##// END OF EJS Templates
debugconfig: list environment variables in debug output...
Jun Wu -
r31686:fbc4eb8e default
parent child Browse files
Show More
@@ -1,5466 +1,5467
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 ('', 'nodates', None, _('omit dates from diff headers'))
165 ('', 'nodates', None, _('omit dates from diff headers'))
166 ]
166 ]
167
167
168 diffwsopts = [
168 diffwsopts = [
169 ('w', 'ignore-all-space', None,
169 ('w', 'ignore-all-space', None,
170 _('ignore white space when comparing lines')),
170 _('ignore white space when comparing lines')),
171 ('b', 'ignore-space-change', None,
171 ('b', 'ignore-space-change', None,
172 _('ignore changes in the amount of white space')),
172 _('ignore changes in the amount of white space')),
173 ('B', 'ignore-blank-lines', None,
173 ('B', 'ignore-blank-lines', None,
174 _('ignore changes whose lines are all blank')),
174 _('ignore changes whose lines are all blank')),
175 ]
175 ]
176
176
177 diffopts2 = [
177 diffopts2 = [
178 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
178 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
179 ('p', 'show-function', None, _('show which function each change is in')),
179 ('p', 'show-function', None, _('show which function each change is in')),
180 ('', 'reverse', None, _('produce a diff that undoes the changes')),
180 ('', 'reverse', None, _('produce a diff that undoes the changes')),
181 ] + diffwsopts + [
181 ] + diffwsopts + [
182 ('U', 'unified', '',
182 ('U', 'unified', '',
183 _('number of lines of context to show'), _('NUM')),
183 _('number of lines of context to show'), _('NUM')),
184 ('', 'stat', None, _('output diffstat-style summary of changes')),
184 ('', 'stat', None, _('output diffstat-style summary of changes')),
185 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
185 ('', 'root', '', _('produce diffs relative to subdirectory'), _('DIR')),
186 ]
186 ]
187
187
188 mergetoolopts = [
188 mergetoolopts = [
189 ('t', 'tool', '', _('specify merge tool')),
189 ('t', 'tool', '', _('specify merge tool')),
190 ]
190 ]
191
191
192 similarityopts = [
192 similarityopts = [
193 ('s', 'similarity', '',
193 ('s', 'similarity', '',
194 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
194 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
195 ]
195 ]
196
196
197 subrepoopts = [
197 subrepoopts = [
198 ('S', 'subrepos', None,
198 ('S', 'subrepos', None,
199 _('recurse into subrepositories'))
199 _('recurse into subrepositories'))
200 ]
200 ]
201
201
202 debugrevlogopts = [
202 debugrevlogopts = [
203 ('c', 'changelog', False, _('open changelog')),
203 ('c', 'changelog', False, _('open changelog')),
204 ('m', 'manifest', False, _('open manifest')),
204 ('m', 'manifest', False, _('open manifest')),
205 ('', 'dir', '', _('open directory manifest')),
205 ('', 'dir', '', _('open directory manifest')),
206 ]
206 ]
207
207
208 # Commands start here, listed alphabetically
208 # Commands start here, listed alphabetically
209
209
210 @command('^add',
210 @command('^add',
211 walkopts + subrepoopts + dryrunopts,
211 walkopts + subrepoopts + dryrunopts,
212 _('[OPTION]... [FILE]...'),
212 _('[OPTION]... [FILE]...'),
213 inferrepo=True)
213 inferrepo=True)
214 def add(ui, repo, *pats, **opts):
214 def add(ui, repo, *pats, **opts):
215 """add the specified files on the next commit
215 """add the specified files on the next commit
216
216
217 Schedule files to be version controlled and added to the
217 Schedule files to be version controlled and added to the
218 repository.
218 repository.
219
219
220 The files will be added to the repository at the next commit. To
220 The files will be added to the repository at the next commit. To
221 undo an add before that, see :hg:`forget`.
221 undo an add before that, see :hg:`forget`.
222
222
223 If no names are given, add all files to the repository (except
223 If no names are given, add all files to the repository (except
224 files matching ``.hgignore``).
224 files matching ``.hgignore``).
225
225
226 .. container:: verbose
226 .. container:: verbose
227
227
228 Examples:
228 Examples:
229
229
230 - New (unknown) files are added
230 - New (unknown) files are added
231 automatically by :hg:`add`::
231 automatically by :hg:`add`::
232
232
233 $ ls
233 $ ls
234 foo.c
234 foo.c
235 $ hg status
235 $ hg status
236 ? foo.c
236 ? foo.c
237 $ hg add
237 $ hg add
238 adding foo.c
238 adding foo.c
239 $ hg status
239 $ hg status
240 A foo.c
240 A foo.c
241
241
242 - Specific files to be added can be specified::
242 - Specific files to be added can be specified::
243
243
244 $ ls
244 $ ls
245 bar.c foo.c
245 bar.c foo.c
246 $ hg status
246 $ hg status
247 ? bar.c
247 ? bar.c
248 ? foo.c
248 ? foo.c
249 $ hg add bar.c
249 $ hg add bar.c
250 $ hg status
250 $ hg status
251 A bar.c
251 A bar.c
252 ? foo.c
252 ? foo.c
253
253
254 Returns 0 if all files are successfully added.
254 Returns 0 if all files are successfully added.
255 """
255 """
256
256
257 m = scmutil.match(repo[None], pats, opts)
257 m = scmutil.match(repo[None], pats, opts)
258 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
258 rejected = cmdutil.add(ui, repo, m, "", False, **opts)
259 return rejected and 1 or 0
259 return rejected and 1 or 0
260
260
261 @command('addremove',
261 @command('addremove',
262 similarityopts + subrepoopts + walkopts + dryrunopts,
262 similarityopts + subrepoopts + walkopts + dryrunopts,
263 _('[OPTION]... [FILE]...'),
263 _('[OPTION]... [FILE]...'),
264 inferrepo=True)
264 inferrepo=True)
265 def addremove(ui, repo, *pats, **opts):
265 def addremove(ui, repo, *pats, **opts):
266 """add all new files, delete all missing files
266 """add all new files, delete all missing files
267
267
268 Add all new files and remove all missing files from the
268 Add all new files and remove all missing files from the
269 repository.
269 repository.
270
270
271 Unless names are given, new files are ignored if they match any of
271 Unless names are given, new files are ignored if they match any of
272 the patterns in ``.hgignore``. As with add, these changes take
272 the patterns in ``.hgignore``. As with add, these changes take
273 effect at the next commit.
273 effect at the next commit.
274
274
275 Use the -s/--similarity option to detect renamed files. This
275 Use the -s/--similarity option to detect renamed files. This
276 option takes a percentage between 0 (disabled) and 100 (files must
276 option takes a percentage between 0 (disabled) and 100 (files must
277 be identical) as its parameter. With a parameter greater than 0,
277 be identical) as its parameter. With a parameter greater than 0,
278 this compares every removed file with every added file and records
278 this compares every removed file with every added file and records
279 those similar enough as renames. Detecting renamed files this way
279 those similar enough as renames. Detecting renamed files this way
280 can be expensive. After using this option, :hg:`status -C` can be
280 can be expensive. After using this option, :hg:`status -C` can be
281 used to check which files were identified as moved or renamed. If
281 used to check which files were identified as moved or renamed. If
282 not specified, -s/--similarity defaults to 100 and only renames of
282 not specified, -s/--similarity defaults to 100 and only renames of
283 identical files are detected.
283 identical files are detected.
284
284
285 .. container:: verbose
285 .. container:: verbose
286
286
287 Examples:
287 Examples:
288
288
289 - A number of files (bar.c and foo.c) are new,
289 - A number of files (bar.c and foo.c) are new,
290 while foobar.c has been removed (without using :hg:`remove`)
290 while foobar.c has been removed (without using :hg:`remove`)
291 from the repository::
291 from the repository::
292
292
293 $ ls
293 $ ls
294 bar.c foo.c
294 bar.c foo.c
295 $ hg status
295 $ hg status
296 ! foobar.c
296 ! foobar.c
297 ? bar.c
297 ? bar.c
298 ? foo.c
298 ? foo.c
299 $ hg addremove
299 $ hg addremove
300 adding bar.c
300 adding bar.c
301 adding foo.c
301 adding foo.c
302 removing foobar.c
302 removing foobar.c
303 $ hg status
303 $ hg status
304 A bar.c
304 A bar.c
305 A foo.c
305 A foo.c
306 R foobar.c
306 R foobar.c
307
307
308 - A file foobar.c was moved to foo.c without using :hg:`rename`.
308 - A file foobar.c was moved to foo.c without using :hg:`rename`.
309 Afterwards, it was edited slightly::
309 Afterwards, it was edited slightly::
310
310
311 $ ls
311 $ ls
312 foo.c
312 foo.c
313 $ hg status
313 $ hg status
314 ! foobar.c
314 ! foobar.c
315 ? foo.c
315 ? foo.c
316 $ hg addremove --similarity 90
316 $ hg addremove --similarity 90
317 removing foobar.c
317 removing foobar.c
318 adding foo.c
318 adding foo.c
319 recording removal of foobar.c as rename to foo.c (94% similar)
319 recording removal of foobar.c as rename to foo.c (94% similar)
320 $ hg status -C
320 $ hg status -C
321 A foo.c
321 A foo.c
322 foobar.c
322 foobar.c
323 R foobar.c
323 R foobar.c
324
324
325 Returns 0 if all files are successfully added.
325 Returns 0 if all files are successfully added.
326 """
326 """
327 try:
327 try:
328 sim = float(opts.get('similarity') or 100)
328 sim = float(opts.get('similarity') or 100)
329 except ValueError:
329 except ValueError:
330 raise error.Abort(_('similarity must be a number'))
330 raise error.Abort(_('similarity must be a number'))
331 if sim < 0 or sim > 100:
331 if sim < 0 or sim > 100:
332 raise error.Abort(_('similarity must be between 0 and 100'))
332 raise error.Abort(_('similarity must be between 0 and 100'))
333 matcher = scmutil.match(repo[None], pats, opts)
333 matcher = scmutil.match(repo[None], pats, opts)
334 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
334 return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0)
335
335
336 @command('^annotate|blame',
336 @command('^annotate|blame',
337 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
337 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
338 ('', 'follow', None,
338 ('', 'follow', None,
339 _('follow copies/renames and list the filename (DEPRECATED)')),
339 _('follow copies/renames and list the filename (DEPRECATED)')),
340 ('', 'no-follow', None, _("don't follow copies and renames")),
340 ('', 'no-follow', None, _("don't follow copies and renames")),
341 ('a', 'text', None, _('treat all files as text')),
341 ('a', 'text', None, _('treat all files as text')),
342 ('u', 'user', None, _('list the author (long with -v)')),
342 ('u', 'user', None, _('list the author (long with -v)')),
343 ('f', 'file', None, _('list the filename')),
343 ('f', 'file', None, _('list the filename')),
344 ('d', 'date', None, _('list the date (short with -q)')),
344 ('d', 'date', None, _('list the date (short with -q)')),
345 ('n', 'number', None, _('list the revision number (default)')),
345 ('n', 'number', None, _('list the revision number (default)')),
346 ('c', 'changeset', None, _('list the changeset')),
346 ('c', 'changeset', None, _('list the changeset')),
347 ('l', 'line-number', None, _('show line number at the first appearance'))
347 ('l', 'line-number', None, _('show line number at the first appearance'))
348 ] + diffwsopts + walkopts + formatteropts,
348 ] + diffwsopts + walkopts + formatteropts,
349 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
349 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
350 inferrepo=True)
350 inferrepo=True)
351 def annotate(ui, repo, *pats, **opts):
351 def annotate(ui, repo, *pats, **opts):
352 """show changeset information by line for each file
352 """show changeset information by line for each file
353
353
354 List changes in files, showing the revision id responsible for
354 List changes in files, showing the revision id responsible for
355 each line.
355 each line.
356
356
357 This command is useful for discovering when a change was made and
357 This command is useful for discovering when a change was made and
358 by whom.
358 by whom.
359
359
360 If you include --file, --user, or --date, the revision number is
360 If you include --file, --user, or --date, the revision number is
361 suppressed unless you also include --number.
361 suppressed unless you also include --number.
362
362
363 Without the -a/--text option, annotate will avoid processing files
363 Without the -a/--text option, annotate will avoid processing files
364 it detects as binary. With -a, annotate will annotate the file
364 it detects as binary. With -a, annotate will annotate the file
365 anyway, although the results will probably be neither useful
365 anyway, although the results will probably be neither useful
366 nor desirable.
366 nor desirable.
367
367
368 Returns 0 on success.
368 Returns 0 on success.
369 """
369 """
370 if not pats:
370 if not pats:
371 raise error.Abort(_('at least one filename or pattern is required'))
371 raise error.Abort(_('at least one filename or pattern is required'))
372
372
373 if opts.get('follow'):
373 if opts.get('follow'):
374 # --follow is deprecated and now just an alias for -f/--file
374 # --follow is deprecated and now just an alias for -f/--file
375 # to mimic the behavior of Mercurial before version 1.5
375 # to mimic the behavior of Mercurial before version 1.5
376 opts['file'] = True
376 opts['file'] = True
377
377
378 ctx = scmutil.revsingle(repo, opts.get('rev'))
378 ctx = scmutil.revsingle(repo, opts.get('rev'))
379
379
380 fm = ui.formatter('annotate', opts)
380 fm = ui.formatter('annotate', opts)
381 if ui.quiet:
381 if ui.quiet:
382 datefunc = util.shortdate
382 datefunc = util.shortdate
383 else:
383 else:
384 datefunc = util.datestr
384 datefunc = util.datestr
385 if ctx.rev() is None:
385 if ctx.rev() is None:
386 def hexfn(node):
386 def hexfn(node):
387 if node is None:
387 if node is None:
388 return None
388 return None
389 else:
389 else:
390 return fm.hexfunc(node)
390 return fm.hexfunc(node)
391 if opts.get('changeset'):
391 if opts.get('changeset'):
392 # omit "+" suffix which is appended to node hex
392 # omit "+" suffix which is appended to node hex
393 def formatrev(rev):
393 def formatrev(rev):
394 if rev is None:
394 if rev is None:
395 return '%d' % ctx.p1().rev()
395 return '%d' % ctx.p1().rev()
396 else:
396 else:
397 return '%d' % rev
397 return '%d' % rev
398 else:
398 else:
399 def formatrev(rev):
399 def formatrev(rev):
400 if rev is None:
400 if rev is None:
401 return '%d+' % ctx.p1().rev()
401 return '%d+' % ctx.p1().rev()
402 else:
402 else:
403 return '%d ' % rev
403 return '%d ' % rev
404 def formathex(hex):
404 def formathex(hex):
405 if hex is None:
405 if hex is None:
406 return '%s+' % fm.hexfunc(ctx.p1().node())
406 return '%s+' % fm.hexfunc(ctx.p1().node())
407 else:
407 else:
408 return '%s ' % hex
408 return '%s ' % hex
409 else:
409 else:
410 hexfn = fm.hexfunc
410 hexfn = fm.hexfunc
411 formatrev = formathex = str
411 formatrev = formathex = str
412
412
413 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
413 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
414 ('number', ' ', lambda x: x[0].rev(), formatrev),
414 ('number', ' ', lambda x: x[0].rev(), formatrev),
415 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
415 ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex),
416 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
416 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
417 ('file', ' ', lambda x: x[0].path(), str),
417 ('file', ' ', lambda x: x[0].path(), str),
418 ('line_number', ':', lambda x: x[1], str),
418 ('line_number', ':', lambda x: x[1], str),
419 ]
419 ]
420 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
420 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
421
421
422 if (not opts.get('user') and not opts.get('changeset')
422 if (not opts.get('user') and not opts.get('changeset')
423 and not opts.get('date') and not opts.get('file')):
423 and not opts.get('date') and not opts.get('file')):
424 opts['number'] = True
424 opts['number'] = True
425
425
426 linenumber = opts.get('line_number') is not None
426 linenumber = opts.get('line_number') is not None
427 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
427 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
428 raise error.Abort(_('at least one of -n/-c is required for -l'))
428 raise error.Abort(_('at least one of -n/-c is required for -l'))
429
429
430 ui.pager('annotate')
430 ui.pager('annotate')
431
431
432 if fm.isplain():
432 if fm.isplain():
433 def makefunc(get, fmt):
433 def makefunc(get, fmt):
434 return lambda x: fmt(get(x))
434 return lambda x: fmt(get(x))
435 else:
435 else:
436 def makefunc(get, fmt):
436 def makefunc(get, fmt):
437 return get
437 return get
438 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
438 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
439 if opts.get(op)]
439 if opts.get(op)]
440 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
440 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
441 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
441 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
442 if opts.get(op))
442 if opts.get(op))
443
443
444 def bad(x, y):
444 def bad(x, y):
445 raise error.Abort("%s: %s" % (x, y))
445 raise error.Abort("%s: %s" % (x, y))
446
446
447 m = scmutil.match(ctx, pats, opts, badfn=bad)
447 m = scmutil.match(ctx, pats, opts, badfn=bad)
448
448
449 follow = not opts.get('no_follow')
449 follow = not opts.get('no_follow')
450 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
450 diffopts = patch.difffeatureopts(ui, opts, section='annotate',
451 whitespace=True)
451 whitespace=True)
452 for abs in ctx.walk(m):
452 for abs in ctx.walk(m):
453 fctx = ctx[abs]
453 fctx = ctx[abs]
454 if not opts.get('text') and util.binary(fctx.data()):
454 if not opts.get('text') and util.binary(fctx.data()):
455 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
455 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
456 continue
456 continue
457
457
458 lines = fctx.annotate(follow=follow, linenumber=linenumber,
458 lines = fctx.annotate(follow=follow, linenumber=linenumber,
459 diffopts=diffopts)
459 diffopts=diffopts)
460 if not lines:
460 if not lines:
461 continue
461 continue
462 formats = []
462 formats = []
463 pieces = []
463 pieces = []
464
464
465 for f, sep in funcmap:
465 for f, sep in funcmap:
466 l = [f(n) for n, dummy in lines]
466 l = [f(n) for n, dummy in lines]
467 if fm.isplain():
467 if fm.isplain():
468 sizes = [encoding.colwidth(x) for x in l]
468 sizes = [encoding.colwidth(x) for x in l]
469 ml = max(sizes)
469 ml = max(sizes)
470 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
470 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
471 else:
471 else:
472 formats.append(['%s' for x in l])
472 formats.append(['%s' for x in l])
473 pieces.append(l)
473 pieces.append(l)
474
474
475 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
475 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
476 fm.startitem()
476 fm.startitem()
477 fm.write(fields, "".join(f), *p)
477 fm.write(fields, "".join(f), *p)
478 fm.write('line', ": %s", l[1])
478 fm.write('line', ": %s", l[1])
479
479
480 if not lines[-1][1].endswith('\n'):
480 if not lines[-1][1].endswith('\n'):
481 fm.plain('\n')
481 fm.plain('\n')
482
482
483 fm.end()
483 fm.end()
484
484
485 @command('archive',
485 @command('archive',
486 [('', 'no-decode', None, _('do not pass files through decoders')),
486 [('', 'no-decode', None, _('do not pass files through decoders')),
487 ('p', 'prefix', '', _('directory prefix for files in archive'),
487 ('p', 'prefix', '', _('directory prefix for files in archive'),
488 _('PREFIX')),
488 _('PREFIX')),
489 ('r', 'rev', '', _('revision to distribute'), _('REV')),
489 ('r', 'rev', '', _('revision to distribute'), _('REV')),
490 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
490 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
491 ] + subrepoopts + walkopts,
491 ] + subrepoopts + walkopts,
492 _('[OPTION]... DEST'))
492 _('[OPTION]... DEST'))
493 def archive(ui, repo, dest, **opts):
493 def archive(ui, repo, dest, **opts):
494 '''create an unversioned archive of a repository revision
494 '''create an unversioned archive of a repository revision
495
495
496 By default, the revision used is the parent of the working
496 By default, the revision used is the parent of the working
497 directory; use -r/--rev to specify a different revision.
497 directory; use -r/--rev to specify a different revision.
498
498
499 The archive type is automatically detected based on file
499 The archive type is automatically detected based on file
500 extension (to override, use -t/--type).
500 extension (to override, use -t/--type).
501
501
502 .. container:: verbose
502 .. container:: verbose
503
503
504 Examples:
504 Examples:
505
505
506 - create a zip file containing the 1.0 release::
506 - create a zip file containing the 1.0 release::
507
507
508 hg archive -r 1.0 project-1.0.zip
508 hg archive -r 1.0 project-1.0.zip
509
509
510 - create a tarball excluding .hg files::
510 - create a tarball excluding .hg files::
511
511
512 hg archive project.tar.gz -X ".hg*"
512 hg archive project.tar.gz -X ".hg*"
513
513
514 Valid types are:
514 Valid types are:
515
515
516 :``files``: a directory full of files (default)
516 :``files``: a directory full of files (default)
517 :``tar``: tar archive, uncompressed
517 :``tar``: tar archive, uncompressed
518 :``tbz2``: tar archive, compressed using bzip2
518 :``tbz2``: tar archive, compressed using bzip2
519 :``tgz``: tar archive, compressed using gzip
519 :``tgz``: tar archive, compressed using gzip
520 :``uzip``: zip archive, uncompressed
520 :``uzip``: zip archive, uncompressed
521 :``zip``: zip archive, compressed using deflate
521 :``zip``: zip archive, compressed using deflate
522
522
523 The exact name of the destination archive or directory is given
523 The exact name of the destination archive or directory is given
524 using a format string; see :hg:`help export` for details.
524 using a format string; see :hg:`help export` for details.
525
525
526 Each member added to an archive file has a directory prefix
526 Each member added to an archive file has a directory prefix
527 prepended. Use -p/--prefix to specify a format string for the
527 prepended. Use -p/--prefix to specify a format string for the
528 prefix. The default is the basename of the archive, with suffixes
528 prefix. The default is the basename of the archive, with suffixes
529 removed.
529 removed.
530
530
531 Returns 0 on success.
531 Returns 0 on success.
532 '''
532 '''
533
533
534 ctx = scmutil.revsingle(repo, opts.get('rev'))
534 ctx = scmutil.revsingle(repo, opts.get('rev'))
535 if not ctx:
535 if not ctx:
536 raise error.Abort(_('no working directory: please specify a revision'))
536 raise error.Abort(_('no working directory: please specify a revision'))
537 node = ctx.node()
537 node = ctx.node()
538 dest = cmdutil.makefilename(repo, dest, node)
538 dest = cmdutil.makefilename(repo, dest, node)
539 if os.path.realpath(dest) == repo.root:
539 if os.path.realpath(dest) == repo.root:
540 raise error.Abort(_('repository root cannot be destination'))
540 raise error.Abort(_('repository root cannot be destination'))
541
541
542 kind = opts.get('type') or archival.guesskind(dest) or 'files'
542 kind = opts.get('type') or archival.guesskind(dest) or 'files'
543 prefix = opts.get('prefix')
543 prefix = opts.get('prefix')
544
544
545 if dest == '-':
545 if dest == '-':
546 if kind == 'files':
546 if kind == 'files':
547 raise error.Abort(_('cannot archive plain files to stdout'))
547 raise error.Abort(_('cannot archive plain files to stdout'))
548 dest = cmdutil.makefileobj(repo, dest)
548 dest = cmdutil.makefileobj(repo, dest)
549 if not prefix:
549 if not prefix:
550 prefix = os.path.basename(repo.root) + '-%h'
550 prefix = os.path.basename(repo.root) + '-%h'
551
551
552 prefix = cmdutil.makefilename(repo, prefix, node)
552 prefix = cmdutil.makefilename(repo, prefix, node)
553 matchfn = scmutil.match(ctx, [], opts)
553 matchfn = scmutil.match(ctx, [], opts)
554 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
554 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
555 matchfn, prefix, subrepos=opts.get('subrepos'))
555 matchfn, prefix, subrepos=opts.get('subrepos'))
556
556
557 @command('backout',
557 @command('backout',
558 [('', 'merge', None, _('merge with old dirstate parent after backout')),
558 [('', 'merge', None, _('merge with old dirstate parent after backout')),
559 ('', 'commit', None,
559 ('', 'commit', None,
560 _('commit if no conflicts were encountered (DEPRECATED)')),
560 _('commit if no conflicts were encountered (DEPRECATED)')),
561 ('', 'no-commit', None, _('do not commit')),
561 ('', 'no-commit', None, _('do not commit')),
562 ('', 'parent', '',
562 ('', 'parent', '',
563 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
563 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
564 ('r', 'rev', '', _('revision to backout'), _('REV')),
564 ('r', 'rev', '', _('revision to backout'), _('REV')),
565 ('e', 'edit', False, _('invoke editor on commit messages')),
565 ('e', 'edit', False, _('invoke editor on commit messages')),
566 ] + mergetoolopts + walkopts + commitopts + commitopts2,
566 ] + mergetoolopts + walkopts + commitopts + commitopts2,
567 _('[OPTION]... [-r] REV'))
567 _('[OPTION]... [-r] REV'))
568 def backout(ui, repo, node=None, rev=None, **opts):
568 def backout(ui, repo, node=None, rev=None, **opts):
569 '''reverse effect of earlier changeset
569 '''reverse effect of earlier changeset
570
570
571 Prepare a new changeset with the effect of REV undone in the
571 Prepare a new changeset with the effect of REV undone in the
572 current working directory. If no conflicts were encountered,
572 current working directory. If no conflicts were encountered,
573 it will be committed immediately.
573 it will be committed immediately.
574
574
575 If REV is the parent of the working directory, then this new changeset
575 If REV is the parent of the working directory, then this new changeset
576 is committed automatically (unless --no-commit is specified).
576 is committed automatically (unless --no-commit is specified).
577
577
578 .. note::
578 .. note::
579
579
580 :hg:`backout` cannot be used to fix either an unwanted or
580 :hg:`backout` cannot be used to fix either an unwanted or
581 incorrect merge.
581 incorrect merge.
582
582
583 .. container:: verbose
583 .. container:: verbose
584
584
585 Examples:
585 Examples:
586
586
587 - Reverse the effect of the parent of the working directory.
587 - Reverse the effect of the parent of the working directory.
588 This backout will be committed immediately::
588 This backout will be committed immediately::
589
589
590 hg backout -r .
590 hg backout -r .
591
591
592 - Reverse the effect of previous bad revision 23::
592 - Reverse the effect of previous bad revision 23::
593
593
594 hg backout -r 23
594 hg backout -r 23
595
595
596 - Reverse the effect of previous bad revision 23 and
596 - Reverse the effect of previous bad revision 23 and
597 leave changes uncommitted::
597 leave changes uncommitted::
598
598
599 hg backout -r 23 --no-commit
599 hg backout -r 23 --no-commit
600 hg commit -m "Backout revision 23"
600 hg commit -m "Backout revision 23"
601
601
602 By default, the pending changeset will have one parent,
602 By default, the pending changeset will have one parent,
603 maintaining a linear history. With --merge, the pending
603 maintaining a linear history. With --merge, the pending
604 changeset will instead have two parents: the old parent of the
604 changeset will instead have two parents: the old parent of the
605 working directory and a new child of REV that simply undoes REV.
605 working directory and a new child of REV that simply undoes REV.
606
606
607 Before version 1.7, the behavior without --merge was equivalent
607 Before version 1.7, the behavior without --merge was equivalent
608 to specifying --merge followed by :hg:`update --clean .` to
608 to specifying --merge followed by :hg:`update --clean .` to
609 cancel the merge and leave the child of REV as a head to be
609 cancel the merge and leave the child of REV as a head to be
610 merged separately.
610 merged separately.
611
611
612 See :hg:`help dates` for a list of formats valid for -d/--date.
612 See :hg:`help dates` for a list of formats valid for -d/--date.
613
613
614 See :hg:`help revert` for a way to restore files to the state
614 See :hg:`help revert` for a way to restore files to the state
615 of another revision.
615 of another revision.
616
616
617 Returns 0 on success, 1 if nothing to backout or there are unresolved
617 Returns 0 on success, 1 if nothing to backout or there are unresolved
618 files.
618 files.
619 '''
619 '''
620 wlock = lock = None
620 wlock = lock = None
621 try:
621 try:
622 wlock = repo.wlock()
622 wlock = repo.wlock()
623 lock = repo.lock()
623 lock = repo.lock()
624 return _dobackout(ui, repo, node, rev, **opts)
624 return _dobackout(ui, repo, node, rev, **opts)
625 finally:
625 finally:
626 release(lock, wlock)
626 release(lock, wlock)
627
627
628 def _dobackout(ui, repo, node=None, rev=None, **opts):
628 def _dobackout(ui, repo, node=None, rev=None, **opts):
629 if opts.get('commit') and opts.get('no_commit'):
629 if opts.get('commit') and opts.get('no_commit'):
630 raise error.Abort(_("cannot use --commit with --no-commit"))
630 raise error.Abort(_("cannot use --commit with --no-commit"))
631 if opts.get('merge') and opts.get('no_commit'):
631 if opts.get('merge') and opts.get('no_commit'):
632 raise error.Abort(_("cannot use --merge with --no-commit"))
632 raise error.Abort(_("cannot use --merge with --no-commit"))
633
633
634 if rev and node:
634 if rev and node:
635 raise error.Abort(_("please specify just one revision"))
635 raise error.Abort(_("please specify just one revision"))
636
636
637 if not rev:
637 if not rev:
638 rev = node
638 rev = node
639
639
640 if not rev:
640 if not rev:
641 raise error.Abort(_("please specify a revision to backout"))
641 raise error.Abort(_("please specify a revision to backout"))
642
642
643 date = opts.get('date')
643 date = opts.get('date')
644 if date:
644 if date:
645 opts['date'] = util.parsedate(date)
645 opts['date'] = util.parsedate(date)
646
646
647 cmdutil.checkunfinished(repo)
647 cmdutil.checkunfinished(repo)
648 cmdutil.bailifchanged(repo)
648 cmdutil.bailifchanged(repo)
649 node = scmutil.revsingle(repo, rev).node()
649 node = scmutil.revsingle(repo, rev).node()
650
650
651 op1, op2 = repo.dirstate.parents()
651 op1, op2 = repo.dirstate.parents()
652 if not repo.changelog.isancestor(node, op1):
652 if not repo.changelog.isancestor(node, op1):
653 raise error.Abort(_('cannot backout change that is not an ancestor'))
653 raise error.Abort(_('cannot backout change that is not an ancestor'))
654
654
655 p1, p2 = repo.changelog.parents(node)
655 p1, p2 = repo.changelog.parents(node)
656 if p1 == nullid:
656 if p1 == nullid:
657 raise error.Abort(_('cannot backout a change with no parents'))
657 raise error.Abort(_('cannot backout a change with no parents'))
658 if p2 != nullid:
658 if p2 != nullid:
659 if not opts.get('parent'):
659 if not opts.get('parent'):
660 raise error.Abort(_('cannot backout a merge changeset'))
660 raise error.Abort(_('cannot backout a merge changeset'))
661 p = repo.lookup(opts['parent'])
661 p = repo.lookup(opts['parent'])
662 if p not in (p1, p2):
662 if p not in (p1, p2):
663 raise error.Abort(_('%s is not a parent of %s') %
663 raise error.Abort(_('%s is not a parent of %s') %
664 (short(p), short(node)))
664 (short(p), short(node)))
665 parent = p
665 parent = p
666 else:
666 else:
667 if opts.get('parent'):
667 if opts.get('parent'):
668 raise error.Abort(_('cannot use --parent on non-merge changeset'))
668 raise error.Abort(_('cannot use --parent on non-merge changeset'))
669 parent = p1
669 parent = p1
670
670
671 # the backout should appear on the same branch
671 # the backout should appear on the same branch
672 branch = repo.dirstate.branch()
672 branch = repo.dirstate.branch()
673 bheads = repo.branchheads(branch)
673 bheads = repo.branchheads(branch)
674 rctx = scmutil.revsingle(repo, hex(parent))
674 rctx = scmutil.revsingle(repo, hex(parent))
675 if not opts.get('merge') and op1 != node:
675 if not opts.get('merge') and op1 != node:
676 dsguard = dirstateguard.dirstateguard(repo, 'backout')
676 dsguard = dirstateguard.dirstateguard(repo, 'backout')
677 try:
677 try:
678 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
678 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
679 'backout')
679 'backout')
680 stats = mergemod.update(repo, parent, True, True, node, False)
680 stats = mergemod.update(repo, parent, True, True, node, False)
681 repo.setparents(op1, op2)
681 repo.setparents(op1, op2)
682 dsguard.close()
682 dsguard.close()
683 hg._showstats(repo, stats)
683 hg._showstats(repo, stats)
684 if stats[3]:
684 if stats[3]:
685 repo.ui.status(_("use 'hg resolve' to retry unresolved "
685 repo.ui.status(_("use 'hg resolve' to retry unresolved "
686 "file merges\n"))
686 "file merges\n"))
687 return 1
687 return 1
688 finally:
688 finally:
689 ui.setconfig('ui', 'forcemerge', '', '')
689 ui.setconfig('ui', 'forcemerge', '', '')
690 lockmod.release(dsguard)
690 lockmod.release(dsguard)
691 else:
691 else:
692 hg.clean(repo, node, show_stats=False)
692 hg.clean(repo, node, show_stats=False)
693 repo.dirstate.setbranch(branch)
693 repo.dirstate.setbranch(branch)
694 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
694 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
695
695
696 if opts.get('no_commit'):
696 if opts.get('no_commit'):
697 msg = _("changeset %s backed out, "
697 msg = _("changeset %s backed out, "
698 "don't forget to commit.\n")
698 "don't forget to commit.\n")
699 ui.status(msg % short(node))
699 ui.status(msg % short(node))
700 return 0
700 return 0
701
701
702 def commitfunc(ui, repo, message, match, opts):
702 def commitfunc(ui, repo, message, match, opts):
703 editform = 'backout'
703 editform = 'backout'
704 e = cmdutil.getcommiteditor(editform=editform, **opts)
704 e = cmdutil.getcommiteditor(editform=editform, **opts)
705 if not message:
705 if not message:
706 # we don't translate commit messages
706 # we don't translate commit messages
707 message = "Backed out changeset %s" % short(node)
707 message = "Backed out changeset %s" % short(node)
708 e = cmdutil.getcommiteditor(edit=True, editform=editform)
708 e = cmdutil.getcommiteditor(edit=True, editform=editform)
709 return repo.commit(message, opts.get('user'), opts.get('date'),
709 return repo.commit(message, opts.get('user'), opts.get('date'),
710 match, editor=e)
710 match, editor=e)
711 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
711 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
712 if not newnode:
712 if not newnode:
713 ui.status(_("nothing changed\n"))
713 ui.status(_("nothing changed\n"))
714 return 1
714 return 1
715 cmdutil.commitstatus(repo, newnode, branch, bheads)
715 cmdutil.commitstatus(repo, newnode, branch, bheads)
716
716
717 def nice(node):
717 def nice(node):
718 return '%d:%s' % (repo.changelog.rev(node), short(node))
718 return '%d:%s' % (repo.changelog.rev(node), short(node))
719 ui.status(_('changeset %s backs out changeset %s\n') %
719 ui.status(_('changeset %s backs out changeset %s\n') %
720 (nice(repo.changelog.tip()), nice(node)))
720 (nice(repo.changelog.tip()), nice(node)))
721 if opts.get('merge') and op1 != node:
721 if opts.get('merge') and op1 != node:
722 hg.clean(repo, op1, show_stats=False)
722 hg.clean(repo, op1, show_stats=False)
723 ui.status(_('merging with changeset %s\n')
723 ui.status(_('merging with changeset %s\n')
724 % nice(repo.changelog.tip()))
724 % nice(repo.changelog.tip()))
725 try:
725 try:
726 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
726 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
727 'backout')
727 'backout')
728 return hg.merge(repo, hex(repo.changelog.tip()))
728 return hg.merge(repo, hex(repo.changelog.tip()))
729 finally:
729 finally:
730 ui.setconfig('ui', 'forcemerge', '', '')
730 ui.setconfig('ui', 'forcemerge', '', '')
731 return 0
731 return 0
732
732
733 @command('bisect',
733 @command('bisect',
734 [('r', 'reset', False, _('reset bisect state')),
734 [('r', 'reset', False, _('reset bisect state')),
735 ('g', 'good', False, _('mark changeset good')),
735 ('g', 'good', False, _('mark changeset good')),
736 ('b', 'bad', False, _('mark changeset bad')),
736 ('b', 'bad', False, _('mark changeset bad')),
737 ('s', 'skip', False, _('skip testing changeset')),
737 ('s', 'skip', False, _('skip testing changeset')),
738 ('e', 'extend', False, _('extend the bisect range')),
738 ('e', 'extend', False, _('extend the bisect range')),
739 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
739 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
740 ('U', 'noupdate', False, _('do not update to target'))],
740 ('U', 'noupdate', False, _('do not update to target'))],
741 _("[-gbsr] [-U] [-c CMD] [REV]"))
741 _("[-gbsr] [-U] [-c CMD] [REV]"))
742 def bisect(ui, repo, rev=None, extra=None, command=None,
742 def bisect(ui, repo, rev=None, extra=None, command=None,
743 reset=None, good=None, bad=None, skip=None, extend=None,
743 reset=None, good=None, bad=None, skip=None, extend=None,
744 noupdate=None):
744 noupdate=None):
745 """subdivision search of changesets
745 """subdivision search of changesets
746
746
747 This command helps to find changesets which introduce problems. To
747 This command helps to find changesets which introduce problems. To
748 use, mark the earliest changeset you know exhibits the problem as
748 use, mark the earliest changeset you know exhibits the problem as
749 bad, then mark the latest changeset which is free from the problem
749 bad, then mark the latest changeset which is free from the problem
750 as good. Bisect will update your working directory to a revision
750 as good. Bisect will update your working directory to a revision
751 for testing (unless the -U/--noupdate option is specified). Once
751 for testing (unless the -U/--noupdate option is specified). Once
752 you have performed tests, mark the working directory as good or
752 you have performed tests, mark the working directory as good or
753 bad, and bisect will either update to another candidate changeset
753 bad, and bisect will either update to another candidate changeset
754 or announce that it has found the bad revision.
754 or announce that it has found the bad revision.
755
755
756 As a shortcut, you can also use the revision argument to mark a
756 As a shortcut, you can also use the revision argument to mark a
757 revision as good or bad without checking it out first.
757 revision as good or bad without checking it out first.
758
758
759 If you supply a command, it will be used for automatic bisection.
759 If you supply a command, it will be used for automatic bisection.
760 The environment variable HG_NODE will contain the ID of the
760 The environment variable HG_NODE will contain the ID of the
761 changeset being tested. The exit status of the command will be
761 changeset being tested. The exit status of the command will be
762 used to mark revisions as good or bad: status 0 means good, 125
762 used to mark revisions as good or bad: status 0 means good, 125
763 means to skip the revision, 127 (command not found) will abort the
763 means to skip the revision, 127 (command not found) will abort the
764 bisection, and any other non-zero exit status means the revision
764 bisection, and any other non-zero exit status means the revision
765 is bad.
765 is bad.
766
766
767 .. container:: verbose
767 .. container:: verbose
768
768
769 Some examples:
769 Some examples:
770
770
771 - start a bisection with known bad revision 34, and good revision 12::
771 - start a bisection with known bad revision 34, and good revision 12::
772
772
773 hg bisect --bad 34
773 hg bisect --bad 34
774 hg bisect --good 12
774 hg bisect --good 12
775
775
776 - advance the current bisection by marking current revision as good or
776 - advance the current bisection by marking current revision as good or
777 bad::
777 bad::
778
778
779 hg bisect --good
779 hg bisect --good
780 hg bisect --bad
780 hg bisect --bad
781
781
782 - mark the current revision, or a known revision, to be skipped (e.g. if
782 - mark the current revision, or a known revision, to be skipped (e.g. if
783 that revision is not usable because of another issue)::
783 that revision is not usable because of another issue)::
784
784
785 hg bisect --skip
785 hg bisect --skip
786 hg bisect --skip 23
786 hg bisect --skip 23
787
787
788 - skip all revisions that do not touch directories ``foo`` or ``bar``::
788 - skip all revisions that do not touch directories ``foo`` or ``bar``::
789
789
790 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
790 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
791
791
792 - forget the current bisection::
792 - forget the current bisection::
793
793
794 hg bisect --reset
794 hg bisect --reset
795
795
796 - use 'make && make tests' to automatically find the first broken
796 - use 'make && make tests' to automatically find the first broken
797 revision::
797 revision::
798
798
799 hg bisect --reset
799 hg bisect --reset
800 hg bisect --bad 34
800 hg bisect --bad 34
801 hg bisect --good 12
801 hg bisect --good 12
802 hg bisect --command "make && make tests"
802 hg bisect --command "make && make tests"
803
803
804 - see all changesets whose states are already known in the current
804 - see all changesets whose states are already known in the current
805 bisection::
805 bisection::
806
806
807 hg log -r "bisect(pruned)"
807 hg log -r "bisect(pruned)"
808
808
809 - see the changeset currently being bisected (especially useful
809 - see the changeset currently being bisected (especially useful
810 if running with -U/--noupdate)::
810 if running with -U/--noupdate)::
811
811
812 hg log -r "bisect(current)"
812 hg log -r "bisect(current)"
813
813
814 - see all changesets that took part in the current bisection::
814 - see all changesets that took part in the current bisection::
815
815
816 hg log -r "bisect(range)"
816 hg log -r "bisect(range)"
817
817
818 - you can even get a nice graph::
818 - you can even get a nice graph::
819
819
820 hg log --graph -r "bisect(range)"
820 hg log --graph -r "bisect(range)"
821
821
822 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
822 See :hg:`help revisions.bisect` for more about the `bisect()` predicate.
823
823
824 Returns 0 on success.
824 Returns 0 on success.
825 """
825 """
826 # backward compatibility
826 # backward compatibility
827 if rev in "good bad reset init".split():
827 if rev in "good bad reset init".split():
828 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
828 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
829 cmd, rev, extra = rev, extra, None
829 cmd, rev, extra = rev, extra, None
830 if cmd == "good":
830 if cmd == "good":
831 good = True
831 good = True
832 elif cmd == "bad":
832 elif cmd == "bad":
833 bad = True
833 bad = True
834 else:
834 else:
835 reset = True
835 reset = True
836 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
836 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
837 raise error.Abort(_('incompatible arguments'))
837 raise error.Abort(_('incompatible arguments'))
838
838
839 cmdutil.checkunfinished(repo)
839 cmdutil.checkunfinished(repo)
840
840
841 if reset:
841 if reset:
842 hbisect.resetstate(repo)
842 hbisect.resetstate(repo)
843 return
843 return
844
844
845 state = hbisect.load_state(repo)
845 state = hbisect.load_state(repo)
846
846
847 # update state
847 # update state
848 if good or bad or skip:
848 if good or bad or skip:
849 if rev:
849 if rev:
850 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
850 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
851 else:
851 else:
852 nodes = [repo.lookup('.')]
852 nodes = [repo.lookup('.')]
853 if good:
853 if good:
854 state['good'] += nodes
854 state['good'] += nodes
855 elif bad:
855 elif bad:
856 state['bad'] += nodes
856 state['bad'] += nodes
857 elif skip:
857 elif skip:
858 state['skip'] += nodes
858 state['skip'] += nodes
859 hbisect.save_state(repo, state)
859 hbisect.save_state(repo, state)
860 if not (state['good'] and state['bad']):
860 if not (state['good'] and state['bad']):
861 return
861 return
862
862
863 def mayupdate(repo, node, show_stats=True):
863 def mayupdate(repo, node, show_stats=True):
864 """common used update sequence"""
864 """common used update sequence"""
865 if noupdate:
865 if noupdate:
866 return
866 return
867 cmdutil.bailifchanged(repo)
867 cmdutil.bailifchanged(repo)
868 return hg.clean(repo, node, show_stats=show_stats)
868 return hg.clean(repo, node, show_stats=show_stats)
869
869
870 displayer = cmdutil.show_changeset(ui, repo, {})
870 displayer = cmdutil.show_changeset(ui, repo, {})
871
871
872 if command:
872 if command:
873 changesets = 1
873 changesets = 1
874 if noupdate:
874 if noupdate:
875 try:
875 try:
876 node = state['current'][0]
876 node = state['current'][0]
877 except LookupError:
877 except LookupError:
878 raise error.Abort(_('current bisect revision is unknown - '
878 raise error.Abort(_('current bisect revision is unknown - '
879 'start a new bisect to fix'))
879 'start a new bisect to fix'))
880 else:
880 else:
881 node, p2 = repo.dirstate.parents()
881 node, p2 = repo.dirstate.parents()
882 if p2 != nullid:
882 if p2 != nullid:
883 raise error.Abort(_('current bisect revision is a merge'))
883 raise error.Abort(_('current bisect revision is a merge'))
884 if rev:
884 if rev:
885 node = repo[scmutil.revsingle(repo, rev, node)].node()
885 node = repo[scmutil.revsingle(repo, rev, node)].node()
886 try:
886 try:
887 while changesets:
887 while changesets:
888 # update state
888 # update state
889 state['current'] = [node]
889 state['current'] = [node]
890 hbisect.save_state(repo, state)
890 hbisect.save_state(repo, state)
891 status = ui.system(command, environ={'HG_NODE': hex(node)},
891 status = ui.system(command, environ={'HG_NODE': hex(node)},
892 blockedtag='bisect_check')
892 blockedtag='bisect_check')
893 if status == 125:
893 if status == 125:
894 transition = "skip"
894 transition = "skip"
895 elif status == 0:
895 elif status == 0:
896 transition = "good"
896 transition = "good"
897 # status < 0 means process was killed
897 # status < 0 means process was killed
898 elif status == 127:
898 elif status == 127:
899 raise error.Abort(_("failed to execute %s") % command)
899 raise error.Abort(_("failed to execute %s") % command)
900 elif status < 0:
900 elif status < 0:
901 raise error.Abort(_("%s killed") % command)
901 raise error.Abort(_("%s killed") % command)
902 else:
902 else:
903 transition = "bad"
903 transition = "bad"
904 state[transition].append(node)
904 state[transition].append(node)
905 ctx = repo[node]
905 ctx = repo[node]
906 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
906 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
907 hbisect.checkstate(state)
907 hbisect.checkstate(state)
908 # bisect
908 # bisect
909 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
909 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
910 # update to next check
910 # update to next check
911 node = nodes[0]
911 node = nodes[0]
912 mayupdate(repo, node, show_stats=False)
912 mayupdate(repo, node, show_stats=False)
913 finally:
913 finally:
914 state['current'] = [node]
914 state['current'] = [node]
915 hbisect.save_state(repo, state)
915 hbisect.save_state(repo, state)
916 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
916 hbisect.printresult(ui, repo, state, displayer, nodes, bgood)
917 return
917 return
918
918
919 hbisect.checkstate(state)
919 hbisect.checkstate(state)
920
920
921 # actually bisect
921 # actually bisect
922 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
922 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
923 if extend:
923 if extend:
924 if not changesets:
924 if not changesets:
925 extendnode = hbisect.extendrange(repo, state, nodes, good)
925 extendnode = hbisect.extendrange(repo, state, nodes, good)
926 if extendnode is not None:
926 if extendnode is not None:
927 ui.write(_("Extending search to changeset %d:%s\n")
927 ui.write(_("Extending search to changeset %d:%s\n")
928 % (extendnode.rev(), extendnode))
928 % (extendnode.rev(), extendnode))
929 state['current'] = [extendnode.node()]
929 state['current'] = [extendnode.node()]
930 hbisect.save_state(repo, state)
930 hbisect.save_state(repo, state)
931 return mayupdate(repo, extendnode.node())
931 return mayupdate(repo, extendnode.node())
932 raise error.Abort(_("nothing to extend"))
932 raise error.Abort(_("nothing to extend"))
933
933
934 if changesets == 0:
934 if changesets == 0:
935 hbisect.printresult(ui, repo, state, displayer, nodes, good)
935 hbisect.printresult(ui, repo, state, displayer, nodes, good)
936 else:
936 else:
937 assert len(nodes) == 1 # only a single node can be tested next
937 assert len(nodes) == 1 # only a single node can be tested next
938 node = nodes[0]
938 node = nodes[0]
939 # compute the approximate number of remaining tests
939 # compute the approximate number of remaining tests
940 tests, size = 0, 2
940 tests, size = 0, 2
941 while size <= changesets:
941 while size <= changesets:
942 tests, size = tests + 1, size * 2
942 tests, size = tests + 1, size * 2
943 rev = repo.changelog.rev(node)
943 rev = repo.changelog.rev(node)
944 ui.write(_("Testing changeset %d:%s "
944 ui.write(_("Testing changeset %d:%s "
945 "(%d changesets remaining, ~%d tests)\n")
945 "(%d changesets remaining, ~%d tests)\n")
946 % (rev, short(node), changesets, tests))
946 % (rev, short(node), changesets, tests))
947 state['current'] = [node]
947 state['current'] = [node]
948 hbisect.save_state(repo, state)
948 hbisect.save_state(repo, state)
949 return mayupdate(repo, node)
949 return mayupdate(repo, node)
950
950
951 @command('bookmarks|bookmark',
951 @command('bookmarks|bookmark',
952 [('f', 'force', False, _('force')),
952 [('f', 'force', False, _('force')),
953 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
953 ('r', 'rev', '', _('revision for bookmark action'), _('REV')),
954 ('d', 'delete', False, _('delete a given bookmark')),
954 ('d', 'delete', False, _('delete a given bookmark')),
955 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
955 ('m', 'rename', '', _('rename a given bookmark'), _('OLD')),
956 ('i', 'inactive', False, _('mark a bookmark inactive')),
956 ('i', 'inactive', False, _('mark a bookmark inactive')),
957 ] + formatteropts,
957 ] + formatteropts,
958 _('hg bookmarks [OPTIONS]... [NAME]...'))
958 _('hg bookmarks [OPTIONS]... [NAME]...'))
959 def bookmark(ui, repo, *names, **opts):
959 def bookmark(ui, repo, *names, **opts):
960 '''create a new bookmark or list existing bookmarks
960 '''create a new bookmark or list existing bookmarks
961
961
962 Bookmarks are labels on changesets to help track lines of development.
962 Bookmarks are labels on changesets to help track lines of development.
963 Bookmarks are unversioned and can be moved, renamed and deleted.
963 Bookmarks are unversioned and can be moved, renamed and deleted.
964 Deleting or moving a bookmark has no effect on the associated changesets.
964 Deleting or moving a bookmark has no effect on the associated changesets.
965
965
966 Creating or updating to a bookmark causes it to be marked as 'active'.
966 Creating or updating to a bookmark causes it to be marked as 'active'.
967 The active bookmark is indicated with a '*'.
967 The active bookmark is indicated with a '*'.
968 When a commit is made, the active bookmark will advance to the new commit.
968 When a commit is made, the active bookmark will advance to the new commit.
969 A plain :hg:`update` will also advance an active bookmark, if possible.
969 A plain :hg:`update` will also advance an active bookmark, if possible.
970 Updating away from a bookmark will cause it to be deactivated.
970 Updating away from a bookmark will cause it to be deactivated.
971
971
972 Bookmarks can be pushed and pulled between repositories (see
972 Bookmarks can be pushed and pulled between repositories (see
973 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
973 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
974 diverged, a new 'divergent bookmark' of the form 'name@path' will
974 diverged, a new 'divergent bookmark' of the form 'name@path' will
975 be created. Using :hg:`merge` will resolve the divergence.
975 be created. Using :hg:`merge` will resolve the divergence.
976
976
977 A bookmark named '@' has the special property that :hg:`clone` will
977 A bookmark named '@' has the special property that :hg:`clone` will
978 check it out by default if it exists.
978 check it out by default if it exists.
979
979
980 .. container:: verbose
980 .. container:: verbose
981
981
982 Examples:
982 Examples:
983
983
984 - create an active bookmark for a new line of development::
984 - create an active bookmark for a new line of development::
985
985
986 hg book new-feature
986 hg book new-feature
987
987
988 - create an inactive bookmark as a place marker::
988 - create an inactive bookmark as a place marker::
989
989
990 hg book -i reviewed
990 hg book -i reviewed
991
991
992 - create an inactive bookmark on another changeset::
992 - create an inactive bookmark on another changeset::
993
993
994 hg book -r .^ tested
994 hg book -r .^ tested
995
995
996 - rename bookmark turkey to dinner::
996 - rename bookmark turkey to dinner::
997
997
998 hg book -m turkey dinner
998 hg book -m turkey dinner
999
999
1000 - move the '@' bookmark from another branch::
1000 - move the '@' bookmark from another branch::
1001
1001
1002 hg book -f @
1002 hg book -f @
1003 '''
1003 '''
1004 force = opts.get('force')
1004 force = opts.get('force')
1005 rev = opts.get('rev')
1005 rev = opts.get('rev')
1006 delete = opts.get('delete')
1006 delete = opts.get('delete')
1007 rename = opts.get('rename')
1007 rename = opts.get('rename')
1008 inactive = opts.get('inactive')
1008 inactive = opts.get('inactive')
1009
1009
1010 def checkformat(mark):
1010 def checkformat(mark):
1011 mark = mark.strip()
1011 mark = mark.strip()
1012 if not mark:
1012 if not mark:
1013 raise error.Abort(_("bookmark names cannot consist entirely of "
1013 raise error.Abort(_("bookmark names cannot consist entirely of "
1014 "whitespace"))
1014 "whitespace"))
1015 scmutil.checknewlabel(repo, mark, 'bookmark')
1015 scmutil.checknewlabel(repo, mark, 'bookmark')
1016 return mark
1016 return mark
1017
1017
1018 def checkconflict(repo, mark, cur, force=False, target=None):
1018 def checkconflict(repo, mark, cur, force=False, target=None):
1019 if mark in marks and not force:
1019 if mark in marks and not force:
1020 if target:
1020 if target:
1021 if marks[mark] == target and target == cur:
1021 if marks[mark] == target and target == cur:
1022 # re-activating a bookmark
1022 # re-activating a bookmark
1023 return
1023 return
1024 anc = repo.changelog.ancestors([repo[target].rev()])
1024 anc = repo.changelog.ancestors([repo[target].rev()])
1025 bmctx = repo[marks[mark]]
1025 bmctx = repo[marks[mark]]
1026 divs = [repo[b].node() for b in marks
1026 divs = [repo[b].node() for b in marks
1027 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1027 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
1028
1028
1029 # allow resolving a single divergent bookmark even if moving
1029 # allow resolving a single divergent bookmark even if moving
1030 # the bookmark across branches when a revision is specified
1030 # the bookmark across branches when a revision is specified
1031 # that contains a divergent bookmark
1031 # that contains a divergent bookmark
1032 if bmctx.rev() not in anc and target in divs:
1032 if bmctx.rev() not in anc and target in divs:
1033 bookmarks.deletedivergent(repo, [target], mark)
1033 bookmarks.deletedivergent(repo, [target], mark)
1034 return
1034 return
1035
1035
1036 deletefrom = [b for b in divs
1036 deletefrom = [b for b in divs
1037 if repo[b].rev() in anc or b == target]
1037 if repo[b].rev() in anc or b == target]
1038 bookmarks.deletedivergent(repo, deletefrom, mark)
1038 bookmarks.deletedivergent(repo, deletefrom, mark)
1039 if bookmarks.validdest(repo, bmctx, repo[target]):
1039 if bookmarks.validdest(repo, bmctx, repo[target]):
1040 ui.status(_("moving bookmark '%s' forward from %s\n") %
1040 ui.status(_("moving bookmark '%s' forward from %s\n") %
1041 (mark, short(bmctx.node())))
1041 (mark, short(bmctx.node())))
1042 return
1042 return
1043 raise error.Abort(_("bookmark '%s' already exists "
1043 raise error.Abort(_("bookmark '%s' already exists "
1044 "(use -f to force)") % mark)
1044 "(use -f to force)") % mark)
1045 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1045 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
1046 and not force):
1046 and not force):
1047 raise error.Abort(
1047 raise error.Abort(
1048 _("a bookmark cannot have the name of an existing branch"))
1048 _("a bookmark cannot have the name of an existing branch"))
1049
1049
1050 if delete and rename:
1050 if delete and rename:
1051 raise error.Abort(_("--delete and --rename are incompatible"))
1051 raise error.Abort(_("--delete and --rename are incompatible"))
1052 if delete and rev:
1052 if delete and rev:
1053 raise error.Abort(_("--rev is incompatible with --delete"))
1053 raise error.Abort(_("--rev is incompatible with --delete"))
1054 if rename and rev:
1054 if rename and rev:
1055 raise error.Abort(_("--rev is incompatible with --rename"))
1055 raise error.Abort(_("--rev is incompatible with --rename"))
1056 if not names and (delete or rev):
1056 if not names and (delete or rev):
1057 raise error.Abort(_("bookmark name required"))
1057 raise error.Abort(_("bookmark name required"))
1058
1058
1059 if delete or rename or names or inactive:
1059 if delete or rename or names or inactive:
1060 wlock = lock = tr = None
1060 wlock = lock = tr = None
1061 try:
1061 try:
1062 wlock = repo.wlock()
1062 wlock = repo.wlock()
1063 lock = repo.lock()
1063 lock = repo.lock()
1064 cur = repo.changectx('.').node()
1064 cur = repo.changectx('.').node()
1065 marks = repo._bookmarks
1065 marks = repo._bookmarks
1066 if delete:
1066 if delete:
1067 tr = repo.transaction('bookmark')
1067 tr = repo.transaction('bookmark')
1068 for mark in names:
1068 for mark in names:
1069 if mark not in marks:
1069 if mark not in marks:
1070 raise error.Abort(_("bookmark '%s' does not exist") %
1070 raise error.Abort(_("bookmark '%s' does not exist") %
1071 mark)
1071 mark)
1072 if mark == repo._activebookmark:
1072 if mark == repo._activebookmark:
1073 bookmarks.deactivate(repo)
1073 bookmarks.deactivate(repo)
1074 del marks[mark]
1074 del marks[mark]
1075
1075
1076 elif rename:
1076 elif rename:
1077 tr = repo.transaction('bookmark')
1077 tr = repo.transaction('bookmark')
1078 if not names:
1078 if not names:
1079 raise error.Abort(_("new bookmark name required"))
1079 raise error.Abort(_("new bookmark name required"))
1080 elif len(names) > 1:
1080 elif len(names) > 1:
1081 raise error.Abort(_("only one new bookmark name allowed"))
1081 raise error.Abort(_("only one new bookmark name allowed"))
1082 mark = checkformat(names[0])
1082 mark = checkformat(names[0])
1083 if rename not in marks:
1083 if rename not in marks:
1084 raise error.Abort(_("bookmark '%s' does not exist")
1084 raise error.Abort(_("bookmark '%s' does not exist")
1085 % rename)
1085 % rename)
1086 checkconflict(repo, mark, cur, force)
1086 checkconflict(repo, mark, cur, force)
1087 marks[mark] = marks[rename]
1087 marks[mark] = marks[rename]
1088 if repo._activebookmark == rename and not inactive:
1088 if repo._activebookmark == rename and not inactive:
1089 bookmarks.activate(repo, mark)
1089 bookmarks.activate(repo, mark)
1090 del marks[rename]
1090 del marks[rename]
1091 elif names:
1091 elif names:
1092 tr = repo.transaction('bookmark')
1092 tr = repo.transaction('bookmark')
1093 newact = None
1093 newact = None
1094 for mark in names:
1094 for mark in names:
1095 mark = checkformat(mark)
1095 mark = checkformat(mark)
1096 if newact is None:
1096 if newact is None:
1097 newact = mark
1097 newact = mark
1098 if inactive and mark == repo._activebookmark:
1098 if inactive and mark == repo._activebookmark:
1099 bookmarks.deactivate(repo)
1099 bookmarks.deactivate(repo)
1100 return
1100 return
1101 tgt = cur
1101 tgt = cur
1102 if rev:
1102 if rev:
1103 tgt = scmutil.revsingle(repo, rev).node()
1103 tgt = scmutil.revsingle(repo, rev).node()
1104 checkconflict(repo, mark, cur, force, tgt)
1104 checkconflict(repo, mark, cur, force, tgt)
1105 marks[mark] = tgt
1105 marks[mark] = tgt
1106 if not inactive and cur == marks[newact] and not rev:
1106 if not inactive and cur == marks[newact] and not rev:
1107 bookmarks.activate(repo, newact)
1107 bookmarks.activate(repo, newact)
1108 elif cur != tgt and newact == repo._activebookmark:
1108 elif cur != tgt and newact == repo._activebookmark:
1109 bookmarks.deactivate(repo)
1109 bookmarks.deactivate(repo)
1110 elif inactive:
1110 elif inactive:
1111 if len(marks) == 0:
1111 if len(marks) == 0:
1112 ui.status(_("no bookmarks set\n"))
1112 ui.status(_("no bookmarks set\n"))
1113 elif not repo._activebookmark:
1113 elif not repo._activebookmark:
1114 ui.status(_("no active bookmark\n"))
1114 ui.status(_("no active bookmark\n"))
1115 else:
1115 else:
1116 bookmarks.deactivate(repo)
1116 bookmarks.deactivate(repo)
1117 if tr is not None:
1117 if tr is not None:
1118 marks.recordchange(tr)
1118 marks.recordchange(tr)
1119 tr.close()
1119 tr.close()
1120 finally:
1120 finally:
1121 lockmod.release(tr, lock, wlock)
1121 lockmod.release(tr, lock, wlock)
1122 else: # show bookmarks
1122 else: # show bookmarks
1123 fm = ui.formatter('bookmarks', opts)
1123 fm = ui.formatter('bookmarks', opts)
1124 hexfn = fm.hexfunc
1124 hexfn = fm.hexfunc
1125 marks = repo._bookmarks
1125 marks = repo._bookmarks
1126 if len(marks) == 0 and fm.isplain():
1126 if len(marks) == 0 and fm.isplain():
1127 ui.status(_("no bookmarks set\n"))
1127 ui.status(_("no bookmarks set\n"))
1128 for bmark, n in sorted(marks.iteritems()):
1128 for bmark, n in sorted(marks.iteritems()):
1129 active = repo._activebookmark
1129 active = repo._activebookmark
1130 if bmark == active:
1130 if bmark == active:
1131 prefix, label = '*', activebookmarklabel
1131 prefix, label = '*', activebookmarklabel
1132 else:
1132 else:
1133 prefix, label = ' ', ''
1133 prefix, label = ' ', ''
1134
1134
1135 fm.startitem()
1135 fm.startitem()
1136 if not ui.quiet:
1136 if not ui.quiet:
1137 fm.plain(' %s ' % prefix, label=label)
1137 fm.plain(' %s ' % prefix, label=label)
1138 fm.write('bookmark', '%s', bmark, label=label)
1138 fm.write('bookmark', '%s', bmark, label=label)
1139 pad = " " * (25 - encoding.colwidth(bmark))
1139 pad = " " * (25 - encoding.colwidth(bmark))
1140 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1140 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1141 repo.changelog.rev(n), hexfn(n), label=label)
1141 repo.changelog.rev(n), hexfn(n), label=label)
1142 fm.data(active=(bmark == active))
1142 fm.data(active=(bmark == active))
1143 fm.plain('\n')
1143 fm.plain('\n')
1144 fm.end()
1144 fm.end()
1145
1145
1146 @command('branch',
1146 @command('branch',
1147 [('f', 'force', None,
1147 [('f', 'force', None,
1148 _('set branch name even if it shadows an existing branch')),
1148 _('set branch name even if it shadows an existing branch')),
1149 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1149 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1150 _('[-fC] [NAME]'))
1150 _('[-fC] [NAME]'))
1151 def branch(ui, repo, label=None, **opts):
1151 def branch(ui, repo, label=None, **opts):
1152 """set or show the current branch name
1152 """set or show the current branch name
1153
1153
1154 .. note::
1154 .. note::
1155
1155
1156 Branch names are permanent and global. Use :hg:`bookmark` to create a
1156 Branch names are permanent and global. Use :hg:`bookmark` to create a
1157 light-weight bookmark instead. See :hg:`help glossary` for more
1157 light-weight bookmark instead. See :hg:`help glossary` for more
1158 information about named branches and bookmarks.
1158 information about named branches and bookmarks.
1159
1159
1160 With no argument, show the current branch name. With one argument,
1160 With no argument, show the current branch name. With one argument,
1161 set the working directory branch name (the branch will not exist
1161 set the working directory branch name (the branch will not exist
1162 in the repository until the next commit). Standard practice
1162 in the repository until the next commit). Standard practice
1163 recommends that primary development take place on the 'default'
1163 recommends that primary development take place on the 'default'
1164 branch.
1164 branch.
1165
1165
1166 Unless -f/--force is specified, branch will not let you set a
1166 Unless -f/--force is specified, branch will not let you set a
1167 branch name that already exists.
1167 branch name that already exists.
1168
1168
1169 Use -C/--clean to reset the working directory branch to that of
1169 Use -C/--clean to reset the working directory branch to that of
1170 the parent of the working directory, negating a previous branch
1170 the parent of the working directory, negating a previous branch
1171 change.
1171 change.
1172
1172
1173 Use the command :hg:`update` to switch to an existing branch. Use
1173 Use the command :hg:`update` to switch to an existing branch. Use
1174 :hg:`commit --close-branch` to mark this branch head as closed.
1174 :hg:`commit --close-branch` to mark this branch head as closed.
1175 When all heads of a branch are closed, the branch will be
1175 When all heads of a branch are closed, the branch will be
1176 considered closed.
1176 considered closed.
1177
1177
1178 Returns 0 on success.
1178 Returns 0 on success.
1179 """
1179 """
1180 if label:
1180 if label:
1181 label = label.strip()
1181 label = label.strip()
1182
1182
1183 if not opts.get('clean') and not label:
1183 if not opts.get('clean') and not label:
1184 ui.write("%s\n" % repo.dirstate.branch())
1184 ui.write("%s\n" % repo.dirstate.branch())
1185 return
1185 return
1186
1186
1187 with repo.wlock():
1187 with repo.wlock():
1188 if opts.get('clean'):
1188 if opts.get('clean'):
1189 label = repo[None].p1().branch()
1189 label = repo[None].p1().branch()
1190 repo.dirstate.setbranch(label)
1190 repo.dirstate.setbranch(label)
1191 ui.status(_('reset working directory to branch %s\n') % label)
1191 ui.status(_('reset working directory to branch %s\n') % label)
1192 elif label:
1192 elif label:
1193 if not opts.get('force') and label in repo.branchmap():
1193 if not opts.get('force') and label in repo.branchmap():
1194 if label not in [p.branch() for p in repo[None].parents()]:
1194 if label not in [p.branch() for p in repo[None].parents()]:
1195 raise error.Abort(_('a branch of the same name already'
1195 raise error.Abort(_('a branch of the same name already'
1196 ' exists'),
1196 ' exists'),
1197 # i18n: "it" refers to an existing branch
1197 # i18n: "it" refers to an existing branch
1198 hint=_("use 'hg update' to switch to it"))
1198 hint=_("use 'hg update' to switch to it"))
1199 scmutil.checknewlabel(repo, label, 'branch')
1199 scmutil.checknewlabel(repo, label, 'branch')
1200 repo.dirstate.setbranch(label)
1200 repo.dirstate.setbranch(label)
1201 ui.status(_('marked working directory as branch %s\n') % label)
1201 ui.status(_('marked working directory as branch %s\n') % label)
1202
1202
1203 # find any open named branches aside from default
1203 # find any open named branches aside from default
1204 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1204 others = [n for n, h, t, c in repo.branchmap().iterbranches()
1205 if n != "default" and not c]
1205 if n != "default" and not c]
1206 if not others:
1206 if not others:
1207 ui.status(_('(branches are permanent and global, '
1207 ui.status(_('(branches are permanent and global, '
1208 'did you want a bookmark?)\n'))
1208 'did you want a bookmark?)\n'))
1209
1209
1210 @command('branches',
1210 @command('branches',
1211 [('a', 'active', False,
1211 [('a', 'active', False,
1212 _('show only branches that have unmerged heads (DEPRECATED)')),
1212 _('show only branches that have unmerged heads (DEPRECATED)')),
1213 ('c', 'closed', False, _('show normal and closed branches')),
1213 ('c', 'closed', False, _('show normal and closed branches')),
1214 ] + formatteropts,
1214 ] + formatteropts,
1215 _('[-c]'))
1215 _('[-c]'))
1216 def branches(ui, repo, active=False, closed=False, **opts):
1216 def branches(ui, repo, active=False, closed=False, **opts):
1217 """list repository named branches
1217 """list repository named branches
1218
1218
1219 List the repository's named branches, indicating which ones are
1219 List the repository's named branches, indicating which ones are
1220 inactive. If -c/--closed is specified, also list branches which have
1220 inactive. If -c/--closed is specified, also list branches which have
1221 been marked closed (see :hg:`commit --close-branch`).
1221 been marked closed (see :hg:`commit --close-branch`).
1222
1222
1223 Use the command :hg:`update` to switch to an existing branch.
1223 Use the command :hg:`update` to switch to an existing branch.
1224
1224
1225 Returns 0.
1225 Returns 0.
1226 """
1226 """
1227
1227
1228 ui.pager('branches')
1228 ui.pager('branches')
1229 fm = ui.formatter('branches', opts)
1229 fm = ui.formatter('branches', opts)
1230 hexfunc = fm.hexfunc
1230 hexfunc = fm.hexfunc
1231
1231
1232 allheads = set(repo.heads())
1232 allheads = set(repo.heads())
1233 branches = []
1233 branches = []
1234 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1234 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1235 isactive = not isclosed and bool(set(heads) & allheads)
1235 isactive = not isclosed and bool(set(heads) & allheads)
1236 branches.append((tag, repo[tip], isactive, not isclosed))
1236 branches.append((tag, repo[tip], isactive, not isclosed))
1237 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1237 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1238 reverse=True)
1238 reverse=True)
1239
1239
1240 for tag, ctx, isactive, isopen in branches:
1240 for tag, ctx, isactive, isopen in branches:
1241 if active and not isactive:
1241 if active and not isactive:
1242 continue
1242 continue
1243 if isactive:
1243 if isactive:
1244 label = 'branches.active'
1244 label = 'branches.active'
1245 notice = ''
1245 notice = ''
1246 elif not isopen:
1246 elif not isopen:
1247 if not closed:
1247 if not closed:
1248 continue
1248 continue
1249 label = 'branches.closed'
1249 label = 'branches.closed'
1250 notice = _(' (closed)')
1250 notice = _(' (closed)')
1251 else:
1251 else:
1252 label = 'branches.inactive'
1252 label = 'branches.inactive'
1253 notice = _(' (inactive)')
1253 notice = _(' (inactive)')
1254 current = (tag == repo.dirstate.branch())
1254 current = (tag == repo.dirstate.branch())
1255 if current:
1255 if current:
1256 label = 'branches.current'
1256 label = 'branches.current'
1257
1257
1258 fm.startitem()
1258 fm.startitem()
1259 fm.write('branch', '%s', tag, label=label)
1259 fm.write('branch', '%s', tag, label=label)
1260 rev = ctx.rev()
1260 rev = ctx.rev()
1261 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1261 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1262 fmt = ' ' * padsize + ' %d:%s'
1262 fmt = ' ' * padsize + ' %d:%s'
1263 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1263 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1264 label='log.changeset changeset.%s' % ctx.phasestr())
1264 label='log.changeset changeset.%s' % ctx.phasestr())
1265 fm.context(ctx=ctx)
1265 fm.context(ctx=ctx)
1266 fm.data(active=isactive, closed=not isopen, current=current)
1266 fm.data(active=isactive, closed=not isopen, current=current)
1267 if not ui.quiet:
1267 if not ui.quiet:
1268 fm.plain(notice)
1268 fm.plain(notice)
1269 fm.plain('\n')
1269 fm.plain('\n')
1270 fm.end()
1270 fm.end()
1271
1271
1272 @command('bundle',
1272 @command('bundle',
1273 [('f', 'force', None, _('run even when the destination is unrelated')),
1273 [('f', 'force', None, _('run even when the destination is unrelated')),
1274 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1274 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1275 _('REV')),
1275 _('REV')),
1276 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1276 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1277 _('BRANCH')),
1277 _('BRANCH')),
1278 ('', 'base', [],
1278 ('', 'base', [],
1279 _('a base changeset assumed to be available at the destination'),
1279 _('a base changeset assumed to be available at the destination'),
1280 _('REV')),
1280 _('REV')),
1281 ('a', 'all', None, _('bundle all changesets in the repository')),
1281 ('a', 'all', None, _('bundle all changesets in the repository')),
1282 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1282 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1283 ] + remoteopts,
1283 ] + remoteopts,
1284 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1284 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1285 def bundle(ui, repo, fname, dest=None, **opts):
1285 def bundle(ui, repo, fname, dest=None, **opts):
1286 """create a changegroup file
1286 """create a changegroup file
1287
1287
1288 Generate a changegroup file collecting changesets to be added
1288 Generate a changegroup file collecting changesets to be added
1289 to a repository.
1289 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. You can
1297 You can change bundle format with the -t/--type option. You can
1298 specify a compression, a bundle version or both using a dash
1298 specify a compression, a bundle version or both using a dash
1299 (comp-version). The available compression methods are: none, bzip2,
1299 (comp-version). The available compression methods are: none, bzip2,
1300 and gzip (by default, bundles are compressed using bzip2). The
1300 and gzip (by default, bundles are compressed using bzip2). The
1301 available formats are: v1, v2 (default to most suitable).
1301 available formats are: v1, v2 (default to most suitable).
1302
1302
1303 The bundle file can then be transferred using conventional means
1303 The bundle file can then be transferred using conventional means
1304 and applied to another repository with the unbundle or pull
1304 and applied to another repository with the unbundle or pull
1305 command. This is useful when direct push and pull are not
1305 command. This is useful when direct push and pull are not
1306 available or when exporting an entire repository is undesirable.
1306 available or when exporting an entire repository is undesirable.
1307
1307
1308 Applying bundles preserves all changeset contents including
1308 Applying bundles preserves all changeset contents including
1309 permissions, copy/rename information, and revision history.
1309 permissions, copy/rename information, and revision history.
1310
1310
1311 Returns 0 on success, 1 if no changes found.
1311 Returns 0 on success, 1 if no changes found.
1312 """
1312 """
1313 revs = None
1313 revs = None
1314 if 'rev' in opts:
1314 if 'rev' in opts:
1315 revstrings = opts['rev']
1315 revstrings = opts['rev']
1316 revs = scmutil.revrange(repo, revstrings)
1316 revs = scmutil.revrange(repo, revstrings)
1317 if revstrings and not revs:
1317 if revstrings and not revs:
1318 raise error.Abort(_('no commits to bundle'))
1318 raise error.Abort(_('no commits to bundle'))
1319
1319
1320 bundletype = opts.get('type', 'bzip2').lower()
1320 bundletype = opts.get('type', 'bzip2').lower()
1321 try:
1321 try:
1322 bcompression, cgversion, params = exchange.parsebundlespec(
1322 bcompression, cgversion, params = exchange.parsebundlespec(
1323 repo, bundletype, strict=False)
1323 repo, bundletype, strict=False)
1324 except error.UnsupportedBundleSpecification as e:
1324 except error.UnsupportedBundleSpecification as e:
1325 raise error.Abort(str(e),
1325 raise error.Abort(str(e),
1326 hint=_("see 'hg help bundle' for supported "
1326 hint=_("see 'hg help bundle' for supported "
1327 "values for --type"))
1327 "values for --type"))
1328
1328
1329 # Packed bundles are a pseudo bundle format for now.
1329 # Packed bundles are a pseudo bundle format for now.
1330 if cgversion == 's1':
1330 if cgversion == 's1':
1331 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1331 raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
1332 hint=_("use 'hg debugcreatestreamclonebundle'"))
1332 hint=_("use 'hg debugcreatestreamclonebundle'"))
1333
1333
1334 if opts.get('all'):
1334 if opts.get('all'):
1335 if dest:
1335 if dest:
1336 raise error.Abort(_("--all is incompatible with specifying "
1336 raise error.Abort(_("--all is incompatible with specifying "
1337 "a destination"))
1337 "a destination"))
1338 if opts.get('base'):
1338 if opts.get('base'):
1339 ui.warn(_("ignoring --base because --all was specified\n"))
1339 ui.warn(_("ignoring --base because --all was specified\n"))
1340 base = ['null']
1340 base = ['null']
1341 else:
1341 else:
1342 base = scmutil.revrange(repo, opts.get('base'))
1342 base = scmutil.revrange(repo, opts.get('base'))
1343 # TODO: get desired bundlecaps from command line.
1343 # TODO: get desired bundlecaps from command line.
1344 bundlecaps = None
1344 bundlecaps = None
1345 if cgversion not in changegroup.supportedoutgoingversions(repo):
1345 if cgversion not in changegroup.supportedoutgoingversions(repo):
1346 raise error.Abort(_("repository does not support bundle version %s") %
1346 raise error.Abort(_("repository does not support bundle version %s") %
1347 cgversion)
1347 cgversion)
1348
1348
1349 if base:
1349 if base:
1350 if dest:
1350 if dest:
1351 raise error.Abort(_("--base is incompatible with specifying "
1351 raise error.Abort(_("--base is incompatible with specifying "
1352 "a destination"))
1352 "a destination"))
1353 common = [repo.lookup(rev) for rev in base]
1353 common = [repo.lookup(rev) for rev in base]
1354 heads = revs and map(repo.lookup, revs) or None
1354 heads = revs and map(repo.lookup, revs) or None
1355 outgoing = discovery.outgoing(repo, common, heads)
1355 outgoing = discovery.outgoing(repo, common, heads)
1356 cg = changegroup.getchangegroup(repo, 'bundle', outgoing,
1356 cg = changegroup.getchangegroup(repo, 'bundle', outgoing,
1357 bundlecaps=bundlecaps,
1357 bundlecaps=bundlecaps,
1358 version=cgversion)
1358 version=cgversion)
1359 outgoing = None
1359 outgoing = None
1360 else:
1360 else:
1361 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1361 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1362 dest, branches = hg.parseurl(dest, opts.get('branch'))
1362 dest, branches = hg.parseurl(dest, opts.get('branch'))
1363 other = hg.peer(repo, opts, dest)
1363 other = hg.peer(repo, opts, dest)
1364 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1364 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1365 heads = revs and map(repo.lookup, revs) or revs
1365 heads = revs and map(repo.lookup, revs) or revs
1366 outgoing = discovery.findcommonoutgoing(repo, other,
1366 outgoing = discovery.findcommonoutgoing(repo, other,
1367 onlyheads=heads,
1367 onlyheads=heads,
1368 force=opts.get('force'),
1368 force=opts.get('force'),
1369 portable=True)
1369 portable=True)
1370 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1370 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1371 bundlecaps, version=cgversion)
1371 bundlecaps, version=cgversion)
1372 if not cg:
1372 if not cg:
1373 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1373 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1374 return 1
1374 return 1
1375
1375
1376 if cgversion == '01': #bundle1
1376 if cgversion == '01': #bundle1
1377 if bcompression is None:
1377 if bcompression is None:
1378 bcompression = 'UN'
1378 bcompression = 'UN'
1379 bversion = 'HG10' + bcompression
1379 bversion = 'HG10' + bcompression
1380 bcompression = None
1380 bcompression = None
1381 else:
1381 else:
1382 assert cgversion == '02'
1382 assert cgversion == '02'
1383 bversion = 'HG20'
1383 bversion = 'HG20'
1384
1384
1385 # TODO compression options should be derived from bundlespec parsing.
1385 # TODO compression options should be derived from bundlespec parsing.
1386 # This is a temporary hack to allow adjusting bundle compression
1386 # This is a temporary hack to allow adjusting bundle compression
1387 # level without a) formalizing the bundlespec changes to declare it
1387 # level without a) formalizing the bundlespec changes to declare it
1388 # b) introducing a command flag.
1388 # b) introducing a command flag.
1389 compopts = {}
1389 compopts = {}
1390 complevel = ui.configint('experimental', 'bundlecomplevel')
1390 complevel = ui.configint('experimental', 'bundlecomplevel')
1391 if complevel is not None:
1391 if complevel is not None:
1392 compopts['level'] = complevel
1392 compopts['level'] = complevel
1393
1393
1394 bundle2.writebundle(ui, cg, fname, bversion, compression=bcompression,
1394 bundle2.writebundle(ui, cg, fname, bversion, compression=bcompression,
1395 compopts=compopts)
1395 compopts=compopts)
1396
1396
1397 @command('cat',
1397 @command('cat',
1398 [('o', 'output', '',
1398 [('o', 'output', '',
1399 _('print output to file with formatted name'), _('FORMAT')),
1399 _('print output to file with formatted name'), _('FORMAT')),
1400 ('r', 'rev', '', _('print the given revision'), _('REV')),
1400 ('r', 'rev', '', _('print the given revision'), _('REV')),
1401 ('', 'decode', None, _('apply any matching decode filter')),
1401 ('', 'decode', None, _('apply any matching decode filter')),
1402 ] + walkopts,
1402 ] + walkopts,
1403 _('[OPTION]... FILE...'),
1403 _('[OPTION]... FILE...'),
1404 inferrepo=True)
1404 inferrepo=True)
1405 def cat(ui, repo, file1, *pats, **opts):
1405 def cat(ui, repo, file1, *pats, **opts):
1406 """output the current or given revision of files
1406 """output the current or given revision of files
1407
1407
1408 Print the specified files as they were at the given revision. If
1408 Print the specified files as they were at the given revision. If
1409 no revision is given, the parent of the working directory is used.
1409 no revision is given, the parent of the working directory is used.
1410
1410
1411 Output may be to a file, in which case the name of the file is
1411 Output may be to a file, in which case the name of the file is
1412 given using a format string. The formatting rules as follows:
1412 given using a format string. The formatting rules as follows:
1413
1413
1414 :``%%``: literal "%" character
1414 :``%%``: literal "%" character
1415 :``%s``: basename of file being printed
1415 :``%s``: basename of file being printed
1416 :``%d``: dirname of file being printed, or '.' if in repository root
1416 :``%d``: dirname of file being printed, or '.' if in repository root
1417 :``%p``: root-relative path name of file being printed
1417 :``%p``: root-relative path name of file being printed
1418 :``%H``: changeset hash (40 hexadecimal digits)
1418 :``%H``: changeset hash (40 hexadecimal digits)
1419 :``%R``: changeset revision number
1419 :``%R``: changeset revision number
1420 :``%h``: short-form changeset hash (12 hexadecimal digits)
1420 :``%h``: short-form changeset hash (12 hexadecimal digits)
1421 :``%r``: zero-padded changeset revision number
1421 :``%r``: zero-padded changeset revision number
1422 :``%b``: basename of the exporting repository
1422 :``%b``: basename of the exporting repository
1423
1423
1424 Returns 0 on success.
1424 Returns 0 on success.
1425 """
1425 """
1426 ctx = scmutil.revsingle(repo, opts.get('rev'))
1426 ctx = scmutil.revsingle(repo, opts.get('rev'))
1427 m = scmutil.match(ctx, (file1,) + pats, opts)
1427 m = scmutil.match(ctx, (file1,) + pats, opts)
1428
1428
1429 ui.pager('cat')
1429 ui.pager('cat')
1430 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1430 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1431
1431
1432 @command('^clone',
1432 @command('^clone',
1433 [('U', 'noupdate', None, _('the clone will include an empty working '
1433 [('U', 'noupdate', None, _('the clone will include an empty working '
1434 'directory (only a repository)')),
1434 'directory (only a repository)')),
1435 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1435 ('u', 'updaterev', '', _('revision, tag, or branch to check out'),
1436 _('REV')),
1436 _('REV')),
1437 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1437 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1438 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1438 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1439 ('', 'pull', None, _('use pull protocol to copy metadata')),
1439 ('', 'pull', None, _('use pull protocol to copy metadata')),
1440 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1440 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1441 ] + remoteopts,
1441 ] + remoteopts,
1442 _('[OPTION]... SOURCE [DEST]'),
1442 _('[OPTION]... SOURCE [DEST]'),
1443 norepo=True)
1443 norepo=True)
1444 def clone(ui, source, dest=None, **opts):
1444 def clone(ui, source, dest=None, **opts):
1445 """make a copy of an existing repository
1445 """make a copy of an existing repository
1446
1446
1447 Create a copy of an existing repository in a new directory.
1447 Create a copy of an existing repository in a new directory.
1448
1448
1449 If no destination directory name is specified, it defaults to the
1449 If no destination directory name is specified, it defaults to the
1450 basename of the source.
1450 basename of the source.
1451
1451
1452 The location of the source is added to the new repository's
1452 The location of the source is added to the new repository's
1453 ``.hg/hgrc`` file, as the default to be used for future pulls.
1453 ``.hg/hgrc`` file, as the default to be used for future pulls.
1454
1454
1455 Only local paths and ``ssh://`` URLs are supported as
1455 Only local paths and ``ssh://`` URLs are supported as
1456 destinations. For ``ssh://`` destinations, no working directory or
1456 destinations. For ``ssh://`` destinations, no working directory or
1457 ``.hg/hgrc`` will be created on the remote side.
1457 ``.hg/hgrc`` will be created on the remote side.
1458
1458
1459 If the source repository has a bookmark called '@' set, that
1459 If the source repository has a bookmark called '@' set, that
1460 revision will be checked out in the new repository by default.
1460 revision will be checked out in the new repository by default.
1461
1461
1462 To check out a particular version, use -u/--update, or
1462 To check out a particular version, use -u/--update, or
1463 -U/--noupdate to create a clone with no working directory.
1463 -U/--noupdate to create a clone with no working directory.
1464
1464
1465 To pull only a subset of changesets, specify one or more revisions
1465 To pull only a subset of changesets, specify one or more revisions
1466 identifiers with -r/--rev or branches with -b/--branch. The
1466 identifiers with -r/--rev or branches with -b/--branch. The
1467 resulting clone will contain only the specified changesets and
1467 resulting clone will contain only the specified changesets and
1468 their ancestors. These options (or 'clone src#rev dest') imply
1468 their ancestors. These options (or 'clone src#rev dest') imply
1469 --pull, even for local source repositories.
1469 --pull, even for local source repositories.
1470
1470
1471 .. note::
1471 .. note::
1472
1472
1473 Specifying a tag will include the tagged changeset but not the
1473 Specifying a tag will include the tagged changeset but not the
1474 changeset containing the tag.
1474 changeset containing the tag.
1475
1475
1476 .. container:: verbose
1476 .. container:: verbose
1477
1477
1478 For efficiency, hardlinks are used for cloning whenever the
1478 For efficiency, hardlinks are used for cloning whenever the
1479 source and destination are on the same filesystem (note this
1479 source and destination are on the same filesystem (note this
1480 applies only to the repository data, not to the working
1480 applies only to the repository data, not to the working
1481 directory). Some filesystems, such as AFS, implement hardlinking
1481 directory). Some filesystems, such as AFS, implement hardlinking
1482 incorrectly, but do not report errors. In these cases, use the
1482 incorrectly, but do not report errors. In these cases, use the
1483 --pull option to avoid hardlinking.
1483 --pull option to avoid hardlinking.
1484
1484
1485 In some cases, you can clone repositories and the working
1485 In some cases, you can clone repositories and the working
1486 directory using full hardlinks with ::
1486 directory using full hardlinks with ::
1487
1487
1488 $ cp -al REPO REPOCLONE
1488 $ cp -al REPO REPOCLONE
1489
1489
1490 This is the fastest way to clone, but it is not always safe. The
1490 This is the fastest way to clone, but it is not always safe. The
1491 operation is not atomic (making sure REPO is not modified during
1491 operation is not atomic (making sure REPO is not modified during
1492 the operation is up to you) and you have to make sure your
1492 the operation is up to you) and you have to make sure your
1493 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1493 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1494 so). Also, this is not compatible with certain extensions that
1494 so). Also, this is not compatible with certain extensions that
1495 place their metadata under the .hg directory, such as mq.
1495 place their metadata under the .hg directory, such as mq.
1496
1496
1497 Mercurial will update the working directory to the first applicable
1497 Mercurial will update the working directory to the first applicable
1498 revision from this list:
1498 revision from this list:
1499
1499
1500 a) null if -U or the source repository has no changesets
1500 a) null if -U or the source repository has no changesets
1501 b) if -u . and the source repository is local, the first parent of
1501 b) if -u . and the source repository is local, the first parent of
1502 the source repository's working directory
1502 the source repository's working directory
1503 c) the changeset specified with -u (if a branch name, this means the
1503 c) the changeset specified with -u (if a branch name, this means the
1504 latest head of that branch)
1504 latest head of that branch)
1505 d) the changeset specified with -r
1505 d) the changeset specified with -r
1506 e) the tipmost head specified with -b
1506 e) the tipmost head specified with -b
1507 f) the tipmost head specified with the url#branch source syntax
1507 f) the tipmost head specified with the url#branch source syntax
1508 g) the revision marked with the '@' bookmark, if present
1508 g) the revision marked with the '@' bookmark, if present
1509 h) the tipmost head of the default branch
1509 h) the tipmost head of the default branch
1510 i) tip
1510 i) tip
1511
1511
1512 When cloning from servers that support it, Mercurial may fetch
1512 When cloning from servers that support it, Mercurial may fetch
1513 pre-generated data from a server-advertised URL. When this is done,
1513 pre-generated data from a server-advertised URL. When this is done,
1514 hooks operating on incoming changesets and changegroups may fire twice,
1514 hooks operating on incoming changesets and changegroups may fire twice,
1515 once for the bundle fetched from the URL and another for any additional
1515 once for the bundle fetched from the URL and another for any additional
1516 data not fetched from this URL. In addition, if an error occurs, the
1516 data not fetched from this URL. In addition, if an error occurs, the
1517 repository may be rolled back to a partial clone. This behavior may
1517 repository may be rolled back to a partial clone. This behavior may
1518 change in future releases. See :hg:`help -e clonebundles` for more.
1518 change in future releases. See :hg:`help -e clonebundles` for more.
1519
1519
1520 Examples:
1520 Examples:
1521
1521
1522 - clone a remote repository to a new directory named hg/::
1522 - clone a remote repository to a new directory named hg/::
1523
1523
1524 hg clone https://www.mercurial-scm.org/repo/hg/
1524 hg clone https://www.mercurial-scm.org/repo/hg/
1525
1525
1526 - create a lightweight local clone::
1526 - create a lightweight local clone::
1527
1527
1528 hg clone project/ project-feature/
1528 hg clone project/ project-feature/
1529
1529
1530 - clone from an absolute path on an ssh server (note double-slash)::
1530 - clone from an absolute path on an ssh server (note double-slash)::
1531
1531
1532 hg clone ssh://user@server//home/projects/alpha/
1532 hg clone ssh://user@server//home/projects/alpha/
1533
1533
1534 - do a high-speed clone over a LAN while checking out a
1534 - do a high-speed clone over a LAN while checking out a
1535 specified version::
1535 specified version::
1536
1536
1537 hg clone --uncompressed http://server/repo -u 1.5
1537 hg clone --uncompressed http://server/repo -u 1.5
1538
1538
1539 - create a repository without changesets after a particular revision::
1539 - create a repository without changesets after a particular revision::
1540
1540
1541 hg clone -r 04e544 experimental/ good/
1541 hg clone -r 04e544 experimental/ good/
1542
1542
1543 - clone (and track) a particular named branch::
1543 - clone (and track) a particular named branch::
1544
1544
1545 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1545 hg clone https://www.mercurial-scm.org/repo/hg/#stable
1546
1546
1547 See :hg:`help urls` for details on specifying URLs.
1547 See :hg:`help urls` for details on specifying URLs.
1548
1548
1549 Returns 0 on success.
1549 Returns 0 on success.
1550 """
1550 """
1551 if opts.get('noupdate') and opts.get('updaterev'):
1551 if opts.get('noupdate') and opts.get('updaterev'):
1552 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1552 raise error.Abort(_("cannot specify both --noupdate and --updaterev"))
1553
1553
1554 r = hg.clone(ui, opts, source, dest,
1554 r = hg.clone(ui, opts, source, dest,
1555 pull=opts.get('pull'),
1555 pull=opts.get('pull'),
1556 stream=opts.get('uncompressed'),
1556 stream=opts.get('uncompressed'),
1557 rev=opts.get('rev'),
1557 rev=opts.get('rev'),
1558 update=opts.get('updaterev') or not opts.get('noupdate'),
1558 update=opts.get('updaterev') or not opts.get('noupdate'),
1559 branch=opts.get('branch'),
1559 branch=opts.get('branch'),
1560 shareopts=opts.get('shareopts'))
1560 shareopts=opts.get('shareopts'))
1561
1561
1562 return r is None
1562 return r is None
1563
1563
1564 @command('^commit|ci',
1564 @command('^commit|ci',
1565 [('A', 'addremove', None,
1565 [('A', 'addremove', None,
1566 _('mark new/missing files as added/removed before committing')),
1566 _('mark new/missing files as added/removed before committing')),
1567 ('', 'close-branch', None,
1567 ('', 'close-branch', None,
1568 _('mark a branch head as closed')),
1568 _('mark a branch head as closed')),
1569 ('', 'amend', None, _('amend the parent of the working directory')),
1569 ('', 'amend', None, _('amend the parent of the working directory')),
1570 ('s', 'secret', None, _('use the secret phase for committing')),
1570 ('s', 'secret', None, _('use the secret phase for committing')),
1571 ('e', 'edit', None, _('invoke editor on commit messages')),
1571 ('e', 'edit', None, _('invoke editor on commit messages')),
1572 ('i', 'interactive', None, _('use interactive mode')),
1572 ('i', 'interactive', None, _('use interactive mode')),
1573 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1573 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1574 _('[OPTION]... [FILE]...'),
1574 _('[OPTION]... [FILE]...'),
1575 inferrepo=True)
1575 inferrepo=True)
1576 def commit(ui, repo, *pats, **opts):
1576 def commit(ui, repo, *pats, **opts):
1577 """commit the specified files or all outstanding changes
1577 """commit the specified files or all outstanding changes
1578
1578
1579 Commit changes to the given files into the repository. Unlike a
1579 Commit changes to the given files into the repository. Unlike a
1580 centralized SCM, this operation is a local operation. See
1580 centralized SCM, this operation is a local operation. See
1581 :hg:`push` for a way to actively distribute your changes.
1581 :hg:`push` for a way to actively distribute your changes.
1582
1582
1583 If a list of files is omitted, all changes reported by :hg:`status`
1583 If a list of files is omitted, all changes reported by :hg:`status`
1584 will be committed.
1584 will be committed.
1585
1585
1586 If you are committing the result of a merge, do not provide any
1586 If you are committing the result of a merge, do not provide any
1587 filenames or -I/-X filters.
1587 filenames or -I/-X filters.
1588
1588
1589 If no commit message is specified, Mercurial starts your
1589 If no commit message is specified, Mercurial starts your
1590 configured editor where you can enter a message. In case your
1590 configured editor where you can enter a message. In case your
1591 commit fails, you will find a backup of your message in
1591 commit fails, you will find a backup of your message in
1592 ``.hg/last-message.txt``.
1592 ``.hg/last-message.txt``.
1593
1593
1594 The --close-branch flag can be used to mark the current branch
1594 The --close-branch flag can be used to mark the current branch
1595 head closed. When all heads of a branch are closed, the branch
1595 head closed. When all heads of a branch are closed, the branch
1596 will be considered closed and no longer listed.
1596 will be considered closed and no longer listed.
1597
1597
1598 The --amend flag can be used to amend the parent of the
1598 The --amend flag can be used to amend the parent of the
1599 working directory with a new commit that contains the changes
1599 working directory with a new commit that contains the changes
1600 in the parent in addition to those currently reported by :hg:`status`,
1600 in the parent in addition to those currently reported by :hg:`status`,
1601 if there are any. The old commit is stored in a backup bundle in
1601 if there are any. The old commit is stored in a backup bundle in
1602 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1602 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1603 on how to restore it).
1603 on how to restore it).
1604
1604
1605 Message, user and date are taken from the amended commit unless
1605 Message, user and date are taken from the amended commit unless
1606 specified. When a message isn't specified on the command line,
1606 specified. When a message isn't specified on the command line,
1607 the editor will open with the message of the amended commit.
1607 the editor will open with the message of the amended commit.
1608
1608
1609 It is not possible to amend public changesets (see :hg:`help phases`)
1609 It is not possible to amend public changesets (see :hg:`help phases`)
1610 or changesets that have children.
1610 or changesets that have children.
1611
1611
1612 See :hg:`help dates` for a list of formats valid for -d/--date.
1612 See :hg:`help dates` for a list of formats valid for -d/--date.
1613
1613
1614 Returns 0 on success, 1 if nothing changed.
1614 Returns 0 on success, 1 if nothing changed.
1615
1615
1616 .. container:: verbose
1616 .. container:: verbose
1617
1617
1618 Examples:
1618 Examples:
1619
1619
1620 - commit all files ending in .py::
1620 - commit all files ending in .py::
1621
1621
1622 hg commit --include "set:**.py"
1622 hg commit --include "set:**.py"
1623
1623
1624 - commit all non-binary files::
1624 - commit all non-binary files::
1625
1625
1626 hg commit --exclude "set:binary()"
1626 hg commit --exclude "set:binary()"
1627
1627
1628 - amend the current commit and set the date to now::
1628 - amend the current commit and set the date to now::
1629
1629
1630 hg commit --amend --date now
1630 hg commit --amend --date now
1631 """
1631 """
1632 wlock = lock = None
1632 wlock = lock = None
1633 try:
1633 try:
1634 wlock = repo.wlock()
1634 wlock = repo.wlock()
1635 lock = repo.lock()
1635 lock = repo.lock()
1636 return _docommit(ui, repo, *pats, **opts)
1636 return _docommit(ui, repo, *pats, **opts)
1637 finally:
1637 finally:
1638 release(lock, wlock)
1638 release(lock, wlock)
1639
1639
1640 def _docommit(ui, repo, *pats, **opts):
1640 def _docommit(ui, repo, *pats, **opts):
1641 opts = pycompat.byteskwargs(opts)
1641 opts = pycompat.byteskwargs(opts)
1642 if opts.get('interactive'):
1642 if opts.get('interactive'):
1643 opts.pop('interactive')
1643 opts.pop('interactive')
1644 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1644 ret = cmdutil.dorecord(ui, repo, commit, None, False,
1645 cmdutil.recordfilter, *pats,
1645 cmdutil.recordfilter, *pats,
1646 **pycompat.strkwargs(opts))
1646 **pycompat.strkwargs(opts))
1647 # ret can be 0 (no changes to record) or the value returned by
1647 # ret can be 0 (no changes to record) or the value returned by
1648 # commit(), 1 if nothing changed or None on success.
1648 # commit(), 1 if nothing changed or None on success.
1649 return 1 if ret == 0 else ret
1649 return 1 if ret == 0 else ret
1650
1650
1651 if opts.get('subrepos'):
1651 if opts.get('subrepos'):
1652 if opts.get('amend'):
1652 if opts.get('amend'):
1653 raise error.Abort(_('cannot amend with --subrepos'))
1653 raise error.Abort(_('cannot amend with --subrepos'))
1654 # Let --subrepos on the command line override config setting.
1654 # Let --subrepos on the command line override config setting.
1655 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1655 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1656
1656
1657 cmdutil.checkunfinished(repo, commit=True)
1657 cmdutil.checkunfinished(repo, commit=True)
1658
1658
1659 branch = repo[None].branch()
1659 branch = repo[None].branch()
1660 bheads = repo.branchheads(branch)
1660 bheads = repo.branchheads(branch)
1661
1661
1662 extra = {}
1662 extra = {}
1663 if opts.get('close_branch'):
1663 if opts.get('close_branch'):
1664 extra['close'] = 1
1664 extra['close'] = 1
1665
1665
1666 if not bheads:
1666 if not bheads:
1667 raise error.Abort(_('can only close branch heads'))
1667 raise error.Abort(_('can only close branch heads'))
1668 elif opts.get('amend'):
1668 elif opts.get('amend'):
1669 if repo[None].parents()[0].p1().branch() != branch and \
1669 if repo[None].parents()[0].p1().branch() != branch and \
1670 repo[None].parents()[0].p2().branch() != branch:
1670 repo[None].parents()[0].p2().branch() != branch:
1671 raise error.Abort(_('can only close branch heads'))
1671 raise error.Abort(_('can only close branch heads'))
1672
1672
1673 if opts.get('amend'):
1673 if opts.get('amend'):
1674 if ui.configbool('ui', 'commitsubrepos'):
1674 if ui.configbool('ui', 'commitsubrepos'):
1675 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1675 raise error.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1676
1676
1677 old = repo['.']
1677 old = repo['.']
1678 if not old.mutable():
1678 if not old.mutable():
1679 raise error.Abort(_('cannot amend public changesets'))
1679 raise error.Abort(_('cannot amend public changesets'))
1680 if len(repo[None].parents()) > 1:
1680 if len(repo[None].parents()) > 1:
1681 raise error.Abort(_('cannot amend while merging'))
1681 raise error.Abort(_('cannot amend while merging'))
1682 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1682 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1683 if not allowunstable and old.children():
1683 if not allowunstable and old.children():
1684 raise error.Abort(_('cannot amend changeset with children'))
1684 raise error.Abort(_('cannot amend changeset with children'))
1685
1685
1686 # Currently histedit gets confused if an amend happens while histedit
1686 # Currently histedit gets confused if an amend happens while histedit
1687 # is in progress. Since we have a checkunfinished command, we are
1687 # is in progress. Since we have a checkunfinished command, we are
1688 # temporarily honoring it.
1688 # temporarily honoring it.
1689 #
1689 #
1690 # Note: eventually this guard will be removed. Please do not expect
1690 # Note: eventually this guard will be removed. Please do not expect
1691 # this behavior to remain.
1691 # this behavior to remain.
1692 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1692 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
1693 cmdutil.checkunfinished(repo)
1693 cmdutil.checkunfinished(repo)
1694
1694
1695 # commitfunc is used only for temporary amend commit by cmdutil.amend
1695 # commitfunc is used only for temporary amend commit by cmdutil.amend
1696 def commitfunc(ui, repo, message, match, opts):
1696 def commitfunc(ui, repo, message, match, opts):
1697 return repo.commit(message,
1697 return repo.commit(message,
1698 opts.get('user') or old.user(),
1698 opts.get('user') or old.user(),
1699 opts.get('date') or old.date(),
1699 opts.get('date') or old.date(),
1700 match,
1700 match,
1701 extra=extra)
1701 extra=extra)
1702
1702
1703 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1703 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1704 if node == old.node():
1704 if node == old.node():
1705 ui.status(_("nothing changed\n"))
1705 ui.status(_("nothing changed\n"))
1706 return 1
1706 return 1
1707 else:
1707 else:
1708 def commitfunc(ui, repo, message, match, opts):
1708 def commitfunc(ui, repo, message, match, opts):
1709 overrides = {}
1709 overrides = {}
1710 if opts.get('secret'):
1710 if opts.get('secret'):
1711 overrides[('phases', 'new-commit')] = 'secret'
1711 overrides[('phases', 'new-commit')] = 'secret'
1712
1712
1713 baseui = repo.baseui
1713 baseui = repo.baseui
1714 with baseui.configoverride(overrides, 'commit'):
1714 with baseui.configoverride(overrides, 'commit'):
1715 with ui.configoverride(overrides, 'commit'):
1715 with ui.configoverride(overrides, 'commit'):
1716 editform = cmdutil.mergeeditform(repo[None],
1716 editform = cmdutil.mergeeditform(repo[None],
1717 'commit.normal')
1717 'commit.normal')
1718 editor = cmdutil.getcommiteditor(
1718 editor = cmdutil.getcommiteditor(
1719 editform=editform, **pycompat.strkwargs(opts))
1719 editform=editform, **pycompat.strkwargs(opts))
1720 return repo.commit(message,
1720 return repo.commit(message,
1721 opts.get('user'),
1721 opts.get('user'),
1722 opts.get('date'),
1722 opts.get('date'),
1723 match,
1723 match,
1724 editor=editor,
1724 editor=editor,
1725 extra=extra)
1725 extra=extra)
1726
1726
1727 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1727 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1728
1728
1729 if not node:
1729 if not node:
1730 stat = cmdutil.postcommitstatus(repo, pats, opts)
1730 stat = cmdutil.postcommitstatus(repo, pats, opts)
1731 if stat[3]:
1731 if stat[3]:
1732 ui.status(_("nothing changed (%d missing files, see "
1732 ui.status(_("nothing changed (%d missing files, see "
1733 "'hg status')\n") % len(stat[3]))
1733 "'hg status')\n") % len(stat[3]))
1734 else:
1734 else:
1735 ui.status(_("nothing changed\n"))
1735 ui.status(_("nothing changed\n"))
1736 return 1
1736 return 1
1737
1737
1738 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1738 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1739
1739
1740 @command('config|showconfig|debugconfig',
1740 @command('config|showconfig|debugconfig',
1741 [('u', 'untrusted', None, _('show untrusted configuration options')),
1741 [('u', 'untrusted', None, _('show untrusted configuration options')),
1742 ('e', 'edit', None, _('edit user config')),
1742 ('e', 'edit', None, _('edit user config')),
1743 ('l', 'local', None, _('edit repository config')),
1743 ('l', 'local', None, _('edit repository config')),
1744 ('g', 'global', None, _('edit global config'))] + formatteropts,
1744 ('g', 'global', None, _('edit global config'))] + formatteropts,
1745 _('[-u] [NAME]...'),
1745 _('[-u] [NAME]...'),
1746 optionalrepo=True)
1746 optionalrepo=True)
1747 def config(ui, repo, *values, **opts):
1747 def config(ui, repo, *values, **opts):
1748 """show combined config settings from all hgrc files
1748 """show combined config settings from all hgrc files
1749
1749
1750 With no arguments, print names and values of all config items.
1750 With no arguments, print names and values of all config items.
1751
1751
1752 With one argument of the form section.name, print just the value
1752 With one argument of the form section.name, print just the value
1753 of that config item.
1753 of that config item.
1754
1754
1755 With multiple arguments, print names and values of all config
1755 With multiple arguments, print names and values of all config
1756 items with matching section names.
1756 items with matching section names.
1757
1757
1758 With --edit, start an editor on the user-level config file. With
1758 With --edit, start an editor on the user-level config file. With
1759 --global, edit the system-wide config file. With --local, edit the
1759 --global, edit the system-wide config file. With --local, edit the
1760 repository-level config file.
1760 repository-level config file.
1761
1761
1762 With --debug, the source (filename and line number) is printed
1762 With --debug, the source (filename and line number) is printed
1763 for each config item.
1763 for each config item.
1764
1764
1765 See :hg:`help config` for more information about config files.
1765 See :hg:`help config` for more information about config files.
1766
1766
1767 Returns 0 on success, 1 if NAME does not exist.
1767 Returns 0 on success, 1 if NAME does not exist.
1768
1768
1769 """
1769 """
1770
1770
1771 if opts.get('edit') or opts.get('local') or opts.get('global'):
1771 if opts.get('edit') or opts.get('local') or opts.get('global'):
1772 if opts.get('local') and opts.get('global'):
1772 if opts.get('local') and opts.get('global'):
1773 raise error.Abort(_("can't use --local and --global together"))
1773 raise error.Abort(_("can't use --local and --global together"))
1774
1774
1775 if opts.get('local'):
1775 if opts.get('local'):
1776 if not repo:
1776 if not repo:
1777 raise error.Abort(_("can't use --local outside a repository"))
1777 raise error.Abort(_("can't use --local outside a repository"))
1778 paths = [repo.vfs.join('hgrc')]
1778 paths = [repo.vfs.join('hgrc')]
1779 elif opts.get('global'):
1779 elif opts.get('global'):
1780 paths = rcutil.systemrcpath()
1780 paths = rcutil.systemrcpath()
1781 else:
1781 else:
1782 paths = rcutil.userrcpath()
1782 paths = rcutil.userrcpath()
1783
1783
1784 for f in paths:
1784 for f in paths:
1785 if os.path.exists(f):
1785 if os.path.exists(f):
1786 break
1786 break
1787 else:
1787 else:
1788 if opts.get('global'):
1788 if opts.get('global'):
1789 samplehgrc = uimod.samplehgrcs['global']
1789 samplehgrc = uimod.samplehgrcs['global']
1790 elif opts.get('local'):
1790 elif opts.get('local'):
1791 samplehgrc = uimod.samplehgrcs['local']
1791 samplehgrc = uimod.samplehgrcs['local']
1792 else:
1792 else:
1793 samplehgrc = uimod.samplehgrcs['user']
1793 samplehgrc = uimod.samplehgrcs['user']
1794
1794
1795 f = paths[0]
1795 f = paths[0]
1796 fp = open(f, "w")
1796 fp = open(f, "w")
1797 fp.write(samplehgrc)
1797 fp.write(samplehgrc)
1798 fp.close()
1798 fp.close()
1799
1799
1800 editor = ui.geteditor()
1800 editor = ui.geteditor()
1801 ui.system("%s \"%s\"" % (editor, f),
1801 ui.system("%s \"%s\"" % (editor, f),
1802 onerr=error.Abort, errprefix=_("edit failed"),
1802 onerr=error.Abort, errprefix=_("edit failed"),
1803 blockedtag='config_edit')
1803 blockedtag='config_edit')
1804 return
1804 return
1805 ui.pager('config')
1805 ui.pager('config')
1806 fm = ui.formatter('config', opts)
1806 fm = ui.formatter('config', opts)
1807 for t, f in rcutil.rccomponents():
1807 for t, f in rcutil.rccomponents():
1808 if t == 'path':
1808 if t == 'path':
1809 ui.debug('read config from: %s\n' % f)
1809 ui.debug('read config from: %s\n' % f)
1810 elif t == 'items':
1810 elif t == 'items':
1811 pass
1811 for section, name, value, source in f:
1812 ui.debug('set config by: %s\n' % source)
1812 else:
1813 else:
1813 raise error.ProgrammingError('unknown rctype: %s' % t)
1814 raise error.ProgrammingError('unknown rctype: %s' % t)
1814 untrusted = bool(opts.get('untrusted'))
1815 untrusted = bool(opts.get('untrusted'))
1815 if values:
1816 if values:
1816 sections = [v for v in values if '.' not in v]
1817 sections = [v for v in values if '.' not in v]
1817 items = [v for v in values if '.' in v]
1818 items = [v for v in values if '.' in v]
1818 if len(items) > 1 or items and sections:
1819 if len(items) > 1 or items and sections:
1819 raise error.Abort(_('only one config item permitted'))
1820 raise error.Abort(_('only one config item permitted'))
1820 matched = False
1821 matched = False
1821 for section, name, value in ui.walkconfig(untrusted=untrusted):
1822 for section, name, value in ui.walkconfig(untrusted=untrusted):
1822 source = ui.configsource(section, name, untrusted)
1823 source = ui.configsource(section, name, untrusted)
1823 value = pycompat.bytestr(value)
1824 value = pycompat.bytestr(value)
1824 if fm.isplain():
1825 if fm.isplain():
1825 source = source or 'none'
1826 source = source or 'none'
1826 value = value.replace('\n', '\\n')
1827 value = value.replace('\n', '\\n')
1827 entryname = section + '.' + name
1828 entryname = section + '.' + name
1828 if values:
1829 if values:
1829 for v in values:
1830 for v in values:
1830 if v == section:
1831 if v == section:
1831 fm.startitem()
1832 fm.startitem()
1832 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1833 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1833 fm.write('name value', '%s=%s\n', entryname, value)
1834 fm.write('name value', '%s=%s\n', entryname, value)
1834 matched = True
1835 matched = True
1835 elif v == entryname:
1836 elif v == entryname:
1836 fm.startitem()
1837 fm.startitem()
1837 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1838 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1838 fm.write('value', '%s\n', value)
1839 fm.write('value', '%s\n', value)
1839 fm.data(name=entryname)
1840 fm.data(name=entryname)
1840 matched = True
1841 matched = True
1841 else:
1842 else:
1842 fm.startitem()
1843 fm.startitem()
1843 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1844 fm.condwrite(ui.debugflag, 'source', '%s: ', source)
1844 fm.write('name value', '%s=%s\n', entryname, value)
1845 fm.write('name value', '%s=%s\n', entryname, value)
1845 matched = True
1846 matched = True
1846 fm.end()
1847 fm.end()
1847 if matched:
1848 if matched:
1848 return 0
1849 return 0
1849 return 1
1850 return 1
1850
1851
1851 @command('copy|cp',
1852 @command('copy|cp',
1852 [('A', 'after', None, _('record a copy that has already occurred')),
1853 [('A', 'after', None, _('record a copy that has already occurred')),
1853 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1854 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1854 ] + walkopts + dryrunopts,
1855 ] + walkopts + dryrunopts,
1855 _('[OPTION]... [SOURCE]... DEST'))
1856 _('[OPTION]... [SOURCE]... DEST'))
1856 def copy(ui, repo, *pats, **opts):
1857 def copy(ui, repo, *pats, **opts):
1857 """mark files as copied for the next commit
1858 """mark files as copied for the next commit
1858
1859
1859 Mark dest as having copies of source files. If dest is a
1860 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,
1861 directory, copies are put in that directory. If dest is a file,
1861 the source must be a single file.
1862 the source must be a single file.
1862
1863
1863 By default, this command copies the contents of files as they
1864 By default, this command copies the contents of files as they
1864 exist in the working directory. If invoked with -A/--after, the
1865 exist in the working directory. If invoked with -A/--after, the
1865 operation is recorded, but no copying is performed.
1866 operation is recorded, but no copying is performed.
1866
1867
1867 This command takes effect with the next commit. To undo a copy
1868 This command takes effect with the next commit. To undo a copy
1868 before that, see :hg:`revert`.
1869 before that, see :hg:`revert`.
1869
1870
1870 Returns 0 on success, 1 if errors are encountered.
1871 Returns 0 on success, 1 if errors are encountered.
1871 """
1872 """
1872 with repo.wlock(False):
1873 with repo.wlock(False):
1873 return cmdutil.copy(ui, repo, pats, opts)
1874 return cmdutil.copy(ui, repo, pats, opts)
1874
1875
1875 @command('^diff',
1876 @command('^diff',
1876 [('r', 'rev', [], _('revision'), _('REV')),
1877 [('r', 'rev', [], _('revision'), _('REV')),
1877 ('c', 'change', '', _('change made by revision'), _('REV'))
1878 ('c', 'change', '', _('change made by revision'), _('REV'))
1878 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1879 ] + diffopts + diffopts2 + walkopts + subrepoopts,
1879 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1880 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
1880 inferrepo=True)
1881 inferrepo=True)
1881 def diff(ui, repo, *pats, **opts):
1882 def diff(ui, repo, *pats, **opts):
1882 """diff repository (or selected files)
1883 """diff repository (or selected files)
1883
1884
1884 Show differences between revisions for the specified files.
1885 Show differences between revisions for the specified files.
1885
1886
1886 Differences between files are shown using the unified diff format.
1887 Differences between files are shown using the unified diff format.
1887
1888
1888 .. note::
1889 .. note::
1889
1890
1890 :hg:`diff` may generate unexpected results for merges, as it will
1891 :hg:`diff` may generate unexpected results for merges, as it will
1891 default to comparing against the working directory's first
1892 default to comparing against the working directory's first
1892 parent changeset if no revisions are specified.
1893 parent changeset if no revisions are specified.
1893
1894
1894 When two revision arguments are given, then changes are shown
1895 When two revision arguments are given, then changes are shown
1895 between those revisions. If only one revision is specified then
1896 between those revisions. If only one revision is specified then
1896 that revision is compared to the working directory, and, when no
1897 that revision is compared to the working directory, and, when no
1897 revisions are specified, the working directory files are compared
1898 revisions are specified, the working directory files are compared
1898 to its first parent.
1899 to its first parent.
1899
1900
1900 Alternatively you can specify -c/--change with a revision to see
1901 Alternatively you can specify -c/--change with a revision to see
1901 the changes in that changeset relative to its first parent.
1902 the changes in that changeset relative to its first parent.
1902
1903
1903 Without the -a/--text option, diff will avoid generating diffs of
1904 Without the -a/--text option, diff will avoid generating diffs of
1904 files it detects as binary. With -a, diff will generate a diff
1905 files it detects as binary. With -a, diff will generate a diff
1905 anyway, probably with undesirable results.
1906 anyway, probably with undesirable results.
1906
1907
1907 Use the -g/--git option to generate diffs in the git extended diff
1908 Use the -g/--git option to generate diffs in the git extended diff
1908 format. For more information, read :hg:`help diffs`.
1909 format. For more information, read :hg:`help diffs`.
1909
1910
1910 .. container:: verbose
1911 .. container:: verbose
1911
1912
1912 Examples:
1913 Examples:
1913
1914
1914 - compare a file in the current working directory to its parent::
1915 - compare a file in the current working directory to its parent::
1915
1916
1916 hg diff foo.c
1917 hg diff foo.c
1917
1918
1918 - compare two historical versions of a directory, with rename info::
1919 - compare two historical versions of a directory, with rename info::
1919
1920
1920 hg diff --git -r 1.0:1.2 lib/
1921 hg diff --git -r 1.0:1.2 lib/
1921
1922
1922 - get change stats relative to the last change on some date::
1923 - get change stats relative to the last change on some date::
1923
1924
1924 hg diff --stat -r "date('may 2')"
1925 hg diff --stat -r "date('may 2')"
1925
1926
1926 - diff all newly-added files that contain a keyword::
1927 - diff all newly-added files that contain a keyword::
1927
1928
1928 hg diff "set:added() and grep(GNU)"
1929 hg diff "set:added() and grep(GNU)"
1929
1930
1930 - compare a revision and its parents::
1931 - compare a revision and its parents::
1931
1932
1932 hg diff -c 9353 # compare against first parent
1933 hg diff -c 9353 # compare against first parent
1933 hg diff -r 9353^:9353 # same using revset syntax
1934 hg diff -r 9353^:9353 # same using revset syntax
1934 hg diff -r 9353^2:9353 # compare against the second parent
1935 hg diff -r 9353^2:9353 # compare against the second parent
1935
1936
1936 Returns 0 on success.
1937 Returns 0 on success.
1937 """
1938 """
1938
1939
1939 revs = opts.get('rev')
1940 revs = opts.get('rev')
1940 change = opts.get('change')
1941 change = opts.get('change')
1941 stat = opts.get('stat')
1942 stat = opts.get('stat')
1942 reverse = opts.get('reverse')
1943 reverse = opts.get('reverse')
1943
1944
1944 if revs and change:
1945 if revs and change:
1945 msg = _('cannot specify --rev and --change at the same time')
1946 msg = _('cannot specify --rev and --change at the same time')
1946 raise error.Abort(msg)
1947 raise error.Abort(msg)
1947 elif change:
1948 elif change:
1948 node2 = scmutil.revsingle(repo, change, None).node()
1949 node2 = scmutil.revsingle(repo, change, None).node()
1949 node1 = repo[node2].p1().node()
1950 node1 = repo[node2].p1().node()
1950 else:
1951 else:
1951 node1, node2 = scmutil.revpair(repo, revs)
1952 node1, node2 = scmutil.revpair(repo, revs)
1952
1953
1953 if reverse:
1954 if reverse:
1954 node1, node2 = node2, node1
1955 node1, node2 = node2, node1
1955
1956
1956 diffopts = patch.diffallopts(ui, opts)
1957 diffopts = patch.diffallopts(ui, opts)
1957 m = scmutil.match(repo[node2], pats, opts)
1958 m = scmutil.match(repo[node2], pats, opts)
1958 ui.pager('diff')
1959 ui.pager('diff')
1959 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1960 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1960 listsubrepos=opts.get('subrepos'),
1961 listsubrepos=opts.get('subrepos'),
1961 root=opts.get('root'))
1962 root=opts.get('root'))
1962
1963
1963 @command('^export',
1964 @command('^export',
1964 [('o', 'output', '',
1965 [('o', 'output', '',
1965 _('print output to file with formatted name'), _('FORMAT')),
1966 _('print output to file with formatted name'), _('FORMAT')),
1966 ('', 'switch-parent', None, _('diff against the second parent')),
1967 ('', 'switch-parent', None, _('diff against the second parent')),
1967 ('r', 'rev', [], _('revisions to export'), _('REV')),
1968 ('r', 'rev', [], _('revisions to export'), _('REV')),
1968 ] + diffopts,
1969 ] + diffopts,
1969 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
1970 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
1970 def export(ui, repo, *changesets, **opts):
1971 def export(ui, repo, *changesets, **opts):
1971 """dump the header and diffs for one or more changesets
1972 """dump the header and diffs for one or more changesets
1972
1973
1973 Print the changeset header and diffs for one or more revisions.
1974 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.
1975 If no revision is given, the parent of the working directory is used.
1975
1976
1976 The information shown in the changeset header is: author, date,
1977 The information shown in the changeset header is: author, date,
1977 branch name (if non-default), changeset hash, parent(s) and commit
1978 branch name (if non-default), changeset hash, parent(s) and commit
1978 comment.
1979 comment.
1979
1980
1980 .. note::
1981 .. note::
1981
1982
1982 :hg:`export` may generate unexpected diff output for merge
1983 :hg:`export` may generate unexpected diff output for merge
1983 changesets, as it will compare the merge changeset against its
1984 changesets, as it will compare the merge changeset against its
1984 first parent only.
1985 first parent only.
1985
1986
1986 Output may be to a file, in which case the name of the file is
1987 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:
1988 given using a format string. The formatting rules are as follows:
1988
1989
1989 :``%%``: literal "%" character
1990 :``%%``: literal "%" character
1990 :``%H``: changeset hash (40 hexadecimal digits)
1991 :``%H``: changeset hash (40 hexadecimal digits)
1991 :``%N``: number of patches being generated
1992 :``%N``: number of patches being generated
1992 :``%R``: changeset revision number
1993 :``%R``: changeset revision number
1993 :``%b``: basename of the exporting repository
1994 :``%b``: basename of the exporting repository
1994 :``%h``: short-form changeset hash (12 hexadecimal digits)
1995 :``%h``: short-form changeset hash (12 hexadecimal digits)
1995 :``%m``: first line of the commit message (only alphanumeric characters)
1996 :``%m``: first line of the commit message (only alphanumeric characters)
1996 :``%n``: zero-padded sequence number, starting at 1
1997 :``%n``: zero-padded sequence number, starting at 1
1997 :``%r``: zero-padded changeset revision number
1998 :``%r``: zero-padded changeset revision number
1998
1999
1999 Without the -a/--text option, export will avoid generating diffs
2000 Without the -a/--text option, export will avoid generating diffs
2000 of files it detects as binary. With -a, export will generate a
2001 of files it detects as binary. With -a, export will generate a
2001 diff anyway, probably with undesirable results.
2002 diff anyway, probably with undesirable results.
2002
2003
2003 Use the -g/--git option to generate diffs in the git extended diff
2004 Use the -g/--git option to generate diffs in the git extended diff
2004 format. See :hg:`help diffs` for more information.
2005 format. See :hg:`help diffs` for more information.
2005
2006
2006 With the --switch-parent option, the diff will be against the
2007 With the --switch-parent option, the diff will be against the
2007 second parent. It can be useful to review a merge.
2008 second parent. It can be useful to review a merge.
2008
2009
2009 .. container:: verbose
2010 .. container:: verbose
2010
2011
2011 Examples:
2012 Examples:
2012
2013
2013 - use export and import to transplant a bugfix to the current
2014 - use export and import to transplant a bugfix to the current
2014 branch::
2015 branch::
2015
2016
2016 hg export -r 9353 | hg import -
2017 hg export -r 9353 | hg import -
2017
2018
2018 - export all the changesets between two revisions to a file with
2019 - export all the changesets between two revisions to a file with
2019 rename information::
2020 rename information::
2020
2021
2021 hg export --git -r 123:150 > changes.txt
2022 hg export --git -r 123:150 > changes.txt
2022
2023
2023 - split outgoing changes into a series of patches with
2024 - split outgoing changes into a series of patches with
2024 descriptive names::
2025 descriptive names::
2025
2026
2026 hg export -r "outgoing()" -o "%n-%m.patch"
2027 hg export -r "outgoing()" -o "%n-%m.patch"
2027
2028
2028 Returns 0 on success.
2029 Returns 0 on success.
2029 """
2030 """
2030 changesets += tuple(opts.get('rev', []))
2031 changesets += tuple(opts.get('rev', []))
2031 if not changesets:
2032 if not changesets:
2032 changesets = ['.']
2033 changesets = ['.']
2033 revs = scmutil.revrange(repo, changesets)
2034 revs = scmutil.revrange(repo, changesets)
2034 if not revs:
2035 if not revs:
2035 raise error.Abort(_("export requires at least one changeset"))
2036 raise error.Abort(_("export requires at least one changeset"))
2036 if len(revs) > 1:
2037 if len(revs) > 1:
2037 ui.note(_('exporting patches:\n'))
2038 ui.note(_('exporting patches:\n'))
2038 else:
2039 else:
2039 ui.note(_('exporting patch:\n'))
2040 ui.note(_('exporting patch:\n'))
2040 ui.pager('export')
2041 ui.pager('export')
2041 cmdutil.export(repo, revs, template=opts.get('output'),
2042 cmdutil.export(repo, revs, template=opts.get('output'),
2042 switch_parent=opts.get('switch_parent'),
2043 switch_parent=opts.get('switch_parent'),
2043 opts=patch.diffallopts(ui, opts))
2044 opts=patch.diffallopts(ui, opts))
2044
2045
2045 @command('files',
2046 @command('files',
2046 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
2047 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
2047 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
2048 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
2048 ] + walkopts + formatteropts + subrepoopts,
2049 ] + walkopts + formatteropts + subrepoopts,
2049 _('[OPTION]... [FILE]...'))
2050 _('[OPTION]... [FILE]...'))
2050 def files(ui, repo, *pats, **opts):
2051 def files(ui, repo, *pats, **opts):
2051 """list tracked files
2052 """list tracked files
2052
2053
2053 Print files under Mercurial control in the working directory or
2054 Print files under Mercurial control in the working directory or
2054 specified revision for given files (excluding removed files).
2055 specified revision for given files (excluding removed files).
2055 Files can be specified as filenames or filesets.
2056 Files can be specified as filenames or filesets.
2056
2057
2057 If no files are given to match, this command prints the names
2058 If no files are given to match, this command prints the names
2058 of all files under Mercurial control.
2059 of all files under Mercurial control.
2059
2060
2060 .. container:: verbose
2061 .. container:: verbose
2061
2062
2062 Examples:
2063 Examples:
2063
2064
2064 - list all files under the current directory::
2065 - list all files under the current directory::
2065
2066
2066 hg files .
2067 hg files .
2067
2068
2068 - shows sizes and flags for current revision::
2069 - shows sizes and flags for current revision::
2069
2070
2070 hg files -vr .
2071 hg files -vr .
2071
2072
2072 - list all files named README::
2073 - list all files named README::
2073
2074
2074 hg files -I "**/README"
2075 hg files -I "**/README"
2075
2076
2076 - list all binary files::
2077 - list all binary files::
2077
2078
2078 hg files "set:binary()"
2079 hg files "set:binary()"
2079
2080
2080 - find files containing a regular expression::
2081 - find files containing a regular expression::
2081
2082
2082 hg files "set:grep('bob')"
2083 hg files "set:grep('bob')"
2083
2084
2084 - search tracked file contents with xargs and grep::
2085 - search tracked file contents with xargs and grep::
2085
2086
2086 hg files -0 | xargs -0 grep foo
2087 hg files -0 | xargs -0 grep foo
2087
2088
2088 See :hg:`help patterns` and :hg:`help filesets` for more information
2089 See :hg:`help patterns` and :hg:`help filesets` for more information
2089 on specifying file patterns.
2090 on specifying file patterns.
2090
2091
2091 Returns 0 if a match is found, 1 otherwise.
2092 Returns 0 if a match is found, 1 otherwise.
2092
2093
2093 """
2094 """
2094 ctx = scmutil.revsingle(repo, opts.get(r'rev'), None)
2095 ctx = scmutil.revsingle(repo, opts.get(r'rev'), None)
2095
2096
2096 end = '\n'
2097 end = '\n'
2097 if opts.get('print0'):
2098 if opts.get('print0'):
2098 end = '\0'
2099 end = '\0'
2099 fmt = '%s' + end
2100 fmt = '%s' + end
2100
2101
2101 m = scmutil.match(ctx, pats, opts)
2102 m = scmutil.match(ctx, pats, opts)
2102 ui.pager('files')
2103 ui.pager('files')
2103 with ui.formatter('files', opts) as fm:
2104 with ui.formatter('files', opts) as fm:
2104 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
2105 return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos'))
2105
2106
2106 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
2107 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
2107 def forget(ui, repo, *pats, **opts):
2108 def forget(ui, repo, *pats, **opts):
2108 """forget the specified files on the next commit
2109 """forget the specified files on the next commit
2109
2110
2110 Mark the specified files so they will no longer be tracked
2111 Mark the specified files so they will no longer be tracked
2111 after the next commit.
2112 after the next commit.
2112
2113
2113 This only removes files from the current branch, not from the
2114 This only removes files from the current branch, not from the
2114 entire project history, and it does not delete them from the
2115 entire project history, and it does not delete them from the
2115 working directory.
2116 working directory.
2116
2117
2117 To delete the file from the working directory, see :hg:`remove`.
2118 To delete the file from the working directory, see :hg:`remove`.
2118
2119
2119 To undo a forget before the next commit, see :hg:`add`.
2120 To undo a forget before the next commit, see :hg:`add`.
2120
2121
2121 .. container:: verbose
2122 .. container:: verbose
2122
2123
2123 Examples:
2124 Examples:
2124
2125
2125 - forget newly-added binary files::
2126 - forget newly-added binary files::
2126
2127
2127 hg forget "set:added() and binary()"
2128 hg forget "set:added() and binary()"
2128
2129
2129 - forget files that would be excluded by .hgignore::
2130 - forget files that would be excluded by .hgignore::
2130
2131
2131 hg forget "set:hgignore()"
2132 hg forget "set:hgignore()"
2132
2133
2133 Returns 0 on success.
2134 Returns 0 on success.
2134 """
2135 """
2135
2136
2136 if not pats:
2137 if not pats:
2137 raise error.Abort(_('no files specified'))
2138 raise error.Abort(_('no files specified'))
2138
2139
2139 m = scmutil.match(repo[None], pats, opts)
2140 m = scmutil.match(repo[None], pats, opts)
2140 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2141 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2141 return rejected and 1 or 0
2142 return rejected and 1 or 0
2142
2143
2143 @command(
2144 @command(
2144 'graft',
2145 'graft',
2145 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2146 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2146 ('c', 'continue', False, _('resume interrupted graft')),
2147 ('c', 'continue', False, _('resume interrupted graft')),
2147 ('e', 'edit', False, _('invoke editor on commit messages')),
2148 ('e', 'edit', False, _('invoke editor on commit messages')),
2148 ('', 'log', None, _('append graft info to log message')),
2149 ('', 'log', None, _('append graft info to log message')),
2149 ('f', 'force', False, _('force graft')),
2150 ('f', 'force', False, _('force graft')),
2150 ('D', 'currentdate', False,
2151 ('D', 'currentdate', False,
2151 _('record the current date as commit date')),
2152 _('record the current date as commit date')),
2152 ('U', 'currentuser', False,
2153 ('U', 'currentuser', False,
2153 _('record the current user as committer'), _('DATE'))]
2154 _('record the current user as committer'), _('DATE'))]
2154 + commitopts2 + mergetoolopts + dryrunopts,
2155 + commitopts2 + mergetoolopts + dryrunopts,
2155 _('[OPTION]... [-r REV]... REV...'))
2156 _('[OPTION]... [-r REV]... REV...'))
2156 def graft(ui, repo, *revs, **opts):
2157 def graft(ui, repo, *revs, **opts):
2157 '''copy changes from other branches onto the current branch
2158 '''copy changes from other branches onto the current branch
2158
2159
2159 This command uses Mercurial's merge logic to copy individual
2160 This command uses Mercurial's merge logic to copy individual
2160 changes from other branches without merging branches in the
2161 changes from other branches without merging branches in the
2161 history graph. This is sometimes known as 'backporting' or
2162 history graph. This is sometimes known as 'backporting' or
2162 'cherry-picking'. By default, graft will copy user, date, and
2163 'cherry-picking'. By default, graft will copy user, date, and
2163 description from the source changesets.
2164 description from the source changesets.
2164
2165
2165 Changesets that are ancestors of the current revision, that have
2166 Changesets that are ancestors of the current revision, that have
2166 already been grafted, or that are merges will be skipped.
2167 already been grafted, or that are merges will be skipped.
2167
2168
2168 If --log is specified, log messages will have a comment appended
2169 If --log is specified, log messages will have a comment appended
2169 of the form::
2170 of the form::
2170
2171
2171 (grafted from CHANGESETHASH)
2172 (grafted from CHANGESETHASH)
2172
2173
2173 If --force is specified, revisions will be grafted even if they
2174 If --force is specified, revisions will be grafted even if they
2174 are already ancestors of or have been grafted to the destination.
2175 are already ancestors of or have been grafted to the destination.
2175 This is useful when the revisions have since been backed out.
2176 This is useful when the revisions have since been backed out.
2176
2177
2177 If a graft merge results in conflicts, the graft process is
2178 If a graft merge results in conflicts, the graft process is
2178 interrupted so that the current merge can be manually resolved.
2179 interrupted so that the current merge can be manually resolved.
2179 Once all conflicts are addressed, the graft process can be
2180 Once all conflicts are addressed, the graft process can be
2180 continued with the -c/--continue option.
2181 continued with the -c/--continue option.
2181
2182
2182 .. note::
2183 .. note::
2183
2184
2184 The -c/--continue option does not reapply earlier options, except
2185 The -c/--continue option does not reapply earlier options, except
2185 for --force.
2186 for --force.
2186
2187
2187 .. container:: verbose
2188 .. container:: verbose
2188
2189
2189 Examples:
2190 Examples:
2190
2191
2191 - copy a single change to the stable branch and edit its description::
2192 - copy a single change to the stable branch and edit its description::
2192
2193
2193 hg update stable
2194 hg update stable
2194 hg graft --edit 9393
2195 hg graft --edit 9393
2195
2196
2196 - graft a range of changesets with one exception, updating dates::
2197 - graft a range of changesets with one exception, updating dates::
2197
2198
2198 hg graft -D "2085::2093 and not 2091"
2199 hg graft -D "2085::2093 and not 2091"
2199
2200
2200 - continue a graft after resolving conflicts::
2201 - continue a graft after resolving conflicts::
2201
2202
2202 hg graft -c
2203 hg graft -c
2203
2204
2204 - show the source of a grafted changeset::
2205 - show the source of a grafted changeset::
2205
2206
2206 hg log --debug -r .
2207 hg log --debug -r .
2207
2208
2208 - show revisions sorted by date::
2209 - show revisions sorted by date::
2209
2210
2210 hg log -r "sort(all(), date)"
2211 hg log -r "sort(all(), date)"
2211
2212
2212 See :hg:`help revisions` for more about specifying revisions.
2213 See :hg:`help revisions` for more about specifying revisions.
2213
2214
2214 Returns 0 on successful completion.
2215 Returns 0 on successful completion.
2215 '''
2216 '''
2216 with repo.wlock():
2217 with repo.wlock():
2217 return _dograft(ui, repo, *revs, **opts)
2218 return _dograft(ui, repo, *revs, **opts)
2218
2219
2219 def _dograft(ui, repo, *revs, **opts):
2220 def _dograft(ui, repo, *revs, **opts):
2220 if revs and opts.get('rev'):
2221 if revs and opts.get('rev'):
2221 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2222 ui.warn(_('warning: inconsistent use of --rev might give unexpected '
2222 'revision ordering!\n'))
2223 'revision ordering!\n'))
2223
2224
2224 revs = list(revs)
2225 revs = list(revs)
2225 revs.extend(opts.get('rev'))
2226 revs.extend(opts.get('rev'))
2226
2227
2227 if not opts.get('user') and opts.get('currentuser'):
2228 if not opts.get('user') and opts.get('currentuser'):
2228 opts['user'] = ui.username()
2229 opts['user'] = ui.username()
2229 if not opts.get('date') and opts.get('currentdate'):
2230 if not opts.get('date') and opts.get('currentdate'):
2230 opts['date'] = "%d %d" % util.makedate()
2231 opts['date'] = "%d %d" % util.makedate()
2231
2232
2232 editor = cmdutil.getcommiteditor(editform='graft', **opts)
2233 editor = cmdutil.getcommiteditor(editform='graft', **opts)
2233
2234
2234 cont = False
2235 cont = False
2235 if opts.get('continue'):
2236 if opts.get('continue'):
2236 cont = True
2237 cont = True
2237 if revs:
2238 if revs:
2238 raise error.Abort(_("can't specify --continue and revisions"))
2239 raise error.Abort(_("can't specify --continue and revisions"))
2239 # read in unfinished revisions
2240 # read in unfinished revisions
2240 try:
2241 try:
2241 nodes = repo.vfs.read('graftstate').splitlines()
2242 nodes = repo.vfs.read('graftstate').splitlines()
2242 revs = [repo[node].rev() for node in nodes]
2243 revs = [repo[node].rev() for node in nodes]
2243 except IOError as inst:
2244 except IOError as inst:
2244 if inst.errno != errno.ENOENT:
2245 if inst.errno != errno.ENOENT:
2245 raise
2246 raise
2246 cmdutil.wrongtooltocontinue(repo, _('graft'))
2247 cmdutil.wrongtooltocontinue(repo, _('graft'))
2247 else:
2248 else:
2248 cmdutil.checkunfinished(repo)
2249 cmdutil.checkunfinished(repo)
2249 cmdutil.bailifchanged(repo)
2250 cmdutil.bailifchanged(repo)
2250 if not revs:
2251 if not revs:
2251 raise error.Abort(_('no revisions specified'))
2252 raise error.Abort(_('no revisions specified'))
2252 revs = scmutil.revrange(repo, revs)
2253 revs = scmutil.revrange(repo, revs)
2253
2254
2254 skipped = set()
2255 skipped = set()
2255 # check for merges
2256 # check for merges
2256 for rev in repo.revs('%ld and merge()', revs):
2257 for rev in repo.revs('%ld and merge()', revs):
2257 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2258 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2258 skipped.add(rev)
2259 skipped.add(rev)
2259 revs = [r for r in revs if r not in skipped]
2260 revs = [r for r in revs if r not in skipped]
2260 if not revs:
2261 if not revs:
2261 return -1
2262 return -1
2262
2263
2263 # Don't check in the --continue case, in effect retaining --force across
2264 # Don't check in the --continue case, in effect retaining --force across
2264 # --continues. That's because without --force, any revisions we decided to
2265 # --continues. That's because without --force, any revisions we decided to
2265 # skip would have been filtered out here, so they wouldn't have made their
2266 # skip would have been filtered out here, so they wouldn't have made their
2266 # way to the graftstate. With --force, any revisions we would have otherwise
2267 # way to the graftstate. With --force, any revisions we would have otherwise
2267 # skipped would not have been filtered out, and if they hadn't been applied
2268 # skipped would not have been filtered out, and if they hadn't been applied
2268 # already, they'd have been in the graftstate.
2269 # already, they'd have been in the graftstate.
2269 if not (cont or opts.get('force')):
2270 if not (cont or opts.get('force')):
2270 # check for ancestors of dest branch
2271 # check for ancestors of dest branch
2271 crev = repo['.'].rev()
2272 crev = repo['.'].rev()
2272 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2273 ancestors = repo.changelog.ancestors([crev], inclusive=True)
2273 # XXX make this lazy in the future
2274 # XXX make this lazy in the future
2274 # don't mutate while iterating, create a copy
2275 # don't mutate while iterating, create a copy
2275 for rev in list(revs):
2276 for rev in list(revs):
2276 if rev in ancestors:
2277 if rev in ancestors:
2277 ui.warn(_('skipping ancestor revision %d:%s\n') %
2278 ui.warn(_('skipping ancestor revision %d:%s\n') %
2278 (rev, repo[rev]))
2279 (rev, repo[rev]))
2279 # XXX remove on list is slow
2280 # XXX remove on list is slow
2280 revs.remove(rev)
2281 revs.remove(rev)
2281 if not revs:
2282 if not revs:
2282 return -1
2283 return -1
2283
2284
2284 # analyze revs for earlier grafts
2285 # analyze revs for earlier grafts
2285 ids = {}
2286 ids = {}
2286 for ctx in repo.set("%ld", revs):
2287 for ctx in repo.set("%ld", revs):
2287 ids[ctx.hex()] = ctx.rev()
2288 ids[ctx.hex()] = ctx.rev()
2288 n = ctx.extra().get('source')
2289 n = ctx.extra().get('source')
2289 if n:
2290 if n:
2290 ids[n] = ctx.rev()
2291 ids[n] = ctx.rev()
2291
2292
2292 # check ancestors for earlier grafts
2293 # check ancestors for earlier grafts
2293 ui.debug('scanning for duplicate grafts\n')
2294 ui.debug('scanning for duplicate grafts\n')
2294
2295
2295 for rev in repo.changelog.findmissingrevs(revs, [crev]):
2296 for rev in repo.changelog.findmissingrevs(revs, [crev]):
2296 ctx = repo[rev]
2297 ctx = repo[rev]
2297 n = ctx.extra().get('source')
2298 n = ctx.extra().get('source')
2298 if n in ids:
2299 if n in ids:
2299 try:
2300 try:
2300 r = repo[n].rev()
2301 r = repo[n].rev()
2301 except error.RepoLookupError:
2302 except error.RepoLookupError:
2302 r = None
2303 r = None
2303 if r in revs:
2304 if r in revs:
2304 ui.warn(_('skipping revision %d:%s '
2305 ui.warn(_('skipping revision %d:%s '
2305 '(already grafted to %d:%s)\n')
2306 '(already grafted to %d:%s)\n')
2306 % (r, repo[r], rev, ctx))
2307 % (r, repo[r], rev, ctx))
2307 revs.remove(r)
2308 revs.remove(r)
2308 elif ids[n] in revs:
2309 elif ids[n] in revs:
2309 if r is None:
2310 if r is None:
2310 ui.warn(_('skipping already grafted revision %d:%s '
2311 ui.warn(_('skipping already grafted revision %d:%s '
2311 '(%d:%s also has unknown origin %s)\n')
2312 '(%d:%s also has unknown origin %s)\n')
2312 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2313 % (ids[n], repo[ids[n]], rev, ctx, n[:12]))
2313 else:
2314 else:
2314 ui.warn(_('skipping already grafted revision %d:%s '
2315 ui.warn(_('skipping already grafted revision %d:%s '
2315 '(%d:%s also has origin %d:%s)\n')
2316 '(%d:%s also has origin %d:%s)\n')
2316 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2317 % (ids[n], repo[ids[n]], rev, ctx, r, n[:12]))
2317 revs.remove(ids[n])
2318 revs.remove(ids[n])
2318 elif ctx.hex() in ids:
2319 elif ctx.hex() in ids:
2319 r = ids[ctx.hex()]
2320 r = ids[ctx.hex()]
2320 ui.warn(_('skipping already grafted revision %d:%s '
2321 ui.warn(_('skipping already grafted revision %d:%s '
2321 '(was grafted from %d:%s)\n') %
2322 '(was grafted from %d:%s)\n') %
2322 (r, repo[r], rev, ctx))
2323 (r, repo[r], rev, ctx))
2323 revs.remove(r)
2324 revs.remove(r)
2324 if not revs:
2325 if not revs:
2325 return -1
2326 return -1
2326
2327
2327 for pos, ctx in enumerate(repo.set("%ld", revs)):
2328 for pos, ctx in enumerate(repo.set("%ld", revs)):
2328 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2329 desc = '%d:%s "%s"' % (ctx.rev(), ctx,
2329 ctx.description().split('\n', 1)[0])
2330 ctx.description().split('\n', 1)[0])
2330 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2331 names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node())
2331 if names:
2332 if names:
2332 desc += ' (%s)' % ' '.join(names)
2333 desc += ' (%s)' % ' '.join(names)
2333 ui.status(_('grafting %s\n') % desc)
2334 ui.status(_('grafting %s\n') % desc)
2334 if opts.get('dry_run'):
2335 if opts.get('dry_run'):
2335 continue
2336 continue
2336
2337
2337 source = ctx.extra().get('source')
2338 source = ctx.extra().get('source')
2338 extra = {}
2339 extra = {}
2339 if source:
2340 if source:
2340 extra['source'] = source
2341 extra['source'] = source
2341 extra['intermediate-source'] = ctx.hex()
2342 extra['intermediate-source'] = ctx.hex()
2342 else:
2343 else:
2343 extra['source'] = ctx.hex()
2344 extra['source'] = ctx.hex()
2344 user = ctx.user()
2345 user = ctx.user()
2345 if opts.get('user'):
2346 if opts.get('user'):
2346 user = opts['user']
2347 user = opts['user']
2347 date = ctx.date()
2348 date = ctx.date()
2348 if opts.get('date'):
2349 if opts.get('date'):
2349 date = opts['date']
2350 date = opts['date']
2350 message = ctx.description()
2351 message = ctx.description()
2351 if opts.get('log'):
2352 if opts.get('log'):
2352 message += '\n(grafted from %s)' % ctx.hex()
2353 message += '\n(grafted from %s)' % ctx.hex()
2353
2354
2354 # we don't merge the first commit when continuing
2355 # we don't merge the first commit when continuing
2355 if not cont:
2356 if not cont:
2356 # perform the graft merge with p1(rev) as 'ancestor'
2357 # perform the graft merge with p1(rev) as 'ancestor'
2357 try:
2358 try:
2358 # ui.forcemerge is an internal variable, do not document
2359 # ui.forcemerge is an internal variable, do not document
2359 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
2360 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
2360 'graft')
2361 'graft')
2361 stats = mergemod.graft(repo, ctx, ctx.p1(),
2362 stats = mergemod.graft(repo, ctx, ctx.p1(),
2362 ['local', 'graft'])
2363 ['local', 'graft'])
2363 finally:
2364 finally:
2364 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
2365 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
2365 # report any conflicts
2366 # report any conflicts
2366 if stats and stats[3] > 0:
2367 if stats and stats[3] > 0:
2367 # write out state for --continue
2368 # write out state for --continue
2368 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2369 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2369 repo.vfs.write('graftstate', ''.join(nodelines))
2370 repo.vfs.write('graftstate', ''.join(nodelines))
2370 extra = ''
2371 extra = ''
2371 if opts.get('user'):
2372 if opts.get('user'):
2372 extra += ' --user %s' % util.shellquote(opts['user'])
2373 extra += ' --user %s' % util.shellquote(opts['user'])
2373 if opts.get('date'):
2374 if opts.get('date'):
2374 extra += ' --date %s' % util.shellquote(opts['date'])
2375 extra += ' --date %s' % util.shellquote(opts['date'])
2375 if opts.get('log'):
2376 if opts.get('log'):
2376 extra += ' --log'
2377 extra += ' --log'
2377 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
2378 hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
2378 raise error.Abort(
2379 raise error.Abort(
2379 _("unresolved conflicts, can't continue"),
2380 _("unresolved conflicts, can't continue"),
2380 hint=hint)
2381 hint=hint)
2381 else:
2382 else:
2382 cont = False
2383 cont = False
2383
2384
2384 # commit
2385 # commit
2385 node = repo.commit(text=message, user=user,
2386 node = repo.commit(text=message, user=user,
2386 date=date, extra=extra, editor=editor)
2387 date=date, extra=extra, editor=editor)
2387 if node is None:
2388 if node is None:
2388 ui.warn(
2389 ui.warn(
2389 _('note: graft of %d:%s created no changes to commit\n') %
2390 _('note: graft of %d:%s created no changes to commit\n') %
2390 (ctx.rev(), ctx))
2391 (ctx.rev(), ctx))
2391
2392
2392 # remove state when we complete successfully
2393 # remove state when we complete successfully
2393 if not opts.get('dry_run'):
2394 if not opts.get('dry_run'):
2394 repo.vfs.unlinkpath('graftstate', ignoremissing=True)
2395 repo.vfs.unlinkpath('graftstate', ignoremissing=True)
2395
2396
2396 return 0
2397 return 0
2397
2398
2398 @command('grep',
2399 @command('grep',
2399 [('0', 'print0', None, _('end fields with NUL')),
2400 [('0', 'print0', None, _('end fields with NUL')),
2400 ('', 'all', None, _('print all revisions that match')),
2401 ('', 'all', None, _('print all revisions that match')),
2401 ('a', 'text', None, _('treat all files as text')),
2402 ('a', 'text', None, _('treat all files as text')),
2402 ('f', 'follow', None,
2403 ('f', 'follow', None,
2403 _('follow changeset history,'
2404 _('follow changeset history,'
2404 ' or file history across copies and renames')),
2405 ' or file history across copies and renames')),
2405 ('i', 'ignore-case', None, _('ignore case when matching')),
2406 ('i', 'ignore-case', None, _('ignore case when matching')),
2406 ('l', 'files-with-matches', None,
2407 ('l', 'files-with-matches', None,
2407 _('print only filenames and revisions that match')),
2408 _('print only filenames and revisions that match')),
2408 ('n', 'line-number', None, _('print matching line numbers')),
2409 ('n', 'line-number', None, _('print matching line numbers')),
2409 ('r', 'rev', [],
2410 ('r', 'rev', [],
2410 _('only search files changed within revision range'), _('REV')),
2411 _('only search files changed within revision range'), _('REV')),
2411 ('u', 'user', None, _('list the author (long with -v)')),
2412 ('u', 'user', None, _('list the author (long with -v)')),
2412 ('d', 'date', None, _('list the date (short with -q)')),
2413 ('d', 'date', None, _('list the date (short with -q)')),
2413 ] + formatteropts + walkopts,
2414 ] + formatteropts + walkopts,
2414 _('[OPTION]... PATTERN [FILE]...'),
2415 _('[OPTION]... PATTERN [FILE]...'),
2415 inferrepo=True)
2416 inferrepo=True)
2416 def grep(ui, repo, pattern, *pats, **opts):
2417 def grep(ui, repo, pattern, *pats, **opts):
2417 """search revision history for a pattern in specified files
2418 """search revision history for a pattern in specified files
2418
2419
2419 Search revision history for a regular expression in the specified
2420 Search revision history for a regular expression in the specified
2420 files or the entire project.
2421 files or the entire project.
2421
2422
2422 By default, grep prints the most recent revision number for each
2423 By default, grep prints the most recent revision number for each
2423 file in which it finds a match. To get it to print every revision
2424 file in which it finds a match. To get it to print every revision
2424 that contains a change in match status ("-" for a match that becomes
2425 that contains a change in match status ("-" for a match that becomes
2425 a non-match, or "+" for a non-match that becomes a match), use the
2426 a non-match, or "+" for a non-match that becomes a match), use the
2426 --all flag.
2427 --all flag.
2427
2428
2428 PATTERN can be any Python (roughly Perl-compatible) regular
2429 PATTERN can be any Python (roughly Perl-compatible) regular
2429 expression.
2430 expression.
2430
2431
2431 If no FILEs are specified (and -f/--follow isn't set), all files in
2432 If no FILEs are specified (and -f/--follow isn't set), all files in
2432 the repository are searched, including those that don't exist in the
2433 the repository are searched, including those that don't exist in the
2433 current branch or have been deleted in a prior changeset.
2434 current branch or have been deleted in a prior changeset.
2434
2435
2435 Returns 0 if a match is found, 1 otherwise.
2436 Returns 0 if a match is found, 1 otherwise.
2436 """
2437 """
2437 reflags = re.M
2438 reflags = re.M
2438 if opts.get('ignore_case'):
2439 if opts.get('ignore_case'):
2439 reflags |= re.I
2440 reflags |= re.I
2440 try:
2441 try:
2441 regexp = util.re.compile(pattern, reflags)
2442 regexp = util.re.compile(pattern, reflags)
2442 except re.error as inst:
2443 except re.error as inst:
2443 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2444 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2444 return 1
2445 return 1
2445 sep, eol = ':', '\n'
2446 sep, eol = ':', '\n'
2446 if opts.get('print0'):
2447 if opts.get('print0'):
2447 sep = eol = '\0'
2448 sep = eol = '\0'
2448
2449
2449 getfile = util.lrucachefunc(repo.file)
2450 getfile = util.lrucachefunc(repo.file)
2450
2451
2451 def matchlines(body):
2452 def matchlines(body):
2452 begin = 0
2453 begin = 0
2453 linenum = 0
2454 linenum = 0
2454 while begin < len(body):
2455 while begin < len(body):
2455 match = regexp.search(body, begin)
2456 match = regexp.search(body, begin)
2456 if not match:
2457 if not match:
2457 break
2458 break
2458 mstart, mend = match.span()
2459 mstart, mend = match.span()
2459 linenum += body.count('\n', begin, mstart) + 1
2460 linenum += body.count('\n', begin, mstart) + 1
2460 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2461 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2461 begin = body.find('\n', mend) + 1 or len(body) + 1
2462 begin = body.find('\n', mend) + 1 or len(body) + 1
2462 lend = begin - 1
2463 lend = begin - 1
2463 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2464 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2464
2465
2465 class linestate(object):
2466 class linestate(object):
2466 def __init__(self, line, linenum, colstart, colend):
2467 def __init__(self, line, linenum, colstart, colend):
2467 self.line = line
2468 self.line = line
2468 self.linenum = linenum
2469 self.linenum = linenum
2469 self.colstart = colstart
2470 self.colstart = colstart
2470 self.colend = colend
2471 self.colend = colend
2471
2472
2472 def __hash__(self):
2473 def __hash__(self):
2473 return hash((self.linenum, self.line))
2474 return hash((self.linenum, self.line))
2474
2475
2475 def __eq__(self, other):
2476 def __eq__(self, other):
2476 return self.line == other.line
2477 return self.line == other.line
2477
2478
2478 def findpos(self):
2479 def findpos(self):
2479 """Iterate all (start, end) indices of matches"""
2480 """Iterate all (start, end) indices of matches"""
2480 yield self.colstart, self.colend
2481 yield self.colstart, self.colend
2481 p = self.colend
2482 p = self.colend
2482 while p < len(self.line):
2483 while p < len(self.line):
2483 m = regexp.search(self.line, p)
2484 m = regexp.search(self.line, p)
2484 if not m:
2485 if not m:
2485 break
2486 break
2486 yield m.span()
2487 yield m.span()
2487 p = m.end()
2488 p = m.end()
2488
2489
2489 matches = {}
2490 matches = {}
2490 copies = {}
2491 copies = {}
2491 def grepbody(fn, rev, body):
2492 def grepbody(fn, rev, body):
2492 matches[rev].setdefault(fn, [])
2493 matches[rev].setdefault(fn, [])
2493 m = matches[rev][fn]
2494 m = matches[rev][fn]
2494 for lnum, cstart, cend, line in matchlines(body):
2495 for lnum, cstart, cend, line in matchlines(body):
2495 s = linestate(line, lnum, cstart, cend)
2496 s = linestate(line, lnum, cstart, cend)
2496 m.append(s)
2497 m.append(s)
2497
2498
2498 def difflinestates(a, b):
2499 def difflinestates(a, b):
2499 sm = difflib.SequenceMatcher(None, a, b)
2500 sm = difflib.SequenceMatcher(None, a, b)
2500 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2501 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2501 if tag == 'insert':
2502 if tag == 'insert':
2502 for i in xrange(blo, bhi):
2503 for i in xrange(blo, bhi):
2503 yield ('+', b[i])
2504 yield ('+', b[i])
2504 elif tag == 'delete':
2505 elif tag == 'delete':
2505 for i in xrange(alo, ahi):
2506 for i in xrange(alo, ahi):
2506 yield ('-', a[i])
2507 yield ('-', a[i])
2507 elif tag == 'replace':
2508 elif tag == 'replace':
2508 for i in xrange(alo, ahi):
2509 for i in xrange(alo, ahi):
2509 yield ('-', a[i])
2510 yield ('-', a[i])
2510 for i in xrange(blo, bhi):
2511 for i in xrange(blo, bhi):
2511 yield ('+', b[i])
2512 yield ('+', b[i])
2512
2513
2513 def display(fm, fn, ctx, pstates, states):
2514 def display(fm, fn, ctx, pstates, states):
2514 rev = ctx.rev()
2515 rev = ctx.rev()
2515 if fm.isplain():
2516 if fm.isplain():
2516 formatuser = ui.shortuser
2517 formatuser = ui.shortuser
2517 else:
2518 else:
2518 formatuser = str
2519 formatuser = str
2519 if ui.quiet:
2520 if ui.quiet:
2520 datefmt = '%Y-%m-%d'
2521 datefmt = '%Y-%m-%d'
2521 else:
2522 else:
2522 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2523 datefmt = '%a %b %d %H:%M:%S %Y %1%2'
2523 found = False
2524 found = False
2524 @util.cachefunc
2525 @util.cachefunc
2525 def binary():
2526 def binary():
2526 flog = getfile(fn)
2527 flog = getfile(fn)
2527 return util.binary(flog.read(ctx.filenode(fn)))
2528 return util.binary(flog.read(ctx.filenode(fn)))
2528
2529
2529 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
2530 fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'}
2530 if opts.get('all'):
2531 if opts.get('all'):
2531 iter = difflinestates(pstates, states)
2532 iter = difflinestates(pstates, states)
2532 else:
2533 else:
2533 iter = [('', l) for l in states]
2534 iter = [('', l) for l in states]
2534 for change, l in iter:
2535 for change, l in iter:
2535 fm.startitem()
2536 fm.startitem()
2536 fm.data(node=fm.hexfunc(ctx.node()))
2537 fm.data(node=fm.hexfunc(ctx.node()))
2537 cols = [
2538 cols = [
2538 ('filename', fn, True),
2539 ('filename', fn, True),
2539 ('rev', rev, True),
2540 ('rev', rev, True),
2540 ('linenumber', l.linenum, opts.get('line_number')),
2541 ('linenumber', l.linenum, opts.get('line_number')),
2541 ]
2542 ]
2542 if opts.get('all'):
2543 if opts.get('all'):
2543 cols.append(('change', change, True))
2544 cols.append(('change', change, True))
2544 cols.extend([
2545 cols.extend([
2545 ('user', formatuser(ctx.user()), opts.get('user')),
2546 ('user', formatuser(ctx.user()), opts.get('user')),
2546 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
2547 ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')),
2547 ])
2548 ])
2548 lastcol = next(name for name, data, cond in reversed(cols) if cond)
2549 lastcol = next(name for name, data, cond in reversed(cols) if cond)
2549 for name, data, cond in cols:
2550 for name, data, cond in cols:
2550 field = fieldnamemap.get(name, name)
2551 field = fieldnamemap.get(name, name)
2551 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
2552 fm.condwrite(cond, field, '%s', data, label='grep.%s' % name)
2552 if cond and name != lastcol:
2553 if cond and name != lastcol:
2553 fm.plain(sep, label='grep.sep')
2554 fm.plain(sep, label='grep.sep')
2554 if not opts.get('files_with_matches'):
2555 if not opts.get('files_with_matches'):
2555 fm.plain(sep, label='grep.sep')
2556 fm.plain(sep, label='grep.sep')
2556 if not opts.get('text') and binary():
2557 if not opts.get('text') and binary():
2557 fm.plain(_(" Binary file matches"))
2558 fm.plain(_(" Binary file matches"))
2558 else:
2559 else:
2559 displaymatches(fm.nested('texts'), l)
2560 displaymatches(fm.nested('texts'), l)
2560 fm.plain(eol)
2561 fm.plain(eol)
2561 found = True
2562 found = True
2562 if opts.get('files_with_matches'):
2563 if opts.get('files_with_matches'):
2563 break
2564 break
2564 return found
2565 return found
2565
2566
2566 def displaymatches(fm, l):
2567 def displaymatches(fm, l):
2567 p = 0
2568 p = 0
2568 for s, e in l.findpos():
2569 for s, e in l.findpos():
2569 if p < s:
2570 if p < s:
2570 fm.startitem()
2571 fm.startitem()
2571 fm.write('text', '%s', l.line[p:s])
2572 fm.write('text', '%s', l.line[p:s])
2572 fm.data(matched=False)
2573 fm.data(matched=False)
2573 fm.startitem()
2574 fm.startitem()
2574 fm.write('text', '%s', l.line[s:e], label='grep.match')
2575 fm.write('text', '%s', l.line[s:e], label='grep.match')
2575 fm.data(matched=True)
2576 fm.data(matched=True)
2576 p = e
2577 p = e
2577 if p < len(l.line):
2578 if p < len(l.line):
2578 fm.startitem()
2579 fm.startitem()
2579 fm.write('text', '%s', l.line[p:])
2580 fm.write('text', '%s', l.line[p:])
2580 fm.data(matched=False)
2581 fm.data(matched=False)
2581 fm.end()
2582 fm.end()
2582
2583
2583 skip = {}
2584 skip = {}
2584 revfiles = {}
2585 revfiles = {}
2585 matchfn = scmutil.match(repo[None], pats, opts)
2586 matchfn = scmutil.match(repo[None], pats, opts)
2586 found = False
2587 found = False
2587 follow = opts.get('follow')
2588 follow = opts.get('follow')
2588
2589
2589 def prep(ctx, fns):
2590 def prep(ctx, fns):
2590 rev = ctx.rev()
2591 rev = ctx.rev()
2591 pctx = ctx.p1()
2592 pctx = ctx.p1()
2592 parent = pctx.rev()
2593 parent = pctx.rev()
2593 matches.setdefault(rev, {})
2594 matches.setdefault(rev, {})
2594 matches.setdefault(parent, {})
2595 matches.setdefault(parent, {})
2595 files = revfiles.setdefault(rev, [])
2596 files = revfiles.setdefault(rev, [])
2596 for fn in fns:
2597 for fn in fns:
2597 flog = getfile(fn)
2598 flog = getfile(fn)
2598 try:
2599 try:
2599 fnode = ctx.filenode(fn)
2600 fnode = ctx.filenode(fn)
2600 except error.LookupError:
2601 except error.LookupError:
2601 continue
2602 continue
2602
2603
2603 copied = flog.renamed(fnode)
2604 copied = flog.renamed(fnode)
2604 copy = follow and copied and copied[0]
2605 copy = follow and copied and copied[0]
2605 if copy:
2606 if copy:
2606 copies.setdefault(rev, {})[fn] = copy
2607 copies.setdefault(rev, {})[fn] = copy
2607 if fn in skip:
2608 if fn in skip:
2608 if copy:
2609 if copy:
2609 skip[copy] = True
2610 skip[copy] = True
2610 continue
2611 continue
2611 files.append(fn)
2612 files.append(fn)
2612
2613
2613 if fn not in matches[rev]:
2614 if fn not in matches[rev]:
2614 grepbody(fn, rev, flog.read(fnode))
2615 grepbody(fn, rev, flog.read(fnode))
2615
2616
2616 pfn = copy or fn
2617 pfn = copy or fn
2617 if pfn not in matches[parent]:
2618 if pfn not in matches[parent]:
2618 try:
2619 try:
2619 fnode = pctx.filenode(pfn)
2620 fnode = pctx.filenode(pfn)
2620 grepbody(pfn, parent, flog.read(fnode))
2621 grepbody(pfn, parent, flog.read(fnode))
2621 except error.LookupError:
2622 except error.LookupError:
2622 pass
2623 pass
2623
2624
2624 ui.pager('grep')
2625 ui.pager('grep')
2625 fm = ui.formatter('grep', opts)
2626 fm = ui.formatter('grep', opts)
2626 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2627 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2627 rev = ctx.rev()
2628 rev = ctx.rev()
2628 parent = ctx.p1().rev()
2629 parent = ctx.p1().rev()
2629 for fn in sorted(revfiles.get(rev, [])):
2630 for fn in sorted(revfiles.get(rev, [])):
2630 states = matches[rev][fn]
2631 states = matches[rev][fn]
2631 copy = copies.get(rev, {}).get(fn)
2632 copy = copies.get(rev, {}).get(fn)
2632 if fn in skip:
2633 if fn in skip:
2633 if copy:
2634 if copy:
2634 skip[copy] = True
2635 skip[copy] = True
2635 continue
2636 continue
2636 pstates = matches.get(parent, {}).get(copy or fn, [])
2637 pstates = matches.get(parent, {}).get(copy or fn, [])
2637 if pstates or states:
2638 if pstates or states:
2638 r = display(fm, fn, ctx, pstates, states)
2639 r = display(fm, fn, ctx, pstates, states)
2639 found = found or r
2640 found = found or r
2640 if r and not opts.get('all'):
2641 if r and not opts.get('all'):
2641 skip[fn] = True
2642 skip[fn] = True
2642 if copy:
2643 if copy:
2643 skip[copy] = True
2644 skip[copy] = True
2644 del matches[rev]
2645 del matches[rev]
2645 del revfiles[rev]
2646 del revfiles[rev]
2646 fm.end()
2647 fm.end()
2647
2648
2648 return not found
2649 return not found
2649
2650
2650 @command('heads',
2651 @command('heads',
2651 [('r', 'rev', '',
2652 [('r', 'rev', '',
2652 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2653 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2653 ('t', 'topo', False, _('show topological heads only')),
2654 ('t', 'topo', False, _('show topological heads only')),
2654 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2655 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2655 ('c', 'closed', False, _('show normal and closed branch heads')),
2656 ('c', 'closed', False, _('show normal and closed branch heads')),
2656 ] + templateopts,
2657 ] + templateopts,
2657 _('[-ct] [-r STARTREV] [REV]...'))
2658 _('[-ct] [-r STARTREV] [REV]...'))
2658 def heads(ui, repo, *branchrevs, **opts):
2659 def heads(ui, repo, *branchrevs, **opts):
2659 """show branch heads
2660 """show branch heads
2660
2661
2661 With no arguments, show all open branch heads in the repository.
2662 With no arguments, show all open branch heads in the repository.
2662 Branch heads are changesets that have no descendants on the
2663 Branch heads are changesets that have no descendants on the
2663 same branch. They are where development generally takes place and
2664 same branch. They are where development generally takes place and
2664 are the usual targets for update and merge operations.
2665 are the usual targets for update and merge operations.
2665
2666
2666 If one or more REVs are given, only open branch heads on the
2667 If one or more REVs are given, only open branch heads on the
2667 branches associated with the specified changesets are shown. This
2668 branches associated with the specified changesets are shown. This
2668 means that you can use :hg:`heads .` to see the heads on the
2669 means that you can use :hg:`heads .` to see the heads on the
2669 currently checked-out branch.
2670 currently checked-out branch.
2670
2671
2671 If -c/--closed is specified, also show branch heads marked closed
2672 If -c/--closed is specified, also show branch heads marked closed
2672 (see :hg:`commit --close-branch`).
2673 (see :hg:`commit --close-branch`).
2673
2674
2674 If STARTREV is specified, only those heads that are descendants of
2675 If STARTREV is specified, only those heads that are descendants of
2675 STARTREV will be displayed.
2676 STARTREV will be displayed.
2676
2677
2677 If -t/--topo is specified, named branch mechanics will be ignored and only
2678 If -t/--topo is specified, named branch mechanics will be ignored and only
2678 topological heads (changesets with no children) will be shown.
2679 topological heads (changesets with no children) will be shown.
2679
2680
2680 Returns 0 if matching heads are found, 1 if not.
2681 Returns 0 if matching heads are found, 1 if not.
2681 """
2682 """
2682
2683
2683 start = None
2684 start = None
2684 if 'rev' in opts:
2685 if 'rev' in opts:
2685 start = scmutil.revsingle(repo, opts['rev'], None).node()
2686 start = scmutil.revsingle(repo, opts['rev'], None).node()
2686
2687
2687 if opts.get('topo'):
2688 if opts.get('topo'):
2688 heads = [repo[h] for h in repo.heads(start)]
2689 heads = [repo[h] for h in repo.heads(start)]
2689 else:
2690 else:
2690 heads = []
2691 heads = []
2691 for branch in repo.branchmap():
2692 for branch in repo.branchmap():
2692 heads += repo.branchheads(branch, start, opts.get('closed'))
2693 heads += repo.branchheads(branch, start, opts.get('closed'))
2693 heads = [repo[h] for h in heads]
2694 heads = [repo[h] for h in heads]
2694
2695
2695 if branchrevs:
2696 if branchrevs:
2696 branches = set(repo[br].branch() for br in branchrevs)
2697 branches = set(repo[br].branch() for br in branchrevs)
2697 heads = [h for h in heads if h.branch() in branches]
2698 heads = [h for h in heads if h.branch() in branches]
2698
2699
2699 if opts.get('active') and branchrevs:
2700 if opts.get('active') and branchrevs:
2700 dagheads = repo.heads(start)
2701 dagheads = repo.heads(start)
2701 heads = [h for h in heads if h.node() in dagheads]
2702 heads = [h for h in heads if h.node() in dagheads]
2702
2703
2703 if branchrevs:
2704 if branchrevs:
2704 haveheads = set(h.branch() for h in heads)
2705 haveheads = set(h.branch() for h in heads)
2705 if branches - haveheads:
2706 if branches - haveheads:
2706 headless = ', '.join(b for b in branches - haveheads)
2707 headless = ', '.join(b for b in branches - haveheads)
2707 msg = _('no open branch heads found on branches %s')
2708 msg = _('no open branch heads found on branches %s')
2708 if opts.get('rev'):
2709 if opts.get('rev'):
2709 msg += _(' (started at %s)') % opts['rev']
2710 msg += _(' (started at %s)') % opts['rev']
2710 ui.warn((msg + '\n') % headless)
2711 ui.warn((msg + '\n') % headless)
2711
2712
2712 if not heads:
2713 if not heads:
2713 return 1
2714 return 1
2714
2715
2715 ui.pager('heads')
2716 ui.pager('heads')
2716 heads = sorted(heads, key=lambda x: -x.rev())
2717 heads = sorted(heads, key=lambda x: -x.rev())
2717 displayer = cmdutil.show_changeset(ui, repo, opts)
2718 displayer = cmdutil.show_changeset(ui, repo, opts)
2718 for ctx in heads:
2719 for ctx in heads:
2719 displayer.show(ctx)
2720 displayer.show(ctx)
2720 displayer.close()
2721 displayer.close()
2721
2722
2722 @command('help',
2723 @command('help',
2723 [('e', 'extension', None, _('show only help for extensions')),
2724 [('e', 'extension', None, _('show only help for extensions')),
2724 ('c', 'command', None, _('show only help for commands')),
2725 ('c', 'command', None, _('show only help for commands')),
2725 ('k', 'keyword', None, _('show topics matching keyword')),
2726 ('k', 'keyword', None, _('show topics matching keyword')),
2726 ('s', 'system', [], _('show help for specific platform(s)')),
2727 ('s', 'system', [], _('show help for specific platform(s)')),
2727 ],
2728 ],
2728 _('[-ecks] [TOPIC]'),
2729 _('[-ecks] [TOPIC]'),
2729 norepo=True)
2730 norepo=True)
2730 def help_(ui, name=None, **opts):
2731 def help_(ui, name=None, **opts):
2731 """show help for a given topic or a help overview
2732 """show help for a given topic or a help overview
2732
2733
2733 With no arguments, print a list of commands with short help messages.
2734 With no arguments, print a list of commands with short help messages.
2734
2735
2735 Given a topic, extension, or command name, print help for that
2736 Given a topic, extension, or command name, print help for that
2736 topic.
2737 topic.
2737
2738
2738 Returns 0 if successful.
2739 Returns 0 if successful.
2739 """
2740 """
2740
2741
2741 keep = opts.get('system') or []
2742 keep = opts.get('system') or []
2742 if len(keep) == 0:
2743 if len(keep) == 0:
2743 if pycompat.sysplatform.startswith('win'):
2744 if pycompat.sysplatform.startswith('win'):
2744 keep.append('windows')
2745 keep.append('windows')
2745 elif pycompat.sysplatform == 'OpenVMS':
2746 elif pycompat.sysplatform == 'OpenVMS':
2746 keep.append('vms')
2747 keep.append('vms')
2747 elif pycompat.sysplatform == 'plan9':
2748 elif pycompat.sysplatform == 'plan9':
2748 keep.append('plan9')
2749 keep.append('plan9')
2749 else:
2750 else:
2750 keep.append('unix')
2751 keep.append('unix')
2751 keep.append(pycompat.sysplatform.lower())
2752 keep.append(pycompat.sysplatform.lower())
2752 if ui.verbose:
2753 if ui.verbose:
2753 keep.append('verbose')
2754 keep.append('verbose')
2754
2755
2755 formatted = help.formattedhelp(ui, name, keep=keep, **opts)
2756 formatted = help.formattedhelp(ui, name, keep=keep, **opts)
2756 ui.pager('help')
2757 ui.pager('help')
2757 ui.write(formatted)
2758 ui.write(formatted)
2758
2759
2759
2760
2760 @command('identify|id',
2761 @command('identify|id',
2761 [('r', 'rev', '',
2762 [('r', 'rev', '',
2762 _('identify the specified revision'), _('REV')),
2763 _('identify the specified revision'), _('REV')),
2763 ('n', 'num', None, _('show local revision number')),
2764 ('n', 'num', None, _('show local revision number')),
2764 ('i', 'id', None, _('show global revision id')),
2765 ('i', 'id', None, _('show global revision id')),
2765 ('b', 'branch', None, _('show branch')),
2766 ('b', 'branch', None, _('show branch')),
2766 ('t', 'tags', None, _('show tags')),
2767 ('t', 'tags', None, _('show tags')),
2767 ('B', 'bookmarks', None, _('show bookmarks')),
2768 ('B', 'bookmarks', None, _('show bookmarks')),
2768 ] + remoteopts,
2769 ] + remoteopts,
2769 _('[-nibtB] [-r REV] [SOURCE]'),
2770 _('[-nibtB] [-r REV] [SOURCE]'),
2770 optionalrepo=True)
2771 optionalrepo=True)
2771 def identify(ui, repo, source=None, rev=None,
2772 def identify(ui, repo, source=None, rev=None,
2772 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2773 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
2773 """identify the working directory or specified revision
2774 """identify the working directory or specified revision
2774
2775
2775 Print a summary identifying the repository state at REV using one or
2776 Print a summary identifying the repository state at REV using one or
2776 two parent hash identifiers, followed by a "+" if the working
2777 two parent hash identifiers, followed by a "+" if the working
2777 directory has uncommitted changes, the branch name (if not default),
2778 directory has uncommitted changes, the branch name (if not default),
2778 a list of tags, and a list of bookmarks.
2779 a list of tags, and a list of bookmarks.
2779
2780
2780 When REV is not given, print a summary of the current state of the
2781 When REV is not given, print a summary of the current state of the
2781 repository.
2782 repository.
2782
2783
2783 Specifying a path to a repository root or Mercurial bundle will
2784 Specifying a path to a repository root or Mercurial bundle will
2784 cause lookup to operate on that repository/bundle.
2785 cause lookup to operate on that repository/bundle.
2785
2786
2786 .. container:: verbose
2787 .. container:: verbose
2787
2788
2788 Examples:
2789 Examples:
2789
2790
2790 - generate a build identifier for the working directory::
2791 - generate a build identifier for the working directory::
2791
2792
2792 hg id --id > build-id.dat
2793 hg id --id > build-id.dat
2793
2794
2794 - find the revision corresponding to a tag::
2795 - find the revision corresponding to a tag::
2795
2796
2796 hg id -n -r 1.3
2797 hg id -n -r 1.3
2797
2798
2798 - check the most recent revision of a remote repository::
2799 - check the most recent revision of a remote repository::
2799
2800
2800 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2801 hg id -r tip https://www.mercurial-scm.org/repo/hg/
2801
2802
2802 See :hg:`log` for generating more information about specific revisions,
2803 See :hg:`log` for generating more information about specific revisions,
2803 including full hash identifiers.
2804 including full hash identifiers.
2804
2805
2805 Returns 0 if successful.
2806 Returns 0 if successful.
2806 """
2807 """
2807
2808
2808 if not repo and not source:
2809 if not repo and not source:
2809 raise error.Abort(_("there is no Mercurial repository here "
2810 raise error.Abort(_("there is no Mercurial repository here "
2810 "(.hg not found)"))
2811 "(.hg not found)"))
2811
2812
2812 if ui.debugflag:
2813 if ui.debugflag:
2813 hexfunc = hex
2814 hexfunc = hex
2814 else:
2815 else:
2815 hexfunc = short
2816 hexfunc = short
2816 default = not (num or id or branch or tags or bookmarks)
2817 default = not (num or id or branch or tags or bookmarks)
2817 output = []
2818 output = []
2818 revs = []
2819 revs = []
2819
2820
2820 if source:
2821 if source:
2821 source, branches = hg.parseurl(ui.expandpath(source))
2822 source, branches = hg.parseurl(ui.expandpath(source))
2822 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2823 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
2823 repo = peer.local()
2824 repo = peer.local()
2824 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2825 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
2825
2826
2826 if not repo:
2827 if not repo:
2827 if num or branch or tags:
2828 if num or branch or tags:
2828 raise error.Abort(
2829 raise error.Abort(
2829 _("can't query remote revision number, branch, or tags"))
2830 _("can't query remote revision number, branch, or tags"))
2830 if not rev and revs:
2831 if not rev and revs:
2831 rev = revs[0]
2832 rev = revs[0]
2832 if not rev:
2833 if not rev:
2833 rev = "tip"
2834 rev = "tip"
2834
2835
2835 remoterev = peer.lookup(rev)
2836 remoterev = peer.lookup(rev)
2836 if default or id:
2837 if default or id:
2837 output = [hexfunc(remoterev)]
2838 output = [hexfunc(remoterev)]
2838
2839
2839 def getbms():
2840 def getbms():
2840 bms = []
2841 bms = []
2841
2842
2842 if 'bookmarks' in peer.listkeys('namespaces'):
2843 if 'bookmarks' in peer.listkeys('namespaces'):
2843 hexremoterev = hex(remoterev)
2844 hexremoterev = hex(remoterev)
2844 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
2845 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
2845 if bmr == hexremoterev]
2846 if bmr == hexremoterev]
2846
2847
2847 return sorted(bms)
2848 return sorted(bms)
2848
2849
2849 if bookmarks:
2850 if bookmarks:
2850 output.extend(getbms())
2851 output.extend(getbms())
2851 elif default and not ui.quiet:
2852 elif default and not ui.quiet:
2852 # multiple bookmarks for a single parent separated by '/'
2853 # multiple bookmarks for a single parent separated by '/'
2853 bm = '/'.join(getbms())
2854 bm = '/'.join(getbms())
2854 if bm:
2855 if bm:
2855 output.append(bm)
2856 output.append(bm)
2856 else:
2857 else:
2857 ctx = scmutil.revsingle(repo, rev, None)
2858 ctx = scmutil.revsingle(repo, rev, None)
2858
2859
2859 if ctx.rev() is None:
2860 if ctx.rev() is None:
2860 ctx = repo[None]
2861 ctx = repo[None]
2861 parents = ctx.parents()
2862 parents = ctx.parents()
2862 taglist = []
2863 taglist = []
2863 for p in parents:
2864 for p in parents:
2864 taglist.extend(p.tags())
2865 taglist.extend(p.tags())
2865
2866
2866 changed = ""
2867 changed = ""
2867 if default or id or num:
2868 if default or id or num:
2868 if (any(repo.status())
2869 if (any(repo.status())
2869 or any(ctx.sub(s).dirty() for s in ctx.substate)):
2870 or any(ctx.sub(s).dirty() for s in ctx.substate)):
2870 changed = '+'
2871 changed = '+'
2871 if default or id:
2872 if default or id:
2872 output = ["%s%s" %
2873 output = ["%s%s" %
2873 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
2874 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
2874 if num:
2875 if num:
2875 output.append("%s%s" %
2876 output.append("%s%s" %
2876 ('+'.join([str(p.rev()) for p in parents]), changed))
2877 ('+'.join([str(p.rev()) for p in parents]), changed))
2877 else:
2878 else:
2878 if default or id:
2879 if default or id:
2879 output = [hexfunc(ctx.node())]
2880 output = [hexfunc(ctx.node())]
2880 if num:
2881 if num:
2881 output.append(str(ctx.rev()))
2882 output.append(str(ctx.rev()))
2882 taglist = ctx.tags()
2883 taglist = ctx.tags()
2883
2884
2884 if default and not ui.quiet:
2885 if default and not ui.quiet:
2885 b = ctx.branch()
2886 b = ctx.branch()
2886 if b != 'default':
2887 if b != 'default':
2887 output.append("(%s)" % b)
2888 output.append("(%s)" % b)
2888
2889
2889 # multiple tags for a single parent separated by '/'
2890 # multiple tags for a single parent separated by '/'
2890 t = '/'.join(taglist)
2891 t = '/'.join(taglist)
2891 if t:
2892 if t:
2892 output.append(t)
2893 output.append(t)
2893
2894
2894 # multiple bookmarks for a single parent separated by '/'
2895 # multiple bookmarks for a single parent separated by '/'
2895 bm = '/'.join(ctx.bookmarks())
2896 bm = '/'.join(ctx.bookmarks())
2896 if bm:
2897 if bm:
2897 output.append(bm)
2898 output.append(bm)
2898 else:
2899 else:
2899 if branch:
2900 if branch:
2900 output.append(ctx.branch())
2901 output.append(ctx.branch())
2901
2902
2902 if tags:
2903 if tags:
2903 output.extend(taglist)
2904 output.extend(taglist)
2904
2905
2905 if bookmarks:
2906 if bookmarks:
2906 output.extend(ctx.bookmarks())
2907 output.extend(ctx.bookmarks())
2907
2908
2908 ui.write("%s\n" % ' '.join(output))
2909 ui.write("%s\n" % ' '.join(output))
2909
2910
2910 @command('import|patch',
2911 @command('import|patch',
2911 [('p', 'strip', 1,
2912 [('p', 'strip', 1,
2912 _('directory strip option for patch. This has the same '
2913 _('directory strip option for patch. This has the same '
2913 'meaning as the corresponding patch option'), _('NUM')),
2914 'meaning as the corresponding patch option'), _('NUM')),
2914 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
2915 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
2915 ('e', 'edit', False, _('invoke editor on commit messages')),
2916 ('e', 'edit', False, _('invoke editor on commit messages')),
2916 ('f', 'force', None,
2917 ('f', 'force', None,
2917 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
2918 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
2918 ('', 'no-commit', None,
2919 ('', 'no-commit', None,
2919 _("don't commit, just update the working directory")),
2920 _("don't commit, just update the working directory")),
2920 ('', 'bypass', None,
2921 ('', 'bypass', None,
2921 _("apply patch without touching the working directory")),
2922 _("apply patch without touching the working directory")),
2922 ('', 'partial', None,
2923 ('', 'partial', None,
2923 _('commit even if some hunks fail')),
2924 _('commit even if some hunks fail')),
2924 ('', 'exact', None,
2925 ('', 'exact', None,
2925 _('abort if patch would apply lossily')),
2926 _('abort if patch would apply lossily')),
2926 ('', 'prefix', '',
2927 ('', 'prefix', '',
2927 _('apply patch to subdirectory'), _('DIR')),
2928 _('apply patch to subdirectory'), _('DIR')),
2928 ('', 'import-branch', None,
2929 ('', 'import-branch', None,
2929 _('use any branch information in patch (implied by --exact)'))] +
2930 _('use any branch information in patch (implied by --exact)'))] +
2930 commitopts + commitopts2 + similarityopts,
2931 commitopts + commitopts2 + similarityopts,
2931 _('[OPTION]... PATCH...'))
2932 _('[OPTION]... PATCH...'))
2932 def import_(ui, repo, patch1=None, *patches, **opts):
2933 def import_(ui, repo, patch1=None, *patches, **opts):
2933 """import an ordered set of patches
2934 """import an ordered set of patches
2934
2935
2935 Import a list of patches and commit them individually (unless
2936 Import a list of patches and commit them individually (unless
2936 --no-commit is specified).
2937 --no-commit is specified).
2937
2938
2938 To read a patch from standard input (stdin), use "-" as the patch
2939 To read a patch from standard input (stdin), use "-" as the patch
2939 name. If a URL is specified, the patch will be downloaded from
2940 name. If a URL is specified, the patch will be downloaded from
2940 there.
2941 there.
2941
2942
2942 Import first applies changes to the working directory (unless
2943 Import first applies changes to the working directory (unless
2943 --bypass is specified), import will abort if there are outstanding
2944 --bypass is specified), import will abort if there are outstanding
2944 changes.
2945 changes.
2945
2946
2946 Use --bypass to apply and commit patches directly to the
2947 Use --bypass to apply and commit patches directly to the
2947 repository, without affecting the working directory. Without
2948 repository, without affecting the working directory. Without
2948 --exact, patches will be applied on top of the working directory
2949 --exact, patches will be applied on top of the working directory
2949 parent revision.
2950 parent revision.
2950
2951
2951 You can import a patch straight from a mail message. Even patches
2952 You can import a patch straight from a mail message. Even patches
2952 as attachments work (to use the body part, it must have type
2953 as attachments work (to use the body part, it must have type
2953 text/plain or text/x-patch). From and Subject headers of email
2954 text/plain or text/x-patch). From and Subject headers of email
2954 message are used as default committer and commit message. All
2955 message are used as default committer and commit message. All
2955 text/plain body parts before first diff are added to the commit
2956 text/plain body parts before first diff are added to the commit
2956 message.
2957 message.
2957
2958
2958 If the imported patch was generated by :hg:`export`, user and
2959 If the imported patch was generated by :hg:`export`, user and
2959 description from patch override values from message headers and
2960 description from patch override values from message headers and
2960 body. Values given on command line with -m/--message and -u/--user
2961 body. Values given on command line with -m/--message and -u/--user
2961 override these.
2962 override these.
2962
2963
2963 If --exact is specified, import will set the working directory to
2964 If --exact is specified, import will set the working directory to
2964 the parent of each patch before applying it, and will abort if the
2965 the parent of each patch before applying it, and will abort if the
2965 resulting changeset has a different ID than the one recorded in
2966 resulting changeset has a different ID than the one recorded in
2966 the patch. This will guard against various ways that portable
2967 the patch. This will guard against various ways that portable
2967 patch formats and mail systems might fail to transfer Mercurial
2968 patch formats and mail systems might fail to transfer Mercurial
2968 data or metadata. See :hg:`bundle` for lossless transmission.
2969 data or metadata. See :hg:`bundle` for lossless transmission.
2969
2970
2970 Use --partial to ensure a changeset will be created from the patch
2971 Use --partial to ensure a changeset will be created from the patch
2971 even if some hunks fail to apply. Hunks that fail to apply will be
2972 even if some hunks fail to apply. Hunks that fail to apply will be
2972 written to a <target-file>.rej file. Conflicts can then be resolved
2973 written to a <target-file>.rej file. Conflicts can then be resolved
2973 by hand before :hg:`commit --amend` is run to update the created
2974 by hand before :hg:`commit --amend` is run to update the created
2974 changeset. This flag exists to let people import patches that
2975 changeset. This flag exists to let people import patches that
2975 partially apply without losing the associated metadata (author,
2976 partially apply without losing the associated metadata (author,
2976 date, description, ...).
2977 date, description, ...).
2977
2978
2978 .. note::
2979 .. note::
2979
2980
2980 When no hunks apply cleanly, :hg:`import --partial` will create
2981 When no hunks apply cleanly, :hg:`import --partial` will create
2981 an empty changeset, importing only the patch metadata.
2982 an empty changeset, importing only the patch metadata.
2982
2983
2983 With -s/--similarity, hg will attempt to discover renames and
2984 With -s/--similarity, hg will attempt to discover renames and
2984 copies in the patch in the same way as :hg:`addremove`.
2985 copies in the patch in the same way as :hg:`addremove`.
2985
2986
2986 It is possible to use external patch programs to perform the patch
2987 It is possible to use external patch programs to perform the patch
2987 by setting the ``ui.patch`` configuration option. For the default
2988 by setting the ``ui.patch`` configuration option. For the default
2988 internal tool, the fuzz can also be configured via ``patch.fuzz``.
2989 internal tool, the fuzz can also be configured via ``patch.fuzz``.
2989 See :hg:`help config` for more information about configuration
2990 See :hg:`help config` for more information about configuration
2990 files and how to use these options.
2991 files and how to use these options.
2991
2992
2992 See :hg:`help dates` for a list of formats valid for -d/--date.
2993 See :hg:`help dates` for a list of formats valid for -d/--date.
2993
2994
2994 .. container:: verbose
2995 .. container:: verbose
2995
2996
2996 Examples:
2997 Examples:
2997
2998
2998 - import a traditional patch from a website and detect renames::
2999 - import a traditional patch from a website and detect renames::
2999
3000
3000 hg import -s 80 http://example.com/bugfix.patch
3001 hg import -s 80 http://example.com/bugfix.patch
3001
3002
3002 - import a changeset from an hgweb server::
3003 - import a changeset from an hgweb server::
3003
3004
3004 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
3005 hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa
3005
3006
3006 - import all the patches in an Unix-style mbox::
3007 - import all the patches in an Unix-style mbox::
3007
3008
3008 hg import incoming-patches.mbox
3009 hg import incoming-patches.mbox
3009
3010
3010 - import patches from stdin::
3011 - import patches from stdin::
3011
3012
3012 hg import -
3013 hg import -
3013
3014
3014 - attempt to exactly restore an exported changeset (not always
3015 - attempt to exactly restore an exported changeset (not always
3015 possible)::
3016 possible)::
3016
3017
3017 hg import --exact proposed-fix.patch
3018 hg import --exact proposed-fix.patch
3018
3019
3019 - use an external tool to apply a patch which is too fuzzy for
3020 - use an external tool to apply a patch which is too fuzzy for
3020 the default internal tool.
3021 the default internal tool.
3021
3022
3022 hg import --config ui.patch="patch --merge" fuzzy.patch
3023 hg import --config ui.patch="patch --merge" fuzzy.patch
3023
3024
3024 - change the default fuzzing from 2 to a less strict 7
3025 - change the default fuzzing from 2 to a less strict 7
3025
3026
3026 hg import --config ui.fuzz=7 fuzz.patch
3027 hg import --config ui.fuzz=7 fuzz.patch
3027
3028
3028 Returns 0 on success, 1 on partial success (see --partial).
3029 Returns 0 on success, 1 on partial success (see --partial).
3029 """
3030 """
3030
3031
3031 if not patch1:
3032 if not patch1:
3032 raise error.Abort(_('need at least one patch to import'))
3033 raise error.Abort(_('need at least one patch to import'))
3033
3034
3034 patches = (patch1,) + patches
3035 patches = (patch1,) + patches
3035
3036
3036 date = opts.get('date')
3037 date = opts.get('date')
3037 if date:
3038 if date:
3038 opts['date'] = util.parsedate(date)
3039 opts['date'] = util.parsedate(date)
3039
3040
3040 exact = opts.get('exact')
3041 exact = opts.get('exact')
3041 update = not opts.get('bypass')
3042 update = not opts.get('bypass')
3042 if not update and opts.get('no_commit'):
3043 if not update and opts.get('no_commit'):
3043 raise error.Abort(_('cannot use --no-commit with --bypass'))
3044 raise error.Abort(_('cannot use --no-commit with --bypass'))
3044 try:
3045 try:
3045 sim = float(opts.get('similarity') or 0)
3046 sim = float(opts.get('similarity') or 0)
3046 except ValueError:
3047 except ValueError:
3047 raise error.Abort(_('similarity must be a number'))
3048 raise error.Abort(_('similarity must be a number'))
3048 if sim < 0 or sim > 100:
3049 if sim < 0 or sim > 100:
3049 raise error.Abort(_('similarity must be between 0 and 100'))
3050 raise error.Abort(_('similarity must be between 0 and 100'))
3050 if sim and not update:
3051 if sim and not update:
3051 raise error.Abort(_('cannot use --similarity with --bypass'))
3052 raise error.Abort(_('cannot use --similarity with --bypass'))
3052 if exact:
3053 if exact:
3053 if opts.get('edit'):
3054 if opts.get('edit'):
3054 raise error.Abort(_('cannot use --exact with --edit'))
3055 raise error.Abort(_('cannot use --exact with --edit'))
3055 if opts.get('prefix'):
3056 if opts.get('prefix'):
3056 raise error.Abort(_('cannot use --exact with --prefix'))
3057 raise error.Abort(_('cannot use --exact with --prefix'))
3057
3058
3058 base = opts["base"]
3059 base = opts["base"]
3059 wlock = dsguard = lock = tr = None
3060 wlock = dsguard = lock = tr = None
3060 msgs = []
3061 msgs = []
3061 ret = 0
3062 ret = 0
3062
3063
3063
3064
3064 try:
3065 try:
3065 wlock = repo.wlock()
3066 wlock = repo.wlock()
3066
3067
3067 if update:
3068 if update:
3068 cmdutil.checkunfinished(repo)
3069 cmdutil.checkunfinished(repo)
3069 if (exact or not opts.get('force')):
3070 if (exact or not opts.get('force')):
3070 cmdutil.bailifchanged(repo)
3071 cmdutil.bailifchanged(repo)
3071
3072
3072 if not opts.get('no_commit'):
3073 if not opts.get('no_commit'):
3073 lock = repo.lock()
3074 lock = repo.lock()
3074 tr = repo.transaction('import')
3075 tr = repo.transaction('import')
3075 else:
3076 else:
3076 dsguard = dirstateguard.dirstateguard(repo, 'import')
3077 dsguard = dirstateguard.dirstateguard(repo, 'import')
3077 parents = repo[None].parents()
3078 parents = repo[None].parents()
3078 for patchurl in patches:
3079 for patchurl in patches:
3079 if patchurl == '-':
3080 if patchurl == '-':
3080 ui.status(_('applying patch from stdin\n'))
3081 ui.status(_('applying patch from stdin\n'))
3081 patchfile = ui.fin
3082 patchfile = ui.fin
3082 patchurl = 'stdin' # for error message
3083 patchurl = 'stdin' # for error message
3083 else:
3084 else:
3084 patchurl = os.path.join(base, patchurl)
3085 patchurl = os.path.join(base, patchurl)
3085 ui.status(_('applying %s\n') % patchurl)
3086 ui.status(_('applying %s\n') % patchurl)
3086 patchfile = hg.openpath(ui, patchurl)
3087 patchfile = hg.openpath(ui, patchurl)
3087
3088
3088 haspatch = False
3089 haspatch = False
3089 for hunk in patch.split(patchfile):
3090 for hunk in patch.split(patchfile):
3090 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
3091 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
3091 parents, opts,
3092 parents, opts,
3092 msgs, hg.clean)
3093 msgs, hg.clean)
3093 if msg:
3094 if msg:
3094 haspatch = True
3095 haspatch = True
3095 ui.note(msg + '\n')
3096 ui.note(msg + '\n')
3096 if update or exact:
3097 if update or exact:
3097 parents = repo[None].parents()
3098 parents = repo[None].parents()
3098 else:
3099 else:
3099 parents = [repo[node]]
3100 parents = [repo[node]]
3100 if rej:
3101 if rej:
3101 ui.write_err(_("patch applied partially\n"))
3102 ui.write_err(_("patch applied partially\n"))
3102 ui.write_err(_("(fix the .rej files and run "
3103 ui.write_err(_("(fix the .rej files and run "
3103 "`hg commit --amend`)\n"))
3104 "`hg commit --amend`)\n"))
3104 ret = 1
3105 ret = 1
3105 break
3106 break
3106
3107
3107 if not haspatch:
3108 if not haspatch:
3108 raise error.Abort(_('%s: no diffs found') % patchurl)
3109 raise error.Abort(_('%s: no diffs found') % patchurl)
3109
3110
3110 if tr:
3111 if tr:
3111 tr.close()
3112 tr.close()
3112 if msgs:
3113 if msgs:
3113 repo.savecommitmessage('\n* * *\n'.join(msgs))
3114 repo.savecommitmessage('\n* * *\n'.join(msgs))
3114 if dsguard:
3115 if dsguard:
3115 dsguard.close()
3116 dsguard.close()
3116 return ret
3117 return ret
3117 finally:
3118 finally:
3118 if tr:
3119 if tr:
3119 tr.release()
3120 tr.release()
3120 release(lock, dsguard, wlock)
3121 release(lock, dsguard, wlock)
3121
3122
3122 @command('incoming|in',
3123 @command('incoming|in',
3123 [('f', 'force', None,
3124 [('f', 'force', None,
3124 _('run even if remote repository is unrelated')),
3125 _('run even if remote repository is unrelated')),
3125 ('n', 'newest-first', None, _('show newest record first')),
3126 ('n', 'newest-first', None, _('show newest record first')),
3126 ('', 'bundle', '',
3127 ('', 'bundle', '',
3127 _('file to store the bundles into'), _('FILE')),
3128 _('file to store the bundles into'), _('FILE')),
3128 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3129 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3129 ('B', 'bookmarks', False, _("compare bookmarks")),
3130 ('B', 'bookmarks', False, _("compare bookmarks")),
3130 ('b', 'branch', [],
3131 ('b', 'branch', [],
3131 _('a specific branch you would like to pull'), _('BRANCH')),
3132 _('a specific branch you would like to pull'), _('BRANCH')),
3132 ] + logopts + remoteopts + subrepoopts,
3133 ] + logopts + remoteopts + subrepoopts,
3133 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3134 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3134 def incoming(ui, repo, source="default", **opts):
3135 def incoming(ui, repo, source="default", **opts):
3135 """show new changesets found in source
3136 """show new changesets found in source
3136
3137
3137 Show new changesets found in the specified path/URL or the default
3138 Show new changesets found in the specified path/URL or the default
3138 pull location. These are the changesets that would have been pulled
3139 pull location. These are the changesets that would have been pulled
3139 if a pull at the time you issued this command.
3140 if a pull at the time you issued this command.
3140
3141
3141 See pull for valid source format details.
3142 See pull for valid source format details.
3142
3143
3143 .. container:: verbose
3144 .. container:: verbose
3144
3145
3145 With -B/--bookmarks, the result of bookmark comparison between
3146 With -B/--bookmarks, the result of bookmark comparison between
3146 local and remote repositories is displayed. With -v/--verbose,
3147 local and remote repositories is displayed. With -v/--verbose,
3147 status is also displayed for each bookmark like below::
3148 status is also displayed for each bookmark like below::
3148
3149
3149 BM1 01234567890a added
3150 BM1 01234567890a added
3150 BM2 1234567890ab advanced
3151 BM2 1234567890ab advanced
3151 BM3 234567890abc diverged
3152 BM3 234567890abc diverged
3152 BM4 34567890abcd changed
3153 BM4 34567890abcd changed
3153
3154
3154 The action taken locally when pulling depends on the
3155 The action taken locally when pulling depends on the
3155 status of each bookmark:
3156 status of each bookmark:
3156
3157
3157 :``added``: pull will create it
3158 :``added``: pull will create it
3158 :``advanced``: pull will update it
3159 :``advanced``: pull will update it
3159 :``diverged``: pull will create a divergent bookmark
3160 :``diverged``: pull will create a divergent bookmark
3160 :``changed``: result depends on remote changesets
3161 :``changed``: result depends on remote changesets
3161
3162
3162 From the point of view of pulling behavior, bookmark
3163 From the point of view of pulling behavior, bookmark
3163 existing only in the remote repository are treated as ``added``,
3164 existing only in the remote repository are treated as ``added``,
3164 even if it is in fact locally deleted.
3165 even if it is in fact locally deleted.
3165
3166
3166 .. container:: verbose
3167 .. container:: verbose
3167
3168
3168 For remote repository, using --bundle avoids downloading the
3169 For remote repository, using --bundle avoids downloading the
3169 changesets twice if the incoming is followed by a pull.
3170 changesets twice if the incoming is followed by a pull.
3170
3171
3171 Examples:
3172 Examples:
3172
3173
3173 - show incoming changes with patches and full description::
3174 - show incoming changes with patches and full description::
3174
3175
3175 hg incoming -vp
3176 hg incoming -vp
3176
3177
3177 - show incoming changes excluding merges, store a bundle::
3178 - show incoming changes excluding merges, store a bundle::
3178
3179
3179 hg in -vpM --bundle incoming.hg
3180 hg in -vpM --bundle incoming.hg
3180 hg pull incoming.hg
3181 hg pull incoming.hg
3181
3182
3182 - briefly list changes inside a bundle::
3183 - briefly list changes inside a bundle::
3183
3184
3184 hg in changes.hg -T "{desc|firstline}\\n"
3185 hg in changes.hg -T "{desc|firstline}\\n"
3185
3186
3186 Returns 0 if there are incoming changes, 1 otherwise.
3187 Returns 0 if there are incoming changes, 1 otherwise.
3187 """
3188 """
3188 if opts.get('graph'):
3189 if opts.get('graph'):
3189 cmdutil.checkunsupportedgraphflags([], opts)
3190 cmdutil.checkunsupportedgraphflags([], opts)
3190 def display(other, chlist, displayer):
3191 def display(other, chlist, displayer):
3191 revdag = cmdutil.graphrevs(other, chlist, opts)
3192 revdag = cmdutil.graphrevs(other, chlist, opts)
3192 cmdutil.displaygraph(ui, repo, revdag, displayer,
3193 cmdutil.displaygraph(ui, repo, revdag, displayer,
3193 graphmod.asciiedges)
3194 graphmod.asciiedges)
3194
3195
3195 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3196 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3196 return 0
3197 return 0
3197
3198
3198 if opts.get('bundle') and opts.get('subrepos'):
3199 if opts.get('bundle') and opts.get('subrepos'):
3199 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3200 raise error.Abort(_('cannot combine --bundle and --subrepos'))
3200
3201
3201 if opts.get('bookmarks'):
3202 if opts.get('bookmarks'):
3202 source, branches = hg.parseurl(ui.expandpath(source),
3203 source, branches = hg.parseurl(ui.expandpath(source),
3203 opts.get('branch'))
3204 opts.get('branch'))
3204 other = hg.peer(repo, opts, source)
3205 other = hg.peer(repo, opts, source)
3205 if 'bookmarks' not in other.listkeys('namespaces'):
3206 if 'bookmarks' not in other.listkeys('namespaces'):
3206 ui.warn(_("remote doesn't support bookmarks\n"))
3207 ui.warn(_("remote doesn't support bookmarks\n"))
3207 return 0
3208 return 0
3208 ui.pager('incoming')
3209 ui.pager('incoming')
3209 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3210 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3210 return bookmarks.incoming(ui, repo, other)
3211 return bookmarks.incoming(ui, repo, other)
3211
3212
3212 repo._subtoppath = ui.expandpath(source)
3213 repo._subtoppath = ui.expandpath(source)
3213 try:
3214 try:
3214 return hg.incoming(ui, repo, source, opts)
3215 return hg.incoming(ui, repo, source, opts)
3215 finally:
3216 finally:
3216 del repo._subtoppath
3217 del repo._subtoppath
3217
3218
3218
3219
3219 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3220 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
3220 norepo=True)
3221 norepo=True)
3221 def init(ui, dest=".", **opts):
3222 def init(ui, dest=".", **opts):
3222 """create a new repository in the given directory
3223 """create a new repository in the given directory
3223
3224
3224 Initialize a new repository in the given directory. If the given
3225 Initialize a new repository in the given directory. If the given
3225 directory does not exist, it will be created.
3226 directory does not exist, it will be created.
3226
3227
3227 If no directory is given, the current directory is used.
3228 If no directory is given, the current directory is used.
3228
3229
3229 It is possible to specify an ``ssh://`` URL as the destination.
3230 It is possible to specify an ``ssh://`` URL as the destination.
3230 See :hg:`help urls` for more information.
3231 See :hg:`help urls` for more information.
3231
3232
3232 Returns 0 on success.
3233 Returns 0 on success.
3233 """
3234 """
3234 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3235 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3235
3236
3236 @command('locate',
3237 @command('locate',
3237 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3238 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3238 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3239 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3239 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3240 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3240 ] + walkopts,
3241 ] + walkopts,
3241 _('[OPTION]... [PATTERN]...'))
3242 _('[OPTION]... [PATTERN]...'))
3242 def locate(ui, repo, *pats, **opts):
3243 def locate(ui, repo, *pats, **opts):
3243 """locate files matching specific patterns (DEPRECATED)
3244 """locate files matching specific patterns (DEPRECATED)
3244
3245
3245 Print files under Mercurial control in the working directory whose
3246 Print files under Mercurial control in the working directory whose
3246 names match the given patterns.
3247 names match the given patterns.
3247
3248
3248 By default, this command searches all directories in the working
3249 By default, this command searches all directories in the working
3249 directory. To search just the current directory and its
3250 directory. To search just the current directory and its
3250 subdirectories, use "--include .".
3251 subdirectories, use "--include .".
3251
3252
3252 If no patterns are given to match, this command prints the names
3253 If no patterns are given to match, this command prints the names
3253 of all files under Mercurial control in the working directory.
3254 of all files under Mercurial control in the working directory.
3254
3255
3255 If you want to feed the output of this command into the "xargs"
3256 If you want to feed the output of this command into the "xargs"
3256 command, use the -0 option to both this command and "xargs". This
3257 command, use the -0 option to both this command and "xargs". This
3257 will avoid the problem of "xargs" treating single filenames that
3258 will avoid the problem of "xargs" treating single filenames that
3258 contain whitespace as multiple filenames.
3259 contain whitespace as multiple filenames.
3259
3260
3260 See :hg:`help files` for a more versatile command.
3261 See :hg:`help files` for a more versatile command.
3261
3262
3262 Returns 0 if a match is found, 1 otherwise.
3263 Returns 0 if a match is found, 1 otherwise.
3263 """
3264 """
3264 if opts.get('print0'):
3265 if opts.get('print0'):
3265 end = '\0'
3266 end = '\0'
3266 else:
3267 else:
3267 end = '\n'
3268 end = '\n'
3268 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3269 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3269
3270
3270 ret = 1
3271 ret = 1
3271 ctx = repo[rev]
3272 ctx = repo[rev]
3272 m = scmutil.match(ctx, pats, opts, default='relglob',
3273 m = scmutil.match(ctx, pats, opts, default='relglob',
3273 badfn=lambda x, y: False)
3274 badfn=lambda x, y: False)
3274
3275
3275 ui.pager('locate')
3276 ui.pager('locate')
3276 for abs in ctx.matches(m):
3277 for abs in ctx.matches(m):
3277 if opts.get('fullpath'):
3278 if opts.get('fullpath'):
3278 ui.write(repo.wjoin(abs), end)
3279 ui.write(repo.wjoin(abs), end)
3279 else:
3280 else:
3280 ui.write(((pats and m.rel(abs)) or abs), end)
3281 ui.write(((pats and m.rel(abs)) or abs), end)
3281 ret = 0
3282 ret = 0
3282
3283
3283 return ret
3284 return ret
3284
3285
3285 @command('^log|history',
3286 @command('^log|history',
3286 [('f', 'follow', None,
3287 [('f', 'follow', None,
3287 _('follow changeset history, or file history across copies and renames')),
3288 _('follow changeset history, or file history across copies and renames')),
3288 ('', 'follow-first', None,
3289 ('', 'follow-first', None,
3289 _('only follow the first parent of merge changesets (DEPRECATED)')),
3290 _('only follow the first parent of merge changesets (DEPRECATED)')),
3290 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3291 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3291 ('C', 'copies', None, _('show copied files')),
3292 ('C', 'copies', None, _('show copied files')),
3292 ('k', 'keyword', [],
3293 ('k', 'keyword', [],
3293 _('do case-insensitive search for a given text'), _('TEXT')),
3294 _('do case-insensitive search for a given text'), _('TEXT')),
3294 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3295 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
3295 ('', 'removed', None, _('include revisions where files were removed')),
3296 ('', 'removed', None, _('include revisions where files were removed')),
3296 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3297 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3297 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3298 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3298 ('', 'only-branch', [],
3299 ('', 'only-branch', [],
3299 _('show only changesets within the given named branch (DEPRECATED)'),
3300 _('show only changesets within the given named branch (DEPRECATED)'),
3300 _('BRANCH')),
3301 _('BRANCH')),
3301 ('b', 'branch', [],
3302 ('b', 'branch', [],
3302 _('show changesets within the given named branch'), _('BRANCH')),
3303 _('show changesets within the given named branch'), _('BRANCH')),
3303 ('P', 'prune', [],
3304 ('P', 'prune', [],
3304 _('do not display revision or any of its ancestors'), _('REV')),
3305 _('do not display revision or any of its ancestors'), _('REV')),
3305 ] + logopts + walkopts,
3306 ] + logopts + walkopts,
3306 _('[OPTION]... [FILE]'),
3307 _('[OPTION]... [FILE]'),
3307 inferrepo=True)
3308 inferrepo=True)
3308 def log(ui, repo, *pats, **opts):
3309 def log(ui, repo, *pats, **opts):
3309 """show revision history of entire repository or files
3310 """show revision history of entire repository or files
3310
3311
3311 Print the revision history of the specified files or the entire
3312 Print the revision history of the specified files or the entire
3312 project.
3313 project.
3313
3314
3314 If no revision range is specified, the default is ``tip:0`` unless
3315 If no revision range is specified, the default is ``tip:0`` unless
3315 --follow is set, in which case the working directory parent is
3316 --follow is set, in which case the working directory parent is
3316 used as the starting revision.
3317 used as the starting revision.
3317
3318
3318 File history is shown without following rename or copy history of
3319 File history is shown without following rename or copy history of
3319 files. Use -f/--follow with a filename to follow history across
3320 files. Use -f/--follow with a filename to follow history across
3320 renames and copies. --follow without a filename will only show
3321 renames and copies. --follow without a filename will only show
3321 ancestors or descendants of the starting revision.
3322 ancestors or descendants of the starting revision.
3322
3323
3323 By default this command prints revision number and changeset id,
3324 By default this command prints revision number and changeset id,
3324 tags, non-trivial parents, user, date and time, and a summary for
3325 tags, non-trivial parents, user, date and time, and a summary for
3325 each commit. When the -v/--verbose switch is used, the list of
3326 each commit. When the -v/--verbose switch is used, the list of
3326 changed files and full commit message are shown.
3327 changed files and full commit message are shown.
3327
3328
3328 With --graph the revisions are shown as an ASCII art DAG with the most
3329 With --graph the revisions are shown as an ASCII art DAG with the most
3329 recent changeset at the top.
3330 recent changeset at the top.
3330 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
3331 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
3331 and '+' represents a fork where the changeset from the lines below is a
3332 and '+' represents a fork where the changeset from the lines below is a
3332 parent of the 'o' merge on the same line.
3333 parent of the 'o' merge on the same line.
3333
3334
3334 .. note::
3335 .. note::
3335
3336
3336 :hg:`log --patch` may generate unexpected diff output for merge
3337 :hg:`log --patch` may generate unexpected diff output for merge
3337 changesets, as it will only compare the merge changeset against
3338 changesets, as it will only compare the merge changeset against
3338 its first parent. Also, only files different from BOTH parents
3339 its first parent. Also, only files different from BOTH parents
3339 will appear in files:.
3340 will appear in files:.
3340
3341
3341 .. note::
3342 .. note::
3342
3343
3343 For performance reasons, :hg:`log FILE` may omit duplicate changes
3344 For performance reasons, :hg:`log FILE` may omit duplicate changes
3344 made on branches and will not show removals or mode changes. To
3345 made on branches and will not show removals or mode changes. To
3345 see all such changes, use the --removed switch.
3346 see all such changes, use the --removed switch.
3346
3347
3347 .. container:: verbose
3348 .. container:: verbose
3348
3349
3349 Some examples:
3350 Some examples:
3350
3351
3351 - changesets with full descriptions and file lists::
3352 - changesets with full descriptions and file lists::
3352
3353
3353 hg log -v
3354 hg log -v
3354
3355
3355 - changesets ancestral to the working directory::
3356 - changesets ancestral to the working directory::
3356
3357
3357 hg log -f
3358 hg log -f
3358
3359
3359 - last 10 commits on the current branch::
3360 - last 10 commits on the current branch::
3360
3361
3361 hg log -l 10 -b .
3362 hg log -l 10 -b .
3362
3363
3363 - changesets showing all modifications of a file, including removals::
3364 - changesets showing all modifications of a file, including removals::
3364
3365
3365 hg log --removed file.c
3366 hg log --removed file.c
3366
3367
3367 - all changesets that touch a directory, with diffs, excluding merges::
3368 - all changesets that touch a directory, with diffs, excluding merges::
3368
3369
3369 hg log -Mp lib/
3370 hg log -Mp lib/
3370
3371
3371 - all revision numbers that match a keyword::
3372 - all revision numbers that match a keyword::
3372
3373
3373 hg log -k bug --template "{rev}\\n"
3374 hg log -k bug --template "{rev}\\n"
3374
3375
3375 - the full hash identifier of the working directory parent::
3376 - the full hash identifier of the working directory parent::
3376
3377
3377 hg log -r . --template "{node}\\n"
3378 hg log -r . --template "{node}\\n"
3378
3379
3379 - list available log templates::
3380 - list available log templates::
3380
3381
3381 hg log -T list
3382 hg log -T list
3382
3383
3383 - check if a given changeset is included in a tagged release::
3384 - check if a given changeset is included in a tagged release::
3384
3385
3385 hg log -r "a21ccf and ancestor(1.9)"
3386 hg log -r "a21ccf and ancestor(1.9)"
3386
3387
3387 - find all changesets by some user in a date range::
3388 - find all changesets by some user in a date range::
3388
3389
3389 hg log -k alice -d "may 2008 to jul 2008"
3390 hg log -k alice -d "may 2008 to jul 2008"
3390
3391
3391 - summary of all changesets after the last tag::
3392 - summary of all changesets after the last tag::
3392
3393
3393 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3394 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3394
3395
3395 See :hg:`help dates` for a list of formats valid for -d/--date.
3396 See :hg:`help dates` for a list of formats valid for -d/--date.
3396
3397
3397 See :hg:`help revisions` for more about specifying and ordering
3398 See :hg:`help revisions` for more about specifying and ordering
3398 revisions.
3399 revisions.
3399
3400
3400 See :hg:`help templates` for more about pre-packaged styles and
3401 See :hg:`help templates` for more about pre-packaged styles and
3401 specifying custom templates.
3402 specifying custom templates.
3402
3403
3403 Returns 0 on success.
3404 Returns 0 on success.
3404
3405
3405 """
3406 """
3406 opts = pycompat.byteskwargs(opts)
3407 opts = pycompat.byteskwargs(opts)
3407 if opts.get('follow') and opts.get('rev'):
3408 if opts.get('follow') and opts.get('rev'):
3408 opts['rev'] = [revsetlang.formatspec('reverse(::%lr)', opts.get('rev'))]
3409 opts['rev'] = [revsetlang.formatspec('reverse(::%lr)', opts.get('rev'))]
3409 del opts['follow']
3410 del opts['follow']
3410
3411
3411 if opts.get('graph'):
3412 if opts.get('graph'):
3412 return cmdutil.graphlog(ui, repo, pats, opts)
3413 return cmdutil.graphlog(ui, repo, pats, opts)
3413
3414
3414 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
3415 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
3415 limit = cmdutil.loglimit(opts)
3416 limit = cmdutil.loglimit(opts)
3416 count = 0
3417 count = 0
3417
3418
3418 getrenamed = None
3419 getrenamed = None
3419 if opts.get('copies'):
3420 if opts.get('copies'):
3420 endrev = None
3421 endrev = None
3421 if opts.get('rev'):
3422 if opts.get('rev'):
3422 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
3423 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
3423 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3424 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3424
3425
3425 ui.pager('log')
3426 ui.pager('log')
3426 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3427 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3427 for rev in revs:
3428 for rev in revs:
3428 if count == limit:
3429 if count == limit:
3429 break
3430 break
3430 ctx = repo[rev]
3431 ctx = repo[rev]
3431 copies = None
3432 copies = None
3432 if getrenamed is not None and rev:
3433 if getrenamed is not None and rev:
3433 copies = []
3434 copies = []
3434 for fn in ctx.files():
3435 for fn in ctx.files():
3435 rename = getrenamed(fn, rev)
3436 rename = getrenamed(fn, rev)
3436 if rename:
3437 if rename:
3437 copies.append((fn, rename[0]))
3438 copies.append((fn, rename[0]))
3438 if filematcher:
3439 if filematcher:
3439 revmatchfn = filematcher(ctx.rev())
3440 revmatchfn = filematcher(ctx.rev())
3440 else:
3441 else:
3441 revmatchfn = None
3442 revmatchfn = None
3442 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
3443 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
3443 if displayer.flush(ctx):
3444 if displayer.flush(ctx):
3444 count += 1
3445 count += 1
3445
3446
3446 displayer.close()
3447 displayer.close()
3447
3448
3448 @command('manifest',
3449 @command('manifest',
3449 [('r', 'rev', '', _('revision to display'), _('REV')),
3450 [('r', 'rev', '', _('revision to display'), _('REV')),
3450 ('', 'all', False, _("list files from all revisions"))]
3451 ('', 'all', False, _("list files from all revisions"))]
3451 + formatteropts,
3452 + formatteropts,
3452 _('[-r REV]'))
3453 _('[-r REV]'))
3453 def manifest(ui, repo, node=None, rev=None, **opts):
3454 def manifest(ui, repo, node=None, rev=None, **opts):
3454 """output the current or given revision of the project manifest
3455 """output the current or given revision of the project manifest
3455
3456
3456 Print a list of version controlled files for the given revision.
3457 Print a list of version controlled files for the given revision.
3457 If no revision is given, the first parent of the working directory
3458 If no revision is given, the first parent of the working directory
3458 is used, or the null revision if no revision is checked out.
3459 is used, or the null revision if no revision is checked out.
3459
3460
3460 With -v, print file permissions, symlink and executable bits.
3461 With -v, print file permissions, symlink and executable bits.
3461 With --debug, print file revision hashes.
3462 With --debug, print file revision hashes.
3462
3463
3463 If option --all is specified, the list of all files from all revisions
3464 If option --all is specified, the list of all files from all revisions
3464 is printed. This includes deleted and renamed files.
3465 is printed. This includes deleted and renamed files.
3465
3466
3466 Returns 0 on success.
3467 Returns 0 on success.
3467 """
3468 """
3468 fm = ui.formatter('manifest', opts)
3469 fm = ui.formatter('manifest', opts)
3469
3470
3470 if opts.get('all'):
3471 if opts.get('all'):
3471 if rev or node:
3472 if rev or node:
3472 raise error.Abort(_("can't specify a revision with --all"))
3473 raise error.Abort(_("can't specify a revision with --all"))
3473
3474
3474 res = []
3475 res = []
3475 prefix = "data/"
3476 prefix = "data/"
3476 suffix = ".i"
3477 suffix = ".i"
3477 plen = len(prefix)
3478 plen = len(prefix)
3478 slen = len(suffix)
3479 slen = len(suffix)
3479 with repo.lock():
3480 with repo.lock():
3480 for fn, b, size in repo.store.datafiles():
3481 for fn, b, size in repo.store.datafiles():
3481 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3482 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
3482 res.append(fn[plen:-slen])
3483 res.append(fn[plen:-slen])
3483 ui.pager('manifest')
3484 ui.pager('manifest')
3484 for f in res:
3485 for f in res:
3485 fm.startitem()
3486 fm.startitem()
3486 fm.write("path", '%s\n', f)
3487 fm.write("path", '%s\n', f)
3487 fm.end()
3488 fm.end()
3488 return
3489 return
3489
3490
3490 if rev and node:
3491 if rev and node:
3491 raise error.Abort(_("please specify just one revision"))
3492 raise error.Abort(_("please specify just one revision"))
3492
3493
3493 if not node:
3494 if not node:
3494 node = rev
3495 node = rev
3495
3496
3496 char = {'l': '@', 'x': '*', '': ''}
3497 char = {'l': '@', 'x': '*', '': ''}
3497 mode = {'l': '644', 'x': '755', '': '644'}
3498 mode = {'l': '644', 'x': '755', '': '644'}
3498 ctx = scmutil.revsingle(repo, node)
3499 ctx = scmutil.revsingle(repo, node)
3499 mf = ctx.manifest()
3500 mf = ctx.manifest()
3500 ui.pager('manifest')
3501 ui.pager('manifest')
3501 for f in ctx:
3502 for f in ctx:
3502 fm.startitem()
3503 fm.startitem()
3503 fl = ctx[f].flags()
3504 fl = ctx[f].flags()
3504 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3505 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
3505 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3506 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
3506 fm.write('path', '%s\n', f)
3507 fm.write('path', '%s\n', f)
3507 fm.end()
3508 fm.end()
3508
3509
3509 @command('^merge',
3510 @command('^merge',
3510 [('f', 'force', None,
3511 [('f', 'force', None,
3511 _('force a merge including outstanding changes (DEPRECATED)')),
3512 _('force a merge including outstanding changes (DEPRECATED)')),
3512 ('r', 'rev', '', _('revision to merge'), _('REV')),
3513 ('r', 'rev', '', _('revision to merge'), _('REV')),
3513 ('P', 'preview', None,
3514 ('P', 'preview', None,
3514 _('review revisions to merge (no merge is performed)'))
3515 _('review revisions to merge (no merge is performed)'))
3515 ] + mergetoolopts,
3516 ] + mergetoolopts,
3516 _('[-P] [[-r] REV]'))
3517 _('[-P] [[-r] REV]'))
3517 def merge(ui, repo, node=None, **opts):
3518 def merge(ui, repo, node=None, **opts):
3518 """merge another revision into working directory
3519 """merge another revision into working directory
3519
3520
3520 The current working directory is updated with all changes made in
3521 The current working directory is updated with all changes made in
3521 the requested revision since the last common predecessor revision.
3522 the requested revision since the last common predecessor revision.
3522
3523
3523 Files that changed between either parent are marked as changed for
3524 Files that changed between either parent are marked as changed for
3524 the next commit and a commit must be performed before any further
3525 the next commit and a commit must be performed before any further
3525 updates to the repository are allowed. The next commit will have
3526 updates to the repository are allowed. The next commit will have
3526 two parents.
3527 two parents.
3527
3528
3528 ``--tool`` can be used to specify the merge tool used for file
3529 ``--tool`` can be used to specify the merge tool used for file
3529 merges. It overrides the HGMERGE environment variable and your
3530 merges. It overrides the HGMERGE environment variable and your
3530 configuration files. See :hg:`help merge-tools` for options.
3531 configuration files. See :hg:`help merge-tools` for options.
3531
3532
3532 If no revision is specified, the working directory's parent is a
3533 If no revision is specified, the working directory's parent is a
3533 head revision, and the current branch contains exactly one other
3534 head revision, and the current branch contains exactly one other
3534 head, the other head is merged with by default. Otherwise, an
3535 head, the other head is merged with by default. Otherwise, an
3535 explicit revision with which to merge with must be provided.
3536 explicit revision with which to merge with must be provided.
3536
3537
3537 See :hg:`help resolve` for information on handling file conflicts.
3538 See :hg:`help resolve` for information on handling file conflicts.
3538
3539
3539 To undo an uncommitted merge, use :hg:`update --clean .` which
3540 To undo an uncommitted merge, use :hg:`update --clean .` which
3540 will check out a clean copy of the original merge parent, losing
3541 will check out a clean copy of the original merge parent, losing
3541 all changes.
3542 all changes.
3542
3543
3543 Returns 0 on success, 1 if there are unresolved files.
3544 Returns 0 on success, 1 if there are unresolved files.
3544 """
3545 """
3545
3546
3546 if opts.get('rev') and node:
3547 if opts.get('rev') and node:
3547 raise error.Abort(_("please specify just one revision"))
3548 raise error.Abort(_("please specify just one revision"))
3548 if not node:
3549 if not node:
3549 node = opts.get('rev')
3550 node = opts.get('rev')
3550
3551
3551 if node:
3552 if node:
3552 node = scmutil.revsingle(repo, node).node()
3553 node = scmutil.revsingle(repo, node).node()
3553
3554
3554 if not node:
3555 if not node:
3555 node = repo[destutil.destmerge(repo)].node()
3556 node = repo[destutil.destmerge(repo)].node()
3556
3557
3557 if opts.get('preview'):
3558 if opts.get('preview'):
3558 # find nodes that are ancestors of p2 but not of p1
3559 # find nodes that are ancestors of p2 but not of p1
3559 p1 = repo.lookup('.')
3560 p1 = repo.lookup('.')
3560 p2 = repo.lookup(node)
3561 p2 = repo.lookup(node)
3561 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3562 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
3562
3563
3563 displayer = cmdutil.show_changeset(ui, repo, opts)
3564 displayer = cmdutil.show_changeset(ui, repo, opts)
3564 for node in nodes:
3565 for node in nodes:
3565 displayer.show(repo[node])
3566 displayer.show(repo[node])
3566 displayer.close()
3567 displayer.close()
3567 return 0
3568 return 0
3568
3569
3569 try:
3570 try:
3570 # ui.forcemerge is an internal variable, do not document
3571 # ui.forcemerge is an internal variable, do not document
3571 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
3572 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
3572 force = opts.get('force')
3573 force = opts.get('force')
3573 labels = ['working copy', 'merge rev']
3574 labels = ['working copy', 'merge rev']
3574 return hg.merge(repo, node, force=force, mergeforce=force,
3575 return hg.merge(repo, node, force=force, mergeforce=force,
3575 labels=labels)
3576 labels=labels)
3576 finally:
3577 finally:
3577 ui.setconfig('ui', 'forcemerge', '', 'merge')
3578 ui.setconfig('ui', 'forcemerge', '', 'merge')
3578
3579
3579 @command('outgoing|out',
3580 @command('outgoing|out',
3580 [('f', 'force', None, _('run even when the destination is unrelated')),
3581 [('f', 'force', None, _('run even when the destination is unrelated')),
3581 ('r', 'rev', [],
3582 ('r', 'rev', [],
3582 _('a changeset intended to be included in the destination'), _('REV')),
3583 _('a changeset intended to be included in the destination'), _('REV')),
3583 ('n', 'newest-first', None, _('show newest record first')),
3584 ('n', 'newest-first', None, _('show newest record first')),
3584 ('B', 'bookmarks', False, _('compare bookmarks')),
3585 ('B', 'bookmarks', False, _('compare bookmarks')),
3585 ('b', 'branch', [], _('a specific branch you would like to push'),
3586 ('b', 'branch', [], _('a specific branch you would like to push'),
3586 _('BRANCH')),
3587 _('BRANCH')),
3587 ] + logopts + remoteopts + subrepoopts,
3588 ] + logopts + remoteopts + subrepoopts,
3588 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3589 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
3589 def outgoing(ui, repo, dest=None, **opts):
3590 def outgoing(ui, repo, dest=None, **opts):
3590 """show changesets not found in the destination
3591 """show changesets not found in the destination
3591
3592
3592 Show changesets not found in the specified destination repository
3593 Show changesets not found in the specified destination repository
3593 or the default push location. These are the changesets that would
3594 or the default push location. These are the changesets that would
3594 be pushed if a push was requested.
3595 be pushed if a push was requested.
3595
3596
3596 See pull for details of valid destination formats.
3597 See pull for details of valid destination formats.
3597
3598
3598 .. container:: verbose
3599 .. container:: verbose
3599
3600
3600 With -B/--bookmarks, the result of bookmark comparison between
3601 With -B/--bookmarks, the result of bookmark comparison between
3601 local and remote repositories is displayed. With -v/--verbose,
3602 local and remote repositories is displayed. With -v/--verbose,
3602 status is also displayed for each bookmark like below::
3603 status is also displayed for each bookmark like below::
3603
3604
3604 BM1 01234567890a added
3605 BM1 01234567890a added
3605 BM2 deleted
3606 BM2 deleted
3606 BM3 234567890abc advanced
3607 BM3 234567890abc advanced
3607 BM4 34567890abcd diverged
3608 BM4 34567890abcd diverged
3608 BM5 4567890abcde changed
3609 BM5 4567890abcde changed
3609
3610
3610 The action taken when pushing depends on the
3611 The action taken when pushing depends on the
3611 status of each bookmark:
3612 status of each bookmark:
3612
3613
3613 :``added``: push with ``-B`` will create it
3614 :``added``: push with ``-B`` will create it
3614 :``deleted``: push with ``-B`` will delete it
3615 :``deleted``: push with ``-B`` will delete it
3615 :``advanced``: push will update it
3616 :``advanced``: push will update it
3616 :``diverged``: push with ``-B`` will update it
3617 :``diverged``: push with ``-B`` will update it
3617 :``changed``: push with ``-B`` will update it
3618 :``changed``: push with ``-B`` will update it
3618
3619
3619 From the point of view of pushing behavior, bookmarks
3620 From the point of view of pushing behavior, bookmarks
3620 existing only in the remote repository are treated as
3621 existing only in the remote repository are treated as
3621 ``deleted``, even if it is in fact added remotely.
3622 ``deleted``, even if it is in fact added remotely.
3622
3623
3623 Returns 0 if there are outgoing changes, 1 otherwise.
3624 Returns 0 if there are outgoing changes, 1 otherwise.
3624 """
3625 """
3625 if opts.get('graph'):
3626 if opts.get('graph'):
3626 cmdutil.checkunsupportedgraphflags([], opts)
3627 cmdutil.checkunsupportedgraphflags([], opts)
3627 o, other = hg._outgoing(ui, repo, dest, opts)
3628 o, other = hg._outgoing(ui, repo, dest, opts)
3628 if not o:
3629 if not o:
3629 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3630 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3630 return
3631 return
3631
3632
3632 revdag = cmdutil.graphrevs(repo, o, opts)
3633 revdag = cmdutil.graphrevs(repo, o, opts)
3633 ui.pager('outgoing')
3634 ui.pager('outgoing')
3634 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3635 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
3635 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
3636 cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges)
3636 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3637 cmdutil.outgoinghooks(ui, repo, other, opts, o)
3637 return 0
3638 return 0
3638
3639
3639 if opts.get('bookmarks'):
3640 if opts.get('bookmarks'):
3640 dest = ui.expandpath(dest or 'default-push', dest or 'default')
3641 dest = ui.expandpath(dest or 'default-push', dest or 'default')
3641 dest, branches = hg.parseurl(dest, opts.get('branch'))
3642 dest, branches = hg.parseurl(dest, opts.get('branch'))
3642 other = hg.peer(repo, opts, dest)
3643 other = hg.peer(repo, opts, dest)
3643 if 'bookmarks' not in other.listkeys('namespaces'):
3644 if 'bookmarks' not in other.listkeys('namespaces'):
3644 ui.warn(_("remote doesn't support bookmarks\n"))
3645 ui.warn(_("remote doesn't support bookmarks\n"))
3645 return 0
3646 return 0
3646 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3647 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
3647 ui.pager('outgoing')
3648 ui.pager('outgoing')
3648 return bookmarks.outgoing(ui, repo, other)
3649 return bookmarks.outgoing(ui, repo, other)
3649
3650
3650 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
3651 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
3651 try:
3652 try:
3652 return hg.outgoing(ui, repo, dest, opts)
3653 return hg.outgoing(ui, repo, dest, opts)
3653 finally:
3654 finally:
3654 del repo._subtoppath
3655 del repo._subtoppath
3655
3656
3656 @command('parents',
3657 @command('parents',
3657 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3658 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
3658 ] + templateopts,
3659 ] + templateopts,
3659 _('[-r REV] [FILE]'),
3660 _('[-r REV] [FILE]'),
3660 inferrepo=True)
3661 inferrepo=True)
3661 def parents(ui, repo, file_=None, **opts):
3662 def parents(ui, repo, file_=None, **opts):
3662 """show the parents of the working directory or revision (DEPRECATED)
3663 """show the parents of the working directory or revision (DEPRECATED)
3663
3664
3664 Print the working directory's parent revisions. If a revision is
3665 Print the working directory's parent revisions. If a revision is
3665 given via -r/--rev, the parent of that revision will be printed.
3666 given via -r/--rev, the parent of that revision will be printed.
3666 If a file argument is given, the revision in which the file was
3667 If a file argument is given, the revision in which the file was
3667 last changed (before the working directory revision or the
3668 last changed (before the working directory revision or the
3668 argument to --rev if given) is printed.
3669 argument to --rev if given) is printed.
3669
3670
3670 This command is equivalent to::
3671 This command is equivalent to::
3671
3672
3672 hg log -r "p1()+p2()" or
3673 hg log -r "p1()+p2()" or
3673 hg log -r "p1(REV)+p2(REV)" or
3674 hg log -r "p1(REV)+p2(REV)" or
3674 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3675 hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or
3675 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3676 hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))"
3676
3677
3677 See :hg:`summary` and :hg:`help revsets` for related information.
3678 See :hg:`summary` and :hg:`help revsets` for related information.
3678
3679
3679 Returns 0 on success.
3680 Returns 0 on success.
3680 """
3681 """
3681
3682
3682 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3683 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3683
3684
3684 if file_:
3685 if file_:
3685 m = scmutil.match(ctx, (file_,), opts)
3686 m = scmutil.match(ctx, (file_,), opts)
3686 if m.anypats() or len(m.files()) != 1:
3687 if m.anypats() or len(m.files()) != 1:
3687 raise error.Abort(_('can only specify an explicit filename'))
3688 raise error.Abort(_('can only specify an explicit filename'))
3688 file_ = m.files()[0]
3689 file_ = m.files()[0]
3689 filenodes = []
3690 filenodes = []
3690 for cp in ctx.parents():
3691 for cp in ctx.parents():
3691 if not cp:
3692 if not cp:
3692 continue
3693 continue
3693 try:
3694 try:
3694 filenodes.append(cp.filenode(file_))
3695 filenodes.append(cp.filenode(file_))
3695 except error.LookupError:
3696 except error.LookupError:
3696 pass
3697 pass
3697 if not filenodes:
3698 if not filenodes:
3698 raise error.Abort(_("'%s' not found in manifest!") % file_)
3699 raise error.Abort(_("'%s' not found in manifest!") % file_)
3699 p = []
3700 p = []
3700 for fn in filenodes:
3701 for fn in filenodes:
3701 fctx = repo.filectx(file_, fileid=fn)
3702 fctx = repo.filectx(file_, fileid=fn)
3702 p.append(fctx.node())
3703 p.append(fctx.node())
3703 else:
3704 else:
3704 p = [cp.node() for cp in ctx.parents()]
3705 p = [cp.node() for cp in ctx.parents()]
3705
3706
3706 displayer = cmdutil.show_changeset(ui, repo, opts)
3707 displayer = cmdutil.show_changeset(ui, repo, opts)
3707 for n in p:
3708 for n in p:
3708 if n != nullid:
3709 if n != nullid:
3709 displayer.show(repo[n])
3710 displayer.show(repo[n])
3710 displayer.close()
3711 displayer.close()
3711
3712
3712 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
3713 @command('paths', formatteropts, _('[NAME]'), optionalrepo=True)
3713 def paths(ui, repo, search=None, **opts):
3714 def paths(ui, repo, search=None, **opts):
3714 """show aliases for remote repositories
3715 """show aliases for remote repositories
3715
3716
3716 Show definition of symbolic path name NAME. If no name is given,
3717 Show definition of symbolic path name NAME. If no name is given,
3717 show definition of all available names.
3718 show definition of all available names.
3718
3719
3719 Option -q/--quiet suppresses all output when searching for NAME
3720 Option -q/--quiet suppresses all output when searching for NAME
3720 and shows only the path names when listing all definitions.
3721 and shows only the path names when listing all definitions.
3721
3722
3722 Path names are defined in the [paths] section of your
3723 Path names are defined in the [paths] section of your
3723 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3724 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
3724 repository, ``.hg/hgrc`` is used, too.
3725 repository, ``.hg/hgrc`` is used, too.
3725
3726
3726 The path names ``default`` and ``default-push`` have a special
3727 The path names ``default`` and ``default-push`` have a special
3727 meaning. When performing a push or pull operation, they are used
3728 meaning. When performing a push or pull operation, they are used
3728 as fallbacks if no location is specified on the command-line.
3729 as fallbacks if no location is specified on the command-line.
3729 When ``default-push`` is set, it will be used for push and
3730 When ``default-push`` is set, it will be used for push and
3730 ``default`` will be used for pull; otherwise ``default`` is used
3731 ``default`` will be used for pull; otherwise ``default`` is used
3731 as the fallback for both. When cloning a repository, the clone
3732 as the fallback for both. When cloning a repository, the clone
3732 source is written as ``default`` in ``.hg/hgrc``.
3733 source is written as ``default`` in ``.hg/hgrc``.
3733
3734
3734 .. note::
3735 .. note::
3735
3736
3736 ``default`` and ``default-push`` apply to all inbound (e.g.
3737 ``default`` and ``default-push`` apply to all inbound (e.g.
3737 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3738 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email`
3738 and :hg:`bundle`) operations.
3739 and :hg:`bundle`) operations.
3739
3740
3740 See :hg:`help urls` for more information.
3741 See :hg:`help urls` for more information.
3741
3742
3742 Returns 0 on success.
3743 Returns 0 on success.
3743 """
3744 """
3744 ui.pager('paths')
3745 ui.pager('paths')
3745 if search:
3746 if search:
3746 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3747 pathitems = [(name, path) for name, path in ui.paths.iteritems()
3747 if name == search]
3748 if name == search]
3748 else:
3749 else:
3749 pathitems = sorted(ui.paths.iteritems())
3750 pathitems = sorted(ui.paths.iteritems())
3750
3751
3751 fm = ui.formatter('paths', opts)
3752 fm = ui.formatter('paths', opts)
3752 if fm.isplain():
3753 if fm.isplain():
3753 hidepassword = util.hidepassword
3754 hidepassword = util.hidepassword
3754 else:
3755 else:
3755 hidepassword = str
3756 hidepassword = str
3756 if ui.quiet:
3757 if ui.quiet:
3757 namefmt = '%s\n'
3758 namefmt = '%s\n'
3758 else:
3759 else:
3759 namefmt = '%s = '
3760 namefmt = '%s = '
3760 showsubopts = not search and not ui.quiet
3761 showsubopts = not search and not ui.quiet
3761
3762
3762 for name, path in pathitems:
3763 for name, path in pathitems:
3763 fm.startitem()
3764 fm.startitem()
3764 fm.condwrite(not search, 'name', namefmt, name)
3765 fm.condwrite(not search, 'name', namefmt, name)
3765 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3766 fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc))
3766 for subopt, value in sorted(path.suboptions.items()):
3767 for subopt, value in sorted(path.suboptions.items()):
3767 assert subopt not in ('name', 'url')
3768 assert subopt not in ('name', 'url')
3768 if showsubopts:
3769 if showsubopts:
3769 fm.plain('%s:%s = ' % (name, subopt))
3770 fm.plain('%s:%s = ' % (name, subopt))
3770 fm.condwrite(showsubopts, subopt, '%s\n', value)
3771 fm.condwrite(showsubopts, subopt, '%s\n', value)
3771
3772
3772 fm.end()
3773 fm.end()
3773
3774
3774 if search and not pathitems:
3775 if search and not pathitems:
3775 if not ui.quiet:
3776 if not ui.quiet:
3776 ui.warn(_("not found!\n"))
3777 ui.warn(_("not found!\n"))
3777 return 1
3778 return 1
3778 else:
3779 else:
3779 return 0
3780 return 0
3780
3781
3781 @command('phase',
3782 @command('phase',
3782 [('p', 'public', False, _('set changeset phase to public')),
3783 [('p', 'public', False, _('set changeset phase to public')),
3783 ('d', 'draft', False, _('set changeset phase to draft')),
3784 ('d', 'draft', False, _('set changeset phase to draft')),
3784 ('s', 'secret', False, _('set changeset phase to secret')),
3785 ('s', 'secret', False, _('set changeset phase to secret')),
3785 ('f', 'force', False, _('allow to move boundary backward')),
3786 ('f', 'force', False, _('allow to move boundary backward')),
3786 ('r', 'rev', [], _('target revision'), _('REV')),
3787 ('r', 'rev', [], _('target revision'), _('REV')),
3787 ],
3788 ],
3788 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3789 _('[-p|-d|-s] [-f] [-r] [REV...]'))
3789 def phase(ui, repo, *revs, **opts):
3790 def phase(ui, repo, *revs, **opts):
3790 """set or show the current phase name
3791 """set or show the current phase name
3791
3792
3792 With no argument, show the phase name of the current revision(s).
3793 With no argument, show the phase name of the current revision(s).
3793
3794
3794 With one of -p/--public, -d/--draft or -s/--secret, change the
3795 With one of -p/--public, -d/--draft or -s/--secret, change the
3795 phase value of the specified revisions.
3796 phase value of the specified revisions.
3796
3797
3797 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
3798 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
3798 lower phase to an higher phase. Phases are ordered as follows::
3799 lower phase to an higher phase. Phases are ordered as follows::
3799
3800
3800 public < draft < secret
3801 public < draft < secret
3801
3802
3802 Returns 0 on success, 1 if some phases could not be changed.
3803 Returns 0 on success, 1 if some phases could not be changed.
3803
3804
3804 (For more information about the phases concept, see :hg:`help phases`.)
3805 (For more information about the phases concept, see :hg:`help phases`.)
3805 """
3806 """
3806 # search for a unique phase argument
3807 # search for a unique phase argument
3807 targetphase = None
3808 targetphase = None
3808 for idx, name in enumerate(phases.phasenames):
3809 for idx, name in enumerate(phases.phasenames):
3809 if opts[name]:
3810 if opts[name]:
3810 if targetphase is not None:
3811 if targetphase is not None:
3811 raise error.Abort(_('only one phase can be specified'))
3812 raise error.Abort(_('only one phase can be specified'))
3812 targetphase = idx
3813 targetphase = idx
3813
3814
3814 # look for specified revision
3815 # look for specified revision
3815 revs = list(revs)
3816 revs = list(revs)
3816 revs.extend(opts['rev'])
3817 revs.extend(opts['rev'])
3817 if not revs:
3818 if not revs:
3818 # display both parents as the second parent phase can influence
3819 # display both parents as the second parent phase can influence
3819 # the phase of a merge commit
3820 # the phase of a merge commit
3820 revs = [c.rev() for c in repo[None].parents()]
3821 revs = [c.rev() for c in repo[None].parents()]
3821
3822
3822 revs = scmutil.revrange(repo, revs)
3823 revs = scmutil.revrange(repo, revs)
3823
3824
3824 lock = None
3825 lock = None
3825 ret = 0
3826 ret = 0
3826 if targetphase is None:
3827 if targetphase is None:
3827 # display
3828 # display
3828 for r in revs:
3829 for r in revs:
3829 ctx = repo[r]
3830 ctx = repo[r]
3830 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3831 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
3831 else:
3832 else:
3832 tr = None
3833 tr = None
3833 lock = repo.lock()
3834 lock = repo.lock()
3834 try:
3835 try:
3835 tr = repo.transaction("phase")
3836 tr = repo.transaction("phase")
3836 # set phase
3837 # set phase
3837 if not revs:
3838 if not revs:
3838 raise error.Abort(_('empty revision set'))
3839 raise error.Abort(_('empty revision set'))
3839 nodes = [repo[r].node() for r in revs]
3840 nodes = [repo[r].node() for r in revs]
3840 # moving revision from public to draft may hide them
3841 # moving revision from public to draft may hide them
3841 # We have to check result on an unfiltered repository
3842 # We have to check result on an unfiltered repository
3842 unfi = repo.unfiltered()
3843 unfi = repo.unfiltered()
3843 getphase = unfi._phasecache.phase
3844 getphase = unfi._phasecache.phase
3844 olddata = [getphase(unfi, r) for r in unfi]
3845 olddata = [getphase(unfi, r) for r in unfi]
3845 phases.advanceboundary(repo, tr, targetphase, nodes)
3846 phases.advanceboundary(repo, tr, targetphase, nodes)
3846 if opts['force']:
3847 if opts['force']:
3847 phases.retractboundary(repo, tr, targetphase, nodes)
3848 phases.retractboundary(repo, tr, targetphase, nodes)
3848 tr.close()
3849 tr.close()
3849 finally:
3850 finally:
3850 if tr is not None:
3851 if tr is not None:
3851 tr.release()
3852 tr.release()
3852 lock.release()
3853 lock.release()
3853 getphase = unfi._phasecache.phase
3854 getphase = unfi._phasecache.phase
3854 newdata = [getphase(unfi, r) for r in unfi]
3855 newdata = [getphase(unfi, r) for r in unfi]
3855 changes = sum(newdata[r] != olddata[r] for r in unfi)
3856 changes = sum(newdata[r] != olddata[r] for r in unfi)
3856 cl = unfi.changelog
3857 cl = unfi.changelog
3857 rejected = [n for n in nodes
3858 rejected = [n for n in nodes
3858 if newdata[cl.rev(n)] < targetphase]
3859 if newdata[cl.rev(n)] < targetphase]
3859 if rejected:
3860 if rejected:
3860 ui.warn(_('cannot move %i changesets to a higher '
3861 ui.warn(_('cannot move %i changesets to a higher '
3861 'phase, use --force\n') % len(rejected))
3862 'phase, use --force\n') % len(rejected))
3862 ret = 1
3863 ret = 1
3863 if changes:
3864 if changes:
3864 msg = _('phase changed for %i changesets\n') % changes
3865 msg = _('phase changed for %i changesets\n') % changes
3865 if ret:
3866 if ret:
3866 ui.status(msg)
3867 ui.status(msg)
3867 else:
3868 else:
3868 ui.note(msg)
3869 ui.note(msg)
3869 else:
3870 else:
3870 ui.warn(_('no phases changed\n'))
3871 ui.warn(_('no phases changed\n'))
3871 return ret
3872 return ret
3872
3873
3873 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
3874 def postincoming(ui, repo, modheads, optupdate, checkout, brev):
3874 """Run after a changegroup has been added via pull/unbundle
3875 """Run after a changegroup has been added via pull/unbundle
3875
3876
3876 This takes arguments below:
3877 This takes arguments below:
3877
3878
3878 :modheads: change of heads by pull/unbundle
3879 :modheads: change of heads by pull/unbundle
3879 :optupdate: updating working directory is needed or not
3880 :optupdate: updating working directory is needed or not
3880 :checkout: update destination revision (or None to default destination)
3881 :checkout: update destination revision (or None to default destination)
3881 :brev: a name, which might be a bookmark to be activated after updating
3882 :brev: a name, which might be a bookmark to be activated after updating
3882 """
3883 """
3883 if modheads == 0:
3884 if modheads == 0:
3884 return
3885 return
3885 if optupdate:
3886 if optupdate:
3886 try:
3887 try:
3887 return hg.updatetotally(ui, repo, checkout, brev)
3888 return hg.updatetotally(ui, repo, checkout, brev)
3888 except error.UpdateAbort as inst:
3889 except error.UpdateAbort as inst:
3889 msg = _("not updating: %s") % str(inst)
3890 msg = _("not updating: %s") % str(inst)
3890 hint = inst.hint
3891 hint = inst.hint
3891 raise error.UpdateAbort(msg, hint=hint)
3892 raise error.UpdateAbort(msg, hint=hint)
3892 if modheads > 1:
3893 if modheads > 1:
3893 currentbranchheads = len(repo.branchheads())
3894 currentbranchheads = len(repo.branchheads())
3894 if currentbranchheads == modheads:
3895 if currentbranchheads == modheads:
3895 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3896 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
3896 elif currentbranchheads > 1:
3897 elif currentbranchheads > 1:
3897 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
3898 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
3898 "merge)\n"))
3899 "merge)\n"))
3899 else:
3900 else:
3900 ui.status(_("(run 'hg heads' to see heads)\n"))
3901 ui.status(_("(run 'hg heads' to see heads)\n"))
3901 else:
3902 else:
3902 ui.status(_("(run 'hg update' to get a working copy)\n"))
3903 ui.status(_("(run 'hg update' to get a working copy)\n"))
3903
3904
3904 @command('^pull',
3905 @command('^pull',
3905 [('u', 'update', None,
3906 [('u', 'update', None,
3906 _('update to new branch head if changesets were pulled')),
3907 _('update to new branch head if changesets were pulled')),
3907 ('f', 'force', None, _('run even when remote repository is unrelated')),
3908 ('f', 'force', None, _('run even when remote repository is unrelated')),
3908 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3909 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3909 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
3910 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
3910 ('b', 'branch', [], _('a specific branch you would like to pull'),
3911 ('b', 'branch', [], _('a specific branch you would like to pull'),
3911 _('BRANCH')),
3912 _('BRANCH')),
3912 ] + remoteopts,
3913 ] + remoteopts,
3913 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
3914 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
3914 def pull(ui, repo, source="default", **opts):
3915 def pull(ui, repo, source="default", **opts):
3915 """pull changes from the specified source
3916 """pull changes from the specified source
3916
3917
3917 Pull changes from a remote repository to a local one.
3918 Pull changes from a remote repository to a local one.
3918
3919
3919 This finds all changes from the repository at the specified path
3920 This finds all changes from the repository at the specified path
3920 or URL and adds them to a local repository (the current one unless
3921 or URL and adds them to a local repository (the current one unless
3921 -R is specified). By default, this does not update the copy of the
3922 -R is specified). By default, this does not update the copy of the
3922 project in the working directory.
3923 project in the working directory.
3923
3924
3924 Use :hg:`incoming` if you want to see what would have been added
3925 Use :hg:`incoming` if you want to see what would have been added
3925 by a pull at the time you issued this command. If you then decide
3926 by a pull at the time you issued this command. If you then decide
3926 to add those changes to the repository, you should use :hg:`pull
3927 to add those changes to the repository, you should use :hg:`pull
3927 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
3928 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
3928
3929
3929 If SOURCE is omitted, the 'default' path will be used.
3930 If SOURCE is omitted, the 'default' path will be used.
3930 See :hg:`help urls` for more information.
3931 See :hg:`help urls` for more information.
3931
3932
3932 Specifying bookmark as ``.`` is equivalent to specifying the active
3933 Specifying bookmark as ``.`` is equivalent to specifying the active
3933 bookmark's name.
3934 bookmark's name.
3934
3935
3935 Returns 0 on success, 1 if an update had unresolved files.
3936 Returns 0 on success, 1 if an update had unresolved files.
3936 """
3937 """
3937 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
3938 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
3938 ui.status(_('pulling from %s\n') % util.hidepassword(source))
3939 ui.status(_('pulling from %s\n') % util.hidepassword(source))
3939 other = hg.peer(repo, opts, source)
3940 other = hg.peer(repo, opts, source)
3940 try:
3941 try:
3941 revs, checkout = hg.addbranchrevs(repo, other, branches,
3942 revs, checkout = hg.addbranchrevs(repo, other, branches,
3942 opts.get('rev'))
3943 opts.get('rev'))
3943
3944
3944
3945
3945 pullopargs = {}
3946 pullopargs = {}
3946 if opts.get('bookmark'):
3947 if opts.get('bookmark'):
3947 if not revs:
3948 if not revs:
3948 revs = []
3949 revs = []
3949 # The list of bookmark used here is not the one used to actually
3950 # The list of bookmark used here is not the one used to actually
3950 # update the bookmark name. This can result in the revision pulled
3951 # update the bookmark name. This can result in the revision pulled
3951 # not ending up with the name of the bookmark because of a race
3952 # not ending up with the name of the bookmark because of a race
3952 # condition on the server. (See issue 4689 for details)
3953 # condition on the server. (See issue 4689 for details)
3953 remotebookmarks = other.listkeys('bookmarks')
3954 remotebookmarks = other.listkeys('bookmarks')
3954 pullopargs['remotebookmarks'] = remotebookmarks
3955 pullopargs['remotebookmarks'] = remotebookmarks
3955 for b in opts['bookmark']:
3956 for b in opts['bookmark']:
3956 b = repo._bookmarks.expandname(b)
3957 b = repo._bookmarks.expandname(b)
3957 if b not in remotebookmarks:
3958 if b not in remotebookmarks:
3958 raise error.Abort(_('remote bookmark %s not found!') % b)
3959 raise error.Abort(_('remote bookmark %s not found!') % b)
3959 revs.append(remotebookmarks[b])
3960 revs.append(remotebookmarks[b])
3960
3961
3961 if revs:
3962 if revs:
3962 try:
3963 try:
3963 # When 'rev' is a bookmark name, we cannot guarantee that it
3964 # When 'rev' is a bookmark name, we cannot guarantee that it
3964 # will be updated with that name because of a race condition
3965 # will be updated with that name because of a race condition
3965 # server side. (See issue 4689 for details)
3966 # server side. (See issue 4689 for details)
3966 oldrevs = revs
3967 oldrevs = revs
3967 revs = [] # actually, nodes
3968 revs = [] # actually, nodes
3968 for r in oldrevs:
3969 for r in oldrevs:
3969 node = other.lookup(r)
3970 node = other.lookup(r)
3970 revs.append(node)
3971 revs.append(node)
3971 if r == checkout:
3972 if r == checkout:
3972 checkout = node
3973 checkout = node
3973 except error.CapabilityError:
3974 except error.CapabilityError:
3974 err = _("other repository doesn't support revision lookup, "
3975 err = _("other repository doesn't support revision lookup, "
3975 "so a rev cannot be specified.")
3976 "so a rev cannot be specified.")
3976 raise error.Abort(err)
3977 raise error.Abort(err)
3977
3978
3978 pullopargs.update(opts.get('opargs', {}))
3979 pullopargs.update(opts.get('opargs', {}))
3979 modheads = exchange.pull(repo, other, heads=revs,
3980 modheads = exchange.pull(repo, other, heads=revs,
3980 force=opts.get('force'),
3981 force=opts.get('force'),
3981 bookmarks=opts.get('bookmark', ()),
3982 bookmarks=opts.get('bookmark', ()),
3982 opargs=pullopargs).cgresult
3983 opargs=pullopargs).cgresult
3983
3984
3984 # brev is a name, which might be a bookmark to be activated at
3985 # brev is a name, which might be a bookmark to be activated at
3985 # the end of the update. In other words, it is an explicit
3986 # the end of the update. In other words, it is an explicit
3986 # destination of the update
3987 # destination of the update
3987 brev = None
3988 brev = None
3988
3989
3989 if checkout:
3990 if checkout:
3990 checkout = str(repo.changelog.rev(checkout))
3991 checkout = str(repo.changelog.rev(checkout))
3991
3992
3992 # order below depends on implementation of
3993 # order below depends on implementation of
3993 # hg.addbranchrevs(). opts['bookmark'] is ignored,
3994 # hg.addbranchrevs(). opts['bookmark'] is ignored,
3994 # because 'checkout' is determined without it.
3995 # because 'checkout' is determined without it.
3995 if opts.get('rev'):
3996 if opts.get('rev'):
3996 brev = opts['rev'][0]
3997 brev = opts['rev'][0]
3997 elif opts.get('branch'):
3998 elif opts.get('branch'):
3998 brev = opts['branch'][0]
3999 brev = opts['branch'][0]
3999 else:
4000 else:
4000 brev = branches[0]
4001 brev = branches[0]
4001 repo._subtoppath = source
4002 repo._subtoppath = source
4002 try:
4003 try:
4003 ret = postincoming(ui, repo, modheads, opts.get('update'),
4004 ret = postincoming(ui, repo, modheads, opts.get('update'),
4004 checkout, brev)
4005 checkout, brev)
4005
4006
4006 finally:
4007 finally:
4007 del repo._subtoppath
4008 del repo._subtoppath
4008
4009
4009 finally:
4010 finally:
4010 other.close()
4011 other.close()
4011 return ret
4012 return ret
4012
4013
4013 @command('^push',
4014 @command('^push',
4014 [('f', 'force', None, _('force push')),
4015 [('f', 'force', None, _('force push')),
4015 ('r', 'rev', [],
4016 ('r', 'rev', [],
4016 _('a changeset intended to be included in the destination'),
4017 _('a changeset intended to be included in the destination'),
4017 _('REV')),
4018 _('REV')),
4018 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4019 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4019 ('b', 'branch', [],
4020 ('b', 'branch', [],
4020 _('a specific branch you would like to push'), _('BRANCH')),
4021 _('a specific branch you would like to push'), _('BRANCH')),
4021 ('', 'new-branch', False, _('allow pushing a new branch')),
4022 ('', 'new-branch', False, _('allow pushing a new branch')),
4022 ] + remoteopts,
4023 ] + remoteopts,
4023 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4024 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4024 def push(ui, repo, dest=None, **opts):
4025 def push(ui, repo, dest=None, **opts):
4025 """push changes to the specified destination
4026 """push changes to the specified destination
4026
4027
4027 Push changesets from the local repository to the specified
4028 Push changesets from the local repository to the specified
4028 destination.
4029 destination.
4029
4030
4030 This operation is symmetrical to pull: it is identical to a pull
4031 This operation is symmetrical to pull: it is identical to a pull
4031 in the destination repository from the current one.
4032 in the destination repository from the current one.
4032
4033
4033 By default, push will not allow creation of new heads at the
4034 By default, push will not allow creation of new heads at the
4034 destination, since multiple heads would make it unclear which head
4035 destination, since multiple heads would make it unclear which head
4035 to use. In this situation, it is recommended to pull and merge
4036 to use. In this situation, it is recommended to pull and merge
4036 before pushing.
4037 before pushing.
4037
4038
4038 Use --new-branch if you want to allow push to create a new named
4039 Use --new-branch if you want to allow push to create a new named
4039 branch that is not present at the destination. This allows you to
4040 branch that is not present at the destination. This allows you to
4040 only create a new branch without forcing other changes.
4041 only create a new branch without forcing other changes.
4041
4042
4042 .. note::
4043 .. note::
4043
4044
4044 Extra care should be taken with the -f/--force option,
4045 Extra care should be taken with the -f/--force option,
4045 which will push all new heads on all branches, an action which will
4046 which will push all new heads on all branches, an action which will
4046 almost always cause confusion for collaborators.
4047 almost always cause confusion for collaborators.
4047
4048
4048 If -r/--rev is used, the specified revision and all its ancestors
4049 If -r/--rev is used, the specified revision and all its ancestors
4049 will be pushed to the remote repository.
4050 will be pushed to the remote repository.
4050
4051
4051 If -B/--bookmark is used, the specified bookmarked revision, its
4052 If -B/--bookmark is used, the specified bookmarked revision, its
4052 ancestors, and the bookmark will be pushed to the remote
4053 ancestors, and the bookmark will be pushed to the remote
4053 repository. Specifying ``.`` is equivalent to specifying the active
4054 repository. Specifying ``.`` is equivalent to specifying the active
4054 bookmark's name.
4055 bookmark's name.
4055
4056
4056 Please see :hg:`help urls` for important details about ``ssh://``
4057 Please see :hg:`help urls` for important details about ``ssh://``
4057 URLs. If DESTINATION is omitted, a default path will be used.
4058 URLs. If DESTINATION is omitted, a default path will be used.
4058
4059
4059 Returns 0 if push was successful, 1 if nothing to push.
4060 Returns 0 if push was successful, 1 if nothing to push.
4060 """
4061 """
4061
4062
4062 if opts.get('bookmark'):
4063 if opts.get('bookmark'):
4063 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4064 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
4064 for b in opts['bookmark']:
4065 for b in opts['bookmark']:
4065 # translate -B options to -r so changesets get pushed
4066 # translate -B options to -r so changesets get pushed
4066 b = repo._bookmarks.expandname(b)
4067 b = repo._bookmarks.expandname(b)
4067 if b in repo._bookmarks:
4068 if b in repo._bookmarks:
4068 opts.setdefault('rev', []).append(b)
4069 opts.setdefault('rev', []).append(b)
4069 else:
4070 else:
4070 # if we try to push a deleted bookmark, translate it to null
4071 # if we try to push a deleted bookmark, translate it to null
4071 # this lets simultaneous -r, -b options continue working
4072 # this lets simultaneous -r, -b options continue working
4072 opts.setdefault('rev', []).append("null")
4073 opts.setdefault('rev', []).append("null")
4073
4074
4074 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4075 path = ui.paths.getpath(dest, default=('default-push', 'default'))
4075 if not path:
4076 if not path:
4076 raise error.Abort(_('default repository not configured!'),
4077 raise error.Abort(_('default repository not configured!'),
4077 hint=_("see 'hg help config.paths'"))
4078 hint=_("see 'hg help config.paths'"))
4078 dest = path.pushloc or path.loc
4079 dest = path.pushloc or path.loc
4079 branches = (path.branch, opts.get('branch') or [])
4080 branches = (path.branch, opts.get('branch') or [])
4080 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4081 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4081 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4082 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4082 other = hg.peer(repo, opts, dest)
4083 other = hg.peer(repo, opts, dest)
4083
4084
4084 if revs:
4085 if revs:
4085 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4086 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4086 if not revs:
4087 if not revs:
4087 raise error.Abort(_("specified revisions evaluate to an empty set"),
4088 raise error.Abort(_("specified revisions evaluate to an empty set"),
4088 hint=_("use different revision arguments"))
4089 hint=_("use different revision arguments"))
4089 elif path.pushrev:
4090 elif path.pushrev:
4090 # It doesn't make any sense to specify ancestor revisions. So limit
4091 # It doesn't make any sense to specify ancestor revisions. So limit
4091 # to DAG heads to make discovery simpler.
4092 # to DAG heads to make discovery simpler.
4092 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4093 expr = revsetlang.formatspec('heads(%r)', path.pushrev)
4093 revs = scmutil.revrange(repo, [expr])
4094 revs = scmutil.revrange(repo, [expr])
4094 revs = [repo[rev].node() for rev in revs]
4095 revs = [repo[rev].node() for rev in revs]
4095 if not revs:
4096 if not revs:
4096 raise error.Abort(_('default push revset for path evaluates to an '
4097 raise error.Abort(_('default push revset for path evaluates to an '
4097 'empty set'))
4098 'empty set'))
4098
4099
4099 repo._subtoppath = dest
4100 repo._subtoppath = dest
4100 try:
4101 try:
4101 # push subrepos depth-first for coherent ordering
4102 # push subrepos depth-first for coherent ordering
4102 c = repo['']
4103 c = repo['']
4103 subs = c.substate # only repos that are committed
4104 subs = c.substate # only repos that are committed
4104 for s in sorted(subs):
4105 for s in sorted(subs):
4105 result = c.sub(s).push(opts)
4106 result = c.sub(s).push(opts)
4106 if result == 0:
4107 if result == 0:
4107 return not result
4108 return not result
4108 finally:
4109 finally:
4109 del repo._subtoppath
4110 del repo._subtoppath
4110 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4111 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
4111 newbranch=opts.get('new_branch'),
4112 newbranch=opts.get('new_branch'),
4112 bookmarks=opts.get('bookmark', ()),
4113 bookmarks=opts.get('bookmark', ()),
4113 opargs=opts.get('opargs'))
4114 opargs=opts.get('opargs'))
4114
4115
4115 result = not pushop.cgresult
4116 result = not pushop.cgresult
4116
4117
4117 if pushop.bkresult is not None:
4118 if pushop.bkresult is not None:
4118 if pushop.bkresult == 2:
4119 if pushop.bkresult == 2:
4119 result = 2
4120 result = 2
4120 elif not result and pushop.bkresult:
4121 elif not result and pushop.bkresult:
4121 result = 2
4122 result = 2
4122
4123
4123 return result
4124 return result
4124
4125
4125 @command('recover', [])
4126 @command('recover', [])
4126 def recover(ui, repo):
4127 def recover(ui, repo):
4127 """roll back an interrupted transaction
4128 """roll back an interrupted transaction
4128
4129
4129 Recover from an interrupted commit or pull.
4130 Recover from an interrupted commit or pull.
4130
4131
4131 This command tries to fix the repository status after an
4132 This command tries to fix the repository status after an
4132 interrupted operation. It should only be necessary when Mercurial
4133 interrupted operation. It should only be necessary when Mercurial
4133 suggests it.
4134 suggests it.
4134
4135
4135 Returns 0 if successful, 1 if nothing to recover or verify fails.
4136 Returns 0 if successful, 1 if nothing to recover or verify fails.
4136 """
4137 """
4137 if repo.recover():
4138 if repo.recover():
4138 return hg.verify(repo)
4139 return hg.verify(repo)
4139 return 1
4140 return 1
4140
4141
4141 @command('^remove|rm',
4142 @command('^remove|rm',
4142 [('A', 'after', None, _('record delete for missing files')),
4143 [('A', 'after', None, _('record delete for missing files')),
4143 ('f', 'force', None,
4144 ('f', 'force', None,
4144 _('forget added files, delete modified files')),
4145 _('forget added files, delete modified files')),
4145 ] + subrepoopts + walkopts,
4146 ] + subrepoopts + walkopts,
4146 _('[OPTION]... FILE...'),
4147 _('[OPTION]... FILE...'),
4147 inferrepo=True)
4148 inferrepo=True)
4148 def remove(ui, repo, *pats, **opts):
4149 def remove(ui, repo, *pats, **opts):
4149 """remove the specified files on the next commit
4150 """remove the specified files on the next commit
4150
4151
4151 Schedule the indicated files for removal from the current branch.
4152 Schedule the indicated files for removal from the current branch.
4152
4153
4153 This command schedules the files to be removed at the next commit.
4154 This command schedules the files to be removed at the next commit.
4154 To undo a remove before that, see :hg:`revert`. To undo added
4155 To undo a remove before that, see :hg:`revert`. To undo added
4155 files, see :hg:`forget`.
4156 files, see :hg:`forget`.
4156
4157
4157 .. container:: verbose
4158 .. container:: verbose
4158
4159
4159 -A/--after can be used to remove only files that have already
4160 -A/--after can be used to remove only files that have already
4160 been deleted, -f/--force can be used to force deletion, and -Af
4161 been deleted, -f/--force can be used to force deletion, and -Af
4161 can be used to remove files from the next revision without
4162 can be used to remove files from the next revision without
4162 deleting them from the working directory.
4163 deleting them from the working directory.
4163
4164
4164 The following table details the behavior of remove for different
4165 The following table details the behavior of remove for different
4165 file states (columns) and option combinations (rows). The file
4166 file states (columns) and option combinations (rows). The file
4166 states are Added [A], Clean [C], Modified [M] and Missing [!]
4167 states are Added [A], Clean [C], Modified [M] and Missing [!]
4167 (as reported by :hg:`status`). The actions are Warn, Remove
4168 (as reported by :hg:`status`). The actions are Warn, Remove
4168 (from branch) and Delete (from disk):
4169 (from branch) and Delete (from disk):
4169
4170
4170 ========= == == == ==
4171 ========= == == == ==
4171 opt/state A C M !
4172 opt/state A C M !
4172 ========= == == == ==
4173 ========= == == == ==
4173 none W RD W R
4174 none W RD W R
4174 -f R RD RD R
4175 -f R RD RD R
4175 -A W W W R
4176 -A W W W R
4176 -Af R R R R
4177 -Af R R R R
4177 ========= == == == ==
4178 ========= == == == ==
4178
4179
4179 .. note::
4180 .. note::
4180
4181
4181 :hg:`remove` never deletes files in Added [A] state from the
4182 :hg:`remove` never deletes files in Added [A] state from the
4182 working directory, not even if ``--force`` is specified.
4183 working directory, not even if ``--force`` is specified.
4183
4184
4184 Returns 0 on success, 1 if any warnings encountered.
4185 Returns 0 on success, 1 if any warnings encountered.
4185 """
4186 """
4186
4187
4187 after, force = opts.get('after'), opts.get('force')
4188 after, force = opts.get('after'), opts.get('force')
4188 if not pats and not after:
4189 if not pats and not after:
4189 raise error.Abort(_('no files specified'))
4190 raise error.Abort(_('no files specified'))
4190
4191
4191 m = scmutil.match(repo[None], pats, opts)
4192 m = scmutil.match(repo[None], pats, opts)
4192 subrepos = opts.get('subrepos')
4193 subrepos = opts.get('subrepos')
4193 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
4194 return cmdutil.remove(ui, repo, m, "", after, force, subrepos)
4194
4195
4195 @command('rename|move|mv',
4196 @command('rename|move|mv',
4196 [('A', 'after', None, _('record a rename that has already occurred')),
4197 [('A', 'after', None, _('record a rename that has already occurred')),
4197 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4198 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4198 ] + walkopts + dryrunopts,
4199 ] + walkopts + dryrunopts,
4199 _('[OPTION]... SOURCE... DEST'))
4200 _('[OPTION]... SOURCE... DEST'))
4200 def rename(ui, repo, *pats, **opts):
4201 def rename(ui, repo, *pats, **opts):
4201 """rename files; equivalent of copy + remove
4202 """rename files; equivalent of copy + remove
4202
4203
4203 Mark dest as copies of sources; mark sources for deletion. If dest
4204 Mark dest as copies of sources; mark sources for deletion. If dest
4204 is a directory, copies are put in that directory. If dest is a
4205 is a directory, copies are put in that directory. If dest is a
4205 file, there can only be one source.
4206 file, there can only be one source.
4206
4207
4207 By default, this command copies the contents of files as they
4208 By default, this command copies the contents of files as they
4208 exist in the working directory. If invoked with -A/--after, the
4209 exist in the working directory. If invoked with -A/--after, the
4209 operation is recorded, but no copying is performed.
4210 operation is recorded, but no copying is performed.
4210
4211
4211 This command takes effect at the next commit. To undo a rename
4212 This command takes effect at the next commit. To undo a rename
4212 before that, see :hg:`revert`.
4213 before that, see :hg:`revert`.
4213
4214
4214 Returns 0 on success, 1 if errors are encountered.
4215 Returns 0 on success, 1 if errors are encountered.
4215 """
4216 """
4216 with repo.wlock(False):
4217 with repo.wlock(False):
4217 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4218 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4218
4219
4219 @command('resolve',
4220 @command('resolve',
4220 [('a', 'all', None, _('select all unresolved files')),
4221 [('a', 'all', None, _('select all unresolved files')),
4221 ('l', 'list', None, _('list state of files needing merge')),
4222 ('l', 'list', None, _('list state of files needing merge')),
4222 ('m', 'mark', None, _('mark files as resolved')),
4223 ('m', 'mark', None, _('mark files as resolved')),
4223 ('u', 'unmark', None, _('mark files as unresolved')),
4224 ('u', 'unmark', None, _('mark files as unresolved')),
4224 ('n', 'no-status', None, _('hide status prefix'))]
4225 ('n', 'no-status', None, _('hide status prefix'))]
4225 + mergetoolopts + walkopts + formatteropts,
4226 + mergetoolopts + walkopts + formatteropts,
4226 _('[OPTION]... [FILE]...'),
4227 _('[OPTION]... [FILE]...'),
4227 inferrepo=True)
4228 inferrepo=True)
4228 def resolve(ui, repo, *pats, **opts):
4229 def resolve(ui, repo, *pats, **opts):
4229 """redo merges or set/view the merge status of files
4230 """redo merges or set/view the merge status of files
4230
4231
4231 Merges with unresolved conflicts are often the result of
4232 Merges with unresolved conflicts are often the result of
4232 non-interactive merging using the ``internal:merge`` configuration
4233 non-interactive merging using the ``internal:merge`` configuration
4233 setting, or a command-line merge tool like ``diff3``. The resolve
4234 setting, or a command-line merge tool like ``diff3``. The resolve
4234 command is used to manage the files involved in a merge, after
4235 command is used to manage the files involved in a merge, after
4235 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4236 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4236 working directory must have two parents). See :hg:`help
4237 working directory must have two parents). See :hg:`help
4237 merge-tools` for information on configuring merge tools.
4238 merge-tools` for information on configuring merge tools.
4238
4239
4239 The resolve command can be used in the following ways:
4240 The resolve command can be used in the following ways:
4240
4241
4241 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4242 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4242 files, discarding any previous merge attempts. Re-merging is not
4243 files, discarding any previous merge attempts. Re-merging is not
4243 performed for files already marked as resolved. Use ``--all/-a``
4244 performed for files already marked as resolved. Use ``--all/-a``
4244 to select all unresolved files. ``--tool`` can be used to specify
4245 to select all unresolved files. ``--tool`` can be used to specify
4245 the merge tool used for the given files. It overrides the HGMERGE
4246 the merge tool used for the given files. It overrides the HGMERGE
4246 environment variable and your configuration files. Previous file
4247 environment variable and your configuration files. Previous file
4247 contents are saved with a ``.orig`` suffix.
4248 contents are saved with a ``.orig`` suffix.
4248
4249
4249 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4250 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4250 (e.g. after having manually fixed-up the files). The default is
4251 (e.g. after having manually fixed-up the files). The default is
4251 to mark all unresolved files.
4252 to mark all unresolved files.
4252
4253
4253 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4254 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4254 default is to mark all resolved files.
4255 default is to mark all resolved files.
4255
4256
4256 - :hg:`resolve -l`: list files which had or still have conflicts.
4257 - :hg:`resolve -l`: list files which had or still have conflicts.
4257 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4258 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4258 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4259 You can use ``set:unresolved()`` or ``set:resolved()`` to filter
4259 the list. See :hg:`help filesets` for details.
4260 the list. See :hg:`help filesets` for details.
4260
4261
4261 .. note::
4262 .. note::
4262
4263
4263 Mercurial will not let you commit files with unresolved merge
4264 Mercurial will not let you commit files with unresolved merge
4264 conflicts. You must use :hg:`resolve -m ...` before you can
4265 conflicts. You must use :hg:`resolve -m ...` before you can
4265 commit after a conflicting merge.
4266 commit after a conflicting merge.
4266
4267
4267 Returns 0 on success, 1 if any files fail a resolve attempt.
4268 Returns 0 on success, 1 if any files fail a resolve attempt.
4268 """
4269 """
4269
4270
4270 flaglist = 'all mark unmark list no_status'.split()
4271 flaglist = 'all mark unmark list no_status'.split()
4271 all, mark, unmark, show, nostatus = \
4272 all, mark, unmark, show, nostatus = \
4272 [opts.get(o) for o in flaglist]
4273 [opts.get(o) for o in flaglist]
4273
4274
4274 if (show and (mark or unmark)) or (mark and unmark):
4275 if (show and (mark or unmark)) or (mark and unmark):
4275 raise error.Abort(_("too many options specified"))
4276 raise error.Abort(_("too many options specified"))
4276 if pats and all:
4277 if pats and all:
4277 raise error.Abort(_("can't specify --all and patterns"))
4278 raise error.Abort(_("can't specify --all and patterns"))
4278 if not (all or pats or show or mark or unmark):
4279 if not (all or pats or show or mark or unmark):
4279 raise error.Abort(_('no files or directories specified'),
4280 raise error.Abort(_('no files or directories specified'),
4280 hint=('use --all to re-merge all unresolved files'))
4281 hint=('use --all to re-merge all unresolved files'))
4281
4282
4282 if show:
4283 if show:
4283 ui.pager('resolve')
4284 ui.pager('resolve')
4284 fm = ui.formatter('resolve', opts)
4285 fm = ui.formatter('resolve', opts)
4285 ms = mergemod.mergestate.read(repo)
4286 ms = mergemod.mergestate.read(repo)
4286 m = scmutil.match(repo[None], pats, opts)
4287 m = scmutil.match(repo[None], pats, opts)
4287 for f in ms:
4288 for f in ms:
4288 if not m(f):
4289 if not m(f):
4289 continue
4290 continue
4290 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
4291 l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
4291 'd': 'driverresolved'}[ms[f]]
4292 'd': 'driverresolved'}[ms[f]]
4292 fm.startitem()
4293 fm.startitem()
4293 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
4294 fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
4294 fm.write('path', '%s\n', f, label=l)
4295 fm.write('path', '%s\n', f, label=l)
4295 fm.end()
4296 fm.end()
4296 return 0
4297 return 0
4297
4298
4298 with repo.wlock():
4299 with repo.wlock():
4299 ms = mergemod.mergestate.read(repo)
4300 ms = mergemod.mergestate.read(repo)
4300
4301
4301 if not (ms.active() or repo.dirstate.p2() != nullid):
4302 if not (ms.active() or repo.dirstate.p2() != nullid):
4302 raise error.Abort(
4303 raise error.Abort(
4303 _('resolve command not applicable when not merging'))
4304 _('resolve command not applicable when not merging'))
4304
4305
4305 wctx = repo[None]
4306 wctx = repo[None]
4306
4307
4307 if ms.mergedriver and ms.mdstate() == 'u':
4308 if ms.mergedriver and ms.mdstate() == 'u':
4308 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4309 proceed = mergemod.driverpreprocess(repo, ms, wctx)
4309 ms.commit()
4310 ms.commit()
4310 # allow mark and unmark to go through
4311 # allow mark and unmark to go through
4311 if not mark and not unmark and not proceed:
4312 if not mark and not unmark and not proceed:
4312 return 1
4313 return 1
4313
4314
4314 m = scmutil.match(wctx, pats, opts)
4315 m = scmutil.match(wctx, pats, opts)
4315 ret = 0
4316 ret = 0
4316 didwork = False
4317 didwork = False
4317 runconclude = False
4318 runconclude = False
4318
4319
4319 tocomplete = []
4320 tocomplete = []
4320 for f in ms:
4321 for f in ms:
4321 if not m(f):
4322 if not m(f):
4322 continue
4323 continue
4323
4324
4324 didwork = True
4325 didwork = True
4325
4326
4326 # don't let driver-resolved files be marked, and run the conclude
4327 # don't let driver-resolved files be marked, and run the conclude
4327 # step if asked to resolve
4328 # step if asked to resolve
4328 if ms[f] == "d":
4329 if ms[f] == "d":
4329 exact = m.exact(f)
4330 exact = m.exact(f)
4330 if mark:
4331 if mark:
4331 if exact:
4332 if exact:
4332 ui.warn(_('not marking %s as it is driver-resolved\n')
4333 ui.warn(_('not marking %s as it is driver-resolved\n')
4333 % f)
4334 % f)
4334 elif unmark:
4335 elif unmark:
4335 if exact:
4336 if exact:
4336 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4337 ui.warn(_('not unmarking %s as it is driver-resolved\n')
4337 % f)
4338 % f)
4338 else:
4339 else:
4339 runconclude = True
4340 runconclude = True
4340 continue
4341 continue
4341
4342
4342 if mark:
4343 if mark:
4343 ms.mark(f, "r")
4344 ms.mark(f, "r")
4344 elif unmark:
4345 elif unmark:
4345 ms.mark(f, "u")
4346 ms.mark(f, "u")
4346 else:
4347 else:
4347 # backup pre-resolve (merge uses .orig for its own purposes)
4348 # backup pre-resolve (merge uses .orig for its own purposes)
4348 a = repo.wjoin(f)
4349 a = repo.wjoin(f)
4349 try:
4350 try:
4350 util.copyfile(a, a + ".resolve")
4351 util.copyfile(a, a + ".resolve")
4351 except (IOError, OSError) as inst:
4352 except (IOError, OSError) as inst:
4352 if inst.errno != errno.ENOENT:
4353 if inst.errno != errno.ENOENT:
4353 raise
4354 raise
4354
4355
4355 try:
4356 try:
4356 # preresolve file
4357 # preresolve file
4357 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4358 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4358 'resolve')
4359 'resolve')
4359 complete, r = ms.preresolve(f, wctx)
4360 complete, r = ms.preresolve(f, wctx)
4360 if not complete:
4361 if not complete:
4361 tocomplete.append(f)
4362 tocomplete.append(f)
4362 elif r:
4363 elif r:
4363 ret = 1
4364 ret = 1
4364 finally:
4365 finally:
4365 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4366 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4366 ms.commit()
4367 ms.commit()
4367
4368
4368 # replace filemerge's .orig file with our resolve file, but only
4369 # replace filemerge's .orig file with our resolve file, but only
4369 # for merges that are complete
4370 # for merges that are complete
4370 if complete:
4371 if complete:
4371 try:
4372 try:
4372 util.rename(a + ".resolve",
4373 util.rename(a + ".resolve",
4373 scmutil.origpath(ui, repo, a))
4374 scmutil.origpath(ui, repo, a))
4374 except OSError as inst:
4375 except OSError as inst:
4375 if inst.errno != errno.ENOENT:
4376 if inst.errno != errno.ENOENT:
4376 raise
4377 raise
4377
4378
4378 for f in tocomplete:
4379 for f in tocomplete:
4379 try:
4380 try:
4380 # resolve file
4381 # resolve file
4381 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4382 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
4382 'resolve')
4383 'resolve')
4383 r = ms.resolve(f, wctx)
4384 r = ms.resolve(f, wctx)
4384 if r:
4385 if r:
4385 ret = 1
4386 ret = 1
4386 finally:
4387 finally:
4387 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4388 ui.setconfig('ui', 'forcemerge', '', 'resolve')
4388 ms.commit()
4389 ms.commit()
4389
4390
4390 # replace filemerge's .orig file with our resolve file
4391 # replace filemerge's .orig file with our resolve file
4391 a = repo.wjoin(f)
4392 a = repo.wjoin(f)
4392 try:
4393 try:
4393 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4394 util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
4394 except OSError as inst:
4395 except OSError as inst:
4395 if inst.errno != errno.ENOENT:
4396 if inst.errno != errno.ENOENT:
4396 raise
4397 raise
4397
4398
4398 ms.commit()
4399 ms.commit()
4399 ms.recordactions()
4400 ms.recordactions()
4400
4401
4401 if not didwork and pats:
4402 if not didwork and pats:
4402 hint = None
4403 hint = None
4403 if not any([p for p in pats if p.find(':') >= 0]):
4404 if not any([p for p in pats if p.find(':') >= 0]):
4404 pats = ['path:%s' % p for p in pats]
4405 pats = ['path:%s' % p for p in pats]
4405 m = scmutil.match(wctx, pats, opts)
4406 m = scmutil.match(wctx, pats, opts)
4406 for f in ms:
4407 for f in ms:
4407 if not m(f):
4408 if not m(f):
4408 continue
4409 continue
4409 flags = ''.join(['-%s ' % o[0] for o in flaglist
4410 flags = ''.join(['-%s ' % o[0] for o in flaglist
4410 if opts.get(o)])
4411 if opts.get(o)])
4411 hint = _("(try: hg resolve %s%s)\n") % (
4412 hint = _("(try: hg resolve %s%s)\n") % (
4412 flags,
4413 flags,
4413 ' '.join(pats))
4414 ' '.join(pats))
4414 break
4415 break
4415 ui.warn(_("arguments do not match paths that need resolving\n"))
4416 ui.warn(_("arguments do not match paths that need resolving\n"))
4416 if hint:
4417 if hint:
4417 ui.warn(hint)
4418 ui.warn(hint)
4418 elif ms.mergedriver and ms.mdstate() != 's':
4419 elif ms.mergedriver and ms.mdstate() != 's':
4419 # run conclude step when either a driver-resolved file is requested
4420 # run conclude step when either a driver-resolved file is requested
4420 # or there are no driver-resolved files
4421 # or there are no driver-resolved files
4421 # we can't use 'ret' to determine whether any files are unresolved
4422 # we can't use 'ret' to determine whether any files are unresolved
4422 # because we might not have tried to resolve some
4423 # because we might not have tried to resolve some
4423 if ((runconclude or not list(ms.driverresolved()))
4424 if ((runconclude or not list(ms.driverresolved()))
4424 and not list(ms.unresolved())):
4425 and not list(ms.unresolved())):
4425 proceed = mergemod.driverconclude(repo, ms, wctx)
4426 proceed = mergemod.driverconclude(repo, ms, wctx)
4426 ms.commit()
4427 ms.commit()
4427 if not proceed:
4428 if not proceed:
4428 return 1
4429 return 1
4429
4430
4430 # Nudge users into finishing an unfinished operation
4431 # Nudge users into finishing an unfinished operation
4431 unresolvedf = list(ms.unresolved())
4432 unresolvedf = list(ms.unresolved())
4432 driverresolvedf = list(ms.driverresolved())
4433 driverresolvedf = list(ms.driverresolved())
4433 if not unresolvedf and not driverresolvedf:
4434 if not unresolvedf and not driverresolvedf:
4434 ui.status(_('(no more unresolved files)\n'))
4435 ui.status(_('(no more unresolved files)\n'))
4435 cmdutil.checkafterresolved(repo)
4436 cmdutil.checkafterresolved(repo)
4436 elif not unresolvedf:
4437 elif not unresolvedf:
4437 ui.status(_('(no more unresolved files -- '
4438 ui.status(_('(no more unresolved files -- '
4438 'run "hg resolve --all" to conclude)\n'))
4439 'run "hg resolve --all" to conclude)\n'))
4439
4440
4440 return ret
4441 return ret
4441
4442
4442 @command('revert',
4443 @command('revert',
4443 [('a', 'all', None, _('revert all changes when no arguments given')),
4444 [('a', 'all', None, _('revert all changes when no arguments given')),
4444 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4445 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4445 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4446 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4446 ('C', 'no-backup', None, _('do not save backup copies of files')),
4447 ('C', 'no-backup', None, _('do not save backup copies of files')),
4447 ('i', 'interactive', None,
4448 ('i', 'interactive', None,
4448 _('interactively select the changes (EXPERIMENTAL)')),
4449 _('interactively select the changes (EXPERIMENTAL)')),
4449 ] + walkopts + dryrunopts,
4450 ] + walkopts + dryrunopts,
4450 _('[OPTION]... [-r REV] [NAME]...'))
4451 _('[OPTION]... [-r REV] [NAME]...'))
4451 def revert(ui, repo, *pats, **opts):
4452 def revert(ui, repo, *pats, **opts):
4452 """restore files to their checkout state
4453 """restore files to their checkout state
4453
4454
4454 .. note::
4455 .. note::
4455
4456
4456 To check out earlier revisions, you should use :hg:`update REV`.
4457 To check out earlier revisions, you should use :hg:`update REV`.
4457 To cancel an uncommitted merge (and lose your changes),
4458 To cancel an uncommitted merge (and lose your changes),
4458 use :hg:`update --clean .`.
4459 use :hg:`update --clean .`.
4459
4460
4460 With no revision specified, revert the specified files or directories
4461 With no revision specified, revert the specified files or directories
4461 to the contents they had in the parent of the working directory.
4462 to the contents they had in the parent of the working directory.
4462 This restores the contents of files to an unmodified
4463 This restores the contents of files to an unmodified
4463 state and unschedules adds, removes, copies, and renames. If the
4464 state and unschedules adds, removes, copies, and renames. If the
4464 working directory has two parents, you must explicitly specify a
4465 working directory has two parents, you must explicitly specify a
4465 revision.
4466 revision.
4466
4467
4467 Using the -r/--rev or -d/--date options, revert the given files or
4468 Using the -r/--rev or -d/--date options, revert the given files or
4468 directories to their states as of a specific revision. Because
4469 directories to their states as of a specific revision. Because
4469 revert does not change the working directory parents, this will
4470 revert does not change the working directory parents, this will
4470 cause these files to appear modified. This can be helpful to "back
4471 cause these files to appear modified. This can be helpful to "back
4471 out" some or all of an earlier change. See :hg:`backout` for a
4472 out" some or all of an earlier change. See :hg:`backout` for a
4472 related method.
4473 related method.
4473
4474
4474 Modified files are saved with a .orig suffix before reverting.
4475 Modified files are saved with a .orig suffix before reverting.
4475 To disable these backups, use --no-backup. It is possible to store
4476 To disable these backups, use --no-backup. It is possible to store
4476 the backup files in a custom directory relative to the root of the
4477 the backup files in a custom directory relative to the root of the
4477 repository by setting the ``ui.origbackuppath`` configuration
4478 repository by setting the ``ui.origbackuppath`` configuration
4478 option.
4479 option.
4479
4480
4480 See :hg:`help dates` for a list of formats valid for -d/--date.
4481 See :hg:`help dates` for a list of formats valid for -d/--date.
4481
4482
4482 See :hg:`help backout` for a way to reverse the effect of an
4483 See :hg:`help backout` for a way to reverse the effect of an
4483 earlier changeset.
4484 earlier changeset.
4484
4485
4485 Returns 0 on success.
4486 Returns 0 on success.
4486 """
4487 """
4487
4488
4488 if opts.get("date"):
4489 if opts.get("date"):
4489 if opts.get("rev"):
4490 if opts.get("rev"):
4490 raise error.Abort(_("you can't specify a revision and a date"))
4491 raise error.Abort(_("you can't specify a revision and a date"))
4491 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4492 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4492
4493
4493 parent, p2 = repo.dirstate.parents()
4494 parent, p2 = repo.dirstate.parents()
4494 if not opts.get('rev') and p2 != nullid:
4495 if not opts.get('rev') and p2 != nullid:
4495 # revert after merge is a trap for new users (issue2915)
4496 # revert after merge is a trap for new users (issue2915)
4496 raise error.Abort(_('uncommitted merge with no revision specified'),
4497 raise error.Abort(_('uncommitted merge with no revision specified'),
4497 hint=_("use 'hg update' or see 'hg help revert'"))
4498 hint=_("use 'hg update' or see 'hg help revert'"))
4498
4499
4499 ctx = scmutil.revsingle(repo, opts.get('rev'))
4500 ctx = scmutil.revsingle(repo, opts.get('rev'))
4500
4501
4501 if (not (pats or opts.get('include') or opts.get('exclude') or
4502 if (not (pats or opts.get('include') or opts.get('exclude') or
4502 opts.get('all') or opts.get('interactive'))):
4503 opts.get('all') or opts.get('interactive'))):
4503 msg = _("no files or directories specified")
4504 msg = _("no files or directories specified")
4504 if p2 != nullid:
4505 if p2 != nullid:
4505 hint = _("uncommitted merge, use --all to discard all changes,"
4506 hint = _("uncommitted merge, use --all to discard all changes,"
4506 " or 'hg update -C .' to abort the merge")
4507 " or 'hg update -C .' to abort the merge")
4507 raise error.Abort(msg, hint=hint)
4508 raise error.Abort(msg, hint=hint)
4508 dirty = any(repo.status())
4509 dirty = any(repo.status())
4509 node = ctx.node()
4510 node = ctx.node()
4510 if node != parent:
4511 if node != parent:
4511 if dirty:
4512 if dirty:
4512 hint = _("uncommitted changes, use --all to discard all"
4513 hint = _("uncommitted changes, use --all to discard all"
4513 " changes, or 'hg update %s' to update") % ctx.rev()
4514 " changes, or 'hg update %s' to update") % ctx.rev()
4514 else:
4515 else:
4515 hint = _("use --all to revert all files,"
4516 hint = _("use --all to revert all files,"
4516 " or 'hg update %s' to update") % ctx.rev()
4517 " or 'hg update %s' to update") % ctx.rev()
4517 elif dirty:
4518 elif dirty:
4518 hint = _("uncommitted changes, use --all to discard all changes")
4519 hint = _("uncommitted changes, use --all to discard all changes")
4519 else:
4520 else:
4520 hint = _("use --all to revert all files")
4521 hint = _("use --all to revert all files")
4521 raise error.Abort(msg, hint=hint)
4522 raise error.Abort(msg, hint=hint)
4522
4523
4523 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
4524 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
4524
4525
4525 @command('rollback', dryrunopts +
4526 @command('rollback', dryrunopts +
4526 [('f', 'force', False, _('ignore safety measures'))])
4527 [('f', 'force', False, _('ignore safety measures'))])
4527 def rollback(ui, repo, **opts):
4528 def rollback(ui, repo, **opts):
4528 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4529 """roll back the last transaction (DANGEROUS) (DEPRECATED)
4529
4530
4530 Please use :hg:`commit --amend` instead of rollback to correct
4531 Please use :hg:`commit --amend` instead of rollback to correct
4531 mistakes in the last commit.
4532 mistakes in the last commit.
4532
4533
4533 This command should be used with care. There is only one level of
4534 This command should be used with care. There is only one level of
4534 rollback, and there is no way to undo a rollback. It will also
4535 rollback, and there is no way to undo a rollback. It will also
4535 restore the dirstate at the time of the last transaction, losing
4536 restore the dirstate at the time of the last transaction, losing
4536 any dirstate changes since that time. This command does not alter
4537 any dirstate changes since that time. This command does not alter
4537 the working directory.
4538 the working directory.
4538
4539
4539 Transactions are used to encapsulate the effects of all commands
4540 Transactions are used to encapsulate the effects of all commands
4540 that create new changesets or propagate existing changesets into a
4541 that create new changesets or propagate existing changesets into a
4541 repository.
4542 repository.
4542
4543
4543 .. container:: verbose
4544 .. container:: verbose
4544
4545
4545 For example, the following commands are transactional, and their
4546 For example, the following commands are transactional, and their
4546 effects can be rolled back:
4547 effects can be rolled back:
4547
4548
4548 - commit
4549 - commit
4549 - import
4550 - import
4550 - pull
4551 - pull
4551 - push (with this repository as the destination)
4552 - push (with this repository as the destination)
4552 - unbundle
4553 - unbundle
4553
4554
4554 To avoid permanent data loss, rollback will refuse to rollback a
4555 To avoid permanent data loss, rollback will refuse to rollback a
4555 commit transaction if it isn't checked out. Use --force to
4556 commit transaction if it isn't checked out. Use --force to
4556 override this protection.
4557 override this protection.
4557
4558
4558 The rollback command can be entirely disabled by setting the
4559 The rollback command can be entirely disabled by setting the
4559 ``ui.rollback`` configuration setting to false. If you're here
4560 ``ui.rollback`` configuration setting to false. If you're here
4560 because you want to use rollback and it's disabled, you can
4561 because you want to use rollback and it's disabled, you can
4561 re-enable the command by setting ``ui.rollback`` to true.
4562 re-enable the command by setting ``ui.rollback`` to true.
4562
4563
4563 This command is not intended for use on public repositories. Once
4564 This command is not intended for use on public repositories. Once
4564 changes are visible for pull by other users, rolling a transaction
4565 changes are visible for pull by other users, rolling a transaction
4565 back locally is ineffective (someone else may already have pulled
4566 back locally is ineffective (someone else may already have pulled
4566 the changes). Furthermore, a race is possible with readers of the
4567 the changes). Furthermore, a race is possible with readers of the
4567 repository; for example an in-progress pull from the repository
4568 repository; for example an in-progress pull from the repository
4568 may fail if a rollback is performed.
4569 may fail if a rollback is performed.
4569
4570
4570 Returns 0 on success, 1 if no rollback data is available.
4571 Returns 0 on success, 1 if no rollback data is available.
4571 """
4572 """
4572 if not ui.configbool('ui', 'rollback', True):
4573 if not ui.configbool('ui', 'rollback', True):
4573 raise error.Abort(_('rollback is disabled because it is unsafe'),
4574 raise error.Abort(_('rollback is disabled because it is unsafe'),
4574 hint=('see `hg help -v rollback` for information'))
4575 hint=('see `hg help -v rollback` for information'))
4575 return repo.rollback(dryrun=opts.get('dry_run'),
4576 return repo.rollback(dryrun=opts.get('dry_run'),
4576 force=opts.get('force'))
4577 force=opts.get('force'))
4577
4578
4578 @command('root', [])
4579 @command('root', [])
4579 def root(ui, repo):
4580 def root(ui, repo):
4580 """print the root (top) of the current working directory
4581 """print the root (top) of the current working directory
4581
4582
4582 Print the root directory of the current repository.
4583 Print the root directory of the current repository.
4583
4584
4584 Returns 0 on success.
4585 Returns 0 on success.
4585 """
4586 """
4586 ui.write(repo.root + "\n")
4587 ui.write(repo.root + "\n")
4587
4588
4588 @command('^serve',
4589 @command('^serve',
4589 [('A', 'accesslog', '', _('name of access log file to write to'),
4590 [('A', 'accesslog', '', _('name of access log file to write to'),
4590 _('FILE')),
4591 _('FILE')),
4591 ('d', 'daemon', None, _('run server in background')),
4592 ('d', 'daemon', None, _('run server in background')),
4592 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4593 ('', 'daemon-postexec', [], _('used internally by daemon mode')),
4593 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4594 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4594 # use string type, then we can check if something was passed
4595 # use string type, then we can check if something was passed
4595 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4596 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4596 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4597 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4597 _('ADDR')),
4598 _('ADDR')),
4598 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4599 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4599 _('PREFIX')),
4600 _('PREFIX')),
4600 ('n', 'name', '',
4601 ('n', 'name', '',
4601 _('name to show in web pages (default: working directory)'), _('NAME')),
4602 _('name to show in web pages (default: working directory)'), _('NAME')),
4602 ('', 'web-conf', '',
4603 ('', 'web-conf', '',
4603 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4604 _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')),
4604 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4605 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4605 _('FILE')),
4606 _('FILE')),
4606 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4607 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4607 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4608 ('', 'stdio', None, _('for remote clients (ADVANCED)')),
4608 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4609 ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')),
4609 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4610 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4610 ('', 'style', '', _('template style to use'), _('STYLE')),
4611 ('', 'style', '', _('template style to use'), _('STYLE')),
4611 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4612 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4612 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
4613 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
4613 _('[OPTION]...'),
4614 _('[OPTION]...'),
4614 optionalrepo=True)
4615 optionalrepo=True)
4615 def serve(ui, repo, **opts):
4616 def serve(ui, repo, **opts):
4616 """start stand-alone webserver
4617 """start stand-alone webserver
4617
4618
4618 Start a local HTTP repository browser and pull server. You can use
4619 Start a local HTTP repository browser and pull server. You can use
4619 this for ad-hoc sharing and browsing of repositories. It is
4620 this for ad-hoc sharing and browsing of repositories. It is
4620 recommended to use a real web server to serve a repository for
4621 recommended to use a real web server to serve a repository for
4621 longer periods of time.
4622 longer periods of time.
4622
4623
4623 Please note that the server does not implement access control.
4624 Please note that the server does not implement access control.
4624 This means that, by default, anybody can read from the server and
4625 This means that, by default, anybody can read from the server and
4625 nobody can write to it by default. Set the ``web.allow_push``
4626 nobody can write to it by default. Set the ``web.allow_push``
4626 option to ``*`` to allow everybody to push to the server. You
4627 option to ``*`` to allow everybody to push to the server. You
4627 should use a real web server if you need to authenticate users.
4628 should use a real web server if you need to authenticate users.
4628
4629
4629 By default, the server logs accesses to stdout and errors to
4630 By default, the server logs accesses to stdout and errors to
4630 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4631 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
4631 files.
4632 files.
4632
4633
4633 To have the server choose a free port number to listen on, specify
4634 To have the server choose a free port number to listen on, specify
4634 a port number of 0; in this case, the server will print the port
4635 a port number of 0; in this case, the server will print the port
4635 number it uses.
4636 number it uses.
4636
4637
4637 Returns 0 on success.
4638 Returns 0 on success.
4638 """
4639 """
4639
4640
4640 if opts["stdio"] and opts["cmdserver"]:
4641 if opts["stdio"] and opts["cmdserver"]:
4641 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4642 raise error.Abort(_("cannot use --stdio with --cmdserver"))
4642
4643
4643 if opts["stdio"]:
4644 if opts["stdio"]:
4644 if repo is None:
4645 if repo is None:
4645 raise error.RepoError(_("there is no Mercurial repository here"
4646 raise error.RepoError(_("there is no Mercurial repository here"
4646 " (.hg not found)"))
4647 " (.hg not found)"))
4647 s = sshserver.sshserver(ui, repo)
4648 s = sshserver.sshserver(ui, repo)
4648 s.serve_forever()
4649 s.serve_forever()
4649
4650
4650 service = server.createservice(ui, repo, opts)
4651 service = server.createservice(ui, repo, opts)
4651 return server.runservice(opts, initfn=service.init, runfn=service.run)
4652 return server.runservice(opts, initfn=service.init, runfn=service.run)
4652
4653
4653 @command('^status|st',
4654 @command('^status|st',
4654 [('A', 'all', None, _('show status of all files')),
4655 [('A', 'all', None, _('show status of all files')),
4655 ('m', 'modified', None, _('show only modified files')),
4656 ('m', 'modified', None, _('show only modified files')),
4656 ('a', 'added', None, _('show only added files')),
4657 ('a', 'added', None, _('show only added files')),
4657 ('r', 'removed', None, _('show only removed files')),
4658 ('r', 'removed', None, _('show only removed files')),
4658 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4659 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4659 ('c', 'clean', None, _('show only files without changes')),
4660 ('c', 'clean', None, _('show only files without changes')),
4660 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4661 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4661 ('i', 'ignored', None, _('show only ignored files')),
4662 ('i', 'ignored', None, _('show only ignored files')),
4662 ('n', 'no-status', None, _('hide status prefix')),
4663 ('n', 'no-status', None, _('hide status prefix')),
4663 ('C', 'copies', None, _('show source of copied files')),
4664 ('C', 'copies', None, _('show source of copied files')),
4664 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4665 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4665 ('', 'rev', [], _('show difference from revision'), _('REV')),
4666 ('', 'rev', [], _('show difference from revision'), _('REV')),
4666 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4667 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
4667 ] + walkopts + subrepoopts + formatteropts,
4668 ] + walkopts + subrepoopts + formatteropts,
4668 _('[OPTION]... [FILE]...'),
4669 _('[OPTION]... [FILE]...'),
4669 inferrepo=True)
4670 inferrepo=True)
4670 def status(ui, repo, *pats, **opts):
4671 def status(ui, repo, *pats, **opts):
4671 """show changed files in the working directory
4672 """show changed files in the working directory
4672
4673
4673 Show status of files in the repository. If names are given, only
4674 Show status of files in the repository. If names are given, only
4674 files that match are shown. Files that are clean or ignored or
4675 files that match are shown. Files that are clean or ignored or
4675 the source of a copy/move operation, are not listed unless
4676 the source of a copy/move operation, are not listed unless
4676 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4677 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
4677 Unless options described with "show only ..." are given, the
4678 Unless options described with "show only ..." are given, the
4678 options -mardu are used.
4679 options -mardu are used.
4679
4680
4680 Option -q/--quiet hides untracked (unknown and ignored) files
4681 Option -q/--quiet hides untracked (unknown and ignored) files
4681 unless explicitly requested with -u/--unknown or -i/--ignored.
4682 unless explicitly requested with -u/--unknown or -i/--ignored.
4682
4683
4683 .. note::
4684 .. note::
4684
4685
4685 :hg:`status` may appear to disagree with diff if permissions have
4686 :hg:`status` may appear to disagree with diff if permissions have
4686 changed or a merge has occurred. The standard diff format does
4687 changed or a merge has occurred. The standard diff format does
4687 not report permission changes and diff only reports changes
4688 not report permission changes and diff only reports changes
4688 relative to one merge parent.
4689 relative to one merge parent.
4689
4690
4690 If one revision is given, it is used as the base revision.
4691 If one revision is given, it is used as the base revision.
4691 If two revisions are given, the differences between them are
4692 If two revisions are given, the differences between them are
4692 shown. The --change option can also be used as a shortcut to list
4693 shown. The --change option can also be used as a shortcut to list
4693 the changed files of a revision from its first parent.
4694 the changed files of a revision from its first parent.
4694
4695
4695 The codes used to show the status of files are::
4696 The codes used to show the status of files are::
4696
4697
4697 M = modified
4698 M = modified
4698 A = added
4699 A = added
4699 R = removed
4700 R = removed
4700 C = clean
4701 C = clean
4701 ! = missing (deleted by non-hg command, but still tracked)
4702 ! = missing (deleted by non-hg command, but still tracked)
4702 ? = not tracked
4703 ? = not tracked
4703 I = ignored
4704 I = ignored
4704 = origin of the previous file (with --copies)
4705 = origin of the previous file (with --copies)
4705
4706
4706 .. container:: verbose
4707 .. container:: verbose
4707
4708
4708 Examples:
4709 Examples:
4709
4710
4710 - show changes in the working directory relative to a
4711 - show changes in the working directory relative to a
4711 changeset::
4712 changeset::
4712
4713
4713 hg status --rev 9353
4714 hg status --rev 9353
4714
4715
4715 - show changes in the working directory relative to the
4716 - show changes in the working directory relative to the
4716 current directory (see :hg:`help patterns` for more information)::
4717 current directory (see :hg:`help patterns` for more information)::
4717
4718
4718 hg status re:
4719 hg status re:
4719
4720
4720 - show all changes including copies in an existing changeset::
4721 - show all changes including copies in an existing changeset::
4721
4722
4722 hg status --copies --change 9353
4723 hg status --copies --change 9353
4723
4724
4724 - get a NUL separated list of added files, suitable for xargs::
4725 - get a NUL separated list of added files, suitable for xargs::
4725
4726
4726 hg status -an0
4727 hg status -an0
4727
4728
4728 Returns 0 on success.
4729 Returns 0 on success.
4729 """
4730 """
4730
4731
4731 opts = pycompat.byteskwargs(opts)
4732 opts = pycompat.byteskwargs(opts)
4732 revs = opts.get('rev')
4733 revs = opts.get('rev')
4733 change = opts.get('change')
4734 change = opts.get('change')
4734
4735
4735 if revs and change:
4736 if revs and change:
4736 msg = _('cannot specify --rev and --change at the same time')
4737 msg = _('cannot specify --rev and --change at the same time')
4737 raise error.Abort(msg)
4738 raise error.Abort(msg)
4738 elif change:
4739 elif change:
4739 node2 = scmutil.revsingle(repo, change, None).node()
4740 node2 = scmutil.revsingle(repo, change, None).node()
4740 node1 = repo[node2].p1().node()
4741 node1 = repo[node2].p1().node()
4741 else:
4742 else:
4742 node1, node2 = scmutil.revpair(repo, revs)
4743 node1, node2 = scmutil.revpair(repo, revs)
4743
4744
4744 if pats or ui.configbool('commands', 'status.relative'):
4745 if pats or ui.configbool('commands', 'status.relative'):
4745 cwd = repo.getcwd()
4746 cwd = repo.getcwd()
4746 else:
4747 else:
4747 cwd = ''
4748 cwd = ''
4748
4749
4749 if opts.get('print0'):
4750 if opts.get('print0'):
4750 end = '\0'
4751 end = '\0'
4751 else:
4752 else:
4752 end = '\n'
4753 end = '\n'
4753 copy = {}
4754 copy = {}
4754 states = 'modified added removed deleted unknown ignored clean'.split()
4755 states = 'modified added removed deleted unknown ignored clean'.split()
4755 show = [k for k in states if opts.get(k)]
4756 show = [k for k in states if opts.get(k)]
4756 if opts.get('all'):
4757 if opts.get('all'):
4757 show += ui.quiet and (states[:4] + ['clean']) or states
4758 show += ui.quiet and (states[:4] + ['clean']) or states
4758 if not show:
4759 if not show:
4759 if ui.quiet:
4760 if ui.quiet:
4760 show = states[:4]
4761 show = states[:4]
4761 else:
4762 else:
4762 show = states[:5]
4763 show = states[:5]
4763
4764
4764 m = scmutil.match(repo[node2], pats, opts)
4765 m = scmutil.match(repo[node2], pats, opts)
4765 stat = repo.status(node1, node2, m,
4766 stat = repo.status(node1, node2, m,
4766 'ignored' in show, 'clean' in show, 'unknown' in show,
4767 'ignored' in show, 'clean' in show, 'unknown' in show,
4767 opts.get('subrepos'))
4768 opts.get('subrepos'))
4768 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
4769 changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat)
4769
4770
4770 if (opts.get('all') or opts.get('copies')
4771 if (opts.get('all') or opts.get('copies')
4771 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
4772 or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'):
4772 copy = copies.pathcopies(repo[node1], repo[node2], m)
4773 copy = copies.pathcopies(repo[node1], repo[node2], m)
4773
4774
4774 ui.pager('status')
4775 ui.pager('status')
4775 fm = ui.formatter('status', opts)
4776 fm = ui.formatter('status', opts)
4776 fmt = '%s' + end
4777 fmt = '%s' + end
4777 showchar = not opts.get('no_status')
4778 showchar = not opts.get('no_status')
4778
4779
4779 for state, char, files in changestates:
4780 for state, char, files in changestates:
4780 if state in show:
4781 if state in show:
4781 label = 'status.' + state
4782 label = 'status.' + state
4782 for f in files:
4783 for f in files:
4783 fm.startitem()
4784 fm.startitem()
4784 fm.condwrite(showchar, 'status', '%s ', char, label=label)
4785 fm.condwrite(showchar, 'status', '%s ', char, label=label)
4785 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
4786 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
4786 if f in copy:
4787 if f in copy:
4787 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
4788 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
4788 label='status.copied')
4789 label='status.copied')
4789 fm.end()
4790 fm.end()
4790
4791
4791 @command('^summary|sum',
4792 @command('^summary|sum',
4792 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
4793 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
4793 def summary(ui, repo, **opts):
4794 def summary(ui, repo, **opts):
4794 """summarize working directory state
4795 """summarize working directory state
4795
4796
4796 This generates a brief summary of the working directory state,
4797 This generates a brief summary of the working directory state,
4797 including parents, branch, commit status, phase and available updates.
4798 including parents, branch, commit status, phase and available updates.
4798
4799
4799 With the --remote option, this will check the default paths for
4800 With the --remote option, this will check the default paths for
4800 incoming and outgoing changes. This can be time-consuming.
4801 incoming and outgoing changes. This can be time-consuming.
4801
4802
4802 Returns 0 on success.
4803 Returns 0 on success.
4803 """
4804 """
4804
4805
4805 ui.pager('summary')
4806 ui.pager('summary')
4806 ctx = repo[None]
4807 ctx = repo[None]
4807 parents = ctx.parents()
4808 parents = ctx.parents()
4808 pnode = parents[0].node()
4809 pnode = parents[0].node()
4809 marks = []
4810 marks = []
4810
4811
4811 ms = None
4812 ms = None
4812 try:
4813 try:
4813 ms = mergemod.mergestate.read(repo)
4814 ms = mergemod.mergestate.read(repo)
4814 except error.UnsupportedMergeRecords as e:
4815 except error.UnsupportedMergeRecords as e:
4815 s = ' '.join(e.recordtypes)
4816 s = ' '.join(e.recordtypes)
4816 ui.warn(
4817 ui.warn(
4817 _('warning: merge state has unsupported record types: %s\n') % s)
4818 _('warning: merge state has unsupported record types: %s\n') % s)
4818 unresolved = 0
4819 unresolved = 0
4819 else:
4820 else:
4820 unresolved = [f for f in ms if ms[f] == 'u']
4821 unresolved = [f for f in ms if ms[f] == 'u']
4821
4822
4822 for p in parents:
4823 for p in parents:
4823 # label with log.changeset (instead of log.parent) since this
4824 # label with log.changeset (instead of log.parent) since this
4824 # shows a working directory parent *changeset*:
4825 # shows a working directory parent *changeset*:
4825 # i18n: column positioning for "hg summary"
4826 # i18n: column positioning for "hg summary"
4826 ui.write(_('parent: %d:%s ') % (p.rev(), p),
4827 ui.write(_('parent: %d:%s ') % (p.rev(), p),
4827 label=cmdutil._changesetlabels(p))
4828 label=cmdutil._changesetlabels(p))
4828 ui.write(' '.join(p.tags()), label='log.tag')
4829 ui.write(' '.join(p.tags()), label='log.tag')
4829 if p.bookmarks():
4830 if p.bookmarks():
4830 marks.extend(p.bookmarks())
4831 marks.extend(p.bookmarks())
4831 if p.rev() == -1:
4832 if p.rev() == -1:
4832 if not len(repo):
4833 if not len(repo):
4833 ui.write(_(' (empty repository)'))
4834 ui.write(_(' (empty repository)'))
4834 else:
4835 else:
4835 ui.write(_(' (no revision checked out)'))
4836 ui.write(_(' (no revision checked out)'))
4836 if p.troubled():
4837 if p.troubled():
4837 ui.write(' ('
4838 ui.write(' ('
4838 + ', '.join(ui.label(trouble, 'trouble.%s' % trouble)
4839 + ', '.join(ui.label(trouble, 'trouble.%s' % trouble)
4839 for trouble in p.troubles())
4840 for trouble in p.troubles())
4840 + ')')
4841 + ')')
4841 ui.write('\n')
4842 ui.write('\n')
4842 if p.description():
4843 if p.description():
4843 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
4844 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
4844 label='log.summary')
4845 label='log.summary')
4845
4846
4846 branch = ctx.branch()
4847 branch = ctx.branch()
4847 bheads = repo.branchheads(branch)
4848 bheads = repo.branchheads(branch)
4848 # i18n: column positioning for "hg summary"
4849 # i18n: column positioning for "hg summary"
4849 m = _('branch: %s\n') % branch
4850 m = _('branch: %s\n') % branch
4850 if branch != 'default':
4851 if branch != 'default':
4851 ui.write(m, label='log.branch')
4852 ui.write(m, label='log.branch')
4852 else:
4853 else:
4853 ui.status(m, label='log.branch')
4854 ui.status(m, label='log.branch')
4854
4855
4855 if marks:
4856 if marks:
4856 active = repo._activebookmark
4857 active = repo._activebookmark
4857 # i18n: column positioning for "hg summary"
4858 # i18n: column positioning for "hg summary"
4858 ui.write(_('bookmarks:'), label='log.bookmark')
4859 ui.write(_('bookmarks:'), label='log.bookmark')
4859 if active is not None:
4860 if active is not None:
4860 if active in marks:
4861 if active in marks:
4861 ui.write(' *' + active, label=activebookmarklabel)
4862 ui.write(' *' + active, label=activebookmarklabel)
4862 marks.remove(active)
4863 marks.remove(active)
4863 else:
4864 else:
4864 ui.write(' [%s]' % active, label=activebookmarklabel)
4865 ui.write(' [%s]' % active, label=activebookmarklabel)
4865 for m in marks:
4866 for m in marks:
4866 ui.write(' ' + m, label='log.bookmark')
4867 ui.write(' ' + m, label='log.bookmark')
4867 ui.write('\n', label='log.bookmark')
4868 ui.write('\n', label='log.bookmark')
4868
4869
4869 status = repo.status(unknown=True)
4870 status = repo.status(unknown=True)
4870
4871
4871 c = repo.dirstate.copies()
4872 c = repo.dirstate.copies()
4872 copied, renamed = [], []
4873 copied, renamed = [], []
4873 for d, s in c.iteritems():
4874 for d, s in c.iteritems():
4874 if s in status.removed:
4875 if s in status.removed:
4875 status.removed.remove(s)
4876 status.removed.remove(s)
4876 renamed.append(d)
4877 renamed.append(d)
4877 else:
4878 else:
4878 copied.append(d)
4879 copied.append(d)
4879 if d in status.added:
4880 if d in status.added:
4880 status.added.remove(d)
4881 status.added.remove(d)
4881
4882
4882 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
4883 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
4883
4884
4884 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
4885 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
4885 (ui.label(_('%d added'), 'status.added'), status.added),
4886 (ui.label(_('%d added'), 'status.added'), status.added),
4886 (ui.label(_('%d removed'), 'status.removed'), status.removed),
4887 (ui.label(_('%d removed'), 'status.removed'), status.removed),
4887 (ui.label(_('%d renamed'), 'status.copied'), renamed),
4888 (ui.label(_('%d renamed'), 'status.copied'), renamed),
4888 (ui.label(_('%d copied'), 'status.copied'), copied),
4889 (ui.label(_('%d copied'), 'status.copied'), copied),
4889 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
4890 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
4890 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
4891 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
4891 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
4892 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
4892 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
4893 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
4893 t = []
4894 t = []
4894 for l, s in labels:
4895 for l, s in labels:
4895 if s:
4896 if s:
4896 t.append(l % len(s))
4897 t.append(l % len(s))
4897
4898
4898 t = ', '.join(t)
4899 t = ', '.join(t)
4899 cleanworkdir = False
4900 cleanworkdir = False
4900
4901
4901 if repo.vfs.exists('graftstate'):
4902 if repo.vfs.exists('graftstate'):
4902 t += _(' (graft in progress)')
4903 t += _(' (graft in progress)')
4903 if repo.vfs.exists('updatestate'):
4904 if repo.vfs.exists('updatestate'):
4904 t += _(' (interrupted update)')
4905 t += _(' (interrupted update)')
4905 elif len(parents) > 1:
4906 elif len(parents) > 1:
4906 t += _(' (merge)')
4907 t += _(' (merge)')
4907 elif branch != parents[0].branch():
4908 elif branch != parents[0].branch():
4908 t += _(' (new branch)')
4909 t += _(' (new branch)')
4909 elif (parents[0].closesbranch() and
4910 elif (parents[0].closesbranch() and
4910 pnode in repo.branchheads(branch, closed=True)):
4911 pnode in repo.branchheads(branch, closed=True)):
4911 t += _(' (head closed)')
4912 t += _(' (head closed)')
4912 elif not (status.modified or status.added or status.removed or renamed or
4913 elif not (status.modified or status.added or status.removed or renamed or
4913 copied or subs):
4914 copied or subs):
4914 t += _(' (clean)')
4915 t += _(' (clean)')
4915 cleanworkdir = True
4916 cleanworkdir = True
4916 elif pnode not in bheads:
4917 elif pnode not in bheads:
4917 t += _(' (new branch head)')
4918 t += _(' (new branch head)')
4918
4919
4919 if parents:
4920 if parents:
4920 pendingphase = max(p.phase() for p in parents)
4921 pendingphase = max(p.phase() for p in parents)
4921 else:
4922 else:
4922 pendingphase = phases.public
4923 pendingphase = phases.public
4923
4924
4924 if pendingphase > phases.newcommitphase(ui):
4925 if pendingphase > phases.newcommitphase(ui):
4925 t += ' (%s)' % phases.phasenames[pendingphase]
4926 t += ' (%s)' % phases.phasenames[pendingphase]
4926
4927
4927 if cleanworkdir:
4928 if cleanworkdir:
4928 # i18n: column positioning for "hg summary"
4929 # i18n: column positioning for "hg summary"
4929 ui.status(_('commit: %s\n') % t.strip())
4930 ui.status(_('commit: %s\n') % t.strip())
4930 else:
4931 else:
4931 # i18n: column positioning for "hg summary"
4932 # i18n: column positioning for "hg summary"
4932 ui.write(_('commit: %s\n') % t.strip())
4933 ui.write(_('commit: %s\n') % t.strip())
4933
4934
4934 # all ancestors of branch heads - all ancestors of parent = new csets
4935 # all ancestors of branch heads - all ancestors of parent = new csets
4935 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
4936 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
4936 bheads))
4937 bheads))
4937
4938
4938 if new == 0:
4939 if new == 0:
4939 # i18n: column positioning for "hg summary"
4940 # i18n: column positioning for "hg summary"
4940 ui.status(_('update: (current)\n'))
4941 ui.status(_('update: (current)\n'))
4941 elif pnode not in bheads:
4942 elif pnode not in bheads:
4942 # i18n: column positioning for "hg summary"
4943 # i18n: column positioning for "hg summary"
4943 ui.write(_('update: %d new changesets (update)\n') % new)
4944 ui.write(_('update: %d new changesets (update)\n') % new)
4944 else:
4945 else:
4945 # i18n: column positioning for "hg summary"
4946 # i18n: column positioning for "hg summary"
4946 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
4947 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
4947 (new, len(bheads)))
4948 (new, len(bheads)))
4948
4949
4949 t = []
4950 t = []
4950 draft = len(repo.revs('draft()'))
4951 draft = len(repo.revs('draft()'))
4951 if draft:
4952 if draft:
4952 t.append(_('%d draft') % draft)
4953 t.append(_('%d draft') % draft)
4953 secret = len(repo.revs('secret()'))
4954 secret = len(repo.revs('secret()'))
4954 if secret:
4955 if secret:
4955 t.append(_('%d secret') % secret)
4956 t.append(_('%d secret') % secret)
4956
4957
4957 if draft or secret:
4958 if draft or secret:
4958 ui.status(_('phases: %s\n') % ', '.join(t))
4959 ui.status(_('phases: %s\n') % ', '.join(t))
4959
4960
4960 if obsolete.isenabled(repo, obsolete.createmarkersopt):
4961 if obsolete.isenabled(repo, obsolete.createmarkersopt):
4961 for trouble in ("unstable", "divergent", "bumped"):
4962 for trouble in ("unstable", "divergent", "bumped"):
4962 numtrouble = len(repo.revs(trouble + "()"))
4963 numtrouble = len(repo.revs(trouble + "()"))
4963 # We write all the possibilities to ease translation
4964 # We write all the possibilities to ease translation
4964 troublemsg = {
4965 troublemsg = {
4965 "unstable": _("unstable: %d changesets"),
4966 "unstable": _("unstable: %d changesets"),
4966 "divergent": _("divergent: %d changesets"),
4967 "divergent": _("divergent: %d changesets"),
4967 "bumped": _("bumped: %d changesets"),
4968 "bumped": _("bumped: %d changesets"),
4968 }
4969 }
4969 if numtrouble > 0:
4970 if numtrouble > 0:
4970 ui.status(troublemsg[trouble] % numtrouble + "\n")
4971 ui.status(troublemsg[trouble] % numtrouble + "\n")
4971
4972
4972 cmdutil.summaryhooks(ui, repo)
4973 cmdutil.summaryhooks(ui, repo)
4973
4974
4974 if opts.get('remote'):
4975 if opts.get('remote'):
4975 needsincoming, needsoutgoing = True, True
4976 needsincoming, needsoutgoing = True, True
4976 else:
4977 else:
4977 needsincoming, needsoutgoing = False, False
4978 needsincoming, needsoutgoing = False, False
4978 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
4979 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
4979 if i:
4980 if i:
4980 needsincoming = True
4981 needsincoming = True
4981 if o:
4982 if o:
4982 needsoutgoing = True
4983 needsoutgoing = True
4983 if not needsincoming and not needsoutgoing:
4984 if not needsincoming and not needsoutgoing:
4984 return
4985 return
4985
4986
4986 def getincoming():
4987 def getincoming():
4987 source, branches = hg.parseurl(ui.expandpath('default'))
4988 source, branches = hg.parseurl(ui.expandpath('default'))
4988 sbranch = branches[0]
4989 sbranch = branches[0]
4989 try:
4990 try:
4990 other = hg.peer(repo, {}, source)
4991 other = hg.peer(repo, {}, source)
4991 except error.RepoError:
4992 except error.RepoError:
4992 if opts.get('remote'):
4993 if opts.get('remote'):
4993 raise
4994 raise
4994 return source, sbranch, None, None, None
4995 return source, sbranch, None, None, None
4995 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
4996 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
4996 if revs:
4997 if revs:
4997 revs = [other.lookup(rev) for rev in revs]
4998 revs = [other.lookup(rev) for rev in revs]
4998 ui.debug('comparing with %s\n' % util.hidepassword(source))
4999 ui.debug('comparing with %s\n' % util.hidepassword(source))
4999 repo.ui.pushbuffer()
5000 repo.ui.pushbuffer()
5000 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5001 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5001 repo.ui.popbuffer()
5002 repo.ui.popbuffer()
5002 return source, sbranch, other, commoninc, commoninc[1]
5003 return source, sbranch, other, commoninc, commoninc[1]
5003
5004
5004 if needsincoming:
5005 if needsincoming:
5005 source, sbranch, sother, commoninc, incoming = getincoming()
5006 source, sbranch, sother, commoninc, incoming = getincoming()
5006 else:
5007 else:
5007 source = sbranch = sother = commoninc = incoming = None
5008 source = sbranch = sother = commoninc = incoming = None
5008
5009
5009 def getoutgoing():
5010 def getoutgoing():
5010 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5011 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5011 dbranch = branches[0]
5012 dbranch = branches[0]
5012 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5013 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5013 if source != dest:
5014 if source != dest:
5014 try:
5015 try:
5015 dother = hg.peer(repo, {}, dest)
5016 dother = hg.peer(repo, {}, dest)
5016 except error.RepoError:
5017 except error.RepoError:
5017 if opts.get('remote'):
5018 if opts.get('remote'):
5018 raise
5019 raise
5019 return dest, dbranch, None, None
5020 return dest, dbranch, None, None
5020 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5021 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5021 elif sother is None:
5022 elif sother is None:
5022 # there is no explicit destination peer, but source one is invalid
5023 # there is no explicit destination peer, but source one is invalid
5023 return dest, dbranch, None, None
5024 return dest, dbranch, None, None
5024 else:
5025 else:
5025 dother = sother
5026 dother = sother
5026 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5027 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5027 common = None
5028 common = None
5028 else:
5029 else:
5029 common = commoninc
5030 common = commoninc
5030 if revs:
5031 if revs:
5031 revs = [repo.lookup(rev) for rev in revs]
5032 revs = [repo.lookup(rev) for rev in revs]
5032 repo.ui.pushbuffer()
5033 repo.ui.pushbuffer()
5033 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5034 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5034 commoninc=common)
5035 commoninc=common)
5035 repo.ui.popbuffer()
5036 repo.ui.popbuffer()
5036 return dest, dbranch, dother, outgoing
5037 return dest, dbranch, dother, outgoing
5037
5038
5038 if needsoutgoing:
5039 if needsoutgoing:
5039 dest, dbranch, dother, outgoing = getoutgoing()
5040 dest, dbranch, dother, outgoing = getoutgoing()
5040 else:
5041 else:
5041 dest = dbranch = dother = outgoing = None
5042 dest = dbranch = dother = outgoing = None
5042
5043
5043 if opts.get('remote'):
5044 if opts.get('remote'):
5044 t = []
5045 t = []
5045 if incoming:
5046 if incoming:
5046 t.append(_('1 or more incoming'))
5047 t.append(_('1 or more incoming'))
5047 o = outgoing.missing
5048 o = outgoing.missing
5048 if o:
5049 if o:
5049 t.append(_('%d outgoing') % len(o))
5050 t.append(_('%d outgoing') % len(o))
5050 other = dother or sother
5051 other = dother or sother
5051 if 'bookmarks' in other.listkeys('namespaces'):
5052 if 'bookmarks' in other.listkeys('namespaces'):
5052 counts = bookmarks.summary(repo, other)
5053 counts = bookmarks.summary(repo, other)
5053 if counts[0] > 0:
5054 if counts[0] > 0:
5054 t.append(_('%d incoming bookmarks') % counts[0])
5055 t.append(_('%d incoming bookmarks') % counts[0])
5055 if counts[1] > 0:
5056 if counts[1] > 0:
5056 t.append(_('%d outgoing bookmarks') % counts[1])
5057 t.append(_('%d outgoing bookmarks') % counts[1])
5057
5058
5058 if t:
5059 if t:
5059 # i18n: column positioning for "hg summary"
5060 # i18n: column positioning for "hg summary"
5060 ui.write(_('remote: %s\n') % (', '.join(t)))
5061 ui.write(_('remote: %s\n') % (', '.join(t)))
5061 else:
5062 else:
5062 # i18n: column positioning for "hg summary"
5063 # i18n: column positioning for "hg summary"
5063 ui.status(_('remote: (synced)\n'))
5064 ui.status(_('remote: (synced)\n'))
5064
5065
5065 cmdutil.summaryremotehooks(ui, repo, opts,
5066 cmdutil.summaryremotehooks(ui, repo, opts,
5066 ((source, sbranch, sother, commoninc),
5067 ((source, sbranch, sother, commoninc),
5067 (dest, dbranch, dother, outgoing)))
5068 (dest, dbranch, dother, outgoing)))
5068
5069
5069 @command('tag',
5070 @command('tag',
5070 [('f', 'force', None, _('force tag')),
5071 [('f', 'force', None, _('force tag')),
5071 ('l', 'local', None, _('make the tag local')),
5072 ('l', 'local', None, _('make the tag local')),
5072 ('r', 'rev', '', _('revision to tag'), _('REV')),
5073 ('r', 'rev', '', _('revision to tag'), _('REV')),
5073 ('', 'remove', None, _('remove a tag')),
5074 ('', 'remove', None, _('remove a tag')),
5074 # -l/--local is already there, commitopts cannot be used
5075 # -l/--local is already there, commitopts cannot be used
5075 ('e', 'edit', None, _('invoke editor on commit messages')),
5076 ('e', 'edit', None, _('invoke editor on commit messages')),
5076 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5077 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5077 ] + commitopts2,
5078 ] + commitopts2,
5078 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5079 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5079 def tag(ui, repo, name1, *names, **opts):
5080 def tag(ui, repo, name1, *names, **opts):
5080 """add one or more tags for the current or given revision
5081 """add one or more tags for the current or given revision
5081
5082
5082 Name a particular revision using <name>.
5083 Name a particular revision using <name>.
5083
5084
5084 Tags are used to name particular revisions of the repository and are
5085 Tags are used to name particular revisions of the repository and are
5085 very useful to compare different revisions, to go back to significant
5086 very useful to compare different revisions, to go back to significant
5086 earlier versions or to mark branch points as releases, etc. Changing
5087 earlier versions or to mark branch points as releases, etc. Changing
5087 an existing tag is normally disallowed; use -f/--force to override.
5088 an existing tag is normally disallowed; use -f/--force to override.
5088
5089
5089 If no revision is given, the parent of the working directory is
5090 If no revision is given, the parent of the working directory is
5090 used.
5091 used.
5091
5092
5092 To facilitate version control, distribution, and merging of tags,
5093 To facilitate version control, distribution, and merging of tags,
5093 they are stored as a file named ".hgtags" which is managed similarly
5094 they are stored as a file named ".hgtags" which is managed similarly
5094 to other project files and can be hand-edited if necessary. This
5095 to other project files and can be hand-edited if necessary. This
5095 also means that tagging creates a new commit. The file
5096 also means that tagging creates a new commit. The file
5096 ".hg/localtags" is used for local tags (not shared among
5097 ".hg/localtags" is used for local tags (not shared among
5097 repositories).
5098 repositories).
5098
5099
5099 Tag commits are usually made at the head of a branch. If the parent
5100 Tag commits are usually made at the head of a branch. If the parent
5100 of the working directory is not a branch head, :hg:`tag` aborts; use
5101 of the working directory is not a branch head, :hg:`tag` aborts; use
5101 -f/--force to force the tag commit to be based on a non-head
5102 -f/--force to force the tag commit to be based on a non-head
5102 changeset.
5103 changeset.
5103
5104
5104 See :hg:`help dates` for a list of formats valid for -d/--date.
5105 See :hg:`help dates` for a list of formats valid for -d/--date.
5105
5106
5106 Since tag names have priority over branch names during revision
5107 Since tag names have priority over branch names during revision
5107 lookup, using an existing branch name as a tag name is discouraged.
5108 lookup, using an existing branch name as a tag name is discouraged.
5108
5109
5109 Returns 0 on success.
5110 Returns 0 on success.
5110 """
5111 """
5111 wlock = lock = None
5112 wlock = lock = None
5112 try:
5113 try:
5113 wlock = repo.wlock()
5114 wlock = repo.wlock()
5114 lock = repo.lock()
5115 lock = repo.lock()
5115 rev_ = "."
5116 rev_ = "."
5116 names = [t.strip() for t in (name1,) + names]
5117 names = [t.strip() for t in (name1,) + names]
5117 if len(names) != len(set(names)):
5118 if len(names) != len(set(names)):
5118 raise error.Abort(_('tag names must be unique'))
5119 raise error.Abort(_('tag names must be unique'))
5119 for n in names:
5120 for n in names:
5120 scmutil.checknewlabel(repo, n, 'tag')
5121 scmutil.checknewlabel(repo, n, 'tag')
5121 if not n:
5122 if not n:
5122 raise error.Abort(_('tag names cannot consist entirely of '
5123 raise error.Abort(_('tag names cannot consist entirely of '
5123 'whitespace'))
5124 'whitespace'))
5124 if opts.get('rev') and opts.get('remove'):
5125 if opts.get('rev') and opts.get('remove'):
5125 raise error.Abort(_("--rev and --remove are incompatible"))
5126 raise error.Abort(_("--rev and --remove are incompatible"))
5126 if opts.get('rev'):
5127 if opts.get('rev'):
5127 rev_ = opts['rev']
5128 rev_ = opts['rev']
5128 message = opts.get('message')
5129 message = opts.get('message')
5129 if opts.get('remove'):
5130 if opts.get('remove'):
5130 if opts.get('local'):
5131 if opts.get('local'):
5131 expectedtype = 'local'
5132 expectedtype = 'local'
5132 else:
5133 else:
5133 expectedtype = 'global'
5134 expectedtype = 'global'
5134
5135
5135 for n in names:
5136 for n in names:
5136 if not repo.tagtype(n):
5137 if not repo.tagtype(n):
5137 raise error.Abort(_("tag '%s' does not exist") % n)
5138 raise error.Abort(_("tag '%s' does not exist") % n)
5138 if repo.tagtype(n) != expectedtype:
5139 if repo.tagtype(n) != expectedtype:
5139 if expectedtype == 'global':
5140 if expectedtype == 'global':
5140 raise error.Abort(_("tag '%s' is not a global tag") % n)
5141 raise error.Abort(_("tag '%s' is not a global tag") % n)
5141 else:
5142 else:
5142 raise error.Abort(_("tag '%s' is not a local tag") % n)
5143 raise error.Abort(_("tag '%s' is not a local tag") % n)
5143 rev_ = 'null'
5144 rev_ = 'null'
5144 if not message:
5145 if not message:
5145 # we don't translate commit messages
5146 # we don't translate commit messages
5146 message = 'Removed tag %s' % ', '.join(names)
5147 message = 'Removed tag %s' % ', '.join(names)
5147 elif not opts.get('force'):
5148 elif not opts.get('force'):
5148 for n in names:
5149 for n in names:
5149 if n in repo.tags():
5150 if n in repo.tags():
5150 raise error.Abort(_("tag '%s' already exists "
5151 raise error.Abort(_("tag '%s' already exists "
5151 "(use -f to force)") % n)
5152 "(use -f to force)") % n)
5152 if not opts.get('local'):
5153 if not opts.get('local'):
5153 p1, p2 = repo.dirstate.parents()
5154 p1, p2 = repo.dirstate.parents()
5154 if p2 != nullid:
5155 if p2 != nullid:
5155 raise error.Abort(_('uncommitted merge'))
5156 raise error.Abort(_('uncommitted merge'))
5156 bheads = repo.branchheads()
5157 bheads = repo.branchheads()
5157 if not opts.get('force') and bheads and p1 not in bheads:
5158 if not opts.get('force') and bheads and p1 not in bheads:
5158 raise error.Abort(_('working directory is not at a branch head '
5159 raise error.Abort(_('working directory is not at a branch head '
5159 '(use -f to force)'))
5160 '(use -f to force)'))
5160 r = scmutil.revsingle(repo, rev_).node()
5161 r = scmutil.revsingle(repo, rev_).node()
5161
5162
5162 if not message:
5163 if not message:
5163 # we don't translate commit messages
5164 # we don't translate commit messages
5164 message = ('Added tag %s for changeset %s' %
5165 message = ('Added tag %s for changeset %s' %
5165 (', '.join(names), short(r)))
5166 (', '.join(names), short(r)))
5166
5167
5167 date = opts.get('date')
5168 date = opts.get('date')
5168 if date:
5169 if date:
5169 date = util.parsedate(date)
5170 date = util.parsedate(date)
5170
5171
5171 if opts.get('remove'):
5172 if opts.get('remove'):
5172 editform = 'tag.remove'
5173 editform = 'tag.remove'
5173 else:
5174 else:
5174 editform = 'tag.add'
5175 editform = 'tag.add'
5175 editor = cmdutil.getcommiteditor(editform=editform, **opts)
5176 editor = cmdutil.getcommiteditor(editform=editform, **opts)
5176
5177
5177 # don't allow tagging the null rev
5178 # don't allow tagging the null rev
5178 if (not opts.get('remove') and
5179 if (not opts.get('remove') and
5179 scmutil.revsingle(repo, rev_).rev() == nullrev):
5180 scmutil.revsingle(repo, rev_).rev() == nullrev):
5180 raise error.Abort(_("cannot tag null revision"))
5181 raise error.Abort(_("cannot tag null revision"))
5181
5182
5182 tagsmod.tag(repo, names, r, message, opts.get('local'),
5183 tagsmod.tag(repo, names, r, message, opts.get('local'),
5183 opts.get('user'), date, editor=editor)
5184 opts.get('user'), date, editor=editor)
5184 finally:
5185 finally:
5185 release(lock, wlock)
5186 release(lock, wlock)
5186
5187
5187 @command('tags', formatteropts, '')
5188 @command('tags', formatteropts, '')
5188 def tags(ui, repo, **opts):
5189 def tags(ui, repo, **opts):
5189 """list repository tags
5190 """list repository tags
5190
5191
5191 This lists both regular and local tags. When the -v/--verbose
5192 This lists both regular and local tags. When the -v/--verbose
5192 switch is used, a third column "local" is printed for local tags.
5193 switch is used, a third column "local" is printed for local tags.
5193 When the -q/--quiet switch is used, only the tag name is printed.
5194 When the -q/--quiet switch is used, only the tag name is printed.
5194
5195
5195 Returns 0 on success.
5196 Returns 0 on success.
5196 """
5197 """
5197
5198
5198 ui.pager('tags')
5199 ui.pager('tags')
5199 fm = ui.formatter('tags', opts)
5200 fm = ui.formatter('tags', opts)
5200 hexfunc = fm.hexfunc
5201 hexfunc = fm.hexfunc
5201 tagtype = ""
5202 tagtype = ""
5202
5203
5203 for t, n in reversed(repo.tagslist()):
5204 for t, n in reversed(repo.tagslist()):
5204 hn = hexfunc(n)
5205 hn = hexfunc(n)
5205 label = 'tags.normal'
5206 label = 'tags.normal'
5206 tagtype = ''
5207 tagtype = ''
5207 if repo.tagtype(t) == 'local':
5208 if repo.tagtype(t) == 'local':
5208 label = 'tags.local'
5209 label = 'tags.local'
5209 tagtype = 'local'
5210 tagtype = 'local'
5210
5211
5211 fm.startitem()
5212 fm.startitem()
5212 fm.write('tag', '%s', t, label=label)
5213 fm.write('tag', '%s', t, label=label)
5213 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5214 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5214 fm.condwrite(not ui.quiet, 'rev node', fmt,
5215 fm.condwrite(not ui.quiet, 'rev node', fmt,
5215 repo.changelog.rev(n), hn, label=label)
5216 repo.changelog.rev(n), hn, label=label)
5216 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5217 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5217 tagtype, label=label)
5218 tagtype, label=label)
5218 fm.plain('\n')
5219 fm.plain('\n')
5219 fm.end()
5220 fm.end()
5220
5221
5221 @command('tip',
5222 @command('tip',
5222 [('p', 'patch', None, _('show patch')),
5223 [('p', 'patch', None, _('show patch')),
5223 ('g', 'git', None, _('use git extended diff format')),
5224 ('g', 'git', None, _('use git extended diff format')),
5224 ] + templateopts,
5225 ] + templateopts,
5225 _('[-p] [-g]'))
5226 _('[-p] [-g]'))
5226 def tip(ui, repo, **opts):
5227 def tip(ui, repo, **opts):
5227 """show the tip revision (DEPRECATED)
5228 """show the tip revision (DEPRECATED)
5228
5229
5229 The tip revision (usually just called the tip) is the changeset
5230 The tip revision (usually just called the tip) is the changeset
5230 most recently added to the repository (and therefore the most
5231 most recently added to the repository (and therefore the most
5231 recently changed head).
5232 recently changed head).
5232
5233
5233 If you have just made a commit, that commit will be the tip. If
5234 If you have just made a commit, that commit will be the tip. If
5234 you have just pulled changes from another repository, the tip of
5235 you have just pulled changes from another repository, the tip of
5235 that repository becomes the current tip. The "tip" tag is special
5236 that repository becomes the current tip. The "tip" tag is special
5236 and cannot be renamed or assigned to a different changeset.
5237 and cannot be renamed or assigned to a different changeset.
5237
5238
5238 This command is deprecated, please use :hg:`heads` instead.
5239 This command is deprecated, please use :hg:`heads` instead.
5239
5240
5240 Returns 0 on success.
5241 Returns 0 on success.
5241 """
5242 """
5242 displayer = cmdutil.show_changeset(ui, repo, opts)
5243 displayer = cmdutil.show_changeset(ui, repo, opts)
5243 displayer.show(repo['tip'])
5244 displayer.show(repo['tip'])
5244 displayer.close()
5245 displayer.close()
5245
5246
5246 @command('unbundle',
5247 @command('unbundle',
5247 [('u', 'update', None,
5248 [('u', 'update', None,
5248 _('update to new branch head if changesets were unbundled'))],
5249 _('update to new branch head if changesets were unbundled'))],
5249 _('[-u] FILE...'))
5250 _('[-u] FILE...'))
5250 def unbundle(ui, repo, fname1, *fnames, **opts):
5251 def unbundle(ui, repo, fname1, *fnames, **opts):
5251 """apply one or more changegroup files
5252 """apply one or more changegroup files
5252
5253
5253 Apply one or more compressed changegroup files generated by the
5254 Apply one or more compressed changegroup files generated by the
5254 bundle command.
5255 bundle command.
5255
5256
5256 Returns 0 on success, 1 if an update has unresolved files.
5257 Returns 0 on success, 1 if an update has unresolved files.
5257 """
5258 """
5258 fnames = (fname1,) + fnames
5259 fnames = (fname1,) + fnames
5259
5260
5260 with repo.lock():
5261 with repo.lock():
5261 for fname in fnames:
5262 for fname in fnames:
5262 f = hg.openpath(ui, fname)
5263 f = hg.openpath(ui, fname)
5263 gen = exchange.readbundle(ui, f, fname)
5264 gen = exchange.readbundle(ui, f, fname)
5264 if isinstance(gen, bundle2.unbundle20):
5265 if isinstance(gen, bundle2.unbundle20):
5265 tr = repo.transaction('unbundle')
5266 tr = repo.transaction('unbundle')
5266 try:
5267 try:
5267 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5268 op = bundle2.applybundle(repo, gen, tr, source='unbundle',
5268 url='bundle:' + fname)
5269 url='bundle:' + fname)
5269 tr.close()
5270 tr.close()
5270 except error.BundleUnknownFeatureError as exc:
5271 except error.BundleUnknownFeatureError as exc:
5271 raise error.Abort(_('%s: unknown bundle feature, %s')
5272 raise error.Abort(_('%s: unknown bundle feature, %s')
5272 % (fname, exc),
5273 % (fname, exc),
5273 hint=_("see https://mercurial-scm.org/"
5274 hint=_("see https://mercurial-scm.org/"
5274 "wiki/BundleFeature for more "
5275 "wiki/BundleFeature for more "
5275 "information"))
5276 "information"))
5276 finally:
5277 finally:
5277 if tr:
5278 if tr:
5278 tr.release()
5279 tr.release()
5279 changes = [r.get('return', 0)
5280 changes = [r.get('return', 0)
5280 for r in op.records['changegroup']]
5281 for r in op.records['changegroup']]
5281 modheads = changegroup.combineresults(changes)
5282 modheads = changegroup.combineresults(changes)
5282 elif isinstance(gen, streamclone.streamcloneapplier):
5283 elif isinstance(gen, streamclone.streamcloneapplier):
5283 raise error.Abort(
5284 raise error.Abort(
5284 _('packed bundles cannot be applied with '
5285 _('packed bundles cannot be applied with '
5285 '"hg unbundle"'),
5286 '"hg unbundle"'),
5286 hint=_('use "hg debugapplystreamclonebundle"'))
5287 hint=_('use "hg debugapplystreamclonebundle"'))
5287 else:
5288 else:
5288 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
5289 modheads = gen.apply(repo, 'unbundle', 'bundle:' + fname)
5289
5290
5290 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
5291 return postincoming(ui, repo, modheads, opts.get('update'), None, None)
5291
5292
5292 @command('^update|up|checkout|co',
5293 @command('^update|up|checkout|co',
5293 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5294 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5294 ('c', 'check', None, _('require clean working directory')),
5295 ('c', 'check', None, _('require clean working directory')),
5295 ('m', 'merge', None, _('merge uncommitted changes')),
5296 ('m', 'merge', None, _('merge uncommitted changes')),
5296 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5297 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5297 ('r', 'rev', '', _('revision'), _('REV'))
5298 ('r', 'rev', '', _('revision'), _('REV'))
5298 ] + mergetoolopts,
5299 ] + mergetoolopts,
5299 _('[-C|-c|-m] [-d DATE] [[-r] REV]'))
5300 _('[-C|-c|-m] [-d DATE] [[-r] REV]'))
5300 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
5301 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
5301 merge=None, tool=None):
5302 merge=None, tool=None):
5302 """update working directory (or switch revisions)
5303 """update working directory (or switch revisions)
5303
5304
5304 Update the repository's working directory to the specified
5305 Update the repository's working directory to the specified
5305 changeset. If no changeset is specified, update to the tip of the
5306 changeset. If no changeset is specified, update to the tip of the
5306 current named branch and move the active bookmark (see :hg:`help
5307 current named branch and move the active bookmark (see :hg:`help
5307 bookmarks`).
5308 bookmarks`).
5308
5309
5309 Update sets the working directory's parent revision to the specified
5310 Update sets the working directory's parent revision to the specified
5310 changeset (see :hg:`help parents`).
5311 changeset (see :hg:`help parents`).
5311
5312
5312 If the changeset is not a descendant or ancestor of the working
5313 If the changeset is not a descendant or ancestor of the working
5313 directory's parent and there are uncommitted changes, the update is
5314 directory's parent and there are uncommitted changes, the update is
5314 aborted. With the -c/--check option, the working directory is checked
5315 aborted. With the -c/--check option, the working directory is checked
5315 for uncommitted changes; if none are found, the working directory is
5316 for uncommitted changes; if none are found, the working directory is
5316 updated to the specified changeset.
5317 updated to the specified changeset.
5317
5318
5318 .. container:: verbose
5319 .. container:: verbose
5319
5320
5320 The -C/--clean, -c/--check, and -m/--merge options control what
5321 The -C/--clean, -c/--check, and -m/--merge options control what
5321 happens if the working directory contains uncommitted changes.
5322 happens if the working directory contains uncommitted changes.
5322 At most of one of them can be specified.
5323 At most of one of them can be specified.
5323
5324
5324 1. If no option is specified, and if
5325 1. If no option is specified, and if
5325 the requested changeset is an ancestor or descendant of
5326 the requested changeset is an ancestor or descendant of
5326 the working directory's parent, the uncommitted changes
5327 the working directory's parent, the uncommitted changes
5327 are merged into the requested changeset and the merged
5328 are merged into the requested changeset and the merged
5328 result is left uncommitted. If the requested changeset is
5329 result is left uncommitted. If the requested changeset is
5329 not an ancestor or descendant (that is, it is on another
5330 not an ancestor or descendant (that is, it is on another
5330 branch), the update is aborted and the uncommitted changes
5331 branch), the update is aborted and the uncommitted changes
5331 are preserved.
5332 are preserved.
5332
5333
5333 2. With the -m/--merge option, the update is allowed even if the
5334 2. With the -m/--merge option, the update is allowed even if the
5334 requested changeset is not an ancestor or descendant of
5335 requested changeset is not an ancestor or descendant of
5335 the working directory's parent.
5336 the working directory's parent.
5336
5337
5337 3. With the -c/--check option, the update is aborted and the
5338 3. With the -c/--check option, the update is aborted and the
5338 uncommitted changes are preserved.
5339 uncommitted changes are preserved.
5339
5340
5340 4. With the -C/--clean option, uncommitted changes are discarded and
5341 4. With the -C/--clean option, uncommitted changes are discarded and
5341 the working directory is updated to the requested changeset.
5342 the working directory is updated to the requested changeset.
5342
5343
5343 To cancel an uncommitted merge (and lose your changes), use
5344 To cancel an uncommitted merge (and lose your changes), use
5344 :hg:`update --clean .`.
5345 :hg:`update --clean .`.
5345
5346
5346 Use null as the changeset to remove the working directory (like
5347 Use null as the changeset to remove the working directory (like
5347 :hg:`clone -U`).
5348 :hg:`clone -U`).
5348
5349
5349 If you want to revert just one file to an older revision, use
5350 If you want to revert just one file to an older revision, use
5350 :hg:`revert [-r REV] NAME`.
5351 :hg:`revert [-r REV] NAME`.
5351
5352
5352 See :hg:`help dates` for a list of formats valid for -d/--date.
5353 See :hg:`help dates` for a list of formats valid for -d/--date.
5353
5354
5354 Returns 0 on success, 1 if there are unresolved files.
5355 Returns 0 on success, 1 if there are unresolved files.
5355 """
5356 """
5356 if rev and node:
5357 if rev and node:
5357 raise error.Abort(_("please specify just one revision"))
5358 raise error.Abort(_("please specify just one revision"))
5358
5359
5359 if ui.configbool('commands', 'update.requiredest'):
5360 if ui.configbool('commands', 'update.requiredest'):
5360 if not node and not rev and not date:
5361 if not node and not rev and not date:
5361 raise error.Abort(_('you must specify a destination'),
5362 raise error.Abort(_('you must specify a destination'),
5362 hint=_('for example: hg update ".::"'))
5363 hint=_('for example: hg update ".::"'))
5363
5364
5364 if rev is None or rev == '':
5365 if rev is None or rev == '':
5365 rev = node
5366 rev = node
5366
5367
5367 if date and rev is not None:
5368 if date and rev is not None:
5368 raise error.Abort(_("you can't specify a revision and a date"))
5369 raise error.Abort(_("you can't specify a revision and a date"))
5369
5370
5370 if len([x for x in (clean, check, merge) if x]) > 1:
5371 if len([x for x in (clean, check, merge) if x]) > 1:
5371 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
5372 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, "
5372 "or -m/merge"))
5373 "or -m/merge"))
5373
5374
5374 updatecheck = None
5375 updatecheck = None
5375 if check:
5376 if check:
5376 updatecheck = 'abort'
5377 updatecheck = 'abort'
5377 elif merge:
5378 elif merge:
5378 updatecheck = 'none'
5379 updatecheck = 'none'
5379
5380
5380 with repo.wlock():
5381 with repo.wlock():
5381 cmdutil.clearunfinished(repo)
5382 cmdutil.clearunfinished(repo)
5382
5383
5383 if date:
5384 if date:
5384 rev = cmdutil.finddate(ui, repo, date)
5385 rev = cmdutil.finddate(ui, repo, date)
5385
5386
5386 # if we defined a bookmark, we have to remember the original name
5387 # if we defined a bookmark, we have to remember the original name
5387 brev = rev
5388 brev = rev
5388 rev = scmutil.revsingle(repo, rev, rev).rev()
5389 rev = scmutil.revsingle(repo, rev, rev).rev()
5389
5390
5390 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
5391 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
5391
5392
5392 return hg.updatetotally(ui, repo, rev, brev, clean=clean,
5393 return hg.updatetotally(ui, repo, rev, brev, clean=clean,
5393 updatecheck=updatecheck)
5394 updatecheck=updatecheck)
5394
5395
5395 @command('verify', [])
5396 @command('verify', [])
5396 def verify(ui, repo):
5397 def verify(ui, repo):
5397 """verify the integrity of the repository
5398 """verify the integrity of the repository
5398
5399
5399 Verify the integrity of the current repository.
5400 Verify the integrity of the current repository.
5400
5401
5401 This will perform an extensive check of the repository's
5402 This will perform an extensive check of the repository's
5402 integrity, validating the hashes and checksums of each entry in
5403 integrity, validating the hashes and checksums of each entry in
5403 the changelog, manifest, and tracked files, as well as the
5404 the changelog, manifest, and tracked files, as well as the
5404 integrity of their crosslinks and indices.
5405 integrity of their crosslinks and indices.
5405
5406
5406 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5407 Please see https://mercurial-scm.org/wiki/RepositoryCorruption
5407 for more information about recovery from corruption of the
5408 for more information about recovery from corruption of the
5408 repository.
5409 repository.
5409
5410
5410 Returns 0 on success, 1 if errors are encountered.
5411 Returns 0 on success, 1 if errors are encountered.
5411 """
5412 """
5412 return hg.verify(repo)
5413 return hg.verify(repo)
5413
5414
5414 @command('version', [] + formatteropts, norepo=True)
5415 @command('version', [] + formatteropts, norepo=True)
5415 def version_(ui, **opts):
5416 def version_(ui, **opts):
5416 """output version and copyright information"""
5417 """output version and copyright information"""
5417 if ui.verbose:
5418 if ui.verbose:
5418 ui.pager('version')
5419 ui.pager('version')
5419 fm = ui.formatter("version", opts)
5420 fm = ui.formatter("version", opts)
5420 fm.startitem()
5421 fm.startitem()
5421 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5422 fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"),
5422 util.version())
5423 util.version())
5423 license = _(
5424 license = _(
5424 "(see https://mercurial-scm.org for more information)\n"
5425 "(see https://mercurial-scm.org for more information)\n"
5425 "\nCopyright (C) 2005-2017 Matt Mackall and others\n"
5426 "\nCopyright (C) 2005-2017 Matt Mackall and others\n"
5426 "This is free software; see the source for copying conditions. "
5427 "This is free software; see the source for copying conditions. "
5427 "There is NO\nwarranty; "
5428 "There is NO\nwarranty; "
5428 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5429 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5429 )
5430 )
5430 if not ui.quiet:
5431 if not ui.quiet:
5431 fm.plain(license)
5432 fm.plain(license)
5432
5433
5433 if ui.verbose:
5434 if ui.verbose:
5434 fm.plain(_("\nEnabled extensions:\n\n"))
5435 fm.plain(_("\nEnabled extensions:\n\n"))
5435 # format names and versions into columns
5436 # format names and versions into columns
5436 names = []
5437 names = []
5437 vers = []
5438 vers = []
5438 isinternals = []
5439 isinternals = []
5439 for name, module in extensions.extensions():
5440 for name, module in extensions.extensions():
5440 names.append(name)
5441 names.append(name)
5441 vers.append(extensions.moduleversion(module) or None)
5442 vers.append(extensions.moduleversion(module) or None)
5442 isinternals.append(extensions.ismoduleinternal(module))
5443 isinternals.append(extensions.ismoduleinternal(module))
5443 fn = fm.nested("extensions")
5444 fn = fm.nested("extensions")
5444 if names:
5445 if names:
5445 namefmt = " %%-%ds " % max(len(n) for n in names)
5446 namefmt = " %%-%ds " % max(len(n) for n in names)
5446 places = [_("external"), _("internal")]
5447 places = [_("external"), _("internal")]
5447 for n, v, p in zip(names, vers, isinternals):
5448 for n, v, p in zip(names, vers, isinternals):
5448 fn.startitem()
5449 fn.startitem()
5449 fn.condwrite(ui.verbose, "name", namefmt, n)
5450 fn.condwrite(ui.verbose, "name", namefmt, n)
5450 if ui.verbose:
5451 if ui.verbose:
5451 fn.plain("%s " % places[p])
5452 fn.plain("%s " % places[p])
5452 fn.data(bundled=p)
5453 fn.data(bundled=p)
5453 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5454 fn.condwrite(ui.verbose and v, "ver", "%s", v)
5454 if ui.verbose:
5455 if ui.verbose:
5455 fn.plain("\n")
5456 fn.plain("\n")
5456 fn.end()
5457 fn.end()
5457 fm.end()
5458 fm.end()
5458
5459
5459 def loadcmdtable(ui, name, cmdtable):
5460 def loadcmdtable(ui, name, cmdtable):
5460 """Load command functions from specified cmdtable
5461 """Load command functions from specified cmdtable
5461 """
5462 """
5462 overrides = [cmd for cmd in cmdtable if cmd in table]
5463 overrides = [cmd for cmd in cmdtable if cmd in table]
5463 if overrides:
5464 if overrides:
5464 ui.warn(_("extension '%s' overrides commands: %s\n")
5465 ui.warn(_("extension '%s' overrides commands: %s\n")
5465 % (name, " ".join(overrides)))
5466 % (name, " ".join(overrides)))
5466 table.update(cmdtable)
5467 table.update(cmdtable)
@@ -1,231 +1,245
1 hide outer repo
1 hide outer repo
2 $ hg init
2 $ hg init
3
3
4 Use hgrc within $TESTTMP
4 Use hgrc within $TESTTMP
5
5
6 $ HGRCPATH=`pwd`/hgrc
6 $ HGRCPATH=`pwd`/hgrc
7 $ export HGRCPATH
7 $ export HGRCPATH
8
8
9 Use an alternate var for scribbling on hgrc to keep check-code from
9 Use an alternate var for scribbling on hgrc to keep check-code from
10 complaining about the important settings we may be overwriting:
10 complaining about the important settings we may be overwriting:
11
11
12 $ HGRC=`pwd`/hgrc
12 $ HGRC=`pwd`/hgrc
13 $ export HGRC
13 $ export HGRC
14
14
15 Basic syntax error
15 Basic syntax error
16
16
17 $ echo "invalid" > $HGRC
17 $ echo "invalid" > $HGRC
18 $ hg version
18 $ hg version
19 hg: parse error at $TESTTMP/hgrc:1: invalid
19 hg: parse error at $TESTTMP/hgrc:1: invalid
20 [255]
20 [255]
21 $ echo "" > $HGRC
21 $ echo "" > $HGRC
22
22
23 Issue1199: Can't use '%' in hgrc (eg url encoded username)
23 Issue1199: Can't use '%' in hgrc (eg url encoded username)
24
24
25 $ hg init "foo%bar"
25 $ hg init "foo%bar"
26 $ hg clone "foo%bar" foobar
26 $ hg clone "foo%bar" foobar
27 updating to branch default
27 updating to branch default
28 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
28 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
29 $ cd foobar
29 $ cd foobar
30 $ cat .hg/hgrc
30 $ cat .hg/hgrc
31 # example repository config (see 'hg help config' for more info)
31 # example repository config (see 'hg help config' for more info)
32 [paths]
32 [paths]
33 default = $TESTTMP/foo%bar (glob)
33 default = $TESTTMP/foo%bar (glob)
34
34
35 # path aliases to other clones of this repo in URLs or filesystem paths
35 # path aliases to other clones of this repo in URLs or filesystem paths
36 # (see 'hg help config.paths' for more info)
36 # (see 'hg help config.paths' for more info)
37 #
37 #
38 # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
38 # default:pushurl = ssh://jdoe@example.net/hg/jdoes-fork
39 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
39 # my-fork = ssh://jdoe@example.net/hg/jdoes-fork
40 # my-clone = /home/jdoe/jdoes-clone
40 # my-clone = /home/jdoe/jdoes-clone
41
41
42 [ui]
42 [ui]
43 # name and email (local to this repository, optional), e.g.
43 # name and email (local to this repository, optional), e.g.
44 # username = Jane Doe <jdoe@example.com>
44 # username = Jane Doe <jdoe@example.com>
45 $ hg paths
45 $ hg paths
46 default = $TESTTMP/foo%bar (glob)
46 default = $TESTTMP/foo%bar (glob)
47 $ hg showconfig
47 $ hg showconfig
48 bundle.mainreporoot=$TESTTMP/foobar (glob)
48 bundle.mainreporoot=$TESTTMP/foobar (glob)
49 paths.default=$TESTTMP/foo%bar (glob)
49 paths.default=$TESTTMP/foo%bar (glob)
50 $ cd ..
50 $ cd ..
51
51
52 issue1829: wrong indentation
52 issue1829: wrong indentation
53
53
54 $ echo '[foo]' > $HGRC
54 $ echo '[foo]' > $HGRC
55 $ echo ' x = y' >> $HGRC
55 $ echo ' x = y' >> $HGRC
56 $ hg version
56 $ hg version
57 hg: parse error at $TESTTMP/hgrc:2: x = y
57 hg: parse error at $TESTTMP/hgrc:2: x = y
58 unexpected leading whitespace
58 unexpected leading whitespace
59 [255]
59 [255]
60
60
61 $ $PYTHON -c "print '[foo]\nbar = a\n b\n c \n de\n fg \nbaz = bif cb \n'" \
61 $ $PYTHON -c "print '[foo]\nbar = a\n b\n c \n de\n fg \nbaz = bif cb \n'" \
62 > > $HGRC
62 > > $HGRC
63 $ hg showconfig foo
63 $ hg showconfig foo
64 foo.bar=a\nb\nc\nde\nfg
64 foo.bar=a\nb\nc\nde\nfg
65 foo.baz=bif cb
65 foo.baz=bif cb
66
66
67 $ FAKEPATH=/path/to/nowhere
67 $ FAKEPATH=/path/to/nowhere
68 $ export FAKEPATH
68 $ export FAKEPATH
69 $ echo '%include $FAKEPATH/no-such-file' > $HGRC
69 $ echo '%include $FAKEPATH/no-such-file' > $HGRC
70 $ hg version
70 $ hg version
71 Mercurial Distributed SCM (version *) (glob)
71 Mercurial Distributed SCM (version *) (glob)
72 (see https://mercurial-scm.org for more information)
72 (see https://mercurial-scm.org for more information)
73
73
74 Copyright (C) 2005-* Matt Mackall and others (glob)
74 Copyright (C) 2005-* Matt Mackall and others (glob)
75 This is free software; see the source for copying conditions. There is NO
75 This is free software; see the source for copying conditions. There is NO
76 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
76 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
77 $ unset FAKEPATH
77 $ unset FAKEPATH
78
78
79 make sure global options given on the cmdline take precedence
79 make sure global options given on the cmdline take precedence
80
80
81 $ hg showconfig --config ui.verbose=True --quiet
81 $ hg showconfig --config ui.verbose=True --quiet
82 bundle.mainreporoot=$TESTTMP
82 bundle.mainreporoot=$TESTTMP
83 ui.verbose=False
83 ui.verbose=False
84 ui.debug=False
84 ui.debug=False
85 ui.quiet=True
85 ui.quiet=True
86
86
87 $ touch foobar/untracked
87 $ touch foobar/untracked
88 $ cat >> foobar/.hg/hgrc <<EOF
88 $ cat >> foobar/.hg/hgrc <<EOF
89 > [ui]
89 > [ui]
90 > verbose=True
90 > verbose=True
91 > EOF
91 > EOF
92 $ hg -R foobar st -q
92 $ hg -R foobar st -q
93
93
94 username expansion
94 username expansion
95
95
96 $ olduser=$HGUSER
96 $ olduser=$HGUSER
97 $ unset HGUSER
97 $ unset HGUSER
98
98
99 $ FAKEUSER='John Doe'
99 $ FAKEUSER='John Doe'
100 $ export FAKEUSER
100 $ export FAKEUSER
101 $ echo '[ui]' > $HGRC
101 $ echo '[ui]' > $HGRC
102 $ echo 'username = $FAKEUSER' >> $HGRC
102 $ echo 'username = $FAKEUSER' >> $HGRC
103
103
104 $ hg init usertest
104 $ hg init usertest
105 $ cd usertest
105 $ cd usertest
106 $ touch bar
106 $ touch bar
107 $ hg commit --addremove --quiet -m "added bar"
107 $ hg commit --addremove --quiet -m "added bar"
108 $ hg log --template "{author}\n"
108 $ hg log --template "{author}\n"
109 John Doe
109 John Doe
110 $ cd ..
110 $ cd ..
111
111
112 $ hg showconfig
112 $ hg showconfig
113 bundle.mainreporoot=$TESTTMP
113 bundle.mainreporoot=$TESTTMP
114 ui.username=$FAKEUSER
114 ui.username=$FAKEUSER
115
115
116 $ unset FAKEUSER
116 $ unset FAKEUSER
117 $ HGUSER=$olduser
117 $ HGUSER=$olduser
118 $ export HGUSER
118 $ export HGUSER
119
119
120 showconfig with multiple arguments
120 showconfig with multiple arguments
121
121
122 $ echo "[alias]" > $HGRC
122 $ echo "[alias]" > $HGRC
123 $ echo "log = log -g" >> $HGRC
123 $ echo "log = log -g" >> $HGRC
124 $ echo "[defaults]" >> $HGRC
124 $ echo "[defaults]" >> $HGRC
125 $ echo "identify = -n" >> $HGRC
125 $ echo "identify = -n" >> $HGRC
126 $ hg showconfig alias defaults
126 $ hg showconfig alias defaults
127 alias.log=log -g
127 alias.log=log -g
128 defaults.identify=-n
128 defaults.identify=-n
129 $ hg showconfig alias defaults.identify
129 $ hg showconfig alias defaults.identify
130 abort: only one config item permitted
130 abort: only one config item permitted
131 [255]
131 [255]
132 $ hg showconfig alias.log defaults.identify
132 $ hg showconfig alias.log defaults.identify
133 abort: only one config item permitted
133 abort: only one config item permitted
134 [255]
134 [255]
135
135
136 HGPLAIN
136 HGPLAIN
137
137
138 $ echo "[ui]" > $HGRC
138 $ echo "[ui]" > $HGRC
139 $ echo "debug=true" >> $HGRC
139 $ echo "debug=true" >> $HGRC
140 $ echo "fallbackencoding=ASCII" >> $HGRC
140 $ echo "fallbackencoding=ASCII" >> $HGRC
141 $ echo "quiet=true" >> $HGRC
141 $ echo "quiet=true" >> $HGRC
142 $ echo "slash=true" >> $HGRC
142 $ echo "slash=true" >> $HGRC
143 $ echo "traceback=true" >> $HGRC
143 $ echo "traceback=true" >> $HGRC
144 $ echo "verbose=true" >> $HGRC
144 $ echo "verbose=true" >> $HGRC
145 $ echo "style=~/.hgstyle" >> $HGRC
145 $ echo "style=~/.hgstyle" >> $HGRC
146 $ echo "logtemplate={node}" >> $HGRC
146 $ echo "logtemplate={node}" >> $HGRC
147 $ echo "[defaults]" >> $HGRC
147 $ echo "[defaults]" >> $HGRC
148 $ echo "identify=-n" >> $HGRC
148 $ echo "identify=-n" >> $HGRC
149 $ echo "[alias]" >> $HGRC
149 $ echo "[alias]" >> $HGRC
150 $ echo "log=log -g" >> $HGRC
150 $ echo "log=log -g" >> $HGRC
151
151
152 customized hgrc
152 customized hgrc
153
153
154 $ hg showconfig
154 $ hg showconfig
155 read config from: $TESTTMP/hgrc
155 read config from: $TESTTMP/hgrc
156 $TESTTMP/hgrc:13: alias.log=log -g
156 $TESTTMP/hgrc:13: alias.log=log -g
157 repo: bundle.mainreporoot=$TESTTMP
157 repo: bundle.mainreporoot=$TESTTMP
158 $TESTTMP/hgrc:11: defaults.identify=-n
158 $TESTTMP/hgrc:11: defaults.identify=-n
159 $TESTTMP/hgrc:2: ui.debug=true
159 $TESTTMP/hgrc:2: ui.debug=true
160 $TESTTMP/hgrc:3: ui.fallbackencoding=ASCII
160 $TESTTMP/hgrc:3: ui.fallbackencoding=ASCII
161 $TESTTMP/hgrc:4: ui.quiet=true
161 $TESTTMP/hgrc:4: ui.quiet=true
162 $TESTTMP/hgrc:5: ui.slash=true
162 $TESTTMP/hgrc:5: ui.slash=true
163 $TESTTMP/hgrc:6: ui.traceback=true
163 $TESTTMP/hgrc:6: ui.traceback=true
164 $TESTTMP/hgrc:7: ui.verbose=true
164 $TESTTMP/hgrc:7: ui.verbose=true
165 $TESTTMP/hgrc:8: ui.style=~/.hgstyle
165 $TESTTMP/hgrc:8: ui.style=~/.hgstyle
166 $TESTTMP/hgrc:9: ui.logtemplate={node}
166 $TESTTMP/hgrc:9: ui.logtemplate={node}
167
167
168 plain hgrc
168 plain hgrc
169
169
170 $ HGPLAIN=; export HGPLAIN
170 $ HGPLAIN=; export HGPLAIN
171 $ hg showconfig --config ui.traceback=True --debug
171 $ hg showconfig --config ui.traceback=True --debug
172 read config from: $TESTTMP/hgrc
172 read config from: $TESTTMP/hgrc
173 repo: bundle.mainreporoot=$TESTTMP
173 repo: bundle.mainreporoot=$TESTTMP
174 --config: ui.traceback=True
174 --config: ui.traceback=True
175 --verbose: ui.verbose=False
175 --verbose: ui.verbose=False
176 --debug: ui.debug=True
176 --debug: ui.debug=True
177 --quiet: ui.quiet=False
177 --quiet: ui.quiet=False
178
178
179 with environment variables
180
181 $ PAGER=p1 EDITOR=e1 VISUAL=e2 hg showconfig --debug
182 set config by: $EDITOR
183 set config by: $VISUAL
184 set config by: $PAGER
185 read config from: $TESTTMP/hgrc
186 repo: bundle.mainreporoot=$TESTTMP
187 $PAGER: pager.pager=p1
188 $VISUAL: ui.editor=e2
189 --verbose: ui.verbose=False
190 --debug: ui.debug=True
191 --quiet: ui.quiet=False
192
179 plain mode with exceptions
193 plain mode with exceptions
180
194
181 $ cat > plain.py <<EOF
195 $ cat > plain.py <<EOF
182 > from mercurial import commands, extensions
196 > from mercurial import commands, extensions
183 > def _config(orig, ui, repo, *values, **opts):
197 > def _config(orig, ui, repo, *values, **opts):
184 > ui.write('plain: %r\n' % ui.plain())
198 > ui.write('plain: %r\n' % ui.plain())
185 > return orig(ui, repo, *values, **opts)
199 > return orig(ui, repo, *values, **opts)
186 > def uisetup(ui):
200 > def uisetup(ui):
187 > extensions.wrapcommand(commands.table, 'config', _config)
201 > extensions.wrapcommand(commands.table, 'config', _config)
188 > EOF
202 > EOF
189 $ echo "[extensions]" >> $HGRC
203 $ echo "[extensions]" >> $HGRC
190 $ echo "plain=./plain.py" >> $HGRC
204 $ echo "plain=./plain.py" >> $HGRC
191 $ HGPLAINEXCEPT=; export HGPLAINEXCEPT
205 $ HGPLAINEXCEPT=; export HGPLAINEXCEPT
192 $ hg showconfig --config ui.traceback=True --debug
206 $ hg showconfig --config ui.traceback=True --debug
193 plain: True
207 plain: True
194 read config from: $TESTTMP/hgrc
208 read config from: $TESTTMP/hgrc
195 repo: bundle.mainreporoot=$TESTTMP
209 repo: bundle.mainreporoot=$TESTTMP
196 $TESTTMP/hgrc:15: extensions.plain=./plain.py
210 $TESTTMP/hgrc:15: extensions.plain=./plain.py
197 --config: ui.traceback=True
211 --config: ui.traceback=True
198 --verbose: ui.verbose=False
212 --verbose: ui.verbose=False
199 --debug: ui.debug=True
213 --debug: ui.debug=True
200 --quiet: ui.quiet=False
214 --quiet: ui.quiet=False
201 $ unset HGPLAIN
215 $ unset HGPLAIN
202 $ hg showconfig --config ui.traceback=True --debug
216 $ hg showconfig --config ui.traceback=True --debug
203 plain: True
217 plain: True
204 read config from: $TESTTMP/hgrc
218 read config from: $TESTTMP/hgrc
205 repo: bundle.mainreporoot=$TESTTMP
219 repo: bundle.mainreporoot=$TESTTMP
206 $TESTTMP/hgrc:15: extensions.plain=./plain.py
220 $TESTTMP/hgrc:15: extensions.plain=./plain.py
207 --config: ui.traceback=True
221 --config: ui.traceback=True
208 --verbose: ui.verbose=False
222 --verbose: ui.verbose=False
209 --debug: ui.debug=True
223 --debug: ui.debug=True
210 --quiet: ui.quiet=False
224 --quiet: ui.quiet=False
211 $ HGPLAINEXCEPT=i18n; export HGPLAINEXCEPT
225 $ HGPLAINEXCEPT=i18n; export HGPLAINEXCEPT
212 $ hg showconfig --config ui.traceback=True --debug
226 $ hg showconfig --config ui.traceback=True --debug
213 plain: True
227 plain: True
214 read config from: $TESTTMP/hgrc
228 read config from: $TESTTMP/hgrc
215 repo: bundle.mainreporoot=$TESTTMP
229 repo: bundle.mainreporoot=$TESTTMP
216 $TESTTMP/hgrc:15: extensions.plain=./plain.py
230 $TESTTMP/hgrc:15: extensions.plain=./plain.py
217 --config: ui.traceback=True
231 --config: ui.traceback=True
218 --verbose: ui.verbose=False
232 --verbose: ui.verbose=False
219 --debug: ui.debug=True
233 --debug: ui.debug=True
220 --quiet: ui.quiet=False
234 --quiet: ui.quiet=False
221
235
222 source of paths is not mangled
236 source of paths is not mangled
223
237
224 $ cat >> $HGRCPATH <<EOF
238 $ cat >> $HGRCPATH <<EOF
225 > [paths]
239 > [paths]
226 > foo = bar
240 > foo = bar
227 > EOF
241 > EOF
228 $ hg showconfig --debug paths
242 $ hg showconfig --debug paths
229 plain: True
243 plain: True
230 read config from: $TESTTMP/hgrc
244 read config from: $TESTTMP/hgrc
231 $TESTTMP/hgrc:17: paths.foo=$TESTTMP/bar (glob)
245 $TESTTMP/hgrc:17: paths.foo=$TESTTMP/bar (glob)
General Comments 0
You need to be logged in to leave comments. Login now