##// END OF EJS Templates
unshelve: rename _dounshelve() to dounshelve()...
Navaneeth Suresh -
r42763:70f1a84d default
parent child Browse files
Show More
@@ -1,6430 +1,6430 b''
1 # commands.py - command processing for mercurial
1 # commands.py - command processing for mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from __future__ import absolute_import
8 from __future__ import absolute_import
9
9
10 import difflib
10 import difflib
11 import errno
11 import errno
12 import os
12 import os
13 import re
13 import re
14 import sys
14 import sys
15
15
16 from .i18n import _
16 from .i18n import _
17 from .node import (
17 from .node import (
18 hex,
18 hex,
19 nullid,
19 nullid,
20 nullrev,
20 nullrev,
21 short,
21 short,
22 wdirhex,
22 wdirhex,
23 wdirrev,
23 wdirrev,
24 )
24 )
25 from . import (
25 from . import (
26 archival,
26 archival,
27 bookmarks,
27 bookmarks,
28 bundle2,
28 bundle2,
29 changegroup,
29 changegroup,
30 cmdutil,
30 cmdutil,
31 copies,
31 copies,
32 debugcommands as debugcommandsmod,
32 debugcommands as debugcommandsmod,
33 destutil,
33 destutil,
34 dirstateguard,
34 dirstateguard,
35 discovery,
35 discovery,
36 encoding,
36 encoding,
37 error,
37 error,
38 exchange,
38 exchange,
39 extensions,
39 extensions,
40 filemerge,
40 filemerge,
41 formatter,
41 formatter,
42 graphmod,
42 graphmod,
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 narrowspec,
48 narrowspec,
49 obsolete,
49 obsolete,
50 obsutil,
50 obsutil,
51 patch,
51 patch,
52 phases,
52 phases,
53 pycompat,
53 pycompat,
54 rcutil,
54 rcutil,
55 registrar,
55 registrar,
56 repair,
56 repair,
57 revsetlang,
57 revsetlang,
58 rewriteutil,
58 rewriteutil,
59 scmutil,
59 scmutil,
60 server,
60 server,
61 shelve as shelvemod,
61 shelve as shelvemod,
62 state as statemod,
62 state as statemod,
63 streamclone,
63 streamclone,
64 tags as tagsmod,
64 tags as tagsmod,
65 ui as uimod,
65 ui as uimod,
66 util,
66 util,
67 verify as verifymod,
67 verify as verifymod,
68 wireprotoserver,
68 wireprotoserver,
69 )
69 )
70 from .utils import (
70 from .utils import (
71 dateutil,
71 dateutil,
72 stringutil,
72 stringutil,
73 )
73 )
74
74
75 table = {}
75 table = {}
76 table.update(debugcommandsmod.command._table)
76 table.update(debugcommandsmod.command._table)
77
77
78 command = registrar.command(table)
78 command = registrar.command(table)
79 INTENT_READONLY = registrar.INTENT_READONLY
79 INTENT_READONLY = registrar.INTENT_READONLY
80
80
81 # common command options
81 # common command options
82
82
83 globalopts = [
83 globalopts = [
84 ('R', 'repository', '',
84 ('R', 'repository', '',
85 _('repository root directory or name of overlay bundle file'),
85 _('repository root directory or name of overlay bundle file'),
86 _('REPO')),
86 _('REPO')),
87 ('', 'cwd', '',
87 ('', 'cwd', '',
88 _('change working directory'), _('DIR')),
88 _('change working directory'), _('DIR')),
89 ('y', 'noninteractive', None,
89 ('y', 'noninteractive', None,
90 _('do not prompt, automatically pick the first choice for all prompts')),
90 _('do not prompt, automatically pick the first choice for all prompts')),
91 ('q', 'quiet', None, _('suppress output')),
91 ('q', 'quiet', None, _('suppress output')),
92 ('v', 'verbose', None, _('enable additional output')),
92 ('v', 'verbose', None, _('enable additional output')),
93 ('', 'color', '',
93 ('', 'color', '',
94 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
94 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
95 # and should not be translated
95 # and should not be translated
96 _("when to colorize (boolean, always, auto, never, or debug)"),
96 _("when to colorize (boolean, always, auto, never, or debug)"),
97 _('TYPE')),
97 _('TYPE')),
98 ('', 'config', [],
98 ('', 'config', [],
99 _('set/override config option (use \'section.name=value\')'),
99 _('set/override config option (use \'section.name=value\')'),
100 _('CONFIG')),
100 _('CONFIG')),
101 ('', 'debug', None, _('enable debugging output')),
101 ('', 'debug', None, _('enable debugging output')),
102 ('', 'debugger', None, _('start debugger')),
102 ('', 'debugger', None, _('start debugger')),
103 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
103 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
104 _('ENCODE')),
104 _('ENCODE')),
105 ('', 'encodingmode', encoding.encodingmode,
105 ('', 'encodingmode', encoding.encodingmode,
106 _('set the charset encoding mode'), _('MODE')),
106 _('set the charset encoding mode'), _('MODE')),
107 ('', 'traceback', None, _('always print a traceback on exception')),
107 ('', 'traceback', None, _('always print a traceback on exception')),
108 ('', 'time', None, _('time how long the command takes')),
108 ('', 'time', None, _('time how long the command takes')),
109 ('', 'profile', None, _('print command execution profile')),
109 ('', 'profile', None, _('print command execution profile')),
110 ('', 'version', None, _('output version information and exit')),
110 ('', 'version', None, _('output version information and exit')),
111 ('h', 'help', None, _('display help and exit')),
111 ('h', 'help', None, _('display help and exit')),
112 ('', 'hidden', False, _('consider hidden changesets')),
112 ('', 'hidden', False, _('consider hidden changesets')),
113 ('', 'pager', 'auto',
113 ('', 'pager', 'auto',
114 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
114 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
115 ]
115 ]
116
116
117 dryrunopts = cmdutil.dryrunopts
117 dryrunopts = cmdutil.dryrunopts
118 remoteopts = cmdutil.remoteopts
118 remoteopts = cmdutil.remoteopts
119 walkopts = cmdutil.walkopts
119 walkopts = cmdutil.walkopts
120 commitopts = cmdutil.commitopts
120 commitopts = cmdutil.commitopts
121 commitopts2 = cmdutil.commitopts2
121 commitopts2 = cmdutil.commitopts2
122 formatteropts = cmdutil.formatteropts
122 formatteropts = cmdutil.formatteropts
123 templateopts = cmdutil.templateopts
123 templateopts = cmdutil.templateopts
124 logopts = cmdutil.logopts
124 logopts = cmdutil.logopts
125 diffopts = cmdutil.diffopts
125 diffopts = cmdutil.diffopts
126 diffwsopts = cmdutil.diffwsopts
126 diffwsopts = cmdutil.diffwsopts
127 diffopts2 = cmdutil.diffopts2
127 diffopts2 = cmdutil.diffopts2
128 mergetoolopts = cmdutil.mergetoolopts
128 mergetoolopts = cmdutil.mergetoolopts
129 similarityopts = cmdutil.similarityopts
129 similarityopts = cmdutil.similarityopts
130 subrepoopts = cmdutil.subrepoopts
130 subrepoopts = cmdutil.subrepoopts
131 debugrevlogopts = cmdutil.debugrevlogopts
131 debugrevlogopts = cmdutil.debugrevlogopts
132
132
133 # Commands start here, listed alphabetically
133 # Commands start here, listed alphabetically
134
134
135 @command('add',
135 @command('add',
136 walkopts + subrepoopts + dryrunopts,
136 walkopts + subrepoopts + dryrunopts,
137 _('[OPTION]... [FILE]...'),
137 _('[OPTION]... [FILE]...'),
138 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
138 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
139 helpbasic=True, inferrepo=True)
139 helpbasic=True, inferrepo=True)
140 def add(ui, repo, *pats, **opts):
140 def add(ui, repo, *pats, **opts):
141 """add the specified files on the next commit
141 """add the specified files on the next commit
142
142
143 Schedule files to be version controlled and added to the
143 Schedule files to be version controlled and added to the
144 repository.
144 repository.
145
145
146 The files will be added to the repository at the next commit. To
146 The files will be added to the repository at the next commit. To
147 undo an add before that, see :hg:`forget`.
147 undo an add before that, see :hg:`forget`.
148
148
149 If no names are given, add all files to the repository (except
149 If no names are given, add all files to the repository (except
150 files matching ``.hgignore``).
150 files matching ``.hgignore``).
151
151
152 .. container:: verbose
152 .. container:: verbose
153
153
154 Examples:
154 Examples:
155
155
156 - New (unknown) files are added
156 - New (unknown) files are added
157 automatically by :hg:`add`::
157 automatically by :hg:`add`::
158
158
159 $ ls
159 $ ls
160 foo.c
160 foo.c
161 $ hg status
161 $ hg status
162 ? foo.c
162 ? foo.c
163 $ hg add
163 $ hg add
164 adding foo.c
164 adding foo.c
165 $ hg status
165 $ hg status
166 A foo.c
166 A foo.c
167
167
168 - Specific files to be added can be specified::
168 - Specific files to be added can be specified::
169
169
170 $ ls
170 $ ls
171 bar.c foo.c
171 bar.c foo.c
172 $ hg status
172 $ hg status
173 ? bar.c
173 ? bar.c
174 ? foo.c
174 ? foo.c
175 $ hg add bar.c
175 $ hg add bar.c
176 $ hg status
176 $ hg status
177 A bar.c
177 A bar.c
178 ? foo.c
178 ? foo.c
179
179
180 Returns 0 if all files are successfully added.
180 Returns 0 if all files are successfully added.
181 """
181 """
182
182
183 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
183 m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts))
184 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
184 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
185 rejected = cmdutil.add(ui, repo, m, "", uipathfn, False, **opts)
185 rejected = cmdutil.add(ui, repo, m, "", uipathfn, False, **opts)
186 return rejected and 1 or 0
186 return rejected and 1 or 0
187
187
188 @command('addremove',
188 @command('addremove',
189 similarityopts + subrepoopts + walkopts + dryrunopts,
189 similarityopts + subrepoopts + walkopts + dryrunopts,
190 _('[OPTION]... [FILE]...'),
190 _('[OPTION]... [FILE]...'),
191 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
191 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
192 inferrepo=True)
192 inferrepo=True)
193 def addremove(ui, repo, *pats, **opts):
193 def addremove(ui, repo, *pats, **opts):
194 """add all new files, delete all missing files
194 """add all new files, delete all missing files
195
195
196 Add all new files and remove all missing files from the
196 Add all new files and remove all missing files from the
197 repository.
197 repository.
198
198
199 Unless names are given, new files are ignored if they match any of
199 Unless names are given, new files are ignored if they match any of
200 the patterns in ``.hgignore``. As with add, these changes take
200 the patterns in ``.hgignore``. As with add, these changes take
201 effect at the next commit.
201 effect at the next commit.
202
202
203 Use the -s/--similarity option to detect renamed files. This
203 Use the -s/--similarity option to detect renamed files. This
204 option takes a percentage between 0 (disabled) and 100 (files must
204 option takes a percentage between 0 (disabled) and 100 (files must
205 be identical) as its parameter. With a parameter greater than 0,
205 be identical) as its parameter. With a parameter greater than 0,
206 this compares every removed file with every added file and records
206 this compares every removed file with every added file and records
207 those similar enough as renames. Detecting renamed files this way
207 those similar enough as renames. Detecting renamed files this way
208 can be expensive. After using this option, :hg:`status -C` can be
208 can be expensive. After using this option, :hg:`status -C` can be
209 used to check which files were identified as moved or renamed. If
209 used to check which files were identified as moved or renamed. If
210 not specified, -s/--similarity defaults to 100 and only renames of
210 not specified, -s/--similarity defaults to 100 and only renames of
211 identical files are detected.
211 identical files are detected.
212
212
213 .. container:: verbose
213 .. container:: verbose
214
214
215 Examples:
215 Examples:
216
216
217 - A number of files (bar.c and foo.c) are new,
217 - A number of files (bar.c and foo.c) are new,
218 while foobar.c has been removed (without using :hg:`remove`)
218 while foobar.c has been removed (without using :hg:`remove`)
219 from the repository::
219 from the repository::
220
220
221 $ ls
221 $ ls
222 bar.c foo.c
222 bar.c foo.c
223 $ hg status
223 $ hg status
224 ! foobar.c
224 ! foobar.c
225 ? bar.c
225 ? bar.c
226 ? foo.c
226 ? foo.c
227 $ hg addremove
227 $ hg addremove
228 adding bar.c
228 adding bar.c
229 adding foo.c
229 adding foo.c
230 removing foobar.c
230 removing foobar.c
231 $ hg status
231 $ hg status
232 A bar.c
232 A bar.c
233 A foo.c
233 A foo.c
234 R foobar.c
234 R foobar.c
235
235
236 - A file foobar.c was moved to foo.c without using :hg:`rename`.
236 - A file foobar.c was moved to foo.c without using :hg:`rename`.
237 Afterwards, it was edited slightly::
237 Afterwards, it was edited slightly::
238
238
239 $ ls
239 $ ls
240 foo.c
240 foo.c
241 $ hg status
241 $ hg status
242 ! foobar.c
242 ! foobar.c
243 ? foo.c
243 ? foo.c
244 $ hg addremove --similarity 90
244 $ hg addremove --similarity 90
245 removing foobar.c
245 removing foobar.c
246 adding foo.c
246 adding foo.c
247 recording removal of foobar.c as rename to foo.c (94% similar)
247 recording removal of foobar.c as rename to foo.c (94% similar)
248 $ hg status -C
248 $ hg status -C
249 A foo.c
249 A foo.c
250 foobar.c
250 foobar.c
251 R foobar.c
251 R foobar.c
252
252
253 Returns 0 if all files are successfully added.
253 Returns 0 if all files are successfully added.
254 """
254 """
255 opts = pycompat.byteskwargs(opts)
255 opts = pycompat.byteskwargs(opts)
256 if not opts.get('similarity'):
256 if not opts.get('similarity'):
257 opts['similarity'] = '100'
257 opts['similarity'] = '100'
258 matcher = scmutil.match(repo[None], pats, opts)
258 matcher = scmutil.match(repo[None], pats, opts)
259 relative = scmutil.anypats(pats, opts)
259 relative = scmutil.anypats(pats, opts)
260 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
260 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
261 return scmutil.addremove(repo, matcher, "", uipathfn, opts)
261 return scmutil.addremove(repo, matcher, "", uipathfn, opts)
262
262
263 @command('annotate|blame',
263 @command('annotate|blame',
264 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
264 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
265 ('', 'follow', None,
265 ('', 'follow', None,
266 _('follow copies/renames and list the filename (DEPRECATED)')),
266 _('follow copies/renames and list the filename (DEPRECATED)')),
267 ('', 'no-follow', None, _("don't follow copies and renames")),
267 ('', 'no-follow', None, _("don't follow copies and renames")),
268 ('a', 'text', None, _('treat all files as text')),
268 ('a', 'text', None, _('treat all files as text')),
269 ('u', 'user', None, _('list the author (long with -v)')),
269 ('u', 'user', None, _('list the author (long with -v)')),
270 ('f', 'file', None, _('list the filename')),
270 ('f', 'file', None, _('list the filename')),
271 ('d', 'date', None, _('list the date (short with -q)')),
271 ('d', 'date', None, _('list the date (short with -q)')),
272 ('n', 'number', None, _('list the revision number (default)')),
272 ('n', 'number', None, _('list the revision number (default)')),
273 ('c', 'changeset', None, _('list the changeset')),
273 ('c', 'changeset', None, _('list the changeset')),
274 ('l', 'line-number', None, _('show line number at the first appearance')),
274 ('l', 'line-number', None, _('show line number at the first appearance')),
275 ('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')),
275 ('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')),
276 ] + diffwsopts + walkopts + formatteropts,
276 ] + diffwsopts + walkopts + formatteropts,
277 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
277 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
278 helpcategory=command.CATEGORY_FILE_CONTENTS,
278 helpcategory=command.CATEGORY_FILE_CONTENTS,
279 helpbasic=True, inferrepo=True)
279 helpbasic=True, inferrepo=True)
280 def annotate(ui, repo, *pats, **opts):
280 def annotate(ui, repo, *pats, **opts):
281 """show changeset information by line for each file
281 """show changeset information by line for each file
282
282
283 List changes in files, showing the revision id responsible for
283 List changes in files, showing the revision id responsible for
284 each line.
284 each line.
285
285
286 This command is useful for discovering when a change was made and
286 This command is useful for discovering when a change was made and
287 by whom.
287 by whom.
288
288
289 If you include --file, --user, or --date, the revision number is
289 If you include --file, --user, or --date, the revision number is
290 suppressed unless you also include --number.
290 suppressed unless you also include --number.
291
291
292 Without the -a/--text option, annotate will avoid processing files
292 Without the -a/--text option, annotate will avoid processing files
293 it detects as binary. With -a, annotate will annotate the file
293 it detects as binary. With -a, annotate will annotate the file
294 anyway, although the results will probably be neither useful
294 anyway, although the results will probably be neither useful
295 nor desirable.
295 nor desirable.
296
296
297 .. container:: verbose
297 .. container:: verbose
298
298
299 Template:
299 Template:
300
300
301 The following keywords are supported in addition to the common template
301 The following keywords are supported in addition to the common template
302 keywords and functions. See also :hg:`help templates`.
302 keywords and functions. See also :hg:`help templates`.
303
303
304 :lines: List of lines with annotation data.
304 :lines: List of lines with annotation data.
305 :path: String. Repository-absolute path of the specified file.
305 :path: String. Repository-absolute path of the specified file.
306
306
307 And each entry of ``{lines}`` provides the following sub-keywords in
307 And each entry of ``{lines}`` provides the following sub-keywords in
308 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
308 addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc.
309
309
310 :line: String. Line content.
310 :line: String. Line content.
311 :lineno: Integer. Line number at that revision.
311 :lineno: Integer. Line number at that revision.
312 :path: String. Repository-absolute path of the file at that revision.
312 :path: String. Repository-absolute path of the file at that revision.
313
313
314 See :hg:`help templates.operators` for the list expansion syntax.
314 See :hg:`help templates.operators` for the list expansion syntax.
315
315
316 Returns 0 on success.
316 Returns 0 on success.
317 """
317 """
318 opts = pycompat.byteskwargs(opts)
318 opts = pycompat.byteskwargs(opts)
319 if not pats:
319 if not pats:
320 raise error.Abort(_('at least one filename or pattern is required'))
320 raise error.Abort(_('at least one filename or pattern is required'))
321
321
322 if opts.get('follow'):
322 if opts.get('follow'):
323 # --follow is deprecated and now just an alias for -f/--file
323 # --follow is deprecated and now just an alias for -f/--file
324 # to mimic the behavior of Mercurial before version 1.5
324 # to mimic the behavior of Mercurial before version 1.5
325 opts['file'] = True
325 opts['file'] = True
326
326
327 if (not opts.get('user') and not opts.get('changeset')
327 if (not opts.get('user') and not opts.get('changeset')
328 and not opts.get('date') and not opts.get('file')):
328 and not opts.get('date') and not opts.get('file')):
329 opts['number'] = True
329 opts['number'] = True
330
330
331 linenumber = opts.get('line_number') is not None
331 linenumber = opts.get('line_number') is not None
332 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
332 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
333 raise error.Abort(_('at least one of -n/-c is required for -l'))
333 raise error.Abort(_('at least one of -n/-c is required for -l'))
334
334
335 rev = opts.get('rev')
335 rev = opts.get('rev')
336 if rev:
336 if rev:
337 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
337 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
338 ctx = scmutil.revsingle(repo, rev)
338 ctx = scmutil.revsingle(repo, rev)
339
339
340 ui.pager('annotate')
340 ui.pager('annotate')
341 rootfm = ui.formatter('annotate', opts)
341 rootfm = ui.formatter('annotate', opts)
342 if ui.debugflag:
342 if ui.debugflag:
343 shorthex = pycompat.identity
343 shorthex = pycompat.identity
344 else:
344 else:
345 def shorthex(h):
345 def shorthex(h):
346 return h[:12]
346 return h[:12]
347 if ui.quiet:
347 if ui.quiet:
348 datefunc = dateutil.shortdate
348 datefunc = dateutil.shortdate
349 else:
349 else:
350 datefunc = dateutil.datestr
350 datefunc = dateutil.datestr
351 if ctx.rev() is None:
351 if ctx.rev() is None:
352 if opts.get('changeset'):
352 if opts.get('changeset'):
353 # omit "+" suffix which is appended to node hex
353 # omit "+" suffix which is appended to node hex
354 def formatrev(rev):
354 def formatrev(rev):
355 if rev == wdirrev:
355 if rev == wdirrev:
356 return '%d' % ctx.p1().rev()
356 return '%d' % ctx.p1().rev()
357 else:
357 else:
358 return '%d' % rev
358 return '%d' % rev
359 else:
359 else:
360 def formatrev(rev):
360 def formatrev(rev):
361 if rev == wdirrev:
361 if rev == wdirrev:
362 return '%d+' % ctx.p1().rev()
362 return '%d+' % ctx.p1().rev()
363 else:
363 else:
364 return '%d ' % rev
364 return '%d ' % rev
365 def formathex(h):
365 def formathex(h):
366 if h == wdirhex:
366 if h == wdirhex:
367 return '%s+' % shorthex(hex(ctx.p1().node()))
367 return '%s+' % shorthex(hex(ctx.p1().node()))
368 else:
368 else:
369 return '%s ' % shorthex(h)
369 return '%s ' % shorthex(h)
370 else:
370 else:
371 formatrev = b'%d'.__mod__
371 formatrev = b'%d'.__mod__
372 formathex = shorthex
372 formathex = shorthex
373
373
374 opmap = [
374 opmap = [
375 ('user', ' ', lambda x: x.fctx.user(), ui.shortuser),
375 ('user', ' ', lambda x: x.fctx.user(), ui.shortuser),
376 ('rev', ' ', lambda x: scmutil.intrev(x.fctx), formatrev),
376 ('rev', ' ', lambda x: scmutil.intrev(x.fctx), formatrev),
377 ('node', ' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
377 ('node', ' ', lambda x: hex(scmutil.binnode(x.fctx)), formathex),
378 ('date', ' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
378 ('date', ' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)),
379 ('path', ' ', lambda x: x.fctx.path(), pycompat.bytestr),
379 ('path', ' ', lambda x: x.fctx.path(), pycompat.bytestr),
380 ('lineno', ':', lambda x: x.lineno, pycompat.bytestr),
380 ('lineno', ':', lambda x: x.lineno, pycompat.bytestr),
381 ]
381 ]
382 opnamemap = {
382 opnamemap = {
383 'rev': 'number',
383 'rev': 'number',
384 'node': 'changeset',
384 'node': 'changeset',
385 'path': 'file',
385 'path': 'file',
386 'lineno': 'line_number',
386 'lineno': 'line_number',
387 }
387 }
388
388
389 if rootfm.isplain():
389 if rootfm.isplain():
390 def makefunc(get, fmt):
390 def makefunc(get, fmt):
391 return lambda x: fmt(get(x))
391 return lambda x: fmt(get(x))
392 else:
392 else:
393 def makefunc(get, fmt):
393 def makefunc(get, fmt):
394 return get
394 return get
395 datahint = rootfm.datahint()
395 datahint = rootfm.datahint()
396 funcmap = [(makefunc(get, fmt), sep) for fn, sep, get, fmt in opmap
396 funcmap = [(makefunc(get, fmt), sep) for fn, sep, get, fmt in opmap
397 if opts.get(opnamemap.get(fn, fn)) or fn in datahint]
397 if opts.get(opnamemap.get(fn, fn)) or fn in datahint]
398 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
398 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
399 fields = ' '.join(fn for fn, sep, get, fmt in opmap
399 fields = ' '.join(fn for fn, sep, get, fmt in opmap
400 if opts.get(opnamemap.get(fn, fn)) or fn in datahint)
400 if opts.get(opnamemap.get(fn, fn)) or fn in datahint)
401
401
402 def bad(x, y):
402 def bad(x, y):
403 raise error.Abort("%s: %s" % (x, y))
403 raise error.Abort("%s: %s" % (x, y))
404
404
405 m = scmutil.match(ctx, pats, opts, badfn=bad)
405 m = scmutil.match(ctx, pats, opts, badfn=bad)
406
406
407 follow = not opts.get('no_follow')
407 follow = not opts.get('no_follow')
408 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
408 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
409 whitespace=True)
409 whitespace=True)
410 skiprevs = opts.get('skip')
410 skiprevs = opts.get('skip')
411 if skiprevs:
411 if skiprevs:
412 skiprevs = scmutil.revrange(repo, skiprevs)
412 skiprevs = scmutil.revrange(repo, skiprevs)
413
413
414 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
414 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
415 for abs in ctx.walk(m):
415 for abs in ctx.walk(m):
416 fctx = ctx[abs]
416 fctx = ctx[abs]
417 rootfm.startitem()
417 rootfm.startitem()
418 rootfm.data(path=abs)
418 rootfm.data(path=abs)
419 if not opts.get('text') and fctx.isbinary():
419 if not opts.get('text') and fctx.isbinary():
420 rootfm.plain(_("%s: binary file\n") % uipathfn(abs))
420 rootfm.plain(_("%s: binary file\n") % uipathfn(abs))
421 continue
421 continue
422
422
423 fm = rootfm.nested('lines', tmpl='{rev}: {line}')
423 fm = rootfm.nested('lines', tmpl='{rev}: {line}')
424 lines = fctx.annotate(follow=follow, skiprevs=skiprevs,
424 lines = fctx.annotate(follow=follow, skiprevs=skiprevs,
425 diffopts=diffopts)
425 diffopts=diffopts)
426 if not lines:
426 if not lines:
427 fm.end()
427 fm.end()
428 continue
428 continue
429 formats = []
429 formats = []
430 pieces = []
430 pieces = []
431
431
432 for f, sep in funcmap:
432 for f, sep in funcmap:
433 l = [f(n) for n in lines]
433 l = [f(n) for n in lines]
434 if fm.isplain():
434 if fm.isplain():
435 sizes = [encoding.colwidth(x) for x in l]
435 sizes = [encoding.colwidth(x) for x in l]
436 ml = max(sizes)
436 ml = max(sizes)
437 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
437 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
438 else:
438 else:
439 formats.append(['%s' for x in l])
439 formats.append(['%s' for x in l])
440 pieces.append(l)
440 pieces.append(l)
441
441
442 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
442 for f, p, n in zip(zip(*formats), zip(*pieces), lines):
443 fm.startitem()
443 fm.startitem()
444 fm.context(fctx=n.fctx)
444 fm.context(fctx=n.fctx)
445 fm.write(fields, "".join(f), *p)
445 fm.write(fields, "".join(f), *p)
446 if n.skip:
446 if n.skip:
447 fmt = "* %s"
447 fmt = "* %s"
448 else:
448 else:
449 fmt = ": %s"
449 fmt = ": %s"
450 fm.write('line', fmt, n.text)
450 fm.write('line', fmt, n.text)
451
451
452 if not lines[-1].text.endswith('\n'):
452 if not lines[-1].text.endswith('\n'):
453 fm.plain('\n')
453 fm.plain('\n')
454 fm.end()
454 fm.end()
455
455
456 rootfm.end()
456 rootfm.end()
457
457
458 @command('archive',
458 @command('archive',
459 [('', 'no-decode', None, _('do not pass files through decoders')),
459 [('', 'no-decode', None, _('do not pass files through decoders')),
460 ('p', 'prefix', '', _('directory prefix for files in archive'),
460 ('p', 'prefix', '', _('directory prefix for files in archive'),
461 _('PREFIX')),
461 _('PREFIX')),
462 ('r', 'rev', '', _('revision to distribute'), _('REV')),
462 ('r', 'rev', '', _('revision to distribute'), _('REV')),
463 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
463 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
464 ] + subrepoopts + walkopts,
464 ] + subrepoopts + walkopts,
465 _('[OPTION]... DEST'),
465 _('[OPTION]... DEST'),
466 helpcategory=command.CATEGORY_IMPORT_EXPORT)
466 helpcategory=command.CATEGORY_IMPORT_EXPORT)
467 def archive(ui, repo, dest, **opts):
467 def archive(ui, repo, dest, **opts):
468 '''create an unversioned archive of a repository revision
468 '''create an unversioned archive of a repository revision
469
469
470 By default, the revision used is the parent of the working
470 By default, the revision used is the parent of the working
471 directory; use -r/--rev to specify a different revision.
471 directory; use -r/--rev to specify a different revision.
472
472
473 The archive type is automatically detected based on file
473 The archive type is automatically detected based on file
474 extension (to override, use -t/--type).
474 extension (to override, use -t/--type).
475
475
476 .. container:: verbose
476 .. container:: verbose
477
477
478 Examples:
478 Examples:
479
479
480 - create a zip file containing the 1.0 release::
480 - create a zip file containing the 1.0 release::
481
481
482 hg archive -r 1.0 project-1.0.zip
482 hg archive -r 1.0 project-1.0.zip
483
483
484 - create a tarball excluding .hg files::
484 - create a tarball excluding .hg files::
485
485
486 hg archive project.tar.gz -X ".hg*"
486 hg archive project.tar.gz -X ".hg*"
487
487
488 Valid types are:
488 Valid types are:
489
489
490 :``files``: a directory full of files (default)
490 :``files``: a directory full of files (default)
491 :``tar``: tar archive, uncompressed
491 :``tar``: tar archive, uncompressed
492 :``tbz2``: tar archive, compressed using bzip2
492 :``tbz2``: tar archive, compressed using bzip2
493 :``tgz``: tar archive, compressed using gzip
493 :``tgz``: tar archive, compressed using gzip
494 :``uzip``: zip archive, uncompressed
494 :``uzip``: zip archive, uncompressed
495 :``zip``: zip archive, compressed using deflate
495 :``zip``: zip archive, compressed using deflate
496
496
497 The exact name of the destination archive or directory is given
497 The exact name of the destination archive or directory is given
498 using a format string; see :hg:`help export` for details.
498 using a format string; see :hg:`help export` for details.
499
499
500 Each member added to an archive file has a directory prefix
500 Each member added to an archive file has a directory prefix
501 prepended. Use -p/--prefix to specify a format string for the
501 prepended. Use -p/--prefix to specify a format string for the
502 prefix. The default is the basename of the archive, with suffixes
502 prefix. The default is the basename of the archive, with suffixes
503 removed.
503 removed.
504
504
505 Returns 0 on success.
505 Returns 0 on success.
506 '''
506 '''
507
507
508 opts = pycompat.byteskwargs(opts)
508 opts = pycompat.byteskwargs(opts)
509 rev = opts.get('rev')
509 rev = opts.get('rev')
510 if rev:
510 if rev:
511 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
511 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
512 ctx = scmutil.revsingle(repo, rev)
512 ctx = scmutil.revsingle(repo, rev)
513 if not ctx:
513 if not ctx:
514 raise error.Abort(_('no working directory: please specify a revision'))
514 raise error.Abort(_('no working directory: please specify a revision'))
515 node = ctx.node()
515 node = ctx.node()
516 dest = cmdutil.makefilename(ctx, dest)
516 dest = cmdutil.makefilename(ctx, dest)
517 if os.path.realpath(dest) == repo.root:
517 if os.path.realpath(dest) == repo.root:
518 raise error.Abort(_('repository root cannot be destination'))
518 raise error.Abort(_('repository root cannot be destination'))
519
519
520 kind = opts.get('type') or archival.guesskind(dest) or 'files'
520 kind = opts.get('type') or archival.guesskind(dest) or 'files'
521 prefix = opts.get('prefix')
521 prefix = opts.get('prefix')
522
522
523 if dest == '-':
523 if dest == '-':
524 if kind == 'files':
524 if kind == 'files':
525 raise error.Abort(_('cannot archive plain files to stdout'))
525 raise error.Abort(_('cannot archive plain files to stdout'))
526 dest = cmdutil.makefileobj(ctx, dest)
526 dest = cmdutil.makefileobj(ctx, dest)
527 if not prefix:
527 if not prefix:
528 prefix = os.path.basename(repo.root) + '-%h'
528 prefix = os.path.basename(repo.root) + '-%h'
529
529
530 prefix = cmdutil.makefilename(ctx, prefix)
530 prefix = cmdutil.makefilename(ctx, prefix)
531 match = scmutil.match(ctx, [], opts)
531 match = scmutil.match(ctx, [], opts)
532 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
532 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
533 match, prefix, subrepos=opts.get('subrepos'))
533 match, prefix, subrepos=opts.get('subrepos'))
534
534
535 @command('backout',
535 @command('backout',
536 [('', 'merge', None, _('merge with old dirstate parent after backout')),
536 [('', 'merge', None, _('merge with old dirstate parent after backout')),
537 ('', 'commit', None,
537 ('', 'commit', None,
538 _('commit if no conflicts were encountered (DEPRECATED)')),
538 _('commit if no conflicts were encountered (DEPRECATED)')),
539 ('', 'no-commit', None, _('do not commit')),
539 ('', 'no-commit', None, _('do not commit')),
540 ('', 'parent', '',
540 ('', 'parent', '',
541 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
541 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
542 ('r', 'rev', '', _('revision to backout'), _('REV')),
542 ('r', 'rev', '', _('revision to backout'), _('REV')),
543 ('e', 'edit', False, _('invoke editor on commit messages')),
543 ('e', 'edit', False, _('invoke editor on commit messages')),
544 ] + mergetoolopts + walkopts + commitopts + commitopts2,
544 ] + mergetoolopts + walkopts + commitopts + commitopts2,
545 _('[OPTION]... [-r] REV'),
545 _('[OPTION]... [-r] REV'),
546 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT)
546 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT)
547 def backout(ui, repo, node=None, rev=None, **opts):
547 def backout(ui, repo, node=None, rev=None, **opts):
548 '''reverse effect of earlier changeset
548 '''reverse effect of earlier changeset
549
549
550 Prepare a new changeset with the effect of REV undone in the
550 Prepare a new changeset with the effect of REV undone in the
551 current working directory. If no conflicts were encountered,
551 current working directory. If no conflicts were encountered,
552 it will be committed immediately.
552 it will be committed immediately.
553
553
554 If REV is the parent of the working directory, then this new changeset
554 If REV is the parent of the working directory, then this new changeset
555 is committed automatically (unless --no-commit is specified).
555 is committed automatically (unless --no-commit is specified).
556
556
557 .. note::
557 .. note::
558
558
559 :hg:`backout` cannot be used to fix either an unwanted or
559 :hg:`backout` cannot be used to fix either an unwanted or
560 incorrect merge.
560 incorrect merge.
561
561
562 .. container:: verbose
562 .. container:: verbose
563
563
564 Examples:
564 Examples:
565
565
566 - Reverse the effect of the parent of the working directory.
566 - Reverse the effect of the parent of the working directory.
567 This backout will be committed immediately::
567 This backout will be committed immediately::
568
568
569 hg backout -r .
569 hg backout -r .
570
570
571 - Reverse the effect of previous bad revision 23::
571 - Reverse the effect of previous bad revision 23::
572
572
573 hg backout -r 23
573 hg backout -r 23
574
574
575 - Reverse the effect of previous bad revision 23 and
575 - Reverse the effect of previous bad revision 23 and
576 leave changes uncommitted::
576 leave changes uncommitted::
577
577
578 hg backout -r 23 --no-commit
578 hg backout -r 23 --no-commit
579 hg commit -m "Backout revision 23"
579 hg commit -m "Backout revision 23"
580
580
581 By default, the pending changeset will have one parent,
581 By default, the pending changeset will have one parent,
582 maintaining a linear history. With --merge, the pending
582 maintaining a linear history. With --merge, the pending
583 changeset will instead have two parents: the old parent of the
583 changeset will instead have two parents: the old parent of the
584 working directory and a new child of REV that simply undoes REV.
584 working directory and a new child of REV that simply undoes REV.
585
585
586 Before version 1.7, the behavior without --merge was equivalent
586 Before version 1.7, the behavior without --merge was equivalent
587 to specifying --merge followed by :hg:`update --clean .` to
587 to specifying --merge followed by :hg:`update --clean .` to
588 cancel the merge and leave the child of REV as a head to be
588 cancel the merge and leave the child of REV as a head to be
589 merged separately.
589 merged separately.
590
590
591 See :hg:`help dates` for a list of formats valid for -d/--date.
591 See :hg:`help dates` for a list of formats valid for -d/--date.
592
592
593 See :hg:`help revert` for a way to restore files to the state
593 See :hg:`help revert` for a way to restore files to the state
594 of another revision.
594 of another revision.
595
595
596 Returns 0 on success, 1 if nothing to backout or there are unresolved
596 Returns 0 on success, 1 if nothing to backout or there are unresolved
597 files.
597 files.
598 '''
598 '''
599 with repo.wlock(), repo.lock():
599 with repo.wlock(), repo.lock():
600 return _dobackout(ui, repo, node, rev, **opts)
600 return _dobackout(ui, repo, node, rev, **opts)
601
601
602 def _dobackout(ui, repo, node=None, rev=None, **opts):
602 def _dobackout(ui, repo, node=None, rev=None, **opts):
603 opts = pycompat.byteskwargs(opts)
603 opts = pycompat.byteskwargs(opts)
604 if opts.get('commit') and opts.get('no_commit'):
604 if opts.get('commit') and opts.get('no_commit'):
605 raise error.Abort(_("cannot use --commit with --no-commit"))
605 raise error.Abort(_("cannot use --commit with --no-commit"))
606 if opts.get('merge') and opts.get('no_commit'):
606 if opts.get('merge') and opts.get('no_commit'):
607 raise error.Abort(_("cannot use --merge with --no-commit"))
607 raise error.Abort(_("cannot use --merge with --no-commit"))
608
608
609 if rev and node:
609 if rev and node:
610 raise error.Abort(_("please specify just one revision"))
610 raise error.Abort(_("please specify just one revision"))
611
611
612 if not rev:
612 if not rev:
613 rev = node
613 rev = node
614
614
615 if not rev:
615 if not rev:
616 raise error.Abort(_("please specify a revision to backout"))
616 raise error.Abort(_("please specify a revision to backout"))
617
617
618 date = opts.get('date')
618 date = opts.get('date')
619 if date:
619 if date:
620 opts['date'] = dateutil.parsedate(date)
620 opts['date'] = dateutil.parsedate(date)
621
621
622 cmdutil.checkunfinished(repo)
622 cmdutil.checkunfinished(repo)
623 cmdutil.bailifchanged(repo)
623 cmdutil.bailifchanged(repo)
624 node = scmutil.revsingle(repo, rev).node()
624 node = scmutil.revsingle(repo, rev).node()
625
625
626 op1, op2 = repo.dirstate.parents()
626 op1, op2 = repo.dirstate.parents()
627 if not repo.changelog.isancestor(node, op1):
627 if not repo.changelog.isancestor(node, op1):
628 raise error.Abort(_('cannot backout change that is not an ancestor'))
628 raise error.Abort(_('cannot backout change that is not an ancestor'))
629
629
630 p1, p2 = repo.changelog.parents(node)
630 p1, p2 = repo.changelog.parents(node)
631 if p1 == nullid:
631 if p1 == nullid:
632 raise error.Abort(_('cannot backout a change with no parents'))
632 raise error.Abort(_('cannot backout a change with no parents'))
633 if p2 != nullid:
633 if p2 != nullid:
634 if not opts.get('parent'):
634 if not opts.get('parent'):
635 raise error.Abort(_('cannot backout a merge changeset'))
635 raise error.Abort(_('cannot backout a merge changeset'))
636 p = repo.lookup(opts['parent'])
636 p = repo.lookup(opts['parent'])
637 if p not in (p1, p2):
637 if p not in (p1, p2):
638 raise error.Abort(_('%s is not a parent of %s') %
638 raise error.Abort(_('%s is not a parent of %s') %
639 (short(p), short(node)))
639 (short(p), short(node)))
640 parent = p
640 parent = p
641 else:
641 else:
642 if opts.get('parent'):
642 if opts.get('parent'):
643 raise error.Abort(_('cannot use --parent on non-merge changeset'))
643 raise error.Abort(_('cannot use --parent on non-merge changeset'))
644 parent = p1
644 parent = p1
645
645
646 # the backout should appear on the same branch
646 # the backout should appear on the same branch
647 branch = repo.dirstate.branch()
647 branch = repo.dirstate.branch()
648 bheads = repo.branchheads(branch)
648 bheads = repo.branchheads(branch)
649 rctx = scmutil.revsingle(repo, hex(parent))
649 rctx = scmutil.revsingle(repo, hex(parent))
650 if not opts.get('merge') and op1 != node:
650 if not opts.get('merge') and op1 != node:
651 with dirstateguard.dirstateguard(repo, 'backout'):
651 with dirstateguard.dirstateguard(repo, 'backout'):
652 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
652 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
653 with ui.configoverride(overrides, 'backout'):
653 with ui.configoverride(overrides, 'backout'):
654 stats = mergemod.update(repo, parent, branchmerge=True,
654 stats = mergemod.update(repo, parent, branchmerge=True,
655 force=True, ancestor=node,
655 force=True, ancestor=node,
656 mergeancestor=False)
656 mergeancestor=False)
657 repo.setparents(op1, op2)
657 repo.setparents(op1, op2)
658 hg._showstats(repo, stats)
658 hg._showstats(repo, stats)
659 if stats.unresolvedcount:
659 if stats.unresolvedcount:
660 repo.ui.status(_("use 'hg resolve' to retry unresolved "
660 repo.ui.status(_("use 'hg resolve' to retry unresolved "
661 "file merges\n"))
661 "file merges\n"))
662 return 1
662 return 1
663 else:
663 else:
664 hg.clean(repo, node, show_stats=False)
664 hg.clean(repo, node, show_stats=False)
665 repo.dirstate.setbranch(branch)
665 repo.dirstate.setbranch(branch)
666 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
666 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
667
667
668 if opts.get('no_commit'):
668 if opts.get('no_commit'):
669 msg = _("changeset %s backed out, "
669 msg = _("changeset %s backed out, "
670 "don't forget to commit.\n")
670 "don't forget to commit.\n")
671 ui.status(msg % short(node))
671 ui.status(msg % short(node))
672 return 0
672 return 0
673
673
674 def commitfunc(ui, repo, message, match, opts):
674 def commitfunc(ui, repo, message, match, opts):
675 editform = 'backout'
675 editform = 'backout'
676 e = cmdutil.getcommiteditor(editform=editform,
676 e = cmdutil.getcommiteditor(editform=editform,
677 **pycompat.strkwargs(opts))
677 **pycompat.strkwargs(opts))
678 if not message:
678 if not message:
679 # we don't translate commit messages
679 # we don't translate commit messages
680 message = "Backed out changeset %s" % short(node)
680 message = "Backed out changeset %s" % short(node)
681 e = cmdutil.getcommiteditor(edit=True, editform=editform)
681 e = cmdutil.getcommiteditor(edit=True, editform=editform)
682 return repo.commit(message, opts.get('user'), opts.get('date'),
682 return repo.commit(message, opts.get('user'), opts.get('date'),
683 match, editor=e)
683 match, editor=e)
684 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
684 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
685 if not newnode:
685 if not newnode:
686 ui.status(_("nothing changed\n"))
686 ui.status(_("nothing changed\n"))
687 return 1
687 return 1
688 cmdutil.commitstatus(repo, newnode, branch, bheads)
688 cmdutil.commitstatus(repo, newnode, branch, bheads)
689
689
690 def nice(node):
690 def nice(node):
691 return '%d:%s' % (repo.changelog.rev(node), short(node))
691 return '%d:%s' % (repo.changelog.rev(node), short(node))
692 ui.status(_('changeset %s backs out changeset %s\n') %
692 ui.status(_('changeset %s backs out changeset %s\n') %
693 (nice(repo.changelog.tip()), nice(node)))
693 (nice(repo.changelog.tip()), nice(node)))
694 if opts.get('merge') and op1 != node:
694 if opts.get('merge') and op1 != node:
695 hg.clean(repo, op1, show_stats=False)
695 hg.clean(repo, op1, show_stats=False)
696 ui.status(_('merging with changeset %s\n')
696 ui.status(_('merging with changeset %s\n')
697 % nice(repo.changelog.tip()))
697 % nice(repo.changelog.tip()))
698 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
698 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
699 with ui.configoverride(overrides, 'backout'):
699 with ui.configoverride(overrides, 'backout'):
700 return hg.merge(repo, hex(repo.changelog.tip()))
700 return hg.merge(repo, hex(repo.changelog.tip()))
701 return 0
701 return 0
702
702
703 @command('bisect',
703 @command('bisect',
704 [('r', 'reset', False, _('reset bisect state')),
704 [('r', 'reset', False, _('reset bisect state')),
705 ('g', 'good', False, _('mark changeset good')),
705 ('g', 'good', False, _('mark changeset good')),
706 ('b', 'bad', False, _('mark changeset bad')),
706 ('b', 'bad', False, _('mark changeset bad')),
707 ('s', 'skip', False, _('skip testing changeset')),
707 ('s', 'skip', False, _('skip testing changeset')),
708 ('e', 'extend', False, _('extend the bisect range')),
708 ('e', 'extend', False, _('extend the bisect range')),
709 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
709 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
710 ('U', 'noupdate', False, _('do not update to target'))],
710 ('U', 'noupdate', False, _('do not update to target'))],
711 _("[-gbsr] [-U] [-c CMD] [REV]"),
711 _("[-gbsr] [-U] [-c CMD] [REV]"),
712 helpcategory=command.CATEGORY_CHANGE_NAVIGATION)
712 helpcategory=command.CATEGORY_CHANGE_NAVIGATION)
713 def bisect(ui, repo, rev=None, extra=None, command=None,
713 def bisect(ui, repo, rev=None, extra=None, command=None,
714 reset=None, good=None, bad=None, skip=None, extend=None,
714 reset=None, good=None, bad=None, skip=None, extend=None,
715 noupdate=None):
715 noupdate=None):
716 """subdivision search of changesets
716 """subdivision search of changesets
717
717
718 This command helps to find changesets which introduce problems. To
718 This command helps to find changesets which introduce problems. To
719 use, mark the earliest changeset you know exhibits the problem as
719 use, mark the earliest changeset you know exhibits the problem as
720 bad, then mark the latest changeset which is free from the problem
720 bad, then mark the latest changeset which is free from the problem
721 as good. Bisect will update your working directory to a revision
721 as good. Bisect will update your working directory to a revision
722 for testing (unless the -U/--noupdate option is specified). Once
722 for testing (unless the -U/--noupdate option is specified). Once
723 you have performed tests, mark the working directory as good or
723 you have performed tests, mark the working directory as good or
724 bad, and bisect will either update to another candidate changeset
724 bad, and bisect will either update to another candidate changeset
725 or announce that it has found the bad revision.
725 or announce that it has found the bad revision.
726
726
727 As a shortcut, you can also use the revision argument to mark a
727 As a shortcut, you can also use the revision argument to mark a
728 revision as good or bad without checking it out first.
728 revision as good or bad without checking it out first.
729
729
730 If you supply a command, it will be used for automatic bisection.
730 If you supply a command, it will be used for automatic bisection.
731 The environment variable HG_NODE will contain the ID of the
731 The environment variable HG_NODE will contain the ID of the
732 changeset being tested. The exit status of the command will be
732 changeset being tested. The exit status of the command will be
733 used to mark revisions as good or bad: status 0 means good, 125
733 used to mark revisions as good or bad: status 0 means good, 125
734 means to skip the revision, 127 (command not found) will abort the
734 means to skip the revision, 127 (command not found) will abort the
735 bisection, and any other non-zero exit status means the revision
735 bisection, and any other non-zero exit status means the revision
736 is bad.
736 is bad.
737
737
738 .. container:: verbose
738 .. container:: verbose
739
739
740 Some examples:
740 Some examples:
741
741
742 - start a bisection with known bad revision 34, and good revision 12::
742 - start a bisection with known bad revision 34, and good revision 12::
743
743
744 hg bisect --bad 34
744 hg bisect --bad 34
745 hg bisect --good 12
745 hg bisect --good 12
746
746
747 - advance the current bisection by marking current revision as good or
747 - advance the current bisection by marking current revision as good or
748 bad::
748 bad::
749
749
750 hg bisect --good
750 hg bisect --good
751 hg bisect --bad
751 hg bisect --bad
752
752
753 - mark the current revision, or a known revision, to be skipped (e.g. if
753 - mark the current revision, or a known revision, to be skipped (e.g. if
754 that revision is not usable because of another issue)::
754 that revision is not usable because of another issue)::
755
755
756 hg bisect --skip
756 hg bisect --skip
757 hg bisect --skip 23
757 hg bisect --skip 23
758
758
759 - skip all revisions that do not touch directories ``foo`` or ``bar``::
759 - skip all revisions that do not touch directories ``foo`` or ``bar``::
760
760
761 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
761 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
762
762
763 - forget the current bisection::
763 - forget the current bisection::
764
764
765 hg bisect --reset
765 hg bisect --reset
766
766
767 - use 'make && make tests' to automatically find the first broken
767 - use 'make && make tests' to automatically find the first broken
768 revision::
768 revision::
769
769
770 hg bisect --reset
770 hg bisect --reset
771 hg bisect --bad 34
771 hg bisect --bad 34
772 hg bisect --good 12
772 hg bisect --good 12
773 hg bisect --command "make && make tests"
773 hg bisect --command "make && make tests"
774
774
775 - see all changesets whose states are already known in the current
775 - see all changesets whose states are already known in the current
776 bisection::
776 bisection::
777
777
778 hg log -r "bisect(pruned)"
778 hg log -r "bisect(pruned)"
779
779
780 - see the changeset currently being bisected (especially useful
780 - see the changeset currently being bisected (especially useful
781 if running with -U/--noupdate)::
781 if running with -U/--noupdate)::
782
782
783 hg log -r "bisect(current)"
783 hg log -r "bisect(current)"
784
784
785 - see all changesets that took part in the current bisection::
785 - see all changesets that took part in the current bisection::
786
786
787 hg log -r "bisect(range)"
787 hg log -r "bisect(range)"
788
788
789 - you can even get a nice graph::
789 - you can even get a nice graph::
790
790
791 hg log --graph -r "bisect(range)"
791 hg log --graph -r "bisect(range)"
792
792
793 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
793 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
794
794
795 Returns 0 on success.
795 Returns 0 on success.
796 """
796 """
797 # backward compatibility
797 # backward compatibility
798 if rev in "good bad reset init".split():
798 if rev in "good bad reset init".split():
799 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
799 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
800 cmd, rev, extra = rev, extra, None
800 cmd, rev, extra = rev, extra, None
801 if cmd == "good":
801 if cmd == "good":
802 good = True
802 good = True
803 elif cmd == "bad":
803 elif cmd == "bad":
804 bad = True
804 bad = True
805 else:
805 else:
806 reset = True
806 reset = True
807 elif extra:
807 elif extra:
808 raise error.Abort(_('incompatible arguments'))
808 raise error.Abort(_('incompatible arguments'))
809
809
810 incompatibles = {
810 incompatibles = {
811 '--bad': bad,
811 '--bad': bad,
812 '--command': bool(command),
812 '--command': bool(command),
813 '--extend': extend,
813 '--extend': extend,
814 '--good': good,
814 '--good': good,
815 '--reset': reset,
815 '--reset': reset,
816 '--skip': skip,
816 '--skip': skip,
817 }
817 }
818
818
819 enabled = [x for x in incompatibles if incompatibles[x]]
819 enabled = [x for x in incompatibles if incompatibles[x]]
820
820
821 if len(enabled) > 1:
821 if len(enabled) > 1:
822 raise error.Abort(_('%s and %s are incompatible') %
822 raise error.Abort(_('%s and %s are incompatible') %
823 tuple(sorted(enabled)[0:2]))
823 tuple(sorted(enabled)[0:2]))
824
824
825 if reset:
825 if reset:
826 hbisect.resetstate(repo)
826 hbisect.resetstate(repo)
827 return
827 return
828
828
829 state = hbisect.load_state(repo)
829 state = hbisect.load_state(repo)
830
830
831 # update state
831 # update state
832 if good or bad or skip:
832 if good or bad or skip:
833 if rev:
833 if rev:
834 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
834 nodes = [repo[i].node() for i in scmutil.revrange(repo, [rev])]
835 else:
835 else:
836 nodes = [repo.lookup('.')]
836 nodes = [repo.lookup('.')]
837 if good:
837 if good:
838 state['good'] += nodes
838 state['good'] += nodes
839 elif bad:
839 elif bad:
840 state['bad'] += nodes
840 state['bad'] += nodes
841 elif skip:
841 elif skip:
842 state['skip'] += nodes
842 state['skip'] += nodes
843 hbisect.save_state(repo, state)
843 hbisect.save_state(repo, state)
844 if not (state['good'] and state['bad']):
844 if not (state['good'] and state['bad']):
845 return
845 return
846
846
847 def mayupdate(repo, node, show_stats=True):
847 def mayupdate(repo, node, show_stats=True):
848 """common used update sequence"""
848 """common used update sequence"""
849 if noupdate:
849 if noupdate:
850 return
850 return
851 cmdutil.checkunfinished(repo)
851 cmdutil.checkunfinished(repo)
852 cmdutil.bailifchanged(repo)
852 cmdutil.bailifchanged(repo)
853 return hg.clean(repo, node, show_stats=show_stats)
853 return hg.clean(repo, node, show_stats=show_stats)
854
854
855 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
855 displayer = logcmdutil.changesetdisplayer(ui, repo, {})
856
856
857 if command:
857 if command:
858 changesets = 1
858 changesets = 1
859 if noupdate:
859 if noupdate:
860 try:
860 try:
861 node = state['current'][0]
861 node = state['current'][0]
862 except LookupError:
862 except LookupError:
863 raise error.Abort(_('current bisect revision is unknown - '
863 raise error.Abort(_('current bisect revision is unknown - '
864 'start a new bisect to fix'))
864 'start a new bisect to fix'))
865 else:
865 else:
866 node, p2 = repo.dirstate.parents()
866 node, p2 = repo.dirstate.parents()
867 if p2 != nullid:
867 if p2 != nullid:
868 raise error.Abort(_('current bisect revision is a merge'))
868 raise error.Abort(_('current bisect revision is a merge'))
869 if rev:
869 if rev:
870 node = repo[scmutil.revsingle(repo, rev, node)].node()
870 node = repo[scmutil.revsingle(repo, rev, node)].node()
871 try:
871 try:
872 while changesets:
872 while changesets:
873 # update state
873 # update state
874 state['current'] = [node]
874 state['current'] = [node]
875 hbisect.save_state(repo, state)
875 hbisect.save_state(repo, state)
876 status = ui.system(command, environ={'HG_NODE': hex(node)},
876 status = ui.system(command, environ={'HG_NODE': hex(node)},
877 blockedtag='bisect_check')
877 blockedtag='bisect_check')
878 if status == 125:
878 if status == 125:
879 transition = "skip"
879 transition = "skip"
880 elif status == 0:
880 elif status == 0:
881 transition = "good"
881 transition = "good"
882 # status < 0 means process was killed
882 # status < 0 means process was killed
883 elif status == 127:
883 elif status == 127:
884 raise error.Abort(_("failed to execute %s") % command)
884 raise error.Abort(_("failed to execute %s") % command)
885 elif status < 0:
885 elif status < 0:
886 raise error.Abort(_("%s killed") % command)
886 raise error.Abort(_("%s killed") % command)
887 else:
887 else:
888 transition = "bad"
888 transition = "bad"
889 state[transition].append(node)
889 state[transition].append(node)
890 ctx = repo[node]
890 ctx = repo[node]
891 ui.status(_('changeset %d:%s: %s\n') % (ctx.rev(), ctx,
891 ui.status(_('changeset %d:%s: %s\n') % (ctx.rev(), ctx,
892 transition))
892 transition))
893 hbisect.checkstate(state)
893 hbisect.checkstate(state)
894 # bisect
894 # bisect
895 nodes, changesets, bgood = hbisect.bisect(repo, state)
895 nodes, changesets, bgood = hbisect.bisect(repo, state)
896 # update to next check
896 # update to next check
897 node = nodes[0]
897 node = nodes[0]
898 mayupdate(repo, node, show_stats=False)
898 mayupdate(repo, node, show_stats=False)
899 finally:
899 finally:
900 state['current'] = [node]
900 state['current'] = [node]
901 hbisect.save_state(repo, state)
901 hbisect.save_state(repo, state)
902 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
902 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
903 return
903 return
904
904
905 hbisect.checkstate(state)
905 hbisect.checkstate(state)
906
906
907 # actually bisect
907 # actually bisect
908 nodes, changesets, good = hbisect.bisect(repo, state)
908 nodes, changesets, good = hbisect.bisect(repo, state)
909 if extend:
909 if extend:
910 if not changesets:
910 if not changesets:
911 extendnode = hbisect.extendrange(repo, state, nodes, good)
911 extendnode = hbisect.extendrange(repo, state, nodes, good)
912 if extendnode is not None:
912 if extendnode is not None:
913 ui.write(_("Extending search to changeset %d:%s\n")
913 ui.write(_("Extending search to changeset %d:%s\n")
914 % (extendnode.rev(), extendnode))
914 % (extendnode.rev(), extendnode))
915 state['current'] = [extendnode.node()]
915 state['current'] = [extendnode.node()]
916 hbisect.save_state(repo, state)
916 hbisect.save_state(repo, state)
917 return mayupdate(repo, extendnode.node())
917 return mayupdate(repo, extendnode.node())
918 raise error.Abort(_("nothing to extend"))
918 raise error.Abort(_("nothing to extend"))
919
919
920 if changesets == 0:
920 if changesets == 0:
921 hbisect.printresult(ui, repo, state, displayer, nodes, good)
921 hbisect.printresult(ui, repo, state, displayer, nodes, good)
922 else:
922 else:
923 assert len(nodes) == 1 # only a single node can be tested next
923 assert len(nodes) == 1 # only a single node can be tested next
924 node = nodes[0]
924 node = nodes[0]
925 # compute the approximate number of remaining tests
925 # compute the approximate number of remaining tests
926 tests, size = 0, 2
926 tests, size = 0, 2
927 while size <= changesets:
927 while size <= changesets:
928 tests, size = tests + 1, size * 2
928 tests, size = tests + 1, size * 2
929 rev = repo.changelog.rev(node)
929 rev = repo.changelog.rev(node)
930 ui.write(_("Testing changeset %d:%s "
930 ui.write(_("Testing changeset %d:%s "
931 "(%d changesets remaining, ~%d tests)\n")
931 "(%d changesets remaining, ~%d tests)\n")
932 % (rev, short(node), changesets, tests))
932 % (rev, short(node), changesets, tests))
933 state['current'] = [node]
933 state['current'] = [node]
934 hbisect.save_state(repo, state)
934 hbisect.save_state(repo, state)
935 return mayupdate(repo, node)
935 return mayupdate(repo, node)
936
936
937 @command('bookmarks|bookmark',
937 @command('bookmarks|bookmark',
938 [('f', 'force', False, _('force')),
938 [('f', 'force', False, _('force')),
939 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
939 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
940 ('d', 'delete', False, _('delete a given bookmark')),
940 ('d', 'delete', False, _('delete a given bookmark')),
941 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
941 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
942 ('i', 'inactive', False, _('mark a bookmark inactive')),
942 ('i', 'inactive', False, _('mark a bookmark inactive')),
943 ('l', 'list', False, _('list existing bookmarks')),
943 ('l', 'list', False, _('list existing bookmarks')),
944 ] + formatteropts,
944 ] + formatteropts,
945 _('hg bookmarks [OPTIONS]... [NAME]...'),
945 _('hg bookmarks [OPTIONS]... [NAME]...'),
946 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
946 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
947 def bookmark(ui, repo, *names, **opts):
947 def bookmark(ui, repo, *names, **opts):
948 '''create a new bookmark or list existing bookmarks
948 '''create a new bookmark or list existing bookmarks
949
949
950 Bookmarks are labels on changesets to help track lines of development.
950 Bookmarks are labels on changesets to help track lines of development.
951 Bookmarks are unversioned and can be moved, renamed and deleted.
951 Bookmarks are unversioned and can be moved, renamed and deleted.
952 Deleting or moving a bookmark has no effect on the associated changesets.
952 Deleting or moving a bookmark has no effect on the associated changesets.
953
953
954 Creating or updating to a bookmark causes it to be marked as 'active'.
954 Creating or updating to a bookmark causes it to be marked as 'active'.
955 The active bookmark is indicated with a '*'.
955 The active bookmark is indicated with a '*'.
956 When a commit is made, the active bookmark will advance to the new commit.
956 When a commit is made, the active bookmark will advance to the new commit.
957 A plain :hg:`update` will also advance an active bookmark, if possible.
957 A plain :hg:`update` will also advance an active bookmark, if possible.
958 Updating away from a bookmark will cause it to be deactivated.
958 Updating away from a bookmark will cause it to be deactivated.
959
959
960 Bookmarks can be pushed and pulled between repositories (see
960 Bookmarks can be pushed and pulled between repositories (see
961 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
961 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
962 diverged, a new 'divergent bookmark' of the form 'name@path' will
962 diverged, a new 'divergent bookmark' of the form 'name@path' will
963 be created. Using :hg:`merge` will resolve the divergence.
963 be created. Using :hg:`merge` will resolve the divergence.
964
964
965 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
965 Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying
966 the active bookmark's name.
966 the active bookmark's name.
967
967
968 A bookmark named '@' has the special property that :hg:`clone` will
968 A bookmark named '@' has the special property that :hg:`clone` will
969 check it out by default if it exists.
969 check it out by default if it exists.
970
970
971 .. container:: verbose
971 .. container:: verbose
972
972
973 Template:
973 Template:
974
974
975 The following keywords are supported in addition to the common template
975 The following keywords are supported in addition to the common template
976 keywords and functions such as ``{bookmark}``. See also
976 keywords and functions such as ``{bookmark}``. See also
977 :hg:`help templates`.
977 :hg:`help templates`.
978
978
979 :active: Boolean. True if the bookmark is active.
979 :active: Boolean. True if the bookmark is active.
980
980
981 Examples:
981 Examples:
982
982
983 - create an active bookmark for a new line of development::
983 - create an active bookmark for a new line of development::
984
984
985 hg book new-feature
985 hg book new-feature
986
986
987 - create an inactive bookmark as a place marker::
987 - create an inactive bookmark as a place marker::
988
988
989 hg book -i reviewed
989 hg book -i reviewed
990
990
991 - create an inactive bookmark on another changeset::
991 - create an inactive bookmark on another changeset::
992
992
993 hg book -r .^ tested
993 hg book -r .^ tested
994
994
995 - rename bookmark turkey to dinner::
995 - rename bookmark turkey to dinner::
996
996
997 hg book -m turkey dinner
997 hg book -m turkey dinner
998
998
999 - move the '@' bookmark from another branch::
999 - move the '@' bookmark from another branch::
1000
1000
1001 hg book -f @
1001 hg book -f @
1002
1002
1003 - print only the active bookmark name::
1003 - print only the active bookmark name::
1004
1004
1005 hg book -ql .
1005 hg book -ql .
1006 '''
1006 '''
1007 opts = pycompat.byteskwargs(opts)
1007 opts = pycompat.byteskwargs(opts)
1008 force = opts.get('force')
1008 force = opts.get('force')
1009 rev = opts.get('rev')
1009 rev = opts.get('rev')
1010 inactive = opts.get('inactive') # meaning add/rename to inactive bookmark
1010 inactive = opts.get('inactive') # meaning add/rename to inactive bookmark
1011
1011
1012 selactions = [k for k in ['delete', 'rename', 'list'] if opts.get(k)]
1012 selactions = [k for k in ['delete', 'rename', 'list'] if opts.get(k)]
1013 if len(selactions) > 1:
1013 if len(selactions) > 1:
1014 raise error.Abort(_('--%s and --%s are incompatible')
1014 raise error.Abort(_('--%s and --%s are incompatible')
1015 % tuple(selactions[:2]))
1015 % tuple(selactions[:2]))
1016 if selactions:
1016 if selactions:
1017 action = selactions[0]
1017 action = selactions[0]
1018 elif names or rev:
1018 elif names or rev:
1019 action = 'add'
1019 action = 'add'
1020 elif inactive:
1020 elif inactive:
1021 action = 'inactive' # meaning deactivate
1021 action = 'inactive' # meaning deactivate
1022 else:
1022 else:
1023 action = 'list'
1023 action = 'list'
1024
1024
1025 if rev and action in {'delete', 'rename', 'list'}:
1025 if rev and action in {'delete', 'rename', 'list'}:
1026 raise error.Abort(_("--rev is incompatible with --%s") % action)
1026 raise error.Abort(_("--rev is incompatible with --%s") % action)
1027 if inactive and action in {'delete', 'list'}:
1027 if inactive and action in {'delete', 'list'}:
1028 raise error.Abort(_("--inactive is incompatible with --%s") % action)
1028 raise error.Abort(_("--inactive is incompatible with --%s") % action)
1029 if not names and action in {'add', 'delete'}:
1029 if not names and action in {'add', 'delete'}:
1030 raise error.Abort(_("bookmark name required"))
1030 raise error.Abort(_("bookmark name required"))
1031
1031
1032 if action in {'add', 'delete', 'rename', 'inactive'}:
1032 if action in {'add', 'delete', 'rename', 'inactive'}:
1033 with repo.wlock(), repo.lock(), repo.transaction('bookmark') as tr:
1033 with repo.wlock(), repo.lock(), repo.transaction('bookmark') as tr:
1034 if action == 'delete':
1034 if action == 'delete':
1035 names = pycompat.maplist(repo._bookmarks.expandname, names)
1035 names = pycompat.maplist(repo._bookmarks.expandname, names)
1036 bookmarks.delete(repo, tr, names)
1036 bookmarks.delete(repo, tr, names)
1037 elif action == 'rename':
1037 elif action == 'rename':
1038 if not names:
1038 if not names:
1039 raise error.Abort(_("new bookmark name required"))
1039 raise error.Abort(_("new bookmark name required"))
1040 elif len(names) > 1:
1040 elif len(names) > 1:
1041 raise error.Abort(_("only one new bookmark name allowed"))
1041 raise error.Abort(_("only one new bookmark name allowed"))
1042 oldname = repo._bookmarks.expandname(opts['rename'])
1042 oldname = repo._bookmarks.expandname(opts['rename'])
1043 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1043 bookmarks.rename(repo, tr, oldname, names[0], force, inactive)
1044 elif action == 'add':
1044 elif action == 'add':
1045 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1045 bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
1046 elif action == 'inactive':
1046 elif action == 'inactive':
1047 if len(repo._bookmarks) == 0:
1047 if len(repo._bookmarks) == 0:
1048 ui.status(_("no bookmarks set\n"))
1048 ui.status(_("no bookmarks set\n"))
1049 elif not repo._activebookmark:
1049 elif not repo._activebookmark:
1050 ui.status(_("no active bookmark\n"))
1050 ui.status(_("no active bookmark\n"))
1051 else:
1051 else:
1052 bookmarks.deactivate(repo)
1052 bookmarks.deactivate(repo)
1053 elif action == 'list':
1053 elif action == 'list':
1054 names = pycompat.maplist(repo._bookmarks.expandname, names)
1054 names = pycompat.maplist(repo._bookmarks.expandname, names)
1055 with ui.formatter('bookmarks', opts) as fm:
1055 with ui.formatter('bookmarks', opts) as fm:
1056 bookmarks.printbookmarks(ui, repo, fm, names)
1056 bookmarks.printbookmarks(ui, repo, fm, names)
1057 else:
1057 else:
1058 raise error.ProgrammingError('invalid action: %s' % action)
1058 raise error.ProgrammingError('invalid action: %s' % action)
1059
1059
1060 @command('branch',
1060 @command('branch',
1061 [('f', 'force', None,
1061 [('f', 'force', None,
1062 _('set branch name even if it shadows an existing branch')),
1062 _('set branch name even if it shadows an existing branch')),
1063 ('C', 'clean', None, _('reset branch name to parent branch name')),
1063 ('C', 'clean', None, _('reset branch name to parent branch name')),
1064 ('r', 'rev', [], _('change branches of the given revs (EXPERIMENTAL)')),
1064 ('r', 'rev', [], _('change branches of the given revs (EXPERIMENTAL)')),
1065 ],
1065 ],
1066 _('[-fC] [NAME]'),
1066 _('[-fC] [NAME]'),
1067 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
1067 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
1068 def branch(ui, repo, label=None, **opts):
1068 def branch(ui, repo, label=None, **opts):
1069 """set or show the current branch name
1069 """set or show the current branch name
1070
1070
1071 .. note::
1071 .. note::
1072
1072
1073 Branch names are permanent and global. Use :hg:`bookmark` to create a
1073 Branch names are permanent and global. Use :hg:`bookmark` to create a
1074 light-weight bookmark instead. See :hg:`help glossary` for more
1074 light-weight bookmark instead. See :hg:`help glossary` for more
1075 information about named branches and bookmarks.
1075 information about named branches and bookmarks.
1076
1076
1077 With no argument, show the current branch name. With one argument,
1077 With no argument, show the current branch name. With one argument,
1078 set the working directory branch name (the branch will not exist
1078 set the working directory branch name (the branch will not exist
1079 in the repository until the next commit). Standard practice
1079 in the repository until the next commit). Standard practice
1080 recommends that primary development take place on the 'default'
1080 recommends that primary development take place on the 'default'
1081 branch.
1081 branch.
1082
1082
1083 Unless -f/--force is specified, branch will not let you set a
1083 Unless -f/--force is specified, branch will not let you set a
1084 branch name that already exists.
1084 branch name that already exists.
1085
1085
1086 Use -C/--clean to reset the working directory branch to that of
1086 Use -C/--clean to reset the working directory branch to that of
1087 the parent of the working directory, negating a previous branch
1087 the parent of the working directory, negating a previous branch
1088 change.
1088 change.
1089
1089
1090 Use the command :hg:`update` to switch to an existing branch. Use
1090 Use the command :hg:`update` to switch to an existing branch. Use
1091 :hg:`commit --close-branch` to mark this branch head as closed.
1091 :hg:`commit --close-branch` to mark this branch head as closed.
1092 When all heads of a branch are closed, the branch will be
1092 When all heads of a branch are closed, the branch will be
1093 considered closed.
1093 considered closed.
1094
1094
1095 Returns 0 on success.
1095 Returns 0 on success.
1096 """
1096 """
1097 opts = pycompat.byteskwargs(opts)
1097 opts = pycompat.byteskwargs(opts)
1098 revs = opts.get('rev')
1098 revs = opts.get('rev')
1099 if label:
1099 if label:
1100 label = label.strip()
1100 label = label.strip()
1101
1101
1102 if not opts.get('clean') and not label:
1102 if not opts.get('clean') and not label:
1103 if revs:
1103 if revs:
1104 raise error.Abort(_("no branch name specified for the revisions"))
1104 raise error.Abort(_("no branch name specified for the revisions"))
1105 ui.write("%s\n" % repo.dirstate.branch())
1105 ui.write("%s\n" % repo.dirstate.branch())
1106 return
1106 return
1107
1107
1108 with repo.wlock():
1108 with repo.wlock():
1109 if opts.get('clean'):
1109 if opts.get('clean'):
1110 label = repo['.'].branch()
1110 label = repo['.'].branch()
1111 repo.dirstate.setbranch(label)
1111 repo.dirstate.setbranch(label)
1112 ui.status(_('reset working directory to branch %s\n') % label)
1112 ui.status(_('reset working directory to branch %s\n') % label)
1113 elif label:
1113 elif label:
1114
1114
1115 scmutil.checknewlabel(repo, label, 'branch')
1115 scmutil.checknewlabel(repo, label, 'branch')
1116 if revs:
1116 if revs:
1117 return cmdutil.changebranch(ui, repo, revs, label)
1117 return cmdutil.changebranch(ui, repo, revs, label)
1118
1118
1119 if not opts.get('force') and label in repo.branchmap():
1119 if not opts.get('force') and label in repo.branchmap():
1120 if label not in [p.branch() for p in repo[None].parents()]:
1120 if label not in [p.branch() for p in repo[None].parents()]:
1121 raise error.Abort(_('a branch of the same name already'
1121 raise error.Abort(_('a branch of the same name already'
1122 ' exists'),
1122 ' exists'),
1123 # i18n: "it" refers to an existing branch
1123 # i18n: "it" refers to an existing branch
1124 hint=_("use 'hg update' to switch to it"))
1124 hint=_("use 'hg update' to switch to it"))
1125
1125
1126 repo.dirstate.setbranch(label)
1126 repo.dirstate.setbranch(label)
1127 ui.status(_('marked working directory as branch %s\n') % label)
1127 ui.status(_('marked working directory as branch %s\n') % label)
1128
1128
1129 # find any open named branches aside from default
1129 # find any open named branches aside from default
1130 for n, h, t, c in repo.branchmap().iterbranches():
1130 for n, h, t, c in repo.branchmap().iterbranches():
1131 if n != "default" and not c:
1131 if n != "default" and not c:
1132 return 0
1132 return 0
1133 ui.status(_('(branches are permanent and global, '
1133 ui.status(_('(branches are permanent and global, '
1134 'did you want a bookmark?)\n'))
1134 'did you want a bookmark?)\n'))
1135
1135
1136 @command('branches',
1136 @command('branches',
1137 [('a', 'active', False,
1137 [('a', 'active', False,
1138 _('show only branches that have unmerged heads (DEPRECATED)')),
1138 _('show only branches that have unmerged heads (DEPRECATED)')),
1139 ('c', 'closed', False, _('show normal and closed branches')),
1139 ('c', 'closed', False, _('show normal and closed branches')),
1140 ('r', 'rev', [], _('show branch name(s) of the given rev'))
1140 ('r', 'rev', [], _('show branch name(s) of the given rev'))
1141 ] + formatteropts,
1141 ] + formatteropts,
1142 _('[-c]'),
1142 _('[-c]'),
1143 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1143 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
1144 intents={INTENT_READONLY})
1144 intents={INTENT_READONLY})
1145 def branches(ui, repo, active=False, closed=False, **opts):
1145 def branches(ui, repo, active=False, closed=False, **opts):
1146 """list repository named branches
1146 """list repository named branches
1147
1147
1148 List the repository's named branches, indicating which ones are
1148 List the repository's named branches, indicating which ones are
1149 inactive. If -c/--closed is specified, also list branches which have
1149 inactive. If -c/--closed is specified, also list branches which have
1150 been marked closed (see :hg:`commit --close-branch`).
1150 been marked closed (see :hg:`commit --close-branch`).
1151
1151
1152 Use the command :hg:`update` to switch to an existing branch.
1152 Use the command :hg:`update` to switch to an existing branch.
1153
1153
1154 .. container:: verbose
1154 .. container:: verbose
1155
1155
1156 Template:
1156 Template:
1157
1157
1158 The following keywords are supported in addition to the common template
1158 The following keywords are supported in addition to the common template
1159 keywords and functions such as ``{branch}``. See also
1159 keywords and functions such as ``{branch}``. See also
1160 :hg:`help templates`.
1160 :hg:`help templates`.
1161
1161
1162 :active: Boolean. True if the branch is active.
1162 :active: Boolean. True if the branch is active.
1163 :closed: Boolean. True if the branch is closed.
1163 :closed: Boolean. True if the branch is closed.
1164 :current: Boolean. True if it is the current branch.
1164 :current: Boolean. True if it is the current branch.
1165
1165
1166 Returns 0.
1166 Returns 0.
1167 """
1167 """
1168
1168
1169 opts = pycompat.byteskwargs(opts)
1169 opts = pycompat.byteskwargs(opts)
1170 revs = opts.get('rev')
1170 revs = opts.get('rev')
1171 selectedbranches = None
1171 selectedbranches = None
1172 if revs:
1172 if revs:
1173 revs = scmutil.revrange(repo, revs)
1173 revs = scmutil.revrange(repo, revs)
1174 getbi = repo.revbranchcache().branchinfo
1174 getbi = repo.revbranchcache().branchinfo
1175 selectedbranches = {getbi(r)[0] for r in revs}
1175 selectedbranches = {getbi(r)[0] for r in revs}
1176
1176
1177 ui.pager('branches')
1177 ui.pager('branches')
1178 fm = ui.formatter('branches', opts)
1178 fm = ui.formatter('branches', opts)
1179 hexfunc = fm.hexfunc
1179 hexfunc = fm.hexfunc
1180
1180
1181 allheads = set(repo.heads())
1181 allheads = set(repo.heads())
1182 branches = []
1182 branches = []
1183 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1183 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1184 if selectedbranches is not None and tag not in selectedbranches:
1184 if selectedbranches is not None and tag not in selectedbranches:
1185 continue
1185 continue
1186 isactive = False
1186 isactive = False
1187 if not isclosed:
1187 if not isclosed:
1188 openheads = set(repo.branchmap().iteropen(heads))
1188 openheads = set(repo.branchmap().iteropen(heads))
1189 isactive = bool(openheads & allheads)
1189 isactive = bool(openheads & allheads)
1190 branches.append((tag, repo[tip], isactive, not isclosed))
1190 branches.append((tag, repo[tip], isactive, not isclosed))
1191 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1191 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1192 reverse=True)
1192 reverse=True)
1193
1193
1194 for tag, ctx, isactive, isopen in branches:
1194 for tag, ctx, isactive, isopen in branches:
1195 if active and not isactive:
1195 if active and not isactive:
1196 continue
1196 continue
1197 if isactive:
1197 if isactive:
1198 label = 'branches.active'
1198 label = 'branches.active'
1199 notice = ''
1199 notice = ''
1200 elif not isopen:
1200 elif not isopen:
1201 if not closed:
1201 if not closed:
1202 continue
1202 continue
1203 label = 'branches.closed'
1203 label = 'branches.closed'
1204 notice = _(' (closed)')
1204 notice = _(' (closed)')
1205 else:
1205 else:
1206 label = 'branches.inactive'
1206 label = 'branches.inactive'
1207 notice = _(' (inactive)')
1207 notice = _(' (inactive)')
1208 current = (tag == repo.dirstate.branch())
1208 current = (tag == repo.dirstate.branch())
1209 if current:
1209 if current:
1210 label = 'branches.current'
1210 label = 'branches.current'
1211
1211
1212 fm.startitem()
1212 fm.startitem()
1213 fm.write('branch', '%s', tag, label=label)
1213 fm.write('branch', '%s', tag, label=label)
1214 rev = ctx.rev()
1214 rev = ctx.rev()
1215 padsize = max(31 - len("%d" % rev) - encoding.colwidth(tag), 0)
1215 padsize = max(31 - len("%d" % rev) - encoding.colwidth(tag), 0)
1216 fmt = ' ' * padsize + ' %d:%s'
1216 fmt = ' ' * padsize + ' %d:%s'
1217 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1217 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1218 label='log.changeset changeset.%s' % ctx.phasestr())
1218 label='log.changeset changeset.%s' % ctx.phasestr())
1219 fm.context(ctx=ctx)
1219 fm.context(ctx=ctx)
1220 fm.data(active=isactive, closed=not isopen, current=current)
1220 fm.data(active=isactive, closed=not isopen, current=current)
1221 if not ui.quiet:
1221 if not ui.quiet:
1222 fm.plain(notice)
1222 fm.plain(notice)
1223 fm.plain('\n')
1223 fm.plain('\n')
1224 fm.end()
1224 fm.end()
1225
1225
1226 @command('bundle',
1226 @command('bundle',
1227 [('f', 'force', None, _('run even when the destination is unrelated')),
1227 [('f', 'force', None, _('run even when the destination is unrelated')),
1228 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1228 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1229 _('REV')),
1229 _('REV')),
1230 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1230 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1231 _('BRANCH')),
1231 _('BRANCH')),
1232 ('', 'base', [],
1232 ('', 'base', [],
1233 _('a base changeset assumed to be available at the destination'),
1233 _('a base changeset assumed to be available at the destination'),
1234 _('REV')),
1234 _('REV')),
1235 ('a', 'all', None, _('bundle all changesets in the repository')),
1235 ('a', 'all', None, _('bundle all changesets in the repository')),
1236 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1236 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1237 ] + remoteopts,
1237 ] + remoteopts,
1238 _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1238 _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),
1239 helpcategory=command.CATEGORY_IMPORT_EXPORT)
1239 helpcategory=command.CATEGORY_IMPORT_EXPORT)
1240 def bundle(ui, repo, fname, dest=None, **opts):
1240 def bundle(ui, repo, fname, dest=None, **opts):
1241 """create a bundle file
1241 """create a bundle file
1242
1242
1243 Generate a bundle file containing data to be transferred to another
1243 Generate a bundle file containing data to be transferred to another
1244 repository.
1244 repository.
1245
1245
1246 To create a bundle containing all changesets, use -a/--all
1246 To create a bundle containing all changesets, use -a/--all
1247 (or --base null). Otherwise, hg assumes the destination will have
1247 (or --base null). Otherwise, hg assumes the destination will have
1248 all the nodes you specify with --base parameters. Otherwise, hg
1248 all the nodes you specify with --base parameters. Otherwise, hg
1249 will assume the repository has all the nodes in destination, or
1249 will assume the repository has all the nodes in destination, or
1250 default-push/default if no destination is specified, where destination
1250 default-push/default if no destination is specified, where destination
1251 is the repository you provide through DEST option.
1251 is the repository you provide through DEST option.
1252
1252
1253 You can change bundle format with the -t/--type option. See
1253 You can change bundle format with the -t/--type option. See
1254 :hg:`help bundlespec` for documentation on this format. By default,
1254 :hg:`help bundlespec` for documentation on this format. By default,
1255 the most appropriate format is used and compression defaults to
1255 the most appropriate format is used and compression defaults to
1256 bzip2.
1256 bzip2.
1257
1257
1258 The bundle file can then be transferred using conventional means
1258 The bundle file can then be transferred using conventional means
1259 and applied to another repository with the unbundle or pull
1259 and applied to another repository with the unbundle or pull
1260 command. This is useful when direct push and pull are not
1260 command. This is useful when direct push and pull are not
1261 available or when exporting an entire repository is undesirable.
1261 available or when exporting an entire repository is undesirable.
1262
1262
1263 Applying bundles preserves all changeset contents including
1263 Applying bundles preserves all changeset contents including
1264 permissions, copy/rename information, and revision history.
1264 permissions, copy/rename information, and revision history.
1265
1265
1266 Returns 0 on success, 1 if no changes found.
1266 Returns 0 on success, 1 if no changes found.
1267 """
1267 """
1268 opts = pycompat.byteskwargs(opts)
1268 opts = pycompat.byteskwargs(opts)
1269 revs = None
1269 revs = None
1270 if 'rev' in opts:
1270 if 'rev' in opts:
1271 revstrings = opts['rev']
1271 revstrings = opts['rev']
1272 revs = scmutil.revrange(repo, revstrings)
1272 revs = scmutil.revrange(repo, revstrings)
1273 if revstrings and not revs:
1273 if revstrings and not revs:
1274 raise error.Abort(_('no commits to bundle'))
1274 raise error.Abort(_('no commits to bundle'))
1275
1275
1276 bundletype = opts.get('type', 'bzip2').lower()
1276 bundletype = opts.get('type', 'bzip2').lower()
1277 try:
1277 try:
1278 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1278 bundlespec = exchange.parsebundlespec(repo, bundletype, strict=False)
1279 except error.UnsupportedBundleSpecification as e:
1279 except error.UnsupportedBundleSpecification as e:
1280 raise error.Abort(pycompat.bytestr(e),
1280 raise error.Abort(pycompat.bytestr(e),
1281 hint=_("see 'hg help bundlespec' for supported "
1281 hint=_("see 'hg help bundlespec' for supported "
1282 "values for --type"))
1282 "values for --type"))
1283 cgversion = bundlespec.contentopts["cg.version"]
1283 cgversion = bundlespec.contentopts["cg.version"]
1284
1284
1285 # Packed bundles are a pseudo bundle format for now.
1285 # Packed bundles are a pseudo bundle format for now.
1286 if cgversion == 's1':
1286 if cgversion == 's1':
1287 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1287 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1288 hint=_("use 'hg debugcreatestreamclonebundle'"))
1288 hint=_("use 'hg debugcreatestreamclonebundle'"))
1289
1289
1290 if opts.get('all'):
1290 if opts.get('all'):
1291 if dest:
1291 if dest:
1292 raise error.Abort(_("--all is incompatible with specifying "
1292 raise error.Abort(_("--all is incompatible with specifying "
1293 "a destination"))
1293 "a destination"))
1294 if opts.get('base'):
1294 if opts.get('base'):
1295 ui.warn(_("ignoring --base because --all was specified\n"))
1295 ui.warn(_("ignoring --base because --all was specified\n"))
1296 base = [nullrev]
1296 base = [nullrev]
1297 else:
1297 else:
1298 base = scmutil.revrange(repo, opts.get('base'))
1298 base = scmutil.revrange(repo, opts.get('base'))
1299 if cgversion not in changegroup.supportedoutgoingversions(repo):
1299 if cgversion not in changegroup.supportedoutgoingversions(repo):
1300 raise error.Abort(_("repository does not support bundle version %s") %
1300 raise error.Abort(_("repository does not support bundle version %s") %
1301 cgversion)
1301 cgversion)
1302
1302
1303 if base:
1303 if base:
1304 if dest:
1304 if dest:
1305 raise error.Abort(_("--base is incompatible with specifying "
1305 raise error.Abort(_("--base is incompatible with specifying "
1306 "a destination"))
1306 "a destination"))
1307 common = [repo[rev].node() for rev in base]
1307 common = [repo[rev].node() for rev in base]
1308 heads = [repo[r].node() for r in revs] if revs else None
1308 heads = [repo[r].node() for r in revs] if revs else None
1309 outgoing = discovery.outgoing(repo, common, heads)
1309 outgoing = discovery.outgoing(repo, common, heads)
1310 else:
1310 else:
1311 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1311 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1312 dest, branches = hg.parseurl(dest, opts.get('branch'))
1312 dest, branches = hg.parseurl(dest, opts.get('branch'))
1313 other = hg.peer(repo, opts, dest)
1313 other = hg.peer(repo, opts, dest)
1314 revs = [repo[r].hex() for r in revs]
1314 revs = [repo[r].hex() for r in revs]
1315 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1315 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1316 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1316 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1317 outgoing = discovery.findcommonoutgoing(repo, other,
1317 outgoing = discovery.findcommonoutgoing(repo, other,
1318 onlyheads=heads,
1318 onlyheads=heads,
1319 force=opts.get('force'),
1319 force=opts.get('force'),
1320 portable=True)
1320 portable=True)
1321
1321
1322 if not outgoing.missing:
1322 if not outgoing.missing:
1323 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1323 scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)
1324 return 1
1324 return 1
1325
1325
1326 if cgversion == '01': #bundle1
1326 if cgversion == '01': #bundle1
1327 bversion = 'HG10' + bundlespec.wirecompression
1327 bversion = 'HG10' + bundlespec.wirecompression
1328 bcompression = None
1328 bcompression = None
1329 elif cgversion in ('02', '03'):
1329 elif cgversion in ('02', '03'):
1330 bversion = 'HG20'
1330 bversion = 'HG20'
1331 bcompression = bundlespec.wirecompression
1331 bcompression = bundlespec.wirecompression
1332 else:
1332 else:
1333 raise error.ProgrammingError(
1333 raise error.ProgrammingError(
1334 'bundle: unexpected changegroup version %s' % cgversion)
1334 'bundle: unexpected changegroup version %s' % cgversion)
1335
1335
1336 # TODO compression options should be derived from bundlespec parsing.
1336 # TODO compression options should be derived from bundlespec parsing.
1337 # This is a temporary hack to allow adjusting bundle compression
1337 # This is a temporary hack to allow adjusting bundle compression
1338 # level without a) formalizing the bundlespec changes to declare it
1338 # level without a) formalizing the bundlespec changes to declare it
1339 # b) introducing a command flag.
1339 # b) introducing a command flag.
1340 compopts = {}
1340 compopts = {}
1341 complevel = ui.configint('experimental',
1341 complevel = ui.configint('experimental',
1342 'bundlecomplevel.' + bundlespec.compression)
1342 'bundlecomplevel.' + bundlespec.compression)
1343 if complevel is None:
1343 if complevel is None:
1344 complevel = ui.configint('experimental', 'bundlecomplevel')
1344 complevel = ui.configint('experimental', 'bundlecomplevel')
1345 if complevel is not None:
1345 if complevel is not None:
1346 compopts['level'] = complevel
1346 compopts['level'] = complevel
1347
1347
1348 # Allow overriding the bundling of obsmarker in phases through
1348 # Allow overriding the bundling of obsmarker in phases through
1349 # configuration while we don't have a bundle version that include them
1349 # configuration while we don't have a bundle version that include them
1350 if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'):
1350 if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'):
1351 bundlespec.contentopts['obsolescence'] = True
1351 bundlespec.contentopts['obsolescence'] = True
1352 if repo.ui.configbool('experimental', 'bundle-phases'):
1352 if repo.ui.configbool('experimental', 'bundle-phases'):
1353 bundlespec.contentopts['phases'] = True
1353 bundlespec.contentopts['phases'] = True
1354
1354
1355 bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing,
1355 bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing,
1356 bundlespec.contentopts, compression=bcompression,
1356 bundlespec.contentopts, compression=bcompression,
1357 compopts=compopts)
1357 compopts=compopts)
1358
1358
1359 @command('cat',
1359 @command('cat',
1360 [('o', 'output', '',
1360 [('o', 'output', '',
1361 _('print output to file with formatted name'), _('FORMAT')),
1361 _('print output to file with formatted name'), _('FORMAT')),
1362 ('r', 'rev', '', _('print the given revision'), _('REV')),
1362 ('r', 'rev', '', _('print the given revision'), _('REV')),
1363 ('', 'decode', None, _('apply any matching decode filter')),
1363 ('', 'decode', None, _('apply any matching decode filter')),
1364 ] + walkopts + formatteropts,
1364 ] + walkopts + formatteropts,
1365 _('[OPTION]... FILE...'),
1365 _('[OPTION]... FILE...'),
1366 helpcategory=command.CATEGORY_FILE_CONTENTS,
1366 helpcategory=command.CATEGORY_FILE_CONTENTS,
1367 inferrepo=True,
1367 inferrepo=True,
1368 intents={INTENT_READONLY})
1368 intents={INTENT_READONLY})
1369 def cat(ui, repo, file1, *pats, **opts):
1369 def cat(ui, repo, file1, *pats, **opts):
1370 """output the current or given revision of files
1370 """output the current or given revision of files
1371
1371
1372 Print the specified files as they were at the given revision. If
1372 Print the specified files as they were at the given revision. If
1373 no revision is given, the parent of the working directory is used.
1373 no revision is given, the parent of the working directory is used.
1374
1374
1375 Output may be to a file, in which case the name of the file is
1375 Output may be to a file, in which case the name of the file is
1376 given using a template string. See :hg:`help templates`. In addition
1376 given using a template string. See :hg:`help templates`. In addition
1377 to the common template keywords, the following formatting rules are
1377 to the common template keywords, the following formatting rules are
1378 supported:
1378 supported:
1379
1379
1380 :``%%``: literal "%" character
1380 :``%%``: literal "%" character
1381 :``%s``: basename of file being printed
1381 :``%s``: basename of file being printed
1382 :``%d``: dirname of file being printed, or '.' if in repository root
1382 :``%d``: dirname of file being printed, or '.' if in repository root
1383 :``%p``: root-relative path name of file being printed
1383 :``%p``: root-relative path name of file being printed
1384 :``%H``: changeset hash (40 hexadecimal digits)
1384 :``%H``: changeset hash (40 hexadecimal digits)
1385 :``%R``: changeset revision number
1385 :``%R``: changeset revision number
1386 :``%h``: short-form changeset hash (12 hexadecimal digits)
1386 :``%h``: short-form changeset hash (12 hexadecimal digits)
1387 :``%r``: zero-padded changeset revision number
1387 :``%r``: zero-padded changeset revision number
1388 :``%b``: basename of the exporting repository
1388 :``%b``: basename of the exporting repository
1389 :``\\``: literal "\\" character
1389 :``\\``: literal "\\" character
1390
1390
1391 .. container:: verbose
1391 .. container:: verbose
1392
1392
1393 Template:
1393 Template:
1394
1394
1395 The following keywords are supported in addition to the common template
1395 The following keywords are supported in addition to the common template
1396 keywords and functions. See also :hg:`help templates`.
1396 keywords and functions. See also :hg:`help templates`.
1397
1397
1398 :data: String. File content.
1398 :data: String. File content.
1399 :path: String. Repository-absolute path of the file.
1399 :path: String. Repository-absolute path of the file.
1400
1400
1401 Returns 0 on success.
1401 Returns 0 on success.
1402 """
1402 """
1403 opts = pycompat.byteskwargs(opts)
1403 opts = pycompat.byteskwargs(opts)
1404 rev = opts.get('rev')
1404 rev = opts.get('rev')
1405 if rev:
1405 if rev:
1406 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
1406 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
1407 ctx = scmutil.revsingle(repo, rev)
1407 ctx = scmutil.revsingle(repo, rev)
1408 m = scmutil.match(ctx, (file1,) + pats, opts)
1408 m = scmutil.match(ctx, (file1,) + pats, opts)
1409 fntemplate = opts.pop('output', '')
1409 fntemplate = opts.pop('output', '')
1410 if cmdutil.isstdiofilename(fntemplate):
1410 if cmdutil.isstdiofilename(fntemplate):
1411 fntemplate = ''
1411 fntemplate = ''
1412
1412
1413 if fntemplate:
1413 if fntemplate:
1414 fm = formatter.nullformatter(ui, 'cat', opts)
1414 fm = formatter.nullformatter(ui, 'cat', opts)
1415 else:
1415 else:
1416 ui.pager('cat')
1416 ui.pager('cat')
1417 fm = ui.formatter('cat', opts)
1417 fm = ui.formatter('cat', opts)
1418 with fm:
1418 with fm:
1419 return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '',
1419 return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '',
1420 **pycompat.strkwargs(opts))
1420 **pycompat.strkwargs(opts))
1421
1421
1422 @command('clone',
1422 @command('clone',
1423 [('U', 'noupdate', None, _('the clone will include an empty working '
1423 [('U', 'noupdate', None, _('the clone will include an empty working '
1424 'directory (only a repository)')),
1424 'directory (only a repository)')),
1425 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1425 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1426 _('REV')),
1426 _('REV')),
1427 ('r', 'rev', [], _('do not clone everything, but include this changeset'
1427 ('r', 'rev', [], _('do not clone everything, but include this changeset'
1428 ' and its ancestors'), _('REV')),
1428 ' and its ancestors'), _('REV')),
1429 ('b', 'branch', [], _('do not clone everything, but include this branch\'s'
1429 ('b', 'branch', [], _('do not clone everything, but include this branch\'s'
1430 ' changesets and their ancestors'), _('BRANCH')),
1430 ' changesets and their ancestors'), _('BRANCH')),
1431 ('', 'pull', None, _('use pull protocol to copy metadata')),
1431 ('', 'pull', None, _('use pull protocol to copy metadata')),
1432 ('', 'uncompressed', None,
1432 ('', 'uncompressed', None,
1433 _('an alias to --stream (DEPRECATED)')),
1433 _('an alias to --stream (DEPRECATED)')),
1434 ('', 'stream', None,
1434 ('', 'stream', None,
1435 _('clone with minimal data processing')),
1435 _('clone with minimal data processing')),
1436 ] + remoteopts,
1436 ] + remoteopts,
1437 _('[OPTION]... SOURCE [DEST]'),
1437 _('[OPTION]... SOURCE [DEST]'),
1438 helpcategory=command.CATEGORY_REPO_CREATION,
1438 helpcategory=command.CATEGORY_REPO_CREATION,
1439 helpbasic=True, norepo=True)
1439 helpbasic=True, norepo=True)
1440 def clone(ui, source, dest=None, **opts):
1440 def clone(ui, source, dest=None, **opts):
1441 """make a copy of an existing repository
1441 """make a copy of an existing repository
1442
1442
1443 Create a copy of an existing repository in a new directory.
1443 Create a copy of an existing repository in a new directory.
1444
1444
1445 If no destination directory name is specified, it defaults to the
1445 If no destination directory name is specified, it defaults to the
1446 basename of the source.
1446 basename of the source.
1447
1447
1448 The location of the source is added to the new repository's
1448 The location of the source is added to the new repository's
1449 ``.hg/hgrc`` file, as the default to be used for future pulls.
1449 ``.hg/hgrc`` file, as the default to be used for future pulls.
1450
1450
1451 Only local paths and ``ssh://`` URLs are supported as
1451 Only local paths and ``ssh://`` URLs are supported as
1452 destinations. For ``ssh://`` destinations, no working directory or
1452 destinations. For ``ssh://`` destinations, no working directory or
1453 ``.hg/hgrc`` will be created on the remote side.
1453 ``.hg/hgrc`` will be created on the remote side.
1454
1454
1455 If the source repository has a bookmark called '@' set, that
1455 If the source repository has a bookmark called '@' set, that
1456 revision will be checked out in the new repository by default.
1456 revision will be checked out in the new repository by default.
1457
1457
1458 To check out a particular version, use -u/--update, or
1458 To check out a particular version, use -u/--update, or
1459 -U/--noupdate to create a clone with no working directory.
1459 -U/--noupdate to create a clone with no working directory.
1460
1460
1461 To pull only a subset of changesets, specify one or more revisions
1461 To pull only a subset of changesets, specify one or more revisions
1462 identifiers with -r/--rev or branches with -b/--branch. The
1462 identifiers with -r/--rev or branches with -b/--branch. The
1463 resulting clone will contain only the specified changesets and
1463 resulting clone will contain only the specified changesets and
1464 their ancestors. These options (or 'clone src#rev dest') imply
1464 their ancestors. These options (or 'clone src#rev dest') imply
1465 --pull, even for local source repositories.
1465 --pull, even for local source repositories.
1466
1466
1467 In normal clone mode, the remote normalizes repository data into a common
1467 In normal clone mode, the remote normalizes repository data into a common
1468 exchange format and the receiving end translates this data into its local
1468 exchange format and the receiving end translates this data into its local
1469 storage format. --stream activates a different clone mode that essentially
1469 storage format. --stream activates a different clone mode that essentially
1470 copies repository files from the remote with minimal data processing. This
1470 copies repository files from the remote with minimal data processing. This
1471 significantly reduces the CPU cost of a clone both remotely and locally.
1471 significantly reduces the CPU cost of a clone both remotely and locally.
1472 However, it often increases the transferred data size by 30-40%. This can
1472 However, it often increases the transferred data size by 30-40%. This can
1473 result in substantially faster clones where I/O throughput is plentiful,
1473 result in substantially faster clones where I/O throughput is plentiful,
1474 especially for larger repositories. A side-effect of --stream clones is
1474 especially for larger repositories. A side-effect of --stream clones is
1475 that storage settings and requirements on the remote are applied locally:
1475 that storage settings and requirements on the remote are applied locally:
1476 a modern client may inherit legacy or inefficient storage used by the
1476 a modern client may inherit legacy or inefficient storage used by the
1477 remote or a legacy Mercurial client may not be able to clone from a
1477 remote or a legacy Mercurial client may not be able to clone from a
1478 modern Mercurial remote.
1478 modern Mercurial remote.
1479
1479
1480 .. note::
1480 .. note::
1481
1481
1482 Specifying a tag will include the tagged changeset but not the
1482 Specifying a tag will include the tagged changeset but not the
1483 changeset containing the tag.
1483 changeset containing the tag.
1484
1484
1485 .. container:: verbose
1485 .. container:: verbose
1486
1486
1487 For efficiency, hardlinks are used for cloning whenever the
1487 For efficiency, hardlinks are used for cloning whenever the
1488 source and destination are on the same filesystem (note this
1488 source and destination are on the same filesystem (note this
1489 applies only to the repository data, not to the working
1489 applies only to the repository data, not to the working
1490 directory). Some filesystems, such as AFS, implement hardlinking
1490 directory). Some filesystems, such as AFS, implement hardlinking
1491 incorrectly, but do not report errors. In these cases, use the
1491 incorrectly, but do not report errors. In these cases, use the
1492 --pull option to avoid hardlinking.
1492 --pull option to avoid hardlinking.
1493
1493
1494 Mercurial will update the working directory to the first applicable
1494 Mercurial will update the working directory to the first applicable
1495 revision from this list:
1495 revision from this list:
1496
1496
1497 a) null if -U or the source repository has no changesets
1497 a) null if -U or the source repository has no changesets
1498 b) if -u . and the source repository is local, the first parent of
1498 b) if -u . and the source repository is local, the first parent of
1499 the source repository's working directory
1499 the source repository's working directory
1500 c) the changeset specified with -u (if a branch name, this means the
1500 c) the changeset specified with -u (if a branch name, this means the
1501 latest head of that branch)
1501 latest head of that branch)
1502 d) the changeset specified with -r
1502 d) the changeset specified with -r
1503 e) the tipmost head specified with -b
1503 e) the tipmost head specified with -b
1504 f) the tipmost head specified with the url#branch source syntax
1504 f) the tipmost head specified with the url#branch source syntax
1505 g) the revision marked with the '@' bookmark, if present
1505 g) the revision marked with the '@' bookmark, if present
1506 h) the tipmost head of the default branch
1506 h) the tipmost head of the default branch
1507 i) tip
1507 i) tip
1508
1508
1509 When cloning from servers that support it, Mercurial may fetch
1509 When cloning from servers that support it, Mercurial may fetch
1510 pre-generated data from a server-advertised URL or inline from the
1510 pre-generated data from a server-advertised URL or inline from the
1511 same stream. When this is done, hooks operating on incoming changesets
1511 same stream. When this is done, hooks operating on incoming changesets
1512 and changegroups may fire more than once, once for each pre-generated
1512 and changegroups may fire more than once, once for each pre-generated
1513 bundle and as well as for any additional remaining data. In addition,
1513 bundle and as well as for any additional remaining data. In addition,
1514 if an error occurs, the repository may be rolled back to a partial
1514 if an error occurs, the repository may be rolled back to a partial
1515 clone. This behavior may change in future releases.
1515 clone. This behavior may change in future releases.
1516 See :hg:`help -e clonebundles` for more.
1516 See :hg:`help -e clonebundles` for more.
1517
1517
1518 Examples:
1518 Examples:
1519
1519
1520 - clone a remote repository to a new directory named hg/::
1520 - clone a remote repository to a new directory named hg/::
1521
1521
1522 hg clone https://www.mercurial-scm.org/repo/hg/
1522 hg clone https://www.mercurial-scm.org/repo/hg/
1523
1523
1524 - create a lightweight local clone::
1524 - create a lightweight local clone::
1525
1525
1526 hg clone project/ project-feature/
1526 hg clone project/ project-feature/
1527
1527
1528 - clone from an absolute path on an ssh server (note double-slash)::
1528 - clone from an absolute path on an ssh server (note double-slash)::
1529
1529
1530 hg clone ssh://user@server//home/projects/alpha/
1530 hg clone ssh://user@server//home/projects/alpha/
1531
1531
1532 - do a streaming clone while checking out a specified version::
1532 - do a streaming clone while checking out a specified version::
1533
1533
1534 hg clone --stream http://server/repo -u 1.5
1534 hg clone --stream http://server/repo -u 1.5
1535
1535
1536 - create a repository without changesets after a particular revision::
1536 - create a repository without changesets after a particular revision::
1537
1537
1538 hg clone -r 04e544 experimental/ good/
1538 hg clone -r 04e544 experimental/ good/
1539
1539
1540 - clone (and track) a particular named branch::
1540 - clone (and track) a particular named branch::
1541
1541
1542 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1542 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1543
1543
1544 See :hg:`help urls` for details on specifying URLs.
1544 See :hg:`help urls` for details on specifying URLs.
1545
1545
1546 Returns 0 on success.
1546 Returns 0 on success.
1547 """
1547 """
1548 opts = pycompat.byteskwargs(opts)
1548 opts = pycompat.byteskwargs(opts)
1549 if opts.get('noupdate') and opts.get('updaterev'):
1549 if opts.get('noupdate') and opts.get('updaterev'):
1550 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1550 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1551
1551
1552 # --include/--exclude can come from narrow or sparse.
1552 # --include/--exclude can come from narrow or sparse.
1553 includepats, excludepats = None, None
1553 includepats, excludepats = None, None
1554
1554
1555 # hg.clone() differentiates between None and an empty set. So make sure
1555 # hg.clone() differentiates between None and an empty set. So make sure
1556 # patterns are sets if narrow is requested without patterns.
1556 # patterns are sets if narrow is requested without patterns.
1557 if opts.get('narrow'):
1557 if opts.get('narrow'):
1558 includepats = set()
1558 includepats = set()
1559 excludepats = set()
1559 excludepats = set()
1560
1560
1561 if opts.get('include'):
1561 if opts.get('include'):
1562 includepats = narrowspec.parsepatterns(opts.get('include'))
1562 includepats = narrowspec.parsepatterns(opts.get('include'))
1563 if opts.get('exclude'):
1563 if opts.get('exclude'):
1564 excludepats = narrowspec.parsepatterns(opts.get('exclude'))
1564 excludepats = narrowspec.parsepatterns(opts.get('exclude'))
1565
1565
1566 r = hg.clone(ui, opts, source, dest,
1566 r = hg.clone(ui, opts, source, dest,
1567 pull=opts.get('pull'),
1567 pull=opts.get('pull'),
1568 stream=opts.get('stream') or opts.get('uncompressed'),
1568 stream=opts.get('stream') or opts.get('uncompressed'),
1569 revs=opts.get('rev'),
1569 revs=opts.get('rev'),
1570 update=opts.get('updaterev') or not opts.get('noupdate'),
1570 update=opts.get('updaterev') or not opts.get('noupdate'),
1571 branch=opts.get('branch'),
1571 branch=opts.get('branch'),
1572 shareopts=opts.get('shareopts'),
1572 shareopts=opts.get('shareopts'),
1573 storeincludepats=includepats,
1573 storeincludepats=includepats,
1574 storeexcludepats=excludepats,
1574 storeexcludepats=excludepats,
1575 depth=opts.get('depth') or None)
1575 depth=opts.get('depth') or None)
1576
1576
1577 return r is None
1577 return r is None
1578
1578
1579 @command('commit|ci',
1579 @command('commit|ci',
1580 [('A', 'addremove', None,
1580 [('A', 'addremove', None,
1581 _('mark new/missing files as added/removed before committing')),
1581 _('mark new/missing files as added/removed before committing')),
1582 ('', 'close-branch', None,
1582 ('', 'close-branch', None,
1583 _('mark a branch head as closed')),
1583 _('mark a branch head as closed')),
1584 ('', 'amend', None, _('amend the parent of the working directory')),
1584 ('', 'amend', None, _('amend the parent of the working directory')),
1585 ('s', 'secret', None, _('use the secret phase for committing')),
1585 ('s', 'secret', None, _('use the secret phase for committing')),
1586 ('e', 'edit', None, _('invoke editor on commit messages')),
1586 ('e', 'edit', None, _('invoke editor on commit messages')),
1587 ('', 'force-close-branch', None,
1587 ('', 'force-close-branch', None,
1588 _('forcibly close branch from a non-head changeset (ADVANCED)')),
1588 _('forcibly close branch from a non-head changeset (ADVANCED)')),
1589 ('i', 'interactive', None, _('use interactive mode')),
1589 ('i', 'interactive', None, _('use interactive mode')),
1590 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1590 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1591 _('[OPTION]... [FILE]...'),
1591 _('[OPTION]... [FILE]...'),
1592 helpcategory=command.CATEGORY_COMMITTING, helpbasic=True,
1592 helpcategory=command.CATEGORY_COMMITTING, helpbasic=True,
1593 inferrepo=True)
1593 inferrepo=True)
1594 def commit(ui, repo, *pats, **opts):
1594 def commit(ui, repo, *pats, **opts):
1595 """commit the specified files or all outstanding changes
1595 """commit the specified files or all outstanding changes
1596
1596
1597 Commit changes to the given files into the repository. Unlike a
1597 Commit changes to the given files into the repository. Unlike a
1598 centralized SCM, this operation is a local operation. See
1598 centralized SCM, this operation is a local operation. See
1599 :hg:`push` for a way to actively distribute your changes.
1599 :hg:`push` for a way to actively distribute your changes.
1600
1600
1601 If a list of files is omitted, all changes reported by :hg:`status`
1601 If a list of files is omitted, all changes reported by :hg:`status`
1602 will be committed.
1602 will be committed.
1603
1603
1604 If you are committing the result of a merge, do not provide any
1604 If you are committing the result of a merge, do not provide any
1605 filenames or -I/-X filters.
1605 filenames or -I/-X filters.
1606
1606
1607 If no commit message is specified, Mercurial starts your
1607 If no commit message is specified, Mercurial starts your
1608 configured editor where you can enter a message. In case your
1608 configured editor where you can enter a message. In case your
1609 commit fails, you will find a backup of your message in
1609 commit fails, you will find a backup of your message in
1610 ``.hg/last-message.txt``.
1610 ``.hg/last-message.txt``.
1611
1611
1612 The --close-branch flag can be used to mark the current branch
1612 The --close-branch flag can be used to mark the current branch
1613 head closed. When all heads of a branch are closed, the branch
1613 head closed. When all heads of a branch are closed, the branch
1614 will be considered closed and no longer listed.
1614 will be considered closed and no longer listed.
1615
1615
1616 The --amend flag can be used to amend the parent of the
1616 The --amend flag can be used to amend the parent of the
1617 working directory with a new commit that contains the changes
1617 working directory with a new commit that contains the changes
1618 in the parent in addition to those currently reported by :hg:`status`,
1618 in the parent in addition to those currently reported by :hg:`status`,
1619 if there are any. The old commit is stored in a backup bundle in
1619 if there are any. The old commit is stored in a backup bundle in
1620 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1620 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1621 on how to restore it).
1621 on how to restore it).
1622
1622
1623 Message, user and date are taken from the amended commit unless
1623 Message, user and date are taken from the amended commit unless
1624 specified. When a message isn't specified on the command line,
1624 specified. When a message isn't specified on the command line,
1625 the editor will open with the message of the amended commit.
1625 the editor will open with the message of the amended commit.
1626
1626
1627 It is not possible to amend public changesets (see :hg:`help phases`)
1627 It is not possible to amend public changesets (see :hg:`help phases`)
1628 or changesets that have children.
1628 or changesets that have children.
1629
1629
1630 See :hg:`help dates` for a list of formats valid for -d/--date.
1630 See :hg:`help dates` for a list of formats valid for -d/--date.
1631
1631
1632 Returns 0 on success, 1 if nothing changed.
1632 Returns 0 on success, 1 if nothing changed.
1633
1633
1634 .. container:: verbose
1634 .. container:: verbose
1635
1635
1636 Examples:
1636 Examples:
1637
1637
1638 - commit all files ending in .py::
1638 - commit all files ending in .py::
1639
1639
1640 hg commit --include "set:**.py"
1640 hg commit --include "set:**.py"
1641
1641
1642 - commit all non-binary files::
1642 - commit all non-binary files::
1643
1643
1644 hg commit --exclude "set:binary()"
1644 hg commit --exclude "set:binary()"
1645
1645
1646 - amend the current commit and set the date to now::
1646 - amend the current commit and set the date to now::
1647
1647
1648 hg commit --amend --date now
1648 hg commit --amend --date now
1649 """
1649 """
1650 with repo.wlock(), repo.lock():
1650 with repo.wlock(), repo.lock():
1651 return _docommit(ui, repo, *pats, **opts)
1651 return _docommit(ui, repo, *pats, **opts)
1652
1652
1653 def _docommit(ui, repo, *pats, **opts):
1653 def _docommit(ui, repo, *pats, **opts):
1654 if opts.get(r'interactive'):
1654 if opts.get(r'interactive'):
1655 opts.pop(r'interactive')
1655 opts.pop(r'interactive')
1656 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1656 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1657 cmdutil.recordfilter, *pats,
1657 cmdutil.recordfilter, *pats,
1658 **opts)
1658 **opts)
1659 # ret can be 0 (no changes to record) or the value returned by
1659 # ret can be 0 (no changes to record) or the value returned by
1660 # commit(), 1 if nothing changed or None on success.
1660 # commit(), 1 if nothing changed or None on success.
1661 return 1 if ret == 0 else ret
1661 return 1 if ret == 0 else ret
1662
1662
1663 opts = pycompat.byteskwargs(opts)
1663 opts = pycompat.byteskwargs(opts)
1664 if opts.get('subrepos'):
1664 if opts.get('subrepos'):
1665 if opts.get('amend'):
1665 if opts.get('amend'):
1666 raise error.Abort(_('cannot amend with --subrepos'))
1666 raise error.Abort(_('cannot amend with --subrepos'))
1667 # Let --subrepos on the command line override config setting.
1667 # Let --subrepos on the command line override config setting.
1668 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1668 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1669
1669
1670 cmdutil.checkunfinished(repo, commit=True)
1670 cmdutil.checkunfinished(repo, commit=True)
1671
1671
1672 branch = repo[None].branch()
1672 branch = repo[None].branch()
1673 bheads = repo.branchheads(branch)
1673 bheads = repo.branchheads(branch)
1674
1674
1675 extra = {}
1675 extra = {}
1676 if opts.get('close_branch') or opts.get('force_close_branch'):
1676 if opts.get('close_branch') or opts.get('force_close_branch'):
1677 extra['close'] = '1'
1677 extra['close'] = '1'
1678
1678
1679 if repo['.'].closesbranch():
1679 if repo['.'].closesbranch():
1680 raise error.Abort(_('current revision is already a branch closing'
1680 raise error.Abort(_('current revision is already a branch closing'
1681 ' head'))
1681 ' head'))
1682 elif not bheads:
1682 elif not bheads:
1683 raise error.Abort(_('branch "%s" has no heads to close') % branch)
1683 raise error.Abort(_('branch "%s" has no heads to close') % branch)
1684 elif (branch == repo['.'].branch() and repo['.'].node() not in bheads
1684 elif (branch == repo['.'].branch() and repo['.'].node() not in bheads
1685 and not opts.get('force_close_branch')):
1685 and not opts.get('force_close_branch')):
1686 hint = _('use --force-close-branch to close branch from a non-head'
1686 hint = _('use --force-close-branch to close branch from a non-head'
1687 ' changeset')
1687 ' changeset')
1688 raise error.Abort(_('can only close branch heads'), hint=hint)
1688 raise error.Abort(_('can only close branch heads'), hint=hint)
1689 elif opts.get('amend'):
1689 elif opts.get('amend'):
1690 if (repo['.'].p1().branch() != branch and
1690 if (repo['.'].p1().branch() != branch and
1691 repo['.'].p2().branch() != branch):
1691 repo['.'].p2().branch() != branch):
1692 raise error.Abort(_('can only close branch heads'))
1692 raise error.Abort(_('can only close branch heads'))
1693
1693
1694 if opts.get('amend'):
1694 if opts.get('amend'):
1695 if ui.configbool('ui', 'commitsubrepos'):
1695 if ui.configbool('ui', 'commitsubrepos'):
1696 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1696 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1697
1697
1698 old = repo['.']
1698 old = repo['.']
1699 rewriteutil.precheck(repo, [old.rev()], 'amend')
1699 rewriteutil.precheck(repo, [old.rev()], 'amend')
1700
1700
1701 # Currently histedit gets confused if an amend happens while histedit
1701 # Currently histedit gets confused if an amend happens while histedit
1702 # is in progress. Since we have a checkunfinished command, we are
1702 # is in progress. Since we have a checkunfinished command, we are
1703 # temporarily honoring it.
1703 # temporarily honoring it.
1704 #
1704 #
1705 # Note: eventually this guard will be removed. Please do not expect
1705 # Note: eventually this guard will be removed. Please do not expect
1706 # this behavior to remain.
1706 # this behavior to remain.
1707 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1707 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1708 cmdutil.checkunfinished(repo)
1708 cmdutil.checkunfinished(repo)
1709
1709
1710 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
1710 node = cmdutil.amend(ui, repo, old, extra, pats, opts)
1711 if node == old.node():
1711 if node == old.node():
1712 ui.status(_("nothing changed\n"))
1712 ui.status(_("nothing changed\n"))
1713 return 1
1713 return 1
1714 else:
1714 else:
1715 def commitfunc(ui, repo, message, match, opts):
1715 def commitfunc(ui, repo, message, match, opts):
1716 overrides = {}
1716 overrides = {}
1717 if opts.get('secret'):
1717 if opts.get('secret'):
1718 overrides[('phases', 'new-commit')] = 'secret'
1718 overrides[('phases', 'new-commit')] = 'secret'
1719
1719
1720 baseui = repo.baseui
1720 baseui = repo.baseui
1721 with baseui.configoverride(overrides, 'commit'):
1721 with baseui.configoverride(overrides, 'commit'):
1722 with ui.configoverride(overrides, 'commit'):
1722 with ui.configoverride(overrides, 'commit'):
1723 editform = cmdutil.mergeeditform(repo[None],
1723 editform = cmdutil.mergeeditform(repo[None],
1724 'commit.normal')
1724 'commit.normal')
1725 editor = cmdutil.getcommiteditor(
1725 editor = cmdutil.getcommiteditor(
1726 editform=editform, **pycompat.strkwargs(opts))
1726 editform=editform, **pycompat.strkwargs(opts))
1727 return repo.commit(message,
1727 return repo.commit(message,
1728 opts.get('user'),
1728 opts.get('user'),
1729 opts.get('date'),
1729 opts.get('date'),
1730 match,
1730 match,
1731 editor=editor,
1731 editor=editor,
1732 extra=extra)
1732 extra=extra)
1733
1733
1734 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1734 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1735
1735
1736 if not node:
1736 if not node:
1737 stat = cmdutil.postcommitstatus(repo, pats, opts)
1737 stat = cmdutil.postcommitstatus(repo, pats, opts)
1738 if stat[3]:
1738 if stat[3]:
1739 ui.status(_("nothing changed (%d missing files, see "
1739 ui.status(_("nothing changed (%d missing files, see "
1740 "'hg status')\n") % len(stat[3]))
1740 "'hg status')\n") % len(stat[3]))
1741 else:
1741 else:
1742 ui.status(_("nothing changed\n"))
1742 ui.status(_("nothing changed\n"))
1743 return 1
1743 return 1
1744
1744
1745 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1745 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1746
1746
1747 if not ui.quiet and ui.configbool('commands', 'commit.post-status'):
1747 if not ui.quiet and ui.configbool('commands', 'commit.post-status'):
1748 status(ui, repo, modified=True, added=True, removed=True, deleted=True,
1748 status(ui, repo, modified=True, added=True, removed=True, deleted=True,
1749 unknown=True, subrepos=opts.get('subrepos'))
1749 unknown=True, subrepos=opts.get('subrepos'))
1750
1750
1751 @command('config|showconfig|debugconfig',
1751 @command('config|showconfig|debugconfig',
1752 [('u', 'untrusted', None, _('show untrusted configuration options')),
1752 [('u', 'untrusted', None, _('show untrusted configuration options')),
1753 ('e', 'edit', None, _('edit user config')),
1753 ('e', 'edit', None, _('edit user config')),
1754 ('l', 'local', None, _('edit repository config')),
1754 ('l', 'local', None, _('edit repository config')),
1755 ('g', 'global', None, _('edit global config'))] + formatteropts,
1755 ('g', 'global', None, _('edit global config'))] + formatteropts,
1756 _('[-u] [NAME]...'),
1756 _('[-u] [NAME]...'),
1757 helpcategory=command.CATEGORY_HELP,
1757 helpcategory=command.CATEGORY_HELP,
1758 optionalrepo=True,
1758 optionalrepo=True,
1759 intents={INTENT_READONLY})
1759 intents={INTENT_READONLY})
1760 def config(ui, repo, *values, **opts):
1760 def config(ui, repo, *values, **opts):
1761 """show combined config settings from all hgrc files
1761 """show combined config settings from all hgrc files
1762
1762
1763 With no arguments, print names and values of all config items.
1763 With no arguments, print names and values of all config items.
1764
1764
1765 With one argument of the form section.name, print just the value
1765 With one argument of the form section.name, print just the value
1766 of that config item.
1766 of that config item.
1767
1767
1768 With multiple arguments, print names and values of all config
1768 With multiple arguments, print names and values of all config
1769 items with matching section names or section.names.
1769 items with matching section names or section.names.
1770
1770
1771 With --edit, start an editor on the user-level config file. With
1771 With --edit, start an editor on the user-level config file. With
1772 --global, edit the system-wide config file. With --local, edit the
1772 --global, edit the system-wide config file. With --local, edit the
1773 repository-level config file.
1773 repository-level config file.
1774
1774
1775 With --debug, the source (filename and line number) is printed
1775 With --debug, the source (filename and line number) is printed
1776 for each config item.
1776 for each config item.
1777
1777
1778 See :hg:`help config` for more information about config files.
1778 See :hg:`help config` for more information about config files.
1779
1779
1780 .. container:: verbose
1780 .. container:: verbose
1781
1781
1782 Template:
1782 Template:
1783
1783
1784 The following keywords are supported. See also :hg:`help templates`.
1784 The following keywords are supported. See also :hg:`help templates`.
1785
1785
1786 :name: String. Config name.
1786 :name: String. Config name.
1787 :source: String. Filename and line number where the item is defined.
1787 :source: String. Filename and line number where the item is defined.
1788 :value: String. Config value.
1788 :value: String. Config value.
1789
1789
1790 Returns 0 on success, 1 if NAME does not exist.
1790 Returns 0 on success, 1 if NAME does not exist.
1791
1791
1792 """
1792 """
1793
1793
1794 opts = pycompat.byteskwargs(opts)
1794 opts = pycompat.byteskwargs(opts)
1795 if opts.get('edit') or opts.get('local') or opts.get('global'):
1795 if opts.get('edit') or opts.get('local') or opts.get('global'):
1796 if opts.get('local') and opts.get('global'):
1796 if opts.get('local') and opts.get('global'):
1797 raise error.Abort(_("can't use --local and --global together"))
1797 raise error.Abort(_("can't use --local and --global together"))
1798
1798
1799 if opts.get('local'):
1799 if opts.get('local'):
1800 if not repo:
1800 if not repo:
1801 raise error.Abort(_("can't use --local outside a repository"))
1801 raise error.Abort(_("can't use --local outside a repository"))
1802 paths = [repo.vfs.join('hgrc')]
1802 paths = [repo.vfs.join('hgrc')]
1803 elif opts.get('global'):
1803 elif opts.get('global'):
1804 paths = rcutil.systemrcpath()
1804 paths = rcutil.systemrcpath()
1805 else:
1805 else:
1806 paths = rcutil.userrcpath()
1806 paths = rcutil.userrcpath()
1807
1807
1808 for f in paths:
1808 for f in paths:
1809 if os.path.exists(f):
1809 if os.path.exists(f):
1810 break
1810 break
1811 else:
1811 else:
1812 if opts.get('global'):
1812 if opts.get('global'):
1813 samplehgrc = uimod.samplehgrcs['global']
1813 samplehgrc = uimod.samplehgrcs['global']
1814 elif opts.get('local'):
1814 elif opts.get('local'):
1815 samplehgrc = uimod.samplehgrcs['local']
1815 samplehgrc = uimod.samplehgrcs['local']
1816 else:
1816 else:
1817 samplehgrc = uimod.samplehgrcs['user']
1817 samplehgrc = uimod.samplehgrcs['user']
1818
1818
1819 f = paths[0]
1819 f = paths[0]
1820 fp = open(f, "wb")
1820 fp = open(f, "wb")
1821 fp.write(util.tonativeeol(samplehgrc))
1821 fp.write(util.tonativeeol(samplehgrc))
1822 fp.close()
1822 fp.close()
1823
1823
1824 editor = ui.geteditor()
1824 editor = ui.geteditor()
1825 ui.system("%s \"%s\"" % (editor, f),
1825 ui.system("%s \"%s\"" % (editor, f),
1826 onerr=error.Abort, errprefix=_("edit failed"),
1826 onerr=error.Abort, errprefix=_("edit failed"),
1827 blockedtag='config_edit')
1827 blockedtag='config_edit')
1828 return
1828 return
1829 ui.pager('config')
1829 ui.pager('config')
1830 fm = ui.formatter('config', opts)
1830 fm = ui.formatter('config', opts)
1831 for t, f in rcutil.rccomponents():
1831 for t, f in rcutil.rccomponents():
1832 if t == 'path':
1832 if t == 'path':
1833 ui.debug('read config from: %s\n' % f)
1833 ui.debug('read config from: %s\n' % f)
1834 elif t == 'items':
1834 elif t == 'items':
1835 for section, name, value, source in f:
1835 for section, name, value, source in f:
1836 ui.debug('set config by: %s\n' % source)
1836 ui.debug('set config by: %s\n' % source)
1837 else:
1837 else:
1838 raise error.ProgrammingError('unknown rctype: %s' % t)
1838 raise error.ProgrammingError('unknown rctype: %s' % t)
1839 untrusted = bool(opts.get('untrusted'))
1839 untrusted = bool(opts.get('untrusted'))
1840
1840
1841 selsections = selentries = []
1841 selsections = selentries = []
1842 if values:
1842 if values:
1843 selsections = [v for v in values if '.' not in v]
1843 selsections = [v for v in values if '.' not in v]
1844 selentries = [v for v in values if '.' in v]
1844 selentries = [v for v in values if '.' in v]
1845 uniquesel = (len(selentries) == 1 and not selsections)
1845 uniquesel = (len(selentries) == 1 and not selsections)
1846 selsections = set(selsections)
1846 selsections = set(selsections)
1847 selentries = set(selentries)
1847 selentries = set(selentries)
1848
1848
1849 matched = False
1849 matched = False
1850 for section, name, value in ui.walkconfig(untrusted=untrusted):
1850 for section, name, value in ui.walkconfig(untrusted=untrusted):
1851 source = ui.configsource(section, name, untrusted)
1851 source = ui.configsource(section, name, untrusted)
1852 value = pycompat.bytestr(value)
1852 value = pycompat.bytestr(value)
1853 if fm.isplain():
1853 if fm.isplain():
1854 source = source or 'none'
1854 source = source or 'none'
1855 value = value.replace('\n', '\\n')
1855 value = value.replace('\n', '\\n')
1856 entryname = section + '.' + name
1856 entryname = section + '.' + name
1857 if values and not (section in selsections or entryname in selentries):
1857 if values and not (section in selsections or entryname in selentries):
1858 continue
1858 continue
1859 fm.startitem()
1859 fm.startitem()
1860 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1860 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1861 if uniquesel:
1861 if uniquesel:
1862 fm.data(name=entryname)
1862 fm.data(name=entryname)
1863 fm.write('value', '%s\n', value)
1863 fm.write('value', '%s\n', value)
1864 else:
1864 else:
1865 fm.write('name value', '%s=%s\n', entryname, value)
1865 fm.write('name value', '%s=%s\n', entryname, value)
1866 matched = True
1866 matched = True
1867 fm.end()
1867 fm.end()
1868 if matched:
1868 if matched:
1869 return 0
1869 return 0
1870 return 1
1870 return 1
1871
1871
1872 @command('copy|cp',
1872 @command('copy|cp',
1873 [('A', 'after', None, _('record a copy that has already occurred')),
1873 [('A', 'after', None, _('record a copy that has already occurred')),
1874 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1874 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1875 ] + walkopts + dryrunopts,
1875 ] + walkopts + dryrunopts,
1876 _('[OPTION]... [SOURCE]... DEST'),
1876 _('[OPTION]... [SOURCE]... DEST'),
1877 helpcategory=command.CATEGORY_FILE_CONTENTS)
1877 helpcategory=command.CATEGORY_FILE_CONTENTS)
1878 def copy(ui, repo, *pats, **opts):
1878 def copy(ui, repo, *pats, **opts):
1879 """mark files as copied for the next commit
1879 """mark files as copied for the next commit
1880
1880
1881 Mark dest as having copies of source files. If dest is a
1881 Mark dest as having copies of source files. If dest is a
1882 directory, copies are put in that directory. If dest is a file,
1882 directory, copies are put in that directory. If dest is a file,
1883 the source must be a single file.
1883 the source must be a single file.
1884
1884
1885 By default, this command copies the contents of files as they
1885 By default, this command copies the contents of files as they
1886 exist in the working directory. If invoked with -A/--after, the
1886 exist in the working directory. If invoked with -A/--after, the
1887 operation is recorded, but no copying is performed.
1887 operation is recorded, but no copying is performed.
1888
1888
1889 This command takes effect with the next commit. To undo a copy
1889 This command takes effect with the next commit. To undo a copy
1890 before that, see :hg:`revert`.
1890 before that, see :hg:`revert`.
1891
1891
1892 Returns 0 on success, 1 if errors are encountered.
1892 Returns 0 on success, 1 if errors are encountered.
1893 """
1893 """
1894 opts = pycompat.byteskwargs(opts)
1894 opts = pycompat.byteskwargs(opts)
1895 with repo.wlock(False):
1895 with repo.wlock(False):
1896 return cmdutil.copy(ui, repo, pats, opts)
1896 return cmdutil.copy(ui, repo, pats, opts)
1897
1897
1898 @command(
1898 @command(
1899 'debugcommands', [], _('[COMMAND]'),
1899 'debugcommands', [], _('[COMMAND]'),
1900 helpcategory=command.CATEGORY_HELP,
1900 helpcategory=command.CATEGORY_HELP,
1901 norepo=True)
1901 norepo=True)
1902 def debugcommands(ui, cmd='', *args):
1902 def debugcommands(ui, cmd='', *args):
1903 """list all available commands and options"""
1903 """list all available commands and options"""
1904 for cmd, vals in sorted(table.iteritems()):
1904 for cmd, vals in sorted(table.iteritems()):
1905 cmd = cmd.split('|')[0]
1905 cmd = cmd.split('|')[0]
1906 opts = ', '.join([i[1] for i in vals[1]])
1906 opts = ', '.join([i[1] for i in vals[1]])
1907 ui.write('%s: %s\n' % (cmd, opts))
1907 ui.write('%s: %s\n' % (cmd, opts))
1908
1908
1909 @command('debugcomplete',
1909 @command('debugcomplete',
1910 [('o', 'options', None, _('show the command options'))],
1910 [('o', 'options', None, _('show the command options'))],
1911 _('[-o] CMD'),
1911 _('[-o] CMD'),
1912 helpcategory=command.CATEGORY_HELP,
1912 helpcategory=command.CATEGORY_HELP,
1913 norepo=True)
1913 norepo=True)
1914 def debugcomplete(ui, cmd='', **opts):
1914 def debugcomplete(ui, cmd='', **opts):
1915 """returns the completion list associated with the given command"""
1915 """returns the completion list associated with the given command"""
1916
1916
1917 if opts.get(r'options'):
1917 if opts.get(r'options'):
1918 options = []
1918 options = []
1919 otables = [globalopts]
1919 otables = [globalopts]
1920 if cmd:
1920 if cmd:
1921 aliases, entry = cmdutil.findcmd(cmd, table, False)
1921 aliases, entry = cmdutil.findcmd(cmd, table, False)
1922 otables.append(entry[1])
1922 otables.append(entry[1])
1923 for t in otables:
1923 for t in otables:
1924 for o in t:
1924 for o in t:
1925 if "(DEPRECATED)" in o[3]:
1925 if "(DEPRECATED)" in o[3]:
1926 continue
1926 continue
1927 if o[0]:
1927 if o[0]:
1928 options.append('-%s' % o[0])
1928 options.append('-%s' % o[0])
1929 options.append('--%s' % o[1])
1929 options.append('--%s' % o[1])
1930 ui.write("%s\n" % "\n".join(options))
1930 ui.write("%s\n" % "\n".join(options))
1931 return
1931 return
1932
1932
1933 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
1933 cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table)
1934 if ui.verbose:
1934 if ui.verbose:
1935 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1935 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1936 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1936 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1937
1937
1938 @command('diff',
1938 @command('diff',
1939 [('r', 'rev', [], _('revision'), _('REV')),
1939 [('r', 'rev', [], _('revision'), _('REV')),
1940 ('c', 'change', '', _('change made by revision'), _('REV'))
1940 ('c', 'change', '', _('change made by revision'), _('REV'))
1941 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1941 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1942 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1942 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1943 helpcategory=command.CATEGORY_FILE_CONTENTS,
1943 helpcategory=command.CATEGORY_FILE_CONTENTS,
1944 helpbasic=True, inferrepo=True, intents={INTENT_READONLY})
1944 helpbasic=True, inferrepo=True, intents={INTENT_READONLY})
1945 def diff(ui, repo, *pats, **opts):
1945 def diff(ui, repo, *pats, **opts):
1946 """diff repository (or selected files)
1946 """diff repository (or selected files)
1947
1947
1948 Show differences between revisions for the specified files.
1948 Show differences between revisions for the specified files.
1949
1949
1950 Differences between files are shown using the unified diff format.
1950 Differences between files are shown using the unified diff format.
1951
1951
1952 .. note::
1952 .. note::
1953
1953
1954 :hg:`diff` may generate unexpected results for merges, as it will
1954 :hg:`diff` may generate unexpected results for merges, as it will
1955 default to comparing against the working directory's first
1955 default to comparing against the working directory's first
1956 parent changeset if no revisions are specified.
1956 parent changeset if no revisions are specified.
1957
1957
1958 When two revision arguments are given, then changes are shown
1958 When two revision arguments are given, then changes are shown
1959 between those revisions. If only one revision is specified then
1959 between those revisions. If only one revision is specified then
1960 that revision is compared to the working directory, and, when no
1960 that revision is compared to the working directory, and, when no
1961 revisions are specified, the working directory files are compared
1961 revisions are specified, the working directory files are compared
1962 to its first parent.
1962 to its first parent.
1963
1963
1964 Alternatively you can specify -c/--change with a revision to see
1964 Alternatively you can specify -c/--change with a revision to see
1965 the changes in that changeset relative to its first parent.
1965 the changes in that changeset relative to its first parent.
1966
1966
1967 Without the -a/--text option, diff will avoid generating diffs of
1967 Without the -a/--text option, diff will avoid generating diffs of
1968 files it detects as binary. With -a, diff will generate a diff
1968 files it detects as binary. With -a, diff will generate a diff
1969 anyway, probably with undesirable results.
1969 anyway, probably with undesirable results.
1970
1970
1971 Use the -g/--git option to generate diffs in the git extended diff
1971 Use the -g/--git option to generate diffs in the git extended diff
1972 format. For more information, read :hg:`help diffs`.
1972 format. For more information, read :hg:`help diffs`.
1973
1973
1974 .. container:: verbose
1974 .. container:: verbose
1975
1975
1976 Examples:
1976 Examples:
1977
1977
1978 - compare a file in the current working directory to its parent::
1978 - compare a file in the current working directory to its parent::
1979
1979
1980 hg diff foo.c
1980 hg diff foo.c
1981
1981
1982 - compare two historical versions of a directory, with rename info::
1982 - compare two historical versions of a directory, with rename info::
1983
1983
1984 hg diff --git -r 1.0:1.2 lib/
1984 hg diff --git -r 1.0:1.2 lib/
1985
1985
1986 - get change stats relative to the last change on some date::
1986 - get change stats relative to the last change on some date::
1987
1987
1988 hg diff --stat -r "date('may 2')"
1988 hg diff --stat -r "date('may 2')"
1989
1989
1990 - diff all newly-added files that contain a keyword::
1990 - diff all newly-added files that contain a keyword::
1991
1991
1992 hg diff "set:added() and grep(GNU)"
1992 hg diff "set:added() and grep(GNU)"
1993
1993
1994 - compare a revision and its parents::
1994 - compare a revision and its parents::
1995
1995
1996 hg diff -c 9353 # compare against first parent
1996 hg diff -c 9353 # compare against first parent
1997 hg diff -r 9353^:9353 # same using revset syntax
1997 hg diff -r 9353^:9353 # same using revset syntax
1998 hg diff -r 9353^2:9353 # compare against the second parent
1998 hg diff -r 9353^2:9353 # compare against the second parent
1999
1999
2000 Returns 0 on success.
2000 Returns 0 on success.
2001 """
2001 """
2002
2002
2003 opts = pycompat.byteskwargs(opts)
2003 opts = pycompat.byteskwargs(opts)
2004 revs = opts.get('rev')
2004 revs = opts.get('rev')
2005 change = opts.get('change')
2005 change = opts.get('change')
2006 stat = opts.get('stat')
2006 stat = opts.get('stat')
2007 reverse = opts.get('reverse')
2007 reverse = opts.get('reverse')
2008
2008
2009 if revs and change:
2009 if revs and change:
2010 msg = _('cannot specify --rev and --change at the same time')
2010 msg = _('cannot specify --rev and --change at the same time')
2011 raise error.Abort(msg)
2011 raise error.Abort(msg)
2012 elif change:
2012 elif change:
2013 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
2013 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
2014 ctx2 = scmutil.revsingle(repo, change, None)
2014 ctx2 = scmutil.revsingle(repo, change, None)
2015 ctx1 = ctx2.p1()
2015 ctx1 = ctx2.p1()
2016 else:
2016 else:
2017 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
2017 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
2018 ctx1, ctx2 = scmutil.revpair(repo, revs)
2018 ctx1, ctx2 = scmutil.revpair(repo, revs)
2019 node1, node2 = ctx1.node(), ctx2.node()
2019 node1, node2 = ctx1.node(), ctx2.node()
2020
2020
2021 if reverse:
2021 if reverse:
2022 node1, node2 = node2, node1
2022 node1, node2 = node2, node1
2023
2023
2024 diffopts = patch.diffallopts(ui, opts)
2024 diffopts = patch.diffallopts(ui, opts)
2025 m = scmutil.match(ctx2, pats, opts)
2025 m = scmutil.match(ctx2, pats, opts)
2026 m = repo.narrowmatch(m)
2026 m = repo.narrowmatch(m)
2027 ui.pager('diff')
2027 ui.pager('diff')
2028 logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
2028 logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
2029 listsubrepos=opts.get('subrepos'),
2029 listsubrepos=opts.get('subrepos'),
2030 root=opts.get('root'))
2030 root=opts.get('root'))
2031
2031
2032 @command('export',
2032 @command('export',
2033 [('B', 'bookmark', '',
2033 [('B', 'bookmark', '',
2034 _('export changes only reachable by given bookmark'), _('BOOKMARK')),
2034 _('export changes only reachable by given bookmark'), _('BOOKMARK')),
2035 ('o', 'output', '',
2035 ('o', 'output', '',
2036 _('print output to file with formatted name'), _('FORMAT')),
2036 _('print output to file with formatted name'), _('FORMAT')),
2037 ('', 'switch-parent', None, _('diff against the second parent')),
2037 ('', 'switch-parent', None, _('diff against the second parent')),
2038 ('r', 'rev', [], _('revisions to export'), _('REV')),
2038 ('r', 'rev', [], _('revisions to export'), _('REV')),
2039 ] + diffopts + formatteropts,
2039 ] + diffopts + formatteropts,
2040 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2040 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'),
2041 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2041 helpcategory=command.CATEGORY_IMPORT_EXPORT,
2042 helpbasic=True, intents={INTENT_READONLY})
2042 helpbasic=True, intents={INTENT_READONLY})
2043 def export(ui, repo, *changesets, **opts):
2043 def export(ui, repo, *changesets, **opts):
2044 """dump the header and diffs for one or more changesets
2044 """dump the header and diffs for one or more changesets
2045
2045
2046 Print the changeset header and diffs for one or more revisions.
2046 Print the changeset header and diffs for one or more revisions.
2047 If no revision is given, the parent of the working directory is used.
2047 If no revision is given, the parent of the working directory is used.
2048
2048
2049 The information shown in the changeset header is: author, date,
2049 The information shown in the changeset header is: author, date,
2050 branch name (if non-default), changeset hash, parent(s) and commit
2050 branch name (if non-default), changeset hash, parent(s) and commit
2051 comment.
2051 comment.
2052
2052
2053 .. note::
2053 .. note::
2054
2054
2055 :hg:`export` may generate unexpected diff output for merge
2055 :hg:`export` may generate unexpected diff output for merge
2056 changesets, as it will compare the merge changeset against its
2056 changesets, as it will compare the merge changeset against its
2057 first parent only.
2057 first parent only.
2058
2058
2059 Output may be to a file, in which case the name of the file is
2059 Output may be to a file, in which case the name of the file is
2060 given using a template string. See :hg:`help templates`. In addition
2060 given using a template string. See :hg:`help templates`. In addition
2061 to the common template keywords, the following formatting rules are
2061 to the common template keywords, the following formatting rules are
2062 supported:
2062 supported:
2063
2063
2064 :``%%``: literal "%" character
2064 :``%%``: literal "%" character
2065 :``%H``: changeset hash (40 hexadecimal digits)
2065 :``%H``: changeset hash (40 hexadecimal digits)
2066 :``%N``: number of patches being generated
2066 :``%N``: number of patches being generated
2067 :``%R``: changeset revision number
2067 :``%R``: changeset revision number
2068 :``%b``: basename of the exporting repository
2068 :``%b``: basename of the exporting repository
2069 :``%h``: short-form changeset hash (12 hexadecimal digits)
2069 :``%h``: short-form changeset hash (12 hexadecimal digits)
2070 :``%m``: first line of the commit message (only alphanumeric characters)
2070 :``%m``: first line of the commit message (only alphanumeric characters)
2071 :``%n``: zero-padded sequence number, starting at 1
2071 :``%n``: zero-padded sequence number, starting at 1
2072 :``%r``: zero-padded changeset revision number
2072 :``%r``: zero-padded changeset revision number
2073 :``\\``: literal "\\" character
2073 :``\\``: literal "\\" character
2074
2074
2075 Without the -a/--text option, export will avoid generating diffs
2075 Without the -a/--text option, export will avoid generating diffs
2076 of files it detects as binary. With -a, export will generate a
2076 of files it detects as binary. With -a, export will generate a
2077 diff anyway, probably with undesirable results.
2077 diff anyway, probably with undesirable results.
2078
2078
2079 With -B/--bookmark changesets reachable by the given bookmark are
2079 With -B/--bookmark changesets reachable by the given bookmark are
2080 selected.
2080 selected.
2081
2081
2082 Use the -g/--git option to generate diffs in the git extended diff
2082 Use the -g/--git option to generate diffs in the git extended diff
2083 format. See :hg:`help diffs` for more information.
2083 format. See :hg:`help diffs` for more information.
2084
2084
2085 With the --switch-parent option, the diff will be against the
2085 With the --switch-parent option, the diff will be against the
2086 second parent. It can be useful to review a merge.
2086 second parent. It can be useful to review a merge.
2087
2087
2088 .. container:: verbose
2088 .. container:: verbose
2089
2089
2090 Template:
2090 Template:
2091
2091
2092 The following keywords are supported in addition to the common template
2092 The following keywords are supported in addition to the common template
2093 keywords and functions. See also :hg:`help templates`.
2093 keywords and functions. See also :hg:`help templates`.
2094
2094
2095 :diff: String. Diff content.
2095 :diff: String. Diff content.
2096 :parents: List of strings. Parent nodes of the changeset.
2096 :parents: List of strings. Parent nodes of the changeset.
2097
2097
2098 Examples:
2098 Examples:
2099
2099
2100 - use export and import to transplant a bugfix to the current
2100 - use export and import to transplant a bugfix to the current
2101 branch::
2101 branch::
2102
2102
2103 hg export -r 9353 | hg import -
2103 hg export -r 9353 | hg import -
2104
2104
2105 - export all the changesets between two revisions to a file with
2105 - export all the changesets between two revisions to a file with
2106 rename information::
2106 rename information::
2107
2107
2108 hg export --git -r 123:150 > changes.txt
2108 hg export --git -r 123:150 > changes.txt
2109
2109
2110 - split outgoing changes into a series of patches with
2110 - split outgoing changes into a series of patches with
2111 descriptive names::
2111 descriptive names::
2112
2112
2113 hg export -r "outgoing()" -o "%n-%m.patch"
2113 hg export -r "outgoing()" -o "%n-%m.patch"
2114
2114
2115 Returns 0 on success.
2115 Returns 0 on success.
2116 """
2116 """
2117 opts = pycompat.byteskwargs(opts)
2117 opts = pycompat.byteskwargs(opts)
2118 bookmark = opts.get('bookmark')
2118 bookmark = opts.get('bookmark')
2119 changesets += tuple(opts.get('rev', []))
2119 changesets += tuple(opts.get('rev', []))
2120
2120
2121 if bookmark and changesets:
2121 if bookmark and changesets:
2122 raise error.Abort(_("-r and -B are mutually exclusive"))
2122 raise error.Abort(_("-r and -B are mutually exclusive"))
2123
2123
2124 if bookmark:
2124 if bookmark:
2125 if bookmark not in repo._bookmarks:
2125 if bookmark not in repo._bookmarks:
2126 raise error.Abort(_("bookmark '%s' not found") % bookmark)
2126 raise error.Abort(_("bookmark '%s' not found") % bookmark)
2127
2127
2128 revs = scmutil.bookmarkrevs(repo, bookmark)
2128 revs = scmutil.bookmarkrevs(repo, bookmark)
2129 else:
2129 else:
2130 if not changesets:
2130 if not changesets:
2131 changesets = ['.']
2131 changesets = ['.']
2132
2132
2133 repo = scmutil.unhidehashlikerevs(repo, changesets, 'nowarn')
2133 repo = scmutil.unhidehashlikerevs(repo, changesets, 'nowarn')
2134 revs = scmutil.revrange(repo, changesets)
2134 revs = scmutil.revrange(repo, changesets)
2135
2135
2136 if not revs:
2136 if not revs:
2137 raise error.Abort(_("export requires at least one changeset"))
2137 raise error.Abort(_("export requires at least one changeset"))
2138 if len(revs) > 1:
2138 if len(revs) > 1:
2139 ui.note(_('exporting patches:\n'))
2139 ui.note(_('exporting patches:\n'))
2140 else:
2140 else:
2141 ui.note(_('exporting patch:\n'))
2141 ui.note(_('exporting patch:\n'))
2142
2142
2143 fntemplate = opts.get('output')
2143 fntemplate = opts.get('output')
2144 if cmdutil.isstdiofilename(fntemplate):
2144 if cmdutil.isstdiofilename(fntemplate):
2145 fntemplate = ''
2145 fntemplate = ''
2146
2146
2147 if fntemplate:
2147 if fntemplate:
2148 fm = formatter.nullformatter(ui, 'export', opts)
2148 fm = formatter.nullformatter(ui, 'export', opts)
2149 else:
2149 else:
2150 ui.pager('export')
2150 ui.pager('export')
2151 fm = ui.formatter('export', opts)
2151 fm = ui.formatter('export', opts)
2152 with fm:
2152 with fm:
2153 cmdutil.export(repo, revs, fm, fntemplate=fntemplate,
2153 cmdutil.export(repo, revs, fm, fntemplate=fntemplate,
2154 switch_parent=opts.get('switch_parent'),
2154 switch_parent=opts.get('switch_parent'),
2155 opts=patch.diffallopts(ui, opts))
2155 opts=patch.diffallopts(ui, opts))
2156
2156
2157 @command('files',
2157 @command('files',
2158 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
2158 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
2159 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
2159 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
2160 ] + walkopts + formatteropts + subrepoopts,
2160 ] + walkopts + formatteropts + subrepoopts,
2161 _('[OPTION]... [FILE]...'),
2161 _('[OPTION]... [FILE]...'),
2162 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2162 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2163 intents={INTENT_READONLY})
2163 intents={INTENT_READONLY})
2164 def files(ui, repo, *pats, **opts):
2164 def files(ui, repo, *pats, **opts):
2165 """list tracked files
2165 """list tracked files
2166
2166
2167 Print files under Mercurial control in the working directory or
2167 Print files under Mercurial control in the working directory or
2168 specified revision for given files (excluding removed files).
2168 specified revision for given files (excluding removed files).
2169 Files can be specified as filenames or filesets.
2169 Files can be specified as filenames or filesets.
2170
2170
2171 If no files are given to match, this command prints the names
2171 If no files are given to match, this command prints the names
2172 of all files under Mercurial control.
2172 of all files under Mercurial control.
2173
2173
2174 .. container:: verbose
2174 .. container:: verbose
2175
2175
2176 Template:
2176 Template:
2177
2177
2178 The following keywords are supported in addition to the common template
2178 The following keywords are supported in addition to the common template
2179 keywords and functions. See also :hg:`help templates`.
2179 keywords and functions. See also :hg:`help templates`.
2180
2180
2181 :flags: String. Character denoting file's symlink and executable bits.
2181 :flags: String. Character denoting file's symlink and executable bits.
2182 :path: String. Repository-absolute path of the file.
2182 :path: String. Repository-absolute path of the file.
2183 :size: Integer. Size of the file in bytes.
2183 :size: Integer. Size of the file in bytes.
2184
2184
2185 Examples:
2185 Examples:
2186
2186
2187 - list all files under the current directory::
2187 - list all files under the current directory::
2188
2188
2189 hg files .
2189 hg files .
2190
2190
2191 - shows sizes and flags for current revision::
2191 - shows sizes and flags for current revision::
2192
2192
2193 hg files -vr .
2193 hg files -vr .
2194
2194
2195 - list all files named README::
2195 - list all files named README::
2196
2196
2197 hg files -I "**/README"
2197 hg files -I "**/README"
2198
2198
2199 - list all binary files::
2199 - list all binary files::
2200
2200
2201 hg files "set:binary()"
2201 hg files "set:binary()"
2202
2202
2203 - find files containing a regular expression::
2203 - find files containing a regular expression::
2204
2204
2205 hg files "set:grep('bob')"
2205 hg files "set:grep('bob')"
2206
2206
2207 - search tracked file contents with xargs and grep::
2207 - search tracked file contents with xargs and grep::
2208
2208
2209 hg files -0 | xargs -0 grep foo
2209 hg files -0 | xargs -0 grep foo
2210
2210
2211 See :hg:`help patterns` and :hg:`help filesets` for more information
2211 See :hg:`help patterns` and :hg:`help filesets` for more information
2212 on specifying file patterns.
2212 on specifying file patterns.
2213
2213
2214 Returns 0 if a match is found, 1 otherwise.
2214 Returns 0 if a match is found, 1 otherwise.
2215
2215
2216 """
2216 """
2217
2217
2218 opts = pycompat.byteskwargs(opts)
2218 opts = pycompat.byteskwargs(opts)
2219 rev = opts.get('rev')
2219 rev = opts.get('rev')
2220 if rev:
2220 if rev:
2221 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2221 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
2222 ctx = scmutil.revsingle(repo, rev, None)
2222 ctx = scmutil.revsingle(repo, rev, None)
2223
2223
2224 end = '\n'
2224 end = '\n'
2225 if opts.get('print0'):
2225 if opts.get('print0'):
2226 end = '\0'
2226 end = '\0'
2227 fmt = '%s' + end
2227 fmt = '%s' + end
2228
2228
2229 m = scmutil.match(ctx, pats, opts)
2229 m = scmutil.match(ctx, pats, opts)
2230 ui.pager('files')
2230 ui.pager('files')
2231 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2231 uipathfn = scmutil.getuipathfn(ctx.repo(), legacyrelativevalue=True)
2232 with ui.formatter('files', opts) as fm:
2232 with ui.formatter('files', opts) as fm:
2233 return cmdutil.files(ui, ctx, m, uipathfn, fm, fmt,
2233 return cmdutil.files(ui, ctx, m, uipathfn, fm, fmt,
2234 opts.get('subrepos'))
2234 opts.get('subrepos'))
2235
2235
2236 @command(
2236 @command(
2237 'forget',
2237 'forget',
2238 [('i', 'interactive', None, _('use interactive mode')),
2238 [('i', 'interactive', None, _('use interactive mode')),
2239 ] + walkopts + dryrunopts,
2239 ] + walkopts + dryrunopts,
2240 _('[OPTION]... FILE...'),
2240 _('[OPTION]... FILE...'),
2241 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2241 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
2242 helpbasic=True, inferrepo=True)
2242 helpbasic=True, inferrepo=True)
2243 def forget(ui, repo, *pats, **opts):
2243 def forget(ui, repo, *pats, **opts):
2244 """forget the specified files on the next commit
2244 """forget the specified files on the next commit
2245
2245
2246 Mark the specified files so they will no longer be tracked
2246 Mark the specified files so they will no longer be tracked
2247 after the next commit.
2247 after the next commit.
2248
2248
2249 This only removes files from the current branch, not from the
2249 This only removes files from the current branch, not from the
2250 entire project history, and it does not delete them from the
2250 entire project history, and it does not delete them from the
2251 working directory.
2251 working directory.
2252
2252
2253 To delete the file from the working directory, see :hg:`remove`.
2253 To delete the file from the working directory, see :hg:`remove`.
2254
2254
2255 To undo a forget before the next commit, see :hg:`add`.
2255 To undo a forget before the next commit, see :hg:`add`.
2256
2256
2257 .. container:: verbose
2257 .. container:: verbose
2258
2258
2259 Examples:
2259 Examples:
2260
2260
2261 - forget newly-added binary files::
2261 - forget newly-added binary files::
2262
2262
2263 hg forget "set:added() and binary()"
2263 hg forget "set:added() and binary()"
2264
2264
2265 - forget files that would be excluded by .hgignore::
2265 - forget files that would be excluded by .hgignore::
2266
2266
2267 hg forget "set:hgignore()"
2267 hg forget "set:hgignore()"
2268
2268
2269 Returns 0 on success.
2269 Returns 0 on success.
2270 """
2270 """
2271
2271
2272 opts = pycompat.byteskwargs(opts)
2272 opts = pycompat.byteskwargs(opts)
2273 if not pats:
2273 if not pats:
2274 raise error.Abort(_('no files specified'))
2274 raise error.Abort(_('no files specified'))
2275
2275
2276 m = scmutil.match(repo[None], pats, opts)
2276 m = scmutil.match(repo[None], pats, opts)
2277 dryrun, interactive = opts.get('dry_run'), opts.get('interactive')
2277 dryrun, interactive = opts.get('dry_run'), opts.get('interactive')
2278 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2278 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
2279 rejected = cmdutil.forget(ui, repo, m, prefix="", uipathfn=uipathfn,
2279 rejected = cmdutil.forget(ui, repo, m, prefix="", uipathfn=uipathfn,
2280 explicitonly=False, dryrun=dryrun,
2280 explicitonly=False, dryrun=dryrun,
2281 interactive=interactive)[0]
2281 interactive=interactive)[0]
2282 return rejected and 1 or 0
2282 return rejected and 1 or 0
2283
2283
2284 @command(
2284 @command(
2285 'graft',
2285 'graft',
2286 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2286 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2287 ('', 'base', '',
2287 ('', 'base', '',
2288 _('base revision when doing the graft merge (ADVANCED)'), _('REV')),
2288 _('base revision when doing the graft merge (ADVANCED)'), _('REV')),
2289 ('c', 'continue', False, _('resume interrupted graft')),
2289 ('c', 'continue', False, _('resume interrupted graft')),
2290 ('', 'stop', False, _('stop interrupted graft')),
2290 ('', 'stop', False, _('stop interrupted graft')),
2291 ('', 'abort', False, _('abort interrupted graft')),
2291 ('', 'abort', False, _('abort interrupted graft')),
2292 ('e', 'edit', False, _('invoke editor on commit messages')),
2292 ('e', 'edit', False, _('invoke editor on commit messages')),
2293 ('', 'log', None, _('append graft info to log message')),
2293 ('', 'log', None, _('append graft info to log message')),
2294 ('', 'no-commit', None,
2294 ('', 'no-commit', None,
2295 _("don't commit, just apply the changes in working directory")),
2295 _("don't commit, just apply the changes in working directory")),
2296 ('f', 'force', False, _('force graft')),
2296 ('f', 'force', False, _('force graft')),
2297 ('D', 'currentdate', False,
2297 ('D', 'currentdate', False,
2298 _('record the current date as commit date')),
2298 _('record the current date as commit date')),
2299 ('U', 'currentuser', False,
2299 ('U', 'currentuser', False,
2300 _('record the current user as committer'))]
2300 _('record the current user as committer'))]
2301 + commitopts2 + mergetoolopts + dryrunopts,
2301 + commitopts2 + mergetoolopts + dryrunopts,
2302 _('[OPTION]... [-r REV]... REV...'),
2302 _('[OPTION]... [-r REV]... REV...'),
2303 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT)
2303 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT)
2304 def graft(ui, repo, *revs, **opts):
2304 def graft(ui, repo, *revs, **opts):
2305 '''copy changes from other branches onto the current branch
2305 '''copy changes from other branches onto the current branch
2306
2306
2307 This command uses Mercurial's merge logic to copy individual
2307 This command uses Mercurial's merge logic to copy individual
2308 changes from other branches without merging branches in the
2308 changes from other branches without merging branches in the
2309 history graph. This is sometimes known as 'backporting' or
2309 history graph. This is sometimes known as 'backporting' or
2310 'cherry-picking'. By default, graft will copy user, date, and
2310 'cherry-picking'. By default, graft will copy user, date, and
2311 description from the source changesets.
2311 description from the source changesets.
2312
2312
2313 Changesets that are ancestors of the current revision, that have
2313 Changesets that are ancestors of the current revision, that have
2314 already been grafted, or that are merges will be skipped.
2314 already been grafted, or that are merges will be skipped.
2315
2315
2316 If --log is specified, log messages will have a comment appended
2316 If --log is specified, log messages will have a comment appended
2317 of the form::
2317 of the form::
2318
2318
2319 (grafted from CHANGESETHASH)
2319 (grafted from CHANGESETHASH)
2320
2320
2321 If --force is specified, revisions will be grafted even if they
2321 If --force is specified, revisions will be grafted even if they
2322 are already ancestors of, or have been grafted to, the destination.
2322 are already ancestors of, or have been grafted to, the destination.
2323 This is useful when the revisions have since been backed out.
2323 This is useful when the revisions have since been backed out.
2324
2324
2325 If a graft merge results in conflicts, the graft process is
2325 If a graft merge results in conflicts, the graft process is
2326 interrupted so that the current merge can be manually resolved.
2326 interrupted so that the current merge can be manually resolved.
2327 Once all conflicts are addressed, the graft process can be
2327 Once all conflicts are addressed, the graft process can be
2328 continued with the -c/--continue option.
2328 continued with the -c/--continue option.
2329
2329
2330 The -c/--continue option reapplies all the earlier options.
2330 The -c/--continue option reapplies all the earlier options.
2331
2331
2332 .. container:: verbose
2332 .. container:: verbose
2333
2333
2334 The --base option exposes more of how graft internally uses merge with a
2334 The --base option exposes more of how graft internally uses merge with a
2335 custom base revision. --base can be used to specify another ancestor than
2335 custom base revision. --base can be used to specify another ancestor than
2336 the first and only parent.
2336 the first and only parent.
2337
2337
2338 The command::
2338 The command::
2339
2339
2340 hg graft -r 345 --base 234
2340 hg graft -r 345 --base 234
2341
2341
2342 is thus pretty much the same as::
2342 is thus pretty much the same as::
2343
2343
2344 hg diff -r 234 -r 345 | hg import
2344 hg diff -r 234 -r 345 | hg import
2345
2345
2346 but using merge to resolve conflicts and track moved files.
2346 but using merge to resolve conflicts and track moved files.
2347
2347
2348 The result of a merge can thus be backported as a single commit by
2348 The result of a merge can thus be backported as a single commit by
2349 specifying one of the merge parents as base, and thus effectively
2349 specifying one of the merge parents as base, and thus effectively
2350 grafting the changes from the other side.
2350 grafting the changes from the other side.
2351
2351
2352 It is also possible to collapse multiple changesets and clean up history
2352 It is also possible to collapse multiple changesets and clean up history
2353 by specifying another ancestor as base, much like rebase --collapse
2353 by specifying another ancestor as base, much like rebase --collapse
2354 --keep.
2354 --keep.
2355
2355
2356 The commit message can be tweaked after the fact using commit --amend .
2356 The commit message can be tweaked after the fact using commit --amend .
2357
2357
2358 For using non-ancestors as the base to backout changes, see the backout
2358 For using non-ancestors as the base to backout changes, see the backout
2359 command and the hidden --parent option.
2359 command and the hidden --parent option.
2360
2360
2361 .. container:: verbose
2361 .. container:: verbose
2362
2362
2363 Examples:
2363 Examples:
2364
2364
2365 - copy a single change to the stable branch and edit its description::
2365 - copy a single change to the stable branch and edit its description::
2366
2366
2367 hg update stable
2367 hg update stable
2368 hg graft --edit 9393
2368 hg graft --edit 9393
2369
2369
2370 - graft a range of changesets with one exception, updating dates::
2370 - graft a range of changesets with one exception, updating dates::
2371
2371
2372 hg graft -D "2085::2093 and not 2091"
2372 hg graft -D "2085::2093 and not 2091"
2373
2373
2374 - continue a graft after resolving conflicts::
2374 - continue a graft after resolving conflicts::
2375
2375
2376 hg graft -c
2376 hg graft -c
2377
2377
2378 - show the source of a grafted changeset::
2378 - show the source of a grafted changeset::
2379
2379
2380 hg log --debug -r .
2380 hg log --debug -r .
2381
2381
2382 - show revisions sorted by date::
2382 - show revisions sorted by date::
2383
2383
2384 hg log -r "sort(all(), date)"
2384 hg log -r "sort(all(), date)"
2385
2385
2386 - backport the result of a merge as a single commit::
2386 - backport the result of a merge as a single commit::
2387
2387
2388 hg graft -r 123 --base 123^
2388 hg graft -r 123 --base 123^
2389
2389
2390 - land a feature branch as one changeset::
2390 - land a feature branch as one changeset::
2391
2391
2392 hg up -cr default
2392 hg up -cr default
2393 hg graft -r featureX --base "ancestor('featureX', 'default')"
2393 hg graft -r featureX --base "ancestor('featureX', 'default')"
2394
2394
2395 See :hg:`help revisions` for more about specifying revisions.
2395 See :hg:`help revisions` for more about specifying revisions.
2396
2396
2397 Returns 0 on successful completion.
2397 Returns 0 on successful completion.
2398 '''
2398 '''
2399 with repo.wlock():
2399 with repo.wlock():
2400 return _dograft(ui, repo, *revs, **opts)
2400 return _dograft(ui, repo, *revs, **opts)
2401
2401
2402 def _dograft(ui, repo, *revs, **opts):
2402 def _dograft(ui, repo, *revs, **opts):
2403 opts = pycompat.byteskwargs(opts)
2403 opts = pycompat.byteskwargs(opts)
2404 if revs and opts.get('rev'):
2404 if revs and opts.get('rev'):
2405 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2405 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2406 'revision ordering!\n'))
2406 'revision ordering!\n'))
2407
2407
2408 revs = list(revs)
2408 revs = list(revs)
2409 revs.extend(opts.get('rev'))
2409 revs.extend(opts.get('rev'))
2410 basectx = None
2410 basectx = None
2411 if opts.get('base'):
2411 if opts.get('base'):
2412 basectx = scmutil.revsingle(repo, opts['base'], None)
2412 basectx = scmutil.revsingle(repo, opts['base'], None)
2413 # a dict of data to be stored in state file
2413 # a dict of data to be stored in state file
2414 statedata = {}
2414 statedata = {}
2415 # list of new nodes created by ongoing graft
2415 # list of new nodes created by ongoing graft
2416 statedata['newnodes'] = []
2416 statedata['newnodes'] = []
2417
2417
2418 if opts.get('user') and opts.get('currentuser'):
2418 if opts.get('user') and opts.get('currentuser'):
2419 raise error.Abort(_('--user and --currentuser are mutually exclusive'))
2419 raise error.Abort(_('--user and --currentuser are mutually exclusive'))
2420 if opts.get('date') and opts.get('currentdate'):
2420 if opts.get('date') and opts.get('currentdate'):
2421 raise error.Abort(_('--date and --currentdate are mutually exclusive'))
2421 raise error.Abort(_('--date and --currentdate are mutually exclusive'))
2422 if not opts.get('user') and opts.get('currentuser'):
2422 if not opts.get('user') and opts.get('currentuser'):
2423 opts['user'] = ui.username()
2423 opts['user'] = ui.username()
2424 if not opts.get('date') and opts.get('currentdate'):
2424 if not opts.get('date') and opts.get('currentdate'):
2425 opts['date'] = "%d %d" % dateutil.makedate()
2425 opts['date'] = "%d %d" % dateutil.makedate()
2426
2426
2427 editor = cmdutil.getcommiteditor(editform='graft',
2427 editor = cmdutil.getcommiteditor(editform='graft',
2428 **pycompat.strkwargs(opts))
2428 **pycompat.strkwargs(opts))
2429
2429
2430 cont = False
2430 cont = False
2431 if opts.get('no_commit'):
2431 if opts.get('no_commit'):
2432 if opts.get('edit'):
2432 if opts.get('edit'):
2433 raise error.Abort(_("cannot specify --no-commit and "
2433 raise error.Abort(_("cannot specify --no-commit and "
2434 "--edit together"))
2434 "--edit together"))
2435 if opts.get('currentuser'):
2435 if opts.get('currentuser'):
2436 raise error.Abort(_("cannot specify --no-commit and "
2436 raise error.Abort(_("cannot specify --no-commit and "
2437 "--currentuser together"))
2437 "--currentuser together"))
2438 if opts.get('currentdate'):
2438 if opts.get('currentdate'):
2439 raise error.Abort(_("cannot specify --no-commit and "
2439 raise error.Abort(_("cannot specify --no-commit and "
2440 "--currentdate together"))
2440 "--currentdate together"))
2441 if opts.get('log'):
2441 if opts.get('log'):
2442 raise error.Abort(_("cannot specify --no-commit and "
2442 raise error.Abort(_("cannot specify --no-commit and "
2443 "--log together"))
2443 "--log together"))
2444
2444
2445 graftstate = statemod.cmdstate(repo, 'graftstate')
2445 graftstate = statemod.cmdstate(repo, 'graftstate')
2446
2446
2447 if opts.get('stop'):
2447 if opts.get('stop'):
2448 if opts.get('continue'):
2448 if opts.get('continue'):
2449 raise error.Abort(_("cannot use '--continue' and "
2449 raise error.Abort(_("cannot use '--continue' and "
2450 "'--stop' together"))
2450 "'--stop' together"))
2451 if opts.get('abort'):
2451 if opts.get('abort'):
2452 raise error.Abort(_("cannot use '--abort' and '--stop' together"))
2452 raise error.Abort(_("cannot use '--abort' and '--stop' together"))
2453
2453
2454 if any((opts.get('edit'), opts.get('log'), opts.get('user'),
2454 if any((opts.get('edit'), opts.get('log'), opts.get('user'),
2455 opts.get('date'), opts.get('currentdate'),
2455 opts.get('date'), opts.get('currentdate'),
2456 opts.get('currentuser'), opts.get('rev'))):
2456 opts.get('currentuser'), opts.get('rev'))):
2457 raise error.Abort(_("cannot specify any other flag with '--stop'"))
2457 raise error.Abort(_("cannot specify any other flag with '--stop'"))
2458 return _stopgraft(ui, repo, graftstate)
2458 return _stopgraft(ui, repo, graftstate)
2459 elif opts.get('abort'):
2459 elif opts.get('abort'):
2460 if opts.get('continue'):
2460 if opts.get('continue'):
2461 raise error.Abort(_("cannot use '--continue' and "
2461 raise error.Abort(_("cannot use '--continue' and "
2462 "'--abort' together"))
2462 "'--abort' together"))
2463 if any((opts.get('edit'), opts.get('log'), opts.get('user'),
2463 if any((opts.get('edit'), opts.get('log'), opts.get('user'),
2464 opts.get('date'), opts.get('currentdate'),
2464 opts.get('date'), opts.get('currentdate'),
2465 opts.get('currentuser'), opts.get('rev'))):
2465 opts.get('currentuser'), opts.get('rev'))):
2466 raise error.Abort(_("cannot specify any other flag with '--abort'"))
2466 raise error.Abort(_("cannot specify any other flag with '--abort'"))
2467
2467
2468 return _abortgraft(ui, repo, graftstate)
2468 return _abortgraft(ui, repo, graftstate)
2469 elif opts.get('continue'):
2469 elif opts.get('continue'):
2470 cont = True
2470 cont = True
2471 if revs:
2471 if revs:
2472 raise error.Abort(_("can't specify --continue and revisions"))
2472 raise error.Abort(_("can't specify --continue and revisions"))
2473 # read in unfinished revisions
2473 # read in unfinished revisions
2474 if graftstate.exists():
2474 if graftstate.exists():
2475 statedata = _readgraftstate(repo, graftstate)
2475 statedata = _readgraftstate(repo, graftstate)
2476 if statedata.get('date'):
2476 if statedata.get('date'):
2477 opts['date'] = statedata['date']
2477 opts['date'] = statedata['date']
2478 if statedata.get('user'):
2478 if statedata.get('user'):
2479 opts['user'] = statedata['user']
2479 opts['user'] = statedata['user']
2480 if statedata.get('log'):
2480 if statedata.get('log'):
2481 opts['log'] = True
2481 opts['log'] = True
2482 if statedata.get('no_commit'):
2482 if statedata.get('no_commit'):
2483 opts['no_commit'] = statedata.get('no_commit')
2483 opts['no_commit'] = statedata.get('no_commit')
2484 nodes = statedata['nodes']
2484 nodes = statedata['nodes']
2485 revs = [repo[node].rev() for node in nodes]
2485 revs = [repo[node].rev() for node in nodes]
2486 else:
2486 else:
2487 cmdutil.wrongtooltocontinue(repo, _('graft'))
2487 cmdutil.wrongtooltocontinue(repo, _('graft'))
2488 else:
2488 else:
2489 if not revs:
2489 if not revs:
2490 raise error.Abort(_('no revisions specified'))
2490 raise error.Abort(_('no revisions specified'))
2491 cmdutil.checkunfinished(repo)
2491 cmdutil.checkunfinished(repo)
2492 cmdutil.bailifchanged(repo)
2492 cmdutil.bailifchanged(repo)
2493 revs = scmutil.revrange(repo, revs)
2493 revs = scmutil.revrange(repo, revs)
2494
2494
2495 skipped = set()
2495 skipped = set()
2496 if basectx is None:
2496 if basectx is None:
2497 # check for merges
2497 # check for merges
2498 for rev in repo.revs('%ld and merge()', revs):
2498 for rev in repo.revs('%ld and merge()', revs):
2499 ui.warn(_('skipping ungraftable merge revision %d\n') % rev)
2499 ui.warn(_('skipping ungraftable merge revision %d\n') % rev)
2500 skipped.add(rev)
2500 skipped.add(rev)
2501 revs = [r for r in revs if r not in skipped]
2501 revs = [r for r in revs if r not in skipped]
2502 if not revs:
2502 if not revs:
2503 return -1
2503 return -1
2504 if basectx is not None and len(revs) != 1:
2504 if basectx is not None and len(revs) != 1:
2505 raise error.Abort(_('only one revision allowed with --base '))
2505 raise error.Abort(_('only one revision allowed with --base '))
2506
2506
2507 # Don't check in the --continue case, in effect retaining --force across
2507 # Don't check in the --continue case, in effect retaining --force across
2508 # --continues. That's because without --force, any revisions we decided to
2508 # --continues. That's because without --force, any revisions we decided to
2509 # skip would have been filtered out here, so they wouldn't have made their
2509 # skip would have been filtered out here, so they wouldn't have made their
2510 # way to the graftstate. With --force, any revisions we would have otherwise
2510 # way to the graftstate. With --force, any revisions we would have otherwise
2511 # skipped would not have been filtered out, and if they hadn't been applied
2511 # skipped would not have been filtered out, and if they hadn't been applied
2512 # already, they'd have been in the graftstate.
2512 # already, they'd have been in the graftstate.
2513 if not (cont or opts.get('force')) and basectx is None:
2513 if not (cont or opts.get('force')) and basectx is None:
2514 # check for ancestors of dest branch
2514 # check for ancestors of dest branch
2515 crev = repo['.'].rev()
2515 crev = repo['.'].rev()
2516 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2516 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2517 # XXX make this lazy in the future
2517 # XXX make this lazy in the future
2518 # don't mutate while iterating, create a copy
2518 # don't mutate while iterating, create a copy
2519 for rev in list(revs):
2519 for rev in list(revs):
2520 if rev in ancestors:
2520 if rev in ancestors:
2521 ui.warn(_('skipping ancestor revision %d:%s\n') %
2521 ui.warn(_('skipping ancestor revision %d:%s\n') %
2522 (rev, repo[rev]))
2522 (rev, repo[rev]))
2523 # XXX remove on list is slow
2523 # XXX remove on list is slow
2524 revs.remove(rev)
2524 revs.remove(rev)
2525 if not revs:
2525 if not revs:
2526 return -1
2526 return -1
2527
2527
2528 # analyze revs for earlier grafts
2528 # analyze revs for earlier grafts
2529 ids = {}
2529 ids = {}
2530 for ctx in repo.set("%ld", revs):
2530 for ctx in repo.set("%ld", revs):
2531 ids[ctx.hex()] = ctx.rev()
2531 ids[ctx.hex()] = ctx.rev()
2532 n = ctx.extra().get('source')
2532 n = ctx.extra().get('source')
2533 if n:
2533 if n:
2534 ids[n] = ctx.rev()
2534 ids[n] = ctx.rev()
2535
2535
2536 # check ancestors for earlier grafts
2536 # check ancestors for earlier grafts
2537 ui.debug('scanning for duplicate grafts\n')
2537 ui.debug('scanning for duplicate grafts\n')
2538
2538
2539 # The only changesets we can be sure doesn't contain grafts of any
2539 # The only changesets we can be sure doesn't contain grafts of any
2540 # revs, are the ones that are common ancestors of *all* revs:
2540 # revs, are the ones that are common ancestors of *all* revs:
2541 for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs):
2541 for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs):
2542 ctx = repo[rev]
2542 ctx = repo[rev]
2543 n = ctx.extra().get('source')
2543 n = ctx.extra().get('source')
2544 if n in ids:
2544 if n in ids:
2545 try:
2545 try:
2546 r = repo[n].rev()
2546 r = repo[n].rev()
2547 except error.RepoLookupError:
2547 except error.RepoLookupError:
2548 r = None
2548 r = None
2549 if r in revs:
2549 if r in revs:
2550 ui.warn(_('skipping revision %d:%s '
2550 ui.warn(_('skipping revision %d:%s '
2551 '(already grafted to %d:%s)\n')
2551 '(already grafted to %d:%s)\n')
2552 % (r, repo[r], rev, ctx))
2552 % (r, repo[r], rev, ctx))
2553 revs.remove(r)
2553 revs.remove(r)
2554 elif ids[n] in revs:
2554 elif ids[n] in revs:
2555 if r is None:
2555 if r is None:
2556 ui.warn(_('skipping already grafted revision %d:%s '
2556 ui.warn(_('skipping already grafted revision %d:%s '
2557 '(%d:%s also has unknown origin %s)\n')
2557 '(%d:%s also has unknown origin %s)\n')
2558 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2558 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2559 else:
2559 else:
2560 ui.warn(_('skipping already grafted revision %d:%s '
2560 ui.warn(_('skipping already grafted revision %d:%s '
2561 '(%d:%s also has origin %d:%s)\n')
2561 '(%d:%s also has origin %d:%s)\n')
2562 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2562 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2563 revs.remove(ids[n])
2563 revs.remove(ids[n])
2564 elif ctx.hex() in ids:
2564 elif ctx.hex() in ids:
2565 r = ids[ctx.hex()]
2565 r = ids[ctx.hex()]
2566 if r in revs:
2566 if r in revs:
2567 ui.warn(_('skipping already grafted revision %d:%s '
2567 ui.warn(_('skipping already grafted revision %d:%s '
2568 '(was grafted from %d:%s)\n') %
2568 '(was grafted from %d:%s)\n') %
2569 (r, repo[r], rev, ctx))
2569 (r, repo[r], rev, ctx))
2570 revs.remove(r)
2570 revs.remove(r)
2571 if not revs:
2571 if not revs:
2572 return -1
2572 return -1
2573
2573
2574 if opts.get('no_commit'):
2574 if opts.get('no_commit'):
2575 statedata['no_commit'] = True
2575 statedata['no_commit'] = True
2576 for pos, ctx in enumerate(repo.set("%ld", revs)):
2576 for pos, ctx in enumerate(repo.set("%ld", revs)):
2577 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2577 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2578 ctx.description().split('\n', 1)[0])
2578 ctx.description().split('\n', 1)[0])
2579 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2579 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2580 if names:
2580 if names:
2581 desc += ' (%s)' % ' '.join(names)
2581 desc += ' (%s)' % ' '.join(names)
2582 ui.status(_('grafting %s\n') % desc)
2582 ui.status(_('grafting %s\n') % desc)
2583 if opts.get('dry_run'):
2583 if opts.get('dry_run'):
2584 continue
2584 continue
2585
2585
2586 source = ctx.extra().get('source')
2586 source = ctx.extra().get('source')
2587 extra = {}
2587 extra = {}
2588 if source:
2588 if source:
2589 extra['source'] = source
2589 extra['source'] = source
2590 extra['intermediate-source'] = ctx.hex()
2590 extra['intermediate-source'] = ctx.hex()
2591 else:
2591 else:
2592 extra['source'] = ctx.hex()
2592 extra['source'] = ctx.hex()
2593 user = ctx.user()
2593 user = ctx.user()
2594 if opts.get('user'):
2594 if opts.get('user'):
2595 user = opts['user']
2595 user = opts['user']
2596 statedata['user'] = user
2596 statedata['user'] = user
2597 date = ctx.date()
2597 date = ctx.date()
2598 if opts.get('date'):
2598 if opts.get('date'):
2599 date = opts['date']
2599 date = opts['date']
2600 statedata['date'] = date
2600 statedata['date'] = date
2601 message = ctx.description()
2601 message = ctx.description()
2602 if opts.get('log'):
2602 if opts.get('log'):
2603 message += '\n(grafted from %s)' % ctx.hex()
2603 message += '\n(grafted from %s)' % ctx.hex()
2604 statedata['log'] = True
2604 statedata['log'] = True
2605
2605
2606 # we don't merge the first commit when continuing
2606 # we don't merge the first commit when continuing
2607 if not cont:
2607 if not cont:
2608 # perform the graft merge with p1(rev) as 'ancestor'
2608 # perform the graft merge with p1(rev) as 'ancestor'
2609 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
2609 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
2610 base = ctx.p1() if basectx is None else basectx
2610 base = ctx.p1() if basectx is None else basectx
2611 with ui.configoverride(overrides, 'graft'):
2611 with ui.configoverride(overrides, 'graft'):
2612 stats = mergemod.graft(repo, ctx, base, ['local', 'graft'])
2612 stats = mergemod.graft(repo, ctx, base, ['local', 'graft'])
2613 # report any conflicts
2613 # report any conflicts
2614 if stats.unresolvedcount > 0:
2614 if stats.unresolvedcount > 0:
2615 # write out state for --continue
2615 # write out state for --continue
2616 nodes = [repo[rev].hex() for rev in revs[pos:]]
2616 nodes = [repo[rev].hex() for rev in revs[pos:]]
2617 statedata['nodes'] = nodes
2617 statedata['nodes'] = nodes
2618 stateversion = 1
2618 stateversion = 1
2619 graftstate.save(stateversion, statedata)
2619 graftstate.save(stateversion, statedata)
2620 hint = _("use 'hg resolve' and 'hg graft --continue'")
2620 hint = _("use 'hg resolve' and 'hg graft --continue'")
2621 raise error.Abort(
2621 raise error.Abort(
2622 _("unresolved conflicts, can't continue"),
2622 _("unresolved conflicts, can't continue"),
2623 hint=hint)
2623 hint=hint)
2624 else:
2624 else:
2625 cont = False
2625 cont = False
2626
2626
2627 # commit if --no-commit is false
2627 # commit if --no-commit is false
2628 if not opts.get('no_commit'):
2628 if not opts.get('no_commit'):
2629 node = repo.commit(text=message, user=user, date=date, extra=extra,
2629 node = repo.commit(text=message, user=user, date=date, extra=extra,
2630 editor=editor)
2630 editor=editor)
2631 if node is None:
2631 if node is None:
2632 ui.warn(
2632 ui.warn(
2633 _('note: graft of %d:%s created no changes to commit\n') %
2633 _('note: graft of %d:%s created no changes to commit\n') %
2634 (ctx.rev(), ctx))
2634 (ctx.rev(), ctx))
2635 # checking that newnodes exist because old state files won't have it
2635 # checking that newnodes exist because old state files won't have it
2636 elif statedata.get('newnodes') is not None:
2636 elif statedata.get('newnodes') is not None:
2637 statedata['newnodes'].append(node)
2637 statedata['newnodes'].append(node)
2638
2638
2639 # remove state when we complete successfully
2639 # remove state when we complete successfully
2640 if not opts.get('dry_run'):
2640 if not opts.get('dry_run'):
2641 graftstate.delete()
2641 graftstate.delete()
2642
2642
2643 return 0
2643 return 0
2644
2644
2645 def _abortgraft(ui, repo, graftstate):
2645 def _abortgraft(ui, repo, graftstate):
2646 """abort the interrupted graft and rollbacks to the state before interrupted
2646 """abort the interrupted graft and rollbacks to the state before interrupted
2647 graft"""
2647 graft"""
2648 if not graftstate.exists():
2648 if not graftstate.exists():
2649 raise error.Abort(_("no interrupted graft to abort"))
2649 raise error.Abort(_("no interrupted graft to abort"))
2650 statedata = _readgraftstate(repo, graftstate)
2650 statedata = _readgraftstate(repo, graftstate)
2651 newnodes = statedata.get('newnodes')
2651 newnodes = statedata.get('newnodes')
2652 if newnodes is None:
2652 if newnodes is None:
2653 # and old graft state which does not have all the data required to abort
2653 # and old graft state which does not have all the data required to abort
2654 # the graft
2654 # the graft
2655 raise error.Abort(_("cannot abort using an old graftstate"))
2655 raise error.Abort(_("cannot abort using an old graftstate"))
2656
2656
2657 # changeset from which graft operation was started
2657 # changeset from which graft operation was started
2658 if len(newnodes) > 0:
2658 if len(newnodes) > 0:
2659 startctx = repo[newnodes[0]].p1()
2659 startctx = repo[newnodes[0]].p1()
2660 else:
2660 else:
2661 startctx = repo['.']
2661 startctx = repo['.']
2662 # whether to strip or not
2662 # whether to strip or not
2663 cleanup = False
2663 cleanup = False
2664 if newnodes:
2664 if newnodes:
2665 newnodes = [repo[r].rev() for r in newnodes]
2665 newnodes = [repo[r].rev() for r in newnodes]
2666 cleanup = True
2666 cleanup = True
2667 # checking that none of the newnodes turned public or is public
2667 # checking that none of the newnodes turned public or is public
2668 immutable = [c for c in newnodes if not repo[c].mutable()]
2668 immutable = [c for c in newnodes if not repo[c].mutable()]
2669 if immutable:
2669 if immutable:
2670 repo.ui.warn(_("cannot clean up public changesets %s\n")
2670 repo.ui.warn(_("cannot clean up public changesets %s\n")
2671 % ', '.join(bytes(repo[r]) for r in immutable),
2671 % ', '.join(bytes(repo[r]) for r in immutable),
2672 hint=_("see 'hg help phases' for details"))
2672 hint=_("see 'hg help phases' for details"))
2673 cleanup = False
2673 cleanup = False
2674
2674
2675 # checking that no new nodes are created on top of grafted revs
2675 # checking that no new nodes are created on top of grafted revs
2676 desc = set(repo.changelog.descendants(newnodes))
2676 desc = set(repo.changelog.descendants(newnodes))
2677 if desc - set(newnodes):
2677 if desc - set(newnodes):
2678 repo.ui.warn(_("new changesets detected on destination "
2678 repo.ui.warn(_("new changesets detected on destination "
2679 "branch, can't strip\n"))
2679 "branch, can't strip\n"))
2680 cleanup = False
2680 cleanup = False
2681
2681
2682 if cleanup:
2682 if cleanup:
2683 with repo.wlock(), repo.lock():
2683 with repo.wlock(), repo.lock():
2684 hg.updaterepo(repo, startctx.node(), overwrite=True)
2684 hg.updaterepo(repo, startctx.node(), overwrite=True)
2685 # stripping the new nodes created
2685 # stripping the new nodes created
2686 strippoints = [c.node() for c in repo.set("roots(%ld)",
2686 strippoints = [c.node() for c in repo.set("roots(%ld)",
2687 newnodes)]
2687 newnodes)]
2688 repair.strip(repo.ui, repo, strippoints, backup=False)
2688 repair.strip(repo.ui, repo, strippoints, backup=False)
2689
2689
2690 if not cleanup:
2690 if not cleanup:
2691 # we don't update to the startnode if we can't strip
2691 # we don't update to the startnode if we can't strip
2692 startctx = repo['.']
2692 startctx = repo['.']
2693 hg.updaterepo(repo, startctx.node(), overwrite=True)
2693 hg.updaterepo(repo, startctx.node(), overwrite=True)
2694
2694
2695 ui.status(_("graft aborted\n"))
2695 ui.status(_("graft aborted\n"))
2696 ui.status(_("working directory is now at %s\n") % startctx.hex()[:12])
2696 ui.status(_("working directory is now at %s\n") % startctx.hex()[:12])
2697 graftstate.delete()
2697 graftstate.delete()
2698 return 0
2698 return 0
2699
2699
2700 def _readgraftstate(repo, graftstate):
2700 def _readgraftstate(repo, graftstate):
2701 """read the graft state file and return a dict of the data stored in it"""
2701 """read the graft state file and return a dict of the data stored in it"""
2702 try:
2702 try:
2703 return graftstate.read()
2703 return graftstate.read()
2704 except error.CorruptedState:
2704 except error.CorruptedState:
2705 nodes = repo.vfs.read('graftstate').splitlines()
2705 nodes = repo.vfs.read('graftstate').splitlines()
2706 return {'nodes': nodes}
2706 return {'nodes': nodes}
2707
2707
2708 def _stopgraft(ui, repo, graftstate):
2708 def _stopgraft(ui, repo, graftstate):
2709 """stop the interrupted graft"""
2709 """stop the interrupted graft"""
2710 if not graftstate.exists():
2710 if not graftstate.exists():
2711 raise error.Abort(_("no interrupted graft found"))
2711 raise error.Abort(_("no interrupted graft found"))
2712 pctx = repo['.']
2712 pctx = repo['.']
2713 hg.updaterepo(repo, pctx.node(), overwrite=True)
2713 hg.updaterepo(repo, pctx.node(), overwrite=True)
2714 graftstate.delete()
2714 graftstate.delete()
2715 ui.status(_("stopped the interrupted graft\n"))
2715 ui.status(_("stopped the interrupted graft\n"))
2716 ui.status(_("working directory is now at %s\n") % pctx.hex()[:12])
2716 ui.status(_("working directory is now at %s\n") % pctx.hex()[:12])
2717 return 0
2717 return 0
2718
2718
2719 @command('grep',
2719 @command('grep',
2720 [('0', 'print0', None, _('end fields with NUL')),
2720 [('0', 'print0', None, _('end fields with NUL')),
2721 ('', 'all', None, _('print all revisions that match (DEPRECATED) ')),
2721 ('', 'all', None, _('print all revisions that match (DEPRECATED) ')),
2722 ('', 'diff', None, _('print all revisions when the term was introduced '
2722 ('', 'diff', None, _('print all revisions when the term was introduced '
2723 'or removed')),
2723 'or removed')),
2724 ('a', 'text', None, _('treat all files as text')),
2724 ('a', 'text', None, _('treat all files as text')),
2725 ('f', 'follow', None,
2725 ('f', 'follow', None,
2726 _('follow changeset history,'
2726 _('follow changeset history,'
2727 ' or file history across copies and renames')),
2727 ' or file history across copies and renames')),
2728 ('i', 'ignore-case', None, _('ignore case when matching')),
2728 ('i', 'ignore-case', None, _('ignore case when matching')),
2729 ('l', 'files-with-matches', None,
2729 ('l', 'files-with-matches', None,
2730 _('print only filenames and revisions that match')),
2730 _('print only filenames and revisions that match')),
2731 ('n', 'line-number', None, _('print matching line numbers')),
2731 ('n', 'line-number', None, _('print matching line numbers')),
2732 ('r', 'rev', [],
2732 ('r', 'rev', [],
2733 _('only search files changed within revision range'), _('REV')),
2733 _('only search files changed within revision range'), _('REV')),
2734 ('', 'all-files', None,
2734 ('', 'all-files', None,
2735 _('include all files in the changeset while grepping (EXPERIMENTAL)')),
2735 _('include all files in the changeset while grepping (EXPERIMENTAL)')),
2736 ('u', 'user', None, _('list the author (long with -v)')),
2736 ('u', 'user', None, _('list the author (long with -v)')),
2737 ('d', 'date', None, _('list the date (short with -q)')),
2737 ('d', 'date', None, _('list the date (short with -q)')),
2738 ] + formatteropts + walkopts,
2738 ] + formatteropts + walkopts,
2739 _('[OPTION]... PATTERN [FILE]...'),
2739 _('[OPTION]... PATTERN [FILE]...'),
2740 helpcategory=command.CATEGORY_FILE_CONTENTS,
2740 helpcategory=command.CATEGORY_FILE_CONTENTS,
2741 inferrepo=True,
2741 inferrepo=True,
2742 intents={INTENT_READONLY})
2742 intents={INTENT_READONLY})
2743 def grep(ui, repo, pattern, *pats, **opts):
2743 def grep(ui, repo, pattern, *pats, **opts):
2744 """search revision history for a pattern in specified files
2744 """search revision history for a pattern in specified files
2745
2745
2746 Search revision history for a regular expression in the specified
2746 Search revision history for a regular expression in the specified
2747 files or the entire project.
2747 files or the entire project.
2748
2748
2749 By default, grep prints the most recent revision number for each
2749 By default, grep prints the most recent revision number for each
2750 file in which it finds a match. To get it to print every revision
2750 file in which it finds a match. To get it to print every revision
2751 that contains a change in match status ("-" for a match that becomes
2751 that contains a change in match status ("-" for a match that becomes
2752 a non-match, or "+" for a non-match that becomes a match), use the
2752 a non-match, or "+" for a non-match that becomes a match), use the
2753 --diff flag.
2753 --diff flag.
2754
2754
2755 PATTERN can be any Python (roughly Perl-compatible) regular
2755 PATTERN can be any Python (roughly Perl-compatible) regular
2756 expression.
2756 expression.
2757
2757
2758 If no FILEs are specified (and -f/--follow isn't set), all files in
2758 If no FILEs are specified (and -f/--follow isn't set), all files in
2759 the repository are searched, including those that don't exist in the
2759 the repository are searched, including those that don't exist in the
2760 current branch or have been deleted in a prior changeset.
2760 current branch or have been deleted in a prior changeset.
2761
2761
2762 .. container:: verbose
2762 .. container:: verbose
2763
2763
2764 Template:
2764 Template:
2765
2765
2766 The following keywords are supported in addition to the common template
2766 The following keywords are supported in addition to the common template
2767 keywords and functions. See also :hg:`help templates`.
2767 keywords and functions. See also :hg:`help templates`.
2768
2768
2769 :change: String. Character denoting insertion ``+`` or removal ``-``.
2769 :change: String. Character denoting insertion ``+`` or removal ``-``.
2770 Available if ``--diff`` is specified.
2770 Available if ``--diff`` is specified.
2771 :lineno: Integer. Line number of the match.
2771 :lineno: Integer. Line number of the match.
2772 :path: String. Repository-absolute path of the file.
2772 :path: String. Repository-absolute path of the file.
2773 :texts: List of text chunks.
2773 :texts: List of text chunks.
2774
2774
2775 And each entry of ``{texts}`` provides the following sub-keywords.
2775 And each entry of ``{texts}`` provides the following sub-keywords.
2776
2776
2777 :matched: Boolean. True if the chunk matches the specified pattern.
2777 :matched: Boolean. True if the chunk matches the specified pattern.
2778 :text: String. Chunk content.
2778 :text: String. Chunk content.
2779
2779
2780 See :hg:`help templates.operators` for the list expansion syntax.
2780 See :hg:`help templates.operators` for the list expansion syntax.
2781
2781
2782 Returns 0 if a match is found, 1 otherwise.
2782 Returns 0 if a match is found, 1 otherwise.
2783 """
2783 """
2784 opts = pycompat.byteskwargs(opts)
2784 opts = pycompat.byteskwargs(opts)
2785 diff = opts.get('all') or opts.get('diff')
2785 diff = opts.get('all') or opts.get('diff')
2786 all_files = opts.get('all_files')
2786 all_files = opts.get('all_files')
2787 if diff and opts.get('all_files'):
2787 if diff and opts.get('all_files'):
2788 raise error.Abort(_('--diff and --all-files are mutually exclusive'))
2788 raise error.Abort(_('--diff and --all-files are mutually exclusive'))
2789 # TODO: remove "not opts.get('rev')" if --all-files -rMULTIREV gets working
2789 # TODO: remove "not opts.get('rev')" if --all-files -rMULTIREV gets working
2790 if opts.get('all_files') is None and not opts.get('rev') and not diff:
2790 if opts.get('all_files') is None and not opts.get('rev') and not diff:
2791 # experimental config: commands.grep.all-files
2791 # experimental config: commands.grep.all-files
2792 opts['all_files'] = ui.configbool('commands', 'grep.all-files')
2792 opts['all_files'] = ui.configbool('commands', 'grep.all-files')
2793 plaingrep = opts.get('all_files') and not opts.get('rev')
2793 plaingrep = opts.get('all_files') and not opts.get('rev')
2794 if plaingrep:
2794 if plaingrep:
2795 opts['rev'] = ['wdir()']
2795 opts['rev'] = ['wdir()']
2796
2796
2797 reflags = re.M
2797 reflags = re.M
2798 if opts.get('ignore_case'):
2798 if opts.get('ignore_case'):
2799 reflags |= re.I
2799 reflags |= re.I
2800 try:
2800 try:
2801 regexp = util.re.compile(pattern, reflags)
2801 regexp = util.re.compile(pattern, reflags)
2802 except re.error as inst:
2802 except re.error as inst:
2803 ui.warn(_("grep: invalid match pattern: %s\n") % pycompat.bytestr(inst))
2803 ui.warn(_("grep: invalid match pattern: %s\n") % pycompat.bytestr(inst))
2804 return 1
2804 return 1
2805 sep, eol = ':', '\n'
2805 sep, eol = ':', '\n'
2806 if opts.get('print0'):
2806 if opts.get('print0'):
2807 sep = eol = '\0'
2807 sep = eol = '\0'
2808
2808
2809 getfile = util.lrucachefunc(repo.file)
2809 getfile = util.lrucachefunc(repo.file)
2810
2810
2811 def matchlines(body):
2811 def matchlines(body):
2812 begin = 0
2812 begin = 0
2813 linenum = 0
2813 linenum = 0
2814 while begin < len(body):
2814 while begin < len(body):
2815 match = regexp.search(body, begin)
2815 match = regexp.search(body, begin)
2816 if not match:
2816 if not match:
2817 break
2817 break
2818 mstart, mend = match.span()
2818 mstart, mend = match.span()
2819 linenum += body.count('\n', begin, mstart) + 1
2819 linenum += body.count('\n', begin, mstart) + 1
2820 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2820 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2821 begin = body.find('\n', mend) + 1 or len(body) + 1
2821 begin = body.find('\n', mend) + 1 or len(body) + 1
2822 lend = begin - 1
2822 lend = begin - 1
2823 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2823 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2824
2824
2825 class linestate(object):
2825 class linestate(object):
2826 def __init__(self, line, linenum, colstart, colend):
2826 def __init__(self, line, linenum, colstart, colend):
2827 self.line = line
2827 self.line = line
2828 self.linenum = linenum
2828 self.linenum = linenum
2829 self.colstart = colstart
2829 self.colstart = colstart
2830 self.colend = colend
2830 self.colend = colend
2831
2831
2832 def __hash__(self):
2832 def __hash__(self):
2833 return hash((self.linenum, self.line))
2833 return hash((self.linenum, self.line))
2834
2834
2835 def __eq__(self, other):
2835 def __eq__(self, other):
2836 return self.line == other.line
2836 return self.line == other.line
2837
2837
2838 def findpos(self):
2838 def findpos(self):
2839 """Iterate all (start, end) indices of matches"""
2839 """Iterate all (start, end) indices of matches"""
2840 yield self.colstart, self.colend
2840 yield self.colstart, self.colend
2841 p = self.colend
2841 p = self.colend
2842 while p < len(self.line):
2842 while p < len(self.line):
2843 m = regexp.search(self.line, p)
2843 m = regexp.search(self.line, p)
2844 if not m:
2844 if not m:
2845 break
2845 break
2846 yield m.span()
2846 yield m.span()
2847 p = m.end()
2847 p = m.end()
2848
2848
2849 matches = {}
2849 matches = {}
2850 copies = {}
2850 copies = {}
2851 def grepbody(fn, rev, body):
2851 def grepbody(fn, rev, body):
2852 matches[rev].setdefault(fn, [])
2852 matches[rev].setdefault(fn, [])
2853 m = matches[rev][fn]
2853 m = matches[rev][fn]
2854 for lnum, cstart, cend, line in matchlines(body):
2854 for lnum, cstart, cend, line in matchlines(body):
2855 s = linestate(line, lnum, cstart, cend)
2855 s = linestate(line, lnum, cstart, cend)
2856 m.append(s)
2856 m.append(s)
2857
2857
2858 def difflinestates(a, b):
2858 def difflinestates(a, b):
2859 sm = difflib.SequenceMatcher(None, a, b)
2859 sm = difflib.SequenceMatcher(None, a, b)
2860 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2860 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2861 if tag == r'insert':
2861 if tag == r'insert':
2862 for i in pycompat.xrange(blo, bhi):
2862 for i in pycompat.xrange(blo, bhi):
2863 yield ('+', b[i])
2863 yield ('+', b[i])
2864 elif tag == r'delete':
2864 elif tag == r'delete':
2865 for i in pycompat.xrange(alo, ahi):
2865 for i in pycompat.xrange(alo, ahi):
2866 yield ('-', a[i])
2866 yield ('-', a[i])
2867 elif tag == r'replace':
2867 elif tag == r'replace':
2868 for i in pycompat.xrange(alo, ahi):
2868 for i in pycompat.xrange(alo, ahi):
2869 yield ('-', a[i])
2869 yield ('-', a[i])
2870 for i in pycompat.xrange(blo, bhi):
2870 for i in pycompat.xrange(blo, bhi):
2871 yield ('+', b[i])
2871 yield ('+', b[i])
2872
2872
2873 uipathfn = scmutil.getuipathfn(repo)
2873 uipathfn = scmutil.getuipathfn(repo)
2874 def display(fm, fn, ctx, pstates, states):
2874 def display(fm, fn, ctx, pstates, states):
2875 rev = scmutil.intrev(ctx)
2875 rev = scmutil.intrev(ctx)
2876 if fm.isplain():
2876 if fm.isplain():
2877 formatuser = ui.shortuser
2877 formatuser = ui.shortuser
2878 else:
2878 else:
2879 formatuser = pycompat.bytestr
2879 formatuser = pycompat.bytestr
2880 if ui.quiet:
2880 if ui.quiet:
2881 datefmt = '%Y-%m-%d'
2881 datefmt = '%Y-%m-%d'
2882 else:
2882 else:
2883 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2883 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2884 found = False
2884 found = False
2885 @util.cachefunc
2885 @util.cachefunc
2886 def binary():
2886 def binary():
2887 flog = getfile(fn)
2887 flog = getfile(fn)
2888 try:
2888 try:
2889 return stringutil.binary(flog.read(ctx.filenode(fn)))
2889 return stringutil.binary(flog.read(ctx.filenode(fn)))
2890 except error.WdirUnsupported:
2890 except error.WdirUnsupported:
2891 return ctx[fn].isbinary()
2891 return ctx[fn].isbinary()
2892
2892
2893 fieldnamemap = {'linenumber': 'lineno'}
2893 fieldnamemap = {'linenumber': 'lineno'}
2894 if diff:
2894 if diff:
2895 iter = difflinestates(pstates, states)
2895 iter = difflinestates(pstates, states)
2896 else:
2896 else:
2897 iter = [('', l) for l in states]
2897 iter = [('', l) for l in states]
2898 for change, l in iter:
2898 for change, l in iter:
2899 fm.startitem()
2899 fm.startitem()
2900 fm.context(ctx=ctx)
2900 fm.context(ctx=ctx)
2901 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
2901 fm.data(node=fm.hexfunc(scmutil.binnode(ctx)), path=fn)
2902 fm.plain(uipathfn(fn), label='grep.filename')
2902 fm.plain(uipathfn(fn), label='grep.filename')
2903
2903
2904 cols = [
2904 cols = [
2905 ('rev', '%d', rev, not plaingrep, ''),
2905 ('rev', '%d', rev, not plaingrep, ''),
2906 ('linenumber', '%d', l.linenum, opts.get('line_number'), ''),
2906 ('linenumber', '%d', l.linenum, opts.get('line_number'), ''),
2907 ]
2907 ]
2908 if diff:
2908 if diff:
2909 cols.append(
2909 cols.append(
2910 ('change', '%s', change, True,
2910 ('change', '%s', change, True,
2911 'grep.inserted ' if change == '+' else 'grep.deleted ')
2911 'grep.inserted ' if change == '+' else 'grep.deleted ')
2912 )
2912 )
2913 cols.extend([
2913 cols.extend([
2914 ('user', '%s', formatuser(ctx.user()), opts.get('user'), ''),
2914 ('user', '%s', formatuser(ctx.user()), opts.get('user'), ''),
2915 ('date', '%s', fm.formatdate(ctx.date(), datefmt),
2915 ('date', '%s', fm.formatdate(ctx.date(), datefmt),
2916 opts.get('date'), ''),
2916 opts.get('date'), ''),
2917 ])
2917 ])
2918 for name, fmt, data, cond, extra_label in cols:
2918 for name, fmt, data, cond, extra_label in cols:
2919 if cond:
2919 if cond:
2920 fm.plain(sep, label='grep.sep')
2920 fm.plain(sep, label='grep.sep')
2921 field = fieldnamemap.get(name, name)
2921 field = fieldnamemap.get(name, name)
2922 label = extra_label + ('grep.%s' % name)
2922 label = extra_label + ('grep.%s' % name)
2923 fm.condwrite(cond, field, fmt, data, label=label)
2923 fm.condwrite(cond, field, fmt, data, label=label)
2924 if not opts.get('files_with_matches'):
2924 if not opts.get('files_with_matches'):
2925 fm.plain(sep, label='grep.sep')
2925 fm.plain(sep, label='grep.sep')
2926 if not opts.get('text') and binary():
2926 if not opts.get('text') and binary():
2927 fm.plain(_(" Binary file matches"))
2927 fm.plain(_(" Binary file matches"))
2928 else:
2928 else:
2929 displaymatches(fm.nested('texts', tmpl='{text}'), l)
2929 displaymatches(fm.nested('texts', tmpl='{text}'), l)
2930 fm.plain(eol)
2930 fm.plain(eol)
2931 found = True
2931 found = True
2932 if opts.get('files_with_matches'):
2932 if opts.get('files_with_matches'):
2933 break
2933 break
2934 return found
2934 return found
2935
2935
2936 def displaymatches(fm, l):
2936 def displaymatches(fm, l):
2937 p = 0
2937 p = 0
2938 for s, e in l.findpos():
2938 for s, e in l.findpos():
2939 if p < s:
2939 if p < s:
2940 fm.startitem()
2940 fm.startitem()
2941 fm.write('text', '%s', l.line[p:s])
2941 fm.write('text', '%s', l.line[p:s])
2942 fm.data(matched=False)
2942 fm.data(matched=False)
2943 fm.startitem()
2943 fm.startitem()
2944 fm.write('text', '%s', l.line[s:e], label='grep.match')
2944 fm.write('text', '%s', l.line[s:e], label='grep.match')
2945 fm.data(matched=True)
2945 fm.data(matched=True)
2946 p = e
2946 p = e
2947 if p < len(l.line):
2947 if p < len(l.line):
2948 fm.startitem()
2948 fm.startitem()
2949 fm.write('text', '%s', l.line[p:])
2949 fm.write('text', '%s', l.line[p:])
2950 fm.data(matched=False)
2950 fm.data(matched=False)
2951 fm.end()
2951 fm.end()
2952
2952
2953 skip = set()
2953 skip = set()
2954 revfiles = {}
2954 revfiles = {}
2955 match = scmutil.match(repo[None], pats, opts)
2955 match = scmutil.match(repo[None], pats, opts)
2956 found = False
2956 found = False
2957 follow = opts.get('follow')
2957 follow = opts.get('follow')
2958
2958
2959 getrenamed = scmutil.getrenamedfn(repo)
2959 getrenamed = scmutil.getrenamedfn(repo)
2960 def prep(ctx, fns):
2960 def prep(ctx, fns):
2961 rev = ctx.rev()
2961 rev = ctx.rev()
2962 pctx = ctx.p1()
2962 pctx = ctx.p1()
2963 parent = pctx.rev()
2963 parent = pctx.rev()
2964 matches.setdefault(rev, {})
2964 matches.setdefault(rev, {})
2965 matches.setdefault(parent, {})
2965 matches.setdefault(parent, {})
2966 files = revfiles.setdefault(rev, [])
2966 files = revfiles.setdefault(rev, [])
2967 for fn in fns:
2967 for fn in fns:
2968 flog = getfile(fn)
2968 flog = getfile(fn)
2969 try:
2969 try:
2970 fnode = ctx.filenode(fn)
2970 fnode = ctx.filenode(fn)
2971 except error.LookupError:
2971 except error.LookupError:
2972 continue
2972 continue
2973
2973
2974 copy = None
2974 copy = None
2975 if follow:
2975 if follow:
2976 copy = getrenamed(fn, rev)
2976 copy = getrenamed(fn, rev)
2977 if copy:
2977 if copy:
2978 copies.setdefault(rev, {})[fn] = copy
2978 copies.setdefault(rev, {})[fn] = copy
2979 if fn in skip:
2979 if fn in skip:
2980 skip.add(copy)
2980 skip.add(copy)
2981 if fn in skip:
2981 if fn in skip:
2982 continue
2982 continue
2983 files.append(fn)
2983 files.append(fn)
2984
2984
2985 if fn not in matches[rev]:
2985 if fn not in matches[rev]:
2986 try:
2986 try:
2987 content = flog.read(fnode)
2987 content = flog.read(fnode)
2988 except error.WdirUnsupported:
2988 except error.WdirUnsupported:
2989 content = ctx[fn].data()
2989 content = ctx[fn].data()
2990 grepbody(fn, rev, content)
2990 grepbody(fn, rev, content)
2991
2991
2992 pfn = copy or fn
2992 pfn = copy or fn
2993 if pfn not in matches[parent]:
2993 if pfn not in matches[parent]:
2994 try:
2994 try:
2995 fnode = pctx.filenode(pfn)
2995 fnode = pctx.filenode(pfn)
2996 grepbody(pfn, parent, flog.read(fnode))
2996 grepbody(pfn, parent, flog.read(fnode))
2997 except error.LookupError:
2997 except error.LookupError:
2998 pass
2998 pass
2999
2999
3000 ui.pager('grep')
3000 ui.pager('grep')
3001 fm = ui.formatter('grep', opts)
3001 fm = ui.formatter('grep', opts)
3002 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
3002 for ctx in cmdutil.walkchangerevs(repo, match, opts, prep):
3003 rev = ctx.rev()
3003 rev = ctx.rev()
3004 parent = ctx.p1().rev()
3004 parent = ctx.p1().rev()
3005 for fn in sorted(revfiles.get(rev, [])):
3005 for fn in sorted(revfiles.get(rev, [])):
3006 states = matches[rev][fn]
3006 states = matches[rev][fn]
3007 copy = copies.get(rev, {}).get(fn)
3007 copy = copies.get(rev, {}).get(fn)
3008 if fn in skip:
3008 if fn in skip:
3009 if copy:
3009 if copy:
3010 skip.add(copy)
3010 skip.add(copy)
3011 continue
3011 continue
3012 pstates = matches.get(parent, {}).get(copy or fn, [])
3012 pstates = matches.get(parent, {}).get(copy or fn, [])
3013 if pstates or states:
3013 if pstates or states:
3014 r = display(fm, fn, ctx, pstates, states)
3014 r = display(fm, fn, ctx, pstates, states)
3015 found = found or r
3015 found = found or r
3016 if r and not diff and not all_files:
3016 if r and not diff and not all_files:
3017 skip.add(fn)
3017 skip.add(fn)
3018 if copy:
3018 if copy:
3019 skip.add(copy)
3019 skip.add(copy)
3020 del revfiles[rev]
3020 del revfiles[rev]
3021 # We will keep the matches dict for the duration of the window
3021 # We will keep the matches dict for the duration of the window
3022 # clear the matches dict once the window is over
3022 # clear the matches dict once the window is over
3023 if not revfiles:
3023 if not revfiles:
3024 matches.clear()
3024 matches.clear()
3025 fm.end()
3025 fm.end()
3026
3026
3027 return not found
3027 return not found
3028
3028
3029 @command('heads',
3029 @command('heads',
3030 [('r', 'rev', '',
3030 [('r', 'rev', '',
3031 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
3031 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
3032 ('t', 'topo', False, _('show topological heads only')),
3032 ('t', 'topo', False, _('show topological heads only')),
3033 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
3033 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
3034 ('c', 'closed', False, _('show normal and closed branch heads')),
3034 ('c', 'closed', False, _('show normal and closed branch heads')),
3035 ] + templateopts,
3035 ] + templateopts,
3036 _('[-ct] [-r STARTREV] [REV]...'),
3036 _('[-ct] [-r STARTREV] [REV]...'),
3037 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3037 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3038 intents={INTENT_READONLY})
3038 intents={INTENT_READONLY})
3039 def heads(ui, repo, *branchrevs, **opts):
3039 def heads(ui, repo, *branchrevs, **opts):
3040 """show branch heads
3040 """show branch heads
3041
3041
3042 With no arguments, show all open branch heads in the repository.
3042 With no arguments, show all open branch heads in the repository.
3043 Branch heads are changesets that have no descendants on the
3043 Branch heads are changesets that have no descendants on the
3044 same branch. They are where development generally takes place and
3044 same branch. They are where development generally takes place and
3045 are the usual targets for update and merge operations.
3045 are the usual targets for update and merge operations.
3046
3046
3047 If one or more REVs are given, only open branch heads on the
3047 If one or more REVs are given, only open branch heads on the
3048 branches associated with the specified changesets are shown. This
3048 branches associated with the specified changesets are shown. This
3049 means that you can use :hg:`heads .` to see the heads on the
3049 means that you can use :hg:`heads .` to see the heads on the
3050 currently checked-out branch.
3050 currently checked-out branch.
3051
3051
3052 If -c/--closed is specified, also show branch heads marked closed
3052 If -c/--closed is specified, also show branch heads marked closed
3053 (see :hg:`commit --close-branch`).
3053 (see :hg:`commit --close-branch`).
3054
3054
3055 If STARTREV is specified, only those heads that are descendants of
3055 If STARTREV is specified, only those heads that are descendants of
3056 STARTREV will be displayed.
3056 STARTREV will be displayed.
3057
3057
3058 If -t/--topo is specified, named branch mechanics will be ignored and only
3058 If -t/--topo is specified, named branch mechanics will be ignored and only
3059 topological heads (changesets with no children) will be shown.
3059 topological heads (changesets with no children) will be shown.
3060
3060
3061 Returns 0 if matching heads are found, 1 if not.
3061 Returns 0 if matching heads are found, 1 if not.
3062 """
3062 """
3063
3063
3064 opts = pycompat.byteskwargs(opts)
3064 opts = pycompat.byteskwargs(opts)
3065 start = None
3065 start = None
3066 rev = opts.get('rev')
3066 rev = opts.get('rev')
3067 if rev:
3067 if rev:
3068 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
3068 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
3069 start = scmutil.revsingle(repo, rev, None).node()
3069 start = scmutil.revsingle(repo, rev, None).node()
3070
3070
3071 if opts.get('topo'):
3071 if opts.get('topo'):
3072 heads = [repo[h] for h in repo.heads(start)]
3072 heads = [repo[h] for h in repo.heads(start)]
3073 else:
3073 else:
3074 heads = []
3074 heads = []
3075 for branch in repo.branchmap():
3075 for branch in repo.branchmap():
3076 heads += repo.branchheads(branch, start, opts.get('closed'))
3076 heads += repo.branchheads(branch, start, opts.get('closed'))
3077 heads = [repo[h] for h in heads]
3077 heads = [repo[h] for h in heads]
3078
3078
3079 if branchrevs:
3079 if branchrevs:
3080 branches = set(repo[r].branch()
3080 branches = set(repo[r].branch()
3081 for r in scmutil.revrange(repo, branchrevs))
3081 for r in scmutil.revrange(repo, branchrevs))
3082 heads = [h for h in heads if h.branch() in branches]
3082 heads = [h for h in heads if h.branch() in branches]
3083
3083
3084 if opts.get('active') and branchrevs:
3084 if opts.get('active') and branchrevs:
3085 dagheads = repo.heads(start)
3085 dagheads = repo.heads(start)
3086 heads = [h for h in heads if h.node() in dagheads]
3086 heads = [h for h in heads if h.node() in dagheads]
3087
3087
3088 if branchrevs:
3088 if branchrevs:
3089 haveheads = set(h.branch() for h in heads)
3089 haveheads = set(h.branch() for h in heads)
3090 if branches - haveheads:
3090 if branches - haveheads:
3091 headless = ', '.join(b for b in branches - haveheads)
3091 headless = ', '.join(b for b in branches - haveheads)
3092 msg = _('no open branch heads found on branches %s')
3092 msg = _('no open branch heads found on branches %s')
3093 if opts.get('rev'):
3093 if opts.get('rev'):
3094 msg += _(' (started at %s)') % opts['rev']
3094 msg += _(' (started at %s)') % opts['rev']
3095 ui.warn((msg + '\n') % headless)
3095 ui.warn((msg + '\n') % headless)
3096
3096
3097 if not heads:
3097 if not heads:
3098 return 1
3098 return 1
3099
3099
3100 ui.pager('heads')
3100 ui.pager('heads')
3101 heads = sorted(heads, key=lambda x: -x.rev())
3101 heads = sorted(heads, key=lambda x: -x.rev())
3102 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3102 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
3103 for ctx in heads:
3103 for ctx in heads:
3104 displayer.show(ctx)
3104 displayer.show(ctx)
3105 displayer.close()
3105 displayer.close()
3106
3106
3107 @command('help',
3107 @command('help',
3108 [('e', 'extension', None, _('show only help for extensions')),
3108 [('e', 'extension', None, _('show only help for extensions')),
3109 ('c', 'command', None, _('show only help for commands')),
3109 ('c', 'command', None, _('show only help for commands')),
3110 ('k', 'keyword', None, _('show topics matching keyword')),
3110 ('k', 'keyword', None, _('show topics matching keyword')),
3111 ('s', 'system', [],
3111 ('s', 'system', [],
3112 _('show help for specific platform(s)'), _('PLATFORM')),
3112 _('show help for specific platform(s)'), _('PLATFORM')),
3113 ],
3113 ],
3114 _('[-eck] [-s PLATFORM] [TOPIC]'),
3114 _('[-eck] [-s PLATFORM] [TOPIC]'),
3115 helpcategory=command.CATEGORY_HELP,
3115 helpcategory=command.CATEGORY_HELP,
3116 norepo=True,
3116 norepo=True,
3117 intents={INTENT_READONLY})
3117 intents={INTENT_READONLY})
3118 def help_(ui, name=None, **opts):
3118 def help_(ui, name=None, **opts):
3119 """show help for a given topic or a help overview
3119 """show help for a given topic or a help overview
3120
3120
3121 With no arguments, print a list of commands with short help messages.
3121 With no arguments, print a list of commands with short help messages.
3122
3122
3123 Given a topic, extension, or command name, print help for that
3123 Given a topic, extension, or command name, print help for that
3124 topic.
3124 topic.
3125
3125
3126 Returns 0 if successful.
3126 Returns 0 if successful.
3127 """
3127 """
3128
3128
3129 keep = opts.get(r'system') or []
3129 keep = opts.get(r'system') or []
3130 if len(keep) == 0:
3130 if len(keep) == 0:
3131 if pycompat.sysplatform.startswith('win'):
3131 if pycompat.sysplatform.startswith('win'):
3132 keep.append('windows')
3132 keep.append('windows')
3133 elif pycompat.sysplatform == 'OpenVMS':
3133 elif pycompat.sysplatform == 'OpenVMS':
3134 keep.append('vms')
3134 keep.append('vms')
3135 elif pycompat.sysplatform == 'plan9':
3135 elif pycompat.sysplatform == 'plan9':
3136 keep.append('plan9')
3136 keep.append('plan9')
3137 else:
3137 else:
3138 keep.append('unix')
3138 keep.append('unix')
3139 keep.append(pycompat.sysplatform.lower())
3139 keep.append(pycompat.sysplatform.lower())
3140 if ui.verbose:
3140 if ui.verbose:
3141 keep.append('verbose')
3141 keep.append('verbose')
3142
3142
3143 commands = sys.modules[__name__]
3143 commands = sys.modules[__name__]
3144 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3144 formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts)
3145 ui.pager('help')
3145 ui.pager('help')
3146 ui.write(formatted)
3146 ui.write(formatted)
3147
3147
3148
3148
3149 @command('identify|id',
3149 @command('identify|id',
3150 [('r', 'rev', '',
3150 [('r', 'rev', '',
3151 _('identify the specified revision'), _('REV')),
3151 _('identify the specified revision'), _('REV')),
3152 ('n', 'num', None, _('show local revision number')),
3152 ('n', 'num', None, _('show local revision number')),
3153 ('i', 'id', None, _('show global revision id')),
3153 ('i', 'id', None, _('show global revision id')),
3154 ('b', 'branch', None, _('show branch')),
3154 ('b', 'branch', None, _('show branch')),
3155 ('t', 'tags', None, _('show tags')),
3155 ('t', 'tags', None, _('show tags')),
3156 ('B', 'bookmarks', None, _('show bookmarks')),
3156 ('B', 'bookmarks', None, _('show bookmarks')),
3157 ] + remoteopts + formatteropts,
3157 ] + remoteopts + formatteropts,
3158 _('[-nibtB] [-r REV] [SOURCE]'),
3158 _('[-nibtB] [-r REV] [SOURCE]'),
3159 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3159 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3160 optionalrepo=True,
3160 optionalrepo=True,
3161 intents={INTENT_READONLY})
3161 intents={INTENT_READONLY})
3162 def identify(ui, repo, source=None, rev=None,
3162 def identify(ui, repo, source=None, rev=None,
3163 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
3163 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
3164 """identify the working directory or specified revision
3164 """identify the working directory or specified revision
3165
3165
3166 Print a summary identifying the repository state at REV using one or
3166 Print a summary identifying the repository state at REV using one or
3167 two parent hash identifiers, followed by a "+" if the working
3167 two parent hash identifiers, followed by a "+" if the working
3168 directory has uncommitted changes, the branch name (if not default),
3168 directory has uncommitted changes, the branch name (if not default),
3169 a list of tags, and a list of bookmarks.
3169 a list of tags, and a list of bookmarks.
3170
3170
3171 When REV is not given, print a summary of the current state of the
3171 When REV is not given, print a summary of the current state of the
3172 repository including the working directory. Specify -r. to get information
3172 repository including the working directory. Specify -r. to get information
3173 of the working directory parent without scanning uncommitted changes.
3173 of the working directory parent without scanning uncommitted changes.
3174
3174
3175 Specifying a path to a repository root or Mercurial bundle will
3175 Specifying a path to a repository root or Mercurial bundle will
3176 cause lookup to operate on that repository/bundle.
3176 cause lookup to operate on that repository/bundle.
3177
3177
3178 .. container:: verbose
3178 .. container:: verbose
3179
3179
3180 Template:
3180 Template:
3181
3181
3182 The following keywords are supported in addition to the common template
3182 The following keywords are supported in addition to the common template
3183 keywords and functions. See also :hg:`help templates`.
3183 keywords and functions. See also :hg:`help templates`.
3184
3184
3185 :dirty: String. Character ``+`` denoting if the working directory has
3185 :dirty: String. Character ``+`` denoting if the working directory has
3186 uncommitted changes.
3186 uncommitted changes.
3187 :id: String. One or two nodes, optionally followed by ``+``.
3187 :id: String. One or two nodes, optionally followed by ``+``.
3188 :parents: List of strings. Parent nodes of the changeset.
3188 :parents: List of strings. Parent nodes of the changeset.
3189
3189
3190 Examples:
3190 Examples:
3191
3191
3192 - generate a build identifier for the working directory::
3192 - generate a build identifier for the working directory::
3193
3193
3194 hg id --id > build-id.dat
3194 hg id --id > build-id.dat
3195
3195
3196 - find the revision corresponding to a tag::
3196 - find the revision corresponding to a tag::
3197
3197
3198 hg id -n -r 1.3
3198 hg id -n -r 1.3
3199
3199
3200 - check the most recent revision of a remote repository::
3200 - check the most recent revision of a remote repository::
3201
3201
3202 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3202 hg id -r tip https://www.mercurial-scm.org/repo/hg/
3203
3203
3204 See :hg:`log` for generating more information about specific revisions,
3204 See :hg:`log` for generating more information about specific revisions,
3205 including full hash identifiers.
3205 including full hash identifiers.
3206
3206
3207 Returns 0 if successful.
3207 Returns 0 if successful.
3208 """
3208 """
3209
3209
3210 opts = pycompat.byteskwargs(opts)
3210 opts = pycompat.byteskwargs(opts)
3211 if not repo and not source:
3211 if not repo and not source:
3212 raise error.Abort(_("there is no Mercurial repository here "
3212 raise error.Abort(_("there is no Mercurial repository here "
3213 "(.hg not found)"))
3213 "(.hg not found)"))
3214
3214
3215 default = not (num or id or branch or tags or bookmarks)
3215 default = not (num or id or branch or tags or bookmarks)
3216 output = []
3216 output = []
3217 revs = []
3217 revs = []
3218
3218
3219 if source:
3219 if source:
3220 source, branches = hg.parseurl(ui.expandpath(source))
3220 source, branches = hg.parseurl(ui.expandpath(source))
3221 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3221 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3222 repo = peer.local()
3222 repo = peer.local()
3223 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3223 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3224
3224
3225 fm = ui.formatter('identify', opts)
3225 fm = ui.formatter('identify', opts)
3226 fm.startitem()
3226 fm.startitem()
3227
3227
3228 if not repo:
3228 if not repo:
3229 if num or branch or tags:
3229 if num or branch or tags:
3230 raise error.Abort(
3230 raise error.Abort(
3231 _("can't query remote revision number, branch, or tags"))
3231 _("can't query remote revision number, branch, or tags"))
3232 if not rev and revs:
3232 if not rev and revs:
3233 rev = revs[0]
3233 rev = revs[0]
3234 if not rev:
3234 if not rev:
3235 rev = "tip"
3235 rev = "tip"
3236
3236
3237 remoterev = peer.lookup(rev)
3237 remoterev = peer.lookup(rev)
3238 hexrev = fm.hexfunc(remoterev)
3238 hexrev = fm.hexfunc(remoterev)
3239 if default or id:
3239 if default or id:
3240 output = [hexrev]
3240 output = [hexrev]
3241 fm.data(id=hexrev)
3241 fm.data(id=hexrev)
3242
3242
3243 @util.cachefunc
3243 @util.cachefunc
3244 def getbms():
3244 def getbms():
3245 bms = []
3245 bms = []
3246
3246
3247 if 'bookmarks' in peer.listkeys('namespaces'):
3247 if 'bookmarks' in peer.listkeys('namespaces'):
3248 hexremoterev = hex(remoterev)
3248 hexremoterev = hex(remoterev)
3249 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
3249 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
3250 if bmr == hexremoterev]
3250 if bmr == hexremoterev]
3251
3251
3252 return sorted(bms)
3252 return sorted(bms)
3253
3253
3254 if fm.isplain():
3254 if fm.isplain():
3255 if bookmarks:
3255 if bookmarks:
3256 output.extend(getbms())
3256 output.extend(getbms())
3257 elif default and not ui.quiet:
3257 elif default and not ui.quiet:
3258 # multiple bookmarks for a single parent separated by '/'
3258 # multiple bookmarks for a single parent separated by '/'
3259 bm = '/'.join(getbms())
3259 bm = '/'.join(getbms())
3260 if bm:
3260 if bm:
3261 output.append(bm)
3261 output.append(bm)
3262 else:
3262 else:
3263 fm.data(node=hex(remoterev))
3263 fm.data(node=hex(remoterev))
3264 if bookmarks or 'bookmarks' in fm.datahint():
3264 if bookmarks or 'bookmarks' in fm.datahint():
3265 fm.data(bookmarks=fm.formatlist(getbms(), name='bookmark'))
3265 fm.data(bookmarks=fm.formatlist(getbms(), name='bookmark'))
3266 else:
3266 else:
3267 if rev:
3267 if rev:
3268 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
3268 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
3269 ctx = scmutil.revsingle(repo, rev, None)
3269 ctx = scmutil.revsingle(repo, rev, None)
3270
3270
3271 if ctx.rev() is None:
3271 if ctx.rev() is None:
3272 ctx = repo[None]
3272 ctx = repo[None]
3273 parents = ctx.parents()
3273 parents = ctx.parents()
3274 taglist = []
3274 taglist = []
3275 for p in parents:
3275 for p in parents:
3276 taglist.extend(p.tags())
3276 taglist.extend(p.tags())
3277
3277
3278 dirty = ""
3278 dirty = ""
3279 if ctx.dirty(missing=True, merge=False, branch=False):
3279 if ctx.dirty(missing=True, merge=False, branch=False):
3280 dirty = '+'
3280 dirty = '+'
3281 fm.data(dirty=dirty)
3281 fm.data(dirty=dirty)
3282
3282
3283 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3283 hexoutput = [fm.hexfunc(p.node()) for p in parents]
3284 if default or id:
3284 if default or id:
3285 output = ["%s%s" % ('+'.join(hexoutput), dirty)]
3285 output = ["%s%s" % ('+'.join(hexoutput), dirty)]
3286 fm.data(id="%s%s" % ('+'.join(hexoutput), dirty))
3286 fm.data(id="%s%s" % ('+'.join(hexoutput), dirty))
3287
3287
3288 if num:
3288 if num:
3289 numoutput = ["%d" % p.rev() for p in parents]
3289 numoutput = ["%d" % p.rev() for p in parents]
3290 output.append("%s%s" % ('+'.join(numoutput), dirty))
3290 output.append("%s%s" % ('+'.join(numoutput), dirty))
3291
3291
3292 fm.data(parents=fm.formatlist([fm.hexfunc(p.node())
3292 fm.data(parents=fm.formatlist([fm.hexfunc(p.node())
3293 for p in parents], name='node'))
3293 for p in parents], name='node'))
3294 else:
3294 else:
3295 hexoutput = fm.hexfunc(ctx.node())
3295 hexoutput = fm.hexfunc(ctx.node())
3296 if default or id:
3296 if default or id:
3297 output = [hexoutput]
3297 output = [hexoutput]
3298 fm.data(id=hexoutput)
3298 fm.data(id=hexoutput)
3299
3299
3300 if num:
3300 if num:
3301 output.append(pycompat.bytestr(ctx.rev()))
3301 output.append(pycompat.bytestr(ctx.rev()))
3302 taglist = ctx.tags()
3302 taglist = ctx.tags()
3303
3303
3304 if default and not ui.quiet:
3304 if default and not ui.quiet:
3305 b = ctx.branch()
3305 b = ctx.branch()
3306 if b != 'default':
3306 if b != 'default':
3307 output.append("(%s)" % b)
3307 output.append("(%s)" % b)
3308
3308
3309 # multiple tags for a single parent separated by '/'
3309 # multiple tags for a single parent separated by '/'
3310 t = '/'.join(taglist)
3310 t = '/'.join(taglist)
3311 if t:
3311 if t:
3312 output.append(t)
3312 output.append(t)
3313
3313
3314 # multiple bookmarks for a single parent separated by '/'
3314 # multiple bookmarks for a single parent separated by '/'
3315 bm = '/'.join(ctx.bookmarks())
3315 bm = '/'.join(ctx.bookmarks())
3316 if bm:
3316 if bm:
3317 output.append(bm)
3317 output.append(bm)
3318 else:
3318 else:
3319 if branch:
3319 if branch:
3320 output.append(ctx.branch())
3320 output.append(ctx.branch())
3321
3321
3322 if tags:
3322 if tags:
3323 output.extend(taglist)
3323 output.extend(taglist)
3324
3324
3325 if bookmarks:
3325 if bookmarks:
3326 output.extend(ctx.bookmarks())
3326 output.extend(ctx.bookmarks())
3327
3327
3328 fm.data(node=ctx.hex())
3328 fm.data(node=ctx.hex())
3329 fm.data(branch=ctx.branch())
3329 fm.data(branch=ctx.branch())
3330 fm.data(tags=fm.formatlist(taglist, name='tag', sep=':'))
3330 fm.data(tags=fm.formatlist(taglist, name='tag', sep=':'))
3331 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark'))
3331 fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark'))
3332 fm.context(ctx=ctx)
3332 fm.context(ctx=ctx)
3333
3333
3334 fm.plain("%s\n" % ' '.join(output))
3334 fm.plain("%s\n" % ' '.join(output))
3335 fm.end()
3335 fm.end()
3336
3336
3337 @command('import|patch',
3337 @command('import|patch',
3338 [('p', 'strip', 1,
3338 [('p', 'strip', 1,
3339 _('directory strip option for patch. This has the same '
3339 _('directory strip option for patch. This has the same '
3340 'meaning as the corresponding patch option'), _('NUM')),
3340 'meaning as the corresponding patch option'), _('NUM')),
3341 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
3341 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
3342 ('e', 'edit', False, _('invoke editor on commit messages')),
3342 ('e', 'edit', False, _('invoke editor on commit messages')),
3343 ('f', 'force', None,
3343 ('f', 'force', None,
3344 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
3344 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
3345 ('', 'no-commit', None,
3345 ('', 'no-commit', None,
3346 _("don't commit, just update the working directory")),
3346 _("don't commit, just update the working directory")),
3347 ('', 'bypass', None,
3347 ('', 'bypass', None,
3348 _("apply patch without touching the working directory")),
3348 _("apply patch without touching the working directory")),
3349 ('', 'partial', None,
3349 ('', 'partial', None,
3350 _('commit even if some hunks fail')),
3350 _('commit even if some hunks fail')),
3351 ('', 'exact', None,
3351 ('', 'exact', None,
3352 _('abort if patch would apply lossily')),
3352 _('abort if patch would apply lossily')),
3353 ('', 'prefix', '',
3353 ('', 'prefix', '',
3354 _('apply patch to subdirectory'), _('DIR')),
3354 _('apply patch to subdirectory'), _('DIR')),
3355 ('', 'import-branch', None,
3355 ('', 'import-branch', None,
3356 _('use any branch information in patch (implied by --exact)'))] +
3356 _('use any branch information in patch (implied by --exact)'))] +
3357 commitopts + commitopts2 + similarityopts,
3357 commitopts + commitopts2 + similarityopts,
3358 _('[OPTION]... PATCH...'),
3358 _('[OPTION]... PATCH...'),
3359 helpcategory=command.CATEGORY_IMPORT_EXPORT)
3359 helpcategory=command.CATEGORY_IMPORT_EXPORT)
3360 def import_(ui, repo, patch1=None, *patches, **opts):
3360 def import_(ui, repo, patch1=None, *patches, **opts):
3361 """import an ordered set of patches
3361 """import an ordered set of patches
3362
3362
3363 Import a list of patches and commit them individually (unless
3363 Import a list of patches and commit them individually (unless
3364 --no-commit is specified).
3364 --no-commit is specified).
3365
3365
3366 To read a patch from standard input (stdin), use "-" as the patch
3366 To read a patch from standard input (stdin), use "-" as the patch
3367 name. If a URL is specified, the patch will be downloaded from
3367 name. If a URL is specified, the patch will be downloaded from
3368 there.
3368 there.
3369
3369
3370 Import first applies changes to the working directory (unless
3370 Import first applies changes to the working directory (unless
3371 --bypass is specified), import will abort if there are outstanding
3371 --bypass is specified), import will abort if there are outstanding
3372 changes.
3372 changes.
3373
3373
3374 Use --bypass to apply and commit patches directly to the
3374 Use --bypass to apply and commit patches directly to the
3375 repository, without affecting the working directory. Without
3375 repository, without affecting the working directory. Without
3376 --exact, patches will be applied on top of the working directory
3376 --exact, patches will be applied on top of the working directory
3377 parent revision.
3377 parent revision.
3378
3378
3379 You can import a patch straight from a mail message. Even patches
3379 You can import a patch straight from a mail message. Even patches
3380 as attachments work (to use the body part, it must have type
3380 as attachments work (to use the body part, it must have type
3381 text/plain or text/x-patch). From and Subject headers of email
3381 text/plain or text/x-patch). From and Subject headers of email
3382 message are used as default committer and commit message. All
3382 message are used as default committer and commit message. All
3383 text/plain body parts before first diff are added to the commit
3383 text/plain body parts before first diff are added to the commit
3384 message.
3384 message.
3385
3385
3386 If the imported patch was generated by :hg:`export`, user and
3386 If the imported patch was generated by :hg:`export`, user and
3387 description from patch override values from message headers and
3387 description from patch override values from message headers and
3388 body. Values given on command line with -m/--message and -u/--user
3388 body. Values given on command line with -m/--message and -u/--user
3389 override these.
3389 override these.
3390
3390
3391 If --exact is specified, import will set the working directory to
3391 If --exact is specified, import will set the working directory to
3392 the parent of each patch before applying it, and will abort if the
3392 the parent of each patch before applying it, and will abort if the
3393 resulting changeset has a different ID than the one recorded in
3393 resulting changeset has a different ID than the one recorded in
3394 the patch. This will guard against various ways that portable
3394 the patch. This will guard against various ways that portable
3395 patch formats and mail systems might fail to transfer Mercurial
3395 patch formats and mail systems might fail to transfer Mercurial
3396 data or metadata. See :hg:`bundle` for lossless transmission.
3396 data or metadata. See :hg:`bundle` for lossless transmission.
3397
3397
3398 Use --partial to ensure a changeset will be created from the patch
3398 Use --partial to ensure a changeset will be created from the patch
3399 even if some hunks fail to apply. Hunks that fail to apply will be
3399 even if some hunks fail to apply. Hunks that fail to apply will be
3400 written to a <target-file>.rej file. Conflicts can then be resolved
3400 written to a <target-file>.rej file. Conflicts can then be resolved
3401 by hand before :hg:`commit --amend` is run to update the created
3401 by hand before :hg:`commit --amend` is run to update the created
3402 changeset. This flag exists to let people import patches that
3402 changeset. This flag exists to let people import patches that
3403 partially apply without losing the associated metadata (author,
3403 partially apply without losing the associated metadata (author,
3404 date, description, ...).
3404 date, description, ...).
3405
3405
3406 .. note::
3406 .. note::
3407
3407
3408 When no hunks apply cleanly, :hg:`import --partial` will create
3408 When no hunks apply cleanly, :hg:`import --partial` will create
3409 an empty changeset, importing only the patch metadata.
3409 an empty changeset, importing only the patch metadata.
3410
3410
3411 With -s/--similarity, hg will attempt to discover renames and
3411 With -s/--similarity, hg will attempt to discover renames and
3412 copies in the patch in the same way as :hg:`addremove`.
3412 copies in the patch in the same way as :hg:`addremove`.
3413
3413
3414 It is possible to use external patch programs to perform the patch
3414 It is possible to use external patch programs to perform the patch
3415 by setting the ``ui.patch`` configuration option. For the default
3415 by setting the ``ui.patch`` configuration option. For the default
3416 internal tool, the fuzz can also be configured via ``patch.fuzz``.
3416 internal tool, the fuzz can also be configured via ``patch.fuzz``.
3417 See :hg:`help config` for more information about configuration
3417 See :hg:`help config` for more information about configuration
3418 files and how to use these options.
3418 files and how to use these options.
3419
3419
3420 See :hg:`help dates` for a list of formats valid for -d/--date.
3420 See :hg:`help dates` for a list of formats valid for -d/--date.
3421
3421
3422 .. container:: verbose
3422 .. container:: verbose
3423
3423
3424 Examples:
3424 Examples:
3425
3425
3426 - import a traditional patch from a website and detect renames::
3426 - import a traditional patch from a website and detect renames::
3427
3427
3428 hg import -s 80 http://example.com/bugfix.patch
3428 hg import -s 80 http://example.com/bugfix.patch
3429
3429
3430 - import a changeset from an hgweb server::
3430 - import a changeset from an hgweb server::
3431
3431
3432 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
3432 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
3433
3433
3434 - import all the patches in an Unix-style mbox::
3434 - import all the patches in an Unix-style mbox::
3435
3435
3436 hg import incoming-patches.mbox
3436 hg import incoming-patches.mbox
3437
3437
3438 - import patches from stdin::
3438 - import patches from stdin::
3439
3439
3440 hg import -
3440 hg import -
3441
3441
3442 - attempt to exactly restore an exported changeset (not always
3442 - attempt to exactly restore an exported changeset (not always
3443 possible)::
3443 possible)::
3444
3444
3445 hg import --exact proposed-fix.patch
3445 hg import --exact proposed-fix.patch
3446
3446
3447 - use an external tool to apply a patch which is too fuzzy for
3447 - use an external tool to apply a patch which is too fuzzy for
3448 the default internal tool.
3448 the default internal tool.
3449
3449
3450 hg import --config ui.patch="patch --merge" fuzzy.patch
3450 hg import --config ui.patch="patch --merge" fuzzy.patch
3451
3451
3452 - change the default fuzzing from 2 to a less strict 7
3452 - change the default fuzzing from 2 to a less strict 7
3453
3453
3454 hg import --config ui.fuzz=7 fuzz.patch
3454 hg import --config ui.fuzz=7 fuzz.patch
3455
3455
3456 Returns 0 on success, 1 on partial success (see --partial).
3456 Returns 0 on success, 1 on partial success (see --partial).
3457 """
3457 """
3458
3458
3459 opts = pycompat.byteskwargs(opts)
3459 opts = pycompat.byteskwargs(opts)
3460 if not patch1:
3460 if not patch1:
3461 raise error.Abort(_('need at least one patch to import'))
3461 raise error.Abort(_('need at least one patch to import'))
3462
3462
3463 patches = (patch1,) + patches
3463 patches = (patch1,) + patches
3464
3464
3465 date = opts.get('date')
3465 date = opts.get('date')
3466 if date:
3466 if date:
3467 opts['date'] = dateutil.parsedate(date)
3467 opts['date'] = dateutil.parsedate(date)
3468
3468
3469 exact = opts.get('exact')
3469 exact = opts.get('exact')
3470 update = not opts.get('bypass')
3470 update = not opts.get('bypass')
3471 if not update and opts.get('no_commit'):
3471 if not update and opts.get('no_commit'):
3472 raise error.Abort(_('cannot use --no-commit with --bypass'))
3472 raise error.Abort(_('cannot use --no-commit with --bypass'))
3473 try:
3473 try:
3474 sim = float(opts.get('similarity') or 0)
3474 sim = float(opts.get('similarity') or 0)
3475 except ValueError:
3475 except ValueError:
3476 raise error.Abort(_('similarity must be a number'))
3476 raise error.Abort(_('similarity must be a number'))
3477 if sim < 0 or sim > 100:
3477 if sim < 0 or sim > 100:
3478 raise error.Abort(_('similarity must be between 0 and 100'))
3478 raise error.Abort(_('similarity must be between 0 and 100'))
3479 if sim and not update:
3479 if sim and not update:
3480 raise error.Abort(_('cannot use --similarity with --bypass'))
3480 raise error.Abort(_('cannot use --similarity with --bypass'))
3481 if exact:
3481 if exact:
3482 if opts.get('edit'):
3482 if opts.get('edit'):
3483 raise error.Abort(_('cannot use --exact with --edit'))
3483 raise error.Abort(_('cannot use --exact with --edit'))
3484 if opts.get('prefix'):
3484 if opts.get('prefix'):
3485 raise error.Abort(_('cannot use --exact with --prefix'))
3485 raise error.Abort(_('cannot use --exact with --prefix'))
3486
3486
3487 base = opts["base"]
3487 base = opts["base"]
3488 msgs = []
3488 msgs = []
3489 ret = 0
3489 ret = 0
3490
3490
3491 with repo.wlock():
3491 with repo.wlock():
3492 if update:
3492 if update:
3493 cmdutil.checkunfinished(repo)
3493 cmdutil.checkunfinished(repo)
3494 if (exact or not opts.get('force')):
3494 if (exact or not opts.get('force')):
3495 cmdutil.bailifchanged(repo)
3495 cmdutil.bailifchanged(repo)
3496
3496
3497 if not opts.get('no_commit'):
3497 if not opts.get('no_commit'):
3498 lock = repo.lock
3498 lock = repo.lock
3499 tr = lambda: repo.transaction('import')
3499 tr = lambda: repo.transaction('import')
3500 dsguard = util.nullcontextmanager
3500 dsguard = util.nullcontextmanager
3501 else:
3501 else:
3502 lock = util.nullcontextmanager
3502 lock = util.nullcontextmanager
3503 tr = util.nullcontextmanager
3503 tr = util.nullcontextmanager
3504 dsguard = lambda: dirstateguard.dirstateguard(repo, 'import')
3504 dsguard = lambda: dirstateguard.dirstateguard(repo, 'import')
3505 with lock(), tr(), dsguard():
3505 with lock(), tr(), dsguard():
3506 parents = repo[None].parents()
3506 parents = repo[None].parents()
3507 for patchurl in patches:
3507 for patchurl in patches:
3508 if patchurl == '-':
3508 if patchurl == '-':
3509 ui.status(_('applying patch from stdin\n'))
3509 ui.status(_('applying patch from stdin\n'))
3510 patchfile = ui.fin
3510 patchfile = ui.fin
3511 patchurl = 'stdin' # for error message
3511 patchurl = 'stdin' # for error message
3512 else:
3512 else:
3513 patchurl = os.path.join(base, patchurl)
3513 patchurl = os.path.join(base, patchurl)
3514 ui.status(_('applying %s\n') % patchurl)
3514 ui.status(_('applying %s\n') % patchurl)
3515 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
3515 patchfile = hg.openpath(ui, patchurl, sendaccept=False)
3516
3516
3517 haspatch = False
3517 haspatch = False
3518 for hunk in patch.split(patchfile):
3518 for hunk in patch.split(patchfile):
3519 with patch.extract(ui, hunk) as patchdata:
3519 with patch.extract(ui, hunk) as patchdata:
3520 msg, node, rej = cmdutil.tryimportone(ui, repo,
3520 msg, node, rej = cmdutil.tryimportone(ui, repo,
3521 patchdata,
3521 patchdata,
3522 parents, opts,
3522 parents, opts,
3523 msgs, hg.clean)
3523 msgs, hg.clean)
3524 if msg:
3524 if msg:
3525 haspatch = True
3525 haspatch = True
3526 ui.note(msg + '\n')
3526 ui.note(msg + '\n')
3527 if update or exact:
3527 if update or exact:
3528 parents = repo[None].parents()
3528 parents = repo[None].parents()
3529 else:
3529 else:
3530 parents = [repo[node]]
3530 parents = [repo[node]]
3531 if rej:
3531 if rej:
3532 ui.write_err(_("patch applied partially\n"))
3532 ui.write_err(_("patch applied partially\n"))
3533 ui.write_err(_("(fix the .rej files and run "
3533 ui.write_err(_("(fix the .rej files and run "
3534 "`hg commit --amend`)\n"))
3534 "`hg commit --amend`)\n"))
3535 ret = 1
3535 ret = 1
3536 break
3536 break
3537
3537
3538 if not haspatch:
3538 if not haspatch:
3539 raise error.Abort(_('%s: no diffs found') % patchurl)
3539 raise error.Abort(_('%s: no diffs found') % patchurl)
3540
3540
3541 if msgs:
3541 if msgs:
3542 repo.savecommitmessage('\n* * *\n'.join(msgs))
3542 repo.savecommitmessage('\n* * *\n'.join(msgs))
3543 return ret
3543 return ret
3544
3544
3545 @command('incoming|in',
3545 @command('incoming|in',
3546 [('f', 'force', None,
3546 [('f', 'force', None,
3547 _('run even if remote repository is unrelated')),
3547 _('run even if remote repository is unrelated')),
3548 ('n', 'newest-first', None, _('show newest record first')),
3548 ('n', 'newest-first', None, _('show newest record first')),
3549 ('', 'bundle', '',
3549 ('', 'bundle', '',
3550 _('file to store the bundles into'), _('FILE')),
3550 _('file to store the bundles into'), _('FILE')),
3551 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3551 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3552 ('B', 'bookmarks', False, _("compare bookmarks")),
3552 ('B', 'bookmarks', False, _("compare bookmarks")),
3553 ('b', 'branch', [],
3553 ('b', 'branch', [],
3554 _('a specific branch you would like to pull'), _('BRANCH')),
3554 _('a specific branch you would like to pull'), _('BRANCH')),
3555 ] + logopts + remoteopts + subrepoopts,
3555 ] + logopts + remoteopts + subrepoopts,
3556 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
3556 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'),
3557 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT)
3557 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT)
3558 def incoming(ui, repo, source="default", **opts):
3558 def incoming(ui, repo, source="default", **opts):
3559 """show new changesets found in source
3559 """show new changesets found in source
3560
3560
3561 Show new changesets found in the specified path/URL or the default
3561 Show new changesets found in the specified path/URL or the default
3562 pull location. These are the changesets that would have been pulled
3562 pull location. These are the changesets that would have been pulled
3563 by :hg:`pull` at the time you issued this command.
3563 by :hg:`pull` at the time you issued this command.
3564
3564
3565 See pull for valid source format details.
3565 See pull for valid source format details.
3566
3566
3567 .. container:: verbose
3567 .. container:: verbose
3568
3568
3569 With -B/--bookmarks, the result of bookmark comparison between
3569 With -B/--bookmarks, the result of bookmark comparison between
3570 local and remote repositories is displayed. With -v/--verbose,
3570 local and remote repositories is displayed. With -v/--verbose,
3571 status is also displayed for each bookmark like below::
3571 status is also displayed for each bookmark like below::
3572
3572
3573 BM1 01234567890a added
3573 BM1 01234567890a added
3574 BM2 1234567890ab advanced
3574 BM2 1234567890ab advanced
3575 BM3 234567890abc diverged
3575 BM3 234567890abc diverged
3576 BM4 34567890abcd changed
3576 BM4 34567890abcd changed
3577
3577
3578 The action taken locally when pulling depends on the
3578 The action taken locally when pulling depends on the
3579 status of each bookmark:
3579 status of each bookmark:
3580
3580
3581 :``added``: pull will create it
3581 :``added``: pull will create it
3582 :``advanced``: pull will update it
3582 :``advanced``: pull will update it
3583 :``diverged``: pull will create a divergent bookmark
3583 :``diverged``: pull will create a divergent bookmark
3584 :``changed``: result depends on remote changesets
3584 :``changed``: result depends on remote changesets
3585
3585
3586 From the point of view of pulling behavior, bookmark
3586 From the point of view of pulling behavior, bookmark
3587 existing only in the remote repository are treated as ``added``,
3587 existing only in the remote repository are treated as ``added``,
3588 even if it is in fact locally deleted.
3588 even if it is in fact locally deleted.
3589
3589
3590 .. container:: verbose
3590 .. container:: verbose
3591
3591
3592 For remote repository, using --bundle avoids downloading the
3592 For remote repository, using --bundle avoids downloading the
3593 changesets twice if the incoming is followed by a pull.
3593 changesets twice if the incoming is followed by a pull.
3594
3594
3595 Examples:
3595 Examples:
3596
3596
3597 - show incoming changes with patches and full description::
3597 - show incoming changes with patches and full description::
3598
3598
3599 hg incoming -vp
3599 hg incoming -vp
3600
3600
3601 - show incoming changes excluding merges, store a bundle::
3601 - show incoming changes excluding merges, store a bundle::
3602
3602
3603 hg in -vpM --bundle incoming.hg
3603 hg in -vpM --bundle incoming.hg
3604 hg pull incoming.hg
3604 hg pull incoming.hg
3605
3605
3606 - briefly list changes inside a bundle::
3606 - briefly list changes inside a bundle::
3607
3607
3608 hg in changes.hg -T "{desc|firstline}\\n"
3608 hg in changes.hg -T "{desc|firstline}\\n"
3609
3609
3610 Returns 0 if there are incoming changes, 1 otherwise.
3610 Returns 0 if there are incoming changes, 1 otherwise.
3611 """
3611 """
3612 opts = pycompat.byteskwargs(opts)
3612 opts = pycompat.byteskwargs(opts)
3613 if opts.get('graph'):
3613 if opts.get('graph'):
3614 logcmdutil.checkunsupportedgraphflags([], opts)
3614 logcmdutil.checkunsupportedgraphflags([], opts)
3615 def display(other, chlist, displayer):
3615 def display(other, chlist, displayer):
3616 revdag = logcmdutil.graphrevs(other, chlist, opts)
3616 revdag = logcmdutil.graphrevs(other, chlist, opts)
3617 logcmdutil.displaygraph(ui, repo, revdag, displayer,
3617 logcmdutil.displaygraph(ui, repo, revdag, displayer,
3618 graphmod.asciiedges)
3618 graphmod.asciiedges)
3619
3619
3620 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3620 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3621 return 0
3621 return 0
3622
3622
3623 if opts.get('bundle') and opts.get('subrepos'):
3623 if opts.get('bundle') and opts.get('subrepos'):
3624 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3624 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3625
3625
3626 if opts.get('bookmarks'):
3626 if opts.get('bookmarks'):
3627 source, branches = hg.parseurl(ui.expandpath(source),
3627 source, branches = hg.parseurl(ui.expandpath(source),
3628 opts.get('branch'))
3628 opts.get('branch'))
3629 other = hg.peer(repo, opts, source)
3629 other = hg.peer(repo, opts, source)
3630 if 'bookmarks' not in other.listkeys('namespaces'):
3630 if 'bookmarks' not in other.listkeys('namespaces'):
3631 ui.warn(_("remote doesn't support bookmarks\n"))
3631 ui.warn(_("remote doesn't support bookmarks\n"))
3632 return 0
3632 return 0
3633 ui.pager('incoming')
3633 ui.pager('incoming')
3634 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3634 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3635 return bookmarks.incoming(ui, repo, other)
3635 return bookmarks.incoming(ui, repo, other)
3636
3636
3637 repo._subtoppath = ui.expandpath(source)
3637 repo._subtoppath = ui.expandpath(source)
3638 try:
3638 try:
3639 return hg.incoming(ui, repo, source, opts)
3639 return hg.incoming(ui, repo, source, opts)
3640 finally:
3640 finally:
3641 del repo._subtoppath
3641 del repo._subtoppath
3642
3642
3643
3643
3644 @command('init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3644 @command('init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3645 helpcategory=command.CATEGORY_REPO_CREATION,
3645 helpcategory=command.CATEGORY_REPO_CREATION,
3646 helpbasic=True, norepo=True)
3646 helpbasic=True, norepo=True)
3647 def init(ui, dest=".", **opts):
3647 def init(ui, dest=".", **opts):
3648 """create a new repository in the given directory
3648 """create a new repository in the given directory
3649
3649
3650 Initialize a new repository in the given directory. If the given
3650 Initialize a new repository in the given directory. If the given
3651 directory does not exist, it will be created.
3651 directory does not exist, it will be created.
3652
3652
3653 If no directory is given, the current directory is used.
3653 If no directory is given, the current directory is used.
3654
3654
3655 It is possible to specify an ``ssh://`` URL as the destination.
3655 It is possible to specify an ``ssh://`` URL as the destination.
3656 See :hg:`help urls` for more information.
3656 See :hg:`help urls` for more information.
3657
3657
3658 Returns 0 on success.
3658 Returns 0 on success.
3659 """
3659 """
3660 opts = pycompat.byteskwargs(opts)
3660 opts = pycompat.byteskwargs(opts)
3661 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3661 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3662
3662
3663 @command('locate',
3663 @command('locate',
3664 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3664 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3665 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3665 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3666 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3666 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3667 ] + walkopts,
3667 ] + walkopts,
3668 _('[OPTION]... [PATTERN]...'),
3668 _('[OPTION]... [PATTERN]...'),
3669 helpcategory=command.CATEGORY_WORKING_DIRECTORY)
3669 helpcategory=command.CATEGORY_WORKING_DIRECTORY)
3670 def locate(ui, repo, *pats, **opts):
3670 def locate(ui, repo, *pats, **opts):
3671 """locate files matching specific patterns (DEPRECATED)
3671 """locate files matching specific patterns (DEPRECATED)
3672
3672
3673 Print files under Mercurial control in the working directory whose
3673 Print files under Mercurial control in the working directory whose
3674 names match the given patterns.
3674 names match the given patterns.
3675
3675
3676 By default, this command searches all directories in the working
3676 By default, this command searches all directories in the working
3677 directory. To search just the current directory and its
3677 directory. To search just the current directory and its
3678 subdirectories, use "--include .".
3678 subdirectories, use "--include .".
3679
3679
3680 If no patterns are given to match, this command prints the names
3680 If no patterns are given to match, this command prints the names
3681 of all files under Mercurial control in the working directory.
3681 of all files under Mercurial control in the working directory.
3682
3682
3683 If you want to feed the output of this command into the "xargs"
3683 If you want to feed the output of this command into the "xargs"
3684 command, use the -0 option to both this command and "xargs". This
3684 command, use the -0 option to both this command and "xargs". This
3685 will avoid the problem of "xargs" treating single filenames that
3685 will avoid the problem of "xargs" treating single filenames that
3686 contain whitespace as multiple filenames.
3686 contain whitespace as multiple filenames.
3687
3687
3688 See :hg:`help files` for a more versatile command.
3688 See :hg:`help files` for a more versatile command.
3689
3689
3690 Returns 0 if a match is found, 1 otherwise.
3690 Returns 0 if a match is found, 1 otherwise.
3691 """
3691 """
3692 opts = pycompat.byteskwargs(opts)
3692 opts = pycompat.byteskwargs(opts)
3693 if opts.get('print0'):
3693 if opts.get('print0'):
3694 end = '\0'
3694 end = '\0'
3695 else:
3695 else:
3696 end = '\n'
3696 end = '\n'
3697 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3697 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3698
3698
3699 ret = 1
3699 ret = 1
3700 m = scmutil.match(ctx, pats, opts, default='relglob',
3700 m = scmutil.match(ctx, pats, opts, default='relglob',
3701 badfn=lambda x, y: False)
3701 badfn=lambda x, y: False)
3702
3702
3703 ui.pager('locate')
3703 ui.pager('locate')
3704 if ctx.rev() is None:
3704 if ctx.rev() is None:
3705 # When run on the working copy, "locate" includes removed files, so
3705 # When run on the working copy, "locate" includes removed files, so
3706 # we get the list of files from the dirstate.
3706 # we get the list of files from the dirstate.
3707 filesgen = sorted(repo.dirstate.matches(m))
3707 filesgen = sorted(repo.dirstate.matches(m))
3708 else:
3708 else:
3709 filesgen = ctx.matches(m)
3709 filesgen = ctx.matches(m)
3710 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
3710 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats))
3711 for abs in filesgen:
3711 for abs in filesgen:
3712 if opts.get('fullpath'):
3712 if opts.get('fullpath'):
3713 ui.write(repo.wjoin(abs), end)
3713 ui.write(repo.wjoin(abs), end)
3714 else:
3714 else:
3715 ui.write(uipathfn(abs), end)
3715 ui.write(uipathfn(abs), end)
3716 ret = 0
3716 ret = 0
3717
3717
3718 return ret
3718 return ret
3719
3719
3720 @command('log|history',
3720 @command('log|history',
3721 [('f', 'follow', None,
3721 [('f', 'follow', None,
3722 _('follow changeset history, or file history across copies and renames')),
3722 _('follow changeset history, or file history across copies and renames')),
3723 ('', 'follow-first', None,
3723 ('', 'follow-first', None,
3724 _('only follow the first parent of merge changesets (DEPRECATED)')),
3724 _('only follow the first parent of merge changesets (DEPRECATED)')),
3725 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3725 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3726 ('C', 'copies', None, _('show copied files')),
3726 ('C', 'copies', None, _('show copied files')),
3727 ('k', 'keyword', [],
3727 ('k', 'keyword', [],
3728 _('do case-insensitive search for a given text'), _('TEXT')),
3728 _('do case-insensitive search for a given text'), _('TEXT')),
3729 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3729 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3730 ('L', 'line-range', [],
3730 ('L', 'line-range', [],
3731 _('follow line range of specified file (EXPERIMENTAL)'),
3731 _('follow line range of specified file (EXPERIMENTAL)'),
3732 _('FILE,RANGE')),
3732 _('FILE,RANGE')),
3733 ('', 'removed', None, _('include revisions where files were removed')),
3733 ('', 'removed', None, _('include revisions where files were removed')),
3734 ('m', 'only-merges', None,
3734 ('m', 'only-merges', None,
3735 _('show only merges (DEPRECATED) (use -r "merge()" instead)')),
3735 _('show only merges (DEPRECATED) (use -r "merge()" instead)')),
3736 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3736 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3737 ('', 'only-branch', [],
3737 ('', 'only-branch', [],
3738 _('show only changesets within the given named branch (DEPRECATED)'),
3738 _('show only changesets within the given named branch (DEPRECATED)'),
3739 _('BRANCH')),
3739 _('BRANCH')),
3740 ('b', 'branch', [],
3740 ('b', 'branch', [],
3741 _('show changesets within the given named branch'), _('BRANCH')),
3741 _('show changesets within the given named branch'), _('BRANCH')),
3742 ('P', 'prune', [],
3742 ('P', 'prune', [],
3743 _('do not display revision or any of its ancestors'), _('REV')),
3743 _('do not display revision or any of its ancestors'), _('REV')),
3744 ] + logopts + walkopts,
3744 ] + logopts + walkopts,
3745 _('[OPTION]... [FILE]'),
3745 _('[OPTION]... [FILE]'),
3746 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3746 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
3747 helpbasic=True, inferrepo=True,
3747 helpbasic=True, inferrepo=True,
3748 intents={INTENT_READONLY})
3748 intents={INTENT_READONLY})
3749 def log(ui, repo, *pats, **opts):
3749 def log(ui, repo, *pats, **opts):
3750 """show revision history of entire repository or files
3750 """show revision history of entire repository or files
3751
3751
3752 Print the revision history of the specified files or the entire
3752 Print the revision history of the specified files or the entire
3753 project.
3753 project.
3754
3754
3755 If no revision range is specified, the default is ``tip:0`` unless
3755 If no revision range is specified, the default is ``tip:0`` unless
3756 --follow is set, in which case the working directory parent is
3756 --follow is set, in which case the working directory parent is
3757 used as the starting revision.
3757 used as the starting revision.
3758
3758
3759 File history is shown without following rename or copy history of
3759 File history is shown without following rename or copy history of
3760 files. Use -f/--follow with a filename to follow history across
3760 files. Use -f/--follow with a filename to follow history across
3761 renames and copies. --follow without a filename will only show
3761 renames and copies. --follow without a filename will only show
3762 ancestors of the starting revision.
3762 ancestors of the starting revision.
3763
3763
3764 By default this command prints revision number and changeset id,
3764 By default this command prints revision number and changeset id,
3765 tags, non-trivial parents, user, date and time, and a summary for
3765 tags, non-trivial parents, user, date and time, and a summary for
3766 each commit. When the -v/--verbose switch is used, the list of
3766 each commit. When the -v/--verbose switch is used, the list of
3767 changed files and full commit message are shown.
3767 changed files and full commit message are shown.
3768
3768
3769 With --graph the revisions are shown as an ASCII art DAG with the most
3769 With --graph the revisions are shown as an ASCII art DAG with the most
3770 recent changeset at the top.
3770 recent changeset at the top.
3771 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
3771 'o' is a changeset, '@' is a working directory parent, '_' closes a branch,
3772 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
3772 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
3773 changeset from the lines below is a parent of the 'o' merge on the same
3773 changeset from the lines below is a parent of the 'o' merge on the same
3774 line.
3774 line.
3775 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
3775 Paths in the DAG are represented with '|', '/' and so forth. ':' in place
3776 of a '|' indicates one or more revisions in a path are omitted.
3776 of a '|' indicates one or more revisions in a path are omitted.
3777
3777
3778 .. container:: verbose
3778 .. container:: verbose
3779
3779
3780 Use -L/--line-range FILE,M:N options to follow the history of lines
3780 Use -L/--line-range FILE,M:N options to follow the history of lines
3781 from M to N in FILE. With -p/--patch only diff hunks affecting
3781 from M to N in FILE. With -p/--patch only diff hunks affecting
3782 specified line range will be shown. This option requires --follow;
3782 specified line range will be shown. This option requires --follow;
3783 it can be specified multiple times. Currently, this option is not
3783 it can be specified multiple times. Currently, this option is not
3784 compatible with --graph. This option is experimental.
3784 compatible with --graph. This option is experimental.
3785
3785
3786 .. note::
3786 .. note::
3787
3787
3788 :hg:`log --patch` may generate unexpected diff output for merge
3788 :hg:`log --patch` may generate unexpected diff output for merge
3789 changesets, as it will only compare the merge changeset against
3789 changesets, as it will only compare the merge changeset against
3790 its first parent. Also, only files different from BOTH parents
3790 its first parent. Also, only files different from BOTH parents
3791 will appear in files:.
3791 will appear in files:.
3792
3792
3793 .. note::
3793 .. note::
3794
3794
3795 For performance reasons, :hg:`log FILE` may omit duplicate changes
3795 For performance reasons, :hg:`log FILE` may omit duplicate changes
3796 made on branches and will not show removals or mode changes. To
3796 made on branches and will not show removals or mode changes. To
3797 see all such changes, use the --removed switch.
3797 see all such changes, use the --removed switch.
3798
3798
3799 .. container:: verbose
3799 .. container:: verbose
3800
3800
3801 .. note::
3801 .. note::
3802
3802
3803 The history resulting from -L/--line-range options depends on diff
3803 The history resulting from -L/--line-range options depends on diff
3804 options; for instance if white-spaces are ignored, respective changes
3804 options; for instance if white-spaces are ignored, respective changes
3805 with only white-spaces in specified line range will not be listed.
3805 with only white-spaces in specified line range will not be listed.
3806
3806
3807 .. container:: verbose
3807 .. container:: verbose
3808
3808
3809 Some examples:
3809 Some examples:
3810
3810
3811 - changesets with full descriptions and file lists::
3811 - changesets with full descriptions and file lists::
3812
3812
3813 hg log -v
3813 hg log -v
3814
3814
3815 - changesets ancestral to the working directory::
3815 - changesets ancestral to the working directory::
3816
3816
3817 hg log -f
3817 hg log -f
3818
3818
3819 - last 10 commits on the current branch::
3819 - last 10 commits on the current branch::
3820
3820
3821 hg log -l 10 -b .
3821 hg log -l 10 -b .
3822
3822
3823 - changesets showing all modifications of a file, including removals::
3823 - changesets showing all modifications of a file, including removals::
3824
3824
3825 hg log --removed file.c
3825 hg log --removed file.c
3826
3826
3827 - all changesets that touch a directory, with diffs, excluding merges::
3827 - all changesets that touch a directory, with diffs, excluding merges::
3828
3828
3829 hg log -Mp lib/
3829 hg log -Mp lib/
3830
3830
3831 - all revision numbers that match a keyword::
3831 - all revision numbers that match a keyword::
3832
3832
3833 hg log -k bug --template "{rev}\\n"
3833 hg log -k bug --template "{rev}\\n"
3834
3834
3835 - the full hash identifier of the working directory parent::
3835 - the full hash identifier of the working directory parent::
3836
3836
3837 hg log -r . --template "{node}\\n"
3837 hg log -r . --template "{node}\\n"
3838
3838
3839 - list available log templates::
3839 - list available log templates::
3840
3840
3841 hg log -T list
3841 hg log -T list
3842
3842
3843 - check if a given changeset is included in a tagged release::
3843 - check if a given changeset is included in a tagged release::
3844
3844
3845 hg log -r "a21ccf and ancestor(1.9)"
3845 hg log -r "a21ccf and ancestor(1.9)"
3846
3846
3847 - find all changesets by some user in a date range::
3847 - find all changesets by some user in a date range::
3848
3848
3849 hg log -k alice -d "may 2008 to jul 2008"
3849 hg log -k alice -d "may 2008 to jul 2008"
3850
3850
3851 - summary of all changesets after the last tag::
3851 - summary of all changesets after the last tag::
3852
3852
3853 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3853 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3854
3854
3855 - changesets touching lines 13 to 23 for file.c::
3855 - changesets touching lines 13 to 23 for file.c::
3856
3856
3857 hg log -L file.c,13:23
3857 hg log -L file.c,13:23
3858
3858
3859 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
3859 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of
3860 main.c with patch::
3860 main.c with patch::
3861
3861
3862 hg log -L file.c,13:23 -L main.c,2:6 -p
3862 hg log -L file.c,13:23 -L main.c,2:6 -p
3863
3863
3864 See :hg:`help dates` for a list of formats valid for -d/--date.
3864 See :hg:`help dates` for a list of formats valid for -d/--date.
3865
3865
3866 See :hg:`help revisions` for more about specifying and ordering
3866 See :hg:`help revisions` for more about specifying and ordering
3867 revisions.
3867 revisions.
3868
3868
3869 See :hg:`help templates` for more about pre-packaged styles and
3869 See :hg:`help templates` for more about pre-packaged styles and
3870 specifying custom templates. The default template used by the log
3870 specifying custom templates. The default template used by the log
3871 command can be customized via the ``ui.logtemplate`` configuration
3871 command can be customized via the ``ui.logtemplate`` configuration
3872 setting.
3872 setting.
3873
3873
3874 Returns 0 on success.
3874 Returns 0 on success.
3875
3875
3876 """
3876 """
3877 opts = pycompat.byteskwargs(opts)
3877 opts = pycompat.byteskwargs(opts)
3878 linerange = opts.get('line_range')
3878 linerange = opts.get('line_range')
3879
3879
3880 if linerange and not opts.get('follow'):
3880 if linerange and not opts.get('follow'):
3881 raise error.Abort(_('--line-range requires --follow'))
3881 raise error.Abort(_('--line-range requires --follow'))
3882
3882
3883 if linerange and pats:
3883 if linerange and pats:
3884 # TODO: take pats as patterns with no line-range filter
3884 # TODO: take pats as patterns with no line-range filter
3885 raise error.Abort(
3885 raise error.Abort(
3886 _('FILE arguments are not compatible with --line-range option')
3886 _('FILE arguments are not compatible with --line-range option')
3887 )
3887 )
3888
3888
3889 repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn')
3889 repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn')
3890 revs, differ = logcmdutil.getrevs(repo, pats, opts)
3890 revs, differ = logcmdutil.getrevs(repo, pats, opts)
3891 if linerange:
3891 if linerange:
3892 # TODO: should follow file history from logcmdutil._initialrevs(),
3892 # TODO: should follow file history from logcmdutil._initialrevs(),
3893 # then filter the result by logcmdutil._makerevset() and --limit
3893 # then filter the result by logcmdutil._makerevset() and --limit
3894 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
3894 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
3895
3895
3896 getcopies = None
3896 getcopies = None
3897 if opts.get('copies'):
3897 if opts.get('copies'):
3898 endrev = None
3898 endrev = None
3899 if revs:
3899 if revs:
3900 endrev = revs.max() + 1
3900 endrev = revs.max() + 1
3901 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
3901 getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
3902
3902
3903 ui.pager('log')
3903 ui.pager('log')
3904 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ,
3904 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ,
3905 buffered=True)
3905 buffered=True)
3906 if opts.get('graph'):
3906 if opts.get('graph'):
3907 displayfn = logcmdutil.displaygraphrevs
3907 displayfn = logcmdutil.displaygraphrevs
3908 else:
3908 else:
3909 displayfn = logcmdutil.displayrevs
3909 displayfn = logcmdutil.displayrevs
3910 displayfn(ui, repo, revs, displayer, getcopies)
3910 displayfn(ui, repo, revs, displayer, getcopies)
3911
3911
3912 @command('manifest',
3912 @command('manifest',
3913 [('r', 'rev', '', _('revision to display'), _('REV')),
3913 [('r', 'rev', '', _('revision to display'), _('REV')),
3914 ('', 'all', False, _("list files from all revisions"))]
3914 ('', 'all', False, _("list files from all revisions"))]
3915 + formatteropts,
3915 + formatteropts,
3916 _('[-r REV]'),
3916 _('[-r REV]'),
3917 helpcategory=command.CATEGORY_MAINTENANCE,
3917 helpcategory=command.CATEGORY_MAINTENANCE,
3918 intents={INTENT_READONLY})
3918 intents={INTENT_READONLY})
3919 def manifest(ui, repo, node=None, rev=None, **opts):
3919 def manifest(ui, repo, node=None, rev=None, **opts):
3920 """output the current or given revision of the project manifest
3920 """output the current or given revision of the project manifest
3921
3921
3922 Print a list of version controlled files for the given revision.
3922 Print a list of version controlled files for the given revision.
3923 If no revision is given, the first parent of the working directory
3923 If no revision is given, the first parent of the working directory
3924 is used, or the null revision if no revision is checked out.
3924 is used, or the null revision if no revision is checked out.
3925
3925
3926 With -v, print file permissions, symlink and executable bits.
3926 With -v, print file permissions, symlink and executable bits.
3927 With --debug, print file revision hashes.
3927 With --debug, print file revision hashes.
3928
3928
3929 If option --all is specified, the list of all files from all revisions
3929 If option --all is specified, the list of all files from all revisions
3930 is printed. This includes deleted and renamed files.
3930 is printed. This includes deleted and renamed files.
3931
3931
3932 Returns 0 on success.
3932 Returns 0 on success.
3933 """
3933 """
3934 opts = pycompat.byteskwargs(opts)
3934 opts = pycompat.byteskwargs(opts)
3935 fm = ui.formatter('manifest', opts)
3935 fm = ui.formatter('manifest', opts)
3936
3936
3937 if opts.get('all'):
3937 if opts.get('all'):
3938 if rev or node:
3938 if rev or node:
3939 raise error.Abort(_("can't specify a revision with --all"))
3939 raise error.Abort(_("can't specify a revision with --all"))
3940
3940
3941 res = set()
3941 res = set()
3942 for rev in repo:
3942 for rev in repo:
3943 ctx = repo[rev]
3943 ctx = repo[rev]
3944 res |= set(ctx.files())
3944 res |= set(ctx.files())
3945
3945
3946 ui.pager('manifest')
3946 ui.pager('manifest')
3947 for f in sorted(res):
3947 for f in sorted(res):
3948 fm.startitem()
3948 fm.startitem()
3949 fm.write("path", '%s\n', f)
3949 fm.write("path", '%s\n', f)
3950 fm.end()
3950 fm.end()
3951 return
3951 return
3952
3952
3953 if rev and node:
3953 if rev and node:
3954 raise error.Abort(_("please specify just one revision"))
3954 raise error.Abort(_("please specify just one revision"))
3955
3955
3956 if not node:
3956 if not node:
3957 node = rev
3957 node = rev
3958
3958
3959 char = {'l': '@', 'x': '*', '': '', 't': 'd'}
3959 char = {'l': '@', 'x': '*', '': '', 't': 'd'}
3960 mode = {'l': '644', 'x': '755', '': '644', 't': '755'}
3960 mode = {'l': '644', 'x': '755', '': '644', 't': '755'}
3961 if node:
3961 if node:
3962 repo = scmutil.unhidehashlikerevs(repo, [node], 'nowarn')
3962 repo = scmutil.unhidehashlikerevs(repo, [node], 'nowarn')
3963 ctx = scmutil.revsingle(repo, node)
3963 ctx = scmutil.revsingle(repo, node)
3964 mf = ctx.manifest()
3964 mf = ctx.manifest()
3965 ui.pager('manifest')
3965 ui.pager('manifest')
3966 for f in ctx:
3966 for f in ctx:
3967 fm.startitem()
3967 fm.startitem()
3968 fm.context(ctx=ctx)
3968 fm.context(ctx=ctx)
3969 fl = ctx[f].flags()
3969 fl = ctx[f].flags()
3970 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3970 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3971 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3971 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3972 fm.write('path', '%s\n', f)
3972 fm.write('path', '%s\n', f)
3973 fm.end()
3973 fm.end()
3974
3974
3975 @command('merge',
3975 @command('merge',
3976 [('f', 'force', None,
3976 [('f', 'force', None,
3977 _('force a merge including outstanding changes (DEPRECATED)')),
3977 _('force a merge including outstanding changes (DEPRECATED)')),
3978 ('r', 'rev', '', _('revision to merge'), _('REV')),
3978 ('r', 'rev', '', _('revision to merge'), _('REV')),
3979 ('P', 'preview', None,
3979 ('P', 'preview', None,
3980 _('review revisions to merge (no merge is performed)')),
3980 _('review revisions to merge (no merge is performed)')),
3981 ('', 'abort', None, _('abort the ongoing merge')),
3981 ('', 'abort', None, _('abort the ongoing merge')),
3982 ] + mergetoolopts,
3982 ] + mergetoolopts,
3983 _('[-P] [[-r] REV]'),
3983 _('[-P] [[-r] REV]'),
3984 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT, helpbasic=True)
3984 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT, helpbasic=True)
3985 def merge(ui, repo, node=None, **opts):
3985 def merge(ui, repo, node=None, **opts):
3986 """merge another revision into working directory
3986 """merge another revision into working directory
3987
3987
3988 The current working directory is updated with all changes made in
3988 The current working directory is updated with all changes made in
3989 the requested revision since the last common predecessor revision.
3989 the requested revision since the last common predecessor revision.
3990
3990
3991 Files that changed between either parent are marked as changed for
3991 Files that changed between either parent are marked as changed for
3992 the next commit and a commit must be performed before any further
3992 the next commit and a commit must be performed before any further
3993 updates to the repository are allowed. The next commit will have
3993 updates to the repository are allowed. The next commit will have
3994 two parents.
3994 two parents.
3995
3995
3996 ``--tool`` can be used to specify the merge tool used for file
3996 ``--tool`` can be used to specify the merge tool used for file
3997 merges. It overrides the HGMERGE environment variable and your
3997 merges. It overrides the HGMERGE environment variable and your
3998 configuration files. See :hg:`help merge-tools` for options.
3998 configuration files. See :hg:`help merge-tools` for options.
3999
3999
4000 If no revision is specified, the working directory's parent is a
4000 If no revision is specified, the working directory's parent is a
4001 head revision, and the current branch contains exactly one other
4001 head revision, and the current branch contains exactly one other
4002 head, the other head is merged with by default. Otherwise, an
4002 head, the other head is merged with by default. Otherwise, an
4003 explicit revision with which to merge must be provided.
4003 explicit revision with which to merge must be provided.
4004
4004
4005 See :hg:`help resolve` for information on handling file conflicts.
4005 See :hg:`help resolve` for information on handling file conflicts.
4006
4006
4007 To undo an uncommitted merge, use :hg:`merge --abort` which
4007 To undo an uncommitted merge, use :hg:`merge --abort` which
4008 will check out a clean copy of the original merge parent, losing
4008 will check out a clean copy of the original merge parent, losing
4009 all changes.
4009 all changes.
4010
4010
4011 Returns 0 on success, 1 if there are unresolved files.
4011 Returns 0 on success, 1 if there are unresolved files.
4012 """
4012 """
4013
4013
4014 opts = pycompat.byteskwargs(opts)
4014 opts = pycompat.byteskwargs(opts)
4015 abort = opts.get('abort')
4015 abort = opts.get('abort')
4016 if abort and repo.dirstate.p2() == nullid:
4016 if abort and repo.dirstate.p2() == nullid:
4017 cmdutil.wrongtooltocontinue(repo, _('merge'))
4017 cmdutil.wrongtooltocontinue(repo, _('merge'))
4018 if abort:
4018 if abort:
4019 if node:
4019 if node:
4020 raise error.Abort(_("cannot specify a node with --abort"))
4020 raise error.Abort(_("cannot specify a node with --abort"))
4021 if opts.get('rev'):
4021 if opts.get('rev'):
4022 raise error.Abort(_("cannot specify both --rev and --abort"))
4022 raise error.Abort(_("cannot specify both --rev and --abort"))
4023 if opts.get('preview'):
4023 if opts.get('preview'):
4024 raise error.Abort(_("cannot specify --preview with --abort"))
4024 raise error.Abort(_("cannot specify --preview with --abort"))
4025 if opts.get('rev') and node:
4025 if opts.get('rev') and node:
4026 raise error.Abort(_("please specify just one revision"))
4026 raise error.Abort(_("please specify just one revision"))
4027 if not node:
4027 if not node:
4028 node = opts.get('rev')
4028 node = opts.get('rev')
4029
4029
4030 if node:
4030 if node:
4031 node = scmutil.revsingle(repo, node).node()
4031 node = scmutil.revsingle(repo, node).node()
4032
4032
4033 if not node and not abort:
4033 if not node and not abort:
4034 node = repo[destutil.destmerge(repo)].node()
4034 node = repo[destutil.destmerge(repo)].node()
4035
4035
4036 if opts.get('preview'):
4036 if opts.get('preview'):
4037 # find nodes that are ancestors of p2 but not of p1
4037 # find nodes that are ancestors of p2 but not of p1
4038 p1 = repo.lookup('.')
4038 p1 = repo.lookup('.')
4039 p2 = node
4039 p2 = node
4040 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4040 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4041
4041
4042 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4042 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4043 for node in nodes:
4043 for node in nodes:
4044 displayer.show(repo[node])
4044 displayer.show(repo[node])
4045 displayer.close()
4045 displayer.close()
4046 return 0
4046 return 0
4047
4047
4048 # ui.forcemerge is an internal variable, do not document
4048 # ui.forcemerge is an internal variable, do not document
4049 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
4049 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
4050 with ui.configoverride(overrides, 'merge'):
4050 with ui.configoverride(overrides, 'merge'):
4051 force = opts.get('force')
4051 force = opts.get('force')
4052 labels = ['working copy', 'merge rev']
4052 labels = ['working copy', 'merge rev']
4053 return hg.merge(repo, node, force=force, mergeforce=force,
4053 return hg.merge(repo, node, force=force, mergeforce=force,
4054 labels=labels, abort=abort)
4054 labels=labels, abort=abort)
4055
4055
4056 @command('outgoing|out',
4056 @command('outgoing|out',
4057 [('f', 'force', None, _('run even when the destination is unrelated')),
4057 [('f', 'force', None, _('run even when the destination is unrelated')),
4058 ('r', 'rev', [],
4058 ('r', 'rev', [],
4059 _('a changeset intended to be included in the destination'), _('REV')),
4059 _('a changeset intended to be included in the destination'), _('REV')),
4060 ('n', 'newest-first', None, _('show newest record first')),
4060 ('n', 'newest-first', None, _('show newest record first')),
4061 ('B', 'bookmarks', False, _('compare bookmarks')),
4061 ('B', 'bookmarks', False, _('compare bookmarks')),
4062 ('b', 'branch', [], _('a specific branch you would like to push'),
4062 ('b', 'branch', [], _('a specific branch you would like to push'),
4063 _('BRANCH')),
4063 _('BRANCH')),
4064 ] + logopts + remoteopts + subrepoopts,
4064 ] + logopts + remoteopts + subrepoopts,
4065 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4065 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'),
4066 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT)
4066 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT)
4067 def outgoing(ui, repo, dest=None, **opts):
4067 def outgoing(ui, repo, dest=None, **opts):
4068 """show changesets not found in the destination
4068 """show changesets not found in the destination
4069
4069
4070 Show changesets not found in the specified destination repository
4070 Show changesets not found in the specified destination repository
4071 or the default push location. These are the changesets that would
4071 or the default push location. These are the changesets that would
4072 be pushed if a push was requested.
4072 be pushed if a push was requested.
4073
4073
4074 See pull for details of valid destination formats.
4074 See pull for details of valid destination formats.
4075
4075
4076 .. container:: verbose
4076 .. container:: verbose
4077
4077
4078 With -B/--bookmarks, the result of bookmark comparison between
4078 With -B/--bookmarks, the result of bookmark comparison between
4079 local and remote repositories is displayed. With -v/--verbose,
4079 local and remote repositories is displayed. With -v/--verbose,
4080 status is also displayed for each bookmark like below::
4080 status is also displayed for each bookmark like below::
4081
4081
4082 BM1 01234567890a added
4082 BM1 01234567890a added
4083 BM2 deleted
4083 BM2 deleted
4084 BM3 234567890abc advanced
4084 BM3 234567890abc advanced
4085 BM4 34567890abcd diverged
4085 BM4 34567890abcd diverged
4086 BM5 4567890abcde changed
4086 BM5 4567890abcde changed
4087
4087
4088 The action taken when pushing depends on the
4088 The action taken when pushing depends on the
4089 status of each bookmark:
4089 status of each bookmark:
4090
4090
4091 :``added``: push with ``-B`` will create it
4091 :``added``: push with ``-B`` will create it
4092 :``deleted``: push with ``-B`` will delete it
4092 :``deleted``: push with ``-B`` will delete it
4093 :``advanced``: push will update it
4093 :``advanced``: push will update it
4094 :``diverged``: push with ``-B`` will update it
4094 :``diverged``: push with ``-B`` will update it
4095 :``changed``: push with ``-B`` will update it
4095 :``changed``: push with ``-B`` will update it
4096
4096
4097 From the point of view of pushing behavior, bookmarks
4097 From the point of view of pushing behavior, bookmarks
4098 existing only in the remote repository are treated as
4098 existing only in the remote repository are treated as
4099 ``deleted``, even if it is in fact added remotely.
4099 ``deleted``, even if it is in fact added remotely.
4100
4100
4101 Returns 0 if there are outgoing changes, 1 otherwise.
4101 Returns 0 if there are outgoing changes, 1 otherwise.
4102 """
4102 """
4103 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4103 # hg._outgoing() needs to re-resolve the path in order to handle #branch
4104 # style URLs, so don't overwrite dest.
4104 # style URLs, so don't overwrite dest.
4105 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4105 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4106 if not path:
4106 if not path:
4107 raise error.Abort(_('default repository not configured!'),
4107 raise error.Abort(_('default repository not configured!'),
4108 hint=_("see 'hg help config.paths'"))
4108 hint=_("see 'hg help config.paths'"))
4109
4109
4110 opts = pycompat.byteskwargs(opts)
4110 opts = pycompat.byteskwargs(opts)
4111 if opts.get('graph'):
4111 if opts.get('graph'):
4112 logcmdutil.checkunsupportedgraphflags([], opts)
4112 logcmdutil.checkunsupportedgraphflags([], opts)
4113 o, other = hg._outgoing(ui, repo, dest, opts)
4113 o, other = hg._outgoing(ui, repo, dest, opts)
4114 if not o:
4114 if not o:
4115 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4115 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4116 return
4116 return
4117
4117
4118 revdag = logcmdutil.graphrevs(repo, o, opts)
4118 revdag = logcmdutil.graphrevs(repo, o, opts)
4119 ui.pager('outgoing')
4119 ui.pager('outgoing')
4120 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
4120 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True)
4121 logcmdutil.displaygraph(ui, repo, revdag, displayer,
4121 logcmdutil.displaygraph(ui, repo, revdag, displayer,
4122 graphmod.asciiedges)
4122 graphmod.asciiedges)
4123 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4123 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4124 return 0
4124 return 0
4125
4125
4126 if opts.get('bookmarks'):
4126 if opts.get('bookmarks'):
4127 dest = path.pushloc or path.loc
4127 dest = path.pushloc or path.loc
4128 other = hg.peer(repo, opts, dest)
4128 other = hg.peer(repo, opts, dest)
4129 if 'bookmarks' not in other.listkeys('namespaces'):
4129 if 'bookmarks' not in other.listkeys('namespaces'):
4130 ui.warn(_("remote doesn't support bookmarks\n"))
4130 ui.warn(_("remote doesn't support bookmarks\n"))
4131 return 0
4131 return 0
4132 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4132 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4133 ui.pager('outgoing')
4133 ui.pager('outgoing')
4134 return bookmarks.outgoing(ui, repo, other)
4134 return bookmarks.outgoing(ui, repo, other)
4135
4135
4136 repo._subtoppath = path.pushloc or path.loc
4136 repo._subtoppath = path.pushloc or path.loc
4137 try:
4137 try:
4138 return hg.outgoing(ui, repo, dest, opts)
4138 return hg.outgoing(ui, repo, dest, opts)
4139 finally:
4139 finally:
4140 del repo._subtoppath
4140 del repo._subtoppath
4141
4141
4142 @command('parents',
4142 @command('parents',
4143 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4143 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4144 ] + templateopts,
4144 ] + templateopts,
4145 _('[-r REV] [FILE]'),
4145 _('[-r REV] [FILE]'),
4146 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4146 helpcategory=command.CATEGORY_CHANGE_NAVIGATION,
4147 inferrepo=True)
4147 inferrepo=True)
4148 def parents(ui, repo, file_=None, **opts):
4148 def parents(ui, repo, file_=None, **opts):
4149 """show the parents of the working directory or revision (DEPRECATED)
4149 """show the parents of the working directory or revision (DEPRECATED)
4150
4150
4151 Print the working directory's parent revisions. If a revision is
4151 Print the working directory's parent revisions. If a revision is
4152 given via -r/--rev, the parent of that revision will be printed.
4152 given via -r/--rev, the parent of that revision will be printed.
4153 If a file argument is given, the revision in which the file was
4153 If a file argument is given, the revision in which the file was
4154 last changed (before the working directory revision or the
4154 last changed (before the working directory revision or the
4155 argument to --rev if given) is printed.
4155 argument to --rev if given) is printed.
4156
4156
4157 This command is equivalent to::
4157 This command is equivalent to::
4158
4158
4159 hg log -r "p1()+p2()" or
4159 hg log -r "p1()+p2()" or
4160 hg log -r "p1(REV)+p2(REV)" or
4160 hg log -r "p1(REV)+p2(REV)" or
4161 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
4161 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
4162 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
4162 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
4163
4163
4164 See :hg:`summary` and :hg:`help revsets` for related information.
4164 See :hg:`summary` and :hg:`help revsets` for related information.
4165
4165
4166 Returns 0 on success.
4166 Returns 0 on success.
4167 """
4167 """
4168
4168
4169 opts = pycompat.byteskwargs(opts)
4169 opts = pycompat.byteskwargs(opts)
4170 rev = opts.get('rev')
4170 rev = opts.get('rev')
4171 if rev:
4171 if rev:
4172 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
4172 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
4173 ctx = scmutil.revsingle(repo, rev, None)
4173 ctx = scmutil.revsingle(repo, rev, None)
4174
4174
4175 if file_:
4175 if file_:
4176 m = scmutil.match(ctx, (file_,), opts)
4176 m = scmutil.match(ctx, (file_,), opts)
4177 if m.anypats() or len(m.files()) != 1:
4177 if m.anypats() or len(m.files()) != 1:
4178 raise error.Abort(_('can only specify an explicit filename'))
4178 raise error.Abort(_('can only specify an explicit filename'))
4179 file_ = m.files()[0]
4179 file_ = m.files()[0]
4180 filenodes = []
4180 filenodes = []
4181 for cp in ctx.parents():
4181 for cp in ctx.parents():
4182 if not cp:
4182 if not cp:
4183 continue
4183 continue
4184 try:
4184 try:
4185 filenodes.append(cp.filenode(file_))
4185 filenodes.append(cp.filenode(file_))
4186 except error.LookupError:
4186 except error.LookupError:
4187 pass
4187 pass
4188 if not filenodes:
4188 if not filenodes:
4189 raise error.Abort(_("'%s' not found in manifest!") % file_)
4189 raise error.Abort(_("'%s' not found in manifest!") % file_)
4190 p = []
4190 p = []
4191 for fn in filenodes:
4191 for fn in filenodes:
4192 fctx = repo.filectx(file_, fileid=fn)
4192 fctx = repo.filectx(file_, fileid=fn)
4193 p.append(fctx.node())
4193 p.append(fctx.node())
4194 else:
4194 else:
4195 p = [cp.node() for cp in ctx.parents()]
4195 p = [cp.node() for cp in ctx.parents()]
4196
4196
4197 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4197 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
4198 for n in p:
4198 for n in p:
4199 if n != nullid:
4199 if n != nullid:
4200 displayer.show(repo[n])
4200 displayer.show(repo[n])
4201 displayer.close()
4201 displayer.close()
4202
4202
4203 @command('paths', formatteropts, _('[NAME]'),
4203 @command('paths', formatteropts, _('[NAME]'),
4204 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4204 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4205 optionalrepo=True, intents={INTENT_READONLY})
4205 optionalrepo=True, intents={INTENT_READONLY})
4206 def paths(ui, repo, search=None, **opts):
4206 def paths(ui, repo, search=None, **opts):
4207 """show aliases for remote repositories
4207 """show aliases for remote repositories
4208
4208
4209 Show definition of symbolic path name NAME. If no name is given,
4209 Show definition of symbolic path name NAME. If no name is given,
4210 show definition of all available names.
4210 show definition of all available names.
4211
4211
4212 Option -q/--quiet suppresses all output when searching for NAME
4212 Option -q/--quiet suppresses all output when searching for NAME
4213 and shows only the path names when listing all definitions.
4213 and shows only the path names when listing all definitions.
4214
4214
4215 Path names are defined in the [paths] section of your
4215 Path names are defined in the [paths] section of your
4216 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4216 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4217 repository, ``.hg/hgrc`` is used, too.
4217 repository, ``.hg/hgrc`` is used, too.
4218
4218
4219 The path names ``default`` and ``default-push`` have a special
4219 The path names ``default`` and ``default-push`` have a special
4220 meaning. When performing a push or pull operation, they are used
4220 meaning. When performing a push or pull operation, they are used
4221 as fallbacks if no location is specified on the command-line.
4221 as fallbacks if no location is specified on the command-line.
4222 When ``default-push`` is set, it will be used for push and
4222 When ``default-push`` is set, it will be used for push and
4223 ``default`` will be used for pull; otherwise ``default`` is used
4223 ``default`` will be used for pull; otherwise ``default`` is used
4224 as the fallback for both. When cloning a repository, the clone
4224 as the fallback for both. When cloning a repository, the clone
4225 source is written as ``default`` in ``.hg/hgrc``.
4225 source is written as ``default`` in ``.hg/hgrc``.
4226
4226
4227 .. note::
4227 .. note::
4228
4228
4229 ``default`` and ``default-push`` apply to all inbound (e.g.
4229 ``default`` and ``default-push`` apply to all inbound (e.g.
4230 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
4230 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
4231 and :hg:`bundle`) operations.
4231 and :hg:`bundle`) operations.
4232
4232
4233 See :hg:`help urls` for more information.
4233 See :hg:`help urls` for more information.
4234
4234
4235 .. container:: verbose
4235 .. container:: verbose
4236
4236
4237 Template:
4237 Template:
4238
4238
4239 The following keywords are supported. See also :hg:`help templates`.
4239 The following keywords are supported. See also :hg:`help templates`.
4240
4240
4241 :name: String. Symbolic name of the path alias.
4241 :name: String. Symbolic name of the path alias.
4242 :pushurl: String. URL for push operations.
4242 :pushurl: String. URL for push operations.
4243 :url: String. URL or directory path for the other operations.
4243 :url: String. URL or directory path for the other operations.
4244
4244
4245 Returns 0 on success.
4245 Returns 0 on success.
4246 """
4246 """
4247
4247
4248 opts = pycompat.byteskwargs(opts)
4248 opts = pycompat.byteskwargs(opts)
4249 ui.pager('paths')
4249 ui.pager('paths')
4250 if search:
4250 if search:
4251 pathitems = [(name, path) for name, path in ui.paths.iteritems()
4251 pathitems = [(name, path) for name, path in ui.paths.iteritems()
4252 if name == search]
4252 if name == search]
4253 else:
4253 else:
4254 pathitems = sorted(ui.paths.iteritems())
4254 pathitems = sorted(ui.paths.iteritems())
4255
4255
4256 fm = ui.formatter('paths', opts)
4256 fm = ui.formatter('paths', opts)
4257 if fm.isplain():
4257 if fm.isplain():
4258 hidepassword = util.hidepassword
4258 hidepassword = util.hidepassword
4259 else:
4259 else:
4260 hidepassword = bytes
4260 hidepassword = bytes
4261 if ui.quiet:
4261 if ui.quiet:
4262 namefmt = '%s\n'
4262 namefmt = '%s\n'
4263 else:
4263 else:
4264 namefmt = '%s = '
4264 namefmt = '%s = '
4265 showsubopts = not search and not ui.quiet
4265 showsubopts = not search and not ui.quiet
4266
4266
4267 for name, path in pathitems:
4267 for name, path in pathitems:
4268 fm.startitem()
4268 fm.startitem()
4269 fm.condwrite(not search, 'name', namefmt, name)
4269 fm.condwrite(not search, 'name', namefmt, name)
4270 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
4270 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
4271 for subopt, value in sorted(path.suboptions.items()):
4271 for subopt, value in sorted(path.suboptions.items()):
4272 assert subopt not in ('name', 'url')
4272 assert subopt not in ('name', 'url')
4273 if showsubopts:
4273 if showsubopts:
4274 fm.plain('%s:%s = ' % (name, subopt))
4274 fm.plain('%s:%s = ' % (name, subopt))
4275 fm.condwrite(showsubopts, subopt, '%s\n', value)
4275 fm.condwrite(showsubopts, subopt, '%s\n', value)
4276
4276
4277 fm.end()
4277 fm.end()
4278
4278
4279 if search and not pathitems:
4279 if search and not pathitems:
4280 if not ui.quiet:
4280 if not ui.quiet:
4281 ui.warn(_("not found!\n"))
4281 ui.warn(_("not found!\n"))
4282 return 1
4282 return 1
4283 else:
4283 else:
4284 return 0
4284 return 0
4285
4285
4286 @command('phase',
4286 @command('phase',
4287 [('p', 'public', False, _('set changeset phase to public')),
4287 [('p', 'public', False, _('set changeset phase to public')),
4288 ('d', 'draft', False, _('set changeset phase to draft')),
4288 ('d', 'draft', False, _('set changeset phase to draft')),
4289 ('s', 'secret', False, _('set changeset phase to secret')),
4289 ('s', 'secret', False, _('set changeset phase to secret')),
4290 ('f', 'force', False, _('allow to move boundary backward')),
4290 ('f', 'force', False, _('allow to move boundary backward')),
4291 ('r', 'rev', [], _('target revision'), _('REV')),
4291 ('r', 'rev', [], _('target revision'), _('REV')),
4292 ],
4292 ],
4293 _('[-p|-d|-s] [-f] [-r] [REV...]'),
4293 _('[-p|-d|-s] [-f] [-r] [REV...]'),
4294 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
4294 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
4295 def phase(ui, repo, *revs, **opts):
4295 def phase(ui, repo, *revs, **opts):
4296 """set or show the current phase name
4296 """set or show the current phase name
4297
4297
4298 With no argument, show the phase name of the current revision(s).
4298 With no argument, show the phase name of the current revision(s).
4299
4299
4300 With one of -p/--public, -d/--draft or -s/--secret, change the
4300 With one of -p/--public, -d/--draft or -s/--secret, change the
4301 phase value of the specified revisions.
4301 phase value of the specified revisions.
4302
4302
4303 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
4303 Unless -f/--force is specified, :hg:`phase` won't move changesets from a
4304 lower phase to a higher phase. Phases are ordered as follows::
4304 lower phase to a higher phase. Phases are ordered as follows::
4305
4305
4306 public < draft < secret
4306 public < draft < secret
4307
4307
4308 Returns 0 on success, 1 if some phases could not be changed.
4308 Returns 0 on success, 1 if some phases could not be changed.
4309
4309
4310 (For more information about the phases concept, see :hg:`help phases`.)
4310 (For more information about the phases concept, see :hg:`help phases`.)
4311 """
4311 """
4312 opts = pycompat.byteskwargs(opts)
4312 opts = pycompat.byteskwargs(opts)
4313 # search for a unique phase argument
4313 # search for a unique phase argument
4314 targetphase = None
4314 targetphase = None
4315 for idx, name in enumerate(phases.cmdphasenames):
4315 for idx, name in enumerate(phases.cmdphasenames):
4316 if opts[name]:
4316 if opts[name]:
4317 if targetphase is not None:
4317 if targetphase is not None:
4318 raise error.Abort(_('only one phase can be specified'))
4318 raise error.Abort(_('only one phase can be specified'))
4319 targetphase = idx
4319 targetphase = idx
4320
4320
4321 # look for specified revision
4321 # look for specified revision
4322 revs = list(revs)
4322 revs = list(revs)
4323 revs.extend(opts['rev'])
4323 revs.extend(opts['rev'])
4324 if not revs:
4324 if not revs:
4325 # display both parents as the second parent phase can influence
4325 # display both parents as the second parent phase can influence
4326 # the phase of a merge commit
4326 # the phase of a merge commit
4327 revs = [c.rev() for c in repo[None].parents()]
4327 revs = [c.rev() for c in repo[None].parents()]
4328
4328
4329 revs = scmutil.revrange(repo, revs)
4329 revs = scmutil.revrange(repo, revs)
4330
4330
4331 ret = 0
4331 ret = 0
4332 if targetphase is None:
4332 if targetphase is None:
4333 # display
4333 # display
4334 for r in revs:
4334 for r in revs:
4335 ctx = repo[r]
4335 ctx = repo[r]
4336 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
4336 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
4337 else:
4337 else:
4338 with repo.lock(), repo.transaction("phase") as tr:
4338 with repo.lock(), repo.transaction("phase") as tr:
4339 # set phase
4339 # set phase
4340 if not revs:
4340 if not revs:
4341 raise error.Abort(_('empty revision set'))
4341 raise error.Abort(_('empty revision set'))
4342 nodes = [repo[r].node() for r in revs]
4342 nodes = [repo[r].node() for r in revs]
4343 # moving revision from public to draft may hide them
4343 # moving revision from public to draft may hide them
4344 # We have to check result on an unfiltered repository
4344 # We have to check result on an unfiltered repository
4345 unfi = repo.unfiltered()
4345 unfi = repo.unfiltered()
4346 getphase = unfi._phasecache.phase
4346 getphase = unfi._phasecache.phase
4347 olddata = [getphase(unfi, r) for r in unfi]
4347 olddata = [getphase(unfi, r) for r in unfi]
4348 phases.advanceboundary(repo, tr, targetphase, nodes)
4348 phases.advanceboundary(repo, tr, targetphase, nodes)
4349 if opts['force']:
4349 if opts['force']:
4350 phases.retractboundary(repo, tr, targetphase, nodes)
4350 phases.retractboundary(repo, tr, targetphase, nodes)
4351 getphase = unfi._phasecache.phase
4351 getphase = unfi._phasecache.phase
4352 newdata = [getphase(unfi, r) for r in unfi]
4352 newdata = [getphase(unfi, r) for r in unfi]
4353 changes = sum(newdata[r] != olddata[r] for r in unfi)
4353 changes = sum(newdata[r] != olddata[r] for r in unfi)
4354 cl = unfi.changelog
4354 cl = unfi.changelog
4355 rejected = [n for n in nodes
4355 rejected = [n for n in nodes
4356 if newdata[cl.rev(n)] < targetphase]
4356 if newdata[cl.rev(n)] < targetphase]
4357 if rejected:
4357 if rejected:
4358 ui.warn(_('cannot move %i changesets to a higher '
4358 ui.warn(_('cannot move %i changesets to a higher '
4359 'phase, use --force\n') % len(rejected))
4359 'phase, use --force\n') % len(rejected))
4360 ret = 1
4360 ret = 1
4361 if changes:
4361 if changes:
4362 msg = _('phase changed for %i changesets\n') % changes
4362 msg = _('phase changed for %i changesets\n') % changes
4363 if ret:
4363 if ret:
4364 ui.status(msg)
4364 ui.status(msg)
4365 else:
4365 else:
4366 ui.note(msg)
4366 ui.note(msg)
4367 else:
4367 else:
4368 ui.warn(_('no phases changed\n'))
4368 ui.warn(_('no phases changed\n'))
4369 return ret
4369 return ret
4370
4370
4371 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
4371 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
4372 """Run after a changegroup has been added via pull/unbundle
4372 """Run after a changegroup has been added via pull/unbundle
4373
4373
4374 This takes arguments below:
4374 This takes arguments below:
4375
4375
4376 :modheads: change of heads by pull/unbundle
4376 :modheads: change of heads by pull/unbundle
4377 :optupdate: updating working directory is needed or not
4377 :optupdate: updating working directory is needed or not
4378 :checkout: update destination revision (or None to default destination)
4378 :checkout: update destination revision (or None to default destination)
4379 :brev: a name, which might be a bookmark to be activated after updating
4379 :brev: a name, which might be a bookmark to be activated after updating
4380 """
4380 """
4381 if modheads == 0:
4381 if modheads == 0:
4382 return
4382 return
4383 if optupdate:
4383 if optupdate:
4384 try:
4384 try:
4385 return hg.updatetotally(ui, repo, checkout, brev)
4385 return hg.updatetotally(ui, repo, checkout, brev)
4386 except error.UpdateAbort as inst:
4386 except error.UpdateAbort as inst:
4387 msg = _("not updating: %s") % stringutil.forcebytestr(inst)
4387 msg = _("not updating: %s") % stringutil.forcebytestr(inst)
4388 hint = inst.hint
4388 hint = inst.hint
4389 raise error.UpdateAbort(msg, hint=hint)
4389 raise error.UpdateAbort(msg, hint=hint)
4390 if modheads is not None and modheads > 1:
4390 if modheads is not None and modheads > 1:
4391 currentbranchheads = len(repo.branchheads())
4391 currentbranchheads = len(repo.branchheads())
4392 if currentbranchheads == modheads:
4392 if currentbranchheads == modheads:
4393 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4393 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4394 elif currentbranchheads > 1:
4394 elif currentbranchheads > 1:
4395 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
4395 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
4396 "merge)\n"))
4396 "merge)\n"))
4397 else:
4397 else:
4398 ui.status(_("(run 'hg heads' to see heads)\n"))
4398 ui.status(_("(run 'hg heads' to see heads)\n"))
4399 elif not ui.configbool('commands', 'update.requiredest'):
4399 elif not ui.configbool('commands', 'update.requiredest'):
4400 ui.status(_("(run 'hg update' to get a working copy)\n"))
4400 ui.status(_("(run 'hg update' to get a working copy)\n"))
4401
4401
4402 @command('pull',
4402 @command('pull',
4403 [('u', 'update', None,
4403 [('u', 'update', None,
4404 _('update to new branch head if new descendants were pulled')),
4404 _('update to new branch head if new descendants were pulled')),
4405 ('f', 'force', None, _('run even when remote repository is unrelated')),
4405 ('f', 'force', None, _('run even when remote repository is unrelated')),
4406 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4406 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4407 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4407 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4408 ('b', 'branch', [], _('a specific branch you would like to pull'),
4408 ('b', 'branch', [], _('a specific branch you would like to pull'),
4409 _('BRANCH')),
4409 _('BRANCH')),
4410 ] + remoteopts,
4410 ] + remoteopts,
4411 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
4411 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'),
4412 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4412 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4413 helpbasic=True)
4413 helpbasic=True)
4414 def pull(ui, repo, source="default", **opts):
4414 def pull(ui, repo, source="default", **opts):
4415 """pull changes from the specified source
4415 """pull changes from the specified source
4416
4416
4417 Pull changes from a remote repository to a local one.
4417 Pull changes from a remote repository to a local one.
4418
4418
4419 This finds all changes from the repository at the specified path
4419 This finds all changes from the repository at the specified path
4420 or URL and adds them to a local repository (the current one unless
4420 or URL and adds them to a local repository (the current one unless
4421 -R is specified). By default, this does not update the copy of the
4421 -R is specified). By default, this does not update the copy of the
4422 project in the working directory.
4422 project in the working directory.
4423
4423
4424 When cloning from servers that support it, Mercurial may fetch
4424 When cloning from servers that support it, Mercurial may fetch
4425 pre-generated data. When this is done, hooks operating on incoming
4425 pre-generated data. When this is done, hooks operating on incoming
4426 changesets and changegroups may fire more than once, once for each
4426 changesets and changegroups may fire more than once, once for each
4427 pre-generated bundle and as well as for any additional remaining
4427 pre-generated bundle and as well as for any additional remaining
4428 data. See :hg:`help -e clonebundles` for more.
4428 data. See :hg:`help -e clonebundles` for more.
4429
4429
4430 Use :hg:`incoming` if you want to see what would have been added
4430 Use :hg:`incoming` if you want to see what would have been added
4431 by a pull at the time you issued this command. If you then decide
4431 by a pull at the time you issued this command. If you then decide
4432 to add those changes to the repository, you should use :hg:`pull
4432 to add those changes to the repository, you should use :hg:`pull
4433 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4433 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4434
4434
4435 If SOURCE is omitted, the 'default' path will be used.
4435 If SOURCE is omitted, the 'default' path will be used.
4436 See :hg:`help urls` for more information.
4436 See :hg:`help urls` for more information.
4437
4437
4438 Specifying bookmark as ``.`` is equivalent to specifying the active
4438 Specifying bookmark as ``.`` is equivalent to specifying the active
4439 bookmark's name.
4439 bookmark's name.
4440
4440
4441 Returns 0 on success, 1 if an update had unresolved files.
4441 Returns 0 on success, 1 if an update had unresolved files.
4442 """
4442 """
4443
4443
4444 opts = pycompat.byteskwargs(opts)
4444 opts = pycompat.byteskwargs(opts)
4445 if ui.configbool('commands', 'update.requiredest') and opts.get('update'):
4445 if ui.configbool('commands', 'update.requiredest') and opts.get('update'):
4446 msg = _('update destination required by configuration')
4446 msg = _('update destination required by configuration')
4447 hint = _('use hg pull followed by hg update DEST')
4447 hint = _('use hg pull followed by hg update DEST')
4448 raise error.Abort(msg, hint=hint)
4448 raise error.Abort(msg, hint=hint)
4449
4449
4450 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4450 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4451 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4451 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4452 other = hg.peer(repo, opts, source)
4452 other = hg.peer(repo, opts, source)
4453 try:
4453 try:
4454 revs, checkout = hg.addbranchrevs(repo, other, branches,
4454 revs, checkout = hg.addbranchrevs(repo, other, branches,
4455 opts.get('rev'))
4455 opts.get('rev'))
4456
4456
4457 pullopargs = {}
4457 pullopargs = {}
4458
4458
4459 nodes = None
4459 nodes = None
4460 if opts.get('bookmark') or revs:
4460 if opts.get('bookmark') or revs:
4461 # The list of bookmark used here is the same used to actually update
4461 # The list of bookmark used here is the same used to actually update
4462 # the bookmark names, to avoid the race from issue 4689 and we do
4462 # the bookmark names, to avoid the race from issue 4689 and we do
4463 # all lookup and bookmark queries in one go so they see the same
4463 # all lookup and bookmark queries in one go so they see the same
4464 # version of the server state (issue 4700).
4464 # version of the server state (issue 4700).
4465 nodes = []
4465 nodes = []
4466 fnodes = []
4466 fnodes = []
4467 revs = revs or []
4467 revs = revs or []
4468 if revs and not other.capable('lookup'):
4468 if revs and not other.capable('lookup'):
4469 err = _("other repository doesn't support revision lookup, "
4469 err = _("other repository doesn't support revision lookup, "
4470 "so a rev cannot be specified.")
4470 "so a rev cannot be specified.")
4471 raise error.Abort(err)
4471 raise error.Abort(err)
4472 with other.commandexecutor() as e:
4472 with other.commandexecutor() as e:
4473 fremotebookmarks = e.callcommand('listkeys', {
4473 fremotebookmarks = e.callcommand('listkeys', {
4474 'namespace': 'bookmarks'
4474 'namespace': 'bookmarks'
4475 })
4475 })
4476 for r in revs:
4476 for r in revs:
4477 fnodes.append(e.callcommand('lookup', {'key': r}))
4477 fnodes.append(e.callcommand('lookup', {'key': r}))
4478 remotebookmarks = fremotebookmarks.result()
4478 remotebookmarks = fremotebookmarks.result()
4479 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
4479 remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks)
4480 pullopargs['remotebookmarks'] = remotebookmarks
4480 pullopargs['remotebookmarks'] = remotebookmarks
4481 for b in opts.get('bookmark', []):
4481 for b in opts.get('bookmark', []):
4482 b = repo._bookmarks.expandname(b)
4482 b = repo._bookmarks.expandname(b)
4483 if b not in remotebookmarks:
4483 if b not in remotebookmarks:
4484 raise error.Abort(_('remote bookmark %s not found!') % b)
4484 raise error.Abort(_('remote bookmark %s not found!') % b)
4485 nodes.append(remotebookmarks[b])
4485 nodes.append(remotebookmarks[b])
4486 for i, rev in enumerate(revs):
4486 for i, rev in enumerate(revs):
4487 node = fnodes[i].result()
4487 node = fnodes[i].result()
4488 nodes.append(node)
4488 nodes.append(node)
4489 if rev == checkout:
4489 if rev == checkout:
4490 checkout = node
4490 checkout = node
4491
4491
4492 wlock = util.nullcontextmanager()
4492 wlock = util.nullcontextmanager()
4493 if opts.get('update'):
4493 if opts.get('update'):
4494 wlock = repo.wlock()
4494 wlock = repo.wlock()
4495 with wlock:
4495 with wlock:
4496 pullopargs.update(opts.get('opargs', {}))
4496 pullopargs.update(opts.get('opargs', {}))
4497 modheads = exchange.pull(repo, other, heads=nodes,
4497 modheads = exchange.pull(repo, other, heads=nodes,
4498 force=opts.get('force'),
4498 force=opts.get('force'),
4499 bookmarks=opts.get('bookmark', ()),
4499 bookmarks=opts.get('bookmark', ()),
4500 opargs=pullopargs).cgresult
4500 opargs=pullopargs).cgresult
4501
4501
4502 # brev is a name, which might be a bookmark to be activated at
4502 # brev is a name, which might be a bookmark to be activated at
4503 # the end of the update. In other words, it is an explicit
4503 # the end of the update. In other words, it is an explicit
4504 # destination of the update
4504 # destination of the update
4505 brev = None
4505 brev = None
4506
4506
4507 if checkout:
4507 if checkout:
4508 checkout = repo.unfiltered().changelog.rev(checkout)
4508 checkout = repo.unfiltered().changelog.rev(checkout)
4509
4509
4510 # order below depends on implementation of
4510 # order below depends on implementation of
4511 # hg.addbranchrevs(). opts['bookmark'] is ignored,
4511 # hg.addbranchrevs(). opts['bookmark'] is ignored,
4512 # because 'checkout' is determined without it.
4512 # because 'checkout' is determined without it.
4513 if opts.get('rev'):
4513 if opts.get('rev'):
4514 brev = opts['rev'][0]
4514 brev = opts['rev'][0]
4515 elif opts.get('branch'):
4515 elif opts.get('branch'):
4516 brev = opts['branch'][0]
4516 brev = opts['branch'][0]
4517 else:
4517 else:
4518 brev = branches[0]
4518 brev = branches[0]
4519 repo._subtoppath = source
4519 repo._subtoppath = source
4520 try:
4520 try:
4521 ret = postincoming(ui, repo, modheads, opts.get('update'),
4521 ret = postincoming(ui, repo, modheads, opts.get('update'),
4522 checkout, brev)
4522 checkout, brev)
4523 except error.FilteredRepoLookupError as exc:
4523 except error.FilteredRepoLookupError as exc:
4524 msg = _('cannot update to target: %s') % exc.args[0]
4524 msg = _('cannot update to target: %s') % exc.args[0]
4525 exc.args = (msg,) + exc.args[1:]
4525 exc.args = (msg,) + exc.args[1:]
4526 raise
4526 raise
4527 finally:
4527 finally:
4528 del repo._subtoppath
4528 del repo._subtoppath
4529
4529
4530 finally:
4530 finally:
4531 other.close()
4531 other.close()
4532 return ret
4532 return ret
4533
4533
4534 @command('push',
4534 @command('push',
4535 [('f', 'force', None, _('force push')),
4535 [('f', 'force', None, _('force push')),
4536 ('r', 'rev', [],
4536 ('r', 'rev', [],
4537 _('a changeset intended to be included in the destination'),
4537 _('a changeset intended to be included in the destination'),
4538 _('REV')),
4538 _('REV')),
4539 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4539 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4540 ('b', 'branch', [],
4540 ('b', 'branch', [],
4541 _('a specific branch you would like to push'), _('BRANCH')),
4541 _('a specific branch you would like to push'), _('BRANCH')),
4542 ('', 'new-branch', False, _('allow pushing a new branch')),
4542 ('', 'new-branch', False, _('allow pushing a new branch')),
4543 ('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')),
4543 ('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')),
4544 ('', 'publish', False, _('push the changeset as public (EXPERIMENTAL)')),
4544 ('', 'publish', False, _('push the changeset as public (EXPERIMENTAL)')),
4545 ] + remoteopts,
4545 ] + remoteopts,
4546 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
4546 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'),
4547 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4547 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
4548 helpbasic=True)
4548 helpbasic=True)
4549 def push(ui, repo, dest=None, **opts):
4549 def push(ui, repo, dest=None, **opts):
4550 """push changes to the specified destination
4550 """push changes to the specified destination
4551
4551
4552 Push changesets from the local repository to the specified
4552 Push changesets from the local repository to the specified
4553 destination.
4553 destination.
4554
4554
4555 This operation is symmetrical to pull: it is identical to a pull
4555 This operation is symmetrical to pull: it is identical to a pull
4556 in the destination repository from the current one.
4556 in the destination repository from the current one.
4557
4557
4558 By default, push will not allow creation of new heads at the
4558 By default, push will not allow creation of new heads at the
4559 destination, since multiple heads would make it unclear which head
4559 destination, since multiple heads would make it unclear which head
4560 to use. In this situation, it is recommended to pull and merge
4560 to use. In this situation, it is recommended to pull and merge
4561 before pushing.
4561 before pushing.
4562
4562
4563 Use --new-branch if you want to allow push to create a new named
4563 Use --new-branch if you want to allow push to create a new named
4564 branch that is not present at the destination. This allows you to
4564 branch that is not present at the destination. This allows you to
4565 only create a new branch without forcing other changes.
4565 only create a new branch without forcing other changes.
4566
4566
4567 .. note::
4567 .. note::
4568
4568
4569 Extra care should be taken with the -f/--force option,
4569 Extra care should be taken with the -f/--force option,
4570 which will push all new heads on all branches, an action which will
4570 which will push all new heads on all branches, an action which will
4571 almost always cause confusion for collaborators.
4571 almost always cause confusion for collaborators.
4572
4572
4573 If -r/--rev is used, the specified revision and all its ancestors
4573 If -r/--rev is used, the specified revision and all its ancestors
4574 will be pushed to the remote repository.
4574 will be pushed to the remote repository.
4575
4575
4576 If -B/--bookmark is used, the specified bookmarked revision, its
4576 If -B/--bookmark is used, the specified bookmarked revision, its
4577 ancestors, and the bookmark will be pushed to the remote
4577 ancestors, and the bookmark will be pushed to the remote
4578 repository. Specifying ``.`` is equivalent to specifying the active
4578 repository. Specifying ``.`` is equivalent to specifying the active
4579 bookmark's name.
4579 bookmark's name.
4580
4580
4581 Please see :hg:`help urls` for important details about ``ssh://``
4581 Please see :hg:`help urls` for important details about ``ssh://``
4582 URLs. If DESTINATION is omitted, a default path will be used.
4582 URLs. If DESTINATION is omitted, a default path will be used.
4583
4583
4584 .. container:: verbose
4584 .. container:: verbose
4585
4585
4586 The --pushvars option sends strings to the server that become
4586 The --pushvars option sends strings to the server that become
4587 environment variables prepended with ``HG_USERVAR_``. For example,
4587 environment variables prepended with ``HG_USERVAR_``. For example,
4588 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
4588 ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with
4589 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
4589 ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment.
4590
4590
4591 pushvars can provide for user-overridable hooks as well as set debug
4591 pushvars can provide for user-overridable hooks as well as set debug
4592 levels. One example is having a hook that blocks commits containing
4592 levels. One example is having a hook that blocks commits containing
4593 conflict markers, but enables the user to override the hook if the file
4593 conflict markers, but enables the user to override the hook if the file
4594 is using conflict markers for testing purposes or the file format has
4594 is using conflict markers for testing purposes or the file format has
4595 strings that look like conflict markers.
4595 strings that look like conflict markers.
4596
4596
4597 By default, servers will ignore `--pushvars`. To enable it add the
4597 By default, servers will ignore `--pushvars`. To enable it add the
4598 following to your configuration file::
4598 following to your configuration file::
4599
4599
4600 [push]
4600 [push]
4601 pushvars.server = true
4601 pushvars.server = true
4602
4602
4603 Returns 0 if push was successful, 1 if nothing to push.
4603 Returns 0 if push was successful, 1 if nothing to push.
4604 """
4604 """
4605
4605
4606 opts = pycompat.byteskwargs(opts)
4606 opts = pycompat.byteskwargs(opts)
4607 if opts.get('bookmark'):
4607 if opts.get('bookmark'):
4608 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4608 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4609 for b in opts['bookmark']:
4609 for b in opts['bookmark']:
4610 # translate -B options to -r so changesets get pushed
4610 # translate -B options to -r so changesets get pushed
4611 b = repo._bookmarks.expandname(b)
4611 b = repo._bookmarks.expandname(b)
4612 if b in repo._bookmarks:
4612 if b in repo._bookmarks:
4613 opts.setdefault('rev', []).append(b)
4613 opts.setdefault('rev', []).append(b)
4614 else:
4614 else:
4615 # if we try to push a deleted bookmark, translate it to null
4615 # if we try to push a deleted bookmark, translate it to null
4616 # this lets simultaneous -r, -b options continue working
4616 # this lets simultaneous -r, -b options continue working
4617 opts.setdefault('rev', []).append("null")
4617 opts.setdefault('rev', []).append("null")
4618
4618
4619 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4619 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4620 if not path:
4620 if not path:
4621 raise error.Abort(_('default repository not configured!'),
4621 raise error.Abort(_('default repository not configured!'),
4622 hint=_("see 'hg help config.paths'"))
4622 hint=_("see 'hg help config.paths'"))
4623 dest = path.pushloc or path.loc
4623 dest = path.pushloc or path.loc
4624 branches = (path.branch, opts.get('branch') or [])
4624 branches = (path.branch, opts.get('branch') or [])
4625 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4625 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4626 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4626 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4627 other = hg.peer(repo, opts, dest)
4627 other = hg.peer(repo, opts, dest)
4628
4628
4629 if revs:
4629 if revs:
4630 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
4630 revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
4631 if not revs:
4631 if not revs:
4632 raise error.Abort(_("specified revisions evaluate to an empty set"),
4632 raise error.Abort(_("specified revisions evaluate to an empty set"),
4633 hint=_("use different revision arguments"))
4633 hint=_("use different revision arguments"))
4634 elif path.pushrev:
4634 elif path.pushrev:
4635 # It doesn't make any sense to specify ancestor revisions. So limit
4635 # It doesn't make any sense to specify ancestor revisions. So limit
4636 # to DAG heads to make discovery simpler.
4636 # to DAG heads to make discovery simpler.
4637 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4637 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4638 revs = scmutil.revrange(repo, [expr])
4638 revs = scmutil.revrange(repo, [expr])
4639 revs = [repo[rev].node() for rev in revs]
4639 revs = [repo[rev].node() for rev in revs]
4640 if not revs:
4640 if not revs:
4641 raise error.Abort(_('default push revset for path evaluates to an '
4641 raise error.Abort(_('default push revset for path evaluates to an '
4642 'empty set'))
4642 'empty set'))
4643
4643
4644 repo._subtoppath = dest
4644 repo._subtoppath = dest
4645 try:
4645 try:
4646 # push subrepos depth-first for coherent ordering
4646 # push subrepos depth-first for coherent ordering
4647 c = repo['.']
4647 c = repo['.']
4648 subs = c.substate # only repos that are committed
4648 subs = c.substate # only repos that are committed
4649 for s in sorted(subs):
4649 for s in sorted(subs):
4650 result = c.sub(s).push(opts)
4650 result = c.sub(s).push(opts)
4651 if result == 0:
4651 if result == 0:
4652 return not result
4652 return not result
4653 finally:
4653 finally:
4654 del repo._subtoppath
4654 del repo._subtoppath
4655
4655
4656 opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it
4656 opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it
4657 opargs.setdefault('pushvars', []).extend(opts.get('pushvars', []))
4657 opargs.setdefault('pushvars', []).extend(opts.get('pushvars', []))
4658
4658
4659 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4659 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4660 newbranch=opts.get('new_branch'),
4660 newbranch=opts.get('new_branch'),
4661 bookmarks=opts.get('bookmark', ()),
4661 bookmarks=opts.get('bookmark', ()),
4662 publish=opts.get('publish'),
4662 publish=opts.get('publish'),
4663 opargs=opargs)
4663 opargs=opargs)
4664
4664
4665 result = not pushop.cgresult
4665 result = not pushop.cgresult
4666
4666
4667 if pushop.bkresult is not None:
4667 if pushop.bkresult is not None:
4668 if pushop.bkresult == 2:
4668 if pushop.bkresult == 2:
4669 result = 2
4669 result = 2
4670 elif not result and pushop.bkresult:
4670 elif not result and pushop.bkresult:
4671 result = 2
4671 result = 2
4672
4672
4673 return result
4673 return result
4674
4674
4675 @command('recover',
4675 @command('recover',
4676 [('','verify', True, "run `hg verify` after succesful recover"),
4676 [('','verify', True, "run `hg verify` after succesful recover"),
4677 ],
4677 ],
4678 helpcategory=command.CATEGORY_MAINTENANCE)
4678 helpcategory=command.CATEGORY_MAINTENANCE)
4679 def recover(ui, repo, **opts):
4679 def recover(ui, repo, **opts):
4680 """roll back an interrupted transaction
4680 """roll back an interrupted transaction
4681
4681
4682 Recover from an interrupted commit or pull.
4682 Recover from an interrupted commit or pull.
4683
4683
4684 This command tries to fix the repository status after an
4684 This command tries to fix the repository status after an
4685 interrupted operation. It should only be necessary when Mercurial
4685 interrupted operation. It should only be necessary when Mercurial
4686 suggests it.
4686 suggests it.
4687
4687
4688 Returns 0 if successful, 1 if nothing to recover or verify fails.
4688 Returns 0 if successful, 1 if nothing to recover or verify fails.
4689 """
4689 """
4690 ret = repo.recover()
4690 ret = repo.recover()
4691 if ret:
4691 if ret:
4692 if opts[r'verify']:
4692 if opts[r'verify']:
4693 return hg.verify(repo)
4693 return hg.verify(repo)
4694 else:
4694 else:
4695 msg = _("(verify step skipped, run `hg verify` to check your "
4695 msg = _("(verify step skipped, run `hg verify` to check your "
4696 "repository content)\n")
4696 "repository content)\n")
4697 ui.warn(msg)
4697 ui.warn(msg)
4698 return 0
4698 return 0
4699 return 1
4699 return 1
4700
4700
4701 @command('remove|rm',
4701 @command('remove|rm',
4702 [('A', 'after', None, _('record delete for missing files')),
4702 [('A', 'after', None, _('record delete for missing files')),
4703 ('f', 'force', None,
4703 ('f', 'force', None,
4704 _('forget added files, delete modified files')),
4704 _('forget added files, delete modified files')),
4705 ] + subrepoopts + walkopts + dryrunopts,
4705 ] + subrepoopts + walkopts + dryrunopts,
4706 _('[OPTION]... FILE...'),
4706 _('[OPTION]... FILE...'),
4707 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4707 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4708 helpbasic=True, inferrepo=True)
4708 helpbasic=True, inferrepo=True)
4709 def remove(ui, repo, *pats, **opts):
4709 def remove(ui, repo, *pats, **opts):
4710 """remove the specified files on the next commit
4710 """remove the specified files on the next commit
4711
4711
4712 Schedule the indicated files for removal from the current branch.
4712 Schedule the indicated files for removal from the current branch.
4713
4713
4714 This command schedules the files to be removed at the next commit.
4714 This command schedules the files to be removed at the next commit.
4715 To undo a remove before that, see :hg:`revert`. To undo added
4715 To undo a remove before that, see :hg:`revert`. To undo added
4716 files, see :hg:`forget`.
4716 files, see :hg:`forget`.
4717
4717
4718 .. container:: verbose
4718 .. container:: verbose
4719
4719
4720 -A/--after can be used to remove only files that have already
4720 -A/--after can be used to remove only files that have already
4721 been deleted, -f/--force can be used to force deletion, and -Af
4721 been deleted, -f/--force can be used to force deletion, and -Af
4722 can be used to remove files from the next revision without
4722 can be used to remove files from the next revision without
4723 deleting them from the working directory.
4723 deleting them from the working directory.
4724
4724
4725 The following table details the behavior of remove for different
4725 The following table details the behavior of remove for different
4726 file states (columns) and option combinations (rows). The file
4726 file states (columns) and option combinations (rows). The file
4727 states are Added [A], Clean [C], Modified [M] and Missing [!]
4727 states are Added [A], Clean [C], Modified [M] and Missing [!]
4728 (as reported by :hg:`status`). The actions are Warn, Remove
4728 (as reported by :hg:`status`). The actions are Warn, Remove
4729 (from branch) and Delete (from disk):
4729 (from branch) and Delete (from disk):
4730
4730
4731 ========= == == == ==
4731 ========= == == == ==
4732 opt/state A C M !
4732 opt/state A C M !
4733 ========= == == == ==
4733 ========= == == == ==
4734 none W RD W R
4734 none W RD W R
4735 -f R RD RD R
4735 -f R RD RD R
4736 -A W W W R
4736 -A W W W R
4737 -Af R R R R
4737 -Af R R R R
4738 ========= == == == ==
4738 ========= == == == ==
4739
4739
4740 .. note::
4740 .. note::
4741
4741
4742 :hg:`remove` never deletes files in Added [A] state from the
4742 :hg:`remove` never deletes files in Added [A] state from the
4743 working directory, not even if ``--force`` is specified.
4743 working directory, not even if ``--force`` is specified.
4744
4744
4745 Returns 0 on success, 1 if any warnings encountered.
4745 Returns 0 on success, 1 if any warnings encountered.
4746 """
4746 """
4747
4747
4748 opts = pycompat.byteskwargs(opts)
4748 opts = pycompat.byteskwargs(opts)
4749 after, force = opts.get('after'), opts.get('force')
4749 after, force = opts.get('after'), opts.get('force')
4750 dryrun = opts.get('dry_run')
4750 dryrun = opts.get('dry_run')
4751 if not pats and not after:
4751 if not pats and not after:
4752 raise error.Abort(_('no files specified'))
4752 raise error.Abort(_('no files specified'))
4753
4753
4754 m = scmutil.match(repo[None], pats, opts)
4754 m = scmutil.match(repo[None], pats, opts)
4755 subrepos = opts.get('subrepos')
4755 subrepos = opts.get('subrepos')
4756 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
4756 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
4757 return cmdutil.remove(ui, repo, m, "", uipathfn, after, force, subrepos,
4757 return cmdutil.remove(ui, repo, m, "", uipathfn, after, force, subrepos,
4758 dryrun=dryrun)
4758 dryrun=dryrun)
4759
4759
4760 @command('rename|move|mv',
4760 @command('rename|move|mv',
4761 [('A', 'after', None, _('record a rename that has already occurred')),
4761 [('A', 'after', None, _('record a rename that has already occurred')),
4762 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4762 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4763 ] + walkopts + dryrunopts,
4763 ] + walkopts + dryrunopts,
4764 _('[OPTION]... SOURCE... DEST'),
4764 _('[OPTION]... SOURCE... DEST'),
4765 helpcategory=command.CATEGORY_WORKING_DIRECTORY)
4765 helpcategory=command.CATEGORY_WORKING_DIRECTORY)
4766 def rename(ui, repo, *pats, **opts):
4766 def rename(ui, repo, *pats, **opts):
4767 """rename files; equivalent of copy + remove
4767 """rename files; equivalent of copy + remove
4768
4768
4769 Mark dest as copies of sources; mark sources for deletion. If dest
4769 Mark dest as copies of sources; mark sources for deletion. If dest
4770 is a directory, copies are put in that directory. If dest is a
4770 is a directory, copies are put in that directory. If dest is a
4771 file, there can only be one source.
4771 file, there can only be one source.
4772
4772
4773 By default, this command copies the contents of files as they
4773 By default, this command copies the contents of files as they
4774 exist in the working directory. If invoked with -A/--after, the
4774 exist in the working directory. If invoked with -A/--after, the
4775 operation is recorded, but no copying is performed.
4775 operation is recorded, but no copying is performed.
4776
4776
4777 This command takes effect at the next commit. To undo a rename
4777 This command takes effect at the next commit. To undo a rename
4778 before that, see :hg:`revert`.
4778 before that, see :hg:`revert`.
4779
4779
4780 Returns 0 on success, 1 if errors are encountered.
4780 Returns 0 on success, 1 if errors are encountered.
4781 """
4781 """
4782 opts = pycompat.byteskwargs(opts)
4782 opts = pycompat.byteskwargs(opts)
4783 with repo.wlock(False):
4783 with repo.wlock(False):
4784 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4784 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4785
4785
4786 @command('resolve',
4786 @command('resolve',
4787 [('a', 'all', None, _('select all unresolved files')),
4787 [('a', 'all', None, _('select all unresolved files')),
4788 ('l', 'list', None, _('list state of files needing merge')),
4788 ('l', 'list', None, _('list state of files needing merge')),
4789 ('m', 'mark', None, _('mark files as resolved')),
4789 ('m', 'mark', None, _('mark files as resolved')),
4790 ('u', 'unmark', None, _('mark files as unresolved')),
4790 ('u', 'unmark', None, _('mark files as unresolved')),
4791 ('n', 'no-status', None, _('hide status prefix')),
4791 ('n', 'no-status', None, _('hide status prefix')),
4792 ('', 're-merge', None, _('re-merge files'))]
4792 ('', 're-merge', None, _('re-merge files'))]
4793 + mergetoolopts + walkopts + formatteropts,
4793 + mergetoolopts + walkopts + formatteropts,
4794 _('[OPTION]... [FILE]...'),
4794 _('[OPTION]... [FILE]...'),
4795 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4795 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
4796 inferrepo=True)
4796 inferrepo=True)
4797 def resolve(ui, repo, *pats, **opts):
4797 def resolve(ui, repo, *pats, **opts):
4798 """redo merges or set/view the merge status of files
4798 """redo merges or set/view the merge status of files
4799
4799
4800 Merges with unresolved conflicts are often the result of
4800 Merges with unresolved conflicts are often the result of
4801 non-interactive merging using the ``internal:merge`` configuration
4801 non-interactive merging using the ``internal:merge`` configuration
4802 setting, or a command-line merge tool like ``diff3``. The resolve
4802 setting, or a command-line merge tool like ``diff3``. The resolve
4803 command is used to manage the files involved in a merge, after
4803 command is used to manage the files involved in a merge, after
4804 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4804 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4805 working directory must have two parents). See :hg:`help
4805 working directory must have two parents). See :hg:`help
4806 merge-tools` for information on configuring merge tools.
4806 merge-tools` for information on configuring merge tools.
4807
4807
4808 The resolve command can be used in the following ways:
4808 The resolve command can be used in the following ways:
4809
4809
4810 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
4810 - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge
4811 the specified files, discarding any previous merge attempts. Re-merging
4811 the specified files, discarding any previous merge attempts. Re-merging
4812 is not performed for files already marked as resolved. Use ``--all/-a``
4812 is not performed for files already marked as resolved. Use ``--all/-a``
4813 to select all unresolved files. ``--tool`` can be used to specify
4813 to select all unresolved files. ``--tool`` can be used to specify
4814 the merge tool used for the given files. It overrides the HGMERGE
4814 the merge tool used for the given files. It overrides the HGMERGE
4815 environment variable and your configuration files. Previous file
4815 environment variable and your configuration files. Previous file
4816 contents are saved with a ``.orig`` suffix.
4816 contents are saved with a ``.orig`` suffix.
4817
4817
4818 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4818 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4819 (e.g. after having manually fixed-up the files). The default is
4819 (e.g. after having manually fixed-up the files). The default is
4820 to mark all unresolved files.
4820 to mark all unresolved files.
4821
4821
4822 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4822 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4823 default is to mark all resolved files.
4823 default is to mark all resolved files.
4824
4824
4825 - :hg:`resolve -l`: list files which had or still have conflicts.
4825 - :hg:`resolve -l`: list files which had or still have conflicts.
4826 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4826 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4827 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4827 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4828 the list. See :hg:`help filesets` for details.
4828 the list. See :hg:`help filesets` for details.
4829
4829
4830 .. note::
4830 .. note::
4831
4831
4832 Mercurial will not let you commit files with unresolved merge
4832 Mercurial will not let you commit files with unresolved merge
4833 conflicts. You must use :hg:`resolve -m ...` before you can
4833 conflicts. You must use :hg:`resolve -m ...` before you can
4834 commit after a conflicting merge.
4834 commit after a conflicting merge.
4835
4835
4836 .. container:: verbose
4836 .. container:: verbose
4837
4837
4838 Template:
4838 Template:
4839
4839
4840 The following keywords are supported in addition to the common template
4840 The following keywords are supported in addition to the common template
4841 keywords and functions. See also :hg:`help templates`.
4841 keywords and functions. See also :hg:`help templates`.
4842
4842
4843 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
4843 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
4844 :path: String. Repository-absolute path of the file.
4844 :path: String. Repository-absolute path of the file.
4845
4845
4846 Returns 0 on success, 1 if any files fail a resolve attempt.
4846 Returns 0 on success, 1 if any files fail a resolve attempt.
4847 """
4847 """
4848
4848
4849 opts = pycompat.byteskwargs(opts)
4849 opts = pycompat.byteskwargs(opts)
4850 confirm = ui.configbool('commands', 'resolve.confirm')
4850 confirm = ui.configbool('commands', 'resolve.confirm')
4851 flaglist = 'all mark unmark list no_status re_merge'.split()
4851 flaglist = 'all mark unmark list no_status re_merge'.split()
4852 all, mark, unmark, show, nostatus, remerge = [
4852 all, mark, unmark, show, nostatus, remerge = [
4853 opts.get(o) for o in flaglist]
4853 opts.get(o) for o in flaglist]
4854
4854
4855 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
4855 actioncount = len(list(filter(None, [show, mark, unmark, remerge])))
4856 if actioncount > 1:
4856 if actioncount > 1:
4857 raise error.Abort(_("too many actions specified"))
4857 raise error.Abort(_("too many actions specified"))
4858 elif (actioncount == 0
4858 elif (actioncount == 0
4859 and ui.configbool('commands', 'resolve.explicit-re-merge')):
4859 and ui.configbool('commands', 'resolve.explicit-re-merge')):
4860 hint = _('use --mark, --unmark, --list or --re-merge')
4860 hint = _('use --mark, --unmark, --list or --re-merge')
4861 raise error.Abort(_('no action specified'), hint=hint)
4861 raise error.Abort(_('no action specified'), hint=hint)
4862 if pats and all:
4862 if pats and all:
4863 raise error.Abort(_("can't specify --all and patterns"))
4863 raise error.Abort(_("can't specify --all and patterns"))
4864 if not (all or pats or show or mark or unmark):
4864 if not (all or pats or show or mark or unmark):
4865 raise error.Abort(_('no files or directories specified'),
4865 raise error.Abort(_('no files or directories specified'),
4866 hint=('use --all to re-merge all unresolved files'))
4866 hint=('use --all to re-merge all unresolved files'))
4867
4867
4868 if confirm:
4868 if confirm:
4869 if all:
4869 if all:
4870 if ui.promptchoice(_(b're-merge all unresolved files (yn)?'
4870 if ui.promptchoice(_(b're-merge all unresolved files (yn)?'
4871 b'$$ &Yes $$ &No')):
4871 b'$$ &Yes $$ &No')):
4872 raise error.Abort(_('user quit'))
4872 raise error.Abort(_('user quit'))
4873 if mark and not pats:
4873 if mark and not pats:
4874 if ui.promptchoice(_(b'mark all unresolved files as resolved (yn)?'
4874 if ui.promptchoice(_(b'mark all unresolved files as resolved (yn)?'
4875 b'$$ &Yes $$ &No')):
4875 b'$$ &Yes $$ &No')):
4876 raise error.Abort(_('user quit'))
4876 raise error.Abort(_('user quit'))
4877 if unmark and not pats:
4877 if unmark and not pats:
4878 if ui.promptchoice(_(b'mark all resolved files as unresolved (yn)?'
4878 if ui.promptchoice(_(b'mark all resolved files as unresolved (yn)?'
4879 b'$$ &Yes $$ &No')):
4879 b'$$ &Yes $$ &No')):
4880 raise error.Abort(_('user quit'))
4880 raise error.Abort(_('user quit'))
4881
4881
4882 uipathfn = scmutil.getuipathfn(repo)
4882 uipathfn = scmutil.getuipathfn(repo)
4883
4883
4884 if show:
4884 if show:
4885 ui.pager('resolve')
4885 ui.pager('resolve')
4886 fm = ui.formatter('resolve', opts)
4886 fm = ui.formatter('resolve', opts)
4887 ms = mergemod.mergestate.read(repo)
4887 ms = mergemod.mergestate.read(repo)
4888 wctx = repo[None]
4888 wctx = repo[None]
4889 m = scmutil.match(wctx, pats, opts)
4889 m = scmutil.match(wctx, pats, opts)
4890
4890
4891 # Labels and keys based on merge state. Unresolved path conflicts show
4891 # Labels and keys based on merge state. Unresolved path conflicts show
4892 # as 'P'. Resolved path conflicts show as 'R', the same as normal
4892 # as 'P'. Resolved path conflicts show as 'R', the same as normal
4893 # resolved conflicts.
4893 # resolved conflicts.
4894 mergestateinfo = {
4894 mergestateinfo = {
4895 mergemod.MERGE_RECORD_UNRESOLVED: ('resolve.unresolved', 'U'),
4895 mergemod.MERGE_RECORD_UNRESOLVED: ('resolve.unresolved', 'U'),
4896 mergemod.MERGE_RECORD_RESOLVED: ('resolve.resolved', 'R'),
4896 mergemod.MERGE_RECORD_RESOLVED: ('resolve.resolved', 'R'),
4897 mergemod.MERGE_RECORD_UNRESOLVED_PATH: ('resolve.unresolved', 'P'),
4897 mergemod.MERGE_RECORD_UNRESOLVED_PATH: ('resolve.unresolved', 'P'),
4898 mergemod.MERGE_RECORD_RESOLVED_PATH: ('resolve.resolved', 'R'),
4898 mergemod.MERGE_RECORD_RESOLVED_PATH: ('resolve.resolved', 'R'),
4899 mergemod.MERGE_RECORD_DRIVER_RESOLVED: ('resolve.driverresolved',
4899 mergemod.MERGE_RECORD_DRIVER_RESOLVED: ('resolve.driverresolved',
4900 'D'),
4900 'D'),
4901 }
4901 }
4902
4902
4903 for f in ms:
4903 for f in ms:
4904 if not m(f):
4904 if not m(f):
4905 continue
4905 continue
4906
4906
4907 label, key = mergestateinfo[ms[f]]
4907 label, key = mergestateinfo[ms[f]]
4908 fm.startitem()
4908 fm.startitem()
4909 fm.context(ctx=wctx)
4909 fm.context(ctx=wctx)
4910 fm.condwrite(not nostatus, 'mergestatus', '%s ', key, label=label)
4910 fm.condwrite(not nostatus, 'mergestatus', '%s ', key, label=label)
4911 fm.data(path=f)
4911 fm.data(path=f)
4912 fm.plain('%s\n' % uipathfn(f), label=label)
4912 fm.plain('%s\n' % uipathfn(f), label=label)
4913 fm.end()
4913 fm.end()
4914 return 0
4914 return 0
4915
4915
4916 with repo.wlock():
4916 with repo.wlock():
4917 ms = mergemod.mergestate.read(repo)
4917 ms = mergemod.mergestate.read(repo)
4918
4918
4919 if not (ms.active() or repo.dirstate.p2() != nullid):
4919 if not (ms.active() or repo.dirstate.p2() != nullid):
4920 raise error.Abort(
4920 raise error.Abort(
4921 _('resolve command not applicable when not merging'))
4921 _('resolve command not applicable when not merging'))
4922
4922
4923 wctx = repo[None]
4923 wctx = repo[None]
4924
4924
4925 if (ms.mergedriver
4925 if (ms.mergedriver
4926 and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED):
4926 and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED):
4927 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4927 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4928 ms.commit()
4928 ms.commit()
4929 # allow mark and unmark to go through
4929 # allow mark and unmark to go through
4930 if not mark and not unmark and not proceed:
4930 if not mark and not unmark and not proceed:
4931 return 1
4931 return 1
4932
4932
4933 m = scmutil.match(wctx, pats, opts)
4933 m = scmutil.match(wctx, pats, opts)
4934 ret = 0
4934 ret = 0
4935 didwork = False
4935 didwork = False
4936 runconclude = False
4936 runconclude = False
4937
4937
4938 tocomplete = []
4938 tocomplete = []
4939 hasconflictmarkers = []
4939 hasconflictmarkers = []
4940 if mark:
4940 if mark:
4941 markcheck = ui.config('commands', 'resolve.mark-check')
4941 markcheck = ui.config('commands', 'resolve.mark-check')
4942 if markcheck not in ['warn', 'abort']:
4942 if markcheck not in ['warn', 'abort']:
4943 # Treat all invalid / unrecognized values as 'none'.
4943 # Treat all invalid / unrecognized values as 'none'.
4944 markcheck = False
4944 markcheck = False
4945 for f in ms:
4945 for f in ms:
4946 if not m(f):
4946 if not m(f):
4947 continue
4947 continue
4948
4948
4949 didwork = True
4949 didwork = True
4950
4950
4951 # don't let driver-resolved files be marked, and run the conclude
4951 # don't let driver-resolved files be marked, and run the conclude
4952 # step if asked to resolve
4952 # step if asked to resolve
4953 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
4953 if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
4954 exact = m.exact(f)
4954 exact = m.exact(f)
4955 if mark:
4955 if mark:
4956 if exact:
4956 if exact:
4957 ui.warn(_('not marking %s as it is driver-resolved\n')
4957 ui.warn(_('not marking %s as it is driver-resolved\n')
4958 % uipathfn(f))
4958 % uipathfn(f))
4959 elif unmark:
4959 elif unmark:
4960 if exact:
4960 if exact:
4961 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4961 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4962 % uipathfn(f))
4962 % uipathfn(f))
4963 else:
4963 else:
4964 runconclude = True
4964 runconclude = True
4965 continue
4965 continue
4966
4966
4967 # path conflicts must be resolved manually
4967 # path conflicts must be resolved manually
4968 if ms[f] in (mergemod.MERGE_RECORD_UNRESOLVED_PATH,
4968 if ms[f] in (mergemod.MERGE_RECORD_UNRESOLVED_PATH,
4969 mergemod.MERGE_RECORD_RESOLVED_PATH):
4969 mergemod.MERGE_RECORD_RESOLVED_PATH):
4970 if mark:
4970 if mark:
4971 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
4971 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH)
4972 elif unmark:
4972 elif unmark:
4973 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
4973 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH)
4974 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
4974 elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH:
4975 ui.warn(_('%s: path conflict must be resolved manually\n')
4975 ui.warn(_('%s: path conflict must be resolved manually\n')
4976 % uipathfn(f))
4976 % uipathfn(f))
4977 continue
4977 continue
4978
4978
4979 if mark:
4979 if mark:
4980 if markcheck:
4980 if markcheck:
4981 fdata = repo.wvfs.tryread(f)
4981 fdata = repo.wvfs.tryread(f)
4982 if (filemerge.hasconflictmarkers(fdata) and
4982 if (filemerge.hasconflictmarkers(fdata) and
4983 ms[f] != mergemod.MERGE_RECORD_RESOLVED):
4983 ms[f] != mergemod.MERGE_RECORD_RESOLVED):
4984 hasconflictmarkers.append(f)
4984 hasconflictmarkers.append(f)
4985 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
4985 ms.mark(f, mergemod.MERGE_RECORD_RESOLVED)
4986 elif unmark:
4986 elif unmark:
4987 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
4987 ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED)
4988 else:
4988 else:
4989 # backup pre-resolve (merge uses .orig for its own purposes)
4989 # backup pre-resolve (merge uses .orig for its own purposes)
4990 a = repo.wjoin(f)
4990 a = repo.wjoin(f)
4991 try:
4991 try:
4992 util.copyfile(a, a + ".resolve")
4992 util.copyfile(a, a + ".resolve")
4993 except (IOError, OSError) as inst:
4993 except (IOError, OSError) as inst:
4994 if inst.errno != errno.ENOENT:
4994 if inst.errno != errno.ENOENT:
4995 raise
4995 raise
4996
4996
4997 try:
4997 try:
4998 # preresolve file
4998 # preresolve file
4999 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
4999 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
5000 with ui.configoverride(overrides, 'resolve'):
5000 with ui.configoverride(overrides, 'resolve'):
5001 complete, r = ms.preresolve(f, wctx)
5001 complete, r = ms.preresolve(f, wctx)
5002 if not complete:
5002 if not complete:
5003 tocomplete.append(f)
5003 tocomplete.append(f)
5004 elif r:
5004 elif r:
5005 ret = 1
5005 ret = 1
5006 finally:
5006 finally:
5007 ms.commit()
5007 ms.commit()
5008
5008
5009 # replace filemerge's .orig file with our resolve file, but only
5009 # replace filemerge's .orig file with our resolve file, but only
5010 # for merges that are complete
5010 # for merges that are complete
5011 if complete:
5011 if complete:
5012 try:
5012 try:
5013 util.rename(a + ".resolve",
5013 util.rename(a + ".resolve",
5014 scmutil.backuppath(ui, repo, f))
5014 scmutil.backuppath(ui, repo, f))
5015 except OSError as inst:
5015 except OSError as inst:
5016 if inst.errno != errno.ENOENT:
5016 if inst.errno != errno.ENOENT:
5017 raise
5017 raise
5018
5018
5019 if hasconflictmarkers:
5019 if hasconflictmarkers:
5020 ui.warn(_('warning: the following files still have conflict '
5020 ui.warn(_('warning: the following files still have conflict '
5021 'markers:\n') + ''.join(' ' + uipathfn(f) + '\n'
5021 'markers:\n') + ''.join(' ' + uipathfn(f) + '\n'
5022 for f in hasconflictmarkers))
5022 for f in hasconflictmarkers))
5023 if markcheck == 'abort' and not all and not pats:
5023 if markcheck == 'abort' and not all and not pats:
5024 raise error.Abort(_('conflict markers detected'),
5024 raise error.Abort(_('conflict markers detected'),
5025 hint=_('use --all to mark anyway'))
5025 hint=_('use --all to mark anyway'))
5026
5026
5027 for f in tocomplete:
5027 for f in tocomplete:
5028 try:
5028 try:
5029 # resolve file
5029 # resolve file
5030 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
5030 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
5031 with ui.configoverride(overrides, 'resolve'):
5031 with ui.configoverride(overrides, 'resolve'):
5032 r = ms.resolve(f, wctx)
5032 r = ms.resolve(f, wctx)
5033 if r:
5033 if r:
5034 ret = 1
5034 ret = 1
5035 finally:
5035 finally:
5036 ms.commit()
5036 ms.commit()
5037
5037
5038 # replace filemerge's .orig file with our resolve file
5038 # replace filemerge's .orig file with our resolve file
5039 a = repo.wjoin(f)
5039 a = repo.wjoin(f)
5040 try:
5040 try:
5041 util.rename(a + ".resolve", scmutil.backuppath(ui, repo, f))
5041 util.rename(a + ".resolve", scmutil.backuppath(ui, repo, f))
5042 except OSError as inst:
5042 except OSError as inst:
5043 if inst.errno != errno.ENOENT:
5043 if inst.errno != errno.ENOENT:
5044 raise
5044 raise
5045
5045
5046 ms.commit()
5046 ms.commit()
5047 ms.recordactions()
5047 ms.recordactions()
5048
5048
5049 if not didwork and pats:
5049 if not didwork and pats:
5050 hint = None
5050 hint = None
5051 if not any([p for p in pats if p.find(':') >= 0]):
5051 if not any([p for p in pats if p.find(':') >= 0]):
5052 pats = ['path:%s' % p for p in pats]
5052 pats = ['path:%s' % p for p in pats]
5053 m = scmutil.match(wctx, pats, opts)
5053 m = scmutil.match(wctx, pats, opts)
5054 for f in ms:
5054 for f in ms:
5055 if not m(f):
5055 if not m(f):
5056 continue
5056 continue
5057 def flag(o):
5057 def flag(o):
5058 if o == 're_merge':
5058 if o == 're_merge':
5059 return '--re-merge '
5059 return '--re-merge '
5060 return '-%s ' % o[0:1]
5060 return '-%s ' % o[0:1]
5061 flags = ''.join([flag(o) for o in flaglist if opts.get(o)])
5061 flags = ''.join([flag(o) for o in flaglist if opts.get(o)])
5062 hint = _("(try: hg resolve %s%s)\n") % (
5062 hint = _("(try: hg resolve %s%s)\n") % (
5063 flags,
5063 flags,
5064 ' '.join(pats))
5064 ' '.join(pats))
5065 break
5065 break
5066 ui.warn(_("arguments do not match paths that need resolving\n"))
5066 ui.warn(_("arguments do not match paths that need resolving\n"))
5067 if hint:
5067 if hint:
5068 ui.warn(hint)
5068 ui.warn(hint)
5069 elif ms.mergedriver and ms.mdstate() != 's':
5069 elif ms.mergedriver and ms.mdstate() != 's':
5070 # run conclude step when either a driver-resolved file is requested
5070 # run conclude step when either a driver-resolved file is requested
5071 # or there are no driver-resolved files
5071 # or there are no driver-resolved files
5072 # we can't use 'ret' to determine whether any files are unresolved
5072 # we can't use 'ret' to determine whether any files are unresolved
5073 # because we might not have tried to resolve some
5073 # because we might not have tried to resolve some
5074 if ((runconclude or not list(ms.driverresolved()))
5074 if ((runconclude or not list(ms.driverresolved()))
5075 and not list(ms.unresolved())):
5075 and not list(ms.unresolved())):
5076 proceed = mergemod.driverconclude(repo, ms, wctx)
5076 proceed = mergemod.driverconclude(repo, ms, wctx)
5077 ms.commit()
5077 ms.commit()
5078 if not proceed:
5078 if not proceed:
5079 return 1
5079 return 1
5080
5080
5081 # Nudge users into finishing an unfinished operation
5081 # Nudge users into finishing an unfinished operation
5082 unresolvedf = list(ms.unresolved())
5082 unresolvedf = list(ms.unresolved())
5083 driverresolvedf = list(ms.driverresolved())
5083 driverresolvedf = list(ms.driverresolved())
5084 if not unresolvedf and not driverresolvedf:
5084 if not unresolvedf and not driverresolvedf:
5085 ui.status(_('(no more unresolved files)\n'))
5085 ui.status(_('(no more unresolved files)\n'))
5086 cmdutil.checkafterresolved(repo)
5086 cmdutil.checkafterresolved(repo)
5087 elif not unresolvedf:
5087 elif not unresolvedf:
5088 ui.status(_('(no more unresolved files -- '
5088 ui.status(_('(no more unresolved files -- '
5089 'run "hg resolve --all" to conclude)\n'))
5089 'run "hg resolve --all" to conclude)\n'))
5090
5090
5091 return ret
5091 return ret
5092
5092
5093 @command('revert',
5093 @command('revert',
5094 [('a', 'all', None, _('revert all changes when no arguments given')),
5094 [('a', 'all', None, _('revert all changes when no arguments given')),
5095 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5095 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5096 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
5096 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
5097 ('C', 'no-backup', None, _('do not save backup copies of files')),
5097 ('C', 'no-backup', None, _('do not save backup copies of files')),
5098 ('i', 'interactive', None, _('interactively select the changes')),
5098 ('i', 'interactive', None, _('interactively select the changes')),
5099 ] + walkopts + dryrunopts,
5099 ] + walkopts + dryrunopts,
5100 _('[OPTION]... [-r REV] [NAME]...'),
5100 _('[OPTION]... [-r REV] [NAME]...'),
5101 helpcategory=command.CATEGORY_WORKING_DIRECTORY)
5101 helpcategory=command.CATEGORY_WORKING_DIRECTORY)
5102 def revert(ui, repo, *pats, **opts):
5102 def revert(ui, repo, *pats, **opts):
5103 """restore files to their checkout state
5103 """restore files to their checkout state
5104
5104
5105 .. note::
5105 .. note::
5106
5106
5107 To check out earlier revisions, you should use :hg:`update REV`.
5107 To check out earlier revisions, you should use :hg:`update REV`.
5108 To cancel an uncommitted merge (and lose your changes),
5108 To cancel an uncommitted merge (and lose your changes),
5109 use :hg:`merge --abort`.
5109 use :hg:`merge --abort`.
5110
5110
5111 With no revision specified, revert the specified files or directories
5111 With no revision specified, revert the specified files or directories
5112 to the contents they had in the parent of the working directory.
5112 to the contents they had in the parent of the working directory.
5113 This restores the contents of files to an unmodified
5113 This restores the contents of files to an unmodified
5114 state and unschedules adds, removes, copies, and renames. If the
5114 state and unschedules adds, removes, copies, and renames. If the
5115 working directory has two parents, you must explicitly specify a
5115 working directory has two parents, you must explicitly specify a
5116 revision.
5116 revision.
5117
5117
5118 Using the -r/--rev or -d/--date options, revert the given files or
5118 Using the -r/--rev or -d/--date options, revert the given files or
5119 directories to their states as of a specific revision. Because
5119 directories to their states as of a specific revision. Because
5120 revert does not change the working directory parents, this will
5120 revert does not change the working directory parents, this will
5121 cause these files to appear modified. This can be helpful to "back
5121 cause these files to appear modified. This can be helpful to "back
5122 out" some or all of an earlier change. See :hg:`backout` for a
5122 out" some or all of an earlier change. See :hg:`backout` for a
5123 related method.
5123 related method.
5124
5124
5125 Modified files are saved with a .orig suffix before reverting.
5125 Modified files are saved with a .orig suffix before reverting.
5126 To disable these backups, use --no-backup. It is possible to store
5126 To disable these backups, use --no-backup. It is possible to store
5127 the backup files in a custom directory relative to the root of the
5127 the backup files in a custom directory relative to the root of the
5128 repository by setting the ``ui.origbackuppath`` configuration
5128 repository by setting the ``ui.origbackuppath`` configuration
5129 option.
5129 option.
5130
5130
5131 See :hg:`help dates` for a list of formats valid for -d/--date.
5131 See :hg:`help dates` for a list of formats valid for -d/--date.
5132
5132
5133 See :hg:`help backout` for a way to reverse the effect of an
5133 See :hg:`help backout` for a way to reverse the effect of an
5134 earlier changeset.
5134 earlier changeset.
5135
5135
5136 Returns 0 on success.
5136 Returns 0 on success.
5137 """
5137 """
5138
5138
5139 opts = pycompat.byteskwargs(opts)
5139 opts = pycompat.byteskwargs(opts)
5140 if opts.get("date"):
5140 if opts.get("date"):
5141 if opts.get("rev"):
5141 if opts.get("rev"):
5142 raise error.Abort(_("you can't specify a revision and a date"))
5142 raise error.Abort(_("you can't specify a revision and a date"))
5143 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
5143 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
5144
5144
5145 parent, p2 = repo.dirstate.parents()
5145 parent, p2 = repo.dirstate.parents()
5146 if not opts.get('rev') and p2 != nullid:
5146 if not opts.get('rev') and p2 != nullid:
5147 # revert after merge is a trap for new users (issue2915)
5147 # revert after merge is a trap for new users (issue2915)
5148 raise error.Abort(_('uncommitted merge with no revision specified'),
5148 raise error.Abort(_('uncommitted merge with no revision specified'),
5149 hint=_("use 'hg update' or see 'hg help revert'"))
5149 hint=_("use 'hg update' or see 'hg help revert'"))
5150
5150
5151 rev = opts.get('rev')
5151 rev = opts.get('rev')
5152 if rev:
5152 if rev:
5153 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
5153 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
5154 ctx = scmutil.revsingle(repo, rev)
5154 ctx = scmutil.revsingle(repo, rev)
5155
5155
5156 if (not (pats or opts.get('include') or opts.get('exclude') or
5156 if (not (pats or opts.get('include') or opts.get('exclude') or
5157 opts.get('all') or opts.get('interactive'))):
5157 opts.get('all') or opts.get('interactive'))):
5158 msg = _("no files or directories specified")
5158 msg = _("no files or directories specified")
5159 if p2 != nullid:
5159 if p2 != nullid:
5160 hint = _("uncommitted merge, use --all to discard all changes,"
5160 hint = _("uncommitted merge, use --all to discard all changes,"
5161 " or 'hg update -C .' to abort the merge")
5161 " or 'hg update -C .' to abort the merge")
5162 raise error.Abort(msg, hint=hint)
5162 raise error.Abort(msg, hint=hint)
5163 dirty = any(repo.status())
5163 dirty = any(repo.status())
5164 node = ctx.node()
5164 node = ctx.node()
5165 if node != parent:
5165 if node != parent:
5166 if dirty:
5166 if dirty:
5167 hint = _("uncommitted changes, use --all to discard all"
5167 hint = _("uncommitted changes, use --all to discard all"
5168 " changes, or 'hg update %d' to update") % ctx.rev()
5168 " changes, or 'hg update %d' to update") % ctx.rev()
5169 else:
5169 else:
5170 hint = _("use --all to revert all files,"
5170 hint = _("use --all to revert all files,"
5171 " or 'hg update %d' to update") % ctx.rev()
5171 " or 'hg update %d' to update") % ctx.rev()
5172 elif dirty:
5172 elif dirty:
5173 hint = _("uncommitted changes, use --all to discard all changes")
5173 hint = _("uncommitted changes, use --all to discard all changes")
5174 else:
5174 else:
5175 hint = _("use --all to revert all files")
5175 hint = _("use --all to revert all files")
5176 raise error.Abort(msg, hint=hint)
5176 raise error.Abort(msg, hint=hint)
5177
5177
5178 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats,
5178 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats,
5179 **pycompat.strkwargs(opts))
5179 **pycompat.strkwargs(opts))
5180
5180
5181 @command(
5181 @command(
5182 'rollback',
5182 'rollback',
5183 dryrunopts + [('f', 'force', False, _('ignore safety measures'))],
5183 dryrunopts + [('f', 'force', False, _('ignore safety measures'))],
5184 helpcategory=command.CATEGORY_MAINTENANCE)
5184 helpcategory=command.CATEGORY_MAINTENANCE)
5185 def rollback(ui, repo, **opts):
5185 def rollback(ui, repo, **opts):
5186 """roll back the last transaction (DANGEROUS) (DEPRECATED)
5186 """roll back the last transaction (DANGEROUS) (DEPRECATED)
5187
5187
5188 Please use :hg:`commit --amend` instead of rollback to correct
5188 Please use :hg:`commit --amend` instead of rollback to correct
5189 mistakes in the last commit.
5189 mistakes in the last commit.
5190
5190
5191 This command should be used with care. There is only one level of
5191 This command should be used with care. There is only one level of
5192 rollback, and there is no way to undo a rollback. It will also
5192 rollback, and there is no way to undo a rollback. It will also
5193 restore the dirstate at the time of the last transaction, losing
5193 restore the dirstate at the time of the last transaction, losing
5194 any dirstate changes since that time. This command does not alter
5194 any dirstate changes since that time. This command does not alter
5195 the working directory.
5195 the working directory.
5196
5196
5197 Transactions are used to encapsulate the effects of all commands
5197 Transactions are used to encapsulate the effects of all commands
5198 that create new changesets or propagate existing changesets into a
5198 that create new changesets or propagate existing changesets into a
5199 repository.
5199 repository.
5200
5200
5201 .. container:: verbose
5201 .. container:: verbose
5202
5202
5203 For example, the following commands are transactional, and their
5203 For example, the following commands are transactional, and their
5204 effects can be rolled back:
5204 effects can be rolled back:
5205
5205
5206 - commit
5206 - commit
5207 - import
5207 - import
5208 - pull
5208 - pull
5209 - push (with this repository as the destination)
5209 - push (with this repository as the destination)
5210 - unbundle
5210 - unbundle
5211
5211
5212 To avoid permanent data loss, rollback will refuse to rollback a
5212 To avoid permanent data loss, rollback will refuse to rollback a
5213 commit transaction if it isn't checked out. Use --force to
5213 commit transaction if it isn't checked out. Use --force to
5214 override this protection.
5214 override this protection.
5215
5215
5216 The rollback command can be entirely disabled by setting the
5216 The rollback command can be entirely disabled by setting the
5217 ``ui.rollback`` configuration setting to false. If you're here
5217 ``ui.rollback`` configuration setting to false. If you're here
5218 because you want to use rollback and it's disabled, you can
5218 because you want to use rollback and it's disabled, you can
5219 re-enable the command by setting ``ui.rollback`` to true.
5219 re-enable the command by setting ``ui.rollback`` to true.
5220
5220
5221 This command is not intended for use on public repositories. Once
5221 This command is not intended for use on public repositories. Once
5222 changes are visible for pull by other users, rolling a transaction
5222 changes are visible for pull by other users, rolling a transaction
5223 back locally is ineffective (someone else may already have pulled
5223 back locally is ineffective (someone else may already have pulled
5224 the changes). Furthermore, a race is possible with readers of the
5224 the changes). Furthermore, a race is possible with readers of the
5225 repository; for example an in-progress pull from the repository
5225 repository; for example an in-progress pull from the repository
5226 may fail if a rollback is performed.
5226 may fail if a rollback is performed.
5227
5227
5228 Returns 0 on success, 1 if no rollback data is available.
5228 Returns 0 on success, 1 if no rollback data is available.
5229 """
5229 """
5230 if not ui.configbool('ui', 'rollback'):
5230 if not ui.configbool('ui', 'rollback'):
5231 raise error.Abort(_('rollback is disabled because it is unsafe'),
5231 raise error.Abort(_('rollback is disabled because it is unsafe'),
5232 hint=('see `hg help -v rollback` for information'))
5232 hint=('see `hg help -v rollback` for information'))
5233 return repo.rollback(dryrun=opts.get(r'dry_run'),
5233 return repo.rollback(dryrun=opts.get(r'dry_run'),
5234 force=opts.get(r'force'))
5234 force=opts.get(r'force'))
5235
5235
5236 @command(
5236 @command(
5237 'root', [] + formatteropts, intents={INTENT_READONLY},
5237 'root', [] + formatteropts, intents={INTENT_READONLY},
5238 helpcategory=command.CATEGORY_WORKING_DIRECTORY)
5238 helpcategory=command.CATEGORY_WORKING_DIRECTORY)
5239 def root(ui, repo, **opts):
5239 def root(ui, repo, **opts):
5240 """print the root (top) of the current working directory
5240 """print the root (top) of the current working directory
5241
5241
5242 Print the root directory of the current repository.
5242 Print the root directory of the current repository.
5243
5243
5244 .. container:: verbose
5244 .. container:: verbose
5245
5245
5246 Template:
5246 Template:
5247
5247
5248 The following keywords are supported in addition to the common template
5248 The following keywords are supported in addition to the common template
5249 keywords and functions. See also :hg:`help templates`.
5249 keywords and functions. See also :hg:`help templates`.
5250
5250
5251 :hgpath: String. Path to the .hg directory.
5251 :hgpath: String. Path to the .hg directory.
5252 :storepath: String. Path to the directory holding versioned data.
5252 :storepath: String. Path to the directory holding versioned data.
5253
5253
5254 Returns 0 on success.
5254 Returns 0 on success.
5255 """
5255 """
5256 opts = pycompat.byteskwargs(opts)
5256 opts = pycompat.byteskwargs(opts)
5257 with ui.formatter('root', opts) as fm:
5257 with ui.formatter('root', opts) as fm:
5258 fm.startitem()
5258 fm.startitem()
5259 fm.write('reporoot', '%s\n', repo.root)
5259 fm.write('reporoot', '%s\n', repo.root)
5260 fm.data(hgpath=repo.path, storepath=repo.spath)
5260 fm.data(hgpath=repo.path, storepath=repo.spath)
5261
5261
5262 @command('serve',
5262 @command('serve',
5263 [('A', 'accesslog', '', _('name of access log file to write to'),
5263 [('A', 'accesslog', '', _('name of access log file to write to'),
5264 _('FILE')),
5264 _('FILE')),
5265 ('d', 'daemon', None, _('run server in background')),
5265 ('d', 'daemon', None, _('run server in background')),
5266 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
5266 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
5267 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
5267 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
5268 # use string type, then we can check if something was passed
5268 # use string type, then we can check if something was passed
5269 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
5269 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
5270 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
5270 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
5271 _('ADDR')),
5271 _('ADDR')),
5272 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
5272 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
5273 _('PREFIX')),
5273 _('PREFIX')),
5274 ('n', 'name', '',
5274 ('n', 'name', '',
5275 _('name to show in web pages (default: working directory)'), _('NAME')),
5275 _('name to show in web pages (default: working directory)'), _('NAME')),
5276 ('', 'web-conf', '',
5276 ('', 'web-conf', '',
5277 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
5277 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
5278 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
5278 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
5279 _('FILE')),
5279 _('FILE')),
5280 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
5280 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
5281 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
5281 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
5282 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
5282 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
5283 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
5283 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
5284 ('', 'style', '', _('template style to use'), _('STYLE')),
5284 ('', 'style', '', _('template style to use'), _('STYLE')),
5285 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
5285 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
5286 ('', 'certificate', '', _('SSL certificate file'), _('FILE')),
5286 ('', 'certificate', '', _('SSL certificate file'), _('FILE')),
5287 ('', 'print-url', None, _('start and print only the URL'))]
5287 ('', 'print-url', None, _('start and print only the URL'))]
5288 + subrepoopts,
5288 + subrepoopts,
5289 _('[OPTION]...'),
5289 _('[OPTION]...'),
5290 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5290 helpcategory=command.CATEGORY_REMOTE_REPO_MANAGEMENT,
5291 helpbasic=True, optionalrepo=True)
5291 helpbasic=True, optionalrepo=True)
5292 def serve(ui, repo, **opts):
5292 def serve(ui, repo, **opts):
5293 """start stand-alone webserver
5293 """start stand-alone webserver
5294
5294
5295 Start a local HTTP repository browser and pull server. You can use
5295 Start a local HTTP repository browser and pull server. You can use
5296 this for ad-hoc sharing and browsing of repositories. It is
5296 this for ad-hoc sharing and browsing of repositories. It is
5297 recommended to use a real web server to serve a repository for
5297 recommended to use a real web server to serve a repository for
5298 longer periods of time.
5298 longer periods of time.
5299
5299
5300 Please note that the server does not implement access control.
5300 Please note that the server does not implement access control.
5301 This means that, by default, anybody can read from the server and
5301 This means that, by default, anybody can read from the server and
5302 nobody can write to it by default. Set the ``web.allow-push``
5302 nobody can write to it by default. Set the ``web.allow-push``
5303 option to ``*`` to allow everybody to push to the server. You
5303 option to ``*`` to allow everybody to push to the server. You
5304 should use a real web server if you need to authenticate users.
5304 should use a real web server if you need to authenticate users.
5305
5305
5306 By default, the server logs accesses to stdout and errors to
5306 By default, the server logs accesses to stdout and errors to
5307 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5307 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5308 files.
5308 files.
5309
5309
5310 To have the server choose a free port number to listen on, specify
5310 To have the server choose a free port number to listen on, specify
5311 a port number of 0; in this case, the server will print the port
5311 a port number of 0; in this case, the server will print the port
5312 number it uses.
5312 number it uses.
5313
5313
5314 Returns 0 on success.
5314 Returns 0 on success.
5315 """
5315 """
5316
5316
5317 opts = pycompat.byteskwargs(opts)
5317 opts = pycompat.byteskwargs(opts)
5318 if opts["stdio"] and opts["cmdserver"]:
5318 if opts["stdio"] and opts["cmdserver"]:
5319 raise error.Abort(_("cannot use --stdio with --cmdserver"))
5319 raise error.Abort(_("cannot use --stdio with --cmdserver"))
5320 if opts["print_url"] and ui.verbose:
5320 if opts["print_url"] and ui.verbose:
5321 raise error.Abort(_("cannot use --print-url with --verbose"))
5321 raise error.Abort(_("cannot use --print-url with --verbose"))
5322
5322
5323 if opts["stdio"]:
5323 if opts["stdio"]:
5324 if repo is None:
5324 if repo is None:
5325 raise error.RepoError(_("there is no Mercurial repository here"
5325 raise error.RepoError(_("there is no Mercurial repository here"
5326 " (.hg not found)"))
5326 " (.hg not found)"))
5327 s = wireprotoserver.sshserver(ui, repo)
5327 s = wireprotoserver.sshserver(ui, repo)
5328 s.serve_forever()
5328 s.serve_forever()
5329
5329
5330 service = server.createservice(ui, repo, opts)
5330 service = server.createservice(ui, repo, opts)
5331 return server.runservice(opts, initfn=service.init, runfn=service.run)
5331 return server.runservice(opts, initfn=service.init, runfn=service.run)
5332
5332
5333 @command('shelve',
5333 @command('shelve',
5334 [('A', 'addremove', None,
5334 [('A', 'addremove', None,
5335 _('mark new/missing files as added/removed before shelving')),
5335 _('mark new/missing files as added/removed before shelving')),
5336 ('u', 'unknown', None,
5336 ('u', 'unknown', None,
5337 _('store unknown files in the shelve')),
5337 _('store unknown files in the shelve')),
5338 ('', 'cleanup', None,
5338 ('', 'cleanup', None,
5339 _('delete all shelved changes')),
5339 _('delete all shelved changes')),
5340 ('', 'date', '',
5340 ('', 'date', '',
5341 _('shelve with the specified commit date'), _('DATE')),
5341 _('shelve with the specified commit date'), _('DATE')),
5342 ('d', 'delete', None,
5342 ('d', 'delete', None,
5343 _('delete the named shelved change(s)')),
5343 _('delete the named shelved change(s)')),
5344 ('e', 'edit', False,
5344 ('e', 'edit', False,
5345 _('invoke editor on commit messages')),
5345 _('invoke editor on commit messages')),
5346 ('k', 'keep', False,
5346 ('k', 'keep', False,
5347 _('shelve, but keep changes in the working directory')),
5347 _('shelve, but keep changes in the working directory')),
5348 ('l', 'list', None,
5348 ('l', 'list', None,
5349 _('list current shelves')),
5349 _('list current shelves')),
5350 ('m', 'message', '',
5350 ('m', 'message', '',
5351 _('use text as shelve message'), _('TEXT')),
5351 _('use text as shelve message'), _('TEXT')),
5352 ('n', 'name', '',
5352 ('n', 'name', '',
5353 _('use the given name for the shelved commit'), _('NAME')),
5353 _('use the given name for the shelved commit'), _('NAME')),
5354 ('p', 'patch', None,
5354 ('p', 'patch', None,
5355 _('output patches for changes (provide the names of the shelved '
5355 _('output patches for changes (provide the names of the shelved '
5356 'changes as positional arguments)')),
5356 'changes as positional arguments)')),
5357 ('i', 'interactive', None,
5357 ('i', 'interactive', None,
5358 _('interactive mode, only works while creating a shelve')),
5358 _('interactive mode, only works while creating a shelve')),
5359 ('', 'stat', None,
5359 ('', 'stat', None,
5360 _('output diffstat-style summary of changes (provide the names of '
5360 _('output diffstat-style summary of changes (provide the names of '
5361 'the shelved changes as positional arguments)')
5361 'the shelved changes as positional arguments)')
5362 )] + cmdutil.walkopts,
5362 )] + cmdutil.walkopts,
5363 _('hg shelve [OPTION]... [FILE]...'),
5363 _('hg shelve [OPTION]... [FILE]...'),
5364 helpcategory=command.CATEGORY_WORKING_DIRECTORY)
5364 helpcategory=command.CATEGORY_WORKING_DIRECTORY)
5365 def shelve(ui, repo, *pats, **opts):
5365 def shelve(ui, repo, *pats, **opts):
5366 '''save and set aside changes from the working directory
5366 '''save and set aside changes from the working directory
5367
5367
5368 Shelving takes files that "hg status" reports as not clean, saves
5368 Shelving takes files that "hg status" reports as not clean, saves
5369 the modifications to a bundle (a shelved change), and reverts the
5369 the modifications to a bundle (a shelved change), and reverts the
5370 files so that their state in the working directory becomes clean.
5370 files so that their state in the working directory becomes clean.
5371
5371
5372 To restore these changes to the working directory, using "hg
5372 To restore these changes to the working directory, using "hg
5373 unshelve"; this will work even if you switch to a different
5373 unshelve"; this will work even if you switch to a different
5374 commit.
5374 commit.
5375
5375
5376 When no files are specified, "hg shelve" saves all not-clean
5376 When no files are specified, "hg shelve" saves all not-clean
5377 files. If specific files or directories are named, only changes to
5377 files. If specific files or directories are named, only changes to
5378 those files are shelved.
5378 those files are shelved.
5379
5379
5380 In bare shelve (when no files are specified, without interactive,
5380 In bare shelve (when no files are specified, without interactive,
5381 include and exclude option), shelving remembers information if the
5381 include and exclude option), shelving remembers information if the
5382 working directory was on newly created branch, in other words working
5382 working directory was on newly created branch, in other words working
5383 directory was on different branch than its first parent. In this
5383 directory was on different branch than its first parent. In this
5384 situation unshelving restores branch information to the working directory.
5384 situation unshelving restores branch information to the working directory.
5385
5385
5386 Each shelved change has a name that makes it easier to find later.
5386 Each shelved change has a name that makes it easier to find later.
5387 The name of a shelved change defaults to being based on the active
5387 The name of a shelved change defaults to being based on the active
5388 bookmark, or if there is no active bookmark, the current named
5388 bookmark, or if there is no active bookmark, the current named
5389 branch. To specify a different name, use ``--name``.
5389 branch. To specify a different name, use ``--name``.
5390
5390
5391 To see a list of existing shelved changes, use the ``--list``
5391 To see a list of existing shelved changes, use the ``--list``
5392 option. For each shelved change, this will print its name, age,
5392 option. For each shelved change, this will print its name, age,
5393 and description; use ``--patch`` or ``--stat`` for more details.
5393 and description; use ``--patch`` or ``--stat`` for more details.
5394
5394
5395 To delete specific shelved changes, use ``--delete``. To delete
5395 To delete specific shelved changes, use ``--delete``. To delete
5396 all shelved changes, use ``--cleanup``.
5396 all shelved changes, use ``--cleanup``.
5397 '''
5397 '''
5398 opts = pycompat.byteskwargs(opts)
5398 opts = pycompat.byteskwargs(opts)
5399 allowables = [
5399 allowables = [
5400 ('addremove', {'create'}), # 'create' is pseudo action
5400 ('addremove', {'create'}), # 'create' is pseudo action
5401 ('unknown', {'create'}),
5401 ('unknown', {'create'}),
5402 ('cleanup', {'cleanup'}),
5402 ('cleanup', {'cleanup'}),
5403 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
5403 # ('date', {'create'}), # ignored for passing '--date "0 0"' in tests
5404 ('delete', {'delete'}),
5404 ('delete', {'delete'}),
5405 ('edit', {'create'}),
5405 ('edit', {'create'}),
5406 ('keep', {'create'}),
5406 ('keep', {'create'}),
5407 ('list', {'list'}),
5407 ('list', {'list'}),
5408 ('message', {'create'}),
5408 ('message', {'create'}),
5409 ('name', {'create'}),
5409 ('name', {'create'}),
5410 ('patch', {'patch', 'list'}),
5410 ('patch', {'patch', 'list'}),
5411 ('stat', {'stat', 'list'}),
5411 ('stat', {'stat', 'list'}),
5412 ]
5412 ]
5413 def checkopt(opt):
5413 def checkopt(opt):
5414 if opts.get(opt):
5414 if opts.get(opt):
5415 for i, allowable in allowables:
5415 for i, allowable in allowables:
5416 if opts[i] and opt not in allowable:
5416 if opts[i] and opt not in allowable:
5417 raise error.Abort(_("options '--%s' and '--%s' may not be "
5417 raise error.Abort(_("options '--%s' and '--%s' may not be "
5418 "used together") % (opt, i))
5418 "used together") % (opt, i))
5419 return True
5419 return True
5420 if checkopt('cleanup'):
5420 if checkopt('cleanup'):
5421 if pats:
5421 if pats:
5422 raise error.Abort(_("cannot specify names when using '--cleanup'"))
5422 raise error.Abort(_("cannot specify names when using '--cleanup'"))
5423 return shelvemod.cleanupcmd(ui, repo)
5423 return shelvemod.cleanupcmd(ui, repo)
5424 elif checkopt('delete'):
5424 elif checkopt('delete'):
5425 return shelvemod.deletecmd(ui, repo, pats)
5425 return shelvemod.deletecmd(ui, repo, pats)
5426 elif checkopt('list'):
5426 elif checkopt('list'):
5427 return shelvemod.listcmd(ui, repo, pats, opts)
5427 return shelvemod.listcmd(ui, repo, pats, opts)
5428 elif checkopt('patch') or checkopt('stat'):
5428 elif checkopt('patch') or checkopt('stat'):
5429 return shelvemod.patchcmds(ui, repo, pats, opts)
5429 return shelvemod.patchcmds(ui, repo, pats, opts)
5430 else:
5430 else:
5431 return shelvemod.createcmd(ui, repo, pats, opts)
5431 return shelvemod.createcmd(ui, repo, pats, opts)
5432
5432
5433 _NOTTERSE = 'nothing'
5433 _NOTTERSE = 'nothing'
5434
5434
5435 @command('status|st',
5435 @command('status|st',
5436 [('A', 'all', None, _('show status of all files')),
5436 [('A', 'all', None, _('show status of all files')),
5437 ('m', 'modified', None, _('show only modified files')),
5437 ('m', 'modified', None, _('show only modified files')),
5438 ('a', 'added', None, _('show only added files')),
5438 ('a', 'added', None, _('show only added files')),
5439 ('r', 'removed', None, _('show only removed files')),
5439 ('r', 'removed', None, _('show only removed files')),
5440 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5440 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5441 ('c', 'clean', None, _('show only files without changes')),
5441 ('c', 'clean', None, _('show only files without changes')),
5442 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5442 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5443 ('i', 'ignored', None, _('show only ignored files')),
5443 ('i', 'ignored', None, _('show only ignored files')),
5444 ('n', 'no-status', None, _('hide status prefix')),
5444 ('n', 'no-status', None, _('hide status prefix')),
5445 ('t', 'terse', _NOTTERSE, _('show the terse output (EXPERIMENTAL)')),
5445 ('t', 'terse', _NOTTERSE, _('show the terse output (EXPERIMENTAL)')),
5446 ('C', 'copies', None, _('show source of copied files')),
5446 ('C', 'copies', None, _('show source of copied files')),
5447 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5447 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5448 ('', 'rev', [], _('show difference from revision'), _('REV')),
5448 ('', 'rev', [], _('show difference from revision'), _('REV')),
5449 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5449 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5450 ] + walkopts + subrepoopts + formatteropts,
5450 ] + walkopts + subrepoopts + formatteropts,
5451 _('[OPTION]... [FILE]...'),
5451 _('[OPTION]... [FILE]...'),
5452 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5452 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5453 helpbasic=True, inferrepo=True,
5453 helpbasic=True, inferrepo=True,
5454 intents={INTENT_READONLY})
5454 intents={INTENT_READONLY})
5455 def status(ui, repo, *pats, **opts):
5455 def status(ui, repo, *pats, **opts):
5456 """show changed files in the working directory
5456 """show changed files in the working directory
5457
5457
5458 Show status of files in the repository. If names are given, only
5458 Show status of files in the repository. If names are given, only
5459 files that match are shown. Files that are clean or ignored or
5459 files that match are shown. Files that are clean or ignored or
5460 the source of a copy/move operation, are not listed unless
5460 the source of a copy/move operation, are not listed unless
5461 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5461 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5462 Unless options described with "show only ..." are given, the
5462 Unless options described with "show only ..." are given, the
5463 options -mardu are used.
5463 options -mardu are used.
5464
5464
5465 Option -q/--quiet hides untracked (unknown and ignored) files
5465 Option -q/--quiet hides untracked (unknown and ignored) files
5466 unless explicitly requested with -u/--unknown or -i/--ignored.
5466 unless explicitly requested with -u/--unknown or -i/--ignored.
5467
5467
5468 .. note::
5468 .. note::
5469
5469
5470 :hg:`status` may appear to disagree with diff if permissions have
5470 :hg:`status` may appear to disagree with diff if permissions have
5471 changed or a merge has occurred. The standard diff format does
5471 changed or a merge has occurred. The standard diff format does
5472 not report permission changes and diff only reports changes
5472 not report permission changes and diff only reports changes
5473 relative to one merge parent.
5473 relative to one merge parent.
5474
5474
5475 If one revision is given, it is used as the base revision.
5475 If one revision is given, it is used as the base revision.
5476 If two revisions are given, the differences between them are
5476 If two revisions are given, the differences between them are
5477 shown. The --change option can also be used as a shortcut to list
5477 shown. The --change option can also be used as a shortcut to list
5478 the changed files of a revision from its first parent.
5478 the changed files of a revision from its first parent.
5479
5479
5480 The codes used to show the status of files are::
5480 The codes used to show the status of files are::
5481
5481
5482 M = modified
5482 M = modified
5483 A = added
5483 A = added
5484 R = removed
5484 R = removed
5485 C = clean
5485 C = clean
5486 ! = missing (deleted by non-hg command, but still tracked)
5486 ! = missing (deleted by non-hg command, but still tracked)
5487 ? = not tracked
5487 ? = not tracked
5488 I = ignored
5488 I = ignored
5489 = origin of the previous file (with --copies)
5489 = origin of the previous file (with --copies)
5490
5490
5491 .. container:: verbose
5491 .. container:: verbose
5492
5492
5493 The -t/--terse option abbreviates the output by showing only the directory
5493 The -t/--terse option abbreviates the output by showing only the directory
5494 name if all the files in it share the same status. The option takes an
5494 name if all the files in it share the same status. The option takes an
5495 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
5495 argument indicating the statuses to abbreviate: 'm' for 'modified', 'a'
5496 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
5496 for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i'
5497 for 'ignored' and 'c' for clean.
5497 for 'ignored' and 'c' for clean.
5498
5498
5499 It abbreviates only those statuses which are passed. Note that clean and
5499 It abbreviates only those statuses which are passed. Note that clean and
5500 ignored files are not displayed with '--terse ic' unless the -c/--clean
5500 ignored files are not displayed with '--terse ic' unless the -c/--clean
5501 and -i/--ignored options are also used.
5501 and -i/--ignored options are also used.
5502
5502
5503 The -v/--verbose option shows information when the repository is in an
5503 The -v/--verbose option shows information when the repository is in an
5504 unfinished merge, shelve, rebase state etc. You can have this behavior
5504 unfinished merge, shelve, rebase state etc. You can have this behavior
5505 turned on by default by enabling the ``commands.status.verbose`` option.
5505 turned on by default by enabling the ``commands.status.verbose`` option.
5506
5506
5507 You can skip displaying some of these states by setting
5507 You can skip displaying some of these states by setting
5508 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
5508 ``commands.status.skipstates`` to one or more of: 'bisect', 'graft',
5509 'histedit', 'merge', 'rebase', or 'unshelve'.
5509 'histedit', 'merge', 'rebase', or 'unshelve'.
5510
5510
5511 Template:
5511 Template:
5512
5512
5513 The following keywords are supported in addition to the common template
5513 The following keywords are supported in addition to the common template
5514 keywords and functions. See also :hg:`help templates`.
5514 keywords and functions. See also :hg:`help templates`.
5515
5515
5516 :path: String. Repository-absolute path of the file.
5516 :path: String. Repository-absolute path of the file.
5517 :source: String. Repository-absolute path of the file originated from.
5517 :source: String. Repository-absolute path of the file originated from.
5518 Available if ``--copies`` is specified.
5518 Available if ``--copies`` is specified.
5519 :status: String. Character denoting file's status.
5519 :status: String. Character denoting file's status.
5520
5520
5521 Examples:
5521 Examples:
5522
5522
5523 - show changes in the working directory relative to a
5523 - show changes in the working directory relative to a
5524 changeset::
5524 changeset::
5525
5525
5526 hg status --rev 9353
5526 hg status --rev 9353
5527
5527
5528 - show changes in the working directory relative to the
5528 - show changes in the working directory relative to the
5529 current directory (see :hg:`help patterns` for more information)::
5529 current directory (see :hg:`help patterns` for more information)::
5530
5530
5531 hg status re:
5531 hg status re:
5532
5532
5533 - show all changes including copies in an existing changeset::
5533 - show all changes including copies in an existing changeset::
5534
5534
5535 hg status --copies --change 9353
5535 hg status --copies --change 9353
5536
5536
5537 - get a NUL separated list of added files, suitable for xargs::
5537 - get a NUL separated list of added files, suitable for xargs::
5538
5538
5539 hg status -an0
5539 hg status -an0
5540
5540
5541 - show more information about the repository status, abbreviating
5541 - show more information about the repository status, abbreviating
5542 added, removed, modified, deleted, and untracked paths::
5542 added, removed, modified, deleted, and untracked paths::
5543
5543
5544 hg status -v -t mardu
5544 hg status -v -t mardu
5545
5545
5546 Returns 0 on success.
5546 Returns 0 on success.
5547
5547
5548 """
5548 """
5549
5549
5550 opts = pycompat.byteskwargs(opts)
5550 opts = pycompat.byteskwargs(opts)
5551 revs = opts.get('rev')
5551 revs = opts.get('rev')
5552 change = opts.get('change')
5552 change = opts.get('change')
5553 terse = opts.get('terse')
5553 terse = opts.get('terse')
5554 if terse is _NOTTERSE:
5554 if terse is _NOTTERSE:
5555 if revs:
5555 if revs:
5556 terse = ''
5556 terse = ''
5557 else:
5557 else:
5558 terse = ui.config('commands', 'status.terse')
5558 terse = ui.config('commands', 'status.terse')
5559
5559
5560 if revs and change:
5560 if revs and change:
5561 msg = _('cannot specify --rev and --change at the same time')
5561 msg = _('cannot specify --rev and --change at the same time')
5562 raise error.Abort(msg)
5562 raise error.Abort(msg)
5563 elif revs and terse:
5563 elif revs and terse:
5564 msg = _('cannot use --terse with --rev')
5564 msg = _('cannot use --terse with --rev')
5565 raise error.Abort(msg)
5565 raise error.Abort(msg)
5566 elif change:
5566 elif change:
5567 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
5567 repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn')
5568 ctx2 = scmutil.revsingle(repo, change, None)
5568 ctx2 = scmutil.revsingle(repo, change, None)
5569 ctx1 = ctx2.p1()
5569 ctx1 = ctx2.p1()
5570 else:
5570 else:
5571 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
5571 repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn')
5572 ctx1, ctx2 = scmutil.revpair(repo, revs)
5572 ctx1, ctx2 = scmutil.revpair(repo, revs)
5573
5573
5574 forcerelativevalue = None
5574 forcerelativevalue = None
5575 if ui.hasconfig('commands', 'status.relative'):
5575 if ui.hasconfig('commands', 'status.relative'):
5576 forcerelativevalue = ui.configbool('commands', 'status.relative')
5576 forcerelativevalue = ui.configbool('commands', 'status.relative')
5577 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats),
5577 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=bool(pats),
5578 forcerelativevalue=forcerelativevalue)
5578 forcerelativevalue=forcerelativevalue)
5579
5579
5580 if opts.get('print0'):
5580 if opts.get('print0'):
5581 end = '\0'
5581 end = '\0'
5582 else:
5582 else:
5583 end = '\n'
5583 end = '\n'
5584 copy = {}
5584 copy = {}
5585 states = 'modified added removed deleted unknown ignored clean'.split()
5585 states = 'modified added removed deleted unknown ignored clean'.split()
5586 show = [k for k in states if opts.get(k)]
5586 show = [k for k in states if opts.get(k)]
5587 if opts.get('all'):
5587 if opts.get('all'):
5588 show += ui.quiet and (states[:4] + ['clean']) or states
5588 show += ui.quiet and (states[:4] + ['clean']) or states
5589
5589
5590 if not show:
5590 if not show:
5591 if ui.quiet:
5591 if ui.quiet:
5592 show = states[:4]
5592 show = states[:4]
5593 else:
5593 else:
5594 show = states[:5]
5594 show = states[:5]
5595
5595
5596 m = scmutil.match(ctx2, pats, opts)
5596 m = scmutil.match(ctx2, pats, opts)
5597 if terse:
5597 if terse:
5598 # we need to compute clean and unknown to terse
5598 # we need to compute clean and unknown to terse
5599 stat = repo.status(ctx1.node(), ctx2.node(), m,
5599 stat = repo.status(ctx1.node(), ctx2.node(), m,
5600 'ignored' in show or 'i' in terse,
5600 'ignored' in show or 'i' in terse,
5601 clean=True, unknown=True,
5601 clean=True, unknown=True,
5602 listsubrepos=opts.get('subrepos'))
5602 listsubrepos=opts.get('subrepos'))
5603
5603
5604 stat = cmdutil.tersedir(stat, terse)
5604 stat = cmdutil.tersedir(stat, terse)
5605 else:
5605 else:
5606 stat = repo.status(ctx1.node(), ctx2.node(), m,
5606 stat = repo.status(ctx1.node(), ctx2.node(), m,
5607 'ignored' in show, 'clean' in show,
5607 'ignored' in show, 'clean' in show,
5608 'unknown' in show, opts.get('subrepos'))
5608 'unknown' in show, opts.get('subrepos'))
5609
5609
5610 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
5610 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
5611
5611
5612 if (opts.get('all') or opts.get('copies')
5612 if (opts.get('all') or opts.get('copies')
5613 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
5613 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
5614 copy = copies.pathcopies(ctx1, ctx2, m)
5614 copy = copies.pathcopies(ctx1, ctx2, m)
5615
5615
5616 ui.pager('status')
5616 ui.pager('status')
5617 fm = ui.formatter('status', opts)
5617 fm = ui.formatter('status', opts)
5618 fmt = '%s' + end
5618 fmt = '%s' + end
5619 showchar = not opts.get('no_status')
5619 showchar = not opts.get('no_status')
5620
5620
5621 for state, char, files in changestates:
5621 for state, char, files in changestates:
5622 if state in show:
5622 if state in show:
5623 label = 'status.' + state
5623 label = 'status.' + state
5624 for f in files:
5624 for f in files:
5625 fm.startitem()
5625 fm.startitem()
5626 fm.context(ctx=ctx2)
5626 fm.context(ctx=ctx2)
5627 fm.data(path=f)
5627 fm.data(path=f)
5628 fm.condwrite(showchar, 'status', '%s ', char, label=label)
5628 fm.condwrite(showchar, 'status', '%s ', char, label=label)
5629 fm.plain(fmt % uipathfn(f), label=label)
5629 fm.plain(fmt % uipathfn(f), label=label)
5630 if f in copy:
5630 if f in copy:
5631 fm.data(source=copy[f])
5631 fm.data(source=copy[f])
5632 fm.plain((' %s' + end) % uipathfn(copy[f]),
5632 fm.plain((' %s' + end) % uipathfn(copy[f]),
5633 label='status.copied')
5633 label='status.copied')
5634
5634
5635 if ((ui.verbose or ui.configbool('commands', 'status.verbose'))
5635 if ((ui.verbose or ui.configbool('commands', 'status.verbose'))
5636 and not ui.plain()):
5636 and not ui.plain()):
5637 cmdutil.morestatus(repo, fm)
5637 cmdutil.morestatus(repo, fm)
5638 fm.end()
5638 fm.end()
5639
5639
5640 @command('summary|sum',
5640 @command('summary|sum',
5641 [('', 'remote', None, _('check for push and pull'))],
5641 [('', 'remote', None, _('check for push and pull'))],
5642 '[--remote]',
5642 '[--remote]',
5643 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5643 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
5644 helpbasic=True,
5644 helpbasic=True,
5645 intents={INTENT_READONLY})
5645 intents={INTENT_READONLY})
5646 def summary(ui, repo, **opts):
5646 def summary(ui, repo, **opts):
5647 """summarize working directory state
5647 """summarize working directory state
5648
5648
5649 This generates a brief summary of the working directory state,
5649 This generates a brief summary of the working directory state,
5650 including parents, branch, commit status, phase and available updates.
5650 including parents, branch, commit status, phase and available updates.
5651
5651
5652 With the --remote option, this will check the default paths for
5652 With the --remote option, this will check the default paths for
5653 incoming and outgoing changes. This can be time-consuming.
5653 incoming and outgoing changes. This can be time-consuming.
5654
5654
5655 Returns 0 on success.
5655 Returns 0 on success.
5656 """
5656 """
5657
5657
5658 opts = pycompat.byteskwargs(opts)
5658 opts = pycompat.byteskwargs(opts)
5659 ui.pager('summary')
5659 ui.pager('summary')
5660 ctx = repo[None]
5660 ctx = repo[None]
5661 parents = ctx.parents()
5661 parents = ctx.parents()
5662 pnode = parents[0].node()
5662 pnode = parents[0].node()
5663 marks = []
5663 marks = []
5664
5664
5665 try:
5665 try:
5666 ms = mergemod.mergestate.read(repo)
5666 ms = mergemod.mergestate.read(repo)
5667 except error.UnsupportedMergeRecords as e:
5667 except error.UnsupportedMergeRecords as e:
5668 s = ' '.join(e.recordtypes)
5668 s = ' '.join(e.recordtypes)
5669 ui.warn(
5669 ui.warn(
5670 _('warning: merge state has unsupported record types: %s\n') % s)
5670 _('warning: merge state has unsupported record types: %s\n') % s)
5671 unresolved = []
5671 unresolved = []
5672 else:
5672 else:
5673 unresolved = list(ms.unresolved())
5673 unresolved = list(ms.unresolved())
5674
5674
5675 for p in parents:
5675 for p in parents:
5676 # label with log.changeset (instead of log.parent) since this
5676 # label with log.changeset (instead of log.parent) since this
5677 # shows a working directory parent *changeset*:
5677 # shows a working directory parent *changeset*:
5678 # i18n: column positioning for "hg summary"
5678 # i18n: column positioning for "hg summary"
5679 ui.write(_('parent: %d:%s ') % (p.rev(), p),
5679 ui.write(_('parent: %d:%s ') % (p.rev(), p),
5680 label=logcmdutil.changesetlabels(p))
5680 label=logcmdutil.changesetlabels(p))
5681 ui.write(' '.join(p.tags()), label='log.tag')
5681 ui.write(' '.join(p.tags()), label='log.tag')
5682 if p.bookmarks():
5682 if p.bookmarks():
5683 marks.extend(p.bookmarks())
5683 marks.extend(p.bookmarks())
5684 if p.rev() == -1:
5684 if p.rev() == -1:
5685 if not len(repo):
5685 if not len(repo):
5686 ui.write(_(' (empty repository)'))
5686 ui.write(_(' (empty repository)'))
5687 else:
5687 else:
5688 ui.write(_(' (no revision checked out)'))
5688 ui.write(_(' (no revision checked out)'))
5689 if p.obsolete():
5689 if p.obsolete():
5690 ui.write(_(' (obsolete)'))
5690 ui.write(_(' (obsolete)'))
5691 if p.isunstable():
5691 if p.isunstable():
5692 instabilities = (ui.label(instability, 'trouble.%s' % instability)
5692 instabilities = (ui.label(instability, 'trouble.%s' % instability)
5693 for instability in p.instabilities())
5693 for instability in p.instabilities())
5694 ui.write(' ('
5694 ui.write(' ('
5695 + ', '.join(instabilities)
5695 + ', '.join(instabilities)
5696 + ')')
5696 + ')')
5697 ui.write('\n')
5697 ui.write('\n')
5698 if p.description():
5698 if p.description():
5699 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5699 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5700 label='log.summary')
5700 label='log.summary')
5701
5701
5702 branch = ctx.branch()
5702 branch = ctx.branch()
5703 bheads = repo.branchheads(branch)
5703 bheads = repo.branchheads(branch)
5704 # i18n: column positioning for "hg summary"
5704 # i18n: column positioning for "hg summary"
5705 m = _('branch: %s\n') % branch
5705 m = _('branch: %s\n') % branch
5706 if branch != 'default':
5706 if branch != 'default':
5707 ui.write(m, label='log.branch')
5707 ui.write(m, label='log.branch')
5708 else:
5708 else:
5709 ui.status(m, label='log.branch')
5709 ui.status(m, label='log.branch')
5710
5710
5711 if marks:
5711 if marks:
5712 active = repo._activebookmark
5712 active = repo._activebookmark
5713 # i18n: column positioning for "hg summary"
5713 # i18n: column positioning for "hg summary"
5714 ui.write(_('bookmarks:'), label='log.bookmark')
5714 ui.write(_('bookmarks:'), label='log.bookmark')
5715 if active is not None:
5715 if active is not None:
5716 if active in marks:
5716 if active in marks:
5717 ui.write(' *' + active, label=bookmarks.activebookmarklabel)
5717 ui.write(' *' + active, label=bookmarks.activebookmarklabel)
5718 marks.remove(active)
5718 marks.remove(active)
5719 else:
5719 else:
5720 ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel)
5720 ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel)
5721 for m in marks:
5721 for m in marks:
5722 ui.write(' ' + m, label='log.bookmark')
5722 ui.write(' ' + m, label='log.bookmark')
5723 ui.write('\n', label='log.bookmark')
5723 ui.write('\n', label='log.bookmark')
5724
5724
5725 status = repo.status(unknown=True)
5725 status = repo.status(unknown=True)
5726
5726
5727 c = repo.dirstate.copies()
5727 c = repo.dirstate.copies()
5728 copied, renamed = [], []
5728 copied, renamed = [], []
5729 for d, s in c.iteritems():
5729 for d, s in c.iteritems():
5730 if s in status.removed:
5730 if s in status.removed:
5731 status.removed.remove(s)
5731 status.removed.remove(s)
5732 renamed.append(d)
5732 renamed.append(d)
5733 else:
5733 else:
5734 copied.append(d)
5734 copied.append(d)
5735 if d in status.added:
5735 if d in status.added:
5736 status.added.remove(d)
5736 status.added.remove(d)
5737
5737
5738 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5738 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5739
5739
5740 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
5740 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
5741 (ui.label(_('%d added'), 'status.added'), status.added),
5741 (ui.label(_('%d added'), 'status.added'), status.added),
5742 (ui.label(_('%d removed'), 'status.removed'), status.removed),
5742 (ui.label(_('%d removed'), 'status.removed'), status.removed),
5743 (ui.label(_('%d renamed'), 'status.copied'), renamed),
5743 (ui.label(_('%d renamed'), 'status.copied'), renamed),
5744 (ui.label(_('%d copied'), 'status.copied'), copied),
5744 (ui.label(_('%d copied'), 'status.copied'), copied),
5745 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
5745 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
5746 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
5746 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
5747 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
5747 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
5748 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
5748 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
5749 t = []
5749 t = []
5750 for l, s in labels:
5750 for l, s in labels:
5751 if s:
5751 if s:
5752 t.append(l % len(s))
5752 t.append(l % len(s))
5753
5753
5754 t = ', '.join(t)
5754 t = ', '.join(t)
5755 cleanworkdir = False
5755 cleanworkdir = False
5756
5756
5757 if repo.vfs.exists('graftstate'):
5757 if repo.vfs.exists('graftstate'):
5758 t += _(' (graft in progress)')
5758 t += _(' (graft in progress)')
5759 if repo.vfs.exists('updatestate'):
5759 if repo.vfs.exists('updatestate'):
5760 t += _(' (interrupted update)')
5760 t += _(' (interrupted update)')
5761 elif len(parents) > 1:
5761 elif len(parents) > 1:
5762 t += _(' (merge)')
5762 t += _(' (merge)')
5763 elif branch != parents[0].branch():
5763 elif branch != parents[0].branch():
5764 t += _(' (new branch)')
5764 t += _(' (new branch)')
5765 elif (parents[0].closesbranch() and
5765 elif (parents[0].closesbranch() and
5766 pnode in repo.branchheads(branch, closed=True)):
5766 pnode in repo.branchheads(branch, closed=True)):
5767 t += _(' (head closed)')
5767 t += _(' (head closed)')
5768 elif not (status.modified or status.added or status.removed or renamed or
5768 elif not (status.modified or status.added or status.removed or renamed or
5769 copied or subs):
5769 copied or subs):
5770 t += _(' (clean)')
5770 t += _(' (clean)')
5771 cleanworkdir = True
5771 cleanworkdir = True
5772 elif pnode not in bheads:
5772 elif pnode not in bheads:
5773 t += _(' (new branch head)')
5773 t += _(' (new branch head)')
5774
5774
5775 if parents:
5775 if parents:
5776 pendingphase = max(p.phase() for p in parents)
5776 pendingphase = max(p.phase() for p in parents)
5777 else:
5777 else:
5778 pendingphase = phases.public
5778 pendingphase = phases.public
5779
5779
5780 if pendingphase > phases.newcommitphase(ui):
5780 if pendingphase > phases.newcommitphase(ui):
5781 t += ' (%s)' % phases.phasenames[pendingphase]
5781 t += ' (%s)' % phases.phasenames[pendingphase]
5782
5782
5783 if cleanworkdir:
5783 if cleanworkdir:
5784 # i18n: column positioning for "hg summary"
5784 # i18n: column positioning for "hg summary"
5785 ui.status(_('commit: %s\n') % t.strip())
5785 ui.status(_('commit: %s\n') % t.strip())
5786 else:
5786 else:
5787 # i18n: column positioning for "hg summary"
5787 # i18n: column positioning for "hg summary"
5788 ui.write(_('commit: %s\n') % t.strip())
5788 ui.write(_('commit: %s\n') % t.strip())
5789
5789
5790 # all ancestors of branch heads - all ancestors of parent = new csets
5790 # all ancestors of branch heads - all ancestors of parent = new csets
5791 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
5791 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
5792 bheads))
5792 bheads))
5793
5793
5794 if new == 0:
5794 if new == 0:
5795 # i18n: column positioning for "hg summary"
5795 # i18n: column positioning for "hg summary"
5796 ui.status(_('update: (current)\n'))
5796 ui.status(_('update: (current)\n'))
5797 elif pnode not in bheads:
5797 elif pnode not in bheads:
5798 # i18n: column positioning for "hg summary"
5798 # i18n: column positioning for "hg summary"
5799 ui.write(_('update: %d new changesets (update)\n') % new)
5799 ui.write(_('update: %d new changesets (update)\n') % new)
5800 else:
5800 else:
5801 # i18n: column positioning for "hg summary"
5801 # i18n: column positioning for "hg summary"
5802 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5802 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5803 (new, len(bheads)))
5803 (new, len(bheads)))
5804
5804
5805 t = []
5805 t = []
5806 draft = len(repo.revs('draft()'))
5806 draft = len(repo.revs('draft()'))
5807 if draft:
5807 if draft:
5808 t.append(_('%d draft') % draft)
5808 t.append(_('%d draft') % draft)
5809 secret = len(repo.revs('secret()'))
5809 secret = len(repo.revs('secret()'))
5810 if secret:
5810 if secret:
5811 t.append(_('%d secret') % secret)
5811 t.append(_('%d secret') % secret)
5812
5812
5813 if draft or secret:
5813 if draft or secret:
5814 ui.status(_('phases: %s\n') % ', '.join(t))
5814 ui.status(_('phases: %s\n') % ', '.join(t))
5815
5815
5816 if obsolete.isenabled(repo, obsolete.createmarkersopt):
5816 if obsolete.isenabled(repo, obsolete.createmarkersopt):
5817 for trouble in ("orphan", "contentdivergent", "phasedivergent"):
5817 for trouble in ("orphan", "contentdivergent", "phasedivergent"):
5818 numtrouble = len(repo.revs(trouble + "()"))
5818 numtrouble = len(repo.revs(trouble + "()"))
5819 # We write all the possibilities to ease translation
5819 # We write all the possibilities to ease translation
5820 troublemsg = {
5820 troublemsg = {
5821 "orphan": _("orphan: %d changesets"),
5821 "orphan": _("orphan: %d changesets"),
5822 "contentdivergent": _("content-divergent: %d changesets"),
5822 "contentdivergent": _("content-divergent: %d changesets"),
5823 "phasedivergent": _("phase-divergent: %d changesets"),
5823 "phasedivergent": _("phase-divergent: %d changesets"),
5824 }
5824 }
5825 if numtrouble > 0:
5825 if numtrouble > 0:
5826 ui.status(troublemsg[trouble] % numtrouble + "\n")
5826 ui.status(troublemsg[trouble] % numtrouble + "\n")
5827
5827
5828 cmdutil.summaryhooks(ui, repo)
5828 cmdutil.summaryhooks(ui, repo)
5829
5829
5830 if opts.get('remote'):
5830 if opts.get('remote'):
5831 needsincoming, needsoutgoing = True, True
5831 needsincoming, needsoutgoing = True, True
5832 else:
5832 else:
5833 needsincoming, needsoutgoing = False, False
5833 needsincoming, needsoutgoing = False, False
5834 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
5834 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
5835 if i:
5835 if i:
5836 needsincoming = True
5836 needsincoming = True
5837 if o:
5837 if o:
5838 needsoutgoing = True
5838 needsoutgoing = True
5839 if not needsincoming and not needsoutgoing:
5839 if not needsincoming and not needsoutgoing:
5840 return
5840 return
5841
5841
5842 def getincoming():
5842 def getincoming():
5843 source, branches = hg.parseurl(ui.expandpath('default'))
5843 source, branches = hg.parseurl(ui.expandpath('default'))
5844 sbranch = branches[0]
5844 sbranch = branches[0]
5845 try:
5845 try:
5846 other = hg.peer(repo, {}, source)
5846 other = hg.peer(repo, {}, source)
5847 except error.RepoError:
5847 except error.RepoError:
5848 if opts.get('remote'):
5848 if opts.get('remote'):
5849 raise
5849 raise
5850 return source, sbranch, None, None, None
5850 return source, sbranch, None, None, None
5851 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5851 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5852 if revs:
5852 if revs:
5853 revs = [other.lookup(rev) for rev in revs]
5853 revs = [other.lookup(rev) for rev in revs]
5854 ui.debug('comparing with %s\n' % util.hidepassword(source))
5854 ui.debug('comparing with %s\n' % util.hidepassword(source))
5855 repo.ui.pushbuffer()
5855 repo.ui.pushbuffer()
5856 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5856 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5857 repo.ui.popbuffer()
5857 repo.ui.popbuffer()
5858 return source, sbranch, other, commoninc, commoninc[1]
5858 return source, sbranch, other, commoninc, commoninc[1]
5859
5859
5860 if needsincoming:
5860 if needsincoming:
5861 source, sbranch, sother, commoninc, incoming = getincoming()
5861 source, sbranch, sother, commoninc, incoming = getincoming()
5862 else:
5862 else:
5863 source = sbranch = sother = commoninc = incoming = None
5863 source = sbranch = sother = commoninc = incoming = None
5864
5864
5865 def getoutgoing():
5865 def getoutgoing():
5866 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5866 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5867 dbranch = branches[0]
5867 dbranch = branches[0]
5868 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5868 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5869 if source != dest:
5869 if source != dest:
5870 try:
5870 try:
5871 dother = hg.peer(repo, {}, dest)
5871 dother = hg.peer(repo, {}, dest)
5872 except error.RepoError:
5872 except error.RepoError:
5873 if opts.get('remote'):
5873 if opts.get('remote'):
5874 raise
5874 raise
5875 return dest, dbranch, None, None
5875 return dest, dbranch, None, None
5876 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5876 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5877 elif sother is None:
5877 elif sother is None:
5878 # there is no explicit destination peer, but source one is invalid
5878 # there is no explicit destination peer, but source one is invalid
5879 return dest, dbranch, None, None
5879 return dest, dbranch, None, None
5880 else:
5880 else:
5881 dother = sother
5881 dother = sother
5882 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5882 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5883 common = None
5883 common = None
5884 else:
5884 else:
5885 common = commoninc
5885 common = commoninc
5886 if revs:
5886 if revs:
5887 revs = [repo.lookup(rev) for rev in revs]
5887 revs = [repo.lookup(rev) for rev in revs]
5888 repo.ui.pushbuffer()
5888 repo.ui.pushbuffer()
5889 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5889 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5890 commoninc=common)
5890 commoninc=common)
5891 repo.ui.popbuffer()
5891 repo.ui.popbuffer()
5892 return dest, dbranch, dother, outgoing
5892 return dest, dbranch, dother, outgoing
5893
5893
5894 if needsoutgoing:
5894 if needsoutgoing:
5895 dest, dbranch, dother, outgoing = getoutgoing()
5895 dest, dbranch, dother, outgoing = getoutgoing()
5896 else:
5896 else:
5897 dest = dbranch = dother = outgoing = None
5897 dest = dbranch = dother = outgoing = None
5898
5898
5899 if opts.get('remote'):
5899 if opts.get('remote'):
5900 t = []
5900 t = []
5901 if incoming:
5901 if incoming:
5902 t.append(_('1 or more incoming'))
5902 t.append(_('1 or more incoming'))
5903 o = outgoing.missing
5903 o = outgoing.missing
5904 if o:
5904 if o:
5905 t.append(_('%d outgoing') % len(o))
5905 t.append(_('%d outgoing') % len(o))
5906 other = dother or sother
5906 other = dother or sother
5907 if 'bookmarks' in other.listkeys('namespaces'):
5907 if 'bookmarks' in other.listkeys('namespaces'):
5908 counts = bookmarks.summary(repo, other)
5908 counts = bookmarks.summary(repo, other)
5909 if counts[0] > 0:
5909 if counts[0] > 0:
5910 t.append(_('%d incoming bookmarks') % counts[0])
5910 t.append(_('%d incoming bookmarks') % counts[0])
5911 if counts[1] > 0:
5911 if counts[1] > 0:
5912 t.append(_('%d outgoing bookmarks') % counts[1])
5912 t.append(_('%d outgoing bookmarks') % counts[1])
5913
5913
5914 if t:
5914 if t:
5915 # i18n: column positioning for "hg summary"
5915 # i18n: column positioning for "hg summary"
5916 ui.write(_('remote: %s\n') % (', '.join(t)))
5916 ui.write(_('remote: %s\n') % (', '.join(t)))
5917 else:
5917 else:
5918 # i18n: column positioning for "hg summary"
5918 # i18n: column positioning for "hg summary"
5919 ui.status(_('remote: (synced)\n'))
5919 ui.status(_('remote: (synced)\n'))
5920
5920
5921 cmdutil.summaryremotehooks(ui, repo, opts,
5921 cmdutil.summaryremotehooks(ui, repo, opts,
5922 ((source, sbranch, sother, commoninc),
5922 ((source, sbranch, sother, commoninc),
5923 (dest, dbranch, dother, outgoing)))
5923 (dest, dbranch, dother, outgoing)))
5924
5924
5925 @command('tag',
5925 @command('tag',
5926 [('f', 'force', None, _('force tag')),
5926 [('f', 'force', None, _('force tag')),
5927 ('l', 'local', None, _('make the tag local')),
5927 ('l', 'local', None, _('make the tag local')),
5928 ('r', 'rev', '', _('revision to tag'), _('REV')),
5928 ('r', 'rev', '', _('revision to tag'), _('REV')),
5929 ('', 'remove', None, _('remove a tag')),
5929 ('', 'remove', None, _('remove a tag')),
5930 # -l/--local is already there, commitopts cannot be used
5930 # -l/--local is already there, commitopts cannot be used
5931 ('e', 'edit', None, _('invoke editor on commit messages')),
5931 ('e', 'edit', None, _('invoke editor on commit messages')),
5932 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5932 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5933 ] + commitopts2,
5933 ] + commitopts2,
5934 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
5934 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'),
5935 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
5935 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION)
5936 def tag(ui, repo, name1, *names, **opts):
5936 def tag(ui, repo, name1, *names, **opts):
5937 """add one or more tags for the current or given revision
5937 """add one or more tags for the current or given revision
5938
5938
5939 Name a particular revision using <name>.
5939 Name a particular revision using <name>.
5940
5940
5941 Tags are used to name particular revisions of the repository and are
5941 Tags are used to name particular revisions of the repository and are
5942 very useful to compare different revisions, to go back to significant
5942 very useful to compare different revisions, to go back to significant
5943 earlier versions or to mark branch points as releases, etc. Changing
5943 earlier versions or to mark branch points as releases, etc. Changing
5944 an existing tag is normally disallowed; use -f/--force to override.
5944 an existing tag is normally disallowed; use -f/--force to override.
5945
5945
5946 If no revision is given, the parent of the working directory is
5946 If no revision is given, the parent of the working directory is
5947 used.
5947 used.
5948
5948
5949 To facilitate version control, distribution, and merging of tags,
5949 To facilitate version control, distribution, and merging of tags,
5950 they are stored as a file named ".hgtags" which is managed similarly
5950 they are stored as a file named ".hgtags" which is managed similarly
5951 to other project files and can be hand-edited if necessary. This
5951 to other project files and can be hand-edited if necessary. This
5952 also means that tagging creates a new commit. The file
5952 also means that tagging creates a new commit. The file
5953 ".hg/localtags" is used for local tags (not shared among
5953 ".hg/localtags" is used for local tags (not shared among
5954 repositories).
5954 repositories).
5955
5955
5956 Tag commits are usually made at the head of a branch. If the parent
5956 Tag commits are usually made at the head of a branch. If the parent
5957 of the working directory is not a branch head, :hg:`tag` aborts; use
5957 of the working directory is not a branch head, :hg:`tag` aborts; use
5958 -f/--force to force the tag commit to be based on a non-head
5958 -f/--force to force the tag commit to be based on a non-head
5959 changeset.
5959 changeset.
5960
5960
5961 See :hg:`help dates` for a list of formats valid for -d/--date.
5961 See :hg:`help dates` for a list of formats valid for -d/--date.
5962
5962
5963 Since tag names have priority over branch names during revision
5963 Since tag names have priority over branch names during revision
5964 lookup, using an existing branch name as a tag name is discouraged.
5964 lookup, using an existing branch name as a tag name is discouraged.
5965
5965
5966 Returns 0 on success.
5966 Returns 0 on success.
5967 """
5967 """
5968 opts = pycompat.byteskwargs(opts)
5968 opts = pycompat.byteskwargs(opts)
5969 with repo.wlock(), repo.lock():
5969 with repo.wlock(), repo.lock():
5970 rev_ = "."
5970 rev_ = "."
5971 names = [t.strip() for t in (name1,) + names]
5971 names = [t.strip() for t in (name1,) + names]
5972 if len(names) != len(set(names)):
5972 if len(names) != len(set(names)):
5973 raise error.Abort(_('tag names must be unique'))
5973 raise error.Abort(_('tag names must be unique'))
5974 for n in names:
5974 for n in names:
5975 scmutil.checknewlabel(repo, n, 'tag')
5975 scmutil.checknewlabel(repo, n, 'tag')
5976 if not n:
5976 if not n:
5977 raise error.Abort(_('tag names cannot consist entirely of '
5977 raise error.Abort(_('tag names cannot consist entirely of '
5978 'whitespace'))
5978 'whitespace'))
5979 if opts.get('rev') and opts.get('remove'):
5979 if opts.get('rev') and opts.get('remove'):
5980 raise error.Abort(_("--rev and --remove are incompatible"))
5980 raise error.Abort(_("--rev and --remove are incompatible"))
5981 if opts.get('rev'):
5981 if opts.get('rev'):
5982 rev_ = opts['rev']
5982 rev_ = opts['rev']
5983 message = opts.get('message')
5983 message = opts.get('message')
5984 if opts.get('remove'):
5984 if opts.get('remove'):
5985 if opts.get('local'):
5985 if opts.get('local'):
5986 expectedtype = 'local'
5986 expectedtype = 'local'
5987 else:
5987 else:
5988 expectedtype = 'global'
5988 expectedtype = 'global'
5989
5989
5990 for n in names:
5990 for n in names:
5991 if repo.tagtype(n) == 'global':
5991 if repo.tagtype(n) == 'global':
5992 alltags = tagsmod.findglobaltags(ui, repo)
5992 alltags = tagsmod.findglobaltags(ui, repo)
5993 if alltags[n][0] == nullid:
5993 if alltags[n][0] == nullid:
5994 raise error.Abort(_("tag '%s' is already removed") % n)
5994 raise error.Abort(_("tag '%s' is already removed") % n)
5995 if not repo.tagtype(n):
5995 if not repo.tagtype(n):
5996 raise error.Abort(_("tag '%s' does not exist") % n)
5996 raise error.Abort(_("tag '%s' does not exist") % n)
5997 if repo.tagtype(n) != expectedtype:
5997 if repo.tagtype(n) != expectedtype:
5998 if expectedtype == 'global':
5998 if expectedtype == 'global':
5999 raise error.Abort(_("tag '%s' is not a global tag") % n)
5999 raise error.Abort(_("tag '%s' is not a global tag") % n)
6000 else:
6000 else:
6001 raise error.Abort(_("tag '%s' is not a local tag") % n)
6001 raise error.Abort(_("tag '%s' is not a local tag") % n)
6002 rev_ = 'null'
6002 rev_ = 'null'
6003 if not message:
6003 if not message:
6004 # we don't translate commit messages
6004 # we don't translate commit messages
6005 message = 'Removed tag %s' % ', '.join(names)
6005 message = 'Removed tag %s' % ', '.join(names)
6006 elif not opts.get('force'):
6006 elif not opts.get('force'):
6007 for n in names:
6007 for n in names:
6008 if n in repo.tags():
6008 if n in repo.tags():
6009 raise error.Abort(_("tag '%s' already exists "
6009 raise error.Abort(_("tag '%s' already exists "
6010 "(use -f to force)") % n)
6010 "(use -f to force)") % n)
6011 if not opts.get('local'):
6011 if not opts.get('local'):
6012 p1, p2 = repo.dirstate.parents()
6012 p1, p2 = repo.dirstate.parents()
6013 if p2 != nullid:
6013 if p2 != nullid:
6014 raise error.Abort(_('uncommitted merge'))
6014 raise error.Abort(_('uncommitted merge'))
6015 bheads = repo.branchheads()
6015 bheads = repo.branchheads()
6016 if not opts.get('force') and bheads and p1 not in bheads:
6016 if not opts.get('force') and bheads and p1 not in bheads:
6017 raise error.Abort(_('working directory is not at a branch head '
6017 raise error.Abort(_('working directory is not at a branch head '
6018 '(use -f to force)'))
6018 '(use -f to force)'))
6019 node = scmutil.revsingle(repo, rev_).node()
6019 node = scmutil.revsingle(repo, rev_).node()
6020
6020
6021 if not message:
6021 if not message:
6022 # we don't translate commit messages
6022 # we don't translate commit messages
6023 message = ('Added tag %s for changeset %s' %
6023 message = ('Added tag %s for changeset %s' %
6024 (', '.join(names), short(node)))
6024 (', '.join(names), short(node)))
6025
6025
6026 date = opts.get('date')
6026 date = opts.get('date')
6027 if date:
6027 if date:
6028 date = dateutil.parsedate(date)
6028 date = dateutil.parsedate(date)
6029
6029
6030 if opts.get('remove'):
6030 if opts.get('remove'):
6031 editform = 'tag.remove'
6031 editform = 'tag.remove'
6032 else:
6032 else:
6033 editform = 'tag.add'
6033 editform = 'tag.add'
6034 editor = cmdutil.getcommiteditor(editform=editform,
6034 editor = cmdutil.getcommiteditor(editform=editform,
6035 **pycompat.strkwargs(opts))
6035 **pycompat.strkwargs(opts))
6036
6036
6037 # don't allow tagging the null rev
6037 # don't allow tagging the null rev
6038 if (not opts.get('remove') and
6038 if (not opts.get('remove') and
6039 scmutil.revsingle(repo, rev_).rev() == nullrev):
6039 scmutil.revsingle(repo, rev_).rev() == nullrev):
6040 raise error.Abort(_("cannot tag null revision"))
6040 raise error.Abort(_("cannot tag null revision"))
6041
6041
6042 tagsmod.tag(repo, names, node, message, opts.get('local'),
6042 tagsmod.tag(repo, names, node, message, opts.get('local'),
6043 opts.get('user'), date, editor=editor)
6043 opts.get('user'), date, editor=editor)
6044
6044
6045 @command(
6045 @command(
6046 'tags', formatteropts, '',
6046 'tags', formatteropts, '',
6047 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
6047 helpcategory=command.CATEGORY_CHANGE_ORGANIZATION,
6048 intents={INTENT_READONLY})
6048 intents={INTENT_READONLY})
6049 def tags(ui, repo, **opts):
6049 def tags(ui, repo, **opts):
6050 """list repository tags
6050 """list repository tags
6051
6051
6052 This lists both regular and local tags. When the -v/--verbose
6052 This lists both regular and local tags. When the -v/--verbose
6053 switch is used, a third column "local" is printed for local tags.
6053 switch is used, a third column "local" is printed for local tags.
6054 When the -q/--quiet switch is used, only the tag name is printed.
6054 When the -q/--quiet switch is used, only the tag name is printed.
6055
6055
6056 .. container:: verbose
6056 .. container:: verbose
6057
6057
6058 Template:
6058 Template:
6059
6059
6060 The following keywords are supported in addition to the common template
6060 The following keywords are supported in addition to the common template
6061 keywords and functions such as ``{tag}``. See also
6061 keywords and functions such as ``{tag}``. See also
6062 :hg:`help templates`.
6062 :hg:`help templates`.
6063
6063
6064 :type: String. ``local`` for local tags.
6064 :type: String. ``local`` for local tags.
6065
6065
6066 Returns 0 on success.
6066 Returns 0 on success.
6067 """
6067 """
6068
6068
6069 opts = pycompat.byteskwargs(opts)
6069 opts = pycompat.byteskwargs(opts)
6070 ui.pager('tags')
6070 ui.pager('tags')
6071 fm = ui.formatter('tags', opts)
6071 fm = ui.formatter('tags', opts)
6072 hexfunc = fm.hexfunc
6072 hexfunc = fm.hexfunc
6073
6073
6074 for t, n in reversed(repo.tagslist()):
6074 for t, n in reversed(repo.tagslist()):
6075 hn = hexfunc(n)
6075 hn = hexfunc(n)
6076 label = 'tags.normal'
6076 label = 'tags.normal'
6077 tagtype = ''
6077 tagtype = ''
6078 if repo.tagtype(t) == 'local':
6078 if repo.tagtype(t) == 'local':
6079 label = 'tags.local'
6079 label = 'tags.local'
6080 tagtype = 'local'
6080 tagtype = 'local'
6081
6081
6082 fm.startitem()
6082 fm.startitem()
6083 fm.context(repo=repo)
6083 fm.context(repo=repo)
6084 fm.write('tag', '%s', t, label=label)
6084 fm.write('tag', '%s', t, label=label)
6085 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
6085 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
6086 fm.condwrite(not ui.quiet, 'rev node', fmt,
6086 fm.condwrite(not ui.quiet, 'rev node', fmt,
6087 repo.changelog.rev(n), hn, label=label)
6087 repo.changelog.rev(n), hn, label=label)
6088 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
6088 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
6089 tagtype, label=label)
6089 tagtype, label=label)
6090 fm.plain('\n')
6090 fm.plain('\n')
6091 fm.end()
6091 fm.end()
6092
6092
6093 @command('tip',
6093 @command('tip',
6094 [('p', 'patch', None, _('show patch')),
6094 [('p', 'patch', None, _('show patch')),
6095 ('g', 'git', None, _('use git extended diff format')),
6095 ('g', 'git', None, _('use git extended diff format')),
6096 ] + templateopts,
6096 ] + templateopts,
6097 _('[-p] [-g]'),
6097 _('[-p] [-g]'),
6098 helpcategory=command.CATEGORY_CHANGE_NAVIGATION)
6098 helpcategory=command.CATEGORY_CHANGE_NAVIGATION)
6099 def tip(ui, repo, **opts):
6099 def tip(ui, repo, **opts):
6100 """show the tip revision (DEPRECATED)
6100 """show the tip revision (DEPRECATED)
6101
6101
6102 The tip revision (usually just called the tip) is the changeset
6102 The tip revision (usually just called the tip) is the changeset
6103 most recently added to the repository (and therefore the most
6103 most recently added to the repository (and therefore the most
6104 recently changed head).
6104 recently changed head).
6105
6105
6106 If you have just made a commit, that commit will be the tip. If
6106 If you have just made a commit, that commit will be the tip. If
6107 you have just pulled changes from another repository, the tip of
6107 you have just pulled changes from another repository, the tip of
6108 that repository becomes the current tip. The "tip" tag is special
6108 that repository becomes the current tip. The "tip" tag is special
6109 and cannot be renamed or assigned to a different changeset.
6109 and cannot be renamed or assigned to a different changeset.
6110
6110
6111 This command is deprecated, please use :hg:`heads` instead.
6111 This command is deprecated, please use :hg:`heads` instead.
6112
6112
6113 Returns 0 on success.
6113 Returns 0 on success.
6114 """
6114 """
6115 opts = pycompat.byteskwargs(opts)
6115 opts = pycompat.byteskwargs(opts)
6116 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
6116 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
6117 displayer.show(repo['tip'])
6117 displayer.show(repo['tip'])
6118 displayer.close()
6118 displayer.close()
6119
6119
6120 @command('unbundle',
6120 @command('unbundle',
6121 [('u', 'update', None,
6121 [('u', 'update', None,
6122 _('update to new branch head if changesets were unbundled'))],
6122 _('update to new branch head if changesets were unbundled'))],
6123 _('[-u] FILE...'),
6123 _('[-u] FILE...'),
6124 helpcategory=command.CATEGORY_IMPORT_EXPORT)
6124 helpcategory=command.CATEGORY_IMPORT_EXPORT)
6125 def unbundle(ui, repo, fname1, *fnames, **opts):
6125 def unbundle(ui, repo, fname1, *fnames, **opts):
6126 """apply one or more bundle files
6126 """apply one or more bundle files
6127
6127
6128 Apply one or more bundle files generated by :hg:`bundle`.
6128 Apply one or more bundle files generated by :hg:`bundle`.
6129
6129
6130 Returns 0 on success, 1 if an update has unresolved files.
6130 Returns 0 on success, 1 if an update has unresolved files.
6131 """
6131 """
6132 fnames = (fname1,) + fnames
6132 fnames = (fname1,) + fnames
6133
6133
6134 with repo.lock():
6134 with repo.lock():
6135 for fname in fnames:
6135 for fname in fnames:
6136 f = hg.openpath(ui, fname)
6136 f = hg.openpath(ui, fname)
6137 gen = exchange.readbundle(ui, f, fname)
6137 gen = exchange.readbundle(ui, f, fname)
6138 if isinstance(gen, streamclone.streamcloneapplier):
6138 if isinstance(gen, streamclone.streamcloneapplier):
6139 raise error.Abort(
6139 raise error.Abort(
6140 _('packed bundles cannot be applied with '
6140 _('packed bundles cannot be applied with '
6141 '"hg unbundle"'),
6141 '"hg unbundle"'),
6142 hint=_('use "hg debugapplystreamclonebundle"'))
6142 hint=_('use "hg debugapplystreamclonebundle"'))
6143 url = 'bundle:' + fname
6143 url = 'bundle:' + fname
6144 try:
6144 try:
6145 txnname = 'unbundle'
6145 txnname = 'unbundle'
6146 if not isinstance(gen, bundle2.unbundle20):
6146 if not isinstance(gen, bundle2.unbundle20):
6147 txnname = 'unbundle\n%s' % util.hidepassword(url)
6147 txnname = 'unbundle\n%s' % util.hidepassword(url)
6148 with repo.transaction(txnname) as tr:
6148 with repo.transaction(txnname) as tr:
6149 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
6149 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
6150 url=url)
6150 url=url)
6151 except error.BundleUnknownFeatureError as exc:
6151 except error.BundleUnknownFeatureError as exc:
6152 raise error.Abort(
6152 raise error.Abort(
6153 _('%s: unknown bundle feature, %s') % (fname, exc),
6153 _('%s: unknown bundle feature, %s') % (fname, exc),
6154 hint=_("see https://mercurial-scm.org/"
6154 hint=_("see https://mercurial-scm.org/"
6155 "wiki/BundleFeature for more "
6155 "wiki/BundleFeature for more "
6156 "information"))
6156 "information"))
6157 modheads = bundle2.combinechangegroupresults(op)
6157 modheads = bundle2.combinechangegroupresults(op)
6158
6158
6159 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
6159 return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
6160
6160
6161 @command('unshelve',
6161 @command('unshelve',
6162 [('a', 'abort', None,
6162 [('a', 'abort', None,
6163 _('abort an incomplete unshelve operation')),
6163 _('abort an incomplete unshelve operation')),
6164 ('c', 'continue', None,
6164 ('c', 'continue', None,
6165 _('continue an incomplete unshelve operation')),
6165 _('continue an incomplete unshelve operation')),
6166 ('k', 'keep', None,
6166 ('k', 'keep', None,
6167 _('keep shelve after unshelving')),
6167 _('keep shelve after unshelving')),
6168 ('n', 'name', '',
6168 ('n', 'name', '',
6169 _('restore shelved change with given name'), _('NAME')),
6169 _('restore shelved change with given name'), _('NAME')),
6170 ('t', 'tool', '', _('specify merge tool')),
6170 ('t', 'tool', '', _('specify merge tool')),
6171 ('', 'date', '',
6171 ('', 'date', '',
6172 _('set date for temporary commits (DEPRECATED)'), _('DATE'))],
6172 _('set date for temporary commits (DEPRECATED)'), _('DATE'))],
6173 _('hg unshelve [[-n] SHELVED]'),
6173 _('hg unshelve [[-n] SHELVED]'),
6174 helpcategory=command.CATEGORY_WORKING_DIRECTORY)
6174 helpcategory=command.CATEGORY_WORKING_DIRECTORY)
6175 def unshelve(ui, repo, *shelved, **opts):
6175 def unshelve(ui, repo, *shelved, **opts):
6176 """restore a shelved change to the working directory
6176 """restore a shelved change to the working directory
6177
6177
6178 This command accepts an optional name of a shelved change to
6178 This command accepts an optional name of a shelved change to
6179 restore. If none is given, the most recent shelved change is used.
6179 restore. If none is given, the most recent shelved change is used.
6180
6180
6181 If a shelved change is applied successfully, the bundle that
6181 If a shelved change is applied successfully, the bundle that
6182 contains the shelved changes is moved to a backup location
6182 contains the shelved changes is moved to a backup location
6183 (.hg/shelve-backup).
6183 (.hg/shelve-backup).
6184
6184
6185 Since you can restore a shelved change on top of an arbitrary
6185 Since you can restore a shelved change on top of an arbitrary
6186 commit, it is possible that unshelving will result in a conflict
6186 commit, it is possible that unshelving will result in a conflict
6187 between your changes and the commits you are unshelving onto. If
6187 between your changes and the commits you are unshelving onto. If
6188 this occurs, you must resolve the conflict, then use
6188 this occurs, you must resolve the conflict, then use
6189 ``--continue`` to complete the unshelve operation. (The bundle
6189 ``--continue`` to complete the unshelve operation. (The bundle
6190 will not be moved until you successfully complete the unshelve.)
6190 will not be moved until you successfully complete the unshelve.)
6191
6191
6192 (Alternatively, you can use ``--abort`` to abandon an unshelve
6192 (Alternatively, you can use ``--abort`` to abandon an unshelve
6193 that causes a conflict. This reverts the unshelved changes, and
6193 that causes a conflict. This reverts the unshelved changes, and
6194 leaves the bundle in place.)
6194 leaves the bundle in place.)
6195
6195
6196 If bare shelved change (when no files are specified, without interactive,
6196 If bare shelved change (when no files are specified, without interactive,
6197 include and exclude option) was done on newly created branch it would
6197 include and exclude option) was done on newly created branch it would
6198 restore branch information to the working directory.
6198 restore branch information to the working directory.
6199
6199
6200 After a successful unshelve, the shelved changes are stored in a
6200 After a successful unshelve, the shelved changes are stored in a
6201 backup directory. Only the N most recent backups are kept. N
6201 backup directory. Only the N most recent backups are kept. N
6202 defaults to 10 but can be overridden using the ``shelve.maxbackups``
6202 defaults to 10 but can be overridden using the ``shelve.maxbackups``
6203 configuration option.
6203 configuration option.
6204
6204
6205 .. container:: verbose
6205 .. container:: verbose
6206
6206
6207 Timestamp in seconds is used to decide order of backups. More
6207 Timestamp in seconds is used to decide order of backups. More
6208 than ``maxbackups`` backups are kept, if same timestamp
6208 than ``maxbackups`` backups are kept, if same timestamp
6209 prevents from deciding exact order of them, for safety.
6209 prevents from deciding exact order of them, for safety.
6210 """
6210 """
6211 with repo.wlock():
6211 with repo.wlock():
6212 return shelvemod._dounshelve(ui, repo, *shelved, **opts)
6212 return shelvemod.dounshelve(ui, repo, *shelved, **opts)
6213
6213
6214 @command('update|up|checkout|co',
6214 @command('update|up|checkout|co',
6215 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
6215 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
6216 ('c', 'check', None, _('require clean working directory')),
6216 ('c', 'check', None, _('require clean working directory')),
6217 ('m', 'merge', None, _('merge uncommitted changes')),
6217 ('m', 'merge', None, _('merge uncommitted changes')),
6218 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6218 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6219 ('r', 'rev', '', _('revision'), _('REV'))
6219 ('r', 'rev', '', _('revision'), _('REV'))
6220 ] + mergetoolopts,
6220 ] + mergetoolopts,
6221 _('[-C|-c|-m] [-d DATE] [[-r] REV]'),
6221 _('[-C|-c|-m] [-d DATE] [[-r] REV]'),
6222 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6222 helpcategory=command.CATEGORY_WORKING_DIRECTORY,
6223 helpbasic=True)
6223 helpbasic=True)
6224 def update(ui, repo, node=None, **opts):
6224 def update(ui, repo, node=None, **opts):
6225 """update working directory (or switch revisions)
6225 """update working directory (or switch revisions)
6226
6226
6227 Update the repository's working directory to the specified
6227 Update the repository's working directory to the specified
6228 changeset. If no changeset is specified, update to the tip of the
6228 changeset. If no changeset is specified, update to the tip of the
6229 current named branch and move the active bookmark (see :hg:`help
6229 current named branch and move the active bookmark (see :hg:`help
6230 bookmarks`).
6230 bookmarks`).
6231
6231
6232 Update sets the working directory's parent revision to the specified
6232 Update sets the working directory's parent revision to the specified
6233 changeset (see :hg:`help parents`).
6233 changeset (see :hg:`help parents`).
6234
6234
6235 If the changeset is not a descendant or ancestor of the working
6235 If the changeset is not a descendant or ancestor of the working
6236 directory's parent and there are uncommitted changes, the update is
6236 directory's parent and there are uncommitted changes, the update is
6237 aborted. With the -c/--check option, the working directory is checked
6237 aborted. With the -c/--check option, the working directory is checked
6238 for uncommitted changes; if none are found, the working directory is
6238 for uncommitted changes; if none are found, the working directory is
6239 updated to the specified changeset.
6239 updated to the specified changeset.
6240
6240
6241 .. container:: verbose
6241 .. container:: verbose
6242
6242
6243 The -C/--clean, -c/--check, and -m/--merge options control what
6243 The -C/--clean, -c/--check, and -m/--merge options control what
6244 happens if the working directory contains uncommitted changes.
6244 happens if the working directory contains uncommitted changes.
6245 At most of one of them can be specified.
6245 At most of one of them can be specified.
6246
6246
6247 1. If no option is specified, and if
6247 1. If no option is specified, and if
6248 the requested changeset is an ancestor or descendant of
6248 the requested changeset is an ancestor or descendant of
6249 the working directory's parent, the uncommitted changes
6249 the working directory's parent, the uncommitted changes
6250 are merged into the requested changeset and the merged
6250 are merged into the requested changeset and the merged
6251 result is left uncommitted. If the requested changeset is
6251 result is left uncommitted. If the requested changeset is
6252 not an ancestor or descendant (that is, it is on another
6252 not an ancestor or descendant (that is, it is on another
6253 branch), the update is aborted and the uncommitted changes
6253 branch), the update is aborted and the uncommitted changes
6254 are preserved.
6254 are preserved.
6255
6255
6256 2. With the -m/--merge option, the update is allowed even if the
6256 2. With the -m/--merge option, the update is allowed even if the
6257 requested changeset is not an ancestor or descendant of
6257 requested changeset is not an ancestor or descendant of
6258 the working directory's parent.
6258 the working directory's parent.
6259
6259
6260 3. With the -c/--check option, the update is aborted and the
6260 3. With the -c/--check option, the update is aborted and the
6261 uncommitted changes are preserved.
6261 uncommitted changes are preserved.
6262
6262
6263 4. With the -C/--clean option, uncommitted changes are discarded and
6263 4. With the -C/--clean option, uncommitted changes are discarded and
6264 the working directory is updated to the requested changeset.
6264 the working directory is updated to the requested changeset.
6265
6265
6266 To cancel an uncommitted merge (and lose your changes), use
6266 To cancel an uncommitted merge (and lose your changes), use
6267 :hg:`merge --abort`.
6267 :hg:`merge --abort`.
6268
6268
6269 Use null as the changeset to remove the working directory (like
6269 Use null as the changeset to remove the working directory (like
6270 :hg:`clone -U`).
6270 :hg:`clone -U`).
6271
6271
6272 If you want to revert just one file to an older revision, use
6272 If you want to revert just one file to an older revision, use
6273 :hg:`revert [-r REV] NAME`.
6273 :hg:`revert [-r REV] NAME`.
6274
6274
6275 See :hg:`help dates` for a list of formats valid for -d/--date.
6275 See :hg:`help dates` for a list of formats valid for -d/--date.
6276
6276
6277 Returns 0 on success, 1 if there are unresolved files.
6277 Returns 0 on success, 1 if there are unresolved files.
6278 """
6278 """
6279 rev = opts.get(r'rev')
6279 rev = opts.get(r'rev')
6280 date = opts.get(r'date')
6280 date = opts.get(r'date')
6281 clean = opts.get(r'clean')
6281 clean = opts.get(r'clean')
6282 check = opts.get(r'check')
6282 check = opts.get(r'check')
6283 merge = opts.get(r'merge')
6283 merge = opts.get(r'merge')
6284 if rev and node:
6284 if rev and node:
6285 raise error.Abort(_("please specify just one revision"))
6285 raise error.Abort(_("please specify just one revision"))
6286
6286
6287 if ui.configbool('commands', 'update.requiredest'):
6287 if ui.configbool('commands', 'update.requiredest'):
6288 if not node and not rev and not date:
6288 if not node and not rev and not date:
6289 raise error.Abort(_('you must specify a destination'),
6289 raise error.Abort(_('you must specify a destination'),
6290 hint=_('for example: hg update ".::"'))
6290 hint=_('for example: hg update ".::"'))
6291
6291
6292 if rev is None or rev == '':
6292 if rev is None or rev == '':
6293 rev = node
6293 rev = node
6294
6294
6295 if date and rev is not None:
6295 if date and rev is not None:
6296 raise error.Abort(_("you can't specify a revision and a date"))
6296 raise error.Abort(_("you can't specify a revision and a date"))
6297
6297
6298 if len([x for x in (clean, check, merge) if x]) > 1:
6298 if len([x for x in (clean, check, merge) if x]) > 1:
6299 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
6299 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
6300 "or -m/--merge"))
6300 "or -m/--merge"))
6301
6301
6302 updatecheck = None
6302 updatecheck = None
6303 if check:
6303 if check:
6304 updatecheck = 'abort'
6304 updatecheck = 'abort'
6305 elif merge:
6305 elif merge:
6306 updatecheck = 'none'
6306 updatecheck = 'none'
6307
6307
6308 with repo.wlock():
6308 with repo.wlock():
6309 cmdutil.clearunfinished(repo)
6309 cmdutil.clearunfinished(repo)
6310 if date:
6310 if date:
6311 rev = cmdutil.finddate(ui, repo, date)
6311 rev = cmdutil.finddate(ui, repo, date)
6312
6312
6313 # if we defined a bookmark, we have to remember the original name
6313 # if we defined a bookmark, we have to remember the original name
6314 brev = rev
6314 brev = rev
6315 if rev:
6315 if rev:
6316 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
6316 repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
6317 ctx = scmutil.revsingle(repo, rev, default=None)
6317 ctx = scmutil.revsingle(repo, rev, default=None)
6318 rev = ctx.rev()
6318 rev = ctx.rev()
6319 hidden = ctx.hidden()
6319 hidden = ctx.hidden()
6320 overrides = {('ui', 'forcemerge'): opts.get(r'tool', '')}
6320 overrides = {('ui', 'forcemerge'): opts.get(r'tool', '')}
6321 with ui.configoverride(overrides, 'update'):
6321 with ui.configoverride(overrides, 'update'):
6322 ret = hg.updatetotally(ui, repo, rev, brev, clean=clean,
6322 ret = hg.updatetotally(ui, repo, rev, brev, clean=clean,
6323 updatecheck=updatecheck)
6323 updatecheck=updatecheck)
6324 if hidden:
6324 if hidden:
6325 ctxstr = ctx.hex()[:12]
6325 ctxstr = ctx.hex()[:12]
6326 ui.warn(_("updated to hidden changeset %s\n") % ctxstr)
6326 ui.warn(_("updated to hidden changeset %s\n") % ctxstr)
6327
6327
6328 if ctx.obsolete():
6328 if ctx.obsolete():
6329 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
6329 obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
6330 ui.warn("(%s)\n" % obsfatemsg)
6330 ui.warn("(%s)\n" % obsfatemsg)
6331 return ret
6331 return ret
6332
6332
6333 @command('verify',
6333 @command('verify',
6334 [('', 'full', False, 'perform more checks (EXPERIMENTAL)')],
6334 [('', 'full', False, 'perform more checks (EXPERIMENTAL)')],
6335 helpcategory=command.CATEGORY_MAINTENANCE)
6335 helpcategory=command.CATEGORY_MAINTENANCE)
6336 def verify(ui, repo, **opts):
6336 def verify(ui, repo, **opts):
6337 """verify the integrity of the repository
6337 """verify the integrity of the repository
6338
6338
6339 Verify the integrity of the current repository.
6339 Verify the integrity of the current repository.
6340
6340
6341 This will perform an extensive check of the repository's
6341 This will perform an extensive check of the repository's
6342 integrity, validating the hashes and checksums of each entry in
6342 integrity, validating the hashes and checksums of each entry in
6343 the changelog, manifest, and tracked files, as well as the
6343 the changelog, manifest, and tracked files, as well as the
6344 integrity of their crosslinks and indices.
6344 integrity of their crosslinks and indices.
6345
6345
6346 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
6346 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
6347 for more information about recovery from corruption of the
6347 for more information about recovery from corruption of the
6348 repository.
6348 repository.
6349
6349
6350 Returns 0 on success, 1 if errors are encountered.
6350 Returns 0 on success, 1 if errors are encountered.
6351 """
6351 """
6352 opts = pycompat.byteskwargs(opts)
6352 opts = pycompat.byteskwargs(opts)
6353
6353
6354 level = None
6354 level = None
6355 if opts['full']:
6355 if opts['full']:
6356 level = verifymod.VERIFY_FULL
6356 level = verifymod.VERIFY_FULL
6357 return hg.verify(repo, level)
6357 return hg.verify(repo, level)
6358
6358
6359 @command(
6359 @command(
6360 'version', [] + formatteropts, helpcategory=command.CATEGORY_HELP,
6360 'version', [] + formatteropts, helpcategory=command.CATEGORY_HELP,
6361 norepo=True, intents={INTENT_READONLY})
6361 norepo=True, intents={INTENT_READONLY})
6362 def version_(ui, **opts):
6362 def version_(ui, **opts):
6363 """output version and copyright information
6363 """output version and copyright information
6364
6364
6365 .. container:: verbose
6365 .. container:: verbose
6366
6366
6367 Template:
6367 Template:
6368
6368
6369 The following keywords are supported. See also :hg:`help templates`.
6369 The following keywords are supported. See also :hg:`help templates`.
6370
6370
6371 :extensions: List of extensions.
6371 :extensions: List of extensions.
6372 :ver: String. Version number.
6372 :ver: String. Version number.
6373
6373
6374 And each entry of ``{extensions}`` provides the following sub-keywords
6374 And each entry of ``{extensions}`` provides the following sub-keywords
6375 in addition to ``{ver}``.
6375 in addition to ``{ver}``.
6376
6376
6377 :bundled: Boolean. True if included in the release.
6377 :bundled: Boolean. True if included in the release.
6378 :name: String. Extension name.
6378 :name: String. Extension name.
6379 """
6379 """
6380 opts = pycompat.byteskwargs(opts)
6380 opts = pycompat.byteskwargs(opts)
6381 if ui.verbose:
6381 if ui.verbose:
6382 ui.pager('version')
6382 ui.pager('version')
6383 fm = ui.formatter("version", opts)
6383 fm = ui.formatter("version", opts)
6384 fm.startitem()
6384 fm.startitem()
6385 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
6385 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
6386 util.version())
6386 util.version())
6387 license = _(
6387 license = _(
6388 "(see https://mercurial-scm.org for more information)\n"
6388 "(see https://mercurial-scm.org for more information)\n"
6389 "\nCopyright (C) 2005-2019 Matt Mackall and others\n"
6389 "\nCopyright (C) 2005-2019 Matt Mackall and others\n"
6390 "This is free software; see the source for copying conditions. "
6390 "This is free software; see the source for copying conditions. "
6391 "There is NO\nwarranty; "
6391 "There is NO\nwarranty; "
6392 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6392 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6393 )
6393 )
6394 if not ui.quiet:
6394 if not ui.quiet:
6395 fm.plain(license)
6395 fm.plain(license)
6396
6396
6397 if ui.verbose:
6397 if ui.verbose:
6398 fm.plain(_("\nEnabled extensions:\n\n"))
6398 fm.plain(_("\nEnabled extensions:\n\n"))
6399 # format names and versions into columns
6399 # format names and versions into columns
6400 names = []
6400 names = []
6401 vers = []
6401 vers = []
6402 isinternals = []
6402 isinternals = []
6403 for name, module in extensions.extensions():
6403 for name, module in extensions.extensions():
6404 names.append(name)
6404 names.append(name)
6405 vers.append(extensions.moduleversion(module) or None)
6405 vers.append(extensions.moduleversion(module) or None)
6406 isinternals.append(extensions.ismoduleinternal(module))
6406 isinternals.append(extensions.ismoduleinternal(module))
6407 fn = fm.nested("extensions", tmpl='{name}\n')
6407 fn = fm.nested("extensions", tmpl='{name}\n')
6408 if names:
6408 if names:
6409 namefmt = " %%-%ds " % max(len(n) for n in names)
6409 namefmt = " %%-%ds " % max(len(n) for n in names)
6410 places = [_("external"), _("internal")]
6410 places = [_("external"), _("internal")]
6411 for n, v, p in zip(names, vers, isinternals):
6411 for n, v, p in zip(names, vers, isinternals):
6412 fn.startitem()
6412 fn.startitem()
6413 fn.condwrite(ui.verbose, "name", namefmt, n)
6413 fn.condwrite(ui.verbose, "name", namefmt, n)
6414 if ui.verbose:
6414 if ui.verbose:
6415 fn.plain("%s " % places[p])
6415 fn.plain("%s " % places[p])
6416 fn.data(bundled=p)
6416 fn.data(bundled=p)
6417 fn.condwrite(ui.verbose and v, "ver", "%s", v)
6417 fn.condwrite(ui.verbose and v, "ver", "%s", v)
6418 if ui.verbose:
6418 if ui.verbose:
6419 fn.plain("\n")
6419 fn.plain("\n")
6420 fn.end()
6420 fn.end()
6421 fm.end()
6421 fm.end()
6422
6422
6423 def loadcmdtable(ui, name, cmdtable):
6423 def loadcmdtable(ui, name, cmdtable):
6424 """Load command functions from specified cmdtable
6424 """Load command functions from specified cmdtable
6425 """
6425 """
6426 overrides = [cmd for cmd in cmdtable if cmd in table]
6426 overrides = [cmd for cmd in cmdtable if cmd in table]
6427 if overrides:
6427 if overrides:
6428 ui.warn(_("extension '%s' overrides commands: %s\n")
6428 ui.warn(_("extension '%s' overrides commands: %s\n")
6429 % (name, " ".join(overrides)))
6429 % (name, " ".join(overrides)))
6430 table.update(cmdtable)
6430 table.update(cmdtable)
@@ -1,948 +1,948 b''
1 # shelve.py - save/restore working directory state
1 # shelve.py - save/restore working directory state
2 #
2 #
3 # Copyright 2013 Facebook, Inc.
3 # Copyright 2013 Facebook, Inc.
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 """save and restore changes to the working directory
8 """save and restore changes to the working directory
9
9
10 The "hg shelve" command saves changes made to the working directory
10 The "hg shelve" command saves changes made to the working directory
11 and reverts those changes, resetting the working directory to a clean
11 and reverts those changes, resetting the working directory to a clean
12 state.
12 state.
13
13
14 Later on, the "hg unshelve" command restores the changes saved by "hg
14 Later on, the "hg unshelve" command restores the changes saved by "hg
15 shelve". Changes can be restored even after updating to a different
15 shelve". Changes can be restored even after updating to a different
16 parent, in which case Mercurial's merge machinery will resolve any
16 parent, in which case Mercurial's merge machinery will resolve any
17 conflicts if necessary.
17 conflicts if necessary.
18
18
19 You can have more than one shelved change outstanding at a time; each
19 You can have more than one shelved change outstanding at a time; each
20 shelved change has a distinct name. For details, see the help for "hg
20 shelved change has a distinct name. For details, see the help for "hg
21 shelve".
21 shelve".
22 """
22 """
23 from __future__ import absolute_import
23 from __future__ import absolute_import
24
24
25 import collections
25 import collections
26 import errno
26 import errno
27 import itertools
27 import itertools
28 import stat
28 import stat
29
29
30 from .i18n import _
30 from .i18n import _
31 from . import (
31 from . import (
32 bookmarks,
32 bookmarks,
33 bundle2,
33 bundle2,
34 bundlerepo,
34 bundlerepo,
35 changegroup,
35 changegroup,
36 cmdutil,
36 cmdutil,
37 discovery,
37 discovery,
38 error,
38 error,
39 exchange,
39 exchange,
40 hg,
40 hg,
41 lock as lockmod,
41 lock as lockmod,
42 mdiff,
42 mdiff,
43 merge,
43 merge,
44 node as nodemod,
44 node as nodemod,
45 patch,
45 patch,
46 phases,
46 phases,
47 pycompat,
47 pycompat,
48 repair,
48 repair,
49 scmutil,
49 scmutil,
50 templatefilters,
50 templatefilters,
51 util,
51 util,
52 vfs as vfsmod,
52 vfs as vfsmod,
53 )
53 )
54 from .utils import (
54 from .utils import (
55 dateutil,
55 dateutil,
56 stringutil,
56 stringutil,
57 )
57 )
58
58
59 backupdir = 'shelve-backup'
59 backupdir = 'shelve-backup'
60 shelvedir = 'shelved'
60 shelvedir = 'shelved'
61 shelvefileextensions = ['hg', 'patch', 'shelve']
61 shelvefileextensions = ['hg', 'patch', 'shelve']
62 # universal extension is present in all types of shelves
62 # universal extension is present in all types of shelves
63 patchextension = 'patch'
63 patchextension = 'patch'
64
64
65 # we never need the user, so we use a
65 # we never need the user, so we use a
66 # generic user for all shelve operations
66 # generic user for all shelve operations
67 shelveuser = 'shelve@localhost'
67 shelveuser = 'shelve@localhost'
68
68
69 class shelvedfile(object):
69 class shelvedfile(object):
70 """Helper for the file storing a single shelve
70 """Helper for the file storing a single shelve
71
71
72 Handles common functions on shelve files (.hg/.patch) using
72 Handles common functions on shelve files (.hg/.patch) using
73 the vfs layer"""
73 the vfs layer"""
74 def __init__(self, repo, name, filetype=None):
74 def __init__(self, repo, name, filetype=None):
75 self.repo = repo
75 self.repo = repo
76 self.name = name
76 self.name = name
77 self.vfs = vfsmod.vfs(repo.vfs.join(shelvedir))
77 self.vfs = vfsmod.vfs(repo.vfs.join(shelvedir))
78 self.backupvfs = vfsmod.vfs(repo.vfs.join(backupdir))
78 self.backupvfs = vfsmod.vfs(repo.vfs.join(backupdir))
79 self.ui = self.repo.ui
79 self.ui = self.repo.ui
80 if filetype:
80 if filetype:
81 self.fname = name + '.' + filetype
81 self.fname = name + '.' + filetype
82 else:
82 else:
83 self.fname = name
83 self.fname = name
84
84
85 def exists(self):
85 def exists(self):
86 return self.vfs.exists(self.fname)
86 return self.vfs.exists(self.fname)
87
87
88 def filename(self):
88 def filename(self):
89 return self.vfs.join(self.fname)
89 return self.vfs.join(self.fname)
90
90
91 def backupfilename(self):
91 def backupfilename(self):
92 def gennames(base):
92 def gennames(base):
93 yield base
93 yield base
94 base, ext = base.rsplit('.', 1)
94 base, ext = base.rsplit('.', 1)
95 for i in itertools.count(1):
95 for i in itertools.count(1):
96 yield '%s-%d.%s' % (base, i, ext)
96 yield '%s-%d.%s' % (base, i, ext)
97
97
98 name = self.backupvfs.join(self.fname)
98 name = self.backupvfs.join(self.fname)
99 for n in gennames(name):
99 for n in gennames(name):
100 if not self.backupvfs.exists(n):
100 if not self.backupvfs.exists(n):
101 return n
101 return n
102
102
103 def movetobackup(self):
103 def movetobackup(self):
104 if not self.backupvfs.isdir():
104 if not self.backupvfs.isdir():
105 self.backupvfs.makedir()
105 self.backupvfs.makedir()
106 util.rename(self.filename(), self.backupfilename())
106 util.rename(self.filename(), self.backupfilename())
107
107
108 def stat(self):
108 def stat(self):
109 return self.vfs.stat(self.fname)
109 return self.vfs.stat(self.fname)
110
110
111 def opener(self, mode='rb'):
111 def opener(self, mode='rb'):
112 try:
112 try:
113 return self.vfs(self.fname, mode)
113 return self.vfs(self.fname, mode)
114 except IOError as err:
114 except IOError as err:
115 if err.errno != errno.ENOENT:
115 if err.errno != errno.ENOENT:
116 raise
116 raise
117 raise error.Abort(_("shelved change '%s' not found") % self.name)
117 raise error.Abort(_("shelved change '%s' not found") % self.name)
118
118
119 def applybundle(self, tr):
119 def applybundle(self, tr):
120 fp = self.opener()
120 fp = self.opener()
121 try:
121 try:
122 targetphase = phases.internal
122 targetphase = phases.internal
123 if not phases.supportinternal(self.repo):
123 if not phases.supportinternal(self.repo):
124 targetphase = phases.secret
124 targetphase = phases.secret
125 gen = exchange.readbundle(self.repo.ui, fp, self.fname, self.vfs)
125 gen = exchange.readbundle(self.repo.ui, fp, self.fname, self.vfs)
126 pretip = self.repo['tip']
126 pretip = self.repo['tip']
127 bundle2.applybundle(self.repo, gen, tr,
127 bundle2.applybundle(self.repo, gen, tr,
128 source='unshelve',
128 source='unshelve',
129 url='bundle:' + self.vfs.join(self.fname),
129 url='bundle:' + self.vfs.join(self.fname),
130 targetphase=targetphase)
130 targetphase=targetphase)
131 shelvectx = self.repo['tip']
131 shelvectx = self.repo['tip']
132 if pretip == shelvectx:
132 if pretip == shelvectx:
133 shelverev = tr.changes['revduplicates'][-1]
133 shelverev = tr.changes['revduplicates'][-1]
134 shelvectx = self.repo[shelverev]
134 shelvectx = self.repo[shelverev]
135 return shelvectx
135 return shelvectx
136 finally:
136 finally:
137 fp.close()
137 fp.close()
138
138
139 def bundlerepo(self):
139 def bundlerepo(self):
140 path = self.vfs.join(self.fname)
140 path = self.vfs.join(self.fname)
141 return bundlerepo.instance(self.repo.baseui,
141 return bundlerepo.instance(self.repo.baseui,
142 'bundle://%s+%s' % (self.repo.root, path))
142 'bundle://%s+%s' % (self.repo.root, path))
143
143
144 def writebundle(self, bases, node):
144 def writebundle(self, bases, node):
145 cgversion = changegroup.safeversion(self.repo)
145 cgversion = changegroup.safeversion(self.repo)
146 if cgversion == '01':
146 if cgversion == '01':
147 btype = 'HG10BZ'
147 btype = 'HG10BZ'
148 compression = None
148 compression = None
149 else:
149 else:
150 btype = 'HG20'
150 btype = 'HG20'
151 compression = 'BZ'
151 compression = 'BZ'
152
152
153 repo = self.repo.unfiltered()
153 repo = self.repo.unfiltered()
154
154
155 outgoing = discovery.outgoing(repo, missingroots=bases,
155 outgoing = discovery.outgoing(repo, missingroots=bases,
156 missingheads=[node])
156 missingheads=[node])
157 cg = changegroup.makechangegroup(repo, outgoing, cgversion, 'shelve')
157 cg = changegroup.makechangegroup(repo, outgoing, cgversion, 'shelve')
158
158
159 bundle2.writebundle(self.ui, cg, self.fname, btype, self.vfs,
159 bundle2.writebundle(self.ui, cg, self.fname, btype, self.vfs,
160 compression=compression)
160 compression=compression)
161
161
162 def writeinfo(self, info):
162 def writeinfo(self, info):
163 scmutil.simplekeyvaluefile(self.vfs, self.fname).write(info)
163 scmutil.simplekeyvaluefile(self.vfs, self.fname).write(info)
164
164
165 def readinfo(self):
165 def readinfo(self):
166 return scmutil.simplekeyvaluefile(self.vfs, self.fname).read()
166 return scmutil.simplekeyvaluefile(self.vfs, self.fname).read()
167
167
168 class shelvedstate(object):
168 class shelvedstate(object):
169 """Handle persistence during unshelving operations.
169 """Handle persistence during unshelving operations.
170
170
171 Handles saving and restoring a shelved state. Ensures that different
171 Handles saving and restoring a shelved state. Ensures that different
172 versions of a shelved state are possible and handles them appropriately.
172 versions of a shelved state are possible and handles them appropriately.
173 """
173 """
174 _version = 2
174 _version = 2
175 _filename = 'shelvedstate'
175 _filename = 'shelvedstate'
176 _keep = 'keep'
176 _keep = 'keep'
177 _nokeep = 'nokeep'
177 _nokeep = 'nokeep'
178 # colon is essential to differentiate from a real bookmark name
178 # colon is essential to differentiate from a real bookmark name
179 _noactivebook = ':no-active-bookmark'
179 _noactivebook = ':no-active-bookmark'
180
180
181 @classmethod
181 @classmethod
182 def _verifyandtransform(cls, d):
182 def _verifyandtransform(cls, d):
183 """Some basic shelvestate syntactic verification and transformation"""
183 """Some basic shelvestate syntactic verification and transformation"""
184 try:
184 try:
185 d['originalwctx'] = nodemod.bin(d['originalwctx'])
185 d['originalwctx'] = nodemod.bin(d['originalwctx'])
186 d['pendingctx'] = nodemod.bin(d['pendingctx'])
186 d['pendingctx'] = nodemod.bin(d['pendingctx'])
187 d['parents'] = [nodemod.bin(h)
187 d['parents'] = [nodemod.bin(h)
188 for h in d['parents'].split(' ')]
188 for h in d['parents'].split(' ')]
189 d['nodestoremove'] = [nodemod.bin(h)
189 d['nodestoremove'] = [nodemod.bin(h)
190 for h in d['nodestoremove'].split(' ')]
190 for h in d['nodestoremove'].split(' ')]
191 except (ValueError, TypeError, KeyError) as err:
191 except (ValueError, TypeError, KeyError) as err:
192 raise error.CorruptedState(pycompat.bytestr(err))
192 raise error.CorruptedState(pycompat.bytestr(err))
193
193
194 @classmethod
194 @classmethod
195 def _getversion(cls, repo):
195 def _getversion(cls, repo):
196 """Read version information from shelvestate file"""
196 """Read version information from shelvestate file"""
197 fp = repo.vfs(cls._filename)
197 fp = repo.vfs(cls._filename)
198 try:
198 try:
199 version = int(fp.readline().strip())
199 version = int(fp.readline().strip())
200 except ValueError as err:
200 except ValueError as err:
201 raise error.CorruptedState(pycompat.bytestr(err))
201 raise error.CorruptedState(pycompat.bytestr(err))
202 finally:
202 finally:
203 fp.close()
203 fp.close()
204 return version
204 return version
205
205
206 @classmethod
206 @classmethod
207 def _readold(cls, repo):
207 def _readold(cls, repo):
208 """Read the old position-based version of a shelvestate file"""
208 """Read the old position-based version of a shelvestate file"""
209 # Order is important, because old shelvestate file uses it
209 # Order is important, because old shelvestate file uses it
210 # to detemine values of fields (i.g. name is on the second line,
210 # to detemine values of fields (i.g. name is on the second line,
211 # originalwctx is on the third and so forth). Please do not change.
211 # originalwctx is on the third and so forth). Please do not change.
212 keys = ['version', 'name', 'originalwctx', 'pendingctx', 'parents',
212 keys = ['version', 'name', 'originalwctx', 'pendingctx', 'parents',
213 'nodestoremove', 'branchtorestore', 'keep', 'activebook']
213 'nodestoremove', 'branchtorestore', 'keep', 'activebook']
214 # this is executed only seldomly, so it is not a big deal
214 # this is executed only seldomly, so it is not a big deal
215 # that we open this file twice
215 # that we open this file twice
216 fp = repo.vfs(cls._filename)
216 fp = repo.vfs(cls._filename)
217 d = {}
217 d = {}
218 try:
218 try:
219 for key in keys:
219 for key in keys:
220 d[key] = fp.readline().strip()
220 d[key] = fp.readline().strip()
221 finally:
221 finally:
222 fp.close()
222 fp.close()
223 return d
223 return d
224
224
225 @classmethod
225 @classmethod
226 def load(cls, repo):
226 def load(cls, repo):
227 version = cls._getversion(repo)
227 version = cls._getversion(repo)
228 if version < cls._version:
228 if version < cls._version:
229 d = cls._readold(repo)
229 d = cls._readold(repo)
230 elif version == cls._version:
230 elif version == cls._version:
231 d = scmutil.simplekeyvaluefile(
231 d = scmutil.simplekeyvaluefile(
232 repo.vfs, cls._filename).read(firstlinenonkeyval=True)
232 repo.vfs, cls._filename).read(firstlinenonkeyval=True)
233 else:
233 else:
234 raise error.Abort(_('this version of shelve is incompatible '
234 raise error.Abort(_('this version of shelve is incompatible '
235 'with the version used in this repo'))
235 'with the version used in this repo'))
236
236
237 cls._verifyandtransform(d)
237 cls._verifyandtransform(d)
238 try:
238 try:
239 obj = cls()
239 obj = cls()
240 obj.name = d['name']
240 obj.name = d['name']
241 obj.wctx = repo[d['originalwctx']]
241 obj.wctx = repo[d['originalwctx']]
242 obj.pendingctx = repo[d['pendingctx']]
242 obj.pendingctx = repo[d['pendingctx']]
243 obj.parents = d['parents']
243 obj.parents = d['parents']
244 obj.nodestoremove = d['nodestoremove']
244 obj.nodestoremove = d['nodestoremove']
245 obj.branchtorestore = d.get('branchtorestore', '')
245 obj.branchtorestore = d.get('branchtorestore', '')
246 obj.keep = d.get('keep') == cls._keep
246 obj.keep = d.get('keep') == cls._keep
247 obj.activebookmark = ''
247 obj.activebookmark = ''
248 if d.get('activebook', '') != cls._noactivebook:
248 if d.get('activebook', '') != cls._noactivebook:
249 obj.activebookmark = d.get('activebook', '')
249 obj.activebookmark = d.get('activebook', '')
250 except (error.RepoLookupError, KeyError) as err:
250 except (error.RepoLookupError, KeyError) as err:
251 raise error.CorruptedState(pycompat.bytestr(err))
251 raise error.CorruptedState(pycompat.bytestr(err))
252
252
253 return obj
253 return obj
254
254
255 @classmethod
255 @classmethod
256 def save(cls, repo, name, originalwctx, pendingctx, nodestoremove,
256 def save(cls, repo, name, originalwctx, pendingctx, nodestoremove,
257 branchtorestore, keep=False, activebook=''):
257 branchtorestore, keep=False, activebook=''):
258 info = {
258 info = {
259 "name": name,
259 "name": name,
260 "originalwctx": nodemod.hex(originalwctx.node()),
260 "originalwctx": nodemod.hex(originalwctx.node()),
261 "pendingctx": nodemod.hex(pendingctx.node()),
261 "pendingctx": nodemod.hex(pendingctx.node()),
262 "parents": ' '.join([nodemod.hex(p)
262 "parents": ' '.join([nodemod.hex(p)
263 for p in repo.dirstate.parents()]),
263 for p in repo.dirstate.parents()]),
264 "nodestoremove": ' '.join([nodemod.hex(n)
264 "nodestoremove": ' '.join([nodemod.hex(n)
265 for n in nodestoremove]),
265 for n in nodestoremove]),
266 "branchtorestore": branchtorestore,
266 "branchtorestore": branchtorestore,
267 "keep": cls._keep if keep else cls._nokeep,
267 "keep": cls._keep if keep else cls._nokeep,
268 "activebook": activebook or cls._noactivebook
268 "activebook": activebook or cls._noactivebook
269 }
269 }
270 scmutil.simplekeyvaluefile(
270 scmutil.simplekeyvaluefile(
271 repo.vfs, cls._filename).write(info,
271 repo.vfs, cls._filename).write(info,
272 firstline=("%d" % cls._version))
272 firstline=("%d" % cls._version))
273
273
274 @classmethod
274 @classmethod
275 def clear(cls, repo):
275 def clear(cls, repo):
276 repo.vfs.unlinkpath(cls._filename, ignoremissing=True)
276 repo.vfs.unlinkpath(cls._filename, ignoremissing=True)
277
277
278 def cleanupoldbackups(repo):
278 def cleanupoldbackups(repo):
279 vfs = vfsmod.vfs(repo.vfs.join(backupdir))
279 vfs = vfsmod.vfs(repo.vfs.join(backupdir))
280 maxbackups = repo.ui.configint('shelve', 'maxbackups')
280 maxbackups = repo.ui.configint('shelve', 'maxbackups')
281 hgfiles = [f for f in vfs.listdir()
281 hgfiles = [f for f in vfs.listdir()
282 if f.endswith('.' + patchextension)]
282 if f.endswith('.' + patchextension)]
283 hgfiles = sorted([(vfs.stat(f)[stat.ST_MTIME], f) for f in hgfiles])
283 hgfiles = sorted([(vfs.stat(f)[stat.ST_MTIME], f) for f in hgfiles])
284 if maxbackups > 0 and maxbackups < len(hgfiles):
284 if maxbackups > 0 and maxbackups < len(hgfiles):
285 bordermtime = hgfiles[-maxbackups][0]
285 bordermtime = hgfiles[-maxbackups][0]
286 else:
286 else:
287 bordermtime = None
287 bordermtime = None
288 for mtime, f in hgfiles[:len(hgfiles) - maxbackups]:
288 for mtime, f in hgfiles[:len(hgfiles) - maxbackups]:
289 if mtime == bordermtime:
289 if mtime == bordermtime:
290 # keep it, because timestamp can't decide exact order of backups
290 # keep it, because timestamp can't decide exact order of backups
291 continue
291 continue
292 base = f[:-(1 + len(patchextension))]
292 base = f[:-(1 + len(patchextension))]
293 for ext in shelvefileextensions:
293 for ext in shelvefileextensions:
294 vfs.tryunlink(base + '.' + ext)
294 vfs.tryunlink(base + '.' + ext)
295
295
296 def _backupactivebookmark(repo):
296 def _backupactivebookmark(repo):
297 activebookmark = repo._activebookmark
297 activebookmark = repo._activebookmark
298 if activebookmark:
298 if activebookmark:
299 bookmarks.deactivate(repo)
299 bookmarks.deactivate(repo)
300 return activebookmark
300 return activebookmark
301
301
302 def _restoreactivebookmark(repo, mark):
302 def _restoreactivebookmark(repo, mark):
303 if mark:
303 if mark:
304 bookmarks.activate(repo, mark)
304 bookmarks.activate(repo, mark)
305
305
306 def _aborttransaction(repo, tr):
306 def _aborttransaction(repo, tr):
307 '''Abort current transaction for shelve/unshelve, but keep dirstate
307 '''Abort current transaction for shelve/unshelve, but keep dirstate
308 '''
308 '''
309 dirstatebackupname = 'dirstate.shelve'
309 dirstatebackupname = 'dirstate.shelve'
310 repo.dirstate.savebackup(tr, dirstatebackupname)
310 repo.dirstate.savebackup(tr, dirstatebackupname)
311 tr.abort()
311 tr.abort()
312 repo.dirstate.restorebackup(None, dirstatebackupname)
312 repo.dirstate.restorebackup(None, dirstatebackupname)
313
313
314 def getshelvename(repo, parent, opts):
314 def getshelvename(repo, parent, opts):
315 """Decide on the name this shelve is going to have"""
315 """Decide on the name this shelve is going to have"""
316 def gennames():
316 def gennames():
317 yield label
317 yield label
318 for i in itertools.count(1):
318 for i in itertools.count(1):
319 yield '%s-%02d' % (label, i)
319 yield '%s-%02d' % (label, i)
320 name = opts.get('name')
320 name = opts.get('name')
321 label = repo._activebookmark or parent.branch() or 'default'
321 label = repo._activebookmark or parent.branch() or 'default'
322 # slashes aren't allowed in filenames, therefore we rename it
322 # slashes aren't allowed in filenames, therefore we rename it
323 label = label.replace('/', '_')
323 label = label.replace('/', '_')
324 label = label.replace('\\', '_')
324 label = label.replace('\\', '_')
325 # filenames must not start with '.' as it should not be hidden
325 # filenames must not start with '.' as it should not be hidden
326 if label.startswith('.'):
326 if label.startswith('.'):
327 label = label.replace('.', '_', 1)
327 label = label.replace('.', '_', 1)
328
328
329 if name:
329 if name:
330 if shelvedfile(repo, name, patchextension).exists():
330 if shelvedfile(repo, name, patchextension).exists():
331 e = _("a shelved change named '%s' already exists") % name
331 e = _("a shelved change named '%s' already exists") % name
332 raise error.Abort(e)
332 raise error.Abort(e)
333
333
334 # ensure we are not creating a subdirectory or a hidden file
334 # ensure we are not creating a subdirectory or a hidden file
335 if '/' in name or '\\' in name:
335 if '/' in name or '\\' in name:
336 raise error.Abort(_('shelved change names can not contain slashes'))
336 raise error.Abort(_('shelved change names can not contain slashes'))
337 if name.startswith('.'):
337 if name.startswith('.'):
338 raise error.Abort(_("shelved change names can not start with '.'"))
338 raise error.Abort(_("shelved change names can not start with '.'"))
339
339
340 else:
340 else:
341 for n in gennames():
341 for n in gennames():
342 if not shelvedfile(repo, n, patchextension).exists():
342 if not shelvedfile(repo, n, patchextension).exists():
343 name = n
343 name = n
344 break
344 break
345
345
346 return name
346 return name
347
347
348 def mutableancestors(ctx):
348 def mutableancestors(ctx):
349 """return all mutable ancestors for ctx (included)
349 """return all mutable ancestors for ctx (included)
350
350
351 Much faster than the revset ancestors(ctx) & draft()"""
351 Much faster than the revset ancestors(ctx) & draft()"""
352 seen = {nodemod.nullrev}
352 seen = {nodemod.nullrev}
353 visit = collections.deque()
353 visit = collections.deque()
354 visit.append(ctx)
354 visit.append(ctx)
355 while visit:
355 while visit:
356 ctx = visit.popleft()
356 ctx = visit.popleft()
357 yield ctx.node()
357 yield ctx.node()
358 for parent in ctx.parents():
358 for parent in ctx.parents():
359 rev = parent.rev()
359 rev = parent.rev()
360 if rev not in seen:
360 if rev not in seen:
361 seen.add(rev)
361 seen.add(rev)
362 if parent.mutable():
362 if parent.mutable():
363 visit.append(parent)
363 visit.append(parent)
364
364
365 def getcommitfunc(extra, interactive, editor=False):
365 def getcommitfunc(extra, interactive, editor=False):
366 def commitfunc(ui, repo, message, match, opts):
366 def commitfunc(ui, repo, message, match, opts):
367 hasmq = util.safehasattr(repo, 'mq')
367 hasmq = util.safehasattr(repo, 'mq')
368 if hasmq:
368 if hasmq:
369 saved, repo.mq.checkapplied = repo.mq.checkapplied, False
369 saved, repo.mq.checkapplied = repo.mq.checkapplied, False
370
370
371 targetphase = phases.internal
371 targetphase = phases.internal
372 if not phases.supportinternal(repo):
372 if not phases.supportinternal(repo):
373 targetphase = phases.secret
373 targetphase = phases.secret
374 overrides = {('phases', 'new-commit'): targetphase}
374 overrides = {('phases', 'new-commit'): targetphase}
375 try:
375 try:
376 editor_ = False
376 editor_ = False
377 if editor:
377 if editor:
378 editor_ = cmdutil.getcommiteditor(editform='shelve.shelve',
378 editor_ = cmdutil.getcommiteditor(editform='shelve.shelve',
379 **pycompat.strkwargs(opts))
379 **pycompat.strkwargs(opts))
380 with repo.ui.configoverride(overrides):
380 with repo.ui.configoverride(overrides):
381 return repo.commit(message, shelveuser, opts.get('date'),
381 return repo.commit(message, shelveuser, opts.get('date'),
382 match, editor=editor_, extra=extra)
382 match, editor=editor_, extra=extra)
383 finally:
383 finally:
384 if hasmq:
384 if hasmq:
385 repo.mq.checkapplied = saved
385 repo.mq.checkapplied = saved
386
386
387 def interactivecommitfunc(ui, repo, *pats, **opts):
387 def interactivecommitfunc(ui, repo, *pats, **opts):
388 opts = pycompat.byteskwargs(opts)
388 opts = pycompat.byteskwargs(opts)
389 match = scmutil.match(repo['.'], pats, {})
389 match = scmutil.match(repo['.'], pats, {})
390 message = opts['message']
390 message = opts['message']
391 return commitfunc(ui, repo, message, match, opts)
391 return commitfunc(ui, repo, message, match, opts)
392
392
393 return interactivecommitfunc if interactive else commitfunc
393 return interactivecommitfunc if interactive else commitfunc
394
394
395 def _nothingtoshelvemessaging(ui, repo, pats, opts):
395 def _nothingtoshelvemessaging(ui, repo, pats, opts):
396 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
396 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
397 if stat.deleted:
397 if stat.deleted:
398 ui.status(_("nothing changed (%d missing files, see "
398 ui.status(_("nothing changed (%d missing files, see "
399 "'hg status')\n") % len(stat.deleted))
399 "'hg status')\n") % len(stat.deleted))
400 else:
400 else:
401 ui.status(_("nothing changed\n"))
401 ui.status(_("nothing changed\n"))
402
402
403 def _shelvecreatedcommit(repo, node, name, match):
403 def _shelvecreatedcommit(repo, node, name, match):
404 info = {'node': nodemod.hex(node)}
404 info = {'node': nodemod.hex(node)}
405 shelvedfile(repo, name, 'shelve').writeinfo(info)
405 shelvedfile(repo, name, 'shelve').writeinfo(info)
406 bases = list(mutableancestors(repo[node]))
406 bases = list(mutableancestors(repo[node]))
407 shelvedfile(repo, name, 'hg').writebundle(bases, node)
407 shelvedfile(repo, name, 'hg').writebundle(bases, node)
408 with shelvedfile(repo, name, patchextension).opener('wb') as fp:
408 with shelvedfile(repo, name, patchextension).opener('wb') as fp:
409 cmdutil.exportfile(repo, [node], fp, opts=mdiff.diffopts(git=True),
409 cmdutil.exportfile(repo, [node], fp, opts=mdiff.diffopts(git=True),
410 match=match)
410 match=match)
411
411
412 def _includeunknownfiles(repo, pats, opts, extra):
412 def _includeunknownfiles(repo, pats, opts, extra):
413 s = repo.status(match=scmutil.match(repo[None], pats, opts),
413 s = repo.status(match=scmutil.match(repo[None], pats, opts),
414 unknown=True)
414 unknown=True)
415 if s.unknown:
415 if s.unknown:
416 extra['shelve_unknown'] = '\0'.join(s.unknown)
416 extra['shelve_unknown'] = '\0'.join(s.unknown)
417 repo[None].add(s.unknown)
417 repo[None].add(s.unknown)
418
418
419 def _finishshelve(repo, tr):
419 def _finishshelve(repo, tr):
420 if phases.supportinternal(repo):
420 if phases.supportinternal(repo):
421 tr.close()
421 tr.close()
422 else:
422 else:
423 _aborttransaction(repo, tr)
423 _aborttransaction(repo, tr)
424
424
425 def createcmd(ui, repo, pats, opts):
425 def createcmd(ui, repo, pats, opts):
426 """subcommand that creates a new shelve"""
426 """subcommand that creates a new shelve"""
427 with repo.wlock():
427 with repo.wlock():
428 cmdutil.checkunfinished(repo)
428 cmdutil.checkunfinished(repo)
429 return _docreatecmd(ui, repo, pats, opts)
429 return _docreatecmd(ui, repo, pats, opts)
430
430
431 def _docreatecmd(ui, repo, pats, opts):
431 def _docreatecmd(ui, repo, pats, opts):
432 wctx = repo[None]
432 wctx = repo[None]
433 parents = wctx.parents()
433 parents = wctx.parents()
434 parent = parents[0]
434 parent = parents[0]
435 origbranch = wctx.branch()
435 origbranch = wctx.branch()
436
436
437 if parent.node() != nodemod.nullid:
437 if parent.node() != nodemod.nullid:
438 desc = "changes to: %s" % parent.description().split('\n', 1)[0]
438 desc = "changes to: %s" % parent.description().split('\n', 1)[0]
439 else:
439 else:
440 desc = '(changes in empty repository)'
440 desc = '(changes in empty repository)'
441
441
442 if not opts.get('message'):
442 if not opts.get('message'):
443 opts['message'] = desc
443 opts['message'] = desc
444
444
445 lock = tr = activebookmark = None
445 lock = tr = activebookmark = None
446 try:
446 try:
447 lock = repo.lock()
447 lock = repo.lock()
448
448
449 # use an uncommitted transaction to generate the bundle to avoid
449 # use an uncommitted transaction to generate the bundle to avoid
450 # pull races. ensure we don't print the abort message to stderr.
450 # pull races. ensure we don't print the abort message to stderr.
451 tr = repo.transaction('shelve', report=lambda x: None)
451 tr = repo.transaction('shelve', report=lambda x: None)
452
452
453 interactive = opts.get('interactive', False)
453 interactive = opts.get('interactive', False)
454 includeunknown = (opts.get('unknown', False) and
454 includeunknown = (opts.get('unknown', False) and
455 not opts.get('addremove', False))
455 not opts.get('addremove', False))
456
456
457 name = getshelvename(repo, parent, opts)
457 name = getshelvename(repo, parent, opts)
458 activebookmark = _backupactivebookmark(repo)
458 activebookmark = _backupactivebookmark(repo)
459 extra = {'internal': 'shelve'}
459 extra = {'internal': 'shelve'}
460 if includeunknown:
460 if includeunknown:
461 _includeunknownfiles(repo, pats, opts, extra)
461 _includeunknownfiles(repo, pats, opts, extra)
462
462
463 if _iswctxonnewbranch(repo) and not _isbareshelve(pats, opts):
463 if _iswctxonnewbranch(repo) and not _isbareshelve(pats, opts):
464 # In non-bare shelve we don't store newly created branch
464 # In non-bare shelve we don't store newly created branch
465 # at bundled commit
465 # at bundled commit
466 repo.dirstate.setbranch(repo['.'].branch())
466 repo.dirstate.setbranch(repo['.'].branch())
467
467
468 commitfunc = getcommitfunc(extra, interactive, editor=True)
468 commitfunc = getcommitfunc(extra, interactive, editor=True)
469 if not interactive:
469 if not interactive:
470 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
470 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
471 else:
471 else:
472 node = cmdutil.dorecord(ui, repo, commitfunc, None,
472 node = cmdutil.dorecord(ui, repo, commitfunc, None,
473 False, cmdutil.recordfilter, *pats,
473 False, cmdutil.recordfilter, *pats,
474 **pycompat.strkwargs(opts))
474 **pycompat.strkwargs(opts))
475 if not node:
475 if not node:
476 _nothingtoshelvemessaging(ui, repo, pats, opts)
476 _nothingtoshelvemessaging(ui, repo, pats, opts)
477 return 1
477 return 1
478
478
479 # Create a matcher so that prefetch doesn't attempt to fetch
479 # Create a matcher so that prefetch doesn't attempt to fetch
480 # the entire repository pointlessly, and as an optimisation
480 # the entire repository pointlessly, and as an optimisation
481 # for movedirstate, if needed.
481 # for movedirstate, if needed.
482 match = scmutil.matchfiles(repo, repo[node].files())
482 match = scmutil.matchfiles(repo, repo[node].files())
483 _shelvecreatedcommit(repo, node, name, match)
483 _shelvecreatedcommit(repo, node, name, match)
484
484
485 if ui.formatted():
485 if ui.formatted():
486 desc = stringutil.ellipsis(desc, ui.termwidth())
486 desc = stringutil.ellipsis(desc, ui.termwidth())
487 ui.status(_('shelved as %s\n') % name)
487 ui.status(_('shelved as %s\n') % name)
488 if opts['keep']:
488 if opts['keep']:
489 with repo.dirstate.parentchange():
489 with repo.dirstate.parentchange():
490 scmutil.movedirstate(repo, parent, match)
490 scmutil.movedirstate(repo, parent, match)
491 else:
491 else:
492 hg.update(repo, parent.node())
492 hg.update(repo, parent.node())
493 if origbranch != repo['.'].branch() and not _isbareshelve(pats, opts):
493 if origbranch != repo['.'].branch() and not _isbareshelve(pats, opts):
494 repo.dirstate.setbranch(origbranch)
494 repo.dirstate.setbranch(origbranch)
495
495
496 _finishshelve(repo, tr)
496 _finishshelve(repo, tr)
497 finally:
497 finally:
498 _restoreactivebookmark(repo, activebookmark)
498 _restoreactivebookmark(repo, activebookmark)
499 lockmod.release(tr, lock)
499 lockmod.release(tr, lock)
500
500
501 def _isbareshelve(pats, opts):
501 def _isbareshelve(pats, opts):
502 return (not pats
502 return (not pats
503 and not opts.get('interactive', False)
503 and not opts.get('interactive', False)
504 and not opts.get('include', False)
504 and not opts.get('include', False)
505 and not opts.get('exclude', False))
505 and not opts.get('exclude', False))
506
506
507 def _iswctxonnewbranch(repo):
507 def _iswctxonnewbranch(repo):
508 return repo[None].branch() != repo['.'].branch()
508 return repo[None].branch() != repo['.'].branch()
509
509
510 def cleanupcmd(ui, repo):
510 def cleanupcmd(ui, repo):
511 """subcommand that deletes all shelves"""
511 """subcommand that deletes all shelves"""
512
512
513 with repo.wlock():
513 with repo.wlock():
514 for (name, _type) in repo.vfs.readdir(shelvedir):
514 for (name, _type) in repo.vfs.readdir(shelvedir):
515 suffix = name.rsplit('.', 1)[-1]
515 suffix = name.rsplit('.', 1)[-1]
516 if suffix in shelvefileextensions:
516 if suffix in shelvefileextensions:
517 shelvedfile(repo, name).movetobackup()
517 shelvedfile(repo, name).movetobackup()
518 cleanupoldbackups(repo)
518 cleanupoldbackups(repo)
519
519
520 def deletecmd(ui, repo, pats):
520 def deletecmd(ui, repo, pats):
521 """subcommand that deletes a specific shelve"""
521 """subcommand that deletes a specific shelve"""
522 if not pats:
522 if not pats:
523 raise error.Abort(_('no shelved changes specified!'))
523 raise error.Abort(_('no shelved changes specified!'))
524 with repo.wlock():
524 with repo.wlock():
525 try:
525 try:
526 for name in pats:
526 for name in pats:
527 for suffix in shelvefileextensions:
527 for suffix in shelvefileextensions:
528 shfile = shelvedfile(repo, name, suffix)
528 shfile = shelvedfile(repo, name, suffix)
529 # patch file is necessary, as it should
529 # patch file is necessary, as it should
530 # be present for any kind of shelve,
530 # be present for any kind of shelve,
531 # but the .hg file is optional as in future we
531 # but the .hg file is optional as in future we
532 # will add obsolete shelve with does not create a
532 # will add obsolete shelve with does not create a
533 # bundle
533 # bundle
534 if shfile.exists() or suffix == patchextension:
534 if shfile.exists() or suffix == patchextension:
535 shfile.movetobackup()
535 shfile.movetobackup()
536 cleanupoldbackups(repo)
536 cleanupoldbackups(repo)
537 except OSError as err:
537 except OSError as err:
538 if err.errno != errno.ENOENT:
538 if err.errno != errno.ENOENT:
539 raise
539 raise
540 raise error.Abort(_("shelved change '%s' not found") % name)
540 raise error.Abort(_("shelved change '%s' not found") % name)
541
541
542 def listshelves(repo):
542 def listshelves(repo):
543 """return all shelves in repo as list of (time, filename)"""
543 """return all shelves in repo as list of (time, filename)"""
544 try:
544 try:
545 names = repo.vfs.readdir(shelvedir)
545 names = repo.vfs.readdir(shelvedir)
546 except OSError as err:
546 except OSError as err:
547 if err.errno != errno.ENOENT:
547 if err.errno != errno.ENOENT:
548 raise
548 raise
549 return []
549 return []
550 info = []
550 info = []
551 for (name, _type) in names:
551 for (name, _type) in names:
552 pfx, sfx = name.rsplit('.', 1)
552 pfx, sfx = name.rsplit('.', 1)
553 if not pfx or sfx != patchextension:
553 if not pfx or sfx != patchextension:
554 continue
554 continue
555 st = shelvedfile(repo, name).stat()
555 st = shelvedfile(repo, name).stat()
556 info.append((st[stat.ST_MTIME], shelvedfile(repo, pfx).filename()))
556 info.append((st[stat.ST_MTIME], shelvedfile(repo, pfx).filename()))
557 return sorted(info, reverse=True)
557 return sorted(info, reverse=True)
558
558
559 def listcmd(ui, repo, pats, opts):
559 def listcmd(ui, repo, pats, opts):
560 """subcommand that displays the list of shelves"""
560 """subcommand that displays the list of shelves"""
561 pats = set(pats)
561 pats = set(pats)
562 width = 80
562 width = 80
563 if not ui.plain():
563 if not ui.plain():
564 width = ui.termwidth()
564 width = ui.termwidth()
565 namelabel = 'shelve.newest'
565 namelabel = 'shelve.newest'
566 ui.pager('shelve')
566 ui.pager('shelve')
567 for mtime, name in listshelves(repo):
567 for mtime, name in listshelves(repo):
568 sname = util.split(name)[1]
568 sname = util.split(name)[1]
569 if pats and sname not in pats:
569 if pats and sname not in pats:
570 continue
570 continue
571 ui.write(sname, label=namelabel)
571 ui.write(sname, label=namelabel)
572 namelabel = 'shelve.name'
572 namelabel = 'shelve.name'
573 if ui.quiet:
573 if ui.quiet:
574 ui.write('\n')
574 ui.write('\n')
575 continue
575 continue
576 ui.write(' ' * (16 - len(sname)))
576 ui.write(' ' * (16 - len(sname)))
577 used = 16
577 used = 16
578 date = dateutil.makedate(mtime)
578 date = dateutil.makedate(mtime)
579 age = '(%s)' % templatefilters.age(date, abbrev=True)
579 age = '(%s)' % templatefilters.age(date, abbrev=True)
580 ui.write(age, label='shelve.age')
580 ui.write(age, label='shelve.age')
581 ui.write(' ' * (12 - len(age)))
581 ui.write(' ' * (12 - len(age)))
582 used += 12
582 used += 12
583 with open(name + '.' + patchextension, 'rb') as fp:
583 with open(name + '.' + patchextension, 'rb') as fp:
584 while True:
584 while True:
585 line = fp.readline()
585 line = fp.readline()
586 if not line:
586 if not line:
587 break
587 break
588 if not line.startswith('#'):
588 if not line.startswith('#'):
589 desc = line.rstrip()
589 desc = line.rstrip()
590 if ui.formatted():
590 if ui.formatted():
591 desc = stringutil.ellipsis(desc, width - used)
591 desc = stringutil.ellipsis(desc, width - used)
592 ui.write(desc)
592 ui.write(desc)
593 break
593 break
594 ui.write('\n')
594 ui.write('\n')
595 if not (opts['patch'] or opts['stat']):
595 if not (opts['patch'] or opts['stat']):
596 continue
596 continue
597 difflines = fp.readlines()
597 difflines = fp.readlines()
598 if opts['patch']:
598 if opts['patch']:
599 for chunk, label in patch.difflabel(iter, difflines):
599 for chunk, label in patch.difflabel(iter, difflines):
600 ui.write(chunk, label=label)
600 ui.write(chunk, label=label)
601 if opts['stat']:
601 if opts['stat']:
602 for chunk, label in patch.diffstatui(difflines, width=width):
602 for chunk, label in patch.diffstatui(difflines, width=width):
603 ui.write(chunk, label=label)
603 ui.write(chunk, label=label)
604
604
605 def patchcmds(ui, repo, pats, opts):
605 def patchcmds(ui, repo, pats, opts):
606 """subcommand that displays shelves"""
606 """subcommand that displays shelves"""
607 if len(pats) == 0:
607 if len(pats) == 0:
608 shelves = listshelves(repo)
608 shelves = listshelves(repo)
609 if not shelves:
609 if not shelves:
610 raise error.Abort(_("there are no shelves to show"))
610 raise error.Abort(_("there are no shelves to show"))
611 mtime, name = shelves[0]
611 mtime, name = shelves[0]
612 sname = util.split(name)[1]
612 sname = util.split(name)[1]
613 pats = [sname]
613 pats = [sname]
614
614
615 for shelfname in pats:
615 for shelfname in pats:
616 if not shelvedfile(repo, shelfname, patchextension).exists():
616 if not shelvedfile(repo, shelfname, patchextension).exists():
617 raise error.Abort(_("cannot find shelf %s") % shelfname)
617 raise error.Abort(_("cannot find shelf %s") % shelfname)
618
618
619 listcmd(ui, repo, pats, opts)
619 listcmd(ui, repo, pats, opts)
620
620
621 def checkparents(repo, state):
621 def checkparents(repo, state):
622 """check parent while resuming an unshelve"""
622 """check parent while resuming an unshelve"""
623 if state.parents != repo.dirstate.parents():
623 if state.parents != repo.dirstate.parents():
624 raise error.Abort(_('working directory parents do not match unshelve '
624 raise error.Abort(_('working directory parents do not match unshelve '
625 'state'))
625 'state'))
626
626
627 def unshelveabort(ui, repo, state, opts):
627 def unshelveabort(ui, repo, state, opts):
628 """subcommand that abort an in-progress unshelve"""
628 """subcommand that abort an in-progress unshelve"""
629 with repo.lock():
629 with repo.lock():
630 try:
630 try:
631 checkparents(repo, state)
631 checkparents(repo, state)
632
632
633 merge.update(repo, state.pendingctx, branchmerge=False, force=True)
633 merge.update(repo, state.pendingctx, branchmerge=False, force=True)
634 if (state.activebookmark
634 if (state.activebookmark
635 and state.activebookmark in repo._bookmarks):
635 and state.activebookmark in repo._bookmarks):
636 bookmarks.activate(repo, state.activebookmark)
636 bookmarks.activate(repo, state.activebookmark)
637 mergefiles(ui, repo, state.wctx, state.pendingctx)
637 mergefiles(ui, repo, state.wctx, state.pendingctx)
638 if not phases.supportinternal(repo):
638 if not phases.supportinternal(repo):
639 repair.strip(ui, repo, state.nodestoremove, backup=False,
639 repair.strip(ui, repo, state.nodestoremove, backup=False,
640 topic='shelve')
640 topic='shelve')
641 finally:
641 finally:
642 shelvedstate.clear(repo)
642 shelvedstate.clear(repo)
643 ui.warn(_("unshelve of '%s' aborted\n") % state.name)
643 ui.warn(_("unshelve of '%s' aborted\n") % state.name)
644
644
645 def mergefiles(ui, repo, wctx, shelvectx):
645 def mergefiles(ui, repo, wctx, shelvectx):
646 """updates to wctx and merges the changes from shelvectx into the
646 """updates to wctx and merges the changes from shelvectx into the
647 dirstate."""
647 dirstate."""
648 with ui.configoverride({('ui', 'quiet'): True}):
648 with ui.configoverride({('ui', 'quiet'): True}):
649 hg.update(repo, wctx.node())
649 hg.update(repo, wctx.node())
650 ui.pushbuffer(True)
650 ui.pushbuffer(True)
651 cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents())
651 cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents())
652 ui.popbuffer()
652 ui.popbuffer()
653
653
654 def restorebranch(ui, repo, branchtorestore):
654 def restorebranch(ui, repo, branchtorestore):
655 if branchtorestore and branchtorestore != repo.dirstate.branch():
655 if branchtorestore and branchtorestore != repo.dirstate.branch():
656 repo.dirstate.setbranch(branchtorestore)
656 repo.dirstate.setbranch(branchtorestore)
657 ui.status(_('marked working directory as branch %s\n')
657 ui.status(_('marked working directory as branch %s\n')
658 % branchtorestore)
658 % branchtorestore)
659
659
660 def unshelvecleanup(ui, repo, name, opts):
660 def unshelvecleanup(ui, repo, name, opts):
661 """remove related files after an unshelve"""
661 """remove related files after an unshelve"""
662 if not opts.get('keep'):
662 if not opts.get('keep'):
663 for filetype in shelvefileextensions:
663 for filetype in shelvefileextensions:
664 shfile = shelvedfile(repo, name, filetype)
664 shfile = shelvedfile(repo, name, filetype)
665 if shfile.exists():
665 if shfile.exists():
666 shfile.movetobackup()
666 shfile.movetobackup()
667 cleanupoldbackups(repo)
667 cleanupoldbackups(repo)
668
668
669 def unshelvecontinue(ui, repo, state, opts):
669 def unshelvecontinue(ui, repo, state, opts):
670 """subcommand to continue an in-progress unshelve"""
670 """subcommand to continue an in-progress unshelve"""
671 # We're finishing off a merge. First parent is our original
671 # We're finishing off a merge. First parent is our original
672 # parent, second is the temporary "fake" commit we're unshelving.
672 # parent, second is the temporary "fake" commit we're unshelving.
673 with repo.lock():
673 with repo.lock():
674 checkparents(repo, state)
674 checkparents(repo, state)
675 ms = merge.mergestate.read(repo)
675 ms = merge.mergestate.read(repo)
676 if list(ms.unresolved()):
676 if list(ms.unresolved()):
677 raise error.Abort(
677 raise error.Abort(
678 _("unresolved conflicts, can't continue"),
678 _("unresolved conflicts, can't continue"),
679 hint=_("see 'hg resolve', then 'hg unshelve --continue'"))
679 hint=_("see 'hg resolve', then 'hg unshelve --continue'"))
680
680
681 shelvectx = repo[state.parents[1]]
681 shelvectx = repo[state.parents[1]]
682 pendingctx = state.pendingctx
682 pendingctx = state.pendingctx
683
683
684 with repo.dirstate.parentchange():
684 with repo.dirstate.parentchange():
685 repo.setparents(state.pendingctx.node(), nodemod.nullid)
685 repo.setparents(state.pendingctx.node(), nodemod.nullid)
686 repo.dirstate.write(repo.currenttransaction())
686 repo.dirstate.write(repo.currenttransaction())
687
687
688 targetphase = phases.internal
688 targetphase = phases.internal
689 if not phases.supportinternal(repo):
689 if not phases.supportinternal(repo):
690 targetphase = phases.secret
690 targetphase = phases.secret
691 overrides = {('phases', 'new-commit'): targetphase}
691 overrides = {('phases', 'new-commit'): targetphase}
692 with repo.ui.configoverride(overrides, 'unshelve'):
692 with repo.ui.configoverride(overrides, 'unshelve'):
693 with repo.dirstate.parentchange():
693 with repo.dirstate.parentchange():
694 repo.setparents(state.parents[0], nodemod.nullid)
694 repo.setparents(state.parents[0], nodemod.nullid)
695 newnode = repo.commit(text=shelvectx.description(),
695 newnode = repo.commit(text=shelvectx.description(),
696 extra=shelvectx.extra(),
696 extra=shelvectx.extra(),
697 user=shelvectx.user(),
697 user=shelvectx.user(),
698 date=shelvectx.date())
698 date=shelvectx.date())
699
699
700 if newnode is None:
700 if newnode is None:
701 # If it ended up being a no-op commit, then the normal
701 # If it ended up being a no-op commit, then the normal
702 # merge state clean-up path doesn't happen, so do it
702 # merge state clean-up path doesn't happen, so do it
703 # here. Fix issue5494
703 # here. Fix issue5494
704 merge.mergestate.clean(repo)
704 merge.mergestate.clean(repo)
705 shelvectx = state.pendingctx
705 shelvectx = state.pendingctx
706 msg = _('note: unshelved changes already existed '
706 msg = _('note: unshelved changes already existed '
707 'in the working copy\n')
707 'in the working copy\n')
708 ui.status(msg)
708 ui.status(msg)
709 else:
709 else:
710 # only strip the shelvectx if we produced one
710 # only strip the shelvectx if we produced one
711 state.nodestoremove.append(newnode)
711 state.nodestoremove.append(newnode)
712 shelvectx = repo[newnode]
712 shelvectx = repo[newnode]
713
713
714 hg.updaterepo(repo, pendingctx.node(), overwrite=False)
714 hg.updaterepo(repo, pendingctx.node(), overwrite=False)
715 mergefiles(ui, repo, state.wctx, shelvectx)
715 mergefiles(ui, repo, state.wctx, shelvectx)
716 restorebranch(ui, repo, state.branchtorestore)
716 restorebranch(ui, repo, state.branchtorestore)
717
717
718 if not phases.supportinternal(repo):
718 if not phases.supportinternal(repo):
719 repair.strip(ui, repo, state.nodestoremove, backup=False,
719 repair.strip(ui, repo, state.nodestoremove, backup=False,
720 topic='shelve')
720 topic='shelve')
721 _restoreactivebookmark(repo, state.activebookmark)
721 _restoreactivebookmark(repo, state.activebookmark)
722 shelvedstate.clear(repo)
722 shelvedstate.clear(repo)
723 unshelvecleanup(ui, repo, state.name, opts)
723 unshelvecleanup(ui, repo, state.name, opts)
724 ui.status(_("unshelve of '%s' complete\n") % state.name)
724 ui.status(_("unshelve of '%s' complete\n") % state.name)
725
725
726 def _commitworkingcopychanges(ui, repo, opts, tmpwctx):
726 def _commitworkingcopychanges(ui, repo, opts, tmpwctx):
727 """Temporarily commit working copy changes before moving unshelve commit"""
727 """Temporarily commit working copy changes before moving unshelve commit"""
728 # Store pending changes in a commit and remember added in case a shelve
728 # Store pending changes in a commit and remember added in case a shelve
729 # contains unknown files that are part of the pending change
729 # contains unknown files that are part of the pending change
730 s = repo.status()
730 s = repo.status()
731 addedbefore = frozenset(s.added)
731 addedbefore = frozenset(s.added)
732 if not (s.modified or s.added or s.removed):
732 if not (s.modified or s.added or s.removed):
733 return tmpwctx, addedbefore
733 return tmpwctx, addedbefore
734 ui.status(_("temporarily committing pending changes "
734 ui.status(_("temporarily committing pending changes "
735 "(restore with 'hg unshelve --abort')\n"))
735 "(restore with 'hg unshelve --abort')\n"))
736 extra = {'internal': 'shelve'}
736 extra = {'internal': 'shelve'}
737 commitfunc = getcommitfunc(extra=extra, interactive=False,
737 commitfunc = getcommitfunc(extra=extra, interactive=False,
738 editor=False)
738 editor=False)
739 tempopts = {}
739 tempopts = {}
740 tempopts['message'] = "pending changes temporary commit"
740 tempopts['message'] = "pending changes temporary commit"
741 tempopts['date'] = opts.get('date')
741 tempopts['date'] = opts.get('date')
742 with ui.configoverride({('ui', 'quiet'): True}):
742 with ui.configoverride({('ui', 'quiet'): True}):
743 node = cmdutil.commit(ui, repo, commitfunc, [], tempopts)
743 node = cmdutil.commit(ui, repo, commitfunc, [], tempopts)
744 tmpwctx = repo[node]
744 tmpwctx = repo[node]
745 return tmpwctx, addedbefore
745 return tmpwctx, addedbefore
746
746
747 def _unshelverestorecommit(ui, repo, tr, basename):
747 def _unshelverestorecommit(ui, repo, tr, basename):
748 """Recreate commit in the repository during the unshelve"""
748 """Recreate commit in the repository during the unshelve"""
749 repo = repo.unfiltered()
749 repo = repo.unfiltered()
750 node = None
750 node = None
751 if shelvedfile(repo, basename, 'shelve').exists():
751 if shelvedfile(repo, basename, 'shelve').exists():
752 node = shelvedfile(repo, basename, 'shelve').readinfo()['node']
752 node = shelvedfile(repo, basename, 'shelve').readinfo()['node']
753 if node is None or node not in repo:
753 if node is None or node not in repo:
754 with ui.configoverride({('ui', 'quiet'): True}):
754 with ui.configoverride({('ui', 'quiet'): True}):
755 shelvectx = shelvedfile(repo, basename, 'hg').applybundle(tr)
755 shelvectx = shelvedfile(repo, basename, 'hg').applybundle(tr)
756 # We might not strip the unbundled changeset, so we should keep track of
756 # We might not strip the unbundled changeset, so we should keep track of
757 # the unshelve node in case we need to reuse it (eg: unshelve --keep)
757 # the unshelve node in case we need to reuse it (eg: unshelve --keep)
758 if node is None:
758 if node is None:
759 info = {'node': nodemod.hex(shelvectx.node())}
759 info = {'node': nodemod.hex(shelvectx.node())}
760 shelvedfile(repo, basename, 'shelve').writeinfo(info)
760 shelvedfile(repo, basename, 'shelve').writeinfo(info)
761 else:
761 else:
762 shelvectx = repo[node]
762 shelvectx = repo[node]
763
763
764 return repo, shelvectx
764 return repo, shelvectx
765
765
766 def _rebaserestoredcommit(ui, repo, opts, tr, oldtiprev, basename, pctx,
766 def _rebaserestoredcommit(ui, repo, opts, tr, oldtiprev, basename, pctx,
767 tmpwctx, shelvectx, branchtorestore,
767 tmpwctx, shelvectx, branchtorestore,
768 activebookmark):
768 activebookmark):
769 """Rebase restored commit from its original location to a destination"""
769 """Rebase restored commit from its original location to a destination"""
770 # If the shelve is not immediately on top of the commit
770 # If the shelve is not immediately on top of the commit
771 # we'll be merging with, rebase it to be on top.
771 # we'll be merging with, rebase it to be on top.
772 if tmpwctx.node() == shelvectx.p1().node():
772 if tmpwctx.node() == shelvectx.p1().node():
773 return shelvectx
773 return shelvectx
774
774
775 overrides = {
775 overrides = {
776 ('ui', 'forcemerge'): opts.get('tool', ''),
776 ('ui', 'forcemerge'): opts.get('tool', ''),
777 ('phases', 'new-commit'): phases.secret,
777 ('phases', 'new-commit'): phases.secret,
778 }
778 }
779 with repo.ui.configoverride(overrides, 'unshelve'):
779 with repo.ui.configoverride(overrides, 'unshelve'):
780 ui.status(_('rebasing shelved changes\n'))
780 ui.status(_('rebasing shelved changes\n'))
781 stats = merge.graft(repo, shelvectx, shelvectx.p1(),
781 stats = merge.graft(repo, shelvectx, shelvectx.p1(),
782 labels=['shelve', 'working-copy'],
782 labels=['shelve', 'working-copy'],
783 keepconflictparent=True)
783 keepconflictparent=True)
784 if stats.unresolvedcount:
784 if stats.unresolvedcount:
785 tr.close()
785 tr.close()
786
786
787 nodestoremove = [repo.changelog.node(rev)
787 nodestoremove = [repo.changelog.node(rev)
788 for rev in pycompat.xrange(oldtiprev, len(repo))]
788 for rev in pycompat.xrange(oldtiprev, len(repo))]
789 shelvedstate.save(repo, basename, pctx, tmpwctx, nodestoremove,
789 shelvedstate.save(repo, basename, pctx, tmpwctx, nodestoremove,
790 branchtorestore, opts.get('keep'), activebookmark)
790 branchtorestore, opts.get('keep'), activebookmark)
791 raise error.InterventionRequired(
791 raise error.InterventionRequired(
792 _("unresolved conflicts (see 'hg resolve', then "
792 _("unresolved conflicts (see 'hg resolve', then "
793 "'hg unshelve --continue')"))
793 "'hg unshelve --continue')"))
794
794
795 with repo.dirstate.parentchange():
795 with repo.dirstate.parentchange():
796 repo.setparents(tmpwctx.node(), nodemod.nullid)
796 repo.setparents(tmpwctx.node(), nodemod.nullid)
797 newnode = repo.commit(text=shelvectx.description(),
797 newnode = repo.commit(text=shelvectx.description(),
798 extra=shelvectx.extra(),
798 extra=shelvectx.extra(),
799 user=shelvectx.user(),
799 user=shelvectx.user(),
800 date=shelvectx.date())
800 date=shelvectx.date())
801
801
802 if newnode is None:
802 if newnode is None:
803 # If it ended up being a no-op commit, then the normal
803 # If it ended up being a no-op commit, then the normal
804 # merge state clean-up path doesn't happen, so do it
804 # merge state clean-up path doesn't happen, so do it
805 # here. Fix issue5494
805 # here. Fix issue5494
806 merge.mergestate.clean(repo)
806 merge.mergestate.clean(repo)
807 shelvectx = tmpwctx
807 shelvectx = tmpwctx
808 msg = _('note: unshelved changes already existed '
808 msg = _('note: unshelved changes already existed '
809 'in the working copy\n')
809 'in the working copy\n')
810 ui.status(msg)
810 ui.status(msg)
811 else:
811 else:
812 shelvectx = repo[newnode]
812 shelvectx = repo[newnode]
813 hg.updaterepo(repo, tmpwctx.node(), False)
813 hg.updaterepo(repo, tmpwctx.node(), False)
814
814
815 return shelvectx
815 return shelvectx
816
816
817 def _forgetunknownfiles(repo, shelvectx, addedbefore):
817 def _forgetunknownfiles(repo, shelvectx, addedbefore):
818 # Forget any files that were unknown before the shelve, unknown before
818 # Forget any files that were unknown before the shelve, unknown before
819 # unshelve started, but are now added.
819 # unshelve started, but are now added.
820 shelveunknown = shelvectx.extra().get('shelve_unknown')
820 shelveunknown = shelvectx.extra().get('shelve_unknown')
821 if not shelveunknown:
821 if not shelveunknown:
822 return
822 return
823 shelveunknown = frozenset(shelveunknown.split('\0'))
823 shelveunknown = frozenset(shelveunknown.split('\0'))
824 addedafter = frozenset(repo.status().added)
824 addedafter = frozenset(repo.status().added)
825 toforget = (addedafter & shelveunknown) - addedbefore
825 toforget = (addedafter & shelveunknown) - addedbefore
826 repo[None].forget(toforget)
826 repo[None].forget(toforget)
827
827
828 def _finishunshelve(repo, oldtiprev, tr, activebookmark):
828 def _finishunshelve(repo, oldtiprev, tr, activebookmark):
829 _restoreactivebookmark(repo, activebookmark)
829 _restoreactivebookmark(repo, activebookmark)
830 # The transaction aborting will strip all the commits for us,
830 # The transaction aborting will strip all the commits for us,
831 # but it doesn't update the inmemory structures, so addchangegroup
831 # but it doesn't update the inmemory structures, so addchangegroup
832 # hooks still fire and try to operate on the missing commits.
832 # hooks still fire and try to operate on the missing commits.
833 # Clean up manually to prevent this.
833 # Clean up manually to prevent this.
834 repo.unfiltered().changelog.strip(oldtiprev, tr)
834 repo.unfiltered().changelog.strip(oldtiprev, tr)
835 _aborttransaction(repo, tr)
835 _aborttransaction(repo, tr)
836
836
837 def _checkunshelveuntrackedproblems(ui, repo, shelvectx):
837 def _checkunshelveuntrackedproblems(ui, repo, shelvectx):
838 """Check potential problems which may result from working
838 """Check potential problems which may result from working
839 copy having untracked changes."""
839 copy having untracked changes."""
840 wcdeleted = set(repo.status().deleted)
840 wcdeleted = set(repo.status().deleted)
841 shelvetouched = set(shelvectx.files())
841 shelvetouched = set(shelvectx.files())
842 intersection = wcdeleted.intersection(shelvetouched)
842 intersection = wcdeleted.intersection(shelvetouched)
843 if intersection:
843 if intersection:
844 m = _("shelved change touches missing files")
844 m = _("shelved change touches missing files")
845 hint = _("run hg status to see which files are missing")
845 hint = _("run hg status to see which files are missing")
846 raise error.Abort(m, hint=hint)
846 raise error.Abort(m, hint=hint)
847
847
848 def _dounshelve(ui, repo, *shelved, **opts):
848 def dounshelve(ui, repo, *shelved, **opts):
849 opts = pycompat.byteskwargs(opts)
849 opts = pycompat.byteskwargs(opts)
850 abortf = opts.get('abort')
850 abortf = opts.get('abort')
851 continuef = opts.get('continue')
851 continuef = opts.get('continue')
852 if not abortf and not continuef:
852 if not abortf and not continuef:
853 cmdutil.checkunfinished(repo)
853 cmdutil.checkunfinished(repo)
854 shelved = list(shelved)
854 shelved = list(shelved)
855 if opts.get("name"):
855 if opts.get("name"):
856 shelved.append(opts["name"])
856 shelved.append(opts["name"])
857
857
858 if abortf or continuef:
858 if abortf or continuef:
859 if abortf and continuef:
859 if abortf and continuef:
860 raise error.Abort(_('cannot use both abort and continue'))
860 raise error.Abort(_('cannot use both abort and continue'))
861 if shelved:
861 if shelved:
862 raise error.Abort(_('cannot combine abort/continue with '
862 raise error.Abort(_('cannot combine abort/continue with '
863 'naming a shelved change'))
863 'naming a shelved change'))
864 if abortf and opts.get('tool', False):
864 if abortf and opts.get('tool', False):
865 ui.warn(_('tool option will be ignored\n'))
865 ui.warn(_('tool option will be ignored\n'))
866
866
867 try:
867 try:
868 state = shelvedstate.load(repo)
868 state = shelvedstate.load(repo)
869 if opts.get('keep') is None:
869 if opts.get('keep') is None:
870 opts['keep'] = state.keep
870 opts['keep'] = state.keep
871 except IOError as err:
871 except IOError as err:
872 if err.errno != errno.ENOENT:
872 if err.errno != errno.ENOENT:
873 raise
873 raise
874 cmdutil.wrongtooltocontinue(repo, _('unshelve'))
874 cmdutil.wrongtooltocontinue(repo, _('unshelve'))
875 except error.CorruptedState as err:
875 except error.CorruptedState as err:
876 ui.debug(pycompat.bytestr(err) + '\n')
876 ui.debug(pycompat.bytestr(err) + '\n')
877 if continuef:
877 if continuef:
878 msg = _('corrupted shelved state file')
878 msg = _('corrupted shelved state file')
879 hint = _('please run hg unshelve --abort to abort unshelve '
879 hint = _('please run hg unshelve --abort to abort unshelve '
880 'operation')
880 'operation')
881 raise error.Abort(msg, hint=hint)
881 raise error.Abort(msg, hint=hint)
882 elif abortf:
882 elif abortf:
883 msg = _('could not read shelved state file, your working copy '
883 msg = _('could not read shelved state file, your working copy '
884 'may be in an unexpected state\nplease update to some '
884 'may be in an unexpected state\nplease update to some '
885 'commit\n')
885 'commit\n')
886 ui.warn(msg)
886 ui.warn(msg)
887 shelvedstate.clear(repo)
887 shelvedstate.clear(repo)
888 return
888 return
889
889
890 if abortf:
890 if abortf:
891 return unshelveabort(ui, repo, state, opts)
891 return unshelveabort(ui, repo, state, opts)
892 elif continuef:
892 elif continuef:
893 return unshelvecontinue(ui, repo, state, opts)
893 return unshelvecontinue(ui, repo, state, opts)
894 elif len(shelved) > 1:
894 elif len(shelved) > 1:
895 raise error.Abort(_('can only unshelve one change at a time'))
895 raise error.Abort(_('can only unshelve one change at a time'))
896 elif not shelved:
896 elif not shelved:
897 shelved = listshelves(repo)
897 shelved = listshelves(repo)
898 if not shelved:
898 if not shelved:
899 raise error.Abort(_('no shelved changes to apply!'))
899 raise error.Abort(_('no shelved changes to apply!'))
900 basename = util.split(shelved[0][1])[1]
900 basename = util.split(shelved[0][1])[1]
901 ui.status(_("unshelving change '%s'\n") % basename)
901 ui.status(_("unshelving change '%s'\n") % basename)
902 else:
902 else:
903 basename = shelved[0]
903 basename = shelved[0]
904
904
905 if not shelvedfile(repo, basename, patchextension).exists():
905 if not shelvedfile(repo, basename, patchextension).exists():
906 raise error.Abort(_("shelved change '%s' not found") % basename)
906 raise error.Abort(_("shelved change '%s' not found") % basename)
907
907
908 repo = repo.unfiltered()
908 repo = repo.unfiltered()
909 lock = tr = None
909 lock = tr = None
910 try:
910 try:
911 lock = repo.lock()
911 lock = repo.lock()
912 tr = repo.transaction('unshelve', report=lambda x: None)
912 tr = repo.transaction('unshelve', report=lambda x: None)
913 oldtiprev = len(repo)
913 oldtiprev = len(repo)
914
914
915 pctx = repo['.']
915 pctx = repo['.']
916 tmpwctx = pctx
916 tmpwctx = pctx
917 # The goal is to have a commit structure like so:
917 # The goal is to have a commit structure like so:
918 # ...-> pctx -> tmpwctx -> shelvectx
918 # ...-> pctx -> tmpwctx -> shelvectx
919 # where tmpwctx is an optional commit with the user's pending changes
919 # where tmpwctx is an optional commit with the user's pending changes
920 # and shelvectx is the unshelved changes. Then we merge it all down
920 # and shelvectx is the unshelved changes. Then we merge it all down
921 # to the original pctx.
921 # to the original pctx.
922
922
923 activebookmark = _backupactivebookmark(repo)
923 activebookmark = _backupactivebookmark(repo)
924 tmpwctx, addedbefore = _commitworkingcopychanges(ui, repo, opts,
924 tmpwctx, addedbefore = _commitworkingcopychanges(ui, repo, opts,
925 tmpwctx)
925 tmpwctx)
926 repo, shelvectx = _unshelverestorecommit(ui, repo, tr, basename)
926 repo, shelvectx = _unshelverestorecommit(ui, repo, tr, basename)
927 _checkunshelveuntrackedproblems(ui, repo, shelvectx)
927 _checkunshelveuntrackedproblems(ui, repo, shelvectx)
928 branchtorestore = ''
928 branchtorestore = ''
929 if shelvectx.branch() != shelvectx.p1().branch():
929 if shelvectx.branch() != shelvectx.p1().branch():
930 branchtorestore = shelvectx.branch()
930 branchtorestore = shelvectx.branch()
931
931
932 shelvectx = _rebaserestoredcommit(ui, repo, opts, tr, oldtiprev,
932 shelvectx = _rebaserestoredcommit(ui, repo, opts, tr, oldtiprev,
933 basename, pctx, tmpwctx,
933 basename, pctx, tmpwctx,
934 shelvectx, branchtorestore,
934 shelvectx, branchtorestore,
935 activebookmark)
935 activebookmark)
936 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
936 overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
937 with ui.configoverride(overrides, 'unshelve'):
937 with ui.configoverride(overrides, 'unshelve'):
938 mergefiles(ui, repo, pctx, shelvectx)
938 mergefiles(ui, repo, pctx, shelvectx)
939 restorebranch(ui, repo, branchtorestore)
939 restorebranch(ui, repo, branchtorestore)
940 _forgetunknownfiles(repo, shelvectx, addedbefore)
940 _forgetunknownfiles(repo, shelvectx, addedbefore)
941
941
942 shelvedstate.clear(repo)
942 shelvedstate.clear(repo)
943 _finishunshelve(repo, oldtiprev, tr, activebookmark)
943 _finishunshelve(repo, oldtiprev, tr, activebookmark)
944 unshelvecleanup(ui, repo, basename, opts)
944 unshelvecleanup(ui, repo, basename, opts)
945 finally:
945 finally:
946 if tr:
946 if tr:
947 tr.release()
947 tr.release()
948 lockmod.release(lock)
948 lockmod.release(lock)
General Comments 0
You need to be logged in to leave comments. Login now