##// END OF EJS Templates
filemerge: switch the default name for internal tools from internal:x to :x
Mads Kiilerich -
r22707:38e0363d default
parent child Browse files
Show More
@@ -25,10 +25,10 b' internals = {}'
25 25 def internaltool(name, trymerge, onfailure=None):
26 26 '''return a decorator for populating internal merge tool table'''
27 27 def decorator(func):
28 fullname = 'internal:' + name
28 fullname = ':' + name
29 29 func.__doc__ = "``%s``\n" % fullname + func.__doc__.strip()
30 30 internals[fullname] = func
31 internals[':' + name] = func
31 internals['internal:' + name] = func
32 32 func.trymerge = trymerge
33 33 func.onfailure = onfailure
34 34 return func
@@ -112,8 +112,8 b' def _picktool(repo, ui, path, binary, sy'
112 112
113 113 # internal merge or prompt as last resort
114 114 if symlink or binary:
115 return "internal:prompt", None
116 return "internal:merge", None
115 return ":prompt", None
116 return ":merge", None
117 117
118 118 def _eoltype(data):
119 119 "Guess the EOL type of a file"
@@ -217,7 +217,7 b' def _imerge(repo, mynode, orig, fcd, fco'
217 217 of merge."""
218 218 tool, toolpath, binary, symlink = toolconf
219 219 if symlink:
220 repo.ui.warn(_('warning: internal:merge cannot merge symlinks '
220 repo.ui.warn(_('warning: internal :merge cannot merge symlinks '
221 221 'for %s\n') % fcd.path())
222 222 return False, 1
223 223 r = _premerge(repo, toolconf, files, labels=labels)
@@ -247,7 +247,7 b' def _imerge3(repo, mynode, orig, fcd, fc'
247 247
248 248 @internaltool('tagmerge', True,
249 249 _("automatic tag merging of %s failed! "
250 "(use 'hg resolve --tool internal:merge' or another merge "
250 "(use 'hg resolve --tool :merge' or another merge "
251 251 "tool of your choice)\n"))
252 252 def _itagmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
253 253 """
@@ -68,7 +68,7 b' 6. If a program named ``hgmerge`` can be'
68 68 it will by default not be used for symlinks and binary files.
69 69
70 70 7. If the file to be merged is not binary and is not a symlink, then
71 ``internal:merge`` is used.
71 internal ``:merge`` is used.
72 72
73 73 8. The merge of the file fails and must be resolved before commit.
74 74
@@ -970,7 +970,7 b' internal merge cannot handle symlinks an'
970 970 $ hg commit -qm 'f is symlink'
971 971 $ hg merge -r 2 --tool internal:merge
972 972 merging f
973 warning: internal:merge cannot merge symlinks for f
973 warning: internal :merge cannot merge symlinks for f
974 974 merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
975 975 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
976 976 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
@@ -40,7 +40,7 b' Symlink is local parent, executable is o'
40 40 picked tool 'internal:merge' for a (binary False symlink True)
41 41 merging a
42 42 my a@521a1e40188f+ other a@3574f3e69b1c ancestor a@c334dc3be0da
43 warning: internal:merge cannot merge symlinks for a
43 warning: internal :merge cannot merge symlinks for a
44 44 merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
45 45 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
46 46 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
@@ -74,7 +74,7 b' Symlink is other parent, executable is l'
74 74 picked tool 'internal:merge' for a (binary False symlink True)
75 75 merging a
76 76 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
77 warning: internal:merge cannot merge symlinks for a
77 warning: internal :merge cannot merge symlinks for a
78 78 merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
79 79 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
80 80 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
@@ -106,7 +106,7 b' Update to link with local change should '
106 106 a: versions differ -> m
107 107 updating: a 1/1 files (100.00%)
108 108 (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re)
109 picked tool 'internal:prompt' for a (binary False symlink True)
109 picked tool ':prompt' for a (binary False symlink True)
110 110 no tool found to merge a
111 111 keep (l)ocal or take (o)ther? l
112 112 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
@@ -138,7 +138,7 b' where that was what happened.'
138 138 $ hg ci -qm2
139 139 $ hg merge
140 140 merging f
141 warning: internal:merge cannot merge symlinks for f
141 warning: internal :merge cannot merge symlinks for f
142 142 merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
143 143 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
144 144 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
@@ -150,7 +150,7 b' where that was what happened.'
150 150 $ hg up -Cqr1
151 151 $ hg merge
152 152 merging f
153 warning: internal:merge cannot merge symlinks for f
153 warning: internal :merge cannot merge symlinks for f
154 154 merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
155 155 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
156 156 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
@@ -177,7 +177,7 b" Test removed 'x' flag merged with change"
177 177 $ hg ci -qm2
178 178 $ hg merge
179 179 merging f
180 warning: internal:merge cannot merge symlinks for f
180 warning: internal :merge cannot merge symlinks for f
181 181 merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
182 182 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
183 183 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
@@ -189,7 +189,7 b" Test removed 'x' flag merged with change"
189 189 $ hg up -Cqr1
190 190 $ hg merge
191 191 merging f
192 warning: internal:merge cannot merge symlinks for f
192 warning: internal :merge cannot merge symlinks for f
193 193 merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
194 194 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
195 195 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
@@ -271,13 +271,13 b' h: l vs l, different'
271 271 merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
272 272 warning: cannot merge flags for c
273 273 merging d
274 warning: internal:merge cannot merge symlinks for d
274 warning: internal :merge cannot merge symlinks for d
275 275 merging d incomplete! (edit conflicts, then use 'hg resolve --mark')
276 276 merging f
277 warning: internal:merge cannot merge symlinks for f
277 warning: internal :merge cannot merge symlinks for f
278 278 merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
279 279 merging h
280 warning: internal:merge cannot merge symlinks for h
280 warning: internal :merge cannot merge symlinks for h
281 281 merging h incomplete! (edit conflicts, then use 'hg resolve --mark')
282 282 3 files updated, 0 files merged, 0 files removed, 5 files unresolved
283 283 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
@@ -332,13 +332,13 b' h: l vs l, different'
332 332 merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
333 333 warning: cannot merge flags for c
334 334 merging d
335 warning: internal:merge cannot merge symlinks for d
335 warning: internal :merge cannot merge symlinks for d
336 336 merging d incomplete! (edit conflicts, then use 'hg resolve --mark')
337 337 merging f
338 warning: internal:merge cannot merge symlinks for f
338 warning: internal :merge cannot merge symlinks for f
339 339 merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
340 340 merging h
341 warning: internal:merge cannot merge symlinks for h
341 warning: internal :merge cannot merge symlinks for h
342 342 merging h incomplete! (edit conflicts, then use 'hg resolve --mark')
343 343 3 files updated, 0 files merged, 0 files removed, 5 files unresolved
344 344 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
@@ -517,7 +517,7 b' detect merge tag conflicts'
517 517 merging .hgtags
518 518 automatic .hgtags merge failed
519 519 the following 1 tags are in conflict: t7
520 automatic tag merging of .hgtags failed! (use 'hg resolve --tool internal:merge' or another merge tool of your choice)
520 automatic tag merging of .hgtags failed! (use 'hg resolve --tool :merge' or another merge tool of your choice)
521 521 2 files updated, 0 files merged, 0 files removed, 1 files unresolved
522 522 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
523 523 [1]
General Comments 0
You need to be logged in to leave comments. Login now