##// END OF EJS Templates
commands: directly use exchange.pull...
Pierre-Yves David -
r22694:21d5416b default
parent child Browse files
Show More
@@ -1,6317 +1,6318 b''
1 # commands.py - command processing for mercurial
1 # commands.py - command processing for mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from node import hex, bin, nullid, nullrev, short
8 from node import hex, bin, nullid, nullrev, short
9 from lock import release
9 from lock import release
10 from i18n import _
10 from i18n import _
11 import os, re, difflib, time, tempfile, errno, shlex
11 import os, re, difflib, time, tempfile, errno, shlex
12 import sys, socket
12 import sys, socket
13 import hg, scmutil, util, revlog, copies, error, bookmarks
13 import hg, scmutil, util, revlog, copies, error, bookmarks
14 import patch, help, encoding, templatekw, discovery
14 import patch, help, encoding, templatekw, discovery
15 import archival, changegroup, cmdutil, hbisect
15 import archival, changegroup, cmdutil, hbisect
16 import sshserver, hgweb, commandserver
16 import sshserver, hgweb, commandserver
17 import extensions
17 import extensions
18 from hgweb import server as hgweb_server
18 from hgweb import server as hgweb_server
19 import merge as mergemod
19 import merge as mergemod
20 import minirst, revset, fileset
20 import minirst, revset, fileset
21 import dagparser, context, simplemerge, graphmod
21 import dagparser, context, simplemerge, graphmod
22 import random
22 import random
23 import setdiscovery, treediscovery, dagutil, pvec, localrepo
23 import setdiscovery, treediscovery, dagutil, pvec, localrepo
24 import phases, obsolete, exchange
24 import phases, obsolete, exchange
25
25
26 table = {}
26 table = {}
27
27
28 command = cmdutil.command(table)
28 command = cmdutil.command(table)
29
29
30 # Space delimited list of commands that don't require local repositories.
30 # Space delimited list of commands that don't require local repositories.
31 # This should be populated by passing norepo=True into the @command decorator.
31 # This should be populated by passing norepo=True into the @command decorator.
32 norepo = ''
32 norepo = ''
33 # Space delimited list of commands that optionally require local repositories.
33 # Space delimited list of commands that optionally require local repositories.
34 # This should be populated by passing optionalrepo=True into the @command
34 # This should be populated by passing optionalrepo=True into the @command
35 # decorator.
35 # decorator.
36 optionalrepo = ''
36 optionalrepo = ''
37 # Space delimited list of commands that will examine arguments looking for
37 # Space delimited list of commands that will examine arguments looking for
38 # a repository. This should be populated by passing inferrepo=True into the
38 # a repository. This should be populated by passing inferrepo=True into the
39 # @command decorator.
39 # @command decorator.
40 inferrepo = ''
40 inferrepo = ''
41
41
42 # common command options
42 # common command options
43
43
44 globalopts = [
44 globalopts = [
45 ('R', 'repository', '',
45 ('R', 'repository', '',
46 _('repository root directory or name of overlay bundle file'),
46 _('repository root directory or name of overlay bundle file'),
47 _('REPO')),
47 _('REPO')),
48 ('', 'cwd', '',
48 ('', 'cwd', '',
49 _('change working directory'), _('DIR')),
49 _('change working directory'), _('DIR')),
50 ('y', 'noninteractive', None,
50 ('y', 'noninteractive', None,
51 _('do not prompt, automatically pick the first choice for all prompts')),
51 _('do not prompt, automatically pick the first choice for all prompts')),
52 ('q', 'quiet', None, _('suppress output')),
52 ('q', 'quiet', None, _('suppress output')),
53 ('v', 'verbose', None, _('enable additional output')),
53 ('v', 'verbose', None, _('enable additional output')),
54 ('', 'config', [],
54 ('', 'config', [],
55 _('set/override config option (use \'section.name=value\')'),
55 _('set/override config option (use \'section.name=value\')'),
56 _('CONFIG')),
56 _('CONFIG')),
57 ('', 'debug', None, _('enable debugging output')),
57 ('', 'debug', None, _('enable debugging output')),
58 ('', 'debugger', None, _('start debugger')),
58 ('', 'debugger', None, _('start debugger')),
59 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
59 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
60 _('ENCODE')),
60 _('ENCODE')),
61 ('', 'encodingmode', encoding.encodingmode,
61 ('', 'encodingmode', encoding.encodingmode,
62 _('set the charset encoding mode'), _('MODE')),
62 _('set the charset encoding mode'), _('MODE')),
63 ('', 'traceback', None, _('always print a traceback on exception')),
63 ('', 'traceback', None, _('always print a traceback on exception')),
64 ('', 'time', None, _('time how long the command takes')),
64 ('', 'time', None, _('time how long the command takes')),
65 ('', 'profile', None, _('print command execution profile')),
65 ('', 'profile', None, _('print command execution profile')),
66 ('', 'version', None, _('output version information and exit')),
66 ('', 'version', None, _('output version information and exit')),
67 ('h', 'help', None, _('display help and exit')),
67 ('h', 'help', None, _('display help and exit')),
68 ('', 'hidden', False, _('consider hidden changesets')),
68 ('', 'hidden', False, _('consider hidden changesets')),
69 ]
69 ]
70
70
71 dryrunopts = [('n', 'dry-run', None,
71 dryrunopts = [('n', 'dry-run', None,
72 _('do not perform actions, just print output'))]
72 _('do not perform actions, just print output'))]
73
73
74 remoteopts = [
74 remoteopts = [
75 ('e', 'ssh', '',
75 ('e', 'ssh', '',
76 _('specify ssh command to use'), _('CMD')),
76 _('specify ssh command to use'), _('CMD')),
77 ('', 'remotecmd', '',
77 ('', 'remotecmd', '',
78 _('specify hg command to run on the remote side'), _('CMD')),
78 _('specify hg command to run on the remote side'), _('CMD')),
79 ('', 'insecure', None,
79 ('', 'insecure', None,
80 _('do not verify server certificate (ignoring web.cacerts config)')),
80 _('do not verify server certificate (ignoring web.cacerts config)')),
81 ]
81 ]
82
82
83 walkopts = [
83 walkopts = [
84 ('I', 'include', [],
84 ('I', 'include', [],
85 _('include names matching the given patterns'), _('PATTERN')),
85 _('include names matching the given patterns'), _('PATTERN')),
86 ('X', 'exclude', [],
86 ('X', 'exclude', [],
87 _('exclude names matching the given patterns'), _('PATTERN')),
87 _('exclude names matching the given patterns'), _('PATTERN')),
88 ]
88 ]
89
89
90 commitopts = [
90 commitopts = [
91 ('m', 'message', '',
91 ('m', 'message', '',
92 _('use text as commit message'), _('TEXT')),
92 _('use text as commit message'), _('TEXT')),
93 ('l', 'logfile', '',
93 ('l', 'logfile', '',
94 _('read commit message from file'), _('FILE')),
94 _('read commit message from file'), _('FILE')),
95 ]
95 ]
96
96
97 commitopts2 = [
97 commitopts2 = [
98 ('d', 'date', '',
98 ('d', 'date', '',
99 _('record the specified date as commit date'), _('DATE')),
99 _('record the specified date as commit date'), _('DATE')),
100 ('u', 'user', '',
100 ('u', 'user', '',
101 _('record the specified user as committer'), _('USER')),
101 _('record the specified user as committer'), _('USER')),
102 ]
102 ]
103
103
104 # hidden for now
104 # hidden for now
105 formatteropts = [
105 formatteropts = [
106 ('T', 'template', '',
106 ('T', 'template', '',
107 _('display with template (DEPRECATED)'), _('TEMPLATE')),
107 _('display with template (DEPRECATED)'), _('TEMPLATE')),
108 ]
108 ]
109
109
110 templateopts = [
110 templateopts = [
111 ('', 'style', '',
111 ('', 'style', '',
112 _('display using template map file (DEPRECATED)'), _('STYLE')),
112 _('display using template map file (DEPRECATED)'), _('STYLE')),
113 ('T', 'template', '',
113 ('T', 'template', '',
114 _('display with template'), _('TEMPLATE')),
114 _('display with template'), _('TEMPLATE')),
115 ]
115 ]
116
116
117 logopts = [
117 logopts = [
118 ('p', 'patch', None, _('show patch')),
118 ('p', 'patch', None, _('show patch')),
119 ('g', 'git', None, _('use git extended diff format')),
119 ('g', 'git', None, _('use git extended diff format')),
120 ('l', 'limit', '',
120 ('l', 'limit', '',
121 _('limit number of changes displayed'), _('NUM')),
121 _('limit number of changes displayed'), _('NUM')),
122 ('M', 'no-merges', None, _('do not show merges')),
122 ('M', 'no-merges', None, _('do not show merges')),
123 ('', 'stat', None, _('output diffstat-style summary of changes')),
123 ('', 'stat', None, _('output diffstat-style summary of changes')),
124 ('G', 'graph', None, _("show the revision DAG")),
124 ('G', 'graph', None, _("show the revision DAG")),
125 ] + templateopts
125 ] + templateopts
126
126
127 diffopts = [
127 diffopts = [
128 ('a', 'text', None, _('treat all files as text')),
128 ('a', 'text', None, _('treat all files as text')),
129 ('g', 'git', None, _('use git extended diff format')),
129 ('g', 'git', None, _('use git extended diff format')),
130 ('', 'nodates', None, _('omit dates from diff headers'))
130 ('', 'nodates', None, _('omit dates from diff headers'))
131 ]
131 ]
132
132
133 diffwsopts = [
133 diffwsopts = [
134 ('w', 'ignore-all-space', None,
134 ('w', 'ignore-all-space', None,
135 _('ignore white space when comparing lines')),
135 _('ignore white space when comparing lines')),
136 ('b', 'ignore-space-change', None,
136 ('b', 'ignore-space-change', None,
137 _('ignore changes in the amount of white space')),
137 _('ignore changes in the amount of white space')),
138 ('B', 'ignore-blank-lines', None,
138 ('B', 'ignore-blank-lines', None,
139 _('ignore changes whose lines are all blank')),
139 _('ignore changes whose lines are all blank')),
140 ]
140 ]
141
141
142 diffopts2 = [
142 diffopts2 = [
143 ('p', 'show-function', None, _('show which function each change is in')),
143 ('p', 'show-function', None, _('show which function each change is in')),
144 ('', 'reverse', None, _('produce a diff that undoes the changes')),
144 ('', 'reverse', None, _('produce a diff that undoes the changes')),
145 ] + diffwsopts + [
145 ] + diffwsopts + [
146 ('U', 'unified', '',
146 ('U', 'unified', '',
147 _('number of lines of context to show'), _('NUM')),
147 _('number of lines of context to show'), _('NUM')),
148 ('', 'stat', None, _('output diffstat-style summary of changes')),
148 ('', 'stat', None, _('output diffstat-style summary of changes')),
149 ]
149 ]
150
150
151 mergetoolopts = [
151 mergetoolopts = [
152 ('t', 'tool', '', _('specify merge tool')),
152 ('t', 'tool', '', _('specify merge tool')),
153 ]
153 ]
154
154
155 similarityopts = [
155 similarityopts = [
156 ('s', 'similarity', '',
156 ('s', 'similarity', '',
157 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
157 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
158 ]
158 ]
159
159
160 subrepoopts = [
160 subrepoopts = [
161 ('S', 'subrepos', None,
161 ('S', 'subrepos', None,
162 _('recurse into subrepositories'))
162 _('recurse into subrepositories'))
163 ]
163 ]
164
164
165 # Commands start here, listed alphabetically
165 # Commands start here, listed alphabetically
166
166
167 @command('^add',
167 @command('^add',
168 walkopts + subrepoopts + dryrunopts,
168 walkopts + subrepoopts + dryrunopts,
169 _('[OPTION]... [FILE]...'),
169 _('[OPTION]... [FILE]...'),
170 inferrepo=True)
170 inferrepo=True)
171 def add(ui, repo, *pats, **opts):
171 def add(ui, repo, *pats, **opts):
172 """add the specified files on the next commit
172 """add the specified files on the next commit
173
173
174 Schedule files to be version controlled and added to the
174 Schedule files to be version controlled and added to the
175 repository.
175 repository.
176
176
177 The files will be added to the repository at the next commit. To
177 The files will be added to the repository at the next commit. To
178 undo an add before that, see :hg:`forget`.
178 undo an add before that, see :hg:`forget`.
179
179
180 If no names are given, add all files to the repository.
180 If no names are given, add all files to the repository.
181
181
182 .. container:: verbose
182 .. container:: verbose
183
183
184 An example showing how new (unknown) files are added
184 An example showing how new (unknown) files are added
185 automatically by :hg:`add`::
185 automatically by :hg:`add`::
186
186
187 $ ls
187 $ ls
188 foo.c
188 foo.c
189 $ hg status
189 $ hg status
190 ? foo.c
190 ? foo.c
191 $ hg add
191 $ hg add
192 adding foo.c
192 adding foo.c
193 $ hg status
193 $ hg status
194 A foo.c
194 A foo.c
195
195
196 Returns 0 if all files are successfully added.
196 Returns 0 if all files are successfully added.
197 """
197 """
198
198
199 m = scmutil.match(repo[None], pats, opts)
199 m = scmutil.match(repo[None], pats, opts)
200 rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'),
200 rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'),
201 opts.get('subrepos'), prefix="", explicitonly=False)
201 opts.get('subrepos'), prefix="", explicitonly=False)
202 return rejected and 1 or 0
202 return rejected and 1 or 0
203
203
204 @command('addremove',
204 @command('addremove',
205 similarityopts + walkopts + dryrunopts,
205 similarityopts + walkopts + dryrunopts,
206 _('[OPTION]... [FILE]...'),
206 _('[OPTION]... [FILE]...'),
207 inferrepo=True)
207 inferrepo=True)
208 def addremove(ui, repo, *pats, **opts):
208 def addremove(ui, repo, *pats, **opts):
209 """add all new files, delete all missing files
209 """add all new files, delete all missing files
210
210
211 Add all new files and remove all missing files from the
211 Add all new files and remove all missing files from the
212 repository.
212 repository.
213
213
214 New files are ignored if they match any of the patterns in
214 New files are ignored if they match any of the patterns in
215 ``.hgignore``. As with add, these changes take effect at the next
215 ``.hgignore``. As with add, these changes take effect at the next
216 commit.
216 commit.
217
217
218 Use the -s/--similarity option to detect renamed files. This
218 Use the -s/--similarity option to detect renamed files. This
219 option takes a percentage between 0 (disabled) and 100 (files must
219 option takes a percentage between 0 (disabled) and 100 (files must
220 be identical) as its parameter. With a parameter greater than 0,
220 be identical) as its parameter. With a parameter greater than 0,
221 this compares every removed file with every added file and records
221 this compares every removed file with every added file and records
222 those similar enough as renames. Detecting renamed files this way
222 those similar enough as renames. Detecting renamed files this way
223 can be expensive. After using this option, :hg:`status -C` can be
223 can be expensive. After using this option, :hg:`status -C` can be
224 used to check which files were identified as moved or renamed. If
224 used to check which files were identified as moved or renamed. If
225 not specified, -s/--similarity defaults to 100 and only renames of
225 not specified, -s/--similarity defaults to 100 and only renames of
226 identical files are detected.
226 identical files are detected.
227
227
228 Returns 0 if all files are successfully added.
228 Returns 0 if all files are successfully added.
229 """
229 """
230 try:
230 try:
231 sim = float(opts.get('similarity') or 100)
231 sim = float(opts.get('similarity') or 100)
232 except ValueError:
232 except ValueError:
233 raise util.Abort(_('similarity must be a number'))
233 raise util.Abort(_('similarity must be a number'))
234 if sim < 0 or sim > 100:
234 if sim < 0 or sim > 100:
235 raise util.Abort(_('similarity must be between 0 and 100'))
235 raise util.Abort(_('similarity must be between 0 and 100'))
236 return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0)
236 return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0)
237
237
238 @command('^annotate|blame',
238 @command('^annotate|blame',
239 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
239 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
240 ('', 'follow', None,
240 ('', 'follow', None,
241 _('follow copies/renames and list the filename (DEPRECATED)')),
241 _('follow copies/renames and list the filename (DEPRECATED)')),
242 ('', 'no-follow', None, _("don't follow copies and renames")),
242 ('', 'no-follow', None, _("don't follow copies and renames")),
243 ('a', 'text', None, _('treat all files as text')),
243 ('a', 'text', None, _('treat all files as text')),
244 ('u', 'user', None, _('list the author (long with -v)')),
244 ('u', 'user', None, _('list the author (long with -v)')),
245 ('f', 'file', None, _('list the filename')),
245 ('f', 'file', None, _('list the filename')),
246 ('d', 'date', None, _('list the date (short with -q)')),
246 ('d', 'date', None, _('list the date (short with -q)')),
247 ('n', 'number', None, _('list the revision number (default)')),
247 ('n', 'number', None, _('list the revision number (default)')),
248 ('c', 'changeset', None, _('list the changeset')),
248 ('c', 'changeset', None, _('list the changeset')),
249 ('l', 'line-number', None, _('show line number at the first appearance'))
249 ('l', 'line-number', None, _('show line number at the first appearance'))
250 ] + diffwsopts + walkopts + formatteropts,
250 ] + diffwsopts + walkopts + formatteropts,
251 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
251 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
252 inferrepo=True)
252 inferrepo=True)
253 def annotate(ui, repo, *pats, **opts):
253 def annotate(ui, repo, *pats, **opts):
254 """show changeset information by line for each file
254 """show changeset information by line for each file
255
255
256 List changes in files, showing the revision id responsible for
256 List changes in files, showing the revision id responsible for
257 each line
257 each line
258
258
259 This command is useful for discovering when a change was made and
259 This command is useful for discovering when a change was made and
260 by whom.
260 by whom.
261
261
262 Without the -a/--text option, annotate will avoid processing files
262 Without the -a/--text option, annotate will avoid processing files
263 it detects as binary. With -a, annotate will annotate the file
263 it detects as binary. With -a, annotate will annotate the file
264 anyway, although the results will probably be neither useful
264 anyway, although the results will probably be neither useful
265 nor desirable.
265 nor desirable.
266
266
267 Returns 0 on success.
267 Returns 0 on success.
268 """
268 """
269 if not pats:
269 if not pats:
270 raise util.Abort(_('at least one filename or pattern is required'))
270 raise util.Abort(_('at least one filename or pattern is required'))
271
271
272 if opts.get('follow'):
272 if opts.get('follow'):
273 # --follow is deprecated and now just an alias for -f/--file
273 # --follow is deprecated and now just an alias for -f/--file
274 # to mimic the behavior of Mercurial before version 1.5
274 # to mimic the behavior of Mercurial before version 1.5
275 opts['file'] = True
275 opts['file'] = True
276
276
277 fm = ui.formatter('annotate', opts)
277 fm = ui.formatter('annotate', opts)
278 datefunc = ui.quiet and util.shortdate or util.datestr
278 datefunc = ui.quiet and util.shortdate or util.datestr
279 if fm or ui.debugflag:
279 if fm or ui.debugflag:
280 hexfn = hex
280 hexfn = hex
281 else:
281 else:
282 hexfn = short
282 hexfn = short
283
283
284 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
284 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
285 ('number', ' ', lambda x: x[0].rev(), str),
285 ('number', ' ', lambda x: x[0].rev(), str),
286 ('changeset', ' ', lambda x: hexfn(x[0].node()), str),
286 ('changeset', ' ', lambda x: hexfn(x[0].node()), str),
287 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
287 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
288 ('file', ' ', lambda x: x[0].path(), str),
288 ('file', ' ', lambda x: x[0].path(), str),
289 ('line_number', ':', lambda x: x[1], str),
289 ('line_number', ':', lambda x: x[1], str),
290 ]
290 ]
291 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
291 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
292
292
293 if (not opts.get('user') and not opts.get('changeset')
293 if (not opts.get('user') and not opts.get('changeset')
294 and not opts.get('date') and not opts.get('file')):
294 and not opts.get('date') and not opts.get('file')):
295 opts['number'] = True
295 opts['number'] = True
296
296
297 linenumber = opts.get('line_number') is not None
297 linenumber = opts.get('line_number') is not None
298 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
298 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
299 raise util.Abort(_('at least one of -n/-c is required for -l'))
299 raise util.Abort(_('at least one of -n/-c is required for -l'))
300
300
301 if fm:
301 if fm:
302 def makefunc(get, fmt):
302 def makefunc(get, fmt):
303 return get
303 return get
304 else:
304 else:
305 def makefunc(get, fmt):
305 def makefunc(get, fmt):
306 return lambda x: fmt(get(x))
306 return lambda x: fmt(get(x))
307 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
307 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
308 if opts.get(op)]
308 if opts.get(op)]
309 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
309 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
310 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
310 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
311 if opts.get(op))
311 if opts.get(op))
312
312
313 def bad(x, y):
313 def bad(x, y):
314 raise util.Abort("%s: %s" % (x, y))
314 raise util.Abort("%s: %s" % (x, y))
315
315
316 ctx = scmutil.revsingle(repo, opts.get('rev'))
316 ctx = scmutil.revsingle(repo, opts.get('rev'))
317 m = scmutil.match(ctx, pats, opts)
317 m = scmutil.match(ctx, pats, opts)
318 m.bad = bad
318 m.bad = bad
319 follow = not opts.get('no_follow')
319 follow = not opts.get('no_follow')
320 diffopts = patch.diffopts(ui, opts, section='annotate')
320 diffopts = patch.diffopts(ui, opts, section='annotate')
321 for abs in ctx.walk(m):
321 for abs in ctx.walk(m):
322 fctx = ctx[abs]
322 fctx = ctx[abs]
323 if not opts.get('text') and util.binary(fctx.data()):
323 if not opts.get('text') and util.binary(fctx.data()):
324 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
324 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
325 continue
325 continue
326
326
327 lines = fctx.annotate(follow=follow, linenumber=linenumber,
327 lines = fctx.annotate(follow=follow, linenumber=linenumber,
328 diffopts=diffopts)
328 diffopts=diffopts)
329 formats = []
329 formats = []
330 pieces = []
330 pieces = []
331
331
332 for f, sep in funcmap:
332 for f, sep in funcmap:
333 l = [f(n) for n, dummy in lines]
333 l = [f(n) for n, dummy in lines]
334 if l:
334 if l:
335 if fm:
335 if fm:
336 formats.append(['%s' for x in l])
336 formats.append(['%s' for x in l])
337 else:
337 else:
338 sizes = [encoding.colwidth(x) for x in l]
338 sizes = [encoding.colwidth(x) for x in l]
339 ml = max(sizes)
339 ml = max(sizes)
340 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
340 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
341 pieces.append(l)
341 pieces.append(l)
342
342
343 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
343 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
344 fm.startitem()
344 fm.startitem()
345 fm.write(fields, "".join(f), *p)
345 fm.write(fields, "".join(f), *p)
346 fm.write('line', ": %s", l[1])
346 fm.write('line', ": %s", l[1])
347
347
348 if lines and not lines[-1][1].endswith('\n'):
348 if lines and not lines[-1][1].endswith('\n'):
349 fm.plain('\n')
349 fm.plain('\n')
350
350
351 fm.end()
351 fm.end()
352
352
353 @command('archive',
353 @command('archive',
354 [('', 'no-decode', None, _('do not pass files through decoders')),
354 [('', 'no-decode', None, _('do not pass files through decoders')),
355 ('p', 'prefix', '', _('directory prefix for files in archive'),
355 ('p', 'prefix', '', _('directory prefix for files in archive'),
356 _('PREFIX')),
356 _('PREFIX')),
357 ('r', 'rev', '', _('revision to distribute'), _('REV')),
357 ('r', 'rev', '', _('revision to distribute'), _('REV')),
358 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
358 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
359 ] + subrepoopts + walkopts,
359 ] + subrepoopts + walkopts,
360 _('[OPTION]... DEST'))
360 _('[OPTION]... DEST'))
361 def archive(ui, repo, dest, **opts):
361 def archive(ui, repo, dest, **opts):
362 '''create an unversioned archive of a repository revision
362 '''create an unversioned archive of a repository revision
363
363
364 By default, the revision used is the parent of the working
364 By default, the revision used is the parent of the working
365 directory; use -r/--rev to specify a different revision.
365 directory; use -r/--rev to specify a different revision.
366
366
367 The archive type is automatically detected based on file
367 The archive type is automatically detected based on file
368 extension (or override using -t/--type).
368 extension (or override using -t/--type).
369
369
370 .. container:: verbose
370 .. container:: verbose
371
371
372 Examples:
372 Examples:
373
373
374 - create a zip file containing the 1.0 release::
374 - create a zip file containing the 1.0 release::
375
375
376 hg archive -r 1.0 project-1.0.zip
376 hg archive -r 1.0 project-1.0.zip
377
377
378 - create a tarball excluding .hg files::
378 - create a tarball excluding .hg files::
379
379
380 hg archive project.tar.gz -X ".hg*"
380 hg archive project.tar.gz -X ".hg*"
381
381
382 Valid types are:
382 Valid types are:
383
383
384 :``files``: a directory full of files (default)
384 :``files``: a directory full of files (default)
385 :``tar``: tar archive, uncompressed
385 :``tar``: tar archive, uncompressed
386 :``tbz2``: tar archive, compressed using bzip2
386 :``tbz2``: tar archive, compressed using bzip2
387 :``tgz``: tar archive, compressed using gzip
387 :``tgz``: tar archive, compressed using gzip
388 :``uzip``: zip archive, uncompressed
388 :``uzip``: zip archive, uncompressed
389 :``zip``: zip archive, compressed using deflate
389 :``zip``: zip archive, compressed using deflate
390
390
391 The exact name of the destination archive or directory is given
391 The exact name of the destination archive or directory is given
392 using a format string; see :hg:`help export` for details.
392 using a format string; see :hg:`help export` for details.
393
393
394 Each member added to an archive file has a directory prefix
394 Each member added to an archive file has a directory prefix
395 prepended. Use -p/--prefix to specify a format string for the
395 prepended. Use -p/--prefix to specify a format string for the
396 prefix. The default is the basename of the archive, with suffixes
396 prefix. The default is the basename of the archive, with suffixes
397 removed.
397 removed.
398
398
399 Returns 0 on success.
399 Returns 0 on success.
400 '''
400 '''
401
401
402 ctx = scmutil.revsingle(repo, opts.get('rev'))
402 ctx = scmutil.revsingle(repo, opts.get('rev'))
403 if not ctx:
403 if not ctx:
404 raise util.Abort(_('no working directory: please specify a revision'))
404 raise util.Abort(_('no working directory: please specify a revision'))
405 node = ctx.node()
405 node = ctx.node()
406 dest = cmdutil.makefilename(repo, dest, node)
406 dest = cmdutil.makefilename(repo, dest, node)
407 if os.path.realpath(dest) == repo.root:
407 if os.path.realpath(dest) == repo.root:
408 raise util.Abort(_('repository root cannot be destination'))
408 raise util.Abort(_('repository root cannot be destination'))
409
409
410 kind = opts.get('type') or archival.guesskind(dest) or 'files'
410 kind = opts.get('type') or archival.guesskind(dest) or 'files'
411 prefix = opts.get('prefix')
411 prefix = opts.get('prefix')
412
412
413 if dest == '-':
413 if dest == '-':
414 if kind == 'files':
414 if kind == 'files':
415 raise util.Abort(_('cannot archive plain files to stdout'))
415 raise util.Abort(_('cannot archive plain files to stdout'))
416 dest = cmdutil.makefileobj(repo, dest)
416 dest = cmdutil.makefileobj(repo, dest)
417 if not prefix:
417 if not prefix:
418 prefix = os.path.basename(repo.root) + '-%h'
418 prefix = os.path.basename(repo.root) + '-%h'
419
419
420 prefix = cmdutil.makefilename(repo, prefix, node)
420 prefix = cmdutil.makefilename(repo, prefix, node)
421 matchfn = scmutil.match(ctx, [], opts)
421 matchfn = scmutil.match(ctx, [], opts)
422 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
422 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
423 matchfn, prefix, subrepos=opts.get('subrepos'))
423 matchfn, prefix, subrepos=opts.get('subrepos'))
424
424
425 @command('backout',
425 @command('backout',
426 [('', 'merge', None, _('merge with old dirstate parent after backout')),
426 [('', 'merge', None, _('merge with old dirstate parent after backout')),
427 ('', 'parent', '',
427 ('', 'parent', '',
428 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
428 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
429 ('r', 'rev', '', _('revision to backout'), _('REV')),
429 ('r', 'rev', '', _('revision to backout'), _('REV')),
430 ('e', 'edit', False, _('invoke editor on commit messages')),
430 ('e', 'edit', False, _('invoke editor on commit messages')),
431 ] + mergetoolopts + walkopts + commitopts + commitopts2,
431 ] + mergetoolopts + walkopts + commitopts + commitopts2,
432 _('[OPTION]... [-r] REV'))
432 _('[OPTION]... [-r] REV'))
433 def backout(ui, repo, node=None, rev=None, **opts):
433 def backout(ui, repo, node=None, rev=None, **opts):
434 '''reverse effect of earlier changeset
434 '''reverse effect of earlier changeset
435
435
436 Prepare a new changeset with the effect of REV undone in the
436 Prepare a new changeset with the effect of REV undone in the
437 current working directory.
437 current working directory.
438
438
439 If REV is the parent of the working directory, then this new changeset
439 If REV is the parent of the working directory, then this new changeset
440 is committed automatically. Otherwise, hg needs to merge the
440 is committed automatically. Otherwise, hg needs to merge the
441 changes and the merged result is left uncommitted.
441 changes and the merged result is left uncommitted.
442
442
443 .. note::
443 .. note::
444
444
445 backout cannot be used to fix either an unwanted or
445 backout cannot be used to fix either an unwanted or
446 incorrect merge.
446 incorrect merge.
447
447
448 .. container:: verbose
448 .. container:: verbose
449
449
450 By default, the pending changeset will have one parent,
450 By default, the pending changeset will have one parent,
451 maintaining a linear history. With --merge, the pending
451 maintaining a linear history. With --merge, the pending
452 changeset will instead have two parents: the old parent of the
452 changeset will instead have two parents: the old parent of the
453 working directory and a new child of REV that simply undoes REV.
453 working directory and a new child of REV that simply undoes REV.
454
454
455 Before version 1.7, the behavior without --merge was equivalent
455 Before version 1.7, the behavior without --merge was equivalent
456 to specifying --merge followed by :hg:`update --clean .` to
456 to specifying --merge followed by :hg:`update --clean .` to
457 cancel the merge and leave the child of REV as a head to be
457 cancel the merge and leave the child of REV as a head to be
458 merged separately.
458 merged separately.
459
459
460 See :hg:`help dates` for a list of formats valid for -d/--date.
460 See :hg:`help dates` for a list of formats valid for -d/--date.
461
461
462 Returns 0 on success, 1 if nothing to backout or there are unresolved
462 Returns 0 on success, 1 if nothing to backout or there are unresolved
463 files.
463 files.
464 '''
464 '''
465 if rev and node:
465 if rev and node:
466 raise util.Abort(_("please specify just one revision"))
466 raise util.Abort(_("please specify just one revision"))
467
467
468 if not rev:
468 if not rev:
469 rev = node
469 rev = node
470
470
471 if not rev:
471 if not rev:
472 raise util.Abort(_("please specify a revision to backout"))
472 raise util.Abort(_("please specify a revision to backout"))
473
473
474 date = opts.get('date')
474 date = opts.get('date')
475 if date:
475 if date:
476 opts['date'] = util.parsedate(date)
476 opts['date'] = util.parsedate(date)
477
477
478 cmdutil.checkunfinished(repo)
478 cmdutil.checkunfinished(repo)
479 cmdutil.bailifchanged(repo)
479 cmdutil.bailifchanged(repo)
480 node = scmutil.revsingle(repo, rev).node()
480 node = scmutil.revsingle(repo, rev).node()
481
481
482 op1, op2 = repo.dirstate.parents()
482 op1, op2 = repo.dirstate.parents()
483 if not repo.changelog.isancestor(node, op1):
483 if not repo.changelog.isancestor(node, op1):
484 raise util.Abort(_('cannot backout change that is not an ancestor'))
484 raise util.Abort(_('cannot backout change that is not an ancestor'))
485
485
486 p1, p2 = repo.changelog.parents(node)
486 p1, p2 = repo.changelog.parents(node)
487 if p1 == nullid:
487 if p1 == nullid:
488 raise util.Abort(_('cannot backout a change with no parents'))
488 raise util.Abort(_('cannot backout a change with no parents'))
489 if p2 != nullid:
489 if p2 != nullid:
490 if not opts.get('parent'):
490 if not opts.get('parent'):
491 raise util.Abort(_('cannot backout a merge changeset'))
491 raise util.Abort(_('cannot backout a merge changeset'))
492 p = repo.lookup(opts['parent'])
492 p = repo.lookup(opts['parent'])
493 if p not in (p1, p2):
493 if p not in (p1, p2):
494 raise util.Abort(_('%s is not a parent of %s') %
494 raise util.Abort(_('%s is not a parent of %s') %
495 (short(p), short(node)))
495 (short(p), short(node)))
496 parent = p
496 parent = p
497 else:
497 else:
498 if opts.get('parent'):
498 if opts.get('parent'):
499 raise util.Abort(_('cannot use --parent on non-merge changeset'))
499 raise util.Abort(_('cannot use --parent on non-merge changeset'))
500 parent = p1
500 parent = p1
501
501
502 # the backout should appear on the same branch
502 # the backout should appear on the same branch
503 wlock = repo.wlock()
503 wlock = repo.wlock()
504 try:
504 try:
505 branch = repo.dirstate.branch()
505 branch = repo.dirstate.branch()
506 bheads = repo.branchheads(branch)
506 bheads = repo.branchheads(branch)
507 rctx = scmutil.revsingle(repo, hex(parent))
507 rctx = scmutil.revsingle(repo, hex(parent))
508 if not opts.get('merge') and op1 != node:
508 if not opts.get('merge') and op1 != node:
509 try:
509 try:
510 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
510 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
511 'backout')
511 'backout')
512 repo.dirstate.beginparentchange()
512 repo.dirstate.beginparentchange()
513 stats = mergemod.update(repo, parent, True, True, False,
513 stats = mergemod.update(repo, parent, True, True, False,
514 node, False)
514 node, False)
515 repo.setparents(op1, op2)
515 repo.setparents(op1, op2)
516 repo.dirstate.endparentchange()
516 repo.dirstate.endparentchange()
517 hg._showstats(repo, stats)
517 hg._showstats(repo, stats)
518 if stats[3]:
518 if stats[3]:
519 repo.ui.status(_("use 'hg resolve' to retry unresolved "
519 repo.ui.status(_("use 'hg resolve' to retry unresolved "
520 "file merges\n"))
520 "file merges\n"))
521 else:
521 else:
522 msg = _("changeset %s backed out, "
522 msg = _("changeset %s backed out, "
523 "don't forget to commit.\n")
523 "don't forget to commit.\n")
524 ui.status(msg % short(node))
524 ui.status(msg % short(node))
525 return stats[3] > 0
525 return stats[3] > 0
526 finally:
526 finally:
527 ui.setconfig('ui', 'forcemerge', '', '')
527 ui.setconfig('ui', 'forcemerge', '', '')
528 else:
528 else:
529 hg.clean(repo, node, show_stats=False)
529 hg.clean(repo, node, show_stats=False)
530 repo.dirstate.setbranch(branch)
530 repo.dirstate.setbranch(branch)
531 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
531 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
532
532
533
533
534 def commitfunc(ui, repo, message, match, opts):
534 def commitfunc(ui, repo, message, match, opts):
535 editform = 'backout'
535 editform = 'backout'
536 e = cmdutil.getcommiteditor(editform=editform, **opts)
536 e = cmdutil.getcommiteditor(editform=editform, **opts)
537 if not message:
537 if not message:
538 # we don't translate commit messages
538 # we don't translate commit messages
539 message = "Backed out changeset %s" % short(node)
539 message = "Backed out changeset %s" % short(node)
540 e = cmdutil.getcommiteditor(edit=True, editform=editform)
540 e = cmdutil.getcommiteditor(edit=True, editform=editform)
541 return repo.commit(message, opts.get('user'), opts.get('date'),
541 return repo.commit(message, opts.get('user'), opts.get('date'),
542 match, editor=e)
542 match, editor=e)
543 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
543 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
544 if not newnode:
544 if not newnode:
545 ui.status(_("nothing changed\n"))
545 ui.status(_("nothing changed\n"))
546 return 1
546 return 1
547 cmdutil.commitstatus(repo, newnode, branch, bheads)
547 cmdutil.commitstatus(repo, newnode, branch, bheads)
548
548
549 def nice(node):
549 def nice(node):
550 return '%d:%s' % (repo.changelog.rev(node), short(node))
550 return '%d:%s' % (repo.changelog.rev(node), short(node))
551 ui.status(_('changeset %s backs out changeset %s\n') %
551 ui.status(_('changeset %s backs out changeset %s\n') %
552 (nice(repo.changelog.tip()), nice(node)))
552 (nice(repo.changelog.tip()), nice(node)))
553 if opts.get('merge') and op1 != node:
553 if opts.get('merge') and op1 != node:
554 hg.clean(repo, op1, show_stats=False)
554 hg.clean(repo, op1, show_stats=False)
555 ui.status(_('merging with changeset %s\n')
555 ui.status(_('merging with changeset %s\n')
556 % nice(repo.changelog.tip()))
556 % nice(repo.changelog.tip()))
557 try:
557 try:
558 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
558 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
559 'backout')
559 'backout')
560 return hg.merge(repo, hex(repo.changelog.tip()))
560 return hg.merge(repo, hex(repo.changelog.tip()))
561 finally:
561 finally:
562 ui.setconfig('ui', 'forcemerge', '', '')
562 ui.setconfig('ui', 'forcemerge', '', '')
563 finally:
563 finally:
564 wlock.release()
564 wlock.release()
565 return 0
565 return 0
566
566
567 @command('bisect',
567 @command('bisect',
568 [('r', 'reset', False, _('reset bisect state')),
568 [('r', 'reset', False, _('reset bisect state')),
569 ('g', 'good', False, _('mark changeset good')),
569 ('g', 'good', False, _('mark changeset good')),
570 ('b', 'bad', False, _('mark changeset bad')),
570 ('b', 'bad', False, _('mark changeset bad')),
571 ('s', 'skip', False, _('skip testing changeset')),
571 ('s', 'skip', False, _('skip testing changeset')),
572 ('e', 'extend', False, _('extend the bisect range')),
572 ('e', 'extend', False, _('extend the bisect range')),
573 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
573 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
574 ('U', 'noupdate', False, _('do not update to target'))],
574 ('U', 'noupdate', False, _('do not update to target'))],
575 _("[-gbsr] [-U] [-c CMD] [REV]"))
575 _("[-gbsr] [-U] [-c CMD] [REV]"))
576 def bisect(ui, repo, rev=None, extra=None, command=None,
576 def bisect(ui, repo, rev=None, extra=None, command=None,
577 reset=None, good=None, bad=None, skip=None, extend=None,
577 reset=None, good=None, bad=None, skip=None, extend=None,
578 noupdate=None):
578 noupdate=None):
579 """subdivision search of changesets
579 """subdivision search of changesets
580
580
581 This command helps to find changesets which introduce problems. To
581 This command helps to find changesets which introduce problems. To
582 use, mark the earliest changeset you know exhibits the problem as
582 use, mark the earliest changeset you know exhibits the problem as
583 bad, then mark the latest changeset which is free from the problem
583 bad, then mark the latest changeset which is free from the problem
584 as good. Bisect will update your working directory to a revision
584 as good. Bisect will update your working directory to a revision
585 for testing (unless the -U/--noupdate option is specified). Once
585 for testing (unless the -U/--noupdate option is specified). Once
586 you have performed tests, mark the working directory as good or
586 you have performed tests, mark the working directory as good or
587 bad, and bisect will either update to another candidate changeset
587 bad, and bisect will either update to another candidate changeset
588 or announce that it has found the bad revision.
588 or announce that it has found the bad revision.
589
589
590 As a shortcut, you can also use the revision argument to mark a
590 As a shortcut, you can also use the revision argument to mark a
591 revision as good or bad without checking it out first.
591 revision as good or bad without checking it out first.
592
592
593 If you supply a command, it will be used for automatic bisection.
593 If you supply a command, it will be used for automatic bisection.
594 The environment variable HG_NODE will contain the ID of the
594 The environment variable HG_NODE will contain the ID of the
595 changeset being tested. The exit status of the command will be
595 changeset being tested. The exit status of the command will be
596 used to mark revisions as good or bad: status 0 means good, 125
596 used to mark revisions as good or bad: status 0 means good, 125
597 means to skip the revision, 127 (command not found) will abort the
597 means to skip the revision, 127 (command not found) will abort the
598 bisection, and any other non-zero exit status means the revision
598 bisection, and any other non-zero exit status means the revision
599 is bad.
599 is bad.
600
600
601 .. container:: verbose
601 .. container:: verbose
602
602
603 Some examples:
603 Some examples:
604
604
605 - start a bisection with known bad revision 34, and good revision 12::
605 - start a bisection with known bad revision 34, and good revision 12::
606
606
607 hg bisect --bad 34
607 hg bisect --bad 34
608 hg bisect --good 12
608 hg bisect --good 12
609
609
610 - advance the current bisection by marking current revision as good or
610 - advance the current bisection by marking current revision as good or
611 bad::
611 bad::
612
612
613 hg bisect --good
613 hg bisect --good
614 hg bisect --bad
614 hg bisect --bad
615
615
616 - mark the current revision, or a known revision, to be skipped (e.g. if
616 - mark the current revision, or a known revision, to be skipped (e.g. if
617 that revision is not usable because of another issue)::
617 that revision is not usable because of another issue)::
618
618
619 hg bisect --skip
619 hg bisect --skip
620 hg bisect --skip 23
620 hg bisect --skip 23
621
621
622 - skip all revisions that do not touch directories ``foo`` or ``bar``::
622 - skip all revisions that do not touch directories ``foo`` or ``bar``::
623
623
624 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
624 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
625
625
626 - forget the current bisection::
626 - forget the current bisection::
627
627
628 hg bisect --reset
628 hg bisect --reset
629
629
630 - use 'make && make tests' to automatically find the first broken
630 - use 'make && make tests' to automatically find the first broken
631 revision::
631 revision::
632
632
633 hg bisect --reset
633 hg bisect --reset
634 hg bisect --bad 34
634 hg bisect --bad 34
635 hg bisect --good 12
635 hg bisect --good 12
636 hg bisect --command "make && make tests"
636 hg bisect --command "make && make tests"
637
637
638 - see all changesets whose states are already known in the current
638 - see all changesets whose states are already known in the current
639 bisection::
639 bisection::
640
640
641 hg log -r "bisect(pruned)"
641 hg log -r "bisect(pruned)"
642
642
643 - see the changeset currently being bisected (especially useful
643 - see the changeset currently being bisected (especially useful
644 if running with -U/--noupdate)::
644 if running with -U/--noupdate)::
645
645
646 hg log -r "bisect(current)"
646 hg log -r "bisect(current)"
647
647
648 - see all changesets that took part in the current bisection::
648 - see all changesets that took part in the current bisection::
649
649
650 hg log -r "bisect(range)"
650 hg log -r "bisect(range)"
651
651
652 - you can even get a nice graph::
652 - you can even get a nice graph::
653
653
654 hg log --graph -r "bisect(range)"
654 hg log --graph -r "bisect(range)"
655
655
656 See :hg:`help revsets` for more about the `bisect()` keyword.
656 See :hg:`help revsets` for more about the `bisect()` keyword.
657
657
658 Returns 0 on success.
658 Returns 0 on success.
659 """
659 """
660 def extendbisectrange(nodes, good):
660 def extendbisectrange(nodes, good):
661 # bisect is incomplete when it ends on a merge node and
661 # bisect is incomplete when it ends on a merge node and
662 # one of the parent was not checked.
662 # one of the parent was not checked.
663 parents = repo[nodes[0]].parents()
663 parents = repo[nodes[0]].parents()
664 if len(parents) > 1:
664 if len(parents) > 1:
665 side = good and state['bad'] or state['good']
665 side = good and state['bad'] or state['good']
666 num = len(set(i.node() for i in parents) & set(side))
666 num = len(set(i.node() for i in parents) & set(side))
667 if num == 1:
667 if num == 1:
668 return parents[0].ancestor(parents[1])
668 return parents[0].ancestor(parents[1])
669 return None
669 return None
670
670
671 def print_result(nodes, good):
671 def print_result(nodes, good):
672 displayer = cmdutil.show_changeset(ui, repo, {})
672 displayer = cmdutil.show_changeset(ui, repo, {})
673 if len(nodes) == 1:
673 if len(nodes) == 1:
674 # narrowed it down to a single revision
674 # narrowed it down to a single revision
675 if good:
675 if good:
676 ui.write(_("The first good revision is:\n"))
676 ui.write(_("The first good revision is:\n"))
677 else:
677 else:
678 ui.write(_("The first bad revision is:\n"))
678 ui.write(_("The first bad revision is:\n"))
679 displayer.show(repo[nodes[0]])
679 displayer.show(repo[nodes[0]])
680 extendnode = extendbisectrange(nodes, good)
680 extendnode = extendbisectrange(nodes, good)
681 if extendnode is not None:
681 if extendnode is not None:
682 ui.write(_('Not all ancestors of this changeset have been'
682 ui.write(_('Not all ancestors of this changeset have been'
683 ' checked.\nUse bisect --extend to continue the '
683 ' checked.\nUse bisect --extend to continue the '
684 'bisection from\nthe common ancestor, %s.\n')
684 'bisection from\nthe common ancestor, %s.\n')
685 % extendnode)
685 % extendnode)
686 else:
686 else:
687 # multiple possible revisions
687 # multiple possible revisions
688 if good:
688 if good:
689 ui.write(_("Due to skipped revisions, the first "
689 ui.write(_("Due to skipped revisions, the first "
690 "good revision could be any of:\n"))
690 "good revision could be any of:\n"))
691 else:
691 else:
692 ui.write(_("Due to skipped revisions, the first "
692 ui.write(_("Due to skipped revisions, the first "
693 "bad revision could be any of:\n"))
693 "bad revision could be any of:\n"))
694 for n in nodes:
694 for n in nodes:
695 displayer.show(repo[n])
695 displayer.show(repo[n])
696 displayer.close()
696 displayer.close()
697
697
698 def check_state(state, interactive=True):
698 def check_state(state, interactive=True):
699 if not state['good'] or not state['bad']:
699 if not state['good'] or not state['bad']:
700 if (good or bad or skip or reset) and interactive:
700 if (good or bad or skip or reset) and interactive:
701 return
701 return
702 if not state['good']:
702 if not state['good']:
703 raise util.Abort(_('cannot bisect (no known good revisions)'))
703 raise util.Abort(_('cannot bisect (no known good revisions)'))
704 else:
704 else:
705 raise util.Abort(_('cannot bisect (no known bad revisions)'))
705 raise util.Abort(_('cannot bisect (no known bad revisions)'))
706 return True
706 return True
707
707
708 # backward compatibility
708 # backward compatibility
709 if rev in "good bad reset init".split():
709 if rev in "good bad reset init".split():
710 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
710 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
711 cmd, rev, extra = rev, extra, None
711 cmd, rev, extra = rev, extra, None
712 if cmd == "good":
712 if cmd == "good":
713 good = True
713 good = True
714 elif cmd == "bad":
714 elif cmd == "bad":
715 bad = True
715 bad = True
716 else:
716 else:
717 reset = True
717 reset = True
718 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
718 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
719 raise util.Abort(_('incompatible arguments'))
719 raise util.Abort(_('incompatible arguments'))
720
720
721 cmdutil.checkunfinished(repo)
721 cmdutil.checkunfinished(repo)
722
722
723 if reset:
723 if reset:
724 p = repo.join("bisect.state")
724 p = repo.join("bisect.state")
725 if os.path.exists(p):
725 if os.path.exists(p):
726 os.unlink(p)
726 os.unlink(p)
727 return
727 return
728
728
729 state = hbisect.load_state(repo)
729 state = hbisect.load_state(repo)
730
730
731 if command:
731 if command:
732 changesets = 1
732 changesets = 1
733 if noupdate:
733 if noupdate:
734 try:
734 try:
735 node = state['current'][0]
735 node = state['current'][0]
736 except LookupError:
736 except LookupError:
737 raise util.Abort(_('current bisect revision is unknown - '
737 raise util.Abort(_('current bisect revision is unknown - '
738 'start a new bisect to fix'))
738 'start a new bisect to fix'))
739 else:
739 else:
740 node, p2 = repo.dirstate.parents()
740 node, p2 = repo.dirstate.parents()
741 if p2 != nullid:
741 if p2 != nullid:
742 raise util.Abort(_('current bisect revision is a merge'))
742 raise util.Abort(_('current bisect revision is a merge'))
743 try:
743 try:
744 while changesets:
744 while changesets:
745 # update state
745 # update state
746 state['current'] = [node]
746 state['current'] = [node]
747 hbisect.save_state(repo, state)
747 hbisect.save_state(repo, state)
748 status = util.system(command,
748 status = util.system(command,
749 environ={'HG_NODE': hex(node)},
749 environ={'HG_NODE': hex(node)},
750 out=ui.fout)
750 out=ui.fout)
751 if status == 125:
751 if status == 125:
752 transition = "skip"
752 transition = "skip"
753 elif status == 0:
753 elif status == 0:
754 transition = "good"
754 transition = "good"
755 # status < 0 means process was killed
755 # status < 0 means process was killed
756 elif status == 127:
756 elif status == 127:
757 raise util.Abort(_("failed to execute %s") % command)
757 raise util.Abort(_("failed to execute %s") % command)
758 elif status < 0:
758 elif status < 0:
759 raise util.Abort(_("%s killed") % command)
759 raise util.Abort(_("%s killed") % command)
760 else:
760 else:
761 transition = "bad"
761 transition = "bad"
762 ctx = scmutil.revsingle(repo, rev, node)
762 ctx = scmutil.revsingle(repo, rev, node)
763 rev = None # clear for future iterations
763 rev = None # clear for future iterations
764 state[transition].append(ctx.node())
764 state[transition].append(ctx.node())
765 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
765 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
766 check_state(state, interactive=False)
766 check_state(state, interactive=False)
767 # bisect
767 # bisect
768 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
768 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
769 # update to next check
769 # update to next check
770 node = nodes[0]
770 node = nodes[0]
771 if not noupdate:
771 if not noupdate:
772 cmdutil.bailifchanged(repo)
772 cmdutil.bailifchanged(repo)
773 hg.clean(repo, node, show_stats=False)
773 hg.clean(repo, node, show_stats=False)
774 finally:
774 finally:
775 state['current'] = [node]
775 state['current'] = [node]
776 hbisect.save_state(repo, state)
776 hbisect.save_state(repo, state)
777 print_result(nodes, bgood)
777 print_result(nodes, bgood)
778 return
778 return
779
779
780 # update state
780 # update state
781
781
782 if rev:
782 if rev:
783 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
783 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
784 else:
784 else:
785 nodes = [repo.lookup('.')]
785 nodes = [repo.lookup('.')]
786
786
787 if good or bad or skip:
787 if good or bad or skip:
788 if good:
788 if good:
789 state['good'] += nodes
789 state['good'] += nodes
790 elif bad:
790 elif bad:
791 state['bad'] += nodes
791 state['bad'] += nodes
792 elif skip:
792 elif skip:
793 state['skip'] += nodes
793 state['skip'] += nodes
794 hbisect.save_state(repo, state)
794 hbisect.save_state(repo, state)
795
795
796 if not check_state(state):
796 if not check_state(state):
797 return
797 return
798
798
799 # actually bisect
799 # actually bisect
800 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
800 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
801 if extend:
801 if extend:
802 if not changesets:
802 if not changesets:
803 extendnode = extendbisectrange(nodes, good)
803 extendnode = extendbisectrange(nodes, good)
804 if extendnode is not None:
804 if extendnode is not None:
805 ui.write(_("Extending search to changeset %d:%s\n")
805 ui.write(_("Extending search to changeset %d:%s\n")
806 % (extendnode.rev(), extendnode))
806 % (extendnode.rev(), extendnode))
807 state['current'] = [extendnode.node()]
807 state['current'] = [extendnode.node()]
808 hbisect.save_state(repo, state)
808 hbisect.save_state(repo, state)
809 if noupdate:
809 if noupdate:
810 return
810 return
811 cmdutil.bailifchanged(repo)
811 cmdutil.bailifchanged(repo)
812 return hg.clean(repo, extendnode.node())
812 return hg.clean(repo, extendnode.node())
813 raise util.Abort(_("nothing to extend"))
813 raise util.Abort(_("nothing to extend"))
814
814
815 if changesets == 0:
815 if changesets == 0:
816 print_result(nodes, good)
816 print_result(nodes, good)
817 else:
817 else:
818 assert len(nodes) == 1 # only a single node can be tested next
818 assert len(nodes) == 1 # only a single node can be tested next
819 node = nodes[0]
819 node = nodes[0]
820 # compute the approximate number of remaining tests
820 # compute the approximate number of remaining tests
821 tests, size = 0, 2
821 tests, size = 0, 2
822 while size <= changesets:
822 while size <= changesets:
823 tests, size = tests + 1, size * 2
823 tests, size = tests + 1, size * 2
824 rev = repo.changelog.rev(node)
824 rev = repo.changelog.rev(node)
825 ui.write(_("Testing changeset %d:%s "
825 ui.write(_("Testing changeset %d:%s "
826 "(%d changesets remaining, ~%d tests)\n")
826 "(%d changesets remaining, ~%d tests)\n")
827 % (rev, short(node), changesets, tests))
827 % (rev, short(node), changesets, tests))
828 state['current'] = [node]
828 state['current'] = [node]
829 hbisect.save_state(repo, state)
829 hbisect.save_state(repo, state)
830 if not noupdate:
830 if not noupdate:
831 cmdutil.bailifchanged(repo)
831 cmdutil.bailifchanged(repo)
832 return hg.clean(repo, node)
832 return hg.clean(repo, node)
833
833
834 @command('bookmarks|bookmark',
834 @command('bookmarks|bookmark',
835 [('f', 'force', False, _('force')),
835 [('f', 'force', False, _('force')),
836 ('r', 'rev', '', _('revision'), _('REV')),
836 ('r', 'rev', '', _('revision'), _('REV')),
837 ('d', 'delete', False, _('delete a given bookmark')),
837 ('d', 'delete', False, _('delete a given bookmark')),
838 ('m', 'rename', '', _('rename a given bookmark'), _('NAME')),
838 ('m', 'rename', '', _('rename a given bookmark'), _('NAME')),
839 ('i', 'inactive', False, _('mark a bookmark inactive'))],
839 ('i', 'inactive', False, _('mark a bookmark inactive'))],
840 _('hg bookmarks [OPTIONS]... [NAME]...'))
840 _('hg bookmarks [OPTIONS]... [NAME]...'))
841 def bookmark(ui, repo, *names, **opts):
841 def bookmark(ui, repo, *names, **opts):
842 '''create a new bookmark or list existing bookmarks
842 '''create a new bookmark or list existing bookmarks
843
843
844 Bookmarks are labels on changesets to help track lines of development.
844 Bookmarks are labels on changesets to help track lines of development.
845 Bookmarks are unversioned and can be moved, renamed and deleted.
845 Bookmarks are unversioned and can be moved, renamed and deleted.
846 Deleting or moving a bookmark has no effect on the associated changesets.
846 Deleting or moving a bookmark has no effect on the associated changesets.
847
847
848 Creating or updating to a bookmark causes it to be marked as 'active'.
848 Creating or updating to a bookmark causes it to be marked as 'active'.
849 The active bookmark is indicated with a '*'.
849 The active bookmark is indicated with a '*'.
850 When a commit is made, the active bookmark will advance to the new commit.
850 When a commit is made, the active bookmark will advance to the new commit.
851 A plain :hg:`update` will also advance an active bookmark, if possible.
851 A plain :hg:`update` will also advance an active bookmark, if possible.
852 Updating away from a bookmark will cause it to be deactivated.
852 Updating away from a bookmark will cause it to be deactivated.
853
853
854 Bookmarks can be pushed and pulled between repositories (see
854 Bookmarks can be pushed and pulled between repositories (see
855 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
855 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
856 diverged, a new 'divergent bookmark' of the form 'name@path' will
856 diverged, a new 'divergent bookmark' of the form 'name@path' will
857 be created. Using :hg:'merge' will resolve the divergence.
857 be created. Using :hg:'merge' will resolve the divergence.
858
858
859 A bookmark named '@' has the special property that :hg:`clone` will
859 A bookmark named '@' has the special property that :hg:`clone` will
860 check it out by default if it exists.
860 check it out by default if it exists.
861
861
862 .. container:: verbose
862 .. container:: verbose
863
863
864 Examples:
864 Examples:
865
865
866 - create an active bookmark for a new line of development::
866 - create an active bookmark for a new line of development::
867
867
868 hg book new-feature
868 hg book new-feature
869
869
870 - create an inactive bookmark as a place marker::
870 - create an inactive bookmark as a place marker::
871
871
872 hg book -i reviewed
872 hg book -i reviewed
873
873
874 - create an inactive bookmark on another changeset::
874 - create an inactive bookmark on another changeset::
875
875
876 hg book -r .^ tested
876 hg book -r .^ tested
877
877
878 - move the '@' bookmark from another branch::
878 - move the '@' bookmark from another branch::
879
879
880 hg book -f @
880 hg book -f @
881 '''
881 '''
882 force = opts.get('force')
882 force = opts.get('force')
883 rev = opts.get('rev')
883 rev = opts.get('rev')
884 delete = opts.get('delete')
884 delete = opts.get('delete')
885 rename = opts.get('rename')
885 rename = opts.get('rename')
886 inactive = opts.get('inactive')
886 inactive = opts.get('inactive')
887
887
888 def checkformat(mark):
888 def checkformat(mark):
889 mark = mark.strip()
889 mark = mark.strip()
890 if not mark:
890 if not mark:
891 raise util.Abort(_("bookmark names cannot consist entirely of "
891 raise util.Abort(_("bookmark names cannot consist entirely of "
892 "whitespace"))
892 "whitespace"))
893 scmutil.checknewlabel(repo, mark, 'bookmark')
893 scmutil.checknewlabel(repo, mark, 'bookmark')
894 return mark
894 return mark
895
895
896 def checkconflict(repo, mark, cur, force=False, target=None):
896 def checkconflict(repo, mark, cur, force=False, target=None):
897 if mark in marks and not force:
897 if mark in marks and not force:
898 if target:
898 if target:
899 if marks[mark] == target and target == cur:
899 if marks[mark] == target and target == cur:
900 # re-activating a bookmark
900 # re-activating a bookmark
901 return
901 return
902 anc = repo.changelog.ancestors([repo[target].rev()])
902 anc = repo.changelog.ancestors([repo[target].rev()])
903 bmctx = repo[marks[mark]]
903 bmctx = repo[marks[mark]]
904 divs = [repo[b].node() for b in marks
904 divs = [repo[b].node() for b in marks
905 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
905 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
906
906
907 # allow resolving a single divergent bookmark even if moving
907 # allow resolving a single divergent bookmark even if moving
908 # the bookmark across branches when a revision is specified
908 # the bookmark across branches when a revision is specified
909 # that contains a divergent bookmark
909 # that contains a divergent bookmark
910 if bmctx.rev() not in anc and target in divs:
910 if bmctx.rev() not in anc and target in divs:
911 bookmarks.deletedivergent(repo, [target], mark)
911 bookmarks.deletedivergent(repo, [target], mark)
912 return
912 return
913
913
914 deletefrom = [b for b in divs
914 deletefrom = [b for b in divs
915 if repo[b].rev() in anc or b == target]
915 if repo[b].rev() in anc or b == target]
916 bookmarks.deletedivergent(repo, deletefrom, mark)
916 bookmarks.deletedivergent(repo, deletefrom, mark)
917 if bookmarks.validdest(repo, bmctx, repo[target]):
917 if bookmarks.validdest(repo, bmctx, repo[target]):
918 ui.status(_("moving bookmark '%s' forward from %s\n") %
918 ui.status(_("moving bookmark '%s' forward from %s\n") %
919 (mark, short(bmctx.node())))
919 (mark, short(bmctx.node())))
920 return
920 return
921 raise util.Abort(_("bookmark '%s' already exists "
921 raise util.Abort(_("bookmark '%s' already exists "
922 "(use -f to force)") % mark)
922 "(use -f to force)") % mark)
923 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
923 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
924 and not force):
924 and not force):
925 raise util.Abort(
925 raise util.Abort(
926 _("a bookmark cannot have the name of an existing branch"))
926 _("a bookmark cannot have the name of an existing branch"))
927
927
928 if delete and rename:
928 if delete and rename:
929 raise util.Abort(_("--delete and --rename are incompatible"))
929 raise util.Abort(_("--delete and --rename are incompatible"))
930 if delete and rev:
930 if delete and rev:
931 raise util.Abort(_("--rev is incompatible with --delete"))
931 raise util.Abort(_("--rev is incompatible with --delete"))
932 if rename and rev:
932 if rename and rev:
933 raise util.Abort(_("--rev is incompatible with --rename"))
933 raise util.Abort(_("--rev is incompatible with --rename"))
934 if not names and (delete or rev):
934 if not names and (delete or rev):
935 raise util.Abort(_("bookmark name required"))
935 raise util.Abort(_("bookmark name required"))
936
936
937 if delete or rename or names or inactive:
937 if delete or rename or names or inactive:
938 wlock = repo.wlock()
938 wlock = repo.wlock()
939 try:
939 try:
940 cur = repo.changectx('.').node()
940 cur = repo.changectx('.').node()
941 marks = repo._bookmarks
941 marks = repo._bookmarks
942 if delete:
942 if delete:
943 for mark in names:
943 for mark in names:
944 if mark not in marks:
944 if mark not in marks:
945 raise util.Abort(_("bookmark '%s' does not exist") %
945 raise util.Abort(_("bookmark '%s' does not exist") %
946 mark)
946 mark)
947 if mark == repo._bookmarkcurrent:
947 if mark == repo._bookmarkcurrent:
948 bookmarks.unsetcurrent(repo)
948 bookmarks.unsetcurrent(repo)
949 del marks[mark]
949 del marks[mark]
950 marks.write()
950 marks.write()
951
951
952 elif rename:
952 elif rename:
953 if not names:
953 if not names:
954 raise util.Abort(_("new bookmark name required"))
954 raise util.Abort(_("new bookmark name required"))
955 elif len(names) > 1:
955 elif len(names) > 1:
956 raise util.Abort(_("only one new bookmark name allowed"))
956 raise util.Abort(_("only one new bookmark name allowed"))
957 mark = checkformat(names[0])
957 mark = checkformat(names[0])
958 if rename not in marks:
958 if rename not in marks:
959 raise util.Abort(_("bookmark '%s' does not exist") % rename)
959 raise util.Abort(_("bookmark '%s' does not exist") % rename)
960 checkconflict(repo, mark, cur, force)
960 checkconflict(repo, mark, cur, force)
961 marks[mark] = marks[rename]
961 marks[mark] = marks[rename]
962 if repo._bookmarkcurrent == rename and not inactive:
962 if repo._bookmarkcurrent == rename and not inactive:
963 bookmarks.setcurrent(repo, mark)
963 bookmarks.setcurrent(repo, mark)
964 del marks[rename]
964 del marks[rename]
965 marks.write()
965 marks.write()
966
966
967 elif names:
967 elif names:
968 newact = None
968 newact = None
969 for mark in names:
969 for mark in names:
970 mark = checkformat(mark)
970 mark = checkformat(mark)
971 if newact is None:
971 if newact is None:
972 newact = mark
972 newact = mark
973 if inactive and mark == repo._bookmarkcurrent:
973 if inactive and mark == repo._bookmarkcurrent:
974 bookmarks.unsetcurrent(repo)
974 bookmarks.unsetcurrent(repo)
975 return
975 return
976 tgt = cur
976 tgt = cur
977 if rev:
977 if rev:
978 tgt = scmutil.revsingle(repo, rev).node()
978 tgt = scmutil.revsingle(repo, rev).node()
979 checkconflict(repo, mark, cur, force, tgt)
979 checkconflict(repo, mark, cur, force, tgt)
980 marks[mark] = tgt
980 marks[mark] = tgt
981 if not inactive and cur == marks[newact] and not rev:
981 if not inactive and cur == marks[newact] and not rev:
982 bookmarks.setcurrent(repo, newact)
982 bookmarks.setcurrent(repo, newact)
983 elif cur != tgt and newact == repo._bookmarkcurrent:
983 elif cur != tgt and newact == repo._bookmarkcurrent:
984 bookmarks.unsetcurrent(repo)
984 bookmarks.unsetcurrent(repo)
985 marks.write()
985 marks.write()
986
986
987 elif inactive:
987 elif inactive:
988 if len(marks) == 0:
988 if len(marks) == 0:
989 ui.status(_("no bookmarks set\n"))
989 ui.status(_("no bookmarks set\n"))
990 elif not repo._bookmarkcurrent:
990 elif not repo._bookmarkcurrent:
991 ui.status(_("no active bookmark\n"))
991 ui.status(_("no active bookmark\n"))
992 else:
992 else:
993 bookmarks.unsetcurrent(repo)
993 bookmarks.unsetcurrent(repo)
994 finally:
994 finally:
995 wlock.release()
995 wlock.release()
996 else: # show bookmarks
996 else: # show bookmarks
997 hexfn = ui.debugflag and hex or short
997 hexfn = ui.debugflag and hex or short
998 marks = repo._bookmarks
998 marks = repo._bookmarks
999 if len(marks) == 0:
999 if len(marks) == 0:
1000 ui.status(_("no bookmarks set\n"))
1000 ui.status(_("no bookmarks set\n"))
1001 else:
1001 else:
1002 for bmark, n in sorted(marks.iteritems()):
1002 for bmark, n in sorted(marks.iteritems()):
1003 current = repo._bookmarkcurrent
1003 current = repo._bookmarkcurrent
1004 if bmark == current:
1004 if bmark == current:
1005 prefix, label = '*', 'bookmarks.current'
1005 prefix, label = '*', 'bookmarks.current'
1006 else:
1006 else:
1007 prefix, label = ' ', ''
1007 prefix, label = ' ', ''
1008
1008
1009 if ui.quiet:
1009 if ui.quiet:
1010 ui.write("%s\n" % bmark, label=label)
1010 ui.write("%s\n" % bmark, label=label)
1011 else:
1011 else:
1012 pad = " " * (25 - encoding.colwidth(bmark))
1012 pad = " " * (25 - encoding.colwidth(bmark))
1013 ui.write(" %s %s%s %d:%s\n" % (
1013 ui.write(" %s %s%s %d:%s\n" % (
1014 prefix, bmark, pad, repo.changelog.rev(n), hexfn(n)),
1014 prefix, bmark, pad, repo.changelog.rev(n), hexfn(n)),
1015 label=label)
1015 label=label)
1016
1016
1017 @command('branch',
1017 @command('branch',
1018 [('f', 'force', None,
1018 [('f', 'force', None,
1019 _('set branch name even if it shadows an existing branch')),
1019 _('set branch name even if it shadows an existing branch')),
1020 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1020 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1021 _('[-fC] [NAME]'))
1021 _('[-fC] [NAME]'))
1022 def branch(ui, repo, label=None, **opts):
1022 def branch(ui, repo, label=None, **opts):
1023 """set or show the current branch name
1023 """set or show the current branch name
1024
1024
1025 .. note::
1025 .. note::
1026
1026
1027 Branch names are permanent and global. Use :hg:`bookmark` to create a
1027 Branch names are permanent and global. Use :hg:`bookmark` to create a
1028 light-weight bookmark instead. See :hg:`help glossary` for more
1028 light-weight bookmark instead. See :hg:`help glossary` for more
1029 information about named branches and bookmarks.
1029 information about named branches and bookmarks.
1030
1030
1031 With no argument, show the current branch name. With one argument,
1031 With no argument, show the current branch name. With one argument,
1032 set the working directory branch name (the branch will not exist
1032 set the working directory branch name (the branch will not exist
1033 in the repository until the next commit). Standard practice
1033 in the repository until the next commit). Standard practice
1034 recommends that primary development take place on the 'default'
1034 recommends that primary development take place on the 'default'
1035 branch.
1035 branch.
1036
1036
1037 Unless -f/--force is specified, branch will not let you set a
1037 Unless -f/--force is specified, branch will not let you set a
1038 branch name that already exists, even if it's inactive.
1038 branch name that already exists, even if it's inactive.
1039
1039
1040 Use -C/--clean to reset the working directory branch to that of
1040 Use -C/--clean to reset the working directory branch to that of
1041 the parent of the working directory, negating a previous branch
1041 the parent of the working directory, negating a previous branch
1042 change.
1042 change.
1043
1043
1044 Use the command :hg:`update` to switch to an existing branch. Use
1044 Use the command :hg:`update` to switch to an existing branch. Use
1045 :hg:`commit --close-branch` to mark this branch as closed.
1045 :hg:`commit --close-branch` to mark this branch as closed.
1046
1046
1047 Returns 0 on success.
1047 Returns 0 on success.
1048 """
1048 """
1049 if label:
1049 if label:
1050 label = label.strip()
1050 label = label.strip()
1051
1051
1052 if not opts.get('clean') and not label:
1052 if not opts.get('clean') and not label:
1053 ui.write("%s\n" % repo.dirstate.branch())
1053 ui.write("%s\n" % repo.dirstate.branch())
1054 return
1054 return
1055
1055
1056 wlock = repo.wlock()
1056 wlock = repo.wlock()
1057 try:
1057 try:
1058 if opts.get('clean'):
1058 if opts.get('clean'):
1059 label = repo[None].p1().branch()
1059 label = repo[None].p1().branch()
1060 repo.dirstate.setbranch(label)
1060 repo.dirstate.setbranch(label)
1061 ui.status(_('reset working directory to branch %s\n') % label)
1061 ui.status(_('reset working directory to branch %s\n') % label)
1062 elif label:
1062 elif label:
1063 if not opts.get('force') and label in repo.branchmap():
1063 if not opts.get('force') and label in repo.branchmap():
1064 if label not in [p.branch() for p in repo.parents()]:
1064 if label not in [p.branch() for p in repo.parents()]:
1065 raise util.Abort(_('a branch of the same name already'
1065 raise util.Abort(_('a branch of the same name already'
1066 ' exists'),
1066 ' exists'),
1067 # i18n: "it" refers to an existing branch
1067 # i18n: "it" refers to an existing branch
1068 hint=_("use 'hg update' to switch to it"))
1068 hint=_("use 'hg update' to switch to it"))
1069 scmutil.checknewlabel(repo, label, 'branch')
1069 scmutil.checknewlabel(repo, label, 'branch')
1070 repo.dirstate.setbranch(label)
1070 repo.dirstate.setbranch(label)
1071 ui.status(_('marked working directory as branch %s\n') % label)
1071 ui.status(_('marked working directory as branch %s\n') % label)
1072 ui.status(_('(branches are permanent and global, '
1072 ui.status(_('(branches are permanent and global, '
1073 'did you want a bookmark?)\n'))
1073 'did you want a bookmark?)\n'))
1074 finally:
1074 finally:
1075 wlock.release()
1075 wlock.release()
1076
1076
1077 @command('branches',
1077 @command('branches',
1078 [('a', 'active', False, _('show only branches that have unmerged heads')),
1078 [('a', 'active', False, _('show only branches that have unmerged heads')),
1079 ('c', 'closed', False, _('show normal and closed branches'))],
1079 ('c', 'closed', False, _('show normal and closed branches'))],
1080 _('[-ac]'))
1080 _('[-ac]'))
1081 def branches(ui, repo, active=False, closed=False):
1081 def branches(ui, repo, active=False, closed=False):
1082 """list repository named branches
1082 """list repository named branches
1083
1083
1084 List the repository's named branches, indicating which ones are
1084 List the repository's named branches, indicating which ones are
1085 inactive. If -c/--closed is specified, also list branches which have
1085 inactive. If -c/--closed is specified, also list branches which have
1086 been marked closed (see :hg:`commit --close-branch`).
1086 been marked closed (see :hg:`commit --close-branch`).
1087
1087
1088 If -a/--active is specified, only show active branches. A branch
1088 If -a/--active is specified, only show active branches. A branch
1089 is considered active if it contains repository heads.
1089 is considered active if it contains repository heads.
1090
1090
1091 Use the command :hg:`update` to switch to an existing branch.
1091 Use the command :hg:`update` to switch to an existing branch.
1092
1092
1093 Returns 0.
1093 Returns 0.
1094 """
1094 """
1095
1095
1096 hexfunc = ui.debugflag and hex or short
1096 hexfunc = ui.debugflag and hex or short
1097
1097
1098 allheads = set(repo.heads())
1098 allheads = set(repo.heads())
1099 branches = []
1099 branches = []
1100 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1100 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1101 isactive = not isclosed and bool(set(heads) & allheads)
1101 isactive = not isclosed and bool(set(heads) & allheads)
1102 branches.append((tag, repo[tip], isactive, not isclosed))
1102 branches.append((tag, repo[tip], isactive, not isclosed))
1103 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1103 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1104 reverse=True)
1104 reverse=True)
1105
1105
1106 for tag, ctx, isactive, isopen in branches:
1106 for tag, ctx, isactive, isopen in branches:
1107 if active and not isactive:
1107 if active and not isactive:
1108 continue
1108 continue
1109 if isactive:
1109 if isactive:
1110 label = 'branches.active'
1110 label = 'branches.active'
1111 notice = ''
1111 notice = ''
1112 elif not isopen:
1112 elif not isopen:
1113 if not closed:
1113 if not closed:
1114 continue
1114 continue
1115 label = 'branches.closed'
1115 label = 'branches.closed'
1116 notice = _(' (closed)')
1116 notice = _(' (closed)')
1117 else:
1117 else:
1118 label = 'branches.inactive'
1118 label = 'branches.inactive'
1119 notice = _(' (inactive)')
1119 notice = _(' (inactive)')
1120 if tag == repo.dirstate.branch():
1120 if tag == repo.dirstate.branch():
1121 label = 'branches.current'
1121 label = 'branches.current'
1122 rev = str(ctx.rev()).rjust(31 - encoding.colwidth(tag))
1122 rev = str(ctx.rev()).rjust(31 - encoding.colwidth(tag))
1123 rev = ui.label('%s:%s' % (rev, hexfunc(ctx.node())),
1123 rev = ui.label('%s:%s' % (rev, hexfunc(ctx.node())),
1124 'log.changeset changeset.%s' % ctx.phasestr())
1124 'log.changeset changeset.%s' % ctx.phasestr())
1125 labeledtag = ui.label(tag, label)
1125 labeledtag = ui.label(tag, label)
1126 if ui.quiet:
1126 if ui.quiet:
1127 ui.write("%s\n" % labeledtag)
1127 ui.write("%s\n" % labeledtag)
1128 else:
1128 else:
1129 ui.write("%s %s%s\n" % (labeledtag, rev, notice))
1129 ui.write("%s %s%s\n" % (labeledtag, rev, notice))
1130
1130
1131 @command('bundle',
1131 @command('bundle',
1132 [('f', 'force', None, _('run even when the destination is unrelated')),
1132 [('f', 'force', None, _('run even when the destination is unrelated')),
1133 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1133 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1134 _('REV')),
1134 _('REV')),
1135 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1135 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1136 _('BRANCH')),
1136 _('BRANCH')),
1137 ('', 'base', [],
1137 ('', 'base', [],
1138 _('a base changeset assumed to be available at the destination'),
1138 _('a base changeset assumed to be available at the destination'),
1139 _('REV')),
1139 _('REV')),
1140 ('a', 'all', None, _('bundle all changesets in the repository')),
1140 ('a', 'all', None, _('bundle all changesets in the repository')),
1141 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1141 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1142 ] + remoteopts,
1142 ] + remoteopts,
1143 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1143 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1144 def bundle(ui, repo, fname, dest=None, **opts):
1144 def bundle(ui, repo, fname, dest=None, **opts):
1145 """create a changegroup file
1145 """create a changegroup file
1146
1146
1147 Generate a compressed changegroup file collecting changesets not
1147 Generate a compressed changegroup file collecting changesets not
1148 known to be in another repository.
1148 known to be in another repository.
1149
1149
1150 If you omit the destination repository, then hg assumes the
1150 If you omit the destination repository, then hg assumes the
1151 destination will have all the nodes you specify with --base
1151 destination will have all the nodes you specify with --base
1152 parameters. To create a bundle containing all changesets, use
1152 parameters. To create a bundle containing all changesets, use
1153 -a/--all (or --base null).
1153 -a/--all (or --base null).
1154
1154
1155 You can change compression method with the -t/--type option.
1155 You can change compression method with the -t/--type option.
1156 The available compression methods are: none, bzip2, and
1156 The available compression methods are: none, bzip2, and
1157 gzip (by default, bundles are compressed using bzip2).
1157 gzip (by default, bundles are compressed using bzip2).
1158
1158
1159 The bundle file can then be transferred using conventional means
1159 The bundle file can then be transferred using conventional means
1160 and applied to another repository with the unbundle or pull
1160 and applied to another repository with the unbundle or pull
1161 command. This is useful when direct push and pull are not
1161 command. This is useful when direct push and pull are not
1162 available or when exporting an entire repository is undesirable.
1162 available or when exporting an entire repository is undesirable.
1163
1163
1164 Applying bundles preserves all changeset contents including
1164 Applying bundles preserves all changeset contents including
1165 permissions, copy/rename information, and revision history.
1165 permissions, copy/rename information, and revision history.
1166
1166
1167 Returns 0 on success, 1 if no changes found.
1167 Returns 0 on success, 1 if no changes found.
1168 """
1168 """
1169 revs = None
1169 revs = None
1170 if 'rev' in opts:
1170 if 'rev' in opts:
1171 revs = scmutil.revrange(repo, opts['rev'])
1171 revs = scmutil.revrange(repo, opts['rev'])
1172
1172
1173 bundletype = opts.get('type', 'bzip2').lower()
1173 bundletype = opts.get('type', 'bzip2').lower()
1174 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1174 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1175 bundletype = btypes.get(bundletype)
1175 bundletype = btypes.get(bundletype)
1176 if bundletype not in changegroup.bundletypes:
1176 if bundletype not in changegroup.bundletypes:
1177 raise util.Abort(_('unknown bundle type specified with --type'))
1177 raise util.Abort(_('unknown bundle type specified with --type'))
1178
1178
1179 if opts.get('all'):
1179 if opts.get('all'):
1180 base = ['null']
1180 base = ['null']
1181 else:
1181 else:
1182 base = scmutil.revrange(repo, opts.get('base'))
1182 base = scmutil.revrange(repo, opts.get('base'))
1183 # TODO: get desired bundlecaps from command line.
1183 # TODO: get desired bundlecaps from command line.
1184 bundlecaps = None
1184 bundlecaps = None
1185 if base:
1185 if base:
1186 if dest:
1186 if dest:
1187 raise util.Abort(_("--base is incompatible with specifying "
1187 raise util.Abort(_("--base is incompatible with specifying "
1188 "a destination"))
1188 "a destination"))
1189 common = [repo.lookup(rev) for rev in base]
1189 common = [repo.lookup(rev) for rev in base]
1190 heads = revs and map(repo.lookup, revs) or revs
1190 heads = revs and map(repo.lookup, revs) or revs
1191 cg = changegroup.getchangegroup(repo, 'bundle', heads=heads,
1191 cg = changegroup.getchangegroup(repo, 'bundle', heads=heads,
1192 common=common, bundlecaps=bundlecaps)
1192 common=common, bundlecaps=bundlecaps)
1193 outgoing = None
1193 outgoing = None
1194 else:
1194 else:
1195 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1195 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1196 dest, branches = hg.parseurl(dest, opts.get('branch'))
1196 dest, branches = hg.parseurl(dest, opts.get('branch'))
1197 other = hg.peer(repo, opts, dest)
1197 other = hg.peer(repo, opts, dest)
1198 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1198 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1199 heads = revs and map(repo.lookup, revs) or revs
1199 heads = revs and map(repo.lookup, revs) or revs
1200 outgoing = discovery.findcommonoutgoing(repo, other,
1200 outgoing = discovery.findcommonoutgoing(repo, other,
1201 onlyheads=heads,
1201 onlyheads=heads,
1202 force=opts.get('force'),
1202 force=opts.get('force'),
1203 portable=True)
1203 portable=True)
1204 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1204 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1205 bundlecaps)
1205 bundlecaps)
1206 if not cg:
1206 if not cg:
1207 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1207 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1208 return 1
1208 return 1
1209
1209
1210 changegroup.writebundle(cg, fname, bundletype)
1210 changegroup.writebundle(cg, fname, bundletype)
1211
1211
1212 @command('cat',
1212 @command('cat',
1213 [('o', 'output', '',
1213 [('o', 'output', '',
1214 _('print output to file with formatted name'), _('FORMAT')),
1214 _('print output to file with formatted name'), _('FORMAT')),
1215 ('r', 'rev', '', _('print the given revision'), _('REV')),
1215 ('r', 'rev', '', _('print the given revision'), _('REV')),
1216 ('', 'decode', None, _('apply any matching decode filter')),
1216 ('', 'decode', None, _('apply any matching decode filter')),
1217 ] + walkopts,
1217 ] + walkopts,
1218 _('[OPTION]... FILE...'),
1218 _('[OPTION]... FILE...'),
1219 inferrepo=True)
1219 inferrepo=True)
1220 def cat(ui, repo, file1, *pats, **opts):
1220 def cat(ui, repo, file1, *pats, **opts):
1221 """output the current or given revision of files
1221 """output the current or given revision of files
1222
1222
1223 Print the specified files as they were at the given revision. If
1223 Print the specified files as they were at the given revision. If
1224 no revision is given, the parent of the working directory is used.
1224 no revision is given, the parent of the working directory is used.
1225
1225
1226 Output may be to a file, in which case the name of the file is
1226 Output may be to a file, in which case the name of the file is
1227 given using a format string. The formatting rules as follows:
1227 given using a format string. The formatting rules as follows:
1228
1228
1229 :``%%``: literal "%" character
1229 :``%%``: literal "%" character
1230 :``%s``: basename of file being printed
1230 :``%s``: basename of file being printed
1231 :``%d``: dirname of file being printed, or '.' if in repository root
1231 :``%d``: dirname of file being printed, or '.' if in repository root
1232 :``%p``: root-relative path name of file being printed
1232 :``%p``: root-relative path name of file being printed
1233 :``%H``: changeset hash (40 hexadecimal digits)
1233 :``%H``: changeset hash (40 hexadecimal digits)
1234 :``%R``: changeset revision number
1234 :``%R``: changeset revision number
1235 :``%h``: short-form changeset hash (12 hexadecimal digits)
1235 :``%h``: short-form changeset hash (12 hexadecimal digits)
1236 :``%r``: zero-padded changeset revision number
1236 :``%r``: zero-padded changeset revision number
1237 :``%b``: basename of the exporting repository
1237 :``%b``: basename of the exporting repository
1238
1238
1239 Returns 0 on success.
1239 Returns 0 on success.
1240 """
1240 """
1241 ctx = scmutil.revsingle(repo, opts.get('rev'))
1241 ctx = scmutil.revsingle(repo, opts.get('rev'))
1242 m = scmutil.match(ctx, (file1,) + pats, opts)
1242 m = scmutil.match(ctx, (file1,) + pats, opts)
1243
1243
1244 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1244 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1245
1245
1246 @command('^clone',
1246 @command('^clone',
1247 [('U', 'noupdate', None,
1247 [('U', 'noupdate', None,
1248 _('the clone will include an empty working copy (only a repository)')),
1248 _('the clone will include an empty working copy (only a repository)')),
1249 ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')),
1249 ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')),
1250 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1250 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1251 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1251 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1252 ('', 'pull', None, _('use pull protocol to copy metadata')),
1252 ('', 'pull', None, _('use pull protocol to copy metadata')),
1253 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1253 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1254 ] + remoteopts,
1254 ] + remoteopts,
1255 _('[OPTION]... SOURCE [DEST]'),
1255 _('[OPTION]... SOURCE [DEST]'),
1256 norepo=True)
1256 norepo=True)
1257 def clone(ui, source, dest=None, **opts):
1257 def clone(ui, source, dest=None, **opts):
1258 """make a copy of an existing repository
1258 """make a copy of an existing repository
1259
1259
1260 Create a copy of an existing repository in a new directory.
1260 Create a copy of an existing repository in a new directory.
1261
1261
1262 If no destination directory name is specified, it defaults to the
1262 If no destination directory name is specified, it defaults to the
1263 basename of the source.
1263 basename of the source.
1264
1264
1265 The location of the source is added to the new repository's
1265 The location of the source is added to the new repository's
1266 ``.hg/hgrc`` file, as the default to be used for future pulls.
1266 ``.hg/hgrc`` file, as the default to be used for future pulls.
1267
1267
1268 Only local paths and ``ssh://`` URLs are supported as
1268 Only local paths and ``ssh://`` URLs are supported as
1269 destinations. For ``ssh://`` destinations, no working directory or
1269 destinations. For ``ssh://`` destinations, no working directory or
1270 ``.hg/hgrc`` will be created on the remote side.
1270 ``.hg/hgrc`` will be created on the remote side.
1271
1271
1272 To pull only a subset of changesets, specify one or more revisions
1272 To pull only a subset of changesets, specify one or more revisions
1273 identifiers with -r/--rev or branches with -b/--branch. The
1273 identifiers with -r/--rev or branches with -b/--branch. The
1274 resulting clone will contain only the specified changesets and
1274 resulting clone will contain only the specified changesets and
1275 their ancestors. These options (or 'clone src#rev dest') imply
1275 their ancestors. These options (or 'clone src#rev dest') imply
1276 --pull, even for local source repositories. Note that specifying a
1276 --pull, even for local source repositories. Note that specifying a
1277 tag will include the tagged changeset but not the changeset
1277 tag will include the tagged changeset but not the changeset
1278 containing the tag.
1278 containing the tag.
1279
1279
1280 If the source repository has a bookmark called '@' set, that
1280 If the source repository has a bookmark called '@' set, that
1281 revision will be checked out in the new repository by default.
1281 revision will be checked out in the new repository by default.
1282
1282
1283 To check out a particular version, use -u/--update, or
1283 To check out a particular version, use -u/--update, or
1284 -U/--noupdate to create a clone with no working directory.
1284 -U/--noupdate to create a clone with no working directory.
1285
1285
1286 .. container:: verbose
1286 .. container:: verbose
1287
1287
1288 For efficiency, hardlinks are used for cloning whenever the
1288 For efficiency, hardlinks are used for cloning whenever the
1289 source and destination are on the same filesystem (note this
1289 source and destination are on the same filesystem (note this
1290 applies only to the repository data, not to the working
1290 applies only to the repository data, not to the working
1291 directory). Some filesystems, such as AFS, implement hardlinking
1291 directory). Some filesystems, such as AFS, implement hardlinking
1292 incorrectly, but do not report errors. In these cases, use the
1292 incorrectly, but do not report errors. In these cases, use the
1293 --pull option to avoid hardlinking.
1293 --pull option to avoid hardlinking.
1294
1294
1295 In some cases, you can clone repositories and the working
1295 In some cases, you can clone repositories and the working
1296 directory using full hardlinks with ::
1296 directory using full hardlinks with ::
1297
1297
1298 $ cp -al REPO REPOCLONE
1298 $ cp -al REPO REPOCLONE
1299
1299
1300 This is the fastest way to clone, but it is not always safe. The
1300 This is the fastest way to clone, but it is not always safe. The
1301 operation is not atomic (making sure REPO is not modified during
1301 operation is not atomic (making sure REPO is not modified during
1302 the operation is up to you) and you have to make sure your
1302 the operation is up to you) and you have to make sure your
1303 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1303 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1304 so). Also, this is not compatible with certain extensions that
1304 so). Also, this is not compatible with certain extensions that
1305 place their metadata under the .hg directory, such as mq.
1305 place their metadata under the .hg directory, such as mq.
1306
1306
1307 Mercurial will update the working directory to the first applicable
1307 Mercurial will update the working directory to the first applicable
1308 revision from this list:
1308 revision from this list:
1309
1309
1310 a) null if -U or the source repository has no changesets
1310 a) null if -U or the source repository has no changesets
1311 b) if -u . and the source repository is local, the first parent of
1311 b) if -u . and the source repository is local, the first parent of
1312 the source repository's working directory
1312 the source repository's working directory
1313 c) the changeset specified with -u (if a branch name, this means the
1313 c) the changeset specified with -u (if a branch name, this means the
1314 latest head of that branch)
1314 latest head of that branch)
1315 d) the changeset specified with -r
1315 d) the changeset specified with -r
1316 e) the tipmost head specified with -b
1316 e) the tipmost head specified with -b
1317 f) the tipmost head specified with the url#branch source syntax
1317 f) the tipmost head specified with the url#branch source syntax
1318 g) the revision marked with the '@' bookmark, if present
1318 g) the revision marked with the '@' bookmark, if present
1319 h) the tipmost head of the default branch
1319 h) the tipmost head of the default branch
1320 i) tip
1320 i) tip
1321
1321
1322 Examples:
1322 Examples:
1323
1323
1324 - clone a remote repository to a new directory named hg/::
1324 - clone a remote repository to a new directory named hg/::
1325
1325
1326 hg clone http://selenic.com/hg
1326 hg clone http://selenic.com/hg
1327
1327
1328 - create a lightweight local clone::
1328 - create a lightweight local clone::
1329
1329
1330 hg clone project/ project-feature/
1330 hg clone project/ project-feature/
1331
1331
1332 - clone from an absolute path on an ssh server (note double-slash)::
1332 - clone from an absolute path on an ssh server (note double-slash)::
1333
1333
1334 hg clone ssh://user@server//home/projects/alpha/
1334 hg clone ssh://user@server//home/projects/alpha/
1335
1335
1336 - do a high-speed clone over a LAN while checking out a
1336 - do a high-speed clone over a LAN while checking out a
1337 specified version::
1337 specified version::
1338
1338
1339 hg clone --uncompressed http://server/repo -u 1.5
1339 hg clone --uncompressed http://server/repo -u 1.5
1340
1340
1341 - create a repository without changesets after a particular revision::
1341 - create a repository without changesets after a particular revision::
1342
1342
1343 hg clone -r 04e544 experimental/ good/
1343 hg clone -r 04e544 experimental/ good/
1344
1344
1345 - clone (and track) a particular named branch::
1345 - clone (and track) a particular named branch::
1346
1346
1347 hg clone http://selenic.com/hg#stable
1347 hg clone http://selenic.com/hg#stable
1348
1348
1349 See :hg:`help urls` for details on specifying URLs.
1349 See :hg:`help urls` for details on specifying URLs.
1350
1350
1351 Returns 0 on success.
1351 Returns 0 on success.
1352 """
1352 """
1353 if opts.get('noupdate') and opts.get('updaterev'):
1353 if opts.get('noupdate') and opts.get('updaterev'):
1354 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
1354 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
1355
1355
1356 r = hg.clone(ui, opts, source, dest,
1356 r = hg.clone(ui, opts, source, dest,
1357 pull=opts.get('pull'),
1357 pull=opts.get('pull'),
1358 stream=opts.get('uncompressed'),
1358 stream=opts.get('uncompressed'),
1359 rev=opts.get('rev'),
1359 rev=opts.get('rev'),
1360 update=opts.get('updaterev') or not opts.get('noupdate'),
1360 update=opts.get('updaterev') or not opts.get('noupdate'),
1361 branch=opts.get('branch'))
1361 branch=opts.get('branch'))
1362
1362
1363 return r is None
1363 return r is None
1364
1364
1365 @command('^commit|ci',
1365 @command('^commit|ci',
1366 [('A', 'addremove', None,
1366 [('A', 'addremove', None,
1367 _('mark new/missing files as added/removed before committing')),
1367 _('mark new/missing files as added/removed before committing')),
1368 ('', 'close-branch', None,
1368 ('', 'close-branch', None,
1369 _('mark a branch as closed, hiding it from the branch list')),
1369 _('mark a branch as closed, hiding it from the branch list')),
1370 ('', 'amend', None, _('amend the parent of the working dir')),
1370 ('', 'amend', None, _('amend the parent of the working dir')),
1371 ('s', 'secret', None, _('use the secret phase for committing')),
1371 ('s', 'secret', None, _('use the secret phase for committing')),
1372 ('e', 'edit', None, _('invoke editor on commit messages')),
1372 ('e', 'edit', None, _('invoke editor on commit messages')),
1373 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1373 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1374 _('[OPTION]... [FILE]...'),
1374 _('[OPTION]... [FILE]...'),
1375 inferrepo=True)
1375 inferrepo=True)
1376 def commit(ui, repo, *pats, **opts):
1376 def commit(ui, repo, *pats, **opts):
1377 """commit the specified files or all outstanding changes
1377 """commit the specified files or all outstanding changes
1378
1378
1379 Commit changes to the given files into the repository. Unlike a
1379 Commit changes to the given files into the repository. Unlike a
1380 centralized SCM, this operation is a local operation. See
1380 centralized SCM, this operation is a local operation. See
1381 :hg:`push` for a way to actively distribute your changes.
1381 :hg:`push` for a way to actively distribute your changes.
1382
1382
1383 If a list of files is omitted, all changes reported by :hg:`status`
1383 If a list of files is omitted, all changes reported by :hg:`status`
1384 will be committed.
1384 will be committed.
1385
1385
1386 If you are committing the result of a merge, do not provide any
1386 If you are committing the result of a merge, do not provide any
1387 filenames or -I/-X filters.
1387 filenames or -I/-X filters.
1388
1388
1389 If no commit message is specified, Mercurial starts your
1389 If no commit message is specified, Mercurial starts your
1390 configured editor where you can enter a message. In case your
1390 configured editor where you can enter a message. In case your
1391 commit fails, you will find a backup of your message in
1391 commit fails, you will find a backup of your message in
1392 ``.hg/last-message.txt``.
1392 ``.hg/last-message.txt``.
1393
1393
1394 The --amend flag can be used to amend the parent of the
1394 The --amend flag can be used to amend the parent of the
1395 working directory with a new commit that contains the changes
1395 working directory with a new commit that contains the changes
1396 in the parent in addition to those currently reported by :hg:`status`,
1396 in the parent in addition to those currently reported by :hg:`status`,
1397 if there are any. The old commit is stored in a backup bundle in
1397 if there are any. The old commit is stored in a backup bundle in
1398 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1398 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1399 on how to restore it).
1399 on how to restore it).
1400
1400
1401 Message, user and date are taken from the amended commit unless
1401 Message, user and date are taken from the amended commit unless
1402 specified. When a message isn't specified on the command line,
1402 specified. When a message isn't specified on the command line,
1403 the editor will open with the message of the amended commit.
1403 the editor will open with the message of the amended commit.
1404
1404
1405 It is not possible to amend public changesets (see :hg:`help phases`)
1405 It is not possible to amend public changesets (see :hg:`help phases`)
1406 or changesets that have children.
1406 or changesets that have children.
1407
1407
1408 See :hg:`help dates` for a list of formats valid for -d/--date.
1408 See :hg:`help dates` for a list of formats valid for -d/--date.
1409
1409
1410 Returns 0 on success, 1 if nothing changed.
1410 Returns 0 on success, 1 if nothing changed.
1411 """
1411 """
1412 if opts.get('subrepos'):
1412 if opts.get('subrepos'):
1413 if opts.get('amend'):
1413 if opts.get('amend'):
1414 raise util.Abort(_('cannot amend with --subrepos'))
1414 raise util.Abort(_('cannot amend with --subrepos'))
1415 # Let --subrepos on the command line override config setting.
1415 # Let --subrepos on the command line override config setting.
1416 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1416 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1417
1417
1418 cmdutil.checkunfinished(repo, commit=True)
1418 cmdutil.checkunfinished(repo, commit=True)
1419
1419
1420 branch = repo[None].branch()
1420 branch = repo[None].branch()
1421 bheads = repo.branchheads(branch)
1421 bheads = repo.branchheads(branch)
1422
1422
1423 extra = {}
1423 extra = {}
1424 if opts.get('close_branch'):
1424 if opts.get('close_branch'):
1425 extra['close'] = 1
1425 extra['close'] = 1
1426
1426
1427 if not bheads:
1427 if not bheads:
1428 raise util.Abort(_('can only close branch heads'))
1428 raise util.Abort(_('can only close branch heads'))
1429 elif opts.get('amend'):
1429 elif opts.get('amend'):
1430 if repo.parents()[0].p1().branch() != branch and \
1430 if repo.parents()[0].p1().branch() != branch and \
1431 repo.parents()[0].p2().branch() != branch:
1431 repo.parents()[0].p2().branch() != branch:
1432 raise util.Abort(_('can only close branch heads'))
1432 raise util.Abort(_('can only close branch heads'))
1433
1433
1434 if opts.get('amend'):
1434 if opts.get('amend'):
1435 if ui.configbool('ui', 'commitsubrepos'):
1435 if ui.configbool('ui', 'commitsubrepos'):
1436 raise util.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1436 raise util.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1437
1437
1438 old = repo['.']
1438 old = repo['.']
1439 if not old.mutable():
1439 if not old.mutable():
1440 raise util.Abort(_('cannot amend public changesets'))
1440 raise util.Abort(_('cannot amend public changesets'))
1441 if len(repo[None].parents()) > 1:
1441 if len(repo[None].parents()) > 1:
1442 raise util.Abort(_('cannot amend while merging'))
1442 raise util.Abort(_('cannot amend while merging'))
1443 if (not obsolete._enabled) and old.children():
1443 if (not obsolete._enabled) and old.children():
1444 raise util.Abort(_('cannot amend changeset with children'))
1444 raise util.Abort(_('cannot amend changeset with children'))
1445
1445
1446 # commitfunc is used only for temporary amend commit by cmdutil.amend
1446 # commitfunc is used only for temporary amend commit by cmdutil.amend
1447 def commitfunc(ui, repo, message, match, opts):
1447 def commitfunc(ui, repo, message, match, opts):
1448 return repo.commit(message,
1448 return repo.commit(message,
1449 opts.get('user') or old.user(),
1449 opts.get('user') or old.user(),
1450 opts.get('date') or old.date(),
1450 opts.get('date') or old.date(),
1451 match,
1451 match,
1452 extra=extra)
1452 extra=extra)
1453
1453
1454 current = repo._bookmarkcurrent
1454 current = repo._bookmarkcurrent
1455 marks = old.bookmarks()
1455 marks = old.bookmarks()
1456 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1456 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1457 if node == old.node():
1457 if node == old.node():
1458 ui.status(_("nothing changed\n"))
1458 ui.status(_("nothing changed\n"))
1459 return 1
1459 return 1
1460 elif marks:
1460 elif marks:
1461 ui.debug('moving bookmarks %r from %s to %s\n' %
1461 ui.debug('moving bookmarks %r from %s to %s\n' %
1462 (marks, old.hex(), hex(node)))
1462 (marks, old.hex(), hex(node)))
1463 newmarks = repo._bookmarks
1463 newmarks = repo._bookmarks
1464 for bm in marks:
1464 for bm in marks:
1465 newmarks[bm] = node
1465 newmarks[bm] = node
1466 if bm == current:
1466 if bm == current:
1467 bookmarks.setcurrent(repo, bm)
1467 bookmarks.setcurrent(repo, bm)
1468 newmarks.write()
1468 newmarks.write()
1469 else:
1469 else:
1470 def commitfunc(ui, repo, message, match, opts):
1470 def commitfunc(ui, repo, message, match, opts):
1471 backup = ui.backupconfig('phases', 'new-commit')
1471 backup = ui.backupconfig('phases', 'new-commit')
1472 baseui = repo.baseui
1472 baseui = repo.baseui
1473 basebackup = baseui.backupconfig('phases', 'new-commit')
1473 basebackup = baseui.backupconfig('phases', 'new-commit')
1474 try:
1474 try:
1475 if opts.get('secret'):
1475 if opts.get('secret'):
1476 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1476 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1477 # Propagate to subrepos
1477 # Propagate to subrepos
1478 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1478 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1479
1479
1480 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1480 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1481 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1481 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1482 return repo.commit(message, opts.get('user'), opts.get('date'),
1482 return repo.commit(message, opts.get('user'), opts.get('date'),
1483 match,
1483 match,
1484 editor=editor,
1484 editor=editor,
1485 extra=extra)
1485 extra=extra)
1486 finally:
1486 finally:
1487 ui.restoreconfig(backup)
1487 ui.restoreconfig(backup)
1488 repo.baseui.restoreconfig(basebackup)
1488 repo.baseui.restoreconfig(basebackup)
1489
1489
1490
1490
1491 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1491 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1492
1492
1493 if not node:
1493 if not node:
1494 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1494 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1495 if stat[3]:
1495 if stat[3]:
1496 ui.status(_("nothing changed (%d missing files, see "
1496 ui.status(_("nothing changed (%d missing files, see "
1497 "'hg status')\n") % len(stat[3]))
1497 "'hg status')\n") % len(stat[3]))
1498 else:
1498 else:
1499 ui.status(_("nothing changed\n"))
1499 ui.status(_("nothing changed\n"))
1500 return 1
1500 return 1
1501
1501
1502 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1502 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1503
1503
1504 @command('config|showconfig|debugconfig',
1504 @command('config|showconfig|debugconfig',
1505 [('u', 'untrusted', None, _('show untrusted configuration options')),
1505 [('u', 'untrusted', None, _('show untrusted configuration options')),
1506 ('e', 'edit', None, _('edit user config')),
1506 ('e', 'edit', None, _('edit user config')),
1507 ('l', 'local', None, _('edit repository config')),
1507 ('l', 'local', None, _('edit repository config')),
1508 ('g', 'global', None, _('edit global config'))],
1508 ('g', 'global', None, _('edit global config'))],
1509 _('[-u] [NAME]...'),
1509 _('[-u] [NAME]...'),
1510 optionalrepo=True)
1510 optionalrepo=True)
1511 def config(ui, repo, *values, **opts):
1511 def config(ui, repo, *values, **opts):
1512 """show combined config settings from all hgrc files
1512 """show combined config settings from all hgrc files
1513
1513
1514 With no arguments, print names and values of all config items.
1514 With no arguments, print names and values of all config items.
1515
1515
1516 With one argument of the form section.name, print just the value
1516 With one argument of the form section.name, print just the value
1517 of that config item.
1517 of that config item.
1518
1518
1519 With multiple arguments, print names and values of all config
1519 With multiple arguments, print names and values of all config
1520 items with matching section names.
1520 items with matching section names.
1521
1521
1522 With --edit, start an editor on the user-level config file. With
1522 With --edit, start an editor on the user-level config file. With
1523 --global, edit the system-wide config file. With --local, edit the
1523 --global, edit the system-wide config file. With --local, edit the
1524 repository-level config file.
1524 repository-level config file.
1525
1525
1526 With --debug, the source (filename and line number) is printed
1526 With --debug, the source (filename and line number) is printed
1527 for each config item.
1527 for each config item.
1528
1528
1529 See :hg:`help config` for more information about config files.
1529 See :hg:`help config` for more information about config files.
1530
1530
1531 Returns 0 on success, 1 if NAME does not exist.
1531 Returns 0 on success, 1 if NAME does not exist.
1532
1532
1533 """
1533 """
1534
1534
1535 if opts.get('edit') or opts.get('local') or opts.get('global'):
1535 if opts.get('edit') or opts.get('local') or opts.get('global'):
1536 if opts.get('local') and opts.get('global'):
1536 if opts.get('local') and opts.get('global'):
1537 raise util.Abort(_("can't use --local and --global together"))
1537 raise util.Abort(_("can't use --local and --global together"))
1538
1538
1539 if opts.get('local'):
1539 if opts.get('local'):
1540 if not repo:
1540 if not repo:
1541 raise util.Abort(_("can't use --local outside a repository"))
1541 raise util.Abort(_("can't use --local outside a repository"))
1542 paths = [repo.join('hgrc')]
1542 paths = [repo.join('hgrc')]
1543 elif opts.get('global'):
1543 elif opts.get('global'):
1544 paths = scmutil.systemrcpath()
1544 paths = scmutil.systemrcpath()
1545 else:
1545 else:
1546 paths = scmutil.userrcpath()
1546 paths = scmutil.userrcpath()
1547
1547
1548 for f in paths:
1548 for f in paths:
1549 if os.path.exists(f):
1549 if os.path.exists(f):
1550 break
1550 break
1551 else:
1551 else:
1552 from ui import samplehgrcs
1552 from ui import samplehgrcs
1553
1553
1554 if opts.get('global'):
1554 if opts.get('global'):
1555 samplehgrc = samplehgrcs['global']
1555 samplehgrc = samplehgrcs['global']
1556 elif opts.get('local'):
1556 elif opts.get('local'):
1557 samplehgrc = samplehgrcs['local']
1557 samplehgrc = samplehgrcs['local']
1558 else:
1558 else:
1559 samplehgrc = samplehgrcs['user']
1559 samplehgrc = samplehgrcs['user']
1560
1560
1561 f = paths[0]
1561 f = paths[0]
1562 fp = open(f, "w")
1562 fp = open(f, "w")
1563 fp.write(samplehgrc)
1563 fp.write(samplehgrc)
1564 fp.close()
1564 fp.close()
1565
1565
1566 editor = ui.geteditor()
1566 editor = ui.geteditor()
1567 util.system("%s \"%s\"" % (editor, f),
1567 util.system("%s \"%s\"" % (editor, f),
1568 onerr=util.Abort, errprefix=_("edit failed"),
1568 onerr=util.Abort, errprefix=_("edit failed"),
1569 out=ui.fout)
1569 out=ui.fout)
1570 return
1570 return
1571
1571
1572 for f in scmutil.rcpath():
1572 for f in scmutil.rcpath():
1573 ui.debug('read config from: %s\n' % f)
1573 ui.debug('read config from: %s\n' % f)
1574 untrusted = bool(opts.get('untrusted'))
1574 untrusted = bool(opts.get('untrusted'))
1575 if values:
1575 if values:
1576 sections = [v for v in values if '.' not in v]
1576 sections = [v for v in values if '.' not in v]
1577 items = [v for v in values if '.' in v]
1577 items = [v for v in values if '.' in v]
1578 if len(items) > 1 or items and sections:
1578 if len(items) > 1 or items and sections:
1579 raise util.Abort(_('only one config item permitted'))
1579 raise util.Abort(_('only one config item permitted'))
1580 matched = False
1580 matched = False
1581 for section, name, value in ui.walkconfig(untrusted=untrusted):
1581 for section, name, value in ui.walkconfig(untrusted=untrusted):
1582 value = str(value).replace('\n', '\\n')
1582 value = str(value).replace('\n', '\\n')
1583 sectname = section + '.' + name
1583 sectname = section + '.' + name
1584 if values:
1584 if values:
1585 for v in values:
1585 for v in values:
1586 if v == section:
1586 if v == section:
1587 ui.debug('%s: ' %
1587 ui.debug('%s: ' %
1588 ui.configsource(section, name, untrusted))
1588 ui.configsource(section, name, untrusted))
1589 ui.write('%s=%s\n' % (sectname, value))
1589 ui.write('%s=%s\n' % (sectname, value))
1590 matched = True
1590 matched = True
1591 elif v == sectname:
1591 elif v == sectname:
1592 ui.debug('%s: ' %
1592 ui.debug('%s: ' %
1593 ui.configsource(section, name, untrusted))
1593 ui.configsource(section, name, untrusted))
1594 ui.write(value, '\n')
1594 ui.write(value, '\n')
1595 matched = True
1595 matched = True
1596 else:
1596 else:
1597 ui.debug('%s: ' %
1597 ui.debug('%s: ' %
1598 ui.configsource(section, name, untrusted))
1598 ui.configsource(section, name, untrusted))
1599 ui.write('%s=%s\n' % (sectname, value))
1599 ui.write('%s=%s\n' % (sectname, value))
1600 matched = True
1600 matched = True
1601 if matched:
1601 if matched:
1602 return 0
1602 return 0
1603 return 1
1603 return 1
1604
1604
1605 @command('copy|cp',
1605 @command('copy|cp',
1606 [('A', 'after', None, _('record a copy that has already occurred')),
1606 [('A', 'after', None, _('record a copy that has already occurred')),
1607 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1607 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1608 ] + walkopts + dryrunopts,
1608 ] + walkopts + dryrunopts,
1609 _('[OPTION]... [SOURCE]... DEST'))
1609 _('[OPTION]... [SOURCE]... DEST'))
1610 def copy(ui, repo, *pats, **opts):
1610 def copy(ui, repo, *pats, **opts):
1611 """mark files as copied for the next commit
1611 """mark files as copied for the next commit
1612
1612
1613 Mark dest as having copies of source files. If dest is a
1613 Mark dest as having copies of source files. If dest is a
1614 directory, copies are put in that directory. If dest is a file,
1614 directory, copies are put in that directory. If dest is a file,
1615 the source must be a single file.
1615 the source must be a single file.
1616
1616
1617 By default, this command copies the contents of files as they
1617 By default, this command copies the contents of files as they
1618 exist in the working directory. If invoked with -A/--after, the
1618 exist in the working directory. If invoked with -A/--after, the
1619 operation is recorded, but no copying is performed.
1619 operation is recorded, but no copying is performed.
1620
1620
1621 This command takes effect with the next commit. To undo a copy
1621 This command takes effect with the next commit. To undo a copy
1622 before that, see :hg:`revert`.
1622 before that, see :hg:`revert`.
1623
1623
1624 Returns 0 on success, 1 if errors are encountered.
1624 Returns 0 on success, 1 if errors are encountered.
1625 """
1625 """
1626 wlock = repo.wlock(False)
1626 wlock = repo.wlock(False)
1627 try:
1627 try:
1628 return cmdutil.copy(ui, repo, pats, opts)
1628 return cmdutil.copy(ui, repo, pats, opts)
1629 finally:
1629 finally:
1630 wlock.release()
1630 wlock.release()
1631
1631
1632 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
1632 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
1633 def debugancestor(ui, repo, *args):
1633 def debugancestor(ui, repo, *args):
1634 """find the ancestor revision of two revisions in a given index"""
1634 """find the ancestor revision of two revisions in a given index"""
1635 if len(args) == 3:
1635 if len(args) == 3:
1636 index, rev1, rev2 = args
1636 index, rev1, rev2 = args
1637 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1637 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1638 lookup = r.lookup
1638 lookup = r.lookup
1639 elif len(args) == 2:
1639 elif len(args) == 2:
1640 if not repo:
1640 if not repo:
1641 raise util.Abort(_("there is no Mercurial repository here "
1641 raise util.Abort(_("there is no Mercurial repository here "
1642 "(.hg not found)"))
1642 "(.hg not found)"))
1643 rev1, rev2 = args
1643 rev1, rev2 = args
1644 r = repo.changelog
1644 r = repo.changelog
1645 lookup = repo.lookup
1645 lookup = repo.lookup
1646 else:
1646 else:
1647 raise util.Abort(_('either two or three arguments required'))
1647 raise util.Abort(_('either two or three arguments required'))
1648 a = r.ancestor(lookup(rev1), lookup(rev2))
1648 a = r.ancestor(lookup(rev1), lookup(rev2))
1649 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1649 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1650
1650
1651 @command('debugbuilddag',
1651 @command('debugbuilddag',
1652 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1652 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1653 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1653 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1654 ('n', 'new-file', None, _('add new file at each rev'))],
1654 ('n', 'new-file', None, _('add new file at each rev'))],
1655 _('[OPTION]... [TEXT]'))
1655 _('[OPTION]... [TEXT]'))
1656 def debugbuilddag(ui, repo, text=None,
1656 def debugbuilddag(ui, repo, text=None,
1657 mergeable_file=False,
1657 mergeable_file=False,
1658 overwritten_file=False,
1658 overwritten_file=False,
1659 new_file=False):
1659 new_file=False):
1660 """builds a repo with a given DAG from scratch in the current empty repo
1660 """builds a repo with a given DAG from scratch in the current empty repo
1661
1661
1662 The description of the DAG is read from stdin if not given on the
1662 The description of the DAG is read from stdin if not given on the
1663 command line.
1663 command line.
1664
1664
1665 Elements:
1665 Elements:
1666
1666
1667 - "+n" is a linear run of n nodes based on the current default parent
1667 - "+n" is a linear run of n nodes based on the current default parent
1668 - "." is a single node based on the current default parent
1668 - "." is a single node based on the current default parent
1669 - "$" resets the default parent to null (implied at the start);
1669 - "$" resets the default parent to null (implied at the start);
1670 otherwise the default parent is always the last node created
1670 otherwise the default parent is always the last node created
1671 - "<p" sets the default parent to the backref p
1671 - "<p" sets the default parent to the backref p
1672 - "*p" is a fork at parent p, which is a backref
1672 - "*p" is a fork at parent p, which is a backref
1673 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1673 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1674 - "/p2" is a merge of the preceding node and p2
1674 - "/p2" is a merge of the preceding node and p2
1675 - ":tag" defines a local tag for the preceding node
1675 - ":tag" defines a local tag for the preceding node
1676 - "@branch" sets the named branch for subsequent nodes
1676 - "@branch" sets the named branch for subsequent nodes
1677 - "#...\\n" is a comment up to the end of the line
1677 - "#...\\n" is a comment up to the end of the line
1678
1678
1679 Whitespace between the above elements is ignored.
1679 Whitespace between the above elements is ignored.
1680
1680
1681 A backref is either
1681 A backref is either
1682
1682
1683 - a number n, which references the node curr-n, where curr is the current
1683 - a number n, which references the node curr-n, where curr is the current
1684 node, or
1684 node, or
1685 - the name of a local tag you placed earlier using ":tag", or
1685 - the name of a local tag you placed earlier using ":tag", or
1686 - empty to denote the default parent.
1686 - empty to denote the default parent.
1687
1687
1688 All string valued-elements are either strictly alphanumeric, or must
1688 All string valued-elements are either strictly alphanumeric, or must
1689 be enclosed in double quotes ("..."), with "\\" as escape character.
1689 be enclosed in double quotes ("..."), with "\\" as escape character.
1690 """
1690 """
1691
1691
1692 if text is None:
1692 if text is None:
1693 ui.status(_("reading DAG from stdin\n"))
1693 ui.status(_("reading DAG from stdin\n"))
1694 text = ui.fin.read()
1694 text = ui.fin.read()
1695
1695
1696 cl = repo.changelog
1696 cl = repo.changelog
1697 if len(cl) > 0:
1697 if len(cl) > 0:
1698 raise util.Abort(_('repository is not empty'))
1698 raise util.Abort(_('repository is not empty'))
1699
1699
1700 # determine number of revs in DAG
1700 # determine number of revs in DAG
1701 total = 0
1701 total = 0
1702 for type, data in dagparser.parsedag(text):
1702 for type, data in dagparser.parsedag(text):
1703 if type == 'n':
1703 if type == 'n':
1704 total += 1
1704 total += 1
1705
1705
1706 if mergeable_file:
1706 if mergeable_file:
1707 linesperrev = 2
1707 linesperrev = 2
1708 # make a file with k lines per rev
1708 # make a file with k lines per rev
1709 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1709 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1710 initialmergedlines.append("")
1710 initialmergedlines.append("")
1711
1711
1712 tags = []
1712 tags = []
1713
1713
1714 lock = tr = None
1714 lock = tr = None
1715 try:
1715 try:
1716 lock = repo.lock()
1716 lock = repo.lock()
1717 tr = repo.transaction("builddag")
1717 tr = repo.transaction("builddag")
1718
1718
1719 at = -1
1719 at = -1
1720 atbranch = 'default'
1720 atbranch = 'default'
1721 nodeids = []
1721 nodeids = []
1722 id = 0
1722 id = 0
1723 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1723 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1724 for type, data in dagparser.parsedag(text):
1724 for type, data in dagparser.parsedag(text):
1725 if type == 'n':
1725 if type == 'n':
1726 ui.note(('node %s\n' % str(data)))
1726 ui.note(('node %s\n' % str(data)))
1727 id, ps = data
1727 id, ps = data
1728
1728
1729 files = []
1729 files = []
1730 fctxs = {}
1730 fctxs = {}
1731
1731
1732 p2 = None
1732 p2 = None
1733 if mergeable_file:
1733 if mergeable_file:
1734 fn = "mf"
1734 fn = "mf"
1735 p1 = repo[ps[0]]
1735 p1 = repo[ps[0]]
1736 if len(ps) > 1:
1736 if len(ps) > 1:
1737 p2 = repo[ps[1]]
1737 p2 = repo[ps[1]]
1738 pa = p1.ancestor(p2)
1738 pa = p1.ancestor(p2)
1739 base, local, other = [x[fn].data() for x in (pa, p1,
1739 base, local, other = [x[fn].data() for x in (pa, p1,
1740 p2)]
1740 p2)]
1741 m3 = simplemerge.Merge3Text(base, local, other)
1741 m3 = simplemerge.Merge3Text(base, local, other)
1742 ml = [l.strip() for l in m3.merge_lines()]
1742 ml = [l.strip() for l in m3.merge_lines()]
1743 ml.append("")
1743 ml.append("")
1744 elif at > 0:
1744 elif at > 0:
1745 ml = p1[fn].data().split("\n")
1745 ml = p1[fn].data().split("\n")
1746 else:
1746 else:
1747 ml = initialmergedlines
1747 ml = initialmergedlines
1748 ml[id * linesperrev] += " r%i" % id
1748 ml[id * linesperrev] += " r%i" % id
1749 mergedtext = "\n".join(ml)
1749 mergedtext = "\n".join(ml)
1750 files.append(fn)
1750 files.append(fn)
1751 fctxs[fn] = context.memfilectx(repo, fn, mergedtext)
1751 fctxs[fn] = context.memfilectx(repo, fn, mergedtext)
1752
1752
1753 if overwritten_file:
1753 if overwritten_file:
1754 fn = "of"
1754 fn = "of"
1755 files.append(fn)
1755 files.append(fn)
1756 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1756 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1757
1757
1758 if new_file:
1758 if new_file:
1759 fn = "nf%i" % id
1759 fn = "nf%i" % id
1760 files.append(fn)
1760 files.append(fn)
1761 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1761 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1762 if len(ps) > 1:
1762 if len(ps) > 1:
1763 if not p2:
1763 if not p2:
1764 p2 = repo[ps[1]]
1764 p2 = repo[ps[1]]
1765 for fn in p2:
1765 for fn in p2:
1766 if fn.startswith("nf"):
1766 if fn.startswith("nf"):
1767 files.append(fn)
1767 files.append(fn)
1768 fctxs[fn] = p2[fn]
1768 fctxs[fn] = p2[fn]
1769
1769
1770 def fctxfn(repo, cx, path):
1770 def fctxfn(repo, cx, path):
1771 return fctxs.get(path)
1771 return fctxs.get(path)
1772
1772
1773 if len(ps) == 0 or ps[0] < 0:
1773 if len(ps) == 0 or ps[0] < 0:
1774 pars = [None, None]
1774 pars = [None, None]
1775 elif len(ps) == 1:
1775 elif len(ps) == 1:
1776 pars = [nodeids[ps[0]], None]
1776 pars = [nodeids[ps[0]], None]
1777 else:
1777 else:
1778 pars = [nodeids[p] for p in ps]
1778 pars = [nodeids[p] for p in ps]
1779 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1779 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1780 date=(id, 0),
1780 date=(id, 0),
1781 user="debugbuilddag",
1781 user="debugbuilddag",
1782 extra={'branch': atbranch})
1782 extra={'branch': atbranch})
1783 nodeid = repo.commitctx(cx)
1783 nodeid = repo.commitctx(cx)
1784 nodeids.append(nodeid)
1784 nodeids.append(nodeid)
1785 at = id
1785 at = id
1786 elif type == 'l':
1786 elif type == 'l':
1787 id, name = data
1787 id, name = data
1788 ui.note(('tag %s\n' % name))
1788 ui.note(('tag %s\n' % name))
1789 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
1789 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
1790 elif type == 'a':
1790 elif type == 'a':
1791 ui.note(('branch %s\n' % data))
1791 ui.note(('branch %s\n' % data))
1792 atbranch = data
1792 atbranch = data
1793 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1793 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1794 tr.close()
1794 tr.close()
1795
1795
1796 if tags:
1796 if tags:
1797 repo.opener.write("localtags", "".join(tags))
1797 repo.opener.write("localtags", "".join(tags))
1798 finally:
1798 finally:
1799 ui.progress(_('building'), None)
1799 ui.progress(_('building'), None)
1800 release(tr, lock)
1800 release(tr, lock)
1801
1801
1802 @command('debugbundle',
1802 @command('debugbundle',
1803 [('a', 'all', None, _('show all details'))],
1803 [('a', 'all', None, _('show all details'))],
1804 _('FILE'),
1804 _('FILE'),
1805 norepo=True)
1805 norepo=True)
1806 def debugbundle(ui, bundlepath, all=None, **opts):
1806 def debugbundle(ui, bundlepath, all=None, **opts):
1807 """lists the contents of a bundle"""
1807 """lists the contents of a bundle"""
1808 f = hg.openpath(ui, bundlepath)
1808 f = hg.openpath(ui, bundlepath)
1809 try:
1809 try:
1810 gen = exchange.readbundle(ui, f, bundlepath)
1810 gen = exchange.readbundle(ui, f, bundlepath)
1811 if all:
1811 if all:
1812 ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n"))
1812 ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n"))
1813
1813
1814 def showchunks(named):
1814 def showchunks(named):
1815 ui.write("\n%s\n" % named)
1815 ui.write("\n%s\n" % named)
1816 chain = None
1816 chain = None
1817 while True:
1817 while True:
1818 chunkdata = gen.deltachunk(chain)
1818 chunkdata = gen.deltachunk(chain)
1819 if not chunkdata:
1819 if not chunkdata:
1820 break
1820 break
1821 node = chunkdata['node']
1821 node = chunkdata['node']
1822 p1 = chunkdata['p1']
1822 p1 = chunkdata['p1']
1823 p2 = chunkdata['p2']
1823 p2 = chunkdata['p2']
1824 cs = chunkdata['cs']
1824 cs = chunkdata['cs']
1825 deltabase = chunkdata['deltabase']
1825 deltabase = chunkdata['deltabase']
1826 delta = chunkdata['delta']
1826 delta = chunkdata['delta']
1827 ui.write("%s %s %s %s %s %s\n" %
1827 ui.write("%s %s %s %s %s %s\n" %
1828 (hex(node), hex(p1), hex(p2),
1828 (hex(node), hex(p1), hex(p2),
1829 hex(cs), hex(deltabase), len(delta)))
1829 hex(cs), hex(deltabase), len(delta)))
1830 chain = node
1830 chain = node
1831
1831
1832 chunkdata = gen.changelogheader()
1832 chunkdata = gen.changelogheader()
1833 showchunks("changelog")
1833 showchunks("changelog")
1834 chunkdata = gen.manifestheader()
1834 chunkdata = gen.manifestheader()
1835 showchunks("manifest")
1835 showchunks("manifest")
1836 while True:
1836 while True:
1837 chunkdata = gen.filelogheader()
1837 chunkdata = gen.filelogheader()
1838 if not chunkdata:
1838 if not chunkdata:
1839 break
1839 break
1840 fname = chunkdata['filename']
1840 fname = chunkdata['filename']
1841 showchunks(fname)
1841 showchunks(fname)
1842 else:
1842 else:
1843 chunkdata = gen.changelogheader()
1843 chunkdata = gen.changelogheader()
1844 chain = None
1844 chain = None
1845 while True:
1845 while True:
1846 chunkdata = gen.deltachunk(chain)
1846 chunkdata = gen.deltachunk(chain)
1847 if not chunkdata:
1847 if not chunkdata:
1848 break
1848 break
1849 node = chunkdata['node']
1849 node = chunkdata['node']
1850 ui.write("%s\n" % hex(node))
1850 ui.write("%s\n" % hex(node))
1851 chain = node
1851 chain = node
1852 finally:
1852 finally:
1853 f.close()
1853 f.close()
1854
1854
1855 @command('debugcheckstate', [], '')
1855 @command('debugcheckstate', [], '')
1856 def debugcheckstate(ui, repo):
1856 def debugcheckstate(ui, repo):
1857 """validate the correctness of the current dirstate"""
1857 """validate the correctness of the current dirstate"""
1858 parent1, parent2 = repo.dirstate.parents()
1858 parent1, parent2 = repo.dirstate.parents()
1859 m1 = repo[parent1].manifest()
1859 m1 = repo[parent1].manifest()
1860 m2 = repo[parent2].manifest()
1860 m2 = repo[parent2].manifest()
1861 errors = 0
1861 errors = 0
1862 for f in repo.dirstate:
1862 for f in repo.dirstate:
1863 state = repo.dirstate[f]
1863 state = repo.dirstate[f]
1864 if state in "nr" and f not in m1:
1864 if state in "nr" and f not in m1:
1865 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1865 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1866 errors += 1
1866 errors += 1
1867 if state in "a" and f in m1:
1867 if state in "a" and f in m1:
1868 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1868 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1869 errors += 1
1869 errors += 1
1870 if state in "m" and f not in m1 and f not in m2:
1870 if state in "m" and f not in m1 and f not in m2:
1871 ui.warn(_("%s in state %s, but not in either manifest\n") %
1871 ui.warn(_("%s in state %s, but not in either manifest\n") %
1872 (f, state))
1872 (f, state))
1873 errors += 1
1873 errors += 1
1874 for f in m1:
1874 for f in m1:
1875 state = repo.dirstate[f]
1875 state = repo.dirstate[f]
1876 if state not in "nrm":
1876 if state not in "nrm":
1877 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1877 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1878 errors += 1
1878 errors += 1
1879 if errors:
1879 if errors:
1880 error = _(".hg/dirstate inconsistent with current parent's manifest")
1880 error = _(".hg/dirstate inconsistent with current parent's manifest")
1881 raise util.Abort(error)
1881 raise util.Abort(error)
1882
1882
1883 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
1883 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
1884 def debugcommands(ui, cmd='', *args):
1884 def debugcommands(ui, cmd='', *args):
1885 """list all available commands and options"""
1885 """list all available commands and options"""
1886 for cmd, vals in sorted(table.iteritems()):
1886 for cmd, vals in sorted(table.iteritems()):
1887 cmd = cmd.split('|')[0].strip('^')
1887 cmd = cmd.split('|')[0].strip('^')
1888 opts = ', '.join([i[1] for i in vals[1]])
1888 opts = ', '.join([i[1] for i in vals[1]])
1889 ui.write('%s: %s\n' % (cmd, opts))
1889 ui.write('%s: %s\n' % (cmd, opts))
1890
1890
1891 @command('debugcomplete',
1891 @command('debugcomplete',
1892 [('o', 'options', None, _('show the command options'))],
1892 [('o', 'options', None, _('show the command options'))],
1893 _('[-o] CMD'),
1893 _('[-o] CMD'),
1894 norepo=True)
1894 norepo=True)
1895 def debugcomplete(ui, cmd='', **opts):
1895 def debugcomplete(ui, cmd='', **opts):
1896 """returns the completion list associated with the given command"""
1896 """returns the completion list associated with the given command"""
1897
1897
1898 if opts.get('options'):
1898 if opts.get('options'):
1899 options = []
1899 options = []
1900 otables = [globalopts]
1900 otables = [globalopts]
1901 if cmd:
1901 if cmd:
1902 aliases, entry = cmdutil.findcmd(cmd, table, False)
1902 aliases, entry = cmdutil.findcmd(cmd, table, False)
1903 otables.append(entry[1])
1903 otables.append(entry[1])
1904 for t in otables:
1904 for t in otables:
1905 for o in t:
1905 for o in t:
1906 if "(DEPRECATED)" in o[3]:
1906 if "(DEPRECATED)" in o[3]:
1907 continue
1907 continue
1908 if o[0]:
1908 if o[0]:
1909 options.append('-%s' % o[0])
1909 options.append('-%s' % o[0])
1910 options.append('--%s' % o[1])
1910 options.append('--%s' % o[1])
1911 ui.write("%s\n" % "\n".join(options))
1911 ui.write("%s\n" % "\n".join(options))
1912 return
1912 return
1913
1913
1914 cmdlist = cmdutil.findpossible(cmd, table)
1914 cmdlist = cmdutil.findpossible(cmd, table)
1915 if ui.verbose:
1915 if ui.verbose:
1916 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1916 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1917 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1917 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1918
1918
1919 @command('debugdag',
1919 @command('debugdag',
1920 [('t', 'tags', None, _('use tags as labels')),
1920 [('t', 'tags', None, _('use tags as labels')),
1921 ('b', 'branches', None, _('annotate with branch names')),
1921 ('b', 'branches', None, _('annotate with branch names')),
1922 ('', 'dots', None, _('use dots for runs')),
1922 ('', 'dots', None, _('use dots for runs')),
1923 ('s', 'spaces', None, _('separate elements by spaces'))],
1923 ('s', 'spaces', None, _('separate elements by spaces'))],
1924 _('[OPTION]... [FILE [REV]...]'),
1924 _('[OPTION]... [FILE [REV]...]'),
1925 optionalrepo=True)
1925 optionalrepo=True)
1926 def debugdag(ui, repo, file_=None, *revs, **opts):
1926 def debugdag(ui, repo, file_=None, *revs, **opts):
1927 """format the changelog or an index DAG as a concise textual description
1927 """format the changelog or an index DAG as a concise textual description
1928
1928
1929 If you pass a revlog index, the revlog's DAG is emitted. If you list
1929 If you pass a revlog index, the revlog's DAG is emitted. If you list
1930 revision numbers, they get labeled in the output as rN.
1930 revision numbers, they get labeled in the output as rN.
1931
1931
1932 Otherwise, the changelog DAG of the current repo is emitted.
1932 Otherwise, the changelog DAG of the current repo is emitted.
1933 """
1933 """
1934 spaces = opts.get('spaces')
1934 spaces = opts.get('spaces')
1935 dots = opts.get('dots')
1935 dots = opts.get('dots')
1936 if file_:
1936 if file_:
1937 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1937 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1938 revs = set((int(r) for r in revs))
1938 revs = set((int(r) for r in revs))
1939 def events():
1939 def events():
1940 for r in rlog:
1940 for r in rlog:
1941 yield 'n', (r, list(p for p in rlog.parentrevs(r)
1941 yield 'n', (r, list(p for p in rlog.parentrevs(r)
1942 if p != -1))
1942 if p != -1))
1943 if r in revs:
1943 if r in revs:
1944 yield 'l', (r, "r%i" % r)
1944 yield 'l', (r, "r%i" % r)
1945 elif repo:
1945 elif repo:
1946 cl = repo.changelog
1946 cl = repo.changelog
1947 tags = opts.get('tags')
1947 tags = opts.get('tags')
1948 branches = opts.get('branches')
1948 branches = opts.get('branches')
1949 if tags:
1949 if tags:
1950 labels = {}
1950 labels = {}
1951 for l, n in repo.tags().items():
1951 for l, n in repo.tags().items():
1952 labels.setdefault(cl.rev(n), []).append(l)
1952 labels.setdefault(cl.rev(n), []).append(l)
1953 def events():
1953 def events():
1954 b = "default"
1954 b = "default"
1955 for r in cl:
1955 for r in cl:
1956 if branches:
1956 if branches:
1957 newb = cl.read(cl.node(r))[5]['branch']
1957 newb = cl.read(cl.node(r))[5]['branch']
1958 if newb != b:
1958 if newb != b:
1959 yield 'a', newb
1959 yield 'a', newb
1960 b = newb
1960 b = newb
1961 yield 'n', (r, list(p for p in cl.parentrevs(r)
1961 yield 'n', (r, list(p for p in cl.parentrevs(r)
1962 if p != -1))
1962 if p != -1))
1963 if tags:
1963 if tags:
1964 ls = labels.get(r)
1964 ls = labels.get(r)
1965 if ls:
1965 if ls:
1966 for l in ls:
1966 for l in ls:
1967 yield 'l', (r, l)
1967 yield 'l', (r, l)
1968 else:
1968 else:
1969 raise util.Abort(_('need repo for changelog dag'))
1969 raise util.Abort(_('need repo for changelog dag'))
1970
1970
1971 for line in dagparser.dagtextlines(events(),
1971 for line in dagparser.dagtextlines(events(),
1972 addspaces=spaces,
1972 addspaces=spaces,
1973 wraplabels=True,
1973 wraplabels=True,
1974 wrapannotations=True,
1974 wrapannotations=True,
1975 wrapnonlinear=dots,
1975 wrapnonlinear=dots,
1976 usedots=dots,
1976 usedots=dots,
1977 maxlinewidth=70):
1977 maxlinewidth=70):
1978 ui.write(line)
1978 ui.write(line)
1979 ui.write("\n")
1979 ui.write("\n")
1980
1980
1981 @command('debugdata',
1981 @command('debugdata',
1982 [('c', 'changelog', False, _('open changelog')),
1982 [('c', 'changelog', False, _('open changelog')),
1983 ('m', 'manifest', False, _('open manifest'))],
1983 ('m', 'manifest', False, _('open manifest'))],
1984 _('-c|-m|FILE REV'))
1984 _('-c|-m|FILE REV'))
1985 def debugdata(ui, repo, file_, rev=None, **opts):
1985 def debugdata(ui, repo, file_, rev=None, **opts):
1986 """dump the contents of a data file revision"""
1986 """dump the contents of a data file revision"""
1987 if opts.get('changelog') or opts.get('manifest'):
1987 if opts.get('changelog') or opts.get('manifest'):
1988 file_, rev = None, file_
1988 file_, rev = None, file_
1989 elif rev is None:
1989 elif rev is None:
1990 raise error.CommandError('debugdata', _('invalid arguments'))
1990 raise error.CommandError('debugdata', _('invalid arguments'))
1991 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
1991 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
1992 try:
1992 try:
1993 ui.write(r.revision(r.lookup(rev)))
1993 ui.write(r.revision(r.lookup(rev)))
1994 except KeyError:
1994 except KeyError:
1995 raise util.Abort(_('invalid revision identifier %s') % rev)
1995 raise util.Abort(_('invalid revision identifier %s') % rev)
1996
1996
1997 @command('debugdate',
1997 @command('debugdate',
1998 [('e', 'extended', None, _('try extended date formats'))],
1998 [('e', 'extended', None, _('try extended date formats'))],
1999 _('[-e] DATE [RANGE]'),
1999 _('[-e] DATE [RANGE]'),
2000 norepo=True, optionalrepo=True)
2000 norepo=True, optionalrepo=True)
2001 def debugdate(ui, date, range=None, **opts):
2001 def debugdate(ui, date, range=None, **opts):
2002 """parse and display a date"""
2002 """parse and display a date"""
2003 if opts["extended"]:
2003 if opts["extended"]:
2004 d = util.parsedate(date, util.extendeddateformats)
2004 d = util.parsedate(date, util.extendeddateformats)
2005 else:
2005 else:
2006 d = util.parsedate(date)
2006 d = util.parsedate(date)
2007 ui.write(("internal: %s %s\n") % d)
2007 ui.write(("internal: %s %s\n") % d)
2008 ui.write(("standard: %s\n") % util.datestr(d))
2008 ui.write(("standard: %s\n") % util.datestr(d))
2009 if range:
2009 if range:
2010 m = util.matchdate(range)
2010 m = util.matchdate(range)
2011 ui.write(("match: %s\n") % m(d[0]))
2011 ui.write(("match: %s\n") % m(d[0]))
2012
2012
2013 @command('debugdiscovery',
2013 @command('debugdiscovery',
2014 [('', 'old', None, _('use old-style discovery')),
2014 [('', 'old', None, _('use old-style discovery')),
2015 ('', 'nonheads', None,
2015 ('', 'nonheads', None,
2016 _('use old-style discovery with non-heads included')),
2016 _('use old-style discovery with non-heads included')),
2017 ] + remoteopts,
2017 ] + remoteopts,
2018 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
2018 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
2019 def debugdiscovery(ui, repo, remoteurl="default", **opts):
2019 def debugdiscovery(ui, repo, remoteurl="default", **opts):
2020 """runs the changeset discovery protocol in isolation"""
2020 """runs the changeset discovery protocol in isolation"""
2021 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
2021 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
2022 opts.get('branch'))
2022 opts.get('branch'))
2023 remote = hg.peer(repo, opts, remoteurl)
2023 remote = hg.peer(repo, opts, remoteurl)
2024 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
2024 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
2025
2025
2026 # make sure tests are repeatable
2026 # make sure tests are repeatable
2027 random.seed(12323)
2027 random.seed(12323)
2028
2028
2029 def doit(localheads, remoteheads, remote=remote):
2029 def doit(localheads, remoteheads, remote=remote):
2030 if opts.get('old'):
2030 if opts.get('old'):
2031 if localheads:
2031 if localheads:
2032 raise util.Abort('cannot use localheads with old style '
2032 raise util.Abort('cannot use localheads with old style '
2033 'discovery')
2033 'discovery')
2034 if not util.safehasattr(remote, 'branches'):
2034 if not util.safehasattr(remote, 'branches'):
2035 # enable in-client legacy support
2035 # enable in-client legacy support
2036 remote = localrepo.locallegacypeer(remote.local())
2036 remote = localrepo.locallegacypeer(remote.local())
2037 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
2037 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
2038 force=True)
2038 force=True)
2039 common = set(common)
2039 common = set(common)
2040 if not opts.get('nonheads'):
2040 if not opts.get('nonheads'):
2041 ui.write(("unpruned common: %s\n") %
2041 ui.write(("unpruned common: %s\n") %
2042 " ".join(sorted(short(n) for n in common)))
2042 " ".join(sorted(short(n) for n in common)))
2043 dag = dagutil.revlogdag(repo.changelog)
2043 dag = dagutil.revlogdag(repo.changelog)
2044 all = dag.ancestorset(dag.internalizeall(common))
2044 all = dag.ancestorset(dag.internalizeall(common))
2045 common = dag.externalizeall(dag.headsetofconnecteds(all))
2045 common = dag.externalizeall(dag.headsetofconnecteds(all))
2046 else:
2046 else:
2047 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
2047 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
2048 common = set(common)
2048 common = set(common)
2049 rheads = set(hds)
2049 rheads = set(hds)
2050 lheads = set(repo.heads())
2050 lheads = set(repo.heads())
2051 ui.write(("common heads: %s\n") %
2051 ui.write(("common heads: %s\n") %
2052 " ".join(sorted(short(n) for n in common)))
2052 " ".join(sorted(short(n) for n in common)))
2053 if lheads <= common:
2053 if lheads <= common:
2054 ui.write(("local is subset\n"))
2054 ui.write(("local is subset\n"))
2055 elif rheads <= common:
2055 elif rheads <= common:
2056 ui.write(("remote is subset\n"))
2056 ui.write(("remote is subset\n"))
2057
2057
2058 serverlogs = opts.get('serverlog')
2058 serverlogs = opts.get('serverlog')
2059 if serverlogs:
2059 if serverlogs:
2060 for filename in serverlogs:
2060 for filename in serverlogs:
2061 logfile = open(filename, 'r')
2061 logfile = open(filename, 'r')
2062 try:
2062 try:
2063 line = logfile.readline()
2063 line = logfile.readline()
2064 while line:
2064 while line:
2065 parts = line.strip().split(';')
2065 parts = line.strip().split(';')
2066 op = parts[1]
2066 op = parts[1]
2067 if op == 'cg':
2067 if op == 'cg':
2068 pass
2068 pass
2069 elif op == 'cgss':
2069 elif op == 'cgss':
2070 doit(parts[2].split(' '), parts[3].split(' '))
2070 doit(parts[2].split(' '), parts[3].split(' '))
2071 elif op == 'unb':
2071 elif op == 'unb':
2072 doit(parts[3].split(' '), parts[2].split(' '))
2072 doit(parts[3].split(' '), parts[2].split(' '))
2073 line = logfile.readline()
2073 line = logfile.readline()
2074 finally:
2074 finally:
2075 logfile.close()
2075 logfile.close()
2076
2076
2077 else:
2077 else:
2078 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
2078 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
2079 opts.get('remote_head'))
2079 opts.get('remote_head'))
2080 localrevs = opts.get('local_head')
2080 localrevs = opts.get('local_head')
2081 doit(localrevs, remoterevs)
2081 doit(localrevs, remoterevs)
2082
2082
2083 @command('debugfileset',
2083 @command('debugfileset',
2084 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2084 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2085 _('[-r REV] FILESPEC'))
2085 _('[-r REV] FILESPEC'))
2086 def debugfileset(ui, repo, expr, **opts):
2086 def debugfileset(ui, repo, expr, **opts):
2087 '''parse and apply a fileset specification'''
2087 '''parse and apply a fileset specification'''
2088 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2088 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2089 if ui.verbose:
2089 if ui.verbose:
2090 tree = fileset.parse(expr)[0]
2090 tree = fileset.parse(expr)[0]
2091 ui.note(tree, "\n")
2091 ui.note(tree, "\n")
2092
2092
2093 for f in ctx.getfileset(expr):
2093 for f in ctx.getfileset(expr):
2094 ui.write("%s\n" % f)
2094 ui.write("%s\n" % f)
2095
2095
2096 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2096 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2097 def debugfsinfo(ui, path="."):
2097 def debugfsinfo(ui, path="."):
2098 """show information detected about current filesystem"""
2098 """show information detected about current filesystem"""
2099 util.writefile('.debugfsinfo', '')
2099 util.writefile('.debugfsinfo', '')
2100 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
2100 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
2101 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
2101 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
2102 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
2102 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
2103 ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo')
2103 ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo')
2104 and 'yes' or 'no'))
2104 and 'yes' or 'no'))
2105 os.unlink('.debugfsinfo')
2105 os.unlink('.debugfsinfo')
2106
2106
2107 @command('debuggetbundle',
2107 @command('debuggetbundle',
2108 [('H', 'head', [], _('id of head node'), _('ID')),
2108 [('H', 'head', [], _('id of head node'), _('ID')),
2109 ('C', 'common', [], _('id of common node'), _('ID')),
2109 ('C', 'common', [], _('id of common node'), _('ID')),
2110 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2110 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2111 _('REPO FILE [-H|-C ID]...'),
2111 _('REPO FILE [-H|-C ID]...'),
2112 norepo=True)
2112 norepo=True)
2113 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2113 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2114 """retrieves a bundle from a repo
2114 """retrieves a bundle from a repo
2115
2115
2116 Every ID must be a full-length hex node id string. Saves the bundle to the
2116 Every ID must be a full-length hex node id string. Saves the bundle to the
2117 given file.
2117 given file.
2118 """
2118 """
2119 repo = hg.peer(ui, opts, repopath)
2119 repo = hg.peer(ui, opts, repopath)
2120 if not repo.capable('getbundle'):
2120 if not repo.capable('getbundle'):
2121 raise util.Abort("getbundle() not supported by target repository")
2121 raise util.Abort("getbundle() not supported by target repository")
2122 args = {}
2122 args = {}
2123 if common:
2123 if common:
2124 args['common'] = [bin(s) for s in common]
2124 args['common'] = [bin(s) for s in common]
2125 if head:
2125 if head:
2126 args['heads'] = [bin(s) for s in head]
2126 args['heads'] = [bin(s) for s in head]
2127 # TODO: get desired bundlecaps from command line.
2127 # TODO: get desired bundlecaps from command line.
2128 args['bundlecaps'] = None
2128 args['bundlecaps'] = None
2129 bundle = repo.getbundle('debug', **args)
2129 bundle = repo.getbundle('debug', **args)
2130
2130
2131 bundletype = opts.get('type', 'bzip2').lower()
2131 bundletype = opts.get('type', 'bzip2').lower()
2132 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
2132 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
2133 bundletype = btypes.get(bundletype)
2133 bundletype = btypes.get(bundletype)
2134 if bundletype not in changegroup.bundletypes:
2134 if bundletype not in changegroup.bundletypes:
2135 raise util.Abort(_('unknown bundle type specified with --type'))
2135 raise util.Abort(_('unknown bundle type specified with --type'))
2136 changegroup.writebundle(bundle, bundlepath, bundletype)
2136 changegroup.writebundle(bundle, bundlepath, bundletype)
2137
2137
2138 @command('debugignore', [], '')
2138 @command('debugignore', [], '')
2139 def debugignore(ui, repo, *values, **opts):
2139 def debugignore(ui, repo, *values, **opts):
2140 """display the combined ignore pattern"""
2140 """display the combined ignore pattern"""
2141 ignore = repo.dirstate._ignore
2141 ignore = repo.dirstate._ignore
2142 includepat = getattr(ignore, 'includepat', None)
2142 includepat = getattr(ignore, 'includepat', None)
2143 if includepat is not None:
2143 if includepat is not None:
2144 ui.write("%s\n" % includepat)
2144 ui.write("%s\n" % includepat)
2145 else:
2145 else:
2146 raise util.Abort(_("no ignore patterns found"))
2146 raise util.Abort(_("no ignore patterns found"))
2147
2147
2148 @command('debugindex',
2148 @command('debugindex',
2149 [('c', 'changelog', False, _('open changelog')),
2149 [('c', 'changelog', False, _('open changelog')),
2150 ('m', 'manifest', False, _('open manifest')),
2150 ('m', 'manifest', False, _('open manifest')),
2151 ('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2151 ('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2152 _('[-f FORMAT] -c|-m|FILE'),
2152 _('[-f FORMAT] -c|-m|FILE'),
2153 optionalrepo=True)
2153 optionalrepo=True)
2154 def debugindex(ui, repo, file_=None, **opts):
2154 def debugindex(ui, repo, file_=None, **opts):
2155 """dump the contents of an index file"""
2155 """dump the contents of an index file"""
2156 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2156 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2157 format = opts.get('format', 0)
2157 format = opts.get('format', 0)
2158 if format not in (0, 1):
2158 if format not in (0, 1):
2159 raise util.Abort(_("unknown format %d") % format)
2159 raise util.Abort(_("unknown format %d") % format)
2160
2160
2161 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2161 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2162 if generaldelta:
2162 if generaldelta:
2163 basehdr = ' delta'
2163 basehdr = ' delta'
2164 else:
2164 else:
2165 basehdr = ' base'
2165 basehdr = ' base'
2166
2166
2167 if format == 0:
2167 if format == 0:
2168 ui.write(" rev offset length " + basehdr + " linkrev"
2168 ui.write(" rev offset length " + basehdr + " linkrev"
2169 " nodeid p1 p2\n")
2169 " nodeid p1 p2\n")
2170 elif format == 1:
2170 elif format == 1:
2171 ui.write(" rev flag offset length"
2171 ui.write(" rev flag offset length"
2172 " size " + basehdr + " link p1 p2"
2172 " size " + basehdr + " link p1 p2"
2173 " nodeid\n")
2173 " nodeid\n")
2174
2174
2175 for i in r:
2175 for i in r:
2176 node = r.node(i)
2176 node = r.node(i)
2177 if generaldelta:
2177 if generaldelta:
2178 base = r.deltaparent(i)
2178 base = r.deltaparent(i)
2179 else:
2179 else:
2180 base = r.chainbase(i)
2180 base = r.chainbase(i)
2181 if format == 0:
2181 if format == 0:
2182 try:
2182 try:
2183 pp = r.parents(node)
2183 pp = r.parents(node)
2184 except Exception:
2184 except Exception:
2185 pp = [nullid, nullid]
2185 pp = [nullid, nullid]
2186 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2186 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2187 i, r.start(i), r.length(i), base, r.linkrev(i),
2187 i, r.start(i), r.length(i), base, r.linkrev(i),
2188 short(node), short(pp[0]), short(pp[1])))
2188 short(node), short(pp[0]), short(pp[1])))
2189 elif format == 1:
2189 elif format == 1:
2190 pr = r.parentrevs(i)
2190 pr = r.parentrevs(i)
2191 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2191 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2192 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2192 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2193 base, r.linkrev(i), pr[0], pr[1], short(node)))
2193 base, r.linkrev(i), pr[0], pr[1], short(node)))
2194
2194
2195 @command('debugindexdot', [], _('FILE'), optionalrepo=True)
2195 @command('debugindexdot', [], _('FILE'), optionalrepo=True)
2196 def debugindexdot(ui, repo, file_):
2196 def debugindexdot(ui, repo, file_):
2197 """dump an index DAG as a graphviz dot file"""
2197 """dump an index DAG as a graphviz dot file"""
2198 r = None
2198 r = None
2199 if repo:
2199 if repo:
2200 filelog = repo.file(file_)
2200 filelog = repo.file(file_)
2201 if len(filelog):
2201 if len(filelog):
2202 r = filelog
2202 r = filelog
2203 if not r:
2203 if not r:
2204 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
2204 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
2205 ui.write(("digraph G {\n"))
2205 ui.write(("digraph G {\n"))
2206 for i in r:
2206 for i in r:
2207 node = r.node(i)
2207 node = r.node(i)
2208 pp = r.parents(node)
2208 pp = r.parents(node)
2209 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2209 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2210 if pp[1] != nullid:
2210 if pp[1] != nullid:
2211 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2211 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2212 ui.write("}\n")
2212 ui.write("}\n")
2213
2213
2214 @command('debuginstall', [], '', norepo=True)
2214 @command('debuginstall', [], '', norepo=True)
2215 def debuginstall(ui):
2215 def debuginstall(ui):
2216 '''test Mercurial installation
2216 '''test Mercurial installation
2217
2217
2218 Returns 0 on success.
2218 Returns 0 on success.
2219 '''
2219 '''
2220
2220
2221 def writetemp(contents):
2221 def writetemp(contents):
2222 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2222 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2223 f = os.fdopen(fd, "wb")
2223 f = os.fdopen(fd, "wb")
2224 f.write(contents)
2224 f.write(contents)
2225 f.close()
2225 f.close()
2226 return name
2226 return name
2227
2227
2228 problems = 0
2228 problems = 0
2229
2229
2230 # encoding
2230 # encoding
2231 ui.status(_("checking encoding (%s)...\n") % encoding.encoding)
2231 ui.status(_("checking encoding (%s)...\n") % encoding.encoding)
2232 try:
2232 try:
2233 encoding.fromlocal("test")
2233 encoding.fromlocal("test")
2234 except util.Abort, inst:
2234 except util.Abort, inst:
2235 ui.write(" %s\n" % inst)
2235 ui.write(" %s\n" % inst)
2236 ui.write(_(" (check that your locale is properly set)\n"))
2236 ui.write(_(" (check that your locale is properly set)\n"))
2237 problems += 1
2237 problems += 1
2238
2238
2239 # Python
2239 # Python
2240 ui.status(_("checking Python executable (%s)\n") % sys.executable)
2240 ui.status(_("checking Python executable (%s)\n") % sys.executable)
2241 ui.status(_("checking Python version (%s)\n")
2241 ui.status(_("checking Python version (%s)\n")
2242 % ("%s.%s.%s" % sys.version_info[:3]))
2242 % ("%s.%s.%s" % sys.version_info[:3]))
2243 ui.status(_("checking Python lib (%s)...\n")
2243 ui.status(_("checking Python lib (%s)...\n")
2244 % os.path.dirname(os.__file__))
2244 % os.path.dirname(os.__file__))
2245
2245
2246 # compiled modules
2246 # compiled modules
2247 ui.status(_("checking installed modules (%s)...\n")
2247 ui.status(_("checking installed modules (%s)...\n")
2248 % os.path.dirname(__file__))
2248 % os.path.dirname(__file__))
2249 try:
2249 try:
2250 import bdiff, mpatch, base85, osutil
2250 import bdiff, mpatch, base85, osutil
2251 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2251 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2252 except Exception, inst:
2252 except Exception, inst:
2253 ui.write(" %s\n" % inst)
2253 ui.write(" %s\n" % inst)
2254 ui.write(_(" One or more extensions could not be found"))
2254 ui.write(_(" One or more extensions could not be found"))
2255 ui.write(_(" (check that you compiled the extensions)\n"))
2255 ui.write(_(" (check that you compiled the extensions)\n"))
2256 problems += 1
2256 problems += 1
2257
2257
2258 # templates
2258 # templates
2259 import templater
2259 import templater
2260 p = templater.templatepaths()
2260 p = templater.templatepaths()
2261 ui.status(_("checking templates (%s)...\n") % ' '.join(p))
2261 ui.status(_("checking templates (%s)...\n") % ' '.join(p))
2262 if p:
2262 if p:
2263 m = templater.templatepath("map-cmdline.default")
2263 m = templater.templatepath("map-cmdline.default")
2264 if m:
2264 if m:
2265 # template found, check if it is working
2265 # template found, check if it is working
2266 try:
2266 try:
2267 templater.templater(m)
2267 templater.templater(m)
2268 except Exception, inst:
2268 except Exception, inst:
2269 ui.write(" %s\n" % inst)
2269 ui.write(" %s\n" % inst)
2270 p = None
2270 p = None
2271 else:
2271 else:
2272 ui.write(_(" template 'default' not found\n"))
2272 ui.write(_(" template 'default' not found\n"))
2273 p = None
2273 p = None
2274 else:
2274 else:
2275 ui.write(_(" no template directories found\n"))
2275 ui.write(_(" no template directories found\n"))
2276 if not p:
2276 if not p:
2277 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
2277 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
2278 problems += 1
2278 problems += 1
2279
2279
2280 # editor
2280 # editor
2281 ui.status(_("checking commit editor...\n"))
2281 ui.status(_("checking commit editor...\n"))
2282 editor = ui.geteditor()
2282 editor = ui.geteditor()
2283 cmdpath = util.findexe(shlex.split(editor)[0])
2283 cmdpath = util.findexe(shlex.split(editor)[0])
2284 if not cmdpath:
2284 if not cmdpath:
2285 if editor == 'vi':
2285 if editor == 'vi':
2286 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
2286 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
2287 ui.write(_(" (specify a commit editor in your configuration"
2287 ui.write(_(" (specify a commit editor in your configuration"
2288 " file)\n"))
2288 " file)\n"))
2289 else:
2289 else:
2290 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
2290 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
2291 ui.write(_(" (specify a commit editor in your configuration"
2291 ui.write(_(" (specify a commit editor in your configuration"
2292 " file)\n"))
2292 " file)\n"))
2293 problems += 1
2293 problems += 1
2294
2294
2295 # check username
2295 # check username
2296 ui.status(_("checking username...\n"))
2296 ui.status(_("checking username...\n"))
2297 try:
2297 try:
2298 ui.username()
2298 ui.username()
2299 except util.Abort, e:
2299 except util.Abort, e:
2300 ui.write(" %s\n" % e)
2300 ui.write(" %s\n" % e)
2301 ui.write(_(" (specify a username in your configuration file)\n"))
2301 ui.write(_(" (specify a username in your configuration file)\n"))
2302 problems += 1
2302 problems += 1
2303
2303
2304 if not problems:
2304 if not problems:
2305 ui.status(_("no problems detected\n"))
2305 ui.status(_("no problems detected\n"))
2306 else:
2306 else:
2307 ui.write(_("%s problems detected,"
2307 ui.write(_("%s problems detected,"
2308 " please check your install!\n") % problems)
2308 " please check your install!\n") % problems)
2309
2309
2310 return problems
2310 return problems
2311
2311
2312 @command('debugknown', [], _('REPO ID...'), norepo=True)
2312 @command('debugknown', [], _('REPO ID...'), norepo=True)
2313 def debugknown(ui, repopath, *ids, **opts):
2313 def debugknown(ui, repopath, *ids, **opts):
2314 """test whether node ids are known to a repo
2314 """test whether node ids are known to a repo
2315
2315
2316 Every ID must be a full-length hex node id string. Returns a list of 0s
2316 Every ID must be a full-length hex node id string. Returns a list of 0s
2317 and 1s indicating unknown/known.
2317 and 1s indicating unknown/known.
2318 """
2318 """
2319 repo = hg.peer(ui, opts, repopath)
2319 repo = hg.peer(ui, opts, repopath)
2320 if not repo.capable('known'):
2320 if not repo.capable('known'):
2321 raise util.Abort("known() not supported by target repository")
2321 raise util.Abort("known() not supported by target repository")
2322 flags = repo.known([bin(s) for s in ids])
2322 flags = repo.known([bin(s) for s in ids])
2323 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2323 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2324
2324
2325 @command('debuglabelcomplete', [], _('LABEL...'))
2325 @command('debuglabelcomplete', [], _('LABEL...'))
2326 def debuglabelcomplete(ui, repo, *args):
2326 def debuglabelcomplete(ui, repo, *args):
2327 '''complete "labels" - tags, open branch names, bookmark names'''
2327 '''complete "labels" - tags, open branch names, bookmark names'''
2328
2328
2329 labels = set()
2329 labels = set()
2330 labels.update(t[0] for t in repo.tagslist())
2330 labels.update(t[0] for t in repo.tagslist())
2331 labels.update(repo._bookmarks.keys())
2331 labels.update(repo._bookmarks.keys())
2332 labels.update(tag for (tag, heads, tip, closed)
2332 labels.update(tag for (tag, heads, tip, closed)
2333 in repo.branchmap().iterbranches() if not closed)
2333 in repo.branchmap().iterbranches() if not closed)
2334 completions = set()
2334 completions = set()
2335 if not args:
2335 if not args:
2336 args = ['']
2336 args = ['']
2337 for a in args:
2337 for a in args:
2338 completions.update(l for l in labels if l.startswith(a))
2338 completions.update(l for l in labels if l.startswith(a))
2339 ui.write('\n'.join(sorted(completions)))
2339 ui.write('\n'.join(sorted(completions)))
2340 ui.write('\n')
2340 ui.write('\n')
2341
2341
2342 @command('debuglocks',
2342 @command('debuglocks',
2343 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2343 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2344 ('W', 'force-wlock', None,
2344 ('W', 'force-wlock', None,
2345 _('free the working state lock (DANGEROUS)'))],
2345 _('free the working state lock (DANGEROUS)'))],
2346 _(''))
2346 _(''))
2347 def debuglocks(ui, repo, **opts):
2347 def debuglocks(ui, repo, **opts):
2348 """show or modify state of locks
2348 """show or modify state of locks
2349
2349
2350 By default, this command will show which locks are held. This
2350 By default, this command will show which locks are held. This
2351 includes the user and process holding the lock, the amount of time
2351 includes the user and process holding the lock, the amount of time
2352 the lock has been held, and the machine name where the process is
2352 the lock has been held, and the machine name where the process is
2353 running if it's not local.
2353 running if it's not local.
2354
2354
2355 Locks protect the integrity of Mercurial's data, so should be
2355 Locks protect the integrity of Mercurial's data, so should be
2356 treated with care. System crashes or other interruptions may cause
2356 treated with care. System crashes or other interruptions may cause
2357 locks to not be properly released, though Mercurial will usually
2357 locks to not be properly released, though Mercurial will usually
2358 detect and remove such stale locks automatically.
2358 detect and remove such stale locks automatically.
2359
2359
2360 However, detecting stale locks may not always be possible (for
2360 However, detecting stale locks may not always be possible (for
2361 instance, on a shared filesystem). Removing locks may also be
2361 instance, on a shared filesystem). Removing locks may also be
2362 blocked by filesystem permissions.
2362 blocked by filesystem permissions.
2363
2363
2364 Returns 0 if no locks are held.
2364 Returns 0 if no locks are held.
2365
2365
2366 """
2366 """
2367
2367
2368 if opts.get('force_lock'):
2368 if opts.get('force_lock'):
2369 repo.svfs.unlink('lock')
2369 repo.svfs.unlink('lock')
2370 if opts.get('force_wlock'):
2370 if opts.get('force_wlock'):
2371 repo.vfs.unlink('wlock')
2371 repo.vfs.unlink('wlock')
2372 if opts.get('force_lock') or opts.get('force_lock'):
2372 if opts.get('force_lock') or opts.get('force_lock'):
2373 return 0
2373 return 0
2374
2374
2375 now = time.time()
2375 now = time.time()
2376 held = 0
2376 held = 0
2377
2377
2378 def report(vfs, name, method):
2378 def report(vfs, name, method):
2379 # this causes stale locks to get reaped for more accurate reporting
2379 # this causes stale locks to get reaped for more accurate reporting
2380 try:
2380 try:
2381 l = method(False)
2381 l = method(False)
2382 except error.LockHeld:
2382 except error.LockHeld:
2383 l = None
2383 l = None
2384
2384
2385 if l:
2385 if l:
2386 l.release()
2386 l.release()
2387 else:
2387 else:
2388 try:
2388 try:
2389 stat = repo.svfs.lstat(name)
2389 stat = repo.svfs.lstat(name)
2390 age = now - stat.st_mtime
2390 age = now - stat.st_mtime
2391 user = util.username(stat.st_uid)
2391 user = util.username(stat.st_uid)
2392 locker = vfs.readlock(name)
2392 locker = vfs.readlock(name)
2393 if ":" in locker:
2393 if ":" in locker:
2394 host, pid = locker.split(':')
2394 host, pid = locker.split(':')
2395 if host == socket.gethostname():
2395 if host == socket.gethostname():
2396 locker = 'user %s, process %s' % (user, pid)
2396 locker = 'user %s, process %s' % (user, pid)
2397 else:
2397 else:
2398 locker = 'user %s, process %s, host %s' \
2398 locker = 'user %s, process %s, host %s' \
2399 % (user, pid, host)
2399 % (user, pid, host)
2400 ui.write("%-6s %s (%ds)\n" % (name + ":", locker, age))
2400 ui.write("%-6s %s (%ds)\n" % (name + ":", locker, age))
2401 return 1
2401 return 1
2402 except OSError, e:
2402 except OSError, e:
2403 if e.errno != errno.ENOENT:
2403 if e.errno != errno.ENOENT:
2404 raise
2404 raise
2405
2405
2406 ui.write("%-6s free\n" % (name + ":"))
2406 ui.write("%-6s free\n" % (name + ":"))
2407 return 0
2407 return 0
2408
2408
2409 held += report(repo.svfs, "lock", repo.lock)
2409 held += report(repo.svfs, "lock", repo.lock)
2410 held += report(repo.vfs, "wlock", repo.wlock)
2410 held += report(repo.vfs, "wlock", repo.wlock)
2411
2411
2412 return held
2412 return held
2413
2413
2414 @command('debugobsolete',
2414 @command('debugobsolete',
2415 [('', 'flags', 0, _('markers flag')),
2415 [('', 'flags', 0, _('markers flag')),
2416 ('', 'record-parents', False,
2416 ('', 'record-parents', False,
2417 _('record parent information for the precursor')),
2417 _('record parent information for the precursor')),
2418 ('r', 'rev', [], _('display markers relevant to REV')),
2418 ('r', 'rev', [], _('display markers relevant to REV')),
2419 ] + commitopts2,
2419 ] + commitopts2,
2420 _('[OBSOLETED [REPLACEMENT] [REPL... ]'))
2420 _('[OBSOLETED [REPLACEMENT] [REPL... ]'))
2421 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
2421 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
2422 """create arbitrary obsolete marker
2422 """create arbitrary obsolete marker
2423
2423
2424 With no arguments, displays the list of obsolescence markers."""
2424 With no arguments, displays the list of obsolescence markers."""
2425
2425
2426 def parsenodeid(s):
2426 def parsenodeid(s):
2427 try:
2427 try:
2428 # We do not use revsingle/revrange functions here to accept
2428 # We do not use revsingle/revrange functions here to accept
2429 # arbitrary node identifiers, possibly not present in the
2429 # arbitrary node identifiers, possibly not present in the
2430 # local repository.
2430 # local repository.
2431 n = bin(s)
2431 n = bin(s)
2432 if len(n) != len(nullid):
2432 if len(n) != len(nullid):
2433 raise TypeError()
2433 raise TypeError()
2434 return n
2434 return n
2435 except TypeError:
2435 except TypeError:
2436 raise util.Abort('changeset references must be full hexadecimal '
2436 raise util.Abort('changeset references must be full hexadecimal '
2437 'node identifiers')
2437 'node identifiers')
2438
2438
2439 if precursor is not None:
2439 if precursor is not None:
2440 if opts['rev']:
2440 if opts['rev']:
2441 raise util.Abort('cannot select revision when creating marker')
2441 raise util.Abort('cannot select revision when creating marker')
2442 metadata = {}
2442 metadata = {}
2443 metadata['user'] = opts['user'] or ui.username()
2443 metadata['user'] = opts['user'] or ui.username()
2444 succs = tuple(parsenodeid(succ) for succ in successors)
2444 succs = tuple(parsenodeid(succ) for succ in successors)
2445 l = repo.lock()
2445 l = repo.lock()
2446 try:
2446 try:
2447 tr = repo.transaction('debugobsolete')
2447 tr = repo.transaction('debugobsolete')
2448 try:
2448 try:
2449 try:
2449 try:
2450 date = opts.get('date')
2450 date = opts.get('date')
2451 if date:
2451 if date:
2452 date = util.parsedate(date)
2452 date = util.parsedate(date)
2453 else:
2453 else:
2454 date = None
2454 date = None
2455 prec = parsenodeid(precursor)
2455 prec = parsenodeid(precursor)
2456 parents = None
2456 parents = None
2457 if opts['record_parents']:
2457 if opts['record_parents']:
2458 if prec not in repo.unfiltered():
2458 if prec not in repo.unfiltered():
2459 raise util.Abort('cannot used --record-parents on '
2459 raise util.Abort('cannot used --record-parents on '
2460 'unknown changesets')
2460 'unknown changesets')
2461 parents = repo.unfiltered()[prec].parents()
2461 parents = repo.unfiltered()[prec].parents()
2462 parents = tuple(p.node() for p in parents)
2462 parents = tuple(p.node() for p in parents)
2463 repo.obsstore.create(tr, prec, succs, opts['flags'],
2463 repo.obsstore.create(tr, prec, succs, opts['flags'],
2464 parents=parents, date=date,
2464 parents=parents, date=date,
2465 metadata=metadata)
2465 metadata=metadata)
2466 tr.close()
2466 tr.close()
2467 except ValueError, exc:
2467 except ValueError, exc:
2468 raise util.Abort(_('bad obsmarker input: %s') % exc)
2468 raise util.Abort(_('bad obsmarker input: %s') % exc)
2469 finally:
2469 finally:
2470 tr.release()
2470 tr.release()
2471 finally:
2471 finally:
2472 l.release()
2472 l.release()
2473 else:
2473 else:
2474 if opts['rev']:
2474 if opts['rev']:
2475 revs = scmutil.revrange(repo, opts['rev'])
2475 revs = scmutil.revrange(repo, opts['rev'])
2476 nodes = [repo[r].node() for r in revs]
2476 nodes = [repo[r].node() for r in revs]
2477 markers = list(obsolete.getmarkers(repo, nodes=nodes))
2477 markers = list(obsolete.getmarkers(repo, nodes=nodes))
2478 markers.sort(key=lambda x: x._data)
2478 markers.sort(key=lambda x: x._data)
2479 else:
2479 else:
2480 markers = obsolete.getmarkers(repo)
2480 markers = obsolete.getmarkers(repo)
2481
2481
2482 for m in markers:
2482 for m in markers:
2483 cmdutil.showmarker(ui, m)
2483 cmdutil.showmarker(ui, m)
2484
2484
2485 @command('debugpathcomplete',
2485 @command('debugpathcomplete',
2486 [('f', 'full', None, _('complete an entire path')),
2486 [('f', 'full', None, _('complete an entire path')),
2487 ('n', 'normal', None, _('show only normal files')),
2487 ('n', 'normal', None, _('show only normal files')),
2488 ('a', 'added', None, _('show only added files')),
2488 ('a', 'added', None, _('show only added files')),
2489 ('r', 'removed', None, _('show only removed files'))],
2489 ('r', 'removed', None, _('show only removed files'))],
2490 _('FILESPEC...'))
2490 _('FILESPEC...'))
2491 def debugpathcomplete(ui, repo, *specs, **opts):
2491 def debugpathcomplete(ui, repo, *specs, **opts):
2492 '''complete part or all of a tracked path
2492 '''complete part or all of a tracked path
2493
2493
2494 This command supports shells that offer path name completion. It
2494 This command supports shells that offer path name completion. It
2495 currently completes only files already known to the dirstate.
2495 currently completes only files already known to the dirstate.
2496
2496
2497 Completion extends only to the next path segment unless
2497 Completion extends only to the next path segment unless
2498 --full is specified, in which case entire paths are used.'''
2498 --full is specified, in which case entire paths are used.'''
2499
2499
2500 def complete(path, acceptable):
2500 def complete(path, acceptable):
2501 dirstate = repo.dirstate
2501 dirstate = repo.dirstate
2502 spec = os.path.normpath(os.path.join(os.getcwd(), path))
2502 spec = os.path.normpath(os.path.join(os.getcwd(), path))
2503 rootdir = repo.root + os.sep
2503 rootdir = repo.root + os.sep
2504 if spec != repo.root and not spec.startswith(rootdir):
2504 if spec != repo.root and not spec.startswith(rootdir):
2505 return [], []
2505 return [], []
2506 if os.path.isdir(spec):
2506 if os.path.isdir(spec):
2507 spec += '/'
2507 spec += '/'
2508 spec = spec[len(rootdir):]
2508 spec = spec[len(rootdir):]
2509 fixpaths = os.sep != '/'
2509 fixpaths = os.sep != '/'
2510 if fixpaths:
2510 if fixpaths:
2511 spec = spec.replace(os.sep, '/')
2511 spec = spec.replace(os.sep, '/')
2512 speclen = len(spec)
2512 speclen = len(spec)
2513 fullpaths = opts['full']
2513 fullpaths = opts['full']
2514 files, dirs = set(), set()
2514 files, dirs = set(), set()
2515 adddir, addfile = dirs.add, files.add
2515 adddir, addfile = dirs.add, files.add
2516 for f, st in dirstate.iteritems():
2516 for f, st in dirstate.iteritems():
2517 if f.startswith(spec) and st[0] in acceptable:
2517 if f.startswith(spec) and st[0] in acceptable:
2518 if fixpaths:
2518 if fixpaths:
2519 f = f.replace('/', os.sep)
2519 f = f.replace('/', os.sep)
2520 if fullpaths:
2520 if fullpaths:
2521 addfile(f)
2521 addfile(f)
2522 continue
2522 continue
2523 s = f.find(os.sep, speclen)
2523 s = f.find(os.sep, speclen)
2524 if s >= 0:
2524 if s >= 0:
2525 adddir(f[:s])
2525 adddir(f[:s])
2526 else:
2526 else:
2527 addfile(f)
2527 addfile(f)
2528 return files, dirs
2528 return files, dirs
2529
2529
2530 acceptable = ''
2530 acceptable = ''
2531 if opts['normal']:
2531 if opts['normal']:
2532 acceptable += 'nm'
2532 acceptable += 'nm'
2533 if opts['added']:
2533 if opts['added']:
2534 acceptable += 'a'
2534 acceptable += 'a'
2535 if opts['removed']:
2535 if opts['removed']:
2536 acceptable += 'r'
2536 acceptable += 'r'
2537 cwd = repo.getcwd()
2537 cwd = repo.getcwd()
2538 if not specs:
2538 if not specs:
2539 specs = ['.']
2539 specs = ['.']
2540
2540
2541 files, dirs = set(), set()
2541 files, dirs = set(), set()
2542 for spec in specs:
2542 for spec in specs:
2543 f, d = complete(spec, acceptable or 'nmar')
2543 f, d = complete(spec, acceptable or 'nmar')
2544 files.update(f)
2544 files.update(f)
2545 dirs.update(d)
2545 dirs.update(d)
2546 files.update(dirs)
2546 files.update(dirs)
2547 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
2547 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
2548 ui.write('\n')
2548 ui.write('\n')
2549
2549
2550 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
2550 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
2551 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
2551 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
2552 '''access the pushkey key/value protocol
2552 '''access the pushkey key/value protocol
2553
2553
2554 With two args, list the keys in the given namespace.
2554 With two args, list the keys in the given namespace.
2555
2555
2556 With five args, set a key to new if it currently is set to old.
2556 With five args, set a key to new if it currently is set to old.
2557 Reports success or failure.
2557 Reports success or failure.
2558 '''
2558 '''
2559
2559
2560 target = hg.peer(ui, {}, repopath)
2560 target = hg.peer(ui, {}, repopath)
2561 if keyinfo:
2561 if keyinfo:
2562 key, old, new = keyinfo
2562 key, old, new = keyinfo
2563 r = target.pushkey(namespace, key, old, new)
2563 r = target.pushkey(namespace, key, old, new)
2564 ui.status(str(r) + '\n')
2564 ui.status(str(r) + '\n')
2565 return not r
2565 return not r
2566 else:
2566 else:
2567 for k, v in sorted(target.listkeys(namespace).iteritems()):
2567 for k, v in sorted(target.listkeys(namespace).iteritems()):
2568 ui.write("%s\t%s\n" % (k.encode('string-escape'),
2568 ui.write("%s\t%s\n" % (k.encode('string-escape'),
2569 v.encode('string-escape')))
2569 v.encode('string-escape')))
2570
2570
2571 @command('debugpvec', [], _('A B'))
2571 @command('debugpvec', [], _('A B'))
2572 def debugpvec(ui, repo, a, b=None):
2572 def debugpvec(ui, repo, a, b=None):
2573 ca = scmutil.revsingle(repo, a)
2573 ca = scmutil.revsingle(repo, a)
2574 cb = scmutil.revsingle(repo, b)
2574 cb = scmutil.revsingle(repo, b)
2575 pa = pvec.ctxpvec(ca)
2575 pa = pvec.ctxpvec(ca)
2576 pb = pvec.ctxpvec(cb)
2576 pb = pvec.ctxpvec(cb)
2577 if pa == pb:
2577 if pa == pb:
2578 rel = "="
2578 rel = "="
2579 elif pa > pb:
2579 elif pa > pb:
2580 rel = ">"
2580 rel = ">"
2581 elif pa < pb:
2581 elif pa < pb:
2582 rel = "<"
2582 rel = "<"
2583 elif pa | pb:
2583 elif pa | pb:
2584 rel = "|"
2584 rel = "|"
2585 ui.write(_("a: %s\n") % pa)
2585 ui.write(_("a: %s\n") % pa)
2586 ui.write(_("b: %s\n") % pb)
2586 ui.write(_("b: %s\n") % pb)
2587 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
2587 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
2588 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
2588 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
2589 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
2589 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
2590 pa.distance(pb), rel))
2590 pa.distance(pb), rel))
2591
2591
2592 @command('debugrebuilddirstate|debugrebuildstate',
2592 @command('debugrebuilddirstate|debugrebuildstate',
2593 [('r', 'rev', '', _('revision to rebuild to'), _('REV'))],
2593 [('r', 'rev', '', _('revision to rebuild to'), _('REV'))],
2594 _('[-r REV]'))
2594 _('[-r REV]'))
2595 def debugrebuilddirstate(ui, repo, rev):
2595 def debugrebuilddirstate(ui, repo, rev):
2596 """rebuild the dirstate as it would look like for the given revision
2596 """rebuild the dirstate as it would look like for the given revision
2597
2597
2598 If no revision is specified the first current parent will be used.
2598 If no revision is specified the first current parent will be used.
2599
2599
2600 The dirstate will be set to the files of the given revision.
2600 The dirstate will be set to the files of the given revision.
2601 The actual working directory content or existing dirstate
2601 The actual working directory content or existing dirstate
2602 information such as adds or removes is not considered.
2602 information such as adds or removes is not considered.
2603
2603
2604 One use of this command is to make the next :hg:`status` invocation
2604 One use of this command is to make the next :hg:`status` invocation
2605 check the actual file content.
2605 check the actual file content.
2606 """
2606 """
2607 ctx = scmutil.revsingle(repo, rev)
2607 ctx = scmutil.revsingle(repo, rev)
2608 wlock = repo.wlock()
2608 wlock = repo.wlock()
2609 try:
2609 try:
2610 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
2610 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
2611 finally:
2611 finally:
2612 wlock.release()
2612 wlock.release()
2613
2613
2614 @command('debugrename',
2614 @command('debugrename',
2615 [('r', 'rev', '', _('revision to debug'), _('REV'))],
2615 [('r', 'rev', '', _('revision to debug'), _('REV'))],
2616 _('[-r REV] FILE'))
2616 _('[-r REV] FILE'))
2617 def debugrename(ui, repo, file1, *pats, **opts):
2617 def debugrename(ui, repo, file1, *pats, **opts):
2618 """dump rename information"""
2618 """dump rename information"""
2619
2619
2620 ctx = scmutil.revsingle(repo, opts.get('rev'))
2620 ctx = scmutil.revsingle(repo, opts.get('rev'))
2621 m = scmutil.match(ctx, (file1,) + pats, opts)
2621 m = scmutil.match(ctx, (file1,) + pats, opts)
2622 for abs in ctx.walk(m):
2622 for abs in ctx.walk(m):
2623 fctx = ctx[abs]
2623 fctx = ctx[abs]
2624 o = fctx.filelog().renamed(fctx.filenode())
2624 o = fctx.filelog().renamed(fctx.filenode())
2625 rel = m.rel(abs)
2625 rel = m.rel(abs)
2626 if o:
2626 if o:
2627 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
2627 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
2628 else:
2628 else:
2629 ui.write(_("%s not renamed\n") % rel)
2629 ui.write(_("%s not renamed\n") % rel)
2630
2630
2631 @command('debugrevlog',
2631 @command('debugrevlog',
2632 [('c', 'changelog', False, _('open changelog')),
2632 [('c', 'changelog', False, _('open changelog')),
2633 ('m', 'manifest', False, _('open manifest')),
2633 ('m', 'manifest', False, _('open manifest')),
2634 ('d', 'dump', False, _('dump index data'))],
2634 ('d', 'dump', False, _('dump index data'))],
2635 _('-c|-m|FILE'),
2635 _('-c|-m|FILE'),
2636 optionalrepo=True)
2636 optionalrepo=True)
2637 def debugrevlog(ui, repo, file_=None, **opts):
2637 def debugrevlog(ui, repo, file_=None, **opts):
2638 """show data and statistics about a revlog"""
2638 """show data and statistics about a revlog"""
2639 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
2639 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
2640
2640
2641 if opts.get("dump"):
2641 if opts.get("dump"):
2642 numrevs = len(r)
2642 numrevs = len(r)
2643 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
2643 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
2644 " rawsize totalsize compression heads chainlen\n")
2644 " rawsize totalsize compression heads chainlen\n")
2645 ts = 0
2645 ts = 0
2646 heads = set()
2646 heads = set()
2647 rindex = r.index
2647 rindex = r.index
2648
2648
2649 def chainbaseandlen(rev):
2649 def chainbaseandlen(rev):
2650 clen = 0
2650 clen = 0
2651 base = rindex[rev][3]
2651 base = rindex[rev][3]
2652 while base != rev:
2652 while base != rev:
2653 clen += 1
2653 clen += 1
2654 rev = base
2654 rev = base
2655 base = rindex[rev][3]
2655 base = rindex[rev][3]
2656 return base, clen
2656 return base, clen
2657
2657
2658 for rev in xrange(numrevs):
2658 for rev in xrange(numrevs):
2659 dbase = r.deltaparent(rev)
2659 dbase = r.deltaparent(rev)
2660 if dbase == -1:
2660 if dbase == -1:
2661 dbase = rev
2661 dbase = rev
2662 cbase, clen = chainbaseandlen(rev)
2662 cbase, clen = chainbaseandlen(rev)
2663 p1, p2 = r.parentrevs(rev)
2663 p1, p2 = r.parentrevs(rev)
2664 rs = r.rawsize(rev)
2664 rs = r.rawsize(rev)
2665 ts = ts + rs
2665 ts = ts + rs
2666 heads -= set(r.parentrevs(rev))
2666 heads -= set(r.parentrevs(rev))
2667 heads.add(rev)
2667 heads.add(rev)
2668 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
2668 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
2669 "%11d %5d %8d\n" %
2669 "%11d %5d %8d\n" %
2670 (rev, p1, p2, r.start(rev), r.end(rev),
2670 (rev, p1, p2, r.start(rev), r.end(rev),
2671 r.start(dbase), r.start(cbase),
2671 r.start(dbase), r.start(cbase),
2672 r.start(p1), r.start(p2),
2672 r.start(p1), r.start(p2),
2673 rs, ts, ts / r.end(rev), len(heads), clen))
2673 rs, ts, ts / r.end(rev), len(heads), clen))
2674 return 0
2674 return 0
2675
2675
2676 v = r.version
2676 v = r.version
2677 format = v & 0xFFFF
2677 format = v & 0xFFFF
2678 flags = []
2678 flags = []
2679 gdelta = False
2679 gdelta = False
2680 if v & revlog.REVLOGNGINLINEDATA:
2680 if v & revlog.REVLOGNGINLINEDATA:
2681 flags.append('inline')
2681 flags.append('inline')
2682 if v & revlog.REVLOGGENERALDELTA:
2682 if v & revlog.REVLOGGENERALDELTA:
2683 gdelta = True
2683 gdelta = True
2684 flags.append('generaldelta')
2684 flags.append('generaldelta')
2685 if not flags:
2685 if not flags:
2686 flags = ['(none)']
2686 flags = ['(none)']
2687
2687
2688 nummerges = 0
2688 nummerges = 0
2689 numfull = 0
2689 numfull = 0
2690 numprev = 0
2690 numprev = 0
2691 nump1 = 0
2691 nump1 = 0
2692 nump2 = 0
2692 nump2 = 0
2693 numother = 0
2693 numother = 0
2694 nump1prev = 0
2694 nump1prev = 0
2695 nump2prev = 0
2695 nump2prev = 0
2696 chainlengths = []
2696 chainlengths = []
2697
2697
2698 datasize = [None, 0, 0L]
2698 datasize = [None, 0, 0L]
2699 fullsize = [None, 0, 0L]
2699 fullsize = [None, 0, 0L]
2700 deltasize = [None, 0, 0L]
2700 deltasize = [None, 0, 0L]
2701
2701
2702 def addsize(size, l):
2702 def addsize(size, l):
2703 if l[0] is None or size < l[0]:
2703 if l[0] is None or size < l[0]:
2704 l[0] = size
2704 l[0] = size
2705 if size > l[1]:
2705 if size > l[1]:
2706 l[1] = size
2706 l[1] = size
2707 l[2] += size
2707 l[2] += size
2708
2708
2709 numrevs = len(r)
2709 numrevs = len(r)
2710 for rev in xrange(numrevs):
2710 for rev in xrange(numrevs):
2711 p1, p2 = r.parentrevs(rev)
2711 p1, p2 = r.parentrevs(rev)
2712 delta = r.deltaparent(rev)
2712 delta = r.deltaparent(rev)
2713 if format > 0:
2713 if format > 0:
2714 addsize(r.rawsize(rev), datasize)
2714 addsize(r.rawsize(rev), datasize)
2715 if p2 != nullrev:
2715 if p2 != nullrev:
2716 nummerges += 1
2716 nummerges += 1
2717 size = r.length(rev)
2717 size = r.length(rev)
2718 if delta == nullrev:
2718 if delta == nullrev:
2719 chainlengths.append(0)
2719 chainlengths.append(0)
2720 numfull += 1
2720 numfull += 1
2721 addsize(size, fullsize)
2721 addsize(size, fullsize)
2722 else:
2722 else:
2723 chainlengths.append(chainlengths[delta] + 1)
2723 chainlengths.append(chainlengths[delta] + 1)
2724 addsize(size, deltasize)
2724 addsize(size, deltasize)
2725 if delta == rev - 1:
2725 if delta == rev - 1:
2726 numprev += 1
2726 numprev += 1
2727 if delta == p1:
2727 if delta == p1:
2728 nump1prev += 1
2728 nump1prev += 1
2729 elif delta == p2:
2729 elif delta == p2:
2730 nump2prev += 1
2730 nump2prev += 1
2731 elif delta == p1:
2731 elif delta == p1:
2732 nump1 += 1
2732 nump1 += 1
2733 elif delta == p2:
2733 elif delta == p2:
2734 nump2 += 1
2734 nump2 += 1
2735 elif delta != nullrev:
2735 elif delta != nullrev:
2736 numother += 1
2736 numother += 1
2737
2737
2738 # Adjust size min value for empty cases
2738 # Adjust size min value for empty cases
2739 for size in (datasize, fullsize, deltasize):
2739 for size in (datasize, fullsize, deltasize):
2740 if size[0] is None:
2740 if size[0] is None:
2741 size[0] = 0
2741 size[0] = 0
2742
2742
2743 numdeltas = numrevs - numfull
2743 numdeltas = numrevs - numfull
2744 numoprev = numprev - nump1prev - nump2prev
2744 numoprev = numprev - nump1prev - nump2prev
2745 totalrawsize = datasize[2]
2745 totalrawsize = datasize[2]
2746 datasize[2] /= numrevs
2746 datasize[2] /= numrevs
2747 fulltotal = fullsize[2]
2747 fulltotal = fullsize[2]
2748 fullsize[2] /= numfull
2748 fullsize[2] /= numfull
2749 deltatotal = deltasize[2]
2749 deltatotal = deltasize[2]
2750 if numrevs - numfull > 0:
2750 if numrevs - numfull > 0:
2751 deltasize[2] /= numrevs - numfull
2751 deltasize[2] /= numrevs - numfull
2752 totalsize = fulltotal + deltatotal
2752 totalsize = fulltotal + deltatotal
2753 avgchainlen = sum(chainlengths) / numrevs
2753 avgchainlen = sum(chainlengths) / numrevs
2754 compratio = totalrawsize / totalsize
2754 compratio = totalrawsize / totalsize
2755
2755
2756 basedfmtstr = '%%%dd\n'
2756 basedfmtstr = '%%%dd\n'
2757 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2757 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2758
2758
2759 def dfmtstr(max):
2759 def dfmtstr(max):
2760 return basedfmtstr % len(str(max))
2760 return basedfmtstr % len(str(max))
2761 def pcfmtstr(max, padding=0):
2761 def pcfmtstr(max, padding=0):
2762 return basepcfmtstr % (len(str(max)), ' ' * padding)
2762 return basepcfmtstr % (len(str(max)), ' ' * padding)
2763
2763
2764 def pcfmt(value, total):
2764 def pcfmt(value, total):
2765 return (value, 100 * float(value) / total)
2765 return (value, 100 * float(value) / total)
2766
2766
2767 ui.write(('format : %d\n') % format)
2767 ui.write(('format : %d\n') % format)
2768 ui.write(('flags : %s\n') % ', '.join(flags))
2768 ui.write(('flags : %s\n') % ', '.join(flags))
2769
2769
2770 ui.write('\n')
2770 ui.write('\n')
2771 fmt = pcfmtstr(totalsize)
2771 fmt = pcfmtstr(totalsize)
2772 fmt2 = dfmtstr(totalsize)
2772 fmt2 = dfmtstr(totalsize)
2773 ui.write(('revisions : ') + fmt2 % numrevs)
2773 ui.write(('revisions : ') + fmt2 % numrevs)
2774 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
2774 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
2775 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
2775 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
2776 ui.write(('revisions : ') + fmt2 % numrevs)
2776 ui.write(('revisions : ') + fmt2 % numrevs)
2777 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
2777 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
2778 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
2778 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
2779 ui.write(('revision size : ') + fmt2 % totalsize)
2779 ui.write(('revision size : ') + fmt2 % totalsize)
2780 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
2780 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
2781 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
2781 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
2782
2782
2783 ui.write('\n')
2783 ui.write('\n')
2784 fmt = dfmtstr(max(avgchainlen, compratio))
2784 fmt = dfmtstr(max(avgchainlen, compratio))
2785 ui.write(('avg chain length : ') + fmt % avgchainlen)
2785 ui.write(('avg chain length : ') + fmt % avgchainlen)
2786 ui.write(('compression ratio : ') + fmt % compratio)
2786 ui.write(('compression ratio : ') + fmt % compratio)
2787
2787
2788 if format > 0:
2788 if format > 0:
2789 ui.write('\n')
2789 ui.write('\n')
2790 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
2790 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
2791 % tuple(datasize))
2791 % tuple(datasize))
2792 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
2792 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
2793 % tuple(fullsize))
2793 % tuple(fullsize))
2794 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
2794 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
2795 % tuple(deltasize))
2795 % tuple(deltasize))
2796
2796
2797 if numdeltas > 0:
2797 if numdeltas > 0:
2798 ui.write('\n')
2798 ui.write('\n')
2799 fmt = pcfmtstr(numdeltas)
2799 fmt = pcfmtstr(numdeltas)
2800 fmt2 = pcfmtstr(numdeltas, 4)
2800 fmt2 = pcfmtstr(numdeltas, 4)
2801 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
2801 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
2802 if numprev > 0:
2802 if numprev > 0:
2803 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
2803 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
2804 numprev))
2804 numprev))
2805 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
2805 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
2806 numprev))
2806 numprev))
2807 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
2807 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
2808 numprev))
2808 numprev))
2809 if gdelta:
2809 if gdelta:
2810 ui.write(('deltas against p1 : ')
2810 ui.write(('deltas against p1 : ')
2811 + fmt % pcfmt(nump1, numdeltas))
2811 + fmt % pcfmt(nump1, numdeltas))
2812 ui.write(('deltas against p2 : ')
2812 ui.write(('deltas against p2 : ')
2813 + fmt % pcfmt(nump2, numdeltas))
2813 + fmt % pcfmt(nump2, numdeltas))
2814 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
2814 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
2815 numdeltas))
2815 numdeltas))
2816
2816
2817 @command('debugrevspec',
2817 @command('debugrevspec',
2818 [('', 'optimize', None, _('print parsed tree after optimizing'))],
2818 [('', 'optimize', None, _('print parsed tree after optimizing'))],
2819 ('REVSPEC'))
2819 ('REVSPEC'))
2820 def debugrevspec(ui, repo, expr, **opts):
2820 def debugrevspec(ui, repo, expr, **opts):
2821 """parse and apply a revision specification
2821 """parse and apply a revision specification
2822
2822
2823 Use --verbose to print the parsed tree before and after aliases
2823 Use --verbose to print the parsed tree before and after aliases
2824 expansion.
2824 expansion.
2825 """
2825 """
2826 if ui.verbose:
2826 if ui.verbose:
2827 tree = revset.parse(expr)[0]
2827 tree = revset.parse(expr)[0]
2828 ui.note(revset.prettyformat(tree), "\n")
2828 ui.note(revset.prettyformat(tree), "\n")
2829 newtree = revset.findaliases(ui, tree)
2829 newtree = revset.findaliases(ui, tree)
2830 if newtree != tree:
2830 if newtree != tree:
2831 ui.note(revset.prettyformat(newtree), "\n")
2831 ui.note(revset.prettyformat(newtree), "\n")
2832 if opts["optimize"]:
2832 if opts["optimize"]:
2833 weight, optimizedtree = revset.optimize(newtree, True)
2833 weight, optimizedtree = revset.optimize(newtree, True)
2834 ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n")
2834 ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n")
2835 func = revset.match(ui, expr)
2835 func = revset.match(ui, expr)
2836 for c in func(repo, revset.spanset(repo)):
2836 for c in func(repo, revset.spanset(repo)):
2837 ui.write("%s\n" % c)
2837 ui.write("%s\n" % c)
2838
2838
2839 @command('debugsetparents', [], _('REV1 [REV2]'))
2839 @command('debugsetparents', [], _('REV1 [REV2]'))
2840 def debugsetparents(ui, repo, rev1, rev2=None):
2840 def debugsetparents(ui, repo, rev1, rev2=None):
2841 """manually set the parents of the current working directory
2841 """manually set the parents of the current working directory
2842
2842
2843 This is useful for writing repository conversion tools, but should
2843 This is useful for writing repository conversion tools, but should
2844 be used with care.
2844 be used with care.
2845
2845
2846 Returns 0 on success.
2846 Returns 0 on success.
2847 """
2847 """
2848
2848
2849 r1 = scmutil.revsingle(repo, rev1).node()
2849 r1 = scmutil.revsingle(repo, rev1).node()
2850 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2850 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2851
2851
2852 wlock = repo.wlock()
2852 wlock = repo.wlock()
2853 try:
2853 try:
2854 repo.dirstate.beginparentchange()
2854 repo.dirstate.beginparentchange()
2855 repo.setparents(r1, r2)
2855 repo.setparents(r1, r2)
2856 repo.dirstate.endparentchange()
2856 repo.dirstate.endparentchange()
2857 finally:
2857 finally:
2858 wlock.release()
2858 wlock.release()
2859
2859
2860 @command('debugdirstate|debugstate',
2860 @command('debugdirstate|debugstate',
2861 [('', 'nodates', None, _('do not display the saved mtime')),
2861 [('', 'nodates', None, _('do not display the saved mtime')),
2862 ('', 'datesort', None, _('sort by saved mtime'))],
2862 ('', 'datesort', None, _('sort by saved mtime'))],
2863 _('[OPTION]...'))
2863 _('[OPTION]...'))
2864 def debugstate(ui, repo, nodates=None, datesort=None):
2864 def debugstate(ui, repo, nodates=None, datesort=None):
2865 """show the contents of the current dirstate"""
2865 """show the contents of the current dirstate"""
2866 timestr = ""
2866 timestr = ""
2867 showdate = not nodates
2867 showdate = not nodates
2868 if datesort:
2868 if datesort:
2869 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
2869 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
2870 else:
2870 else:
2871 keyfunc = None # sort by filename
2871 keyfunc = None # sort by filename
2872 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
2872 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
2873 if showdate:
2873 if showdate:
2874 if ent[3] == -1:
2874 if ent[3] == -1:
2875 # Pad or slice to locale representation
2875 # Pad or slice to locale representation
2876 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
2876 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
2877 time.localtime(0)))
2877 time.localtime(0)))
2878 timestr = 'unset'
2878 timestr = 'unset'
2879 timestr = (timestr[:locale_len] +
2879 timestr = (timestr[:locale_len] +
2880 ' ' * (locale_len - len(timestr)))
2880 ' ' * (locale_len - len(timestr)))
2881 else:
2881 else:
2882 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
2882 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
2883 time.localtime(ent[3]))
2883 time.localtime(ent[3]))
2884 if ent[1] & 020000:
2884 if ent[1] & 020000:
2885 mode = 'lnk'
2885 mode = 'lnk'
2886 else:
2886 else:
2887 mode = '%3o' % (ent[1] & 0777 & ~util.umask)
2887 mode = '%3o' % (ent[1] & 0777 & ~util.umask)
2888 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
2888 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
2889 for f in repo.dirstate.copies():
2889 for f in repo.dirstate.copies():
2890 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
2890 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
2891
2891
2892 @command('debugsub',
2892 @command('debugsub',
2893 [('r', 'rev', '',
2893 [('r', 'rev', '',
2894 _('revision to check'), _('REV'))],
2894 _('revision to check'), _('REV'))],
2895 _('[-r REV] [REV]'))
2895 _('[-r REV] [REV]'))
2896 def debugsub(ui, repo, rev=None):
2896 def debugsub(ui, repo, rev=None):
2897 ctx = scmutil.revsingle(repo, rev, None)
2897 ctx = scmutil.revsingle(repo, rev, None)
2898 for k, v in sorted(ctx.substate.items()):
2898 for k, v in sorted(ctx.substate.items()):
2899 ui.write(('path %s\n') % k)
2899 ui.write(('path %s\n') % k)
2900 ui.write((' source %s\n') % v[0])
2900 ui.write((' source %s\n') % v[0])
2901 ui.write((' revision %s\n') % v[1])
2901 ui.write((' revision %s\n') % v[1])
2902
2902
2903 @command('debugsuccessorssets',
2903 @command('debugsuccessorssets',
2904 [],
2904 [],
2905 _('[REV]'))
2905 _('[REV]'))
2906 def debugsuccessorssets(ui, repo, *revs):
2906 def debugsuccessorssets(ui, repo, *revs):
2907 """show set of successors for revision
2907 """show set of successors for revision
2908
2908
2909 A successors set of changeset A is a consistent group of revisions that
2909 A successors set of changeset A is a consistent group of revisions that
2910 succeed A. It contains non-obsolete changesets only.
2910 succeed A. It contains non-obsolete changesets only.
2911
2911
2912 In most cases a changeset A has a single successors set containing a single
2912 In most cases a changeset A has a single successors set containing a single
2913 successor (changeset A replaced by A').
2913 successor (changeset A replaced by A').
2914
2914
2915 A changeset that is made obsolete with no successors are called "pruned".
2915 A changeset that is made obsolete with no successors are called "pruned".
2916 Such changesets have no successors sets at all.
2916 Such changesets have no successors sets at all.
2917
2917
2918 A changeset that has been "split" will have a successors set containing
2918 A changeset that has been "split" will have a successors set containing
2919 more than one successor.
2919 more than one successor.
2920
2920
2921 A changeset that has been rewritten in multiple different ways is called
2921 A changeset that has been rewritten in multiple different ways is called
2922 "divergent". Such changesets have multiple successor sets (each of which
2922 "divergent". Such changesets have multiple successor sets (each of which
2923 may also be split, i.e. have multiple successors).
2923 may also be split, i.e. have multiple successors).
2924
2924
2925 Results are displayed as follows::
2925 Results are displayed as follows::
2926
2926
2927 <rev1>
2927 <rev1>
2928 <successors-1A>
2928 <successors-1A>
2929 <rev2>
2929 <rev2>
2930 <successors-2A>
2930 <successors-2A>
2931 <successors-2B1> <successors-2B2> <successors-2B3>
2931 <successors-2B1> <successors-2B2> <successors-2B3>
2932
2932
2933 Here rev2 has two possible (i.e. divergent) successors sets. The first
2933 Here rev2 has two possible (i.e. divergent) successors sets. The first
2934 holds one element, whereas the second holds three (i.e. the changeset has
2934 holds one element, whereas the second holds three (i.e. the changeset has
2935 been split).
2935 been split).
2936 """
2936 """
2937 # passed to successorssets caching computation from one call to another
2937 # passed to successorssets caching computation from one call to another
2938 cache = {}
2938 cache = {}
2939 ctx2str = str
2939 ctx2str = str
2940 node2str = short
2940 node2str = short
2941 if ui.debug():
2941 if ui.debug():
2942 def ctx2str(ctx):
2942 def ctx2str(ctx):
2943 return ctx.hex()
2943 return ctx.hex()
2944 node2str = hex
2944 node2str = hex
2945 for rev in scmutil.revrange(repo, revs):
2945 for rev in scmutil.revrange(repo, revs):
2946 ctx = repo[rev]
2946 ctx = repo[rev]
2947 ui.write('%s\n'% ctx2str(ctx))
2947 ui.write('%s\n'% ctx2str(ctx))
2948 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
2948 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
2949 if succsset:
2949 if succsset:
2950 ui.write(' ')
2950 ui.write(' ')
2951 ui.write(node2str(succsset[0]))
2951 ui.write(node2str(succsset[0]))
2952 for node in succsset[1:]:
2952 for node in succsset[1:]:
2953 ui.write(' ')
2953 ui.write(' ')
2954 ui.write(node2str(node))
2954 ui.write(node2str(node))
2955 ui.write('\n')
2955 ui.write('\n')
2956
2956
2957 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
2957 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
2958 def debugwalk(ui, repo, *pats, **opts):
2958 def debugwalk(ui, repo, *pats, **opts):
2959 """show how files match on given patterns"""
2959 """show how files match on given patterns"""
2960 m = scmutil.match(repo[None], pats, opts)
2960 m = scmutil.match(repo[None], pats, opts)
2961 items = list(repo.walk(m))
2961 items = list(repo.walk(m))
2962 if not items:
2962 if not items:
2963 return
2963 return
2964 f = lambda fn: fn
2964 f = lambda fn: fn
2965 if ui.configbool('ui', 'slash') and os.sep != '/':
2965 if ui.configbool('ui', 'slash') and os.sep != '/':
2966 f = lambda fn: util.normpath(fn)
2966 f = lambda fn: util.normpath(fn)
2967 fmt = 'f %%-%ds %%-%ds %%s' % (
2967 fmt = 'f %%-%ds %%-%ds %%s' % (
2968 max([len(abs) for abs in items]),
2968 max([len(abs) for abs in items]),
2969 max([len(m.rel(abs)) for abs in items]))
2969 max([len(m.rel(abs)) for abs in items]))
2970 for abs in items:
2970 for abs in items:
2971 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
2971 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
2972 ui.write("%s\n" % line.rstrip())
2972 ui.write("%s\n" % line.rstrip())
2973
2973
2974 @command('debugwireargs',
2974 @command('debugwireargs',
2975 [('', 'three', '', 'three'),
2975 [('', 'three', '', 'three'),
2976 ('', 'four', '', 'four'),
2976 ('', 'four', '', 'four'),
2977 ('', 'five', '', 'five'),
2977 ('', 'five', '', 'five'),
2978 ] + remoteopts,
2978 ] + remoteopts,
2979 _('REPO [OPTIONS]... [ONE [TWO]]'),
2979 _('REPO [OPTIONS]... [ONE [TWO]]'),
2980 norepo=True)
2980 norepo=True)
2981 def debugwireargs(ui, repopath, *vals, **opts):
2981 def debugwireargs(ui, repopath, *vals, **opts):
2982 repo = hg.peer(ui, opts, repopath)
2982 repo = hg.peer(ui, opts, repopath)
2983 for opt in remoteopts:
2983 for opt in remoteopts:
2984 del opts[opt[1]]
2984 del opts[opt[1]]
2985 args = {}
2985 args = {}
2986 for k, v in opts.iteritems():
2986 for k, v in opts.iteritems():
2987 if v:
2987 if v:
2988 args[k] = v
2988 args[k] = v
2989 # run twice to check that we don't mess up the stream for the next command
2989 # run twice to check that we don't mess up the stream for the next command
2990 res1 = repo.debugwireargs(*vals, **args)
2990 res1 = repo.debugwireargs(*vals, **args)
2991 res2 = repo.debugwireargs(*vals, **args)
2991 res2 = repo.debugwireargs(*vals, **args)
2992 ui.write("%s\n" % res1)
2992 ui.write("%s\n" % res1)
2993 if res1 != res2:
2993 if res1 != res2:
2994 ui.warn("%s\n" % res2)
2994 ui.warn("%s\n" % res2)
2995
2995
2996 @command('^diff',
2996 @command('^diff',
2997 [('r', 'rev', [], _('revision'), _('REV')),
2997 [('r', 'rev', [], _('revision'), _('REV')),
2998 ('c', 'change', '', _('change made by revision'), _('REV'))
2998 ('c', 'change', '', _('change made by revision'), _('REV'))
2999 ] + diffopts + diffopts2 + walkopts + subrepoopts,
2999 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3000 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3000 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3001 inferrepo=True)
3001 inferrepo=True)
3002 def diff(ui, repo, *pats, **opts):
3002 def diff(ui, repo, *pats, **opts):
3003 """diff repository (or selected files)
3003 """diff repository (or selected files)
3004
3004
3005 Show differences between revisions for the specified files.
3005 Show differences between revisions for the specified files.
3006
3006
3007 Differences between files are shown using the unified diff format.
3007 Differences between files are shown using the unified diff format.
3008
3008
3009 .. note::
3009 .. note::
3010
3010
3011 diff may generate unexpected results for merges, as it will
3011 diff may generate unexpected results for merges, as it will
3012 default to comparing against the working directory's first
3012 default to comparing against the working directory's first
3013 parent changeset if no revisions are specified.
3013 parent changeset if no revisions are specified.
3014
3014
3015 When two revision arguments are given, then changes are shown
3015 When two revision arguments are given, then changes are shown
3016 between those revisions. If only one revision is specified then
3016 between those revisions. If only one revision is specified then
3017 that revision is compared to the working directory, and, when no
3017 that revision is compared to the working directory, and, when no
3018 revisions are specified, the working directory files are compared
3018 revisions are specified, the working directory files are compared
3019 to its parent.
3019 to its parent.
3020
3020
3021 Alternatively you can specify -c/--change with a revision to see
3021 Alternatively you can specify -c/--change with a revision to see
3022 the changes in that changeset relative to its first parent.
3022 the changes in that changeset relative to its first parent.
3023
3023
3024 Without the -a/--text option, diff will avoid generating diffs of
3024 Without the -a/--text option, diff will avoid generating diffs of
3025 files it detects as binary. With -a, diff will generate a diff
3025 files it detects as binary. With -a, diff will generate a diff
3026 anyway, probably with undesirable results.
3026 anyway, probably with undesirable results.
3027
3027
3028 Use the -g/--git option to generate diffs in the git extended diff
3028 Use the -g/--git option to generate diffs in the git extended diff
3029 format. For more information, read :hg:`help diffs`.
3029 format. For more information, read :hg:`help diffs`.
3030
3030
3031 .. container:: verbose
3031 .. container:: verbose
3032
3032
3033 Examples:
3033 Examples:
3034
3034
3035 - compare a file in the current working directory to its parent::
3035 - compare a file in the current working directory to its parent::
3036
3036
3037 hg diff foo.c
3037 hg diff foo.c
3038
3038
3039 - compare two historical versions of a directory, with rename info::
3039 - compare two historical versions of a directory, with rename info::
3040
3040
3041 hg diff --git -r 1.0:1.2 lib/
3041 hg diff --git -r 1.0:1.2 lib/
3042
3042
3043 - get change stats relative to the last change on some date::
3043 - get change stats relative to the last change on some date::
3044
3044
3045 hg diff --stat -r "date('may 2')"
3045 hg diff --stat -r "date('may 2')"
3046
3046
3047 - diff all newly-added files that contain a keyword::
3047 - diff all newly-added files that contain a keyword::
3048
3048
3049 hg diff "set:added() and grep(GNU)"
3049 hg diff "set:added() and grep(GNU)"
3050
3050
3051 - compare a revision and its parents::
3051 - compare a revision and its parents::
3052
3052
3053 hg diff -c 9353 # compare against first parent
3053 hg diff -c 9353 # compare against first parent
3054 hg diff -r 9353^:9353 # same using revset syntax
3054 hg diff -r 9353^:9353 # same using revset syntax
3055 hg diff -r 9353^2:9353 # compare against the second parent
3055 hg diff -r 9353^2:9353 # compare against the second parent
3056
3056
3057 Returns 0 on success.
3057 Returns 0 on success.
3058 """
3058 """
3059
3059
3060 revs = opts.get('rev')
3060 revs = opts.get('rev')
3061 change = opts.get('change')
3061 change = opts.get('change')
3062 stat = opts.get('stat')
3062 stat = opts.get('stat')
3063 reverse = opts.get('reverse')
3063 reverse = opts.get('reverse')
3064
3064
3065 if revs and change:
3065 if revs and change:
3066 msg = _('cannot specify --rev and --change at the same time')
3066 msg = _('cannot specify --rev and --change at the same time')
3067 raise util.Abort(msg)
3067 raise util.Abort(msg)
3068 elif change:
3068 elif change:
3069 node2 = scmutil.revsingle(repo, change, None).node()
3069 node2 = scmutil.revsingle(repo, change, None).node()
3070 node1 = repo[node2].p1().node()
3070 node1 = repo[node2].p1().node()
3071 else:
3071 else:
3072 node1, node2 = scmutil.revpair(repo, revs)
3072 node1, node2 = scmutil.revpair(repo, revs)
3073
3073
3074 if reverse:
3074 if reverse:
3075 node1, node2 = node2, node1
3075 node1, node2 = node2, node1
3076
3076
3077 diffopts = patch.diffopts(ui, opts)
3077 diffopts = patch.diffopts(ui, opts)
3078 m = scmutil.match(repo[node2], pats, opts)
3078 m = scmutil.match(repo[node2], pats, opts)
3079 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3079 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3080 listsubrepos=opts.get('subrepos'))
3080 listsubrepos=opts.get('subrepos'))
3081
3081
3082 @command('^export',
3082 @command('^export',
3083 [('o', 'output', '',
3083 [('o', 'output', '',
3084 _('print output to file with formatted name'), _('FORMAT')),
3084 _('print output to file with formatted name'), _('FORMAT')),
3085 ('', 'switch-parent', None, _('diff against the second parent')),
3085 ('', 'switch-parent', None, _('diff against the second parent')),
3086 ('r', 'rev', [], _('revisions to export'), _('REV')),
3086 ('r', 'rev', [], _('revisions to export'), _('REV')),
3087 ] + diffopts,
3087 ] + diffopts,
3088 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3088 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3089 def export(ui, repo, *changesets, **opts):
3089 def export(ui, repo, *changesets, **opts):
3090 """dump the header and diffs for one or more changesets
3090 """dump the header and diffs for one or more changesets
3091
3091
3092 Print the changeset header and diffs for one or more revisions.
3092 Print the changeset header and diffs for one or more revisions.
3093 If no revision is given, the parent of the working directory is used.
3093 If no revision is given, the parent of the working directory is used.
3094
3094
3095 The information shown in the changeset header is: author, date,
3095 The information shown in the changeset header is: author, date,
3096 branch name (if non-default), changeset hash, parent(s) and commit
3096 branch name (if non-default), changeset hash, parent(s) and commit
3097 comment.
3097 comment.
3098
3098
3099 .. note::
3099 .. note::
3100
3100
3101 export may generate unexpected diff output for merge
3101 export may generate unexpected diff output for merge
3102 changesets, as it will compare the merge changeset against its
3102 changesets, as it will compare the merge changeset against its
3103 first parent only.
3103 first parent only.
3104
3104
3105 Output may be to a file, in which case the name of the file is
3105 Output may be to a file, in which case the name of the file is
3106 given using a format string. The formatting rules are as follows:
3106 given using a format string. The formatting rules are as follows:
3107
3107
3108 :``%%``: literal "%" character
3108 :``%%``: literal "%" character
3109 :``%H``: changeset hash (40 hexadecimal digits)
3109 :``%H``: changeset hash (40 hexadecimal digits)
3110 :``%N``: number of patches being generated
3110 :``%N``: number of patches being generated
3111 :``%R``: changeset revision number
3111 :``%R``: changeset revision number
3112 :``%b``: basename of the exporting repository
3112 :``%b``: basename of the exporting repository
3113 :``%h``: short-form changeset hash (12 hexadecimal digits)
3113 :``%h``: short-form changeset hash (12 hexadecimal digits)
3114 :``%m``: first line of the commit message (only alphanumeric characters)
3114 :``%m``: first line of the commit message (only alphanumeric characters)
3115 :``%n``: zero-padded sequence number, starting at 1
3115 :``%n``: zero-padded sequence number, starting at 1
3116 :``%r``: zero-padded changeset revision number
3116 :``%r``: zero-padded changeset revision number
3117
3117
3118 Without the -a/--text option, export will avoid generating diffs
3118 Without the -a/--text option, export will avoid generating diffs
3119 of files it detects as binary. With -a, export will generate a
3119 of files it detects as binary. With -a, export will generate a
3120 diff anyway, probably with undesirable results.
3120 diff anyway, probably with undesirable results.
3121
3121
3122 Use the -g/--git option to generate diffs in the git extended diff
3122 Use the -g/--git option to generate diffs in the git extended diff
3123 format. See :hg:`help diffs` for more information.
3123 format. See :hg:`help diffs` for more information.
3124
3124
3125 With the --switch-parent option, the diff will be against the
3125 With the --switch-parent option, the diff will be against the
3126 second parent. It can be useful to review a merge.
3126 second parent. It can be useful to review a merge.
3127
3127
3128 .. container:: verbose
3128 .. container:: verbose
3129
3129
3130 Examples:
3130 Examples:
3131
3131
3132 - use export and import to transplant a bugfix to the current
3132 - use export and import to transplant a bugfix to the current
3133 branch::
3133 branch::
3134
3134
3135 hg export -r 9353 | hg import -
3135 hg export -r 9353 | hg import -
3136
3136
3137 - export all the changesets between two revisions to a file with
3137 - export all the changesets between two revisions to a file with
3138 rename information::
3138 rename information::
3139
3139
3140 hg export --git -r 123:150 > changes.txt
3140 hg export --git -r 123:150 > changes.txt
3141
3141
3142 - split outgoing changes into a series of patches with
3142 - split outgoing changes into a series of patches with
3143 descriptive names::
3143 descriptive names::
3144
3144
3145 hg export -r "outgoing()" -o "%n-%m.patch"
3145 hg export -r "outgoing()" -o "%n-%m.patch"
3146
3146
3147 Returns 0 on success.
3147 Returns 0 on success.
3148 """
3148 """
3149 changesets += tuple(opts.get('rev', []))
3149 changesets += tuple(opts.get('rev', []))
3150 if not changesets:
3150 if not changesets:
3151 changesets = ['.']
3151 changesets = ['.']
3152 revs = scmutil.revrange(repo, changesets)
3152 revs = scmutil.revrange(repo, changesets)
3153 if not revs:
3153 if not revs:
3154 raise util.Abort(_("export requires at least one changeset"))
3154 raise util.Abort(_("export requires at least one changeset"))
3155 if len(revs) > 1:
3155 if len(revs) > 1:
3156 ui.note(_('exporting patches:\n'))
3156 ui.note(_('exporting patches:\n'))
3157 else:
3157 else:
3158 ui.note(_('exporting patch:\n'))
3158 ui.note(_('exporting patch:\n'))
3159 cmdutil.export(repo, revs, template=opts.get('output'),
3159 cmdutil.export(repo, revs, template=opts.get('output'),
3160 switch_parent=opts.get('switch_parent'),
3160 switch_parent=opts.get('switch_parent'),
3161 opts=patch.diffopts(ui, opts))
3161 opts=patch.diffopts(ui, opts))
3162
3162
3163 @command('files',
3163 @command('files',
3164 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3164 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3165 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3165 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3166 ] + walkopts + formatteropts,
3166 ] + walkopts + formatteropts,
3167 _('[OPTION]... [PATTERN]...'))
3167 _('[OPTION]... [PATTERN]...'))
3168 def files(ui, repo, *pats, **opts):
3168 def files(ui, repo, *pats, **opts):
3169 """list tracked files
3169 """list tracked files
3170
3170
3171 Print files under Mercurial control in the working directory or
3171 Print files under Mercurial control in the working directory or
3172 specified revision whose names match the given patterns (excluding
3172 specified revision whose names match the given patterns (excluding
3173 removed files).
3173 removed files).
3174
3174
3175 If no patterns are given to match, this command prints the names
3175 If no patterns are given to match, this command prints the names
3176 of all files under Mercurial control in the working copy.
3176 of all files under Mercurial control in the working copy.
3177
3177
3178 .. container:: verbose
3178 .. container:: verbose
3179
3179
3180 Examples:
3180 Examples:
3181
3181
3182 - list all files under the current directory::
3182 - list all files under the current directory::
3183
3183
3184 hg files .
3184 hg files .
3185
3185
3186 - shows sizes and flags for current revision::
3186 - shows sizes and flags for current revision::
3187
3187
3188 hg files -vr .
3188 hg files -vr .
3189
3189
3190 - list all files named README::
3190 - list all files named README::
3191
3191
3192 hg files -I "**/README"
3192 hg files -I "**/README"
3193
3193
3194 - list all binary files::
3194 - list all binary files::
3195
3195
3196 hg files "set:binary()"
3196 hg files "set:binary()"
3197
3197
3198 - find files containing a regular expression:
3198 - find files containing a regular expression:
3199
3199
3200 hg files "set:grep('bob')"
3200 hg files "set:grep('bob')"
3201
3201
3202 - search tracked file contents with xargs and grep::
3202 - search tracked file contents with xargs and grep::
3203
3203
3204 hg files -0 | xargs -0 grep foo
3204 hg files -0 | xargs -0 grep foo
3205
3205
3206 See :hg:'help pattern' and :hg:'help revsets' for more information
3206 See :hg:'help pattern' and :hg:'help revsets' for more information
3207 on specifying file patterns.
3207 on specifying file patterns.
3208
3208
3209 Returns 0 if a match is found, 1 otherwise.
3209 Returns 0 if a match is found, 1 otherwise.
3210
3210
3211 """
3211 """
3212 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3212 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3213 rev = ctx.rev()
3213 rev = ctx.rev()
3214 ret = 1
3214 ret = 1
3215
3215
3216 end = '\n'
3216 end = '\n'
3217 if opts.get('print0'):
3217 if opts.get('print0'):
3218 end = '\0'
3218 end = '\0'
3219 fm = ui.formatter('files', opts)
3219 fm = ui.formatter('files', opts)
3220 fmt = '%s' + end
3220 fmt = '%s' + end
3221
3221
3222 m = scmutil.match(ctx, pats, opts)
3222 m = scmutil.match(ctx, pats, opts)
3223 ds = repo.dirstate
3223 ds = repo.dirstate
3224 for f in ctx.matches(m):
3224 for f in ctx.matches(m):
3225 if rev is None and ds[f] == 'r':
3225 if rev is None and ds[f] == 'r':
3226 continue
3226 continue
3227 fm.startitem()
3227 fm.startitem()
3228 if ui.verbose:
3228 if ui.verbose:
3229 fc = ctx[f]
3229 fc = ctx[f]
3230 fm.write('size flags', '% 10d % 1s ', fc.size(), fc.flags())
3230 fm.write('size flags', '% 10d % 1s ', fc.size(), fc.flags())
3231 fm.data(abspath=f)
3231 fm.data(abspath=f)
3232 fm.write('path', fmt, m.rel(f))
3232 fm.write('path', fmt, m.rel(f))
3233 ret = 0
3233 ret = 0
3234
3234
3235 fm.end()
3235 fm.end()
3236
3236
3237 return ret
3237 return ret
3238
3238
3239 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3239 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3240 def forget(ui, repo, *pats, **opts):
3240 def forget(ui, repo, *pats, **opts):
3241 """forget the specified files on the next commit
3241 """forget the specified files on the next commit
3242
3242
3243 Mark the specified files so they will no longer be tracked
3243 Mark the specified files so they will no longer be tracked
3244 after the next commit.
3244 after the next commit.
3245
3245
3246 This only removes files from the current branch, not from the
3246 This only removes files from the current branch, not from the
3247 entire project history, and it does not delete them from the
3247 entire project history, and it does not delete them from the
3248 working directory.
3248 working directory.
3249
3249
3250 To undo a forget before the next commit, see :hg:`add`.
3250 To undo a forget before the next commit, see :hg:`add`.
3251
3251
3252 .. container:: verbose
3252 .. container:: verbose
3253
3253
3254 Examples:
3254 Examples:
3255
3255
3256 - forget newly-added binary files::
3256 - forget newly-added binary files::
3257
3257
3258 hg forget "set:added() and binary()"
3258 hg forget "set:added() and binary()"
3259
3259
3260 - forget files that would be excluded by .hgignore::
3260 - forget files that would be excluded by .hgignore::
3261
3261
3262 hg forget "set:hgignore()"
3262 hg forget "set:hgignore()"
3263
3263
3264 Returns 0 on success.
3264 Returns 0 on success.
3265 """
3265 """
3266
3266
3267 if not pats:
3267 if not pats:
3268 raise util.Abort(_('no files specified'))
3268 raise util.Abort(_('no files specified'))
3269
3269
3270 m = scmutil.match(repo[None], pats, opts)
3270 m = scmutil.match(repo[None], pats, opts)
3271 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
3271 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
3272 return rejected and 1 or 0
3272 return rejected and 1 or 0
3273
3273
3274 @command(
3274 @command(
3275 'graft',
3275 'graft',
3276 [('r', 'rev', [], _('revisions to graft'), _('REV')),
3276 [('r', 'rev', [], _('revisions to graft'), _('REV')),
3277 ('c', 'continue', False, _('resume interrupted graft')),
3277 ('c', 'continue', False, _('resume interrupted graft')),
3278 ('e', 'edit', False, _('invoke editor on commit messages')),
3278 ('e', 'edit', False, _('invoke editor on commit messages')),
3279 ('', 'log', None, _('append graft info to log message')),
3279 ('', 'log', None, _('append graft info to log message')),
3280 ('f', 'force', False, _('force graft')),
3280 ('f', 'force', False, _('force graft')),
3281 ('D', 'currentdate', False,
3281 ('D', 'currentdate', False,
3282 _('record the current date as commit date')),
3282 _('record the current date as commit date')),
3283 ('U', 'currentuser', False,
3283 ('U', 'currentuser', False,
3284 _('record the current user as committer'), _('DATE'))]
3284 _('record the current user as committer'), _('DATE'))]
3285 + commitopts2 + mergetoolopts + dryrunopts,
3285 + commitopts2 + mergetoolopts + dryrunopts,
3286 _('[OPTION]... [-r] REV...'))
3286 _('[OPTION]... [-r] REV...'))
3287 def graft(ui, repo, *revs, **opts):
3287 def graft(ui, repo, *revs, **opts):
3288 '''copy changes from other branches onto the current branch
3288 '''copy changes from other branches onto the current branch
3289
3289
3290 This command uses Mercurial's merge logic to copy individual
3290 This command uses Mercurial's merge logic to copy individual
3291 changes from other branches without merging branches in the
3291 changes from other branches without merging branches in the
3292 history graph. This is sometimes known as 'backporting' or
3292 history graph. This is sometimes known as 'backporting' or
3293 'cherry-picking'. By default, graft will copy user, date, and
3293 'cherry-picking'. By default, graft will copy user, date, and
3294 description from the source changesets.
3294 description from the source changesets.
3295
3295
3296 Changesets that are ancestors of the current revision, that have
3296 Changesets that are ancestors of the current revision, that have
3297 already been grafted, or that are merges will be skipped.
3297 already been grafted, or that are merges will be skipped.
3298
3298
3299 If --log is specified, log messages will have a comment appended
3299 If --log is specified, log messages will have a comment appended
3300 of the form::
3300 of the form::
3301
3301
3302 (grafted from CHANGESETHASH)
3302 (grafted from CHANGESETHASH)
3303
3303
3304 If --force is specified, revisions will be grafted even if they
3304 If --force is specified, revisions will be grafted even if they
3305 are already ancestors of or have been grafted to the destination.
3305 are already ancestors of or have been grafted to the destination.
3306 This is useful when the revisions have since been backed out.
3306 This is useful when the revisions have since been backed out.
3307
3307
3308 If a graft merge results in conflicts, the graft process is
3308 If a graft merge results in conflicts, the graft process is
3309 interrupted so that the current merge can be manually resolved.
3309 interrupted so that the current merge can be manually resolved.
3310 Once all conflicts are addressed, the graft process can be
3310 Once all conflicts are addressed, the graft process can be
3311 continued with the -c/--continue option.
3311 continued with the -c/--continue option.
3312
3312
3313 .. note::
3313 .. note::
3314
3314
3315 The -c/--continue option does not reapply earlier options, except
3315 The -c/--continue option does not reapply earlier options, except
3316 for --force.
3316 for --force.
3317
3317
3318 .. container:: verbose
3318 .. container:: verbose
3319
3319
3320 Examples:
3320 Examples:
3321
3321
3322 - copy a single change to the stable branch and edit its description::
3322 - copy a single change to the stable branch and edit its description::
3323
3323
3324 hg update stable
3324 hg update stable
3325 hg graft --edit 9393
3325 hg graft --edit 9393
3326
3326
3327 - graft a range of changesets with one exception, updating dates::
3327 - graft a range of changesets with one exception, updating dates::
3328
3328
3329 hg graft -D "2085::2093 and not 2091"
3329 hg graft -D "2085::2093 and not 2091"
3330
3330
3331 - continue a graft after resolving conflicts::
3331 - continue a graft after resolving conflicts::
3332
3332
3333 hg graft -c
3333 hg graft -c
3334
3334
3335 - show the source of a grafted changeset::
3335 - show the source of a grafted changeset::
3336
3336
3337 hg log --debug -r .
3337 hg log --debug -r .
3338
3338
3339 See :hg:`help revisions` and :hg:`help revsets` for more about
3339 See :hg:`help revisions` and :hg:`help revsets` for more about
3340 specifying revisions.
3340 specifying revisions.
3341
3341
3342 Returns 0 on successful completion.
3342 Returns 0 on successful completion.
3343 '''
3343 '''
3344
3344
3345 revs = list(revs)
3345 revs = list(revs)
3346 revs.extend(opts['rev'])
3346 revs.extend(opts['rev'])
3347
3347
3348 if not opts.get('user') and opts.get('currentuser'):
3348 if not opts.get('user') and opts.get('currentuser'):
3349 opts['user'] = ui.username()
3349 opts['user'] = ui.username()
3350 if not opts.get('date') and opts.get('currentdate'):
3350 if not opts.get('date') and opts.get('currentdate'):
3351 opts['date'] = "%d %d" % util.makedate()
3351 opts['date'] = "%d %d" % util.makedate()
3352
3352
3353 editor = cmdutil.getcommiteditor(editform='graft', **opts)
3353 editor = cmdutil.getcommiteditor(editform='graft', **opts)
3354
3354
3355 cont = False
3355 cont = False
3356 if opts['continue']:
3356 if opts['continue']:
3357 cont = True
3357 cont = True
3358 if revs:
3358 if revs:
3359 raise util.Abort(_("can't specify --continue and revisions"))
3359 raise util.Abort(_("can't specify --continue and revisions"))
3360 # read in unfinished revisions
3360 # read in unfinished revisions
3361 try:
3361 try:
3362 nodes = repo.opener.read('graftstate').splitlines()
3362 nodes = repo.opener.read('graftstate').splitlines()
3363 revs = [repo[node].rev() for node in nodes]
3363 revs = [repo[node].rev() for node in nodes]
3364 except IOError, inst:
3364 except IOError, inst:
3365 if inst.errno != errno.ENOENT:
3365 if inst.errno != errno.ENOENT:
3366 raise
3366 raise
3367 raise util.Abort(_("no graft state found, can't continue"))
3367 raise util.Abort(_("no graft state found, can't continue"))
3368 else:
3368 else:
3369 cmdutil.checkunfinished(repo)
3369 cmdutil.checkunfinished(repo)
3370 cmdutil.bailifchanged(repo)
3370 cmdutil.bailifchanged(repo)
3371 if not revs:
3371 if not revs:
3372 raise util.Abort(_('no revisions specified'))
3372 raise util.Abort(_('no revisions specified'))
3373 revs = scmutil.revrange(repo, revs)
3373 revs = scmutil.revrange(repo, revs)
3374
3374
3375 # check for merges
3375 # check for merges
3376 for rev in repo.revs('%ld and merge()', revs):
3376 for rev in repo.revs('%ld and merge()', revs):
3377 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
3377 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
3378 revs.remove(rev)
3378 revs.remove(rev)
3379 if not revs:
3379 if not revs:
3380 return -1
3380 return -1
3381
3381
3382 # Don't check in the --continue case, in effect retaining --force across
3382 # Don't check in the --continue case, in effect retaining --force across
3383 # --continues. That's because without --force, any revisions we decided to
3383 # --continues. That's because without --force, any revisions we decided to
3384 # skip would have been filtered out here, so they wouldn't have made their
3384 # skip would have been filtered out here, so they wouldn't have made their
3385 # way to the graftstate. With --force, any revisions we would have otherwise
3385 # way to the graftstate. With --force, any revisions we would have otherwise
3386 # skipped would not have been filtered out, and if they hadn't been applied
3386 # skipped would not have been filtered out, and if they hadn't been applied
3387 # already, they'd have been in the graftstate.
3387 # already, they'd have been in the graftstate.
3388 if not (cont or opts.get('force')):
3388 if not (cont or opts.get('force')):
3389 # check for ancestors of dest branch
3389 # check for ancestors of dest branch
3390 crev = repo['.'].rev()
3390 crev = repo['.'].rev()
3391 ancestors = repo.changelog.ancestors([crev], inclusive=True)
3391 ancestors = repo.changelog.ancestors([crev], inclusive=True)
3392 # Cannot use x.remove(y) on smart set, this has to be a list.
3392 # Cannot use x.remove(y) on smart set, this has to be a list.
3393 # XXX make this lazy in the future
3393 # XXX make this lazy in the future
3394 revs = list(revs)
3394 revs = list(revs)
3395 # don't mutate while iterating, create a copy
3395 # don't mutate while iterating, create a copy
3396 for rev in list(revs):
3396 for rev in list(revs):
3397 if rev in ancestors:
3397 if rev in ancestors:
3398 ui.warn(_('skipping ancestor revision %s\n') % rev)
3398 ui.warn(_('skipping ancestor revision %s\n') % rev)
3399 # XXX remove on list is slow
3399 # XXX remove on list is slow
3400 revs.remove(rev)
3400 revs.remove(rev)
3401 if not revs:
3401 if not revs:
3402 return -1
3402 return -1
3403
3403
3404 # analyze revs for earlier grafts
3404 # analyze revs for earlier grafts
3405 ids = {}
3405 ids = {}
3406 for ctx in repo.set("%ld", revs):
3406 for ctx in repo.set("%ld", revs):
3407 ids[ctx.hex()] = ctx.rev()
3407 ids[ctx.hex()] = ctx.rev()
3408 n = ctx.extra().get('source')
3408 n = ctx.extra().get('source')
3409 if n:
3409 if n:
3410 ids[n] = ctx.rev()
3410 ids[n] = ctx.rev()
3411
3411
3412 # check ancestors for earlier grafts
3412 # check ancestors for earlier grafts
3413 ui.debug('scanning for duplicate grafts\n')
3413 ui.debug('scanning for duplicate grafts\n')
3414
3414
3415 for rev in repo.changelog.findmissingrevs(revs, [crev]):
3415 for rev in repo.changelog.findmissingrevs(revs, [crev]):
3416 ctx = repo[rev]
3416 ctx = repo[rev]
3417 n = ctx.extra().get('source')
3417 n = ctx.extra().get('source')
3418 if n in ids:
3418 if n in ids:
3419 try:
3419 try:
3420 r = repo[n].rev()
3420 r = repo[n].rev()
3421 except error.RepoLookupError:
3421 except error.RepoLookupError:
3422 r = None
3422 r = None
3423 if r in revs:
3423 if r in revs:
3424 ui.warn(_('skipping revision %s (already grafted to %s)\n')
3424 ui.warn(_('skipping revision %s (already grafted to %s)\n')
3425 % (r, rev))
3425 % (r, rev))
3426 revs.remove(r)
3426 revs.remove(r)
3427 elif ids[n] in revs:
3427 elif ids[n] in revs:
3428 if r is None:
3428 if r is None:
3429 ui.warn(_('skipping already grafted revision %s '
3429 ui.warn(_('skipping already grafted revision %s '
3430 '(%s also has unknown origin %s)\n')
3430 '(%s also has unknown origin %s)\n')
3431 % (ids[n], rev, n))
3431 % (ids[n], rev, n))
3432 else:
3432 else:
3433 ui.warn(_('skipping already grafted revision %s '
3433 ui.warn(_('skipping already grafted revision %s '
3434 '(%s also has origin %d)\n')
3434 '(%s also has origin %d)\n')
3435 % (ids[n], rev, r))
3435 % (ids[n], rev, r))
3436 revs.remove(ids[n])
3436 revs.remove(ids[n])
3437 elif ctx.hex() in ids:
3437 elif ctx.hex() in ids:
3438 r = ids[ctx.hex()]
3438 r = ids[ctx.hex()]
3439 ui.warn(_('skipping already grafted revision %s '
3439 ui.warn(_('skipping already grafted revision %s '
3440 '(was grafted from %d)\n') % (r, rev))
3440 '(was grafted from %d)\n') % (r, rev))
3441 revs.remove(r)
3441 revs.remove(r)
3442 if not revs:
3442 if not revs:
3443 return -1
3443 return -1
3444
3444
3445 wlock = repo.wlock()
3445 wlock = repo.wlock()
3446 try:
3446 try:
3447 current = repo['.']
3447 current = repo['.']
3448 for pos, ctx in enumerate(repo.set("%ld", revs)):
3448 for pos, ctx in enumerate(repo.set("%ld", revs)):
3449
3449
3450 ui.status(_('grafting revision %s\n') % ctx.rev())
3450 ui.status(_('grafting revision %s\n') % ctx.rev())
3451 if opts.get('dry_run'):
3451 if opts.get('dry_run'):
3452 continue
3452 continue
3453
3453
3454 source = ctx.extra().get('source')
3454 source = ctx.extra().get('source')
3455 if not source:
3455 if not source:
3456 source = ctx.hex()
3456 source = ctx.hex()
3457 extra = {'source': source}
3457 extra = {'source': source}
3458 user = ctx.user()
3458 user = ctx.user()
3459 if opts.get('user'):
3459 if opts.get('user'):
3460 user = opts['user']
3460 user = opts['user']
3461 date = ctx.date()
3461 date = ctx.date()
3462 if opts.get('date'):
3462 if opts.get('date'):
3463 date = opts['date']
3463 date = opts['date']
3464 message = ctx.description()
3464 message = ctx.description()
3465 if opts.get('log'):
3465 if opts.get('log'):
3466 message += '\n(grafted from %s)' % ctx.hex()
3466 message += '\n(grafted from %s)' % ctx.hex()
3467
3467
3468 # we don't merge the first commit when continuing
3468 # we don't merge the first commit when continuing
3469 if not cont:
3469 if not cont:
3470 # perform the graft merge with p1(rev) as 'ancestor'
3470 # perform the graft merge with p1(rev) as 'ancestor'
3471 try:
3471 try:
3472 # ui.forcemerge is an internal variable, do not document
3472 # ui.forcemerge is an internal variable, do not document
3473 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
3473 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
3474 'graft')
3474 'graft')
3475 stats = mergemod.update(repo, ctx.node(), True, True, False,
3475 stats = mergemod.update(repo, ctx.node(), True, True, False,
3476 ctx.p1().node(),
3476 ctx.p1().node(),
3477 labels=['local', 'graft'])
3477 labels=['local', 'graft'])
3478 finally:
3478 finally:
3479 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
3479 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
3480 # report any conflicts
3480 # report any conflicts
3481 if stats and stats[3] > 0:
3481 if stats and stats[3] > 0:
3482 # write out state for --continue
3482 # write out state for --continue
3483 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
3483 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
3484 repo.opener.write('graftstate', ''.join(nodelines))
3484 repo.opener.write('graftstate', ''.join(nodelines))
3485 raise util.Abort(
3485 raise util.Abort(
3486 _("unresolved conflicts, can't continue"),
3486 _("unresolved conflicts, can't continue"),
3487 hint=_('use hg resolve and hg graft --continue'))
3487 hint=_('use hg resolve and hg graft --continue'))
3488 else:
3488 else:
3489 cont = False
3489 cont = False
3490
3490
3491 # drop the second merge parent
3491 # drop the second merge parent
3492 repo.dirstate.beginparentchange()
3492 repo.dirstate.beginparentchange()
3493 repo.setparents(current.node(), nullid)
3493 repo.setparents(current.node(), nullid)
3494 repo.dirstate.write()
3494 repo.dirstate.write()
3495 # fix up dirstate for copies and renames
3495 # fix up dirstate for copies and renames
3496 cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev())
3496 cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev())
3497 repo.dirstate.endparentchange()
3497 repo.dirstate.endparentchange()
3498
3498
3499 # commit
3499 # commit
3500 node = repo.commit(text=message, user=user,
3500 node = repo.commit(text=message, user=user,
3501 date=date, extra=extra, editor=editor)
3501 date=date, extra=extra, editor=editor)
3502 if node is None:
3502 if node is None:
3503 ui.status(_('graft for revision %s is empty\n') % ctx.rev())
3503 ui.status(_('graft for revision %s is empty\n') % ctx.rev())
3504 else:
3504 else:
3505 current = repo[node]
3505 current = repo[node]
3506 finally:
3506 finally:
3507 wlock.release()
3507 wlock.release()
3508
3508
3509 # remove state when we complete successfully
3509 # remove state when we complete successfully
3510 if not opts.get('dry_run'):
3510 if not opts.get('dry_run'):
3511 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
3511 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
3512
3512
3513 return 0
3513 return 0
3514
3514
3515 @command('grep',
3515 @command('grep',
3516 [('0', 'print0', None, _('end fields with NUL')),
3516 [('0', 'print0', None, _('end fields with NUL')),
3517 ('', 'all', None, _('print all revisions that match')),
3517 ('', 'all', None, _('print all revisions that match')),
3518 ('a', 'text', None, _('treat all files as text')),
3518 ('a', 'text', None, _('treat all files as text')),
3519 ('f', 'follow', None,
3519 ('f', 'follow', None,
3520 _('follow changeset history,'
3520 _('follow changeset history,'
3521 ' or file history across copies and renames')),
3521 ' or file history across copies and renames')),
3522 ('i', 'ignore-case', None, _('ignore case when matching')),
3522 ('i', 'ignore-case', None, _('ignore case when matching')),
3523 ('l', 'files-with-matches', None,
3523 ('l', 'files-with-matches', None,
3524 _('print only filenames and revisions that match')),
3524 _('print only filenames and revisions that match')),
3525 ('n', 'line-number', None, _('print matching line numbers')),
3525 ('n', 'line-number', None, _('print matching line numbers')),
3526 ('r', 'rev', [],
3526 ('r', 'rev', [],
3527 _('only search files changed within revision range'), _('REV')),
3527 _('only search files changed within revision range'), _('REV')),
3528 ('u', 'user', None, _('list the author (long with -v)')),
3528 ('u', 'user', None, _('list the author (long with -v)')),
3529 ('d', 'date', None, _('list the date (short with -q)')),
3529 ('d', 'date', None, _('list the date (short with -q)')),
3530 ] + walkopts,
3530 ] + walkopts,
3531 _('[OPTION]... PATTERN [FILE]...'),
3531 _('[OPTION]... PATTERN [FILE]...'),
3532 inferrepo=True)
3532 inferrepo=True)
3533 def grep(ui, repo, pattern, *pats, **opts):
3533 def grep(ui, repo, pattern, *pats, **opts):
3534 """search for a pattern in specified files and revisions
3534 """search for a pattern in specified files and revisions
3535
3535
3536 Search revisions of files for a regular expression.
3536 Search revisions of files for a regular expression.
3537
3537
3538 This command behaves differently than Unix grep. It only accepts
3538 This command behaves differently than Unix grep. It only accepts
3539 Python/Perl regexps. It searches repository history, not the
3539 Python/Perl regexps. It searches repository history, not the
3540 working directory. It always prints the revision number in which a
3540 working directory. It always prints the revision number in which a
3541 match appears.
3541 match appears.
3542
3542
3543 By default, grep only prints output for the first revision of a
3543 By default, grep only prints output for the first revision of a
3544 file in which it finds a match. To get it to print every revision
3544 file in which it finds a match. To get it to print every revision
3545 that contains a change in match status ("-" for a match that
3545 that contains a change in match status ("-" for a match that
3546 becomes a non-match, or "+" for a non-match that becomes a match),
3546 becomes a non-match, or "+" for a non-match that becomes a match),
3547 use the --all flag.
3547 use the --all flag.
3548
3548
3549 Returns 0 if a match is found, 1 otherwise.
3549 Returns 0 if a match is found, 1 otherwise.
3550 """
3550 """
3551 reflags = re.M
3551 reflags = re.M
3552 if opts.get('ignore_case'):
3552 if opts.get('ignore_case'):
3553 reflags |= re.I
3553 reflags |= re.I
3554 try:
3554 try:
3555 regexp = util.re.compile(pattern, reflags)
3555 regexp = util.re.compile(pattern, reflags)
3556 except re.error, inst:
3556 except re.error, inst:
3557 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
3557 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
3558 return 1
3558 return 1
3559 sep, eol = ':', '\n'
3559 sep, eol = ':', '\n'
3560 if opts.get('print0'):
3560 if opts.get('print0'):
3561 sep = eol = '\0'
3561 sep = eol = '\0'
3562
3562
3563 getfile = util.lrucachefunc(repo.file)
3563 getfile = util.lrucachefunc(repo.file)
3564
3564
3565 def matchlines(body):
3565 def matchlines(body):
3566 begin = 0
3566 begin = 0
3567 linenum = 0
3567 linenum = 0
3568 while begin < len(body):
3568 while begin < len(body):
3569 match = regexp.search(body, begin)
3569 match = regexp.search(body, begin)
3570 if not match:
3570 if not match:
3571 break
3571 break
3572 mstart, mend = match.span()
3572 mstart, mend = match.span()
3573 linenum += body.count('\n', begin, mstart) + 1
3573 linenum += body.count('\n', begin, mstart) + 1
3574 lstart = body.rfind('\n', begin, mstart) + 1 or begin
3574 lstart = body.rfind('\n', begin, mstart) + 1 or begin
3575 begin = body.find('\n', mend) + 1 or len(body) + 1
3575 begin = body.find('\n', mend) + 1 or len(body) + 1
3576 lend = begin - 1
3576 lend = begin - 1
3577 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3577 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3578
3578
3579 class linestate(object):
3579 class linestate(object):
3580 def __init__(self, line, linenum, colstart, colend):
3580 def __init__(self, line, linenum, colstart, colend):
3581 self.line = line
3581 self.line = line
3582 self.linenum = linenum
3582 self.linenum = linenum
3583 self.colstart = colstart
3583 self.colstart = colstart
3584 self.colend = colend
3584 self.colend = colend
3585
3585
3586 def __hash__(self):
3586 def __hash__(self):
3587 return hash((self.linenum, self.line))
3587 return hash((self.linenum, self.line))
3588
3588
3589 def __eq__(self, other):
3589 def __eq__(self, other):
3590 return self.line == other.line
3590 return self.line == other.line
3591
3591
3592 def __iter__(self):
3592 def __iter__(self):
3593 yield (self.line[:self.colstart], '')
3593 yield (self.line[:self.colstart], '')
3594 yield (self.line[self.colstart:self.colend], 'grep.match')
3594 yield (self.line[self.colstart:self.colend], 'grep.match')
3595 rest = self.line[self.colend:]
3595 rest = self.line[self.colend:]
3596 while rest != '':
3596 while rest != '':
3597 match = regexp.search(rest)
3597 match = regexp.search(rest)
3598 if not match:
3598 if not match:
3599 yield (rest, '')
3599 yield (rest, '')
3600 break
3600 break
3601 mstart, mend = match.span()
3601 mstart, mend = match.span()
3602 yield (rest[:mstart], '')
3602 yield (rest[:mstart], '')
3603 yield (rest[mstart:mend], 'grep.match')
3603 yield (rest[mstart:mend], 'grep.match')
3604 rest = rest[mend:]
3604 rest = rest[mend:]
3605
3605
3606 matches = {}
3606 matches = {}
3607 copies = {}
3607 copies = {}
3608 def grepbody(fn, rev, body):
3608 def grepbody(fn, rev, body):
3609 matches[rev].setdefault(fn, [])
3609 matches[rev].setdefault(fn, [])
3610 m = matches[rev][fn]
3610 m = matches[rev][fn]
3611 for lnum, cstart, cend, line in matchlines(body):
3611 for lnum, cstart, cend, line in matchlines(body):
3612 s = linestate(line, lnum, cstart, cend)
3612 s = linestate(line, lnum, cstart, cend)
3613 m.append(s)
3613 m.append(s)
3614
3614
3615 def difflinestates(a, b):
3615 def difflinestates(a, b):
3616 sm = difflib.SequenceMatcher(None, a, b)
3616 sm = difflib.SequenceMatcher(None, a, b)
3617 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3617 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3618 if tag == 'insert':
3618 if tag == 'insert':
3619 for i in xrange(blo, bhi):
3619 for i in xrange(blo, bhi):
3620 yield ('+', b[i])
3620 yield ('+', b[i])
3621 elif tag == 'delete':
3621 elif tag == 'delete':
3622 for i in xrange(alo, ahi):
3622 for i in xrange(alo, ahi):
3623 yield ('-', a[i])
3623 yield ('-', a[i])
3624 elif tag == 'replace':
3624 elif tag == 'replace':
3625 for i in xrange(alo, ahi):
3625 for i in xrange(alo, ahi):
3626 yield ('-', a[i])
3626 yield ('-', a[i])
3627 for i in xrange(blo, bhi):
3627 for i in xrange(blo, bhi):
3628 yield ('+', b[i])
3628 yield ('+', b[i])
3629
3629
3630 def display(fn, ctx, pstates, states):
3630 def display(fn, ctx, pstates, states):
3631 rev = ctx.rev()
3631 rev = ctx.rev()
3632 datefunc = ui.quiet and util.shortdate or util.datestr
3632 datefunc = ui.quiet and util.shortdate or util.datestr
3633 found = False
3633 found = False
3634 @util.cachefunc
3634 @util.cachefunc
3635 def binary():
3635 def binary():
3636 flog = getfile(fn)
3636 flog = getfile(fn)
3637 return util.binary(flog.read(ctx.filenode(fn)))
3637 return util.binary(flog.read(ctx.filenode(fn)))
3638
3638
3639 if opts.get('all'):
3639 if opts.get('all'):
3640 iter = difflinestates(pstates, states)
3640 iter = difflinestates(pstates, states)
3641 else:
3641 else:
3642 iter = [('', l) for l in states]
3642 iter = [('', l) for l in states]
3643 for change, l in iter:
3643 for change, l in iter:
3644 cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')]
3644 cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')]
3645
3645
3646 if opts.get('line_number'):
3646 if opts.get('line_number'):
3647 cols.append((str(l.linenum), 'grep.linenumber'))
3647 cols.append((str(l.linenum), 'grep.linenumber'))
3648 if opts.get('all'):
3648 if opts.get('all'):
3649 cols.append((change, 'grep.change'))
3649 cols.append((change, 'grep.change'))
3650 if opts.get('user'):
3650 if opts.get('user'):
3651 cols.append((ui.shortuser(ctx.user()), 'grep.user'))
3651 cols.append((ui.shortuser(ctx.user()), 'grep.user'))
3652 if opts.get('date'):
3652 if opts.get('date'):
3653 cols.append((datefunc(ctx.date()), 'grep.date'))
3653 cols.append((datefunc(ctx.date()), 'grep.date'))
3654 for col, label in cols[:-1]:
3654 for col, label in cols[:-1]:
3655 ui.write(col, label=label)
3655 ui.write(col, label=label)
3656 ui.write(sep, label='grep.sep')
3656 ui.write(sep, label='grep.sep')
3657 ui.write(cols[-1][0], label=cols[-1][1])
3657 ui.write(cols[-1][0], label=cols[-1][1])
3658 if not opts.get('files_with_matches'):
3658 if not opts.get('files_with_matches'):
3659 ui.write(sep, label='grep.sep')
3659 ui.write(sep, label='grep.sep')
3660 if not opts.get('text') and binary():
3660 if not opts.get('text') and binary():
3661 ui.write(" Binary file matches")
3661 ui.write(" Binary file matches")
3662 else:
3662 else:
3663 for s, label in l:
3663 for s, label in l:
3664 ui.write(s, label=label)
3664 ui.write(s, label=label)
3665 ui.write(eol)
3665 ui.write(eol)
3666 found = True
3666 found = True
3667 if opts.get('files_with_matches'):
3667 if opts.get('files_with_matches'):
3668 break
3668 break
3669 return found
3669 return found
3670
3670
3671 skip = {}
3671 skip = {}
3672 revfiles = {}
3672 revfiles = {}
3673 matchfn = scmutil.match(repo[None], pats, opts)
3673 matchfn = scmutil.match(repo[None], pats, opts)
3674 found = False
3674 found = False
3675 follow = opts.get('follow')
3675 follow = opts.get('follow')
3676
3676
3677 def prep(ctx, fns):
3677 def prep(ctx, fns):
3678 rev = ctx.rev()
3678 rev = ctx.rev()
3679 pctx = ctx.p1()
3679 pctx = ctx.p1()
3680 parent = pctx.rev()
3680 parent = pctx.rev()
3681 matches.setdefault(rev, {})
3681 matches.setdefault(rev, {})
3682 matches.setdefault(parent, {})
3682 matches.setdefault(parent, {})
3683 files = revfiles.setdefault(rev, [])
3683 files = revfiles.setdefault(rev, [])
3684 for fn in fns:
3684 for fn in fns:
3685 flog = getfile(fn)
3685 flog = getfile(fn)
3686 try:
3686 try:
3687 fnode = ctx.filenode(fn)
3687 fnode = ctx.filenode(fn)
3688 except error.LookupError:
3688 except error.LookupError:
3689 continue
3689 continue
3690
3690
3691 copied = flog.renamed(fnode)
3691 copied = flog.renamed(fnode)
3692 copy = follow and copied and copied[0]
3692 copy = follow and copied and copied[0]
3693 if copy:
3693 if copy:
3694 copies.setdefault(rev, {})[fn] = copy
3694 copies.setdefault(rev, {})[fn] = copy
3695 if fn in skip:
3695 if fn in skip:
3696 if copy:
3696 if copy:
3697 skip[copy] = True
3697 skip[copy] = True
3698 continue
3698 continue
3699 files.append(fn)
3699 files.append(fn)
3700
3700
3701 if fn not in matches[rev]:
3701 if fn not in matches[rev]:
3702 grepbody(fn, rev, flog.read(fnode))
3702 grepbody(fn, rev, flog.read(fnode))
3703
3703
3704 pfn = copy or fn
3704 pfn = copy or fn
3705 if pfn not in matches[parent]:
3705 if pfn not in matches[parent]:
3706 try:
3706 try:
3707 fnode = pctx.filenode(pfn)
3707 fnode = pctx.filenode(pfn)
3708 grepbody(pfn, parent, flog.read(fnode))
3708 grepbody(pfn, parent, flog.read(fnode))
3709 except error.LookupError:
3709 except error.LookupError:
3710 pass
3710 pass
3711
3711
3712 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
3712 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
3713 rev = ctx.rev()
3713 rev = ctx.rev()
3714 parent = ctx.p1().rev()
3714 parent = ctx.p1().rev()
3715 for fn in sorted(revfiles.get(rev, [])):
3715 for fn in sorted(revfiles.get(rev, [])):
3716 states = matches[rev][fn]
3716 states = matches[rev][fn]
3717 copy = copies.get(rev, {}).get(fn)
3717 copy = copies.get(rev, {}).get(fn)
3718 if fn in skip:
3718 if fn in skip:
3719 if copy:
3719 if copy:
3720 skip[copy] = True
3720 skip[copy] = True
3721 continue
3721 continue
3722 pstates = matches.get(parent, {}).get(copy or fn, [])
3722 pstates = matches.get(parent, {}).get(copy or fn, [])
3723 if pstates or states:
3723 if pstates or states:
3724 r = display(fn, ctx, pstates, states)
3724 r = display(fn, ctx, pstates, states)
3725 found = found or r
3725 found = found or r
3726 if r and not opts.get('all'):
3726 if r and not opts.get('all'):
3727 skip[fn] = True
3727 skip[fn] = True
3728 if copy:
3728 if copy:
3729 skip[copy] = True
3729 skip[copy] = True
3730 del matches[rev]
3730 del matches[rev]
3731 del revfiles[rev]
3731 del revfiles[rev]
3732
3732
3733 return not found
3733 return not found
3734
3734
3735 @command('heads',
3735 @command('heads',
3736 [('r', 'rev', '',
3736 [('r', 'rev', '',
3737 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
3737 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
3738 ('t', 'topo', False, _('show topological heads only')),
3738 ('t', 'topo', False, _('show topological heads only')),
3739 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
3739 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
3740 ('c', 'closed', False, _('show normal and closed branch heads')),
3740 ('c', 'closed', False, _('show normal and closed branch heads')),
3741 ] + templateopts,
3741 ] + templateopts,
3742 _('[-ct] [-r STARTREV] [REV]...'))
3742 _('[-ct] [-r STARTREV] [REV]...'))
3743 def heads(ui, repo, *branchrevs, **opts):
3743 def heads(ui, repo, *branchrevs, **opts):
3744 """show branch heads
3744 """show branch heads
3745
3745
3746 With no arguments, show all open branch heads in the repository.
3746 With no arguments, show all open branch heads in the repository.
3747 Branch heads are changesets that have no descendants on the
3747 Branch heads are changesets that have no descendants on the
3748 same branch. They are where development generally takes place and
3748 same branch. They are where development generally takes place and
3749 are the usual targets for update and merge operations.
3749 are the usual targets for update and merge operations.
3750
3750
3751 If one or more REVs are given, only open branch heads on the
3751 If one or more REVs are given, only open branch heads on the
3752 branches associated with the specified changesets are shown. This
3752 branches associated with the specified changesets are shown. This
3753 means that you can use :hg:`heads .` to see the heads on the
3753 means that you can use :hg:`heads .` to see the heads on the
3754 currently checked-out branch.
3754 currently checked-out branch.
3755
3755
3756 If -c/--closed is specified, also show branch heads marked closed
3756 If -c/--closed is specified, also show branch heads marked closed
3757 (see :hg:`commit --close-branch`).
3757 (see :hg:`commit --close-branch`).
3758
3758
3759 If STARTREV is specified, only those heads that are descendants of
3759 If STARTREV is specified, only those heads that are descendants of
3760 STARTREV will be displayed.
3760 STARTREV will be displayed.
3761
3761
3762 If -t/--topo is specified, named branch mechanics will be ignored and only
3762 If -t/--topo is specified, named branch mechanics will be ignored and only
3763 topological heads (changesets with no children) will be shown.
3763 topological heads (changesets with no children) will be shown.
3764
3764
3765 Returns 0 if matching heads are found, 1 if not.
3765 Returns 0 if matching heads are found, 1 if not.
3766 """
3766 """
3767
3767
3768 start = None
3768 start = None
3769 if 'rev' in opts:
3769 if 'rev' in opts:
3770 start = scmutil.revsingle(repo, opts['rev'], None).node()
3770 start = scmutil.revsingle(repo, opts['rev'], None).node()
3771
3771
3772 if opts.get('topo'):
3772 if opts.get('topo'):
3773 heads = [repo[h] for h in repo.heads(start)]
3773 heads = [repo[h] for h in repo.heads(start)]
3774 else:
3774 else:
3775 heads = []
3775 heads = []
3776 for branch in repo.branchmap():
3776 for branch in repo.branchmap():
3777 heads += repo.branchheads(branch, start, opts.get('closed'))
3777 heads += repo.branchheads(branch, start, opts.get('closed'))
3778 heads = [repo[h] for h in heads]
3778 heads = [repo[h] for h in heads]
3779
3779
3780 if branchrevs:
3780 if branchrevs:
3781 branches = set(repo[br].branch() for br in branchrevs)
3781 branches = set(repo[br].branch() for br in branchrevs)
3782 heads = [h for h in heads if h.branch() in branches]
3782 heads = [h for h in heads if h.branch() in branches]
3783
3783
3784 if opts.get('active') and branchrevs:
3784 if opts.get('active') and branchrevs:
3785 dagheads = repo.heads(start)
3785 dagheads = repo.heads(start)
3786 heads = [h for h in heads if h.node() in dagheads]
3786 heads = [h for h in heads if h.node() in dagheads]
3787
3787
3788 if branchrevs:
3788 if branchrevs:
3789 haveheads = set(h.branch() for h in heads)
3789 haveheads = set(h.branch() for h in heads)
3790 if branches - haveheads:
3790 if branches - haveheads:
3791 headless = ', '.join(b for b in branches - haveheads)
3791 headless = ', '.join(b for b in branches - haveheads)
3792 msg = _('no open branch heads found on branches %s')
3792 msg = _('no open branch heads found on branches %s')
3793 if opts.get('rev'):
3793 if opts.get('rev'):
3794 msg += _(' (started at %s)') % opts['rev']
3794 msg += _(' (started at %s)') % opts['rev']
3795 ui.warn((msg + '\n') % headless)
3795 ui.warn((msg + '\n') % headless)
3796
3796
3797 if not heads:
3797 if not heads:
3798 return 1
3798 return 1
3799
3799
3800 heads = sorted(heads, key=lambda x: -x.rev())
3800 heads = sorted(heads, key=lambda x: -x.rev())
3801 displayer = cmdutil.show_changeset(ui, repo, opts)
3801 displayer = cmdutil.show_changeset(ui, repo, opts)
3802 for ctx in heads:
3802 for ctx in heads:
3803 displayer.show(ctx)
3803 displayer.show(ctx)
3804 displayer.close()
3804 displayer.close()
3805
3805
3806 @command('help',
3806 @command('help',
3807 [('e', 'extension', None, _('show only help for extensions')),
3807 [('e', 'extension', None, _('show only help for extensions')),
3808 ('c', 'command', None, _('show only help for commands')),
3808 ('c', 'command', None, _('show only help for commands')),
3809 ('k', 'keyword', '', _('show topics matching keyword')),
3809 ('k', 'keyword', '', _('show topics matching keyword')),
3810 ],
3810 ],
3811 _('[-ec] [TOPIC]'),
3811 _('[-ec] [TOPIC]'),
3812 norepo=True)
3812 norepo=True)
3813 def help_(ui, name=None, **opts):
3813 def help_(ui, name=None, **opts):
3814 """show help for a given topic or a help overview
3814 """show help for a given topic or a help overview
3815
3815
3816 With no arguments, print a list of commands with short help messages.
3816 With no arguments, print a list of commands with short help messages.
3817
3817
3818 Given a topic, extension, or command name, print help for that
3818 Given a topic, extension, or command name, print help for that
3819 topic.
3819 topic.
3820
3820
3821 Returns 0 if successful.
3821 Returns 0 if successful.
3822 """
3822 """
3823
3823
3824 textwidth = min(ui.termwidth(), 80) - 2
3824 textwidth = min(ui.termwidth(), 80) - 2
3825
3825
3826 keep = []
3826 keep = []
3827 if ui.verbose:
3827 if ui.verbose:
3828 keep.append('verbose')
3828 keep.append('verbose')
3829 if sys.platform.startswith('win'):
3829 if sys.platform.startswith('win'):
3830 keep.append('windows')
3830 keep.append('windows')
3831 elif sys.platform == 'OpenVMS':
3831 elif sys.platform == 'OpenVMS':
3832 keep.append('vms')
3832 keep.append('vms')
3833 elif sys.platform == 'plan9':
3833 elif sys.platform == 'plan9':
3834 keep.append('plan9')
3834 keep.append('plan9')
3835 else:
3835 else:
3836 keep.append('unix')
3836 keep.append('unix')
3837 keep.append(sys.platform.lower())
3837 keep.append(sys.platform.lower())
3838
3838
3839 section = None
3839 section = None
3840 if name and '.' in name:
3840 if name and '.' in name:
3841 name, section = name.split('.')
3841 name, section = name.split('.')
3842
3842
3843 text = help.help_(ui, name, **opts)
3843 text = help.help_(ui, name, **opts)
3844
3844
3845 formatted, pruned = minirst.format(text, textwidth, keep=keep,
3845 formatted, pruned = minirst.format(text, textwidth, keep=keep,
3846 section=section)
3846 section=section)
3847 if section and not formatted:
3847 if section and not formatted:
3848 raise util.Abort(_("help section not found"))
3848 raise util.Abort(_("help section not found"))
3849
3849
3850 if 'verbose' in pruned:
3850 if 'verbose' in pruned:
3851 keep.append('omitted')
3851 keep.append('omitted')
3852 else:
3852 else:
3853 keep.append('notomitted')
3853 keep.append('notomitted')
3854 formatted, pruned = minirst.format(text, textwidth, keep=keep,
3854 formatted, pruned = minirst.format(text, textwidth, keep=keep,
3855 section=section)
3855 section=section)
3856 ui.write(formatted)
3856 ui.write(formatted)
3857
3857
3858
3858
3859 @command('identify|id',
3859 @command('identify|id',
3860 [('r', 'rev', '',
3860 [('r', 'rev', '',
3861 _('identify the specified revision'), _('REV')),
3861 _('identify the specified revision'), _('REV')),
3862 ('n', 'num', None, _('show local revision number')),
3862 ('n', 'num', None, _('show local revision number')),
3863 ('i', 'id', None, _('show global revision id')),
3863 ('i', 'id', None, _('show global revision id')),
3864 ('b', 'branch', None, _('show branch')),
3864 ('b', 'branch', None, _('show branch')),
3865 ('t', 'tags', None, _('show tags')),
3865 ('t', 'tags', None, _('show tags')),
3866 ('B', 'bookmarks', None, _('show bookmarks')),
3866 ('B', 'bookmarks', None, _('show bookmarks')),
3867 ] + remoteopts,
3867 ] + remoteopts,
3868 _('[-nibtB] [-r REV] [SOURCE]'),
3868 _('[-nibtB] [-r REV] [SOURCE]'),
3869 optionalrepo=True)
3869 optionalrepo=True)
3870 def identify(ui, repo, source=None, rev=None,
3870 def identify(ui, repo, source=None, rev=None,
3871 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
3871 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
3872 """identify the working copy or specified revision
3872 """identify the working copy or specified revision
3873
3873
3874 Print a summary identifying the repository state at REV using one or
3874 Print a summary identifying the repository state at REV using one or
3875 two parent hash identifiers, followed by a "+" if the working
3875 two parent hash identifiers, followed by a "+" if the working
3876 directory has uncommitted changes, the branch name (if not default),
3876 directory has uncommitted changes, the branch name (if not default),
3877 a list of tags, and a list of bookmarks.
3877 a list of tags, and a list of bookmarks.
3878
3878
3879 When REV is not given, print a summary of the current state of the
3879 When REV is not given, print a summary of the current state of the
3880 repository.
3880 repository.
3881
3881
3882 Specifying a path to a repository root or Mercurial bundle will
3882 Specifying a path to a repository root or Mercurial bundle will
3883 cause lookup to operate on that repository/bundle.
3883 cause lookup to operate on that repository/bundle.
3884
3884
3885 .. container:: verbose
3885 .. container:: verbose
3886
3886
3887 Examples:
3887 Examples:
3888
3888
3889 - generate a build identifier for the working directory::
3889 - generate a build identifier for the working directory::
3890
3890
3891 hg id --id > build-id.dat
3891 hg id --id > build-id.dat
3892
3892
3893 - find the revision corresponding to a tag::
3893 - find the revision corresponding to a tag::
3894
3894
3895 hg id -n -r 1.3
3895 hg id -n -r 1.3
3896
3896
3897 - check the most recent revision of a remote repository::
3897 - check the most recent revision of a remote repository::
3898
3898
3899 hg id -r tip http://selenic.com/hg/
3899 hg id -r tip http://selenic.com/hg/
3900
3900
3901 Returns 0 if successful.
3901 Returns 0 if successful.
3902 """
3902 """
3903
3903
3904 if not repo and not source:
3904 if not repo and not source:
3905 raise util.Abort(_("there is no Mercurial repository here "
3905 raise util.Abort(_("there is no Mercurial repository here "
3906 "(.hg not found)"))
3906 "(.hg not found)"))
3907
3907
3908 hexfunc = ui.debugflag and hex or short
3908 hexfunc = ui.debugflag and hex or short
3909 default = not (num or id or branch or tags or bookmarks)
3909 default = not (num or id or branch or tags or bookmarks)
3910 output = []
3910 output = []
3911 revs = []
3911 revs = []
3912
3912
3913 if source:
3913 if source:
3914 source, branches = hg.parseurl(ui.expandpath(source))
3914 source, branches = hg.parseurl(ui.expandpath(source))
3915 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3915 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3916 repo = peer.local()
3916 repo = peer.local()
3917 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3917 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3918
3918
3919 if not repo:
3919 if not repo:
3920 if num or branch or tags:
3920 if num or branch or tags:
3921 raise util.Abort(
3921 raise util.Abort(
3922 _("can't query remote revision number, branch, or tags"))
3922 _("can't query remote revision number, branch, or tags"))
3923 if not rev and revs:
3923 if not rev and revs:
3924 rev = revs[0]
3924 rev = revs[0]
3925 if not rev:
3925 if not rev:
3926 rev = "tip"
3926 rev = "tip"
3927
3927
3928 remoterev = peer.lookup(rev)
3928 remoterev = peer.lookup(rev)
3929 if default or id:
3929 if default or id:
3930 output = [hexfunc(remoterev)]
3930 output = [hexfunc(remoterev)]
3931
3931
3932 def getbms():
3932 def getbms():
3933 bms = []
3933 bms = []
3934
3934
3935 if 'bookmarks' in peer.listkeys('namespaces'):
3935 if 'bookmarks' in peer.listkeys('namespaces'):
3936 hexremoterev = hex(remoterev)
3936 hexremoterev = hex(remoterev)
3937 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
3937 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
3938 if bmr == hexremoterev]
3938 if bmr == hexremoterev]
3939
3939
3940 return sorted(bms)
3940 return sorted(bms)
3941
3941
3942 if bookmarks:
3942 if bookmarks:
3943 output.extend(getbms())
3943 output.extend(getbms())
3944 elif default and not ui.quiet:
3944 elif default and not ui.quiet:
3945 # multiple bookmarks for a single parent separated by '/'
3945 # multiple bookmarks for a single parent separated by '/'
3946 bm = '/'.join(getbms())
3946 bm = '/'.join(getbms())
3947 if bm:
3947 if bm:
3948 output.append(bm)
3948 output.append(bm)
3949 else:
3949 else:
3950 if not rev:
3950 if not rev:
3951 ctx = repo[None]
3951 ctx = repo[None]
3952 parents = ctx.parents()
3952 parents = ctx.parents()
3953 changed = ""
3953 changed = ""
3954 if default or id or num:
3954 if default or id or num:
3955 if (util.any(repo.status())
3955 if (util.any(repo.status())
3956 or util.any(ctx.sub(s).dirty() for s in ctx.substate)):
3956 or util.any(ctx.sub(s).dirty() for s in ctx.substate)):
3957 changed = '+'
3957 changed = '+'
3958 if default or id:
3958 if default or id:
3959 output = ["%s%s" %
3959 output = ["%s%s" %
3960 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
3960 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
3961 if num:
3961 if num:
3962 output.append("%s%s" %
3962 output.append("%s%s" %
3963 ('+'.join([str(p.rev()) for p in parents]), changed))
3963 ('+'.join([str(p.rev()) for p in parents]), changed))
3964 else:
3964 else:
3965 ctx = scmutil.revsingle(repo, rev)
3965 ctx = scmutil.revsingle(repo, rev)
3966 if default or id:
3966 if default or id:
3967 output = [hexfunc(ctx.node())]
3967 output = [hexfunc(ctx.node())]
3968 if num:
3968 if num:
3969 output.append(str(ctx.rev()))
3969 output.append(str(ctx.rev()))
3970
3970
3971 if default and not ui.quiet:
3971 if default and not ui.quiet:
3972 b = ctx.branch()
3972 b = ctx.branch()
3973 if b != 'default':
3973 if b != 'default':
3974 output.append("(%s)" % b)
3974 output.append("(%s)" % b)
3975
3975
3976 # multiple tags for a single parent separated by '/'
3976 # multiple tags for a single parent separated by '/'
3977 t = '/'.join(ctx.tags())
3977 t = '/'.join(ctx.tags())
3978 if t:
3978 if t:
3979 output.append(t)
3979 output.append(t)
3980
3980
3981 # multiple bookmarks for a single parent separated by '/'
3981 # multiple bookmarks for a single parent separated by '/'
3982 bm = '/'.join(ctx.bookmarks())
3982 bm = '/'.join(ctx.bookmarks())
3983 if bm:
3983 if bm:
3984 output.append(bm)
3984 output.append(bm)
3985 else:
3985 else:
3986 if branch:
3986 if branch:
3987 output.append(ctx.branch())
3987 output.append(ctx.branch())
3988
3988
3989 if tags:
3989 if tags:
3990 output.extend(ctx.tags())
3990 output.extend(ctx.tags())
3991
3991
3992 if bookmarks:
3992 if bookmarks:
3993 output.extend(ctx.bookmarks())
3993 output.extend(ctx.bookmarks())
3994
3994
3995 ui.write("%s\n" % ' '.join(output))
3995 ui.write("%s\n" % ' '.join(output))
3996
3996
3997 @command('import|patch',
3997 @command('import|patch',
3998 [('p', 'strip', 1,
3998 [('p', 'strip', 1,
3999 _('directory strip option for patch. This has the same '
3999 _('directory strip option for patch. This has the same '
4000 'meaning as the corresponding patch option'), _('NUM')),
4000 'meaning as the corresponding patch option'), _('NUM')),
4001 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4001 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4002 ('e', 'edit', False, _('invoke editor on commit messages')),
4002 ('e', 'edit', False, _('invoke editor on commit messages')),
4003 ('f', 'force', None,
4003 ('f', 'force', None,
4004 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4004 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4005 ('', 'no-commit', None,
4005 ('', 'no-commit', None,
4006 _("don't commit, just update the working directory")),
4006 _("don't commit, just update the working directory")),
4007 ('', 'bypass', None,
4007 ('', 'bypass', None,
4008 _("apply patch without touching the working directory")),
4008 _("apply patch without touching the working directory")),
4009 ('', 'partial', None,
4009 ('', 'partial', None,
4010 _('commit even if some hunks fail')),
4010 _('commit even if some hunks fail')),
4011 ('', 'exact', None,
4011 ('', 'exact', None,
4012 _('apply patch to the nodes from which it was generated')),
4012 _('apply patch to the nodes from which it was generated')),
4013 ('', 'import-branch', None,
4013 ('', 'import-branch', None,
4014 _('use any branch information in patch (implied by --exact)'))] +
4014 _('use any branch information in patch (implied by --exact)'))] +
4015 commitopts + commitopts2 + similarityopts,
4015 commitopts + commitopts2 + similarityopts,
4016 _('[OPTION]... PATCH...'))
4016 _('[OPTION]... PATCH...'))
4017 def import_(ui, repo, patch1=None, *patches, **opts):
4017 def import_(ui, repo, patch1=None, *patches, **opts):
4018 """import an ordered set of patches
4018 """import an ordered set of patches
4019
4019
4020 Import a list of patches and commit them individually (unless
4020 Import a list of patches and commit them individually (unless
4021 --no-commit is specified).
4021 --no-commit is specified).
4022
4022
4023 Because import first applies changes to the working directory,
4023 Because import first applies changes to the working directory,
4024 import will abort if there are outstanding changes.
4024 import will abort if there are outstanding changes.
4025
4025
4026 You can import a patch straight from a mail message. Even patches
4026 You can import a patch straight from a mail message. Even patches
4027 as attachments work (to use the body part, it must have type
4027 as attachments work (to use the body part, it must have type
4028 text/plain or text/x-patch). From and Subject headers of email
4028 text/plain or text/x-patch). From and Subject headers of email
4029 message are used as default committer and commit message. All
4029 message are used as default committer and commit message. All
4030 text/plain body parts before first diff are added to commit
4030 text/plain body parts before first diff are added to commit
4031 message.
4031 message.
4032
4032
4033 If the imported patch was generated by :hg:`export`, user and
4033 If the imported patch was generated by :hg:`export`, user and
4034 description from patch override values from message headers and
4034 description from patch override values from message headers and
4035 body. Values given on command line with -m/--message and -u/--user
4035 body. Values given on command line with -m/--message and -u/--user
4036 override these.
4036 override these.
4037
4037
4038 If --exact is specified, import will set the working directory to
4038 If --exact is specified, import will set the working directory to
4039 the parent of each patch before applying it, and will abort if the
4039 the parent of each patch before applying it, and will abort if the
4040 resulting changeset has a different ID than the one recorded in
4040 resulting changeset has a different ID than the one recorded in
4041 the patch. This may happen due to character set problems or other
4041 the patch. This may happen due to character set problems or other
4042 deficiencies in the text patch format.
4042 deficiencies in the text patch format.
4043
4043
4044 Use --bypass to apply and commit patches directly to the
4044 Use --bypass to apply and commit patches directly to the
4045 repository, not touching the working directory. Without --exact,
4045 repository, not touching the working directory. Without --exact,
4046 patches will be applied on top of the working directory parent
4046 patches will be applied on top of the working directory parent
4047 revision.
4047 revision.
4048
4048
4049 With -s/--similarity, hg will attempt to discover renames and
4049 With -s/--similarity, hg will attempt to discover renames and
4050 copies in the patch in the same way as :hg:`addremove`.
4050 copies in the patch in the same way as :hg:`addremove`.
4051
4051
4052 Use --partial to ensure a changeset will be created from the patch
4052 Use --partial to ensure a changeset will be created from the patch
4053 even if some hunks fail to apply. Hunks that fail to apply will be
4053 even if some hunks fail to apply. Hunks that fail to apply will be
4054 written to a <target-file>.rej file. Conflicts can then be resolved
4054 written to a <target-file>.rej file. Conflicts can then be resolved
4055 by hand before :hg:`commit --amend` is run to update the created
4055 by hand before :hg:`commit --amend` is run to update the created
4056 changeset. This flag exists to let people import patches that
4056 changeset. This flag exists to let people import patches that
4057 partially apply without losing the associated metadata (author,
4057 partially apply without losing the associated metadata (author,
4058 date, description, ...). Note that when none of the hunk applies
4058 date, description, ...). Note that when none of the hunk applies
4059 cleanly, :hg:`import --partial` will create an empty changeset,
4059 cleanly, :hg:`import --partial` will create an empty changeset,
4060 importing only the patch metadata.
4060 importing only the patch metadata.
4061
4061
4062 To read a patch from standard input, use "-" as the patch name. If
4062 To read a patch from standard input, use "-" as the patch name. If
4063 a URL is specified, the patch will be downloaded from it.
4063 a URL is specified, the patch will be downloaded from it.
4064 See :hg:`help dates` for a list of formats valid for -d/--date.
4064 See :hg:`help dates` for a list of formats valid for -d/--date.
4065
4065
4066 .. container:: verbose
4066 .. container:: verbose
4067
4067
4068 Examples:
4068 Examples:
4069
4069
4070 - import a traditional patch from a website and detect renames::
4070 - import a traditional patch from a website and detect renames::
4071
4071
4072 hg import -s 80 http://example.com/bugfix.patch
4072 hg import -s 80 http://example.com/bugfix.patch
4073
4073
4074 - import a changeset from an hgweb server::
4074 - import a changeset from an hgweb server::
4075
4075
4076 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4076 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4077
4077
4078 - import all the patches in an Unix-style mbox::
4078 - import all the patches in an Unix-style mbox::
4079
4079
4080 hg import incoming-patches.mbox
4080 hg import incoming-patches.mbox
4081
4081
4082 - attempt to exactly restore an exported changeset (not always
4082 - attempt to exactly restore an exported changeset (not always
4083 possible)::
4083 possible)::
4084
4084
4085 hg import --exact proposed-fix.patch
4085 hg import --exact proposed-fix.patch
4086
4086
4087 Returns 0 on success, 1 on partial success (see --partial).
4087 Returns 0 on success, 1 on partial success (see --partial).
4088 """
4088 """
4089
4089
4090 if not patch1:
4090 if not patch1:
4091 raise util.Abort(_('need at least one patch to import'))
4091 raise util.Abort(_('need at least one patch to import'))
4092
4092
4093 patches = (patch1,) + patches
4093 patches = (patch1,) + patches
4094
4094
4095 date = opts.get('date')
4095 date = opts.get('date')
4096 if date:
4096 if date:
4097 opts['date'] = util.parsedate(date)
4097 opts['date'] = util.parsedate(date)
4098
4098
4099 update = not opts.get('bypass')
4099 update = not opts.get('bypass')
4100 if not update and opts.get('no_commit'):
4100 if not update and opts.get('no_commit'):
4101 raise util.Abort(_('cannot use --no-commit with --bypass'))
4101 raise util.Abort(_('cannot use --no-commit with --bypass'))
4102 try:
4102 try:
4103 sim = float(opts.get('similarity') or 0)
4103 sim = float(opts.get('similarity') or 0)
4104 except ValueError:
4104 except ValueError:
4105 raise util.Abort(_('similarity must be a number'))
4105 raise util.Abort(_('similarity must be a number'))
4106 if sim < 0 or sim > 100:
4106 if sim < 0 or sim > 100:
4107 raise util.Abort(_('similarity must be between 0 and 100'))
4107 raise util.Abort(_('similarity must be between 0 and 100'))
4108 if sim and not update:
4108 if sim and not update:
4109 raise util.Abort(_('cannot use --similarity with --bypass'))
4109 raise util.Abort(_('cannot use --similarity with --bypass'))
4110 if opts.get('exact') and opts.get('edit'):
4110 if opts.get('exact') and opts.get('edit'):
4111 raise util.Abort(_('cannot use --exact with --edit'))
4111 raise util.Abort(_('cannot use --exact with --edit'))
4112
4112
4113 if update:
4113 if update:
4114 cmdutil.checkunfinished(repo)
4114 cmdutil.checkunfinished(repo)
4115 if (opts.get('exact') or not opts.get('force')) and update:
4115 if (opts.get('exact') or not opts.get('force')) and update:
4116 cmdutil.bailifchanged(repo)
4116 cmdutil.bailifchanged(repo)
4117
4117
4118 base = opts["base"]
4118 base = opts["base"]
4119 wlock = lock = tr = None
4119 wlock = lock = tr = None
4120 msgs = []
4120 msgs = []
4121 ret = 0
4121 ret = 0
4122
4122
4123
4123
4124 try:
4124 try:
4125 try:
4125 try:
4126 wlock = repo.wlock()
4126 wlock = repo.wlock()
4127 repo.dirstate.beginparentchange()
4127 repo.dirstate.beginparentchange()
4128 if not opts.get('no_commit'):
4128 if not opts.get('no_commit'):
4129 lock = repo.lock()
4129 lock = repo.lock()
4130 tr = repo.transaction('import')
4130 tr = repo.transaction('import')
4131 parents = repo.parents()
4131 parents = repo.parents()
4132 for patchurl in patches:
4132 for patchurl in patches:
4133 if patchurl == '-':
4133 if patchurl == '-':
4134 ui.status(_('applying patch from stdin\n'))
4134 ui.status(_('applying patch from stdin\n'))
4135 patchfile = ui.fin
4135 patchfile = ui.fin
4136 patchurl = 'stdin' # for error message
4136 patchurl = 'stdin' # for error message
4137 else:
4137 else:
4138 patchurl = os.path.join(base, patchurl)
4138 patchurl = os.path.join(base, patchurl)
4139 ui.status(_('applying %s\n') % patchurl)
4139 ui.status(_('applying %s\n') % patchurl)
4140 patchfile = hg.openpath(ui, patchurl)
4140 patchfile = hg.openpath(ui, patchurl)
4141
4141
4142 haspatch = False
4142 haspatch = False
4143 for hunk in patch.split(patchfile):
4143 for hunk in patch.split(patchfile):
4144 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4144 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4145 parents, opts,
4145 parents, opts,
4146 msgs, hg.clean)
4146 msgs, hg.clean)
4147 if msg:
4147 if msg:
4148 haspatch = True
4148 haspatch = True
4149 ui.note(msg + '\n')
4149 ui.note(msg + '\n')
4150 if update or opts.get('exact'):
4150 if update or opts.get('exact'):
4151 parents = repo.parents()
4151 parents = repo.parents()
4152 else:
4152 else:
4153 parents = [repo[node]]
4153 parents = [repo[node]]
4154 if rej:
4154 if rej:
4155 ui.write_err(_("patch applied partially\n"))
4155 ui.write_err(_("patch applied partially\n"))
4156 ui.write_err(_("(fix the .rej files and run "
4156 ui.write_err(_("(fix the .rej files and run "
4157 "`hg commit --amend`)\n"))
4157 "`hg commit --amend`)\n"))
4158 ret = 1
4158 ret = 1
4159 break
4159 break
4160
4160
4161 if not haspatch:
4161 if not haspatch:
4162 raise util.Abort(_('%s: no diffs found') % patchurl)
4162 raise util.Abort(_('%s: no diffs found') % patchurl)
4163
4163
4164 if tr:
4164 if tr:
4165 tr.close()
4165 tr.close()
4166 if msgs:
4166 if msgs:
4167 repo.savecommitmessage('\n* * *\n'.join(msgs))
4167 repo.savecommitmessage('\n* * *\n'.join(msgs))
4168 repo.dirstate.endparentchange()
4168 repo.dirstate.endparentchange()
4169 return ret
4169 return ret
4170 except: # re-raises
4170 except: # re-raises
4171 # wlock.release() indirectly calls dirstate.write(): since
4171 # wlock.release() indirectly calls dirstate.write(): since
4172 # we're crashing, we do not want to change the working dir
4172 # we're crashing, we do not want to change the working dir
4173 # parent after all, so make sure it writes nothing
4173 # parent after all, so make sure it writes nothing
4174 repo.dirstate.invalidate()
4174 repo.dirstate.invalidate()
4175 raise
4175 raise
4176 finally:
4176 finally:
4177 if tr:
4177 if tr:
4178 tr.release()
4178 tr.release()
4179 release(lock, wlock)
4179 release(lock, wlock)
4180
4180
4181 @command('incoming|in',
4181 @command('incoming|in',
4182 [('f', 'force', None,
4182 [('f', 'force', None,
4183 _('run even if remote repository is unrelated')),
4183 _('run even if remote repository is unrelated')),
4184 ('n', 'newest-first', None, _('show newest record first')),
4184 ('n', 'newest-first', None, _('show newest record first')),
4185 ('', 'bundle', '',
4185 ('', 'bundle', '',
4186 _('file to store the bundles into'), _('FILE')),
4186 _('file to store the bundles into'), _('FILE')),
4187 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4187 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4188 ('B', 'bookmarks', False, _("compare bookmarks")),
4188 ('B', 'bookmarks', False, _("compare bookmarks")),
4189 ('b', 'branch', [],
4189 ('b', 'branch', [],
4190 _('a specific branch you would like to pull'), _('BRANCH')),
4190 _('a specific branch you would like to pull'), _('BRANCH')),
4191 ] + logopts + remoteopts + subrepoopts,
4191 ] + logopts + remoteopts + subrepoopts,
4192 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
4192 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
4193 def incoming(ui, repo, source="default", **opts):
4193 def incoming(ui, repo, source="default", **opts):
4194 """show new changesets found in source
4194 """show new changesets found in source
4195
4195
4196 Show new changesets found in the specified path/URL or the default
4196 Show new changesets found in the specified path/URL or the default
4197 pull location. These are the changesets that would have been pulled
4197 pull location. These are the changesets that would have been pulled
4198 if a pull at the time you issued this command.
4198 if a pull at the time you issued this command.
4199
4199
4200 For remote repository, using --bundle avoids downloading the
4200 For remote repository, using --bundle avoids downloading the
4201 changesets twice if the incoming is followed by a pull.
4201 changesets twice if the incoming is followed by a pull.
4202
4202
4203 See pull for valid source format details.
4203 See pull for valid source format details.
4204
4204
4205 .. container:: verbose
4205 .. container:: verbose
4206
4206
4207 Examples:
4207 Examples:
4208
4208
4209 - show incoming changes with patches and full description::
4209 - show incoming changes with patches and full description::
4210
4210
4211 hg incoming -vp
4211 hg incoming -vp
4212
4212
4213 - show incoming changes excluding merges, store a bundle::
4213 - show incoming changes excluding merges, store a bundle::
4214
4214
4215 hg in -vpM --bundle incoming.hg
4215 hg in -vpM --bundle incoming.hg
4216 hg pull incoming.hg
4216 hg pull incoming.hg
4217
4217
4218 - briefly list changes inside a bundle::
4218 - briefly list changes inside a bundle::
4219
4219
4220 hg in changes.hg -T "{desc|firstline}\\n"
4220 hg in changes.hg -T "{desc|firstline}\\n"
4221
4221
4222 Returns 0 if there are incoming changes, 1 otherwise.
4222 Returns 0 if there are incoming changes, 1 otherwise.
4223 """
4223 """
4224 if opts.get('graph'):
4224 if opts.get('graph'):
4225 cmdutil.checkunsupportedgraphflags([], opts)
4225 cmdutil.checkunsupportedgraphflags([], opts)
4226 def display(other, chlist, displayer):
4226 def display(other, chlist, displayer):
4227 revdag = cmdutil.graphrevs(other, chlist, opts)
4227 revdag = cmdutil.graphrevs(other, chlist, opts)
4228 showparents = [ctx.node() for ctx in repo[None].parents()]
4228 showparents = [ctx.node() for ctx in repo[None].parents()]
4229 cmdutil.displaygraph(ui, revdag, displayer, showparents,
4229 cmdutil.displaygraph(ui, revdag, displayer, showparents,
4230 graphmod.asciiedges)
4230 graphmod.asciiedges)
4231
4231
4232 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4232 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4233 return 0
4233 return 0
4234
4234
4235 if opts.get('bundle') and opts.get('subrepos'):
4235 if opts.get('bundle') and opts.get('subrepos'):
4236 raise util.Abort(_('cannot combine --bundle and --subrepos'))
4236 raise util.Abort(_('cannot combine --bundle and --subrepos'))
4237
4237
4238 if opts.get('bookmarks'):
4238 if opts.get('bookmarks'):
4239 source, branches = hg.parseurl(ui.expandpath(source),
4239 source, branches = hg.parseurl(ui.expandpath(source),
4240 opts.get('branch'))
4240 opts.get('branch'))
4241 other = hg.peer(repo, opts, source)
4241 other = hg.peer(repo, opts, source)
4242 if 'bookmarks' not in other.listkeys('namespaces'):
4242 if 'bookmarks' not in other.listkeys('namespaces'):
4243 ui.warn(_("remote doesn't support bookmarks\n"))
4243 ui.warn(_("remote doesn't support bookmarks\n"))
4244 return 0
4244 return 0
4245 ui.status(_('comparing with %s\n') % util.hidepassword(source))
4245 ui.status(_('comparing with %s\n') % util.hidepassword(source))
4246 return bookmarks.diff(ui, repo, other)
4246 return bookmarks.diff(ui, repo, other)
4247
4247
4248 repo._subtoppath = ui.expandpath(source)
4248 repo._subtoppath = ui.expandpath(source)
4249 try:
4249 try:
4250 return hg.incoming(ui, repo, source, opts)
4250 return hg.incoming(ui, repo, source, opts)
4251 finally:
4251 finally:
4252 del repo._subtoppath
4252 del repo._subtoppath
4253
4253
4254
4254
4255 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
4255 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
4256 norepo=True)
4256 norepo=True)
4257 def init(ui, dest=".", **opts):
4257 def init(ui, dest=".", **opts):
4258 """create a new repository in the given directory
4258 """create a new repository in the given directory
4259
4259
4260 Initialize a new repository in the given directory. If the given
4260 Initialize a new repository in the given directory. If the given
4261 directory does not exist, it will be created.
4261 directory does not exist, it will be created.
4262
4262
4263 If no directory is given, the current directory is used.
4263 If no directory is given, the current directory is used.
4264
4264
4265 It is possible to specify an ``ssh://`` URL as the destination.
4265 It is possible to specify an ``ssh://`` URL as the destination.
4266 See :hg:`help urls` for more information.
4266 See :hg:`help urls` for more information.
4267
4267
4268 Returns 0 on success.
4268 Returns 0 on success.
4269 """
4269 """
4270 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4270 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4271
4271
4272 @command('locate',
4272 @command('locate',
4273 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
4273 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
4274 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4274 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4275 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
4275 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
4276 ] + walkopts,
4276 ] + walkopts,
4277 _('[OPTION]... [PATTERN]...'))
4277 _('[OPTION]... [PATTERN]...'))
4278 def locate(ui, repo, *pats, **opts):
4278 def locate(ui, repo, *pats, **opts):
4279 """locate files matching specific patterns (DEPRECATED)
4279 """locate files matching specific patterns (DEPRECATED)
4280
4280
4281 Print files under Mercurial control in the working directory whose
4281 Print files under Mercurial control in the working directory whose
4282 names match the given patterns.
4282 names match the given patterns.
4283
4283
4284 By default, this command searches all directories in the working
4284 By default, this command searches all directories in the working
4285 directory. To search just the current directory and its
4285 directory. To search just the current directory and its
4286 subdirectories, use "--include .".
4286 subdirectories, use "--include .".
4287
4287
4288 If no patterns are given to match, this command prints the names
4288 If no patterns are given to match, this command prints the names
4289 of all files under Mercurial control in the working directory.
4289 of all files under Mercurial control in the working directory.
4290
4290
4291 If you want to feed the output of this command into the "xargs"
4291 If you want to feed the output of this command into the "xargs"
4292 command, use the -0 option to both this command and "xargs". This
4292 command, use the -0 option to both this command and "xargs". This
4293 will avoid the problem of "xargs" treating single filenames that
4293 will avoid the problem of "xargs" treating single filenames that
4294 contain whitespace as multiple filenames.
4294 contain whitespace as multiple filenames.
4295
4295
4296 See :hg:`help files` for a more versatile command.
4296 See :hg:`help files` for a more versatile command.
4297
4297
4298 Returns 0 if a match is found, 1 otherwise.
4298 Returns 0 if a match is found, 1 otherwise.
4299 """
4299 """
4300 end = opts.get('print0') and '\0' or '\n'
4300 end = opts.get('print0') and '\0' or '\n'
4301 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
4301 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
4302
4302
4303 ret = 1
4303 ret = 1
4304 ctx = repo[rev]
4304 ctx = repo[rev]
4305 m = scmutil.match(ctx, pats, opts, default='relglob')
4305 m = scmutil.match(ctx, pats, opts, default='relglob')
4306 m.bad = lambda x, y: False
4306 m.bad = lambda x, y: False
4307
4307
4308 for abs in ctx.matches(m):
4308 for abs in ctx.matches(m):
4309 if opts.get('fullpath'):
4309 if opts.get('fullpath'):
4310 ui.write(repo.wjoin(abs), end)
4310 ui.write(repo.wjoin(abs), end)
4311 else:
4311 else:
4312 ui.write(((pats and m.rel(abs)) or abs), end)
4312 ui.write(((pats and m.rel(abs)) or abs), end)
4313 ret = 0
4313 ret = 0
4314
4314
4315 return ret
4315 return ret
4316
4316
4317 @command('^log|history',
4317 @command('^log|history',
4318 [('f', 'follow', None,
4318 [('f', 'follow', None,
4319 _('follow changeset history, or file history across copies and renames')),
4319 _('follow changeset history, or file history across copies and renames')),
4320 ('', 'follow-first', None,
4320 ('', 'follow-first', None,
4321 _('only follow the first parent of merge changesets (DEPRECATED)')),
4321 _('only follow the first parent of merge changesets (DEPRECATED)')),
4322 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
4322 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
4323 ('C', 'copies', None, _('show copied files')),
4323 ('C', 'copies', None, _('show copied files')),
4324 ('k', 'keyword', [],
4324 ('k', 'keyword', [],
4325 _('do case-insensitive search for a given text'), _('TEXT')),
4325 _('do case-insensitive search for a given text'), _('TEXT')),
4326 ('r', 'rev', [], _('show the specified revision or range'), _('REV')),
4326 ('r', 'rev', [], _('show the specified revision or range'), _('REV')),
4327 ('', 'removed', None, _('include revisions where files were removed')),
4327 ('', 'removed', None, _('include revisions where files were removed')),
4328 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
4328 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
4329 ('u', 'user', [], _('revisions committed by user'), _('USER')),
4329 ('u', 'user', [], _('revisions committed by user'), _('USER')),
4330 ('', 'only-branch', [],
4330 ('', 'only-branch', [],
4331 _('show only changesets within the given named branch (DEPRECATED)'),
4331 _('show only changesets within the given named branch (DEPRECATED)'),
4332 _('BRANCH')),
4332 _('BRANCH')),
4333 ('b', 'branch', [],
4333 ('b', 'branch', [],
4334 _('show changesets within the given named branch'), _('BRANCH')),
4334 _('show changesets within the given named branch'), _('BRANCH')),
4335 ('P', 'prune', [],
4335 ('P', 'prune', [],
4336 _('do not display revision or any of its ancestors'), _('REV')),
4336 _('do not display revision or any of its ancestors'), _('REV')),
4337 ] + logopts + walkopts,
4337 ] + logopts + walkopts,
4338 _('[OPTION]... [FILE]'),
4338 _('[OPTION]... [FILE]'),
4339 inferrepo=True)
4339 inferrepo=True)
4340 def log(ui, repo, *pats, **opts):
4340 def log(ui, repo, *pats, **opts):
4341 """show revision history of entire repository or files
4341 """show revision history of entire repository or files
4342
4342
4343 Print the revision history of the specified files or the entire
4343 Print the revision history of the specified files or the entire
4344 project.
4344 project.
4345
4345
4346 If no revision range is specified, the default is ``tip:0`` unless
4346 If no revision range is specified, the default is ``tip:0`` unless
4347 --follow is set, in which case the working directory parent is
4347 --follow is set, in which case the working directory parent is
4348 used as the starting revision.
4348 used as the starting revision.
4349
4349
4350 File history is shown without following rename or copy history of
4350 File history is shown without following rename or copy history of
4351 files. Use -f/--follow with a filename to follow history across
4351 files. Use -f/--follow with a filename to follow history across
4352 renames and copies. --follow without a filename will only show
4352 renames and copies. --follow without a filename will only show
4353 ancestors or descendants of the starting revision.
4353 ancestors or descendants of the starting revision.
4354
4354
4355 By default this command prints revision number and changeset id,
4355 By default this command prints revision number and changeset id,
4356 tags, non-trivial parents, user, date and time, and a summary for
4356 tags, non-trivial parents, user, date and time, and a summary for
4357 each commit. When the -v/--verbose switch is used, the list of
4357 each commit. When the -v/--verbose switch is used, the list of
4358 changed files and full commit message are shown.
4358 changed files and full commit message are shown.
4359
4359
4360 With --graph the revisions are shown as an ASCII art DAG with the most
4360 With --graph the revisions are shown as an ASCII art DAG with the most
4361 recent changeset at the top.
4361 recent changeset at the top.
4362 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
4362 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
4363 and '+' represents a fork where the changeset from the lines below is a
4363 and '+' represents a fork where the changeset from the lines below is a
4364 parent of the 'o' merge on the same line.
4364 parent of the 'o' merge on the same line.
4365
4365
4366 .. note::
4366 .. note::
4367
4367
4368 log -p/--patch may generate unexpected diff output for merge
4368 log -p/--patch may generate unexpected diff output for merge
4369 changesets, as it will only compare the merge changeset against
4369 changesets, as it will only compare the merge changeset against
4370 its first parent. Also, only files different from BOTH parents
4370 its first parent. Also, only files different from BOTH parents
4371 will appear in files:.
4371 will appear in files:.
4372
4372
4373 .. note::
4373 .. note::
4374
4374
4375 for performance reasons, log FILE may omit duplicate changes
4375 for performance reasons, log FILE may omit duplicate changes
4376 made on branches and will not show removals or mode changes. To
4376 made on branches and will not show removals or mode changes. To
4377 see all such changes, use the --removed switch.
4377 see all such changes, use the --removed switch.
4378
4378
4379 .. container:: verbose
4379 .. container:: verbose
4380
4380
4381 Some examples:
4381 Some examples:
4382
4382
4383 - changesets with full descriptions and file lists::
4383 - changesets with full descriptions and file lists::
4384
4384
4385 hg log -v
4385 hg log -v
4386
4386
4387 - changesets ancestral to the working directory::
4387 - changesets ancestral to the working directory::
4388
4388
4389 hg log -f
4389 hg log -f
4390
4390
4391 - last 10 commits on the current branch::
4391 - last 10 commits on the current branch::
4392
4392
4393 hg log -l 10 -b .
4393 hg log -l 10 -b .
4394
4394
4395 - changesets showing all modifications of a file, including removals::
4395 - changesets showing all modifications of a file, including removals::
4396
4396
4397 hg log --removed file.c
4397 hg log --removed file.c
4398
4398
4399 - all changesets that touch a directory, with diffs, excluding merges::
4399 - all changesets that touch a directory, with diffs, excluding merges::
4400
4400
4401 hg log -Mp lib/
4401 hg log -Mp lib/
4402
4402
4403 - all revision numbers that match a keyword::
4403 - all revision numbers that match a keyword::
4404
4404
4405 hg log -k bug --template "{rev}\\n"
4405 hg log -k bug --template "{rev}\\n"
4406
4406
4407 - list available log templates::
4407 - list available log templates::
4408
4408
4409 hg log -T list
4409 hg log -T list
4410
4410
4411 - check if a given changeset is included in a tagged release::
4411 - check if a given changeset is included in a tagged release::
4412
4412
4413 hg log -r "a21ccf and ancestor(1.9)"
4413 hg log -r "a21ccf and ancestor(1.9)"
4414
4414
4415 - find all changesets by some user in a date range::
4415 - find all changesets by some user in a date range::
4416
4416
4417 hg log -k alice -d "may 2008 to jul 2008"
4417 hg log -k alice -d "may 2008 to jul 2008"
4418
4418
4419 - summary of all changesets after the last tag::
4419 - summary of all changesets after the last tag::
4420
4420
4421 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4421 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4422
4422
4423 See :hg:`help dates` for a list of formats valid for -d/--date.
4423 See :hg:`help dates` for a list of formats valid for -d/--date.
4424
4424
4425 See :hg:`help revisions` and :hg:`help revsets` for more about
4425 See :hg:`help revisions` and :hg:`help revsets` for more about
4426 specifying revisions.
4426 specifying revisions.
4427
4427
4428 See :hg:`help templates` for more about pre-packaged styles and
4428 See :hg:`help templates` for more about pre-packaged styles and
4429 specifying custom templates.
4429 specifying custom templates.
4430
4430
4431 Returns 0 on success.
4431 Returns 0 on success.
4432
4432
4433 """
4433 """
4434 if opts.get('graph'):
4434 if opts.get('graph'):
4435 return cmdutil.graphlog(ui, repo, *pats, **opts)
4435 return cmdutil.graphlog(ui, repo, *pats, **opts)
4436
4436
4437 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
4437 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
4438 limit = cmdutil.loglimit(opts)
4438 limit = cmdutil.loglimit(opts)
4439 count = 0
4439 count = 0
4440
4440
4441 getrenamed = None
4441 getrenamed = None
4442 if opts.get('copies'):
4442 if opts.get('copies'):
4443 endrev = None
4443 endrev = None
4444 if opts.get('rev'):
4444 if opts.get('rev'):
4445 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
4445 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
4446 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
4446 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
4447
4447
4448 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
4448 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
4449 for rev in revs:
4449 for rev in revs:
4450 if count == limit:
4450 if count == limit:
4451 break
4451 break
4452 ctx = repo[rev]
4452 ctx = repo[rev]
4453 copies = None
4453 copies = None
4454 if getrenamed is not None and rev:
4454 if getrenamed is not None and rev:
4455 copies = []
4455 copies = []
4456 for fn in ctx.files():
4456 for fn in ctx.files():
4457 rename = getrenamed(fn, rev)
4457 rename = getrenamed(fn, rev)
4458 if rename:
4458 if rename:
4459 copies.append((fn, rename[0]))
4459 copies.append((fn, rename[0]))
4460 revmatchfn = filematcher and filematcher(ctx.rev()) or None
4460 revmatchfn = filematcher and filematcher(ctx.rev()) or None
4461 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
4461 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
4462 if displayer.flush(rev):
4462 if displayer.flush(rev):
4463 count += 1
4463 count += 1
4464
4464
4465 displayer.close()
4465 displayer.close()
4466
4466
4467 @command('manifest',
4467 @command('manifest',
4468 [('r', 'rev', '', _('revision to display'), _('REV')),
4468 [('r', 'rev', '', _('revision to display'), _('REV')),
4469 ('', 'all', False, _("list files from all revisions"))]
4469 ('', 'all', False, _("list files from all revisions"))]
4470 + formatteropts,
4470 + formatteropts,
4471 _('[-r REV]'))
4471 _('[-r REV]'))
4472 def manifest(ui, repo, node=None, rev=None, **opts):
4472 def manifest(ui, repo, node=None, rev=None, **opts):
4473 """output the current or given revision of the project manifest
4473 """output the current or given revision of the project manifest
4474
4474
4475 Print a list of version controlled files for the given revision.
4475 Print a list of version controlled files for the given revision.
4476 If no revision is given, the first parent of the working directory
4476 If no revision is given, the first parent of the working directory
4477 is used, or the null revision if no revision is checked out.
4477 is used, or the null revision if no revision is checked out.
4478
4478
4479 With -v, print file permissions, symlink and executable bits.
4479 With -v, print file permissions, symlink and executable bits.
4480 With --debug, print file revision hashes.
4480 With --debug, print file revision hashes.
4481
4481
4482 If option --all is specified, the list of all files from all revisions
4482 If option --all is specified, the list of all files from all revisions
4483 is printed. This includes deleted and renamed files.
4483 is printed. This includes deleted and renamed files.
4484
4484
4485 Returns 0 on success.
4485 Returns 0 on success.
4486 """
4486 """
4487
4487
4488 fm = ui.formatter('manifest', opts)
4488 fm = ui.formatter('manifest', opts)
4489
4489
4490 if opts.get('all'):
4490 if opts.get('all'):
4491 if rev or node:
4491 if rev or node:
4492 raise util.Abort(_("can't specify a revision with --all"))
4492 raise util.Abort(_("can't specify a revision with --all"))
4493
4493
4494 res = []
4494 res = []
4495 prefix = "data/"
4495 prefix = "data/"
4496 suffix = ".i"
4496 suffix = ".i"
4497 plen = len(prefix)
4497 plen = len(prefix)
4498 slen = len(suffix)
4498 slen = len(suffix)
4499 lock = repo.lock()
4499 lock = repo.lock()
4500 try:
4500 try:
4501 for fn, b, size in repo.store.datafiles():
4501 for fn, b, size in repo.store.datafiles():
4502 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
4502 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
4503 res.append(fn[plen:-slen])
4503 res.append(fn[plen:-slen])
4504 finally:
4504 finally:
4505 lock.release()
4505 lock.release()
4506 for f in res:
4506 for f in res:
4507 fm.startitem()
4507 fm.startitem()
4508 fm.write("path", '%s\n', f)
4508 fm.write("path", '%s\n', f)
4509 fm.end()
4509 fm.end()
4510 return
4510 return
4511
4511
4512 if rev and node:
4512 if rev and node:
4513 raise util.Abort(_("please specify just one revision"))
4513 raise util.Abort(_("please specify just one revision"))
4514
4514
4515 if not node:
4515 if not node:
4516 node = rev
4516 node = rev
4517
4517
4518 char = {'l': '@', 'x': '*', '': ''}
4518 char = {'l': '@', 'x': '*', '': ''}
4519 mode = {'l': '644', 'x': '755', '': '644'}
4519 mode = {'l': '644', 'x': '755', '': '644'}
4520 ctx = scmutil.revsingle(repo, node)
4520 ctx = scmutil.revsingle(repo, node)
4521 mf = ctx.manifest()
4521 mf = ctx.manifest()
4522 for f in ctx:
4522 for f in ctx:
4523 fm.startitem()
4523 fm.startitem()
4524 fl = ctx[f].flags()
4524 fl = ctx[f].flags()
4525 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
4525 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
4526 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
4526 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
4527 fm.write('path', '%s\n', f)
4527 fm.write('path', '%s\n', f)
4528 fm.end()
4528 fm.end()
4529
4529
4530 @command('^merge',
4530 @command('^merge',
4531 [('f', 'force', None,
4531 [('f', 'force', None,
4532 _('force a merge including outstanding changes (DEPRECATED)')),
4532 _('force a merge including outstanding changes (DEPRECATED)')),
4533 ('r', 'rev', '', _('revision to merge'), _('REV')),
4533 ('r', 'rev', '', _('revision to merge'), _('REV')),
4534 ('P', 'preview', None,
4534 ('P', 'preview', None,
4535 _('review revisions to merge (no merge is performed)'))
4535 _('review revisions to merge (no merge is performed)'))
4536 ] + mergetoolopts,
4536 ] + mergetoolopts,
4537 _('[-P] [-f] [[-r] REV]'))
4537 _('[-P] [-f] [[-r] REV]'))
4538 def merge(ui, repo, node=None, **opts):
4538 def merge(ui, repo, node=None, **opts):
4539 """merge working directory with another revision
4539 """merge working directory with another revision
4540
4540
4541 The current working directory is updated with all changes made in
4541 The current working directory is updated with all changes made in
4542 the requested revision since the last common predecessor revision.
4542 the requested revision since the last common predecessor revision.
4543
4543
4544 Files that changed between either parent are marked as changed for
4544 Files that changed between either parent are marked as changed for
4545 the next commit and a commit must be performed before any further
4545 the next commit and a commit must be performed before any further
4546 updates to the repository are allowed. The next commit will have
4546 updates to the repository are allowed. The next commit will have
4547 two parents.
4547 two parents.
4548
4548
4549 ``--tool`` can be used to specify the merge tool used for file
4549 ``--tool`` can be used to specify the merge tool used for file
4550 merges. It overrides the HGMERGE environment variable and your
4550 merges. It overrides the HGMERGE environment variable and your
4551 configuration files. See :hg:`help merge-tools` for options.
4551 configuration files. See :hg:`help merge-tools` for options.
4552
4552
4553 If no revision is specified, the working directory's parent is a
4553 If no revision is specified, the working directory's parent is a
4554 head revision, and the current branch contains exactly one other
4554 head revision, and the current branch contains exactly one other
4555 head, the other head is merged with by default. Otherwise, an
4555 head, the other head is merged with by default. Otherwise, an
4556 explicit revision with which to merge with must be provided.
4556 explicit revision with which to merge with must be provided.
4557
4557
4558 :hg:`resolve` must be used to resolve unresolved files.
4558 :hg:`resolve` must be used to resolve unresolved files.
4559
4559
4560 To undo an uncommitted merge, use :hg:`update --clean .` which
4560 To undo an uncommitted merge, use :hg:`update --clean .` which
4561 will check out a clean copy of the original merge parent, losing
4561 will check out a clean copy of the original merge parent, losing
4562 all changes.
4562 all changes.
4563
4563
4564 Returns 0 on success, 1 if there are unresolved files.
4564 Returns 0 on success, 1 if there are unresolved files.
4565 """
4565 """
4566
4566
4567 if opts.get('rev') and node:
4567 if opts.get('rev') and node:
4568 raise util.Abort(_("please specify just one revision"))
4568 raise util.Abort(_("please specify just one revision"))
4569 if not node:
4569 if not node:
4570 node = opts.get('rev')
4570 node = opts.get('rev')
4571
4571
4572 if node:
4572 if node:
4573 node = scmutil.revsingle(repo, node).node()
4573 node = scmutil.revsingle(repo, node).node()
4574
4574
4575 if not node and repo._bookmarkcurrent:
4575 if not node and repo._bookmarkcurrent:
4576 bmheads = repo.bookmarkheads(repo._bookmarkcurrent)
4576 bmheads = repo.bookmarkheads(repo._bookmarkcurrent)
4577 curhead = repo[repo._bookmarkcurrent].node()
4577 curhead = repo[repo._bookmarkcurrent].node()
4578 if len(bmheads) == 2:
4578 if len(bmheads) == 2:
4579 if curhead == bmheads[0]:
4579 if curhead == bmheads[0]:
4580 node = bmheads[1]
4580 node = bmheads[1]
4581 else:
4581 else:
4582 node = bmheads[0]
4582 node = bmheads[0]
4583 elif len(bmheads) > 2:
4583 elif len(bmheads) > 2:
4584 raise util.Abort(_("multiple matching bookmarks to merge - "
4584 raise util.Abort(_("multiple matching bookmarks to merge - "
4585 "please merge with an explicit rev or bookmark"),
4585 "please merge with an explicit rev or bookmark"),
4586 hint=_("run 'hg heads' to see all heads"))
4586 hint=_("run 'hg heads' to see all heads"))
4587 elif len(bmheads) <= 1:
4587 elif len(bmheads) <= 1:
4588 raise util.Abort(_("no matching bookmark to merge - "
4588 raise util.Abort(_("no matching bookmark to merge - "
4589 "please merge with an explicit rev or bookmark"),
4589 "please merge with an explicit rev or bookmark"),
4590 hint=_("run 'hg heads' to see all heads"))
4590 hint=_("run 'hg heads' to see all heads"))
4591
4591
4592 if not node and not repo._bookmarkcurrent:
4592 if not node and not repo._bookmarkcurrent:
4593 branch = repo[None].branch()
4593 branch = repo[None].branch()
4594 bheads = repo.branchheads(branch)
4594 bheads = repo.branchheads(branch)
4595 nbhs = [bh for bh in bheads if not repo[bh].bookmarks()]
4595 nbhs = [bh for bh in bheads if not repo[bh].bookmarks()]
4596
4596
4597 if len(nbhs) > 2:
4597 if len(nbhs) > 2:
4598 raise util.Abort(_("branch '%s' has %d heads - "
4598 raise util.Abort(_("branch '%s' has %d heads - "
4599 "please merge with an explicit rev")
4599 "please merge with an explicit rev")
4600 % (branch, len(bheads)),
4600 % (branch, len(bheads)),
4601 hint=_("run 'hg heads .' to see heads"))
4601 hint=_("run 'hg heads .' to see heads"))
4602
4602
4603 parent = repo.dirstate.p1()
4603 parent = repo.dirstate.p1()
4604 if len(nbhs) <= 1:
4604 if len(nbhs) <= 1:
4605 if len(bheads) > 1:
4605 if len(bheads) > 1:
4606 raise util.Abort(_("heads are bookmarked - "
4606 raise util.Abort(_("heads are bookmarked - "
4607 "please merge with an explicit rev"),
4607 "please merge with an explicit rev"),
4608 hint=_("run 'hg heads' to see all heads"))
4608 hint=_("run 'hg heads' to see all heads"))
4609 if len(repo.heads()) > 1:
4609 if len(repo.heads()) > 1:
4610 raise util.Abort(_("branch '%s' has one head - "
4610 raise util.Abort(_("branch '%s' has one head - "
4611 "please merge with an explicit rev")
4611 "please merge with an explicit rev")
4612 % branch,
4612 % branch,
4613 hint=_("run 'hg heads' to see all heads"))
4613 hint=_("run 'hg heads' to see all heads"))
4614 msg, hint = _('nothing to merge'), None
4614 msg, hint = _('nothing to merge'), None
4615 if parent != repo.lookup(branch):
4615 if parent != repo.lookup(branch):
4616 hint = _("use 'hg update' instead")
4616 hint = _("use 'hg update' instead")
4617 raise util.Abort(msg, hint=hint)
4617 raise util.Abort(msg, hint=hint)
4618
4618
4619 if parent not in bheads:
4619 if parent not in bheads:
4620 raise util.Abort(_('working directory not at a head revision'),
4620 raise util.Abort(_('working directory not at a head revision'),
4621 hint=_("use 'hg update' or merge with an "
4621 hint=_("use 'hg update' or merge with an "
4622 "explicit revision"))
4622 "explicit revision"))
4623 if parent == nbhs[0]:
4623 if parent == nbhs[0]:
4624 node = nbhs[-1]
4624 node = nbhs[-1]
4625 else:
4625 else:
4626 node = nbhs[0]
4626 node = nbhs[0]
4627
4627
4628 if opts.get('preview'):
4628 if opts.get('preview'):
4629 # find nodes that are ancestors of p2 but not of p1
4629 # find nodes that are ancestors of p2 but not of p1
4630 p1 = repo.lookup('.')
4630 p1 = repo.lookup('.')
4631 p2 = repo.lookup(node)
4631 p2 = repo.lookup(node)
4632 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4632 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4633
4633
4634 displayer = cmdutil.show_changeset(ui, repo, opts)
4634 displayer = cmdutil.show_changeset(ui, repo, opts)
4635 for node in nodes:
4635 for node in nodes:
4636 displayer.show(repo[node])
4636 displayer.show(repo[node])
4637 displayer.close()
4637 displayer.close()
4638 return 0
4638 return 0
4639
4639
4640 try:
4640 try:
4641 # ui.forcemerge is an internal variable, do not document
4641 # ui.forcemerge is an internal variable, do not document
4642 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
4642 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
4643 return hg.merge(repo, node, force=opts.get('force'))
4643 return hg.merge(repo, node, force=opts.get('force'))
4644 finally:
4644 finally:
4645 ui.setconfig('ui', 'forcemerge', '', 'merge')
4645 ui.setconfig('ui', 'forcemerge', '', 'merge')
4646
4646
4647 @command('outgoing|out',
4647 @command('outgoing|out',
4648 [('f', 'force', None, _('run even when the destination is unrelated')),
4648 [('f', 'force', None, _('run even when the destination is unrelated')),
4649 ('r', 'rev', [],
4649 ('r', 'rev', [],
4650 _('a changeset intended to be included in the destination'), _('REV')),
4650 _('a changeset intended to be included in the destination'), _('REV')),
4651 ('n', 'newest-first', None, _('show newest record first')),
4651 ('n', 'newest-first', None, _('show newest record first')),
4652 ('B', 'bookmarks', False, _('compare bookmarks')),
4652 ('B', 'bookmarks', False, _('compare bookmarks')),
4653 ('b', 'branch', [], _('a specific branch you would like to push'),
4653 ('b', 'branch', [], _('a specific branch you would like to push'),
4654 _('BRANCH')),
4654 _('BRANCH')),
4655 ] + logopts + remoteopts + subrepoopts,
4655 ] + logopts + remoteopts + subrepoopts,
4656 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
4656 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
4657 def outgoing(ui, repo, dest=None, **opts):
4657 def outgoing(ui, repo, dest=None, **opts):
4658 """show changesets not found in the destination
4658 """show changesets not found in the destination
4659
4659
4660 Show changesets not found in the specified destination repository
4660 Show changesets not found in the specified destination repository
4661 or the default push location. These are the changesets that would
4661 or the default push location. These are the changesets that would
4662 be pushed if a push was requested.
4662 be pushed if a push was requested.
4663
4663
4664 See pull for details of valid destination formats.
4664 See pull for details of valid destination formats.
4665
4665
4666 Returns 0 if there are outgoing changes, 1 otherwise.
4666 Returns 0 if there are outgoing changes, 1 otherwise.
4667 """
4667 """
4668 if opts.get('graph'):
4668 if opts.get('graph'):
4669 cmdutil.checkunsupportedgraphflags([], opts)
4669 cmdutil.checkunsupportedgraphflags([], opts)
4670 o, other = hg._outgoing(ui, repo, dest, opts)
4670 o, other = hg._outgoing(ui, repo, dest, opts)
4671 if not o:
4671 if not o:
4672 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4672 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4673 return
4673 return
4674
4674
4675 revdag = cmdutil.graphrevs(repo, o, opts)
4675 revdag = cmdutil.graphrevs(repo, o, opts)
4676 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
4676 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
4677 showparents = [ctx.node() for ctx in repo[None].parents()]
4677 showparents = [ctx.node() for ctx in repo[None].parents()]
4678 cmdutil.displaygraph(ui, revdag, displayer, showparents,
4678 cmdutil.displaygraph(ui, revdag, displayer, showparents,
4679 graphmod.asciiedges)
4679 graphmod.asciiedges)
4680 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4680 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4681 return 0
4681 return 0
4682
4682
4683 if opts.get('bookmarks'):
4683 if opts.get('bookmarks'):
4684 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4684 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4685 dest, branches = hg.parseurl(dest, opts.get('branch'))
4685 dest, branches = hg.parseurl(dest, opts.get('branch'))
4686 other = hg.peer(repo, opts, dest)
4686 other = hg.peer(repo, opts, dest)
4687 if 'bookmarks' not in other.listkeys('namespaces'):
4687 if 'bookmarks' not in other.listkeys('namespaces'):
4688 ui.warn(_("remote doesn't support bookmarks\n"))
4688 ui.warn(_("remote doesn't support bookmarks\n"))
4689 return 0
4689 return 0
4690 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4690 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4691 return bookmarks.diff(ui, other, repo)
4691 return bookmarks.diff(ui, other, repo)
4692
4692
4693 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
4693 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
4694 try:
4694 try:
4695 return hg.outgoing(ui, repo, dest, opts)
4695 return hg.outgoing(ui, repo, dest, opts)
4696 finally:
4696 finally:
4697 del repo._subtoppath
4697 del repo._subtoppath
4698
4698
4699 @command('parents',
4699 @command('parents',
4700 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4700 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4701 ] + templateopts,
4701 ] + templateopts,
4702 _('[-r REV] [FILE]'),
4702 _('[-r REV] [FILE]'),
4703 inferrepo=True)
4703 inferrepo=True)
4704 def parents(ui, repo, file_=None, **opts):
4704 def parents(ui, repo, file_=None, **opts):
4705 """show the parents of the working directory or revision (DEPRECATED)
4705 """show the parents of the working directory or revision (DEPRECATED)
4706
4706
4707 Print the working directory's parent revisions. If a revision is
4707 Print the working directory's parent revisions. If a revision is
4708 given via -r/--rev, the parent of that revision will be printed.
4708 given via -r/--rev, the parent of that revision will be printed.
4709 If a file argument is given, the revision in which the file was
4709 If a file argument is given, the revision in which the file was
4710 last changed (before the working directory revision or the
4710 last changed (before the working directory revision or the
4711 argument to --rev if given) is printed.
4711 argument to --rev if given) is printed.
4712
4712
4713 See :hg:`summary` and :hg:`help revsets` for related information.
4713 See :hg:`summary` and :hg:`help revsets` for related information.
4714
4714
4715 Returns 0 on success.
4715 Returns 0 on success.
4716 """
4716 """
4717
4717
4718 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4718 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4719
4719
4720 if file_:
4720 if file_:
4721 m = scmutil.match(ctx, (file_,), opts)
4721 m = scmutil.match(ctx, (file_,), opts)
4722 if m.anypats() or len(m.files()) != 1:
4722 if m.anypats() or len(m.files()) != 1:
4723 raise util.Abort(_('can only specify an explicit filename'))
4723 raise util.Abort(_('can only specify an explicit filename'))
4724 file_ = m.files()[0]
4724 file_ = m.files()[0]
4725 filenodes = []
4725 filenodes = []
4726 for cp in ctx.parents():
4726 for cp in ctx.parents():
4727 if not cp:
4727 if not cp:
4728 continue
4728 continue
4729 try:
4729 try:
4730 filenodes.append(cp.filenode(file_))
4730 filenodes.append(cp.filenode(file_))
4731 except error.LookupError:
4731 except error.LookupError:
4732 pass
4732 pass
4733 if not filenodes:
4733 if not filenodes:
4734 raise util.Abort(_("'%s' not found in manifest!") % file_)
4734 raise util.Abort(_("'%s' not found in manifest!") % file_)
4735 p = []
4735 p = []
4736 for fn in filenodes:
4736 for fn in filenodes:
4737 fctx = repo.filectx(file_, fileid=fn)
4737 fctx = repo.filectx(file_, fileid=fn)
4738 p.append(fctx.node())
4738 p.append(fctx.node())
4739 else:
4739 else:
4740 p = [cp.node() for cp in ctx.parents()]
4740 p = [cp.node() for cp in ctx.parents()]
4741
4741
4742 displayer = cmdutil.show_changeset(ui, repo, opts)
4742 displayer = cmdutil.show_changeset(ui, repo, opts)
4743 for n in p:
4743 for n in p:
4744 if n != nullid:
4744 if n != nullid:
4745 displayer.show(repo[n])
4745 displayer.show(repo[n])
4746 displayer.close()
4746 displayer.close()
4747
4747
4748 @command('paths', [], _('[NAME]'), optionalrepo=True)
4748 @command('paths', [], _('[NAME]'), optionalrepo=True)
4749 def paths(ui, repo, search=None):
4749 def paths(ui, repo, search=None):
4750 """show aliases for remote repositories
4750 """show aliases for remote repositories
4751
4751
4752 Show definition of symbolic path name NAME. If no name is given,
4752 Show definition of symbolic path name NAME. If no name is given,
4753 show definition of all available names.
4753 show definition of all available names.
4754
4754
4755 Option -q/--quiet suppresses all output when searching for NAME
4755 Option -q/--quiet suppresses all output when searching for NAME
4756 and shows only the path names when listing all definitions.
4756 and shows only the path names when listing all definitions.
4757
4757
4758 Path names are defined in the [paths] section of your
4758 Path names are defined in the [paths] section of your
4759 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4759 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4760 repository, ``.hg/hgrc`` is used, too.
4760 repository, ``.hg/hgrc`` is used, too.
4761
4761
4762 The path names ``default`` and ``default-push`` have a special
4762 The path names ``default`` and ``default-push`` have a special
4763 meaning. When performing a push or pull operation, they are used
4763 meaning. When performing a push or pull operation, they are used
4764 as fallbacks if no location is specified on the command-line.
4764 as fallbacks if no location is specified on the command-line.
4765 When ``default-push`` is set, it will be used for push and
4765 When ``default-push`` is set, it will be used for push and
4766 ``default`` will be used for pull; otherwise ``default`` is used
4766 ``default`` will be used for pull; otherwise ``default`` is used
4767 as the fallback for both. When cloning a repository, the clone
4767 as the fallback for both. When cloning a repository, the clone
4768 source is written as ``default`` in ``.hg/hgrc``. Note that
4768 source is written as ``default`` in ``.hg/hgrc``. Note that
4769 ``default`` and ``default-push`` apply to all inbound (e.g.
4769 ``default`` and ``default-push`` apply to all inbound (e.g.
4770 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
4770 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
4771 :hg:`bundle`) operations.
4771 :hg:`bundle`) operations.
4772
4772
4773 See :hg:`help urls` for more information.
4773 See :hg:`help urls` for more information.
4774
4774
4775 Returns 0 on success.
4775 Returns 0 on success.
4776 """
4776 """
4777 if search:
4777 if search:
4778 for name, path in ui.configitems("paths"):
4778 for name, path in ui.configitems("paths"):
4779 if name == search:
4779 if name == search:
4780 ui.status("%s\n" % util.hidepassword(path))
4780 ui.status("%s\n" % util.hidepassword(path))
4781 return
4781 return
4782 if not ui.quiet:
4782 if not ui.quiet:
4783 ui.warn(_("not found!\n"))
4783 ui.warn(_("not found!\n"))
4784 return 1
4784 return 1
4785 else:
4785 else:
4786 for name, path in ui.configitems("paths"):
4786 for name, path in ui.configitems("paths"):
4787 if ui.quiet:
4787 if ui.quiet:
4788 ui.write("%s\n" % name)
4788 ui.write("%s\n" % name)
4789 else:
4789 else:
4790 ui.write("%s = %s\n" % (name, util.hidepassword(path)))
4790 ui.write("%s = %s\n" % (name, util.hidepassword(path)))
4791
4791
4792 @command('phase',
4792 @command('phase',
4793 [('p', 'public', False, _('set changeset phase to public')),
4793 [('p', 'public', False, _('set changeset phase to public')),
4794 ('d', 'draft', False, _('set changeset phase to draft')),
4794 ('d', 'draft', False, _('set changeset phase to draft')),
4795 ('s', 'secret', False, _('set changeset phase to secret')),
4795 ('s', 'secret', False, _('set changeset phase to secret')),
4796 ('f', 'force', False, _('allow to move boundary backward')),
4796 ('f', 'force', False, _('allow to move boundary backward')),
4797 ('r', 'rev', [], _('target revision'), _('REV')),
4797 ('r', 'rev', [], _('target revision'), _('REV')),
4798 ],
4798 ],
4799 _('[-p|-d|-s] [-f] [-r] REV...'))
4799 _('[-p|-d|-s] [-f] [-r] REV...'))
4800 def phase(ui, repo, *revs, **opts):
4800 def phase(ui, repo, *revs, **opts):
4801 """set or show the current phase name
4801 """set or show the current phase name
4802
4802
4803 With no argument, show the phase name of specified revisions.
4803 With no argument, show the phase name of specified revisions.
4804
4804
4805 With one of -p/--public, -d/--draft or -s/--secret, change the
4805 With one of -p/--public, -d/--draft or -s/--secret, change the
4806 phase value of the specified revisions.
4806 phase value of the specified revisions.
4807
4807
4808 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
4808 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
4809 lower phase to an higher phase. Phases are ordered as follows::
4809 lower phase to an higher phase. Phases are ordered as follows::
4810
4810
4811 public < draft < secret
4811 public < draft < secret
4812
4812
4813 Returns 0 on success, 1 if no phases were changed or some could not
4813 Returns 0 on success, 1 if no phases were changed or some could not
4814 be changed.
4814 be changed.
4815 """
4815 """
4816 # search for a unique phase argument
4816 # search for a unique phase argument
4817 targetphase = None
4817 targetphase = None
4818 for idx, name in enumerate(phases.phasenames):
4818 for idx, name in enumerate(phases.phasenames):
4819 if opts[name]:
4819 if opts[name]:
4820 if targetphase is not None:
4820 if targetphase is not None:
4821 raise util.Abort(_('only one phase can be specified'))
4821 raise util.Abort(_('only one phase can be specified'))
4822 targetphase = idx
4822 targetphase = idx
4823
4823
4824 # look for specified revision
4824 # look for specified revision
4825 revs = list(revs)
4825 revs = list(revs)
4826 revs.extend(opts['rev'])
4826 revs.extend(opts['rev'])
4827 if not revs:
4827 if not revs:
4828 raise util.Abort(_('no revisions specified'))
4828 raise util.Abort(_('no revisions specified'))
4829
4829
4830 revs = scmutil.revrange(repo, revs)
4830 revs = scmutil.revrange(repo, revs)
4831
4831
4832 lock = None
4832 lock = None
4833 ret = 0
4833 ret = 0
4834 if targetphase is None:
4834 if targetphase is None:
4835 # display
4835 # display
4836 for r in revs:
4836 for r in revs:
4837 ctx = repo[r]
4837 ctx = repo[r]
4838 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
4838 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
4839 else:
4839 else:
4840 tr = None
4840 tr = None
4841 lock = repo.lock()
4841 lock = repo.lock()
4842 try:
4842 try:
4843 tr = repo.transaction("phase")
4843 tr = repo.transaction("phase")
4844 # set phase
4844 # set phase
4845 if not revs:
4845 if not revs:
4846 raise util.Abort(_('empty revision set'))
4846 raise util.Abort(_('empty revision set'))
4847 nodes = [repo[r].node() for r in revs]
4847 nodes = [repo[r].node() for r in revs]
4848 olddata = repo._phasecache.getphaserevs(repo)[:]
4848 olddata = repo._phasecache.getphaserevs(repo)[:]
4849 phases.advanceboundary(repo, tr, targetphase, nodes)
4849 phases.advanceboundary(repo, tr, targetphase, nodes)
4850 if opts['force']:
4850 if opts['force']:
4851 phases.retractboundary(repo, tr, targetphase, nodes)
4851 phases.retractboundary(repo, tr, targetphase, nodes)
4852 tr.close()
4852 tr.close()
4853 finally:
4853 finally:
4854 if tr is not None:
4854 if tr is not None:
4855 tr.release()
4855 tr.release()
4856 lock.release()
4856 lock.release()
4857 # moving revision from public to draft may hide them
4857 # moving revision from public to draft may hide them
4858 # We have to check result on an unfiltered repository
4858 # We have to check result on an unfiltered repository
4859 unfi = repo.unfiltered()
4859 unfi = repo.unfiltered()
4860 newdata = repo._phasecache.getphaserevs(unfi)
4860 newdata = repo._phasecache.getphaserevs(unfi)
4861 changes = sum(o != newdata[i] for i, o in enumerate(olddata))
4861 changes = sum(o != newdata[i] for i, o in enumerate(olddata))
4862 cl = unfi.changelog
4862 cl = unfi.changelog
4863 rejected = [n for n in nodes
4863 rejected = [n for n in nodes
4864 if newdata[cl.rev(n)] < targetphase]
4864 if newdata[cl.rev(n)] < targetphase]
4865 if rejected:
4865 if rejected:
4866 ui.warn(_('cannot move %i changesets to a higher '
4866 ui.warn(_('cannot move %i changesets to a higher '
4867 'phase, use --force\n') % len(rejected))
4867 'phase, use --force\n') % len(rejected))
4868 ret = 1
4868 ret = 1
4869 if changes:
4869 if changes:
4870 msg = _('phase changed for %i changesets\n') % changes
4870 msg = _('phase changed for %i changesets\n') % changes
4871 if ret:
4871 if ret:
4872 ui.status(msg)
4872 ui.status(msg)
4873 else:
4873 else:
4874 ui.note(msg)
4874 ui.note(msg)
4875 else:
4875 else:
4876 ui.warn(_('no phases changed\n'))
4876 ui.warn(_('no phases changed\n'))
4877 ret = 1
4877 ret = 1
4878 return ret
4878 return ret
4879
4879
4880 def postincoming(ui, repo, modheads, optupdate, checkout):
4880 def postincoming(ui, repo, modheads, optupdate, checkout):
4881 if modheads == 0:
4881 if modheads == 0:
4882 return
4882 return
4883 if optupdate:
4883 if optupdate:
4884 checkout, movemarkfrom = bookmarks.calculateupdate(ui, repo, checkout)
4884 checkout, movemarkfrom = bookmarks.calculateupdate(ui, repo, checkout)
4885 try:
4885 try:
4886 ret = hg.update(repo, checkout)
4886 ret = hg.update(repo, checkout)
4887 except util.Abort, inst:
4887 except util.Abort, inst:
4888 ui.warn(_("not updating: %s\n") % str(inst))
4888 ui.warn(_("not updating: %s\n") % str(inst))
4889 if inst.hint:
4889 if inst.hint:
4890 ui.warn(_("(%s)\n") % inst.hint)
4890 ui.warn(_("(%s)\n") % inst.hint)
4891 return 0
4891 return 0
4892 if not ret and not checkout:
4892 if not ret and not checkout:
4893 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
4893 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
4894 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
4894 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
4895 return ret
4895 return ret
4896 if modheads > 1:
4896 if modheads > 1:
4897 currentbranchheads = len(repo.branchheads())
4897 currentbranchheads = len(repo.branchheads())
4898 if currentbranchheads == modheads:
4898 if currentbranchheads == modheads:
4899 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4899 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4900 elif currentbranchheads > 1:
4900 elif currentbranchheads > 1:
4901 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
4901 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
4902 "merge)\n"))
4902 "merge)\n"))
4903 else:
4903 else:
4904 ui.status(_("(run 'hg heads' to see heads)\n"))
4904 ui.status(_("(run 'hg heads' to see heads)\n"))
4905 else:
4905 else:
4906 ui.status(_("(run 'hg update' to get a working copy)\n"))
4906 ui.status(_("(run 'hg update' to get a working copy)\n"))
4907
4907
4908 @command('^pull',
4908 @command('^pull',
4909 [('u', 'update', None,
4909 [('u', 'update', None,
4910 _('update to new branch head if changesets were pulled')),
4910 _('update to new branch head if changesets were pulled')),
4911 ('f', 'force', None, _('run even when remote repository is unrelated')),
4911 ('f', 'force', None, _('run even when remote repository is unrelated')),
4912 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4912 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4913 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4913 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4914 ('b', 'branch', [], _('a specific branch you would like to pull'),
4914 ('b', 'branch', [], _('a specific branch you would like to pull'),
4915 _('BRANCH')),
4915 _('BRANCH')),
4916 ] + remoteopts,
4916 ] + remoteopts,
4917 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4917 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4918 def pull(ui, repo, source="default", **opts):
4918 def pull(ui, repo, source="default", **opts):
4919 """pull changes from the specified source
4919 """pull changes from the specified source
4920
4920
4921 Pull changes from a remote repository to a local one.
4921 Pull changes from a remote repository to a local one.
4922
4922
4923 This finds all changes from the repository at the specified path
4923 This finds all changes from the repository at the specified path
4924 or URL and adds them to a local repository (the current one unless
4924 or URL and adds them to a local repository (the current one unless
4925 -R is specified). By default, this does not update the copy of the
4925 -R is specified). By default, this does not update the copy of the
4926 project in the working directory.
4926 project in the working directory.
4927
4927
4928 Use :hg:`incoming` if you want to see what would have been added
4928 Use :hg:`incoming` if you want to see what would have been added
4929 by a pull at the time you issued this command. If you then decide
4929 by a pull at the time you issued this command. If you then decide
4930 to add those changes to the repository, you should use :hg:`pull
4930 to add those changes to the repository, you should use :hg:`pull
4931 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4931 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4932
4932
4933 If SOURCE is omitted, the 'default' path will be used.
4933 If SOURCE is omitted, the 'default' path will be used.
4934 See :hg:`help urls` for more information.
4934 See :hg:`help urls` for more information.
4935
4935
4936 Returns 0 on success, 1 if an update had unresolved files.
4936 Returns 0 on success, 1 if an update had unresolved files.
4937 """
4937 """
4938 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4938 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4939 other = hg.peer(repo, opts, source)
4939 other = hg.peer(repo, opts, source)
4940 try:
4940 try:
4941 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4941 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4942 revs, checkout = hg.addbranchrevs(repo, other, branches,
4942 revs, checkout = hg.addbranchrevs(repo, other, branches,
4943 opts.get('rev'))
4943 opts.get('rev'))
4944
4944
4945 remotebookmarks = other.listkeys('bookmarks')
4945 remotebookmarks = other.listkeys('bookmarks')
4946
4946
4947 if opts.get('bookmark'):
4947 if opts.get('bookmark'):
4948 if not revs:
4948 if not revs:
4949 revs = []
4949 revs = []
4950 for b in opts['bookmark']:
4950 for b in opts['bookmark']:
4951 if b not in remotebookmarks:
4951 if b not in remotebookmarks:
4952 raise util.Abort(_('remote bookmark %s not found!') % b)
4952 raise util.Abort(_('remote bookmark %s not found!') % b)
4953 revs.append(remotebookmarks[b])
4953 revs.append(remotebookmarks[b])
4954
4954
4955 if revs:
4955 if revs:
4956 try:
4956 try:
4957 revs = [other.lookup(rev) for rev in revs]
4957 revs = [other.lookup(rev) for rev in revs]
4958 except error.CapabilityError:
4958 except error.CapabilityError:
4959 err = _("other repository doesn't support revision lookup, "
4959 err = _("other repository doesn't support revision lookup, "
4960 "so a rev cannot be specified.")
4960 "so a rev cannot be specified.")
4961 raise util.Abort(err)
4961 raise util.Abort(err)
4962
4962
4963 modheads = repo.pull(other, heads=revs, force=opts.get('force'),
4963 modheads = exchange.pull(repo, other, heads=revs,
4964 bookmarks=opts.get('bookmark', ()))
4964 force=opts.get('force'),
4965 bookmarks=opts.get('bookmark', ())).cgresult
4965 if checkout:
4966 if checkout:
4966 checkout = str(repo.changelog.rev(other.lookup(checkout)))
4967 checkout = str(repo.changelog.rev(other.lookup(checkout)))
4967 repo._subtoppath = source
4968 repo._subtoppath = source
4968 try:
4969 try:
4969 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
4970 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
4970
4971
4971 finally:
4972 finally:
4972 del repo._subtoppath
4973 del repo._subtoppath
4973
4974
4974 finally:
4975 finally:
4975 other.close()
4976 other.close()
4976 return ret
4977 return ret
4977
4978
4978 @command('^push',
4979 @command('^push',
4979 [('f', 'force', None, _('force push')),
4980 [('f', 'force', None, _('force push')),
4980 ('r', 'rev', [],
4981 ('r', 'rev', [],
4981 _('a changeset intended to be included in the destination'),
4982 _('a changeset intended to be included in the destination'),
4982 _('REV')),
4983 _('REV')),
4983 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4984 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4984 ('b', 'branch', [],
4985 ('b', 'branch', [],
4985 _('a specific branch you would like to push'), _('BRANCH')),
4986 _('a specific branch you would like to push'), _('BRANCH')),
4986 ('', 'new-branch', False, _('allow pushing a new branch')),
4987 ('', 'new-branch', False, _('allow pushing a new branch')),
4987 ] + remoteopts,
4988 ] + remoteopts,
4988 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4989 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4989 def push(ui, repo, dest=None, **opts):
4990 def push(ui, repo, dest=None, **opts):
4990 """push changes to the specified destination
4991 """push changes to the specified destination
4991
4992
4992 Push changesets from the local repository to the specified
4993 Push changesets from the local repository to the specified
4993 destination.
4994 destination.
4994
4995
4995 This operation is symmetrical to pull: it is identical to a pull
4996 This operation is symmetrical to pull: it is identical to a pull
4996 in the destination repository from the current one.
4997 in the destination repository from the current one.
4997
4998
4998 By default, push will not allow creation of new heads at the
4999 By default, push will not allow creation of new heads at the
4999 destination, since multiple heads would make it unclear which head
5000 destination, since multiple heads would make it unclear which head
5000 to use. In this situation, it is recommended to pull and merge
5001 to use. In this situation, it is recommended to pull and merge
5001 before pushing.
5002 before pushing.
5002
5003
5003 Use --new-branch if you want to allow push to create a new named
5004 Use --new-branch if you want to allow push to create a new named
5004 branch that is not present at the destination. This allows you to
5005 branch that is not present at the destination. This allows you to
5005 only create a new branch without forcing other changes.
5006 only create a new branch without forcing other changes.
5006
5007
5007 .. note::
5008 .. note::
5008
5009
5009 Extra care should be taken with the -f/--force option,
5010 Extra care should be taken with the -f/--force option,
5010 which will push all new heads on all branches, an action which will
5011 which will push all new heads on all branches, an action which will
5011 almost always cause confusion for collaborators.
5012 almost always cause confusion for collaborators.
5012
5013
5013 If -r/--rev is used, the specified revision and all its ancestors
5014 If -r/--rev is used, the specified revision and all its ancestors
5014 will be pushed to the remote repository.
5015 will be pushed to the remote repository.
5015
5016
5016 If -B/--bookmark is used, the specified bookmarked revision, its
5017 If -B/--bookmark is used, the specified bookmarked revision, its
5017 ancestors, and the bookmark will be pushed to the remote
5018 ancestors, and the bookmark will be pushed to the remote
5018 repository.
5019 repository.
5019
5020
5020 Please see :hg:`help urls` for important details about ``ssh://``
5021 Please see :hg:`help urls` for important details about ``ssh://``
5021 URLs. If DESTINATION is omitted, a default path will be used.
5022 URLs. If DESTINATION is omitted, a default path will be used.
5022
5023
5023 Returns 0 if push was successful, 1 if nothing to push.
5024 Returns 0 if push was successful, 1 if nothing to push.
5024 """
5025 """
5025
5026
5026 if opts.get('bookmark'):
5027 if opts.get('bookmark'):
5027 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5028 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5028 for b in opts['bookmark']:
5029 for b in opts['bookmark']:
5029 # translate -B options to -r so changesets get pushed
5030 # translate -B options to -r so changesets get pushed
5030 if b in repo._bookmarks:
5031 if b in repo._bookmarks:
5031 opts.setdefault('rev', []).append(b)
5032 opts.setdefault('rev', []).append(b)
5032 else:
5033 else:
5033 # if we try to push a deleted bookmark, translate it to null
5034 # if we try to push a deleted bookmark, translate it to null
5034 # this lets simultaneous -r, -b options continue working
5035 # this lets simultaneous -r, -b options continue working
5035 opts.setdefault('rev', []).append("null")
5036 opts.setdefault('rev', []).append("null")
5036
5037
5037 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5038 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5038 dest, branches = hg.parseurl(dest, opts.get('branch'))
5039 dest, branches = hg.parseurl(dest, opts.get('branch'))
5039 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5040 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5040 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5041 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5041 try:
5042 try:
5042 other = hg.peer(repo, opts, dest)
5043 other = hg.peer(repo, opts, dest)
5043 except error.RepoError:
5044 except error.RepoError:
5044 if dest == "default-push":
5045 if dest == "default-push":
5045 raise util.Abort(_("default repository not configured!"),
5046 raise util.Abort(_("default repository not configured!"),
5046 hint=_('see the "path" section in "hg help config"'))
5047 hint=_('see the "path" section in "hg help config"'))
5047 else:
5048 else:
5048 raise
5049 raise
5049
5050
5050 if revs:
5051 if revs:
5051 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5052 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5052
5053
5053 repo._subtoppath = dest
5054 repo._subtoppath = dest
5054 try:
5055 try:
5055 # push subrepos depth-first for coherent ordering
5056 # push subrepos depth-first for coherent ordering
5056 c = repo['']
5057 c = repo['']
5057 subs = c.substate # only repos that are committed
5058 subs = c.substate # only repos that are committed
5058 for s in sorted(subs):
5059 for s in sorted(subs):
5059 result = c.sub(s).push(opts)
5060 result = c.sub(s).push(opts)
5060 if result == 0:
5061 if result == 0:
5061 return not result
5062 return not result
5062 finally:
5063 finally:
5063 del repo._subtoppath
5064 del repo._subtoppath
5064 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5065 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5065 newbranch=opts.get('new_branch'),
5066 newbranch=opts.get('new_branch'),
5066 bookmarks=opts.get('bookmark', ()))
5067 bookmarks=opts.get('bookmark', ()))
5067
5068
5068 result = not pushop.cgresult
5069 result = not pushop.cgresult
5069
5070
5070 if pushop.bkresult is not None:
5071 if pushop.bkresult is not None:
5071 if pushop.bkresult == 2:
5072 if pushop.bkresult == 2:
5072 result = 2
5073 result = 2
5073 elif not result and pushop.bkresult:
5074 elif not result and pushop.bkresult:
5074 result = 2
5075 result = 2
5075
5076
5076 return result
5077 return result
5077
5078
5078 @command('recover', [])
5079 @command('recover', [])
5079 def recover(ui, repo):
5080 def recover(ui, repo):
5080 """roll back an interrupted transaction
5081 """roll back an interrupted transaction
5081
5082
5082 Recover from an interrupted commit or pull.
5083 Recover from an interrupted commit or pull.
5083
5084
5084 This command tries to fix the repository status after an
5085 This command tries to fix the repository status after an
5085 interrupted operation. It should only be necessary when Mercurial
5086 interrupted operation. It should only be necessary when Mercurial
5086 suggests it.
5087 suggests it.
5087
5088
5088 Returns 0 if successful, 1 if nothing to recover or verify fails.
5089 Returns 0 if successful, 1 if nothing to recover or verify fails.
5089 """
5090 """
5090 if repo.recover():
5091 if repo.recover():
5091 return hg.verify(repo)
5092 return hg.verify(repo)
5092 return 1
5093 return 1
5093
5094
5094 @command('^remove|rm',
5095 @command('^remove|rm',
5095 [('A', 'after', None, _('record delete for missing files')),
5096 [('A', 'after', None, _('record delete for missing files')),
5096 ('f', 'force', None,
5097 ('f', 'force', None,
5097 _('remove (and delete) file even if added or modified')),
5098 _('remove (and delete) file even if added or modified')),
5098 ] + walkopts,
5099 ] + walkopts,
5099 _('[OPTION]... FILE...'),
5100 _('[OPTION]... FILE...'),
5100 inferrepo=True)
5101 inferrepo=True)
5101 def remove(ui, repo, *pats, **opts):
5102 def remove(ui, repo, *pats, **opts):
5102 """remove the specified files on the next commit
5103 """remove the specified files on the next commit
5103
5104
5104 Schedule the indicated files for removal from the current branch.
5105 Schedule the indicated files for removal from the current branch.
5105
5106
5106 This command schedules the files to be removed at the next commit.
5107 This command schedules the files to be removed at the next commit.
5107 To undo a remove before that, see :hg:`revert`. To undo added
5108 To undo a remove before that, see :hg:`revert`. To undo added
5108 files, see :hg:`forget`.
5109 files, see :hg:`forget`.
5109
5110
5110 .. container:: verbose
5111 .. container:: verbose
5111
5112
5112 -A/--after can be used to remove only files that have already
5113 -A/--after can be used to remove only files that have already
5113 been deleted, -f/--force can be used to force deletion, and -Af
5114 been deleted, -f/--force can be used to force deletion, and -Af
5114 can be used to remove files from the next revision without
5115 can be used to remove files from the next revision without
5115 deleting them from the working directory.
5116 deleting them from the working directory.
5116
5117
5117 The following table details the behavior of remove for different
5118 The following table details the behavior of remove for different
5118 file states (columns) and option combinations (rows). The file
5119 file states (columns) and option combinations (rows). The file
5119 states are Added [A], Clean [C], Modified [M] and Missing [!]
5120 states are Added [A], Clean [C], Modified [M] and Missing [!]
5120 (as reported by :hg:`status`). The actions are Warn, Remove
5121 (as reported by :hg:`status`). The actions are Warn, Remove
5121 (from branch) and Delete (from disk):
5122 (from branch) and Delete (from disk):
5122
5123
5123 ========= == == == ==
5124 ========= == == == ==
5124 opt/state A C M !
5125 opt/state A C M !
5125 ========= == == == ==
5126 ========= == == == ==
5126 none W RD W R
5127 none W RD W R
5127 -f R RD RD R
5128 -f R RD RD R
5128 -A W W W R
5129 -A W W W R
5129 -Af R R R R
5130 -Af R R R R
5130 ========= == == == ==
5131 ========= == == == ==
5131
5132
5132 Note that remove never deletes files in Added [A] state from the
5133 Note that remove never deletes files in Added [A] state from the
5133 working directory, not even if option --force is specified.
5134 working directory, not even if option --force is specified.
5134
5135
5135 Returns 0 on success, 1 if any warnings encountered.
5136 Returns 0 on success, 1 if any warnings encountered.
5136 """
5137 """
5137
5138
5138 ret = 0
5139 ret = 0
5139 after, force = opts.get('after'), opts.get('force')
5140 after, force = opts.get('after'), opts.get('force')
5140 if not pats and not after:
5141 if not pats and not after:
5141 raise util.Abort(_('no files specified'))
5142 raise util.Abort(_('no files specified'))
5142
5143
5143 m = scmutil.match(repo[None], pats, opts)
5144 m = scmutil.match(repo[None], pats, opts)
5144 s = repo.status(match=m, clean=True)
5145 s = repo.status(match=m, clean=True)
5145 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
5146 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
5146
5147
5147 # warn about failure to delete explicit files/dirs
5148 # warn about failure to delete explicit files/dirs
5148 wctx = repo[None]
5149 wctx = repo[None]
5149 for f in m.files():
5150 for f in m.files():
5150 if f in repo.dirstate or f in wctx.dirs():
5151 if f in repo.dirstate or f in wctx.dirs():
5151 continue
5152 continue
5152 if os.path.exists(m.rel(f)):
5153 if os.path.exists(m.rel(f)):
5153 if os.path.isdir(m.rel(f)):
5154 if os.path.isdir(m.rel(f)):
5154 ui.warn(_('not removing %s: no tracked files\n') % m.rel(f))
5155 ui.warn(_('not removing %s: no tracked files\n') % m.rel(f))
5155 else:
5156 else:
5156 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
5157 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
5157 # missing files will generate a warning elsewhere
5158 # missing files will generate a warning elsewhere
5158 ret = 1
5159 ret = 1
5159
5160
5160 if force:
5161 if force:
5161 list = modified + deleted + clean + added
5162 list = modified + deleted + clean + added
5162 elif after:
5163 elif after:
5163 list = deleted
5164 list = deleted
5164 for f in modified + added + clean:
5165 for f in modified + added + clean:
5165 ui.warn(_('not removing %s: file still exists\n') % m.rel(f))
5166 ui.warn(_('not removing %s: file still exists\n') % m.rel(f))
5166 ret = 1
5167 ret = 1
5167 else:
5168 else:
5168 list = deleted + clean
5169 list = deleted + clean
5169 for f in modified:
5170 for f in modified:
5170 ui.warn(_('not removing %s: file is modified (use -f'
5171 ui.warn(_('not removing %s: file is modified (use -f'
5171 ' to force removal)\n') % m.rel(f))
5172 ' to force removal)\n') % m.rel(f))
5172 ret = 1
5173 ret = 1
5173 for f in added:
5174 for f in added:
5174 ui.warn(_('not removing %s: file has been marked for add'
5175 ui.warn(_('not removing %s: file has been marked for add'
5175 ' (use forget to undo)\n') % m.rel(f))
5176 ' (use forget to undo)\n') % m.rel(f))
5176 ret = 1
5177 ret = 1
5177
5178
5178 for f in sorted(list):
5179 for f in sorted(list):
5179 if ui.verbose or not m.exact(f):
5180 if ui.verbose or not m.exact(f):
5180 ui.status(_('removing %s\n') % m.rel(f))
5181 ui.status(_('removing %s\n') % m.rel(f))
5181
5182
5182 wlock = repo.wlock()
5183 wlock = repo.wlock()
5183 try:
5184 try:
5184 if not after:
5185 if not after:
5185 for f in list:
5186 for f in list:
5186 if f in added:
5187 if f in added:
5187 continue # we never unlink added files on remove
5188 continue # we never unlink added files on remove
5188 util.unlinkpath(repo.wjoin(f), ignoremissing=True)
5189 util.unlinkpath(repo.wjoin(f), ignoremissing=True)
5189 repo[None].forget(list)
5190 repo[None].forget(list)
5190 finally:
5191 finally:
5191 wlock.release()
5192 wlock.release()
5192
5193
5193 return ret
5194 return ret
5194
5195
5195 @command('rename|move|mv',
5196 @command('rename|move|mv',
5196 [('A', 'after', None, _('record a rename that has already occurred')),
5197 [('A', 'after', None, _('record a rename that has already occurred')),
5197 ('f', 'force', None, _('forcibly copy over an existing managed file')),
5198 ('f', 'force', None, _('forcibly copy over an existing managed file')),
5198 ] + walkopts + dryrunopts,
5199 ] + walkopts + dryrunopts,
5199 _('[OPTION]... SOURCE... DEST'))
5200 _('[OPTION]... SOURCE... DEST'))
5200 def rename(ui, repo, *pats, **opts):
5201 def rename(ui, repo, *pats, **opts):
5201 """rename files; equivalent of copy + remove
5202 """rename files; equivalent of copy + remove
5202
5203
5203 Mark dest as copies of sources; mark sources for deletion. If dest
5204 Mark dest as copies of sources; mark sources for deletion. If dest
5204 is a directory, copies are put in that directory. If dest is a
5205 is a directory, copies are put in that directory. If dest is a
5205 file, there can only be one source.
5206 file, there can only be one source.
5206
5207
5207 By default, this command copies the contents of files as they
5208 By default, this command copies the contents of files as they
5208 exist in the working directory. If invoked with -A/--after, the
5209 exist in the working directory. If invoked with -A/--after, the
5209 operation is recorded, but no copying is performed.
5210 operation is recorded, but no copying is performed.
5210
5211
5211 This command takes effect at the next commit. To undo a rename
5212 This command takes effect at the next commit. To undo a rename
5212 before that, see :hg:`revert`.
5213 before that, see :hg:`revert`.
5213
5214
5214 Returns 0 on success, 1 if errors are encountered.
5215 Returns 0 on success, 1 if errors are encountered.
5215 """
5216 """
5216 wlock = repo.wlock(False)
5217 wlock = repo.wlock(False)
5217 try:
5218 try:
5218 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5219 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5219 finally:
5220 finally:
5220 wlock.release()
5221 wlock.release()
5221
5222
5222 @command('resolve',
5223 @command('resolve',
5223 [('a', 'all', None, _('select all unresolved files')),
5224 [('a', 'all', None, _('select all unresolved files')),
5224 ('l', 'list', None, _('list state of files needing merge')),
5225 ('l', 'list', None, _('list state of files needing merge')),
5225 ('m', 'mark', None, _('mark files as resolved')),
5226 ('m', 'mark', None, _('mark files as resolved')),
5226 ('u', 'unmark', None, _('mark files as unresolved')),
5227 ('u', 'unmark', None, _('mark files as unresolved')),
5227 ('n', 'no-status', None, _('hide status prefix'))]
5228 ('n', 'no-status', None, _('hide status prefix'))]
5228 + mergetoolopts + walkopts,
5229 + mergetoolopts + walkopts,
5229 _('[OPTION]... [FILE]...'),
5230 _('[OPTION]... [FILE]...'),
5230 inferrepo=True)
5231 inferrepo=True)
5231 def resolve(ui, repo, *pats, **opts):
5232 def resolve(ui, repo, *pats, **opts):
5232 """redo merges or set/view the merge status of files
5233 """redo merges or set/view the merge status of files
5233
5234
5234 Merges with unresolved conflicts are often the result of
5235 Merges with unresolved conflicts are often the result of
5235 non-interactive merging using the ``internal:merge`` configuration
5236 non-interactive merging using the ``internal:merge`` configuration
5236 setting, or a command-line merge tool like ``diff3``. The resolve
5237 setting, or a command-line merge tool like ``diff3``. The resolve
5237 command is used to manage the files involved in a merge, after
5238 command is used to manage the files involved in a merge, after
5238 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5239 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5239 working directory must have two parents). See :hg:`help
5240 working directory must have two parents). See :hg:`help
5240 merge-tools` for information on configuring merge tools.
5241 merge-tools` for information on configuring merge tools.
5241
5242
5242 The resolve command can be used in the following ways:
5243 The resolve command can be used in the following ways:
5243
5244
5244 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
5245 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
5245 files, discarding any previous merge attempts. Re-merging is not
5246 files, discarding any previous merge attempts. Re-merging is not
5246 performed for files already marked as resolved. Use ``--all/-a``
5247 performed for files already marked as resolved. Use ``--all/-a``
5247 to select all unresolved files. ``--tool`` can be used to specify
5248 to select all unresolved files. ``--tool`` can be used to specify
5248 the merge tool used for the given files. It overrides the HGMERGE
5249 the merge tool used for the given files. It overrides the HGMERGE
5249 environment variable and your configuration files. Previous file
5250 environment variable and your configuration files. Previous file
5250 contents are saved with a ``.orig`` suffix.
5251 contents are saved with a ``.orig`` suffix.
5251
5252
5252 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5253 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5253 (e.g. after having manually fixed-up the files). The default is
5254 (e.g. after having manually fixed-up the files). The default is
5254 to mark all unresolved files.
5255 to mark all unresolved files.
5255
5256
5256 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5257 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5257 default is to mark all resolved files.
5258 default is to mark all resolved files.
5258
5259
5259 - :hg:`resolve -l`: list files which had or still have conflicts.
5260 - :hg:`resolve -l`: list files which had or still have conflicts.
5260 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5261 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5261
5262
5262 Note that Mercurial will not let you commit files with unresolved
5263 Note that Mercurial will not let you commit files with unresolved
5263 merge conflicts. You must use :hg:`resolve -m ...` before you can
5264 merge conflicts. You must use :hg:`resolve -m ...` before you can
5264 commit after a conflicting merge.
5265 commit after a conflicting merge.
5265
5266
5266 Returns 0 on success, 1 if any files fail a resolve attempt.
5267 Returns 0 on success, 1 if any files fail a resolve attempt.
5267 """
5268 """
5268
5269
5269 all, mark, unmark, show, nostatus = \
5270 all, mark, unmark, show, nostatus = \
5270 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
5271 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
5271
5272
5272 if (show and (mark or unmark)) or (mark and unmark):
5273 if (show and (mark or unmark)) or (mark and unmark):
5273 raise util.Abort(_("too many options specified"))
5274 raise util.Abort(_("too many options specified"))
5274 if pats and all:
5275 if pats and all:
5275 raise util.Abort(_("can't specify --all and patterns"))
5276 raise util.Abort(_("can't specify --all and patterns"))
5276 if not (all or pats or show or mark or unmark):
5277 if not (all or pats or show or mark or unmark):
5277 raise util.Abort(_('no files or directories specified'),
5278 raise util.Abort(_('no files or directories specified'),
5278 hint=('use --all to remerge all files'))
5279 hint=('use --all to remerge all files'))
5279
5280
5280 wlock = repo.wlock()
5281 wlock = repo.wlock()
5281 try:
5282 try:
5282 ms = mergemod.mergestate(repo)
5283 ms = mergemod.mergestate(repo)
5283
5284
5284 if not ms.active() and not show:
5285 if not ms.active() and not show:
5285 raise util.Abort(
5286 raise util.Abort(
5286 _('resolve command not applicable when not merging'))
5287 _('resolve command not applicable when not merging'))
5287
5288
5288 m = scmutil.match(repo[None], pats, opts)
5289 m = scmutil.match(repo[None], pats, opts)
5289 ret = 0
5290 ret = 0
5290 didwork = False
5291 didwork = False
5291
5292
5292 for f in ms:
5293 for f in ms:
5293 if not m(f):
5294 if not m(f):
5294 continue
5295 continue
5295
5296
5296 didwork = True
5297 didwork = True
5297
5298
5298 if show:
5299 if show:
5299 if nostatus:
5300 if nostatus:
5300 ui.write("%s\n" % f)
5301 ui.write("%s\n" % f)
5301 else:
5302 else:
5302 ui.write("%s %s\n" % (ms[f].upper(), f),
5303 ui.write("%s %s\n" % (ms[f].upper(), f),
5303 label='resolve.' +
5304 label='resolve.' +
5304 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
5305 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
5305 elif mark:
5306 elif mark:
5306 ms.mark(f, "r")
5307 ms.mark(f, "r")
5307 elif unmark:
5308 elif unmark:
5308 ms.mark(f, "u")
5309 ms.mark(f, "u")
5309 else:
5310 else:
5310 wctx = repo[None]
5311 wctx = repo[None]
5311
5312
5312 # backup pre-resolve (merge uses .orig for its own purposes)
5313 # backup pre-resolve (merge uses .orig for its own purposes)
5313 a = repo.wjoin(f)
5314 a = repo.wjoin(f)
5314 util.copyfile(a, a + ".resolve")
5315 util.copyfile(a, a + ".resolve")
5315
5316
5316 try:
5317 try:
5317 # resolve file
5318 # resolve file
5318 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5319 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5319 'resolve')
5320 'resolve')
5320 if ms.resolve(f, wctx):
5321 if ms.resolve(f, wctx):
5321 ret = 1
5322 ret = 1
5322 finally:
5323 finally:
5323 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5324 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5324 ms.commit()
5325 ms.commit()
5325
5326
5326 # replace filemerge's .orig file with our resolve file
5327 # replace filemerge's .orig file with our resolve file
5327 util.rename(a + ".resolve", a + ".orig")
5328 util.rename(a + ".resolve", a + ".orig")
5328
5329
5329 ms.commit()
5330 ms.commit()
5330
5331
5331 if not didwork and pats:
5332 if not didwork and pats:
5332 ui.warn(_("arguments do not match paths that need resolving\n"))
5333 ui.warn(_("arguments do not match paths that need resolving\n"))
5333
5334
5334 finally:
5335 finally:
5335 wlock.release()
5336 wlock.release()
5336
5337
5337 # Nudge users into finishing an unfinished operation. We don't print
5338 # Nudge users into finishing an unfinished operation. We don't print
5338 # this with the list/show operation because we want list/show to remain
5339 # this with the list/show operation because we want list/show to remain
5339 # machine readable.
5340 # machine readable.
5340 if not list(ms.unresolved()) and not show:
5341 if not list(ms.unresolved()) and not show:
5341 ui.status(_('(no more unresolved files)\n'))
5342 ui.status(_('(no more unresolved files)\n'))
5342
5343
5343 return ret
5344 return ret
5344
5345
5345 @command('revert',
5346 @command('revert',
5346 [('a', 'all', None, _('revert all changes when no arguments given')),
5347 [('a', 'all', None, _('revert all changes when no arguments given')),
5347 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5348 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5348 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
5349 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
5349 ('C', 'no-backup', None, _('do not save backup copies of files')),
5350 ('C', 'no-backup', None, _('do not save backup copies of files')),
5350 ] + walkopts + dryrunopts,
5351 ] + walkopts + dryrunopts,
5351 _('[OPTION]... [-r REV] [NAME]...'))
5352 _('[OPTION]... [-r REV] [NAME]...'))
5352 def revert(ui, repo, *pats, **opts):
5353 def revert(ui, repo, *pats, **opts):
5353 """restore files to their checkout state
5354 """restore files to their checkout state
5354
5355
5355 .. note::
5356 .. note::
5356
5357
5357 To check out earlier revisions, you should use :hg:`update REV`.
5358 To check out earlier revisions, you should use :hg:`update REV`.
5358 To cancel an uncommitted merge (and lose your changes),
5359 To cancel an uncommitted merge (and lose your changes),
5359 use :hg:`update --clean .`.
5360 use :hg:`update --clean .`.
5360
5361
5361 With no revision specified, revert the specified files or directories
5362 With no revision specified, revert the specified files or directories
5362 to the contents they had in the parent of the working directory.
5363 to the contents they had in the parent of the working directory.
5363 This restores the contents of files to an unmodified
5364 This restores the contents of files to an unmodified
5364 state and unschedules adds, removes, copies, and renames. If the
5365 state and unschedules adds, removes, copies, and renames. If the
5365 working directory has two parents, you must explicitly specify a
5366 working directory has two parents, you must explicitly specify a
5366 revision.
5367 revision.
5367
5368
5368 Using the -r/--rev or -d/--date options, revert the given files or
5369 Using the -r/--rev or -d/--date options, revert the given files or
5369 directories to their states as of a specific revision. Because
5370 directories to their states as of a specific revision. Because
5370 revert does not change the working directory parents, this will
5371 revert does not change the working directory parents, this will
5371 cause these files to appear modified. This can be helpful to "back
5372 cause these files to appear modified. This can be helpful to "back
5372 out" some or all of an earlier change. See :hg:`backout` for a
5373 out" some or all of an earlier change. See :hg:`backout` for a
5373 related method.
5374 related method.
5374
5375
5375 Modified files are saved with a .orig suffix before reverting.
5376 Modified files are saved with a .orig suffix before reverting.
5376 To disable these backups, use --no-backup.
5377 To disable these backups, use --no-backup.
5377
5378
5378 See :hg:`help dates` for a list of formats valid for -d/--date.
5379 See :hg:`help dates` for a list of formats valid for -d/--date.
5379
5380
5380 Returns 0 on success.
5381 Returns 0 on success.
5381 """
5382 """
5382
5383
5383 if opts.get("date"):
5384 if opts.get("date"):
5384 if opts.get("rev"):
5385 if opts.get("rev"):
5385 raise util.Abort(_("you can't specify a revision and a date"))
5386 raise util.Abort(_("you can't specify a revision and a date"))
5386 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
5387 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
5387
5388
5388 parent, p2 = repo.dirstate.parents()
5389 parent, p2 = repo.dirstate.parents()
5389 if not opts.get('rev') and p2 != nullid:
5390 if not opts.get('rev') and p2 != nullid:
5390 # revert after merge is a trap for new users (issue2915)
5391 # revert after merge is a trap for new users (issue2915)
5391 raise util.Abort(_('uncommitted merge with no revision specified'),
5392 raise util.Abort(_('uncommitted merge with no revision specified'),
5392 hint=_('use "hg update" or see "hg help revert"'))
5393 hint=_('use "hg update" or see "hg help revert"'))
5393
5394
5394 ctx = scmutil.revsingle(repo, opts.get('rev'))
5395 ctx = scmutil.revsingle(repo, opts.get('rev'))
5395
5396
5396 if not pats and not opts.get('all'):
5397 if not pats and not opts.get('all'):
5397 msg = _("no files or directories specified")
5398 msg = _("no files or directories specified")
5398 if p2 != nullid:
5399 if p2 != nullid:
5399 hint = _("uncommitted merge, use --all to discard all changes,"
5400 hint = _("uncommitted merge, use --all to discard all changes,"
5400 " or 'hg update -C .' to abort the merge")
5401 " or 'hg update -C .' to abort the merge")
5401 raise util.Abort(msg, hint=hint)
5402 raise util.Abort(msg, hint=hint)
5402 dirty = util.any(repo.status())
5403 dirty = util.any(repo.status())
5403 node = ctx.node()
5404 node = ctx.node()
5404 if node != parent:
5405 if node != parent:
5405 if dirty:
5406 if dirty:
5406 hint = _("uncommitted changes, use --all to discard all"
5407 hint = _("uncommitted changes, use --all to discard all"
5407 " changes, or 'hg update %s' to update") % ctx.rev()
5408 " changes, or 'hg update %s' to update") % ctx.rev()
5408 else:
5409 else:
5409 hint = _("use --all to revert all files,"
5410 hint = _("use --all to revert all files,"
5410 " or 'hg update %s' to update") % ctx.rev()
5411 " or 'hg update %s' to update") % ctx.rev()
5411 elif dirty:
5412 elif dirty:
5412 hint = _("uncommitted changes, use --all to discard all changes")
5413 hint = _("uncommitted changes, use --all to discard all changes")
5413 else:
5414 else:
5414 hint = _("use --all to revert all files")
5415 hint = _("use --all to revert all files")
5415 raise util.Abort(msg, hint=hint)
5416 raise util.Abort(msg, hint=hint)
5416
5417
5417 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
5418 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
5418
5419
5419 @command('rollback', dryrunopts +
5420 @command('rollback', dryrunopts +
5420 [('f', 'force', False, _('ignore safety measures'))])
5421 [('f', 'force', False, _('ignore safety measures'))])
5421 def rollback(ui, repo, **opts):
5422 def rollback(ui, repo, **opts):
5422 """roll back the last transaction (DANGEROUS) (DEPRECATED)
5423 """roll back the last transaction (DANGEROUS) (DEPRECATED)
5423
5424
5424 Please use :hg:`commit --amend` instead of rollback to correct
5425 Please use :hg:`commit --amend` instead of rollback to correct
5425 mistakes in the last commit.
5426 mistakes in the last commit.
5426
5427
5427 This command should be used with care. There is only one level of
5428 This command should be used with care. There is only one level of
5428 rollback, and there is no way to undo a rollback. It will also
5429 rollback, and there is no way to undo a rollback. It will also
5429 restore the dirstate at the time of the last transaction, losing
5430 restore the dirstate at the time of the last transaction, losing
5430 any dirstate changes since that time. This command does not alter
5431 any dirstate changes since that time. This command does not alter
5431 the working directory.
5432 the working directory.
5432
5433
5433 Transactions are used to encapsulate the effects of all commands
5434 Transactions are used to encapsulate the effects of all commands
5434 that create new changesets or propagate existing changesets into a
5435 that create new changesets or propagate existing changesets into a
5435 repository.
5436 repository.
5436
5437
5437 .. container:: verbose
5438 .. container:: verbose
5438
5439
5439 For example, the following commands are transactional, and their
5440 For example, the following commands are transactional, and their
5440 effects can be rolled back:
5441 effects can be rolled back:
5441
5442
5442 - commit
5443 - commit
5443 - import
5444 - import
5444 - pull
5445 - pull
5445 - push (with this repository as the destination)
5446 - push (with this repository as the destination)
5446 - unbundle
5447 - unbundle
5447
5448
5448 To avoid permanent data loss, rollback will refuse to rollback a
5449 To avoid permanent data loss, rollback will refuse to rollback a
5449 commit transaction if it isn't checked out. Use --force to
5450 commit transaction if it isn't checked out. Use --force to
5450 override this protection.
5451 override this protection.
5451
5452
5452 This command is not intended for use on public repositories. Once
5453 This command is not intended for use on public repositories. Once
5453 changes are visible for pull by other users, rolling a transaction
5454 changes are visible for pull by other users, rolling a transaction
5454 back locally is ineffective (someone else may already have pulled
5455 back locally is ineffective (someone else may already have pulled
5455 the changes). Furthermore, a race is possible with readers of the
5456 the changes). Furthermore, a race is possible with readers of the
5456 repository; for example an in-progress pull from the repository
5457 repository; for example an in-progress pull from the repository
5457 may fail if a rollback is performed.
5458 may fail if a rollback is performed.
5458
5459
5459 Returns 0 on success, 1 if no rollback data is available.
5460 Returns 0 on success, 1 if no rollback data is available.
5460 """
5461 """
5461 return repo.rollback(dryrun=opts.get('dry_run'),
5462 return repo.rollback(dryrun=opts.get('dry_run'),
5462 force=opts.get('force'))
5463 force=opts.get('force'))
5463
5464
5464 @command('root', [])
5465 @command('root', [])
5465 def root(ui, repo):
5466 def root(ui, repo):
5466 """print the root (top) of the current working directory
5467 """print the root (top) of the current working directory
5467
5468
5468 Print the root directory of the current repository.
5469 Print the root directory of the current repository.
5469
5470
5470 Returns 0 on success.
5471 Returns 0 on success.
5471 """
5472 """
5472 ui.write(repo.root + "\n")
5473 ui.write(repo.root + "\n")
5473
5474
5474 @command('^serve',
5475 @command('^serve',
5475 [('A', 'accesslog', '', _('name of access log file to write to'),
5476 [('A', 'accesslog', '', _('name of access log file to write to'),
5476 _('FILE')),
5477 _('FILE')),
5477 ('d', 'daemon', None, _('run server in background')),
5478 ('d', 'daemon', None, _('run server in background')),
5478 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')),
5479 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')),
5479 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
5480 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
5480 # use string type, then we can check if something was passed
5481 # use string type, then we can check if something was passed
5481 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
5482 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
5482 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
5483 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
5483 _('ADDR')),
5484 _('ADDR')),
5484 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
5485 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
5485 _('PREFIX')),
5486 _('PREFIX')),
5486 ('n', 'name', '',
5487 ('n', 'name', '',
5487 _('name to show in web pages (default: working directory)'), _('NAME')),
5488 _('name to show in web pages (default: working directory)'), _('NAME')),
5488 ('', 'web-conf', '',
5489 ('', 'web-conf', '',
5489 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
5490 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
5490 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
5491 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
5491 _('FILE')),
5492 _('FILE')),
5492 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
5493 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
5493 ('', 'stdio', None, _('for remote clients')),
5494 ('', 'stdio', None, _('for remote clients')),
5494 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
5495 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
5495 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
5496 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
5496 ('', 'style', '', _('template style to use'), _('STYLE')),
5497 ('', 'style', '', _('template style to use'), _('STYLE')),
5497 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
5498 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
5498 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
5499 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
5499 _('[OPTION]...'),
5500 _('[OPTION]...'),
5500 optionalrepo=True)
5501 optionalrepo=True)
5501 def serve(ui, repo, **opts):
5502 def serve(ui, repo, **opts):
5502 """start stand-alone webserver
5503 """start stand-alone webserver
5503
5504
5504 Start a local HTTP repository browser and pull server. You can use
5505 Start a local HTTP repository browser and pull server. You can use
5505 this for ad-hoc sharing and browsing of repositories. It is
5506 this for ad-hoc sharing and browsing of repositories. It is
5506 recommended to use a real web server to serve a repository for
5507 recommended to use a real web server to serve a repository for
5507 longer periods of time.
5508 longer periods of time.
5508
5509
5509 Please note that the server does not implement access control.
5510 Please note that the server does not implement access control.
5510 This means that, by default, anybody can read from the server and
5511 This means that, by default, anybody can read from the server and
5511 nobody can write to it by default. Set the ``web.allow_push``
5512 nobody can write to it by default. Set the ``web.allow_push``
5512 option to ``*`` to allow everybody to push to the server. You
5513 option to ``*`` to allow everybody to push to the server. You
5513 should use a real web server if you need to authenticate users.
5514 should use a real web server if you need to authenticate users.
5514
5515
5515 By default, the server logs accesses to stdout and errors to
5516 By default, the server logs accesses to stdout and errors to
5516 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5517 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5517 files.
5518 files.
5518
5519
5519 To have the server choose a free port number to listen on, specify
5520 To have the server choose a free port number to listen on, specify
5520 a port number of 0; in this case, the server will print the port
5521 a port number of 0; in this case, the server will print the port
5521 number it uses.
5522 number it uses.
5522
5523
5523 Returns 0 on success.
5524 Returns 0 on success.
5524 """
5525 """
5525
5526
5526 if opts["stdio"] and opts["cmdserver"]:
5527 if opts["stdio"] and opts["cmdserver"]:
5527 raise util.Abort(_("cannot use --stdio with --cmdserver"))
5528 raise util.Abort(_("cannot use --stdio with --cmdserver"))
5528
5529
5529 if opts["stdio"]:
5530 if opts["stdio"]:
5530 if repo is None:
5531 if repo is None:
5531 raise error.RepoError(_("there is no Mercurial repository here"
5532 raise error.RepoError(_("there is no Mercurial repository here"
5532 " (.hg not found)"))
5533 " (.hg not found)"))
5533 s = sshserver.sshserver(ui, repo)
5534 s = sshserver.sshserver(ui, repo)
5534 s.serve_forever()
5535 s.serve_forever()
5535
5536
5536 if opts["cmdserver"]:
5537 if opts["cmdserver"]:
5537 s = commandserver.server(ui, repo, opts["cmdserver"])
5538 s = commandserver.server(ui, repo, opts["cmdserver"])
5538 return s.serve()
5539 return s.serve()
5539
5540
5540 # this way we can check if something was given in the command-line
5541 # this way we can check if something was given in the command-line
5541 if opts.get('port'):
5542 if opts.get('port'):
5542 opts['port'] = util.getport(opts.get('port'))
5543 opts['port'] = util.getport(opts.get('port'))
5543
5544
5544 baseui = repo and repo.baseui or ui
5545 baseui = repo and repo.baseui or ui
5545 optlist = ("name templates style address port prefix ipv6"
5546 optlist = ("name templates style address port prefix ipv6"
5546 " accesslog errorlog certificate encoding")
5547 " accesslog errorlog certificate encoding")
5547 for o in optlist.split():
5548 for o in optlist.split():
5548 val = opts.get(o, '')
5549 val = opts.get(o, '')
5549 if val in (None, ''): # should check against default options instead
5550 if val in (None, ''): # should check against default options instead
5550 continue
5551 continue
5551 baseui.setconfig("web", o, val, 'serve')
5552 baseui.setconfig("web", o, val, 'serve')
5552 if repo and repo.ui != baseui:
5553 if repo and repo.ui != baseui:
5553 repo.ui.setconfig("web", o, val, 'serve')
5554 repo.ui.setconfig("web", o, val, 'serve')
5554
5555
5555 o = opts.get('web_conf') or opts.get('webdir_conf')
5556 o = opts.get('web_conf') or opts.get('webdir_conf')
5556 if not o:
5557 if not o:
5557 if not repo:
5558 if not repo:
5558 raise error.RepoError(_("there is no Mercurial repository"
5559 raise error.RepoError(_("there is no Mercurial repository"
5559 " here (.hg not found)"))
5560 " here (.hg not found)"))
5560 o = repo
5561 o = repo
5561
5562
5562 app = hgweb.hgweb(o, baseui=baseui)
5563 app = hgweb.hgweb(o, baseui=baseui)
5563 service = httpservice(ui, app, opts)
5564 service = httpservice(ui, app, opts)
5564 cmdutil.service(opts, initfn=service.init, runfn=service.run)
5565 cmdutil.service(opts, initfn=service.init, runfn=service.run)
5565
5566
5566 class httpservice(object):
5567 class httpservice(object):
5567 def __init__(self, ui, app, opts):
5568 def __init__(self, ui, app, opts):
5568 self.ui = ui
5569 self.ui = ui
5569 self.app = app
5570 self.app = app
5570 self.opts = opts
5571 self.opts = opts
5571
5572
5572 def init(self):
5573 def init(self):
5573 util.setsignalhandler()
5574 util.setsignalhandler()
5574 self.httpd = hgweb_server.create_server(self.ui, self.app)
5575 self.httpd = hgweb_server.create_server(self.ui, self.app)
5575
5576
5576 if self.opts['port'] and not self.ui.verbose:
5577 if self.opts['port'] and not self.ui.verbose:
5577 return
5578 return
5578
5579
5579 if self.httpd.prefix:
5580 if self.httpd.prefix:
5580 prefix = self.httpd.prefix.strip('/') + '/'
5581 prefix = self.httpd.prefix.strip('/') + '/'
5581 else:
5582 else:
5582 prefix = ''
5583 prefix = ''
5583
5584
5584 port = ':%d' % self.httpd.port
5585 port = ':%d' % self.httpd.port
5585 if port == ':80':
5586 if port == ':80':
5586 port = ''
5587 port = ''
5587
5588
5588 bindaddr = self.httpd.addr
5589 bindaddr = self.httpd.addr
5589 if bindaddr == '0.0.0.0':
5590 if bindaddr == '0.0.0.0':
5590 bindaddr = '*'
5591 bindaddr = '*'
5591 elif ':' in bindaddr: # IPv6
5592 elif ':' in bindaddr: # IPv6
5592 bindaddr = '[%s]' % bindaddr
5593 bindaddr = '[%s]' % bindaddr
5593
5594
5594 fqaddr = self.httpd.fqaddr
5595 fqaddr = self.httpd.fqaddr
5595 if ':' in fqaddr:
5596 if ':' in fqaddr:
5596 fqaddr = '[%s]' % fqaddr
5597 fqaddr = '[%s]' % fqaddr
5597 if self.opts['port']:
5598 if self.opts['port']:
5598 write = self.ui.status
5599 write = self.ui.status
5599 else:
5600 else:
5600 write = self.ui.write
5601 write = self.ui.write
5601 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
5602 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
5602 (fqaddr, port, prefix, bindaddr, self.httpd.port))
5603 (fqaddr, port, prefix, bindaddr, self.httpd.port))
5603 self.ui.flush() # avoid buffering of status message
5604 self.ui.flush() # avoid buffering of status message
5604
5605
5605 def run(self):
5606 def run(self):
5606 self.httpd.serve_forever()
5607 self.httpd.serve_forever()
5607
5608
5608
5609
5609 @command('^status|st',
5610 @command('^status|st',
5610 [('A', 'all', None, _('show status of all files')),
5611 [('A', 'all', None, _('show status of all files')),
5611 ('m', 'modified', None, _('show only modified files')),
5612 ('m', 'modified', None, _('show only modified files')),
5612 ('a', 'added', None, _('show only added files')),
5613 ('a', 'added', None, _('show only added files')),
5613 ('r', 'removed', None, _('show only removed files')),
5614 ('r', 'removed', None, _('show only removed files')),
5614 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5615 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5615 ('c', 'clean', None, _('show only files without changes')),
5616 ('c', 'clean', None, _('show only files without changes')),
5616 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5617 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5617 ('i', 'ignored', None, _('show only ignored files')),
5618 ('i', 'ignored', None, _('show only ignored files')),
5618 ('n', 'no-status', None, _('hide status prefix')),
5619 ('n', 'no-status', None, _('hide status prefix')),
5619 ('C', 'copies', None, _('show source of copied files')),
5620 ('C', 'copies', None, _('show source of copied files')),
5620 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5621 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5621 ('', 'rev', [], _('show difference from revision'), _('REV')),
5622 ('', 'rev', [], _('show difference from revision'), _('REV')),
5622 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5623 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5623 ] + walkopts + subrepoopts + formatteropts,
5624 ] + walkopts + subrepoopts + formatteropts,
5624 _('[OPTION]... [FILE]...'),
5625 _('[OPTION]... [FILE]...'),
5625 inferrepo=True)
5626 inferrepo=True)
5626 def status(ui, repo, *pats, **opts):
5627 def status(ui, repo, *pats, **opts):
5627 """show changed files in the working directory
5628 """show changed files in the working directory
5628
5629
5629 Show status of files in the repository. If names are given, only
5630 Show status of files in the repository. If names are given, only
5630 files that match are shown. Files that are clean or ignored or
5631 files that match are shown. Files that are clean or ignored or
5631 the source of a copy/move operation, are not listed unless
5632 the source of a copy/move operation, are not listed unless
5632 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5633 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5633 Unless options described with "show only ..." are given, the
5634 Unless options described with "show only ..." are given, the
5634 options -mardu are used.
5635 options -mardu are used.
5635
5636
5636 Option -q/--quiet hides untracked (unknown and ignored) files
5637 Option -q/--quiet hides untracked (unknown and ignored) files
5637 unless explicitly requested with -u/--unknown or -i/--ignored.
5638 unless explicitly requested with -u/--unknown or -i/--ignored.
5638
5639
5639 .. note::
5640 .. note::
5640
5641
5641 status may appear to disagree with diff if permissions have
5642 status may appear to disagree with diff if permissions have
5642 changed or a merge has occurred. The standard diff format does
5643 changed or a merge has occurred. The standard diff format does
5643 not report permission changes and diff only reports changes
5644 not report permission changes and diff only reports changes
5644 relative to one merge parent.
5645 relative to one merge parent.
5645
5646
5646 If one revision is given, it is used as the base revision.
5647 If one revision is given, it is used as the base revision.
5647 If two revisions are given, the differences between them are
5648 If two revisions are given, the differences between them are
5648 shown. The --change option can also be used as a shortcut to list
5649 shown. The --change option can also be used as a shortcut to list
5649 the changed files of a revision from its first parent.
5650 the changed files of a revision from its first parent.
5650
5651
5651 The codes used to show the status of files are::
5652 The codes used to show the status of files are::
5652
5653
5653 M = modified
5654 M = modified
5654 A = added
5655 A = added
5655 R = removed
5656 R = removed
5656 C = clean
5657 C = clean
5657 ! = missing (deleted by non-hg command, but still tracked)
5658 ! = missing (deleted by non-hg command, but still tracked)
5658 ? = not tracked
5659 ? = not tracked
5659 I = ignored
5660 I = ignored
5660 = origin of the previous file (with --copies)
5661 = origin of the previous file (with --copies)
5661
5662
5662 .. container:: verbose
5663 .. container:: verbose
5663
5664
5664 Examples:
5665 Examples:
5665
5666
5666 - show changes in the working directory relative to a
5667 - show changes in the working directory relative to a
5667 changeset::
5668 changeset::
5668
5669
5669 hg status --rev 9353
5670 hg status --rev 9353
5670
5671
5671 - show all changes including copies in an existing changeset::
5672 - show all changes including copies in an existing changeset::
5672
5673
5673 hg status --copies --change 9353
5674 hg status --copies --change 9353
5674
5675
5675 - get a NUL separated list of added files, suitable for xargs::
5676 - get a NUL separated list of added files, suitable for xargs::
5676
5677
5677 hg status -an0
5678 hg status -an0
5678
5679
5679 Returns 0 on success.
5680 Returns 0 on success.
5680 """
5681 """
5681
5682
5682 revs = opts.get('rev')
5683 revs = opts.get('rev')
5683 change = opts.get('change')
5684 change = opts.get('change')
5684
5685
5685 if revs and change:
5686 if revs and change:
5686 msg = _('cannot specify --rev and --change at the same time')
5687 msg = _('cannot specify --rev and --change at the same time')
5687 raise util.Abort(msg)
5688 raise util.Abort(msg)
5688 elif change:
5689 elif change:
5689 node2 = scmutil.revsingle(repo, change, None).node()
5690 node2 = scmutil.revsingle(repo, change, None).node()
5690 node1 = repo[node2].p1().node()
5691 node1 = repo[node2].p1().node()
5691 else:
5692 else:
5692 node1, node2 = scmutil.revpair(repo, revs)
5693 node1, node2 = scmutil.revpair(repo, revs)
5693
5694
5694 cwd = (pats and repo.getcwd()) or ''
5695 cwd = (pats and repo.getcwd()) or ''
5695 end = opts.get('print0') and '\0' or '\n'
5696 end = opts.get('print0') and '\0' or '\n'
5696 copy = {}
5697 copy = {}
5697 states = 'modified added removed deleted unknown ignored clean'.split()
5698 states = 'modified added removed deleted unknown ignored clean'.split()
5698 show = [k for k in states if opts.get(k)]
5699 show = [k for k in states if opts.get(k)]
5699 if opts.get('all'):
5700 if opts.get('all'):
5700 show += ui.quiet and (states[:4] + ['clean']) or states
5701 show += ui.quiet and (states[:4] + ['clean']) or states
5701 if not show:
5702 if not show:
5702 show = ui.quiet and states[:4] or states[:5]
5703 show = ui.quiet and states[:4] or states[:5]
5703
5704
5704 stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts),
5705 stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts),
5705 'ignored' in show, 'clean' in show, 'unknown' in show,
5706 'ignored' in show, 'clean' in show, 'unknown' in show,
5706 opts.get('subrepos'))
5707 opts.get('subrepos'))
5707 changestates = zip(states, 'MAR!?IC', stat)
5708 changestates = zip(states, 'MAR!?IC', stat)
5708
5709
5709 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
5710 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
5710 copy = copies.pathcopies(repo[node1], repo[node2])
5711 copy = copies.pathcopies(repo[node1], repo[node2])
5711
5712
5712 fm = ui.formatter('status', opts)
5713 fm = ui.formatter('status', opts)
5713 fmt = '%s' + end
5714 fmt = '%s' + end
5714 showchar = not opts.get('no_status')
5715 showchar = not opts.get('no_status')
5715
5716
5716 for state, char, files in changestates:
5717 for state, char, files in changestates:
5717 if state in show:
5718 if state in show:
5718 label = 'status.' + state
5719 label = 'status.' + state
5719 for f in files:
5720 for f in files:
5720 fm.startitem()
5721 fm.startitem()
5721 fm.condwrite(showchar, 'status', '%s ', char, label=label)
5722 fm.condwrite(showchar, 'status', '%s ', char, label=label)
5722 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
5723 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
5723 if f in copy:
5724 if f in copy:
5724 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
5725 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
5725 label='status.copied')
5726 label='status.copied')
5726 fm.end()
5727 fm.end()
5727
5728
5728 @command('^summary|sum',
5729 @command('^summary|sum',
5729 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
5730 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
5730 def summary(ui, repo, **opts):
5731 def summary(ui, repo, **opts):
5731 """summarize working directory state
5732 """summarize working directory state
5732
5733
5733 This generates a brief summary of the working directory state,
5734 This generates a brief summary of the working directory state,
5734 including parents, branch, commit status, and available updates.
5735 including parents, branch, commit status, and available updates.
5735
5736
5736 With the --remote option, this will check the default paths for
5737 With the --remote option, this will check the default paths for
5737 incoming and outgoing changes. This can be time-consuming.
5738 incoming and outgoing changes. This can be time-consuming.
5738
5739
5739 Returns 0 on success.
5740 Returns 0 on success.
5740 """
5741 """
5741
5742
5742 ctx = repo[None]
5743 ctx = repo[None]
5743 parents = ctx.parents()
5744 parents = ctx.parents()
5744 pnode = parents[0].node()
5745 pnode = parents[0].node()
5745 marks = []
5746 marks = []
5746
5747
5747 for p in parents:
5748 for p in parents:
5748 # label with log.changeset (instead of log.parent) since this
5749 # label with log.changeset (instead of log.parent) since this
5749 # shows a working directory parent *changeset*:
5750 # shows a working directory parent *changeset*:
5750 # i18n: column positioning for "hg summary"
5751 # i18n: column positioning for "hg summary"
5751 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
5752 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
5752 label='log.changeset changeset.%s' % p.phasestr())
5753 label='log.changeset changeset.%s' % p.phasestr())
5753 ui.write(' '.join(p.tags()), label='log.tag')
5754 ui.write(' '.join(p.tags()), label='log.tag')
5754 if p.bookmarks():
5755 if p.bookmarks():
5755 marks.extend(p.bookmarks())
5756 marks.extend(p.bookmarks())
5756 if p.rev() == -1:
5757 if p.rev() == -1:
5757 if not len(repo):
5758 if not len(repo):
5758 ui.write(_(' (empty repository)'))
5759 ui.write(_(' (empty repository)'))
5759 else:
5760 else:
5760 ui.write(_(' (no revision checked out)'))
5761 ui.write(_(' (no revision checked out)'))
5761 ui.write('\n')
5762 ui.write('\n')
5762 if p.description():
5763 if p.description():
5763 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5764 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5764 label='log.summary')
5765 label='log.summary')
5765
5766
5766 branch = ctx.branch()
5767 branch = ctx.branch()
5767 bheads = repo.branchheads(branch)
5768 bheads = repo.branchheads(branch)
5768 # i18n: column positioning for "hg summary"
5769 # i18n: column positioning for "hg summary"
5769 m = _('branch: %s\n') % branch
5770 m = _('branch: %s\n') % branch
5770 if branch != 'default':
5771 if branch != 'default':
5771 ui.write(m, label='log.branch')
5772 ui.write(m, label='log.branch')
5772 else:
5773 else:
5773 ui.status(m, label='log.branch')
5774 ui.status(m, label='log.branch')
5774
5775
5775 if marks:
5776 if marks:
5776 current = repo._bookmarkcurrent
5777 current = repo._bookmarkcurrent
5777 # i18n: column positioning for "hg summary"
5778 # i18n: column positioning for "hg summary"
5778 ui.write(_('bookmarks:'), label='log.bookmark')
5779 ui.write(_('bookmarks:'), label='log.bookmark')
5779 if current is not None:
5780 if current is not None:
5780 if current in marks:
5781 if current in marks:
5781 ui.write(' *' + current, label='bookmarks.current')
5782 ui.write(' *' + current, label='bookmarks.current')
5782 marks.remove(current)
5783 marks.remove(current)
5783 else:
5784 else:
5784 ui.write(' [%s]' % current, label='bookmarks.current')
5785 ui.write(' [%s]' % current, label='bookmarks.current')
5785 for m in marks:
5786 for m in marks:
5786 ui.write(' ' + m, label='log.bookmark')
5787 ui.write(' ' + m, label='log.bookmark')
5787 ui.write('\n', label='log.bookmark')
5788 ui.write('\n', label='log.bookmark')
5788
5789
5789 st = list(repo.status(unknown=True))[:5]
5790 st = list(repo.status(unknown=True))[:5]
5790
5791
5791 c = repo.dirstate.copies()
5792 c = repo.dirstate.copies()
5792 copied, renamed = [], []
5793 copied, renamed = [], []
5793 for d, s in c.iteritems():
5794 for d, s in c.iteritems():
5794 if s in st[2]:
5795 if s in st[2]:
5795 st[2].remove(s)
5796 st[2].remove(s)
5796 renamed.append(d)
5797 renamed.append(d)
5797 else:
5798 else:
5798 copied.append(d)
5799 copied.append(d)
5799 if d in st[1]:
5800 if d in st[1]:
5800 st[1].remove(d)
5801 st[1].remove(d)
5801 st.insert(3, renamed)
5802 st.insert(3, renamed)
5802 st.insert(4, copied)
5803 st.insert(4, copied)
5803
5804
5804 ms = mergemod.mergestate(repo)
5805 ms = mergemod.mergestate(repo)
5805 st.append([f for f in ms if ms[f] == 'u'])
5806 st.append([f for f in ms if ms[f] == 'u'])
5806
5807
5807 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5808 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5808 st.append(subs)
5809 st.append(subs)
5809
5810
5810 labels = [ui.label(_('%d modified'), 'status.modified'),
5811 labels = [ui.label(_('%d modified'), 'status.modified'),
5811 ui.label(_('%d added'), 'status.added'),
5812 ui.label(_('%d added'), 'status.added'),
5812 ui.label(_('%d removed'), 'status.removed'),
5813 ui.label(_('%d removed'), 'status.removed'),
5813 ui.label(_('%d renamed'), 'status.copied'),
5814 ui.label(_('%d renamed'), 'status.copied'),
5814 ui.label(_('%d copied'), 'status.copied'),
5815 ui.label(_('%d copied'), 'status.copied'),
5815 ui.label(_('%d deleted'), 'status.deleted'),
5816 ui.label(_('%d deleted'), 'status.deleted'),
5816 ui.label(_('%d unknown'), 'status.unknown'),
5817 ui.label(_('%d unknown'), 'status.unknown'),
5817 ui.label(_('%d unresolved'), 'resolve.unresolved'),
5818 ui.label(_('%d unresolved'), 'resolve.unresolved'),
5818 ui.label(_('%d subrepos'), 'status.modified')]
5819 ui.label(_('%d subrepos'), 'status.modified')]
5819 t = []
5820 t = []
5820 for s, l in zip(st, labels):
5821 for s, l in zip(st, labels):
5821 if s:
5822 if s:
5822 t.append(l % len(s))
5823 t.append(l % len(s))
5823
5824
5824 t = ', '.join(t)
5825 t = ', '.join(t)
5825 cleanworkdir = False
5826 cleanworkdir = False
5826
5827
5827 if repo.vfs.exists('updatestate'):
5828 if repo.vfs.exists('updatestate'):
5828 t += _(' (interrupted update)')
5829 t += _(' (interrupted update)')
5829 elif len(parents) > 1:
5830 elif len(parents) > 1:
5830 t += _(' (merge)')
5831 t += _(' (merge)')
5831 elif branch != parents[0].branch():
5832 elif branch != parents[0].branch():
5832 t += _(' (new branch)')
5833 t += _(' (new branch)')
5833 elif (parents[0].closesbranch() and
5834 elif (parents[0].closesbranch() and
5834 pnode in repo.branchheads(branch, closed=True)):
5835 pnode in repo.branchheads(branch, closed=True)):
5835 t += _(' (head closed)')
5836 t += _(' (head closed)')
5836 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[8]):
5837 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[8]):
5837 t += _(' (clean)')
5838 t += _(' (clean)')
5838 cleanworkdir = True
5839 cleanworkdir = True
5839 elif pnode not in bheads:
5840 elif pnode not in bheads:
5840 t += _(' (new branch head)')
5841 t += _(' (new branch head)')
5841
5842
5842 if cleanworkdir:
5843 if cleanworkdir:
5843 # i18n: column positioning for "hg summary"
5844 # i18n: column positioning for "hg summary"
5844 ui.status(_('commit: %s\n') % t.strip())
5845 ui.status(_('commit: %s\n') % t.strip())
5845 else:
5846 else:
5846 # i18n: column positioning for "hg summary"
5847 # i18n: column positioning for "hg summary"
5847 ui.write(_('commit: %s\n') % t.strip())
5848 ui.write(_('commit: %s\n') % t.strip())
5848
5849
5849 # all ancestors of branch heads - all ancestors of parent = new csets
5850 # all ancestors of branch heads - all ancestors of parent = new csets
5850 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
5851 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
5851 bheads))
5852 bheads))
5852
5853
5853 if new == 0:
5854 if new == 0:
5854 # i18n: column positioning for "hg summary"
5855 # i18n: column positioning for "hg summary"
5855 ui.status(_('update: (current)\n'))
5856 ui.status(_('update: (current)\n'))
5856 elif pnode not in bheads:
5857 elif pnode not in bheads:
5857 # i18n: column positioning for "hg summary"
5858 # i18n: column positioning for "hg summary"
5858 ui.write(_('update: %d new changesets (update)\n') % new)
5859 ui.write(_('update: %d new changesets (update)\n') % new)
5859 else:
5860 else:
5860 # i18n: column positioning for "hg summary"
5861 # i18n: column positioning for "hg summary"
5861 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5862 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5862 (new, len(bheads)))
5863 (new, len(bheads)))
5863
5864
5864 cmdutil.summaryhooks(ui, repo)
5865 cmdutil.summaryhooks(ui, repo)
5865
5866
5866 if opts.get('remote'):
5867 if opts.get('remote'):
5867 needsincoming, needsoutgoing = True, True
5868 needsincoming, needsoutgoing = True, True
5868 else:
5869 else:
5869 needsincoming, needsoutgoing = False, False
5870 needsincoming, needsoutgoing = False, False
5870 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
5871 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
5871 if i:
5872 if i:
5872 needsincoming = True
5873 needsincoming = True
5873 if o:
5874 if o:
5874 needsoutgoing = True
5875 needsoutgoing = True
5875 if not needsincoming and not needsoutgoing:
5876 if not needsincoming and not needsoutgoing:
5876 return
5877 return
5877
5878
5878 def getincoming():
5879 def getincoming():
5879 source, branches = hg.parseurl(ui.expandpath('default'))
5880 source, branches = hg.parseurl(ui.expandpath('default'))
5880 sbranch = branches[0]
5881 sbranch = branches[0]
5881 try:
5882 try:
5882 other = hg.peer(repo, {}, source)
5883 other = hg.peer(repo, {}, source)
5883 except error.RepoError:
5884 except error.RepoError:
5884 if opts.get('remote'):
5885 if opts.get('remote'):
5885 raise
5886 raise
5886 return source, sbranch, None, None, None
5887 return source, sbranch, None, None, None
5887 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5888 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5888 if revs:
5889 if revs:
5889 revs = [other.lookup(rev) for rev in revs]
5890 revs = [other.lookup(rev) for rev in revs]
5890 ui.debug('comparing with %s\n' % util.hidepassword(source))
5891 ui.debug('comparing with %s\n' % util.hidepassword(source))
5891 repo.ui.pushbuffer()
5892 repo.ui.pushbuffer()
5892 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5893 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5893 repo.ui.popbuffer()
5894 repo.ui.popbuffer()
5894 return source, sbranch, other, commoninc, commoninc[1]
5895 return source, sbranch, other, commoninc, commoninc[1]
5895
5896
5896 if needsincoming:
5897 if needsincoming:
5897 source, sbranch, sother, commoninc, incoming = getincoming()
5898 source, sbranch, sother, commoninc, incoming = getincoming()
5898 else:
5899 else:
5899 source = sbranch = sother = commoninc = incoming = None
5900 source = sbranch = sother = commoninc = incoming = None
5900
5901
5901 def getoutgoing():
5902 def getoutgoing():
5902 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5903 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5903 dbranch = branches[0]
5904 dbranch = branches[0]
5904 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5905 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5905 if source != dest:
5906 if source != dest:
5906 try:
5907 try:
5907 dother = hg.peer(repo, {}, dest)
5908 dother = hg.peer(repo, {}, dest)
5908 except error.RepoError:
5909 except error.RepoError:
5909 if opts.get('remote'):
5910 if opts.get('remote'):
5910 raise
5911 raise
5911 return dest, dbranch, None, None
5912 return dest, dbranch, None, None
5912 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5913 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5913 elif sother is None:
5914 elif sother is None:
5914 # there is no explicit destination peer, but source one is invalid
5915 # there is no explicit destination peer, but source one is invalid
5915 return dest, dbranch, None, None
5916 return dest, dbranch, None, None
5916 else:
5917 else:
5917 dother = sother
5918 dother = sother
5918 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5919 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5919 common = None
5920 common = None
5920 else:
5921 else:
5921 common = commoninc
5922 common = commoninc
5922 if revs:
5923 if revs:
5923 revs = [repo.lookup(rev) for rev in revs]
5924 revs = [repo.lookup(rev) for rev in revs]
5924 repo.ui.pushbuffer()
5925 repo.ui.pushbuffer()
5925 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5926 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5926 commoninc=common)
5927 commoninc=common)
5927 repo.ui.popbuffer()
5928 repo.ui.popbuffer()
5928 return dest, dbranch, dother, outgoing
5929 return dest, dbranch, dother, outgoing
5929
5930
5930 if needsoutgoing:
5931 if needsoutgoing:
5931 dest, dbranch, dother, outgoing = getoutgoing()
5932 dest, dbranch, dother, outgoing = getoutgoing()
5932 else:
5933 else:
5933 dest = dbranch = dother = outgoing = None
5934 dest = dbranch = dother = outgoing = None
5934
5935
5935 if opts.get('remote'):
5936 if opts.get('remote'):
5936 t = []
5937 t = []
5937 if incoming:
5938 if incoming:
5938 t.append(_('1 or more incoming'))
5939 t.append(_('1 or more incoming'))
5939 o = outgoing.missing
5940 o = outgoing.missing
5940 if o:
5941 if o:
5941 t.append(_('%d outgoing') % len(o))
5942 t.append(_('%d outgoing') % len(o))
5942 other = dother or sother
5943 other = dother or sother
5943 if 'bookmarks' in other.listkeys('namespaces'):
5944 if 'bookmarks' in other.listkeys('namespaces'):
5944 lmarks = repo.listkeys('bookmarks')
5945 lmarks = repo.listkeys('bookmarks')
5945 rmarks = other.listkeys('bookmarks')
5946 rmarks = other.listkeys('bookmarks')
5946 diff = set(rmarks) - set(lmarks)
5947 diff = set(rmarks) - set(lmarks)
5947 if len(diff) > 0:
5948 if len(diff) > 0:
5948 t.append(_('%d incoming bookmarks') % len(diff))
5949 t.append(_('%d incoming bookmarks') % len(diff))
5949 diff = set(lmarks) - set(rmarks)
5950 diff = set(lmarks) - set(rmarks)
5950 if len(diff) > 0:
5951 if len(diff) > 0:
5951 t.append(_('%d outgoing bookmarks') % len(diff))
5952 t.append(_('%d outgoing bookmarks') % len(diff))
5952
5953
5953 if t:
5954 if t:
5954 # i18n: column positioning for "hg summary"
5955 # i18n: column positioning for "hg summary"
5955 ui.write(_('remote: %s\n') % (', '.join(t)))
5956 ui.write(_('remote: %s\n') % (', '.join(t)))
5956 else:
5957 else:
5957 # i18n: column positioning for "hg summary"
5958 # i18n: column positioning for "hg summary"
5958 ui.status(_('remote: (synced)\n'))
5959 ui.status(_('remote: (synced)\n'))
5959
5960
5960 cmdutil.summaryremotehooks(ui, repo, opts,
5961 cmdutil.summaryremotehooks(ui, repo, opts,
5961 ((source, sbranch, sother, commoninc),
5962 ((source, sbranch, sother, commoninc),
5962 (dest, dbranch, dother, outgoing)))
5963 (dest, dbranch, dother, outgoing)))
5963
5964
5964 @command('tag',
5965 @command('tag',
5965 [('f', 'force', None, _('force tag')),
5966 [('f', 'force', None, _('force tag')),
5966 ('l', 'local', None, _('make the tag local')),
5967 ('l', 'local', None, _('make the tag local')),
5967 ('r', 'rev', '', _('revision to tag'), _('REV')),
5968 ('r', 'rev', '', _('revision to tag'), _('REV')),
5968 ('', 'remove', None, _('remove a tag')),
5969 ('', 'remove', None, _('remove a tag')),
5969 # -l/--local is already there, commitopts cannot be used
5970 # -l/--local is already there, commitopts cannot be used
5970 ('e', 'edit', None, _('invoke editor on commit messages')),
5971 ('e', 'edit', None, _('invoke editor on commit messages')),
5971 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5972 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5972 ] + commitopts2,
5973 ] + commitopts2,
5973 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5974 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5974 def tag(ui, repo, name1, *names, **opts):
5975 def tag(ui, repo, name1, *names, **opts):
5975 """add one or more tags for the current or given revision
5976 """add one or more tags for the current or given revision
5976
5977
5977 Name a particular revision using <name>.
5978 Name a particular revision using <name>.
5978
5979
5979 Tags are used to name particular revisions of the repository and are
5980 Tags are used to name particular revisions of the repository and are
5980 very useful to compare different revisions, to go back to significant
5981 very useful to compare different revisions, to go back to significant
5981 earlier versions or to mark branch points as releases, etc. Changing
5982 earlier versions or to mark branch points as releases, etc. Changing
5982 an existing tag is normally disallowed; use -f/--force to override.
5983 an existing tag is normally disallowed; use -f/--force to override.
5983
5984
5984 If no revision is given, the parent of the working directory is
5985 If no revision is given, the parent of the working directory is
5985 used.
5986 used.
5986
5987
5987 To facilitate version control, distribution, and merging of tags,
5988 To facilitate version control, distribution, and merging of tags,
5988 they are stored as a file named ".hgtags" which is managed similarly
5989 they are stored as a file named ".hgtags" which is managed similarly
5989 to other project files and can be hand-edited if necessary. This
5990 to other project files and can be hand-edited if necessary. This
5990 also means that tagging creates a new commit. The file
5991 also means that tagging creates a new commit. The file
5991 ".hg/localtags" is used for local tags (not shared among
5992 ".hg/localtags" is used for local tags (not shared among
5992 repositories).
5993 repositories).
5993
5994
5994 Tag commits are usually made at the head of a branch. If the parent
5995 Tag commits are usually made at the head of a branch. If the parent
5995 of the working directory is not a branch head, :hg:`tag` aborts; use
5996 of the working directory is not a branch head, :hg:`tag` aborts; use
5996 -f/--force to force the tag commit to be based on a non-head
5997 -f/--force to force the tag commit to be based on a non-head
5997 changeset.
5998 changeset.
5998
5999
5999 See :hg:`help dates` for a list of formats valid for -d/--date.
6000 See :hg:`help dates` for a list of formats valid for -d/--date.
6000
6001
6001 Since tag names have priority over branch names during revision
6002 Since tag names have priority over branch names during revision
6002 lookup, using an existing branch name as a tag name is discouraged.
6003 lookup, using an existing branch name as a tag name is discouraged.
6003
6004
6004 Returns 0 on success.
6005 Returns 0 on success.
6005 """
6006 """
6006 wlock = lock = None
6007 wlock = lock = None
6007 try:
6008 try:
6008 wlock = repo.wlock()
6009 wlock = repo.wlock()
6009 lock = repo.lock()
6010 lock = repo.lock()
6010 rev_ = "."
6011 rev_ = "."
6011 names = [t.strip() for t in (name1,) + names]
6012 names = [t.strip() for t in (name1,) + names]
6012 if len(names) != len(set(names)):
6013 if len(names) != len(set(names)):
6013 raise util.Abort(_('tag names must be unique'))
6014 raise util.Abort(_('tag names must be unique'))
6014 for n in names:
6015 for n in names:
6015 scmutil.checknewlabel(repo, n, 'tag')
6016 scmutil.checknewlabel(repo, n, 'tag')
6016 if not n:
6017 if not n:
6017 raise util.Abort(_('tag names cannot consist entirely of '
6018 raise util.Abort(_('tag names cannot consist entirely of '
6018 'whitespace'))
6019 'whitespace'))
6019 if opts.get('rev') and opts.get('remove'):
6020 if opts.get('rev') and opts.get('remove'):
6020 raise util.Abort(_("--rev and --remove are incompatible"))
6021 raise util.Abort(_("--rev and --remove are incompatible"))
6021 if opts.get('rev'):
6022 if opts.get('rev'):
6022 rev_ = opts['rev']
6023 rev_ = opts['rev']
6023 message = opts.get('message')
6024 message = opts.get('message')
6024 if opts.get('remove'):
6025 if opts.get('remove'):
6025 expectedtype = opts.get('local') and 'local' or 'global'
6026 expectedtype = opts.get('local') and 'local' or 'global'
6026 for n in names:
6027 for n in names:
6027 if not repo.tagtype(n):
6028 if not repo.tagtype(n):
6028 raise util.Abort(_("tag '%s' does not exist") % n)
6029 raise util.Abort(_("tag '%s' does not exist") % n)
6029 if repo.tagtype(n) != expectedtype:
6030 if repo.tagtype(n) != expectedtype:
6030 if expectedtype == 'global':
6031 if expectedtype == 'global':
6031 raise util.Abort(_("tag '%s' is not a global tag") % n)
6032 raise util.Abort(_("tag '%s' is not a global tag") % n)
6032 else:
6033 else:
6033 raise util.Abort(_("tag '%s' is not a local tag") % n)
6034 raise util.Abort(_("tag '%s' is not a local tag") % n)
6034 rev_ = nullid
6035 rev_ = nullid
6035 if not message:
6036 if not message:
6036 # we don't translate commit messages
6037 # we don't translate commit messages
6037 message = 'Removed tag %s' % ', '.join(names)
6038 message = 'Removed tag %s' % ', '.join(names)
6038 elif not opts.get('force'):
6039 elif not opts.get('force'):
6039 for n in names:
6040 for n in names:
6040 if n in repo.tags():
6041 if n in repo.tags():
6041 raise util.Abort(_("tag '%s' already exists "
6042 raise util.Abort(_("tag '%s' already exists "
6042 "(use -f to force)") % n)
6043 "(use -f to force)") % n)
6043 if not opts.get('local'):
6044 if not opts.get('local'):
6044 p1, p2 = repo.dirstate.parents()
6045 p1, p2 = repo.dirstate.parents()
6045 if p2 != nullid:
6046 if p2 != nullid:
6046 raise util.Abort(_('uncommitted merge'))
6047 raise util.Abort(_('uncommitted merge'))
6047 bheads = repo.branchheads()
6048 bheads = repo.branchheads()
6048 if not opts.get('force') and bheads and p1 not in bheads:
6049 if not opts.get('force') and bheads and p1 not in bheads:
6049 raise util.Abort(_('not at a branch head (use -f to force)'))
6050 raise util.Abort(_('not at a branch head (use -f to force)'))
6050 r = scmutil.revsingle(repo, rev_).node()
6051 r = scmutil.revsingle(repo, rev_).node()
6051
6052
6052 if not message:
6053 if not message:
6053 # we don't translate commit messages
6054 # we don't translate commit messages
6054 message = ('Added tag %s for changeset %s' %
6055 message = ('Added tag %s for changeset %s' %
6055 (', '.join(names), short(r)))
6056 (', '.join(names), short(r)))
6056
6057
6057 date = opts.get('date')
6058 date = opts.get('date')
6058 if date:
6059 if date:
6059 date = util.parsedate(date)
6060 date = util.parsedate(date)
6060
6061
6061 if opts.get('remove'):
6062 if opts.get('remove'):
6062 editform = 'tag.remove'
6063 editform = 'tag.remove'
6063 else:
6064 else:
6064 editform = 'tag.add'
6065 editform = 'tag.add'
6065 editor = cmdutil.getcommiteditor(editform=editform, **opts)
6066 editor = cmdutil.getcommiteditor(editform=editform, **opts)
6066
6067
6067 # don't allow tagging the null rev
6068 # don't allow tagging the null rev
6068 if (not opts.get('remove') and
6069 if (not opts.get('remove') and
6069 scmutil.revsingle(repo, rev_).rev() == nullrev):
6070 scmutil.revsingle(repo, rev_).rev() == nullrev):
6070 raise util.Abort(_("cannot tag null revision"))
6071 raise util.Abort(_("cannot tag null revision"))
6071
6072
6072 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
6073 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
6073 editor=editor)
6074 editor=editor)
6074 finally:
6075 finally:
6075 release(lock, wlock)
6076 release(lock, wlock)
6076
6077
6077 @command('tags', formatteropts, '')
6078 @command('tags', formatteropts, '')
6078 def tags(ui, repo, **opts):
6079 def tags(ui, repo, **opts):
6079 """list repository tags
6080 """list repository tags
6080
6081
6081 This lists both regular and local tags. When the -v/--verbose
6082 This lists both regular and local tags. When the -v/--verbose
6082 switch is used, a third column "local" is printed for local tags.
6083 switch is used, a third column "local" is printed for local tags.
6083
6084
6084 Returns 0 on success.
6085 Returns 0 on success.
6085 """
6086 """
6086
6087
6087 fm = ui.formatter('tags', opts)
6088 fm = ui.formatter('tags', opts)
6088 if fm or ui.debugflag:
6089 if fm or ui.debugflag:
6089 hexfunc = hex
6090 hexfunc = hex
6090 else:
6091 else:
6091 hexfunc = short
6092 hexfunc = short
6092 tagtype = ""
6093 tagtype = ""
6093
6094
6094 for t, n in reversed(repo.tagslist()):
6095 for t, n in reversed(repo.tagslist()):
6095 hn = hexfunc(n)
6096 hn = hexfunc(n)
6096 label = 'tags.normal'
6097 label = 'tags.normal'
6097 tagtype = ''
6098 tagtype = ''
6098 if repo.tagtype(t) == 'local':
6099 if repo.tagtype(t) == 'local':
6099 label = 'tags.local'
6100 label = 'tags.local'
6100 tagtype = 'local'
6101 tagtype = 'local'
6101
6102
6102 fm.startitem()
6103 fm.startitem()
6103 fm.write('tag', '%s', t, label=label)
6104 fm.write('tag', '%s', t, label=label)
6104 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
6105 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
6105 fm.condwrite(not ui.quiet, 'rev node', fmt,
6106 fm.condwrite(not ui.quiet, 'rev node', fmt,
6106 repo.changelog.rev(n), hn, label=label)
6107 repo.changelog.rev(n), hn, label=label)
6107 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
6108 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
6108 tagtype, label=label)
6109 tagtype, label=label)
6109 fm.plain('\n')
6110 fm.plain('\n')
6110 fm.end()
6111 fm.end()
6111
6112
6112 @command('tip',
6113 @command('tip',
6113 [('p', 'patch', None, _('show patch')),
6114 [('p', 'patch', None, _('show patch')),
6114 ('g', 'git', None, _('use git extended diff format')),
6115 ('g', 'git', None, _('use git extended diff format')),
6115 ] + templateopts,
6116 ] + templateopts,
6116 _('[-p] [-g]'))
6117 _('[-p] [-g]'))
6117 def tip(ui, repo, **opts):
6118 def tip(ui, repo, **opts):
6118 """show the tip revision (DEPRECATED)
6119 """show the tip revision (DEPRECATED)
6119
6120
6120 The tip revision (usually just called the tip) is the changeset
6121 The tip revision (usually just called the tip) is the changeset
6121 most recently added to the repository (and therefore the most
6122 most recently added to the repository (and therefore the most
6122 recently changed head).
6123 recently changed head).
6123
6124
6124 If you have just made a commit, that commit will be the tip. If
6125 If you have just made a commit, that commit will be the tip. If
6125 you have just pulled changes from another repository, the tip of
6126 you have just pulled changes from another repository, the tip of
6126 that repository becomes the current tip. The "tip" tag is special
6127 that repository becomes the current tip. The "tip" tag is special
6127 and cannot be renamed or assigned to a different changeset.
6128 and cannot be renamed or assigned to a different changeset.
6128
6129
6129 This command is deprecated, please use :hg:`heads` instead.
6130 This command is deprecated, please use :hg:`heads` instead.
6130
6131
6131 Returns 0 on success.
6132 Returns 0 on success.
6132 """
6133 """
6133 displayer = cmdutil.show_changeset(ui, repo, opts)
6134 displayer = cmdutil.show_changeset(ui, repo, opts)
6134 displayer.show(repo['tip'])
6135 displayer.show(repo['tip'])
6135 displayer.close()
6136 displayer.close()
6136
6137
6137 @command('unbundle',
6138 @command('unbundle',
6138 [('u', 'update', None,
6139 [('u', 'update', None,
6139 _('update to new branch head if changesets were unbundled'))],
6140 _('update to new branch head if changesets were unbundled'))],
6140 _('[-u] FILE...'))
6141 _('[-u] FILE...'))
6141 def unbundle(ui, repo, fname1, *fnames, **opts):
6142 def unbundle(ui, repo, fname1, *fnames, **opts):
6142 """apply one or more changegroup files
6143 """apply one or more changegroup files
6143
6144
6144 Apply one or more compressed changegroup files generated by the
6145 Apply one or more compressed changegroup files generated by the
6145 bundle command.
6146 bundle command.
6146
6147
6147 Returns 0 on success, 1 if an update has unresolved files.
6148 Returns 0 on success, 1 if an update has unresolved files.
6148 """
6149 """
6149 fnames = (fname1,) + fnames
6150 fnames = (fname1,) + fnames
6150
6151
6151 lock = repo.lock()
6152 lock = repo.lock()
6152 try:
6153 try:
6153 for fname in fnames:
6154 for fname in fnames:
6154 f = hg.openpath(ui, fname)
6155 f = hg.openpath(ui, fname)
6155 gen = exchange.readbundle(ui, f, fname)
6156 gen = exchange.readbundle(ui, f, fname)
6156 modheads = changegroup.addchangegroup(repo, gen, 'unbundle',
6157 modheads = changegroup.addchangegroup(repo, gen, 'unbundle',
6157 'bundle:' + fname)
6158 'bundle:' + fname)
6158 finally:
6159 finally:
6159 lock.release()
6160 lock.release()
6160
6161
6161 return postincoming(ui, repo, modheads, opts.get('update'), None)
6162 return postincoming(ui, repo, modheads, opts.get('update'), None)
6162
6163
6163 @command('^update|up|checkout|co',
6164 @command('^update|up|checkout|co',
6164 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
6165 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
6165 ('c', 'check', None,
6166 ('c', 'check', None,
6166 _('update across branches if no uncommitted changes')),
6167 _('update across branches if no uncommitted changes')),
6167 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6168 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6168 ('r', 'rev', '', _('revision'), _('REV'))
6169 ('r', 'rev', '', _('revision'), _('REV'))
6169 ] + mergetoolopts,
6170 ] + mergetoolopts,
6170 _('[-c] [-C] [-d DATE] [[-r] REV]'))
6171 _('[-c] [-C] [-d DATE] [[-r] REV]'))
6171 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
6172 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
6172 tool=None):
6173 tool=None):
6173 """update working directory (or switch revisions)
6174 """update working directory (or switch revisions)
6174
6175
6175 Update the repository's working directory to the specified
6176 Update the repository's working directory to the specified
6176 changeset. If no changeset is specified, update to the tip of the
6177 changeset. If no changeset is specified, update to the tip of the
6177 current named branch and move the current bookmark (see :hg:`help
6178 current named branch and move the current bookmark (see :hg:`help
6178 bookmarks`).
6179 bookmarks`).
6179
6180
6180 Update sets the working directory's parent revision to the specified
6181 Update sets the working directory's parent revision to the specified
6181 changeset (see :hg:`help parents`).
6182 changeset (see :hg:`help parents`).
6182
6183
6183 If the changeset is not a descendant or ancestor of the working
6184 If the changeset is not a descendant or ancestor of the working
6184 directory's parent, the update is aborted. With the -c/--check
6185 directory's parent, the update is aborted. With the -c/--check
6185 option, the working directory is checked for uncommitted changes; if
6186 option, the working directory is checked for uncommitted changes; if
6186 none are found, the working directory is updated to the specified
6187 none are found, the working directory is updated to the specified
6187 changeset.
6188 changeset.
6188
6189
6189 .. container:: verbose
6190 .. container:: verbose
6190
6191
6191 The following rules apply when the working directory contains
6192 The following rules apply when the working directory contains
6192 uncommitted changes:
6193 uncommitted changes:
6193
6194
6194 1. If neither -c/--check nor -C/--clean is specified, and if
6195 1. If neither -c/--check nor -C/--clean is specified, and if
6195 the requested changeset is an ancestor or descendant of
6196 the requested changeset is an ancestor or descendant of
6196 the working directory's parent, the uncommitted changes
6197 the working directory's parent, the uncommitted changes
6197 are merged into the requested changeset and the merged
6198 are merged into the requested changeset and the merged
6198 result is left uncommitted. If the requested changeset is
6199 result is left uncommitted. If the requested changeset is
6199 not an ancestor or descendant (that is, it is on another
6200 not an ancestor or descendant (that is, it is on another
6200 branch), the update is aborted and the uncommitted changes
6201 branch), the update is aborted and the uncommitted changes
6201 are preserved.
6202 are preserved.
6202
6203
6203 2. With the -c/--check option, the update is aborted and the
6204 2. With the -c/--check option, the update is aborted and the
6204 uncommitted changes are preserved.
6205 uncommitted changes are preserved.
6205
6206
6206 3. With the -C/--clean option, uncommitted changes are discarded and
6207 3. With the -C/--clean option, uncommitted changes are discarded and
6207 the working directory is updated to the requested changeset.
6208 the working directory is updated to the requested changeset.
6208
6209
6209 To cancel an uncommitted merge (and lose your changes), use
6210 To cancel an uncommitted merge (and lose your changes), use
6210 :hg:`update --clean .`.
6211 :hg:`update --clean .`.
6211
6212
6212 Use null as the changeset to remove the working directory (like
6213 Use null as the changeset to remove the working directory (like
6213 :hg:`clone -U`).
6214 :hg:`clone -U`).
6214
6215
6215 If you want to revert just one file to an older revision, use
6216 If you want to revert just one file to an older revision, use
6216 :hg:`revert [-r REV] NAME`.
6217 :hg:`revert [-r REV] NAME`.
6217
6218
6218 See :hg:`help dates` for a list of formats valid for -d/--date.
6219 See :hg:`help dates` for a list of formats valid for -d/--date.
6219
6220
6220 Returns 0 on success, 1 if there are unresolved files.
6221 Returns 0 on success, 1 if there are unresolved files.
6221 """
6222 """
6222 if rev and node:
6223 if rev and node:
6223 raise util.Abort(_("please specify just one revision"))
6224 raise util.Abort(_("please specify just one revision"))
6224
6225
6225 if rev is None or rev == '':
6226 if rev is None or rev == '':
6226 rev = node
6227 rev = node
6227
6228
6228 cmdutil.clearunfinished(repo)
6229 cmdutil.clearunfinished(repo)
6229
6230
6230 # with no argument, we also move the current bookmark, if any
6231 # with no argument, we also move the current bookmark, if any
6231 rev, movemarkfrom = bookmarks.calculateupdate(ui, repo, rev)
6232 rev, movemarkfrom = bookmarks.calculateupdate(ui, repo, rev)
6232
6233
6233 # if we defined a bookmark, we have to remember the original bookmark name
6234 # if we defined a bookmark, we have to remember the original bookmark name
6234 brev = rev
6235 brev = rev
6235 rev = scmutil.revsingle(repo, rev, rev).rev()
6236 rev = scmutil.revsingle(repo, rev, rev).rev()
6236
6237
6237 if check and clean:
6238 if check and clean:
6238 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
6239 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
6239
6240
6240 if date:
6241 if date:
6241 if rev is not None:
6242 if rev is not None:
6242 raise util.Abort(_("you can't specify a revision and a date"))
6243 raise util.Abort(_("you can't specify a revision and a date"))
6243 rev = cmdutil.finddate(ui, repo, date)
6244 rev = cmdutil.finddate(ui, repo, date)
6244
6245
6245 if check:
6246 if check:
6246 c = repo[None]
6247 c = repo[None]
6247 if c.dirty(merge=False, branch=False, missing=True):
6248 if c.dirty(merge=False, branch=False, missing=True):
6248 raise util.Abort(_("uncommitted changes"))
6249 raise util.Abort(_("uncommitted changes"))
6249 if rev is None:
6250 if rev is None:
6250 rev = repo[repo[None].branch()].rev()
6251 rev = repo[repo[None].branch()].rev()
6251 mergemod._checkunknown(repo, repo[None], repo[rev])
6252 mergemod._checkunknown(repo, repo[None], repo[rev])
6252
6253
6253 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
6254 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
6254
6255
6255 if clean:
6256 if clean:
6256 ret = hg.clean(repo, rev)
6257 ret = hg.clean(repo, rev)
6257 else:
6258 else:
6258 ret = hg.update(repo, rev)
6259 ret = hg.update(repo, rev)
6259
6260
6260 if not ret and movemarkfrom:
6261 if not ret and movemarkfrom:
6261 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
6262 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
6262 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
6263 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
6263 elif brev in repo._bookmarks:
6264 elif brev in repo._bookmarks:
6264 bookmarks.setcurrent(repo, brev)
6265 bookmarks.setcurrent(repo, brev)
6265 ui.status(_("(activating bookmark %s)\n") % brev)
6266 ui.status(_("(activating bookmark %s)\n") % brev)
6266 elif brev:
6267 elif brev:
6267 if repo._bookmarkcurrent:
6268 if repo._bookmarkcurrent:
6268 ui.status(_("(leaving bookmark %s)\n") %
6269 ui.status(_("(leaving bookmark %s)\n") %
6269 repo._bookmarkcurrent)
6270 repo._bookmarkcurrent)
6270 bookmarks.unsetcurrent(repo)
6271 bookmarks.unsetcurrent(repo)
6271
6272
6272 return ret
6273 return ret
6273
6274
6274 @command('verify', [])
6275 @command('verify', [])
6275 def verify(ui, repo):
6276 def verify(ui, repo):
6276 """verify the integrity of the repository
6277 """verify the integrity of the repository
6277
6278
6278 Verify the integrity of the current repository.
6279 Verify the integrity of the current repository.
6279
6280
6280 This will perform an extensive check of the repository's
6281 This will perform an extensive check of the repository's
6281 integrity, validating the hashes and checksums of each entry in
6282 integrity, validating the hashes and checksums of each entry in
6282 the changelog, manifest, and tracked files, as well as the
6283 the changelog, manifest, and tracked files, as well as the
6283 integrity of their crosslinks and indices.
6284 integrity of their crosslinks and indices.
6284
6285
6285 Please see http://mercurial.selenic.com/wiki/RepositoryCorruption
6286 Please see http://mercurial.selenic.com/wiki/RepositoryCorruption
6286 for more information about recovery from corruption of the
6287 for more information about recovery from corruption of the
6287 repository.
6288 repository.
6288
6289
6289 Returns 0 on success, 1 if errors are encountered.
6290 Returns 0 on success, 1 if errors are encountered.
6290 """
6291 """
6291 return hg.verify(repo)
6292 return hg.verify(repo)
6292
6293
6293 @command('version', [], norepo=True)
6294 @command('version', [], norepo=True)
6294 def version_(ui):
6295 def version_(ui):
6295 """output version and copyright information"""
6296 """output version and copyright information"""
6296 ui.write(_("Mercurial Distributed SCM (version %s)\n")
6297 ui.write(_("Mercurial Distributed SCM (version %s)\n")
6297 % util.version())
6298 % util.version())
6298 ui.status(_(
6299 ui.status(_(
6299 "(see http://mercurial.selenic.com for more information)\n"
6300 "(see http://mercurial.selenic.com for more information)\n"
6300 "\nCopyright (C) 2005-2014 Matt Mackall and others\n"
6301 "\nCopyright (C) 2005-2014 Matt Mackall and others\n"
6301 "This is free software; see the source for copying conditions. "
6302 "This is free software; see the source for copying conditions. "
6302 "There is NO\nwarranty; "
6303 "There is NO\nwarranty; "
6303 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6304 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6304 ))
6305 ))
6305
6306
6306 ui.note(_("\nEnabled extensions:\n\n"))
6307 ui.note(_("\nEnabled extensions:\n\n"))
6307 if ui.verbose:
6308 if ui.verbose:
6308 # format names and versions into columns
6309 # format names and versions into columns
6309 names = []
6310 names = []
6310 vers = []
6311 vers = []
6311 for name, module in extensions.extensions():
6312 for name, module in extensions.extensions():
6312 names.append(name)
6313 names.append(name)
6313 vers.append(extensions.moduleversion(module))
6314 vers.append(extensions.moduleversion(module))
6314 if names:
6315 if names:
6315 maxnamelen = max(len(n) for n in names)
6316 maxnamelen = max(len(n) for n in names)
6316 for i, name in enumerate(names):
6317 for i, name in enumerate(names):
6317 ui.write(" %-*s %s\n" % (maxnamelen, name, vers[i]))
6318 ui.write(" %-*s %s\n" % (maxnamelen, name, vers[i]))
General Comments 0
You need to be logged in to leave comments. Login now