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

annotate mercurial/merge.py @ 19095:5cc71484ee9c stable

merge: increase safety of parallel updating/removing on icasefs "merge.applyupdates()" sorts "actions" in removal first order, and "workeractions" derived from it should be also sorted. If each actions in "workeractions" are executed in serial, this sorting ensures that merging/updating process is collision free, because updating the file in target context is always executed after removing the existing file which causes case-folding collision against the former. In the other hand, if each actions are executed in parallel, updating on a worker process may be executed before removing on another worker process, because "worker.partition()" partitions list of actions regardless of type of each actions. This patch divides "workeractions" into removing and updating, and executes the former first. This patch still scans "actions"/"workeractions" some times for ease of patch review, even though large list may cost much in this way. (total cost should be as same as before) This also changes some tests, because dividing "workeractions" affects progress indication.

author	FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date	Mon, 29 Apr 2013 15:58:15 +0900
parents	a59e575c6ff8
children	c60a7f5a741f

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
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	64 def mark(self, dfile, state):
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	65 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	66 self._dirty = True
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	67 def resolve(self, dfile, wctx, octx):
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	68 if self[dfile] == 'r':
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	69 return 0
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6517 diff changeset	70 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	71 fcd = wctx[dfile]
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	72 fco = octx[ofile]
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	73 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	74 # "premerge" x flags
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	75 flo = fco.flags()
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	76 fla = fca.flags()
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	77 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	78 if fca.node() == nullid:
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	79 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	80 afile)
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	81 elif flags == fla:
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	82 flags = flo
384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	83 # restore local
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	84 f = self._repo.opener("merge/" + hash)
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	85 self._repo.wwrite(dfile, f.read(), flags)
13400 14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13323 diff changeset	86 f.close()
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	87 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	88 if r is None:
fac040b7e822 merge: drop resolve state for mergers with identical contents (issue2680) Matt Mackall <mpm@selenic.com> parents: 13437 diff changeset	89 # no real conflict
fac040b7e822 merge: drop resolve state for mergers with identical contents (issue2680) Matt Mackall <mpm@selenic.com> parents: 13437 diff changeset	90 del self._state[dfile]
fac040b7e822 merge: drop resolve state for mergers with identical contents (issue2680) Matt Mackall <mpm@selenic.com> parents: 13437 diff changeset	91 elif not r:
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	92 self.mark(dfile, 'r')
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	93 return r
2775 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	94
16093 7e30f5f2285f merge: refactor unknown file conflict checking Matt Mackall <mpm@selenic.com> parents: 16092 diff changeset	95 def _checkunknownfile(repo, wctx, mctx, f):
7e30f5f2285f merge: refactor unknown file conflict checking Matt Mackall <mpm@selenic.com> parents: 16092 diff changeset	96 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	97 and os.path.isfile(repo.wjoin(f))
16284 2b0a406d3043 merge: fix unknown file merge detection for case-folding systems Matt Mackall <mpm@selenic.com> parents: 16261 diff changeset	98 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	99 and mctx[f].cmp(wctx[f]))
7e30f5f2285f merge: refactor unknown file conflict checking Matt Mackall <mpm@selenic.com> parents: 16092 diff changeset	100
7e30f5f2285f merge: refactor unknown file conflict checking Matt Mackall <mpm@selenic.com> parents: 16092 diff changeset	101 def _checkunknown(repo, wctx, mctx):
3315 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	102 "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	103
44fa047cef57 merge: report all files in _checkunknown Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 15774 diff changeset	104 error = False
16093 7e30f5f2285f merge: refactor unknown file conflict checking Matt Mackall <mpm@selenic.com> parents: 16092 diff changeset	105 for f in mctx:
7e30f5f2285f merge: refactor unknown file conflict checking Matt Mackall <mpm@selenic.com> parents: 16092 diff changeset	106 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	107 error = True
16093 7e30f5f2285f merge: refactor unknown file conflict checking Matt Mackall <mpm@selenic.com> parents: 16092 diff changeset	108 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	109 if error:
44fa047cef57 merge: report all files in _checkunknown Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 15774 diff changeset	110 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	111 "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	112
17889 ce7bc04d863b icasefs: make case-folding collision detection as deletion aware (issue3648) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16794 diff changeset	113 def _remains(f, m, ma, workingctx=False):
ce7bc04d863b icasefs: make case-folding collision detection as deletion aware (issue3648) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16794 diff changeset	114 """check whether specified file remains after merge.
ce7bc04d863b icasefs: make case-folding collision detection as deletion aware (issue3648) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16794 diff changeset	115
ce7bc04d863b icasefs: make case-folding collision detection as deletion aware (issue3648) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16794 diff changeset	116 It is assumed that specified file is not contained in the manifest
ce7bc04d863b icasefs: make case-folding collision detection as deletion aware (issue3648) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16794 diff changeset	117 of the other context.
ce7bc04d863b icasefs: make case-folding collision detection as deletion aware (issue3648) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16794 diff changeset	118 """
ce7bc04d863b icasefs: make case-folding collision detection as deletion aware (issue3648) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16794 diff changeset	119 if f in ma:
ce7bc04d863b icasefs: make case-folding collision detection as deletion aware (issue3648) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16794 diff changeset	120 n = m[f]
ce7bc04d863b icasefs: make case-folding collision detection as deletion aware (issue3648) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16794 diff changeset	121 if n != ma[f]:
ce7bc04d863b icasefs: make case-folding collision detection as deletion aware (issue3648) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16794 diff changeset	122 return True # because it is changed locally
ce7bc04d863b icasefs: make case-folding collision detection as deletion aware (issue3648) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16794 diff changeset	123 # even though it doesn't remain, if "remote deleted" is
ce7bc04d863b icasefs: make case-folding collision detection as deletion aware (issue3648) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16794 diff changeset	124 # chosen in manifestmerge()
ce7bc04d863b icasefs: make case-folding collision detection as deletion aware (issue3648) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16794 diff changeset	125 elif workingctx and n[20:] == "a":
ce7bc04d863b icasefs: make case-folding collision detection as deletion aware (issue3648) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16794 diff changeset	126 return True # because it is added locally (linear merge specific)
ce7bc04d863b icasefs: make case-folding collision detection as deletion aware (issue3648) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16794 diff changeset	127 else:
ce7bc04d863b icasefs: make case-folding collision detection as deletion aware (issue3648) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16794 diff changeset	128 return False # because it is removed remotely
ce7bc04d863b icasefs: make case-folding collision detection as deletion aware (issue3648) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16794 diff changeset	129 else:
ce7bc04d863b icasefs: make case-folding collision detection as deletion aware (issue3648) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16794 diff changeset	130 return True # because it is added locally
ce7bc04d863b icasefs: make case-folding collision detection as deletion aware (issue3648) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16794 diff changeset	131
ce7bc04d863b icasefs: make case-folding collision detection as deletion aware (issue3648) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16794 diff changeset	132 def _checkcollision(mctx, extractxs):
3785 6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3773 diff changeset	133 "check for case folding collisions in the destination context"
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3773 diff changeset	134 folded = {}
6272 dd9bd227ae9a merge: simplify some helpers Matt Mackall <mpm@selenic.com> parents: 6271 diff changeset	135 for fn in mctx:
15637 7f01ad702405 icasefs: use util.normcase() instead of str.lower() or os.path.normpath() FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15538 diff changeset	136 fold = util.normcase(fn)
3785 6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3773 diff changeset	137 if fold in folded:
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3773 diff changeset	138 raise util.Abort(_("case-folding collision between %s and %s")
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3773 diff changeset	139 % (fn, folded[fold]))
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3773 diff changeset	140 folded[fold] = fn
6398ff7cb705 imported patch collision Matt Mackall <mpm@selenic.com> parents: 3773 diff changeset	141
17889 ce7bc04d863b icasefs: make case-folding collision detection as deletion aware (issue3648) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16794 diff changeset	142 if extractxs:
ce7bc04d863b icasefs: make case-folding collision detection as deletion aware (issue3648) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16794 diff changeset	143 wctx, actx = extractxs
16478 cbf2ea2f5ca1 icasefs: make case-folding collision detection as rename aware (issue3370) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16284 diff changeset	144 # class to delay looking up copy mapping
cbf2ea2f5ca1 icasefs: make case-folding collision detection as rename aware (issue3370) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16284 diff changeset	145 class pathcopies(object):
cbf2ea2f5ca1 icasefs: make case-folding collision detection as rename aware (issue3370) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16284 diff changeset	146 @util.propertycache
cbf2ea2f5ca1 icasefs: make case-folding collision detection as rename aware (issue3370) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16284 diff changeset	147 def map(self):
cbf2ea2f5ca1 icasefs: make case-folding collision detection as rename aware (issue3370) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16284 diff changeset	148 # {dst@mctx: src@wctx} copy mapping
cbf2ea2f5ca1 icasefs: make case-folding collision detection as rename aware (issue3370) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16284 diff changeset	149 return copies.pathcopies(wctx, mctx)
cbf2ea2f5ca1 icasefs: make case-folding collision detection as rename aware (issue3370) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16284 diff changeset	150 pc = pathcopies()
cbf2ea2f5ca1 icasefs: make case-folding collision detection as rename aware (issue3370) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16284 diff changeset	151
15673 d550168f11ce merge: check filename case collision between changesets for branch merging FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15637 diff changeset	152 for fn in wctx:
d550168f11ce merge: check filename case collision between changesets for branch merging FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15637 diff changeset	153 fold = util.normcase(fn)
d550168f11ce merge: check filename case collision between changesets for branch merging FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15637 diff changeset	154 mfn = folded.get(fold, None)
17889 ce7bc04d863b icasefs: make case-folding collision detection as deletion aware (issue3648) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16794 diff changeset	155 if (mfn and mfn != fn and pc.map.get(mfn) != fn and
ce7bc04d863b icasefs: make case-folding collision detection as deletion aware (issue3648) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16794 diff changeset	156 _remains(fn, wctx.manifest(), actx.manifest(), True) and
ce7bc04d863b icasefs: make case-folding collision detection as deletion aware (issue3648) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16794 diff changeset	157 _remains(mfn, mctx.manifest(), actx.manifest())):
15673 d550168f11ce merge: check filename case collision between changesets for branch merging FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15637 diff changeset	158 raise util.Abort(_("case-folding collision between %s and %s")
d550168f11ce merge: check filename case collision between changesets for branch merging FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15637 diff changeset	159 % (mfn, fn))
d550168f11ce merge: check filename case collision between changesets for branch merging FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15637 diff changeset	160
6269 ffdf70e74623 merge: privatize some functions, unnest some others Matt Mackall <mpm@selenic.com> parents: 6268 diff changeset	161 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	162 """
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	163 Forget removed files
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	164
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	165 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	166 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	167 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	168 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	169 manifest.
6242 a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	170
a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	171 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	172 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	173 as removed.
3107 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	174 """
3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	175
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	176 actions = []
6242 a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	177 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	178 for f in wctx.deleted():
6272 dd9bd227ae9a merge: simplify some helpers Matt Mackall <mpm@selenic.com> parents: 6271 diff changeset	179 if f not in mctx:
18541 5ed6a375e9ca merge: delay debug messages for merge actions Mads Kiilerich <madski@unity3d.com> parents: 18540 diff changeset	180 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	181
a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	182 if not branchmerge:
a375ffc2aa1b merge: fix handling of deleted files Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6211 diff changeset	183 for f in wctx.removed():
6272 dd9bd227ae9a merge: simplify some helpers Matt Mackall <mpm@selenic.com> parents: 6271 diff changeset	184 if f not in mctx:
18541 5ed6a375e9ca merge: delay debug messages for merge actions Mads Kiilerich <madski@unity3d.com> parents: 18540 diff changeset	185 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	186
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	187 return actions
3107 3bd05ad67f45 merge: pull manifest checks and updates into separate functions Matt Mackall <mpm@selenic.com> parents: 3106 diff changeset	188
18778 1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	189 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	190 acceptremote=False):
3105 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	191 """
11817 d12fe809e1ee merge: fix typo in docstring Alecs King <alecsk@gmail.com> parents: 11759 diff changeset	192 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	193
18605 bcf29565d89f manifestmerge: pass in branchmerge and force separately Siddharth Agarwal <sid0@fb.com> parents: 18544 diff changeset	194 branchmerge and force are as passed in to update
3315 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	195 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	196 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	197 """
7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	198
18605 bcf29565d89f manifestmerge: pass in branchmerge and force separately Siddharth Agarwal <sid0@fb.com> parents: 18544 diff changeset	199 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	200 actions, copy, movewithdir = [], {}, {}
8753 af5f099d932b merge: refactor manifestmerge init to better report effective ancestor Matt Mackall <mpm@selenic.com> parents: 8752 diff changeset	201
18651 e556659340f0 manifestmerge: fix order in which manifests are fetched Siddharth Agarwal <sid0@fb.com> parents: 18650 diff changeset	202 followcopies = False
8749 69caf50da4a0 merge: refactor some initialization, drop backwards var Matt Mackall <mpm@selenic.com> parents: 8748 diff changeset	203 if overwrite:
18611 18c2184c27dc merge: rename p1 to wctx in manifestmerge Bryan O'Sullivan <bryano@fb.com> parents: 18606 diff changeset	204 pa = wctx
8753 af5f099d932b merge: refactor manifestmerge init to better report effective ancestor Matt Mackall <mpm@selenic.com> parents: 8752 diff changeset	205 elif pa == p2: # backwards
18611 18c2184c27dc merge: rename p1 to wctx in manifestmerge Bryan O'Sullivan <bryano@fb.com> parents: 18606 diff changeset	206 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	207 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	208 pass
8753 af5f099d932b merge: refactor manifestmerge init to better report effective ancestor Matt Mackall <mpm@selenic.com> parents: 8752 diff changeset	209 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	210 followcopies = True
e556659340f0 manifestmerge: fix order in which manifests are fetched Siddharth Agarwal <sid0@fb.com> parents: 18650 diff changeset	211
e556659340f0 manifestmerge: fix order in which manifests are fetched Siddharth Agarwal <sid0@fb.com> parents: 18650 diff changeset	212 # 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	213 [x.manifest() for x in
e556659340f0 manifestmerge: fix order in which manifests are fetched Siddharth Agarwal <sid0@fb.com> parents: 18650 diff changeset	214 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	215
e556659340f0 manifestmerge: fix order in which manifests are fetched Siddharth Agarwal <sid0@fb.com> parents: 18650 diff changeset	216 if followcopies:
18611 18c2184c27dc merge: rename p1 to wctx in manifestmerge Bryan O'Sullivan <bryano@fb.com> parents: 18606 diff changeset	217 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	218 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	219 for of, fl in diverge.iteritems():
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	220 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	221 for of, fl in renamedelete.iteritems():
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	222 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	223
af5f099d932b merge: refactor manifestmerge init to better report effective ancestor Matt Mackall <mpm@selenic.com> parents: 8752 diff changeset	224 repo.ui.note(_("resolving manifests\n"))
18605 bcf29565d89f manifestmerge: pass in branchmerge and force separately Siddharth Agarwal <sid0@fb.com> parents: 18544 diff changeset	225 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	226 % (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	227 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	228
18611 18c2184c27dc merge: rename p1 to wctx in manifestmerge Bryan O'Sullivan <bryano@fb.com> parents: 18606 diff changeset	229 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	230 copied = set(copy.values())
18134 6c35b53cd28b copies: separate moves via directory renames from explicit copies Siddharth Agarwal <sid0@fb.com> parents: 18042 diff changeset	231 copied.update(movewithdir.values())
3295 72d1e521da77 merge: use contexts for manifestmerge Matt Mackall <mpm@selenic.com> parents: 3292 diff changeset	232
11470 34e33d50c26b subrepo: correctly handle update -C with modified subrepos (issue2022) Matt Mackall <mpm@selenic.com> parents: 11466 diff changeset	233 if '.hgsubstate' in m1:
9783 ee00ef6f9be7 submerge: properly deal with overwrites Matt Mackall <mpm@selenic.com> parents: 9780 diff changeset	234 # 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	235 for s in sorted(wctx.substate):
18c2184c27dc merge: rename p1 to wctx in manifestmerge Bryan O'Sullivan <bryano@fb.com> parents: 18606 diff changeset	236 if wctx.sub(s).dirty():
9783 ee00ef6f9be7 submerge: properly deal with overwrites Matt Mackall <mpm@selenic.com> parents: 9780 diff changeset	237 m1['.hgsubstate'] += "+"
ee00ef6f9be7 submerge: properly deal with overwrites Matt Mackall <mpm@selenic.com> parents: 9780 diff changeset	238 break
ee00ef6f9be7 submerge: properly deal with overwrites Matt Mackall <mpm@selenic.com> parents: 9780 diff changeset	239
18606 95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	240 aborts, prompts = [], []
3105 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	241 # Compare manifests
18822 381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	242 fdiff = dicthelpers.diff(m1, m2)
381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	243 flagsdiff = m1.flagsdiff(m2)
381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	244 diff12 = dicthelpers.join(fdiff, flagsdiff)
381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	245
381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	246 for f, (n12, fl12) in diff12.iteritems():
381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	247 if n12:
381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	248 n1, n2 = n12
381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	249 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	250 n1 = n2 = m1.get(f, None)
ed676ed67a5c manifestmerge: handle workdir removed, remote removed with flags Siddharth Agarwal <sid0@fb.com> parents: 18876 diff changeset	251 if n1 is None:
ed676ed67a5c manifestmerge: handle workdir removed, remote removed with flags Siddharth Agarwal <sid0@fb.com> parents: 18876 diff changeset	252 # 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	253 # 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	254 # 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	255 # 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	256 continue
18822 381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	257 if fl12:
381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	258 fl1, fl2 = fl12
381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	259 else: # flags didn't change, file contents did
381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	260 fl1 = fl2 = m1.flags(f)
381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	261
3248 751840e739a1 merge: reduce manifest copying Matt Mackall <mpm@selenic.com> parents: 3247 diff changeset	262 if partial and not partial(f):
751840e739a1 merge: reduce manifest copying Matt Mackall <mpm@selenic.com> parents: 3247 diff changeset	263 continue
18822 381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	264 if n1 and n2:
381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	265 fla = ma.flags(f)
18338 384df4db6520 merge: merge file flags together with file content Mads Kiilerich <mads@kiilerich.com> parents: 18336 diff changeset	266 nol = 'l' not in fl1 + fl2 + fla
8752 f177bdab261b merge: simplify file revision comparison logic Matt Mackall <mpm@selenic.com> parents: 8751 diff changeset	267 a = ma.get(f, nullid)
18822 381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	268 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	269 pass # remote unchanged - keep local
18818 a0bff3d4f67b manifestmerge: rename n to n1 and n2 Siddharth Agarwal <sid0@fb.com> parents: 18780 diff changeset	270 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	271 if n1 == n2: # optimization: keep local content
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	272 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	273 else:
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	274 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	275 elif nol and n2 == a: # remote only changed 'x'
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	276 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	277 elif nol and n1 == a: # local only changed 'x'
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	278 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	279 else: # both changed something
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	280 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	281 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	282 pass
18822 381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	283 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	284 f2 = movewithdir[f]
18823 b2a36e9b9ccc manifestmerge: drop redundant flags calls Siddharth Agarwal <sid0@fb.com> parents: 18822 diff changeset	285 actions.append((f, "d", (None, f2, fl1),
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	286 "remote renamed directory to " + f2))
18822 381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	287 elif n1 and f in copy:
3249 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	288 f2 = copy[f]
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	289 actions.append((f, "m", (f2, f, False),
d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	290 "local copied/moved to " + f2))
18822 381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	291 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	292 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	293 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	294 elif n1[20:] == "a": # added, no remote
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	295 actions.append((f, "f", None, "remote deleted"))
16094 0776a6cababe merge: don't use unknown() Matt Mackall <mpm@selenic.com> parents: 16093 diff changeset	296 else:
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	297 actions.append((f, "r", None, "other deleted"))
18822 381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	298 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	299 f2 = movewithdir[f]
18823 b2a36e9b9ccc manifestmerge: drop redundant flags calls Siddharth Agarwal <sid0@fb.com> parents: 18822 diff changeset	300 actions.append((None, "d", (f, f2, fl2),
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	301 "local renamed directory to " + f2))
18822 381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	302 elif n2 and f in copy:
3249 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	303 f2 = copy[f]
18339 aadefcee1f5e merge: remove "case" comments Mads Kiilerich <mads@kiilerich.com> parents: 18338 diff changeset	304 if f2 in m2:
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	305 actions.append((f2, "m", (f, f, False),
d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	306 "remote copied to " + f))
18339 aadefcee1f5e merge: remove "case" comments Mads Kiilerich <mads@kiilerich.com> parents: 18338 diff changeset	307 else:
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	308 actions.append((f2, "m", (f, f, True),
d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	309 "remote moved to " + f))
18822 381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	310 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	311 # 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	312 # following table:
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	313 #
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	314 # force branchmerge different \| action
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	315 # n * n \| get
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	316 # n * y \| abort
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	317 # y n * \| get
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	318 # y y n \| get
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	319 # y y y \| merge
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	320 #
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	321 # 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	322 # 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	323 if force and not branchmerge:
18823 b2a36e9b9ccc manifestmerge: drop redundant flags calls Siddharth Agarwal <sid0@fb.com> parents: 18822 diff changeset	324 actions.append((f, "g", (fl2,), "remote created"))
18339 aadefcee1f5e merge: remove "case" comments Mads Kiilerich <mads@kiilerich.com> parents: 18338 diff changeset	325 else:
18611 18c2184c27dc merge: rename p1 to wctx in manifestmerge Bryan O'Sullivan <bryano@fb.com> parents: 18606 diff changeset	326 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	327 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	328 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	329 "remote differs from untracked local"))
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	330 elif not force and different:
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	331 aborts.append((f, "ud"))
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	332 else:
18823 b2a36e9b9ccc manifestmerge: drop redundant flags calls Siddharth Agarwal <sid0@fb.com> parents: 18822 diff changeset	333 actions.append((f, "g", (fl2,), "remote created"))
18822 381c0ef72a56 manifestmerge: use dicthelpers.diff and join Siddharth Agarwal <sid0@fb.com> parents: 18818 diff changeset	334 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	335 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	336
18606 95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	337 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	338 if m == "ud":
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	339 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	340 else: assert False, m
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	341 if aborts:
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	342 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	343 "from files in requested revision"))
95773237df7f manifestmerge: handle abort on local unknown, remote created files Siddharth Agarwal <sid0@fb.com> parents: 18605 diff changeset	344
18539 cf25e4efd685 merge: delay prompts a bit and show them in (extra) sorted order Mads Kiilerich <madski@unity3d.com> parents: 18505 diff changeset	345 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	346 if m == "cd":
18778 1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	347 if acceptremote:
1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	348 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	349 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	350 _("local changed %s which remote deleted\n"
18539 cf25e4efd685 merge: delay prompts a bit and show them in (extra) sorted order Mads Kiilerich <madski@unity3d.com> parents: 18505 diff changeset	351 "use (c)hanged version or (d)elete?") % f,
cf25e4efd685 merge: delay prompts a bit and show them in (extra) sorted order Mads Kiilerich <madski@unity3d.com> parents: 18505 diff changeset	352 (_("&Changed"), _("&Delete")), 0):
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	353 actions.append((f, "r", None, "prompt delete"))
16094 0776a6cababe merge: don't use unknown() Matt Mackall <mpm@selenic.com> parents: 16093 diff changeset	354 else:
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	355 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	356 elif m == "dc":
18778 1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	357 if acceptremote:
1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	358 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	359 elif repo.ui.promptchoice(
8741 e592180ba435 merge: reorder remote creation tests Matt Mackall <mpm@selenic.com> parents: 8740 diff changeset	360 _("remote changed %s which local deleted\n"
e592180ba435 merge: reorder remote creation tests Matt Mackall <mpm@selenic.com> parents: 8740 diff changeset	361 "use (c)hanged version or leave (d)eleted?") % f,
9048 86b4a9b0ddda ui: extract choice from prompt Simon Heimberg <simohe@besonet.ch> parents: 9030 diff changeset	362 (_("&Changed"), _("&Deleted")), 0) == 0:
18544 d0a8f09a22eb merge: inline act() Mads Kiilerich <madski@unity3d.com> parents: 18543 diff changeset	363 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	364 else: assert False, m
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	365 return actions
3105 7c7469d41ade merge: pull manifest comparison out into separate function Matt Mackall <mpm@selenic.com> parents: 3104 diff changeset	366
8366 0bf0045000b5 some modernization cleanups, forward compatibility Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8312 diff changeset	367 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	368 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	369
18632 3e20079117c5 merge: handle subrepo merges and .hgsubstate specially Bryan O'Sullivan <bryano@fb.com> parents: 18630 diff changeset	370 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	371 """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	372
9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	373 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	374
9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	375 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	376 """
18640 a8648f32b8ed merge: don't fiddle with name lookups or i18n in hot loops Bryan O'Sullivan <bryano@fb.com> parents: 18639 diff changeset	377 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	378 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	379 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	380 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	381 wwrite = repo.wwrite
18630 9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	382 audit = repo.wopener.audit
18633 6390dd22b12f merge: report non-interactive progress in chunks Bryan O'Sullivan <bryano@fb.com> parents: 18632 diff changeset	383 i = 0
6390dd22b12f merge: report non-interactive progress in chunks Bryan O'Sullivan <bryano@fb.com> parents: 18632 diff changeset	384 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	385 f = arg[0]
9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	386 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	387 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	388 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	389 audit(f)
9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	390 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	391 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	392 except OSError, inst:
9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	393 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	394 (f, inst.strerror))
9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	395 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	396 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	397 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	398 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	399 if i == 100:
6390dd22b12f merge: report non-interactive progress in chunks Bryan O'Sullivan <bryano@fb.com> parents: 18632 diff changeset	400 yield i, f
6390dd22b12f merge: report non-interactive progress in chunks Bryan O'Sullivan <bryano@fb.com> parents: 18632 diff changeset	401 i = 0
6390dd22b12f merge: report non-interactive progress in chunks Bryan O'Sullivan <bryano@fb.com> parents: 18632 diff changeset	402 i += 1
6390dd22b12f merge: report non-interactive progress in chunks Bryan O'Sullivan <bryano@fb.com> parents: 18632 diff changeset	403 if i > 0:
18630 9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	404 yield i, f
9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	405
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	406 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	407 """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	408
9b0406b23be0 merge: pass constant cset ancestor to fctx.ancestor Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11451 diff changeset	409 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	410 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	411 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	412
115a9760c382 merge: document some internal return values. Greg Ward <greg-hg@gerg.ca> parents: 13158 diff changeset	413 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	414 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	415 """
3315 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	416
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	417 updated, merged, removed, unresolved = 0, 0, 0, 0
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	418 ms = mergestate(repo)
13878 a8d13ee0ce68 misc: replace .parents()[0] with p1() Matt Mackall <mpm@selenic.com> parents: 13874 diff changeset	419 ms.reset(wctx.p1().node())
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	420 moves = []
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	421 actions.sort(key=actionkey)
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	422
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	423 # prescan for merges
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	424 for a in actions:
18541 5ed6a375e9ca merge: delay debug messages for merge actions Mads Kiilerich <madski@unity3d.com> parents: 18540 diff changeset	425 f, m, args, msg = a
5ed6a375e9ca merge: delay debug messages for merge actions Mads Kiilerich <madski@unity3d.com> parents: 18540 diff changeset	426 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	427 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	428 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	429 if fd == '.hgsubstate': # merged internally
8814 ab668c92a036 subrepo: add update/merge logic Matt Mackall <mpm@selenic.com> parents: 8753 diff changeset	430 continue
18541 5ed6a375e9ca merge: delay debug messages for merge actions Mads Kiilerich <madski@unity3d.com> parents: 18540 diff changeset	431 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	432 fcl = wctx[f]
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	433 fco = mctx[f2]
12008 fad5ed0ff997 merge: move reverse-merge logic out of filemerge (issue2342) Matt Mackall <mpm@selenic.com> parents: 11755 diff changeset	434 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	435 if fcl.parents():
13878 a8d13ee0ce68 misc: replace .parents()[0] with p1() Matt Mackall <mpm@selenic.com> parents: 13874 diff changeset	436 fca = fcl.p1()
12664 545ec1775021 merge: handle no file parent in backwards merge (issue2364) Matt Mackall <mpm@selenic.com> parents: 12401 diff changeset	437 else:
545ec1775021 merge: handle no file parent in backwards merge (issue2364) Matt Mackall <mpm@selenic.com> parents: 12401 diff changeset	438 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	439 else:
fad5ed0ff997 merge: move reverse-merge logic out of filemerge (issue2342) Matt Mackall <mpm@selenic.com> parents: 11755 diff changeset	440 fca = fcl.ancestor(fco, actx)
fad5ed0ff997 merge: move reverse-merge logic out of filemerge (issue2342) Matt Mackall <mpm@selenic.com> parents: 11755 diff changeset	441 if not fca:
fad5ed0ff997 merge: move reverse-merge logic out of filemerge (issue2342) Matt Mackall <mpm@selenic.com> parents: 11755 diff changeset	442 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	443 ms.add(fcl, fco, fca, fd)
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	444 if f != fd and move:
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	445 moves.append(f)
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	446
18328 2fee5119099b merge: consistently use repo.wopener.audit instead of creating a new auditor Mads Kiilerich <mads@kiilerich.com> parents: 18143 diff changeset	447 audit = repo.wopener.audit
14398 ae1f7a5373e8 applyupdates: audit unlinking of renamed files and directories Adrian Buehlmann <adrian@cadifra.com> parents: 14232 diff changeset	448
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	449 # remove renamed files after safely stored
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	450 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	451 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	452 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	453 audit(f)
18333 f6f23ecafc9b merge: use util.unlinkpath for removing moved files Mads Kiilerich <mads@kiilerich.com> parents: 18332 diff changeset	454 util.unlinkpath(repo.wjoin(f))
5042 f191bc3916f7 merge: do early copy to deal with issue636 Matt Mackall <mpm@selenic.com> parents: 4997 diff changeset	455
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	456 numupdates = len(actions)
18630 9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	457 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	458 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	459 updated = len(updateactions)
5cc71484ee9c merge: increase safety of parallel updating/removing on icasefs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18985 diff changeset	460 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	461 removed = len(removeactions)
18630 9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	462 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	463
18632 3e20079117c5 merge: handle subrepo merges and .hgsubstate specially Bryan O'Sullivan <bryano@fb.com> parents: 18630 diff changeset	464 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	465 if hgsub and hgsub[0] == 'r':
3e20079117c5 merge: handle subrepo merges and .hgsubstate specially Bryan O'Sullivan <bryano@fb.com> parents: 18630 diff changeset	466 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	467
18633 6390dd22b12f merge: report non-interactive progress in chunks Bryan O'Sullivan <bryano@fb.com> parents: 18632 diff changeset	468 z = 0
18639 5774732bb5e5 merge: apply non-interactive working dir updates in parallel Bryan O'Sullivan <bryano@fb.com> parents: 18633 diff changeset	469 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	470 removeactions)
5cc71484ee9c merge: increase safety of parallel updating/removing on icasefs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18985 diff changeset	471 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	472 z += i
5cc71484ee9c merge: increase safety of parallel updating/removing on icasefs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18985 diff changeset	473 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	474 unit=_('files'))
5cc71484ee9c merge: increase safety of parallel updating/removing on icasefs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18985 diff changeset	475 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	476 updateactions)
18639 5774732bb5e5 merge: apply non-interactive working dir updates in parallel Bryan O'Sullivan <bryano@fb.com> parents: 18633 diff changeset	477 for i, item in prog:
18633 6390dd22b12f merge: report non-interactive progress in chunks Bryan O'Sullivan <bryano@fb.com> parents: 18632 diff changeset	478 z += i
6390dd22b12f merge: report non-interactive progress in chunks Bryan O'Sullivan <bryano@fb.com> parents: 18632 diff changeset	479 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	480 unit=_('files'))
18630 9b9e2d9e83a1 merge: split out mostly-non-interactive working dir updates Bryan O'Sullivan <bryano@fb.com> parents: 18612 diff changeset	481
18632 3e20079117c5 merge: handle subrepo merges and .hgsubstate specially Bryan O'Sullivan <bryano@fb.com> parents: 18630 diff changeset	482 if hgsub and hgsub[0] == 'g':
3e20079117c5 merge: handle subrepo merges and .hgsubstate specially Bryan O'Sullivan <bryano@fb.com> parents: 18630 diff changeset	483 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	484
18640 a8648f32b8ed merge: don't fiddle with name lookups or i18n in hot loops Bryan O'Sullivan <bryano@fb.com> parents: 18639 diff changeset	485 _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	486 _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	487 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	488
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	489 for i, a in enumerate(actions):
18541 5ed6a375e9ca merge: delay debug messages for merge actions Mads Kiilerich <madski@unity3d.com> parents: 18540 diff changeset	490 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	491 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	492 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	493 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	494 if fd == '.hgsubstate': # subrepo states need updating
16683 525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16551 diff changeset	495 subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx),
525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16551 diff changeset	496 overwrite)
8814 ab668c92a036 subrepo: add update/merge logic Matt Mackall <mpm@selenic.com> parents: 8753 diff changeset	497 continue
18328 2fee5119099b merge: consistently use repo.wopener.audit instead of creating a new auditor Mads Kiilerich <mads@kiilerich.com> parents: 18143 diff changeset	498 audit(fd)
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6425 diff changeset	499 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	500 if r is not None and r > 0:
3249 f05c182430a0 merge: add rename following Matt Mackall <mpm@selenic.com> parents: 3248 diff changeset	501 unresolved += 1
3309 e8be5942335d merge: pull file copy/move out of filemerge Matt Mackall <mpm@selenic.com> parents: 3308 diff changeset	502 else:
3400 d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3372 diff changeset	503 if r is None:
d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3372 diff changeset	504 updated += 1
d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3372 diff changeset	505 else:
d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3372 diff changeset	506 merged += 1
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	507 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	508 f2, fd, flags = args
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	509 if f:
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	510 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	511 audit(f)
18335 435909bf0257 merge: drop reference to file contents immediately after write Mads Kiilerich <mads@kiilerich.com> parents: 18334 diff changeset	512 repo.wwrite(fd, wctx.filectx(f).data(), flags)
13235 6bf39d88c857 rename util.unlink to unlinkpath Adrian Buehlmann <adrian@cadifra.com> parents: 13162 diff changeset	513 util.unlinkpath(repo.wjoin(f))
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	514 if f2:
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	515 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	516 repo.wwrite(fd, mctx.filectx(f2).data(), flags)
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	517 updated += 1
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	518 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	519 fl, = args
12757 62c8f7691bc3 merge: make 'diverging renames' diagnostic a more helpful note. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 12746 diff changeset	520 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	521 "multiple times to:\n") % f)
4674 723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	522 for nf in fl:
723e0ddb6ada merge: warn user about divergent renames Matt Mackall <mpm@selenic.com> parents: 4635 diff changeset	523 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	524 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	525 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	526 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	527 "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	528 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	529 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	530 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	531 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	532 audit(f)
14232 df2399663392 rename util.set_flags to setflags Adrian Buehlmann <adrian@cadifra.com> parents: 14220 diff changeset	533 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	534 updated += 1
12369 6f0d9d79111f merge: delay writing the mergestate during until commit is called Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 12279 diff changeset	535 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	536 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	537
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	538 return updated, merged, removed, unresolved
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	539
18778 1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	540 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	541 acceptremote=False):
18035 5881d5b7552f merge: refactor action calculation into function David Schleimer <dschleimer@fb.com> parents: 17889 diff changeset	542 "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	543 actions = []
18035 5881d5b7552f merge: refactor action calculation into function David Schleimer <dschleimer@fb.com> parents: 17889 diff changeset	544 folding = not util.checkcase(repo.path)
5881d5b7552f merge: refactor action calculation into function David Schleimer <dschleimer@fb.com> parents: 17889 diff changeset	545 if folding:
5881d5b7552f merge: refactor action calculation into function David Schleimer <dschleimer@fb.com> parents: 17889 diff changeset	546 # collision check is not needed for clean update
5881d5b7552f merge: refactor action calculation into function David Schleimer <dschleimer@fb.com> parents: 17889 diff changeset	547 if (not branchmerge and
5881d5b7552f merge: refactor action calculation into function David Schleimer <dschleimer@fb.com> parents: 17889 diff changeset	548 (force or not tctx.dirty(missing=True, branch=False))):
5881d5b7552f merge: refactor action calculation into function David Schleimer <dschleimer@fb.com> parents: 17889 diff changeset	549 _checkcollision(mctx, None)
5881d5b7552f merge: refactor action calculation into function David Schleimer <dschleimer@fb.com> parents: 17889 diff changeset	550 else:
18042 551e2901192e merge: fix mistake in moved _checkcollision call from 5881d5b7552f Kevin Bullock <kbullock@ringworld.org> parents: 18036 diff changeset	551 _checkcollision(mctx, (tctx, ancestor))
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	552 actions += manifestmerge(repo, tctx, mctx,
b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	553 ancestor,
18605 bcf29565d89f manifestmerge: pass in branchmerge and force separately Siddharth Agarwal <sid0@fb.com> parents: 18544 diff changeset	554 branchmerge, force,
18778 1ef89df2c248 rebase: fix --collapse when a file was added then removed Durham Goode <durham@fb.com> parents: 18651 diff changeset	555 partial, acceptremote)
18036 8b846dbc57b6 merge: support calculating merge actions against non-working contexts David Schleimer <dschleimer@fb.com> parents: 18035 diff changeset	556 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	557 actions += _forgetremoved(tctx, mctx, branchmerge)
b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	558 return actions
18035 5881d5b7552f merge: refactor action calculation into function David Schleimer <dschleimer@fb.com> parents: 17889 diff changeset	559
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	560 def recordupdates(repo, actions, branchmerge):
3315 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	561 "record merge actions to the dirstate"
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	562
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	563 for a in actions:
18541 5ed6a375e9ca merge: delay debug messages for merge actions Mads Kiilerich <madski@unity3d.com> parents: 18540 diff changeset	564 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	565 if m == "r": # remove
5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	566 if branchmerge:
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4884 diff changeset	567 repo.dirstate.remove(f)
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	568 else:
14434 cc8c09855d19 dirstate: rename forget to drop Matt Mackall <mpm@selenic.com> parents: 14406 diff changeset	569 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	570 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	571 if not branchmerge:
5bf5fd1e2a74 merge: mark kept local files as readded on linear update (issue539) Matt Mackall <mpm@selenic.com> parents: 7631 diff changeset	572 repo.dirstate.add(f)
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	573 elif m == "f": # forget
14434 cc8c09855d19 dirstate: rename forget to drop Matt Mackall <mpm@selenic.com> parents: 14406 diff changeset	574 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	575 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	576 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	577 elif m == "g": # get
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	578 if branchmerge:
10968 7a0d096e221e dirstate: more explicit name, rename normaldirty() to otherparent() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10492 diff changeset	579 repo.dirstate.otherparent(f)
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	580 else:
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4884 diff changeset	581 repo.dirstate.normal(f)
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	582 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	583 f2, fd, move = args
3251 c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3249 diff changeset	584 if branchmerge:
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3249 diff changeset	585 # 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	586 # 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	587 repo.dirstate.merge(fd)
3372 ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3371 diff changeset	588 if f != f2: # copy/rename
ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3371 diff changeset	589 if move:
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4884 diff changeset	590 repo.dirstate.remove(f)
3372 ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3371 diff changeset	591 if f != fd:
ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3371 diff changeset	592 repo.dirstate.copy(f, fd)
ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3371 diff changeset	593 else:
ba7c74081861 merge: update dirstate correctly for non-branchmerge updates Matt Mackall <mpm@selenic.com> parents: 3371 diff changeset	594 repo.dirstate.copy(f2, fd)
3251 c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3249 diff changeset	595 else:
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3249 diff changeset	596 # We've update-merged a locally modified file, so
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3249 diff changeset	597 # we set the dirstate to emulate a normal checkout
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3249 diff changeset	598 # 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	599 # merge will appear as a normal local file
c93ce7f10f85 merge: fixes for merge+rename Matt Mackall <mpm@selenic.com> parents: 3249 diff changeset	600 # modification.
11178 21a7ae13208f merge: avoid to break the dirstate copy status on moved files Gilles Moris <gilles.moris@free.fr> parents: 11101 diff changeset	601 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	602 repo.dirstate.normallookup(fd)
3308 ecc1bf27378c merge: unify merge and copy actions Matt Mackall <mpm@selenic.com> parents: 3307 diff changeset	603 if move:
14434 cc8c09855d19 dirstate: rename forget to drop Matt Mackall <mpm@selenic.com> parents: 14406 diff changeset	604 repo.dirstate.drop(f)
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	605 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	606 f2, fd, flag = args
4819 9797124581c9 merge: fix adding untracked files on directory rename (issue612) Matt Mackall <mpm@selenic.com> parents: 4748 diff changeset	607 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	608 # untracked file moved
9797124581c9 merge: fix adding untracked files on directory rename (issue612) Matt Mackall <mpm@selenic.com> parents: 4748 diff changeset	609 continue
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	610 if branchmerge:
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4884 diff changeset	611 repo.dirstate.add(fd)
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	612 if f:
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4884 diff changeset	613 repo.dirstate.remove(f)
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	614 repo.dirstate.copy(f, fd)
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	615 if f2:
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	616 repo.dirstate.copy(f2, fd)
9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	617 else:
4904 6fd953d5faea dirstate: break update into separate functions Matt Mackall <mpm@selenic.com> parents: 4884 diff changeset	618 repo.dirstate.normal(fd)
3733 9e67fecbfd16 merge: handle directory renames Matt Mackall <mpm@selenic.com> parents: 3732 diff changeset	619 if f:
14434 cc8c09855d19 dirstate: rename forget to drop Matt Mackall <mpm@selenic.com> parents: 14406 diff changeset	620 repo.dirstate.drop(f)
3111 5cc62d99b785 merge: move apply and dirstate code into separate functions Matt Mackall <mpm@selenic.com> parents: 3110 diff changeset	621
16696 d1afbf03e69a rebase: allow collapsing branches in place (issue3111) Patrick Mezard <patrick@mezard.eu> parents: 16683 diff changeset	622 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	623 mergeancestor=False):
3315 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	624 """
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	625 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	626
9716 ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	627 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	628 branchmerge = whether to merge between branches
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	629 force = whether to force branch merging or file overwriting
38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	630 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	631 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	632 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	633 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	634 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	635 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	636
ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	637 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	638 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	639 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	640 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	641 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	642
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12032 diff changeset	643 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	644
ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	645 -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	646 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	647 n n n y \| ok ok ok
68a1b9d0663e update: allow branch crossing without -c or -C, with no uncommitted changes Stuart W Marks <smarks@smarks.org> parents: 9716 diff changeset	648 n n y * \| merge (2) (2)
9716 ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	649 n y * * \| --- discard ---
9717 68a1b9d0663e update: allow branch crossing without -c or -C, with no uncommitted changes Stuart W Marks <smarks@smarks.org> parents: 9716 diff changeset	650 y n y * \| --- (3) ---
9716 ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	651 y n n * \| --- ok ---
9717 68a1b9d0663e update: allow branch crossing without -c or -C, with no uncommitted changes Stuart W Marks <smarks@smarks.org> parents: 9716 diff changeset	652 y y * * \| --- (4) ---
9716 ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	653
ea8c207a0f78 update: add comments and test cases for updating across branches Stuart W Marks <smarks@smarks.org> parents: 9467 diff changeset	654 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	655 * = don't-care
9717 68a1b9d0663e update: allow branch crossing without -c or -C, with no uncommitted changes Stuart W Marks <smarks@smarks.org> parents: 9716 diff changeset	656 1 = abort: crosses branches (use 'hg merge' or 'hg update -c')
68a1b9d0663e update: allow branch crossing without -c or -C, with no uncommitted changes Stuart W Marks <smarks@smarks.org> parents: 9716 diff changeset	657 2 = abort: crosses branches (use 'hg merge' to merge or
68a1b9d0663e update: allow branch crossing without -c or -C, with no uncommitted changes Stuart W Marks <smarks@smarks.org> parents: 9716 diff changeset	658 use 'hg update -C' to discard changes)
68a1b9d0663e update: allow branch crossing without -c or -C, with no uncommitted changes Stuart W Marks <smarks@smarks.org> parents: 9716 diff changeset	659 3 = abort: uncommitted local changes
68a1b9d0663e update: allow branch crossing without -c or -C, with no uncommitted changes Stuart W Marks <smarks@smarks.org> parents: 9716 diff changeset	660 4 = incompatible options (checked in commands.py)
13162 115a9760c382 merge: document some internal return values. Greg Ward <greg-hg@gerg.ca> parents: 13158 diff changeset	661
115a9760c382 merge: document some internal return values. Greg Ward <greg-hg@gerg.ca> parents: 13158 diff changeset	662 Return the same tuple as applyupdates().
3315 38be819a1225 merge: update some docstrings Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	663 """
2815 4870f795f681 Merge: combine force and forcemerge arguments Matt Mackall <mpm@selenic.com> parents: 2814 diff changeset	664
9717 68a1b9d0663e update: allow branch crossing without -c or -C, with no uncommitted changes Stuart W Marks <smarks@smarks.org> parents: 9716 diff changeset	665 onode = node
4917 126f527b3ba3 Make repo locks recursive, eliminate all passing of lock/wlock Matt Mackall <mpm@selenic.com> parents: 4915 diff changeset	666 wlock = repo.wlock()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	667 try:
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6746 diff changeset	668 wc = repo[None]
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	669 if node is None:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	670 # tip of current branch
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	671 try:
16719 e7bf09acd410 localrepo: add branchtip() method for faster single-branch lookups Brodie Rao <brodie@sf.io> parents: 16696 diff changeset	672 node = repo.branchtip(wc.branch())
e7bf09acd410 localrepo: add branchtip() method for faster single-branch lookups Brodie Rao <brodie@sf.io> parents: 16696 diff changeset	673 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	674 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	675 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	676 else:
78a6b985882f update: default to tipmost branch if default branch doesn't exist Matt Mackall <mpm@selenic.com> parents: 5489 diff changeset	677 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	678 overwrite = force and not branchmerge
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	679 pl = wc.parents()
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6746 diff changeset	680 p1, p2 = pl[0], repo[node]
13874 9d67277c9204 merge: add ancestor to the update function Matt Mackall <mpm@selenic.com> parents: 13728 diff changeset	681 if ancestor:
9d67277c9204 merge: add ancestor to the update function Matt Mackall <mpm@selenic.com> parents: 13728 diff changeset	682 pa = repo[ancestor]
9d67277c9204 merge: add ancestor to the update function Matt Mackall <mpm@selenic.com> parents: 13728 diff changeset	683 else:
9d67277c9204 merge: add ancestor to the update function Matt Mackall <mpm@selenic.com> parents: 13728 diff changeset	684 pa = p1.ancestor(p2)
9d67277c9204 merge: add ancestor to the update function Matt Mackall <mpm@selenic.com> parents: 13728 diff changeset	685
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	686 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	687
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	688 ### check phase
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	689 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	690 raise util.Abort(_("outstanding uncommitted merges"))
6375 cdc458b12f0f update: better logic and messages for updates Matt Mackall <mpm@selenic.com> parents: 6350 diff changeset	691 if branchmerge:
cdc458b12f0f update: better logic and messages for updates Matt Mackall <mpm@selenic.com> parents: 6350 diff changeset	692 if pa == p2:
11417 6f1d1ed3e19a merge: improve merge with ancestor message Matt Mackall <mpm@selenic.com> parents: 11178 diff changeset	693 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	694 " has no effect"))
6375 cdc458b12f0f update: better logic and messages for updates Matt Mackall <mpm@selenic.com> parents: 6350 diff changeset	695 elif pa == p1:
16696 d1afbf03e69a rebase: allow collapsing branches in place (issue3111) Patrick Mezard <patrick@mezard.eu> parents: 16683 diff changeset	696 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	697 raise util.Abort(_("nothing to merge"),
6c8573dd1b6b merge: make 'nothing to merge' aborts consistent Kevin Bullock <kbullock@ringworld.org> parents: 15538 diff changeset	698 hint=_("use 'hg update' "
6c8573dd1b6b merge: make 'nothing to merge' aborts consistent Kevin Bullock <kbullock@ringworld.org> parents: 15538 diff changeset	699 "or check 'hg heads'"))
6375 cdc458b12f0f update: better logic and messages for updates Matt Mackall <mpm@selenic.com> parents: 6350 diff changeset	700 if not force and (wc.files() or wc.deleted()):
15619 6c8573dd1b6b merge: make 'nothing to merge' aborts consistent Kevin Bullock <kbullock@ringworld.org> parents: 15538 diff changeset	701 raise util.Abort(_("outstanding uncommitted changes"),
6c8573dd1b6b merge: make 'nothing to merge' aborts consistent Kevin Bullock <kbullock@ringworld.org> parents: 15538 diff changeset	702 hint=_("use 'hg status' to list changes"))
18364 6252b4f1c4b4 subrepos: process subrepos in sorted order Mads Kiilerich <mads@kiilerich.com> parents: 18360 diff changeset	703 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	704 if wc.sub(s).dirty():
6169493ac3f9 Do not allow merging with uncommitted changes in a subrepo Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 13400 diff changeset	705 raise util.Abort(_("outstanding uncommitted changes in "
6169493ac3f9 Do not allow merging with uncommitted changes in a subrepo Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 13400 diff changeset	706 "subrepository '%s'") % s)
6169493ac3f9 Do not allow merging with uncommitted changes in a subrepo Oleg Stepanov <oleg.stepanov@jetbrains.com> parents: 13400 diff changeset	707
6375 cdc458b12f0f update: better logic and messages for updates Matt Mackall <mpm@selenic.com> parents: 6350 diff changeset	708 elif not overwrite:
18985 a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	709 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	710 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	711 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	712 # 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	713 # 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	714 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	715 # 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	716 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	717 pa = p1 # allow updating to successors
a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	718 elif dirty:
a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	719 msg = _("crosses branches (merge branches or use"
a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	720 " --clean to discard changes)")
a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	721 raise util.Abort(msg)
a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	722 else: # node is none
a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	723 msg = _("crosses branches (merge branches or update"
a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	724 " --check to force update)")
a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	725 raise util.Abort(msg)
a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	726 else:
a59e575c6ff8 update: allow dirty update to foreground (successors) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18895 diff changeset	727 # 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	728 pa = p1
2814 0f787997e3c2 Merge: move most tests to the beginning Matt Mackall <mpm@selenic.com> parents: 2813 diff changeset	729
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	730 ### calculate phase
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	731 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	732 branchmerge, force, partial, mergeancestor)
2775 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	733
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	734 ### apply phase
13550 1792b8a9422b merge: back out single-parent fast-forward merge Matt Mackall <mpm@selenic.com> parents: 13536 diff changeset	735 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	736 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	737 if not partial:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	738 repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2)
2775 b550cd82f92a Move merge code to its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	739
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	740 stats = applyupdates(repo, actions, wc, p2, pa, overwrite)
2899 8743188f4d2e merge: consolidate dirstate updates Matt Mackall <mpm@selenic.com> parents: 2898 diff changeset	741
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	742 if not partial:
16551 ebf6d38c9063 localrepo: add setparents() to adjust dirstate copies (issue3407) Patrick Mezard <patrick@mezard.eu> parents: 16534 diff changeset	743 repo.setparents(fp1, fp2)
18330 b717f49833a2 merge: rename list of actions from action to actions Mads Kiilerich <mads@kiilerich.com> parents: 18329 diff changeset	744 recordupdates(repo, actions, branchmerge)
13561 0ab0ceefddf2 merge: remove last traces of fastforward merging Mads Kiilerich <mads@kiilerich.com> parents: 13550 diff changeset	745 if not branchmerge:
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	746 repo.dirstate.setbranch(p2.branch())
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	747 finally:
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 7848 diff changeset	748 wlock.release()
10492 0e64d814d7d0 run commit and update hooks after command completion (issue1827) Sune Foldager <cryo@cyanite.org> parents: 10431 diff changeset	749
0e64d814d7d0 run commit and update hooks after command completion (issue1827) Sune Foldager <cryo@cyanite.org> parents: 10431 diff changeset	750 if not partial:
0e64d814d7d0 run commit and update hooks after command completion (issue1827) Sune Foldager <cryo@cyanite.org> parents: 10431 diff changeset	751 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	752 return stats

Mercurial > public > mercurial-scm > hg

annotate mercurial/merge.py @ 19095:5cc71484ee9c stable