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

annotate mercurial/merge.py @ 3570:c141d07198b9

Inform the user about the new URL when being redirected via http. Additionally the changed code ensures that the new URL is used, even if it doesn't end with the query string.

author	Thomas Arendsen Hein <thomas@intevation.de>
date	Sat, 28 Oct 2006 23:05:57 +0200
parents	798bcde0c9c2
children	3b4e00cba57a

rev	line source
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	1 # merge.py - directory-level update/merge handling for Mercurial
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	2 #
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	3 # Copyright 2006 Matt Mackall <mpm@selenic.com>
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	4 #
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	5 # This software may be used and distributed according to the terms
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	6 # of the GNU General Public License, incorporated herein by reference.
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	7
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	8 from node import *
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	9 from i18n import gettext as _
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	10 from demandload import *
3015 db3f42261452 fix errors reported by pychecker Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3007 diff changeset	11 demandload(globals(), "errno util os tempfile")
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	12
3315 e8be5942335d merge: pull file copy/move out of filemerge Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	13 def filemerge(repo, fw, fo, wctx, mctx):
3233 3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	14 """perform a 3-way merge in the working directory
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	15
3322 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	16 fw = filename in the working directory
3233 3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	17 fo = filename in other parent
3303 69b9471f26bb merge: pass contexts to applyupdates Matt Mackall <mpm@selenic.com> parents: 3302 diff changeset	18 wctx, mctx = working and merge changecontexts
3233 3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	19 """
3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	20
3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	21 def temp(prefix, ctx):
3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	22 pre = "%s~%s." % (os.path.basename(ctx.path()), prefix)
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	23 (fd, name) = tempfile.mkstemp(prefix=pre)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	24 f = os.fdopen(fd, "wb")
3233 3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	25 repo.wwrite(ctx.path(), ctx.data(), f)
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	26 f.close()
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	27 return name
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	28
3305 e7abcf3a7c5f filemerge: use contexts rather than my and other Matt Mackall <mpm@selenic.com> parents: 3303 diff changeset	29 fcm = wctx.filectx(fw)
e7abcf3a7c5f filemerge: use contexts rather than my and other Matt Mackall <mpm@selenic.com> parents: 3303 diff changeset	30 fco = mctx.filectx(fo)
3317 966632304dde merge: shortcircuit filemerge for identical files Matt Mackall <mpm@selenic.com> parents: 3315 diff changeset	31
966632304dde merge: shortcircuit filemerge for identical files Matt Mackall <mpm@selenic.com> parents: 3315 diff changeset	32 if not fco.cmp(fcm.data()): # files identical?
3407 d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3387 diff changeset	33 return None
3317 966632304dde merge: shortcircuit filemerge for identical files Matt Mackall <mpm@selenic.com> parents: 3315 diff changeset	34
3233 3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	35 fca = fcm.ancestor(fco)
3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	36 if not fca:
3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	37 fca = repo.filectx(fw, fileid=-1)
3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	38 a = repo.wjoin(fw)
3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	39 b = temp("base", fca)
3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	40 c = temp("other", fco)
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	41
3317 966632304dde merge: shortcircuit filemerge for identical files Matt Mackall <mpm@selenic.com> parents: 3315 diff changeset	42 if fw != fo:
966632304dde merge: shortcircuit filemerge for identical files Matt Mackall <mpm@selenic.com> parents: 3315 diff changeset	43 repo.ui.status(_("merging %s and %s\n") % (fw, fo))
966632304dde merge: shortcircuit filemerge for identical files Matt Mackall <mpm@selenic.com> parents: 3315 diff changeset	44 else:
966632304dde merge: shortcircuit filemerge for identical files Matt Mackall <mpm@selenic.com> parents: 3315 diff changeset	45 repo.ui.status(_("merging %s\n") % fw)
966632304dde merge: shortcircuit filemerge for identical files Matt Mackall <mpm@selenic.com> parents: 3315 diff changeset	46
3233 3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	47 repo.ui.debug(_("my %s other %s ancestor %s\n") % (fcm, fco, fca))
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	48
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	49 cmd = (os.environ.get("HGMERGE") or repo.ui.config("ui", "merge")
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	50 or "hgmerge")
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	51 r = util.system('%s "%s" "%s" "%s"' % (cmd, a, b, c), cwd=repo.root,
3233 3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	52 environ={'HG_FILE': fw,
3303 69b9471f26bb merge: pass contexts to applyupdates Matt Mackall <mpm@selenic.com> parents: 3302 diff changeset	53 'HG_MY_NODE': str(wctx.parents()[0]),
69b9471f26bb merge: pass contexts to applyupdates Matt Mackall <mpm@selenic.com> parents: 3302 diff changeset	54 'HG_OTHER_NODE': str(mctx)})
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	55 if r:
3233 3fd098e0902d merge: extend file merge function for renames Matt Mackall <mpm@selenic.com> parents: 3202 diff changeset	56 repo.ui.warn(_("merging %s failed!\n") % fw)
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	57
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	58 os.unlink(b)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	59 os.unlink(c)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	60 return r
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	61
3318 c5075ad5e3e9 merge: use contexts in checkunknown and forgetremoved Matt Mackall <mpm@selenic.com> parents: 3317 diff changeset	62 def checkunknown(wctx, mctx):
3322 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	63 "check for collisions between unknown files and files in mctx"
3318 c5075ad5e3e9 merge: use contexts in checkunknown and forgetremoved Matt Mackall <mpm@selenic.com> parents: 3317 diff changeset	64 man = mctx.manifest()
3240 8d4855fd9d7b merge: use new working context object in update Matt Mackall <mpm@selenic.com> parents: 3234 diff changeset	65 for f in wctx.unknown():
3318 c5075ad5e3e9 merge: use contexts in checkunknown and forgetremoved Matt Mackall <mpm@selenic.com> parents: 3317 diff changeset	66 if f in man:
c5075ad5e3e9 merge: use contexts in checkunknown and forgetremoved Matt Mackall <mpm@selenic.com> parents: 3317 diff changeset	67 if mctx.filectx(f).cmp(wctx.filectx(f).data()):
3108 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	68 raise util.Abort(_("'%s' already exists in the working"
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	69 " dir and differs from remote") % f)
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	70
3318 c5075ad5e3e9 merge: use contexts in checkunknown and forgetremoved Matt Mackall <mpm@selenic.com> parents: 3317 diff changeset	71 def forgetremoved(wctx, mctx):
3108 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	72 """
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	73 Forget removed files
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	74
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	75 If we're jumping between revisions (as opposed to merging), and if
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	76 neither the working directory nor the target rev has the file,
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	77 then we need to remove it from the dirstate, to prevent the
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	78 dirstate from listing the file when it is no longer in the
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	79 manifest.
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	80 """
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	81
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	82 action = []
3318 c5075ad5e3e9 merge: use contexts in checkunknown and forgetremoved Matt Mackall <mpm@selenic.com> parents: 3317 diff changeset	83 man = mctx.manifest()
3240 8d4855fd9d7b merge: use new working context object in update Matt Mackall <mpm@selenic.com> parents: 3234 diff changeset	84 for f in wctx.deleted() + wctx.removed():
3318 c5075ad5e3e9 merge: use contexts in checkunknown and forgetremoved Matt Mackall <mpm@selenic.com> parents: 3317 diff changeset	85 if f not in man:
3108 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	86 action.append((f, "f"))
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	87
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	88 return action
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	89
3377 8c36b33a27c7 merge: turn followcopies on by default Matt Mackall <mpm@selenic.com> parents: 3323 diff changeset	90 def nonoverlap(d1, d2, d3):
8c36b33a27c7 merge: turn followcopies on by default Matt Mackall <mpm@selenic.com> parents: 3323 diff changeset	91 "Return list of elements in d1 not in d2 or d3"
3155 c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	92
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	93 l = []
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	94 for d in d1:
3377 8c36b33a27c7 merge: turn followcopies on by default Matt Mackall <mpm@selenic.com> parents: 3323 diff changeset	95 if d not in d3 and d not in d2:
3155 c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	96 l.append(d)
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	97
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	98 l.sort()
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	99 return l
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	100
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	101 def findold(fctx, limit):
3322 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	102 "find files that path was copied from, back to linkrev limit"
3155 c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	103
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	104 old = {}
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	105 orig = fctx.path()
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	106 visit = [fctx]
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	107 while visit:
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	108 fc = visit.pop()
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	109 if fc.rev() < limit:
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	110 continue
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	111 if fc.path() != orig and fc.path() not in old:
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	112 old[fc.path()] = 1
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	113 visit += fc.parents()
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	114
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	115 old = old.keys()
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	116 old.sort()
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	117 return old
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	118
3377 8c36b33a27c7 merge: turn followcopies on by default Matt Mackall <mpm@selenic.com> parents: 3323 diff changeset	119 def findcopies(repo, m1, m2, ma, limit):
3155 c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	120 """
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	121 Find moves and copies between m1 and m2 back to limit linkrev
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	122 """
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	123
3377 8c36b33a27c7 merge: turn followcopies on by default Matt Mackall <mpm@selenic.com> parents: 3323 diff changeset	124 if not repo.ui.configbool("merge", "followcopies", True):
3255 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	125 return {}
f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	126
3161 1839e6e91c3a findcopies: shortcut for empty working dir Matt Mackall <mpm@selenic.com> parents: 3157 diff changeset	127 # avoid silly behavior for update from empty dir
1839e6e91c3a findcopies: shortcut for empty working dir Matt Mackall <mpm@selenic.com> parents: 3157 diff changeset	128 if not m1:
1839e6e91c3a findcopies: shortcut for empty working dir Matt Mackall <mpm@selenic.com> parents: 3157 diff changeset	129 return {}
1839e6e91c3a findcopies: shortcut for empty working dir Matt Mackall <mpm@selenic.com> parents: 3157 diff changeset	130
3157 56c59ba7aa76 findcopies: use dirstate rename information Matt Mackall <mpm@selenic.com> parents: 3155 diff changeset	131 dcopies = repo.dirstate.copies()
3155 c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	132 copy = {}
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	133 match = {}
3377 8c36b33a27c7 merge: turn followcopies on by default Matt Mackall <mpm@selenic.com> parents: 3323 diff changeset	134 u1 = nonoverlap(m1, m2, ma)
8c36b33a27c7 merge: turn followcopies on by default Matt Mackall <mpm@selenic.com> parents: 3323 diff changeset	135 u2 = nonoverlap(m2, m1, ma)
3155 c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	136 ctx = util.cachefunc(lambda f,n: repo.filectx(f, fileid=n[:20]))
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	137
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	138 def checkpair(c, f2, man):
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	139 ''' check if an apparent pair actually matches '''
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	140 c2 = ctx(f2, man[f2])
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	141 ca = c.ancestor(c2)
3257 c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3255 diff changeset	142 if ca and ca.path() == c.path() or ca.path() == c2.path():
3155 c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	143 copy[c.path()] = f2
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	144 copy[f2] = c.path()
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	145
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	146 for f in u1:
3157 56c59ba7aa76 findcopies: use dirstate rename information Matt Mackall <mpm@selenic.com> parents: 3155 diff changeset	147 c = ctx(dcopies.get(f, f), m1[f])
3155 c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	148 for of in findold(c, limit):
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	149 if of in m2:
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	150 checkpair(c, of, m2)
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	151 else:
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	152 match.setdefault(of, []).append(f)
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	153
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	154 for f in u2:
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	155 c = ctx(f, m2[f])
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	156 for of in findold(c, limit):
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	157 if of in m1:
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	158 checkpair(c, of, m1)
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	159 elif of in match:
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	160 for mf in match[of]:
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	161 checkpair(c, mf, m1)
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	162
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	163 return copy
c82ea81d6850 Add core copy detection algorithm Matt Mackall <mpm@selenic.com> parents: 3122 diff changeset	164
3301 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	165 def manifestmerge(repo, p1, p2, pa, overwrite, partial):
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	166 """
3322 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	167 Merge p1 and p2 with ancestor ma and generate merge action list
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	168
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	169 overwrite = whether we clobber working files
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	170 partial = function to filter file lists
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	171 """
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	172
3320 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	173 repo.ui.note(_("resolving manifests\n"))
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	174 repo.ui.debug(_(" overwrite %s partial %s\n") % (overwrite, bool(partial)))
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	175 repo.ui.debug(_(" ancestor %s local %s remote %s\n") % (pa, p1, p2))
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	176
3301 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	177 m1 = p1.manifest()
72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	178 m2 = p2.manifest()
72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	179 ma = pa.manifest()
72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	180 backwards = (pa == p2)
3320 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	181 action = []
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	182 copy = {}
3301 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	183
3255 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	184 def fmerge(f, f2=None, fa=None):
3119 5644a05a608c merge: simplify exec flag handling Matt Mackall <mpm@selenic.com> parents: 3118 diff changeset	185 """merge executable flags"""
3255 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	186 if not f2:
f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	187 f2 = f
f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	188 fa = f
f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	189 a, b, c = ma.execf(fa), m1.execf(f), m2.execf(f2)
3119 5644a05a608c merge: simplify exec flag handling Matt Mackall <mpm@selenic.com> parents: 3118 diff changeset	190 return ((a^b) \| (a^c)) ^ a
5644a05a608c merge: simplify exec flag handling Matt Mackall <mpm@selenic.com> parents: 3118 diff changeset	191
3313 f009a6f12a59 merge: swap file and mode args for act() Matt Mackall <mpm@selenic.com> parents: 3312 diff changeset	192 def act(msg, m, f, *args):
3301 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	193 repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m))
3122 2ef0b3aae186 merge: simplify actions with helper function Matt Mackall <mpm@selenic.com> parents: 3121 diff changeset	194 action.append((f, m) + args)
2ef0b3aae186 merge: simplify actions with helper function Matt Mackall <mpm@selenic.com> parents: 3121 diff changeset	195
3301 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	196 if not (backwards or overwrite):
3377 8c36b33a27c7 merge: turn followcopies on by default Matt Mackall <mpm@selenic.com> parents: 3323 diff changeset	197 copy = findcopies(repo, m1, m2, ma, pa.rev())
3301 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	198
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	199 # Compare manifests
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	200 for f, n in m1.iteritems():
3254 751840e739a1 merge: reduce manifest copying Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	201 if partial and not partial(f):
751840e739a1 merge: reduce manifest copying Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	202 continue
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	203 if f in m2:
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	204 # are files different?
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	205 if n != m2[f]:
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	206 a = ma.get(f, nullid)
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	207 # are both different from the ancestor?
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	208 if not overwrite and n != a and m2[f] != a:
3314 ecc1bf27378c merge: unify merge and copy actions Matt Mackall <mpm@selenic.com> parents: 3313 diff changeset	209 act("versions differ", "m", f, f, f, fmerge(f), False)
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	210 # are we clobbering?
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	211 # is remote's version newer?
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	212 # or are we going back in time and clean?
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	213 elif overwrite or m2[f] != a or (backwards and not n[20:]):
3313 f009a6f12a59 merge: swap file and mode args for act() Matt Mackall <mpm@selenic.com> parents: 3312 diff changeset	214 act("remote is newer", "g", f, m2.execf(f))
3114 d1d1cd5b9484 merge: eliminate confusing queued variable Matt Mackall <mpm@selenic.com> parents: 3113 diff changeset	215 # local is newer, not overwrite, check mode bits
3119 5644a05a608c merge: simplify exec flag handling Matt Mackall <mpm@selenic.com> parents: 3118 diff changeset	216 elif fmerge(f) != m1.execf(f):
3313 f009a6f12a59 merge: swap file and mode args for act() Matt Mackall <mpm@selenic.com> parents: 3312 diff changeset	217 act("update permissions", "e", f, m2.execf(f))
3114 d1d1cd5b9484 merge: eliminate confusing queued variable Matt Mackall <mpm@selenic.com> parents: 3113 diff changeset	218 # contents same, check mode bits
d1d1cd5b9484 merge: eliminate confusing queued variable Matt Mackall <mpm@selenic.com> parents: 3113 diff changeset	219 elif m1.execf(f) != m2.execf(f):
3121 1c1e59aac82a merge: simplify local created logic Matt Mackall <mpm@selenic.com> parents: 3120 diff changeset	220 if overwrite or fmerge(f) != m1.execf(f):
3313 f009a6f12a59 merge: swap file and mode args for act() Matt Mackall <mpm@selenic.com> parents: 3312 diff changeset	221 act("update permissions", "e", f, m2.execf(f))
3255 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	222 elif f in copy:
f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	223 f2 = copy[f]
f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	224 if f in ma: # case 3,20 A/B/A
3314 ecc1bf27378c merge: unify merge and copy actions Matt Mackall <mpm@selenic.com> parents: 3313 diff changeset	225 act("remote moved", "m", f, f2, f2, fmerge(f, f2, f), True)
3255 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	226 else:
f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	227 if f2 in m1: # case 2 A,B/B/B
3314 ecc1bf27378c merge: unify merge and copy actions Matt Mackall <mpm@selenic.com> parents: 3313 diff changeset	228 act("local copied", "m",
3313 f009a6f12a59 merge: swap file and mode args for act() Matt Mackall <mpm@selenic.com> parents: 3312 diff changeset	229 f, f2, f, fmerge(f, f2, f2), False)
3255 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	230 else: # case 4,21 A/B/B
3314 ecc1bf27378c merge: unify merge and copy actions Matt Mackall <mpm@selenic.com> parents: 3313 diff changeset	231 act("local moved", "m",
3313 f009a6f12a59 merge: swap file and mode args for act() Matt Mackall <mpm@selenic.com> parents: 3312 diff changeset	232 f, f2, f, fmerge(f, f2, f2), False)
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	233 elif f in ma:
3118 7a635ef25132 merge: simplify tests for local changed/remote deleted Matt Mackall <mpm@selenic.com> parents: 3117 diff changeset	234 if n != ma[f] and not overwrite:
3301 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	235 if repo.ui.prompt(
3118 7a635ef25132 merge: simplify tests for local changed/remote deleted Matt Mackall <mpm@selenic.com> parents: 3117 diff changeset	236 (_(" local changed %s which remote deleted\n") % f) +
3120 b1de36a4b4df merge: simplify prompt code Matt Mackall <mpm@selenic.com> parents: 3119 diff changeset	237 _("(k)eep or (d)elete?"), _("[kd]"), _("k")) == _("d"):
3313 f009a6f12a59 merge: swap file and mode args for act() Matt Mackall <mpm@selenic.com> parents: 3312 diff changeset	238 act("prompt delete", "r", f)
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	239 else:
3313 f009a6f12a59 merge: swap file and mode args for act() Matt Mackall <mpm@selenic.com> parents: 3312 diff changeset	240 act("other deleted", "r", f)
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	241 else:
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	242 # file is created on branch or in working directory
3121 1c1e59aac82a merge: simplify local created logic Matt Mackall <mpm@selenic.com> parents: 3120 diff changeset	243 if (overwrite and n[20:] != "u") or (backwards and not n[20:]):
3313 f009a6f12a59 merge: swap file and mode args for act() Matt Mackall <mpm@selenic.com> parents: 3312 diff changeset	244 act("remote deleted", "r", f)
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	245
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	246 for f, n in m2.iteritems():
3254 751840e739a1 merge: reduce manifest copying Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	247 if partial and not partial(f):
751840e739a1 merge: reduce manifest copying Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	248 continue
751840e739a1 merge: reduce manifest copying Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	249 if f in m1:
751840e739a1 merge: reduce manifest copying Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	250 continue
3255 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	251 if f in copy:
f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	252 f2 = copy[f]
3280 ae85272b59a4 merge: copy fixes and tests Matt Mackall <mpm@selenic.com> parents: 3257 diff changeset	253 if f2 not in m2: # already seen
3255 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	254 continue
f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	255 # rename case 1, A/A,B/A
3314 ecc1bf27378c merge: unify merge and copy actions Matt Mackall <mpm@selenic.com> parents: 3313 diff changeset	256 act("remote copied", "m", f2, f, f, fmerge(f2, f, f2), False)
3255 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	257 elif f in ma:
3117 920f54a2249e merge: more simplification of m2 manifest scanning Matt Mackall <mpm@selenic.com> parents: 3116 diff changeset	258 if overwrite or backwards:
3313 f009a6f12a59 merge: swap file and mode args for act() Matt Mackall <mpm@selenic.com> parents: 3312 diff changeset	259 act("recreating", "g", f, m2.execf(f))
3117 920f54a2249e merge: more simplification of m2 manifest scanning Matt Mackall <mpm@selenic.com> parents: 3116 diff changeset	260 elif n != ma[f]:
3301 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	261 if repo.ui.prompt(
3117 920f54a2249e merge: more simplification of m2 manifest scanning Matt Mackall <mpm@selenic.com> parents: 3116 diff changeset	262 (_("remote changed %s which local deleted\n") % f) +
3120 b1de36a4b4df merge: simplify prompt code Matt Mackall <mpm@selenic.com> parents: 3119 diff changeset	263 _("(k)eep or (d)elete?"), _("[kd]"), _("k")) == _("k"):
3313 f009a6f12a59 merge: swap file and mode args for act() Matt Mackall <mpm@selenic.com> parents: 3312 diff changeset	264 act("prompt recreating", "g", f, m2.execf(f))
3116 bb74f809bc95 merge: reorder tests on m2 items in manifestmerge Matt Mackall <mpm@selenic.com> parents: 3115 diff changeset	265 else:
3313 f009a6f12a59 merge: swap file and mode args for act() Matt Mackall <mpm@selenic.com> parents: 3312 diff changeset	266 act("remote created", "g", f, m2.execf(f))
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	267
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	268 return action
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	269
3303 69b9471f26bb merge: pass contexts to applyupdates Matt Mackall <mpm@selenic.com> parents: 3302 diff changeset	270 def applyupdates(repo, action, wctx, mctx):
3322 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	271 "apply the merge action list to the working directory"
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	272
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	273 updated, merged, removed, unresolved = 0, 0, 0, 0
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	274 action.sort()
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	275 for a in action:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	276 f, m = a[:2]
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	277 if f[0] == "/":
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	278 continue
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	279 if m == "r": # remove
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	280 repo.ui.note(_("removing %s\n") % f)
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	281 util.audit_path(f)
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	282 try:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	283 util.unlink(repo.wjoin(f))
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	284 except OSError, inst:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	285 if inst.errno != errno.ENOENT:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	286 repo.ui.warn(_("update failed to remove %s: %s!\n") %
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	287 (f, inst.strerror))
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	288 removed +=1
3314 ecc1bf27378c merge: unify merge and copy actions Matt Mackall <mpm@selenic.com> parents: 3313 diff changeset	289 elif m == "m": # merge
3309 488d3062d225 merge: eliminate nodes from action list Matt Mackall <mpm@selenic.com> parents: 3305 diff changeset	290 f2, fd, flag, move = a[2:]
3407 d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3387 diff changeset	291 r = filemerge(repo, f, f2, wctx, mctx)
d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3387 diff changeset	292 if r > 0:
3255 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	293 unresolved += 1
3315 e8be5942335d merge: pull file copy/move out of filemerge Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	294 else:
3407 d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3387 diff changeset	295 if r is None:
d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3387 diff changeset	296 updated += 1
d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3387 diff changeset	297 else:
d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3387 diff changeset	298 merged += 1
3315 e8be5942335d merge: pull file copy/move out of filemerge Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	299 if f != fd:
e8be5942335d merge: pull file copy/move out of filemerge Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	300 repo.ui.debug(_("copying %s to %s\n") % (f, fd))
e8be5942335d merge: pull file copy/move out of filemerge Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	301 repo.wwrite(fd, repo.wread(f))
e8be5942335d merge: pull file copy/move out of filemerge Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	302 if move:
e8be5942335d merge: pull file copy/move out of filemerge Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	303 repo.ui.debug(_("removing %s\n") % f)
e8be5942335d merge: pull file copy/move out of filemerge Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	304 os.unlink(repo.wjoin(f))
3255 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3254 diff changeset	305 util.set_exec(repo.wjoin(fd), flag)
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	306 elif m == "g": # get
3312 5c9806554d65 merge: finish removing nodes from action list Matt Mackall <mpm@selenic.com> parents: 3309 diff changeset	307 flag = a[2]
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	308 repo.ui.note(_("getting %s\n") % f)
3309 488d3062d225 merge: eliminate nodes from action list Matt Mackall <mpm@selenic.com> parents: 3305 diff changeset	309 t = mctx.filectx(f).data()
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	310 repo.wwrite(f, t)
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	311 util.set_exec(repo.wjoin(f), flag)
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	312 updated += 1
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	313 elif m == "e": # exec
3309 488d3062d225 merge: eliminate nodes from action list Matt Mackall <mpm@selenic.com> parents: 3305 diff changeset	314 flag = a[2]
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	315 util.set_exec(repo.wjoin(f), flag)
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	316
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	317 return updated, merged, removed, unresolved
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	318
3387 ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	319 def recordupdates(repo, action, branchmerge):
3322 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	320 "record merge actions to the dirstate"
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	321
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	322 for a in action:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	323 f, m = a[:2]
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	324 if m == "r": # remove
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	325 if branchmerge:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	326 repo.dirstate.update([f], 'r')
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	327 else:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	328 repo.dirstate.forget([f])
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	329 elif m == "f": # forget
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	330 repo.dirstate.forget([f])
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	331 elif m == "g": # get
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	332 if branchmerge:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	333 repo.dirstate.update([f], 'n', st_mtime=-1)
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	334 else:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	335 repo.dirstate.update([f], 'n')
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	336 elif m == "m": # merge
3309 488d3062d225 merge: eliminate nodes from action list Matt Mackall <mpm@selenic.com> parents: 3305 diff changeset	337 f2, fd, flag, move = a[2:]
3257 c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3255 diff changeset	338 if branchmerge:
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3255 diff changeset	339 # We've done a branch merge, mark this file as merged
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3255 diff changeset	340 # so that we properly record the merger later
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3255 diff changeset	341 repo.dirstate.update([fd], 'm')
3387 ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	342 if f != f2: # copy/rename
ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	343 if move:
ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	344 repo.dirstate.update([f], 'r')
ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	345 if f != fd:
ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	346 repo.dirstate.copy(f, fd)
ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	347 else:
ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	348 repo.dirstate.copy(f2, fd)
3257 c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3255 diff changeset	349 else:
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3255 diff changeset	350 # We've update-merged a locally modified file, so
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3255 diff changeset	351 # we set the dirstate to emulate a normal checkout
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3255 diff changeset	352 # of that file some time in the past. Thus our
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3255 diff changeset	353 # merge will appear as a normal local file
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3255 diff changeset	354 # modification.
3387 ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	355 repo.dirstate.update([fd], 'n', st_size=-1, st_mtime=-1)
3314 ecc1bf27378c merge: unify merge and copy actions Matt Mackall <mpm@selenic.com> parents: 3313 diff changeset	356 if move:
3387 ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	357 repo.dirstate.forget([f])
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	358
3323 39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3322 diff changeset	359 def update(repo, node, branchmerge, force, partial, wlock):
3322 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	360 """
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	361 Perform a merge between the working directory and the given node
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	362
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	363 branchmerge = whether to merge between branches
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	364 force = whether to force branch merging or file overwriting
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	365 partial = a function to filter file lists (dirstate not updated)
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	366 wlock = working dir lock, if already held
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3320 diff changeset	367 """
2829 4870f795f681 Merge: combine force and forcemerge arguments Matt Mackall <mpm@selenic.com> parents: 2828 diff changeset	368
2826 3aeab7bb5adc Refactor update locking slightly Matt Mackall <mpm@selenic.com> parents: 2825 diff changeset	369 if not wlock:
3aeab7bb5adc Refactor update locking slightly Matt Mackall <mpm@selenic.com> parents: 2825 diff changeset	370 wlock = repo.wlock()
3aeab7bb5adc Refactor update locking slightly Matt Mackall <mpm@selenic.com> parents: 2825 diff changeset	371
3320 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	372 overwrite = force and not branchmerge
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	373 forcemerge = force and branchmerge
3240 8d4855fd9d7b merge: use new working context object in update Matt Mackall <mpm@selenic.com> parents: 3234 diff changeset	374 wc = repo.workingctx()
8d4855fd9d7b merge: use new working context object in update Matt Mackall <mpm@selenic.com> parents: 3234 diff changeset	375 pl = wc.parents()
3320 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	376 p1, p2 = pl[0], repo.changectx(node)
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	377 pa = p1.ancestor(p2)
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	378 fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2)
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	379
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	380 ### check phase
3200 e67c22bc8bba merge: use repo.parents and parent contexts in update Matt Mackall <mpm@selenic.com> parents: 3163 diff changeset	381 if not overwrite and len(pl) > 1:
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	382 raise util.Abort(_("outstanding uncommitted merges"))
3320 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	383 if pa == p1 or pa == p2: # is there a linear path from p1 to p2?
3111 40e777bda455 merge: remove linear variable Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	384 if branchmerge:
40e777bda455 merge: remove linear variable Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	385 raise util.Abort(_("there is nothing to merge, just use "
40e777bda455 merge: remove linear variable Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	386 "'hg update' or look at 'hg heads'"))
40e777bda455 merge: remove linear variable Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	387 elif not (overwrite or branchmerge):
2829 4870f795f681 Merge: combine force and forcemerge arguments Matt Mackall <mpm@selenic.com> parents: 2828 diff changeset	388 raise util.Abort(_("update spans branches, use 'hg merge' "
2828 0f787997e3c2 Merge: move most tests to the beginning Matt Mackall <mpm@selenic.com> parents: 2827 diff changeset	389 "or 'hg update -C' to lose changes"))
0f787997e3c2 Merge: move most tests to the beginning Matt Mackall <mpm@selenic.com> parents: 2827 diff changeset	390 if branchmerge and not forcemerge:
3240 8d4855fd9d7b merge: use new working context object in update Matt Mackall <mpm@selenic.com> parents: 3234 diff changeset	391 if wc.modified() or wc.added() or wc.removed():
2828 0f787997e3c2 Merge: move most tests to the beginning Matt Mackall <mpm@selenic.com> parents: 2827 diff changeset	392 raise util.Abort(_("outstanding uncommitted changes"))
0f787997e3c2 Merge: move most tests to the beginning Matt Mackall <mpm@selenic.com> parents: 2827 diff changeset	393
3320 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	394 ### calculate phase
3101 87ea5a71f7b9 merge: convert actions to list Matt Mackall <mpm@selenic.com> parents: 3097 diff changeset	395 action = []
3108 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	396 if not force:
3318 c5075ad5e3e9 merge: use contexts in checkunknown and forgetremoved Matt Mackall <mpm@selenic.com> parents: 3317 diff changeset	397 checkunknown(wc, p2)
3111 40e777bda455 merge: remove linear variable Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	398 if not branchmerge:
3318 c5075ad5e3e9 merge: use contexts in checkunknown and forgetremoved Matt Mackall <mpm@selenic.com> parents: 3317 diff changeset	399 action += forgetremoved(wc, p2)
3301 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3295 diff changeset	400 action += manifestmerge(repo, wc, p2, pa, overwrite, partial)
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	401
2917 dd032b0f02ac merge: move forgets to the apply stage Matt Mackall <mpm@selenic.com> parents: 2916 diff changeset	402 ### apply phase
3320 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	403 if not branchmerge: # just jump to the new rev
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	404 fp1, fp2, xp1, xp2 = fp2, nullid, xp2, ''
3302 20087b4bc6f9 merge: don't call hooks for revert Matt Mackall <mpm@selenic.com> parents: 3301 diff changeset	405 if not partial:
20087b4bc6f9 merge: don't call hooks for revert Matt Mackall <mpm@selenic.com> parents: 3301 diff changeset	406 repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2)
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	407
3323 39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3322 diff changeset	408 stats = applyupdates(repo, action, wc, p2)
2919 8743188f4d2e merge: consolidate dirstate updates Matt Mackall <mpm@selenic.com> parents: 2918 diff changeset	409
2825 1ea086bc2086 Merge: combine choose and moddirstate to partial Matt Mackall <mpm@selenic.com> parents: 2824 diff changeset	410 if not partial:
3387 ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3377 diff changeset	411 recordupdates(repo, action, branchmerge)
3320 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	412 repo.dirstate.setparents(fp1, fp2)
3323 39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3322 diff changeset	413 repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])
3441 ef2e990f9047 imported patch foo Matt Mackall <mpm@selenic.com> parents: 3407 diff changeset	414 if not branchmerge:
3442 798bcde0c9c2 merge: fix branch setting Matt Mackall <mpm@selenic.com> parents: 3441 diff changeset	415 repo.opener("branch", "w").write(p2.branch() + "\n")
3320 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3318 diff changeset	416
3323 39fd6e82ea38 merge: pull user messages out to hg.py Matt Mackall <mpm@selenic.com> parents: 3322 diff changeset	417 return stats
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	418

Mercurial > hg > mercurial-crew-with-dirclash

annotate mercurial/merge.py @ 3570:c141d07198b9