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

annotate mercurial/merge.py @ 3117:920f54a2249e

merge: more simplification of m2 manifest scanning

author	Matt Mackall <mpm@selenic.com>
date	Sun, 17 Sep 2006 20:10:54 -0500
parents	bb74f809bc95
children	7a635ef25132

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
2912 dd41ad984f71 merge: factor out exec bit merge function Matt Mackall <mpm@selenic.com> parents: 2911 diff changeset	13 def fmerge(f, local, other, ancestor):
dd41ad984f71 merge: factor out exec bit merge function Matt Mackall <mpm@selenic.com> parents: 2911 diff changeset	14 """merge executable flags"""
dd41ad984f71 merge: factor out exec bit merge function Matt Mackall <mpm@selenic.com> parents: 2911 diff changeset	15 a, b, c = ancestor.execf(f), local.execf(f), other.execf(f)
dd41ad984f71 merge: factor out exec bit merge function Matt Mackall <mpm@selenic.com> parents: 2911 diff changeset	16 return ((a^b) \| (a^c)) ^ a
dd41ad984f71 merge: factor out exec bit merge function Matt Mackall <mpm@selenic.com> parents: 2911 diff changeset	17
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	18 def merge3(repo, fn, my, other, p1, p2):
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	19 """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	20
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	21 def temp(prefix, node):
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	22 pre = "%s~%s." % (os.path.basename(fn), prefix)
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")
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	25 repo.wwrite(fn, fl.read(node), f)
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
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	29 fl = repo.file(fn)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	30 base = fl.ancestor(my, other)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	31 a = repo.wjoin(fn)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	32 b = temp("base", base)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	33 c = temp("other", other)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	34
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	35 repo.ui.note(_("resolving %s\n") % fn)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	36 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	37 (fn, short(my), short(other), short(base)))
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	38
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	39 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	40 or "hgmerge")
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	41 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	42 environ={'HG_FILE': fn,
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	43 'HG_MY_NODE': p1,
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	44 'HG_OTHER_NODE': p2,
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	45 'HG_FILE_MY_NODE': hex(my),
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	46 'HG_FILE_OTHER_NODE': hex(other),
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	47 'HG_FILE_BASE_NODE': hex(base)})
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	48 if r:
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	49 repo.ui.warn(_("merging %s failed!\n") % fn)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	50
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	51 os.unlink(b)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	52 os.unlink(c)
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	53 return r
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	54
3108 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	55 def checkunknown(repo, m2, status):
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	56 """
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	57 check for collisions between unknown files and files in m2
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	58 """
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	59 modified, added, removed, deleted, unknown = status[:5]
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	60 for f in unknown:
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	61 if f in m2:
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	62 if repo.file(f).cmp(m2[f], repo.wread(f)):
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	63 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	64 " 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	65
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	66 def workingmanifest(repo, man, status):
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	67 """
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	68 Update manifest to correspond to the working directory
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	69 """
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	70
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	71 modified, added, removed, deleted, unknown = status[:5]
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	72 for i,l in (("a", added), ("m", modified), ("u", unknown)):
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	73 for f in l:
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	74 man[f] = man.get(f, nullid) + i
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	75 man.set(f, util.is_exec(repo.wjoin(f), man.execf(f)))
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	76
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	77 for f in deleted + removed:
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	78 del man[f]
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	79
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	80 return man
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 def forgetremoved(m2, status):
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	83 """
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	84 Forget removed files
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	85
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	86 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	87 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	88 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	89 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	90 manifest.
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	91 """
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	92
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	93 modified, added, removed, deleted, unknown = status[:5]
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	94 action = []
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	95
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	96 for f in deleted + removed:
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	97 if f not in m2:
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	98 action.append((f, "f"))
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	99
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	100 return action
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	101
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	102 def manifestmerge(ui, m1, m2, ma, overwrite, backwards, partial):
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	103 """
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	104 Merge manifest m1 with m2 using ancestor ma and generate merge action list
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	105 """
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	106
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	107 action = []
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	108
3108 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	109 # Filter manifests
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	110 if partial:
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	111 for f in m1.keys():
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	112 if not partial(f): del m1[f]
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	113 for f in m2.keys():
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	114 if not partial(f): del m2[f]
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	115
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	116 # Compare manifests
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	117 for f, n in m1.iteritems():
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	118 if f in m2:
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	119 # are files different?
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	120 if n != m2[f]:
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	121 a = ma.get(f, nullid)
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	122 # are both different from the ancestor?
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	123 if not overwrite and n != a and m2[f] != a:
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	124 ui.debug(_(" %s versions differ, resolve\n") % f)
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	125 action.append((f, "m", fmerge(f, m1, m2, ma), n[:20], m2[f]))
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	126 # are we clobbering?
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	127 # is remote's version newer?
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	128 # 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	129 elif overwrite or m2[f] != a or (backwards and not n[20:]):
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	130 ui.debug(_(" remote %s is newer, get\n") % f)
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	131 action.append((f, "g", m2.execf(f), m2[f]))
3114 d1d1cd5b9484 merge: eliminate confusing queued variable Matt Mackall <mpm@selenic.com> parents: 3113 diff changeset	132 # local is newer, not overwrite, check mode bits
d1d1cd5b9484 merge: eliminate confusing queued variable Matt Mackall <mpm@selenic.com> parents: 3113 diff changeset	133 elif m1.execf(f) != m2.execf(f):
d1d1cd5b9484 merge: eliminate confusing queued variable Matt Mackall <mpm@selenic.com> parents: 3113 diff changeset	134 mode = fmerge(f, m1, m2, ma)
d1d1cd5b9484 merge: eliminate confusing queued variable Matt Mackall <mpm@selenic.com> parents: 3113 diff changeset	135 if mode != m1.execf(f):
d1d1cd5b9484 merge: eliminate confusing queued variable Matt Mackall <mpm@selenic.com> parents: 3113 diff changeset	136 ui.debug(_(" updating permissions for %s\n") % f)
d1d1cd5b9484 merge: eliminate confusing queued variable Matt Mackall <mpm@selenic.com> parents: 3113 diff changeset	137 action.append((f, "e", m2.execf(f)))
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	138
3114 d1d1cd5b9484 merge: eliminate confusing queued variable Matt Mackall <mpm@selenic.com> parents: 3113 diff changeset	139 # contents same, check mode bits
d1d1cd5b9484 merge: eliminate confusing queued variable Matt Mackall <mpm@selenic.com> parents: 3113 diff changeset	140 elif m1.execf(f) != m2.execf(f):
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	141 if overwrite:
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	142 ui.debug(_(" updating permissions for %s\n") % f)
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	143 action.append((f, "e", m2.execf(f)))
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	144 else:
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	145 mode = fmerge(f, m1, m2, ma)
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	146 if mode != m1.execf(f):
3114 d1d1cd5b9484 merge: eliminate confusing queued variable Matt Mackall <mpm@selenic.com> parents: 3113 diff changeset	147 ui.debug(_(" updating permissions for %s\n") % f)
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	148 action.append((f, "e", m2.execf(f)))
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	149 del m2[f]
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	150 elif f in ma:
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	151 if n != ma[f]:
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	152 r = _("d")
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	153 if not overwrite:
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	154 r = ui.prompt(
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	155 (_(" local changed %s which remote deleted\n") % f) +
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	156 _("(k)eep or (d)elete?"), _("[kd]"), _("k"))
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	157 if r == _("d"):
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	158 action.append((f, "r"))
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	159 else:
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	160 ui.debug(_("other deleted %s\n") % f)
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	161 action.append((f, "r"))
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	162 else:
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	163 # file is created on branch or in working directory
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	164 if overwrite and n[20:] != "u":
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	165 ui.debug(_("remote deleted %s, clobbering\n") % f)
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	166 action.append((f, "r"))
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	167 elif not n[20:]: # same as parent
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	168 if backwards:
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	169 ui.debug(_("remote deleted %s\n") % f)
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	170 action.append((f, "r"))
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	171 else:
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	172 ui.debug(_("local modified %s, keeping\n") % f)
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	173 else:
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	174 ui.debug(_("working dir created %s, keeping\n") % f)
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	175
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	176 for f, n in m2.iteritems():
3116 bb74f809bc95 merge: reorder tests on m2 items in manifestmerge Matt Mackall <mpm@selenic.com> parents: 3115 diff changeset	177 if f in ma:
3117 920f54a2249e merge: more simplification of m2 manifest scanning Matt Mackall <mpm@selenic.com> parents: 3116 diff changeset	178 if overwrite or backwards:
920f54a2249e merge: more simplification of m2 manifest scanning Matt Mackall <mpm@selenic.com> parents: 3116 diff changeset	179 ui.debug(_("local deleted %s, recreating\n") % f)
920f54a2249e merge: more simplification of m2 manifest scanning Matt Mackall <mpm@selenic.com> parents: 3116 diff changeset	180 action.append((f, "g", m2.execf(f), n))
920f54a2249e merge: more simplification of m2 manifest scanning Matt Mackall <mpm@selenic.com> parents: 3116 diff changeset	181 elif n != ma[f]:
920f54a2249e merge: more simplification of m2 manifest scanning Matt Mackall <mpm@selenic.com> parents: 3116 diff changeset	182 r = ui.prompt(
920f54a2249e merge: more simplification of m2 manifest scanning Matt Mackall <mpm@selenic.com> parents: 3116 diff changeset	183 (_("remote changed %s which local deleted\n") % f) +
920f54a2249e merge: more simplification of m2 manifest scanning Matt Mackall <mpm@selenic.com> parents: 3116 diff changeset	184 _("(k)eep or (d)elete?"), _("[kd]"), _("k"))
3116 bb74f809bc95 merge: reorder tests on m2 items in manifestmerge Matt Mackall <mpm@selenic.com> parents: 3115 diff changeset	185 if r == _("k"):
bb74f809bc95 merge: reorder tests on m2 items in manifestmerge Matt Mackall <mpm@selenic.com> parents: 3115 diff changeset	186 action.append((f, "g", m2.execf(f), n))
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	187 else:
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	188 ui.debug(_("local deleted %s\n") % f)
3116 bb74f809bc95 merge: reorder tests on m2 items in manifestmerge Matt Mackall <mpm@selenic.com> parents: 3115 diff changeset	189 else:
bb74f809bc95 merge: reorder tests on m2 items in manifestmerge Matt Mackall <mpm@selenic.com> parents: 3115 diff changeset	190 ui.debug(_("remote created %s\n") % f)
bb74f809bc95 merge: reorder tests on m2 items in manifestmerge Matt Mackall <mpm@selenic.com> parents: 3115 diff changeset	191 action.append((f, "g", m2.execf(f), n))
3106 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	192
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	193 return action
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3105 diff changeset	194
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	195 def applyupdates(repo, action, xp1, xp2):
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	196 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	197 action.sort()
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	198 for a in action:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	199 f, m = a[:2]
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	200 if f[0] == "/":
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	201 continue
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	202 if m == "r": # remove
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	203 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	204 util.audit_path(f)
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	205 try:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	206 util.unlink(repo.wjoin(f))
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	207 except OSError, inst:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	208 if inst.errno != errno.ENOENT:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	209 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	210 (f, inst.strerror))
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	211 removed +=1
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	212 elif m == "m": # merge
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	213 flag, my, other = a[2:]
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	214 repo.ui.status(_("merging %s\n") % f)
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	215 if merge3(repo, f, my, other, xp1, xp2):
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	216 unresolved += 1
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	217 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	218 merged += 1
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	219 elif m == "g": # get
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	220 flag, node = a[2:]
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	221 repo.ui.note(_("getting %s\n") % f)
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	222 t = repo.file(f).read(node)
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	223 repo.wwrite(f, t)
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	224 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	225 updated += 1
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	226 elif m == "e": # exec
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	227 flag = a[2:]
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	228 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	229
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	230 return updated, merged, removed, unresolved
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	231
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	232 def recordupdates(repo, action, branchmerge):
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	233 for a in action:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	234 f, m = a[:2]
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	235 if m == "r": # remove
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	236 if branchmerge:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	237 repo.dirstate.update([f], 'r')
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	238 else:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	239 repo.dirstate.forget([f])
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	240 elif m == "f": # forget
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	241 repo.dirstate.forget([f])
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	242 elif m == "g": # get
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	243 if branchmerge:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	244 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	245 else:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	246 repo.dirstate.update([f], 'n')
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	247 elif m == "m": # merge
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	248 flag, my, other = a[2:]
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	249 if branchmerge:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	250 # We've done a branch merge, mark this file as merged
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	251 # so that we properly record the merger later
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	252 repo.dirstate.update([f], 'm')
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	253 else:
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	254 # We've update-merged a locally modified file, so
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	255 # we set the dirstate to emulate a normal checkout
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	256 # of that file some time in the past. Thus our
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	257 # merge will appear as a normal local file
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	258 # modification.
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	259 fl = repo.file(f)
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	260 f_len = fl.size(fl.rev(other))
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	261 repo.dirstate.update([f], 'n', st_size=f_len, st_mtime=-1)
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	262
2825 1ea086bc2086 Merge: combine choose and moddirstate to partial Matt Mackall <mpm@selenic.com> parents: 2824 diff changeset	263 def update(repo, node, branchmerge=False, force=False, partial=None,
2829 4870f795f681 Merge: combine force and forcemerge arguments Matt Mackall <mpm@selenic.com> parents: 2828 diff changeset	264 wlock=None, show_stats=True, remind=True):
4870f795f681 Merge: combine force and forcemerge arguments Matt Mackall <mpm@selenic.com> parents: 2828 diff changeset	265
4870f795f681 Merge: combine force and forcemerge arguments Matt Mackall <mpm@selenic.com> parents: 2828 diff changeset	266 overwrite = force and not branchmerge
4870f795f681 Merge: combine force and forcemerge arguments Matt Mackall <mpm@selenic.com> parents: 2828 diff changeset	267 forcemerge = force and branchmerge
2826 3aeab7bb5adc Refactor update locking slightly Matt Mackall <mpm@selenic.com> parents: 2825 diff changeset	268
3aeab7bb5adc Refactor update locking slightly Matt Mackall <mpm@selenic.com> parents: 2825 diff changeset	269 if not wlock:
3aeab7bb5adc Refactor update locking slightly Matt Mackall <mpm@selenic.com> parents: 2825 diff changeset	270 wlock = repo.wlock()
3aeab7bb5adc Refactor update locking slightly Matt Mackall <mpm@selenic.com> parents: 2825 diff changeset	271
2828 0f787997e3c2 Merge: move most tests to the beginning Matt Mackall <mpm@selenic.com> parents: 2827 diff changeset	272 ### check phase
0f787997e3c2 Merge: move most tests to the beginning Matt Mackall <mpm@selenic.com> parents: 2827 diff changeset	273
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	274 pl = repo.dirstate.parents()
2829 4870f795f681 Merge: combine force and forcemerge arguments Matt Mackall <mpm@selenic.com> parents: 2828 diff changeset	275 if not overwrite and pl[1] != nullid:
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	276 raise util.Abort(_("outstanding uncommitted merges"))
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	277
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	278 p1, p2 = pl[0], node
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	279 pa = repo.changelog.ancestor(p1, p2)
2828 0f787997e3c2 Merge: move most tests to the beginning Matt Mackall <mpm@selenic.com> parents: 2827 diff changeset	280
2997 545d33aa3f82 merge: add backwards variable Matt Mackall <mpm@selenic.com> parents: 2919 diff changeset	281 # are we going backwards?
545d33aa3f82 merge: add backwards variable Matt Mackall <mpm@selenic.com> parents: 2919 diff changeset	282 backwards = (pa == p2)
545d33aa3f82 merge: add backwards variable Matt Mackall <mpm@selenic.com> parents: 2919 diff changeset	283
2828 0f787997e3c2 Merge: move most tests to the beginning Matt Mackall <mpm@selenic.com> parents: 2827 diff changeset	284 # is there a linear path from p1 to p2?
3111 40e777bda455 merge: remove linear variable Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	285 if pa == p1 or pa == p2:
40e777bda455 merge: remove linear variable Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	286 if branchmerge:
40e777bda455 merge: remove linear variable Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	287 raise util.Abort(_("there is nothing to merge, just use "
40e777bda455 merge: remove linear variable Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	288 "'hg update' or look at 'hg heads'"))
40e777bda455 merge: remove linear variable Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	289 elif not (overwrite or branchmerge):
2829 4870f795f681 Merge: combine force and forcemerge arguments Matt Mackall <mpm@selenic.com> parents: 2828 diff changeset	290 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	291 "or 'hg update -C' to lose changes"))
0f787997e3c2 Merge: move most tests to the beginning Matt Mackall <mpm@selenic.com> parents: 2827 diff changeset	292
3108 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	293 status = repo.status()
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	294 modified, added, removed, deleted, unknown = status[:5]
2828 0f787997e3c2 Merge: move most tests to the beginning Matt Mackall <mpm@selenic.com> parents: 2827 diff changeset	295 if branchmerge and not forcemerge:
0f787997e3c2 Merge: move most tests to the beginning Matt Mackall <mpm@selenic.com> parents: 2827 diff changeset	296 if modified or added or removed:
0f787997e3c2 Merge: move most tests to the beginning Matt Mackall <mpm@selenic.com> parents: 2827 diff changeset	297 raise util.Abort(_("outstanding uncommitted changes"))
0f787997e3c2 Merge: move most tests to the beginning Matt Mackall <mpm@selenic.com> parents: 2827 diff changeset	298
3095 92a0c2200e41 merge: use context code to retrieve manifests Matt Mackall <mpm@selenic.com> parents: 3007 diff changeset	299 m1 = repo.changectx(p1).manifest().copy()
92a0c2200e41 merge: use context code to retrieve manifests Matt Mackall <mpm@selenic.com> parents: 3007 diff changeset	300 m2 = repo.changectx(p2).manifest().copy()
92a0c2200e41 merge: use context code to retrieve manifests Matt Mackall <mpm@selenic.com> parents: 3007 diff changeset	301 ma = repo.changectx(pa).manifest()
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	302
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	303 # resolve the manifest to determine which files
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	304 # we care about merging
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	305 repo.ui.note(_("resolving manifests\n"))
3111 40e777bda455 merge: remove linear variable Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	306 repo.ui.debug(_(" overwrite %s branchmerge %s partial %s\n") %
40e777bda455 merge: remove linear variable Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	307 (overwrite, branchmerge, bool(partial)))
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	308 repo.ui.debug(_(" ancestor %s local %s remote %s\n") %
3095 92a0c2200e41 merge: use context code to retrieve manifests Matt Mackall <mpm@selenic.com> parents: 3007 diff changeset	309 (short(p1), short(p2), short(pa)))
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	310
3101 87ea5a71f7b9 merge: convert actions to list Matt Mackall <mpm@selenic.com> parents: 3097 diff changeset	311 action = []
3108 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	312 m1 = workingmanifest(repo, m1, status)
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	313
3108 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	314 if not force:
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	315 checkunknown(repo, m2, status)
3111 40e777bda455 merge: remove linear variable Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	316 if not branchmerge:
3108 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	317 action += forgetremoved(m2, status)
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3107 diff changeset	318 action += manifestmerge(repo.ui, m1, m2, ma, overwrite, backwards, partial)
3004 31011730f9bd merge: eliminate mw manifestdict, do everything with m1 Matt Mackall <mpm@selenic.com> parents: 3003 diff changeset	319 del m1, m2, ma
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	320
2917 dd032b0f02ac merge: move forgets to the apply stage Matt Mackall <mpm@selenic.com> parents: 2916 diff changeset	321 ### apply phase
dd032b0f02ac merge: move forgets to the apply stage Matt Mackall <mpm@selenic.com> parents: 2916 diff changeset	322
3111 40e777bda455 merge: remove linear variable Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	323 if not branchmerge:
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	324 # 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	325 p1, p2 = p2, nullid
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	326
3110 62044d161470 merge: simplify hook code Matt Mackall <mpm@selenic.com> parents: 3109 diff changeset	327 xp1, xp2 = hex(p1), hex(p2)
62044d161470 merge: simplify hook code Matt Mackall <mpm@selenic.com> parents: 3109 diff changeset	328 if p2 == nullid: xp2 = ''
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	329
3110 62044d161470 merge: simplify hook code Matt Mackall <mpm@selenic.com> parents: 3109 diff changeset	330 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	331
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	332 updated, merged, removed, unresolved = applyupdates(repo, action, xp1, xp2)
2919 8743188f4d2e merge: consolidate dirstate updates Matt Mackall <mpm@selenic.com> parents: 2918 diff changeset	333
8743188f4d2e merge: consolidate dirstate updates Matt Mackall <mpm@selenic.com> parents: 2918 diff changeset	334 # update dirstate
8743188f4d2e merge: consolidate dirstate updates Matt Mackall <mpm@selenic.com> parents: 2918 diff changeset	335 if not partial:
8743188f4d2e merge: consolidate dirstate updates Matt Mackall <mpm@selenic.com> parents: 2918 diff changeset	336 repo.dirstate.setparents(p1, p2)
3112 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3111 diff changeset	337 recordupdates(repo, action, branchmerge)
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	338
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	339 if show_stats:
3006 87a0332ab58b merge: combine merge and get lists Matt Mackall <mpm@selenic.com> parents: 3005 diff changeset	340 stats = ((updated, _("updated")),
3096 54d85098fb82 merge: make unresolved a counter Matt Mackall <mpm@selenic.com> parents: 3095 diff changeset	341 (merged - unresolved, _("merged")),
3007 962b9c7df641 merge: add remove to the action hash Matt Mackall <mpm@selenic.com> parents: 3006 diff changeset	342 (removed, _("removed")),
3096 54d85098fb82 merge: make unresolved a counter Matt Mackall <mpm@selenic.com> parents: 3095 diff changeset	343 (unresolved, _("unresolved")))
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	344 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	345 repo.ui.status("%s\n" % note)
2825 1ea086bc2086 Merge: combine choose and moddirstate to partial Matt Mackall <mpm@selenic.com> parents: 2824 diff changeset	346 if not partial:
2824 ca06d35af65e Rename merge.allow -> merge.branchmerge Matt Mackall <mpm@selenic.com> parents: 2803 diff changeset	347 if branchmerge:
2827 56f99f5aab34 Merge: refactor err and failedmerge -> unresolved Matt Mackall <mpm@selenic.com> parents: 2826 diff changeset	348 if unresolved:
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	349 repo.ui.status(_("There are unresolved merges,"
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	350 " you can redo the full merge using:\n"
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	351 " hg update -C %s\n"
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	352 " hg merge %s\n"
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	353 % (repo.changelog.rev(p1),
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	354 repo.changelog.rev(p2))))
2803 987c31e2a08c Merge with crew Matt Mackall <mpm@selenic.com> parents: 2799 diff changeset	355 elif remind:
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	356 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	357 elif unresolved:
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	358 repo.ui.status(_("There are unresolved merges with"
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	359 " locally modified files.\n"))
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	360
3110 62044d161470 merge: simplify hook code Matt Mackall <mpm@selenic.com> parents: 3109 diff changeset	361 repo.hook('update', parent1=xp1, parent2=xp2, error=unresolved)
3096 54d85098fb82 merge: make unresolved a counter Matt Mackall <mpm@selenic.com> parents: 3095 diff changeset	362 return unresolved
2799 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	363

Mercurial > hg > mercurial-crew-with-dirclash

annotate mercurial/merge.py @ 3117:920f54a2249e