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

annotate mercurial/merge.py @ 19929:ab2362e1672e

merge: exit early during a no-op update (BC) hg update . (or equivalents) are effectively no-ops in just about all circumstances. These sorts of updates can be especially common in a bookmark-oriented workflow. This saves us a status check and a manifest decompression, which means that on a repo with over 210,000 files, this brings hg update . down from 2.5 seconds to 0.15. There is one change in behavior: a file that was added, not committed, and then deleted but not removed used to be removed from the dirstate. With this patch it isn't. This is what causes the change in test-mq-qpush-exact.t. This seems like it's enough of an edge case to not be worth handling. The output of test-empty.t changes because those files are not yet created.

author	Siddharth Agarwal <sid0@fb.com>
date	Tue, 01 Oct 2013 17:43:54 -0700
parents	0f64af33fb63
children	d51c4d85ec23

rev	line source
2775 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	1 # merge.py - directory-level update/merge handling for Mercurial
b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	2 #
4635 63b9d2deed48 Updated copyright notices and add "and others" to "hg version" Thomas Arendsen Hein <thomas@intevation.de> parents: 4633 diff changeset	3 # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>
2775 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	4 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8152 diff changeset	5 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 9783 diff changeset	6 # GNU General Public License version 2 or any later version.
2775 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	7
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	8 from node import nullid, nullrev, hex, bin
3891 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3877 diff changeset	9 from i18n import _
18985 a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	10 from mercurial import obsolete
18822 381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	11 import error, util, filemerge, copies, subrepo, worker, dicthelpers
8312 b87a50b7125c separate import lines from mercurial and general python modules Simon Heimberg <simohe@besonet.ch> parents: 8259 diff changeset	12 import errno, os, shutil
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	13
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	14 class mergestate(object):
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	15 '''track 3-way merge state of individual files'''
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	16 def __init__(self, repo):
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	17 self._repo = repo
12369 6f0d9d79111f merge: delay writing the mergestate during until commit is called Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12279 diff changeset	18 self._dirty = False
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	19 self._read()
7848 89e05c02a4af resolve: move reset to localrepo.commit Matt Mackall <mpm@selenic.com> parents: 7768 diff changeset	20 def reset(self, node=None):
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	21 self._state = {}
7848 89e05c02a4af resolve: move reset to localrepo.commit Matt Mackall <mpm@selenic.com> parents: 7768 diff changeset	22 if node:
89e05c02a4af resolve: move reset to localrepo.commit Matt Mackall <mpm@selenic.com> parents: 7768 diff changeset	23 self._local = node
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	24 shutil.rmtree(self._repo.join("merge"), True)
12369 6f0d9d79111f merge: delay writing the mergestate during until commit is called Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12279 diff changeset	25 self._dirty = False
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	26 def _read(self):
92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	27 self._state = {}
92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	28 try:
92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	29 f = self._repo.opener("merge/state")
6530 4b92591c69a7 merge: replace readline() call, missing from posixfile_nt Patrick Mezard <pmezard@gmail.com> parents: 6518 diff changeset	30 for i, l in enumerate(f):
4b92591c69a7 merge: replace readline() call, missing from posixfile_nt Patrick Mezard <pmezard@gmail.com> parents: 6518 diff changeset	31 if i == 0:
11451 51021f4c80b5 resolve: do not crash on empty mergestate Martin Geisler <mg@lazybytes.net> parents: 11417 diff changeset	32 self._local = bin(l[:-1])
6530 4b92591c69a7 merge: replace readline() call, missing from posixfile_nt Patrick Mezard <pmezard@gmail.com> parents: 6518 diff changeset	33 else:
4b92591c69a7 merge: replace readline() call, missing from posixfile_nt Patrick Mezard <pmezard@gmail.com> parents: 6518 diff changeset	34 bits = l[:-1].split("\0")
4b92591c69a7 merge: replace readline() call, missing from posixfile_nt Patrick Mezard <pmezard@gmail.com> parents: 6518 diff changeset	35 self._state[bits[0]] = bits[1:]
13400 14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13323 diff changeset	36 f.close()
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	37 except IOError, err:
92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	38 if err.errno != errno.ENOENT:
92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	39 raise
12369 6f0d9d79111f merge: delay writing the mergestate during until commit is called Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12279 diff changeset	40 self._dirty = False
6f0d9d79111f merge: delay writing the mergestate during until commit is called Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12279 diff changeset	41 def commit(self):
6f0d9d79111f merge: delay writing the mergestate during until commit is called Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12279 diff changeset	42 if self._dirty:
6f0d9d79111f merge: delay writing the mergestate during until commit is called Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12279 diff changeset	43 f = self._repo.opener("merge/state", "w")
6f0d9d79111f merge: delay writing the mergestate during until commit is called Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12279 diff changeset	44 f.write(hex(self._local) + "\n")
6f0d9d79111f merge: delay writing the mergestate during until commit is called Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12279 diff changeset	45 for d, v in self._state.iteritems():
6f0d9d79111f merge: delay writing the mergestate during until commit is called Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12279 diff changeset	46 f.write("\0".join([d] + v) + "\n")
13400 14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13323 diff changeset	47 f.close()
12369 6f0d9d79111f merge: delay writing the mergestate during until commit is called Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12279 diff changeset	48 self._dirty = False
18338 384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	49 def add(self, fcl, fco, fca, fd):
6517 fcfb6a0a0a84 python-2.6: use sha wrapper from util for new merge code Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6512 diff changeset	50 hash = util.sha1(fcl.path()).hexdigest()
14168 135e244776f0 prevent transient leaks of file handle by using new helper functions Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 14064 diff changeset	51 self._repo.opener.write("merge/" + hash, fcl.data())
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	52 self._state[fd] = ['u', hash, fcl.path(), fca.path(),
18338 384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	53 hex(fca.filenode()), fco.path(), fcl.flags()]
12369 6f0d9d79111f merge: delay writing the mergestate during until commit is called Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12279 diff changeset	54 self._dirty = True
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	55 def __contains__(self, dfile):
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	56 return dfile in self._state
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	57 def __getitem__(self, dfile):
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	58 return self._state[dfile][0]
92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	59 def __iter__(self):
92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	60 l = self._state.keys()
92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	61 l.sort()
92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	62 for f in l:
92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	63 yield f
19285 feaf5749d7a4 merge: add a files method to the mergestate class Bryan O'Sullivan <bryano@fb.com> parents: 19226 diff changeset	64 def files(self):
feaf5749d7a4 merge: add a files method to the mergestate class Bryan O'Sullivan <bryano@fb.com> parents: 19226 diff changeset	65 return self._state.keys()
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	66 def mark(self, dfile, state):
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	67 self._state[dfile][0] = state
12369 6f0d9d79111f merge: delay writing the mergestate during until commit is called Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12279 diff changeset	68 self._dirty = True
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	69 def resolve(self, dfile, wctx, octx):
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	70 if self[dfile] == 'r':
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	71 return 0
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	72 state, hash, lfile, afile, anode, ofile, flags = self._state[dfile]
18338 384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	73 fcd = wctx[dfile]
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	74 fco = octx[ofile]
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	75 fca = self._repo.filectx(afile, fileid=anode)
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	76 # "premerge" x flags
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	77 flo = fco.flags()
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	78 fla = fca.flags()
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	79 if 'x' in flags + flo + fla and 'l' not in flags + flo + fla:
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	80 if fca.node() == nullid:
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	81 self._repo.ui.warn(_('warning: cannot merge flags for %s\n') %
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	82 afile)
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	83 elif flags == fla:
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	84 flags = flo
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	85 # restore local
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	86 f = self._repo.opener("merge/" + hash)
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	87 self._repo.wwrite(dfile, f.read(), flags)
13400 14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13323 diff changeset	88 f.close()
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	89 r = filemerge.filemerge(self._repo, self._local, lfile, fcd, fco, fca)
13536 fac040b7e822 merge: drop resolve state for mergers with identical contents (issue2680) Matt Mackall <mpm@selenic.com> parents: 13437 diff changeset	90 if r is None:
fac040b7e822 merge: drop resolve state for mergers with identical contents (issue2680) Matt Mackall <mpm@selenic.com> parents: 13437 diff changeset	91 # no real conflict
fac040b7e822 merge: drop resolve state for mergers with identical contents (issue2680) Matt Mackall <mpm@selenic.com> parents: 13437 diff changeset	92 del self._state[dfile]
fac040b7e822 merge: drop resolve state for mergers with identical contents (issue2680) Matt Mackall <mpm@selenic.com> parents: 13437 diff changeset	93 elif not r:
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	94 self.mark(dfile, 'r')
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	95 return r
2775 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	96
16093 7e30f5f2285f merge: refactor unknown file conflict checking Matt Mackall <mpm@selenic.com> parents: 16092 diff changeset	97 def _checkunknownfile(repo, wctx, mctx, f):
7e30f5f2285f merge: refactor unknown file conflict checking Matt Mackall <mpm@selenic.com> parents: 16092 diff changeset	98 return (not repo.dirstate._ignore(f)
16534 11212babc690 merge: check for untracked files more precisely (issue3400) Matt Mackall <mpm@selenic.com> parents: 16492 diff changeset	99 and os.path.isfile(repo.wjoin(f))
19157 113681bbef9e manifestmerge: local unknown, remote created: don't traverse symlinks Siddharth Agarwal <sid0@fb.com> parents: 19105 diff changeset	100 and repo.wopener.audit.check(f)
16284 2b0a406d3043 merge: fix unknown file merge detection for case-folding systems Matt Mackall <mpm@selenic.com> parents: 16261 diff changeset	101 and repo.dirstate.normalize(f) not in repo.dirstate
16093 7e30f5f2285f merge: refactor unknown file conflict checking Matt Mackall <mpm@selenic.com> parents: 16092 diff changeset	102 and mctx[f].cmp(wctx[f]))
7e30f5f2285f merge: refactor unknown file conflict checking Matt Mackall <mpm@selenic.com> parents: 16092 diff changeset	103
7e30f5f2285f merge: refactor unknown file conflict checking Matt Mackall <mpm@selenic.com> parents: 16092 diff changeset	104 def _checkunknown(repo, wctx, mctx):
3315 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	105 "check for collisions between unknown files and files in mctx"
15894 44fa047cef57 merge: report all files in _checkunknown Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 15774 diff changeset	106
44fa047cef57 merge: report all files in _checkunknown Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 15774 diff changeset	107 error = False
16093 7e30f5f2285f merge: refactor unknown file conflict checking Matt Mackall <mpm@selenic.com> parents: 16092 diff changeset	108 for f in mctx:
7e30f5f2285f merge: refactor unknown file conflict checking Matt Mackall <mpm@selenic.com> parents: 16092 diff changeset	109 if f not in wctx and _checkunknownfile(repo, wctx, mctx, f):
15894 44fa047cef57 merge: report all files in _checkunknown Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 15774 diff changeset	110 error = True
16093 7e30f5f2285f merge: refactor unknown file conflict checking Matt Mackall <mpm@selenic.com> parents: 16092 diff changeset	111 wctx._repo.ui.warn(_("%s: untracked file differs\n") % f)
15894 44fa047cef57 merge: report all files in _checkunknown Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 15774 diff changeset	112 if error:
44fa047cef57 merge: report all files in _checkunknown Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 15774 diff changeset	113 raise util.Abort(_("untracked files in working directory differ "
44fa047cef57 merge: report all files in _checkunknown Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 15774 diff changeset	114 "from files in requested revision"))
3107 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	115
6269 ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	116 def _forgetremoved(wctx, mctx, branchmerge):
3107 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	117 """
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	118 Forget removed files
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	119
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	120 If we're jumping between revisions (as opposed to merging), and if
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	121 neither the working directory nor the target rev has the file,
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	122 then we need to remove it from the dirstate, to prevent the
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	123 dirstate from listing the file when it is no longer in the
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	124 manifest.
6242 a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	125
a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	126 If we're merging, and the other revision has removed a file
a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	127 that is not present in the working directory, we need to mark it
a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	128 as removed.
3107 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	129 """
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	130
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	131 actions = []
6242 a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	132 state = branchmerge and 'r' or 'f'
a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	133 for f in wctx.deleted():
6272 dd9bd227ae9a merge: simplify some helpers Matt Mackall <mpm@selenic.com> parents: 6271 diff changeset	134 if f not in mctx:
18541 5ed6a375e9ca merge: delay debug messages for merge actions Mads Kiilerich <madski@unity3d.com> parents: 18540 diff changeset	135 actions.append((f, state, None, "forget deleted"))
6242 a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	136
a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	137 if not branchmerge:
a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	138 for f in wctx.removed():
6272 dd9bd227ae9a merge: simplify some helpers Matt Mackall <mpm@selenic.com> parents: 6271 diff changeset	139 if f not in mctx:
18541 5ed6a375e9ca merge: delay debug messages for merge actions Mads Kiilerich <madski@unity3d.com> parents: 18540 diff changeset	140 actions.append((f, "f", None, "forget removed"))
3107 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	141
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	142 return actions
3107 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	143
19105 c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	144 def _checkcollision(repo, wmf, actions, prompts):
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	145 # build provisional merged manifest up
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	146 pmmf = set(wmf)
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	147
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	148 def addop(f, args):
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	149 pmmf.add(f)
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	150 def removeop(f, args):
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	151 pmmf.discard(f)
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	152 def nop(f, args):
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	153 pass
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	154
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	155 def renameop(f, args):
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	156 f2, fd, flags = args
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	157 if f:
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	158 pmmf.discard(f)
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	159 pmmf.add(fd)
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	160 def mergeop(f, args):
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	161 f2, fd, move = args
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	162 if move:
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	163 pmmf.discard(f)
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	164 pmmf.add(fd)
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	165
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	166 opmap = {
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	167 "a": addop,
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	168 "d": renameop,
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	169 "dr": nop,
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	170 "e": nop,
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	171 "f": addop, # untracked file should be kept in working directory
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	172 "g": addop,
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	173 "m": mergeop,
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	174 "r": removeop,
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	175 "rd": nop,
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	176 }
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	177 for f, m, args, msg in actions:
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	178 op = opmap.get(m)
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	179 assert op, m
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	180 op(f, args)
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	181
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	182 opmap = {
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	183 "cd": addop,
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	184 "dc": addop,
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	185 }
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	186 for f, m in prompts:
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	187 op = opmap.get(m)
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	188 assert op, m
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	189 op(f, None)
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	190
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	191 # check case-folding collision in provisional merged manifest
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	192 foldmap = {}
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	193 for f in sorted(pmmf):
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	194 fold = util.normcase(f)
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	195 if fold in foldmap:
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	196 raise util.Abort(_("case-folding collision between %s and %s")
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	197 % (f, foldmap[fold]))
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	198 foldmap[fold] = f
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	199
18778 1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	200 def manifestmerge(repo, wctx, p2, pa, branchmerge, force, partial,
1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	201 acceptremote=False):
3105 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	202 """
11817 d12fe809e1ee merge: fix typo in docstring Alecs King <alecsk@gmail.com> parents: 11759 diff changeset	203 Merge p1 and p2 with ancestor pa and generate merge action list
3315 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	204
18605 bcf29565d89f manifestmerge: pass in branchmerge and force separately Siddharth Agarwal <sid0@fb.com> parents: 18544 diff changeset	205 branchmerge and force are as passed in to update
3315 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	206 partial = function to filter file lists
18778 1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	207 acceptremote = accept the incoming changes without prompting
3105 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	208 """
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	209
18605 bcf29565d89f manifestmerge: pass in branchmerge and force separately Siddharth Agarwal <sid0@fb.com> parents: 18544 diff changeset	210 overwrite = force and not branchmerge
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	211 actions, copy, movewithdir = [], {}, {}
8753 af5f099d932b merge: refactor manifestmerge init to better report effective ancestor Matt Mackall <mpm@selenic.com> parents: 8752 diff changeset	212
18651 e556659340f0 manifestmerge: fix order in which manifests are fetched Siddharth Agarwal <sid0@fb.com> parents: 18650 diff changeset	213 followcopies = False
8749 69caf50da4a0 merge: refactor some initialization, drop backwards var Matt Mackall <mpm@selenic.com> parents: 8748 diff changeset	214 if overwrite:
18611 18c2184c27dc merge: rename p1 to wctx in manifestmerge Bryan O'Sullivan <bryano@fb.com> parents: 18606 diff changeset	215 pa = wctx
8753 af5f099d932b merge: refactor manifestmerge init to better report effective ancestor Matt Mackall <mpm@selenic.com> parents: 8752 diff changeset	216 elif pa == p2: # backwards
18611 18c2184c27dc merge: rename p1 to wctx in manifestmerge Bryan O'Sullivan <bryano@fb.com> parents: 18606 diff changeset	217 pa = wctx.p1()
18612 0b6e6eacc939 merge: don't call copies.mergecopies unless we need to Bryan O'Sullivan <bryano@fb.com> parents: 18611 diff changeset	218 elif not branchmerge and not wctx.dirty(missing=True):
0b6e6eacc939 merge: don't call copies.mergecopies unless we need to Bryan O'Sullivan <bryano@fb.com> parents: 18611 diff changeset	219 pass
8753 af5f099d932b merge: refactor manifestmerge init to better report effective ancestor Matt Mackall <mpm@selenic.com> parents: 8752 diff changeset	220 elif pa and repo.ui.configbool("merge", "followcopies", True):
18651 e556659340f0 manifestmerge: fix order in which manifests are fetched Siddharth Agarwal <sid0@fb.com> parents: 18650 diff changeset	221 followcopies = True
e556659340f0 manifestmerge: fix order in which manifests are fetched Siddharth Agarwal <sid0@fb.com> parents: 18650 diff changeset	222
e556659340f0 manifestmerge: fix order in which manifests are fetched Siddharth Agarwal <sid0@fb.com> parents: 18650 diff changeset	223 # manifests fetched in order are going to be faster, so prime the caches
e556659340f0 manifestmerge: fix order in which manifests are fetched Siddharth Agarwal <sid0@fb.com> parents: 18650 diff changeset	224 [x.manifest() for x in
e556659340f0 manifestmerge: fix order in which manifests are fetched Siddharth Agarwal <sid0@fb.com> parents: 18650 diff changeset	225 sorted(wctx.parents() + [p2, pa], key=lambda x: x.rev())]
e556659340f0 manifestmerge: fix order in which manifests are fetched Siddharth Agarwal <sid0@fb.com> parents: 18650 diff changeset	226
e556659340f0 manifestmerge: fix order in which manifests are fetched Siddharth Agarwal <sid0@fb.com> parents: 18650 diff changeset	227 if followcopies:
18611 18c2184c27dc merge: rename p1 to wctx in manifestmerge Bryan O'Sullivan <bryano@fb.com> parents: 18606 diff changeset	228 ret = copies.mergecopies(repo, wctx, p2, pa)
18134 6c35b53cd28b copies: separate moves via directory renames from explicit copies Siddharth Agarwal <sid0@fb.com> parents: 18042 diff changeset	229 copy, movewithdir, diverge, renamedelete = ret
8753 af5f099d932b merge: refactor manifestmerge init to better report effective ancestor Matt Mackall <mpm@selenic.com> parents: 8752 diff changeset	230 for of, fl in diverge.iteritems():
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	231 actions.append((of, "dr", (fl,), "divergent renames"))
16794 98687cdddcb1 merge: warn about file deleted in one branch and renamed in other (issue3074) Thomas Arendsen Hein <thomas@intevation.de> parents: 16719 diff changeset	232 for of, fl in renamedelete.iteritems():
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	233 actions.append((of, "rd", (fl,), "rename and delete"))
8753 af5f099d932b merge: refactor manifestmerge init to better report effective ancestor Matt Mackall <mpm@selenic.com> parents: 8752 diff changeset	234
af5f099d932b merge: refactor manifestmerge init to better report effective ancestor Matt Mackall <mpm@selenic.com> parents: 8752 diff changeset	235 repo.ui.note(_("resolving manifests\n"))
18605 bcf29565d89f manifestmerge: pass in branchmerge and force separately Siddharth Agarwal <sid0@fb.com> parents: 18544 diff changeset	236 repo.ui.debug(" branchmerge: %s, force: %s, partial: %s\n"
bcf29565d89f manifestmerge: pass in branchmerge and force separately Siddharth Agarwal <sid0@fb.com> parents: 18544 diff changeset	237 % (bool(branchmerge), bool(force), bool(partial)))
18611 18c2184c27dc merge: rename p1 to wctx in manifestmerge Bryan O'Sullivan <bryano@fb.com> parents: 18606 diff changeset	238 repo.ui.debug(" ancestor: %s, local: %s, remote: %s\n" % (pa, wctx, p2))
8753 af5f099d932b merge: refactor manifestmerge init to better report effective ancestor Matt Mackall <mpm@selenic.com> parents: 8752 diff changeset	239
18611 18c2184c27dc merge: rename p1 to wctx in manifestmerge Bryan O'Sullivan <bryano@fb.com> parents: 18606 diff changeset	240 m1, m2, ma = wctx.manifest(), p2.manifest(), pa.manifest()
8753 af5f099d932b merge: refactor manifestmerge init to better report effective ancestor Matt Mackall <mpm@selenic.com> parents: 8752 diff changeset	241 copied = set(copy.values())
18134 6c35b53cd28b copies: separate moves via directory renames from explicit copies Siddharth Agarwal <sid0@fb.com> parents: 18042 diff changeset	242 copied.update(movewithdir.values())
3295 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3292 diff changeset	243
11470 34e33d50c26b subrepo: correctly handle update -C with modified subrepos (issue2022) Matt Mackall <mpm@selenic.com> parents: 11466 diff changeset	244 if '.hgsubstate' in m1:
9783 ee00ef6f9be7 submerge: properly deal with overwrites Matt Mackall <mpm@selenic.com> parents: 9780 diff changeset	245 # check whether sub state is modified
18611 18c2184c27dc merge: rename p1 to wctx in manifestmerge Bryan O'Sullivan <bryano@fb.com> parents: 18606 diff changeset	246 for s in sorted(wctx.substate):
18c2184c27dc merge: rename p1 to wctx in manifestmerge Bryan O'Sullivan <bryano@fb.com> parents: 18606 diff changeset	247 if wctx.sub(s).dirty():
9783 ee00ef6f9be7 submerge: properly deal with overwrites Matt Mackall <mpm@selenic.com> parents: 9780 diff changeset	248 m1['.hgsubstate'] += "+"
ee00ef6f9be7 submerge: properly deal with overwrites Matt Mackall <mpm@selenic.com> parents: 9780 diff changeset	249 break
ee00ef6f9be7 submerge: properly deal with overwrites Matt Mackall <mpm@selenic.com> parents: 9780 diff changeset	250
18606 95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	251 aborts, prompts = [], []
3105 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	252 # Compare manifests
18822 381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	253 fdiff = dicthelpers.diff(m1, m2)
381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	254 flagsdiff = m1.flagsdiff(m2)
381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	255 diff12 = dicthelpers.join(fdiff, flagsdiff)
381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	256
381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	257 for f, (n12, fl12) in diff12.iteritems():
381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	258 if n12:
381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	259 n1, n2 = n12
381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	260 else: # file contents didn't change, but flags did
18895 ed676ed67a5c manifestmerge: handle workdir removed, remote removed with flags Siddharth Agarwal <sid0@fb.com> parents: 18876 diff changeset	261 n1 = n2 = m1.get(f, None)
ed676ed67a5c manifestmerge: handle workdir removed, remote removed with flags Siddharth Agarwal <sid0@fb.com> parents: 18876 diff changeset	262 if n1 is None:
ed676ed67a5c manifestmerge: handle workdir removed, remote removed with flags Siddharth Agarwal <sid0@fb.com> parents: 18876 diff changeset	263 # Since n1 == n2, the file isn't present in m2 either. This
ed676ed67a5c manifestmerge: handle workdir removed, remote removed with flags Siddharth Agarwal <sid0@fb.com> parents: 18876 diff changeset	264 # means that the file was removed or deleted locally and
ed676ed67a5c manifestmerge: handle workdir removed, remote removed with flags Siddharth Agarwal <sid0@fb.com> parents: 18876 diff changeset	265 # removed remotely, but that residual entries remain in flags.
ed676ed67a5c manifestmerge: handle workdir removed, remote removed with flags Siddharth Agarwal <sid0@fb.com> parents: 18876 diff changeset	266 # This can happen in manifests generated by workingctx.
ed676ed67a5c manifestmerge: handle workdir removed, remote removed with flags Siddharth Agarwal <sid0@fb.com> parents: 18876 diff changeset	267 continue
18822 381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	268 if fl12:
381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	269 fl1, fl2 = fl12
381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	270 else: # flags didn't change, file contents did
381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	271 fl1 = fl2 = m1.flags(f)
381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	272
3248 751840e739a1 merge: reduce manifest copying Matt Mackall <mpm@selenic.com> parents: 3247 diff changeset	273 if partial and not partial(f):
751840e739a1 merge: reduce manifest copying Matt Mackall <mpm@selenic.com> parents: 3247 diff changeset	274 continue
18822 381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	275 if n1 and n2:
381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	276 fla = ma.flags(f)
18338 384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	277 nol = 'l' not in fl1 + fl2 + fla
8752 f177bdab261b merge: simplify file revision comparison logic Matt Mackall <mpm@selenic.com> parents: 8751 diff changeset	278 a = ma.get(f, nullid)
18822 381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	279 if n2 == a and fl2 == fla:
18338 384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	280 pass # remote unchanged - keep local
18818 a0bff3d4f67b manifestmerge: rename n to n1 and n2 Siddharth Agarwal <sid0@fb.com> parents: 18780 diff changeset	281 elif n1 == a and fl1 == fla: # local unchanged - use remote
a0bff3d4f67b manifestmerge: rename n to n1 and n2 Siddharth Agarwal <sid0@fb.com> parents: 18780 diff changeset	282 if n1 == n2: # optimization: keep local content
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	283 actions.append((f, "e", (fl2,), "update permissions"))
18338 384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	284 else:
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	285 actions.append((f, "g", (fl2,), "remote is newer"))
18338 384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	286 elif nol and n2 == a: # remote only changed 'x'
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	287 actions.append((f, "e", (fl2,), "update permissions"))
18818 a0bff3d4f67b manifestmerge: rename n to n1 and n2 Siddharth Agarwal <sid0@fb.com> parents: 18780 diff changeset	288 elif nol and n1 == a: # local only changed 'x'
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	289 actions.append((f, "g", (fl1,), "remote is newer"))
18338 384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	290 else: # both changed something
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	291 actions.append((f, "m", (f, f, False), "versions differ"))
8752 f177bdab261b merge: simplify file revision comparison logic Matt Mackall <mpm@selenic.com> parents: 8751 diff changeset	292 elif f in copied: # files we'll deal with on m2 side
f177bdab261b merge: simplify file revision comparison logic Matt Mackall <mpm@selenic.com> parents: 8751 diff changeset	293 pass
18822 381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	294 elif n1 and f in movewithdir: # directory rename
18134 6c35b53cd28b copies: separate moves via directory renames from explicit copies Siddharth Agarwal <sid0@fb.com> parents: 18042 diff changeset	295 f2 = movewithdir[f]
18823 b2a36e9b9ccc manifestmerge: drop redundant flags calls Siddharth Agarwal <sid0@fb.com> parents: 18822 diff changeset	296 actions.append((f, "d", (None, f2, fl1),
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	297 "remote renamed directory to " + f2))
18822 381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	298 elif n1 and f in copy:
3249 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	299 f2 = copy[f]
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	300 actions.append((f, "m", (f2, f, False),
d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	301 "local copied/moved to " + f2))
18822 381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	302 elif n1 and f in ma: # clean, a different, no remote
18818 a0bff3d4f67b manifestmerge: rename n to n1 and n2 Siddharth Agarwal <sid0@fb.com> parents: 18780 diff changeset	303 if n1 != ma[f]:
18539 cf25e4efd685 merge: delay prompts a bit and show them in (extra) sorted order Mads Kiilerich <madski@unity3d.com> parents: 18505 diff changeset	304 prompts.append((f, "cd")) # prompt changed/deleted
18818 a0bff3d4f67b manifestmerge: rename n to n1 and n2 Siddharth Agarwal <sid0@fb.com> parents: 18780 diff changeset	305 elif n1[20:] == "a": # added, no remote
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	306 actions.append((f, "f", None, "remote deleted"))
16094 0776a6cababe merge: don't use unknown() Matt Mackall <mpm@selenic.com> parents: 16093 diff changeset	307 else:
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	308 actions.append((f, "r", None, "other deleted"))
18822 381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	309 elif n2 and f in movewithdir:
18134 6c35b53cd28b copies: separate moves via directory renames from explicit copies Siddharth Agarwal <sid0@fb.com> parents: 18042 diff changeset	310 f2 = movewithdir[f]
18823 b2a36e9b9ccc manifestmerge: drop redundant flags calls Siddharth Agarwal <sid0@fb.com> parents: 18822 diff changeset	311 actions.append((None, "d", (f, f2, fl2),
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	312 "local renamed directory to " + f2))
18822 381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	313 elif n2 and f in copy:
3249 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	314 f2 = copy[f]
18339 aadefcee1f5e merge: remove "case" comments Mads Kiilerich <mads@kiilerich.com> parents: 18338 diff changeset	315 if f2 in m2:
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	316 actions.append((f2, "m", (f, f, False),
d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	317 "remote copied to " + f))
18339 aadefcee1f5e merge: remove "case" comments Mads Kiilerich <mads@kiilerich.com> parents: 18338 diff changeset	318 else:
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	319 actions.append((f2, "m", (f, f, True),
d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	320 "remote moved to " + f))
18822 381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	321 elif n2 and f not in ma:
18606 95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	322 # local unknown, remote created: the logic is described by the
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	323 # following table:
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	324 #
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	325 # force branchmerge different \| action
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	326 # n * n \| get
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	327 # n * y \| abort
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	328 # y n * \| get
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	329 # y y n \| get
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	330 # y y y \| merge
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	331 #
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	332 # Checking whether the files are different is expensive, so we
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	333 # don't do that when we can avoid it.
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	334 if force and not branchmerge:
18823 b2a36e9b9ccc manifestmerge: drop redundant flags calls Siddharth Agarwal <sid0@fb.com> parents: 18822 diff changeset	335 actions.append((f, "g", (fl2,), "remote created"))
18339 aadefcee1f5e merge: remove "case" comments Mads Kiilerich <mads@kiilerich.com> parents: 18338 diff changeset	336 else:
18611 18c2184c27dc merge: rename p1 to wctx in manifestmerge Bryan O'Sullivan <bryano@fb.com> parents: 18606 diff changeset	337 different = _checkunknownfile(repo, wctx, p2, f)
18606 95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	338 if force and branchmerge and different:
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	339 actions.append((f, "m", (f, f, False),
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	340 "remote differs from untracked local"))
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	341 elif not force and different:
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	342 aborts.append((f, "ud"))
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	343 else:
18823 b2a36e9b9ccc manifestmerge: drop redundant flags calls Siddharth Agarwal <sid0@fb.com> parents: 18822 diff changeset	344 actions.append((f, "g", (fl2,), "remote created"))
18822 381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	345 elif n2 and n2 != ma[f]:
18539 cf25e4efd685 merge: delay prompts a bit and show them in (extra) sorted order Mads Kiilerich <madski@unity3d.com> parents: 18505 diff changeset	346 prompts.append((f, "dc")) # prompt deleted/changed
cf25e4efd685 merge: delay prompts a bit and show them in (extra) sorted order Mads Kiilerich <madski@unity3d.com> parents: 18505 diff changeset	347
18606 95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	348 for f, m in sorted(aborts):
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	349 if m == "ud":
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	350 repo.ui.warn(_("%s: untracked file differs\n") % f)
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	351 else: assert False, m
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	352 if aborts:
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	353 raise util.Abort(_("untracked files in working directory differ "
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	354 "from files in requested revision"))
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	355
19105 c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	356 if not util.checkcase(repo.path):
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	357 # check collision between files only in p2 for clean update
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	358 if (not branchmerge and
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	359 (force or not wctx.dirty(missing=True, branch=False))):
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	360 _checkcollision(repo, m2, [], [])
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	361 else:
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	362 _checkcollision(repo, m1, actions, prompts)
c60a7f5a741f icasefs: rewrite case-folding collision detection (issue3452) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19095 diff changeset	363
18539 cf25e4efd685 merge: delay prompts a bit and show them in (extra) sorted order Mads Kiilerich <madski@unity3d.com> parents: 18505 diff changeset	364 for f, m in sorted(prompts):
cf25e4efd685 merge: delay prompts a bit and show them in (extra) sorted order Mads Kiilerich <madski@unity3d.com> parents: 18505 diff changeset	365 if m == "cd":
18778 1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	366 if acceptremote:
1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	367 actions.append((f, "r", None, "remote delete"))
1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	368 elif repo.ui.promptchoice(
18543 c8ba98bf0e71 merge: don't indent "local changed %s which remote deleted" prompt Mads Kiilerich <madski@unity3d.com> parents: 18542 diff changeset	369 _("local changed %s which remote deleted\n"
19226 c58b6ab4c26f ui: merge prompt text components into a singe string Matt Mackall <mpm@selenic.com> parents: 19157 diff changeset	370 "use (c)hanged version or (d)elete?"
c58b6ab4c26f ui: merge prompt text components into a singe string Matt Mackall <mpm@selenic.com> parents: 19157 diff changeset	371 "$$ &Changed $$ &Delete") % f, 0):
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	372 actions.append((f, "r", None, "prompt delete"))
16094 0776a6cababe merge: don't use unknown() Matt Mackall <mpm@selenic.com> parents: 16093 diff changeset	373 else:
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	374 actions.append((f, "a", None, "prompt keep"))
18539 cf25e4efd685 merge: delay prompts a bit and show them in (extra) sorted order Mads Kiilerich <madski@unity3d.com> parents: 18505 diff changeset	375 elif m == "dc":
18778 1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	376 if acceptremote:
1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	377 actions.append((f, "g", (m2.flags(f),), "remote recreating"))
1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	378 elif repo.ui.promptchoice(
8741 e592180ba435 merge: reorder remote creation tests Matt Mackall <mpm@selenic.com> parents: 8740 diff changeset	379 _("remote changed %s which local deleted\n"
19226 c58b6ab4c26f ui: merge prompt text components into a singe string Matt Mackall <mpm@selenic.com> parents: 19157 diff changeset	380 "use (c)hanged version or leave (d)eleted?"
c58b6ab4c26f ui: merge prompt text components into a singe string Matt Mackall <mpm@selenic.com> parents: 19157 diff changeset	381 "$$ &Changed $$ &Deleted") % f, 0) == 0:
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	382 actions.append((f, "g", (m2.flags(f),), "prompt recreating"))
18539 cf25e4efd685 merge: delay prompts a bit and show them in (extra) sorted order Mads Kiilerich <madski@unity3d.com> parents: 18505 diff changeset	383 else: assert False, m
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	384 return actions
3105 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	385
8366 0bf0045000b5 some modernization cleanups, forward compatibility Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8312 diff changeset	386 def actionkey(a):
18329 eb6ca96f4dd0 merge: consistently use "x" instead of 'x' for internal action types Mads Kiilerich <mads@kiilerich.com> parents: 18328 diff changeset	387 return a[1] == "r" and -1 or 0, a
6805 482581431dcd Sort removes first when applying updates (fixes issues 750 and 912) Paul Moore <p.f.moore@gmail.com> parents: 6762 diff changeset	388
18632 3e20079117c5 merge: handle subrepo merges and .hgsubstate specially Bryan O'Sullivan <bryano@fb.com> parents: 18630 diff changeset	389 def getremove(repo, mctx, overwrite, args):
18630 9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	390 """apply usually-non-interactive updates to the working directory
9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	391
9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	392 mctx is the context to be merged into the working copy
9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	393
9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	394 yields tuples for progress updates
9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	395 """
18640 a8648f32b8ed merge: don't fiddle with name lookups or i18n in hot loops Bryan O'Sullivan <bryano@fb.com> parents: 18639 diff changeset	396 verbose = repo.ui.verbose
a8648f32b8ed merge: don't fiddle with name lookups or i18n in hot loops Bryan O'Sullivan <bryano@fb.com> parents: 18639 diff changeset	397 unlink = util.unlinkpath
a8648f32b8ed merge: don't fiddle with name lookups or i18n in hot loops Bryan O'Sullivan <bryano@fb.com> parents: 18639 diff changeset	398 wjoin = repo.wjoin
a8648f32b8ed merge: don't fiddle with name lookups or i18n in hot loops Bryan O'Sullivan <bryano@fb.com> parents: 18639 diff changeset	399 fctx = mctx.filectx
a8648f32b8ed merge: don't fiddle with name lookups or i18n in hot loops Bryan O'Sullivan <bryano@fb.com> parents: 18639 diff changeset	400 wwrite = repo.wwrite
18630 9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	401 audit = repo.wopener.audit
18633 6390dd22b12f merge: report non-interactive progress in chunks Bryan O'Sullivan <bryano@fb.com> parents: 18632 diff changeset	402 i = 0
6390dd22b12f merge: report non-interactive progress in chunks Bryan O'Sullivan <bryano@fb.com> parents: 18632 diff changeset	403 for arg in args:
18630 9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	404 f = arg[0]
9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	405 if arg[1] == 'r':
18640 a8648f32b8ed merge: don't fiddle with name lookups or i18n in hot loops Bryan O'Sullivan <bryano@fb.com> parents: 18639 diff changeset	406 if verbose:
a8648f32b8ed merge: don't fiddle with name lookups or i18n in hot loops Bryan O'Sullivan <bryano@fb.com> parents: 18639 diff changeset	407 repo.ui.note(_("removing %s\n") % f)
18630 9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	408 audit(f)
9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	409 try:
18640 a8648f32b8ed merge: don't fiddle with name lookups or i18n in hot loops Bryan O'Sullivan <bryano@fb.com> parents: 18639 diff changeset	410 unlink(wjoin(f), ignoremissing=True)
18630 9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	411 except OSError, inst:
9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	412 repo.ui.warn(_("update failed to remove %s: %s!\n") %
9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	413 (f, inst.strerror))
9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	414 else:
18640 a8648f32b8ed merge: don't fiddle with name lookups or i18n in hot loops Bryan O'Sullivan <bryano@fb.com> parents: 18639 diff changeset	415 if verbose:
a8648f32b8ed merge: don't fiddle with name lookups or i18n in hot loops Bryan O'Sullivan <bryano@fb.com> parents: 18639 diff changeset	416 repo.ui.note(_("getting %s\n") % f)
a8648f32b8ed merge: don't fiddle with name lookups or i18n in hot loops Bryan O'Sullivan <bryano@fb.com> parents: 18639 diff changeset	417 wwrite(f, fctx(f).data(), arg[2][0])
18633 6390dd22b12f merge: report non-interactive progress in chunks Bryan O'Sullivan <bryano@fb.com> parents: 18632 diff changeset	418 if i == 100:
6390dd22b12f merge: report non-interactive progress in chunks Bryan O'Sullivan <bryano@fb.com> parents: 18632 diff changeset	419 yield i, f
6390dd22b12f merge: report non-interactive progress in chunks Bryan O'Sullivan <bryano@fb.com> parents: 18632 diff changeset	420 i = 0
6390dd22b12f merge: report non-interactive progress in chunks Bryan O'Sullivan <bryano@fb.com> parents: 18632 diff changeset	421 i += 1
6390dd22b12f merge: report non-interactive progress in chunks Bryan O'Sullivan <bryano@fb.com> parents: 18632 diff changeset	422 if i > 0:
18630 9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	423 yield i, f
9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	424
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	425 def applyupdates(repo, actions, wctx, mctx, actx, overwrite):
11454 9b0406b23be0 merge: pass constant cset ancestor to fctx.ancestor Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11451 diff changeset	426 """apply the merge action list to the working directory
9b0406b23be0 merge: pass constant cset ancestor to fctx.ancestor Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11451 diff changeset	427
9b0406b23be0 merge: pass constant cset ancestor to fctx.ancestor Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11451 diff changeset	428 wctx is the working copy context
9b0406b23be0 merge: pass constant cset ancestor to fctx.ancestor Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11451 diff changeset	429 mctx is the context to be merged into the working copy
9b0406b23be0 merge: pass constant cset ancestor to fctx.ancestor Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11451 diff changeset	430 actx is the context of the common ancestor
13162 115a9760c382 merge: document some internal return values. Greg Ward <greg-hg@gerg.ca> parents: 13158 diff changeset	431
115a9760c382 merge: document some internal return values. Greg Ward <greg-hg@gerg.ca> parents: 13158 diff changeset	432 Return a tuple of counts (updated, merged, removed, unresolved) that
115a9760c382 merge: document some internal return values. Greg Ward <greg-hg@gerg.ca> parents: 13158 diff changeset	433 describes how many files were affected by the update.
11454 9b0406b23be0 merge: pass constant cset ancestor to fctx.ancestor Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11451 diff changeset	434 """
3315 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	435
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	436 updated, merged, removed, unresolved = 0, 0, 0, 0
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	437 ms = mergestate(repo)
13878 a8d13ee0ce68 misc: replace .parents()[0] with p1() Matt Mackall <mpm@selenic.com> parents: 13874 diff changeset	438 ms.reset(wctx.p1().node())
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	439 moves = []
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	440 actions.sort(key=actionkey)
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	441
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	442 # prescan for merges
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	443 for a in actions:
18541 5ed6a375e9ca merge: delay debug messages for merge actions Mads Kiilerich <madski@unity3d.com> parents: 18540 diff changeset	444 f, m, args, msg = a
5ed6a375e9ca merge: delay debug messages for merge actions Mads Kiilerich <madski@unity3d.com> parents: 18540 diff changeset	445 repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m))
18329 eb6ca96f4dd0 merge: consistently use "x" instead of 'x' for internal action types Mads Kiilerich <mads@kiilerich.com> parents: 18328 diff changeset	446 if m == "m": # merge
18540 139529b0a191 merge: make all action tuples have the same length - keep args as tuple Mads Kiilerich <madski@unity3d.com> parents: 18539 diff changeset	447 f2, fd, move = args
18332 6ba58ab719e5 merge: .hgsubstate is special as merge destination, not as merge source Mads Kiilerich <mads@kiilerich.com> parents: 18331 diff changeset	448 if fd == '.hgsubstate': # merged internally
8814 ab668c92a036 subrepo: add update/merge logic Matt Mackall <mpm@selenic.com> parents: 8753 diff changeset	449 continue
18541 5ed6a375e9ca merge: delay debug messages for merge actions Mads Kiilerich <madski@unity3d.com> parents: 18540 diff changeset	450 repo.ui.debug(" preserving %s for resolve of %s\n" % (f, fd))
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	451 fcl = wctx[f]
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	452 fco = mctx[f2]
12008 fad5ed0ff997 merge: move reverse-merge logic out of filemerge (issue2342) Matt Mackall <mpm@selenic.com> parents: 11755 diff changeset	453 if mctx == actx: # backwards, use working dir parent as ancestor
12664 545ec1775021 merge: handle no file parent in backwards merge (issue2364) Matt Mackall <mpm@selenic.com> parents: 12401 diff changeset	454 if fcl.parents():
13878 a8d13ee0ce68 misc: replace .parents()[0] with p1() Matt Mackall <mpm@selenic.com> parents: 13874 diff changeset	455 fca = fcl.p1()
12664 545ec1775021 merge: handle no file parent in backwards merge (issue2364) Matt Mackall <mpm@selenic.com> parents: 12401 diff changeset	456 else:
545ec1775021 merge: handle no file parent in backwards merge (issue2364) Matt Mackall <mpm@selenic.com> parents: 12401 diff changeset	457 fca = repo.filectx(f, fileid=nullrev)
12008 fad5ed0ff997 merge: move reverse-merge logic out of filemerge (issue2342) Matt Mackall <mpm@selenic.com> parents: 11755 diff changeset	458 else:
fad5ed0ff997 merge: move reverse-merge logic out of filemerge (issue2342) Matt Mackall <mpm@selenic.com> parents: 11755 diff changeset	459 fca = fcl.ancestor(fco, actx)
fad5ed0ff997 merge: move reverse-merge logic out of filemerge (issue2342) Matt Mackall <mpm@selenic.com> parents: 11755 diff changeset	460 if not fca:
fad5ed0ff997 merge: move reverse-merge logic out of filemerge (issue2342) Matt Mackall <mpm@selenic.com> parents: 11755 diff changeset	461 fca = repo.filectx(f, fileid=nullrev)
18338 384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	462 ms.add(fcl, fco, fca, fd)
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	463 if f != fd and move:
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	464 moves.append(f)
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	465
18328 2fee5119099b merge: consistently use repo.wopener.audit instead of creating a new auditor Mads Kiilerich <mads@kiilerich.com> parents: 18143 diff changeset	466 audit = repo.wopener.audit
14398 ae1f7a5373e8 applyupdates: audit unlinking of renamed files and directories Adrian Buehlmann <adrian@cadifra.com> parents: 14232 diff changeset	467
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	468 # remove renamed files after safely stored
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	469 for f in moves:
12032 ad787252fed6 util: remove lexists, Python 2.4 introduced os.path.lexists Martin Geisler <mg@lazybytes.net> parents: 12010 diff changeset	470 if os.path.lexists(repo.wjoin(f)):
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 9048 diff changeset	471 repo.ui.debug("removing %s\n" % f)
14398 ae1f7a5373e8 applyupdates: audit unlinking of renamed files and directories Adrian Buehlmann <adrian@cadifra.com> parents: 14232 diff changeset	472 audit(f)
18333 f6f23ecafc9b merge: use util.unlinkpath for removing moved files Mads Kiilerich <mads@kiilerich.com> parents: 18332 diff changeset	473 util.unlinkpath(repo.wjoin(f))
5042 f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4997 diff changeset	474
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	475 numupdates = len(actions)
18630 9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	476 workeractions = [a for a in actions if a[1] in 'gr']
19095 5cc71484ee9c merge: increase safety of parallel updating/removing on icasefs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18985 diff changeset	477 updateactions = [a for a in workeractions if a[1] == 'g']
5cc71484ee9c merge: increase safety of parallel updating/removing on icasefs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18985 diff changeset	478 updated = len(updateactions)
5cc71484ee9c merge: increase safety of parallel updating/removing on icasefs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18985 diff changeset	479 removeactions = [a for a in workeractions if a[1] == 'r']
5cc71484ee9c merge: increase safety of parallel updating/removing on icasefs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18985 diff changeset	480 removed = len(removeactions)
18630 9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	481 actions = [a for a in actions if a[1] not in 'gr']
9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	482
18632 3e20079117c5 merge: handle subrepo merges and .hgsubstate specially Bryan O'Sullivan <bryano@fb.com> parents: 18630 diff changeset	483 hgsub = [a[1] for a in workeractions if a[0] == '.hgsubstate']
3e20079117c5 merge: handle subrepo merges and .hgsubstate specially Bryan O'Sullivan <bryano@fb.com> parents: 18630 diff changeset	484 if hgsub and hgsub[0] == 'r':
3e20079117c5 merge: handle subrepo merges and .hgsubstate specially Bryan O'Sullivan <bryano@fb.com> parents: 18630 diff changeset	485 subrepo.submerge(repo, wctx, mctx, wctx, overwrite)
3e20079117c5 merge: handle subrepo merges and .hgsubstate specially Bryan O'Sullivan <bryano@fb.com> parents: 18630 diff changeset	486
18633 6390dd22b12f merge: report non-interactive progress in chunks Bryan O'Sullivan <bryano@fb.com> parents: 18632 diff changeset	487 z = 0
18639 5774732bb5e5 merge: apply non-interactive working dir updates in parallel Bryan O'Sullivan <bryano@fb.com> parents: 18633 diff changeset	488 prog = worker.worker(repo.ui, 0.001, getremove, (repo, mctx, overwrite),
19095 5cc71484ee9c merge: increase safety of parallel updating/removing on icasefs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18985 diff changeset	489 removeactions)
5cc71484ee9c merge: increase safety of parallel updating/removing on icasefs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18985 diff changeset	490 for i, item in prog:
5cc71484ee9c merge: increase safety of parallel updating/removing on icasefs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18985 diff changeset	491 z += i
5cc71484ee9c merge: increase safety of parallel updating/removing on icasefs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18985 diff changeset	492 repo.ui.progress(_('updating'), z, item=item, total=numupdates,
5cc71484ee9c merge: increase safety of parallel updating/removing on icasefs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18985 diff changeset	493 unit=_('files'))
5cc71484ee9c merge: increase safety of parallel updating/removing on icasefs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18985 diff changeset	494 prog = worker.worker(repo.ui, 0.001, getremove, (repo, mctx, overwrite),
5cc71484ee9c merge: increase safety of parallel updating/removing on icasefs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18985 diff changeset	495 updateactions)
18639 5774732bb5e5 merge: apply non-interactive working dir updates in parallel Bryan O'Sullivan <bryano@fb.com> parents: 18633 diff changeset	496 for i, item in prog:
18633 6390dd22b12f merge: report non-interactive progress in chunks Bryan O'Sullivan <bryano@fb.com> parents: 18632 diff changeset	497 z += i
6390dd22b12f merge: report non-interactive progress in chunks Bryan O'Sullivan <bryano@fb.com> parents: 18632 diff changeset	498 repo.ui.progress(_('updating'), z, item=item, total=numupdates,
15041 3afe5edda4e3 merge: use repo.ui directly instead local variable Martin Geisler <mg@aragost.com> parents: 14980 diff changeset	499 unit=_('files'))
18630 9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	500
18632 3e20079117c5 merge: handle subrepo merges and .hgsubstate specially Bryan O'Sullivan <bryano@fb.com> parents: 18630 diff changeset	501 if hgsub and hgsub[0] == 'g':
3e20079117c5 merge: handle subrepo merges and .hgsubstate specially Bryan O'Sullivan <bryano@fb.com> parents: 18630 diff changeset	502 subrepo.submerge(repo, wctx, mctx, wctx, overwrite)
3e20079117c5 merge: handle subrepo merges and .hgsubstate specially Bryan O'Sullivan <bryano@fb.com> parents: 18630 diff changeset	503
18640 a8648f32b8ed merge: don't fiddle with name lookups or i18n in hot loops Bryan O'Sullivan <bryano@fb.com> parents: 18639 diff changeset	504 _updating = _('updating')
a8648f32b8ed merge: don't fiddle with name lookups or i18n in hot loops Bryan O'Sullivan <bryano@fb.com> parents: 18639 diff changeset	505 _files = _('files')
a8648f32b8ed merge: don't fiddle with name lookups or i18n in hot loops Bryan O'Sullivan <bryano@fb.com> parents: 18639 diff changeset	506 progress = repo.ui.progress
a8648f32b8ed merge: don't fiddle with name lookups or i18n in hot loops Bryan O'Sullivan <bryano@fb.com> parents: 18639 diff changeset	507
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	508 for i, a in enumerate(actions):
18541 5ed6a375e9ca merge: delay debug messages for merge actions Mads Kiilerich <madski@unity3d.com> parents: 18540 diff changeset	509 f, m, args, msg = a
18640 a8648f32b8ed merge: don't fiddle with name lookups or i18n in hot loops Bryan O'Sullivan <bryano@fb.com> parents: 18639 diff changeset	510 progress(_updating, z + i + 1, item=f, total=numupdates, unit=_files)
18630 9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	511 if m == "m": # merge
18780 0705ad73e878 applyupdates: assign variable before we try to use it (issue3855) Kevin Bullock <kbullock@ringworld.org> parents: 18778 diff changeset	512 f2, fd, move = args
18332 6ba58ab719e5 merge: .hgsubstate is special as merge destination, not as merge source Mads Kiilerich <mads@kiilerich.com> parents: 18331 diff changeset	513 if fd == '.hgsubstate': # subrepo states need updating
16683 525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16551 diff changeset	514 subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx),
525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16551 diff changeset	515 overwrite)
8814 ab668c92a036 subrepo: add update/merge logic Matt Mackall <mpm@selenic.com> parents: 8753 diff changeset	516 continue
18328 2fee5119099b merge: consistently use repo.wopener.audit instead of creating a new auditor Mads Kiilerich <mads@kiilerich.com> parents: 18143 diff changeset	517 audit(fd)
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	518 r = ms.resolve(fd, wctx, mctx)
9030 3f56055ff1d7 compat: can't compare two values of unequal datatypes Alejandro Santos <alejolp@alejolp.com> parents: 8814 diff changeset	519 if r is not None and r > 0:
3249 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	520 unresolved += 1
3309 e8be5942335d merge: pull file copy/move out of filemerge Matt Mackall <mpm@selenic.com> parents: 3308 diff changeset	521 else:
3400 d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3372 diff changeset	522 if r is None:
d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3372 diff changeset	523 updated += 1
d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3372 diff changeset	524 else:
d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3372 diff changeset	525 merged += 1
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	526 elif m == "d": # directory rename
18540 139529b0a191 merge: make all action tuples have the same length - keep args as tuple Mads Kiilerich <madski@unity3d.com> parents: 18539 diff changeset	527 f2, fd, flags = args
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	528 if f:
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	529 repo.ui.note(_("moving %s to %s\n") % (f, fd))
14398 ae1f7a5373e8 applyupdates: audit unlinking of renamed files and directories Adrian Buehlmann <adrian@cadifra.com> parents: 14232 diff changeset	530 audit(f)
18335 435909bf0257 merge: drop reference to file contents immediately after write Mads Kiilerich <mads@kiilerich.com> parents: 18334 diff changeset	531 repo.wwrite(fd, wctx.filectx(f).data(), flags)
13235 6bf39d88c857 rename util.unlink to unlinkpath Adrian Buehlmann <adrian@cadifra.com> parents: 13162 diff changeset	532 util.unlinkpath(repo.wjoin(f))
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	533 if f2:
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	534 repo.ui.note(_("getting %s to %s\n") % (f2, fd))
18335 435909bf0257 merge: drop reference to file contents immediately after write Mads Kiilerich <mads@kiilerich.com> parents: 18334 diff changeset	535 repo.wwrite(fd, mctx.filectx(f2).data(), flags)
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	536 updated += 1
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	537 elif m == "dr": # divergent renames
18540 139529b0a191 merge: make all action tuples have the same length - keep args as tuple Mads Kiilerich <madski@unity3d.com> parents: 18539 diff changeset	538 fl, = args
12757 62c8f7691bc3 merge: make 'diverging renames' diagnostic a more helpful note. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 12746 diff changeset	539 repo.ui.warn(_("note: possible conflict - %s was renamed "
62c8f7691bc3 merge: make 'diverging renames' diagnostic a more helpful note. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 12746 diff changeset	540 "multiple times to:\n") % f)
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	541 for nf in fl:
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	542 repo.ui.warn(" %s\n" % nf)
16794 98687cdddcb1 merge: warn about file deleted in one branch and renamed in other (issue3074) Thomas Arendsen Hein <thomas@intevation.de> parents: 16719 diff changeset	543 elif m == "rd": # rename and delete
18540 139529b0a191 merge: make all action tuples have the same length - keep args as tuple Mads Kiilerich <madski@unity3d.com> parents: 18539 diff changeset	544 fl, = args
16794 98687cdddcb1 merge: warn about file deleted in one branch and renamed in other (issue3074) Thomas Arendsen Hein <thomas@intevation.de> parents: 16719 diff changeset	545 repo.ui.warn(_("note: possible conflict - %s was deleted "
98687cdddcb1 merge: warn about file deleted in one branch and renamed in other (issue3074) Thomas Arendsen Hein <thomas@intevation.de> parents: 16719 diff changeset	546 "and renamed to:\n") % f)
98687cdddcb1 merge: warn about file deleted in one branch and renamed in other (issue3074) Thomas Arendsen Hein <thomas@intevation.de> parents: 16719 diff changeset	547 for nf in fl:
98687cdddcb1 merge: warn about file deleted in one branch and renamed in other (issue3074) Thomas Arendsen Hein <thomas@intevation.de> parents: 16719 diff changeset	548 repo.ui.warn(" %s\n" % nf)
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	549 elif m == "e": # exec
18540 139529b0a191 merge: make all action tuples have the same length - keep args as tuple Mads Kiilerich <madski@unity3d.com> parents: 18539 diff changeset	550 flags, = args
18328 2fee5119099b merge: consistently use repo.wopener.audit instead of creating a new auditor Mads Kiilerich <mads@kiilerich.com> parents: 18143 diff changeset	551 audit(f)
14232 df2399663392 rename util.set_flags to setflags Adrian Buehlmann <adrian@cadifra.com> parents: 14220 diff changeset	552 util.setflags(repo.wjoin(f), 'l' in flags, 'x' in flags)
18334 44bda93df90e merge: changing the mode of a file is also an update Mads Kiilerich <mads@kiilerich.com> parents: 18333 diff changeset	553 updated += 1
12369 6f0d9d79111f merge: delay writing the mergestate during until commit is called Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12279 diff changeset	554 ms.commit()
18640 a8648f32b8ed merge: don't fiddle with name lookups or i18n in hot loops Bryan O'Sullivan <bryano@fb.com> parents: 18639 diff changeset	555 progress(_updating, None, total=numupdates, unit=_files)
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	556
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	557 return updated, merged, removed, unresolved
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	558
18778 1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	559 def calculateupdates(repo, tctx, mctx, ancestor, branchmerge, force, partial,
1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	560 acceptremote=False):
18035 5881d5b7552f merge: refactor action calculation into function David Schleimer <dschleimer@fb.com> parents: 17889 diff changeset	561 "Calculate the actions needed to merge mctx into tctx"
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	562 actions = []
b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	563 actions += manifestmerge(repo, tctx, mctx,
b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	564 ancestor,
18605 bcf29565d89f manifestmerge: pass in branchmerge and force separately Siddharth Agarwal <sid0@fb.com> parents: 18544 diff changeset	565 branchmerge, force,
18778 1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	566 partial, acceptremote)
18036 8b846dbc57b6 merge: support calculating merge actions against non-working contexts David Schleimer <dschleimer@fb.com> parents: 18035 diff changeset	567 if tctx.rev() is None:
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	568 actions += _forgetremoved(tctx, mctx, branchmerge)
b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	569 return actions
18035 5881d5b7552f merge: refactor action calculation into function David Schleimer <dschleimer@fb.com> parents: 17889 diff changeset	570
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	571 def recordupdates(repo, actions, branchmerge):
3315 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	572 "record merge actions to the dirstate"
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	573
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	574 for a in actions:
18541 5ed6a375e9ca merge: delay debug messages for merge actions Mads Kiilerich <madski@unity3d.com> parents: 18540 diff changeset	575 f, m, args, msg = a
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	576 if m == "r": # remove
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	577 if branchmerge:
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4884 diff changeset	578 repo.dirstate.remove(f)
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	579 else:
14434 cc8c09855d19 dirstate: rename forget to drop Matt Mackall <mpm@selenic.com> parents: 14406 diff changeset	580 repo.dirstate.drop(f)
7768 5bf5fd1e2a74 merge: mark kept local files as readded on linear update (issue539) Matt Mackall <mpm@selenic.com> parents: 7631 diff changeset	581 elif m == "a": # re-add
5bf5fd1e2a74 merge: mark kept local files as readded on linear update (issue539) Matt Mackall <mpm@selenic.com> parents: 7631 diff changeset	582 if not branchmerge:
5bf5fd1e2a74 merge: mark kept local files as readded on linear update (issue539) Matt Mackall <mpm@selenic.com> parents: 7631 diff changeset	583 repo.dirstate.add(f)
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	584 elif m == "f": # forget
14434 cc8c09855d19 dirstate: rename forget to drop Matt Mackall <mpm@selenic.com> parents: 14406 diff changeset	585 repo.dirstate.drop(f)
7569 89207edf3973 correctly update dirstate after update+mode change (issue1456) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7066 diff changeset	586 elif m == "e": # exec change
7630 a679bd371091 merge: fix execute bit update issue introduced by 89207edf3973 Patrick Mezard <pmezard@gmail.com> parents: 7569 diff changeset	587 repo.dirstate.normallookup(f)
7569 89207edf3973 correctly update dirstate after update+mode change (issue1456) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7066 diff changeset	588 elif m == "g": # get
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	589 if branchmerge:
10968 7a0d096e221e dirstate: more explicit name, rename normaldirty() to otherparent() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10492 diff changeset	590 repo.dirstate.otherparent(f)
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	591 else:
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4884 diff changeset	592 repo.dirstate.normal(f)
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	593 elif m == "m": # merge
18540 139529b0a191 merge: make all action tuples have the same length - keep args as tuple Mads Kiilerich <madski@unity3d.com> parents: 18539 diff changeset	594 f2, fd, move = args
3251 c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3249 diff changeset	595 if branchmerge:
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3249 diff changeset	596 # We've done a branch merge, mark this file as merged
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3249 diff changeset	597 # so that we properly record the merger later
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4884 diff changeset	598 repo.dirstate.merge(fd)
3372 ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3371 diff changeset	599 if f != f2: # copy/rename
ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3371 diff changeset	600 if move:
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4884 diff changeset	601 repo.dirstate.remove(f)
3372 ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3371 diff changeset	602 if f != fd:
ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3371 diff changeset	603 repo.dirstate.copy(f, fd)
ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3371 diff changeset	604 else:
ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3371 diff changeset	605 repo.dirstate.copy(f2, fd)
3251 c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3249 diff changeset	606 else:
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3249 diff changeset	607 # We've update-merged a locally modified file, so
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3249 diff changeset	608 # we set the dirstate to emulate a normal checkout
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3249 diff changeset	609 # of that file some time in the past. Thus our
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3249 diff changeset	610 # merge will appear as a normal local file
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3249 diff changeset	611 # modification.
11178 21a7ae13208f merge: avoid to break the dirstate copy status on moved files Gilles Moris <gilles.moris@free.fr> parents: 11101 diff changeset	612 if f2 == fd: # file not locally copied/moved
21a7ae13208f merge: avoid to break the dirstate copy status on moved files Gilles Moris <gilles.moris@free.fr> parents: 11101 diff changeset	613 repo.dirstate.normallookup(fd)
3308 ecc1bf27378c merge: unify merge and copy actions Matt Mackall <mpm@selenic.com> parents: 3307 diff changeset	614 if move:
14434 cc8c09855d19 dirstate: rename forget to drop Matt Mackall <mpm@selenic.com> parents: 14406 diff changeset	615 repo.dirstate.drop(f)
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	616 elif m == "d": # directory rename
18540 139529b0a191 merge: make all action tuples have the same length - keep args as tuple Mads Kiilerich <madski@unity3d.com> parents: 18539 diff changeset	617 f2, fd, flag = args
4819 9797124581c9 merge: fix adding untracked files on directory rename (issue612) Matt Mackall <mpm@selenic.com> parents: 4748 diff changeset	618 if not f2 and f not in repo.dirstate:
9797124581c9 merge: fix adding untracked files on directory rename (issue612) Matt Mackall <mpm@selenic.com> parents: 4748 diff changeset	619 # untracked file moved
9797124581c9 merge: fix adding untracked files on directory rename (issue612) Matt Mackall <mpm@selenic.com> parents: 4748 diff changeset	620 continue
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	621 if branchmerge:
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4884 diff changeset	622 repo.dirstate.add(fd)
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	623 if f:
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4884 diff changeset	624 repo.dirstate.remove(f)
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	625 repo.dirstate.copy(f, fd)
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	626 if f2:
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	627 repo.dirstate.copy(f2, fd)
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	628 else:
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4884 diff changeset	629 repo.dirstate.normal(fd)
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	630 if f:
14434 cc8c09855d19 dirstate: rename forget to drop Matt Mackall <mpm@selenic.com> parents: 14406 diff changeset	631 repo.dirstate.drop(f)
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	632
16696 d1afbf03e69a rebase: allow collapsing branches in place (issue3111) Patrick Mezard <patrick@mezard.eu> parents: 16683 diff changeset	633 def update(repo, node, branchmerge, force, partial, ancestor=None,
d1afbf03e69a rebase: allow collapsing branches in place (issue3111) Patrick Mezard <patrick@mezard.eu> parents: 16683 diff changeset	634 mergeancestor=False):
3315 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	635 """
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	636 Perform a merge between the working directory and the given node
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	637
9716 ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	638 node = the node to update to, or None if unspecified
3315 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	639 branchmerge = whether to merge between branches
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	640 force = whether to force branch merging or file overwriting
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	641 partial = a function to filter file lists (dirstate not updated)
18778 1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	642 mergeancestor = whether it is merging with an ancestor. If true,
1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	643 we should accept the incoming changes for any prompts that occur.
1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	644 If false, merging with an ancestor (fast-forward) is only allowed
1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	645 between different named branches. This flag is used by rebase extension
1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	646 as a temporary fix and should be avoided in general.
9716 ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	647
ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	648 The table below shows all the behaviors of the update command
ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	649 given the -c and -C or no options, whether the working directory
ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	650 is dirty, whether a revision is specified, and the relationship of
ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	651 the parent rev to the target rev (linear, on the same named
ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	652 branch, or on another named branch).
ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	653
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12032 diff changeset	654 This logic is tested by test-update-branches.t.
9716 ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	655
ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	656 -c -C dirty rev \| linear same cross
ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	657 n n n n \| ok (1) x
9717 68a1b9d0663e update: allow branch crossing without -c or -C, with no uncommitted changes Stuart W Marks <smarks@smarks.org> parents: 9716 diff changeset	658 n n n y \| ok ok ok
19799 ab3e42225dbc update: add error message for dirty non-linear update with no rev Siddharth Agarwal <sid0@fb.com> parents: 19798 diff changeset	659 n n y n \| merge (2) (2)
ab3e42225dbc update: add error message for dirty non-linear update with no rev Siddharth Agarwal <sid0@fb.com> parents: 19798 diff changeset	660 n n y y \| merge (3) (3)
9716 ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	661 n y * * \| --- discard ---
19799 ab3e42225dbc update: add error message for dirty non-linear update with no rev Siddharth Agarwal <sid0@fb.com> parents: 19798 diff changeset	662 y n y * \| --- (4) ---
9716 ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	663 y n n * \| --- ok ---
19799 ab3e42225dbc update: add error message for dirty non-linear update with no rev Siddharth Agarwal <sid0@fb.com> parents: 19798 diff changeset	664 y y * * \| --- (5) ---
9716 ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	665
ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	666 x = can't happen
ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	667 * = don't-care
19798 76df01e56e7f update: improve error message for clean non-linear update Siddharth Agarwal <sid0@fb.com> parents: 19482 diff changeset	668 1 = abort: not a linear update (merge or update --check to force update)
19800 4894e0d9462d update: improve error message for dirty non-linear update with rev Siddharth Agarwal <sid0@fb.com> parents: 19799 diff changeset	669 2 = abort: uncommitted changes (commit and merge, or update --clean to
4894e0d9462d update: improve error message for dirty non-linear update with rev Siddharth Agarwal <sid0@fb.com> parents: 19799 diff changeset	670 discard changes)
19799 ab3e42225dbc update: add error message for dirty non-linear update with no rev Siddharth Agarwal <sid0@fb.com> parents: 19798 diff changeset	671 3 = abort: uncommitted changes (commit or update --clean to discard changes)
19801 41abe2e3e3b7 update: standardize error message for dirty update --check Siddharth Agarwal <sid0@fb.com> parents: 19800 diff changeset	672 4 = abort: uncommitted changes (checked in commands.py)
19799 ab3e42225dbc update: add error message for dirty non-linear update with no rev Siddharth Agarwal <sid0@fb.com> parents: 19798 diff changeset	673 5 = incompatible options (checked in commands.py)
13162 115a9760c382 merge: document some internal return values. Greg Ward <greg-hg@gerg.ca> parents: 13158 diff changeset	674
115a9760c382 merge: document some internal return values. Greg Ward <greg-hg@gerg.ca> parents: 13158 diff changeset	675 Return the same tuple as applyupdates().
3315 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	676 """
2815 4870f795f681 Merge: combine force and forcemerge arguments Matt Mackall <mpm@selenic.com> parents: 2814 diff changeset	677
9717 68a1b9d0663e update: allow branch crossing without -c or -C, with no uncommitted changes Stuart W Marks <smarks@smarks.org> parents: 9716 diff changeset	678 onode = node
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	679 wlock = repo.wlock()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	680 try:
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6746 diff changeset	681 wc = repo[None]
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	682 if node is None:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	683 # tip of current branch
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	684 try:
16719 e7bf09acd410 localrepo: add branchtip() method for faster single-branch lookups Brodie Rao <brodie@sf.io> parents: 16696 diff changeset	685 node = repo.branchtip(wc.branch())
e7bf09acd410 localrepo: add branchtip() method for faster single-branch lookups Brodie Rao <brodie@sf.io> parents: 16696 diff changeset	686 except error.RepoLookupError:
5570 78a6b985882f update: default to tipmost branch if default branch doesn't exist Matt Mackall <mpm@selenic.com> parents: 5489 diff changeset	687 if wc.branch() == "default": # no default branch!
78a6b985882f update: default to tipmost branch if default branch doesn't exist Matt Mackall <mpm@selenic.com> parents: 5489 diff changeset	688 node = repo.lookup("tip") # update to tip
78a6b985882f update: default to tipmost branch if default branch doesn't exist Matt Mackall <mpm@selenic.com> parents: 5489 diff changeset	689 else:
78a6b985882f update: default to tipmost branch if default branch doesn't exist Matt Mackall <mpm@selenic.com> parents: 5489 diff changeset	690 raise util.Abort(_("branch %s not found") % wc.branch())
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	691 overwrite = force and not branchmerge
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	692 pl = wc.parents()
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6746 diff changeset	693 p1, p2 = pl[0], repo[node]
13874 9d67277c9204 merge: add ancestor to the update function Matt Mackall <mpm@selenic.com> parents: 13728 diff changeset	694 if ancestor:
9d67277c9204 merge: add ancestor to the update function Matt Mackall <mpm@selenic.com> parents: 13728 diff changeset	695 pa = repo[ancestor]
9d67277c9204 merge: add ancestor to the update function Matt Mackall <mpm@selenic.com> parents: 13728 diff changeset	696 else:
9d67277c9204 merge: add ancestor to the update function Matt Mackall <mpm@selenic.com> parents: 13728 diff changeset	697 pa = p1.ancestor(p2)
9d67277c9204 merge: add ancestor to the update function Matt Mackall <mpm@selenic.com> parents: 13728 diff changeset	698
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	699 fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2)
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3312 diff changeset	700
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	701 ### check phase
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	702 if not overwrite and len(pl) > 1:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	703 raise util.Abort(_("outstanding uncommitted merges"))
6375 cdc458b12f0f update: better logic and messages for updates Matt Mackall <mpm@selenic.com> parents: 6350 diff changeset	704 if branchmerge:
cdc458b12f0f update: better logic and messages for updates Matt Mackall <mpm@selenic.com> parents: 6350 diff changeset	705 if pa == p2:
11417 6f1d1ed3e19a merge: improve merge with ancestor message Matt Mackall <mpm@selenic.com> parents: 11178 diff changeset	706 raise util.Abort(_("merging with a working directory ancestor"
6f1d1ed3e19a merge: improve merge with ancestor message Matt Mackall <mpm@selenic.com> parents: 11178 diff changeset	707 " has no effect"))
6375 cdc458b12f0f update: better logic and messages for updates Matt Mackall <mpm@selenic.com> parents: 6350 diff changeset	708 elif pa == p1:
16696 d1afbf03e69a rebase: allow collapsing branches in place (issue3111) Patrick Mezard <patrick@mezard.eu> parents: 16683 diff changeset	709 if not mergeancestor and p1.branch() == p2.branch():
15619 6c8573dd1b6b merge: make 'nothing to merge' aborts consistent Kevin Bullock <kbullock@ringworld.org> parents: 15538 diff changeset	710 raise util.Abort(_("nothing to merge"),
6c8573dd1b6b merge: make 'nothing to merge' aborts consistent Kevin Bullock <kbullock@ringworld.org> parents: 15538 diff changeset	711 hint=_("use 'hg update' "
6c8573dd1b6b merge: make 'nothing to merge' aborts consistent Kevin Bullock <kbullock@ringworld.org> parents: 15538 diff changeset	712 "or check 'hg heads'"))
6375 cdc458b12f0f update: better logic and messages for updates Matt Mackall <mpm@selenic.com> parents: 6350 diff changeset	713 if not force and (wc.files() or wc.deleted()):
19802 94c394653b2a merge: standardize error message for dirty working dir Siddharth Agarwal <sid0@fb.com> parents: 19801 diff changeset	714 raise util.Abort(_("uncommitted changes"),
15619 6c8573dd1b6b merge: make 'nothing to merge' aborts consistent Kevin Bullock <kbullock@ringworld.org> parents: 15538 diff changeset	715 hint=_("use 'hg status' to list changes"))
18364 6252b4f1c4b4 subrepos: process subrepos in sorted order Mads Kiilerich <mads@kiilerich.com> parents: 18360 diff changeset	716 for s in sorted(wc.substate):
13437 6169493ac3f9 Do not allow merging with uncommitted changes in a subrepo Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 13400 diff changeset	717 if wc.sub(s).dirty():
19803 0f64af33fb63 merge: standardize error message for dirty subrepo Siddharth Agarwal <sid0@fb.com> parents: 19802 diff changeset	718 raise util.Abort(_("uncommitted changes in "
13437 6169493ac3f9 Do not allow merging with uncommitted changes in a subrepo Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 13400 diff changeset	719 "subrepository '%s'") % s)
6169493ac3f9 Do not allow merging with uncommitted changes in a subrepo Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 13400 diff changeset	720
6375 cdc458b12f0f update: better logic and messages for updates Matt Mackall <mpm@selenic.com> parents: 6350 diff changeset	721 elif not overwrite:
19929 ab2362e1672e merge: exit early during a no-op update (BC) Siddharth Agarwal <sid0@fb.com> parents: 19803 diff changeset	722 if p1 == p2: # no-op update
ab2362e1672e merge: exit early during a no-op update (BC) Siddharth Agarwal <sid0@fb.com> parents: 19803 diff changeset	723 # call the hooks and exit early
ab2362e1672e merge: exit early during a no-op update (BC) Siddharth Agarwal <sid0@fb.com> parents: 19803 diff changeset	724 repo.hook('preupdate', throw=True, parent1=xp2, parent2='')
ab2362e1672e merge: exit early during a no-op update (BC) Siddharth Agarwal <sid0@fb.com> parents: 19803 diff changeset	725 repo.hook('update', parent1=xp2, parent2='', error=0)
ab2362e1672e merge: exit early during a no-op update (BC) Siddharth Agarwal <sid0@fb.com> parents: 19803 diff changeset	726 return 0, 0, 0, 0
ab2362e1672e merge: exit early during a no-op update (BC) Siddharth Agarwal <sid0@fb.com> parents: 19803 diff changeset	727
18985 a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	728 if pa not in (p1, p2): # nolinear
a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	729 dirty = wc.dirty(missing=True)
a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	730 if dirty or onode is None:
a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	731 # Branching is a bit strange to ensure we do the minimal
a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	732 # amount of call to obsolete.background.
a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	733 foreground = obsolete.foreground(repo, [p1.node()])
a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	734 # note: the <node> variable contains a random identifier
a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	735 if repo[node].node() in foreground:
a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	736 pa = p1 # allow updating to successors
19799 ab3e42225dbc update: add error message for dirty non-linear update with no rev Siddharth Agarwal <sid0@fb.com> parents: 19798 diff changeset	737 elif dirty:
ab3e42225dbc update: add error message for dirty non-linear update with no rev Siddharth Agarwal <sid0@fb.com> parents: 19798 diff changeset	738 msg = _("uncommitted changes")
19800 4894e0d9462d update: improve error message for dirty non-linear update with rev Siddharth Agarwal <sid0@fb.com> parents: 19799 diff changeset	739 if onode is None:
4894e0d9462d update: improve error message for dirty non-linear update with rev Siddharth Agarwal <sid0@fb.com> parents: 19799 diff changeset	740 hint = _("commit and merge, or update --clean to"
4894e0d9462d update: improve error message for dirty non-linear update with rev Siddharth Agarwal <sid0@fb.com> parents: 19799 diff changeset	741 " discard changes")
4894e0d9462d update: improve error message for dirty non-linear update with rev Siddharth Agarwal <sid0@fb.com> parents: 19799 diff changeset	742 else:
4894e0d9462d update: improve error message for dirty non-linear update with rev Siddharth Agarwal <sid0@fb.com> parents: 19799 diff changeset	743 hint = _("commit or update --clean to discard"
4894e0d9462d update: improve error message for dirty non-linear update with rev Siddharth Agarwal <sid0@fb.com> parents: 19799 diff changeset	744 " changes")
19799 ab3e42225dbc update: add error message for dirty non-linear update with no rev Siddharth Agarwal <sid0@fb.com> parents: 19798 diff changeset	745 raise util.Abort(msg, hint=hint)
18985 a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	746 else: # node is none
19798 76df01e56e7f update: improve error message for clean non-linear update Siddharth Agarwal <sid0@fb.com> parents: 19482 diff changeset	747 msg = _("not a linear update")
76df01e56e7f update: improve error message for clean non-linear update Siddharth Agarwal <sid0@fb.com> parents: 19482 diff changeset	748 hint = _("merge or update --check to force update")
76df01e56e7f update: improve error message for clean non-linear update Siddharth Agarwal <sid0@fb.com> parents: 19482 diff changeset	749 raise util.Abort(msg, hint=hint)
18985 a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	750 else:
a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	751 # Allow jumping branches if clean and specific rev given
a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	752 pa = p1
2814 0f787997e3c2 Merge: move most tests to the beginning Matt Mackall <mpm@selenic.com> parents: 2813 diff changeset	753
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	754 ### calculate phase
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	755 actions = calculateupdates(repo, wc, p2, pa,
18778 1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	756 branchmerge, force, partial, mergeancestor)
2775 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	757
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	758 ### apply phase
13550 1792b8a9422b merge: back out single-parent fast-forward merge Matt Mackall <mpm@selenic.com> parents: 13536 diff changeset	759 if not branchmerge: # just jump to the new rev
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	760 fp1, fp2, xp1, xp2 = fp2, nullid, xp2, ''
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	761 if not partial:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	762 repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2)
19482 499fc471296b update: add tracking of interrupted updates (issue3113) Matt Mackall <mpm@selenic.com> parents: 19285 diff changeset	763 # note that we're in the middle of an update
499fc471296b update: add tracking of interrupted updates (issue3113) Matt Mackall <mpm@selenic.com> parents: 19285 diff changeset	764 repo.vfs.write('updatestate', p2.hex())
2775 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	765
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	766 stats = applyupdates(repo, actions, wc, p2, pa, overwrite)
2899 8743188f4d2e merge: consolidate dirstate updates Matt Mackall <mpm@selenic.com> parents: 2898 diff changeset	767
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	768 if not partial:
16551 ebf6d38c9063 localrepo: add setparents() to adjust dirstate copies (issue3407) Patrick Mezard <patrick@mezard.eu> parents: 16534 diff changeset	769 repo.setparents(fp1, fp2)
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	770 recordupdates(repo, actions, branchmerge)
19482 499fc471296b update: add tracking of interrupted updates (issue3113) Matt Mackall <mpm@selenic.com> parents: 19285 diff changeset	771 # update completed, clear state
499fc471296b update: add tracking of interrupted updates (issue3113) Matt Mackall <mpm@selenic.com> parents: 19285 diff changeset	772 util.unlink(repo.join('updatestate'))
499fc471296b update: add tracking of interrupted updates (issue3113) Matt Mackall <mpm@selenic.com> parents: 19285 diff changeset	773
13561 0ab0ceefddf2 merge: remove last traces of fastforward merging Mads Kiilerich <mads@kiilerich.com> parents: 13550 diff changeset	774 if not branchmerge:
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	775 repo.dirstate.setbranch(p2.branch())
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	776 finally:
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 7848 diff changeset	777 wlock.release()
10492 0e64d814d7d0 run commit and update hooks after command completion (issue1827) Sune Foldager <cryo@cyanite.org> parents: 10431 diff changeset	778
0e64d814d7d0 run commit and update hooks after command completion (issue1827) Sune Foldager <cryo@cyanite.org> parents: 10431 diff changeset	779 if not partial:
0e64d814d7d0 run commit and update hooks after command completion (issue1827) Sune Foldager <cryo@cyanite.org> parents: 10431 diff changeset	780 repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])
0e64d814d7d0 run commit and update hooks after command completion (issue1827) Sune Foldager <cryo@cyanite.org> parents: 10431 diff changeset	781 return stats

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/merge.py @ 19929:ab2362e1672e