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

annotate mercurial/merge.py @ 2827:56f99f5aab34

Merge: refactor err and failedmerge -> unresolved

author	Matt Mackall <mpm@selenic.com>
date	Tue, 08 Aug 2006 09:26:00 -0500
parents	3aeab7bb5adc
children	0f787997e3c2

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 *
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	11 demandload(globals(), "util os tempfile")
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	12
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	13 def merge3(repo, fn, my, other, p1, p2):
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	14 """perform a 3-way merge in the working directory"""
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	15
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	16 def temp(prefix, node):
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	17 pre = "%s~%s." % (os.path.basename(fn), prefix)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	18 (fd, name) = tempfile.mkstemp(prefix=pre)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	19 f = os.fdopen(fd, "wb")
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	20 repo.wwrite(fn, fl.read(node), f)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	21 f.close()
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	22 return name
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	23
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	24 fl = repo.file(fn)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	25 base = fl.ancestor(my, other)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	26 a = repo.wjoin(fn)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	27 b = temp("base", base)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	28 c = temp("other", other)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	29
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	30 repo.ui.note(_("resolving %s\n") % fn)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	31 repo.ui.debug(_("file %s: my %s other %s ancestor %s\n") %
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	32 (fn, short(my), short(other), short(base)))
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	33
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	34 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	35 or "hgmerge")
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	36 r = util.system('%s "%s" "%s" "%s"' % (cmd, a, b, c), cwd=repo.root,
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	37 environ={'HG_FILE': fn,
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	38 'HG_MY_NODE': p1,
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	39 'HG_OTHER_NODE': p2,
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	40 'HG_FILE_MY_NODE': hex(my),
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	41 'HG_FILE_OTHER_NODE': hex(other),
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	42 'HG_FILE_BASE_NODE': hex(base)})
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	43 if r:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	44 repo.ui.warn(_("merging %s failed!\n") % fn)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	45
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	46 os.unlink(b)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	47 os.unlink(c)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	48 return r
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	49
2825 1ea086bc2086 Merge: combine choose and moddirstate to partial Matt Mackall <mpm@selenic.com> parents: 2824 diff changeset	50 def update(repo, node, branchmerge=False, force=False, partial=None,
1ea086bc2086 Merge: combine choose and moddirstate to partial Matt Mackall <mpm@selenic.com> parents: 2824 diff changeset	51 forcemerge=False, wlock=None, show_stats=True, remind=True):
2826 3aeab7bb5adc Refactor update locking slightly Matt Mackall <mpm@selenic.com> parents: 2825 diff changeset	52
3aeab7bb5adc Refactor update locking slightly Matt Mackall <mpm@selenic.com> parents: 2825 diff changeset	53 if not wlock:
3aeab7bb5adc Refactor update locking slightly Matt Mackall <mpm@selenic.com> parents: 2825 diff changeset	54 wlock = repo.wlock()
3aeab7bb5adc Refactor update locking slightly Matt Mackall <mpm@selenic.com> parents: 2825 diff changeset	55
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	56 pl = repo.dirstate.parents()
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	57 if not force and pl[1] != nullid:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	58 raise util.Abort(_("outstanding uncommitted merges"))
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	59
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	60 p1, p2 = pl[0], node
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	61 pa = repo.changelog.ancestor(p1, p2)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	62 m1n = repo.changelog.read(p1)[0]
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	63 m2n = repo.changelog.read(p2)[0]
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	64 man = repo.manifest.ancestor(m1n, m2n)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	65 m1 = repo.manifest.read(m1n)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	66 mf1 = repo.manifest.readflags(m1n)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	67 m2 = repo.manifest.read(m2n).copy()
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	68 mf2 = repo.manifest.readflags(m2n)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	69 ma = repo.manifest.read(man)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	70 mfa = repo.manifest.readflags(man)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	71
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	72 modified, added, removed, deleted, unknown = repo.changes()
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	73
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	74 # is this a jump, or a merge? i.e. is there a linear path
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	75 # from p1 to p2?
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	76 linear_path = (pa == p1 or pa == p2)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	77
2824 ca06d35af65e Rename merge.allow -> merge.branchmerge Matt Mackall <mpm@selenic.com> parents: 2803 diff changeset	78 if branchmerge and linear_path:
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	79 raise util.Abort(_("there is nothing to merge, just use "
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	80 "'hg update' or look at 'hg heads'"))
2824 ca06d35af65e Rename merge.allow -> merge.branchmerge Matt Mackall <mpm@selenic.com> parents: 2803 diff changeset	81 if branchmerge and not forcemerge:
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	82 if modified or added or removed:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	83 raise util.Abort(_("outstanding uncommitted changes"))
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	84
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	85 if not forcemerge and not force:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	86 for f in unknown:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	87 if f in m2:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	88 t1 = repo.wread(f)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	89 t2 = repo.file(f).read(m2[f])
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	90 if cmp(t1, t2) != 0:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	91 raise util.Abort(_("'%s' already exists in the working"
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	92 " dir and differs from remote") % f)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	93
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	94 # resolve the manifest to determine which files
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	95 # we care about merging
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	96 repo.ui.note(_("resolving manifests\n"))
2825 1ea086bc2086 Merge: combine choose and moddirstate to partial Matt Mackall <mpm@selenic.com> parents: 2824 diff changeset	97 repo.ui.debug(_(" force %s branchmerge %s partial %s linear %s\n") %
1ea086bc2086 Merge: combine choose and moddirstate to partial Matt Mackall <mpm@selenic.com> parents: 2824 diff changeset	98 (force, branchmerge, partial and True or False, linear_path))
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	99 repo.ui.debug(_(" ancestor %s local %s remote %s\n") %
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	100 (short(man), short(m1n), short(m2n)))
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	101
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	102 merge = {}
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	103 get = {}
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	104 remove = []
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	105
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	106 # construct a working dir manifest
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	107 mw = m1.copy()
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	108 mfw = mf1.copy()
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	109 umap = dict.fromkeys(unknown)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	110
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	111 for f in added + modified + unknown:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	112 mw[f] = ""
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	113 mfw[f] = util.is_exec(repo.wjoin(f), mfw.get(f, False))
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	114
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	115 for f in deleted + removed:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	116 if f in mw:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	117 del mw[f]
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	118
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	119 # If we're jumping between revisions (as opposed to merging),
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	120 # and if neither the working directory nor the target rev has
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	121 # the file, then we need to remove it from the dirstate, to
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	122 # prevent the dirstate from listing the file when it is no
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	123 # longer in the manifest.
2825 1ea086bc2086 Merge: combine choose and moddirstate to partial Matt Mackall <mpm@selenic.com> parents: 2824 diff changeset	124 if not partial and linear_path and f not in m2:
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	125 repo.dirstate.forget((f,))
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	126
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	127 # Compare manifests
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	128 for f, n in mw.iteritems():
2825 1ea086bc2086 Merge: combine choose and moddirstate to partial Matt Mackall <mpm@selenic.com> parents: 2824 diff changeset	129 if partial and not partial(f):
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	130 continue
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	131 if f in m2:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	132 s = 0
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	133
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	134 # is the wfile new since m1, and match m2?
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	135 if f not in m1:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	136 t1 = repo.wread(f)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	137 t2 = repo.file(f).read(m2[f])
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	138 if cmp(t1, t2) == 0:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	139 n = m2[f]
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	140 del t1, t2
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	141
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	142 # are files different?
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	143 if n != m2[f]:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	144 a = ma.get(f, nullid)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	145 # are both different from the ancestor?
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	146 if n != a and m2[f] != a:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	147 repo.ui.debug(_(" %s versions differ, resolve\n") % f)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	148 # merge executable bits
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	149 # "if we changed or they changed, change in merge"
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	150 a, b, c = mfa.get(f, 0), mfw[f], mf2[f]
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	151 mode = ((a^b) \| (a^c)) ^ a
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	152 merge[f] = (m1.get(f, nullid), m2[f], mode)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	153 s = 1
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	154 # are we clobbering?
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	155 # is remote's version newer?
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	156 # or are we going back in time?
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	157 elif force or m2[f] != a or (p2 == pa and mw[f] == m1[f]):
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	158 repo.ui.debug(_(" remote %s is newer, get\n") % f)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	159 get[f] = m2[f]
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	160 s = 1
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	161 elif f in umap or f in added:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	162 # this unknown file is the same as the checkout
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	163 # we need to reset the dirstate if the file was added
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	164 get[f] = m2[f]
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	165
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	166 if not s and mfw[f] != mf2[f]:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	167 if force:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	168 repo.ui.debug(_(" updating permissions for %s\n") % f)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	169 util.set_exec(repo.wjoin(f), mf2[f])
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	170 else:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	171 a, b, c = mfa.get(f, 0), mfw[f], mf2[f]
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	172 mode = ((a^b) \| (a^c)) ^ a
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	173 if mode != b:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	174 repo.ui.debug(_(" updating permissions for %s\n")
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	175 % f)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	176 util.set_exec(repo.wjoin(f), mode)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	177 del m2[f]
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	178 elif f in ma:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	179 if n != ma[f]:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	180 r = _("d")
2824 ca06d35af65e Rename merge.allow -> merge.branchmerge Matt Mackall <mpm@selenic.com> parents: 2803 diff changeset	181 if not force and (linear_path or branchmerge):
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	182 r = repo.ui.prompt(
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	183 (_(" local changed %s which remote deleted\n") % f) +
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	184 _("(k)eep or (d)elete?"), _("[kd]"), _("k"))
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	185 if r == _("d"):
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	186 remove.append(f)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	187 else:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	188 repo.ui.debug(_("other deleted %s\n") % f)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	189 remove.append(f) # other deleted it
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	190 else:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	191 # file is created on branch or in working directory
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	192 if force and f not in umap:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	193 repo.ui.debug(_("remote deleted %s, clobbering\n") % f)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	194 remove.append(f)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	195 elif n == m1.get(f, nullid): # same as parent
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	196 if p2 == pa: # going backwards?
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	197 repo.ui.debug(_("remote deleted %s\n") % f)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	198 remove.append(f)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	199 else:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	200 repo.ui.debug(_("local modified %s, keeping\n") % f)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	201 else:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	202 repo.ui.debug(_("working dir created %s, keeping\n") % f)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	203
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	204 for f, n in m2.iteritems():
2825 1ea086bc2086 Merge: combine choose and moddirstate to partial Matt Mackall <mpm@selenic.com> parents: 2824 diff changeset	205 if partial and not partial(f):
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	206 continue
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	207 if f[0] == "/":
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	208 continue
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	209 if f in ma and n != ma[f]:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	210 r = _("k")
2824 ca06d35af65e Rename merge.allow -> merge.branchmerge Matt Mackall <mpm@selenic.com> parents: 2803 diff changeset	211 if not force and (linear_path or branchmerge):
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	212 r = repo.ui.prompt(
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	213 (_("remote changed %s which local deleted\n") % f) +
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	214 _("(k)eep or (d)elete?"), _("[kd]"), _("k"))
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	215 if r == _("k"):
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	216 get[f] = n
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	217 elif f not in ma:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	218 repo.ui.debug(_("remote created %s\n") % f)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	219 get[f] = n
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	220 else:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	221 if force or p2 == pa: # going backwards?
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	222 repo.ui.debug(_("local deleted %s, recreating\n") % f)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	223 get[f] = n
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	224 else:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	225 repo.ui.debug(_("local deleted %s\n") % f)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	226
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	227 del mw, m1, m2, ma
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	228
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	229 if force:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	230 for f in merge:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	231 get[f] = merge[f][1]
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	232 merge = {}
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	233
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	234 if linear_path or force:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	235 # we don't need to do any magic, just jump to the new rev
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	236 p1, p2 = p2, nullid
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	237 else:
2824 ca06d35af65e Rename merge.allow -> merge.branchmerge Matt Mackall <mpm@selenic.com> parents: 2803 diff changeset	238 if not branchmerge:
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	239 repo.ui.status(_("this update spans a branch"
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	240 " affecting the following files:\n"))
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	241 fl = merge.keys() + get.keys()
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	242 fl.sort()
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	243 for f in fl:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	244 cf = ""
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	245 if f in merge:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	246 cf = _(" (resolve)")
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	247 repo.ui.status(" %s%s\n" % (f, cf))
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	248 repo.ui.warn(_("aborting update spanning branches!\n"))
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	249 repo.ui.status(_("(use 'hg merge' to merge across branches"
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	250 " or 'hg update -C' to lose changes)\n"))
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	251 return 1
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	252
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	253 xp1 = hex(p1)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	254 xp2 = hex(p2)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	255 if p2 == nullid: xxp2 = ''
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	256 else: xxp2 = xp2
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	257
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	258 repo.hook('preupdate', throw=True, parent1=xp1, parent2=xxp2)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	259
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	260 # get the files we don't need to change
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	261 files = get.keys()
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	262 files.sort()
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	263 for f in files:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	264 if f[0] == "/":
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	265 continue
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	266 repo.ui.note(_("getting %s\n") % f)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	267 t = repo.file(f).read(get[f])
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	268 repo.wwrite(f, t)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	269 util.set_exec(repo.wjoin(f), mf2[f])
2825 1ea086bc2086 Merge: combine choose and moddirstate to partial Matt Mackall <mpm@selenic.com> parents: 2824 diff changeset	270 if not partial:
2824 ca06d35af65e Rename merge.allow -> merge.branchmerge Matt Mackall <mpm@selenic.com> parents: 2803 diff changeset	271 if branchmerge:
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	272 repo.dirstate.update([f], 'n', st_mtime=-1)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	273 else:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	274 repo.dirstate.update([f], 'n')
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	275
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	276 # merge the tricky bits
2827 56f99f5aab34 Merge: refactor err and failedmerge -> unresolved Matt Mackall <mpm@selenic.com> parents: 2826 diff changeset	277 unresolved = []
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	278 files = merge.keys()
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	279 files.sort()
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	280 for f in files:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	281 repo.ui.status(_("merging %s\n") % f)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	282 my, other, flag = merge[f]
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	283 ret = merge3(repo, f, my, other, xp1, xp2)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	284 if ret:
2827 56f99f5aab34 Merge: refactor err and failedmerge -> unresolved Matt Mackall <mpm@selenic.com> parents: 2826 diff changeset	285 unresolved.append(f)
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	286 util.set_exec(repo.wjoin(f), flag)
2825 1ea086bc2086 Merge: combine choose and moddirstate to partial Matt Mackall <mpm@selenic.com> parents: 2824 diff changeset	287 if not partial:
2824 ca06d35af65e Rename merge.allow -> merge.branchmerge Matt Mackall <mpm@selenic.com> parents: 2803 diff changeset	288 if branchmerge:
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	289 # We've done a branch merge, mark this file as merged
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	290 # so that we properly record the merger later
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	291 repo.dirstate.update([f], 'm')
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	292 else:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	293 # We've update-merged a locally modified file, so
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	294 # we set the dirstate to emulate a normal checkout
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	295 # of that file some time in the past. Thus our
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	296 # merge will appear as a normal local file
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	297 # modification.
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	298 f_len = len(repo.file(f).read(other))
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	299 repo.dirstate.update([f], 'n', st_size=f_len, st_mtime=-1)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	300
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	301 remove.sort()
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	302 for f in remove:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	303 repo.ui.note(_("removing %s\n") % f)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	304 util.audit_path(f)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	305 try:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	306 util.unlink(repo.wjoin(f))
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	307 except OSError, inst:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	308 if inst.errno != errno.ENOENT:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	309 repo.ui.warn(_("update failed to remove %s: %s!\n") %
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	310 (f, inst.strerror))
2825 1ea086bc2086 Merge: combine choose and moddirstate to partial Matt Mackall <mpm@selenic.com> parents: 2824 diff changeset	311 if not partial:
2824 ca06d35af65e Rename merge.allow -> merge.branchmerge Matt Mackall <mpm@selenic.com> parents: 2803 diff changeset	312 if branchmerge:
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	313 repo.dirstate.update(remove, 'r')
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	314 else:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	315 repo.dirstate.forget(remove)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	316
2825 1ea086bc2086 Merge: combine choose and moddirstate to partial Matt Mackall <mpm@selenic.com> parents: 2824 diff changeset	317 if not partial:
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	318 repo.dirstate.setparents(p1, p2)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	319
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	320 if show_stats:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	321 stats = ((len(get), _("updated")),
2827 56f99f5aab34 Merge: refactor err and failedmerge -> unresolved Matt Mackall <mpm@selenic.com> parents: 2826 diff changeset	322 (len(merge) - len(unresolved), _("merged")),
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	323 (len(remove), _("removed")),
2827 56f99f5aab34 Merge: refactor err and failedmerge -> unresolved Matt Mackall <mpm@selenic.com> parents: 2826 diff changeset	324 (len(unresolved), _("unresolved")))
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	325 note = ", ".join([_("%d files %s") % s for s in stats])
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	326 repo.ui.status("%s\n" % note)
2825 1ea086bc2086 Merge: combine choose and moddirstate to partial Matt Mackall <mpm@selenic.com> parents: 2824 diff changeset	327 if not partial:
2824 ca06d35af65e Rename merge.allow -> merge.branchmerge Matt Mackall <mpm@selenic.com> parents: 2803 diff changeset	328 if branchmerge:
2827 56f99f5aab34 Merge: refactor err and failedmerge -> unresolved Matt Mackall <mpm@selenic.com> parents: 2826 diff changeset	329 if unresolved:
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	330 repo.ui.status(_("There are unresolved merges,"
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	331 " you can redo the full merge using:\n"
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	332 " hg update -C %s\n"
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	333 " hg merge %s\n"
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	334 % (repo.changelog.rev(p1),
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	335 repo.changelog.rev(p2))))
2803 987c31e2a08c Merge with crew Matt Mackall <mpm@selenic.com> parents: 2799 diff changeset	336 elif remind:
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	337 repo.ui.status(_("(branch merge, don't forget to commit)\n"))
2827 56f99f5aab34 Merge: refactor err and failedmerge -> unresolved Matt Mackall <mpm@selenic.com> parents: 2826 diff changeset	338 elif unresolved:
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	339 repo.ui.status(_("There are unresolved merges with"
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	340 " locally modified files.\n"))
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	341
2827 56f99f5aab34 Merge: refactor err and failedmerge -> unresolved Matt Mackall <mpm@selenic.com> parents: 2826 diff changeset	342 repo.hook('update', parent1=xp1, parent2=xxp2, error=len(unresolved))
56f99f5aab34 Merge: refactor err and failedmerge -> unresolved Matt Mackall <mpm@selenic.com> parents: 2826 diff changeset	343 return len(unresolved)
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	344

Mercurial > hg > mercurial-crew-with-dirclash

annotate mercurial/merge.py @ 2827:56f99f5aab34