Mercurial > hg > mercurial-crew-with-dirclash

annotate mercurial/merge.py @ 3202:9e002614f2eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: minor nullid cleanup
author Matt Mackall <mpm@selenic.com>
date Fri, 29 Sep 2006 17:50:59 -0500
parents e67c22bc8bba
children 3fd098e0902d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2799
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
1 # merge.py - directory-level update/merge handling for Mercurial
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
2 #
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
3 # Copyright 2006 Matt Mackall <mpm@selenic.com>
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
4 #
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
5 # This software may be used and distributed according to the terms
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
6 # of the GNU General Public License, incorporated herein by reference.
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
7
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
8 from node import *
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
9 from i18n import gettext as _
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
10 from demandload import *
3015
db3f42261452 fix errors reported by pychecker
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 3007
diff changeset
11 demandload(globals(), "errno util os tempfile")
2799
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
12
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
13 def merge3(repo, fn, my, other, p1, p2):
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
14 """perform a 3-way merge in the working directory"""
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
15
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
16 def temp(prefix, node):
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
17 pre = "%s~%s." % (os.path.basename(fn), prefix)
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
18 (fd, name) = tempfile.mkstemp(prefix=pre)
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
19 f = os.fdopen(fd, "wb")
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
20 repo.wwrite(fn, fl.read(node), f)
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
21 f.close()
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
22 return name
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
23
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
24 fl = repo.file(fn)
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
25 base = fl.ancestor(my, other)
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
26 a = repo.wjoin(fn)
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
27 b = temp("base", base)
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
28 c = temp("other", other)
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
29
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
30 repo.ui.note(_("resolving %s\n") % fn)
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
31 repo.ui.debug(_("file %s: my %s other %s ancestor %s\n") %
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
32 (fn, short(my), short(other), short(base)))
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
33
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
34 cmd = (os.environ.get("HGMERGE") or repo.ui.config("ui", "merge")
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
35 or "hgmerge")
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
36 r = util.system('%s "%s" "%s" "%s"' % (cmd, a, b, c), cwd=repo.root,
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
37 environ={'HG_FILE': fn,
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
38 'HG_MY_NODE': p1,
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
39 'HG_OTHER_NODE': p2,
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
40 'HG_FILE_MY_NODE': hex(my),
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
41 'HG_FILE_OTHER_NODE': hex(other),
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
42 'HG_FILE_BASE_NODE': hex(base)})
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
43 if r:
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
44 repo.ui.warn(_("merging %s failed!\n") % fn)
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
45
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
46 os.unlink(b)
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
47 os.unlink(c)
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
48 return r
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
49
3108
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
50 def checkunknown(repo, m2, status):
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
51 """
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
52 check for collisions between unknown files and files in m2
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
53 """
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
54 modified, added, removed, deleted, unknown = status[:5]
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
55 for f in unknown:
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
56 if f in m2:
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
57 if repo.file(f).cmp(m2[f], repo.wread(f)):
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
58 raise util.Abort(_("'%s' already exists in the working"
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
59 " dir and differs from remote") % f)
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
60
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
61 def workingmanifest(repo, man, status):
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
62 """
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
63 Update manifest to correspond to the working directory
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
64 """
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
65
3157
56c59ba7aa76 findcopies: use dirstate rename information
Matt Mackall <mpm@selenic.com>
parents: 3155
diff changeset
66 copied = repo.dirstate.copies()
3108
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
67 modified, added, removed, deleted, unknown = status[:5]
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
68 for i,l in (("a", added), ("m", modified), ("u", unknown)):
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
69 for f in l:
3157
56c59ba7aa76 findcopies: use dirstate rename information
Matt Mackall <mpm@selenic.com>
parents: 3155
diff changeset
70 man[f] = man.get(copied.get(f, f), nullid) + i
3108
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
71 man.set(f, util.is_exec(repo.wjoin(f), man.execf(f)))
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
72
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
73 for f in deleted + removed:
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
74 del man[f]
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
75
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
76 return man
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
77
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
78 def forgetremoved(m2, status):
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
79 """
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
80 Forget removed files
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
81
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
82 If we're jumping between revisions (as opposed to merging), and if
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
83 neither the working directory nor the target rev has the file,
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
84 then we need to remove it from the dirstate, to prevent the
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
85 dirstate from listing the file when it is no longer in the
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
86 manifest.
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
87 """
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
88
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
89 modified, added, removed, deleted, unknown = status[:5]
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
90 action = []
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
91
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
92 for f in deleted + removed:
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
93 if f not in m2:
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
94 action.append((f, "f"))
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
95
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
96 return action
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
97
3155
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
98 def nonoverlap(d1, d2):
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
99 """
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
100 Return list of elements in d1 not in d2
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
101 """
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
102
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
103 l = []
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
104 for d in d1:
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
105 if d not in d2:
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
106 l.append(d)
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
107
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
108 l.sort()
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
109 return l
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
110
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
111 def findold(fctx, limit):
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
112 """
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
113 find files that path was copied from, back to linkrev limit
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
114 """
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
115
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
116 old = {}
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
117 orig = fctx.path()
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
118 visit = [fctx]
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
119 while visit:
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
120 fc = visit.pop()
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
121 if fc.rev() < limit:
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
122 continue
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
123 if fc.path() != orig and fc.path() not in old:
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
124 old[fc.path()] = 1
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
125 visit += fc.parents()
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
126
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
127 old = old.keys()
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
128 old.sort()
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
129 return old
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
130
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
131 def findcopies(repo, m1, m2, limit):
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
132 """
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
133 Find moves and copies between m1 and m2 back to limit linkrev
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
134 """
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
135
3161
1839e6e91c3a findcopies: shortcut for empty working dir
Matt Mackall <mpm@selenic.com>
parents: 3157
diff changeset
136 # avoid silly behavior for update from empty dir
1839e6e91c3a findcopies: shortcut for empty working dir
Matt Mackall <mpm@selenic.com>
parents: 3157
diff changeset
137 if not m1:
1839e6e91c3a findcopies: shortcut for empty working dir
Matt Mackall <mpm@selenic.com>
parents: 3157
diff changeset
138 return {}
1839e6e91c3a findcopies: shortcut for empty working dir
Matt Mackall <mpm@selenic.com>
parents: 3157
diff changeset
139
3157
56c59ba7aa76 findcopies: use dirstate rename information
Matt Mackall <mpm@selenic.com>
parents: 3155
diff changeset
140 dcopies = repo.dirstate.copies()
3155
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
141 copy = {}
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
142 match = {}
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
143 u1 = nonoverlap(m1, m2)
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
144 u2 = nonoverlap(m2, m1)
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
145 ctx = util.cachefunc(lambda f,n: repo.filectx(f, fileid=n[:20]))
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
146
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
147 def checkpair(c, f2, man):
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
148 ''' check if an apparent pair actually matches '''
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
149 c2 = ctx(f2, man[f2])
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
150 ca = c.ancestor(c2)
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
151 if ca:
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
152 copy[c.path()] = f2
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
153 copy[f2] = c.path()
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
154
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
155 for f in u1:
3157
56c59ba7aa76 findcopies: use dirstate rename information
Matt Mackall <mpm@selenic.com>
parents: 3155
diff changeset
156 c = ctx(dcopies.get(f, f), m1[f])
3155
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
157 for of in findold(c, limit):
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
158 if of in m2:
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
159 checkpair(c, of, m2)
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
160 else:
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
161 match.setdefault(of, []).append(f)
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
162
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
163 for f in u2:
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
164 c = ctx(f, m2[f])
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
165 for of in findold(c, limit):
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
166 if of in m1:
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
167 checkpair(c, of, m1)
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
168 elif of in match:
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
169 for mf in match[of]:
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
170 checkpair(c, mf, m1)
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
171
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
172 return copy
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
173
3163
a9e75b371315 merge: move partial filtering out of manifest merge
Matt Mackall <mpm@selenic.com>
parents: 3162
diff changeset
174 def filtermanifest(man, partial):
a9e75b371315 merge: move partial filtering out of manifest merge
Matt Mackall <mpm@selenic.com>
parents: 3162
diff changeset
175 if partial:
a9e75b371315 merge: move partial filtering out of manifest merge
Matt Mackall <mpm@selenic.com>
parents: 3162
diff changeset
176 for k in man.keys():
a9e75b371315 merge: move partial filtering out of manifest merge
Matt Mackall <mpm@selenic.com>
parents: 3162
diff changeset
177 if not partial(k): del man[k]
a9e75b371315 merge: move partial filtering out of manifest merge
Matt Mackall <mpm@selenic.com>
parents: 3162
diff changeset
178
a9e75b371315 merge: move partial filtering out of manifest merge
Matt Mackall <mpm@selenic.com>
parents: 3162
diff changeset
179 def manifestmerge(ui, m1, m2, ma, overwrite, backwards):
3106
7c7469d41ade merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents: 3105
diff changeset
180 """
7c7469d41ade merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents: 3105
diff changeset
181 Merge manifest m1 with m2 using ancestor ma and generate merge action list
7c7469d41ade merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents: 3105
diff changeset
182 """
7c7469d41ade merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents: 3105
diff changeset
183
3119
5644a05a608c merge: simplify exec flag handling
Matt Mackall <mpm@selenic.com>
parents: 3118
diff changeset
184 def fmerge(f):
5644a05a608c merge: simplify exec flag handling
Matt Mackall <mpm@selenic.com>
parents: 3118
diff changeset
185 """merge executable flags"""
5644a05a608c merge: simplify exec flag handling
Matt Mackall <mpm@selenic.com>
parents: 3118
diff changeset
186 a, b, c = ma.execf(f), m1.execf(f), m2.execf(f)
5644a05a608c merge: simplify exec flag handling
Matt Mackall <mpm@selenic.com>
parents: 3118
diff changeset
187 return ((a^b) | (a^c)) ^ a
5644a05a608c merge: simplify exec flag handling
Matt Mackall <mpm@selenic.com>
parents: 3118
diff changeset
188
3106
7c7469d41ade merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents: 3105
diff changeset
189 action = []
7c7469d41ade merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents: 3105
diff changeset
190
3122
2ef0b3aae186 merge: simplify actions with helper function
Matt Mackall <mpm@selenic.com>
parents: 3121
diff changeset
191 def act(msg, f, m, *args):
2ef0b3aae186 merge: simplify actions with helper function
Matt Mackall <mpm@selenic.com>
parents: 3121
diff changeset
192 ui.debug(" %s: %s -> %s\n" % (f, msg, m))
2ef0b3aae186 merge: simplify actions with helper function
Matt Mackall <mpm@selenic.com>
parents: 3121
diff changeset
193 action.append((f, m) + args)
2ef0b3aae186 merge: simplify actions with helper function
Matt Mackall <mpm@selenic.com>
parents: 3121
diff changeset
194
3106
7c7469d41ade merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents: 3105
diff changeset
195 # Compare manifests
7c7469d41ade merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents: 3105
diff changeset
196 for f, n in m1.iteritems():
7c7469d41ade merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents: 3105
diff changeset
197 if f in m2:
7c7469d41ade merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents: 3105
diff changeset
198 # are files different?
7c7469d41ade merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents: 3105
diff changeset
199 if n != m2[f]:
7c7469d41ade merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents: 3105
diff changeset
200 a = ma.get(f, nullid)
7c7469d41ade merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents: 3105
diff changeset
201 # are both different from the ancestor?
7c7469d41ade merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents: 3105
diff changeset
202 if not overwrite and n != a and m2[f] != a:
3122
2ef0b3aae186 merge: simplify actions with helper function
Matt Mackall <mpm@selenic.com>
parents: 3121
diff changeset
203 act("versions differ", f, "m", fmerge(f), n[:20], m2[f])
3106
7c7469d41ade merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents: 3105
diff changeset
204 # are we clobbering?
7c7469d41ade merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents: 3105
diff changeset
205 # is remote's version newer?
7c7469d41ade merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents: 3105
diff changeset
206 # or are we going back in time and clean?
7c7469d41ade merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents: 3105
diff changeset
207 elif overwrite or m2[f] != a or (backwards and not n[20:]):
3122
2ef0b3aae186 merge: simplify actions with helper function
Matt Mackall <mpm@selenic.com>
parents: 3121
diff changeset
208 act("remote is newer", f, "g", m2.execf(f), m2[f])
3114
d1d1cd5b9484 merge: eliminate confusing queued variable
Matt Mackall <mpm@selenic.com>
parents: 3113
diff changeset
209 # local is newer, not overwrite, check mode bits
3119
5644a05a608c merge: simplify exec flag handling
Matt Mackall <mpm@selenic.com>
parents: 3118
diff changeset
210 elif fmerge(f) != m1.execf(f):
3122
2ef0b3aae186 merge: simplify actions with helper function
Matt Mackall <mpm@selenic.com>
parents: 3121
diff changeset
211 act("update permissions", f, "e", m2.execf(f))
3114
d1d1cd5b9484 merge: eliminate confusing queued variable
Matt Mackall <mpm@selenic.com>
parents: 3113
diff changeset
212 # contents same, check mode bits
d1d1cd5b9484 merge: eliminate confusing queued variable
Matt Mackall <mpm@selenic.com>
parents: 3113
diff changeset
213 elif m1.execf(f) != m2.execf(f):
3121
1c1e59aac82a merge: simplify local created logic
Matt Mackall <mpm@selenic.com>
parents: 3120
diff changeset
214 if overwrite or fmerge(f) != m1.execf(f):
3122
2ef0b3aae186 merge: simplify actions with helper function
Matt Mackall <mpm@selenic.com>
parents: 3121
diff changeset
215 act("update permissions", f, "e", m2.execf(f))
3106
7c7469d41ade merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents: 3105
diff changeset
216 del m2[f]
7c7469d41ade merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents: 3105
diff changeset
217 elif f in ma:
3118
7a635ef25132 merge: simplify tests for local changed/remote deleted
Matt Mackall <mpm@selenic.com>
parents: 3117
diff changeset
218 if n != ma[f] and not overwrite:
3120
b1de36a4b4df merge: simplify prompt code
Matt Mackall <mpm@selenic.com>
parents: 3119
diff changeset
219 if ui.prompt(
3118
7a635ef25132 merge: simplify tests for local changed/remote deleted
Matt Mackall <mpm@selenic.com>
parents: 3117
diff changeset
220 (_(" local changed %s which remote deleted\n") % f) +
3120
b1de36a4b4df merge: simplify prompt code
Matt Mackall <mpm@selenic.com>
parents: 3119
diff changeset
221 _("(k)eep or (d)elete?"), _("[kd]"), _("k")) == _("d"):
3122
2ef0b3aae186 merge: simplify actions with helper function
Matt Mackall <mpm@selenic.com>
parents: 3121
diff changeset
222 act("prompt delete", f, "r")
3106
7c7469d41ade merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents: 3105
diff changeset
223 else:
3122
2ef0b3aae186 merge: simplify actions with helper function
Matt Mackall <mpm@selenic.com>
parents: 3121
diff changeset
224 act("other deleted", f, "r")
3106
7c7469d41ade merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents: 3105
diff changeset
225 else:
7c7469d41ade merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents: 3105
diff changeset
226 # file is created on branch or in working directory
3121
1c1e59aac82a merge: simplify local created logic
Matt Mackall <mpm@selenic.com>
parents: 3120
diff changeset
227 if (overwrite and n[20:] != "u") or (backwards and not n[20:]):
3122
2ef0b3aae186 merge: simplify actions with helper function
Matt Mackall <mpm@selenic.com>
parents: 3121
diff changeset
228 act("remote deleted", f, "r")
3106
7c7469d41ade merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents: 3105
diff changeset
229
7c7469d41ade merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents: 3105
diff changeset
230 for f, n in m2.iteritems():
3116
bb74f809bc95 merge: reorder tests on m2 items in manifestmerge
Matt Mackall <mpm@selenic.com>
parents: 3115
diff changeset
231 if f in ma:
3117
920f54a2249e merge: more simplification of m2 manifest scanning
Matt Mackall <mpm@selenic.com>
parents: 3116
diff changeset
232 if overwrite or backwards:
3122
2ef0b3aae186 merge: simplify actions with helper function
Matt Mackall <mpm@selenic.com>
parents: 3121
diff changeset
233 act("recreating", f, "g", m2.execf(f), n)
3117
920f54a2249e merge: more simplification of m2 manifest scanning
Matt Mackall <mpm@selenic.com>
parents: 3116
diff changeset
234 elif n != ma[f]:
3120
b1de36a4b4df merge: simplify prompt code
Matt Mackall <mpm@selenic.com>
parents: 3119
diff changeset
235 if ui.prompt(
3117
920f54a2249e merge: more simplification of m2 manifest scanning
Matt Mackall <mpm@selenic.com>
parents: 3116
diff changeset
236 (_("remote changed %s which local deleted\n") % f) +
3120
b1de36a4b4df merge: simplify prompt code
Matt Mackall <mpm@selenic.com>
parents: 3119
diff changeset
237 _("(k)eep or (d)elete?"), _("[kd]"), _("k")) == _("k"):
3122
2ef0b3aae186 merge: simplify actions with helper function
Matt Mackall <mpm@selenic.com>
parents: 3121
diff changeset
238 act("prompt recreating", f, "g", m2.execf(f), n)
3116
bb74f809bc95 merge: reorder tests on m2 items in manifestmerge
Matt Mackall <mpm@selenic.com>
parents: 3115
diff changeset
239 else:
3122
2ef0b3aae186 merge: simplify actions with helper function
Matt Mackall <mpm@selenic.com>
parents: 3121
diff changeset
240 act("remote created", f, "g", m2.execf(f), n)
3106
7c7469d41ade merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents: 3105
diff changeset
241
7c7469d41ade merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents: 3105
diff changeset
242 return action
7c7469d41ade merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents: 3105
diff changeset
243
3112
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
244 def applyupdates(repo, action, xp1, xp2):
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
245 updated, merged, removed, unresolved = 0, 0, 0, 0
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
246 action.sort()
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
247 for a in action:
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
248 f, m = a[:2]
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
249 if f[0] == "/":
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
250 continue
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
251 if m == "r": # remove
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
252 repo.ui.note(_("removing %s\n") % f)
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
253 util.audit_path(f)
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
254 try:
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
255 util.unlink(repo.wjoin(f))
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
256 except OSError, inst:
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
257 if inst.errno != errno.ENOENT:
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
258 repo.ui.warn(_("update failed to remove %s: %s!\n") %
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
259 (f, inst.strerror))
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
260 removed +=1
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
261 elif m == "m": # merge
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
262 flag, my, other = a[2:]
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
263 repo.ui.status(_("merging %s\n") % f)
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
264 if merge3(repo, f, my, other, xp1, xp2):
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
265 unresolved += 1
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
266 util.set_exec(repo.wjoin(f), flag)
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
267 merged += 1
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
268 elif m == "g": # get
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
269 flag, node = a[2:]
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
270 repo.ui.note(_("getting %s\n") % f)
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
271 t = repo.file(f).read(node)
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
272 repo.wwrite(f, t)
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
273 util.set_exec(repo.wjoin(f), flag)
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
274 updated += 1
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
275 elif m == "e": # exec
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
276 flag = a[2:]
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
277 util.set_exec(repo.wjoin(f), flag)
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
278
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
279 return updated, merged, removed, unresolved
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
280
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
281 def recordupdates(repo, action, branchmerge):
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
282 for a in action:
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
283 f, m = a[:2]
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
284 if m == "r": # remove
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
285 if branchmerge:
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
286 repo.dirstate.update([f], 'r')
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
287 else:
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
288 repo.dirstate.forget([f])
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
289 elif m == "f": # forget
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
290 repo.dirstate.forget([f])
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
291 elif m == "g": # get
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
292 if branchmerge:
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
293 repo.dirstate.update([f], 'n', st_mtime=-1)
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
294 else:
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
295 repo.dirstate.update([f], 'n')
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
296 elif m == "m": # merge
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
297 flag, my, other = a[2:]
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
298 if branchmerge:
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
299 # We've done a branch merge, mark this file as merged
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
300 # so that we properly record the merger later
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
301 repo.dirstate.update([f], 'm')
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
302 else:
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
303 # We've update-merged a locally modified file, so
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
304 # we set the dirstate to emulate a normal checkout
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
305 # of that file some time in the past. Thus our
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
306 # merge will appear as a normal local file
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
307 # modification.
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
308 fl = repo.file(f)
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
309 f_len = fl.size(fl.rev(other))
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
310 repo.dirstate.update([f], 'n', st_size=f_len, st_mtime=-1)
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
311
2825
1ea086bc2086 Merge: combine choose and moddirstate to partial
Matt Mackall <mpm@selenic.com>
parents: 2824
diff changeset
312 def update(repo, node, branchmerge=False, force=False, partial=None,
2829
4870f795f681 Merge: combine force and forcemerge arguments
Matt Mackall <mpm@selenic.com>
parents: 2828
diff changeset
313 wlock=None, show_stats=True, remind=True):
4870f795f681 Merge: combine force and forcemerge arguments
Matt Mackall <mpm@selenic.com>
parents: 2828
diff changeset
314
4870f795f681 Merge: combine force and forcemerge arguments
Matt Mackall <mpm@selenic.com>
parents: 2828
diff changeset
315 overwrite = force and not branchmerge
4870f795f681 Merge: combine force and forcemerge arguments
Matt Mackall <mpm@selenic.com>
parents: 2828
diff changeset
316 forcemerge = force and branchmerge
2826
3aeab7bb5adc Refactor update locking slightly
Matt Mackall <mpm@selenic.com>
parents: 2825
diff changeset
317
3aeab7bb5adc Refactor update locking slightly
Matt Mackall <mpm@selenic.com>
parents: 2825
diff changeset
318 if not wlock:
3aeab7bb5adc Refactor update locking slightly
Matt Mackall <mpm@selenic.com>
parents: 2825
diff changeset
319 wlock = repo.wlock()
3aeab7bb5adc Refactor update locking slightly
Matt Mackall <mpm@selenic.com>
parents: 2825
diff changeset
320
2828
0f787997e3c2 Merge: move most tests to the beginning
Matt Mackall <mpm@selenic.com>
parents: 2827
diff changeset
321 ### check phase
0f787997e3c2 Merge: move most tests to the beginning
Matt Mackall <mpm@selenic.com>
parents: 2827
diff changeset
322
3200
e67c22bc8bba merge: use repo.parents and parent contexts in update
Matt Mackall <mpm@selenic.com>
parents: 3163
diff changeset
323 pl = repo.parents()
e67c22bc8bba merge: use repo.parents and parent contexts in update
Matt Mackall <mpm@selenic.com>
parents: 3163
diff changeset
324 if not overwrite and len(pl) > 1:
2799
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
325 raise util.Abort(_("outstanding uncommitted merges"))
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
326
3200
e67c22bc8bba merge: use repo.parents and parent contexts in update
Matt Mackall <mpm@selenic.com>
parents: 3163
diff changeset
327 p1, p2 = pl[0], repo.changectx(node)
e67c22bc8bba merge: use repo.parents and parent contexts in update
Matt Mackall <mpm@selenic.com>
parents: 3163
diff changeset
328 pa = p1.ancestor(p2)
2828
0f787997e3c2 Merge: move most tests to the beginning
Matt Mackall <mpm@selenic.com>
parents: 2827
diff changeset
329
2997
545d33aa3f82 merge: add backwards variable
Matt Mackall <mpm@selenic.com>
parents: 2919
diff changeset
330 # are we going backwards?
545d33aa3f82 merge: add backwards variable
Matt Mackall <mpm@selenic.com>
parents: 2919
diff changeset
331 backwards = (pa == p2)
545d33aa3f82 merge: add backwards variable
Matt Mackall <mpm@selenic.com>
parents: 2919
diff changeset
332
2828
0f787997e3c2 Merge: move most tests to the beginning
Matt Mackall <mpm@selenic.com>
parents: 2827
diff changeset
333 # is there a linear path from p1 to p2?
3111
40e777bda455 merge: remove linear variable
Matt Mackall <mpm@selenic.com>
parents: 3110
diff changeset
334 if pa == p1 or pa == p2:
40e777bda455 merge: remove linear variable
Matt Mackall <mpm@selenic.com>
parents: 3110
diff changeset
335 if branchmerge:
40e777bda455 merge: remove linear variable
Matt Mackall <mpm@selenic.com>
parents: 3110
diff changeset
336 raise util.Abort(_("there is nothing to merge, just use "
40e777bda455 merge: remove linear variable
Matt Mackall <mpm@selenic.com>
parents: 3110
diff changeset
337 "'hg update' or look at 'hg heads'"))
40e777bda455 merge: remove linear variable
Matt Mackall <mpm@selenic.com>
parents: 3110
diff changeset
338 elif not (overwrite or branchmerge):
2829
4870f795f681 Merge: combine force and forcemerge arguments
Matt Mackall <mpm@selenic.com>
parents: 2828
diff changeset
339 raise util.Abort(_("update spans branches, use 'hg merge' "
2828
0f787997e3c2 Merge: move most tests to the beginning
Matt Mackall <mpm@selenic.com>
parents: 2827
diff changeset
340 "or 'hg update -C' to lose changes"))
0f787997e3c2 Merge: move most tests to the beginning
Matt Mackall <mpm@selenic.com>
parents: 2827
diff changeset
341
3108
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
342 status = repo.status()
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
343 modified, added, removed, deleted, unknown = status[:5]
2828
0f787997e3c2 Merge: move most tests to the beginning
Matt Mackall <mpm@selenic.com>
parents: 2827
diff changeset
344 if branchmerge and not forcemerge:
0f787997e3c2 Merge: move most tests to the beginning
Matt Mackall <mpm@selenic.com>
parents: 2827
diff changeset
345 if modified or added or removed:
0f787997e3c2 Merge: move most tests to the beginning
Matt Mackall <mpm@selenic.com>
parents: 2827
diff changeset
346 raise util.Abort(_("outstanding uncommitted changes"))
0f787997e3c2 Merge: move most tests to the beginning
Matt Mackall <mpm@selenic.com>
parents: 2827
diff changeset
347
3200
e67c22bc8bba merge: use repo.parents and parent contexts in update
Matt Mackall <mpm@selenic.com>
parents: 3163
diff changeset
348 m1 = p1.manifest().copy()
e67c22bc8bba merge: use repo.parents and parent contexts in update
Matt Mackall <mpm@selenic.com>
parents: 3163
diff changeset
349 m2 = p2.manifest().copy()
e67c22bc8bba merge: use repo.parents and parent contexts in update
Matt Mackall <mpm@selenic.com>
parents: 3163
diff changeset
350 ma = pa.manifest()
2799
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
351
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
352 # resolve the manifest to determine which files
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
353 # we care about merging
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
354 repo.ui.note(_("resolving manifests\n"))
3111
40e777bda455 merge: remove linear variable
Matt Mackall <mpm@selenic.com>
parents: 3110
diff changeset
355 repo.ui.debug(_(" overwrite %s branchmerge %s partial %s\n") %
40e777bda455 merge: remove linear variable
Matt Mackall <mpm@selenic.com>
parents: 3110
diff changeset
356 (overwrite, branchmerge, bool(partial)))
3200
e67c22bc8bba merge: use repo.parents and parent contexts in update
Matt Mackall <mpm@selenic.com>
parents: 3163
diff changeset
357 repo.ui.debug(_(" ancestor %s local %s remote %s\n") % (p1, p2, pa))
2799
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
358
3101
87ea5a71f7b9 merge: convert actions to list
Matt Mackall <mpm@selenic.com>
parents: 3097
diff changeset
359 action = []
3157
56c59ba7aa76 findcopies: use dirstate rename information
Matt Mackall <mpm@selenic.com>
parents: 3155
diff changeset
360 copy = {}
56c59ba7aa76 findcopies: use dirstate rename information
Matt Mackall <mpm@selenic.com>
parents: 3155
diff changeset
361
3108
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
362 m1 = workingmanifest(repo, m1, status)
3163
a9e75b371315 merge: move partial filtering out of manifest merge
Matt Mackall <mpm@selenic.com>
parents: 3162
diff changeset
363 filtermanifest(m1, partial)
a9e75b371315 merge: move partial filtering out of manifest merge
Matt Mackall <mpm@selenic.com>
parents: 3162
diff changeset
364 filtermanifest(m2, partial)
2799
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
365
3108
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
366 if not force:
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
367 checkunknown(repo, m2, status)
3111
40e777bda455 merge: remove linear variable
Matt Mackall <mpm@selenic.com>
parents: 3110
diff changeset
368 if not branchmerge:
3108
3bd05ad67f45 merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3107
diff changeset
369 action += forgetremoved(m2, status)
3162
84561ea8711e merge: move findcopies after workingmanifest
Matt Mackall <mpm@selenic.com>
parents: 3161
diff changeset
370 if not (backwards or overwrite):
3200
e67c22bc8bba merge: use repo.parents and parent contexts in update
Matt Mackall <mpm@selenic.com>
parents: 3163
diff changeset
371 copy = findcopies(repo, m1, m2, pa.rev())
3155
c82ea81d6850 Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents: 3122
diff changeset
372
3163
a9e75b371315 merge: move partial filtering out of manifest merge
Matt Mackall <mpm@selenic.com>
parents: 3162
diff changeset
373 action += manifestmerge(repo.ui, m1, m2, ma, overwrite, backwards)
3004
31011730f9bd merge: eliminate mw manifestdict, do everything with m1
Matt Mackall <mpm@selenic.com>
parents: 3003
diff changeset
374 del m1, m2, ma
2799
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
375
2917
dd032b0f02ac merge: move forgets to the apply stage
Matt Mackall <mpm@selenic.com>
parents: 2916
diff changeset
376 ### apply phase
dd032b0f02ac merge: move forgets to the apply stage
Matt Mackall <mpm@selenic.com>
parents: 2916
diff changeset
377
3111
40e777bda455 merge: remove linear variable
Matt Mackall <mpm@selenic.com>
parents: 3110
diff changeset
378 if not branchmerge:
2799
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
379 # we don't need to do any magic, just jump to the new rev
3200
e67c22bc8bba merge: use repo.parents and parent contexts in update
Matt Mackall <mpm@selenic.com>
parents: 3163
diff changeset
380 p1, p2 = p2, repo.changectx(nullid)
2799
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
381
3200
e67c22bc8bba merge: use repo.parents and parent contexts in update
Matt Mackall <mpm@selenic.com>
parents: 3163
diff changeset
382 xp1, xp2 = str(p1), str(p2)
3202
9e002614f2eb merge: minor nullid cleanup
Matt Mackall <mpm@selenic.com>
parents: 3200
diff changeset
383 if not p2: xp2 = ''
2799
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
384
3110
62044d161470 merge: simplify hook code
Matt Mackall <mpm@selenic.com>
parents: 3109
diff changeset
385 repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2)
2799
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
386
3112
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
387 updated, merged, removed, unresolved = applyupdates(repo, action, xp1, xp2)
2919
8743188f4d2e merge: consolidate dirstate updates
Matt Mackall <mpm@selenic.com>
parents: 2918
diff changeset
388
8743188f4d2e merge: consolidate dirstate updates
Matt Mackall <mpm@selenic.com>
parents: 2918
diff changeset
389 # update dirstate
8743188f4d2e merge: consolidate dirstate updates
Matt Mackall <mpm@selenic.com>
parents: 2918
diff changeset
390 if not partial:
3200
e67c22bc8bba merge: use repo.parents and parent contexts in update
Matt Mackall <mpm@selenic.com>
parents: 3163
diff changeset
391 repo.dirstate.setparents(p1.node(), p2.node())
3112
5cc62d99b785 merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents: 3111
diff changeset
392 recordupdates(repo, action, branchmerge)
2799
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
393
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
394 if show_stats:
3006
87a0332ab58b merge: combine merge and get lists
Matt Mackall <mpm@selenic.com>
parents: 3005
diff changeset
395 stats = ((updated, _("updated")),
3096
54d85098fb82 merge: make unresolved a counter
Matt Mackall <mpm@selenic.com>
parents: 3095
diff changeset
396 (merged - unresolved, _("merged")),
3007
962b9c7df641 merge: add remove to the action hash
Matt Mackall <mpm@selenic.com>
parents: 3006
diff changeset
397 (removed, _("removed")),
3096
54d85098fb82 merge: make unresolved a counter
Matt Mackall <mpm@selenic.com>
parents: 3095
diff changeset
398 (unresolved, _("unresolved")))
2799
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
399 note = ", ".join([_("%d files %s") % s for s in stats])
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
400 repo.ui.status("%s\n" % note)
2825
1ea086bc2086 Merge: combine choose and moddirstate to partial
Matt Mackall <mpm@selenic.com>
parents: 2824
diff changeset
401 if not partial:
2824
ca06d35af65e Rename merge.allow -> merge.branchmerge
Matt Mackall <mpm@selenic.com>
parents: 2803
diff changeset
402 if branchmerge:
2827
56f99f5aab34 Merge: refactor err and failedmerge -> unresolved
Matt Mackall <mpm@selenic.com>
parents: 2826
diff changeset
403 if unresolved:
2799
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
404 repo.ui.status(_("There are unresolved merges,"
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
405 " you can redo the full merge using:\n"
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
406 " hg update -C %s\n"
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
407 " hg merge %s\n"
3200
e67c22bc8bba merge: use repo.parents and parent contexts in update
Matt Mackall <mpm@selenic.com>
parents: 3163
diff changeset
408 % (p1.rev(), p2.rev())))
2803
987c31e2a08c Merge with crew
Matt Mackall <mpm@selenic.com>
parents: 2799
diff changeset
409 elif remind:
2799
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
410 repo.ui.status(_("(branch merge, don't forget to commit)\n"))
2827
56f99f5aab34 Merge: refactor err and failedmerge -> unresolved
Matt Mackall <mpm@selenic.com>
parents: 2826
diff changeset
411 elif unresolved:
2799
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
412 repo.ui.status(_("There are unresolved merges with"
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
413 " locally modified files.\n"))
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
414
3110
62044d161470 merge: simplify hook code
Matt Mackall <mpm@selenic.com>
parents: 3109
diff changeset
415 repo.hook('update', parent1=xp1, parent2=xp2, error=unresolved)
3096
54d85098fb82 merge: make unresolved a counter
Matt Mackall <mpm@selenic.com>
parents: 3095
diff changeset
416 return unresolved
2799
b550cd82f92a Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
417