##// END OF EJS Templates
cmdutil: make resolvecommitoptions() work on str-keyed opts...
Martin von Zweigbergk -
r48225:7f7457f8 default
parent child Browse files
Show More
@@ -1,316 +1,316 b''
1 # uncommit - undo the actions of a commit
1 # uncommit - undo the actions of a commit
2 #
2 #
3 # Copyright 2011 Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
3 # Copyright 2011 Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
4 # Logilab SA <contact@logilab.fr>
4 # Logilab SA <contact@logilab.fr>
5 # Pierre-Yves David <pierre-yves.david@ens-lyon.org>
5 # Pierre-Yves David <pierre-yves.david@ens-lyon.org>
6 # Patrick Mezard <patrick@mezard.eu>
6 # Patrick Mezard <patrick@mezard.eu>
7 # Copyright 2016 Facebook, Inc.
7 # Copyright 2016 Facebook, Inc.
8 #
8 #
9 # This software may be used and distributed according to the terms of the
9 # This software may be used and distributed according to the terms of the
10 # GNU General Public License version 2 or any later version.
10 # GNU General Public License version 2 or any later version.
11
11
12 """uncommit part or all of a local changeset (EXPERIMENTAL)
12 """uncommit part or all of a local changeset (EXPERIMENTAL)
13
13
14 This command undoes the effect of a local commit, returning the affected
14 This command undoes the effect of a local commit, returning the affected
15 files to their uncommitted state. This means that files modified, added or
15 files to their uncommitted state. This means that files modified, added or
16 removed in the changeset will be left unchanged, and so will remain modified,
16 removed in the changeset will be left unchanged, and so will remain modified,
17 added and removed in the working directory.
17 added and removed in the working directory.
18 """
18 """
19
19
20 from __future__ import absolute_import
20 from __future__ import absolute_import
21
21
22 from mercurial.i18n import _
22 from mercurial.i18n import _
23
23
24 from mercurial import (
24 from mercurial import (
25 cmdutil,
25 cmdutil,
26 commands,
26 commands,
27 context,
27 context,
28 copies as copiesmod,
28 copies as copiesmod,
29 error,
29 error,
30 obsutil,
30 obsutil,
31 pathutil,
31 pathutil,
32 pycompat,
32 pycompat,
33 registrar,
33 registrar,
34 rewriteutil,
34 rewriteutil,
35 scmutil,
35 scmutil,
36 )
36 )
37
37
38 cmdtable = {}
38 cmdtable = {}
39 command = registrar.command(cmdtable)
39 command = registrar.command(cmdtable)
40
40
41 configtable = {}
41 configtable = {}
42 configitem = registrar.configitem(configtable)
42 configitem = registrar.configitem(configtable)
43
43
44 configitem(
44 configitem(
45 b'experimental',
45 b'experimental',
46 b'uncommitondirtywdir',
46 b'uncommitondirtywdir',
47 default=False,
47 default=False,
48 )
48 )
49 configitem(
49 configitem(
50 b'experimental',
50 b'experimental',
51 b'uncommit.keep',
51 b'uncommit.keep',
52 default=False,
52 default=False,
53 )
53 )
54
54
55 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
55 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
56 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
56 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
57 # be specifying the version(s) of Mercurial they are tested with, or
57 # be specifying the version(s) of Mercurial they are tested with, or
58 # leave the attribute unspecified.
58 # leave the attribute unspecified.
59 testedwith = b'ships-with-hg-core'
59 testedwith = b'ships-with-hg-core'
60
60
61
61
62 def _commitfiltered(
62 def _commitfiltered(
63 repo, ctx, match, keepcommit, message=None, user=None, date=None
63 repo, ctx, match, keepcommit, message=None, user=None, date=None
64 ):
64 ):
65 """Recommit ctx with changed files not in match. Return the new
65 """Recommit ctx with changed files not in match. Return the new
66 node identifier, or None if nothing changed.
66 node identifier, or None if nothing changed.
67 """
67 """
68 base = ctx.p1()
68 base = ctx.p1()
69 # ctx
69 # ctx
70 initialfiles = set(ctx.files())
70 initialfiles = set(ctx.files())
71 exclude = {f for f in initialfiles if match(f)}
71 exclude = {f for f in initialfiles if match(f)}
72
72
73 # No files matched commit, so nothing excluded
73 # No files matched commit, so nothing excluded
74 if not exclude:
74 if not exclude:
75 return None
75 return None
76
76
77 # return the p1 so that we don't create an obsmarker later
77 # return the p1 so that we don't create an obsmarker later
78 if not keepcommit:
78 if not keepcommit:
79 return ctx.p1().node()
79 return ctx.p1().node()
80
80
81 files = initialfiles - exclude
81 files = initialfiles - exclude
82 # Filter copies
82 # Filter copies
83 copied = copiesmod.pathcopies(base, ctx)
83 copied = copiesmod.pathcopies(base, ctx)
84 copied = {
84 copied = {
85 dst: src for dst, src in pycompat.iteritems(copied) if dst in files
85 dst: src for dst, src in pycompat.iteritems(copied) if dst in files
86 }
86 }
87
87
88 def filectxfn(repo, memctx, path, contentctx=ctx, redirect=()):
88 def filectxfn(repo, memctx, path, contentctx=ctx, redirect=()):
89 if path not in contentctx:
89 if path not in contentctx:
90 return None
90 return None
91 fctx = contentctx[path]
91 fctx = contentctx[path]
92 mctx = context.memfilectx(
92 mctx = context.memfilectx(
93 repo,
93 repo,
94 memctx,
94 memctx,
95 fctx.path(),
95 fctx.path(),
96 fctx.data(),
96 fctx.data(),
97 fctx.islink(),
97 fctx.islink(),
98 fctx.isexec(),
98 fctx.isexec(),
99 copysource=copied.get(path),
99 copysource=copied.get(path),
100 )
100 )
101 return mctx
101 return mctx
102
102
103 if not files:
103 if not files:
104 repo.ui.status(_(b"note: keeping empty commit\n"))
104 repo.ui.status(_(b"note: keeping empty commit\n"))
105
105
106 if message is None:
106 if message is None:
107 message = ctx.description()
107 message = ctx.description()
108 if not user:
108 if not user:
109 user = ctx.user()
109 user = ctx.user()
110 if not date:
110 if not date:
111 date = ctx.date()
111 date = ctx.date()
112
112
113 new = context.memctx(
113 new = context.memctx(
114 repo,
114 repo,
115 parents=[base.node(), repo.nullid],
115 parents=[base.node(), repo.nullid],
116 text=message,
116 text=message,
117 files=files,
117 files=files,
118 filectxfn=filectxfn,
118 filectxfn=filectxfn,
119 user=user,
119 user=user,
120 date=date,
120 date=date,
121 extra=ctx.extra(),
121 extra=ctx.extra(),
122 )
122 )
123 return repo.commitctx(new)
123 return repo.commitctx(new)
124
124
125
125
126 @command(
126 @command(
127 b'uncommit',
127 b'uncommit',
128 [
128 [
129 (b'', b'keep', None, _(b'allow an empty commit after uncommitting')),
129 (b'', b'keep', None, _(b'allow an empty commit after uncommitting')),
130 (
130 (
131 b'',
131 b'',
132 b'allow-dirty-working-copy',
132 b'allow-dirty-working-copy',
133 False,
133 False,
134 _(b'allow uncommit with outstanding changes'),
134 _(b'allow uncommit with outstanding changes'),
135 ),
135 ),
136 (b'n', b'note', b'', _(b'store a note on uncommit'), _(b'TEXT')),
136 (b'n', b'note', b'', _(b'store a note on uncommit'), _(b'TEXT')),
137 ]
137 ]
138 + commands.walkopts
138 + commands.walkopts
139 + commands.commitopts
139 + commands.commitopts
140 + commands.commitopts2
140 + commands.commitopts2
141 + commands.commitopts3,
141 + commands.commitopts3,
142 _(b'[OPTION]... [FILE]...'),
142 _(b'[OPTION]... [FILE]...'),
143 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
143 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
144 )
144 )
145 def uncommit(ui, repo, *pats, **opts):
145 def uncommit(ui, repo, *pats, **opts):
146 """uncommit part or all of a local changeset
146 """uncommit part or all of a local changeset
147
147
148 This command undoes the effect of a local commit, returning the affected
148 This command undoes the effect of a local commit, returning the affected
149 files to their uncommitted state. This means that files modified or
149 files to their uncommitted state. This means that files modified or
150 deleted in the changeset will be left unchanged, and so will remain
150 deleted in the changeset will be left unchanged, and so will remain
151 modified in the working directory.
151 modified in the working directory.
152
152
153 If no files are specified, the commit will be pruned, unless --keep is
153 If no files are specified, the commit will be pruned, unless --keep is
154 given.
154 given.
155 """
155 """
156 cmdutil.check_note_size(opts)
156 cmdutil.check_note_size(opts)
157 cmdutil.resolve_commit_options(ui, opts)
157 opts = pycompat.byteskwargs(opts)
158 opts = pycompat.byteskwargs(opts)
158 cmdutil.resolvecommitoptions(ui, opts)
159
159
160 with repo.wlock(), repo.lock():
160 with repo.wlock(), repo.lock():
161
161
162 st = repo.status()
162 st = repo.status()
163 m, a, r, d = st.modified, st.added, st.removed, st.deleted
163 m, a, r, d = st.modified, st.added, st.removed, st.deleted
164 isdirtypath = any(set(m + a + r + d) & set(pats))
164 isdirtypath = any(set(m + a + r + d) & set(pats))
165 allowdirtywcopy = opts[
165 allowdirtywcopy = opts[
166 b'allow_dirty_working_copy'
166 b'allow_dirty_working_copy'
167 ] or repo.ui.configbool(b'experimental', b'uncommitondirtywdir')
167 ] or repo.ui.configbool(b'experimental', b'uncommitondirtywdir')
168 if not allowdirtywcopy and (not pats or isdirtypath):
168 if not allowdirtywcopy and (not pats or isdirtypath):
169 cmdutil.bailifchanged(
169 cmdutil.bailifchanged(
170 repo,
170 repo,
171 hint=_(b'requires --allow-dirty-working-copy to uncommit'),
171 hint=_(b'requires --allow-dirty-working-copy to uncommit'),
172 )
172 )
173 old = repo[b'.']
173 old = repo[b'.']
174 rewriteutil.precheck(repo, [old.rev()], b'uncommit')
174 rewriteutil.precheck(repo, [old.rev()], b'uncommit')
175 if len(old.parents()) > 1:
175 if len(old.parents()) > 1:
176 raise error.InputError(_(b"cannot uncommit merge changeset"))
176 raise error.InputError(_(b"cannot uncommit merge changeset"))
177
177
178 match = scmutil.match(old, pats, opts)
178 match = scmutil.match(old, pats, opts)
179
179
180 # Check all explicitly given files; abort if there's a problem.
180 # Check all explicitly given files; abort if there's a problem.
181 if match.files():
181 if match.files():
182 s = old.status(old.p1(), match, listclean=True)
182 s = old.status(old.p1(), match, listclean=True)
183 eligible = set(s.added) | set(s.modified) | set(s.removed)
183 eligible = set(s.added) | set(s.modified) | set(s.removed)
184
184
185 badfiles = set(match.files()) - eligible
185 badfiles = set(match.files()) - eligible
186
186
187 # Naming a parent directory of an eligible file is OK, even
187 # Naming a parent directory of an eligible file is OK, even
188 # if not everything tracked in that directory can be
188 # if not everything tracked in that directory can be
189 # uncommitted.
189 # uncommitted.
190 if badfiles:
190 if badfiles:
191 badfiles -= {f for f in pathutil.dirs(eligible)}
191 badfiles -= {f for f in pathutil.dirs(eligible)}
192
192
193 for f in sorted(badfiles):
193 for f in sorted(badfiles):
194 if f in s.clean:
194 if f in s.clean:
195 hint = _(
195 hint = _(
196 b"file was not changed in working directory parent"
196 b"file was not changed in working directory parent"
197 )
197 )
198 elif repo.wvfs.exists(f):
198 elif repo.wvfs.exists(f):
199 hint = _(b"file was untracked in working directory parent")
199 hint = _(b"file was untracked in working directory parent")
200 else:
200 else:
201 hint = _(b"file does not exist")
201 hint = _(b"file does not exist")
202
202
203 raise error.InputError(
203 raise error.InputError(
204 _(b'cannot uncommit "%s"') % scmutil.getuipathfn(repo)(f),
204 _(b'cannot uncommit "%s"') % scmutil.getuipathfn(repo)(f),
205 hint=hint,
205 hint=hint,
206 )
206 )
207
207
208 with repo.transaction(b'uncommit'):
208 with repo.transaction(b'uncommit'):
209 if not (opts[b'message'] or opts[b'logfile']):
209 if not (opts[b'message'] or opts[b'logfile']):
210 opts[b'message'] = old.description()
210 opts[b'message'] = old.description()
211 message = cmdutil.logmessage(ui, opts)
211 message = cmdutil.logmessage(ui, opts)
212
212
213 keepcommit = pats
213 keepcommit = pats
214 if not keepcommit:
214 if not keepcommit:
215 if opts.get(b'keep') is not None:
215 if opts.get(b'keep') is not None:
216 keepcommit = opts.get(b'keep')
216 keepcommit = opts.get(b'keep')
217 else:
217 else:
218 keepcommit = ui.configbool(
218 keepcommit = ui.configbool(
219 b'experimental', b'uncommit.keep'
219 b'experimental', b'uncommit.keep'
220 )
220 )
221 newid = _commitfiltered(
221 newid = _commitfiltered(
222 repo,
222 repo,
223 old,
223 old,
224 match,
224 match,
225 keepcommit,
225 keepcommit,
226 message=message,
226 message=message,
227 user=opts.get(b'user'),
227 user=opts.get(b'user'),
228 date=opts.get(b'date'),
228 date=opts.get(b'date'),
229 )
229 )
230 if newid is None:
230 if newid is None:
231 ui.status(_(b"nothing to uncommit\n"))
231 ui.status(_(b"nothing to uncommit\n"))
232 return 1
232 return 1
233
233
234 mapping = {}
234 mapping = {}
235 if newid != old.p1().node():
235 if newid != old.p1().node():
236 # Move local changes on filtered changeset
236 # Move local changes on filtered changeset
237 mapping[old.node()] = (newid,)
237 mapping[old.node()] = (newid,)
238 else:
238 else:
239 # Fully removed the old commit
239 # Fully removed the old commit
240 mapping[old.node()] = ()
240 mapping[old.node()] = ()
241
241
242 with repo.dirstate.parentchange():
242 with repo.dirstate.parentchange():
243 scmutil.movedirstate(repo, repo[newid], match)
243 scmutil.movedirstate(repo, repo[newid], match)
244
244
245 scmutil.cleanupnodes(repo, mapping, b'uncommit', fixphase=True)
245 scmutil.cleanupnodes(repo, mapping, b'uncommit', fixphase=True)
246
246
247
247
248 def predecessormarkers(ctx):
248 def predecessormarkers(ctx):
249 """yields the obsolete markers marking the given changeset as a successor"""
249 """yields the obsolete markers marking the given changeset as a successor"""
250 for data in ctx.repo().obsstore.predecessors.get(ctx.node(), ()):
250 for data in ctx.repo().obsstore.predecessors.get(ctx.node(), ()):
251 yield obsutil.marker(ctx.repo(), data)
251 yield obsutil.marker(ctx.repo(), data)
252
252
253
253
254 @command(
254 @command(
255 b'unamend',
255 b'unamend',
256 [],
256 [],
257 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
257 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
258 helpbasic=True,
258 helpbasic=True,
259 )
259 )
260 def unamend(ui, repo, **opts):
260 def unamend(ui, repo, **opts):
261 """undo the most recent amend operation on a current changeset
261 """undo the most recent amend operation on a current changeset
262
262
263 This command will roll back to the previous version of a changeset,
263 This command will roll back to the previous version of a changeset,
264 leaving working directory in state in which it was before running
264 leaving working directory in state in which it was before running
265 `hg amend` (e.g. files modified as part of an amend will be
265 `hg amend` (e.g. files modified as part of an amend will be
266 marked as modified `hg status`)
266 marked as modified `hg status`)
267 """
267 """
268
268
269 unfi = repo.unfiltered()
269 unfi = repo.unfiltered()
270 with repo.wlock(), repo.lock(), repo.transaction(b'unamend'):
270 with repo.wlock(), repo.lock(), repo.transaction(b'unamend'):
271
271
272 # identify the commit from which to unamend
272 # identify the commit from which to unamend
273 curctx = repo[b'.']
273 curctx = repo[b'.']
274
274
275 rewriteutil.precheck(repo, [curctx.rev()], b'unamend')
275 rewriteutil.precheck(repo, [curctx.rev()], b'unamend')
276
276
277 # identify the commit to which to unamend
277 # identify the commit to which to unamend
278 markers = list(predecessormarkers(curctx))
278 markers = list(predecessormarkers(curctx))
279 if len(markers) != 1:
279 if len(markers) != 1:
280 e = _(b"changeset must have one predecessor, found %i predecessors")
280 e = _(b"changeset must have one predecessor, found %i predecessors")
281 raise error.InputError(e % len(markers))
281 raise error.InputError(e % len(markers))
282
282
283 prednode = markers[0].prednode()
283 prednode = markers[0].prednode()
284 predctx = unfi[prednode]
284 predctx = unfi[prednode]
285
285
286 # add an extra so that we get a new hash
286 # add an extra so that we get a new hash
287 # note: allowing unamend to undo an unamend is an intentional feature
287 # note: allowing unamend to undo an unamend is an intentional feature
288 extras = predctx.extra()
288 extras = predctx.extra()
289 extras[b'unamend_source'] = curctx.hex()
289 extras[b'unamend_source'] = curctx.hex()
290
290
291 def filectxfn(repo, ctx_, path):
291 def filectxfn(repo, ctx_, path):
292 try:
292 try:
293 return predctx.filectx(path)
293 return predctx.filectx(path)
294 except KeyError:
294 except KeyError:
295 return None
295 return None
296
296
297 # Make a new commit same as predctx
297 # Make a new commit same as predctx
298 newctx = context.memctx(
298 newctx = context.memctx(
299 repo,
299 repo,
300 parents=(predctx.p1(), predctx.p2()),
300 parents=(predctx.p1(), predctx.p2()),
301 text=predctx.description(),
301 text=predctx.description(),
302 files=predctx.files(),
302 files=predctx.files(),
303 filectxfn=filectxfn,
303 filectxfn=filectxfn,
304 user=predctx.user(),
304 user=predctx.user(),
305 date=predctx.date(),
305 date=predctx.date(),
306 extra=extras,
306 extra=extras,
307 )
307 )
308 newprednode = repo.commitctx(newctx)
308 newprednode = repo.commitctx(newctx)
309 newpredctx = repo[newprednode]
309 newpredctx = repo[newprednode]
310 dirstate = repo.dirstate
310 dirstate = repo.dirstate
311
311
312 with dirstate.parentchange():
312 with dirstate.parentchange():
313 scmutil.movedirstate(repo, newpredctx)
313 scmutil.movedirstate(repo, newpredctx)
314
314
315 mapping = {curctx.node(): (newprednode,)}
315 mapping = {curctx.node(): (newprednode,)}
316 scmutil.cleanupnodes(repo, mapping, b'unamend', fixphase=True)
316 scmutil.cleanupnodes(repo, mapping, b'unamend', fixphase=True)
@@ -1,3932 +1,3932 b''
1 # cmdutil.py - help for command processing in mercurial
1 # cmdutil.py - help for command processing in mercurial
2 #
2 #
3 # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
3 # Copyright 2005-2007 Olivia Mackall <olivia@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 copy as copymod
10 import copy as copymod
11 import errno
11 import errno
12 import os
12 import os
13 import re
13 import re
14
14
15 from .i18n import _
15 from .i18n import _
16 from .node import (
16 from .node import (
17 hex,
17 hex,
18 nullrev,
18 nullrev,
19 short,
19 short,
20 )
20 )
21 from .pycompat import (
21 from .pycompat import (
22 getattr,
22 getattr,
23 open,
23 open,
24 setattr,
24 setattr,
25 )
25 )
26 from .thirdparty import attr
26 from .thirdparty import attr
27
27
28 from . import (
28 from . import (
29 bookmarks,
29 bookmarks,
30 changelog,
30 changelog,
31 copies,
31 copies,
32 crecord as crecordmod,
32 crecord as crecordmod,
33 dirstateguard,
33 dirstateguard,
34 encoding,
34 encoding,
35 error,
35 error,
36 formatter,
36 formatter,
37 logcmdutil,
37 logcmdutil,
38 match as matchmod,
38 match as matchmod,
39 merge as mergemod,
39 merge as mergemod,
40 mergestate as mergestatemod,
40 mergestate as mergestatemod,
41 mergeutil,
41 mergeutil,
42 obsolete,
42 obsolete,
43 patch,
43 patch,
44 pathutil,
44 pathutil,
45 phases,
45 phases,
46 pycompat,
46 pycompat,
47 repair,
47 repair,
48 revlog,
48 revlog,
49 rewriteutil,
49 rewriteutil,
50 scmutil,
50 scmutil,
51 state as statemod,
51 state as statemod,
52 subrepoutil,
52 subrepoutil,
53 templatekw,
53 templatekw,
54 templater,
54 templater,
55 util,
55 util,
56 vfs as vfsmod,
56 vfs as vfsmod,
57 )
57 )
58
58
59 from .utils import (
59 from .utils import (
60 dateutil,
60 dateutil,
61 stringutil,
61 stringutil,
62 )
62 )
63
63
64 from .revlogutils import (
64 from .revlogutils import (
65 constants as revlog_constants,
65 constants as revlog_constants,
66 )
66 )
67
67
68 if pycompat.TYPE_CHECKING:
68 if pycompat.TYPE_CHECKING:
69 from typing import (
69 from typing import (
70 Any,
70 Any,
71 Dict,
71 Dict,
72 )
72 )
73
73
74 for t in (Any, Dict):
74 for t in (Any, Dict):
75 assert t
75 assert t
76
76
77 stringio = util.stringio
77 stringio = util.stringio
78
78
79 # templates of common command options
79 # templates of common command options
80
80
81 dryrunopts = [
81 dryrunopts = [
82 (b'n', b'dry-run', None, _(b'do not perform actions, just print output')),
82 (b'n', b'dry-run', None, _(b'do not perform actions, just print output')),
83 ]
83 ]
84
84
85 confirmopts = [
85 confirmopts = [
86 (b'', b'confirm', None, _(b'ask before applying actions')),
86 (b'', b'confirm', None, _(b'ask before applying actions')),
87 ]
87 ]
88
88
89 remoteopts = [
89 remoteopts = [
90 (b'e', b'ssh', b'', _(b'specify ssh command to use'), _(b'CMD')),
90 (b'e', b'ssh', b'', _(b'specify ssh command to use'), _(b'CMD')),
91 (
91 (
92 b'',
92 b'',
93 b'remotecmd',
93 b'remotecmd',
94 b'',
94 b'',
95 _(b'specify hg command to run on the remote side'),
95 _(b'specify hg command to run on the remote side'),
96 _(b'CMD'),
96 _(b'CMD'),
97 ),
97 ),
98 (
98 (
99 b'',
99 b'',
100 b'insecure',
100 b'insecure',
101 None,
101 None,
102 _(b'do not verify server certificate (ignoring web.cacerts config)'),
102 _(b'do not verify server certificate (ignoring web.cacerts config)'),
103 ),
103 ),
104 ]
104 ]
105
105
106 walkopts = [
106 walkopts = [
107 (
107 (
108 b'I',
108 b'I',
109 b'include',
109 b'include',
110 [],
110 [],
111 _(b'include names matching the given patterns'),
111 _(b'include names matching the given patterns'),
112 _(b'PATTERN'),
112 _(b'PATTERN'),
113 ),
113 ),
114 (
114 (
115 b'X',
115 b'X',
116 b'exclude',
116 b'exclude',
117 [],
117 [],
118 _(b'exclude names matching the given patterns'),
118 _(b'exclude names matching the given patterns'),
119 _(b'PATTERN'),
119 _(b'PATTERN'),
120 ),
120 ),
121 ]
121 ]
122
122
123 commitopts = [
123 commitopts = [
124 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
124 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
125 (b'l', b'logfile', b'', _(b'read commit message from file'), _(b'FILE')),
125 (b'l', b'logfile', b'', _(b'read commit message from file'), _(b'FILE')),
126 ]
126 ]
127
127
128 commitopts2 = [
128 commitopts2 = [
129 (
129 (
130 b'd',
130 b'd',
131 b'date',
131 b'date',
132 b'',
132 b'',
133 _(b'record the specified date as commit date'),
133 _(b'record the specified date as commit date'),
134 _(b'DATE'),
134 _(b'DATE'),
135 ),
135 ),
136 (
136 (
137 b'u',
137 b'u',
138 b'user',
138 b'user',
139 b'',
139 b'',
140 _(b'record the specified user as committer'),
140 _(b'record the specified user as committer'),
141 _(b'USER'),
141 _(b'USER'),
142 ),
142 ),
143 ]
143 ]
144
144
145 commitopts3 = [
145 commitopts3 = [
146 (b'D', b'currentdate', None, _(b'record the current date as commit date')),
146 (b'D', b'currentdate', None, _(b'record the current date as commit date')),
147 (b'U', b'currentuser', None, _(b'record the current user as committer')),
147 (b'U', b'currentuser', None, _(b'record the current user as committer')),
148 ]
148 ]
149
149
150 formatteropts = [
150 formatteropts = [
151 (b'T', b'template', b'', _(b'display with template'), _(b'TEMPLATE')),
151 (b'T', b'template', b'', _(b'display with template'), _(b'TEMPLATE')),
152 ]
152 ]
153
153
154 templateopts = [
154 templateopts = [
155 (
155 (
156 b'',
156 b'',
157 b'style',
157 b'style',
158 b'',
158 b'',
159 _(b'display using template map file (DEPRECATED)'),
159 _(b'display using template map file (DEPRECATED)'),
160 _(b'STYLE'),
160 _(b'STYLE'),
161 ),
161 ),
162 (b'T', b'template', b'', _(b'display with template'), _(b'TEMPLATE')),
162 (b'T', b'template', b'', _(b'display with template'), _(b'TEMPLATE')),
163 ]
163 ]
164
164
165 logopts = [
165 logopts = [
166 (b'p', b'patch', None, _(b'show patch')),
166 (b'p', b'patch', None, _(b'show patch')),
167 (b'g', b'git', None, _(b'use git extended diff format')),
167 (b'g', b'git', None, _(b'use git extended diff format')),
168 (b'l', b'limit', b'', _(b'limit number of changes displayed'), _(b'NUM')),
168 (b'l', b'limit', b'', _(b'limit number of changes displayed'), _(b'NUM')),
169 (b'M', b'no-merges', None, _(b'do not show merges')),
169 (b'M', b'no-merges', None, _(b'do not show merges')),
170 (b'', b'stat', None, _(b'output diffstat-style summary of changes')),
170 (b'', b'stat', None, _(b'output diffstat-style summary of changes')),
171 (b'G', b'graph', None, _(b"show the revision DAG")),
171 (b'G', b'graph', None, _(b"show the revision DAG")),
172 ] + templateopts
172 ] + templateopts
173
173
174 diffopts = [
174 diffopts = [
175 (b'a', b'text', None, _(b'treat all files as text')),
175 (b'a', b'text', None, _(b'treat all files as text')),
176 (
176 (
177 b'g',
177 b'g',
178 b'git',
178 b'git',
179 None,
179 None,
180 _(b'use git extended diff format (DEFAULT: diff.git)'),
180 _(b'use git extended diff format (DEFAULT: diff.git)'),
181 ),
181 ),
182 (b'', b'binary', None, _(b'generate binary diffs in git mode (default)')),
182 (b'', b'binary', None, _(b'generate binary diffs in git mode (default)')),
183 (b'', b'nodates', None, _(b'omit dates from diff headers')),
183 (b'', b'nodates', None, _(b'omit dates from diff headers')),
184 ]
184 ]
185
185
186 diffwsopts = [
186 diffwsopts = [
187 (
187 (
188 b'w',
188 b'w',
189 b'ignore-all-space',
189 b'ignore-all-space',
190 None,
190 None,
191 _(b'ignore white space when comparing lines'),
191 _(b'ignore white space when comparing lines'),
192 ),
192 ),
193 (
193 (
194 b'b',
194 b'b',
195 b'ignore-space-change',
195 b'ignore-space-change',
196 None,
196 None,
197 _(b'ignore changes in the amount of white space'),
197 _(b'ignore changes in the amount of white space'),
198 ),
198 ),
199 (
199 (
200 b'B',
200 b'B',
201 b'ignore-blank-lines',
201 b'ignore-blank-lines',
202 None,
202 None,
203 _(b'ignore changes whose lines are all blank'),
203 _(b'ignore changes whose lines are all blank'),
204 ),
204 ),
205 (
205 (
206 b'Z',
206 b'Z',
207 b'ignore-space-at-eol',
207 b'ignore-space-at-eol',
208 None,
208 None,
209 _(b'ignore changes in whitespace at EOL'),
209 _(b'ignore changes in whitespace at EOL'),
210 ),
210 ),
211 ]
211 ]
212
212
213 diffopts2 = (
213 diffopts2 = (
214 [
214 [
215 (b'', b'noprefix', None, _(b'omit a/ and b/ prefixes from filenames')),
215 (b'', b'noprefix', None, _(b'omit a/ and b/ prefixes from filenames')),
216 (
216 (
217 b'p',
217 b'p',
218 b'show-function',
218 b'show-function',
219 None,
219 None,
220 _(
220 _(
221 b'show which function each change is in (DEFAULT: diff.showfunc)'
221 b'show which function each change is in (DEFAULT: diff.showfunc)'
222 ),
222 ),
223 ),
223 ),
224 (b'', b'reverse', None, _(b'produce a diff that undoes the changes')),
224 (b'', b'reverse', None, _(b'produce a diff that undoes the changes')),
225 ]
225 ]
226 + diffwsopts
226 + diffwsopts
227 + [
227 + [
228 (
228 (
229 b'U',
229 b'U',
230 b'unified',
230 b'unified',
231 b'',
231 b'',
232 _(b'number of lines of context to show'),
232 _(b'number of lines of context to show'),
233 _(b'NUM'),
233 _(b'NUM'),
234 ),
234 ),
235 (b'', b'stat', None, _(b'output diffstat-style summary of changes')),
235 (b'', b'stat', None, _(b'output diffstat-style summary of changes')),
236 (
236 (
237 b'',
237 b'',
238 b'root',
238 b'root',
239 b'',
239 b'',
240 _(b'produce diffs relative to subdirectory'),
240 _(b'produce diffs relative to subdirectory'),
241 _(b'DIR'),
241 _(b'DIR'),
242 ),
242 ),
243 ]
243 ]
244 )
244 )
245
245
246 mergetoolopts = [
246 mergetoolopts = [
247 (b't', b'tool', b'', _(b'specify merge tool'), _(b'TOOL')),
247 (b't', b'tool', b'', _(b'specify merge tool'), _(b'TOOL')),
248 ]
248 ]
249
249
250 similarityopts = [
250 similarityopts = [
251 (
251 (
252 b's',
252 b's',
253 b'similarity',
253 b'similarity',
254 b'',
254 b'',
255 _(b'guess renamed files by similarity (0<=s<=100)'),
255 _(b'guess renamed files by similarity (0<=s<=100)'),
256 _(b'SIMILARITY'),
256 _(b'SIMILARITY'),
257 )
257 )
258 ]
258 ]
259
259
260 subrepoopts = [(b'S', b'subrepos', None, _(b'recurse into subrepositories'))]
260 subrepoopts = [(b'S', b'subrepos', None, _(b'recurse into subrepositories'))]
261
261
262 debugrevlogopts = [
262 debugrevlogopts = [
263 (b'c', b'changelog', False, _(b'open changelog')),
263 (b'c', b'changelog', False, _(b'open changelog')),
264 (b'm', b'manifest', False, _(b'open manifest')),
264 (b'm', b'manifest', False, _(b'open manifest')),
265 (b'', b'dir', b'', _(b'open directory manifest')),
265 (b'', b'dir', b'', _(b'open directory manifest')),
266 ]
266 ]
267
267
268 # special string such that everything below this line will be ingored in the
268 # special string such that everything below this line will be ingored in the
269 # editor text
269 # editor text
270 _linebelow = b"^HG: ------------------------ >8 ------------------------$"
270 _linebelow = b"^HG: ------------------------ >8 ------------------------$"
271
271
272
272
273 def check_at_most_one_arg(opts, *args):
273 def check_at_most_one_arg(opts, *args):
274 """abort if more than one of the arguments are in opts
274 """abort if more than one of the arguments are in opts
275
275
276 Returns the unique argument or None if none of them were specified.
276 Returns the unique argument or None if none of them were specified.
277 """
277 """
278
278
279 def to_display(name):
279 def to_display(name):
280 return pycompat.sysbytes(name).replace(b'_', b'-')
280 return pycompat.sysbytes(name).replace(b'_', b'-')
281
281
282 previous = None
282 previous = None
283 for x in args:
283 for x in args:
284 if opts.get(x):
284 if opts.get(x):
285 if previous:
285 if previous:
286 raise error.InputError(
286 raise error.InputError(
287 _(b'cannot specify both --%s and --%s')
287 _(b'cannot specify both --%s and --%s')
288 % (to_display(previous), to_display(x))
288 % (to_display(previous), to_display(x))
289 )
289 )
290 previous = x
290 previous = x
291 return previous
291 return previous
292
292
293
293
294 def check_incompatible_arguments(opts, first, others):
294 def check_incompatible_arguments(opts, first, others):
295 """abort if the first argument is given along with any of the others
295 """abort if the first argument is given along with any of the others
296
296
297 Unlike check_at_most_one_arg(), `others` are not mutually exclusive
297 Unlike check_at_most_one_arg(), `others` are not mutually exclusive
298 among themselves, and they're passed as a single collection.
298 among themselves, and they're passed as a single collection.
299 """
299 """
300 for other in others:
300 for other in others:
301 check_at_most_one_arg(opts, first, other)
301 check_at_most_one_arg(opts, first, other)
302
302
303
303
304 def resolvecommitoptions(ui, opts):
304 def resolve_commit_options(ui, opts):
305 """modify commit options dict to handle related options
305 """modify commit options dict to handle related options
306
306
307 The return value indicates that ``rewrite.update-timestamp`` is the reason
307 The return value indicates that ``rewrite.update-timestamp`` is the reason
308 the ``date`` option is set.
308 the ``date`` option is set.
309 """
309 """
310 check_at_most_one_arg(opts, b'date', b'currentdate')
310 check_at_most_one_arg(opts, 'date', 'currentdate')
311 check_at_most_one_arg(opts, b'user', b'currentuser')
311 check_at_most_one_arg(opts, 'user', 'currentuser')
312
312
313 datemaydiffer = False # date-only change should be ignored?
313 datemaydiffer = False # date-only change should be ignored?
314
314
315 if opts.get(b'currentdate'):
315 if opts.get('currentdate'):
316 opts[b'date'] = b'%d %d' % dateutil.makedate()
316 opts['date'] = b'%d %d' % dateutil.makedate()
317 elif (
317 elif (
318 not opts.get(b'date')
318 not opts.get('date')
319 and ui.configbool(b'rewrite', b'update-timestamp')
319 and ui.configbool(b'rewrite', b'update-timestamp')
320 and opts.get(b'currentdate') is None
320 and opts.get('currentdate') is None
321 ):
321 ):
322 opts[b'date'] = b'%d %d' % dateutil.makedate()
322 opts['date'] = b'%d %d' % dateutil.makedate()
323 datemaydiffer = True
323 datemaydiffer = True
324
324
325 if opts.get(b'currentuser'):
325 if opts.get('currentuser'):
326 opts[b'user'] = ui.username()
326 opts['user'] = ui.username()
327
327
328 return datemaydiffer
328 return datemaydiffer
329
329
330
330
331 def check_note_size(opts):
331 def check_note_size(opts):
332 """make sure note is of valid format"""
332 """make sure note is of valid format"""
333
333
334 note = opts.get('note')
334 note = opts.get('note')
335 if not note:
335 if not note:
336 return
336 return
337
337
338 if len(note) > 255:
338 if len(note) > 255:
339 raise error.InputError(_(b"cannot store a note of more than 255 bytes"))
339 raise error.InputError(_(b"cannot store a note of more than 255 bytes"))
340 if b'\n' in note:
340 if b'\n' in note:
341 raise error.InputError(_(b"note cannot contain a newline"))
341 raise error.InputError(_(b"note cannot contain a newline"))
342
342
343
343
344 def ishunk(x):
344 def ishunk(x):
345 hunkclasses = (crecordmod.uihunk, patch.recordhunk)
345 hunkclasses = (crecordmod.uihunk, patch.recordhunk)
346 return isinstance(x, hunkclasses)
346 return isinstance(x, hunkclasses)
347
347
348
348
349 def newandmodified(chunks, originalchunks):
349 def newandmodified(chunks, originalchunks):
350 newlyaddedandmodifiedfiles = set()
350 newlyaddedandmodifiedfiles = set()
351 alsorestore = set()
351 alsorestore = set()
352 for chunk in chunks:
352 for chunk in chunks:
353 if (
353 if (
354 ishunk(chunk)
354 ishunk(chunk)
355 and chunk.header.isnewfile()
355 and chunk.header.isnewfile()
356 and chunk not in originalchunks
356 and chunk not in originalchunks
357 ):
357 ):
358 newlyaddedandmodifiedfiles.add(chunk.header.filename())
358 newlyaddedandmodifiedfiles.add(chunk.header.filename())
359 alsorestore.update(
359 alsorestore.update(
360 set(chunk.header.files()) - {chunk.header.filename()}
360 set(chunk.header.files()) - {chunk.header.filename()}
361 )
361 )
362 return newlyaddedandmodifiedfiles, alsorestore
362 return newlyaddedandmodifiedfiles, alsorestore
363
363
364
364
365 def parsealiases(cmd):
365 def parsealiases(cmd):
366 base_aliases = cmd.split(b"|")
366 base_aliases = cmd.split(b"|")
367 all_aliases = set(base_aliases)
367 all_aliases = set(base_aliases)
368 extra_aliases = []
368 extra_aliases = []
369 for alias in base_aliases:
369 for alias in base_aliases:
370 if b'-' in alias:
370 if b'-' in alias:
371 folded_alias = alias.replace(b'-', b'')
371 folded_alias = alias.replace(b'-', b'')
372 if folded_alias not in all_aliases:
372 if folded_alias not in all_aliases:
373 all_aliases.add(folded_alias)
373 all_aliases.add(folded_alias)
374 extra_aliases.append(folded_alias)
374 extra_aliases.append(folded_alias)
375 base_aliases.extend(extra_aliases)
375 base_aliases.extend(extra_aliases)
376 return base_aliases
376 return base_aliases
377
377
378
378
379 def setupwrapcolorwrite(ui):
379 def setupwrapcolorwrite(ui):
380 # wrap ui.write so diff output can be labeled/colorized
380 # wrap ui.write so diff output can be labeled/colorized
381 def wrapwrite(orig, *args, **kw):
381 def wrapwrite(orig, *args, **kw):
382 label = kw.pop('label', b'')
382 label = kw.pop('label', b'')
383 for chunk, l in patch.difflabel(lambda: args):
383 for chunk, l in patch.difflabel(lambda: args):
384 orig(chunk, label=label + l)
384 orig(chunk, label=label + l)
385
385
386 oldwrite = ui.write
386 oldwrite = ui.write
387
387
388 def wrap(*args, **kwargs):
388 def wrap(*args, **kwargs):
389 return wrapwrite(oldwrite, *args, **kwargs)
389 return wrapwrite(oldwrite, *args, **kwargs)
390
390
391 setattr(ui, 'write', wrap)
391 setattr(ui, 'write', wrap)
392 return oldwrite
392 return oldwrite
393
393
394
394
395 def filterchunks(ui, originalhunks, usecurses, testfile, match, operation=None):
395 def filterchunks(ui, originalhunks, usecurses, testfile, match, operation=None):
396 try:
396 try:
397 if usecurses:
397 if usecurses:
398 if testfile:
398 if testfile:
399 recordfn = crecordmod.testdecorator(
399 recordfn = crecordmod.testdecorator(
400 testfile, crecordmod.testchunkselector
400 testfile, crecordmod.testchunkselector
401 )
401 )
402 else:
402 else:
403 recordfn = crecordmod.chunkselector
403 recordfn = crecordmod.chunkselector
404
404
405 return crecordmod.filterpatch(
405 return crecordmod.filterpatch(
406 ui, originalhunks, recordfn, operation
406 ui, originalhunks, recordfn, operation
407 )
407 )
408 except crecordmod.fallbackerror as e:
408 except crecordmod.fallbackerror as e:
409 ui.warn(b'%s\n' % e)
409 ui.warn(b'%s\n' % e)
410 ui.warn(_(b'falling back to text mode\n'))
410 ui.warn(_(b'falling back to text mode\n'))
411
411
412 return patch.filterpatch(ui, originalhunks, match, operation)
412 return patch.filterpatch(ui, originalhunks, match, operation)
413
413
414
414
415 def recordfilter(ui, originalhunks, match, operation=None):
415 def recordfilter(ui, originalhunks, match, operation=None):
416 """Prompts the user to filter the originalhunks and return a list of
416 """Prompts the user to filter the originalhunks and return a list of
417 selected hunks.
417 selected hunks.
418 *operation* is used for to build ui messages to indicate the user what
418 *operation* is used for to build ui messages to indicate the user what
419 kind of filtering they are doing: reverting, committing, shelving, etc.
419 kind of filtering they are doing: reverting, committing, shelving, etc.
420 (see patch.filterpatch).
420 (see patch.filterpatch).
421 """
421 """
422 usecurses = crecordmod.checkcurses(ui)
422 usecurses = crecordmod.checkcurses(ui)
423 testfile = ui.config(b'experimental', b'crecordtest')
423 testfile = ui.config(b'experimental', b'crecordtest')
424 oldwrite = setupwrapcolorwrite(ui)
424 oldwrite = setupwrapcolorwrite(ui)
425 try:
425 try:
426 newchunks, newopts = filterchunks(
426 newchunks, newopts = filterchunks(
427 ui, originalhunks, usecurses, testfile, match, operation
427 ui, originalhunks, usecurses, testfile, match, operation
428 )
428 )
429 finally:
429 finally:
430 ui.write = oldwrite
430 ui.write = oldwrite
431 return newchunks, newopts
431 return newchunks, newopts
432
432
433
433
434 def dorecord(
434 def dorecord(
435 ui, repo, commitfunc, cmdsuggest, backupall, filterfn, *pats, **opts
435 ui, repo, commitfunc, cmdsuggest, backupall, filterfn, *pats, **opts
436 ):
436 ):
437 opts = pycompat.byteskwargs(opts)
437 opts = pycompat.byteskwargs(opts)
438 if not ui.interactive():
438 if not ui.interactive():
439 if cmdsuggest:
439 if cmdsuggest:
440 msg = _(b'running non-interactively, use %s instead') % cmdsuggest
440 msg = _(b'running non-interactively, use %s instead') % cmdsuggest
441 else:
441 else:
442 msg = _(b'running non-interactively')
442 msg = _(b'running non-interactively')
443 raise error.InputError(msg)
443 raise error.InputError(msg)
444
444
445 # make sure username is set before going interactive
445 # make sure username is set before going interactive
446 if not opts.get(b'user'):
446 if not opts.get(b'user'):
447 ui.username() # raise exception, username not provided
447 ui.username() # raise exception, username not provided
448
448
449 def recordfunc(ui, repo, message, match, opts):
449 def recordfunc(ui, repo, message, match, opts):
450 """This is generic record driver.
450 """This is generic record driver.
451
451
452 Its job is to interactively filter local changes, and
452 Its job is to interactively filter local changes, and
453 accordingly prepare working directory into a state in which the
453 accordingly prepare working directory into a state in which the
454 job can be delegated to a non-interactive commit command such as
454 job can be delegated to a non-interactive commit command such as
455 'commit' or 'qrefresh'.
455 'commit' or 'qrefresh'.
456
456
457 After the actual job is done by non-interactive command, the
457 After the actual job is done by non-interactive command, the
458 working directory is restored to its original state.
458 working directory is restored to its original state.
459
459
460 In the end we'll record interesting changes, and everything else
460 In the end we'll record interesting changes, and everything else
461 will be left in place, so the user can continue working.
461 will be left in place, so the user can continue working.
462 """
462 """
463 if not opts.get(b'interactive-unshelve'):
463 if not opts.get(b'interactive-unshelve'):
464 checkunfinished(repo, commit=True)
464 checkunfinished(repo, commit=True)
465 wctx = repo[None]
465 wctx = repo[None]
466 merge = len(wctx.parents()) > 1
466 merge = len(wctx.parents()) > 1
467 if merge:
467 if merge:
468 raise error.InputError(
468 raise error.InputError(
469 _(
469 _(
470 b'cannot partially commit a merge '
470 b'cannot partially commit a merge '
471 b'(use "hg commit" instead)'
471 b'(use "hg commit" instead)'
472 )
472 )
473 )
473 )
474
474
475 def fail(f, msg):
475 def fail(f, msg):
476 raise error.InputError(b'%s: %s' % (f, msg))
476 raise error.InputError(b'%s: %s' % (f, msg))
477
477
478 force = opts.get(b'force')
478 force = opts.get(b'force')
479 if not force:
479 if not force:
480 match = matchmod.badmatch(match, fail)
480 match = matchmod.badmatch(match, fail)
481
481
482 status = repo.status(match=match)
482 status = repo.status(match=match)
483
483
484 overrides = {(b'ui', b'commitsubrepos'): True}
484 overrides = {(b'ui', b'commitsubrepos'): True}
485
485
486 with repo.ui.configoverride(overrides, b'record'):
486 with repo.ui.configoverride(overrides, b'record'):
487 # subrepoutil.precommit() modifies the status
487 # subrepoutil.precommit() modifies the status
488 tmpstatus = scmutil.status(
488 tmpstatus = scmutil.status(
489 copymod.copy(status.modified),
489 copymod.copy(status.modified),
490 copymod.copy(status.added),
490 copymod.copy(status.added),
491 copymod.copy(status.removed),
491 copymod.copy(status.removed),
492 copymod.copy(status.deleted),
492 copymod.copy(status.deleted),
493 copymod.copy(status.unknown),
493 copymod.copy(status.unknown),
494 copymod.copy(status.ignored),
494 copymod.copy(status.ignored),
495 copymod.copy(status.clean), # pytype: disable=wrong-arg-count
495 copymod.copy(status.clean), # pytype: disable=wrong-arg-count
496 )
496 )
497
497
498 # Force allows -X subrepo to skip the subrepo.
498 # Force allows -X subrepo to skip the subrepo.
499 subs, commitsubs, newstate = subrepoutil.precommit(
499 subs, commitsubs, newstate = subrepoutil.precommit(
500 repo.ui, wctx, tmpstatus, match, force=True
500 repo.ui, wctx, tmpstatus, match, force=True
501 )
501 )
502 for s in subs:
502 for s in subs:
503 if s in commitsubs:
503 if s in commitsubs:
504 dirtyreason = wctx.sub(s).dirtyreason(True)
504 dirtyreason = wctx.sub(s).dirtyreason(True)
505 raise error.Abort(dirtyreason)
505 raise error.Abort(dirtyreason)
506
506
507 if not force:
507 if not force:
508 repo.checkcommitpatterns(wctx, match, status, fail)
508 repo.checkcommitpatterns(wctx, match, status, fail)
509 diffopts = patch.difffeatureopts(
509 diffopts = patch.difffeatureopts(
510 ui,
510 ui,
511 opts=opts,
511 opts=opts,
512 whitespace=True,
512 whitespace=True,
513 section=b'commands',
513 section=b'commands',
514 configprefix=b'commit.interactive.',
514 configprefix=b'commit.interactive.',
515 )
515 )
516 diffopts.nodates = True
516 diffopts.nodates = True
517 diffopts.git = True
517 diffopts.git = True
518 diffopts.showfunc = True
518 diffopts.showfunc = True
519 originaldiff = patch.diff(repo, changes=status, opts=diffopts)
519 originaldiff = patch.diff(repo, changes=status, opts=diffopts)
520 originalchunks = patch.parsepatch(originaldiff)
520 originalchunks = patch.parsepatch(originaldiff)
521 match = scmutil.match(repo[None], pats)
521 match = scmutil.match(repo[None], pats)
522
522
523 # 1. filter patch, since we are intending to apply subset of it
523 # 1. filter patch, since we are intending to apply subset of it
524 try:
524 try:
525 chunks, newopts = filterfn(ui, originalchunks, match)
525 chunks, newopts = filterfn(ui, originalchunks, match)
526 except error.PatchError as err:
526 except error.PatchError as err:
527 raise error.InputError(_(b'error parsing patch: %s') % err)
527 raise error.InputError(_(b'error parsing patch: %s') % err)
528 opts.update(newopts)
528 opts.update(newopts)
529
529
530 # We need to keep a backup of files that have been newly added and
530 # We need to keep a backup of files that have been newly added and
531 # modified during the recording process because there is a previous
531 # modified during the recording process because there is a previous
532 # version without the edit in the workdir. We also will need to restore
532 # version without the edit in the workdir. We also will need to restore
533 # files that were the sources of renames so that the patch application
533 # files that were the sources of renames so that the patch application
534 # works.
534 # works.
535 newlyaddedandmodifiedfiles, alsorestore = newandmodified(
535 newlyaddedandmodifiedfiles, alsorestore = newandmodified(
536 chunks, originalchunks
536 chunks, originalchunks
537 )
537 )
538 contenders = set()
538 contenders = set()
539 for h in chunks:
539 for h in chunks:
540 try:
540 try:
541 contenders.update(set(h.files()))
541 contenders.update(set(h.files()))
542 except AttributeError:
542 except AttributeError:
543 pass
543 pass
544
544
545 changed = status.modified + status.added + status.removed
545 changed = status.modified + status.added + status.removed
546 newfiles = [f for f in changed if f in contenders]
546 newfiles = [f for f in changed if f in contenders]
547 if not newfiles:
547 if not newfiles:
548 ui.status(_(b'no changes to record\n'))
548 ui.status(_(b'no changes to record\n'))
549 return 0
549 return 0
550
550
551 modified = set(status.modified)
551 modified = set(status.modified)
552
552
553 # 2. backup changed files, so we can restore them in the end
553 # 2. backup changed files, so we can restore them in the end
554
554
555 if backupall:
555 if backupall:
556 tobackup = changed
556 tobackup = changed
557 else:
557 else:
558 tobackup = [
558 tobackup = [
559 f
559 f
560 for f in newfiles
560 for f in newfiles
561 if f in modified or f in newlyaddedandmodifiedfiles
561 if f in modified or f in newlyaddedandmodifiedfiles
562 ]
562 ]
563 backups = {}
563 backups = {}
564 if tobackup:
564 if tobackup:
565 backupdir = repo.vfs.join(b'record-backups')
565 backupdir = repo.vfs.join(b'record-backups')
566 try:
566 try:
567 os.mkdir(backupdir)
567 os.mkdir(backupdir)
568 except OSError as err:
568 except OSError as err:
569 if err.errno != errno.EEXIST:
569 if err.errno != errno.EEXIST:
570 raise
570 raise
571 try:
571 try:
572 # backup continues
572 # backup continues
573 for f in tobackup:
573 for f in tobackup:
574 fd, tmpname = pycompat.mkstemp(
574 fd, tmpname = pycompat.mkstemp(
575 prefix=os.path.basename(f) + b'.', dir=backupdir
575 prefix=os.path.basename(f) + b'.', dir=backupdir
576 )
576 )
577 os.close(fd)
577 os.close(fd)
578 ui.debug(b'backup %r as %r\n' % (f, tmpname))
578 ui.debug(b'backup %r as %r\n' % (f, tmpname))
579 util.copyfile(repo.wjoin(f), tmpname, copystat=True)
579 util.copyfile(repo.wjoin(f), tmpname, copystat=True)
580 backups[f] = tmpname
580 backups[f] = tmpname
581
581
582 fp = stringio()
582 fp = stringio()
583 for c in chunks:
583 for c in chunks:
584 fname = c.filename()
584 fname = c.filename()
585 if fname in backups:
585 if fname in backups:
586 c.write(fp)
586 c.write(fp)
587 dopatch = fp.tell()
587 dopatch = fp.tell()
588 fp.seek(0)
588 fp.seek(0)
589
589
590 # 2.5 optionally review / modify patch in text editor
590 # 2.5 optionally review / modify patch in text editor
591 if opts.get(b'review', False):
591 if opts.get(b'review', False):
592 patchtext = (
592 patchtext = (
593 crecordmod.diffhelptext
593 crecordmod.diffhelptext
594 + crecordmod.patchhelptext
594 + crecordmod.patchhelptext
595 + fp.read()
595 + fp.read()
596 )
596 )
597 reviewedpatch = ui.edit(
597 reviewedpatch = ui.edit(
598 patchtext, b"", action=b"diff", repopath=repo.path
598 patchtext, b"", action=b"diff", repopath=repo.path
599 )
599 )
600 fp.truncate(0)
600 fp.truncate(0)
601 fp.write(reviewedpatch)
601 fp.write(reviewedpatch)
602 fp.seek(0)
602 fp.seek(0)
603
603
604 [os.unlink(repo.wjoin(c)) for c in newlyaddedandmodifiedfiles]
604 [os.unlink(repo.wjoin(c)) for c in newlyaddedandmodifiedfiles]
605 # 3a. apply filtered patch to clean repo (clean)
605 # 3a. apply filtered patch to clean repo (clean)
606 if backups:
606 if backups:
607 m = scmutil.matchfiles(repo, set(backups.keys()) | alsorestore)
607 m = scmutil.matchfiles(repo, set(backups.keys()) | alsorestore)
608 mergemod.revert_to(repo[b'.'], matcher=m)
608 mergemod.revert_to(repo[b'.'], matcher=m)
609
609
610 # 3b. (apply)
610 # 3b. (apply)
611 if dopatch:
611 if dopatch:
612 try:
612 try:
613 ui.debug(b'applying patch\n')
613 ui.debug(b'applying patch\n')
614 ui.debug(fp.getvalue())
614 ui.debug(fp.getvalue())
615 patch.internalpatch(ui, repo, fp, 1, eolmode=None)
615 patch.internalpatch(ui, repo, fp, 1, eolmode=None)
616 except error.PatchError as err:
616 except error.PatchError as err:
617 raise error.InputError(pycompat.bytestr(err))
617 raise error.InputError(pycompat.bytestr(err))
618 del fp
618 del fp
619
619
620 # 4. We prepared working directory according to filtered
620 # 4. We prepared working directory according to filtered
621 # patch. Now is the time to delegate the job to
621 # patch. Now is the time to delegate the job to
622 # commit/qrefresh or the like!
622 # commit/qrefresh or the like!
623
623
624 # Make all of the pathnames absolute.
624 # Make all of the pathnames absolute.
625 newfiles = [repo.wjoin(nf) for nf in newfiles]
625 newfiles = [repo.wjoin(nf) for nf in newfiles]
626 return commitfunc(ui, repo, *newfiles, **pycompat.strkwargs(opts))
626 return commitfunc(ui, repo, *newfiles, **pycompat.strkwargs(opts))
627 finally:
627 finally:
628 # 5. finally restore backed-up files
628 # 5. finally restore backed-up files
629 try:
629 try:
630 dirstate = repo.dirstate
630 dirstate = repo.dirstate
631 for realname, tmpname in pycompat.iteritems(backups):
631 for realname, tmpname in pycompat.iteritems(backups):
632 ui.debug(b'restoring %r to %r\n' % (tmpname, realname))
632 ui.debug(b'restoring %r to %r\n' % (tmpname, realname))
633
633
634 if dirstate[realname] == b'n':
634 if dirstate[realname] == b'n':
635 # without normallookup, restoring timestamp
635 # without normallookup, restoring timestamp
636 # may cause partially committed files
636 # may cause partially committed files
637 # to be treated as unmodified
637 # to be treated as unmodified
638 dirstate.normallookup(realname)
638 dirstate.normallookup(realname)
639
639
640 # copystat=True here and above are a hack to trick any
640 # copystat=True here and above are a hack to trick any
641 # editors that have f open that we haven't modified them.
641 # editors that have f open that we haven't modified them.
642 #
642 #
643 # Also note that this racy as an editor could notice the
643 # Also note that this racy as an editor could notice the
644 # file's mtime before we've finished writing it.
644 # file's mtime before we've finished writing it.
645 util.copyfile(tmpname, repo.wjoin(realname), copystat=True)
645 util.copyfile(tmpname, repo.wjoin(realname), copystat=True)
646 os.unlink(tmpname)
646 os.unlink(tmpname)
647 if tobackup:
647 if tobackup:
648 os.rmdir(backupdir)
648 os.rmdir(backupdir)
649 except OSError:
649 except OSError:
650 pass
650 pass
651
651
652 def recordinwlock(ui, repo, message, match, opts):
652 def recordinwlock(ui, repo, message, match, opts):
653 with repo.wlock():
653 with repo.wlock():
654 return recordfunc(ui, repo, message, match, opts)
654 return recordfunc(ui, repo, message, match, opts)
655
655
656 return commit(ui, repo, recordinwlock, pats, opts)
656 return commit(ui, repo, recordinwlock, pats, opts)
657
657
658
658
659 class dirnode(object):
659 class dirnode(object):
660 """
660 """
661 Represent a directory in user working copy with information required for
661 Represent a directory in user working copy with information required for
662 the purpose of tersing its status.
662 the purpose of tersing its status.
663
663
664 path is the path to the directory, without a trailing '/'
664 path is the path to the directory, without a trailing '/'
665
665
666 statuses is a set of statuses of all files in this directory (this includes
666 statuses is a set of statuses of all files in this directory (this includes
667 all the files in all the subdirectories too)
667 all the files in all the subdirectories too)
668
668
669 files is a list of files which are direct child of this directory
669 files is a list of files which are direct child of this directory
670
670
671 subdirs is a dictionary of sub-directory name as the key and it's own
671 subdirs is a dictionary of sub-directory name as the key and it's own
672 dirnode object as the value
672 dirnode object as the value
673 """
673 """
674
674
675 def __init__(self, dirpath):
675 def __init__(self, dirpath):
676 self.path = dirpath
676 self.path = dirpath
677 self.statuses = set()
677 self.statuses = set()
678 self.files = []
678 self.files = []
679 self.subdirs = {}
679 self.subdirs = {}
680
680
681 def _addfileindir(self, filename, status):
681 def _addfileindir(self, filename, status):
682 """Add a file in this directory as a direct child."""
682 """Add a file in this directory as a direct child."""
683 self.files.append((filename, status))
683 self.files.append((filename, status))
684
684
685 def addfile(self, filename, status):
685 def addfile(self, filename, status):
686 """
686 """
687 Add a file to this directory or to its direct parent directory.
687 Add a file to this directory or to its direct parent directory.
688
688
689 If the file is not direct child of this directory, we traverse to the
689 If the file is not direct child of this directory, we traverse to the
690 directory of which this file is a direct child of and add the file
690 directory of which this file is a direct child of and add the file
691 there.
691 there.
692 """
692 """
693
693
694 # the filename contains a path separator, it means it's not the direct
694 # the filename contains a path separator, it means it's not the direct
695 # child of this directory
695 # child of this directory
696 if b'/' in filename:
696 if b'/' in filename:
697 subdir, filep = filename.split(b'/', 1)
697 subdir, filep = filename.split(b'/', 1)
698
698
699 # does the dirnode object for subdir exists
699 # does the dirnode object for subdir exists
700 if subdir not in self.subdirs:
700 if subdir not in self.subdirs:
701 subdirpath = pathutil.join(self.path, subdir)
701 subdirpath = pathutil.join(self.path, subdir)
702 self.subdirs[subdir] = dirnode(subdirpath)
702 self.subdirs[subdir] = dirnode(subdirpath)
703
703
704 # try adding the file in subdir
704 # try adding the file in subdir
705 self.subdirs[subdir].addfile(filep, status)
705 self.subdirs[subdir].addfile(filep, status)
706
706
707 else:
707 else:
708 self._addfileindir(filename, status)
708 self._addfileindir(filename, status)
709
709
710 if status not in self.statuses:
710 if status not in self.statuses:
711 self.statuses.add(status)
711 self.statuses.add(status)
712
712
713 def iterfilepaths(self):
713 def iterfilepaths(self):
714 """Yield (status, path) for files directly under this directory."""
714 """Yield (status, path) for files directly under this directory."""
715 for f, st in self.files:
715 for f, st in self.files:
716 yield st, pathutil.join(self.path, f)
716 yield st, pathutil.join(self.path, f)
717
717
718 def tersewalk(self, terseargs):
718 def tersewalk(self, terseargs):
719 """
719 """
720 Yield (status, path) obtained by processing the status of this
720 Yield (status, path) obtained by processing the status of this
721 dirnode.
721 dirnode.
722
722
723 terseargs is the string of arguments passed by the user with `--terse`
723 terseargs is the string of arguments passed by the user with `--terse`
724 flag.
724 flag.
725
725
726 Following are the cases which can happen:
726 Following are the cases which can happen:
727
727
728 1) All the files in the directory (including all the files in its
728 1) All the files in the directory (including all the files in its
729 subdirectories) share the same status and the user has asked us to terse
729 subdirectories) share the same status and the user has asked us to terse
730 that status. -> yield (status, dirpath). dirpath will end in '/'.
730 that status. -> yield (status, dirpath). dirpath will end in '/'.
731
731
732 2) Otherwise, we do following:
732 2) Otherwise, we do following:
733
733
734 a) Yield (status, filepath) for all the files which are in this
734 a) Yield (status, filepath) for all the files which are in this
735 directory (only the ones in this directory, not the subdirs)
735 directory (only the ones in this directory, not the subdirs)
736
736
737 b) Recurse the function on all the subdirectories of this
737 b) Recurse the function on all the subdirectories of this
738 directory
738 directory
739 """
739 """
740
740
741 if len(self.statuses) == 1:
741 if len(self.statuses) == 1:
742 onlyst = self.statuses.pop()
742 onlyst = self.statuses.pop()
743
743
744 # Making sure we terse only when the status abbreviation is
744 # Making sure we terse only when the status abbreviation is
745 # passed as terse argument
745 # passed as terse argument
746 if onlyst in terseargs:
746 if onlyst in terseargs:
747 yield onlyst, self.path + b'/'
747 yield onlyst, self.path + b'/'
748 return
748 return
749
749
750 # add the files to status list
750 # add the files to status list
751 for st, fpath in self.iterfilepaths():
751 for st, fpath in self.iterfilepaths():
752 yield st, fpath
752 yield st, fpath
753
753
754 # recurse on the subdirs
754 # recurse on the subdirs
755 for dirobj in self.subdirs.values():
755 for dirobj in self.subdirs.values():
756 for st, fpath in dirobj.tersewalk(terseargs):
756 for st, fpath in dirobj.tersewalk(terseargs):
757 yield st, fpath
757 yield st, fpath
758
758
759
759
760 def tersedir(statuslist, terseargs):
760 def tersedir(statuslist, terseargs):
761 """
761 """
762 Terse the status if all the files in a directory shares the same status.
762 Terse the status if all the files in a directory shares the same status.
763
763
764 statuslist is scmutil.status() object which contains a list of files for
764 statuslist is scmutil.status() object which contains a list of files for
765 each status.
765 each status.
766 terseargs is string which is passed by the user as the argument to `--terse`
766 terseargs is string which is passed by the user as the argument to `--terse`
767 flag.
767 flag.
768
768
769 The function makes a tree of objects of dirnode class, and at each node it
769 The function makes a tree of objects of dirnode class, and at each node it
770 stores the information required to know whether we can terse a certain
770 stores the information required to know whether we can terse a certain
771 directory or not.
771 directory or not.
772 """
772 """
773 # the order matters here as that is used to produce final list
773 # the order matters here as that is used to produce final list
774 allst = (b'm', b'a', b'r', b'd', b'u', b'i', b'c')
774 allst = (b'm', b'a', b'r', b'd', b'u', b'i', b'c')
775
775
776 # checking the argument validity
776 # checking the argument validity
777 for s in pycompat.bytestr(terseargs):
777 for s in pycompat.bytestr(terseargs):
778 if s not in allst:
778 if s not in allst:
779 raise error.InputError(_(b"'%s' not recognized") % s)
779 raise error.InputError(_(b"'%s' not recognized") % s)
780
780
781 # creating a dirnode object for the root of the repo
781 # creating a dirnode object for the root of the repo
782 rootobj = dirnode(b'')
782 rootobj = dirnode(b'')
783 pstatus = (
783 pstatus = (
784 b'modified',
784 b'modified',
785 b'added',
785 b'added',
786 b'deleted',
786 b'deleted',
787 b'clean',
787 b'clean',
788 b'unknown',
788 b'unknown',
789 b'ignored',
789 b'ignored',
790 b'removed',
790 b'removed',
791 )
791 )
792
792
793 tersedict = {}
793 tersedict = {}
794 for attrname in pstatus:
794 for attrname in pstatus:
795 statuschar = attrname[0:1]
795 statuschar = attrname[0:1]
796 for f in getattr(statuslist, attrname):
796 for f in getattr(statuslist, attrname):
797 rootobj.addfile(f, statuschar)
797 rootobj.addfile(f, statuschar)
798 tersedict[statuschar] = []
798 tersedict[statuschar] = []
799
799
800 # we won't be tersing the root dir, so add files in it
800 # we won't be tersing the root dir, so add files in it
801 for st, fpath in rootobj.iterfilepaths():
801 for st, fpath in rootobj.iterfilepaths():
802 tersedict[st].append(fpath)
802 tersedict[st].append(fpath)
803
803
804 # process each sub-directory and build tersedict
804 # process each sub-directory and build tersedict
805 for subdir in rootobj.subdirs.values():
805 for subdir in rootobj.subdirs.values():
806 for st, f in subdir.tersewalk(terseargs):
806 for st, f in subdir.tersewalk(terseargs):
807 tersedict[st].append(f)
807 tersedict[st].append(f)
808
808
809 tersedlist = []
809 tersedlist = []
810 for st in allst:
810 for st in allst:
811 tersedict[st].sort()
811 tersedict[st].sort()
812 tersedlist.append(tersedict[st])
812 tersedlist.append(tersedict[st])
813
813
814 return scmutil.status(*tersedlist)
814 return scmutil.status(*tersedlist)
815
815
816
816
817 def _commentlines(raw):
817 def _commentlines(raw):
818 '''Surround lineswith a comment char and a new line'''
818 '''Surround lineswith a comment char and a new line'''
819 lines = raw.splitlines()
819 lines = raw.splitlines()
820 commentedlines = [b'# %s' % line for line in lines]
820 commentedlines = [b'# %s' % line for line in lines]
821 return b'\n'.join(commentedlines) + b'\n'
821 return b'\n'.join(commentedlines) + b'\n'
822
822
823
823
824 @attr.s(frozen=True)
824 @attr.s(frozen=True)
825 class morestatus(object):
825 class morestatus(object):
826 reporoot = attr.ib()
826 reporoot = attr.ib()
827 unfinishedop = attr.ib()
827 unfinishedop = attr.ib()
828 unfinishedmsg = attr.ib()
828 unfinishedmsg = attr.ib()
829 activemerge = attr.ib()
829 activemerge = attr.ib()
830 unresolvedpaths = attr.ib()
830 unresolvedpaths = attr.ib()
831 _formattedpaths = attr.ib(init=False, default=set())
831 _formattedpaths = attr.ib(init=False, default=set())
832 _label = b'status.morestatus'
832 _label = b'status.morestatus'
833
833
834 def formatfile(self, path, fm):
834 def formatfile(self, path, fm):
835 self._formattedpaths.add(path)
835 self._formattedpaths.add(path)
836 if self.activemerge and path in self.unresolvedpaths:
836 if self.activemerge and path in self.unresolvedpaths:
837 fm.data(unresolved=True)
837 fm.data(unresolved=True)
838
838
839 def formatfooter(self, fm):
839 def formatfooter(self, fm):
840 if self.unfinishedop or self.unfinishedmsg:
840 if self.unfinishedop or self.unfinishedmsg:
841 fm.startitem()
841 fm.startitem()
842 fm.data(itemtype=b'morestatus')
842 fm.data(itemtype=b'morestatus')
843
843
844 if self.unfinishedop:
844 if self.unfinishedop:
845 fm.data(unfinished=self.unfinishedop)
845 fm.data(unfinished=self.unfinishedop)
846 statemsg = (
846 statemsg = (
847 _(b'The repository is in an unfinished *%s* state.')
847 _(b'The repository is in an unfinished *%s* state.')
848 % self.unfinishedop
848 % self.unfinishedop
849 )
849 )
850 fm.plain(b'%s\n' % _commentlines(statemsg), label=self._label)
850 fm.plain(b'%s\n' % _commentlines(statemsg), label=self._label)
851 if self.unfinishedmsg:
851 if self.unfinishedmsg:
852 fm.data(unfinishedmsg=self.unfinishedmsg)
852 fm.data(unfinishedmsg=self.unfinishedmsg)
853
853
854 # May also start new data items.
854 # May also start new data items.
855 self._formatconflicts(fm)
855 self._formatconflicts(fm)
856
856
857 if self.unfinishedmsg:
857 if self.unfinishedmsg:
858 fm.plain(
858 fm.plain(
859 b'%s\n' % _commentlines(self.unfinishedmsg), label=self._label
859 b'%s\n' % _commentlines(self.unfinishedmsg), label=self._label
860 )
860 )
861
861
862 def _formatconflicts(self, fm):
862 def _formatconflicts(self, fm):
863 if not self.activemerge:
863 if not self.activemerge:
864 return
864 return
865
865
866 if self.unresolvedpaths:
866 if self.unresolvedpaths:
867 mergeliststr = b'\n'.join(
867 mergeliststr = b'\n'.join(
868 [
868 [
869 b' %s'
869 b' %s'
870 % util.pathto(self.reporoot, encoding.getcwd(), path)
870 % util.pathto(self.reporoot, encoding.getcwd(), path)
871 for path in self.unresolvedpaths
871 for path in self.unresolvedpaths
872 ]
872 ]
873 )
873 )
874 msg = (
874 msg = (
875 _(
875 _(
876 b'''Unresolved merge conflicts:
876 b'''Unresolved merge conflicts:
877
877
878 %s
878 %s
879
879
880 To mark files as resolved: hg resolve --mark FILE'''
880 To mark files as resolved: hg resolve --mark FILE'''
881 )
881 )
882 % mergeliststr
882 % mergeliststr
883 )
883 )
884
884
885 # If any paths with unresolved conflicts were not previously
885 # If any paths with unresolved conflicts were not previously
886 # formatted, output them now.
886 # formatted, output them now.
887 for f in self.unresolvedpaths:
887 for f in self.unresolvedpaths:
888 if f in self._formattedpaths:
888 if f in self._formattedpaths:
889 # Already output.
889 # Already output.
890 continue
890 continue
891 fm.startitem()
891 fm.startitem()
892 # We can't claim to know the status of the file - it may just
892 # We can't claim to know the status of the file - it may just
893 # have been in one of the states that were not requested for
893 # have been in one of the states that were not requested for
894 # display, so it could be anything.
894 # display, so it could be anything.
895 fm.data(itemtype=b'file', path=f, unresolved=True)
895 fm.data(itemtype=b'file', path=f, unresolved=True)
896
896
897 else:
897 else:
898 msg = _(b'No unresolved merge conflicts.')
898 msg = _(b'No unresolved merge conflicts.')
899
899
900 fm.plain(b'%s\n' % _commentlines(msg), label=self._label)
900 fm.plain(b'%s\n' % _commentlines(msg), label=self._label)
901
901
902
902
903 def readmorestatus(repo):
903 def readmorestatus(repo):
904 """Returns a morestatus object if the repo has unfinished state."""
904 """Returns a morestatus object if the repo has unfinished state."""
905 statetuple = statemod.getrepostate(repo)
905 statetuple = statemod.getrepostate(repo)
906 mergestate = mergestatemod.mergestate.read(repo)
906 mergestate = mergestatemod.mergestate.read(repo)
907 activemerge = mergestate.active()
907 activemerge = mergestate.active()
908 if not statetuple and not activemerge:
908 if not statetuple and not activemerge:
909 return None
909 return None
910
910
911 unfinishedop = unfinishedmsg = unresolved = None
911 unfinishedop = unfinishedmsg = unresolved = None
912 if statetuple:
912 if statetuple:
913 unfinishedop, unfinishedmsg = statetuple
913 unfinishedop, unfinishedmsg = statetuple
914 if activemerge:
914 if activemerge:
915 unresolved = sorted(mergestate.unresolved())
915 unresolved = sorted(mergestate.unresolved())
916 return morestatus(
916 return morestatus(
917 repo.root, unfinishedop, unfinishedmsg, activemerge, unresolved
917 repo.root, unfinishedop, unfinishedmsg, activemerge, unresolved
918 )
918 )
919
919
920
920
921 def findpossible(cmd, table, strict=False):
921 def findpossible(cmd, table, strict=False):
922 """
922 """
923 Return cmd -> (aliases, command table entry)
923 Return cmd -> (aliases, command table entry)
924 for each matching command.
924 for each matching command.
925 Return debug commands (or their aliases) only if no normal command matches.
925 Return debug commands (or their aliases) only if no normal command matches.
926 """
926 """
927 choice = {}
927 choice = {}
928 debugchoice = {}
928 debugchoice = {}
929
929
930 if cmd in table:
930 if cmd in table:
931 # short-circuit exact matches, "log" alias beats "log|history"
931 # short-circuit exact matches, "log" alias beats "log|history"
932 keys = [cmd]
932 keys = [cmd]
933 else:
933 else:
934 keys = table.keys()
934 keys = table.keys()
935
935
936 allcmds = []
936 allcmds = []
937 for e in keys:
937 for e in keys:
938 aliases = parsealiases(e)
938 aliases = parsealiases(e)
939 allcmds.extend(aliases)
939 allcmds.extend(aliases)
940 found = None
940 found = None
941 if cmd in aliases:
941 if cmd in aliases:
942 found = cmd
942 found = cmd
943 elif not strict:
943 elif not strict:
944 for a in aliases:
944 for a in aliases:
945 if a.startswith(cmd):
945 if a.startswith(cmd):
946 found = a
946 found = a
947 break
947 break
948 if found is not None:
948 if found is not None:
949 if aliases[0].startswith(b"debug") or found.startswith(b"debug"):
949 if aliases[0].startswith(b"debug") or found.startswith(b"debug"):
950 debugchoice[found] = (aliases, table[e])
950 debugchoice[found] = (aliases, table[e])
951 else:
951 else:
952 choice[found] = (aliases, table[e])
952 choice[found] = (aliases, table[e])
953
953
954 if not choice and debugchoice:
954 if not choice and debugchoice:
955 choice = debugchoice
955 choice = debugchoice
956
956
957 return choice, allcmds
957 return choice, allcmds
958
958
959
959
960 def findcmd(cmd, table, strict=True):
960 def findcmd(cmd, table, strict=True):
961 """Return (aliases, command table entry) for command string."""
961 """Return (aliases, command table entry) for command string."""
962 choice, allcmds = findpossible(cmd, table, strict)
962 choice, allcmds = findpossible(cmd, table, strict)
963
963
964 if cmd in choice:
964 if cmd in choice:
965 return choice[cmd]
965 return choice[cmd]
966
966
967 if len(choice) > 1:
967 if len(choice) > 1:
968 clist = sorted(choice)
968 clist = sorted(choice)
969 raise error.AmbiguousCommand(cmd, clist)
969 raise error.AmbiguousCommand(cmd, clist)
970
970
971 if choice:
971 if choice:
972 return list(choice.values())[0]
972 return list(choice.values())[0]
973
973
974 raise error.UnknownCommand(cmd, allcmds)
974 raise error.UnknownCommand(cmd, allcmds)
975
975
976
976
977 def changebranch(ui, repo, revs, label, opts):
977 def changebranch(ui, repo, revs, label, opts):
978 """Change the branch name of given revs to label"""
978 """Change the branch name of given revs to label"""
979
979
980 with repo.wlock(), repo.lock(), repo.transaction(b'branches'):
980 with repo.wlock(), repo.lock(), repo.transaction(b'branches'):
981 # abort in case of uncommitted merge or dirty wdir
981 # abort in case of uncommitted merge or dirty wdir
982 bailifchanged(repo)
982 bailifchanged(repo)
983 revs = scmutil.revrange(repo, revs)
983 revs = scmutil.revrange(repo, revs)
984 if not revs:
984 if not revs:
985 raise error.InputError(b"empty revision set")
985 raise error.InputError(b"empty revision set")
986 roots = repo.revs(b'roots(%ld)', revs)
986 roots = repo.revs(b'roots(%ld)', revs)
987 if len(roots) > 1:
987 if len(roots) > 1:
988 raise error.InputError(
988 raise error.InputError(
989 _(b"cannot change branch of non-linear revisions")
989 _(b"cannot change branch of non-linear revisions")
990 )
990 )
991 rewriteutil.precheck(repo, revs, b'change branch of')
991 rewriteutil.precheck(repo, revs, b'change branch of')
992
992
993 root = repo[roots.first()]
993 root = repo[roots.first()]
994 rpb = {parent.branch() for parent in root.parents()}
994 rpb = {parent.branch() for parent in root.parents()}
995 if (
995 if (
996 not opts.get(b'force')
996 not opts.get(b'force')
997 and label not in rpb
997 and label not in rpb
998 and label in repo.branchmap()
998 and label in repo.branchmap()
999 ):
999 ):
1000 raise error.InputError(
1000 raise error.InputError(
1001 _(b"a branch of the same name already exists")
1001 _(b"a branch of the same name already exists")
1002 )
1002 )
1003
1003
1004 # make sure only topological heads
1004 # make sure only topological heads
1005 if repo.revs(b'heads(%ld) - head()', revs):
1005 if repo.revs(b'heads(%ld) - head()', revs):
1006 raise error.InputError(
1006 raise error.InputError(
1007 _(b"cannot change branch in middle of a stack")
1007 _(b"cannot change branch in middle of a stack")
1008 )
1008 )
1009
1009
1010 replacements = {}
1010 replacements = {}
1011 # avoid import cycle mercurial.cmdutil -> mercurial.context ->
1011 # avoid import cycle mercurial.cmdutil -> mercurial.context ->
1012 # mercurial.subrepo -> mercurial.cmdutil
1012 # mercurial.subrepo -> mercurial.cmdutil
1013 from . import context
1013 from . import context
1014
1014
1015 for rev in revs:
1015 for rev in revs:
1016 ctx = repo[rev]
1016 ctx = repo[rev]
1017 oldbranch = ctx.branch()
1017 oldbranch = ctx.branch()
1018 # check if ctx has same branch
1018 # check if ctx has same branch
1019 if oldbranch == label:
1019 if oldbranch == label:
1020 continue
1020 continue
1021
1021
1022 def filectxfn(repo, newctx, path):
1022 def filectxfn(repo, newctx, path):
1023 try:
1023 try:
1024 return ctx[path]
1024 return ctx[path]
1025 except error.ManifestLookupError:
1025 except error.ManifestLookupError:
1026 return None
1026 return None
1027
1027
1028 ui.debug(
1028 ui.debug(
1029 b"changing branch of '%s' from '%s' to '%s'\n"
1029 b"changing branch of '%s' from '%s' to '%s'\n"
1030 % (hex(ctx.node()), oldbranch, label)
1030 % (hex(ctx.node()), oldbranch, label)
1031 )
1031 )
1032 extra = ctx.extra()
1032 extra = ctx.extra()
1033 extra[b'branch_change'] = hex(ctx.node())
1033 extra[b'branch_change'] = hex(ctx.node())
1034 # While changing branch of set of linear commits, make sure that
1034 # While changing branch of set of linear commits, make sure that
1035 # we base our commits on new parent rather than old parent which
1035 # we base our commits on new parent rather than old parent which
1036 # was obsoleted while changing the branch
1036 # was obsoleted while changing the branch
1037 p1 = ctx.p1().node()
1037 p1 = ctx.p1().node()
1038 p2 = ctx.p2().node()
1038 p2 = ctx.p2().node()
1039 if p1 in replacements:
1039 if p1 in replacements:
1040 p1 = replacements[p1][0]
1040 p1 = replacements[p1][0]
1041 if p2 in replacements:
1041 if p2 in replacements:
1042 p2 = replacements[p2][0]
1042 p2 = replacements[p2][0]
1043
1043
1044 mc = context.memctx(
1044 mc = context.memctx(
1045 repo,
1045 repo,
1046 (p1, p2),
1046 (p1, p2),
1047 ctx.description(),
1047 ctx.description(),
1048 ctx.files(),
1048 ctx.files(),
1049 filectxfn,
1049 filectxfn,
1050 user=ctx.user(),
1050 user=ctx.user(),
1051 date=ctx.date(),
1051 date=ctx.date(),
1052 extra=extra,
1052 extra=extra,
1053 branch=label,
1053 branch=label,
1054 )
1054 )
1055
1055
1056 newnode = repo.commitctx(mc)
1056 newnode = repo.commitctx(mc)
1057 replacements[ctx.node()] = (newnode,)
1057 replacements[ctx.node()] = (newnode,)
1058 ui.debug(b'new node id is %s\n' % hex(newnode))
1058 ui.debug(b'new node id is %s\n' % hex(newnode))
1059
1059
1060 # create obsmarkers and move bookmarks
1060 # create obsmarkers and move bookmarks
1061 scmutil.cleanupnodes(
1061 scmutil.cleanupnodes(
1062 repo, replacements, b'branch-change', fixphase=True
1062 repo, replacements, b'branch-change', fixphase=True
1063 )
1063 )
1064
1064
1065 # move the working copy too
1065 # move the working copy too
1066 wctx = repo[None]
1066 wctx = repo[None]
1067 # in-progress merge is a bit too complex for now.
1067 # in-progress merge is a bit too complex for now.
1068 if len(wctx.parents()) == 1:
1068 if len(wctx.parents()) == 1:
1069 newid = replacements.get(wctx.p1().node())
1069 newid = replacements.get(wctx.p1().node())
1070 if newid is not None:
1070 if newid is not None:
1071 # avoid import cycle mercurial.cmdutil -> mercurial.hg ->
1071 # avoid import cycle mercurial.cmdutil -> mercurial.hg ->
1072 # mercurial.cmdutil
1072 # mercurial.cmdutil
1073 from . import hg
1073 from . import hg
1074
1074
1075 hg.update(repo, newid[0], quietempty=True)
1075 hg.update(repo, newid[0], quietempty=True)
1076
1076
1077 ui.status(_(b"changed branch on %d changesets\n") % len(replacements))
1077 ui.status(_(b"changed branch on %d changesets\n") % len(replacements))
1078
1078
1079
1079
1080 def findrepo(p):
1080 def findrepo(p):
1081 while not os.path.isdir(os.path.join(p, b".hg")):
1081 while not os.path.isdir(os.path.join(p, b".hg")):
1082 oldp, p = p, os.path.dirname(p)
1082 oldp, p = p, os.path.dirname(p)
1083 if p == oldp:
1083 if p == oldp:
1084 return None
1084 return None
1085
1085
1086 return p
1086 return p
1087
1087
1088
1088
1089 def bailifchanged(repo, merge=True, hint=None):
1089 def bailifchanged(repo, merge=True, hint=None):
1090 """enforce the precondition that working directory must be clean.
1090 """enforce the precondition that working directory must be clean.
1091
1091
1092 'merge' can be set to false if a pending uncommitted merge should be
1092 'merge' can be set to false if a pending uncommitted merge should be
1093 ignored (such as when 'update --check' runs).
1093 ignored (such as when 'update --check' runs).
1094
1094
1095 'hint' is the usual hint given to Abort exception.
1095 'hint' is the usual hint given to Abort exception.
1096 """
1096 """
1097
1097
1098 if merge and repo.dirstate.p2() != repo.nullid:
1098 if merge and repo.dirstate.p2() != repo.nullid:
1099 raise error.StateError(_(b'outstanding uncommitted merge'), hint=hint)
1099 raise error.StateError(_(b'outstanding uncommitted merge'), hint=hint)
1100 st = repo.status()
1100 st = repo.status()
1101 if st.modified or st.added or st.removed or st.deleted:
1101 if st.modified or st.added or st.removed or st.deleted:
1102 raise error.StateError(_(b'uncommitted changes'), hint=hint)
1102 raise error.StateError(_(b'uncommitted changes'), hint=hint)
1103 ctx = repo[None]
1103 ctx = repo[None]
1104 for s in sorted(ctx.substate):
1104 for s in sorted(ctx.substate):
1105 ctx.sub(s).bailifchanged(hint=hint)
1105 ctx.sub(s).bailifchanged(hint=hint)
1106
1106
1107
1107
1108 def logmessage(ui, opts):
1108 def logmessage(ui, opts):
1109 """get the log message according to -m and -l option"""
1109 """get the log message according to -m and -l option"""
1110
1110
1111 check_at_most_one_arg(opts, b'message', b'logfile')
1111 check_at_most_one_arg(opts, b'message', b'logfile')
1112
1112
1113 message = opts.get(b'message')
1113 message = opts.get(b'message')
1114 logfile = opts.get(b'logfile')
1114 logfile = opts.get(b'logfile')
1115
1115
1116 if not message and logfile:
1116 if not message and logfile:
1117 try:
1117 try:
1118 if isstdiofilename(logfile):
1118 if isstdiofilename(logfile):
1119 message = ui.fin.read()
1119 message = ui.fin.read()
1120 else:
1120 else:
1121 message = b'\n'.join(util.readfile(logfile).splitlines())
1121 message = b'\n'.join(util.readfile(logfile).splitlines())
1122 except IOError as inst:
1122 except IOError as inst:
1123 raise error.Abort(
1123 raise error.Abort(
1124 _(b"can't read commit message '%s': %s")
1124 _(b"can't read commit message '%s': %s")
1125 % (logfile, encoding.strtolocal(inst.strerror))
1125 % (logfile, encoding.strtolocal(inst.strerror))
1126 )
1126 )
1127 return message
1127 return message
1128
1128
1129
1129
1130 def mergeeditform(ctxorbool, baseformname):
1130 def mergeeditform(ctxorbool, baseformname):
1131 """return appropriate editform name (referencing a committemplate)
1131 """return appropriate editform name (referencing a committemplate)
1132
1132
1133 'ctxorbool' is either a ctx to be committed, or a bool indicating whether
1133 'ctxorbool' is either a ctx to be committed, or a bool indicating whether
1134 merging is committed.
1134 merging is committed.
1135
1135
1136 This returns baseformname with '.merge' appended if it is a merge,
1136 This returns baseformname with '.merge' appended if it is a merge,
1137 otherwise '.normal' is appended.
1137 otherwise '.normal' is appended.
1138 """
1138 """
1139 if isinstance(ctxorbool, bool):
1139 if isinstance(ctxorbool, bool):
1140 if ctxorbool:
1140 if ctxorbool:
1141 return baseformname + b".merge"
1141 return baseformname + b".merge"
1142 elif len(ctxorbool.parents()) > 1:
1142 elif len(ctxorbool.parents()) > 1:
1143 return baseformname + b".merge"
1143 return baseformname + b".merge"
1144
1144
1145 return baseformname + b".normal"
1145 return baseformname + b".normal"
1146
1146
1147
1147
1148 def getcommiteditor(
1148 def getcommiteditor(
1149 edit=False, finishdesc=None, extramsg=None, editform=b'', **opts
1149 edit=False, finishdesc=None, extramsg=None, editform=b'', **opts
1150 ):
1150 ):
1151 """get appropriate commit message editor according to '--edit' option
1151 """get appropriate commit message editor according to '--edit' option
1152
1152
1153 'finishdesc' is a function to be called with edited commit message
1153 'finishdesc' is a function to be called with edited commit message
1154 (= 'description' of the new changeset) just after editing, but
1154 (= 'description' of the new changeset) just after editing, but
1155 before checking empty-ness. It should return actual text to be
1155 before checking empty-ness. It should return actual text to be
1156 stored into history. This allows to change description before
1156 stored into history. This allows to change description before
1157 storing.
1157 storing.
1158
1158
1159 'extramsg' is a extra message to be shown in the editor instead of
1159 'extramsg' is a extra message to be shown in the editor instead of
1160 'Leave message empty to abort commit' line. 'HG: ' prefix and EOL
1160 'Leave message empty to abort commit' line. 'HG: ' prefix and EOL
1161 is automatically added.
1161 is automatically added.
1162
1162
1163 'editform' is a dot-separated list of names, to distinguish
1163 'editform' is a dot-separated list of names, to distinguish
1164 the purpose of commit text editing.
1164 the purpose of commit text editing.
1165
1165
1166 'getcommiteditor' returns 'commitforceeditor' regardless of
1166 'getcommiteditor' returns 'commitforceeditor' regardless of
1167 'edit', if one of 'finishdesc' or 'extramsg' is specified, because
1167 'edit', if one of 'finishdesc' or 'extramsg' is specified, because
1168 they are specific for usage in MQ.
1168 they are specific for usage in MQ.
1169 """
1169 """
1170 if edit or finishdesc or extramsg:
1170 if edit or finishdesc or extramsg:
1171 return lambda r, c, s: commitforceeditor(
1171 return lambda r, c, s: commitforceeditor(
1172 r, c, s, finishdesc=finishdesc, extramsg=extramsg, editform=editform
1172 r, c, s, finishdesc=finishdesc, extramsg=extramsg, editform=editform
1173 )
1173 )
1174 elif editform:
1174 elif editform:
1175 return lambda r, c, s: commiteditor(r, c, s, editform=editform)
1175 return lambda r, c, s: commiteditor(r, c, s, editform=editform)
1176 else:
1176 else:
1177 return commiteditor
1177 return commiteditor
1178
1178
1179
1179
1180 def _escapecommandtemplate(tmpl):
1180 def _escapecommandtemplate(tmpl):
1181 parts = []
1181 parts = []
1182 for typ, start, end in templater.scantemplate(tmpl, raw=True):
1182 for typ, start, end in templater.scantemplate(tmpl, raw=True):
1183 if typ == b'string':
1183 if typ == b'string':
1184 parts.append(stringutil.escapestr(tmpl[start:end]))
1184 parts.append(stringutil.escapestr(tmpl[start:end]))
1185 else:
1185 else:
1186 parts.append(tmpl[start:end])
1186 parts.append(tmpl[start:end])
1187 return b''.join(parts)
1187 return b''.join(parts)
1188
1188
1189
1189
1190 def rendercommandtemplate(ui, tmpl, props):
1190 def rendercommandtemplate(ui, tmpl, props):
1191 r"""Expand a literal template 'tmpl' in a way suitable for command line
1191 r"""Expand a literal template 'tmpl' in a way suitable for command line
1192
1192
1193 '\' in outermost string is not taken as an escape character because it
1193 '\' in outermost string is not taken as an escape character because it
1194 is a directory separator on Windows.
1194 is a directory separator on Windows.
1195
1195
1196 >>> from . import ui as uimod
1196 >>> from . import ui as uimod
1197 >>> ui = uimod.ui()
1197 >>> ui = uimod.ui()
1198 >>> rendercommandtemplate(ui, b'c:\\{path}', {b'path': b'foo'})
1198 >>> rendercommandtemplate(ui, b'c:\\{path}', {b'path': b'foo'})
1199 'c:\\foo'
1199 'c:\\foo'
1200 >>> rendercommandtemplate(ui, b'{"c:\\{path}"}', {'path': b'foo'})
1200 >>> rendercommandtemplate(ui, b'{"c:\\{path}"}', {'path': b'foo'})
1201 'c:{path}'
1201 'c:{path}'
1202 """
1202 """
1203 if not tmpl:
1203 if not tmpl:
1204 return tmpl
1204 return tmpl
1205 t = formatter.maketemplater(ui, _escapecommandtemplate(tmpl))
1205 t = formatter.maketemplater(ui, _escapecommandtemplate(tmpl))
1206 return t.renderdefault(props)
1206 return t.renderdefault(props)
1207
1207
1208
1208
1209 def rendertemplate(ctx, tmpl, props=None):
1209 def rendertemplate(ctx, tmpl, props=None):
1210 """Expand a literal template 'tmpl' byte-string against one changeset
1210 """Expand a literal template 'tmpl' byte-string against one changeset
1211
1211
1212 Each props item must be a stringify-able value or a callable returning
1212 Each props item must be a stringify-able value or a callable returning
1213 such value, i.e. no bare list nor dict should be passed.
1213 such value, i.e. no bare list nor dict should be passed.
1214 """
1214 """
1215 repo = ctx.repo()
1215 repo = ctx.repo()
1216 tres = formatter.templateresources(repo.ui, repo)
1216 tres = formatter.templateresources(repo.ui, repo)
1217 t = formatter.maketemplater(
1217 t = formatter.maketemplater(
1218 repo.ui, tmpl, defaults=templatekw.keywords, resources=tres
1218 repo.ui, tmpl, defaults=templatekw.keywords, resources=tres
1219 )
1219 )
1220 mapping = {b'ctx': ctx}
1220 mapping = {b'ctx': ctx}
1221 if props:
1221 if props:
1222 mapping.update(props)
1222 mapping.update(props)
1223 return t.renderdefault(mapping)
1223 return t.renderdefault(mapping)
1224
1224
1225
1225
1226 def format_changeset_summary(ui, ctx, command=None, default_spec=None):
1226 def format_changeset_summary(ui, ctx, command=None, default_spec=None):
1227 """Format a changeset summary (one line)."""
1227 """Format a changeset summary (one line)."""
1228 spec = None
1228 spec = None
1229 if command:
1229 if command:
1230 spec = ui.config(
1230 spec = ui.config(
1231 b'command-templates', b'oneline-summary.%s' % command, None
1231 b'command-templates', b'oneline-summary.%s' % command, None
1232 )
1232 )
1233 if not spec:
1233 if not spec:
1234 spec = ui.config(b'command-templates', b'oneline-summary')
1234 spec = ui.config(b'command-templates', b'oneline-summary')
1235 if not spec:
1235 if not spec:
1236 spec = default_spec
1236 spec = default_spec
1237 if not spec:
1237 if not spec:
1238 spec = (
1238 spec = (
1239 b'{separate(" ", '
1239 b'{separate(" ", '
1240 b'label("oneline-summary.changeset", "{rev}:{node|short}")'
1240 b'label("oneline-summary.changeset", "{rev}:{node|short}")'
1241 b', '
1241 b', '
1242 b'join(filter(namespaces % "{ifeq(namespace, "branches", "", join(names % "{label("oneline-summary.{namespace}", name)}", " "))}"), " ")'
1242 b'join(filter(namespaces % "{ifeq(namespace, "branches", "", join(names % "{label("oneline-summary.{namespace}", name)}", " "))}"), " ")'
1243 b')} '
1243 b')} '
1244 b'"{label("oneline-summary.desc", desc|firstline)}"'
1244 b'"{label("oneline-summary.desc", desc|firstline)}"'
1245 )
1245 )
1246 text = rendertemplate(ctx, spec)
1246 text = rendertemplate(ctx, spec)
1247 return text.split(b'\n')[0]
1247 return text.split(b'\n')[0]
1248
1248
1249
1249
1250 def _buildfntemplate(pat, total=None, seqno=None, revwidth=None, pathname=None):
1250 def _buildfntemplate(pat, total=None, seqno=None, revwidth=None, pathname=None):
1251 r"""Convert old-style filename format string to template string
1251 r"""Convert old-style filename format string to template string
1252
1252
1253 >>> _buildfntemplate(b'foo-%b-%n.patch', seqno=0)
1253 >>> _buildfntemplate(b'foo-%b-%n.patch', seqno=0)
1254 'foo-{reporoot|basename}-{seqno}.patch'
1254 'foo-{reporoot|basename}-{seqno}.patch'
1255 >>> _buildfntemplate(b'%R{tags % "{tag}"}%H')
1255 >>> _buildfntemplate(b'%R{tags % "{tag}"}%H')
1256 '{rev}{tags % "{tag}"}{node}'
1256 '{rev}{tags % "{tag}"}{node}'
1257
1257
1258 '\' in outermost strings has to be escaped because it is a directory
1258 '\' in outermost strings has to be escaped because it is a directory
1259 separator on Windows:
1259 separator on Windows:
1260
1260
1261 >>> _buildfntemplate(b'c:\\tmp\\%R\\%n.patch', seqno=0)
1261 >>> _buildfntemplate(b'c:\\tmp\\%R\\%n.patch', seqno=0)
1262 'c:\\\\tmp\\\\{rev}\\\\{seqno}.patch'
1262 'c:\\\\tmp\\\\{rev}\\\\{seqno}.patch'
1263 >>> _buildfntemplate(b'\\\\foo\\bar.patch')
1263 >>> _buildfntemplate(b'\\\\foo\\bar.patch')
1264 '\\\\\\\\foo\\\\bar.patch'
1264 '\\\\\\\\foo\\\\bar.patch'
1265 >>> _buildfntemplate(b'\\{tags % "{tag}"}')
1265 >>> _buildfntemplate(b'\\{tags % "{tag}"}')
1266 '\\\\{tags % "{tag}"}'
1266 '\\\\{tags % "{tag}"}'
1267
1267
1268 but inner strings follow the template rules (i.e. '\' is taken as an
1268 but inner strings follow the template rules (i.e. '\' is taken as an
1269 escape character):
1269 escape character):
1270
1270
1271 >>> _buildfntemplate(br'{"c:\tmp"}', seqno=0)
1271 >>> _buildfntemplate(br'{"c:\tmp"}', seqno=0)
1272 '{"c:\\tmp"}'
1272 '{"c:\\tmp"}'
1273 """
1273 """
1274 expander = {
1274 expander = {
1275 b'H': b'{node}',
1275 b'H': b'{node}',
1276 b'R': b'{rev}',
1276 b'R': b'{rev}',
1277 b'h': b'{node|short}',
1277 b'h': b'{node|short}',
1278 b'm': br'{sub(r"[^\w]", "_", desc|firstline)}',
1278 b'm': br'{sub(r"[^\w]", "_", desc|firstline)}',
1279 b'r': b'{if(revwidth, pad(rev, revwidth, "0", left=True), rev)}',
1279 b'r': b'{if(revwidth, pad(rev, revwidth, "0", left=True), rev)}',
1280 b'%': b'%',
1280 b'%': b'%',
1281 b'b': b'{reporoot|basename}',
1281 b'b': b'{reporoot|basename}',
1282 }
1282 }
1283 if total is not None:
1283 if total is not None:
1284 expander[b'N'] = b'{total}'
1284 expander[b'N'] = b'{total}'
1285 if seqno is not None:
1285 if seqno is not None:
1286 expander[b'n'] = b'{seqno}'
1286 expander[b'n'] = b'{seqno}'
1287 if total is not None and seqno is not None:
1287 if total is not None and seqno is not None:
1288 expander[b'n'] = b'{pad(seqno, total|stringify|count, "0", left=True)}'
1288 expander[b'n'] = b'{pad(seqno, total|stringify|count, "0", left=True)}'
1289 if pathname is not None:
1289 if pathname is not None:
1290 expander[b's'] = b'{pathname|basename}'
1290 expander[b's'] = b'{pathname|basename}'
1291 expander[b'd'] = b'{if(pathname|dirname, pathname|dirname, ".")}'
1291 expander[b'd'] = b'{if(pathname|dirname, pathname|dirname, ".")}'
1292 expander[b'p'] = b'{pathname}'
1292 expander[b'p'] = b'{pathname}'
1293
1293
1294 newname = []
1294 newname = []
1295 for typ, start, end in templater.scantemplate(pat, raw=True):
1295 for typ, start, end in templater.scantemplate(pat, raw=True):
1296 if typ != b'string':
1296 if typ != b'string':
1297 newname.append(pat[start:end])
1297 newname.append(pat[start:end])
1298 continue
1298 continue
1299 i = start
1299 i = start
1300 while i < end:
1300 while i < end:
1301 n = pat.find(b'%', i, end)
1301 n = pat.find(b'%', i, end)
1302 if n < 0:
1302 if n < 0:
1303 newname.append(stringutil.escapestr(pat[i:end]))
1303 newname.append(stringutil.escapestr(pat[i:end]))
1304 break
1304 break
1305 newname.append(stringutil.escapestr(pat[i:n]))
1305 newname.append(stringutil.escapestr(pat[i:n]))
1306 if n + 2 > end:
1306 if n + 2 > end:
1307 raise error.Abort(
1307 raise error.Abort(
1308 _(b"incomplete format spec in output filename")
1308 _(b"incomplete format spec in output filename")
1309 )
1309 )
1310 c = pat[n + 1 : n + 2]
1310 c = pat[n + 1 : n + 2]
1311 i = n + 2
1311 i = n + 2
1312 try:
1312 try:
1313 newname.append(expander[c])
1313 newname.append(expander[c])
1314 except KeyError:
1314 except KeyError:
1315 raise error.Abort(
1315 raise error.Abort(
1316 _(b"invalid format spec '%%%s' in output filename") % c
1316 _(b"invalid format spec '%%%s' in output filename") % c
1317 )
1317 )
1318 return b''.join(newname)
1318 return b''.join(newname)
1319
1319
1320
1320
1321 def makefilename(ctx, pat, **props):
1321 def makefilename(ctx, pat, **props):
1322 if not pat:
1322 if not pat:
1323 return pat
1323 return pat
1324 tmpl = _buildfntemplate(pat, **props)
1324 tmpl = _buildfntemplate(pat, **props)
1325 # BUG: alias expansion shouldn't be made against template fragments
1325 # BUG: alias expansion shouldn't be made against template fragments
1326 # rewritten from %-format strings, but we have no easy way to partially
1326 # rewritten from %-format strings, but we have no easy way to partially
1327 # disable the expansion.
1327 # disable the expansion.
1328 return rendertemplate(ctx, tmpl, pycompat.byteskwargs(props))
1328 return rendertemplate(ctx, tmpl, pycompat.byteskwargs(props))
1329
1329
1330
1330
1331 def isstdiofilename(pat):
1331 def isstdiofilename(pat):
1332 """True if the given pat looks like a filename denoting stdin/stdout"""
1332 """True if the given pat looks like a filename denoting stdin/stdout"""
1333 return not pat or pat == b'-'
1333 return not pat or pat == b'-'
1334
1334
1335
1335
1336 class _unclosablefile(object):
1336 class _unclosablefile(object):
1337 def __init__(self, fp):
1337 def __init__(self, fp):
1338 self._fp = fp
1338 self._fp = fp
1339
1339
1340 def close(self):
1340 def close(self):
1341 pass
1341 pass
1342
1342
1343 def __iter__(self):
1343 def __iter__(self):
1344 return iter(self._fp)
1344 return iter(self._fp)
1345
1345
1346 def __getattr__(self, attr):
1346 def __getattr__(self, attr):
1347 return getattr(self._fp, attr)
1347 return getattr(self._fp, attr)
1348
1348
1349 def __enter__(self):
1349 def __enter__(self):
1350 return self
1350 return self
1351
1351
1352 def __exit__(self, exc_type, exc_value, exc_tb):
1352 def __exit__(self, exc_type, exc_value, exc_tb):
1353 pass
1353 pass
1354
1354
1355
1355
1356 def makefileobj(ctx, pat, mode=b'wb', **props):
1356 def makefileobj(ctx, pat, mode=b'wb', **props):
1357 writable = mode not in (b'r', b'rb')
1357 writable = mode not in (b'r', b'rb')
1358
1358
1359 if isstdiofilename(pat):
1359 if isstdiofilename(pat):
1360 repo = ctx.repo()
1360 repo = ctx.repo()
1361 if writable:
1361 if writable:
1362 fp = repo.ui.fout
1362 fp = repo.ui.fout
1363 else:
1363 else:
1364 fp = repo.ui.fin
1364 fp = repo.ui.fin
1365 return _unclosablefile(fp)
1365 return _unclosablefile(fp)
1366 fn = makefilename(ctx, pat, **props)
1366 fn = makefilename(ctx, pat, **props)
1367 return open(fn, mode)
1367 return open(fn, mode)
1368
1368
1369
1369
1370 def openstorage(repo, cmd, file_, opts, returnrevlog=False):
1370 def openstorage(repo, cmd, file_, opts, returnrevlog=False):
1371 """opens the changelog, manifest, a filelog or a given revlog"""
1371 """opens the changelog, manifest, a filelog or a given revlog"""
1372 cl = opts[b'changelog']
1372 cl = opts[b'changelog']
1373 mf = opts[b'manifest']
1373 mf = opts[b'manifest']
1374 dir = opts[b'dir']
1374 dir = opts[b'dir']
1375 msg = None
1375 msg = None
1376 if cl and mf:
1376 if cl and mf:
1377 msg = _(b'cannot specify --changelog and --manifest at the same time')
1377 msg = _(b'cannot specify --changelog and --manifest at the same time')
1378 elif cl and dir:
1378 elif cl and dir:
1379 msg = _(b'cannot specify --changelog and --dir at the same time')
1379 msg = _(b'cannot specify --changelog and --dir at the same time')
1380 elif cl or mf or dir:
1380 elif cl or mf or dir:
1381 if file_:
1381 if file_:
1382 msg = _(b'cannot specify filename with --changelog or --manifest')
1382 msg = _(b'cannot specify filename with --changelog or --manifest')
1383 elif not repo:
1383 elif not repo:
1384 msg = _(
1384 msg = _(
1385 b'cannot specify --changelog or --manifest or --dir '
1385 b'cannot specify --changelog or --manifest or --dir '
1386 b'without a repository'
1386 b'without a repository'
1387 )
1387 )
1388 if msg:
1388 if msg:
1389 raise error.InputError(msg)
1389 raise error.InputError(msg)
1390
1390
1391 r = None
1391 r = None
1392 if repo:
1392 if repo:
1393 if cl:
1393 if cl:
1394 r = repo.unfiltered().changelog
1394 r = repo.unfiltered().changelog
1395 elif dir:
1395 elif dir:
1396 if not scmutil.istreemanifest(repo):
1396 if not scmutil.istreemanifest(repo):
1397 raise error.InputError(
1397 raise error.InputError(
1398 _(
1398 _(
1399 b"--dir can only be used on repos with "
1399 b"--dir can only be used on repos with "
1400 b"treemanifest enabled"
1400 b"treemanifest enabled"
1401 )
1401 )
1402 )
1402 )
1403 if not dir.endswith(b'/'):
1403 if not dir.endswith(b'/'):
1404 dir = dir + b'/'
1404 dir = dir + b'/'
1405 dirlog = repo.manifestlog.getstorage(dir)
1405 dirlog = repo.manifestlog.getstorage(dir)
1406 if len(dirlog):
1406 if len(dirlog):
1407 r = dirlog
1407 r = dirlog
1408 elif mf:
1408 elif mf:
1409 r = repo.manifestlog.getstorage(b'')
1409 r = repo.manifestlog.getstorage(b'')
1410 elif file_:
1410 elif file_:
1411 filelog = repo.file(file_)
1411 filelog = repo.file(file_)
1412 if len(filelog):
1412 if len(filelog):
1413 r = filelog
1413 r = filelog
1414
1414
1415 # Not all storage may be revlogs. If requested, try to return an actual
1415 # Not all storage may be revlogs. If requested, try to return an actual
1416 # revlog instance.
1416 # revlog instance.
1417 if returnrevlog:
1417 if returnrevlog:
1418 if isinstance(r, revlog.revlog):
1418 if isinstance(r, revlog.revlog):
1419 pass
1419 pass
1420 elif util.safehasattr(r, b'_revlog'):
1420 elif util.safehasattr(r, b'_revlog'):
1421 r = r._revlog # pytype: disable=attribute-error
1421 r = r._revlog # pytype: disable=attribute-error
1422 elif r is not None:
1422 elif r is not None:
1423 raise error.InputError(
1423 raise error.InputError(
1424 _(b'%r does not appear to be a revlog') % r
1424 _(b'%r does not appear to be a revlog') % r
1425 )
1425 )
1426
1426
1427 if not r:
1427 if not r:
1428 if not returnrevlog:
1428 if not returnrevlog:
1429 raise error.InputError(_(b'cannot give path to non-revlog'))
1429 raise error.InputError(_(b'cannot give path to non-revlog'))
1430
1430
1431 if not file_:
1431 if not file_:
1432 raise error.CommandError(cmd, _(b'invalid arguments'))
1432 raise error.CommandError(cmd, _(b'invalid arguments'))
1433 if not os.path.isfile(file_):
1433 if not os.path.isfile(file_):
1434 raise error.InputError(_(b"revlog '%s' not found") % file_)
1434 raise error.InputError(_(b"revlog '%s' not found") % file_)
1435
1435
1436 target = (revlog_constants.KIND_OTHER, b'free-form:%s' % file_)
1436 target = (revlog_constants.KIND_OTHER, b'free-form:%s' % file_)
1437 r = revlog.revlog(
1437 r = revlog.revlog(
1438 vfsmod.vfs(encoding.getcwd(), audit=False),
1438 vfsmod.vfs(encoding.getcwd(), audit=False),
1439 target=target,
1439 target=target,
1440 radix=file_[:-2],
1440 radix=file_[:-2],
1441 )
1441 )
1442 return r
1442 return r
1443
1443
1444
1444
1445 def openrevlog(repo, cmd, file_, opts):
1445 def openrevlog(repo, cmd, file_, opts):
1446 """Obtain a revlog backing storage of an item.
1446 """Obtain a revlog backing storage of an item.
1447
1447
1448 This is similar to ``openstorage()`` except it always returns a revlog.
1448 This is similar to ``openstorage()`` except it always returns a revlog.
1449
1449
1450 In most cases, a caller cares about the main storage object - not the
1450 In most cases, a caller cares about the main storage object - not the
1451 revlog backing it. Therefore, this function should only be used by code
1451 revlog backing it. Therefore, this function should only be used by code
1452 that needs to examine low-level revlog implementation details. e.g. debug
1452 that needs to examine low-level revlog implementation details. e.g. debug
1453 commands.
1453 commands.
1454 """
1454 """
1455 return openstorage(repo, cmd, file_, opts, returnrevlog=True)
1455 return openstorage(repo, cmd, file_, opts, returnrevlog=True)
1456
1456
1457
1457
1458 def copy(ui, repo, pats, opts, rename=False):
1458 def copy(ui, repo, pats, opts, rename=False):
1459 check_incompatible_arguments(opts, b'forget', [b'dry_run'])
1459 check_incompatible_arguments(opts, b'forget', [b'dry_run'])
1460
1460
1461 # called with the repo lock held
1461 # called with the repo lock held
1462 #
1462 #
1463 # hgsep => pathname that uses "/" to separate directories
1463 # hgsep => pathname that uses "/" to separate directories
1464 # ossep => pathname that uses os.sep to separate directories
1464 # ossep => pathname that uses os.sep to separate directories
1465 cwd = repo.getcwd()
1465 cwd = repo.getcwd()
1466 targets = {}
1466 targets = {}
1467 forget = opts.get(b"forget")
1467 forget = opts.get(b"forget")
1468 after = opts.get(b"after")
1468 after = opts.get(b"after")
1469 dryrun = opts.get(b"dry_run")
1469 dryrun = opts.get(b"dry_run")
1470 rev = opts.get(b'at_rev')
1470 rev = opts.get(b'at_rev')
1471 if rev:
1471 if rev:
1472 if not forget and not after:
1472 if not forget and not after:
1473 # TODO: Remove this restriction and make it also create the copy
1473 # TODO: Remove this restriction and make it also create the copy
1474 # targets (and remove the rename source if rename==True).
1474 # targets (and remove the rename source if rename==True).
1475 raise error.InputError(_(b'--at-rev requires --after'))
1475 raise error.InputError(_(b'--at-rev requires --after'))
1476 ctx = scmutil.revsingle(repo, rev)
1476 ctx = scmutil.revsingle(repo, rev)
1477 if len(ctx.parents()) > 1:
1477 if len(ctx.parents()) > 1:
1478 raise error.InputError(
1478 raise error.InputError(
1479 _(b'cannot mark/unmark copy in merge commit')
1479 _(b'cannot mark/unmark copy in merge commit')
1480 )
1480 )
1481 else:
1481 else:
1482 ctx = repo[None]
1482 ctx = repo[None]
1483
1483
1484 pctx = ctx.p1()
1484 pctx = ctx.p1()
1485
1485
1486 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
1486 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
1487
1487
1488 if forget:
1488 if forget:
1489 if ctx.rev() is None:
1489 if ctx.rev() is None:
1490 new_ctx = ctx
1490 new_ctx = ctx
1491 else:
1491 else:
1492 if len(ctx.parents()) > 1:
1492 if len(ctx.parents()) > 1:
1493 raise error.InputError(_(b'cannot unmark copy in merge commit'))
1493 raise error.InputError(_(b'cannot unmark copy in merge commit'))
1494 # avoid cycle context -> subrepo -> cmdutil
1494 # avoid cycle context -> subrepo -> cmdutil
1495 from . import context
1495 from . import context
1496
1496
1497 rewriteutil.precheck(repo, [ctx.rev()], b'uncopy')
1497 rewriteutil.precheck(repo, [ctx.rev()], b'uncopy')
1498 new_ctx = context.overlayworkingctx(repo)
1498 new_ctx = context.overlayworkingctx(repo)
1499 new_ctx.setbase(ctx.p1())
1499 new_ctx.setbase(ctx.p1())
1500 mergemod.graft(repo, ctx, wctx=new_ctx)
1500 mergemod.graft(repo, ctx, wctx=new_ctx)
1501
1501
1502 match = scmutil.match(ctx, pats, opts)
1502 match = scmutil.match(ctx, pats, opts)
1503
1503
1504 current_copies = ctx.p1copies()
1504 current_copies = ctx.p1copies()
1505 current_copies.update(ctx.p2copies())
1505 current_copies.update(ctx.p2copies())
1506
1506
1507 uipathfn = scmutil.getuipathfn(repo)
1507 uipathfn = scmutil.getuipathfn(repo)
1508 for f in ctx.walk(match):
1508 for f in ctx.walk(match):
1509 if f in current_copies:
1509 if f in current_copies:
1510 new_ctx[f].markcopied(None)
1510 new_ctx[f].markcopied(None)
1511 elif match.exact(f):
1511 elif match.exact(f):
1512 ui.warn(
1512 ui.warn(
1513 _(
1513 _(
1514 b'%s: not unmarking as copy - file is not marked as copied\n'
1514 b'%s: not unmarking as copy - file is not marked as copied\n'
1515 )
1515 )
1516 % uipathfn(f)
1516 % uipathfn(f)
1517 )
1517 )
1518
1518
1519 if ctx.rev() is not None:
1519 if ctx.rev() is not None:
1520 with repo.lock():
1520 with repo.lock():
1521 mem_ctx = new_ctx.tomemctx_for_amend(ctx)
1521 mem_ctx = new_ctx.tomemctx_for_amend(ctx)
1522 new_node = mem_ctx.commit()
1522 new_node = mem_ctx.commit()
1523
1523
1524 if repo.dirstate.p1() == ctx.node():
1524 if repo.dirstate.p1() == ctx.node():
1525 with repo.dirstate.parentchange():
1525 with repo.dirstate.parentchange():
1526 scmutil.movedirstate(repo, repo[new_node])
1526 scmutil.movedirstate(repo, repo[new_node])
1527 replacements = {ctx.node(): [new_node]}
1527 replacements = {ctx.node(): [new_node]}
1528 scmutil.cleanupnodes(
1528 scmutil.cleanupnodes(
1529 repo, replacements, b'uncopy', fixphase=True
1529 repo, replacements, b'uncopy', fixphase=True
1530 )
1530 )
1531
1531
1532 return
1532 return
1533
1533
1534 pats = scmutil.expandpats(pats)
1534 pats = scmutil.expandpats(pats)
1535 if not pats:
1535 if not pats:
1536 raise error.InputError(_(b'no source or destination specified'))
1536 raise error.InputError(_(b'no source or destination specified'))
1537 if len(pats) == 1:
1537 if len(pats) == 1:
1538 raise error.InputError(_(b'no destination specified'))
1538 raise error.InputError(_(b'no destination specified'))
1539 dest = pats.pop()
1539 dest = pats.pop()
1540
1540
1541 def walkpat(pat):
1541 def walkpat(pat):
1542 srcs = []
1542 srcs = []
1543 # TODO: Inline and simplify the non-working-copy version of this code
1543 # TODO: Inline and simplify the non-working-copy version of this code
1544 # since it shares very little with the working-copy version of it.
1544 # since it shares very little with the working-copy version of it.
1545 ctx_to_walk = ctx if ctx.rev() is None else pctx
1545 ctx_to_walk = ctx if ctx.rev() is None else pctx
1546 m = scmutil.match(ctx_to_walk, [pat], opts, globbed=True)
1546 m = scmutil.match(ctx_to_walk, [pat], opts, globbed=True)
1547 for abs in ctx_to_walk.walk(m):
1547 for abs in ctx_to_walk.walk(m):
1548 rel = uipathfn(abs)
1548 rel = uipathfn(abs)
1549 exact = m.exact(abs)
1549 exact = m.exact(abs)
1550 if abs not in ctx:
1550 if abs not in ctx:
1551 if abs in pctx:
1551 if abs in pctx:
1552 if not after:
1552 if not after:
1553 if exact:
1553 if exact:
1554 ui.warn(
1554 ui.warn(
1555 _(
1555 _(
1556 b'%s: not copying - file has been marked '
1556 b'%s: not copying - file has been marked '
1557 b'for remove\n'
1557 b'for remove\n'
1558 )
1558 )
1559 % rel
1559 % rel
1560 )
1560 )
1561 continue
1561 continue
1562 else:
1562 else:
1563 if exact:
1563 if exact:
1564 ui.warn(
1564 ui.warn(
1565 _(b'%s: not copying - file is not managed\n') % rel
1565 _(b'%s: not copying - file is not managed\n') % rel
1566 )
1566 )
1567 continue
1567 continue
1568
1568
1569 # abs: hgsep
1569 # abs: hgsep
1570 # rel: ossep
1570 # rel: ossep
1571 srcs.append((abs, rel, exact))
1571 srcs.append((abs, rel, exact))
1572 return srcs
1572 return srcs
1573
1573
1574 if ctx.rev() is not None:
1574 if ctx.rev() is not None:
1575 rewriteutil.precheck(repo, [ctx.rev()], b'uncopy')
1575 rewriteutil.precheck(repo, [ctx.rev()], b'uncopy')
1576 absdest = pathutil.canonpath(repo.root, cwd, dest)
1576 absdest = pathutil.canonpath(repo.root, cwd, dest)
1577 if ctx.hasdir(absdest):
1577 if ctx.hasdir(absdest):
1578 raise error.InputError(
1578 raise error.InputError(
1579 _(b'%s: --at-rev does not support a directory as destination')
1579 _(b'%s: --at-rev does not support a directory as destination')
1580 % uipathfn(absdest)
1580 % uipathfn(absdest)
1581 )
1581 )
1582 if absdest not in ctx:
1582 if absdest not in ctx:
1583 raise error.InputError(
1583 raise error.InputError(
1584 _(b'%s: copy destination does not exist in %s')
1584 _(b'%s: copy destination does not exist in %s')
1585 % (uipathfn(absdest), ctx)
1585 % (uipathfn(absdest), ctx)
1586 )
1586 )
1587
1587
1588 # avoid cycle context -> subrepo -> cmdutil
1588 # avoid cycle context -> subrepo -> cmdutil
1589 from . import context
1589 from . import context
1590
1590
1591 copylist = []
1591 copylist = []
1592 for pat in pats:
1592 for pat in pats:
1593 srcs = walkpat(pat)
1593 srcs = walkpat(pat)
1594 if not srcs:
1594 if not srcs:
1595 continue
1595 continue
1596 for abs, rel, exact in srcs:
1596 for abs, rel, exact in srcs:
1597 copylist.append(abs)
1597 copylist.append(abs)
1598
1598
1599 if not copylist:
1599 if not copylist:
1600 raise error.InputError(_(b'no files to copy'))
1600 raise error.InputError(_(b'no files to copy'))
1601 # TODO: Add support for `hg cp --at-rev . foo bar dir` and
1601 # TODO: Add support for `hg cp --at-rev . foo bar dir` and
1602 # `hg cp --at-rev . dir1 dir2`, preferably unifying the code with the
1602 # `hg cp --at-rev . dir1 dir2`, preferably unifying the code with the
1603 # existing functions below.
1603 # existing functions below.
1604 if len(copylist) != 1:
1604 if len(copylist) != 1:
1605 raise error.InputError(_(b'--at-rev requires a single source'))
1605 raise error.InputError(_(b'--at-rev requires a single source'))
1606
1606
1607 new_ctx = context.overlayworkingctx(repo)
1607 new_ctx = context.overlayworkingctx(repo)
1608 new_ctx.setbase(ctx.p1())
1608 new_ctx.setbase(ctx.p1())
1609 mergemod.graft(repo, ctx, wctx=new_ctx)
1609 mergemod.graft(repo, ctx, wctx=new_ctx)
1610
1610
1611 new_ctx.markcopied(absdest, copylist[0])
1611 new_ctx.markcopied(absdest, copylist[0])
1612
1612
1613 with repo.lock():
1613 with repo.lock():
1614 mem_ctx = new_ctx.tomemctx_for_amend(ctx)
1614 mem_ctx = new_ctx.tomemctx_for_amend(ctx)
1615 new_node = mem_ctx.commit()
1615 new_node = mem_ctx.commit()
1616
1616
1617 if repo.dirstate.p1() == ctx.node():
1617 if repo.dirstate.p1() == ctx.node():
1618 with repo.dirstate.parentchange():
1618 with repo.dirstate.parentchange():
1619 scmutil.movedirstate(repo, repo[new_node])
1619 scmutil.movedirstate(repo, repo[new_node])
1620 replacements = {ctx.node(): [new_node]}
1620 replacements = {ctx.node(): [new_node]}
1621 scmutil.cleanupnodes(repo, replacements, b'copy', fixphase=True)
1621 scmutil.cleanupnodes(repo, replacements, b'copy', fixphase=True)
1622
1622
1623 return
1623 return
1624
1624
1625 # abssrc: hgsep
1625 # abssrc: hgsep
1626 # relsrc: ossep
1626 # relsrc: ossep
1627 # otarget: ossep
1627 # otarget: ossep
1628 def copyfile(abssrc, relsrc, otarget, exact):
1628 def copyfile(abssrc, relsrc, otarget, exact):
1629 abstarget = pathutil.canonpath(repo.root, cwd, otarget)
1629 abstarget = pathutil.canonpath(repo.root, cwd, otarget)
1630 if b'/' in abstarget:
1630 if b'/' in abstarget:
1631 # We cannot normalize abstarget itself, this would prevent
1631 # We cannot normalize abstarget itself, this would prevent
1632 # case only renames, like a => A.
1632 # case only renames, like a => A.
1633 abspath, absname = abstarget.rsplit(b'/', 1)
1633 abspath, absname = abstarget.rsplit(b'/', 1)
1634 abstarget = repo.dirstate.normalize(abspath) + b'/' + absname
1634 abstarget = repo.dirstate.normalize(abspath) + b'/' + absname
1635 reltarget = repo.pathto(abstarget, cwd)
1635 reltarget = repo.pathto(abstarget, cwd)
1636 target = repo.wjoin(abstarget)
1636 target = repo.wjoin(abstarget)
1637 src = repo.wjoin(abssrc)
1637 src = repo.wjoin(abssrc)
1638 state = repo.dirstate[abstarget]
1638 state = repo.dirstate[abstarget]
1639
1639
1640 scmutil.checkportable(ui, abstarget)
1640 scmutil.checkportable(ui, abstarget)
1641
1641
1642 # check for collisions
1642 # check for collisions
1643 prevsrc = targets.get(abstarget)
1643 prevsrc = targets.get(abstarget)
1644 if prevsrc is not None:
1644 if prevsrc is not None:
1645 ui.warn(
1645 ui.warn(
1646 _(b'%s: not overwriting - %s collides with %s\n')
1646 _(b'%s: not overwriting - %s collides with %s\n')
1647 % (
1647 % (
1648 reltarget,
1648 reltarget,
1649 repo.pathto(abssrc, cwd),
1649 repo.pathto(abssrc, cwd),
1650 repo.pathto(prevsrc, cwd),
1650 repo.pathto(prevsrc, cwd),
1651 )
1651 )
1652 )
1652 )
1653 return True # report a failure
1653 return True # report a failure
1654
1654
1655 # check for overwrites
1655 # check for overwrites
1656 exists = os.path.lexists(target)
1656 exists = os.path.lexists(target)
1657 samefile = False
1657 samefile = False
1658 if exists and abssrc != abstarget:
1658 if exists and abssrc != abstarget:
1659 if repo.dirstate.normalize(abssrc) == repo.dirstate.normalize(
1659 if repo.dirstate.normalize(abssrc) == repo.dirstate.normalize(
1660 abstarget
1660 abstarget
1661 ):
1661 ):
1662 if not rename:
1662 if not rename:
1663 ui.warn(_(b"%s: can't copy - same file\n") % reltarget)
1663 ui.warn(_(b"%s: can't copy - same file\n") % reltarget)
1664 return True # report a failure
1664 return True # report a failure
1665 exists = False
1665 exists = False
1666 samefile = True
1666 samefile = True
1667
1667
1668 if not after and exists or after and state in b'mn':
1668 if not after and exists or after and state in b'mn':
1669 if not opts[b'force']:
1669 if not opts[b'force']:
1670 if state in b'mn':
1670 if state in b'mn':
1671 msg = _(b'%s: not overwriting - file already committed\n')
1671 msg = _(b'%s: not overwriting - file already committed\n')
1672 if after:
1672 if after:
1673 flags = b'--after --force'
1673 flags = b'--after --force'
1674 else:
1674 else:
1675 flags = b'--force'
1675 flags = b'--force'
1676 if rename:
1676 if rename:
1677 hint = (
1677 hint = (
1678 _(
1678 _(
1679 b"('hg rename %s' to replace the file by "
1679 b"('hg rename %s' to replace the file by "
1680 b'recording a rename)\n'
1680 b'recording a rename)\n'
1681 )
1681 )
1682 % flags
1682 % flags
1683 )
1683 )
1684 else:
1684 else:
1685 hint = (
1685 hint = (
1686 _(
1686 _(
1687 b"('hg copy %s' to replace the file by "
1687 b"('hg copy %s' to replace the file by "
1688 b'recording a copy)\n'
1688 b'recording a copy)\n'
1689 )
1689 )
1690 % flags
1690 % flags
1691 )
1691 )
1692 else:
1692 else:
1693 msg = _(b'%s: not overwriting - file exists\n')
1693 msg = _(b'%s: not overwriting - file exists\n')
1694 if rename:
1694 if rename:
1695 hint = _(
1695 hint = _(
1696 b"('hg rename --after' to record the rename)\n"
1696 b"('hg rename --after' to record the rename)\n"
1697 )
1697 )
1698 else:
1698 else:
1699 hint = _(b"('hg copy --after' to record the copy)\n")
1699 hint = _(b"('hg copy --after' to record the copy)\n")
1700 ui.warn(msg % reltarget)
1700 ui.warn(msg % reltarget)
1701 ui.warn(hint)
1701 ui.warn(hint)
1702 return True # report a failure
1702 return True # report a failure
1703
1703
1704 if after:
1704 if after:
1705 if not exists:
1705 if not exists:
1706 if rename:
1706 if rename:
1707 ui.warn(
1707 ui.warn(
1708 _(b'%s: not recording move - %s does not exist\n')
1708 _(b'%s: not recording move - %s does not exist\n')
1709 % (relsrc, reltarget)
1709 % (relsrc, reltarget)
1710 )
1710 )
1711 else:
1711 else:
1712 ui.warn(
1712 ui.warn(
1713 _(b'%s: not recording copy - %s does not exist\n')
1713 _(b'%s: not recording copy - %s does not exist\n')
1714 % (relsrc, reltarget)
1714 % (relsrc, reltarget)
1715 )
1715 )
1716 return True # report a failure
1716 return True # report a failure
1717 elif not dryrun:
1717 elif not dryrun:
1718 try:
1718 try:
1719 if exists:
1719 if exists:
1720 os.unlink(target)
1720 os.unlink(target)
1721 targetdir = os.path.dirname(target) or b'.'
1721 targetdir = os.path.dirname(target) or b'.'
1722 if not os.path.isdir(targetdir):
1722 if not os.path.isdir(targetdir):
1723 os.makedirs(targetdir)
1723 os.makedirs(targetdir)
1724 if samefile:
1724 if samefile:
1725 tmp = target + b"~hgrename"
1725 tmp = target + b"~hgrename"
1726 os.rename(src, tmp)
1726 os.rename(src, tmp)
1727 os.rename(tmp, target)
1727 os.rename(tmp, target)
1728 else:
1728 else:
1729 # Preserve stat info on renames, not on copies; this matches
1729 # Preserve stat info on renames, not on copies; this matches
1730 # Linux CLI behavior.
1730 # Linux CLI behavior.
1731 util.copyfile(src, target, copystat=rename)
1731 util.copyfile(src, target, copystat=rename)
1732 srcexists = True
1732 srcexists = True
1733 except IOError as inst:
1733 except IOError as inst:
1734 if inst.errno == errno.ENOENT:
1734 if inst.errno == errno.ENOENT:
1735 ui.warn(_(b'%s: deleted in working directory\n') % relsrc)
1735 ui.warn(_(b'%s: deleted in working directory\n') % relsrc)
1736 srcexists = False
1736 srcexists = False
1737 else:
1737 else:
1738 ui.warn(
1738 ui.warn(
1739 _(b'%s: cannot copy - %s\n')
1739 _(b'%s: cannot copy - %s\n')
1740 % (relsrc, encoding.strtolocal(inst.strerror))
1740 % (relsrc, encoding.strtolocal(inst.strerror))
1741 )
1741 )
1742 return True # report a failure
1742 return True # report a failure
1743
1743
1744 if ui.verbose or not exact:
1744 if ui.verbose or not exact:
1745 if rename:
1745 if rename:
1746 ui.status(_(b'moving %s to %s\n') % (relsrc, reltarget))
1746 ui.status(_(b'moving %s to %s\n') % (relsrc, reltarget))
1747 else:
1747 else:
1748 ui.status(_(b'copying %s to %s\n') % (relsrc, reltarget))
1748 ui.status(_(b'copying %s to %s\n') % (relsrc, reltarget))
1749
1749
1750 targets[abstarget] = abssrc
1750 targets[abstarget] = abssrc
1751
1751
1752 # fix up dirstate
1752 # fix up dirstate
1753 scmutil.dirstatecopy(
1753 scmutil.dirstatecopy(
1754 ui, repo, ctx, abssrc, abstarget, dryrun=dryrun, cwd=cwd
1754 ui, repo, ctx, abssrc, abstarget, dryrun=dryrun, cwd=cwd
1755 )
1755 )
1756 if rename and not dryrun:
1756 if rename and not dryrun:
1757 if not after and srcexists and not samefile:
1757 if not after and srcexists and not samefile:
1758 rmdir = repo.ui.configbool(b'experimental', b'removeemptydirs')
1758 rmdir = repo.ui.configbool(b'experimental', b'removeemptydirs')
1759 repo.wvfs.unlinkpath(abssrc, rmdir=rmdir)
1759 repo.wvfs.unlinkpath(abssrc, rmdir=rmdir)
1760 ctx.forget([abssrc])
1760 ctx.forget([abssrc])
1761
1761
1762 # pat: ossep
1762 # pat: ossep
1763 # dest ossep
1763 # dest ossep
1764 # srcs: list of (hgsep, hgsep, ossep, bool)
1764 # srcs: list of (hgsep, hgsep, ossep, bool)
1765 # return: function that takes hgsep and returns ossep
1765 # return: function that takes hgsep and returns ossep
1766 def targetpathfn(pat, dest, srcs):
1766 def targetpathfn(pat, dest, srcs):
1767 if os.path.isdir(pat):
1767 if os.path.isdir(pat):
1768 abspfx = pathutil.canonpath(repo.root, cwd, pat)
1768 abspfx = pathutil.canonpath(repo.root, cwd, pat)
1769 abspfx = util.localpath(abspfx)
1769 abspfx = util.localpath(abspfx)
1770 if destdirexists:
1770 if destdirexists:
1771 striplen = len(os.path.split(abspfx)[0])
1771 striplen = len(os.path.split(abspfx)[0])
1772 else:
1772 else:
1773 striplen = len(abspfx)
1773 striplen = len(abspfx)
1774 if striplen:
1774 if striplen:
1775 striplen += len(pycompat.ossep)
1775 striplen += len(pycompat.ossep)
1776 res = lambda p: os.path.join(dest, util.localpath(p)[striplen:])
1776 res = lambda p: os.path.join(dest, util.localpath(p)[striplen:])
1777 elif destdirexists:
1777 elif destdirexists:
1778 res = lambda p: os.path.join(
1778 res = lambda p: os.path.join(
1779 dest, os.path.basename(util.localpath(p))
1779 dest, os.path.basename(util.localpath(p))
1780 )
1780 )
1781 else:
1781 else:
1782 res = lambda p: dest
1782 res = lambda p: dest
1783 return res
1783 return res
1784
1784
1785 # pat: ossep
1785 # pat: ossep
1786 # dest ossep
1786 # dest ossep
1787 # srcs: list of (hgsep, hgsep, ossep, bool)
1787 # srcs: list of (hgsep, hgsep, ossep, bool)
1788 # return: function that takes hgsep and returns ossep
1788 # return: function that takes hgsep and returns ossep
1789 def targetpathafterfn(pat, dest, srcs):
1789 def targetpathafterfn(pat, dest, srcs):
1790 if matchmod.patkind(pat):
1790 if matchmod.patkind(pat):
1791 # a mercurial pattern
1791 # a mercurial pattern
1792 res = lambda p: os.path.join(
1792 res = lambda p: os.path.join(
1793 dest, os.path.basename(util.localpath(p))
1793 dest, os.path.basename(util.localpath(p))
1794 )
1794 )
1795 else:
1795 else:
1796 abspfx = pathutil.canonpath(repo.root, cwd, pat)
1796 abspfx = pathutil.canonpath(repo.root, cwd, pat)
1797 if len(abspfx) < len(srcs[0][0]):
1797 if len(abspfx) < len(srcs[0][0]):
1798 # A directory. Either the target path contains the last
1798 # A directory. Either the target path contains the last
1799 # component of the source path or it does not.
1799 # component of the source path or it does not.
1800 def evalpath(striplen):
1800 def evalpath(striplen):
1801 score = 0
1801 score = 0
1802 for s in srcs:
1802 for s in srcs:
1803 t = os.path.join(dest, util.localpath(s[0])[striplen:])
1803 t = os.path.join(dest, util.localpath(s[0])[striplen:])
1804 if os.path.lexists(t):
1804 if os.path.lexists(t):
1805 score += 1
1805 score += 1
1806 return score
1806 return score
1807
1807
1808 abspfx = util.localpath(abspfx)
1808 abspfx = util.localpath(abspfx)
1809 striplen = len(abspfx)
1809 striplen = len(abspfx)
1810 if striplen:
1810 if striplen:
1811 striplen += len(pycompat.ossep)
1811 striplen += len(pycompat.ossep)
1812 if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])):
1812 if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])):
1813 score = evalpath(striplen)
1813 score = evalpath(striplen)
1814 striplen1 = len(os.path.split(abspfx)[0])
1814 striplen1 = len(os.path.split(abspfx)[0])
1815 if striplen1:
1815 if striplen1:
1816 striplen1 += len(pycompat.ossep)
1816 striplen1 += len(pycompat.ossep)
1817 if evalpath(striplen1) > score:
1817 if evalpath(striplen1) > score:
1818 striplen = striplen1
1818 striplen = striplen1
1819 res = lambda p: os.path.join(dest, util.localpath(p)[striplen:])
1819 res = lambda p: os.path.join(dest, util.localpath(p)[striplen:])
1820 else:
1820 else:
1821 # a file
1821 # a file
1822 if destdirexists:
1822 if destdirexists:
1823 res = lambda p: os.path.join(
1823 res = lambda p: os.path.join(
1824 dest, os.path.basename(util.localpath(p))
1824 dest, os.path.basename(util.localpath(p))
1825 )
1825 )
1826 else:
1826 else:
1827 res = lambda p: dest
1827 res = lambda p: dest
1828 return res
1828 return res
1829
1829
1830 destdirexists = os.path.isdir(dest) and not os.path.islink(dest)
1830 destdirexists = os.path.isdir(dest) and not os.path.islink(dest)
1831 if not destdirexists:
1831 if not destdirexists:
1832 if len(pats) > 1 or matchmod.patkind(pats[0]):
1832 if len(pats) > 1 or matchmod.patkind(pats[0]):
1833 raise error.InputError(
1833 raise error.InputError(
1834 _(
1834 _(
1835 b'with multiple sources, destination must be an '
1835 b'with multiple sources, destination must be an '
1836 b'existing directory'
1836 b'existing directory'
1837 )
1837 )
1838 )
1838 )
1839 if util.endswithsep(dest):
1839 if util.endswithsep(dest):
1840 raise error.InputError(
1840 raise error.InputError(
1841 _(b'destination %s is not a directory') % dest
1841 _(b'destination %s is not a directory') % dest
1842 )
1842 )
1843
1843
1844 tfn = targetpathfn
1844 tfn = targetpathfn
1845 if after:
1845 if after:
1846 tfn = targetpathafterfn
1846 tfn = targetpathafterfn
1847 copylist = []
1847 copylist = []
1848 for pat in pats:
1848 for pat in pats:
1849 srcs = walkpat(pat)
1849 srcs = walkpat(pat)
1850 if not srcs:
1850 if not srcs:
1851 continue
1851 continue
1852 copylist.append((tfn(pat, dest, srcs), srcs))
1852 copylist.append((tfn(pat, dest, srcs), srcs))
1853 if not copylist:
1853 if not copylist:
1854 hint = None
1854 hint = None
1855 if rename:
1855 if rename:
1856 hint = _(b'maybe you meant to use --after --at-rev=.')
1856 hint = _(b'maybe you meant to use --after --at-rev=.')
1857 raise error.InputError(_(b'no files to copy'), hint=hint)
1857 raise error.InputError(_(b'no files to copy'), hint=hint)
1858
1858
1859 errors = 0
1859 errors = 0
1860 for targetpath, srcs in copylist:
1860 for targetpath, srcs in copylist:
1861 for abssrc, relsrc, exact in srcs:
1861 for abssrc, relsrc, exact in srcs:
1862 if copyfile(abssrc, relsrc, targetpath(abssrc), exact):
1862 if copyfile(abssrc, relsrc, targetpath(abssrc), exact):
1863 errors += 1
1863 errors += 1
1864
1864
1865 return errors != 0
1865 return errors != 0
1866
1866
1867
1867
1868 ## facility to let extension process additional data into an import patch
1868 ## facility to let extension process additional data into an import patch
1869 # list of identifier to be executed in order
1869 # list of identifier to be executed in order
1870 extrapreimport = [] # run before commit
1870 extrapreimport = [] # run before commit
1871 extrapostimport = [] # run after commit
1871 extrapostimport = [] # run after commit
1872 # mapping from identifier to actual import function
1872 # mapping from identifier to actual import function
1873 #
1873 #
1874 # 'preimport' are run before the commit is made and are provided the following
1874 # 'preimport' are run before the commit is made and are provided the following
1875 # arguments:
1875 # arguments:
1876 # - repo: the localrepository instance,
1876 # - repo: the localrepository instance,
1877 # - patchdata: data extracted from patch header (cf m.patch.patchheadermap),
1877 # - patchdata: data extracted from patch header (cf m.patch.patchheadermap),
1878 # - extra: the future extra dictionary of the changeset, please mutate it,
1878 # - extra: the future extra dictionary of the changeset, please mutate it,
1879 # - opts: the import options.
1879 # - opts: the import options.
1880 # XXX ideally, we would just pass an ctx ready to be computed, that would allow
1880 # XXX ideally, we would just pass an ctx ready to be computed, that would allow
1881 # mutation of in memory commit and more. Feel free to rework the code to get
1881 # mutation of in memory commit and more. Feel free to rework the code to get
1882 # there.
1882 # there.
1883 extrapreimportmap = {}
1883 extrapreimportmap = {}
1884 # 'postimport' are run after the commit is made and are provided the following
1884 # 'postimport' are run after the commit is made and are provided the following
1885 # argument:
1885 # argument:
1886 # - ctx: the changectx created by import.
1886 # - ctx: the changectx created by import.
1887 extrapostimportmap = {}
1887 extrapostimportmap = {}
1888
1888
1889
1889
1890 def tryimportone(ui, repo, patchdata, parents, opts, msgs, updatefunc):
1890 def tryimportone(ui, repo, patchdata, parents, opts, msgs, updatefunc):
1891 """Utility function used by commands.import to import a single patch
1891 """Utility function used by commands.import to import a single patch
1892
1892
1893 This function is explicitly defined here to help the evolve extension to
1893 This function is explicitly defined here to help the evolve extension to
1894 wrap this part of the import logic.
1894 wrap this part of the import logic.
1895
1895
1896 The API is currently a bit ugly because it a simple code translation from
1896 The API is currently a bit ugly because it a simple code translation from
1897 the import command. Feel free to make it better.
1897 the import command. Feel free to make it better.
1898
1898
1899 :patchdata: a dictionary containing parsed patch data (such as from
1899 :patchdata: a dictionary containing parsed patch data (such as from
1900 ``patch.extract()``)
1900 ``patch.extract()``)
1901 :parents: nodes that will be parent of the created commit
1901 :parents: nodes that will be parent of the created commit
1902 :opts: the full dict of option passed to the import command
1902 :opts: the full dict of option passed to the import command
1903 :msgs: list to save commit message to.
1903 :msgs: list to save commit message to.
1904 (used in case we need to save it when failing)
1904 (used in case we need to save it when failing)
1905 :updatefunc: a function that update a repo to a given node
1905 :updatefunc: a function that update a repo to a given node
1906 updatefunc(<repo>, <node>)
1906 updatefunc(<repo>, <node>)
1907 """
1907 """
1908 # avoid cycle context -> subrepo -> cmdutil
1908 # avoid cycle context -> subrepo -> cmdutil
1909 from . import context
1909 from . import context
1910
1910
1911 tmpname = patchdata.get(b'filename')
1911 tmpname = patchdata.get(b'filename')
1912 message = patchdata.get(b'message')
1912 message = patchdata.get(b'message')
1913 user = opts.get(b'user') or patchdata.get(b'user')
1913 user = opts.get(b'user') or patchdata.get(b'user')
1914 date = opts.get(b'date') or patchdata.get(b'date')
1914 date = opts.get(b'date') or patchdata.get(b'date')
1915 branch = patchdata.get(b'branch')
1915 branch = patchdata.get(b'branch')
1916 nodeid = patchdata.get(b'nodeid')
1916 nodeid = patchdata.get(b'nodeid')
1917 p1 = patchdata.get(b'p1')
1917 p1 = patchdata.get(b'p1')
1918 p2 = patchdata.get(b'p2')
1918 p2 = patchdata.get(b'p2')
1919
1919
1920 nocommit = opts.get(b'no_commit')
1920 nocommit = opts.get(b'no_commit')
1921 importbranch = opts.get(b'import_branch')
1921 importbranch = opts.get(b'import_branch')
1922 update = not opts.get(b'bypass')
1922 update = not opts.get(b'bypass')
1923 strip = opts[b"strip"]
1923 strip = opts[b"strip"]
1924 prefix = opts[b"prefix"]
1924 prefix = opts[b"prefix"]
1925 sim = float(opts.get(b'similarity') or 0)
1925 sim = float(opts.get(b'similarity') or 0)
1926
1926
1927 if not tmpname:
1927 if not tmpname:
1928 return None, None, False
1928 return None, None, False
1929
1929
1930 rejects = False
1930 rejects = False
1931
1931
1932 cmdline_message = logmessage(ui, opts)
1932 cmdline_message = logmessage(ui, opts)
1933 if cmdline_message:
1933 if cmdline_message:
1934 # pickup the cmdline msg
1934 # pickup the cmdline msg
1935 message = cmdline_message
1935 message = cmdline_message
1936 elif message:
1936 elif message:
1937 # pickup the patch msg
1937 # pickup the patch msg
1938 message = message.strip()
1938 message = message.strip()
1939 else:
1939 else:
1940 # launch the editor
1940 # launch the editor
1941 message = None
1941 message = None
1942 ui.debug(b'message:\n%s\n' % (message or b''))
1942 ui.debug(b'message:\n%s\n' % (message or b''))
1943
1943
1944 if len(parents) == 1:
1944 if len(parents) == 1:
1945 parents.append(repo[nullrev])
1945 parents.append(repo[nullrev])
1946 if opts.get(b'exact'):
1946 if opts.get(b'exact'):
1947 if not nodeid or not p1:
1947 if not nodeid or not p1:
1948 raise error.InputError(_(b'not a Mercurial patch'))
1948 raise error.InputError(_(b'not a Mercurial patch'))
1949 p1 = repo[p1]
1949 p1 = repo[p1]
1950 p2 = repo[p2 or nullrev]
1950 p2 = repo[p2 or nullrev]
1951 elif p2:
1951 elif p2:
1952 try:
1952 try:
1953 p1 = repo[p1]
1953 p1 = repo[p1]
1954 p2 = repo[p2]
1954 p2 = repo[p2]
1955 # Without any options, consider p2 only if the
1955 # Without any options, consider p2 only if the
1956 # patch is being applied on top of the recorded
1956 # patch is being applied on top of the recorded
1957 # first parent.
1957 # first parent.
1958 if p1 != parents[0]:
1958 if p1 != parents[0]:
1959 p1 = parents[0]
1959 p1 = parents[0]
1960 p2 = repo[nullrev]
1960 p2 = repo[nullrev]
1961 except error.RepoError:
1961 except error.RepoError:
1962 p1, p2 = parents
1962 p1, p2 = parents
1963 if p2.rev() == nullrev:
1963 if p2.rev() == nullrev:
1964 ui.warn(
1964 ui.warn(
1965 _(
1965 _(
1966 b"warning: import the patch as a normal revision\n"
1966 b"warning: import the patch as a normal revision\n"
1967 b"(use --exact to import the patch as a merge)\n"
1967 b"(use --exact to import the patch as a merge)\n"
1968 )
1968 )
1969 )
1969 )
1970 else:
1970 else:
1971 p1, p2 = parents
1971 p1, p2 = parents
1972
1972
1973 n = None
1973 n = None
1974 if update:
1974 if update:
1975 if p1 != parents[0]:
1975 if p1 != parents[0]:
1976 updatefunc(repo, p1.node())
1976 updatefunc(repo, p1.node())
1977 if p2 != parents[1]:
1977 if p2 != parents[1]:
1978 repo.setparents(p1.node(), p2.node())
1978 repo.setparents(p1.node(), p2.node())
1979
1979
1980 if opts.get(b'exact') or importbranch:
1980 if opts.get(b'exact') or importbranch:
1981 repo.dirstate.setbranch(branch or b'default')
1981 repo.dirstate.setbranch(branch or b'default')
1982
1982
1983 partial = opts.get(b'partial', False)
1983 partial = opts.get(b'partial', False)
1984 files = set()
1984 files = set()
1985 try:
1985 try:
1986 patch.patch(
1986 patch.patch(
1987 ui,
1987 ui,
1988 repo,
1988 repo,
1989 tmpname,
1989 tmpname,
1990 strip=strip,
1990 strip=strip,
1991 prefix=prefix,
1991 prefix=prefix,
1992 files=files,
1992 files=files,
1993 eolmode=None,
1993 eolmode=None,
1994 similarity=sim / 100.0,
1994 similarity=sim / 100.0,
1995 )
1995 )
1996 except error.PatchError as e:
1996 except error.PatchError as e:
1997 if not partial:
1997 if not partial:
1998 raise error.Abort(pycompat.bytestr(e))
1998 raise error.Abort(pycompat.bytestr(e))
1999 if partial:
1999 if partial:
2000 rejects = True
2000 rejects = True
2001
2001
2002 files = list(files)
2002 files = list(files)
2003 if nocommit:
2003 if nocommit:
2004 if message:
2004 if message:
2005 msgs.append(message)
2005 msgs.append(message)
2006 else:
2006 else:
2007 if opts.get(b'exact') or p2:
2007 if opts.get(b'exact') or p2:
2008 # If you got here, you either use --force and know what
2008 # If you got here, you either use --force and know what
2009 # you are doing or used --exact or a merge patch while
2009 # you are doing or used --exact or a merge patch while
2010 # being updated to its first parent.
2010 # being updated to its first parent.
2011 m = None
2011 m = None
2012 else:
2012 else:
2013 m = scmutil.matchfiles(repo, files or [])
2013 m = scmutil.matchfiles(repo, files or [])
2014 editform = mergeeditform(repo[None], b'import.normal')
2014 editform = mergeeditform(repo[None], b'import.normal')
2015 if opts.get(b'exact'):
2015 if opts.get(b'exact'):
2016 editor = None
2016 editor = None
2017 else:
2017 else:
2018 editor = getcommiteditor(
2018 editor = getcommiteditor(
2019 editform=editform, **pycompat.strkwargs(opts)
2019 editform=editform, **pycompat.strkwargs(opts)
2020 )
2020 )
2021 extra = {}
2021 extra = {}
2022 for idfunc in extrapreimport:
2022 for idfunc in extrapreimport:
2023 extrapreimportmap[idfunc](repo, patchdata, extra, opts)
2023 extrapreimportmap[idfunc](repo, patchdata, extra, opts)
2024 overrides = {}
2024 overrides = {}
2025 if partial:
2025 if partial:
2026 overrides[(b'ui', b'allowemptycommit')] = True
2026 overrides[(b'ui', b'allowemptycommit')] = True
2027 if opts.get(b'secret'):
2027 if opts.get(b'secret'):
2028 overrides[(b'phases', b'new-commit')] = b'secret'
2028 overrides[(b'phases', b'new-commit')] = b'secret'
2029 with repo.ui.configoverride(overrides, b'import'):
2029 with repo.ui.configoverride(overrides, b'import'):
2030 n = repo.commit(
2030 n = repo.commit(
2031 message, user, date, match=m, editor=editor, extra=extra
2031 message, user, date, match=m, editor=editor, extra=extra
2032 )
2032 )
2033 for idfunc in extrapostimport:
2033 for idfunc in extrapostimport:
2034 extrapostimportmap[idfunc](repo[n])
2034 extrapostimportmap[idfunc](repo[n])
2035 else:
2035 else:
2036 if opts.get(b'exact') or importbranch:
2036 if opts.get(b'exact') or importbranch:
2037 branch = branch or b'default'
2037 branch = branch or b'default'
2038 else:
2038 else:
2039 branch = p1.branch()
2039 branch = p1.branch()
2040 store = patch.filestore()
2040 store = patch.filestore()
2041 try:
2041 try:
2042 files = set()
2042 files = set()
2043 try:
2043 try:
2044 patch.patchrepo(
2044 patch.patchrepo(
2045 ui,
2045 ui,
2046 repo,
2046 repo,
2047 p1,
2047 p1,
2048 store,
2048 store,
2049 tmpname,
2049 tmpname,
2050 strip,
2050 strip,
2051 prefix,
2051 prefix,
2052 files,
2052 files,
2053 eolmode=None,
2053 eolmode=None,
2054 )
2054 )
2055 except error.PatchError as e:
2055 except error.PatchError as e:
2056 raise error.Abort(stringutil.forcebytestr(e))
2056 raise error.Abort(stringutil.forcebytestr(e))
2057 if opts.get(b'exact'):
2057 if opts.get(b'exact'):
2058 editor = None
2058 editor = None
2059 else:
2059 else:
2060 editor = getcommiteditor(editform=b'import.bypass')
2060 editor = getcommiteditor(editform=b'import.bypass')
2061 memctx = context.memctx(
2061 memctx = context.memctx(
2062 repo,
2062 repo,
2063 (p1.node(), p2.node()),
2063 (p1.node(), p2.node()),
2064 message,
2064 message,
2065 files=files,
2065 files=files,
2066 filectxfn=store,
2066 filectxfn=store,
2067 user=user,
2067 user=user,
2068 date=date,
2068 date=date,
2069 branch=branch,
2069 branch=branch,
2070 editor=editor,
2070 editor=editor,
2071 )
2071 )
2072
2072
2073 overrides = {}
2073 overrides = {}
2074 if opts.get(b'secret'):
2074 if opts.get(b'secret'):
2075 overrides[(b'phases', b'new-commit')] = b'secret'
2075 overrides[(b'phases', b'new-commit')] = b'secret'
2076 with repo.ui.configoverride(overrides, b'import'):
2076 with repo.ui.configoverride(overrides, b'import'):
2077 n = memctx.commit()
2077 n = memctx.commit()
2078 finally:
2078 finally:
2079 store.close()
2079 store.close()
2080 if opts.get(b'exact') and nocommit:
2080 if opts.get(b'exact') and nocommit:
2081 # --exact with --no-commit is still useful in that it does merge
2081 # --exact with --no-commit is still useful in that it does merge
2082 # and branch bits
2082 # and branch bits
2083 ui.warn(_(b"warning: can't check exact import with --no-commit\n"))
2083 ui.warn(_(b"warning: can't check exact import with --no-commit\n"))
2084 elif opts.get(b'exact') and (not n or hex(n) != nodeid):
2084 elif opts.get(b'exact') and (not n or hex(n) != nodeid):
2085 raise error.Abort(_(b'patch is damaged or loses information'))
2085 raise error.Abort(_(b'patch is damaged or loses information'))
2086 msg = _(b'applied to working directory')
2086 msg = _(b'applied to working directory')
2087 if n:
2087 if n:
2088 # i18n: refers to a short changeset id
2088 # i18n: refers to a short changeset id
2089 msg = _(b'created %s') % short(n)
2089 msg = _(b'created %s') % short(n)
2090 return msg, n, rejects
2090 return msg, n, rejects
2091
2091
2092
2092
2093 # facility to let extensions include additional data in an exported patch
2093 # facility to let extensions include additional data in an exported patch
2094 # list of identifiers to be executed in order
2094 # list of identifiers to be executed in order
2095 extraexport = []
2095 extraexport = []
2096 # mapping from identifier to actual export function
2096 # mapping from identifier to actual export function
2097 # function as to return a string to be added to the header or None
2097 # function as to return a string to be added to the header or None
2098 # it is given two arguments (sequencenumber, changectx)
2098 # it is given two arguments (sequencenumber, changectx)
2099 extraexportmap = {}
2099 extraexportmap = {}
2100
2100
2101
2101
2102 def _exportsingle(repo, ctx, fm, match, switch_parent, seqno, diffopts):
2102 def _exportsingle(repo, ctx, fm, match, switch_parent, seqno, diffopts):
2103 node = scmutil.binnode(ctx)
2103 node = scmutil.binnode(ctx)
2104 parents = [p.node() for p in ctx.parents() if p]
2104 parents = [p.node() for p in ctx.parents() if p]
2105 branch = ctx.branch()
2105 branch = ctx.branch()
2106 if switch_parent:
2106 if switch_parent:
2107 parents.reverse()
2107 parents.reverse()
2108
2108
2109 if parents:
2109 if parents:
2110 prev = parents[0]
2110 prev = parents[0]
2111 else:
2111 else:
2112 prev = repo.nullid
2112 prev = repo.nullid
2113
2113
2114 fm.context(ctx=ctx)
2114 fm.context(ctx=ctx)
2115 fm.plain(b'# HG changeset patch\n')
2115 fm.plain(b'# HG changeset patch\n')
2116 fm.write(b'user', b'# User %s\n', ctx.user())
2116 fm.write(b'user', b'# User %s\n', ctx.user())
2117 fm.plain(b'# Date %d %d\n' % ctx.date())
2117 fm.plain(b'# Date %d %d\n' % ctx.date())
2118 fm.write(b'date', b'# %s\n', fm.formatdate(ctx.date()))
2118 fm.write(b'date', b'# %s\n', fm.formatdate(ctx.date()))
2119 fm.condwrite(
2119 fm.condwrite(
2120 branch and branch != b'default', b'branch', b'# Branch %s\n', branch
2120 branch and branch != b'default', b'branch', b'# Branch %s\n', branch
2121 )
2121 )
2122 fm.write(b'node', b'# Node ID %s\n', hex(node))
2122 fm.write(b'node', b'# Node ID %s\n', hex(node))
2123 fm.plain(b'# Parent %s\n' % hex(prev))
2123 fm.plain(b'# Parent %s\n' % hex(prev))
2124 if len(parents) > 1:
2124 if len(parents) > 1:
2125 fm.plain(b'# Parent %s\n' % hex(parents[1]))
2125 fm.plain(b'# Parent %s\n' % hex(parents[1]))
2126 fm.data(parents=fm.formatlist(pycompat.maplist(hex, parents), name=b'node'))
2126 fm.data(parents=fm.formatlist(pycompat.maplist(hex, parents), name=b'node'))
2127
2127
2128 # TODO: redesign extraexportmap function to support formatter
2128 # TODO: redesign extraexportmap function to support formatter
2129 for headerid in extraexport:
2129 for headerid in extraexport:
2130 header = extraexportmap[headerid](seqno, ctx)
2130 header = extraexportmap[headerid](seqno, ctx)
2131 if header is not None:
2131 if header is not None:
2132 fm.plain(b'# %s\n' % header)
2132 fm.plain(b'# %s\n' % header)
2133
2133
2134 fm.write(b'desc', b'%s\n', ctx.description().rstrip())
2134 fm.write(b'desc', b'%s\n', ctx.description().rstrip())
2135 fm.plain(b'\n')
2135 fm.plain(b'\n')
2136
2136
2137 if fm.isplain():
2137 if fm.isplain():
2138 chunkiter = patch.diffui(repo, prev, node, match, opts=diffopts)
2138 chunkiter = patch.diffui(repo, prev, node, match, opts=diffopts)
2139 for chunk, label in chunkiter:
2139 for chunk, label in chunkiter:
2140 fm.plain(chunk, label=label)
2140 fm.plain(chunk, label=label)
2141 else:
2141 else:
2142 chunkiter = patch.diff(repo, prev, node, match, opts=diffopts)
2142 chunkiter = patch.diff(repo, prev, node, match, opts=diffopts)
2143 # TODO: make it structured?
2143 # TODO: make it structured?
2144 fm.data(diff=b''.join(chunkiter))
2144 fm.data(diff=b''.join(chunkiter))
2145
2145
2146
2146
2147 def _exportfile(repo, revs, fm, dest, switch_parent, diffopts, match):
2147 def _exportfile(repo, revs, fm, dest, switch_parent, diffopts, match):
2148 """Export changesets to stdout or a single file"""
2148 """Export changesets to stdout or a single file"""
2149 for seqno, rev in enumerate(revs, 1):
2149 for seqno, rev in enumerate(revs, 1):
2150 ctx = repo[rev]
2150 ctx = repo[rev]
2151 if not dest.startswith(b'<'):
2151 if not dest.startswith(b'<'):
2152 repo.ui.note(b"%s\n" % dest)
2152 repo.ui.note(b"%s\n" % dest)
2153 fm.startitem()
2153 fm.startitem()
2154 _exportsingle(repo, ctx, fm, match, switch_parent, seqno, diffopts)
2154 _exportsingle(repo, ctx, fm, match, switch_parent, seqno, diffopts)
2155
2155
2156
2156
2157 def _exportfntemplate(
2157 def _exportfntemplate(
2158 repo, revs, basefm, fntemplate, switch_parent, diffopts, match
2158 repo, revs, basefm, fntemplate, switch_parent, diffopts, match
2159 ):
2159 ):
2160 """Export changesets to possibly multiple files"""
2160 """Export changesets to possibly multiple files"""
2161 total = len(revs)
2161 total = len(revs)
2162 revwidth = max(len(str(rev)) for rev in revs)
2162 revwidth = max(len(str(rev)) for rev in revs)
2163 filemap = util.sortdict() # filename: [(seqno, rev), ...]
2163 filemap = util.sortdict() # filename: [(seqno, rev), ...]
2164
2164
2165 for seqno, rev in enumerate(revs, 1):
2165 for seqno, rev in enumerate(revs, 1):
2166 ctx = repo[rev]
2166 ctx = repo[rev]
2167 dest = makefilename(
2167 dest = makefilename(
2168 ctx, fntemplate, total=total, seqno=seqno, revwidth=revwidth
2168 ctx, fntemplate, total=total, seqno=seqno, revwidth=revwidth
2169 )
2169 )
2170 filemap.setdefault(dest, []).append((seqno, rev))
2170 filemap.setdefault(dest, []).append((seqno, rev))
2171
2171
2172 for dest in filemap:
2172 for dest in filemap:
2173 with formatter.maybereopen(basefm, dest) as fm:
2173 with formatter.maybereopen(basefm, dest) as fm:
2174 repo.ui.note(b"%s\n" % dest)
2174 repo.ui.note(b"%s\n" % dest)
2175 for seqno, rev in filemap[dest]:
2175 for seqno, rev in filemap[dest]:
2176 fm.startitem()
2176 fm.startitem()
2177 ctx = repo[rev]
2177 ctx = repo[rev]
2178 _exportsingle(
2178 _exportsingle(
2179 repo, ctx, fm, match, switch_parent, seqno, diffopts
2179 repo, ctx, fm, match, switch_parent, seqno, diffopts
2180 )
2180 )
2181
2181
2182
2182
2183 def _prefetchchangedfiles(repo, revs, match):
2183 def _prefetchchangedfiles(repo, revs, match):
2184 allfiles = set()
2184 allfiles = set()
2185 for rev in revs:
2185 for rev in revs:
2186 for file in repo[rev].files():
2186 for file in repo[rev].files():
2187 if not match or match(file):
2187 if not match or match(file):
2188 allfiles.add(file)
2188 allfiles.add(file)
2189 match = scmutil.matchfiles(repo, allfiles)
2189 match = scmutil.matchfiles(repo, allfiles)
2190 revmatches = [(rev, match) for rev in revs]
2190 revmatches = [(rev, match) for rev in revs]
2191 scmutil.prefetchfiles(repo, revmatches)
2191 scmutil.prefetchfiles(repo, revmatches)
2192
2192
2193
2193
2194 def export(
2194 def export(
2195 repo,
2195 repo,
2196 revs,
2196 revs,
2197 basefm,
2197 basefm,
2198 fntemplate=b'hg-%h.patch',
2198 fntemplate=b'hg-%h.patch',
2199 switch_parent=False,
2199 switch_parent=False,
2200 opts=None,
2200 opts=None,
2201 match=None,
2201 match=None,
2202 ):
2202 ):
2203 """export changesets as hg patches
2203 """export changesets as hg patches
2204
2204
2205 Args:
2205 Args:
2206 repo: The repository from which we're exporting revisions.
2206 repo: The repository from which we're exporting revisions.
2207 revs: A list of revisions to export as revision numbers.
2207 revs: A list of revisions to export as revision numbers.
2208 basefm: A formatter to which patches should be written.
2208 basefm: A formatter to which patches should be written.
2209 fntemplate: An optional string to use for generating patch file names.
2209 fntemplate: An optional string to use for generating patch file names.
2210 switch_parent: If True, show diffs against second parent when not nullid.
2210 switch_parent: If True, show diffs against second parent when not nullid.
2211 Default is false, which always shows diff against p1.
2211 Default is false, which always shows diff against p1.
2212 opts: diff options to use for generating the patch.
2212 opts: diff options to use for generating the patch.
2213 match: If specified, only export changes to files matching this matcher.
2213 match: If specified, only export changes to files matching this matcher.
2214
2214
2215 Returns:
2215 Returns:
2216 Nothing.
2216 Nothing.
2217
2217
2218 Side Effect:
2218 Side Effect:
2219 "HG Changeset Patch" data is emitted to one of the following
2219 "HG Changeset Patch" data is emitted to one of the following
2220 destinations:
2220 destinations:
2221 fntemplate specified: Each rev is written to a unique file named using
2221 fntemplate specified: Each rev is written to a unique file named using
2222 the given template.
2222 the given template.
2223 Otherwise: All revs will be written to basefm.
2223 Otherwise: All revs will be written to basefm.
2224 """
2224 """
2225 _prefetchchangedfiles(repo, revs, match)
2225 _prefetchchangedfiles(repo, revs, match)
2226
2226
2227 if not fntemplate:
2227 if not fntemplate:
2228 _exportfile(
2228 _exportfile(
2229 repo, revs, basefm, b'<unnamed>', switch_parent, opts, match
2229 repo, revs, basefm, b'<unnamed>', switch_parent, opts, match
2230 )
2230 )
2231 else:
2231 else:
2232 _exportfntemplate(
2232 _exportfntemplate(
2233 repo, revs, basefm, fntemplate, switch_parent, opts, match
2233 repo, revs, basefm, fntemplate, switch_parent, opts, match
2234 )
2234 )
2235
2235
2236
2236
2237 def exportfile(repo, revs, fp, switch_parent=False, opts=None, match=None):
2237 def exportfile(repo, revs, fp, switch_parent=False, opts=None, match=None):
2238 """Export changesets to the given file stream"""
2238 """Export changesets to the given file stream"""
2239 _prefetchchangedfiles(repo, revs, match)
2239 _prefetchchangedfiles(repo, revs, match)
2240
2240
2241 dest = getattr(fp, 'name', b'<unnamed>')
2241 dest = getattr(fp, 'name', b'<unnamed>')
2242 with formatter.formatter(repo.ui, fp, b'export', {}) as fm:
2242 with formatter.formatter(repo.ui, fp, b'export', {}) as fm:
2243 _exportfile(repo, revs, fm, dest, switch_parent, opts, match)
2243 _exportfile(repo, revs, fm, dest, switch_parent, opts, match)
2244
2244
2245
2245
2246 def showmarker(fm, marker, index=None):
2246 def showmarker(fm, marker, index=None):
2247 """utility function to display obsolescence marker in a readable way
2247 """utility function to display obsolescence marker in a readable way
2248
2248
2249 To be used by debug function."""
2249 To be used by debug function."""
2250 if index is not None:
2250 if index is not None:
2251 fm.write(b'index', b'%i ', index)
2251 fm.write(b'index', b'%i ', index)
2252 fm.write(b'prednode', b'%s ', hex(marker.prednode()))
2252 fm.write(b'prednode', b'%s ', hex(marker.prednode()))
2253 succs = marker.succnodes()
2253 succs = marker.succnodes()
2254 fm.condwrite(
2254 fm.condwrite(
2255 succs,
2255 succs,
2256 b'succnodes',
2256 b'succnodes',
2257 b'%s ',
2257 b'%s ',
2258 fm.formatlist(map(hex, succs), name=b'node'),
2258 fm.formatlist(map(hex, succs), name=b'node'),
2259 )
2259 )
2260 fm.write(b'flag', b'%X ', marker.flags())
2260 fm.write(b'flag', b'%X ', marker.flags())
2261 parents = marker.parentnodes()
2261 parents = marker.parentnodes()
2262 if parents is not None:
2262 if parents is not None:
2263 fm.write(
2263 fm.write(
2264 b'parentnodes',
2264 b'parentnodes',
2265 b'{%s} ',
2265 b'{%s} ',
2266 fm.formatlist(map(hex, parents), name=b'node', sep=b', '),
2266 fm.formatlist(map(hex, parents), name=b'node', sep=b', '),
2267 )
2267 )
2268 fm.write(b'date', b'(%s) ', fm.formatdate(marker.date()))
2268 fm.write(b'date', b'(%s) ', fm.formatdate(marker.date()))
2269 meta = marker.metadata().copy()
2269 meta = marker.metadata().copy()
2270 meta.pop(b'date', None)
2270 meta.pop(b'date', None)
2271 smeta = pycompat.rapply(pycompat.maybebytestr, meta)
2271 smeta = pycompat.rapply(pycompat.maybebytestr, meta)
2272 fm.write(
2272 fm.write(
2273 b'metadata', b'{%s}', fm.formatdict(smeta, fmt=b'%r: %r', sep=b', ')
2273 b'metadata', b'{%s}', fm.formatdict(smeta, fmt=b'%r: %r', sep=b', ')
2274 )
2274 )
2275 fm.plain(b'\n')
2275 fm.plain(b'\n')
2276
2276
2277
2277
2278 def finddate(ui, repo, date):
2278 def finddate(ui, repo, date):
2279 """Find the tipmost changeset that matches the given date spec"""
2279 """Find the tipmost changeset that matches the given date spec"""
2280 mrevs = repo.revs(b'date(%s)', date)
2280 mrevs = repo.revs(b'date(%s)', date)
2281 try:
2281 try:
2282 rev = mrevs.max()
2282 rev = mrevs.max()
2283 except ValueError:
2283 except ValueError:
2284 raise error.InputError(_(b"revision matching date not found"))
2284 raise error.InputError(_(b"revision matching date not found"))
2285
2285
2286 ui.status(
2286 ui.status(
2287 _(b"found revision %d from %s\n")
2287 _(b"found revision %d from %s\n")
2288 % (rev, dateutil.datestr(repo[rev].date()))
2288 % (rev, dateutil.datestr(repo[rev].date()))
2289 )
2289 )
2290 return b'%d' % rev
2290 return b'%d' % rev
2291
2291
2292
2292
2293 def add(ui, repo, match, prefix, uipathfn, explicitonly, **opts):
2293 def add(ui, repo, match, prefix, uipathfn, explicitonly, **opts):
2294 bad = []
2294 bad = []
2295
2295
2296 badfn = lambda x, y: bad.append(x) or match.bad(x, y)
2296 badfn = lambda x, y: bad.append(x) or match.bad(x, y)
2297 names = []
2297 names = []
2298 wctx = repo[None]
2298 wctx = repo[None]
2299 cca = None
2299 cca = None
2300 abort, warn = scmutil.checkportabilityalert(ui)
2300 abort, warn = scmutil.checkportabilityalert(ui)
2301 if abort or warn:
2301 if abort or warn:
2302 cca = scmutil.casecollisionauditor(ui, abort, repo.dirstate)
2302 cca = scmutil.casecollisionauditor(ui, abort, repo.dirstate)
2303
2303
2304 match = repo.narrowmatch(match, includeexact=True)
2304 match = repo.narrowmatch(match, includeexact=True)
2305 badmatch = matchmod.badmatch(match, badfn)
2305 badmatch = matchmod.badmatch(match, badfn)
2306 dirstate = repo.dirstate
2306 dirstate = repo.dirstate
2307 # We don't want to just call wctx.walk here, since it would return a lot of
2307 # We don't want to just call wctx.walk here, since it would return a lot of
2308 # clean files, which we aren't interested in and takes time.
2308 # clean files, which we aren't interested in and takes time.
2309 for f in sorted(
2309 for f in sorted(
2310 dirstate.walk(
2310 dirstate.walk(
2311 badmatch,
2311 badmatch,
2312 subrepos=sorted(wctx.substate),
2312 subrepos=sorted(wctx.substate),
2313 unknown=True,
2313 unknown=True,
2314 ignored=False,
2314 ignored=False,
2315 full=False,
2315 full=False,
2316 )
2316 )
2317 ):
2317 ):
2318 exact = match.exact(f)
2318 exact = match.exact(f)
2319 if exact or not explicitonly and f not in wctx and repo.wvfs.lexists(f):
2319 if exact or not explicitonly and f not in wctx and repo.wvfs.lexists(f):
2320 if cca:
2320 if cca:
2321 cca(f)
2321 cca(f)
2322 names.append(f)
2322 names.append(f)
2323 if ui.verbose or not exact:
2323 if ui.verbose or not exact:
2324 ui.status(
2324 ui.status(
2325 _(b'adding %s\n') % uipathfn(f), label=b'ui.addremove.added'
2325 _(b'adding %s\n') % uipathfn(f), label=b'ui.addremove.added'
2326 )
2326 )
2327
2327
2328 for subpath in sorted(wctx.substate):
2328 for subpath in sorted(wctx.substate):
2329 sub = wctx.sub(subpath)
2329 sub = wctx.sub(subpath)
2330 try:
2330 try:
2331 submatch = matchmod.subdirmatcher(subpath, match)
2331 submatch = matchmod.subdirmatcher(subpath, match)
2332 subprefix = repo.wvfs.reljoin(prefix, subpath)
2332 subprefix = repo.wvfs.reljoin(prefix, subpath)
2333 subuipathfn = scmutil.subdiruipathfn(subpath, uipathfn)
2333 subuipathfn = scmutil.subdiruipathfn(subpath, uipathfn)
2334 if opts.get('subrepos'):
2334 if opts.get('subrepos'):
2335 bad.extend(
2335 bad.extend(
2336 sub.add(ui, submatch, subprefix, subuipathfn, False, **opts)
2336 sub.add(ui, submatch, subprefix, subuipathfn, False, **opts)
2337 )
2337 )
2338 else:
2338 else:
2339 bad.extend(
2339 bad.extend(
2340 sub.add(ui, submatch, subprefix, subuipathfn, True, **opts)
2340 sub.add(ui, submatch, subprefix, subuipathfn, True, **opts)
2341 )
2341 )
2342 except error.LookupError:
2342 except error.LookupError:
2343 ui.status(
2343 ui.status(
2344 _(b"skipping missing subrepository: %s\n") % uipathfn(subpath)
2344 _(b"skipping missing subrepository: %s\n") % uipathfn(subpath)
2345 )
2345 )
2346
2346
2347 if not opts.get('dry_run'):
2347 if not opts.get('dry_run'):
2348 rejected = wctx.add(names, prefix)
2348 rejected = wctx.add(names, prefix)
2349 bad.extend(f for f in rejected if f in match.files())
2349 bad.extend(f for f in rejected if f in match.files())
2350 return bad
2350 return bad
2351
2351
2352
2352
2353 def addwebdirpath(repo, serverpath, webconf):
2353 def addwebdirpath(repo, serverpath, webconf):
2354 webconf[serverpath] = repo.root
2354 webconf[serverpath] = repo.root
2355 repo.ui.debug(b'adding %s = %s\n' % (serverpath, repo.root))
2355 repo.ui.debug(b'adding %s = %s\n' % (serverpath, repo.root))
2356
2356
2357 for r in repo.revs(b'filelog("path:.hgsub")'):
2357 for r in repo.revs(b'filelog("path:.hgsub")'):
2358 ctx = repo[r]
2358 ctx = repo[r]
2359 for subpath in ctx.substate:
2359 for subpath in ctx.substate:
2360 ctx.sub(subpath).addwebdirpath(serverpath, webconf)
2360 ctx.sub(subpath).addwebdirpath(serverpath, webconf)
2361
2361
2362
2362
2363 def forget(
2363 def forget(
2364 ui, repo, match, prefix, uipathfn, explicitonly, dryrun, interactive
2364 ui, repo, match, prefix, uipathfn, explicitonly, dryrun, interactive
2365 ):
2365 ):
2366 if dryrun and interactive:
2366 if dryrun and interactive:
2367 raise error.InputError(
2367 raise error.InputError(
2368 _(b"cannot specify both --dry-run and --interactive")
2368 _(b"cannot specify both --dry-run and --interactive")
2369 )
2369 )
2370 bad = []
2370 bad = []
2371 badfn = lambda x, y: bad.append(x) or match.bad(x, y)
2371 badfn = lambda x, y: bad.append(x) or match.bad(x, y)
2372 wctx = repo[None]
2372 wctx = repo[None]
2373 forgot = []
2373 forgot = []
2374
2374
2375 s = repo.status(match=matchmod.badmatch(match, badfn), clean=True)
2375 s = repo.status(match=matchmod.badmatch(match, badfn), clean=True)
2376 forget = sorted(s.modified + s.added + s.deleted + s.clean)
2376 forget = sorted(s.modified + s.added + s.deleted + s.clean)
2377 if explicitonly:
2377 if explicitonly:
2378 forget = [f for f in forget if match.exact(f)]
2378 forget = [f for f in forget if match.exact(f)]
2379
2379
2380 for subpath in sorted(wctx.substate):
2380 for subpath in sorted(wctx.substate):
2381 sub = wctx.sub(subpath)
2381 sub = wctx.sub(subpath)
2382 submatch = matchmod.subdirmatcher(subpath, match)
2382 submatch = matchmod.subdirmatcher(subpath, match)
2383 subprefix = repo.wvfs.reljoin(prefix, subpath)
2383 subprefix = repo.wvfs.reljoin(prefix, subpath)
2384 subuipathfn = scmutil.subdiruipathfn(subpath, uipathfn)
2384 subuipathfn = scmutil.subdiruipathfn(subpath, uipathfn)
2385 try:
2385 try:
2386 subbad, subforgot = sub.forget(
2386 subbad, subforgot = sub.forget(
2387 submatch,
2387 submatch,
2388 subprefix,
2388 subprefix,
2389 subuipathfn,
2389 subuipathfn,
2390 dryrun=dryrun,
2390 dryrun=dryrun,
2391 interactive=interactive,
2391 interactive=interactive,
2392 )
2392 )
2393 bad.extend([subpath + b'/' + f for f in subbad])
2393 bad.extend([subpath + b'/' + f for f in subbad])
2394 forgot.extend([subpath + b'/' + f for f in subforgot])
2394 forgot.extend([subpath + b'/' + f for f in subforgot])
2395 except error.LookupError:
2395 except error.LookupError:
2396 ui.status(
2396 ui.status(
2397 _(b"skipping missing subrepository: %s\n") % uipathfn(subpath)
2397 _(b"skipping missing subrepository: %s\n") % uipathfn(subpath)
2398 )
2398 )
2399
2399
2400 if not explicitonly:
2400 if not explicitonly:
2401 for f in match.files():
2401 for f in match.files():
2402 if f not in repo.dirstate and not repo.wvfs.isdir(f):
2402 if f not in repo.dirstate and not repo.wvfs.isdir(f):
2403 if f not in forgot:
2403 if f not in forgot:
2404 if repo.wvfs.exists(f):
2404 if repo.wvfs.exists(f):
2405 # Don't complain if the exact case match wasn't given.
2405 # Don't complain if the exact case match wasn't given.
2406 # But don't do this until after checking 'forgot', so
2406 # But don't do this until after checking 'forgot', so
2407 # that subrepo files aren't normalized, and this op is
2407 # that subrepo files aren't normalized, and this op is
2408 # purely from data cached by the status walk above.
2408 # purely from data cached by the status walk above.
2409 if repo.dirstate.normalize(f) in repo.dirstate:
2409 if repo.dirstate.normalize(f) in repo.dirstate:
2410 continue
2410 continue
2411 ui.warn(
2411 ui.warn(
2412 _(
2412 _(
2413 b'not removing %s: '
2413 b'not removing %s: '
2414 b'file is already untracked\n'
2414 b'file is already untracked\n'
2415 )
2415 )
2416 % uipathfn(f)
2416 % uipathfn(f)
2417 )
2417 )
2418 bad.append(f)
2418 bad.append(f)
2419
2419
2420 if interactive:
2420 if interactive:
2421 responses = _(
2421 responses = _(
2422 b'[Ynsa?]'
2422 b'[Ynsa?]'
2423 b'$$ &Yes, forget this file'
2423 b'$$ &Yes, forget this file'
2424 b'$$ &No, skip this file'
2424 b'$$ &No, skip this file'
2425 b'$$ &Skip remaining files'
2425 b'$$ &Skip remaining files'
2426 b'$$ Include &all remaining files'
2426 b'$$ Include &all remaining files'
2427 b'$$ &? (display help)'
2427 b'$$ &? (display help)'
2428 )
2428 )
2429 for filename in forget[:]:
2429 for filename in forget[:]:
2430 r = ui.promptchoice(
2430 r = ui.promptchoice(
2431 _(b'forget %s %s') % (uipathfn(filename), responses)
2431 _(b'forget %s %s') % (uipathfn(filename), responses)
2432 )
2432 )
2433 if r == 4: # ?
2433 if r == 4: # ?
2434 while r == 4:
2434 while r == 4:
2435 for c, t in ui.extractchoices(responses)[1]:
2435 for c, t in ui.extractchoices(responses)[1]:
2436 ui.write(b'%s - %s\n' % (c, encoding.lower(t)))
2436 ui.write(b'%s - %s\n' % (c, encoding.lower(t)))
2437 r = ui.promptchoice(
2437 r = ui.promptchoice(
2438 _(b'forget %s %s') % (uipathfn(filename), responses)
2438 _(b'forget %s %s') % (uipathfn(filename), responses)
2439 )
2439 )
2440 if r == 0: # yes
2440 if r == 0: # yes
2441 continue
2441 continue
2442 elif r == 1: # no
2442 elif r == 1: # no
2443 forget.remove(filename)
2443 forget.remove(filename)
2444 elif r == 2: # Skip
2444 elif r == 2: # Skip
2445 fnindex = forget.index(filename)
2445 fnindex = forget.index(filename)
2446 del forget[fnindex:]
2446 del forget[fnindex:]
2447 break
2447 break
2448 elif r == 3: # All
2448 elif r == 3: # All
2449 break
2449 break
2450
2450
2451 for f in forget:
2451 for f in forget:
2452 if ui.verbose or not match.exact(f) or interactive:
2452 if ui.verbose or not match.exact(f) or interactive:
2453 ui.status(
2453 ui.status(
2454 _(b'removing %s\n') % uipathfn(f), label=b'ui.addremove.removed'
2454 _(b'removing %s\n') % uipathfn(f), label=b'ui.addremove.removed'
2455 )
2455 )
2456
2456
2457 if not dryrun:
2457 if not dryrun:
2458 rejected = wctx.forget(forget, prefix)
2458 rejected = wctx.forget(forget, prefix)
2459 bad.extend(f for f in rejected if f in match.files())
2459 bad.extend(f for f in rejected if f in match.files())
2460 forgot.extend(f for f in forget if f not in rejected)
2460 forgot.extend(f for f in forget if f not in rejected)
2461 return bad, forgot
2461 return bad, forgot
2462
2462
2463
2463
2464 def files(ui, ctx, m, uipathfn, fm, fmt, subrepos):
2464 def files(ui, ctx, m, uipathfn, fm, fmt, subrepos):
2465 ret = 1
2465 ret = 1
2466
2466
2467 needsfctx = ui.verbose or {b'size', b'flags'} & fm.datahint()
2467 needsfctx = ui.verbose or {b'size', b'flags'} & fm.datahint()
2468 if fm.isplain() and not needsfctx:
2468 if fm.isplain() and not needsfctx:
2469 # Fast path. The speed-up comes from skipping the formatter, and batching
2469 # Fast path. The speed-up comes from skipping the formatter, and batching
2470 # calls to ui.write.
2470 # calls to ui.write.
2471 buf = []
2471 buf = []
2472 for f in ctx.matches(m):
2472 for f in ctx.matches(m):
2473 buf.append(fmt % uipathfn(f))
2473 buf.append(fmt % uipathfn(f))
2474 if len(buf) > 100:
2474 if len(buf) > 100:
2475 ui.write(b''.join(buf))
2475 ui.write(b''.join(buf))
2476 del buf[:]
2476 del buf[:]
2477 ret = 0
2477 ret = 0
2478 if buf:
2478 if buf:
2479 ui.write(b''.join(buf))
2479 ui.write(b''.join(buf))
2480 else:
2480 else:
2481 for f in ctx.matches(m):
2481 for f in ctx.matches(m):
2482 fm.startitem()
2482 fm.startitem()
2483 fm.context(ctx=ctx)
2483 fm.context(ctx=ctx)
2484 if needsfctx:
2484 if needsfctx:
2485 fc = ctx[f]
2485 fc = ctx[f]
2486 fm.write(b'size flags', b'% 10d % 1s ', fc.size(), fc.flags())
2486 fm.write(b'size flags', b'% 10d % 1s ', fc.size(), fc.flags())
2487 fm.data(path=f)
2487 fm.data(path=f)
2488 fm.plain(fmt % uipathfn(f))
2488 fm.plain(fmt % uipathfn(f))
2489 ret = 0
2489 ret = 0
2490
2490
2491 for subpath in sorted(ctx.substate):
2491 for subpath in sorted(ctx.substate):
2492 submatch = matchmod.subdirmatcher(subpath, m)
2492 submatch = matchmod.subdirmatcher(subpath, m)
2493 subuipathfn = scmutil.subdiruipathfn(subpath, uipathfn)
2493 subuipathfn = scmutil.subdiruipathfn(subpath, uipathfn)
2494 if subrepos or m.exact(subpath) or any(submatch.files()):
2494 if subrepos or m.exact(subpath) or any(submatch.files()):
2495 sub = ctx.sub(subpath)
2495 sub = ctx.sub(subpath)
2496 try:
2496 try:
2497 recurse = m.exact(subpath) or subrepos
2497 recurse = m.exact(subpath) or subrepos
2498 if (
2498 if (
2499 sub.printfiles(ui, submatch, subuipathfn, fm, fmt, recurse)
2499 sub.printfiles(ui, submatch, subuipathfn, fm, fmt, recurse)
2500 == 0
2500 == 0
2501 ):
2501 ):
2502 ret = 0
2502 ret = 0
2503 except error.LookupError:
2503 except error.LookupError:
2504 ui.status(
2504 ui.status(
2505 _(b"skipping missing subrepository: %s\n")
2505 _(b"skipping missing subrepository: %s\n")
2506 % uipathfn(subpath)
2506 % uipathfn(subpath)
2507 )
2507 )
2508
2508
2509 return ret
2509 return ret
2510
2510
2511
2511
2512 def remove(
2512 def remove(
2513 ui, repo, m, prefix, uipathfn, after, force, subrepos, dryrun, warnings=None
2513 ui, repo, m, prefix, uipathfn, after, force, subrepos, dryrun, warnings=None
2514 ):
2514 ):
2515 ret = 0
2515 ret = 0
2516 s = repo.status(match=m, clean=True)
2516 s = repo.status(match=m, clean=True)
2517 modified, added, deleted, clean = s.modified, s.added, s.deleted, s.clean
2517 modified, added, deleted, clean = s.modified, s.added, s.deleted, s.clean
2518
2518
2519 wctx = repo[None]
2519 wctx = repo[None]
2520
2520
2521 if warnings is None:
2521 if warnings is None:
2522 warnings = []
2522 warnings = []
2523 warn = True
2523 warn = True
2524 else:
2524 else:
2525 warn = False
2525 warn = False
2526
2526
2527 subs = sorted(wctx.substate)
2527 subs = sorted(wctx.substate)
2528 progress = ui.makeprogress(
2528 progress = ui.makeprogress(
2529 _(b'searching'), total=len(subs), unit=_(b'subrepos')
2529 _(b'searching'), total=len(subs), unit=_(b'subrepos')
2530 )
2530 )
2531 for subpath in subs:
2531 for subpath in subs:
2532 submatch = matchmod.subdirmatcher(subpath, m)
2532 submatch = matchmod.subdirmatcher(subpath, m)
2533 subprefix = repo.wvfs.reljoin(prefix, subpath)
2533 subprefix = repo.wvfs.reljoin(prefix, subpath)
2534 subuipathfn = scmutil.subdiruipathfn(subpath, uipathfn)
2534 subuipathfn = scmutil.subdiruipathfn(subpath, uipathfn)
2535 if subrepos or m.exact(subpath) or any(submatch.files()):
2535 if subrepos or m.exact(subpath) or any(submatch.files()):
2536 progress.increment()
2536 progress.increment()
2537 sub = wctx.sub(subpath)
2537 sub = wctx.sub(subpath)
2538 try:
2538 try:
2539 if sub.removefiles(
2539 if sub.removefiles(
2540 submatch,
2540 submatch,
2541 subprefix,
2541 subprefix,
2542 subuipathfn,
2542 subuipathfn,
2543 after,
2543 after,
2544 force,
2544 force,
2545 subrepos,
2545 subrepos,
2546 dryrun,
2546 dryrun,
2547 warnings,
2547 warnings,
2548 ):
2548 ):
2549 ret = 1
2549 ret = 1
2550 except error.LookupError:
2550 except error.LookupError:
2551 warnings.append(
2551 warnings.append(
2552 _(b"skipping missing subrepository: %s\n")
2552 _(b"skipping missing subrepository: %s\n")
2553 % uipathfn(subpath)
2553 % uipathfn(subpath)
2554 )
2554 )
2555 progress.complete()
2555 progress.complete()
2556
2556
2557 # warn about failure to delete explicit files/dirs
2557 # warn about failure to delete explicit files/dirs
2558 deleteddirs = pathutil.dirs(deleted)
2558 deleteddirs = pathutil.dirs(deleted)
2559 files = m.files()
2559 files = m.files()
2560 progress = ui.makeprogress(
2560 progress = ui.makeprogress(
2561 _(b'deleting'), total=len(files), unit=_(b'files')
2561 _(b'deleting'), total=len(files), unit=_(b'files')
2562 )
2562 )
2563 for f in files:
2563 for f in files:
2564
2564
2565 def insubrepo():
2565 def insubrepo():
2566 for subpath in wctx.substate:
2566 for subpath in wctx.substate:
2567 if f.startswith(subpath + b'/'):
2567 if f.startswith(subpath + b'/'):
2568 return True
2568 return True
2569 return False
2569 return False
2570
2570
2571 progress.increment()
2571 progress.increment()
2572 isdir = f in deleteddirs or wctx.hasdir(f)
2572 isdir = f in deleteddirs or wctx.hasdir(f)
2573 if f in repo.dirstate or isdir or f == b'.' or insubrepo() or f in subs:
2573 if f in repo.dirstate or isdir or f == b'.' or insubrepo() or f in subs:
2574 continue
2574 continue
2575
2575
2576 if repo.wvfs.exists(f):
2576 if repo.wvfs.exists(f):
2577 if repo.wvfs.isdir(f):
2577 if repo.wvfs.isdir(f):
2578 warnings.append(
2578 warnings.append(
2579 _(b'not removing %s: no tracked files\n') % uipathfn(f)
2579 _(b'not removing %s: no tracked files\n') % uipathfn(f)
2580 )
2580 )
2581 else:
2581 else:
2582 warnings.append(
2582 warnings.append(
2583 _(b'not removing %s: file is untracked\n') % uipathfn(f)
2583 _(b'not removing %s: file is untracked\n') % uipathfn(f)
2584 )
2584 )
2585 # missing files will generate a warning elsewhere
2585 # missing files will generate a warning elsewhere
2586 ret = 1
2586 ret = 1
2587 progress.complete()
2587 progress.complete()
2588
2588
2589 if force:
2589 if force:
2590 list = modified + deleted + clean + added
2590 list = modified + deleted + clean + added
2591 elif after:
2591 elif after:
2592 list = deleted
2592 list = deleted
2593 remaining = modified + added + clean
2593 remaining = modified + added + clean
2594 progress = ui.makeprogress(
2594 progress = ui.makeprogress(
2595 _(b'skipping'), total=len(remaining), unit=_(b'files')
2595 _(b'skipping'), total=len(remaining), unit=_(b'files')
2596 )
2596 )
2597 for f in remaining:
2597 for f in remaining:
2598 progress.increment()
2598 progress.increment()
2599 if ui.verbose or (f in files):
2599 if ui.verbose or (f in files):
2600 warnings.append(
2600 warnings.append(
2601 _(b'not removing %s: file still exists\n') % uipathfn(f)
2601 _(b'not removing %s: file still exists\n') % uipathfn(f)
2602 )
2602 )
2603 ret = 1
2603 ret = 1
2604 progress.complete()
2604 progress.complete()
2605 else:
2605 else:
2606 list = deleted + clean
2606 list = deleted + clean
2607 progress = ui.makeprogress(
2607 progress = ui.makeprogress(
2608 _(b'skipping'), total=(len(modified) + len(added)), unit=_(b'files')
2608 _(b'skipping'), total=(len(modified) + len(added)), unit=_(b'files')
2609 )
2609 )
2610 for f in modified:
2610 for f in modified:
2611 progress.increment()
2611 progress.increment()
2612 warnings.append(
2612 warnings.append(
2613 _(
2613 _(
2614 b'not removing %s: file is modified (use -f'
2614 b'not removing %s: file is modified (use -f'
2615 b' to force removal)\n'
2615 b' to force removal)\n'
2616 )
2616 )
2617 % uipathfn(f)
2617 % uipathfn(f)
2618 )
2618 )
2619 ret = 1
2619 ret = 1
2620 for f in added:
2620 for f in added:
2621 progress.increment()
2621 progress.increment()
2622 warnings.append(
2622 warnings.append(
2623 _(
2623 _(
2624 b"not removing %s: file has been marked for add"
2624 b"not removing %s: file has been marked for add"
2625 b" (use 'hg forget' to undo add)\n"
2625 b" (use 'hg forget' to undo add)\n"
2626 )
2626 )
2627 % uipathfn(f)
2627 % uipathfn(f)
2628 )
2628 )
2629 ret = 1
2629 ret = 1
2630 progress.complete()
2630 progress.complete()
2631
2631
2632 list = sorted(list)
2632 list = sorted(list)
2633 progress = ui.makeprogress(
2633 progress = ui.makeprogress(
2634 _(b'deleting'), total=len(list), unit=_(b'files')
2634 _(b'deleting'), total=len(list), unit=_(b'files')
2635 )
2635 )
2636 for f in list:
2636 for f in list:
2637 if ui.verbose or not m.exact(f):
2637 if ui.verbose or not m.exact(f):
2638 progress.increment()
2638 progress.increment()
2639 ui.status(
2639 ui.status(
2640 _(b'removing %s\n') % uipathfn(f), label=b'ui.addremove.removed'
2640 _(b'removing %s\n') % uipathfn(f), label=b'ui.addremove.removed'
2641 )
2641 )
2642 progress.complete()
2642 progress.complete()
2643
2643
2644 if not dryrun:
2644 if not dryrun:
2645 with repo.wlock():
2645 with repo.wlock():
2646 if not after:
2646 if not after:
2647 for f in list:
2647 for f in list:
2648 if f in added:
2648 if f in added:
2649 continue # we never unlink added files on remove
2649 continue # we never unlink added files on remove
2650 rmdir = repo.ui.configbool(
2650 rmdir = repo.ui.configbool(
2651 b'experimental', b'removeemptydirs'
2651 b'experimental', b'removeemptydirs'
2652 )
2652 )
2653 repo.wvfs.unlinkpath(f, ignoremissing=True, rmdir=rmdir)
2653 repo.wvfs.unlinkpath(f, ignoremissing=True, rmdir=rmdir)
2654 repo[None].forget(list)
2654 repo[None].forget(list)
2655
2655
2656 if warn:
2656 if warn:
2657 for warning in warnings:
2657 for warning in warnings:
2658 ui.warn(warning)
2658 ui.warn(warning)
2659
2659
2660 return ret
2660 return ret
2661
2661
2662
2662
2663 def _catfmtneedsdata(fm):
2663 def _catfmtneedsdata(fm):
2664 return not fm.datahint() or b'data' in fm.datahint()
2664 return not fm.datahint() or b'data' in fm.datahint()
2665
2665
2666
2666
2667 def _updatecatformatter(fm, ctx, matcher, path, decode):
2667 def _updatecatformatter(fm, ctx, matcher, path, decode):
2668 """Hook for adding data to the formatter used by ``hg cat``.
2668 """Hook for adding data to the formatter used by ``hg cat``.
2669
2669
2670 Extensions (e.g., lfs) can wrap this to inject keywords/data, but must call
2670 Extensions (e.g., lfs) can wrap this to inject keywords/data, but must call
2671 this method first."""
2671 this method first."""
2672
2672
2673 # data() can be expensive to fetch (e.g. lfs), so don't fetch it if it
2673 # data() can be expensive to fetch (e.g. lfs), so don't fetch it if it
2674 # wasn't requested.
2674 # wasn't requested.
2675 data = b''
2675 data = b''
2676 if _catfmtneedsdata(fm):
2676 if _catfmtneedsdata(fm):
2677 data = ctx[path].data()
2677 data = ctx[path].data()
2678 if decode:
2678 if decode:
2679 data = ctx.repo().wwritedata(path, data)
2679 data = ctx.repo().wwritedata(path, data)
2680 fm.startitem()
2680 fm.startitem()
2681 fm.context(ctx=ctx)
2681 fm.context(ctx=ctx)
2682 fm.write(b'data', b'%s', data)
2682 fm.write(b'data', b'%s', data)
2683 fm.data(path=path)
2683 fm.data(path=path)
2684
2684
2685
2685
2686 def cat(ui, repo, ctx, matcher, basefm, fntemplate, prefix, **opts):
2686 def cat(ui, repo, ctx, matcher, basefm, fntemplate, prefix, **opts):
2687 err = 1
2687 err = 1
2688 opts = pycompat.byteskwargs(opts)
2688 opts = pycompat.byteskwargs(opts)
2689
2689
2690 def write(path):
2690 def write(path):
2691 filename = None
2691 filename = None
2692 if fntemplate:
2692 if fntemplate:
2693 filename = makefilename(
2693 filename = makefilename(
2694 ctx, fntemplate, pathname=os.path.join(prefix, path)
2694 ctx, fntemplate, pathname=os.path.join(prefix, path)
2695 )
2695 )
2696 # attempt to create the directory if it does not already exist
2696 # attempt to create the directory if it does not already exist
2697 try:
2697 try:
2698 os.makedirs(os.path.dirname(filename))
2698 os.makedirs(os.path.dirname(filename))
2699 except OSError:
2699 except OSError:
2700 pass
2700 pass
2701 with formatter.maybereopen(basefm, filename) as fm:
2701 with formatter.maybereopen(basefm, filename) as fm:
2702 _updatecatformatter(fm, ctx, matcher, path, opts.get(b'decode'))
2702 _updatecatformatter(fm, ctx, matcher, path, opts.get(b'decode'))
2703
2703
2704 # Automation often uses hg cat on single files, so special case it
2704 # Automation often uses hg cat on single files, so special case it
2705 # for performance to avoid the cost of parsing the manifest.
2705 # for performance to avoid the cost of parsing the manifest.
2706 if len(matcher.files()) == 1 and not matcher.anypats():
2706 if len(matcher.files()) == 1 and not matcher.anypats():
2707 file = matcher.files()[0]
2707 file = matcher.files()[0]
2708 mfl = repo.manifestlog
2708 mfl = repo.manifestlog
2709 mfnode = ctx.manifestnode()
2709 mfnode = ctx.manifestnode()
2710 try:
2710 try:
2711 if mfnode and mfl[mfnode].find(file)[0]:
2711 if mfnode and mfl[mfnode].find(file)[0]:
2712 if _catfmtneedsdata(basefm):
2712 if _catfmtneedsdata(basefm):
2713 scmutil.prefetchfiles(repo, [(ctx.rev(), matcher)])
2713 scmutil.prefetchfiles(repo, [(ctx.rev(), matcher)])
2714 write(file)
2714 write(file)
2715 return 0
2715 return 0
2716 except KeyError:
2716 except KeyError:
2717 pass
2717 pass
2718
2718
2719 if _catfmtneedsdata(basefm):
2719 if _catfmtneedsdata(basefm):
2720 scmutil.prefetchfiles(repo, [(ctx.rev(), matcher)])
2720 scmutil.prefetchfiles(repo, [(ctx.rev(), matcher)])
2721
2721
2722 for abs in ctx.walk(matcher):
2722 for abs in ctx.walk(matcher):
2723 write(abs)
2723 write(abs)
2724 err = 0
2724 err = 0
2725
2725
2726 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2726 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2727 for subpath in sorted(ctx.substate):
2727 for subpath in sorted(ctx.substate):
2728 sub = ctx.sub(subpath)
2728 sub = ctx.sub(subpath)
2729 try:
2729 try:
2730 submatch = matchmod.subdirmatcher(subpath, matcher)
2730 submatch = matchmod.subdirmatcher(subpath, matcher)
2731 subprefix = os.path.join(prefix, subpath)
2731 subprefix = os.path.join(prefix, subpath)
2732 if not sub.cat(
2732 if not sub.cat(
2733 submatch,
2733 submatch,
2734 basefm,
2734 basefm,
2735 fntemplate,
2735 fntemplate,
2736 subprefix,
2736 subprefix,
2737 **pycompat.strkwargs(opts)
2737 **pycompat.strkwargs(opts)
2738 ):
2738 ):
2739 err = 0
2739 err = 0
2740 except error.RepoLookupError:
2740 except error.RepoLookupError:
2741 ui.status(
2741 ui.status(
2742 _(b"skipping missing subrepository: %s\n") % uipathfn(subpath)
2742 _(b"skipping missing subrepository: %s\n") % uipathfn(subpath)
2743 )
2743 )
2744
2744
2745 return err
2745 return err
2746
2746
2747
2747
2748 def commit(ui, repo, commitfunc, pats, opts):
2748 def commit(ui, repo, commitfunc, pats, opts):
2749 '''commit the specified files or all outstanding changes'''
2749 '''commit the specified files or all outstanding changes'''
2750 date = opts.get(b'date')
2750 date = opts.get(b'date')
2751 if date:
2751 if date:
2752 opts[b'date'] = dateutil.parsedate(date)
2752 opts[b'date'] = dateutil.parsedate(date)
2753 message = logmessage(ui, opts)
2753 message = logmessage(ui, opts)
2754 matcher = scmutil.match(repo[None], pats, opts)
2754 matcher = scmutil.match(repo[None], pats, opts)
2755
2755
2756 dsguard = None
2756 dsguard = None
2757 # extract addremove carefully -- this function can be called from a command
2757 # extract addremove carefully -- this function can be called from a command
2758 # that doesn't support addremove
2758 # that doesn't support addremove
2759 if opts.get(b'addremove'):
2759 if opts.get(b'addremove'):
2760 dsguard = dirstateguard.dirstateguard(repo, b'commit')
2760 dsguard = dirstateguard.dirstateguard(repo, b'commit')
2761 with dsguard or util.nullcontextmanager():
2761 with dsguard or util.nullcontextmanager():
2762 if dsguard:
2762 if dsguard:
2763 relative = scmutil.anypats(pats, opts)
2763 relative = scmutil.anypats(pats, opts)
2764 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
2764 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
2765 if scmutil.addremove(repo, matcher, b"", uipathfn, opts) != 0:
2765 if scmutil.addremove(repo, matcher, b"", uipathfn, opts) != 0:
2766 raise error.Abort(
2766 raise error.Abort(
2767 _(b"failed to mark all new/missing files as added/removed")
2767 _(b"failed to mark all new/missing files as added/removed")
2768 )
2768 )
2769
2769
2770 return commitfunc(ui, repo, message, matcher, opts)
2770 return commitfunc(ui, repo, message, matcher, opts)
2771
2771
2772
2772
2773 def samefile(f, ctx1, ctx2):
2773 def samefile(f, ctx1, ctx2):
2774 if f in ctx1.manifest():
2774 if f in ctx1.manifest():
2775 a = ctx1.filectx(f)
2775 a = ctx1.filectx(f)
2776 if f in ctx2.manifest():
2776 if f in ctx2.manifest():
2777 b = ctx2.filectx(f)
2777 b = ctx2.filectx(f)
2778 return not a.cmp(b) and a.flags() == b.flags()
2778 return not a.cmp(b) and a.flags() == b.flags()
2779 else:
2779 else:
2780 return False
2780 return False
2781 else:
2781 else:
2782 return f not in ctx2.manifest()
2782 return f not in ctx2.manifest()
2783
2783
2784
2784
2785 def amend(ui, repo, old, extra, pats, opts):
2785 def amend(ui, repo, old, extra, pats, opts):
2786 opts = pycompat.byteskwargs(opts)
2787 # avoid cycle context -> subrepo -> cmdutil
2786 # avoid cycle context -> subrepo -> cmdutil
2788 from . import context
2787 from . import context
2789
2788
2790 # amend will reuse the existing user if not specified, but the obsolete
2789 # amend will reuse the existing user if not specified, but the obsolete
2791 # marker creation requires that the current user's name is specified.
2790 # marker creation requires that the current user's name is specified.
2792 if obsolete.isenabled(repo, obsolete.createmarkersopt):
2791 if obsolete.isenabled(repo, obsolete.createmarkersopt):
2793 ui.username() # raise exception if username not set
2792 ui.username() # raise exception if username not set
2794
2793
2795 ui.note(_(b'amending changeset %s\n') % old)
2794 ui.note(_(b'amending changeset %s\n') % old)
2796 base = old.p1()
2795 base = old.p1()
2797
2796
2798 with repo.wlock(), repo.lock(), repo.transaction(b'amend'):
2797 with repo.wlock(), repo.lock(), repo.transaction(b'amend'):
2799 # Participating changesets:
2798 # Participating changesets:
2800 #
2799 #
2801 # wctx o - workingctx that contains changes from working copy
2800 # wctx o - workingctx that contains changes from working copy
2802 # | to go into amending commit
2801 # | to go into amending commit
2803 # |
2802 # |
2804 # old o - changeset to amend
2803 # old o - changeset to amend
2805 # |
2804 # |
2806 # base o - first parent of the changeset to amend
2805 # base o - first parent of the changeset to amend
2807 wctx = repo[None]
2806 wctx = repo[None]
2808
2807
2809 # Copy to avoid mutating input
2808 # Copy to avoid mutating input
2810 extra = extra.copy()
2809 extra = extra.copy()
2811 # Update extra dict from amended commit (e.g. to preserve graft
2810 # Update extra dict from amended commit (e.g. to preserve graft
2812 # source)
2811 # source)
2813 extra.update(old.extra())
2812 extra.update(old.extra())
2814
2813
2815 # Also update it from the from the wctx
2814 # Also update it from the from the wctx
2816 extra.update(wctx.extra())
2815 extra.update(wctx.extra())
2817
2816
2818 # date-only change should be ignored?
2817 # date-only change should be ignored?
2819 datemaydiffer = resolvecommitoptions(ui, opts)
2818 datemaydiffer = resolve_commit_options(ui, opts)
2819 opts = pycompat.byteskwargs(opts)
2820
2820
2821 date = old.date()
2821 date = old.date()
2822 if opts.get(b'date'):
2822 if opts.get(b'date'):
2823 date = dateutil.parsedate(opts.get(b'date'))
2823 date = dateutil.parsedate(opts.get(b'date'))
2824 user = opts.get(b'user') or old.user()
2824 user = opts.get(b'user') or old.user()
2825
2825
2826 if len(old.parents()) > 1:
2826 if len(old.parents()) > 1:
2827 # ctx.files() isn't reliable for merges, so fall back to the
2827 # ctx.files() isn't reliable for merges, so fall back to the
2828 # slower repo.status() method
2828 # slower repo.status() method
2829 st = base.status(old)
2829 st = base.status(old)
2830 files = set(st.modified) | set(st.added) | set(st.removed)
2830 files = set(st.modified) | set(st.added) | set(st.removed)
2831 else:
2831 else:
2832 files = set(old.files())
2832 files = set(old.files())
2833
2833
2834 # add/remove the files to the working copy if the "addremove" option
2834 # add/remove the files to the working copy if the "addremove" option
2835 # was specified.
2835 # was specified.
2836 matcher = scmutil.match(wctx, pats, opts)
2836 matcher = scmutil.match(wctx, pats, opts)
2837 relative = scmutil.anypats(pats, opts)
2837 relative = scmutil.anypats(pats, opts)
2838 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
2838 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
2839 if opts.get(b'addremove') and scmutil.addremove(
2839 if opts.get(b'addremove') and scmutil.addremove(
2840 repo, matcher, b"", uipathfn, opts
2840 repo, matcher, b"", uipathfn, opts
2841 ):
2841 ):
2842 raise error.Abort(
2842 raise error.Abort(
2843 _(b"failed to mark all new/missing files as added/removed")
2843 _(b"failed to mark all new/missing files as added/removed")
2844 )
2844 )
2845
2845
2846 # Check subrepos. This depends on in-place wctx._status update in
2846 # Check subrepos. This depends on in-place wctx._status update in
2847 # subrepo.precommit(). To minimize the risk of this hack, we do
2847 # subrepo.precommit(). To minimize the risk of this hack, we do
2848 # nothing if .hgsub does not exist.
2848 # nothing if .hgsub does not exist.
2849 if b'.hgsub' in wctx or b'.hgsub' in old:
2849 if b'.hgsub' in wctx or b'.hgsub' in old:
2850 subs, commitsubs, newsubstate = subrepoutil.precommit(
2850 subs, commitsubs, newsubstate = subrepoutil.precommit(
2851 ui, wctx, wctx._status, matcher
2851 ui, wctx, wctx._status, matcher
2852 )
2852 )
2853 # amend should abort if commitsubrepos is enabled
2853 # amend should abort if commitsubrepos is enabled
2854 assert not commitsubs
2854 assert not commitsubs
2855 if subs:
2855 if subs:
2856 subrepoutil.writestate(repo, newsubstate)
2856 subrepoutil.writestate(repo, newsubstate)
2857
2857
2858 ms = mergestatemod.mergestate.read(repo)
2858 ms = mergestatemod.mergestate.read(repo)
2859 mergeutil.checkunresolved(ms)
2859 mergeutil.checkunresolved(ms)
2860
2860
2861 filestoamend = {f for f in wctx.files() if matcher(f)}
2861 filestoamend = {f for f in wctx.files() if matcher(f)}
2862
2862
2863 changes = len(filestoamend) > 0
2863 changes = len(filestoamend) > 0
2864 if changes:
2864 if changes:
2865 # Recompute copies (avoid recording a -> b -> a)
2865 # Recompute copies (avoid recording a -> b -> a)
2866 copied = copies.pathcopies(base, wctx, matcher)
2866 copied = copies.pathcopies(base, wctx, matcher)
2867 if old.p2:
2867 if old.p2:
2868 copied.update(copies.pathcopies(old.p2(), wctx, matcher))
2868 copied.update(copies.pathcopies(old.p2(), wctx, matcher))
2869
2869
2870 # Prune files which were reverted by the updates: if old
2870 # Prune files which were reverted by the updates: if old
2871 # introduced file X and the file was renamed in the working
2871 # introduced file X and the file was renamed in the working
2872 # copy, then those two files are the same and
2872 # copy, then those two files are the same and
2873 # we can discard X from our list of files. Likewise if X
2873 # we can discard X from our list of files. Likewise if X
2874 # was removed, it's no longer relevant. If X is missing (aka
2874 # was removed, it's no longer relevant. If X is missing (aka
2875 # deleted), old X must be preserved.
2875 # deleted), old X must be preserved.
2876 files.update(filestoamend)
2876 files.update(filestoamend)
2877 files = [
2877 files = [
2878 f
2878 f
2879 for f in files
2879 for f in files
2880 if (f not in filestoamend or not samefile(f, wctx, base))
2880 if (f not in filestoamend or not samefile(f, wctx, base))
2881 ]
2881 ]
2882
2882
2883 def filectxfn(repo, ctx_, path):
2883 def filectxfn(repo, ctx_, path):
2884 try:
2884 try:
2885 # If the file being considered is not amongst the files
2885 # If the file being considered is not amongst the files
2886 # to be amended, we should return the file context from the
2886 # to be amended, we should return the file context from the
2887 # old changeset. This avoids issues when only some files in
2887 # old changeset. This avoids issues when only some files in
2888 # the working copy are being amended but there are also
2888 # the working copy are being amended but there are also
2889 # changes to other files from the old changeset.
2889 # changes to other files from the old changeset.
2890 if path not in filestoamend:
2890 if path not in filestoamend:
2891 return old.filectx(path)
2891 return old.filectx(path)
2892
2892
2893 # Return None for removed files.
2893 # Return None for removed files.
2894 if path in wctx.removed():
2894 if path in wctx.removed():
2895 return None
2895 return None
2896
2896
2897 fctx = wctx[path]
2897 fctx = wctx[path]
2898 flags = fctx.flags()
2898 flags = fctx.flags()
2899 mctx = context.memfilectx(
2899 mctx = context.memfilectx(
2900 repo,
2900 repo,
2901 ctx_,
2901 ctx_,
2902 fctx.path(),
2902 fctx.path(),
2903 fctx.data(),
2903 fctx.data(),
2904 islink=b'l' in flags,
2904 islink=b'l' in flags,
2905 isexec=b'x' in flags,
2905 isexec=b'x' in flags,
2906 copysource=copied.get(path),
2906 copysource=copied.get(path),
2907 )
2907 )
2908 return mctx
2908 return mctx
2909 except KeyError:
2909 except KeyError:
2910 return None
2910 return None
2911
2911
2912 else:
2912 else:
2913 ui.note(_(b'copying changeset %s to %s\n') % (old, base))
2913 ui.note(_(b'copying changeset %s to %s\n') % (old, base))
2914
2914
2915 # Use version of files as in the old cset
2915 # Use version of files as in the old cset
2916 def filectxfn(repo, ctx_, path):
2916 def filectxfn(repo, ctx_, path):
2917 try:
2917 try:
2918 return old.filectx(path)
2918 return old.filectx(path)
2919 except KeyError:
2919 except KeyError:
2920 return None
2920 return None
2921
2921
2922 # See if we got a message from -m or -l, if not, open the editor with
2922 # See if we got a message from -m or -l, if not, open the editor with
2923 # the message of the changeset to amend.
2923 # the message of the changeset to amend.
2924 message = logmessage(ui, opts)
2924 message = logmessage(ui, opts)
2925
2925
2926 editform = mergeeditform(old, b'commit.amend')
2926 editform = mergeeditform(old, b'commit.amend')
2927
2927
2928 if not message:
2928 if not message:
2929 message = old.description()
2929 message = old.description()
2930 # Default if message isn't provided and --edit is not passed is to
2930 # Default if message isn't provided and --edit is not passed is to
2931 # invoke editor, but allow --no-edit. If somehow we don't have any
2931 # invoke editor, but allow --no-edit. If somehow we don't have any
2932 # description, let's always start the editor.
2932 # description, let's always start the editor.
2933 doedit = not message or opts.get(b'edit') in [True, None]
2933 doedit = not message or opts.get(b'edit') in [True, None]
2934 else:
2934 else:
2935 # Default if message is provided is to not invoke editor, but allow
2935 # Default if message is provided is to not invoke editor, but allow
2936 # --edit.
2936 # --edit.
2937 doedit = opts.get(b'edit') is True
2937 doedit = opts.get(b'edit') is True
2938 editor = getcommiteditor(edit=doedit, editform=editform)
2938 editor = getcommiteditor(edit=doedit, editform=editform)
2939
2939
2940 pureextra = extra.copy()
2940 pureextra = extra.copy()
2941 extra[b'amend_source'] = old.hex()
2941 extra[b'amend_source'] = old.hex()
2942
2942
2943 new = context.memctx(
2943 new = context.memctx(
2944 repo,
2944 repo,
2945 parents=[base.node(), old.p2().node()],
2945 parents=[base.node(), old.p2().node()],
2946 text=message,
2946 text=message,
2947 files=files,
2947 files=files,
2948 filectxfn=filectxfn,
2948 filectxfn=filectxfn,
2949 user=user,
2949 user=user,
2950 date=date,
2950 date=date,
2951 extra=extra,
2951 extra=extra,
2952 editor=editor,
2952 editor=editor,
2953 )
2953 )
2954
2954
2955 newdesc = changelog.stripdesc(new.description())
2955 newdesc = changelog.stripdesc(new.description())
2956 if (
2956 if (
2957 (not changes)
2957 (not changes)
2958 and newdesc == old.description()
2958 and newdesc == old.description()
2959 and user == old.user()
2959 and user == old.user()
2960 and (date == old.date() or datemaydiffer)
2960 and (date == old.date() or datemaydiffer)
2961 and pureextra == old.extra()
2961 and pureextra == old.extra()
2962 ):
2962 ):
2963 # nothing changed. continuing here would create a new node
2963 # nothing changed. continuing here would create a new node
2964 # anyway because of the amend_source noise.
2964 # anyway because of the amend_source noise.
2965 #
2965 #
2966 # This not what we expect from amend.
2966 # This not what we expect from amend.
2967 return old.node()
2967 return old.node()
2968
2968
2969 commitphase = None
2969 commitphase = None
2970 if opts.get(b'secret'):
2970 if opts.get(b'secret'):
2971 commitphase = phases.secret
2971 commitphase = phases.secret
2972 newid = repo.commitctx(new)
2972 newid = repo.commitctx(new)
2973 ms.reset()
2973 ms.reset()
2974
2974
2975 # Reroute the working copy parent to the new changeset
2975 # Reroute the working copy parent to the new changeset
2976 repo.setparents(newid, repo.nullid)
2976 repo.setparents(newid, repo.nullid)
2977
2977
2978 # Fixing the dirstate because localrepo.commitctx does not update
2978 # Fixing the dirstate because localrepo.commitctx does not update
2979 # it. This is rather convenient because we did not need to update
2979 # it. This is rather convenient because we did not need to update
2980 # the dirstate for all the files in the new commit which commitctx
2980 # the dirstate for all the files in the new commit which commitctx
2981 # could have done if it updated the dirstate. Now, we can
2981 # could have done if it updated the dirstate. Now, we can
2982 # selectively update the dirstate only for the amended files.
2982 # selectively update the dirstate only for the amended files.
2983 dirstate = repo.dirstate
2983 dirstate = repo.dirstate
2984
2984
2985 # Update the state of the files which were added and modified in the
2985 # Update the state of the files which were added and modified in the
2986 # amend to "normal" in the dirstate. We need to use "normallookup" since
2986 # amend to "normal" in the dirstate. We need to use "normallookup" since
2987 # the files may have changed since the command started; using "normal"
2987 # the files may have changed since the command started; using "normal"
2988 # would mark them as clean but with uncommitted contents.
2988 # would mark them as clean but with uncommitted contents.
2989 normalfiles = set(wctx.modified() + wctx.added()) & filestoamend
2989 normalfiles = set(wctx.modified() + wctx.added()) & filestoamend
2990 for f in normalfiles:
2990 for f in normalfiles:
2991 dirstate.normallookup(f)
2991 dirstate.normallookup(f)
2992
2992
2993 # Update the state of files which were removed in the amend
2993 # Update the state of files which were removed in the amend
2994 # to "removed" in the dirstate.
2994 # to "removed" in the dirstate.
2995 removedfiles = set(wctx.removed()) & filestoamend
2995 removedfiles = set(wctx.removed()) & filestoamend
2996 for f in removedfiles:
2996 for f in removedfiles:
2997 dirstate.drop(f)
2997 dirstate.drop(f)
2998
2998
2999 mapping = {old.node(): (newid,)}
2999 mapping = {old.node(): (newid,)}
3000 obsmetadata = None
3000 obsmetadata = None
3001 if opts.get(b'note'):
3001 if opts.get(b'note'):
3002 obsmetadata = {b'note': encoding.fromlocal(opts[b'note'])}
3002 obsmetadata = {b'note': encoding.fromlocal(opts[b'note'])}
3003 backup = ui.configbool(b'rewrite', b'backup-bundle')
3003 backup = ui.configbool(b'rewrite', b'backup-bundle')
3004 scmutil.cleanupnodes(
3004 scmutil.cleanupnodes(
3005 repo,
3005 repo,
3006 mapping,
3006 mapping,
3007 b'amend',
3007 b'amend',
3008 metadata=obsmetadata,
3008 metadata=obsmetadata,
3009 fixphase=True,
3009 fixphase=True,
3010 targetphase=commitphase,
3010 targetphase=commitphase,
3011 backup=backup,
3011 backup=backup,
3012 )
3012 )
3013
3013
3014 return newid
3014 return newid
3015
3015
3016
3016
3017 def commiteditor(repo, ctx, subs, editform=b''):
3017 def commiteditor(repo, ctx, subs, editform=b''):
3018 if ctx.description():
3018 if ctx.description():
3019 return ctx.description()
3019 return ctx.description()
3020 return commitforceeditor(
3020 return commitforceeditor(
3021 repo, ctx, subs, editform=editform, unchangedmessagedetection=True
3021 repo, ctx, subs, editform=editform, unchangedmessagedetection=True
3022 )
3022 )
3023
3023
3024
3024
3025 def commitforceeditor(
3025 def commitforceeditor(
3026 repo,
3026 repo,
3027 ctx,
3027 ctx,
3028 subs,
3028 subs,
3029 finishdesc=None,
3029 finishdesc=None,
3030 extramsg=None,
3030 extramsg=None,
3031 editform=b'',
3031 editform=b'',
3032 unchangedmessagedetection=False,
3032 unchangedmessagedetection=False,
3033 ):
3033 ):
3034 if not extramsg:
3034 if not extramsg:
3035 extramsg = _(b"Leave message empty to abort commit.")
3035 extramsg = _(b"Leave message empty to abort commit.")
3036
3036
3037 forms = [e for e in editform.split(b'.') if e]
3037 forms = [e for e in editform.split(b'.') if e]
3038 forms.insert(0, b'changeset')
3038 forms.insert(0, b'changeset')
3039 templatetext = None
3039 templatetext = None
3040 while forms:
3040 while forms:
3041 ref = b'.'.join(forms)
3041 ref = b'.'.join(forms)
3042 if repo.ui.config(b'committemplate', ref):
3042 if repo.ui.config(b'committemplate', ref):
3043 templatetext = committext = buildcommittemplate(
3043 templatetext = committext = buildcommittemplate(
3044 repo, ctx, subs, extramsg, ref
3044 repo, ctx, subs, extramsg, ref
3045 )
3045 )
3046 break
3046 break
3047 forms.pop()
3047 forms.pop()
3048 else:
3048 else:
3049 committext = buildcommittext(repo, ctx, subs, extramsg)
3049 committext = buildcommittext(repo, ctx, subs, extramsg)
3050
3050
3051 # run editor in the repository root
3051 # run editor in the repository root
3052 olddir = encoding.getcwd()
3052 olddir = encoding.getcwd()
3053 os.chdir(repo.root)
3053 os.chdir(repo.root)
3054
3054
3055 # make in-memory changes visible to external process
3055 # make in-memory changes visible to external process
3056 tr = repo.currenttransaction()
3056 tr = repo.currenttransaction()
3057 repo.dirstate.write(tr)
3057 repo.dirstate.write(tr)
3058 pending = tr and tr.writepending() and repo.root
3058 pending = tr and tr.writepending() and repo.root
3059
3059
3060 editortext = repo.ui.edit(
3060 editortext = repo.ui.edit(
3061 committext,
3061 committext,
3062 ctx.user(),
3062 ctx.user(),
3063 ctx.extra(),
3063 ctx.extra(),
3064 editform=editform,
3064 editform=editform,
3065 pending=pending,
3065 pending=pending,
3066 repopath=repo.path,
3066 repopath=repo.path,
3067 action=b'commit',
3067 action=b'commit',
3068 )
3068 )
3069 text = editortext
3069 text = editortext
3070
3070
3071 # strip away anything below this special string (used for editors that want
3071 # strip away anything below this special string (used for editors that want
3072 # to display the diff)
3072 # to display the diff)
3073 stripbelow = re.search(_linebelow, text, flags=re.MULTILINE)
3073 stripbelow = re.search(_linebelow, text, flags=re.MULTILINE)
3074 if stripbelow:
3074 if stripbelow:
3075 text = text[: stripbelow.start()]
3075 text = text[: stripbelow.start()]
3076
3076
3077 text = re.sub(b"(?m)^HG:.*(\n|$)", b"", text)
3077 text = re.sub(b"(?m)^HG:.*(\n|$)", b"", text)
3078 os.chdir(olddir)
3078 os.chdir(olddir)
3079
3079
3080 if finishdesc:
3080 if finishdesc:
3081 text = finishdesc(text)
3081 text = finishdesc(text)
3082 if not text.strip():
3082 if not text.strip():
3083 raise error.InputError(_(b"empty commit message"))
3083 raise error.InputError(_(b"empty commit message"))
3084 if unchangedmessagedetection and editortext == templatetext:
3084 if unchangedmessagedetection and editortext == templatetext:
3085 raise error.InputError(_(b"commit message unchanged"))
3085 raise error.InputError(_(b"commit message unchanged"))
3086
3086
3087 return text
3087 return text
3088
3088
3089
3089
3090 def buildcommittemplate(repo, ctx, subs, extramsg, ref):
3090 def buildcommittemplate(repo, ctx, subs, extramsg, ref):
3091 ui = repo.ui
3091 ui = repo.ui
3092 spec = formatter.reference_templatespec(ref)
3092 spec = formatter.reference_templatespec(ref)
3093 t = logcmdutil.changesettemplater(ui, repo, spec)
3093 t = logcmdutil.changesettemplater(ui, repo, spec)
3094 t.t.cache.update(
3094 t.t.cache.update(
3095 (k, templater.unquotestring(v))
3095 (k, templater.unquotestring(v))
3096 for k, v in repo.ui.configitems(b'committemplate')
3096 for k, v in repo.ui.configitems(b'committemplate')
3097 )
3097 )
3098
3098
3099 if not extramsg:
3099 if not extramsg:
3100 extramsg = b'' # ensure that extramsg is string
3100 extramsg = b'' # ensure that extramsg is string
3101
3101
3102 ui.pushbuffer()
3102 ui.pushbuffer()
3103 t.show(ctx, extramsg=extramsg)
3103 t.show(ctx, extramsg=extramsg)
3104 return ui.popbuffer()
3104 return ui.popbuffer()
3105
3105
3106
3106
3107 def hgprefix(msg):
3107 def hgprefix(msg):
3108 return b"\n".join([b"HG: %s" % a for a in msg.split(b"\n") if a])
3108 return b"\n".join([b"HG: %s" % a for a in msg.split(b"\n") if a])
3109
3109
3110
3110
3111 def buildcommittext(repo, ctx, subs, extramsg):
3111 def buildcommittext(repo, ctx, subs, extramsg):
3112 edittext = []
3112 edittext = []
3113 modified, added, removed = ctx.modified(), ctx.added(), ctx.removed()
3113 modified, added, removed = ctx.modified(), ctx.added(), ctx.removed()
3114 if ctx.description():
3114 if ctx.description():
3115 edittext.append(ctx.description())
3115 edittext.append(ctx.description())
3116 edittext.append(b"")
3116 edittext.append(b"")
3117 edittext.append(b"") # Empty line between message and comments.
3117 edittext.append(b"") # Empty line between message and comments.
3118 edittext.append(
3118 edittext.append(
3119 hgprefix(
3119 hgprefix(
3120 _(
3120 _(
3121 b"Enter commit message."
3121 b"Enter commit message."
3122 b" Lines beginning with 'HG:' are removed."
3122 b" Lines beginning with 'HG:' are removed."
3123 )
3123 )
3124 )
3124 )
3125 )
3125 )
3126 edittext.append(hgprefix(extramsg))
3126 edittext.append(hgprefix(extramsg))
3127 edittext.append(b"HG: --")
3127 edittext.append(b"HG: --")
3128 edittext.append(hgprefix(_(b"user: %s") % ctx.user()))
3128 edittext.append(hgprefix(_(b"user: %s") % ctx.user()))
3129 if ctx.p2():
3129 if ctx.p2():
3130 edittext.append(hgprefix(_(b"branch merge")))
3130 edittext.append(hgprefix(_(b"branch merge")))
3131 if ctx.branch():
3131 if ctx.branch():
3132 edittext.append(hgprefix(_(b"branch '%s'") % ctx.branch()))
3132 edittext.append(hgprefix(_(b"branch '%s'") % ctx.branch()))
3133 if bookmarks.isactivewdirparent(repo):
3133 if bookmarks.isactivewdirparent(repo):
3134 edittext.append(hgprefix(_(b"bookmark '%s'") % repo._activebookmark))
3134 edittext.append(hgprefix(_(b"bookmark '%s'") % repo._activebookmark))
3135 edittext.extend([hgprefix(_(b"subrepo %s") % s) for s in subs])
3135 edittext.extend([hgprefix(_(b"subrepo %s") % s) for s in subs])
3136 edittext.extend([hgprefix(_(b"added %s") % f) for f in added])
3136 edittext.extend([hgprefix(_(b"added %s") % f) for f in added])
3137 edittext.extend([hgprefix(_(b"changed %s") % f) for f in modified])
3137 edittext.extend([hgprefix(_(b"changed %s") % f) for f in modified])
3138 edittext.extend([hgprefix(_(b"removed %s") % f) for f in removed])
3138 edittext.extend([hgprefix(_(b"removed %s") % f) for f in removed])
3139 if not added and not modified and not removed:
3139 if not added and not modified and not removed:
3140 edittext.append(hgprefix(_(b"no files changed")))
3140 edittext.append(hgprefix(_(b"no files changed")))
3141 edittext.append(b"")
3141 edittext.append(b"")
3142
3142
3143 return b"\n".join(edittext)
3143 return b"\n".join(edittext)
3144
3144
3145
3145
3146 def commitstatus(repo, node, branch, bheads=None, tip=None, opts=None):
3146 def commitstatus(repo, node, branch, bheads=None, tip=None, opts=None):
3147 if opts is None:
3147 if opts is None:
3148 opts = {}
3148 opts = {}
3149 ctx = repo[node]
3149 ctx = repo[node]
3150 parents = ctx.parents()
3150 parents = ctx.parents()
3151
3151
3152 if tip is not None and repo.changelog.tip() == tip:
3152 if tip is not None and repo.changelog.tip() == tip:
3153 # avoid reporting something like "committed new head" when
3153 # avoid reporting something like "committed new head" when
3154 # recommitting old changesets, and issue a helpful warning
3154 # recommitting old changesets, and issue a helpful warning
3155 # for most instances
3155 # for most instances
3156 repo.ui.warn(_(b"warning: commit already existed in the repository!\n"))
3156 repo.ui.warn(_(b"warning: commit already existed in the repository!\n"))
3157 elif (
3157 elif (
3158 not opts.get(b'amend')
3158 not opts.get(b'amend')
3159 and bheads
3159 and bheads
3160 and node not in bheads
3160 and node not in bheads
3161 and not any(
3161 and not any(
3162 p.node() in bheads and p.branch() == branch for p in parents
3162 p.node() in bheads and p.branch() == branch for p in parents
3163 )
3163 )
3164 ):
3164 ):
3165 repo.ui.status(_(b'created new head\n'))
3165 repo.ui.status(_(b'created new head\n'))
3166 # The message is not printed for initial roots. For the other
3166 # The message is not printed for initial roots. For the other
3167 # changesets, it is printed in the following situations:
3167 # changesets, it is printed in the following situations:
3168 #
3168 #
3169 # Par column: for the 2 parents with ...
3169 # Par column: for the 2 parents with ...
3170 # N: null or no parent
3170 # N: null or no parent
3171 # B: parent is on another named branch
3171 # B: parent is on another named branch
3172 # C: parent is a regular non head changeset
3172 # C: parent is a regular non head changeset
3173 # H: parent was a branch head of the current branch
3173 # H: parent was a branch head of the current branch
3174 # Msg column: whether we print "created new head" message
3174 # Msg column: whether we print "created new head" message
3175 # In the following, it is assumed that there already exists some
3175 # In the following, it is assumed that there already exists some
3176 # initial branch heads of the current branch, otherwise nothing is
3176 # initial branch heads of the current branch, otherwise nothing is
3177 # printed anyway.
3177 # printed anyway.
3178 #
3178 #
3179 # Par Msg Comment
3179 # Par Msg Comment
3180 # N N y additional topo root
3180 # N N y additional topo root
3181 #
3181 #
3182 # B N y additional branch root
3182 # B N y additional branch root
3183 # C N y additional topo head
3183 # C N y additional topo head
3184 # H N n usual case
3184 # H N n usual case
3185 #
3185 #
3186 # B B y weird additional branch root
3186 # B B y weird additional branch root
3187 # C B y branch merge
3187 # C B y branch merge
3188 # H B n merge with named branch
3188 # H B n merge with named branch
3189 #
3189 #
3190 # C C y additional head from merge
3190 # C C y additional head from merge
3191 # C H n merge with a head
3191 # C H n merge with a head
3192 #
3192 #
3193 # H H n head merge: head count decreases
3193 # H H n head merge: head count decreases
3194
3194
3195 if not opts.get(b'close_branch'):
3195 if not opts.get(b'close_branch'):
3196 for r in parents:
3196 for r in parents:
3197 if r.closesbranch() and r.branch() == branch:
3197 if r.closesbranch() and r.branch() == branch:
3198 repo.ui.status(
3198 repo.ui.status(
3199 _(b'reopening closed branch head %d\n') % r.rev()
3199 _(b'reopening closed branch head %d\n') % r.rev()
3200 )
3200 )
3201
3201
3202 if repo.ui.debugflag:
3202 if repo.ui.debugflag:
3203 repo.ui.write(
3203 repo.ui.write(
3204 _(b'committed changeset %d:%s\n') % (ctx.rev(), ctx.hex())
3204 _(b'committed changeset %d:%s\n') % (ctx.rev(), ctx.hex())
3205 )
3205 )
3206 elif repo.ui.verbose:
3206 elif repo.ui.verbose:
3207 repo.ui.write(_(b'committed changeset %d:%s\n') % (ctx.rev(), ctx))
3207 repo.ui.write(_(b'committed changeset %d:%s\n') % (ctx.rev(), ctx))
3208
3208
3209
3209
3210 def postcommitstatus(repo, pats, opts):
3210 def postcommitstatus(repo, pats, opts):
3211 return repo.status(match=scmutil.match(repo[None], pats, opts))
3211 return repo.status(match=scmutil.match(repo[None], pats, opts))
3212
3212
3213
3213
3214 def revert(ui, repo, ctx, *pats, **opts):
3214 def revert(ui, repo, ctx, *pats, **opts):
3215 opts = pycompat.byteskwargs(opts)
3215 opts = pycompat.byteskwargs(opts)
3216 parent, p2 = repo.dirstate.parents()
3216 parent, p2 = repo.dirstate.parents()
3217 node = ctx.node()
3217 node = ctx.node()
3218
3218
3219 mf = ctx.manifest()
3219 mf = ctx.manifest()
3220 if node == p2:
3220 if node == p2:
3221 parent = p2
3221 parent = p2
3222
3222
3223 # need all matching names in dirstate and manifest of target rev,
3223 # need all matching names in dirstate and manifest of target rev,
3224 # so have to walk both. do not print errors if files exist in one
3224 # so have to walk both. do not print errors if files exist in one
3225 # but not other. in both cases, filesets should be evaluated against
3225 # but not other. in both cases, filesets should be evaluated against
3226 # workingctx to get consistent result (issue4497). this means 'set:**'
3226 # workingctx to get consistent result (issue4497). this means 'set:**'
3227 # cannot be used to select missing files from target rev.
3227 # cannot be used to select missing files from target rev.
3228
3228
3229 # `names` is a mapping for all elements in working copy and target revision
3229 # `names` is a mapping for all elements in working copy and target revision
3230 # The mapping is in the form:
3230 # The mapping is in the form:
3231 # <abs path in repo> -> (<path from CWD>, <exactly specified by matcher?>)
3231 # <abs path in repo> -> (<path from CWD>, <exactly specified by matcher?>)
3232 names = {}
3232 names = {}
3233 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
3233 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
3234
3234
3235 with repo.wlock():
3235 with repo.wlock():
3236 ## filling of the `names` mapping
3236 ## filling of the `names` mapping
3237 # walk dirstate to fill `names`
3237 # walk dirstate to fill `names`
3238
3238
3239 interactive = opts.get(b'interactive', False)
3239 interactive = opts.get(b'interactive', False)
3240 wctx = repo[None]
3240 wctx = repo[None]
3241 m = scmutil.match(wctx, pats, opts)
3241 m = scmutil.match(wctx, pats, opts)
3242
3242
3243 # we'll need this later
3243 # we'll need this later
3244 targetsubs = sorted(s for s in wctx.substate if m(s))
3244 targetsubs = sorted(s for s in wctx.substate if m(s))
3245
3245
3246 if not m.always():
3246 if not m.always():
3247 matcher = matchmod.badmatch(m, lambda x, y: False)
3247 matcher = matchmod.badmatch(m, lambda x, y: False)
3248 for abs in wctx.walk(matcher):
3248 for abs in wctx.walk(matcher):
3249 names[abs] = m.exact(abs)
3249 names[abs] = m.exact(abs)
3250
3250
3251 # walk target manifest to fill `names`
3251 # walk target manifest to fill `names`
3252
3252
3253 def badfn(path, msg):
3253 def badfn(path, msg):
3254 if path in names:
3254 if path in names:
3255 return
3255 return
3256 if path in ctx.substate:
3256 if path in ctx.substate:
3257 return
3257 return
3258 path_ = path + b'/'
3258 path_ = path + b'/'
3259 for f in names:
3259 for f in names:
3260 if f.startswith(path_):
3260 if f.startswith(path_):
3261 return
3261 return
3262 ui.warn(b"%s: %s\n" % (uipathfn(path), msg))
3262 ui.warn(b"%s: %s\n" % (uipathfn(path), msg))
3263
3263
3264 for abs in ctx.walk(matchmod.badmatch(m, badfn)):
3264 for abs in ctx.walk(matchmod.badmatch(m, badfn)):
3265 if abs not in names:
3265 if abs not in names:
3266 names[abs] = m.exact(abs)
3266 names[abs] = m.exact(abs)
3267
3267
3268 # Find status of all file in `names`.
3268 # Find status of all file in `names`.
3269 m = scmutil.matchfiles(repo, names)
3269 m = scmutil.matchfiles(repo, names)
3270
3270
3271 changes = repo.status(
3271 changes = repo.status(
3272 node1=node, match=m, unknown=True, ignored=True, clean=True
3272 node1=node, match=m, unknown=True, ignored=True, clean=True
3273 )
3273 )
3274 else:
3274 else:
3275 changes = repo.status(node1=node, match=m)
3275 changes = repo.status(node1=node, match=m)
3276 for kind in changes:
3276 for kind in changes:
3277 for abs in kind:
3277 for abs in kind:
3278 names[abs] = m.exact(abs)
3278 names[abs] = m.exact(abs)
3279
3279
3280 m = scmutil.matchfiles(repo, names)
3280 m = scmutil.matchfiles(repo, names)
3281
3281
3282 modified = set(changes.modified)
3282 modified = set(changes.modified)
3283 added = set(changes.added)
3283 added = set(changes.added)
3284 removed = set(changes.removed)
3284 removed = set(changes.removed)
3285 _deleted = set(changes.deleted)
3285 _deleted = set(changes.deleted)
3286 unknown = set(changes.unknown)
3286 unknown = set(changes.unknown)
3287 unknown.update(changes.ignored)
3287 unknown.update(changes.ignored)
3288 clean = set(changes.clean)
3288 clean = set(changes.clean)
3289 modadded = set()
3289 modadded = set()
3290
3290
3291 # We need to account for the state of the file in the dirstate,
3291 # We need to account for the state of the file in the dirstate,
3292 # even when we revert against something else than parent. This will
3292 # even when we revert against something else than parent. This will
3293 # slightly alter the behavior of revert (doing back up or not, delete
3293 # slightly alter the behavior of revert (doing back up or not, delete
3294 # or just forget etc).
3294 # or just forget etc).
3295 if parent == node:
3295 if parent == node:
3296 dsmodified = modified
3296 dsmodified = modified
3297 dsadded = added
3297 dsadded = added
3298 dsremoved = removed
3298 dsremoved = removed
3299 # store all local modifications, useful later for rename detection
3299 # store all local modifications, useful later for rename detection
3300 localchanges = dsmodified | dsadded
3300 localchanges = dsmodified | dsadded
3301 modified, added, removed = set(), set(), set()
3301 modified, added, removed = set(), set(), set()
3302 else:
3302 else:
3303 changes = repo.status(node1=parent, match=m)
3303 changes = repo.status(node1=parent, match=m)
3304 dsmodified = set(changes.modified)
3304 dsmodified = set(changes.modified)
3305 dsadded = set(changes.added)
3305 dsadded = set(changes.added)
3306 dsremoved = set(changes.removed)
3306 dsremoved = set(changes.removed)
3307 # store all local modifications, useful later for rename detection
3307 # store all local modifications, useful later for rename detection
3308 localchanges = dsmodified | dsadded
3308 localchanges = dsmodified | dsadded
3309
3309
3310 # only take into account for removes between wc and target
3310 # only take into account for removes between wc and target
3311 clean |= dsremoved - removed
3311 clean |= dsremoved - removed
3312 dsremoved &= removed
3312 dsremoved &= removed
3313 # distinct between dirstate remove and other
3313 # distinct between dirstate remove and other
3314 removed -= dsremoved
3314 removed -= dsremoved
3315
3315
3316 modadded = added & dsmodified
3316 modadded = added & dsmodified
3317 added -= modadded
3317 added -= modadded
3318
3318
3319 # tell newly modified apart.
3319 # tell newly modified apart.
3320 dsmodified &= modified
3320 dsmodified &= modified
3321 dsmodified |= modified & dsadded # dirstate added may need backup
3321 dsmodified |= modified & dsadded # dirstate added may need backup
3322 modified -= dsmodified
3322 modified -= dsmodified
3323
3323
3324 # We need to wait for some post-processing to update this set
3324 # We need to wait for some post-processing to update this set
3325 # before making the distinction. The dirstate will be used for
3325 # before making the distinction. The dirstate will be used for
3326 # that purpose.
3326 # that purpose.
3327 dsadded = added
3327 dsadded = added
3328
3328
3329 # in case of merge, files that are actually added can be reported as
3329 # in case of merge, files that are actually added can be reported as
3330 # modified, we need to post process the result
3330 # modified, we need to post process the result
3331 if p2 != repo.nullid:
3331 if p2 != repo.nullid:
3332 mergeadd = set(dsmodified)
3332 mergeadd = set(dsmodified)
3333 for path in dsmodified:
3333 for path in dsmodified:
3334 if path in mf:
3334 if path in mf:
3335 mergeadd.remove(path)
3335 mergeadd.remove(path)
3336 dsadded |= mergeadd
3336 dsadded |= mergeadd
3337 dsmodified -= mergeadd
3337 dsmodified -= mergeadd
3338
3338
3339 # if f is a rename, update `names` to also revert the source
3339 # if f is a rename, update `names` to also revert the source
3340 for f in localchanges:
3340 for f in localchanges:
3341 src = repo.dirstate.copied(f)
3341 src = repo.dirstate.copied(f)
3342 # XXX should we check for rename down to target node?
3342 # XXX should we check for rename down to target node?
3343 if src and src not in names and repo.dirstate[src] == b'r':
3343 if src and src not in names and repo.dirstate[src] == b'r':
3344 dsremoved.add(src)
3344 dsremoved.add(src)
3345 names[src] = True
3345 names[src] = True
3346
3346
3347 # determine the exact nature of the deleted changesets
3347 # determine the exact nature of the deleted changesets
3348 deladded = set(_deleted)
3348 deladded = set(_deleted)
3349 for path in _deleted:
3349 for path in _deleted:
3350 if path in mf:
3350 if path in mf:
3351 deladded.remove(path)
3351 deladded.remove(path)
3352 deleted = _deleted - deladded
3352 deleted = _deleted - deladded
3353
3353
3354 # distinguish between file to forget and the other
3354 # distinguish between file to forget and the other
3355 added = set()
3355 added = set()
3356 for abs in dsadded:
3356 for abs in dsadded:
3357 if repo.dirstate[abs] != b'a':
3357 if repo.dirstate[abs] != b'a':
3358 added.add(abs)
3358 added.add(abs)
3359 dsadded -= added
3359 dsadded -= added
3360
3360
3361 for abs in deladded:
3361 for abs in deladded:
3362 if repo.dirstate[abs] == b'a':
3362 if repo.dirstate[abs] == b'a':
3363 dsadded.add(abs)
3363 dsadded.add(abs)
3364 deladded -= dsadded
3364 deladded -= dsadded
3365
3365
3366 # For files marked as removed, we check if an unknown file is present at
3366 # For files marked as removed, we check if an unknown file is present at
3367 # the same path. If a such file exists it may need to be backed up.
3367 # the same path. If a such file exists it may need to be backed up.
3368 # Making the distinction at this stage helps have simpler backup
3368 # Making the distinction at this stage helps have simpler backup
3369 # logic.
3369 # logic.
3370 removunk = set()
3370 removunk = set()
3371 for abs in removed:
3371 for abs in removed:
3372 target = repo.wjoin(abs)
3372 target = repo.wjoin(abs)
3373 if os.path.lexists(target):
3373 if os.path.lexists(target):
3374 removunk.add(abs)
3374 removunk.add(abs)
3375 removed -= removunk
3375 removed -= removunk
3376
3376
3377 dsremovunk = set()
3377 dsremovunk = set()
3378 for abs in dsremoved:
3378 for abs in dsremoved:
3379 target = repo.wjoin(abs)
3379 target = repo.wjoin(abs)
3380 if os.path.lexists(target):
3380 if os.path.lexists(target):
3381 dsremovunk.add(abs)
3381 dsremovunk.add(abs)
3382 dsremoved -= dsremovunk
3382 dsremoved -= dsremovunk
3383
3383
3384 # action to be actually performed by revert
3384 # action to be actually performed by revert
3385 # (<list of file>, message>) tuple
3385 # (<list of file>, message>) tuple
3386 actions = {
3386 actions = {
3387 b'revert': ([], _(b'reverting %s\n')),
3387 b'revert': ([], _(b'reverting %s\n')),
3388 b'add': ([], _(b'adding %s\n')),
3388 b'add': ([], _(b'adding %s\n')),
3389 b'remove': ([], _(b'removing %s\n')),
3389 b'remove': ([], _(b'removing %s\n')),
3390 b'drop': ([], _(b'removing %s\n')),
3390 b'drop': ([], _(b'removing %s\n')),
3391 b'forget': ([], _(b'forgetting %s\n')),
3391 b'forget': ([], _(b'forgetting %s\n')),
3392 b'undelete': ([], _(b'undeleting %s\n')),
3392 b'undelete': ([], _(b'undeleting %s\n')),
3393 b'noop': (None, _(b'no changes needed to %s\n')),
3393 b'noop': (None, _(b'no changes needed to %s\n')),
3394 b'unknown': (None, _(b'file not managed: %s\n')),
3394 b'unknown': (None, _(b'file not managed: %s\n')),
3395 }
3395 }
3396
3396
3397 # "constant" that convey the backup strategy.
3397 # "constant" that convey the backup strategy.
3398 # All set to `discard` if `no-backup` is set do avoid checking
3398 # All set to `discard` if `no-backup` is set do avoid checking
3399 # no_backup lower in the code.
3399 # no_backup lower in the code.
3400 # These values are ordered for comparison purposes
3400 # These values are ordered for comparison purposes
3401 backupinteractive = 3 # do backup if interactively modified
3401 backupinteractive = 3 # do backup if interactively modified
3402 backup = 2 # unconditionally do backup
3402 backup = 2 # unconditionally do backup
3403 check = 1 # check if the existing file differs from target
3403 check = 1 # check if the existing file differs from target
3404 discard = 0 # never do backup
3404 discard = 0 # never do backup
3405 if opts.get(b'no_backup'):
3405 if opts.get(b'no_backup'):
3406 backupinteractive = backup = check = discard
3406 backupinteractive = backup = check = discard
3407 if interactive:
3407 if interactive:
3408 dsmodifiedbackup = backupinteractive
3408 dsmodifiedbackup = backupinteractive
3409 else:
3409 else:
3410 dsmodifiedbackup = backup
3410 dsmodifiedbackup = backup
3411 tobackup = set()
3411 tobackup = set()
3412
3412
3413 backupanddel = actions[b'remove']
3413 backupanddel = actions[b'remove']
3414 if not opts.get(b'no_backup'):
3414 if not opts.get(b'no_backup'):
3415 backupanddel = actions[b'drop']
3415 backupanddel = actions[b'drop']
3416
3416
3417 disptable = (
3417 disptable = (
3418 # dispatch table:
3418 # dispatch table:
3419 # file state
3419 # file state
3420 # action
3420 # action
3421 # make backup
3421 # make backup
3422 ## Sets that results that will change file on disk
3422 ## Sets that results that will change file on disk
3423 # Modified compared to target, no local change
3423 # Modified compared to target, no local change
3424 (modified, actions[b'revert'], discard),
3424 (modified, actions[b'revert'], discard),
3425 # Modified compared to target, but local file is deleted
3425 # Modified compared to target, but local file is deleted
3426 (deleted, actions[b'revert'], discard),
3426 (deleted, actions[b'revert'], discard),
3427 # Modified compared to target, local change
3427 # Modified compared to target, local change
3428 (dsmodified, actions[b'revert'], dsmodifiedbackup),
3428 (dsmodified, actions[b'revert'], dsmodifiedbackup),
3429 # Added since target
3429 # Added since target
3430 (added, actions[b'remove'], discard),
3430 (added, actions[b'remove'], discard),
3431 # Added in working directory
3431 # Added in working directory
3432 (dsadded, actions[b'forget'], discard),
3432 (dsadded, actions[b'forget'], discard),
3433 # Added since target, have local modification
3433 # Added since target, have local modification
3434 (modadded, backupanddel, backup),
3434 (modadded, backupanddel, backup),
3435 # Added since target but file is missing in working directory
3435 # Added since target but file is missing in working directory
3436 (deladded, actions[b'drop'], discard),
3436 (deladded, actions[b'drop'], discard),
3437 # Removed since target, before working copy parent
3437 # Removed since target, before working copy parent
3438 (removed, actions[b'add'], discard),
3438 (removed, actions[b'add'], discard),
3439 # Same as `removed` but an unknown file exists at the same path
3439 # Same as `removed` but an unknown file exists at the same path
3440 (removunk, actions[b'add'], check),
3440 (removunk, actions[b'add'], check),
3441 # Removed since targe, marked as such in working copy parent
3441 # Removed since targe, marked as such in working copy parent
3442 (dsremoved, actions[b'undelete'], discard),
3442 (dsremoved, actions[b'undelete'], discard),
3443 # Same as `dsremoved` but an unknown file exists at the same path
3443 # Same as `dsremoved` but an unknown file exists at the same path
3444 (dsremovunk, actions[b'undelete'], check),
3444 (dsremovunk, actions[b'undelete'], check),
3445 ## the following sets does not result in any file changes
3445 ## the following sets does not result in any file changes
3446 # File with no modification
3446 # File with no modification
3447 (clean, actions[b'noop'], discard),
3447 (clean, actions[b'noop'], discard),
3448 # Existing file, not tracked anywhere
3448 # Existing file, not tracked anywhere
3449 (unknown, actions[b'unknown'], discard),
3449 (unknown, actions[b'unknown'], discard),
3450 )
3450 )
3451
3451
3452 for abs, exact in sorted(names.items()):
3452 for abs, exact in sorted(names.items()):
3453 # target file to be touch on disk (relative to cwd)
3453 # target file to be touch on disk (relative to cwd)
3454 target = repo.wjoin(abs)
3454 target = repo.wjoin(abs)
3455 # search the entry in the dispatch table.
3455 # search the entry in the dispatch table.
3456 # if the file is in any of these sets, it was touched in the working
3456 # if the file is in any of these sets, it was touched in the working
3457 # directory parent and we are sure it needs to be reverted.
3457 # directory parent and we are sure it needs to be reverted.
3458 for table, (xlist, msg), dobackup in disptable:
3458 for table, (xlist, msg), dobackup in disptable:
3459 if abs not in table:
3459 if abs not in table:
3460 continue
3460 continue
3461 if xlist is not None:
3461 if xlist is not None:
3462 xlist.append(abs)
3462 xlist.append(abs)
3463 if dobackup:
3463 if dobackup:
3464 # If in interactive mode, don't automatically create
3464 # If in interactive mode, don't automatically create
3465 # .orig files (issue4793)
3465 # .orig files (issue4793)
3466 if dobackup == backupinteractive:
3466 if dobackup == backupinteractive:
3467 tobackup.add(abs)
3467 tobackup.add(abs)
3468 elif backup <= dobackup or wctx[abs].cmp(ctx[abs]):
3468 elif backup <= dobackup or wctx[abs].cmp(ctx[abs]):
3469 absbakname = scmutil.backuppath(ui, repo, abs)
3469 absbakname = scmutil.backuppath(ui, repo, abs)
3470 bakname = os.path.relpath(
3470 bakname = os.path.relpath(
3471 absbakname, start=repo.root
3471 absbakname, start=repo.root
3472 )
3472 )
3473 ui.note(
3473 ui.note(
3474 _(b'saving current version of %s as %s\n')
3474 _(b'saving current version of %s as %s\n')
3475 % (uipathfn(abs), uipathfn(bakname))
3475 % (uipathfn(abs), uipathfn(bakname))
3476 )
3476 )
3477 if not opts.get(b'dry_run'):
3477 if not opts.get(b'dry_run'):
3478 if interactive:
3478 if interactive:
3479 util.copyfile(target, absbakname)
3479 util.copyfile(target, absbakname)
3480 else:
3480 else:
3481 util.rename(target, absbakname)
3481 util.rename(target, absbakname)
3482 if opts.get(b'dry_run'):
3482 if opts.get(b'dry_run'):
3483 if ui.verbose or not exact:
3483 if ui.verbose or not exact:
3484 ui.status(msg % uipathfn(abs))
3484 ui.status(msg % uipathfn(abs))
3485 elif exact:
3485 elif exact:
3486 ui.warn(msg % uipathfn(abs))
3486 ui.warn(msg % uipathfn(abs))
3487 break
3487 break
3488
3488
3489 if not opts.get(b'dry_run'):
3489 if not opts.get(b'dry_run'):
3490 needdata = (b'revert', b'add', b'undelete')
3490 needdata = (b'revert', b'add', b'undelete')
3491 oplist = [actions[name][0] for name in needdata]
3491 oplist = [actions[name][0] for name in needdata]
3492 prefetch = scmutil.prefetchfiles
3492 prefetch = scmutil.prefetchfiles
3493 matchfiles = scmutil.matchfiles(
3493 matchfiles = scmutil.matchfiles(
3494 repo, [f for sublist in oplist for f in sublist]
3494 repo, [f for sublist in oplist for f in sublist]
3495 )
3495 )
3496 prefetch(
3496 prefetch(
3497 repo,
3497 repo,
3498 [(ctx.rev(), matchfiles)],
3498 [(ctx.rev(), matchfiles)],
3499 )
3499 )
3500 match = scmutil.match(repo[None], pats)
3500 match = scmutil.match(repo[None], pats)
3501 _performrevert(
3501 _performrevert(
3502 repo,
3502 repo,
3503 ctx,
3503 ctx,
3504 names,
3504 names,
3505 uipathfn,
3505 uipathfn,
3506 actions,
3506 actions,
3507 match,
3507 match,
3508 interactive,
3508 interactive,
3509 tobackup,
3509 tobackup,
3510 )
3510 )
3511
3511
3512 if targetsubs:
3512 if targetsubs:
3513 # Revert the subrepos on the revert list
3513 # Revert the subrepos on the revert list
3514 for sub in targetsubs:
3514 for sub in targetsubs:
3515 try:
3515 try:
3516 wctx.sub(sub).revert(
3516 wctx.sub(sub).revert(
3517 ctx.substate[sub], *pats, **pycompat.strkwargs(opts)
3517 ctx.substate[sub], *pats, **pycompat.strkwargs(opts)
3518 )
3518 )
3519 except KeyError:
3519 except KeyError:
3520 raise error.Abort(
3520 raise error.Abort(
3521 b"subrepository '%s' does not exist in %s!"
3521 b"subrepository '%s' does not exist in %s!"
3522 % (sub, short(ctx.node()))
3522 % (sub, short(ctx.node()))
3523 )
3523 )
3524
3524
3525
3525
3526 def _performrevert(
3526 def _performrevert(
3527 repo,
3527 repo,
3528 ctx,
3528 ctx,
3529 names,
3529 names,
3530 uipathfn,
3530 uipathfn,
3531 actions,
3531 actions,
3532 match,
3532 match,
3533 interactive=False,
3533 interactive=False,
3534 tobackup=None,
3534 tobackup=None,
3535 ):
3535 ):
3536 """function that actually perform all the actions computed for revert
3536 """function that actually perform all the actions computed for revert
3537
3537
3538 This is an independent function to let extension to plug in and react to
3538 This is an independent function to let extension to plug in and react to
3539 the imminent revert.
3539 the imminent revert.
3540
3540
3541 Make sure you have the working directory locked when calling this function.
3541 Make sure you have the working directory locked when calling this function.
3542 """
3542 """
3543 parent, p2 = repo.dirstate.parents()
3543 parent, p2 = repo.dirstate.parents()
3544 node = ctx.node()
3544 node = ctx.node()
3545 excluded_files = []
3545 excluded_files = []
3546
3546
3547 def checkout(f):
3547 def checkout(f):
3548 fc = ctx[f]
3548 fc = ctx[f]
3549 repo.wwrite(f, fc.data(), fc.flags())
3549 repo.wwrite(f, fc.data(), fc.flags())
3550
3550
3551 def doremove(f):
3551 def doremove(f):
3552 try:
3552 try:
3553 rmdir = repo.ui.configbool(b'experimental', b'removeemptydirs')
3553 rmdir = repo.ui.configbool(b'experimental', b'removeemptydirs')
3554 repo.wvfs.unlinkpath(f, rmdir=rmdir)
3554 repo.wvfs.unlinkpath(f, rmdir=rmdir)
3555 except OSError:
3555 except OSError:
3556 pass
3556 pass
3557 repo.dirstate.remove(f)
3557 repo.dirstate.remove(f)
3558
3558
3559 def prntstatusmsg(action, f):
3559 def prntstatusmsg(action, f):
3560 exact = names[f]
3560 exact = names[f]
3561 if repo.ui.verbose or not exact:
3561 if repo.ui.verbose or not exact:
3562 repo.ui.status(actions[action][1] % uipathfn(f))
3562 repo.ui.status(actions[action][1] % uipathfn(f))
3563
3563
3564 audit_path = pathutil.pathauditor(repo.root, cached=True)
3564 audit_path = pathutil.pathauditor(repo.root, cached=True)
3565 for f in actions[b'forget'][0]:
3565 for f in actions[b'forget'][0]:
3566 if interactive:
3566 if interactive:
3567 choice = repo.ui.promptchoice(
3567 choice = repo.ui.promptchoice(
3568 _(b"forget added file %s (Yn)?$$ &Yes $$ &No") % uipathfn(f)
3568 _(b"forget added file %s (Yn)?$$ &Yes $$ &No") % uipathfn(f)
3569 )
3569 )
3570 if choice == 0:
3570 if choice == 0:
3571 prntstatusmsg(b'forget', f)
3571 prntstatusmsg(b'forget', f)
3572 repo.dirstate.drop(f)
3572 repo.dirstate.drop(f)
3573 else:
3573 else:
3574 excluded_files.append(f)
3574 excluded_files.append(f)
3575 else:
3575 else:
3576 prntstatusmsg(b'forget', f)
3576 prntstatusmsg(b'forget', f)
3577 repo.dirstate.drop(f)
3577 repo.dirstate.drop(f)
3578 for f in actions[b'remove'][0]:
3578 for f in actions[b'remove'][0]:
3579 audit_path(f)
3579 audit_path(f)
3580 if interactive:
3580 if interactive:
3581 choice = repo.ui.promptchoice(
3581 choice = repo.ui.promptchoice(
3582 _(b"remove added file %s (Yn)?$$ &Yes $$ &No") % uipathfn(f)
3582 _(b"remove added file %s (Yn)?$$ &Yes $$ &No") % uipathfn(f)
3583 )
3583 )
3584 if choice == 0:
3584 if choice == 0:
3585 prntstatusmsg(b'remove', f)
3585 prntstatusmsg(b'remove', f)
3586 doremove(f)
3586 doremove(f)
3587 else:
3587 else:
3588 excluded_files.append(f)
3588 excluded_files.append(f)
3589 else:
3589 else:
3590 prntstatusmsg(b'remove', f)
3590 prntstatusmsg(b'remove', f)
3591 doremove(f)
3591 doremove(f)
3592 for f in actions[b'drop'][0]:
3592 for f in actions[b'drop'][0]:
3593 audit_path(f)
3593 audit_path(f)
3594 prntstatusmsg(b'drop', f)
3594 prntstatusmsg(b'drop', f)
3595 repo.dirstate.remove(f)
3595 repo.dirstate.remove(f)
3596
3596
3597 normal = None
3597 normal = None
3598 if node == parent:
3598 if node == parent:
3599 # We're reverting to our parent. If possible, we'd like status
3599 # We're reverting to our parent. If possible, we'd like status
3600 # to report the file as clean. We have to use normallookup for
3600 # to report the file as clean. We have to use normallookup for
3601 # merges to avoid losing information about merged/dirty files.
3601 # merges to avoid losing information about merged/dirty files.
3602 if p2 != repo.nullid:
3602 if p2 != repo.nullid:
3603 normal = repo.dirstate.normallookup
3603 normal = repo.dirstate.normallookup
3604 else:
3604 else:
3605 normal = repo.dirstate.normal
3605 normal = repo.dirstate.normal
3606
3606
3607 newlyaddedandmodifiedfiles = set()
3607 newlyaddedandmodifiedfiles = set()
3608 if interactive:
3608 if interactive:
3609 # Prompt the user for changes to revert
3609 # Prompt the user for changes to revert
3610 torevert = [f for f in actions[b'revert'][0] if f not in excluded_files]
3610 torevert = [f for f in actions[b'revert'][0] if f not in excluded_files]
3611 m = scmutil.matchfiles(repo, torevert)
3611 m = scmutil.matchfiles(repo, torevert)
3612 diffopts = patch.difffeatureopts(
3612 diffopts = patch.difffeatureopts(
3613 repo.ui,
3613 repo.ui,
3614 whitespace=True,
3614 whitespace=True,
3615 section=b'commands',
3615 section=b'commands',
3616 configprefix=b'revert.interactive.',
3616 configprefix=b'revert.interactive.',
3617 )
3617 )
3618 diffopts.nodates = True
3618 diffopts.nodates = True
3619 diffopts.git = True
3619 diffopts.git = True
3620 operation = b'apply'
3620 operation = b'apply'
3621 if node == parent:
3621 if node == parent:
3622 if repo.ui.configbool(
3622 if repo.ui.configbool(
3623 b'experimental', b'revert.interactive.select-to-keep'
3623 b'experimental', b'revert.interactive.select-to-keep'
3624 ):
3624 ):
3625 operation = b'keep'
3625 operation = b'keep'
3626 else:
3626 else:
3627 operation = b'discard'
3627 operation = b'discard'
3628
3628
3629 if operation == b'apply':
3629 if operation == b'apply':
3630 diff = patch.diff(repo, None, ctx.node(), m, opts=diffopts)
3630 diff = patch.diff(repo, None, ctx.node(), m, opts=diffopts)
3631 else:
3631 else:
3632 diff = patch.diff(repo, ctx.node(), None, m, opts=diffopts)
3632 diff = patch.diff(repo, ctx.node(), None, m, opts=diffopts)
3633 originalchunks = patch.parsepatch(diff)
3633 originalchunks = patch.parsepatch(diff)
3634
3634
3635 try:
3635 try:
3636
3636
3637 chunks, opts = recordfilter(
3637 chunks, opts = recordfilter(
3638 repo.ui, originalchunks, match, operation=operation
3638 repo.ui, originalchunks, match, operation=operation
3639 )
3639 )
3640 if operation == b'discard':
3640 if operation == b'discard':
3641 chunks = patch.reversehunks(chunks)
3641 chunks = patch.reversehunks(chunks)
3642
3642
3643 except error.PatchError as err:
3643 except error.PatchError as err:
3644 raise error.Abort(_(b'error parsing patch: %s') % err)
3644 raise error.Abort(_(b'error parsing patch: %s') % err)
3645
3645
3646 # FIXME: when doing an interactive revert of a copy, there's no way of
3646 # FIXME: when doing an interactive revert of a copy, there's no way of
3647 # performing a partial revert of the added file, the only option is
3647 # performing a partial revert of the added file, the only option is
3648 # "remove added file <name> (Yn)?", so we don't need to worry about the
3648 # "remove added file <name> (Yn)?", so we don't need to worry about the
3649 # alsorestore value. Ideally we'd be able to partially revert
3649 # alsorestore value. Ideally we'd be able to partially revert
3650 # copied/renamed files.
3650 # copied/renamed files.
3651 newlyaddedandmodifiedfiles, unusedalsorestore = newandmodified(
3651 newlyaddedandmodifiedfiles, unusedalsorestore = newandmodified(
3652 chunks, originalchunks
3652 chunks, originalchunks
3653 )
3653 )
3654 if tobackup is None:
3654 if tobackup is None:
3655 tobackup = set()
3655 tobackup = set()
3656 # Apply changes
3656 # Apply changes
3657 fp = stringio()
3657 fp = stringio()
3658 # chunks are serialized per file, but files aren't sorted
3658 # chunks are serialized per file, but files aren't sorted
3659 for f in sorted({c.header.filename() for c in chunks if ishunk(c)}):
3659 for f in sorted({c.header.filename() for c in chunks if ishunk(c)}):
3660 prntstatusmsg(b'revert', f)
3660 prntstatusmsg(b'revert', f)
3661 files = set()
3661 files = set()
3662 for c in chunks:
3662 for c in chunks:
3663 if ishunk(c):
3663 if ishunk(c):
3664 abs = c.header.filename()
3664 abs = c.header.filename()
3665 # Create a backup file only if this hunk should be backed up
3665 # Create a backup file only if this hunk should be backed up
3666 if c.header.filename() in tobackup:
3666 if c.header.filename() in tobackup:
3667 target = repo.wjoin(abs)
3667 target = repo.wjoin(abs)
3668 bakname = scmutil.backuppath(repo.ui, repo, abs)
3668 bakname = scmutil.backuppath(repo.ui, repo, abs)
3669 util.copyfile(target, bakname)
3669 util.copyfile(target, bakname)
3670 tobackup.remove(abs)
3670 tobackup.remove(abs)
3671 if abs not in files:
3671 if abs not in files:
3672 files.add(abs)
3672 files.add(abs)
3673 if operation == b'keep':
3673 if operation == b'keep':
3674 checkout(abs)
3674 checkout(abs)
3675 c.write(fp)
3675 c.write(fp)
3676 dopatch = fp.tell()
3676 dopatch = fp.tell()
3677 fp.seek(0)
3677 fp.seek(0)
3678 if dopatch:
3678 if dopatch:
3679 try:
3679 try:
3680 patch.internalpatch(repo.ui, repo, fp, 1, eolmode=None)
3680 patch.internalpatch(repo.ui, repo, fp, 1, eolmode=None)
3681 except error.PatchError as err:
3681 except error.PatchError as err:
3682 raise error.Abort(pycompat.bytestr(err))
3682 raise error.Abort(pycompat.bytestr(err))
3683 del fp
3683 del fp
3684 else:
3684 else:
3685 for f in actions[b'revert'][0]:
3685 for f in actions[b'revert'][0]:
3686 prntstatusmsg(b'revert', f)
3686 prntstatusmsg(b'revert', f)
3687 checkout(f)
3687 checkout(f)
3688 if normal:
3688 if normal:
3689 normal(f)
3689 normal(f)
3690
3690
3691 for f in actions[b'add'][0]:
3691 for f in actions[b'add'][0]:
3692 # Don't checkout modified files, they are already created by the diff
3692 # Don't checkout modified files, they are already created by the diff
3693 if f not in newlyaddedandmodifiedfiles:
3693 if f not in newlyaddedandmodifiedfiles:
3694 prntstatusmsg(b'add', f)
3694 prntstatusmsg(b'add', f)
3695 checkout(f)
3695 checkout(f)
3696 repo.dirstate.add(f)
3696 repo.dirstate.add(f)
3697
3697
3698 normal = repo.dirstate.normallookup
3698 normal = repo.dirstate.normallookup
3699 if node == parent and p2 == repo.nullid:
3699 if node == parent and p2 == repo.nullid:
3700 normal = repo.dirstate.normal
3700 normal = repo.dirstate.normal
3701 for f in actions[b'undelete'][0]:
3701 for f in actions[b'undelete'][0]:
3702 if interactive:
3702 if interactive:
3703 choice = repo.ui.promptchoice(
3703 choice = repo.ui.promptchoice(
3704 _(b"add back removed file %s (Yn)?$$ &Yes $$ &No") % f
3704 _(b"add back removed file %s (Yn)?$$ &Yes $$ &No") % f
3705 )
3705 )
3706 if choice == 0:
3706 if choice == 0:
3707 prntstatusmsg(b'undelete', f)
3707 prntstatusmsg(b'undelete', f)
3708 checkout(f)
3708 checkout(f)
3709 normal(f)
3709 normal(f)
3710 else:
3710 else:
3711 excluded_files.append(f)
3711 excluded_files.append(f)
3712 else:
3712 else:
3713 prntstatusmsg(b'undelete', f)
3713 prntstatusmsg(b'undelete', f)
3714 checkout(f)
3714 checkout(f)
3715 normal(f)
3715 normal(f)
3716
3716
3717 copied = copies.pathcopies(repo[parent], ctx)
3717 copied = copies.pathcopies(repo[parent], ctx)
3718
3718
3719 for f in (
3719 for f in (
3720 actions[b'add'][0] + actions[b'undelete'][0] + actions[b'revert'][0]
3720 actions[b'add'][0] + actions[b'undelete'][0] + actions[b'revert'][0]
3721 ):
3721 ):
3722 if f in copied:
3722 if f in copied:
3723 repo.dirstate.copy(copied[f], f)
3723 repo.dirstate.copy(copied[f], f)
3724
3724
3725
3725
3726 # a list of (ui, repo, otherpeer, opts, missing) functions called by
3726 # a list of (ui, repo, otherpeer, opts, missing) functions called by
3727 # commands.outgoing. "missing" is "missing" of the result of
3727 # commands.outgoing. "missing" is "missing" of the result of
3728 # "findcommonoutgoing()"
3728 # "findcommonoutgoing()"
3729 outgoinghooks = util.hooks()
3729 outgoinghooks = util.hooks()
3730
3730
3731 # a list of (ui, repo) functions called by commands.summary
3731 # a list of (ui, repo) functions called by commands.summary
3732 summaryhooks = util.hooks()
3732 summaryhooks = util.hooks()
3733
3733
3734 # a list of (ui, repo, opts, changes) functions called by commands.summary.
3734 # a list of (ui, repo, opts, changes) functions called by commands.summary.
3735 #
3735 #
3736 # functions should return tuple of booleans below, if 'changes' is None:
3736 # functions should return tuple of booleans below, if 'changes' is None:
3737 # (whether-incomings-are-needed, whether-outgoings-are-needed)
3737 # (whether-incomings-are-needed, whether-outgoings-are-needed)
3738 #
3738 #
3739 # otherwise, 'changes' is a tuple of tuples below:
3739 # otherwise, 'changes' is a tuple of tuples below:
3740 # - (sourceurl, sourcebranch, sourcepeer, incoming)
3740 # - (sourceurl, sourcebranch, sourcepeer, incoming)
3741 # - (desturl, destbranch, destpeer, outgoing)
3741 # - (desturl, destbranch, destpeer, outgoing)
3742 summaryremotehooks = util.hooks()
3742 summaryremotehooks = util.hooks()
3743
3743
3744
3744
3745 def checkunfinished(repo, commit=False, skipmerge=False):
3745 def checkunfinished(repo, commit=False, skipmerge=False):
3746 """Look for an unfinished multistep operation, like graft, and abort
3746 """Look for an unfinished multistep operation, like graft, and abort
3747 if found. It's probably good to check this right before
3747 if found. It's probably good to check this right before
3748 bailifchanged().
3748 bailifchanged().
3749 """
3749 """
3750 # Check for non-clearable states first, so things like rebase will take
3750 # Check for non-clearable states first, so things like rebase will take
3751 # precedence over update.
3751 # precedence over update.
3752 for state in statemod._unfinishedstates:
3752 for state in statemod._unfinishedstates:
3753 if (
3753 if (
3754 state._clearable
3754 state._clearable
3755 or (commit and state._allowcommit)
3755 or (commit and state._allowcommit)
3756 or state._reportonly
3756 or state._reportonly
3757 ):
3757 ):
3758 continue
3758 continue
3759 if state.isunfinished(repo):
3759 if state.isunfinished(repo):
3760 raise error.StateError(state.msg(), hint=state.hint())
3760 raise error.StateError(state.msg(), hint=state.hint())
3761
3761
3762 for s in statemod._unfinishedstates:
3762 for s in statemod._unfinishedstates:
3763 if (
3763 if (
3764 not s._clearable
3764 not s._clearable
3765 or (commit and s._allowcommit)
3765 or (commit and s._allowcommit)
3766 or (s._opname == b'merge' and skipmerge)
3766 or (s._opname == b'merge' and skipmerge)
3767 or s._reportonly
3767 or s._reportonly
3768 ):
3768 ):
3769 continue
3769 continue
3770 if s.isunfinished(repo):
3770 if s.isunfinished(repo):
3771 raise error.StateError(s.msg(), hint=s.hint())
3771 raise error.StateError(s.msg(), hint=s.hint())
3772
3772
3773
3773
3774 def clearunfinished(repo):
3774 def clearunfinished(repo):
3775 """Check for unfinished operations (as above), and clear the ones
3775 """Check for unfinished operations (as above), and clear the ones
3776 that are clearable.
3776 that are clearable.
3777 """
3777 """
3778 for state in statemod._unfinishedstates:
3778 for state in statemod._unfinishedstates:
3779 if state._reportonly:
3779 if state._reportonly:
3780 continue
3780 continue
3781 if not state._clearable and state.isunfinished(repo):
3781 if not state._clearable and state.isunfinished(repo):
3782 raise error.StateError(state.msg(), hint=state.hint())
3782 raise error.StateError(state.msg(), hint=state.hint())
3783
3783
3784 for s in statemod._unfinishedstates:
3784 for s in statemod._unfinishedstates:
3785 if s._opname == b'merge' or s._reportonly:
3785 if s._opname == b'merge' or s._reportonly:
3786 continue
3786 continue
3787 if s._clearable and s.isunfinished(repo):
3787 if s._clearable and s.isunfinished(repo):
3788 util.unlink(repo.vfs.join(s._fname))
3788 util.unlink(repo.vfs.join(s._fname))
3789
3789
3790
3790
3791 def getunfinishedstate(repo):
3791 def getunfinishedstate(repo):
3792 """Checks for unfinished operations and returns statecheck object
3792 """Checks for unfinished operations and returns statecheck object
3793 for it"""
3793 for it"""
3794 for state in statemod._unfinishedstates:
3794 for state in statemod._unfinishedstates:
3795 if state.isunfinished(repo):
3795 if state.isunfinished(repo):
3796 return state
3796 return state
3797 return None
3797 return None
3798
3798
3799
3799
3800 def howtocontinue(repo):
3800 def howtocontinue(repo):
3801 """Check for an unfinished operation and return the command to finish
3801 """Check for an unfinished operation and return the command to finish
3802 it.
3802 it.
3803
3803
3804 statemod._unfinishedstates list is checked for an unfinished operation
3804 statemod._unfinishedstates list is checked for an unfinished operation
3805 and the corresponding message to finish it is generated if a method to
3805 and the corresponding message to finish it is generated if a method to
3806 continue is supported by the operation.
3806 continue is supported by the operation.
3807
3807
3808 Returns a (msg, warning) tuple. 'msg' is a string and 'warning' is
3808 Returns a (msg, warning) tuple. 'msg' is a string and 'warning' is
3809 a boolean.
3809 a boolean.
3810 """
3810 """
3811 contmsg = _(b"continue: %s")
3811 contmsg = _(b"continue: %s")
3812 for state in statemod._unfinishedstates:
3812 for state in statemod._unfinishedstates:
3813 if not state._continueflag:
3813 if not state._continueflag:
3814 continue
3814 continue
3815 if state.isunfinished(repo):
3815 if state.isunfinished(repo):
3816 return contmsg % state.continuemsg(), True
3816 return contmsg % state.continuemsg(), True
3817 if repo[None].dirty(missing=True, merge=False, branch=False):
3817 if repo[None].dirty(missing=True, merge=False, branch=False):
3818 return contmsg % _(b"hg commit"), False
3818 return contmsg % _(b"hg commit"), False
3819 return None, None
3819 return None, None
3820
3820
3821
3821
3822 def checkafterresolved(repo):
3822 def checkafterresolved(repo):
3823 """Inform the user about the next action after completing hg resolve
3823 """Inform the user about the next action after completing hg resolve
3824
3824
3825 If there's a an unfinished operation that supports continue flag,
3825 If there's a an unfinished operation that supports continue flag,
3826 howtocontinue will yield repo.ui.warn as the reporter.
3826 howtocontinue will yield repo.ui.warn as the reporter.
3827
3827
3828 Otherwise, it will yield repo.ui.note.
3828 Otherwise, it will yield repo.ui.note.
3829 """
3829 """
3830 msg, warning = howtocontinue(repo)
3830 msg, warning = howtocontinue(repo)
3831 if msg is not None:
3831 if msg is not None:
3832 if warning:
3832 if warning:
3833 repo.ui.warn(b"%s\n" % msg)
3833 repo.ui.warn(b"%s\n" % msg)
3834 else:
3834 else:
3835 repo.ui.note(b"%s\n" % msg)
3835 repo.ui.note(b"%s\n" % msg)
3836
3836
3837
3837
3838 def wrongtooltocontinue(repo, task):
3838 def wrongtooltocontinue(repo, task):
3839 """Raise an abort suggesting how to properly continue if there is an
3839 """Raise an abort suggesting how to properly continue if there is an
3840 active task.
3840 active task.
3841
3841
3842 Uses howtocontinue() to find the active task.
3842 Uses howtocontinue() to find the active task.
3843
3843
3844 If there's no task (repo.ui.note for 'hg commit'), it does not offer
3844 If there's no task (repo.ui.note for 'hg commit'), it does not offer
3845 a hint.
3845 a hint.
3846 """
3846 """
3847 after = howtocontinue(repo)
3847 after = howtocontinue(repo)
3848 hint = None
3848 hint = None
3849 if after[1]:
3849 if after[1]:
3850 hint = after[0]
3850 hint = after[0]
3851 raise error.StateError(_(b'no %s in progress') % task, hint=hint)
3851 raise error.StateError(_(b'no %s in progress') % task, hint=hint)
3852
3852
3853
3853
3854 def abortgraft(ui, repo, graftstate):
3854 def abortgraft(ui, repo, graftstate):
3855 """abort the interrupted graft and rollbacks to the state before interrupted
3855 """abort the interrupted graft and rollbacks to the state before interrupted
3856 graft"""
3856 graft"""
3857 if not graftstate.exists():
3857 if not graftstate.exists():
3858 raise error.StateError(_(b"no interrupted graft to abort"))
3858 raise error.StateError(_(b"no interrupted graft to abort"))
3859 statedata = readgraftstate(repo, graftstate)
3859 statedata = readgraftstate(repo, graftstate)
3860 newnodes = statedata.get(b'newnodes')
3860 newnodes = statedata.get(b'newnodes')
3861 if newnodes is None:
3861 if newnodes is None:
3862 # and old graft state which does not have all the data required to abort
3862 # and old graft state which does not have all the data required to abort
3863 # the graft
3863 # the graft
3864 raise error.Abort(_(b"cannot abort using an old graftstate"))
3864 raise error.Abort(_(b"cannot abort using an old graftstate"))
3865
3865
3866 # changeset from which graft operation was started
3866 # changeset from which graft operation was started
3867 if len(newnodes) > 0:
3867 if len(newnodes) > 0:
3868 startctx = repo[newnodes[0]].p1()
3868 startctx = repo[newnodes[0]].p1()
3869 else:
3869 else:
3870 startctx = repo[b'.']
3870 startctx = repo[b'.']
3871 # whether to strip or not
3871 # whether to strip or not
3872 cleanup = False
3872 cleanup = False
3873
3873
3874 if newnodes:
3874 if newnodes:
3875 newnodes = [repo[r].rev() for r in newnodes]
3875 newnodes = [repo[r].rev() for r in newnodes]
3876 cleanup = True
3876 cleanup = True
3877 # checking that none of the newnodes turned public or is public
3877 # checking that none of the newnodes turned public or is public
3878 immutable = [c for c in newnodes if not repo[c].mutable()]
3878 immutable = [c for c in newnodes if not repo[c].mutable()]
3879 if immutable:
3879 if immutable:
3880 repo.ui.warn(
3880 repo.ui.warn(
3881 _(b"cannot clean up public changesets %s\n")
3881 _(b"cannot clean up public changesets %s\n")
3882 % b', '.join(bytes(repo[r]) for r in immutable),
3882 % b', '.join(bytes(repo[r]) for r in immutable),
3883 hint=_(b"see 'hg help phases' for details"),
3883 hint=_(b"see 'hg help phases' for details"),
3884 )
3884 )
3885 cleanup = False
3885 cleanup = False
3886
3886
3887 # checking that no new nodes are created on top of grafted revs
3887 # checking that no new nodes are created on top of grafted revs
3888 desc = set(repo.changelog.descendants(newnodes))
3888 desc = set(repo.changelog.descendants(newnodes))
3889 if desc - set(newnodes):
3889 if desc - set(newnodes):
3890 repo.ui.warn(
3890 repo.ui.warn(
3891 _(
3891 _(
3892 b"new changesets detected on destination "
3892 b"new changesets detected on destination "
3893 b"branch, can't strip\n"
3893 b"branch, can't strip\n"
3894 )
3894 )
3895 )
3895 )
3896 cleanup = False
3896 cleanup = False
3897
3897
3898 if cleanup:
3898 if cleanup:
3899 with repo.wlock(), repo.lock():
3899 with repo.wlock(), repo.lock():
3900 mergemod.clean_update(startctx)
3900 mergemod.clean_update(startctx)
3901 # stripping the new nodes created
3901 # stripping the new nodes created
3902 strippoints = [
3902 strippoints = [
3903 c.node() for c in repo.set(b"roots(%ld)", newnodes)
3903 c.node() for c in repo.set(b"roots(%ld)", newnodes)
3904 ]
3904 ]
3905 repair.strip(repo.ui, repo, strippoints, backup=False)
3905 repair.strip(repo.ui, repo, strippoints, backup=False)
3906
3906
3907 if not cleanup:
3907 if not cleanup:
3908 # we don't update to the startnode if we can't strip
3908 # we don't update to the startnode if we can't strip
3909 startctx = repo[b'.']
3909 startctx = repo[b'.']
3910 mergemod.clean_update(startctx)
3910 mergemod.clean_update(startctx)
3911
3911
3912 ui.status(_(b"graft aborted\n"))
3912 ui.status(_(b"graft aborted\n"))
3913 ui.status(_(b"working directory is now at %s\n") % startctx.hex()[:12])
3913 ui.status(_(b"working directory is now at %s\n") % startctx.hex()[:12])
3914 graftstate.delete()
3914 graftstate.delete()
3915 return 0
3915 return 0
3916
3916
3917
3917
3918 def readgraftstate(repo, graftstate):
3918 def readgraftstate(repo, graftstate):
3919 # type: (Any, statemod.cmdstate) -> Dict[bytes, Any]
3919 # type: (Any, statemod.cmdstate) -> Dict[bytes, Any]
3920 """read the graft state file and return a dict of the data stored in it"""
3920 """read the graft state file and return a dict of the data stored in it"""
3921 try:
3921 try:
3922 return graftstate.read()
3922 return graftstate.read()
3923 except error.CorruptedState:
3923 except error.CorruptedState:
3924 nodes = repo.vfs.read(b'graftstate').splitlines()
3924 nodes = repo.vfs.read(b'graftstate').splitlines()
3925 return {b'nodes': nodes}
3925 return {b'nodes': nodes}
3926
3926
3927
3927
3928 def hgabortgraft(ui, repo):
3928 def hgabortgraft(ui, repo):
3929 """abort logic for aborting graft using 'hg abort'"""
3929 """abort logic for aborting graft using 'hg abort'"""
3930 with repo.wlock():
3930 with repo.wlock():
3931 graftstate = statemod.cmdstate(repo, b'graftstate')
3931 graftstate = statemod.cmdstate(repo, b'graftstate')
3932 return abortgraft(ui, repo, graftstate)
3932 return abortgraft(ui, repo, graftstate)
@@ -1,7965 +1,7965 b''
1 # commands.py - command processing for mercurial
1 # commands.py - command processing for mercurial
2 #
2 #
3 # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
3 # Copyright 2005-2007 Olivia Mackall <olivia@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 errno
10 import errno
11 import os
11 import os
12 import re
12 import re
13 import sys
13 import sys
14
14
15 from .i18n import _
15 from .i18n import _
16 from .node import (
16 from .node import (
17 hex,
17 hex,
18 nullrev,
18 nullrev,
19 short,
19 short,
20 wdirrev,
20 wdirrev,
21 )
21 )
22 from .pycompat import open
22 from .pycompat import open
23 from . import (
23 from . import (
24 archival,
24 archival,
25 bookmarks,
25 bookmarks,
26 bundle2,
26 bundle2,
27 bundlecaches,
27 bundlecaches,
28 changegroup,
28 changegroup,
29 cmdutil,
29 cmdutil,
30 copies,
30 copies,
31 debugcommands as debugcommandsmod,
31 debugcommands as debugcommandsmod,
32 destutil,
32 destutil,
33 dirstateguard,
33 dirstateguard,
34 discovery,
34 discovery,
35 encoding,
35 encoding,
36 error,
36 error,
37 exchange,
37 exchange,
38 extensions,
38 extensions,
39 filemerge,
39 filemerge,
40 formatter,
40 formatter,
41 graphmod,
41 graphmod,
42 grep as grepmod,
42 grep as grepmod,
43 hbisect,
43 hbisect,
44 help,
44 help,
45 hg,
45 hg,
46 logcmdutil,
46 logcmdutil,
47 merge as mergemod,
47 merge as mergemod,
48 mergestate as mergestatemod,
48 mergestate as mergestatemod,
49 narrowspec,
49 narrowspec,
50 obsolete,
50 obsolete,
51 obsutil,
51 obsutil,
52 patch,
52 patch,
53 phases,
53 phases,
54 pycompat,
54 pycompat,
55 rcutil,
55 rcutil,
56 registrar,
56 registrar,
57 requirements,
57 requirements,
58 revsetlang,
58 revsetlang,
59 rewriteutil,
59 rewriteutil,
60 scmutil,
60 scmutil,
61 server,
61 server,
62 shelve as shelvemod,
62 shelve as shelvemod,
63 state as statemod,
63 state as statemod,
64 streamclone,
64 streamclone,
65 tags as tagsmod,
65 tags as tagsmod,
66 ui as uimod,
66 ui as uimod,
67 util,
67 util,
68 verify as verifymod,
68 verify as verifymod,
69 vfs as vfsmod,
69 vfs as vfsmod,
70 wireprotoserver,
70 wireprotoserver,
71 )
71 )
72 from .utils import (
72 from .utils import (
73 dateutil,
73 dateutil,
74 stringutil,
74 stringutil,
75 urlutil,
75 urlutil,
76 )
76 )
77
77
78 if pycompat.TYPE_CHECKING:
78 if pycompat.TYPE_CHECKING:
79 from typing import (
79 from typing import (
80 List,
80 List,
81 )
81 )
82
82
83
83
84 table = {}
84 table = {}
85 table.update(debugcommandsmod.command._table)
85 table.update(debugcommandsmod.command._table)
86
86
87 command = registrar.command(table)
87 command = registrar.command(table)
88 INTENT_READONLY = registrar.INTENT_READONLY
88 INTENT_READONLY = registrar.INTENT_READONLY
89
89
90 # common command options
90 # common command options
91
91
92 globalopts = [
92 globalopts = [
93 (
93 (
94 b'R',
94 b'R',
95 b'repository',
95 b'repository',
96 b'',
96 b'',
97 _(b'repository root directory or name of overlay bundle file'),
97 _(b'repository root directory or name of overlay bundle file'),
98 _(b'REPO'),
98 _(b'REPO'),
99 ),
99 ),
100 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
100 (b'', b'cwd', b'', _(b'change working directory'), _(b'DIR')),
101 (
101 (
102 b'y',
102 b'y',
103 b'noninteractive',
103 b'noninteractive',
104 None,
104 None,
105 _(
105 _(
106 b'do not prompt, automatically pick the first choice for all prompts'
106 b'do not prompt, automatically pick the first choice for all prompts'
107 ),
107 ),
108 ),
108 ),
109 (b'q', b'quiet', None, _(b'suppress output')),
109 (b'q', b'quiet', None, _(b'suppress output')),
110 (b'v', b'verbose', None, _(b'enable additional output')),
110 (b'v', b'verbose', None, _(b'enable additional output')),
111 (
111 (
112 b'',
112 b'',
113 b'color',
113 b'color',
114 b'',
114 b'',
115 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
115 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
116 # and should not be translated
116 # and should not be translated
117 _(b"when to colorize (boolean, always, auto, never, or debug)"),
117 _(b"when to colorize (boolean, always, auto, never, or debug)"),
118 _(b'TYPE'),
118 _(b'TYPE'),
119 ),
119 ),
120 (
120 (
121 b'',
121 b'',
122 b'config',
122 b'config',
123 [],
123 [],
124 _(b'set/override config option (use \'section.name=value\')'),
124 _(b'set/override config option (use \'section.name=value\')'),
125 _(b'CONFIG'),
125 _(b'CONFIG'),
126 ),
126 ),
127 (b'', b'debug', None, _(b'enable debugging output')),
127 (b'', b'debug', None, _(b'enable debugging output')),
128 (b'', b'debugger', None, _(b'start debugger')),
128 (b'', b'debugger', None, _(b'start debugger')),
129 (
129 (
130 b'',
130 b'',
131 b'encoding',
131 b'encoding',
132 encoding.encoding,
132 encoding.encoding,
133 _(b'set the charset encoding'),
133 _(b'set the charset encoding'),
134 _(b'ENCODE'),
134 _(b'ENCODE'),
135 ),
135 ),
136 (
136 (
137 b'',
137 b'',
138 b'encodingmode',
138 b'encodingmode',
139 encoding.encodingmode,
139 encoding.encodingmode,
140 _(b'set the charset encoding mode'),
140 _(b'set the charset encoding mode'),
141 _(b'MODE'),
141 _(b'MODE'),
142 ),
142 ),
143 (b'', b'traceback', None, _(b'always print a traceback on exception')),
143 (b'', b'traceback', None, _(b'always print a traceback on exception')),
144 (b'', b'time', None, _(b'time how long the command takes')),
144 (b'', b'time', None, _(b'time how long the command takes')),
145 (b'', b'profile', None, _(b'print command execution profile')),
145 (b'', b'profile', None, _(b'print command execution profile')),
146 (b'', b'version', None, _(b'output version information and exit')),
146 (b'', b'version', None, _(b'output version information and exit')),
147 (b'h', b'help', None, _(b'display help and exit')),
147 (b'h', b'help', None, _(b'display help and exit')),
148 (b'', b'hidden', False, _(b'consider hidden changesets')),
148 (b'', b'hidden', False, _(b'consider hidden changesets')),
149 (
149 (
150 b'',
150 b'',
151 b'pager',
151 b'pager',
152 b'auto',
152 b'auto',
153 _(b"when to paginate (boolean, always, auto, or never)"),
153 _(b"when to paginate (boolean, always, auto, or never)"),
154 _(b'TYPE'),
154 _(b'TYPE'),
155 ),
155 ),
156 ]
156 ]
157
157
158 dryrunopts = cmdutil.dryrunopts
158 dryrunopts = cmdutil.dryrunopts
159 remoteopts = cmdutil.remoteopts
159 remoteopts = cmdutil.remoteopts
160 walkopts = cmdutil.walkopts
160 walkopts = cmdutil.walkopts
161 commitopts = cmdutil.commitopts
161 commitopts = cmdutil.commitopts
162 commitopts2 = cmdutil.commitopts2
162 commitopts2 = cmdutil.commitopts2
163 commitopts3 = cmdutil.commitopts3
163 commitopts3 = cmdutil.commitopts3
164 formatteropts = cmdutil.formatteropts
164 formatteropts = cmdutil.formatteropts
165 templateopts = cmdutil.templateopts
165 templateopts = cmdutil.templateopts
166 logopts = cmdutil.logopts
166 logopts = cmdutil.logopts
167 diffopts = cmdutil.diffopts
167 diffopts = cmdutil.diffopts
168 diffwsopts = cmdutil.diffwsopts
168 diffwsopts = cmdutil.diffwsopts
169 diffopts2 = cmdutil.diffopts2
169 diffopts2 = cmdutil.diffopts2
170 mergetoolopts = cmdutil.mergetoolopts
170 mergetoolopts = cmdutil.mergetoolopts
171 similarityopts = cmdutil.similarityopts
171 similarityopts = cmdutil.similarityopts
172 subrepoopts = cmdutil.subrepoopts
172 subrepoopts = cmdutil.subrepoopts
173 debugrevlogopts = cmdutil.debugrevlogopts
173 debugrevlogopts = cmdutil.debugrevlogopts
174
174
175 # Commands start here, listed alphabetically
175 # Commands start here, listed alphabetically
176
176
177
177
178 @command(
178 @command(
179 b'abort',
179 b'abort',
180 dryrunopts,
180 dryrunopts,
181 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
181 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
182 helpbasic=True,
182 helpbasic=True,
183 )
183 )
184 def abort(ui, repo, **opts):
184 def abort(ui, repo, **opts):
185 """abort an unfinished operation (EXPERIMENTAL)
185 """abort an unfinished operation (EXPERIMENTAL)
186
186
187 Aborts a multistep operation like graft, histedit, rebase, merge,
187 Aborts a multistep operation like graft, histedit, rebase, merge,
188 and unshelve if they are in an unfinished state.
188 and unshelve if they are in an unfinished state.
189
189
190 use --dry-run/-n to dry run the command.
190 use --dry-run/-n to dry run the command.
191 """
191 """
192 dryrun = opts.get('dry_run')
192 dryrun = opts.get('dry_run')
193 abortstate = cmdutil.getunfinishedstate(repo)
193 abortstate = cmdutil.getunfinishedstate(repo)
194 if not abortstate:
194 if not abortstate:
195 raise error.StateError(_(b'no operation in progress'))
195 raise error.StateError(_(b'no operation in progress'))
196 if not abortstate.abortfunc:
196 if not abortstate.abortfunc:
197 raise error.InputError(
197 raise error.InputError(
198 (
198 (
199 _(b"%s in progress but does not support 'hg abort'")
199 _(b"%s in progress but does not support 'hg abort'")
200 % (abortstate._opname)
200 % (abortstate._opname)
201 ),
201 ),
202 hint=abortstate.hint(),
202 hint=abortstate.hint(),
203 )
203 )
204 if dryrun:
204 if dryrun:
205 ui.status(
205 ui.status(
206 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
206 _(b'%s in progress, will be aborted\n') % (abortstate._opname)
207 )
207 )
208 return
208 return
209 return abortstate.abortfunc(ui, repo)
209 return abortstate.abortfunc(ui, repo)
210
210
211
211
212 @command(
212 @command(
213 b'add',
213 b'add',
214 walkopts + subrepoopts + dryrunopts,
214 walkopts + subrepoopts + dryrunopts,
215 _(b'[OPTION]... [FILE]...'),
215 _(b'[OPTION]... [FILE]...'),
216 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
216 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
217 helpbasic=True,
217 helpbasic=True,
218 inferrepo=True,
218 inferrepo=True,
219 )
219 )
220 def add(ui, repo, *pats, **opts):
220 def add(ui, repo, *pats, **opts):
221 """add the specified files on the next commit
221 """add the specified files on the next commit
222
222
223 Schedule files to be version controlled and added to the
223 Schedule files to be version controlled and added to the
224 repository.
224 repository.
225
225
226 The files will be added to the repository at the next commit. To
226 The files will be added to the repository at the next commit. To
227 undo an add before that, see :hg:`forget`.
227 undo an add before that, see :hg:`forget`.
228
228
229 If no names are given, add all files to the repository (except
229 If no names are given, add all files to the repository (except
230 files matching ``.hgignore``).
230 files matching ``.hgignore``).
231
231
232 .. container:: verbose
232 .. container:: verbose
233
233
234 Examples:
234 Examples:
235
235
236 - New (unknown) files are added
236 - New (unknown) files are added
237 automatically by :hg:`add`::
237 automatically by :hg:`add`::
238
238
239 $ ls
239 $ ls
240 foo.c
240 foo.c
241 $ hg status
241 $ hg status
242 ? foo.c
242 ? foo.c
243 $ hg add
243 $ hg add
244 adding foo.c
244 adding foo.c
245 $ hg status
245 $ hg status
246 A foo.c
246 A foo.c
247
247
248 - Specific files to be added can be specified::
248 - Specific files to be added can be specified::
249
249
250 $ ls
250 $ ls
251 bar.c foo.c
251 bar.c foo.c
252 $ hg status
252 $ hg status
253 ? bar.c
253 ? bar.c
254 ? foo.c
254 ? foo.c
255 $ hg add bar.c
255 $ hg add bar.c
256 $ hg status
256 $ hg status
257 A bar.c
257 A bar.c
258 ? foo.c
258 ? foo.c
259
259
260 Returns 0 if all files are successfully added.
260 Returns 0 if all files are successfully added.
261 """
261 """
262
262
263 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
263 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
264 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
264 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
265 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
265 rejected = cmdutil.add(ui, repo, m, b"", uipathfn, False, **opts)
266 return rejected and 1 or 0
266 return rejected and 1 or 0
267
267
268
268
269 @command(
269 @command(
270 b'addremove',
270 b'addremove',
271 similarityopts + subrepoopts + walkopts + dryrunopts,
271 similarityopts + subrepoopts + walkopts + dryrunopts,
272 _(b'[OPTION]... [FILE]...'),
272 _(b'[OPTION]... [FILE]...'),
273 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
273 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
274 inferrepo=True,
274 inferrepo=True,
275 )
275 )
276 def addremove(ui, repo, *pats, **opts):
276 def addremove(ui, repo, *pats, **opts):
277 """add all new files, delete all missing files
277 """add all new files, delete all missing files
278
278
279 Add all new files and remove all missing files from the
279 Add all new files and remove all missing files from the
280 repository.
280 repository.
281
281
282 Unless names are given, new files are ignored if they match any of
282 Unless names are given, new files are ignored if they match any of
283 the patterns in ``.hgignore``. As with add, these changes take
283 the patterns in ``.hgignore``. As with add, these changes take
284 effect at the next commit.
284 effect at the next commit.
285
285
286 Use the -s/--similarity option to detect renamed files. This
286 Use the -s/--similarity option to detect renamed files. This
287 option takes a percentage between 0 (disabled) and 100 (files must
287 option takes a percentage between 0 (disabled) and 100 (files must
288 be identical) as its parameter. With a parameter greater than 0,
288 be identical) as its parameter. With a parameter greater than 0,
289 this compares every removed file with every added file and records
289 this compares every removed file with every added file and records
290 those similar enough as renames. Detecting renamed files this way
290 those similar enough as renames. Detecting renamed files this way
291 can be expensive. After using this option, :hg:`status -C` can be
291 can be expensive. After using this option, :hg:`status -C` can be
292 used to check which files were identified as moved or renamed. If
292 used to check which files were identified as moved or renamed. If
293 not specified, -s/--similarity defaults to 100 and only renames of
293 not specified, -s/--similarity defaults to 100 and only renames of
294 identical files are detected.
294 identical files are detected.
295
295
296 .. container:: verbose
296 .. container:: verbose
297
297
298 Examples:
298 Examples:
299
299
300 - A number of files (bar.c and foo.c) are new,
300 - A number of files (bar.c and foo.c) are new,
301 while foobar.c has been removed (without using :hg:`remove`)
301 while foobar.c has been removed (without using :hg:`remove`)
302 from the repository::
302 from the repository::
303
303
304 $ ls
304 $ ls
305 bar.c foo.c
305 bar.c foo.c
306 $ hg status
306 $ hg status
307 ! foobar.c
307 ! foobar.c
308 ? bar.c
308 ? bar.c
309 ? foo.c
309 ? foo.c
310 $ hg addremove
310 $ hg addremove
311 adding bar.c
311 adding bar.c
312 adding foo.c
312 adding foo.c
313 removing foobar.c
313 removing foobar.c
314 $ hg status
314 $ hg status
315 A bar.c
315 A bar.c
316 A foo.c
316 A foo.c
317 R foobar.c
317 R foobar.c
318
318
319 - A file foobar.c was moved to foo.c without using :hg:`rename`.
319 - A file foobar.c was moved to foo.c without using :hg:`rename`.
320 Afterwards, it was edited slightly::
320 Afterwards, it was edited slightly::
321
321
322 $ ls
322 $ ls
323 foo.c
323 foo.c
324 $ hg status
324 $ hg status
325 ! foobar.c
325 ! foobar.c
326 ? foo.c
326 ? foo.c
327 $ hg addremove --similarity 90
327 $ hg addremove --similarity 90
328 removing foobar.c
328 removing foobar.c
329 adding foo.c
329 adding foo.c
330 recording removal of foobar.c as rename to foo.c (94% similar)
330 recording removal of foobar.c as rename to foo.c (94% similar)
331 $ hg status -C
331 $ hg status -C
332 A foo.c
332 A foo.c
333 foobar.c
333 foobar.c
334 R foobar.c
334 R foobar.c
335
335
336 Returns 0 if all files are successfully added.
336 Returns 0 if all files are successfully added.
337 """
337 """
338 opts = pycompat.byteskwargs(opts)
338 opts = pycompat.byteskwargs(opts)
339 if not opts.get(b'similarity'):
339 if not opts.get(b'similarity'):
340 opts[b'similarity'] = b'100'
340 opts[b'similarity'] = b'100'
341 matcher = scmutil.match(repo[None], pats, opts)
341 matcher = scmutil.match(repo[None], pats, opts)
342 relative = scmutil.anypats(pats, opts)
342 relative = scmutil.anypats(pats, opts)
343 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
343 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
344 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
344 return scmutil.addremove(repo, matcher, b"", uipathfn, opts)
345
345
346
346
347 @command(
347 @command(
348 b'annotate|blame',
348 b'annotate|blame',
349 [
349 [
350 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
350 (b'r', b'rev', b'', _(b'annotate the specified revision'), _(b'REV')),
351 (
351 (
352 b'',
352 b'',
353 b'follow',
353 b'follow',
354 None,
354 None,
355 _(b'follow copies/renames and list the filename (DEPRECATED)'),
355 _(b'follow copies/renames and list the filename (DEPRECATED)'),
356 ),
356 ),
357 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
357 (b'', b'no-follow', None, _(b"don't follow copies and renames")),
358 (b'a', b'text', None, _(b'treat all files as text')),
358 (b'a', b'text', None, _(b'treat all files as text')),
359 (b'u', b'user', None, _(b'list the author (long with -v)')),
359 (b'u', b'user', None, _(b'list the author (long with -v)')),
360 (b'f', b'file', None, _(b'list the filename')),
360 (b'f', b'file', None, _(b'list the filename')),
361 (b'd', b'date', None, _(b'list the date (short with -q)')),
361 (b'd', b'date', None, _(b'list the date (short with -q)')),
362 (b'n', b'number', None, _(b'list the revision number (default)')),
362 (b'n', b'number', None, _(b'list the revision number (default)')),
363 (b'c', b'changeset', None, _(b'list the changeset')),
363 (b'c', b'changeset', None, _(b'list the changeset')),
364 (
364 (
365 b'l',
365 b'l',
366 b'line-number',
366 b'line-number',
367 None,
367 None,
368 _(b'show line number at the first appearance'),
368 _(b'show line number at the first appearance'),
369 ),
369 ),
370 (
370 (
371 b'',
371 b'',
372 b'skip',
372 b'skip',
373 [],
373 [],
374 _(b'revset to not display (EXPERIMENTAL)'),
374 _(b'revset to not display (EXPERIMENTAL)'),
375 _(b'REV'),
375 _(b'REV'),
376 ),
376 ),
377 ]
377 ]
378 + diffwsopts
378 + diffwsopts
379 + walkopts
379 + walkopts
380 + formatteropts,
380 + formatteropts,
381 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
381 _(b'[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
382 helpcategory=command.CATEGORY_FILE_CONTENTS,
382 helpcategory=command.CATEGORY_FILE_CONTENTS,
383 helpbasic=True,
383 helpbasic=True,
384 inferrepo=True,
384 inferrepo=True,
385 )
385 )
386 def annotate(ui, repo, *pats, **opts):
386 def annotate(ui, repo, *pats, **opts):
387 """show changeset information by line for each file
387 """show changeset information by line for each file
388
388
389 List changes in files, showing the revision id responsible for
389 List changes in files, showing the revision id responsible for
390 each line.
390 each line.
391
391
392 This command is useful for discovering when a change was made and
392 This command is useful for discovering when a change was made and
393 by whom.
393 by whom.
394
394
395 If you include --file, --user, or --date, the revision number is
395 If you include --file, --user, or --date, the revision number is
396 suppressed unless you also include --number.
396 suppressed unless you also include --number.
397
397
398 Without the -a/--text option, annotate will avoid processing files
398 Without the -a/--text option, annotate will avoid processing files
399 it detects as binary. With -a, annotate will annotate the file
399 it detects as binary. With -a, annotate will annotate the file
400 anyway, although the results will probably be neither useful
400 anyway, although the results will probably be neither useful
401 nor desirable.
401 nor desirable.
402
402
403 .. container:: verbose
403 .. container:: verbose
404
404
405 Template:
405 Template:
406
406
407 The following keywords are supported in addition to the common template
407 The following keywords are supported in addition to the common template
408 keywords and functions. See also :hg:`help templates`.
408 keywords and functions. See also :hg:`help templates`.
409
409
410 :lines: List of lines with annotation data.
410 :lines: List of lines with annotation data.
411 :path: String. Repository-absolute path of the specified file.
411 :path: String. Repository-absolute path of the specified file.
412
412
413 And each entry of ``{lines}`` provides the following sub-keywords in
413 And each entry of ``{lines}`` provides the following sub-keywords in
414 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
414 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
415
415
416 :line: String. Line content.
416 :line: String. Line content.
417 :lineno: Integer. Line number at that revision.
417 :lineno: Integer. Line number at that revision.
418 :path: String. Repository-absolute path of the file at that revision.
418 :path: String. Repository-absolute path of the file at that revision.
419
419
420 See :hg:`help templates.operators` for the list expansion syntax.
420 See :hg:`help templates.operators` for the list expansion syntax.
421
421
422 Returns 0 on success.
422 Returns 0 on success.
423 """
423 """
424 opts = pycompat.byteskwargs(opts)
424 opts = pycompat.byteskwargs(opts)
425 if not pats:
425 if not pats:
426 raise error.InputError(
426 raise error.InputError(
427 _(b'at least one filename or pattern is required')
427 _(b'at least one filename or pattern is required')
428 )
428 )
429
429
430 if opts.get(b'follow'):
430 if opts.get(b'follow'):
431 # --follow is deprecated and now just an alias for -f/--file
431 # --follow is deprecated and now just an alias for -f/--file
432 # to mimic the behavior of Mercurial before version 1.5
432 # to mimic the behavior of Mercurial before version 1.5
433 opts[b'file'] = True
433 opts[b'file'] = True
434
434
435 if (
435 if (
436 not opts.get(b'user')
436 not opts.get(b'user')
437 and not opts.get(b'changeset')
437 and not opts.get(b'changeset')
438 and not opts.get(b'date')
438 and not opts.get(b'date')
439 and not opts.get(b'file')
439 and not opts.get(b'file')
440 ):
440 ):
441 opts[b'number'] = True
441 opts[b'number'] = True
442
442
443 linenumber = opts.get(b'line_number') is not None
443 linenumber = opts.get(b'line_number') is not None
444 if (
444 if (
445 linenumber
445 linenumber
446 and (not opts.get(b'changeset'))
446 and (not opts.get(b'changeset'))
447 and (not opts.get(b'number'))
447 and (not opts.get(b'number'))
448 ):
448 ):
449 raise error.InputError(_(b'at least one of -n/-c is required for -l'))
449 raise error.InputError(_(b'at least one of -n/-c is required for -l'))
450
450
451 rev = opts.get(b'rev')
451 rev = opts.get(b'rev')
452 if rev:
452 if rev:
453 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
453 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
454 ctx = scmutil.revsingle(repo, rev)
454 ctx = scmutil.revsingle(repo, rev)
455
455
456 ui.pager(b'annotate')
456 ui.pager(b'annotate')
457 rootfm = ui.formatter(b'annotate', opts)
457 rootfm = ui.formatter(b'annotate', opts)
458 if ui.debugflag:
458 if ui.debugflag:
459 shorthex = pycompat.identity
459 shorthex = pycompat.identity
460 else:
460 else:
461
461
462 def shorthex(h):
462 def shorthex(h):
463 return h[:12]
463 return h[:12]
464
464
465 if ui.quiet:
465 if ui.quiet:
466 datefunc = dateutil.shortdate
466 datefunc = dateutil.shortdate
467 else:
467 else:
468 datefunc = dateutil.datestr
468 datefunc = dateutil.datestr
469 if ctx.rev() is None:
469 if ctx.rev() is None:
470 if opts.get(b'changeset'):
470 if opts.get(b'changeset'):
471 # omit "+" suffix which is appended to node hex
471 # omit "+" suffix which is appended to node hex
472 def formatrev(rev):
472 def formatrev(rev):
473 if rev == wdirrev:
473 if rev == wdirrev:
474 return b'%d' % ctx.p1().rev()
474 return b'%d' % ctx.p1().rev()
475 else:
475 else:
476 return b'%d' % rev
476 return b'%d' % rev
477
477
478 else:
478 else:
479
479
480 def formatrev(rev):
480 def formatrev(rev):
481 if rev == wdirrev:
481 if rev == wdirrev:
482 return b'%d+' % ctx.p1().rev()
482 return b'%d+' % ctx.p1().rev()
483 else:
483 else:
484 return b'%d ' % rev
484 return b'%d ' % rev
485
485
486 def formathex(h):
486 def formathex(h):
487 if h == repo.nodeconstants.wdirhex:
487 if h == repo.nodeconstants.wdirhex:
488 return b'%s+' % shorthex(hex(ctx.p1().node()))
488 return b'%s+' % shorthex(hex(ctx.p1().node()))
489 else:
489 else:
490 return b'%s ' % shorthex(h)
490 return b'%s ' % shorthex(h)
491
491
492 else:
492 else:
493 formatrev = b'%d'.__mod__
493 formatrev = b'%d'.__mod__
494 formathex = shorthex
494 formathex = shorthex
495
495
496 opmap = [
496 opmap = [
497 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
497 (b'user', b' ', lambda x: x.fctx.user(), ui.shortuser),
498 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
498 (b'rev', b' ', lambda x: scmutil.intrev(x.fctx), formatrev),
499 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
499 (b'node', b' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
500 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
500 (b'date', b' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
501 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
501 (b'path', b' ', lambda x: x.fctx.path(), pycompat.bytestr),
502 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
502 (b'lineno', b':', lambda x: x.lineno, pycompat.bytestr),
503 ]
503 ]
504 opnamemap = {
504 opnamemap = {
505 b'rev': b'number',
505 b'rev': b'number',
506 b'node': b'changeset',
506 b'node': b'changeset',
507 b'path': b'file',
507 b'path': b'file',
508 b'lineno': b'line_number',
508 b'lineno': b'line_number',
509 }
509 }
510
510
511 if rootfm.isplain():
511 if rootfm.isplain():
512
512
513 def makefunc(get, fmt):
513 def makefunc(get, fmt):
514 return lambda x: fmt(get(x))
514 return lambda x: fmt(get(x))
515
515
516 else:
516 else:
517
517
518 def makefunc(get, fmt):
518 def makefunc(get, fmt):
519 return get
519 return get
520
520
521 datahint = rootfm.datahint()
521 datahint = rootfm.datahint()
522 funcmap = [
522 funcmap = [
523 (makefunc(get, fmt), sep)
523 (makefunc(get, fmt), sep)
524 for fn, sep, get, fmt in opmap
524 for fn, sep, get, fmt in opmap
525 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
525 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
526 ]
526 ]
527 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
527 funcmap[0] = (funcmap[0][0], b'') # no separator in front of first column
528 fields = b' '.join(
528 fields = b' '.join(
529 fn
529 fn
530 for fn, sep, get, fmt in opmap
530 for fn, sep, get, fmt in opmap
531 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
531 if opts.get(opnamemap.get(fn, fn)) or fn in datahint
532 )
532 )
533
533
534 def bad(x, y):
534 def bad(x, y):
535 raise error.Abort(b"%s: %s" % (x, y))
535 raise error.Abort(b"%s: %s" % (x, y))
536
536
537 m = scmutil.match(ctx, pats, opts, badfn=bad)
537 m = scmutil.match(ctx, pats, opts, badfn=bad)
538
538
539 follow = not opts.get(b'no_follow')
539 follow = not opts.get(b'no_follow')
540 diffopts = patch.difffeatureopts(
540 diffopts = patch.difffeatureopts(
541 ui, opts, section=b'annotate', whitespace=True
541 ui, opts, section=b'annotate', whitespace=True
542 )
542 )
543 skiprevs = opts.get(b'skip')
543 skiprevs = opts.get(b'skip')
544 if skiprevs:
544 if skiprevs:
545 skiprevs = scmutil.revrange(repo, skiprevs)
545 skiprevs = scmutil.revrange(repo, skiprevs)
546
546
547 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
547 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
548 for abs in ctx.walk(m):
548 for abs in ctx.walk(m):
549 fctx = ctx[abs]
549 fctx = ctx[abs]
550 rootfm.startitem()
550 rootfm.startitem()
551 rootfm.data(path=abs)
551 rootfm.data(path=abs)
552 if not opts.get(b'text') and fctx.isbinary():
552 if not opts.get(b'text') and fctx.isbinary():
553 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
553 rootfm.plain(_(b"%s: binary file\n") % uipathfn(abs))
554 continue
554 continue
555
555
556 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
556 fm = rootfm.nested(b'lines', tmpl=b'{rev}: {line}')
557 lines = fctx.annotate(
557 lines = fctx.annotate(
558 follow=follow, skiprevs=skiprevs, diffopts=diffopts
558 follow=follow, skiprevs=skiprevs, diffopts=diffopts
559 )
559 )
560 if not lines:
560 if not lines:
561 fm.end()
561 fm.end()
562 continue
562 continue
563 formats = []
563 formats = []
564 pieces = []
564 pieces = []
565
565
566 for f, sep in funcmap:
566 for f, sep in funcmap:
567 l = [f(n) for n in lines]
567 l = [f(n) for n in lines]
568 if fm.isplain():
568 if fm.isplain():
569 sizes = [encoding.colwidth(x) for x in l]
569 sizes = [encoding.colwidth(x) for x in l]
570 ml = max(sizes)
570 ml = max(sizes)
571 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
571 formats.append([sep + b' ' * (ml - w) + b'%s' for w in sizes])
572 else:
572 else:
573 formats.append([b'%s'] * len(l))
573 formats.append([b'%s'] * len(l))
574 pieces.append(l)
574 pieces.append(l)
575
575
576 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
576 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
577 fm.startitem()
577 fm.startitem()
578 fm.context(fctx=n.fctx)
578 fm.context(fctx=n.fctx)
579 fm.write(fields, b"".join(f), *p)
579 fm.write(fields, b"".join(f), *p)
580 if n.skip:
580 if n.skip:
581 fmt = b"* %s"
581 fmt = b"* %s"
582 else:
582 else:
583 fmt = b": %s"
583 fmt = b": %s"
584 fm.write(b'line', fmt, n.text)
584 fm.write(b'line', fmt, n.text)
585
585
586 if not lines[-1].text.endswith(b'\n'):
586 if not lines[-1].text.endswith(b'\n'):
587 fm.plain(b'\n')
587 fm.plain(b'\n')
588 fm.end()
588 fm.end()
589
589
590 rootfm.end()
590 rootfm.end()
591
591
592
592
593 @command(
593 @command(
594 b'archive',
594 b'archive',
595 [
595 [
596 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
596 (b'', b'no-decode', None, _(b'do not pass files through decoders')),
597 (
597 (
598 b'p',
598 b'p',
599 b'prefix',
599 b'prefix',
600 b'',
600 b'',
601 _(b'directory prefix for files in archive'),
601 _(b'directory prefix for files in archive'),
602 _(b'PREFIX'),
602 _(b'PREFIX'),
603 ),
603 ),
604 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
604 (b'r', b'rev', b'', _(b'revision to distribute'), _(b'REV')),
605 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
605 (b't', b'type', b'', _(b'type of distribution to create'), _(b'TYPE')),
606 ]
606 ]
607 + subrepoopts
607 + subrepoopts
608 + walkopts,
608 + walkopts,
609 _(b'[OPTION]... DEST'),
609 _(b'[OPTION]... DEST'),
610 helpcategory=command.CATEGORY_IMPORT_EXPORT,
610 helpcategory=command.CATEGORY_IMPORT_EXPORT,
611 )
611 )
612 def archive(ui, repo, dest, **opts):
612 def archive(ui, repo, dest, **opts):
613 """create an unversioned archive of a repository revision
613 """create an unversioned archive of a repository revision
614
614
615 By default, the revision used is the parent of the working
615 By default, the revision used is the parent of the working
616 directory; use -r/--rev to specify a different revision.
616 directory; use -r/--rev to specify a different revision.
617
617
618 The archive type is automatically detected based on file
618 The archive type is automatically detected based on file
619 extension (to override, use -t/--type).
619 extension (to override, use -t/--type).
620
620
621 .. container:: verbose
621 .. container:: verbose
622
622
623 Examples:
623 Examples:
624
624
625 - create a zip file containing the 1.0 release::
625 - create a zip file containing the 1.0 release::
626
626
627 hg archive -r 1.0 project-1.0.zip
627 hg archive -r 1.0 project-1.0.zip
628
628
629 - create a tarball excluding .hg files::
629 - create a tarball excluding .hg files::
630
630
631 hg archive project.tar.gz -X ".hg*"
631 hg archive project.tar.gz -X ".hg*"
632
632
633 Valid types are:
633 Valid types are:
634
634
635 :``files``: a directory full of files (default)
635 :``files``: a directory full of files (default)
636 :``tar``: tar archive, uncompressed
636 :``tar``: tar archive, uncompressed
637 :``tbz2``: tar archive, compressed using bzip2
637 :``tbz2``: tar archive, compressed using bzip2
638 :``tgz``: tar archive, compressed using gzip
638 :``tgz``: tar archive, compressed using gzip
639 :``txz``: tar archive, compressed using lzma (only in Python 3)
639 :``txz``: tar archive, compressed using lzma (only in Python 3)
640 :``uzip``: zip archive, uncompressed
640 :``uzip``: zip archive, uncompressed
641 :``zip``: zip archive, compressed using deflate
641 :``zip``: zip archive, compressed using deflate
642
642
643 The exact name of the destination archive or directory is given
643 The exact name of the destination archive or directory is given
644 using a format string; see :hg:`help export` for details.
644 using a format string; see :hg:`help export` for details.
645
645
646 Each member added to an archive file has a directory prefix
646 Each member added to an archive file has a directory prefix
647 prepended. Use -p/--prefix to specify a format string for the
647 prepended. Use -p/--prefix to specify a format string for the
648 prefix. The default is the basename of the archive, with suffixes
648 prefix. The default is the basename of the archive, with suffixes
649 removed.
649 removed.
650
650
651 Returns 0 on success.
651 Returns 0 on success.
652 """
652 """
653
653
654 opts = pycompat.byteskwargs(opts)
654 opts = pycompat.byteskwargs(opts)
655 rev = opts.get(b'rev')
655 rev = opts.get(b'rev')
656 if rev:
656 if rev:
657 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
657 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
658 ctx = scmutil.revsingle(repo, rev)
658 ctx = scmutil.revsingle(repo, rev)
659 if not ctx:
659 if not ctx:
660 raise error.InputError(
660 raise error.InputError(
661 _(b'no working directory: please specify a revision')
661 _(b'no working directory: please specify a revision')
662 )
662 )
663 node = ctx.node()
663 node = ctx.node()
664 dest = cmdutil.makefilename(ctx, dest)
664 dest = cmdutil.makefilename(ctx, dest)
665 if os.path.realpath(dest) == repo.root:
665 if os.path.realpath(dest) == repo.root:
666 raise error.InputError(_(b'repository root cannot be destination'))
666 raise error.InputError(_(b'repository root cannot be destination'))
667
667
668 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
668 kind = opts.get(b'type') or archival.guesskind(dest) or b'files'
669 prefix = opts.get(b'prefix')
669 prefix = opts.get(b'prefix')
670
670
671 if dest == b'-':
671 if dest == b'-':
672 if kind == b'files':
672 if kind == b'files':
673 raise error.InputError(_(b'cannot archive plain files to stdout'))
673 raise error.InputError(_(b'cannot archive plain files to stdout'))
674 dest = cmdutil.makefileobj(ctx, dest)
674 dest = cmdutil.makefileobj(ctx, dest)
675 if not prefix:
675 if not prefix:
676 prefix = os.path.basename(repo.root) + b'-%h'
676 prefix = os.path.basename(repo.root) + b'-%h'
677
677
678 prefix = cmdutil.makefilename(ctx, prefix)
678 prefix = cmdutil.makefilename(ctx, prefix)
679 match = scmutil.match(ctx, [], opts)
679 match = scmutil.match(ctx, [], opts)
680 archival.archive(
680 archival.archive(
681 repo,
681 repo,
682 dest,
682 dest,
683 node,
683 node,
684 kind,
684 kind,
685 not opts.get(b'no_decode'),
685 not opts.get(b'no_decode'),
686 match,
686 match,
687 prefix,
687 prefix,
688 subrepos=opts.get(b'subrepos'),
688 subrepos=opts.get(b'subrepos'),
689 )
689 )
690
690
691
691
692 @command(
692 @command(
693 b'backout',
693 b'backout',
694 [
694 [
695 (
695 (
696 b'',
696 b'',
697 b'merge',
697 b'merge',
698 None,
698 None,
699 _(b'merge with old dirstate parent after backout'),
699 _(b'merge with old dirstate parent after backout'),
700 ),
700 ),
701 (
701 (
702 b'',
702 b'',
703 b'commit',
703 b'commit',
704 None,
704 None,
705 _(b'commit if no conflicts were encountered (DEPRECATED)'),
705 _(b'commit if no conflicts were encountered (DEPRECATED)'),
706 ),
706 ),
707 (b'', b'no-commit', None, _(b'do not commit')),
707 (b'', b'no-commit', None, _(b'do not commit')),
708 (
708 (
709 b'',
709 b'',
710 b'parent',
710 b'parent',
711 b'',
711 b'',
712 _(b'parent to choose when backing out merge (DEPRECATED)'),
712 _(b'parent to choose when backing out merge (DEPRECATED)'),
713 _(b'REV'),
713 _(b'REV'),
714 ),
714 ),
715 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
715 (b'r', b'rev', b'', _(b'revision to backout'), _(b'REV')),
716 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
716 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
717 ]
717 ]
718 + mergetoolopts
718 + mergetoolopts
719 + walkopts
719 + walkopts
720 + commitopts
720 + commitopts
721 + commitopts2,
721 + commitopts2,
722 _(b'[OPTION]... [-r] REV'),
722 _(b'[OPTION]... [-r] REV'),
723 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
723 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
724 )
724 )
725 def backout(ui, repo, node=None, rev=None, **opts):
725 def backout(ui, repo, node=None, rev=None, **opts):
726 """reverse effect of earlier changeset
726 """reverse effect of earlier changeset
727
727
728 Prepare a new changeset with the effect of REV undone in the
728 Prepare a new changeset with the effect of REV undone in the
729 current working directory. If no conflicts were encountered,
729 current working directory. If no conflicts were encountered,
730 it will be committed immediately.
730 it will be committed immediately.
731
731
732 If REV is the parent of the working directory, then this new changeset
732 If REV is the parent of the working directory, then this new changeset
733 is committed automatically (unless --no-commit is specified).
733 is committed automatically (unless --no-commit is specified).
734
734
735 .. note::
735 .. note::
736
736
737 :hg:`backout` cannot be used to fix either an unwanted or
737 :hg:`backout` cannot be used to fix either an unwanted or
738 incorrect merge.
738 incorrect merge.
739
739
740 .. container:: verbose
740 .. container:: verbose
741
741
742 Examples:
742 Examples:
743
743
744 - Reverse the effect of the parent of the working directory.
744 - Reverse the effect of the parent of the working directory.
745 This backout will be committed immediately::
745 This backout will be committed immediately::
746
746
747 hg backout -r .
747 hg backout -r .
748
748
749 - Reverse the effect of previous bad revision 23::
749 - Reverse the effect of previous bad revision 23::
750
750
751 hg backout -r 23
751 hg backout -r 23
752
752
753 - Reverse the effect of previous bad revision 23 and
753 - Reverse the effect of previous bad revision 23 and
754 leave changes uncommitted::
754 leave changes uncommitted::
755
755
756 hg backout -r 23 --no-commit
756 hg backout -r 23 --no-commit
757 hg commit -m "Backout revision 23"
757 hg commit -m "Backout revision 23"
758
758
759 By default, the pending changeset will have one parent,
759 By default, the pending changeset will have one parent,
760 maintaining a linear history. With --merge, the pending
760 maintaining a linear history. With --merge, the pending
761 changeset will instead have two parents: the old parent of the
761 changeset will instead have two parents: the old parent of the
762 working directory and a new child of REV that simply undoes REV.
762 working directory and a new child of REV that simply undoes REV.
763
763
764 Before version 1.7, the behavior without --merge was equivalent
764 Before version 1.7, the behavior without --merge was equivalent
765 to specifying --merge followed by :hg:`update --clean .` to
765 to specifying --merge followed by :hg:`update --clean .` to
766 cancel the merge and leave the child of REV as a head to be
766 cancel the merge and leave the child of REV as a head to be
767 merged separately.
767 merged separately.
768
768
769 See :hg:`help dates` for a list of formats valid for -d/--date.
769 See :hg:`help dates` for a list of formats valid for -d/--date.
770
770
771 See :hg:`help revert` for a way to restore files to the state
771 See :hg:`help revert` for a way to restore files to the state
772 of another revision.
772 of another revision.
773
773
774 Returns 0 on success, 1 if nothing to backout or there are unresolved
774 Returns 0 on success, 1 if nothing to backout or there are unresolved
775 files.
775 files.
776 """
776 """
777 with repo.wlock(), repo.lock():
777 with repo.wlock(), repo.lock():
778 return _dobackout(ui, repo, node, rev, **opts)
778 return _dobackout(ui, repo, node, rev, **opts)
779
779
780
780
781 def _dobackout(ui, repo, node=None, rev=None, **opts):
781 def _dobackout(ui, repo, node=None, rev=None, **opts):
782 cmdutil.check_incompatible_arguments(opts, 'no_commit', ['commit', 'merge'])
782 cmdutil.check_incompatible_arguments(opts, 'no_commit', ['commit', 'merge'])
783 opts = pycompat.byteskwargs(opts)
783 opts = pycompat.byteskwargs(opts)
784
784
785 if rev and node:
785 if rev and node:
786 raise error.InputError(_(b"please specify just one revision"))
786 raise error.InputError(_(b"please specify just one revision"))
787
787
788 if not rev:
788 if not rev:
789 rev = node
789 rev = node
790
790
791 if not rev:
791 if not rev:
792 raise error.InputError(_(b"please specify a revision to backout"))
792 raise error.InputError(_(b"please specify a revision to backout"))
793
793
794 date = opts.get(b'date')
794 date = opts.get(b'date')
795 if date:
795 if date:
796 opts[b'date'] = dateutil.parsedate(date)
796 opts[b'date'] = dateutil.parsedate(date)
797
797
798 cmdutil.checkunfinished(repo)
798 cmdutil.checkunfinished(repo)
799 cmdutil.bailifchanged(repo)
799 cmdutil.bailifchanged(repo)
800 ctx = scmutil.revsingle(repo, rev)
800 ctx = scmutil.revsingle(repo, rev)
801 node = ctx.node()
801 node = ctx.node()
802
802
803 op1, op2 = repo.dirstate.parents()
803 op1, op2 = repo.dirstate.parents()
804 if not repo.changelog.isancestor(node, op1):
804 if not repo.changelog.isancestor(node, op1):
805 raise error.InputError(
805 raise error.InputError(
806 _(b'cannot backout change that is not an ancestor')
806 _(b'cannot backout change that is not an ancestor')
807 )
807 )
808
808
809 p1, p2 = repo.changelog.parents(node)
809 p1, p2 = repo.changelog.parents(node)
810 if p1 == repo.nullid:
810 if p1 == repo.nullid:
811 raise error.InputError(_(b'cannot backout a change with no parents'))
811 raise error.InputError(_(b'cannot backout a change with no parents'))
812 if p2 != repo.nullid:
812 if p2 != repo.nullid:
813 if not opts.get(b'parent'):
813 if not opts.get(b'parent'):
814 raise error.InputError(_(b'cannot backout a merge changeset'))
814 raise error.InputError(_(b'cannot backout a merge changeset'))
815 p = repo.lookup(opts[b'parent'])
815 p = repo.lookup(opts[b'parent'])
816 if p not in (p1, p2):
816 if p not in (p1, p2):
817 raise error.InputError(
817 raise error.InputError(
818 _(b'%s is not a parent of %s') % (short(p), short(node))
818 _(b'%s is not a parent of %s') % (short(p), short(node))
819 )
819 )
820 parent = p
820 parent = p
821 else:
821 else:
822 if opts.get(b'parent'):
822 if opts.get(b'parent'):
823 raise error.InputError(
823 raise error.InputError(
824 _(b'cannot use --parent on non-merge changeset')
824 _(b'cannot use --parent on non-merge changeset')
825 )
825 )
826 parent = p1
826 parent = p1
827
827
828 # the backout should appear on the same branch
828 # the backout should appear on the same branch
829 branch = repo.dirstate.branch()
829 branch = repo.dirstate.branch()
830 bheads = repo.branchheads(branch)
830 bheads = repo.branchheads(branch)
831 rctx = scmutil.revsingle(repo, hex(parent))
831 rctx = scmutil.revsingle(repo, hex(parent))
832 if not opts.get(b'merge') and op1 != node:
832 if not opts.get(b'merge') and op1 != node:
833 with dirstateguard.dirstateguard(repo, b'backout'):
833 with dirstateguard.dirstateguard(repo, b'backout'):
834 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
834 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
835 with ui.configoverride(overrides, b'backout'):
835 with ui.configoverride(overrides, b'backout'):
836 stats = mergemod.back_out(ctx, parent=repo[parent])
836 stats = mergemod.back_out(ctx, parent=repo[parent])
837 repo.setparents(op1, op2)
837 repo.setparents(op1, op2)
838 hg._showstats(repo, stats)
838 hg._showstats(repo, stats)
839 if stats.unresolvedcount:
839 if stats.unresolvedcount:
840 repo.ui.status(
840 repo.ui.status(
841 _(b"use 'hg resolve' to retry unresolved file merges\n")
841 _(b"use 'hg resolve' to retry unresolved file merges\n")
842 )
842 )
843 return 1
843 return 1
844 else:
844 else:
845 hg.clean(repo, node, show_stats=False)
845 hg.clean(repo, node, show_stats=False)
846 repo.dirstate.setbranch(branch)
846 repo.dirstate.setbranch(branch)
847 cmdutil.revert(ui, repo, rctx)
847 cmdutil.revert(ui, repo, rctx)
848
848
849 if opts.get(b'no_commit'):
849 if opts.get(b'no_commit'):
850 msg = _(b"changeset %s backed out, don't forget to commit.\n")
850 msg = _(b"changeset %s backed out, don't forget to commit.\n")
851 ui.status(msg % short(node))
851 ui.status(msg % short(node))
852 return 0
852 return 0
853
853
854 def commitfunc(ui, repo, message, match, opts):
854 def commitfunc(ui, repo, message, match, opts):
855 editform = b'backout'
855 editform = b'backout'
856 e = cmdutil.getcommiteditor(
856 e = cmdutil.getcommiteditor(
857 editform=editform, **pycompat.strkwargs(opts)
857 editform=editform, **pycompat.strkwargs(opts)
858 )
858 )
859 if not message:
859 if not message:
860 # we don't translate commit messages
860 # we don't translate commit messages
861 message = b"Backed out changeset %s" % short(node)
861 message = b"Backed out changeset %s" % short(node)
862 e = cmdutil.getcommiteditor(edit=True, editform=editform)
862 e = cmdutil.getcommiteditor(edit=True, editform=editform)
863 return repo.commit(
863 return repo.commit(
864 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
864 message, opts.get(b'user'), opts.get(b'date'), match, editor=e
865 )
865 )
866
866
867 # save to detect changes
867 # save to detect changes
868 tip = repo.changelog.tip()
868 tip = repo.changelog.tip()
869
869
870 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
870 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
871 if not newnode:
871 if not newnode:
872 ui.status(_(b"nothing changed\n"))
872 ui.status(_(b"nothing changed\n"))
873 return 1
873 return 1
874 cmdutil.commitstatus(repo, newnode, branch, bheads, tip)
874 cmdutil.commitstatus(repo, newnode, branch, bheads, tip)
875
875
876 def nice(node):
876 def nice(node):
877 return b'%d:%s' % (repo.changelog.rev(node), short(node))
877 return b'%d:%s' % (repo.changelog.rev(node), short(node))
878
878
879 ui.status(
879 ui.status(
880 _(b'changeset %s backs out changeset %s\n')
880 _(b'changeset %s backs out changeset %s\n')
881 % (nice(newnode), nice(node))
881 % (nice(newnode), nice(node))
882 )
882 )
883 if opts.get(b'merge') and op1 != node:
883 if opts.get(b'merge') and op1 != node:
884 hg.clean(repo, op1, show_stats=False)
884 hg.clean(repo, op1, show_stats=False)
885 ui.status(_(b'merging with changeset %s\n') % nice(newnode))
885 ui.status(_(b'merging with changeset %s\n') % nice(newnode))
886 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
886 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
887 with ui.configoverride(overrides, b'backout'):
887 with ui.configoverride(overrides, b'backout'):
888 return hg.merge(repo[b'tip'])
888 return hg.merge(repo[b'tip'])
889 return 0
889 return 0
890
890
891
891
892 @command(
892 @command(
893 b'bisect',
893 b'bisect',
894 [
894 [
895 (b'r', b'reset', False, _(b'reset bisect state')),
895 (b'r', b'reset', False, _(b'reset bisect state')),
896 (b'g', b'good', False, _(b'mark changeset good')),
896 (b'g', b'good', False, _(b'mark changeset good')),
897 (b'b', b'bad', False, _(b'mark changeset bad')),
897 (b'b', b'bad', False, _(b'mark changeset bad')),
898 (b's', b'skip', False, _(b'skip testing changeset')),
898 (b's', b'skip', False, _(b'skip testing changeset')),
899 (b'e', b'extend', False, _(b'extend the bisect range')),
899 (b'e', b'extend', False, _(b'extend the bisect range')),
900 (
900 (
901 b'c',
901 b'c',
902 b'command',
902 b'command',
903 b'',
903 b'',
904 _(b'use command to check changeset state'),
904 _(b'use command to check changeset state'),
905 _(b'CMD'),
905 _(b'CMD'),
906 ),
906 ),
907 (b'U', b'noupdate', False, _(b'do not update to target')),
907 (b'U', b'noupdate', False, _(b'do not update to target')),
908 ],
908 ],
909 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
909 _(b"[-gbsr] [-U] [-c CMD] [REV]"),
910 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
910 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
911 )
911 )
912 def bisect(
912 def bisect(
913 ui,
913 ui,
914 repo,
914 repo,
915 positional_1=None,
915 positional_1=None,
916 positional_2=None,
916 positional_2=None,
917 command=None,
917 command=None,
918 reset=None,
918 reset=None,
919 good=None,
919 good=None,
920 bad=None,
920 bad=None,
921 skip=None,
921 skip=None,
922 extend=None,
922 extend=None,
923 noupdate=None,
923 noupdate=None,
924 ):
924 ):
925 """subdivision search of changesets
925 """subdivision search of changesets
926
926
927 This command helps to find changesets which introduce problems. To
927 This command helps to find changesets which introduce problems. To
928 use, mark the earliest changeset you know exhibits the problem as
928 use, mark the earliest changeset you know exhibits the problem as
929 bad, then mark the latest changeset which is free from the problem
929 bad, then mark the latest changeset which is free from the problem
930 as good. Bisect will update your working directory to a revision
930 as good. Bisect will update your working directory to a revision
931 for testing (unless the -U/--noupdate option is specified). Once
931 for testing (unless the -U/--noupdate option is specified). Once
932 you have performed tests, mark the working directory as good or
932 you have performed tests, mark the working directory as good or
933 bad, and bisect will either update to another candidate changeset
933 bad, and bisect will either update to another candidate changeset
934 or announce that it has found the bad revision.
934 or announce that it has found the bad revision.
935
935
936 As a shortcut, you can also use the revision argument to mark a
936 As a shortcut, you can also use the revision argument to mark a
937 revision as good or bad without checking it out first.
937 revision as good or bad without checking it out first.
938
938
939 If you supply a command, it will be used for automatic bisection.
939 If you supply a command, it will be used for automatic bisection.
940 The environment variable HG_NODE will contain the ID of the
940 The environment variable HG_NODE will contain the ID of the
941 changeset being tested. The exit status of the command will be
941 changeset being tested. The exit status of the command will be
942 used to mark revisions as good or bad: status 0 means good, 125
942 used to mark revisions as good or bad: status 0 means good, 125
943 means to skip the revision, 127 (command not found) will abort the
943 means to skip the revision, 127 (command not found) will abort the
944 bisection, and any other non-zero exit status means the revision
944 bisection, and any other non-zero exit status means the revision
945 is bad.
945 is bad.
946
946
947 .. container:: verbose
947 .. container:: verbose
948
948
949 Some examples:
949 Some examples:
950
950
951 - start a bisection with known bad revision 34, and good revision 12::
951 - start a bisection with known bad revision 34, and good revision 12::
952
952
953 hg bisect --bad 34
953 hg bisect --bad 34
954 hg bisect --good 12
954 hg bisect --good 12
955
955
956 - advance the current bisection by marking current revision as good or
956 - advance the current bisection by marking current revision as good or
957 bad::
957 bad::
958
958
959 hg bisect --good
959 hg bisect --good
960 hg bisect --bad
960 hg bisect --bad
961
961
962 - mark the current revision, or a known revision, to be skipped (e.g. if
962 - mark the current revision, or a known revision, to be skipped (e.g. if
963 that revision is not usable because of another issue)::
963 that revision is not usable because of another issue)::
964
964
965 hg bisect --skip
965 hg bisect --skip
966 hg bisect --skip 23
966 hg bisect --skip 23
967
967
968 - skip all revisions that do not touch directories ``foo`` or ``bar``::
968 - skip all revisions that do not touch directories ``foo`` or ``bar``::
969
969
970 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
970 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
971
971
972 - forget the current bisection::
972 - forget the current bisection::
973
973
974 hg bisect --reset
974 hg bisect --reset
975
975
976 - use 'make && make tests' to automatically find the first broken
976 - use 'make && make tests' to automatically find the first broken
977 revision::
977 revision::
978
978
979 hg bisect --reset
979 hg bisect --reset
980 hg bisect --bad 34
980 hg bisect --bad 34
981 hg bisect --good 12
981 hg bisect --good 12
982 hg bisect --command "make && make tests"
982 hg bisect --command "make && make tests"
983
983
984 - see all changesets whose states are already known in the current
984 - see all changesets whose states are already known in the current
985 bisection::
985 bisection::
986
986
987 hg log -r "bisect(pruned)"
987 hg log -r "bisect(pruned)"
988
988
989 - see the changeset currently being bisected (especially useful
989 - see the changeset currently being bisected (especially useful
990 if running with -U/--noupdate)::
990 if running with -U/--noupdate)::
991
991
992 hg log -r "bisect(current)"
992 hg log -r "bisect(current)"
993
993
994 - see all changesets that took part in the current bisection::
994 - see all changesets that took part in the current bisection::
995
995
996 hg log -r "bisect(range)"
996 hg log -r "bisect(range)"
997
997
998 - you can even get a nice graph::
998 - you can even get a nice graph::
999
999
1000 hg log --graph -r "bisect(range)"
1000 hg log --graph -r "bisect(range)"
1001
1001
1002 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
1002 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
1003
1003
1004 Returns 0 on success.
1004 Returns 0 on success.
1005 """
1005 """
1006 rev = []
1006 rev = []
1007 # backward compatibility
1007 # backward compatibility
1008 if positional_1 in (b"good", b"bad", b"reset", b"init"):
1008 if positional_1 in (b"good", b"bad", b"reset", b"init"):
1009 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1009 ui.warn(_(b"(use of 'hg bisect <cmd>' is deprecated)\n"))
1010 cmd = positional_1
1010 cmd = positional_1
1011 rev.append(positional_2)
1011 rev.append(positional_2)
1012 if cmd == b"good":
1012 if cmd == b"good":
1013 good = True
1013 good = True
1014 elif cmd == b"bad":
1014 elif cmd == b"bad":
1015 bad = True
1015 bad = True
1016 else:
1016 else:
1017 reset = True
1017 reset = True
1018 elif positional_2:
1018 elif positional_2:
1019 raise error.InputError(_(b'incompatible arguments'))
1019 raise error.InputError(_(b'incompatible arguments'))
1020 elif positional_1 is not None:
1020 elif positional_1 is not None:
1021 rev.append(positional_1)
1021 rev.append(positional_1)
1022
1022
1023 incompatibles = {
1023 incompatibles = {
1024 b'--bad': bad,
1024 b'--bad': bad,
1025 b'--command': bool(command),
1025 b'--command': bool(command),
1026 b'--extend': extend,
1026 b'--extend': extend,
1027 b'--good': good,
1027 b'--good': good,
1028 b'--reset': reset,
1028 b'--reset': reset,
1029 b'--skip': skip,
1029 b'--skip': skip,
1030 }
1030 }
1031
1031
1032 enabled = [x for x in incompatibles if incompatibles[x]]
1032 enabled = [x for x in incompatibles if incompatibles[x]]
1033
1033
1034 if len(enabled) > 1:
1034 if len(enabled) > 1:
1035 raise error.InputError(
1035 raise error.InputError(
1036 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1036 _(b'%s and %s are incompatible') % tuple(sorted(enabled)[0:2])
1037 )
1037 )
1038
1038
1039 if reset:
1039 if reset:
1040 hbisect.resetstate(repo)
1040 hbisect.resetstate(repo)
1041 return
1041 return
1042
1042
1043 state = hbisect.load_state(repo)
1043 state = hbisect.load_state(repo)
1044
1044
1045 if rev:
1045 if rev:
1046 nodes = [repo[i].node() for i in scmutil.revrange(repo, rev)]
1046 nodes = [repo[i].node() for i in scmutil.revrange(repo, rev)]
1047 else:
1047 else:
1048 nodes = [repo.lookup(b'.')]
1048 nodes = [repo.lookup(b'.')]
1049
1049
1050 # update state
1050 # update state
1051 if good or bad or skip:
1051 if good or bad or skip:
1052 if good:
1052 if good:
1053 state[b'good'] += nodes
1053 state[b'good'] += nodes
1054 elif bad:
1054 elif bad:
1055 state[b'bad'] += nodes
1055 state[b'bad'] += nodes
1056 elif skip:
1056 elif skip:
1057 state[b'skip'] += nodes
1057 state[b'skip'] += nodes
1058 hbisect.save_state(repo, state)
1058 hbisect.save_state(repo, state)
1059 if not (state[b'good'] and state[b'bad']):
1059 if not (state[b'good'] and state[b'bad']):
1060 return
1060 return
1061
1061
1062 def mayupdate(repo, node, show_stats=True):
1062 def mayupdate(repo, node, show_stats=True):
1063 """common used update sequence"""
1063 """common used update sequence"""
1064 if noupdate:
1064 if noupdate:
1065 return
1065 return
1066 cmdutil.checkunfinished(repo)
1066 cmdutil.checkunfinished(repo)
1067 cmdutil.bailifchanged(repo)
1067 cmdutil.bailifchanged(repo)
1068 return hg.clean(repo, node, show_stats=show_stats)
1068 return hg.clean(repo, node, show_stats=show_stats)
1069
1069
1070 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1070 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
1071
1071
1072 if command:
1072 if command:
1073 changesets = 1
1073 changesets = 1
1074 if noupdate:
1074 if noupdate:
1075 try:
1075 try:
1076 node = state[b'current'][0]
1076 node = state[b'current'][0]
1077 except LookupError:
1077 except LookupError:
1078 raise error.StateError(
1078 raise error.StateError(
1079 _(
1079 _(
1080 b'current bisect revision is unknown - '
1080 b'current bisect revision is unknown - '
1081 b'start a new bisect to fix'
1081 b'start a new bisect to fix'
1082 )
1082 )
1083 )
1083 )
1084 else:
1084 else:
1085 node, p2 = repo.dirstate.parents()
1085 node, p2 = repo.dirstate.parents()
1086 if p2 != repo.nullid:
1086 if p2 != repo.nullid:
1087 raise error.StateError(_(b'current bisect revision is a merge'))
1087 raise error.StateError(_(b'current bisect revision is a merge'))
1088 if rev:
1088 if rev:
1089 if not nodes:
1089 if not nodes:
1090 raise error.Abort(_(b'empty revision set'))
1090 raise error.Abort(_(b'empty revision set'))
1091 node = repo[nodes[-1]].node()
1091 node = repo[nodes[-1]].node()
1092 with hbisect.restore_state(repo, state, node):
1092 with hbisect.restore_state(repo, state, node):
1093 while changesets:
1093 while changesets:
1094 # update state
1094 # update state
1095 state[b'current'] = [node]
1095 state[b'current'] = [node]
1096 hbisect.save_state(repo, state)
1096 hbisect.save_state(repo, state)
1097 status = ui.system(
1097 status = ui.system(
1098 command,
1098 command,
1099 environ={b'HG_NODE': hex(node)},
1099 environ={b'HG_NODE': hex(node)},
1100 blockedtag=b'bisect_check',
1100 blockedtag=b'bisect_check',
1101 )
1101 )
1102 if status == 125:
1102 if status == 125:
1103 transition = b"skip"
1103 transition = b"skip"
1104 elif status == 0:
1104 elif status == 0:
1105 transition = b"good"
1105 transition = b"good"
1106 # status < 0 means process was killed
1106 # status < 0 means process was killed
1107 elif status == 127:
1107 elif status == 127:
1108 raise error.Abort(_(b"failed to execute %s") % command)
1108 raise error.Abort(_(b"failed to execute %s") % command)
1109 elif status < 0:
1109 elif status < 0:
1110 raise error.Abort(_(b"%s killed") % command)
1110 raise error.Abort(_(b"%s killed") % command)
1111 else:
1111 else:
1112 transition = b"bad"
1112 transition = b"bad"
1113 state[transition].append(node)
1113 state[transition].append(node)
1114 ctx = repo[node]
1114 ctx = repo[node]
1115 summary = cmdutil.format_changeset_summary(ui, ctx, b'bisect')
1115 summary = cmdutil.format_changeset_summary(ui, ctx, b'bisect')
1116 ui.status(_(b'changeset %s: %s\n') % (summary, transition))
1116 ui.status(_(b'changeset %s: %s\n') % (summary, transition))
1117 hbisect.checkstate(state)
1117 hbisect.checkstate(state)
1118 # bisect
1118 # bisect
1119 nodes, changesets, bgood = hbisect.bisect(repo, state)
1119 nodes, changesets, bgood = hbisect.bisect(repo, state)
1120 # update to next check
1120 # update to next check
1121 node = nodes[0]
1121 node = nodes[0]
1122 mayupdate(repo, node, show_stats=False)
1122 mayupdate(repo, node, show_stats=False)
1123 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1123 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
1124 return
1124 return
1125
1125
1126 hbisect.checkstate(state)
1126 hbisect.checkstate(state)
1127
1127
1128 # actually bisect
1128 # actually bisect
1129 nodes, changesets, good = hbisect.bisect(repo, state)
1129 nodes, changesets, good = hbisect.bisect(repo, state)
1130 if extend:
1130 if extend:
1131 if not changesets:
1131 if not changesets:
1132 extendctx = hbisect.extendrange(repo, state, nodes, good)
1132 extendctx = hbisect.extendrange(repo, state, nodes, good)
1133 if extendctx is not None:
1133 if extendctx is not None:
1134 ui.write(
1134 ui.write(
1135 _(b"Extending search to changeset %s\n")
1135 _(b"Extending search to changeset %s\n")
1136 % cmdutil.format_changeset_summary(ui, extendctx, b'bisect')
1136 % cmdutil.format_changeset_summary(ui, extendctx, b'bisect')
1137 )
1137 )
1138 state[b'current'] = [extendctx.node()]
1138 state[b'current'] = [extendctx.node()]
1139 hbisect.save_state(repo, state)
1139 hbisect.save_state(repo, state)
1140 return mayupdate(repo, extendctx.node())
1140 return mayupdate(repo, extendctx.node())
1141 raise error.StateError(_(b"nothing to extend"))
1141 raise error.StateError(_(b"nothing to extend"))
1142
1142
1143 if changesets == 0:
1143 if changesets == 0:
1144 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1144 hbisect.printresult(ui, repo, state, displayer, nodes, good)
1145 else:
1145 else:
1146 assert len(nodes) == 1 # only a single node can be tested next
1146 assert len(nodes) == 1 # only a single node can be tested next
1147 node = nodes[0]
1147 node = nodes[0]
1148 # compute the approximate number of remaining tests
1148 # compute the approximate number of remaining tests
1149 tests, size = 0, 2
1149 tests, size = 0, 2
1150 while size <= changesets:
1150 while size <= changesets:
1151 tests, size = tests + 1, size * 2
1151 tests, size = tests + 1, size * 2
1152 rev = repo.changelog.rev(node)
1152 rev = repo.changelog.rev(node)
1153 summary = cmdutil.format_changeset_summary(ui, repo[rev], b'bisect')
1153 summary = cmdutil.format_changeset_summary(ui, repo[rev], b'bisect')
1154 ui.write(
1154 ui.write(
1155 _(
1155 _(
1156 b"Testing changeset %s "
1156 b"Testing changeset %s "
1157 b"(%d changesets remaining, ~%d tests)\n"
1157 b"(%d changesets remaining, ~%d tests)\n"
1158 )
1158 )
1159 % (summary, changesets, tests)
1159 % (summary, changesets, tests)
1160 )
1160 )
1161 state[b'current'] = [node]
1161 state[b'current'] = [node]
1162 hbisect.save_state(repo, state)
1162 hbisect.save_state(repo, state)
1163 return mayupdate(repo, node)
1163 return mayupdate(repo, node)
1164
1164
1165
1165
1166 @command(
1166 @command(
1167 b'bookmarks|bookmark',
1167 b'bookmarks|bookmark',
1168 [
1168 [
1169 (b'f', b'force', False, _(b'force')),
1169 (b'f', b'force', False, _(b'force')),
1170 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1170 (b'r', b'rev', b'', _(b'revision for bookmark action'), _(b'REV')),
1171 (b'd', b'delete', False, _(b'delete a given bookmark')),
1171 (b'd', b'delete', False, _(b'delete a given bookmark')),
1172 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1172 (b'm', b'rename', b'', _(b'rename a given bookmark'), _(b'OLD')),
1173 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1173 (b'i', b'inactive', False, _(b'mark a bookmark inactive')),
1174 (b'l', b'list', False, _(b'list existing bookmarks')),
1174 (b'l', b'list', False, _(b'list existing bookmarks')),
1175 ]
1175 ]
1176 + formatteropts,
1176 + formatteropts,
1177 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1177 _(b'hg bookmarks [OPTIONS]... [NAME]...'),
1178 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1178 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1179 )
1179 )
1180 def bookmark(ui, repo, *names, **opts):
1180 def bookmark(ui, repo, *names, **opts):
1181 """create a new bookmark or list existing bookmarks
1181 """create a new bookmark or list existing bookmarks
1182
1182
1183 Bookmarks are labels on changesets to help track lines of development.
1183 Bookmarks are labels on changesets to help track lines of development.
1184 Bookmarks are unversioned and can be moved, renamed and deleted.
1184 Bookmarks are unversioned and can be moved, renamed and deleted.
1185 Deleting or moving a bookmark has no effect on the associated changesets.
1185 Deleting or moving a bookmark has no effect on the associated changesets.
1186
1186
1187 Creating or updating to a bookmark causes it to be marked as 'active'.
1187 Creating or updating to a bookmark causes it to be marked as 'active'.
1188 The active bookmark is indicated with a '*'.
1188 The active bookmark is indicated with a '*'.
1189 When a commit is made, the active bookmark will advance to the new commit.
1189 When a commit is made, the active bookmark will advance to the new commit.
1190 A plain :hg:`update` will also advance an active bookmark, if possible.
1190 A plain :hg:`update` will also advance an active bookmark, if possible.
1191 Updating away from a bookmark will cause it to be deactivated.
1191 Updating away from a bookmark will cause it to be deactivated.
1192
1192
1193 Bookmarks can be pushed and pulled between repositories (see
1193 Bookmarks can be pushed and pulled between repositories (see
1194 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1194 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
1195 diverged, a new 'divergent bookmark' of the form 'name@path' will
1195 diverged, a new 'divergent bookmark' of the form 'name@path' will
1196 be created. Using :hg:`merge` will resolve the divergence.
1196 be created. Using :hg:`merge` will resolve the divergence.
1197
1197
1198 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1198 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
1199 the active bookmark's name.
1199 the active bookmark's name.
1200
1200
1201 A bookmark named '@' has the special property that :hg:`clone` will
1201 A bookmark named '@' has the special property that :hg:`clone` will
1202 check it out by default if it exists.
1202 check it out by default if it exists.
1203
1203
1204 .. container:: verbose
1204 .. container:: verbose
1205
1205
1206 Template:
1206 Template:
1207
1207
1208 The following keywords are supported in addition to the common template
1208 The following keywords are supported in addition to the common template
1209 keywords and functions such as ``{bookmark}``. See also
1209 keywords and functions such as ``{bookmark}``. See also
1210 :hg:`help templates`.
1210 :hg:`help templates`.
1211
1211
1212 :active: Boolean. True if the bookmark is active.
1212 :active: Boolean. True if the bookmark is active.
1213
1213
1214 Examples:
1214 Examples:
1215
1215
1216 - create an active bookmark for a new line of development::
1216 - create an active bookmark for a new line of development::
1217
1217
1218 hg book new-feature
1218 hg book new-feature
1219
1219
1220 - create an inactive bookmark as a place marker::
1220 - create an inactive bookmark as a place marker::
1221
1221
1222 hg book -i reviewed
1222 hg book -i reviewed
1223
1223
1224 - create an inactive bookmark on another changeset::
1224 - create an inactive bookmark on another changeset::
1225
1225
1226 hg book -r .^ tested
1226 hg book -r .^ tested
1227
1227
1228 - rename bookmark turkey to dinner::
1228 - rename bookmark turkey to dinner::
1229
1229
1230 hg book -m turkey dinner
1230 hg book -m turkey dinner
1231
1231
1232 - move the '@' bookmark from another branch::
1232 - move the '@' bookmark from another branch::
1233
1233
1234 hg book -f @
1234 hg book -f @
1235
1235
1236 - print only the active bookmark name::
1236 - print only the active bookmark name::
1237
1237
1238 hg book -ql .
1238 hg book -ql .
1239 """
1239 """
1240 opts = pycompat.byteskwargs(opts)
1240 opts = pycompat.byteskwargs(opts)
1241 force = opts.get(b'force')
1241 force = opts.get(b'force')
1242 rev = opts.get(b'rev')
1242 rev = opts.get(b'rev')
1243 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1243 inactive = opts.get(b'inactive') # meaning add/rename to inactive bookmark
1244
1244
1245 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1245 action = cmdutil.check_at_most_one_arg(opts, b'delete', b'rename', b'list')
1246 if action:
1246 if action:
1247 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1247 cmdutil.check_incompatible_arguments(opts, action, [b'rev'])
1248 elif names or rev:
1248 elif names or rev:
1249 action = b'add'
1249 action = b'add'
1250 elif inactive:
1250 elif inactive:
1251 action = b'inactive' # meaning deactivate
1251 action = b'inactive' # meaning deactivate
1252 else:
1252 else:
1253 action = b'list'
1253 action = b'list'
1254
1254
1255 cmdutil.check_incompatible_arguments(
1255 cmdutil.check_incompatible_arguments(
1256 opts, b'inactive', [b'delete', b'list']
1256 opts, b'inactive', [b'delete', b'list']
1257 )
1257 )
1258 if not names and action in {b'add', b'delete'}:
1258 if not names and action in {b'add', b'delete'}:
1259 raise error.InputError(_(b"bookmark name required"))
1259 raise error.InputError(_(b"bookmark name required"))
1260
1260
1261 if action in {b'add', b'delete', b'rename', b'inactive'}:
1261 if action in {b'add', b'delete', b'rename', b'inactive'}:
1262 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1262 with repo.wlock(), repo.lock(), repo.transaction(b'bookmark') as tr:
1263 if action == b'delete':
1263 if action == b'delete':
1264 names = pycompat.maplist(repo._bookmarks.expandname, names)
1264 names = pycompat.maplist(repo._bookmarks.expandname, names)
1265 bookmarks.delete(repo, tr, names)
1265 bookmarks.delete(repo, tr, names)
1266 elif action == b'rename':
1266 elif action == b'rename':
1267 if not names:
1267 if not names:
1268 raise error.InputError(_(b"new bookmark name required"))
1268 raise error.InputError(_(b"new bookmark name required"))
1269 elif len(names) > 1:
1269 elif len(names) > 1:
1270 raise error.InputError(
1270 raise error.InputError(
1271 _(b"only one new bookmark name allowed")
1271 _(b"only one new bookmark name allowed")
1272 )
1272 )
1273 oldname = repo._bookmarks.expandname(opts[b'rename'])
1273 oldname = repo._bookmarks.expandname(opts[b'rename'])
1274 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1274 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1275 elif action == b'add':
1275 elif action == b'add':
1276 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1276 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1277 elif action == b'inactive':
1277 elif action == b'inactive':
1278 if len(repo._bookmarks) == 0:
1278 if len(repo._bookmarks) == 0:
1279 ui.status(_(b"no bookmarks set\n"))
1279 ui.status(_(b"no bookmarks set\n"))
1280 elif not repo._activebookmark:
1280 elif not repo._activebookmark:
1281 ui.status(_(b"no active bookmark\n"))
1281 ui.status(_(b"no active bookmark\n"))
1282 else:
1282 else:
1283 bookmarks.deactivate(repo)
1283 bookmarks.deactivate(repo)
1284 elif action == b'list':
1284 elif action == b'list':
1285 names = pycompat.maplist(repo._bookmarks.expandname, names)
1285 names = pycompat.maplist(repo._bookmarks.expandname, names)
1286 with ui.formatter(b'bookmarks', opts) as fm:
1286 with ui.formatter(b'bookmarks', opts) as fm:
1287 bookmarks.printbookmarks(ui, repo, fm, names)
1287 bookmarks.printbookmarks(ui, repo, fm, names)
1288 else:
1288 else:
1289 raise error.ProgrammingError(b'invalid action: %s' % action)
1289 raise error.ProgrammingError(b'invalid action: %s' % action)
1290
1290
1291
1291
1292 @command(
1292 @command(
1293 b'branch',
1293 b'branch',
1294 [
1294 [
1295 (
1295 (
1296 b'f',
1296 b'f',
1297 b'force',
1297 b'force',
1298 None,
1298 None,
1299 _(b'set branch name even if it shadows an existing branch'),
1299 _(b'set branch name even if it shadows an existing branch'),
1300 ),
1300 ),
1301 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1301 (b'C', b'clean', None, _(b'reset branch name to parent branch name')),
1302 (
1302 (
1303 b'r',
1303 b'r',
1304 b'rev',
1304 b'rev',
1305 [],
1305 [],
1306 _(b'change branches of the given revs (EXPERIMENTAL)'),
1306 _(b'change branches of the given revs (EXPERIMENTAL)'),
1307 ),
1307 ),
1308 ],
1308 ],
1309 _(b'[-fC] [NAME]'),
1309 _(b'[-fC] [NAME]'),
1310 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1310 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1311 )
1311 )
1312 def branch(ui, repo, label=None, **opts):
1312 def branch(ui, repo, label=None, **opts):
1313 """set or show the current branch name
1313 """set or show the current branch name
1314
1314
1315 .. note::
1315 .. note::
1316
1316
1317 Branch names are permanent and global. Use :hg:`bookmark` to create a
1317 Branch names are permanent and global. Use :hg:`bookmark` to create a
1318 light-weight bookmark instead. See :hg:`help glossary` for more
1318 light-weight bookmark instead. See :hg:`help glossary` for more
1319 information about named branches and bookmarks.
1319 information about named branches and bookmarks.
1320
1320
1321 With no argument, show the current branch name. With one argument,
1321 With no argument, show the current branch name. With one argument,
1322 set the working directory branch name (the branch will not exist
1322 set the working directory branch name (the branch will not exist
1323 in the repository until the next commit). Standard practice
1323 in the repository until the next commit). Standard practice
1324 recommends that primary development take place on the 'default'
1324 recommends that primary development take place on the 'default'
1325 branch.
1325 branch.
1326
1326
1327 Unless -f/--force is specified, branch will not let you set a
1327 Unless -f/--force is specified, branch will not let you set a
1328 branch name that already exists.
1328 branch name that already exists.
1329
1329
1330 Use -C/--clean to reset the working directory branch to that of
1330 Use -C/--clean to reset the working directory branch to that of
1331 the parent of the working directory, negating a previous branch
1331 the parent of the working directory, negating a previous branch
1332 change.
1332 change.
1333
1333
1334 Use the command :hg:`update` to switch to an existing branch. Use
1334 Use the command :hg:`update` to switch to an existing branch. Use
1335 :hg:`commit --close-branch` to mark this branch head as closed.
1335 :hg:`commit --close-branch` to mark this branch head as closed.
1336 When all heads of a branch are closed, the branch will be
1336 When all heads of a branch are closed, the branch will be
1337 considered closed.
1337 considered closed.
1338
1338
1339 Returns 0 on success.
1339 Returns 0 on success.
1340 """
1340 """
1341 opts = pycompat.byteskwargs(opts)
1341 opts = pycompat.byteskwargs(opts)
1342 revs = opts.get(b'rev')
1342 revs = opts.get(b'rev')
1343 if label:
1343 if label:
1344 label = label.strip()
1344 label = label.strip()
1345
1345
1346 if not opts.get(b'clean') and not label:
1346 if not opts.get(b'clean') and not label:
1347 if revs:
1347 if revs:
1348 raise error.InputError(
1348 raise error.InputError(
1349 _(b"no branch name specified for the revisions")
1349 _(b"no branch name specified for the revisions")
1350 )
1350 )
1351 ui.write(b"%s\n" % repo.dirstate.branch())
1351 ui.write(b"%s\n" % repo.dirstate.branch())
1352 return
1352 return
1353
1353
1354 with repo.wlock():
1354 with repo.wlock():
1355 if opts.get(b'clean'):
1355 if opts.get(b'clean'):
1356 label = repo[b'.'].branch()
1356 label = repo[b'.'].branch()
1357 repo.dirstate.setbranch(label)
1357 repo.dirstate.setbranch(label)
1358 ui.status(_(b'reset working directory to branch %s\n') % label)
1358 ui.status(_(b'reset working directory to branch %s\n') % label)
1359 elif label:
1359 elif label:
1360
1360
1361 scmutil.checknewlabel(repo, label, b'branch')
1361 scmutil.checknewlabel(repo, label, b'branch')
1362 if revs:
1362 if revs:
1363 return cmdutil.changebranch(ui, repo, revs, label, opts)
1363 return cmdutil.changebranch(ui, repo, revs, label, opts)
1364
1364
1365 if not opts.get(b'force') and label in repo.branchmap():
1365 if not opts.get(b'force') and label in repo.branchmap():
1366 if label not in [p.branch() for p in repo[None].parents()]:
1366 if label not in [p.branch() for p in repo[None].parents()]:
1367 raise error.InputError(
1367 raise error.InputError(
1368 _(b'a branch of the same name already exists'),
1368 _(b'a branch of the same name already exists'),
1369 # i18n: "it" refers to an existing branch
1369 # i18n: "it" refers to an existing branch
1370 hint=_(b"use 'hg update' to switch to it"),
1370 hint=_(b"use 'hg update' to switch to it"),
1371 )
1371 )
1372
1372
1373 repo.dirstate.setbranch(label)
1373 repo.dirstate.setbranch(label)
1374 ui.status(_(b'marked working directory as branch %s\n') % label)
1374 ui.status(_(b'marked working directory as branch %s\n') % label)
1375
1375
1376 # find any open named branches aside from default
1376 # find any open named branches aside from default
1377 for n, h, t, c in repo.branchmap().iterbranches():
1377 for n, h, t, c in repo.branchmap().iterbranches():
1378 if n != b"default" and not c:
1378 if n != b"default" and not c:
1379 return 0
1379 return 0
1380 ui.status(
1380 ui.status(
1381 _(
1381 _(
1382 b'(branches are permanent and global, '
1382 b'(branches are permanent and global, '
1383 b'did you want a bookmark?)\n'
1383 b'did you want a bookmark?)\n'
1384 )
1384 )
1385 )
1385 )
1386
1386
1387
1387
1388 @command(
1388 @command(
1389 b'branches',
1389 b'branches',
1390 [
1390 [
1391 (
1391 (
1392 b'a',
1392 b'a',
1393 b'active',
1393 b'active',
1394 False,
1394 False,
1395 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1395 _(b'show only branches that have unmerged heads (DEPRECATED)'),
1396 ),
1396 ),
1397 (b'c', b'closed', False, _(b'show normal and closed branches')),
1397 (b'c', b'closed', False, _(b'show normal and closed branches')),
1398 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1398 (b'r', b'rev', [], _(b'show branch name(s) of the given rev')),
1399 ]
1399 ]
1400 + formatteropts,
1400 + formatteropts,
1401 _(b'[-c]'),
1401 _(b'[-c]'),
1402 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1402 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1403 intents={INTENT_READONLY},
1403 intents={INTENT_READONLY},
1404 )
1404 )
1405 def branches(ui, repo, active=False, closed=False, **opts):
1405 def branches(ui, repo, active=False, closed=False, **opts):
1406 """list repository named branches
1406 """list repository named branches
1407
1407
1408 List the repository's named branches, indicating which ones are
1408 List the repository's named branches, indicating which ones are
1409 inactive. If -c/--closed is specified, also list branches which have
1409 inactive. If -c/--closed is specified, also list branches which have
1410 been marked closed (see :hg:`commit --close-branch`).
1410 been marked closed (see :hg:`commit --close-branch`).
1411
1411
1412 Use the command :hg:`update` to switch to an existing branch.
1412 Use the command :hg:`update` to switch to an existing branch.
1413
1413
1414 .. container:: verbose
1414 .. container:: verbose
1415
1415
1416 Template:
1416 Template:
1417
1417
1418 The following keywords are supported in addition to the common template
1418 The following keywords are supported in addition to the common template
1419 keywords and functions such as ``{branch}``. See also
1419 keywords and functions such as ``{branch}``. See also
1420 :hg:`help templates`.
1420 :hg:`help templates`.
1421
1421
1422 :active: Boolean. True if the branch is active.
1422 :active: Boolean. True if the branch is active.
1423 :closed: Boolean. True if the branch is closed.
1423 :closed: Boolean. True if the branch is closed.
1424 :current: Boolean. True if it is the current branch.
1424 :current: Boolean. True if it is the current branch.
1425
1425
1426 Returns 0.
1426 Returns 0.
1427 """
1427 """
1428
1428
1429 opts = pycompat.byteskwargs(opts)
1429 opts = pycompat.byteskwargs(opts)
1430 revs = opts.get(b'rev')
1430 revs = opts.get(b'rev')
1431 selectedbranches = None
1431 selectedbranches = None
1432 if revs:
1432 if revs:
1433 revs = scmutil.revrange(repo, revs)
1433 revs = scmutil.revrange(repo, revs)
1434 getbi = repo.revbranchcache().branchinfo
1434 getbi = repo.revbranchcache().branchinfo
1435 selectedbranches = {getbi(r)[0] for r in revs}
1435 selectedbranches = {getbi(r)[0] for r in revs}
1436
1436
1437 ui.pager(b'branches')
1437 ui.pager(b'branches')
1438 fm = ui.formatter(b'branches', opts)
1438 fm = ui.formatter(b'branches', opts)
1439 hexfunc = fm.hexfunc
1439 hexfunc = fm.hexfunc
1440
1440
1441 allheads = set(repo.heads())
1441 allheads = set(repo.heads())
1442 branches = []
1442 branches = []
1443 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1443 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1444 if selectedbranches is not None and tag not in selectedbranches:
1444 if selectedbranches is not None and tag not in selectedbranches:
1445 continue
1445 continue
1446 isactive = False
1446 isactive = False
1447 if not isclosed:
1447 if not isclosed:
1448 openheads = set(repo.branchmap().iteropen(heads))
1448 openheads = set(repo.branchmap().iteropen(heads))
1449 isactive = bool(openheads & allheads)
1449 isactive = bool(openheads & allheads)
1450 branches.append((tag, repo[tip], isactive, not isclosed))
1450 branches.append((tag, repo[tip], isactive, not isclosed))
1451 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1451 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), reverse=True)
1452
1452
1453 for tag, ctx, isactive, isopen in branches:
1453 for tag, ctx, isactive, isopen in branches:
1454 if active and not isactive:
1454 if active and not isactive:
1455 continue
1455 continue
1456 if isactive:
1456 if isactive:
1457 label = b'branches.active'
1457 label = b'branches.active'
1458 notice = b''
1458 notice = b''
1459 elif not isopen:
1459 elif not isopen:
1460 if not closed:
1460 if not closed:
1461 continue
1461 continue
1462 label = b'branches.closed'
1462 label = b'branches.closed'
1463 notice = _(b' (closed)')
1463 notice = _(b' (closed)')
1464 else:
1464 else:
1465 label = b'branches.inactive'
1465 label = b'branches.inactive'
1466 notice = _(b' (inactive)')
1466 notice = _(b' (inactive)')
1467 current = tag == repo.dirstate.branch()
1467 current = tag == repo.dirstate.branch()
1468 if current:
1468 if current:
1469 label = b'branches.current'
1469 label = b'branches.current'
1470
1470
1471 fm.startitem()
1471 fm.startitem()
1472 fm.write(b'branch', b'%s', tag, label=label)
1472 fm.write(b'branch', b'%s', tag, label=label)
1473 rev = ctx.rev()
1473 rev = ctx.rev()
1474 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1474 padsize = max(31 - len(b"%d" % rev) - encoding.colwidth(tag), 0)
1475 fmt = b' ' * padsize + b' %d:%s'
1475 fmt = b' ' * padsize + b' %d:%s'
1476 fm.condwrite(
1476 fm.condwrite(
1477 not ui.quiet,
1477 not ui.quiet,
1478 b'rev node',
1478 b'rev node',
1479 fmt,
1479 fmt,
1480 rev,
1480 rev,
1481 hexfunc(ctx.node()),
1481 hexfunc(ctx.node()),
1482 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1482 label=b'log.changeset changeset.%s' % ctx.phasestr(),
1483 )
1483 )
1484 fm.context(ctx=ctx)
1484 fm.context(ctx=ctx)
1485 fm.data(active=isactive, closed=not isopen, current=current)
1485 fm.data(active=isactive, closed=not isopen, current=current)
1486 if not ui.quiet:
1486 if not ui.quiet:
1487 fm.plain(notice)
1487 fm.plain(notice)
1488 fm.plain(b'\n')
1488 fm.plain(b'\n')
1489 fm.end()
1489 fm.end()
1490
1490
1491
1491
1492 @command(
1492 @command(
1493 b'bundle',
1493 b'bundle',
1494 [
1494 [
1495 (
1495 (
1496 b'f',
1496 b'f',
1497 b'force',
1497 b'force',
1498 None,
1498 None,
1499 _(b'run even when the destination is unrelated'),
1499 _(b'run even when the destination is unrelated'),
1500 ),
1500 ),
1501 (
1501 (
1502 b'r',
1502 b'r',
1503 b'rev',
1503 b'rev',
1504 [],
1504 [],
1505 _(b'a changeset intended to be added to the destination'),
1505 _(b'a changeset intended to be added to the destination'),
1506 _(b'REV'),
1506 _(b'REV'),
1507 ),
1507 ),
1508 (
1508 (
1509 b'b',
1509 b'b',
1510 b'branch',
1510 b'branch',
1511 [],
1511 [],
1512 _(b'a specific branch you would like to bundle'),
1512 _(b'a specific branch you would like to bundle'),
1513 _(b'BRANCH'),
1513 _(b'BRANCH'),
1514 ),
1514 ),
1515 (
1515 (
1516 b'',
1516 b'',
1517 b'base',
1517 b'base',
1518 [],
1518 [],
1519 _(b'a base changeset assumed to be available at the destination'),
1519 _(b'a base changeset assumed to be available at the destination'),
1520 _(b'REV'),
1520 _(b'REV'),
1521 ),
1521 ),
1522 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1522 (b'a', b'all', None, _(b'bundle all changesets in the repository')),
1523 (
1523 (
1524 b't',
1524 b't',
1525 b'type',
1525 b'type',
1526 b'bzip2',
1526 b'bzip2',
1527 _(b'bundle compression type to use'),
1527 _(b'bundle compression type to use'),
1528 _(b'TYPE'),
1528 _(b'TYPE'),
1529 ),
1529 ),
1530 ]
1530 ]
1531 + remoteopts,
1531 + remoteopts,
1532 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]...'),
1532 _(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]...'),
1533 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1533 helpcategory=command.CATEGORY_IMPORT_EXPORT,
1534 )
1534 )
1535 def bundle(ui, repo, fname, *dests, **opts):
1535 def bundle(ui, repo, fname, *dests, **opts):
1536 """create a bundle file
1536 """create a bundle file
1537
1537
1538 Generate a bundle file containing data to be transferred to another
1538 Generate a bundle file containing data to be transferred to another
1539 repository.
1539 repository.
1540
1540
1541 To create a bundle containing all changesets, use -a/--all
1541 To create a bundle containing all changesets, use -a/--all
1542 (or --base null). Otherwise, hg assumes the destination will have
1542 (or --base null). Otherwise, hg assumes the destination will have
1543 all the nodes you specify with --base parameters. Otherwise, hg
1543 all the nodes you specify with --base parameters. Otherwise, hg
1544 will assume the repository has all the nodes in destination, or
1544 will assume the repository has all the nodes in destination, or
1545 default-push/default if no destination is specified, where destination
1545 default-push/default if no destination is specified, where destination
1546 is the repositories you provide through DEST option.
1546 is the repositories you provide through DEST option.
1547
1547
1548 You can change bundle format with the -t/--type option. See
1548 You can change bundle format with the -t/--type option. See
1549 :hg:`help bundlespec` for documentation on this format. By default,
1549 :hg:`help bundlespec` for documentation on this format. By default,
1550 the most appropriate format is used and compression defaults to
1550 the most appropriate format is used and compression defaults to
1551 bzip2.
1551 bzip2.
1552
1552
1553 The bundle file can then be transferred using conventional means
1553 The bundle file can then be transferred using conventional means
1554 and applied to another repository with the unbundle or pull
1554 and applied to another repository with the unbundle or pull
1555 command. This is useful when direct push and pull are not
1555 command. This is useful when direct push and pull are not
1556 available or when exporting an entire repository is undesirable.
1556 available or when exporting an entire repository is undesirable.
1557
1557
1558 Applying bundles preserves all changeset contents including
1558 Applying bundles preserves all changeset contents including
1559 permissions, copy/rename information, and revision history.
1559 permissions, copy/rename information, and revision history.
1560
1560
1561 Returns 0 on success, 1 if no changes found.
1561 Returns 0 on success, 1 if no changes found.
1562 """
1562 """
1563 opts = pycompat.byteskwargs(opts)
1563 opts = pycompat.byteskwargs(opts)
1564 revs = None
1564 revs = None
1565 if b'rev' in opts:
1565 if b'rev' in opts:
1566 revstrings = opts[b'rev']
1566 revstrings = opts[b'rev']
1567 revs = scmutil.revrange(repo, revstrings)
1567 revs = scmutil.revrange(repo, revstrings)
1568 if revstrings and not revs:
1568 if revstrings and not revs:
1569 raise error.InputError(_(b'no commits to bundle'))
1569 raise error.InputError(_(b'no commits to bundle'))
1570
1570
1571 bundletype = opts.get(b'type', b'bzip2').lower()
1571 bundletype = opts.get(b'type', b'bzip2').lower()
1572 try:
1572 try:
1573 bundlespec = bundlecaches.parsebundlespec(
1573 bundlespec = bundlecaches.parsebundlespec(
1574 repo, bundletype, strict=False
1574 repo, bundletype, strict=False
1575 )
1575 )
1576 except error.UnsupportedBundleSpecification as e:
1576 except error.UnsupportedBundleSpecification as e:
1577 raise error.InputError(
1577 raise error.InputError(
1578 pycompat.bytestr(e),
1578 pycompat.bytestr(e),
1579 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1579 hint=_(b"see 'hg help bundlespec' for supported values for --type"),
1580 )
1580 )
1581 cgversion = bundlespec.contentopts[b"cg.version"]
1581 cgversion = bundlespec.contentopts[b"cg.version"]
1582
1582
1583 # Packed bundles are a pseudo bundle format for now.
1583 # Packed bundles are a pseudo bundle format for now.
1584 if cgversion == b's1':
1584 if cgversion == b's1':
1585 raise error.InputError(
1585 raise error.InputError(
1586 _(b'packed bundles cannot be produced by "hg bundle"'),
1586 _(b'packed bundles cannot be produced by "hg bundle"'),
1587 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1587 hint=_(b"use 'hg debugcreatestreamclonebundle'"),
1588 )
1588 )
1589
1589
1590 if opts.get(b'all'):
1590 if opts.get(b'all'):
1591 if dests:
1591 if dests:
1592 raise error.InputError(
1592 raise error.InputError(
1593 _(b"--all is incompatible with specifying destinations")
1593 _(b"--all is incompatible with specifying destinations")
1594 )
1594 )
1595 if opts.get(b'base'):
1595 if opts.get(b'base'):
1596 ui.warn(_(b"ignoring --base because --all was specified\n"))
1596 ui.warn(_(b"ignoring --base because --all was specified\n"))
1597 base = [nullrev]
1597 base = [nullrev]
1598 else:
1598 else:
1599 base = scmutil.revrange(repo, opts.get(b'base'))
1599 base = scmutil.revrange(repo, opts.get(b'base'))
1600 if cgversion not in changegroup.supportedoutgoingversions(repo):
1600 if cgversion not in changegroup.supportedoutgoingversions(repo):
1601 raise error.Abort(
1601 raise error.Abort(
1602 _(b"repository does not support bundle version %s") % cgversion
1602 _(b"repository does not support bundle version %s") % cgversion
1603 )
1603 )
1604
1604
1605 if base:
1605 if base:
1606 if dests:
1606 if dests:
1607 raise error.InputError(
1607 raise error.InputError(
1608 _(b"--base is incompatible with specifying destinations")
1608 _(b"--base is incompatible with specifying destinations")
1609 )
1609 )
1610 common = [repo[rev].node() for rev in base]
1610 common = [repo[rev].node() for rev in base]
1611 heads = [repo[r].node() for r in revs] if revs else None
1611 heads = [repo[r].node() for r in revs] if revs else None
1612 outgoing = discovery.outgoing(repo, common, heads)
1612 outgoing = discovery.outgoing(repo, common, heads)
1613 missing = outgoing.missing
1613 missing = outgoing.missing
1614 excluded = outgoing.excluded
1614 excluded = outgoing.excluded
1615 else:
1615 else:
1616 missing = set()
1616 missing = set()
1617 excluded = set()
1617 excluded = set()
1618 for path in urlutil.get_push_paths(repo, ui, dests):
1618 for path in urlutil.get_push_paths(repo, ui, dests):
1619 other = hg.peer(repo, opts, path.rawloc)
1619 other = hg.peer(repo, opts, path.rawloc)
1620 if revs is not None:
1620 if revs is not None:
1621 hex_revs = [repo[r].hex() for r in revs]
1621 hex_revs = [repo[r].hex() for r in revs]
1622 else:
1622 else:
1623 hex_revs = None
1623 hex_revs = None
1624 branches = (path.branch, [])
1624 branches = (path.branch, [])
1625 head_revs, checkout = hg.addbranchrevs(
1625 head_revs, checkout = hg.addbranchrevs(
1626 repo, repo, branches, hex_revs
1626 repo, repo, branches, hex_revs
1627 )
1627 )
1628 heads = (
1628 heads = (
1629 head_revs
1629 head_revs
1630 and pycompat.maplist(repo.lookup, head_revs)
1630 and pycompat.maplist(repo.lookup, head_revs)
1631 or head_revs
1631 or head_revs
1632 )
1632 )
1633 outgoing = discovery.findcommonoutgoing(
1633 outgoing = discovery.findcommonoutgoing(
1634 repo,
1634 repo,
1635 other,
1635 other,
1636 onlyheads=heads,
1636 onlyheads=heads,
1637 force=opts.get(b'force'),
1637 force=opts.get(b'force'),
1638 portable=True,
1638 portable=True,
1639 )
1639 )
1640 missing.update(outgoing.missing)
1640 missing.update(outgoing.missing)
1641 excluded.update(outgoing.excluded)
1641 excluded.update(outgoing.excluded)
1642
1642
1643 if not missing:
1643 if not missing:
1644 scmutil.nochangesfound(ui, repo, not base and excluded)
1644 scmutil.nochangesfound(ui, repo, not base and excluded)
1645 return 1
1645 return 1
1646
1646
1647 if heads:
1647 if heads:
1648 outgoing = discovery.outgoing(
1648 outgoing = discovery.outgoing(
1649 repo, missingroots=missing, ancestorsof=heads
1649 repo, missingroots=missing, ancestorsof=heads
1650 )
1650 )
1651 else:
1651 else:
1652 outgoing = discovery.outgoing(repo, missingroots=missing)
1652 outgoing = discovery.outgoing(repo, missingroots=missing)
1653 outgoing.excluded = sorted(excluded)
1653 outgoing.excluded = sorted(excluded)
1654
1654
1655 if cgversion == b'01': # bundle1
1655 if cgversion == b'01': # bundle1
1656 bversion = b'HG10' + bundlespec.wirecompression
1656 bversion = b'HG10' + bundlespec.wirecompression
1657 bcompression = None
1657 bcompression = None
1658 elif cgversion in (b'02', b'03'):
1658 elif cgversion in (b'02', b'03'):
1659 bversion = b'HG20'
1659 bversion = b'HG20'
1660 bcompression = bundlespec.wirecompression
1660 bcompression = bundlespec.wirecompression
1661 else:
1661 else:
1662 raise error.ProgrammingError(
1662 raise error.ProgrammingError(
1663 b'bundle: unexpected changegroup version %s' % cgversion
1663 b'bundle: unexpected changegroup version %s' % cgversion
1664 )
1664 )
1665
1665
1666 # TODO compression options should be derived from bundlespec parsing.
1666 # TODO compression options should be derived from bundlespec parsing.
1667 # This is a temporary hack to allow adjusting bundle compression
1667 # This is a temporary hack to allow adjusting bundle compression
1668 # level without a) formalizing the bundlespec changes to declare it
1668 # level without a) formalizing the bundlespec changes to declare it
1669 # b) introducing a command flag.
1669 # b) introducing a command flag.
1670 compopts = {}
1670 compopts = {}
1671 complevel = ui.configint(
1671 complevel = ui.configint(
1672 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1672 b'experimental', b'bundlecomplevel.' + bundlespec.compression
1673 )
1673 )
1674 if complevel is None:
1674 if complevel is None:
1675 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1675 complevel = ui.configint(b'experimental', b'bundlecomplevel')
1676 if complevel is not None:
1676 if complevel is not None:
1677 compopts[b'level'] = complevel
1677 compopts[b'level'] = complevel
1678
1678
1679 compthreads = ui.configint(
1679 compthreads = ui.configint(
1680 b'experimental', b'bundlecompthreads.' + bundlespec.compression
1680 b'experimental', b'bundlecompthreads.' + bundlespec.compression
1681 )
1681 )
1682 if compthreads is None:
1682 if compthreads is None:
1683 compthreads = ui.configint(b'experimental', b'bundlecompthreads')
1683 compthreads = ui.configint(b'experimental', b'bundlecompthreads')
1684 if compthreads is not None:
1684 if compthreads is not None:
1685 compopts[b'threads'] = compthreads
1685 compopts[b'threads'] = compthreads
1686
1686
1687 # Bundling of obsmarker and phases is optional as not all clients
1687 # Bundling of obsmarker and phases is optional as not all clients
1688 # support the necessary features.
1688 # support the necessary features.
1689 cfg = ui.configbool
1689 cfg = ui.configbool
1690 contentopts = {
1690 contentopts = {
1691 b'obsolescence': cfg(b'experimental', b'evolution.bundle-obsmarker'),
1691 b'obsolescence': cfg(b'experimental', b'evolution.bundle-obsmarker'),
1692 b'obsolescence-mandatory': cfg(
1692 b'obsolescence-mandatory': cfg(
1693 b'experimental', b'evolution.bundle-obsmarker:mandatory'
1693 b'experimental', b'evolution.bundle-obsmarker:mandatory'
1694 ),
1694 ),
1695 b'phases': cfg(b'experimental', b'bundle-phases'),
1695 b'phases': cfg(b'experimental', b'bundle-phases'),
1696 }
1696 }
1697 bundlespec.contentopts.update(contentopts)
1697 bundlespec.contentopts.update(contentopts)
1698
1698
1699 bundle2.writenewbundle(
1699 bundle2.writenewbundle(
1700 ui,
1700 ui,
1701 repo,
1701 repo,
1702 b'bundle',
1702 b'bundle',
1703 fname,
1703 fname,
1704 bversion,
1704 bversion,
1705 outgoing,
1705 outgoing,
1706 bundlespec.contentopts,
1706 bundlespec.contentopts,
1707 compression=bcompression,
1707 compression=bcompression,
1708 compopts=compopts,
1708 compopts=compopts,
1709 )
1709 )
1710
1710
1711
1711
1712 @command(
1712 @command(
1713 b'cat',
1713 b'cat',
1714 [
1714 [
1715 (
1715 (
1716 b'o',
1716 b'o',
1717 b'output',
1717 b'output',
1718 b'',
1718 b'',
1719 _(b'print output to file with formatted name'),
1719 _(b'print output to file with formatted name'),
1720 _(b'FORMAT'),
1720 _(b'FORMAT'),
1721 ),
1721 ),
1722 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1722 (b'r', b'rev', b'', _(b'print the given revision'), _(b'REV')),
1723 (b'', b'decode', None, _(b'apply any matching decode filter')),
1723 (b'', b'decode', None, _(b'apply any matching decode filter')),
1724 ]
1724 ]
1725 + walkopts
1725 + walkopts
1726 + formatteropts,
1726 + formatteropts,
1727 _(b'[OPTION]... FILE...'),
1727 _(b'[OPTION]... FILE...'),
1728 helpcategory=command.CATEGORY_FILE_CONTENTS,
1728 helpcategory=command.CATEGORY_FILE_CONTENTS,
1729 inferrepo=True,
1729 inferrepo=True,
1730 intents={INTENT_READONLY},
1730 intents={INTENT_READONLY},
1731 )
1731 )
1732 def cat(ui, repo, file1, *pats, **opts):
1732 def cat(ui, repo, file1, *pats, **opts):
1733 """output the current or given revision of files
1733 """output the current or given revision of files
1734
1734
1735 Print the specified files as they were at the given revision. If
1735 Print the specified files as they were at the given revision. If
1736 no revision is given, the parent of the working directory is used.
1736 no revision is given, the parent of the working directory is used.
1737
1737
1738 Output may be to a file, in which case the name of the file is
1738 Output may be to a file, in which case the name of the file is
1739 given using a template string. See :hg:`help templates`. In addition
1739 given using a template string. See :hg:`help templates`. In addition
1740 to the common template keywords, the following formatting rules are
1740 to the common template keywords, the following formatting rules are
1741 supported:
1741 supported:
1742
1742
1743 :``%%``: literal "%" character
1743 :``%%``: literal "%" character
1744 :``%s``: basename of file being printed
1744 :``%s``: basename of file being printed
1745 :``%d``: dirname of file being printed, or '.' if in repository root
1745 :``%d``: dirname of file being printed, or '.' if in repository root
1746 :``%p``: root-relative path name of file being printed
1746 :``%p``: root-relative path name of file being printed
1747 :``%H``: changeset hash (40 hexadecimal digits)
1747 :``%H``: changeset hash (40 hexadecimal digits)
1748 :``%R``: changeset revision number
1748 :``%R``: changeset revision number
1749 :``%h``: short-form changeset hash (12 hexadecimal digits)
1749 :``%h``: short-form changeset hash (12 hexadecimal digits)
1750 :``%r``: zero-padded changeset revision number
1750 :``%r``: zero-padded changeset revision number
1751 :``%b``: basename of the exporting repository
1751 :``%b``: basename of the exporting repository
1752 :``\\``: literal "\\" character
1752 :``\\``: literal "\\" character
1753
1753
1754 .. container:: verbose
1754 .. container:: verbose
1755
1755
1756 Template:
1756 Template:
1757
1757
1758 The following keywords are supported in addition to the common template
1758 The following keywords are supported in addition to the common template
1759 keywords and functions. See also :hg:`help templates`.
1759 keywords and functions. See also :hg:`help templates`.
1760
1760
1761 :data: String. File content.
1761 :data: String. File content.
1762 :path: String. Repository-absolute path of the file.
1762 :path: String. Repository-absolute path of the file.
1763
1763
1764 Returns 0 on success.
1764 Returns 0 on success.
1765 """
1765 """
1766 opts = pycompat.byteskwargs(opts)
1766 opts = pycompat.byteskwargs(opts)
1767 rev = opts.get(b'rev')
1767 rev = opts.get(b'rev')
1768 if rev:
1768 if rev:
1769 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1769 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
1770 ctx = scmutil.revsingle(repo, rev)
1770 ctx = scmutil.revsingle(repo, rev)
1771 m = scmutil.match(ctx, (file1,) + pats, opts)
1771 m = scmutil.match(ctx, (file1,) + pats, opts)
1772 fntemplate = opts.pop(b'output', b'')
1772 fntemplate = opts.pop(b'output', b'')
1773 if cmdutil.isstdiofilename(fntemplate):
1773 if cmdutil.isstdiofilename(fntemplate):
1774 fntemplate = b''
1774 fntemplate = b''
1775
1775
1776 if fntemplate:
1776 if fntemplate:
1777 fm = formatter.nullformatter(ui, b'cat', opts)
1777 fm = formatter.nullformatter(ui, b'cat', opts)
1778 else:
1778 else:
1779 ui.pager(b'cat')
1779 ui.pager(b'cat')
1780 fm = ui.formatter(b'cat', opts)
1780 fm = ui.formatter(b'cat', opts)
1781 with fm:
1781 with fm:
1782 return cmdutil.cat(
1782 return cmdutil.cat(
1783 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1783 ui, repo, ctx, m, fm, fntemplate, b'', **pycompat.strkwargs(opts)
1784 )
1784 )
1785
1785
1786
1786
1787 @command(
1787 @command(
1788 b'clone',
1788 b'clone',
1789 [
1789 [
1790 (
1790 (
1791 b'U',
1791 b'U',
1792 b'noupdate',
1792 b'noupdate',
1793 None,
1793 None,
1794 _(
1794 _(
1795 b'the clone will include an empty working '
1795 b'the clone will include an empty working '
1796 b'directory (only a repository)'
1796 b'directory (only a repository)'
1797 ),
1797 ),
1798 ),
1798 ),
1799 (
1799 (
1800 b'u',
1800 b'u',
1801 b'updaterev',
1801 b'updaterev',
1802 b'',
1802 b'',
1803 _(b'revision, tag, or branch to check out'),
1803 _(b'revision, tag, or branch to check out'),
1804 _(b'REV'),
1804 _(b'REV'),
1805 ),
1805 ),
1806 (
1806 (
1807 b'r',
1807 b'r',
1808 b'rev',
1808 b'rev',
1809 [],
1809 [],
1810 _(
1810 _(
1811 b'do not clone everything, but include this changeset'
1811 b'do not clone everything, but include this changeset'
1812 b' and its ancestors'
1812 b' and its ancestors'
1813 ),
1813 ),
1814 _(b'REV'),
1814 _(b'REV'),
1815 ),
1815 ),
1816 (
1816 (
1817 b'b',
1817 b'b',
1818 b'branch',
1818 b'branch',
1819 [],
1819 [],
1820 _(
1820 _(
1821 b'do not clone everything, but include this branch\'s'
1821 b'do not clone everything, but include this branch\'s'
1822 b' changesets and their ancestors'
1822 b' changesets and their ancestors'
1823 ),
1823 ),
1824 _(b'BRANCH'),
1824 _(b'BRANCH'),
1825 ),
1825 ),
1826 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1826 (b'', b'pull', None, _(b'use pull protocol to copy metadata')),
1827 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1827 (b'', b'uncompressed', None, _(b'an alias to --stream (DEPRECATED)')),
1828 (b'', b'stream', None, _(b'clone with minimal data processing')),
1828 (b'', b'stream', None, _(b'clone with minimal data processing')),
1829 ]
1829 ]
1830 + remoteopts,
1830 + remoteopts,
1831 _(b'[OPTION]... SOURCE [DEST]'),
1831 _(b'[OPTION]... SOURCE [DEST]'),
1832 helpcategory=command.CATEGORY_REPO_CREATION,
1832 helpcategory=command.CATEGORY_REPO_CREATION,
1833 helpbasic=True,
1833 helpbasic=True,
1834 norepo=True,
1834 norepo=True,
1835 )
1835 )
1836 def clone(ui, source, dest=None, **opts):
1836 def clone(ui, source, dest=None, **opts):
1837 """make a copy of an existing repository
1837 """make a copy of an existing repository
1838
1838
1839 Create a copy of an existing repository in a new directory.
1839 Create a copy of an existing repository in a new directory.
1840
1840
1841 If no destination directory name is specified, it defaults to the
1841 If no destination directory name is specified, it defaults to the
1842 basename of the source.
1842 basename of the source.
1843
1843
1844 The location of the source is added to the new repository's
1844 The location of the source is added to the new repository's
1845 ``.hg/hgrc`` file, as the default to be used for future pulls.
1845 ``.hg/hgrc`` file, as the default to be used for future pulls.
1846
1846
1847 Only local paths and ``ssh://`` URLs are supported as
1847 Only local paths and ``ssh://`` URLs are supported as
1848 destinations. For ``ssh://`` destinations, no working directory or
1848 destinations. For ``ssh://`` destinations, no working directory or
1849 ``.hg/hgrc`` will be created on the remote side.
1849 ``.hg/hgrc`` will be created on the remote side.
1850
1850
1851 If the source repository has a bookmark called '@' set, that
1851 If the source repository has a bookmark called '@' set, that
1852 revision will be checked out in the new repository by default.
1852 revision will be checked out in the new repository by default.
1853
1853
1854 To check out a particular version, use -u/--update, or
1854 To check out a particular version, use -u/--update, or
1855 -U/--noupdate to create a clone with no working directory.
1855 -U/--noupdate to create a clone with no working directory.
1856
1856
1857 To pull only a subset of changesets, specify one or more revisions
1857 To pull only a subset of changesets, specify one or more revisions
1858 identifiers with -r/--rev or branches with -b/--branch. The
1858 identifiers with -r/--rev or branches with -b/--branch. The
1859 resulting clone will contain only the specified changesets and
1859 resulting clone will contain only the specified changesets and
1860 their ancestors. These options (or 'clone src#rev dest') imply
1860 their ancestors. These options (or 'clone src#rev dest') imply
1861 --pull, even for local source repositories.
1861 --pull, even for local source repositories.
1862
1862
1863 In normal clone mode, the remote normalizes repository data into a common
1863 In normal clone mode, the remote normalizes repository data into a common
1864 exchange format and the receiving end translates this data into its local
1864 exchange format and the receiving end translates this data into its local
1865 storage format. --stream activates a different clone mode that essentially
1865 storage format. --stream activates a different clone mode that essentially
1866 copies repository files from the remote with minimal data processing. This
1866 copies repository files from the remote with minimal data processing. This
1867 significantly reduces the CPU cost of a clone both remotely and locally.
1867 significantly reduces the CPU cost of a clone both remotely and locally.
1868 However, it often increases the transferred data size by 30-40%. This can
1868 However, it often increases the transferred data size by 30-40%. This can
1869 result in substantially faster clones where I/O throughput is plentiful,
1869 result in substantially faster clones where I/O throughput is plentiful,
1870 especially for larger repositories. A side-effect of --stream clones is
1870 especially for larger repositories. A side-effect of --stream clones is
1871 that storage settings and requirements on the remote are applied locally:
1871 that storage settings and requirements on the remote are applied locally:
1872 a modern client may inherit legacy or inefficient storage used by the
1872 a modern client may inherit legacy or inefficient storage used by the
1873 remote or a legacy Mercurial client may not be able to clone from a
1873 remote or a legacy Mercurial client may not be able to clone from a
1874 modern Mercurial remote.
1874 modern Mercurial remote.
1875
1875
1876 .. note::
1876 .. note::
1877
1877
1878 Specifying a tag will include the tagged changeset but not the
1878 Specifying a tag will include the tagged changeset but not the
1879 changeset containing the tag.
1879 changeset containing the tag.
1880
1880
1881 .. container:: verbose
1881 .. container:: verbose
1882
1882
1883 For efficiency, hardlinks are used for cloning whenever the
1883 For efficiency, hardlinks are used for cloning whenever the
1884 source and destination are on the same filesystem (note this
1884 source and destination are on the same filesystem (note this
1885 applies only to the repository data, not to the working
1885 applies only to the repository data, not to the working
1886 directory). Some filesystems, such as AFS, implement hardlinking
1886 directory). Some filesystems, such as AFS, implement hardlinking
1887 incorrectly, but do not report errors. In these cases, use the
1887 incorrectly, but do not report errors. In these cases, use the
1888 --pull option to avoid hardlinking.
1888 --pull option to avoid hardlinking.
1889
1889
1890 Mercurial will update the working directory to the first applicable
1890 Mercurial will update the working directory to the first applicable
1891 revision from this list:
1891 revision from this list:
1892
1892
1893 a) null if -U or the source repository has no changesets
1893 a) null if -U or the source repository has no changesets
1894 b) if -u . and the source repository is local, the first parent of
1894 b) if -u . and the source repository is local, the first parent of
1895 the source repository's working directory
1895 the source repository's working directory
1896 c) the changeset specified with -u (if a branch name, this means the
1896 c) the changeset specified with -u (if a branch name, this means the
1897 latest head of that branch)
1897 latest head of that branch)
1898 d) the changeset specified with -r
1898 d) the changeset specified with -r
1899 e) the tipmost head specified with -b
1899 e) the tipmost head specified with -b
1900 f) the tipmost head specified with the url#branch source syntax
1900 f) the tipmost head specified with the url#branch source syntax
1901 g) the revision marked with the '@' bookmark, if present
1901 g) the revision marked with the '@' bookmark, if present
1902 h) the tipmost head of the default branch
1902 h) the tipmost head of the default branch
1903 i) tip
1903 i) tip
1904
1904
1905 When cloning from servers that support it, Mercurial may fetch
1905 When cloning from servers that support it, Mercurial may fetch
1906 pre-generated data from a server-advertised URL or inline from the
1906 pre-generated data from a server-advertised URL or inline from the
1907 same stream. When this is done, hooks operating on incoming changesets
1907 same stream. When this is done, hooks operating on incoming changesets
1908 and changegroups may fire more than once, once for each pre-generated
1908 and changegroups may fire more than once, once for each pre-generated
1909 bundle and as well as for any additional remaining data. In addition,
1909 bundle and as well as for any additional remaining data. In addition,
1910 if an error occurs, the repository may be rolled back to a partial
1910 if an error occurs, the repository may be rolled back to a partial
1911 clone. This behavior may change in future releases.
1911 clone. This behavior may change in future releases.
1912 See :hg:`help -e clonebundles` for more.
1912 See :hg:`help -e clonebundles` for more.
1913
1913
1914 Examples:
1914 Examples:
1915
1915
1916 - clone a remote repository to a new directory named hg/::
1916 - clone a remote repository to a new directory named hg/::
1917
1917
1918 hg clone https://www.mercurial-scm.org/repo/hg/
1918 hg clone https://www.mercurial-scm.org/repo/hg/
1919
1919
1920 - create a lightweight local clone::
1920 - create a lightweight local clone::
1921
1921
1922 hg clone project/ project-feature/
1922 hg clone project/ project-feature/
1923
1923
1924 - clone from an absolute path on an ssh server (note double-slash)::
1924 - clone from an absolute path on an ssh server (note double-slash)::
1925
1925
1926 hg clone ssh://user@server//home/projects/alpha/
1926 hg clone ssh://user@server//home/projects/alpha/
1927
1927
1928 - do a streaming clone while checking out a specified version::
1928 - do a streaming clone while checking out a specified version::
1929
1929
1930 hg clone --stream http://server/repo -u 1.5
1930 hg clone --stream http://server/repo -u 1.5
1931
1931
1932 - create a repository without changesets after a particular revision::
1932 - create a repository without changesets after a particular revision::
1933
1933
1934 hg clone -r 04e544 experimental/ good/
1934 hg clone -r 04e544 experimental/ good/
1935
1935
1936 - clone (and track) a particular named branch::
1936 - clone (and track) a particular named branch::
1937
1937
1938 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1938 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1939
1939
1940 See :hg:`help urls` for details on specifying URLs.
1940 See :hg:`help urls` for details on specifying URLs.
1941
1941
1942 Returns 0 on success.
1942 Returns 0 on success.
1943 """
1943 """
1944 opts = pycompat.byteskwargs(opts)
1944 opts = pycompat.byteskwargs(opts)
1945 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1945 cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev')
1946
1946
1947 # --include/--exclude can come from narrow or sparse.
1947 # --include/--exclude can come from narrow or sparse.
1948 includepats, excludepats = None, None
1948 includepats, excludepats = None, None
1949
1949
1950 # hg.clone() differentiates between None and an empty set. So make sure
1950 # hg.clone() differentiates between None and an empty set. So make sure
1951 # patterns are sets if narrow is requested without patterns.
1951 # patterns are sets if narrow is requested without patterns.
1952 if opts.get(b'narrow'):
1952 if opts.get(b'narrow'):
1953 includepats = set()
1953 includepats = set()
1954 excludepats = set()
1954 excludepats = set()
1955
1955
1956 if opts.get(b'include'):
1956 if opts.get(b'include'):
1957 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1957 includepats = narrowspec.parsepatterns(opts.get(b'include'))
1958 if opts.get(b'exclude'):
1958 if opts.get(b'exclude'):
1959 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1959 excludepats = narrowspec.parsepatterns(opts.get(b'exclude'))
1960
1960
1961 r = hg.clone(
1961 r = hg.clone(
1962 ui,
1962 ui,
1963 opts,
1963 opts,
1964 source,
1964 source,
1965 dest,
1965 dest,
1966 pull=opts.get(b'pull'),
1966 pull=opts.get(b'pull'),
1967 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1967 stream=opts.get(b'stream') or opts.get(b'uncompressed'),
1968 revs=opts.get(b'rev'),
1968 revs=opts.get(b'rev'),
1969 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1969 update=opts.get(b'updaterev') or not opts.get(b'noupdate'),
1970 branch=opts.get(b'branch'),
1970 branch=opts.get(b'branch'),
1971 shareopts=opts.get(b'shareopts'),
1971 shareopts=opts.get(b'shareopts'),
1972 storeincludepats=includepats,
1972 storeincludepats=includepats,
1973 storeexcludepats=excludepats,
1973 storeexcludepats=excludepats,
1974 depth=opts.get(b'depth') or None,
1974 depth=opts.get(b'depth') or None,
1975 )
1975 )
1976
1976
1977 return r is None
1977 return r is None
1978
1978
1979
1979
1980 @command(
1980 @command(
1981 b'commit|ci',
1981 b'commit|ci',
1982 [
1982 [
1983 (
1983 (
1984 b'A',
1984 b'A',
1985 b'addremove',
1985 b'addremove',
1986 None,
1986 None,
1987 _(b'mark new/missing files as added/removed before committing'),
1987 _(b'mark new/missing files as added/removed before committing'),
1988 ),
1988 ),
1989 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1989 (b'', b'close-branch', None, _(b'mark a branch head as closed')),
1990 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1990 (b'', b'amend', None, _(b'amend the parent of the working directory')),
1991 (b's', b'secret', None, _(b'use the secret phase for committing')),
1991 (b's', b'secret', None, _(b'use the secret phase for committing')),
1992 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1992 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
1993 (
1993 (
1994 b'',
1994 b'',
1995 b'force-close-branch',
1995 b'force-close-branch',
1996 None,
1996 None,
1997 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1997 _(b'forcibly close branch from a non-head changeset (ADVANCED)'),
1998 ),
1998 ),
1999 (b'i', b'interactive', None, _(b'use interactive mode')),
1999 (b'i', b'interactive', None, _(b'use interactive mode')),
2000 ]
2000 ]
2001 + walkopts
2001 + walkopts
2002 + commitopts
2002 + commitopts
2003 + commitopts2
2003 + commitopts2
2004 + subrepoopts,
2004 + subrepoopts,
2005 _(b'[OPTION]... [FILE]...'),
2005 _(b'[OPTION]... [FILE]...'),
2006 helpcategory=command.CATEGORY_COMMITTING,
2006 helpcategory=command.CATEGORY_COMMITTING,
2007 helpbasic=True,
2007 helpbasic=True,
2008 inferrepo=True,
2008 inferrepo=True,
2009 )
2009 )
2010 def commit(ui, repo, *pats, **opts):
2010 def commit(ui, repo, *pats, **opts):
2011 """commit the specified files or all outstanding changes
2011 """commit the specified files or all outstanding changes
2012
2012
2013 Commit changes to the given files into the repository. Unlike a
2013 Commit changes to the given files into the repository. Unlike a
2014 centralized SCM, this operation is a local operation. See
2014 centralized SCM, this operation is a local operation. See
2015 :hg:`push` for a way to actively distribute your changes.
2015 :hg:`push` for a way to actively distribute your changes.
2016
2016
2017 If a list of files is omitted, all changes reported by :hg:`status`
2017 If a list of files is omitted, all changes reported by :hg:`status`
2018 will be committed.
2018 will be committed.
2019
2019
2020 If you are committing the result of a merge, do not provide any
2020 If you are committing the result of a merge, do not provide any
2021 filenames or -I/-X filters.
2021 filenames or -I/-X filters.
2022
2022
2023 If no commit message is specified, Mercurial starts your
2023 If no commit message is specified, Mercurial starts your
2024 configured editor where you can enter a message. In case your
2024 configured editor where you can enter a message. In case your
2025 commit fails, you will find a backup of your message in
2025 commit fails, you will find a backup of your message in
2026 ``.hg/last-message.txt``.
2026 ``.hg/last-message.txt``.
2027
2027
2028 The --close-branch flag can be used to mark the current branch
2028 The --close-branch flag can be used to mark the current branch
2029 head closed. When all heads of a branch are closed, the branch
2029 head closed. When all heads of a branch are closed, the branch
2030 will be considered closed and no longer listed.
2030 will be considered closed and no longer listed.
2031
2031
2032 The --amend flag can be used to amend the parent of the
2032 The --amend flag can be used to amend the parent of the
2033 working directory with a new commit that contains the changes
2033 working directory with a new commit that contains the changes
2034 in the parent in addition to those currently reported by :hg:`status`,
2034 in the parent in addition to those currently reported by :hg:`status`,
2035 if there are any. The old commit is stored in a backup bundle in
2035 if there are any. The old commit is stored in a backup bundle in
2036 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
2036 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
2037 on how to restore it).
2037 on how to restore it).
2038
2038
2039 Message, user and date are taken from the amended commit unless
2039 Message, user and date are taken from the amended commit unless
2040 specified. When a message isn't specified on the command line,
2040 specified. When a message isn't specified on the command line,
2041 the editor will open with the message of the amended commit.
2041 the editor will open with the message of the amended commit.
2042
2042
2043 It is not possible to amend public changesets (see :hg:`help phases`)
2043 It is not possible to amend public changesets (see :hg:`help phases`)
2044 or changesets that have children.
2044 or changesets that have children.
2045
2045
2046 See :hg:`help dates` for a list of formats valid for -d/--date.
2046 See :hg:`help dates` for a list of formats valid for -d/--date.
2047
2047
2048 Returns 0 on success, 1 if nothing changed.
2048 Returns 0 on success, 1 if nothing changed.
2049
2049
2050 .. container:: verbose
2050 .. container:: verbose
2051
2051
2052 Examples:
2052 Examples:
2053
2053
2054 - commit all files ending in .py::
2054 - commit all files ending in .py::
2055
2055
2056 hg commit --include "set:**.py"
2056 hg commit --include "set:**.py"
2057
2057
2058 - commit all non-binary files::
2058 - commit all non-binary files::
2059
2059
2060 hg commit --exclude "set:binary()"
2060 hg commit --exclude "set:binary()"
2061
2061
2062 - amend the current commit and set the date to now::
2062 - amend the current commit and set the date to now::
2063
2063
2064 hg commit --amend --date now
2064 hg commit --amend --date now
2065 """
2065 """
2066 with repo.wlock(), repo.lock():
2066 with repo.wlock(), repo.lock():
2067 return _docommit(ui, repo, *pats, **opts)
2067 return _docommit(ui, repo, *pats, **opts)
2068
2068
2069
2069
2070 def _docommit(ui, repo, *pats, **opts):
2070 def _docommit(ui, repo, *pats, **opts):
2071 if opts.get('interactive'):
2071 if opts.get('interactive'):
2072 opts.pop('interactive')
2072 opts.pop('interactive')
2073 ret = cmdutil.dorecord(
2073 ret = cmdutil.dorecord(
2074 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2074 ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
2075 )
2075 )
2076 # ret can be 0 (no changes to record) or the value returned by
2076 # ret can be 0 (no changes to record) or the value returned by
2077 # commit(), 1 if nothing changed or None on success.
2077 # commit(), 1 if nothing changed or None on success.
2078 return 1 if ret == 0 else ret
2078 return 1 if ret == 0 else ret
2079
2079
2080 if opts.get('subrepos'):
2080 if opts.get('subrepos'):
2081 cmdutil.check_incompatible_arguments(opts, 'subrepos', ['amend'])
2081 cmdutil.check_incompatible_arguments(opts, 'subrepos', ['amend'])
2082 # Let --subrepos on the command line override config setting.
2082 # Let --subrepos on the command line override config setting.
2083 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2083 ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
2084
2084
2085 cmdutil.checkunfinished(repo, commit=True)
2085 cmdutil.checkunfinished(repo, commit=True)
2086
2086
2087 branch = repo[None].branch()
2087 branch = repo[None].branch()
2088 bheads = repo.branchheads(branch)
2088 bheads = repo.branchheads(branch)
2089 tip = repo.changelog.tip()
2089 tip = repo.changelog.tip()
2090
2090
2091 extra = {}
2091 extra = {}
2092 if opts.get('close_branch') or opts.get('force_close_branch'):
2092 if opts.get('close_branch') or opts.get('force_close_branch'):
2093 extra[b'close'] = b'1'
2093 extra[b'close'] = b'1'
2094
2094
2095 if repo[b'.'].closesbranch():
2095 if repo[b'.'].closesbranch():
2096 raise error.InputError(
2096 raise error.InputError(
2097 _(b'current revision is already a branch closing head')
2097 _(b'current revision is already a branch closing head')
2098 )
2098 )
2099 elif not bheads:
2099 elif not bheads:
2100 raise error.InputError(
2100 raise error.InputError(
2101 _(b'branch "%s" has no heads to close') % branch
2101 _(b'branch "%s" has no heads to close') % branch
2102 )
2102 )
2103 elif (
2103 elif (
2104 branch == repo[b'.'].branch()
2104 branch == repo[b'.'].branch()
2105 and repo[b'.'].node() not in bheads
2105 and repo[b'.'].node() not in bheads
2106 and not opts.get('force_close_branch')
2106 and not opts.get('force_close_branch')
2107 ):
2107 ):
2108 hint = _(
2108 hint = _(
2109 b'use --force-close-branch to close branch from a non-head'
2109 b'use --force-close-branch to close branch from a non-head'
2110 b' changeset'
2110 b' changeset'
2111 )
2111 )
2112 raise error.InputError(_(b'can only close branch heads'), hint=hint)
2112 raise error.InputError(_(b'can only close branch heads'), hint=hint)
2113 elif opts.get('amend'):
2113 elif opts.get('amend'):
2114 if (
2114 if (
2115 repo[b'.'].p1().branch() != branch
2115 repo[b'.'].p1().branch() != branch
2116 and repo[b'.'].p2().branch() != branch
2116 and repo[b'.'].p2().branch() != branch
2117 ):
2117 ):
2118 raise error.InputError(_(b'can only close branch heads'))
2118 raise error.InputError(_(b'can only close branch heads'))
2119
2119
2120 if opts.get('amend'):
2120 if opts.get('amend'):
2121 if ui.configbool(b'ui', b'commitsubrepos'):
2121 if ui.configbool(b'ui', b'commitsubrepos'):
2122 raise error.InputError(
2122 raise error.InputError(
2123 _(b'cannot amend with ui.commitsubrepos enabled')
2123 _(b'cannot amend with ui.commitsubrepos enabled')
2124 )
2124 )
2125
2125
2126 old = repo[b'.']
2126 old = repo[b'.']
2127 rewriteutil.precheck(repo, [old.rev()], b'amend')
2127 rewriteutil.precheck(repo, [old.rev()], b'amend')
2128
2128
2129 # Currently histedit gets confused if an amend happens while histedit
2129 # Currently histedit gets confused if an amend happens while histedit
2130 # is in progress. Since we have a checkunfinished command, we are
2130 # is in progress. Since we have a checkunfinished command, we are
2131 # temporarily honoring it.
2131 # temporarily honoring it.
2132 #
2132 #
2133 # Note: eventually this guard will be removed. Please do not expect
2133 # Note: eventually this guard will be removed. Please do not expect
2134 # this behavior to remain.
2134 # this behavior to remain.
2135 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2135 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2136 cmdutil.checkunfinished(repo)
2136 cmdutil.checkunfinished(repo)
2137
2137
2138 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2138 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
2139 opts = pycompat.byteskwargs(opts)
2139 opts = pycompat.byteskwargs(opts)
2140 if node == old.node():
2140 if node == old.node():
2141 ui.status(_(b"nothing changed\n"))
2141 ui.status(_(b"nothing changed\n"))
2142 return 1
2142 return 1
2143 else:
2143 else:
2144
2144
2145 def commitfunc(ui, repo, message, match, opts):
2145 def commitfunc(ui, repo, message, match, opts):
2146 overrides = {}
2146 overrides = {}
2147 if opts.get(b'secret'):
2147 if opts.get(b'secret'):
2148 overrides[(b'phases', b'new-commit')] = b'secret'
2148 overrides[(b'phases', b'new-commit')] = b'secret'
2149
2149
2150 baseui = repo.baseui
2150 baseui = repo.baseui
2151 with baseui.configoverride(overrides, b'commit'):
2151 with baseui.configoverride(overrides, b'commit'):
2152 with ui.configoverride(overrides, b'commit'):
2152 with ui.configoverride(overrides, b'commit'):
2153 editform = cmdutil.mergeeditform(
2153 editform = cmdutil.mergeeditform(
2154 repo[None], b'commit.normal'
2154 repo[None], b'commit.normal'
2155 )
2155 )
2156 editor = cmdutil.getcommiteditor(
2156 editor = cmdutil.getcommiteditor(
2157 editform=editform, **pycompat.strkwargs(opts)
2157 editform=editform, **pycompat.strkwargs(opts)
2158 )
2158 )
2159 return repo.commit(
2159 return repo.commit(
2160 message,
2160 message,
2161 opts.get(b'user'),
2161 opts.get(b'user'),
2162 opts.get(b'date'),
2162 opts.get(b'date'),
2163 match,
2163 match,
2164 editor=editor,
2164 editor=editor,
2165 extra=extra,
2165 extra=extra,
2166 )
2166 )
2167
2167
2168 opts = pycompat.byteskwargs(opts)
2168 opts = pycompat.byteskwargs(opts)
2169 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2169 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
2170
2170
2171 if not node:
2171 if not node:
2172 stat = cmdutil.postcommitstatus(repo, pats, opts)
2172 stat = cmdutil.postcommitstatus(repo, pats, opts)
2173 if stat.deleted:
2173 if stat.deleted:
2174 ui.status(
2174 ui.status(
2175 _(
2175 _(
2176 b"nothing changed (%d missing files, see "
2176 b"nothing changed (%d missing files, see "
2177 b"'hg status')\n"
2177 b"'hg status')\n"
2178 )
2178 )
2179 % len(stat.deleted)
2179 % len(stat.deleted)
2180 )
2180 )
2181 else:
2181 else:
2182 ui.status(_(b"nothing changed\n"))
2182 ui.status(_(b"nothing changed\n"))
2183 return 1
2183 return 1
2184
2184
2185 cmdutil.commitstatus(repo, node, branch, bheads, tip, opts)
2185 cmdutil.commitstatus(repo, node, branch, bheads, tip, opts)
2186
2186
2187 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2187 if not ui.quiet and ui.configbool(b'commands', b'commit.post-status'):
2188 status(
2188 status(
2189 ui,
2189 ui,
2190 repo,
2190 repo,
2191 modified=True,
2191 modified=True,
2192 added=True,
2192 added=True,
2193 removed=True,
2193 removed=True,
2194 deleted=True,
2194 deleted=True,
2195 unknown=True,
2195 unknown=True,
2196 subrepos=opts.get(b'subrepos'),
2196 subrepos=opts.get(b'subrepos'),
2197 )
2197 )
2198
2198
2199
2199
2200 @command(
2200 @command(
2201 b'config|showconfig|debugconfig',
2201 b'config|showconfig|debugconfig',
2202 [
2202 [
2203 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2203 (b'u', b'untrusted', None, _(b'show untrusted configuration options')),
2204 # This is experimental because we need
2204 # This is experimental because we need
2205 # * reasonable behavior around aliases,
2205 # * reasonable behavior around aliases,
2206 # * decide if we display [debug] [experimental] and [devel] section par
2206 # * decide if we display [debug] [experimental] and [devel] section par
2207 # default
2207 # default
2208 # * some way to display "generic" config entry (the one matching
2208 # * some way to display "generic" config entry (the one matching
2209 # regexp,
2209 # regexp,
2210 # * proper display of the different value type
2210 # * proper display of the different value type
2211 # * a better way to handle <DYNAMIC> values (and variable types),
2211 # * a better way to handle <DYNAMIC> values (and variable types),
2212 # * maybe some type information ?
2212 # * maybe some type information ?
2213 (
2213 (
2214 b'',
2214 b'',
2215 b'exp-all-known',
2215 b'exp-all-known',
2216 None,
2216 None,
2217 _(b'show all known config option (EXPERIMENTAL)'),
2217 _(b'show all known config option (EXPERIMENTAL)'),
2218 ),
2218 ),
2219 (b'e', b'edit', None, _(b'edit user config')),
2219 (b'e', b'edit', None, _(b'edit user config')),
2220 (b'l', b'local', None, _(b'edit repository config')),
2220 (b'l', b'local', None, _(b'edit repository config')),
2221 (b'', b'source', None, _(b'show source of configuration value')),
2221 (b'', b'source', None, _(b'show source of configuration value')),
2222 (
2222 (
2223 b'',
2223 b'',
2224 b'shared',
2224 b'shared',
2225 None,
2225 None,
2226 _(b'edit shared source repository config (EXPERIMENTAL)'),
2226 _(b'edit shared source repository config (EXPERIMENTAL)'),
2227 ),
2227 ),
2228 (b'', b'non-shared', None, _(b'edit non shared config (EXPERIMENTAL)')),
2228 (b'', b'non-shared', None, _(b'edit non shared config (EXPERIMENTAL)')),
2229 (b'g', b'global', None, _(b'edit global config')),
2229 (b'g', b'global', None, _(b'edit global config')),
2230 ]
2230 ]
2231 + formatteropts,
2231 + formatteropts,
2232 _(b'[-u] [NAME]...'),
2232 _(b'[-u] [NAME]...'),
2233 helpcategory=command.CATEGORY_HELP,
2233 helpcategory=command.CATEGORY_HELP,
2234 optionalrepo=True,
2234 optionalrepo=True,
2235 intents={INTENT_READONLY},
2235 intents={INTENT_READONLY},
2236 )
2236 )
2237 def config(ui, repo, *values, **opts):
2237 def config(ui, repo, *values, **opts):
2238 """show combined config settings from all hgrc files
2238 """show combined config settings from all hgrc files
2239
2239
2240 With no arguments, print names and values of all config items.
2240 With no arguments, print names and values of all config items.
2241
2241
2242 With one argument of the form section.name, print just the value
2242 With one argument of the form section.name, print just the value
2243 of that config item.
2243 of that config item.
2244
2244
2245 With multiple arguments, print names and values of all config
2245 With multiple arguments, print names and values of all config
2246 items with matching section names or section.names.
2246 items with matching section names or section.names.
2247
2247
2248 With --edit, start an editor on the user-level config file. With
2248 With --edit, start an editor on the user-level config file. With
2249 --global, edit the system-wide config file. With --local, edit the
2249 --global, edit the system-wide config file. With --local, edit the
2250 repository-level config file.
2250 repository-level config file.
2251
2251
2252 With --source, the source (filename and line number) is printed
2252 With --source, the source (filename and line number) is printed
2253 for each config item.
2253 for each config item.
2254
2254
2255 See :hg:`help config` for more information about config files.
2255 See :hg:`help config` for more information about config files.
2256
2256
2257 .. container:: verbose
2257 .. container:: verbose
2258
2258
2259 --non-shared flag is used to edit `.hg/hgrc-not-shared` config file.
2259 --non-shared flag is used to edit `.hg/hgrc-not-shared` config file.
2260 This file is not shared across shares when in share-safe mode.
2260 This file is not shared across shares when in share-safe mode.
2261
2261
2262 Template:
2262 Template:
2263
2263
2264 The following keywords are supported. See also :hg:`help templates`.
2264 The following keywords are supported. See also :hg:`help templates`.
2265
2265
2266 :name: String. Config name.
2266 :name: String. Config name.
2267 :source: String. Filename and line number where the item is defined.
2267 :source: String. Filename and line number where the item is defined.
2268 :value: String. Config value.
2268 :value: String. Config value.
2269
2269
2270 The --shared flag can be used to edit the config file of shared source
2270 The --shared flag can be used to edit the config file of shared source
2271 repository. It only works when you have shared using the experimental
2271 repository. It only works when you have shared using the experimental
2272 share safe feature.
2272 share safe feature.
2273
2273
2274 Returns 0 on success, 1 if NAME does not exist.
2274 Returns 0 on success, 1 if NAME does not exist.
2275
2275
2276 """
2276 """
2277
2277
2278 opts = pycompat.byteskwargs(opts)
2278 opts = pycompat.byteskwargs(opts)
2279 editopts = (b'edit', b'local', b'global', b'shared', b'non_shared')
2279 editopts = (b'edit', b'local', b'global', b'shared', b'non_shared')
2280 if any(opts.get(o) for o in editopts):
2280 if any(opts.get(o) for o in editopts):
2281 cmdutil.check_at_most_one_arg(opts, *editopts[1:])
2281 cmdutil.check_at_most_one_arg(opts, *editopts[1:])
2282 if opts.get(b'local'):
2282 if opts.get(b'local'):
2283 if not repo:
2283 if not repo:
2284 raise error.InputError(
2284 raise error.InputError(
2285 _(b"can't use --local outside a repository")
2285 _(b"can't use --local outside a repository")
2286 )
2286 )
2287 paths = [repo.vfs.join(b'hgrc')]
2287 paths = [repo.vfs.join(b'hgrc')]
2288 elif opts.get(b'global'):
2288 elif opts.get(b'global'):
2289 paths = rcutil.systemrcpath()
2289 paths = rcutil.systemrcpath()
2290 elif opts.get(b'shared'):
2290 elif opts.get(b'shared'):
2291 if not repo.shared():
2291 if not repo.shared():
2292 raise error.InputError(
2292 raise error.InputError(
2293 _(b"repository is not shared; can't use --shared")
2293 _(b"repository is not shared; can't use --shared")
2294 )
2294 )
2295 if requirements.SHARESAFE_REQUIREMENT not in repo.requirements:
2295 if requirements.SHARESAFE_REQUIREMENT not in repo.requirements:
2296 raise error.InputError(
2296 raise error.InputError(
2297 _(
2297 _(
2298 b"share safe feature not enabled; "
2298 b"share safe feature not enabled; "
2299 b"unable to edit shared source repository config"
2299 b"unable to edit shared source repository config"
2300 )
2300 )
2301 )
2301 )
2302 paths = [vfsmod.vfs(repo.sharedpath).join(b'hgrc')]
2302 paths = [vfsmod.vfs(repo.sharedpath).join(b'hgrc')]
2303 elif opts.get(b'non_shared'):
2303 elif opts.get(b'non_shared'):
2304 paths = [repo.vfs.join(b'hgrc-not-shared')]
2304 paths = [repo.vfs.join(b'hgrc-not-shared')]
2305 else:
2305 else:
2306 paths = rcutil.userrcpath()
2306 paths = rcutil.userrcpath()
2307
2307
2308 for f in paths:
2308 for f in paths:
2309 if os.path.exists(f):
2309 if os.path.exists(f):
2310 break
2310 break
2311 else:
2311 else:
2312 if opts.get(b'global'):
2312 if opts.get(b'global'):
2313 samplehgrc = uimod.samplehgrcs[b'global']
2313 samplehgrc = uimod.samplehgrcs[b'global']
2314 elif opts.get(b'local'):
2314 elif opts.get(b'local'):
2315 samplehgrc = uimod.samplehgrcs[b'local']
2315 samplehgrc = uimod.samplehgrcs[b'local']
2316 else:
2316 else:
2317 samplehgrc = uimod.samplehgrcs[b'user']
2317 samplehgrc = uimod.samplehgrcs[b'user']
2318
2318
2319 f = paths[0]
2319 f = paths[0]
2320 fp = open(f, b"wb")
2320 fp = open(f, b"wb")
2321 fp.write(util.tonativeeol(samplehgrc))
2321 fp.write(util.tonativeeol(samplehgrc))
2322 fp.close()
2322 fp.close()
2323
2323
2324 editor = ui.geteditor()
2324 editor = ui.geteditor()
2325 ui.system(
2325 ui.system(
2326 b"%s \"%s\"" % (editor, f),
2326 b"%s \"%s\"" % (editor, f),
2327 onerr=error.InputError,
2327 onerr=error.InputError,
2328 errprefix=_(b"edit failed"),
2328 errprefix=_(b"edit failed"),
2329 blockedtag=b'config_edit',
2329 blockedtag=b'config_edit',
2330 )
2330 )
2331 return
2331 return
2332 ui.pager(b'config')
2332 ui.pager(b'config')
2333 fm = ui.formatter(b'config', opts)
2333 fm = ui.formatter(b'config', opts)
2334 for t, f in rcutil.rccomponents():
2334 for t, f in rcutil.rccomponents():
2335 if t == b'path':
2335 if t == b'path':
2336 ui.debug(b'read config from: %s\n' % f)
2336 ui.debug(b'read config from: %s\n' % f)
2337 elif t == b'resource':
2337 elif t == b'resource':
2338 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2338 ui.debug(b'read config from: resource:%s.%s\n' % (f[0], f[1]))
2339 elif t == b'items':
2339 elif t == b'items':
2340 # Don't print anything for 'items'.
2340 # Don't print anything for 'items'.
2341 pass
2341 pass
2342 else:
2342 else:
2343 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2343 raise error.ProgrammingError(b'unknown rctype: %s' % t)
2344 untrusted = bool(opts.get(b'untrusted'))
2344 untrusted = bool(opts.get(b'untrusted'))
2345
2345
2346 selsections = selentries = []
2346 selsections = selentries = []
2347 if values:
2347 if values:
2348 selsections = [v for v in values if b'.' not in v]
2348 selsections = [v for v in values if b'.' not in v]
2349 selentries = [v for v in values if b'.' in v]
2349 selentries = [v for v in values if b'.' in v]
2350 uniquesel = len(selentries) == 1 and not selsections
2350 uniquesel = len(selentries) == 1 and not selsections
2351 selsections = set(selsections)
2351 selsections = set(selsections)
2352 selentries = set(selentries)
2352 selentries = set(selentries)
2353
2353
2354 matched = False
2354 matched = False
2355 all_known = opts[b'exp_all_known']
2355 all_known = opts[b'exp_all_known']
2356 show_source = ui.debugflag or opts.get(b'source')
2356 show_source = ui.debugflag or opts.get(b'source')
2357 entries = ui.walkconfig(untrusted=untrusted, all_known=all_known)
2357 entries = ui.walkconfig(untrusted=untrusted, all_known=all_known)
2358 for section, name, value in entries:
2358 for section, name, value in entries:
2359 source = ui.configsource(section, name, untrusted)
2359 source = ui.configsource(section, name, untrusted)
2360 value = pycompat.bytestr(value)
2360 value = pycompat.bytestr(value)
2361 defaultvalue = ui.configdefault(section, name)
2361 defaultvalue = ui.configdefault(section, name)
2362 if fm.isplain():
2362 if fm.isplain():
2363 source = source or b'none'
2363 source = source or b'none'
2364 value = value.replace(b'\n', b'\\n')
2364 value = value.replace(b'\n', b'\\n')
2365 entryname = section + b'.' + name
2365 entryname = section + b'.' + name
2366 if values and not (section in selsections or entryname in selentries):
2366 if values and not (section in selsections or entryname in selentries):
2367 continue
2367 continue
2368 fm.startitem()
2368 fm.startitem()
2369 fm.condwrite(show_source, b'source', b'%s: ', source)
2369 fm.condwrite(show_source, b'source', b'%s: ', source)
2370 if uniquesel:
2370 if uniquesel:
2371 fm.data(name=entryname)
2371 fm.data(name=entryname)
2372 fm.write(b'value', b'%s\n', value)
2372 fm.write(b'value', b'%s\n', value)
2373 else:
2373 else:
2374 fm.write(b'name value', b'%s=%s\n', entryname, value)
2374 fm.write(b'name value', b'%s=%s\n', entryname, value)
2375 if formatter.isprintable(defaultvalue):
2375 if formatter.isprintable(defaultvalue):
2376 fm.data(defaultvalue=defaultvalue)
2376 fm.data(defaultvalue=defaultvalue)
2377 elif isinstance(defaultvalue, list) and all(
2377 elif isinstance(defaultvalue, list) and all(
2378 formatter.isprintable(e) for e in defaultvalue
2378 formatter.isprintable(e) for e in defaultvalue
2379 ):
2379 ):
2380 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2380 fm.data(defaultvalue=fm.formatlist(defaultvalue, name=b'value'))
2381 # TODO: no idea how to process unsupported defaultvalue types
2381 # TODO: no idea how to process unsupported defaultvalue types
2382 matched = True
2382 matched = True
2383 fm.end()
2383 fm.end()
2384 if matched:
2384 if matched:
2385 return 0
2385 return 0
2386 return 1
2386 return 1
2387
2387
2388
2388
2389 @command(
2389 @command(
2390 b'continue',
2390 b'continue',
2391 dryrunopts,
2391 dryrunopts,
2392 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2392 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2393 helpbasic=True,
2393 helpbasic=True,
2394 )
2394 )
2395 def continuecmd(ui, repo, **opts):
2395 def continuecmd(ui, repo, **opts):
2396 """resumes an interrupted operation (EXPERIMENTAL)
2396 """resumes an interrupted operation (EXPERIMENTAL)
2397
2397
2398 Finishes a multistep operation like graft, histedit, rebase, merge,
2398 Finishes a multistep operation like graft, histedit, rebase, merge,
2399 and unshelve if they are in an interrupted state.
2399 and unshelve if they are in an interrupted state.
2400
2400
2401 use --dry-run/-n to dry run the command.
2401 use --dry-run/-n to dry run the command.
2402 """
2402 """
2403 dryrun = opts.get('dry_run')
2403 dryrun = opts.get('dry_run')
2404 contstate = cmdutil.getunfinishedstate(repo)
2404 contstate = cmdutil.getunfinishedstate(repo)
2405 if not contstate:
2405 if not contstate:
2406 raise error.StateError(_(b'no operation in progress'))
2406 raise error.StateError(_(b'no operation in progress'))
2407 if not contstate.continuefunc:
2407 if not contstate.continuefunc:
2408 raise error.StateError(
2408 raise error.StateError(
2409 (
2409 (
2410 _(b"%s in progress but does not support 'hg continue'")
2410 _(b"%s in progress but does not support 'hg continue'")
2411 % (contstate._opname)
2411 % (contstate._opname)
2412 ),
2412 ),
2413 hint=contstate.continuemsg(),
2413 hint=contstate.continuemsg(),
2414 )
2414 )
2415 if dryrun:
2415 if dryrun:
2416 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2416 ui.status(_(b'%s in progress, will be resumed\n') % (contstate._opname))
2417 return
2417 return
2418 return contstate.continuefunc(ui, repo)
2418 return contstate.continuefunc(ui, repo)
2419
2419
2420
2420
2421 @command(
2421 @command(
2422 b'copy|cp',
2422 b'copy|cp',
2423 [
2423 [
2424 (b'', b'forget', None, _(b'unmark a destination file as copied')),
2424 (b'', b'forget', None, _(b'unmark a destination file as copied')),
2425 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2425 (b'A', b'after', None, _(b'record a copy that has already occurred')),
2426 (
2426 (
2427 b'',
2427 b'',
2428 b'at-rev',
2428 b'at-rev',
2429 b'',
2429 b'',
2430 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2430 _(b'(un)mark copies in the given revision (EXPERIMENTAL)'),
2431 _(b'REV'),
2431 _(b'REV'),
2432 ),
2432 ),
2433 (
2433 (
2434 b'f',
2434 b'f',
2435 b'force',
2435 b'force',
2436 None,
2436 None,
2437 _(b'forcibly copy over an existing managed file'),
2437 _(b'forcibly copy over an existing managed file'),
2438 ),
2438 ),
2439 ]
2439 ]
2440 + walkopts
2440 + walkopts
2441 + dryrunopts,
2441 + dryrunopts,
2442 _(b'[OPTION]... (SOURCE... DEST | --forget DEST...)'),
2442 _(b'[OPTION]... (SOURCE... DEST | --forget DEST...)'),
2443 helpcategory=command.CATEGORY_FILE_CONTENTS,
2443 helpcategory=command.CATEGORY_FILE_CONTENTS,
2444 )
2444 )
2445 def copy(ui, repo, *pats, **opts):
2445 def copy(ui, repo, *pats, **opts):
2446 """mark files as copied for the next commit
2446 """mark files as copied for the next commit
2447
2447
2448 Mark dest as having copies of source files. If dest is a
2448 Mark dest as having copies of source files. If dest is a
2449 directory, copies are put in that directory. If dest is a file,
2449 directory, copies are put in that directory. If dest is a file,
2450 the source must be a single file.
2450 the source must be a single file.
2451
2451
2452 By default, this command copies the contents of files as they
2452 By default, this command copies the contents of files as they
2453 exist in the working directory. If invoked with -A/--after, the
2453 exist in the working directory. If invoked with -A/--after, the
2454 operation is recorded, but no copying is performed.
2454 operation is recorded, but no copying is performed.
2455
2455
2456 To undo marking a destination file as copied, use --forget. With that
2456 To undo marking a destination file as copied, use --forget. With that
2457 option, all given (positional) arguments are unmarked as copies. The
2457 option, all given (positional) arguments are unmarked as copies. The
2458 destination file(s) will be left in place (still tracked). Note that
2458 destination file(s) will be left in place (still tracked). Note that
2459 :hg:`copy --forget` behaves the same way as :hg:`rename --forget`.
2459 :hg:`copy --forget` behaves the same way as :hg:`rename --forget`.
2460
2460
2461 This command takes effect with the next commit by default.
2461 This command takes effect with the next commit by default.
2462
2462
2463 Returns 0 on success, 1 if errors are encountered.
2463 Returns 0 on success, 1 if errors are encountered.
2464 """
2464 """
2465 opts = pycompat.byteskwargs(opts)
2465 opts = pycompat.byteskwargs(opts)
2466 with repo.wlock():
2466 with repo.wlock():
2467 return cmdutil.copy(ui, repo, pats, opts)
2467 return cmdutil.copy(ui, repo, pats, opts)
2468
2468
2469
2469
2470 @command(
2470 @command(
2471 b'debugcommands',
2471 b'debugcommands',
2472 [],
2472 [],
2473 _(b'[COMMAND]'),
2473 _(b'[COMMAND]'),
2474 helpcategory=command.CATEGORY_HELP,
2474 helpcategory=command.CATEGORY_HELP,
2475 norepo=True,
2475 norepo=True,
2476 )
2476 )
2477 def debugcommands(ui, cmd=b'', *args):
2477 def debugcommands(ui, cmd=b'', *args):
2478 """list all available commands and options"""
2478 """list all available commands and options"""
2479 for cmd, vals in sorted(pycompat.iteritems(table)):
2479 for cmd, vals in sorted(pycompat.iteritems(table)):
2480 cmd = cmd.split(b'|')[0]
2480 cmd = cmd.split(b'|')[0]
2481 opts = b', '.join([i[1] for i in vals[1]])
2481 opts = b', '.join([i[1] for i in vals[1]])
2482 ui.write(b'%s: %s\n' % (cmd, opts))
2482 ui.write(b'%s: %s\n' % (cmd, opts))
2483
2483
2484
2484
2485 @command(
2485 @command(
2486 b'debugcomplete',
2486 b'debugcomplete',
2487 [(b'o', b'options', None, _(b'show the command options'))],
2487 [(b'o', b'options', None, _(b'show the command options'))],
2488 _(b'[-o] CMD'),
2488 _(b'[-o] CMD'),
2489 helpcategory=command.CATEGORY_HELP,
2489 helpcategory=command.CATEGORY_HELP,
2490 norepo=True,
2490 norepo=True,
2491 )
2491 )
2492 def debugcomplete(ui, cmd=b'', **opts):
2492 def debugcomplete(ui, cmd=b'', **opts):
2493 """returns the completion list associated with the given command"""
2493 """returns the completion list associated with the given command"""
2494
2494
2495 if opts.get('options'):
2495 if opts.get('options'):
2496 options = []
2496 options = []
2497 otables = [globalopts]
2497 otables = [globalopts]
2498 if cmd:
2498 if cmd:
2499 aliases, entry = cmdutil.findcmd(cmd, table, False)
2499 aliases, entry = cmdutil.findcmd(cmd, table, False)
2500 otables.append(entry[1])
2500 otables.append(entry[1])
2501 for t in otables:
2501 for t in otables:
2502 for o in t:
2502 for o in t:
2503 if b"(DEPRECATED)" in o[3]:
2503 if b"(DEPRECATED)" in o[3]:
2504 continue
2504 continue
2505 if o[0]:
2505 if o[0]:
2506 options.append(b'-%s' % o[0])
2506 options.append(b'-%s' % o[0])
2507 options.append(b'--%s' % o[1])
2507 options.append(b'--%s' % o[1])
2508 ui.write(b"%s\n" % b"\n".join(options))
2508 ui.write(b"%s\n" % b"\n".join(options))
2509 return
2509 return
2510
2510
2511 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2511 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
2512 if ui.verbose:
2512 if ui.verbose:
2513 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2513 cmdlist = [b' '.join(c[0]) for c in cmdlist.values()]
2514 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2514 ui.write(b"%s\n" % b"\n".join(sorted(cmdlist)))
2515
2515
2516
2516
2517 @command(
2517 @command(
2518 b'diff',
2518 b'diff',
2519 [
2519 [
2520 (b'r', b'rev', [], _(b'revision (DEPRECATED)'), _(b'REV')),
2520 (b'r', b'rev', [], _(b'revision (DEPRECATED)'), _(b'REV')),
2521 (b'', b'from', b'', _(b'revision to diff from'), _(b'REV1')),
2521 (b'', b'from', b'', _(b'revision to diff from'), _(b'REV1')),
2522 (b'', b'to', b'', _(b'revision to diff to'), _(b'REV2')),
2522 (b'', b'to', b'', _(b'revision to diff to'), _(b'REV2')),
2523 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2523 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2524 ]
2524 ]
2525 + diffopts
2525 + diffopts
2526 + diffopts2
2526 + diffopts2
2527 + walkopts
2527 + walkopts
2528 + subrepoopts,
2528 + subrepoopts,
2529 _(b'[OPTION]... ([-c REV] | [--from REV1] [--to REV2]) [FILE]...'),
2529 _(b'[OPTION]... ([-c REV] | [--from REV1] [--to REV2]) [FILE]...'),
2530 helpcategory=command.CATEGORY_FILE_CONTENTS,
2530 helpcategory=command.CATEGORY_FILE_CONTENTS,
2531 helpbasic=True,
2531 helpbasic=True,
2532 inferrepo=True,
2532 inferrepo=True,
2533 intents={INTENT_READONLY},
2533 intents={INTENT_READONLY},
2534 )
2534 )
2535 def diff(ui, repo, *pats, **opts):
2535 def diff(ui, repo, *pats, **opts):
2536 """diff repository (or selected files)
2536 """diff repository (or selected files)
2537
2537
2538 Show differences between revisions for the specified files.
2538 Show differences between revisions for the specified files.
2539
2539
2540 Differences between files are shown using the unified diff format.
2540 Differences between files are shown using the unified diff format.
2541
2541
2542 .. note::
2542 .. note::
2543
2543
2544 :hg:`diff` may generate unexpected results for merges, as it will
2544 :hg:`diff` may generate unexpected results for merges, as it will
2545 default to comparing against the working directory's first
2545 default to comparing against the working directory's first
2546 parent changeset if no revisions are specified.
2546 parent changeset if no revisions are specified.
2547
2547
2548 By default, the working directory files are compared to its first parent. To
2548 By default, the working directory files are compared to its first parent. To
2549 see the differences from another revision, use --from. To see the difference
2549 see the differences from another revision, use --from. To see the difference
2550 to another revision, use --to. For example, :hg:`diff --from .^` will show
2550 to another revision, use --to. For example, :hg:`diff --from .^` will show
2551 the differences from the working copy's grandparent to the working copy,
2551 the differences from the working copy's grandparent to the working copy,
2552 :hg:`diff --to .` will show the diff from the working copy to its parent
2552 :hg:`diff --to .` will show the diff from the working copy to its parent
2553 (i.e. the reverse of the default), and :hg:`diff --from 1.0 --to 1.2` will
2553 (i.e. the reverse of the default), and :hg:`diff --from 1.0 --to 1.2` will
2554 show the diff between those two revisions.
2554 show the diff between those two revisions.
2555
2555
2556 Alternatively you can specify -c/--change with a revision to see the changes
2556 Alternatively you can specify -c/--change with a revision to see the changes
2557 in that changeset relative to its first parent (i.e. :hg:`diff -c 42` is
2557 in that changeset relative to its first parent (i.e. :hg:`diff -c 42` is
2558 equivalent to :hg:`diff --from 42^ --to 42`)
2558 equivalent to :hg:`diff --from 42^ --to 42`)
2559
2559
2560 Without the -a/--text option, diff will avoid generating diffs of
2560 Without the -a/--text option, diff will avoid generating diffs of
2561 files it detects as binary. With -a, diff will generate a diff
2561 files it detects as binary. With -a, diff will generate a diff
2562 anyway, probably with undesirable results.
2562 anyway, probably with undesirable results.
2563
2563
2564 Use the -g/--git option to generate diffs in the git extended diff
2564 Use the -g/--git option to generate diffs in the git extended diff
2565 format. For more information, read :hg:`help diffs`.
2565 format. For more information, read :hg:`help diffs`.
2566
2566
2567 .. container:: verbose
2567 .. container:: verbose
2568
2568
2569 Examples:
2569 Examples:
2570
2570
2571 - compare a file in the current working directory to its parent::
2571 - compare a file in the current working directory to its parent::
2572
2572
2573 hg diff foo.c
2573 hg diff foo.c
2574
2574
2575 - compare two historical versions of a directory, with rename info::
2575 - compare two historical versions of a directory, with rename info::
2576
2576
2577 hg diff --git --from 1.0 --to 1.2 lib/
2577 hg diff --git --from 1.0 --to 1.2 lib/
2578
2578
2579 - get change stats relative to the last change on some date::
2579 - get change stats relative to the last change on some date::
2580
2580
2581 hg diff --stat --from "date('may 2')"
2581 hg diff --stat --from "date('may 2')"
2582
2582
2583 - diff all newly-added files that contain a keyword::
2583 - diff all newly-added files that contain a keyword::
2584
2584
2585 hg diff "set:added() and grep(GNU)"
2585 hg diff "set:added() and grep(GNU)"
2586
2586
2587 - compare a revision and its parents::
2587 - compare a revision and its parents::
2588
2588
2589 hg diff -c 9353 # compare against first parent
2589 hg diff -c 9353 # compare against first parent
2590 hg diff --from 9353^ --to 9353 # same using revset syntax
2590 hg diff --from 9353^ --to 9353 # same using revset syntax
2591 hg diff --from 9353^2 --to 9353 # compare against the second parent
2591 hg diff --from 9353^2 --to 9353 # compare against the second parent
2592
2592
2593 Returns 0 on success.
2593 Returns 0 on success.
2594 """
2594 """
2595
2595
2596 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2596 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
2597 opts = pycompat.byteskwargs(opts)
2597 opts = pycompat.byteskwargs(opts)
2598 revs = opts.get(b'rev')
2598 revs = opts.get(b'rev')
2599 change = opts.get(b'change')
2599 change = opts.get(b'change')
2600 from_rev = opts.get(b'from')
2600 from_rev = opts.get(b'from')
2601 to_rev = opts.get(b'to')
2601 to_rev = opts.get(b'to')
2602 stat = opts.get(b'stat')
2602 stat = opts.get(b'stat')
2603 reverse = opts.get(b'reverse')
2603 reverse = opts.get(b'reverse')
2604
2604
2605 cmdutil.check_incompatible_arguments(opts, b'from', [b'rev', b'change'])
2605 cmdutil.check_incompatible_arguments(opts, b'from', [b'rev', b'change'])
2606 cmdutil.check_incompatible_arguments(opts, b'to', [b'rev', b'change'])
2606 cmdutil.check_incompatible_arguments(opts, b'to', [b'rev', b'change'])
2607 if change:
2607 if change:
2608 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2608 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
2609 ctx2 = scmutil.revsingle(repo, change, None)
2609 ctx2 = scmutil.revsingle(repo, change, None)
2610 ctx1 = logcmdutil.diff_parent(ctx2)
2610 ctx1 = logcmdutil.diff_parent(ctx2)
2611 elif from_rev or to_rev:
2611 elif from_rev or to_rev:
2612 repo = scmutil.unhidehashlikerevs(
2612 repo = scmutil.unhidehashlikerevs(
2613 repo, [from_rev] + [to_rev], b'nowarn'
2613 repo, [from_rev] + [to_rev], b'nowarn'
2614 )
2614 )
2615 ctx1 = scmutil.revsingle(repo, from_rev, None)
2615 ctx1 = scmutil.revsingle(repo, from_rev, None)
2616 ctx2 = scmutil.revsingle(repo, to_rev, None)
2616 ctx2 = scmutil.revsingle(repo, to_rev, None)
2617 else:
2617 else:
2618 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2618 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
2619 ctx1, ctx2 = scmutil.revpair(repo, revs)
2619 ctx1, ctx2 = scmutil.revpair(repo, revs)
2620
2620
2621 if reverse:
2621 if reverse:
2622 ctxleft = ctx2
2622 ctxleft = ctx2
2623 ctxright = ctx1
2623 ctxright = ctx1
2624 else:
2624 else:
2625 ctxleft = ctx1
2625 ctxleft = ctx1
2626 ctxright = ctx2
2626 ctxright = ctx2
2627
2627
2628 diffopts = patch.diffallopts(ui, opts)
2628 diffopts = patch.diffallopts(ui, opts)
2629 m = scmutil.match(ctx2, pats, opts)
2629 m = scmutil.match(ctx2, pats, opts)
2630 m = repo.narrowmatch(m)
2630 m = repo.narrowmatch(m)
2631 ui.pager(b'diff')
2631 ui.pager(b'diff')
2632 logcmdutil.diffordiffstat(
2632 logcmdutil.diffordiffstat(
2633 ui,
2633 ui,
2634 repo,
2634 repo,
2635 diffopts,
2635 diffopts,
2636 ctxleft,
2636 ctxleft,
2637 ctxright,
2637 ctxright,
2638 m,
2638 m,
2639 stat=stat,
2639 stat=stat,
2640 listsubrepos=opts.get(b'subrepos'),
2640 listsubrepos=opts.get(b'subrepos'),
2641 root=opts.get(b'root'),
2641 root=opts.get(b'root'),
2642 )
2642 )
2643
2643
2644
2644
2645 @command(
2645 @command(
2646 b'export',
2646 b'export',
2647 [
2647 [
2648 (
2648 (
2649 b'B',
2649 b'B',
2650 b'bookmark',
2650 b'bookmark',
2651 b'',
2651 b'',
2652 _(b'export changes only reachable by given bookmark'),
2652 _(b'export changes only reachable by given bookmark'),
2653 _(b'BOOKMARK'),
2653 _(b'BOOKMARK'),
2654 ),
2654 ),
2655 (
2655 (
2656 b'o',
2656 b'o',
2657 b'output',
2657 b'output',
2658 b'',
2658 b'',
2659 _(b'print output to file with formatted name'),
2659 _(b'print output to file with formatted name'),
2660 _(b'FORMAT'),
2660 _(b'FORMAT'),
2661 ),
2661 ),
2662 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2662 (b'', b'switch-parent', None, _(b'diff against the second parent')),
2663 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2663 (b'r', b'rev', [], _(b'revisions to export'), _(b'REV')),
2664 ]
2664 ]
2665 + diffopts
2665 + diffopts
2666 + formatteropts,
2666 + formatteropts,
2667 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2667 _(b'[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2668 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2668 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2669 helpbasic=True,
2669 helpbasic=True,
2670 intents={INTENT_READONLY},
2670 intents={INTENT_READONLY},
2671 )
2671 )
2672 def export(ui, repo, *changesets, **opts):
2672 def export(ui, repo, *changesets, **opts):
2673 """dump the header and diffs for one or more changesets
2673 """dump the header and diffs for one or more changesets
2674
2674
2675 Print the changeset header and diffs for one or more revisions.
2675 Print the changeset header and diffs for one or more revisions.
2676 If no revision is given, the parent of the working directory is used.
2676 If no revision is given, the parent of the working directory is used.
2677
2677
2678 The information shown in the changeset header is: author, date,
2678 The information shown in the changeset header is: author, date,
2679 branch name (if non-default), changeset hash, parent(s) and commit
2679 branch name (if non-default), changeset hash, parent(s) and commit
2680 comment.
2680 comment.
2681
2681
2682 .. note::
2682 .. note::
2683
2683
2684 :hg:`export` may generate unexpected diff output for merge
2684 :hg:`export` may generate unexpected diff output for merge
2685 changesets, as it will compare the merge changeset against its
2685 changesets, as it will compare the merge changeset against its
2686 first parent only.
2686 first parent only.
2687
2687
2688 Output may be to a file, in which case the name of the file is
2688 Output may be to a file, in which case the name of the file is
2689 given using a template string. See :hg:`help templates`. In addition
2689 given using a template string. See :hg:`help templates`. In addition
2690 to the common template keywords, the following formatting rules are
2690 to the common template keywords, the following formatting rules are
2691 supported:
2691 supported:
2692
2692
2693 :``%%``: literal "%" character
2693 :``%%``: literal "%" character
2694 :``%H``: changeset hash (40 hexadecimal digits)
2694 :``%H``: changeset hash (40 hexadecimal digits)
2695 :``%N``: number of patches being generated
2695 :``%N``: number of patches being generated
2696 :``%R``: changeset revision number
2696 :``%R``: changeset revision number
2697 :``%b``: basename of the exporting repository
2697 :``%b``: basename of the exporting repository
2698 :``%h``: short-form changeset hash (12 hexadecimal digits)
2698 :``%h``: short-form changeset hash (12 hexadecimal digits)
2699 :``%m``: first line of the commit message (only alphanumeric characters)
2699 :``%m``: first line of the commit message (only alphanumeric characters)
2700 :``%n``: zero-padded sequence number, starting at 1
2700 :``%n``: zero-padded sequence number, starting at 1
2701 :``%r``: zero-padded changeset revision number
2701 :``%r``: zero-padded changeset revision number
2702 :``\\``: literal "\\" character
2702 :``\\``: literal "\\" character
2703
2703
2704 Without the -a/--text option, export will avoid generating diffs
2704 Without the -a/--text option, export will avoid generating diffs
2705 of files it detects as binary. With -a, export will generate a
2705 of files it detects as binary. With -a, export will generate a
2706 diff anyway, probably with undesirable results.
2706 diff anyway, probably with undesirable results.
2707
2707
2708 With -B/--bookmark changesets reachable by the given bookmark are
2708 With -B/--bookmark changesets reachable by the given bookmark are
2709 selected.
2709 selected.
2710
2710
2711 Use the -g/--git option to generate diffs in the git extended diff
2711 Use the -g/--git option to generate diffs in the git extended diff
2712 format. See :hg:`help diffs` for more information.
2712 format. See :hg:`help diffs` for more information.
2713
2713
2714 With the --switch-parent option, the diff will be against the
2714 With the --switch-parent option, the diff will be against the
2715 second parent. It can be useful to review a merge.
2715 second parent. It can be useful to review a merge.
2716
2716
2717 .. container:: verbose
2717 .. container:: verbose
2718
2718
2719 Template:
2719 Template:
2720
2720
2721 The following keywords are supported in addition to the common template
2721 The following keywords are supported in addition to the common template
2722 keywords and functions. See also :hg:`help templates`.
2722 keywords and functions. See also :hg:`help templates`.
2723
2723
2724 :diff: String. Diff content.
2724 :diff: String. Diff content.
2725 :parents: List of strings. Parent nodes of the changeset.
2725 :parents: List of strings. Parent nodes of the changeset.
2726
2726
2727 Examples:
2727 Examples:
2728
2728
2729 - use export and import to transplant a bugfix to the current
2729 - use export and import to transplant a bugfix to the current
2730 branch::
2730 branch::
2731
2731
2732 hg export -r 9353 | hg import -
2732 hg export -r 9353 | hg import -
2733
2733
2734 - export all the changesets between two revisions to a file with
2734 - export all the changesets between two revisions to a file with
2735 rename information::
2735 rename information::
2736
2736
2737 hg export --git -r 123:150 > changes.txt
2737 hg export --git -r 123:150 > changes.txt
2738
2738
2739 - split outgoing changes into a series of patches with
2739 - split outgoing changes into a series of patches with
2740 descriptive names::
2740 descriptive names::
2741
2741
2742 hg export -r "outgoing()" -o "%n-%m.patch"
2742 hg export -r "outgoing()" -o "%n-%m.patch"
2743
2743
2744 Returns 0 on success.
2744 Returns 0 on success.
2745 """
2745 """
2746 opts = pycompat.byteskwargs(opts)
2746 opts = pycompat.byteskwargs(opts)
2747 bookmark = opts.get(b'bookmark')
2747 bookmark = opts.get(b'bookmark')
2748 changesets += tuple(opts.get(b'rev', []))
2748 changesets += tuple(opts.get(b'rev', []))
2749
2749
2750 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2750 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
2751
2751
2752 if bookmark:
2752 if bookmark:
2753 if bookmark not in repo._bookmarks:
2753 if bookmark not in repo._bookmarks:
2754 raise error.InputError(_(b"bookmark '%s' not found") % bookmark)
2754 raise error.InputError(_(b"bookmark '%s' not found") % bookmark)
2755
2755
2756 revs = scmutil.bookmarkrevs(repo, bookmark)
2756 revs = scmutil.bookmarkrevs(repo, bookmark)
2757 else:
2757 else:
2758 if not changesets:
2758 if not changesets:
2759 changesets = [b'.']
2759 changesets = [b'.']
2760
2760
2761 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2761 repo = scmutil.unhidehashlikerevs(repo, changesets, b'nowarn')
2762 revs = scmutil.revrange(repo, changesets)
2762 revs = scmutil.revrange(repo, changesets)
2763
2763
2764 if not revs:
2764 if not revs:
2765 raise error.InputError(_(b"export requires at least one changeset"))
2765 raise error.InputError(_(b"export requires at least one changeset"))
2766 if len(revs) > 1:
2766 if len(revs) > 1:
2767 ui.note(_(b'exporting patches:\n'))
2767 ui.note(_(b'exporting patches:\n'))
2768 else:
2768 else:
2769 ui.note(_(b'exporting patch:\n'))
2769 ui.note(_(b'exporting patch:\n'))
2770
2770
2771 fntemplate = opts.get(b'output')
2771 fntemplate = opts.get(b'output')
2772 if cmdutil.isstdiofilename(fntemplate):
2772 if cmdutil.isstdiofilename(fntemplate):
2773 fntemplate = b''
2773 fntemplate = b''
2774
2774
2775 if fntemplate:
2775 if fntemplate:
2776 fm = formatter.nullformatter(ui, b'export', opts)
2776 fm = formatter.nullformatter(ui, b'export', opts)
2777 else:
2777 else:
2778 ui.pager(b'export')
2778 ui.pager(b'export')
2779 fm = ui.formatter(b'export', opts)
2779 fm = ui.formatter(b'export', opts)
2780 with fm:
2780 with fm:
2781 cmdutil.export(
2781 cmdutil.export(
2782 repo,
2782 repo,
2783 revs,
2783 revs,
2784 fm,
2784 fm,
2785 fntemplate=fntemplate,
2785 fntemplate=fntemplate,
2786 switch_parent=opts.get(b'switch_parent'),
2786 switch_parent=opts.get(b'switch_parent'),
2787 opts=patch.diffallopts(ui, opts),
2787 opts=patch.diffallopts(ui, opts),
2788 )
2788 )
2789
2789
2790
2790
2791 @command(
2791 @command(
2792 b'files',
2792 b'files',
2793 [
2793 [
2794 (
2794 (
2795 b'r',
2795 b'r',
2796 b'rev',
2796 b'rev',
2797 b'',
2797 b'',
2798 _(b'search the repository as it is in REV'),
2798 _(b'search the repository as it is in REV'),
2799 _(b'REV'),
2799 _(b'REV'),
2800 ),
2800 ),
2801 (
2801 (
2802 b'0',
2802 b'0',
2803 b'print0',
2803 b'print0',
2804 None,
2804 None,
2805 _(b'end filenames with NUL, for use with xargs'),
2805 _(b'end filenames with NUL, for use with xargs'),
2806 ),
2806 ),
2807 ]
2807 ]
2808 + walkopts
2808 + walkopts
2809 + formatteropts
2809 + formatteropts
2810 + subrepoopts,
2810 + subrepoopts,
2811 _(b'[OPTION]... [FILE]...'),
2811 _(b'[OPTION]... [FILE]...'),
2812 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2812 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2813 intents={INTENT_READONLY},
2813 intents={INTENT_READONLY},
2814 )
2814 )
2815 def files(ui, repo, *pats, **opts):
2815 def files(ui, repo, *pats, **opts):
2816 """list tracked files
2816 """list tracked files
2817
2817
2818 Print files under Mercurial control in the working directory or
2818 Print files under Mercurial control in the working directory or
2819 specified revision for given files (excluding removed files).
2819 specified revision for given files (excluding removed files).
2820 Files can be specified as filenames or filesets.
2820 Files can be specified as filenames or filesets.
2821
2821
2822 If no files are given to match, this command prints the names
2822 If no files are given to match, this command prints the names
2823 of all files under Mercurial control.
2823 of all files under Mercurial control.
2824
2824
2825 .. container:: verbose
2825 .. container:: verbose
2826
2826
2827 Template:
2827 Template:
2828
2828
2829 The following keywords are supported in addition to the common template
2829 The following keywords are supported in addition to the common template
2830 keywords and functions. See also :hg:`help templates`.
2830 keywords and functions. See also :hg:`help templates`.
2831
2831
2832 :flags: String. Character denoting file's symlink and executable bits.
2832 :flags: String. Character denoting file's symlink and executable bits.
2833 :path: String. Repository-absolute path of the file.
2833 :path: String. Repository-absolute path of the file.
2834 :size: Integer. Size of the file in bytes.
2834 :size: Integer. Size of the file in bytes.
2835
2835
2836 Examples:
2836 Examples:
2837
2837
2838 - list all files under the current directory::
2838 - list all files under the current directory::
2839
2839
2840 hg files .
2840 hg files .
2841
2841
2842 - shows sizes and flags for current revision::
2842 - shows sizes and flags for current revision::
2843
2843
2844 hg files -vr .
2844 hg files -vr .
2845
2845
2846 - list all files named README::
2846 - list all files named README::
2847
2847
2848 hg files -I "**/README"
2848 hg files -I "**/README"
2849
2849
2850 - list all binary files::
2850 - list all binary files::
2851
2851
2852 hg files "set:binary()"
2852 hg files "set:binary()"
2853
2853
2854 - find files containing a regular expression::
2854 - find files containing a regular expression::
2855
2855
2856 hg files "set:grep('bob')"
2856 hg files "set:grep('bob')"
2857
2857
2858 - search tracked file contents with xargs and grep::
2858 - search tracked file contents with xargs and grep::
2859
2859
2860 hg files -0 | xargs -0 grep foo
2860 hg files -0 | xargs -0 grep foo
2861
2861
2862 See :hg:`help patterns` and :hg:`help filesets` for more information
2862 See :hg:`help patterns` and :hg:`help filesets` for more information
2863 on specifying file patterns.
2863 on specifying file patterns.
2864
2864
2865 Returns 0 if a match is found, 1 otherwise.
2865 Returns 0 if a match is found, 1 otherwise.
2866
2866
2867 """
2867 """
2868
2868
2869 opts = pycompat.byteskwargs(opts)
2869 opts = pycompat.byteskwargs(opts)
2870 rev = opts.get(b'rev')
2870 rev = opts.get(b'rev')
2871 if rev:
2871 if rev:
2872 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2872 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
2873 ctx = scmutil.revsingle(repo, rev, None)
2873 ctx = scmutil.revsingle(repo, rev, None)
2874
2874
2875 end = b'\n'
2875 end = b'\n'
2876 if opts.get(b'print0'):
2876 if opts.get(b'print0'):
2877 end = b'\0'
2877 end = b'\0'
2878 fmt = b'%s' + end
2878 fmt = b'%s' + end
2879
2879
2880 m = scmutil.match(ctx, pats, opts)
2880 m = scmutil.match(ctx, pats, opts)
2881 ui.pager(b'files')
2881 ui.pager(b'files')
2882 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2882 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2883 with ui.formatter(b'files', opts) as fm:
2883 with ui.formatter(b'files', opts) as fm:
2884 return cmdutil.files(
2884 return cmdutil.files(
2885 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2885 ui, ctx, m, uipathfn, fm, fmt, opts.get(b'subrepos')
2886 )
2886 )
2887
2887
2888
2888
2889 @command(
2889 @command(
2890 b'forget',
2890 b'forget',
2891 [
2891 [
2892 (b'i', b'interactive', None, _(b'use interactive mode')),
2892 (b'i', b'interactive', None, _(b'use interactive mode')),
2893 ]
2893 ]
2894 + walkopts
2894 + walkopts
2895 + dryrunopts,
2895 + dryrunopts,
2896 _(b'[OPTION]... FILE...'),
2896 _(b'[OPTION]... FILE...'),
2897 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2897 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2898 helpbasic=True,
2898 helpbasic=True,
2899 inferrepo=True,
2899 inferrepo=True,
2900 )
2900 )
2901 def forget(ui, repo, *pats, **opts):
2901 def forget(ui, repo, *pats, **opts):
2902 """forget the specified files on the next commit
2902 """forget the specified files on the next commit
2903
2903
2904 Mark the specified files so they will no longer be tracked
2904 Mark the specified files so they will no longer be tracked
2905 after the next commit.
2905 after the next commit.
2906
2906
2907 This only removes files from the current branch, not from the
2907 This only removes files from the current branch, not from the
2908 entire project history, and it does not delete them from the
2908 entire project history, and it does not delete them from the
2909 working directory.
2909 working directory.
2910
2910
2911 To delete the file from the working directory, see :hg:`remove`.
2911 To delete the file from the working directory, see :hg:`remove`.
2912
2912
2913 To undo a forget before the next commit, see :hg:`add`.
2913 To undo a forget before the next commit, see :hg:`add`.
2914
2914
2915 .. container:: verbose
2915 .. container:: verbose
2916
2916
2917 Examples:
2917 Examples:
2918
2918
2919 - forget newly-added binary files::
2919 - forget newly-added binary files::
2920
2920
2921 hg forget "set:added() and binary()"
2921 hg forget "set:added() and binary()"
2922
2922
2923 - forget files that would be excluded by .hgignore::
2923 - forget files that would be excluded by .hgignore::
2924
2924
2925 hg forget "set:hgignore()"
2925 hg forget "set:hgignore()"
2926
2926
2927 Returns 0 on success.
2927 Returns 0 on success.
2928 """
2928 """
2929
2929
2930 opts = pycompat.byteskwargs(opts)
2930 opts = pycompat.byteskwargs(opts)
2931 if not pats:
2931 if not pats:
2932 raise error.InputError(_(b'no files specified'))
2932 raise error.InputError(_(b'no files specified'))
2933
2933
2934 m = scmutil.match(repo[None], pats, opts)
2934 m = scmutil.match(repo[None], pats, opts)
2935 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2935 dryrun, interactive = opts.get(b'dry_run'), opts.get(b'interactive')
2936 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2936 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2937 rejected = cmdutil.forget(
2937 rejected = cmdutil.forget(
2938 ui,
2938 ui,
2939 repo,
2939 repo,
2940 m,
2940 m,
2941 prefix=b"",
2941 prefix=b"",
2942 uipathfn=uipathfn,
2942 uipathfn=uipathfn,
2943 explicitonly=False,
2943 explicitonly=False,
2944 dryrun=dryrun,
2944 dryrun=dryrun,
2945 interactive=interactive,
2945 interactive=interactive,
2946 )[0]
2946 )[0]
2947 return rejected and 1 or 0
2947 return rejected and 1 or 0
2948
2948
2949
2949
2950 @command(
2950 @command(
2951 b'graft',
2951 b'graft',
2952 [
2952 [
2953 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2953 (b'r', b'rev', [], _(b'revisions to graft'), _(b'REV')),
2954 (
2954 (
2955 b'',
2955 b'',
2956 b'base',
2956 b'base',
2957 b'',
2957 b'',
2958 _(b'base revision when doing the graft merge (ADVANCED)'),
2958 _(b'base revision when doing the graft merge (ADVANCED)'),
2959 _(b'REV'),
2959 _(b'REV'),
2960 ),
2960 ),
2961 (b'c', b'continue', False, _(b'resume interrupted graft')),
2961 (b'c', b'continue', False, _(b'resume interrupted graft')),
2962 (b'', b'stop', False, _(b'stop interrupted graft')),
2962 (b'', b'stop', False, _(b'stop interrupted graft')),
2963 (b'', b'abort', False, _(b'abort interrupted graft')),
2963 (b'', b'abort', False, _(b'abort interrupted graft')),
2964 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2964 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
2965 (b'', b'log', None, _(b'append graft info to log message')),
2965 (b'', b'log', None, _(b'append graft info to log message')),
2966 (
2966 (
2967 b'',
2967 b'',
2968 b'no-commit',
2968 b'no-commit',
2969 None,
2969 None,
2970 _(b"don't commit, just apply the changes in working directory"),
2970 _(b"don't commit, just apply the changes in working directory"),
2971 ),
2971 ),
2972 (b'f', b'force', False, _(b'force graft')),
2972 (b'f', b'force', False, _(b'force graft')),
2973 (
2973 (
2974 b'D',
2974 b'D',
2975 b'currentdate',
2975 b'currentdate',
2976 False,
2976 False,
2977 _(b'record the current date as commit date'),
2977 _(b'record the current date as commit date'),
2978 ),
2978 ),
2979 (
2979 (
2980 b'U',
2980 b'U',
2981 b'currentuser',
2981 b'currentuser',
2982 False,
2982 False,
2983 _(b'record the current user as committer'),
2983 _(b'record the current user as committer'),
2984 ),
2984 ),
2985 ]
2985 ]
2986 + commitopts2
2986 + commitopts2
2987 + mergetoolopts
2987 + mergetoolopts
2988 + dryrunopts,
2988 + dryrunopts,
2989 _(b'[OPTION]... [-r REV]... REV...'),
2989 _(b'[OPTION]... [-r REV]... REV...'),
2990 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2990 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2991 )
2991 )
2992 def graft(ui, repo, *revs, **opts):
2992 def graft(ui, repo, *revs, **opts):
2993 """copy changes from other branches onto the current branch
2993 """copy changes from other branches onto the current branch
2994
2994
2995 This command uses Mercurial's merge logic to copy individual
2995 This command uses Mercurial's merge logic to copy individual
2996 changes from other branches without merging branches in the
2996 changes from other branches without merging branches in the
2997 history graph. This is sometimes known as 'backporting' or
2997 history graph. This is sometimes known as 'backporting' or
2998 'cherry-picking'. By default, graft will copy user, date, and
2998 'cherry-picking'. By default, graft will copy user, date, and
2999 description from the source changesets.
2999 description from the source changesets.
3000
3000
3001 Changesets that are ancestors of the current revision, that have
3001 Changesets that are ancestors of the current revision, that have
3002 already been grafted, or that are merges will be skipped.
3002 already been grafted, or that are merges will be skipped.
3003
3003
3004 If --log is specified, log messages will have a comment appended
3004 If --log is specified, log messages will have a comment appended
3005 of the form::
3005 of the form::
3006
3006
3007 (grafted from CHANGESETHASH)
3007 (grafted from CHANGESETHASH)
3008
3008
3009 If --force is specified, revisions will be grafted even if they
3009 If --force is specified, revisions will be grafted even if they
3010 are already ancestors of, or have been grafted to, the destination.
3010 are already ancestors of, or have been grafted to, the destination.
3011 This is useful when the revisions have since been backed out.
3011 This is useful when the revisions have since been backed out.
3012
3012
3013 If a graft merge results in conflicts, the graft process is
3013 If a graft merge results in conflicts, the graft process is
3014 interrupted so that the current merge can be manually resolved.
3014 interrupted so that the current merge can be manually resolved.
3015 Once all conflicts are addressed, the graft process can be
3015 Once all conflicts are addressed, the graft process can be
3016 continued with the -c/--continue option.
3016 continued with the -c/--continue option.
3017
3017
3018 The -c/--continue option reapplies all the earlier options.
3018 The -c/--continue option reapplies all the earlier options.
3019
3019
3020 .. container:: verbose
3020 .. container:: verbose
3021
3021
3022 The --base option exposes more of how graft internally uses merge with a
3022 The --base option exposes more of how graft internally uses merge with a
3023 custom base revision. --base can be used to specify another ancestor than
3023 custom base revision. --base can be used to specify another ancestor than
3024 the first and only parent.
3024 the first and only parent.
3025
3025
3026 The command::
3026 The command::
3027
3027
3028 hg graft -r 345 --base 234
3028 hg graft -r 345 --base 234
3029
3029
3030 is thus pretty much the same as::
3030 is thus pretty much the same as::
3031
3031
3032 hg diff --from 234 --to 345 | hg import
3032 hg diff --from 234 --to 345 | hg import
3033
3033
3034 but using merge to resolve conflicts and track moved files.
3034 but using merge to resolve conflicts and track moved files.
3035
3035
3036 The result of a merge can thus be backported as a single commit by
3036 The result of a merge can thus be backported as a single commit by
3037 specifying one of the merge parents as base, and thus effectively
3037 specifying one of the merge parents as base, and thus effectively
3038 grafting the changes from the other side.
3038 grafting the changes from the other side.
3039
3039
3040 It is also possible to collapse multiple changesets and clean up history
3040 It is also possible to collapse multiple changesets and clean up history
3041 by specifying another ancestor as base, much like rebase --collapse
3041 by specifying another ancestor as base, much like rebase --collapse
3042 --keep.
3042 --keep.
3043
3043
3044 The commit message can be tweaked after the fact using commit --amend .
3044 The commit message can be tweaked after the fact using commit --amend .
3045
3045
3046 For using non-ancestors as the base to backout changes, see the backout
3046 For using non-ancestors as the base to backout changes, see the backout
3047 command and the hidden --parent option.
3047 command and the hidden --parent option.
3048
3048
3049 .. container:: verbose
3049 .. container:: verbose
3050
3050
3051 Examples:
3051 Examples:
3052
3052
3053 - copy a single change to the stable branch and edit its description::
3053 - copy a single change to the stable branch and edit its description::
3054
3054
3055 hg update stable
3055 hg update stable
3056 hg graft --edit 9393
3056 hg graft --edit 9393
3057
3057
3058 - graft a range of changesets with one exception, updating dates::
3058 - graft a range of changesets with one exception, updating dates::
3059
3059
3060 hg graft -D "2085::2093 and not 2091"
3060 hg graft -D "2085::2093 and not 2091"
3061
3061
3062 - continue a graft after resolving conflicts::
3062 - continue a graft after resolving conflicts::
3063
3063
3064 hg graft -c
3064 hg graft -c
3065
3065
3066 - show the source of a grafted changeset::
3066 - show the source of a grafted changeset::
3067
3067
3068 hg log --debug -r .
3068 hg log --debug -r .
3069
3069
3070 - show revisions sorted by date::
3070 - show revisions sorted by date::
3071
3071
3072 hg log -r "sort(all(), date)"
3072 hg log -r "sort(all(), date)"
3073
3073
3074 - backport the result of a merge as a single commit::
3074 - backport the result of a merge as a single commit::
3075
3075
3076 hg graft -r 123 --base 123^
3076 hg graft -r 123 --base 123^
3077
3077
3078 - land a feature branch as one changeset::
3078 - land a feature branch as one changeset::
3079
3079
3080 hg up -cr default
3080 hg up -cr default
3081 hg graft -r featureX --base "ancestor('featureX', 'default')"
3081 hg graft -r featureX --base "ancestor('featureX', 'default')"
3082
3082
3083 See :hg:`help revisions` for more about specifying revisions.
3083 See :hg:`help revisions` for more about specifying revisions.
3084
3084
3085 Returns 0 on successful completion, 1 if there are unresolved files.
3085 Returns 0 on successful completion, 1 if there are unresolved files.
3086 """
3086 """
3087 with repo.wlock():
3087 with repo.wlock():
3088 return _dograft(ui, repo, *revs, **opts)
3088 return _dograft(ui, repo, *revs, **opts)
3089
3089
3090
3090
3091 def _dograft(ui, repo, *revs, **opts):
3091 def _dograft(ui, repo, *revs, **opts):
3092 if revs and opts.get('rev'):
3092 if revs and opts.get('rev'):
3093 ui.warn(
3093 ui.warn(
3094 _(
3094 _(
3095 b'warning: inconsistent use of --rev might give unexpected '
3095 b'warning: inconsistent use of --rev might give unexpected '
3096 b'revision ordering!\n'
3096 b'revision ordering!\n'
3097 )
3097 )
3098 )
3098 )
3099
3099
3100 revs = list(revs)
3100 revs = list(revs)
3101 revs.extend(opts.get('rev'))
3101 revs.extend(opts.get('rev'))
3102 # a dict of data to be stored in state file
3102 # a dict of data to be stored in state file
3103 statedata = {}
3103 statedata = {}
3104 # list of new nodes created by ongoing graft
3104 # list of new nodes created by ongoing graft
3105 statedata[b'newnodes'] = []
3105 statedata[b'newnodes'] = []
3106
3106
3107 cmdutil.resolve_commit_options(ui, opts)
3107 opts = pycompat.byteskwargs(opts)
3108 opts = pycompat.byteskwargs(opts)
3108 cmdutil.resolvecommitoptions(ui, opts)
3109
3109
3110 editor = cmdutil.getcommiteditor(
3110 editor = cmdutil.getcommiteditor(
3111 editform=b'graft', **pycompat.strkwargs(opts)
3111 editform=b'graft', **pycompat.strkwargs(opts)
3112 )
3112 )
3113
3113
3114 cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')
3114 cmdutil.check_at_most_one_arg(opts, b'abort', b'stop', b'continue')
3115
3115
3116 cont = False
3116 cont = False
3117 if opts.get(b'no_commit'):
3117 if opts.get(b'no_commit'):
3118 cmdutil.check_incompatible_arguments(
3118 cmdutil.check_incompatible_arguments(
3119 opts,
3119 opts,
3120 b'no_commit',
3120 b'no_commit',
3121 [b'edit', b'currentuser', b'currentdate', b'log'],
3121 [b'edit', b'currentuser', b'currentdate', b'log'],
3122 )
3122 )
3123
3123
3124 graftstate = statemod.cmdstate(repo, b'graftstate')
3124 graftstate = statemod.cmdstate(repo, b'graftstate')
3125
3125
3126 if opts.get(b'stop'):
3126 if opts.get(b'stop'):
3127 cmdutil.check_incompatible_arguments(
3127 cmdutil.check_incompatible_arguments(
3128 opts,
3128 opts,
3129 b'stop',
3129 b'stop',
3130 [
3130 [
3131 b'edit',
3131 b'edit',
3132 b'log',
3132 b'log',
3133 b'user',
3133 b'user',
3134 b'date',
3134 b'date',
3135 b'currentdate',
3135 b'currentdate',
3136 b'currentuser',
3136 b'currentuser',
3137 b'rev',
3137 b'rev',
3138 ],
3138 ],
3139 )
3139 )
3140 return _stopgraft(ui, repo, graftstate)
3140 return _stopgraft(ui, repo, graftstate)
3141 elif opts.get(b'abort'):
3141 elif opts.get(b'abort'):
3142 cmdutil.check_incompatible_arguments(
3142 cmdutil.check_incompatible_arguments(
3143 opts,
3143 opts,
3144 b'abort',
3144 b'abort',
3145 [
3145 [
3146 b'edit',
3146 b'edit',
3147 b'log',
3147 b'log',
3148 b'user',
3148 b'user',
3149 b'date',
3149 b'date',
3150 b'currentdate',
3150 b'currentdate',
3151 b'currentuser',
3151 b'currentuser',
3152 b'rev',
3152 b'rev',
3153 ],
3153 ],
3154 )
3154 )
3155 return cmdutil.abortgraft(ui, repo, graftstate)
3155 return cmdutil.abortgraft(ui, repo, graftstate)
3156 elif opts.get(b'continue'):
3156 elif opts.get(b'continue'):
3157 cont = True
3157 cont = True
3158 if revs:
3158 if revs:
3159 raise error.InputError(_(b"can't specify --continue and revisions"))
3159 raise error.InputError(_(b"can't specify --continue and revisions"))
3160 # read in unfinished revisions
3160 # read in unfinished revisions
3161 if graftstate.exists():
3161 if graftstate.exists():
3162 statedata = cmdutil.readgraftstate(repo, graftstate)
3162 statedata = cmdutil.readgraftstate(repo, graftstate)
3163 if statedata.get(b'date'):
3163 if statedata.get(b'date'):
3164 opts[b'date'] = statedata[b'date']
3164 opts[b'date'] = statedata[b'date']
3165 if statedata.get(b'user'):
3165 if statedata.get(b'user'):
3166 opts[b'user'] = statedata[b'user']
3166 opts[b'user'] = statedata[b'user']
3167 if statedata.get(b'log'):
3167 if statedata.get(b'log'):
3168 opts[b'log'] = True
3168 opts[b'log'] = True
3169 if statedata.get(b'no_commit'):
3169 if statedata.get(b'no_commit'):
3170 opts[b'no_commit'] = statedata.get(b'no_commit')
3170 opts[b'no_commit'] = statedata.get(b'no_commit')
3171 if statedata.get(b'base'):
3171 if statedata.get(b'base'):
3172 opts[b'base'] = statedata.get(b'base')
3172 opts[b'base'] = statedata.get(b'base')
3173 nodes = statedata[b'nodes']
3173 nodes = statedata[b'nodes']
3174 revs = [repo[node].rev() for node in nodes]
3174 revs = [repo[node].rev() for node in nodes]
3175 else:
3175 else:
3176 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3176 cmdutil.wrongtooltocontinue(repo, _(b'graft'))
3177 else:
3177 else:
3178 if not revs:
3178 if not revs:
3179 raise error.InputError(_(b'no revisions specified'))
3179 raise error.InputError(_(b'no revisions specified'))
3180 cmdutil.checkunfinished(repo)
3180 cmdutil.checkunfinished(repo)
3181 cmdutil.bailifchanged(repo)
3181 cmdutil.bailifchanged(repo)
3182 revs = scmutil.revrange(repo, revs)
3182 revs = scmutil.revrange(repo, revs)
3183
3183
3184 skipped = set()
3184 skipped = set()
3185 basectx = None
3185 basectx = None
3186 if opts.get(b'base'):
3186 if opts.get(b'base'):
3187 basectx = scmutil.revsingle(repo, opts[b'base'], None)
3187 basectx = scmutil.revsingle(repo, opts[b'base'], None)
3188 if basectx is None:
3188 if basectx is None:
3189 # check for merges
3189 # check for merges
3190 for rev in repo.revs(b'%ld and merge()', revs):
3190 for rev in repo.revs(b'%ld and merge()', revs):
3191 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3191 ui.warn(_(b'skipping ungraftable merge revision %d\n') % rev)
3192 skipped.add(rev)
3192 skipped.add(rev)
3193 revs = [r for r in revs if r not in skipped]
3193 revs = [r for r in revs if r not in skipped]
3194 if not revs:
3194 if not revs:
3195 return -1
3195 return -1
3196 if basectx is not None and len(revs) != 1:
3196 if basectx is not None and len(revs) != 1:
3197 raise error.InputError(_(b'only one revision allowed with --base '))
3197 raise error.InputError(_(b'only one revision allowed with --base '))
3198
3198
3199 # Don't check in the --continue case, in effect retaining --force across
3199 # Don't check in the --continue case, in effect retaining --force across
3200 # --continues. That's because without --force, any revisions we decided to
3200 # --continues. That's because without --force, any revisions we decided to
3201 # skip would have been filtered out here, so they wouldn't have made their
3201 # skip would have been filtered out here, so they wouldn't have made their
3202 # way to the graftstate. With --force, any revisions we would have otherwise
3202 # way to the graftstate. With --force, any revisions we would have otherwise
3203 # skipped would not have been filtered out, and if they hadn't been applied
3203 # skipped would not have been filtered out, and if they hadn't been applied
3204 # already, they'd have been in the graftstate.
3204 # already, they'd have been in the graftstate.
3205 if not (cont or opts.get(b'force')) and basectx is None:
3205 if not (cont or opts.get(b'force')) and basectx is None:
3206 # check for ancestors of dest branch
3206 # check for ancestors of dest branch
3207 ancestors = repo.revs(b'%ld & (::.)', revs)
3207 ancestors = repo.revs(b'%ld & (::.)', revs)
3208 for rev in ancestors:
3208 for rev in ancestors:
3209 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3209 ui.warn(_(b'skipping ancestor revision %d:%s\n') % (rev, repo[rev]))
3210
3210
3211 revs = [r for r in revs if r not in ancestors]
3211 revs = [r for r in revs if r not in ancestors]
3212
3212
3213 if not revs:
3213 if not revs:
3214 return -1
3214 return -1
3215
3215
3216 # analyze revs for earlier grafts
3216 # analyze revs for earlier grafts
3217 ids = {}
3217 ids = {}
3218 for ctx in repo.set(b"%ld", revs):
3218 for ctx in repo.set(b"%ld", revs):
3219 ids[ctx.hex()] = ctx.rev()
3219 ids[ctx.hex()] = ctx.rev()
3220 n = ctx.extra().get(b'source')
3220 n = ctx.extra().get(b'source')
3221 if n:
3221 if n:
3222 ids[n] = ctx.rev()
3222 ids[n] = ctx.rev()
3223
3223
3224 # check ancestors for earlier grafts
3224 # check ancestors for earlier grafts
3225 ui.debug(b'scanning for duplicate grafts\n')
3225 ui.debug(b'scanning for duplicate grafts\n')
3226
3226
3227 # The only changesets we can be sure doesn't contain grafts of any
3227 # The only changesets we can be sure doesn't contain grafts of any
3228 # revs, are the ones that are common ancestors of *all* revs:
3228 # revs, are the ones that are common ancestors of *all* revs:
3229 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3229 for rev in repo.revs(b'only(%d,ancestor(%ld))', repo[b'.'].rev(), revs):
3230 ctx = repo[rev]
3230 ctx = repo[rev]
3231 n = ctx.extra().get(b'source')
3231 n = ctx.extra().get(b'source')
3232 if n in ids:
3232 if n in ids:
3233 try:
3233 try:
3234 r = repo[n].rev()
3234 r = repo[n].rev()
3235 except error.RepoLookupError:
3235 except error.RepoLookupError:
3236 r = None
3236 r = None
3237 if r in revs:
3237 if r in revs:
3238 ui.warn(
3238 ui.warn(
3239 _(
3239 _(
3240 b'skipping revision %d:%s '
3240 b'skipping revision %d:%s '
3241 b'(already grafted to %d:%s)\n'
3241 b'(already grafted to %d:%s)\n'
3242 )
3242 )
3243 % (r, repo[r], rev, ctx)
3243 % (r, repo[r], rev, ctx)
3244 )
3244 )
3245 revs.remove(r)
3245 revs.remove(r)
3246 elif ids[n] in revs:
3246 elif ids[n] in revs:
3247 if r is None:
3247 if r is None:
3248 ui.warn(
3248 ui.warn(
3249 _(
3249 _(
3250 b'skipping already grafted revision %d:%s '
3250 b'skipping already grafted revision %d:%s '
3251 b'(%d:%s also has unknown origin %s)\n'
3251 b'(%d:%s also has unknown origin %s)\n'
3252 )
3252 )
3253 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3253 % (ids[n], repo[ids[n]], rev, ctx, n[:12])
3254 )
3254 )
3255 else:
3255 else:
3256 ui.warn(
3256 ui.warn(
3257 _(
3257 _(
3258 b'skipping already grafted revision %d:%s '
3258 b'skipping already grafted revision %d:%s '
3259 b'(%d:%s also has origin %d:%s)\n'
3259 b'(%d:%s also has origin %d:%s)\n'
3260 )
3260 )
3261 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3261 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])
3262 )
3262 )
3263 revs.remove(ids[n])
3263 revs.remove(ids[n])
3264 elif ctx.hex() in ids:
3264 elif ctx.hex() in ids:
3265 r = ids[ctx.hex()]
3265 r = ids[ctx.hex()]
3266 if r in revs:
3266 if r in revs:
3267 ui.warn(
3267 ui.warn(
3268 _(
3268 _(
3269 b'skipping already grafted revision %d:%s '
3269 b'skipping already grafted revision %d:%s '
3270 b'(was grafted from %d:%s)\n'
3270 b'(was grafted from %d:%s)\n'
3271 )
3271 )
3272 % (r, repo[r], rev, ctx)
3272 % (r, repo[r], rev, ctx)
3273 )
3273 )
3274 revs.remove(r)
3274 revs.remove(r)
3275 if not revs:
3275 if not revs:
3276 return -1
3276 return -1
3277
3277
3278 if opts.get(b'no_commit'):
3278 if opts.get(b'no_commit'):
3279 statedata[b'no_commit'] = True
3279 statedata[b'no_commit'] = True
3280 if opts.get(b'base'):
3280 if opts.get(b'base'):
3281 statedata[b'base'] = opts[b'base']
3281 statedata[b'base'] = opts[b'base']
3282 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3282 for pos, ctx in enumerate(repo.set(b"%ld", revs)):
3283 desc = b'%d:%s "%s"' % (
3283 desc = b'%d:%s "%s"' % (
3284 ctx.rev(),
3284 ctx.rev(),
3285 ctx,
3285 ctx,
3286 ctx.description().split(b'\n', 1)[0],
3286 ctx.description().split(b'\n', 1)[0],
3287 )
3287 )
3288 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3288 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
3289 if names:
3289 if names:
3290 desc += b' (%s)' % b' '.join(names)
3290 desc += b' (%s)' % b' '.join(names)
3291 ui.status(_(b'grafting %s\n') % desc)
3291 ui.status(_(b'grafting %s\n') % desc)
3292 if opts.get(b'dry_run'):
3292 if opts.get(b'dry_run'):
3293 continue
3293 continue
3294
3294
3295 source = ctx.extra().get(b'source')
3295 source = ctx.extra().get(b'source')
3296 extra = {}
3296 extra = {}
3297 if source:
3297 if source:
3298 extra[b'source'] = source
3298 extra[b'source'] = source
3299 extra[b'intermediate-source'] = ctx.hex()
3299 extra[b'intermediate-source'] = ctx.hex()
3300 else:
3300 else:
3301 extra[b'source'] = ctx.hex()
3301 extra[b'source'] = ctx.hex()
3302 user = ctx.user()
3302 user = ctx.user()
3303 if opts.get(b'user'):
3303 if opts.get(b'user'):
3304 user = opts[b'user']
3304 user = opts[b'user']
3305 statedata[b'user'] = user
3305 statedata[b'user'] = user
3306 date = ctx.date()
3306 date = ctx.date()
3307 if opts.get(b'date'):
3307 if opts.get(b'date'):
3308 date = opts[b'date']
3308 date = opts[b'date']
3309 statedata[b'date'] = date
3309 statedata[b'date'] = date
3310 message = ctx.description()
3310 message = ctx.description()
3311 if opts.get(b'log'):
3311 if opts.get(b'log'):
3312 message += b'\n(grafted from %s)' % ctx.hex()
3312 message += b'\n(grafted from %s)' % ctx.hex()
3313 statedata[b'log'] = True
3313 statedata[b'log'] = True
3314
3314
3315 # we don't merge the first commit when continuing
3315 # we don't merge the first commit when continuing
3316 if not cont:
3316 if not cont:
3317 # perform the graft merge with p1(rev) as 'ancestor'
3317 # perform the graft merge with p1(rev) as 'ancestor'
3318 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3318 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
3319 base = ctx.p1() if basectx is None else basectx
3319 base = ctx.p1() if basectx is None else basectx
3320 with ui.configoverride(overrides, b'graft'):
3320 with ui.configoverride(overrides, b'graft'):
3321 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3321 stats = mergemod.graft(repo, ctx, base, [b'local', b'graft'])
3322 # report any conflicts
3322 # report any conflicts
3323 if stats.unresolvedcount > 0:
3323 if stats.unresolvedcount > 0:
3324 # write out state for --continue
3324 # write out state for --continue
3325 nodes = [repo[rev].hex() for rev in revs[pos:]]
3325 nodes = [repo[rev].hex() for rev in revs[pos:]]
3326 statedata[b'nodes'] = nodes
3326 statedata[b'nodes'] = nodes
3327 stateversion = 1
3327 stateversion = 1
3328 graftstate.save(stateversion, statedata)
3328 graftstate.save(stateversion, statedata)
3329 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3329 ui.error(_(b"abort: unresolved conflicts, can't continue\n"))
3330 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3330 ui.error(_(b"(use 'hg resolve' and 'hg graft --continue')\n"))
3331 return 1
3331 return 1
3332 else:
3332 else:
3333 cont = False
3333 cont = False
3334
3334
3335 # commit if --no-commit is false
3335 # commit if --no-commit is false
3336 if not opts.get(b'no_commit'):
3336 if not opts.get(b'no_commit'):
3337 node = repo.commit(
3337 node = repo.commit(
3338 text=message, user=user, date=date, extra=extra, editor=editor
3338 text=message, user=user, date=date, extra=extra, editor=editor
3339 )
3339 )
3340 if node is None:
3340 if node is None:
3341 ui.warn(
3341 ui.warn(
3342 _(b'note: graft of %d:%s created no changes to commit\n')
3342 _(b'note: graft of %d:%s created no changes to commit\n')
3343 % (ctx.rev(), ctx)
3343 % (ctx.rev(), ctx)
3344 )
3344 )
3345 # checking that newnodes exist because old state files won't have it
3345 # checking that newnodes exist because old state files won't have it
3346 elif statedata.get(b'newnodes') is not None:
3346 elif statedata.get(b'newnodes') is not None:
3347 nn = statedata[b'newnodes'] # type: List[bytes]
3347 nn = statedata[b'newnodes'] # type: List[bytes]
3348 nn.append(node)
3348 nn.append(node)
3349
3349
3350 # remove state when we complete successfully
3350 # remove state when we complete successfully
3351 if not opts.get(b'dry_run'):
3351 if not opts.get(b'dry_run'):
3352 graftstate.delete()
3352 graftstate.delete()
3353
3353
3354 return 0
3354 return 0
3355
3355
3356
3356
3357 def _stopgraft(ui, repo, graftstate):
3357 def _stopgraft(ui, repo, graftstate):
3358 """stop the interrupted graft"""
3358 """stop the interrupted graft"""
3359 if not graftstate.exists():
3359 if not graftstate.exists():
3360 raise error.StateError(_(b"no interrupted graft found"))
3360 raise error.StateError(_(b"no interrupted graft found"))
3361 pctx = repo[b'.']
3361 pctx = repo[b'.']
3362 mergemod.clean_update(pctx)
3362 mergemod.clean_update(pctx)
3363 graftstate.delete()
3363 graftstate.delete()
3364 ui.status(_(b"stopped the interrupted graft\n"))
3364 ui.status(_(b"stopped the interrupted graft\n"))
3365 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3365 ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12])
3366 return 0
3366 return 0
3367
3367
3368
3368
3369 statemod.addunfinished(
3369 statemod.addunfinished(
3370 b'graft',
3370 b'graft',
3371 fname=b'graftstate',
3371 fname=b'graftstate',
3372 clearable=True,
3372 clearable=True,
3373 stopflag=True,
3373 stopflag=True,
3374 continueflag=True,
3374 continueflag=True,
3375 abortfunc=cmdutil.hgabortgraft,
3375 abortfunc=cmdutil.hgabortgraft,
3376 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3376 cmdhint=_(b"use 'hg graft --continue' or 'hg graft --stop' to stop"),
3377 )
3377 )
3378
3378
3379
3379
3380 @command(
3380 @command(
3381 b'grep',
3381 b'grep',
3382 [
3382 [
3383 (b'0', b'print0', None, _(b'end fields with NUL')),
3383 (b'0', b'print0', None, _(b'end fields with NUL')),
3384 (b'', b'all', None, _(b'an alias to --diff (DEPRECATED)')),
3384 (b'', b'all', None, _(b'an alias to --diff (DEPRECATED)')),
3385 (
3385 (
3386 b'',
3386 b'',
3387 b'diff',
3387 b'diff',
3388 None,
3388 None,
3389 _(
3389 _(
3390 b'search revision differences for when the pattern was added '
3390 b'search revision differences for when the pattern was added '
3391 b'or removed'
3391 b'or removed'
3392 ),
3392 ),
3393 ),
3393 ),
3394 (b'a', b'text', None, _(b'treat all files as text')),
3394 (b'a', b'text', None, _(b'treat all files as text')),
3395 (
3395 (
3396 b'f',
3396 b'f',
3397 b'follow',
3397 b'follow',
3398 None,
3398 None,
3399 _(
3399 _(
3400 b'follow changeset history,'
3400 b'follow changeset history,'
3401 b' or file history across copies and renames'
3401 b' or file history across copies and renames'
3402 ),
3402 ),
3403 ),
3403 ),
3404 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3404 (b'i', b'ignore-case', None, _(b'ignore case when matching')),
3405 (
3405 (
3406 b'l',
3406 b'l',
3407 b'files-with-matches',
3407 b'files-with-matches',
3408 None,
3408 None,
3409 _(b'print only filenames and revisions that match'),
3409 _(b'print only filenames and revisions that match'),
3410 ),
3410 ),
3411 (b'n', b'line-number', None, _(b'print matching line numbers')),
3411 (b'n', b'line-number', None, _(b'print matching line numbers')),
3412 (
3412 (
3413 b'r',
3413 b'r',
3414 b'rev',
3414 b'rev',
3415 [],
3415 [],
3416 _(b'search files changed within revision range'),
3416 _(b'search files changed within revision range'),
3417 _(b'REV'),
3417 _(b'REV'),
3418 ),
3418 ),
3419 (
3419 (
3420 b'',
3420 b'',
3421 b'all-files',
3421 b'all-files',
3422 None,
3422 None,
3423 _(
3423 _(
3424 b'include all files in the changeset while grepping (DEPRECATED)'
3424 b'include all files in the changeset while grepping (DEPRECATED)'
3425 ),
3425 ),
3426 ),
3426 ),
3427 (b'u', b'user', None, _(b'list the author (long with -v)')),
3427 (b'u', b'user', None, _(b'list the author (long with -v)')),
3428 (b'd', b'date', None, _(b'list the date (short with -q)')),
3428 (b'd', b'date', None, _(b'list the date (short with -q)')),
3429 ]
3429 ]
3430 + formatteropts
3430 + formatteropts
3431 + walkopts,
3431 + walkopts,
3432 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3432 _(b'[--diff] [OPTION]... PATTERN [FILE]...'),
3433 helpcategory=command.CATEGORY_FILE_CONTENTS,
3433 helpcategory=command.CATEGORY_FILE_CONTENTS,
3434 inferrepo=True,
3434 inferrepo=True,
3435 intents={INTENT_READONLY},
3435 intents={INTENT_READONLY},
3436 )
3436 )
3437 def grep(ui, repo, pattern, *pats, **opts):
3437 def grep(ui, repo, pattern, *pats, **opts):
3438 """search for a pattern in specified files
3438 """search for a pattern in specified files
3439
3439
3440 Search the working directory or revision history for a regular
3440 Search the working directory or revision history for a regular
3441 expression in the specified files for the entire repository.
3441 expression in the specified files for the entire repository.
3442
3442
3443 By default, grep searches the repository files in the working
3443 By default, grep searches the repository files in the working
3444 directory and prints the files where it finds a match. To specify
3444 directory and prints the files where it finds a match. To specify
3445 historical revisions instead of the working directory, use the
3445 historical revisions instead of the working directory, use the
3446 --rev flag.
3446 --rev flag.
3447
3447
3448 To search instead historical revision differences that contains a
3448 To search instead historical revision differences that contains a
3449 change in match status ("-" for a match that becomes a non-match,
3449 change in match status ("-" for a match that becomes a non-match,
3450 or "+" for a non-match that becomes a match), use the --diff flag.
3450 or "+" for a non-match that becomes a match), use the --diff flag.
3451
3451
3452 PATTERN can be any Python (roughly Perl-compatible) regular
3452 PATTERN can be any Python (roughly Perl-compatible) regular
3453 expression.
3453 expression.
3454
3454
3455 If no FILEs are specified and the --rev flag isn't supplied, all
3455 If no FILEs are specified and the --rev flag isn't supplied, all
3456 files in the working directory are searched. When using the --rev
3456 files in the working directory are searched. When using the --rev
3457 flag and specifying FILEs, use the --follow argument to also
3457 flag and specifying FILEs, use the --follow argument to also
3458 follow the specified FILEs across renames and copies.
3458 follow the specified FILEs across renames and copies.
3459
3459
3460 .. container:: verbose
3460 .. container:: verbose
3461
3461
3462 Template:
3462 Template:
3463
3463
3464 The following keywords are supported in addition to the common template
3464 The following keywords are supported in addition to the common template
3465 keywords and functions. See also :hg:`help templates`.
3465 keywords and functions. See also :hg:`help templates`.
3466
3466
3467 :change: String. Character denoting insertion ``+`` or removal ``-``.
3467 :change: String. Character denoting insertion ``+`` or removal ``-``.
3468 Available if ``--diff`` is specified.
3468 Available if ``--diff`` is specified.
3469 :lineno: Integer. Line number of the match.
3469 :lineno: Integer. Line number of the match.
3470 :path: String. Repository-absolute path of the file.
3470 :path: String. Repository-absolute path of the file.
3471 :texts: List of text chunks.
3471 :texts: List of text chunks.
3472
3472
3473 And each entry of ``{texts}`` provides the following sub-keywords.
3473 And each entry of ``{texts}`` provides the following sub-keywords.
3474
3474
3475 :matched: Boolean. True if the chunk matches the specified pattern.
3475 :matched: Boolean. True if the chunk matches the specified pattern.
3476 :text: String. Chunk content.
3476 :text: String. Chunk content.
3477
3477
3478 See :hg:`help templates.operators` for the list expansion syntax.
3478 See :hg:`help templates.operators` for the list expansion syntax.
3479
3479
3480 Returns 0 if a match is found, 1 otherwise.
3480 Returns 0 if a match is found, 1 otherwise.
3481
3481
3482 """
3482 """
3483 cmdutil.check_incompatible_arguments(opts, 'all_files', ['all', 'diff'])
3483 cmdutil.check_incompatible_arguments(opts, 'all_files', ['all', 'diff'])
3484 opts = pycompat.byteskwargs(opts)
3484 opts = pycompat.byteskwargs(opts)
3485 diff = opts.get(b'all') or opts.get(b'diff')
3485 diff = opts.get(b'all') or opts.get(b'diff')
3486 follow = opts.get(b'follow')
3486 follow = opts.get(b'follow')
3487 if opts.get(b'all_files') is None and not diff:
3487 if opts.get(b'all_files') is None and not diff:
3488 opts[b'all_files'] = True
3488 opts[b'all_files'] = True
3489 plaingrep = (
3489 plaingrep = (
3490 opts.get(b'all_files')
3490 opts.get(b'all_files')
3491 and not opts.get(b'rev')
3491 and not opts.get(b'rev')
3492 and not opts.get(b'follow')
3492 and not opts.get(b'follow')
3493 )
3493 )
3494 all_files = opts.get(b'all_files')
3494 all_files = opts.get(b'all_files')
3495 if plaingrep:
3495 if plaingrep:
3496 opts[b'rev'] = [b'wdir()']
3496 opts[b'rev'] = [b'wdir()']
3497
3497
3498 reflags = re.M
3498 reflags = re.M
3499 if opts.get(b'ignore_case'):
3499 if opts.get(b'ignore_case'):
3500 reflags |= re.I
3500 reflags |= re.I
3501 try:
3501 try:
3502 regexp = util.re.compile(pattern, reflags)
3502 regexp = util.re.compile(pattern, reflags)
3503 except re.error as inst:
3503 except re.error as inst:
3504 ui.warn(
3504 ui.warn(
3505 _(b"grep: invalid match pattern: %s\n")
3505 _(b"grep: invalid match pattern: %s\n")
3506 % stringutil.forcebytestr(inst)
3506 % stringutil.forcebytestr(inst)
3507 )
3507 )
3508 return 1
3508 return 1
3509 sep, eol = b':', b'\n'
3509 sep, eol = b':', b'\n'
3510 if opts.get(b'print0'):
3510 if opts.get(b'print0'):
3511 sep = eol = b'\0'
3511 sep = eol = b'\0'
3512
3512
3513 searcher = grepmod.grepsearcher(
3513 searcher = grepmod.grepsearcher(
3514 ui, repo, regexp, all_files=all_files, diff=diff, follow=follow
3514 ui, repo, regexp, all_files=all_files, diff=diff, follow=follow
3515 )
3515 )
3516
3516
3517 getfile = searcher._getfile
3517 getfile = searcher._getfile
3518
3518
3519 uipathfn = scmutil.getuipathfn(repo)
3519 uipathfn = scmutil.getuipathfn(repo)
3520
3520
3521 def display(fm, fn, ctx, pstates, states):
3521 def display(fm, fn, ctx, pstates, states):
3522 rev = scmutil.intrev(ctx)
3522 rev = scmutil.intrev(ctx)
3523 if fm.isplain():
3523 if fm.isplain():
3524 formatuser = ui.shortuser
3524 formatuser = ui.shortuser
3525 else:
3525 else:
3526 formatuser = pycompat.bytestr
3526 formatuser = pycompat.bytestr
3527 if ui.quiet:
3527 if ui.quiet:
3528 datefmt = b'%Y-%m-%d'
3528 datefmt = b'%Y-%m-%d'
3529 else:
3529 else:
3530 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3530 datefmt = b'%a %b %d %H:%M:%S %Y %1%2'
3531 found = False
3531 found = False
3532
3532
3533 @util.cachefunc
3533 @util.cachefunc
3534 def binary():
3534 def binary():
3535 flog = getfile(fn)
3535 flog = getfile(fn)
3536 try:
3536 try:
3537 return stringutil.binary(flog.read(ctx.filenode(fn)))
3537 return stringutil.binary(flog.read(ctx.filenode(fn)))
3538 except error.WdirUnsupported:
3538 except error.WdirUnsupported:
3539 return ctx[fn].isbinary()
3539 return ctx[fn].isbinary()
3540
3540
3541 fieldnamemap = {b'linenumber': b'lineno'}
3541 fieldnamemap = {b'linenumber': b'lineno'}
3542 if diff:
3542 if diff:
3543 iter = grepmod.difflinestates(pstates, states)
3543 iter = grepmod.difflinestates(pstates, states)
3544 else:
3544 else:
3545 iter = [(b'', l) for l in states]
3545 iter = [(b'', l) for l in states]
3546 for change, l in iter:
3546 for change, l in iter:
3547 fm.startitem()
3547 fm.startitem()
3548 fm.context(ctx=ctx)
3548 fm.context(ctx=ctx)
3549 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3549 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
3550 fm.plain(uipathfn(fn), label=b'grep.filename')
3550 fm.plain(uipathfn(fn), label=b'grep.filename')
3551
3551
3552 cols = [
3552 cols = [
3553 (b'rev', b'%d', rev, not plaingrep, b''),
3553 (b'rev', b'%d', rev, not plaingrep, b''),
3554 (
3554 (
3555 b'linenumber',
3555 b'linenumber',
3556 b'%d',
3556 b'%d',
3557 l.linenum,
3557 l.linenum,
3558 opts.get(b'line_number'),
3558 opts.get(b'line_number'),
3559 b'',
3559 b'',
3560 ),
3560 ),
3561 ]
3561 ]
3562 if diff:
3562 if diff:
3563 cols.append(
3563 cols.append(
3564 (
3564 (
3565 b'change',
3565 b'change',
3566 b'%s',
3566 b'%s',
3567 change,
3567 change,
3568 True,
3568 True,
3569 b'grep.inserted '
3569 b'grep.inserted '
3570 if change == b'+'
3570 if change == b'+'
3571 else b'grep.deleted ',
3571 else b'grep.deleted ',
3572 )
3572 )
3573 )
3573 )
3574 cols.extend(
3574 cols.extend(
3575 [
3575 [
3576 (
3576 (
3577 b'user',
3577 b'user',
3578 b'%s',
3578 b'%s',
3579 formatuser(ctx.user()),
3579 formatuser(ctx.user()),
3580 opts.get(b'user'),
3580 opts.get(b'user'),
3581 b'',
3581 b'',
3582 ),
3582 ),
3583 (
3583 (
3584 b'date',
3584 b'date',
3585 b'%s',
3585 b'%s',
3586 fm.formatdate(ctx.date(), datefmt),
3586 fm.formatdate(ctx.date(), datefmt),
3587 opts.get(b'date'),
3587 opts.get(b'date'),
3588 b'',
3588 b'',
3589 ),
3589 ),
3590 ]
3590 ]
3591 )
3591 )
3592 for name, fmt, data, cond, extra_label in cols:
3592 for name, fmt, data, cond, extra_label in cols:
3593 if cond:
3593 if cond:
3594 fm.plain(sep, label=b'grep.sep')
3594 fm.plain(sep, label=b'grep.sep')
3595 field = fieldnamemap.get(name, name)
3595 field = fieldnamemap.get(name, name)
3596 label = extra_label + (b'grep.%s' % name)
3596 label = extra_label + (b'grep.%s' % name)
3597 fm.condwrite(cond, field, fmt, data, label=label)
3597 fm.condwrite(cond, field, fmt, data, label=label)
3598 if not opts.get(b'files_with_matches'):
3598 if not opts.get(b'files_with_matches'):
3599 fm.plain(sep, label=b'grep.sep')
3599 fm.plain(sep, label=b'grep.sep')
3600 if not opts.get(b'text') and binary():
3600 if not opts.get(b'text') and binary():
3601 fm.plain(_(b" Binary file matches"))
3601 fm.plain(_(b" Binary file matches"))
3602 else:
3602 else:
3603 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3603 displaymatches(fm.nested(b'texts', tmpl=b'{text}'), l)
3604 fm.plain(eol)
3604 fm.plain(eol)
3605 found = True
3605 found = True
3606 if opts.get(b'files_with_matches'):
3606 if opts.get(b'files_with_matches'):
3607 break
3607 break
3608 return found
3608 return found
3609
3609
3610 def displaymatches(fm, l):
3610 def displaymatches(fm, l):
3611 p = 0
3611 p = 0
3612 for s, e in l.findpos(regexp):
3612 for s, e in l.findpos(regexp):
3613 if p < s:
3613 if p < s:
3614 fm.startitem()
3614 fm.startitem()
3615 fm.write(b'text', b'%s', l.line[p:s])
3615 fm.write(b'text', b'%s', l.line[p:s])
3616 fm.data(matched=False)
3616 fm.data(matched=False)
3617 fm.startitem()
3617 fm.startitem()
3618 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3618 fm.write(b'text', b'%s', l.line[s:e], label=b'grep.match')
3619 fm.data(matched=True)
3619 fm.data(matched=True)
3620 p = e
3620 p = e
3621 if p < len(l.line):
3621 if p < len(l.line):
3622 fm.startitem()
3622 fm.startitem()
3623 fm.write(b'text', b'%s', l.line[p:])
3623 fm.write(b'text', b'%s', l.line[p:])
3624 fm.data(matched=False)
3624 fm.data(matched=False)
3625 fm.end()
3625 fm.end()
3626
3626
3627 found = False
3627 found = False
3628
3628
3629 wopts = logcmdutil.walkopts(
3629 wopts = logcmdutil.walkopts(
3630 pats=pats,
3630 pats=pats,
3631 opts=opts,
3631 opts=opts,
3632 revspec=opts[b'rev'],
3632 revspec=opts[b'rev'],
3633 include_pats=opts[b'include'],
3633 include_pats=opts[b'include'],
3634 exclude_pats=opts[b'exclude'],
3634 exclude_pats=opts[b'exclude'],
3635 follow=follow,
3635 follow=follow,
3636 force_changelog_traversal=all_files,
3636 force_changelog_traversal=all_files,
3637 filter_revisions_by_pats=not all_files,
3637 filter_revisions_by_pats=not all_files,
3638 )
3638 )
3639 revs, makefilematcher = logcmdutil.makewalker(repo, wopts)
3639 revs, makefilematcher = logcmdutil.makewalker(repo, wopts)
3640
3640
3641 ui.pager(b'grep')
3641 ui.pager(b'grep')
3642 fm = ui.formatter(b'grep', opts)
3642 fm = ui.formatter(b'grep', opts)
3643 for fn, ctx, pstates, states in searcher.searchfiles(revs, makefilematcher):
3643 for fn, ctx, pstates, states in searcher.searchfiles(revs, makefilematcher):
3644 r = display(fm, fn, ctx, pstates, states)
3644 r = display(fm, fn, ctx, pstates, states)
3645 found = found or r
3645 found = found or r
3646 if r and not diff and not all_files:
3646 if r and not diff and not all_files:
3647 searcher.skipfile(fn, ctx.rev())
3647 searcher.skipfile(fn, ctx.rev())
3648 fm.end()
3648 fm.end()
3649
3649
3650 return not found
3650 return not found
3651
3651
3652
3652
3653 @command(
3653 @command(
3654 b'heads',
3654 b'heads',
3655 [
3655 [
3656 (
3656 (
3657 b'r',
3657 b'r',
3658 b'rev',
3658 b'rev',
3659 b'',
3659 b'',
3660 _(b'show only heads which are descendants of STARTREV'),
3660 _(b'show only heads which are descendants of STARTREV'),
3661 _(b'STARTREV'),
3661 _(b'STARTREV'),
3662 ),
3662 ),
3663 (b't', b'topo', False, _(b'show topological heads only')),
3663 (b't', b'topo', False, _(b'show topological heads only')),
3664 (
3664 (
3665 b'a',
3665 b'a',
3666 b'active',
3666 b'active',
3667 False,
3667 False,
3668 _(b'show active branchheads only (DEPRECATED)'),
3668 _(b'show active branchheads only (DEPRECATED)'),
3669 ),
3669 ),
3670 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3670 (b'c', b'closed', False, _(b'show normal and closed branch heads')),
3671 ]
3671 ]
3672 + templateopts,
3672 + templateopts,
3673 _(b'[-ct] [-r STARTREV] [REV]...'),
3673 _(b'[-ct] [-r STARTREV] [REV]...'),
3674 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3674 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3675 intents={INTENT_READONLY},
3675 intents={INTENT_READONLY},
3676 )
3676 )
3677 def heads(ui, repo, *branchrevs, **opts):
3677 def heads(ui, repo, *branchrevs, **opts):
3678 """show branch heads
3678 """show branch heads
3679
3679
3680 With no arguments, show all open branch heads in the repository.
3680 With no arguments, show all open branch heads in the repository.
3681 Branch heads are changesets that have no descendants on the
3681 Branch heads are changesets that have no descendants on the
3682 same branch. They are where development generally takes place and
3682 same branch. They are where development generally takes place and
3683 are the usual targets for update and merge operations.
3683 are the usual targets for update and merge operations.
3684
3684
3685 If one or more REVs are given, only open branch heads on the
3685 If one or more REVs are given, only open branch heads on the
3686 branches associated with the specified changesets are shown. This
3686 branches associated with the specified changesets are shown. This
3687 means that you can use :hg:`heads .` to see the heads on the
3687 means that you can use :hg:`heads .` to see the heads on the
3688 currently checked-out branch.
3688 currently checked-out branch.
3689
3689
3690 If -c/--closed is specified, also show branch heads marked closed
3690 If -c/--closed is specified, also show branch heads marked closed
3691 (see :hg:`commit --close-branch`).
3691 (see :hg:`commit --close-branch`).
3692
3692
3693 If STARTREV is specified, only those heads that are descendants of
3693 If STARTREV is specified, only those heads that are descendants of
3694 STARTREV will be displayed.
3694 STARTREV will be displayed.
3695
3695
3696 If -t/--topo is specified, named branch mechanics will be ignored and only
3696 If -t/--topo is specified, named branch mechanics will be ignored and only
3697 topological heads (changesets with no children) will be shown.
3697 topological heads (changesets with no children) will be shown.
3698
3698
3699 Returns 0 if matching heads are found, 1 if not.
3699 Returns 0 if matching heads are found, 1 if not.
3700 """
3700 """
3701
3701
3702 opts = pycompat.byteskwargs(opts)
3702 opts = pycompat.byteskwargs(opts)
3703 start = None
3703 start = None
3704 rev = opts.get(b'rev')
3704 rev = opts.get(b'rev')
3705 if rev:
3705 if rev:
3706 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3706 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3707 start = scmutil.revsingle(repo, rev, None).node()
3707 start = scmutil.revsingle(repo, rev, None).node()
3708
3708
3709 if opts.get(b'topo'):
3709 if opts.get(b'topo'):
3710 heads = [repo[h] for h in repo.heads(start)]
3710 heads = [repo[h] for h in repo.heads(start)]
3711 else:
3711 else:
3712 heads = []
3712 heads = []
3713 for branch in repo.branchmap():
3713 for branch in repo.branchmap():
3714 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3714 heads += repo.branchheads(branch, start, opts.get(b'closed'))
3715 heads = [repo[h] for h in heads]
3715 heads = [repo[h] for h in heads]
3716
3716
3717 if branchrevs:
3717 if branchrevs:
3718 branches = {
3718 branches = {
3719 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3719 repo[r].branch() for r in scmutil.revrange(repo, branchrevs)
3720 }
3720 }
3721 heads = [h for h in heads if h.branch() in branches]
3721 heads = [h for h in heads if h.branch() in branches]
3722
3722
3723 if opts.get(b'active') and branchrevs:
3723 if opts.get(b'active') and branchrevs:
3724 dagheads = repo.heads(start)
3724 dagheads = repo.heads(start)
3725 heads = [h for h in heads if h.node() in dagheads]
3725 heads = [h for h in heads if h.node() in dagheads]
3726
3726
3727 if branchrevs:
3727 if branchrevs:
3728 haveheads = {h.branch() for h in heads}
3728 haveheads = {h.branch() for h in heads}
3729 if branches - haveheads:
3729 if branches - haveheads:
3730 headless = b', '.join(b for b in branches - haveheads)
3730 headless = b', '.join(b for b in branches - haveheads)
3731 msg = _(b'no open branch heads found on branches %s')
3731 msg = _(b'no open branch heads found on branches %s')
3732 if opts.get(b'rev'):
3732 if opts.get(b'rev'):
3733 msg += _(b' (started at %s)') % opts[b'rev']
3733 msg += _(b' (started at %s)') % opts[b'rev']
3734 ui.warn((msg + b'\n') % headless)
3734 ui.warn((msg + b'\n') % headless)
3735
3735
3736 if not heads:
3736 if not heads:
3737 return 1
3737 return 1
3738
3738
3739 ui.pager(b'heads')
3739 ui.pager(b'heads')
3740 heads = sorted(heads, key=lambda x: -(x.rev()))
3740 heads = sorted(heads, key=lambda x: -(x.rev()))
3741 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3741 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3742 for ctx in heads:
3742 for ctx in heads:
3743 displayer.show(ctx)
3743 displayer.show(ctx)
3744 displayer.close()
3744 displayer.close()
3745
3745
3746
3746
3747 @command(
3747 @command(
3748 b'help',
3748 b'help',
3749 [
3749 [
3750 (b'e', b'extension', None, _(b'show only help for extensions')),
3750 (b'e', b'extension', None, _(b'show only help for extensions')),
3751 (b'c', b'command', None, _(b'show only help for commands')),
3751 (b'c', b'command', None, _(b'show only help for commands')),
3752 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3752 (b'k', b'keyword', None, _(b'show topics matching keyword')),
3753 (
3753 (
3754 b's',
3754 b's',
3755 b'system',
3755 b'system',
3756 [],
3756 [],
3757 _(b'show help for specific platform(s)'),
3757 _(b'show help for specific platform(s)'),
3758 _(b'PLATFORM'),
3758 _(b'PLATFORM'),
3759 ),
3759 ),
3760 ],
3760 ],
3761 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3761 _(b'[-eck] [-s PLATFORM] [TOPIC]'),
3762 helpcategory=command.CATEGORY_HELP,
3762 helpcategory=command.CATEGORY_HELP,
3763 norepo=True,
3763 norepo=True,
3764 intents={INTENT_READONLY},
3764 intents={INTENT_READONLY},
3765 )
3765 )
3766 def help_(ui, name=None, **opts):
3766 def help_(ui, name=None, **opts):
3767 """show help for a given topic or a help overview
3767 """show help for a given topic or a help overview
3768
3768
3769 With no arguments, print a list of commands with short help messages.
3769 With no arguments, print a list of commands with short help messages.
3770
3770
3771 Given a topic, extension, or command name, print help for that
3771 Given a topic, extension, or command name, print help for that
3772 topic.
3772 topic.
3773
3773
3774 Returns 0 if successful.
3774 Returns 0 if successful.
3775 """
3775 """
3776
3776
3777 keep = opts.get('system') or []
3777 keep = opts.get('system') or []
3778 if len(keep) == 0:
3778 if len(keep) == 0:
3779 if pycompat.sysplatform.startswith(b'win'):
3779 if pycompat.sysplatform.startswith(b'win'):
3780 keep.append(b'windows')
3780 keep.append(b'windows')
3781 elif pycompat.sysplatform == b'OpenVMS':
3781 elif pycompat.sysplatform == b'OpenVMS':
3782 keep.append(b'vms')
3782 keep.append(b'vms')
3783 elif pycompat.sysplatform == b'plan9':
3783 elif pycompat.sysplatform == b'plan9':
3784 keep.append(b'plan9')
3784 keep.append(b'plan9')
3785 else:
3785 else:
3786 keep.append(b'unix')
3786 keep.append(b'unix')
3787 keep.append(pycompat.sysplatform.lower())
3787 keep.append(pycompat.sysplatform.lower())
3788 if ui.verbose:
3788 if ui.verbose:
3789 keep.append(b'verbose')
3789 keep.append(b'verbose')
3790
3790
3791 commands = sys.modules[__name__]
3791 commands = sys.modules[__name__]
3792 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3792 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3793 ui.pager(b'help')
3793 ui.pager(b'help')
3794 ui.write(formatted)
3794 ui.write(formatted)
3795
3795
3796
3796
3797 @command(
3797 @command(
3798 b'identify|id',
3798 b'identify|id',
3799 [
3799 [
3800 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3800 (b'r', b'rev', b'', _(b'identify the specified revision'), _(b'REV')),
3801 (b'n', b'num', None, _(b'show local revision number')),
3801 (b'n', b'num', None, _(b'show local revision number')),
3802 (b'i', b'id', None, _(b'show global revision id')),
3802 (b'i', b'id', None, _(b'show global revision id')),
3803 (b'b', b'branch', None, _(b'show branch')),
3803 (b'b', b'branch', None, _(b'show branch')),
3804 (b't', b'tags', None, _(b'show tags')),
3804 (b't', b'tags', None, _(b'show tags')),
3805 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3805 (b'B', b'bookmarks', None, _(b'show bookmarks')),
3806 ]
3806 ]
3807 + remoteopts
3807 + remoteopts
3808 + formatteropts,
3808 + formatteropts,
3809 _(b'[-nibtB] [-r REV] [SOURCE]'),
3809 _(b'[-nibtB] [-r REV] [SOURCE]'),
3810 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3810 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3811 optionalrepo=True,
3811 optionalrepo=True,
3812 intents={INTENT_READONLY},
3812 intents={INTENT_READONLY},
3813 )
3813 )
3814 def identify(
3814 def identify(
3815 ui,
3815 ui,
3816 repo,
3816 repo,
3817 source=None,
3817 source=None,
3818 rev=None,
3818 rev=None,
3819 num=None,
3819 num=None,
3820 id=None,
3820 id=None,
3821 branch=None,
3821 branch=None,
3822 tags=None,
3822 tags=None,
3823 bookmarks=None,
3823 bookmarks=None,
3824 **opts
3824 **opts
3825 ):
3825 ):
3826 """identify the working directory or specified revision
3826 """identify the working directory or specified revision
3827
3827
3828 Print a summary identifying the repository state at REV using one or
3828 Print a summary identifying the repository state at REV using one or
3829 two parent hash identifiers, followed by a "+" if the working
3829 two parent hash identifiers, followed by a "+" if the working
3830 directory has uncommitted changes, the branch name (if not default),
3830 directory has uncommitted changes, the branch name (if not default),
3831 a list of tags, and a list of bookmarks.
3831 a list of tags, and a list of bookmarks.
3832
3832
3833 When REV is not given, print a summary of the current state of the
3833 When REV is not given, print a summary of the current state of the
3834 repository including the working directory. Specify -r. to get information
3834 repository including the working directory. Specify -r. to get information
3835 of the working directory parent without scanning uncommitted changes.
3835 of the working directory parent without scanning uncommitted changes.
3836
3836
3837 Specifying a path to a repository root or Mercurial bundle will
3837 Specifying a path to a repository root or Mercurial bundle will
3838 cause lookup to operate on that repository/bundle.
3838 cause lookup to operate on that repository/bundle.
3839
3839
3840 .. container:: verbose
3840 .. container:: verbose
3841
3841
3842 Template:
3842 Template:
3843
3843
3844 The following keywords are supported in addition to the common template
3844 The following keywords are supported in addition to the common template
3845 keywords and functions. See also :hg:`help templates`.
3845 keywords and functions. See also :hg:`help templates`.
3846
3846
3847 :dirty: String. Character ``+`` denoting if the working directory has
3847 :dirty: String. Character ``+`` denoting if the working directory has
3848 uncommitted changes.
3848 uncommitted changes.
3849 :id: String. One or two nodes, optionally followed by ``+``.
3849 :id: String. One or two nodes, optionally followed by ``+``.
3850 :parents: List of strings. Parent nodes of the changeset.
3850 :parents: List of strings. Parent nodes of the changeset.
3851
3851
3852 Examples:
3852 Examples:
3853
3853
3854 - generate a build identifier for the working directory::
3854 - generate a build identifier for the working directory::
3855
3855
3856 hg id --id > build-id.dat
3856 hg id --id > build-id.dat
3857
3857
3858 - find the revision corresponding to a tag::
3858 - find the revision corresponding to a tag::
3859
3859
3860 hg id -n -r 1.3
3860 hg id -n -r 1.3
3861
3861
3862 - check the most recent revision of a remote repository::
3862 - check the most recent revision of a remote repository::
3863
3863
3864 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3864 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3865
3865
3866 See :hg:`log` for generating more information about specific revisions,
3866 See :hg:`log` for generating more information about specific revisions,
3867 including full hash identifiers.
3867 including full hash identifiers.
3868
3868
3869 Returns 0 if successful.
3869 Returns 0 if successful.
3870 """
3870 """
3871
3871
3872 opts = pycompat.byteskwargs(opts)
3872 opts = pycompat.byteskwargs(opts)
3873 if not repo and not source:
3873 if not repo and not source:
3874 raise error.InputError(
3874 raise error.InputError(
3875 _(b"there is no Mercurial repository here (.hg not found)")
3875 _(b"there is no Mercurial repository here (.hg not found)")
3876 )
3876 )
3877
3877
3878 default = not (num or id or branch or tags or bookmarks)
3878 default = not (num or id or branch or tags or bookmarks)
3879 output = []
3879 output = []
3880 revs = []
3880 revs = []
3881
3881
3882 peer = None
3882 peer = None
3883 try:
3883 try:
3884 if source:
3884 if source:
3885 source, branches = urlutil.get_unique_pull_path(
3885 source, branches = urlutil.get_unique_pull_path(
3886 b'identify', repo, ui, source
3886 b'identify', repo, ui, source
3887 )
3887 )
3888 # only pass ui when no repo
3888 # only pass ui when no repo
3889 peer = hg.peer(repo or ui, opts, source)
3889 peer = hg.peer(repo or ui, opts, source)
3890 repo = peer.local()
3890 repo = peer.local()
3891 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3891 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3892
3892
3893 fm = ui.formatter(b'identify', opts)
3893 fm = ui.formatter(b'identify', opts)
3894 fm.startitem()
3894 fm.startitem()
3895
3895
3896 if not repo:
3896 if not repo:
3897 if num or branch or tags:
3897 if num or branch or tags:
3898 raise error.InputError(
3898 raise error.InputError(
3899 _(b"can't query remote revision number, branch, or tags")
3899 _(b"can't query remote revision number, branch, or tags")
3900 )
3900 )
3901 if not rev and revs:
3901 if not rev and revs:
3902 rev = revs[0]
3902 rev = revs[0]
3903 if not rev:
3903 if not rev:
3904 rev = b"tip"
3904 rev = b"tip"
3905
3905
3906 remoterev = peer.lookup(rev)
3906 remoterev = peer.lookup(rev)
3907 hexrev = fm.hexfunc(remoterev)
3907 hexrev = fm.hexfunc(remoterev)
3908 if default or id:
3908 if default or id:
3909 output = [hexrev]
3909 output = [hexrev]
3910 fm.data(id=hexrev)
3910 fm.data(id=hexrev)
3911
3911
3912 @util.cachefunc
3912 @util.cachefunc
3913 def getbms():
3913 def getbms():
3914 bms = []
3914 bms = []
3915
3915
3916 if b'bookmarks' in peer.listkeys(b'namespaces'):
3916 if b'bookmarks' in peer.listkeys(b'namespaces'):
3917 hexremoterev = hex(remoterev)
3917 hexremoterev = hex(remoterev)
3918 bms = [
3918 bms = [
3919 bm
3919 bm
3920 for bm, bmr in pycompat.iteritems(
3920 for bm, bmr in pycompat.iteritems(
3921 peer.listkeys(b'bookmarks')
3921 peer.listkeys(b'bookmarks')
3922 )
3922 )
3923 if bmr == hexremoterev
3923 if bmr == hexremoterev
3924 ]
3924 ]
3925
3925
3926 return sorted(bms)
3926 return sorted(bms)
3927
3927
3928 if fm.isplain():
3928 if fm.isplain():
3929 if bookmarks:
3929 if bookmarks:
3930 output.extend(getbms())
3930 output.extend(getbms())
3931 elif default and not ui.quiet:
3931 elif default and not ui.quiet:
3932 # multiple bookmarks for a single parent separated by '/'
3932 # multiple bookmarks for a single parent separated by '/'
3933 bm = b'/'.join(getbms())
3933 bm = b'/'.join(getbms())
3934 if bm:
3934 if bm:
3935 output.append(bm)
3935 output.append(bm)
3936 else:
3936 else:
3937 fm.data(node=hex(remoterev))
3937 fm.data(node=hex(remoterev))
3938 if bookmarks or b'bookmarks' in fm.datahint():
3938 if bookmarks or b'bookmarks' in fm.datahint():
3939 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3939 fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
3940 else:
3940 else:
3941 if rev:
3941 if rev:
3942 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3942 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
3943 ctx = scmutil.revsingle(repo, rev, None)
3943 ctx = scmutil.revsingle(repo, rev, None)
3944
3944
3945 if ctx.rev() is None:
3945 if ctx.rev() is None:
3946 ctx = repo[None]
3946 ctx = repo[None]
3947 parents = ctx.parents()
3947 parents = ctx.parents()
3948 taglist = []
3948 taglist = []
3949 for p in parents:
3949 for p in parents:
3950 taglist.extend(p.tags())
3950 taglist.extend(p.tags())
3951
3951
3952 dirty = b""
3952 dirty = b""
3953 if ctx.dirty(missing=True, merge=False, branch=False):
3953 if ctx.dirty(missing=True, merge=False, branch=False):
3954 dirty = b'+'
3954 dirty = b'+'
3955 fm.data(dirty=dirty)
3955 fm.data(dirty=dirty)
3956
3956
3957 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3957 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3958 if default or id:
3958 if default or id:
3959 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3959 output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
3960 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3960 fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))
3961
3961
3962 if num:
3962 if num:
3963 numoutput = [b"%d" % p.rev() for p in parents]
3963 numoutput = [b"%d" % p.rev() for p in parents]
3964 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3964 output.append(b"%s%s" % (b'+'.join(numoutput), dirty))
3965
3965
3966 fm.data(
3966 fm.data(
3967 parents=fm.formatlist(
3967 parents=fm.formatlist(
3968 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3968 [fm.hexfunc(p.node()) for p in parents], name=b'node'
3969 )
3969 )
3970 )
3970 )
3971 else:
3971 else:
3972 hexoutput = fm.hexfunc(ctx.node())
3972 hexoutput = fm.hexfunc(ctx.node())
3973 if default or id:
3973 if default or id:
3974 output = [hexoutput]
3974 output = [hexoutput]
3975 fm.data(id=hexoutput)
3975 fm.data(id=hexoutput)
3976
3976
3977 if num:
3977 if num:
3978 output.append(pycompat.bytestr(ctx.rev()))
3978 output.append(pycompat.bytestr(ctx.rev()))
3979 taglist = ctx.tags()
3979 taglist = ctx.tags()
3980
3980
3981 if default and not ui.quiet:
3981 if default and not ui.quiet:
3982 b = ctx.branch()
3982 b = ctx.branch()
3983 if b != b'default':
3983 if b != b'default':
3984 output.append(b"(%s)" % b)
3984 output.append(b"(%s)" % b)
3985
3985
3986 # multiple tags for a single parent separated by '/'
3986 # multiple tags for a single parent separated by '/'
3987 t = b'/'.join(taglist)
3987 t = b'/'.join(taglist)
3988 if t:
3988 if t:
3989 output.append(t)
3989 output.append(t)
3990
3990
3991 # multiple bookmarks for a single parent separated by '/'
3991 # multiple bookmarks for a single parent separated by '/'
3992 bm = b'/'.join(ctx.bookmarks())
3992 bm = b'/'.join(ctx.bookmarks())
3993 if bm:
3993 if bm:
3994 output.append(bm)
3994 output.append(bm)
3995 else:
3995 else:
3996 if branch:
3996 if branch:
3997 output.append(ctx.branch())
3997 output.append(ctx.branch())
3998
3998
3999 if tags:
3999 if tags:
4000 output.extend(taglist)
4000 output.extend(taglist)
4001
4001
4002 if bookmarks:
4002 if bookmarks:
4003 output.extend(ctx.bookmarks())
4003 output.extend(ctx.bookmarks())
4004
4004
4005 fm.data(node=ctx.hex())
4005 fm.data(node=ctx.hex())
4006 fm.data(branch=ctx.branch())
4006 fm.data(branch=ctx.branch())
4007 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
4007 fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
4008 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
4008 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
4009 fm.context(ctx=ctx)
4009 fm.context(ctx=ctx)
4010
4010
4011 fm.plain(b"%s\n" % b' '.join(output))
4011 fm.plain(b"%s\n" % b' '.join(output))
4012 fm.end()
4012 fm.end()
4013 finally:
4013 finally:
4014 if peer:
4014 if peer:
4015 peer.close()
4015 peer.close()
4016
4016
4017
4017
4018 @command(
4018 @command(
4019 b'import|patch',
4019 b'import|patch',
4020 [
4020 [
4021 (
4021 (
4022 b'p',
4022 b'p',
4023 b'strip',
4023 b'strip',
4024 1,
4024 1,
4025 _(
4025 _(
4026 b'directory strip option for patch. This has the same '
4026 b'directory strip option for patch. This has the same '
4027 b'meaning as the corresponding patch option'
4027 b'meaning as the corresponding patch option'
4028 ),
4028 ),
4029 _(b'NUM'),
4029 _(b'NUM'),
4030 ),
4030 ),
4031 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4031 (b'b', b'base', b'', _(b'base path (DEPRECATED)'), _(b'PATH')),
4032 (b'', b'secret', None, _(b'use the secret phase for committing')),
4032 (b'', b'secret', None, _(b'use the secret phase for committing')),
4033 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4033 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
4034 (
4034 (
4035 b'f',
4035 b'f',
4036 b'force',
4036 b'force',
4037 None,
4037 None,
4038 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4038 _(b'skip check for outstanding uncommitted changes (DEPRECATED)'),
4039 ),
4039 ),
4040 (
4040 (
4041 b'',
4041 b'',
4042 b'no-commit',
4042 b'no-commit',
4043 None,
4043 None,
4044 _(b"don't commit, just update the working directory"),
4044 _(b"don't commit, just update the working directory"),
4045 ),
4045 ),
4046 (
4046 (
4047 b'',
4047 b'',
4048 b'bypass',
4048 b'bypass',
4049 None,
4049 None,
4050 _(b"apply patch without touching the working directory"),
4050 _(b"apply patch without touching the working directory"),
4051 ),
4051 ),
4052 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4052 (b'', b'partial', None, _(b'commit even if some hunks fail')),
4053 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4053 (b'', b'exact', None, _(b'abort if patch would apply lossily')),
4054 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4054 (b'', b'prefix', b'', _(b'apply patch to subdirectory'), _(b'DIR')),
4055 (
4055 (
4056 b'',
4056 b'',
4057 b'import-branch',
4057 b'import-branch',
4058 None,
4058 None,
4059 _(b'use any branch information in patch (implied by --exact)'),
4059 _(b'use any branch information in patch (implied by --exact)'),
4060 ),
4060 ),
4061 ]
4061 ]
4062 + commitopts
4062 + commitopts
4063 + commitopts2
4063 + commitopts2
4064 + similarityopts,
4064 + similarityopts,
4065 _(b'[OPTION]... PATCH...'),
4065 _(b'[OPTION]... PATCH...'),
4066 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4066 helpcategory=command.CATEGORY_IMPORT_EXPORT,
4067 )
4067 )
4068 def import_(ui, repo, patch1=None, *patches, **opts):
4068 def import_(ui, repo, patch1=None, *patches, **opts):
4069 """import an ordered set of patches
4069 """import an ordered set of patches
4070
4070
4071 Import a list of patches and commit them individually (unless
4071 Import a list of patches and commit them individually (unless
4072 --no-commit is specified).
4072 --no-commit is specified).
4073
4073
4074 To read a patch from standard input (stdin), use "-" as the patch
4074 To read a patch from standard input (stdin), use "-" as the patch
4075 name. If a URL is specified, the patch will be downloaded from
4075 name. If a URL is specified, the patch will be downloaded from
4076 there.
4076 there.
4077
4077
4078 Import first applies changes to the working directory (unless
4078 Import first applies changes to the working directory (unless
4079 --bypass is specified), import will abort if there are outstanding
4079 --bypass is specified), import will abort if there are outstanding
4080 changes.
4080 changes.
4081
4081
4082 Use --bypass to apply and commit patches directly to the
4082 Use --bypass to apply and commit patches directly to the
4083 repository, without affecting the working directory. Without
4083 repository, without affecting the working directory. Without
4084 --exact, patches will be applied on top of the working directory
4084 --exact, patches will be applied on top of the working directory
4085 parent revision.
4085 parent revision.
4086
4086
4087 You can import a patch straight from a mail message. Even patches
4087 You can import a patch straight from a mail message. Even patches
4088 as attachments work (to use the body part, it must have type
4088 as attachments work (to use the body part, it must have type
4089 text/plain or text/x-patch). From and Subject headers of email
4089 text/plain or text/x-patch). From and Subject headers of email
4090 message are used as default committer and commit message. All
4090 message are used as default committer and commit message. All
4091 text/plain body parts before first diff are added to the commit
4091 text/plain body parts before first diff are added to the commit
4092 message.
4092 message.
4093
4093
4094 If the imported patch was generated by :hg:`export`, user and
4094 If the imported patch was generated by :hg:`export`, user and
4095 description from patch override values from message headers and
4095 description from patch override values from message headers and
4096 body. Values given on command line with -m/--message and -u/--user
4096 body. Values given on command line with -m/--message and -u/--user
4097 override these.
4097 override these.
4098
4098
4099 If --exact is specified, import will set the working directory to
4099 If --exact is specified, import will set the working directory to
4100 the parent of each patch before applying it, and will abort if the
4100 the parent of each patch before applying it, and will abort if the
4101 resulting changeset has a different ID than the one recorded in
4101 resulting changeset has a different ID than the one recorded in
4102 the patch. This will guard against various ways that portable
4102 the patch. This will guard against various ways that portable
4103 patch formats and mail systems might fail to transfer Mercurial
4103 patch formats and mail systems might fail to transfer Mercurial
4104 data or metadata. See :hg:`bundle` for lossless transmission.
4104 data or metadata. See :hg:`bundle` for lossless transmission.
4105
4105
4106 Use --partial to ensure a changeset will be created from the patch
4106 Use --partial to ensure a changeset will be created from the patch
4107 even if some hunks fail to apply. Hunks that fail to apply will be
4107 even if some hunks fail to apply. Hunks that fail to apply will be
4108 written to a <target-file>.rej file. Conflicts can then be resolved
4108 written to a <target-file>.rej file. Conflicts can then be resolved
4109 by hand before :hg:`commit --amend` is run to update the created
4109 by hand before :hg:`commit --amend` is run to update the created
4110 changeset. This flag exists to let people import patches that
4110 changeset. This flag exists to let people import patches that
4111 partially apply without losing the associated metadata (author,
4111 partially apply without losing the associated metadata (author,
4112 date, description, ...).
4112 date, description, ...).
4113
4113
4114 .. note::
4114 .. note::
4115
4115
4116 When no hunks apply cleanly, :hg:`import --partial` will create
4116 When no hunks apply cleanly, :hg:`import --partial` will create
4117 an empty changeset, importing only the patch metadata.
4117 an empty changeset, importing only the patch metadata.
4118
4118
4119 With -s/--similarity, hg will attempt to discover renames and
4119 With -s/--similarity, hg will attempt to discover renames and
4120 copies in the patch in the same way as :hg:`addremove`.
4120 copies in the patch in the same way as :hg:`addremove`.
4121
4121
4122 It is possible to use external patch programs to perform the patch
4122 It is possible to use external patch programs to perform the patch
4123 by setting the ``ui.patch`` configuration option. For the default
4123 by setting the ``ui.patch`` configuration option. For the default
4124 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4124 internal tool, the fuzz can also be configured via ``patch.fuzz``.
4125 See :hg:`help config` for more information about configuration
4125 See :hg:`help config` for more information about configuration
4126 files and how to use these options.
4126 files and how to use these options.
4127
4127
4128 See :hg:`help dates` for a list of formats valid for -d/--date.
4128 See :hg:`help dates` for a list of formats valid for -d/--date.
4129
4129
4130 .. container:: verbose
4130 .. container:: verbose
4131
4131
4132 Examples:
4132 Examples:
4133
4133
4134 - import a traditional patch from a website and detect renames::
4134 - import a traditional patch from a website and detect renames::
4135
4135
4136 hg import -s 80 http://example.com/bugfix.patch
4136 hg import -s 80 http://example.com/bugfix.patch
4137
4137
4138 - import a changeset from an hgweb server::
4138 - import a changeset from an hgweb server::
4139
4139
4140 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4140 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
4141
4141
4142 - import all the patches in an Unix-style mbox::
4142 - import all the patches in an Unix-style mbox::
4143
4143
4144 hg import incoming-patches.mbox
4144 hg import incoming-patches.mbox
4145
4145
4146 - import patches from stdin::
4146 - import patches from stdin::
4147
4147
4148 hg import -
4148 hg import -
4149
4149
4150 - attempt to exactly restore an exported changeset (not always
4150 - attempt to exactly restore an exported changeset (not always
4151 possible)::
4151 possible)::
4152
4152
4153 hg import --exact proposed-fix.patch
4153 hg import --exact proposed-fix.patch
4154
4154
4155 - use an external tool to apply a patch which is too fuzzy for
4155 - use an external tool to apply a patch which is too fuzzy for
4156 the default internal tool.
4156 the default internal tool.
4157
4157
4158 hg import --config ui.patch="patch --merge" fuzzy.patch
4158 hg import --config ui.patch="patch --merge" fuzzy.patch
4159
4159
4160 - change the default fuzzing from 2 to a less strict 7
4160 - change the default fuzzing from 2 to a less strict 7
4161
4161
4162 hg import --config ui.fuzz=7 fuzz.patch
4162 hg import --config ui.fuzz=7 fuzz.patch
4163
4163
4164 Returns 0 on success, 1 on partial success (see --partial).
4164 Returns 0 on success, 1 on partial success (see --partial).
4165 """
4165 """
4166
4166
4167 cmdutil.check_incompatible_arguments(
4167 cmdutil.check_incompatible_arguments(
4168 opts, 'no_commit', ['bypass', 'secret']
4168 opts, 'no_commit', ['bypass', 'secret']
4169 )
4169 )
4170 cmdutil.check_incompatible_arguments(opts, 'exact', ['edit', 'prefix'])
4170 cmdutil.check_incompatible_arguments(opts, 'exact', ['edit', 'prefix'])
4171 opts = pycompat.byteskwargs(opts)
4171 opts = pycompat.byteskwargs(opts)
4172 if not patch1:
4172 if not patch1:
4173 raise error.InputError(_(b'need at least one patch to import'))
4173 raise error.InputError(_(b'need at least one patch to import'))
4174
4174
4175 patches = (patch1,) + patches
4175 patches = (patch1,) + patches
4176
4176
4177 date = opts.get(b'date')
4177 date = opts.get(b'date')
4178 if date:
4178 if date:
4179 opts[b'date'] = dateutil.parsedate(date)
4179 opts[b'date'] = dateutil.parsedate(date)
4180
4180
4181 exact = opts.get(b'exact')
4181 exact = opts.get(b'exact')
4182 update = not opts.get(b'bypass')
4182 update = not opts.get(b'bypass')
4183 try:
4183 try:
4184 sim = float(opts.get(b'similarity') or 0)
4184 sim = float(opts.get(b'similarity') or 0)
4185 except ValueError:
4185 except ValueError:
4186 raise error.InputError(_(b'similarity must be a number'))
4186 raise error.InputError(_(b'similarity must be a number'))
4187 if sim < 0 or sim > 100:
4187 if sim < 0 or sim > 100:
4188 raise error.InputError(_(b'similarity must be between 0 and 100'))
4188 raise error.InputError(_(b'similarity must be between 0 and 100'))
4189 if sim and not update:
4189 if sim and not update:
4190 raise error.InputError(_(b'cannot use --similarity with --bypass'))
4190 raise error.InputError(_(b'cannot use --similarity with --bypass'))
4191
4191
4192 base = opts[b"base"]
4192 base = opts[b"base"]
4193 msgs = []
4193 msgs = []
4194 ret = 0
4194 ret = 0
4195
4195
4196 with repo.wlock():
4196 with repo.wlock():
4197 if update:
4197 if update:
4198 cmdutil.checkunfinished(repo)
4198 cmdutil.checkunfinished(repo)
4199 if exact or not opts.get(b'force'):
4199 if exact or not opts.get(b'force'):
4200 cmdutil.bailifchanged(repo)
4200 cmdutil.bailifchanged(repo)
4201
4201
4202 if not opts.get(b'no_commit'):
4202 if not opts.get(b'no_commit'):
4203 lock = repo.lock
4203 lock = repo.lock
4204 tr = lambda: repo.transaction(b'import')
4204 tr = lambda: repo.transaction(b'import')
4205 dsguard = util.nullcontextmanager
4205 dsguard = util.nullcontextmanager
4206 else:
4206 else:
4207 lock = util.nullcontextmanager
4207 lock = util.nullcontextmanager
4208 tr = util.nullcontextmanager
4208 tr = util.nullcontextmanager
4209 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4209 dsguard = lambda: dirstateguard.dirstateguard(repo, b'import')
4210 with lock(), tr(), dsguard():
4210 with lock(), tr(), dsguard():
4211 parents = repo[None].parents()
4211 parents = repo[None].parents()
4212 for patchurl in patches:
4212 for patchurl in patches:
4213 if patchurl == b'-':
4213 if patchurl == b'-':
4214 ui.status(_(b'applying patch from stdin\n'))
4214 ui.status(_(b'applying patch from stdin\n'))
4215 patchfile = ui.fin
4215 patchfile = ui.fin
4216 patchurl = b'stdin' # for error message
4216 patchurl = b'stdin' # for error message
4217 else:
4217 else:
4218 patchurl = os.path.join(base, patchurl)
4218 patchurl = os.path.join(base, patchurl)
4219 ui.status(_(b'applying %s\n') % patchurl)
4219 ui.status(_(b'applying %s\n') % patchurl)
4220 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4220 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
4221
4221
4222 haspatch = False
4222 haspatch = False
4223 for hunk in patch.split(patchfile):
4223 for hunk in patch.split(patchfile):
4224 with patch.extract(ui, hunk) as patchdata:
4224 with patch.extract(ui, hunk) as patchdata:
4225 msg, node, rej = cmdutil.tryimportone(
4225 msg, node, rej = cmdutil.tryimportone(
4226 ui, repo, patchdata, parents, opts, msgs, hg.clean
4226 ui, repo, patchdata, parents, opts, msgs, hg.clean
4227 )
4227 )
4228 if msg:
4228 if msg:
4229 haspatch = True
4229 haspatch = True
4230 ui.note(msg + b'\n')
4230 ui.note(msg + b'\n')
4231 if update or exact:
4231 if update or exact:
4232 parents = repo[None].parents()
4232 parents = repo[None].parents()
4233 else:
4233 else:
4234 parents = [repo[node]]
4234 parents = [repo[node]]
4235 if rej:
4235 if rej:
4236 ui.write_err(_(b"patch applied partially\n"))
4236 ui.write_err(_(b"patch applied partially\n"))
4237 ui.write_err(
4237 ui.write_err(
4238 _(
4238 _(
4239 b"(fix the .rej files and run "
4239 b"(fix the .rej files and run "
4240 b"`hg commit --amend`)\n"
4240 b"`hg commit --amend`)\n"
4241 )
4241 )
4242 )
4242 )
4243 ret = 1
4243 ret = 1
4244 break
4244 break
4245
4245
4246 if not haspatch:
4246 if not haspatch:
4247 raise error.InputError(_(b'%s: no diffs found') % patchurl)
4247 raise error.InputError(_(b'%s: no diffs found') % patchurl)
4248
4248
4249 if msgs:
4249 if msgs:
4250 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4250 repo.savecommitmessage(b'\n* * *\n'.join(msgs))
4251 return ret
4251 return ret
4252
4252
4253
4253
4254 @command(
4254 @command(
4255 b'incoming|in',
4255 b'incoming|in',
4256 [
4256 [
4257 (
4257 (
4258 b'f',
4258 b'f',
4259 b'force',
4259 b'force',
4260 None,
4260 None,
4261 _(b'run even if remote repository is unrelated'),
4261 _(b'run even if remote repository is unrelated'),
4262 ),
4262 ),
4263 (b'n', b'newest-first', None, _(b'show newest record first')),
4263 (b'n', b'newest-first', None, _(b'show newest record first')),
4264 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4264 (b'', b'bundle', b'', _(b'file to store the bundles into'), _(b'FILE')),
4265 (
4265 (
4266 b'r',
4266 b'r',
4267 b'rev',
4267 b'rev',
4268 [],
4268 [],
4269 _(b'a remote changeset intended to be added'),
4269 _(b'a remote changeset intended to be added'),
4270 _(b'REV'),
4270 _(b'REV'),
4271 ),
4271 ),
4272 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4272 (b'B', b'bookmarks', False, _(b"compare bookmarks")),
4273 (
4273 (
4274 b'b',
4274 b'b',
4275 b'branch',
4275 b'branch',
4276 [],
4276 [],
4277 _(b'a specific branch you would like to pull'),
4277 _(b'a specific branch you would like to pull'),
4278 _(b'BRANCH'),
4278 _(b'BRANCH'),
4279 ),
4279 ),
4280 ]
4280 ]
4281 + logopts
4281 + logopts
4282 + remoteopts
4282 + remoteopts
4283 + subrepoopts,
4283 + subrepoopts,
4284 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4284 _(b'[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
4285 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4285 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4286 )
4286 )
4287 def incoming(ui, repo, source=b"default", **opts):
4287 def incoming(ui, repo, source=b"default", **opts):
4288 """show new changesets found in source
4288 """show new changesets found in source
4289
4289
4290 Show new changesets found in the specified path/URL or the default
4290 Show new changesets found in the specified path/URL or the default
4291 pull location. These are the changesets that would have been pulled
4291 pull location. These are the changesets that would have been pulled
4292 by :hg:`pull` at the time you issued this command.
4292 by :hg:`pull` at the time you issued this command.
4293
4293
4294 See pull for valid source format details.
4294 See pull for valid source format details.
4295
4295
4296 .. container:: verbose
4296 .. container:: verbose
4297
4297
4298 With -B/--bookmarks, the result of bookmark comparison between
4298 With -B/--bookmarks, the result of bookmark comparison between
4299 local and remote repositories is displayed. With -v/--verbose,
4299 local and remote repositories is displayed. With -v/--verbose,
4300 status is also displayed for each bookmark like below::
4300 status is also displayed for each bookmark like below::
4301
4301
4302 BM1 01234567890a added
4302 BM1 01234567890a added
4303 BM2 1234567890ab advanced
4303 BM2 1234567890ab advanced
4304 BM3 234567890abc diverged
4304 BM3 234567890abc diverged
4305 BM4 34567890abcd changed
4305 BM4 34567890abcd changed
4306
4306
4307 The action taken locally when pulling depends on the
4307 The action taken locally when pulling depends on the
4308 status of each bookmark:
4308 status of each bookmark:
4309
4309
4310 :``added``: pull will create it
4310 :``added``: pull will create it
4311 :``advanced``: pull will update it
4311 :``advanced``: pull will update it
4312 :``diverged``: pull will create a divergent bookmark
4312 :``diverged``: pull will create a divergent bookmark
4313 :``changed``: result depends on remote changesets
4313 :``changed``: result depends on remote changesets
4314
4314
4315 From the point of view of pulling behavior, bookmark
4315 From the point of view of pulling behavior, bookmark
4316 existing only in the remote repository are treated as ``added``,
4316 existing only in the remote repository are treated as ``added``,
4317 even if it is in fact locally deleted.
4317 even if it is in fact locally deleted.
4318
4318
4319 .. container:: verbose
4319 .. container:: verbose
4320
4320
4321 For remote repository, using --bundle avoids downloading the
4321 For remote repository, using --bundle avoids downloading the
4322 changesets twice if the incoming is followed by a pull.
4322 changesets twice if the incoming is followed by a pull.
4323
4323
4324 Examples:
4324 Examples:
4325
4325
4326 - show incoming changes with patches and full description::
4326 - show incoming changes with patches and full description::
4327
4327
4328 hg incoming -vp
4328 hg incoming -vp
4329
4329
4330 - show incoming changes excluding merges, store a bundle::
4330 - show incoming changes excluding merges, store a bundle::
4331
4331
4332 hg in -vpM --bundle incoming.hg
4332 hg in -vpM --bundle incoming.hg
4333 hg pull incoming.hg
4333 hg pull incoming.hg
4334
4334
4335 - briefly list changes inside a bundle::
4335 - briefly list changes inside a bundle::
4336
4336
4337 hg in changes.hg -T "{desc|firstline}\\n"
4337 hg in changes.hg -T "{desc|firstline}\\n"
4338
4338
4339 Returns 0 if there are incoming changes, 1 otherwise.
4339 Returns 0 if there are incoming changes, 1 otherwise.
4340 """
4340 """
4341 opts = pycompat.byteskwargs(opts)
4341 opts = pycompat.byteskwargs(opts)
4342 if opts.get(b'graph'):
4342 if opts.get(b'graph'):
4343 logcmdutil.checkunsupportedgraphflags([], opts)
4343 logcmdutil.checkunsupportedgraphflags([], opts)
4344
4344
4345 def display(other, chlist, displayer):
4345 def display(other, chlist, displayer):
4346 revdag = logcmdutil.graphrevs(other, chlist, opts)
4346 revdag = logcmdutil.graphrevs(other, chlist, opts)
4347 logcmdutil.displaygraph(
4347 logcmdutil.displaygraph(
4348 ui, repo, revdag, displayer, graphmod.asciiedges
4348 ui, repo, revdag, displayer, graphmod.asciiedges
4349 )
4349 )
4350
4350
4351 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4351 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4352 return 0
4352 return 0
4353
4353
4354 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle'])
4354 cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle'])
4355
4355
4356 if opts.get(b'bookmarks'):
4356 if opts.get(b'bookmarks'):
4357 srcs = urlutil.get_pull_paths(repo, ui, [source], opts.get(b'branch'))
4357 srcs = urlutil.get_pull_paths(repo, ui, [source], opts.get(b'branch'))
4358 for source, branches in srcs:
4358 for source, branches in srcs:
4359 other = hg.peer(repo, opts, source)
4359 other = hg.peer(repo, opts, source)
4360 try:
4360 try:
4361 if b'bookmarks' not in other.listkeys(b'namespaces'):
4361 if b'bookmarks' not in other.listkeys(b'namespaces'):
4362 ui.warn(_(b"remote doesn't support bookmarks\n"))
4362 ui.warn(_(b"remote doesn't support bookmarks\n"))
4363 return 0
4363 return 0
4364 ui.pager(b'incoming')
4364 ui.pager(b'incoming')
4365 ui.status(
4365 ui.status(
4366 _(b'comparing with %s\n') % urlutil.hidepassword(source)
4366 _(b'comparing with %s\n') % urlutil.hidepassword(source)
4367 )
4367 )
4368 return bookmarks.incoming(ui, repo, other)
4368 return bookmarks.incoming(ui, repo, other)
4369 finally:
4369 finally:
4370 other.close()
4370 other.close()
4371
4371
4372 return hg.incoming(ui, repo, source, opts)
4372 return hg.incoming(ui, repo, source, opts)
4373
4373
4374
4374
4375 @command(
4375 @command(
4376 b'init',
4376 b'init',
4377 remoteopts,
4377 remoteopts,
4378 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4378 _(b'[-e CMD] [--remotecmd CMD] [DEST]'),
4379 helpcategory=command.CATEGORY_REPO_CREATION,
4379 helpcategory=command.CATEGORY_REPO_CREATION,
4380 helpbasic=True,
4380 helpbasic=True,
4381 norepo=True,
4381 norepo=True,
4382 )
4382 )
4383 def init(ui, dest=b".", **opts):
4383 def init(ui, dest=b".", **opts):
4384 """create a new repository in the given directory
4384 """create a new repository in the given directory
4385
4385
4386 Initialize a new repository in the given directory. If the given
4386 Initialize a new repository in the given directory. If the given
4387 directory does not exist, it will be created.
4387 directory does not exist, it will be created.
4388
4388
4389 If no directory is given, the current directory is used.
4389 If no directory is given, the current directory is used.
4390
4390
4391 It is possible to specify an ``ssh://`` URL as the destination.
4391 It is possible to specify an ``ssh://`` URL as the destination.
4392 See :hg:`help urls` for more information.
4392 See :hg:`help urls` for more information.
4393
4393
4394 Returns 0 on success.
4394 Returns 0 on success.
4395 """
4395 """
4396 opts = pycompat.byteskwargs(opts)
4396 opts = pycompat.byteskwargs(opts)
4397 path = urlutil.get_clone_path(ui, dest)[1]
4397 path = urlutil.get_clone_path(ui, dest)[1]
4398 peer = hg.peer(ui, opts, path, create=True)
4398 peer = hg.peer(ui, opts, path, create=True)
4399 peer.close()
4399 peer.close()
4400
4400
4401
4401
4402 @command(
4402 @command(
4403 b'locate',
4403 b'locate',
4404 [
4404 [
4405 (
4405 (
4406 b'r',
4406 b'r',
4407 b'rev',
4407 b'rev',
4408 b'',
4408 b'',
4409 _(b'search the repository as it is in REV'),
4409 _(b'search the repository as it is in REV'),
4410 _(b'REV'),
4410 _(b'REV'),
4411 ),
4411 ),
4412 (
4412 (
4413 b'0',
4413 b'0',
4414 b'print0',
4414 b'print0',
4415 None,
4415 None,
4416 _(b'end filenames with NUL, for use with xargs'),
4416 _(b'end filenames with NUL, for use with xargs'),
4417 ),
4417 ),
4418 (
4418 (
4419 b'f',
4419 b'f',
4420 b'fullpath',
4420 b'fullpath',
4421 None,
4421 None,
4422 _(b'print complete paths from the filesystem root'),
4422 _(b'print complete paths from the filesystem root'),
4423 ),
4423 ),
4424 ]
4424 ]
4425 + walkopts,
4425 + walkopts,
4426 _(b'[OPTION]... [PATTERN]...'),
4426 _(b'[OPTION]... [PATTERN]...'),
4427 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4427 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4428 )
4428 )
4429 def locate(ui, repo, *pats, **opts):
4429 def locate(ui, repo, *pats, **opts):
4430 """locate files matching specific patterns (DEPRECATED)
4430 """locate files matching specific patterns (DEPRECATED)
4431
4431
4432 Print files under Mercurial control in the working directory whose
4432 Print files under Mercurial control in the working directory whose
4433 names match the given patterns.
4433 names match the given patterns.
4434
4434
4435 By default, this command searches all directories in the working
4435 By default, this command searches all directories in the working
4436 directory. To search just the current directory and its
4436 directory. To search just the current directory and its
4437 subdirectories, use "--include .".
4437 subdirectories, use "--include .".
4438
4438
4439 If no patterns are given to match, this command prints the names
4439 If no patterns are given to match, this command prints the names
4440 of all files under Mercurial control in the working directory.
4440 of all files under Mercurial control in the working directory.
4441
4441
4442 If you want to feed the output of this command into the "xargs"
4442 If you want to feed the output of this command into the "xargs"
4443 command, use the -0 option to both this command and "xargs". This
4443 command, use the -0 option to both this command and "xargs". This
4444 will avoid the problem of "xargs" treating single filenames that
4444 will avoid the problem of "xargs" treating single filenames that
4445 contain whitespace as multiple filenames.
4445 contain whitespace as multiple filenames.
4446
4446
4447 See :hg:`help files` for a more versatile command.
4447 See :hg:`help files` for a more versatile command.
4448
4448
4449 Returns 0 if a match is found, 1 otherwise.
4449 Returns 0 if a match is found, 1 otherwise.
4450 """
4450 """
4451 opts = pycompat.byteskwargs(opts)
4451 opts = pycompat.byteskwargs(opts)
4452 if opts.get(b'print0'):
4452 if opts.get(b'print0'):
4453 end = b'\0'
4453 end = b'\0'
4454 else:
4454 else:
4455 end = b'\n'
4455 end = b'\n'
4456 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4456 ctx = scmutil.revsingle(repo, opts.get(b'rev'), None)
4457
4457
4458 ret = 1
4458 ret = 1
4459 m = scmutil.match(
4459 m = scmutil.match(
4460 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4460 ctx, pats, opts, default=b'relglob', badfn=lambda x, y: False
4461 )
4461 )
4462
4462
4463 ui.pager(b'locate')
4463 ui.pager(b'locate')
4464 if ctx.rev() is None:
4464 if ctx.rev() is None:
4465 # When run on the working copy, "locate" includes removed files, so
4465 # When run on the working copy, "locate" includes removed files, so
4466 # we get the list of files from the dirstate.
4466 # we get the list of files from the dirstate.
4467 filesgen = sorted(repo.dirstate.matches(m))
4467 filesgen = sorted(repo.dirstate.matches(m))
4468 else:
4468 else:
4469 filesgen = ctx.matches(m)
4469 filesgen = ctx.matches(m)
4470 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4470 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
4471 for abs in filesgen:
4471 for abs in filesgen:
4472 if opts.get(b'fullpath'):
4472 if opts.get(b'fullpath'):
4473 ui.write(repo.wjoin(abs), end)
4473 ui.write(repo.wjoin(abs), end)
4474 else:
4474 else:
4475 ui.write(uipathfn(abs), end)
4475 ui.write(uipathfn(abs), end)
4476 ret = 0
4476 ret = 0
4477
4477
4478 return ret
4478 return ret
4479
4479
4480
4480
4481 @command(
4481 @command(
4482 b'log|history',
4482 b'log|history',
4483 [
4483 [
4484 (
4484 (
4485 b'f',
4485 b'f',
4486 b'follow',
4486 b'follow',
4487 None,
4487 None,
4488 _(
4488 _(
4489 b'follow changeset history, or file history across copies and renames'
4489 b'follow changeset history, or file history across copies and renames'
4490 ),
4490 ),
4491 ),
4491 ),
4492 (
4492 (
4493 b'',
4493 b'',
4494 b'follow-first',
4494 b'follow-first',
4495 None,
4495 None,
4496 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4496 _(b'only follow the first parent of merge changesets (DEPRECATED)'),
4497 ),
4497 ),
4498 (
4498 (
4499 b'd',
4499 b'd',
4500 b'date',
4500 b'date',
4501 b'',
4501 b'',
4502 _(b'show revisions matching date spec'),
4502 _(b'show revisions matching date spec'),
4503 _(b'DATE'),
4503 _(b'DATE'),
4504 ),
4504 ),
4505 (b'C', b'copies', None, _(b'show copied files')),
4505 (b'C', b'copies', None, _(b'show copied files')),
4506 (
4506 (
4507 b'k',
4507 b'k',
4508 b'keyword',
4508 b'keyword',
4509 [],
4509 [],
4510 _(b'do case-insensitive search for a given text'),
4510 _(b'do case-insensitive search for a given text'),
4511 _(b'TEXT'),
4511 _(b'TEXT'),
4512 ),
4512 ),
4513 (
4513 (
4514 b'r',
4514 b'r',
4515 b'rev',
4515 b'rev',
4516 [],
4516 [],
4517 _(b'revisions to select or follow from'),
4517 _(b'revisions to select or follow from'),
4518 _(b'REV'),
4518 _(b'REV'),
4519 ),
4519 ),
4520 (
4520 (
4521 b'L',
4521 b'L',
4522 b'line-range',
4522 b'line-range',
4523 [],
4523 [],
4524 _(b'follow line range of specified file (EXPERIMENTAL)'),
4524 _(b'follow line range of specified file (EXPERIMENTAL)'),
4525 _(b'FILE,RANGE'),
4525 _(b'FILE,RANGE'),
4526 ),
4526 ),
4527 (
4527 (
4528 b'',
4528 b'',
4529 b'removed',
4529 b'removed',
4530 None,
4530 None,
4531 _(b'include revisions where files were removed'),
4531 _(b'include revisions where files were removed'),
4532 ),
4532 ),
4533 (
4533 (
4534 b'm',
4534 b'm',
4535 b'only-merges',
4535 b'only-merges',
4536 None,
4536 None,
4537 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4537 _(b'show only merges (DEPRECATED) (use -r "merge()" instead)'),
4538 ),
4538 ),
4539 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4539 (b'u', b'user', [], _(b'revisions committed by user'), _(b'USER')),
4540 (
4540 (
4541 b'',
4541 b'',
4542 b'only-branch',
4542 b'only-branch',
4543 [],
4543 [],
4544 _(
4544 _(
4545 b'show only changesets within the given named branch (DEPRECATED)'
4545 b'show only changesets within the given named branch (DEPRECATED)'
4546 ),
4546 ),
4547 _(b'BRANCH'),
4547 _(b'BRANCH'),
4548 ),
4548 ),
4549 (
4549 (
4550 b'b',
4550 b'b',
4551 b'branch',
4551 b'branch',
4552 [],
4552 [],
4553 _(b'show changesets within the given named branch'),
4553 _(b'show changesets within the given named branch'),
4554 _(b'BRANCH'),
4554 _(b'BRANCH'),
4555 ),
4555 ),
4556 (
4556 (
4557 b'B',
4557 b'B',
4558 b'bookmark',
4558 b'bookmark',
4559 [],
4559 [],
4560 _(b"show changesets within the given bookmark"),
4560 _(b"show changesets within the given bookmark"),
4561 _(b'BOOKMARK'),
4561 _(b'BOOKMARK'),
4562 ),
4562 ),
4563 (
4563 (
4564 b'P',
4564 b'P',
4565 b'prune',
4565 b'prune',
4566 [],
4566 [],
4567 _(b'do not display revision or any of its ancestors'),
4567 _(b'do not display revision or any of its ancestors'),
4568 _(b'REV'),
4568 _(b'REV'),
4569 ),
4569 ),
4570 ]
4570 ]
4571 + logopts
4571 + logopts
4572 + walkopts,
4572 + walkopts,
4573 _(b'[OPTION]... [FILE]'),
4573 _(b'[OPTION]... [FILE]'),
4574 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4574 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4575 helpbasic=True,
4575 helpbasic=True,
4576 inferrepo=True,
4576 inferrepo=True,
4577 intents={INTENT_READONLY},
4577 intents={INTENT_READONLY},
4578 )
4578 )
4579 def log(ui, repo, *pats, **opts):
4579 def log(ui, repo, *pats, **opts):
4580 """show revision history of entire repository or files
4580 """show revision history of entire repository or files
4581
4581
4582 Print the revision history of the specified files or the entire
4582 Print the revision history of the specified files or the entire
4583 project.
4583 project.
4584
4584
4585 If no revision range is specified, the default is ``tip:0`` unless
4585 If no revision range is specified, the default is ``tip:0`` unless
4586 --follow is set.
4586 --follow is set.
4587
4587
4588 File history is shown without following rename or copy history of
4588 File history is shown without following rename or copy history of
4589 files. Use -f/--follow with a filename to follow history across
4589 files. Use -f/--follow with a filename to follow history across
4590 renames and copies. --follow without a filename will only show
4590 renames and copies. --follow without a filename will only show
4591 ancestors of the starting revisions. The starting revisions can be
4591 ancestors of the starting revisions. The starting revisions can be
4592 specified by -r/--rev, which default to the working directory parent.
4592 specified by -r/--rev, which default to the working directory parent.
4593
4593
4594 By default this command prints revision number and changeset id,
4594 By default this command prints revision number and changeset id,
4595 tags, non-trivial parents, user, date and time, and a summary for
4595 tags, non-trivial parents, user, date and time, and a summary for
4596 each commit. When the -v/--verbose switch is used, the list of
4596 each commit. When the -v/--verbose switch is used, the list of
4597 changed files and full commit message are shown.
4597 changed files and full commit message are shown.
4598
4598
4599 With --graph the revisions are shown as an ASCII art DAG with the most
4599 With --graph the revisions are shown as an ASCII art DAG with the most
4600 recent changeset at the top.
4600 recent changeset at the top.
4601 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
4601 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
4602 involved in an unresolved merge conflict, '_' closes a branch,
4602 involved in an unresolved merge conflict, '_' closes a branch,
4603 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4603 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
4604 changeset from the lines below is a parent of the 'o' merge on the same
4604 changeset from the lines below is a parent of the 'o' merge on the same
4605 line.
4605 line.
4606 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4606 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
4607 of a '|' indicates one or more revisions in a path are omitted.
4607 of a '|' indicates one or more revisions in a path are omitted.
4608
4608
4609 .. container:: verbose
4609 .. container:: verbose
4610
4610
4611 Use -L/--line-range FILE,M:N options to follow the history of lines
4611 Use -L/--line-range FILE,M:N options to follow the history of lines
4612 from M to N in FILE. With -p/--patch only diff hunks affecting
4612 from M to N in FILE. With -p/--patch only diff hunks affecting
4613 specified line range will be shown. This option requires --follow;
4613 specified line range will be shown. This option requires --follow;
4614 it can be specified multiple times. Currently, this option is not
4614 it can be specified multiple times. Currently, this option is not
4615 compatible with --graph. This option is experimental.
4615 compatible with --graph. This option is experimental.
4616
4616
4617 .. note::
4617 .. note::
4618
4618
4619 :hg:`log --patch` may generate unexpected diff output for merge
4619 :hg:`log --patch` may generate unexpected diff output for merge
4620 changesets, as it will only compare the merge changeset against
4620 changesets, as it will only compare the merge changeset against
4621 its first parent. Also, only files different from BOTH parents
4621 its first parent. Also, only files different from BOTH parents
4622 will appear in files:.
4622 will appear in files:.
4623
4623
4624 .. note::
4624 .. note::
4625
4625
4626 For performance reasons, :hg:`log FILE` may omit duplicate changes
4626 For performance reasons, :hg:`log FILE` may omit duplicate changes
4627 made on branches and will not show removals or mode changes. To
4627 made on branches and will not show removals or mode changes. To
4628 see all such changes, use the --removed switch.
4628 see all such changes, use the --removed switch.
4629
4629
4630 .. container:: verbose
4630 .. container:: verbose
4631
4631
4632 .. note::
4632 .. note::
4633
4633
4634 The history resulting from -L/--line-range options depends on diff
4634 The history resulting from -L/--line-range options depends on diff
4635 options; for instance if white-spaces are ignored, respective changes
4635 options; for instance if white-spaces are ignored, respective changes
4636 with only white-spaces in specified line range will not be listed.
4636 with only white-spaces in specified line range will not be listed.
4637
4637
4638 .. container:: verbose
4638 .. container:: verbose
4639
4639
4640 Some examples:
4640 Some examples:
4641
4641
4642 - changesets with full descriptions and file lists::
4642 - changesets with full descriptions and file lists::
4643
4643
4644 hg log -v
4644 hg log -v
4645
4645
4646 - changesets ancestral to the working directory::
4646 - changesets ancestral to the working directory::
4647
4647
4648 hg log -f
4648 hg log -f
4649
4649
4650 - last 10 commits on the current branch::
4650 - last 10 commits on the current branch::
4651
4651
4652 hg log -l 10 -b .
4652 hg log -l 10 -b .
4653
4653
4654 - changesets showing all modifications of a file, including removals::
4654 - changesets showing all modifications of a file, including removals::
4655
4655
4656 hg log --removed file.c
4656 hg log --removed file.c
4657
4657
4658 - all changesets that touch a directory, with diffs, excluding merges::
4658 - all changesets that touch a directory, with diffs, excluding merges::
4659
4659
4660 hg log -Mp lib/
4660 hg log -Mp lib/
4661
4661
4662 - all revision numbers that match a keyword::
4662 - all revision numbers that match a keyword::
4663
4663
4664 hg log -k bug --template "{rev}\\n"
4664 hg log -k bug --template "{rev}\\n"
4665
4665
4666 - the full hash identifier of the working directory parent::
4666 - the full hash identifier of the working directory parent::
4667
4667
4668 hg log -r . --template "{node}\\n"
4668 hg log -r . --template "{node}\\n"
4669
4669
4670 - list available log templates::
4670 - list available log templates::
4671
4671
4672 hg log -T list
4672 hg log -T list
4673
4673
4674 - check if a given changeset is included in a tagged release::
4674 - check if a given changeset is included in a tagged release::
4675
4675
4676 hg log -r "a21ccf and ancestor(1.9)"
4676 hg log -r "a21ccf and ancestor(1.9)"
4677
4677
4678 - find all changesets by some user in a date range::
4678 - find all changesets by some user in a date range::
4679
4679
4680 hg log -k alice -d "may 2008 to jul 2008"
4680 hg log -k alice -d "may 2008 to jul 2008"
4681
4681
4682 - summary of all changesets after the last tag::
4682 - summary of all changesets after the last tag::
4683
4683
4684 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4684 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4685
4685
4686 - changesets touching lines 13 to 23 for file.c::
4686 - changesets touching lines 13 to 23 for file.c::
4687
4687
4688 hg log -L file.c,13:23
4688 hg log -L file.c,13:23
4689
4689
4690 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4690 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
4691 main.c with patch::
4691 main.c with patch::
4692
4692
4693 hg log -L file.c,13:23 -L main.c,2:6 -p
4693 hg log -L file.c,13:23 -L main.c,2:6 -p
4694
4694
4695 See :hg:`help dates` for a list of formats valid for -d/--date.
4695 See :hg:`help dates` for a list of formats valid for -d/--date.
4696
4696
4697 See :hg:`help revisions` for more about specifying and ordering
4697 See :hg:`help revisions` for more about specifying and ordering
4698 revisions.
4698 revisions.
4699
4699
4700 See :hg:`help templates` for more about pre-packaged styles and
4700 See :hg:`help templates` for more about pre-packaged styles and
4701 specifying custom templates. The default template used by the log
4701 specifying custom templates. The default template used by the log
4702 command can be customized via the ``command-templates.log`` configuration
4702 command can be customized via the ``command-templates.log`` configuration
4703 setting.
4703 setting.
4704
4704
4705 Returns 0 on success.
4705 Returns 0 on success.
4706
4706
4707 """
4707 """
4708 opts = pycompat.byteskwargs(opts)
4708 opts = pycompat.byteskwargs(opts)
4709 linerange = opts.get(b'line_range')
4709 linerange = opts.get(b'line_range')
4710
4710
4711 if linerange and not opts.get(b'follow'):
4711 if linerange and not opts.get(b'follow'):
4712 raise error.InputError(_(b'--line-range requires --follow'))
4712 raise error.InputError(_(b'--line-range requires --follow'))
4713
4713
4714 if linerange and pats:
4714 if linerange and pats:
4715 # TODO: take pats as patterns with no line-range filter
4715 # TODO: take pats as patterns with no line-range filter
4716 raise error.InputError(
4716 raise error.InputError(
4717 _(b'FILE arguments are not compatible with --line-range option')
4717 _(b'FILE arguments are not compatible with --line-range option')
4718 )
4718 )
4719
4719
4720 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4720 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
4721 walk_opts = logcmdutil.parseopts(ui, pats, opts)
4721 walk_opts = logcmdutil.parseopts(ui, pats, opts)
4722 revs, differ = logcmdutil.getrevs(repo, walk_opts)
4722 revs, differ = logcmdutil.getrevs(repo, walk_opts)
4723 if linerange:
4723 if linerange:
4724 # TODO: should follow file history from logcmdutil._initialrevs(),
4724 # TODO: should follow file history from logcmdutil._initialrevs(),
4725 # then filter the result by logcmdutil._makerevset() and --limit
4725 # then filter the result by logcmdutil._makerevset() and --limit
4726 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4726 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
4727
4727
4728 getcopies = None
4728 getcopies = None
4729 if opts.get(b'copies'):
4729 if opts.get(b'copies'):
4730 endrev = None
4730 endrev = None
4731 if revs:
4731 if revs:
4732 endrev = revs.max() + 1
4732 endrev = revs.max() + 1
4733 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4733 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
4734
4734
4735 ui.pager(b'log')
4735 ui.pager(b'log')
4736 displayer = logcmdutil.changesetdisplayer(
4736 displayer = logcmdutil.changesetdisplayer(
4737 ui, repo, opts, differ, buffered=True
4737 ui, repo, opts, differ, buffered=True
4738 )
4738 )
4739 if opts.get(b'graph'):
4739 if opts.get(b'graph'):
4740 displayfn = logcmdutil.displaygraphrevs
4740 displayfn = logcmdutil.displaygraphrevs
4741 else:
4741 else:
4742 displayfn = logcmdutil.displayrevs
4742 displayfn = logcmdutil.displayrevs
4743 displayfn(ui, repo, revs, displayer, getcopies)
4743 displayfn(ui, repo, revs, displayer, getcopies)
4744
4744
4745
4745
4746 @command(
4746 @command(
4747 b'manifest',
4747 b'manifest',
4748 [
4748 [
4749 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4749 (b'r', b'rev', b'', _(b'revision to display'), _(b'REV')),
4750 (b'', b'all', False, _(b"list files from all revisions")),
4750 (b'', b'all', False, _(b"list files from all revisions")),
4751 ]
4751 ]
4752 + formatteropts,
4752 + formatteropts,
4753 _(b'[-r REV]'),
4753 _(b'[-r REV]'),
4754 helpcategory=command.CATEGORY_MAINTENANCE,
4754 helpcategory=command.CATEGORY_MAINTENANCE,
4755 intents={INTENT_READONLY},
4755 intents={INTENT_READONLY},
4756 )
4756 )
4757 def manifest(ui, repo, node=None, rev=None, **opts):
4757 def manifest(ui, repo, node=None, rev=None, **opts):
4758 """output the current or given revision of the project manifest
4758 """output the current or given revision of the project manifest
4759
4759
4760 Print a list of version controlled files for the given revision.
4760 Print a list of version controlled files for the given revision.
4761 If no revision is given, the first parent of the working directory
4761 If no revision is given, the first parent of the working directory
4762 is used, or the null revision if no revision is checked out.
4762 is used, or the null revision if no revision is checked out.
4763
4763
4764 With -v, print file permissions, symlink and executable bits.
4764 With -v, print file permissions, symlink and executable bits.
4765 With --debug, print file revision hashes.
4765 With --debug, print file revision hashes.
4766
4766
4767 If option --all is specified, the list of all files from all revisions
4767 If option --all is specified, the list of all files from all revisions
4768 is printed. This includes deleted and renamed files.
4768 is printed. This includes deleted and renamed files.
4769
4769
4770 Returns 0 on success.
4770 Returns 0 on success.
4771 """
4771 """
4772 opts = pycompat.byteskwargs(opts)
4772 opts = pycompat.byteskwargs(opts)
4773 fm = ui.formatter(b'manifest', opts)
4773 fm = ui.formatter(b'manifest', opts)
4774
4774
4775 if opts.get(b'all'):
4775 if opts.get(b'all'):
4776 if rev or node:
4776 if rev or node:
4777 raise error.InputError(_(b"can't specify a revision with --all"))
4777 raise error.InputError(_(b"can't specify a revision with --all"))
4778
4778
4779 res = set()
4779 res = set()
4780 for rev in repo:
4780 for rev in repo:
4781 ctx = repo[rev]
4781 ctx = repo[rev]
4782 res |= set(ctx.files())
4782 res |= set(ctx.files())
4783
4783
4784 ui.pager(b'manifest')
4784 ui.pager(b'manifest')
4785 for f in sorted(res):
4785 for f in sorted(res):
4786 fm.startitem()
4786 fm.startitem()
4787 fm.write(b"path", b'%s\n', f)
4787 fm.write(b"path", b'%s\n', f)
4788 fm.end()
4788 fm.end()
4789 return
4789 return
4790
4790
4791 if rev and node:
4791 if rev and node:
4792 raise error.InputError(_(b"please specify just one revision"))
4792 raise error.InputError(_(b"please specify just one revision"))
4793
4793
4794 if not node:
4794 if not node:
4795 node = rev
4795 node = rev
4796
4796
4797 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4797 char = {b'l': b'@', b'x': b'*', b'': b'', b't': b'd'}
4798 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4798 mode = {b'l': b'644', b'x': b'755', b'': b'644', b't': b'755'}
4799 if node:
4799 if node:
4800 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4800 repo = scmutil.unhidehashlikerevs(repo, [node], b'nowarn')
4801 ctx = scmutil.revsingle(repo, node)
4801 ctx = scmutil.revsingle(repo, node)
4802 mf = ctx.manifest()
4802 mf = ctx.manifest()
4803 ui.pager(b'manifest')
4803 ui.pager(b'manifest')
4804 for f in ctx:
4804 for f in ctx:
4805 fm.startitem()
4805 fm.startitem()
4806 fm.context(ctx=ctx)
4806 fm.context(ctx=ctx)
4807 fl = ctx[f].flags()
4807 fl = ctx[f].flags()
4808 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4808 fm.condwrite(ui.debugflag, b'hash', b'%s ', hex(mf[f]))
4809 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4809 fm.condwrite(ui.verbose, b'mode type', b'%s %1s ', mode[fl], char[fl])
4810 fm.write(b'path', b'%s\n', f)
4810 fm.write(b'path', b'%s\n', f)
4811 fm.end()
4811 fm.end()
4812
4812
4813
4813
4814 @command(
4814 @command(
4815 b'merge',
4815 b'merge',
4816 [
4816 [
4817 (
4817 (
4818 b'f',
4818 b'f',
4819 b'force',
4819 b'force',
4820 None,
4820 None,
4821 _(b'force a merge including outstanding changes (DEPRECATED)'),
4821 _(b'force a merge including outstanding changes (DEPRECATED)'),
4822 ),
4822 ),
4823 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4823 (b'r', b'rev', b'', _(b'revision to merge'), _(b'REV')),
4824 (
4824 (
4825 b'P',
4825 b'P',
4826 b'preview',
4826 b'preview',
4827 None,
4827 None,
4828 _(b'review revisions to merge (no merge is performed)'),
4828 _(b'review revisions to merge (no merge is performed)'),
4829 ),
4829 ),
4830 (b'', b'abort', None, _(b'abort the ongoing merge')),
4830 (b'', b'abort', None, _(b'abort the ongoing merge')),
4831 ]
4831 ]
4832 + mergetoolopts,
4832 + mergetoolopts,
4833 _(b'[-P] [[-r] REV]'),
4833 _(b'[-P] [[-r] REV]'),
4834 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4834 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
4835 helpbasic=True,
4835 helpbasic=True,
4836 )
4836 )
4837 def merge(ui, repo, node=None, **opts):
4837 def merge(ui, repo, node=None, **opts):
4838 """merge another revision into working directory
4838 """merge another revision into working directory
4839
4839
4840 The current working directory is updated with all changes made in
4840 The current working directory is updated with all changes made in
4841 the requested revision since the last common predecessor revision.
4841 the requested revision since the last common predecessor revision.
4842
4842
4843 Files that changed between either parent are marked as changed for
4843 Files that changed between either parent are marked as changed for
4844 the next commit and a commit must be performed before any further
4844 the next commit and a commit must be performed before any further
4845 updates to the repository are allowed. The next commit will have
4845 updates to the repository are allowed. The next commit will have
4846 two parents.
4846 two parents.
4847
4847
4848 ``--tool`` can be used to specify the merge tool used for file
4848 ``--tool`` can be used to specify the merge tool used for file
4849 merges. It overrides the HGMERGE environment variable and your
4849 merges. It overrides the HGMERGE environment variable and your
4850 configuration files. See :hg:`help merge-tools` for options.
4850 configuration files. See :hg:`help merge-tools` for options.
4851
4851
4852 If no revision is specified, the working directory's parent is a
4852 If no revision is specified, the working directory's parent is a
4853 head revision, and the current branch contains exactly one other
4853 head revision, and the current branch contains exactly one other
4854 head, the other head is merged with by default. Otherwise, an
4854 head, the other head is merged with by default. Otherwise, an
4855 explicit revision with which to merge must be provided.
4855 explicit revision with which to merge must be provided.
4856
4856
4857 See :hg:`help resolve` for information on handling file conflicts.
4857 See :hg:`help resolve` for information on handling file conflicts.
4858
4858
4859 To undo an uncommitted merge, use :hg:`merge --abort` which
4859 To undo an uncommitted merge, use :hg:`merge --abort` which
4860 will check out a clean copy of the original merge parent, losing
4860 will check out a clean copy of the original merge parent, losing
4861 all changes.
4861 all changes.
4862
4862
4863 Returns 0 on success, 1 if there are unresolved files.
4863 Returns 0 on success, 1 if there are unresolved files.
4864 """
4864 """
4865
4865
4866 opts = pycompat.byteskwargs(opts)
4866 opts = pycompat.byteskwargs(opts)
4867 abort = opts.get(b'abort')
4867 abort = opts.get(b'abort')
4868 if abort and repo.dirstate.p2() == repo.nullid:
4868 if abort and repo.dirstate.p2() == repo.nullid:
4869 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4869 cmdutil.wrongtooltocontinue(repo, _(b'merge'))
4870 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4870 cmdutil.check_incompatible_arguments(opts, b'abort', [b'rev', b'preview'])
4871 if abort:
4871 if abort:
4872 state = cmdutil.getunfinishedstate(repo)
4872 state = cmdutil.getunfinishedstate(repo)
4873 if state and state._opname != b'merge':
4873 if state and state._opname != b'merge':
4874 raise error.StateError(
4874 raise error.StateError(
4875 _(b'cannot abort merge with %s in progress') % (state._opname),
4875 _(b'cannot abort merge with %s in progress') % (state._opname),
4876 hint=state.hint(),
4876 hint=state.hint(),
4877 )
4877 )
4878 if node:
4878 if node:
4879 raise error.InputError(_(b"cannot specify a node with --abort"))
4879 raise error.InputError(_(b"cannot specify a node with --abort"))
4880 return hg.abortmerge(repo.ui, repo)
4880 return hg.abortmerge(repo.ui, repo)
4881
4881
4882 if opts.get(b'rev') and node:
4882 if opts.get(b'rev') and node:
4883 raise error.InputError(_(b"please specify just one revision"))
4883 raise error.InputError(_(b"please specify just one revision"))
4884 if not node:
4884 if not node:
4885 node = opts.get(b'rev')
4885 node = opts.get(b'rev')
4886
4886
4887 if node:
4887 if node:
4888 ctx = scmutil.revsingle(repo, node)
4888 ctx = scmutil.revsingle(repo, node)
4889 else:
4889 else:
4890 if ui.configbool(b'commands', b'merge.require-rev'):
4890 if ui.configbool(b'commands', b'merge.require-rev'):
4891 raise error.InputError(
4891 raise error.InputError(
4892 _(
4892 _(
4893 b'configuration requires specifying revision to merge '
4893 b'configuration requires specifying revision to merge '
4894 b'with'
4894 b'with'
4895 )
4895 )
4896 )
4896 )
4897 ctx = repo[destutil.destmerge(repo)]
4897 ctx = repo[destutil.destmerge(repo)]
4898
4898
4899 if ctx.node() is None:
4899 if ctx.node() is None:
4900 raise error.InputError(
4900 raise error.InputError(
4901 _(b'merging with the working copy has no effect')
4901 _(b'merging with the working copy has no effect')
4902 )
4902 )
4903
4903
4904 if opts.get(b'preview'):
4904 if opts.get(b'preview'):
4905 # find nodes that are ancestors of p2 but not of p1
4905 # find nodes that are ancestors of p2 but not of p1
4906 p1 = repo[b'.'].node()
4906 p1 = repo[b'.'].node()
4907 p2 = ctx.node()
4907 p2 = ctx.node()
4908 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4908 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4909
4909
4910 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4910 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4911 for node in nodes:
4911 for node in nodes:
4912 displayer.show(repo[node])
4912 displayer.show(repo[node])
4913 displayer.close()
4913 displayer.close()
4914 return 0
4914 return 0
4915
4915
4916 # ui.forcemerge is an internal variable, do not document
4916 # ui.forcemerge is an internal variable, do not document
4917 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4917 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
4918 with ui.configoverride(overrides, b'merge'):
4918 with ui.configoverride(overrides, b'merge'):
4919 force = opts.get(b'force')
4919 force = opts.get(b'force')
4920 labels = [b'working copy', b'merge rev']
4920 labels = [b'working copy', b'merge rev']
4921 return hg.merge(ctx, force=force, labels=labels)
4921 return hg.merge(ctx, force=force, labels=labels)
4922
4922
4923
4923
4924 statemod.addunfinished(
4924 statemod.addunfinished(
4925 b'merge',
4925 b'merge',
4926 fname=None,
4926 fname=None,
4927 clearable=True,
4927 clearable=True,
4928 allowcommit=True,
4928 allowcommit=True,
4929 cmdmsg=_(b'outstanding uncommitted merge'),
4929 cmdmsg=_(b'outstanding uncommitted merge'),
4930 abortfunc=hg.abortmerge,
4930 abortfunc=hg.abortmerge,
4931 statushint=_(
4931 statushint=_(
4932 b'To continue: hg commit\nTo abort: hg merge --abort'
4932 b'To continue: hg commit\nTo abort: hg merge --abort'
4933 ),
4933 ),
4934 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4934 cmdhint=_(b"use 'hg commit' or 'hg merge --abort'"),
4935 )
4935 )
4936
4936
4937
4937
4938 @command(
4938 @command(
4939 b'outgoing|out',
4939 b'outgoing|out',
4940 [
4940 [
4941 (
4941 (
4942 b'f',
4942 b'f',
4943 b'force',
4943 b'force',
4944 None,
4944 None,
4945 _(b'run even when the destination is unrelated'),
4945 _(b'run even when the destination is unrelated'),
4946 ),
4946 ),
4947 (
4947 (
4948 b'r',
4948 b'r',
4949 b'rev',
4949 b'rev',
4950 [],
4950 [],
4951 _(b'a changeset intended to be included in the destination'),
4951 _(b'a changeset intended to be included in the destination'),
4952 _(b'REV'),
4952 _(b'REV'),
4953 ),
4953 ),
4954 (b'n', b'newest-first', None, _(b'show newest record first')),
4954 (b'n', b'newest-first', None, _(b'show newest record first')),
4955 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4955 (b'B', b'bookmarks', False, _(b'compare bookmarks')),
4956 (
4956 (
4957 b'b',
4957 b'b',
4958 b'branch',
4958 b'branch',
4959 [],
4959 [],
4960 _(b'a specific branch you would like to push'),
4960 _(b'a specific branch you would like to push'),
4961 _(b'BRANCH'),
4961 _(b'BRANCH'),
4962 ),
4962 ),
4963 ]
4963 ]
4964 + logopts
4964 + logopts
4965 + remoteopts
4965 + remoteopts
4966 + subrepoopts,
4966 + subrepoopts,
4967 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]...'),
4967 _(b'[-M] [-p] [-n] [-f] [-r REV]... [DEST]...'),
4968 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4968 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4969 )
4969 )
4970 def outgoing(ui, repo, *dests, **opts):
4970 def outgoing(ui, repo, *dests, **opts):
4971 """show changesets not found in the destination
4971 """show changesets not found in the destination
4972
4972
4973 Show changesets not found in the specified destination repository
4973 Show changesets not found in the specified destination repository
4974 or the default push location. These are the changesets that would
4974 or the default push location. These are the changesets that would
4975 be pushed if a push was requested.
4975 be pushed if a push was requested.
4976
4976
4977 See pull for details of valid destination formats.
4977 See pull for details of valid destination formats.
4978
4978
4979 .. container:: verbose
4979 .. container:: verbose
4980
4980
4981 With -B/--bookmarks, the result of bookmark comparison between
4981 With -B/--bookmarks, the result of bookmark comparison between
4982 local and remote repositories is displayed. With -v/--verbose,
4982 local and remote repositories is displayed. With -v/--verbose,
4983 status is also displayed for each bookmark like below::
4983 status is also displayed for each bookmark like below::
4984
4984
4985 BM1 01234567890a added
4985 BM1 01234567890a added
4986 BM2 deleted
4986 BM2 deleted
4987 BM3 234567890abc advanced
4987 BM3 234567890abc advanced
4988 BM4 34567890abcd diverged
4988 BM4 34567890abcd diverged
4989 BM5 4567890abcde changed
4989 BM5 4567890abcde changed
4990
4990
4991 The action taken when pushing depends on the
4991 The action taken when pushing depends on the
4992 status of each bookmark:
4992 status of each bookmark:
4993
4993
4994 :``added``: push with ``-B`` will create it
4994 :``added``: push with ``-B`` will create it
4995 :``deleted``: push with ``-B`` will delete it
4995 :``deleted``: push with ``-B`` will delete it
4996 :``advanced``: push will update it
4996 :``advanced``: push will update it
4997 :``diverged``: push with ``-B`` will update it
4997 :``diverged``: push with ``-B`` will update it
4998 :``changed``: push with ``-B`` will update it
4998 :``changed``: push with ``-B`` will update it
4999
4999
5000 From the point of view of pushing behavior, bookmarks
5000 From the point of view of pushing behavior, bookmarks
5001 existing only in the remote repository are treated as
5001 existing only in the remote repository are treated as
5002 ``deleted``, even if it is in fact added remotely.
5002 ``deleted``, even if it is in fact added remotely.
5003
5003
5004 Returns 0 if there are outgoing changes, 1 otherwise.
5004 Returns 0 if there are outgoing changes, 1 otherwise.
5005 """
5005 """
5006 opts = pycompat.byteskwargs(opts)
5006 opts = pycompat.byteskwargs(opts)
5007 if opts.get(b'bookmarks'):
5007 if opts.get(b'bookmarks'):
5008 for path in urlutil.get_push_paths(repo, ui, dests):
5008 for path in urlutil.get_push_paths(repo, ui, dests):
5009 dest = path.pushloc or path.loc
5009 dest = path.pushloc or path.loc
5010 other = hg.peer(repo, opts, dest)
5010 other = hg.peer(repo, opts, dest)
5011 try:
5011 try:
5012 if b'bookmarks' not in other.listkeys(b'namespaces'):
5012 if b'bookmarks' not in other.listkeys(b'namespaces'):
5013 ui.warn(_(b"remote doesn't support bookmarks\n"))
5013 ui.warn(_(b"remote doesn't support bookmarks\n"))
5014 return 0
5014 return 0
5015 ui.status(
5015 ui.status(
5016 _(b'comparing with %s\n') % urlutil.hidepassword(dest)
5016 _(b'comparing with %s\n') % urlutil.hidepassword(dest)
5017 )
5017 )
5018 ui.pager(b'outgoing')
5018 ui.pager(b'outgoing')
5019 return bookmarks.outgoing(ui, repo, other)
5019 return bookmarks.outgoing(ui, repo, other)
5020 finally:
5020 finally:
5021 other.close()
5021 other.close()
5022
5022
5023 return hg.outgoing(ui, repo, dests, opts)
5023 return hg.outgoing(ui, repo, dests, opts)
5024
5024
5025
5025
5026 @command(
5026 @command(
5027 b'parents',
5027 b'parents',
5028 [
5028 [
5029 (
5029 (
5030 b'r',
5030 b'r',
5031 b'rev',
5031 b'rev',
5032 b'',
5032 b'',
5033 _(b'show parents of the specified revision'),
5033 _(b'show parents of the specified revision'),
5034 _(b'REV'),
5034 _(b'REV'),
5035 ),
5035 ),
5036 ]
5036 ]
5037 + templateopts,
5037 + templateopts,
5038 _(b'[-r REV] [FILE]'),
5038 _(b'[-r REV] [FILE]'),
5039 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5039 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
5040 inferrepo=True,
5040 inferrepo=True,
5041 )
5041 )
5042 def parents(ui, repo, file_=None, **opts):
5042 def parents(ui, repo, file_=None, **opts):
5043 """show the parents of the working directory or revision (DEPRECATED)
5043 """show the parents of the working directory or revision (DEPRECATED)
5044
5044
5045 Print the working directory's parent revisions. If a revision is
5045 Print the working directory's parent revisions. If a revision is
5046 given via -r/--rev, the parent of that revision will be printed.
5046 given via -r/--rev, the parent of that revision will be printed.
5047 If a file argument is given, the revision in which the file was
5047 If a file argument is given, the revision in which the file was
5048 last changed (before the working directory revision or the
5048 last changed (before the working directory revision or the
5049 argument to --rev if given) is printed.
5049 argument to --rev if given) is printed.
5050
5050
5051 This command is equivalent to::
5051 This command is equivalent to::
5052
5052
5053 hg log -r "p1()+p2()" or
5053 hg log -r "p1()+p2()" or
5054 hg log -r "p1(REV)+p2(REV)" or
5054 hg log -r "p1(REV)+p2(REV)" or
5055 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5055 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
5056 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5056 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
5057
5057
5058 See :hg:`summary` and :hg:`help revsets` for related information.
5058 See :hg:`summary` and :hg:`help revsets` for related information.
5059
5059
5060 Returns 0 on success.
5060 Returns 0 on success.
5061 """
5061 """
5062
5062
5063 opts = pycompat.byteskwargs(opts)
5063 opts = pycompat.byteskwargs(opts)
5064 rev = opts.get(b'rev')
5064 rev = opts.get(b'rev')
5065 if rev:
5065 if rev:
5066 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5066 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
5067 ctx = scmutil.revsingle(repo, rev, None)
5067 ctx = scmutil.revsingle(repo, rev, None)
5068
5068
5069 if file_:
5069 if file_:
5070 m = scmutil.match(ctx, (file_,), opts)
5070 m = scmutil.match(ctx, (file_,), opts)
5071 if m.anypats() or len(m.files()) != 1:
5071 if m.anypats() or len(m.files()) != 1:
5072 raise error.InputError(_(b'can only specify an explicit filename'))
5072 raise error.InputError(_(b'can only specify an explicit filename'))
5073 file_ = m.files()[0]
5073 file_ = m.files()[0]
5074 filenodes = []
5074 filenodes = []
5075 for cp in ctx.parents():
5075 for cp in ctx.parents():
5076 if not cp:
5076 if not cp:
5077 continue
5077 continue
5078 try:
5078 try:
5079 filenodes.append(cp.filenode(file_))
5079 filenodes.append(cp.filenode(file_))
5080 except error.LookupError:
5080 except error.LookupError:
5081 pass
5081 pass
5082 if not filenodes:
5082 if not filenodes:
5083 raise error.InputError(_(b"'%s' not found in manifest") % file_)
5083 raise error.InputError(_(b"'%s' not found in manifest") % file_)
5084 p = []
5084 p = []
5085 for fn in filenodes:
5085 for fn in filenodes:
5086 fctx = repo.filectx(file_, fileid=fn)
5086 fctx = repo.filectx(file_, fileid=fn)
5087 p.append(fctx.node())
5087 p.append(fctx.node())
5088 else:
5088 else:
5089 p = [cp.node() for cp in ctx.parents()]
5089 p = [cp.node() for cp in ctx.parents()]
5090
5090
5091 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5091 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
5092 for n in p:
5092 for n in p:
5093 if n != repo.nullid:
5093 if n != repo.nullid:
5094 displayer.show(repo[n])
5094 displayer.show(repo[n])
5095 displayer.close()
5095 displayer.close()
5096
5096
5097
5097
5098 @command(
5098 @command(
5099 b'paths',
5099 b'paths',
5100 formatteropts,
5100 formatteropts,
5101 _(b'[NAME]'),
5101 _(b'[NAME]'),
5102 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5102 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5103 optionalrepo=True,
5103 optionalrepo=True,
5104 intents={INTENT_READONLY},
5104 intents={INTENT_READONLY},
5105 )
5105 )
5106 def paths(ui, repo, search=None, **opts):
5106 def paths(ui, repo, search=None, **opts):
5107 """show aliases for remote repositories
5107 """show aliases for remote repositories
5108
5108
5109 Show definition of symbolic path name NAME. If no name is given,
5109 Show definition of symbolic path name NAME. If no name is given,
5110 show definition of all available names.
5110 show definition of all available names.
5111
5111
5112 Option -q/--quiet suppresses all output when searching for NAME
5112 Option -q/--quiet suppresses all output when searching for NAME
5113 and shows only the path names when listing all definitions.
5113 and shows only the path names when listing all definitions.
5114
5114
5115 Path names are defined in the [paths] section of your
5115 Path names are defined in the [paths] section of your
5116 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5116 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
5117 repository, ``.hg/hgrc`` is used, too.
5117 repository, ``.hg/hgrc`` is used, too.
5118
5118
5119 The path names ``default`` and ``default-push`` have a special
5119 The path names ``default`` and ``default-push`` have a special
5120 meaning. When performing a push or pull operation, they are used
5120 meaning. When performing a push or pull operation, they are used
5121 as fallbacks if no location is specified on the command-line.
5121 as fallbacks if no location is specified on the command-line.
5122 When ``default-push`` is set, it will be used for push and
5122 When ``default-push`` is set, it will be used for push and
5123 ``default`` will be used for pull; otherwise ``default`` is used
5123 ``default`` will be used for pull; otherwise ``default`` is used
5124 as the fallback for both. When cloning a repository, the clone
5124 as the fallback for both. When cloning a repository, the clone
5125 source is written as ``default`` in ``.hg/hgrc``.
5125 source is written as ``default`` in ``.hg/hgrc``.
5126
5126
5127 .. note::
5127 .. note::
5128
5128
5129 ``default`` and ``default-push`` apply to all inbound (e.g.
5129 ``default`` and ``default-push`` apply to all inbound (e.g.
5130 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5130 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
5131 and :hg:`bundle`) operations.
5131 and :hg:`bundle`) operations.
5132
5132
5133 See :hg:`help urls` for more information.
5133 See :hg:`help urls` for more information.
5134
5134
5135 .. container:: verbose
5135 .. container:: verbose
5136
5136
5137 Template:
5137 Template:
5138
5138
5139 The following keywords are supported. See also :hg:`help templates`.
5139 The following keywords are supported. See also :hg:`help templates`.
5140
5140
5141 :name: String. Symbolic name of the path alias.
5141 :name: String. Symbolic name of the path alias.
5142 :pushurl: String. URL for push operations.
5142 :pushurl: String. URL for push operations.
5143 :url: String. URL or directory path for the other operations.
5143 :url: String. URL or directory path for the other operations.
5144
5144
5145 Returns 0 on success.
5145 Returns 0 on success.
5146 """
5146 """
5147
5147
5148 opts = pycompat.byteskwargs(opts)
5148 opts = pycompat.byteskwargs(opts)
5149
5149
5150 pathitems = urlutil.list_paths(ui, search)
5150 pathitems = urlutil.list_paths(ui, search)
5151 ui.pager(b'paths')
5151 ui.pager(b'paths')
5152
5152
5153 fm = ui.formatter(b'paths', opts)
5153 fm = ui.formatter(b'paths', opts)
5154 if fm.isplain():
5154 if fm.isplain():
5155 hidepassword = urlutil.hidepassword
5155 hidepassword = urlutil.hidepassword
5156 else:
5156 else:
5157 hidepassword = bytes
5157 hidepassword = bytes
5158 if ui.quiet:
5158 if ui.quiet:
5159 namefmt = b'%s\n'
5159 namefmt = b'%s\n'
5160 else:
5160 else:
5161 namefmt = b'%s = '
5161 namefmt = b'%s = '
5162 showsubopts = not search and not ui.quiet
5162 showsubopts = not search and not ui.quiet
5163
5163
5164 for name, path in pathitems:
5164 for name, path in pathitems:
5165 fm.startitem()
5165 fm.startitem()
5166 fm.condwrite(not search, b'name', namefmt, name)
5166 fm.condwrite(not search, b'name', namefmt, name)
5167 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5167 fm.condwrite(not ui.quiet, b'url', b'%s\n', hidepassword(path.rawloc))
5168 for subopt, value in sorted(path.suboptions.items()):
5168 for subopt, value in sorted(path.suboptions.items()):
5169 assert subopt not in (b'name', b'url')
5169 assert subopt not in (b'name', b'url')
5170 if showsubopts:
5170 if showsubopts:
5171 fm.plain(b'%s:%s = ' % (name, subopt))
5171 fm.plain(b'%s:%s = ' % (name, subopt))
5172 if isinstance(value, bool):
5172 if isinstance(value, bool):
5173 if value:
5173 if value:
5174 value = b'yes'
5174 value = b'yes'
5175 else:
5175 else:
5176 value = b'no'
5176 value = b'no'
5177 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5177 fm.condwrite(showsubopts, subopt, b'%s\n', value)
5178
5178
5179 fm.end()
5179 fm.end()
5180
5180
5181 if search and not pathitems:
5181 if search and not pathitems:
5182 if not ui.quiet:
5182 if not ui.quiet:
5183 ui.warn(_(b"not found!\n"))
5183 ui.warn(_(b"not found!\n"))
5184 return 1
5184 return 1
5185 else:
5185 else:
5186 return 0
5186 return 0
5187
5187
5188
5188
5189 @command(
5189 @command(
5190 b'phase',
5190 b'phase',
5191 [
5191 [
5192 (b'p', b'public', False, _(b'set changeset phase to public')),
5192 (b'p', b'public', False, _(b'set changeset phase to public')),
5193 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5193 (b'd', b'draft', False, _(b'set changeset phase to draft')),
5194 (b's', b'secret', False, _(b'set changeset phase to secret')),
5194 (b's', b'secret', False, _(b'set changeset phase to secret')),
5195 (b'f', b'force', False, _(b'allow to move boundary backward')),
5195 (b'f', b'force', False, _(b'allow to move boundary backward')),
5196 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5196 (b'r', b'rev', [], _(b'target revision'), _(b'REV')),
5197 ],
5197 ],
5198 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5198 _(b'[-p|-d|-s] [-f] [-r] [REV...]'),
5199 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5199 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
5200 )
5200 )
5201 def phase(ui, repo, *revs, **opts):
5201 def phase(ui, repo, *revs, **opts):
5202 """set or show the current phase name
5202 """set or show the current phase name
5203
5203
5204 With no argument, show the phase name of the current revision(s).
5204 With no argument, show the phase name of the current revision(s).
5205
5205
5206 With one of -p/--public, -d/--draft or -s/--secret, change the
5206 With one of -p/--public, -d/--draft or -s/--secret, change the
5207 phase value of the specified revisions.
5207 phase value of the specified revisions.
5208
5208
5209 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5209 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
5210 lower phase to a higher phase. Phases are ordered as follows::
5210 lower phase to a higher phase. Phases are ordered as follows::
5211
5211
5212 public < draft < secret
5212 public < draft < secret
5213
5213
5214 Returns 0 on success, 1 if some phases could not be changed.
5214 Returns 0 on success, 1 if some phases could not be changed.
5215
5215
5216 (For more information about the phases concept, see :hg:`help phases`.)
5216 (For more information about the phases concept, see :hg:`help phases`.)
5217 """
5217 """
5218 opts = pycompat.byteskwargs(opts)
5218 opts = pycompat.byteskwargs(opts)
5219 # search for a unique phase argument
5219 # search for a unique phase argument
5220 targetphase = None
5220 targetphase = None
5221 for idx, name in enumerate(phases.cmdphasenames):
5221 for idx, name in enumerate(phases.cmdphasenames):
5222 if opts[name]:
5222 if opts[name]:
5223 if targetphase is not None:
5223 if targetphase is not None:
5224 raise error.InputError(_(b'only one phase can be specified'))
5224 raise error.InputError(_(b'only one phase can be specified'))
5225 targetphase = idx
5225 targetphase = idx
5226
5226
5227 # look for specified revision
5227 # look for specified revision
5228 revs = list(revs)
5228 revs = list(revs)
5229 revs.extend(opts[b'rev'])
5229 revs.extend(opts[b'rev'])
5230 if not revs:
5230 if not revs:
5231 # display both parents as the second parent phase can influence
5231 # display both parents as the second parent phase can influence
5232 # the phase of a merge commit
5232 # the phase of a merge commit
5233 revs = [c.rev() for c in repo[None].parents()]
5233 revs = [c.rev() for c in repo[None].parents()]
5234
5234
5235 revs = scmutil.revrange(repo, revs)
5235 revs = scmutil.revrange(repo, revs)
5236
5236
5237 ret = 0
5237 ret = 0
5238 if targetphase is None:
5238 if targetphase is None:
5239 # display
5239 # display
5240 for r in revs:
5240 for r in revs:
5241 ctx = repo[r]
5241 ctx = repo[r]
5242 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5242 ui.write(b'%i: %s\n' % (ctx.rev(), ctx.phasestr()))
5243 else:
5243 else:
5244 with repo.lock(), repo.transaction(b"phase") as tr:
5244 with repo.lock(), repo.transaction(b"phase") as tr:
5245 # set phase
5245 # set phase
5246 if not revs:
5246 if not revs:
5247 raise error.InputError(_(b'empty revision set'))
5247 raise error.InputError(_(b'empty revision set'))
5248 nodes = [repo[r].node() for r in revs]
5248 nodes = [repo[r].node() for r in revs]
5249 # moving revision from public to draft may hide them
5249 # moving revision from public to draft may hide them
5250 # We have to check result on an unfiltered repository
5250 # We have to check result on an unfiltered repository
5251 unfi = repo.unfiltered()
5251 unfi = repo.unfiltered()
5252 getphase = unfi._phasecache.phase
5252 getphase = unfi._phasecache.phase
5253 olddata = [getphase(unfi, r) for r in unfi]
5253 olddata = [getphase(unfi, r) for r in unfi]
5254 phases.advanceboundary(repo, tr, targetphase, nodes)
5254 phases.advanceboundary(repo, tr, targetphase, nodes)
5255 if opts[b'force']:
5255 if opts[b'force']:
5256 phases.retractboundary(repo, tr, targetphase, nodes)
5256 phases.retractboundary(repo, tr, targetphase, nodes)
5257 getphase = unfi._phasecache.phase
5257 getphase = unfi._phasecache.phase
5258 newdata = [getphase(unfi, r) for r in unfi]
5258 newdata = [getphase(unfi, r) for r in unfi]
5259 changes = sum(newdata[r] != olddata[r] for r in unfi)
5259 changes = sum(newdata[r] != olddata[r] for r in unfi)
5260 cl = unfi.changelog
5260 cl = unfi.changelog
5261 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5261 rejected = [n for n in nodes if newdata[cl.rev(n)] < targetphase]
5262 if rejected:
5262 if rejected:
5263 ui.warn(
5263 ui.warn(
5264 _(
5264 _(
5265 b'cannot move %i changesets to a higher '
5265 b'cannot move %i changesets to a higher '
5266 b'phase, use --force\n'
5266 b'phase, use --force\n'
5267 )
5267 )
5268 % len(rejected)
5268 % len(rejected)
5269 )
5269 )
5270 ret = 1
5270 ret = 1
5271 if changes:
5271 if changes:
5272 msg = _(b'phase changed for %i changesets\n') % changes
5272 msg = _(b'phase changed for %i changesets\n') % changes
5273 if ret:
5273 if ret:
5274 ui.status(msg)
5274 ui.status(msg)
5275 else:
5275 else:
5276 ui.note(msg)
5276 ui.note(msg)
5277 else:
5277 else:
5278 ui.warn(_(b'no phases changed\n'))
5278 ui.warn(_(b'no phases changed\n'))
5279 return ret
5279 return ret
5280
5280
5281
5281
5282 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5282 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
5283 """Run after a changegroup has been added via pull/unbundle
5283 """Run after a changegroup has been added via pull/unbundle
5284
5284
5285 This takes arguments below:
5285 This takes arguments below:
5286
5286
5287 :modheads: change of heads by pull/unbundle
5287 :modheads: change of heads by pull/unbundle
5288 :optupdate: updating working directory is needed or not
5288 :optupdate: updating working directory is needed or not
5289 :checkout: update destination revision (or None to default destination)
5289 :checkout: update destination revision (or None to default destination)
5290 :brev: a name, which might be a bookmark to be activated after updating
5290 :brev: a name, which might be a bookmark to be activated after updating
5291
5291
5292 return True if update raise any conflict, False otherwise.
5292 return True if update raise any conflict, False otherwise.
5293 """
5293 """
5294 if modheads == 0:
5294 if modheads == 0:
5295 return False
5295 return False
5296 if optupdate:
5296 if optupdate:
5297 try:
5297 try:
5298 return hg.updatetotally(ui, repo, checkout, brev)
5298 return hg.updatetotally(ui, repo, checkout, brev)
5299 except error.UpdateAbort as inst:
5299 except error.UpdateAbort as inst:
5300 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5300 msg = _(b"not updating: %s") % stringutil.forcebytestr(inst)
5301 hint = inst.hint
5301 hint = inst.hint
5302 raise error.UpdateAbort(msg, hint=hint)
5302 raise error.UpdateAbort(msg, hint=hint)
5303 if modheads is not None and modheads > 1:
5303 if modheads is not None and modheads > 1:
5304 currentbranchheads = len(repo.branchheads())
5304 currentbranchheads = len(repo.branchheads())
5305 if currentbranchheads == modheads:
5305 if currentbranchheads == modheads:
5306 ui.status(
5306 ui.status(
5307 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5307 _(b"(run 'hg heads' to see heads, 'hg merge' to merge)\n")
5308 )
5308 )
5309 elif currentbranchheads > 1:
5309 elif currentbranchheads > 1:
5310 ui.status(
5310 ui.status(
5311 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5311 _(b"(run 'hg heads .' to see heads, 'hg merge' to merge)\n")
5312 )
5312 )
5313 else:
5313 else:
5314 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5314 ui.status(_(b"(run 'hg heads' to see heads)\n"))
5315 elif not ui.configbool(b'commands', b'update.requiredest'):
5315 elif not ui.configbool(b'commands', b'update.requiredest'):
5316 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5316 ui.status(_(b"(run 'hg update' to get a working copy)\n"))
5317 return False
5317 return False
5318
5318
5319
5319
5320 @command(
5320 @command(
5321 b'pull',
5321 b'pull',
5322 [
5322 [
5323 (
5323 (
5324 b'u',
5324 b'u',
5325 b'update',
5325 b'update',
5326 None,
5326 None,
5327 _(b'update to new branch head if new descendants were pulled'),
5327 _(b'update to new branch head if new descendants were pulled'),
5328 ),
5328 ),
5329 (
5329 (
5330 b'f',
5330 b'f',
5331 b'force',
5331 b'force',
5332 None,
5332 None,
5333 _(b'run even when remote repository is unrelated'),
5333 _(b'run even when remote repository is unrelated'),
5334 ),
5334 ),
5335 (
5335 (
5336 b'',
5336 b'',
5337 b'confirm',
5337 b'confirm',
5338 None,
5338 None,
5339 _(b'confirm pull before applying changes'),
5339 _(b'confirm pull before applying changes'),
5340 ),
5340 ),
5341 (
5341 (
5342 b'r',
5342 b'r',
5343 b'rev',
5343 b'rev',
5344 [],
5344 [],
5345 _(b'a remote changeset intended to be added'),
5345 _(b'a remote changeset intended to be added'),
5346 _(b'REV'),
5346 _(b'REV'),
5347 ),
5347 ),
5348 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5348 (b'B', b'bookmark', [], _(b"bookmark to pull"), _(b'BOOKMARK')),
5349 (
5349 (
5350 b'b',
5350 b'b',
5351 b'branch',
5351 b'branch',
5352 [],
5352 [],
5353 _(b'a specific branch you would like to pull'),
5353 _(b'a specific branch you would like to pull'),
5354 _(b'BRANCH'),
5354 _(b'BRANCH'),
5355 ),
5355 ),
5356 ]
5356 ]
5357 + remoteopts,
5357 + remoteopts,
5358 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]...'),
5358 _(b'[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]...'),
5359 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5359 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5360 helpbasic=True,
5360 helpbasic=True,
5361 )
5361 )
5362 def pull(ui, repo, *sources, **opts):
5362 def pull(ui, repo, *sources, **opts):
5363 """pull changes from the specified source
5363 """pull changes from the specified source
5364
5364
5365 Pull changes from a remote repository to a local one.
5365 Pull changes from a remote repository to a local one.
5366
5366
5367 This finds all changes from the repository at the specified path
5367 This finds all changes from the repository at the specified path
5368 or URL and adds them to a local repository (the current one unless
5368 or URL and adds them to a local repository (the current one unless
5369 -R is specified). By default, this does not update the copy of the
5369 -R is specified). By default, this does not update the copy of the
5370 project in the working directory.
5370 project in the working directory.
5371
5371
5372 When cloning from servers that support it, Mercurial may fetch
5372 When cloning from servers that support it, Mercurial may fetch
5373 pre-generated data. When this is done, hooks operating on incoming
5373 pre-generated data. When this is done, hooks operating on incoming
5374 changesets and changegroups may fire more than once, once for each
5374 changesets and changegroups may fire more than once, once for each
5375 pre-generated bundle and as well as for any additional remaining
5375 pre-generated bundle and as well as for any additional remaining
5376 data. See :hg:`help -e clonebundles` for more.
5376 data. See :hg:`help -e clonebundles` for more.
5377
5377
5378 Use :hg:`incoming` if you want to see what would have been added
5378 Use :hg:`incoming` if you want to see what would have been added
5379 by a pull at the time you issued this command. If you then decide
5379 by a pull at the time you issued this command. If you then decide
5380 to add those changes to the repository, you should use :hg:`pull
5380 to add those changes to the repository, you should use :hg:`pull
5381 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5381 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
5382
5382
5383 If SOURCE is omitted, the 'default' path will be used.
5383 If SOURCE is omitted, the 'default' path will be used.
5384 See :hg:`help urls` for more information.
5384 See :hg:`help urls` for more information.
5385
5385
5386 If multiple sources are specified, they will be pulled sequentially as if
5386 If multiple sources are specified, they will be pulled sequentially as if
5387 the command was run multiple time. If --update is specify and the command
5387 the command was run multiple time. If --update is specify and the command
5388 will stop at the first failed --update.
5388 will stop at the first failed --update.
5389
5389
5390 Specifying bookmark as ``.`` is equivalent to specifying the active
5390 Specifying bookmark as ``.`` is equivalent to specifying the active
5391 bookmark's name.
5391 bookmark's name.
5392
5392
5393 Returns 0 on success, 1 if an update had unresolved files.
5393 Returns 0 on success, 1 if an update had unresolved files.
5394 """
5394 """
5395
5395
5396 opts = pycompat.byteskwargs(opts)
5396 opts = pycompat.byteskwargs(opts)
5397 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5397 if ui.configbool(b'commands', b'update.requiredest') and opts.get(
5398 b'update'
5398 b'update'
5399 ):
5399 ):
5400 msg = _(b'update destination required by configuration')
5400 msg = _(b'update destination required by configuration')
5401 hint = _(b'use hg pull followed by hg update DEST')
5401 hint = _(b'use hg pull followed by hg update DEST')
5402 raise error.InputError(msg, hint=hint)
5402 raise error.InputError(msg, hint=hint)
5403
5403
5404 sources = urlutil.get_pull_paths(repo, ui, sources, opts.get(b'branch'))
5404 sources = urlutil.get_pull_paths(repo, ui, sources, opts.get(b'branch'))
5405 for source, branches in sources:
5405 for source, branches in sources:
5406 ui.status(_(b'pulling from %s\n') % urlutil.hidepassword(source))
5406 ui.status(_(b'pulling from %s\n') % urlutil.hidepassword(source))
5407 ui.flush()
5407 ui.flush()
5408 other = hg.peer(repo, opts, source)
5408 other = hg.peer(repo, opts, source)
5409 update_conflict = None
5409 update_conflict = None
5410 try:
5410 try:
5411 revs, checkout = hg.addbranchrevs(
5411 revs, checkout = hg.addbranchrevs(
5412 repo, other, branches, opts.get(b'rev')
5412 repo, other, branches, opts.get(b'rev')
5413 )
5413 )
5414
5414
5415 pullopargs = {}
5415 pullopargs = {}
5416
5416
5417 nodes = None
5417 nodes = None
5418 if opts.get(b'bookmark') or revs:
5418 if opts.get(b'bookmark') or revs:
5419 # The list of bookmark used here is the same used to actually update
5419 # The list of bookmark used here is the same used to actually update
5420 # the bookmark names, to avoid the race from issue 4689 and we do
5420 # the bookmark names, to avoid the race from issue 4689 and we do
5421 # all lookup and bookmark queries in one go so they see the same
5421 # all lookup and bookmark queries in one go so they see the same
5422 # version of the server state (issue 4700).
5422 # version of the server state (issue 4700).
5423 nodes = []
5423 nodes = []
5424 fnodes = []
5424 fnodes = []
5425 revs = revs or []
5425 revs = revs or []
5426 if revs and not other.capable(b'lookup'):
5426 if revs and not other.capable(b'lookup'):
5427 err = _(
5427 err = _(
5428 b"other repository doesn't support revision lookup, "
5428 b"other repository doesn't support revision lookup, "
5429 b"so a rev cannot be specified."
5429 b"so a rev cannot be specified."
5430 )
5430 )
5431 raise error.Abort(err)
5431 raise error.Abort(err)
5432 with other.commandexecutor() as e:
5432 with other.commandexecutor() as e:
5433 fremotebookmarks = e.callcommand(
5433 fremotebookmarks = e.callcommand(
5434 b'listkeys', {b'namespace': b'bookmarks'}
5434 b'listkeys', {b'namespace': b'bookmarks'}
5435 )
5435 )
5436 for r in revs:
5436 for r in revs:
5437 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5437 fnodes.append(e.callcommand(b'lookup', {b'key': r}))
5438 remotebookmarks = fremotebookmarks.result()
5438 remotebookmarks = fremotebookmarks.result()
5439 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5439 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
5440 pullopargs[b'remotebookmarks'] = remotebookmarks
5440 pullopargs[b'remotebookmarks'] = remotebookmarks
5441 for b in opts.get(b'bookmark', []):
5441 for b in opts.get(b'bookmark', []):
5442 b = repo._bookmarks.expandname(b)
5442 b = repo._bookmarks.expandname(b)
5443 if b not in remotebookmarks:
5443 if b not in remotebookmarks:
5444 raise error.InputError(
5444 raise error.InputError(
5445 _(b'remote bookmark %s not found!') % b
5445 _(b'remote bookmark %s not found!') % b
5446 )
5446 )
5447 nodes.append(remotebookmarks[b])
5447 nodes.append(remotebookmarks[b])
5448 for i, rev in enumerate(revs):
5448 for i, rev in enumerate(revs):
5449 node = fnodes[i].result()
5449 node = fnodes[i].result()
5450 nodes.append(node)
5450 nodes.append(node)
5451 if rev == checkout:
5451 if rev == checkout:
5452 checkout = node
5452 checkout = node
5453
5453
5454 wlock = util.nullcontextmanager()
5454 wlock = util.nullcontextmanager()
5455 if opts.get(b'update'):
5455 if opts.get(b'update'):
5456 wlock = repo.wlock()
5456 wlock = repo.wlock()
5457 with wlock:
5457 with wlock:
5458 pullopargs.update(opts.get(b'opargs', {}))
5458 pullopargs.update(opts.get(b'opargs', {}))
5459 modheads = exchange.pull(
5459 modheads = exchange.pull(
5460 repo,
5460 repo,
5461 other,
5461 other,
5462 heads=nodes,
5462 heads=nodes,
5463 force=opts.get(b'force'),
5463 force=opts.get(b'force'),
5464 bookmarks=opts.get(b'bookmark', ()),
5464 bookmarks=opts.get(b'bookmark', ()),
5465 opargs=pullopargs,
5465 opargs=pullopargs,
5466 confirm=opts.get(b'confirm'),
5466 confirm=opts.get(b'confirm'),
5467 ).cgresult
5467 ).cgresult
5468
5468
5469 # brev is a name, which might be a bookmark to be activated at
5469 # brev is a name, which might be a bookmark to be activated at
5470 # the end of the update. In other words, it is an explicit
5470 # the end of the update. In other words, it is an explicit
5471 # destination of the update
5471 # destination of the update
5472 brev = None
5472 brev = None
5473
5473
5474 if checkout:
5474 if checkout:
5475 checkout = repo.unfiltered().changelog.rev(checkout)
5475 checkout = repo.unfiltered().changelog.rev(checkout)
5476
5476
5477 # order below depends on implementation of
5477 # order below depends on implementation of
5478 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5478 # hg.addbranchrevs(). opts['bookmark'] is ignored,
5479 # because 'checkout' is determined without it.
5479 # because 'checkout' is determined without it.
5480 if opts.get(b'rev'):
5480 if opts.get(b'rev'):
5481 brev = opts[b'rev'][0]
5481 brev = opts[b'rev'][0]
5482 elif opts.get(b'branch'):
5482 elif opts.get(b'branch'):
5483 brev = opts[b'branch'][0]
5483 brev = opts[b'branch'][0]
5484 else:
5484 else:
5485 brev = branches[0]
5485 brev = branches[0]
5486 repo._subtoppath = source
5486 repo._subtoppath = source
5487 try:
5487 try:
5488 update_conflict = postincoming(
5488 update_conflict = postincoming(
5489 ui, repo, modheads, opts.get(b'update'), checkout, brev
5489 ui, repo, modheads, opts.get(b'update'), checkout, brev
5490 )
5490 )
5491 except error.FilteredRepoLookupError as exc:
5491 except error.FilteredRepoLookupError as exc:
5492 msg = _(b'cannot update to target: %s') % exc.args[0]
5492 msg = _(b'cannot update to target: %s') % exc.args[0]
5493 exc.args = (msg,) + exc.args[1:]
5493 exc.args = (msg,) + exc.args[1:]
5494 raise
5494 raise
5495 finally:
5495 finally:
5496 del repo._subtoppath
5496 del repo._subtoppath
5497
5497
5498 finally:
5498 finally:
5499 other.close()
5499 other.close()
5500 # skip the remaining pull source if they are some conflict.
5500 # skip the remaining pull source if they are some conflict.
5501 if update_conflict:
5501 if update_conflict:
5502 break
5502 break
5503 if update_conflict:
5503 if update_conflict:
5504 return 1
5504 return 1
5505 else:
5505 else:
5506 return 0
5506 return 0
5507
5507
5508
5508
5509 @command(
5509 @command(
5510 b'purge|clean',
5510 b'purge|clean',
5511 [
5511 [
5512 (b'a', b'abort-on-err', None, _(b'abort if an error occurs')),
5512 (b'a', b'abort-on-err', None, _(b'abort if an error occurs')),
5513 (b'', b'all', None, _(b'purge ignored files too')),
5513 (b'', b'all', None, _(b'purge ignored files too')),
5514 (b'i', b'ignored', None, _(b'purge only ignored files')),
5514 (b'i', b'ignored', None, _(b'purge only ignored files')),
5515 (b'', b'dirs', None, _(b'purge empty directories')),
5515 (b'', b'dirs', None, _(b'purge empty directories')),
5516 (b'', b'files', None, _(b'purge files')),
5516 (b'', b'files', None, _(b'purge files')),
5517 (b'p', b'print', None, _(b'print filenames instead of deleting them')),
5517 (b'p', b'print', None, _(b'print filenames instead of deleting them')),
5518 (
5518 (
5519 b'0',
5519 b'0',
5520 b'print0',
5520 b'print0',
5521 None,
5521 None,
5522 _(
5522 _(
5523 b'end filenames with NUL, for use with xargs'
5523 b'end filenames with NUL, for use with xargs'
5524 b' (implies -p/--print)'
5524 b' (implies -p/--print)'
5525 ),
5525 ),
5526 ),
5526 ),
5527 (b'', b'confirm', None, _(b'ask before permanently deleting files')),
5527 (b'', b'confirm', None, _(b'ask before permanently deleting files')),
5528 ]
5528 ]
5529 + cmdutil.walkopts,
5529 + cmdutil.walkopts,
5530 _(b'hg purge [OPTION]... [DIR]...'),
5530 _(b'hg purge [OPTION]... [DIR]...'),
5531 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5531 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5532 )
5532 )
5533 def purge(ui, repo, *dirs, **opts):
5533 def purge(ui, repo, *dirs, **opts):
5534 """removes files not tracked by Mercurial
5534 """removes files not tracked by Mercurial
5535
5535
5536 Delete files not known to Mercurial. This is useful to test local
5536 Delete files not known to Mercurial. This is useful to test local
5537 and uncommitted changes in an otherwise-clean source tree.
5537 and uncommitted changes in an otherwise-clean source tree.
5538
5538
5539 This means that purge will delete the following by default:
5539 This means that purge will delete the following by default:
5540
5540
5541 - Unknown files: files marked with "?" by :hg:`status`
5541 - Unknown files: files marked with "?" by :hg:`status`
5542 - Empty directories: in fact Mercurial ignores directories unless
5542 - Empty directories: in fact Mercurial ignores directories unless
5543 they contain files under source control management
5543 they contain files under source control management
5544
5544
5545 But it will leave untouched:
5545 But it will leave untouched:
5546
5546
5547 - Modified and unmodified tracked files
5547 - Modified and unmodified tracked files
5548 - Ignored files (unless -i or --all is specified)
5548 - Ignored files (unless -i or --all is specified)
5549 - New files added to the repository (with :hg:`add`)
5549 - New files added to the repository (with :hg:`add`)
5550
5550
5551 The --files and --dirs options can be used to direct purge to delete
5551 The --files and --dirs options can be used to direct purge to delete
5552 only files, only directories, or both. If neither option is given,
5552 only files, only directories, or both. If neither option is given,
5553 both will be deleted.
5553 both will be deleted.
5554
5554
5555 If directories are given on the command line, only files in these
5555 If directories are given on the command line, only files in these
5556 directories are considered.
5556 directories are considered.
5557
5557
5558 Be careful with purge, as you could irreversibly delete some files
5558 Be careful with purge, as you could irreversibly delete some files
5559 you forgot to add to the repository. If you only want to print the
5559 you forgot to add to the repository. If you only want to print the
5560 list of files that this program would delete, use the --print
5560 list of files that this program would delete, use the --print
5561 option.
5561 option.
5562 """
5562 """
5563 opts = pycompat.byteskwargs(opts)
5563 opts = pycompat.byteskwargs(opts)
5564 cmdutil.check_at_most_one_arg(opts, b'all', b'ignored')
5564 cmdutil.check_at_most_one_arg(opts, b'all', b'ignored')
5565
5565
5566 act = not opts.get(b'print')
5566 act = not opts.get(b'print')
5567 eol = b'\n'
5567 eol = b'\n'
5568 if opts.get(b'print0'):
5568 if opts.get(b'print0'):
5569 eol = b'\0'
5569 eol = b'\0'
5570 act = False # --print0 implies --print
5570 act = False # --print0 implies --print
5571 if opts.get(b'all', False):
5571 if opts.get(b'all', False):
5572 ignored = True
5572 ignored = True
5573 unknown = True
5573 unknown = True
5574 else:
5574 else:
5575 ignored = opts.get(b'ignored', False)
5575 ignored = opts.get(b'ignored', False)
5576 unknown = not ignored
5576 unknown = not ignored
5577
5577
5578 removefiles = opts.get(b'files')
5578 removefiles = opts.get(b'files')
5579 removedirs = opts.get(b'dirs')
5579 removedirs = opts.get(b'dirs')
5580 confirm = opts.get(b'confirm')
5580 confirm = opts.get(b'confirm')
5581 if confirm is None:
5581 if confirm is None:
5582 try:
5582 try:
5583 extensions.find(b'purge')
5583 extensions.find(b'purge')
5584 confirm = False
5584 confirm = False
5585 except KeyError:
5585 except KeyError:
5586 confirm = True
5586 confirm = True
5587
5587
5588 if not removefiles and not removedirs:
5588 if not removefiles and not removedirs:
5589 removefiles = True
5589 removefiles = True
5590 removedirs = True
5590 removedirs = True
5591
5591
5592 match = scmutil.match(repo[None], dirs, opts)
5592 match = scmutil.match(repo[None], dirs, opts)
5593
5593
5594 paths = mergemod.purge(
5594 paths = mergemod.purge(
5595 repo,
5595 repo,
5596 match,
5596 match,
5597 unknown=unknown,
5597 unknown=unknown,
5598 ignored=ignored,
5598 ignored=ignored,
5599 removeemptydirs=removedirs,
5599 removeemptydirs=removedirs,
5600 removefiles=removefiles,
5600 removefiles=removefiles,
5601 abortonerror=opts.get(b'abort_on_err'),
5601 abortonerror=opts.get(b'abort_on_err'),
5602 noop=not act,
5602 noop=not act,
5603 confirm=confirm,
5603 confirm=confirm,
5604 )
5604 )
5605
5605
5606 for path in paths:
5606 for path in paths:
5607 if not act:
5607 if not act:
5608 ui.write(b'%s%s' % (path, eol))
5608 ui.write(b'%s%s' % (path, eol))
5609
5609
5610
5610
5611 @command(
5611 @command(
5612 b'push',
5612 b'push',
5613 [
5613 [
5614 (b'f', b'force', None, _(b'force push')),
5614 (b'f', b'force', None, _(b'force push')),
5615 (
5615 (
5616 b'r',
5616 b'r',
5617 b'rev',
5617 b'rev',
5618 [],
5618 [],
5619 _(b'a changeset intended to be included in the destination'),
5619 _(b'a changeset intended to be included in the destination'),
5620 _(b'REV'),
5620 _(b'REV'),
5621 ),
5621 ),
5622 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5622 (b'B', b'bookmark', [], _(b"bookmark to push"), _(b'BOOKMARK')),
5623 (b'', b'all-bookmarks', None, _(b"push all bookmarks (EXPERIMENTAL)")),
5623 (b'', b'all-bookmarks', None, _(b"push all bookmarks (EXPERIMENTAL)")),
5624 (
5624 (
5625 b'b',
5625 b'b',
5626 b'branch',
5626 b'branch',
5627 [],
5627 [],
5628 _(b'a specific branch you would like to push'),
5628 _(b'a specific branch you would like to push'),
5629 _(b'BRANCH'),
5629 _(b'BRANCH'),
5630 ),
5630 ),
5631 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5631 (b'', b'new-branch', False, _(b'allow pushing a new branch')),
5632 (
5632 (
5633 b'',
5633 b'',
5634 b'pushvars',
5634 b'pushvars',
5635 [],
5635 [],
5636 _(b'variables that can be sent to server (ADVANCED)'),
5636 _(b'variables that can be sent to server (ADVANCED)'),
5637 ),
5637 ),
5638 (
5638 (
5639 b'',
5639 b'',
5640 b'publish',
5640 b'publish',
5641 False,
5641 False,
5642 _(b'push the changeset as public (EXPERIMENTAL)'),
5642 _(b'push the changeset as public (EXPERIMENTAL)'),
5643 ),
5643 ),
5644 ]
5644 ]
5645 + remoteopts,
5645 + remoteopts,
5646 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]...'),
5646 _(b'[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]...'),
5647 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5647 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5648 helpbasic=True,
5648 helpbasic=True,
5649 )
5649 )
5650 def push(ui, repo, *dests, **opts):
5650 def push(ui, repo, *dests, **opts):
5651 """push changes to the specified destination
5651 """push changes to the specified destination
5652
5652
5653 Push changesets from the local repository to the specified
5653 Push changesets from the local repository to the specified
5654 destination.
5654 destination.
5655
5655
5656 This operation is symmetrical to pull: it is identical to a pull
5656 This operation is symmetrical to pull: it is identical to a pull
5657 in the destination repository from the current one.
5657 in the destination repository from the current one.
5658
5658
5659 By default, push will not allow creation of new heads at the
5659 By default, push will not allow creation of new heads at the
5660 destination, since multiple heads would make it unclear which head
5660 destination, since multiple heads would make it unclear which head
5661 to use. In this situation, it is recommended to pull and merge
5661 to use. In this situation, it is recommended to pull and merge
5662 before pushing.
5662 before pushing.
5663
5663
5664 Use --new-branch if you want to allow push to create a new named
5664 Use --new-branch if you want to allow push to create a new named
5665 branch that is not present at the destination. This allows you to
5665 branch that is not present at the destination. This allows you to
5666 only create a new branch without forcing other changes.
5666 only create a new branch without forcing other changes.
5667
5667
5668 .. note::
5668 .. note::
5669
5669
5670 Extra care should be taken with the -f/--force option,
5670 Extra care should be taken with the -f/--force option,
5671 which will push all new heads on all branches, an action which will
5671 which will push all new heads on all branches, an action which will
5672 almost always cause confusion for collaborators.
5672 almost always cause confusion for collaborators.
5673
5673
5674 If -r/--rev is used, the specified revision and all its ancestors
5674 If -r/--rev is used, the specified revision and all its ancestors
5675 will be pushed to the remote repository.
5675 will be pushed to the remote repository.
5676
5676
5677 If -B/--bookmark is used, the specified bookmarked revision, its
5677 If -B/--bookmark is used, the specified bookmarked revision, its
5678 ancestors, and the bookmark will be pushed to the remote
5678 ancestors, and the bookmark will be pushed to the remote
5679 repository. Specifying ``.`` is equivalent to specifying the active
5679 repository. Specifying ``.`` is equivalent to specifying the active
5680 bookmark's name. Use the --all-bookmarks option for pushing all
5680 bookmark's name. Use the --all-bookmarks option for pushing all
5681 current bookmarks.
5681 current bookmarks.
5682
5682
5683 Please see :hg:`help urls` for important details about ``ssh://``
5683 Please see :hg:`help urls` for important details about ``ssh://``
5684 URLs. If DESTINATION is omitted, a default path will be used.
5684 URLs. If DESTINATION is omitted, a default path will be used.
5685
5685
5686 When passed multiple destinations, push will process them one after the
5686 When passed multiple destinations, push will process them one after the
5687 other, but stop should an error occur.
5687 other, but stop should an error occur.
5688
5688
5689 .. container:: verbose
5689 .. container:: verbose
5690
5690
5691 The --pushvars option sends strings to the server that become
5691 The --pushvars option sends strings to the server that become
5692 environment variables prepended with ``HG_USERVAR_``. For example,
5692 environment variables prepended with ``HG_USERVAR_``. For example,
5693 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5693 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
5694 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5694 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
5695
5695
5696 pushvars can provide for user-overridable hooks as well as set debug
5696 pushvars can provide for user-overridable hooks as well as set debug
5697 levels. One example is having a hook that blocks commits containing
5697 levels. One example is having a hook that blocks commits containing
5698 conflict markers, but enables the user to override the hook if the file
5698 conflict markers, but enables the user to override the hook if the file
5699 is using conflict markers for testing purposes or the file format has
5699 is using conflict markers for testing purposes or the file format has
5700 strings that look like conflict markers.
5700 strings that look like conflict markers.
5701
5701
5702 By default, servers will ignore `--pushvars`. To enable it add the
5702 By default, servers will ignore `--pushvars`. To enable it add the
5703 following to your configuration file::
5703 following to your configuration file::
5704
5704
5705 [push]
5705 [push]
5706 pushvars.server = true
5706 pushvars.server = true
5707
5707
5708 Returns 0 if push was successful, 1 if nothing to push.
5708 Returns 0 if push was successful, 1 if nothing to push.
5709 """
5709 """
5710
5710
5711 opts = pycompat.byteskwargs(opts)
5711 opts = pycompat.byteskwargs(opts)
5712
5712
5713 if opts.get(b'all_bookmarks'):
5713 if opts.get(b'all_bookmarks'):
5714 cmdutil.check_incompatible_arguments(
5714 cmdutil.check_incompatible_arguments(
5715 opts,
5715 opts,
5716 b'all_bookmarks',
5716 b'all_bookmarks',
5717 [b'bookmark', b'rev'],
5717 [b'bookmark', b'rev'],
5718 )
5718 )
5719 opts[b'bookmark'] = list(repo._bookmarks)
5719 opts[b'bookmark'] = list(repo._bookmarks)
5720
5720
5721 if opts.get(b'bookmark'):
5721 if opts.get(b'bookmark'):
5722 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5722 ui.setconfig(b'bookmarks', b'pushing', opts[b'bookmark'], b'push')
5723 for b in opts[b'bookmark']:
5723 for b in opts[b'bookmark']:
5724 # translate -B options to -r so changesets get pushed
5724 # translate -B options to -r so changesets get pushed
5725 b = repo._bookmarks.expandname(b)
5725 b = repo._bookmarks.expandname(b)
5726 if b in repo._bookmarks:
5726 if b in repo._bookmarks:
5727 opts.setdefault(b'rev', []).append(b)
5727 opts.setdefault(b'rev', []).append(b)
5728 else:
5728 else:
5729 # if we try to push a deleted bookmark, translate it to null
5729 # if we try to push a deleted bookmark, translate it to null
5730 # this lets simultaneous -r, -b options continue working
5730 # this lets simultaneous -r, -b options continue working
5731 opts.setdefault(b'rev', []).append(b"null")
5731 opts.setdefault(b'rev', []).append(b"null")
5732
5732
5733 some_pushed = False
5733 some_pushed = False
5734 result = 0
5734 result = 0
5735 for path in urlutil.get_push_paths(repo, ui, dests):
5735 for path in urlutil.get_push_paths(repo, ui, dests):
5736 dest = path.pushloc or path.loc
5736 dest = path.pushloc or path.loc
5737 branches = (path.branch, opts.get(b'branch') or [])
5737 branches = (path.branch, opts.get(b'branch') or [])
5738 ui.status(_(b'pushing to %s\n') % urlutil.hidepassword(dest))
5738 ui.status(_(b'pushing to %s\n') % urlutil.hidepassword(dest))
5739 revs, checkout = hg.addbranchrevs(
5739 revs, checkout = hg.addbranchrevs(
5740 repo, repo, branches, opts.get(b'rev')
5740 repo, repo, branches, opts.get(b'rev')
5741 )
5741 )
5742 other = hg.peer(repo, opts, dest)
5742 other = hg.peer(repo, opts, dest)
5743
5743
5744 try:
5744 try:
5745 if revs:
5745 if revs:
5746 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5746 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
5747 if not revs:
5747 if not revs:
5748 raise error.InputError(
5748 raise error.InputError(
5749 _(b"specified revisions evaluate to an empty set"),
5749 _(b"specified revisions evaluate to an empty set"),
5750 hint=_(b"use different revision arguments"),
5750 hint=_(b"use different revision arguments"),
5751 )
5751 )
5752 elif path.pushrev:
5752 elif path.pushrev:
5753 # It doesn't make any sense to specify ancestor revisions. So limit
5753 # It doesn't make any sense to specify ancestor revisions. So limit
5754 # to DAG heads to make discovery simpler.
5754 # to DAG heads to make discovery simpler.
5755 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5755 expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
5756 revs = scmutil.revrange(repo, [expr])
5756 revs = scmutil.revrange(repo, [expr])
5757 revs = [repo[rev].node() for rev in revs]
5757 revs = [repo[rev].node() for rev in revs]
5758 if not revs:
5758 if not revs:
5759 raise error.InputError(
5759 raise error.InputError(
5760 _(
5760 _(
5761 b'default push revset for path evaluates to an empty set'
5761 b'default push revset for path evaluates to an empty set'
5762 )
5762 )
5763 )
5763 )
5764 elif ui.configbool(b'commands', b'push.require-revs'):
5764 elif ui.configbool(b'commands', b'push.require-revs'):
5765 raise error.InputError(
5765 raise error.InputError(
5766 _(b'no revisions specified to push'),
5766 _(b'no revisions specified to push'),
5767 hint=_(b'did you mean "hg push -r ."?'),
5767 hint=_(b'did you mean "hg push -r ."?'),
5768 )
5768 )
5769
5769
5770 repo._subtoppath = dest
5770 repo._subtoppath = dest
5771 try:
5771 try:
5772 # push subrepos depth-first for coherent ordering
5772 # push subrepos depth-first for coherent ordering
5773 c = repo[b'.']
5773 c = repo[b'.']
5774 subs = c.substate # only repos that are committed
5774 subs = c.substate # only repos that are committed
5775 for s in sorted(subs):
5775 for s in sorted(subs):
5776 sub_result = c.sub(s).push(opts)
5776 sub_result = c.sub(s).push(opts)
5777 if sub_result == 0:
5777 if sub_result == 0:
5778 return 1
5778 return 1
5779 finally:
5779 finally:
5780 del repo._subtoppath
5780 del repo._subtoppath
5781
5781
5782 opargs = dict(
5782 opargs = dict(
5783 opts.get(b'opargs', {})
5783 opts.get(b'opargs', {})
5784 ) # copy opargs since we may mutate it
5784 ) # copy opargs since we may mutate it
5785 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5785 opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))
5786
5786
5787 pushop = exchange.push(
5787 pushop = exchange.push(
5788 repo,
5788 repo,
5789 other,
5789 other,
5790 opts.get(b'force'),
5790 opts.get(b'force'),
5791 revs=revs,
5791 revs=revs,
5792 newbranch=opts.get(b'new_branch'),
5792 newbranch=opts.get(b'new_branch'),
5793 bookmarks=opts.get(b'bookmark', ()),
5793 bookmarks=opts.get(b'bookmark', ()),
5794 publish=opts.get(b'publish'),
5794 publish=opts.get(b'publish'),
5795 opargs=opargs,
5795 opargs=opargs,
5796 )
5796 )
5797
5797
5798 if pushop.cgresult == 0:
5798 if pushop.cgresult == 0:
5799 result = 1
5799 result = 1
5800 elif pushop.cgresult is not None:
5800 elif pushop.cgresult is not None:
5801 some_pushed = True
5801 some_pushed = True
5802
5802
5803 if pushop.bkresult is not None:
5803 if pushop.bkresult is not None:
5804 if pushop.bkresult == 2:
5804 if pushop.bkresult == 2:
5805 result = 2
5805 result = 2
5806 elif not result and pushop.bkresult:
5806 elif not result and pushop.bkresult:
5807 result = 2
5807 result = 2
5808
5808
5809 if result:
5809 if result:
5810 break
5810 break
5811
5811
5812 finally:
5812 finally:
5813 other.close()
5813 other.close()
5814 if result == 0 and not some_pushed:
5814 if result == 0 and not some_pushed:
5815 result = 1
5815 result = 1
5816 return result
5816 return result
5817
5817
5818
5818
5819 @command(
5819 @command(
5820 b'recover',
5820 b'recover',
5821 [
5821 [
5822 (b'', b'verify', False, b"run `hg verify` after successful recover"),
5822 (b'', b'verify', False, b"run `hg verify` after successful recover"),
5823 ],
5823 ],
5824 helpcategory=command.CATEGORY_MAINTENANCE,
5824 helpcategory=command.CATEGORY_MAINTENANCE,
5825 )
5825 )
5826 def recover(ui, repo, **opts):
5826 def recover(ui, repo, **opts):
5827 """roll back an interrupted transaction
5827 """roll back an interrupted transaction
5828
5828
5829 Recover from an interrupted commit or pull.
5829 Recover from an interrupted commit or pull.
5830
5830
5831 This command tries to fix the repository status after an
5831 This command tries to fix the repository status after an
5832 interrupted operation. It should only be necessary when Mercurial
5832 interrupted operation. It should only be necessary when Mercurial
5833 suggests it.
5833 suggests it.
5834
5834
5835 Returns 0 if successful, 1 if nothing to recover or verify fails.
5835 Returns 0 if successful, 1 if nothing to recover or verify fails.
5836 """
5836 """
5837 ret = repo.recover()
5837 ret = repo.recover()
5838 if ret:
5838 if ret:
5839 if opts['verify']:
5839 if opts['verify']:
5840 return hg.verify(repo)
5840 return hg.verify(repo)
5841 else:
5841 else:
5842 msg = _(
5842 msg = _(
5843 b"(verify step skipped, run `hg verify` to check your "
5843 b"(verify step skipped, run `hg verify` to check your "
5844 b"repository content)\n"
5844 b"repository content)\n"
5845 )
5845 )
5846 ui.warn(msg)
5846 ui.warn(msg)
5847 return 0
5847 return 0
5848 return 1
5848 return 1
5849
5849
5850
5850
5851 @command(
5851 @command(
5852 b'remove|rm',
5852 b'remove|rm',
5853 [
5853 [
5854 (b'A', b'after', None, _(b'record delete for missing files')),
5854 (b'A', b'after', None, _(b'record delete for missing files')),
5855 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5855 (b'f', b'force', None, _(b'forget added files, delete modified files')),
5856 ]
5856 ]
5857 + subrepoopts
5857 + subrepoopts
5858 + walkopts
5858 + walkopts
5859 + dryrunopts,
5859 + dryrunopts,
5860 _(b'[OPTION]... FILE...'),
5860 _(b'[OPTION]... FILE...'),
5861 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5861 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5862 helpbasic=True,
5862 helpbasic=True,
5863 inferrepo=True,
5863 inferrepo=True,
5864 )
5864 )
5865 def remove(ui, repo, *pats, **opts):
5865 def remove(ui, repo, *pats, **opts):
5866 """remove the specified files on the next commit
5866 """remove the specified files on the next commit
5867
5867
5868 Schedule the indicated files for removal from the current branch.
5868 Schedule the indicated files for removal from the current branch.
5869
5869
5870 This command schedules the files to be removed at the next commit.
5870 This command schedules the files to be removed at the next commit.
5871 To undo a remove before that, see :hg:`revert`. To undo added
5871 To undo a remove before that, see :hg:`revert`. To undo added
5872 files, see :hg:`forget`.
5872 files, see :hg:`forget`.
5873
5873
5874 .. container:: verbose
5874 .. container:: verbose
5875
5875
5876 -A/--after can be used to remove only files that have already
5876 -A/--after can be used to remove only files that have already
5877 been deleted, -f/--force can be used to force deletion, and -Af
5877 been deleted, -f/--force can be used to force deletion, and -Af
5878 can be used to remove files from the next revision without
5878 can be used to remove files from the next revision without
5879 deleting them from the working directory.
5879 deleting them from the working directory.
5880
5880
5881 The following table details the behavior of remove for different
5881 The following table details the behavior of remove for different
5882 file states (columns) and option combinations (rows). The file
5882 file states (columns) and option combinations (rows). The file
5883 states are Added [A], Clean [C], Modified [M] and Missing [!]
5883 states are Added [A], Clean [C], Modified [M] and Missing [!]
5884 (as reported by :hg:`status`). The actions are Warn, Remove
5884 (as reported by :hg:`status`). The actions are Warn, Remove
5885 (from branch) and Delete (from disk):
5885 (from branch) and Delete (from disk):
5886
5886
5887 ========= == == == ==
5887 ========= == == == ==
5888 opt/state A C M !
5888 opt/state A C M !
5889 ========= == == == ==
5889 ========= == == == ==
5890 none W RD W R
5890 none W RD W R
5891 -f R RD RD R
5891 -f R RD RD R
5892 -A W W W R
5892 -A W W W R
5893 -Af R R R R
5893 -Af R R R R
5894 ========= == == == ==
5894 ========= == == == ==
5895
5895
5896 .. note::
5896 .. note::
5897
5897
5898 :hg:`remove` never deletes files in Added [A] state from the
5898 :hg:`remove` never deletes files in Added [A] state from the
5899 working directory, not even if ``--force`` is specified.
5899 working directory, not even if ``--force`` is specified.
5900
5900
5901 Returns 0 on success, 1 if any warnings encountered.
5901 Returns 0 on success, 1 if any warnings encountered.
5902 """
5902 """
5903
5903
5904 opts = pycompat.byteskwargs(opts)
5904 opts = pycompat.byteskwargs(opts)
5905 after, force = opts.get(b'after'), opts.get(b'force')
5905 after, force = opts.get(b'after'), opts.get(b'force')
5906 dryrun = opts.get(b'dry_run')
5906 dryrun = opts.get(b'dry_run')
5907 if not pats and not after:
5907 if not pats and not after:
5908 raise error.InputError(_(b'no files specified'))
5908 raise error.InputError(_(b'no files specified'))
5909
5909
5910 m = scmutil.match(repo[None], pats, opts)
5910 m = scmutil.match(repo[None], pats, opts)
5911 subrepos = opts.get(b'subrepos')
5911 subrepos = opts.get(b'subrepos')
5912 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5912 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
5913 return cmdutil.remove(
5913 return cmdutil.remove(
5914 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5914 ui, repo, m, b"", uipathfn, after, force, subrepos, dryrun=dryrun
5915 )
5915 )
5916
5916
5917
5917
5918 @command(
5918 @command(
5919 b'rename|move|mv',
5919 b'rename|move|mv',
5920 [
5920 [
5921 (b'', b'forget', None, _(b'unmark a destination file as renamed')),
5921 (b'', b'forget', None, _(b'unmark a destination file as renamed')),
5922 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5922 (b'A', b'after', None, _(b'record a rename that has already occurred')),
5923 (
5923 (
5924 b'',
5924 b'',
5925 b'at-rev',
5925 b'at-rev',
5926 b'',
5926 b'',
5927 _(b'(un)mark renames in the given revision (EXPERIMENTAL)'),
5927 _(b'(un)mark renames in the given revision (EXPERIMENTAL)'),
5928 _(b'REV'),
5928 _(b'REV'),
5929 ),
5929 ),
5930 (
5930 (
5931 b'f',
5931 b'f',
5932 b'force',
5932 b'force',
5933 None,
5933 None,
5934 _(b'forcibly move over an existing managed file'),
5934 _(b'forcibly move over an existing managed file'),
5935 ),
5935 ),
5936 ]
5936 ]
5937 + walkopts
5937 + walkopts
5938 + dryrunopts,
5938 + dryrunopts,
5939 _(b'[OPTION]... SOURCE... DEST'),
5939 _(b'[OPTION]... SOURCE... DEST'),
5940 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5940 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5941 )
5941 )
5942 def rename(ui, repo, *pats, **opts):
5942 def rename(ui, repo, *pats, **opts):
5943 """rename files; equivalent of copy + remove
5943 """rename files; equivalent of copy + remove
5944
5944
5945 Mark dest as copies of sources; mark sources for deletion. If dest
5945 Mark dest as copies of sources; mark sources for deletion. If dest
5946 is a directory, copies are put in that directory. If dest is a
5946 is a directory, copies are put in that directory. If dest is a
5947 file, there can only be one source.
5947 file, there can only be one source.
5948
5948
5949 By default, this command copies the contents of files as they
5949 By default, this command copies the contents of files as they
5950 exist in the working directory. If invoked with -A/--after, the
5950 exist in the working directory. If invoked with -A/--after, the
5951 operation is recorded, but no copying is performed.
5951 operation is recorded, but no copying is performed.
5952
5952
5953 To undo marking a destination file as renamed, use --forget. With that
5953 To undo marking a destination file as renamed, use --forget. With that
5954 option, all given (positional) arguments are unmarked as renames. The
5954 option, all given (positional) arguments are unmarked as renames. The
5955 destination file(s) will be left in place (still tracked). The source
5955 destination file(s) will be left in place (still tracked). The source
5956 file(s) will not be restored. Note that :hg:`rename --forget` behaves
5956 file(s) will not be restored. Note that :hg:`rename --forget` behaves
5957 the same way as :hg:`copy --forget`.
5957 the same way as :hg:`copy --forget`.
5958
5958
5959 This command takes effect with the next commit by default.
5959 This command takes effect with the next commit by default.
5960
5960
5961 Returns 0 on success, 1 if errors are encountered.
5961 Returns 0 on success, 1 if errors are encountered.
5962 """
5962 """
5963 opts = pycompat.byteskwargs(opts)
5963 opts = pycompat.byteskwargs(opts)
5964 with repo.wlock():
5964 with repo.wlock():
5965 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5965 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5966
5966
5967
5967
5968 @command(
5968 @command(
5969 b'resolve',
5969 b'resolve',
5970 [
5970 [
5971 (b'a', b'all', None, _(b'select all unresolved files')),
5971 (b'a', b'all', None, _(b'select all unresolved files')),
5972 (b'l', b'list', None, _(b'list state of files needing merge')),
5972 (b'l', b'list', None, _(b'list state of files needing merge')),
5973 (b'm', b'mark', None, _(b'mark files as resolved')),
5973 (b'm', b'mark', None, _(b'mark files as resolved')),
5974 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5974 (b'u', b'unmark', None, _(b'mark files as unresolved')),
5975 (b'n', b'no-status', None, _(b'hide status prefix')),
5975 (b'n', b'no-status', None, _(b'hide status prefix')),
5976 (b'', b're-merge', None, _(b're-merge files')),
5976 (b'', b're-merge', None, _(b're-merge files')),
5977 ]
5977 ]
5978 + mergetoolopts
5978 + mergetoolopts
5979 + walkopts
5979 + walkopts
5980 + formatteropts,
5980 + formatteropts,
5981 _(b'[OPTION]... [FILE]...'),
5981 _(b'[OPTION]... [FILE]...'),
5982 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5982 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5983 inferrepo=True,
5983 inferrepo=True,
5984 )
5984 )
5985 def resolve(ui, repo, *pats, **opts):
5985 def resolve(ui, repo, *pats, **opts):
5986 """redo merges or set/view the merge status of files
5986 """redo merges or set/view the merge status of files
5987
5987
5988 Merges with unresolved conflicts are often the result of
5988 Merges with unresolved conflicts are often the result of
5989 non-interactive merging using the ``internal:merge`` configuration
5989 non-interactive merging using the ``internal:merge`` configuration
5990 setting, or a command-line merge tool like ``diff3``. The resolve
5990 setting, or a command-line merge tool like ``diff3``. The resolve
5991 command is used to manage the files involved in a merge, after
5991 command is used to manage the files involved in a merge, after
5992 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5992 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5993 working directory must have two parents). See :hg:`help
5993 working directory must have two parents). See :hg:`help
5994 merge-tools` for information on configuring merge tools.
5994 merge-tools` for information on configuring merge tools.
5995
5995
5996 The resolve command can be used in the following ways:
5996 The resolve command can be used in the following ways:
5997
5997
5998 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5998 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
5999 the specified files, discarding any previous merge attempts. Re-merging
5999 the specified files, discarding any previous merge attempts. Re-merging
6000 is not performed for files already marked as resolved. Use ``--all/-a``
6000 is not performed for files already marked as resolved. Use ``--all/-a``
6001 to select all unresolved files. ``--tool`` can be used to specify
6001 to select all unresolved files. ``--tool`` can be used to specify
6002 the merge tool used for the given files. It overrides the HGMERGE
6002 the merge tool used for the given files. It overrides the HGMERGE
6003 environment variable and your configuration files. Previous file
6003 environment variable and your configuration files. Previous file
6004 contents are saved with a ``.orig`` suffix.
6004 contents are saved with a ``.orig`` suffix.
6005
6005
6006 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
6006 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
6007 (e.g. after having manually fixed-up the files). The default is
6007 (e.g. after having manually fixed-up the files). The default is
6008 to mark all unresolved files.
6008 to mark all unresolved files.
6009
6009
6010 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
6010 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
6011 default is to mark all resolved files.
6011 default is to mark all resolved files.
6012
6012
6013 - :hg:`resolve -l`: list files which had or still have conflicts.
6013 - :hg:`resolve -l`: list files which had or still have conflicts.
6014 In the printed list, ``U`` = unresolved and ``R`` = resolved.
6014 In the printed list, ``U`` = unresolved and ``R`` = resolved.
6015 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
6015 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
6016 the list. See :hg:`help filesets` for details.
6016 the list. See :hg:`help filesets` for details.
6017
6017
6018 .. note::
6018 .. note::
6019
6019
6020 Mercurial will not let you commit files with unresolved merge
6020 Mercurial will not let you commit files with unresolved merge
6021 conflicts. You must use :hg:`resolve -m ...` before you can
6021 conflicts. You must use :hg:`resolve -m ...` before you can
6022 commit after a conflicting merge.
6022 commit after a conflicting merge.
6023
6023
6024 .. container:: verbose
6024 .. container:: verbose
6025
6025
6026 Template:
6026 Template:
6027
6027
6028 The following keywords are supported in addition to the common template
6028 The following keywords are supported in addition to the common template
6029 keywords and functions. See also :hg:`help templates`.
6029 keywords and functions. See also :hg:`help templates`.
6030
6030
6031 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
6031 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
6032 :path: String. Repository-absolute path of the file.
6032 :path: String. Repository-absolute path of the file.
6033
6033
6034 Returns 0 on success, 1 if any files fail a resolve attempt.
6034 Returns 0 on success, 1 if any files fail a resolve attempt.
6035 """
6035 """
6036
6036
6037 opts = pycompat.byteskwargs(opts)
6037 opts = pycompat.byteskwargs(opts)
6038 confirm = ui.configbool(b'commands', b'resolve.confirm')
6038 confirm = ui.configbool(b'commands', b'resolve.confirm')
6039 flaglist = b'all mark unmark list no_status re_merge'.split()
6039 flaglist = b'all mark unmark list no_status re_merge'.split()
6040 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
6040 all, mark, unmark, show, nostatus, remerge = [opts.get(o) for o in flaglist]
6041
6041
6042 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
6042 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
6043 if actioncount > 1:
6043 if actioncount > 1:
6044 raise error.InputError(_(b"too many actions specified"))
6044 raise error.InputError(_(b"too many actions specified"))
6045 elif actioncount == 0 and ui.configbool(
6045 elif actioncount == 0 and ui.configbool(
6046 b'commands', b'resolve.explicit-re-merge'
6046 b'commands', b'resolve.explicit-re-merge'
6047 ):
6047 ):
6048 hint = _(b'use --mark, --unmark, --list or --re-merge')
6048 hint = _(b'use --mark, --unmark, --list or --re-merge')
6049 raise error.InputError(_(b'no action specified'), hint=hint)
6049 raise error.InputError(_(b'no action specified'), hint=hint)
6050 if pats and all:
6050 if pats and all:
6051 raise error.InputError(_(b"can't specify --all and patterns"))
6051 raise error.InputError(_(b"can't specify --all and patterns"))
6052 if not (all or pats or show or mark or unmark):
6052 if not (all or pats or show or mark or unmark):
6053 raise error.InputError(
6053 raise error.InputError(
6054 _(b'no files or directories specified'),
6054 _(b'no files or directories specified'),
6055 hint=b'use --all to re-merge all unresolved files',
6055 hint=b'use --all to re-merge all unresolved files',
6056 )
6056 )
6057
6057
6058 if confirm:
6058 if confirm:
6059 if all:
6059 if all:
6060 if ui.promptchoice(
6060 if ui.promptchoice(
6061 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
6061 _(b're-merge all unresolved files (yn)?$$ &Yes $$ &No')
6062 ):
6062 ):
6063 raise error.CanceledError(_(b'user quit'))
6063 raise error.CanceledError(_(b'user quit'))
6064 if mark and not pats:
6064 if mark and not pats:
6065 if ui.promptchoice(
6065 if ui.promptchoice(
6066 _(
6066 _(
6067 b'mark all unresolved files as resolved (yn)?'
6067 b'mark all unresolved files as resolved (yn)?'
6068 b'$$ &Yes $$ &No'
6068 b'$$ &Yes $$ &No'
6069 )
6069 )
6070 ):
6070 ):
6071 raise error.CanceledError(_(b'user quit'))
6071 raise error.CanceledError(_(b'user quit'))
6072 if unmark and not pats:
6072 if unmark and not pats:
6073 if ui.promptchoice(
6073 if ui.promptchoice(
6074 _(
6074 _(
6075 b'mark all resolved files as unresolved (yn)?'
6075 b'mark all resolved files as unresolved (yn)?'
6076 b'$$ &Yes $$ &No'
6076 b'$$ &Yes $$ &No'
6077 )
6077 )
6078 ):
6078 ):
6079 raise error.CanceledError(_(b'user quit'))
6079 raise error.CanceledError(_(b'user quit'))
6080
6080
6081 uipathfn = scmutil.getuipathfn(repo)
6081 uipathfn = scmutil.getuipathfn(repo)
6082
6082
6083 if show:
6083 if show:
6084 ui.pager(b'resolve')
6084 ui.pager(b'resolve')
6085 fm = ui.formatter(b'resolve', opts)
6085 fm = ui.formatter(b'resolve', opts)
6086 ms = mergestatemod.mergestate.read(repo)
6086 ms = mergestatemod.mergestate.read(repo)
6087 wctx = repo[None]
6087 wctx = repo[None]
6088 m = scmutil.match(wctx, pats, opts)
6088 m = scmutil.match(wctx, pats, opts)
6089
6089
6090 # Labels and keys based on merge state. Unresolved path conflicts show
6090 # Labels and keys based on merge state. Unresolved path conflicts show
6091 # as 'P'. Resolved path conflicts show as 'R', the same as normal
6091 # as 'P'. Resolved path conflicts show as 'R', the same as normal
6092 # resolved conflicts.
6092 # resolved conflicts.
6093 mergestateinfo = {
6093 mergestateinfo = {
6094 mergestatemod.MERGE_RECORD_UNRESOLVED: (
6094 mergestatemod.MERGE_RECORD_UNRESOLVED: (
6095 b'resolve.unresolved',
6095 b'resolve.unresolved',
6096 b'U',
6096 b'U',
6097 ),
6097 ),
6098 mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
6098 mergestatemod.MERGE_RECORD_RESOLVED: (b'resolve.resolved', b'R'),
6099 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: (
6099 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH: (
6100 b'resolve.unresolved',
6100 b'resolve.unresolved',
6101 b'P',
6101 b'P',
6102 ),
6102 ),
6103 mergestatemod.MERGE_RECORD_RESOLVED_PATH: (
6103 mergestatemod.MERGE_RECORD_RESOLVED_PATH: (
6104 b'resolve.resolved',
6104 b'resolve.resolved',
6105 b'R',
6105 b'R',
6106 ),
6106 ),
6107 }
6107 }
6108
6108
6109 for f in ms:
6109 for f in ms:
6110 if not m(f):
6110 if not m(f):
6111 continue
6111 continue
6112
6112
6113 label, key = mergestateinfo[ms[f]]
6113 label, key = mergestateinfo[ms[f]]
6114 fm.startitem()
6114 fm.startitem()
6115 fm.context(ctx=wctx)
6115 fm.context(ctx=wctx)
6116 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
6116 fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
6117 fm.data(path=f)
6117 fm.data(path=f)
6118 fm.plain(b'%s\n' % uipathfn(f), label=label)
6118 fm.plain(b'%s\n' % uipathfn(f), label=label)
6119 fm.end()
6119 fm.end()
6120 return 0
6120 return 0
6121
6121
6122 with repo.wlock():
6122 with repo.wlock():
6123 ms = mergestatemod.mergestate.read(repo)
6123 ms = mergestatemod.mergestate.read(repo)
6124
6124
6125 if not (ms.active() or repo.dirstate.p2() != repo.nullid):
6125 if not (ms.active() or repo.dirstate.p2() != repo.nullid):
6126 raise error.StateError(
6126 raise error.StateError(
6127 _(b'resolve command not applicable when not merging')
6127 _(b'resolve command not applicable when not merging')
6128 )
6128 )
6129
6129
6130 wctx = repo[None]
6130 wctx = repo[None]
6131 m = scmutil.match(wctx, pats, opts)
6131 m = scmutil.match(wctx, pats, opts)
6132 ret = 0
6132 ret = 0
6133 didwork = False
6133 didwork = False
6134
6134
6135 tocomplete = []
6135 tocomplete = []
6136 hasconflictmarkers = []
6136 hasconflictmarkers = []
6137 if mark:
6137 if mark:
6138 markcheck = ui.config(b'commands', b'resolve.mark-check')
6138 markcheck = ui.config(b'commands', b'resolve.mark-check')
6139 if markcheck not in [b'warn', b'abort']:
6139 if markcheck not in [b'warn', b'abort']:
6140 # Treat all invalid / unrecognized values as 'none'.
6140 # Treat all invalid / unrecognized values as 'none'.
6141 markcheck = False
6141 markcheck = False
6142 for f in ms:
6142 for f in ms:
6143 if not m(f):
6143 if not m(f):
6144 continue
6144 continue
6145
6145
6146 didwork = True
6146 didwork = True
6147
6147
6148 # path conflicts must be resolved manually
6148 # path conflicts must be resolved manually
6149 if ms[f] in (
6149 if ms[f] in (
6150 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
6150 mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
6151 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
6151 mergestatemod.MERGE_RECORD_RESOLVED_PATH,
6152 ):
6152 ):
6153 if mark:
6153 if mark:
6154 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH)
6154 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED_PATH)
6155 elif unmark:
6155 elif unmark:
6156 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH)
6156 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH)
6157 elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH:
6157 elif ms[f] == mergestatemod.MERGE_RECORD_UNRESOLVED_PATH:
6158 ui.warn(
6158 ui.warn(
6159 _(b'%s: path conflict must be resolved manually\n')
6159 _(b'%s: path conflict must be resolved manually\n')
6160 % uipathfn(f)
6160 % uipathfn(f)
6161 )
6161 )
6162 continue
6162 continue
6163
6163
6164 if mark:
6164 if mark:
6165 if markcheck:
6165 if markcheck:
6166 fdata = repo.wvfs.tryread(f)
6166 fdata = repo.wvfs.tryread(f)
6167 if (
6167 if (
6168 filemerge.hasconflictmarkers(fdata)
6168 filemerge.hasconflictmarkers(fdata)
6169 and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED
6169 and ms[f] != mergestatemod.MERGE_RECORD_RESOLVED
6170 ):
6170 ):
6171 hasconflictmarkers.append(f)
6171 hasconflictmarkers.append(f)
6172 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED)
6172 ms.mark(f, mergestatemod.MERGE_RECORD_RESOLVED)
6173 elif unmark:
6173 elif unmark:
6174 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED)
6174 ms.mark(f, mergestatemod.MERGE_RECORD_UNRESOLVED)
6175 else:
6175 else:
6176 # backup pre-resolve (merge uses .orig for its own purposes)
6176 # backup pre-resolve (merge uses .orig for its own purposes)
6177 a = repo.wjoin(f)
6177 a = repo.wjoin(f)
6178 try:
6178 try:
6179 util.copyfile(a, a + b".resolve")
6179 util.copyfile(a, a + b".resolve")
6180 except (IOError, OSError) as inst:
6180 except (IOError, OSError) as inst:
6181 if inst.errno != errno.ENOENT:
6181 if inst.errno != errno.ENOENT:
6182 raise
6182 raise
6183
6183
6184 try:
6184 try:
6185 # preresolve file
6185 # preresolve file
6186 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6186 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6187 with ui.configoverride(overrides, b'resolve'):
6187 with ui.configoverride(overrides, b'resolve'):
6188 complete, r = ms.preresolve(f, wctx)
6188 complete, r = ms.preresolve(f, wctx)
6189 if not complete:
6189 if not complete:
6190 tocomplete.append(f)
6190 tocomplete.append(f)
6191 elif r:
6191 elif r:
6192 ret = 1
6192 ret = 1
6193 finally:
6193 finally:
6194 ms.commit()
6194 ms.commit()
6195
6195
6196 # replace filemerge's .orig file with our resolve file, but only
6196 # replace filemerge's .orig file with our resolve file, but only
6197 # for merges that are complete
6197 # for merges that are complete
6198 if complete:
6198 if complete:
6199 try:
6199 try:
6200 util.rename(
6200 util.rename(
6201 a + b".resolve", scmutil.backuppath(ui, repo, f)
6201 a + b".resolve", scmutil.backuppath(ui, repo, f)
6202 )
6202 )
6203 except OSError as inst:
6203 except OSError as inst:
6204 if inst.errno != errno.ENOENT:
6204 if inst.errno != errno.ENOENT:
6205 raise
6205 raise
6206
6206
6207 if hasconflictmarkers:
6207 if hasconflictmarkers:
6208 ui.warn(
6208 ui.warn(
6209 _(
6209 _(
6210 b'warning: the following files still have conflict '
6210 b'warning: the following files still have conflict '
6211 b'markers:\n'
6211 b'markers:\n'
6212 )
6212 )
6213 + b''.join(
6213 + b''.join(
6214 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6214 b' ' + uipathfn(f) + b'\n' for f in hasconflictmarkers
6215 )
6215 )
6216 )
6216 )
6217 if markcheck == b'abort' and not all and not pats:
6217 if markcheck == b'abort' and not all and not pats:
6218 raise error.StateError(
6218 raise error.StateError(
6219 _(b'conflict markers detected'),
6219 _(b'conflict markers detected'),
6220 hint=_(b'use --all to mark anyway'),
6220 hint=_(b'use --all to mark anyway'),
6221 )
6221 )
6222
6222
6223 for f in tocomplete:
6223 for f in tocomplete:
6224 try:
6224 try:
6225 # resolve file
6225 # resolve file
6226 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6226 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6227 with ui.configoverride(overrides, b'resolve'):
6227 with ui.configoverride(overrides, b'resolve'):
6228 r = ms.resolve(f, wctx)
6228 r = ms.resolve(f, wctx)
6229 if r:
6229 if r:
6230 ret = 1
6230 ret = 1
6231 finally:
6231 finally:
6232 ms.commit()
6232 ms.commit()
6233
6233
6234 # replace filemerge's .orig file with our resolve file
6234 # replace filemerge's .orig file with our resolve file
6235 a = repo.wjoin(f)
6235 a = repo.wjoin(f)
6236 try:
6236 try:
6237 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6237 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6238 except OSError as inst:
6238 except OSError as inst:
6239 if inst.errno != errno.ENOENT:
6239 if inst.errno != errno.ENOENT:
6240 raise
6240 raise
6241
6241
6242 ms.commit()
6242 ms.commit()
6243 branchmerge = repo.dirstate.p2() != repo.nullid
6243 branchmerge = repo.dirstate.p2() != repo.nullid
6244 mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None)
6244 mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None)
6245
6245
6246 if not didwork and pats:
6246 if not didwork and pats:
6247 hint = None
6247 hint = None
6248 if not any([p for p in pats if p.find(b':') >= 0]):
6248 if not any([p for p in pats if p.find(b':') >= 0]):
6249 pats = [b'path:%s' % p for p in pats]
6249 pats = [b'path:%s' % p for p in pats]
6250 m = scmutil.match(wctx, pats, opts)
6250 m = scmutil.match(wctx, pats, opts)
6251 for f in ms:
6251 for f in ms:
6252 if not m(f):
6252 if not m(f):
6253 continue
6253 continue
6254
6254
6255 def flag(o):
6255 def flag(o):
6256 if o == b're_merge':
6256 if o == b're_merge':
6257 return b'--re-merge '
6257 return b'--re-merge '
6258 return b'-%s ' % o[0:1]
6258 return b'-%s ' % o[0:1]
6259
6259
6260 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6260 flags = b''.join([flag(o) for o in flaglist if opts.get(o)])
6261 hint = _(b"(try: hg resolve %s%s)\n") % (
6261 hint = _(b"(try: hg resolve %s%s)\n") % (
6262 flags,
6262 flags,
6263 b' '.join(pats),
6263 b' '.join(pats),
6264 )
6264 )
6265 break
6265 break
6266 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6266 ui.warn(_(b"arguments do not match paths that need resolving\n"))
6267 if hint:
6267 if hint:
6268 ui.warn(hint)
6268 ui.warn(hint)
6269
6269
6270 unresolvedf = ms.unresolvedcount()
6270 unresolvedf = ms.unresolvedcount()
6271 if not unresolvedf:
6271 if not unresolvedf:
6272 ui.status(_(b'(no more unresolved files)\n'))
6272 ui.status(_(b'(no more unresolved files)\n'))
6273 cmdutil.checkafterresolved(repo)
6273 cmdutil.checkafterresolved(repo)
6274
6274
6275 return ret
6275 return ret
6276
6276
6277
6277
6278 @command(
6278 @command(
6279 b'revert',
6279 b'revert',
6280 [
6280 [
6281 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6281 (b'a', b'all', None, _(b'revert all changes when no arguments given')),
6282 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6282 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
6283 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6283 (b'r', b'rev', b'', _(b'revert to the specified revision'), _(b'REV')),
6284 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6284 (b'C', b'no-backup', None, _(b'do not save backup copies of files')),
6285 (b'i', b'interactive', None, _(b'interactively select the changes')),
6285 (b'i', b'interactive', None, _(b'interactively select the changes')),
6286 ]
6286 ]
6287 + walkopts
6287 + walkopts
6288 + dryrunopts,
6288 + dryrunopts,
6289 _(b'[OPTION]... [-r REV] [NAME]...'),
6289 _(b'[OPTION]... [-r REV] [NAME]...'),
6290 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6290 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6291 )
6291 )
6292 def revert(ui, repo, *pats, **opts):
6292 def revert(ui, repo, *pats, **opts):
6293 """restore files to their checkout state
6293 """restore files to their checkout state
6294
6294
6295 .. note::
6295 .. note::
6296
6296
6297 To check out earlier revisions, you should use :hg:`update REV`.
6297 To check out earlier revisions, you should use :hg:`update REV`.
6298 To cancel an uncommitted merge (and lose your changes),
6298 To cancel an uncommitted merge (and lose your changes),
6299 use :hg:`merge --abort`.
6299 use :hg:`merge --abort`.
6300
6300
6301 With no revision specified, revert the specified files or directories
6301 With no revision specified, revert the specified files or directories
6302 to the contents they had in the parent of the working directory.
6302 to the contents they had in the parent of the working directory.
6303 This restores the contents of files to an unmodified
6303 This restores the contents of files to an unmodified
6304 state and unschedules adds, removes, copies, and renames. If the
6304 state and unschedules adds, removes, copies, and renames. If the
6305 working directory has two parents, you must explicitly specify a
6305 working directory has two parents, you must explicitly specify a
6306 revision.
6306 revision.
6307
6307
6308 Using the -r/--rev or -d/--date options, revert the given files or
6308 Using the -r/--rev or -d/--date options, revert the given files or
6309 directories to their states as of a specific revision. Because
6309 directories to their states as of a specific revision. Because
6310 revert does not change the working directory parents, this will
6310 revert does not change the working directory parents, this will
6311 cause these files to appear modified. This can be helpful to "back
6311 cause these files to appear modified. This can be helpful to "back
6312 out" some or all of an earlier change. See :hg:`backout` for a
6312 out" some or all of an earlier change. See :hg:`backout` for a
6313 related method.
6313 related method.
6314
6314
6315 Modified files are saved with a .orig suffix before reverting.
6315 Modified files are saved with a .orig suffix before reverting.
6316 To disable these backups, use --no-backup. It is possible to store
6316 To disable these backups, use --no-backup. It is possible to store
6317 the backup files in a custom directory relative to the root of the
6317 the backup files in a custom directory relative to the root of the
6318 repository by setting the ``ui.origbackuppath`` configuration
6318 repository by setting the ``ui.origbackuppath`` configuration
6319 option.
6319 option.
6320
6320
6321 See :hg:`help dates` for a list of formats valid for -d/--date.
6321 See :hg:`help dates` for a list of formats valid for -d/--date.
6322
6322
6323 See :hg:`help backout` for a way to reverse the effect of an
6323 See :hg:`help backout` for a way to reverse the effect of an
6324 earlier changeset.
6324 earlier changeset.
6325
6325
6326 Returns 0 on success.
6326 Returns 0 on success.
6327 """
6327 """
6328
6328
6329 opts = pycompat.byteskwargs(opts)
6329 opts = pycompat.byteskwargs(opts)
6330 if opts.get(b"date"):
6330 if opts.get(b"date"):
6331 cmdutil.check_incompatible_arguments(opts, b'date', [b'rev'])
6331 cmdutil.check_incompatible_arguments(opts, b'date', [b'rev'])
6332 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6332 opts[b"rev"] = cmdutil.finddate(ui, repo, opts[b"date"])
6333
6333
6334 parent, p2 = repo.dirstate.parents()
6334 parent, p2 = repo.dirstate.parents()
6335 if not opts.get(b'rev') and p2 != repo.nullid:
6335 if not opts.get(b'rev') and p2 != repo.nullid:
6336 # revert after merge is a trap for new users (issue2915)
6336 # revert after merge is a trap for new users (issue2915)
6337 raise error.InputError(
6337 raise error.InputError(
6338 _(b'uncommitted merge with no revision specified'),
6338 _(b'uncommitted merge with no revision specified'),
6339 hint=_(b"use 'hg update' or see 'hg help revert'"),
6339 hint=_(b"use 'hg update' or see 'hg help revert'"),
6340 )
6340 )
6341
6341
6342 rev = opts.get(b'rev')
6342 rev = opts.get(b'rev')
6343 if rev:
6343 if rev:
6344 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6344 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
6345 ctx = scmutil.revsingle(repo, rev)
6345 ctx = scmutil.revsingle(repo, rev)
6346
6346
6347 if not (
6347 if not (
6348 pats
6348 pats
6349 or opts.get(b'include')
6349 or opts.get(b'include')
6350 or opts.get(b'exclude')
6350 or opts.get(b'exclude')
6351 or opts.get(b'all')
6351 or opts.get(b'all')
6352 or opts.get(b'interactive')
6352 or opts.get(b'interactive')
6353 ):
6353 ):
6354 msg = _(b"no files or directories specified")
6354 msg = _(b"no files or directories specified")
6355 if p2 != repo.nullid:
6355 if p2 != repo.nullid:
6356 hint = _(
6356 hint = _(
6357 b"uncommitted merge, use --all to discard all changes,"
6357 b"uncommitted merge, use --all to discard all changes,"
6358 b" or 'hg update -C .' to abort the merge"
6358 b" or 'hg update -C .' to abort the merge"
6359 )
6359 )
6360 raise error.InputError(msg, hint=hint)
6360 raise error.InputError(msg, hint=hint)
6361 dirty = any(repo.status())
6361 dirty = any(repo.status())
6362 node = ctx.node()
6362 node = ctx.node()
6363 if node != parent:
6363 if node != parent:
6364 if dirty:
6364 if dirty:
6365 hint = (
6365 hint = (
6366 _(
6366 _(
6367 b"uncommitted changes, use --all to discard all"
6367 b"uncommitted changes, use --all to discard all"
6368 b" changes, or 'hg update %d' to update"
6368 b" changes, or 'hg update %d' to update"
6369 )
6369 )
6370 % ctx.rev()
6370 % ctx.rev()
6371 )
6371 )
6372 else:
6372 else:
6373 hint = (
6373 hint = (
6374 _(
6374 _(
6375 b"use --all to revert all files,"
6375 b"use --all to revert all files,"
6376 b" or 'hg update %d' to update"
6376 b" or 'hg update %d' to update"
6377 )
6377 )
6378 % ctx.rev()
6378 % ctx.rev()
6379 )
6379 )
6380 elif dirty:
6380 elif dirty:
6381 hint = _(b"uncommitted changes, use --all to discard all changes")
6381 hint = _(b"uncommitted changes, use --all to discard all changes")
6382 else:
6382 else:
6383 hint = _(b"use --all to revert all files")
6383 hint = _(b"use --all to revert all files")
6384 raise error.InputError(msg, hint=hint)
6384 raise error.InputError(msg, hint=hint)
6385
6385
6386 return cmdutil.revert(ui, repo, ctx, *pats, **pycompat.strkwargs(opts))
6386 return cmdutil.revert(ui, repo, ctx, *pats, **pycompat.strkwargs(opts))
6387
6387
6388
6388
6389 @command(
6389 @command(
6390 b'rollback',
6390 b'rollback',
6391 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6391 dryrunopts + [(b'f', b'force', False, _(b'ignore safety measures'))],
6392 helpcategory=command.CATEGORY_MAINTENANCE,
6392 helpcategory=command.CATEGORY_MAINTENANCE,
6393 )
6393 )
6394 def rollback(ui, repo, **opts):
6394 def rollback(ui, repo, **opts):
6395 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6395 """roll back the last transaction (DANGEROUS) (DEPRECATED)
6396
6396
6397 Please use :hg:`commit --amend` instead of rollback to correct
6397 Please use :hg:`commit --amend` instead of rollback to correct
6398 mistakes in the last commit.
6398 mistakes in the last commit.
6399
6399
6400 This command should be used with care. There is only one level of
6400 This command should be used with care. There is only one level of
6401 rollback, and there is no way to undo a rollback. It will also
6401 rollback, and there is no way to undo a rollback. It will also
6402 restore the dirstate at the time of the last transaction, losing
6402 restore the dirstate at the time of the last transaction, losing
6403 any dirstate changes since that time. This command does not alter
6403 any dirstate changes since that time. This command does not alter
6404 the working directory.
6404 the working directory.
6405
6405
6406 Transactions are used to encapsulate the effects of all commands
6406 Transactions are used to encapsulate the effects of all commands
6407 that create new changesets or propagate existing changesets into a
6407 that create new changesets or propagate existing changesets into a
6408 repository.
6408 repository.
6409
6409
6410 .. container:: verbose
6410 .. container:: verbose
6411
6411
6412 For example, the following commands are transactional, and their
6412 For example, the following commands are transactional, and their
6413 effects can be rolled back:
6413 effects can be rolled back:
6414
6414
6415 - commit
6415 - commit
6416 - import
6416 - import
6417 - pull
6417 - pull
6418 - push (with this repository as the destination)
6418 - push (with this repository as the destination)
6419 - unbundle
6419 - unbundle
6420
6420
6421 To avoid permanent data loss, rollback will refuse to rollback a
6421 To avoid permanent data loss, rollback will refuse to rollback a
6422 commit transaction if it isn't checked out. Use --force to
6422 commit transaction if it isn't checked out. Use --force to
6423 override this protection.
6423 override this protection.
6424
6424
6425 The rollback command can be entirely disabled by setting the
6425 The rollback command can be entirely disabled by setting the
6426 ``ui.rollback`` configuration setting to false. If you're here
6426 ``ui.rollback`` configuration setting to false. If you're here
6427 because you want to use rollback and it's disabled, you can
6427 because you want to use rollback and it's disabled, you can
6428 re-enable the command by setting ``ui.rollback`` to true.
6428 re-enable the command by setting ``ui.rollback`` to true.
6429
6429
6430 This command is not intended for use on public repositories. Once
6430 This command is not intended for use on public repositories. Once
6431 changes are visible for pull by other users, rolling a transaction
6431 changes are visible for pull by other users, rolling a transaction
6432 back locally is ineffective (someone else may already have pulled
6432 back locally is ineffective (someone else may already have pulled
6433 the changes). Furthermore, a race is possible with readers of the
6433 the changes). Furthermore, a race is possible with readers of the
6434 repository; for example an in-progress pull from the repository
6434 repository; for example an in-progress pull from the repository
6435 may fail if a rollback is performed.
6435 may fail if a rollback is performed.
6436
6436
6437 Returns 0 on success, 1 if no rollback data is available.
6437 Returns 0 on success, 1 if no rollback data is available.
6438 """
6438 """
6439 if not ui.configbool(b'ui', b'rollback'):
6439 if not ui.configbool(b'ui', b'rollback'):
6440 raise error.Abort(
6440 raise error.Abort(
6441 _(b'rollback is disabled because it is unsafe'),
6441 _(b'rollback is disabled because it is unsafe'),
6442 hint=b'see `hg help -v rollback` for information',
6442 hint=b'see `hg help -v rollback` for information',
6443 )
6443 )
6444 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6444 return repo.rollback(dryrun=opts.get('dry_run'), force=opts.get('force'))
6445
6445
6446
6446
6447 @command(
6447 @command(
6448 b'root',
6448 b'root',
6449 [] + formatteropts,
6449 [] + formatteropts,
6450 intents={INTENT_READONLY},
6450 intents={INTENT_READONLY},
6451 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6451 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6452 )
6452 )
6453 def root(ui, repo, **opts):
6453 def root(ui, repo, **opts):
6454 """print the root (top) of the current working directory
6454 """print the root (top) of the current working directory
6455
6455
6456 Print the root directory of the current repository.
6456 Print the root directory of the current repository.
6457
6457
6458 .. container:: verbose
6458 .. container:: verbose
6459
6459
6460 Template:
6460 Template:
6461
6461
6462 The following keywords are supported in addition to the common template
6462 The following keywords are supported in addition to the common template
6463 keywords and functions. See also :hg:`help templates`.
6463 keywords and functions. See also :hg:`help templates`.
6464
6464
6465 :hgpath: String. Path to the .hg directory.
6465 :hgpath: String. Path to the .hg directory.
6466 :storepath: String. Path to the directory holding versioned data.
6466 :storepath: String. Path to the directory holding versioned data.
6467
6467
6468 Returns 0 on success.
6468 Returns 0 on success.
6469 """
6469 """
6470 opts = pycompat.byteskwargs(opts)
6470 opts = pycompat.byteskwargs(opts)
6471 with ui.formatter(b'root', opts) as fm:
6471 with ui.formatter(b'root', opts) as fm:
6472 fm.startitem()
6472 fm.startitem()
6473 fm.write(b'reporoot', b'%s\n', repo.root)
6473 fm.write(b'reporoot', b'%s\n', repo.root)
6474 fm.data(hgpath=repo.path, storepath=repo.spath)
6474 fm.data(hgpath=repo.path, storepath=repo.spath)
6475
6475
6476
6476
6477 @command(
6477 @command(
6478 b'serve',
6478 b'serve',
6479 [
6479 [
6480 (
6480 (
6481 b'A',
6481 b'A',
6482 b'accesslog',
6482 b'accesslog',
6483 b'',
6483 b'',
6484 _(b'name of access log file to write to'),
6484 _(b'name of access log file to write to'),
6485 _(b'FILE'),
6485 _(b'FILE'),
6486 ),
6486 ),
6487 (b'd', b'daemon', None, _(b'run server in background')),
6487 (b'd', b'daemon', None, _(b'run server in background')),
6488 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6488 (b'', b'daemon-postexec', [], _(b'used internally by daemon mode')),
6489 (
6489 (
6490 b'E',
6490 b'E',
6491 b'errorlog',
6491 b'errorlog',
6492 b'',
6492 b'',
6493 _(b'name of error log file to write to'),
6493 _(b'name of error log file to write to'),
6494 _(b'FILE'),
6494 _(b'FILE'),
6495 ),
6495 ),
6496 # use string type, then we can check if something was passed
6496 # use string type, then we can check if something was passed
6497 (
6497 (
6498 b'p',
6498 b'p',
6499 b'port',
6499 b'port',
6500 b'',
6500 b'',
6501 _(b'port to listen on (default: 8000)'),
6501 _(b'port to listen on (default: 8000)'),
6502 _(b'PORT'),
6502 _(b'PORT'),
6503 ),
6503 ),
6504 (
6504 (
6505 b'a',
6505 b'a',
6506 b'address',
6506 b'address',
6507 b'',
6507 b'',
6508 _(b'address to listen on (default: all interfaces)'),
6508 _(b'address to listen on (default: all interfaces)'),
6509 _(b'ADDR'),
6509 _(b'ADDR'),
6510 ),
6510 ),
6511 (
6511 (
6512 b'',
6512 b'',
6513 b'prefix',
6513 b'prefix',
6514 b'',
6514 b'',
6515 _(b'prefix path to serve from (default: server root)'),
6515 _(b'prefix path to serve from (default: server root)'),
6516 _(b'PREFIX'),
6516 _(b'PREFIX'),
6517 ),
6517 ),
6518 (
6518 (
6519 b'n',
6519 b'n',
6520 b'name',
6520 b'name',
6521 b'',
6521 b'',
6522 _(b'name to show in web pages (default: working directory)'),
6522 _(b'name to show in web pages (default: working directory)'),
6523 _(b'NAME'),
6523 _(b'NAME'),
6524 ),
6524 ),
6525 (
6525 (
6526 b'',
6526 b'',
6527 b'web-conf',
6527 b'web-conf',
6528 b'',
6528 b'',
6529 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6529 _(b"name of the hgweb config file (see 'hg help hgweb')"),
6530 _(b'FILE'),
6530 _(b'FILE'),
6531 ),
6531 ),
6532 (
6532 (
6533 b'',
6533 b'',
6534 b'webdir-conf',
6534 b'webdir-conf',
6535 b'',
6535 b'',
6536 _(b'name of the hgweb config file (DEPRECATED)'),
6536 _(b'name of the hgweb config file (DEPRECATED)'),
6537 _(b'FILE'),
6537 _(b'FILE'),
6538 ),
6538 ),
6539 (
6539 (
6540 b'',
6540 b'',
6541 b'pid-file',
6541 b'pid-file',
6542 b'',
6542 b'',
6543 _(b'name of file to write process ID to'),
6543 _(b'name of file to write process ID to'),
6544 _(b'FILE'),
6544 _(b'FILE'),
6545 ),
6545 ),
6546 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6546 (b'', b'stdio', None, _(b'for remote clients (ADVANCED)')),
6547 (
6547 (
6548 b'',
6548 b'',
6549 b'cmdserver',
6549 b'cmdserver',
6550 b'',
6550 b'',
6551 _(b'for remote clients (ADVANCED)'),
6551 _(b'for remote clients (ADVANCED)'),
6552 _(b'MODE'),
6552 _(b'MODE'),
6553 ),
6553 ),
6554 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6554 (b't', b'templates', b'', _(b'web templates to use'), _(b'TEMPLATE')),
6555 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6555 (b'', b'style', b'', _(b'template style to use'), _(b'STYLE')),
6556 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6556 (b'6', b'ipv6', None, _(b'use IPv6 in addition to IPv4')),
6557 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6557 (b'', b'certificate', b'', _(b'SSL certificate file'), _(b'FILE')),
6558 (b'', b'print-url', None, _(b'start and print only the URL')),
6558 (b'', b'print-url', None, _(b'start and print only the URL')),
6559 ]
6559 ]
6560 + subrepoopts,
6560 + subrepoopts,
6561 _(b'[OPTION]...'),
6561 _(b'[OPTION]...'),
6562 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6562 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
6563 helpbasic=True,
6563 helpbasic=True,
6564 optionalrepo=True,
6564 optionalrepo=True,
6565 )
6565 )
6566 def serve(ui, repo, **opts):
6566 def serve(ui, repo, **opts):
6567 """start stand-alone webserver
6567 """start stand-alone webserver
6568
6568
6569 Start a local HTTP repository browser and pull server. You can use
6569 Start a local HTTP repository browser and pull server. You can use
6570 this for ad-hoc sharing and browsing of repositories. It is
6570 this for ad-hoc sharing and browsing of repositories. It is
6571 recommended to use a real web server to serve a repository for
6571 recommended to use a real web server to serve a repository for
6572 longer periods of time.
6572 longer periods of time.
6573
6573
6574 Please note that the server does not implement access control.
6574 Please note that the server does not implement access control.
6575 This means that, by default, anybody can read from the server and
6575 This means that, by default, anybody can read from the server and
6576 nobody can write to it by default. Set the ``web.allow-push``
6576 nobody can write to it by default. Set the ``web.allow-push``
6577 option to ``*`` to allow everybody to push to the server. You
6577 option to ``*`` to allow everybody to push to the server. You
6578 should use a real web server if you need to authenticate users.
6578 should use a real web server if you need to authenticate users.
6579
6579
6580 By default, the server logs accesses to stdout and errors to
6580 By default, the server logs accesses to stdout and errors to
6581 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6581 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
6582 files.
6582 files.
6583
6583
6584 To have the server choose a free port number to listen on, specify
6584 To have the server choose a free port number to listen on, specify
6585 a port number of 0; in this case, the server will print the port
6585 a port number of 0; in this case, the server will print the port
6586 number it uses.
6586 number it uses.
6587
6587
6588 Returns 0 on success.
6588 Returns 0 on success.
6589 """
6589 """
6590
6590
6591 cmdutil.check_incompatible_arguments(opts, 'stdio', ['cmdserver'])
6591 cmdutil.check_incompatible_arguments(opts, 'stdio', ['cmdserver'])
6592 opts = pycompat.byteskwargs(opts)
6592 opts = pycompat.byteskwargs(opts)
6593 if opts[b"print_url"] and ui.verbose:
6593 if opts[b"print_url"] and ui.verbose:
6594 raise error.InputError(_(b"cannot use --print-url with --verbose"))
6594 raise error.InputError(_(b"cannot use --print-url with --verbose"))
6595
6595
6596 if opts[b"stdio"]:
6596 if opts[b"stdio"]:
6597 if repo is None:
6597 if repo is None:
6598 raise error.RepoError(
6598 raise error.RepoError(
6599 _(b"there is no Mercurial repository here (.hg not found)")
6599 _(b"there is no Mercurial repository here (.hg not found)")
6600 )
6600 )
6601 s = wireprotoserver.sshserver(ui, repo)
6601 s = wireprotoserver.sshserver(ui, repo)
6602 s.serve_forever()
6602 s.serve_forever()
6603 return
6603 return
6604
6604
6605 service = server.createservice(ui, repo, opts)
6605 service = server.createservice(ui, repo, opts)
6606 return server.runservice(opts, initfn=service.init, runfn=service.run)
6606 return server.runservice(opts, initfn=service.init, runfn=service.run)
6607
6607
6608
6608
6609 @command(
6609 @command(
6610 b'shelve',
6610 b'shelve',
6611 [
6611 [
6612 (
6612 (
6613 b'A',
6613 b'A',
6614 b'addremove',
6614 b'addremove',
6615 None,
6615 None,
6616 _(b'mark new/missing files as added/removed before shelving'),
6616 _(b'mark new/missing files as added/removed before shelving'),
6617 ),
6617 ),
6618 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6618 (b'u', b'unknown', None, _(b'store unknown files in the shelve')),
6619 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6619 (b'', b'cleanup', None, _(b'delete all shelved changes')),
6620 (
6620 (
6621 b'',
6621 b'',
6622 b'date',
6622 b'date',
6623 b'',
6623 b'',
6624 _(b'shelve with the specified commit date'),
6624 _(b'shelve with the specified commit date'),
6625 _(b'DATE'),
6625 _(b'DATE'),
6626 ),
6626 ),
6627 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6627 (b'd', b'delete', None, _(b'delete the named shelved change(s)')),
6628 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6628 (b'e', b'edit', False, _(b'invoke editor on commit messages')),
6629 (
6629 (
6630 b'k',
6630 b'k',
6631 b'keep',
6631 b'keep',
6632 False,
6632 False,
6633 _(b'shelve, but keep changes in the working directory'),
6633 _(b'shelve, but keep changes in the working directory'),
6634 ),
6634 ),
6635 (b'l', b'list', None, _(b'list current shelves')),
6635 (b'l', b'list', None, _(b'list current shelves')),
6636 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6636 (b'm', b'message', b'', _(b'use text as shelve message'), _(b'TEXT')),
6637 (
6637 (
6638 b'n',
6638 b'n',
6639 b'name',
6639 b'name',
6640 b'',
6640 b'',
6641 _(b'use the given name for the shelved commit'),
6641 _(b'use the given name for the shelved commit'),
6642 _(b'NAME'),
6642 _(b'NAME'),
6643 ),
6643 ),
6644 (
6644 (
6645 b'p',
6645 b'p',
6646 b'patch',
6646 b'patch',
6647 None,
6647 None,
6648 _(
6648 _(
6649 b'output patches for changes (provide the names of the shelved '
6649 b'output patches for changes (provide the names of the shelved '
6650 b'changes as positional arguments)'
6650 b'changes as positional arguments)'
6651 ),
6651 ),
6652 ),
6652 ),
6653 (b'i', b'interactive', None, _(b'interactive mode')),
6653 (b'i', b'interactive', None, _(b'interactive mode')),
6654 (
6654 (
6655 b'',
6655 b'',
6656 b'stat',
6656 b'stat',
6657 None,
6657 None,
6658 _(
6658 _(
6659 b'output diffstat-style summary of changes (provide the names of '
6659 b'output diffstat-style summary of changes (provide the names of '
6660 b'the shelved changes as positional arguments)'
6660 b'the shelved changes as positional arguments)'
6661 ),
6661 ),
6662 ),
6662 ),
6663 ]
6663 ]
6664 + cmdutil.walkopts,
6664 + cmdutil.walkopts,
6665 _(b'hg shelve [OPTION]... [FILE]...'),
6665 _(b'hg shelve [OPTION]... [FILE]...'),
6666 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6666 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6667 )
6667 )
6668 def shelve(ui, repo, *pats, **opts):
6668 def shelve(ui, repo, *pats, **opts):
6669 """save and set aside changes from the working directory
6669 """save and set aside changes from the working directory
6670
6670
6671 Shelving takes files that "hg status" reports as not clean, saves
6671 Shelving takes files that "hg status" reports as not clean, saves
6672 the modifications to a bundle (a shelved change), and reverts the
6672 the modifications to a bundle (a shelved change), and reverts the
6673 files so that their state in the working directory becomes clean.
6673 files so that their state in the working directory becomes clean.
6674
6674
6675 To restore these changes to the working directory, using "hg
6675 To restore these changes to the working directory, using "hg
6676 unshelve"; this will work even if you switch to a different
6676 unshelve"; this will work even if you switch to a different
6677 commit.
6677 commit.
6678
6678
6679 When no files are specified, "hg shelve" saves all not-clean
6679 When no files are specified, "hg shelve" saves all not-clean
6680 files. If specific files or directories are named, only changes to
6680 files. If specific files or directories are named, only changes to
6681 those files are shelved.
6681 those files are shelved.
6682
6682
6683 In bare shelve (when no files are specified, without interactive,
6683 In bare shelve (when no files are specified, without interactive,
6684 include and exclude option), shelving remembers information if the
6684 include and exclude option), shelving remembers information if the
6685 working directory was on newly created branch, in other words working
6685 working directory was on newly created branch, in other words working
6686 directory was on different branch than its first parent. In this
6686 directory was on different branch than its first parent. In this
6687 situation unshelving restores branch information to the working directory.
6687 situation unshelving restores branch information to the working directory.
6688
6688
6689 Each shelved change has a name that makes it easier to find later.
6689 Each shelved change has a name that makes it easier to find later.
6690 The name of a shelved change defaults to being based on the active
6690 The name of a shelved change defaults to being based on the active
6691 bookmark, or if there is no active bookmark, the current named
6691 bookmark, or if there is no active bookmark, the current named
6692 branch. To specify a different name, use ``--name``.
6692 branch. To specify a different name, use ``--name``.
6693
6693
6694 To see a list of existing shelved changes, use the ``--list``
6694 To see a list of existing shelved changes, use the ``--list``
6695 option. For each shelved change, this will print its name, age,
6695 option. For each shelved change, this will print its name, age,
6696 and description; use ``--patch`` or ``--stat`` for more details.
6696 and description; use ``--patch`` or ``--stat`` for more details.
6697
6697
6698 To delete specific shelved changes, use ``--delete``. To delete
6698 To delete specific shelved changes, use ``--delete``. To delete
6699 all shelved changes, use ``--cleanup``.
6699 all shelved changes, use ``--cleanup``.
6700 """
6700 """
6701 opts = pycompat.byteskwargs(opts)
6701 opts = pycompat.byteskwargs(opts)
6702 allowables = [
6702 allowables = [
6703 (b'addremove', {b'create'}), # 'create' is pseudo action
6703 (b'addremove', {b'create'}), # 'create' is pseudo action
6704 (b'unknown', {b'create'}),
6704 (b'unknown', {b'create'}),
6705 (b'cleanup', {b'cleanup'}),
6705 (b'cleanup', {b'cleanup'}),
6706 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6706 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
6707 (b'delete', {b'delete'}),
6707 (b'delete', {b'delete'}),
6708 (b'edit', {b'create'}),
6708 (b'edit', {b'create'}),
6709 (b'keep', {b'create'}),
6709 (b'keep', {b'create'}),
6710 (b'list', {b'list'}),
6710 (b'list', {b'list'}),
6711 (b'message', {b'create'}),
6711 (b'message', {b'create'}),
6712 (b'name', {b'create'}),
6712 (b'name', {b'create'}),
6713 (b'patch', {b'patch', b'list'}),
6713 (b'patch', {b'patch', b'list'}),
6714 (b'stat', {b'stat', b'list'}),
6714 (b'stat', {b'stat', b'list'}),
6715 ]
6715 ]
6716
6716
6717 def checkopt(opt):
6717 def checkopt(opt):
6718 if opts.get(opt):
6718 if opts.get(opt):
6719 for i, allowable in allowables:
6719 for i, allowable in allowables:
6720 if opts[i] and opt not in allowable:
6720 if opts[i] and opt not in allowable:
6721 raise error.InputError(
6721 raise error.InputError(
6722 _(
6722 _(
6723 b"options '--%s' and '--%s' may not be "
6723 b"options '--%s' and '--%s' may not be "
6724 b"used together"
6724 b"used together"
6725 )
6725 )
6726 % (opt, i)
6726 % (opt, i)
6727 )
6727 )
6728 return True
6728 return True
6729
6729
6730 if checkopt(b'cleanup'):
6730 if checkopt(b'cleanup'):
6731 if pats:
6731 if pats:
6732 raise error.InputError(
6732 raise error.InputError(
6733 _(b"cannot specify names when using '--cleanup'")
6733 _(b"cannot specify names when using '--cleanup'")
6734 )
6734 )
6735 return shelvemod.cleanupcmd(ui, repo)
6735 return shelvemod.cleanupcmd(ui, repo)
6736 elif checkopt(b'delete'):
6736 elif checkopt(b'delete'):
6737 return shelvemod.deletecmd(ui, repo, pats)
6737 return shelvemod.deletecmd(ui, repo, pats)
6738 elif checkopt(b'list'):
6738 elif checkopt(b'list'):
6739 return shelvemod.listcmd(ui, repo, pats, opts)
6739 return shelvemod.listcmd(ui, repo, pats, opts)
6740 elif checkopt(b'patch') or checkopt(b'stat'):
6740 elif checkopt(b'patch') or checkopt(b'stat'):
6741 return shelvemod.patchcmds(ui, repo, pats, opts)
6741 return shelvemod.patchcmds(ui, repo, pats, opts)
6742 else:
6742 else:
6743 return shelvemod.createcmd(ui, repo, pats, opts)
6743 return shelvemod.createcmd(ui, repo, pats, opts)
6744
6744
6745
6745
6746 _NOTTERSE = b'nothing'
6746 _NOTTERSE = b'nothing'
6747
6747
6748
6748
6749 @command(
6749 @command(
6750 b'status|st',
6750 b'status|st',
6751 [
6751 [
6752 (b'A', b'all', None, _(b'show status of all files')),
6752 (b'A', b'all', None, _(b'show status of all files')),
6753 (b'm', b'modified', None, _(b'show only modified files')),
6753 (b'm', b'modified', None, _(b'show only modified files')),
6754 (b'a', b'added', None, _(b'show only added files')),
6754 (b'a', b'added', None, _(b'show only added files')),
6755 (b'r', b'removed', None, _(b'show only removed files')),
6755 (b'r', b'removed', None, _(b'show only removed files')),
6756 (b'd', b'deleted', None, _(b'show only missing files')),
6756 (b'd', b'deleted', None, _(b'show only missing files')),
6757 (b'c', b'clean', None, _(b'show only files without changes')),
6757 (b'c', b'clean', None, _(b'show only files without changes')),
6758 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6758 (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
6759 (b'i', b'ignored', None, _(b'show only ignored files')),
6759 (b'i', b'ignored', None, _(b'show only ignored files')),
6760 (b'n', b'no-status', None, _(b'hide status prefix')),
6760 (b'n', b'no-status', None, _(b'hide status prefix')),
6761 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6761 (b't', b'terse', _NOTTERSE, _(b'show the terse output (EXPERIMENTAL)')),
6762 (
6762 (
6763 b'C',
6763 b'C',
6764 b'copies',
6764 b'copies',
6765 None,
6765 None,
6766 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6766 _(b'show source of copied files (DEFAULT: ui.statuscopies)'),
6767 ),
6767 ),
6768 (
6768 (
6769 b'0',
6769 b'0',
6770 b'print0',
6770 b'print0',
6771 None,
6771 None,
6772 _(b'end filenames with NUL, for use with xargs'),
6772 _(b'end filenames with NUL, for use with xargs'),
6773 ),
6773 ),
6774 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6774 (b'', b'rev', [], _(b'show difference from revision'), _(b'REV')),
6775 (
6775 (
6776 b'',
6776 b'',
6777 b'change',
6777 b'change',
6778 b'',
6778 b'',
6779 _(b'list the changed files of a revision'),
6779 _(b'list the changed files of a revision'),
6780 _(b'REV'),
6780 _(b'REV'),
6781 ),
6781 ),
6782 ]
6782 ]
6783 + walkopts
6783 + walkopts
6784 + subrepoopts
6784 + subrepoopts
6785 + formatteropts,
6785 + formatteropts,
6786 _(b'[OPTION]... [FILE]...'),
6786 _(b'[OPTION]... [FILE]...'),
6787 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6787 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6788 helpbasic=True,
6788 helpbasic=True,
6789 inferrepo=True,
6789 inferrepo=True,
6790 intents={INTENT_READONLY},
6790 intents={INTENT_READONLY},
6791 )
6791 )
6792 def status(ui, repo, *pats, **opts):
6792 def status(ui, repo, *pats, **opts):
6793 """show changed files in the working directory
6793 """show changed files in the working directory
6794
6794
6795 Show status of files in the repository. If names are given, only
6795 Show status of files in the repository. If names are given, only
6796 files that match are shown. Files that are clean or ignored or
6796 files that match are shown. Files that are clean or ignored or
6797 the source of a copy/move operation, are not listed unless
6797 the source of a copy/move operation, are not listed unless
6798 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6798 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
6799 Unless options described with "show only ..." are given, the
6799 Unless options described with "show only ..." are given, the
6800 options -mardu are used.
6800 options -mardu are used.
6801
6801
6802 Option -q/--quiet hides untracked (unknown and ignored) files
6802 Option -q/--quiet hides untracked (unknown and ignored) files
6803 unless explicitly requested with -u/--unknown or -i/--ignored.
6803 unless explicitly requested with -u/--unknown or -i/--ignored.
6804
6804
6805 .. note::
6805 .. note::
6806
6806
6807 :hg:`status` may appear to disagree with diff if permissions have
6807 :hg:`status` may appear to disagree with diff if permissions have
6808 changed or a merge has occurred. The standard diff format does
6808 changed or a merge has occurred. The standard diff format does
6809 not report permission changes and diff only reports changes
6809 not report permission changes and diff only reports changes
6810 relative to one merge parent.
6810 relative to one merge parent.
6811
6811
6812 If one revision is given, it is used as the base revision.
6812 If one revision is given, it is used as the base revision.
6813 If two revisions are given, the differences between them are
6813 If two revisions are given, the differences between them are
6814 shown. The --change option can also be used as a shortcut to list
6814 shown. The --change option can also be used as a shortcut to list
6815 the changed files of a revision from its first parent.
6815 the changed files of a revision from its first parent.
6816
6816
6817 The codes used to show the status of files are::
6817 The codes used to show the status of files are::
6818
6818
6819 M = modified
6819 M = modified
6820 A = added
6820 A = added
6821 R = removed
6821 R = removed
6822 C = clean
6822 C = clean
6823 ! = missing (deleted by non-hg command, but still tracked)
6823 ! = missing (deleted by non-hg command, but still tracked)
6824 ? = not tracked
6824 ? = not tracked
6825 I = ignored
6825 I = ignored
6826 = origin of the previous file (with --copies)
6826 = origin of the previous file (with --copies)
6827
6827
6828 .. container:: verbose
6828 .. container:: verbose
6829
6829
6830 The -t/--terse option abbreviates the output by showing only the directory
6830 The -t/--terse option abbreviates the output by showing only the directory
6831 name if all the files in it share the same status. The option takes an
6831 name if all the files in it share the same status. The option takes an
6832 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6832 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
6833 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6833 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
6834 for 'ignored' and 'c' for clean.
6834 for 'ignored' and 'c' for clean.
6835
6835
6836 It abbreviates only those statuses which are passed. Note that clean and
6836 It abbreviates only those statuses which are passed. Note that clean and
6837 ignored files are not displayed with '--terse ic' unless the -c/--clean
6837 ignored files are not displayed with '--terse ic' unless the -c/--clean
6838 and -i/--ignored options are also used.
6838 and -i/--ignored options are also used.
6839
6839
6840 The -v/--verbose option shows information when the repository is in an
6840 The -v/--verbose option shows information when the repository is in an
6841 unfinished merge, shelve, rebase state etc. You can have this behavior
6841 unfinished merge, shelve, rebase state etc. You can have this behavior
6842 turned on by default by enabling the ``commands.status.verbose`` option.
6842 turned on by default by enabling the ``commands.status.verbose`` option.
6843
6843
6844 You can skip displaying some of these states by setting
6844 You can skip displaying some of these states by setting
6845 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6845 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
6846 'histedit', 'merge', 'rebase', or 'unshelve'.
6846 'histedit', 'merge', 'rebase', or 'unshelve'.
6847
6847
6848 Template:
6848 Template:
6849
6849
6850 The following keywords are supported in addition to the common template
6850 The following keywords are supported in addition to the common template
6851 keywords and functions. See also :hg:`help templates`.
6851 keywords and functions. See also :hg:`help templates`.
6852
6852
6853 :path: String. Repository-absolute path of the file.
6853 :path: String. Repository-absolute path of the file.
6854 :source: String. Repository-absolute path of the file originated from.
6854 :source: String. Repository-absolute path of the file originated from.
6855 Available if ``--copies`` is specified.
6855 Available if ``--copies`` is specified.
6856 :status: String. Character denoting file's status.
6856 :status: String. Character denoting file's status.
6857
6857
6858 Examples:
6858 Examples:
6859
6859
6860 - show changes in the working directory relative to a
6860 - show changes in the working directory relative to a
6861 changeset::
6861 changeset::
6862
6862
6863 hg status --rev 9353
6863 hg status --rev 9353
6864
6864
6865 - show changes in the working directory relative to the
6865 - show changes in the working directory relative to the
6866 current directory (see :hg:`help patterns` for more information)::
6866 current directory (see :hg:`help patterns` for more information)::
6867
6867
6868 hg status re:
6868 hg status re:
6869
6869
6870 - show all changes including copies in an existing changeset::
6870 - show all changes including copies in an existing changeset::
6871
6871
6872 hg status --copies --change 9353
6872 hg status --copies --change 9353
6873
6873
6874 - get a NUL separated list of added files, suitable for xargs::
6874 - get a NUL separated list of added files, suitable for xargs::
6875
6875
6876 hg status -an0
6876 hg status -an0
6877
6877
6878 - show more information about the repository status, abbreviating
6878 - show more information about the repository status, abbreviating
6879 added, removed, modified, deleted, and untracked paths::
6879 added, removed, modified, deleted, and untracked paths::
6880
6880
6881 hg status -v -t mardu
6881 hg status -v -t mardu
6882
6882
6883 Returns 0 on success.
6883 Returns 0 on success.
6884
6884
6885 """
6885 """
6886
6886
6887 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6887 cmdutil.check_at_most_one_arg(opts, 'rev', 'change')
6888 opts = pycompat.byteskwargs(opts)
6888 opts = pycompat.byteskwargs(opts)
6889 revs = opts.get(b'rev')
6889 revs = opts.get(b'rev')
6890 change = opts.get(b'change')
6890 change = opts.get(b'change')
6891 terse = opts.get(b'terse')
6891 terse = opts.get(b'terse')
6892 if terse is _NOTTERSE:
6892 if terse is _NOTTERSE:
6893 if revs:
6893 if revs:
6894 terse = b''
6894 terse = b''
6895 else:
6895 else:
6896 terse = ui.config(b'commands', b'status.terse')
6896 terse = ui.config(b'commands', b'status.terse')
6897
6897
6898 if revs and terse:
6898 if revs and terse:
6899 msg = _(b'cannot use --terse with --rev')
6899 msg = _(b'cannot use --terse with --rev')
6900 raise error.InputError(msg)
6900 raise error.InputError(msg)
6901 elif change:
6901 elif change:
6902 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6902 repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
6903 ctx2 = scmutil.revsingle(repo, change, None)
6903 ctx2 = scmutil.revsingle(repo, change, None)
6904 ctx1 = ctx2.p1()
6904 ctx1 = ctx2.p1()
6905 else:
6905 else:
6906 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6906 repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
6907 ctx1, ctx2 = scmutil.revpair(repo, revs)
6907 ctx1, ctx2 = scmutil.revpair(repo, revs)
6908
6908
6909 forcerelativevalue = None
6909 forcerelativevalue = None
6910 if ui.hasconfig(b'commands', b'status.relative'):
6910 if ui.hasconfig(b'commands', b'status.relative'):
6911 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6911 forcerelativevalue = ui.configbool(b'commands', b'status.relative')
6912 uipathfn = scmutil.getuipathfn(
6912 uipathfn = scmutil.getuipathfn(
6913 repo,
6913 repo,
6914 legacyrelativevalue=bool(pats),
6914 legacyrelativevalue=bool(pats),
6915 forcerelativevalue=forcerelativevalue,
6915 forcerelativevalue=forcerelativevalue,
6916 )
6916 )
6917
6917
6918 if opts.get(b'print0'):
6918 if opts.get(b'print0'):
6919 end = b'\0'
6919 end = b'\0'
6920 else:
6920 else:
6921 end = b'\n'
6921 end = b'\n'
6922 states = b'modified added removed deleted unknown ignored clean'.split()
6922 states = b'modified added removed deleted unknown ignored clean'.split()
6923 show = [k for k in states if opts.get(k)]
6923 show = [k for k in states if opts.get(k)]
6924 if opts.get(b'all'):
6924 if opts.get(b'all'):
6925 show += ui.quiet and (states[:4] + [b'clean']) or states
6925 show += ui.quiet and (states[:4] + [b'clean']) or states
6926
6926
6927 if not show:
6927 if not show:
6928 if ui.quiet:
6928 if ui.quiet:
6929 show = states[:4]
6929 show = states[:4]
6930 else:
6930 else:
6931 show = states[:5]
6931 show = states[:5]
6932
6932
6933 m = scmutil.match(ctx2, pats, opts)
6933 m = scmutil.match(ctx2, pats, opts)
6934 if terse:
6934 if terse:
6935 # we need to compute clean and unknown to terse
6935 # we need to compute clean and unknown to terse
6936 stat = repo.status(
6936 stat = repo.status(
6937 ctx1.node(),
6937 ctx1.node(),
6938 ctx2.node(),
6938 ctx2.node(),
6939 m,
6939 m,
6940 b'ignored' in show or b'i' in terse,
6940 b'ignored' in show or b'i' in terse,
6941 clean=True,
6941 clean=True,
6942 unknown=True,
6942 unknown=True,
6943 listsubrepos=opts.get(b'subrepos'),
6943 listsubrepos=opts.get(b'subrepos'),
6944 )
6944 )
6945
6945
6946 stat = cmdutil.tersedir(stat, terse)
6946 stat = cmdutil.tersedir(stat, terse)
6947 else:
6947 else:
6948 stat = repo.status(
6948 stat = repo.status(
6949 ctx1.node(),
6949 ctx1.node(),
6950 ctx2.node(),
6950 ctx2.node(),
6951 m,
6951 m,
6952 b'ignored' in show,
6952 b'ignored' in show,
6953 b'clean' in show,
6953 b'clean' in show,
6954 b'unknown' in show,
6954 b'unknown' in show,
6955 opts.get(b'subrepos'),
6955 opts.get(b'subrepos'),
6956 )
6956 )
6957
6957
6958 changestates = zip(
6958 changestates = zip(
6959 states,
6959 states,
6960 pycompat.iterbytestr(b'MAR!?IC'),
6960 pycompat.iterbytestr(b'MAR!?IC'),
6961 [getattr(stat, s.decode('utf8')) for s in states],
6961 [getattr(stat, s.decode('utf8')) for s in states],
6962 )
6962 )
6963
6963
6964 copy = {}
6964 copy = {}
6965 if (
6965 if (
6966 opts.get(b'all')
6966 opts.get(b'all')
6967 or opts.get(b'copies')
6967 or opts.get(b'copies')
6968 or ui.configbool(b'ui', b'statuscopies')
6968 or ui.configbool(b'ui', b'statuscopies')
6969 ) and not opts.get(b'no_status'):
6969 ) and not opts.get(b'no_status'):
6970 copy = copies.pathcopies(ctx1, ctx2, m)
6970 copy = copies.pathcopies(ctx1, ctx2, m)
6971
6971
6972 morestatus = None
6972 morestatus = None
6973 if (
6973 if (
6974 (ui.verbose or ui.configbool(b'commands', b'status.verbose'))
6974 (ui.verbose or ui.configbool(b'commands', b'status.verbose'))
6975 and not ui.plain()
6975 and not ui.plain()
6976 and not opts.get(b'print0')
6976 and not opts.get(b'print0')
6977 ):
6977 ):
6978 morestatus = cmdutil.readmorestatus(repo)
6978 morestatus = cmdutil.readmorestatus(repo)
6979
6979
6980 ui.pager(b'status')
6980 ui.pager(b'status')
6981 fm = ui.formatter(b'status', opts)
6981 fm = ui.formatter(b'status', opts)
6982 fmt = b'%s' + end
6982 fmt = b'%s' + end
6983 showchar = not opts.get(b'no_status')
6983 showchar = not opts.get(b'no_status')
6984
6984
6985 for state, char, files in changestates:
6985 for state, char, files in changestates:
6986 if state in show:
6986 if state in show:
6987 label = b'status.' + state
6987 label = b'status.' + state
6988 for f in files:
6988 for f in files:
6989 fm.startitem()
6989 fm.startitem()
6990 fm.context(ctx=ctx2)
6990 fm.context(ctx=ctx2)
6991 fm.data(itemtype=b'file', path=f)
6991 fm.data(itemtype=b'file', path=f)
6992 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6992 fm.condwrite(showchar, b'status', b'%s ', char, label=label)
6993 fm.plain(fmt % uipathfn(f), label=label)
6993 fm.plain(fmt % uipathfn(f), label=label)
6994 if f in copy:
6994 if f in copy:
6995 fm.data(source=copy[f])
6995 fm.data(source=copy[f])
6996 fm.plain(
6996 fm.plain(
6997 (b' %s' + end) % uipathfn(copy[f]),
6997 (b' %s' + end) % uipathfn(copy[f]),
6998 label=b'status.copied',
6998 label=b'status.copied',
6999 )
6999 )
7000 if morestatus:
7000 if morestatus:
7001 morestatus.formatfile(f, fm)
7001 morestatus.formatfile(f, fm)
7002
7002
7003 if morestatus:
7003 if morestatus:
7004 morestatus.formatfooter(fm)
7004 morestatus.formatfooter(fm)
7005 fm.end()
7005 fm.end()
7006
7006
7007
7007
7008 @command(
7008 @command(
7009 b'summary|sum',
7009 b'summary|sum',
7010 [(b'', b'remote', None, _(b'check for push and pull'))],
7010 [(b'', b'remote', None, _(b'check for push and pull'))],
7011 b'[--remote]',
7011 b'[--remote]',
7012 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7012 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7013 helpbasic=True,
7013 helpbasic=True,
7014 intents={INTENT_READONLY},
7014 intents={INTENT_READONLY},
7015 )
7015 )
7016 def summary(ui, repo, **opts):
7016 def summary(ui, repo, **opts):
7017 """summarize working directory state
7017 """summarize working directory state
7018
7018
7019 This generates a brief summary of the working directory state,
7019 This generates a brief summary of the working directory state,
7020 including parents, branch, commit status, phase and available updates.
7020 including parents, branch, commit status, phase and available updates.
7021
7021
7022 With the --remote option, this will check the default paths for
7022 With the --remote option, this will check the default paths for
7023 incoming and outgoing changes. This can be time-consuming.
7023 incoming and outgoing changes. This can be time-consuming.
7024
7024
7025 Returns 0 on success.
7025 Returns 0 on success.
7026 """
7026 """
7027
7027
7028 opts = pycompat.byteskwargs(opts)
7028 opts = pycompat.byteskwargs(opts)
7029 ui.pager(b'summary')
7029 ui.pager(b'summary')
7030 ctx = repo[None]
7030 ctx = repo[None]
7031 parents = ctx.parents()
7031 parents = ctx.parents()
7032 pnode = parents[0].node()
7032 pnode = parents[0].node()
7033 marks = []
7033 marks = []
7034
7034
7035 try:
7035 try:
7036 ms = mergestatemod.mergestate.read(repo)
7036 ms = mergestatemod.mergestate.read(repo)
7037 except error.UnsupportedMergeRecords as e:
7037 except error.UnsupportedMergeRecords as e:
7038 s = b' '.join(e.recordtypes)
7038 s = b' '.join(e.recordtypes)
7039 ui.warn(
7039 ui.warn(
7040 _(b'warning: merge state has unsupported record types: %s\n') % s
7040 _(b'warning: merge state has unsupported record types: %s\n') % s
7041 )
7041 )
7042 unresolved = []
7042 unresolved = []
7043 else:
7043 else:
7044 unresolved = list(ms.unresolved())
7044 unresolved = list(ms.unresolved())
7045
7045
7046 for p in parents:
7046 for p in parents:
7047 # label with log.changeset (instead of log.parent) since this
7047 # label with log.changeset (instead of log.parent) since this
7048 # shows a working directory parent *changeset*:
7048 # shows a working directory parent *changeset*:
7049 # i18n: column positioning for "hg summary"
7049 # i18n: column positioning for "hg summary"
7050 ui.write(
7050 ui.write(
7051 _(b'parent: %d:%s ') % (p.rev(), p),
7051 _(b'parent: %d:%s ') % (p.rev(), p),
7052 label=logcmdutil.changesetlabels(p),
7052 label=logcmdutil.changesetlabels(p),
7053 )
7053 )
7054 ui.write(b' '.join(p.tags()), label=b'log.tag')
7054 ui.write(b' '.join(p.tags()), label=b'log.tag')
7055 if p.bookmarks():
7055 if p.bookmarks():
7056 marks.extend(p.bookmarks())
7056 marks.extend(p.bookmarks())
7057 if p.rev() == -1:
7057 if p.rev() == -1:
7058 if not len(repo):
7058 if not len(repo):
7059 ui.write(_(b' (empty repository)'))
7059 ui.write(_(b' (empty repository)'))
7060 else:
7060 else:
7061 ui.write(_(b' (no revision checked out)'))
7061 ui.write(_(b' (no revision checked out)'))
7062 if p.obsolete():
7062 if p.obsolete():
7063 ui.write(_(b' (obsolete)'))
7063 ui.write(_(b' (obsolete)'))
7064 if p.isunstable():
7064 if p.isunstable():
7065 instabilities = (
7065 instabilities = (
7066 ui.label(instability, b'trouble.%s' % instability)
7066 ui.label(instability, b'trouble.%s' % instability)
7067 for instability in p.instabilities()
7067 for instability in p.instabilities()
7068 )
7068 )
7069 ui.write(b' (' + b', '.join(instabilities) + b')')
7069 ui.write(b' (' + b', '.join(instabilities) + b')')
7070 ui.write(b'\n')
7070 ui.write(b'\n')
7071 if p.description():
7071 if p.description():
7072 ui.status(
7072 ui.status(
7073 b' ' + p.description().splitlines()[0].strip() + b'\n',
7073 b' ' + p.description().splitlines()[0].strip() + b'\n',
7074 label=b'log.summary',
7074 label=b'log.summary',
7075 )
7075 )
7076
7076
7077 branch = ctx.branch()
7077 branch = ctx.branch()
7078 bheads = repo.branchheads(branch)
7078 bheads = repo.branchheads(branch)
7079 # i18n: column positioning for "hg summary"
7079 # i18n: column positioning for "hg summary"
7080 m = _(b'branch: %s\n') % branch
7080 m = _(b'branch: %s\n') % branch
7081 if branch != b'default':
7081 if branch != b'default':
7082 ui.write(m, label=b'log.branch')
7082 ui.write(m, label=b'log.branch')
7083 else:
7083 else:
7084 ui.status(m, label=b'log.branch')
7084 ui.status(m, label=b'log.branch')
7085
7085
7086 if marks:
7086 if marks:
7087 active = repo._activebookmark
7087 active = repo._activebookmark
7088 # i18n: column positioning for "hg summary"
7088 # i18n: column positioning for "hg summary"
7089 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
7089 ui.write(_(b'bookmarks:'), label=b'log.bookmark')
7090 if active is not None:
7090 if active is not None:
7091 if active in marks:
7091 if active in marks:
7092 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
7092 ui.write(b' *' + active, label=bookmarks.activebookmarklabel)
7093 marks.remove(active)
7093 marks.remove(active)
7094 else:
7094 else:
7095 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
7095 ui.write(b' [%s]' % active, label=bookmarks.activebookmarklabel)
7096 for m in marks:
7096 for m in marks:
7097 ui.write(b' ' + m, label=b'log.bookmark')
7097 ui.write(b' ' + m, label=b'log.bookmark')
7098 ui.write(b'\n', label=b'log.bookmark')
7098 ui.write(b'\n', label=b'log.bookmark')
7099
7099
7100 status = repo.status(unknown=True)
7100 status = repo.status(unknown=True)
7101
7101
7102 c = repo.dirstate.copies()
7102 c = repo.dirstate.copies()
7103 copied, renamed = [], []
7103 copied, renamed = [], []
7104 for d, s in pycompat.iteritems(c):
7104 for d, s in pycompat.iteritems(c):
7105 if s in status.removed:
7105 if s in status.removed:
7106 status.removed.remove(s)
7106 status.removed.remove(s)
7107 renamed.append(d)
7107 renamed.append(d)
7108 else:
7108 else:
7109 copied.append(d)
7109 copied.append(d)
7110 if d in status.added:
7110 if d in status.added:
7111 status.added.remove(d)
7111 status.added.remove(d)
7112
7112
7113 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7113 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
7114
7114
7115 labels = [
7115 labels = [
7116 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7116 (ui.label(_(b'%d modified'), b'status.modified'), status.modified),
7117 (ui.label(_(b'%d added'), b'status.added'), status.added),
7117 (ui.label(_(b'%d added'), b'status.added'), status.added),
7118 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7118 (ui.label(_(b'%d removed'), b'status.removed'), status.removed),
7119 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7119 (ui.label(_(b'%d renamed'), b'status.copied'), renamed),
7120 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7120 (ui.label(_(b'%d copied'), b'status.copied'), copied),
7121 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7121 (ui.label(_(b'%d deleted'), b'status.deleted'), status.deleted),
7122 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7122 (ui.label(_(b'%d unknown'), b'status.unknown'), status.unknown),
7123 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7123 (ui.label(_(b'%d unresolved'), b'resolve.unresolved'), unresolved),
7124 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7124 (ui.label(_(b'%d subrepos'), b'status.modified'), subs),
7125 ]
7125 ]
7126 t = []
7126 t = []
7127 for l, s in labels:
7127 for l, s in labels:
7128 if s:
7128 if s:
7129 t.append(l % len(s))
7129 t.append(l % len(s))
7130
7130
7131 t = b', '.join(t)
7131 t = b', '.join(t)
7132 cleanworkdir = False
7132 cleanworkdir = False
7133
7133
7134 if repo.vfs.exists(b'graftstate'):
7134 if repo.vfs.exists(b'graftstate'):
7135 t += _(b' (graft in progress)')
7135 t += _(b' (graft in progress)')
7136 if repo.vfs.exists(b'updatestate'):
7136 if repo.vfs.exists(b'updatestate'):
7137 t += _(b' (interrupted update)')
7137 t += _(b' (interrupted update)')
7138 elif len(parents) > 1:
7138 elif len(parents) > 1:
7139 t += _(b' (merge)')
7139 t += _(b' (merge)')
7140 elif branch != parents[0].branch():
7140 elif branch != parents[0].branch():
7141 t += _(b' (new branch)')
7141 t += _(b' (new branch)')
7142 elif parents[0].closesbranch() and pnode in repo.branchheads(
7142 elif parents[0].closesbranch() and pnode in repo.branchheads(
7143 branch, closed=True
7143 branch, closed=True
7144 ):
7144 ):
7145 t += _(b' (head closed)')
7145 t += _(b' (head closed)')
7146 elif not (
7146 elif not (
7147 status.modified
7147 status.modified
7148 or status.added
7148 or status.added
7149 or status.removed
7149 or status.removed
7150 or renamed
7150 or renamed
7151 or copied
7151 or copied
7152 or subs
7152 or subs
7153 ):
7153 ):
7154 t += _(b' (clean)')
7154 t += _(b' (clean)')
7155 cleanworkdir = True
7155 cleanworkdir = True
7156 elif pnode not in bheads:
7156 elif pnode not in bheads:
7157 t += _(b' (new branch head)')
7157 t += _(b' (new branch head)')
7158
7158
7159 if parents:
7159 if parents:
7160 pendingphase = max(p.phase() for p in parents)
7160 pendingphase = max(p.phase() for p in parents)
7161 else:
7161 else:
7162 pendingphase = phases.public
7162 pendingphase = phases.public
7163
7163
7164 if pendingphase > phases.newcommitphase(ui):
7164 if pendingphase > phases.newcommitphase(ui):
7165 t += b' (%s)' % phases.phasenames[pendingphase]
7165 t += b' (%s)' % phases.phasenames[pendingphase]
7166
7166
7167 if cleanworkdir:
7167 if cleanworkdir:
7168 # i18n: column positioning for "hg summary"
7168 # i18n: column positioning for "hg summary"
7169 ui.status(_(b'commit: %s\n') % t.strip())
7169 ui.status(_(b'commit: %s\n') % t.strip())
7170 else:
7170 else:
7171 # i18n: column positioning for "hg summary"
7171 # i18n: column positioning for "hg summary"
7172 ui.write(_(b'commit: %s\n') % t.strip())
7172 ui.write(_(b'commit: %s\n') % t.strip())
7173
7173
7174 # all ancestors of branch heads - all ancestors of parent = new csets
7174 # all ancestors of branch heads - all ancestors of parent = new csets
7175 new = len(
7175 new = len(
7176 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7176 repo.changelog.findmissing([pctx.node() for pctx in parents], bheads)
7177 )
7177 )
7178
7178
7179 if new == 0:
7179 if new == 0:
7180 # i18n: column positioning for "hg summary"
7180 # i18n: column positioning for "hg summary"
7181 ui.status(_(b'update: (current)\n'))
7181 ui.status(_(b'update: (current)\n'))
7182 elif pnode not in bheads:
7182 elif pnode not in bheads:
7183 # i18n: column positioning for "hg summary"
7183 # i18n: column positioning for "hg summary"
7184 ui.write(_(b'update: %d new changesets (update)\n') % new)
7184 ui.write(_(b'update: %d new changesets (update)\n') % new)
7185 else:
7185 else:
7186 # i18n: column positioning for "hg summary"
7186 # i18n: column positioning for "hg summary"
7187 ui.write(
7187 ui.write(
7188 _(b'update: %d new changesets, %d branch heads (merge)\n')
7188 _(b'update: %d new changesets, %d branch heads (merge)\n')
7189 % (new, len(bheads))
7189 % (new, len(bheads))
7190 )
7190 )
7191
7191
7192 t = []
7192 t = []
7193 draft = len(repo.revs(b'draft()'))
7193 draft = len(repo.revs(b'draft()'))
7194 if draft:
7194 if draft:
7195 t.append(_(b'%d draft') % draft)
7195 t.append(_(b'%d draft') % draft)
7196 secret = len(repo.revs(b'secret()'))
7196 secret = len(repo.revs(b'secret()'))
7197 if secret:
7197 if secret:
7198 t.append(_(b'%d secret') % secret)
7198 t.append(_(b'%d secret') % secret)
7199
7199
7200 if draft or secret:
7200 if draft or secret:
7201 ui.status(_(b'phases: %s\n') % b', '.join(t))
7201 ui.status(_(b'phases: %s\n') % b', '.join(t))
7202
7202
7203 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7203 if obsolete.isenabled(repo, obsolete.createmarkersopt):
7204 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7204 for trouble in (b"orphan", b"contentdivergent", b"phasedivergent"):
7205 numtrouble = len(repo.revs(trouble + b"()"))
7205 numtrouble = len(repo.revs(trouble + b"()"))
7206 # We write all the possibilities to ease translation
7206 # We write all the possibilities to ease translation
7207 troublemsg = {
7207 troublemsg = {
7208 b"orphan": _(b"orphan: %d changesets"),
7208 b"orphan": _(b"orphan: %d changesets"),
7209 b"contentdivergent": _(b"content-divergent: %d changesets"),
7209 b"contentdivergent": _(b"content-divergent: %d changesets"),
7210 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7210 b"phasedivergent": _(b"phase-divergent: %d changesets"),
7211 }
7211 }
7212 if numtrouble > 0:
7212 if numtrouble > 0:
7213 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7213 ui.status(troublemsg[trouble] % numtrouble + b"\n")
7214
7214
7215 cmdutil.summaryhooks(ui, repo)
7215 cmdutil.summaryhooks(ui, repo)
7216
7216
7217 if opts.get(b'remote'):
7217 if opts.get(b'remote'):
7218 needsincoming, needsoutgoing = True, True
7218 needsincoming, needsoutgoing = True, True
7219 else:
7219 else:
7220 needsincoming, needsoutgoing = False, False
7220 needsincoming, needsoutgoing = False, False
7221 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7221 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
7222 if i:
7222 if i:
7223 needsincoming = True
7223 needsincoming = True
7224 if o:
7224 if o:
7225 needsoutgoing = True
7225 needsoutgoing = True
7226 if not needsincoming and not needsoutgoing:
7226 if not needsincoming and not needsoutgoing:
7227 return
7227 return
7228
7228
7229 def getincoming():
7229 def getincoming():
7230 # XXX We should actually skip this if no default is specified, instead
7230 # XXX We should actually skip this if no default is specified, instead
7231 # of passing "default" which will resolve as "./default/" if no default
7231 # of passing "default" which will resolve as "./default/" if no default
7232 # path is defined.
7232 # path is defined.
7233 source, branches = urlutil.get_unique_pull_path(
7233 source, branches = urlutil.get_unique_pull_path(
7234 b'summary', repo, ui, b'default'
7234 b'summary', repo, ui, b'default'
7235 )
7235 )
7236 sbranch = branches[0]
7236 sbranch = branches[0]
7237 try:
7237 try:
7238 other = hg.peer(repo, {}, source)
7238 other = hg.peer(repo, {}, source)
7239 except error.RepoError:
7239 except error.RepoError:
7240 if opts.get(b'remote'):
7240 if opts.get(b'remote'):
7241 raise
7241 raise
7242 return source, sbranch, None, None, None
7242 return source, sbranch, None, None, None
7243 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7243 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
7244 if revs:
7244 if revs:
7245 revs = [other.lookup(rev) for rev in revs]
7245 revs = [other.lookup(rev) for rev in revs]
7246 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(source))
7246 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(source))
7247 repo.ui.pushbuffer()
7247 repo.ui.pushbuffer()
7248 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7248 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
7249 repo.ui.popbuffer()
7249 repo.ui.popbuffer()
7250 return source, sbranch, other, commoninc, commoninc[1]
7250 return source, sbranch, other, commoninc, commoninc[1]
7251
7251
7252 if needsincoming:
7252 if needsincoming:
7253 source, sbranch, sother, commoninc, incoming = getincoming()
7253 source, sbranch, sother, commoninc, incoming = getincoming()
7254 else:
7254 else:
7255 source = sbranch = sother = commoninc = incoming = None
7255 source = sbranch = sother = commoninc = incoming = None
7256
7256
7257 def getoutgoing():
7257 def getoutgoing():
7258 # XXX We should actually skip this if no default is specified, instead
7258 # XXX We should actually skip this if no default is specified, instead
7259 # of passing "default" which will resolve as "./default/" if no default
7259 # of passing "default" which will resolve as "./default/" if no default
7260 # path is defined.
7260 # path is defined.
7261 d = None
7261 d = None
7262 if b'default-push' in ui.paths:
7262 if b'default-push' in ui.paths:
7263 d = b'default-push'
7263 d = b'default-push'
7264 elif b'default' in ui.paths:
7264 elif b'default' in ui.paths:
7265 d = b'default'
7265 d = b'default'
7266 if d is not None:
7266 if d is not None:
7267 path = urlutil.get_unique_push_path(b'summary', repo, ui, d)
7267 path = urlutil.get_unique_push_path(b'summary', repo, ui, d)
7268 dest = path.pushloc or path.loc
7268 dest = path.pushloc or path.loc
7269 dbranch = path.branch
7269 dbranch = path.branch
7270 else:
7270 else:
7271 dest = b'default'
7271 dest = b'default'
7272 dbranch = None
7272 dbranch = None
7273 revs, checkout = hg.addbranchrevs(repo, repo, (dbranch, []), None)
7273 revs, checkout = hg.addbranchrevs(repo, repo, (dbranch, []), None)
7274 if source != dest:
7274 if source != dest:
7275 try:
7275 try:
7276 dother = hg.peer(repo, {}, dest)
7276 dother = hg.peer(repo, {}, dest)
7277 except error.RepoError:
7277 except error.RepoError:
7278 if opts.get(b'remote'):
7278 if opts.get(b'remote'):
7279 raise
7279 raise
7280 return dest, dbranch, None, None
7280 return dest, dbranch, None, None
7281 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(dest))
7281 ui.debug(b'comparing with %s\n' % urlutil.hidepassword(dest))
7282 elif sother is None:
7282 elif sother is None:
7283 # there is no explicit destination peer, but source one is invalid
7283 # there is no explicit destination peer, but source one is invalid
7284 return dest, dbranch, None, None
7284 return dest, dbranch, None, None
7285 else:
7285 else:
7286 dother = sother
7286 dother = sother
7287 if source != dest or (sbranch is not None and sbranch != dbranch):
7287 if source != dest or (sbranch is not None and sbranch != dbranch):
7288 common = None
7288 common = None
7289 else:
7289 else:
7290 common = commoninc
7290 common = commoninc
7291 if revs:
7291 if revs:
7292 revs = [repo.lookup(rev) for rev in revs]
7292 revs = [repo.lookup(rev) for rev in revs]
7293 repo.ui.pushbuffer()
7293 repo.ui.pushbuffer()
7294 outgoing = discovery.findcommonoutgoing(
7294 outgoing = discovery.findcommonoutgoing(
7295 repo, dother, onlyheads=revs, commoninc=common
7295 repo, dother, onlyheads=revs, commoninc=common
7296 )
7296 )
7297 repo.ui.popbuffer()
7297 repo.ui.popbuffer()
7298 return dest, dbranch, dother, outgoing
7298 return dest, dbranch, dother, outgoing
7299
7299
7300 if needsoutgoing:
7300 if needsoutgoing:
7301 dest, dbranch, dother, outgoing = getoutgoing()
7301 dest, dbranch, dother, outgoing = getoutgoing()
7302 else:
7302 else:
7303 dest = dbranch = dother = outgoing = None
7303 dest = dbranch = dother = outgoing = None
7304
7304
7305 if opts.get(b'remote'):
7305 if opts.get(b'remote'):
7306 # Help pytype. --remote sets both `needsincoming` and `needsoutgoing`.
7306 # Help pytype. --remote sets both `needsincoming` and `needsoutgoing`.
7307 # The former always sets `sother` (or raises an exception if it can't);
7307 # The former always sets `sother` (or raises an exception if it can't);
7308 # the latter always sets `outgoing`.
7308 # the latter always sets `outgoing`.
7309 assert sother is not None
7309 assert sother is not None
7310 assert outgoing is not None
7310 assert outgoing is not None
7311
7311
7312 t = []
7312 t = []
7313 if incoming:
7313 if incoming:
7314 t.append(_(b'1 or more incoming'))
7314 t.append(_(b'1 or more incoming'))
7315 o = outgoing.missing
7315 o = outgoing.missing
7316 if o:
7316 if o:
7317 t.append(_(b'%d outgoing') % len(o))
7317 t.append(_(b'%d outgoing') % len(o))
7318 other = dother or sother
7318 other = dother or sother
7319 if b'bookmarks' in other.listkeys(b'namespaces'):
7319 if b'bookmarks' in other.listkeys(b'namespaces'):
7320 counts = bookmarks.summary(repo, other)
7320 counts = bookmarks.summary(repo, other)
7321 if counts[0] > 0:
7321 if counts[0] > 0:
7322 t.append(_(b'%d incoming bookmarks') % counts[0])
7322 t.append(_(b'%d incoming bookmarks') % counts[0])
7323 if counts[1] > 0:
7323 if counts[1] > 0:
7324 t.append(_(b'%d outgoing bookmarks') % counts[1])
7324 t.append(_(b'%d outgoing bookmarks') % counts[1])
7325
7325
7326 if t:
7326 if t:
7327 # i18n: column positioning for "hg summary"
7327 # i18n: column positioning for "hg summary"
7328 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7328 ui.write(_(b'remote: %s\n') % (b', '.join(t)))
7329 else:
7329 else:
7330 # i18n: column positioning for "hg summary"
7330 # i18n: column positioning for "hg summary"
7331 ui.status(_(b'remote: (synced)\n'))
7331 ui.status(_(b'remote: (synced)\n'))
7332
7332
7333 cmdutil.summaryremotehooks(
7333 cmdutil.summaryremotehooks(
7334 ui,
7334 ui,
7335 repo,
7335 repo,
7336 opts,
7336 opts,
7337 (
7337 (
7338 (source, sbranch, sother, commoninc),
7338 (source, sbranch, sother, commoninc),
7339 (dest, dbranch, dother, outgoing),
7339 (dest, dbranch, dother, outgoing),
7340 ),
7340 ),
7341 )
7341 )
7342
7342
7343
7343
7344 @command(
7344 @command(
7345 b'tag',
7345 b'tag',
7346 [
7346 [
7347 (b'f', b'force', None, _(b'force tag')),
7347 (b'f', b'force', None, _(b'force tag')),
7348 (b'l', b'local', None, _(b'make the tag local')),
7348 (b'l', b'local', None, _(b'make the tag local')),
7349 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7349 (b'r', b'rev', b'', _(b'revision to tag'), _(b'REV')),
7350 (b'', b'remove', None, _(b'remove a tag')),
7350 (b'', b'remove', None, _(b'remove a tag')),
7351 # -l/--local is already there, commitopts cannot be used
7351 # -l/--local is already there, commitopts cannot be used
7352 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7352 (b'e', b'edit', None, _(b'invoke editor on commit messages')),
7353 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7353 (b'm', b'message', b'', _(b'use text as commit message'), _(b'TEXT')),
7354 ]
7354 ]
7355 + commitopts2,
7355 + commitopts2,
7356 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7356 _(b'[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
7357 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7357 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7358 )
7358 )
7359 def tag(ui, repo, name1, *names, **opts):
7359 def tag(ui, repo, name1, *names, **opts):
7360 """add one or more tags for the current or given revision
7360 """add one or more tags for the current or given revision
7361
7361
7362 Name a particular revision using <name>.
7362 Name a particular revision using <name>.
7363
7363
7364 Tags are used to name particular revisions of the repository and are
7364 Tags are used to name particular revisions of the repository and are
7365 very useful to compare different revisions, to go back to significant
7365 very useful to compare different revisions, to go back to significant
7366 earlier versions or to mark branch points as releases, etc. Changing
7366 earlier versions or to mark branch points as releases, etc. Changing
7367 an existing tag is normally disallowed; use -f/--force to override.
7367 an existing tag is normally disallowed; use -f/--force to override.
7368
7368
7369 If no revision is given, the parent of the working directory is
7369 If no revision is given, the parent of the working directory is
7370 used.
7370 used.
7371
7371
7372 To facilitate version control, distribution, and merging of tags,
7372 To facilitate version control, distribution, and merging of tags,
7373 they are stored as a file named ".hgtags" which is managed similarly
7373 they are stored as a file named ".hgtags" which is managed similarly
7374 to other project files and can be hand-edited if necessary. This
7374 to other project files and can be hand-edited if necessary. This
7375 also means that tagging creates a new commit. The file
7375 also means that tagging creates a new commit. The file
7376 ".hg/localtags" is used for local tags (not shared among
7376 ".hg/localtags" is used for local tags (not shared among
7377 repositories).
7377 repositories).
7378
7378
7379 Tag commits are usually made at the head of a branch. If the parent
7379 Tag commits are usually made at the head of a branch. If the parent
7380 of the working directory is not a branch head, :hg:`tag` aborts; use
7380 of the working directory is not a branch head, :hg:`tag` aborts; use
7381 -f/--force to force the tag commit to be based on a non-head
7381 -f/--force to force the tag commit to be based on a non-head
7382 changeset.
7382 changeset.
7383
7383
7384 See :hg:`help dates` for a list of formats valid for -d/--date.
7384 See :hg:`help dates` for a list of formats valid for -d/--date.
7385
7385
7386 Since tag names have priority over branch names during revision
7386 Since tag names have priority over branch names during revision
7387 lookup, using an existing branch name as a tag name is discouraged.
7387 lookup, using an existing branch name as a tag name is discouraged.
7388
7388
7389 Returns 0 on success.
7389 Returns 0 on success.
7390 """
7390 """
7391 cmdutil.check_incompatible_arguments(opts, 'remove', ['rev'])
7391 cmdutil.check_incompatible_arguments(opts, 'remove', ['rev'])
7392 opts = pycompat.byteskwargs(opts)
7392 opts = pycompat.byteskwargs(opts)
7393 with repo.wlock(), repo.lock():
7393 with repo.wlock(), repo.lock():
7394 rev_ = b"."
7394 rev_ = b"."
7395 names = [t.strip() for t in (name1,) + names]
7395 names = [t.strip() for t in (name1,) + names]
7396 if len(names) != len(set(names)):
7396 if len(names) != len(set(names)):
7397 raise error.InputError(_(b'tag names must be unique'))
7397 raise error.InputError(_(b'tag names must be unique'))
7398 for n in names:
7398 for n in names:
7399 scmutil.checknewlabel(repo, n, b'tag')
7399 scmutil.checknewlabel(repo, n, b'tag')
7400 if not n:
7400 if not n:
7401 raise error.InputError(
7401 raise error.InputError(
7402 _(b'tag names cannot consist entirely of whitespace')
7402 _(b'tag names cannot consist entirely of whitespace')
7403 )
7403 )
7404 if opts.get(b'rev'):
7404 if opts.get(b'rev'):
7405 rev_ = opts[b'rev']
7405 rev_ = opts[b'rev']
7406 message = opts.get(b'message')
7406 message = opts.get(b'message')
7407 if opts.get(b'remove'):
7407 if opts.get(b'remove'):
7408 if opts.get(b'local'):
7408 if opts.get(b'local'):
7409 expectedtype = b'local'
7409 expectedtype = b'local'
7410 else:
7410 else:
7411 expectedtype = b'global'
7411 expectedtype = b'global'
7412
7412
7413 for n in names:
7413 for n in names:
7414 if repo.tagtype(n) == b'global':
7414 if repo.tagtype(n) == b'global':
7415 alltags = tagsmod.findglobaltags(ui, repo)
7415 alltags = tagsmod.findglobaltags(ui, repo)
7416 if alltags[n][0] == repo.nullid:
7416 if alltags[n][0] == repo.nullid:
7417 raise error.InputError(
7417 raise error.InputError(
7418 _(b"tag '%s' is already removed") % n
7418 _(b"tag '%s' is already removed") % n
7419 )
7419 )
7420 if not repo.tagtype(n):
7420 if not repo.tagtype(n):
7421 raise error.InputError(_(b"tag '%s' does not exist") % n)
7421 raise error.InputError(_(b"tag '%s' does not exist") % n)
7422 if repo.tagtype(n) != expectedtype:
7422 if repo.tagtype(n) != expectedtype:
7423 if expectedtype == b'global':
7423 if expectedtype == b'global':
7424 raise error.InputError(
7424 raise error.InputError(
7425 _(b"tag '%s' is not a global tag") % n
7425 _(b"tag '%s' is not a global tag") % n
7426 )
7426 )
7427 else:
7427 else:
7428 raise error.InputError(
7428 raise error.InputError(
7429 _(b"tag '%s' is not a local tag") % n
7429 _(b"tag '%s' is not a local tag") % n
7430 )
7430 )
7431 rev_ = b'null'
7431 rev_ = b'null'
7432 if not message:
7432 if not message:
7433 # we don't translate commit messages
7433 # we don't translate commit messages
7434 message = b'Removed tag %s' % b', '.join(names)
7434 message = b'Removed tag %s' % b', '.join(names)
7435 elif not opts.get(b'force'):
7435 elif not opts.get(b'force'):
7436 for n in names:
7436 for n in names:
7437 if n in repo.tags():
7437 if n in repo.tags():
7438 raise error.InputError(
7438 raise error.InputError(
7439 _(b"tag '%s' already exists (use -f to force)") % n
7439 _(b"tag '%s' already exists (use -f to force)") % n
7440 )
7440 )
7441 if not opts.get(b'local'):
7441 if not opts.get(b'local'):
7442 p1, p2 = repo.dirstate.parents()
7442 p1, p2 = repo.dirstate.parents()
7443 if p2 != repo.nullid:
7443 if p2 != repo.nullid:
7444 raise error.StateError(_(b'uncommitted merge'))
7444 raise error.StateError(_(b'uncommitted merge'))
7445 bheads = repo.branchheads()
7445 bheads = repo.branchheads()
7446 if not opts.get(b'force') and bheads and p1 not in bheads:
7446 if not opts.get(b'force') and bheads and p1 not in bheads:
7447 raise error.InputError(
7447 raise error.InputError(
7448 _(
7448 _(
7449 b'working directory is not at a branch head '
7449 b'working directory is not at a branch head '
7450 b'(use -f to force)'
7450 b'(use -f to force)'
7451 )
7451 )
7452 )
7452 )
7453 node = scmutil.revsingle(repo, rev_).node()
7453 node = scmutil.revsingle(repo, rev_).node()
7454
7454
7455 if not message:
7455 if not message:
7456 # we don't translate commit messages
7456 # we don't translate commit messages
7457 message = b'Added tag %s for changeset %s' % (
7457 message = b'Added tag %s for changeset %s' % (
7458 b', '.join(names),
7458 b', '.join(names),
7459 short(node),
7459 short(node),
7460 )
7460 )
7461
7461
7462 date = opts.get(b'date')
7462 date = opts.get(b'date')
7463 if date:
7463 if date:
7464 date = dateutil.parsedate(date)
7464 date = dateutil.parsedate(date)
7465
7465
7466 if opts.get(b'remove'):
7466 if opts.get(b'remove'):
7467 editform = b'tag.remove'
7467 editform = b'tag.remove'
7468 else:
7468 else:
7469 editform = b'tag.add'
7469 editform = b'tag.add'
7470 editor = cmdutil.getcommiteditor(
7470 editor = cmdutil.getcommiteditor(
7471 editform=editform, **pycompat.strkwargs(opts)
7471 editform=editform, **pycompat.strkwargs(opts)
7472 )
7472 )
7473
7473
7474 # don't allow tagging the null rev
7474 # don't allow tagging the null rev
7475 if (
7475 if (
7476 not opts.get(b'remove')
7476 not opts.get(b'remove')
7477 and scmutil.revsingle(repo, rev_).rev() == nullrev
7477 and scmutil.revsingle(repo, rev_).rev() == nullrev
7478 ):
7478 ):
7479 raise error.InputError(_(b"cannot tag null revision"))
7479 raise error.InputError(_(b"cannot tag null revision"))
7480
7480
7481 tagsmod.tag(
7481 tagsmod.tag(
7482 repo,
7482 repo,
7483 names,
7483 names,
7484 node,
7484 node,
7485 message,
7485 message,
7486 opts.get(b'local'),
7486 opts.get(b'local'),
7487 opts.get(b'user'),
7487 opts.get(b'user'),
7488 date,
7488 date,
7489 editor=editor,
7489 editor=editor,
7490 )
7490 )
7491
7491
7492
7492
7493 @command(
7493 @command(
7494 b'tags',
7494 b'tags',
7495 formatteropts,
7495 formatteropts,
7496 b'',
7496 b'',
7497 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7497 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
7498 intents={INTENT_READONLY},
7498 intents={INTENT_READONLY},
7499 )
7499 )
7500 def tags(ui, repo, **opts):
7500 def tags(ui, repo, **opts):
7501 """list repository tags
7501 """list repository tags
7502
7502
7503 This lists both regular and local tags. When the -v/--verbose
7503 This lists both regular and local tags. When the -v/--verbose
7504 switch is used, a third column "local" is printed for local tags.
7504 switch is used, a third column "local" is printed for local tags.
7505 When the -q/--quiet switch is used, only the tag name is printed.
7505 When the -q/--quiet switch is used, only the tag name is printed.
7506
7506
7507 .. container:: verbose
7507 .. container:: verbose
7508
7508
7509 Template:
7509 Template:
7510
7510
7511 The following keywords are supported in addition to the common template
7511 The following keywords are supported in addition to the common template
7512 keywords and functions such as ``{tag}``. See also
7512 keywords and functions such as ``{tag}``. See also
7513 :hg:`help templates`.
7513 :hg:`help templates`.
7514
7514
7515 :type: String. ``local`` for local tags.
7515 :type: String. ``local`` for local tags.
7516
7516
7517 Returns 0 on success.
7517 Returns 0 on success.
7518 """
7518 """
7519
7519
7520 opts = pycompat.byteskwargs(opts)
7520 opts = pycompat.byteskwargs(opts)
7521 ui.pager(b'tags')
7521 ui.pager(b'tags')
7522 fm = ui.formatter(b'tags', opts)
7522 fm = ui.formatter(b'tags', opts)
7523 hexfunc = fm.hexfunc
7523 hexfunc = fm.hexfunc
7524
7524
7525 for t, n in reversed(repo.tagslist()):
7525 for t, n in reversed(repo.tagslist()):
7526 hn = hexfunc(n)
7526 hn = hexfunc(n)
7527 label = b'tags.normal'
7527 label = b'tags.normal'
7528 tagtype = repo.tagtype(t)
7528 tagtype = repo.tagtype(t)
7529 if not tagtype or tagtype == b'global':
7529 if not tagtype or tagtype == b'global':
7530 tagtype = b''
7530 tagtype = b''
7531 else:
7531 else:
7532 label = b'tags.' + tagtype
7532 label = b'tags.' + tagtype
7533
7533
7534 fm.startitem()
7534 fm.startitem()
7535 fm.context(repo=repo)
7535 fm.context(repo=repo)
7536 fm.write(b'tag', b'%s', t, label=label)
7536 fm.write(b'tag', b'%s', t, label=label)
7537 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7537 fmt = b" " * (30 - encoding.colwidth(t)) + b' %5d:%s'
7538 fm.condwrite(
7538 fm.condwrite(
7539 not ui.quiet,
7539 not ui.quiet,
7540 b'rev node',
7540 b'rev node',
7541 fmt,
7541 fmt,
7542 repo.changelog.rev(n),
7542 repo.changelog.rev(n),
7543 hn,
7543 hn,
7544 label=label,
7544 label=label,
7545 )
7545 )
7546 fm.condwrite(
7546 fm.condwrite(
7547 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7547 ui.verbose and tagtype, b'type', b' %s', tagtype, label=label
7548 )
7548 )
7549 fm.plain(b'\n')
7549 fm.plain(b'\n')
7550 fm.end()
7550 fm.end()
7551
7551
7552
7552
7553 @command(
7553 @command(
7554 b'tip',
7554 b'tip',
7555 [
7555 [
7556 (b'p', b'patch', None, _(b'show patch')),
7556 (b'p', b'patch', None, _(b'show patch')),
7557 (b'g', b'git', None, _(b'use git extended diff format')),
7557 (b'g', b'git', None, _(b'use git extended diff format')),
7558 ]
7558 ]
7559 + templateopts,
7559 + templateopts,
7560 _(b'[-p] [-g]'),
7560 _(b'[-p] [-g]'),
7561 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7561 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
7562 )
7562 )
7563 def tip(ui, repo, **opts):
7563 def tip(ui, repo, **opts):
7564 """show the tip revision (DEPRECATED)
7564 """show the tip revision (DEPRECATED)
7565
7565
7566 The tip revision (usually just called the tip) is the changeset
7566 The tip revision (usually just called the tip) is the changeset
7567 most recently added to the repository (and therefore the most
7567 most recently added to the repository (and therefore the most
7568 recently changed head).
7568 recently changed head).
7569
7569
7570 If you have just made a commit, that commit will be the tip. If
7570 If you have just made a commit, that commit will be the tip. If
7571 you have just pulled changes from another repository, the tip of
7571 you have just pulled changes from another repository, the tip of
7572 that repository becomes the current tip. The "tip" tag is special
7572 that repository becomes the current tip. The "tip" tag is special
7573 and cannot be renamed or assigned to a different changeset.
7573 and cannot be renamed or assigned to a different changeset.
7574
7574
7575 This command is deprecated, please use :hg:`heads` instead.
7575 This command is deprecated, please use :hg:`heads` instead.
7576
7576
7577 Returns 0 on success.
7577 Returns 0 on success.
7578 """
7578 """
7579 opts = pycompat.byteskwargs(opts)
7579 opts = pycompat.byteskwargs(opts)
7580 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7580 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
7581 displayer.show(repo[b'tip'])
7581 displayer.show(repo[b'tip'])
7582 displayer.close()
7582 displayer.close()
7583
7583
7584
7584
7585 @command(
7585 @command(
7586 b'unbundle',
7586 b'unbundle',
7587 [
7587 [
7588 (
7588 (
7589 b'u',
7589 b'u',
7590 b'update',
7590 b'update',
7591 None,
7591 None,
7592 _(b'update to new branch head if changesets were unbundled'),
7592 _(b'update to new branch head if changesets were unbundled'),
7593 )
7593 )
7594 ],
7594 ],
7595 _(b'[-u] FILE...'),
7595 _(b'[-u] FILE...'),
7596 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7596 helpcategory=command.CATEGORY_IMPORT_EXPORT,
7597 )
7597 )
7598 def unbundle(ui, repo, fname1, *fnames, **opts):
7598 def unbundle(ui, repo, fname1, *fnames, **opts):
7599 """apply one or more bundle files
7599 """apply one or more bundle files
7600
7600
7601 Apply one or more bundle files generated by :hg:`bundle`.
7601 Apply one or more bundle files generated by :hg:`bundle`.
7602
7602
7603 Returns 0 on success, 1 if an update has unresolved files.
7603 Returns 0 on success, 1 if an update has unresolved files.
7604 """
7604 """
7605 fnames = (fname1,) + fnames
7605 fnames = (fname1,) + fnames
7606
7606
7607 with repo.lock():
7607 with repo.lock():
7608 for fname in fnames:
7608 for fname in fnames:
7609 f = hg.openpath(ui, fname)
7609 f = hg.openpath(ui, fname)
7610 gen = exchange.readbundle(ui, f, fname)
7610 gen = exchange.readbundle(ui, f, fname)
7611 if isinstance(gen, streamclone.streamcloneapplier):
7611 if isinstance(gen, streamclone.streamcloneapplier):
7612 raise error.InputError(
7612 raise error.InputError(
7613 _(
7613 _(
7614 b'packed bundles cannot be applied with '
7614 b'packed bundles cannot be applied with '
7615 b'"hg unbundle"'
7615 b'"hg unbundle"'
7616 ),
7616 ),
7617 hint=_(b'use "hg debugapplystreamclonebundle"'),
7617 hint=_(b'use "hg debugapplystreamclonebundle"'),
7618 )
7618 )
7619 url = b'bundle:' + fname
7619 url = b'bundle:' + fname
7620 try:
7620 try:
7621 txnname = b'unbundle'
7621 txnname = b'unbundle'
7622 if not isinstance(gen, bundle2.unbundle20):
7622 if not isinstance(gen, bundle2.unbundle20):
7623 txnname = b'unbundle\n%s' % urlutil.hidepassword(url)
7623 txnname = b'unbundle\n%s' % urlutil.hidepassword(url)
7624 with repo.transaction(txnname) as tr:
7624 with repo.transaction(txnname) as tr:
7625 op = bundle2.applybundle(
7625 op = bundle2.applybundle(
7626 repo, gen, tr, source=b'unbundle', url=url
7626 repo, gen, tr, source=b'unbundle', url=url
7627 )
7627 )
7628 except error.BundleUnknownFeatureError as exc:
7628 except error.BundleUnknownFeatureError as exc:
7629 raise error.Abort(
7629 raise error.Abort(
7630 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7630 _(b'%s: unknown bundle feature, %s') % (fname, exc),
7631 hint=_(
7631 hint=_(
7632 b"see https://mercurial-scm.org/"
7632 b"see https://mercurial-scm.org/"
7633 b"wiki/BundleFeature for more "
7633 b"wiki/BundleFeature for more "
7634 b"information"
7634 b"information"
7635 ),
7635 ),
7636 )
7636 )
7637 modheads = bundle2.combinechangegroupresults(op)
7637 modheads = bundle2.combinechangegroupresults(op)
7638
7638
7639 if postincoming(ui, repo, modheads, opts.get('update'), None, None):
7639 if postincoming(ui, repo, modheads, opts.get('update'), None, None):
7640 return 1
7640 return 1
7641 else:
7641 else:
7642 return 0
7642 return 0
7643
7643
7644
7644
7645 @command(
7645 @command(
7646 b'unshelve',
7646 b'unshelve',
7647 [
7647 [
7648 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7648 (b'a', b'abort', None, _(b'abort an incomplete unshelve operation')),
7649 (
7649 (
7650 b'c',
7650 b'c',
7651 b'continue',
7651 b'continue',
7652 None,
7652 None,
7653 _(b'continue an incomplete unshelve operation'),
7653 _(b'continue an incomplete unshelve operation'),
7654 ),
7654 ),
7655 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7655 (b'i', b'interactive', None, _(b'use interactive mode (EXPERIMENTAL)')),
7656 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7656 (b'k', b'keep', None, _(b'keep shelve after unshelving')),
7657 (
7657 (
7658 b'n',
7658 b'n',
7659 b'name',
7659 b'name',
7660 b'',
7660 b'',
7661 _(b'restore shelved change with given name'),
7661 _(b'restore shelved change with given name'),
7662 _(b'NAME'),
7662 _(b'NAME'),
7663 ),
7663 ),
7664 (b't', b'tool', b'', _(b'specify merge tool')),
7664 (b't', b'tool', b'', _(b'specify merge tool')),
7665 (
7665 (
7666 b'',
7666 b'',
7667 b'date',
7667 b'date',
7668 b'',
7668 b'',
7669 _(b'set date for temporary commits (DEPRECATED)'),
7669 _(b'set date for temporary commits (DEPRECATED)'),
7670 _(b'DATE'),
7670 _(b'DATE'),
7671 ),
7671 ),
7672 ],
7672 ],
7673 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7673 _(b'hg unshelve [OPTION]... [[-n] SHELVED]'),
7674 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7674 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7675 )
7675 )
7676 def unshelve(ui, repo, *shelved, **opts):
7676 def unshelve(ui, repo, *shelved, **opts):
7677 """restore a shelved change to the working directory
7677 """restore a shelved change to the working directory
7678
7678
7679 This command accepts an optional name of a shelved change to
7679 This command accepts an optional name of a shelved change to
7680 restore. If none is given, the most recent shelved change is used.
7680 restore. If none is given, the most recent shelved change is used.
7681
7681
7682 If a shelved change is applied successfully, the bundle that
7682 If a shelved change is applied successfully, the bundle that
7683 contains the shelved changes is moved to a backup location
7683 contains the shelved changes is moved to a backup location
7684 (.hg/shelve-backup).
7684 (.hg/shelve-backup).
7685
7685
7686 Since you can restore a shelved change on top of an arbitrary
7686 Since you can restore a shelved change on top of an arbitrary
7687 commit, it is possible that unshelving will result in a conflict
7687 commit, it is possible that unshelving will result in a conflict
7688 between your changes and the commits you are unshelving onto. If
7688 between your changes and the commits you are unshelving onto. If
7689 this occurs, you must resolve the conflict, then use
7689 this occurs, you must resolve the conflict, then use
7690 ``--continue`` to complete the unshelve operation. (The bundle
7690 ``--continue`` to complete the unshelve operation. (The bundle
7691 will not be moved until you successfully complete the unshelve.)
7691 will not be moved until you successfully complete the unshelve.)
7692
7692
7693 (Alternatively, you can use ``--abort`` to abandon an unshelve
7693 (Alternatively, you can use ``--abort`` to abandon an unshelve
7694 that causes a conflict. This reverts the unshelved changes, and
7694 that causes a conflict. This reverts the unshelved changes, and
7695 leaves the bundle in place.)
7695 leaves the bundle in place.)
7696
7696
7697 If bare shelved change (without interactive, include and exclude
7697 If bare shelved change (without interactive, include and exclude
7698 option) was done on newly created branch it would restore branch
7698 option) was done on newly created branch it would restore branch
7699 information to the working directory.
7699 information to the working directory.
7700
7700
7701 After a successful unshelve, the shelved changes are stored in a
7701 After a successful unshelve, the shelved changes are stored in a
7702 backup directory. Only the N most recent backups are kept. N
7702 backup directory. Only the N most recent backups are kept. N
7703 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7703 defaults to 10 but can be overridden using the ``shelve.maxbackups``
7704 configuration option.
7704 configuration option.
7705
7705
7706 .. container:: verbose
7706 .. container:: verbose
7707
7707
7708 Timestamp in seconds is used to decide order of backups. More
7708 Timestamp in seconds is used to decide order of backups. More
7709 than ``maxbackups`` backups are kept, if same timestamp
7709 than ``maxbackups`` backups are kept, if same timestamp
7710 prevents from deciding exact order of them, for safety.
7710 prevents from deciding exact order of them, for safety.
7711
7711
7712 Selected changes can be unshelved with ``--interactive`` flag.
7712 Selected changes can be unshelved with ``--interactive`` flag.
7713 The working directory is updated with the selected changes, and
7713 The working directory is updated with the selected changes, and
7714 only the unselected changes remain shelved.
7714 only the unselected changes remain shelved.
7715 Note: The whole shelve is applied to working directory first before
7715 Note: The whole shelve is applied to working directory first before
7716 running interactively. So, this will bring up all the conflicts between
7716 running interactively. So, this will bring up all the conflicts between
7717 working directory and the shelve, irrespective of which changes will be
7717 working directory and the shelve, irrespective of which changes will be
7718 unshelved.
7718 unshelved.
7719 """
7719 """
7720 with repo.wlock():
7720 with repo.wlock():
7721 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7721 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7722
7722
7723
7723
7724 statemod.addunfinished(
7724 statemod.addunfinished(
7725 b'unshelve',
7725 b'unshelve',
7726 fname=b'shelvedstate',
7726 fname=b'shelvedstate',
7727 continueflag=True,
7727 continueflag=True,
7728 abortfunc=shelvemod.hgabortunshelve,
7728 abortfunc=shelvemod.hgabortunshelve,
7729 continuefunc=shelvemod.hgcontinueunshelve,
7729 continuefunc=shelvemod.hgcontinueunshelve,
7730 cmdmsg=_(b'unshelve already in progress'),
7730 cmdmsg=_(b'unshelve already in progress'),
7731 )
7731 )
7732
7732
7733
7733
7734 @command(
7734 @command(
7735 b'update|up|checkout|co',
7735 b'update|up|checkout|co',
7736 [
7736 [
7737 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7737 (b'C', b'clean', None, _(b'discard uncommitted changes (no backup)')),
7738 (b'c', b'check', None, _(b'require clean working directory')),
7738 (b'c', b'check', None, _(b'require clean working directory')),
7739 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7739 (b'm', b'merge', None, _(b'merge uncommitted changes')),
7740 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7740 (b'd', b'date', b'', _(b'tipmost revision matching date'), _(b'DATE')),
7741 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7741 (b'r', b'rev', b'', _(b'revision'), _(b'REV')),
7742 ]
7742 ]
7743 + mergetoolopts,
7743 + mergetoolopts,
7744 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7744 _(b'[-C|-c|-m] [-d DATE] [[-r] REV]'),
7745 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7745 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
7746 helpbasic=True,
7746 helpbasic=True,
7747 )
7747 )
7748 def update(ui, repo, node=None, **opts):
7748 def update(ui, repo, node=None, **opts):
7749 """update working directory (or switch revisions)
7749 """update working directory (or switch revisions)
7750
7750
7751 Update the repository's working directory to the specified
7751 Update the repository's working directory to the specified
7752 changeset. If no changeset is specified, update to the tip of the
7752 changeset. If no changeset is specified, update to the tip of the
7753 current named branch and move the active bookmark (see :hg:`help
7753 current named branch and move the active bookmark (see :hg:`help
7754 bookmarks`).
7754 bookmarks`).
7755
7755
7756 Update sets the working directory's parent revision to the specified
7756 Update sets the working directory's parent revision to the specified
7757 changeset (see :hg:`help parents`).
7757 changeset (see :hg:`help parents`).
7758
7758
7759 If the changeset is not a descendant or ancestor of the working
7759 If the changeset is not a descendant or ancestor of the working
7760 directory's parent and there are uncommitted changes, the update is
7760 directory's parent and there are uncommitted changes, the update is
7761 aborted. With the -c/--check option, the working directory is checked
7761 aborted. With the -c/--check option, the working directory is checked
7762 for uncommitted changes; if none are found, the working directory is
7762 for uncommitted changes; if none are found, the working directory is
7763 updated to the specified changeset.
7763 updated to the specified changeset.
7764
7764
7765 .. container:: verbose
7765 .. container:: verbose
7766
7766
7767 The -C/--clean, -c/--check, and -m/--merge options control what
7767 The -C/--clean, -c/--check, and -m/--merge options control what
7768 happens if the working directory contains uncommitted changes.
7768 happens if the working directory contains uncommitted changes.
7769 At most of one of them can be specified.
7769 At most of one of them can be specified.
7770
7770
7771 1. If no option is specified, and if
7771 1. If no option is specified, and if
7772 the requested changeset is an ancestor or descendant of
7772 the requested changeset is an ancestor or descendant of
7773 the working directory's parent, the uncommitted changes
7773 the working directory's parent, the uncommitted changes
7774 are merged into the requested changeset and the merged
7774 are merged into the requested changeset and the merged
7775 result is left uncommitted. If the requested changeset is
7775 result is left uncommitted. If the requested changeset is
7776 not an ancestor or descendant (that is, it is on another
7776 not an ancestor or descendant (that is, it is on another
7777 branch), the update is aborted and the uncommitted changes
7777 branch), the update is aborted and the uncommitted changes
7778 are preserved.
7778 are preserved.
7779
7779
7780 2. With the -m/--merge option, the update is allowed even if the
7780 2. With the -m/--merge option, the update is allowed even if the
7781 requested changeset is not an ancestor or descendant of
7781 requested changeset is not an ancestor or descendant of
7782 the working directory's parent.
7782 the working directory's parent.
7783
7783
7784 3. With the -c/--check option, the update is aborted and the
7784 3. With the -c/--check option, the update is aborted and the
7785 uncommitted changes are preserved.
7785 uncommitted changes are preserved.
7786
7786
7787 4. With the -C/--clean option, uncommitted changes are discarded and
7787 4. With the -C/--clean option, uncommitted changes are discarded and
7788 the working directory is updated to the requested changeset.
7788 the working directory is updated to the requested changeset.
7789
7789
7790 To cancel an uncommitted merge (and lose your changes), use
7790 To cancel an uncommitted merge (and lose your changes), use
7791 :hg:`merge --abort`.
7791 :hg:`merge --abort`.
7792
7792
7793 Use null as the changeset to remove the working directory (like
7793 Use null as the changeset to remove the working directory (like
7794 :hg:`clone -U`).
7794 :hg:`clone -U`).
7795
7795
7796 If you want to revert just one file to an older revision, use
7796 If you want to revert just one file to an older revision, use
7797 :hg:`revert [-r REV] NAME`.
7797 :hg:`revert [-r REV] NAME`.
7798
7798
7799 See :hg:`help dates` for a list of formats valid for -d/--date.
7799 See :hg:`help dates` for a list of formats valid for -d/--date.
7800
7800
7801 Returns 0 on success, 1 if there are unresolved files.
7801 Returns 0 on success, 1 if there are unresolved files.
7802 """
7802 """
7803 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7803 cmdutil.check_at_most_one_arg(opts, 'clean', 'check', 'merge')
7804 rev = opts.get('rev')
7804 rev = opts.get('rev')
7805 date = opts.get('date')
7805 date = opts.get('date')
7806 clean = opts.get('clean')
7806 clean = opts.get('clean')
7807 check = opts.get('check')
7807 check = opts.get('check')
7808 merge = opts.get('merge')
7808 merge = opts.get('merge')
7809 if rev and node:
7809 if rev and node:
7810 raise error.InputError(_(b"please specify just one revision"))
7810 raise error.InputError(_(b"please specify just one revision"))
7811
7811
7812 if ui.configbool(b'commands', b'update.requiredest'):
7812 if ui.configbool(b'commands', b'update.requiredest'):
7813 if not node and not rev and not date:
7813 if not node and not rev and not date:
7814 raise error.InputError(
7814 raise error.InputError(
7815 _(b'you must specify a destination'),
7815 _(b'you must specify a destination'),
7816 hint=_(b'for example: hg update ".::"'),
7816 hint=_(b'for example: hg update ".::"'),
7817 )
7817 )
7818
7818
7819 if rev is None or rev == b'':
7819 if rev is None or rev == b'':
7820 rev = node
7820 rev = node
7821
7821
7822 if date and rev is not None:
7822 if date and rev is not None:
7823 raise error.InputError(_(b"you can't specify a revision and a date"))
7823 raise error.InputError(_(b"you can't specify a revision and a date"))
7824
7824
7825 updatecheck = None
7825 updatecheck = None
7826 if check:
7826 if check:
7827 updatecheck = b'abort'
7827 updatecheck = b'abort'
7828 elif merge:
7828 elif merge:
7829 updatecheck = b'none'
7829 updatecheck = b'none'
7830
7830
7831 with repo.wlock():
7831 with repo.wlock():
7832 cmdutil.clearunfinished(repo)
7832 cmdutil.clearunfinished(repo)
7833 if date:
7833 if date:
7834 rev = cmdutil.finddate(ui, repo, date)
7834 rev = cmdutil.finddate(ui, repo, date)
7835
7835
7836 # if we defined a bookmark, we have to remember the original name
7836 # if we defined a bookmark, we have to remember the original name
7837 brev = rev
7837 brev = rev
7838 if rev:
7838 if rev:
7839 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7839 repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
7840 ctx = scmutil.revsingle(repo, rev, default=None)
7840 ctx = scmutil.revsingle(repo, rev, default=None)
7841 rev = ctx.rev()
7841 rev = ctx.rev()
7842 hidden = ctx.hidden()
7842 hidden = ctx.hidden()
7843 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7843 overrides = {(b'ui', b'forcemerge'): opts.get('tool', b'')}
7844 with ui.configoverride(overrides, b'update'):
7844 with ui.configoverride(overrides, b'update'):
7845 ret = hg.updatetotally(
7845 ret = hg.updatetotally(
7846 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7846 ui, repo, rev, brev, clean=clean, updatecheck=updatecheck
7847 )
7847 )
7848 if hidden:
7848 if hidden:
7849 ctxstr = ctx.hex()[:12]
7849 ctxstr = ctx.hex()[:12]
7850 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7850 ui.warn(_(b"updated to hidden changeset %s\n") % ctxstr)
7851
7851
7852 if ctx.obsolete():
7852 if ctx.obsolete():
7853 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7853 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
7854 ui.warn(b"(%s)\n" % obsfatemsg)
7854 ui.warn(b"(%s)\n" % obsfatemsg)
7855 return ret
7855 return ret
7856
7856
7857
7857
7858 @command(
7858 @command(
7859 b'verify',
7859 b'verify',
7860 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7860 [(b'', b'full', False, b'perform more checks (EXPERIMENTAL)')],
7861 helpcategory=command.CATEGORY_MAINTENANCE,
7861 helpcategory=command.CATEGORY_MAINTENANCE,
7862 )
7862 )
7863 def verify(ui, repo, **opts):
7863 def verify(ui, repo, **opts):
7864 """verify the integrity of the repository
7864 """verify the integrity of the repository
7865
7865
7866 Verify the integrity of the current repository.
7866 Verify the integrity of the current repository.
7867
7867
7868 This will perform an extensive check of the repository's
7868 This will perform an extensive check of the repository's
7869 integrity, validating the hashes and checksums of each entry in
7869 integrity, validating the hashes and checksums of each entry in
7870 the changelog, manifest, and tracked files, as well as the
7870 the changelog, manifest, and tracked files, as well as the
7871 integrity of their crosslinks and indices.
7871 integrity of their crosslinks and indices.
7872
7872
7873 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7873 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
7874 for more information about recovery from corruption of the
7874 for more information about recovery from corruption of the
7875 repository.
7875 repository.
7876
7876
7877 Returns 0 on success, 1 if errors are encountered.
7877 Returns 0 on success, 1 if errors are encountered.
7878 """
7878 """
7879 opts = pycompat.byteskwargs(opts)
7879 opts = pycompat.byteskwargs(opts)
7880
7880
7881 level = None
7881 level = None
7882 if opts[b'full']:
7882 if opts[b'full']:
7883 level = verifymod.VERIFY_FULL
7883 level = verifymod.VERIFY_FULL
7884 return hg.verify(repo, level)
7884 return hg.verify(repo, level)
7885
7885
7886
7886
7887 @command(
7887 @command(
7888 b'version',
7888 b'version',
7889 [] + formatteropts,
7889 [] + formatteropts,
7890 helpcategory=command.CATEGORY_HELP,
7890 helpcategory=command.CATEGORY_HELP,
7891 norepo=True,
7891 norepo=True,
7892 intents={INTENT_READONLY},
7892 intents={INTENT_READONLY},
7893 )
7893 )
7894 def version_(ui, **opts):
7894 def version_(ui, **opts):
7895 """output version and copyright information
7895 """output version and copyright information
7896
7896
7897 .. container:: verbose
7897 .. container:: verbose
7898
7898
7899 Template:
7899 Template:
7900
7900
7901 The following keywords are supported. See also :hg:`help templates`.
7901 The following keywords are supported. See also :hg:`help templates`.
7902
7902
7903 :extensions: List of extensions.
7903 :extensions: List of extensions.
7904 :ver: String. Version number.
7904 :ver: String. Version number.
7905
7905
7906 And each entry of ``{extensions}`` provides the following sub-keywords
7906 And each entry of ``{extensions}`` provides the following sub-keywords
7907 in addition to ``{ver}``.
7907 in addition to ``{ver}``.
7908
7908
7909 :bundled: Boolean. True if included in the release.
7909 :bundled: Boolean. True if included in the release.
7910 :name: String. Extension name.
7910 :name: String. Extension name.
7911 """
7911 """
7912 opts = pycompat.byteskwargs(opts)
7912 opts = pycompat.byteskwargs(opts)
7913 if ui.verbose:
7913 if ui.verbose:
7914 ui.pager(b'version')
7914 ui.pager(b'version')
7915 fm = ui.formatter(b"version", opts)
7915 fm = ui.formatter(b"version", opts)
7916 fm.startitem()
7916 fm.startitem()
7917 fm.write(
7917 fm.write(
7918 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7918 b"ver", _(b"Mercurial Distributed SCM (version %s)\n"), util.version()
7919 )
7919 )
7920 license = _(
7920 license = _(
7921 b"(see https://mercurial-scm.org for more information)\n"
7921 b"(see https://mercurial-scm.org for more information)\n"
7922 b"\nCopyright (C) 2005-2021 Olivia Mackall and others\n"
7922 b"\nCopyright (C) 2005-2021 Olivia Mackall and others\n"
7923 b"This is free software; see the source for copying conditions. "
7923 b"This is free software; see the source for copying conditions. "
7924 b"There is NO\nwarranty; "
7924 b"There is NO\nwarranty; "
7925 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7925 b"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
7926 )
7926 )
7927 if not ui.quiet:
7927 if not ui.quiet:
7928 fm.plain(license)
7928 fm.plain(license)
7929
7929
7930 if ui.verbose:
7930 if ui.verbose:
7931 fm.plain(_(b"\nEnabled extensions:\n\n"))
7931 fm.plain(_(b"\nEnabled extensions:\n\n"))
7932 # format names and versions into columns
7932 # format names and versions into columns
7933 names = []
7933 names = []
7934 vers = []
7934 vers = []
7935 isinternals = []
7935 isinternals = []
7936 for name, module in sorted(extensions.extensions()):
7936 for name, module in sorted(extensions.extensions()):
7937 names.append(name)
7937 names.append(name)
7938 vers.append(extensions.moduleversion(module) or None)
7938 vers.append(extensions.moduleversion(module) or None)
7939 isinternals.append(extensions.ismoduleinternal(module))
7939 isinternals.append(extensions.ismoduleinternal(module))
7940 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7940 fn = fm.nested(b"extensions", tmpl=b'{name}\n')
7941 if names:
7941 if names:
7942 namefmt = b" %%-%ds " % max(len(n) for n in names)
7942 namefmt = b" %%-%ds " % max(len(n) for n in names)
7943 places = [_(b"external"), _(b"internal")]
7943 places = [_(b"external"), _(b"internal")]
7944 for n, v, p in zip(names, vers, isinternals):
7944 for n, v, p in zip(names, vers, isinternals):
7945 fn.startitem()
7945 fn.startitem()
7946 fn.condwrite(ui.verbose, b"name", namefmt, n)
7946 fn.condwrite(ui.verbose, b"name", namefmt, n)
7947 if ui.verbose:
7947 if ui.verbose:
7948 fn.plain(b"%s " % places[p])
7948 fn.plain(b"%s " % places[p])
7949 fn.data(bundled=p)
7949 fn.data(bundled=p)
7950 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7950 fn.condwrite(ui.verbose and v, b"ver", b"%s", v)
7951 if ui.verbose:
7951 if ui.verbose:
7952 fn.plain(b"\n")
7952 fn.plain(b"\n")
7953 fn.end()
7953 fn.end()
7954 fm.end()
7954 fm.end()
7955
7955
7956
7956
7957 def loadcmdtable(ui, name, cmdtable):
7957 def loadcmdtable(ui, name, cmdtable):
7958 """Load command functions from specified cmdtable"""
7958 """Load command functions from specified cmdtable"""
7959 overrides = [cmd for cmd in cmdtable if cmd in table]
7959 overrides = [cmd for cmd in cmdtable if cmd in table]
7960 if overrides:
7960 if overrides:
7961 ui.warn(
7961 ui.warn(
7962 _(b"extension '%s' overrides commands: %s\n")
7962 _(b"extension '%s' overrides commands: %s\n")
7963 % (name, b" ".join(overrides))
7963 % (name, b" ".join(overrides))
7964 )
7964 )
7965 table.update(cmdtable)
7965 table.update(cmdtable)
General Comments 0
You need to be logged in to leave comments. Login now