merge.py
339 lines
| 11.9 KiB
| text/x-python
|
PythonLexer
/ mercurial / merge.py
Matt Mackall
|
r2775 | # merge.py - directory-level update/merge handling for Mercurial | ||
# | ||||
# Copyright 2006 Matt Mackall <mpm@selenic.com> | ||||
# | ||||
# This software may be used and distributed according to the terms | ||||
# of the GNU General Public License, incorporated herein by reference. | ||||
from node import * | ||||
from i18n import gettext as _ | ||||
from demandload import * | ||||
demandload(globals(), "util os tempfile") | ||||
Matt Mackall
|
r2892 | def fmerge(f, local, other, ancestor): | ||
"""merge executable flags""" | ||||
a, b, c = ancestor.execf(f), local.execf(f), other.execf(f) | ||||
return ((a^b) | (a^c)) ^ a | ||||
Matt Mackall
|
r2775 | def merge3(repo, fn, my, other, p1, p2): | ||
"""perform a 3-way merge in the working directory""" | ||||
def temp(prefix, node): | ||||
pre = "%s~%s." % (os.path.basename(fn), prefix) | ||||
(fd, name) = tempfile.mkstemp(prefix=pre) | ||||
f = os.fdopen(fd, "wb") | ||||
repo.wwrite(fn, fl.read(node), f) | ||||
f.close() | ||||
return name | ||||
fl = repo.file(fn) | ||||
base = fl.ancestor(my, other) | ||||
a = repo.wjoin(fn) | ||||
b = temp("base", base) | ||||
c = temp("other", other) | ||||
repo.ui.note(_("resolving %s\n") % fn) | ||||
repo.ui.debug(_("file %s: my %s other %s ancestor %s\n") % | ||||
(fn, short(my), short(other), short(base))) | ||||
cmd = (os.environ.get("HGMERGE") or repo.ui.config("ui", "merge") | ||||
or "hgmerge") | ||||
r = util.system('%s "%s" "%s" "%s"' % (cmd, a, b, c), cwd=repo.root, | ||||
environ={'HG_FILE': fn, | ||||
'HG_MY_NODE': p1, | ||||
'HG_OTHER_NODE': p2, | ||||
'HG_FILE_MY_NODE': hex(my), | ||||
'HG_FILE_OTHER_NODE': hex(other), | ||||
'HG_FILE_BASE_NODE': hex(base)}) | ||||
if r: | ||||
repo.ui.warn(_("merging %s failed!\n") % fn) | ||||
os.unlink(b) | ||||
os.unlink(c) | ||||
return r | ||||
Matt Mackall
|
r2811 | def update(repo, node, branchmerge=False, force=False, partial=None, | ||
Matt Mackall
|
r2815 | wlock=None, show_stats=True, remind=True): | ||
overwrite = force and not branchmerge | ||||
forcemerge = force and branchmerge | ||||
Matt Mackall
|
r2812 | |||
if not wlock: | ||||
wlock = repo.wlock() | ||||
Matt Mackall
|
r2814 | ### check phase | ||
Matt Mackall
|
r2775 | pl = repo.dirstate.parents() | ||
Matt Mackall
|
r2815 | if not overwrite and pl[1] != nullid: | ||
Matt Mackall
|
r2775 | raise util.Abort(_("outstanding uncommitted merges")) | ||
p1, p2 = pl[0], node | ||||
pa = repo.changelog.ancestor(p1, p2) | ||||
Matt Mackall
|
r2814 | |||
# is there a linear path from p1 to p2? | ||||
linear_path = (pa == p1 or pa == p2) | ||||
if branchmerge and linear_path: | ||||
raise util.Abort(_("there is nothing to merge, just use " | ||||
"'hg update' or look at 'hg heads'")) | ||||
Matt Mackall
|
r2815 | if not overwrite and not linear_path and not branchmerge: | ||
raise util.Abort(_("update spans branches, use 'hg merge' " | ||||
Matt Mackall
|
r2814 | "or 'hg update -C' to lose changes")) | ||
Vadim Gelfer
|
r2875 | modified, added, removed, deleted, unknown = repo.status()[:5] | ||
Matt Mackall
|
r2814 | if branchmerge and not forcemerge: | ||
if modified or added or removed: | ||||
raise util.Abort(_("outstanding uncommitted changes")) | ||||
Matt Mackall
|
r2775 | m1n = repo.changelog.read(p1)[0] | ||
m2n = repo.changelog.read(p2)[0] | ||||
man = repo.manifest.ancestor(m1n, m2n) | ||||
m1 = repo.manifest.read(m1n) | ||||
m2 = repo.manifest.read(m2n).copy() | ||||
ma = repo.manifest.read(man) | ||||
Matt Mackall
|
r2842 | if not force: | ||
Matt Mackall
|
r2775 | for f in unknown: | ||
if f in m2: | ||||
Matt Mackall
|
r2891 | if repo.file(f).cmp(m2[f], repo.wread(f)): | ||
Matt Mackall
|
r2775 | raise util.Abort(_("'%s' already exists in the working" | ||
" dir and differs from remote") % f) | ||||
# resolve the manifest to determine which files | ||||
# we care about merging | ||||
repo.ui.note(_("resolving manifests\n")) | ||||
Matt Mackall
|
r2815 | repo.ui.debug(_(" overwrite %s branchmerge %s partial %s linear %s\n") % | ||
Matt Mackall
|
r2896 | (overwrite, branchmerge, bool(partial), linear_path)) | ||
Matt Mackall
|
r2775 | repo.ui.debug(_(" ancestor %s local %s remote %s\n") % | ||
(short(man), short(m1n), short(m2n))) | ||||
merge = {} | ||||
get = {} | ||||
remove = [] | ||||
Matt Mackall
|
r2897 | forget = [] | ||
Matt Mackall
|
r2775 | |||
# construct a working dir manifest | ||||
mw = m1.copy() | ||||
umap = dict.fromkeys(unknown) | ||||
for f in added + modified + unknown: | ||||
Matt Mackall
|
r2894 | mw[f] = "" | ||
# is the wfile new and matches m2? | ||||
if (f not in m1 and f in m2 and | ||||
not repo.file(f).cmp(m2[f], repo.wread(f))): | ||||
mw[f] = m2[f] | ||||
Matt Mackall
|
r2838 | mw.set(f, util.is_exec(repo.wjoin(f), mw.execf(f))) | ||
Matt Mackall
|
r2775 | |||
for f in deleted + removed: | ||||
if f in mw: | ||||
del mw[f] | ||||
# If we're jumping between revisions (as opposed to merging), | ||||
# and if neither the working directory nor the target rev has | ||||
# the file, then we need to remove it from the dirstate, to | ||||
# prevent the dirstate from listing the file when it is no | ||||
# longer in the manifest. | ||||
Matt Mackall
|
r2897 | if linear_path and f not in m2: | ||
forget.append(f) | ||||
Matt Mackall
|
r2775 | |||
# Compare manifests | ||||
for f, n in mw.iteritems(): | ||||
Matt Mackall
|
r2811 | if partial and not partial(f): | ||
Matt Mackall
|
r2775 | continue | ||
if f in m2: | ||||
s = 0 | ||||
# are files different? | ||||
if n != m2[f]: | ||||
a = ma.get(f, nullid) | ||||
# are both different from the ancestor? | ||||
if n != a and m2[f] != a: | ||||
repo.ui.debug(_(" %s versions differ, resolve\n") % f) | ||||
Matt Mackall
|
r2892 | merge[f] = (fmerge(f, mw, m2, ma), m1.get(f, nullid), m2[f]) | ||
Matt Mackall
|
r2775 | s = 1 | ||
# are we clobbering? | ||||
# is remote's version newer? | ||||
# or are we going back in time? | ||||
Matt Mackall
|
r2815 | elif overwrite or m2[f] != a or (p2 == pa and mw[f] == m1[f]): | ||
Matt Mackall
|
r2775 | repo.ui.debug(_(" remote %s is newer, get\n") % f) | ||
Matt Mackall
|
r2837 | get[f] = (m2.execf(f), m2[f]) | ||
Matt Mackall
|
r2775 | s = 1 | ||
elif f in umap or f in added: | ||||
# this unknown file is the same as the checkout | ||||
# we need to reset the dirstate if the file was added | ||||
Matt Mackall
|
r2837 | get[f] = (m2.execf(f), m2[f]) | ||
Matt Mackall
|
r2775 | |||
Matt Mackall
|
r2838 | if not s and mw.execf(f) != m2.execf(f): | ||
Matt Mackall
|
r2815 | if overwrite: | ||
Matt Mackall
|
r2775 | repo.ui.debug(_(" updating permissions for %s\n") % f) | ||
Matt Mackall
|
r2838 | util.set_exec(repo.wjoin(f), m2.execf(f)) | ||
Matt Mackall
|
r2775 | else: | ||
Matt Mackall
|
r2892 | if fmerge(f, mw, m2, ma) != mw.execf(f): | ||
Matt Mackall
|
r2775 | repo.ui.debug(_(" updating permissions for %s\n") | ||
% f) | ||||
util.set_exec(repo.wjoin(f), mode) | ||||
del m2[f] | ||||
elif f in ma: | ||||
if n != ma[f]: | ||||
r = _("d") | ||||
Matt Mackall
|
r2815 | if not overwrite and (linear_path or branchmerge): | ||
Matt Mackall
|
r2775 | r = repo.ui.prompt( | ||
(_(" local changed %s which remote deleted\n") % f) + | ||||
_("(k)eep or (d)elete?"), _("[kd]"), _("k")) | ||||
if r == _("d"): | ||||
remove.append(f) | ||||
else: | ||||
repo.ui.debug(_("other deleted %s\n") % f) | ||||
remove.append(f) # other deleted it | ||||
else: | ||||
# file is created on branch or in working directory | ||||
Matt Mackall
|
r2815 | if overwrite and f not in umap: | ||
Matt Mackall
|
r2775 | repo.ui.debug(_("remote deleted %s, clobbering\n") % f) | ||
remove.append(f) | ||||
elif n == m1.get(f, nullid): # same as parent | ||||
if p2 == pa: # going backwards? | ||||
repo.ui.debug(_("remote deleted %s\n") % f) | ||||
remove.append(f) | ||||
else: | ||||
repo.ui.debug(_("local modified %s, keeping\n") % f) | ||||
else: | ||||
repo.ui.debug(_("working dir created %s, keeping\n") % f) | ||||
for f, n in m2.iteritems(): | ||||
Matt Mackall
|
r2811 | if partial and not partial(f): | ||
Matt Mackall
|
r2775 | continue | ||
if f[0] == "/": | ||||
continue | ||||
if f in ma and n != ma[f]: | ||||
r = _("k") | ||||
Matt Mackall
|
r2815 | if not overwrite and (linear_path or branchmerge): | ||
Matt Mackall
|
r2775 | r = repo.ui.prompt( | ||
(_("remote changed %s which local deleted\n") % f) + | ||||
_("(k)eep or (d)elete?"), _("[kd]"), _("k")) | ||||
if r == _("k"): | ||||
Matt Mackall
|
r2837 | get[f] = (m2.execf(f), n) | ||
Matt Mackall
|
r2775 | elif f not in ma: | ||
repo.ui.debug(_("remote created %s\n") % f) | ||||
Matt Mackall
|
r2837 | get[f] = (m2.execf(f), n) | ||
Matt Mackall
|
r2775 | else: | ||
Matt Mackall
|
r2815 | if overwrite or p2 == pa: # going backwards? | ||
Matt Mackall
|
r2775 | repo.ui.debug(_("local deleted %s, recreating\n") % f) | ||
Matt Mackall
|
r2837 | get[f] = (m2.execf(f), n) | ||
Matt Mackall
|
r2775 | else: | ||
repo.ui.debug(_("local deleted %s\n") % f) | ||||
del mw, m1, m2, ma | ||||
Matt Mackall
|
r2897 | ### apply phase | ||
Matt Mackall
|
r2815 | if overwrite: | ||
Matt Mackall
|
r2775 | for f in merge: | ||
Matt Mackall
|
r2837 | get[f] = merge[f][:2] | ||
Matt Mackall
|
r2775 | merge = {} | ||
Matt Mackall
|
r2815 | if linear_path or overwrite: | ||
Matt Mackall
|
r2775 | # we don't need to do any magic, just jump to the new rev | ||
p1, p2 = p2, nullid | ||||
xp1 = hex(p1) | ||||
xp2 = hex(p2) | ||||
if p2 == nullid: xxp2 = '' | ||||
else: xxp2 = xp2 | ||||
repo.hook('preupdate', throw=True, parent1=xp1, parent2=xxp2) | ||||
# get the files we don't need to change | ||||
files = get.keys() | ||||
files.sort() | ||||
for f in files: | ||||
Matt Mackall
|
r2837 | flag, node = get[f] | ||
Matt Mackall
|
r2775 | if f[0] == "/": | ||
continue | ||||
repo.ui.note(_("getting %s\n") % f) | ||||
Matt Mackall
|
r2837 | t = repo.file(f).read(node) | ||
Matt Mackall
|
r2775 | repo.wwrite(f, t) | ||
Matt Mackall
|
r2837 | util.set_exec(repo.wjoin(f), flag) | ||
Matt Mackall
|
r2775 | |||
# merge the tricky bits | ||||
Matt Mackall
|
r2813 | unresolved = [] | ||
Matt Mackall
|
r2775 | files = merge.keys() | ||
files.sort() | ||||
for f in files: | ||||
repo.ui.status(_("merging %s\n") % f) | ||||
Matt Mackall
|
r2837 | flag, my, other = merge[f] | ||
Matt Mackall
|
r2775 | ret = merge3(repo, f, my, other, xp1, xp2) | ||
if ret: | ||||
Matt Mackall
|
r2813 | unresolved.append(f) | ||
Matt Mackall
|
r2775 | util.set_exec(repo.wjoin(f), flag) | ||
Matt Mackall
|
r2899 | |||
remove.sort() | ||||
for f in remove: | ||||
repo.ui.note(_("removing %s\n") % f) | ||||
util.audit_path(f) | ||||
try: | ||||
util.unlink(repo.wjoin(f)) | ||||
except OSError, inst: | ||||
if inst.errno != errno.ENOENT: | ||||
repo.ui.warn(_("update failed to remove %s: %s!\n") % | ||||
(f, inst.strerror)) | ||||
# update dirstate | ||||
if not partial: | ||||
repo.dirstate.setparents(p1, p2) | ||||
repo.dirstate.forget(forget) | ||||
if branchmerge: | ||||
repo.dirstate.update(remove, 'r') | ||||
else: | ||||
repo.dirstate.forget(remove) | ||||
files = get.keys() | ||||
files.sort() | ||||
for f in files: | ||||
if branchmerge: | ||||
repo.dirstate.update([f], 'n', st_mtime=-1) | ||||
else: | ||||
repo.dirstate.update([f], 'n') | ||||
files = merge.keys() | ||||
files.sort() | ||||
for f in files: | ||||
Matt Mackall
|
r2810 | if branchmerge: | ||
Matt Mackall
|
r2775 | # We've done a branch merge, mark this file as merged | ||
# so that we properly record the merger later | ||||
repo.dirstate.update([f], 'm') | ||||
else: | ||||
# We've update-merged a locally modified file, so | ||||
# we set the dirstate to emulate a normal checkout | ||||
# of that file some time in the past. Thus our | ||||
# merge will appear as a normal local file | ||||
# modification. | ||||
Matt Mackall
|
r2898 | fl = repo.file(f) | ||
f_len = fl.size(fl.rev(other)) | ||||
Matt Mackall
|
r2775 | repo.dirstate.update([f], 'n', st_size=f_len, st_mtime=-1) | ||
if show_stats: | ||||
stats = ((len(get), _("updated")), | ||||
Matt Mackall
|
r2813 | (len(merge) - len(unresolved), _("merged")), | ||
Matt Mackall
|
r2775 | (len(remove), _("removed")), | ||
Matt Mackall
|
r2813 | (len(unresolved), _("unresolved"))) | ||
Matt Mackall
|
r2775 | note = ", ".join([_("%d files %s") % s for s in stats]) | ||
repo.ui.status("%s\n" % note) | ||||
Matt Mackall
|
r2811 | if not partial: | ||
Matt Mackall
|
r2810 | if branchmerge: | ||
Matt Mackall
|
r2813 | if unresolved: | ||
Matt Mackall
|
r2775 | repo.ui.status(_("There are unresolved merges," | ||
" you can redo the full merge using:\n" | ||||
" hg update -C %s\n" | ||||
" hg merge %s\n" | ||||
% (repo.changelog.rev(p1), | ||||
repo.changelog.rev(p2)))) | ||||
Matt Mackall
|
r2803 | elif remind: | ||
Matt Mackall
|
r2775 | repo.ui.status(_("(branch merge, don't forget to commit)\n")) | ||
Matt Mackall
|
r2813 | elif unresolved: | ||
Matt Mackall
|
r2775 | repo.ui.status(_("There are unresolved merges with" | ||
" locally modified files.\n")) | ||||
Matt Mackall
|
r2813 | repo.hook('update', parent1=xp1, parent2=xxp2, error=len(unresolved)) | ||
return len(unresolved) | ||||
Matt Mackall
|
r2775 | |||