Show More
@@ -1,724 +1,724 b'' | |||||
1 | # filemerge.py - file-level merge handling for Mercurial |
|
1 | # filemerge.py - file-level merge handling for Mercurial | |
2 | # |
|
2 | # | |
3 | # Copyright 2006, 2007, 2008 Matt Mackall <mpm@selenic.com> |
|
3 | # Copyright 2006, 2007, 2008 Matt Mackall <mpm@selenic.com> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 |
|
7 | |||
8 | from __future__ import absolute_import |
|
8 | from __future__ import absolute_import | |
9 |
|
9 | |||
10 | import filecmp |
|
10 | import filecmp | |
11 | import os |
|
11 | import os | |
12 | import re |
|
12 | import re | |
13 | import tempfile |
|
13 | import tempfile | |
14 |
|
14 | |||
15 | from .i18n import _ |
|
15 | from .i18n import _ | |
16 | from .node import nullid, short |
|
16 | from .node import nullid, short | |
17 |
|
17 | |||
18 | from . import ( |
|
18 | from . import ( | |
19 | encoding, |
|
19 | encoding, | |
20 | error, |
|
20 | error, | |
21 | formatter, |
|
21 | formatter, | |
22 | match, |
|
22 | match, | |
23 | pycompat, |
|
23 | pycompat, | |
24 | scmutil, |
|
24 | scmutil, | |
25 | simplemerge, |
|
25 | simplemerge, | |
26 | tagmerge, |
|
26 | tagmerge, | |
27 | templatekw, |
|
27 | templatekw, | |
28 | templater, |
|
28 | templater, | |
29 | util, |
|
29 | util, | |
30 | ) |
|
30 | ) | |
31 |
|
31 | |||
32 | def _toolstr(ui, tool, part, default=""): |
|
32 | def _toolstr(ui, tool, part, default=""): | |
33 | return ui.config("merge-tools", tool + "." + part, default) |
|
33 | return ui.config("merge-tools", tool + "." + part, default) | |
34 |
|
34 | |||
35 | def _toolbool(ui, tool, part, default=False): |
|
35 | def _toolbool(ui, tool, part, default=False): | |
36 | return ui.configbool("merge-tools", tool + "." + part, default) |
|
36 | return ui.configbool("merge-tools", tool + "." + part, default) | |
37 |
|
37 | |||
38 | def _toollist(ui, tool, part, default=None): |
|
38 | def _toollist(ui, tool, part, default=None): | |
39 | if default is None: |
|
39 | if default is None: | |
40 | default = [] |
|
40 | default = [] | |
41 | return ui.configlist("merge-tools", tool + "." + part, default) |
|
41 | return ui.configlist("merge-tools", tool + "." + part, default) | |
42 |
|
42 | |||
43 | internals = {} |
|
43 | internals = {} | |
44 | # Merge tools to document. |
|
44 | # Merge tools to document. | |
45 | internalsdoc = {} |
|
45 | internalsdoc = {} | |
46 |
|
46 | |||
47 | # internal tool merge types |
|
47 | # internal tool merge types | |
48 | nomerge = None |
|
48 | nomerge = None | |
49 | mergeonly = 'mergeonly' # just the full merge, no premerge |
|
49 | mergeonly = 'mergeonly' # just the full merge, no premerge | |
50 | fullmerge = 'fullmerge' # both premerge and merge |
|
50 | fullmerge = 'fullmerge' # both premerge and merge | |
51 |
|
51 | |||
52 | class absentfilectx(object): |
|
52 | class absentfilectx(object): | |
53 | """Represents a file that's ostensibly in a context but is actually not |
|
53 | """Represents a file that's ostensibly in a context but is actually not | |
54 | present in it. |
|
54 | present in it. | |
55 |
|
55 | |||
56 | This is here because it's very specific to the filemerge code for now -- |
|
56 | This is here because it's very specific to the filemerge code for now -- | |
57 | other code is likely going to break with the values this returns.""" |
|
57 | other code is likely going to break with the values this returns.""" | |
58 | def __init__(self, ctx, f): |
|
58 | def __init__(self, ctx, f): | |
59 | self._ctx = ctx |
|
59 | self._ctx = ctx | |
60 | self._f = f |
|
60 | self._f = f | |
61 |
|
61 | |||
62 | def path(self): |
|
62 | def path(self): | |
63 | return self._f |
|
63 | return self._f | |
64 |
|
64 | |||
65 | def size(self): |
|
65 | def size(self): | |
66 | return None |
|
66 | return None | |
67 |
|
67 | |||
68 | def data(self): |
|
68 | def data(self): | |
69 | return None |
|
69 | return None | |
70 |
|
70 | |||
71 | def filenode(self): |
|
71 | def filenode(self): | |
72 | return nullid |
|
72 | return nullid | |
73 |
|
73 | |||
74 | _customcmp = True |
|
74 | _customcmp = True | |
75 | def cmp(self, fctx): |
|
75 | def cmp(self, fctx): | |
76 | """compare with other file context |
|
76 | """compare with other file context | |
77 |
|
77 | |||
78 | returns True if different from fctx. |
|
78 | returns True if different from fctx. | |
79 | """ |
|
79 | """ | |
80 | return not (fctx.isabsent() and |
|
80 | return not (fctx.isabsent() and | |
81 | fctx.ctx() == self.ctx() and |
|
81 | fctx.ctx() == self.ctx() and | |
82 | fctx.path() == self.path()) |
|
82 | fctx.path() == self.path()) | |
83 |
|
83 | |||
84 | def flags(self): |
|
84 | def flags(self): | |
85 | return '' |
|
85 | return '' | |
86 |
|
86 | |||
87 | def changectx(self): |
|
87 | def changectx(self): | |
88 | return self._ctx |
|
88 | return self._ctx | |
89 |
|
89 | |||
90 | def isbinary(self): |
|
90 | def isbinary(self): | |
91 | return False |
|
91 | return False | |
92 |
|
92 | |||
93 | def isabsent(self): |
|
93 | def isabsent(self): | |
94 | return True |
|
94 | return True | |
95 |
|
95 | |||
96 | def internaltool(name, mergetype, onfailure=None, precheck=None): |
|
96 | def internaltool(name, mergetype, onfailure=None, precheck=None): | |
97 | '''return a decorator for populating internal merge tool table''' |
|
97 | '''return a decorator for populating internal merge tool table''' | |
98 | def decorator(func): |
|
98 | def decorator(func): | |
99 | fullname = ':' + name |
|
99 | fullname = ':' + name | |
100 | func.__doc__ = (pycompat.sysstr("``%s``\n" % fullname) |
|
100 | func.__doc__ = (pycompat.sysstr("``%s``\n" % fullname) | |
101 | + func.__doc__.strip()) |
|
101 | + func.__doc__.strip()) | |
102 | internals[fullname] = func |
|
102 | internals[fullname] = func | |
103 | internals['internal:' + name] = func |
|
103 | internals['internal:' + name] = func | |
104 | internalsdoc[fullname] = func |
|
104 | internalsdoc[fullname] = func | |
105 | func.mergetype = mergetype |
|
105 | func.mergetype = mergetype | |
106 | func.onfailure = onfailure |
|
106 | func.onfailure = onfailure | |
107 | func.precheck = precheck |
|
107 | func.precheck = precheck | |
108 | return func |
|
108 | return func | |
109 | return decorator |
|
109 | return decorator | |
110 |
|
110 | |||
111 | def _findtool(ui, tool): |
|
111 | def _findtool(ui, tool): | |
112 | if tool in internals: |
|
112 | if tool in internals: | |
113 | return tool |
|
113 | return tool | |
114 | return findexternaltool(ui, tool) |
|
114 | return findexternaltool(ui, tool) | |
115 |
|
115 | |||
116 | def findexternaltool(ui, tool): |
|
116 | def findexternaltool(ui, tool): | |
117 | for kn in ("regkey", "regkeyalt"): |
|
117 | for kn in ("regkey", "regkeyalt"): | |
118 | k = _toolstr(ui, tool, kn) |
|
118 | k = _toolstr(ui, tool, kn) | |
119 | if not k: |
|
119 | if not k: | |
120 | continue |
|
120 | continue | |
121 | p = util.lookupreg(k, _toolstr(ui, tool, "regname")) |
|
121 | p = util.lookupreg(k, _toolstr(ui, tool, "regname")) | |
122 | if p: |
|
122 | if p: | |
123 | p = util.findexe(p + _toolstr(ui, tool, "regappend")) |
|
123 | p = util.findexe(p + _toolstr(ui, tool, "regappend")) | |
124 | if p: |
|
124 | if p: | |
125 | return p |
|
125 | return p | |
126 | exe = _toolstr(ui, tool, "executable", tool) |
|
126 | exe = _toolstr(ui, tool, "executable", tool) | |
127 | return util.findexe(util.expandpath(exe)) |
|
127 | return util.findexe(util.expandpath(exe)) | |
128 |
|
128 | |||
129 | def _picktool(repo, ui, path, binary, symlink, changedelete): |
|
129 | def _picktool(repo, ui, path, binary, symlink, changedelete): | |
130 | def supportscd(tool): |
|
130 | def supportscd(tool): | |
131 | return tool in internals and internals[tool].mergetype == nomerge |
|
131 | return tool in internals and internals[tool].mergetype == nomerge | |
132 |
|
132 | |||
133 | def check(tool, pat, symlink, binary, changedelete): |
|
133 | def check(tool, pat, symlink, binary, changedelete): | |
134 | tmsg = tool |
|
134 | tmsg = tool | |
135 | if pat: |
|
135 | if pat: | |
136 |
tmsg |
|
136 | tmsg = _("%s (for pattern %s)") % (tool, pat) | |
137 | if not _findtool(ui, tool): |
|
137 | if not _findtool(ui, tool): | |
138 | if pat: # explicitly requested tool deserves a warning |
|
138 | if pat: # explicitly requested tool deserves a warning | |
139 | ui.warn(_("couldn't find merge tool %s\n") % tmsg) |
|
139 | ui.warn(_("couldn't find merge tool %s\n") % tmsg) | |
140 | else: # configured but non-existing tools are more silent |
|
140 | else: # configured but non-existing tools are more silent | |
141 | ui.note(_("couldn't find merge tool %s\n") % tmsg) |
|
141 | ui.note(_("couldn't find merge tool %s\n") % tmsg) | |
142 | elif symlink and not _toolbool(ui, tool, "symlink"): |
|
142 | elif symlink and not _toolbool(ui, tool, "symlink"): | |
143 | ui.warn(_("tool %s can't handle symlinks\n") % tmsg) |
|
143 | ui.warn(_("tool %s can't handle symlinks\n") % tmsg) | |
144 | elif binary and not _toolbool(ui, tool, "binary"): |
|
144 | elif binary and not _toolbool(ui, tool, "binary"): | |
145 | ui.warn(_("tool %s can't handle binary\n") % tmsg) |
|
145 | ui.warn(_("tool %s can't handle binary\n") % tmsg) | |
146 | elif changedelete and not supportscd(tool): |
|
146 | elif changedelete and not supportscd(tool): | |
147 | # the nomerge tools are the only tools that support change/delete |
|
147 | # the nomerge tools are the only tools that support change/delete | |
148 | # conflicts |
|
148 | # conflicts | |
149 | pass |
|
149 | pass | |
150 | elif not util.gui() and _toolbool(ui, tool, "gui"): |
|
150 | elif not util.gui() and _toolbool(ui, tool, "gui"): | |
151 | ui.warn(_("tool %s requires a GUI\n") % tmsg) |
|
151 | ui.warn(_("tool %s requires a GUI\n") % tmsg) | |
152 | else: |
|
152 | else: | |
153 | return True |
|
153 | return True | |
154 | return False |
|
154 | return False | |
155 |
|
155 | |||
156 | # internal config: ui.forcemerge |
|
156 | # internal config: ui.forcemerge | |
157 | # forcemerge comes from command line arguments, highest priority |
|
157 | # forcemerge comes from command line arguments, highest priority | |
158 | force = ui.config('ui', 'forcemerge') |
|
158 | force = ui.config('ui', 'forcemerge') | |
159 | if force: |
|
159 | if force: | |
160 | toolpath = _findtool(ui, force) |
|
160 | toolpath = _findtool(ui, force) | |
161 | if changedelete and not supportscd(toolpath): |
|
161 | if changedelete and not supportscd(toolpath): | |
162 | return ":prompt", None |
|
162 | return ":prompt", None | |
163 | else: |
|
163 | else: | |
164 | if toolpath: |
|
164 | if toolpath: | |
165 | return (force, util.shellquote(toolpath)) |
|
165 | return (force, util.shellquote(toolpath)) | |
166 | else: |
|
166 | else: | |
167 | # mimic HGMERGE if given tool not found |
|
167 | # mimic HGMERGE if given tool not found | |
168 | return (force, force) |
|
168 | return (force, force) | |
169 |
|
169 | |||
170 | # HGMERGE takes next precedence |
|
170 | # HGMERGE takes next precedence | |
171 | hgmerge = encoding.environ.get("HGMERGE") |
|
171 | hgmerge = encoding.environ.get("HGMERGE") | |
172 | if hgmerge: |
|
172 | if hgmerge: | |
173 | if changedelete and not supportscd(hgmerge): |
|
173 | if changedelete and not supportscd(hgmerge): | |
174 | return ":prompt", None |
|
174 | return ":prompt", None | |
175 | else: |
|
175 | else: | |
176 | return (hgmerge, hgmerge) |
|
176 | return (hgmerge, hgmerge) | |
177 |
|
177 | |||
178 | # then patterns |
|
178 | # then patterns | |
179 | for pat, tool in ui.configitems("merge-patterns"): |
|
179 | for pat, tool in ui.configitems("merge-patterns"): | |
180 | mf = match.match(repo.root, '', [pat]) |
|
180 | mf = match.match(repo.root, '', [pat]) | |
181 | if mf(path) and check(tool, pat, symlink, False, changedelete): |
|
181 | if mf(path) and check(tool, pat, symlink, False, changedelete): | |
182 | toolpath = _findtool(ui, tool) |
|
182 | toolpath = _findtool(ui, tool) | |
183 | return (tool, util.shellquote(toolpath)) |
|
183 | return (tool, util.shellquote(toolpath)) | |
184 |
|
184 | |||
185 | # then merge tools |
|
185 | # then merge tools | |
186 | tools = {} |
|
186 | tools = {} | |
187 | disabled = set() |
|
187 | disabled = set() | |
188 | for k, v in ui.configitems("merge-tools"): |
|
188 | for k, v in ui.configitems("merge-tools"): | |
189 | t = k.split('.')[0] |
|
189 | t = k.split('.')[0] | |
190 | if t not in tools: |
|
190 | if t not in tools: | |
191 | tools[t] = int(_toolstr(ui, t, "priority", "0")) |
|
191 | tools[t] = int(_toolstr(ui, t, "priority", "0")) | |
192 | if _toolbool(ui, t, "disabled", False): |
|
192 | if _toolbool(ui, t, "disabled", False): | |
193 | disabled.add(t) |
|
193 | disabled.add(t) | |
194 | names = tools.keys() |
|
194 | names = tools.keys() | |
195 | tools = sorted([(-p, tool) for tool, p in tools.items() |
|
195 | tools = sorted([(-p, tool) for tool, p in tools.items() | |
196 | if tool not in disabled]) |
|
196 | if tool not in disabled]) | |
197 | uimerge = ui.config("ui", "merge") |
|
197 | uimerge = ui.config("ui", "merge") | |
198 | if uimerge: |
|
198 | if uimerge: | |
199 | # external tools defined in uimerge won't be able to handle |
|
199 | # external tools defined in uimerge won't be able to handle | |
200 | # change/delete conflicts |
|
200 | # change/delete conflicts | |
201 | if uimerge not in names and not changedelete: |
|
201 | if uimerge not in names and not changedelete: | |
202 | return (uimerge, uimerge) |
|
202 | return (uimerge, uimerge) | |
203 | tools.insert(0, (None, uimerge)) # highest priority |
|
203 | tools.insert(0, (None, uimerge)) # highest priority | |
204 | tools.append((None, "hgmerge")) # the old default, if found |
|
204 | tools.append((None, "hgmerge")) # the old default, if found | |
205 | for p, t in tools: |
|
205 | for p, t in tools: | |
206 | if check(t, None, symlink, binary, changedelete): |
|
206 | if check(t, None, symlink, binary, changedelete): | |
207 | toolpath = _findtool(ui, t) |
|
207 | toolpath = _findtool(ui, t) | |
208 | return (t, util.shellquote(toolpath)) |
|
208 | return (t, util.shellquote(toolpath)) | |
209 |
|
209 | |||
210 | # internal merge or prompt as last resort |
|
210 | # internal merge or prompt as last resort | |
211 | if symlink or binary or changedelete: |
|
211 | if symlink or binary or changedelete: | |
212 | if not changedelete and len(tools): |
|
212 | if not changedelete and len(tools): | |
213 | # any tool is rejected by capability for symlink or binary |
|
213 | # any tool is rejected by capability for symlink or binary | |
214 | ui.warn(_("no tool found to merge %s\n") % path) |
|
214 | ui.warn(_("no tool found to merge %s\n") % path) | |
215 | return ":prompt", None |
|
215 | return ":prompt", None | |
216 | return ":merge", None |
|
216 | return ":merge", None | |
217 |
|
217 | |||
218 | def _eoltype(data): |
|
218 | def _eoltype(data): | |
219 | "Guess the EOL type of a file" |
|
219 | "Guess the EOL type of a file" | |
220 | if '\0' in data: # binary |
|
220 | if '\0' in data: # binary | |
221 | return None |
|
221 | return None | |
222 | if '\r\n' in data: # Windows |
|
222 | if '\r\n' in data: # Windows | |
223 | return '\r\n' |
|
223 | return '\r\n' | |
224 | if '\r' in data: # Old Mac |
|
224 | if '\r' in data: # Old Mac | |
225 | return '\r' |
|
225 | return '\r' | |
226 | if '\n' in data: # UNIX |
|
226 | if '\n' in data: # UNIX | |
227 | return '\n' |
|
227 | return '\n' | |
228 | return None # unknown |
|
228 | return None # unknown | |
229 |
|
229 | |||
230 | def _matcheol(file, origfile): |
|
230 | def _matcheol(file, origfile): | |
231 | "Convert EOL markers in a file to match origfile" |
|
231 | "Convert EOL markers in a file to match origfile" | |
232 | tostyle = _eoltype(util.readfile(origfile)) |
|
232 | tostyle = _eoltype(util.readfile(origfile)) | |
233 | if tostyle: |
|
233 | if tostyle: | |
234 | data = util.readfile(file) |
|
234 | data = util.readfile(file) | |
235 | style = _eoltype(data) |
|
235 | style = _eoltype(data) | |
236 | if style: |
|
236 | if style: | |
237 | newdata = data.replace(style, tostyle) |
|
237 | newdata = data.replace(style, tostyle) | |
238 | if newdata != data: |
|
238 | if newdata != data: | |
239 | util.writefile(file, newdata) |
|
239 | util.writefile(file, newdata) | |
240 |
|
240 | |||
241 | @internaltool('prompt', nomerge) |
|
241 | @internaltool('prompt', nomerge) | |
242 | def _iprompt(repo, mynode, orig, fcd, fco, fca, toolconf, labels=None): |
|
242 | def _iprompt(repo, mynode, orig, fcd, fco, fca, toolconf, labels=None): | |
243 | """Asks the user which of the local `p1()` or the other `p2()` version to |
|
243 | """Asks the user which of the local `p1()` or the other `p2()` version to | |
244 | keep as the merged version.""" |
|
244 | keep as the merged version.""" | |
245 | ui = repo.ui |
|
245 | ui = repo.ui | |
246 | fd = fcd.path() |
|
246 | fd = fcd.path() | |
247 |
|
247 | |||
248 | prompts = partextras(labels) |
|
248 | prompts = partextras(labels) | |
249 | prompts['fd'] = fd |
|
249 | prompts['fd'] = fd | |
250 | try: |
|
250 | try: | |
251 | if fco.isabsent(): |
|
251 | if fco.isabsent(): | |
252 | index = ui.promptchoice( |
|
252 | index = ui.promptchoice( | |
253 | _("local%(l)s changed %(fd)s which other%(o)s deleted\n" |
|
253 | _("local%(l)s changed %(fd)s which other%(o)s deleted\n" | |
254 | "use (c)hanged version, (d)elete, or leave (u)nresolved?" |
|
254 | "use (c)hanged version, (d)elete, or leave (u)nresolved?" | |
255 | "$$ &Changed $$ &Delete $$ &Unresolved") % prompts, 2) |
|
255 | "$$ &Changed $$ &Delete $$ &Unresolved") % prompts, 2) | |
256 | choice = ['local', 'other', 'unresolved'][index] |
|
256 | choice = ['local', 'other', 'unresolved'][index] | |
257 | elif fcd.isabsent(): |
|
257 | elif fcd.isabsent(): | |
258 | index = ui.promptchoice( |
|
258 | index = ui.promptchoice( | |
259 | _("other%(o)s changed %(fd)s which local%(l)s deleted\n" |
|
259 | _("other%(o)s changed %(fd)s which local%(l)s deleted\n" | |
260 | "use (c)hanged version, leave (d)eleted, or " |
|
260 | "use (c)hanged version, leave (d)eleted, or " | |
261 | "leave (u)nresolved?" |
|
261 | "leave (u)nresolved?" | |
262 | "$$ &Changed $$ &Deleted $$ &Unresolved") % prompts, 2) |
|
262 | "$$ &Changed $$ &Deleted $$ &Unresolved") % prompts, 2) | |
263 | choice = ['other', 'local', 'unresolved'][index] |
|
263 | choice = ['other', 'local', 'unresolved'][index] | |
264 | else: |
|
264 | else: | |
265 | index = ui.promptchoice( |
|
265 | index = ui.promptchoice( | |
266 | _("keep (l)ocal%(l)s, take (o)ther%(o)s, or leave (u)nresolved" |
|
266 | _("keep (l)ocal%(l)s, take (o)ther%(o)s, or leave (u)nresolved" | |
267 | " for %(fd)s?" |
|
267 | " for %(fd)s?" | |
268 | "$$ &Local $$ &Other $$ &Unresolved") % prompts, 2) |
|
268 | "$$ &Local $$ &Other $$ &Unresolved") % prompts, 2) | |
269 | choice = ['local', 'other', 'unresolved'][index] |
|
269 | choice = ['local', 'other', 'unresolved'][index] | |
270 |
|
270 | |||
271 | if choice == 'other': |
|
271 | if choice == 'other': | |
272 | return _iother(repo, mynode, orig, fcd, fco, fca, toolconf, |
|
272 | return _iother(repo, mynode, orig, fcd, fco, fca, toolconf, | |
273 | labels) |
|
273 | labels) | |
274 | elif choice == 'local': |
|
274 | elif choice == 'local': | |
275 | return _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf, |
|
275 | return _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf, | |
276 | labels) |
|
276 | labels) | |
277 | elif choice == 'unresolved': |
|
277 | elif choice == 'unresolved': | |
278 | return _ifail(repo, mynode, orig, fcd, fco, fca, toolconf, |
|
278 | return _ifail(repo, mynode, orig, fcd, fco, fca, toolconf, | |
279 | labels) |
|
279 | labels) | |
280 | except error.ResponseExpected: |
|
280 | except error.ResponseExpected: | |
281 | ui.write("\n") |
|
281 | ui.write("\n") | |
282 | return _ifail(repo, mynode, orig, fcd, fco, fca, toolconf, |
|
282 | return _ifail(repo, mynode, orig, fcd, fco, fca, toolconf, | |
283 | labels) |
|
283 | labels) | |
284 |
|
284 | |||
285 | @internaltool('local', nomerge) |
|
285 | @internaltool('local', nomerge) | |
286 | def _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf, labels=None): |
|
286 | def _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf, labels=None): | |
287 | """Uses the local `p1()` version of files as the merged version.""" |
|
287 | """Uses the local `p1()` version of files as the merged version.""" | |
288 | return 0, fcd.isabsent() |
|
288 | return 0, fcd.isabsent() | |
289 |
|
289 | |||
290 | @internaltool('other', nomerge) |
|
290 | @internaltool('other', nomerge) | |
291 | def _iother(repo, mynode, orig, fcd, fco, fca, toolconf, labels=None): |
|
291 | def _iother(repo, mynode, orig, fcd, fco, fca, toolconf, labels=None): | |
292 | """Uses the other `p2()` version of files as the merged version.""" |
|
292 | """Uses the other `p2()` version of files as the merged version.""" | |
293 | if fco.isabsent(): |
|
293 | if fco.isabsent(): | |
294 | # local changed, remote deleted -- 'deleted' picked |
|
294 | # local changed, remote deleted -- 'deleted' picked | |
295 | repo.wvfs.unlinkpath(fcd.path()) |
|
295 | repo.wvfs.unlinkpath(fcd.path()) | |
296 | deleted = True |
|
296 | deleted = True | |
297 | else: |
|
297 | else: | |
298 | repo.wwrite(fcd.path(), fco.data(), fco.flags()) |
|
298 | repo.wwrite(fcd.path(), fco.data(), fco.flags()) | |
299 | deleted = False |
|
299 | deleted = False | |
300 | return 0, deleted |
|
300 | return 0, deleted | |
301 |
|
301 | |||
302 | @internaltool('fail', nomerge) |
|
302 | @internaltool('fail', nomerge) | |
303 | def _ifail(repo, mynode, orig, fcd, fco, fca, toolconf, labels=None): |
|
303 | def _ifail(repo, mynode, orig, fcd, fco, fca, toolconf, labels=None): | |
304 | """ |
|
304 | """ | |
305 | Rather than attempting to merge files that were modified on both |
|
305 | Rather than attempting to merge files that were modified on both | |
306 | branches, it marks them as unresolved. The resolve command must be |
|
306 | branches, it marks them as unresolved. The resolve command must be | |
307 | used to resolve these conflicts.""" |
|
307 | used to resolve these conflicts.""" | |
308 | # for change/delete conflicts write out the changed version, then fail |
|
308 | # for change/delete conflicts write out the changed version, then fail | |
309 | if fcd.isabsent(): |
|
309 | if fcd.isabsent(): | |
310 | repo.wwrite(fcd.path(), fco.data(), fco.flags()) |
|
310 | repo.wwrite(fcd.path(), fco.data(), fco.flags()) | |
311 | return 1, False |
|
311 | return 1, False | |
312 |
|
312 | |||
313 | def _premerge(repo, fcd, fco, fca, toolconf, files, labels=None): |
|
313 | def _premerge(repo, fcd, fco, fca, toolconf, files, labels=None): | |
314 | tool, toolpath, binary, symlink = toolconf |
|
314 | tool, toolpath, binary, symlink = toolconf | |
315 | if symlink or fcd.isabsent() or fco.isabsent(): |
|
315 | if symlink or fcd.isabsent() or fco.isabsent(): | |
316 | return 1 |
|
316 | return 1 | |
317 | a, b, c, back = files |
|
317 | a, b, c, back = files | |
318 |
|
318 | |||
319 | ui = repo.ui |
|
319 | ui = repo.ui | |
320 |
|
320 | |||
321 | validkeep = ['keep', 'keep-merge3'] |
|
321 | validkeep = ['keep', 'keep-merge3'] | |
322 |
|
322 | |||
323 | # do we attempt to simplemerge first? |
|
323 | # do we attempt to simplemerge first? | |
324 | try: |
|
324 | try: | |
325 | premerge = _toolbool(ui, tool, "premerge", not binary) |
|
325 | premerge = _toolbool(ui, tool, "premerge", not binary) | |
326 | except error.ConfigError: |
|
326 | except error.ConfigError: | |
327 | premerge = _toolstr(ui, tool, "premerge").lower() |
|
327 | premerge = _toolstr(ui, tool, "premerge").lower() | |
328 | if premerge not in validkeep: |
|
328 | if premerge not in validkeep: | |
329 | _valid = ', '.join(["'" + v + "'" for v in validkeep]) |
|
329 | _valid = ', '.join(["'" + v + "'" for v in validkeep]) | |
330 | raise error.ConfigError(_("%s.premerge not valid " |
|
330 | raise error.ConfigError(_("%s.premerge not valid " | |
331 | "('%s' is neither boolean nor %s)") % |
|
331 | "('%s' is neither boolean nor %s)") % | |
332 | (tool, premerge, _valid)) |
|
332 | (tool, premerge, _valid)) | |
333 |
|
333 | |||
334 | if premerge: |
|
334 | if premerge: | |
335 | if premerge == 'keep-merge3': |
|
335 | if premerge == 'keep-merge3': | |
336 | if not labels: |
|
336 | if not labels: | |
337 | labels = _defaultconflictlabels |
|
337 | labels = _defaultconflictlabels | |
338 | if len(labels) < 3: |
|
338 | if len(labels) < 3: | |
339 | labels.append('base') |
|
339 | labels.append('base') | |
340 | r = simplemerge.simplemerge(ui, a, b, c, quiet=True, label=labels) |
|
340 | r = simplemerge.simplemerge(ui, a, b, c, quiet=True, label=labels) | |
341 | if not r: |
|
341 | if not r: | |
342 | ui.debug(" premerge successful\n") |
|
342 | ui.debug(" premerge successful\n") | |
343 | return 0 |
|
343 | return 0 | |
344 | if premerge not in validkeep: |
|
344 | if premerge not in validkeep: | |
345 | util.copyfile(back, a) # restore from backup and try again |
|
345 | util.copyfile(back, a) # restore from backup and try again | |
346 | return 1 # continue merging |
|
346 | return 1 # continue merging | |
347 |
|
347 | |||
348 | def _mergecheck(repo, mynode, orig, fcd, fco, fca, toolconf): |
|
348 | def _mergecheck(repo, mynode, orig, fcd, fco, fca, toolconf): | |
349 | tool, toolpath, binary, symlink = toolconf |
|
349 | tool, toolpath, binary, symlink = toolconf | |
350 | if symlink: |
|
350 | if symlink: | |
351 | repo.ui.warn(_('warning: internal %s cannot merge symlinks ' |
|
351 | repo.ui.warn(_('warning: internal %s cannot merge symlinks ' | |
352 | 'for %s\n') % (tool, fcd.path())) |
|
352 | 'for %s\n') % (tool, fcd.path())) | |
353 | return False |
|
353 | return False | |
354 | if fcd.isabsent() or fco.isabsent(): |
|
354 | if fcd.isabsent() or fco.isabsent(): | |
355 | repo.ui.warn(_('warning: internal %s cannot merge change/delete ' |
|
355 | repo.ui.warn(_('warning: internal %s cannot merge change/delete ' | |
356 | 'conflict for %s\n') % (tool, fcd.path())) |
|
356 | 'conflict for %s\n') % (tool, fcd.path())) | |
357 | return False |
|
357 | return False | |
358 | return True |
|
358 | return True | |
359 |
|
359 | |||
360 | def _merge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels, mode): |
|
360 | def _merge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels, mode): | |
361 | """ |
|
361 | """ | |
362 | Uses the internal non-interactive simple merge algorithm for merging |
|
362 | Uses the internal non-interactive simple merge algorithm for merging | |
363 | files. It will fail if there are any conflicts and leave markers in |
|
363 | files. It will fail if there are any conflicts and leave markers in | |
364 | the partially merged file. Markers will have two sections, one for each side |
|
364 | the partially merged file. Markers will have two sections, one for each side | |
365 | of merge, unless mode equals 'union' which suppresses the markers.""" |
|
365 | of merge, unless mode equals 'union' which suppresses the markers.""" | |
366 | a, b, c, back = files |
|
366 | a, b, c, back = files | |
367 |
|
367 | |||
368 | ui = repo.ui |
|
368 | ui = repo.ui | |
369 |
|
369 | |||
370 | r = simplemerge.simplemerge(ui, a, b, c, label=labels, mode=mode) |
|
370 | r = simplemerge.simplemerge(ui, a, b, c, label=labels, mode=mode) | |
371 | return True, r, False |
|
371 | return True, r, False | |
372 |
|
372 | |||
373 | @internaltool('union', fullmerge, |
|
373 | @internaltool('union', fullmerge, | |
374 | _("warning: conflicts while merging %s! " |
|
374 | _("warning: conflicts while merging %s! " | |
375 | "(edit, then use 'hg resolve --mark')\n"), |
|
375 | "(edit, then use 'hg resolve --mark')\n"), | |
376 | precheck=_mergecheck) |
|
376 | precheck=_mergecheck) | |
377 | def _iunion(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): |
|
377 | def _iunion(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): | |
378 | """ |
|
378 | """ | |
379 | Uses the internal non-interactive simple merge algorithm for merging |
|
379 | Uses the internal non-interactive simple merge algorithm for merging | |
380 | files. It will use both left and right sides for conflict regions. |
|
380 | files. It will use both left and right sides for conflict regions. | |
381 | No markers are inserted.""" |
|
381 | No markers are inserted.""" | |
382 | return _merge(repo, mynode, orig, fcd, fco, fca, toolconf, |
|
382 | return _merge(repo, mynode, orig, fcd, fco, fca, toolconf, | |
383 | files, labels, 'union') |
|
383 | files, labels, 'union') | |
384 |
|
384 | |||
385 | @internaltool('merge', fullmerge, |
|
385 | @internaltool('merge', fullmerge, | |
386 | _("warning: conflicts while merging %s! " |
|
386 | _("warning: conflicts while merging %s! " | |
387 | "(edit, then use 'hg resolve --mark')\n"), |
|
387 | "(edit, then use 'hg resolve --mark')\n"), | |
388 | precheck=_mergecheck) |
|
388 | precheck=_mergecheck) | |
389 | def _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): |
|
389 | def _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): | |
390 | """ |
|
390 | """ | |
391 | Uses the internal non-interactive simple merge algorithm for merging |
|
391 | Uses the internal non-interactive simple merge algorithm for merging | |
392 | files. It will fail if there are any conflicts and leave markers in |
|
392 | files. It will fail if there are any conflicts and leave markers in | |
393 | the partially merged file. Markers will have two sections, one for each side |
|
393 | the partially merged file. Markers will have two sections, one for each side | |
394 | of merge.""" |
|
394 | of merge.""" | |
395 | return _merge(repo, mynode, orig, fcd, fco, fca, toolconf, |
|
395 | return _merge(repo, mynode, orig, fcd, fco, fca, toolconf, | |
396 | files, labels, 'merge') |
|
396 | files, labels, 'merge') | |
397 |
|
397 | |||
398 | @internaltool('merge3', fullmerge, |
|
398 | @internaltool('merge3', fullmerge, | |
399 | _("warning: conflicts while merging %s! " |
|
399 | _("warning: conflicts while merging %s! " | |
400 | "(edit, then use 'hg resolve --mark')\n"), |
|
400 | "(edit, then use 'hg resolve --mark')\n"), | |
401 | precheck=_mergecheck) |
|
401 | precheck=_mergecheck) | |
402 | def _imerge3(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): |
|
402 | def _imerge3(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): | |
403 | """ |
|
403 | """ | |
404 | Uses the internal non-interactive simple merge algorithm for merging |
|
404 | Uses the internal non-interactive simple merge algorithm for merging | |
405 | files. It will fail if there are any conflicts and leave markers in |
|
405 | files. It will fail if there are any conflicts and leave markers in | |
406 | the partially merged file. Marker will have three sections, one from each |
|
406 | the partially merged file. Marker will have three sections, one from each | |
407 | side of the merge and one for the base content.""" |
|
407 | side of the merge and one for the base content.""" | |
408 | if not labels: |
|
408 | if not labels: | |
409 | labels = _defaultconflictlabels |
|
409 | labels = _defaultconflictlabels | |
410 | if len(labels) < 3: |
|
410 | if len(labels) < 3: | |
411 | labels.append('base') |
|
411 | labels.append('base') | |
412 | return _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels) |
|
412 | return _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels) | |
413 |
|
413 | |||
414 | def _imergeauto(repo, mynode, orig, fcd, fco, fca, toolconf, files, |
|
414 | def _imergeauto(repo, mynode, orig, fcd, fco, fca, toolconf, files, | |
415 | labels=None, localorother=None): |
|
415 | labels=None, localorother=None): | |
416 | """ |
|
416 | """ | |
417 | Generic driver for _imergelocal and _imergeother |
|
417 | Generic driver for _imergelocal and _imergeother | |
418 | """ |
|
418 | """ | |
419 | assert localorother is not None |
|
419 | assert localorother is not None | |
420 | tool, toolpath, binary, symlink = toolconf |
|
420 | tool, toolpath, binary, symlink = toolconf | |
421 | a, b, c, back = files |
|
421 | a, b, c, back = files | |
422 | r = simplemerge.simplemerge(repo.ui, a, b, c, label=labels, |
|
422 | r = simplemerge.simplemerge(repo.ui, a, b, c, label=labels, | |
423 | localorother=localorother) |
|
423 | localorother=localorother) | |
424 | return True, r |
|
424 | return True, r | |
425 |
|
425 | |||
426 | @internaltool('merge-local', mergeonly, precheck=_mergecheck) |
|
426 | @internaltool('merge-local', mergeonly, precheck=_mergecheck) | |
427 | def _imergelocal(*args, **kwargs): |
|
427 | def _imergelocal(*args, **kwargs): | |
428 | """ |
|
428 | """ | |
429 | Like :merge, but resolve all conflicts non-interactively in favor |
|
429 | Like :merge, but resolve all conflicts non-interactively in favor | |
430 | of the local `p1()` changes.""" |
|
430 | of the local `p1()` changes.""" | |
431 | success, status = _imergeauto(localorother='local', *args, **kwargs) |
|
431 | success, status = _imergeauto(localorother='local', *args, **kwargs) | |
432 | return success, status, False |
|
432 | return success, status, False | |
433 |
|
433 | |||
434 | @internaltool('merge-other', mergeonly, precheck=_mergecheck) |
|
434 | @internaltool('merge-other', mergeonly, precheck=_mergecheck) | |
435 | def _imergeother(*args, **kwargs): |
|
435 | def _imergeother(*args, **kwargs): | |
436 | """ |
|
436 | """ | |
437 | Like :merge, but resolve all conflicts non-interactively in favor |
|
437 | Like :merge, but resolve all conflicts non-interactively in favor | |
438 | of the other `p2()` changes.""" |
|
438 | of the other `p2()` changes.""" | |
439 | success, status = _imergeauto(localorother='other', *args, **kwargs) |
|
439 | success, status = _imergeauto(localorother='other', *args, **kwargs) | |
440 | return success, status, False |
|
440 | return success, status, False | |
441 |
|
441 | |||
442 | @internaltool('tagmerge', mergeonly, |
|
442 | @internaltool('tagmerge', mergeonly, | |
443 | _("automatic tag merging of %s failed! " |
|
443 | _("automatic tag merging of %s failed! " | |
444 | "(use 'hg resolve --tool :merge' or another merge " |
|
444 | "(use 'hg resolve --tool :merge' or another merge " | |
445 | "tool of your choice)\n")) |
|
445 | "tool of your choice)\n")) | |
446 | def _itagmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): |
|
446 | def _itagmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): | |
447 | """ |
|
447 | """ | |
448 | Uses the internal tag merge algorithm (experimental). |
|
448 | Uses the internal tag merge algorithm (experimental). | |
449 | """ |
|
449 | """ | |
450 | success, status = tagmerge.merge(repo, fcd, fco, fca) |
|
450 | success, status = tagmerge.merge(repo, fcd, fco, fca) | |
451 | return success, status, False |
|
451 | return success, status, False | |
452 |
|
452 | |||
453 | @internaltool('dump', fullmerge) |
|
453 | @internaltool('dump', fullmerge) | |
454 | def _idump(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): |
|
454 | def _idump(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): | |
455 | """ |
|
455 | """ | |
456 | Creates three versions of the files to merge, containing the |
|
456 | Creates three versions of the files to merge, containing the | |
457 | contents of local, other and base. These files can then be used to |
|
457 | contents of local, other and base. These files can then be used to | |
458 | perform a merge manually. If the file to be merged is named |
|
458 | perform a merge manually. If the file to be merged is named | |
459 | ``a.txt``, these files will accordingly be named ``a.txt.local``, |
|
459 | ``a.txt``, these files will accordingly be named ``a.txt.local``, | |
460 | ``a.txt.other`` and ``a.txt.base`` and they will be placed in the |
|
460 | ``a.txt.other`` and ``a.txt.base`` and they will be placed in the | |
461 | same directory as ``a.txt``.""" |
|
461 | same directory as ``a.txt``.""" | |
462 | a, b, c, back = files |
|
462 | a, b, c, back = files | |
463 |
|
463 | |||
464 | fd = fcd.path() |
|
464 | fd = fcd.path() | |
465 |
|
465 | |||
466 | util.copyfile(a, a + ".local") |
|
466 | util.copyfile(a, a + ".local") | |
467 | repo.wwrite(fd + ".other", fco.data(), fco.flags()) |
|
467 | repo.wwrite(fd + ".other", fco.data(), fco.flags()) | |
468 | repo.wwrite(fd + ".base", fca.data(), fca.flags()) |
|
468 | repo.wwrite(fd + ".base", fca.data(), fca.flags()) | |
469 | return False, 1, False |
|
469 | return False, 1, False | |
470 |
|
470 | |||
471 | def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): |
|
471 | def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): | |
472 | tool, toolpath, binary, symlink = toolconf |
|
472 | tool, toolpath, binary, symlink = toolconf | |
473 | if fcd.isabsent() or fco.isabsent(): |
|
473 | if fcd.isabsent() or fco.isabsent(): | |
474 | repo.ui.warn(_('warning: %s cannot merge change/delete conflict ' |
|
474 | repo.ui.warn(_('warning: %s cannot merge change/delete conflict ' | |
475 | 'for %s\n') % (tool, fcd.path())) |
|
475 | 'for %s\n') % (tool, fcd.path())) | |
476 | return False, 1, None |
|
476 | return False, 1, None | |
477 | a, b, c, back = files |
|
477 | a, b, c, back = files | |
478 | out = "" |
|
478 | out = "" | |
479 | env = {'HG_FILE': fcd.path(), |
|
479 | env = {'HG_FILE': fcd.path(), | |
480 | 'HG_MY_NODE': short(mynode), |
|
480 | 'HG_MY_NODE': short(mynode), | |
481 | 'HG_OTHER_NODE': str(fco.changectx()), |
|
481 | 'HG_OTHER_NODE': str(fco.changectx()), | |
482 | 'HG_BASE_NODE': str(fca.changectx()), |
|
482 | 'HG_BASE_NODE': str(fca.changectx()), | |
483 | 'HG_MY_ISLINK': 'l' in fcd.flags(), |
|
483 | 'HG_MY_ISLINK': 'l' in fcd.flags(), | |
484 | 'HG_OTHER_ISLINK': 'l' in fco.flags(), |
|
484 | 'HG_OTHER_ISLINK': 'l' in fco.flags(), | |
485 | 'HG_BASE_ISLINK': 'l' in fca.flags(), |
|
485 | 'HG_BASE_ISLINK': 'l' in fca.flags(), | |
486 | } |
|
486 | } | |
487 |
|
487 | |||
488 | ui = repo.ui |
|
488 | ui = repo.ui | |
489 |
|
489 | |||
490 | args = _toolstr(ui, tool, "args", '$local $base $other') |
|
490 | args = _toolstr(ui, tool, "args", '$local $base $other') | |
491 | if "$output" in args: |
|
491 | if "$output" in args: | |
492 | out, a = a, back # read input from backup, write to original |
|
492 | out, a = a, back # read input from backup, write to original | |
493 | replace = {'local': a, 'base': b, 'other': c, 'output': out} |
|
493 | replace = {'local': a, 'base': b, 'other': c, 'output': out} | |
494 | args = util.interpolate(r'\$', replace, args, |
|
494 | args = util.interpolate(r'\$', replace, args, | |
495 | lambda s: util.shellquote(util.localpath(s))) |
|
495 | lambda s: util.shellquote(util.localpath(s))) | |
496 | cmd = toolpath + ' ' + args |
|
496 | cmd = toolpath + ' ' + args | |
497 | if _toolbool(ui, tool, "gui"): |
|
497 | if _toolbool(ui, tool, "gui"): | |
498 | repo.ui.status(_('running merge tool %s for file %s\n') % |
|
498 | repo.ui.status(_('running merge tool %s for file %s\n') % | |
499 | (tool, fcd.path())) |
|
499 | (tool, fcd.path())) | |
500 | repo.ui.debug('launching merge tool: %s\n' % cmd) |
|
500 | repo.ui.debug('launching merge tool: %s\n' % cmd) | |
501 | r = ui.system(cmd, cwd=repo.root, environ=env, blockedtag='mergetool') |
|
501 | r = ui.system(cmd, cwd=repo.root, environ=env, blockedtag='mergetool') | |
502 | repo.ui.debug('merge tool returned: %s\n' % r) |
|
502 | repo.ui.debug('merge tool returned: %s\n' % r) | |
503 | return True, r, False |
|
503 | return True, r, False | |
504 |
|
504 | |||
505 | def _formatconflictmarker(repo, ctx, template, label, pad): |
|
505 | def _formatconflictmarker(repo, ctx, template, label, pad): | |
506 | """Applies the given template to the ctx, prefixed by the label. |
|
506 | """Applies the given template to the ctx, prefixed by the label. | |
507 |
|
507 | |||
508 | Pad is the minimum width of the label prefix, so that multiple markers |
|
508 | Pad is the minimum width of the label prefix, so that multiple markers | |
509 | can have aligned templated parts. |
|
509 | can have aligned templated parts. | |
510 | """ |
|
510 | """ | |
511 | if ctx.node() is None: |
|
511 | if ctx.node() is None: | |
512 | ctx = ctx.p1() |
|
512 | ctx = ctx.p1() | |
513 |
|
513 | |||
514 | props = templatekw.keywords.copy() |
|
514 | props = templatekw.keywords.copy() | |
515 | props['templ'] = template |
|
515 | props['templ'] = template | |
516 | props['ctx'] = ctx |
|
516 | props['ctx'] = ctx | |
517 | props['repo'] = repo |
|
517 | props['repo'] = repo | |
518 | templateresult = template('conflictmarker', **props) |
|
518 | templateresult = template('conflictmarker', **props) | |
519 |
|
519 | |||
520 | label = ('%s:' % label).ljust(pad + 1) |
|
520 | label = ('%s:' % label).ljust(pad + 1) | |
521 | mark = '%s %s' % (label, templater.stringify(templateresult)) |
|
521 | mark = '%s %s' % (label, templater.stringify(templateresult)) | |
522 |
|
522 | |||
523 | if mark: |
|
523 | if mark: | |
524 | mark = mark.splitlines()[0] # split for safety |
|
524 | mark = mark.splitlines()[0] # split for safety | |
525 |
|
525 | |||
526 | # 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ') |
|
526 | # 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ') | |
527 | return util.ellipsis(mark, 80 - 8) |
|
527 | return util.ellipsis(mark, 80 - 8) | |
528 |
|
528 | |||
529 | _defaultconflictmarker = ('{node|short} ' |
|
529 | _defaultconflictmarker = ('{node|short} ' | |
530 | '{ifeq(tags, "tip", "", ' |
|
530 | '{ifeq(tags, "tip", "", ' | |
531 | 'ifeq(tags, "", "", "{tags} "))}' |
|
531 | 'ifeq(tags, "", "", "{tags} "))}' | |
532 | '{if(bookmarks, "{bookmarks} ")}' |
|
532 | '{if(bookmarks, "{bookmarks} ")}' | |
533 | '{ifeq(branch, "default", "", "{branch} ")}' |
|
533 | '{ifeq(branch, "default", "", "{branch} ")}' | |
534 | '- {author|user}: {desc|firstline}') |
|
534 | '- {author|user}: {desc|firstline}') | |
535 |
|
535 | |||
536 | _defaultconflictlabels = ['local', 'other'] |
|
536 | _defaultconflictlabels = ['local', 'other'] | |
537 |
|
537 | |||
538 | def _formatlabels(repo, fcd, fco, fca, labels): |
|
538 | def _formatlabels(repo, fcd, fco, fca, labels): | |
539 | """Formats the given labels using the conflict marker template. |
|
539 | """Formats the given labels using the conflict marker template. | |
540 |
|
540 | |||
541 | Returns a list of formatted labels. |
|
541 | Returns a list of formatted labels. | |
542 | """ |
|
542 | """ | |
543 | cd = fcd.changectx() |
|
543 | cd = fcd.changectx() | |
544 | co = fco.changectx() |
|
544 | co = fco.changectx() | |
545 | ca = fca.changectx() |
|
545 | ca = fca.changectx() | |
546 |
|
546 | |||
547 | ui = repo.ui |
|
547 | ui = repo.ui | |
548 | template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker) |
|
548 | template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker) | |
549 | template = templater.unquotestring(template) |
|
549 | template = templater.unquotestring(template) | |
550 | tmpl = formatter.maketemplater(ui, 'conflictmarker', template) |
|
550 | tmpl = formatter.maketemplater(ui, 'conflictmarker', template) | |
551 |
|
551 | |||
552 | pad = max(len(l) for l in labels) |
|
552 | pad = max(len(l) for l in labels) | |
553 |
|
553 | |||
554 | newlabels = [_formatconflictmarker(repo, cd, tmpl, labels[0], pad), |
|
554 | newlabels = [_formatconflictmarker(repo, cd, tmpl, labels[0], pad), | |
555 | _formatconflictmarker(repo, co, tmpl, labels[1], pad)] |
|
555 | _formatconflictmarker(repo, co, tmpl, labels[1], pad)] | |
556 | if len(labels) > 2: |
|
556 | if len(labels) > 2: | |
557 | newlabels.append(_formatconflictmarker(repo, ca, tmpl, labels[2], pad)) |
|
557 | newlabels.append(_formatconflictmarker(repo, ca, tmpl, labels[2], pad)) | |
558 | return newlabels |
|
558 | return newlabels | |
559 |
|
559 | |||
560 | def partextras(labels): |
|
560 | def partextras(labels): | |
561 | """Return a dictionary of extra labels for use in prompts to the user |
|
561 | """Return a dictionary of extra labels for use in prompts to the user | |
562 |
|
562 | |||
563 | Intended use is in strings of the form "(l)ocal%(l)s". |
|
563 | Intended use is in strings of the form "(l)ocal%(l)s". | |
564 | """ |
|
564 | """ | |
565 | if labels is None: |
|
565 | if labels is None: | |
566 | return { |
|
566 | return { | |
567 | "l": "", |
|
567 | "l": "", | |
568 | "o": "", |
|
568 | "o": "", | |
569 | } |
|
569 | } | |
570 |
|
570 | |||
571 | return { |
|
571 | return { | |
572 | "l": " [%s]" % labels[0], |
|
572 | "l": " [%s]" % labels[0], | |
573 | "o": " [%s]" % labels[1], |
|
573 | "o": " [%s]" % labels[1], | |
574 | } |
|
574 | } | |
575 |
|
575 | |||
576 | def _filemerge(premerge, repo, mynode, orig, fcd, fco, fca, labels=None): |
|
576 | def _filemerge(premerge, repo, mynode, orig, fcd, fco, fca, labels=None): | |
577 | """perform a 3-way merge in the working directory |
|
577 | """perform a 3-way merge in the working directory | |
578 |
|
578 | |||
579 | premerge = whether this is a premerge |
|
579 | premerge = whether this is a premerge | |
580 | mynode = parent node before merge |
|
580 | mynode = parent node before merge | |
581 | orig = original local filename before merge |
|
581 | orig = original local filename before merge | |
582 | fco = other file context |
|
582 | fco = other file context | |
583 | fca = ancestor file context |
|
583 | fca = ancestor file context | |
584 | fcd = local file context for current/destination file |
|
584 | fcd = local file context for current/destination file | |
585 |
|
585 | |||
586 | Returns whether the merge is complete, the return value of the merge, and |
|
586 | Returns whether the merge is complete, the return value of the merge, and | |
587 | a boolean indicating whether the file was deleted from disk.""" |
|
587 | a boolean indicating whether the file was deleted from disk.""" | |
588 |
|
588 | |||
589 | def temp(prefix, ctx): |
|
589 | def temp(prefix, ctx): | |
590 | fullbase, ext = os.path.splitext(ctx.path()) |
|
590 | fullbase, ext = os.path.splitext(ctx.path()) | |
591 | pre = "%s~%s." % (os.path.basename(fullbase), prefix) |
|
591 | pre = "%s~%s." % (os.path.basename(fullbase), prefix) | |
592 | (fd, name) = tempfile.mkstemp(prefix=pre, suffix=ext) |
|
592 | (fd, name) = tempfile.mkstemp(prefix=pre, suffix=ext) | |
593 | data = repo.wwritedata(ctx.path(), ctx.data()) |
|
593 | data = repo.wwritedata(ctx.path(), ctx.data()) | |
594 | f = os.fdopen(fd, pycompat.sysstr("wb")) |
|
594 | f = os.fdopen(fd, pycompat.sysstr("wb")) | |
595 | f.write(data) |
|
595 | f.write(data) | |
596 | f.close() |
|
596 | f.close() | |
597 | return name |
|
597 | return name | |
598 |
|
598 | |||
599 | if not fco.cmp(fcd): # files identical? |
|
599 | if not fco.cmp(fcd): # files identical? | |
600 | return True, None, False |
|
600 | return True, None, False | |
601 |
|
601 | |||
602 | ui = repo.ui |
|
602 | ui = repo.ui | |
603 | fd = fcd.path() |
|
603 | fd = fcd.path() | |
604 | binary = fcd.isbinary() or fco.isbinary() or fca.isbinary() |
|
604 | binary = fcd.isbinary() or fco.isbinary() or fca.isbinary() | |
605 | symlink = 'l' in fcd.flags() + fco.flags() |
|
605 | symlink = 'l' in fcd.flags() + fco.flags() | |
606 | changedelete = fcd.isabsent() or fco.isabsent() |
|
606 | changedelete = fcd.isabsent() or fco.isabsent() | |
607 | tool, toolpath = _picktool(repo, ui, fd, binary, symlink, changedelete) |
|
607 | tool, toolpath = _picktool(repo, ui, fd, binary, symlink, changedelete) | |
608 | if tool in internals and tool.startswith('internal:'): |
|
608 | if tool in internals and tool.startswith('internal:'): | |
609 | # normalize to new-style names (':merge' etc) |
|
609 | # normalize to new-style names (':merge' etc) | |
610 | tool = tool[len('internal'):] |
|
610 | tool = tool[len('internal'):] | |
611 | ui.debug("picked tool '%s' for %s (binary %s symlink %s changedelete %s)\n" |
|
611 | ui.debug("picked tool '%s' for %s (binary %s symlink %s changedelete %s)\n" | |
612 | % (tool, fd, binary, symlink, changedelete)) |
|
612 | % (tool, fd, binary, symlink, changedelete)) | |
613 |
|
613 | |||
614 | if tool in internals: |
|
614 | if tool in internals: | |
615 | func = internals[tool] |
|
615 | func = internals[tool] | |
616 | mergetype = func.mergetype |
|
616 | mergetype = func.mergetype | |
617 | onfailure = func.onfailure |
|
617 | onfailure = func.onfailure | |
618 | precheck = func.precheck |
|
618 | precheck = func.precheck | |
619 | else: |
|
619 | else: | |
620 | func = _xmerge |
|
620 | func = _xmerge | |
621 | mergetype = fullmerge |
|
621 | mergetype = fullmerge | |
622 | onfailure = _("merging %s failed!\n") |
|
622 | onfailure = _("merging %s failed!\n") | |
623 | precheck = None |
|
623 | precheck = None | |
624 |
|
624 | |||
625 | toolconf = tool, toolpath, binary, symlink |
|
625 | toolconf = tool, toolpath, binary, symlink | |
626 |
|
626 | |||
627 | if mergetype == nomerge: |
|
627 | if mergetype == nomerge: | |
628 | r, deleted = func(repo, mynode, orig, fcd, fco, fca, toolconf, labels) |
|
628 | r, deleted = func(repo, mynode, orig, fcd, fco, fca, toolconf, labels) | |
629 | return True, r, deleted |
|
629 | return True, r, deleted | |
630 |
|
630 | |||
631 | if premerge: |
|
631 | if premerge: | |
632 | if orig != fco.path(): |
|
632 | if orig != fco.path(): | |
633 | ui.status(_("merging %s and %s to %s\n") % (orig, fco.path(), fd)) |
|
633 | ui.status(_("merging %s and %s to %s\n") % (orig, fco.path(), fd)) | |
634 | else: |
|
634 | else: | |
635 | ui.status(_("merging %s\n") % fd) |
|
635 | ui.status(_("merging %s\n") % fd) | |
636 |
|
636 | |||
637 | ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca)) |
|
637 | ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca)) | |
638 |
|
638 | |||
639 | if precheck and not precheck(repo, mynode, orig, fcd, fco, fca, |
|
639 | if precheck and not precheck(repo, mynode, orig, fcd, fco, fca, | |
640 | toolconf): |
|
640 | toolconf): | |
641 | if onfailure: |
|
641 | if onfailure: | |
642 | ui.warn(onfailure % fd) |
|
642 | ui.warn(onfailure % fd) | |
643 | return True, 1, False |
|
643 | return True, 1, False | |
644 |
|
644 | |||
645 | a = repo.wjoin(fd) |
|
645 | a = repo.wjoin(fd) | |
646 | b = temp("base", fca) |
|
646 | b = temp("base", fca) | |
647 | c = temp("other", fco) |
|
647 | c = temp("other", fco) | |
648 | if not fcd.isabsent(): |
|
648 | if not fcd.isabsent(): | |
649 | back = scmutil.origpath(ui, repo, a) |
|
649 | back = scmutil.origpath(ui, repo, a) | |
650 | if premerge: |
|
650 | if premerge: | |
651 | util.copyfile(a, back) |
|
651 | util.copyfile(a, back) | |
652 | else: |
|
652 | else: | |
653 | back = None |
|
653 | back = None | |
654 | files = (a, b, c, back) |
|
654 | files = (a, b, c, back) | |
655 |
|
655 | |||
656 | r = 1 |
|
656 | r = 1 | |
657 | try: |
|
657 | try: | |
658 | markerstyle = ui.config('ui', 'mergemarkers', 'basic') |
|
658 | markerstyle = ui.config('ui', 'mergemarkers', 'basic') | |
659 | if not labels: |
|
659 | if not labels: | |
660 | labels = _defaultconflictlabels |
|
660 | labels = _defaultconflictlabels | |
661 | if markerstyle != 'basic': |
|
661 | if markerstyle != 'basic': | |
662 | labels = _formatlabels(repo, fcd, fco, fca, labels) |
|
662 | labels = _formatlabels(repo, fcd, fco, fca, labels) | |
663 |
|
663 | |||
664 | if premerge and mergetype == fullmerge: |
|
664 | if premerge and mergetype == fullmerge: | |
665 | r = _premerge(repo, fcd, fco, fca, toolconf, files, labels=labels) |
|
665 | r = _premerge(repo, fcd, fco, fca, toolconf, files, labels=labels) | |
666 | # complete if premerge successful (r is 0) |
|
666 | # complete if premerge successful (r is 0) | |
667 | return not r, r, False |
|
667 | return not r, r, False | |
668 |
|
668 | |||
669 | needcheck, r, deleted = func(repo, mynode, orig, fcd, fco, fca, |
|
669 | needcheck, r, deleted = func(repo, mynode, orig, fcd, fco, fca, | |
670 | toolconf, files, labels=labels) |
|
670 | toolconf, files, labels=labels) | |
671 |
|
671 | |||
672 | if needcheck: |
|
672 | if needcheck: | |
673 | r = _check(r, ui, tool, fcd, files) |
|
673 | r = _check(r, ui, tool, fcd, files) | |
674 |
|
674 | |||
675 | if r: |
|
675 | if r: | |
676 | if onfailure: |
|
676 | if onfailure: | |
677 | ui.warn(onfailure % fd) |
|
677 | ui.warn(onfailure % fd) | |
678 |
|
678 | |||
679 | return True, r, deleted |
|
679 | return True, r, deleted | |
680 | finally: |
|
680 | finally: | |
681 | if not r and back is not None: |
|
681 | if not r and back is not None: | |
682 | util.unlink(back) |
|
682 | util.unlink(back) | |
683 | util.unlink(b) |
|
683 | util.unlink(b) | |
684 | util.unlink(c) |
|
684 | util.unlink(c) | |
685 |
|
685 | |||
686 | def _check(r, ui, tool, fcd, files): |
|
686 | def _check(r, ui, tool, fcd, files): | |
687 | fd = fcd.path() |
|
687 | fd = fcd.path() | |
688 | a, b, c, back = files |
|
688 | a, b, c, back = files | |
689 |
|
689 | |||
690 | if not r and (_toolbool(ui, tool, "checkconflicts") or |
|
690 | if not r and (_toolbool(ui, tool, "checkconflicts") or | |
691 | 'conflicts' in _toollist(ui, tool, "check")): |
|
691 | 'conflicts' in _toollist(ui, tool, "check")): | |
692 | if re.search("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcd.data(), |
|
692 | if re.search("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcd.data(), | |
693 | re.MULTILINE): |
|
693 | re.MULTILINE): | |
694 | r = 1 |
|
694 | r = 1 | |
695 |
|
695 | |||
696 | checked = False |
|
696 | checked = False | |
697 | if 'prompt' in _toollist(ui, tool, "check"): |
|
697 | if 'prompt' in _toollist(ui, tool, "check"): | |
698 | checked = True |
|
698 | checked = True | |
699 | if ui.promptchoice(_("was merge of '%s' successful (yn)?" |
|
699 | if ui.promptchoice(_("was merge of '%s' successful (yn)?" | |
700 | "$$ &Yes $$ &No") % fd, 1): |
|
700 | "$$ &Yes $$ &No") % fd, 1): | |
701 | r = 1 |
|
701 | r = 1 | |
702 |
|
702 | |||
703 | if not r and not checked and (_toolbool(ui, tool, "checkchanged") or |
|
703 | if not r and not checked and (_toolbool(ui, tool, "checkchanged") or | |
704 | 'changed' in |
|
704 | 'changed' in | |
705 | _toollist(ui, tool, "check")): |
|
705 | _toollist(ui, tool, "check")): | |
706 | if back is not None and filecmp.cmp(a, back): |
|
706 | if back is not None and filecmp.cmp(a, back): | |
707 | if ui.promptchoice(_(" output file %s appears unchanged\n" |
|
707 | if ui.promptchoice(_(" output file %s appears unchanged\n" | |
708 | "was merge successful (yn)?" |
|
708 | "was merge successful (yn)?" | |
709 | "$$ &Yes $$ &No") % fd, 1): |
|
709 | "$$ &Yes $$ &No") % fd, 1): | |
710 | r = 1 |
|
710 | r = 1 | |
711 |
|
711 | |||
712 | if back is not None and _toolbool(ui, tool, "fixeol"): |
|
712 | if back is not None and _toolbool(ui, tool, "fixeol"): | |
713 | _matcheol(a, back) |
|
713 | _matcheol(a, back) | |
714 |
|
714 | |||
715 | return r |
|
715 | return r | |
716 |
|
716 | |||
717 | def premerge(repo, mynode, orig, fcd, fco, fca, labels=None): |
|
717 | def premerge(repo, mynode, orig, fcd, fco, fca, labels=None): | |
718 | return _filemerge(True, repo, mynode, orig, fcd, fco, fca, labels=labels) |
|
718 | return _filemerge(True, repo, mynode, orig, fcd, fco, fca, labels=labels) | |
719 |
|
719 | |||
720 | def filemerge(repo, mynode, orig, fcd, fco, fca, labels=None): |
|
720 | def filemerge(repo, mynode, orig, fcd, fco, fca, labels=None): | |
721 | return _filemerge(False, repo, mynode, orig, fcd, fco, fca, labels=labels) |
|
721 | return _filemerge(False, repo, mynode, orig, fcd, fco, fca, labels=labels) | |
722 |
|
722 | |||
723 | # tell hggettext to extract docstrings from these functions: |
|
723 | # tell hggettext to extract docstrings from these functions: | |
724 | i18nfunctions = internals.values() |
|
724 | i18nfunctions = internals.values() |
@@ -1,1217 +1,1217 b'' | |||||
1 | test merge-tools configuration - mostly exercising filemerge.py |
|
1 | test merge-tools configuration - mostly exercising filemerge.py | |
2 |
|
2 | |||
3 | $ unset HGMERGE # make sure HGMERGE doesn't interfere with the test |
|
3 | $ unset HGMERGE # make sure HGMERGE doesn't interfere with the test | |
4 | $ hg init |
|
4 | $ hg init | |
5 |
|
5 | |||
6 | revision 0 |
|
6 | revision 0 | |
7 |
|
7 | |||
8 | $ echo "revision 0" > f |
|
8 | $ echo "revision 0" > f | |
9 | $ echo "space" >> f |
|
9 | $ echo "space" >> f | |
10 | $ hg commit -Am "revision 0" |
|
10 | $ hg commit -Am "revision 0" | |
11 | adding f |
|
11 | adding f | |
12 |
|
12 | |||
13 | revision 1 |
|
13 | revision 1 | |
14 |
|
14 | |||
15 | $ echo "revision 1" > f |
|
15 | $ echo "revision 1" > f | |
16 | $ echo "space" >> f |
|
16 | $ echo "space" >> f | |
17 | $ hg commit -Am "revision 1" |
|
17 | $ hg commit -Am "revision 1" | |
18 | $ hg update 0 > /dev/null |
|
18 | $ hg update 0 > /dev/null | |
19 |
|
19 | |||
20 | revision 2 |
|
20 | revision 2 | |
21 |
|
21 | |||
22 | $ echo "revision 2" > f |
|
22 | $ echo "revision 2" > f | |
23 | $ echo "space" >> f |
|
23 | $ echo "space" >> f | |
24 | $ hg commit -Am "revision 2" |
|
24 | $ hg commit -Am "revision 2" | |
25 | created new head |
|
25 | created new head | |
26 | $ hg update 0 > /dev/null |
|
26 | $ hg update 0 > /dev/null | |
27 |
|
27 | |||
28 | revision 3 - simple to merge |
|
28 | revision 3 - simple to merge | |
29 |
|
29 | |||
30 | $ echo "revision 3" >> f |
|
30 | $ echo "revision 3" >> f | |
31 | $ hg commit -Am "revision 3" |
|
31 | $ hg commit -Am "revision 3" | |
32 | created new head |
|
32 | created new head | |
33 |
|
33 | |||
34 | revision 4 - hard to merge |
|
34 | revision 4 - hard to merge | |
35 |
|
35 | |||
36 | $ hg update 0 > /dev/null |
|
36 | $ hg update 0 > /dev/null | |
37 | $ echo "revision 4" > f |
|
37 | $ echo "revision 4" > f | |
38 | $ hg commit -Am "revision 4" |
|
38 | $ hg commit -Am "revision 4" | |
39 | created new head |
|
39 | created new head | |
40 |
|
40 | |||
41 | $ echo "[merge-tools]" > .hg/hgrc |
|
41 | $ echo "[merge-tools]" > .hg/hgrc | |
42 |
|
42 | |||
43 | $ beforemerge() { |
|
43 | $ beforemerge() { | |
44 | > cat .hg/hgrc |
|
44 | > cat .hg/hgrc | |
45 | > echo "# hg update -C 1" |
|
45 | > echo "# hg update -C 1" | |
46 | > hg update -C 1 > /dev/null |
|
46 | > hg update -C 1 > /dev/null | |
47 | > } |
|
47 | > } | |
48 | $ aftermerge() { |
|
48 | $ aftermerge() { | |
49 | > echo "# cat f" |
|
49 | > echo "# cat f" | |
50 | > cat f |
|
50 | > cat f | |
51 | > echo "# hg stat" |
|
51 | > echo "# hg stat" | |
52 | > hg stat |
|
52 | > hg stat | |
53 | > echo "# hg resolve --list" |
|
53 | > echo "# hg resolve --list" | |
54 | > hg resolve --list |
|
54 | > hg resolve --list | |
55 | > rm -f f.orig |
|
55 | > rm -f f.orig | |
56 | > } |
|
56 | > } | |
57 |
|
57 | |||
58 | Tool selection |
|
58 | Tool selection | |
59 |
|
59 | |||
60 | default is internal merge: |
|
60 | default is internal merge: | |
61 |
|
61 | |||
62 | $ beforemerge |
|
62 | $ beforemerge | |
63 | [merge-tools] |
|
63 | [merge-tools] | |
64 | # hg update -C 1 |
|
64 | # hg update -C 1 | |
65 |
|
65 | |||
66 | hg merge -r 2 |
|
66 | hg merge -r 2 | |
67 | override $PATH to ensure hgmerge not visible; use $PYTHON in case we're |
|
67 | override $PATH to ensure hgmerge not visible; use $PYTHON in case we're | |
68 | running from a devel copy, not a temp installation |
|
68 | running from a devel copy, not a temp installation | |
69 |
|
69 | |||
70 | $ PATH="$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2 |
|
70 | $ PATH="$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2 | |
71 | merging f |
|
71 | merging f | |
72 | warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
|
72 | warning: conflicts while merging f! (edit, then use 'hg resolve --mark') | |
73 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
73 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
74 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
74 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
75 | [1] |
|
75 | [1] | |
76 | $ aftermerge |
|
76 | $ aftermerge | |
77 | # cat f |
|
77 | # cat f | |
78 | <<<<<<< working copy: ef83787e2614 - test: revision 1 |
|
78 | <<<<<<< working copy: ef83787e2614 - test: revision 1 | |
79 | revision 1 |
|
79 | revision 1 | |
80 | ======= |
|
80 | ======= | |
81 | revision 2 |
|
81 | revision 2 | |
82 | >>>>>>> merge rev: 0185f4e0cf02 - test: revision 2 |
|
82 | >>>>>>> merge rev: 0185f4e0cf02 - test: revision 2 | |
83 | space |
|
83 | space | |
84 | # hg stat |
|
84 | # hg stat | |
85 | M f |
|
85 | M f | |
86 | ? f.orig |
|
86 | ? f.orig | |
87 | # hg resolve --list |
|
87 | # hg resolve --list | |
88 | U f |
|
88 | U f | |
89 |
|
89 | |||
90 | simplest hgrc using false for merge: |
|
90 | simplest hgrc using false for merge: | |
91 |
|
91 | |||
92 | $ echo "false.whatever=" >> .hg/hgrc |
|
92 | $ echo "false.whatever=" >> .hg/hgrc | |
93 | $ beforemerge |
|
93 | $ beforemerge | |
94 | [merge-tools] |
|
94 | [merge-tools] | |
95 | false.whatever= |
|
95 | false.whatever= | |
96 | # hg update -C 1 |
|
96 | # hg update -C 1 | |
97 | $ hg merge -r 2 |
|
97 | $ hg merge -r 2 | |
98 | merging f |
|
98 | merging f | |
99 | merging f failed! |
|
99 | merging f failed! | |
100 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
100 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
101 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
101 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
102 | [1] |
|
102 | [1] | |
103 | $ aftermerge |
|
103 | $ aftermerge | |
104 | # cat f |
|
104 | # cat f | |
105 | revision 1 |
|
105 | revision 1 | |
106 | space |
|
106 | space | |
107 | # hg stat |
|
107 | # hg stat | |
108 | M f |
|
108 | M f | |
109 | ? f.orig |
|
109 | ? f.orig | |
110 | # hg resolve --list |
|
110 | # hg resolve --list | |
111 | U f |
|
111 | U f | |
112 |
|
112 | |||
113 | #if unix-permissions |
|
113 | #if unix-permissions | |
114 |
|
114 | |||
115 | unexecutable file in $PATH shouldn't be found: |
|
115 | unexecutable file in $PATH shouldn't be found: | |
116 |
|
116 | |||
117 | $ echo "echo fail" > false |
|
117 | $ echo "echo fail" > false | |
118 | $ hg up -qC 1 |
|
118 | $ hg up -qC 1 | |
119 | $ PATH="`pwd`:$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2 |
|
119 | $ PATH="`pwd`:$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2 | |
120 | merging f |
|
120 | merging f | |
121 | warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
|
121 | warning: conflicts while merging f! (edit, then use 'hg resolve --mark') | |
122 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
122 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
123 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
123 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
124 | [1] |
|
124 | [1] | |
125 | $ rm false |
|
125 | $ rm false | |
126 |
|
126 | |||
127 | #endif |
|
127 | #endif | |
128 |
|
128 | |||
129 | executable directory in $PATH shouldn't be found: |
|
129 | executable directory in $PATH shouldn't be found: | |
130 |
|
130 | |||
131 | $ mkdir false |
|
131 | $ mkdir false | |
132 | $ hg up -qC 1 |
|
132 | $ hg up -qC 1 | |
133 | $ PATH="`pwd`:$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2 |
|
133 | $ PATH="`pwd`:$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2 | |
134 | merging f |
|
134 | merging f | |
135 | warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
|
135 | warning: conflicts while merging f! (edit, then use 'hg resolve --mark') | |
136 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
136 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
137 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
137 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
138 | [1] |
|
138 | [1] | |
139 | $ rmdir false |
|
139 | $ rmdir false | |
140 |
|
140 | |||
141 | true with higher .priority gets precedence: |
|
141 | true with higher .priority gets precedence: | |
142 |
|
142 | |||
143 | $ echo "true.priority=1" >> .hg/hgrc |
|
143 | $ echo "true.priority=1" >> .hg/hgrc | |
144 | $ beforemerge |
|
144 | $ beforemerge | |
145 | [merge-tools] |
|
145 | [merge-tools] | |
146 | false.whatever= |
|
146 | false.whatever= | |
147 | true.priority=1 |
|
147 | true.priority=1 | |
148 | # hg update -C 1 |
|
148 | # hg update -C 1 | |
149 | $ hg merge -r 2 |
|
149 | $ hg merge -r 2 | |
150 | merging f |
|
150 | merging f | |
151 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
151 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
152 | (branch merge, don't forget to commit) |
|
152 | (branch merge, don't forget to commit) | |
153 | $ aftermerge |
|
153 | $ aftermerge | |
154 | # cat f |
|
154 | # cat f | |
155 | revision 1 |
|
155 | revision 1 | |
156 | space |
|
156 | space | |
157 | # hg stat |
|
157 | # hg stat | |
158 | M f |
|
158 | M f | |
159 | # hg resolve --list |
|
159 | # hg resolve --list | |
160 | R f |
|
160 | R f | |
161 |
|
161 | |||
162 | unless lowered on command line: |
|
162 | unless lowered on command line: | |
163 |
|
163 | |||
164 | $ beforemerge |
|
164 | $ beforemerge | |
165 | [merge-tools] |
|
165 | [merge-tools] | |
166 | false.whatever= |
|
166 | false.whatever= | |
167 | true.priority=1 |
|
167 | true.priority=1 | |
168 | # hg update -C 1 |
|
168 | # hg update -C 1 | |
169 | $ hg merge -r 2 --config merge-tools.true.priority=-7 |
|
169 | $ hg merge -r 2 --config merge-tools.true.priority=-7 | |
170 | merging f |
|
170 | merging f | |
171 | merging f failed! |
|
171 | merging f failed! | |
172 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
172 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
173 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
173 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
174 | [1] |
|
174 | [1] | |
175 | $ aftermerge |
|
175 | $ aftermerge | |
176 | # cat f |
|
176 | # cat f | |
177 | revision 1 |
|
177 | revision 1 | |
178 | space |
|
178 | space | |
179 | # hg stat |
|
179 | # hg stat | |
180 | M f |
|
180 | M f | |
181 | ? f.orig |
|
181 | ? f.orig | |
182 | # hg resolve --list |
|
182 | # hg resolve --list | |
183 | U f |
|
183 | U f | |
184 |
|
184 | |||
185 | or false set higher on command line: |
|
185 | or false set higher on command line: | |
186 |
|
186 | |||
187 | $ beforemerge |
|
187 | $ beforemerge | |
188 | [merge-tools] |
|
188 | [merge-tools] | |
189 | false.whatever= |
|
189 | false.whatever= | |
190 | true.priority=1 |
|
190 | true.priority=1 | |
191 | # hg update -C 1 |
|
191 | # hg update -C 1 | |
192 | $ hg merge -r 2 --config merge-tools.false.priority=117 |
|
192 | $ hg merge -r 2 --config merge-tools.false.priority=117 | |
193 | merging f |
|
193 | merging f | |
194 | merging f failed! |
|
194 | merging f failed! | |
195 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
195 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
196 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
196 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
197 | [1] |
|
197 | [1] | |
198 | $ aftermerge |
|
198 | $ aftermerge | |
199 | # cat f |
|
199 | # cat f | |
200 | revision 1 |
|
200 | revision 1 | |
201 | space |
|
201 | space | |
202 | # hg stat |
|
202 | # hg stat | |
203 | M f |
|
203 | M f | |
204 | ? f.orig |
|
204 | ? f.orig | |
205 | # hg resolve --list |
|
205 | # hg resolve --list | |
206 | U f |
|
206 | U f | |
207 |
|
207 | |||
208 | or true set to disabled: |
|
208 | or true set to disabled: | |
209 | $ beforemerge |
|
209 | $ beforemerge | |
210 | [merge-tools] |
|
210 | [merge-tools] | |
211 | false.whatever= |
|
211 | false.whatever= | |
212 | true.priority=1 |
|
212 | true.priority=1 | |
213 | # hg update -C 1 |
|
213 | # hg update -C 1 | |
214 | $ hg merge -r 2 --config merge-tools.true.disabled=yes |
|
214 | $ hg merge -r 2 --config merge-tools.true.disabled=yes | |
215 | merging f |
|
215 | merging f | |
216 | merging f failed! |
|
216 | merging f failed! | |
217 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
217 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
218 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
218 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
219 | [1] |
|
219 | [1] | |
220 | $ aftermerge |
|
220 | $ aftermerge | |
221 | # cat f |
|
221 | # cat f | |
222 | revision 1 |
|
222 | revision 1 | |
223 | space |
|
223 | space | |
224 | # hg stat |
|
224 | # hg stat | |
225 | M f |
|
225 | M f | |
226 | ? f.orig |
|
226 | ? f.orig | |
227 | # hg resolve --list |
|
227 | # hg resolve --list | |
228 | U f |
|
228 | U f | |
229 |
|
229 | |||
230 | or true.executable not found in PATH: |
|
230 | or true.executable not found in PATH: | |
231 |
|
231 | |||
232 | $ beforemerge |
|
232 | $ beforemerge | |
233 | [merge-tools] |
|
233 | [merge-tools] | |
234 | false.whatever= |
|
234 | false.whatever= | |
235 | true.priority=1 |
|
235 | true.priority=1 | |
236 | # hg update -C 1 |
|
236 | # hg update -C 1 | |
237 | $ hg merge -r 2 --config merge-tools.true.executable=nonexistentmergetool |
|
237 | $ hg merge -r 2 --config merge-tools.true.executable=nonexistentmergetool | |
238 | merging f |
|
238 | merging f | |
239 | merging f failed! |
|
239 | merging f failed! | |
240 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
240 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
241 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
241 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
242 | [1] |
|
242 | [1] | |
243 | $ aftermerge |
|
243 | $ aftermerge | |
244 | # cat f |
|
244 | # cat f | |
245 | revision 1 |
|
245 | revision 1 | |
246 | space |
|
246 | space | |
247 | # hg stat |
|
247 | # hg stat | |
248 | M f |
|
248 | M f | |
249 | ? f.orig |
|
249 | ? f.orig | |
250 | # hg resolve --list |
|
250 | # hg resolve --list | |
251 | U f |
|
251 | U f | |
252 |
|
252 | |||
253 | or true.executable with bogus path: |
|
253 | or true.executable with bogus path: | |
254 |
|
254 | |||
255 | $ beforemerge |
|
255 | $ beforemerge | |
256 | [merge-tools] |
|
256 | [merge-tools] | |
257 | false.whatever= |
|
257 | false.whatever= | |
258 | true.priority=1 |
|
258 | true.priority=1 | |
259 | # hg update -C 1 |
|
259 | # hg update -C 1 | |
260 | $ hg merge -r 2 --config merge-tools.true.executable=/nonexistent/mergetool |
|
260 | $ hg merge -r 2 --config merge-tools.true.executable=/nonexistent/mergetool | |
261 | merging f |
|
261 | merging f | |
262 | merging f failed! |
|
262 | merging f failed! | |
263 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
263 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
264 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
264 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
265 | [1] |
|
265 | [1] | |
266 | $ aftermerge |
|
266 | $ aftermerge | |
267 | # cat f |
|
267 | # cat f | |
268 | revision 1 |
|
268 | revision 1 | |
269 | space |
|
269 | space | |
270 | # hg stat |
|
270 | # hg stat | |
271 | M f |
|
271 | M f | |
272 | ? f.orig |
|
272 | ? f.orig | |
273 | # hg resolve --list |
|
273 | # hg resolve --list | |
274 | U f |
|
274 | U f | |
275 |
|
275 | |||
276 | but true.executable set to cat found in PATH works: |
|
276 | but true.executable set to cat found in PATH works: | |
277 |
|
277 | |||
278 | $ echo "true.executable=cat" >> .hg/hgrc |
|
278 | $ echo "true.executable=cat" >> .hg/hgrc | |
279 | $ beforemerge |
|
279 | $ beforemerge | |
280 | [merge-tools] |
|
280 | [merge-tools] | |
281 | false.whatever= |
|
281 | false.whatever= | |
282 | true.priority=1 |
|
282 | true.priority=1 | |
283 | true.executable=cat |
|
283 | true.executable=cat | |
284 | # hg update -C 1 |
|
284 | # hg update -C 1 | |
285 | $ hg merge -r 2 |
|
285 | $ hg merge -r 2 | |
286 | merging f |
|
286 | merging f | |
287 | revision 1 |
|
287 | revision 1 | |
288 | space |
|
288 | space | |
289 | revision 0 |
|
289 | revision 0 | |
290 | space |
|
290 | space | |
291 | revision 2 |
|
291 | revision 2 | |
292 | space |
|
292 | space | |
293 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
293 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
294 | (branch merge, don't forget to commit) |
|
294 | (branch merge, don't forget to commit) | |
295 | $ aftermerge |
|
295 | $ aftermerge | |
296 | # cat f |
|
296 | # cat f | |
297 | revision 1 |
|
297 | revision 1 | |
298 | space |
|
298 | space | |
299 | # hg stat |
|
299 | # hg stat | |
300 | M f |
|
300 | M f | |
301 | # hg resolve --list |
|
301 | # hg resolve --list | |
302 | R f |
|
302 | R f | |
303 |
|
303 | |||
304 | and true.executable set to cat with path works: |
|
304 | and true.executable set to cat with path works: | |
305 |
|
305 | |||
306 | $ beforemerge |
|
306 | $ beforemerge | |
307 | [merge-tools] |
|
307 | [merge-tools] | |
308 | false.whatever= |
|
308 | false.whatever= | |
309 | true.priority=1 |
|
309 | true.priority=1 | |
310 | true.executable=cat |
|
310 | true.executable=cat | |
311 | # hg update -C 1 |
|
311 | # hg update -C 1 | |
312 | $ hg merge -r 2 --config merge-tools.true.executable=cat |
|
312 | $ hg merge -r 2 --config merge-tools.true.executable=cat | |
313 | merging f |
|
313 | merging f | |
314 | revision 1 |
|
314 | revision 1 | |
315 | space |
|
315 | space | |
316 | revision 0 |
|
316 | revision 0 | |
317 | space |
|
317 | space | |
318 | revision 2 |
|
318 | revision 2 | |
319 | space |
|
319 | space | |
320 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
320 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
321 | (branch merge, don't forget to commit) |
|
321 | (branch merge, don't forget to commit) | |
322 | $ aftermerge |
|
322 | $ aftermerge | |
323 | # cat f |
|
323 | # cat f | |
324 | revision 1 |
|
324 | revision 1 | |
325 | space |
|
325 | space | |
326 | # hg stat |
|
326 | # hg stat | |
327 | M f |
|
327 | M f | |
328 | # hg resolve --list |
|
328 | # hg resolve --list | |
329 | R f |
|
329 | R f | |
330 |
|
330 | |||
331 | #if unix-permissions |
|
331 | #if unix-permissions | |
332 |
|
332 | |||
333 | environment variables in true.executable are handled: |
|
333 | environment variables in true.executable are handled: | |
334 |
|
334 | |||
335 | $ echo 'echo "custom merge tool"' > .hg/merge.sh |
|
335 | $ echo 'echo "custom merge tool"' > .hg/merge.sh | |
336 | $ beforemerge |
|
336 | $ beforemerge | |
337 | [merge-tools] |
|
337 | [merge-tools] | |
338 | false.whatever= |
|
338 | false.whatever= | |
339 | true.priority=1 |
|
339 | true.priority=1 | |
340 | true.executable=cat |
|
340 | true.executable=cat | |
341 | # hg update -C 1 |
|
341 | # hg update -C 1 | |
342 | $ hg --config merge-tools.true.executable='sh' \ |
|
342 | $ hg --config merge-tools.true.executable='sh' \ | |
343 | > --config merge-tools.true.args=.hg/merge.sh \ |
|
343 | > --config merge-tools.true.args=.hg/merge.sh \ | |
344 | > merge -r 2 |
|
344 | > merge -r 2 | |
345 | merging f |
|
345 | merging f | |
346 | custom merge tool |
|
346 | custom merge tool | |
347 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
347 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
348 | (branch merge, don't forget to commit) |
|
348 | (branch merge, don't forget to commit) | |
349 | $ aftermerge |
|
349 | $ aftermerge | |
350 | # cat f |
|
350 | # cat f | |
351 | revision 1 |
|
351 | revision 1 | |
352 | space |
|
352 | space | |
353 | # hg stat |
|
353 | # hg stat | |
354 | M f |
|
354 | M f | |
355 | # hg resolve --list |
|
355 | # hg resolve --list | |
356 | R f |
|
356 | R f | |
357 |
|
357 | |||
358 | #endif |
|
358 | #endif | |
359 |
|
359 | |||
360 | Tool selection and merge-patterns |
|
360 | Tool selection and merge-patterns | |
361 |
|
361 | |||
362 | merge-patterns specifies new tool false: |
|
362 | merge-patterns specifies new tool false: | |
363 |
|
363 | |||
364 | $ beforemerge |
|
364 | $ beforemerge | |
365 | [merge-tools] |
|
365 | [merge-tools] | |
366 | false.whatever= |
|
366 | false.whatever= | |
367 | true.priority=1 |
|
367 | true.priority=1 | |
368 | true.executable=cat |
|
368 | true.executable=cat | |
369 | # hg update -C 1 |
|
369 | # hg update -C 1 | |
370 | $ hg merge -r 2 --config merge-patterns.f=false |
|
370 | $ hg merge -r 2 --config merge-patterns.f=false | |
371 | merging f |
|
371 | merging f | |
372 | merging f failed! |
|
372 | merging f failed! | |
373 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
373 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
374 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
374 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
375 | [1] |
|
375 | [1] | |
376 | $ aftermerge |
|
376 | $ aftermerge | |
377 | # cat f |
|
377 | # cat f | |
378 | revision 1 |
|
378 | revision 1 | |
379 | space |
|
379 | space | |
380 | # hg stat |
|
380 | # hg stat | |
381 | M f |
|
381 | M f | |
382 | ? f.orig |
|
382 | ? f.orig | |
383 | # hg resolve --list |
|
383 | # hg resolve --list | |
384 | U f |
|
384 | U f | |
385 |
|
385 | |||
386 | merge-patterns specifies executable not found in PATH and gets warning: |
|
386 | merge-patterns specifies executable not found in PATH and gets warning: | |
387 |
|
387 | |||
388 | $ beforemerge |
|
388 | $ beforemerge | |
389 | [merge-tools] |
|
389 | [merge-tools] | |
390 | false.whatever= |
|
390 | false.whatever= | |
391 | true.priority=1 |
|
391 | true.priority=1 | |
392 | true.executable=cat |
|
392 | true.executable=cat | |
393 | # hg update -C 1 |
|
393 | # hg update -C 1 | |
394 | $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool |
|
394 | $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool | |
395 |
couldn't find merge tool true |
|
395 | couldn't find merge tool true (for pattern f) | |
396 | merging f |
|
396 | merging f | |
397 |
couldn't find merge tool true |
|
397 | couldn't find merge tool true (for pattern f) | |
398 | merging f failed! |
|
398 | merging f failed! | |
399 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
399 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
400 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
400 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
401 | [1] |
|
401 | [1] | |
402 | $ aftermerge |
|
402 | $ aftermerge | |
403 | # cat f |
|
403 | # cat f | |
404 | revision 1 |
|
404 | revision 1 | |
405 | space |
|
405 | space | |
406 | # hg stat |
|
406 | # hg stat | |
407 | M f |
|
407 | M f | |
408 | ? f.orig |
|
408 | ? f.orig | |
409 | # hg resolve --list |
|
409 | # hg resolve --list | |
410 | U f |
|
410 | U f | |
411 |
|
411 | |||
412 | merge-patterns specifies executable with bogus path and gets warning: |
|
412 | merge-patterns specifies executable with bogus path and gets warning: | |
413 |
|
413 | |||
414 | $ beforemerge |
|
414 | $ beforemerge | |
415 | [merge-tools] |
|
415 | [merge-tools] | |
416 | false.whatever= |
|
416 | false.whatever= | |
417 | true.priority=1 |
|
417 | true.priority=1 | |
418 | true.executable=cat |
|
418 | true.executable=cat | |
419 | # hg update -C 1 |
|
419 | # hg update -C 1 | |
420 | $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexistent/mergetool |
|
420 | $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexistent/mergetool | |
421 |
couldn't find merge tool true |
|
421 | couldn't find merge tool true (for pattern f) | |
422 | merging f |
|
422 | merging f | |
423 |
couldn't find merge tool true |
|
423 | couldn't find merge tool true (for pattern f) | |
424 | merging f failed! |
|
424 | merging f failed! | |
425 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
425 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
426 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
426 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
427 | [1] |
|
427 | [1] | |
428 | $ aftermerge |
|
428 | $ aftermerge | |
429 | # cat f |
|
429 | # cat f | |
430 | revision 1 |
|
430 | revision 1 | |
431 | space |
|
431 | space | |
432 | # hg stat |
|
432 | # hg stat | |
433 | M f |
|
433 | M f | |
434 | ? f.orig |
|
434 | ? f.orig | |
435 | # hg resolve --list |
|
435 | # hg resolve --list | |
436 | U f |
|
436 | U f | |
437 |
|
437 | |||
438 | ui.merge overrules priority |
|
438 | ui.merge overrules priority | |
439 |
|
439 | |||
440 | ui.merge specifies false: |
|
440 | ui.merge specifies false: | |
441 |
|
441 | |||
442 | $ beforemerge |
|
442 | $ beforemerge | |
443 | [merge-tools] |
|
443 | [merge-tools] | |
444 | false.whatever= |
|
444 | false.whatever= | |
445 | true.priority=1 |
|
445 | true.priority=1 | |
446 | true.executable=cat |
|
446 | true.executable=cat | |
447 | # hg update -C 1 |
|
447 | # hg update -C 1 | |
448 | $ hg merge -r 2 --config ui.merge=false |
|
448 | $ hg merge -r 2 --config ui.merge=false | |
449 | merging f |
|
449 | merging f | |
450 | merging f failed! |
|
450 | merging f failed! | |
451 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
451 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
452 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
452 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
453 | [1] |
|
453 | [1] | |
454 | $ aftermerge |
|
454 | $ aftermerge | |
455 | # cat f |
|
455 | # cat f | |
456 | revision 1 |
|
456 | revision 1 | |
457 | space |
|
457 | space | |
458 | # hg stat |
|
458 | # hg stat | |
459 | M f |
|
459 | M f | |
460 | ? f.orig |
|
460 | ? f.orig | |
461 | # hg resolve --list |
|
461 | # hg resolve --list | |
462 | U f |
|
462 | U f | |
463 |
|
463 | |||
464 | ui.merge specifies internal:fail: |
|
464 | ui.merge specifies internal:fail: | |
465 |
|
465 | |||
466 | $ beforemerge |
|
466 | $ beforemerge | |
467 | [merge-tools] |
|
467 | [merge-tools] | |
468 | false.whatever= |
|
468 | false.whatever= | |
469 | true.priority=1 |
|
469 | true.priority=1 | |
470 | true.executable=cat |
|
470 | true.executable=cat | |
471 | # hg update -C 1 |
|
471 | # hg update -C 1 | |
472 | $ hg merge -r 2 --config ui.merge=internal:fail |
|
472 | $ hg merge -r 2 --config ui.merge=internal:fail | |
473 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
473 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
474 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
474 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
475 | [1] |
|
475 | [1] | |
476 | $ aftermerge |
|
476 | $ aftermerge | |
477 | # cat f |
|
477 | # cat f | |
478 | revision 1 |
|
478 | revision 1 | |
479 | space |
|
479 | space | |
480 | # hg stat |
|
480 | # hg stat | |
481 | M f |
|
481 | M f | |
482 | # hg resolve --list |
|
482 | # hg resolve --list | |
483 | U f |
|
483 | U f | |
484 |
|
484 | |||
485 | ui.merge specifies :local (without internal prefix): |
|
485 | ui.merge specifies :local (without internal prefix): | |
486 |
|
486 | |||
487 | $ beforemerge |
|
487 | $ beforemerge | |
488 | [merge-tools] |
|
488 | [merge-tools] | |
489 | false.whatever= |
|
489 | false.whatever= | |
490 | true.priority=1 |
|
490 | true.priority=1 | |
491 | true.executable=cat |
|
491 | true.executable=cat | |
492 | # hg update -C 1 |
|
492 | # hg update -C 1 | |
493 | $ hg merge -r 2 --config ui.merge=:local |
|
493 | $ hg merge -r 2 --config ui.merge=:local | |
494 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
494 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
495 | (branch merge, don't forget to commit) |
|
495 | (branch merge, don't forget to commit) | |
496 | $ aftermerge |
|
496 | $ aftermerge | |
497 | # cat f |
|
497 | # cat f | |
498 | revision 1 |
|
498 | revision 1 | |
499 | space |
|
499 | space | |
500 | # hg stat |
|
500 | # hg stat | |
501 | M f |
|
501 | M f | |
502 | # hg resolve --list |
|
502 | # hg resolve --list | |
503 | R f |
|
503 | R f | |
504 |
|
504 | |||
505 | ui.merge specifies internal:other: |
|
505 | ui.merge specifies internal:other: | |
506 |
|
506 | |||
507 | $ beforemerge |
|
507 | $ beforemerge | |
508 | [merge-tools] |
|
508 | [merge-tools] | |
509 | false.whatever= |
|
509 | false.whatever= | |
510 | true.priority=1 |
|
510 | true.priority=1 | |
511 | true.executable=cat |
|
511 | true.executable=cat | |
512 | # hg update -C 1 |
|
512 | # hg update -C 1 | |
513 | $ hg merge -r 2 --config ui.merge=internal:other |
|
513 | $ hg merge -r 2 --config ui.merge=internal:other | |
514 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
514 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
515 | (branch merge, don't forget to commit) |
|
515 | (branch merge, don't forget to commit) | |
516 | $ aftermerge |
|
516 | $ aftermerge | |
517 | # cat f |
|
517 | # cat f | |
518 | revision 2 |
|
518 | revision 2 | |
519 | space |
|
519 | space | |
520 | # hg stat |
|
520 | # hg stat | |
521 | M f |
|
521 | M f | |
522 | # hg resolve --list |
|
522 | # hg resolve --list | |
523 | R f |
|
523 | R f | |
524 |
|
524 | |||
525 | ui.merge specifies internal:prompt: |
|
525 | ui.merge specifies internal:prompt: | |
526 |
|
526 | |||
527 | $ beforemerge |
|
527 | $ beforemerge | |
528 | [merge-tools] |
|
528 | [merge-tools] | |
529 | false.whatever= |
|
529 | false.whatever= | |
530 | true.priority=1 |
|
530 | true.priority=1 | |
531 | true.executable=cat |
|
531 | true.executable=cat | |
532 | # hg update -C 1 |
|
532 | # hg update -C 1 | |
533 | $ hg merge -r 2 --config ui.merge=internal:prompt |
|
533 | $ hg merge -r 2 --config ui.merge=internal:prompt | |
534 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
|
534 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u | |
535 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
535 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
536 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
536 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
537 | [1] |
|
537 | [1] | |
538 | $ aftermerge |
|
538 | $ aftermerge | |
539 | # cat f |
|
539 | # cat f | |
540 | revision 1 |
|
540 | revision 1 | |
541 | space |
|
541 | space | |
542 | # hg stat |
|
542 | # hg stat | |
543 | M f |
|
543 | M f | |
544 | # hg resolve --list |
|
544 | # hg resolve --list | |
545 | U f |
|
545 | U f | |
546 |
|
546 | |||
547 | ui.merge specifies :prompt, with 'leave unresolved' chosen |
|
547 | ui.merge specifies :prompt, with 'leave unresolved' chosen | |
548 |
|
548 | |||
549 | $ beforemerge |
|
549 | $ beforemerge | |
550 | [merge-tools] |
|
550 | [merge-tools] | |
551 | false.whatever= |
|
551 | false.whatever= | |
552 | true.priority=1 |
|
552 | true.priority=1 | |
553 | true.executable=cat |
|
553 | true.executable=cat | |
554 | # hg update -C 1 |
|
554 | # hg update -C 1 | |
555 | $ hg merge -r 2 --config ui.merge=:prompt --config ui.interactive=True << EOF |
|
555 | $ hg merge -r 2 --config ui.merge=:prompt --config ui.interactive=True << EOF | |
556 | > u |
|
556 | > u | |
557 | > EOF |
|
557 | > EOF | |
558 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
|
558 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u | |
559 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
559 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
560 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
560 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
561 | [1] |
|
561 | [1] | |
562 | $ aftermerge |
|
562 | $ aftermerge | |
563 | # cat f |
|
563 | # cat f | |
564 | revision 1 |
|
564 | revision 1 | |
565 | space |
|
565 | space | |
566 | # hg stat |
|
566 | # hg stat | |
567 | M f |
|
567 | M f | |
568 | # hg resolve --list |
|
568 | # hg resolve --list | |
569 | U f |
|
569 | U f | |
570 |
|
570 | |||
571 | prompt with EOF |
|
571 | prompt with EOF | |
572 |
|
572 | |||
573 | $ beforemerge |
|
573 | $ beforemerge | |
574 | [merge-tools] |
|
574 | [merge-tools] | |
575 | false.whatever= |
|
575 | false.whatever= | |
576 | true.priority=1 |
|
576 | true.priority=1 | |
577 | true.executable=cat |
|
577 | true.executable=cat | |
578 | # hg update -C 1 |
|
578 | # hg update -C 1 | |
579 | $ hg merge -r 2 --config ui.merge=internal:prompt --config ui.interactive=true |
|
579 | $ hg merge -r 2 --config ui.merge=internal:prompt --config ui.interactive=true | |
580 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? |
|
580 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? | |
581 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
581 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
582 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
582 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
583 | [1] |
|
583 | [1] | |
584 | $ aftermerge |
|
584 | $ aftermerge | |
585 | # cat f |
|
585 | # cat f | |
586 | revision 1 |
|
586 | revision 1 | |
587 | space |
|
587 | space | |
588 | # hg stat |
|
588 | # hg stat | |
589 | M f |
|
589 | M f | |
590 | # hg resolve --list |
|
590 | # hg resolve --list | |
591 | U f |
|
591 | U f | |
592 | $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true |
|
592 | $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true | |
593 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? |
|
593 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? | |
594 | [1] |
|
594 | [1] | |
595 | $ aftermerge |
|
595 | $ aftermerge | |
596 | # cat f |
|
596 | # cat f | |
597 | revision 1 |
|
597 | revision 1 | |
598 | space |
|
598 | space | |
599 | # hg stat |
|
599 | # hg stat | |
600 | M f |
|
600 | M f | |
601 | ? f.orig |
|
601 | ? f.orig | |
602 | # hg resolve --list |
|
602 | # hg resolve --list | |
603 | U f |
|
603 | U f | |
604 | $ rm f |
|
604 | $ rm f | |
605 | $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true |
|
605 | $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true | |
606 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? |
|
606 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? | |
607 | [1] |
|
607 | [1] | |
608 | $ aftermerge |
|
608 | $ aftermerge | |
609 | # cat f |
|
609 | # cat f | |
610 | revision 1 |
|
610 | revision 1 | |
611 | space |
|
611 | space | |
612 | # hg stat |
|
612 | # hg stat | |
613 | M f |
|
613 | M f | |
614 | # hg resolve --list |
|
614 | # hg resolve --list | |
615 | U f |
|
615 | U f | |
616 | $ hg resolve --all --config ui.merge=internal:prompt |
|
616 | $ hg resolve --all --config ui.merge=internal:prompt | |
617 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
|
617 | keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u | |
618 | [1] |
|
618 | [1] | |
619 | $ aftermerge |
|
619 | $ aftermerge | |
620 | # cat f |
|
620 | # cat f | |
621 | revision 1 |
|
621 | revision 1 | |
622 | space |
|
622 | space | |
623 | # hg stat |
|
623 | # hg stat | |
624 | M f |
|
624 | M f | |
625 | ? f.orig |
|
625 | ? f.orig | |
626 | # hg resolve --list |
|
626 | # hg resolve --list | |
627 | U f |
|
627 | U f | |
628 |
|
628 | |||
629 | ui.merge specifies internal:dump: |
|
629 | ui.merge specifies internal:dump: | |
630 |
|
630 | |||
631 | $ beforemerge |
|
631 | $ beforemerge | |
632 | [merge-tools] |
|
632 | [merge-tools] | |
633 | false.whatever= |
|
633 | false.whatever= | |
634 | true.priority=1 |
|
634 | true.priority=1 | |
635 | true.executable=cat |
|
635 | true.executable=cat | |
636 | # hg update -C 1 |
|
636 | # hg update -C 1 | |
637 | $ hg merge -r 2 --config ui.merge=internal:dump |
|
637 | $ hg merge -r 2 --config ui.merge=internal:dump | |
638 | merging f |
|
638 | merging f | |
639 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
639 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
640 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
640 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
641 | [1] |
|
641 | [1] | |
642 | $ aftermerge |
|
642 | $ aftermerge | |
643 | # cat f |
|
643 | # cat f | |
644 | revision 1 |
|
644 | revision 1 | |
645 | space |
|
645 | space | |
646 | # hg stat |
|
646 | # hg stat | |
647 | M f |
|
647 | M f | |
648 | ? f.base |
|
648 | ? f.base | |
649 | ? f.local |
|
649 | ? f.local | |
650 | ? f.orig |
|
650 | ? f.orig | |
651 | ? f.other |
|
651 | ? f.other | |
652 | # hg resolve --list |
|
652 | # hg resolve --list | |
653 | U f |
|
653 | U f | |
654 |
|
654 | |||
655 | f.base: |
|
655 | f.base: | |
656 |
|
656 | |||
657 | $ cat f.base |
|
657 | $ cat f.base | |
658 | revision 0 |
|
658 | revision 0 | |
659 | space |
|
659 | space | |
660 |
|
660 | |||
661 | f.local: |
|
661 | f.local: | |
662 |
|
662 | |||
663 | $ cat f.local |
|
663 | $ cat f.local | |
664 | revision 1 |
|
664 | revision 1 | |
665 | space |
|
665 | space | |
666 |
|
666 | |||
667 | f.other: |
|
667 | f.other: | |
668 |
|
668 | |||
669 | $ cat f.other |
|
669 | $ cat f.other | |
670 | revision 2 |
|
670 | revision 2 | |
671 | space |
|
671 | space | |
672 | $ rm f.base f.local f.other |
|
672 | $ rm f.base f.local f.other | |
673 |
|
673 | |||
674 | ui.merge specifies internal:other but is overruled by pattern for false: |
|
674 | ui.merge specifies internal:other but is overruled by pattern for false: | |
675 |
|
675 | |||
676 | $ beforemerge |
|
676 | $ beforemerge | |
677 | [merge-tools] |
|
677 | [merge-tools] | |
678 | false.whatever= |
|
678 | false.whatever= | |
679 | true.priority=1 |
|
679 | true.priority=1 | |
680 | true.executable=cat |
|
680 | true.executable=cat | |
681 | # hg update -C 1 |
|
681 | # hg update -C 1 | |
682 | $ hg merge -r 2 --config ui.merge=internal:other --config merge-patterns.f=false |
|
682 | $ hg merge -r 2 --config ui.merge=internal:other --config merge-patterns.f=false | |
683 | merging f |
|
683 | merging f | |
684 | merging f failed! |
|
684 | merging f failed! | |
685 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
685 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
686 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
686 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
687 | [1] |
|
687 | [1] | |
688 | $ aftermerge |
|
688 | $ aftermerge | |
689 | # cat f |
|
689 | # cat f | |
690 | revision 1 |
|
690 | revision 1 | |
691 | space |
|
691 | space | |
692 | # hg stat |
|
692 | # hg stat | |
693 | M f |
|
693 | M f | |
694 | ? f.orig |
|
694 | ? f.orig | |
695 | # hg resolve --list |
|
695 | # hg resolve --list | |
696 | U f |
|
696 | U f | |
697 |
|
697 | |||
698 | Premerge |
|
698 | Premerge | |
699 |
|
699 | |||
700 | ui.merge specifies internal:other but is overruled by --tool=false |
|
700 | ui.merge specifies internal:other but is overruled by --tool=false | |
701 |
|
701 | |||
702 | $ beforemerge |
|
702 | $ beforemerge | |
703 | [merge-tools] |
|
703 | [merge-tools] | |
704 | false.whatever= |
|
704 | false.whatever= | |
705 | true.priority=1 |
|
705 | true.priority=1 | |
706 | true.executable=cat |
|
706 | true.executable=cat | |
707 | # hg update -C 1 |
|
707 | # hg update -C 1 | |
708 | $ hg merge -r 2 --config ui.merge=internal:other --tool=false |
|
708 | $ hg merge -r 2 --config ui.merge=internal:other --tool=false | |
709 | merging f |
|
709 | merging f | |
710 | merging f failed! |
|
710 | merging f failed! | |
711 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
711 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
712 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
712 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
713 | [1] |
|
713 | [1] | |
714 | $ aftermerge |
|
714 | $ aftermerge | |
715 | # cat f |
|
715 | # cat f | |
716 | revision 1 |
|
716 | revision 1 | |
717 | space |
|
717 | space | |
718 | # hg stat |
|
718 | # hg stat | |
719 | M f |
|
719 | M f | |
720 | ? f.orig |
|
720 | ? f.orig | |
721 | # hg resolve --list |
|
721 | # hg resolve --list | |
722 | U f |
|
722 | U f | |
723 |
|
723 | |||
724 | HGMERGE specifies internal:other but is overruled by --tool=false |
|
724 | HGMERGE specifies internal:other but is overruled by --tool=false | |
725 |
|
725 | |||
726 | $ HGMERGE=internal:other ; export HGMERGE |
|
726 | $ HGMERGE=internal:other ; export HGMERGE | |
727 | $ beforemerge |
|
727 | $ beforemerge | |
728 | [merge-tools] |
|
728 | [merge-tools] | |
729 | false.whatever= |
|
729 | false.whatever= | |
730 | true.priority=1 |
|
730 | true.priority=1 | |
731 | true.executable=cat |
|
731 | true.executable=cat | |
732 | # hg update -C 1 |
|
732 | # hg update -C 1 | |
733 | $ hg merge -r 2 --tool=false |
|
733 | $ hg merge -r 2 --tool=false | |
734 | merging f |
|
734 | merging f | |
735 | merging f failed! |
|
735 | merging f failed! | |
736 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
736 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
737 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
737 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
738 | [1] |
|
738 | [1] | |
739 | $ aftermerge |
|
739 | $ aftermerge | |
740 | # cat f |
|
740 | # cat f | |
741 | revision 1 |
|
741 | revision 1 | |
742 | space |
|
742 | space | |
743 | # hg stat |
|
743 | # hg stat | |
744 | M f |
|
744 | M f | |
745 | ? f.orig |
|
745 | ? f.orig | |
746 | # hg resolve --list |
|
746 | # hg resolve --list | |
747 | U f |
|
747 | U f | |
748 |
|
748 | |||
749 | $ unset HGMERGE # make sure HGMERGE doesn't interfere with remaining tests |
|
749 | $ unset HGMERGE # make sure HGMERGE doesn't interfere with remaining tests | |
750 |
|
750 | |||
751 | update is a merge ... |
|
751 | update is a merge ... | |
752 |
|
752 | |||
753 | (this also tests that files reverted with '--rev REV' are treated as |
|
753 | (this also tests that files reverted with '--rev REV' are treated as | |
754 | "modified", even if none of mode, size and timestamp of them isn't |
|
754 | "modified", even if none of mode, size and timestamp of them isn't | |
755 | changed on the filesystem (see also issue4583)) |
|
755 | changed on the filesystem (see also issue4583)) | |
756 |
|
756 | |||
757 | $ cat >> $HGRCPATH <<EOF |
|
757 | $ cat >> $HGRCPATH <<EOF | |
758 | > [fakedirstatewritetime] |
|
758 | > [fakedirstatewritetime] | |
759 | > # emulate invoking dirstate.write() via repo.status() |
|
759 | > # emulate invoking dirstate.write() via repo.status() | |
760 | > # at 2000-01-01 00:00 |
|
760 | > # at 2000-01-01 00:00 | |
761 | > fakenow = 200001010000 |
|
761 | > fakenow = 200001010000 | |
762 | > EOF |
|
762 | > EOF | |
763 |
|
763 | |||
764 | $ beforemerge |
|
764 | $ beforemerge | |
765 | [merge-tools] |
|
765 | [merge-tools] | |
766 | false.whatever= |
|
766 | false.whatever= | |
767 | true.priority=1 |
|
767 | true.priority=1 | |
768 | true.executable=cat |
|
768 | true.executable=cat | |
769 | # hg update -C 1 |
|
769 | # hg update -C 1 | |
770 | $ hg update -q 0 |
|
770 | $ hg update -q 0 | |
771 | $ f -s f |
|
771 | $ f -s f | |
772 | f: size=17 |
|
772 | f: size=17 | |
773 | $ touch -t 200001010000 f |
|
773 | $ touch -t 200001010000 f | |
774 | $ hg debugrebuildstate |
|
774 | $ hg debugrebuildstate | |
775 | $ cat >> $HGRCPATH <<EOF |
|
775 | $ cat >> $HGRCPATH <<EOF | |
776 | > [extensions] |
|
776 | > [extensions] | |
777 | > fakedirstatewritetime = $TESTDIR/fakedirstatewritetime.py |
|
777 | > fakedirstatewritetime = $TESTDIR/fakedirstatewritetime.py | |
778 | > EOF |
|
778 | > EOF | |
779 | $ hg revert -q -r 1 . |
|
779 | $ hg revert -q -r 1 . | |
780 | $ cat >> $HGRCPATH <<EOF |
|
780 | $ cat >> $HGRCPATH <<EOF | |
781 | > [extensions] |
|
781 | > [extensions] | |
782 | > fakedirstatewritetime = ! |
|
782 | > fakedirstatewritetime = ! | |
783 | > EOF |
|
783 | > EOF | |
784 | $ f -s f |
|
784 | $ f -s f | |
785 | f: size=17 |
|
785 | f: size=17 | |
786 | $ touch -t 200001010000 f |
|
786 | $ touch -t 200001010000 f | |
787 | $ hg status f |
|
787 | $ hg status f | |
788 | M f |
|
788 | M f | |
789 | $ hg update -r 2 |
|
789 | $ hg update -r 2 | |
790 | merging f |
|
790 | merging f | |
791 | revision 1 |
|
791 | revision 1 | |
792 | space |
|
792 | space | |
793 | revision 0 |
|
793 | revision 0 | |
794 | space |
|
794 | space | |
795 | revision 2 |
|
795 | revision 2 | |
796 | space |
|
796 | space | |
797 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
797 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
798 | $ aftermerge |
|
798 | $ aftermerge | |
799 | # cat f |
|
799 | # cat f | |
800 | revision 1 |
|
800 | revision 1 | |
801 | space |
|
801 | space | |
802 | # hg stat |
|
802 | # hg stat | |
803 | M f |
|
803 | M f | |
804 | # hg resolve --list |
|
804 | # hg resolve --list | |
805 | R f |
|
805 | R f | |
806 |
|
806 | |||
807 | update should also have --tool |
|
807 | update should also have --tool | |
808 |
|
808 | |||
809 | $ beforemerge |
|
809 | $ beforemerge | |
810 | [merge-tools] |
|
810 | [merge-tools] | |
811 | false.whatever= |
|
811 | false.whatever= | |
812 | true.priority=1 |
|
812 | true.priority=1 | |
813 | true.executable=cat |
|
813 | true.executable=cat | |
814 | # hg update -C 1 |
|
814 | # hg update -C 1 | |
815 | $ hg update -q 0 |
|
815 | $ hg update -q 0 | |
816 | $ f -s f |
|
816 | $ f -s f | |
817 | f: size=17 |
|
817 | f: size=17 | |
818 | $ touch -t 200001010000 f |
|
818 | $ touch -t 200001010000 f | |
819 | $ hg debugrebuildstate |
|
819 | $ hg debugrebuildstate | |
820 | $ cat >> $HGRCPATH <<EOF |
|
820 | $ cat >> $HGRCPATH <<EOF | |
821 | > [extensions] |
|
821 | > [extensions] | |
822 | > fakedirstatewritetime = $TESTDIR/fakedirstatewritetime.py |
|
822 | > fakedirstatewritetime = $TESTDIR/fakedirstatewritetime.py | |
823 | > EOF |
|
823 | > EOF | |
824 | $ hg revert -q -r 1 . |
|
824 | $ hg revert -q -r 1 . | |
825 | $ cat >> $HGRCPATH <<EOF |
|
825 | $ cat >> $HGRCPATH <<EOF | |
826 | > [extensions] |
|
826 | > [extensions] | |
827 | > fakedirstatewritetime = ! |
|
827 | > fakedirstatewritetime = ! | |
828 | > EOF |
|
828 | > EOF | |
829 | $ f -s f |
|
829 | $ f -s f | |
830 | f: size=17 |
|
830 | f: size=17 | |
831 | $ touch -t 200001010000 f |
|
831 | $ touch -t 200001010000 f | |
832 | $ hg status f |
|
832 | $ hg status f | |
833 | M f |
|
833 | M f | |
834 | $ hg update -r 2 --tool false |
|
834 | $ hg update -r 2 --tool false | |
835 | merging f |
|
835 | merging f | |
836 | merging f failed! |
|
836 | merging f failed! | |
837 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
837 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
838 | use 'hg resolve' to retry unresolved file merges |
|
838 | use 'hg resolve' to retry unresolved file merges | |
839 | [1] |
|
839 | [1] | |
840 | $ aftermerge |
|
840 | $ aftermerge | |
841 | # cat f |
|
841 | # cat f | |
842 | revision 1 |
|
842 | revision 1 | |
843 | space |
|
843 | space | |
844 | # hg stat |
|
844 | # hg stat | |
845 | M f |
|
845 | M f | |
846 | ? f.orig |
|
846 | ? f.orig | |
847 | # hg resolve --list |
|
847 | # hg resolve --list | |
848 | U f |
|
848 | U f | |
849 |
|
849 | |||
850 | Default is silent simplemerge: |
|
850 | Default is silent simplemerge: | |
851 |
|
851 | |||
852 | $ beforemerge |
|
852 | $ beforemerge | |
853 | [merge-tools] |
|
853 | [merge-tools] | |
854 | false.whatever= |
|
854 | false.whatever= | |
855 | true.priority=1 |
|
855 | true.priority=1 | |
856 | true.executable=cat |
|
856 | true.executable=cat | |
857 | # hg update -C 1 |
|
857 | # hg update -C 1 | |
858 | $ hg merge -r 3 |
|
858 | $ hg merge -r 3 | |
859 | merging f |
|
859 | merging f | |
860 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
860 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
861 | (branch merge, don't forget to commit) |
|
861 | (branch merge, don't forget to commit) | |
862 | $ aftermerge |
|
862 | $ aftermerge | |
863 | # cat f |
|
863 | # cat f | |
864 | revision 1 |
|
864 | revision 1 | |
865 | space |
|
865 | space | |
866 | revision 3 |
|
866 | revision 3 | |
867 | # hg stat |
|
867 | # hg stat | |
868 | M f |
|
868 | M f | |
869 | # hg resolve --list |
|
869 | # hg resolve --list | |
870 | R f |
|
870 | R f | |
871 |
|
871 | |||
872 | .premerge=True is same: |
|
872 | .premerge=True is same: | |
873 |
|
873 | |||
874 | $ beforemerge |
|
874 | $ beforemerge | |
875 | [merge-tools] |
|
875 | [merge-tools] | |
876 | false.whatever= |
|
876 | false.whatever= | |
877 | true.priority=1 |
|
877 | true.priority=1 | |
878 | true.executable=cat |
|
878 | true.executable=cat | |
879 | # hg update -C 1 |
|
879 | # hg update -C 1 | |
880 | $ hg merge -r 3 --config merge-tools.true.premerge=True |
|
880 | $ hg merge -r 3 --config merge-tools.true.premerge=True | |
881 | merging f |
|
881 | merging f | |
882 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
882 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
883 | (branch merge, don't forget to commit) |
|
883 | (branch merge, don't forget to commit) | |
884 | $ aftermerge |
|
884 | $ aftermerge | |
885 | # cat f |
|
885 | # cat f | |
886 | revision 1 |
|
886 | revision 1 | |
887 | space |
|
887 | space | |
888 | revision 3 |
|
888 | revision 3 | |
889 | # hg stat |
|
889 | # hg stat | |
890 | M f |
|
890 | M f | |
891 | # hg resolve --list |
|
891 | # hg resolve --list | |
892 | R f |
|
892 | R f | |
893 |
|
893 | |||
894 | .premerge=False executes merge-tool: |
|
894 | .premerge=False executes merge-tool: | |
895 |
|
895 | |||
896 | $ beforemerge |
|
896 | $ beforemerge | |
897 | [merge-tools] |
|
897 | [merge-tools] | |
898 | false.whatever= |
|
898 | false.whatever= | |
899 | true.priority=1 |
|
899 | true.priority=1 | |
900 | true.executable=cat |
|
900 | true.executable=cat | |
901 | # hg update -C 1 |
|
901 | # hg update -C 1 | |
902 | $ hg merge -r 3 --config merge-tools.true.premerge=False |
|
902 | $ hg merge -r 3 --config merge-tools.true.premerge=False | |
903 | merging f |
|
903 | merging f | |
904 | revision 1 |
|
904 | revision 1 | |
905 | space |
|
905 | space | |
906 | revision 0 |
|
906 | revision 0 | |
907 | space |
|
907 | space | |
908 | revision 0 |
|
908 | revision 0 | |
909 | space |
|
909 | space | |
910 | revision 3 |
|
910 | revision 3 | |
911 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
911 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
912 | (branch merge, don't forget to commit) |
|
912 | (branch merge, don't forget to commit) | |
913 | $ aftermerge |
|
913 | $ aftermerge | |
914 | # cat f |
|
914 | # cat f | |
915 | revision 1 |
|
915 | revision 1 | |
916 | space |
|
916 | space | |
917 | # hg stat |
|
917 | # hg stat | |
918 | M f |
|
918 | M f | |
919 | # hg resolve --list |
|
919 | # hg resolve --list | |
920 | R f |
|
920 | R f | |
921 |
|
921 | |||
922 | premerge=keep keeps conflict markers in: |
|
922 | premerge=keep keeps conflict markers in: | |
923 |
|
923 | |||
924 | $ beforemerge |
|
924 | $ beforemerge | |
925 | [merge-tools] |
|
925 | [merge-tools] | |
926 | false.whatever= |
|
926 | false.whatever= | |
927 | true.priority=1 |
|
927 | true.priority=1 | |
928 | true.executable=cat |
|
928 | true.executable=cat | |
929 | # hg update -C 1 |
|
929 | # hg update -C 1 | |
930 | $ hg merge -r 4 --config merge-tools.true.premerge=keep |
|
930 | $ hg merge -r 4 --config merge-tools.true.premerge=keep | |
931 | merging f |
|
931 | merging f | |
932 | <<<<<<< working copy: ef83787e2614 - test: revision 1 |
|
932 | <<<<<<< working copy: ef83787e2614 - test: revision 1 | |
933 | revision 1 |
|
933 | revision 1 | |
934 | space |
|
934 | space | |
935 | ======= |
|
935 | ======= | |
936 | revision 4 |
|
936 | revision 4 | |
937 | >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 |
|
937 | >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 | |
938 | revision 0 |
|
938 | revision 0 | |
939 | space |
|
939 | space | |
940 | revision 4 |
|
940 | revision 4 | |
941 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
941 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
942 | (branch merge, don't forget to commit) |
|
942 | (branch merge, don't forget to commit) | |
943 | $ aftermerge |
|
943 | $ aftermerge | |
944 | # cat f |
|
944 | # cat f | |
945 | <<<<<<< working copy: ef83787e2614 - test: revision 1 |
|
945 | <<<<<<< working copy: ef83787e2614 - test: revision 1 | |
946 | revision 1 |
|
946 | revision 1 | |
947 | space |
|
947 | space | |
948 | ======= |
|
948 | ======= | |
949 | revision 4 |
|
949 | revision 4 | |
950 | >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 |
|
950 | >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 | |
951 | # hg stat |
|
951 | # hg stat | |
952 | M f |
|
952 | M f | |
953 | # hg resolve --list |
|
953 | # hg resolve --list | |
954 | R f |
|
954 | R f | |
955 |
|
955 | |||
956 | premerge=keep-merge3 keeps conflict markers with base content: |
|
956 | premerge=keep-merge3 keeps conflict markers with base content: | |
957 |
|
957 | |||
958 | $ beforemerge |
|
958 | $ beforemerge | |
959 | [merge-tools] |
|
959 | [merge-tools] | |
960 | false.whatever= |
|
960 | false.whatever= | |
961 | true.priority=1 |
|
961 | true.priority=1 | |
962 | true.executable=cat |
|
962 | true.executable=cat | |
963 | # hg update -C 1 |
|
963 | # hg update -C 1 | |
964 | $ hg merge -r 4 --config merge-tools.true.premerge=keep-merge3 |
|
964 | $ hg merge -r 4 --config merge-tools.true.premerge=keep-merge3 | |
965 | merging f |
|
965 | merging f | |
966 | <<<<<<< working copy: ef83787e2614 - test: revision 1 |
|
966 | <<<<<<< working copy: ef83787e2614 - test: revision 1 | |
967 | revision 1 |
|
967 | revision 1 | |
968 | space |
|
968 | space | |
969 | ||||||| base |
|
969 | ||||||| base | |
970 | revision 0 |
|
970 | revision 0 | |
971 | space |
|
971 | space | |
972 | ======= |
|
972 | ======= | |
973 | revision 4 |
|
973 | revision 4 | |
974 | >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 |
|
974 | >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 | |
975 | revision 0 |
|
975 | revision 0 | |
976 | space |
|
976 | space | |
977 | revision 4 |
|
977 | revision 4 | |
978 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
978 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
979 | (branch merge, don't forget to commit) |
|
979 | (branch merge, don't forget to commit) | |
980 | $ aftermerge |
|
980 | $ aftermerge | |
981 | # cat f |
|
981 | # cat f | |
982 | <<<<<<< working copy: ef83787e2614 - test: revision 1 |
|
982 | <<<<<<< working copy: ef83787e2614 - test: revision 1 | |
983 | revision 1 |
|
983 | revision 1 | |
984 | space |
|
984 | space | |
985 | ||||||| base |
|
985 | ||||||| base | |
986 | revision 0 |
|
986 | revision 0 | |
987 | space |
|
987 | space | |
988 | ======= |
|
988 | ======= | |
989 | revision 4 |
|
989 | revision 4 | |
990 | >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 |
|
990 | >>>>>>> merge rev: 81448d39c9a0 - test: revision 4 | |
991 | # hg stat |
|
991 | # hg stat | |
992 | M f |
|
992 | M f | |
993 | # hg resolve --list |
|
993 | # hg resolve --list | |
994 | R f |
|
994 | R f | |
995 |
|
995 | |||
996 |
|
996 | |||
997 | Tool execution |
|
997 | Tool execution | |
998 |
|
998 | |||
999 | set tools.args explicit to include $base $local $other $output: |
|
999 | set tools.args explicit to include $base $local $other $output: | |
1000 |
|
1000 | |||
1001 | $ beforemerge |
|
1001 | $ beforemerge | |
1002 | [merge-tools] |
|
1002 | [merge-tools] | |
1003 | false.whatever= |
|
1003 | false.whatever= | |
1004 | true.priority=1 |
|
1004 | true.priority=1 | |
1005 | true.executable=cat |
|
1005 | true.executable=cat | |
1006 | # hg update -C 1 |
|
1006 | # hg update -C 1 | |
1007 | $ hg merge -r 2 --config merge-tools.true.executable=head --config merge-tools.true.args='$base $local $other $output' \ |
|
1007 | $ hg merge -r 2 --config merge-tools.true.executable=head --config merge-tools.true.args='$base $local $other $output' \ | |
1008 | > | sed 's,==> .* <==,==> ... <==,g' |
|
1008 | > | sed 's,==> .* <==,==> ... <==,g' | |
1009 | merging f |
|
1009 | merging f | |
1010 | ==> ... <== |
|
1010 | ==> ... <== | |
1011 | revision 0 |
|
1011 | revision 0 | |
1012 | space |
|
1012 | space | |
1013 |
|
1013 | |||
1014 | ==> ... <== |
|
1014 | ==> ... <== | |
1015 | revision 1 |
|
1015 | revision 1 | |
1016 | space |
|
1016 | space | |
1017 |
|
1017 | |||
1018 | ==> ... <== |
|
1018 | ==> ... <== | |
1019 | revision 2 |
|
1019 | revision 2 | |
1020 | space |
|
1020 | space | |
1021 |
|
1021 | |||
1022 | ==> ... <== |
|
1022 | ==> ... <== | |
1023 | revision 1 |
|
1023 | revision 1 | |
1024 | space |
|
1024 | space | |
1025 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
1025 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
1026 | (branch merge, don't forget to commit) |
|
1026 | (branch merge, don't forget to commit) | |
1027 | $ aftermerge |
|
1027 | $ aftermerge | |
1028 | # cat f |
|
1028 | # cat f | |
1029 | revision 1 |
|
1029 | revision 1 | |
1030 | space |
|
1030 | space | |
1031 | # hg stat |
|
1031 | # hg stat | |
1032 | M f |
|
1032 | M f | |
1033 | # hg resolve --list |
|
1033 | # hg resolve --list | |
1034 | R f |
|
1034 | R f | |
1035 |
|
1035 | |||
1036 | Merge with "echo mergeresult > $local": |
|
1036 | Merge with "echo mergeresult > $local": | |
1037 |
|
1037 | |||
1038 | $ beforemerge |
|
1038 | $ beforemerge | |
1039 | [merge-tools] |
|
1039 | [merge-tools] | |
1040 | false.whatever= |
|
1040 | false.whatever= | |
1041 | true.priority=1 |
|
1041 | true.priority=1 | |
1042 | true.executable=cat |
|
1042 | true.executable=cat | |
1043 | # hg update -C 1 |
|
1043 | # hg update -C 1 | |
1044 | $ hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > $local' |
|
1044 | $ hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > $local' | |
1045 | merging f |
|
1045 | merging f | |
1046 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
1046 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
1047 | (branch merge, don't forget to commit) |
|
1047 | (branch merge, don't forget to commit) | |
1048 | $ aftermerge |
|
1048 | $ aftermerge | |
1049 | # cat f |
|
1049 | # cat f | |
1050 | mergeresult |
|
1050 | mergeresult | |
1051 | # hg stat |
|
1051 | # hg stat | |
1052 | M f |
|
1052 | M f | |
1053 | # hg resolve --list |
|
1053 | # hg resolve --list | |
1054 | R f |
|
1054 | R f | |
1055 |
|
1055 | |||
1056 | - and $local is the file f: |
|
1056 | - and $local is the file f: | |
1057 |
|
1057 | |||
1058 | $ beforemerge |
|
1058 | $ beforemerge | |
1059 | [merge-tools] |
|
1059 | [merge-tools] | |
1060 | false.whatever= |
|
1060 | false.whatever= | |
1061 | true.priority=1 |
|
1061 | true.priority=1 | |
1062 | true.executable=cat |
|
1062 | true.executable=cat | |
1063 | # hg update -C 1 |
|
1063 | # hg update -C 1 | |
1064 | $ hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > f' |
|
1064 | $ hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > f' | |
1065 | merging f |
|
1065 | merging f | |
1066 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
1066 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
1067 | (branch merge, don't forget to commit) |
|
1067 | (branch merge, don't forget to commit) | |
1068 | $ aftermerge |
|
1068 | $ aftermerge | |
1069 | # cat f |
|
1069 | # cat f | |
1070 | mergeresult |
|
1070 | mergeresult | |
1071 | # hg stat |
|
1071 | # hg stat | |
1072 | M f |
|
1072 | M f | |
1073 | # hg resolve --list |
|
1073 | # hg resolve --list | |
1074 | R f |
|
1074 | R f | |
1075 |
|
1075 | |||
1076 | Merge with "echo mergeresult > $output" - the variable is a bit magic: |
|
1076 | Merge with "echo mergeresult > $output" - the variable is a bit magic: | |
1077 |
|
1077 | |||
1078 | $ beforemerge |
|
1078 | $ beforemerge | |
1079 | [merge-tools] |
|
1079 | [merge-tools] | |
1080 | false.whatever= |
|
1080 | false.whatever= | |
1081 | true.priority=1 |
|
1081 | true.priority=1 | |
1082 | true.executable=cat |
|
1082 | true.executable=cat | |
1083 | # hg update -C 1 |
|
1083 | # hg update -C 1 | |
1084 | $ hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > $output' |
|
1084 | $ hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > $output' | |
1085 | merging f |
|
1085 | merging f | |
1086 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
1086 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
1087 | (branch merge, don't forget to commit) |
|
1087 | (branch merge, don't forget to commit) | |
1088 | $ aftermerge |
|
1088 | $ aftermerge | |
1089 | # cat f |
|
1089 | # cat f | |
1090 | mergeresult |
|
1090 | mergeresult | |
1091 | # hg stat |
|
1091 | # hg stat | |
1092 | M f |
|
1092 | M f | |
1093 | # hg resolve --list |
|
1093 | # hg resolve --list | |
1094 | R f |
|
1094 | R f | |
1095 |
|
1095 | |||
1096 | Merge using tool with a path that must be quoted: |
|
1096 | Merge using tool with a path that must be quoted: | |
1097 |
|
1097 | |||
1098 | $ beforemerge |
|
1098 | $ beforemerge | |
1099 | [merge-tools] |
|
1099 | [merge-tools] | |
1100 | false.whatever= |
|
1100 | false.whatever= | |
1101 | true.priority=1 |
|
1101 | true.priority=1 | |
1102 | true.executable=cat |
|
1102 | true.executable=cat | |
1103 | # hg update -C 1 |
|
1103 | # hg update -C 1 | |
1104 | $ cat <<EOF > 'my merge tool' |
|
1104 | $ cat <<EOF > 'my merge tool' | |
1105 | > cat "\$1" "\$2" "\$3" > "\$4" |
|
1105 | > cat "\$1" "\$2" "\$3" > "\$4" | |
1106 | > EOF |
|
1106 | > EOF | |
1107 | $ hg --config merge-tools.true.executable='sh' \ |
|
1107 | $ hg --config merge-tools.true.executable='sh' \ | |
1108 | > --config merge-tools.true.args='"./my merge tool" $base $local $other $output' \ |
|
1108 | > --config merge-tools.true.args='"./my merge tool" $base $local $other $output' \ | |
1109 | > merge -r 2 |
|
1109 | > merge -r 2 | |
1110 | merging f |
|
1110 | merging f | |
1111 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
1111 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
1112 | (branch merge, don't forget to commit) |
|
1112 | (branch merge, don't forget to commit) | |
1113 | $ rm -f 'my merge tool' |
|
1113 | $ rm -f 'my merge tool' | |
1114 | $ aftermerge |
|
1114 | $ aftermerge | |
1115 | # cat f |
|
1115 | # cat f | |
1116 | revision 0 |
|
1116 | revision 0 | |
1117 | space |
|
1117 | space | |
1118 | revision 1 |
|
1118 | revision 1 | |
1119 | space |
|
1119 | space | |
1120 | revision 2 |
|
1120 | revision 2 | |
1121 | space |
|
1121 | space | |
1122 | # hg stat |
|
1122 | # hg stat | |
1123 | M f |
|
1123 | M f | |
1124 | # hg resolve --list |
|
1124 | # hg resolve --list | |
1125 | R f |
|
1125 | R f | |
1126 |
|
1126 | |||
1127 | Issue3581: Merging a filename that needs to be quoted |
|
1127 | Issue3581: Merging a filename that needs to be quoted | |
1128 | (This test doesn't work on Windows filesystems even on Linux, so check |
|
1128 | (This test doesn't work on Windows filesystems even on Linux, so check | |
1129 | for Unix-like permission) |
|
1129 | for Unix-like permission) | |
1130 |
|
1130 | |||
1131 | #if unix-permissions |
|
1131 | #if unix-permissions | |
1132 | $ beforemerge |
|
1132 | $ beforemerge | |
1133 | [merge-tools] |
|
1133 | [merge-tools] | |
1134 | false.whatever= |
|
1134 | false.whatever= | |
1135 | true.priority=1 |
|
1135 | true.priority=1 | |
1136 | true.executable=cat |
|
1136 | true.executable=cat | |
1137 | # hg update -C 1 |
|
1137 | # hg update -C 1 | |
1138 | $ echo "revision 5" > '"; exit 1; echo "' |
|
1138 | $ echo "revision 5" > '"; exit 1; echo "' | |
1139 | $ hg commit -Am "revision 5" |
|
1139 | $ hg commit -Am "revision 5" | |
1140 | adding "; exit 1; echo " |
|
1140 | adding "; exit 1; echo " | |
1141 | warning: filename contains '"', which is reserved on Windows: '"; exit 1; echo "' |
|
1141 | warning: filename contains '"', which is reserved on Windows: '"; exit 1; echo "' | |
1142 | $ hg update -C 1 > /dev/null |
|
1142 | $ hg update -C 1 > /dev/null | |
1143 | $ echo "revision 6" > '"; exit 1; echo "' |
|
1143 | $ echo "revision 6" > '"; exit 1; echo "' | |
1144 | $ hg commit -Am "revision 6" |
|
1144 | $ hg commit -Am "revision 6" | |
1145 | adding "; exit 1; echo " |
|
1145 | adding "; exit 1; echo " | |
1146 | warning: filename contains '"', which is reserved on Windows: '"; exit 1; echo "' |
|
1146 | warning: filename contains '"', which is reserved on Windows: '"; exit 1; echo "' | |
1147 | created new head |
|
1147 | created new head | |
1148 | $ hg merge --config merge-tools.true.executable="true" -r 5 |
|
1148 | $ hg merge --config merge-tools.true.executable="true" -r 5 | |
1149 | merging "; exit 1; echo " |
|
1149 | merging "; exit 1; echo " | |
1150 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
1150 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
1151 | (branch merge, don't forget to commit) |
|
1151 | (branch merge, don't forget to commit) | |
1152 | $ hg update -C 1 > /dev/null |
|
1152 | $ hg update -C 1 > /dev/null | |
1153 | #endif |
|
1153 | #endif | |
1154 |
|
1154 | |||
1155 | Merge post-processing |
|
1155 | Merge post-processing | |
1156 |
|
1156 | |||
1157 | cat is a bad merge-tool and doesn't change: |
|
1157 | cat is a bad merge-tool and doesn't change: | |
1158 |
|
1158 | |||
1159 | $ beforemerge |
|
1159 | $ beforemerge | |
1160 | [merge-tools] |
|
1160 | [merge-tools] | |
1161 | false.whatever= |
|
1161 | false.whatever= | |
1162 | true.priority=1 |
|
1162 | true.priority=1 | |
1163 | true.executable=cat |
|
1163 | true.executable=cat | |
1164 | # hg update -C 1 |
|
1164 | # hg update -C 1 | |
1165 | $ hg merge -y -r 2 --config merge-tools.true.checkchanged=1 |
|
1165 | $ hg merge -y -r 2 --config merge-tools.true.checkchanged=1 | |
1166 | merging f |
|
1166 | merging f | |
1167 | revision 1 |
|
1167 | revision 1 | |
1168 | space |
|
1168 | space | |
1169 | revision 0 |
|
1169 | revision 0 | |
1170 | space |
|
1170 | space | |
1171 | revision 2 |
|
1171 | revision 2 | |
1172 | space |
|
1172 | space | |
1173 | output file f appears unchanged |
|
1173 | output file f appears unchanged | |
1174 | was merge successful (yn)? n |
|
1174 | was merge successful (yn)? n | |
1175 | merging f failed! |
|
1175 | merging f failed! | |
1176 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
1176 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
1177 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
1177 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
1178 | [1] |
|
1178 | [1] | |
1179 | $ aftermerge |
|
1179 | $ aftermerge | |
1180 | # cat f |
|
1180 | # cat f | |
1181 | revision 1 |
|
1181 | revision 1 | |
1182 | space |
|
1182 | space | |
1183 | # hg stat |
|
1183 | # hg stat | |
1184 | M f |
|
1184 | M f | |
1185 | ? f.orig |
|
1185 | ? f.orig | |
1186 | # hg resolve --list |
|
1186 | # hg resolve --list | |
1187 | U f |
|
1187 | U f | |
1188 |
|
1188 | |||
1189 | #if symlink |
|
1189 | #if symlink | |
1190 |
|
1190 | |||
1191 | internal merge cannot handle symlinks and shouldn't try: |
|
1191 | internal merge cannot handle symlinks and shouldn't try: | |
1192 |
|
1192 | |||
1193 | $ hg update -q -C 1 |
|
1193 | $ hg update -q -C 1 | |
1194 | $ rm f |
|
1194 | $ rm f | |
1195 | $ ln -s symlink f |
|
1195 | $ ln -s symlink f | |
1196 | $ hg commit -qm 'f is symlink' |
|
1196 | $ hg commit -qm 'f is symlink' | |
1197 | $ hg merge -r 2 --tool internal:merge |
|
1197 | $ hg merge -r 2 --tool internal:merge | |
1198 | merging f |
|
1198 | merging f | |
1199 | warning: internal :merge cannot merge symlinks for f |
|
1199 | warning: internal :merge cannot merge symlinks for f | |
1200 | warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
|
1200 | warning: conflicts while merging f! (edit, then use 'hg resolve --mark') | |
1201 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
1201 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
1202 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
1202 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
1203 | [1] |
|
1203 | [1] | |
1204 |
|
1204 | |||
1205 | #endif |
|
1205 | #endif | |
1206 |
|
1206 | |||
1207 | Verify naming of temporary files and that extension is preserved: |
|
1207 | Verify naming of temporary files and that extension is preserved: | |
1208 |
|
1208 | |||
1209 | $ hg update -q -C 1 |
|
1209 | $ hg update -q -C 1 | |
1210 | $ hg mv f f.txt |
|
1210 | $ hg mv f f.txt | |
1211 | $ hg ci -qm "f.txt" |
|
1211 | $ hg ci -qm "f.txt" | |
1212 | $ hg update -q -C 2 |
|
1212 | $ hg update -q -C 2 | |
1213 | $ hg merge -y -r tip --tool echo --config merge-tools.echo.args='$base $local $other $output' |
|
1213 | $ hg merge -y -r tip --tool echo --config merge-tools.echo.args='$base $local $other $output' | |
1214 | merging f and f.txt to f.txt |
|
1214 | merging f and f.txt to f.txt | |
1215 | */f~base.?????? $TESTTMP/f.txt.orig */f~other.??????.txt $TESTTMP/f.txt (glob) |
|
1215 | */f~base.?????? $TESTTMP/f.txt.orig */f~other.??????.txt $TESTTMP/f.txt (glob) | |
1216 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
1216 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
1217 | (branch merge, don't forget to commit) |
|
1217 | (branch merge, don't forget to commit) |
General Comments 0
You need to be logged in to leave comments.
Login now