Mercurial > hg > mercurial-crew-with-dirclash
annotate mercurial/merge.py @ 5090:e86788af599a
hghave: detect support for EOL in paths.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 06 Aug 2007 09:57:23 +0200 |
parents | 8d9bdcbb2b18 |
children | 2ef14e29e538 ad6b97132b81 |
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 # |
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> |
2799
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 * |
3893 | 9 from i18n import _ |
4417 | 10 import errno, util, os, tempfile, context |
2799
b550cd82f92a
Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
11 |
5045
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4999
diff
changeset
|
12 def filemerge(repo, fw, fd, fo, wctx, mctx): |
3233
3fd098e0902d
merge: extend file merge function for renames
Matt Mackall <mpm@selenic.com>
parents:
3202
diff
changeset
|
13 """perform a 3-way merge in the working directory |
2799
b550cd82f92a
Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
14 |
5045
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4999
diff
changeset
|
15 fw = original filename in the working directory |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4999
diff
changeset
|
16 fd = destination filename in the working directory |
3233
3fd098e0902d
merge: extend file merge function for renames
Matt Mackall <mpm@selenic.com>
parents:
3202
diff
changeset
|
17 fo = filename in other parent |
3303
69b9471f26bb
merge: pass contexts to applyupdates
Matt Mackall <mpm@selenic.com>
parents:
3302
diff
changeset
|
18 wctx, mctx = working and merge changecontexts |
3233
3fd098e0902d
merge: extend file merge function for renames
Matt Mackall <mpm@selenic.com>
parents:
3202
diff
changeset
|
19 """ |
3fd098e0902d
merge: extend file merge function for renames
Matt Mackall <mpm@selenic.com>
parents:
3202
diff
changeset
|
20 |
3fd098e0902d
merge: extend file merge function for renames
Matt Mackall <mpm@selenic.com>
parents:
3202
diff
changeset
|
21 def temp(prefix, ctx): |
3fd098e0902d
merge: extend file merge function for renames
Matt Mackall <mpm@selenic.com>
parents:
3202
diff
changeset
|
22 pre = "%s~%s." % (os.path.basename(ctx.path()), prefix) |
2799
b550cd82f92a
Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
23 (fd, name) = tempfile.mkstemp(prefix=pre) |
4005
656e06eebda7
replace filehandle version of wwrite with wwritedata
Matt Mackall <mpm@selenic.com>
parents:
3893
diff
changeset
|
24 data = repo.wwritedata(ctx.path(), ctx.data()) |
2799
b550cd82f92a
Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
25 f = os.fdopen(fd, "wb") |
4005
656e06eebda7
replace filehandle version of wwrite with wwritedata
Matt Mackall <mpm@selenic.com>
parents:
3893
diff
changeset
|
26 f.write(data) |
2799
b550cd82f92a
Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
27 f.close() |
b550cd82f92a
Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
28 return name |
b550cd82f92a
Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
29 |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3303
diff
changeset
|
30 fcm = wctx.filectx(fw) |
5045
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4999
diff
changeset
|
31 fcmdata = wctx.filectx(fd).data() |
3305
e7abcf3a7c5f
filemerge: use contexts rather than my and other
Matt Mackall <mpm@selenic.com>
parents:
3303
diff
changeset
|
32 fco = mctx.filectx(fo) |
3317
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3315
diff
changeset
|
33 |
5045
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4999
diff
changeset
|
34 if not fco.cmp(fcmdata): # files identical? |
3407
d2b55e3c4e25
merge: if filemerge skips merge, report as updated
Matt Mackall <mpm@selenic.com>
parents:
3387
diff
changeset
|
35 return None |
3317
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3315
diff
changeset
|
36 |
3233
3fd098e0902d
merge: extend file merge function for renames
Matt Mackall <mpm@selenic.com>
parents:
3202
diff
changeset
|
37 fca = fcm.ancestor(fco) |
3fd098e0902d
merge: extend file merge function for renames
Matt Mackall <mpm@selenic.com>
parents:
3202
diff
changeset
|
38 if not fca: |
3578
3b4e00cba57a
Define and use nullrev (revision of nullid) instead of -1.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3442
diff
changeset
|
39 fca = repo.filectx(fw, fileid=nullrev) |
5045
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4999
diff
changeset
|
40 a = repo.wjoin(fd) |
3233
3fd098e0902d
merge: extend file merge function for renames
Matt Mackall <mpm@selenic.com>
parents:
3202
diff
changeset
|
41 b = temp("base", fca) |
3fd098e0902d
merge: extend file merge function for renames
Matt Mackall <mpm@selenic.com>
parents:
3202
diff
changeset
|
42 c = temp("other", fco) |
2799
b550cd82f92a
Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
43 |
3317
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3315
diff
changeset
|
44 if fw != fo: |
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3315
diff
changeset
|
45 repo.ui.status(_("merging %s and %s\n") % (fw, fo)) |
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3315
diff
changeset
|
46 else: |
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3315
diff
changeset
|
47 repo.ui.status(_("merging %s\n") % fw) |
966632304dde
merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents:
3315
diff
changeset
|
48 |
3233
3fd098e0902d
merge: extend file merge function for renames
Matt Mackall <mpm@selenic.com>
parents:
3202
diff
changeset
|
49 repo.ui.debug(_("my %s other %s ancestor %s\n") % (fcm, fco, fca)) |
2799
b550cd82f92a
Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
50 |
b550cd82f92a
Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
51 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
|
52 or "hgmerge") |
b550cd82f92a
Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
53 r = util.system('%s "%s" "%s" "%s"' % (cmd, a, b, c), cwd=repo.root, |
5045
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4999
diff
changeset
|
54 environ={'HG_FILE': fd, |
3303
69b9471f26bb
merge: pass contexts to applyupdates
Matt Mackall <mpm@selenic.com>
parents:
3302
diff
changeset
|
55 'HG_MY_NODE': str(wctx.parents()[0]), |
69b9471f26bb
merge: pass contexts to applyupdates
Matt Mackall <mpm@selenic.com>
parents:
3302
diff
changeset
|
56 'HG_OTHER_NODE': str(mctx)}) |
2799
b550cd82f92a
Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
57 if r: |
5045
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4999
diff
changeset
|
58 repo.ui.warn(_("merging %s failed!\n") % fd) |
2799
b550cd82f92a
Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
59 |
b550cd82f92a
Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
60 os.unlink(b) |
b550cd82f92a
Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
61 os.unlink(c) |
b550cd82f92a
Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
62 return r |
b550cd82f92a
Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
63 |
3318
c5075ad5e3e9
merge: use contexts in checkunknown and forgetremoved
Matt Mackall <mpm@selenic.com>
parents:
3317
diff
changeset
|
64 def checkunknown(wctx, mctx): |
3322
38be819a1225
merge: update some docstrings
Matt Mackall <mpm@selenic.com>
parents:
3320
diff
changeset
|
65 "check for collisions between unknown files and files in mctx" |
3318
c5075ad5e3e9
merge: use contexts in checkunknown and forgetremoved
Matt Mackall <mpm@selenic.com>
parents:
3317
diff
changeset
|
66 man = mctx.manifest() |
3240
8d4855fd9d7b
merge: use new working context object in update
Matt Mackall <mpm@selenic.com>
parents:
3234
diff
changeset
|
67 for f in wctx.unknown(): |
3318
c5075ad5e3e9
merge: use contexts in checkunknown and forgetremoved
Matt Mackall <mpm@selenic.com>
parents:
3317
diff
changeset
|
68 if f in man: |
c5075ad5e3e9
merge: use contexts in checkunknown and forgetremoved
Matt Mackall <mpm@selenic.com>
parents:
3317
diff
changeset
|
69 if mctx.filectx(f).cmp(wctx.filectx(f).data()): |
4633
ff7253a0d1da
Cleanup of whitespace, indentation and line continuation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4603
diff
changeset
|
70 raise util.Abort(_("untracked local file '%s' differs" |
3620
3109f012c305
Clarify untracked file merge message
Matt Mackall <mpm@selenic.com>
parents:
3593
diff
changeset
|
71 " from remote version") % f) |
3108
3bd05ad67f45
merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3107
diff
changeset
|
72 |
3786 | 73 def checkcollision(mctx): |
74 "check for case folding collisions in the destination context" | |
75 folded = {} | |
76 for fn in mctx.manifest(): | |
77 fold = fn.lower() | |
78 if fold in folded: | |
79 raise util.Abort(_("case-folding collision between %s and %s") | |
80 % (fn, folded[fold])) | |
81 folded[fold] = fn | |
82 | |
3318
c5075ad5e3e9
merge: use contexts in checkunknown and forgetremoved
Matt Mackall <mpm@selenic.com>
parents:
3317
diff
changeset
|
83 def forgetremoved(wctx, mctx): |
3108
3bd05ad67f45
merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3107
diff
changeset
|
84 """ |
3bd05ad67f45
merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3107
diff
changeset
|
85 Forget removed files |
3bd05ad67f45
merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3107
diff
changeset
|
86 |
3bd05ad67f45
merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3107
diff
changeset
|
87 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
|
88 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
|
89 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
|
90 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
|
91 manifest. |
3bd05ad67f45
merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3107
diff
changeset
|
92 """ |
3bd05ad67f45
merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3107
diff
changeset
|
93 |
3bd05ad67f45
merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3107
diff
changeset
|
94 action = [] |
3318
c5075ad5e3e9
merge: use contexts in checkunknown and forgetremoved
Matt Mackall <mpm@selenic.com>
parents:
3317
diff
changeset
|
95 man = mctx.manifest() |
3240
8d4855fd9d7b
merge: use new working context object in update
Matt Mackall <mpm@selenic.com>
parents:
3234
diff
changeset
|
96 for f in wctx.deleted() + wctx.removed(): |
3318
c5075ad5e3e9
merge: use contexts in checkunknown and forgetremoved
Matt Mackall <mpm@selenic.com>
parents:
3317
diff
changeset
|
97 if f not in man: |
3108
3bd05ad67f45
merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3107
diff
changeset
|
98 action.append((f, "f")) |
3bd05ad67f45
merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3107
diff
changeset
|
99 |
3bd05ad67f45
merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3107
diff
changeset
|
100 return action |
3bd05ad67f45
merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3107
diff
changeset
|
101 |
3377
8c36b33a27c7
merge: turn followcopies on by default
Matt Mackall <mpm@selenic.com>
parents:
3323
diff
changeset
|
102 def findcopies(repo, m1, m2, ma, limit): |
3155
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
3122
diff
changeset
|
103 """ |
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
3122
diff
changeset
|
104 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
|
105 """ |
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
3122
diff
changeset
|
106 |
4401
84cd52b48f94
merge: reorganize some hunks in findcopies
Matt Mackall <mpm@selenic.com>
parents:
4400
diff
changeset
|
107 def nonoverlap(d1, d2, d3): |
84cd52b48f94
merge: reorganize some hunks in findcopies
Matt Mackall <mpm@selenic.com>
parents:
4400
diff
changeset
|
108 "Return list of elements in d1 not in d2 or d3" |
84cd52b48f94
merge: reorganize some hunks in findcopies
Matt Mackall <mpm@selenic.com>
parents:
4400
diff
changeset
|
109 l = [d for d in d1 if d not in d3 and d not in d2] |
84cd52b48f94
merge: reorganize some hunks in findcopies
Matt Mackall <mpm@selenic.com>
parents:
4400
diff
changeset
|
110 l.sort() |
84cd52b48f94
merge: reorganize some hunks in findcopies
Matt Mackall <mpm@selenic.com>
parents:
4400
diff
changeset
|
111 return l |
84cd52b48f94
merge: reorganize some hunks in findcopies
Matt Mackall <mpm@selenic.com>
parents:
4400
diff
changeset
|
112 |
4398
9fe267f77f56
merge: fix a bug detecting directory moves
Matt Mackall <mpm@selenic.com>
parents:
4397
diff
changeset
|
113 def dirname(f): |
9fe267f77f56
merge: fix a bug detecting directory moves
Matt Mackall <mpm@selenic.com>
parents:
4397
diff
changeset
|
114 s = f.rfind("/") |
9fe267f77f56
merge: fix a bug detecting directory moves
Matt Mackall <mpm@selenic.com>
parents:
4397
diff
changeset
|
115 if s == -1: |
9fe267f77f56
merge: fix a bug detecting directory moves
Matt Mackall <mpm@selenic.com>
parents:
4397
diff
changeset
|
116 return "" |
9fe267f77f56
merge: fix a bug detecting directory moves
Matt Mackall <mpm@selenic.com>
parents:
4397
diff
changeset
|
117 return f[:s] |
9fe267f77f56
merge: fix a bug detecting directory moves
Matt Mackall <mpm@selenic.com>
parents:
4397
diff
changeset
|
118 |
9fe267f77f56
merge: fix a bug detecting directory moves
Matt Mackall <mpm@selenic.com>
parents:
4397
diff
changeset
|
119 def dirs(files): |
9fe267f77f56
merge: fix a bug detecting directory moves
Matt Mackall <mpm@selenic.com>
parents:
4397
diff
changeset
|
120 d = {} |
9fe267f77f56
merge: fix a bug detecting directory moves
Matt Mackall <mpm@selenic.com>
parents:
4397
diff
changeset
|
121 for f in files: |
9fe267f77f56
merge: fix a bug detecting directory moves
Matt Mackall <mpm@selenic.com>
parents:
4397
diff
changeset
|
122 f = dirname(f) |
9fe267f77f56
merge: fix a bug detecting directory moves
Matt Mackall <mpm@selenic.com>
parents:
4397
diff
changeset
|
123 while f not in d: |
9fe267f77f56
merge: fix a bug detecting directory moves
Matt Mackall <mpm@selenic.com>
parents:
4397
diff
changeset
|
124 d[f] = True |
9fe267f77f56
merge: fix a bug detecting directory moves
Matt Mackall <mpm@selenic.com>
parents:
4397
diff
changeset
|
125 f = dirname(f) |
9fe267f77f56
merge: fix a bug detecting directory moves
Matt Mackall <mpm@selenic.com>
parents:
4397
diff
changeset
|
126 return d |
9fe267f77f56
merge: fix a bug detecting directory moves
Matt Mackall <mpm@selenic.com>
parents:
4397
diff
changeset
|
127 |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4401
diff
changeset
|
128 wctx = repo.workingctx() |
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4401
diff
changeset
|
129 |
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4401
diff
changeset
|
130 def makectx(f, n): |
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4401
diff
changeset
|
131 if len(n) == 20: |
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4401
diff
changeset
|
132 return repo.filectx(f, fileid=n) |
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4401
diff
changeset
|
133 return wctx.filectx(f) |
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4401
diff
changeset
|
134 ctx = util.cachefunc(makectx) |
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4401
diff
changeset
|
135 |
3732
ffe9fef84801
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
Matt Mackall <mpm@selenic.com>
parents:
3731
diff
changeset
|
136 def findold(fctx): |
ffe9fef84801
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
Matt Mackall <mpm@selenic.com>
parents:
3731
diff
changeset
|
137 "find files that path was copied from, back to linkrev limit" |
ffe9fef84801
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
Matt Mackall <mpm@selenic.com>
parents:
3731
diff
changeset
|
138 old = {} |
4354
8aee687f0214
merge: fix quadratic behavior in find-copies
Matt Mackall <mpm@selenic.com>
parents:
4311
diff
changeset
|
139 seen = {} |
3732
ffe9fef84801
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
Matt Mackall <mpm@selenic.com>
parents:
3731
diff
changeset
|
140 orig = fctx.path() |
ffe9fef84801
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
Matt Mackall <mpm@selenic.com>
parents:
3731
diff
changeset
|
141 visit = [fctx] |
ffe9fef84801
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
Matt Mackall <mpm@selenic.com>
parents:
3731
diff
changeset
|
142 while visit: |
ffe9fef84801
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
Matt Mackall <mpm@selenic.com>
parents:
3731
diff
changeset
|
143 fc = visit.pop() |
4354
8aee687f0214
merge: fix quadratic behavior in find-copies
Matt Mackall <mpm@selenic.com>
parents:
4311
diff
changeset
|
144 s = str(fc) |
8aee687f0214
merge: fix quadratic behavior in find-copies
Matt Mackall <mpm@selenic.com>
parents:
4311
diff
changeset
|
145 if s in seen: |
8aee687f0214
merge: fix quadratic behavior in find-copies
Matt Mackall <mpm@selenic.com>
parents:
4311
diff
changeset
|
146 continue |
8aee687f0214
merge: fix quadratic behavior in find-copies
Matt Mackall <mpm@selenic.com>
parents:
4311
diff
changeset
|
147 seen[s] = 1 |
3881
c0a12e6441a5
Fix copy detection corner case
Matt Mackall <mpm@selenic.com>
parents:
3862
diff
changeset
|
148 if fc.path() != orig and fc.path() not in old: |
c0a12e6441a5
Fix copy detection corner case
Matt Mackall <mpm@selenic.com>
parents:
3862
diff
changeset
|
149 old[fc.path()] = 1 |
3732
ffe9fef84801
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
Matt Mackall <mpm@selenic.com>
parents:
3731
diff
changeset
|
150 if fc.rev() < limit: |
ffe9fef84801
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
Matt Mackall <mpm@selenic.com>
parents:
3731
diff
changeset
|
151 continue |
ffe9fef84801
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
Matt Mackall <mpm@selenic.com>
parents:
3731
diff
changeset
|
152 visit += fc.parents() |
ffe9fef84801
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
Matt Mackall <mpm@selenic.com>
parents:
3731
diff
changeset
|
153 |
ffe9fef84801
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
Matt Mackall <mpm@selenic.com>
parents:
3731
diff
changeset
|
154 old = old.keys() |
ffe9fef84801
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
Matt Mackall <mpm@selenic.com>
parents:
3731
diff
changeset
|
155 old.sort() |
ffe9fef84801
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
Matt Mackall <mpm@selenic.com>
parents:
3731
diff
changeset
|
156 return old |
ffe9fef84801
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
Matt Mackall <mpm@selenic.com>
parents:
3731
diff
changeset
|
157 |
4401
84cd52b48f94
merge: reorganize some hunks in findcopies
Matt Mackall <mpm@selenic.com>
parents:
4400
diff
changeset
|
158 copy = {} |
84cd52b48f94
merge: reorganize some hunks in findcopies
Matt Mackall <mpm@selenic.com>
parents:
4400
diff
changeset
|
159 fullcopy = {} |
4674
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4635
diff
changeset
|
160 diverge = {} |
3732
ffe9fef84801
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
Matt Mackall <mpm@selenic.com>
parents:
3731
diff
changeset
|
161 |
4890
931f901ab811
merge: fix unnecessary rename merges on linear update (issue631)
Matt Mackall <mpm@selenic.com>
parents:
4820
diff
changeset
|
162 def checkcopies(c, man, aman): |
3732
ffe9fef84801
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
Matt Mackall <mpm@selenic.com>
parents:
3731
diff
changeset
|
163 '''check possible copies for filectx c''' |
ffe9fef84801
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
Matt Mackall <mpm@selenic.com>
parents:
3731
diff
changeset
|
164 for of in findold(c): |
4674
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4635
diff
changeset
|
165 fullcopy[c.path()] = of # remember for dir rename detection |
4397
c04c96504a12
merge: clarify the findcopies code
Matt Mackall <mpm@selenic.com>
parents:
4354
diff
changeset
|
166 if of not in man: # original file not in other manifest? |
4674
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4635
diff
changeset
|
167 if of in ma: |
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4635
diff
changeset
|
168 diverge.setdefault(of, []).append(c.path()) |
4311
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
4207
diff
changeset
|
169 continue |
4890
931f901ab811
merge: fix unnecessary rename merges on linear update (issue631)
Matt Mackall <mpm@selenic.com>
parents:
4820
diff
changeset
|
170 # if the original file is unchanged on the other branch, |
931f901ab811
merge: fix unnecessary rename merges on linear update (issue631)
Matt Mackall <mpm@selenic.com>
parents:
4820
diff
changeset
|
171 # no merge needed |
931f901ab811
merge: fix unnecessary rename merges on linear update (issue631)
Matt Mackall <mpm@selenic.com>
parents:
4820
diff
changeset
|
172 if man[of] == aman.get(of): |
931f901ab811
merge: fix unnecessary rename merges on linear update (issue631)
Matt Mackall <mpm@selenic.com>
parents:
4820
diff
changeset
|
173 continue |
3732
ffe9fef84801
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
Matt Mackall <mpm@selenic.com>
parents:
3731
diff
changeset
|
174 c2 = ctx(of, man[of]) |
ffe9fef84801
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
Matt Mackall <mpm@selenic.com>
parents:
3731
diff
changeset
|
175 ca = c.ancestor(c2) |
4397
c04c96504a12
merge: clarify the findcopies code
Matt Mackall <mpm@selenic.com>
parents:
4354
diff
changeset
|
176 if not ca: # unrelated? |
4311
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
4207
diff
changeset
|
177 continue |
4397
c04c96504a12
merge: clarify the findcopies code
Matt Mackall <mpm@selenic.com>
parents:
4354
diff
changeset
|
178 # named changed on only one side? |
3732
ffe9fef84801
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
Matt Mackall <mpm@selenic.com>
parents:
3731
diff
changeset
|
179 if ca.path() == c.path() or ca.path() == c2.path(): |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4401
diff
changeset
|
180 if c == ca or c2 == ca: # no merge needed, ignore copy |
4311
4787e2b0dd03
merge: fix a bug where copies were ignored
Matt Mackall <mpm@selenic.com>
parents:
4207
diff
changeset
|
181 continue |
3732
ffe9fef84801
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
Matt Mackall <mpm@selenic.com>
parents:
3731
diff
changeset
|
182 copy[c.path()] = of |
ffe9fef84801
merge: pull findcopies helpers inside, refactor checkpair to checkcopies
Matt Mackall <mpm@selenic.com>
parents:
3731
diff
changeset
|
183 |
3377
8c36b33a27c7
merge: turn followcopies on by default
Matt Mackall <mpm@selenic.com>
parents:
3323
diff
changeset
|
184 if not repo.ui.configbool("merge", "followcopies", True): |
4674
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4635
diff
changeset
|
185 return {}, {} |
3255
f05c182430a0
merge: add rename following
Matt Mackall <mpm@selenic.com>
parents:
3254
diff
changeset
|
186 |
3161
1839e6e91c3a
findcopies: shortcut for empty working dir
Matt Mackall <mpm@selenic.com>
parents:
3157
diff
changeset
|
187 # avoid silly behavior for update from empty dir |
3731
b4af5f92e04b
merge: move check for empty ancestor into findcopies
Matt Mackall <mpm@selenic.com>
parents:
3730
diff
changeset
|
188 if not m1 or not m2 or not ma: |
4674
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4635
diff
changeset
|
189 return {}, {} |
3161
1839e6e91c3a
findcopies: shortcut for empty working dir
Matt Mackall <mpm@selenic.com>
parents:
3157
diff
changeset
|
190 |
3377
8c36b33a27c7
merge: turn followcopies on by default
Matt Mackall <mpm@selenic.com>
parents:
3323
diff
changeset
|
191 u1 = nonoverlap(m1, m2, ma) |
8c36b33a27c7
merge: turn followcopies on by default
Matt Mackall <mpm@selenic.com>
parents:
3323
diff
changeset
|
192 u2 = nonoverlap(m2, m1, ma) |
3155
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
3122
diff
changeset
|
193 |
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
3122
diff
changeset
|
194 for f in u1: |
4890
931f901ab811
merge: fix unnecessary rename merges on linear update (issue631)
Matt Mackall <mpm@selenic.com>
parents:
4820
diff
changeset
|
195 checkcopies(ctx(f, m1[f]), m2, ma) |
3155
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
3122
diff
changeset
|
196 |
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
3122
diff
changeset
|
197 for f in u2: |
4890
931f901ab811
merge: fix unnecessary rename merges on linear update (issue631)
Matt Mackall <mpm@selenic.com>
parents:
4820
diff
changeset
|
198 checkcopies(ctx(f, m2[f]), m1, ma) |
3155
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
3122
diff
changeset
|
199 |
4674
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4635
diff
changeset
|
200 d2 = {} |
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4635
diff
changeset
|
201 for of, fl in diverge.items(): |
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4635
diff
changeset
|
202 for f in fl: |
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4635
diff
changeset
|
203 fo = list(fl) |
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4635
diff
changeset
|
204 fo.remove(f) |
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4635
diff
changeset
|
205 d2[f] = (of, fo) |
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4635
diff
changeset
|
206 |
3733
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
207 if not fullcopy or not repo.ui.configbool("merge", "followdirs", True): |
4674
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4635
diff
changeset
|
208 return copy, diverge |
3733
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
209 |
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
210 # generate a directory move map |
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
211 d1, d2 = dirs(m1), dirs(m2) |
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
212 invalid = {} |
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
213 dirmove = {} |
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
214 |
4397
c04c96504a12
merge: clarify the findcopies code
Matt Mackall <mpm@selenic.com>
parents:
4354
diff
changeset
|
215 # examine each file copy for a potential directory move, which is |
c04c96504a12
merge: clarify the findcopies code
Matt Mackall <mpm@selenic.com>
parents:
4354
diff
changeset
|
216 # when all the files in a directory are moved to a new directory |
3733
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
217 for dst, src in fullcopy.items(): |
4398
9fe267f77f56
merge: fix a bug detecting directory moves
Matt Mackall <mpm@selenic.com>
parents:
4397
diff
changeset
|
218 dsrc, ddst = dirname(src), dirname(dst) |
3733
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
219 if dsrc in invalid: |
4397
c04c96504a12
merge: clarify the findcopies code
Matt Mackall <mpm@selenic.com>
parents:
4354
diff
changeset
|
220 # already seen to be uninteresting |
3733
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
221 continue |
4397
c04c96504a12
merge: clarify the findcopies code
Matt Mackall <mpm@selenic.com>
parents:
4354
diff
changeset
|
222 elif dsrc in d1 and ddst in d1: |
c04c96504a12
merge: clarify the findcopies code
Matt Mackall <mpm@selenic.com>
parents:
4354
diff
changeset
|
223 # directory wasn't entirely moved locally |
c04c96504a12
merge: clarify the findcopies code
Matt Mackall <mpm@selenic.com>
parents:
4354
diff
changeset
|
224 invalid[dsrc] = True |
c04c96504a12
merge: clarify the findcopies code
Matt Mackall <mpm@selenic.com>
parents:
4354
diff
changeset
|
225 elif dsrc in d2 and ddst in d2: |
c04c96504a12
merge: clarify the findcopies code
Matt Mackall <mpm@selenic.com>
parents:
4354
diff
changeset
|
226 # directory wasn't entirely moved remotely |
3733
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
227 invalid[dsrc] = True |
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
228 elif dsrc in dirmove and dirmove[dsrc] != ddst: |
4397
c04c96504a12
merge: clarify the findcopies code
Matt Mackall <mpm@selenic.com>
parents:
4354
diff
changeset
|
229 # files from the same directory moved to two different places |
3733
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
230 invalid[dsrc] = True |
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
231 else: |
4397
c04c96504a12
merge: clarify the findcopies code
Matt Mackall <mpm@selenic.com>
parents:
4354
diff
changeset
|
232 # looks good so far |
4117
c95060a5391a
merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
3881
diff
changeset
|
233 dirmove[dsrc + "/"] = ddst + "/" |
3733
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
234 |
4399
3b7e284b8f28
merge: expand and simplify the invalid handling for directory moves
Matt Mackall <mpm@selenic.com>
parents:
4398
diff
changeset
|
235 for i in invalid: |
3b7e284b8f28
merge: expand and simplify the invalid handling for directory moves
Matt Mackall <mpm@selenic.com>
parents:
4398
diff
changeset
|
236 if i in dirmove: |
3b7e284b8f28
merge: expand and simplify the invalid handling for directory moves
Matt Mackall <mpm@selenic.com>
parents:
4398
diff
changeset
|
237 del dirmove[i] |
3b7e284b8f28
merge: expand and simplify the invalid handling for directory moves
Matt Mackall <mpm@selenic.com>
parents:
4398
diff
changeset
|
238 |
3733
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
239 del d1, d2, invalid |
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
240 |
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
241 if not dirmove: |
4674
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4635
diff
changeset
|
242 return copy, diverge |
3733
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
243 |
4397
c04c96504a12
merge: clarify the findcopies code
Matt Mackall <mpm@selenic.com>
parents:
4354
diff
changeset
|
244 # check unaccounted nonoverlapping files against directory moves |
3733
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
245 for f in u1 + u2: |
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
246 if f not in fullcopy: |
4117
c95060a5391a
merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
3881
diff
changeset
|
247 for d in dirmove: |
c95060a5391a
merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
3881
diff
changeset
|
248 if f.startswith(d): |
4397
c04c96504a12
merge: clarify the findcopies code
Matt Mackall <mpm@selenic.com>
parents:
4354
diff
changeset
|
249 # new file added in a directory that was moved, move it |
4117
c95060a5391a
merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
3881
diff
changeset
|
250 copy[f] = dirmove[d] + f[len(d):] |
c95060a5391a
merge: fix renaming of subdirectories under renamed directories
Matt Mackall <mpm@selenic.com>
parents:
3881
diff
changeset
|
251 break |
3733
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
252 |
4674
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4635
diff
changeset
|
253 return copy, diverge |
3155
c82ea81d6850
Add core copy detection algorithm
Matt Mackall <mpm@selenic.com>
parents:
3122
diff
changeset
|
254 |
3301
72d1e521da77
merge: use contexts for manifestmerge
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
255 def manifestmerge(repo, p1, p2, pa, overwrite, partial): |
3106
7c7469d41ade
merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents:
3105
diff
changeset
|
256 """ |
3322
38be819a1225
merge: update some docstrings
Matt Mackall <mpm@selenic.com>
parents:
3320
diff
changeset
|
257 Merge p1 and p2 with ancestor ma and generate merge action list |
38be819a1225
merge: update some docstrings
Matt Mackall <mpm@selenic.com>
parents:
3320
diff
changeset
|
258 |
38be819a1225
merge: update some docstrings
Matt Mackall <mpm@selenic.com>
parents:
3320
diff
changeset
|
259 overwrite = whether we clobber working files |
38be819a1225
merge: update some docstrings
Matt Mackall <mpm@selenic.com>
parents:
3320
diff
changeset
|
260 partial = function to filter file lists |
3106
7c7469d41ade
merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents:
3105
diff
changeset
|
261 """ |
7c7469d41ade
merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents:
3105
diff
changeset
|
262 |
3320 | 263 repo.ui.note(_("resolving manifests\n")) |
264 repo.ui.debug(_(" overwrite %s partial %s\n") % (overwrite, bool(partial))) | |
265 repo.ui.debug(_(" ancestor %s local %s remote %s\n") % (pa, p1, p2)) | |
266 | |
3301
72d1e521da77
merge: use contexts for manifestmerge
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
267 m1 = p1.manifest() |
72d1e521da77
merge: use contexts for manifestmerge
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
268 m2 = p2.manifest() |
72d1e521da77
merge: use contexts for manifestmerge
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
269 ma = pa.manifest() |
72d1e521da77
merge: use contexts for manifestmerge
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
270 backwards = (pa == p2) |
3320 | 271 action = [] |
272 copy = {} | |
4674
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4635
diff
changeset
|
273 diverge = {} |
3301
72d1e521da77
merge: use contexts for manifestmerge
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
274 |
3255
f05c182430a0
merge: add rename following
Matt Mackall <mpm@selenic.com>
parents:
3254
diff
changeset
|
275 def fmerge(f, f2=None, fa=None): |
4007
20da40cc1c73
symlinks: minimal support for symlinks in merge/update
Matt Mackall <mpm@selenic.com>
parents:
4006
diff
changeset
|
276 """merge flags""" |
3255
f05c182430a0
merge: add rename following
Matt Mackall <mpm@selenic.com>
parents:
3254
diff
changeset
|
277 if not f2: |
f05c182430a0
merge: add rename following
Matt Mackall <mpm@selenic.com>
parents:
3254
diff
changeset
|
278 f2 = f |
f05c182430a0
merge: add rename following
Matt Mackall <mpm@selenic.com>
parents:
3254
diff
changeset
|
279 fa = f |
f05c182430a0
merge: add rename following
Matt Mackall <mpm@selenic.com>
parents:
3254
diff
changeset
|
280 a, b, c = ma.execf(fa), m1.execf(f), m2.execf(f2) |
4007
20da40cc1c73
symlinks: minimal support for symlinks in merge/update
Matt Mackall <mpm@selenic.com>
parents:
4006
diff
changeset
|
281 if ((a^b) | (a^c)) ^ a: |
20da40cc1c73
symlinks: minimal support for symlinks in merge/update
Matt Mackall <mpm@selenic.com>
parents:
4006
diff
changeset
|
282 return 'x' |
20da40cc1c73
symlinks: minimal support for symlinks in merge/update
Matt Mackall <mpm@selenic.com>
parents:
4006
diff
changeset
|
283 a, b, c = ma.linkf(fa), m1.linkf(f), m2.linkf(f2) |
20da40cc1c73
symlinks: minimal support for symlinks in merge/update
Matt Mackall <mpm@selenic.com>
parents:
4006
diff
changeset
|
284 if ((a^b) | (a^c)) ^ a: |
20da40cc1c73
symlinks: minimal support for symlinks in merge/update
Matt Mackall <mpm@selenic.com>
parents:
4006
diff
changeset
|
285 return 'l' |
20da40cc1c73
symlinks: minimal support for symlinks in merge/update
Matt Mackall <mpm@selenic.com>
parents:
4006
diff
changeset
|
286 return '' |
3119
5644a05a608c
merge: simplify exec flag handling
Matt Mackall <mpm@selenic.com>
parents:
3118
diff
changeset
|
287 |
3313
f009a6f12a59
merge: swap file and mode args for act()
Matt Mackall <mpm@selenic.com>
parents:
3312
diff
changeset
|
288 def act(msg, m, f, *args): |
3301
72d1e521da77
merge: use contexts for manifestmerge
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
289 repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m)) |
3122
2ef0b3aae186
merge: simplify actions with helper function
Matt Mackall <mpm@selenic.com>
parents:
3121
diff
changeset
|
290 action.append((f, m) + args) |
2ef0b3aae186
merge: simplify actions with helper function
Matt Mackall <mpm@selenic.com>
parents:
3121
diff
changeset
|
291 |
3731
b4af5f92e04b
merge: move check for empty ancestor into findcopies
Matt Mackall <mpm@selenic.com>
parents:
3730
diff
changeset
|
292 if not (backwards or overwrite): |
4674
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4635
diff
changeset
|
293 copy, diverge = findcopies(repo, m1, m2, ma, pa.rev()) |
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4635
diff
changeset
|
294 |
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4635
diff
changeset
|
295 for of, fl in diverge.items(): |
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4635
diff
changeset
|
296 act("divergent renames", "dr", of, fl) |
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4635
diff
changeset
|
297 |
3730
d377f8d25662
merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com>
parents:
3729
diff
changeset
|
298 copied = dict.fromkeys(copy.values()) |
3301
72d1e521da77
merge: use contexts for manifestmerge
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
299 |
3106
7c7469d41ade
merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents:
3105
diff
changeset
|
300 # Compare manifests |
7c7469d41ade
merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents:
3105
diff
changeset
|
301 for f, n in m1.iteritems(): |
3254
751840e739a1
merge: reduce manifest copying
Matt Mackall <mpm@selenic.com>
parents:
3248
diff
changeset
|
302 if partial and not partial(f): |
751840e739a1
merge: reduce manifest copying
Matt Mackall <mpm@selenic.com>
parents:
3248
diff
changeset
|
303 continue |
3106
7c7469d41ade
merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents:
3105
diff
changeset
|
304 if f in m2: |
7c7469d41ade
merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents:
3105
diff
changeset
|
305 # are files different? |
7c7469d41ade
merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents:
3105
diff
changeset
|
306 if n != m2[f]: |
7c7469d41ade
merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents:
3105
diff
changeset
|
307 a = ma.get(f, nullid) |
7c7469d41ade
merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents:
3105
diff
changeset
|
308 # are both different from the ancestor? |
7c7469d41ade
merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents:
3105
diff
changeset
|
309 if not overwrite and n != a and m2[f] != a: |
3314
ecc1bf27378c
merge: unify merge and copy actions
Matt Mackall <mpm@selenic.com>
parents:
3313
diff
changeset
|
310 act("versions differ", "m", f, f, f, fmerge(f), False) |
3106
7c7469d41ade
merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents:
3105
diff
changeset
|
311 # are we clobbering? |
7c7469d41ade
merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents:
3105
diff
changeset
|
312 # is remote's version newer? |
7c7469d41ade
merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents:
3105
diff
changeset
|
313 # 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
|
314 elif overwrite or m2[f] != a or (backwards and not n[20:]): |
4007
20da40cc1c73
symlinks: minimal support for symlinks in merge/update
Matt Mackall <mpm@selenic.com>
parents:
4006
diff
changeset
|
315 act("remote is newer", "g", f, m2.flags(f)) |
3114
d1d1cd5b9484
merge: eliminate confusing queued variable
Matt Mackall <mpm@selenic.com>
parents:
3113
diff
changeset
|
316 # local is newer, not overwrite, check mode bits |
4007
20da40cc1c73
symlinks: minimal support for symlinks in merge/update
Matt Mackall <mpm@selenic.com>
parents:
4006
diff
changeset
|
317 elif fmerge(f) != m1.flags(f): |
20da40cc1c73
symlinks: minimal support for symlinks in merge/update
Matt Mackall <mpm@selenic.com>
parents:
4006
diff
changeset
|
318 act("update permissions", "e", f, m2.flags(f)) |
3114
d1d1cd5b9484
merge: eliminate confusing queued variable
Matt Mackall <mpm@selenic.com>
parents:
3113
diff
changeset
|
319 # contents same, check mode bits |
4007
20da40cc1c73
symlinks: minimal support for symlinks in merge/update
Matt Mackall <mpm@selenic.com>
parents:
4006
diff
changeset
|
320 elif m1.flags(f) != m2.flags(f): |
20da40cc1c73
symlinks: minimal support for symlinks in merge/update
Matt Mackall <mpm@selenic.com>
parents:
4006
diff
changeset
|
321 if overwrite or fmerge(f) != m1.flags(f): |
20da40cc1c73
symlinks: minimal support for symlinks in merge/update
Matt Mackall <mpm@selenic.com>
parents:
4006
diff
changeset
|
322 act("update permissions", "e", f, m2.flags(f)) |
3730
d377f8d25662
merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com>
parents:
3729
diff
changeset
|
323 elif f in copied: |
d377f8d25662
merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com>
parents:
3729
diff
changeset
|
324 continue |
3255
f05c182430a0
merge: add rename following
Matt Mackall <mpm@selenic.com>
parents:
3254
diff
changeset
|
325 elif f in copy: |
f05c182430a0
merge: add rename following
Matt Mackall <mpm@selenic.com>
parents:
3254
diff
changeset
|
326 f2 = copy[f] |
3733
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
327 if f2 not in m2: # directory rename |
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
328 act("remote renamed directory to " + f2, "d", |
4007
20da40cc1c73
symlinks: minimal support for symlinks in merge/update
Matt Mackall <mpm@selenic.com>
parents:
4006
diff
changeset
|
329 f, None, f2, m1.flags(f)) |
3733
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
330 elif f2 in m1: # case 2 A,B/B/B |
3730
d377f8d25662
merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com>
parents:
3729
diff
changeset
|
331 act("local copied to " + f2, "m", |
d377f8d25662
merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com>
parents:
3729
diff
changeset
|
332 f, f2, f, fmerge(f, f2, f2), False) |
d377f8d25662
merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com>
parents:
3729
diff
changeset
|
333 else: # case 4,21 A/B/B |
d377f8d25662
merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com>
parents:
3729
diff
changeset
|
334 act("local moved to " + f2, "m", |
d377f8d25662
merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com>
parents:
3729
diff
changeset
|
335 f, f2, f, fmerge(f, f2, f2), False) |
3106
7c7469d41ade
merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents:
3105
diff
changeset
|
336 elif f in ma: |
3118
7a635ef25132
merge: simplify tests for local changed/remote deleted
Matt Mackall <mpm@selenic.com>
parents:
3117
diff
changeset
|
337 if n != ma[f] and not overwrite: |
3301
72d1e521da77
merge: use contexts for manifestmerge
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
338 if repo.ui.prompt( |
3118
7a635ef25132
merge: simplify tests for local changed/remote deleted
Matt Mackall <mpm@selenic.com>
parents:
3117
diff
changeset
|
339 (_(" local changed %s which remote deleted\n") % f) + |
3120
b1de36a4b4df
merge: simplify prompt code
Matt Mackall <mpm@selenic.com>
parents:
3119
diff
changeset
|
340 _("(k)eep or (d)elete?"), _("[kd]"), _("k")) == _("d"): |
3313
f009a6f12a59
merge: swap file and mode args for act()
Matt Mackall <mpm@selenic.com>
parents:
3312
diff
changeset
|
341 act("prompt delete", "r", f) |
3106
7c7469d41ade
merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents:
3105
diff
changeset
|
342 else: |
3313
f009a6f12a59
merge: swap file and mode args for act()
Matt Mackall <mpm@selenic.com>
parents:
3312
diff
changeset
|
343 act("other deleted", "r", f) |
3106
7c7469d41ade
merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents:
3105
diff
changeset
|
344 else: |
7c7469d41ade
merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents:
3105
diff
changeset
|
345 # 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
|
346 if (overwrite and n[20:] != "u") or (backwards and not n[20:]): |
3313
f009a6f12a59
merge: swap file and mode args for act()
Matt Mackall <mpm@selenic.com>
parents:
3312
diff
changeset
|
347 act("remote deleted", "r", f) |
3106
7c7469d41ade
merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents:
3105
diff
changeset
|
348 |
7c7469d41ade
merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents:
3105
diff
changeset
|
349 for f, n in m2.iteritems(): |
3254
751840e739a1
merge: reduce manifest copying
Matt Mackall <mpm@selenic.com>
parents:
3248
diff
changeset
|
350 if partial and not partial(f): |
751840e739a1
merge: reduce manifest copying
Matt Mackall <mpm@selenic.com>
parents:
3248
diff
changeset
|
351 continue |
751840e739a1
merge: reduce manifest copying
Matt Mackall <mpm@selenic.com>
parents:
3248
diff
changeset
|
352 if f in m1: |
751840e739a1
merge: reduce manifest copying
Matt Mackall <mpm@selenic.com>
parents:
3248
diff
changeset
|
353 continue |
3729
581d20773326
merge: add copied hash to simplify copy logic
Matt Mackall <mpm@selenic.com>
parents:
3728
diff
changeset
|
354 if f in copied: |
581d20773326
merge: add copied hash to simplify copy logic
Matt Mackall <mpm@selenic.com>
parents:
3728
diff
changeset
|
355 continue |
3255
f05c182430a0
merge: add rename following
Matt Mackall <mpm@selenic.com>
parents:
3254
diff
changeset
|
356 if f in copy: |
f05c182430a0
merge: add rename following
Matt Mackall <mpm@selenic.com>
parents:
3254
diff
changeset
|
357 f2 = copy[f] |
3733
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
358 if f2 not in m1: # directory rename |
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
359 act("local renamed directory to " + f2, "d", |
4007
20da40cc1c73
symlinks: minimal support for symlinks in merge/update
Matt Mackall <mpm@selenic.com>
parents:
4006
diff
changeset
|
360 None, f, f2, m2.flags(f)) |
3733
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
361 elif f2 in m2: # rename case 1, A/A,B/A |
3730
d377f8d25662
merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com>
parents:
3729
diff
changeset
|
362 act("remote copied to " + f, "m", |
d377f8d25662
merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com>
parents:
3729
diff
changeset
|
363 f2, f, f, fmerge(f2, f, f2), False) |
d377f8d25662
merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com>
parents:
3729
diff
changeset
|
364 else: # case 3,20 A/B/A |
d377f8d25662
merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com>
parents:
3729
diff
changeset
|
365 act("remote moved to " + f, "m", |
d377f8d25662
merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com>
parents:
3729
diff
changeset
|
366 f2, f, f, fmerge(f2, f, f2), True) |
3255
f05c182430a0
merge: add rename following
Matt Mackall <mpm@selenic.com>
parents:
3254
diff
changeset
|
367 elif f in ma: |
3117
920f54a2249e
merge: more simplification of m2 manifest scanning
Matt Mackall <mpm@selenic.com>
parents:
3116
diff
changeset
|
368 if overwrite or backwards: |
4007
20da40cc1c73
symlinks: minimal support for symlinks in merge/update
Matt Mackall <mpm@selenic.com>
parents:
4006
diff
changeset
|
369 act("recreating", "g", f, m2.flags(f)) |
3117
920f54a2249e
merge: more simplification of m2 manifest scanning
Matt Mackall <mpm@selenic.com>
parents:
3116
diff
changeset
|
370 elif n != ma[f]: |
3301
72d1e521da77
merge: use contexts for manifestmerge
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
371 if repo.ui.prompt( |
3117
920f54a2249e
merge: more simplification of m2 manifest scanning
Matt Mackall <mpm@selenic.com>
parents:
3116
diff
changeset
|
372 (_("remote changed %s which local deleted\n") % f) + |
3120
b1de36a4b4df
merge: simplify prompt code
Matt Mackall <mpm@selenic.com>
parents:
3119
diff
changeset
|
373 _("(k)eep or (d)elete?"), _("[kd]"), _("k")) == _("k"): |
4007
20da40cc1c73
symlinks: minimal support for symlinks in merge/update
Matt Mackall <mpm@selenic.com>
parents:
4006
diff
changeset
|
374 act("prompt recreating", "g", f, m2.flags(f)) |
3116
bb74f809bc95
merge: reorder tests on m2 items in manifestmerge
Matt Mackall <mpm@selenic.com>
parents:
3115
diff
changeset
|
375 else: |
4007
20da40cc1c73
symlinks: minimal support for symlinks in merge/update
Matt Mackall <mpm@selenic.com>
parents:
4006
diff
changeset
|
376 act("remote created", "g", f, m2.flags(f)) |
3106
7c7469d41ade
merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents:
3105
diff
changeset
|
377 |
7c7469d41ade
merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents:
3105
diff
changeset
|
378 return action |
7c7469d41ade
merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com>
parents:
3105
diff
changeset
|
379 |
3303
69b9471f26bb
merge: pass contexts to applyupdates
Matt Mackall <mpm@selenic.com>
parents:
3302
diff
changeset
|
380 def applyupdates(repo, action, wctx, mctx): |
3322
38be819a1225
merge: update some docstrings
Matt Mackall <mpm@selenic.com>
parents:
3320
diff
changeset
|
381 "apply the merge action list to the working directory" |
38be819a1225
merge: update some docstrings
Matt Mackall <mpm@selenic.com>
parents:
3320
diff
changeset
|
382 |
3112
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
383 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
|
384 action.sort() |
5045
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4999
diff
changeset
|
385 # prescan for copy/renames |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4999
diff
changeset
|
386 for a in action: |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4999
diff
changeset
|
387 f, m = a[:2] |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4999
diff
changeset
|
388 if m == 'm': # merge |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4999
diff
changeset
|
389 f2, fd, flags, move = a[2:] |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4999
diff
changeset
|
390 if f != fd: |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4999
diff
changeset
|
391 repo.ui.debug(_("copying %s to %s\n") % (f, fd)) |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4999
diff
changeset
|
392 repo.wwrite(fd, repo.wread(f), flags) |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4999
diff
changeset
|
393 |
3112
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
394 for a in action: |
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
395 f, m = a[:2] |
3733
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
396 if f and f[0] == "/": |
3112
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
397 continue |
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
398 if m == "r": # remove |
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
399 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
|
400 util.audit_path(f) |
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
401 try: |
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
402 util.unlink(repo.wjoin(f)) |
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
403 except OSError, inst: |
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
404 if inst.errno != errno.ENOENT: |
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
405 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
|
406 (f, inst.strerror)) |
3673
eb0b4a2d70a9
white space and line break cleanups
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3620
diff
changeset
|
407 removed += 1 |
3314
ecc1bf27378c
merge: unify merge and copy actions
Matt Mackall <mpm@selenic.com>
parents:
3313
diff
changeset
|
408 elif m == "m": # merge |
4007
20da40cc1c73
symlinks: minimal support for symlinks in merge/update
Matt Mackall <mpm@selenic.com>
parents:
4006
diff
changeset
|
409 f2, fd, flags, move = a[2:] |
5045
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4999
diff
changeset
|
410 r = filemerge(repo, f, fd, f2, wctx, mctx) |
3407
d2b55e3c4e25
merge: if filemerge skips merge, report as updated
Matt Mackall <mpm@selenic.com>
parents:
3387
diff
changeset
|
411 if r > 0: |
3255
f05c182430a0
merge: add rename following
Matt Mackall <mpm@selenic.com>
parents:
3254
diff
changeset
|
412 unresolved += 1 |
3315
e8be5942335d
merge: pull file copy/move out of filemerge
Matt Mackall <mpm@selenic.com>
parents:
3314
diff
changeset
|
413 else: |
3407
d2b55e3c4e25
merge: if filemerge skips merge, report as updated
Matt Mackall <mpm@selenic.com>
parents:
3387
diff
changeset
|
414 if r is None: |
d2b55e3c4e25
merge: if filemerge skips merge, report as updated
Matt Mackall <mpm@selenic.com>
parents:
3387
diff
changeset
|
415 updated += 1 |
d2b55e3c4e25
merge: if filemerge skips merge, report as updated
Matt Mackall <mpm@selenic.com>
parents:
3387
diff
changeset
|
416 else: |
d2b55e3c4e25
merge: if filemerge skips merge, report as updated
Matt Mackall <mpm@selenic.com>
parents:
3387
diff
changeset
|
417 merged += 1 |
5059
8d9bdcbb2b18
merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
5045
diff
changeset
|
418 util.set_exec(repo.wjoin(fd), "x" in flags) |
8d9bdcbb2b18
merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
5045
diff
changeset
|
419 if f != fd and move and util.lexists(repo.wjoin(f)): |
5045
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4999
diff
changeset
|
420 repo.ui.debug(_("removing %s\n") % f) |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
4999
diff
changeset
|
421 os.unlink(repo.wjoin(f)) |
3112
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
422 elif m == "g": # get |
4007
20da40cc1c73
symlinks: minimal support for symlinks in merge/update
Matt Mackall <mpm@selenic.com>
parents:
4006
diff
changeset
|
423 flags = a[2] |
3112
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
424 repo.ui.note(_("getting %s\n") % f) |
3309
488d3062d225
merge: eliminate nodes from action list
Matt Mackall <mpm@selenic.com>
parents:
3305
diff
changeset
|
425 t = mctx.filectx(f).data() |
4007
20da40cc1c73
symlinks: minimal support for symlinks in merge/update
Matt Mackall <mpm@selenic.com>
parents:
4006
diff
changeset
|
426 repo.wwrite(f, t, flags) |
3112
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
427 updated += 1 |
3733
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
428 elif m == "d": # directory rename |
4007
20da40cc1c73
symlinks: minimal support for symlinks in merge/update
Matt Mackall <mpm@selenic.com>
parents:
4006
diff
changeset
|
429 f2, fd, flags = a[2:] |
3733
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
430 if f: |
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
431 repo.ui.note(_("moving %s to %s\n") % (f, fd)) |
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
432 t = wctx.filectx(f).data() |
4007
20da40cc1c73
symlinks: minimal support for symlinks in merge/update
Matt Mackall <mpm@selenic.com>
parents:
4006
diff
changeset
|
433 repo.wwrite(fd, t, flags) |
3733
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
434 util.unlink(repo.wjoin(f)) |
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
435 if f2: |
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
436 repo.ui.note(_("getting %s to %s\n") % (f2, fd)) |
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
437 t = mctx.filectx(f2).data() |
4007
20da40cc1c73
symlinks: minimal support for symlinks in merge/update
Matt Mackall <mpm@selenic.com>
parents:
4006
diff
changeset
|
438 repo.wwrite(fd, t, flags) |
3733
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
439 updated += 1 |
4674
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4635
diff
changeset
|
440 elif m == "dr": # divergent renames |
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4635
diff
changeset
|
441 fl = a[2] |
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4635
diff
changeset
|
442 repo.ui.warn("warning: detected divergent renames of %s to:\n" % f) |
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4635
diff
changeset
|
443 for nf in fl: |
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4635
diff
changeset
|
444 repo.ui.warn(" %s\n" % nf) |
3112
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
445 elif m == "e": # exec |
4007
20da40cc1c73
symlinks: minimal support for symlinks in merge/update
Matt Mackall <mpm@selenic.com>
parents:
4006
diff
changeset
|
446 flags = a[2] |
20da40cc1c73
symlinks: minimal support for symlinks in merge/update
Matt Mackall <mpm@selenic.com>
parents:
4006
diff
changeset
|
447 util.set_exec(repo.wjoin(f), flags) |
3112
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
448 |
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
449 return updated, merged, removed, unresolved |
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
450 |
3387
ba7c74081861
merge: update dirstate correctly for non-branchmerge updates
Matt Mackall <mpm@selenic.com>
parents:
3377
diff
changeset
|
451 def recordupdates(repo, action, branchmerge): |
3322
38be819a1225
merge: update some docstrings
Matt Mackall <mpm@selenic.com>
parents:
3320
diff
changeset
|
452 "record merge actions to the dirstate" |
38be819a1225
merge: update some docstrings
Matt Mackall <mpm@selenic.com>
parents:
3320
diff
changeset
|
453 |
3112
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
454 for a in action: |
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
455 f, m = a[:2] |
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
456 if m == "r": # remove |
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
457 if branchmerge: |
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
458 repo.dirstate.update([f], 'r') |
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
459 else: |
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
460 repo.dirstate.forget([f]) |
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
461 elif m == "f": # forget |
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
462 repo.dirstate.forget([f]) |
4999
60c54154ec4c
merge: don't forget to update the dirstate for exec bit changes
Matt Mackall <mpm@selenic.com>
parents:
4890
diff
changeset
|
463 elif m in "ge": # get or exec change |
3112
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
464 if branchmerge: |
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
465 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
|
466 else: |
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
467 repo.dirstate.update([f], 'n') |
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
468 elif m == "m": # merge |
3309
488d3062d225
merge: eliminate nodes from action list
Matt Mackall <mpm@selenic.com>
parents:
3305
diff
changeset
|
469 f2, fd, flag, move = a[2:] |
3257
c93ce7f10f85
merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents:
3255
diff
changeset
|
470 if branchmerge: |
c93ce7f10f85
merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents:
3255
diff
changeset
|
471 # We've done a branch merge, mark this file as merged |
c93ce7f10f85
merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents:
3255
diff
changeset
|
472 # so that we properly record the merger later |
c93ce7f10f85
merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents:
3255
diff
changeset
|
473 repo.dirstate.update([fd], 'm') |
3387
ba7c74081861
merge: update dirstate correctly for non-branchmerge updates
Matt Mackall <mpm@selenic.com>
parents:
3377
diff
changeset
|
474 if f != f2: # copy/rename |
ba7c74081861
merge: update dirstate correctly for non-branchmerge updates
Matt Mackall <mpm@selenic.com>
parents:
3377
diff
changeset
|
475 if move: |
ba7c74081861
merge: update dirstate correctly for non-branchmerge updates
Matt Mackall <mpm@selenic.com>
parents:
3377
diff
changeset
|
476 repo.dirstate.update([f], 'r') |
ba7c74081861
merge: update dirstate correctly for non-branchmerge updates
Matt Mackall <mpm@selenic.com>
parents:
3377
diff
changeset
|
477 if f != fd: |
ba7c74081861
merge: update dirstate correctly for non-branchmerge updates
Matt Mackall <mpm@selenic.com>
parents:
3377
diff
changeset
|
478 repo.dirstate.copy(f, fd) |
ba7c74081861
merge: update dirstate correctly for non-branchmerge updates
Matt Mackall <mpm@selenic.com>
parents:
3377
diff
changeset
|
479 else: |
ba7c74081861
merge: update dirstate correctly for non-branchmerge updates
Matt Mackall <mpm@selenic.com>
parents:
3377
diff
changeset
|
480 repo.dirstate.copy(f2, fd) |
3257
c93ce7f10f85
merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents:
3255
diff
changeset
|
481 else: |
c93ce7f10f85
merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents:
3255
diff
changeset
|
482 # We've update-merged a locally modified file, so |
c93ce7f10f85
merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents:
3255
diff
changeset
|
483 # we set the dirstate to emulate a normal checkout |
c93ce7f10f85
merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents:
3255
diff
changeset
|
484 # of that file some time in the past. Thus our |
c93ce7f10f85
merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents:
3255
diff
changeset
|
485 # merge will appear as a normal local file |
c93ce7f10f85
merge: fixes for merge+rename
Matt Mackall <mpm@selenic.com>
parents:
3255
diff
changeset
|
486 # modification. |
3387
ba7c74081861
merge: update dirstate correctly for non-branchmerge updates
Matt Mackall <mpm@selenic.com>
parents:
3377
diff
changeset
|
487 repo.dirstate.update([fd], 'n', st_size=-1, st_mtime=-1) |
3314
ecc1bf27378c
merge: unify merge and copy actions
Matt Mackall <mpm@selenic.com>
parents:
3313
diff
changeset
|
488 if move: |
3387
ba7c74081861
merge: update dirstate correctly for non-branchmerge updates
Matt Mackall <mpm@selenic.com>
parents:
3377
diff
changeset
|
489 repo.dirstate.forget([f]) |
3733
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
490 elif m == "d": # directory rename |
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
491 f2, fd, flag = a[2:] |
4820
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
4815
diff
changeset
|
492 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:
4815
diff
changeset
|
493 # untracked file moved |
9797124581c9
merge: fix adding untracked files on directory rename (issue612)
Matt Mackall <mpm@selenic.com>
parents:
4815
diff
changeset
|
494 continue |
3733
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
495 if branchmerge: |
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
496 repo.dirstate.update([fd], 'a') |
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
497 if f: |
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
498 repo.dirstate.update([f], 'r') |
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
499 repo.dirstate.copy(f, fd) |
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
500 if f2: |
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
501 repo.dirstate.copy(f2, fd) |
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
502 else: |
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
503 repo.dirstate.update([fd], 'n') |
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
504 if f: |
9e67fecbfd16
merge: handle directory renames
Matt Mackall <mpm@selenic.com>
parents:
3732
diff
changeset
|
505 repo.dirstate.forget([f]) |
3112
5cc62d99b785
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3111
diff
changeset
|
506 |
3323
39fd6e82ea38
merge: pull user messages out to hg.py
Matt Mackall <mpm@selenic.com>
parents:
3322
diff
changeset
|
507 def update(repo, node, branchmerge, force, partial, wlock): |
3322
38be819a1225
merge: update some docstrings
Matt Mackall <mpm@selenic.com>
parents:
3320
diff
changeset
|
508 """ |
38be819a1225
merge: update some docstrings
Matt Mackall <mpm@selenic.com>
parents:
3320
diff
changeset
|
509 Perform a merge between the working directory and the given node |
38be819a1225
merge: update some docstrings
Matt Mackall <mpm@selenic.com>
parents:
3320
diff
changeset
|
510 |
38be819a1225
merge: update some docstrings
Matt Mackall <mpm@selenic.com>
parents:
3320
diff
changeset
|
511 branchmerge = whether to merge between branches |
38be819a1225
merge: update some docstrings
Matt Mackall <mpm@selenic.com>
parents:
3320
diff
changeset
|
512 force = whether to force branch merging or file overwriting |
38be819a1225
merge: update some docstrings
Matt Mackall <mpm@selenic.com>
parents:
3320
diff
changeset
|
513 partial = a function to filter file lists (dirstate not updated) |
38be819a1225
merge: update some docstrings
Matt Mackall <mpm@selenic.com>
parents:
3320
diff
changeset
|
514 wlock = working dir lock, if already held |
38be819a1225
merge: update some docstrings
Matt Mackall <mpm@selenic.com>
parents:
3320
diff
changeset
|
515 """ |
2829
4870f795f681
Merge: combine force and forcemerge arguments
Matt Mackall <mpm@selenic.com>
parents:
2828
diff
changeset
|
516 |
2826
3aeab7bb5adc
Refactor update locking slightly
Matt Mackall <mpm@selenic.com>
parents:
2825
diff
changeset
|
517 if not wlock: |
3aeab7bb5adc
Refactor update locking slightly
Matt Mackall <mpm@selenic.com>
parents:
2825
diff
changeset
|
518 wlock = repo.wlock() |
3aeab7bb5adc
Refactor update locking slightly
Matt Mackall <mpm@selenic.com>
parents:
2825
diff
changeset
|
519 |
4177 | 520 wc = repo.workingctx() |
521 if node is None: | |
522 # tip of current branch | |
4232
0d51eb296fb9
Merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4209
diff
changeset
|
523 try: |
0d51eb296fb9
Merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4209
diff
changeset
|
524 node = repo.branchtags()[wc.branch()] |
0d51eb296fb9
Merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4209
diff
changeset
|
525 except KeyError: |
0d51eb296fb9
Merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4209
diff
changeset
|
526 raise util.Abort(_("branch %s not found") % wc.branch()) |
3320 | 527 overwrite = force and not branchmerge |
528 forcemerge = force and branchmerge | |
3240
8d4855fd9d7b
merge: use new working context object in update
Matt Mackall <mpm@selenic.com>
parents:
3234
diff
changeset
|
529 pl = wc.parents() |
3320 | 530 p1, p2 = pl[0], repo.changectx(node) |
531 pa = p1.ancestor(p2) | |
532 fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2) | |
4410
bbc97d419b16
Add fast-forward branch merging
Brendan Cully <brendan@kublai.com>
parents:
4404
diff
changeset
|
533 fastforward = False |
3320 | 534 |
535 ### check phase | |
3200
e67c22bc8bba
merge: use repo.parents and parent contexts in update
Matt Mackall <mpm@selenic.com>
parents:
3163
diff
changeset
|
536 if not overwrite and len(pl) > 1: |
2799
b550cd82f92a
Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
537 raise util.Abort(_("outstanding uncommitted merges")) |
3320 | 538 if pa == p1 or pa == p2: # is there a linear path from p1 to p2? |
3111
40e777bda455
merge: remove linear variable
Matt Mackall <mpm@selenic.com>
parents:
3110
diff
changeset
|
539 if branchmerge: |
4815
8808ea7da86b
merge: make test for fast-forward merge stricter (issue619)
Matt Mackall <mpm@selenic.com>
parents:
4681
diff
changeset
|
540 if p1.branch() != p2.branch() and pa != p2: |
4410
bbc97d419b16
Add fast-forward branch merging
Brendan Cully <brendan@kublai.com>
parents:
4404
diff
changeset
|
541 fastforward = True |
bbc97d419b16
Add fast-forward branch merging
Brendan Cully <brendan@kublai.com>
parents:
4404
diff
changeset
|
542 else: |
bbc97d419b16
Add fast-forward branch merging
Brendan Cully <brendan@kublai.com>
parents:
4404
diff
changeset
|
543 raise util.Abort(_("there is nothing to merge, just use " |
bbc97d419b16
Add fast-forward branch merging
Brendan Cully <brendan@kublai.com>
parents:
4404
diff
changeset
|
544 "'hg update' or look at 'hg heads'")) |
3592
fffc8a733bf9
Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3580
diff
changeset
|
545 elif not (overwrite or branchmerge): |
fffc8a733bf9
Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3580
diff
changeset
|
546 raise util.Abort(_("update spans branches, use 'hg merge' " |
fffc8a733bf9
Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3580
diff
changeset
|
547 "or 'hg update -C' to lose changes")) |
2828
0f787997e3c2
Merge: move most tests to the beginning
Matt Mackall <mpm@selenic.com>
parents:
2827
diff
changeset
|
548 if branchmerge and not forcemerge: |
3581
be61bd32046c
use workingcontext.files() to detect if the repo is unclean
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3580
diff
changeset
|
549 if wc.files(): |
2828
0f787997e3c2
Merge: move most tests to the beginning
Matt Mackall <mpm@selenic.com>
parents:
2827
diff
changeset
|
550 raise util.Abort(_("outstanding uncommitted changes")) |
0f787997e3c2
Merge: move most tests to the beginning
Matt Mackall <mpm@selenic.com>
parents:
2827
diff
changeset
|
551 |
3320 | 552 ### calculate phase |
3101
87ea5a71f7b9
merge: convert actions to list
Matt Mackall <mpm@selenic.com>
parents:
3097
diff
changeset
|
553 action = [] |
3108
3bd05ad67f45
merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com>
parents:
3107
diff
changeset
|
554 if not force: |
3318
c5075ad5e3e9
merge: use contexts in checkunknown and forgetremoved
Matt Mackall <mpm@selenic.com>
parents:
3317
diff
changeset
|
555 checkunknown(wc, p2) |
3786 | 556 if not util.checkfolding(repo.path): |
557 checkcollision(p2) | |
3111
40e777bda455
merge: remove linear variable
Matt Mackall <mpm@selenic.com>
parents:
3110
diff
changeset
|
558 if not branchmerge: |
3318
c5075ad5e3e9
merge: use contexts in checkunknown and forgetremoved
Matt Mackall <mpm@selenic.com>
parents:
3317
diff
changeset
|
559 action += forgetremoved(wc, p2) |
3301
72d1e521da77
merge: use contexts for manifestmerge
Matt Mackall <mpm@selenic.com>
parents:
3295
diff
changeset
|
560 action += manifestmerge(repo, wc, p2, pa, overwrite, partial) |
2799
b550cd82f92a
Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
561 |
2917
dd032b0f02ac
merge: move forgets to the apply stage
Matt Mackall <mpm@selenic.com>
parents:
2916
diff
changeset
|
562 ### apply phase |
3320 | 563 if not branchmerge: # just jump to the new rev |
564 fp1, fp2, xp1, xp2 = fp2, nullid, xp2, '' | |
3302
20087b4bc6f9
merge: don't call hooks for revert
Matt Mackall <mpm@selenic.com>
parents:
3301
diff
changeset
|
565 if not partial: |
20087b4bc6f9
merge: don't call hooks for revert
Matt Mackall <mpm@selenic.com>
parents:
3301
diff
changeset
|
566 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
|
567 |
3323
39fd6e82ea38
merge: pull user messages out to hg.py
Matt Mackall <mpm@selenic.com>
parents:
3322
diff
changeset
|
568 stats = applyupdates(repo, action, wc, p2) |
2919
8743188f4d2e
merge: consolidate dirstate updates
Matt Mackall <mpm@selenic.com>
parents:
2918
diff
changeset
|
569 |
2825
1ea086bc2086
Merge: combine choose and moddirstate to partial
Matt Mackall <mpm@selenic.com>
parents:
2824
diff
changeset
|
570 if not partial: |
3387
ba7c74081861
merge: update dirstate correctly for non-branchmerge updates
Matt Mackall <mpm@selenic.com>
parents:
3377
diff
changeset
|
571 recordupdates(repo, action, branchmerge) |
3320 | 572 repo.dirstate.setparents(fp1, fp2) |
4410
bbc97d419b16
Add fast-forward branch merging
Brendan Cully <brendan@kublai.com>
parents:
4404
diff
changeset
|
573 if not branchmerge and not fastforward: |
4207
7e1c8a565a4f
Move branch read/write to dirstate where it belongs
Matt Mackall <mpm@selenic.com>
parents:
4117
diff
changeset
|
574 repo.dirstate.setbranch(p2.branch()) |
3323
39fd6e82ea38
merge: pull user messages out to hg.py
Matt Mackall <mpm@selenic.com>
parents:
3322
diff
changeset
|
575 repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3]) |
3320 | 576 |
3323
39fd6e82ea38
merge: pull user messages out to hg.py
Matt Mackall <mpm@selenic.com>
parents:
3322
diff
changeset
|
577 return stats |
2799
b550cd82f92a
Move merge code to its own module
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
578 |