##// END OF EJS Templates
bundle: allow bundle command to use changegroup3 in tests...
Jun Wu -
r31831:1da9b2a4 default
parent child Browse files
Show More
@@ -1,5469 +1,5471 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
14
15 from .i18n import _
15 from .i18n import _
16 from .node import (
16 from .node import (
17 hex,
17 hex,
18 nullid,
18 nullid,
19 nullrev,
19 nullrev,
20 short,
20 short,
21 )
21 )
22 from . import (
22 from . import (
23 archival,
23 archival,
24 bookmarks,
24 bookmarks,
25 bundle2,
25 bundle2,
26 changegroup,
26 changegroup,
27 cmdutil,
27 cmdutil,
28 copies,
28 copies,
29 destutil,
29 destutil,
30 dirstateguard,
30 dirstateguard,
31 discovery,
31 discovery,
32 encoding,
32 encoding,
33 error,
33 error,
34 exchange,
34 exchange,
35 extensions,
35 extensions,
36 graphmod,
36 graphmod,
37 hbisect,
37 hbisect,
38 help,
38 help,
39 hg,
39 hg,
40 lock as lockmod,
40 lock as lockmod,
41 merge as mergemod,
41 merge as mergemod,
42 obsolete,
42 obsolete,
43 patch,
43 patch,
44 phases,
44 phases,
45 pycompat,
45 pycompat,
46 rcutil,
46 rcutil,
47 revsetlang,
47 revsetlang,
48 scmutil,
48 scmutil,
49 server,
49 server,
50 sshserver,
50 sshserver,
51 streamclone,
51 streamclone,
52 tags as tagsmod,
52 tags as tagsmod,
53 templatekw,
53 templatekw,
54 ui as uimod,
54 ui as uimod,
55 util,
55 util,
56 )
56 )
57
57
58 release = lockmod.release
58 release = lockmod.release
59
59
60 table = {}
60 table = {}
61
61
62 command = cmdutil.command(table)
62 command = cmdutil.command(table)
63
63
64 # label constants
64 # label constants
65 # until 3.5, bookmarks.current was the advertised name, not
65 # until 3.5, bookmarks.current was the advertised name, not
66 # bookmarks.active, so we must use both to avoid breaking old
66 # bookmarks.active, so we must use both to avoid breaking old
67 # custom styles
67 # custom styles
68 activebookmarklabel = 'bookmarks.active bookmarks.current'
68 activebookmarklabel = 'bookmarks.active bookmarks.current'
69
69
70 # common command options
70 # common command options
71
71
72 globalopts = [
72 globalopts = [
73 ('R', 'repository', '',
73 ('R', 'repository', '',
74 _('repository root directory or name of overlay bundle file'),
74 _('repository root directory or name of overlay bundle file'),
75 _('REPO')),
75 _('REPO')),
76 ('', 'cwd', '',
76 ('', 'cwd', '',
77 _('change working directory'), _('DIR')),
77 _('change working directory'), _('DIR')),
78 ('y', 'noninteractive', None,
78 ('y', 'noninteractive', None,
79 _('do not prompt, automatically pick the first choice for all prompts')),
79 _('do not prompt, automatically pick the first choice for all prompts')),
80 ('q', 'quiet', None, _('suppress output')),
80 ('q', 'quiet', None, _('suppress output')),
81 ('v', 'verbose', None, _('enable additional output')),
81 ('v', 'verbose', None, _('enable additional output')),
82 ('', 'color', '',
82 ('', 'color', '',
83 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
83 # i18n: 'always', 'auto', 'never', and 'debug' are keywords
84 # and should not be translated
84 # and should not be translated
85 _("when to colorize (boolean, always, auto, never, or debug)"),
85 _("when to colorize (boolean, always, auto, never, or debug)"),
86 _('TYPE')),
86 _('TYPE')),
87 ('', 'config', [],
87 ('', 'config', [],
88 _('set/override config option (use \'section.name=value\')'),
88 _('set/override config option (use \'section.name=value\')'),
89 _('CONFIG')),
89 _('CONFIG')),
90 ('', 'debug', None, _('enable debugging output')),
90 ('', 'debug', None, _('enable debugging output')),
91 ('', 'debugger', None, _('start debugger')),
91 ('', 'debugger', None, _('start debugger')),
92 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
92 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
93 _('ENCODE')),
93 _('ENCODE')),
94 ('', 'encodingmode', encoding.encodingmode,
94 ('', 'encodingmode', encoding.encodingmode,
95 _('set the charset encoding mode'), _('MODE')),
95 _('set the charset encoding mode'), _('MODE')),
96 ('', 'traceback', None, _('always print a traceback on exception')),
96 ('', 'traceback', None, _('always print a traceback on exception')),
97 ('', 'time', None, _('time how long the command takes')),
97 ('', 'time', None, _('time how long the command takes')),
98 ('', 'profile', None, _('print command execution profile')),
98 ('', 'profile', None, _('print command execution profile')),
99 ('', 'version', None, _('output version information and exit')),
99 ('', 'version', None, _('output version information and exit')),
100 ('h', 'help', None, _('display help and exit')),
100 ('h', 'help', None, _('display help and exit')),
101 ('', 'hidden', False, _('consider hidden changesets')),
101 ('', 'hidden', False, _('consider hidden changesets')),
102 ('', 'pager', 'auto',
102 ('', 'pager', 'auto',
103 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
103 _("when to paginate (boolean, always, auto, or never)"), _('TYPE')),
104 ]
104 ]
105
105
106 dryrunopts = [('n', 'dry-run', None,
106 dryrunopts = [('n', 'dry-run', None,
107 _('do not perform actions, just print output'))]
107 _('do not perform actions, just print output'))]
108
108
109 remoteopts = [
109 remoteopts = [
110 ('e', 'ssh', '',
110 ('e', 'ssh', '',
111 _('specify ssh command to use'), _('CMD')),
111 _('specify ssh command to use'), _('CMD')),
112 ('', 'remotecmd', '',
112 ('', 'remotecmd', '',
113 _('specify hg command to run on the remote side'), _('CMD')),
113 _('specify hg command to run on the remote side'), _('CMD')),
114 ('', 'insecure', None,
114 ('', 'insecure', None,
115 _('do not verify server certificate (ignoring web.cacerts config)')),
115 _('do not verify server certificate (ignoring web.cacerts config)')),
116 ]
116 ]
117
117
118 walkopts = [
118 walkopts = [
119 ('I', 'include', [],
119 ('I', 'include', [],
120 _('include names matching the given patterns'), _('PATTERN')),
120 _('include names matching the given patterns'), _('PATTERN')),
121 ('X', 'exclude', [],
121 ('X', 'exclude', [],
122 _('exclude names matching the given patterns'), _('PATTERN')),
122 _('exclude names matching the given patterns'), _('PATTERN')),
123 ]
123 ]
124
124
125 commitopts = [
125 commitopts = [
126 ('m', 'message', '',
126 ('m', 'message', '',
127 _('use text as commit message'), _('TEXT')),
127 _('use text as commit message'), _('TEXT')),
128 ('l', 'logfile', '',
128 ('l', 'logfile', '',
129 _('read commit message from file'), _('FILE')),
129 _('read commit message from file'), _('FILE')),
130 ]
130 ]
131
131
132 commitopts2 = [
132 commitopts2 = [
133 ('d', 'date', '',
133 ('d', 'date', '',
134 _('record the specified date as commit date'), _('DATE')),
134 _('record the specified date as commit date'), _('DATE')),
135 ('u', 'user', '',
135 ('u', 'user', '',
136 _('record the specified user as committer'), _('USER')),
136 _('record the specified user as committer'), _('USER')),
137 ]
137 ]
138
138
139 # hidden for now
139 # hidden for now
140 formatteropts = [
140 formatteropts = [
141 ('T', 'template', '',
141 ('T', 'template', '',
142 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
142 _('display with template (EXPERIMENTAL)'), _('TEMPLATE')),
143 ]
143 ]
144
144
145 templateopts = [
145 templateopts = [
146 ('', 'style', '',
146 ('', 'style', '',
147 _('display using template map file (DEPRECATED)'), _('STYLE')),
147 _('display using template map file (DEPRECATED)'), _('STYLE')),
148 ('T', 'template', '',
148 ('T', 'template', '',
149 _('display with template'), _('TEMPLATE')),
149 _('display with template'), _('TEMPLATE')),
150 ]
150 ]
151
151
152 logopts = [
152 logopts = [
153 ('p', 'patch', None, _('show patch')),
153 ('p', 'patch', None, _('show patch')),
154 ('g', 'git', None, _('use git extended diff format')),
154 ('g', 'git', None, _('use git extended diff format')),
155 ('l', 'limit', '',
155 ('l', 'limit', '',
156 _('limit number of changes displayed'), _('NUM')),
156 _('limit number of changes displayed'), _('NUM')),
157 ('M', 'no-merges', None, _('do not show merges')),
157 ('M', 'no-merges', None, _('do not show merges')),
158 ('', 'stat', None, _('output diffstat-style summary of changes')),
158 ('', 'stat', None, _('output diffstat-style summary of changes')),
159 ('G', 'graph', None, _("show the revision DAG")),
159 ('G', 'graph', None, _("show the revision DAG")),
160 ] + templateopts
160 ] + templateopts
161
161
162 diffopts = [
162 diffopts = [
163 ('a', 'text', None, _('treat all files as text')),
163 ('a', 'text', None, _('treat all files as text')),
164 ('g', 'git', None, _('use git extended diff format')),
164 ('g', 'git', None, _('use git extended diff format')),
165 ('', 'binary', None, _('generate binary diffs in git mode (default)')),
165 ('', 'binary', None, _('generate binary diffs in git mode (default)')),
166 ('', 'nodates', None, _('omit dates from diff headers'))
166 ('', 'nodates', None, _('omit dates from diff headers'))
167 ]
167 ]
168
168
169 diffwsopts = [
169 diffwsopts = [
170 ('w', 'ignore-all-space', None,
170 ('w', 'ignore-all-space', None,
171 _('ignore white space when comparing lines')),
171 _('ignore white space when comparing lines')),
172 ('b', 'ignore-space-change', None,
172 ('b', 'ignore-space-change', None,
173 _('ignore changes in the amount of white space')),
173 _('ignore changes in the amount of white space')),
174 ('B', 'ignore-blank-lines', None,
174 ('B', 'ignore-blank-lines', None,
175 _('ignore changes whose lines are all blank')),
175 _('ignore changes whose lines are all blank')),
176 ]
176 ]
177
177
178 diffopts2 = [
178 diffopts2 = [
179 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
179 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
180 ('p', 'show-function', None, _('show which function each change is in')),
180 ('p', 'show-function', None, _('show which function each change is in')),
181 ('', 'reverse', None, _('produce a diff that undoes the changes')),
181 ('', 'reverse', None, _('produce a diff that undoes the changes')),
182 ] + diffwsopts + [
182 ] + diffwsopts + [
183 ('U', 'unified', '',
183 ('U', 'unified', '',
184 _('number of lines of context to show'), _('NUM')),
184 _('number of lines of context to show'), _('NUM')),
185 ('', 'stat', None, _('output diffstat-style summary of changes')),
185 ('', 'stat', None, _('output diffstat-style summary of changes')),
186 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
186 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
187 ]
187 ]
188
188
189 mergetoolopts = [
189 mergetoolopts = [
190 ('t', 'tool', '', _('specify merge tool')),
190 ('t', 'tool', '', _('specify merge tool')),
191 ]
191 ]
192
192
193 similarityopts = [
193 similarityopts = [
194 ('s', 'similarity', '',
194 ('s', 'similarity', '',
195 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
195 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
196 ]
196 ]
197
197
198 subrepoopts = [
198 subrepoopts = [
199 ('S', 'subrepos', None,
199 ('S', 'subrepos', None,
200 _('recurse into subrepositories'))
200 _('recurse into subrepositories'))
201 ]
201 ]
202
202
203 debugrevlogopts = [
203 debugrevlogopts = [
204 ('c', 'changelog', False, _('open changelog')),
204 ('c', 'changelog', False, _('open changelog')),
205 ('m', 'manifest', False, _('open manifest')),
205 ('m', 'manifest', False, _('open manifest')),
206 ('', 'dir', '', _('open directory manifest')),
206 ('', 'dir', '', _('open directory manifest')),
207 ]
207 ]
208
208
209 # Commands start here, listed alphabetically
209 # Commands start here, listed alphabetically
210
210
211 @command('^add',
211 @command('^add',
212 walkopts + subrepoopts + dryrunopts,
212 walkopts + subrepoopts + dryrunopts,
213 _('[OPTION]... [FILE]...'),
213 _('[OPTION]... [FILE]...'),
214 inferrepo=True)
214 inferrepo=True)
215 def add(ui, repo, *pats, **opts):
215 def add(ui, repo, *pats, **opts):
216 """add the specified files on the next commit
216 """add the specified files on the next commit
217
217
218 Schedule files to be version controlled and added to the
218 Schedule files to be version controlled and added to the
219 repository.
219 repository.
220
220
221 The files will be added to the repository at the next commit. To
221 The files will be added to the repository at the next commit. To
222 undo an add before that, see :hg:`forget`.
222 undo an add before that, see :hg:`forget`.
223
223
224 If no names are given, add all files to the repository (except
224 If no names are given, add all files to the repository (except
225 files matching ``.hgignore``).
225 files matching ``.hgignore``).
226
226
227 .. container:: verbose
227 .. container:: verbose
228
228
229 Examples:
229 Examples:
230
230
231 - New (unknown) files are added
231 - New (unknown) files are added
232 automatically by :hg:`add`::
232 automatically by :hg:`add`::
233
233
234 $ ls
234 $ ls
235 foo.c
235 foo.c
236 $ hg status
236 $ hg status
237 ? foo.c
237 ? foo.c
238 $ hg add
238 $ hg add
239 adding foo.c
239 adding foo.c
240 $ hg status
240 $ hg status
241 A foo.c
241 A foo.c
242
242
243 - Specific files to be added can be specified::
243 - Specific files to be added can be specified::
244
244
245 $ ls
245 $ ls
246 bar.c foo.c
246 bar.c foo.c
247 $ hg status
247 $ hg status
248 ? bar.c
248 ? bar.c
249 ? foo.c
249 ? foo.c
250 $ hg add bar.c
250 $ hg add bar.c
251 $ hg status
251 $ hg status
252 A bar.c
252 A bar.c
253 ? foo.c
253 ? foo.c
254
254
255 Returns 0 if all files are successfully added.
255 Returns 0 if all files are successfully added.
256 """
256 """
257
257
258 m = scmutil.match(repo[None], pats, opts)
258 m = scmutil.match(repo[None], pats, opts)
259 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
259 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
260 return rejected and 1 or 0
260 return rejected and 1 or 0
261
261
262 @command('addremove',
262 @command('addremove',
263 similarityopts + subrepoopts + walkopts + dryrunopts,
263 similarityopts + subrepoopts + walkopts + dryrunopts,
264 _('[OPTION]... [FILE]...'),
264 _('[OPTION]... [FILE]...'),
265 inferrepo=True)
265 inferrepo=True)
266 def addremove(ui, repo, *pats, **opts):
266 def addremove(ui, repo, *pats, **opts):
267 """add all new files, delete all missing files
267 """add all new files, delete all missing files
268
268
269 Add all new files and remove all missing files from the
269 Add all new files and remove all missing files from the
270 repository.
270 repository.
271
271
272 Unless names are given, new files are ignored if they match any of
272 Unless names are given, new files are ignored if they match any of
273 the patterns in ``.hgignore``. As with add, these changes take
273 the patterns in ``.hgignore``. As with add, these changes take
274 effect at the next commit.
274 effect at the next commit.
275
275
276 Use the -s/--similarity option to detect renamed files. This
276 Use the -s/--similarity option to detect renamed files. This
277 option takes a percentage between 0 (disabled) and 100 (files must
277 option takes a percentage between 0 (disabled) and 100 (files must
278 be identical) as its parameter. With a parameter greater than 0,
278 be identical) as its parameter. With a parameter greater than 0,
279 this compares every removed file with every added file and records
279 this compares every removed file with every added file and records
280 those similar enough as renames. Detecting renamed files this way
280 those similar enough as renames. Detecting renamed files this way
281 can be expensive. After using this option, :hg:`status -C` can be
281 can be expensive. After using this option, :hg:`status -C` can be
282 used to check which files were identified as moved or renamed. If
282 used to check which files were identified as moved or renamed. If
283 not specified, -s/--similarity defaults to 100 and only renames of
283 not specified, -s/--similarity defaults to 100 and only renames of
284 identical files are detected.
284 identical files are detected.
285
285
286 .. container:: verbose
286 .. container:: verbose
287
287
288 Examples:
288 Examples:
289
289
290 - A number of files (bar.c and foo.c) are new,
290 - A number of files (bar.c and foo.c) are new,
291 while foobar.c has been removed (without using :hg:`remove`)
291 while foobar.c has been removed (without using :hg:`remove`)
292 from the repository::
292 from the repository::
293
293
294 $ ls
294 $ ls
295 bar.c foo.c
295 bar.c foo.c
296 $ hg status
296 $ hg status
297 ! foobar.c
297 ! foobar.c
298 ? bar.c
298 ? bar.c
299 ? foo.c
299 ? foo.c
300 $ hg addremove
300 $ hg addremove
301 adding bar.c
301 adding bar.c
302 adding foo.c
302 adding foo.c
303 removing foobar.c
303 removing foobar.c
304 $ hg status
304 $ hg status
305 A bar.c
305 A bar.c
306 A foo.c
306 A foo.c
307 R foobar.c
307 R foobar.c
308
308
309 - A file foobar.c was moved to foo.c without using :hg:`rename`.
309 - A file foobar.c was moved to foo.c without using :hg:`rename`.
310 Afterwards, it was edited slightly::
310 Afterwards, it was edited slightly::
311
311
312 $ ls
312 $ ls
313 foo.c
313 foo.c
314 $ hg status
314 $ hg status
315 ! foobar.c
315 ! foobar.c
316 ? foo.c
316 ? foo.c
317 $ hg addremove --similarity 90
317 $ hg addremove --similarity 90
318 removing foobar.c
318 removing foobar.c
319 adding foo.c
319 adding foo.c
320 recording removal of foobar.c as rename to foo.c (94% similar)
320 recording removal of foobar.c as rename to foo.c (94% similar)
321 $ hg status -C
321 $ hg status -C
322 A foo.c
322 A foo.c
323 foobar.c
323 foobar.c
324 R foobar.c
324 R foobar.c
325
325
326 Returns 0 if all files are successfully added.
326 Returns 0 if all files are successfully added.
327 """
327 """
328 try:
328 try:
329 sim = float(opts.get('similarity') or 100)
329 sim = float(opts.get('similarity') or 100)
330 except ValueError:
330 except ValueError:
331 raise error.Abort(_('similarity must be a number'))
331 raise error.Abort(_('similarity must be a number'))
332 if sim < 0 or sim > 100:
332 if sim < 0 or sim > 100:
333 raise error.Abort(_('similarity must be between 0 and 100'))
333 raise error.Abort(_('similarity must be between 0 and 100'))
334 matcher = scmutil.match(repo[None], pats, opts)
334 matcher = scmutil.match(repo[None], pats, opts)
335 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
335 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
336
336
337 @command('^annotate|blame',
337 @command('^annotate|blame',
338 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
338 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
339 ('', 'follow', None,
339 ('', 'follow', None,
340 _('follow copies/renames and list the filename (DEPRECATED)')),
340 _('follow copies/renames and list the filename (DEPRECATED)')),
341 ('', 'no-follow', None, _("don't follow copies and renames")),
341 ('', 'no-follow', None, _("don't follow copies and renames")),
342 ('a', 'text', None, _('treat all files as text')),
342 ('a', 'text', None, _('treat all files as text')),
343 ('u', 'user', None, _('list the author (long with -v)')),
343 ('u', 'user', None, _('list the author (long with -v)')),
344 ('f', 'file', None, _('list the filename')),
344 ('f', 'file', None, _('list the filename')),
345 ('d', 'date', None, _('list the date (short with -q)')),
345 ('d', 'date', None, _('list the date (short with -q)')),
346 ('n', 'number', None, _('list the revision number (default)')),
346 ('n', 'number', None, _('list the revision number (default)')),
347 ('c', 'changeset', None, _('list the changeset')),
347 ('c', 'changeset', None, _('list the changeset')),
348 ('l', 'line-number', None, _('show line number at the first appearance'))
348 ('l', 'line-number', None, _('show line number at the first appearance'))
349 ] + diffwsopts + walkopts + formatteropts,
349 ] + diffwsopts + walkopts + formatteropts,
350 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
350 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
351 inferrepo=True)
351 inferrepo=True)
352 def annotate(ui, repo, *pats, **opts):
352 def annotate(ui, repo, *pats, **opts):
353 """show changeset information by line for each file
353 """show changeset information by line for each file
354
354
355 List changes in files, showing the revision id responsible for
355 List changes in files, showing the revision id responsible for
356 each line.
356 each line.
357
357
358 This command is useful for discovering when a change was made and
358 This command is useful for discovering when a change was made and
359 by whom.
359 by whom.
360
360
361 If you include --file, --user, or --date, the revision number is
361 If you include --file, --user, or --date, the revision number is
362 suppressed unless you also include --number.
362 suppressed unless you also include --number.
363
363
364 Without the -a/--text option, annotate will avoid processing files
364 Without the -a/--text option, annotate will avoid processing files
365 it detects as binary. With -a, annotate will annotate the file
365 it detects as binary. With -a, annotate will annotate the file
366 anyway, although the results will probably be neither useful
366 anyway, although the results will probably be neither useful
367 nor desirable.
367 nor desirable.
368
368
369 Returns 0 on success.
369 Returns 0 on success.
370 """
370 """
371 if not pats:
371 if not pats:
372 raise error.Abort(_('at least one filename or pattern is required'))
372 raise error.Abort(_('at least one filename or pattern is required'))
373
373
374 if opts.get('follow'):
374 if opts.get('follow'):
375 # --follow is deprecated and now just an alias for -f/--file
375 # --follow is deprecated and now just an alias for -f/--file
376 # to mimic the behavior of Mercurial before version 1.5
376 # to mimic the behavior of Mercurial before version 1.5
377 opts['file'] = True
377 opts['file'] = True
378
378
379 ctx = scmutil.revsingle(repo, opts.get('rev'))
379 ctx = scmutil.revsingle(repo, opts.get('rev'))
380
380
381 fm = ui.formatter('annotate', opts)
381 fm = ui.formatter('annotate', opts)
382 if ui.quiet:
382 if ui.quiet:
383 datefunc = util.shortdate
383 datefunc = util.shortdate
384 else:
384 else:
385 datefunc = util.datestr
385 datefunc = util.datestr
386 if ctx.rev() is None:
386 if ctx.rev() is None:
387 def hexfn(node):
387 def hexfn(node):
388 if node is None:
388 if node is None:
389 return None
389 return None
390 else:
390 else:
391 return fm.hexfunc(node)
391 return fm.hexfunc(node)
392 if opts.get('changeset'):
392 if opts.get('changeset'):
393 # omit "+" suffix which is appended to node hex
393 # omit "+" suffix which is appended to node hex
394 def formatrev(rev):
394 def formatrev(rev):
395 if rev is None:
395 if rev is None:
396 return '%d' % ctx.p1().rev()
396 return '%d' % ctx.p1().rev()
397 else:
397 else:
398 return '%d' % rev
398 return '%d' % rev
399 else:
399 else:
400 def formatrev(rev):
400 def formatrev(rev):
401 if rev is None:
401 if rev is None:
402 return '%d+' % ctx.p1().rev()
402 return '%d+' % ctx.p1().rev()
403 else:
403 else:
404 return '%d ' % rev
404 return '%d ' % rev
405 def formathex(hex):
405 def formathex(hex):
406 if hex is None:
406 if hex is None:
407 return '%s+' % fm.hexfunc(ctx.p1().node())
407 return '%s+' % fm.hexfunc(ctx.p1().node())
408 else:
408 else:
409 return '%s ' % hex
409 return '%s ' % hex
410 else:
410 else:
411 hexfn = fm.hexfunc
411 hexfn = fm.hexfunc
412 formatrev = formathex = str
412 formatrev = formathex = str
413
413
414 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
414 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
415 ('number', ' ', lambda x: x[0].rev(), formatrev),
415 ('number', ' ', lambda x: x[0].rev(), formatrev),
416 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
416 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
417 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
417 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
418 ('file', ' ', lambda x: x[0].path(), str),
418 ('file', ' ', lambda x: x[0].path(), str),
419 ('line_number', ':', lambda x: x[1], str),
419 ('line_number', ':', lambda x: x[1], str),
420 ]
420 ]
421 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
421 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
422
422
423 if (not opts.get('user') and not opts.get('changeset')
423 if (not opts.get('user') and not opts.get('changeset')
424 and not opts.get('date') and not opts.get('file')):
424 and not opts.get('date') and not opts.get('file')):
425 opts['number'] = True
425 opts['number'] = True
426
426
427 linenumber = opts.get('line_number') is not None
427 linenumber = opts.get('line_number') is not None
428 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
428 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
429 raise error.Abort(_('at least one of -n/-c is required for -l'))
429 raise error.Abort(_('at least one of -n/-c is required for -l'))
430
430
431 ui.pager('annotate')
431 ui.pager('annotate')
432
432
433 if fm.isplain():
433 if fm.isplain():
434 def makefunc(get, fmt):
434 def makefunc(get, fmt):
435 return lambda x: fmt(get(x))
435 return lambda x: fmt(get(x))
436 else:
436 else:
437 def makefunc(get, fmt):
437 def makefunc(get, fmt):
438 return get
438 return get
439 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
439 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
440 if opts.get(op)]
440 if opts.get(op)]
441 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
441 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
442 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
442 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
443 if opts.get(op))
443 if opts.get(op))
444
444
445 def bad(x, y):
445 def bad(x, y):
446 raise error.Abort("%s: %s" % (x, y))
446 raise error.Abort("%s: %s" % (x, y))
447
447
448 m = scmutil.match(ctx, pats, opts, badfn=bad)
448 m = scmutil.match(ctx, pats, opts, badfn=bad)
449
449
450 follow = not opts.get('no_follow')
450 follow = not opts.get('no_follow')
451 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
451 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
452 whitespace=True)
452 whitespace=True)
453 for abs in ctx.walk(m):
453 for abs in ctx.walk(m):
454 fctx = ctx[abs]
454 fctx = ctx[abs]
455 if not opts.get('text') and util.binary(fctx.data()):
455 if not opts.get('text') and util.binary(fctx.data()):
456 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
456 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
457 continue
457 continue
458
458
459 lines = fctx.annotate(follow=follow, linenumber=linenumber,
459 lines = fctx.annotate(follow=follow, linenumber=linenumber,
460 diffopts=diffopts)
460 diffopts=diffopts)
461 if not lines:
461 if not lines:
462 continue
462 continue
463 formats = []
463 formats = []
464 pieces = []
464 pieces = []
465
465
466 for f, sep in funcmap:
466 for f, sep in funcmap:
467 l = [f(n) for n, dummy in lines]
467 l = [f(n) for n, dummy in lines]
468 if fm.isplain():
468 if fm.isplain():
469 sizes = [encoding.colwidth(x) for x in l]
469 sizes = [encoding.colwidth(x) for x in l]
470 ml = max(sizes)
470 ml = max(sizes)
471 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
471 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
472 else:
472 else:
473 formats.append(['%s' for x in l])
473 formats.append(['%s' for x in l])
474 pieces.append(l)
474 pieces.append(l)
475
475
476 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
476 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
477 fm.startitem()
477 fm.startitem()
478 fm.write(fields, "".join(f), *p)
478 fm.write(fields, "".join(f), *p)
479 fm.write('line', ": %s", l[1])
479 fm.write('line', ": %s", l[1])
480
480
481 if not lines[-1][1].endswith('\n'):
481 if not lines[-1][1].endswith('\n'):
482 fm.plain('\n')
482 fm.plain('\n')
483
483
484 fm.end()
484 fm.end()
485
485
486 @command('archive',
486 @command('archive',
487 [('', 'no-decode', None, _('do not pass files through decoders')),
487 [('', 'no-decode', None, _('do not pass files through decoders')),
488 ('p', 'prefix', '', _('directory prefix for files in archive'),
488 ('p', 'prefix', '', _('directory prefix for files in archive'),
489 _('PREFIX')),
489 _('PREFIX')),
490 ('r', 'rev', '', _('revision to distribute'), _('REV')),
490 ('r', 'rev', '', _('revision to distribute'), _('REV')),
491 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
491 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
492 ] + subrepoopts + walkopts,
492 ] + subrepoopts + walkopts,
493 _('[OPTION]... DEST'))
493 _('[OPTION]... DEST'))
494 def archive(ui, repo, dest, **opts):
494 def archive(ui, repo, dest, **opts):
495 '''create an unversioned archive of a repository revision
495 '''create an unversioned archive of a repository revision
496
496
497 By default, the revision used is the parent of the working
497 By default, the revision used is the parent of the working
498 directory; use -r/--rev to specify a different revision.
498 directory; use -r/--rev to specify a different revision.
499
499
500 The archive type is automatically detected based on file
500 The archive type is automatically detected based on file
501 extension (to override, use -t/--type).
501 extension (to override, use -t/--type).
502
502
503 .. container:: verbose
503 .. container:: verbose
504
504
505 Examples:
505 Examples:
506
506
507 - create a zip file containing the 1.0 release::
507 - create a zip file containing the 1.0 release::
508
508
509 hg archive -r 1.0 project-1.0.zip
509 hg archive -r 1.0 project-1.0.zip
510
510
511 - create a tarball excluding .hg files::
511 - create a tarball excluding .hg files::
512
512
513 hg archive project.tar.gz -X ".hg*"
513 hg archive project.tar.gz -X ".hg*"
514
514
515 Valid types are:
515 Valid types are:
516
516
517 :``files``: a directory full of files (default)
517 :``files``: a directory full of files (default)
518 :``tar``: tar archive, uncompressed
518 :``tar``: tar archive, uncompressed
519 :``tbz2``: tar archive, compressed using bzip2
519 :``tbz2``: tar archive, compressed using bzip2
520 :``tgz``: tar archive, compressed using gzip
520 :``tgz``: tar archive, compressed using gzip
521 :``uzip``: zip archive, uncompressed
521 :``uzip``: zip archive, uncompressed
522 :``zip``: zip archive, compressed using deflate
522 :``zip``: zip archive, compressed using deflate
523
523
524 The exact name of the destination archive or directory is given
524 The exact name of the destination archive or directory is given
525 using a format string; see :hg:`help export` for details.
525 using a format string; see :hg:`help export` for details.
526
526
527 Each member added to an archive file has a directory prefix
527 Each member added to an archive file has a directory prefix
528 prepended. Use -p/--prefix to specify a format string for the
528 prepended. Use -p/--prefix to specify a format string for the
529 prefix. The default is the basename of the archive, with suffixes
529 prefix. The default is the basename of the archive, with suffixes
530 removed.
530 removed.
531
531
532 Returns 0 on success.
532 Returns 0 on success.
533 '''
533 '''
534
534
535 ctx = scmutil.revsingle(repo, opts.get('rev'))
535 ctx = scmutil.revsingle(repo, opts.get('rev'))
536 if not ctx:
536 if not ctx:
537 raise error.Abort(_('no working directory: please specify a revision'))
537 raise error.Abort(_('no working directory: please specify a revision'))
538 node = ctx.node()
538 node = ctx.node()
539 dest = cmdutil.makefilename(repo, dest, node)
539 dest = cmdutil.makefilename(repo, dest, node)
540 if os.path.realpath(dest) == repo.root:
540 if os.path.realpath(dest) == repo.root:
541 raise error.Abort(_('repository root cannot be destination'))
541 raise error.Abort(_('repository root cannot be destination'))
542
542
543 kind = opts.get('type') or archival.guesskind(dest) or 'files'
543 kind = opts.get('type') or archival.guesskind(dest) or 'files'
544 prefix = opts.get('prefix')
544 prefix = opts.get('prefix')
545
545
546 if dest == '-':
546 if dest == '-':
547 if kind == 'files':
547 if kind == 'files':
548 raise error.Abort(_('cannot archive plain files to stdout'))
548 raise error.Abort(_('cannot archive plain files to stdout'))
549 dest = cmdutil.makefileobj(repo, dest)
549 dest = cmdutil.makefileobj(repo, dest)
550 if not prefix:
550 if not prefix:
551 prefix = os.path.basename(repo.root) + '-%h'
551 prefix = os.path.basename(repo.root) + '-%h'
552
552
553 prefix = cmdutil.makefilename(repo, prefix, node)
553 prefix = cmdutil.makefilename(repo, prefix, node)
554 matchfn = scmutil.match(ctx, [], opts)
554 matchfn = scmutil.match(ctx, [], opts)
555 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
555 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
556 matchfn, prefix, subrepos=opts.get('subrepos'))
556 matchfn, prefix, subrepos=opts.get('subrepos'))
557
557
558 @command('backout',
558 @command('backout',
559 [('', 'merge', None, _('merge with old dirstate parent after backout')),
559 [('', 'merge', None, _('merge with old dirstate parent after backout')),
560 ('', 'commit', None,
560 ('', 'commit', None,
561 _('commit if no conflicts were encountered (DEPRECATED)')),
561 _('commit if no conflicts were encountered (DEPRECATED)')),
562 ('', 'no-commit', None, _('do not commit')),
562 ('', 'no-commit', None, _('do not commit')),
563 ('', 'parent', '',
563 ('', 'parent', '',
564 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
564 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
565 ('r', 'rev', '', _('revision to backout'), _('REV')),
565 ('r', 'rev', '', _('revision to backout'), _('REV')),
566 ('e', 'edit', False, _('invoke editor on commit messages')),
566 ('e', 'edit', False, _('invoke editor on commit messages')),
567 ] + mergetoolopts + walkopts + commitopts + commitopts2,
567 ] + mergetoolopts + walkopts + commitopts + commitopts2,
568 _('[OPTION]... [-r] REV'))
568 _('[OPTION]... [-r] REV'))
569 def backout(ui, repo, node=None, rev=None, **opts):
569 def backout(ui, repo, node=None, rev=None, **opts):
570 '''reverse effect of earlier changeset
570 '''reverse effect of earlier changeset
571
571
572 Prepare a new changeset with the effect of REV undone in the
572 Prepare a new changeset with the effect of REV undone in the
573 current working directory. If no conflicts were encountered,
573 current working directory. If no conflicts were encountered,
574 it will be committed immediately.
574 it will be committed immediately.
575
575
576 If REV is the parent of the working directory, then this new changeset
576 If REV is the parent of the working directory, then this new changeset
577 is committed automatically (unless --no-commit is specified).
577 is committed automatically (unless --no-commit is specified).
578
578
579 .. note::
579 .. note::
580
580
581 :hg:`backout` cannot be used to fix either an unwanted or
581 :hg:`backout` cannot be used to fix either an unwanted or
582 incorrect merge.
582 incorrect merge.
583
583
584 .. container:: verbose
584 .. container:: verbose
585
585
586 Examples:
586 Examples:
587
587
588 - Reverse the effect of the parent of the working directory.
588 - Reverse the effect of the parent of the working directory.
589 This backout will be committed immediately::
589 This backout will be committed immediately::
590
590
591 hg backout -r .
591 hg backout -r .
592
592
593 - Reverse the effect of previous bad revision 23::
593 - Reverse the effect of previous bad revision 23::
594
594
595 hg backout -r 23
595 hg backout -r 23
596
596
597 - Reverse the effect of previous bad revision 23 and
597 - Reverse the effect of previous bad revision 23 and
598 leave changes uncommitted::
598 leave changes uncommitted::
599
599
600 hg backout -r 23 --no-commit
600 hg backout -r 23 --no-commit
601 hg commit -m "Backout revision 23"
601 hg commit -m "Backout revision 23"
602
602
603 By default, the pending changeset will have one parent,
603 By default, the pending changeset will have one parent,
604 maintaining a linear history. With --merge, the pending
604 maintaining a linear history. With --merge, the pending
605 changeset will instead have two parents: the old parent of the
605 changeset will instead have two parents: the old parent of the
606 working directory and a new child of REV that simply undoes REV.
606 working directory and a new child of REV that simply undoes REV.
607
607
608 Before version 1.7, the behavior without --merge was equivalent
608 Before version 1.7, the behavior without --merge was equivalent
609 to specifying --merge followed by :hg:`update --clean .` to
609 to specifying --merge followed by :hg:`update --clean .` to
610 cancel the merge and leave the child of REV as a head to be
610 cancel the merge and leave the child of REV as a head to be
611 merged separately.
611 merged separately.
612
612
613 See :hg:`help dates` for a list of formats valid for -d/--date.
613 See :hg:`help dates` for a list of formats valid for -d/--date.
614
614
615 See :hg:`help revert` for a way to restore files to the state
615 See :hg:`help revert` for a way to restore files to the state
616 of another revision.
616 of another revision.
617
617
618 Returns 0 on success, 1 if nothing to backout or there are unresolved
618 Returns 0 on success, 1 if nothing to backout or there are unresolved
619 files.
619 files.
620 '''
620 '''
621 wlock = lock = None
621 wlock = lock = None
622 try:
622 try:
623 wlock = repo.wlock()
623 wlock = repo.wlock()
624 lock = repo.lock()
624 lock = repo.lock()
625 return _dobackout(ui, repo, node, rev, **opts)
625 return _dobackout(ui, repo, node, rev, **opts)
626 finally:
626 finally:
627 release(lock, wlock)
627 release(lock, wlock)
628
628
629 def _dobackout(ui, repo, node=None, rev=None, **opts):
629 def _dobackout(ui, repo, node=None, rev=None, **opts):
630 if opts.get('commit') and opts.get('no_commit'):
630 if opts.get('commit') and opts.get('no_commit'):
631 raise error.Abort(_("cannot use --commit with --no-commit"))
631 raise error.Abort(_("cannot use --commit with --no-commit"))
632 if opts.get('merge') and opts.get('no_commit'):
632 if opts.get('merge') and opts.get('no_commit'):
633 raise error.Abort(_("cannot use --merge with --no-commit"))
633 raise error.Abort(_("cannot use --merge with --no-commit"))
634
634
635 if rev and node:
635 if rev and node:
636 raise error.Abort(_("please specify just one revision"))
636 raise error.Abort(_("please specify just one revision"))
637
637
638 if not rev:
638 if not rev:
639 rev = node
639 rev = node
640
640
641 if not rev:
641 if not rev:
642 raise error.Abort(_("please specify a revision to backout"))
642 raise error.Abort(_("please specify a revision to backout"))
643
643
644 date = opts.get('date')
644 date = opts.get('date')
645 if date:
645 if date:
646 opts['date'] = util.parsedate(date)
646 opts['date'] = util.parsedate(date)
647
647
648 cmdutil.checkunfinished(repo)
648 cmdutil.checkunfinished(repo)
649 cmdutil.bailifchanged(repo)
649 cmdutil.bailifchanged(repo)
650 node = scmutil.revsingle(repo, rev).node()
650 node = scmutil.revsingle(repo, rev).node()
651
651
652 op1, op2 = repo.dirstate.parents()
652 op1, op2 = repo.dirstate.parents()
653 if not repo.changelog.isancestor(node, op1):
653 if not repo.changelog.isancestor(node, op1):
654 raise error.Abort(_('cannot backout change that is not an ancestor'))
654 raise error.Abort(_('cannot backout change that is not an ancestor'))
655
655
656 p1, p2 = repo.changelog.parents(node)
656 p1, p2 = repo.changelog.parents(node)
657 if p1 == nullid:
657 if p1 == nullid:
658 raise error.Abort(_('cannot backout a change with no parents'))
658 raise error.Abort(_('cannot backout a change with no parents'))
659 if p2 != nullid:
659 if p2 != nullid:
660 if not opts.get('parent'):
660 if not opts.get('parent'):
661 raise error.Abort(_('cannot backout a merge changeset'))
661 raise error.Abort(_('cannot backout a merge changeset'))
662 p = repo.lookup(opts['parent'])
662 p = repo.lookup(opts['parent'])
663 if p not in (p1, p2):
663 if p not in (p1, p2):
664 raise error.Abort(_('%s is not a parent of %s') %
664 raise error.Abort(_('%s is not a parent of %s') %
665 (short(p), short(node)))
665 (short(p), short(node)))
666 parent = p
666 parent = p
667 else:
667 else:
668 if opts.get('parent'):
668 if opts.get('parent'):
669 raise error.Abort(_('cannot use --parent on non-merge changeset'))
669 raise error.Abort(_('cannot use --parent on non-merge changeset'))
670 parent = p1
670 parent = p1
671
671
672 # the backout should appear on the same branch
672 # the backout should appear on the same branch
673 branch = repo.dirstate.branch()
673 branch = repo.dirstate.branch()
674 bheads = repo.branchheads(branch)
674 bheads = repo.branchheads(branch)
675 rctx = scmutil.revsingle(repo, hex(parent))
675 rctx = scmutil.revsingle(repo, hex(parent))
676 if not opts.get('merge') and op1 != node:
676 if not opts.get('merge') and op1 != node:
677 dsguard = dirstateguard.dirstateguard(repo, 'backout')
677 dsguard = dirstateguard.dirstateguard(repo, 'backout')
678 try:
678 try:
679 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
679 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
680 'backout')
680 'backout')
681 stats = mergemod.update(repo, parent, True, True, node, False)
681 stats = mergemod.update(repo, parent, True, True, node, False)
682 repo.setparents(op1, op2)
682 repo.setparents(op1, op2)
683 dsguard.close()
683 dsguard.close()
684 hg._showstats(repo, stats)
684 hg._showstats(repo, stats)
685 if stats[3]:
685 if stats[3]:
686 repo.ui.status(_("use 'hg resolve' to retry unresolved "
686 repo.ui.status(_("use 'hg resolve' to retry unresolved "
687 "file merges\n"))
687 "file merges\n"))
688 return 1
688 return 1
689 finally:
689 finally:
690 ui.setconfig('ui', 'forcemerge', '', '')
690 ui.setconfig('ui', 'forcemerge', '', '')
691 lockmod.release(dsguard)
691 lockmod.release(dsguard)
692 else:
692 else:
693 hg.clean(repo, node, show_stats=False)
693 hg.clean(repo, node, show_stats=False)
694 repo.dirstate.setbranch(branch)
694 repo.dirstate.setbranch(branch)
695 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
695 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
696
696
697 if opts.get('no_commit'):
697 if opts.get('no_commit'):
698 msg = _("changeset %s backed out, "
698 msg = _("changeset %s backed out, "
699 "don't forget to commit.\n")
699 "don't forget to commit.\n")
700 ui.status(msg % short(node))
700 ui.status(msg % short(node))
701 return 0
701 return 0
702
702
703 def commitfunc(ui, repo, message, match, opts):
703 def commitfunc(ui, repo, message, match, opts):
704 editform = 'backout'
704 editform = 'backout'
705 e = cmdutil.getcommiteditor(editform=editform, **opts)
705 e = cmdutil.getcommiteditor(editform=editform, **opts)
706 if not message:
706 if not message:
707 # we don't translate commit messages
707 # we don't translate commit messages
708 message = "Backed out changeset %s" % short(node)
708 message = "Backed out changeset %s" % short(node)
709 e = cmdutil.getcommiteditor(edit=True, editform=editform)
709 e = cmdutil.getcommiteditor(edit=True, editform=editform)
710 return repo.commit(message, opts.get('user'), opts.get('date'),
710 return repo.commit(message, opts.get('user'), opts.get('date'),
711 match, editor=e)
711 match, editor=e)
712 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
712 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
713 if not newnode:
713 if not newnode:
714 ui.status(_("nothing changed\n"))
714 ui.status(_("nothing changed\n"))
715 return 1
715 return 1
716 cmdutil.commitstatus(repo, newnode, branch, bheads)
716 cmdutil.commitstatus(repo, newnode, branch, bheads)
717
717
718 def nice(node):
718 def nice(node):
719 return '%d:%s' % (repo.changelog.rev(node), short(node))
719 return '%d:%s' % (repo.changelog.rev(node), short(node))
720 ui.status(_('changeset %s backs out changeset %s\n') %
720 ui.status(_('changeset %s backs out changeset %s\n') %
721 (nice(repo.changelog.tip()), nice(node)))
721 (nice(repo.changelog.tip()), nice(node)))
722 if opts.get('merge') and op1 != node:
722 if opts.get('merge') and op1 != node:
723 hg.clean(repo, op1, show_stats=False)
723 hg.clean(repo, op1, show_stats=False)
724 ui.status(_('merging with changeset %s\n')
724 ui.status(_('merging with changeset %s\n')
725 % nice(repo.changelog.tip()))
725 % nice(repo.changelog.tip()))
726 try:
726 try:
727 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
727 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
728 'backout')
728 'backout')
729 return hg.merge(repo, hex(repo.changelog.tip()))
729 return hg.merge(repo, hex(repo.changelog.tip()))
730 finally:
730 finally:
731 ui.setconfig('ui', 'forcemerge', '', '')
731 ui.setconfig('ui', 'forcemerge', '', '')
732 return 0
732 return 0
733
733
734 @command('bisect',
734 @command('bisect',
735 [('r', 'reset', False, _('reset bisect state')),
735 [('r', 'reset', False, _('reset bisect state')),
736 ('g', 'good', False, _('mark changeset good')),
736 ('g', 'good', False, _('mark changeset good')),
737 ('b', 'bad', False, _('mark changeset bad')),
737 ('b', 'bad', False, _('mark changeset bad')),
738 ('s', 'skip', False, _('skip testing changeset')),
738 ('s', 'skip', False, _('skip testing changeset')),
739 ('e', 'extend', False, _('extend the bisect range')),
739 ('e', 'extend', False, _('extend the bisect range')),
740 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
740 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
741 ('U', 'noupdate', False, _('do not update to target'))],
741 ('U', 'noupdate', False, _('do not update to target'))],
742 _("[-gbsr] [-U] [-c CMD] [REV]"))
742 _("[-gbsr] [-U] [-c CMD] [REV]"))
743 def bisect(ui, repo, rev=None, extra=None, command=None,
743 def bisect(ui, repo, rev=None, extra=None, command=None,
744 reset=None, good=None, bad=None, skip=None, extend=None,
744 reset=None, good=None, bad=None, skip=None, extend=None,
745 noupdate=None):
745 noupdate=None):
746 """subdivision search of changesets
746 """subdivision search of changesets
747
747
748 This command helps to find changesets which introduce problems. To
748 This command helps to find changesets which introduce problems. To
749 use, mark the earliest changeset you know exhibits the problem as
749 use, mark the earliest changeset you know exhibits the problem as
750 bad, then mark the latest changeset which is free from the problem
750 bad, then mark the latest changeset which is free from the problem
751 as good. Bisect will update your working directory to a revision
751 as good. Bisect will update your working directory to a revision
752 for testing (unless the -U/--noupdate option is specified). Once
752 for testing (unless the -U/--noupdate option is specified). Once
753 you have performed tests, mark the working directory as good or
753 you have performed tests, mark the working directory as good or
754 bad, and bisect will either update to another candidate changeset
754 bad, and bisect will either update to another candidate changeset
755 or announce that it has found the bad revision.
755 or announce that it has found the bad revision.
756
756
757 As a shortcut, you can also use the revision argument to mark a
757 As a shortcut, you can also use the revision argument to mark a
758 revision as good or bad without checking it out first.
758 revision as good or bad without checking it out first.
759
759
760 If you supply a command, it will be used for automatic bisection.
760 If you supply a command, it will be used for automatic bisection.
761 The environment variable HG_NODE will contain the ID of the
761 The environment variable HG_NODE will contain the ID of the
762 changeset being tested. The exit status of the command will be
762 changeset being tested. The exit status of the command will be
763 used to mark revisions as good or bad: status 0 means good, 125
763 used to mark revisions as good or bad: status 0 means good, 125
764 means to skip the revision, 127 (command not found) will abort the
764 means to skip the revision, 127 (command not found) will abort the
765 bisection, and any other non-zero exit status means the revision
765 bisection, and any other non-zero exit status means the revision
766 is bad.
766 is bad.
767
767
768 .. container:: verbose
768 .. container:: verbose
769
769
770 Some examples:
770 Some examples:
771
771
772 - start a bisection with known bad revision 34, and good revision 12::
772 - start a bisection with known bad revision 34, and good revision 12::
773
773
774 hg bisect --bad 34
774 hg bisect --bad 34
775 hg bisect --good 12
775 hg bisect --good 12
776
776
777 - advance the current bisection by marking current revision as good or
777 - advance the current bisection by marking current revision as good or
778 bad::
778 bad::
779
779
780 hg bisect --good
780 hg bisect --good
781 hg bisect --bad
781 hg bisect --bad
782
782
783 - mark the current revision, or a known revision, to be skipped (e.g. if
783 - mark the current revision, or a known revision, to be skipped (e.g. if
784 that revision is not usable because of another issue)::
784 that revision is not usable because of another issue)::
785
785
786 hg bisect --skip
786 hg bisect --skip
787 hg bisect --skip 23
787 hg bisect --skip 23
788
788
789 - skip all revisions that do not touch directories ``foo`` or ``bar``::
789 - skip all revisions that do not touch directories ``foo`` or ``bar``::
790
790
791 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
791 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
792
792
793 - forget the current bisection::
793 - forget the current bisection::
794
794
795 hg bisect --reset
795 hg bisect --reset
796
796
797 - use 'make && make tests' to automatically find the first broken
797 - use 'make && make tests' to automatically find the first broken
798 revision::
798 revision::
799
799
800 hg bisect --reset
800 hg bisect --reset
801 hg bisect --bad 34
801 hg bisect --bad 34
802 hg bisect --good 12
802 hg bisect --good 12
803 hg bisect --command "make && make tests"
803 hg bisect --command "make && make tests"
804
804
805 - see all changesets whose states are already known in the current
805 - see all changesets whose states are already known in the current
806 bisection::
806 bisection::
807
807
808 hg log -r "bisect(pruned)"
808 hg log -r "bisect(pruned)"
809
809
810 - see the changeset currently being bisected (especially useful
810 - see the changeset currently being bisected (especially useful
811 if running with -U/--noupdate)::
811 if running with -U/--noupdate)::
812
812
813 hg log -r "bisect(current)"
813 hg log -r "bisect(current)"
814
814
815 - see all changesets that took part in the current bisection::
815 - see all changesets that took part in the current bisection::
816
816
817 hg log -r "bisect(range)"
817 hg log -r "bisect(range)"
818
818
819 - you can even get a nice graph::
819 - you can even get a nice graph::
820
820
821 hg log --graph -r "bisect(range)"
821 hg log --graph -r "bisect(range)"
822
822
823 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
823 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
824
824
825 Returns 0 on success.
825 Returns 0 on success.
826 """
826 """
827 # backward compatibility
827 # backward compatibility
828 if rev in "good bad reset init".split():
828 if rev in "good bad reset init".split():
829 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
829 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
830 cmd, rev, extra = rev, extra, None
830 cmd, rev, extra = rev, extra, None
831 if cmd == "good":
831 if cmd == "good":
832 good = True
832 good = True
833 elif cmd == "bad":
833 elif cmd == "bad":
834 bad = True
834 bad = True
835 else:
835 else:
836 reset = True
836 reset = True
837 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
837 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
838 raise error.Abort(_('incompatible arguments'))
838 raise error.Abort(_('incompatible arguments'))
839
839
840 cmdutil.checkunfinished(repo)
840 cmdutil.checkunfinished(repo)
841
841
842 if reset:
842 if reset:
843 hbisect.resetstate(repo)
843 hbisect.resetstate(repo)
844 return
844 return
845
845
846 state = hbisect.load_state(repo)
846 state = hbisect.load_state(repo)
847
847
848 # update state
848 # update state
849 if good or bad or skip:
849 if good or bad or skip:
850 if rev:
850 if rev:
851 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
851 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
852 else:
852 else:
853 nodes = [repo.lookup('.')]
853 nodes = [repo.lookup('.')]
854 if good:
854 if good:
855 state['good'] += nodes
855 state['good'] += nodes
856 elif bad:
856 elif bad:
857 state['bad'] += nodes
857 state['bad'] += nodes
858 elif skip:
858 elif skip:
859 state['skip'] += nodes
859 state['skip'] += nodes
860 hbisect.save_state(repo, state)
860 hbisect.save_state(repo, state)
861 if not (state['good'] and state['bad']):
861 if not (state['good'] and state['bad']):
862 return
862 return
863
863
864 def mayupdate(repo, node, show_stats=True):
864 def mayupdate(repo, node, show_stats=True):
865 """common used update sequence"""
865 """common used update sequence"""
866 if noupdate:
866 if noupdate:
867 return
867 return
868 cmdutil.bailifchanged(repo)
868 cmdutil.bailifchanged(repo)
869 return hg.clean(repo, node, show_stats=show_stats)
869 return hg.clean(repo, node, show_stats=show_stats)
870
870
871 displayer = cmdutil.show_changeset(ui, repo, {})
871 displayer = cmdutil.show_changeset(ui, repo, {})
872
872
873 if command:
873 if command:
874 changesets = 1
874 changesets = 1
875 if noupdate:
875 if noupdate:
876 try:
876 try:
877 node = state['current'][0]
877 node = state['current'][0]
878 except LookupError:
878 except LookupError:
879 raise error.Abort(_('current bisect revision is unknown - '
879 raise error.Abort(_('current bisect revision is unknown - '
880 'start a new bisect to fix'))
880 'start a new bisect to fix'))
881 else:
881 else:
882 node, p2 = repo.dirstate.parents()
882 node, p2 = repo.dirstate.parents()
883 if p2 != nullid:
883 if p2 != nullid:
884 raise error.Abort(_('current bisect revision is a merge'))
884 raise error.Abort(_('current bisect revision is a merge'))
885 if rev:
885 if rev:
886 node = repo[scmutil.revsingle(repo, rev, node)].node()
886 node = repo[scmutil.revsingle(repo, rev, node)].node()
887 try:
887 try:
888 while changesets:
888 while changesets:
889 # update state
889 # update state
890 state['current'] = [node]
890 state['current'] = [node]
891 hbisect.save_state(repo, state)
891 hbisect.save_state(repo, state)
892 status = ui.system(command, environ={'HG_NODE': hex(node)},
892 status = ui.system(command, environ={'HG_NODE': hex(node)},
893 blockedtag='bisect_check')
893 blockedtag='bisect_check')
894 if status == 125:
894 if status == 125:
895 transition = "skip"
895 transition = "skip"
896 elif status == 0:
896 elif status == 0:
897 transition = "good"
897 transition = "good"
898 # status < 0 means process was killed
898 # status < 0 means process was killed
899 elif status == 127:
899 elif status == 127:
900 raise error.Abort(_("failed to execute %s") % command)
900 raise error.Abort(_("failed to execute %s") % command)
901 elif status < 0:
901 elif status < 0:
902 raise error.Abort(_("%s killed") % command)
902 raise error.Abort(_("%s killed") % command)
903 else:
903 else:
904 transition = "bad"
904 transition = "bad"
905 state[transition].append(node)
905 state[transition].append(node)
906 ctx = repo[node]
906 ctx = repo[node]
907 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
907 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
908 hbisect.checkstate(state)
908 hbisect.checkstate(state)
909 # bisect
909 # bisect
910 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
910 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
911 # update to next check
911 # update to next check
912 node = nodes[0]
912 node = nodes[0]
913 mayupdate(repo, node, show_stats=False)
913 mayupdate(repo, node, show_stats=False)
914 finally:
914 finally:
915 state['current'] = [node]
915 state['current'] = [node]
916 hbisect.save_state(repo, state)
916 hbisect.save_state(repo, state)
917 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
917 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
918 return
918 return
919
919
920 hbisect.checkstate(state)
920 hbisect.checkstate(state)
921
921
922 # actually bisect
922 # actually bisect
923 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
923 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
924 if extend:
924 if extend:
925 if not changesets:
925 if not changesets:
926 extendnode = hbisect.extendrange(repo, state, nodes, good)
926 extendnode = hbisect.extendrange(repo, state, nodes, good)
927 if extendnode is not None:
927 if extendnode is not None:
928 ui.write(_("Extending search to changeset %d:%s\n")
928 ui.write(_("Extending search to changeset %d:%s\n")
929 % (extendnode.rev(), extendnode))
929 % (extendnode.rev(), extendnode))
930 state['current'] = [extendnode.node()]
930 state['current'] = [extendnode.node()]
931 hbisect.save_state(repo, state)
931 hbisect.save_state(repo, state)
932 return mayupdate(repo, extendnode.node())
932 return mayupdate(repo, extendnode.node())
933 raise error.Abort(_("nothing to extend"))
933 raise error.Abort(_("nothing to extend"))
934
934
935 if changesets == 0:
935 if changesets == 0:
936 hbisect.printresult(ui, repo, state, displayer, nodes, good)
936 hbisect.printresult(ui, repo, state, displayer, nodes, good)
937 else:
937 else:
938 assert len(nodes) == 1 # only a single node can be tested next
938 assert len(nodes) == 1 # only a single node can be tested next
939 node = nodes[0]
939 node = nodes[0]
940 # compute the approximate number of remaining tests
940 # compute the approximate number of remaining tests
941 tests, size = 0, 2
941 tests, size = 0, 2
942 while size <= changesets:
942 while size <= changesets:
943 tests, size = tests + 1, size * 2
943 tests, size = tests + 1, size * 2
944 rev = repo.changelog.rev(node)
944 rev = repo.changelog.rev(node)
945 ui.write(_("Testing changeset %d:%s "
945 ui.write(_("Testing changeset %d:%s "
946 "(%d changesets remaining, ~%d tests)\n")
946 "(%d changesets remaining, ~%d tests)\n")
947 % (rev, short(node), changesets, tests))
947 % (rev, short(node), changesets, tests))
948 state['current'] = [node]
948 state['current'] = [node]
949 hbisect.save_state(repo, state)
949 hbisect.save_state(repo, state)
950 return mayupdate(repo, node)
950 return mayupdate(repo, node)
951
951
952 @command('bookmarks|bookmark',
952 @command('bookmarks|bookmark',
953 [('f', 'force', False, _('force')),
953 [('f', 'force', False, _('force')),
954 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
954 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
955 ('d', 'delete', False, _('delete a given bookmark')),
955 ('d', 'delete', False, _('delete a given bookmark')),
956 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
956 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
957 ('i', 'inactive', False, _('mark a bookmark inactive')),
957 ('i', 'inactive', False, _('mark a bookmark inactive')),
958 ] + formatteropts,
958 ] + formatteropts,
959 _('hg bookmarks [OPTIONS]... [NAME]...'))
959 _('hg bookmarks [OPTIONS]... [NAME]...'))
960 def bookmark(ui, repo, *names, **opts):
960 def bookmark(ui, repo, *names, **opts):
961 '''create a new bookmark or list existing bookmarks
961 '''create a new bookmark or list existing bookmarks
962
962
963 Bookmarks are labels on changesets to help track lines of development.
963 Bookmarks are labels on changesets to help track lines of development.
964 Bookmarks are unversioned and can be moved, renamed and deleted.
964 Bookmarks are unversioned and can be moved, renamed and deleted.
965 Deleting or moving a bookmark has no effect on the associated changesets.
965 Deleting or moving a bookmark has no effect on the associated changesets.
966
966
967 Creating or updating to a bookmark causes it to be marked as 'active'.
967 Creating or updating to a bookmark causes it to be marked as 'active'.
968 The active bookmark is indicated with a '*'.
968 The active bookmark is indicated with a '*'.
969 When a commit is made, the active bookmark will advance to the new commit.
969 When a commit is made, the active bookmark will advance to the new commit.
970 A plain :hg:`update` will also advance an active bookmark, if possible.
970 A plain :hg:`update` will also advance an active bookmark, if possible.
971 Updating away from a bookmark will cause it to be deactivated.
971 Updating away from a bookmark will cause it to be deactivated.
972
972
973 Bookmarks can be pushed and pulled between repositories (see
973 Bookmarks can be pushed and pulled between repositories (see
974 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
974 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
975 diverged, a new 'divergent bookmark' of the form 'name@path' will
975 diverged, a new 'divergent bookmark' of the form 'name@path' will
976 be created. Using :hg:`merge` will resolve the divergence.
976 be created. Using :hg:`merge` will resolve the divergence.
977
977
978 A bookmark named '@' has the special property that :hg:`clone` will
978 A bookmark named '@' has the special property that :hg:`clone` will
979 check it out by default if it exists.
979 check it out by default if it exists.
980
980
981 .. container:: verbose
981 .. container:: verbose
982
982
983 Examples:
983 Examples:
984
984
985 - create an active bookmark for a new line of development::
985 - create an active bookmark for a new line of development::
986
986
987 hg book new-feature
987 hg book new-feature
988
988
989 - create an inactive bookmark as a place marker::
989 - create an inactive bookmark as a place marker::
990
990
991 hg book -i reviewed
991 hg book -i reviewed
992
992
993 - create an inactive bookmark on another changeset::
993 - create an inactive bookmark on another changeset::
994
994
995 hg book -r .^ tested
995 hg book -r .^ tested
996
996
997 - rename bookmark turkey to dinner::
997 - rename bookmark turkey to dinner::
998
998
999 hg book -m turkey dinner
999 hg book -m turkey dinner
1000
1000
1001 - move the '@' bookmark from another branch::
1001 - move the '@' bookmark from another branch::
1002
1002
1003 hg book -f @
1003 hg book -f @
1004 '''
1004 '''
1005 force = opts.get('force')
1005 force = opts.get('force')
1006 rev = opts.get('rev')
1006 rev = opts.get('rev')
1007 delete = opts.get('delete')
1007 delete = opts.get('delete')
1008 rename = opts.get('rename')
1008 rename = opts.get('rename')
1009 inactive = opts.get('inactive')
1009 inactive = opts.get('inactive')
1010
1010
1011 def checkformat(mark):
1011 def checkformat(mark):
1012 mark = mark.strip()
1012 mark = mark.strip()
1013 if not mark:
1013 if not mark:
1014 raise error.Abort(_("bookmark names cannot consist entirely of "
1014 raise error.Abort(_("bookmark names cannot consist entirely of "
1015 "whitespace"))
1015 "whitespace"))
1016 scmutil.checknewlabel(repo, mark, 'bookmark')
1016 scmutil.checknewlabel(repo, mark, 'bookmark')
1017 return mark
1017 return mark
1018
1018
1019 def checkconflict(repo, mark, cur, force=False, target=None):
1019 def checkconflict(repo, mark, cur, force=False, target=None):
1020 if mark in marks and not force:
1020 if mark in marks and not force:
1021 if target:
1021 if target:
1022 if marks[mark] == target and target == cur:
1022 if marks[mark] == target and target == cur:
1023 # re-activating a bookmark
1023 # re-activating a bookmark
1024 return
1024 return
1025 anc = repo.changelog.ancestors([repo[target].rev()])
1025 anc = repo.changelog.ancestors([repo[target].rev()])
1026 bmctx = repo[marks[mark]]
1026 bmctx = repo[marks[mark]]
1027 divs = [repo[b].node() for b in marks
1027 divs = [repo[b].node() for b in marks
1028 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1028 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1029
1029
1030 # allow resolving a single divergent bookmark even if moving
1030 # allow resolving a single divergent bookmark even if moving
1031 # the bookmark across branches when a revision is specified
1031 # the bookmark across branches when a revision is specified
1032 # that contains a divergent bookmark
1032 # that contains a divergent bookmark
1033 if bmctx.rev() not in anc and target in divs:
1033 if bmctx.rev() not in anc and target in divs:
1034 bookmarks.deletedivergent(repo, [target], mark)
1034 bookmarks.deletedivergent(repo, [target], mark)
1035 return
1035 return
1036
1036
1037 deletefrom = [b for b in divs
1037 deletefrom = [b for b in divs
1038 if repo[b].rev() in anc or b == target]
1038 if repo[b].rev() in anc or b == target]
1039 bookmarks.deletedivergent(repo, deletefrom, mark)
1039 bookmarks.deletedivergent(repo, deletefrom, mark)
1040 if bookmarks.validdest(repo, bmctx, repo[target]):
1040 if bookmarks.validdest(repo, bmctx, repo[target]):
1041 ui.status(_("moving bookmark '%s' forward from %s\n") %
1041 ui.status(_("moving bookmark '%s' forward from %s\n") %
1042 (mark, short(bmctx.node())))
1042 (mark, short(bmctx.node())))
1043 return
1043 return
1044 raise error.Abort(_("bookmark '%s' already exists "
1044 raise error.Abort(_("bookmark '%s' already exists "
1045 "(use -f to force)") % mark)
1045 "(use -f to force)") % mark)
1046 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1046 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1047 and not force):
1047 and not force):
1048 raise error.Abort(
1048 raise error.Abort(
1049 _("a bookmark cannot have the name of an existing branch"))
1049 _("a bookmark cannot have the name of an existing branch"))
1050
1050
1051 if delete and rename:
1051 if delete and rename:
1052 raise error.Abort(_("--delete and --rename are incompatible"))
1052 raise error.Abort(_("--delete and --rename are incompatible"))
1053 if delete and rev:
1053 if delete and rev:
1054 raise error.Abort(_("--rev is incompatible with --delete"))
1054 raise error.Abort(_("--rev is incompatible with --delete"))
1055 if rename and rev:
1055 if rename and rev:
1056 raise error.Abort(_("--rev is incompatible with --rename"))
1056 raise error.Abort(_("--rev is incompatible with --rename"))
1057 if not names and (delete or rev):
1057 if not names and (delete or rev):
1058 raise error.Abort(_("bookmark name required"))
1058 raise error.Abort(_("bookmark name required"))
1059
1059
1060 if delete or rename or names or inactive:
1060 if delete or rename or names or inactive:
1061 wlock = lock = tr = None
1061 wlock = lock = tr = None
1062 try:
1062 try:
1063 wlock = repo.wlock()
1063 wlock = repo.wlock()
1064 lock = repo.lock()
1064 lock = repo.lock()
1065 cur = repo.changectx('.').node()
1065 cur = repo.changectx('.').node()
1066 marks = repo._bookmarks
1066 marks = repo._bookmarks
1067 if delete:
1067 if delete:
1068 tr = repo.transaction('bookmark')
1068 tr = repo.transaction('bookmark')
1069 for mark in names:
1069 for mark in names:
1070 if mark not in marks:
1070 if mark not in marks:
1071 raise error.Abort(_("bookmark '%s' does not exist") %
1071 raise error.Abort(_("bookmark '%s' does not exist") %
1072 mark)
1072 mark)
1073 if mark == repo._activebookmark:
1073 if mark == repo._activebookmark:
1074 bookmarks.deactivate(repo)
1074 bookmarks.deactivate(repo)
1075 del marks[mark]
1075 del marks[mark]
1076
1076
1077 elif rename:
1077 elif rename:
1078 tr = repo.transaction('bookmark')
1078 tr = repo.transaction('bookmark')
1079 if not names:
1079 if not names:
1080 raise error.Abort(_("new bookmark name required"))
1080 raise error.Abort(_("new bookmark name required"))
1081 elif len(names) > 1:
1081 elif len(names) > 1:
1082 raise error.Abort(_("only one new bookmark name allowed"))
1082 raise error.Abort(_("only one new bookmark name allowed"))
1083 mark = checkformat(names[0])
1083 mark = checkformat(names[0])
1084 if rename not in marks:
1084 if rename not in marks:
1085 raise error.Abort(_("bookmark '%s' does not exist")
1085 raise error.Abort(_("bookmark '%s' does not exist")
1086 % rename)
1086 % rename)
1087 checkconflict(repo, mark, cur, force)
1087 checkconflict(repo, mark, cur, force)
1088 marks[mark] = marks[rename]
1088 marks[mark] = marks[rename]
1089 if repo._activebookmark == rename and not inactive:
1089 if repo._activebookmark == rename and not inactive:
1090 bookmarks.activate(repo, mark)
1090 bookmarks.activate(repo, mark)
1091 del marks[rename]
1091 del marks[rename]
1092 elif names:
1092 elif names:
1093 tr = repo.transaction('bookmark')
1093 tr = repo.transaction('bookmark')
1094 newact = None
1094 newact = None
1095 for mark in names:
1095 for mark in names:
1096 mark = checkformat(mark)
1096 mark = checkformat(mark)
1097 if newact is None:
1097 if newact is None:
1098 newact = mark
1098 newact = mark
1099 if inactive and mark == repo._activebookmark:
1099 if inactive and mark == repo._activebookmark:
1100 bookmarks.deactivate(repo)
1100 bookmarks.deactivate(repo)
1101 return
1101 return
1102 tgt = cur
1102 tgt = cur
1103 if rev:
1103 if rev:
1104 tgt = scmutil.revsingle(repo, rev).node()
1104 tgt = scmutil.revsingle(repo, rev).node()
1105 checkconflict(repo, mark, cur, force, tgt)
1105 checkconflict(repo, mark, cur, force, tgt)
1106 marks[mark] = tgt
1106 marks[mark] = tgt
1107 if not inactive and cur == marks[newact] and not rev:
1107 if not inactive and cur == marks[newact] and not rev:
1108 bookmarks.activate(repo, newact)
1108 bookmarks.activate(repo, newact)
1109 elif cur != tgt and newact == repo._activebookmark:
1109 elif cur != tgt and newact == repo._activebookmark:
1110 bookmarks.deactivate(repo)
1110 bookmarks.deactivate(repo)
1111 elif inactive:
1111 elif inactive:
1112 if len(marks) == 0:
1112 if len(marks) == 0:
1113 ui.status(_("no bookmarks set\n"))
1113 ui.status(_("no bookmarks set\n"))
1114 elif not repo._activebookmark:
1114 elif not repo._activebookmark:
1115 ui.status(_("no active bookmark\n"))
1115 ui.status(_("no active bookmark\n"))
1116 else:
1116 else:
1117 bookmarks.deactivate(repo)
1117 bookmarks.deactivate(repo)
1118 if tr is not None:
1118 if tr is not None:
1119 marks.recordchange(tr)
1119 marks.recordchange(tr)
1120 tr.close()
1120 tr.close()
1121 finally:
1121 finally:
1122 lockmod.release(tr, lock, wlock)
1122 lockmod.release(tr, lock, wlock)
1123 else: # show bookmarks
1123 else: # show bookmarks
1124 fm = ui.formatter('bookmarks', opts)
1124 fm = ui.formatter('bookmarks', opts)
1125 hexfn = fm.hexfunc
1125 hexfn = fm.hexfunc
1126 marks = repo._bookmarks
1126 marks = repo._bookmarks
1127 if len(marks) == 0 and fm.isplain():
1127 if len(marks) == 0 and fm.isplain():
1128 ui.status(_("no bookmarks set\n"))
1128 ui.status(_("no bookmarks set\n"))
1129 for bmark, n in sorted(marks.iteritems()):
1129 for bmark, n in sorted(marks.iteritems()):
1130 active = repo._activebookmark
1130 active = repo._activebookmark
1131 if bmark == active:
1131 if bmark == active:
1132 prefix, label = '*', activebookmarklabel
1132 prefix, label = '*', activebookmarklabel
1133 else:
1133 else:
1134 prefix, label = ' ', ''
1134 prefix, label = ' ', ''
1135
1135
1136 fm.startitem()
1136 fm.startitem()
1137 if not ui.quiet:
1137 if not ui.quiet:
1138 fm.plain(' %s ' % prefix, label=label)
1138 fm.plain(' %s ' % prefix, label=label)
1139 fm.write('bookmark', '%s', bmark, label=label)
1139 fm.write('bookmark', '%s', bmark, label=label)
1140 pad = " " * (25 - encoding.colwidth(bmark))
1140 pad = " " * (25 - encoding.colwidth(bmark))
1141 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1141 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1142 repo.changelog.rev(n), hexfn(n), label=label)
1142 repo.changelog.rev(n), hexfn(n), label=label)
1143 fm.data(active=(bmark == active))
1143 fm.data(active=(bmark == active))
1144 fm.plain('\n')
1144 fm.plain('\n')
1145 fm.end()
1145 fm.end()
1146
1146
1147 @command('branch',
1147 @command('branch',
1148 [('f', 'force', None,
1148 [('f', 'force', None,
1149 _('set branch name even if it shadows an existing branch')),
1149 _('set branch name even if it shadows an existing branch')),
1150 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1150 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1151 _('[-fC] [NAME]'))
1151 _('[-fC] [NAME]'))
1152 def branch(ui, repo, label=None, **opts):
1152 def branch(ui, repo, label=None, **opts):
1153 """set or show the current branch name
1153 """set or show the current branch name
1154
1154
1155 .. note::
1155 .. note::
1156
1156
1157 Branch names are permanent and global. Use :hg:`bookmark` to create a
1157 Branch names are permanent and global. Use :hg:`bookmark` to create a
1158 light-weight bookmark instead. See :hg:`help glossary` for more
1158 light-weight bookmark instead. See :hg:`help glossary` for more
1159 information about named branches and bookmarks.
1159 information about named branches and bookmarks.
1160
1160
1161 With no argument, show the current branch name. With one argument,
1161 With no argument, show the current branch name. With one argument,
1162 set the working directory branch name (the branch will not exist
1162 set the working directory branch name (the branch will not exist
1163 in the repository until the next commit). Standard practice
1163 in the repository until the next commit). Standard practice
1164 recommends that primary development take place on the 'default'
1164 recommends that primary development take place on the 'default'
1165 branch.
1165 branch.
1166
1166
1167 Unless -f/--force is specified, branch will not let you set a
1167 Unless -f/--force is specified, branch will not let you set a
1168 branch name that already exists.
1168 branch name that already exists.
1169
1169
1170 Use -C/--clean to reset the working directory branch to that of
1170 Use -C/--clean to reset the working directory branch to that of
1171 the parent of the working directory, negating a previous branch
1171 the parent of the working directory, negating a previous branch
1172 change.
1172 change.
1173
1173
1174 Use the command :hg:`update` to switch to an existing branch. Use
1174 Use the command :hg:`update` to switch to an existing branch. Use
1175 :hg:`commit --close-branch` to mark this branch head as closed.
1175 :hg:`commit --close-branch` to mark this branch head as closed.
1176 When all heads of a branch are closed, the branch will be
1176 When all heads of a branch are closed, the branch will be
1177 considered closed.
1177 considered closed.
1178
1178
1179 Returns 0 on success.
1179 Returns 0 on success.
1180 """
1180 """
1181 if label:
1181 if label:
1182 label = label.strip()
1182 label = label.strip()
1183
1183
1184 if not opts.get('clean') and not label:
1184 if not opts.get('clean') and not label:
1185 ui.write("%s\n" % repo.dirstate.branch())
1185 ui.write("%s\n" % repo.dirstate.branch())
1186 return
1186 return
1187
1187
1188 with repo.wlock():
1188 with repo.wlock():
1189 if opts.get('clean'):
1189 if opts.get('clean'):
1190 label = repo[None].p1().branch()
1190 label = repo[None].p1().branch()
1191 repo.dirstate.setbranch(label)
1191 repo.dirstate.setbranch(label)
1192 ui.status(_('reset working directory to branch %s\n') % label)
1192 ui.status(_('reset working directory to branch %s\n') % label)
1193 elif label:
1193 elif label:
1194 if not opts.get('force') and label in repo.branchmap():
1194 if not opts.get('force') and label in repo.branchmap():
1195 if label not in [p.branch() for p in repo[None].parents()]:
1195 if label not in [p.branch() for p in repo[None].parents()]:
1196 raise error.Abort(_('a branch of the same name already'
1196 raise error.Abort(_('a branch of the same name already'
1197 ' exists'),
1197 ' exists'),
1198 # i18n: "it" refers to an existing branch
1198 # i18n: "it" refers to an existing branch
1199 hint=_("use 'hg update' to switch to it"))
1199 hint=_("use 'hg update' to switch to it"))
1200 scmutil.checknewlabel(repo, label, 'branch')
1200 scmutil.checknewlabel(repo, label, 'branch')
1201 repo.dirstate.setbranch(label)
1201 repo.dirstate.setbranch(label)
1202 ui.status(_('marked working directory as branch %s\n') % label)
1202 ui.status(_('marked working directory as branch %s\n') % label)
1203
1203
1204 # find any open named branches aside from default
1204 # find any open named branches aside from default
1205 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1205 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1206 if n != "default" and not c]
1206 if n != "default" and not c]
1207 if not others:
1207 if not others:
1208 ui.status(_('(branches are permanent and global, '
1208 ui.status(_('(branches are permanent and global, '
1209 'did you want a bookmark?)\n'))
1209 'did you want a bookmark?)\n'))
1210
1210
1211 @command('branches',
1211 @command('branches',
1212 [('a', 'active', False,
1212 [('a', 'active', False,
1213 _('show only branches that have unmerged heads (DEPRECATED)')),
1213 _('show only branches that have unmerged heads (DEPRECATED)')),
1214 ('c', 'closed', False, _('show normal and closed branches')),
1214 ('c', 'closed', False, _('show normal and closed branches')),
1215 ] + formatteropts,
1215 ] + formatteropts,
1216 _('[-c]'))
1216 _('[-c]'))
1217 def branches(ui, repo, active=False, closed=False, **opts):
1217 def branches(ui, repo, active=False, closed=False, **opts):
1218 """list repository named branches
1218 """list repository named branches
1219
1219
1220 List the repository's named branches, indicating which ones are
1220 List the repository's named branches, indicating which ones are
1221 inactive. If -c/--closed is specified, also list branches which have
1221 inactive. If -c/--closed is specified, also list branches which have
1222 been marked closed (see :hg:`commit --close-branch`).
1222 been marked closed (see :hg:`commit --close-branch`).
1223
1223
1224 Use the command :hg:`update` to switch to an existing branch.
1224 Use the command :hg:`update` to switch to an existing branch.
1225
1225
1226 Returns 0.
1226 Returns 0.
1227 """
1227 """
1228
1228
1229 ui.pager('branches')
1229 ui.pager('branches')
1230 fm = ui.formatter('branches', opts)
1230 fm = ui.formatter('branches', opts)
1231 hexfunc = fm.hexfunc
1231 hexfunc = fm.hexfunc
1232
1232
1233 allheads = set(repo.heads())
1233 allheads = set(repo.heads())
1234 branches = []
1234 branches = []
1235 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1235 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1236 isactive = not isclosed and bool(set(heads) & allheads)
1236 isactive = not isclosed and bool(set(heads) & allheads)
1237 branches.append((tag, repo[tip], isactive, not isclosed))
1237 branches.append((tag, repo[tip], isactive, not isclosed))
1238 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1238 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1239 reverse=True)
1239 reverse=True)
1240
1240
1241 for tag, ctx, isactive, isopen in branches:
1241 for tag, ctx, isactive, isopen in branches:
1242 if active and not isactive:
1242 if active and not isactive:
1243 continue
1243 continue
1244 if isactive:
1244 if isactive:
1245 label = 'branches.active'
1245 label = 'branches.active'
1246 notice = ''
1246 notice = ''
1247 elif not isopen:
1247 elif not isopen:
1248 if not closed:
1248 if not closed:
1249 continue
1249 continue
1250 label = 'branches.closed'
1250 label = 'branches.closed'
1251 notice = _(' (closed)')
1251 notice = _(' (closed)')
1252 else:
1252 else:
1253 label = 'branches.inactive'
1253 label = 'branches.inactive'
1254 notice = _(' (inactive)')
1254 notice = _(' (inactive)')
1255 current = (tag == repo.dirstate.branch())
1255 current = (tag == repo.dirstate.branch())
1256 if current:
1256 if current:
1257 label = 'branches.current'
1257 label = 'branches.current'
1258
1258
1259 fm.startitem()
1259 fm.startitem()
1260 fm.write('branch', '%s', tag, label=label)
1260 fm.write('branch', '%s', tag, label=label)
1261 rev = ctx.rev()
1261 rev = ctx.rev()
1262 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1262 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1263 fmt = ' ' * padsize + ' %d:%s'
1263 fmt = ' ' * padsize + ' %d:%s'
1264 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1264 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1265 label='log.changeset changeset.%s' % ctx.phasestr())
1265 label='log.changeset changeset.%s' % ctx.phasestr())
1266 fm.context(ctx=ctx)
1266 fm.context(ctx=ctx)
1267 fm.data(active=isactive, closed=not isopen, current=current)
1267 fm.data(active=isactive, closed=not isopen, current=current)
1268 if not ui.quiet:
1268 if not ui.quiet:
1269 fm.plain(notice)
1269 fm.plain(notice)
1270 fm.plain('\n')
1270 fm.plain('\n')
1271 fm.end()
1271 fm.end()
1272
1272
1273 @command('bundle',
1273 @command('bundle',
1274 [('f', 'force', None, _('run even when the destination is unrelated')),
1274 [('f', 'force', None, _('run even when the destination is unrelated')),
1275 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1275 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1276 _('REV')),
1276 _('REV')),
1277 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1277 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1278 _('BRANCH')),
1278 _('BRANCH')),
1279 ('', 'base', [],
1279 ('', 'base', [],
1280 _('a base changeset assumed to be available at the destination'),
1280 _('a base changeset assumed to be available at the destination'),
1281 _('REV')),
1281 _('REV')),
1282 ('a', 'all', None, _('bundle all changesets in the repository')),
1282 ('a', 'all', None, _('bundle all changesets in the repository')),
1283 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1283 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1284 ] + remoteopts,
1284 ] + remoteopts,
1285 _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1285 _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1286 def bundle(ui, repo, fname, dest=None, **opts):
1286 def bundle(ui, repo, fname, dest=None, **opts):
1287 """create a bundle file
1287 """create a bundle file
1288
1288
1289 Generate a bundle file containing data to be added to a repository.
1289 Generate a bundle file containing data to be added to a repository.
1290
1290
1291 To create a bundle containing all changesets, use -a/--all
1291 To create a bundle containing all changesets, use -a/--all
1292 (or --base null). Otherwise, hg assumes the destination will have
1292 (or --base null). Otherwise, hg assumes the destination will have
1293 all the nodes you specify with --base parameters. Otherwise, hg
1293 all the nodes you specify with --base parameters. Otherwise, hg
1294 will assume the repository has all the nodes in destination, or
1294 will assume the repository has all the nodes in destination, or
1295 default-push/default if no destination is specified.
1295 default-push/default if no destination is specified.
1296
1296
1297 You can change bundle format with the -t/--type option. See
1297 You can change bundle format with the -t/--type option. See
1298 :hg:`help bundlespec` for documentation on this format. By default,
1298 :hg:`help bundlespec` for documentation on this format. By default,
1299 the most appropriate format is used and compression defaults to
1299 the most appropriate format is used and compression defaults to
1300 bzip2.
1300 bzip2.
1301
1301
1302 The bundle file can then be transferred using conventional means
1302 The bundle file can then be transferred using conventional means
1303 and applied to another repository with the unbundle or pull
1303 and applied to another repository with the unbundle or pull
1304 command. This is useful when direct push and pull are not
1304 command. This is useful when direct push and pull are not
1305 available or when exporting an entire repository is undesirable.
1305 available or when exporting an entire repository is undesirable.
1306
1306
1307 Applying bundles preserves all changeset contents including
1307 Applying bundles preserves all changeset contents including
1308 permissions, copy/rename information, and revision history.
1308 permissions, copy/rename information, and revision history.
1309
1309
1310 Returns 0 on success, 1 if no changes found.
1310 Returns 0 on success, 1 if no changes found.
1311 """
1311 """
1312 revs = None
1312 revs = None
1313 if 'rev' in opts:
1313 if 'rev' in opts:
1314 revstrings = opts['rev']
1314 revstrings = opts['rev']
1315 revs = scmutil.revrange(repo, revstrings)
1315 revs = scmutil.revrange(repo, revstrings)
1316 if revstrings and not revs:
1316 if revstrings and not revs:
1317 raise error.Abort(_('no commits to bundle'))
1317 raise error.Abort(_('no commits to bundle'))
1318
1318
1319 bundletype = opts.get('type', 'bzip2').lower()
1319 bundletype = opts.get('type', 'bzip2').lower()
1320 try:
1320 try:
1321 bcompression, cgversion, params = exchange.parsebundlespec(
1321 bcompression, cgversion, params = exchange.parsebundlespec(
1322 repo, bundletype, strict=False)
1322 repo, bundletype, strict=False)
1323 except error.UnsupportedBundleSpecification as e:
1323 except error.UnsupportedBundleSpecification as e:
1324 raise error.Abort(str(e),
1324 raise error.Abort(str(e),
1325 hint=_("see 'hg help bundlespec' for supported "
1325 hint=_("see 'hg help bundlespec' for supported "
1326 "values for --type"))
1326 "values for --type"))
1327
1327
1328 # Packed bundles are a pseudo bundle format for now.
1328 # Packed bundles are a pseudo bundle format for now.
1329 if cgversion == 's1':
1329 if cgversion == 's1':
1330 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1330 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1331 hint=_("use 'hg debugcreatestreamclonebundle'"))
1331 hint=_("use 'hg debugcreatestreamclonebundle'"))
1332
1332
1333 if opts.get('all'):
1333 if opts.get('all'):
1334 if dest:
1334 if dest:
1335 raise error.Abort(_("--all is incompatible with specifying "
1335 raise error.Abort(_("--all is incompatible with specifying "
1336 "a destination"))
1336 "a destination"))
1337 if opts.get('base'):
1337 if opts.get('base'):
1338 ui.warn(_("ignoring --base because --all was specified\n"))
1338 ui.warn(_("ignoring --base because --all was specified\n"))
1339 base = ['null']
1339 base = ['null']
1340 else:
1340 else:
1341 base = scmutil.revrange(repo, opts.get('base'))
1341 base = scmutil.revrange(repo, opts.get('base'))
1342 # TODO: get desired bundlecaps from command line.
1342 # TODO: get desired bundlecaps from command line.
1343 bundlecaps = None
1343 bundlecaps = None
1344 if cgversion not in changegroup.supportedoutgoingversions(repo):
1344 if cgversion not in changegroup.supportedoutgoingversions(repo):
1345 raise error.Abort(_("repository does not support bundle version %s") %
1345 raise error.Abort(_("repository does not support bundle version %s") %
1346 cgversion)
1346 cgversion)
1347
1347
1348 if base:
1348 if base:
1349 if dest:
1349 if dest:
1350 raise error.Abort(_("--base is incompatible with specifying "
1350 raise error.Abort(_("--base is incompatible with specifying "
1351 "a destination"))
1351 "a destination"))
1352 common = [repo.lookup(rev) for rev in base]
1352 common = [repo.lookup(rev) for rev in base]
1353 heads = revs and map(repo.lookup, revs) or None
1353 heads = revs and map(repo.lookup, revs) or None
1354 outgoing = discovery.outgoing(repo, common, heads)
1354 outgoing = discovery.outgoing(repo, common, heads)
1355 cg = changegroup.getchangegroup(repo, 'bundle', outgoing,
1355 cg = changegroup.getchangegroup(repo, 'bundle', outgoing,
1356 bundlecaps=bundlecaps,
1356 bundlecaps=bundlecaps,
1357 version=cgversion)
1357 version=cgversion)
1358 outgoing = None
1358 outgoing = None
1359 else:
1359 else:
1360 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1360 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1361 dest, branches = hg.parseurl(dest, opts.get('branch'))
1361 dest, branches = hg.parseurl(dest, opts.get('branch'))
1362 other = hg.peer(repo, opts, dest)
1362 other = hg.peer(repo, opts, dest)
1363 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1363 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1364 heads = revs and map(repo.lookup, revs) or revs
1364 heads = revs and map(repo.lookup, revs) or revs
1365 outgoing = discovery.findcommonoutgoing(repo, other,
1365 outgoing = discovery.findcommonoutgoing(repo, other,
1366 onlyheads=heads,
1366 onlyheads=heads,
1367 force=opts.get('force'),
1367 force=opts.get('force'),
1368 portable=True)
1368 portable=True)
1369 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1369 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1370 bundlecaps, version=cgversion)
1370 bundlecaps, version=cgversion)
1371 if not cg:
1371 if not cg:
1372 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1372 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1373 return 1
1373 return 1
1374
1374
1375 if cgversion == '01': #bundle1
1375 if cgversion == '01': #bundle1
1376 if bcompression is None:
1376 if bcompression is None:
1377 bcompression = 'UN'
1377 bcompression = 'UN'
1378 bversion = 'HG10' + bcompression
1378 bversion = 'HG10' + bcompression
1379 bcompression = None
1379 bcompression = None
1380 elif cgversion in ('02', '03'):
1381 bversion = 'HG20'
1380 else:
1382 else:
1381 assert cgversion == '02'
1383 raise error.ProgrammingError(
1382 bversion = 'HG20'
1384 'bundle: unexpected changegroup version %s' % cgversion)
1383
1385
1384 # TODO compression options should be derived from bundlespec parsing.
1386 # TODO compression options should be derived from bundlespec parsing.
1385 # This is a temporary hack to allow adjusting bundle compression
1387 # This is a temporary hack to allow adjusting bundle compression
1386 # level without a) formalizing the bundlespec changes to declare it
1388 # level without a) formalizing the bundlespec changes to declare it
1387 # b) introducing a command flag.
1389 # b) introducing a command flag.
1388 compopts = {}
1390 compopts = {}
1389 complevel = ui.configint('experimental', 'bundlecomplevel')
1391 complevel = ui.configint('experimental', 'bundlecomplevel')
1390 if complevel is not None:
1392 if complevel is not None:
1391 compopts['level'] = complevel
1393 compopts['level'] = complevel
1392
1394
1393 bundle2.writebundle(ui, cg, fname, bversion, compression=bcompression,
1395 bundle2.writebundle(ui, cg, fname, bversion, compression=bcompression,
1394 compopts=compopts)
1396 compopts=compopts)
1395
1397
1396 @command('cat',
1398 @command('cat',
1397 [('o', 'output', '',
1399 [('o', 'output', '',
1398 _('print output to file with formatted name'), _('FORMAT')),
1400 _('print output to file with formatted name'), _('FORMAT')),
1399 ('r', 'rev', '', _('print the given revision'), _('REV')),
1401 ('r', 'rev', '', _('print the given revision'), _('REV')),
1400 ('', 'decode', None, _('apply any matching decode filter')),
1402 ('', 'decode', None, _('apply any matching decode filter')),
1401 ] + walkopts,
1403 ] + walkopts,
1402 _('[OPTION]... FILE...'),
1404 _('[OPTION]... FILE...'),
1403 inferrepo=True)
1405 inferrepo=True)
1404 def cat(ui, repo, file1, *pats, **opts):
1406 def cat(ui, repo, file1, *pats, **opts):
1405 """output the current or given revision of files
1407 """output the current or given revision of files
1406
1408
1407 Print the specified files as they were at the given revision. If
1409 Print the specified files as they were at the given revision. If
1408 no revision is given, the parent of the working directory is used.
1410 no revision is given, the parent of the working directory is used.
1409
1411
1410 Output may be to a file, in which case the name of the file is
1412 Output may be to a file, in which case the name of the file is
1411 given using a format string. The formatting rules as follows:
1413 given using a format string. The formatting rules as follows:
1412
1414
1413 :``%%``: literal "%" character
1415 :``%%``: literal "%" character
1414 :``%s``: basename of file being printed
1416 :``%s``: basename of file being printed
1415 :``%d``: dirname of file being printed, or '.' if in repository root
1417 :``%d``: dirname of file being printed, or '.' if in repository root
1416 :``%p``: root-relative path name of file being printed
1418 :``%p``: root-relative path name of file being printed
1417 :``%H``: changeset hash (40 hexadecimal digits)
1419 :``%H``: changeset hash (40 hexadecimal digits)
1418 :``%R``: changeset revision number
1420 :``%R``: changeset revision number
1419 :``%h``: short-form changeset hash (12 hexadecimal digits)
1421 :``%h``: short-form changeset hash (12 hexadecimal digits)
1420 :``%r``: zero-padded changeset revision number
1422 :``%r``: zero-padded changeset revision number
1421 :``%b``: basename of the exporting repository
1423 :``%b``: basename of the exporting repository
1422
1424
1423 Returns 0 on success.
1425 Returns 0 on success.
1424 """
1426 """
1425 ctx = scmutil.revsingle(repo, opts.get('rev'))
1427 ctx = scmutil.revsingle(repo, opts.get('rev'))
1426 m = scmutil.match(ctx, (file1,) + pats, opts)
1428 m = scmutil.match(ctx, (file1,) + pats, opts)
1427
1429
1428 ui.pager('cat')
1430 ui.pager('cat')
1429 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1431 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1430
1432
1431 @command('^clone',
1433 @command('^clone',
1432 [('U', 'noupdate', None, _('the clone will include an empty working '
1434 [('U', 'noupdate', None, _('the clone will include an empty working '
1433 'directory (only a repository)')),
1435 'directory (only a repository)')),
1434 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1436 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1435 _('REV')),
1437 _('REV')),
1436 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1438 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1437 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1439 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1438 ('', 'pull', None, _('use pull protocol to copy metadata')),
1440 ('', 'pull', None, _('use pull protocol to copy metadata')),
1439 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1441 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1440 ] + remoteopts,
1442 ] + remoteopts,
1441 _('[OPTION]... SOURCE [DEST]'),
1443 _('[OPTION]... SOURCE [DEST]'),
1442 norepo=True)
1444 norepo=True)
1443 def clone(ui, source, dest=None, **opts):
1445 def clone(ui, source, dest=None, **opts):
1444 """make a copy of an existing repository
1446 """make a copy of an existing repository
1445
1447
1446 Create a copy of an existing repository in a new directory.
1448 Create a copy of an existing repository in a new directory.
1447
1449
1448 If no destination directory name is specified, it defaults to the
1450 If no destination directory name is specified, it defaults to the
1449 basename of the source.
1451 basename of the source.
1450
1452
1451 The location of the source is added to the new repository's
1453 The location of the source is added to the new repository's
1452 ``.hg/hgrc`` file, as the default to be used for future pulls.
1454 ``.hg/hgrc`` file, as the default to be used for future pulls.
1453
1455
1454 Only local paths and ``ssh://`` URLs are supported as
1456 Only local paths and ``ssh://`` URLs are supported as
1455 destinations. For ``ssh://`` destinations, no working directory or
1457 destinations. For ``ssh://`` destinations, no working directory or
1456 ``.hg/hgrc`` will be created on the remote side.
1458 ``.hg/hgrc`` will be created on the remote side.
1457
1459
1458 If the source repository has a bookmark called '@' set, that
1460 If the source repository has a bookmark called '@' set, that
1459 revision will be checked out in the new repository by default.
1461 revision will be checked out in the new repository by default.
1460
1462
1461 To check out a particular version, use -u/--update, or
1463 To check out a particular version, use -u/--update, or
1462 -U/--noupdate to create a clone with no working directory.
1464 -U/--noupdate to create a clone with no working directory.
1463
1465
1464 To pull only a subset of changesets, specify one or more revisions
1466 To pull only a subset of changesets, specify one or more revisions
1465 identifiers with -r/--rev or branches with -b/--branch. The
1467 identifiers with -r/--rev or branches with -b/--branch. The
1466 resulting clone will contain only the specified changesets and
1468 resulting clone will contain only the specified changesets and
1467 their ancestors. These options (or 'clone src#rev dest') imply
1469 their ancestors. These options (or 'clone src#rev dest') imply
1468 --pull, even for local source repositories.
1470 --pull, even for local source repositories.
1469
1471
1470 .. note::
1472 .. note::
1471
1473
1472 Specifying a tag will include the tagged changeset but not the
1474 Specifying a tag will include the tagged changeset but not the
1473 changeset containing the tag.
1475 changeset containing the tag.
1474
1476
1475 .. container:: verbose
1477 .. container:: verbose
1476
1478
1477 For efficiency, hardlinks are used for cloning whenever the
1479 For efficiency, hardlinks are used for cloning whenever the
1478 source and destination are on the same filesystem (note this
1480 source and destination are on the same filesystem (note this
1479 applies only to the repository data, not to the working
1481 applies only to the repository data, not to the working
1480 directory). Some filesystems, such as AFS, implement hardlinking
1482 directory). Some filesystems, such as AFS, implement hardlinking
1481 incorrectly, but do not report errors. In these cases, use the
1483 incorrectly, but do not report errors. In these cases, use the
1482 --pull option to avoid hardlinking.
1484 --pull option to avoid hardlinking.
1483
1485
1484 In some cases, you can clone repositories and the working
1486 In some cases, you can clone repositories and the working
1485 directory using full hardlinks with ::
1487 directory using full hardlinks with ::
1486
1488
1487 $ cp -al REPO REPOCLONE
1489 $ cp -al REPO REPOCLONE
1488
1490
1489 This is the fastest way to clone, but it is not always safe. The
1491 This is the fastest way to clone, but it is not always safe. The
1490 operation is not atomic (making sure REPO is not modified during
1492 operation is not atomic (making sure REPO is not modified during
1491 the operation is up to you) and you have to make sure your
1493 the operation is up to you) and you have to make sure your
1492 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1494 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1493 so). Also, this is not compatible with certain extensions that
1495 so). Also, this is not compatible with certain extensions that
1494 place their metadata under the .hg directory, such as mq.
1496 place their metadata under the .hg directory, such as mq.
1495
1497
1496 Mercurial will update the working directory to the first applicable
1498 Mercurial will update the working directory to the first applicable
1497 revision from this list:
1499 revision from this list:
1498
1500
1499 a) null if -U or the source repository has no changesets
1501 a) null if -U or the source repository has no changesets
1500 b) if -u . and the source repository is local, the first parent of
1502 b) if -u . and the source repository is local, the first parent of
1501 the source repository's working directory
1503 the source repository's working directory
1502 c) the changeset specified with -u (if a branch name, this means the
1504 c) the changeset specified with -u (if a branch name, this means the
1503 latest head of that branch)
1505 latest head of that branch)
1504 d) the changeset specified with -r
1506 d) the changeset specified with -r
1505 e) the tipmost head specified with -b
1507 e) the tipmost head specified with -b
1506 f) the tipmost head specified with the url#branch source syntax
1508 f) the tipmost head specified with the url#branch source syntax
1507 g) the revision marked with the '@' bookmark, if present
1509 g) the revision marked with the '@' bookmark, if present
1508 h) the tipmost head of the default branch
1510 h) the tipmost head of the default branch
1509 i) tip
1511 i) tip
1510
1512
1511 When cloning from servers that support it, Mercurial may fetch
1513 When cloning from servers that support it, Mercurial may fetch
1512 pre-generated data from a server-advertised URL. When this is done,
1514 pre-generated data from a server-advertised URL. When this is done,
1513 hooks operating on incoming changesets and changegroups may fire twice,
1515 hooks operating on incoming changesets and changegroups may fire twice,
1514 once for the bundle fetched from the URL and another for any additional
1516 once for the bundle fetched from the URL and another for any additional
1515 data not fetched from this URL. In addition, if an error occurs, the
1517 data not fetched from this URL. In addition, if an error occurs, the
1516 repository may be rolled back to a partial clone. This behavior may
1518 repository may be rolled back to a partial clone. This behavior may
1517 change in future releases. See :hg:`help -e clonebundles` for more.
1519 change in future releases. See :hg:`help -e clonebundles` for more.
1518
1520
1519 Examples:
1521 Examples:
1520
1522
1521 - clone a remote repository to a new directory named hg/::
1523 - clone a remote repository to a new directory named hg/::
1522
1524
1523 hg clone https://www.mercurial-scm.org/repo/hg/
1525 hg clone https://www.mercurial-scm.org/repo/hg/
1524
1526
1525 - create a lightweight local clone::
1527 - create a lightweight local clone::
1526
1528
1527 hg clone project/ project-feature/
1529 hg clone project/ project-feature/
1528
1530
1529 - clone from an absolute path on an ssh server (note double-slash)::
1531 - clone from an absolute path on an ssh server (note double-slash)::
1530
1532
1531 hg clone ssh://user@server//home/projects/alpha/
1533 hg clone ssh://user@server//home/projects/alpha/
1532
1534
1533 - do a high-speed clone over a LAN while checking out a
1535 - do a high-speed clone over a LAN while checking out a
1534 specified version::
1536 specified version::
1535
1537
1536 hg clone --uncompressed http://server/repo -u 1.5
1538 hg clone --uncompressed http://server/repo -u 1.5
1537
1539
1538 - create a repository without changesets after a particular revision::
1540 - create a repository without changesets after a particular revision::
1539
1541
1540 hg clone -r 04e544 experimental/ good/
1542 hg clone -r 04e544 experimental/ good/
1541
1543
1542 - clone (and track) a particular named branch::
1544 - clone (and track) a particular named branch::
1543
1545
1544 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1546 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1545
1547
1546 See :hg:`help urls` for details on specifying URLs.
1548 See :hg:`help urls` for details on specifying URLs.
1547
1549
1548 Returns 0 on success.
1550 Returns 0 on success.
1549 """
1551 """
1550 if opts.get('noupdate') and opts.get('updaterev'):
1552 if opts.get('noupdate') and opts.get('updaterev'):
1551 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1553 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1552
1554
1553 r = hg.clone(ui, opts, source, dest,
1555 r = hg.clone(ui, opts, source, dest,
1554 pull=opts.get('pull'),
1556 pull=opts.get('pull'),
1555 stream=opts.get('uncompressed'),
1557 stream=opts.get('uncompressed'),
1556 rev=opts.get('rev'),
1558 rev=opts.get('rev'),
1557 update=opts.get('updaterev') or not opts.get('noupdate'),
1559 update=opts.get('updaterev') or not opts.get('noupdate'),
1558 branch=opts.get('branch'),
1560 branch=opts.get('branch'),
1559 shareopts=opts.get('shareopts'))
1561 shareopts=opts.get('shareopts'))
1560
1562
1561 return r is None
1563 return r is None
1562
1564
1563 @command('^commit|ci',
1565 @command('^commit|ci',
1564 [('A', 'addremove', None,
1566 [('A', 'addremove', None,
1565 _('mark new/missing files as added/removed before committing')),
1567 _('mark new/missing files as added/removed before committing')),
1566 ('', 'close-branch', None,
1568 ('', 'close-branch', None,
1567 _('mark a branch head as closed')),
1569 _('mark a branch head as closed')),
1568 ('', 'amend', None, _('amend the parent of the working directory')),
1570 ('', 'amend', None, _('amend the parent of the working directory')),
1569 ('s', 'secret', None, _('use the secret phase for committing')),
1571 ('s', 'secret', None, _('use the secret phase for committing')),
1570 ('e', 'edit', None, _('invoke editor on commit messages')),
1572 ('e', 'edit', None, _('invoke editor on commit messages')),
1571 ('i', 'interactive', None, _('use interactive mode')),
1573 ('i', 'interactive', None, _('use interactive mode')),
1572 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1574 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1573 _('[OPTION]... [FILE]...'),
1575 _('[OPTION]... [FILE]...'),
1574 inferrepo=True)
1576 inferrepo=True)
1575 def commit(ui, repo, *pats, **opts):
1577 def commit(ui, repo, *pats, **opts):
1576 """commit the specified files or all outstanding changes
1578 """commit the specified files or all outstanding changes
1577
1579
1578 Commit changes to the given files into the repository. Unlike a
1580 Commit changes to the given files into the repository. Unlike a
1579 centralized SCM, this operation is a local operation. See
1581 centralized SCM, this operation is a local operation. See
1580 :hg:`push` for a way to actively distribute your changes.
1582 :hg:`push` for a way to actively distribute your changes.
1581
1583
1582 If a list of files is omitted, all changes reported by :hg:`status`
1584 If a list of files is omitted, all changes reported by :hg:`status`
1583 will be committed.
1585 will be committed.
1584
1586
1585 If you are committing the result of a merge, do not provide any
1587 If you are committing the result of a merge, do not provide any
1586 filenames or -I/-X filters.
1588 filenames or -I/-X filters.
1587
1589
1588 If no commit message is specified, Mercurial starts your
1590 If no commit message is specified, Mercurial starts your
1589 configured editor where you can enter a message. In case your
1591 configured editor where you can enter a message. In case your
1590 commit fails, you will find a backup of your message in
1592 commit fails, you will find a backup of your message in
1591 ``.hg/last-message.txt``.
1593 ``.hg/last-message.txt``.
1592
1594
1593 The --close-branch flag can be used to mark the current branch
1595 The --close-branch flag can be used to mark the current branch
1594 head closed. When all heads of a branch are closed, the branch
1596 head closed. When all heads of a branch are closed, the branch
1595 will be considered closed and no longer listed.
1597 will be considered closed and no longer listed.
1596
1598
1597 The --amend flag can be used to amend the parent of the
1599 The --amend flag can be used to amend the parent of the
1598 working directory with a new commit that contains the changes
1600 working directory with a new commit that contains the changes
1599 in the parent in addition to those currently reported by :hg:`status`,
1601 in the parent in addition to those currently reported by :hg:`status`,
1600 if there are any. The old commit is stored in a backup bundle in
1602 if there are any. The old commit is stored in a backup bundle in
1601 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1603 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1602 on how to restore it).
1604 on how to restore it).
1603
1605
1604 Message, user and date are taken from the amended commit unless
1606 Message, user and date are taken from the amended commit unless
1605 specified. When a message isn't specified on the command line,
1607 specified. When a message isn't specified on the command line,
1606 the editor will open with the message of the amended commit.
1608 the editor will open with the message of the amended commit.
1607
1609
1608 It is not possible to amend public changesets (see :hg:`help phases`)
1610 It is not possible to amend public changesets (see :hg:`help phases`)
1609 or changesets that have children.
1611 or changesets that have children.
1610
1612
1611 See :hg:`help dates` for a list of formats valid for -d/--date.
1613 See :hg:`help dates` for a list of formats valid for -d/--date.
1612
1614
1613 Returns 0 on success, 1 if nothing changed.
1615 Returns 0 on success, 1 if nothing changed.
1614
1616
1615 .. container:: verbose
1617 .. container:: verbose
1616
1618
1617 Examples:
1619 Examples:
1618
1620
1619 - commit all files ending in .py::
1621 - commit all files ending in .py::
1620
1622
1621 hg commit --include "set:**.py"
1623 hg commit --include "set:**.py"
1622
1624
1623 - commit all non-binary files::
1625 - commit all non-binary files::
1624
1626
1625 hg commit --exclude "set:binary()"
1627 hg commit --exclude "set:binary()"
1626
1628
1627 - amend the current commit and set the date to now::
1629 - amend the current commit and set the date to now::
1628
1630
1629 hg commit --amend --date now
1631 hg commit --amend --date now
1630 """
1632 """
1631 wlock = lock = None
1633 wlock = lock = None
1632 try:
1634 try:
1633 wlock = repo.wlock()
1635 wlock = repo.wlock()
1634 lock = repo.lock()
1636 lock = repo.lock()
1635 return _docommit(ui, repo, *pats, **opts)
1637 return _docommit(ui, repo, *pats, **opts)
1636 finally:
1638 finally:
1637 release(lock, wlock)
1639 release(lock, wlock)
1638
1640
1639 def _docommit(ui, repo, *pats, **opts):
1641 def _docommit(ui, repo, *pats, **opts):
1640 opts = pycompat.byteskwargs(opts)
1642 opts = pycompat.byteskwargs(opts)
1641 if opts.get('interactive'):
1643 if opts.get('interactive'):
1642 opts.pop('interactive')
1644 opts.pop('interactive')
1643 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1645 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1644 cmdutil.recordfilter, *pats,
1646 cmdutil.recordfilter, *pats,
1645 **pycompat.strkwargs(opts))
1647 **pycompat.strkwargs(opts))
1646 # ret can be 0 (no changes to record) or the value returned by
1648 # ret can be 0 (no changes to record) or the value returned by
1647 # commit(), 1 if nothing changed or None on success.
1649 # commit(), 1 if nothing changed or None on success.
1648 return 1 if ret == 0 else ret
1650 return 1 if ret == 0 else ret
1649
1651
1650 if opts.get('subrepos'):
1652 if opts.get('subrepos'):
1651 if opts.get('amend'):
1653 if opts.get('amend'):
1652 raise error.Abort(_('cannot amend with --subrepos'))
1654 raise error.Abort(_('cannot amend with --subrepos'))
1653 # Let --subrepos on the command line override config setting.
1655 # Let --subrepos on the command line override config setting.
1654 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1656 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1655
1657
1656 cmdutil.checkunfinished(repo, commit=True)
1658 cmdutil.checkunfinished(repo, commit=True)
1657
1659
1658 branch = repo[None].branch()
1660 branch = repo[None].branch()
1659 bheads = repo.branchheads(branch)
1661 bheads = repo.branchheads(branch)
1660
1662
1661 extra = {}
1663 extra = {}
1662 if opts.get('close_branch'):
1664 if opts.get('close_branch'):
1663 extra['close'] = 1
1665 extra['close'] = 1
1664
1666
1665 if not bheads:
1667 if not bheads:
1666 raise error.Abort(_('can only close branch heads'))
1668 raise error.Abort(_('can only close branch heads'))
1667 elif opts.get('amend'):
1669 elif opts.get('amend'):
1668 if repo[None].parents()[0].p1().branch() != branch and \
1670 if repo[None].parents()[0].p1().branch() != branch and \
1669 repo[None].parents()[0].p2().branch() != branch:
1671 repo[None].parents()[0].p2().branch() != branch:
1670 raise error.Abort(_('can only close branch heads'))
1672 raise error.Abort(_('can only close branch heads'))
1671
1673
1672 if opts.get('amend'):
1674 if opts.get('amend'):
1673 if ui.configbool('ui', 'commitsubrepos'):
1675 if ui.configbool('ui', 'commitsubrepos'):
1674 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1676 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1675
1677
1676 old = repo['.']
1678 old = repo['.']
1677 if not old.mutable():
1679 if not old.mutable():
1678 raise error.Abort(_('cannot amend public changesets'))
1680 raise error.Abort(_('cannot amend public changesets'))
1679 if len(repo[None].parents()) > 1:
1681 if len(repo[None].parents()) > 1:
1680 raise error.Abort(_('cannot amend while merging'))
1682 raise error.Abort(_('cannot amend while merging'))
1681 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1683 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1682 if not allowunstable and old.children():
1684 if not allowunstable and old.children():
1683 raise error.Abort(_('cannot amend changeset with children'))
1685 raise error.Abort(_('cannot amend changeset with children'))
1684
1686
1685 # Currently histedit gets confused if an amend happens while histedit
1687 # Currently histedit gets confused if an amend happens while histedit
1686 # is in progress. Since we have a checkunfinished command, we are
1688 # is in progress. Since we have a checkunfinished command, we are
1687 # temporarily honoring it.
1689 # temporarily honoring it.
1688 #
1690 #
1689 # Note: eventually this guard will be removed. Please do not expect
1691 # Note: eventually this guard will be removed. Please do not expect
1690 # this behavior to remain.
1692 # this behavior to remain.
1691 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1693 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1692 cmdutil.checkunfinished(repo)
1694 cmdutil.checkunfinished(repo)
1693
1695
1694 # commitfunc is used only for temporary amend commit by cmdutil.amend
1696 # commitfunc is used only for temporary amend commit by cmdutil.amend
1695 def commitfunc(ui, repo, message, match, opts):
1697 def commitfunc(ui, repo, message, match, opts):
1696 return repo.commit(message,
1698 return repo.commit(message,
1697 opts.get('user') or old.user(),
1699 opts.get('user') or old.user(),
1698 opts.get('date') or old.date(),
1700 opts.get('date') or old.date(),
1699 match,
1701 match,
1700 extra=extra)
1702 extra=extra)
1701
1703
1702 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1704 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1703 if node == old.node():
1705 if node == old.node():
1704 ui.status(_("nothing changed\n"))
1706 ui.status(_("nothing changed\n"))
1705 return 1
1707 return 1
1706 else:
1708 else:
1707 def commitfunc(ui, repo, message, match, opts):
1709 def commitfunc(ui, repo, message, match, opts):
1708 overrides = {}
1710 overrides = {}
1709 if opts.get('secret'):
1711 if opts.get('secret'):
1710 overrides[('phases', 'new-commit')] = 'secret'
1712 overrides[('phases', 'new-commit')] = 'secret'
1711
1713
1712 baseui = repo.baseui
1714 baseui = repo.baseui
1713 with baseui.configoverride(overrides, 'commit'):
1715 with baseui.configoverride(overrides, 'commit'):
1714 with ui.configoverride(overrides, 'commit'):
1716 with ui.configoverride(overrides, 'commit'):
1715 editform = cmdutil.mergeeditform(repo[None],
1717 editform = cmdutil.mergeeditform(repo[None],
1716 'commit.normal')
1718 'commit.normal')
1717 editor = cmdutil.getcommiteditor(
1719 editor = cmdutil.getcommiteditor(
1718 editform=editform, **pycompat.strkwargs(opts))
1720 editform=editform, **pycompat.strkwargs(opts))
1719 return repo.commit(message,
1721 return repo.commit(message,
1720 opts.get('user'),
1722 opts.get('user'),
1721 opts.get('date'),
1723 opts.get('date'),
1722 match,
1724 match,
1723 editor=editor,
1725 editor=editor,
1724 extra=extra)
1726 extra=extra)
1725
1727
1726 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1728 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1727
1729
1728 if not node:
1730 if not node:
1729 stat = cmdutil.postcommitstatus(repo, pats, opts)
1731 stat = cmdutil.postcommitstatus(repo, pats, opts)
1730 if stat[3]:
1732 if stat[3]:
1731 ui.status(_("nothing changed (%d missing files, see "
1733 ui.status(_("nothing changed (%d missing files, see "
1732 "'hg status')\n") % len(stat[3]))
1734 "'hg status')\n") % len(stat[3]))
1733 else:
1735 else:
1734 ui.status(_("nothing changed\n"))
1736 ui.status(_("nothing changed\n"))
1735 return 1
1737 return 1
1736
1738
1737 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1739 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1738
1740
1739 @command('config|showconfig|debugconfig',
1741 @command('config|showconfig|debugconfig',
1740 [('u', 'untrusted', None, _('show untrusted configuration options')),
1742 [('u', 'untrusted', None, _('show untrusted configuration options')),
1741 ('e', 'edit', None, _('edit user config')),
1743 ('e', 'edit', None, _('edit user config')),
1742 ('l', 'local', None, _('edit repository config')),
1744 ('l', 'local', None, _('edit repository config')),
1743 ('g', 'global', None, _('edit global config'))] + formatteropts,
1745 ('g', 'global', None, _('edit global config'))] + formatteropts,
1744 _('[-u] [NAME]...'),
1746 _('[-u] [NAME]...'),
1745 optionalrepo=True)
1747 optionalrepo=True)
1746 def config(ui, repo, *values, **opts):
1748 def config(ui, repo, *values, **opts):
1747 """show combined config settings from all hgrc files
1749 """show combined config settings from all hgrc files
1748
1750
1749 With no arguments, print names and values of all config items.
1751 With no arguments, print names and values of all config items.
1750
1752
1751 With one argument of the form section.name, print just the value
1753 With one argument of the form section.name, print just the value
1752 of that config item.
1754 of that config item.
1753
1755
1754 With multiple arguments, print names and values of all config
1756 With multiple arguments, print names and values of all config
1755 items with matching section names.
1757 items with matching section names.
1756
1758
1757 With --edit, start an editor on the user-level config file. With
1759 With --edit, start an editor on the user-level config file. With
1758 --global, edit the system-wide config file. With --local, edit the
1760 --global, edit the system-wide config file. With --local, edit the
1759 repository-level config file.
1761 repository-level config file.
1760
1762
1761 With --debug, the source (filename and line number) is printed
1763 With --debug, the source (filename and line number) is printed
1762 for each config item.
1764 for each config item.
1763
1765
1764 See :hg:`help config` for more information about config files.
1766 See :hg:`help config` for more information about config files.
1765
1767
1766 Returns 0 on success, 1 if NAME does not exist.
1768 Returns 0 on success, 1 if NAME does not exist.
1767
1769
1768 """
1770 """
1769
1771
1770 if opts.get('edit') or opts.get('local') or opts.get('global'):
1772 if opts.get('edit') or opts.get('local') or opts.get('global'):
1771 if opts.get('local') and opts.get('global'):
1773 if opts.get('local') and opts.get('global'):
1772 raise error.Abort(_("can't use --local and --global together"))
1774 raise error.Abort(_("can't use --local and --global together"))
1773
1775
1774 if opts.get('local'):
1776 if opts.get('local'):
1775 if not repo:
1777 if not repo:
1776 raise error.Abort(_("can't use --local outside a repository"))
1778 raise error.Abort(_("can't use --local outside a repository"))
1777 paths = [repo.vfs.join('hgrc')]
1779 paths = [repo.vfs.join('hgrc')]
1778 elif opts.get('global'):
1780 elif opts.get('global'):
1779 paths = rcutil.systemrcpath()
1781 paths = rcutil.systemrcpath()
1780 else:
1782 else:
1781 paths = rcutil.userrcpath()
1783 paths = rcutil.userrcpath()
1782
1784
1783 for f in paths:
1785 for f in paths:
1784 if os.path.exists(f):
1786 if os.path.exists(f):
1785 break
1787 break
1786 else:
1788 else:
1787 if opts.get('global'):
1789 if opts.get('global'):
1788 samplehgrc = uimod.samplehgrcs['global']
1790 samplehgrc = uimod.samplehgrcs['global']
1789 elif opts.get('local'):
1791 elif opts.get('local'):
1790 samplehgrc = uimod.samplehgrcs['local']
1792 samplehgrc = uimod.samplehgrcs['local']
1791 else:
1793 else:
1792 samplehgrc = uimod.samplehgrcs['user']
1794 samplehgrc = uimod.samplehgrcs['user']
1793
1795
1794 f = paths[0]
1796 f = paths[0]
1795 fp = open(f, "w")
1797 fp = open(f, "w")
1796 fp.write(samplehgrc)
1798 fp.write(samplehgrc)
1797 fp.close()
1799 fp.close()
1798
1800
1799 editor = ui.geteditor()
1801 editor = ui.geteditor()
1800 ui.system("%s \"%s\"" % (editor, f),
1802 ui.system("%s \"%s\"" % (editor, f),
1801 onerr=error.Abort, errprefix=_("edit failed"),
1803 onerr=error.Abort, errprefix=_("edit failed"),
1802 blockedtag='config_edit')
1804 blockedtag='config_edit')
1803 return
1805 return
1804 ui.pager('config')
1806 ui.pager('config')
1805 fm = ui.formatter('config', opts)
1807 fm = ui.formatter('config', opts)
1806 for t, f in rcutil.rccomponents():
1808 for t, f in rcutil.rccomponents():
1807 if t == 'path':
1809 if t == 'path':
1808 ui.debug('read config from: %s\n' % f)
1810 ui.debug('read config from: %s\n' % f)
1809 elif t == 'items':
1811 elif t == 'items':
1810 for section, name, value, source in f:
1812 for section, name, value, source in f:
1811 ui.debug('set config by: %s\n' % source)
1813 ui.debug('set config by: %s\n' % source)
1812 else:
1814 else:
1813 raise error.ProgrammingError('unknown rctype: %s' % t)
1815 raise error.ProgrammingError('unknown rctype: %s' % t)
1814 untrusted = bool(opts.get('untrusted'))
1816 untrusted = bool(opts.get('untrusted'))
1815 if values:
1817 if values:
1816 sections = [v for v in values if '.' not in v]
1818 sections = [v for v in values if '.' not in v]
1817 items = [v for v in values if '.' in v]
1819 items = [v for v in values if '.' in v]
1818 if len(items) > 1 or items and sections:
1820 if len(items) > 1 or items and sections:
1819 raise error.Abort(_('only one config item permitted'))
1821 raise error.Abort(_('only one config item permitted'))
1820 matched = False
1822 matched = False
1821 for section, name, value in ui.walkconfig(untrusted=untrusted):
1823 for section, name, value in ui.walkconfig(untrusted=untrusted):
1822 source = ui.configsource(section, name, untrusted)
1824 source = ui.configsource(section, name, untrusted)
1823 value = pycompat.bytestr(value)
1825 value = pycompat.bytestr(value)
1824 if fm.isplain():
1826 if fm.isplain():
1825 source = source or 'none'
1827 source = source or 'none'
1826 value = value.replace('\n', '\\n')
1828 value = value.replace('\n', '\\n')
1827 entryname = section + '.' + name
1829 entryname = section + '.' + name
1828 if values:
1830 if values:
1829 for v in values:
1831 for v in values:
1830 if v == section:
1832 if v == section:
1831 fm.startitem()
1833 fm.startitem()
1832 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1834 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1833 fm.write('name value', '%s=%s\n', entryname, value)
1835 fm.write('name value', '%s=%s\n', entryname, value)
1834 matched = True
1836 matched = True
1835 elif v == entryname:
1837 elif v == entryname:
1836 fm.startitem()
1838 fm.startitem()
1837 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1839 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1838 fm.write('value', '%s\n', value)
1840 fm.write('value', '%s\n', value)
1839 fm.data(name=entryname)
1841 fm.data(name=entryname)
1840 matched = True
1842 matched = True
1841 else:
1843 else:
1842 fm.startitem()
1844 fm.startitem()
1843 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1845 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1844 fm.write('name value', '%s=%s\n', entryname, value)
1846 fm.write('name value', '%s=%s\n', entryname, value)
1845 matched = True
1847 matched = True
1846 fm.end()
1848 fm.end()
1847 if matched:
1849 if matched:
1848 return 0
1850 return 0
1849 return 1
1851 return 1
1850
1852
1851 @command('copy|cp',
1853 @command('copy|cp',
1852 [('A', 'after', None, _('record a copy that has already occurred')),
1854 [('A', 'after', None, _('record a copy that has already occurred')),
1853 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1855 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1854 ] + walkopts + dryrunopts,
1856 ] + walkopts + dryrunopts,
1855 _('[OPTION]... [SOURCE]... DEST'))
1857 _('[OPTION]... [SOURCE]... DEST'))
1856 def copy(ui, repo, *pats, **opts):
1858 def copy(ui, repo, *pats, **opts):
1857 """mark files as copied for the next commit
1859 """mark files as copied for the next commit
1858
1860
1859 Mark dest as having copies of source files. If dest is a
1861 Mark dest as having copies of source files. If dest is a
1860 directory, copies are put in that directory. If dest is a file,
1862 directory, copies are put in that directory. If dest is a file,
1861 the source must be a single file.
1863 the source must be a single file.
1862
1864
1863 By default, this command copies the contents of files as they
1865 By default, this command copies the contents of files as they
1864 exist in the working directory. If invoked with -A/--after, the
1866 exist in the working directory. If invoked with -A/--after, the
1865 operation is recorded, but no copying is performed.
1867 operation is recorded, but no copying is performed.
1866
1868
1867 This command takes effect with the next commit. To undo a copy
1869 This command takes effect with the next commit. To undo a copy
1868 before that, see :hg:`revert`.
1870 before that, see :hg:`revert`.
1869
1871
1870 Returns 0 on success, 1 if errors are encountered.
1872 Returns 0 on success, 1 if errors are encountered.
1871 """
1873 """
1872 with repo.wlock(False):
1874 with repo.wlock(False):
1873 return cmdutil.copy(ui, repo, pats, opts)
1875 return cmdutil.copy(ui, repo, pats, opts)
1874
1876
1875 @command('^diff',
1877 @command('^diff',
1876 [('r', 'rev', [], _('revision'), _('REV')),
1878 [('r', 'rev', [], _('revision'), _('REV')),
1877 ('c', 'change', '', _('change made by revision'), _('REV'))
1879 ('c', 'change', '', _('change made by revision'), _('REV'))
1878 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1880 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1879 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1881 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1880 inferrepo=True)
1882 inferrepo=True)
1881 def diff(ui, repo, *pats, **opts):
1883 def diff(ui, repo, *pats, **opts):
1882 """diff repository (or selected files)
1884 """diff repository (or selected files)
1883
1885
1884 Show differences between revisions for the specified files.
1886 Show differences between revisions for the specified files.
1885
1887
1886 Differences between files are shown using the unified diff format.
1888 Differences between files are shown using the unified diff format.
1887
1889
1888 .. note::
1890 .. note::
1889
1891
1890 :hg:`diff` may generate unexpected results for merges, as it will
1892 :hg:`diff` may generate unexpected results for merges, as it will
1891 default to comparing against the working directory's first
1893 default to comparing against the working directory's first
1892 parent changeset if no revisions are specified.
1894 parent changeset if no revisions are specified.
1893
1895
1894 When two revision arguments are given, then changes are shown
1896 When two revision arguments are given, then changes are shown
1895 between those revisions. If only one revision is specified then
1897 between those revisions. If only one revision is specified then
1896 that revision is compared to the working directory, and, when no
1898 that revision is compared to the working directory, and, when no
1897 revisions are specified, the working directory files are compared
1899 revisions are specified, the working directory files are compared
1898 to its first parent.
1900 to its first parent.
1899
1901
1900 Alternatively you can specify -c/--change with a revision to see
1902 Alternatively you can specify -c/--change with a revision to see
1901 the changes in that changeset relative to its first parent.
1903 the changes in that changeset relative to its first parent.
1902
1904
1903 Without the -a/--text option, diff will avoid generating diffs of
1905 Without the -a/--text option, diff will avoid generating diffs of
1904 files it detects as binary. With -a, diff will generate a diff
1906 files it detects as binary. With -a, diff will generate a diff
1905 anyway, probably with undesirable results.
1907 anyway, probably with undesirable results.
1906
1908
1907 Use the -g/--git option to generate diffs in the git extended diff
1909 Use the -g/--git option to generate diffs in the git extended diff
1908 format. For more information, read :hg:`help diffs`.
1910 format. For more information, read :hg:`help diffs`.
1909
1911
1910 .. container:: verbose
1912 .. container:: verbose
1911
1913
1912 Examples:
1914 Examples:
1913
1915
1914 - compare a file in the current working directory to its parent::
1916 - compare a file in the current working directory to its parent::
1915
1917
1916 hg diff foo.c
1918 hg diff foo.c
1917
1919
1918 - compare two historical versions of a directory, with rename info::
1920 - compare two historical versions of a directory, with rename info::
1919
1921
1920 hg diff --git -r 1.0:1.2 lib/
1922 hg diff --git -r 1.0:1.2 lib/
1921
1923
1922 - get change stats relative to the last change on some date::
1924 - get change stats relative to the last change on some date::
1923
1925
1924 hg diff --stat -r "date('may 2')"
1926 hg diff --stat -r "date('may 2')"
1925
1927
1926 - diff all newly-added files that contain a keyword::
1928 - diff all newly-added files that contain a keyword::
1927
1929
1928 hg diff "set:added() and grep(GNU)"
1930 hg diff "set:added() and grep(GNU)"
1929
1931
1930 - compare a revision and its parents::
1932 - compare a revision and its parents::
1931
1933
1932 hg diff -c 9353 # compare against first parent
1934 hg diff -c 9353 # compare against first parent
1933 hg diff -r 9353^:9353 # same using revset syntax
1935 hg diff -r 9353^:9353 # same using revset syntax
1934 hg diff -r 9353^2:9353 # compare against the second parent
1936 hg diff -r 9353^2:9353 # compare against the second parent
1935
1937
1936 Returns 0 on success.
1938 Returns 0 on success.
1937 """
1939 """
1938
1940
1939 revs = opts.get('rev')
1941 revs = opts.get('rev')
1940 change = opts.get('change')
1942 change = opts.get('change')
1941 stat = opts.get('stat')
1943 stat = opts.get('stat')
1942 reverse = opts.get('reverse')
1944 reverse = opts.get('reverse')
1943
1945
1944 if revs and change:
1946 if revs and change:
1945 msg = _('cannot specify --rev and --change at the same time')
1947 msg = _('cannot specify --rev and --change at the same time')
1946 raise error.Abort(msg)
1948 raise error.Abort(msg)
1947 elif change:
1949 elif change:
1948 node2 = scmutil.revsingle(repo, change, None).node()
1950 node2 = scmutil.revsingle(repo, change, None).node()
1949 node1 = repo[node2].p1().node()
1951 node1 = repo[node2].p1().node()
1950 else:
1952 else:
1951 node1, node2 = scmutil.revpair(repo, revs)
1953 node1, node2 = scmutil.revpair(repo, revs)
1952
1954
1953 if reverse:
1955 if reverse:
1954 node1, node2 = node2, node1
1956 node1, node2 = node2, node1
1955
1957
1956 diffopts = patch.diffallopts(ui, opts)
1958 diffopts = patch.diffallopts(ui, opts)
1957 m = scmutil.match(repo[node2], pats, opts)
1959 m = scmutil.match(repo[node2], pats, opts)
1958 ui.pager('diff')
1960 ui.pager('diff')
1959 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1961 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1960 listsubrepos=opts.get('subrepos'),
1962 listsubrepos=opts.get('subrepos'),
1961 root=opts.get('root'))
1963 root=opts.get('root'))
1962
1964
1963 @command('^export',
1965 @command('^export',
1964 [('o', 'output', '',
1966 [('o', 'output', '',
1965 _('print output to file with formatted name'), _('FORMAT')),
1967 _('print output to file with formatted name'), _('FORMAT')),
1966 ('', 'switch-parent', None, _('diff against the second parent')),
1968 ('', 'switch-parent', None, _('diff against the second parent')),
1967 ('r', 'rev', [], _('revisions to export'), _('REV')),
1969 ('r', 'rev', [], _('revisions to export'), _('REV')),
1968 ] + diffopts,
1970 ] + diffopts,
1969 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
1971 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
1970 def export(ui, repo, *changesets, **opts):
1972 def export(ui, repo, *changesets, **opts):
1971 """dump the header and diffs for one or more changesets
1973 """dump the header and diffs for one or more changesets
1972
1974
1973 Print the changeset header and diffs for one or more revisions.
1975 Print the changeset header and diffs for one or more revisions.
1974 If no revision is given, the parent of the working directory is used.
1976 If no revision is given, the parent of the working directory is used.
1975
1977
1976 The information shown in the changeset header is: author, date,
1978 The information shown in the changeset header is: author, date,
1977 branch name (if non-default), changeset hash, parent(s) and commit
1979 branch name (if non-default), changeset hash, parent(s) and commit
1978 comment.
1980 comment.
1979
1981
1980 .. note::
1982 .. note::
1981
1983
1982 :hg:`export` may generate unexpected diff output for merge
1984 :hg:`export` may generate unexpected diff output for merge
1983 changesets, as it will compare the merge changeset against its
1985 changesets, as it will compare the merge changeset against its
1984 first parent only.
1986 first parent only.
1985
1987
1986 Output may be to a file, in which case the name of the file is
1988 Output may be to a file, in which case the name of the file is
1987 given using a format string. The formatting rules are as follows:
1989 given using a format string. The formatting rules are as follows:
1988
1990
1989 :``%%``: literal "%" character
1991 :``%%``: literal "%" character
1990 :``%H``: changeset hash (40 hexadecimal digits)
1992 :``%H``: changeset hash (40 hexadecimal digits)
1991 :``%N``: number of patches being generated
1993 :``%N``: number of patches being generated
1992 :``%R``: changeset revision number
1994 :``%R``: changeset revision number
1993 :``%b``: basename of the exporting repository
1995 :``%b``: basename of the exporting repository
1994 :``%h``: short-form changeset hash (12 hexadecimal digits)
1996 :``%h``: short-form changeset hash (12 hexadecimal digits)
1995 :``%m``: first line of the commit message (only alphanumeric characters)
1997 :``%m``: first line of the commit message (only alphanumeric characters)
1996 :``%n``: zero-padded sequence number, starting at 1
1998 :``%n``: zero-padded sequence number, starting at 1
1997 :``%r``: zero-padded changeset revision number
1999 :``%r``: zero-padded changeset revision number
1998
2000
1999 Without the -a/--text option, export will avoid generating diffs
2001 Without the -a/--text option, export will avoid generating diffs
2000 of files it detects as binary. With -a, export will generate a
2002 of files it detects as binary. With -a, export will generate a
2001 diff anyway, probably with undesirable results.
2003 diff anyway, probably with undesirable results.
2002
2004
2003 Use the -g/--git option to generate diffs in the git extended diff
2005 Use the -g/--git option to generate diffs in the git extended diff
2004 format. See :hg:`help diffs` for more information.
2006 format. See :hg:`help diffs` for more information.
2005
2007
2006 With the --switch-parent option, the diff will be against the
2008 With the --switch-parent option, the diff will be against the
2007 second parent. It can be useful to review a merge.
2009 second parent. It can be useful to review a merge.
2008
2010
2009 .. container:: verbose
2011 .. container:: verbose
2010
2012
2011 Examples:
2013 Examples:
2012
2014
2013 - use export and import to transplant a bugfix to the current
2015 - use export and import to transplant a bugfix to the current
2014 branch::
2016 branch::
2015
2017
2016 hg export -r 9353 | hg import -
2018 hg export -r 9353 | hg import -
2017
2019
2018 - export all the changesets between two revisions to a file with
2020 - export all the changesets between two revisions to a file with
2019 rename information::
2021 rename information::
2020
2022
2021 hg export --git -r 123:150 > changes.txt
2023 hg export --git -r 123:150 > changes.txt
2022
2024
2023 - split outgoing changes into a series of patches with
2025 - split outgoing changes into a series of patches with
2024 descriptive names::
2026 descriptive names::
2025
2027
2026 hg export -r "outgoing()" -o "%n-%m.patch"
2028 hg export -r "outgoing()" -o "%n-%m.patch"
2027
2029
2028 Returns 0 on success.
2030 Returns 0 on success.
2029 """
2031 """
2030 opts = pycompat.byteskwargs(opts)
2032 opts = pycompat.byteskwargs(opts)
2031 changesets += tuple(opts.get('rev', []))
2033 changesets += tuple(opts.get('rev', []))
2032 if not changesets:
2034 if not changesets:
2033 changesets = ['.']
2035 changesets = ['.']
2034 revs = scmutil.revrange(repo, changesets)
2036 revs = scmutil.revrange(repo, changesets)
2035 if not revs:
2037 if not revs:
2036 raise error.Abort(_("export requires at least one changeset"))
2038 raise error.Abort(_("export requires at least one changeset"))
2037 if len(revs) > 1:
2039 if len(revs) > 1:
2038 ui.note(_('exporting patches:\n'))
2040 ui.note(_('exporting patches:\n'))
2039 else:
2041 else:
2040 ui.note(_('exporting patch:\n'))
2042 ui.note(_('exporting patch:\n'))
2041 ui.pager('export')
2043 ui.pager('export')
2042 cmdutil.export(repo, revs, template=opts.get('output'),
2044 cmdutil.export(repo, revs, template=opts.get('output'),
2043 switch_parent=opts.get('switch_parent'),
2045 switch_parent=opts.get('switch_parent'),
2044 opts=patch.diffallopts(ui, opts))
2046 opts=patch.diffallopts(ui, opts))
2045
2047
2046 @command('files',
2048 @command('files',
2047 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
2049 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
2048 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
2050 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
2049 ] + walkopts + formatteropts + subrepoopts,
2051 ] + walkopts + formatteropts + subrepoopts,
2050 _('[OPTION]... [FILE]...'))
2052 _('[OPTION]... [FILE]...'))
2051 def files(ui, repo, *pats, **opts):
2053 def files(ui, repo, *pats, **opts):
2052 """list tracked files
2054 """list tracked files
2053
2055
2054 Print files under Mercurial control in the working directory or
2056 Print files under Mercurial control in the working directory or
2055 specified revision for given files (excluding removed files).
2057 specified revision for given files (excluding removed files).
2056 Files can be specified as filenames or filesets.
2058 Files can be specified as filenames or filesets.
2057
2059
2058 If no files are given to match, this command prints the names
2060 If no files are given to match, this command prints the names
2059 of all files under Mercurial control.
2061 of all files under Mercurial control.
2060
2062
2061 .. container:: verbose
2063 .. container:: verbose
2062
2064
2063 Examples:
2065 Examples:
2064
2066
2065 - list all files under the current directory::
2067 - list all files under the current directory::
2066
2068
2067 hg files .
2069 hg files .
2068
2070
2069 - shows sizes and flags for current revision::
2071 - shows sizes and flags for current revision::
2070
2072
2071 hg files -vr .
2073 hg files -vr .
2072
2074
2073 - list all files named README::
2075 - list all files named README::
2074
2076
2075 hg files -I "**/README"
2077 hg files -I "**/README"
2076
2078
2077 - list all binary files::
2079 - list all binary files::
2078
2080
2079 hg files "set:binary()"
2081 hg files "set:binary()"
2080
2082
2081 - find files containing a regular expression::
2083 - find files containing a regular expression::
2082
2084
2083 hg files "set:grep('bob')"
2085 hg files "set:grep('bob')"
2084
2086
2085 - search tracked file contents with xargs and grep::
2087 - search tracked file contents with xargs and grep::
2086
2088
2087 hg files -0 | xargs -0 grep foo
2089 hg files -0 | xargs -0 grep foo
2088
2090
2089 See :hg:`help patterns` and :hg:`help filesets` for more information
2091 See :hg:`help patterns` and :hg:`help filesets` for more information
2090 on specifying file patterns.
2092 on specifying file patterns.
2091
2093
2092 Returns 0 if a match is found, 1 otherwise.
2094 Returns 0 if a match is found, 1 otherwise.
2093
2095
2094 """
2096 """
2095 ctx = scmutil.revsingle(repo, opts.get(r'rev'), None)
2097 ctx = scmutil.revsingle(repo, opts.get(r'rev'), None)
2096
2098
2097 end = '\n'
2099 end = '\n'
2098 if opts.get('print0'):
2100 if opts.get('print0'):
2099 end = '\0'
2101 end = '\0'
2100 fmt = '%s' + end
2102 fmt = '%s' + end
2101
2103
2102 m = scmutil.match(ctx, pats, opts)
2104 m = scmutil.match(ctx, pats, opts)
2103 ui.pager('files')
2105 ui.pager('files')
2104 with ui.formatter('files', opts) as fm:
2106 with ui.formatter('files', opts) as fm:
2105 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
2107 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
2106
2108
2107 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
2109 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
2108 def forget(ui, repo, *pats, **opts):
2110 def forget(ui, repo, *pats, **opts):
2109 """forget the specified files on the next commit
2111 """forget the specified files on the next commit
2110
2112
2111 Mark the specified files so they will no longer be tracked
2113 Mark the specified files so they will no longer be tracked
2112 after the next commit.
2114 after the next commit.
2113
2115
2114 This only removes files from the current branch, not from the
2116 This only removes files from the current branch, not from the
2115 entire project history, and it does not delete them from the
2117 entire project history, and it does not delete them from the
2116 working directory.
2118 working directory.
2117
2119
2118 To delete the file from the working directory, see :hg:`remove`.
2120 To delete the file from the working directory, see :hg:`remove`.
2119
2121
2120 To undo a forget before the next commit, see :hg:`add`.
2122 To undo a forget before the next commit, see :hg:`add`.
2121
2123
2122 .. container:: verbose
2124 .. container:: verbose
2123
2125
2124 Examples:
2126 Examples:
2125
2127
2126 - forget newly-added binary files::
2128 - forget newly-added binary files::
2127
2129
2128 hg forget "set:added() and binary()"
2130 hg forget "set:added() and binary()"
2129
2131
2130 - forget files that would be excluded by .hgignore::
2132 - forget files that would be excluded by .hgignore::
2131
2133
2132 hg forget "set:hgignore()"
2134 hg forget "set:hgignore()"
2133
2135
2134 Returns 0 on success.
2136 Returns 0 on success.
2135 """
2137 """
2136
2138
2137 if not pats:
2139 if not pats:
2138 raise error.Abort(_('no files specified'))
2140 raise error.Abort(_('no files specified'))
2139
2141
2140 m = scmutil.match(repo[None], pats, opts)
2142 m = scmutil.match(repo[None], pats, opts)
2141 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2143 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2142 return rejected and 1 or 0
2144 return rejected and 1 or 0
2143
2145
2144 @command(
2146 @command(
2145 'graft',
2147 'graft',
2146 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2148 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2147 ('c', 'continue', False, _('resume interrupted graft')),
2149 ('c', 'continue', False, _('resume interrupted graft')),
2148 ('e', 'edit', False, _('invoke editor on commit messages')),
2150 ('e', 'edit', False, _('invoke editor on commit messages')),
2149 ('', 'log', None, _('append graft info to log message')),
2151 ('', 'log', None, _('append graft info to log message')),
2150 ('f', 'force', False, _('force graft')),
2152 ('f', 'force', False, _('force graft')),
2151 ('D', 'currentdate', False,
2153 ('D', 'currentdate', False,
2152 _('record the current date as commit date')),
2154 _('record the current date as commit date')),
2153 ('U', 'currentuser', False,
2155 ('U', 'currentuser', False,
2154 _('record the current user as committer'), _('DATE'))]
2156 _('record the current user as committer'), _('DATE'))]
2155 + commitopts2 + mergetoolopts + dryrunopts,
2157 + commitopts2 + mergetoolopts + dryrunopts,
2156 _('[OPTION]... [-r REV]... REV...'))
2158 _('[OPTION]... [-r REV]... REV...'))
2157 def graft(ui, repo, *revs, **opts):
2159 def graft(ui, repo, *revs, **opts):
2158 '''copy changes from other branches onto the current branch
2160 '''copy changes from other branches onto the current branch
2159
2161
2160 This command uses Mercurial's merge logic to copy individual
2162 This command uses Mercurial's merge logic to copy individual
2161 changes from other branches without merging branches in the
2163 changes from other branches without merging branches in the
2162 history graph. This is sometimes known as 'backporting' or
2164 history graph. This is sometimes known as 'backporting' or
2163 'cherry-picking'. By default, graft will copy user, date, and
2165 'cherry-picking'. By default, graft will copy user, date, and
2164 description from the source changesets.
2166 description from the source changesets.
2165
2167
2166 Changesets that are ancestors of the current revision, that have
2168 Changesets that are ancestors of the current revision, that have
2167 already been grafted, or that are merges will be skipped.
2169 already been grafted, or that are merges will be skipped.
2168
2170
2169 If --log is specified, log messages will have a comment appended
2171 If --log is specified, log messages will have a comment appended
2170 of the form::
2172 of the form::
2171
2173
2172 (grafted from CHANGESETHASH)
2174 (grafted from CHANGESETHASH)
2173
2175
2174 If --force is specified, revisions will be grafted even if they
2176 If --force is specified, revisions will be grafted even if they
2175 are already ancestors of or have been grafted to the destination.
2177 are already ancestors of or have been grafted to the destination.
2176 This is useful when the revisions have since been backed out.
2178 This is useful when the revisions have since been backed out.
2177
2179
2178 If a graft merge results in conflicts, the graft process is
2180 If a graft merge results in conflicts, the graft process is
2179 interrupted so that the current merge can be manually resolved.
2181 interrupted so that the current merge can be manually resolved.
2180 Once all conflicts are addressed, the graft process can be
2182 Once all conflicts are addressed, the graft process can be
2181 continued with the -c/--continue option.
2183 continued with the -c/--continue option.
2182
2184
2183 .. note::
2185 .. note::
2184
2186
2185 The -c/--continue option does not reapply earlier options, except
2187 The -c/--continue option does not reapply earlier options, except
2186 for --force.
2188 for --force.
2187
2189
2188 .. container:: verbose
2190 .. container:: verbose
2189
2191
2190 Examples:
2192 Examples:
2191
2193
2192 - copy a single change to the stable branch and edit its description::
2194 - copy a single change to the stable branch and edit its description::
2193
2195
2194 hg update stable
2196 hg update stable
2195 hg graft --edit 9393
2197 hg graft --edit 9393
2196
2198
2197 - graft a range of changesets with one exception, updating dates::
2199 - graft a range of changesets with one exception, updating dates::
2198
2200
2199 hg graft -D "2085::2093 and not 2091"
2201 hg graft -D "2085::2093 and not 2091"
2200
2202
2201 - continue a graft after resolving conflicts::
2203 - continue a graft after resolving conflicts::
2202
2204
2203 hg graft -c
2205 hg graft -c
2204
2206
2205 - show the source of a grafted changeset::
2207 - show the source of a grafted changeset::
2206
2208
2207 hg log --debug -r .
2209 hg log --debug -r .
2208
2210
2209 - show revisions sorted by date::
2211 - show revisions sorted by date::
2210
2212
2211 hg log -r "sort(all(), date)"
2213 hg log -r "sort(all(), date)"
2212
2214
2213 See :hg:`help revisions` for more about specifying revisions.
2215 See :hg:`help revisions` for more about specifying revisions.
2214
2216
2215 Returns 0 on successful completion.
2217 Returns 0 on successful completion.
2216 '''
2218 '''
2217 with repo.wlock():
2219 with repo.wlock():
2218 return _dograft(ui, repo, *revs, **opts)
2220 return _dograft(ui, repo, *revs, **opts)
2219
2221
2220 def _dograft(ui, repo, *revs, **opts):
2222 def _dograft(ui, repo, *revs, **opts):
2221 if revs and opts.get('rev'):
2223 if revs and opts.get('rev'):
2222 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2224 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2223 'revision ordering!\n'))
2225 'revision ordering!\n'))
2224
2226
2225 revs = list(revs)
2227 revs = list(revs)
2226 revs.extend(opts.get('rev'))
2228 revs.extend(opts.get('rev'))
2227
2229
2228 if not opts.get('user') and opts.get('currentuser'):
2230 if not opts.get('user') and opts.get('currentuser'):
2229 opts['user'] = ui.username()
2231 opts['user'] = ui.username()
2230 if not opts.get('date') and opts.get('currentdate'):
2232 if not opts.get('date') and opts.get('currentdate'):
2231 opts['date'] = "%d %d" % util.makedate()
2233 opts['date'] = "%d %d" % util.makedate()
2232
2234
2233 editor = cmdutil.getcommiteditor(editform='graft', **opts)
2235 editor = cmdutil.getcommiteditor(editform='graft', **opts)
2234
2236
2235 cont = False
2237 cont = False
2236 if opts.get('continue'):
2238 if opts.get('continue'):
2237 cont = True
2239 cont = True
2238 if revs:
2240 if revs:
2239 raise error.Abort(_("can't specify --continue and revisions"))
2241 raise error.Abort(_("can't specify --continue and revisions"))
2240 # read in unfinished revisions
2242 # read in unfinished revisions
2241 try:
2243 try:
2242 nodes = repo.vfs.read('graftstate').splitlines()
2244 nodes = repo.vfs.read('graftstate').splitlines()
2243 revs = [repo[node].rev() for node in nodes]
2245 revs = [repo[node].rev() for node in nodes]
2244 except IOError as inst:
2246 except IOError as inst:
2245 if inst.errno != errno.ENOENT:
2247 if inst.errno != errno.ENOENT:
2246 raise
2248 raise
2247 cmdutil.wrongtooltocontinue(repo, _('graft'))
2249 cmdutil.wrongtooltocontinue(repo, _('graft'))
2248 else:
2250 else:
2249 cmdutil.checkunfinished(repo)
2251 cmdutil.checkunfinished(repo)
2250 cmdutil.bailifchanged(repo)
2252 cmdutil.bailifchanged(repo)
2251 if not revs:
2253 if not revs:
2252 raise error.Abort(_('no revisions specified'))
2254 raise error.Abort(_('no revisions specified'))
2253 revs = scmutil.revrange(repo, revs)
2255 revs = scmutil.revrange(repo, revs)
2254
2256
2255 skipped = set()
2257 skipped = set()
2256 # check for merges
2258 # check for merges
2257 for rev in repo.revs('%ld and merge()', revs):
2259 for rev in repo.revs('%ld and merge()', revs):
2258 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2260 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2259 skipped.add(rev)
2261 skipped.add(rev)
2260 revs = [r for r in revs if r not in skipped]
2262 revs = [r for r in revs if r not in skipped]
2261 if not revs:
2263 if not revs:
2262 return -1
2264 return -1
2263
2265
2264 # Don't check in the --continue case, in effect retaining --force across
2266 # Don't check in the --continue case, in effect retaining --force across
2265 # --continues. That's because without --force, any revisions we decided to
2267 # --continues. That's because without --force, any revisions we decided to
2266 # skip would have been filtered out here, so they wouldn't have made their
2268 # skip would have been filtered out here, so they wouldn't have made their
2267 # way to the graftstate. With --force, any revisions we would have otherwise
2269 # way to the graftstate. With --force, any revisions we would have otherwise
2268 # skipped would not have been filtered out, and if they hadn't been applied
2270 # skipped would not have been filtered out, and if they hadn't been applied
2269 # already, they'd have been in the graftstate.
2271 # already, they'd have been in the graftstate.
2270 if not (cont or opts.get('force')):
2272 if not (cont or opts.get('force')):
2271 # check for ancestors of dest branch
2273 # check for ancestors of dest branch
2272 crev = repo['.'].rev()
2274 crev = repo['.'].rev()
2273 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2275 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2274 # XXX make this lazy in the future
2276 # XXX make this lazy in the future
2275 # don't mutate while iterating, create a copy
2277 # don't mutate while iterating, create a copy
2276 for rev in list(revs):
2278 for rev in list(revs):
2277 if rev in ancestors:
2279 if rev in ancestors:
2278 ui.warn(_('skipping ancestor revision %d:%s\n') %
2280 ui.warn(_('skipping ancestor revision %d:%s\n') %
2279 (rev, repo[rev]))
2281 (rev, repo[rev]))
2280 # XXX remove on list is slow
2282 # XXX remove on list is slow
2281 revs.remove(rev)
2283 revs.remove(rev)
2282 if not revs:
2284 if not revs:
2283 return -1
2285 return -1
2284
2286
2285 # analyze revs for earlier grafts
2287 # analyze revs for earlier grafts
2286 ids = {}
2288 ids = {}
2287 for ctx in repo.set("%ld", revs):
2289 for ctx in repo.set("%ld", revs):
2288 ids[ctx.hex()] = ctx.rev()
2290 ids[ctx.hex()] = ctx.rev()
2289 n = ctx.extra().get('source')
2291 n = ctx.extra().get('source')
2290 if n:
2292 if n:
2291 ids[n] = ctx.rev()
2293 ids[n] = ctx.rev()
2292
2294
2293 # check ancestors for earlier grafts
2295 # check ancestors for earlier grafts
2294 ui.debug('scanning for duplicate grafts\n')
2296 ui.debug('scanning for duplicate grafts\n')
2295
2297
2296 for rev in repo.changelog.findmissingrevs(revs, [crev]):
2298 for rev in repo.changelog.findmissingrevs(revs, [crev]):
2297 ctx = repo[rev]
2299 ctx = repo[rev]
2298 n = ctx.extra().get('source')
2300 n = ctx.extra().get('source')
2299 if n in ids:
2301 if n in ids:
2300 try:
2302 try:
2301 r = repo[n].rev()
2303 r = repo[n].rev()
2302 except error.RepoLookupError:
2304 except error.RepoLookupError:
2303 r = None
2305 r = None
2304 if r in revs:
2306 if r in revs:
2305 ui.warn(_('skipping revision %d:%s '
2307 ui.warn(_('skipping revision %d:%s '
2306 '(already grafted to %d:%s)\n')
2308 '(already grafted to %d:%s)\n')
2307 % (r, repo[r], rev, ctx))
2309 % (r, repo[r], rev, ctx))
2308 revs.remove(r)
2310 revs.remove(r)
2309 elif ids[n] in revs:
2311 elif ids[n] in revs:
2310 if r is None:
2312 if r is None:
2311 ui.warn(_('skipping already grafted revision %d:%s '
2313 ui.warn(_('skipping already grafted revision %d:%s '
2312 '(%d:%s also has unknown origin %s)\n')
2314 '(%d:%s also has unknown origin %s)\n')
2313 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2315 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2314 else:
2316 else:
2315 ui.warn(_('skipping already grafted revision %d:%s '
2317 ui.warn(_('skipping already grafted revision %d:%s '
2316 '(%d:%s also has origin %d:%s)\n')
2318 '(%d:%s also has origin %d:%s)\n')
2317 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2319 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2318 revs.remove(ids[n])
2320 revs.remove(ids[n])
2319 elif ctx.hex() in ids:
2321 elif ctx.hex() in ids:
2320 r = ids[ctx.hex()]
2322 r = ids[ctx.hex()]
2321 ui.warn(_('skipping already grafted revision %d:%s '
2323 ui.warn(_('skipping already grafted revision %d:%s '
2322 '(was grafted from %d:%s)\n') %
2324 '(was grafted from %d:%s)\n') %
2323 (r, repo[r], rev, ctx))
2325 (r, repo[r], rev, ctx))
2324 revs.remove(r)
2326 revs.remove(r)
2325 if not revs:
2327 if not revs:
2326 return -1
2328 return -1
2327
2329
2328 for pos, ctx in enumerate(repo.set("%ld", revs)):
2330 for pos, ctx in enumerate(repo.set("%ld", revs)):
2329 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2331 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2330 ctx.description().split('\n', 1)[0])
2332 ctx.description().split('\n', 1)[0])
2331 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2333 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2332 if names:
2334 if names:
2333 desc += ' (%s)' % ' '.join(names)
2335 desc += ' (%s)' % ' '.join(names)
2334 ui.status(_('grafting %s\n') % desc)
2336 ui.status(_('grafting %s\n') % desc)
2335 if opts.get('dry_run'):
2337 if opts.get('dry_run'):
2336 continue
2338 continue
2337
2339
2338 source = ctx.extra().get('source')
2340 source = ctx.extra().get('source')
2339 extra = {}
2341 extra = {}
2340 if source:
2342 if source:
2341 extra['source'] = source
2343 extra['source'] = source
2342 extra['intermediate-source'] = ctx.hex()
2344 extra['intermediate-source'] = ctx.hex()
2343 else:
2345 else:
2344 extra['source'] = ctx.hex()
2346 extra['source'] = ctx.hex()
2345 user = ctx.user()
2347 user = ctx.user()
2346 if opts.get('user'):
2348 if opts.get('user'):
2347 user = opts['user']
2349 user = opts['user']
2348 date = ctx.date()
2350 date = ctx.date()
2349 if opts.get('date'):
2351 if opts.get('date'):
2350 date = opts['date']
2352 date = opts['date']
2351 message = ctx.description()
2353 message = ctx.description()
2352 if opts.get('log'):
2354 if opts.get('log'):
2353 message += '\n(grafted from %s)' % ctx.hex()
2355 message += '\n(grafted from %s)' % ctx.hex()
2354
2356
2355 # we don't merge the first commit when continuing
2357 # we don't merge the first commit when continuing
2356 if not cont:
2358 if not cont:
2357 # perform the graft merge with p1(rev) as 'ancestor'
2359 # perform the graft merge with p1(rev) as 'ancestor'
2358 try:
2360 try:
2359 # ui.forcemerge is an internal variable, do not document
2361 # ui.forcemerge is an internal variable, do not document
2360 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
2362 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
2361 'graft')
2363 'graft')
2362 stats = mergemod.graft(repo, ctx, ctx.p1(),
2364 stats = mergemod.graft(repo, ctx, ctx.p1(),
2363 ['local', 'graft'])
2365 ['local', 'graft'])
2364 finally:
2366 finally:
2365 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
2367 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
2366 # report any conflicts
2368 # report any conflicts
2367 if stats and stats[3] > 0:
2369 if stats and stats[3] > 0:
2368 # write out state for --continue
2370 # write out state for --continue
2369 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2371 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2370 repo.vfs.write('graftstate', ''.join(nodelines))
2372 repo.vfs.write('graftstate', ''.join(nodelines))
2371 extra = ''
2373 extra = ''
2372 if opts.get('user'):
2374 if opts.get('user'):
2373 extra += ' --user %s' % util.shellquote(opts['user'])
2375 extra += ' --user %s' % util.shellquote(opts['user'])
2374 if opts.get('date'):
2376 if opts.get('date'):
2375 extra += ' --date %s' % util.shellquote(opts['date'])
2377 extra += ' --date %s' % util.shellquote(opts['date'])
2376 if opts.get('log'):
2378 if opts.get('log'):
2377 extra += ' --log'
2379 extra += ' --log'
2378 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
2380 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
2379 raise error.Abort(
2381 raise error.Abort(
2380 _("unresolved conflicts, can't continue"),
2382 _("unresolved conflicts, can't continue"),
2381 hint=hint)
2383 hint=hint)
2382 else:
2384 else:
2383 cont = False
2385 cont = False
2384
2386
2385 # commit
2387 # commit
2386 node = repo.commit(text=message, user=user,
2388 node = repo.commit(text=message, user=user,
2387 date=date, extra=extra, editor=editor)
2389 date=date, extra=extra, editor=editor)
2388 if node is None:
2390 if node is None:
2389 ui.warn(
2391 ui.warn(
2390 _('note: graft of %d:%s created no changes to commit\n') %
2392 _('note: graft of %d:%s created no changes to commit\n') %
2391 (ctx.rev(), ctx))
2393 (ctx.rev(), ctx))
2392
2394
2393 # remove state when we complete successfully
2395 # remove state when we complete successfully
2394 if not opts.get('dry_run'):
2396 if not opts.get('dry_run'):
2395 repo.vfs.unlinkpath('graftstate', ignoremissing=True)
2397 repo.vfs.unlinkpath('graftstate', ignoremissing=True)
2396
2398
2397 return 0
2399 return 0
2398
2400
2399 @command('grep',
2401 @command('grep',
2400 [('0', 'print0', None, _('end fields with NUL')),
2402 [('0', 'print0', None, _('end fields with NUL')),
2401 ('', 'all', None, _('print all revisions that match')),
2403 ('', 'all', None, _('print all revisions that match')),
2402 ('a', 'text', None, _('treat all files as text')),
2404 ('a', 'text', None, _('treat all files as text')),
2403 ('f', 'follow', None,
2405 ('f', 'follow', None,
2404 _('follow changeset history,'
2406 _('follow changeset history,'
2405 ' or file history across copies and renames')),
2407 ' or file history across copies and renames')),
2406 ('i', 'ignore-case', None, _('ignore case when matching')),
2408 ('i', 'ignore-case', None, _('ignore case when matching')),
2407 ('l', 'files-with-matches', None,
2409 ('l', 'files-with-matches', None,
2408 _('print only filenames and revisions that match')),
2410 _('print only filenames and revisions that match')),
2409 ('n', 'line-number', None, _('print matching line numbers')),
2411 ('n', 'line-number', None, _('print matching line numbers')),
2410 ('r', 'rev', [],
2412 ('r', 'rev', [],
2411 _('only search files changed within revision range'), _('REV')),
2413 _('only search files changed within revision range'), _('REV')),
2412 ('u', 'user', None, _('list the author (long with -v)')),
2414 ('u', 'user', None, _('list the author (long with -v)')),
2413 ('d', 'date', None, _('list the date (short with -q)')),
2415 ('d', 'date', None, _('list the date (short with -q)')),
2414 ] + formatteropts + walkopts,
2416 ] + formatteropts + walkopts,
2415 _('[OPTION]... PATTERN [FILE]...'),
2417 _('[OPTION]... PATTERN [FILE]...'),
2416 inferrepo=True)
2418 inferrepo=True)
2417 def grep(ui, repo, pattern, *pats, **opts):
2419 def grep(ui, repo, pattern, *pats, **opts):
2418 """search revision history for a pattern in specified files
2420 """search revision history for a pattern in specified files
2419
2421
2420 Search revision history for a regular expression in the specified
2422 Search revision history for a regular expression in the specified
2421 files or the entire project.
2423 files or the entire project.
2422
2424
2423 By default, grep prints the most recent revision number for each
2425 By default, grep prints the most recent revision number for each
2424 file in which it finds a match. To get it to print every revision
2426 file in which it finds a match. To get it to print every revision
2425 that contains a change in match status ("-" for a match that becomes
2427 that contains a change in match status ("-" for a match that becomes
2426 a non-match, or "+" for a non-match that becomes a match), use the
2428 a non-match, or "+" for a non-match that becomes a match), use the
2427 --all flag.
2429 --all flag.
2428
2430
2429 PATTERN can be any Python (roughly Perl-compatible) regular
2431 PATTERN can be any Python (roughly Perl-compatible) regular
2430 expression.
2432 expression.
2431
2433
2432 If no FILEs are specified (and -f/--follow isn't set), all files in
2434 If no FILEs are specified (and -f/--follow isn't set), all files in
2433 the repository are searched, including those that don't exist in the
2435 the repository are searched, including those that don't exist in the
2434 current branch or have been deleted in a prior changeset.
2436 current branch or have been deleted in a prior changeset.
2435
2437
2436 Returns 0 if a match is found, 1 otherwise.
2438 Returns 0 if a match is found, 1 otherwise.
2437 """
2439 """
2438 reflags = re.M
2440 reflags = re.M
2439 if opts.get('ignore_case'):
2441 if opts.get('ignore_case'):
2440 reflags |= re.I
2442 reflags |= re.I
2441 try:
2443 try:
2442 regexp = util.re.compile(pattern, reflags)
2444 regexp = util.re.compile(pattern, reflags)
2443 except re.error as inst:
2445 except re.error as inst:
2444 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2446 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2445 return 1
2447 return 1
2446 sep, eol = ':', '\n'
2448 sep, eol = ':', '\n'
2447 if opts.get('print0'):
2449 if opts.get('print0'):
2448 sep = eol = '\0'
2450 sep = eol = '\0'
2449
2451
2450 getfile = util.lrucachefunc(repo.file)
2452 getfile = util.lrucachefunc(repo.file)
2451
2453
2452 def matchlines(body):
2454 def matchlines(body):
2453 begin = 0
2455 begin = 0
2454 linenum = 0
2456 linenum = 0
2455 while begin < len(body):
2457 while begin < len(body):
2456 match = regexp.search(body, begin)
2458 match = regexp.search(body, begin)
2457 if not match:
2459 if not match:
2458 break
2460 break
2459 mstart, mend = match.span()
2461 mstart, mend = match.span()
2460 linenum += body.count('\n', begin, mstart) + 1
2462 linenum += body.count('\n', begin, mstart) + 1
2461 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2463 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2462 begin = body.find('\n', mend) + 1 or len(body) + 1
2464 begin = body.find('\n', mend) + 1 or len(body) + 1
2463 lend = begin - 1
2465 lend = begin - 1
2464 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2466 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2465
2467
2466 class linestate(object):
2468 class linestate(object):
2467 def __init__(self, line, linenum, colstart, colend):
2469 def __init__(self, line, linenum, colstart, colend):
2468 self.line = line
2470 self.line = line
2469 self.linenum = linenum
2471 self.linenum = linenum
2470 self.colstart = colstart
2472 self.colstart = colstart
2471 self.colend = colend
2473 self.colend = colend
2472
2474
2473 def __hash__(self):
2475 def __hash__(self):
2474 return hash((self.linenum, self.line))
2476 return hash((self.linenum, self.line))
2475
2477
2476 def __eq__(self, other):
2478 def __eq__(self, other):
2477 return self.line == other.line
2479 return self.line == other.line
2478
2480
2479 def findpos(self):
2481 def findpos(self):
2480 """Iterate all (start, end) indices of matches"""
2482 """Iterate all (start, end) indices of matches"""
2481 yield self.colstart, self.colend
2483 yield self.colstart, self.colend
2482 p = self.colend
2484 p = self.colend
2483 while p < len(self.line):
2485 while p < len(self.line):
2484 m = regexp.search(self.line, p)
2486 m = regexp.search(self.line, p)
2485 if not m:
2487 if not m:
2486 break
2488 break
2487 yield m.span()
2489 yield m.span()
2488 p = m.end()
2490 p = m.end()
2489
2491
2490 matches = {}
2492 matches = {}
2491 copies = {}
2493 copies = {}
2492 def grepbody(fn, rev, body):
2494 def grepbody(fn, rev, body):
2493 matches[rev].setdefault(fn, [])
2495 matches[rev].setdefault(fn, [])
2494 m = matches[rev][fn]
2496 m = matches[rev][fn]
2495 for lnum, cstart, cend, line in matchlines(body):
2497 for lnum, cstart, cend, line in matchlines(body):
2496 s = linestate(line, lnum, cstart, cend)
2498 s = linestate(line, lnum, cstart, cend)
2497 m.append(s)
2499 m.append(s)
2498
2500
2499 def difflinestates(a, b):
2501 def difflinestates(a, b):
2500 sm = difflib.SequenceMatcher(None, a, b)
2502 sm = difflib.SequenceMatcher(None, a, b)
2501 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2503 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2502 if tag == 'insert':
2504 if tag == 'insert':
2503 for i in xrange(blo, bhi):
2505 for i in xrange(blo, bhi):
2504 yield ('+', b[i])
2506 yield ('+', b[i])
2505 elif tag == 'delete':
2507 elif tag == 'delete':
2506 for i in xrange(alo, ahi):
2508 for i in xrange(alo, ahi):
2507 yield ('-', a[i])
2509 yield ('-', a[i])
2508 elif tag == 'replace':
2510 elif tag == 'replace':
2509 for i in xrange(alo, ahi):
2511 for i in xrange(alo, ahi):
2510 yield ('-', a[i])
2512 yield ('-', a[i])
2511 for i in xrange(blo, bhi):
2513 for i in xrange(blo, bhi):
2512 yield ('+', b[i])
2514 yield ('+', b[i])
2513
2515
2514 def display(fm, fn, ctx, pstates, states):
2516 def display(fm, fn, ctx, pstates, states):
2515 rev = ctx.rev()
2517 rev = ctx.rev()
2516 if fm.isplain():
2518 if fm.isplain():
2517 formatuser = ui.shortuser
2519 formatuser = ui.shortuser
2518 else:
2520 else:
2519 formatuser = str
2521 formatuser = str
2520 if ui.quiet:
2522 if ui.quiet:
2521 datefmt = '%Y-%m-%d'
2523 datefmt = '%Y-%m-%d'
2522 else:
2524 else:
2523 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2525 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2524 found = False
2526 found = False
2525 @util.cachefunc
2527 @util.cachefunc
2526 def binary():
2528 def binary():
2527 flog = getfile(fn)
2529 flog = getfile(fn)
2528 return util.binary(flog.read(ctx.filenode(fn)))
2530 return util.binary(flog.read(ctx.filenode(fn)))
2529
2531
2530 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
2532 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
2531 if opts.get('all'):
2533 if opts.get('all'):
2532 iter = difflinestates(pstates, states)
2534 iter = difflinestates(pstates, states)
2533 else:
2535 else:
2534 iter = [('', l) for l in states]
2536 iter = [('', l) for l in states]
2535 for change, l in iter:
2537 for change, l in iter:
2536 fm.startitem()
2538 fm.startitem()
2537 fm.data(node=fm.hexfunc(ctx.node()))
2539 fm.data(node=fm.hexfunc(ctx.node()))
2538 cols = [
2540 cols = [
2539 ('filename', fn, True),
2541 ('filename', fn, True),
2540 ('rev', rev, True),
2542 ('rev', rev, True),
2541 ('linenumber', l.linenum, opts.get('line_number')),
2543 ('linenumber', l.linenum, opts.get('line_number')),
2542 ]
2544 ]
2543 if opts.get('all'):
2545 if opts.get('all'):
2544 cols.append(('change', change, True))
2546 cols.append(('change', change, True))
2545 cols.extend([
2547 cols.extend([
2546 ('user', formatuser(ctx.user()), opts.get('user')),
2548 ('user', formatuser(ctx.user()), opts.get('user')),
2547 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
2549 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
2548 ])
2550 ])
2549 lastcol = next(name for name, data, cond in reversed(cols) if cond)
2551 lastcol = next(name for name, data, cond in reversed(cols) if cond)
2550 for name, data, cond in cols:
2552 for name, data, cond in cols:
2551 field = fieldnamemap.get(name, name)
2553 field = fieldnamemap.get(name, name)
2552 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
2554 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
2553 if cond and name != lastcol:
2555 if cond and name != lastcol:
2554 fm.plain(sep, label='grep.sep')
2556 fm.plain(sep, label='grep.sep')
2555 if not opts.get('files_with_matches'):
2557 if not opts.get('files_with_matches'):
2556 fm.plain(sep, label='grep.sep')
2558 fm.plain(sep, label='grep.sep')
2557 if not opts.get('text') and binary():
2559 if not opts.get('text') and binary():
2558 fm.plain(_(" Binary file matches"))
2560 fm.plain(_(" Binary file matches"))
2559 else:
2561 else:
2560 displaymatches(fm.nested('texts'), l)
2562 displaymatches(fm.nested('texts'), l)
2561 fm.plain(eol)
2563 fm.plain(eol)
2562 found = True
2564 found = True
2563 if opts.get('files_with_matches'):
2565 if opts.get('files_with_matches'):
2564 break
2566 break
2565 return found
2567 return found
2566
2568
2567 def displaymatches(fm, l):
2569 def displaymatches(fm, l):
2568 p = 0
2570 p = 0
2569 for s, e in l.findpos():
2571 for s, e in l.findpos():
2570 if p < s:
2572 if p < s:
2571 fm.startitem()
2573 fm.startitem()
2572 fm.write('text', '%s', l.line[p:s])
2574 fm.write('text', '%s', l.line[p:s])
2573 fm.data(matched=False)
2575 fm.data(matched=False)
2574 fm.startitem()
2576 fm.startitem()
2575 fm.write('text', '%s', l.line[s:e], label='grep.match')
2577 fm.write('text', '%s', l.line[s:e], label='grep.match')
2576 fm.data(matched=True)
2578 fm.data(matched=True)
2577 p = e
2579 p = e
2578 if p < len(l.line):
2580 if p < len(l.line):
2579 fm.startitem()
2581 fm.startitem()
2580 fm.write('text', '%s', l.line[p:])
2582 fm.write('text', '%s', l.line[p:])
2581 fm.data(matched=False)
2583 fm.data(matched=False)
2582 fm.end()
2584 fm.end()
2583
2585
2584 skip = {}
2586 skip = {}
2585 revfiles = {}
2587 revfiles = {}
2586 matchfn = scmutil.match(repo[None], pats, opts)
2588 matchfn = scmutil.match(repo[None], pats, opts)
2587 found = False
2589 found = False
2588 follow = opts.get('follow')
2590 follow = opts.get('follow')
2589
2591
2590 def prep(ctx, fns):
2592 def prep(ctx, fns):
2591 rev = ctx.rev()
2593 rev = ctx.rev()
2592 pctx = ctx.p1()
2594 pctx = ctx.p1()
2593 parent = pctx.rev()
2595 parent = pctx.rev()
2594 matches.setdefault(rev, {})
2596 matches.setdefault(rev, {})
2595 matches.setdefault(parent, {})
2597 matches.setdefault(parent, {})
2596 files = revfiles.setdefault(rev, [])
2598 files = revfiles.setdefault(rev, [])
2597 for fn in fns:
2599 for fn in fns:
2598 flog = getfile(fn)
2600 flog = getfile(fn)
2599 try:
2601 try:
2600 fnode = ctx.filenode(fn)
2602 fnode = ctx.filenode(fn)
2601 except error.LookupError:
2603 except error.LookupError:
2602 continue
2604 continue
2603
2605
2604 copied = flog.renamed(fnode)
2606 copied = flog.renamed(fnode)
2605 copy = follow and copied and copied[0]
2607 copy = follow and copied and copied[0]
2606 if copy:
2608 if copy:
2607 copies.setdefault(rev, {})[fn] = copy
2609 copies.setdefault(rev, {})[fn] = copy
2608 if fn in skip:
2610 if fn in skip:
2609 if copy:
2611 if copy:
2610 skip[copy] = True
2612 skip[copy] = True
2611 continue
2613 continue
2612 files.append(fn)
2614 files.append(fn)
2613
2615
2614 if fn not in matches[rev]:
2616 if fn not in matches[rev]:
2615 grepbody(fn, rev, flog.read(fnode))
2617 grepbody(fn, rev, flog.read(fnode))
2616
2618
2617 pfn = copy or fn
2619 pfn = copy or fn
2618 if pfn not in matches[parent]:
2620 if pfn not in matches[parent]:
2619 try:
2621 try:
2620 fnode = pctx.filenode(pfn)
2622 fnode = pctx.filenode(pfn)
2621 grepbody(pfn, parent, flog.read(fnode))
2623 grepbody(pfn, parent, flog.read(fnode))
2622 except error.LookupError:
2624 except error.LookupError:
2623 pass
2625 pass
2624
2626
2625 ui.pager('grep')
2627 ui.pager('grep')
2626 fm = ui.formatter('grep', opts)
2628 fm = ui.formatter('grep', opts)
2627 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2629 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2628 rev = ctx.rev()
2630 rev = ctx.rev()
2629 parent = ctx.p1().rev()
2631 parent = ctx.p1().rev()
2630 for fn in sorted(revfiles.get(rev, [])):
2632 for fn in sorted(revfiles.get(rev, [])):
2631 states = matches[rev][fn]
2633 states = matches[rev][fn]
2632 copy = copies.get(rev, {}).get(fn)
2634 copy = copies.get(rev, {}).get(fn)
2633 if fn in skip:
2635 if fn in skip:
2634 if copy:
2636 if copy:
2635 skip[copy] = True
2637 skip[copy] = True
2636 continue
2638 continue
2637 pstates = matches.get(parent, {}).get(copy or fn, [])
2639 pstates = matches.get(parent, {}).get(copy or fn, [])
2638 if pstates or states:
2640 if pstates or states:
2639 r = display(fm, fn, ctx, pstates, states)
2641 r = display(fm, fn, ctx, pstates, states)
2640 found = found or r
2642 found = found or r
2641 if r and not opts.get('all'):
2643 if r and not opts.get('all'):
2642 skip[fn] = True
2644 skip[fn] = True
2643 if copy:
2645 if copy:
2644 skip[copy] = True
2646 skip[copy] = True
2645 del matches[rev]
2647 del matches[rev]
2646 del revfiles[rev]
2648 del revfiles[rev]
2647 fm.end()
2649 fm.end()
2648
2650
2649 return not found
2651 return not found
2650
2652
2651 @command('heads',
2653 @command('heads',
2652 [('r', 'rev', '',
2654 [('r', 'rev', '',
2653 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2655 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2654 ('t', 'topo', False, _('show topological heads only')),
2656 ('t', 'topo', False, _('show topological heads only')),
2655 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2657 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2656 ('c', 'closed', False, _('show normal and closed branch heads')),
2658 ('c', 'closed', False, _('show normal and closed branch heads')),
2657 ] + templateopts,
2659 ] + templateopts,
2658 _('[-ct] [-r STARTREV] [REV]...'))
2660 _('[-ct] [-r STARTREV] [REV]...'))
2659 def heads(ui, repo, *branchrevs, **opts):
2661 def heads(ui, repo, *branchrevs, **opts):
2660 """show branch heads
2662 """show branch heads
2661
2663
2662 With no arguments, show all open branch heads in the repository.
2664 With no arguments, show all open branch heads in the repository.
2663 Branch heads are changesets that have no descendants on the
2665 Branch heads are changesets that have no descendants on the
2664 same branch. They are where development generally takes place and
2666 same branch. They are where development generally takes place and
2665 are the usual targets for update and merge operations.
2667 are the usual targets for update and merge operations.
2666
2668
2667 If one or more REVs are given, only open branch heads on the
2669 If one or more REVs are given, only open branch heads on the
2668 branches associated with the specified changesets are shown. This
2670 branches associated with the specified changesets are shown. This
2669 means that you can use :hg:`heads .` to see the heads on the
2671 means that you can use :hg:`heads .` to see the heads on the
2670 currently checked-out branch.
2672 currently checked-out branch.
2671
2673
2672 If -c/--closed is specified, also show branch heads marked closed
2674 If -c/--closed is specified, also show branch heads marked closed
2673 (see :hg:`commit --close-branch`).
2675 (see :hg:`commit --close-branch`).
2674
2676
2675 If STARTREV is specified, only those heads that are descendants of
2677 If STARTREV is specified, only those heads that are descendants of
2676 STARTREV will be displayed.
2678 STARTREV will be displayed.
2677
2679
2678 If -t/--topo is specified, named branch mechanics will be ignored and only
2680 If -t/--topo is specified, named branch mechanics will be ignored and only
2679 topological heads (changesets with no children) will be shown.
2681 topological heads (changesets with no children) will be shown.
2680
2682
2681 Returns 0 if matching heads are found, 1 if not.
2683 Returns 0 if matching heads are found, 1 if not.
2682 """
2684 """
2683
2685
2684 start = None
2686 start = None
2685 if 'rev' in opts:
2687 if 'rev' in opts:
2686 start = scmutil.revsingle(repo, opts['rev'], None).node()
2688 start = scmutil.revsingle(repo, opts['rev'], None).node()
2687
2689
2688 if opts.get('topo'):
2690 if opts.get('topo'):
2689 heads = [repo[h] for h in repo.heads(start)]
2691 heads = [repo[h] for h in repo.heads(start)]
2690 else:
2692 else:
2691 heads = []
2693 heads = []
2692 for branch in repo.branchmap():
2694 for branch in repo.branchmap():
2693 heads += repo.branchheads(branch, start, opts.get('closed'))
2695 heads += repo.branchheads(branch, start, opts.get('closed'))
2694 heads = [repo[h] for h in heads]
2696 heads = [repo[h] for h in heads]
2695
2697
2696 if branchrevs:
2698 if branchrevs:
2697 branches = set(repo[br].branch() for br in branchrevs)
2699 branches = set(repo[br].branch() for br in branchrevs)
2698 heads = [h for h in heads if h.branch() in branches]
2700 heads = [h for h in heads if h.branch() in branches]
2699
2701
2700 if opts.get('active') and branchrevs:
2702 if opts.get('active') and branchrevs:
2701 dagheads = repo.heads(start)
2703 dagheads = repo.heads(start)
2702 heads = [h for h in heads if h.node() in dagheads]
2704 heads = [h for h in heads if h.node() in dagheads]
2703
2705
2704 if branchrevs:
2706 if branchrevs:
2705 haveheads = set(h.branch() for h in heads)
2707 haveheads = set(h.branch() for h in heads)
2706 if branches - haveheads:
2708 if branches - haveheads:
2707 headless = ', '.join(b for b in branches - haveheads)
2709 headless = ', '.join(b for b in branches - haveheads)
2708 msg = _('no open branch heads found on branches %s')
2710 msg = _('no open branch heads found on branches %s')
2709 if opts.get('rev'):
2711 if opts.get('rev'):
2710 msg += _(' (started at %s)') % opts['rev']
2712 msg += _(' (started at %s)') % opts['rev']
2711 ui.warn((msg + '\n') % headless)
2713 ui.warn((msg + '\n') % headless)
2712
2714
2713 if not heads:
2715 if not heads:
2714 return 1
2716 return 1
2715
2717
2716 ui.pager('heads')
2718 ui.pager('heads')
2717 heads = sorted(heads, key=lambda x: -x.rev())
2719 heads = sorted(heads, key=lambda x: -x.rev())
2718 displayer = cmdutil.show_changeset(ui, repo, opts)
2720 displayer = cmdutil.show_changeset(ui, repo, opts)
2719 for ctx in heads:
2721 for ctx in heads:
2720 displayer.show(ctx)
2722 displayer.show(ctx)
2721 displayer.close()
2723 displayer.close()
2722
2724
2723 @command('help',
2725 @command('help',
2724 [('e', 'extension', None, _('show only help for extensions')),
2726 [('e', 'extension', None, _('show only help for extensions')),
2725 ('c', 'command', None, _('show only help for commands')),
2727 ('c', 'command', None, _('show only help for commands')),
2726 ('k', 'keyword', None, _('show topics matching keyword')),
2728 ('k', 'keyword', None, _('show topics matching keyword')),
2727 ('s', 'system', [], _('show help for specific platform(s)')),
2729 ('s', 'system', [], _('show help for specific platform(s)')),
2728 ],
2730 ],
2729 _('[-ecks] [TOPIC]'),
2731 _('[-ecks] [TOPIC]'),
2730 norepo=True)
2732 norepo=True)
2731 def help_(ui, name=None, **opts):
2733 def help_(ui, name=None, **opts):
2732 """show help for a given topic or a help overview
2734 """show help for a given topic or a help overview
2733
2735
2734 With no arguments, print a list of commands with short help messages.
2736 With no arguments, print a list of commands with short help messages.
2735
2737
2736 Given a topic, extension, or command name, print help for that
2738 Given a topic, extension, or command name, print help for that
2737 topic.
2739 topic.
2738
2740
2739 Returns 0 if successful.
2741 Returns 0 if successful.
2740 """
2742 """
2741
2743
2742 keep = opts.get('system') or []
2744 keep = opts.get('system') or []
2743 if len(keep) == 0:
2745 if len(keep) == 0:
2744 if pycompat.sysplatform.startswith('win'):
2746 if pycompat.sysplatform.startswith('win'):
2745 keep.append('windows')
2747 keep.append('windows')
2746 elif pycompat.sysplatform == 'OpenVMS':
2748 elif pycompat.sysplatform == 'OpenVMS':
2747 keep.append('vms')
2749 keep.append('vms')
2748 elif pycompat.sysplatform == 'plan9':
2750 elif pycompat.sysplatform == 'plan9':
2749 keep.append('plan9')
2751 keep.append('plan9')
2750 else:
2752 else:
2751 keep.append('unix')
2753 keep.append('unix')
2752 keep.append(pycompat.sysplatform.lower())
2754 keep.append(pycompat.sysplatform.lower())
2753 if ui.verbose:
2755 if ui.verbose:
2754 keep.append('verbose')
2756 keep.append('verbose')
2755
2757
2756 formatted = help.formattedhelp(ui, name, keep=keep, **opts)
2758 formatted = help.formattedhelp(ui, name, keep=keep, **opts)
2757 ui.pager('help')
2759 ui.pager('help')
2758 ui.write(formatted)
2760 ui.write(formatted)
2759
2761
2760
2762
2761 @command('identify|id',
2763 @command('identify|id',
2762 [('r', 'rev', '',
2764 [('r', 'rev', '',
2763 _('identify the specified revision'), _('REV')),
2765 _('identify the specified revision'), _('REV')),
2764 ('n', 'num', None, _('show local revision number')),
2766 ('n', 'num', None, _('show local revision number')),
2765 ('i', 'id', None, _('show global revision id')),
2767 ('i', 'id', None, _('show global revision id')),
2766 ('b', 'branch', None, _('show branch')),
2768 ('b', 'branch', None, _('show branch')),
2767 ('t', 'tags', None, _('show tags')),
2769 ('t', 'tags', None, _('show tags')),
2768 ('B', 'bookmarks', None, _('show bookmarks')),
2770 ('B', 'bookmarks', None, _('show bookmarks')),
2769 ] + remoteopts,
2771 ] + remoteopts,
2770 _('[-nibtB] [-r REV] [SOURCE]'),
2772 _('[-nibtB] [-r REV] [SOURCE]'),
2771 optionalrepo=True)
2773 optionalrepo=True)
2772 def identify(ui, repo, source=None, rev=None,
2774 def identify(ui, repo, source=None, rev=None,
2773 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2775 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2774 """identify the working directory or specified revision
2776 """identify the working directory or specified revision
2775
2777
2776 Print a summary identifying the repository state at REV using one or
2778 Print a summary identifying the repository state at REV using one or
2777 two parent hash identifiers, followed by a "+" if the working
2779 two parent hash identifiers, followed by a "+" if the working
2778 directory has uncommitted changes, the branch name (if not default),
2780 directory has uncommitted changes, the branch name (if not default),
2779 a list of tags, and a list of bookmarks.
2781 a list of tags, and a list of bookmarks.
2780
2782
2781 When REV is not given, print a summary of the current state of the
2783 When REV is not given, print a summary of the current state of the
2782 repository.
2784 repository.
2783
2785
2784 Specifying a path to a repository root or Mercurial bundle will
2786 Specifying a path to a repository root or Mercurial bundle will
2785 cause lookup to operate on that repository/bundle.
2787 cause lookup to operate on that repository/bundle.
2786
2788
2787 .. container:: verbose
2789 .. container:: verbose
2788
2790
2789 Examples:
2791 Examples:
2790
2792
2791 - generate a build identifier for the working directory::
2793 - generate a build identifier for the working directory::
2792
2794
2793 hg id --id > build-id.dat
2795 hg id --id > build-id.dat
2794
2796
2795 - find the revision corresponding to a tag::
2797 - find the revision corresponding to a tag::
2796
2798
2797 hg id -n -r 1.3
2799 hg id -n -r 1.3
2798
2800
2799 - check the most recent revision of a remote repository::
2801 - check the most recent revision of a remote repository::
2800
2802
2801 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2803 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2802
2804
2803 See :hg:`log` for generating more information about specific revisions,
2805 See :hg:`log` for generating more information about specific revisions,
2804 including full hash identifiers.
2806 including full hash identifiers.
2805
2807
2806 Returns 0 if successful.
2808 Returns 0 if successful.
2807 """
2809 """
2808
2810
2809 if not repo and not source:
2811 if not repo and not source:
2810 raise error.Abort(_("there is no Mercurial repository here "
2812 raise error.Abort(_("there is no Mercurial repository here "
2811 "(.hg not found)"))
2813 "(.hg not found)"))
2812
2814
2813 if ui.debugflag:
2815 if ui.debugflag:
2814 hexfunc = hex
2816 hexfunc = hex
2815 else:
2817 else:
2816 hexfunc = short
2818 hexfunc = short
2817 default = not (num or id or branch or tags or bookmarks)
2819 default = not (num or id or branch or tags or bookmarks)
2818 output = []
2820 output = []
2819 revs = []
2821 revs = []
2820
2822
2821 if source:
2823 if source:
2822 source, branches = hg.parseurl(ui.expandpath(source))
2824 source, branches = hg.parseurl(ui.expandpath(source))
2823 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2825 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2824 repo = peer.local()
2826 repo = peer.local()
2825 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2827 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2826
2828
2827 if not repo:
2829 if not repo:
2828 if num or branch or tags:
2830 if num or branch or tags:
2829 raise error.Abort(
2831 raise error.Abort(
2830 _("can't query remote revision number, branch, or tags"))
2832 _("can't query remote revision number, branch, or tags"))
2831 if not rev and revs:
2833 if not rev and revs:
2832 rev = revs[0]
2834 rev = revs[0]
2833 if not rev:
2835 if not rev:
2834 rev = "tip"
2836 rev = "tip"
2835
2837
2836 remoterev = peer.lookup(rev)
2838 remoterev = peer.lookup(rev)
2837 if default or id:
2839 if default or id:
2838 output = [hexfunc(remoterev)]
2840 output = [hexfunc(remoterev)]
2839
2841
2840 def getbms():
2842 def getbms():
2841 bms = []
2843 bms = []
2842
2844
2843 if 'bookmarks' in peer.listkeys('namespaces'):
2845 if 'bookmarks' in peer.listkeys('namespaces'):
2844 hexremoterev = hex(remoterev)
2846 hexremoterev = hex(remoterev)
2845 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
2847 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
2846 if bmr == hexremoterev]
2848 if bmr == hexremoterev]
2847
2849
2848 return sorted(bms)
2850 return sorted(bms)
2849
2851
2850 if bookmarks:
2852 if bookmarks:
2851 output.extend(getbms())
2853 output.extend(getbms())
2852 elif default and not ui.quiet:
2854 elif default and not ui.quiet:
2853 # multiple bookmarks for a single parent separated by '/'
2855 # multiple bookmarks for a single parent separated by '/'
2854 bm = '/'.join(getbms())
2856 bm = '/'.join(getbms())
2855 if bm:
2857 if bm:
2856 output.append(bm)
2858 output.append(bm)
2857 else:
2859 else:
2858 ctx = scmutil.revsingle(repo, rev, None)
2860 ctx = scmutil.revsingle(repo, rev, None)
2859
2861
2860 if ctx.rev() is None:
2862 if ctx.rev() is None:
2861 ctx = repo[None]
2863 ctx = repo[None]
2862 parents = ctx.parents()
2864 parents = ctx.parents()
2863 taglist = []
2865 taglist = []
2864 for p in parents:
2866 for p in parents:
2865 taglist.extend(p.tags())
2867 taglist.extend(p.tags())
2866
2868
2867 changed = ""
2869 changed = ""
2868 if default or id or num:
2870 if default or id or num:
2869 if (any(repo.status())
2871 if (any(repo.status())
2870 or any(ctx.sub(s).dirty() for s in ctx.substate)):
2872 or any(ctx.sub(s).dirty() for s in ctx.substate)):
2871 changed = '+'
2873 changed = '+'
2872 if default or id:
2874 if default or id:
2873 output = ["%s%s" %
2875 output = ["%s%s" %
2874 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
2876 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
2875 if num:
2877 if num:
2876 output.append("%s%s" %
2878 output.append("%s%s" %
2877 ('+'.join([str(p.rev()) for p in parents]), changed))
2879 ('+'.join([str(p.rev()) for p in parents]), changed))
2878 else:
2880 else:
2879 if default or id:
2881 if default or id:
2880 output = [hexfunc(ctx.node())]
2882 output = [hexfunc(ctx.node())]
2881 if num:
2883 if num:
2882 output.append(str(ctx.rev()))
2884 output.append(str(ctx.rev()))
2883 taglist = ctx.tags()
2885 taglist = ctx.tags()
2884
2886
2885 if default and not ui.quiet:
2887 if default and not ui.quiet:
2886 b = ctx.branch()
2888 b = ctx.branch()
2887 if b != 'default':
2889 if b != 'default':
2888 output.append("(%s)" % b)
2890 output.append("(%s)" % b)
2889
2891
2890 # multiple tags for a single parent separated by '/'
2892 # multiple tags for a single parent separated by '/'
2891 t = '/'.join(taglist)
2893 t = '/'.join(taglist)
2892 if t:
2894 if t:
2893 output.append(t)
2895 output.append(t)
2894
2896
2895 # multiple bookmarks for a single parent separated by '/'
2897 # multiple bookmarks for a single parent separated by '/'
2896 bm = '/'.join(ctx.bookmarks())
2898 bm = '/'.join(ctx.bookmarks())
2897 if bm:
2899 if bm:
2898 output.append(bm)
2900 output.append(bm)
2899 else:
2901 else:
2900 if branch:
2902 if branch:
2901 output.append(ctx.branch())
2903 output.append(ctx.branch())
2902
2904
2903 if tags:
2905 if tags:
2904 output.extend(taglist)
2906 output.extend(taglist)
2905
2907
2906 if bookmarks:
2908 if bookmarks:
2907 output.extend(ctx.bookmarks())
2909 output.extend(ctx.bookmarks())
2908
2910
2909 ui.write("%s\n" % ' '.join(output))
2911 ui.write("%s\n" % ' '.join(output))
2910
2912
2911 @command('import|patch',
2913 @command('import|patch',
2912 [('p', 'strip', 1,
2914 [('p', 'strip', 1,
2913 _('directory strip option for patch. This has the same '
2915 _('directory strip option for patch. This has the same '
2914 'meaning as the corresponding patch option'), _('NUM')),
2916 'meaning as the corresponding patch option'), _('NUM')),
2915 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
2917 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
2916 ('e', 'edit', False, _('invoke editor on commit messages')),
2918 ('e', 'edit', False, _('invoke editor on commit messages')),
2917 ('f', 'force', None,
2919 ('f', 'force', None,
2918 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
2920 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
2919 ('', 'no-commit', None,
2921 ('', 'no-commit', None,
2920 _("don't commit, just update the working directory")),
2922 _("don't commit, just update the working directory")),
2921 ('', 'bypass', None,
2923 ('', 'bypass', None,
2922 _("apply patch without touching the working directory")),
2924 _("apply patch without touching the working directory")),
2923 ('', 'partial', None,
2925 ('', 'partial', None,
2924 _('commit even if some hunks fail')),
2926 _('commit even if some hunks fail')),
2925 ('', 'exact', None,
2927 ('', 'exact', None,
2926 _('abort if patch would apply lossily')),
2928 _('abort if patch would apply lossily')),
2927 ('', 'prefix', '',
2929 ('', 'prefix', '',
2928 _('apply patch to subdirectory'), _('DIR')),
2930 _('apply patch to subdirectory'), _('DIR')),
2929 ('', 'import-branch', None,
2931 ('', 'import-branch', None,
2930 _('use any branch information in patch (implied by --exact)'))] +
2932 _('use any branch information in patch (implied by --exact)'))] +
2931 commitopts + commitopts2 + similarityopts,
2933 commitopts + commitopts2 + similarityopts,
2932 _('[OPTION]... PATCH...'))
2934 _('[OPTION]... PATCH...'))
2933 def import_(ui, repo, patch1=None, *patches, **opts):
2935 def import_(ui, repo, patch1=None, *patches, **opts):
2934 """import an ordered set of patches
2936 """import an ordered set of patches
2935
2937
2936 Import a list of patches and commit them individually (unless
2938 Import a list of patches and commit them individually (unless
2937 --no-commit is specified).
2939 --no-commit is specified).
2938
2940
2939 To read a patch from standard input (stdin), use "-" as the patch
2941 To read a patch from standard input (stdin), use "-" as the patch
2940 name. If a URL is specified, the patch will be downloaded from
2942 name. If a URL is specified, the patch will be downloaded from
2941 there.
2943 there.
2942
2944
2943 Import first applies changes to the working directory (unless
2945 Import first applies changes to the working directory (unless
2944 --bypass is specified), import will abort if there are outstanding
2946 --bypass is specified), import will abort if there are outstanding
2945 changes.
2947 changes.
2946
2948
2947 Use --bypass to apply and commit patches directly to the
2949 Use --bypass to apply and commit patches directly to the
2948 repository, without affecting the working directory. Without
2950 repository, without affecting the working directory. Without
2949 --exact, patches will be applied on top of the working directory
2951 --exact, patches will be applied on top of the working directory
2950 parent revision.
2952 parent revision.
2951
2953
2952 You can import a patch straight from a mail message. Even patches
2954 You can import a patch straight from a mail message. Even patches
2953 as attachments work (to use the body part, it must have type
2955 as attachments work (to use the body part, it must have type
2954 text/plain or text/x-patch). From and Subject headers of email
2956 text/plain or text/x-patch). From and Subject headers of email
2955 message are used as default committer and commit message. All
2957 message are used as default committer and commit message. All
2956 text/plain body parts before first diff are added to the commit
2958 text/plain body parts before first diff are added to the commit
2957 message.
2959 message.
2958
2960
2959 If the imported patch was generated by :hg:`export`, user and
2961 If the imported patch was generated by :hg:`export`, user and
2960 description from patch override values from message headers and
2962 description from patch override values from message headers and
2961 body. Values given on command line with -m/--message and -u/--user
2963 body. Values given on command line with -m/--message and -u/--user
2962 override these.
2964 override these.
2963
2965
2964 If --exact is specified, import will set the working directory to
2966 If --exact is specified, import will set the working directory to
2965 the parent of each patch before applying it, and will abort if the
2967 the parent of each patch before applying it, and will abort if the
2966 resulting changeset has a different ID than the one recorded in
2968 resulting changeset has a different ID than the one recorded in
2967 the patch. This will guard against various ways that portable
2969 the patch. This will guard against various ways that portable
2968 patch formats and mail systems might fail to transfer Mercurial
2970 patch formats and mail systems might fail to transfer Mercurial
2969 data or metadata. See :hg:`bundle` for lossless transmission.
2971 data or metadata. See :hg:`bundle` for lossless transmission.
2970
2972
2971 Use --partial to ensure a changeset will be created from the patch
2973 Use --partial to ensure a changeset will be created from the patch
2972 even if some hunks fail to apply. Hunks that fail to apply will be
2974 even if some hunks fail to apply. Hunks that fail to apply will be
2973 written to a <target-file>.rej file. Conflicts can then be resolved
2975 written to a <target-file>.rej file. Conflicts can then be resolved
2974 by hand before :hg:`commit --amend` is run to update the created
2976 by hand before :hg:`commit --amend` is run to update the created
2975 changeset. This flag exists to let people import patches that
2977 changeset. This flag exists to let people import patches that
2976 partially apply without losing the associated metadata (author,
2978 partially apply without losing the associated metadata (author,
2977 date, description, ...).
2979 date, description, ...).
2978
2980
2979 .. note::
2981 .. note::
2980
2982
2981 When no hunks apply cleanly, :hg:`import --partial` will create
2983 When no hunks apply cleanly, :hg:`import --partial` will create
2982 an empty changeset, importing only the patch metadata.
2984 an empty changeset, importing only the patch metadata.
2983
2985
2984 With -s/--similarity, hg will attempt to discover renames and
2986 With -s/--similarity, hg will attempt to discover renames and
2985 copies in the patch in the same way as :hg:`addremove`.
2987 copies in the patch in the same way as :hg:`addremove`.
2986
2988
2987 It is possible to use external patch programs to perform the patch
2989 It is possible to use external patch programs to perform the patch
2988 by setting the ``ui.patch`` configuration option. For the default
2990 by setting the ``ui.patch`` configuration option. For the default
2989 internal tool, the fuzz can also be configured via ``patch.fuzz``.
2991 internal tool, the fuzz can also be configured via ``patch.fuzz``.
2990 See :hg:`help config` for more information about configuration
2992 See :hg:`help config` for more information about configuration
2991 files and how to use these options.
2993 files and how to use these options.
2992
2994
2993 See :hg:`help dates` for a list of formats valid for -d/--date.
2995 See :hg:`help dates` for a list of formats valid for -d/--date.
2994
2996
2995 .. container:: verbose
2997 .. container:: verbose
2996
2998
2997 Examples:
2999 Examples:
2998
3000
2999 - import a traditional patch from a website and detect renames::
3001 - import a traditional patch from a website and detect renames::
3000
3002
3001 hg import -s 80 http://example.com/bugfix.patch
3003 hg import -s 80 http://example.com/bugfix.patch
3002
3004
3003 - import a changeset from an hgweb server::
3005 - import a changeset from an hgweb server::
3004
3006
3005 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
3007 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
3006
3008
3007 - import all the patches in an Unix-style mbox::
3009 - import all the patches in an Unix-style mbox::
3008
3010
3009 hg import incoming-patches.mbox
3011 hg import incoming-patches.mbox
3010
3012
3011 - import patches from stdin::
3013 - import patches from stdin::
3012
3014
3013 hg import -
3015 hg import -
3014
3016
3015 - attempt to exactly restore an exported changeset (not always
3017 - attempt to exactly restore an exported changeset (not always
3016 possible)::
3018 possible)::
3017
3019
3018 hg import --exact proposed-fix.patch
3020 hg import --exact proposed-fix.patch
3019
3021
3020 - use an external tool to apply a patch which is too fuzzy for
3022 - use an external tool to apply a patch which is too fuzzy for
3021 the default internal tool.
3023 the default internal tool.
3022
3024
3023 hg import --config ui.patch="patch --merge" fuzzy.patch
3025 hg import --config ui.patch="patch --merge" fuzzy.patch
3024
3026
3025 - change the default fuzzing from 2 to a less strict 7
3027 - change the default fuzzing from 2 to a less strict 7
3026
3028
3027 hg import --config ui.fuzz=7 fuzz.patch
3029 hg import --config ui.fuzz=7 fuzz.patch
3028
3030
3029 Returns 0 on success, 1 on partial success (see --partial).
3031 Returns 0 on success, 1 on partial success (see --partial).
3030 """
3032 """
3031
3033
3032 if not patch1:
3034 if not patch1:
3033 raise error.Abort(_('need at least one patch to import'))
3035 raise error.Abort(_('need at least one patch to import'))
3034
3036
3035 patches = (patch1,) + patches
3037 patches = (patch1,) + patches
3036
3038
3037 date = opts.get('date')
3039 date = opts.get('date')
3038 if date:
3040 if date:
3039 opts['date'] = util.parsedate(date)
3041 opts['date'] = util.parsedate(date)
3040
3042
3041 exact = opts.get('exact')
3043 exact = opts.get('exact')
3042 update = not opts.get('bypass')
3044 update = not opts.get('bypass')
3043 if not update and opts.get('no_commit'):
3045 if not update and opts.get('no_commit'):
3044 raise error.Abort(_('cannot use --no-commit with --bypass'))
3046 raise error.Abort(_('cannot use --no-commit with --bypass'))
3045 try:
3047 try:
3046 sim = float(opts.get('similarity') or 0)
3048 sim = float(opts.get('similarity') or 0)
3047 except ValueError:
3049 except ValueError:
3048 raise error.Abort(_('similarity must be a number'))
3050 raise error.Abort(_('similarity must be a number'))
3049 if sim < 0 or sim > 100:
3051 if sim < 0 or sim > 100:
3050 raise error.Abort(_('similarity must be between 0 and 100'))
3052 raise error.Abort(_('similarity must be between 0 and 100'))
3051 if sim and not update:
3053 if sim and not update:
3052 raise error.Abort(_('cannot use --similarity with --bypass'))
3054 raise error.Abort(_('cannot use --similarity with --bypass'))
3053 if exact:
3055 if exact:
3054 if opts.get('edit'):
3056 if opts.get('edit'):
3055 raise error.Abort(_('cannot use --exact with --edit'))
3057 raise error.Abort(_('cannot use --exact with --edit'))
3056 if opts.get('prefix'):
3058 if opts.get('prefix'):
3057 raise error.Abort(_('cannot use --exact with --prefix'))
3059 raise error.Abort(_('cannot use --exact with --prefix'))
3058
3060
3059 base = opts["base"]
3061 base = opts["base"]
3060 wlock = dsguard = lock = tr = None
3062 wlock = dsguard = lock = tr = None
3061 msgs = []
3063 msgs = []
3062 ret = 0
3064 ret = 0
3063
3065
3064
3066
3065 try:
3067 try:
3066 wlock = repo.wlock()
3068 wlock = repo.wlock()
3067
3069
3068 if update:
3070 if update:
3069 cmdutil.checkunfinished(repo)
3071 cmdutil.checkunfinished(repo)
3070 if (exact or not opts.get('force')):
3072 if (exact or not opts.get('force')):
3071 cmdutil.bailifchanged(repo)
3073 cmdutil.bailifchanged(repo)
3072
3074
3073 if not opts.get('no_commit'):
3075 if not opts.get('no_commit'):
3074 lock = repo.lock()
3076 lock = repo.lock()
3075 tr = repo.transaction('import')
3077 tr = repo.transaction('import')
3076 else:
3078 else:
3077 dsguard = dirstateguard.dirstateguard(repo, 'import')
3079 dsguard = dirstateguard.dirstateguard(repo, 'import')
3078 parents = repo[None].parents()
3080 parents = repo[None].parents()
3079 for patchurl in patches:
3081 for patchurl in patches:
3080 if patchurl == '-':
3082 if patchurl == '-':
3081 ui.status(_('applying patch from stdin\n'))
3083 ui.status(_('applying patch from stdin\n'))
3082 patchfile = ui.fin
3084 patchfile = ui.fin
3083 patchurl = 'stdin' # for error message
3085 patchurl = 'stdin' # for error message
3084 else:
3086 else:
3085 patchurl = os.path.join(base, patchurl)
3087 patchurl = os.path.join(base, patchurl)
3086 ui.status(_('applying %s\n') % patchurl)
3088 ui.status(_('applying %s\n') % patchurl)
3087 patchfile = hg.openpath(ui, patchurl)
3089 patchfile = hg.openpath(ui, patchurl)
3088
3090
3089 haspatch = False
3091 haspatch = False
3090 for hunk in patch.split(patchfile):
3092 for hunk in patch.split(patchfile):
3091 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
3093 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
3092 parents, opts,
3094 parents, opts,
3093 msgs, hg.clean)
3095 msgs, hg.clean)
3094 if msg:
3096 if msg:
3095 haspatch = True
3097 haspatch = True
3096 ui.note(msg + '\n')
3098 ui.note(msg + '\n')
3097 if update or exact:
3099 if update or exact:
3098 parents = repo[None].parents()
3100 parents = repo[None].parents()
3099 else:
3101 else:
3100 parents = [repo[node]]
3102 parents = [repo[node]]
3101 if rej:
3103 if rej:
3102 ui.write_err(_("patch applied partially\n"))
3104 ui.write_err(_("patch applied partially\n"))
3103 ui.write_err(_("(fix the .rej files and run "
3105 ui.write_err(_("(fix the .rej files and run "
3104 "`hg commit --amend`)\n"))
3106 "`hg commit --amend`)\n"))
3105 ret = 1
3107 ret = 1
3106 break
3108 break
3107
3109
3108 if not haspatch:
3110 if not haspatch:
3109 raise error.Abort(_('%s: no diffs found') % patchurl)
3111 raise error.Abort(_('%s: no diffs found') % patchurl)
3110
3112
3111 if tr:
3113 if tr:
3112 tr.close()
3114 tr.close()
3113 if msgs:
3115 if msgs:
3114 repo.savecommitmessage('\n* * *\n'.join(msgs))
3116 repo.savecommitmessage('\n* * *\n'.join(msgs))
3115 if dsguard:
3117 if dsguard:
3116 dsguard.close()
3118 dsguard.close()
3117 return ret
3119 return ret
3118 finally:
3120 finally:
3119 if tr:
3121 if tr:
3120 tr.release()
3122 tr.release()
3121 release(lock, dsguard, wlock)
3123 release(lock, dsguard, wlock)
3122
3124
3123 @command('incoming|in',
3125 @command('incoming|in',
3124 [('f', 'force', None,
3126 [('f', 'force', None,
3125 _('run even if remote repository is unrelated')),
3127 _('run even if remote repository is unrelated')),
3126 ('n', 'newest-first', None, _('show newest record first')),
3128 ('n', 'newest-first', None, _('show newest record first')),
3127 ('', 'bundle', '',
3129 ('', 'bundle', '',
3128 _('file to store the bundles into'), _('FILE')),
3130 _('file to store the bundles into'), _('FILE')),
3129 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3131 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3130 ('B', 'bookmarks', False, _("compare bookmarks")),
3132 ('B', 'bookmarks', False, _("compare bookmarks")),
3131 ('b', 'branch', [],
3133 ('b', 'branch', [],
3132 _('a specific branch you would like to pull'), _('BRANCH')),
3134 _('a specific branch you would like to pull'), _('BRANCH')),
3133 ] + logopts + remoteopts + subrepoopts,
3135 ] + logopts + remoteopts + subrepoopts,
3134 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3136 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3135 def incoming(ui, repo, source="default", **opts):
3137 def incoming(ui, repo, source="default", **opts):
3136 """show new changesets found in source
3138 """show new changesets found in source
3137
3139
3138 Show new changesets found in the specified path/URL or the default
3140 Show new changesets found in the specified path/URL or the default
3139 pull location. These are the changesets that would have been pulled
3141 pull location. These are the changesets that would have been pulled
3140 if a pull at the time you issued this command.
3142 if a pull at the time you issued this command.
3141
3143
3142 See pull for valid source format details.
3144 See pull for valid source format details.
3143
3145
3144 .. container:: verbose
3146 .. container:: verbose
3145
3147
3146 With -B/--bookmarks, the result of bookmark comparison between
3148 With -B/--bookmarks, the result of bookmark comparison between
3147 local and remote repositories is displayed. With -v/--verbose,
3149 local and remote repositories is displayed. With -v/--verbose,
3148 status is also displayed for each bookmark like below::
3150 status is also displayed for each bookmark like below::
3149
3151
3150 BM1 01234567890a added
3152 BM1 01234567890a added
3151 BM2 1234567890ab advanced
3153 BM2 1234567890ab advanced
3152 BM3 234567890abc diverged
3154 BM3 234567890abc diverged
3153 BM4 34567890abcd changed
3155 BM4 34567890abcd changed
3154
3156
3155 The action taken locally when pulling depends on the
3157 The action taken locally when pulling depends on the
3156 status of each bookmark:
3158 status of each bookmark:
3157
3159
3158 :``added``: pull will create it
3160 :``added``: pull will create it
3159 :``advanced``: pull will update it
3161 :``advanced``: pull will update it
3160 :``diverged``: pull will create a divergent bookmark
3162 :``diverged``: pull will create a divergent bookmark
3161 :``changed``: result depends on remote changesets
3163 :``changed``: result depends on remote changesets
3162
3164
3163 From the point of view of pulling behavior, bookmark
3165 From the point of view of pulling behavior, bookmark
3164 existing only in the remote repository are treated as ``added``,
3166 existing only in the remote repository are treated as ``added``,
3165 even if it is in fact locally deleted.
3167 even if it is in fact locally deleted.
3166
3168
3167 .. container:: verbose
3169 .. container:: verbose
3168
3170
3169 For remote repository, using --bundle avoids downloading the
3171 For remote repository, using --bundle avoids downloading the
3170 changesets twice if the incoming is followed by a pull.
3172 changesets twice if the incoming is followed by a pull.
3171
3173
3172 Examples:
3174 Examples:
3173
3175
3174 - show incoming changes with patches and full description::
3176 - show incoming changes with patches and full description::
3175
3177
3176 hg incoming -vp
3178 hg incoming -vp
3177
3179
3178 - show incoming changes excluding merges, store a bundle::
3180 - show incoming changes excluding merges, store a bundle::
3179
3181
3180 hg in -vpM --bundle incoming.hg
3182 hg in -vpM --bundle incoming.hg
3181 hg pull incoming.hg
3183 hg pull incoming.hg
3182
3184
3183 - briefly list changes inside a bundle::
3185 - briefly list changes inside a bundle::
3184
3186
3185 hg in changes.hg -T "{desc|firstline}\\n"
3187 hg in changes.hg -T "{desc|firstline}\\n"
3186
3188
3187 Returns 0 if there are incoming changes, 1 otherwise.
3189 Returns 0 if there are incoming changes, 1 otherwise.
3188 """
3190 """
3189 opts = pycompat.byteskwargs(opts)
3191 opts = pycompat.byteskwargs(opts)
3190 if opts.get('graph'):
3192 if opts.get('graph'):
3191 cmdutil.checkunsupportedgraphflags([], opts)
3193 cmdutil.checkunsupportedgraphflags([], opts)
3192 def display(other, chlist, displayer):
3194 def display(other, chlist, displayer):
3193 revdag = cmdutil.graphrevs(other, chlist, opts)
3195 revdag = cmdutil.graphrevs(other, chlist, opts)
3194 cmdutil.displaygraph(ui, repo, revdag, displayer,
3196 cmdutil.displaygraph(ui, repo, revdag, displayer,
3195 graphmod.asciiedges)
3197 graphmod.asciiedges)
3196
3198
3197 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3199 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3198 return 0
3200 return 0
3199
3201
3200 if opts.get('bundle') and opts.get('subrepos'):
3202 if opts.get('bundle') and opts.get('subrepos'):
3201 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3203 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3202
3204
3203 if opts.get('bookmarks'):
3205 if opts.get('bookmarks'):
3204 source, branches = hg.parseurl(ui.expandpath(source),
3206 source, branches = hg.parseurl(ui.expandpath(source),
3205 opts.get('branch'))
3207 opts.get('branch'))
3206 other = hg.peer(repo, opts, source)
3208 other = hg.peer(repo, opts, source)
3207 if 'bookmarks' not in other.listkeys('namespaces'):
3209 if 'bookmarks' not in other.listkeys('namespaces'):
3208 ui.warn(_("remote doesn't support bookmarks\n"))
3210 ui.warn(_("remote doesn't support bookmarks\n"))
3209 return 0
3211 return 0
3210 ui.pager('incoming')
3212 ui.pager('incoming')
3211 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3213 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3212 return bookmarks.incoming(ui, repo, other)
3214 return bookmarks.incoming(ui, repo, other)
3213
3215
3214 repo._subtoppath = ui.expandpath(source)
3216 repo._subtoppath = ui.expandpath(source)
3215 try:
3217 try:
3216 return hg.incoming(ui, repo, source, opts)
3218 return hg.incoming(ui, repo, source, opts)
3217 finally:
3219 finally:
3218 del repo._subtoppath
3220 del repo._subtoppath
3219
3221
3220
3222
3221 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3223 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3222 norepo=True)
3224 norepo=True)
3223 def init(ui, dest=".", **opts):
3225 def init(ui, dest=".", **opts):
3224 """create a new repository in the given directory
3226 """create a new repository in the given directory
3225
3227
3226 Initialize a new repository in the given directory. If the given
3228 Initialize a new repository in the given directory. If the given
3227 directory does not exist, it will be created.
3229 directory does not exist, it will be created.
3228
3230
3229 If no directory is given, the current directory is used.
3231 If no directory is given, the current directory is used.
3230
3232
3231 It is possible to specify an ``ssh://`` URL as the destination.
3233 It is possible to specify an ``ssh://`` URL as the destination.
3232 See :hg:`help urls` for more information.
3234 See :hg:`help urls` for more information.
3233
3235
3234 Returns 0 on success.
3236 Returns 0 on success.
3235 """
3237 """
3236 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3238 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3237
3239
3238 @command('locate',
3240 @command('locate',
3239 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3241 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3240 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3242 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3241 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3243 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3242 ] + walkopts,
3244 ] + walkopts,
3243 _('[OPTION]... [PATTERN]...'))
3245 _('[OPTION]... [PATTERN]...'))
3244 def locate(ui, repo, *pats, **opts):
3246 def locate(ui, repo, *pats, **opts):
3245 """locate files matching specific patterns (DEPRECATED)
3247 """locate files matching specific patterns (DEPRECATED)
3246
3248
3247 Print files under Mercurial control in the working directory whose
3249 Print files under Mercurial control in the working directory whose
3248 names match the given patterns.
3250 names match the given patterns.
3249
3251
3250 By default, this command searches all directories in the working
3252 By default, this command searches all directories in the working
3251 directory. To search just the current directory and its
3253 directory. To search just the current directory and its
3252 subdirectories, use "--include .".
3254 subdirectories, use "--include .".
3253
3255
3254 If no patterns are given to match, this command prints the names
3256 If no patterns are given to match, this command prints the names
3255 of all files under Mercurial control in the working directory.
3257 of all files under Mercurial control in the working directory.
3256
3258
3257 If you want to feed the output of this command into the "xargs"
3259 If you want to feed the output of this command into the "xargs"
3258 command, use the -0 option to both this command and "xargs". This
3260 command, use the -0 option to both this command and "xargs". This
3259 will avoid the problem of "xargs" treating single filenames that
3261 will avoid the problem of "xargs" treating single filenames that
3260 contain whitespace as multiple filenames.
3262 contain whitespace as multiple filenames.
3261
3263
3262 See :hg:`help files` for a more versatile command.
3264 See :hg:`help files` for a more versatile command.
3263
3265
3264 Returns 0 if a match is found, 1 otherwise.
3266 Returns 0 if a match is found, 1 otherwise.
3265 """
3267 """
3266 if opts.get('print0'):
3268 if opts.get('print0'):
3267 end = '\0'
3269 end = '\0'
3268 else:
3270 else:
3269 end = '\n'
3271 end = '\n'
3270 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3272 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3271
3273
3272 ret = 1
3274 ret = 1
3273 ctx = repo[rev]
3275 ctx = repo[rev]
3274 m = scmutil.match(ctx, pats, opts, default='relglob',
3276 m = scmutil.match(ctx, pats, opts, default='relglob',
3275 badfn=lambda x, y: False)
3277 badfn=lambda x, y: False)
3276
3278
3277 ui.pager('locate')
3279 ui.pager('locate')
3278 for abs in ctx.matches(m):
3280 for abs in ctx.matches(m):
3279 if opts.get('fullpath'):
3281 if opts.get('fullpath'):
3280 ui.write(repo.wjoin(abs), end)
3282 ui.write(repo.wjoin(abs), end)
3281 else:
3283 else:
3282 ui.write(((pats and m.rel(abs)) or abs), end)
3284 ui.write(((pats and m.rel(abs)) or abs), end)
3283 ret = 0
3285 ret = 0
3284
3286
3285 return ret
3287 return ret
3286
3288
3287 @command('^log|history',
3289 @command('^log|history',
3288 [('f', 'follow', None,
3290 [('f', 'follow', None,
3289 _('follow changeset history, or file history across copies and renames')),
3291 _('follow changeset history, or file history across copies and renames')),
3290 ('', 'follow-first', None,
3292 ('', 'follow-first', None,
3291 _('only follow the first parent of merge changesets (DEPRECATED)')),
3293 _('only follow the first parent of merge changesets (DEPRECATED)')),
3292 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3294 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3293 ('C', 'copies', None, _('show copied files')),
3295 ('C', 'copies', None, _('show copied files')),
3294 ('k', 'keyword', [],
3296 ('k', 'keyword', [],
3295 _('do case-insensitive search for a given text'), _('TEXT')),
3297 _('do case-insensitive search for a given text'), _('TEXT')),
3296 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3298 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3297 ('', 'removed', None, _('include revisions where files were removed')),
3299 ('', 'removed', None, _('include revisions where files were removed')),
3298 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3300 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3299 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3301 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3300 ('', 'only-branch', [],
3302 ('', 'only-branch', [],
3301 _('show only changesets within the given named branch (DEPRECATED)'),
3303 _('show only changesets within the given named branch (DEPRECATED)'),
3302 _('BRANCH')),
3304 _('BRANCH')),
3303 ('b', 'branch', [],
3305 ('b', 'branch', [],
3304 _('show changesets within the given named branch'), _('BRANCH')),
3306 _('show changesets within the given named branch'), _('BRANCH')),
3305 ('P', 'prune', [],
3307 ('P', 'prune', [],
3306 _('do not display revision or any of its ancestors'), _('REV')),
3308 _('do not display revision or any of its ancestors'), _('REV')),
3307 ] + logopts + walkopts,
3309 ] + logopts + walkopts,
3308 _('[OPTION]... [FILE]'),
3310 _('[OPTION]... [FILE]'),
3309 inferrepo=True)
3311 inferrepo=True)
3310 def log(ui, repo, *pats, **opts):
3312 def log(ui, repo, *pats, **opts):
3311 """show revision history of entire repository or files
3313 """show revision history of entire repository or files
3312
3314
3313 Print the revision history of the specified files or the entire
3315 Print the revision history of the specified files or the entire
3314 project.
3316 project.
3315
3317
3316 If no revision range is specified, the default is ``tip:0`` unless
3318 If no revision range is specified, the default is ``tip:0`` unless
3317 --follow is set, in which case the working directory parent is
3319 --follow is set, in which case the working directory parent is
3318 used as the starting revision.
3320 used as the starting revision.
3319
3321
3320 File history is shown without following rename or copy history of
3322 File history is shown without following rename or copy history of
3321 files. Use -f/--follow with a filename to follow history across
3323 files. Use -f/--follow with a filename to follow history across
3322 renames and copies. --follow without a filename will only show
3324 renames and copies. --follow without a filename will only show
3323 ancestors or descendants of the starting revision.
3325 ancestors or descendants of the starting revision.
3324
3326
3325 By default this command prints revision number and changeset id,
3327 By default this command prints revision number and changeset id,
3326 tags, non-trivial parents, user, date and time, and a summary for
3328 tags, non-trivial parents, user, date and time, and a summary for
3327 each commit. When the -v/--verbose switch is used, the list of
3329 each commit. When the -v/--verbose switch is used, the list of
3328 changed files and full commit message are shown.
3330 changed files and full commit message are shown.
3329
3331
3330 With --graph the revisions are shown as an ASCII art DAG with the most
3332 With --graph the revisions are shown as an ASCII art DAG with the most
3331 recent changeset at the top.
3333 recent changeset at the top.
3332 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
3334 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
3333 and '+' represents a fork where the changeset from the lines below is a
3335 and '+' represents a fork where the changeset from the lines below is a
3334 parent of the 'o' merge on the same line.
3336 parent of the 'o' merge on the same line.
3335
3337
3336 .. note::
3338 .. note::
3337
3339
3338 :hg:`log --patch` may generate unexpected diff output for merge
3340 :hg:`log --patch` may generate unexpected diff output for merge
3339 changesets, as it will only compare the merge changeset against
3341 changesets, as it will only compare the merge changeset against
3340 its first parent. Also, only files different from BOTH parents
3342 its first parent. Also, only files different from BOTH parents
3341 will appear in files:.
3343 will appear in files:.
3342
3344
3343 .. note::
3345 .. note::
3344
3346
3345 For performance reasons, :hg:`log FILE` may omit duplicate changes
3347 For performance reasons, :hg:`log FILE` may omit duplicate changes
3346 made on branches and will not show removals or mode changes. To
3348 made on branches and will not show removals or mode changes. To
3347 see all such changes, use the --removed switch.
3349 see all such changes, use the --removed switch.
3348
3350
3349 .. container:: verbose
3351 .. container:: verbose
3350
3352
3351 Some examples:
3353 Some examples:
3352
3354
3353 - changesets with full descriptions and file lists::
3355 - changesets with full descriptions and file lists::
3354
3356
3355 hg log -v
3357 hg log -v
3356
3358
3357 - changesets ancestral to the working directory::
3359 - changesets ancestral to the working directory::
3358
3360
3359 hg log -f
3361 hg log -f
3360
3362
3361 - last 10 commits on the current branch::
3363 - last 10 commits on the current branch::
3362
3364
3363 hg log -l 10 -b .
3365 hg log -l 10 -b .
3364
3366
3365 - changesets showing all modifications of a file, including removals::
3367 - changesets showing all modifications of a file, including removals::
3366
3368
3367 hg log --removed file.c
3369 hg log --removed file.c
3368
3370
3369 - all changesets that touch a directory, with diffs, excluding merges::
3371 - all changesets that touch a directory, with diffs, excluding merges::
3370
3372
3371 hg log -Mp lib/
3373 hg log -Mp lib/
3372
3374
3373 - all revision numbers that match a keyword::
3375 - all revision numbers that match a keyword::
3374
3376
3375 hg log -k bug --template "{rev}\\n"
3377 hg log -k bug --template "{rev}\\n"
3376
3378
3377 - the full hash identifier of the working directory parent::
3379 - the full hash identifier of the working directory parent::
3378
3380
3379 hg log -r . --template "{node}\\n"
3381 hg log -r . --template "{node}\\n"
3380
3382
3381 - list available log templates::
3383 - list available log templates::
3382
3384
3383 hg log -T list
3385 hg log -T list
3384
3386
3385 - check if a given changeset is included in a tagged release::
3387 - check if a given changeset is included in a tagged release::
3386
3388
3387 hg log -r "a21ccf and ancestor(1.9)"
3389 hg log -r "a21ccf and ancestor(1.9)"
3388
3390
3389 - find all changesets by some user in a date range::
3391 - find all changesets by some user in a date range::
3390
3392
3391 hg log -k alice -d "may 2008 to jul 2008"
3393 hg log -k alice -d "may 2008 to jul 2008"
3392
3394
3393 - summary of all changesets after the last tag::
3395 - summary of all changesets after the last tag::
3394
3396
3395 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3397 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3396
3398
3397 See :hg:`help dates` for a list of formats valid for -d/--date.
3399 See :hg:`help dates` for a list of formats valid for -d/--date.
3398
3400
3399 See :hg:`help revisions` for more about specifying and ordering
3401 See :hg:`help revisions` for more about specifying and ordering
3400 revisions.
3402 revisions.
3401
3403
3402 See :hg:`help templates` for more about pre-packaged styles and
3404 See :hg:`help templates` for more about pre-packaged styles and
3403 specifying custom templates.
3405 specifying custom templates.
3404
3406
3405 Returns 0 on success.
3407 Returns 0 on success.
3406
3408
3407 """
3409 """
3408 opts = pycompat.byteskwargs(opts)
3410 opts = pycompat.byteskwargs(opts)
3409 if opts.get('follow') and opts.get('rev'):
3411 if opts.get('follow') and opts.get('rev'):
3410 opts['rev'] = [revsetlang.formatspec('reverse(::%lr)', opts.get('rev'))]
3412 opts['rev'] = [revsetlang.formatspec('reverse(::%lr)', opts.get('rev'))]
3411 del opts['follow']
3413 del opts['follow']
3412
3414
3413 if opts.get('graph'):
3415 if opts.get('graph'):
3414 return cmdutil.graphlog(ui, repo, pats, opts)
3416 return cmdutil.graphlog(ui, repo, pats, opts)
3415
3417
3416 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
3418 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
3417 limit = cmdutil.loglimit(opts)
3419 limit = cmdutil.loglimit(opts)
3418 count = 0
3420 count = 0
3419
3421
3420 getrenamed = None
3422 getrenamed = None
3421 if opts.get('copies'):
3423 if opts.get('copies'):
3422 endrev = None
3424 endrev = None
3423 if opts.get('rev'):
3425 if opts.get('rev'):
3424 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
3426 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
3425 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3427 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3426
3428
3427 ui.pager('log')
3429 ui.pager('log')
3428 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3430 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3429 for rev in revs:
3431 for rev in revs:
3430 if count == limit:
3432 if count == limit:
3431 break
3433 break
3432 ctx = repo[rev]
3434 ctx = repo[rev]
3433 copies = None
3435 copies = None
3434 if getrenamed is not None and rev:
3436 if getrenamed is not None and rev:
3435 copies = []
3437 copies = []
3436 for fn in ctx.files():
3438 for fn in ctx.files():
3437 rename = getrenamed(fn, rev)
3439 rename = getrenamed(fn, rev)
3438 if rename:
3440 if rename:
3439 copies.append((fn, rename[0]))
3441 copies.append((fn, rename[0]))
3440 if filematcher:
3442 if filematcher:
3441 revmatchfn = filematcher(ctx.rev())
3443 revmatchfn = filematcher(ctx.rev())
3442 else:
3444 else:
3443 revmatchfn = None
3445 revmatchfn = None
3444 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
3446 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
3445 if displayer.flush(ctx):
3447 if displayer.flush(ctx):
3446 count += 1
3448 count += 1
3447
3449
3448 displayer.close()
3450 displayer.close()
3449
3451
3450 @command('manifest',
3452 @command('manifest',
3451 [('r', 'rev', '', _('revision to display'), _('REV')),
3453 [('r', 'rev', '', _('revision to display'), _('REV')),
3452 ('', 'all', False, _("list files from all revisions"))]
3454 ('', 'all', False, _("list files from all revisions"))]
3453 + formatteropts,
3455 + formatteropts,
3454 _('[-r REV]'))
3456 _('[-r REV]'))
3455 def manifest(ui, repo, node=None, rev=None, **opts):
3457 def manifest(ui, repo, node=None, rev=None, **opts):
3456 """output the current or given revision of the project manifest
3458 """output the current or given revision of the project manifest
3457
3459
3458 Print a list of version controlled files for the given revision.
3460 Print a list of version controlled files for the given revision.
3459 If no revision is given, the first parent of the working directory
3461 If no revision is given, the first parent of the working directory
3460 is used, or the null revision if no revision is checked out.
3462 is used, or the null revision if no revision is checked out.
3461
3463
3462 With -v, print file permissions, symlink and executable bits.
3464 With -v, print file permissions, symlink and executable bits.
3463 With --debug, print file revision hashes.
3465 With --debug, print file revision hashes.
3464
3466
3465 If option --all is specified, the list of all files from all revisions
3467 If option --all is specified, the list of all files from all revisions
3466 is printed. This includes deleted and renamed files.
3468 is printed. This includes deleted and renamed files.
3467
3469
3468 Returns 0 on success.
3470 Returns 0 on success.
3469 """
3471 """
3470 fm = ui.formatter('manifest', opts)
3472 fm = ui.formatter('manifest', opts)
3471
3473
3472 if opts.get('all'):
3474 if opts.get('all'):
3473 if rev or node:
3475 if rev or node:
3474 raise error.Abort(_("can't specify a revision with --all"))
3476 raise error.Abort(_("can't specify a revision with --all"))
3475
3477
3476 res = []
3478 res = []
3477 prefix = "data/"
3479 prefix = "data/"
3478 suffix = ".i"
3480 suffix = ".i"
3479 plen = len(prefix)
3481 plen = len(prefix)
3480 slen = len(suffix)
3482 slen = len(suffix)
3481 with repo.lock():
3483 with repo.lock():
3482 for fn, b, size in repo.store.datafiles():
3484 for fn, b, size in repo.store.datafiles():
3483 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3485 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3484 res.append(fn[plen:-slen])
3486 res.append(fn[plen:-slen])
3485 ui.pager('manifest')
3487 ui.pager('manifest')
3486 for f in res:
3488 for f in res:
3487 fm.startitem()
3489 fm.startitem()
3488 fm.write("path", '%s\n', f)
3490 fm.write("path", '%s\n', f)
3489 fm.end()
3491 fm.end()
3490 return
3492 return
3491
3493
3492 if rev and node:
3494 if rev and node:
3493 raise error.Abort(_("please specify just one revision"))
3495 raise error.Abort(_("please specify just one revision"))
3494
3496
3495 if not node:
3497 if not node:
3496 node = rev
3498 node = rev
3497
3499
3498 char = {'l': '@', 'x': '*', '': ''}
3500 char = {'l': '@', 'x': '*', '': ''}
3499 mode = {'l': '644', 'x': '755', '': '644'}
3501 mode = {'l': '644', 'x': '755', '': '644'}
3500 ctx = scmutil.revsingle(repo, node)
3502 ctx = scmutil.revsingle(repo, node)
3501 mf = ctx.manifest()
3503 mf = ctx.manifest()
3502 ui.pager('manifest')
3504 ui.pager('manifest')
3503 for f in ctx:
3505 for f in ctx:
3504 fm.startitem()
3506 fm.startitem()
3505 fl = ctx[f].flags()
3507 fl = ctx[f].flags()
3506 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3508 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3507 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3509 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3508 fm.write('path', '%s\n', f)
3510 fm.write('path', '%s\n', f)
3509 fm.end()
3511 fm.end()
3510
3512
3511 @command('^merge',
3513 @command('^merge',
3512 [('f', 'force', None,
3514 [('f', 'force', None,
3513 _('force a merge including outstanding changes (DEPRECATED)')),
3515 _('force a merge including outstanding changes (DEPRECATED)')),
3514 ('r', 'rev', '', _('revision to merge'), _('REV')),
3516 ('r', 'rev', '', _('revision to merge'), _('REV')),
3515 ('P', 'preview', None,
3517 ('P', 'preview', None,
3516 _('review revisions to merge (no merge is performed)'))
3518 _('review revisions to merge (no merge is performed)'))
3517 ] + mergetoolopts,
3519 ] + mergetoolopts,
3518 _('[-P] [[-r] REV]'))
3520 _('[-P] [[-r] REV]'))
3519 def merge(ui, repo, node=None, **opts):
3521 def merge(ui, repo, node=None, **opts):
3520 """merge another revision into working directory
3522 """merge another revision into working directory
3521
3523
3522 The current working directory is updated with all changes made in
3524 The current working directory is updated with all changes made in
3523 the requested revision since the last common predecessor revision.
3525 the requested revision since the last common predecessor revision.
3524
3526
3525 Files that changed between either parent are marked as changed for
3527 Files that changed between either parent are marked as changed for
3526 the next commit and a commit must be performed before any further
3528 the next commit and a commit must be performed before any further
3527 updates to the repository are allowed. The next commit will have
3529 updates to the repository are allowed. The next commit will have
3528 two parents.
3530 two parents.
3529
3531
3530 ``--tool`` can be used to specify the merge tool used for file
3532 ``--tool`` can be used to specify the merge tool used for file
3531 merges. It overrides the HGMERGE environment variable and your
3533 merges. It overrides the HGMERGE environment variable and your
3532 configuration files. See :hg:`help merge-tools` for options.
3534 configuration files. See :hg:`help merge-tools` for options.
3533
3535
3534 If no revision is specified, the working directory's parent is a
3536 If no revision is specified, the working directory's parent is a
3535 head revision, and the current branch contains exactly one other
3537 head revision, and the current branch contains exactly one other
3536 head, the other head is merged with by default. Otherwise, an
3538 head, the other head is merged with by default. Otherwise, an
3537 explicit revision with which to merge with must be provided.
3539 explicit revision with which to merge with must be provided.
3538
3540
3539 See :hg:`help resolve` for information on handling file conflicts.
3541 See :hg:`help resolve` for information on handling file conflicts.
3540
3542
3541 To undo an uncommitted merge, use :hg:`update --clean .` which
3543 To undo an uncommitted merge, use :hg:`update --clean .` which
3542 will check out a clean copy of the original merge parent, losing
3544 will check out a clean copy of the original merge parent, losing
3543 all changes.
3545 all changes.
3544
3546
3545 Returns 0 on success, 1 if there are unresolved files.
3547 Returns 0 on success, 1 if there are unresolved files.
3546 """
3548 """
3547
3549
3548 if opts.get('rev') and node:
3550 if opts.get('rev') and node:
3549 raise error.Abort(_("please specify just one revision"))
3551 raise error.Abort(_("please specify just one revision"))
3550 if not node:
3552 if not node:
3551 node = opts.get('rev')
3553 node = opts.get('rev')
3552
3554
3553 if node:
3555 if node:
3554 node = scmutil.revsingle(repo, node).node()
3556 node = scmutil.revsingle(repo, node).node()
3555
3557
3556 if not node:
3558 if not node:
3557 node = repo[destutil.destmerge(repo)].node()
3559 node = repo[destutil.destmerge(repo)].node()
3558
3560
3559 if opts.get('preview'):
3561 if opts.get('preview'):
3560 # find nodes that are ancestors of p2 but not of p1
3562 # find nodes that are ancestors of p2 but not of p1
3561 p1 = repo.lookup('.')
3563 p1 = repo.lookup('.')
3562 p2 = repo.lookup(node)
3564 p2 = repo.lookup(node)
3563 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3565 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3564
3566
3565 displayer = cmdutil.show_changeset(ui, repo, opts)
3567 displayer = cmdutil.show_changeset(ui, repo, opts)
3566 for node in nodes:
3568 for node in nodes:
3567 displayer.show(repo[node])
3569 displayer.show(repo[node])
3568 displayer.close()
3570 displayer.close()
3569 return 0
3571 return 0
3570
3572
3571 try:
3573 try:
3572 # ui.forcemerge is an internal variable, do not document
3574 # ui.forcemerge is an internal variable, do not document
3573 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
3575 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
3574 force = opts.get('force')
3576 force = opts.get('force')
3575 labels = ['working copy', 'merge rev']
3577 labels = ['working copy', 'merge rev']
3576 return hg.merge(repo, node, force=force, mergeforce=force,
3578 return hg.merge(repo, node, force=force, mergeforce=force,
3577 labels=labels)
3579 labels=labels)
3578 finally:
3580 finally:
3579 ui.setconfig('ui', 'forcemerge', '', 'merge')
3581 ui.setconfig('ui', 'forcemerge', '', 'merge')
3580
3582
3581 @command('outgoing|out',
3583 @command('outgoing|out',
3582 [('f', 'force', None, _('run even when the destination is unrelated')),
3584 [('f', 'force', None, _('run even when the destination is unrelated')),
3583 ('r', 'rev', [],
3585 ('r', 'rev', [],
3584 _('a changeset intended to be included in the destination'), _('REV')),
3586 _('a changeset intended to be included in the destination'), _('REV')),
3585 ('n', 'newest-first', None, _('show newest record first')),
3587 ('n', 'newest-first', None, _('show newest record first')),
3586 ('B', 'bookmarks', False, _('compare bookmarks')),
3588 ('B', 'bookmarks', False, _('compare bookmarks')),
3587 ('b', 'branch', [], _('a specific branch you would like to push'),
3589 ('b', 'branch', [], _('a specific branch you would like to push'),
3588 _('BRANCH')),
3590 _('BRANCH')),
3589 ] + logopts + remoteopts + subrepoopts,
3591 ] + logopts + remoteopts + subrepoopts,
3590 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3592 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3591 def outgoing(ui, repo, dest=None, **opts):
3593 def outgoing(ui, repo, dest=None, **opts):
3592 """show changesets not found in the destination
3594 """show changesets not found in the destination
3593
3595
3594 Show changesets not found in the specified destination repository
3596 Show changesets not found in the specified destination repository
3595 or the default push location. These are the changesets that would
3597 or the default push location. These are the changesets that would
3596 be pushed if a push was requested.
3598 be pushed if a push was requested.
3597
3599
3598 See pull for details of valid destination formats.
3600 See pull for details of valid destination formats.
3599
3601
3600 .. container:: verbose
3602 .. container:: verbose
3601
3603
3602 With -B/--bookmarks, the result of bookmark comparison between
3604 With -B/--bookmarks, the result of bookmark comparison between
3603 local and remote repositories is displayed. With -v/--verbose,
3605 local and remote repositories is displayed. With -v/--verbose,
3604 status is also displayed for each bookmark like below::
3606 status is also displayed for each bookmark like below::
3605
3607
3606 BM1 01234567890a added
3608 BM1 01234567890a added
3607 BM2 deleted
3609 BM2 deleted
3608 BM3 234567890abc advanced
3610 BM3 234567890abc advanced
3609 BM4 34567890abcd diverged
3611 BM4 34567890abcd diverged
3610 BM5 4567890abcde changed
3612 BM5 4567890abcde changed
3611
3613
3612 The action taken when pushing depends on the
3614 The action taken when pushing depends on the
3613 status of each bookmark:
3615 status of each bookmark:
3614
3616
3615 :``added``: push with ``-B`` will create it
3617 :``added``: push with ``-B`` will create it
3616 :``deleted``: push with ``-B`` will delete it
3618 :``deleted``: push with ``-B`` will delete it
3617 :``advanced``: push will update it
3619 :``advanced``: push will update it
3618 :``diverged``: push with ``-B`` will update it
3620 :``diverged``: push with ``-B`` will update it
3619 :``changed``: push with ``-B`` will update it
3621 :``changed``: push with ``-B`` will update it
3620
3622
3621 From the point of view of pushing behavior, bookmarks
3623 From the point of view of pushing behavior, bookmarks
3622 existing only in the remote repository are treated as
3624 existing only in the remote repository are treated as
3623 ``deleted``, even if it is in fact added remotely.
3625 ``deleted``, even if it is in fact added remotely.
3624
3626
3625 Returns 0 if there are outgoing changes, 1 otherwise.
3627 Returns 0 if there are outgoing changes, 1 otherwise.
3626 """
3628 """
3627 if opts.get('graph'):
3629 if opts.get('graph'):
3628 cmdutil.checkunsupportedgraphflags([], opts)
3630 cmdutil.checkunsupportedgraphflags([], opts)
3629 o, other = hg._outgoing(ui, repo, dest, opts)
3631 o, other = hg._outgoing(ui, repo, dest, opts)
3630 if not o:
3632 if not o:
3631 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3633 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3632 return
3634 return
3633
3635
3634 revdag = cmdutil.graphrevs(repo, o, opts)
3636 revdag = cmdutil.graphrevs(repo, o, opts)
3635 ui.pager('outgoing')
3637 ui.pager('outgoing')
3636 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3638 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3637 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
3639 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
3638 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3640 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3639 return 0
3641 return 0
3640
3642
3641 if opts.get('bookmarks'):
3643 if opts.get('bookmarks'):
3642 dest = ui.expandpath(dest or 'default-push', dest or 'default')
3644 dest = ui.expandpath(dest or 'default-push', dest or 'default')
3643 dest, branches = hg.parseurl(dest, opts.get('branch'))
3645 dest, branches = hg.parseurl(dest, opts.get('branch'))
3644 other = hg.peer(repo, opts, dest)
3646 other = hg.peer(repo, opts, dest)
3645 if 'bookmarks' not in other.listkeys('namespaces'):
3647 if 'bookmarks' not in other.listkeys('namespaces'):
3646 ui.warn(_("remote doesn't support bookmarks\n"))
3648 ui.warn(_("remote doesn't support bookmarks\n"))
3647 return 0
3649 return 0
3648 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3650 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3649 ui.pager('outgoing')
3651 ui.pager('outgoing')
3650 return bookmarks.outgoing(ui, repo, other)
3652 return bookmarks.outgoing(ui, repo, other)
3651
3653
3652 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
3654 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
3653 try:
3655 try:
3654 return hg.outgoing(ui, repo, dest, opts)
3656 return hg.outgoing(ui, repo, dest, opts)
3655 finally:
3657 finally:
3656 del repo._subtoppath
3658 del repo._subtoppath
3657
3659
3658 @command('parents',
3660 @command('parents',
3659 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3661 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3660 ] + templateopts,
3662 ] + templateopts,
3661 _('[-r REV] [FILE]'),
3663 _('[-r REV] [FILE]'),
3662 inferrepo=True)
3664 inferrepo=True)
3663 def parents(ui, repo, file_=None, **opts):
3665 def parents(ui, repo, file_=None, **opts):
3664 """show the parents of the working directory or revision (DEPRECATED)
3666 """show the parents of the working directory or revision (DEPRECATED)
3665
3667
3666 Print the working directory's parent revisions. If a revision is
3668 Print the working directory's parent revisions. If a revision is
3667 given via -r/--rev, the parent of that revision will be printed.
3669 given via -r/--rev, the parent of that revision will be printed.
3668 If a file argument is given, the revision in which the file was
3670 If a file argument is given, the revision in which the file was
3669 last changed (before the working directory revision or the
3671 last changed (before the working directory revision or the
3670 argument to --rev if given) is printed.
3672 argument to --rev if given) is printed.
3671
3673
3672 This command is equivalent to::
3674 This command is equivalent to::
3673
3675
3674 hg log -r "p1()+p2()" or
3676 hg log -r "p1()+p2()" or
3675 hg log -r "p1(REV)+p2(REV)" or
3677 hg log -r "p1(REV)+p2(REV)" or
3676 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3678 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3677 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3679 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3678
3680
3679 See :hg:`summary` and :hg:`help revsets` for related information.
3681 See :hg:`summary` and :hg:`help revsets` for related information.
3680
3682
3681 Returns 0 on success.
3683 Returns 0 on success.
3682 """
3684 """
3683
3685
3684 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3686 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3685
3687
3686 if file_:
3688 if file_:
3687 m = scmutil.match(ctx, (file_,), opts)
3689 m = scmutil.match(ctx, (file_,), opts)
3688 if m.anypats() or len(m.files()) != 1:
3690 if m.anypats() or len(m.files()) != 1:
3689 raise error.Abort(_('can only specify an explicit filename'))
3691 raise error.Abort(_('can only specify an explicit filename'))
3690 file_ = m.files()[0]
3692 file_ = m.files()[0]
3691 filenodes = []
3693 filenodes = []
3692 for cp in ctx.parents():
3694 for cp in ctx.parents():
3693 if not cp:
3695 if not cp:
3694 continue
3696 continue
3695 try:
3697 try:
3696 filenodes.append(cp.filenode(file_))
3698 filenodes.append(cp.filenode(file_))
3697 except error.LookupError:
3699 except error.LookupError:
3698 pass
3700 pass
3699 if not filenodes:
3701 if not filenodes:
3700 raise error.Abort(_("'%s' not found in manifest!") % file_)
3702 raise error.Abort(_("'%s' not found in manifest!") % file_)
3701 p = []
3703 p = []
3702 for fn in filenodes:
3704 for fn in filenodes:
3703 fctx = repo.filectx(file_, fileid=fn)
3705 fctx = repo.filectx(file_, fileid=fn)
3704 p.append(fctx.node())
3706 p.append(fctx.node())
3705 else:
3707 else:
3706 p = [cp.node() for cp in ctx.parents()]
3708 p = [cp.node() for cp in ctx.parents()]
3707
3709
3708 displayer = cmdutil.show_changeset(ui, repo, opts)
3710 displayer = cmdutil.show_changeset(ui, repo, opts)
3709 for n in p:
3711 for n in p:
3710 if n != nullid:
3712 if n != nullid:
3711 displayer.show(repo[n])
3713 displayer.show(repo[n])
3712 displayer.close()
3714 displayer.close()
3713
3715
3714 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
3716 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
3715 def paths(ui, repo, search=None, **opts):
3717 def paths(ui, repo, search=None, **opts):
3716 """show aliases for remote repositories
3718 """show aliases for remote repositories
3717
3719
3718 Show definition of symbolic path name NAME. If no name is given,
3720 Show definition of symbolic path name NAME. If no name is given,
3719 show definition of all available names.
3721 show definition of all available names.
3720
3722
3721 Option -q/--quiet suppresses all output when searching for NAME
3723 Option -q/--quiet suppresses all output when searching for NAME
3722 and shows only the path names when listing all definitions.
3724 and shows only the path names when listing all definitions.
3723
3725
3724 Path names are defined in the [paths] section of your
3726 Path names are defined in the [paths] section of your
3725 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3727 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3726 repository, ``.hg/hgrc`` is used, too.
3728 repository, ``.hg/hgrc`` is used, too.
3727
3729
3728 The path names ``default`` and ``default-push`` have a special
3730 The path names ``default`` and ``default-push`` have a special
3729 meaning. When performing a push or pull operation, they are used
3731 meaning. When performing a push or pull operation, they are used
3730 as fallbacks if no location is specified on the command-line.
3732 as fallbacks if no location is specified on the command-line.
3731 When ``default-push`` is set, it will be used for push and
3733 When ``default-push`` is set, it will be used for push and
3732 ``default`` will be used for pull; otherwise ``default`` is used
3734 ``default`` will be used for pull; otherwise ``default`` is used
3733 as the fallback for both. When cloning a repository, the clone
3735 as the fallback for both. When cloning a repository, the clone
3734 source is written as ``default`` in ``.hg/hgrc``.
3736 source is written as ``default`` in ``.hg/hgrc``.
3735
3737
3736 .. note::
3738 .. note::
3737
3739
3738 ``default`` and ``default-push`` apply to all inbound (e.g.
3740 ``default`` and ``default-push`` apply to all inbound (e.g.
3739 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3741 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3740 and :hg:`bundle`) operations.
3742 and :hg:`bundle`) operations.
3741
3743
3742 See :hg:`help urls` for more information.
3744 See :hg:`help urls` for more information.
3743
3745
3744 Returns 0 on success.
3746 Returns 0 on success.
3745 """
3747 """
3746 ui.pager('paths')
3748 ui.pager('paths')
3747 if search:
3749 if search:
3748 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3750 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3749 if name == search]
3751 if name == search]
3750 else:
3752 else:
3751 pathitems = sorted(ui.paths.iteritems())
3753 pathitems = sorted(ui.paths.iteritems())
3752
3754
3753 fm = ui.formatter('paths', opts)
3755 fm = ui.formatter('paths', opts)
3754 if fm.isplain():
3756 if fm.isplain():
3755 hidepassword = util.hidepassword
3757 hidepassword = util.hidepassword
3756 else:
3758 else:
3757 hidepassword = str
3759 hidepassword = str
3758 if ui.quiet:
3760 if ui.quiet:
3759 namefmt = '%s\n'
3761 namefmt = '%s\n'
3760 else:
3762 else:
3761 namefmt = '%s = '
3763 namefmt = '%s = '
3762 showsubopts = not search and not ui.quiet
3764 showsubopts = not search and not ui.quiet
3763
3765
3764 for name, path in pathitems:
3766 for name, path in pathitems:
3765 fm.startitem()
3767 fm.startitem()
3766 fm.condwrite(not search, 'name', namefmt, name)
3768 fm.condwrite(not search, 'name', namefmt, name)
3767 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3769 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3768 for subopt, value in sorted(path.suboptions.items()):
3770 for subopt, value in sorted(path.suboptions.items()):
3769 assert subopt not in ('name', 'url')
3771 assert subopt not in ('name', 'url')
3770 if showsubopts:
3772 if showsubopts:
3771 fm.plain('%s:%s = ' % (name, subopt))
3773 fm.plain('%s:%s = ' % (name, subopt))
3772 fm.condwrite(showsubopts, subopt, '%s\n', value)
3774 fm.condwrite(showsubopts, subopt, '%s\n', value)
3773
3775
3774 fm.end()
3776 fm.end()
3775
3777
3776 if search and not pathitems:
3778 if search and not pathitems:
3777 if not ui.quiet:
3779 if not ui.quiet:
3778 ui.warn(_("not found!\n"))
3780 ui.warn(_("not found!\n"))
3779 return 1
3781 return 1
3780 else:
3782 else:
3781 return 0
3783 return 0
3782
3784
3783 @command('phase',
3785 @command('phase',
3784 [('p', 'public', False, _('set changeset phase to public')),
3786 [('p', 'public', False, _('set changeset phase to public')),
3785 ('d', 'draft', False, _('set changeset phase to draft')),
3787 ('d', 'draft', False, _('set changeset phase to draft')),
3786 ('s', 'secret', False, _('set changeset phase to secret')),
3788 ('s', 'secret', False, _('set changeset phase to secret')),
3787 ('f', 'force', False, _('allow to move boundary backward')),
3789 ('f', 'force', False, _('allow to move boundary backward')),
3788 ('r', 'rev', [], _('target revision'), _('REV')),
3790 ('r', 'rev', [], _('target revision'), _('REV')),
3789 ],
3791 ],
3790 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3792 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3791 def phase(ui, repo, *revs, **opts):
3793 def phase(ui, repo, *revs, **opts):
3792 """set or show the current phase name
3794 """set or show the current phase name
3793
3795
3794 With no argument, show the phase name of the current revision(s).
3796 With no argument, show the phase name of the current revision(s).
3795
3797
3796 With one of -p/--public, -d/--draft or -s/--secret, change the
3798 With one of -p/--public, -d/--draft or -s/--secret, change the
3797 phase value of the specified revisions.
3799 phase value of the specified revisions.
3798
3800
3799 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
3801 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
3800 lower phase to an higher phase. Phases are ordered as follows::
3802 lower phase to an higher phase. Phases are ordered as follows::
3801
3803
3802 public < draft < secret
3804 public < draft < secret
3803
3805
3804 Returns 0 on success, 1 if some phases could not be changed.
3806 Returns 0 on success, 1 if some phases could not be changed.
3805
3807
3806 (For more information about the phases concept, see :hg:`help phases`.)
3808 (For more information about the phases concept, see :hg:`help phases`.)
3807 """
3809 """
3808 # search for a unique phase argument
3810 # search for a unique phase argument
3809 targetphase = None
3811 targetphase = None
3810 for idx, name in enumerate(phases.phasenames):
3812 for idx, name in enumerate(phases.phasenames):
3811 if opts[name]:
3813 if opts[name]:
3812 if targetphase is not None:
3814 if targetphase is not None:
3813 raise error.Abort(_('only one phase can be specified'))
3815 raise error.Abort(_('only one phase can be specified'))
3814 targetphase = idx
3816 targetphase = idx
3815
3817
3816 # look for specified revision
3818 # look for specified revision
3817 revs = list(revs)
3819 revs = list(revs)
3818 revs.extend(opts['rev'])
3820 revs.extend(opts['rev'])
3819 if not revs:
3821 if not revs:
3820 # display both parents as the second parent phase can influence
3822 # display both parents as the second parent phase can influence
3821 # the phase of a merge commit
3823 # the phase of a merge commit
3822 revs = [c.rev() for c in repo[None].parents()]
3824 revs = [c.rev() for c in repo[None].parents()]
3823
3825
3824 revs = scmutil.revrange(repo, revs)
3826 revs = scmutil.revrange(repo, revs)
3825
3827
3826 lock = None
3828 lock = None
3827 ret = 0
3829 ret = 0
3828 if targetphase is None:
3830 if targetphase is None:
3829 # display
3831 # display
3830 for r in revs:
3832 for r in revs:
3831 ctx = repo[r]
3833 ctx = repo[r]
3832 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3834 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3833 else:
3835 else:
3834 tr = None
3836 tr = None
3835 lock = repo.lock()
3837 lock = repo.lock()
3836 try:
3838 try:
3837 tr = repo.transaction("phase")
3839 tr = repo.transaction("phase")
3838 # set phase
3840 # set phase
3839 if not revs:
3841 if not revs:
3840 raise error.Abort(_('empty revision set'))
3842 raise error.Abort(_('empty revision set'))
3841 nodes = [repo[r].node() for r in revs]
3843 nodes = [repo[r].node() for r in revs]
3842 # moving revision from public to draft may hide them
3844 # moving revision from public to draft may hide them
3843 # We have to check result on an unfiltered repository
3845 # We have to check result on an unfiltered repository
3844 unfi = repo.unfiltered()
3846 unfi = repo.unfiltered()
3845 getphase = unfi._phasecache.phase
3847 getphase = unfi._phasecache.phase
3846 olddata = [getphase(unfi, r) for r in unfi]
3848 olddata = [getphase(unfi, r) for r in unfi]
3847 phases.advanceboundary(repo, tr, targetphase, nodes)
3849 phases.advanceboundary(repo, tr, targetphase, nodes)
3848 if opts['force']:
3850 if opts['force']:
3849 phases.retractboundary(repo, tr, targetphase, nodes)
3851 phases.retractboundary(repo, tr, targetphase, nodes)
3850 tr.close()
3852 tr.close()
3851 finally:
3853 finally:
3852 if tr is not None:
3854 if tr is not None:
3853 tr.release()
3855 tr.release()
3854 lock.release()
3856 lock.release()
3855 getphase = unfi._phasecache.phase
3857 getphase = unfi._phasecache.phase
3856 newdata = [getphase(unfi, r) for r in unfi]
3858 newdata = [getphase(unfi, r) for r in unfi]
3857 changes = sum(newdata[r] != olddata[r] for r in unfi)
3859 changes = sum(newdata[r] != olddata[r] for r in unfi)
3858 cl = unfi.changelog
3860 cl = unfi.changelog
3859 rejected = [n for n in nodes
3861 rejected = [n for n in nodes
3860 if newdata[cl.rev(n)] < targetphase]
3862 if newdata[cl.rev(n)] < targetphase]
3861 if rejected:
3863 if rejected:
3862 ui.warn(_('cannot move %i changesets to a higher '
3864 ui.warn(_('cannot move %i changesets to a higher '
3863 'phase, use --force\n') % len(rejected))
3865 'phase, use --force\n') % len(rejected))
3864 ret = 1
3866 ret = 1
3865 if changes:
3867 if changes:
3866 msg = _('phase changed for %i changesets\n') % changes
3868 msg = _('phase changed for %i changesets\n') % changes
3867 if ret:
3869 if ret:
3868 ui.status(msg)
3870 ui.status(msg)
3869 else:
3871 else:
3870 ui.note(msg)
3872 ui.note(msg)
3871 else:
3873 else:
3872 ui.warn(_('no phases changed\n'))
3874 ui.warn(_('no phases changed\n'))
3873 return ret
3875 return ret
3874
3876
3875 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
3877 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
3876 """Run after a changegroup has been added via pull/unbundle
3878 """Run after a changegroup has been added via pull/unbundle
3877
3879
3878 This takes arguments below:
3880 This takes arguments below:
3879
3881
3880 :modheads: change of heads by pull/unbundle
3882 :modheads: change of heads by pull/unbundle
3881 :optupdate: updating working directory is needed or not
3883 :optupdate: updating working directory is needed or not
3882 :checkout: update destination revision (or None to default destination)
3884 :checkout: update destination revision (or None to default destination)
3883 :brev: a name, which might be a bookmark to be activated after updating
3885 :brev: a name, which might be a bookmark to be activated after updating
3884 """
3886 """
3885 if modheads == 0:
3887 if modheads == 0:
3886 return
3888 return
3887 if optupdate:
3889 if optupdate:
3888 try:
3890 try:
3889 return hg.updatetotally(ui, repo, checkout, brev)
3891 return hg.updatetotally(ui, repo, checkout, brev)
3890 except error.UpdateAbort as inst:
3892 except error.UpdateAbort as inst:
3891 msg = _("not updating: %s") % str(inst)
3893 msg = _("not updating: %s") % str(inst)
3892 hint = inst.hint
3894 hint = inst.hint
3893 raise error.UpdateAbort(msg, hint=hint)
3895 raise error.UpdateAbort(msg, hint=hint)
3894 if modheads > 1:
3896 if modheads > 1:
3895 currentbranchheads = len(repo.branchheads())
3897 currentbranchheads = len(repo.branchheads())
3896 if currentbranchheads == modheads:
3898 if currentbranchheads == modheads:
3897 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3899 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3898 elif currentbranchheads > 1:
3900 elif currentbranchheads > 1:
3899 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
3901 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
3900 "merge)\n"))
3902 "merge)\n"))
3901 else:
3903 else:
3902 ui.status(_("(run 'hg heads' to see heads)\n"))
3904 ui.status(_("(run 'hg heads' to see heads)\n"))
3903 else:
3905 else:
3904 ui.status(_("(run 'hg update' to get a working copy)\n"))
3906 ui.status(_("(run 'hg update' to get a working copy)\n"))
3905
3907
3906 @command('^pull',
3908 @command('^pull',
3907 [('u', 'update', None,
3909 [('u', 'update', None,
3908 _('update to new branch head if changesets were pulled')),
3910 _('update to new branch head if changesets were pulled')),
3909 ('f', 'force', None, _('run even when remote repository is unrelated')),
3911 ('f', 'force', None, _('run even when remote repository is unrelated')),
3910 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3912 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3911 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
3913 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
3912 ('b', 'branch', [], _('a specific branch you would like to pull'),
3914 ('b', 'branch', [], _('a specific branch you would like to pull'),
3913 _('BRANCH')),
3915 _('BRANCH')),
3914 ] + remoteopts,
3916 ] + remoteopts,
3915 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
3917 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
3916 def pull(ui, repo, source="default", **opts):
3918 def pull(ui, repo, source="default", **opts):
3917 """pull changes from the specified source
3919 """pull changes from the specified source
3918
3920
3919 Pull changes from a remote repository to a local one.
3921 Pull changes from a remote repository to a local one.
3920
3922
3921 This finds all changes from the repository at the specified path
3923 This finds all changes from the repository at the specified path
3922 or URL and adds them to a local repository (the current one unless
3924 or URL and adds them to a local repository (the current one unless
3923 -R is specified). By default, this does not update the copy of the
3925 -R is specified). By default, this does not update the copy of the
3924 project in the working directory.
3926 project in the working directory.
3925
3927
3926 Use :hg:`incoming` if you want to see what would have been added
3928 Use :hg:`incoming` if you want to see what would have been added
3927 by a pull at the time you issued this command. If you then decide
3929 by a pull at the time you issued this command. If you then decide
3928 to add those changes to the repository, you should use :hg:`pull
3930 to add those changes to the repository, you should use :hg:`pull
3929 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
3931 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
3930
3932
3931 If SOURCE is omitted, the 'default' path will be used.
3933 If SOURCE is omitted, the 'default' path will be used.
3932 See :hg:`help urls` for more information.
3934 See :hg:`help urls` for more information.
3933
3935
3934 Specifying bookmark as ``.`` is equivalent to specifying the active
3936 Specifying bookmark as ``.`` is equivalent to specifying the active
3935 bookmark's name.
3937 bookmark's name.
3936
3938
3937 Returns 0 on success, 1 if an update had unresolved files.
3939 Returns 0 on success, 1 if an update had unresolved files.
3938 """
3940 """
3939 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
3941 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
3940 ui.status(_('pulling from %s\n') % util.hidepassword(source))
3942 ui.status(_('pulling from %s\n') % util.hidepassword(source))
3941 other = hg.peer(repo, opts, source)
3943 other = hg.peer(repo, opts, source)
3942 try:
3944 try:
3943 revs, checkout = hg.addbranchrevs(repo, other, branches,
3945 revs, checkout = hg.addbranchrevs(repo, other, branches,
3944 opts.get('rev'))
3946 opts.get('rev'))
3945
3947
3946
3948
3947 pullopargs = {}
3949 pullopargs = {}
3948 if opts.get('bookmark'):
3950 if opts.get('bookmark'):
3949 if not revs:
3951 if not revs:
3950 revs = []
3952 revs = []
3951 # The list of bookmark used here is not the one used to actually
3953 # The list of bookmark used here is not the one used to actually
3952 # update the bookmark name. This can result in the revision pulled
3954 # update the bookmark name. This can result in the revision pulled
3953 # not ending up with the name of the bookmark because of a race
3955 # not ending up with the name of the bookmark because of a race
3954 # condition on the server. (See issue 4689 for details)
3956 # condition on the server. (See issue 4689 for details)
3955 remotebookmarks = other.listkeys('bookmarks')
3957 remotebookmarks = other.listkeys('bookmarks')
3956 pullopargs['remotebookmarks'] = remotebookmarks
3958 pullopargs['remotebookmarks'] = remotebookmarks
3957 for b in opts['bookmark']:
3959 for b in opts['bookmark']:
3958 b = repo._bookmarks.expandname(b)
3960 b = repo._bookmarks.expandname(b)
3959 if b not in remotebookmarks:
3961 if b not in remotebookmarks:
3960 raise error.Abort(_('remote bookmark %s not found!') % b)
3962 raise error.Abort(_('remote bookmark %s not found!') % b)
3961 revs.append(remotebookmarks[b])
3963 revs.append(remotebookmarks[b])
3962
3964
3963 if revs:
3965 if revs:
3964 try:
3966 try:
3965 # When 'rev' is a bookmark name, we cannot guarantee that it
3967 # When 'rev' is a bookmark name, we cannot guarantee that it
3966 # will be updated with that name because of a race condition
3968 # will be updated with that name because of a race condition
3967 # server side. (See issue 4689 for details)
3969 # server side. (See issue 4689 for details)
3968 oldrevs = revs
3970 oldrevs = revs
3969 revs = [] # actually, nodes
3971 revs = [] # actually, nodes
3970 for r in oldrevs:
3972 for r in oldrevs:
3971 node = other.lookup(r)
3973 node = other.lookup(r)
3972 revs.append(node)
3974 revs.append(node)
3973 if r == checkout:
3975 if r == checkout:
3974 checkout = node
3976 checkout = node
3975 except error.CapabilityError:
3977 except error.CapabilityError:
3976 err = _("other repository doesn't support revision lookup, "
3978 err = _("other repository doesn't support revision lookup, "
3977 "so a rev cannot be specified.")
3979 "so a rev cannot be specified.")
3978 raise error.Abort(err)
3980 raise error.Abort(err)
3979
3981
3980 pullopargs.update(opts.get('opargs', {}))
3982 pullopargs.update(opts.get('opargs', {}))
3981 modheads = exchange.pull(repo, other, heads=revs,
3983 modheads = exchange.pull(repo, other, heads=revs,
3982 force=opts.get('force'),
3984 force=opts.get('force'),
3983 bookmarks=opts.get('bookmark', ()),
3985 bookmarks=opts.get('bookmark', ()),
3984 opargs=pullopargs).cgresult
3986 opargs=pullopargs).cgresult
3985
3987
3986 # brev is a name, which might be a bookmark to be activated at
3988 # brev is a name, which might be a bookmark to be activated at
3987 # the end of the update. In other words, it is an explicit
3989 # the end of the update. In other words, it is an explicit
3988 # destination of the update
3990 # destination of the update
3989 brev = None
3991 brev = None
3990
3992
3991 if checkout:
3993 if checkout:
3992 checkout = str(repo.changelog.rev(checkout))
3994 checkout = str(repo.changelog.rev(checkout))
3993
3995
3994 # order below depends on implementation of
3996 # order below depends on implementation of
3995 # hg.addbranchrevs(). opts['bookmark'] is ignored,
3997 # hg.addbranchrevs(). opts['bookmark'] is ignored,
3996 # because 'checkout' is determined without it.
3998 # because 'checkout' is determined without it.
3997 if opts.get('rev'):
3999 if opts.get('rev'):
3998 brev = opts['rev'][0]
4000 brev = opts['rev'][0]
3999 elif opts.get('branch'):
4001 elif opts.get('branch'):
4000 brev = opts['branch'][0]
4002 brev = opts['branch'][0]
4001 else:
4003 else:
4002 brev = branches[0]
4004 brev = branches[0]
4003 repo._subtoppath = source
4005 repo._subtoppath = source
4004 try:
4006 try:
4005 ret = postincoming(ui, repo, modheads, opts.get('update'),
4007 ret = postincoming(ui, repo, modheads, opts.get('update'),
4006 checkout, brev)
4008 checkout, brev)
4007
4009
4008 finally:
4010 finally:
4009 del repo._subtoppath
4011 del repo._subtoppath
4010
4012
4011 finally:
4013 finally:
4012 other.close()
4014 other.close()
4013 return ret
4015 return ret
4014
4016
4015 @command('^push',
4017 @command('^push',
4016 [('f', 'force', None, _('force push')),
4018 [('f', 'force', None, _('force push')),
4017 ('r', 'rev', [],
4019 ('r', 'rev', [],
4018 _('a changeset intended to be included in the destination'),
4020 _('a changeset intended to be included in the destination'),
4019 _('REV')),
4021 _('REV')),
4020 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4022 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4021 ('b', 'branch', [],
4023 ('b', 'branch', [],
4022 _('a specific branch you would like to push'), _('BRANCH')),
4024 _('a specific branch you would like to push'), _('BRANCH')),
4023 ('', 'new-branch', False, _('allow pushing a new branch')),
4025 ('', 'new-branch', False, _('allow pushing a new branch')),
4024 ] + remoteopts,
4026 ] + remoteopts,
4025 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4027 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4026 def push(ui, repo, dest=None, **opts):
4028 def push(ui, repo, dest=None, **opts):
4027 """push changes to the specified destination
4029 """push changes to the specified destination
4028
4030
4029 Push changesets from the local repository to the specified
4031 Push changesets from the local repository to the specified
4030 destination.
4032 destination.
4031
4033
4032 This operation is symmetrical to pull: it is identical to a pull
4034 This operation is symmetrical to pull: it is identical to a pull
4033 in the destination repository from the current one.
4035 in the destination repository from the current one.
4034
4036
4035 By default, push will not allow creation of new heads at the
4037 By default, push will not allow creation of new heads at the
4036 destination, since multiple heads would make it unclear which head
4038 destination, since multiple heads would make it unclear which head
4037 to use. In this situation, it is recommended to pull and merge
4039 to use. In this situation, it is recommended to pull and merge
4038 before pushing.
4040 before pushing.
4039
4041
4040 Use --new-branch if you want to allow push to create a new named
4042 Use --new-branch if you want to allow push to create a new named
4041 branch that is not present at the destination. This allows you to
4043 branch that is not present at the destination. This allows you to
4042 only create a new branch without forcing other changes.
4044 only create a new branch without forcing other changes.
4043
4045
4044 .. note::
4046 .. note::
4045
4047
4046 Extra care should be taken with the -f/--force option,
4048 Extra care should be taken with the -f/--force option,
4047 which will push all new heads on all branches, an action which will
4049 which will push all new heads on all branches, an action which will
4048 almost always cause confusion for collaborators.
4050 almost always cause confusion for collaborators.
4049
4051
4050 If -r/--rev is used, the specified revision and all its ancestors
4052 If -r/--rev is used, the specified revision and all its ancestors
4051 will be pushed to the remote repository.
4053 will be pushed to the remote repository.
4052
4054
4053 If -B/--bookmark is used, the specified bookmarked revision, its
4055 If -B/--bookmark is used, the specified bookmarked revision, its
4054 ancestors, and the bookmark will be pushed to the remote
4056 ancestors, and the bookmark will be pushed to the remote
4055 repository. Specifying ``.`` is equivalent to specifying the active
4057 repository. Specifying ``.`` is equivalent to specifying the active
4056 bookmark's name.
4058 bookmark's name.
4057
4059
4058 Please see :hg:`help urls` for important details about ``ssh://``
4060 Please see :hg:`help urls` for important details about ``ssh://``
4059 URLs. If DESTINATION is omitted, a default path will be used.
4061 URLs. If DESTINATION is omitted, a default path will be used.
4060
4062
4061 Returns 0 if push was successful, 1 if nothing to push.
4063 Returns 0 if push was successful, 1 if nothing to push.
4062 """
4064 """
4063
4065
4064 if opts.get('bookmark'):
4066 if opts.get('bookmark'):
4065 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4067 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4066 for b in opts['bookmark']:
4068 for b in opts['bookmark']:
4067 # translate -B options to -r so changesets get pushed
4069 # translate -B options to -r so changesets get pushed
4068 b = repo._bookmarks.expandname(b)
4070 b = repo._bookmarks.expandname(b)
4069 if b in repo._bookmarks:
4071 if b in repo._bookmarks:
4070 opts.setdefault('rev', []).append(b)
4072 opts.setdefault('rev', []).append(b)
4071 else:
4073 else:
4072 # if we try to push a deleted bookmark, translate it to null
4074 # if we try to push a deleted bookmark, translate it to null
4073 # this lets simultaneous -r, -b options continue working
4075 # this lets simultaneous -r, -b options continue working
4074 opts.setdefault('rev', []).append("null")
4076 opts.setdefault('rev', []).append("null")
4075
4077
4076 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4078 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4077 if not path:
4079 if not path:
4078 raise error.Abort(_('default repository not configured!'),
4080 raise error.Abort(_('default repository not configured!'),
4079 hint=_("see 'hg help config.paths'"))
4081 hint=_("see 'hg help config.paths'"))
4080 dest = path.pushloc or path.loc
4082 dest = path.pushloc or path.loc
4081 branches = (path.branch, opts.get('branch') or [])
4083 branches = (path.branch, opts.get('branch') or [])
4082 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4084 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4083 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4085 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4084 other = hg.peer(repo, opts, dest)
4086 other = hg.peer(repo, opts, dest)
4085
4087
4086 if revs:
4088 if revs:
4087 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4089 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4088 if not revs:
4090 if not revs:
4089 raise error.Abort(_("specified revisions evaluate to an empty set"),
4091 raise error.Abort(_("specified revisions evaluate to an empty set"),
4090 hint=_("use different revision arguments"))
4092 hint=_("use different revision arguments"))
4091 elif path.pushrev:
4093 elif path.pushrev:
4092 # It doesn't make any sense to specify ancestor revisions. So limit
4094 # It doesn't make any sense to specify ancestor revisions. So limit
4093 # to DAG heads to make discovery simpler.
4095 # to DAG heads to make discovery simpler.
4094 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4096 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4095 revs = scmutil.revrange(repo, [expr])
4097 revs = scmutil.revrange(repo, [expr])
4096 revs = [repo[rev].node() for rev in revs]
4098 revs = [repo[rev].node() for rev in revs]
4097 if not revs:
4099 if not revs:
4098 raise error.Abort(_('default push revset for path evaluates to an '
4100 raise error.Abort(_('default push revset for path evaluates to an '
4099 'empty set'))
4101 'empty set'))
4100
4102
4101 repo._subtoppath = dest
4103 repo._subtoppath = dest
4102 try:
4104 try:
4103 # push subrepos depth-first for coherent ordering
4105 # push subrepos depth-first for coherent ordering
4104 c = repo['']
4106 c = repo['']
4105 subs = c.substate # only repos that are committed
4107 subs = c.substate # only repos that are committed
4106 for s in sorted(subs):
4108 for s in sorted(subs):
4107 result = c.sub(s).push(opts)
4109 result = c.sub(s).push(opts)
4108 if result == 0:
4110 if result == 0:
4109 return not result
4111 return not result
4110 finally:
4112 finally:
4111 del repo._subtoppath
4113 del repo._subtoppath
4112 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4114 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4113 newbranch=opts.get('new_branch'),
4115 newbranch=opts.get('new_branch'),
4114 bookmarks=opts.get('bookmark', ()),
4116 bookmarks=opts.get('bookmark', ()),
4115 opargs=opts.get('opargs'))
4117 opargs=opts.get('opargs'))
4116
4118
4117 result = not pushop.cgresult
4119 result = not pushop.cgresult
4118
4120
4119 if pushop.bkresult is not None:
4121 if pushop.bkresult is not None:
4120 if pushop.bkresult == 2:
4122 if pushop.bkresult == 2:
4121 result = 2
4123 result = 2
4122 elif not result and pushop.bkresult:
4124 elif not result and pushop.bkresult:
4123 result = 2
4125 result = 2
4124
4126
4125 return result
4127 return result
4126
4128
4127 @command('recover', [])
4129 @command('recover', [])
4128 def recover(ui, repo):
4130 def recover(ui, repo):
4129 """roll back an interrupted transaction
4131 """roll back an interrupted transaction
4130
4132
4131 Recover from an interrupted commit or pull.
4133 Recover from an interrupted commit or pull.
4132
4134
4133 This command tries to fix the repository status after an
4135 This command tries to fix the repository status after an
4134 interrupted operation. It should only be necessary when Mercurial
4136 interrupted operation. It should only be necessary when Mercurial
4135 suggests it.
4137 suggests it.
4136
4138
4137 Returns 0 if successful, 1 if nothing to recover or verify fails.
4139 Returns 0 if successful, 1 if nothing to recover or verify fails.
4138 """
4140 """
4139 if repo.recover():
4141 if repo.recover():
4140 return hg.verify(repo)
4142 return hg.verify(repo)
4141 return 1
4143 return 1
4142
4144
4143 @command('^remove|rm',
4145 @command('^remove|rm',
4144 [('A', 'after', None, _('record delete for missing files')),
4146 [('A', 'after', None, _('record delete for missing files')),
4145 ('f', 'force', None,
4147 ('f', 'force', None,
4146 _('forget added files, delete modified files')),
4148 _('forget added files, delete modified files')),
4147 ] + subrepoopts + walkopts,
4149 ] + subrepoopts + walkopts,
4148 _('[OPTION]... FILE...'),
4150 _('[OPTION]... FILE...'),
4149 inferrepo=True)
4151 inferrepo=True)
4150 def remove(ui, repo, *pats, **opts):
4152 def remove(ui, repo, *pats, **opts):
4151 """remove the specified files on the next commit
4153 """remove the specified files on the next commit
4152
4154
4153 Schedule the indicated files for removal from the current branch.
4155 Schedule the indicated files for removal from the current branch.
4154
4156
4155 This command schedules the files to be removed at the next commit.
4157 This command schedules the files to be removed at the next commit.
4156 To undo a remove before that, see :hg:`revert`. To undo added
4158 To undo a remove before that, see :hg:`revert`. To undo added
4157 files, see :hg:`forget`.
4159 files, see :hg:`forget`.
4158
4160
4159 .. container:: verbose
4161 .. container:: verbose
4160
4162
4161 -A/--after can be used to remove only files that have already
4163 -A/--after can be used to remove only files that have already
4162 been deleted, -f/--force can be used to force deletion, and -Af
4164 been deleted, -f/--force can be used to force deletion, and -Af
4163 can be used to remove files from the next revision without
4165 can be used to remove files from the next revision without
4164 deleting them from the working directory.
4166 deleting them from the working directory.
4165
4167
4166 The following table details the behavior of remove for different
4168 The following table details the behavior of remove for different
4167 file states (columns) and option combinations (rows). The file
4169 file states (columns) and option combinations (rows). The file
4168 states are Added [A], Clean [C], Modified [M] and Missing [!]
4170 states are Added [A], Clean [C], Modified [M] and Missing [!]
4169 (as reported by :hg:`status`). The actions are Warn, Remove
4171 (as reported by :hg:`status`). The actions are Warn, Remove
4170 (from branch) and Delete (from disk):
4172 (from branch) and Delete (from disk):
4171
4173
4172 ========= == == == ==
4174 ========= == == == ==
4173 opt/state A C M !
4175 opt/state A C M !
4174 ========= == == == ==
4176 ========= == == == ==
4175 none W RD W R
4177 none W RD W R
4176 -f R RD RD R
4178 -f R RD RD R
4177 -A W W W R
4179 -A W W W R
4178 -Af R R R R
4180 -Af R R R R
4179 ========= == == == ==
4181 ========= == == == ==
4180
4182
4181 .. note::
4183 .. note::
4182
4184
4183 :hg:`remove` never deletes files in Added [A] state from the
4185 :hg:`remove` never deletes files in Added [A] state from the
4184 working directory, not even if ``--force`` is specified.
4186 working directory, not even if ``--force`` is specified.
4185
4187
4186 Returns 0 on success, 1 if any warnings encountered.
4188 Returns 0 on success, 1 if any warnings encountered.
4187 """
4189 """
4188
4190
4189 after, force = opts.get('after'), opts.get('force')
4191 after, force = opts.get('after'), opts.get('force')
4190 if not pats and not after:
4192 if not pats and not after:
4191 raise error.Abort(_('no files specified'))
4193 raise error.Abort(_('no files specified'))
4192
4194
4193 m = scmutil.match(repo[None], pats, opts)
4195 m = scmutil.match(repo[None], pats, opts)
4194 subrepos = opts.get('subrepos')
4196 subrepos = opts.get('subrepos')
4195 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
4197 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
4196
4198
4197 @command('rename|move|mv',
4199 @command('rename|move|mv',
4198 [('A', 'after', None, _('record a rename that has already occurred')),
4200 [('A', 'after', None, _('record a rename that has already occurred')),
4199 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4201 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4200 ] + walkopts + dryrunopts,
4202 ] + walkopts + dryrunopts,
4201 _('[OPTION]... SOURCE... DEST'))
4203 _('[OPTION]... SOURCE... DEST'))
4202 def rename(ui, repo, *pats, **opts):
4204 def rename(ui, repo, *pats, **opts):
4203 """rename files; equivalent of copy + remove
4205 """rename files; equivalent of copy + remove
4204
4206
4205 Mark dest as copies of sources; mark sources for deletion. If dest
4207 Mark dest as copies of sources; mark sources for deletion. If dest
4206 is a directory, copies are put in that directory. If dest is a
4208 is a directory, copies are put in that directory. If dest is a
4207 file, there can only be one source.
4209 file, there can only be one source.
4208
4210
4209 By default, this command copies the contents of files as they
4211 By default, this command copies the contents of files as they
4210 exist in the working directory. If invoked with -A/--after, the
4212 exist in the working directory. If invoked with -A/--after, the
4211 operation is recorded, but no copying is performed.
4213 operation is recorded, but no copying is performed.
4212
4214
4213 This command takes effect at the next commit. To undo a rename
4215 This command takes effect at the next commit. To undo a rename
4214 before that, see :hg:`revert`.
4216 before that, see :hg:`revert`.
4215
4217
4216 Returns 0 on success, 1 if errors are encountered.
4218 Returns 0 on success, 1 if errors are encountered.
4217 """
4219 """
4218 with repo.wlock(False):
4220 with repo.wlock(False):
4219 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4221 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4220
4222
4221 @command('resolve',
4223 @command('resolve',
4222 [('a', 'all', None, _('select all unresolved files')),
4224 [('a', 'all', None, _('select all unresolved files')),
4223 ('l', 'list', None, _('list state of files needing merge')),
4225 ('l', 'list', None, _('list state of files needing merge')),
4224 ('m', 'mark', None, _('mark files as resolved')),
4226 ('m', 'mark', None, _('mark files as resolved')),
4225 ('u', 'unmark', None, _('mark files as unresolved')),
4227 ('u', 'unmark', None, _('mark files as unresolved')),
4226 ('n', 'no-status', None, _('hide status prefix'))]
4228 ('n', 'no-status', None, _('hide status prefix'))]
4227 + mergetoolopts + walkopts + formatteropts,
4229 + mergetoolopts + walkopts + formatteropts,
4228 _('[OPTION]... [FILE]...'),
4230 _('[OPTION]... [FILE]...'),
4229 inferrepo=True)
4231 inferrepo=True)
4230 def resolve(ui, repo, *pats, **opts):
4232 def resolve(ui, repo, *pats, **opts):
4231 """redo merges or set/view the merge status of files
4233 """redo merges or set/view the merge status of files
4232
4234
4233 Merges with unresolved conflicts are often the result of
4235 Merges with unresolved conflicts are often the result of
4234 non-interactive merging using the ``internal:merge`` configuration
4236 non-interactive merging using the ``internal:merge`` configuration
4235 setting, or a command-line merge tool like ``diff3``. The resolve
4237 setting, or a command-line merge tool like ``diff3``. The resolve
4236 command is used to manage the files involved in a merge, after
4238 command is used to manage the files involved in a merge, after
4237 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4239 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4238 working directory must have two parents). See :hg:`help
4240 working directory must have two parents). See :hg:`help
4239 merge-tools` for information on configuring merge tools.
4241 merge-tools` for information on configuring merge tools.
4240
4242
4241 The resolve command can be used in the following ways:
4243 The resolve command can be used in the following ways:
4242
4244
4243 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4245 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4244 files, discarding any previous merge attempts. Re-merging is not
4246 files, discarding any previous merge attempts. Re-merging is not
4245 performed for files already marked as resolved. Use ``--all/-a``
4247 performed for files already marked as resolved. Use ``--all/-a``
4246 to select all unresolved files. ``--tool`` can be used to specify
4248 to select all unresolved files. ``--tool`` can be used to specify
4247 the merge tool used for the given files. It overrides the HGMERGE
4249 the merge tool used for the given files. It overrides the HGMERGE
4248 environment variable and your configuration files. Previous file
4250 environment variable and your configuration files. Previous file
4249 contents are saved with a ``.orig`` suffix.
4251 contents are saved with a ``.orig`` suffix.
4250
4252
4251 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4253 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4252 (e.g. after having manually fixed-up the files). The default is
4254 (e.g. after having manually fixed-up the files). The default is
4253 to mark all unresolved files.
4255 to mark all unresolved files.
4254
4256
4255 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4257 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4256 default is to mark all resolved files.
4258 default is to mark all resolved files.
4257
4259
4258 - :hg:`resolve -l`: list files which had or still have conflicts.
4260 - :hg:`resolve -l`: list files which had or still have conflicts.
4259 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4261 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4260 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4262 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4261 the list. See :hg:`help filesets` for details.
4263 the list. See :hg:`help filesets` for details.
4262
4264
4263 .. note::
4265 .. note::
4264
4266
4265 Mercurial will not let you commit files with unresolved merge
4267 Mercurial will not let you commit files with unresolved merge
4266 conflicts. You must use :hg:`resolve -m ...` before you can
4268 conflicts. You must use :hg:`resolve -m ...` before you can
4267 commit after a conflicting merge.
4269 commit after a conflicting merge.
4268
4270
4269 Returns 0 on success, 1 if any files fail a resolve attempt.
4271 Returns 0 on success, 1 if any files fail a resolve attempt.
4270 """
4272 """
4271
4273
4272 flaglist = 'all mark unmark list no_status'.split()
4274 flaglist = 'all mark unmark list no_status'.split()
4273 all, mark, unmark, show, nostatus = \
4275 all, mark, unmark, show, nostatus = \
4274 [opts.get(o) for o in flaglist]
4276 [opts.get(o) for o in flaglist]
4275
4277
4276 if (show and (mark or unmark)) or (mark and unmark):
4278 if (show and (mark or unmark)) or (mark and unmark):
4277 raise error.Abort(_("too many options specified"))
4279 raise error.Abort(_("too many options specified"))
4278 if pats and all:
4280 if pats and all:
4279 raise error.Abort(_("can't specify --all and patterns"))
4281 raise error.Abort(_("can't specify --all and patterns"))
4280 if not (all or pats or show or mark or unmark):
4282 if not (all or pats or show or mark or unmark):
4281 raise error.Abort(_('no files or directories specified'),
4283 raise error.Abort(_('no files or directories specified'),
4282 hint=('use --all to re-merge all unresolved files'))
4284 hint=('use --all to re-merge all unresolved files'))
4283
4285
4284 if show:
4286 if show:
4285 ui.pager('resolve')
4287 ui.pager('resolve')
4286 fm = ui.formatter('resolve', opts)
4288 fm = ui.formatter('resolve', opts)
4287 ms = mergemod.mergestate.read(repo)
4289 ms = mergemod.mergestate.read(repo)
4288 m = scmutil.match(repo[None], pats, opts)
4290 m = scmutil.match(repo[None], pats, opts)
4289 for f in ms:
4291 for f in ms:
4290 if not m(f):
4292 if not m(f):
4291 continue
4293 continue
4292 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
4294 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
4293 'd': 'driverresolved'}[ms[f]]
4295 'd': 'driverresolved'}[ms[f]]
4294 fm.startitem()
4296 fm.startitem()
4295 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
4297 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
4296 fm.write('path', '%s\n', f, label=l)
4298 fm.write('path', '%s\n', f, label=l)
4297 fm.end()
4299 fm.end()
4298 return 0
4300 return 0
4299
4301
4300 with repo.wlock():
4302 with repo.wlock():
4301 ms = mergemod.mergestate.read(repo)
4303 ms = mergemod.mergestate.read(repo)
4302
4304
4303 if not (ms.active() or repo.dirstate.p2() != nullid):
4305 if not (ms.active() or repo.dirstate.p2() != nullid):
4304 raise error.Abort(
4306 raise error.Abort(
4305 _('resolve command not applicable when not merging'))
4307 _('resolve command not applicable when not merging'))
4306
4308
4307 wctx = repo[None]
4309 wctx = repo[None]
4308
4310
4309 if ms.mergedriver and ms.mdstate() == 'u':
4311 if ms.mergedriver and ms.mdstate() == 'u':
4310 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4312 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4311 ms.commit()
4313 ms.commit()
4312 # allow mark and unmark to go through
4314 # allow mark and unmark to go through
4313 if not mark and not unmark and not proceed:
4315 if not mark and not unmark and not proceed:
4314 return 1
4316 return 1
4315
4317
4316 m = scmutil.match(wctx, pats, opts)
4318 m = scmutil.match(wctx, pats, opts)
4317 ret = 0
4319 ret = 0
4318 didwork = False
4320 didwork = False
4319 runconclude = False
4321 runconclude = False
4320
4322
4321 tocomplete = []
4323 tocomplete = []
4322 for f in ms:
4324 for f in ms:
4323 if not m(f):
4325 if not m(f):
4324 continue
4326 continue
4325
4327
4326 didwork = True
4328 didwork = True
4327
4329
4328 # don't let driver-resolved files be marked, and run the conclude
4330 # don't let driver-resolved files be marked, and run the conclude
4329 # step if asked to resolve
4331 # step if asked to resolve
4330 if ms[f] == "d":
4332 if ms[f] == "d":
4331 exact = m.exact(f)
4333 exact = m.exact(f)
4332 if mark:
4334 if mark:
4333 if exact:
4335 if exact:
4334 ui.warn(_('not marking %s as it is driver-resolved\n')
4336 ui.warn(_('not marking %s as it is driver-resolved\n')
4335 % f)
4337 % f)
4336 elif unmark:
4338 elif unmark:
4337 if exact:
4339 if exact:
4338 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4340 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4339 % f)
4341 % f)
4340 else:
4342 else:
4341 runconclude = True
4343 runconclude = True
4342 continue
4344 continue
4343
4345
4344 if mark:
4346 if mark:
4345 ms.mark(f, "r")
4347 ms.mark(f, "r")
4346 elif unmark:
4348 elif unmark:
4347 ms.mark(f, "u")
4349 ms.mark(f, "u")
4348 else:
4350 else:
4349 # backup pre-resolve (merge uses .orig for its own purposes)
4351 # backup pre-resolve (merge uses .orig for its own purposes)
4350 a = repo.wjoin(f)
4352 a = repo.wjoin(f)
4351 try:
4353 try:
4352 util.copyfile(a, a + ".resolve")
4354 util.copyfile(a, a + ".resolve")
4353 except (IOError, OSError) as inst:
4355 except (IOError, OSError) as inst:
4354 if inst.errno != errno.ENOENT:
4356 if inst.errno != errno.ENOENT:
4355 raise
4357 raise
4356
4358
4357 try:
4359 try:
4358 # preresolve file
4360 # preresolve file
4359 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4361 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4360 'resolve')
4362 'resolve')
4361 complete, r = ms.preresolve(f, wctx)
4363 complete, r = ms.preresolve(f, wctx)
4362 if not complete:
4364 if not complete:
4363 tocomplete.append(f)
4365 tocomplete.append(f)
4364 elif r:
4366 elif r:
4365 ret = 1
4367 ret = 1
4366 finally:
4368 finally:
4367 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4369 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4368 ms.commit()
4370 ms.commit()
4369
4371
4370 # replace filemerge's .orig file with our resolve file, but only
4372 # replace filemerge's .orig file with our resolve file, but only
4371 # for merges that are complete
4373 # for merges that are complete
4372 if complete:
4374 if complete:
4373 try:
4375 try:
4374 util.rename(a + ".resolve",
4376 util.rename(a + ".resolve",
4375 scmutil.origpath(ui, repo, a))
4377 scmutil.origpath(ui, repo, a))
4376 except OSError as inst:
4378 except OSError as inst:
4377 if inst.errno != errno.ENOENT:
4379 if inst.errno != errno.ENOENT:
4378 raise
4380 raise
4379
4381
4380 for f in tocomplete:
4382 for f in tocomplete:
4381 try:
4383 try:
4382 # resolve file
4384 # resolve file
4383 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4385 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4384 'resolve')
4386 'resolve')
4385 r = ms.resolve(f, wctx)
4387 r = ms.resolve(f, wctx)
4386 if r:
4388 if r:
4387 ret = 1
4389 ret = 1
4388 finally:
4390 finally:
4389 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4391 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4390 ms.commit()
4392 ms.commit()
4391
4393
4392 # replace filemerge's .orig file with our resolve file
4394 # replace filemerge's .orig file with our resolve file
4393 a = repo.wjoin(f)
4395 a = repo.wjoin(f)
4394 try:
4396 try:
4395 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4397 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4396 except OSError as inst:
4398 except OSError as inst:
4397 if inst.errno != errno.ENOENT:
4399 if inst.errno != errno.ENOENT:
4398 raise
4400 raise
4399
4401
4400 ms.commit()
4402 ms.commit()
4401 ms.recordactions()
4403 ms.recordactions()
4402
4404
4403 if not didwork and pats:
4405 if not didwork and pats:
4404 hint = None
4406 hint = None
4405 if not any([p for p in pats if p.find(':') >= 0]):
4407 if not any([p for p in pats if p.find(':') >= 0]):
4406 pats = ['path:%s' % p for p in pats]
4408 pats = ['path:%s' % p for p in pats]
4407 m = scmutil.match(wctx, pats, opts)
4409 m = scmutil.match(wctx, pats, opts)
4408 for f in ms:
4410 for f in ms:
4409 if not m(f):
4411 if not m(f):
4410 continue
4412 continue
4411 flags = ''.join(['-%s ' % o[0] for o in flaglist
4413 flags = ''.join(['-%s ' % o[0] for o in flaglist
4412 if opts.get(o)])
4414 if opts.get(o)])
4413 hint = _("(try: hg resolve %s%s)\n") % (
4415 hint = _("(try: hg resolve %s%s)\n") % (
4414 flags,
4416 flags,
4415 ' '.join(pats))
4417 ' '.join(pats))
4416 break
4418 break
4417 ui.warn(_("arguments do not match paths that need resolving\n"))
4419 ui.warn(_("arguments do not match paths that need resolving\n"))
4418 if hint:
4420 if hint:
4419 ui.warn(hint)
4421 ui.warn(hint)
4420 elif ms.mergedriver and ms.mdstate() != 's':
4422 elif ms.mergedriver and ms.mdstate() != 's':
4421 # run conclude step when either a driver-resolved file is requested
4423 # run conclude step when either a driver-resolved file is requested
4422 # or there are no driver-resolved files
4424 # or there are no driver-resolved files
4423 # we can't use 'ret' to determine whether any files are unresolved
4425 # we can't use 'ret' to determine whether any files are unresolved
4424 # because we might not have tried to resolve some
4426 # because we might not have tried to resolve some
4425 if ((runconclude or not list(ms.driverresolved()))
4427 if ((runconclude or not list(ms.driverresolved()))
4426 and not list(ms.unresolved())):
4428 and not list(ms.unresolved())):
4427 proceed = mergemod.driverconclude(repo, ms, wctx)
4429 proceed = mergemod.driverconclude(repo, ms, wctx)
4428 ms.commit()
4430 ms.commit()
4429 if not proceed:
4431 if not proceed:
4430 return 1
4432 return 1
4431
4433
4432 # Nudge users into finishing an unfinished operation
4434 # Nudge users into finishing an unfinished operation
4433 unresolvedf = list(ms.unresolved())
4435 unresolvedf = list(ms.unresolved())
4434 driverresolvedf = list(ms.driverresolved())
4436 driverresolvedf = list(ms.driverresolved())
4435 if not unresolvedf and not driverresolvedf:
4437 if not unresolvedf and not driverresolvedf:
4436 ui.status(_('(no more unresolved files)\n'))
4438 ui.status(_('(no more unresolved files)\n'))
4437 cmdutil.checkafterresolved(repo)
4439 cmdutil.checkafterresolved(repo)
4438 elif not unresolvedf:
4440 elif not unresolvedf:
4439 ui.status(_('(no more unresolved files -- '
4441 ui.status(_('(no more unresolved files -- '
4440 'run "hg resolve --all" to conclude)\n'))
4442 'run "hg resolve --all" to conclude)\n'))
4441
4443
4442 return ret
4444 return ret
4443
4445
4444 @command('revert',
4446 @command('revert',
4445 [('a', 'all', None, _('revert all changes when no arguments given')),
4447 [('a', 'all', None, _('revert all changes when no arguments given')),
4446 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4448 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4447 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4449 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4448 ('C', 'no-backup', None, _('do not save backup copies of files')),
4450 ('C', 'no-backup', None, _('do not save backup copies of files')),
4449 ('i', 'interactive', None,
4451 ('i', 'interactive', None,
4450 _('interactively select the changes (EXPERIMENTAL)')),
4452 _('interactively select the changes (EXPERIMENTAL)')),
4451 ] + walkopts + dryrunopts,
4453 ] + walkopts + dryrunopts,
4452 _('[OPTION]... [-r REV] [NAME]...'))
4454 _('[OPTION]... [-r REV] [NAME]...'))
4453 def revert(ui, repo, *pats, **opts):
4455 def revert(ui, repo, *pats, **opts):
4454 """restore files to their checkout state
4456 """restore files to their checkout state
4455
4457
4456 .. note::
4458 .. note::
4457
4459
4458 To check out earlier revisions, you should use :hg:`update REV`.
4460 To check out earlier revisions, you should use :hg:`update REV`.
4459 To cancel an uncommitted merge (and lose your changes),
4461 To cancel an uncommitted merge (and lose your changes),
4460 use :hg:`update --clean .`.
4462 use :hg:`update --clean .`.
4461
4463
4462 With no revision specified, revert the specified files or directories
4464 With no revision specified, revert the specified files or directories
4463 to the contents they had in the parent of the working directory.
4465 to the contents they had in the parent of the working directory.
4464 This restores the contents of files to an unmodified
4466 This restores the contents of files to an unmodified
4465 state and unschedules adds, removes, copies, and renames. If the
4467 state and unschedules adds, removes, copies, and renames. If the
4466 working directory has two parents, you must explicitly specify a
4468 working directory has two parents, you must explicitly specify a
4467 revision.
4469 revision.
4468
4470
4469 Using the -r/--rev or -d/--date options, revert the given files or
4471 Using the -r/--rev or -d/--date options, revert the given files or
4470 directories to their states as of a specific revision. Because
4472 directories to their states as of a specific revision. Because
4471 revert does not change the working directory parents, this will
4473 revert does not change the working directory parents, this will
4472 cause these files to appear modified. This can be helpful to "back
4474 cause these files to appear modified. This can be helpful to "back
4473 out" some or all of an earlier change. See :hg:`backout` for a
4475 out" some or all of an earlier change. See :hg:`backout` for a
4474 related method.
4476 related method.
4475
4477
4476 Modified files are saved with a .orig suffix before reverting.
4478 Modified files are saved with a .orig suffix before reverting.
4477 To disable these backups, use --no-backup. It is possible to store
4479 To disable these backups, use --no-backup. It is possible to store
4478 the backup files in a custom directory relative to the root of the
4480 the backup files in a custom directory relative to the root of the
4479 repository by setting the ``ui.origbackuppath`` configuration
4481 repository by setting the ``ui.origbackuppath`` configuration
4480 option.
4482 option.
4481
4483
4482 See :hg:`help dates` for a list of formats valid for -d/--date.
4484 See :hg:`help dates` for a list of formats valid for -d/--date.
4483
4485
4484 See :hg:`help backout` for a way to reverse the effect of an
4486 See :hg:`help backout` for a way to reverse the effect of an
4485 earlier changeset.
4487 earlier changeset.
4486
4488
4487 Returns 0 on success.
4489 Returns 0 on success.
4488 """
4490 """
4489
4491
4490 if opts.get("date"):
4492 if opts.get("date"):
4491 if opts.get("rev"):
4493 if opts.get("rev"):
4492 raise error.Abort(_("you can't specify a revision and a date"))
4494 raise error.Abort(_("you can't specify a revision and a date"))
4493 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4495 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4494
4496
4495 parent, p2 = repo.dirstate.parents()
4497 parent, p2 = repo.dirstate.parents()
4496 if not opts.get('rev') and p2 != nullid:
4498 if not opts.get('rev') and p2 != nullid:
4497 # revert after merge is a trap for new users (issue2915)
4499 # revert after merge is a trap for new users (issue2915)
4498 raise error.Abort(_('uncommitted merge with no revision specified'),
4500 raise error.Abort(_('uncommitted merge with no revision specified'),
4499 hint=_("use 'hg update' or see 'hg help revert'"))
4501 hint=_("use 'hg update' or see 'hg help revert'"))
4500
4502
4501 ctx = scmutil.revsingle(repo, opts.get('rev'))
4503 ctx = scmutil.revsingle(repo, opts.get('rev'))
4502
4504
4503 if (not (pats or opts.get('include') or opts.get('exclude') or
4505 if (not (pats or opts.get('include') or opts.get('exclude') or
4504 opts.get('all') or opts.get('interactive'))):
4506 opts.get('all') or opts.get('interactive'))):
4505 msg = _("no files or directories specified")
4507 msg = _("no files or directories specified")
4506 if p2 != nullid:
4508 if p2 != nullid:
4507 hint = _("uncommitted merge, use --all to discard all changes,"
4509 hint = _("uncommitted merge, use --all to discard all changes,"
4508 " or 'hg update -C .' to abort the merge")
4510 " or 'hg update -C .' to abort the merge")
4509 raise error.Abort(msg, hint=hint)
4511 raise error.Abort(msg, hint=hint)
4510 dirty = any(repo.status())
4512 dirty = any(repo.status())
4511 node = ctx.node()
4513 node = ctx.node()
4512 if node != parent:
4514 if node != parent:
4513 if dirty:
4515 if dirty:
4514 hint = _("uncommitted changes, use --all to discard all"
4516 hint = _("uncommitted changes, use --all to discard all"
4515 " changes, or 'hg update %s' to update") % ctx.rev()
4517 " changes, or 'hg update %s' to update") % ctx.rev()
4516 else:
4518 else:
4517 hint = _("use --all to revert all files,"
4519 hint = _("use --all to revert all files,"
4518 " or 'hg update %s' to update") % ctx.rev()
4520 " or 'hg update %s' to update") % ctx.rev()
4519 elif dirty:
4521 elif dirty:
4520 hint = _("uncommitted changes, use --all to discard all changes")
4522 hint = _("uncommitted changes, use --all to discard all changes")
4521 else:
4523 else:
4522 hint = _("use --all to revert all files")
4524 hint = _("use --all to revert all files")
4523 raise error.Abort(msg, hint=hint)
4525 raise error.Abort(msg, hint=hint)
4524
4526
4525 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
4527 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
4526
4528
4527 @command('rollback', dryrunopts +
4529 @command('rollback', dryrunopts +
4528 [('f', 'force', False, _('ignore safety measures'))])
4530 [('f', 'force', False, _('ignore safety measures'))])
4529 def rollback(ui, repo, **opts):
4531 def rollback(ui, repo, **opts):
4530 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4532 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4531
4533
4532 Please use :hg:`commit --amend` instead of rollback to correct
4534 Please use :hg:`commit --amend` instead of rollback to correct
4533 mistakes in the last commit.
4535 mistakes in the last commit.
4534
4536
4535 This command should be used with care. There is only one level of
4537 This command should be used with care. There is only one level of
4536 rollback, and there is no way to undo a rollback. It will also
4538 rollback, and there is no way to undo a rollback. It will also
4537 restore the dirstate at the time of the last transaction, losing
4539 restore the dirstate at the time of the last transaction, losing
4538 any dirstate changes since that time. This command does not alter
4540 any dirstate changes since that time. This command does not alter
4539 the working directory.
4541 the working directory.
4540
4542
4541 Transactions are used to encapsulate the effects of all commands
4543 Transactions are used to encapsulate the effects of all commands
4542 that create new changesets or propagate existing changesets into a
4544 that create new changesets or propagate existing changesets into a
4543 repository.
4545 repository.
4544
4546
4545 .. container:: verbose
4547 .. container:: verbose
4546
4548
4547 For example, the following commands are transactional, and their
4549 For example, the following commands are transactional, and their
4548 effects can be rolled back:
4550 effects can be rolled back:
4549
4551
4550 - commit
4552 - commit
4551 - import
4553 - import
4552 - pull
4554 - pull
4553 - push (with this repository as the destination)
4555 - push (with this repository as the destination)
4554 - unbundle
4556 - unbundle
4555
4557
4556 To avoid permanent data loss, rollback will refuse to rollback a
4558 To avoid permanent data loss, rollback will refuse to rollback a
4557 commit transaction if it isn't checked out. Use --force to
4559 commit transaction if it isn't checked out. Use --force to
4558 override this protection.
4560 override this protection.
4559
4561
4560 The rollback command can be entirely disabled by setting the
4562 The rollback command can be entirely disabled by setting the
4561 ``ui.rollback`` configuration setting to false. If you're here
4563 ``ui.rollback`` configuration setting to false. If you're here
4562 because you want to use rollback and it's disabled, you can
4564 because you want to use rollback and it's disabled, you can
4563 re-enable the command by setting ``ui.rollback`` to true.
4565 re-enable the command by setting ``ui.rollback`` to true.
4564
4566
4565 This command is not intended for use on public repositories. Once
4567 This command is not intended for use on public repositories. Once
4566 changes are visible for pull by other users, rolling a transaction
4568 changes are visible for pull by other users, rolling a transaction
4567 back locally is ineffective (someone else may already have pulled
4569 back locally is ineffective (someone else may already have pulled
4568 the changes). Furthermore, a race is possible with readers of the
4570 the changes). Furthermore, a race is possible with readers of the
4569 repository; for example an in-progress pull from the repository
4571 repository; for example an in-progress pull from the repository
4570 may fail if a rollback is performed.
4572 may fail if a rollback is performed.
4571
4573
4572 Returns 0 on success, 1 if no rollback data is available.
4574 Returns 0 on success, 1 if no rollback data is available.
4573 """
4575 """
4574 if not ui.configbool('ui', 'rollback', True):
4576 if not ui.configbool('ui', 'rollback', True):
4575 raise error.Abort(_('rollback is disabled because it is unsafe'),
4577 raise error.Abort(_('rollback is disabled because it is unsafe'),
4576 hint=('see `hg help -v rollback` for information'))
4578 hint=('see `hg help -v rollback` for information'))
4577 return repo.rollback(dryrun=opts.get('dry_run'),
4579 return repo.rollback(dryrun=opts.get('dry_run'),
4578 force=opts.get('force'))
4580 force=opts.get('force'))
4579
4581
4580 @command('root', [])
4582 @command('root', [])
4581 def root(ui, repo):
4583 def root(ui, repo):
4582 """print the root (top) of the current working directory
4584 """print the root (top) of the current working directory
4583
4585
4584 Print the root directory of the current repository.
4586 Print the root directory of the current repository.
4585
4587
4586 Returns 0 on success.
4588 Returns 0 on success.
4587 """
4589 """
4588 ui.write(repo.root + "\n")
4590 ui.write(repo.root + "\n")
4589
4591
4590 @command('^serve',
4592 @command('^serve',
4591 [('A', 'accesslog', '', _('name of access log file to write to'),
4593 [('A', 'accesslog', '', _('name of access log file to write to'),
4592 _('FILE')),
4594 _('FILE')),
4593 ('d', 'daemon', None, _('run server in background')),
4595 ('d', 'daemon', None, _('run server in background')),
4594 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4596 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4595 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4597 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4596 # use string type, then we can check if something was passed
4598 # use string type, then we can check if something was passed
4597 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4599 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4598 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4600 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4599 _('ADDR')),
4601 _('ADDR')),
4600 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4602 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4601 _('PREFIX')),
4603 _('PREFIX')),
4602 ('n', 'name', '',
4604 ('n', 'name', '',
4603 _('name to show in web pages (default: working directory)'), _('NAME')),
4605 _('name to show in web pages (default: working directory)'), _('NAME')),
4604 ('', 'web-conf', '',
4606 ('', 'web-conf', '',
4605 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4607 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4606 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4608 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4607 _('FILE')),
4609 _('FILE')),
4608 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4610 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4609 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4611 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4610 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4612 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4611 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4613 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4612 ('', 'style', '', _('template style to use'), _('STYLE')),
4614 ('', 'style', '', _('template style to use'), _('STYLE')),
4613 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4615 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4614 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
4616 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
4615 _('[OPTION]...'),
4617 _('[OPTION]...'),
4616 optionalrepo=True)
4618 optionalrepo=True)
4617 def serve(ui, repo, **opts):
4619 def serve(ui, repo, **opts):
4618 """start stand-alone webserver
4620 """start stand-alone webserver
4619
4621
4620 Start a local HTTP repository browser and pull server. You can use
4622 Start a local HTTP repository browser and pull server. You can use
4621 this for ad-hoc sharing and browsing of repositories. It is
4623 this for ad-hoc sharing and browsing of repositories. It is
4622 recommended to use a real web server to serve a repository for
4624 recommended to use a real web server to serve a repository for
4623 longer periods of time.
4625 longer periods of time.
4624
4626
4625 Please note that the server does not implement access control.
4627 Please note that the server does not implement access control.
4626 This means that, by default, anybody can read from the server and
4628 This means that, by default, anybody can read from the server and
4627 nobody can write to it by default. Set the ``web.allow_push``
4629 nobody can write to it by default. Set the ``web.allow_push``
4628 option to ``*`` to allow everybody to push to the server. You
4630 option to ``*`` to allow everybody to push to the server. You
4629 should use a real web server if you need to authenticate users.
4631 should use a real web server if you need to authenticate users.
4630
4632
4631 By default, the server logs accesses to stdout and errors to
4633 By default, the server logs accesses to stdout and errors to
4632 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4634 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4633 files.
4635 files.
4634
4636
4635 To have the server choose a free port number to listen on, specify
4637 To have the server choose a free port number to listen on, specify
4636 a port number of 0; in this case, the server will print the port
4638 a port number of 0; in this case, the server will print the port
4637 number it uses.
4639 number it uses.
4638
4640
4639 Returns 0 on success.
4641 Returns 0 on success.
4640 """
4642 """
4641
4643
4642 if opts["stdio"] and opts["cmdserver"]:
4644 if opts["stdio"] and opts["cmdserver"]:
4643 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4645 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4644
4646
4645 if opts["stdio"]:
4647 if opts["stdio"]:
4646 if repo is None:
4648 if repo is None:
4647 raise error.RepoError(_("there is no Mercurial repository here"
4649 raise error.RepoError(_("there is no Mercurial repository here"
4648 " (.hg not found)"))
4650 " (.hg not found)"))
4649 s = sshserver.sshserver(ui, repo)
4651 s = sshserver.sshserver(ui, repo)
4650 s.serve_forever()
4652 s.serve_forever()
4651
4653
4652 service = server.createservice(ui, repo, opts)
4654 service = server.createservice(ui, repo, opts)
4653 return server.runservice(opts, initfn=service.init, runfn=service.run)
4655 return server.runservice(opts, initfn=service.init, runfn=service.run)
4654
4656
4655 @command('^status|st',
4657 @command('^status|st',
4656 [('A', 'all', None, _('show status of all files')),
4658 [('A', 'all', None, _('show status of all files')),
4657 ('m', 'modified', None, _('show only modified files')),
4659 ('m', 'modified', None, _('show only modified files')),
4658 ('a', 'added', None, _('show only added files')),
4660 ('a', 'added', None, _('show only added files')),
4659 ('r', 'removed', None, _('show only removed files')),
4661 ('r', 'removed', None, _('show only removed files')),
4660 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4662 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4661 ('c', 'clean', None, _('show only files without changes')),
4663 ('c', 'clean', None, _('show only files without changes')),
4662 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4664 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4663 ('i', 'ignored', None, _('show only ignored files')),
4665 ('i', 'ignored', None, _('show only ignored files')),
4664 ('n', 'no-status', None, _('hide status prefix')),
4666 ('n', 'no-status', None, _('hide status prefix')),
4665 ('C', 'copies', None, _('show source of copied files')),
4667 ('C', 'copies', None, _('show source of copied files')),
4666 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4668 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4667 ('', 'rev', [], _('show difference from revision'), _('REV')),
4669 ('', 'rev', [], _('show difference from revision'), _('REV')),
4668 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4670 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4669 ] + walkopts + subrepoopts + formatteropts,
4671 ] + walkopts + subrepoopts + formatteropts,
4670 _('[OPTION]... [FILE]...'),
4672 _('[OPTION]... [FILE]...'),
4671 inferrepo=True)
4673 inferrepo=True)
4672 def status(ui, repo, *pats, **opts):
4674 def status(ui, repo, *pats, **opts):
4673 """show changed files in the working directory
4675 """show changed files in the working directory
4674
4676
4675 Show status of files in the repository. If names are given, only
4677 Show status of files in the repository. If names are given, only
4676 files that match are shown. Files that are clean or ignored or
4678 files that match are shown. Files that are clean or ignored or
4677 the source of a copy/move operation, are not listed unless
4679 the source of a copy/move operation, are not listed unless
4678 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4680 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4679 Unless options described with "show only ..." are given, the
4681 Unless options described with "show only ..." are given, the
4680 options -mardu are used.
4682 options -mardu are used.
4681
4683
4682 Option -q/--quiet hides untracked (unknown and ignored) files
4684 Option -q/--quiet hides untracked (unknown and ignored) files
4683 unless explicitly requested with -u/--unknown or -i/--ignored.
4685 unless explicitly requested with -u/--unknown or -i/--ignored.
4684
4686
4685 .. note::
4687 .. note::
4686
4688
4687 :hg:`status` may appear to disagree with diff if permissions have
4689 :hg:`status` may appear to disagree with diff if permissions have
4688 changed or a merge has occurred. The standard diff format does
4690 changed or a merge has occurred. The standard diff format does
4689 not report permission changes and diff only reports changes
4691 not report permission changes and diff only reports changes
4690 relative to one merge parent.
4692 relative to one merge parent.
4691
4693
4692 If one revision is given, it is used as the base revision.
4694 If one revision is given, it is used as the base revision.
4693 If two revisions are given, the differences between them are
4695 If two revisions are given, the differences between them are
4694 shown. The --change option can also be used as a shortcut to list
4696 shown. The --change option can also be used as a shortcut to list
4695 the changed files of a revision from its first parent.
4697 the changed files of a revision from its first parent.
4696
4698
4697 The codes used to show the status of files are::
4699 The codes used to show the status of files are::
4698
4700
4699 M = modified
4701 M = modified
4700 A = added
4702 A = added
4701 R = removed
4703 R = removed
4702 C = clean
4704 C = clean
4703 ! = missing (deleted by non-hg command, but still tracked)
4705 ! = missing (deleted by non-hg command, but still tracked)
4704 ? = not tracked
4706 ? = not tracked
4705 I = ignored
4707 I = ignored
4706 = origin of the previous file (with --copies)
4708 = origin of the previous file (with --copies)
4707
4709
4708 .. container:: verbose
4710 .. container:: verbose
4709
4711
4710 Examples:
4712 Examples:
4711
4713
4712 - show changes in the working directory relative to a
4714 - show changes in the working directory relative to a
4713 changeset::
4715 changeset::
4714
4716
4715 hg status --rev 9353
4717 hg status --rev 9353
4716
4718
4717 - show changes in the working directory relative to the
4719 - show changes in the working directory relative to the
4718 current directory (see :hg:`help patterns` for more information)::
4720 current directory (see :hg:`help patterns` for more information)::
4719
4721
4720 hg status re:
4722 hg status re:
4721
4723
4722 - show all changes including copies in an existing changeset::
4724 - show all changes including copies in an existing changeset::
4723
4725
4724 hg status --copies --change 9353
4726 hg status --copies --change 9353
4725
4727
4726 - get a NUL separated list of added files, suitable for xargs::
4728 - get a NUL separated list of added files, suitable for xargs::
4727
4729
4728 hg status -an0
4730 hg status -an0
4729
4731
4730 Returns 0 on success.
4732 Returns 0 on success.
4731 """
4733 """
4732
4734
4733 opts = pycompat.byteskwargs(opts)
4735 opts = pycompat.byteskwargs(opts)
4734 revs = opts.get('rev')
4736 revs = opts.get('rev')
4735 change = opts.get('change')
4737 change = opts.get('change')
4736
4738
4737 if revs and change:
4739 if revs and change:
4738 msg = _('cannot specify --rev and --change at the same time')
4740 msg = _('cannot specify --rev and --change at the same time')
4739 raise error.Abort(msg)
4741 raise error.Abort(msg)
4740 elif change:
4742 elif change:
4741 node2 = scmutil.revsingle(repo, change, None).node()
4743 node2 = scmutil.revsingle(repo, change, None).node()
4742 node1 = repo[node2].p1().node()
4744 node1 = repo[node2].p1().node()
4743 else:
4745 else:
4744 node1, node2 = scmutil.revpair(repo, revs)
4746 node1, node2 = scmutil.revpair(repo, revs)
4745
4747
4746 if pats or ui.configbool('commands', 'status.relative'):
4748 if pats or ui.configbool('commands', 'status.relative'):
4747 cwd = repo.getcwd()
4749 cwd = repo.getcwd()
4748 else:
4750 else:
4749 cwd = ''
4751 cwd = ''
4750
4752
4751 if opts.get('print0'):
4753 if opts.get('print0'):
4752 end = '\0'
4754 end = '\0'
4753 else:
4755 else:
4754 end = '\n'
4756 end = '\n'
4755 copy = {}
4757 copy = {}
4756 states = 'modified added removed deleted unknown ignored clean'.split()
4758 states = 'modified added removed deleted unknown ignored clean'.split()
4757 show = [k for k in states if opts.get(k)]
4759 show = [k for k in states if opts.get(k)]
4758 if opts.get('all'):
4760 if opts.get('all'):
4759 show += ui.quiet and (states[:4] + ['clean']) or states
4761 show += ui.quiet and (states[:4] + ['clean']) or states
4760 if not show:
4762 if not show:
4761 if ui.quiet:
4763 if ui.quiet:
4762 show = states[:4]
4764 show = states[:4]
4763 else:
4765 else:
4764 show = states[:5]
4766 show = states[:5]
4765
4767
4766 m = scmutil.match(repo[node2], pats, opts)
4768 m = scmutil.match(repo[node2], pats, opts)
4767 stat = repo.status(node1, node2, m,
4769 stat = repo.status(node1, node2, m,
4768 'ignored' in show, 'clean' in show, 'unknown' in show,
4770 'ignored' in show, 'clean' in show, 'unknown' in show,
4769 opts.get('subrepos'))
4771 opts.get('subrepos'))
4770 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
4772 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
4771
4773
4772 if (opts.get('all') or opts.get('copies')
4774 if (opts.get('all') or opts.get('copies')
4773 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
4775 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
4774 copy = copies.pathcopies(repo[node1], repo[node2], m)
4776 copy = copies.pathcopies(repo[node1], repo[node2], m)
4775
4777
4776 ui.pager('status')
4778 ui.pager('status')
4777 fm = ui.formatter('status', opts)
4779 fm = ui.formatter('status', opts)
4778 fmt = '%s' + end
4780 fmt = '%s' + end
4779 showchar = not opts.get('no_status')
4781 showchar = not opts.get('no_status')
4780
4782
4781 for state, char, files in changestates:
4783 for state, char, files in changestates:
4782 if state in show:
4784 if state in show:
4783 label = 'status.' + state
4785 label = 'status.' + state
4784 for f in files:
4786 for f in files:
4785 fm.startitem()
4787 fm.startitem()
4786 fm.condwrite(showchar, 'status', '%s ', char, label=label)
4788 fm.condwrite(showchar, 'status', '%s ', char, label=label)
4787 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
4789 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
4788 if f in copy:
4790 if f in copy:
4789 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
4791 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
4790 label='status.copied')
4792 label='status.copied')
4791 fm.end()
4793 fm.end()
4792
4794
4793 @command('^summary|sum',
4795 @command('^summary|sum',
4794 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
4796 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
4795 def summary(ui, repo, **opts):
4797 def summary(ui, repo, **opts):
4796 """summarize working directory state
4798 """summarize working directory state
4797
4799
4798 This generates a brief summary of the working directory state,
4800 This generates a brief summary of the working directory state,
4799 including parents, branch, commit status, phase and available updates.
4801 including parents, branch, commit status, phase and available updates.
4800
4802
4801 With the --remote option, this will check the default paths for
4803 With the --remote option, this will check the default paths for
4802 incoming and outgoing changes. This can be time-consuming.
4804 incoming and outgoing changes. This can be time-consuming.
4803
4805
4804 Returns 0 on success.
4806 Returns 0 on success.
4805 """
4807 """
4806
4808
4807 ui.pager('summary')
4809 ui.pager('summary')
4808 ctx = repo[None]
4810 ctx = repo[None]
4809 parents = ctx.parents()
4811 parents = ctx.parents()
4810 pnode = parents[0].node()
4812 pnode = parents[0].node()
4811 marks = []
4813 marks = []
4812
4814
4813 ms = None
4815 ms = None
4814 try:
4816 try:
4815 ms = mergemod.mergestate.read(repo)
4817 ms = mergemod.mergestate.read(repo)
4816 except error.UnsupportedMergeRecords as e:
4818 except error.UnsupportedMergeRecords as e:
4817 s = ' '.join(e.recordtypes)
4819 s = ' '.join(e.recordtypes)
4818 ui.warn(
4820 ui.warn(
4819 _('warning: merge state has unsupported record types: %s\n') % s)
4821 _('warning: merge state has unsupported record types: %s\n') % s)
4820 unresolved = 0
4822 unresolved = 0
4821 else:
4823 else:
4822 unresolved = [f for f in ms if ms[f] == 'u']
4824 unresolved = [f for f in ms if ms[f] == 'u']
4823
4825
4824 for p in parents:
4826 for p in parents:
4825 # label with log.changeset (instead of log.parent) since this
4827 # label with log.changeset (instead of log.parent) since this
4826 # shows a working directory parent *changeset*:
4828 # shows a working directory parent *changeset*:
4827 # i18n: column positioning for "hg summary"
4829 # i18n: column positioning for "hg summary"
4828 ui.write(_('parent: %d:%s ') % (p.rev(), p),
4830 ui.write(_('parent: %d:%s ') % (p.rev(), p),
4829 label=cmdutil._changesetlabels(p))
4831 label=cmdutil._changesetlabels(p))
4830 ui.write(' '.join(p.tags()), label='log.tag')
4832 ui.write(' '.join(p.tags()), label='log.tag')
4831 if p.bookmarks():
4833 if p.bookmarks():
4832 marks.extend(p.bookmarks())
4834 marks.extend(p.bookmarks())
4833 if p.rev() == -1:
4835 if p.rev() == -1:
4834 if not len(repo):
4836 if not len(repo):
4835 ui.write(_(' (empty repository)'))
4837 ui.write(_(' (empty repository)'))
4836 else:
4838 else:
4837 ui.write(_(' (no revision checked out)'))
4839 ui.write(_(' (no revision checked out)'))
4838 if p.obsolete():
4840 if p.obsolete():
4839 ui.write(_(' (obsolete)'))
4841 ui.write(_(' (obsolete)'))
4840 if p.troubled():
4842 if p.troubled():
4841 ui.write(' ('
4843 ui.write(' ('
4842 + ', '.join(ui.label(trouble, 'trouble.%s' % trouble)
4844 + ', '.join(ui.label(trouble, 'trouble.%s' % trouble)
4843 for trouble in p.troubles())
4845 for trouble in p.troubles())
4844 + ')')
4846 + ')')
4845 ui.write('\n')
4847 ui.write('\n')
4846 if p.description():
4848 if p.description():
4847 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
4849 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
4848 label='log.summary')
4850 label='log.summary')
4849
4851
4850 branch = ctx.branch()
4852 branch = ctx.branch()
4851 bheads = repo.branchheads(branch)
4853 bheads = repo.branchheads(branch)
4852 # i18n: column positioning for "hg summary"
4854 # i18n: column positioning for "hg summary"
4853 m = _('branch: %s\n') % branch
4855 m = _('branch: %s\n') % branch
4854 if branch != 'default':
4856 if branch != 'default':
4855 ui.write(m, label='log.branch')
4857 ui.write(m, label='log.branch')
4856 else:
4858 else:
4857 ui.status(m, label='log.branch')
4859 ui.status(m, label='log.branch')
4858
4860
4859 if marks:
4861 if marks:
4860 active = repo._activebookmark
4862 active = repo._activebookmark
4861 # i18n: column positioning for "hg summary"
4863 # i18n: column positioning for "hg summary"
4862 ui.write(_('bookmarks:'), label='log.bookmark')
4864 ui.write(_('bookmarks:'), label='log.bookmark')
4863 if active is not None:
4865 if active is not None:
4864 if active in marks:
4866 if active in marks:
4865 ui.write(' *' + active, label=activebookmarklabel)
4867 ui.write(' *' + active, label=activebookmarklabel)
4866 marks.remove(active)
4868 marks.remove(active)
4867 else:
4869 else:
4868 ui.write(' [%s]' % active, label=activebookmarklabel)
4870 ui.write(' [%s]' % active, label=activebookmarklabel)
4869 for m in marks:
4871 for m in marks:
4870 ui.write(' ' + m, label='log.bookmark')
4872 ui.write(' ' + m, label='log.bookmark')
4871 ui.write('\n', label='log.bookmark')
4873 ui.write('\n', label='log.bookmark')
4872
4874
4873 status = repo.status(unknown=True)
4875 status = repo.status(unknown=True)
4874
4876
4875 c = repo.dirstate.copies()
4877 c = repo.dirstate.copies()
4876 copied, renamed = [], []
4878 copied, renamed = [], []
4877 for d, s in c.iteritems():
4879 for d, s in c.iteritems():
4878 if s in status.removed:
4880 if s in status.removed:
4879 status.removed.remove(s)
4881 status.removed.remove(s)
4880 renamed.append(d)
4882 renamed.append(d)
4881 else:
4883 else:
4882 copied.append(d)
4884 copied.append(d)
4883 if d in status.added:
4885 if d in status.added:
4884 status.added.remove(d)
4886 status.added.remove(d)
4885
4887
4886 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
4888 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
4887
4889
4888 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
4890 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
4889 (ui.label(_('%d added'), 'status.added'), status.added),
4891 (ui.label(_('%d added'), 'status.added'), status.added),
4890 (ui.label(_('%d removed'), 'status.removed'), status.removed),
4892 (ui.label(_('%d removed'), 'status.removed'), status.removed),
4891 (ui.label(_('%d renamed'), 'status.copied'), renamed),
4893 (ui.label(_('%d renamed'), 'status.copied'), renamed),
4892 (ui.label(_('%d copied'), 'status.copied'), copied),
4894 (ui.label(_('%d copied'), 'status.copied'), copied),
4893 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
4895 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
4894 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
4896 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
4895 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
4897 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
4896 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
4898 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
4897 t = []
4899 t = []
4898 for l, s in labels:
4900 for l, s in labels:
4899 if s:
4901 if s:
4900 t.append(l % len(s))
4902 t.append(l % len(s))
4901
4903
4902 t = ', '.join(t)
4904 t = ', '.join(t)
4903 cleanworkdir = False
4905 cleanworkdir = False
4904
4906
4905 if repo.vfs.exists('graftstate'):
4907 if repo.vfs.exists('graftstate'):
4906 t += _(' (graft in progress)')
4908 t += _(' (graft in progress)')
4907 if repo.vfs.exists('updatestate'):
4909 if repo.vfs.exists('updatestate'):
4908 t += _(' (interrupted update)')
4910 t += _(' (interrupted update)')
4909 elif len(parents) > 1:
4911 elif len(parents) > 1:
4910 t += _(' (merge)')
4912 t += _(' (merge)')
4911 elif branch != parents[0].branch():
4913 elif branch != parents[0].branch():
4912 t += _(' (new branch)')
4914 t += _(' (new branch)')
4913 elif (parents[0].closesbranch() and
4915 elif (parents[0].closesbranch() and
4914 pnode in repo.branchheads(branch, closed=True)):
4916 pnode in repo.branchheads(branch, closed=True)):
4915 t += _(' (head closed)')
4917 t += _(' (head closed)')
4916 elif not (status.modified or status.added or status.removed or renamed or
4918 elif not (status.modified or status.added or status.removed or renamed or
4917 copied or subs):
4919 copied or subs):
4918 t += _(' (clean)')
4920 t += _(' (clean)')
4919 cleanworkdir = True
4921 cleanworkdir = True
4920 elif pnode not in bheads:
4922 elif pnode not in bheads:
4921 t += _(' (new branch head)')
4923 t += _(' (new branch head)')
4922
4924
4923 if parents:
4925 if parents:
4924 pendingphase = max(p.phase() for p in parents)
4926 pendingphase = max(p.phase() for p in parents)
4925 else:
4927 else:
4926 pendingphase = phases.public
4928 pendingphase = phases.public
4927
4929
4928 if pendingphase > phases.newcommitphase(ui):
4930 if pendingphase > phases.newcommitphase(ui):
4929 t += ' (%s)' % phases.phasenames[pendingphase]
4931 t += ' (%s)' % phases.phasenames[pendingphase]
4930
4932
4931 if cleanworkdir:
4933 if cleanworkdir:
4932 # i18n: column positioning for "hg summary"
4934 # i18n: column positioning for "hg summary"
4933 ui.status(_('commit: %s\n') % t.strip())
4935 ui.status(_('commit: %s\n') % t.strip())
4934 else:
4936 else:
4935 # i18n: column positioning for "hg summary"
4937 # i18n: column positioning for "hg summary"
4936 ui.write(_('commit: %s\n') % t.strip())
4938 ui.write(_('commit: %s\n') % t.strip())
4937
4939
4938 # all ancestors of branch heads - all ancestors of parent = new csets
4940 # all ancestors of branch heads - all ancestors of parent = new csets
4939 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
4941 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
4940 bheads))
4942 bheads))
4941
4943
4942 if new == 0:
4944 if new == 0:
4943 # i18n: column positioning for "hg summary"
4945 # i18n: column positioning for "hg summary"
4944 ui.status(_('update: (current)\n'))
4946 ui.status(_('update: (current)\n'))
4945 elif pnode not in bheads:
4947 elif pnode not in bheads:
4946 # i18n: column positioning for "hg summary"
4948 # i18n: column positioning for "hg summary"
4947 ui.write(_('update: %d new changesets (update)\n') % new)
4949 ui.write(_('update: %d new changesets (update)\n') % new)
4948 else:
4950 else:
4949 # i18n: column positioning for "hg summary"
4951 # i18n: column positioning for "hg summary"
4950 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
4952 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
4951 (new, len(bheads)))
4953 (new, len(bheads)))
4952
4954
4953 t = []
4955 t = []
4954 draft = len(repo.revs('draft()'))
4956 draft = len(repo.revs('draft()'))
4955 if draft:
4957 if draft:
4956 t.append(_('%d draft') % draft)
4958 t.append(_('%d draft') % draft)
4957 secret = len(repo.revs('secret()'))
4959 secret = len(repo.revs('secret()'))
4958 if secret:
4960 if secret:
4959 t.append(_('%d secret') % secret)
4961 t.append(_('%d secret') % secret)
4960
4962
4961 if draft or secret:
4963 if draft or secret:
4962 ui.status(_('phases: %s\n') % ', '.join(t))
4964 ui.status(_('phases: %s\n') % ', '.join(t))
4963
4965
4964 if obsolete.isenabled(repo, obsolete.createmarkersopt):
4966 if obsolete.isenabled(repo, obsolete.createmarkersopt):
4965 for trouble in ("unstable", "divergent", "bumped"):
4967 for trouble in ("unstable", "divergent", "bumped"):
4966 numtrouble = len(repo.revs(trouble + "()"))
4968 numtrouble = len(repo.revs(trouble + "()"))
4967 # We write all the possibilities to ease translation
4969 # We write all the possibilities to ease translation
4968 troublemsg = {
4970 troublemsg = {
4969 "unstable": _("unstable: %d changesets"),
4971 "unstable": _("unstable: %d changesets"),
4970 "divergent": _("divergent: %d changesets"),
4972 "divergent": _("divergent: %d changesets"),
4971 "bumped": _("bumped: %d changesets"),
4973 "bumped": _("bumped: %d changesets"),
4972 }
4974 }
4973 if numtrouble > 0:
4975 if numtrouble > 0:
4974 ui.status(troublemsg[trouble] % numtrouble + "\n")
4976 ui.status(troublemsg[trouble] % numtrouble + "\n")
4975
4977
4976 cmdutil.summaryhooks(ui, repo)
4978 cmdutil.summaryhooks(ui, repo)
4977
4979
4978 if opts.get('remote'):
4980 if opts.get('remote'):
4979 needsincoming, needsoutgoing = True, True
4981 needsincoming, needsoutgoing = True, True
4980 else:
4982 else:
4981 needsincoming, needsoutgoing = False, False
4983 needsincoming, needsoutgoing = False, False
4982 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
4984 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
4983 if i:
4985 if i:
4984 needsincoming = True
4986 needsincoming = True
4985 if o:
4987 if o:
4986 needsoutgoing = True
4988 needsoutgoing = True
4987 if not needsincoming and not needsoutgoing:
4989 if not needsincoming and not needsoutgoing:
4988 return
4990 return
4989
4991
4990 def getincoming():
4992 def getincoming():
4991 source, branches = hg.parseurl(ui.expandpath('default'))
4993 source, branches = hg.parseurl(ui.expandpath('default'))
4992 sbranch = branches[0]
4994 sbranch = branches[0]
4993 try:
4995 try:
4994 other = hg.peer(repo, {}, source)
4996 other = hg.peer(repo, {}, source)
4995 except error.RepoError:
4997 except error.RepoError:
4996 if opts.get('remote'):
4998 if opts.get('remote'):
4997 raise
4999 raise
4998 return source, sbranch, None, None, None
5000 return source, sbranch, None, None, None
4999 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5001 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5000 if revs:
5002 if revs:
5001 revs = [other.lookup(rev) for rev in revs]
5003 revs = [other.lookup(rev) for rev in revs]
5002 ui.debug('comparing with %s\n' % util.hidepassword(source))
5004 ui.debug('comparing with %s\n' % util.hidepassword(source))
5003 repo.ui.pushbuffer()
5005 repo.ui.pushbuffer()
5004 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5006 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5005 repo.ui.popbuffer()
5007 repo.ui.popbuffer()
5006 return source, sbranch, other, commoninc, commoninc[1]
5008 return source, sbranch, other, commoninc, commoninc[1]
5007
5009
5008 if needsincoming:
5010 if needsincoming:
5009 source, sbranch, sother, commoninc, incoming = getincoming()
5011 source, sbranch, sother, commoninc, incoming = getincoming()
5010 else:
5012 else:
5011 source = sbranch = sother = commoninc = incoming = None
5013 source = sbranch = sother = commoninc = incoming = None
5012
5014
5013 def getoutgoing():
5015 def getoutgoing():
5014 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5016 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5015 dbranch = branches[0]
5017 dbranch = branches[0]
5016 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5018 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5017 if source != dest:
5019 if source != dest:
5018 try:
5020 try:
5019 dother = hg.peer(repo, {}, dest)
5021 dother = hg.peer(repo, {}, dest)
5020 except error.RepoError:
5022 except error.RepoError:
5021 if opts.get('remote'):
5023 if opts.get('remote'):
5022 raise
5024 raise
5023 return dest, dbranch, None, None
5025 return dest, dbranch, None, None
5024 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5026 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5025 elif sother is None:
5027 elif sother is None:
5026 # there is no explicit destination peer, but source one is invalid
5028 # there is no explicit destination peer, but source one is invalid
5027 return dest, dbranch, None, None
5029 return dest, dbranch, None, None
5028 else:
5030 else:
5029 dother = sother
5031 dother = sother
5030 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5032 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5031 common = None
5033 common = None
5032 else:
5034 else:
5033 common = commoninc
5035 common = commoninc
5034 if revs:
5036 if revs:
5035 revs = [repo.lookup(rev) for rev in revs]
5037 revs = [repo.lookup(rev) for rev in revs]
5036 repo.ui.pushbuffer()
5038 repo.ui.pushbuffer()
5037 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5039 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5038 commoninc=common)
5040 commoninc=common)
5039 repo.ui.popbuffer()
5041 repo.ui.popbuffer()
5040 return dest, dbranch, dother, outgoing
5042 return dest, dbranch, dother, outgoing
5041
5043
5042 if needsoutgoing:
5044 if needsoutgoing:
5043 dest, dbranch, dother, outgoing = getoutgoing()
5045 dest, dbranch, dother, outgoing = getoutgoing()
5044 else:
5046 else:
5045 dest = dbranch = dother = outgoing = None
5047 dest = dbranch = dother = outgoing = None
5046
5048
5047 if opts.get('remote'):
5049 if opts.get('remote'):
5048 t = []
5050 t = []
5049 if incoming:
5051 if incoming:
5050 t.append(_('1 or more incoming'))
5052 t.append(_('1 or more incoming'))
5051 o = outgoing.missing
5053 o = outgoing.missing
5052 if o:
5054 if o:
5053 t.append(_('%d outgoing') % len(o))
5055 t.append(_('%d outgoing') % len(o))
5054 other = dother or sother
5056 other = dother or sother
5055 if 'bookmarks' in other.listkeys('namespaces'):
5057 if 'bookmarks' in other.listkeys('namespaces'):
5056 counts = bookmarks.summary(repo, other)
5058 counts = bookmarks.summary(repo, other)
5057 if counts[0] > 0:
5059 if counts[0] > 0:
5058 t.append(_('%d incoming bookmarks') % counts[0])
5060 t.append(_('%d incoming bookmarks') % counts[0])
5059 if counts[1] > 0:
5061 if counts[1] > 0:
5060 t.append(_('%d outgoing bookmarks') % counts[1])
5062 t.append(_('%d outgoing bookmarks') % counts[1])
5061
5063
5062 if t:
5064 if t:
5063 # i18n: column positioning for "hg summary"
5065 # i18n: column positioning for "hg summary"
5064 ui.write(_('remote: %s\n') % (', '.join(t)))
5066 ui.write(_('remote: %s\n') % (', '.join(t)))
5065 else:
5067 else:
5066 # i18n: column positioning for "hg summary"
5068 # i18n: column positioning for "hg summary"
5067 ui.status(_('remote: (synced)\n'))
5069 ui.status(_('remote: (synced)\n'))
5068
5070
5069 cmdutil.summaryremotehooks(ui, repo, opts,
5071 cmdutil.summaryremotehooks(ui, repo, opts,
5070 ((source, sbranch, sother, commoninc),
5072 ((source, sbranch, sother, commoninc),
5071 (dest, dbranch, dother, outgoing)))
5073 (dest, dbranch, dother, outgoing)))
5072
5074
5073 @command('tag',
5075 @command('tag',
5074 [('f', 'force', None, _('force tag')),
5076 [('f', 'force', None, _('force tag')),
5075 ('l', 'local', None, _('make the tag local')),
5077 ('l', 'local', None, _('make the tag local')),
5076 ('r', 'rev', '', _('revision to tag'), _('REV')),
5078 ('r', 'rev', '', _('revision to tag'), _('REV')),
5077 ('', 'remove', None, _('remove a tag')),
5079 ('', 'remove', None, _('remove a tag')),
5078 # -l/--local is already there, commitopts cannot be used
5080 # -l/--local is already there, commitopts cannot be used
5079 ('e', 'edit', None, _('invoke editor on commit messages')),
5081 ('e', 'edit', None, _('invoke editor on commit messages')),
5080 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5082 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5081 ] + commitopts2,
5083 ] + commitopts2,
5082 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5084 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5083 def tag(ui, repo, name1, *names, **opts):
5085 def tag(ui, repo, name1, *names, **opts):
5084 """add one or more tags for the current or given revision
5086 """add one or more tags for the current or given revision
5085
5087
5086 Name a particular revision using <name>.
5088 Name a particular revision using <name>.
5087
5089
5088 Tags are used to name particular revisions of the repository and are
5090 Tags are used to name particular revisions of the repository and are
5089 very useful to compare different revisions, to go back to significant
5091 very useful to compare different revisions, to go back to significant
5090 earlier versions or to mark branch points as releases, etc. Changing
5092 earlier versions or to mark branch points as releases, etc. Changing
5091 an existing tag is normally disallowed; use -f/--force to override.
5093 an existing tag is normally disallowed; use -f/--force to override.
5092
5094
5093 If no revision is given, the parent of the working directory is
5095 If no revision is given, the parent of the working directory is
5094 used.
5096 used.
5095
5097
5096 To facilitate version control, distribution, and merging of tags,
5098 To facilitate version control, distribution, and merging of tags,
5097 they are stored as a file named ".hgtags" which is managed similarly
5099 they are stored as a file named ".hgtags" which is managed similarly
5098 to other project files and can be hand-edited if necessary. This
5100 to other project files and can be hand-edited if necessary. This
5099 also means that tagging creates a new commit. The file
5101 also means that tagging creates a new commit. The file
5100 ".hg/localtags" is used for local tags (not shared among
5102 ".hg/localtags" is used for local tags (not shared among
5101 repositories).
5103 repositories).
5102
5104
5103 Tag commits are usually made at the head of a branch. If the parent
5105 Tag commits are usually made at the head of a branch. If the parent
5104 of the working directory is not a branch head, :hg:`tag` aborts; use
5106 of the working directory is not a branch head, :hg:`tag` aborts; use
5105 -f/--force to force the tag commit to be based on a non-head
5107 -f/--force to force the tag commit to be based on a non-head
5106 changeset.
5108 changeset.
5107
5109
5108 See :hg:`help dates` for a list of formats valid for -d/--date.
5110 See :hg:`help dates` for a list of formats valid for -d/--date.
5109
5111
5110 Since tag names have priority over branch names during revision
5112 Since tag names have priority over branch names during revision
5111 lookup, using an existing branch name as a tag name is discouraged.
5113 lookup, using an existing branch name as a tag name is discouraged.
5112
5114
5113 Returns 0 on success.
5115 Returns 0 on success.
5114 """
5116 """
5115 wlock = lock = None
5117 wlock = lock = None
5116 try:
5118 try:
5117 wlock = repo.wlock()
5119 wlock = repo.wlock()
5118 lock = repo.lock()
5120 lock = repo.lock()
5119 rev_ = "."
5121 rev_ = "."
5120 names = [t.strip() for t in (name1,) + names]
5122 names = [t.strip() for t in (name1,) + names]
5121 if len(names) != len(set(names)):
5123 if len(names) != len(set(names)):
5122 raise error.Abort(_('tag names must be unique'))
5124 raise error.Abort(_('tag names must be unique'))
5123 for n in names:
5125 for n in names:
5124 scmutil.checknewlabel(repo, n, 'tag')
5126 scmutil.checknewlabel(repo, n, 'tag')
5125 if not n:
5127 if not n:
5126 raise error.Abort(_('tag names cannot consist entirely of '
5128 raise error.Abort(_('tag names cannot consist entirely of '
5127 'whitespace'))
5129 'whitespace'))
5128 if opts.get('rev') and opts.get('remove'):
5130 if opts.get('rev') and opts.get('remove'):
5129 raise error.Abort(_("--rev and --remove are incompatible"))
5131 raise error.Abort(_("--rev and --remove are incompatible"))
5130 if opts.get('rev'):
5132 if opts.get('rev'):
5131 rev_ = opts['rev']
5133 rev_ = opts['rev']
5132 message = opts.get('message')
5134 message = opts.get('message')
5133 if opts.get('remove'):
5135 if opts.get('remove'):
5134 if opts.get('local'):
5136 if opts.get('local'):
5135 expectedtype = 'local'
5137 expectedtype = 'local'
5136 else:
5138 else:
5137 expectedtype = 'global'
5139 expectedtype = 'global'
5138
5140
5139 for n in names:
5141 for n in names:
5140 if not repo.tagtype(n):
5142 if not repo.tagtype(n):
5141 raise error.Abort(_("tag '%s' does not exist") % n)
5143 raise error.Abort(_("tag '%s' does not exist") % n)
5142 if repo.tagtype(n) != expectedtype:
5144 if repo.tagtype(n) != expectedtype:
5143 if expectedtype == 'global':
5145 if expectedtype == 'global':
5144 raise error.Abort(_("tag '%s' is not a global tag") % n)
5146 raise error.Abort(_("tag '%s' is not a global tag") % n)
5145 else:
5147 else:
5146 raise error.Abort(_("tag '%s' is not a local tag") % n)
5148 raise error.Abort(_("tag '%s' is not a local tag") % n)
5147 rev_ = 'null'
5149 rev_ = 'null'
5148 if not message:
5150 if not message:
5149 # we don't translate commit messages
5151 # we don't translate commit messages
5150 message = 'Removed tag %s' % ', '.join(names)
5152 message = 'Removed tag %s' % ', '.join(names)
5151 elif not opts.get('force'):
5153 elif not opts.get('force'):
5152 for n in names:
5154 for n in names:
5153 if n in repo.tags():
5155 if n in repo.tags():
5154 raise error.Abort(_("tag '%s' already exists "
5156 raise error.Abort(_("tag '%s' already exists "
5155 "(use -f to force)") % n)
5157 "(use -f to force)") % n)
5156 if not opts.get('local'):
5158 if not opts.get('local'):
5157 p1, p2 = repo.dirstate.parents()
5159 p1, p2 = repo.dirstate.parents()
5158 if p2 != nullid:
5160 if p2 != nullid:
5159 raise error.Abort(_('uncommitted merge'))
5161 raise error.Abort(_('uncommitted merge'))
5160 bheads = repo.branchheads()
5162 bheads = repo.branchheads()
5161 if not opts.get('force') and bheads and p1 not in bheads:
5163 if not opts.get('force') and bheads and p1 not in bheads:
5162 raise error.Abort(_('working directory is not at a branch head '
5164 raise error.Abort(_('working directory is not at a branch head '
5163 '(use -f to force)'))
5165 '(use -f to force)'))
5164 r = scmutil.revsingle(repo, rev_).node()
5166 r = scmutil.revsingle(repo, rev_).node()
5165
5167
5166 if not message:
5168 if not message:
5167 # we don't translate commit messages
5169 # we don't translate commit messages
5168 message = ('Added tag %s for changeset %s' %
5170 message = ('Added tag %s for changeset %s' %
5169 (', '.join(names), short(r)))
5171 (', '.join(names), short(r)))
5170
5172
5171 date = opts.get('date')
5173 date = opts.get('date')
5172 if date:
5174 if date:
5173 date = util.parsedate(date)
5175 date = util.parsedate(date)
5174
5176
5175 if opts.get('remove'):
5177 if opts.get('remove'):
5176 editform = 'tag.remove'
5178 editform = 'tag.remove'
5177 else:
5179 else:
5178 editform = 'tag.add'
5180 editform = 'tag.add'
5179 editor = cmdutil.getcommiteditor(editform=editform, **opts)
5181 editor = cmdutil.getcommiteditor(editform=editform, **opts)
5180
5182
5181 # don't allow tagging the null rev
5183 # don't allow tagging the null rev
5182 if (not opts.get('remove') and
5184 if (not opts.get('remove') and
5183 scmutil.revsingle(repo, rev_).rev() == nullrev):
5185 scmutil.revsingle(repo, rev_).rev() == nullrev):
5184 raise error.Abort(_("cannot tag null revision"))
5186 raise error.Abort(_("cannot tag null revision"))
5185
5187
5186 tagsmod.tag(repo, names, r, message, opts.get('local'),
5188 tagsmod.tag(repo, names, r, message, opts.get('local'),
5187 opts.get('user'), date, editor=editor)
5189 opts.get('user'), date, editor=editor)
5188 finally:
5190 finally:
5189 release(lock, wlock)
5191 release(lock, wlock)
5190
5192
5191 @command('tags', formatteropts, '')
5193 @command('tags', formatteropts, '')
5192 def tags(ui, repo, **opts):
5194 def tags(ui, repo, **opts):
5193 """list repository tags
5195 """list repository tags
5194
5196
5195 This lists both regular and local tags. When the -v/--verbose
5197 This lists both regular and local tags. When the -v/--verbose
5196 switch is used, a third column "local" is printed for local tags.
5198 switch is used, a third column "local" is printed for local tags.
5197 When the -q/--quiet switch is used, only the tag name is printed.
5199 When the -q/--quiet switch is used, only the tag name is printed.
5198
5200
5199 Returns 0 on success.
5201 Returns 0 on success.
5200 """
5202 """
5201
5203
5202 ui.pager('tags')
5204 ui.pager('tags')
5203 fm = ui.formatter('tags', opts)
5205 fm = ui.formatter('tags', opts)
5204 hexfunc = fm.hexfunc
5206 hexfunc = fm.hexfunc
5205 tagtype = ""
5207 tagtype = ""
5206
5208
5207 for t, n in reversed(repo.tagslist()):
5209 for t, n in reversed(repo.tagslist()):
5208 hn = hexfunc(n)
5210 hn = hexfunc(n)
5209 label = 'tags.normal'
5211 label = 'tags.normal'
5210 tagtype = ''
5212 tagtype = ''
5211 if repo.tagtype(t) == 'local':
5213 if repo.tagtype(t) == 'local':
5212 label = 'tags.local'
5214 label = 'tags.local'
5213 tagtype = 'local'
5215 tagtype = 'local'
5214
5216
5215 fm.startitem()
5217 fm.startitem()
5216 fm.write('tag', '%s', t, label=label)
5218 fm.write('tag', '%s', t, label=label)
5217 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5219 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5218 fm.condwrite(not ui.quiet, 'rev node', fmt,
5220 fm.condwrite(not ui.quiet, 'rev node', fmt,
5219 repo.changelog.rev(n), hn, label=label)
5221 repo.changelog.rev(n), hn, label=label)
5220 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5222 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5221 tagtype, label=label)
5223 tagtype, label=label)
5222 fm.plain('\n')
5224 fm.plain('\n')
5223 fm.end()
5225 fm.end()
5224
5226
5225 @command('tip',
5227 @command('tip',
5226 [('p', 'patch', None, _('show patch')),
5228 [('p', 'patch', None, _('show patch')),
5227 ('g', 'git', None, _('use git extended diff format')),
5229 ('g', 'git', None, _('use git extended diff format')),
5228 ] + templateopts,
5230 ] + templateopts,
5229 _('[-p] [-g]'))
5231 _('[-p] [-g]'))
5230 def tip(ui, repo, **opts):
5232 def tip(ui, repo, **opts):
5231 """show the tip revision (DEPRECATED)
5233 """show the tip revision (DEPRECATED)
5232
5234
5233 The tip revision (usually just called the tip) is the changeset
5235 The tip revision (usually just called the tip) is the changeset
5234 most recently added to the repository (and therefore the most
5236 most recently added to the repository (and therefore the most
5235 recently changed head).
5237 recently changed head).
5236
5238
5237 If you have just made a commit, that commit will be the tip. If
5239 If you have just made a commit, that commit will be the tip. If
5238 you have just pulled changes from another repository, the tip of
5240 you have just pulled changes from another repository, the tip of
5239 that repository becomes the current tip. The "tip" tag is special
5241 that repository becomes the current tip. The "tip" tag is special
5240 and cannot be renamed or assigned to a different changeset.
5242 and cannot be renamed or assigned to a different changeset.
5241
5243
5242 This command is deprecated, please use :hg:`heads` instead.
5244 This command is deprecated, please use :hg:`heads` instead.
5243
5245
5244 Returns 0 on success.
5246 Returns 0 on success.
5245 """
5247 """
5246 displayer = cmdutil.show_changeset(ui, repo, opts)
5248 displayer = cmdutil.show_changeset(ui, repo, opts)
5247 displayer.show(repo['tip'])
5249 displayer.show(repo['tip'])
5248 displayer.close()
5250 displayer.close()
5249
5251
5250 @command('unbundle',
5252 @command('unbundle',
5251 [('u', 'update', None,
5253 [('u', 'update', None,
5252 _('update to new branch head if changesets were unbundled'))],
5254 _('update to new branch head if changesets were unbundled'))],
5253 _('[-u] FILE...'))
5255 _('[-u] FILE...'))
5254 def unbundle(ui, repo, fname1, *fnames, **opts):
5256 def unbundle(ui, repo, fname1, *fnames, **opts):
5255 """apply one or more bundle files
5257 """apply one or more bundle files
5256
5258
5257 Apply one or more bundle files generated by :hg:`bundle`.
5259 Apply one or more bundle files generated by :hg:`bundle`.
5258
5260
5259 Returns 0 on success, 1 if an update has unresolved files.
5261 Returns 0 on success, 1 if an update has unresolved files.
5260 """
5262 """
5261 fnames = (fname1,) + fnames
5263 fnames = (fname1,) + fnames
5262
5264
5263 with repo.lock():
5265 with repo.lock():
5264 for fname in fnames:
5266 for fname in fnames:
5265 f = hg.openpath(ui, fname)
5267 f = hg.openpath(ui, fname)
5266 gen = exchange.readbundle(ui, f, fname)
5268 gen = exchange.readbundle(ui, f, fname)
5267 if isinstance(gen, bundle2.unbundle20):
5269 if isinstance(gen, bundle2.unbundle20):
5268 tr = repo.transaction('unbundle')
5270 tr = repo.transaction('unbundle')
5269 try:
5271 try:
5270 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5272 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5271 url='bundle:' + fname)
5273 url='bundle:' + fname)
5272 tr.close()
5274 tr.close()
5273 except error.BundleUnknownFeatureError as exc:
5275 except error.BundleUnknownFeatureError as exc:
5274 raise error.Abort(_('%s: unknown bundle feature, %s')
5276 raise error.Abort(_('%s: unknown bundle feature, %s')
5275 % (fname, exc),
5277 % (fname, exc),
5276 hint=_("see https://mercurial-scm.org/"
5278 hint=_("see https://mercurial-scm.org/"
5277 "wiki/BundleFeature for more "
5279 "wiki/BundleFeature for more "
5278 "information"))
5280 "information"))
5279 finally:
5281 finally:
5280 if tr:
5282 if tr:
5281 tr.release()
5283 tr.release()
5282 changes = [r.get('return', 0)
5284 changes = [r.get('return', 0)
5283 for r in op.records['changegroup']]
5285 for r in op.records['changegroup']]
5284 modheads = changegroup.combineresults(changes)
5286 modheads = changegroup.combineresults(changes)
5285 elif isinstance(gen, streamclone.streamcloneapplier):
5287 elif isinstance(gen, streamclone.streamcloneapplier):
5286 raise error.Abort(
5288 raise error.Abort(
5287 _('packed bundles cannot be applied with '
5289 _('packed bundles cannot be applied with '
5288 '"hg unbundle"'),
5290 '"hg unbundle"'),
5289 hint=_('use "hg debugapplystreamclonebundle"'))
5291 hint=_('use "hg debugapplystreamclonebundle"'))
5290 else:
5292 else:
5291 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
5293 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
5292
5294
5293 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
5295 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
5294
5296
5295 @command('^update|up|checkout|co',
5297 @command('^update|up|checkout|co',
5296 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5298 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5297 ('c', 'check', None, _('require clean working directory')),
5299 ('c', 'check', None, _('require clean working directory')),
5298 ('m', 'merge', None, _('merge uncommitted changes')),
5300 ('m', 'merge', None, _('merge uncommitted changes')),
5299 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5301 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5300 ('r', 'rev', '', _('revision'), _('REV'))
5302 ('r', 'rev', '', _('revision'), _('REV'))
5301 ] + mergetoolopts,
5303 ] + mergetoolopts,
5302 _('[-C|-c|-m] [-d DATE] [[-r] REV]'))
5304 _('[-C|-c|-m] [-d DATE] [[-r] REV]'))
5303 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
5305 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
5304 merge=None, tool=None):
5306 merge=None, tool=None):
5305 """update working directory (or switch revisions)
5307 """update working directory (or switch revisions)
5306
5308
5307 Update the repository's working directory to the specified
5309 Update the repository's working directory to the specified
5308 changeset. If no changeset is specified, update to the tip of the
5310 changeset. If no changeset is specified, update to the tip of the
5309 current named branch and move the active bookmark (see :hg:`help
5311 current named branch and move the active bookmark (see :hg:`help
5310 bookmarks`).
5312 bookmarks`).
5311
5313
5312 Update sets the working directory's parent revision to the specified
5314 Update sets the working directory's parent revision to the specified
5313 changeset (see :hg:`help parents`).
5315 changeset (see :hg:`help parents`).
5314
5316
5315 If the changeset is not a descendant or ancestor of the working
5317 If the changeset is not a descendant or ancestor of the working
5316 directory's parent and there are uncommitted changes, the update is
5318 directory's parent and there are uncommitted changes, the update is
5317 aborted. With the -c/--check option, the working directory is checked
5319 aborted. With the -c/--check option, the working directory is checked
5318 for uncommitted changes; if none are found, the working directory is
5320 for uncommitted changes; if none are found, the working directory is
5319 updated to the specified changeset.
5321 updated to the specified changeset.
5320
5322
5321 .. container:: verbose
5323 .. container:: verbose
5322
5324
5323 The -C/--clean, -c/--check, and -m/--merge options control what
5325 The -C/--clean, -c/--check, and -m/--merge options control what
5324 happens if the working directory contains uncommitted changes.
5326 happens if the working directory contains uncommitted changes.
5325 At most of one of them can be specified.
5327 At most of one of them can be specified.
5326
5328
5327 1. If no option is specified, and if
5329 1. If no option is specified, and if
5328 the requested changeset is an ancestor or descendant of
5330 the requested changeset is an ancestor or descendant of
5329 the working directory's parent, the uncommitted changes
5331 the working directory's parent, the uncommitted changes
5330 are merged into the requested changeset and the merged
5332 are merged into the requested changeset and the merged
5331 result is left uncommitted. If the requested changeset is
5333 result is left uncommitted. If the requested changeset is
5332 not an ancestor or descendant (that is, it is on another
5334 not an ancestor or descendant (that is, it is on another
5333 branch), the update is aborted and the uncommitted changes
5335 branch), the update is aborted and the uncommitted changes
5334 are preserved.
5336 are preserved.
5335
5337
5336 2. With the -m/--merge option, the update is allowed even if the
5338 2. With the -m/--merge option, the update is allowed even if the
5337 requested changeset is not an ancestor or descendant of
5339 requested changeset is not an ancestor or descendant of
5338 the working directory's parent.
5340 the working directory's parent.
5339
5341
5340 3. With the -c/--check option, the update is aborted and the
5342 3. With the -c/--check option, the update is aborted and the
5341 uncommitted changes are preserved.
5343 uncommitted changes are preserved.
5342
5344
5343 4. With the -C/--clean option, uncommitted changes are discarded and
5345 4. With the -C/--clean option, uncommitted changes are discarded and
5344 the working directory is updated to the requested changeset.
5346 the working directory is updated to the requested changeset.
5345
5347
5346 To cancel an uncommitted merge (and lose your changes), use
5348 To cancel an uncommitted merge (and lose your changes), use
5347 :hg:`update --clean .`.
5349 :hg:`update --clean .`.
5348
5350
5349 Use null as the changeset to remove the working directory (like
5351 Use null as the changeset to remove the working directory (like
5350 :hg:`clone -U`).
5352 :hg:`clone -U`).
5351
5353
5352 If you want to revert just one file to an older revision, use
5354 If you want to revert just one file to an older revision, use
5353 :hg:`revert [-r REV] NAME`.
5355 :hg:`revert [-r REV] NAME`.
5354
5356
5355 See :hg:`help dates` for a list of formats valid for -d/--date.
5357 See :hg:`help dates` for a list of formats valid for -d/--date.
5356
5358
5357 Returns 0 on success, 1 if there are unresolved files.
5359 Returns 0 on success, 1 if there are unresolved files.
5358 """
5360 """
5359 if rev and node:
5361 if rev and node:
5360 raise error.Abort(_("please specify just one revision"))
5362 raise error.Abort(_("please specify just one revision"))
5361
5363
5362 if ui.configbool('commands', 'update.requiredest'):
5364 if ui.configbool('commands', 'update.requiredest'):
5363 if not node and not rev and not date:
5365 if not node and not rev and not date:
5364 raise error.Abort(_('you must specify a destination'),
5366 raise error.Abort(_('you must specify a destination'),
5365 hint=_('for example: hg update ".::"'))
5367 hint=_('for example: hg update ".::"'))
5366
5368
5367 if rev is None or rev == '':
5369 if rev is None or rev == '':
5368 rev = node
5370 rev = node
5369
5371
5370 if date and rev is not None:
5372 if date and rev is not None:
5371 raise error.Abort(_("you can't specify a revision and a date"))
5373 raise error.Abort(_("you can't specify a revision and a date"))
5372
5374
5373 if len([x for x in (clean, check, merge) if x]) > 1:
5375 if len([x for x in (clean, check, merge) if x]) > 1:
5374 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
5376 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
5375 "or -m/merge"))
5377 "or -m/merge"))
5376
5378
5377 updatecheck = None
5379 updatecheck = None
5378 if check:
5380 if check:
5379 updatecheck = 'abort'
5381 updatecheck = 'abort'
5380 elif merge:
5382 elif merge:
5381 updatecheck = 'none'
5383 updatecheck = 'none'
5382
5384
5383 with repo.wlock():
5385 with repo.wlock():
5384 cmdutil.clearunfinished(repo)
5386 cmdutil.clearunfinished(repo)
5385
5387
5386 if date:
5388 if date:
5387 rev = cmdutil.finddate(ui, repo, date)
5389 rev = cmdutil.finddate(ui, repo, date)
5388
5390
5389 # if we defined a bookmark, we have to remember the original name
5391 # if we defined a bookmark, we have to remember the original name
5390 brev = rev
5392 brev = rev
5391 rev = scmutil.revsingle(repo, rev, rev).rev()
5393 rev = scmutil.revsingle(repo, rev, rev).rev()
5392
5394
5393 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
5395 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
5394
5396
5395 return hg.updatetotally(ui, repo, rev, brev, clean=clean,
5397 return hg.updatetotally(ui, repo, rev, brev, clean=clean,
5396 updatecheck=updatecheck)
5398 updatecheck=updatecheck)
5397
5399
5398 @command('verify', [])
5400 @command('verify', [])
5399 def verify(ui, repo):
5401 def verify(ui, repo):
5400 """verify the integrity of the repository
5402 """verify the integrity of the repository
5401
5403
5402 Verify the integrity of the current repository.
5404 Verify the integrity of the current repository.
5403
5405
5404 This will perform an extensive check of the repository's
5406 This will perform an extensive check of the repository's
5405 integrity, validating the hashes and checksums of each entry in
5407 integrity, validating the hashes and checksums of each entry in
5406 the changelog, manifest, and tracked files, as well as the
5408 the changelog, manifest, and tracked files, as well as the
5407 integrity of their crosslinks and indices.
5409 integrity of their crosslinks and indices.
5408
5410
5409 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5411 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5410 for more information about recovery from corruption of the
5412 for more information about recovery from corruption of the
5411 repository.
5413 repository.
5412
5414
5413 Returns 0 on success, 1 if errors are encountered.
5415 Returns 0 on success, 1 if errors are encountered.
5414 """
5416 """
5415 return hg.verify(repo)
5417 return hg.verify(repo)
5416
5418
5417 @command('version', [] + formatteropts, norepo=True)
5419 @command('version', [] + formatteropts, norepo=True)
5418 def version_(ui, **opts):
5420 def version_(ui, **opts):
5419 """output version and copyright information"""
5421 """output version and copyright information"""
5420 if ui.verbose:
5422 if ui.verbose:
5421 ui.pager('version')
5423 ui.pager('version')
5422 fm = ui.formatter("version", opts)
5424 fm = ui.formatter("version", opts)
5423 fm.startitem()
5425 fm.startitem()
5424 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5426 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5425 util.version())
5427 util.version())
5426 license = _(
5428 license = _(
5427 "(see https://mercurial-scm.org for more information)\n"
5429 "(see https://mercurial-scm.org for more information)\n"
5428 "\nCopyright (C) 2005-2017 Matt Mackall and others\n"
5430 "\nCopyright (C) 2005-2017 Matt Mackall and others\n"
5429 "This is free software; see the source for copying conditions. "
5431 "This is free software; see the source for copying conditions. "
5430 "There is NO\nwarranty; "
5432 "There is NO\nwarranty; "
5431 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5433 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5432 )
5434 )
5433 if not ui.quiet:
5435 if not ui.quiet:
5434 fm.plain(license)
5436 fm.plain(license)
5435
5437
5436 if ui.verbose:
5438 if ui.verbose:
5437 fm.plain(_("\nEnabled extensions:\n\n"))
5439 fm.plain(_("\nEnabled extensions:\n\n"))
5438 # format names and versions into columns
5440 # format names and versions into columns
5439 names = []
5441 names = []
5440 vers = []
5442 vers = []
5441 isinternals = []
5443 isinternals = []
5442 for name, module in extensions.extensions():
5444 for name, module in extensions.extensions():
5443 names.append(name)
5445 names.append(name)
5444 vers.append(extensions.moduleversion(module) or None)
5446 vers.append(extensions.moduleversion(module) or None)
5445 isinternals.append(extensions.ismoduleinternal(module))
5447 isinternals.append(extensions.ismoduleinternal(module))
5446 fn = fm.nested("extensions")
5448 fn = fm.nested("extensions")
5447 if names:
5449 if names:
5448 namefmt = " %%-%ds " % max(len(n) for n in names)
5450 namefmt = " %%-%ds " % max(len(n) for n in names)
5449 places = [_("external"), _("internal")]
5451 places = [_("external"), _("internal")]
5450 for n, v, p in zip(names, vers, isinternals):
5452 for n, v, p in zip(names, vers, isinternals):
5451 fn.startitem()
5453 fn.startitem()
5452 fn.condwrite(ui.verbose, "name", namefmt, n)
5454 fn.condwrite(ui.verbose, "name", namefmt, n)
5453 if ui.verbose:
5455 if ui.verbose:
5454 fn.plain("%s " % places[p])
5456 fn.plain("%s " % places[p])
5455 fn.data(bundled=p)
5457 fn.data(bundled=p)
5456 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5458 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5457 if ui.verbose:
5459 if ui.verbose:
5458 fn.plain("\n")
5460 fn.plain("\n")
5459 fn.end()
5461 fn.end()
5460 fm.end()
5462 fm.end()
5461
5463
5462 def loadcmdtable(ui, name, cmdtable):
5464 def loadcmdtable(ui, name, cmdtable):
5463 """Load command functions from specified cmdtable
5465 """Load command functions from specified cmdtable
5464 """
5466 """
5465 overrides = [cmd for cmd in cmdtable if cmd in table]
5467 overrides = [cmd for cmd in cmdtable if cmd in table]
5466 if overrides:
5468 if overrides:
5467 ui.warn(_("extension '%s' overrides commands: %s\n")
5469 ui.warn(_("extension '%s' overrides commands: %s\n")
5468 % (name, " ".join(overrides)))
5470 % (name, " ".join(overrides)))
5469 table.update(cmdtable)
5471 table.update(cmdtable)
General Comments 0
You need to be logged in to leave comments. Login now