##// END OF EJS Templates
push: sanitize handling of bookmark push return value...
Pierre-Yves David -
r22621:76a43e0d default
parent child Browse files
Show More
@@ -1,6325 +1,6325 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 (not active) or isactive:
1107 if (not active) or isactive:
1108 if isactive:
1108 if isactive:
1109 label = 'branches.active'
1109 label = 'branches.active'
1110 notice = ''
1110 notice = ''
1111 elif not isopen:
1111 elif not isopen:
1112 if not closed:
1112 if not closed:
1113 continue
1113 continue
1114 label = 'branches.closed'
1114 label = 'branches.closed'
1115 notice = _(' (closed)')
1115 notice = _(' (closed)')
1116 else:
1116 else:
1117 label = 'branches.inactive'
1117 label = 'branches.inactive'
1118 notice = _(' (inactive)')
1118 notice = _(' (inactive)')
1119 if tag == repo.dirstate.branch():
1119 if tag == repo.dirstate.branch():
1120 label = 'branches.current'
1120 label = 'branches.current'
1121 rev = str(ctx.rev()).rjust(31 - encoding.colwidth(tag))
1121 rev = str(ctx.rev()).rjust(31 - encoding.colwidth(tag))
1122 rev = ui.label('%s:%s' % (rev, hexfunc(ctx.node())),
1122 rev = ui.label('%s:%s' % (rev, hexfunc(ctx.node())),
1123 'log.changeset changeset.%s' % ctx.phasestr())
1123 'log.changeset changeset.%s' % ctx.phasestr())
1124 labeledtag = ui.label(tag, label)
1124 labeledtag = ui.label(tag, label)
1125 if ui.quiet:
1125 if ui.quiet:
1126 ui.write("%s\n" % labeledtag)
1126 ui.write("%s\n" % labeledtag)
1127 else:
1127 else:
1128 ui.write("%s %s%s\n" % (labeledtag, rev, notice))
1128 ui.write("%s %s%s\n" % (labeledtag, rev, notice))
1129
1129
1130 @command('bundle',
1130 @command('bundle',
1131 [('f', 'force', None, _('run even when the destination is unrelated')),
1131 [('f', 'force', None, _('run even when the destination is unrelated')),
1132 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1132 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1133 _('REV')),
1133 _('REV')),
1134 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1134 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1135 _('BRANCH')),
1135 _('BRANCH')),
1136 ('', 'base', [],
1136 ('', 'base', [],
1137 _('a base changeset assumed to be available at the destination'),
1137 _('a base changeset assumed to be available at the destination'),
1138 _('REV')),
1138 _('REV')),
1139 ('a', 'all', None, _('bundle all changesets in the repository')),
1139 ('a', 'all', None, _('bundle all changesets in the repository')),
1140 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1140 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1141 ] + remoteopts,
1141 ] + remoteopts,
1142 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1142 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1143 def bundle(ui, repo, fname, dest=None, **opts):
1143 def bundle(ui, repo, fname, dest=None, **opts):
1144 """create a changegroup file
1144 """create a changegroup file
1145
1145
1146 Generate a compressed changegroup file collecting changesets not
1146 Generate a compressed changegroup file collecting changesets not
1147 known to be in another repository.
1147 known to be in another repository.
1148
1148
1149 If you omit the destination repository, then hg assumes the
1149 If you omit the destination repository, then hg assumes the
1150 destination will have all the nodes you specify with --base
1150 destination will have all the nodes you specify with --base
1151 parameters. To create a bundle containing all changesets, use
1151 parameters. To create a bundle containing all changesets, use
1152 -a/--all (or --base null).
1152 -a/--all (or --base null).
1153
1153
1154 You can change compression method with the -t/--type option.
1154 You can change compression method with the -t/--type option.
1155 The available compression methods are: none, bzip2, and
1155 The available compression methods are: none, bzip2, and
1156 gzip (by default, bundles are compressed using bzip2).
1156 gzip (by default, bundles are compressed using bzip2).
1157
1157
1158 The bundle file can then be transferred using conventional means
1158 The bundle file can then be transferred using conventional means
1159 and applied to another repository with the unbundle or pull
1159 and applied to another repository with the unbundle or pull
1160 command. This is useful when direct push and pull are not
1160 command. This is useful when direct push and pull are not
1161 available or when exporting an entire repository is undesirable.
1161 available or when exporting an entire repository is undesirable.
1162
1162
1163 Applying bundles preserves all changeset contents including
1163 Applying bundles preserves all changeset contents including
1164 permissions, copy/rename information, and revision history.
1164 permissions, copy/rename information, and revision history.
1165
1165
1166 Returns 0 on success, 1 if no changes found.
1166 Returns 0 on success, 1 if no changes found.
1167 """
1167 """
1168 revs = None
1168 revs = None
1169 if 'rev' in opts:
1169 if 'rev' in opts:
1170 revs = scmutil.revrange(repo, opts['rev'])
1170 revs = scmutil.revrange(repo, opts['rev'])
1171
1171
1172 bundletype = opts.get('type', 'bzip2').lower()
1172 bundletype = opts.get('type', 'bzip2').lower()
1173 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1173 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1174 bundletype = btypes.get(bundletype)
1174 bundletype = btypes.get(bundletype)
1175 if bundletype not in changegroup.bundletypes:
1175 if bundletype not in changegroup.bundletypes:
1176 raise util.Abort(_('unknown bundle type specified with --type'))
1176 raise util.Abort(_('unknown bundle type specified with --type'))
1177
1177
1178 if opts.get('all'):
1178 if opts.get('all'):
1179 base = ['null']
1179 base = ['null']
1180 else:
1180 else:
1181 base = scmutil.revrange(repo, opts.get('base'))
1181 base = scmutil.revrange(repo, opts.get('base'))
1182 # TODO: get desired bundlecaps from command line.
1182 # TODO: get desired bundlecaps from command line.
1183 bundlecaps = None
1183 bundlecaps = None
1184 if base:
1184 if base:
1185 if dest:
1185 if dest:
1186 raise util.Abort(_("--base is incompatible with specifying "
1186 raise util.Abort(_("--base is incompatible with specifying "
1187 "a destination"))
1187 "a destination"))
1188 common = [repo.lookup(rev) for rev in base]
1188 common = [repo.lookup(rev) for rev in base]
1189 heads = revs and map(repo.lookup, revs) or revs
1189 heads = revs and map(repo.lookup, revs) or revs
1190 cg = changegroup.getchangegroup(repo, 'bundle', heads=heads,
1190 cg = changegroup.getchangegroup(repo, 'bundle', heads=heads,
1191 common=common, bundlecaps=bundlecaps)
1191 common=common, bundlecaps=bundlecaps)
1192 outgoing = None
1192 outgoing = None
1193 else:
1193 else:
1194 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1194 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1195 dest, branches = hg.parseurl(dest, opts.get('branch'))
1195 dest, branches = hg.parseurl(dest, opts.get('branch'))
1196 other = hg.peer(repo, opts, dest)
1196 other = hg.peer(repo, opts, dest)
1197 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1197 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1198 heads = revs and map(repo.lookup, revs) or revs
1198 heads = revs and map(repo.lookup, revs) or revs
1199 outgoing = discovery.findcommonoutgoing(repo, other,
1199 outgoing = discovery.findcommonoutgoing(repo, other,
1200 onlyheads=heads,
1200 onlyheads=heads,
1201 force=opts.get('force'),
1201 force=opts.get('force'),
1202 portable=True)
1202 portable=True)
1203 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1203 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1204 bundlecaps)
1204 bundlecaps)
1205 if not cg:
1205 if not cg:
1206 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1206 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1207 return 1
1207 return 1
1208
1208
1209 changegroup.writebundle(cg, fname, bundletype)
1209 changegroup.writebundle(cg, fname, bundletype)
1210
1210
1211 @command('cat',
1211 @command('cat',
1212 [('o', 'output', '',
1212 [('o', 'output', '',
1213 _('print output to file with formatted name'), _('FORMAT')),
1213 _('print output to file with formatted name'), _('FORMAT')),
1214 ('r', 'rev', '', _('print the given revision'), _('REV')),
1214 ('r', 'rev', '', _('print the given revision'), _('REV')),
1215 ('', 'decode', None, _('apply any matching decode filter')),
1215 ('', 'decode', None, _('apply any matching decode filter')),
1216 ] + walkopts,
1216 ] + walkopts,
1217 _('[OPTION]... FILE...'),
1217 _('[OPTION]... FILE...'),
1218 inferrepo=True)
1218 inferrepo=True)
1219 def cat(ui, repo, file1, *pats, **opts):
1219 def cat(ui, repo, file1, *pats, **opts):
1220 """output the current or given revision of files
1220 """output the current or given revision of files
1221
1221
1222 Print the specified files as they were at the given revision. If
1222 Print the specified files as they were at the given revision. If
1223 no revision is given, the parent of the working directory is used.
1223 no revision is given, the parent of the working directory is used.
1224
1224
1225 Output may be to a file, in which case the name of the file is
1225 Output may be to a file, in which case the name of the file is
1226 given using a format string. The formatting rules as follows:
1226 given using a format string. The formatting rules as follows:
1227
1227
1228 :``%%``: literal "%" character
1228 :``%%``: literal "%" character
1229 :``%s``: basename of file being printed
1229 :``%s``: basename of file being printed
1230 :``%d``: dirname of file being printed, or '.' if in repository root
1230 :``%d``: dirname of file being printed, or '.' if in repository root
1231 :``%p``: root-relative path name of file being printed
1231 :``%p``: root-relative path name of file being printed
1232 :``%H``: changeset hash (40 hexadecimal digits)
1232 :``%H``: changeset hash (40 hexadecimal digits)
1233 :``%R``: changeset revision number
1233 :``%R``: changeset revision number
1234 :``%h``: short-form changeset hash (12 hexadecimal digits)
1234 :``%h``: short-form changeset hash (12 hexadecimal digits)
1235 :``%r``: zero-padded changeset revision number
1235 :``%r``: zero-padded changeset revision number
1236 :``%b``: basename of the exporting repository
1236 :``%b``: basename of the exporting repository
1237
1237
1238 Returns 0 on success.
1238 Returns 0 on success.
1239 """
1239 """
1240 ctx = scmutil.revsingle(repo, opts.get('rev'))
1240 ctx = scmutil.revsingle(repo, opts.get('rev'))
1241 m = scmutil.match(ctx, (file1,) + pats, opts)
1241 m = scmutil.match(ctx, (file1,) + pats, opts)
1242
1242
1243 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1243 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1244
1244
1245 @command('^clone',
1245 @command('^clone',
1246 [('U', 'noupdate', None,
1246 [('U', 'noupdate', None,
1247 _('the clone will include an empty working copy (only a repository)')),
1247 _('the clone will include an empty working copy (only a repository)')),
1248 ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')),
1248 ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')),
1249 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1249 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1250 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1250 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1251 ('', 'pull', None, _('use pull protocol to copy metadata')),
1251 ('', 'pull', None, _('use pull protocol to copy metadata')),
1252 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1252 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1253 ] + remoteopts,
1253 ] + remoteopts,
1254 _('[OPTION]... SOURCE [DEST]'),
1254 _('[OPTION]... SOURCE [DEST]'),
1255 norepo=True)
1255 norepo=True)
1256 def clone(ui, source, dest=None, **opts):
1256 def clone(ui, source, dest=None, **opts):
1257 """make a copy of an existing repository
1257 """make a copy of an existing repository
1258
1258
1259 Create a copy of an existing repository in a new directory.
1259 Create a copy of an existing repository in a new directory.
1260
1260
1261 If no destination directory name is specified, it defaults to the
1261 If no destination directory name is specified, it defaults to the
1262 basename of the source.
1262 basename of the source.
1263
1263
1264 The location of the source is added to the new repository's
1264 The location of the source is added to the new repository's
1265 ``.hg/hgrc`` file, as the default to be used for future pulls.
1265 ``.hg/hgrc`` file, as the default to be used for future pulls.
1266
1266
1267 Only local paths and ``ssh://`` URLs are supported as
1267 Only local paths and ``ssh://`` URLs are supported as
1268 destinations. For ``ssh://`` destinations, no working directory or
1268 destinations. For ``ssh://`` destinations, no working directory or
1269 ``.hg/hgrc`` will be created on the remote side.
1269 ``.hg/hgrc`` will be created on the remote side.
1270
1270
1271 To pull only a subset of changesets, specify one or more revisions
1271 To pull only a subset of changesets, specify one or more revisions
1272 identifiers with -r/--rev or branches with -b/--branch. The
1272 identifiers with -r/--rev or branches with -b/--branch. The
1273 resulting clone will contain only the specified changesets and
1273 resulting clone will contain only the specified changesets and
1274 their ancestors. These options (or 'clone src#rev dest') imply
1274 their ancestors. These options (or 'clone src#rev dest') imply
1275 --pull, even for local source repositories. Note that specifying a
1275 --pull, even for local source repositories. Note that specifying a
1276 tag will include the tagged changeset but not the changeset
1276 tag will include the tagged changeset but not the changeset
1277 containing the tag.
1277 containing the tag.
1278
1278
1279 If the source repository has a bookmark called '@' set, that
1279 If the source repository has a bookmark called '@' set, that
1280 revision will be checked out in the new repository by default.
1280 revision will be checked out in the new repository by default.
1281
1281
1282 To check out a particular version, use -u/--update, or
1282 To check out a particular version, use -u/--update, or
1283 -U/--noupdate to create a clone with no working directory.
1283 -U/--noupdate to create a clone with no working directory.
1284
1284
1285 .. container:: verbose
1285 .. container:: verbose
1286
1286
1287 For efficiency, hardlinks are used for cloning whenever the
1287 For efficiency, hardlinks are used for cloning whenever the
1288 source and destination are on the same filesystem (note this
1288 source and destination are on the same filesystem (note this
1289 applies only to the repository data, not to the working
1289 applies only to the repository data, not to the working
1290 directory). Some filesystems, such as AFS, implement hardlinking
1290 directory). Some filesystems, such as AFS, implement hardlinking
1291 incorrectly, but do not report errors. In these cases, use the
1291 incorrectly, but do not report errors. In these cases, use the
1292 --pull option to avoid hardlinking.
1292 --pull option to avoid hardlinking.
1293
1293
1294 In some cases, you can clone repositories and the working
1294 In some cases, you can clone repositories and the working
1295 directory using full hardlinks with ::
1295 directory using full hardlinks with ::
1296
1296
1297 $ cp -al REPO REPOCLONE
1297 $ cp -al REPO REPOCLONE
1298
1298
1299 This is the fastest way to clone, but it is not always safe. The
1299 This is the fastest way to clone, but it is not always safe. The
1300 operation is not atomic (making sure REPO is not modified during
1300 operation is not atomic (making sure REPO is not modified during
1301 the operation is up to you) and you have to make sure your
1301 the operation is up to you) and you have to make sure your
1302 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1302 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1303 so). Also, this is not compatible with certain extensions that
1303 so). Also, this is not compatible with certain extensions that
1304 place their metadata under the .hg directory, such as mq.
1304 place their metadata under the .hg directory, such as mq.
1305
1305
1306 Mercurial will update the working directory to the first applicable
1306 Mercurial will update the working directory to the first applicable
1307 revision from this list:
1307 revision from this list:
1308
1308
1309 a) null if -U or the source repository has no changesets
1309 a) null if -U or the source repository has no changesets
1310 b) if -u . and the source repository is local, the first parent of
1310 b) if -u . and the source repository is local, the first parent of
1311 the source repository's working directory
1311 the source repository's working directory
1312 c) the changeset specified with -u (if a branch name, this means the
1312 c) the changeset specified with -u (if a branch name, this means the
1313 latest head of that branch)
1313 latest head of that branch)
1314 d) the changeset specified with -r
1314 d) the changeset specified with -r
1315 e) the tipmost head specified with -b
1315 e) the tipmost head specified with -b
1316 f) the tipmost head specified with the url#branch source syntax
1316 f) the tipmost head specified with the url#branch source syntax
1317 g) the revision marked with the '@' bookmark, if present
1317 g) the revision marked with the '@' bookmark, if present
1318 h) the tipmost head of the default branch
1318 h) the tipmost head of the default branch
1319 i) tip
1319 i) tip
1320
1320
1321 Examples:
1321 Examples:
1322
1322
1323 - clone a remote repository to a new directory named hg/::
1323 - clone a remote repository to a new directory named hg/::
1324
1324
1325 hg clone http://selenic.com/hg
1325 hg clone http://selenic.com/hg
1326
1326
1327 - create a lightweight local clone::
1327 - create a lightweight local clone::
1328
1328
1329 hg clone project/ project-feature/
1329 hg clone project/ project-feature/
1330
1330
1331 - clone from an absolute path on an ssh server (note double-slash)::
1331 - clone from an absolute path on an ssh server (note double-slash)::
1332
1332
1333 hg clone ssh://user@server//home/projects/alpha/
1333 hg clone ssh://user@server//home/projects/alpha/
1334
1334
1335 - do a high-speed clone over a LAN while checking out a
1335 - do a high-speed clone over a LAN while checking out a
1336 specified version::
1336 specified version::
1337
1337
1338 hg clone --uncompressed http://server/repo -u 1.5
1338 hg clone --uncompressed http://server/repo -u 1.5
1339
1339
1340 - create a repository without changesets after a particular revision::
1340 - create a repository without changesets after a particular revision::
1341
1341
1342 hg clone -r 04e544 experimental/ good/
1342 hg clone -r 04e544 experimental/ good/
1343
1343
1344 - clone (and track) a particular named branch::
1344 - clone (and track) a particular named branch::
1345
1345
1346 hg clone http://selenic.com/hg#stable
1346 hg clone http://selenic.com/hg#stable
1347
1347
1348 See :hg:`help urls` for details on specifying URLs.
1348 See :hg:`help urls` for details on specifying URLs.
1349
1349
1350 Returns 0 on success.
1350 Returns 0 on success.
1351 """
1351 """
1352 if opts.get('noupdate') and opts.get('updaterev'):
1352 if opts.get('noupdate') and opts.get('updaterev'):
1353 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
1353 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
1354
1354
1355 r = hg.clone(ui, opts, source, dest,
1355 r = hg.clone(ui, opts, source, dest,
1356 pull=opts.get('pull'),
1356 pull=opts.get('pull'),
1357 stream=opts.get('uncompressed'),
1357 stream=opts.get('uncompressed'),
1358 rev=opts.get('rev'),
1358 rev=opts.get('rev'),
1359 update=opts.get('updaterev') or not opts.get('noupdate'),
1359 update=opts.get('updaterev') or not opts.get('noupdate'),
1360 branch=opts.get('branch'))
1360 branch=opts.get('branch'))
1361
1361
1362 return r is None
1362 return r is None
1363
1363
1364 @command('^commit|ci',
1364 @command('^commit|ci',
1365 [('A', 'addremove', None,
1365 [('A', 'addremove', None,
1366 _('mark new/missing files as added/removed before committing')),
1366 _('mark new/missing files as added/removed before committing')),
1367 ('', 'close-branch', None,
1367 ('', 'close-branch', None,
1368 _('mark a branch as closed, hiding it from the branch list')),
1368 _('mark a branch as closed, hiding it from the branch list')),
1369 ('', 'amend', None, _('amend the parent of the working dir')),
1369 ('', 'amend', None, _('amend the parent of the working dir')),
1370 ('s', 'secret', None, _('use the secret phase for committing')),
1370 ('s', 'secret', None, _('use the secret phase for committing')),
1371 ('e', 'edit', None, _('invoke editor on commit messages')),
1371 ('e', 'edit', None, _('invoke editor on commit messages')),
1372 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1372 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1373 _('[OPTION]... [FILE]...'),
1373 _('[OPTION]... [FILE]...'),
1374 inferrepo=True)
1374 inferrepo=True)
1375 def commit(ui, repo, *pats, **opts):
1375 def commit(ui, repo, *pats, **opts):
1376 """commit the specified files or all outstanding changes
1376 """commit the specified files or all outstanding changes
1377
1377
1378 Commit changes to the given files into the repository. Unlike a
1378 Commit changes to the given files into the repository. Unlike a
1379 centralized SCM, this operation is a local operation. See
1379 centralized SCM, this operation is a local operation. See
1380 :hg:`push` for a way to actively distribute your changes.
1380 :hg:`push` for a way to actively distribute your changes.
1381
1381
1382 If a list of files is omitted, all changes reported by :hg:`status`
1382 If a list of files is omitted, all changes reported by :hg:`status`
1383 will be committed.
1383 will be committed.
1384
1384
1385 If you are committing the result of a merge, do not provide any
1385 If you are committing the result of a merge, do not provide any
1386 filenames or -I/-X filters.
1386 filenames or -I/-X filters.
1387
1387
1388 If no commit message is specified, Mercurial starts your
1388 If no commit message is specified, Mercurial starts your
1389 configured editor where you can enter a message. In case your
1389 configured editor where you can enter a message. In case your
1390 commit fails, you will find a backup of your message in
1390 commit fails, you will find a backup of your message in
1391 ``.hg/last-message.txt``.
1391 ``.hg/last-message.txt``.
1392
1392
1393 The --amend flag can be used to amend the parent of the
1393 The --amend flag can be used to amend the parent of the
1394 working directory with a new commit that contains the changes
1394 working directory with a new commit that contains the changes
1395 in the parent in addition to those currently reported by :hg:`status`,
1395 in the parent in addition to those currently reported by :hg:`status`,
1396 if there are any. The old commit is stored in a backup bundle in
1396 if there are any. The old commit is stored in a backup bundle in
1397 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1397 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1398 on how to restore it).
1398 on how to restore it).
1399
1399
1400 Message, user and date are taken from the amended commit unless
1400 Message, user and date are taken from the amended commit unless
1401 specified. When a message isn't specified on the command line,
1401 specified. When a message isn't specified on the command line,
1402 the editor will open with the message of the amended commit.
1402 the editor will open with the message of the amended commit.
1403
1403
1404 It is not possible to amend public changesets (see :hg:`help phases`)
1404 It is not possible to amend public changesets (see :hg:`help phases`)
1405 or changesets that have children.
1405 or changesets that have children.
1406
1406
1407 See :hg:`help dates` for a list of formats valid for -d/--date.
1407 See :hg:`help dates` for a list of formats valid for -d/--date.
1408
1408
1409 Returns 0 on success, 1 if nothing changed.
1409 Returns 0 on success, 1 if nothing changed.
1410 """
1410 """
1411 if opts.get('subrepos'):
1411 if opts.get('subrepos'):
1412 if opts.get('amend'):
1412 if opts.get('amend'):
1413 raise util.Abort(_('cannot amend with --subrepos'))
1413 raise util.Abort(_('cannot amend with --subrepos'))
1414 # Let --subrepos on the command line override config setting.
1414 # Let --subrepos on the command line override config setting.
1415 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1415 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1416
1416
1417 cmdutil.checkunfinished(repo, commit=True)
1417 cmdutil.checkunfinished(repo, commit=True)
1418
1418
1419 branch = repo[None].branch()
1419 branch = repo[None].branch()
1420 bheads = repo.branchheads(branch)
1420 bheads = repo.branchheads(branch)
1421
1421
1422 extra = {}
1422 extra = {}
1423 if opts.get('close_branch'):
1423 if opts.get('close_branch'):
1424 extra['close'] = 1
1424 extra['close'] = 1
1425
1425
1426 if not bheads:
1426 if not bheads:
1427 raise util.Abort(_('can only close branch heads'))
1427 raise util.Abort(_('can only close branch heads'))
1428 elif opts.get('amend'):
1428 elif opts.get('amend'):
1429 if repo.parents()[0].p1().branch() != branch and \
1429 if repo.parents()[0].p1().branch() != branch and \
1430 repo.parents()[0].p2().branch() != branch:
1430 repo.parents()[0].p2().branch() != branch:
1431 raise util.Abort(_('can only close branch heads'))
1431 raise util.Abort(_('can only close branch heads'))
1432
1432
1433 if opts.get('amend'):
1433 if opts.get('amend'):
1434 if ui.configbool('ui', 'commitsubrepos'):
1434 if ui.configbool('ui', 'commitsubrepos'):
1435 raise util.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1435 raise util.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1436
1436
1437 old = repo['.']
1437 old = repo['.']
1438 if not old.mutable():
1438 if not old.mutable():
1439 raise util.Abort(_('cannot amend public changesets'))
1439 raise util.Abort(_('cannot amend public changesets'))
1440 if len(repo[None].parents()) > 1:
1440 if len(repo[None].parents()) > 1:
1441 raise util.Abort(_('cannot amend while merging'))
1441 raise util.Abort(_('cannot amend while merging'))
1442 if (not obsolete._enabled) and old.children():
1442 if (not obsolete._enabled) and old.children():
1443 raise util.Abort(_('cannot amend changeset with children'))
1443 raise util.Abort(_('cannot amend changeset with children'))
1444
1444
1445 # commitfunc is used only for temporary amend commit by cmdutil.amend
1445 # commitfunc is used only for temporary amend commit by cmdutil.amend
1446 def commitfunc(ui, repo, message, match, opts):
1446 def commitfunc(ui, repo, message, match, opts):
1447 return repo.commit(message,
1447 return repo.commit(message,
1448 opts.get('user') or old.user(),
1448 opts.get('user') or old.user(),
1449 opts.get('date') or old.date(),
1449 opts.get('date') or old.date(),
1450 match,
1450 match,
1451 extra=extra)
1451 extra=extra)
1452
1452
1453 current = repo._bookmarkcurrent
1453 current = repo._bookmarkcurrent
1454 marks = old.bookmarks()
1454 marks = old.bookmarks()
1455 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1455 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1456 if node == old.node():
1456 if node == old.node():
1457 ui.status(_("nothing changed\n"))
1457 ui.status(_("nothing changed\n"))
1458 return 1
1458 return 1
1459 elif marks:
1459 elif marks:
1460 ui.debug('moving bookmarks %r from %s to %s\n' %
1460 ui.debug('moving bookmarks %r from %s to %s\n' %
1461 (marks, old.hex(), hex(node)))
1461 (marks, old.hex(), hex(node)))
1462 newmarks = repo._bookmarks
1462 newmarks = repo._bookmarks
1463 for bm in marks:
1463 for bm in marks:
1464 newmarks[bm] = node
1464 newmarks[bm] = node
1465 if bm == current:
1465 if bm == current:
1466 bookmarks.setcurrent(repo, bm)
1466 bookmarks.setcurrent(repo, bm)
1467 newmarks.write()
1467 newmarks.write()
1468 else:
1468 else:
1469 def commitfunc(ui, repo, message, match, opts):
1469 def commitfunc(ui, repo, message, match, opts):
1470 backup = ui.backupconfig('phases', 'new-commit')
1470 backup = ui.backupconfig('phases', 'new-commit')
1471 baseui = repo.baseui
1471 baseui = repo.baseui
1472 basebackup = baseui.backupconfig('phases', 'new-commit')
1472 basebackup = baseui.backupconfig('phases', 'new-commit')
1473 try:
1473 try:
1474 if opts.get('secret'):
1474 if opts.get('secret'):
1475 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1475 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1476 # Propagate to subrepos
1476 # Propagate to subrepos
1477 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1477 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1478
1478
1479 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1479 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1480 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1480 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1481 return repo.commit(message, opts.get('user'), opts.get('date'),
1481 return repo.commit(message, opts.get('user'), opts.get('date'),
1482 match,
1482 match,
1483 editor=editor,
1483 editor=editor,
1484 extra=extra)
1484 extra=extra)
1485 finally:
1485 finally:
1486 ui.restoreconfig(backup)
1486 ui.restoreconfig(backup)
1487 repo.baseui.restoreconfig(basebackup)
1487 repo.baseui.restoreconfig(basebackup)
1488
1488
1489
1489
1490 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1490 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1491
1491
1492 if not node:
1492 if not node:
1493 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1493 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1494 if stat[3]:
1494 if stat[3]:
1495 ui.status(_("nothing changed (%d missing files, see "
1495 ui.status(_("nothing changed (%d missing files, see "
1496 "'hg status')\n") % len(stat[3]))
1496 "'hg status')\n") % len(stat[3]))
1497 else:
1497 else:
1498 ui.status(_("nothing changed\n"))
1498 ui.status(_("nothing changed\n"))
1499 return 1
1499 return 1
1500
1500
1501 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1501 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1502
1502
1503 @command('config|showconfig|debugconfig',
1503 @command('config|showconfig|debugconfig',
1504 [('u', 'untrusted', None, _('show untrusted configuration options')),
1504 [('u', 'untrusted', None, _('show untrusted configuration options')),
1505 ('e', 'edit', None, _('edit user config')),
1505 ('e', 'edit', None, _('edit user config')),
1506 ('l', 'local', None, _('edit repository config')),
1506 ('l', 'local', None, _('edit repository config')),
1507 ('g', 'global', None, _('edit global config'))],
1507 ('g', 'global', None, _('edit global config'))],
1508 _('[-u] [NAME]...'),
1508 _('[-u] [NAME]...'),
1509 optionalrepo=True)
1509 optionalrepo=True)
1510 def config(ui, repo, *values, **opts):
1510 def config(ui, repo, *values, **opts):
1511 """show combined config settings from all hgrc files
1511 """show combined config settings from all hgrc files
1512
1512
1513 With no arguments, print names and values of all config items.
1513 With no arguments, print names and values of all config items.
1514
1514
1515 With one argument of the form section.name, print just the value
1515 With one argument of the form section.name, print just the value
1516 of that config item.
1516 of that config item.
1517
1517
1518 With multiple arguments, print names and values of all config
1518 With multiple arguments, print names and values of all config
1519 items with matching section names.
1519 items with matching section names.
1520
1520
1521 With --edit, start an editor on the user-level config file. With
1521 With --edit, start an editor on the user-level config file. With
1522 --global, edit the system-wide config file. With --local, edit the
1522 --global, edit the system-wide config file. With --local, edit the
1523 repository-level config file.
1523 repository-level config file.
1524
1524
1525 With --debug, the source (filename and line number) is printed
1525 With --debug, the source (filename and line number) is printed
1526 for each config item.
1526 for each config item.
1527
1527
1528 See :hg:`help config` for more information about config files.
1528 See :hg:`help config` for more information about config files.
1529
1529
1530 Returns 0 on success, 1 if NAME does not exist.
1530 Returns 0 on success, 1 if NAME does not exist.
1531
1531
1532 """
1532 """
1533
1533
1534 if opts.get('edit') or opts.get('local') or opts.get('global'):
1534 if opts.get('edit') or opts.get('local') or opts.get('global'):
1535 if opts.get('local') and opts.get('global'):
1535 if opts.get('local') and opts.get('global'):
1536 raise util.Abort(_("can't use --local and --global together"))
1536 raise util.Abort(_("can't use --local and --global together"))
1537
1537
1538 if opts.get('local'):
1538 if opts.get('local'):
1539 if not repo:
1539 if not repo:
1540 raise util.Abort(_("can't use --local outside a repository"))
1540 raise util.Abort(_("can't use --local outside a repository"))
1541 paths = [repo.join('hgrc')]
1541 paths = [repo.join('hgrc')]
1542 elif opts.get('global'):
1542 elif opts.get('global'):
1543 paths = scmutil.systemrcpath()
1543 paths = scmutil.systemrcpath()
1544 else:
1544 else:
1545 paths = scmutil.userrcpath()
1545 paths = scmutil.userrcpath()
1546
1546
1547 for f in paths:
1547 for f in paths:
1548 if os.path.exists(f):
1548 if os.path.exists(f):
1549 break
1549 break
1550 else:
1550 else:
1551 from ui import samplehgrcs
1551 from ui import samplehgrcs
1552
1552
1553 if opts.get('global'):
1553 if opts.get('global'):
1554 samplehgrc = samplehgrcs['global']
1554 samplehgrc = samplehgrcs['global']
1555 elif opts.get('local'):
1555 elif opts.get('local'):
1556 samplehgrc = samplehgrcs['local']
1556 samplehgrc = samplehgrcs['local']
1557 else:
1557 else:
1558 samplehgrc = samplehgrcs['user']
1558 samplehgrc = samplehgrcs['user']
1559
1559
1560 f = paths[0]
1560 f = paths[0]
1561 fp = open(f, "w")
1561 fp = open(f, "w")
1562 fp.write(samplehgrc)
1562 fp.write(samplehgrc)
1563 fp.close()
1563 fp.close()
1564
1564
1565 editor = ui.geteditor()
1565 editor = ui.geteditor()
1566 util.system("%s \"%s\"" % (editor, f),
1566 util.system("%s \"%s\"" % (editor, f),
1567 onerr=util.Abort, errprefix=_("edit failed"),
1567 onerr=util.Abort, errprefix=_("edit failed"),
1568 out=ui.fout)
1568 out=ui.fout)
1569 return
1569 return
1570
1570
1571 for f in scmutil.rcpath():
1571 for f in scmutil.rcpath():
1572 ui.debug('read config from: %s\n' % f)
1572 ui.debug('read config from: %s\n' % f)
1573 untrusted = bool(opts.get('untrusted'))
1573 untrusted = bool(opts.get('untrusted'))
1574 if values:
1574 if values:
1575 sections = [v for v in values if '.' not in v]
1575 sections = [v for v in values if '.' not in v]
1576 items = [v for v in values if '.' in v]
1576 items = [v for v in values if '.' in v]
1577 if len(items) > 1 or items and sections:
1577 if len(items) > 1 or items and sections:
1578 raise util.Abort(_('only one config item permitted'))
1578 raise util.Abort(_('only one config item permitted'))
1579 matched = False
1579 matched = False
1580 for section, name, value in ui.walkconfig(untrusted=untrusted):
1580 for section, name, value in ui.walkconfig(untrusted=untrusted):
1581 value = str(value).replace('\n', '\\n')
1581 value = str(value).replace('\n', '\\n')
1582 sectname = section + '.' + name
1582 sectname = section + '.' + name
1583 if values:
1583 if values:
1584 for v in values:
1584 for v in values:
1585 if v == section:
1585 if v == section:
1586 ui.debug('%s: ' %
1586 ui.debug('%s: ' %
1587 ui.configsource(section, name, untrusted))
1587 ui.configsource(section, name, untrusted))
1588 ui.write('%s=%s\n' % (sectname, value))
1588 ui.write('%s=%s\n' % (sectname, value))
1589 matched = True
1589 matched = True
1590 elif v == sectname:
1590 elif v == sectname:
1591 ui.debug('%s: ' %
1591 ui.debug('%s: ' %
1592 ui.configsource(section, name, untrusted))
1592 ui.configsource(section, name, untrusted))
1593 ui.write(value, '\n')
1593 ui.write(value, '\n')
1594 matched = True
1594 matched = True
1595 else:
1595 else:
1596 ui.debug('%s: ' %
1596 ui.debug('%s: ' %
1597 ui.configsource(section, name, untrusted))
1597 ui.configsource(section, name, untrusted))
1598 ui.write('%s=%s\n' % (sectname, value))
1598 ui.write('%s=%s\n' % (sectname, value))
1599 matched = True
1599 matched = True
1600 if matched:
1600 if matched:
1601 return 0
1601 return 0
1602 return 1
1602 return 1
1603
1603
1604 @command('copy|cp',
1604 @command('copy|cp',
1605 [('A', 'after', None, _('record a copy that has already occurred')),
1605 [('A', 'after', None, _('record a copy that has already occurred')),
1606 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1606 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1607 ] + walkopts + dryrunopts,
1607 ] + walkopts + dryrunopts,
1608 _('[OPTION]... [SOURCE]... DEST'))
1608 _('[OPTION]... [SOURCE]... DEST'))
1609 def copy(ui, repo, *pats, **opts):
1609 def copy(ui, repo, *pats, **opts):
1610 """mark files as copied for the next commit
1610 """mark files as copied for the next commit
1611
1611
1612 Mark dest as having copies of source files. If dest is a
1612 Mark dest as having copies of source files. If dest is a
1613 directory, copies are put in that directory. If dest is a file,
1613 directory, copies are put in that directory. If dest is a file,
1614 the source must be a single file.
1614 the source must be a single file.
1615
1615
1616 By default, this command copies the contents of files as they
1616 By default, this command copies the contents of files as they
1617 exist in the working directory. If invoked with -A/--after, the
1617 exist in the working directory. If invoked with -A/--after, the
1618 operation is recorded, but no copying is performed.
1618 operation is recorded, but no copying is performed.
1619
1619
1620 This command takes effect with the next commit. To undo a copy
1620 This command takes effect with the next commit. To undo a copy
1621 before that, see :hg:`revert`.
1621 before that, see :hg:`revert`.
1622
1622
1623 Returns 0 on success, 1 if errors are encountered.
1623 Returns 0 on success, 1 if errors are encountered.
1624 """
1624 """
1625 wlock = repo.wlock(False)
1625 wlock = repo.wlock(False)
1626 try:
1626 try:
1627 return cmdutil.copy(ui, repo, pats, opts)
1627 return cmdutil.copy(ui, repo, pats, opts)
1628 finally:
1628 finally:
1629 wlock.release()
1629 wlock.release()
1630
1630
1631 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
1631 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
1632 def debugancestor(ui, repo, *args):
1632 def debugancestor(ui, repo, *args):
1633 """find the ancestor revision of two revisions in a given index"""
1633 """find the ancestor revision of two revisions in a given index"""
1634 if len(args) == 3:
1634 if len(args) == 3:
1635 index, rev1, rev2 = args
1635 index, rev1, rev2 = args
1636 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1636 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1637 lookup = r.lookup
1637 lookup = r.lookup
1638 elif len(args) == 2:
1638 elif len(args) == 2:
1639 if not repo:
1639 if not repo:
1640 raise util.Abort(_("there is no Mercurial repository here "
1640 raise util.Abort(_("there is no Mercurial repository here "
1641 "(.hg not found)"))
1641 "(.hg not found)"))
1642 rev1, rev2 = args
1642 rev1, rev2 = args
1643 r = repo.changelog
1643 r = repo.changelog
1644 lookup = repo.lookup
1644 lookup = repo.lookup
1645 else:
1645 else:
1646 raise util.Abort(_('either two or three arguments required'))
1646 raise util.Abort(_('either two or three arguments required'))
1647 a = r.ancestor(lookup(rev1), lookup(rev2))
1647 a = r.ancestor(lookup(rev1), lookup(rev2))
1648 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1648 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1649
1649
1650 @command('debugbuilddag',
1650 @command('debugbuilddag',
1651 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1651 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1652 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1652 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1653 ('n', 'new-file', None, _('add new file at each rev'))],
1653 ('n', 'new-file', None, _('add new file at each rev'))],
1654 _('[OPTION]... [TEXT]'))
1654 _('[OPTION]... [TEXT]'))
1655 def debugbuilddag(ui, repo, text=None,
1655 def debugbuilddag(ui, repo, text=None,
1656 mergeable_file=False,
1656 mergeable_file=False,
1657 overwritten_file=False,
1657 overwritten_file=False,
1658 new_file=False):
1658 new_file=False):
1659 """builds a repo with a given DAG from scratch in the current empty repo
1659 """builds a repo with a given DAG from scratch in the current empty repo
1660
1660
1661 The description of the DAG is read from stdin if not given on the
1661 The description of the DAG is read from stdin if not given on the
1662 command line.
1662 command line.
1663
1663
1664 Elements:
1664 Elements:
1665
1665
1666 - "+n" is a linear run of n nodes based on the current default parent
1666 - "+n" is a linear run of n nodes based on the current default parent
1667 - "." is a single node based on the current default parent
1667 - "." is a single node based on the current default parent
1668 - "$" resets the default parent to null (implied at the start);
1668 - "$" resets the default parent to null (implied at the start);
1669 otherwise the default parent is always the last node created
1669 otherwise the default parent is always the last node created
1670 - "<p" sets the default parent to the backref p
1670 - "<p" sets the default parent to the backref p
1671 - "*p" is a fork at parent p, which is a backref
1671 - "*p" is a fork at parent p, which is a backref
1672 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1672 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1673 - "/p2" is a merge of the preceding node and p2
1673 - "/p2" is a merge of the preceding node and p2
1674 - ":tag" defines a local tag for the preceding node
1674 - ":tag" defines a local tag for the preceding node
1675 - "@branch" sets the named branch for subsequent nodes
1675 - "@branch" sets the named branch for subsequent nodes
1676 - "#...\\n" is a comment up to the end of the line
1676 - "#...\\n" is a comment up to the end of the line
1677
1677
1678 Whitespace between the above elements is ignored.
1678 Whitespace between the above elements is ignored.
1679
1679
1680 A backref is either
1680 A backref is either
1681
1681
1682 - a number n, which references the node curr-n, where curr is the current
1682 - a number n, which references the node curr-n, where curr is the current
1683 node, or
1683 node, or
1684 - the name of a local tag you placed earlier using ":tag", or
1684 - the name of a local tag you placed earlier using ":tag", or
1685 - empty to denote the default parent.
1685 - empty to denote the default parent.
1686
1686
1687 All string valued-elements are either strictly alphanumeric, or must
1687 All string valued-elements are either strictly alphanumeric, or must
1688 be enclosed in double quotes ("..."), with "\\" as escape character.
1688 be enclosed in double quotes ("..."), with "\\" as escape character.
1689 """
1689 """
1690
1690
1691 if text is None:
1691 if text is None:
1692 ui.status(_("reading DAG from stdin\n"))
1692 ui.status(_("reading DAG from stdin\n"))
1693 text = ui.fin.read()
1693 text = ui.fin.read()
1694
1694
1695 cl = repo.changelog
1695 cl = repo.changelog
1696 if len(cl) > 0:
1696 if len(cl) > 0:
1697 raise util.Abort(_('repository is not empty'))
1697 raise util.Abort(_('repository is not empty'))
1698
1698
1699 # determine number of revs in DAG
1699 # determine number of revs in DAG
1700 total = 0
1700 total = 0
1701 for type, data in dagparser.parsedag(text):
1701 for type, data in dagparser.parsedag(text):
1702 if type == 'n':
1702 if type == 'n':
1703 total += 1
1703 total += 1
1704
1704
1705 if mergeable_file:
1705 if mergeable_file:
1706 linesperrev = 2
1706 linesperrev = 2
1707 # make a file with k lines per rev
1707 # make a file with k lines per rev
1708 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1708 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1709 initialmergedlines.append("")
1709 initialmergedlines.append("")
1710
1710
1711 tags = []
1711 tags = []
1712
1712
1713 lock = tr = None
1713 lock = tr = None
1714 try:
1714 try:
1715 lock = repo.lock()
1715 lock = repo.lock()
1716 tr = repo.transaction("builddag")
1716 tr = repo.transaction("builddag")
1717
1717
1718 at = -1
1718 at = -1
1719 atbranch = 'default'
1719 atbranch = 'default'
1720 nodeids = []
1720 nodeids = []
1721 id = 0
1721 id = 0
1722 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1722 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1723 for type, data in dagparser.parsedag(text):
1723 for type, data in dagparser.parsedag(text):
1724 if type == 'n':
1724 if type == 'n':
1725 ui.note(('node %s\n' % str(data)))
1725 ui.note(('node %s\n' % str(data)))
1726 id, ps = data
1726 id, ps = data
1727
1727
1728 files = []
1728 files = []
1729 fctxs = {}
1729 fctxs = {}
1730
1730
1731 p2 = None
1731 p2 = None
1732 if mergeable_file:
1732 if mergeable_file:
1733 fn = "mf"
1733 fn = "mf"
1734 p1 = repo[ps[0]]
1734 p1 = repo[ps[0]]
1735 if len(ps) > 1:
1735 if len(ps) > 1:
1736 p2 = repo[ps[1]]
1736 p2 = repo[ps[1]]
1737 pa = p1.ancestor(p2)
1737 pa = p1.ancestor(p2)
1738 base, local, other = [x[fn].data() for x in (pa, p1,
1738 base, local, other = [x[fn].data() for x in (pa, p1,
1739 p2)]
1739 p2)]
1740 m3 = simplemerge.Merge3Text(base, local, other)
1740 m3 = simplemerge.Merge3Text(base, local, other)
1741 ml = [l.strip() for l in m3.merge_lines()]
1741 ml = [l.strip() for l in m3.merge_lines()]
1742 ml.append("")
1742 ml.append("")
1743 elif at > 0:
1743 elif at > 0:
1744 ml = p1[fn].data().split("\n")
1744 ml = p1[fn].data().split("\n")
1745 else:
1745 else:
1746 ml = initialmergedlines
1746 ml = initialmergedlines
1747 ml[id * linesperrev] += " r%i" % id
1747 ml[id * linesperrev] += " r%i" % id
1748 mergedtext = "\n".join(ml)
1748 mergedtext = "\n".join(ml)
1749 files.append(fn)
1749 files.append(fn)
1750 fctxs[fn] = context.memfilectx(repo, fn, mergedtext)
1750 fctxs[fn] = context.memfilectx(repo, fn, mergedtext)
1751
1751
1752 if overwritten_file:
1752 if overwritten_file:
1753 fn = "of"
1753 fn = "of"
1754 files.append(fn)
1754 files.append(fn)
1755 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1755 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1756
1756
1757 if new_file:
1757 if new_file:
1758 fn = "nf%i" % id
1758 fn = "nf%i" % id
1759 files.append(fn)
1759 files.append(fn)
1760 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1760 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1761 if len(ps) > 1:
1761 if len(ps) > 1:
1762 if not p2:
1762 if not p2:
1763 p2 = repo[ps[1]]
1763 p2 = repo[ps[1]]
1764 for fn in p2:
1764 for fn in p2:
1765 if fn.startswith("nf"):
1765 if fn.startswith("nf"):
1766 files.append(fn)
1766 files.append(fn)
1767 fctxs[fn] = p2[fn]
1767 fctxs[fn] = p2[fn]
1768
1768
1769 def fctxfn(repo, cx, path):
1769 def fctxfn(repo, cx, path):
1770 return fctxs.get(path)
1770 return fctxs.get(path)
1771
1771
1772 if len(ps) == 0 or ps[0] < 0:
1772 if len(ps) == 0 or ps[0] < 0:
1773 pars = [None, None]
1773 pars = [None, None]
1774 elif len(ps) == 1:
1774 elif len(ps) == 1:
1775 pars = [nodeids[ps[0]], None]
1775 pars = [nodeids[ps[0]], None]
1776 else:
1776 else:
1777 pars = [nodeids[p] for p in ps]
1777 pars = [nodeids[p] for p in ps]
1778 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1778 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1779 date=(id, 0),
1779 date=(id, 0),
1780 user="debugbuilddag",
1780 user="debugbuilddag",
1781 extra={'branch': atbranch})
1781 extra={'branch': atbranch})
1782 nodeid = repo.commitctx(cx)
1782 nodeid = repo.commitctx(cx)
1783 nodeids.append(nodeid)
1783 nodeids.append(nodeid)
1784 at = id
1784 at = id
1785 elif type == 'l':
1785 elif type == 'l':
1786 id, name = data
1786 id, name = data
1787 ui.note(('tag %s\n' % name))
1787 ui.note(('tag %s\n' % name))
1788 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
1788 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
1789 elif type == 'a':
1789 elif type == 'a':
1790 ui.note(('branch %s\n' % data))
1790 ui.note(('branch %s\n' % data))
1791 atbranch = data
1791 atbranch = data
1792 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1792 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1793 tr.close()
1793 tr.close()
1794
1794
1795 if tags:
1795 if tags:
1796 repo.opener.write("localtags", "".join(tags))
1796 repo.opener.write("localtags", "".join(tags))
1797 finally:
1797 finally:
1798 ui.progress(_('building'), None)
1798 ui.progress(_('building'), None)
1799 release(tr, lock)
1799 release(tr, lock)
1800
1800
1801 @command('debugbundle',
1801 @command('debugbundle',
1802 [('a', 'all', None, _('show all details'))],
1802 [('a', 'all', None, _('show all details'))],
1803 _('FILE'),
1803 _('FILE'),
1804 norepo=True)
1804 norepo=True)
1805 def debugbundle(ui, bundlepath, all=None, **opts):
1805 def debugbundle(ui, bundlepath, all=None, **opts):
1806 """lists the contents of a bundle"""
1806 """lists the contents of a bundle"""
1807 f = hg.openpath(ui, bundlepath)
1807 f = hg.openpath(ui, bundlepath)
1808 try:
1808 try:
1809 gen = exchange.readbundle(ui, f, bundlepath)
1809 gen = exchange.readbundle(ui, f, bundlepath)
1810 if all:
1810 if all:
1811 ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n"))
1811 ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n"))
1812
1812
1813 def showchunks(named):
1813 def showchunks(named):
1814 ui.write("\n%s\n" % named)
1814 ui.write("\n%s\n" % named)
1815 chain = None
1815 chain = None
1816 while True:
1816 while True:
1817 chunkdata = gen.deltachunk(chain)
1817 chunkdata = gen.deltachunk(chain)
1818 if not chunkdata:
1818 if not chunkdata:
1819 break
1819 break
1820 node = chunkdata['node']
1820 node = chunkdata['node']
1821 p1 = chunkdata['p1']
1821 p1 = chunkdata['p1']
1822 p2 = chunkdata['p2']
1822 p2 = chunkdata['p2']
1823 cs = chunkdata['cs']
1823 cs = chunkdata['cs']
1824 deltabase = chunkdata['deltabase']
1824 deltabase = chunkdata['deltabase']
1825 delta = chunkdata['delta']
1825 delta = chunkdata['delta']
1826 ui.write("%s %s %s %s %s %s\n" %
1826 ui.write("%s %s %s %s %s %s\n" %
1827 (hex(node), hex(p1), hex(p2),
1827 (hex(node), hex(p1), hex(p2),
1828 hex(cs), hex(deltabase), len(delta)))
1828 hex(cs), hex(deltabase), len(delta)))
1829 chain = node
1829 chain = node
1830
1830
1831 chunkdata = gen.changelogheader()
1831 chunkdata = gen.changelogheader()
1832 showchunks("changelog")
1832 showchunks("changelog")
1833 chunkdata = gen.manifestheader()
1833 chunkdata = gen.manifestheader()
1834 showchunks("manifest")
1834 showchunks("manifest")
1835 while True:
1835 while True:
1836 chunkdata = gen.filelogheader()
1836 chunkdata = gen.filelogheader()
1837 if not chunkdata:
1837 if not chunkdata:
1838 break
1838 break
1839 fname = chunkdata['filename']
1839 fname = chunkdata['filename']
1840 showchunks(fname)
1840 showchunks(fname)
1841 else:
1841 else:
1842 chunkdata = gen.changelogheader()
1842 chunkdata = gen.changelogheader()
1843 chain = None
1843 chain = None
1844 while True:
1844 while True:
1845 chunkdata = gen.deltachunk(chain)
1845 chunkdata = gen.deltachunk(chain)
1846 if not chunkdata:
1846 if not chunkdata:
1847 break
1847 break
1848 node = chunkdata['node']
1848 node = chunkdata['node']
1849 ui.write("%s\n" % hex(node))
1849 ui.write("%s\n" % hex(node))
1850 chain = node
1850 chain = node
1851 finally:
1851 finally:
1852 f.close()
1852 f.close()
1853
1853
1854 @command('debugcheckstate', [], '')
1854 @command('debugcheckstate', [], '')
1855 def debugcheckstate(ui, repo):
1855 def debugcheckstate(ui, repo):
1856 """validate the correctness of the current dirstate"""
1856 """validate the correctness of the current dirstate"""
1857 parent1, parent2 = repo.dirstate.parents()
1857 parent1, parent2 = repo.dirstate.parents()
1858 m1 = repo[parent1].manifest()
1858 m1 = repo[parent1].manifest()
1859 m2 = repo[parent2].manifest()
1859 m2 = repo[parent2].manifest()
1860 errors = 0
1860 errors = 0
1861 for f in repo.dirstate:
1861 for f in repo.dirstate:
1862 state = repo.dirstate[f]
1862 state = repo.dirstate[f]
1863 if state in "nr" and f not in m1:
1863 if state in "nr" and f not in m1:
1864 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1864 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1865 errors += 1
1865 errors += 1
1866 if state in "a" and f in m1:
1866 if state in "a" and f in m1:
1867 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1867 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1868 errors += 1
1868 errors += 1
1869 if state in "m" and f not in m1 and f not in m2:
1869 if state in "m" and f not in m1 and f not in m2:
1870 ui.warn(_("%s in state %s, but not in either manifest\n") %
1870 ui.warn(_("%s in state %s, but not in either manifest\n") %
1871 (f, state))
1871 (f, state))
1872 errors += 1
1872 errors += 1
1873 for f in m1:
1873 for f in m1:
1874 state = repo.dirstate[f]
1874 state = repo.dirstate[f]
1875 if state not in "nrm":
1875 if state not in "nrm":
1876 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1876 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1877 errors += 1
1877 errors += 1
1878 if errors:
1878 if errors:
1879 error = _(".hg/dirstate inconsistent with current parent's manifest")
1879 error = _(".hg/dirstate inconsistent with current parent's manifest")
1880 raise util.Abort(error)
1880 raise util.Abort(error)
1881
1881
1882 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
1882 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
1883 def debugcommands(ui, cmd='', *args):
1883 def debugcommands(ui, cmd='', *args):
1884 """list all available commands and options"""
1884 """list all available commands and options"""
1885 for cmd, vals in sorted(table.iteritems()):
1885 for cmd, vals in sorted(table.iteritems()):
1886 cmd = cmd.split('|')[0].strip('^')
1886 cmd = cmd.split('|')[0].strip('^')
1887 opts = ', '.join([i[1] for i in vals[1]])
1887 opts = ', '.join([i[1] for i in vals[1]])
1888 ui.write('%s: %s\n' % (cmd, opts))
1888 ui.write('%s: %s\n' % (cmd, opts))
1889
1889
1890 @command('debugcomplete',
1890 @command('debugcomplete',
1891 [('o', 'options', None, _('show the command options'))],
1891 [('o', 'options', None, _('show the command options'))],
1892 _('[-o] CMD'),
1892 _('[-o] CMD'),
1893 norepo=True)
1893 norepo=True)
1894 def debugcomplete(ui, cmd='', **opts):
1894 def debugcomplete(ui, cmd='', **opts):
1895 """returns the completion list associated with the given command"""
1895 """returns the completion list associated with the given command"""
1896
1896
1897 if opts.get('options'):
1897 if opts.get('options'):
1898 options = []
1898 options = []
1899 otables = [globalopts]
1899 otables = [globalopts]
1900 if cmd:
1900 if cmd:
1901 aliases, entry = cmdutil.findcmd(cmd, table, False)
1901 aliases, entry = cmdutil.findcmd(cmd, table, False)
1902 otables.append(entry[1])
1902 otables.append(entry[1])
1903 for t in otables:
1903 for t in otables:
1904 for o in t:
1904 for o in t:
1905 if "(DEPRECATED)" in o[3]:
1905 if "(DEPRECATED)" in o[3]:
1906 continue
1906 continue
1907 if o[0]:
1907 if o[0]:
1908 options.append('-%s' % o[0])
1908 options.append('-%s' % o[0])
1909 options.append('--%s' % o[1])
1909 options.append('--%s' % o[1])
1910 ui.write("%s\n" % "\n".join(options))
1910 ui.write("%s\n" % "\n".join(options))
1911 return
1911 return
1912
1912
1913 cmdlist = cmdutil.findpossible(cmd, table)
1913 cmdlist = cmdutil.findpossible(cmd, table)
1914 if ui.verbose:
1914 if ui.verbose:
1915 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1915 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1916 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1916 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1917
1917
1918 @command('debugdag',
1918 @command('debugdag',
1919 [('t', 'tags', None, _('use tags as labels')),
1919 [('t', 'tags', None, _('use tags as labels')),
1920 ('b', 'branches', None, _('annotate with branch names')),
1920 ('b', 'branches', None, _('annotate with branch names')),
1921 ('', 'dots', None, _('use dots for runs')),
1921 ('', 'dots', None, _('use dots for runs')),
1922 ('s', 'spaces', None, _('separate elements by spaces'))],
1922 ('s', 'spaces', None, _('separate elements by spaces'))],
1923 _('[OPTION]... [FILE [REV]...]'),
1923 _('[OPTION]... [FILE [REV]...]'),
1924 optionalrepo=True)
1924 optionalrepo=True)
1925 def debugdag(ui, repo, file_=None, *revs, **opts):
1925 def debugdag(ui, repo, file_=None, *revs, **opts):
1926 """format the changelog or an index DAG as a concise textual description
1926 """format the changelog or an index DAG as a concise textual description
1927
1927
1928 If you pass a revlog index, the revlog's DAG is emitted. If you list
1928 If you pass a revlog index, the revlog's DAG is emitted. If you list
1929 revision numbers, they get labeled in the output as rN.
1929 revision numbers, they get labeled in the output as rN.
1930
1930
1931 Otherwise, the changelog DAG of the current repo is emitted.
1931 Otherwise, the changelog DAG of the current repo is emitted.
1932 """
1932 """
1933 spaces = opts.get('spaces')
1933 spaces = opts.get('spaces')
1934 dots = opts.get('dots')
1934 dots = opts.get('dots')
1935 if file_:
1935 if file_:
1936 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1936 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1937 revs = set((int(r) for r in revs))
1937 revs = set((int(r) for r in revs))
1938 def events():
1938 def events():
1939 for r in rlog:
1939 for r in rlog:
1940 yield 'n', (r, list(p for p in rlog.parentrevs(r)
1940 yield 'n', (r, list(p for p in rlog.parentrevs(r)
1941 if p != -1))
1941 if p != -1))
1942 if r in revs:
1942 if r in revs:
1943 yield 'l', (r, "r%i" % r)
1943 yield 'l', (r, "r%i" % r)
1944 elif repo:
1944 elif repo:
1945 cl = repo.changelog
1945 cl = repo.changelog
1946 tags = opts.get('tags')
1946 tags = opts.get('tags')
1947 branches = opts.get('branches')
1947 branches = opts.get('branches')
1948 if tags:
1948 if tags:
1949 labels = {}
1949 labels = {}
1950 for l, n in repo.tags().items():
1950 for l, n in repo.tags().items():
1951 labels.setdefault(cl.rev(n), []).append(l)
1951 labels.setdefault(cl.rev(n), []).append(l)
1952 def events():
1952 def events():
1953 b = "default"
1953 b = "default"
1954 for r in cl:
1954 for r in cl:
1955 if branches:
1955 if branches:
1956 newb = cl.read(cl.node(r))[5]['branch']
1956 newb = cl.read(cl.node(r))[5]['branch']
1957 if newb != b:
1957 if newb != b:
1958 yield 'a', newb
1958 yield 'a', newb
1959 b = newb
1959 b = newb
1960 yield 'n', (r, list(p for p in cl.parentrevs(r)
1960 yield 'n', (r, list(p for p in cl.parentrevs(r)
1961 if p != -1))
1961 if p != -1))
1962 if tags:
1962 if tags:
1963 ls = labels.get(r)
1963 ls = labels.get(r)
1964 if ls:
1964 if ls:
1965 for l in ls:
1965 for l in ls:
1966 yield 'l', (r, l)
1966 yield 'l', (r, l)
1967 else:
1967 else:
1968 raise util.Abort(_('need repo for changelog dag'))
1968 raise util.Abort(_('need repo for changelog dag'))
1969
1969
1970 for line in dagparser.dagtextlines(events(),
1970 for line in dagparser.dagtextlines(events(),
1971 addspaces=spaces,
1971 addspaces=spaces,
1972 wraplabels=True,
1972 wraplabels=True,
1973 wrapannotations=True,
1973 wrapannotations=True,
1974 wrapnonlinear=dots,
1974 wrapnonlinear=dots,
1975 usedots=dots,
1975 usedots=dots,
1976 maxlinewidth=70):
1976 maxlinewidth=70):
1977 ui.write(line)
1977 ui.write(line)
1978 ui.write("\n")
1978 ui.write("\n")
1979
1979
1980 @command('debugdata',
1980 @command('debugdata',
1981 [('c', 'changelog', False, _('open changelog')),
1981 [('c', 'changelog', False, _('open changelog')),
1982 ('m', 'manifest', False, _('open manifest'))],
1982 ('m', 'manifest', False, _('open manifest'))],
1983 _('-c|-m|FILE REV'))
1983 _('-c|-m|FILE REV'))
1984 def debugdata(ui, repo, file_, rev=None, **opts):
1984 def debugdata(ui, repo, file_, rev=None, **opts):
1985 """dump the contents of a data file revision"""
1985 """dump the contents of a data file revision"""
1986 if opts.get('changelog') or opts.get('manifest'):
1986 if opts.get('changelog') or opts.get('manifest'):
1987 file_, rev = None, file_
1987 file_, rev = None, file_
1988 elif rev is None:
1988 elif rev is None:
1989 raise error.CommandError('debugdata', _('invalid arguments'))
1989 raise error.CommandError('debugdata', _('invalid arguments'))
1990 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
1990 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
1991 try:
1991 try:
1992 ui.write(r.revision(r.lookup(rev)))
1992 ui.write(r.revision(r.lookup(rev)))
1993 except KeyError:
1993 except KeyError:
1994 raise util.Abort(_('invalid revision identifier %s') % rev)
1994 raise util.Abort(_('invalid revision identifier %s') % rev)
1995
1995
1996 @command('debugdate',
1996 @command('debugdate',
1997 [('e', 'extended', None, _('try extended date formats'))],
1997 [('e', 'extended', None, _('try extended date formats'))],
1998 _('[-e] DATE [RANGE]'),
1998 _('[-e] DATE [RANGE]'),
1999 norepo=True, optionalrepo=True)
1999 norepo=True, optionalrepo=True)
2000 def debugdate(ui, date, range=None, **opts):
2000 def debugdate(ui, date, range=None, **opts):
2001 """parse and display a date"""
2001 """parse and display a date"""
2002 if opts["extended"]:
2002 if opts["extended"]:
2003 d = util.parsedate(date, util.extendeddateformats)
2003 d = util.parsedate(date, util.extendeddateformats)
2004 else:
2004 else:
2005 d = util.parsedate(date)
2005 d = util.parsedate(date)
2006 ui.write(("internal: %s %s\n") % d)
2006 ui.write(("internal: %s %s\n") % d)
2007 ui.write(("standard: %s\n") % util.datestr(d))
2007 ui.write(("standard: %s\n") % util.datestr(d))
2008 if range:
2008 if range:
2009 m = util.matchdate(range)
2009 m = util.matchdate(range)
2010 ui.write(("match: %s\n") % m(d[0]))
2010 ui.write(("match: %s\n") % m(d[0]))
2011
2011
2012 @command('debugdiscovery',
2012 @command('debugdiscovery',
2013 [('', 'old', None, _('use old-style discovery')),
2013 [('', 'old', None, _('use old-style discovery')),
2014 ('', 'nonheads', None,
2014 ('', 'nonheads', None,
2015 _('use old-style discovery with non-heads included')),
2015 _('use old-style discovery with non-heads included')),
2016 ] + remoteopts,
2016 ] + remoteopts,
2017 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
2017 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
2018 def debugdiscovery(ui, repo, remoteurl="default", **opts):
2018 def debugdiscovery(ui, repo, remoteurl="default", **opts):
2019 """runs the changeset discovery protocol in isolation"""
2019 """runs the changeset discovery protocol in isolation"""
2020 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
2020 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
2021 opts.get('branch'))
2021 opts.get('branch'))
2022 remote = hg.peer(repo, opts, remoteurl)
2022 remote = hg.peer(repo, opts, remoteurl)
2023 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
2023 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
2024
2024
2025 # make sure tests are repeatable
2025 # make sure tests are repeatable
2026 random.seed(12323)
2026 random.seed(12323)
2027
2027
2028 def doit(localheads, remoteheads, remote=remote):
2028 def doit(localheads, remoteheads, remote=remote):
2029 if opts.get('old'):
2029 if opts.get('old'):
2030 if localheads:
2030 if localheads:
2031 raise util.Abort('cannot use localheads with old style '
2031 raise util.Abort('cannot use localheads with old style '
2032 'discovery')
2032 'discovery')
2033 if not util.safehasattr(remote, 'branches'):
2033 if not util.safehasattr(remote, 'branches'):
2034 # enable in-client legacy support
2034 # enable in-client legacy support
2035 remote = localrepo.locallegacypeer(remote.local())
2035 remote = localrepo.locallegacypeer(remote.local())
2036 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
2036 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
2037 force=True)
2037 force=True)
2038 common = set(common)
2038 common = set(common)
2039 if not opts.get('nonheads'):
2039 if not opts.get('nonheads'):
2040 ui.write(("unpruned common: %s\n") %
2040 ui.write(("unpruned common: %s\n") %
2041 " ".join(sorted(short(n) for n in common)))
2041 " ".join(sorted(short(n) for n in common)))
2042 dag = dagutil.revlogdag(repo.changelog)
2042 dag = dagutil.revlogdag(repo.changelog)
2043 all = dag.ancestorset(dag.internalizeall(common))
2043 all = dag.ancestorset(dag.internalizeall(common))
2044 common = dag.externalizeall(dag.headsetofconnecteds(all))
2044 common = dag.externalizeall(dag.headsetofconnecteds(all))
2045 else:
2045 else:
2046 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
2046 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
2047 common = set(common)
2047 common = set(common)
2048 rheads = set(hds)
2048 rheads = set(hds)
2049 lheads = set(repo.heads())
2049 lheads = set(repo.heads())
2050 ui.write(("common heads: %s\n") %
2050 ui.write(("common heads: %s\n") %
2051 " ".join(sorted(short(n) for n in common)))
2051 " ".join(sorted(short(n) for n in common)))
2052 if lheads <= common:
2052 if lheads <= common:
2053 ui.write(("local is subset\n"))
2053 ui.write(("local is subset\n"))
2054 elif rheads <= common:
2054 elif rheads <= common:
2055 ui.write(("remote is subset\n"))
2055 ui.write(("remote is subset\n"))
2056
2056
2057 serverlogs = opts.get('serverlog')
2057 serverlogs = opts.get('serverlog')
2058 if serverlogs:
2058 if serverlogs:
2059 for filename in serverlogs:
2059 for filename in serverlogs:
2060 logfile = open(filename, 'r')
2060 logfile = open(filename, 'r')
2061 try:
2061 try:
2062 line = logfile.readline()
2062 line = logfile.readline()
2063 while line:
2063 while line:
2064 parts = line.strip().split(';')
2064 parts = line.strip().split(';')
2065 op = parts[1]
2065 op = parts[1]
2066 if op == 'cg':
2066 if op == 'cg':
2067 pass
2067 pass
2068 elif op == 'cgss':
2068 elif op == 'cgss':
2069 doit(parts[2].split(' '), parts[3].split(' '))
2069 doit(parts[2].split(' '), parts[3].split(' '))
2070 elif op == 'unb':
2070 elif op == 'unb':
2071 doit(parts[3].split(' '), parts[2].split(' '))
2071 doit(parts[3].split(' '), parts[2].split(' '))
2072 line = logfile.readline()
2072 line = logfile.readline()
2073 finally:
2073 finally:
2074 logfile.close()
2074 logfile.close()
2075
2075
2076 else:
2076 else:
2077 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
2077 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
2078 opts.get('remote_head'))
2078 opts.get('remote_head'))
2079 localrevs = opts.get('local_head')
2079 localrevs = opts.get('local_head')
2080 doit(localrevs, remoterevs)
2080 doit(localrevs, remoterevs)
2081
2081
2082 @command('debugfileset',
2082 @command('debugfileset',
2083 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2083 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2084 _('[-r REV] FILESPEC'))
2084 _('[-r REV] FILESPEC'))
2085 def debugfileset(ui, repo, expr, **opts):
2085 def debugfileset(ui, repo, expr, **opts):
2086 '''parse and apply a fileset specification'''
2086 '''parse and apply a fileset specification'''
2087 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2087 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2088 if ui.verbose:
2088 if ui.verbose:
2089 tree = fileset.parse(expr)[0]
2089 tree = fileset.parse(expr)[0]
2090 ui.note(tree, "\n")
2090 ui.note(tree, "\n")
2091
2091
2092 for f in ctx.getfileset(expr):
2092 for f in ctx.getfileset(expr):
2093 ui.write("%s\n" % f)
2093 ui.write("%s\n" % f)
2094
2094
2095 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2095 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2096 def debugfsinfo(ui, path="."):
2096 def debugfsinfo(ui, path="."):
2097 """show information detected about current filesystem"""
2097 """show information detected about current filesystem"""
2098 util.writefile('.debugfsinfo', '')
2098 util.writefile('.debugfsinfo', '')
2099 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
2099 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
2100 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
2100 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
2101 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
2101 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
2102 ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo')
2102 ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo')
2103 and 'yes' or 'no'))
2103 and 'yes' or 'no'))
2104 os.unlink('.debugfsinfo')
2104 os.unlink('.debugfsinfo')
2105
2105
2106 @command('debuggetbundle',
2106 @command('debuggetbundle',
2107 [('H', 'head', [], _('id of head node'), _('ID')),
2107 [('H', 'head', [], _('id of head node'), _('ID')),
2108 ('C', 'common', [], _('id of common node'), _('ID')),
2108 ('C', 'common', [], _('id of common node'), _('ID')),
2109 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2109 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2110 _('REPO FILE [-H|-C ID]...'),
2110 _('REPO FILE [-H|-C ID]...'),
2111 norepo=True)
2111 norepo=True)
2112 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2112 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2113 """retrieves a bundle from a repo
2113 """retrieves a bundle from a repo
2114
2114
2115 Every ID must be a full-length hex node id string. Saves the bundle to the
2115 Every ID must be a full-length hex node id string. Saves the bundle to the
2116 given file.
2116 given file.
2117 """
2117 """
2118 repo = hg.peer(ui, opts, repopath)
2118 repo = hg.peer(ui, opts, repopath)
2119 if not repo.capable('getbundle'):
2119 if not repo.capable('getbundle'):
2120 raise util.Abort("getbundle() not supported by target repository")
2120 raise util.Abort("getbundle() not supported by target repository")
2121 args = {}
2121 args = {}
2122 if common:
2122 if common:
2123 args['common'] = [bin(s) for s in common]
2123 args['common'] = [bin(s) for s in common]
2124 if head:
2124 if head:
2125 args['heads'] = [bin(s) for s in head]
2125 args['heads'] = [bin(s) for s in head]
2126 # TODO: get desired bundlecaps from command line.
2126 # TODO: get desired bundlecaps from command line.
2127 args['bundlecaps'] = None
2127 args['bundlecaps'] = None
2128 bundle = repo.getbundle('debug', **args)
2128 bundle = repo.getbundle('debug', **args)
2129
2129
2130 bundletype = opts.get('type', 'bzip2').lower()
2130 bundletype = opts.get('type', 'bzip2').lower()
2131 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
2131 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
2132 bundletype = btypes.get(bundletype)
2132 bundletype = btypes.get(bundletype)
2133 if bundletype not in changegroup.bundletypes:
2133 if bundletype not in changegroup.bundletypes:
2134 raise util.Abort(_('unknown bundle type specified with --type'))
2134 raise util.Abort(_('unknown bundle type specified with --type'))
2135 changegroup.writebundle(bundle, bundlepath, bundletype)
2135 changegroup.writebundle(bundle, bundlepath, bundletype)
2136
2136
2137 @command('debugignore', [], '')
2137 @command('debugignore', [], '')
2138 def debugignore(ui, repo, *values, **opts):
2138 def debugignore(ui, repo, *values, **opts):
2139 """display the combined ignore pattern"""
2139 """display the combined ignore pattern"""
2140 ignore = repo.dirstate._ignore
2140 ignore = repo.dirstate._ignore
2141 includepat = getattr(ignore, 'includepat', None)
2141 includepat = getattr(ignore, 'includepat', None)
2142 if includepat is not None:
2142 if includepat is not None:
2143 ui.write("%s\n" % includepat)
2143 ui.write("%s\n" % includepat)
2144 else:
2144 else:
2145 raise util.Abort(_("no ignore patterns found"))
2145 raise util.Abort(_("no ignore patterns found"))
2146
2146
2147 @command('debugindex',
2147 @command('debugindex',
2148 [('c', 'changelog', False, _('open changelog')),
2148 [('c', 'changelog', False, _('open changelog')),
2149 ('m', 'manifest', False, _('open manifest')),
2149 ('m', 'manifest', False, _('open manifest')),
2150 ('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2150 ('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2151 _('[-f FORMAT] -c|-m|FILE'),
2151 _('[-f FORMAT] -c|-m|FILE'),
2152 optionalrepo=True)
2152 optionalrepo=True)
2153 def debugindex(ui, repo, file_=None, **opts):
2153 def debugindex(ui, repo, file_=None, **opts):
2154 """dump the contents of an index file"""
2154 """dump the contents of an index file"""
2155 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2155 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2156 format = opts.get('format', 0)
2156 format = opts.get('format', 0)
2157 if format not in (0, 1):
2157 if format not in (0, 1):
2158 raise util.Abort(_("unknown format %d") % format)
2158 raise util.Abort(_("unknown format %d") % format)
2159
2159
2160 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2160 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2161 if generaldelta:
2161 if generaldelta:
2162 basehdr = ' delta'
2162 basehdr = ' delta'
2163 else:
2163 else:
2164 basehdr = ' base'
2164 basehdr = ' base'
2165
2165
2166 if format == 0:
2166 if format == 0:
2167 ui.write(" rev offset length " + basehdr + " linkrev"
2167 ui.write(" rev offset length " + basehdr + " linkrev"
2168 " nodeid p1 p2\n")
2168 " nodeid p1 p2\n")
2169 elif format == 1:
2169 elif format == 1:
2170 ui.write(" rev flag offset length"
2170 ui.write(" rev flag offset length"
2171 " size " + basehdr + " link p1 p2"
2171 " size " + basehdr + " link p1 p2"
2172 " nodeid\n")
2172 " nodeid\n")
2173
2173
2174 for i in r:
2174 for i in r:
2175 node = r.node(i)
2175 node = r.node(i)
2176 if generaldelta:
2176 if generaldelta:
2177 base = r.deltaparent(i)
2177 base = r.deltaparent(i)
2178 else:
2178 else:
2179 base = r.chainbase(i)
2179 base = r.chainbase(i)
2180 if format == 0:
2180 if format == 0:
2181 try:
2181 try:
2182 pp = r.parents(node)
2182 pp = r.parents(node)
2183 except Exception:
2183 except Exception:
2184 pp = [nullid, nullid]
2184 pp = [nullid, nullid]
2185 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2185 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2186 i, r.start(i), r.length(i), base, r.linkrev(i),
2186 i, r.start(i), r.length(i), base, r.linkrev(i),
2187 short(node), short(pp[0]), short(pp[1])))
2187 short(node), short(pp[0]), short(pp[1])))
2188 elif format == 1:
2188 elif format == 1:
2189 pr = r.parentrevs(i)
2189 pr = r.parentrevs(i)
2190 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2190 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2191 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2191 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2192 base, r.linkrev(i), pr[0], pr[1], short(node)))
2192 base, r.linkrev(i), pr[0], pr[1], short(node)))
2193
2193
2194 @command('debugindexdot', [], _('FILE'), optionalrepo=True)
2194 @command('debugindexdot', [], _('FILE'), optionalrepo=True)
2195 def debugindexdot(ui, repo, file_):
2195 def debugindexdot(ui, repo, file_):
2196 """dump an index DAG as a graphviz dot file"""
2196 """dump an index DAG as a graphviz dot file"""
2197 r = None
2197 r = None
2198 if repo:
2198 if repo:
2199 filelog = repo.file(file_)
2199 filelog = repo.file(file_)
2200 if len(filelog):
2200 if len(filelog):
2201 r = filelog
2201 r = filelog
2202 if not r:
2202 if not r:
2203 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
2203 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
2204 ui.write(("digraph G {\n"))
2204 ui.write(("digraph G {\n"))
2205 for i in r:
2205 for i in r:
2206 node = r.node(i)
2206 node = r.node(i)
2207 pp = r.parents(node)
2207 pp = r.parents(node)
2208 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2208 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2209 if pp[1] != nullid:
2209 if pp[1] != nullid:
2210 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2210 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2211 ui.write("}\n")
2211 ui.write("}\n")
2212
2212
2213 @command('debuginstall', [], '', norepo=True)
2213 @command('debuginstall', [], '', norepo=True)
2214 def debuginstall(ui):
2214 def debuginstall(ui):
2215 '''test Mercurial installation
2215 '''test Mercurial installation
2216
2216
2217 Returns 0 on success.
2217 Returns 0 on success.
2218 '''
2218 '''
2219
2219
2220 def writetemp(contents):
2220 def writetemp(contents):
2221 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2221 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2222 f = os.fdopen(fd, "wb")
2222 f = os.fdopen(fd, "wb")
2223 f.write(contents)
2223 f.write(contents)
2224 f.close()
2224 f.close()
2225 return name
2225 return name
2226
2226
2227 problems = 0
2227 problems = 0
2228
2228
2229 # encoding
2229 # encoding
2230 ui.status(_("checking encoding (%s)...\n") % encoding.encoding)
2230 ui.status(_("checking encoding (%s)...\n") % encoding.encoding)
2231 try:
2231 try:
2232 encoding.fromlocal("test")
2232 encoding.fromlocal("test")
2233 except util.Abort, inst:
2233 except util.Abort, inst:
2234 ui.write(" %s\n" % inst)
2234 ui.write(" %s\n" % inst)
2235 ui.write(_(" (check that your locale is properly set)\n"))
2235 ui.write(_(" (check that your locale is properly set)\n"))
2236 problems += 1
2236 problems += 1
2237
2237
2238 # Python
2238 # Python
2239 ui.status(_("checking Python executable (%s)\n") % sys.executable)
2239 ui.status(_("checking Python executable (%s)\n") % sys.executable)
2240 ui.status(_("checking Python version (%s)\n")
2240 ui.status(_("checking Python version (%s)\n")
2241 % ("%s.%s.%s" % sys.version_info[:3]))
2241 % ("%s.%s.%s" % sys.version_info[:3]))
2242 ui.status(_("checking Python lib (%s)...\n")
2242 ui.status(_("checking Python lib (%s)...\n")
2243 % os.path.dirname(os.__file__))
2243 % os.path.dirname(os.__file__))
2244
2244
2245 # compiled modules
2245 # compiled modules
2246 ui.status(_("checking installed modules (%s)...\n")
2246 ui.status(_("checking installed modules (%s)...\n")
2247 % os.path.dirname(__file__))
2247 % os.path.dirname(__file__))
2248 try:
2248 try:
2249 import bdiff, mpatch, base85, osutil
2249 import bdiff, mpatch, base85, osutil
2250 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2250 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2251 except Exception, inst:
2251 except Exception, inst:
2252 ui.write(" %s\n" % inst)
2252 ui.write(" %s\n" % inst)
2253 ui.write(_(" One or more extensions could not be found"))
2253 ui.write(_(" One or more extensions could not be found"))
2254 ui.write(_(" (check that you compiled the extensions)\n"))
2254 ui.write(_(" (check that you compiled the extensions)\n"))
2255 problems += 1
2255 problems += 1
2256
2256
2257 # templates
2257 # templates
2258 import templater
2258 import templater
2259 p = templater.templatepath()
2259 p = templater.templatepath()
2260 ui.status(_("checking templates (%s)...\n") % ' '.join(p))
2260 ui.status(_("checking templates (%s)...\n") % ' '.join(p))
2261 if p:
2261 if p:
2262 m = templater.templatepath("map-cmdline.default")
2262 m = templater.templatepath("map-cmdline.default")
2263 if m:
2263 if m:
2264 # template found, check if it is working
2264 # template found, check if it is working
2265 try:
2265 try:
2266 templater.templater(m)
2266 templater.templater(m)
2267 except Exception, inst:
2267 except Exception, inst:
2268 ui.write(" %s\n" % inst)
2268 ui.write(" %s\n" % inst)
2269 p = None
2269 p = None
2270 else:
2270 else:
2271 ui.write(_(" template 'default' not found\n"))
2271 ui.write(_(" template 'default' not found\n"))
2272 p = None
2272 p = None
2273 else:
2273 else:
2274 ui.write(_(" no template directories found\n"))
2274 ui.write(_(" no template directories found\n"))
2275 if not p:
2275 if not p:
2276 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
2276 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
2277 problems += 1
2277 problems += 1
2278
2278
2279 # editor
2279 # editor
2280 ui.status(_("checking commit editor...\n"))
2280 ui.status(_("checking commit editor...\n"))
2281 editor = ui.geteditor()
2281 editor = ui.geteditor()
2282 cmdpath = util.findexe(shlex.split(editor)[0])
2282 cmdpath = util.findexe(shlex.split(editor)[0])
2283 if not cmdpath:
2283 if not cmdpath:
2284 if editor == 'vi':
2284 if editor == 'vi':
2285 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
2285 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
2286 ui.write(_(" (specify a commit editor in your configuration"
2286 ui.write(_(" (specify a commit editor in your configuration"
2287 " file)\n"))
2287 " file)\n"))
2288 else:
2288 else:
2289 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
2289 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
2290 ui.write(_(" (specify a commit editor in your configuration"
2290 ui.write(_(" (specify a commit editor in your configuration"
2291 " file)\n"))
2291 " file)\n"))
2292 problems += 1
2292 problems += 1
2293
2293
2294 # check username
2294 # check username
2295 ui.status(_("checking username...\n"))
2295 ui.status(_("checking username...\n"))
2296 try:
2296 try:
2297 ui.username()
2297 ui.username()
2298 except util.Abort, e:
2298 except util.Abort, e:
2299 ui.write(" %s\n" % e)
2299 ui.write(" %s\n" % e)
2300 ui.write(_(" (specify a username in your configuration file)\n"))
2300 ui.write(_(" (specify a username in your configuration file)\n"))
2301 problems += 1
2301 problems += 1
2302
2302
2303 if not problems:
2303 if not problems:
2304 ui.status(_("no problems detected\n"))
2304 ui.status(_("no problems detected\n"))
2305 else:
2305 else:
2306 ui.write(_("%s problems detected,"
2306 ui.write(_("%s problems detected,"
2307 " please check your install!\n") % problems)
2307 " please check your install!\n") % problems)
2308
2308
2309 return problems
2309 return problems
2310
2310
2311 @command('debugknown', [], _('REPO ID...'), norepo=True)
2311 @command('debugknown', [], _('REPO ID...'), norepo=True)
2312 def debugknown(ui, repopath, *ids, **opts):
2312 def debugknown(ui, repopath, *ids, **opts):
2313 """test whether node ids are known to a repo
2313 """test whether node ids are known to a repo
2314
2314
2315 Every ID must be a full-length hex node id string. Returns a list of 0s
2315 Every ID must be a full-length hex node id string. Returns a list of 0s
2316 and 1s indicating unknown/known.
2316 and 1s indicating unknown/known.
2317 """
2317 """
2318 repo = hg.peer(ui, opts, repopath)
2318 repo = hg.peer(ui, opts, repopath)
2319 if not repo.capable('known'):
2319 if not repo.capable('known'):
2320 raise util.Abort("known() not supported by target repository")
2320 raise util.Abort("known() not supported by target repository")
2321 flags = repo.known([bin(s) for s in ids])
2321 flags = repo.known([bin(s) for s in ids])
2322 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2322 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2323
2323
2324 @command('debuglabelcomplete', [], _('LABEL...'))
2324 @command('debuglabelcomplete', [], _('LABEL...'))
2325 def debuglabelcomplete(ui, repo, *args):
2325 def debuglabelcomplete(ui, repo, *args):
2326 '''complete "labels" - tags, open branch names, bookmark names'''
2326 '''complete "labels" - tags, open branch names, bookmark names'''
2327
2327
2328 labels = set()
2328 labels = set()
2329 labels.update(t[0] for t in repo.tagslist())
2329 labels.update(t[0] for t in repo.tagslist())
2330 labels.update(repo._bookmarks.keys())
2330 labels.update(repo._bookmarks.keys())
2331 labels.update(tag for (tag, heads, tip, closed)
2331 labels.update(tag for (tag, heads, tip, closed)
2332 in repo.branchmap().iterbranches() if not closed)
2332 in repo.branchmap().iterbranches() if not closed)
2333 completions = set()
2333 completions = set()
2334 if not args:
2334 if not args:
2335 args = ['']
2335 args = ['']
2336 for a in args:
2336 for a in args:
2337 completions.update(l for l in labels if l.startswith(a))
2337 completions.update(l for l in labels if l.startswith(a))
2338 ui.write('\n'.join(sorted(completions)))
2338 ui.write('\n'.join(sorted(completions)))
2339 ui.write('\n')
2339 ui.write('\n')
2340
2340
2341 @command('debuglocks',
2341 @command('debuglocks',
2342 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2342 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2343 ('W', 'force-wlock', None,
2343 ('W', 'force-wlock', None,
2344 _('free the working state lock (DANGEROUS)'))],
2344 _('free the working state lock (DANGEROUS)'))],
2345 _(''))
2345 _(''))
2346 def debuglocks(ui, repo, **opts):
2346 def debuglocks(ui, repo, **opts):
2347 """show or modify state of locks
2347 """show or modify state of locks
2348
2348
2349 By default, this command will show which locks are held. This
2349 By default, this command will show which locks are held. This
2350 includes the user and process holding the lock, the amount of time
2350 includes the user and process holding the lock, the amount of time
2351 the lock has been held, and the machine name where the process is
2351 the lock has been held, and the machine name where the process is
2352 running if it's not local.
2352 running if it's not local.
2353
2353
2354 Locks protect the integrity of Mercurial's data, so should be
2354 Locks protect the integrity of Mercurial's data, so should be
2355 treated with care. System crashes or other interruptions may cause
2355 treated with care. System crashes or other interruptions may cause
2356 locks to not be properly released, though Mercurial will usually
2356 locks to not be properly released, though Mercurial will usually
2357 detect and remove such stale locks automatically.
2357 detect and remove such stale locks automatically.
2358
2358
2359 However, detecting stale locks may not always be possible (for
2359 However, detecting stale locks may not always be possible (for
2360 instance, on a shared filesystem). Removing locks may also be
2360 instance, on a shared filesystem). Removing locks may also be
2361 blocked by filesystem permissions.
2361 blocked by filesystem permissions.
2362
2362
2363 Returns 0 if no locks are held.
2363 Returns 0 if no locks are held.
2364
2364
2365 """
2365 """
2366
2366
2367 if opts.get('force_lock'):
2367 if opts.get('force_lock'):
2368 repo.svfs.unlink('lock')
2368 repo.svfs.unlink('lock')
2369 if opts.get('force_wlock'):
2369 if opts.get('force_wlock'):
2370 repo.vfs.unlink('wlock')
2370 repo.vfs.unlink('wlock')
2371 if opts.get('force_lock') or opts.get('force_lock'):
2371 if opts.get('force_lock') or opts.get('force_lock'):
2372 return 0
2372 return 0
2373
2373
2374 now = time.time()
2374 now = time.time()
2375 held = 0
2375 held = 0
2376
2376
2377 def report(vfs, name, method):
2377 def report(vfs, name, method):
2378 # this causes stale locks to get reaped for more accurate reporting
2378 # this causes stale locks to get reaped for more accurate reporting
2379 try:
2379 try:
2380 l = method(False)
2380 l = method(False)
2381 except error.LockHeld:
2381 except error.LockHeld:
2382 l = None
2382 l = None
2383
2383
2384 if l:
2384 if l:
2385 l.release()
2385 l.release()
2386 else:
2386 else:
2387 try:
2387 try:
2388 stat = repo.svfs.lstat(name)
2388 stat = repo.svfs.lstat(name)
2389 age = now - stat.st_mtime
2389 age = now - stat.st_mtime
2390 user = util.username(stat.st_uid)
2390 user = util.username(stat.st_uid)
2391 locker = vfs.readlock(name)
2391 locker = vfs.readlock(name)
2392 if ":" in locker:
2392 if ":" in locker:
2393 host, pid = locker.split(':')
2393 host, pid = locker.split(':')
2394 if host == socket.gethostname():
2394 if host == socket.gethostname():
2395 locker = 'user %s, process %s' % (user, pid)
2395 locker = 'user %s, process %s' % (user, pid)
2396 else:
2396 else:
2397 locker = 'user %s, process %s, host %s' \
2397 locker = 'user %s, process %s, host %s' \
2398 % (user, pid, host)
2398 % (user, pid, host)
2399 ui.write("%-6s %s (%ds)\n" % (name + ":", locker, age))
2399 ui.write("%-6s %s (%ds)\n" % (name + ":", locker, age))
2400 return 1
2400 return 1
2401 except OSError, e:
2401 except OSError, e:
2402 if e.errno != errno.ENOENT:
2402 if e.errno != errno.ENOENT:
2403 raise
2403 raise
2404
2404
2405 ui.write("%-6s free\n" % (name + ":"))
2405 ui.write("%-6s free\n" % (name + ":"))
2406 return 0
2406 return 0
2407
2407
2408 held += report(repo.svfs, "lock", repo.lock)
2408 held += report(repo.svfs, "lock", repo.lock)
2409 held += report(repo.vfs, "wlock", repo.wlock)
2409 held += report(repo.vfs, "wlock", repo.wlock)
2410
2410
2411 return held
2411 return held
2412
2412
2413 @command('debugobsolete',
2413 @command('debugobsolete',
2414 [('', 'flags', 0, _('markers flag')),
2414 [('', 'flags', 0, _('markers flag')),
2415 ('', 'record-parents', False,
2415 ('', 'record-parents', False,
2416 _('record parent information for the precursor')),
2416 _('record parent information for the precursor')),
2417 ('r', 'rev', [], _('display markers relevant to REV')),
2417 ('r', 'rev', [], _('display markers relevant to REV')),
2418 ] + commitopts2,
2418 ] + commitopts2,
2419 _('[OBSOLETED [REPLACEMENT] [REPL... ]'))
2419 _('[OBSOLETED [REPLACEMENT] [REPL... ]'))
2420 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
2420 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
2421 """create arbitrary obsolete marker
2421 """create arbitrary obsolete marker
2422
2422
2423 With no arguments, displays the list of obsolescence markers."""
2423 With no arguments, displays the list of obsolescence markers."""
2424
2424
2425 def parsenodeid(s):
2425 def parsenodeid(s):
2426 try:
2426 try:
2427 # We do not use revsingle/revrange functions here to accept
2427 # We do not use revsingle/revrange functions here to accept
2428 # arbitrary node identifiers, possibly not present in the
2428 # arbitrary node identifiers, possibly not present in the
2429 # local repository.
2429 # local repository.
2430 n = bin(s)
2430 n = bin(s)
2431 if len(n) != len(nullid):
2431 if len(n) != len(nullid):
2432 raise TypeError()
2432 raise TypeError()
2433 return n
2433 return n
2434 except TypeError:
2434 except TypeError:
2435 raise util.Abort('changeset references must be full hexadecimal '
2435 raise util.Abort('changeset references must be full hexadecimal '
2436 'node identifiers')
2436 'node identifiers')
2437
2437
2438 if precursor is not None:
2438 if precursor is not None:
2439 if opts['rev']:
2439 if opts['rev']:
2440 raise util.Abort('cannot select revision when creating marker')
2440 raise util.Abort('cannot select revision when creating marker')
2441 metadata = {}
2441 metadata = {}
2442 metadata['user'] = opts['user'] or ui.username()
2442 metadata['user'] = opts['user'] or ui.username()
2443 succs = tuple(parsenodeid(succ) for succ in successors)
2443 succs = tuple(parsenodeid(succ) for succ in successors)
2444 l = repo.lock()
2444 l = repo.lock()
2445 try:
2445 try:
2446 tr = repo.transaction('debugobsolete')
2446 tr = repo.transaction('debugobsolete')
2447 try:
2447 try:
2448 try:
2448 try:
2449 date = opts.get('date')
2449 date = opts.get('date')
2450 if date:
2450 if date:
2451 date = util.parsedate(date)
2451 date = util.parsedate(date)
2452 else:
2452 else:
2453 date = None
2453 date = None
2454 prec = parsenodeid(precursor)
2454 prec = parsenodeid(precursor)
2455 parents = None
2455 parents = None
2456 if opts['record_parents']:
2456 if opts['record_parents']:
2457 if prec not in repo.unfiltered():
2457 if prec not in repo.unfiltered():
2458 raise util.Abort('cannot used --record-parents on '
2458 raise util.Abort('cannot used --record-parents on '
2459 'unknown changesets')
2459 'unknown changesets')
2460 parents = repo.unfiltered()[prec].parents()
2460 parents = repo.unfiltered()[prec].parents()
2461 parents = tuple(p.node() for p in parents)
2461 parents = tuple(p.node() for p in parents)
2462 repo.obsstore.create(tr, prec, succs, opts['flags'],
2462 repo.obsstore.create(tr, prec, succs, opts['flags'],
2463 parents=parents, date=date,
2463 parents=parents, date=date,
2464 metadata=metadata)
2464 metadata=metadata)
2465 tr.close()
2465 tr.close()
2466 except ValueError, exc:
2466 except ValueError, exc:
2467 raise util.Abort(_('bad obsmarker input: %s') % exc)
2467 raise util.Abort(_('bad obsmarker input: %s') % exc)
2468 finally:
2468 finally:
2469 tr.release()
2469 tr.release()
2470 finally:
2470 finally:
2471 l.release()
2471 l.release()
2472 else:
2472 else:
2473 if opts['rev']:
2473 if opts['rev']:
2474 revs = scmutil.revrange(repo, opts['rev'])
2474 revs = scmutil.revrange(repo, opts['rev'])
2475 nodes = [repo[r].node() for r in revs]
2475 nodes = [repo[r].node() for r in revs]
2476 markers = list(obsolete.getmarkers(repo, nodes=nodes))
2476 markers = list(obsolete.getmarkers(repo, nodes=nodes))
2477 markers.sort(key=lambda x: x._data)
2477 markers.sort(key=lambda x: x._data)
2478 else:
2478 else:
2479 markers = obsolete.getmarkers(repo)
2479 markers = obsolete.getmarkers(repo)
2480
2480
2481 for m in markers:
2481 for m in markers:
2482 cmdutil.showmarker(ui, m)
2482 cmdutil.showmarker(ui, m)
2483
2483
2484 @command('debugpathcomplete',
2484 @command('debugpathcomplete',
2485 [('f', 'full', None, _('complete an entire path')),
2485 [('f', 'full', None, _('complete an entire path')),
2486 ('n', 'normal', None, _('show only normal files')),
2486 ('n', 'normal', None, _('show only normal files')),
2487 ('a', 'added', None, _('show only added files')),
2487 ('a', 'added', None, _('show only added files')),
2488 ('r', 'removed', None, _('show only removed files'))],
2488 ('r', 'removed', None, _('show only removed files'))],
2489 _('FILESPEC...'))
2489 _('FILESPEC...'))
2490 def debugpathcomplete(ui, repo, *specs, **opts):
2490 def debugpathcomplete(ui, repo, *specs, **opts):
2491 '''complete part or all of a tracked path
2491 '''complete part or all of a tracked path
2492
2492
2493 This command supports shells that offer path name completion. It
2493 This command supports shells that offer path name completion. It
2494 currently completes only files already known to the dirstate.
2494 currently completes only files already known to the dirstate.
2495
2495
2496 Completion extends only to the next path segment unless
2496 Completion extends only to the next path segment unless
2497 --full is specified, in which case entire paths are used.'''
2497 --full is specified, in which case entire paths are used.'''
2498
2498
2499 def complete(path, acceptable):
2499 def complete(path, acceptable):
2500 dirstate = repo.dirstate
2500 dirstate = repo.dirstate
2501 spec = os.path.normpath(os.path.join(os.getcwd(), path))
2501 spec = os.path.normpath(os.path.join(os.getcwd(), path))
2502 rootdir = repo.root + os.sep
2502 rootdir = repo.root + os.sep
2503 if spec != repo.root and not spec.startswith(rootdir):
2503 if spec != repo.root and not spec.startswith(rootdir):
2504 return [], []
2504 return [], []
2505 if os.path.isdir(spec):
2505 if os.path.isdir(spec):
2506 spec += '/'
2506 spec += '/'
2507 spec = spec[len(rootdir):]
2507 spec = spec[len(rootdir):]
2508 fixpaths = os.sep != '/'
2508 fixpaths = os.sep != '/'
2509 if fixpaths:
2509 if fixpaths:
2510 spec = spec.replace(os.sep, '/')
2510 spec = spec.replace(os.sep, '/')
2511 speclen = len(spec)
2511 speclen = len(spec)
2512 fullpaths = opts['full']
2512 fullpaths = opts['full']
2513 files, dirs = set(), set()
2513 files, dirs = set(), set()
2514 adddir, addfile = dirs.add, files.add
2514 adddir, addfile = dirs.add, files.add
2515 for f, st in dirstate.iteritems():
2515 for f, st in dirstate.iteritems():
2516 if f.startswith(spec) and st[0] in acceptable:
2516 if f.startswith(spec) and st[0] in acceptable:
2517 if fixpaths:
2517 if fixpaths:
2518 f = f.replace('/', os.sep)
2518 f = f.replace('/', os.sep)
2519 if fullpaths:
2519 if fullpaths:
2520 addfile(f)
2520 addfile(f)
2521 continue
2521 continue
2522 s = f.find(os.sep, speclen)
2522 s = f.find(os.sep, speclen)
2523 if s >= 0:
2523 if s >= 0:
2524 adddir(f[:s])
2524 adddir(f[:s])
2525 else:
2525 else:
2526 addfile(f)
2526 addfile(f)
2527 return files, dirs
2527 return files, dirs
2528
2528
2529 acceptable = ''
2529 acceptable = ''
2530 if opts['normal']:
2530 if opts['normal']:
2531 acceptable += 'nm'
2531 acceptable += 'nm'
2532 if opts['added']:
2532 if opts['added']:
2533 acceptable += 'a'
2533 acceptable += 'a'
2534 if opts['removed']:
2534 if opts['removed']:
2535 acceptable += 'r'
2535 acceptable += 'r'
2536 cwd = repo.getcwd()
2536 cwd = repo.getcwd()
2537 if not specs:
2537 if not specs:
2538 specs = ['.']
2538 specs = ['.']
2539
2539
2540 files, dirs = set(), set()
2540 files, dirs = set(), set()
2541 for spec in specs:
2541 for spec in specs:
2542 f, d = complete(spec, acceptable or 'nmar')
2542 f, d = complete(spec, acceptable or 'nmar')
2543 files.update(f)
2543 files.update(f)
2544 dirs.update(d)
2544 dirs.update(d)
2545 files.update(dirs)
2545 files.update(dirs)
2546 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
2546 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
2547 ui.write('\n')
2547 ui.write('\n')
2548
2548
2549 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
2549 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
2550 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
2550 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
2551 '''access the pushkey key/value protocol
2551 '''access the pushkey key/value protocol
2552
2552
2553 With two args, list the keys in the given namespace.
2553 With two args, list the keys in the given namespace.
2554
2554
2555 With five args, set a key to new if it currently is set to old.
2555 With five args, set a key to new if it currently is set to old.
2556 Reports success or failure.
2556 Reports success or failure.
2557 '''
2557 '''
2558
2558
2559 target = hg.peer(ui, {}, repopath)
2559 target = hg.peer(ui, {}, repopath)
2560 if keyinfo:
2560 if keyinfo:
2561 key, old, new = keyinfo
2561 key, old, new = keyinfo
2562 r = target.pushkey(namespace, key, old, new)
2562 r = target.pushkey(namespace, key, old, new)
2563 ui.status(str(r) + '\n')
2563 ui.status(str(r) + '\n')
2564 return not r
2564 return not r
2565 else:
2565 else:
2566 for k, v in sorted(target.listkeys(namespace).iteritems()):
2566 for k, v in sorted(target.listkeys(namespace).iteritems()):
2567 ui.write("%s\t%s\n" % (k.encode('string-escape'),
2567 ui.write("%s\t%s\n" % (k.encode('string-escape'),
2568 v.encode('string-escape')))
2568 v.encode('string-escape')))
2569
2569
2570 @command('debugpvec', [], _('A B'))
2570 @command('debugpvec', [], _('A B'))
2571 def debugpvec(ui, repo, a, b=None):
2571 def debugpvec(ui, repo, a, b=None):
2572 ca = scmutil.revsingle(repo, a)
2572 ca = scmutil.revsingle(repo, a)
2573 cb = scmutil.revsingle(repo, b)
2573 cb = scmutil.revsingle(repo, b)
2574 pa = pvec.ctxpvec(ca)
2574 pa = pvec.ctxpvec(ca)
2575 pb = pvec.ctxpvec(cb)
2575 pb = pvec.ctxpvec(cb)
2576 if pa == pb:
2576 if pa == pb:
2577 rel = "="
2577 rel = "="
2578 elif pa > pb:
2578 elif pa > pb:
2579 rel = ">"
2579 rel = ">"
2580 elif pa < pb:
2580 elif pa < pb:
2581 rel = "<"
2581 rel = "<"
2582 elif pa | pb:
2582 elif pa | pb:
2583 rel = "|"
2583 rel = "|"
2584 ui.write(_("a: %s\n") % pa)
2584 ui.write(_("a: %s\n") % pa)
2585 ui.write(_("b: %s\n") % pb)
2585 ui.write(_("b: %s\n") % pb)
2586 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
2586 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
2587 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
2587 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
2588 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
2588 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
2589 pa.distance(pb), rel))
2589 pa.distance(pb), rel))
2590
2590
2591 @command('debugrebuilddirstate|debugrebuildstate',
2591 @command('debugrebuilddirstate|debugrebuildstate',
2592 [('r', 'rev', '', _('revision to rebuild to'), _('REV'))],
2592 [('r', 'rev', '', _('revision to rebuild to'), _('REV'))],
2593 _('[-r REV]'))
2593 _('[-r REV]'))
2594 def debugrebuilddirstate(ui, repo, rev):
2594 def debugrebuilddirstate(ui, repo, rev):
2595 """rebuild the dirstate as it would look like for the given revision
2595 """rebuild the dirstate as it would look like for the given revision
2596
2596
2597 If no revision is specified the first current parent will be used.
2597 If no revision is specified the first current parent will be used.
2598
2598
2599 The dirstate will be set to the files of the given revision.
2599 The dirstate will be set to the files of the given revision.
2600 The actual working directory content or existing dirstate
2600 The actual working directory content or existing dirstate
2601 information such as adds or removes is not considered.
2601 information such as adds or removes is not considered.
2602
2602
2603 One use of this command is to make the next :hg:`status` invocation
2603 One use of this command is to make the next :hg:`status` invocation
2604 check the actual file content.
2604 check the actual file content.
2605 """
2605 """
2606 ctx = scmutil.revsingle(repo, rev)
2606 ctx = scmutil.revsingle(repo, rev)
2607 wlock = repo.wlock()
2607 wlock = repo.wlock()
2608 try:
2608 try:
2609 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
2609 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
2610 finally:
2610 finally:
2611 wlock.release()
2611 wlock.release()
2612
2612
2613 @command('debugrename',
2613 @command('debugrename',
2614 [('r', 'rev', '', _('revision to debug'), _('REV'))],
2614 [('r', 'rev', '', _('revision to debug'), _('REV'))],
2615 _('[-r REV] FILE'))
2615 _('[-r REV] FILE'))
2616 def debugrename(ui, repo, file1, *pats, **opts):
2616 def debugrename(ui, repo, file1, *pats, **opts):
2617 """dump rename information"""
2617 """dump rename information"""
2618
2618
2619 ctx = scmutil.revsingle(repo, opts.get('rev'))
2619 ctx = scmutil.revsingle(repo, opts.get('rev'))
2620 m = scmutil.match(ctx, (file1,) + pats, opts)
2620 m = scmutil.match(ctx, (file1,) + pats, opts)
2621 for abs in ctx.walk(m):
2621 for abs in ctx.walk(m):
2622 fctx = ctx[abs]
2622 fctx = ctx[abs]
2623 o = fctx.filelog().renamed(fctx.filenode())
2623 o = fctx.filelog().renamed(fctx.filenode())
2624 rel = m.rel(abs)
2624 rel = m.rel(abs)
2625 if o:
2625 if o:
2626 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
2626 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
2627 else:
2627 else:
2628 ui.write(_("%s not renamed\n") % rel)
2628 ui.write(_("%s not renamed\n") % rel)
2629
2629
2630 @command('debugrevlog',
2630 @command('debugrevlog',
2631 [('c', 'changelog', False, _('open changelog')),
2631 [('c', 'changelog', False, _('open changelog')),
2632 ('m', 'manifest', False, _('open manifest')),
2632 ('m', 'manifest', False, _('open manifest')),
2633 ('d', 'dump', False, _('dump index data'))],
2633 ('d', 'dump', False, _('dump index data'))],
2634 _('-c|-m|FILE'),
2634 _('-c|-m|FILE'),
2635 optionalrepo=True)
2635 optionalrepo=True)
2636 def debugrevlog(ui, repo, file_=None, **opts):
2636 def debugrevlog(ui, repo, file_=None, **opts):
2637 """show data and statistics about a revlog"""
2637 """show data and statistics about a revlog"""
2638 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
2638 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
2639
2639
2640 if opts.get("dump"):
2640 if opts.get("dump"):
2641 numrevs = len(r)
2641 numrevs = len(r)
2642 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
2642 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
2643 " rawsize totalsize compression heads chainlen\n")
2643 " rawsize totalsize compression heads chainlen\n")
2644 ts = 0
2644 ts = 0
2645 heads = set()
2645 heads = set()
2646 rindex = r.index
2646 rindex = r.index
2647
2647
2648 def chainbaseandlen(rev):
2648 def chainbaseandlen(rev):
2649 clen = 0
2649 clen = 0
2650 base = rindex[rev][3]
2650 base = rindex[rev][3]
2651 while base != rev:
2651 while base != rev:
2652 clen += 1
2652 clen += 1
2653 rev = base
2653 rev = base
2654 base = rindex[rev][3]
2654 base = rindex[rev][3]
2655 return base, clen
2655 return base, clen
2656
2656
2657 for rev in xrange(numrevs):
2657 for rev in xrange(numrevs):
2658 dbase = r.deltaparent(rev)
2658 dbase = r.deltaparent(rev)
2659 if dbase == -1:
2659 if dbase == -1:
2660 dbase = rev
2660 dbase = rev
2661 cbase, clen = chainbaseandlen(rev)
2661 cbase, clen = chainbaseandlen(rev)
2662 p1, p2 = r.parentrevs(rev)
2662 p1, p2 = r.parentrevs(rev)
2663 rs = r.rawsize(rev)
2663 rs = r.rawsize(rev)
2664 ts = ts + rs
2664 ts = ts + rs
2665 heads -= set(r.parentrevs(rev))
2665 heads -= set(r.parentrevs(rev))
2666 heads.add(rev)
2666 heads.add(rev)
2667 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
2667 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
2668 "%11d %5d %8d\n" %
2668 "%11d %5d %8d\n" %
2669 (rev, p1, p2, r.start(rev), r.end(rev),
2669 (rev, p1, p2, r.start(rev), r.end(rev),
2670 r.start(dbase), r.start(cbase),
2670 r.start(dbase), r.start(cbase),
2671 r.start(p1), r.start(p2),
2671 r.start(p1), r.start(p2),
2672 rs, ts, ts / r.end(rev), len(heads), clen))
2672 rs, ts, ts / r.end(rev), len(heads), clen))
2673 return 0
2673 return 0
2674
2674
2675 v = r.version
2675 v = r.version
2676 format = v & 0xFFFF
2676 format = v & 0xFFFF
2677 flags = []
2677 flags = []
2678 gdelta = False
2678 gdelta = False
2679 if v & revlog.REVLOGNGINLINEDATA:
2679 if v & revlog.REVLOGNGINLINEDATA:
2680 flags.append('inline')
2680 flags.append('inline')
2681 if v & revlog.REVLOGGENERALDELTA:
2681 if v & revlog.REVLOGGENERALDELTA:
2682 gdelta = True
2682 gdelta = True
2683 flags.append('generaldelta')
2683 flags.append('generaldelta')
2684 if not flags:
2684 if not flags:
2685 flags = ['(none)']
2685 flags = ['(none)']
2686
2686
2687 nummerges = 0
2687 nummerges = 0
2688 numfull = 0
2688 numfull = 0
2689 numprev = 0
2689 numprev = 0
2690 nump1 = 0
2690 nump1 = 0
2691 nump2 = 0
2691 nump2 = 0
2692 numother = 0
2692 numother = 0
2693 nump1prev = 0
2693 nump1prev = 0
2694 nump2prev = 0
2694 nump2prev = 0
2695 chainlengths = []
2695 chainlengths = []
2696
2696
2697 datasize = [None, 0, 0L]
2697 datasize = [None, 0, 0L]
2698 fullsize = [None, 0, 0L]
2698 fullsize = [None, 0, 0L]
2699 deltasize = [None, 0, 0L]
2699 deltasize = [None, 0, 0L]
2700
2700
2701 def addsize(size, l):
2701 def addsize(size, l):
2702 if l[0] is None or size < l[0]:
2702 if l[0] is None or size < l[0]:
2703 l[0] = size
2703 l[0] = size
2704 if size > l[1]:
2704 if size > l[1]:
2705 l[1] = size
2705 l[1] = size
2706 l[2] += size
2706 l[2] += size
2707
2707
2708 numrevs = len(r)
2708 numrevs = len(r)
2709 for rev in xrange(numrevs):
2709 for rev in xrange(numrevs):
2710 p1, p2 = r.parentrevs(rev)
2710 p1, p2 = r.parentrevs(rev)
2711 delta = r.deltaparent(rev)
2711 delta = r.deltaparent(rev)
2712 if format > 0:
2712 if format > 0:
2713 addsize(r.rawsize(rev), datasize)
2713 addsize(r.rawsize(rev), datasize)
2714 if p2 != nullrev:
2714 if p2 != nullrev:
2715 nummerges += 1
2715 nummerges += 1
2716 size = r.length(rev)
2716 size = r.length(rev)
2717 if delta == nullrev:
2717 if delta == nullrev:
2718 chainlengths.append(0)
2718 chainlengths.append(0)
2719 numfull += 1
2719 numfull += 1
2720 addsize(size, fullsize)
2720 addsize(size, fullsize)
2721 else:
2721 else:
2722 chainlengths.append(chainlengths[delta] + 1)
2722 chainlengths.append(chainlengths[delta] + 1)
2723 addsize(size, deltasize)
2723 addsize(size, deltasize)
2724 if delta == rev - 1:
2724 if delta == rev - 1:
2725 numprev += 1
2725 numprev += 1
2726 if delta == p1:
2726 if delta == p1:
2727 nump1prev += 1
2727 nump1prev += 1
2728 elif delta == p2:
2728 elif delta == p2:
2729 nump2prev += 1
2729 nump2prev += 1
2730 elif delta == p1:
2730 elif delta == p1:
2731 nump1 += 1
2731 nump1 += 1
2732 elif delta == p2:
2732 elif delta == p2:
2733 nump2 += 1
2733 nump2 += 1
2734 elif delta != nullrev:
2734 elif delta != nullrev:
2735 numother += 1
2735 numother += 1
2736
2736
2737 # Adjust size min value for empty cases
2737 # Adjust size min value for empty cases
2738 for size in (datasize, fullsize, deltasize):
2738 for size in (datasize, fullsize, deltasize):
2739 if size[0] is None:
2739 if size[0] is None:
2740 size[0] = 0
2740 size[0] = 0
2741
2741
2742 numdeltas = numrevs - numfull
2742 numdeltas = numrevs - numfull
2743 numoprev = numprev - nump1prev - nump2prev
2743 numoprev = numprev - nump1prev - nump2prev
2744 totalrawsize = datasize[2]
2744 totalrawsize = datasize[2]
2745 datasize[2] /= numrevs
2745 datasize[2] /= numrevs
2746 fulltotal = fullsize[2]
2746 fulltotal = fullsize[2]
2747 fullsize[2] /= numfull
2747 fullsize[2] /= numfull
2748 deltatotal = deltasize[2]
2748 deltatotal = deltasize[2]
2749 if numrevs - numfull > 0:
2749 if numrevs - numfull > 0:
2750 deltasize[2] /= numrevs - numfull
2750 deltasize[2] /= numrevs - numfull
2751 totalsize = fulltotal + deltatotal
2751 totalsize = fulltotal + deltatotal
2752 avgchainlen = sum(chainlengths) / numrevs
2752 avgchainlen = sum(chainlengths) / numrevs
2753 compratio = totalrawsize / totalsize
2753 compratio = totalrawsize / totalsize
2754
2754
2755 basedfmtstr = '%%%dd\n'
2755 basedfmtstr = '%%%dd\n'
2756 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2756 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2757
2757
2758 def dfmtstr(max):
2758 def dfmtstr(max):
2759 return basedfmtstr % len(str(max))
2759 return basedfmtstr % len(str(max))
2760 def pcfmtstr(max, padding=0):
2760 def pcfmtstr(max, padding=0):
2761 return basepcfmtstr % (len(str(max)), ' ' * padding)
2761 return basepcfmtstr % (len(str(max)), ' ' * padding)
2762
2762
2763 def pcfmt(value, total):
2763 def pcfmt(value, total):
2764 return (value, 100 * float(value) / total)
2764 return (value, 100 * float(value) / total)
2765
2765
2766 ui.write(('format : %d\n') % format)
2766 ui.write(('format : %d\n') % format)
2767 ui.write(('flags : %s\n') % ', '.join(flags))
2767 ui.write(('flags : %s\n') % ', '.join(flags))
2768
2768
2769 ui.write('\n')
2769 ui.write('\n')
2770 fmt = pcfmtstr(totalsize)
2770 fmt = pcfmtstr(totalsize)
2771 fmt2 = dfmtstr(totalsize)
2771 fmt2 = dfmtstr(totalsize)
2772 ui.write(('revisions : ') + fmt2 % numrevs)
2772 ui.write(('revisions : ') + fmt2 % numrevs)
2773 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
2773 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
2774 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
2774 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
2775 ui.write(('revisions : ') + fmt2 % numrevs)
2775 ui.write(('revisions : ') + fmt2 % numrevs)
2776 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
2776 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
2777 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
2777 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
2778 ui.write(('revision size : ') + fmt2 % totalsize)
2778 ui.write(('revision size : ') + fmt2 % totalsize)
2779 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
2779 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
2780 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
2780 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
2781
2781
2782 ui.write('\n')
2782 ui.write('\n')
2783 fmt = dfmtstr(max(avgchainlen, compratio))
2783 fmt = dfmtstr(max(avgchainlen, compratio))
2784 ui.write(('avg chain length : ') + fmt % avgchainlen)
2784 ui.write(('avg chain length : ') + fmt % avgchainlen)
2785 ui.write(('compression ratio : ') + fmt % compratio)
2785 ui.write(('compression ratio : ') + fmt % compratio)
2786
2786
2787 if format > 0:
2787 if format > 0:
2788 ui.write('\n')
2788 ui.write('\n')
2789 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
2789 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
2790 % tuple(datasize))
2790 % tuple(datasize))
2791 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
2791 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
2792 % tuple(fullsize))
2792 % tuple(fullsize))
2793 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
2793 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
2794 % tuple(deltasize))
2794 % tuple(deltasize))
2795
2795
2796 if numdeltas > 0:
2796 if numdeltas > 0:
2797 ui.write('\n')
2797 ui.write('\n')
2798 fmt = pcfmtstr(numdeltas)
2798 fmt = pcfmtstr(numdeltas)
2799 fmt2 = pcfmtstr(numdeltas, 4)
2799 fmt2 = pcfmtstr(numdeltas, 4)
2800 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
2800 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
2801 if numprev > 0:
2801 if numprev > 0:
2802 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
2802 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
2803 numprev))
2803 numprev))
2804 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
2804 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
2805 numprev))
2805 numprev))
2806 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
2806 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
2807 numprev))
2807 numprev))
2808 if gdelta:
2808 if gdelta:
2809 ui.write(('deltas against p1 : ')
2809 ui.write(('deltas against p1 : ')
2810 + fmt % pcfmt(nump1, numdeltas))
2810 + fmt % pcfmt(nump1, numdeltas))
2811 ui.write(('deltas against p2 : ')
2811 ui.write(('deltas against p2 : ')
2812 + fmt % pcfmt(nump2, numdeltas))
2812 + fmt % pcfmt(nump2, numdeltas))
2813 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
2813 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
2814 numdeltas))
2814 numdeltas))
2815
2815
2816 @command('debugrevspec',
2816 @command('debugrevspec',
2817 [('', 'optimize', None, _('print parsed tree after optimizing'))],
2817 [('', 'optimize', None, _('print parsed tree after optimizing'))],
2818 ('REVSPEC'))
2818 ('REVSPEC'))
2819 def debugrevspec(ui, repo, expr, **opts):
2819 def debugrevspec(ui, repo, expr, **opts):
2820 """parse and apply a revision specification
2820 """parse and apply a revision specification
2821
2821
2822 Use --verbose to print the parsed tree before and after aliases
2822 Use --verbose to print the parsed tree before and after aliases
2823 expansion.
2823 expansion.
2824 """
2824 """
2825 if ui.verbose:
2825 if ui.verbose:
2826 tree = revset.parse(expr)[0]
2826 tree = revset.parse(expr)[0]
2827 ui.note(revset.prettyformat(tree), "\n")
2827 ui.note(revset.prettyformat(tree), "\n")
2828 newtree = revset.findaliases(ui, tree)
2828 newtree = revset.findaliases(ui, tree)
2829 if newtree != tree:
2829 if newtree != tree:
2830 ui.note(revset.prettyformat(newtree), "\n")
2830 ui.note(revset.prettyformat(newtree), "\n")
2831 if opts["optimize"]:
2831 if opts["optimize"]:
2832 weight, optimizedtree = revset.optimize(newtree, True)
2832 weight, optimizedtree = revset.optimize(newtree, True)
2833 ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n")
2833 ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n")
2834 func = revset.match(ui, expr)
2834 func = revset.match(ui, expr)
2835 for c in func(repo, revset.spanset(repo)):
2835 for c in func(repo, revset.spanset(repo)):
2836 ui.write("%s\n" % c)
2836 ui.write("%s\n" % c)
2837
2837
2838 @command('debugsetparents', [], _('REV1 [REV2]'))
2838 @command('debugsetparents', [], _('REV1 [REV2]'))
2839 def debugsetparents(ui, repo, rev1, rev2=None):
2839 def debugsetparents(ui, repo, rev1, rev2=None):
2840 """manually set the parents of the current working directory
2840 """manually set the parents of the current working directory
2841
2841
2842 This is useful for writing repository conversion tools, but should
2842 This is useful for writing repository conversion tools, but should
2843 be used with care.
2843 be used with care.
2844
2844
2845 Returns 0 on success.
2845 Returns 0 on success.
2846 """
2846 """
2847
2847
2848 r1 = scmutil.revsingle(repo, rev1).node()
2848 r1 = scmutil.revsingle(repo, rev1).node()
2849 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2849 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2850
2850
2851 wlock = repo.wlock()
2851 wlock = repo.wlock()
2852 try:
2852 try:
2853 repo.dirstate.beginparentchange()
2853 repo.dirstate.beginparentchange()
2854 repo.setparents(r1, r2)
2854 repo.setparents(r1, r2)
2855 repo.dirstate.endparentchange()
2855 repo.dirstate.endparentchange()
2856 finally:
2856 finally:
2857 wlock.release()
2857 wlock.release()
2858
2858
2859 @command('debugdirstate|debugstate',
2859 @command('debugdirstate|debugstate',
2860 [('', 'nodates', None, _('do not display the saved mtime')),
2860 [('', 'nodates', None, _('do not display the saved mtime')),
2861 ('', 'datesort', None, _('sort by saved mtime'))],
2861 ('', 'datesort', None, _('sort by saved mtime'))],
2862 _('[OPTION]...'))
2862 _('[OPTION]...'))
2863 def debugstate(ui, repo, nodates=None, datesort=None):
2863 def debugstate(ui, repo, nodates=None, datesort=None):
2864 """show the contents of the current dirstate"""
2864 """show the contents of the current dirstate"""
2865 timestr = ""
2865 timestr = ""
2866 showdate = not nodates
2866 showdate = not nodates
2867 if datesort:
2867 if datesort:
2868 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
2868 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
2869 else:
2869 else:
2870 keyfunc = None # sort by filename
2870 keyfunc = None # sort by filename
2871 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
2871 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
2872 if showdate:
2872 if showdate:
2873 if ent[3] == -1:
2873 if ent[3] == -1:
2874 # Pad or slice to locale representation
2874 # Pad or slice to locale representation
2875 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
2875 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
2876 time.localtime(0)))
2876 time.localtime(0)))
2877 timestr = 'unset'
2877 timestr = 'unset'
2878 timestr = (timestr[:locale_len] +
2878 timestr = (timestr[:locale_len] +
2879 ' ' * (locale_len - len(timestr)))
2879 ' ' * (locale_len - len(timestr)))
2880 else:
2880 else:
2881 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
2881 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
2882 time.localtime(ent[3]))
2882 time.localtime(ent[3]))
2883 if ent[1] & 020000:
2883 if ent[1] & 020000:
2884 mode = 'lnk'
2884 mode = 'lnk'
2885 else:
2885 else:
2886 mode = '%3o' % (ent[1] & 0777 & ~util.umask)
2886 mode = '%3o' % (ent[1] & 0777 & ~util.umask)
2887 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
2887 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
2888 for f in repo.dirstate.copies():
2888 for f in repo.dirstate.copies():
2889 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
2889 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
2890
2890
2891 @command('debugsub',
2891 @command('debugsub',
2892 [('r', 'rev', '',
2892 [('r', 'rev', '',
2893 _('revision to check'), _('REV'))],
2893 _('revision to check'), _('REV'))],
2894 _('[-r REV] [REV]'))
2894 _('[-r REV] [REV]'))
2895 def debugsub(ui, repo, rev=None):
2895 def debugsub(ui, repo, rev=None):
2896 ctx = scmutil.revsingle(repo, rev, None)
2896 ctx = scmutil.revsingle(repo, rev, None)
2897 for k, v in sorted(ctx.substate.items()):
2897 for k, v in sorted(ctx.substate.items()):
2898 ui.write(('path %s\n') % k)
2898 ui.write(('path %s\n') % k)
2899 ui.write((' source %s\n') % v[0])
2899 ui.write((' source %s\n') % v[0])
2900 ui.write((' revision %s\n') % v[1])
2900 ui.write((' revision %s\n') % v[1])
2901
2901
2902 @command('debugsuccessorssets',
2902 @command('debugsuccessorssets',
2903 [],
2903 [],
2904 _('[REV]'))
2904 _('[REV]'))
2905 def debugsuccessorssets(ui, repo, *revs):
2905 def debugsuccessorssets(ui, repo, *revs):
2906 """show set of successors for revision
2906 """show set of successors for revision
2907
2907
2908 A successors set of changeset A is a consistent group of revisions that
2908 A successors set of changeset A is a consistent group of revisions that
2909 succeed A. It contains non-obsolete changesets only.
2909 succeed A. It contains non-obsolete changesets only.
2910
2910
2911 In most cases a changeset A has a single successors set containing a single
2911 In most cases a changeset A has a single successors set containing a single
2912 successor (changeset A replaced by A').
2912 successor (changeset A replaced by A').
2913
2913
2914 A changeset that is made obsolete with no successors are called "pruned".
2914 A changeset that is made obsolete with no successors are called "pruned".
2915 Such changesets have no successors sets at all.
2915 Such changesets have no successors sets at all.
2916
2916
2917 A changeset that has been "split" will have a successors set containing
2917 A changeset that has been "split" will have a successors set containing
2918 more than one successor.
2918 more than one successor.
2919
2919
2920 A changeset that has been rewritten in multiple different ways is called
2920 A changeset that has been rewritten in multiple different ways is called
2921 "divergent". Such changesets have multiple successor sets (each of which
2921 "divergent". Such changesets have multiple successor sets (each of which
2922 may also be split, i.e. have multiple successors).
2922 may also be split, i.e. have multiple successors).
2923
2923
2924 Results are displayed as follows::
2924 Results are displayed as follows::
2925
2925
2926 <rev1>
2926 <rev1>
2927 <successors-1A>
2927 <successors-1A>
2928 <rev2>
2928 <rev2>
2929 <successors-2A>
2929 <successors-2A>
2930 <successors-2B1> <successors-2B2> <successors-2B3>
2930 <successors-2B1> <successors-2B2> <successors-2B3>
2931
2931
2932 Here rev2 has two possible (i.e. divergent) successors sets. The first
2932 Here rev2 has two possible (i.e. divergent) successors sets. The first
2933 holds one element, whereas the second holds three (i.e. the changeset has
2933 holds one element, whereas the second holds three (i.e. the changeset has
2934 been split).
2934 been split).
2935 """
2935 """
2936 # passed to successorssets caching computation from one call to another
2936 # passed to successorssets caching computation from one call to another
2937 cache = {}
2937 cache = {}
2938 ctx2str = str
2938 ctx2str = str
2939 node2str = short
2939 node2str = short
2940 if ui.debug():
2940 if ui.debug():
2941 def ctx2str(ctx):
2941 def ctx2str(ctx):
2942 return ctx.hex()
2942 return ctx.hex()
2943 node2str = hex
2943 node2str = hex
2944 for rev in scmutil.revrange(repo, revs):
2944 for rev in scmutil.revrange(repo, revs):
2945 ctx = repo[rev]
2945 ctx = repo[rev]
2946 ui.write('%s\n'% ctx2str(ctx))
2946 ui.write('%s\n'% ctx2str(ctx))
2947 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
2947 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
2948 if succsset:
2948 if succsset:
2949 ui.write(' ')
2949 ui.write(' ')
2950 ui.write(node2str(succsset[0]))
2950 ui.write(node2str(succsset[0]))
2951 for node in succsset[1:]:
2951 for node in succsset[1:]:
2952 ui.write(' ')
2952 ui.write(' ')
2953 ui.write(node2str(node))
2953 ui.write(node2str(node))
2954 ui.write('\n')
2954 ui.write('\n')
2955
2955
2956 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
2956 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
2957 def debugwalk(ui, repo, *pats, **opts):
2957 def debugwalk(ui, repo, *pats, **opts):
2958 """show how files match on given patterns"""
2958 """show how files match on given patterns"""
2959 m = scmutil.match(repo[None], pats, opts)
2959 m = scmutil.match(repo[None], pats, opts)
2960 items = list(repo.walk(m))
2960 items = list(repo.walk(m))
2961 if not items:
2961 if not items:
2962 return
2962 return
2963 f = lambda fn: fn
2963 f = lambda fn: fn
2964 if ui.configbool('ui', 'slash') and os.sep != '/':
2964 if ui.configbool('ui', 'slash') and os.sep != '/':
2965 f = lambda fn: util.normpath(fn)
2965 f = lambda fn: util.normpath(fn)
2966 fmt = 'f %%-%ds %%-%ds %%s' % (
2966 fmt = 'f %%-%ds %%-%ds %%s' % (
2967 max([len(abs) for abs in items]),
2967 max([len(abs) for abs in items]),
2968 max([len(m.rel(abs)) for abs in items]))
2968 max([len(m.rel(abs)) for abs in items]))
2969 for abs in items:
2969 for abs in items:
2970 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
2970 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
2971 ui.write("%s\n" % line.rstrip())
2971 ui.write("%s\n" % line.rstrip())
2972
2972
2973 @command('debugwireargs',
2973 @command('debugwireargs',
2974 [('', 'three', '', 'three'),
2974 [('', 'three', '', 'three'),
2975 ('', 'four', '', 'four'),
2975 ('', 'four', '', 'four'),
2976 ('', 'five', '', 'five'),
2976 ('', 'five', '', 'five'),
2977 ] + remoteopts,
2977 ] + remoteopts,
2978 _('REPO [OPTIONS]... [ONE [TWO]]'),
2978 _('REPO [OPTIONS]... [ONE [TWO]]'),
2979 norepo=True)
2979 norepo=True)
2980 def debugwireargs(ui, repopath, *vals, **opts):
2980 def debugwireargs(ui, repopath, *vals, **opts):
2981 repo = hg.peer(ui, opts, repopath)
2981 repo = hg.peer(ui, opts, repopath)
2982 for opt in remoteopts:
2982 for opt in remoteopts:
2983 del opts[opt[1]]
2983 del opts[opt[1]]
2984 args = {}
2984 args = {}
2985 for k, v in opts.iteritems():
2985 for k, v in opts.iteritems():
2986 if v:
2986 if v:
2987 args[k] = v
2987 args[k] = v
2988 # run twice to check that we don't mess up the stream for the next command
2988 # run twice to check that we don't mess up the stream for the next command
2989 res1 = repo.debugwireargs(*vals, **args)
2989 res1 = repo.debugwireargs(*vals, **args)
2990 res2 = repo.debugwireargs(*vals, **args)
2990 res2 = repo.debugwireargs(*vals, **args)
2991 ui.write("%s\n" % res1)
2991 ui.write("%s\n" % res1)
2992 if res1 != res2:
2992 if res1 != res2:
2993 ui.warn("%s\n" % res2)
2993 ui.warn("%s\n" % res2)
2994
2994
2995 @command('^diff',
2995 @command('^diff',
2996 [('r', 'rev', [], _('revision'), _('REV')),
2996 [('r', 'rev', [], _('revision'), _('REV')),
2997 ('c', 'change', '', _('change made by revision'), _('REV'))
2997 ('c', 'change', '', _('change made by revision'), _('REV'))
2998 ] + diffopts + diffopts2 + walkopts + subrepoopts,
2998 ] + diffopts + diffopts2 + walkopts + subrepoopts,
2999 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2999 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3000 inferrepo=True)
3000 inferrepo=True)
3001 def diff(ui, repo, *pats, **opts):
3001 def diff(ui, repo, *pats, **opts):
3002 """diff repository (or selected files)
3002 """diff repository (or selected files)
3003
3003
3004 Show differences between revisions for the specified files.
3004 Show differences between revisions for the specified files.
3005
3005
3006 Differences between files are shown using the unified diff format.
3006 Differences between files are shown using the unified diff format.
3007
3007
3008 .. note::
3008 .. note::
3009
3009
3010 diff may generate unexpected results for merges, as it will
3010 diff may generate unexpected results for merges, as it will
3011 default to comparing against the working directory's first
3011 default to comparing against the working directory's first
3012 parent changeset if no revisions are specified.
3012 parent changeset if no revisions are specified.
3013
3013
3014 When two revision arguments are given, then changes are shown
3014 When two revision arguments are given, then changes are shown
3015 between those revisions. If only one revision is specified then
3015 between those revisions. If only one revision is specified then
3016 that revision is compared to the working directory, and, when no
3016 that revision is compared to the working directory, and, when no
3017 revisions are specified, the working directory files are compared
3017 revisions are specified, the working directory files are compared
3018 to its parent.
3018 to its parent.
3019
3019
3020 Alternatively you can specify -c/--change with a revision to see
3020 Alternatively you can specify -c/--change with a revision to see
3021 the changes in that changeset relative to its first parent.
3021 the changes in that changeset relative to its first parent.
3022
3022
3023 Without the -a/--text option, diff will avoid generating diffs of
3023 Without the -a/--text option, diff will avoid generating diffs of
3024 files it detects as binary. With -a, diff will generate a diff
3024 files it detects as binary. With -a, diff will generate a diff
3025 anyway, probably with undesirable results.
3025 anyway, probably with undesirable results.
3026
3026
3027 Use the -g/--git option to generate diffs in the git extended diff
3027 Use the -g/--git option to generate diffs in the git extended diff
3028 format. For more information, read :hg:`help diffs`.
3028 format. For more information, read :hg:`help diffs`.
3029
3029
3030 .. container:: verbose
3030 .. container:: verbose
3031
3031
3032 Examples:
3032 Examples:
3033
3033
3034 - compare a file in the current working directory to its parent::
3034 - compare a file in the current working directory to its parent::
3035
3035
3036 hg diff foo.c
3036 hg diff foo.c
3037
3037
3038 - compare two historical versions of a directory, with rename info::
3038 - compare two historical versions of a directory, with rename info::
3039
3039
3040 hg diff --git -r 1.0:1.2 lib/
3040 hg diff --git -r 1.0:1.2 lib/
3041
3041
3042 - get change stats relative to the last change on some date::
3042 - get change stats relative to the last change on some date::
3043
3043
3044 hg diff --stat -r "date('may 2')"
3044 hg diff --stat -r "date('may 2')"
3045
3045
3046 - diff all newly-added files that contain a keyword::
3046 - diff all newly-added files that contain a keyword::
3047
3047
3048 hg diff "set:added() and grep(GNU)"
3048 hg diff "set:added() and grep(GNU)"
3049
3049
3050 - compare a revision and its parents::
3050 - compare a revision and its parents::
3051
3051
3052 hg diff -c 9353 # compare against first parent
3052 hg diff -c 9353 # compare against first parent
3053 hg diff -r 9353^:9353 # same using revset syntax
3053 hg diff -r 9353^:9353 # same using revset syntax
3054 hg diff -r 9353^2:9353 # compare against the second parent
3054 hg diff -r 9353^2:9353 # compare against the second parent
3055
3055
3056 Returns 0 on success.
3056 Returns 0 on success.
3057 """
3057 """
3058
3058
3059 revs = opts.get('rev')
3059 revs = opts.get('rev')
3060 change = opts.get('change')
3060 change = opts.get('change')
3061 stat = opts.get('stat')
3061 stat = opts.get('stat')
3062 reverse = opts.get('reverse')
3062 reverse = opts.get('reverse')
3063
3063
3064 if revs and change:
3064 if revs and change:
3065 msg = _('cannot specify --rev and --change at the same time')
3065 msg = _('cannot specify --rev and --change at the same time')
3066 raise util.Abort(msg)
3066 raise util.Abort(msg)
3067 elif change:
3067 elif change:
3068 node2 = scmutil.revsingle(repo, change, None).node()
3068 node2 = scmutil.revsingle(repo, change, None).node()
3069 node1 = repo[node2].p1().node()
3069 node1 = repo[node2].p1().node()
3070 else:
3070 else:
3071 node1, node2 = scmutil.revpair(repo, revs)
3071 node1, node2 = scmutil.revpair(repo, revs)
3072
3072
3073 if reverse:
3073 if reverse:
3074 node1, node2 = node2, node1
3074 node1, node2 = node2, node1
3075
3075
3076 diffopts = patch.diffopts(ui, opts)
3076 diffopts = patch.diffopts(ui, opts)
3077 m = scmutil.match(repo[node2], pats, opts)
3077 m = scmutil.match(repo[node2], pats, opts)
3078 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3078 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3079 listsubrepos=opts.get('subrepos'))
3079 listsubrepos=opts.get('subrepos'))
3080
3080
3081 @command('^export',
3081 @command('^export',
3082 [('o', 'output', '',
3082 [('o', 'output', '',
3083 _('print output to file with formatted name'), _('FORMAT')),
3083 _('print output to file with formatted name'), _('FORMAT')),
3084 ('', 'switch-parent', None, _('diff against the second parent')),
3084 ('', 'switch-parent', None, _('diff against the second parent')),
3085 ('r', 'rev', [], _('revisions to export'), _('REV')),
3085 ('r', 'rev', [], _('revisions to export'), _('REV')),
3086 ] + diffopts,
3086 ] + diffopts,
3087 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3087 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3088 def export(ui, repo, *changesets, **opts):
3088 def export(ui, repo, *changesets, **opts):
3089 """dump the header and diffs for one or more changesets
3089 """dump the header and diffs for one or more changesets
3090
3090
3091 Print the changeset header and diffs for one or more revisions.
3091 Print the changeset header and diffs for one or more revisions.
3092 If no revision is given, the parent of the working directory is used.
3092 If no revision is given, the parent of the working directory is used.
3093
3093
3094 The information shown in the changeset header is: author, date,
3094 The information shown in the changeset header is: author, date,
3095 branch name (if non-default), changeset hash, parent(s) and commit
3095 branch name (if non-default), changeset hash, parent(s) and commit
3096 comment.
3096 comment.
3097
3097
3098 .. note::
3098 .. note::
3099
3099
3100 export may generate unexpected diff output for merge
3100 export may generate unexpected diff output for merge
3101 changesets, as it will compare the merge changeset against its
3101 changesets, as it will compare the merge changeset against its
3102 first parent only.
3102 first parent only.
3103
3103
3104 Output may be to a file, in which case the name of the file is
3104 Output may be to a file, in which case the name of the file is
3105 given using a format string. The formatting rules are as follows:
3105 given using a format string. The formatting rules are as follows:
3106
3106
3107 :``%%``: literal "%" character
3107 :``%%``: literal "%" character
3108 :``%H``: changeset hash (40 hexadecimal digits)
3108 :``%H``: changeset hash (40 hexadecimal digits)
3109 :``%N``: number of patches being generated
3109 :``%N``: number of patches being generated
3110 :``%R``: changeset revision number
3110 :``%R``: changeset revision number
3111 :``%b``: basename of the exporting repository
3111 :``%b``: basename of the exporting repository
3112 :``%h``: short-form changeset hash (12 hexadecimal digits)
3112 :``%h``: short-form changeset hash (12 hexadecimal digits)
3113 :``%m``: first line of the commit message (only alphanumeric characters)
3113 :``%m``: first line of the commit message (only alphanumeric characters)
3114 :``%n``: zero-padded sequence number, starting at 1
3114 :``%n``: zero-padded sequence number, starting at 1
3115 :``%r``: zero-padded changeset revision number
3115 :``%r``: zero-padded changeset revision number
3116
3116
3117 Without the -a/--text option, export will avoid generating diffs
3117 Without the -a/--text option, export will avoid generating diffs
3118 of files it detects as binary. With -a, export will generate a
3118 of files it detects as binary. With -a, export will generate a
3119 diff anyway, probably with undesirable results.
3119 diff anyway, probably with undesirable results.
3120
3120
3121 Use the -g/--git option to generate diffs in the git extended diff
3121 Use the -g/--git option to generate diffs in the git extended diff
3122 format. See :hg:`help diffs` for more information.
3122 format. See :hg:`help diffs` for more information.
3123
3123
3124 With the --switch-parent option, the diff will be against the
3124 With the --switch-parent option, the diff will be against the
3125 second parent. It can be useful to review a merge.
3125 second parent. It can be useful to review a merge.
3126
3126
3127 .. container:: verbose
3127 .. container:: verbose
3128
3128
3129 Examples:
3129 Examples:
3130
3130
3131 - use export and import to transplant a bugfix to the current
3131 - use export and import to transplant a bugfix to the current
3132 branch::
3132 branch::
3133
3133
3134 hg export -r 9353 | hg import -
3134 hg export -r 9353 | hg import -
3135
3135
3136 - export all the changesets between two revisions to a file with
3136 - export all the changesets between two revisions to a file with
3137 rename information::
3137 rename information::
3138
3138
3139 hg export --git -r 123:150 > changes.txt
3139 hg export --git -r 123:150 > changes.txt
3140
3140
3141 - split outgoing changes into a series of patches with
3141 - split outgoing changes into a series of patches with
3142 descriptive names::
3142 descriptive names::
3143
3143
3144 hg export -r "outgoing()" -o "%n-%m.patch"
3144 hg export -r "outgoing()" -o "%n-%m.patch"
3145
3145
3146 Returns 0 on success.
3146 Returns 0 on success.
3147 """
3147 """
3148 changesets += tuple(opts.get('rev', []))
3148 changesets += tuple(opts.get('rev', []))
3149 if not changesets:
3149 if not changesets:
3150 changesets = ['.']
3150 changesets = ['.']
3151 revs = scmutil.revrange(repo, changesets)
3151 revs = scmutil.revrange(repo, changesets)
3152 if not revs:
3152 if not revs:
3153 raise util.Abort(_("export requires at least one changeset"))
3153 raise util.Abort(_("export requires at least one changeset"))
3154 if len(revs) > 1:
3154 if len(revs) > 1:
3155 ui.note(_('exporting patches:\n'))
3155 ui.note(_('exporting patches:\n'))
3156 else:
3156 else:
3157 ui.note(_('exporting patch:\n'))
3157 ui.note(_('exporting patch:\n'))
3158 cmdutil.export(repo, revs, template=opts.get('output'),
3158 cmdutil.export(repo, revs, template=opts.get('output'),
3159 switch_parent=opts.get('switch_parent'),
3159 switch_parent=opts.get('switch_parent'),
3160 opts=patch.diffopts(ui, opts))
3160 opts=patch.diffopts(ui, opts))
3161
3161
3162 @command('files',
3162 @command('files',
3163 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3163 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3164 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3164 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3165 ] + walkopts + formatteropts,
3165 ] + walkopts + formatteropts,
3166 _('[OPTION]... [PATTERN]...'))
3166 _('[OPTION]... [PATTERN]...'))
3167 def files(ui, repo, *pats, **opts):
3167 def files(ui, repo, *pats, **opts):
3168 """list tracked files
3168 """list tracked files
3169
3169
3170 Print files under Mercurial control in the working directory or
3170 Print files under Mercurial control in the working directory or
3171 specified revision whose names match the given patterns (excluding
3171 specified revision whose names match the given patterns (excluding
3172 removed files).
3172 removed files).
3173
3173
3174 If no patterns are given to match, this command prints the names
3174 If no patterns are given to match, this command prints the names
3175 of all files under Mercurial control in the working copy.
3175 of all files under Mercurial control in the working copy.
3176
3176
3177 .. container:: verbose
3177 .. container:: verbose
3178
3178
3179 Examples:
3179 Examples:
3180
3180
3181 - list all files under the current directory::
3181 - list all files under the current directory::
3182
3182
3183 hg files .
3183 hg files .
3184
3184
3185 - shows sizes and flags for current revision::
3185 - shows sizes and flags for current revision::
3186
3186
3187 hg files -vr .
3187 hg files -vr .
3188
3188
3189 - list all files named README::
3189 - list all files named README::
3190
3190
3191 hg files -I "**/README"
3191 hg files -I "**/README"
3192
3192
3193 - list all binary files::
3193 - list all binary files::
3194
3194
3195 hg files "set:binary()"
3195 hg files "set:binary()"
3196
3196
3197 - find files containing a regular expression:
3197 - find files containing a regular expression:
3198
3198
3199 hg files "set:grep('bob')"
3199 hg files "set:grep('bob')"
3200
3200
3201 - search tracked file contents with xargs and grep::
3201 - search tracked file contents with xargs and grep::
3202
3202
3203 hg files -0 | xargs -0 grep foo
3203 hg files -0 | xargs -0 grep foo
3204
3204
3205 See :hg:'help pattern' and :hg:'help revsets' for more information
3205 See :hg:'help pattern' and :hg:'help revsets' for more information
3206 on specifying file patterns.
3206 on specifying file patterns.
3207
3207
3208 Returns 0 if a match is found, 1 otherwise.
3208 Returns 0 if a match is found, 1 otherwise.
3209
3209
3210 """
3210 """
3211 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3211 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3212 rev = ctx.rev()
3212 rev = ctx.rev()
3213 ret = 1
3213 ret = 1
3214
3214
3215 end = '\n'
3215 end = '\n'
3216 if opts.get('print0'):
3216 if opts.get('print0'):
3217 end = '\0'
3217 end = '\0'
3218 fm = ui.formatter('files', opts)
3218 fm = ui.formatter('files', opts)
3219 fmt = '%s' + end
3219 fmt = '%s' + end
3220
3220
3221 m = scmutil.match(ctx, pats, opts)
3221 m = scmutil.match(ctx, pats, opts)
3222 ds = repo.dirstate
3222 ds = repo.dirstate
3223 for f in ctx.matches(m):
3223 for f in ctx.matches(m):
3224 if rev is None and ds[f] == 'r':
3224 if rev is None and ds[f] == 'r':
3225 continue
3225 continue
3226 fm.startitem()
3226 fm.startitem()
3227 if ui.verbose:
3227 if ui.verbose:
3228 fc = ctx[f]
3228 fc = ctx[f]
3229 fm.write('size flags', '% 10d % 1s ', fc.size(), fc.flags())
3229 fm.write('size flags', '% 10d % 1s ', fc.size(), fc.flags())
3230 fm.data(abspath=f)
3230 fm.data(abspath=f)
3231 fm.write('path', fmt, m.rel(f))
3231 fm.write('path', fmt, m.rel(f))
3232 ret = 0
3232 ret = 0
3233
3233
3234 fm.end()
3234 fm.end()
3235
3235
3236 return ret
3236 return ret
3237
3237
3238 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3238 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3239 def forget(ui, repo, *pats, **opts):
3239 def forget(ui, repo, *pats, **opts):
3240 """forget the specified files on the next commit
3240 """forget the specified files on the next commit
3241
3241
3242 Mark the specified files so they will no longer be tracked
3242 Mark the specified files so they will no longer be tracked
3243 after the next commit.
3243 after the next commit.
3244
3244
3245 This only removes files from the current branch, not from the
3245 This only removes files from the current branch, not from the
3246 entire project history, and it does not delete them from the
3246 entire project history, and it does not delete them from the
3247 working directory.
3247 working directory.
3248
3248
3249 To undo a forget before the next commit, see :hg:`add`.
3249 To undo a forget before the next commit, see :hg:`add`.
3250
3250
3251 .. container:: verbose
3251 .. container:: verbose
3252
3252
3253 Examples:
3253 Examples:
3254
3254
3255 - forget newly-added binary files::
3255 - forget newly-added binary files::
3256
3256
3257 hg forget "set:added() and binary()"
3257 hg forget "set:added() and binary()"
3258
3258
3259 - forget files that would be excluded by .hgignore::
3259 - forget files that would be excluded by .hgignore::
3260
3260
3261 hg forget "set:hgignore()"
3261 hg forget "set:hgignore()"
3262
3262
3263 Returns 0 on success.
3263 Returns 0 on success.
3264 """
3264 """
3265
3265
3266 if not pats:
3266 if not pats:
3267 raise util.Abort(_('no files specified'))
3267 raise util.Abort(_('no files specified'))
3268
3268
3269 m = scmutil.match(repo[None], pats, opts)
3269 m = scmutil.match(repo[None], pats, opts)
3270 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
3270 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
3271 return rejected and 1 or 0
3271 return rejected and 1 or 0
3272
3272
3273 @command(
3273 @command(
3274 'graft',
3274 'graft',
3275 [('r', 'rev', [], _('revisions to graft'), _('REV')),
3275 [('r', 'rev', [], _('revisions to graft'), _('REV')),
3276 ('c', 'continue', False, _('resume interrupted graft')),
3276 ('c', 'continue', False, _('resume interrupted graft')),
3277 ('e', 'edit', False, _('invoke editor on commit messages')),
3277 ('e', 'edit', False, _('invoke editor on commit messages')),
3278 ('', 'log', None, _('append graft info to log message')),
3278 ('', 'log', None, _('append graft info to log message')),
3279 ('f', 'force', False, _('force graft')),
3279 ('f', 'force', False, _('force graft')),
3280 ('D', 'currentdate', False,
3280 ('D', 'currentdate', False,
3281 _('record the current date as commit date')),
3281 _('record the current date as commit date')),
3282 ('U', 'currentuser', False,
3282 ('U', 'currentuser', False,
3283 _('record the current user as committer'), _('DATE'))]
3283 _('record the current user as committer'), _('DATE'))]
3284 + commitopts2 + mergetoolopts + dryrunopts,
3284 + commitopts2 + mergetoolopts + dryrunopts,
3285 _('[OPTION]... [-r] REV...'))
3285 _('[OPTION]... [-r] REV...'))
3286 def graft(ui, repo, *revs, **opts):
3286 def graft(ui, repo, *revs, **opts):
3287 '''copy changes from other branches onto the current branch
3287 '''copy changes from other branches onto the current branch
3288
3288
3289 This command uses Mercurial's merge logic to copy individual
3289 This command uses Mercurial's merge logic to copy individual
3290 changes from other branches without merging branches in the
3290 changes from other branches without merging branches in the
3291 history graph. This is sometimes known as 'backporting' or
3291 history graph. This is sometimes known as 'backporting' or
3292 'cherry-picking'. By default, graft will copy user, date, and
3292 'cherry-picking'. By default, graft will copy user, date, and
3293 description from the source changesets.
3293 description from the source changesets.
3294
3294
3295 Changesets that are ancestors of the current revision, that have
3295 Changesets that are ancestors of the current revision, that have
3296 already been grafted, or that are merges will be skipped.
3296 already been grafted, or that are merges will be skipped.
3297
3297
3298 If --log is specified, log messages will have a comment appended
3298 If --log is specified, log messages will have a comment appended
3299 of the form::
3299 of the form::
3300
3300
3301 (grafted from CHANGESETHASH)
3301 (grafted from CHANGESETHASH)
3302
3302
3303 If --force is specified, revisions will be grafted even if they
3303 If --force is specified, revisions will be grafted even if they
3304 are already ancestors of or have been grafted to the destination.
3304 are already ancestors of or have been grafted to the destination.
3305 This is useful when the revisions have since been backed out.
3305 This is useful when the revisions have since been backed out.
3306
3306
3307 If a graft merge results in conflicts, the graft process is
3307 If a graft merge results in conflicts, the graft process is
3308 interrupted so that the current merge can be manually resolved.
3308 interrupted so that the current merge can be manually resolved.
3309 Once all conflicts are addressed, the graft process can be
3309 Once all conflicts are addressed, the graft process can be
3310 continued with the -c/--continue option.
3310 continued with the -c/--continue option.
3311
3311
3312 .. note::
3312 .. note::
3313
3313
3314 The -c/--continue option does not reapply earlier options, except
3314 The -c/--continue option does not reapply earlier options, except
3315 for --force.
3315 for --force.
3316
3316
3317 .. container:: verbose
3317 .. container:: verbose
3318
3318
3319 Examples:
3319 Examples:
3320
3320
3321 - copy a single change to the stable branch and edit its description::
3321 - copy a single change to the stable branch and edit its description::
3322
3322
3323 hg update stable
3323 hg update stable
3324 hg graft --edit 9393
3324 hg graft --edit 9393
3325
3325
3326 - graft a range of changesets with one exception, updating dates::
3326 - graft a range of changesets with one exception, updating dates::
3327
3327
3328 hg graft -D "2085::2093 and not 2091"
3328 hg graft -D "2085::2093 and not 2091"
3329
3329
3330 - continue a graft after resolving conflicts::
3330 - continue a graft after resolving conflicts::
3331
3331
3332 hg graft -c
3332 hg graft -c
3333
3333
3334 - show the source of a grafted changeset::
3334 - show the source of a grafted changeset::
3335
3335
3336 hg log --debug -r .
3336 hg log --debug -r .
3337
3337
3338 See :hg:`help revisions` and :hg:`help revsets` for more about
3338 See :hg:`help revisions` and :hg:`help revsets` for more about
3339 specifying revisions.
3339 specifying revisions.
3340
3340
3341 Returns 0 on successful completion.
3341 Returns 0 on successful completion.
3342 '''
3342 '''
3343
3343
3344 revs = list(revs)
3344 revs = list(revs)
3345 revs.extend(opts['rev'])
3345 revs.extend(opts['rev'])
3346
3346
3347 if not opts.get('user') and opts.get('currentuser'):
3347 if not opts.get('user') and opts.get('currentuser'):
3348 opts['user'] = ui.username()
3348 opts['user'] = ui.username()
3349 if not opts.get('date') and opts.get('currentdate'):
3349 if not opts.get('date') and opts.get('currentdate'):
3350 opts['date'] = "%d %d" % util.makedate()
3350 opts['date'] = "%d %d" % util.makedate()
3351
3351
3352 editor = cmdutil.getcommiteditor(editform='graft', **opts)
3352 editor = cmdutil.getcommiteditor(editform='graft', **opts)
3353
3353
3354 cont = False
3354 cont = False
3355 if opts['continue']:
3355 if opts['continue']:
3356 cont = True
3356 cont = True
3357 if revs:
3357 if revs:
3358 raise util.Abort(_("can't specify --continue and revisions"))
3358 raise util.Abort(_("can't specify --continue and revisions"))
3359 # read in unfinished revisions
3359 # read in unfinished revisions
3360 try:
3360 try:
3361 nodes = repo.opener.read('graftstate').splitlines()
3361 nodes = repo.opener.read('graftstate').splitlines()
3362 revs = [repo[node].rev() for node in nodes]
3362 revs = [repo[node].rev() for node in nodes]
3363 except IOError, inst:
3363 except IOError, inst:
3364 if inst.errno != errno.ENOENT:
3364 if inst.errno != errno.ENOENT:
3365 raise
3365 raise
3366 raise util.Abort(_("no graft state found, can't continue"))
3366 raise util.Abort(_("no graft state found, can't continue"))
3367 else:
3367 else:
3368 cmdutil.checkunfinished(repo)
3368 cmdutil.checkunfinished(repo)
3369 cmdutil.bailifchanged(repo)
3369 cmdutil.bailifchanged(repo)
3370 if not revs:
3370 if not revs:
3371 raise util.Abort(_('no revisions specified'))
3371 raise util.Abort(_('no revisions specified'))
3372 revs = scmutil.revrange(repo, revs)
3372 revs = scmutil.revrange(repo, revs)
3373
3373
3374 # check for merges
3374 # check for merges
3375 for rev in repo.revs('%ld and merge()', revs):
3375 for rev in repo.revs('%ld and merge()', revs):
3376 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
3376 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
3377 revs.remove(rev)
3377 revs.remove(rev)
3378 if not revs:
3378 if not revs:
3379 return -1
3379 return -1
3380
3380
3381 # Don't check in the --continue case, in effect retaining --force across
3381 # Don't check in the --continue case, in effect retaining --force across
3382 # --continues. That's because without --force, any revisions we decided to
3382 # --continues. That's because without --force, any revisions we decided to
3383 # skip would have been filtered out here, so they wouldn't have made their
3383 # skip would have been filtered out here, so they wouldn't have made their
3384 # way to the graftstate. With --force, any revisions we would have otherwise
3384 # way to the graftstate. With --force, any revisions we would have otherwise
3385 # skipped would not have been filtered out, and if they hadn't been applied
3385 # skipped would not have been filtered out, and if they hadn't been applied
3386 # already, they'd have been in the graftstate.
3386 # already, they'd have been in the graftstate.
3387 if not (cont or opts.get('force')):
3387 if not (cont or opts.get('force')):
3388 # check for ancestors of dest branch
3388 # check for ancestors of dest branch
3389 crev = repo['.'].rev()
3389 crev = repo['.'].rev()
3390 ancestors = repo.changelog.ancestors([crev], inclusive=True)
3390 ancestors = repo.changelog.ancestors([crev], inclusive=True)
3391 # Cannot use x.remove(y) on smart set, this has to be a list.
3391 # Cannot use x.remove(y) on smart set, this has to be a list.
3392 # XXX make this lazy in the future
3392 # XXX make this lazy in the future
3393 revs = list(revs)
3393 revs = list(revs)
3394 # don't mutate while iterating, create a copy
3394 # don't mutate while iterating, create a copy
3395 for rev in list(revs):
3395 for rev in list(revs):
3396 if rev in ancestors:
3396 if rev in ancestors:
3397 ui.warn(_('skipping ancestor revision %s\n') % rev)
3397 ui.warn(_('skipping ancestor revision %s\n') % rev)
3398 # XXX remove on list is slow
3398 # XXX remove on list is slow
3399 revs.remove(rev)
3399 revs.remove(rev)
3400 if not revs:
3400 if not revs:
3401 return -1
3401 return -1
3402
3402
3403 # analyze revs for earlier grafts
3403 # analyze revs for earlier grafts
3404 ids = {}
3404 ids = {}
3405 for ctx in repo.set("%ld", revs):
3405 for ctx in repo.set("%ld", revs):
3406 ids[ctx.hex()] = ctx.rev()
3406 ids[ctx.hex()] = ctx.rev()
3407 n = ctx.extra().get('source')
3407 n = ctx.extra().get('source')
3408 if n:
3408 if n:
3409 ids[n] = ctx.rev()
3409 ids[n] = ctx.rev()
3410
3410
3411 # check ancestors for earlier grafts
3411 # check ancestors for earlier grafts
3412 ui.debug('scanning for duplicate grafts\n')
3412 ui.debug('scanning for duplicate grafts\n')
3413
3413
3414 for rev in repo.changelog.findmissingrevs(revs, [crev]):
3414 for rev in repo.changelog.findmissingrevs(revs, [crev]):
3415 ctx = repo[rev]
3415 ctx = repo[rev]
3416 n = ctx.extra().get('source')
3416 n = ctx.extra().get('source')
3417 if n in ids:
3417 if n in ids:
3418 try:
3418 try:
3419 r = repo[n].rev()
3419 r = repo[n].rev()
3420 except error.RepoLookupError:
3420 except error.RepoLookupError:
3421 r = None
3421 r = None
3422 if r in revs:
3422 if r in revs:
3423 ui.warn(_('skipping revision %s (already grafted to %s)\n')
3423 ui.warn(_('skipping revision %s (already grafted to %s)\n')
3424 % (r, rev))
3424 % (r, rev))
3425 revs.remove(r)
3425 revs.remove(r)
3426 elif ids[n] in revs:
3426 elif ids[n] in revs:
3427 if r is None:
3427 if r is None:
3428 ui.warn(_('skipping already grafted revision %s '
3428 ui.warn(_('skipping already grafted revision %s '
3429 '(%s also has unknown origin %s)\n')
3429 '(%s also has unknown origin %s)\n')
3430 % (ids[n], rev, n))
3430 % (ids[n], rev, n))
3431 else:
3431 else:
3432 ui.warn(_('skipping already grafted revision %s '
3432 ui.warn(_('skipping already grafted revision %s '
3433 '(%s also has origin %d)\n')
3433 '(%s also has origin %d)\n')
3434 % (ids[n], rev, r))
3434 % (ids[n], rev, r))
3435 revs.remove(ids[n])
3435 revs.remove(ids[n])
3436 elif ctx.hex() in ids:
3436 elif ctx.hex() in ids:
3437 r = ids[ctx.hex()]
3437 r = ids[ctx.hex()]
3438 ui.warn(_('skipping already grafted revision %s '
3438 ui.warn(_('skipping already grafted revision %s '
3439 '(was grafted from %d)\n') % (r, rev))
3439 '(was grafted from %d)\n') % (r, rev))
3440 revs.remove(r)
3440 revs.remove(r)
3441 if not revs:
3441 if not revs:
3442 return -1
3442 return -1
3443
3443
3444 wlock = repo.wlock()
3444 wlock = repo.wlock()
3445 try:
3445 try:
3446 current = repo['.']
3446 current = repo['.']
3447 for pos, ctx in enumerate(repo.set("%ld", revs)):
3447 for pos, ctx in enumerate(repo.set("%ld", revs)):
3448
3448
3449 ui.status(_('grafting revision %s\n') % ctx.rev())
3449 ui.status(_('grafting revision %s\n') % ctx.rev())
3450 if opts.get('dry_run'):
3450 if opts.get('dry_run'):
3451 continue
3451 continue
3452
3452
3453 source = ctx.extra().get('source')
3453 source = ctx.extra().get('source')
3454 if not source:
3454 if not source:
3455 source = ctx.hex()
3455 source = ctx.hex()
3456 extra = {'source': source}
3456 extra = {'source': source}
3457 user = ctx.user()
3457 user = ctx.user()
3458 if opts.get('user'):
3458 if opts.get('user'):
3459 user = opts['user']
3459 user = opts['user']
3460 date = ctx.date()
3460 date = ctx.date()
3461 if opts.get('date'):
3461 if opts.get('date'):
3462 date = opts['date']
3462 date = opts['date']
3463 message = ctx.description()
3463 message = ctx.description()
3464 if opts.get('log'):
3464 if opts.get('log'):
3465 message += '\n(grafted from %s)' % ctx.hex()
3465 message += '\n(grafted from %s)' % ctx.hex()
3466
3466
3467 # we don't merge the first commit when continuing
3467 # we don't merge the first commit when continuing
3468 if not cont:
3468 if not cont:
3469 # perform the graft merge with p1(rev) as 'ancestor'
3469 # perform the graft merge with p1(rev) as 'ancestor'
3470 try:
3470 try:
3471 # ui.forcemerge is an internal variable, do not document
3471 # ui.forcemerge is an internal variable, do not document
3472 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
3472 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
3473 'graft')
3473 'graft')
3474 stats = mergemod.update(repo, ctx.node(), True, True, False,
3474 stats = mergemod.update(repo, ctx.node(), True, True, False,
3475 ctx.p1().node(),
3475 ctx.p1().node(),
3476 labels=['local', 'graft'])
3476 labels=['local', 'graft'])
3477 finally:
3477 finally:
3478 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
3478 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
3479 # report any conflicts
3479 # report any conflicts
3480 if stats and stats[3] > 0:
3480 if stats and stats[3] > 0:
3481 # write out state for --continue
3481 # write out state for --continue
3482 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
3482 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
3483 repo.opener.write('graftstate', ''.join(nodelines))
3483 repo.opener.write('graftstate', ''.join(nodelines))
3484 raise util.Abort(
3484 raise util.Abort(
3485 _("unresolved conflicts, can't continue"),
3485 _("unresolved conflicts, can't continue"),
3486 hint=_('use hg resolve and hg graft --continue'))
3486 hint=_('use hg resolve and hg graft --continue'))
3487 else:
3487 else:
3488 cont = False
3488 cont = False
3489
3489
3490 # drop the second merge parent
3490 # drop the second merge parent
3491 repo.dirstate.beginparentchange()
3491 repo.dirstate.beginparentchange()
3492 repo.setparents(current.node(), nullid)
3492 repo.setparents(current.node(), nullid)
3493 repo.dirstate.write()
3493 repo.dirstate.write()
3494 # fix up dirstate for copies and renames
3494 # fix up dirstate for copies and renames
3495 cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev())
3495 cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev())
3496 repo.dirstate.endparentchange()
3496 repo.dirstate.endparentchange()
3497
3497
3498 # commit
3498 # commit
3499 node = repo.commit(text=message, user=user,
3499 node = repo.commit(text=message, user=user,
3500 date=date, extra=extra, editor=editor)
3500 date=date, extra=extra, editor=editor)
3501 if node is None:
3501 if node is None:
3502 ui.status(_('graft for revision %s is empty\n') % ctx.rev())
3502 ui.status(_('graft for revision %s is empty\n') % ctx.rev())
3503 else:
3503 else:
3504 current = repo[node]
3504 current = repo[node]
3505 finally:
3505 finally:
3506 wlock.release()
3506 wlock.release()
3507
3507
3508 # remove state when we complete successfully
3508 # remove state when we complete successfully
3509 if not opts.get('dry_run'):
3509 if not opts.get('dry_run'):
3510 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
3510 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
3511
3511
3512 return 0
3512 return 0
3513
3513
3514 @command('grep',
3514 @command('grep',
3515 [('0', 'print0', None, _('end fields with NUL')),
3515 [('0', 'print0', None, _('end fields with NUL')),
3516 ('', 'all', None, _('print all revisions that match')),
3516 ('', 'all', None, _('print all revisions that match')),
3517 ('a', 'text', None, _('treat all files as text')),
3517 ('a', 'text', None, _('treat all files as text')),
3518 ('f', 'follow', None,
3518 ('f', 'follow', None,
3519 _('follow changeset history,'
3519 _('follow changeset history,'
3520 ' or file history across copies and renames')),
3520 ' or file history across copies and renames')),
3521 ('i', 'ignore-case', None, _('ignore case when matching')),
3521 ('i', 'ignore-case', None, _('ignore case when matching')),
3522 ('l', 'files-with-matches', None,
3522 ('l', 'files-with-matches', None,
3523 _('print only filenames and revisions that match')),
3523 _('print only filenames and revisions that match')),
3524 ('n', 'line-number', None, _('print matching line numbers')),
3524 ('n', 'line-number', None, _('print matching line numbers')),
3525 ('r', 'rev', [],
3525 ('r', 'rev', [],
3526 _('only search files changed within revision range'), _('REV')),
3526 _('only search files changed within revision range'), _('REV')),
3527 ('u', 'user', None, _('list the author (long with -v)')),
3527 ('u', 'user', None, _('list the author (long with -v)')),
3528 ('d', 'date', None, _('list the date (short with -q)')),
3528 ('d', 'date', None, _('list the date (short with -q)')),
3529 ] + walkopts,
3529 ] + walkopts,
3530 _('[OPTION]... PATTERN [FILE]...'),
3530 _('[OPTION]... PATTERN [FILE]...'),
3531 inferrepo=True)
3531 inferrepo=True)
3532 def grep(ui, repo, pattern, *pats, **opts):
3532 def grep(ui, repo, pattern, *pats, **opts):
3533 """search for a pattern in specified files and revisions
3533 """search for a pattern in specified files and revisions
3534
3534
3535 Search revisions of files for a regular expression.
3535 Search revisions of files for a regular expression.
3536
3536
3537 This command behaves differently than Unix grep. It only accepts
3537 This command behaves differently than Unix grep. It only accepts
3538 Python/Perl regexps. It searches repository history, not the
3538 Python/Perl regexps. It searches repository history, not the
3539 working directory. It always prints the revision number in which a
3539 working directory. It always prints the revision number in which a
3540 match appears.
3540 match appears.
3541
3541
3542 By default, grep only prints output for the first revision of a
3542 By default, grep only prints output for the first revision of a
3543 file in which it finds a match. To get it to print every revision
3543 file in which it finds a match. To get it to print every revision
3544 that contains a change in match status ("-" for a match that
3544 that contains a change in match status ("-" for a match that
3545 becomes a non-match, or "+" for a non-match that becomes a match),
3545 becomes a non-match, or "+" for a non-match that becomes a match),
3546 use the --all flag.
3546 use the --all flag.
3547
3547
3548 Returns 0 if a match is found, 1 otherwise.
3548 Returns 0 if a match is found, 1 otherwise.
3549 """
3549 """
3550 reflags = re.M
3550 reflags = re.M
3551 if opts.get('ignore_case'):
3551 if opts.get('ignore_case'):
3552 reflags |= re.I
3552 reflags |= re.I
3553 try:
3553 try:
3554 regexp = util.re.compile(pattern, reflags)
3554 regexp = util.re.compile(pattern, reflags)
3555 except re.error, inst:
3555 except re.error, inst:
3556 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
3556 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
3557 return 1
3557 return 1
3558 sep, eol = ':', '\n'
3558 sep, eol = ':', '\n'
3559 if opts.get('print0'):
3559 if opts.get('print0'):
3560 sep = eol = '\0'
3560 sep = eol = '\0'
3561
3561
3562 getfile = util.lrucachefunc(repo.file)
3562 getfile = util.lrucachefunc(repo.file)
3563
3563
3564 def matchlines(body):
3564 def matchlines(body):
3565 begin = 0
3565 begin = 0
3566 linenum = 0
3566 linenum = 0
3567 while begin < len(body):
3567 while begin < len(body):
3568 match = regexp.search(body, begin)
3568 match = regexp.search(body, begin)
3569 if not match:
3569 if not match:
3570 break
3570 break
3571 mstart, mend = match.span()
3571 mstart, mend = match.span()
3572 linenum += body.count('\n', begin, mstart) + 1
3572 linenum += body.count('\n', begin, mstart) + 1
3573 lstart = body.rfind('\n', begin, mstart) + 1 or begin
3573 lstart = body.rfind('\n', begin, mstart) + 1 or begin
3574 begin = body.find('\n', mend) + 1 or len(body) + 1
3574 begin = body.find('\n', mend) + 1 or len(body) + 1
3575 lend = begin - 1
3575 lend = begin - 1
3576 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3576 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3577
3577
3578 class linestate(object):
3578 class linestate(object):
3579 def __init__(self, line, linenum, colstart, colend):
3579 def __init__(self, line, linenum, colstart, colend):
3580 self.line = line
3580 self.line = line
3581 self.linenum = linenum
3581 self.linenum = linenum
3582 self.colstart = colstart
3582 self.colstart = colstart
3583 self.colend = colend
3583 self.colend = colend
3584
3584
3585 def __hash__(self):
3585 def __hash__(self):
3586 return hash((self.linenum, self.line))
3586 return hash((self.linenum, self.line))
3587
3587
3588 def __eq__(self, other):
3588 def __eq__(self, other):
3589 return self.line == other.line
3589 return self.line == other.line
3590
3590
3591 def __iter__(self):
3591 def __iter__(self):
3592 yield (self.line[:self.colstart], '')
3592 yield (self.line[:self.colstart], '')
3593 yield (self.line[self.colstart:self.colend], 'grep.match')
3593 yield (self.line[self.colstart:self.colend], 'grep.match')
3594 rest = self.line[self.colend:]
3594 rest = self.line[self.colend:]
3595 while rest != '':
3595 while rest != '':
3596 match = regexp.search(rest)
3596 match = regexp.search(rest)
3597 if not match:
3597 if not match:
3598 yield (rest, '')
3598 yield (rest, '')
3599 break
3599 break
3600 mstart, mend = match.span()
3600 mstart, mend = match.span()
3601 yield (rest[:mstart], '')
3601 yield (rest[:mstart], '')
3602 yield (rest[mstart:mend], 'grep.match')
3602 yield (rest[mstart:mend], 'grep.match')
3603 rest = rest[mend:]
3603 rest = rest[mend:]
3604
3604
3605 matches = {}
3605 matches = {}
3606 copies = {}
3606 copies = {}
3607 def grepbody(fn, rev, body):
3607 def grepbody(fn, rev, body):
3608 matches[rev].setdefault(fn, [])
3608 matches[rev].setdefault(fn, [])
3609 m = matches[rev][fn]
3609 m = matches[rev][fn]
3610 for lnum, cstart, cend, line in matchlines(body):
3610 for lnum, cstart, cend, line in matchlines(body):
3611 s = linestate(line, lnum, cstart, cend)
3611 s = linestate(line, lnum, cstart, cend)
3612 m.append(s)
3612 m.append(s)
3613
3613
3614 def difflinestates(a, b):
3614 def difflinestates(a, b):
3615 sm = difflib.SequenceMatcher(None, a, b)
3615 sm = difflib.SequenceMatcher(None, a, b)
3616 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3616 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3617 if tag == 'insert':
3617 if tag == 'insert':
3618 for i in xrange(blo, bhi):
3618 for i in xrange(blo, bhi):
3619 yield ('+', b[i])
3619 yield ('+', b[i])
3620 elif tag == 'delete':
3620 elif tag == 'delete':
3621 for i in xrange(alo, ahi):
3621 for i in xrange(alo, ahi):
3622 yield ('-', a[i])
3622 yield ('-', a[i])
3623 elif tag == 'replace':
3623 elif tag == 'replace':
3624 for i in xrange(alo, ahi):
3624 for i in xrange(alo, ahi):
3625 yield ('-', a[i])
3625 yield ('-', a[i])
3626 for i in xrange(blo, bhi):
3626 for i in xrange(blo, bhi):
3627 yield ('+', b[i])
3627 yield ('+', b[i])
3628
3628
3629 def display(fn, ctx, pstates, states):
3629 def display(fn, ctx, pstates, states):
3630 rev = ctx.rev()
3630 rev = ctx.rev()
3631 datefunc = ui.quiet and util.shortdate or util.datestr
3631 datefunc = ui.quiet and util.shortdate or util.datestr
3632 found = False
3632 found = False
3633 @util.cachefunc
3633 @util.cachefunc
3634 def binary():
3634 def binary():
3635 flog = getfile(fn)
3635 flog = getfile(fn)
3636 return util.binary(flog.read(ctx.filenode(fn)))
3636 return util.binary(flog.read(ctx.filenode(fn)))
3637
3637
3638 if opts.get('all'):
3638 if opts.get('all'):
3639 iter = difflinestates(pstates, states)
3639 iter = difflinestates(pstates, states)
3640 else:
3640 else:
3641 iter = [('', l) for l in states]
3641 iter = [('', l) for l in states]
3642 for change, l in iter:
3642 for change, l in iter:
3643 cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')]
3643 cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')]
3644
3644
3645 if opts.get('line_number'):
3645 if opts.get('line_number'):
3646 cols.append((str(l.linenum), 'grep.linenumber'))
3646 cols.append((str(l.linenum), 'grep.linenumber'))
3647 if opts.get('all'):
3647 if opts.get('all'):
3648 cols.append((change, 'grep.change'))
3648 cols.append((change, 'grep.change'))
3649 if opts.get('user'):
3649 if opts.get('user'):
3650 cols.append((ui.shortuser(ctx.user()), 'grep.user'))
3650 cols.append((ui.shortuser(ctx.user()), 'grep.user'))
3651 if opts.get('date'):
3651 if opts.get('date'):
3652 cols.append((datefunc(ctx.date()), 'grep.date'))
3652 cols.append((datefunc(ctx.date()), 'grep.date'))
3653 for col, label in cols[:-1]:
3653 for col, label in cols[:-1]:
3654 ui.write(col, label=label)
3654 ui.write(col, label=label)
3655 ui.write(sep, label='grep.sep')
3655 ui.write(sep, label='grep.sep')
3656 ui.write(cols[-1][0], label=cols[-1][1])
3656 ui.write(cols[-1][0], label=cols[-1][1])
3657 if not opts.get('files_with_matches'):
3657 if not opts.get('files_with_matches'):
3658 ui.write(sep, label='grep.sep')
3658 ui.write(sep, label='grep.sep')
3659 if not opts.get('text') and binary():
3659 if not opts.get('text') and binary():
3660 ui.write(" Binary file matches")
3660 ui.write(" Binary file matches")
3661 else:
3661 else:
3662 for s, label in l:
3662 for s, label in l:
3663 ui.write(s, label=label)
3663 ui.write(s, label=label)
3664 ui.write(eol)
3664 ui.write(eol)
3665 found = True
3665 found = True
3666 if opts.get('files_with_matches'):
3666 if opts.get('files_with_matches'):
3667 break
3667 break
3668 return found
3668 return found
3669
3669
3670 skip = {}
3670 skip = {}
3671 revfiles = {}
3671 revfiles = {}
3672 matchfn = scmutil.match(repo[None], pats, opts)
3672 matchfn = scmutil.match(repo[None], pats, opts)
3673 found = False
3673 found = False
3674 follow = opts.get('follow')
3674 follow = opts.get('follow')
3675
3675
3676 def prep(ctx, fns):
3676 def prep(ctx, fns):
3677 rev = ctx.rev()
3677 rev = ctx.rev()
3678 pctx = ctx.p1()
3678 pctx = ctx.p1()
3679 parent = pctx.rev()
3679 parent = pctx.rev()
3680 matches.setdefault(rev, {})
3680 matches.setdefault(rev, {})
3681 matches.setdefault(parent, {})
3681 matches.setdefault(parent, {})
3682 files = revfiles.setdefault(rev, [])
3682 files = revfiles.setdefault(rev, [])
3683 for fn in fns:
3683 for fn in fns:
3684 flog = getfile(fn)
3684 flog = getfile(fn)
3685 try:
3685 try:
3686 fnode = ctx.filenode(fn)
3686 fnode = ctx.filenode(fn)
3687 except error.LookupError:
3687 except error.LookupError:
3688 continue
3688 continue
3689
3689
3690 copied = flog.renamed(fnode)
3690 copied = flog.renamed(fnode)
3691 copy = follow and copied and copied[0]
3691 copy = follow and copied and copied[0]
3692 if copy:
3692 if copy:
3693 copies.setdefault(rev, {})[fn] = copy
3693 copies.setdefault(rev, {})[fn] = copy
3694 if fn in skip:
3694 if fn in skip:
3695 if copy:
3695 if copy:
3696 skip[copy] = True
3696 skip[copy] = True
3697 continue
3697 continue
3698 files.append(fn)
3698 files.append(fn)
3699
3699
3700 if fn not in matches[rev]:
3700 if fn not in matches[rev]:
3701 grepbody(fn, rev, flog.read(fnode))
3701 grepbody(fn, rev, flog.read(fnode))
3702
3702
3703 pfn = copy or fn
3703 pfn = copy or fn
3704 if pfn not in matches[parent]:
3704 if pfn not in matches[parent]:
3705 try:
3705 try:
3706 fnode = pctx.filenode(pfn)
3706 fnode = pctx.filenode(pfn)
3707 grepbody(pfn, parent, flog.read(fnode))
3707 grepbody(pfn, parent, flog.read(fnode))
3708 except error.LookupError:
3708 except error.LookupError:
3709 pass
3709 pass
3710
3710
3711 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
3711 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
3712 rev = ctx.rev()
3712 rev = ctx.rev()
3713 parent = ctx.p1().rev()
3713 parent = ctx.p1().rev()
3714 for fn in sorted(revfiles.get(rev, [])):
3714 for fn in sorted(revfiles.get(rev, [])):
3715 states = matches[rev][fn]
3715 states = matches[rev][fn]
3716 copy = copies.get(rev, {}).get(fn)
3716 copy = copies.get(rev, {}).get(fn)
3717 if fn in skip:
3717 if fn in skip:
3718 if copy:
3718 if copy:
3719 skip[copy] = True
3719 skip[copy] = True
3720 continue
3720 continue
3721 pstates = matches.get(parent, {}).get(copy or fn, [])
3721 pstates = matches.get(parent, {}).get(copy or fn, [])
3722 if pstates or states:
3722 if pstates or states:
3723 r = display(fn, ctx, pstates, states)
3723 r = display(fn, ctx, pstates, states)
3724 found = found or r
3724 found = found or r
3725 if r and not opts.get('all'):
3725 if r and not opts.get('all'):
3726 skip[fn] = True
3726 skip[fn] = True
3727 if copy:
3727 if copy:
3728 skip[copy] = True
3728 skip[copy] = True
3729 del matches[rev]
3729 del matches[rev]
3730 del revfiles[rev]
3730 del revfiles[rev]
3731
3731
3732 return not found
3732 return not found
3733
3733
3734 @command('heads',
3734 @command('heads',
3735 [('r', 'rev', '',
3735 [('r', 'rev', '',
3736 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
3736 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
3737 ('t', 'topo', False, _('show topological heads only')),
3737 ('t', 'topo', False, _('show topological heads only')),
3738 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
3738 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
3739 ('c', 'closed', False, _('show normal and closed branch heads')),
3739 ('c', 'closed', False, _('show normal and closed branch heads')),
3740 ] + templateopts,
3740 ] + templateopts,
3741 _('[-ct] [-r STARTREV] [REV]...'))
3741 _('[-ct] [-r STARTREV] [REV]...'))
3742 def heads(ui, repo, *branchrevs, **opts):
3742 def heads(ui, repo, *branchrevs, **opts):
3743 """show branch heads
3743 """show branch heads
3744
3744
3745 With no arguments, show all open branch heads in the repository.
3745 With no arguments, show all open branch heads in the repository.
3746 Branch heads are changesets that have no descendants on the
3746 Branch heads are changesets that have no descendants on the
3747 same branch. They are where development generally takes place and
3747 same branch. They are where development generally takes place and
3748 are the usual targets for update and merge operations.
3748 are the usual targets for update and merge operations.
3749
3749
3750 If one or more REVs are given, only open branch heads on the
3750 If one or more REVs are given, only open branch heads on the
3751 branches associated with the specified changesets are shown. This
3751 branches associated with the specified changesets are shown. This
3752 means that you can use :hg:`heads .` to see the heads on the
3752 means that you can use :hg:`heads .` to see the heads on the
3753 currently checked-out branch.
3753 currently checked-out branch.
3754
3754
3755 If -c/--closed is specified, also show branch heads marked closed
3755 If -c/--closed is specified, also show branch heads marked closed
3756 (see :hg:`commit --close-branch`).
3756 (see :hg:`commit --close-branch`).
3757
3757
3758 If STARTREV is specified, only those heads that are descendants of
3758 If STARTREV is specified, only those heads that are descendants of
3759 STARTREV will be displayed.
3759 STARTREV will be displayed.
3760
3760
3761 If -t/--topo is specified, named branch mechanics will be ignored and only
3761 If -t/--topo is specified, named branch mechanics will be ignored and only
3762 topological heads (changesets with no children) will be shown.
3762 topological heads (changesets with no children) will be shown.
3763
3763
3764 Returns 0 if matching heads are found, 1 if not.
3764 Returns 0 if matching heads are found, 1 if not.
3765 """
3765 """
3766
3766
3767 start = None
3767 start = None
3768 if 'rev' in opts:
3768 if 'rev' in opts:
3769 start = scmutil.revsingle(repo, opts['rev'], None).node()
3769 start = scmutil.revsingle(repo, opts['rev'], None).node()
3770
3770
3771 if opts.get('topo'):
3771 if opts.get('topo'):
3772 heads = [repo[h] for h in repo.heads(start)]
3772 heads = [repo[h] for h in repo.heads(start)]
3773 else:
3773 else:
3774 heads = []
3774 heads = []
3775 for branch in repo.branchmap():
3775 for branch in repo.branchmap():
3776 heads += repo.branchheads(branch, start, opts.get('closed'))
3776 heads += repo.branchheads(branch, start, opts.get('closed'))
3777 heads = [repo[h] for h in heads]
3777 heads = [repo[h] for h in heads]
3778
3778
3779 if branchrevs:
3779 if branchrevs:
3780 branches = set(repo[br].branch() for br in branchrevs)
3780 branches = set(repo[br].branch() for br in branchrevs)
3781 heads = [h for h in heads if h.branch() in branches]
3781 heads = [h for h in heads if h.branch() in branches]
3782
3782
3783 if opts.get('active') and branchrevs:
3783 if opts.get('active') and branchrevs:
3784 dagheads = repo.heads(start)
3784 dagheads = repo.heads(start)
3785 heads = [h for h in heads if h.node() in dagheads]
3785 heads = [h for h in heads if h.node() in dagheads]
3786
3786
3787 if branchrevs:
3787 if branchrevs:
3788 haveheads = set(h.branch() for h in heads)
3788 haveheads = set(h.branch() for h in heads)
3789 if branches - haveheads:
3789 if branches - haveheads:
3790 headless = ', '.join(b for b in branches - haveheads)
3790 headless = ', '.join(b for b in branches - haveheads)
3791 msg = _('no open branch heads found on branches %s')
3791 msg = _('no open branch heads found on branches %s')
3792 if opts.get('rev'):
3792 if opts.get('rev'):
3793 msg += _(' (started at %s)') % opts['rev']
3793 msg += _(' (started at %s)') % opts['rev']
3794 ui.warn((msg + '\n') % headless)
3794 ui.warn((msg + '\n') % headless)
3795
3795
3796 if not heads:
3796 if not heads:
3797 return 1
3797 return 1
3798
3798
3799 heads = sorted(heads, key=lambda x: -x.rev())
3799 heads = sorted(heads, key=lambda x: -x.rev())
3800 displayer = cmdutil.show_changeset(ui, repo, opts)
3800 displayer = cmdutil.show_changeset(ui, repo, opts)
3801 for ctx in heads:
3801 for ctx in heads:
3802 displayer.show(ctx)
3802 displayer.show(ctx)
3803 displayer.close()
3803 displayer.close()
3804
3804
3805 @command('help',
3805 @command('help',
3806 [('e', 'extension', None, _('show only help for extensions')),
3806 [('e', 'extension', None, _('show only help for extensions')),
3807 ('c', 'command', None, _('show only help for commands')),
3807 ('c', 'command', None, _('show only help for commands')),
3808 ('k', 'keyword', '', _('show topics matching keyword')),
3808 ('k', 'keyword', '', _('show topics matching keyword')),
3809 ],
3809 ],
3810 _('[-ec] [TOPIC]'),
3810 _('[-ec] [TOPIC]'),
3811 norepo=True)
3811 norepo=True)
3812 def help_(ui, name=None, **opts):
3812 def help_(ui, name=None, **opts):
3813 """show help for a given topic or a help overview
3813 """show help for a given topic or a help overview
3814
3814
3815 With no arguments, print a list of commands with short help messages.
3815 With no arguments, print a list of commands with short help messages.
3816
3816
3817 Given a topic, extension, or command name, print help for that
3817 Given a topic, extension, or command name, print help for that
3818 topic.
3818 topic.
3819
3819
3820 Returns 0 if successful.
3820 Returns 0 if successful.
3821 """
3821 """
3822
3822
3823 textwidth = min(ui.termwidth(), 80) - 2
3823 textwidth = min(ui.termwidth(), 80) - 2
3824
3824
3825 keep = []
3825 keep = []
3826 if ui.verbose:
3826 if ui.verbose:
3827 keep.append('verbose')
3827 keep.append('verbose')
3828 if sys.platform.startswith('win'):
3828 if sys.platform.startswith('win'):
3829 keep.append('windows')
3829 keep.append('windows')
3830 elif sys.platform == 'OpenVMS':
3830 elif sys.platform == 'OpenVMS':
3831 keep.append('vms')
3831 keep.append('vms')
3832 elif sys.platform == 'plan9':
3832 elif sys.platform == 'plan9':
3833 keep.append('plan9')
3833 keep.append('plan9')
3834 else:
3834 else:
3835 keep.append('unix')
3835 keep.append('unix')
3836 keep.append(sys.platform.lower())
3836 keep.append(sys.platform.lower())
3837
3837
3838 section = None
3838 section = None
3839 if name and '.' in name:
3839 if name and '.' in name:
3840 name, section = name.split('.')
3840 name, section = name.split('.')
3841
3841
3842 text = help.help_(ui, name, **opts)
3842 text = help.help_(ui, name, **opts)
3843
3843
3844 formatted, pruned = minirst.format(text, textwidth, keep=keep,
3844 formatted, pruned = minirst.format(text, textwidth, keep=keep,
3845 section=section)
3845 section=section)
3846 if section and not formatted:
3846 if section and not formatted:
3847 raise util.Abort(_("help section not found"))
3847 raise util.Abort(_("help section not found"))
3848
3848
3849 if 'verbose' in pruned:
3849 if 'verbose' in pruned:
3850 keep.append('omitted')
3850 keep.append('omitted')
3851 else:
3851 else:
3852 keep.append('notomitted')
3852 keep.append('notomitted')
3853 formatted, pruned = minirst.format(text, textwidth, keep=keep,
3853 formatted, pruned = minirst.format(text, textwidth, keep=keep,
3854 section=section)
3854 section=section)
3855 ui.write(formatted)
3855 ui.write(formatted)
3856
3856
3857
3857
3858 @command('identify|id',
3858 @command('identify|id',
3859 [('r', 'rev', '',
3859 [('r', 'rev', '',
3860 _('identify the specified revision'), _('REV')),
3860 _('identify the specified revision'), _('REV')),
3861 ('n', 'num', None, _('show local revision number')),
3861 ('n', 'num', None, _('show local revision number')),
3862 ('i', 'id', None, _('show global revision id')),
3862 ('i', 'id', None, _('show global revision id')),
3863 ('b', 'branch', None, _('show branch')),
3863 ('b', 'branch', None, _('show branch')),
3864 ('t', 'tags', None, _('show tags')),
3864 ('t', 'tags', None, _('show tags')),
3865 ('B', 'bookmarks', None, _('show bookmarks')),
3865 ('B', 'bookmarks', None, _('show bookmarks')),
3866 ] + remoteopts,
3866 ] + remoteopts,
3867 _('[-nibtB] [-r REV] [SOURCE]'),
3867 _('[-nibtB] [-r REV] [SOURCE]'),
3868 optionalrepo=True)
3868 optionalrepo=True)
3869 def identify(ui, repo, source=None, rev=None,
3869 def identify(ui, repo, source=None, rev=None,
3870 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
3870 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
3871 """identify the working copy or specified revision
3871 """identify the working copy or specified revision
3872
3872
3873 Print a summary identifying the repository state at REV using one or
3873 Print a summary identifying the repository state at REV using one or
3874 two parent hash identifiers, followed by a "+" if the working
3874 two parent hash identifiers, followed by a "+" if the working
3875 directory has uncommitted changes, the branch name (if not default),
3875 directory has uncommitted changes, the branch name (if not default),
3876 a list of tags, and a list of bookmarks.
3876 a list of tags, and a list of bookmarks.
3877
3877
3878 When REV is not given, print a summary of the current state of the
3878 When REV is not given, print a summary of the current state of the
3879 repository.
3879 repository.
3880
3880
3881 Specifying a path to a repository root or Mercurial bundle will
3881 Specifying a path to a repository root or Mercurial bundle will
3882 cause lookup to operate on that repository/bundle.
3882 cause lookup to operate on that repository/bundle.
3883
3883
3884 .. container:: verbose
3884 .. container:: verbose
3885
3885
3886 Examples:
3886 Examples:
3887
3887
3888 - generate a build identifier for the working directory::
3888 - generate a build identifier for the working directory::
3889
3889
3890 hg id --id > build-id.dat
3890 hg id --id > build-id.dat
3891
3891
3892 - find the revision corresponding to a tag::
3892 - find the revision corresponding to a tag::
3893
3893
3894 hg id -n -r 1.3
3894 hg id -n -r 1.3
3895
3895
3896 - check the most recent revision of a remote repository::
3896 - check the most recent revision of a remote repository::
3897
3897
3898 hg id -r tip http://selenic.com/hg/
3898 hg id -r tip http://selenic.com/hg/
3899
3899
3900 Returns 0 if successful.
3900 Returns 0 if successful.
3901 """
3901 """
3902
3902
3903 if not repo and not source:
3903 if not repo and not source:
3904 raise util.Abort(_("there is no Mercurial repository here "
3904 raise util.Abort(_("there is no Mercurial repository here "
3905 "(.hg not found)"))
3905 "(.hg not found)"))
3906
3906
3907 hexfunc = ui.debugflag and hex or short
3907 hexfunc = ui.debugflag and hex or short
3908 default = not (num or id or branch or tags or bookmarks)
3908 default = not (num or id or branch or tags or bookmarks)
3909 output = []
3909 output = []
3910 revs = []
3910 revs = []
3911
3911
3912 if source:
3912 if source:
3913 source, branches = hg.parseurl(ui.expandpath(source))
3913 source, branches = hg.parseurl(ui.expandpath(source))
3914 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3914 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3915 repo = peer.local()
3915 repo = peer.local()
3916 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3916 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3917
3917
3918 if not repo:
3918 if not repo:
3919 if num or branch or tags:
3919 if num or branch or tags:
3920 raise util.Abort(
3920 raise util.Abort(
3921 _("can't query remote revision number, branch, or tags"))
3921 _("can't query remote revision number, branch, or tags"))
3922 if not rev and revs:
3922 if not rev and revs:
3923 rev = revs[0]
3923 rev = revs[0]
3924 if not rev:
3924 if not rev:
3925 rev = "tip"
3925 rev = "tip"
3926
3926
3927 remoterev = peer.lookup(rev)
3927 remoterev = peer.lookup(rev)
3928 if default or id:
3928 if default or id:
3929 output = [hexfunc(remoterev)]
3929 output = [hexfunc(remoterev)]
3930
3930
3931 def getbms():
3931 def getbms():
3932 bms = []
3932 bms = []
3933
3933
3934 if 'bookmarks' in peer.listkeys('namespaces'):
3934 if 'bookmarks' in peer.listkeys('namespaces'):
3935 hexremoterev = hex(remoterev)
3935 hexremoterev = hex(remoterev)
3936 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
3936 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
3937 if bmr == hexremoterev]
3937 if bmr == hexremoterev]
3938
3938
3939 return sorted(bms)
3939 return sorted(bms)
3940
3940
3941 if bookmarks:
3941 if bookmarks:
3942 output.extend(getbms())
3942 output.extend(getbms())
3943 elif default and not ui.quiet:
3943 elif default and not ui.quiet:
3944 # multiple bookmarks for a single parent separated by '/'
3944 # multiple bookmarks for a single parent separated by '/'
3945 bm = '/'.join(getbms())
3945 bm = '/'.join(getbms())
3946 if bm:
3946 if bm:
3947 output.append(bm)
3947 output.append(bm)
3948 else:
3948 else:
3949 if not rev:
3949 if not rev:
3950 ctx = repo[None]
3950 ctx = repo[None]
3951 parents = ctx.parents()
3951 parents = ctx.parents()
3952 changed = ""
3952 changed = ""
3953 if default or id or num:
3953 if default or id or num:
3954 if (util.any(repo.status())
3954 if (util.any(repo.status())
3955 or util.any(ctx.sub(s).dirty() for s in ctx.substate)):
3955 or util.any(ctx.sub(s).dirty() for s in ctx.substate)):
3956 changed = '+'
3956 changed = '+'
3957 if default or id:
3957 if default or id:
3958 output = ["%s%s" %
3958 output = ["%s%s" %
3959 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
3959 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
3960 if num:
3960 if num:
3961 output.append("%s%s" %
3961 output.append("%s%s" %
3962 ('+'.join([str(p.rev()) for p in parents]), changed))
3962 ('+'.join([str(p.rev()) for p in parents]), changed))
3963 else:
3963 else:
3964 ctx = scmutil.revsingle(repo, rev)
3964 ctx = scmutil.revsingle(repo, rev)
3965 if default or id:
3965 if default or id:
3966 output = [hexfunc(ctx.node())]
3966 output = [hexfunc(ctx.node())]
3967 if num:
3967 if num:
3968 output.append(str(ctx.rev()))
3968 output.append(str(ctx.rev()))
3969
3969
3970 if default and not ui.quiet:
3970 if default and not ui.quiet:
3971 b = ctx.branch()
3971 b = ctx.branch()
3972 if b != 'default':
3972 if b != 'default':
3973 output.append("(%s)" % b)
3973 output.append("(%s)" % b)
3974
3974
3975 # multiple tags for a single parent separated by '/'
3975 # multiple tags for a single parent separated by '/'
3976 t = '/'.join(ctx.tags())
3976 t = '/'.join(ctx.tags())
3977 if t:
3977 if t:
3978 output.append(t)
3978 output.append(t)
3979
3979
3980 # multiple bookmarks for a single parent separated by '/'
3980 # multiple bookmarks for a single parent separated by '/'
3981 bm = '/'.join(ctx.bookmarks())
3981 bm = '/'.join(ctx.bookmarks())
3982 if bm:
3982 if bm:
3983 output.append(bm)
3983 output.append(bm)
3984 else:
3984 else:
3985 if branch:
3985 if branch:
3986 output.append(ctx.branch())
3986 output.append(ctx.branch())
3987
3987
3988 if tags:
3988 if tags:
3989 output.extend(ctx.tags())
3989 output.extend(ctx.tags())
3990
3990
3991 if bookmarks:
3991 if bookmarks:
3992 output.extend(ctx.bookmarks())
3992 output.extend(ctx.bookmarks())
3993
3993
3994 ui.write("%s\n" % ' '.join(output))
3994 ui.write("%s\n" % ' '.join(output))
3995
3995
3996 @command('import|patch',
3996 @command('import|patch',
3997 [('p', 'strip', 1,
3997 [('p', 'strip', 1,
3998 _('directory strip option for patch. This has the same '
3998 _('directory strip option for patch. This has the same '
3999 'meaning as the corresponding patch option'), _('NUM')),
3999 'meaning as the corresponding patch option'), _('NUM')),
4000 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4000 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
4001 ('e', 'edit', False, _('invoke editor on commit messages')),
4001 ('e', 'edit', False, _('invoke editor on commit messages')),
4002 ('f', 'force', None,
4002 ('f', 'force', None,
4003 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4003 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
4004 ('', 'no-commit', None,
4004 ('', 'no-commit', None,
4005 _("don't commit, just update the working directory")),
4005 _("don't commit, just update the working directory")),
4006 ('', 'bypass', None,
4006 ('', 'bypass', None,
4007 _("apply patch without touching the working directory")),
4007 _("apply patch without touching the working directory")),
4008 ('', 'partial', None,
4008 ('', 'partial', None,
4009 _('commit even if some hunks fail')),
4009 _('commit even if some hunks fail')),
4010 ('', 'exact', None,
4010 ('', 'exact', None,
4011 _('apply patch to the nodes from which it was generated')),
4011 _('apply patch to the nodes from which it was generated')),
4012 ('', 'import-branch', None,
4012 ('', 'import-branch', None,
4013 _('use any branch information in patch (implied by --exact)'))] +
4013 _('use any branch information in patch (implied by --exact)'))] +
4014 commitopts + commitopts2 + similarityopts,
4014 commitopts + commitopts2 + similarityopts,
4015 _('[OPTION]... PATCH...'))
4015 _('[OPTION]... PATCH...'))
4016 def import_(ui, repo, patch1=None, *patches, **opts):
4016 def import_(ui, repo, patch1=None, *patches, **opts):
4017 """import an ordered set of patches
4017 """import an ordered set of patches
4018
4018
4019 Import a list of patches and commit them individually (unless
4019 Import a list of patches and commit them individually (unless
4020 --no-commit is specified).
4020 --no-commit is specified).
4021
4021
4022 Because import first applies changes to the working directory,
4022 Because import first applies changes to the working directory,
4023 import will abort if there are outstanding changes.
4023 import will abort if there are outstanding changes.
4024
4024
4025 You can import a patch straight from a mail message. Even patches
4025 You can import a patch straight from a mail message. Even patches
4026 as attachments work (to use the body part, it must have type
4026 as attachments work (to use the body part, it must have type
4027 text/plain or text/x-patch). From and Subject headers of email
4027 text/plain or text/x-patch). From and Subject headers of email
4028 message are used as default committer and commit message. All
4028 message are used as default committer and commit message. All
4029 text/plain body parts before first diff are added to commit
4029 text/plain body parts before first diff are added to commit
4030 message.
4030 message.
4031
4031
4032 If the imported patch was generated by :hg:`export`, user and
4032 If the imported patch was generated by :hg:`export`, user and
4033 description from patch override values from message headers and
4033 description from patch override values from message headers and
4034 body. Values given on command line with -m/--message and -u/--user
4034 body. Values given on command line with -m/--message and -u/--user
4035 override these.
4035 override these.
4036
4036
4037 If --exact is specified, import will set the working directory to
4037 If --exact is specified, import will set the working directory to
4038 the parent of each patch before applying it, and will abort if the
4038 the parent of each patch before applying it, and will abort if the
4039 resulting changeset has a different ID than the one recorded in
4039 resulting changeset has a different ID than the one recorded in
4040 the patch. This may happen due to character set problems or other
4040 the patch. This may happen due to character set problems or other
4041 deficiencies in the text patch format.
4041 deficiencies in the text patch format.
4042
4042
4043 Use --bypass to apply and commit patches directly to the
4043 Use --bypass to apply and commit patches directly to the
4044 repository, not touching the working directory. Without --exact,
4044 repository, not touching the working directory. Without --exact,
4045 patches will be applied on top of the working directory parent
4045 patches will be applied on top of the working directory parent
4046 revision.
4046 revision.
4047
4047
4048 With -s/--similarity, hg will attempt to discover renames and
4048 With -s/--similarity, hg will attempt to discover renames and
4049 copies in the patch in the same way as :hg:`addremove`.
4049 copies in the patch in the same way as :hg:`addremove`.
4050
4050
4051 Use --partial to ensure a changeset will be created from the patch
4051 Use --partial to ensure a changeset will be created from the patch
4052 even if some hunks fail to apply. Hunks that fail to apply will be
4052 even if some hunks fail to apply. Hunks that fail to apply will be
4053 written to a <target-file>.rej file. Conflicts can then be resolved
4053 written to a <target-file>.rej file. Conflicts can then be resolved
4054 by hand before :hg:`commit --amend` is run to update the created
4054 by hand before :hg:`commit --amend` is run to update the created
4055 changeset. This flag exists to let people import patches that
4055 changeset. This flag exists to let people import patches that
4056 partially apply without losing the associated metadata (author,
4056 partially apply without losing the associated metadata (author,
4057 date, description, ...). Note that when none of the hunk applies
4057 date, description, ...). Note that when none of the hunk applies
4058 cleanly, :hg:`import --partial` will create an empty changeset,
4058 cleanly, :hg:`import --partial` will create an empty changeset,
4059 importing only the patch metadata.
4059 importing only the patch metadata.
4060
4060
4061 To read a patch from standard input, use "-" as the patch name. If
4061 To read a patch from standard input, use "-" as the patch name. If
4062 a URL is specified, the patch will be downloaded from it.
4062 a URL is specified, the patch will be downloaded from it.
4063 See :hg:`help dates` for a list of formats valid for -d/--date.
4063 See :hg:`help dates` for a list of formats valid for -d/--date.
4064
4064
4065 .. container:: verbose
4065 .. container:: verbose
4066
4066
4067 Examples:
4067 Examples:
4068
4068
4069 - import a traditional patch from a website and detect renames::
4069 - import a traditional patch from a website and detect renames::
4070
4070
4071 hg import -s 80 http://example.com/bugfix.patch
4071 hg import -s 80 http://example.com/bugfix.patch
4072
4072
4073 - import a changeset from an hgweb server::
4073 - import a changeset from an hgweb server::
4074
4074
4075 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4075 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
4076
4076
4077 - import all the patches in an Unix-style mbox::
4077 - import all the patches in an Unix-style mbox::
4078
4078
4079 hg import incoming-patches.mbox
4079 hg import incoming-patches.mbox
4080
4080
4081 - attempt to exactly restore an exported changeset (not always
4081 - attempt to exactly restore an exported changeset (not always
4082 possible)::
4082 possible)::
4083
4083
4084 hg import --exact proposed-fix.patch
4084 hg import --exact proposed-fix.patch
4085
4085
4086 Returns 0 on success, 1 on partial success (see --partial).
4086 Returns 0 on success, 1 on partial success (see --partial).
4087 """
4087 """
4088
4088
4089 if not patch1:
4089 if not patch1:
4090 raise util.Abort(_('need at least one patch to import'))
4090 raise util.Abort(_('need at least one patch to import'))
4091
4091
4092 patches = (patch1,) + patches
4092 patches = (patch1,) + patches
4093
4093
4094 date = opts.get('date')
4094 date = opts.get('date')
4095 if date:
4095 if date:
4096 opts['date'] = util.parsedate(date)
4096 opts['date'] = util.parsedate(date)
4097
4097
4098 update = not opts.get('bypass')
4098 update = not opts.get('bypass')
4099 if not update and opts.get('no_commit'):
4099 if not update and opts.get('no_commit'):
4100 raise util.Abort(_('cannot use --no-commit with --bypass'))
4100 raise util.Abort(_('cannot use --no-commit with --bypass'))
4101 try:
4101 try:
4102 sim = float(opts.get('similarity') or 0)
4102 sim = float(opts.get('similarity') or 0)
4103 except ValueError:
4103 except ValueError:
4104 raise util.Abort(_('similarity must be a number'))
4104 raise util.Abort(_('similarity must be a number'))
4105 if sim < 0 or sim > 100:
4105 if sim < 0 or sim > 100:
4106 raise util.Abort(_('similarity must be between 0 and 100'))
4106 raise util.Abort(_('similarity must be between 0 and 100'))
4107 if sim and not update:
4107 if sim and not update:
4108 raise util.Abort(_('cannot use --similarity with --bypass'))
4108 raise util.Abort(_('cannot use --similarity with --bypass'))
4109 if opts.get('exact') and opts.get('edit'):
4109 if opts.get('exact') and opts.get('edit'):
4110 raise util.Abort(_('cannot use --exact with --edit'))
4110 raise util.Abort(_('cannot use --exact with --edit'))
4111
4111
4112 if update:
4112 if update:
4113 cmdutil.checkunfinished(repo)
4113 cmdutil.checkunfinished(repo)
4114 if (opts.get('exact') or not opts.get('force')) and update:
4114 if (opts.get('exact') or not opts.get('force')) and update:
4115 cmdutil.bailifchanged(repo)
4115 cmdutil.bailifchanged(repo)
4116
4116
4117 base = opts["base"]
4117 base = opts["base"]
4118 wlock = lock = tr = None
4118 wlock = lock = tr = None
4119 msgs = []
4119 msgs = []
4120 ret = 0
4120 ret = 0
4121
4121
4122
4122
4123 try:
4123 try:
4124 try:
4124 try:
4125 wlock = repo.wlock()
4125 wlock = repo.wlock()
4126 repo.dirstate.beginparentchange()
4126 repo.dirstate.beginparentchange()
4127 if not opts.get('no_commit'):
4127 if not opts.get('no_commit'):
4128 lock = repo.lock()
4128 lock = repo.lock()
4129 tr = repo.transaction('import')
4129 tr = repo.transaction('import')
4130 parents = repo.parents()
4130 parents = repo.parents()
4131 for patchurl in patches:
4131 for patchurl in patches:
4132 if patchurl == '-':
4132 if patchurl == '-':
4133 ui.status(_('applying patch from stdin\n'))
4133 ui.status(_('applying patch from stdin\n'))
4134 patchfile = ui.fin
4134 patchfile = ui.fin
4135 patchurl = 'stdin' # for error message
4135 patchurl = 'stdin' # for error message
4136 else:
4136 else:
4137 patchurl = os.path.join(base, patchurl)
4137 patchurl = os.path.join(base, patchurl)
4138 ui.status(_('applying %s\n') % patchurl)
4138 ui.status(_('applying %s\n') % patchurl)
4139 patchfile = hg.openpath(ui, patchurl)
4139 patchfile = hg.openpath(ui, patchurl)
4140
4140
4141 haspatch = False
4141 haspatch = False
4142 for hunk in patch.split(patchfile):
4142 for hunk in patch.split(patchfile):
4143 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4143 (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk,
4144 parents, opts,
4144 parents, opts,
4145 msgs, hg.clean)
4145 msgs, hg.clean)
4146 if msg:
4146 if msg:
4147 haspatch = True
4147 haspatch = True
4148 ui.note(msg + '\n')
4148 ui.note(msg + '\n')
4149 if update or opts.get('exact'):
4149 if update or opts.get('exact'):
4150 parents = repo.parents()
4150 parents = repo.parents()
4151 else:
4151 else:
4152 parents = [repo[node]]
4152 parents = [repo[node]]
4153 if rej:
4153 if rej:
4154 ui.write_err(_("patch applied partially\n"))
4154 ui.write_err(_("patch applied partially\n"))
4155 ui.write_err(_("(fix the .rej files and run "
4155 ui.write_err(_("(fix the .rej files and run "
4156 "`hg commit --amend`)\n"))
4156 "`hg commit --amend`)\n"))
4157 ret = 1
4157 ret = 1
4158 break
4158 break
4159
4159
4160 if not haspatch:
4160 if not haspatch:
4161 raise util.Abort(_('%s: no diffs found') % patchurl)
4161 raise util.Abort(_('%s: no diffs found') % patchurl)
4162
4162
4163 if tr:
4163 if tr:
4164 tr.close()
4164 tr.close()
4165 if msgs:
4165 if msgs:
4166 repo.savecommitmessage('\n* * *\n'.join(msgs))
4166 repo.savecommitmessage('\n* * *\n'.join(msgs))
4167 repo.dirstate.endparentchange()
4167 repo.dirstate.endparentchange()
4168 return ret
4168 return ret
4169 except: # re-raises
4169 except: # re-raises
4170 # wlock.release() indirectly calls dirstate.write(): since
4170 # wlock.release() indirectly calls dirstate.write(): since
4171 # we're crashing, we do not want to change the working dir
4171 # we're crashing, we do not want to change the working dir
4172 # parent after all, so make sure it writes nothing
4172 # parent after all, so make sure it writes nothing
4173 repo.dirstate.invalidate()
4173 repo.dirstate.invalidate()
4174 raise
4174 raise
4175 finally:
4175 finally:
4176 if tr:
4176 if tr:
4177 tr.release()
4177 tr.release()
4178 release(lock, wlock)
4178 release(lock, wlock)
4179
4179
4180 @command('incoming|in',
4180 @command('incoming|in',
4181 [('f', 'force', None,
4181 [('f', 'force', None,
4182 _('run even if remote repository is unrelated')),
4182 _('run even if remote repository is unrelated')),
4183 ('n', 'newest-first', None, _('show newest record first')),
4183 ('n', 'newest-first', None, _('show newest record first')),
4184 ('', 'bundle', '',
4184 ('', 'bundle', '',
4185 _('file to store the bundles into'), _('FILE')),
4185 _('file to store the bundles into'), _('FILE')),
4186 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4186 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4187 ('B', 'bookmarks', False, _("compare bookmarks")),
4187 ('B', 'bookmarks', False, _("compare bookmarks")),
4188 ('b', 'branch', [],
4188 ('b', 'branch', [],
4189 _('a specific branch you would like to pull'), _('BRANCH')),
4189 _('a specific branch you would like to pull'), _('BRANCH')),
4190 ] + logopts + remoteopts + subrepoopts,
4190 ] + logopts + remoteopts + subrepoopts,
4191 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
4191 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
4192 def incoming(ui, repo, source="default", **opts):
4192 def incoming(ui, repo, source="default", **opts):
4193 """show new changesets found in source
4193 """show new changesets found in source
4194
4194
4195 Show new changesets found in the specified path/URL or the default
4195 Show new changesets found in the specified path/URL or the default
4196 pull location. These are the changesets that would have been pulled
4196 pull location. These are the changesets that would have been pulled
4197 if a pull at the time you issued this command.
4197 if a pull at the time you issued this command.
4198
4198
4199 For remote repository, using --bundle avoids downloading the
4199 For remote repository, using --bundle avoids downloading the
4200 changesets twice if the incoming is followed by a pull.
4200 changesets twice if the incoming is followed by a pull.
4201
4201
4202 See pull for valid source format details.
4202 See pull for valid source format details.
4203
4203
4204 .. container:: verbose
4204 .. container:: verbose
4205
4205
4206 Examples:
4206 Examples:
4207
4207
4208 - show incoming changes with patches and full description::
4208 - show incoming changes with patches and full description::
4209
4209
4210 hg incoming -vp
4210 hg incoming -vp
4211
4211
4212 - show incoming changes excluding merges, store a bundle::
4212 - show incoming changes excluding merges, store a bundle::
4213
4213
4214 hg in -vpM --bundle incoming.hg
4214 hg in -vpM --bundle incoming.hg
4215 hg pull incoming.hg
4215 hg pull incoming.hg
4216
4216
4217 - briefly list changes inside a bundle::
4217 - briefly list changes inside a bundle::
4218
4218
4219 hg in changes.hg -T "{desc|firstline}\\n"
4219 hg in changes.hg -T "{desc|firstline}\\n"
4220
4220
4221 Returns 0 if there are incoming changes, 1 otherwise.
4221 Returns 0 if there are incoming changes, 1 otherwise.
4222 """
4222 """
4223 if opts.get('graph'):
4223 if opts.get('graph'):
4224 cmdutil.checkunsupportedgraphflags([], opts)
4224 cmdutil.checkunsupportedgraphflags([], opts)
4225 def display(other, chlist, displayer):
4225 def display(other, chlist, displayer):
4226 revdag = cmdutil.graphrevs(other, chlist, opts)
4226 revdag = cmdutil.graphrevs(other, chlist, opts)
4227 showparents = [ctx.node() for ctx in repo[None].parents()]
4227 showparents = [ctx.node() for ctx in repo[None].parents()]
4228 cmdutil.displaygraph(ui, revdag, displayer, showparents,
4228 cmdutil.displaygraph(ui, revdag, displayer, showparents,
4229 graphmod.asciiedges)
4229 graphmod.asciiedges)
4230
4230
4231 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4231 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
4232 return 0
4232 return 0
4233
4233
4234 if opts.get('bundle') and opts.get('subrepos'):
4234 if opts.get('bundle') and opts.get('subrepos'):
4235 raise util.Abort(_('cannot combine --bundle and --subrepos'))
4235 raise util.Abort(_('cannot combine --bundle and --subrepos'))
4236
4236
4237 if opts.get('bookmarks'):
4237 if opts.get('bookmarks'):
4238 source, branches = hg.parseurl(ui.expandpath(source),
4238 source, branches = hg.parseurl(ui.expandpath(source),
4239 opts.get('branch'))
4239 opts.get('branch'))
4240 other = hg.peer(repo, opts, source)
4240 other = hg.peer(repo, opts, source)
4241 if 'bookmarks' not in other.listkeys('namespaces'):
4241 if 'bookmarks' not in other.listkeys('namespaces'):
4242 ui.warn(_("remote doesn't support bookmarks\n"))
4242 ui.warn(_("remote doesn't support bookmarks\n"))
4243 return 0
4243 return 0
4244 ui.status(_('comparing with %s\n') % util.hidepassword(source))
4244 ui.status(_('comparing with %s\n') % util.hidepassword(source))
4245 return bookmarks.diff(ui, repo, other)
4245 return bookmarks.diff(ui, repo, other)
4246
4246
4247 repo._subtoppath = ui.expandpath(source)
4247 repo._subtoppath = ui.expandpath(source)
4248 try:
4248 try:
4249 return hg.incoming(ui, repo, source, opts)
4249 return hg.incoming(ui, repo, source, opts)
4250 finally:
4250 finally:
4251 del repo._subtoppath
4251 del repo._subtoppath
4252
4252
4253
4253
4254 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
4254 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'),
4255 norepo=True)
4255 norepo=True)
4256 def init(ui, dest=".", **opts):
4256 def init(ui, dest=".", **opts):
4257 """create a new repository in the given directory
4257 """create a new repository in the given directory
4258
4258
4259 Initialize a new repository in the given directory. If the given
4259 Initialize a new repository in the given directory. If the given
4260 directory does not exist, it will be created.
4260 directory does not exist, it will be created.
4261
4261
4262 If no directory is given, the current directory is used.
4262 If no directory is given, the current directory is used.
4263
4263
4264 It is possible to specify an ``ssh://`` URL as the destination.
4264 It is possible to specify an ``ssh://`` URL as the destination.
4265 See :hg:`help urls` for more information.
4265 See :hg:`help urls` for more information.
4266
4266
4267 Returns 0 on success.
4267 Returns 0 on success.
4268 """
4268 """
4269 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4269 hg.peer(ui, opts, ui.expandpath(dest), create=True)
4270
4270
4271 @command('locate',
4271 @command('locate',
4272 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
4272 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
4273 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4273 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
4274 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
4274 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
4275 ] + walkopts,
4275 ] + walkopts,
4276 _('[OPTION]... [PATTERN]...'))
4276 _('[OPTION]... [PATTERN]...'))
4277 def locate(ui, repo, *pats, **opts):
4277 def locate(ui, repo, *pats, **opts):
4278 """locate files matching specific patterns (DEPRECATED)
4278 """locate files matching specific patterns (DEPRECATED)
4279
4279
4280 Print files under Mercurial control in the working directory whose
4280 Print files under Mercurial control in the working directory whose
4281 names match the given patterns.
4281 names match the given patterns.
4282
4282
4283 By default, this command searches all directories in the working
4283 By default, this command searches all directories in the working
4284 directory. To search just the current directory and its
4284 directory. To search just the current directory and its
4285 subdirectories, use "--include .".
4285 subdirectories, use "--include .".
4286
4286
4287 If no patterns are given to match, this command prints the names
4287 If no patterns are given to match, this command prints the names
4288 of all files under Mercurial control in the working directory.
4288 of all files under Mercurial control in the working directory.
4289
4289
4290 If you want to feed the output of this command into the "xargs"
4290 If you want to feed the output of this command into the "xargs"
4291 command, use the -0 option to both this command and "xargs". This
4291 command, use the -0 option to both this command and "xargs". This
4292 will avoid the problem of "xargs" treating single filenames that
4292 will avoid the problem of "xargs" treating single filenames that
4293 contain whitespace as multiple filenames.
4293 contain whitespace as multiple filenames.
4294
4294
4295 See :hg:`help files` for a more versatile command.
4295 See :hg:`help files` for a more versatile command.
4296
4296
4297 Returns 0 if a match is found, 1 otherwise.
4297 Returns 0 if a match is found, 1 otherwise.
4298 """
4298 """
4299 end = opts.get('print0') and '\0' or '\n'
4299 end = opts.get('print0') and '\0' or '\n'
4300 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
4300 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
4301
4301
4302 ret = 1
4302 ret = 1
4303 ctx = repo[rev]
4303 ctx = repo[rev]
4304 m = scmutil.match(ctx, pats, opts, default='relglob')
4304 m = scmutil.match(ctx, pats, opts, default='relglob')
4305 m.bad = lambda x, y: False
4305 m.bad = lambda x, y: False
4306
4306
4307 for abs in ctx.matches(m):
4307 for abs in ctx.matches(m):
4308 if opts.get('fullpath'):
4308 if opts.get('fullpath'):
4309 ui.write(repo.wjoin(abs), end)
4309 ui.write(repo.wjoin(abs), end)
4310 else:
4310 else:
4311 ui.write(((pats and m.rel(abs)) or abs), end)
4311 ui.write(((pats and m.rel(abs)) or abs), end)
4312 ret = 0
4312 ret = 0
4313
4313
4314 return ret
4314 return ret
4315
4315
4316 @command('^log|history',
4316 @command('^log|history',
4317 [('f', 'follow', None,
4317 [('f', 'follow', None,
4318 _('follow changeset history, or file history across copies and renames')),
4318 _('follow changeset history, or file history across copies and renames')),
4319 ('', 'follow-first', None,
4319 ('', 'follow-first', None,
4320 _('only follow the first parent of merge changesets (DEPRECATED)')),
4320 _('only follow the first parent of merge changesets (DEPRECATED)')),
4321 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
4321 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
4322 ('C', 'copies', None, _('show copied files')),
4322 ('C', 'copies', None, _('show copied files')),
4323 ('k', 'keyword', [],
4323 ('k', 'keyword', [],
4324 _('do case-insensitive search for a given text'), _('TEXT')),
4324 _('do case-insensitive search for a given text'), _('TEXT')),
4325 ('r', 'rev', [], _('show the specified revision or range'), _('REV')),
4325 ('r', 'rev', [], _('show the specified revision or range'), _('REV')),
4326 ('', 'removed', None, _('include revisions where files were removed')),
4326 ('', 'removed', None, _('include revisions where files were removed')),
4327 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
4327 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
4328 ('u', 'user', [], _('revisions committed by user'), _('USER')),
4328 ('u', 'user', [], _('revisions committed by user'), _('USER')),
4329 ('', 'only-branch', [],
4329 ('', 'only-branch', [],
4330 _('show only changesets within the given named branch (DEPRECATED)'),
4330 _('show only changesets within the given named branch (DEPRECATED)'),
4331 _('BRANCH')),
4331 _('BRANCH')),
4332 ('b', 'branch', [],
4332 ('b', 'branch', [],
4333 _('show changesets within the given named branch'), _('BRANCH')),
4333 _('show changesets within the given named branch'), _('BRANCH')),
4334 ('P', 'prune', [],
4334 ('P', 'prune', [],
4335 _('do not display revision or any of its ancestors'), _('REV')),
4335 _('do not display revision or any of its ancestors'), _('REV')),
4336 ] + logopts + walkopts,
4336 ] + logopts + walkopts,
4337 _('[OPTION]... [FILE]'),
4337 _('[OPTION]... [FILE]'),
4338 inferrepo=True)
4338 inferrepo=True)
4339 def log(ui, repo, *pats, **opts):
4339 def log(ui, repo, *pats, **opts):
4340 """show revision history of entire repository or files
4340 """show revision history of entire repository or files
4341
4341
4342 Print the revision history of the specified files or the entire
4342 Print the revision history of the specified files or the entire
4343 project.
4343 project.
4344
4344
4345 If no revision range is specified, the default is ``tip:0`` unless
4345 If no revision range is specified, the default is ``tip:0`` unless
4346 --follow is set, in which case the working directory parent is
4346 --follow is set, in which case the working directory parent is
4347 used as the starting revision.
4347 used as the starting revision.
4348
4348
4349 File history is shown without following rename or copy history of
4349 File history is shown without following rename or copy history of
4350 files. Use -f/--follow with a filename to follow history across
4350 files. Use -f/--follow with a filename to follow history across
4351 renames and copies. --follow without a filename will only show
4351 renames and copies. --follow without a filename will only show
4352 ancestors or descendants of the starting revision.
4352 ancestors or descendants of the starting revision.
4353
4353
4354 By default this command prints revision number and changeset id,
4354 By default this command prints revision number and changeset id,
4355 tags, non-trivial parents, user, date and time, and a summary for
4355 tags, non-trivial parents, user, date and time, and a summary for
4356 each commit. When the -v/--verbose switch is used, the list of
4356 each commit. When the -v/--verbose switch is used, the list of
4357 changed files and full commit message are shown.
4357 changed files and full commit message are shown.
4358
4358
4359 With --graph the revisions are shown as an ASCII art DAG with the most
4359 With --graph the revisions are shown as an ASCII art DAG with the most
4360 recent changeset at the top.
4360 recent changeset at the top.
4361 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
4361 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete,
4362 and '+' represents a fork where the changeset from the lines below is a
4362 and '+' represents a fork where the changeset from the lines below is a
4363 parent of the 'o' merge on the same line.
4363 parent of the 'o' merge on the same line.
4364
4364
4365 .. note::
4365 .. note::
4366
4366
4367 log -p/--patch may generate unexpected diff output for merge
4367 log -p/--patch may generate unexpected diff output for merge
4368 changesets, as it will only compare the merge changeset against
4368 changesets, as it will only compare the merge changeset against
4369 its first parent. Also, only files different from BOTH parents
4369 its first parent. Also, only files different from BOTH parents
4370 will appear in files:.
4370 will appear in files:.
4371
4371
4372 .. note::
4372 .. note::
4373
4373
4374 for performance reasons, log FILE may omit duplicate changes
4374 for performance reasons, log FILE may omit duplicate changes
4375 made on branches and will not show removals or mode changes. To
4375 made on branches and will not show removals or mode changes. To
4376 see all such changes, use the --removed switch.
4376 see all such changes, use the --removed switch.
4377
4377
4378 .. container:: verbose
4378 .. container:: verbose
4379
4379
4380 Some examples:
4380 Some examples:
4381
4381
4382 - changesets with full descriptions and file lists::
4382 - changesets with full descriptions and file lists::
4383
4383
4384 hg log -v
4384 hg log -v
4385
4385
4386 - changesets ancestral to the working directory::
4386 - changesets ancestral to the working directory::
4387
4387
4388 hg log -f
4388 hg log -f
4389
4389
4390 - last 10 commits on the current branch::
4390 - last 10 commits on the current branch::
4391
4391
4392 hg log -l 10 -b .
4392 hg log -l 10 -b .
4393
4393
4394 - changesets showing all modifications of a file, including removals::
4394 - changesets showing all modifications of a file, including removals::
4395
4395
4396 hg log --removed file.c
4396 hg log --removed file.c
4397
4397
4398 - all changesets that touch a directory, with diffs, excluding merges::
4398 - all changesets that touch a directory, with diffs, excluding merges::
4399
4399
4400 hg log -Mp lib/
4400 hg log -Mp lib/
4401
4401
4402 - all revision numbers that match a keyword::
4402 - all revision numbers that match a keyword::
4403
4403
4404 hg log -k bug --template "{rev}\\n"
4404 hg log -k bug --template "{rev}\\n"
4405
4405
4406 - list available log templates::
4406 - list available log templates::
4407
4407
4408 hg log -T list
4408 hg log -T list
4409
4409
4410 - check if a given changeset is included in a tagged release::
4410 - check if a given changeset is included in a tagged release::
4411
4411
4412 hg log -r "a21ccf and ancestor(1.9)"
4412 hg log -r "a21ccf and ancestor(1.9)"
4413
4413
4414 - find all changesets by some user in a date range::
4414 - find all changesets by some user in a date range::
4415
4415
4416 hg log -k alice -d "may 2008 to jul 2008"
4416 hg log -k alice -d "may 2008 to jul 2008"
4417
4417
4418 - summary of all changesets after the last tag::
4418 - summary of all changesets after the last tag::
4419
4419
4420 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4420 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4421
4421
4422 See :hg:`help dates` for a list of formats valid for -d/--date.
4422 See :hg:`help dates` for a list of formats valid for -d/--date.
4423
4423
4424 See :hg:`help revisions` and :hg:`help revsets` for more about
4424 See :hg:`help revisions` and :hg:`help revsets` for more about
4425 specifying revisions.
4425 specifying revisions.
4426
4426
4427 See :hg:`help templates` for more about pre-packaged styles and
4427 See :hg:`help templates` for more about pre-packaged styles and
4428 specifying custom templates.
4428 specifying custom templates.
4429
4429
4430 Returns 0 on success.
4430 Returns 0 on success.
4431
4431
4432 """
4432 """
4433 if opts.get('graph'):
4433 if opts.get('graph'):
4434 return cmdutil.graphlog(ui, repo, *pats, **opts)
4434 return cmdutil.graphlog(ui, repo, *pats, **opts)
4435
4435
4436 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
4436 revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts)
4437 limit = cmdutil.loglimit(opts)
4437 limit = cmdutil.loglimit(opts)
4438 count = 0
4438 count = 0
4439
4439
4440 getrenamed = None
4440 getrenamed = None
4441 if opts.get('copies'):
4441 if opts.get('copies'):
4442 endrev = None
4442 endrev = None
4443 if opts.get('rev'):
4443 if opts.get('rev'):
4444 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
4444 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1
4445 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
4445 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
4446
4446
4447 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
4447 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
4448 for rev in revs:
4448 for rev in revs:
4449 if count == limit:
4449 if count == limit:
4450 break
4450 break
4451 ctx = repo[rev]
4451 ctx = repo[rev]
4452 copies = None
4452 copies = None
4453 if getrenamed is not None and rev:
4453 if getrenamed is not None and rev:
4454 copies = []
4454 copies = []
4455 for fn in ctx.files():
4455 for fn in ctx.files():
4456 rename = getrenamed(fn, rev)
4456 rename = getrenamed(fn, rev)
4457 if rename:
4457 if rename:
4458 copies.append((fn, rename[0]))
4458 copies.append((fn, rename[0]))
4459 revmatchfn = filematcher and filematcher(ctx.rev()) or None
4459 revmatchfn = filematcher and filematcher(ctx.rev()) or None
4460 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
4460 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
4461 if displayer.flush(rev):
4461 if displayer.flush(rev):
4462 count += 1
4462 count += 1
4463
4463
4464 displayer.close()
4464 displayer.close()
4465
4465
4466 @command('manifest',
4466 @command('manifest',
4467 [('r', 'rev', '', _('revision to display'), _('REV')),
4467 [('r', 'rev', '', _('revision to display'), _('REV')),
4468 ('', 'all', False, _("list files from all revisions"))]
4468 ('', 'all', False, _("list files from all revisions"))]
4469 + formatteropts,
4469 + formatteropts,
4470 _('[-r REV]'))
4470 _('[-r REV]'))
4471 def manifest(ui, repo, node=None, rev=None, **opts):
4471 def manifest(ui, repo, node=None, rev=None, **opts):
4472 """output the current or given revision of the project manifest
4472 """output the current or given revision of the project manifest
4473
4473
4474 Print a list of version controlled files for the given revision.
4474 Print a list of version controlled files for the given revision.
4475 If no revision is given, the first parent of the working directory
4475 If no revision is given, the first parent of the working directory
4476 is used, or the null revision if no revision is checked out.
4476 is used, or the null revision if no revision is checked out.
4477
4477
4478 With -v, print file permissions, symlink and executable bits.
4478 With -v, print file permissions, symlink and executable bits.
4479 With --debug, print file revision hashes.
4479 With --debug, print file revision hashes.
4480
4480
4481 If option --all is specified, the list of all files from all revisions
4481 If option --all is specified, the list of all files from all revisions
4482 is printed. This includes deleted and renamed files.
4482 is printed. This includes deleted and renamed files.
4483
4483
4484 Returns 0 on success.
4484 Returns 0 on success.
4485 """
4485 """
4486
4486
4487 fm = ui.formatter('manifest', opts)
4487 fm = ui.formatter('manifest', opts)
4488
4488
4489 if opts.get('all'):
4489 if opts.get('all'):
4490 if rev or node:
4490 if rev or node:
4491 raise util.Abort(_("can't specify a revision with --all"))
4491 raise util.Abort(_("can't specify a revision with --all"))
4492
4492
4493 res = []
4493 res = []
4494 prefix = "data/"
4494 prefix = "data/"
4495 suffix = ".i"
4495 suffix = ".i"
4496 plen = len(prefix)
4496 plen = len(prefix)
4497 slen = len(suffix)
4497 slen = len(suffix)
4498 lock = repo.lock()
4498 lock = repo.lock()
4499 try:
4499 try:
4500 for fn, b, size in repo.store.datafiles():
4500 for fn, b, size in repo.store.datafiles():
4501 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
4501 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
4502 res.append(fn[plen:-slen])
4502 res.append(fn[plen:-slen])
4503 finally:
4503 finally:
4504 lock.release()
4504 lock.release()
4505 for f in res:
4505 for f in res:
4506 fm.startitem()
4506 fm.startitem()
4507 fm.write("path", '%s\n', f)
4507 fm.write("path", '%s\n', f)
4508 fm.end()
4508 fm.end()
4509 return
4509 return
4510
4510
4511 if rev and node:
4511 if rev and node:
4512 raise util.Abort(_("please specify just one revision"))
4512 raise util.Abort(_("please specify just one revision"))
4513
4513
4514 if not node:
4514 if not node:
4515 node = rev
4515 node = rev
4516
4516
4517 char = {'l': '@', 'x': '*', '': ''}
4517 char = {'l': '@', 'x': '*', '': ''}
4518 mode = {'l': '644', 'x': '755', '': '644'}
4518 mode = {'l': '644', 'x': '755', '': '644'}
4519 ctx = scmutil.revsingle(repo, node)
4519 ctx = scmutil.revsingle(repo, node)
4520 mf = ctx.manifest()
4520 mf = ctx.manifest()
4521 for f in ctx:
4521 for f in ctx:
4522 fm.startitem()
4522 fm.startitem()
4523 fl = ctx[f].flags()
4523 fl = ctx[f].flags()
4524 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
4524 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
4525 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
4525 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
4526 fm.write('path', '%s\n', f)
4526 fm.write('path', '%s\n', f)
4527 fm.end()
4527 fm.end()
4528
4528
4529 @command('^merge',
4529 @command('^merge',
4530 [('f', 'force', None,
4530 [('f', 'force', None,
4531 _('force a merge including outstanding changes (DEPRECATED)')),
4531 _('force a merge including outstanding changes (DEPRECATED)')),
4532 ('r', 'rev', '', _('revision to merge'), _('REV')),
4532 ('r', 'rev', '', _('revision to merge'), _('REV')),
4533 ('P', 'preview', None,
4533 ('P', 'preview', None,
4534 _('review revisions to merge (no merge is performed)'))
4534 _('review revisions to merge (no merge is performed)'))
4535 ] + mergetoolopts,
4535 ] + mergetoolopts,
4536 _('[-P] [-f] [[-r] REV]'))
4536 _('[-P] [-f] [[-r] REV]'))
4537 def merge(ui, repo, node=None, **opts):
4537 def merge(ui, repo, node=None, **opts):
4538 """merge working directory with another revision
4538 """merge working directory with another revision
4539
4539
4540 The current working directory is updated with all changes made in
4540 The current working directory is updated with all changes made in
4541 the requested revision since the last common predecessor revision.
4541 the requested revision since the last common predecessor revision.
4542
4542
4543 Files that changed between either parent are marked as changed for
4543 Files that changed between either parent are marked as changed for
4544 the next commit and a commit must be performed before any further
4544 the next commit and a commit must be performed before any further
4545 updates to the repository are allowed. The next commit will have
4545 updates to the repository are allowed. The next commit will have
4546 two parents.
4546 two parents.
4547
4547
4548 ``--tool`` can be used to specify the merge tool used for file
4548 ``--tool`` can be used to specify the merge tool used for file
4549 merges. It overrides the HGMERGE environment variable and your
4549 merges. It overrides the HGMERGE environment variable and your
4550 configuration files. See :hg:`help merge-tools` for options.
4550 configuration files. See :hg:`help merge-tools` for options.
4551
4551
4552 If no revision is specified, the working directory's parent is a
4552 If no revision is specified, the working directory's parent is a
4553 head revision, and the current branch contains exactly one other
4553 head revision, and the current branch contains exactly one other
4554 head, the other head is merged with by default. Otherwise, an
4554 head, the other head is merged with by default. Otherwise, an
4555 explicit revision with which to merge with must be provided.
4555 explicit revision with which to merge with must be provided.
4556
4556
4557 :hg:`resolve` must be used to resolve unresolved files.
4557 :hg:`resolve` must be used to resolve unresolved files.
4558
4558
4559 To undo an uncommitted merge, use :hg:`update --clean .` which
4559 To undo an uncommitted merge, use :hg:`update --clean .` which
4560 will check out a clean copy of the original merge parent, losing
4560 will check out a clean copy of the original merge parent, losing
4561 all changes.
4561 all changes.
4562
4562
4563 Returns 0 on success, 1 if there are unresolved files.
4563 Returns 0 on success, 1 if there are unresolved files.
4564 """
4564 """
4565
4565
4566 if opts.get('rev') and node:
4566 if opts.get('rev') and node:
4567 raise util.Abort(_("please specify just one revision"))
4567 raise util.Abort(_("please specify just one revision"))
4568 if not node:
4568 if not node:
4569 node = opts.get('rev')
4569 node = opts.get('rev')
4570
4570
4571 if node:
4571 if node:
4572 node = scmutil.revsingle(repo, node).node()
4572 node = scmutil.revsingle(repo, node).node()
4573
4573
4574 if not node and repo._bookmarkcurrent:
4574 if not node and repo._bookmarkcurrent:
4575 bmheads = repo.bookmarkheads(repo._bookmarkcurrent)
4575 bmheads = repo.bookmarkheads(repo._bookmarkcurrent)
4576 curhead = repo[repo._bookmarkcurrent].node()
4576 curhead = repo[repo._bookmarkcurrent].node()
4577 if len(bmheads) == 2:
4577 if len(bmheads) == 2:
4578 if curhead == bmheads[0]:
4578 if curhead == bmheads[0]:
4579 node = bmheads[1]
4579 node = bmheads[1]
4580 else:
4580 else:
4581 node = bmheads[0]
4581 node = bmheads[0]
4582 elif len(bmheads) > 2:
4582 elif len(bmheads) > 2:
4583 raise util.Abort(_("multiple matching bookmarks to merge - "
4583 raise util.Abort(_("multiple matching bookmarks to merge - "
4584 "please merge with an explicit rev or bookmark"),
4584 "please merge with an explicit rev or bookmark"),
4585 hint=_("run 'hg heads' to see all heads"))
4585 hint=_("run 'hg heads' to see all heads"))
4586 elif len(bmheads) <= 1:
4586 elif len(bmheads) <= 1:
4587 raise util.Abort(_("no matching bookmark to merge - "
4587 raise util.Abort(_("no matching bookmark to merge - "
4588 "please merge with an explicit rev or bookmark"),
4588 "please merge with an explicit rev or bookmark"),
4589 hint=_("run 'hg heads' to see all heads"))
4589 hint=_("run 'hg heads' to see all heads"))
4590
4590
4591 if not node and not repo._bookmarkcurrent:
4591 if not node and not repo._bookmarkcurrent:
4592 branch = repo[None].branch()
4592 branch = repo[None].branch()
4593 bheads = repo.branchheads(branch)
4593 bheads = repo.branchheads(branch)
4594 nbhs = [bh for bh in bheads if not repo[bh].bookmarks()]
4594 nbhs = [bh for bh in bheads if not repo[bh].bookmarks()]
4595
4595
4596 if len(nbhs) > 2:
4596 if len(nbhs) > 2:
4597 raise util.Abort(_("branch '%s' has %d heads - "
4597 raise util.Abort(_("branch '%s' has %d heads - "
4598 "please merge with an explicit rev")
4598 "please merge with an explicit rev")
4599 % (branch, len(bheads)),
4599 % (branch, len(bheads)),
4600 hint=_("run 'hg heads .' to see heads"))
4600 hint=_("run 'hg heads .' to see heads"))
4601
4601
4602 parent = repo.dirstate.p1()
4602 parent = repo.dirstate.p1()
4603 if len(nbhs) <= 1:
4603 if len(nbhs) <= 1:
4604 if len(bheads) > 1:
4604 if len(bheads) > 1:
4605 raise util.Abort(_("heads are bookmarked - "
4605 raise util.Abort(_("heads are bookmarked - "
4606 "please merge with an explicit rev"),
4606 "please merge with an explicit rev"),
4607 hint=_("run 'hg heads' to see all heads"))
4607 hint=_("run 'hg heads' to see all heads"))
4608 if len(repo.heads()) > 1:
4608 if len(repo.heads()) > 1:
4609 raise util.Abort(_("branch '%s' has one head - "
4609 raise util.Abort(_("branch '%s' has one head - "
4610 "please merge with an explicit rev")
4610 "please merge with an explicit rev")
4611 % branch,
4611 % branch,
4612 hint=_("run 'hg heads' to see all heads"))
4612 hint=_("run 'hg heads' to see all heads"))
4613 msg, hint = _('nothing to merge'), None
4613 msg, hint = _('nothing to merge'), None
4614 if parent != repo.lookup(branch):
4614 if parent != repo.lookup(branch):
4615 hint = _("use 'hg update' instead")
4615 hint = _("use 'hg update' instead")
4616 raise util.Abort(msg, hint=hint)
4616 raise util.Abort(msg, hint=hint)
4617
4617
4618 if parent not in bheads:
4618 if parent not in bheads:
4619 raise util.Abort(_('working directory not at a head revision'),
4619 raise util.Abort(_('working directory not at a head revision'),
4620 hint=_("use 'hg update' or merge with an "
4620 hint=_("use 'hg update' or merge with an "
4621 "explicit revision"))
4621 "explicit revision"))
4622 if parent == nbhs[0]:
4622 if parent == nbhs[0]:
4623 node = nbhs[-1]
4623 node = nbhs[-1]
4624 else:
4624 else:
4625 node = nbhs[0]
4625 node = nbhs[0]
4626
4626
4627 if opts.get('preview'):
4627 if opts.get('preview'):
4628 # find nodes that are ancestors of p2 but not of p1
4628 # find nodes that are ancestors of p2 but not of p1
4629 p1 = repo.lookup('.')
4629 p1 = repo.lookup('.')
4630 p2 = repo.lookup(node)
4630 p2 = repo.lookup(node)
4631 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4631 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4632
4632
4633 displayer = cmdutil.show_changeset(ui, repo, opts)
4633 displayer = cmdutil.show_changeset(ui, repo, opts)
4634 for node in nodes:
4634 for node in nodes:
4635 displayer.show(repo[node])
4635 displayer.show(repo[node])
4636 displayer.close()
4636 displayer.close()
4637 return 0
4637 return 0
4638
4638
4639 try:
4639 try:
4640 # ui.forcemerge is an internal variable, do not document
4640 # ui.forcemerge is an internal variable, do not document
4641 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
4641 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
4642 return hg.merge(repo, node, force=opts.get('force'))
4642 return hg.merge(repo, node, force=opts.get('force'))
4643 finally:
4643 finally:
4644 ui.setconfig('ui', 'forcemerge', '', 'merge')
4644 ui.setconfig('ui', 'forcemerge', '', 'merge')
4645
4645
4646 @command('outgoing|out',
4646 @command('outgoing|out',
4647 [('f', 'force', None, _('run even when the destination is unrelated')),
4647 [('f', 'force', None, _('run even when the destination is unrelated')),
4648 ('r', 'rev', [],
4648 ('r', 'rev', [],
4649 _('a changeset intended to be included in the destination'), _('REV')),
4649 _('a changeset intended to be included in the destination'), _('REV')),
4650 ('n', 'newest-first', None, _('show newest record first')),
4650 ('n', 'newest-first', None, _('show newest record first')),
4651 ('B', 'bookmarks', False, _('compare bookmarks')),
4651 ('B', 'bookmarks', False, _('compare bookmarks')),
4652 ('b', 'branch', [], _('a specific branch you would like to push'),
4652 ('b', 'branch', [], _('a specific branch you would like to push'),
4653 _('BRANCH')),
4653 _('BRANCH')),
4654 ] + logopts + remoteopts + subrepoopts,
4654 ] + logopts + remoteopts + subrepoopts,
4655 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
4655 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
4656 def outgoing(ui, repo, dest=None, **opts):
4656 def outgoing(ui, repo, dest=None, **opts):
4657 """show changesets not found in the destination
4657 """show changesets not found in the destination
4658
4658
4659 Show changesets not found in the specified destination repository
4659 Show changesets not found in the specified destination repository
4660 or the default push location. These are the changesets that would
4660 or the default push location. These are the changesets that would
4661 be pushed if a push was requested.
4661 be pushed if a push was requested.
4662
4662
4663 See pull for details of valid destination formats.
4663 See pull for details of valid destination formats.
4664
4664
4665 Returns 0 if there are outgoing changes, 1 otherwise.
4665 Returns 0 if there are outgoing changes, 1 otherwise.
4666 """
4666 """
4667 if opts.get('graph'):
4667 if opts.get('graph'):
4668 cmdutil.checkunsupportedgraphflags([], opts)
4668 cmdutil.checkunsupportedgraphflags([], opts)
4669 o, other = hg._outgoing(ui, repo, dest, opts)
4669 o, other = hg._outgoing(ui, repo, dest, opts)
4670 if not o:
4670 if not o:
4671 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4671 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4672 return
4672 return
4673
4673
4674 revdag = cmdutil.graphrevs(repo, o, opts)
4674 revdag = cmdutil.graphrevs(repo, o, opts)
4675 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
4675 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
4676 showparents = [ctx.node() for ctx in repo[None].parents()]
4676 showparents = [ctx.node() for ctx in repo[None].parents()]
4677 cmdutil.displaygraph(ui, revdag, displayer, showparents,
4677 cmdutil.displaygraph(ui, revdag, displayer, showparents,
4678 graphmod.asciiedges)
4678 graphmod.asciiedges)
4679 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4679 cmdutil.outgoinghooks(ui, repo, other, opts, o)
4680 return 0
4680 return 0
4681
4681
4682 if opts.get('bookmarks'):
4682 if opts.get('bookmarks'):
4683 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4683 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4684 dest, branches = hg.parseurl(dest, opts.get('branch'))
4684 dest, branches = hg.parseurl(dest, opts.get('branch'))
4685 other = hg.peer(repo, opts, dest)
4685 other = hg.peer(repo, opts, dest)
4686 if 'bookmarks' not in other.listkeys('namespaces'):
4686 if 'bookmarks' not in other.listkeys('namespaces'):
4687 ui.warn(_("remote doesn't support bookmarks\n"))
4687 ui.warn(_("remote doesn't support bookmarks\n"))
4688 return 0
4688 return 0
4689 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4689 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4690 return bookmarks.diff(ui, other, repo)
4690 return bookmarks.diff(ui, other, repo)
4691
4691
4692 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
4692 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
4693 try:
4693 try:
4694 return hg.outgoing(ui, repo, dest, opts)
4694 return hg.outgoing(ui, repo, dest, opts)
4695 finally:
4695 finally:
4696 del repo._subtoppath
4696 del repo._subtoppath
4697
4697
4698 @command('parents',
4698 @command('parents',
4699 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4699 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4700 ] + templateopts,
4700 ] + templateopts,
4701 _('[-r REV] [FILE]'),
4701 _('[-r REV] [FILE]'),
4702 inferrepo=True)
4702 inferrepo=True)
4703 def parents(ui, repo, file_=None, **opts):
4703 def parents(ui, repo, file_=None, **opts):
4704 """show the parents of the working directory or revision (DEPRECATED)
4704 """show the parents of the working directory or revision (DEPRECATED)
4705
4705
4706 Print the working directory's parent revisions. If a revision is
4706 Print the working directory's parent revisions. If a revision is
4707 given via -r/--rev, the parent of that revision will be printed.
4707 given via -r/--rev, the parent of that revision will be printed.
4708 If a file argument is given, the revision in which the file was
4708 If a file argument is given, the revision in which the file was
4709 last changed (before the working directory revision or the
4709 last changed (before the working directory revision or the
4710 argument to --rev if given) is printed.
4710 argument to --rev if given) is printed.
4711
4711
4712 See :hg:`summary` and :hg:`help revsets` for related information.
4712 See :hg:`summary` and :hg:`help revsets` for related information.
4713
4713
4714 Returns 0 on success.
4714 Returns 0 on success.
4715 """
4715 """
4716
4716
4717 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4717 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4718
4718
4719 if file_:
4719 if file_:
4720 m = scmutil.match(ctx, (file_,), opts)
4720 m = scmutil.match(ctx, (file_,), opts)
4721 if m.anypats() or len(m.files()) != 1:
4721 if m.anypats() or len(m.files()) != 1:
4722 raise util.Abort(_('can only specify an explicit filename'))
4722 raise util.Abort(_('can only specify an explicit filename'))
4723 file_ = m.files()[0]
4723 file_ = m.files()[0]
4724 filenodes = []
4724 filenodes = []
4725 for cp in ctx.parents():
4725 for cp in ctx.parents():
4726 if not cp:
4726 if not cp:
4727 continue
4727 continue
4728 try:
4728 try:
4729 filenodes.append(cp.filenode(file_))
4729 filenodes.append(cp.filenode(file_))
4730 except error.LookupError:
4730 except error.LookupError:
4731 pass
4731 pass
4732 if not filenodes:
4732 if not filenodes:
4733 raise util.Abort(_("'%s' not found in manifest!") % file_)
4733 raise util.Abort(_("'%s' not found in manifest!") % file_)
4734 p = []
4734 p = []
4735 for fn in filenodes:
4735 for fn in filenodes:
4736 fctx = repo.filectx(file_, fileid=fn)
4736 fctx = repo.filectx(file_, fileid=fn)
4737 p.append(fctx.node())
4737 p.append(fctx.node())
4738 else:
4738 else:
4739 p = [cp.node() for cp in ctx.parents()]
4739 p = [cp.node() for cp in ctx.parents()]
4740
4740
4741 displayer = cmdutil.show_changeset(ui, repo, opts)
4741 displayer = cmdutil.show_changeset(ui, repo, opts)
4742 for n in p:
4742 for n in p:
4743 if n != nullid:
4743 if n != nullid:
4744 displayer.show(repo[n])
4744 displayer.show(repo[n])
4745 displayer.close()
4745 displayer.close()
4746
4746
4747 @command('paths', [], _('[NAME]'), optionalrepo=True)
4747 @command('paths', [], _('[NAME]'), optionalrepo=True)
4748 def paths(ui, repo, search=None):
4748 def paths(ui, repo, search=None):
4749 """show aliases for remote repositories
4749 """show aliases for remote repositories
4750
4750
4751 Show definition of symbolic path name NAME. If no name is given,
4751 Show definition of symbolic path name NAME. If no name is given,
4752 show definition of all available names.
4752 show definition of all available names.
4753
4753
4754 Option -q/--quiet suppresses all output when searching for NAME
4754 Option -q/--quiet suppresses all output when searching for NAME
4755 and shows only the path names when listing all definitions.
4755 and shows only the path names when listing all definitions.
4756
4756
4757 Path names are defined in the [paths] section of your
4757 Path names are defined in the [paths] section of your
4758 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4758 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4759 repository, ``.hg/hgrc`` is used, too.
4759 repository, ``.hg/hgrc`` is used, too.
4760
4760
4761 The path names ``default`` and ``default-push`` have a special
4761 The path names ``default`` and ``default-push`` have a special
4762 meaning. When performing a push or pull operation, they are used
4762 meaning. When performing a push or pull operation, they are used
4763 as fallbacks if no location is specified on the command-line.
4763 as fallbacks if no location is specified on the command-line.
4764 When ``default-push`` is set, it will be used for push and
4764 When ``default-push`` is set, it will be used for push and
4765 ``default`` will be used for pull; otherwise ``default`` is used
4765 ``default`` will be used for pull; otherwise ``default`` is used
4766 as the fallback for both. When cloning a repository, the clone
4766 as the fallback for both. When cloning a repository, the clone
4767 source is written as ``default`` in ``.hg/hgrc``. Note that
4767 source is written as ``default`` in ``.hg/hgrc``. Note that
4768 ``default`` and ``default-push`` apply to all inbound (e.g.
4768 ``default`` and ``default-push`` apply to all inbound (e.g.
4769 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
4769 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
4770 :hg:`bundle`) operations.
4770 :hg:`bundle`) operations.
4771
4771
4772 See :hg:`help urls` for more information.
4772 See :hg:`help urls` for more information.
4773
4773
4774 Returns 0 on success.
4774 Returns 0 on success.
4775 """
4775 """
4776 if search:
4776 if search:
4777 for name, path in ui.configitems("paths"):
4777 for name, path in ui.configitems("paths"):
4778 if name == search:
4778 if name == search:
4779 ui.status("%s\n" % util.hidepassword(path))
4779 ui.status("%s\n" % util.hidepassword(path))
4780 return
4780 return
4781 if not ui.quiet:
4781 if not ui.quiet:
4782 ui.warn(_("not found!\n"))
4782 ui.warn(_("not found!\n"))
4783 return 1
4783 return 1
4784 else:
4784 else:
4785 for name, path in ui.configitems("paths"):
4785 for name, path in ui.configitems("paths"):
4786 if ui.quiet:
4786 if ui.quiet:
4787 ui.write("%s\n" % name)
4787 ui.write("%s\n" % name)
4788 else:
4788 else:
4789 ui.write("%s = %s\n" % (name, util.hidepassword(path)))
4789 ui.write("%s = %s\n" % (name, util.hidepassword(path)))
4790
4790
4791 @command('phase',
4791 @command('phase',
4792 [('p', 'public', False, _('set changeset phase to public')),
4792 [('p', 'public', False, _('set changeset phase to public')),
4793 ('d', 'draft', False, _('set changeset phase to draft')),
4793 ('d', 'draft', False, _('set changeset phase to draft')),
4794 ('s', 'secret', False, _('set changeset phase to secret')),
4794 ('s', 'secret', False, _('set changeset phase to secret')),
4795 ('f', 'force', False, _('allow to move boundary backward')),
4795 ('f', 'force', False, _('allow to move boundary backward')),
4796 ('r', 'rev', [], _('target revision'), _('REV')),
4796 ('r', 'rev', [], _('target revision'), _('REV')),
4797 ],
4797 ],
4798 _('[-p|-d|-s] [-f] [-r] REV...'))
4798 _('[-p|-d|-s] [-f] [-r] REV...'))
4799 def phase(ui, repo, *revs, **opts):
4799 def phase(ui, repo, *revs, **opts):
4800 """set or show the current phase name
4800 """set or show the current phase name
4801
4801
4802 With no argument, show the phase name of specified revisions.
4802 With no argument, show the phase name of specified revisions.
4803
4803
4804 With one of -p/--public, -d/--draft or -s/--secret, change the
4804 With one of -p/--public, -d/--draft or -s/--secret, change the
4805 phase value of the specified revisions.
4805 phase value of the specified revisions.
4806
4806
4807 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
4807 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
4808 lower phase to an higher phase. Phases are ordered as follows::
4808 lower phase to an higher phase. Phases are ordered as follows::
4809
4809
4810 public < draft < secret
4810 public < draft < secret
4811
4811
4812 Returns 0 on success, 1 if no phases were changed or some could not
4812 Returns 0 on success, 1 if no phases were changed or some could not
4813 be changed.
4813 be changed.
4814 """
4814 """
4815 # search for a unique phase argument
4815 # search for a unique phase argument
4816 targetphase = None
4816 targetphase = None
4817 for idx, name in enumerate(phases.phasenames):
4817 for idx, name in enumerate(phases.phasenames):
4818 if opts[name]:
4818 if opts[name]:
4819 if targetphase is not None:
4819 if targetphase is not None:
4820 raise util.Abort(_('only one phase can be specified'))
4820 raise util.Abort(_('only one phase can be specified'))
4821 targetphase = idx
4821 targetphase = idx
4822
4822
4823 # look for specified revision
4823 # look for specified revision
4824 revs = list(revs)
4824 revs = list(revs)
4825 revs.extend(opts['rev'])
4825 revs.extend(opts['rev'])
4826 if not revs:
4826 if not revs:
4827 raise util.Abort(_('no revisions specified'))
4827 raise util.Abort(_('no revisions specified'))
4828
4828
4829 revs = scmutil.revrange(repo, revs)
4829 revs = scmutil.revrange(repo, revs)
4830
4830
4831 lock = None
4831 lock = None
4832 ret = 0
4832 ret = 0
4833 if targetphase is None:
4833 if targetphase is None:
4834 # display
4834 # display
4835 for r in revs:
4835 for r in revs:
4836 ctx = repo[r]
4836 ctx = repo[r]
4837 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
4837 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
4838 else:
4838 else:
4839 tr = None
4839 tr = None
4840 lock = repo.lock()
4840 lock = repo.lock()
4841 try:
4841 try:
4842 tr = repo.transaction("phase")
4842 tr = repo.transaction("phase")
4843 # set phase
4843 # set phase
4844 if not revs:
4844 if not revs:
4845 raise util.Abort(_('empty revision set'))
4845 raise util.Abort(_('empty revision set'))
4846 nodes = [repo[r].node() for r in revs]
4846 nodes = [repo[r].node() for r in revs]
4847 olddata = repo._phasecache.getphaserevs(repo)[:]
4847 olddata = repo._phasecache.getphaserevs(repo)[:]
4848 phases.advanceboundary(repo, tr, targetphase, nodes)
4848 phases.advanceboundary(repo, tr, targetphase, nodes)
4849 if opts['force']:
4849 if opts['force']:
4850 phases.retractboundary(repo, tr, targetphase, nodes)
4850 phases.retractboundary(repo, tr, targetphase, nodes)
4851 tr.close()
4851 tr.close()
4852 finally:
4852 finally:
4853 if tr is not None:
4853 if tr is not None:
4854 tr.release()
4854 tr.release()
4855 lock.release()
4855 lock.release()
4856 # moving revision from public to draft may hide them
4856 # moving revision from public to draft may hide them
4857 # We have to check result on an unfiltered repository
4857 # We have to check result on an unfiltered repository
4858 unfi = repo.unfiltered()
4858 unfi = repo.unfiltered()
4859 newdata = repo._phasecache.getphaserevs(unfi)
4859 newdata = repo._phasecache.getphaserevs(unfi)
4860 changes = sum(o != newdata[i] for i, o in enumerate(olddata))
4860 changes = sum(o != newdata[i] for i, o in enumerate(olddata))
4861 cl = unfi.changelog
4861 cl = unfi.changelog
4862 rejected = [n for n in nodes
4862 rejected = [n for n in nodes
4863 if newdata[cl.rev(n)] < targetphase]
4863 if newdata[cl.rev(n)] < targetphase]
4864 if rejected:
4864 if rejected:
4865 ui.warn(_('cannot move %i changesets to a higher '
4865 ui.warn(_('cannot move %i changesets to a higher '
4866 'phase, use --force\n') % len(rejected))
4866 'phase, use --force\n') % len(rejected))
4867 ret = 1
4867 ret = 1
4868 if changes:
4868 if changes:
4869 msg = _('phase changed for %i changesets\n') % changes
4869 msg = _('phase changed for %i changesets\n') % changes
4870 if ret:
4870 if ret:
4871 ui.status(msg)
4871 ui.status(msg)
4872 else:
4872 else:
4873 ui.note(msg)
4873 ui.note(msg)
4874 else:
4874 else:
4875 ui.warn(_('no phases changed\n'))
4875 ui.warn(_('no phases changed\n'))
4876 ret = 1
4876 ret = 1
4877 return ret
4877 return ret
4878
4878
4879 def postincoming(ui, repo, modheads, optupdate, checkout):
4879 def postincoming(ui, repo, modheads, optupdate, checkout):
4880 if modheads == 0:
4880 if modheads == 0:
4881 return
4881 return
4882 if optupdate:
4882 if optupdate:
4883 checkout, movemarkfrom = bookmarks.calculateupdate(ui, repo, checkout)
4883 checkout, movemarkfrom = bookmarks.calculateupdate(ui, repo, checkout)
4884 try:
4884 try:
4885 ret = hg.update(repo, checkout)
4885 ret = hg.update(repo, checkout)
4886 except util.Abort, inst:
4886 except util.Abort, inst:
4887 ui.warn(_("not updating: %s\n") % str(inst))
4887 ui.warn(_("not updating: %s\n") % str(inst))
4888 if inst.hint:
4888 if inst.hint:
4889 ui.warn(_("(%s)\n") % inst.hint)
4889 ui.warn(_("(%s)\n") % inst.hint)
4890 return 0
4890 return 0
4891 if not ret and not checkout:
4891 if not ret and not checkout:
4892 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
4892 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
4893 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
4893 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
4894 return ret
4894 return ret
4895 if modheads > 1:
4895 if modheads > 1:
4896 currentbranchheads = len(repo.branchheads())
4896 currentbranchheads = len(repo.branchheads())
4897 if currentbranchheads == modheads:
4897 if currentbranchheads == modheads:
4898 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4898 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4899 elif currentbranchheads > 1:
4899 elif currentbranchheads > 1:
4900 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
4900 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
4901 "merge)\n"))
4901 "merge)\n"))
4902 else:
4902 else:
4903 ui.status(_("(run 'hg heads' to see heads)\n"))
4903 ui.status(_("(run 'hg heads' to see heads)\n"))
4904 else:
4904 else:
4905 ui.status(_("(run 'hg update' to get a working copy)\n"))
4905 ui.status(_("(run 'hg update' to get a working copy)\n"))
4906
4906
4907 @command('^pull',
4907 @command('^pull',
4908 [('u', 'update', None,
4908 [('u', 'update', None,
4909 _('update to new branch head if changesets were pulled')),
4909 _('update to new branch head if changesets were pulled')),
4910 ('f', 'force', None, _('run even when remote repository is unrelated')),
4910 ('f', 'force', None, _('run even when remote repository is unrelated')),
4911 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4911 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4912 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4912 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4913 ('b', 'branch', [], _('a specific branch you would like to pull'),
4913 ('b', 'branch', [], _('a specific branch you would like to pull'),
4914 _('BRANCH')),
4914 _('BRANCH')),
4915 ] + remoteopts,
4915 ] + remoteopts,
4916 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4916 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4917 def pull(ui, repo, source="default", **opts):
4917 def pull(ui, repo, source="default", **opts):
4918 """pull changes from the specified source
4918 """pull changes from the specified source
4919
4919
4920 Pull changes from a remote repository to a local one.
4920 Pull changes from a remote repository to a local one.
4921
4921
4922 This finds all changes from the repository at the specified path
4922 This finds all changes from the repository at the specified path
4923 or URL and adds them to a local repository (the current one unless
4923 or URL and adds them to a local repository (the current one unless
4924 -R is specified). By default, this does not update the copy of the
4924 -R is specified). By default, this does not update the copy of the
4925 project in the working directory.
4925 project in the working directory.
4926
4926
4927 Use :hg:`incoming` if you want to see what would have been added
4927 Use :hg:`incoming` if you want to see what would have been added
4928 by a pull at the time you issued this command. If you then decide
4928 by a pull at the time you issued this command. If you then decide
4929 to add those changes to the repository, you should use :hg:`pull
4929 to add those changes to the repository, you should use :hg:`pull
4930 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4930 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4931
4931
4932 If SOURCE is omitted, the 'default' path will be used.
4932 If SOURCE is omitted, the 'default' path will be used.
4933 See :hg:`help urls` for more information.
4933 See :hg:`help urls` for more information.
4934
4934
4935 Returns 0 on success, 1 if an update had unresolved files.
4935 Returns 0 on success, 1 if an update had unresolved files.
4936 """
4936 """
4937 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4937 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4938 other = hg.peer(repo, opts, source)
4938 other = hg.peer(repo, opts, source)
4939 try:
4939 try:
4940 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4940 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4941 revs, checkout = hg.addbranchrevs(repo, other, branches,
4941 revs, checkout = hg.addbranchrevs(repo, other, branches,
4942 opts.get('rev'))
4942 opts.get('rev'))
4943
4943
4944 remotebookmarks = other.listkeys('bookmarks')
4944 remotebookmarks = other.listkeys('bookmarks')
4945
4945
4946 if opts.get('bookmark'):
4946 if opts.get('bookmark'):
4947 if not revs:
4947 if not revs:
4948 revs = []
4948 revs = []
4949 for b in opts['bookmark']:
4949 for b in opts['bookmark']:
4950 if b not in remotebookmarks:
4950 if b not in remotebookmarks:
4951 raise util.Abort(_('remote bookmark %s not found!') % b)
4951 raise util.Abort(_('remote bookmark %s not found!') % b)
4952 revs.append(remotebookmarks[b])
4952 revs.append(remotebookmarks[b])
4953
4953
4954 if revs:
4954 if revs:
4955 try:
4955 try:
4956 revs = [other.lookup(rev) for rev in revs]
4956 revs = [other.lookup(rev) for rev in revs]
4957 except error.CapabilityError:
4957 except error.CapabilityError:
4958 err = _("other repository doesn't support revision lookup, "
4958 err = _("other repository doesn't support revision lookup, "
4959 "so a rev cannot be specified.")
4959 "so a rev cannot be specified.")
4960 raise util.Abort(err)
4960 raise util.Abort(err)
4961
4961
4962 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
4962 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
4963 bookmarks.updatefromremote(ui, repo, remotebookmarks, source)
4963 bookmarks.updatefromremote(ui, repo, remotebookmarks, source)
4964 if checkout:
4964 if checkout:
4965 checkout = str(repo.changelog.rev(other.lookup(checkout)))
4965 checkout = str(repo.changelog.rev(other.lookup(checkout)))
4966 repo._subtoppath = source
4966 repo._subtoppath = source
4967 try:
4967 try:
4968 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
4968 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
4969
4969
4970 finally:
4970 finally:
4971 del repo._subtoppath
4971 del repo._subtoppath
4972
4972
4973 # update specified bookmarks
4973 # update specified bookmarks
4974 if opts.get('bookmark'):
4974 if opts.get('bookmark'):
4975 marks = repo._bookmarks
4975 marks = repo._bookmarks
4976 for b in opts['bookmark']:
4976 for b in opts['bookmark']:
4977 # explicit pull overrides local bookmark if any
4977 # explicit pull overrides local bookmark if any
4978 ui.status(_("importing bookmark %s\n") % b)
4978 ui.status(_("importing bookmark %s\n") % b)
4979 marks[b] = repo[remotebookmarks[b]].node()
4979 marks[b] = repo[remotebookmarks[b]].node()
4980 marks.write()
4980 marks.write()
4981 finally:
4981 finally:
4982 other.close()
4982 other.close()
4983 return ret
4983 return ret
4984
4984
4985 @command('^push',
4985 @command('^push',
4986 [('f', 'force', None, _('force push')),
4986 [('f', 'force', None, _('force push')),
4987 ('r', 'rev', [],
4987 ('r', 'rev', [],
4988 _('a changeset intended to be included in the destination'),
4988 _('a changeset intended to be included in the destination'),
4989 _('REV')),
4989 _('REV')),
4990 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4990 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4991 ('b', 'branch', [],
4991 ('b', 'branch', [],
4992 _('a specific branch you would like to push'), _('BRANCH')),
4992 _('a specific branch you would like to push'), _('BRANCH')),
4993 ('', 'new-branch', False, _('allow pushing a new branch')),
4993 ('', 'new-branch', False, _('allow pushing a new branch')),
4994 ] + remoteopts,
4994 ] + remoteopts,
4995 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4995 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4996 def push(ui, repo, dest=None, **opts):
4996 def push(ui, repo, dest=None, **opts):
4997 """push changes to the specified destination
4997 """push changes to the specified destination
4998
4998
4999 Push changesets from the local repository to the specified
4999 Push changesets from the local repository to the specified
5000 destination.
5000 destination.
5001
5001
5002 This operation is symmetrical to pull: it is identical to a pull
5002 This operation is symmetrical to pull: it is identical to a pull
5003 in the destination repository from the current one.
5003 in the destination repository from the current one.
5004
5004
5005 By default, push will not allow creation of new heads at the
5005 By default, push will not allow creation of new heads at the
5006 destination, since multiple heads would make it unclear which head
5006 destination, since multiple heads would make it unclear which head
5007 to use. In this situation, it is recommended to pull and merge
5007 to use. In this situation, it is recommended to pull and merge
5008 before pushing.
5008 before pushing.
5009
5009
5010 Use --new-branch if you want to allow push to create a new named
5010 Use --new-branch if you want to allow push to create a new named
5011 branch that is not present at the destination. This allows you to
5011 branch that is not present at the destination. This allows you to
5012 only create a new branch without forcing other changes.
5012 only create a new branch without forcing other changes.
5013
5013
5014 .. note::
5014 .. note::
5015
5015
5016 Extra care should be taken with the -f/--force option,
5016 Extra care should be taken with the -f/--force option,
5017 which will push all new heads on all branches, an action which will
5017 which will push all new heads on all branches, an action which will
5018 almost always cause confusion for collaborators.
5018 almost always cause confusion for collaborators.
5019
5019
5020 If -r/--rev is used, the specified revision and all its ancestors
5020 If -r/--rev is used, the specified revision and all its ancestors
5021 will be pushed to the remote repository.
5021 will be pushed to the remote repository.
5022
5022
5023 If -B/--bookmark is used, the specified bookmarked revision, its
5023 If -B/--bookmark is used, the specified bookmarked revision, its
5024 ancestors, and the bookmark will be pushed to the remote
5024 ancestors, and the bookmark will be pushed to the remote
5025 repository.
5025 repository.
5026
5026
5027 Please see :hg:`help urls` for important details about ``ssh://``
5027 Please see :hg:`help urls` for important details about ``ssh://``
5028 URLs. If DESTINATION is omitted, a default path will be used.
5028 URLs. If DESTINATION is omitted, a default path will be used.
5029
5029
5030 Returns 0 if push was successful, 1 if nothing to push.
5030 Returns 0 if push was successful, 1 if nothing to push.
5031 """
5031 """
5032
5032
5033 if opts.get('bookmark'):
5033 if opts.get('bookmark'):
5034 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5034 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5035 for b in opts['bookmark']:
5035 for b in opts['bookmark']:
5036 # translate -B options to -r so changesets get pushed
5036 # translate -B options to -r so changesets get pushed
5037 if b in repo._bookmarks:
5037 if b in repo._bookmarks:
5038 opts.setdefault('rev', []).append(b)
5038 opts.setdefault('rev', []).append(b)
5039 else:
5039 else:
5040 # if we try to push a deleted bookmark, translate it to null
5040 # if we try to push a deleted bookmark, translate it to null
5041 # this lets simultaneous -r, -b options continue working
5041 # this lets simultaneous -r, -b options continue working
5042 opts.setdefault('rev', []).append("null")
5042 opts.setdefault('rev', []).append("null")
5043
5043
5044 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5044 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5045 dest, branches = hg.parseurl(dest, opts.get('branch'))
5045 dest, branches = hg.parseurl(dest, opts.get('branch'))
5046 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5046 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5047 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5047 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5048 try:
5048 try:
5049 other = hg.peer(repo, opts, dest)
5049 other = hg.peer(repo, opts, dest)
5050 except error.RepoError:
5050 except error.RepoError:
5051 if dest == "default-push":
5051 if dest == "default-push":
5052 raise util.Abort(_("default repository not configured!"),
5052 raise util.Abort(_("default repository not configured!"),
5053 hint=_('see the "path" section in "hg help config"'))
5053 hint=_('see the "path" section in "hg help config"'))
5054 else:
5054 else:
5055 raise
5055 raise
5056
5056
5057 if revs:
5057 if revs:
5058 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5058 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5059
5059
5060 repo._subtoppath = dest
5060 repo._subtoppath = dest
5061 try:
5061 try:
5062 # push subrepos depth-first for coherent ordering
5062 # push subrepos depth-first for coherent ordering
5063 c = repo['']
5063 c = repo['']
5064 subs = c.substate # only repos that are committed
5064 subs = c.substate # only repos that are committed
5065 for s in sorted(subs):
5065 for s in sorted(subs):
5066 result = c.sub(s).push(opts)
5066 result = c.sub(s).push(opts)
5067 if result == 0:
5067 if result == 0:
5068 return not result
5068 return not result
5069 finally:
5069 finally:
5070 del repo._subtoppath
5070 del repo._subtoppath
5071 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5071 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5072 newbranch=opts.get('new_branch'))
5072 newbranch=opts.get('new_branch'))
5073
5073
5074 result = not pushop.cgresult
5074 result = not pushop.cgresult
5075
5075
5076 if opts.get('bookmark'):
5076 if opts.get('bookmark'):
5077 bresult = bookmarks.pushtoremote(ui, repo, other, opts['bookmark'])
5077 bresult = bookmarks.pushtoremote(ui, repo, other, opts['bookmark'])
5078 if bresult == 2:
5078 if bresult == 2:
5079 return 2
5079 result = 2
5080 if not result and bresult:
5080 elif not result and bresult:
5081 result = 2
5081 result = 2
5082
5082
5083 return result
5083 return result
5084
5084
5085 @command('recover', [])
5085 @command('recover', [])
5086 def recover(ui, repo):
5086 def recover(ui, repo):
5087 """roll back an interrupted transaction
5087 """roll back an interrupted transaction
5088
5088
5089 Recover from an interrupted commit or pull.
5089 Recover from an interrupted commit or pull.
5090
5090
5091 This command tries to fix the repository status after an
5091 This command tries to fix the repository status after an
5092 interrupted operation. It should only be necessary when Mercurial
5092 interrupted operation. It should only be necessary when Mercurial
5093 suggests it.
5093 suggests it.
5094
5094
5095 Returns 0 if successful, 1 if nothing to recover or verify fails.
5095 Returns 0 if successful, 1 if nothing to recover or verify fails.
5096 """
5096 """
5097 if repo.recover():
5097 if repo.recover():
5098 return hg.verify(repo)
5098 return hg.verify(repo)
5099 return 1
5099 return 1
5100
5100
5101 @command('^remove|rm',
5101 @command('^remove|rm',
5102 [('A', 'after', None, _('record delete for missing files')),
5102 [('A', 'after', None, _('record delete for missing files')),
5103 ('f', 'force', None,
5103 ('f', 'force', None,
5104 _('remove (and delete) file even if added or modified')),
5104 _('remove (and delete) file even if added or modified')),
5105 ] + walkopts,
5105 ] + walkopts,
5106 _('[OPTION]... FILE...'),
5106 _('[OPTION]... FILE...'),
5107 inferrepo=True)
5107 inferrepo=True)
5108 def remove(ui, repo, *pats, **opts):
5108 def remove(ui, repo, *pats, **opts):
5109 """remove the specified files on the next commit
5109 """remove the specified files on the next commit
5110
5110
5111 Schedule the indicated files for removal from the current branch.
5111 Schedule the indicated files for removal from the current branch.
5112
5112
5113 This command schedules the files to be removed at the next commit.
5113 This command schedules the files to be removed at the next commit.
5114 To undo a remove before that, see :hg:`revert`. To undo added
5114 To undo a remove before that, see :hg:`revert`. To undo added
5115 files, see :hg:`forget`.
5115 files, see :hg:`forget`.
5116
5116
5117 .. container:: verbose
5117 .. container:: verbose
5118
5118
5119 -A/--after can be used to remove only files that have already
5119 -A/--after can be used to remove only files that have already
5120 been deleted, -f/--force can be used to force deletion, and -Af
5120 been deleted, -f/--force can be used to force deletion, and -Af
5121 can be used to remove files from the next revision without
5121 can be used to remove files from the next revision without
5122 deleting them from the working directory.
5122 deleting them from the working directory.
5123
5123
5124 The following table details the behavior of remove for different
5124 The following table details the behavior of remove for different
5125 file states (columns) and option combinations (rows). The file
5125 file states (columns) and option combinations (rows). The file
5126 states are Added [A], Clean [C], Modified [M] and Missing [!]
5126 states are Added [A], Clean [C], Modified [M] and Missing [!]
5127 (as reported by :hg:`status`). The actions are Warn, Remove
5127 (as reported by :hg:`status`). The actions are Warn, Remove
5128 (from branch) and Delete (from disk):
5128 (from branch) and Delete (from disk):
5129
5129
5130 ========= == == == ==
5130 ========= == == == ==
5131 opt/state A C M !
5131 opt/state A C M !
5132 ========= == == == ==
5132 ========= == == == ==
5133 none W RD W R
5133 none W RD W R
5134 -f R RD RD R
5134 -f R RD RD R
5135 -A W W W R
5135 -A W W W R
5136 -Af R R R R
5136 -Af R R R R
5137 ========= == == == ==
5137 ========= == == == ==
5138
5138
5139 Note that remove never deletes files in Added [A] state from the
5139 Note that remove never deletes files in Added [A] state from the
5140 working directory, not even if option --force is specified.
5140 working directory, not even if option --force is specified.
5141
5141
5142 Returns 0 on success, 1 if any warnings encountered.
5142 Returns 0 on success, 1 if any warnings encountered.
5143 """
5143 """
5144
5144
5145 ret = 0
5145 ret = 0
5146 after, force = opts.get('after'), opts.get('force')
5146 after, force = opts.get('after'), opts.get('force')
5147 if not pats and not after:
5147 if not pats and not after:
5148 raise util.Abort(_('no files specified'))
5148 raise util.Abort(_('no files specified'))
5149
5149
5150 m = scmutil.match(repo[None], pats, opts)
5150 m = scmutil.match(repo[None], pats, opts)
5151 s = repo.status(match=m, clean=True)
5151 s = repo.status(match=m, clean=True)
5152 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
5152 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
5153
5153
5154 # warn about failure to delete explicit files/dirs
5154 # warn about failure to delete explicit files/dirs
5155 wctx = repo[None]
5155 wctx = repo[None]
5156 for f in m.files():
5156 for f in m.files():
5157 if f in repo.dirstate or f in wctx.dirs():
5157 if f in repo.dirstate or f in wctx.dirs():
5158 continue
5158 continue
5159 if os.path.exists(m.rel(f)):
5159 if os.path.exists(m.rel(f)):
5160 if os.path.isdir(m.rel(f)):
5160 if os.path.isdir(m.rel(f)):
5161 ui.warn(_('not removing %s: no tracked files\n') % m.rel(f))
5161 ui.warn(_('not removing %s: no tracked files\n') % m.rel(f))
5162 else:
5162 else:
5163 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
5163 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
5164 # missing files will generate a warning elsewhere
5164 # missing files will generate a warning elsewhere
5165 ret = 1
5165 ret = 1
5166
5166
5167 if force:
5167 if force:
5168 list = modified + deleted + clean + added
5168 list = modified + deleted + clean + added
5169 elif after:
5169 elif after:
5170 list = deleted
5170 list = deleted
5171 for f in modified + added + clean:
5171 for f in modified + added + clean:
5172 ui.warn(_('not removing %s: file still exists\n') % m.rel(f))
5172 ui.warn(_('not removing %s: file still exists\n') % m.rel(f))
5173 ret = 1
5173 ret = 1
5174 else:
5174 else:
5175 list = deleted + clean
5175 list = deleted + clean
5176 for f in modified:
5176 for f in modified:
5177 ui.warn(_('not removing %s: file is modified (use -f'
5177 ui.warn(_('not removing %s: file is modified (use -f'
5178 ' to force removal)\n') % m.rel(f))
5178 ' to force removal)\n') % m.rel(f))
5179 ret = 1
5179 ret = 1
5180 for f in added:
5180 for f in added:
5181 ui.warn(_('not removing %s: file has been marked for add'
5181 ui.warn(_('not removing %s: file has been marked for add'
5182 ' (use forget to undo)\n') % m.rel(f))
5182 ' (use forget to undo)\n') % m.rel(f))
5183 ret = 1
5183 ret = 1
5184
5184
5185 for f in sorted(list):
5185 for f in sorted(list):
5186 if ui.verbose or not m.exact(f):
5186 if ui.verbose or not m.exact(f):
5187 ui.status(_('removing %s\n') % m.rel(f))
5187 ui.status(_('removing %s\n') % m.rel(f))
5188
5188
5189 wlock = repo.wlock()
5189 wlock = repo.wlock()
5190 try:
5190 try:
5191 if not after:
5191 if not after:
5192 for f in list:
5192 for f in list:
5193 if f in added:
5193 if f in added:
5194 continue # we never unlink added files on remove
5194 continue # we never unlink added files on remove
5195 util.unlinkpath(repo.wjoin(f), ignoremissing=True)
5195 util.unlinkpath(repo.wjoin(f), ignoremissing=True)
5196 repo[None].forget(list)
5196 repo[None].forget(list)
5197 finally:
5197 finally:
5198 wlock.release()
5198 wlock.release()
5199
5199
5200 return ret
5200 return ret
5201
5201
5202 @command('rename|move|mv',
5202 @command('rename|move|mv',
5203 [('A', 'after', None, _('record a rename that has already occurred')),
5203 [('A', 'after', None, _('record a rename that has already occurred')),
5204 ('f', 'force', None, _('forcibly copy over an existing managed file')),
5204 ('f', 'force', None, _('forcibly copy over an existing managed file')),
5205 ] + walkopts + dryrunopts,
5205 ] + walkopts + dryrunopts,
5206 _('[OPTION]... SOURCE... DEST'))
5206 _('[OPTION]... SOURCE... DEST'))
5207 def rename(ui, repo, *pats, **opts):
5207 def rename(ui, repo, *pats, **opts):
5208 """rename files; equivalent of copy + remove
5208 """rename files; equivalent of copy + remove
5209
5209
5210 Mark dest as copies of sources; mark sources for deletion. If dest
5210 Mark dest as copies of sources; mark sources for deletion. If dest
5211 is a directory, copies are put in that directory. If dest is a
5211 is a directory, copies are put in that directory. If dest is a
5212 file, there can only be one source.
5212 file, there can only be one source.
5213
5213
5214 By default, this command copies the contents of files as they
5214 By default, this command copies the contents of files as they
5215 exist in the working directory. If invoked with -A/--after, the
5215 exist in the working directory. If invoked with -A/--after, the
5216 operation is recorded, but no copying is performed.
5216 operation is recorded, but no copying is performed.
5217
5217
5218 This command takes effect at the next commit. To undo a rename
5218 This command takes effect at the next commit. To undo a rename
5219 before that, see :hg:`revert`.
5219 before that, see :hg:`revert`.
5220
5220
5221 Returns 0 on success, 1 if errors are encountered.
5221 Returns 0 on success, 1 if errors are encountered.
5222 """
5222 """
5223 wlock = repo.wlock(False)
5223 wlock = repo.wlock(False)
5224 try:
5224 try:
5225 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5225 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5226 finally:
5226 finally:
5227 wlock.release()
5227 wlock.release()
5228
5228
5229 @command('resolve',
5229 @command('resolve',
5230 [('a', 'all', None, _('select all unresolved files')),
5230 [('a', 'all', None, _('select all unresolved files')),
5231 ('l', 'list', None, _('list state of files needing merge')),
5231 ('l', 'list', None, _('list state of files needing merge')),
5232 ('m', 'mark', None, _('mark files as resolved')),
5232 ('m', 'mark', None, _('mark files as resolved')),
5233 ('u', 'unmark', None, _('mark files as unresolved')),
5233 ('u', 'unmark', None, _('mark files as unresolved')),
5234 ('n', 'no-status', None, _('hide status prefix'))]
5234 ('n', 'no-status', None, _('hide status prefix'))]
5235 + mergetoolopts + walkopts,
5235 + mergetoolopts + walkopts,
5236 _('[OPTION]... [FILE]...'),
5236 _('[OPTION]... [FILE]...'),
5237 inferrepo=True)
5237 inferrepo=True)
5238 def resolve(ui, repo, *pats, **opts):
5238 def resolve(ui, repo, *pats, **opts):
5239 """redo merges or set/view the merge status of files
5239 """redo merges or set/view the merge status of files
5240
5240
5241 Merges with unresolved conflicts are often the result of
5241 Merges with unresolved conflicts are often the result of
5242 non-interactive merging using the ``internal:merge`` configuration
5242 non-interactive merging using the ``internal:merge`` configuration
5243 setting, or a command-line merge tool like ``diff3``. The resolve
5243 setting, or a command-line merge tool like ``diff3``. The resolve
5244 command is used to manage the files involved in a merge, after
5244 command is used to manage the files involved in a merge, after
5245 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5245 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5246 working directory must have two parents). See :hg:`help
5246 working directory must have two parents). See :hg:`help
5247 merge-tools` for information on configuring merge tools.
5247 merge-tools` for information on configuring merge tools.
5248
5248
5249 The resolve command can be used in the following ways:
5249 The resolve command can be used in the following ways:
5250
5250
5251 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
5251 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
5252 files, discarding any previous merge attempts. Re-merging is not
5252 files, discarding any previous merge attempts. Re-merging is not
5253 performed for files already marked as resolved. Use ``--all/-a``
5253 performed for files already marked as resolved. Use ``--all/-a``
5254 to select all unresolved files. ``--tool`` can be used to specify
5254 to select all unresolved files. ``--tool`` can be used to specify
5255 the merge tool used for the given files. It overrides the HGMERGE
5255 the merge tool used for the given files. It overrides the HGMERGE
5256 environment variable and your configuration files. Previous file
5256 environment variable and your configuration files. Previous file
5257 contents are saved with a ``.orig`` suffix.
5257 contents are saved with a ``.orig`` suffix.
5258
5258
5259 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5259 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5260 (e.g. after having manually fixed-up the files). The default is
5260 (e.g. after having manually fixed-up the files). The default is
5261 to mark all unresolved files.
5261 to mark all unresolved files.
5262
5262
5263 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5263 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5264 default is to mark all resolved files.
5264 default is to mark all resolved files.
5265
5265
5266 - :hg:`resolve -l`: list files which had or still have conflicts.
5266 - :hg:`resolve -l`: list files which had or still have conflicts.
5267 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5267 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5268
5268
5269 Note that Mercurial will not let you commit files with unresolved
5269 Note that Mercurial will not let you commit files with unresolved
5270 merge conflicts. You must use :hg:`resolve -m ...` before you can
5270 merge conflicts. You must use :hg:`resolve -m ...` before you can
5271 commit after a conflicting merge.
5271 commit after a conflicting merge.
5272
5272
5273 Returns 0 on success, 1 if any files fail a resolve attempt.
5273 Returns 0 on success, 1 if any files fail a resolve attempt.
5274 """
5274 """
5275
5275
5276 all, mark, unmark, show, nostatus = \
5276 all, mark, unmark, show, nostatus = \
5277 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
5277 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
5278
5278
5279 if (show and (mark or unmark)) or (mark and unmark):
5279 if (show and (mark or unmark)) or (mark and unmark):
5280 raise util.Abort(_("too many options specified"))
5280 raise util.Abort(_("too many options specified"))
5281 if pats and all:
5281 if pats and all:
5282 raise util.Abort(_("can't specify --all and patterns"))
5282 raise util.Abort(_("can't specify --all and patterns"))
5283 if not (all or pats or show or mark or unmark):
5283 if not (all or pats or show or mark or unmark):
5284 raise util.Abort(_('no files or directories specified'),
5284 raise util.Abort(_('no files or directories specified'),
5285 hint=('use --all to remerge all files'))
5285 hint=('use --all to remerge all files'))
5286
5286
5287 wlock = repo.wlock()
5287 wlock = repo.wlock()
5288 try:
5288 try:
5289 ms = mergemod.mergestate(repo)
5289 ms = mergemod.mergestate(repo)
5290
5290
5291 if not ms.active() and not show:
5291 if not ms.active() and not show:
5292 raise util.Abort(
5292 raise util.Abort(
5293 _('resolve command not applicable when not merging'))
5293 _('resolve command not applicable when not merging'))
5294
5294
5295 m = scmutil.match(repo[None], pats, opts)
5295 m = scmutil.match(repo[None], pats, opts)
5296 ret = 0
5296 ret = 0
5297 didwork = False
5297 didwork = False
5298
5298
5299 for f in ms:
5299 for f in ms:
5300 if not m(f):
5300 if not m(f):
5301 continue
5301 continue
5302
5302
5303 didwork = True
5303 didwork = True
5304
5304
5305 if show:
5305 if show:
5306 if nostatus:
5306 if nostatus:
5307 ui.write("%s\n" % f)
5307 ui.write("%s\n" % f)
5308 else:
5308 else:
5309 ui.write("%s %s\n" % (ms[f].upper(), f),
5309 ui.write("%s %s\n" % (ms[f].upper(), f),
5310 label='resolve.' +
5310 label='resolve.' +
5311 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
5311 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
5312 elif mark:
5312 elif mark:
5313 ms.mark(f, "r")
5313 ms.mark(f, "r")
5314 elif unmark:
5314 elif unmark:
5315 ms.mark(f, "u")
5315 ms.mark(f, "u")
5316 else:
5316 else:
5317 wctx = repo[None]
5317 wctx = repo[None]
5318
5318
5319 # backup pre-resolve (merge uses .orig for its own purposes)
5319 # backup pre-resolve (merge uses .orig for its own purposes)
5320 a = repo.wjoin(f)
5320 a = repo.wjoin(f)
5321 util.copyfile(a, a + ".resolve")
5321 util.copyfile(a, a + ".resolve")
5322
5322
5323 try:
5323 try:
5324 # resolve file
5324 # resolve file
5325 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5325 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5326 'resolve')
5326 'resolve')
5327 if ms.resolve(f, wctx):
5327 if ms.resolve(f, wctx):
5328 ret = 1
5328 ret = 1
5329 finally:
5329 finally:
5330 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5330 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5331 ms.commit()
5331 ms.commit()
5332
5332
5333 # replace filemerge's .orig file with our resolve file
5333 # replace filemerge's .orig file with our resolve file
5334 util.rename(a + ".resolve", a + ".orig")
5334 util.rename(a + ".resolve", a + ".orig")
5335
5335
5336 ms.commit()
5336 ms.commit()
5337
5337
5338 if not didwork and pats:
5338 if not didwork and pats:
5339 ui.warn(_("arguments do not match paths that need resolving\n"))
5339 ui.warn(_("arguments do not match paths that need resolving\n"))
5340
5340
5341 finally:
5341 finally:
5342 wlock.release()
5342 wlock.release()
5343
5343
5344 # Nudge users into finishing an unfinished operation. We don't print
5344 # Nudge users into finishing an unfinished operation. We don't print
5345 # this with the list/show operation because we want list/show to remain
5345 # this with the list/show operation because we want list/show to remain
5346 # machine readable.
5346 # machine readable.
5347 if not list(ms.unresolved()) and not show:
5347 if not list(ms.unresolved()) and not show:
5348 ui.status(_('(no more unresolved files)\n'))
5348 ui.status(_('(no more unresolved files)\n'))
5349
5349
5350 return ret
5350 return ret
5351
5351
5352 @command('revert',
5352 @command('revert',
5353 [('a', 'all', None, _('revert all changes when no arguments given')),
5353 [('a', 'all', None, _('revert all changes when no arguments given')),
5354 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5354 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5355 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
5355 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
5356 ('C', 'no-backup', None, _('do not save backup copies of files')),
5356 ('C', 'no-backup', None, _('do not save backup copies of files')),
5357 ] + walkopts + dryrunopts,
5357 ] + walkopts + dryrunopts,
5358 _('[OPTION]... [-r REV] [NAME]...'))
5358 _('[OPTION]... [-r REV] [NAME]...'))
5359 def revert(ui, repo, *pats, **opts):
5359 def revert(ui, repo, *pats, **opts):
5360 """restore files to their checkout state
5360 """restore files to their checkout state
5361
5361
5362 .. note::
5362 .. note::
5363
5363
5364 To check out earlier revisions, you should use :hg:`update REV`.
5364 To check out earlier revisions, you should use :hg:`update REV`.
5365 To cancel an uncommitted merge (and lose your changes),
5365 To cancel an uncommitted merge (and lose your changes),
5366 use :hg:`update --clean .`.
5366 use :hg:`update --clean .`.
5367
5367
5368 With no revision specified, revert the specified files or directories
5368 With no revision specified, revert the specified files or directories
5369 to the contents they had in the parent of the working directory.
5369 to the contents they had in the parent of the working directory.
5370 This restores the contents of files to an unmodified
5370 This restores the contents of files to an unmodified
5371 state and unschedules adds, removes, copies, and renames. If the
5371 state and unschedules adds, removes, copies, and renames. If the
5372 working directory has two parents, you must explicitly specify a
5372 working directory has two parents, you must explicitly specify a
5373 revision.
5373 revision.
5374
5374
5375 Using the -r/--rev or -d/--date options, revert the given files or
5375 Using the -r/--rev or -d/--date options, revert the given files or
5376 directories to their states as of a specific revision. Because
5376 directories to their states as of a specific revision. Because
5377 revert does not change the working directory parents, this will
5377 revert does not change the working directory parents, this will
5378 cause these files to appear modified. This can be helpful to "back
5378 cause these files to appear modified. This can be helpful to "back
5379 out" some or all of an earlier change. See :hg:`backout` for a
5379 out" some or all of an earlier change. See :hg:`backout` for a
5380 related method.
5380 related method.
5381
5381
5382 Modified files are saved with a .orig suffix before reverting.
5382 Modified files are saved with a .orig suffix before reverting.
5383 To disable these backups, use --no-backup.
5383 To disable these backups, use --no-backup.
5384
5384
5385 See :hg:`help dates` for a list of formats valid for -d/--date.
5385 See :hg:`help dates` for a list of formats valid for -d/--date.
5386
5386
5387 Returns 0 on success.
5387 Returns 0 on success.
5388 """
5388 """
5389
5389
5390 if opts.get("date"):
5390 if opts.get("date"):
5391 if opts.get("rev"):
5391 if opts.get("rev"):
5392 raise util.Abort(_("you can't specify a revision and a date"))
5392 raise util.Abort(_("you can't specify a revision and a date"))
5393 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
5393 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
5394
5394
5395 parent, p2 = repo.dirstate.parents()
5395 parent, p2 = repo.dirstate.parents()
5396 if not opts.get('rev') and p2 != nullid:
5396 if not opts.get('rev') and p2 != nullid:
5397 # revert after merge is a trap for new users (issue2915)
5397 # revert after merge is a trap for new users (issue2915)
5398 raise util.Abort(_('uncommitted merge with no revision specified'),
5398 raise util.Abort(_('uncommitted merge with no revision specified'),
5399 hint=_('use "hg update" or see "hg help revert"'))
5399 hint=_('use "hg update" or see "hg help revert"'))
5400
5400
5401 ctx = scmutil.revsingle(repo, opts.get('rev'))
5401 ctx = scmutil.revsingle(repo, opts.get('rev'))
5402
5402
5403 if not pats and not opts.get('all'):
5403 if not pats and not opts.get('all'):
5404 msg = _("no files or directories specified")
5404 msg = _("no files or directories specified")
5405 if p2 != nullid:
5405 if p2 != nullid:
5406 hint = _("uncommitted merge, use --all to discard all changes,"
5406 hint = _("uncommitted merge, use --all to discard all changes,"
5407 " or 'hg update -C .' to abort the merge")
5407 " or 'hg update -C .' to abort the merge")
5408 raise util.Abort(msg, hint=hint)
5408 raise util.Abort(msg, hint=hint)
5409 dirty = util.any(repo.status())
5409 dirty = util.any(repo.status())
5410 node = ctx.node()
5410 node = ctx.node()
5411 if node != parent:
5411 if node != parent:
5412 if dirty:
5412 if dirty:
5413 hint = _("uncommitted changes, use --all to discard all"
5413 hint = _("uncommitted changes, use --all to discard all"
5414 " changes, or 'hg update %s' to update") % ctx.rev()
5414 " changes, or 'hg update %s' to update") % ctx.rev()
5415 else:
5415 else:
5416 hint = _("use --all to revert all files,"
5416 hint = _("use --all to revert all files,"
5417 " or 'hg update %s' to update") % ctx.rev()
5417 " or 'hg update %s' to update") % ctx.rev()
5418 elif dirty:
5418 elif dirty:
5419 hint = _("uncommitted changes, use --all to discard all changes")
5419 hint = _("uncommitted changes, use --all to discard all changes")
5420 else:
5420 else:
5421 hint = _("use --all to revert all files")
5421 hint = _("use --all to revert all files")
5422 raise util.Abort(msg, hint=hint)
5422 raise util.Abort(msg, hint=hint)
5423
5423
5424 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
5424 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
5425
5425
5426 @command('rollback', dryrunopts +
5426 @command('rollback', dryrunopts +
5427 [('f', 'force', False, _('ignore safety measures'))])
5427 [('f', 'force', False, _('ignore safety measures'))])
5428 def rollback(ui, repo, **opts):
5428 def rollback(ui, repo, **opts):
5429 """roll back the last transaction (DANGEROUS) (DEPRECATED)
5429 """roll back the last transaction (DANGEROUS) (DEPRECATED)
5430
5430
5431 Please use :hg:`commit --amend` instead of rollback to correct
5431 Please use :hg:`commit --amend` instead of rollback to correct
5432 mistakes in the last commit.
5432 mistakes in the last commit.
5433
5433
5434 This command should be used with care. There is only one level of
5434 This command should be used with care. There is only one level of
5435 rollback, and there is no way to undo a rollback. It will also
5435 rollback, and there is no way to undo a rollback. It will also
5436 restore the dirstate at the time of the last transaction, losing
5436 restore the dirstate at the time of the last transaction, losing
5437 any dirstate changes since that time. This command does not alter
5437 any dirstate changes since that time. This command does not alter
5438 the working directory.
5438 the working directory.
5439
5439
5440 Transactions are used to encapsulate the effects of all commands
5440 Transactions are used to encapsulate the effects of all commands
5441 that create new changesets or propagate existing changesets into a
5441 that create new changesets or propagate existing changesets into a
5442 repository.
5442 repository.
5443
5443
5444 .. container:: verbose
5444 .. container:: verbose
5445
5445
5446 For example, the following commands are transactional, and their
5446 For example, the following commands are transactional, and their
5447 effects can be rolled back:
5447 effects can be rolled back:
5448
5448
5449 - commit
5449 - commit
5450 - import
5450 - import
5451 - pull
5451 - pull
5452 - push (with this repository as the destination)
5452 - push (with this repository as the destination)
5453 - unbundle
5453 - unbundle
5454
5454
5455 To avoid permanent data loss, rollback will refuse to rollback a
5455 To avoid permanent data loss, rollback will refuse to rollback a
5456 commit transaction if it isn't checked out. Use --force to
5456 commit transaction if it isn't checked out. Use --force to
5457 override this protection.
5457 override this protection.
5458
5458
5459 This command is not intended for use on public repositories. Once
5459 This command is not intended for use on public repositories. Once
5460 changes are visible for pull by other users, rolling a transaction
5460 changes are visible for pull by other users, rolling a transaction
5461 back locally is ineffective (someone else may already have pulled
5461 back locally is ineffective (someone else may already have pulled
5462 the changes). Furthermore, a race is possible with readers of the
5462 the changes). Furthermore, a race is possible with readers of the
5463 repository; for example an in-progress pull from the repository
5463 repository; for example an in-progress pull from the repository
5464 may fail if a rollback is performed.
5464 may fail if a rollback is performed.
5465
5465
5466 Returns 0 on success, 1 if no rollback data is available.
5466 Returns 0 on success, 1 if no rollback data is available.
5467 """
5467 """
5468 return repo.rollback(dryrun=opts.get('dry_run'),
5468 return repo.rollback(dryrun=opts.get('dry_run'),
5469 force=opts.get('force'))
5469 force=opts.get('force'))
5470
5470
5471 @command('root', [])
5471 @command('root', [])
5472 def root(ui, repo):
5472 def root(ui, repo):
5473 """print the root (top) of the current working directory
5473 """print the root (top) of the current working directory
5474
5474
5475 Print the root directory of the current repository.
5475 Print the root directory of the current repository.
5476
5476
5477 Returns 0 on success.
5477 Returns 0 on success.
5478 """
5478 """
5479 ui.write(repo.root + "\n")
5479 ui.write(repo.root + "\n")
5480
5480
5481 @command('^serve',
5481 @command('^serve',
5482 [('A', 'accesslog', '', _('name of access log file to write to'),
5482 [('A', 'accesslog', '', _('name of access log file to write to'),
5483 _('FILE')),
5483 _('FILE')),
5484 ('d', 'daemon', None, _('run server in background')),
5484 ('d', 'daemon', None, _('run server in background')),
5485 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')),
5485 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')),
5486 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
5486 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
5487 # use string type, then we can check if something was passed
5487 # use string type, then we can check if something was passed
5488 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
5488 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
5489 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
5489 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
5490 _('ADDR')),
5490 _('ADDR')),
5491 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
5491 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
5492 _('PREFIX')),
5492 _('PREFIX')),
5493 ('n', 'name', '',
5493 ('n', 'name', '',
5494 _('name to show in web pages (default: working directory)'), _('NAME')),
5494 _('name to show in web pages (default: working directory)'), _('NAME')),
5495 ('', 'web-conf', '',
5495 ('', 'web-conf', '',
5496 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
5496 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
5497 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
5497 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
5498 _('FILE')),
5498 _('FILE')),
5499 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
5499 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
5500 ('', 'stdio', None, _('for remote clients')),
5500 ('', 'stdio', None, _('for remote clients')),
5501 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
5501 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
5502 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
5502 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
5503 ('', 'style', '', _('template style to use'), _('STYLE')),
5503 ('', 'style', '', _('template style to use'), _('STYLE')),
5504 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
5504 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
5505 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
5505 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
5506 _('[OPTION]...'),
5506 _('[OPTION]...'),
5507 optionalrepo=True)
5507 optionalrepo=True)
5508 def serve(ui, repo, **opts):
5508 def serve(ui, repo, **opts):
5509 """start stand-alone webserver
5509 """start stand-alone webserver
5510
5510
5511 Start a local HTTP repository browser and pull server. You can use
5511 Start a local HTTP repository browser and pull server. You can use
5512 this for ad-hoc sharing and browsing of repositories. It is
5512 this for ad-hoc sharing and browsing of repositories. It is
5513 recommended to use a real web server to serve a repository for
5513 recommended to use a real web server to serve a repository for
5514 longer periods of time.
5514 longer periods of time.
5515
5515
5516 Please note that the server does not implement access control.
5516 Please note that the server does not implement access control.
5517 This means that, by default, anybody can read from the server and
5517 This means that, by default, anybody can read from the server and
5518 nobody can write to it by default. Set the ``web.allow_push``
5518 nobody can write to it by default. Set the ``web.allow_push``
5519 option to ``*`` to allow everybody to push to the server. You
5519 option to ``*`` to allow everybody to push to the server. You
5520 should use a real web server if you need to authenticate users.
5520 should use a real web server if you need to authenticate users.
5521
5521
5522 By default, the server logs accesses to stdout and errors to
5522 By default, the server logs accesses to stdout and errors to
5523 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5523 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5524 files.
5524 files.
5525
5525
5526 To have the server choose a free port number to listen on, specify
5526 To have the server choose a free port number to listen on, specify
5527 a port number of 0; in this case, the server will print the port
5527 a port number of 0; in this case, the server will print the port
5528 number it uses.
5528 number it uses.
5529
5529
5530 Returns 0 on success.
5530 Returns 0 on success.
5531 """
5531 """
5532
5532
5533 if opts["stdio"] and opts["cmdserver"]:
5533 if opts["stdio"] and opts["cmdserver"]:
5534 raise util.Abort(_("cannot use --stdio with --cmdserver"))
5534 raise util.Abort(_("cannot use --stdio with --cmdserver"))
5535
5535
5536 if opts["stdio"]:
5536 if opts["stdio"]:
5537 if repo is None:
5537 if repo is None:
5538 raise error.RepoError(_("there is no Mercurial repository here"
5538 raise error.RepoError(_("there is no Mercurial repository here"
5539 " (.hg not found)"))
5539 " (.hg not found)"))
5540 s = sshserver.sshserver(ui, repo)
5540 s = sshserver.sshserver(ui, repo)
5541 s.serve_forever()
5541 s.serve_forever()
5542
5542
5543 if opts["cmdserver"]:
5543 if opts["cmdserver"]:
5544 s = commandserver.server(ui, repo, opts["cmdserver"])
5544 s = commandserver.server(ui, repo, opts["cmdserver"])
5545 return s.serve()
5545 return s.serve()
5546
5546
5547 # this way we can check if something was given in the command-line
5547 # this way we can check if something was given in the command-line
5548 if opts.get('port'):
5548 if opts.get('port'):
5549 opts['port'] = util.getport(opts.get('port'))
5549 opts['port'] = util.getport(opts.get('port'))
5550
5550
5551 baseui = repo and repo.baseui or ui
5551 baseui = repo and repo.baseui or ui
5552 optlist = ("name templates style address port prefix ipv6"
5552 optlist = ("name templates style address port prefix ipv6"
5553 " accesslog errorlog certificate encoding")
5553 " accesslog errorlog certificate encoding")
5554 for o in optlist.split():
5554 for o in optlist.split():
5555 val = opts.get(o, '')
5555 val = opts.get(o, '')
5556 if val in (None, ''): # should check against default options instead
5556 if val in (None, ''): # should check against default options instead
5557 continue
5557 continue
5558 baseui.setconfig("web", o, val, 'serve')
5558 baseui.setconfig("web", o, val, 'serve')
5559 if repo and repo.ui != baseui:
5559 if repo and repo.ui != baseui:
5560 repo.ui.setconfig("web", o, val, 'serve')
5560 repo.ui.setconfig("web", o, val, 'serve')
5561
5561
5562 o = opts.get('web_conf') or opts.get('webdir_conf')
5562 o = opts.get('web_conf') or opts.get('webdir_conf')
5563 if not o:
5563 if not o:
5564 if not repo:
5564 if not repo:
5565 raise error.RepoError(_("there is no Mercurial repository"
5565 raise error.RepoError(_("there is no Mercurial repository"
5566 " here (.hg not found)"))
5566 " here (.hg not found)"))
5567 o = repo
5567 o = repo
5568
5568
5569 app = hgweb.hgweb(o, baseui=baseui)
5569 app = hgweb.hgweb(o, baseui=baseui)
5570 service = httpservice(ui, app, opts)
5570 service = httpservice(ui, app, opts)
5571 cmdutil.service(opts, initfn=service.init, runfn=service.run)
5571 cmdutil.service(opts, initfn=service.init, runfn=service.run)
5572
5572
5573 class httpservice(object):
5573 class httpservice(object):
5574 def __init__(self, ui, app, opts):
5574 def __init__(self, ui, app, opts):
5575 self.ui = ui
5575 self.ui = ui
5576 self.app = app
5576 self.app = app
5577 self.opts = opts
5577 self.opts = opts
5578
5578
5579 def init(self):
5579 def init(self):
5580 util.setsignalhandler()
5580 util.setsignalhandler()
5581 self.httpd = hgweb_server.create_server(self.ui, self.app)
5581 self.httpd = hgweb_server.create_server(self.ui, self.app)
5582
5582
5583 if self.opts['port'] and not self.ui.verbose:
5583 if self.opts['port'] and not self.ui.verbose:
5584 return
5584 return
5585
5585
5586 if self.httpd.prefix:
5586 if self.httpd.prefix:
5587 prefix = self.httpd.prefix.strip('/') + '/'
5587 prefix = self.httpd.prefix.strip('/') + '/'
5588 else:
5588 else:
5589 prefix = ''
5589 prefix = ''
5590
5590
5591 port = ':%d' % self.httpd.port
5591 port = ':%d' % self.httpd.port
5592 if port == ':80':
5592 if port == ':80':
5593 port = ''
5593 port = ''
5594
5594
5595 bindaddr = self.httpd.addr
5595 bindaddr = self.httpd.addr
5596 if bindaddr == '0.0.0.0':
5596 if bindaddr == '0.0.0.0':
5597 bindaddr = '*'
5597 bindaddr = '*'
5598 elif ':' in bindaddr: # IPv6
5598 elif ':' in bindaddr: # IPv6
5599 bindaddr = '[%s]' % bindaddr
5599 bindaddr = '[%s]' % bindaddr
5600
5600
5601 fqaddr = self.httpd.fqaddr
5601 fqaddr = self.httpd.fqaddr
5602 if ':' in fqaddr:
5602 if ':' in fqaddr:
5603 fqaddr = '[%s]' % fqaddr
5603 fqaddr = '[%s]' % fqaddr
5604 if self.opts['port']:
5604 if self.opts['port']:
5605 write = self.ui.status
5605 write = self.ui.status
5606 else:
5606 else:
5607 write = self.ui.write
5607 write = self.ui.write
5608 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
5608 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
5609 (fqaddr, port, prefix, bindaddr, self.httpd.port))
5609 (fqaddr, port, prefix, bindaddr, self.httpd.port))
5610 self.ui.flush() # avoid buffering of status message
5610 self.ui.flush() # avoid buffering of status message
5611
5611
5612 def run(self):
5612 def run(self):
5613 self.httpd.serve_forever()
5613 self.httpd.serve_forever()
5614
5614
5615
5615
5616 @command('^status|st',
5616 @command('^status|st',
5617 [('A', 'all', None, _('show status of all files')),
5617 [('A', 'all', None, _('show status of all files')),
5618 ('m', 'modified', None, _('show only modified files')),
5618 ('m', 'modified', None, _('show only modified files')),
5619 ('a', 'added', None, _('show only added files')),
5619 ('a', 'added', None, _('show only added files')),
5620 ('r', 'removed', None, _('show only removed files')),
5620 ('r', 'removed', None, _('show only removed files')),
5621 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5621 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5622 ('c', 'clean', None, _('show only files without changes')),
5622 ('c', 'clean', None, _('show only files without changes')),
5623 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5623 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5624 ('i', 'ignored', None, _('show only ignored files')),
5624 ('i', 'ignored', None, _('show only ignored files')),
5625 ('n', 'no-status', None, _('hide status prefix')),
5625 ('n', 'no-status', None, _('hide status prefix')),
5626 ('C', 'copies', None, _('show source of copied files')),
5626 ('C', 'copies', None, _('show source of copied files')),
5627 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5627 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5628 ('', 'rev', [], _('show difference from revision'), _('REV')),
5628 ('', 'rev', [], _('show difference from revision'), _('REV')),
5629 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5629 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5630 ] + walkopts + subrepoopts + formatteropts,
5630 ] + walkopts + subrepoopts + formatteropts,
5631 _('[OPTION]... [FILE]...'),
5631 _('[OPTION]... [FILE]...'),
5632 inferrepo=True)
5632 inferrepo=True)
5633 def status(ui, repo, *pats, **opts):
5633 def status(ui, repo, *pats, **opts):
5634 """show changed files in the working directory
5634 """show changed files in the working directory
5635
5635
5636 Show status of files in the repository. If names are given, only
5636 Show status of files in the repository. If names are given, only
5637 files that match are shown. Files that are clean or ignored or
5637 files that match are shown. Files that are clean or ignored or
5638 the source of a copy/move operation, are not listed unless
5638 the source of a copy/move operation, are not listed unless
5639 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5639 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5640 Unless options described with "show only ..." are given, the
5640 Unless options described with "show only ..." are given, the
5641 options -mardu are used.
5641 options -mardu are used.
5642
5642
5643 Option -q/--quiet hides untracked (unknown and ignored) files
5643 Option -q/--quiet hides untracked (unknown and ignored) files
5644 unless explicitly requested with -u/--unknown or -i/--ignored.
5644 unless explicitly requested with -u/--unknown or -i/--ignored.
5645
5645
5646 .. note::
5646 .. note::
5647
5647
5648 status may appear to disagree with diff if permissions have
5648 status may appear to disagree with diff if permissions have
5649 changed or a merge has occurred. The standard diff format does
5649 changed or a merge has occurred. The standard diff format does
5650 not report permission changes and diff only reports changes
5650 not report permission changes and diff only reports changes
5651 relative to one merge parent.
5651 relative to one merge parent.
5652
5652
5653 If one revision is given, it is used as the base revision.
5653 If one revision is given, it is used as the base revision.
5654 If two revisions are given, the differences between them are
5654 If two revisions are given, the differences between them are
5655 shown. The --change option can also be used as a shortcut to list
5655 shown. The --change option can also be used as a shortcut to list
5656 the changed files of a revision from its first parent.
5656 the changed files of a revision from its first parent.
5657
5657
5658 The codes used to show the status of files are::
5658 The codes used to show the status of files are::
5659
5659
5660 M = modified
5660 M = modified
5661 A = added
5661 A = added
5662 R = removed
5662 R = removed
5663 C = clean
5663 C = clean
5664 ! = missing (deleted by non-hg command, but still tracked)
5664 ! = missing (deleted by non-hg command, but still tracked)
5665 ? = not tracked
5665 ? = not tracked
5666 I = ignored
5666 I = ignored
5667 = origin of the previous file (with --copies)
5667 = origin of the previous file (with --copies)
5668
5668
5669 .. container:: verbose
5669 .. container:: verbose
5670
5670
5671 Examples:
5671 Examples:
5672
5672
5673 - show changes in the working directory relative to a
5673 - show changes in the working directory relative to a
5674 changeset::
5674 changeset::
5675
5675
5676 hg status --rev 9353
5676 hg status --rev 9353
5677
5677
5678 - show all changes including copies in an existing changeset::
5678 - show all changes including copies in an existing changeset::
5679
5679
5680 hg status --copies --change 9353
5680 hg status --copies --change 9353
5681
5681
5682 - get a NUL separated list of added files, suitable for xargs::
5682 - get a NUL separated list of added files, suitable for xargs::
5683
5683
5684 hg status -an0
5684 hg status -an0
5685
5685
5686 Returns 0 on success.
5686 Returns 0 on success.
5687 """
5687 """
5688
5688
5689 revs = opts.get('rev')
5689 revs = opts.get('rev')
5690 change = opts.get('change')
5690 change = opts.get('change')
5691
5691
5692 if revs and change:
5692 if revs and change:
5693 msg = _('cannot specify --rev and --change at the same time')
5693 msg = _('cannot specify --rev and --change at the same time')
5694 raise util.Abort(msg)
5694 raise util.Abort(msg)
5695 elif change:
5695 elif change:
5696 node2 = scmutil.revsingle(repo, change, None).node()
5696 node2 = scmutil.revsingle(repo, change, None).node()
5697 node1 = repo[node2].p1().node()
5697 node1 = repo[node2].p1().node()
5698 else:
5698 else:
5699 node1, node2 = scmutil.revpair(repo, revs)
5699 node1, node2 = scmutil.revpair(repo, revs)
5700
5700
5701 cwd = (pats and repo.getcwd()) or ''
5701 cwd = (pats and repo.getcwd()) or ''
5702 end = opts.get('print0') and '\0' or '\n'
5702 end = opts.get('print0') and '\0' or '\n'
5703 copy = {}
5703 copy = {}
5704 states = 'modified added removed deleted unknown ignored clean'.split()
5704 states = 'modified added removed deleted unknown ignored clean'.split()
5705 show = [k for k in states if opts.get(k)]
5705 show = [k for k in states if opts.get(k)]
5706 if opts.get('all'):
5706 if opts.get('all'):
5707 show += ui.quiet and (states[:4] + ['clean']) or states
5707 show += ui.quiet and (states[:4] + ['clean']) or states
5708 if not show:
5708 if not show:
5709 show = ui.quiet and states[:4] or states[:5]
5709 show = ui.quiet and states[:4] or states[:5]
5710
5710
5711 stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts),
5711 stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts),
5712 'ignored' in show, 'clean' in show, 'unknown' in show,
5712 'ignored' in show, 'clean' in show, 'unknown' in show,
5713 opts.get('subrepos'))
5713 opts.get('subrepos'))
5714 changestates = zip(states, 'MAR!?IC', stat)
5714 changestates = zip(states, 'MAR!?IC', stat)
5715
5715
5716 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
5716 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
5717 copy = copies.pathcopies(repo[node1], repo[node2])
5717 copy = copies.pathcopies(repo[node1], repo[node2])
5718
5718
5719 fm = ui.formatter('status', opts)
5719 fm = ui.formatter('status', opts)
5720 fmt = '%s' + end
5720 fmt = '%s' + end
5721 showchar = not opts.get('no_status')
5721 showchar = not opts.get('no_status')
5722
5722
5723 for state, char, files in changestates:
5723 for state, char, files in changestates:
5724 if state in show:
5724 if state in show:
5725 label = 'status.' + state
5725 label = 'status.' + state
5726 for f in files:
5726 for f in files:
5727 fm.startitem()
5727 fm.startitem()
5728 fm.condwrite(showchar, 'status', '%s ', char, label=label)
5728 fm.condwrite(showchar, 'status', '%s ', char, label=label)
5729 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
5729 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
5730 if f in copy:
5730 if f in copy:
5731 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
5731 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
5732 label='status.copied')
5732 label='status.copied')
5733 fm.end()
5733 fm.end()
5734
5734
5735 @command('^summary|sum',
5735 @command('^summary|sum',
5736 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
5736 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
5737 def summary(ui, repo, **opts):
5737 def summary(ui, repo, **opts):
5738 """summarize working directory state
5738 """summarize working directory state
5739
5739
5740 This generates a brief summary of the working directory state,
5740 This generates a brief summary of the working directory state,
5741 including parents, branch, commit status, and available updates.
5741 including parents, branch, commit status, and available updates.
5742
5742
5743 With the --remote option, this will check the default paths for
5743 With the --remote option, this will check the default paths for
5744 incoming and outgoing changes. This can be time-consuming.
5744 incoming and outgoing changes. This can be time-consuming.
5745
5745
5746 Returns 0 on success.
5746 Returns 0 on success.
5747 """
5747 """
5748
5748
5749 ctx = repo[None]
5749 ctx = repo[None]
5750 parents = ctx.parents()
5750 parents = ctx.parents()
5751 pnode = parents[0].node()
5751 pnode = parents[0].node()
5752 marks = []
5752 marks = []
5753
5753
5754 for p in parents:
5754 for p in parents:
5755 # label with log.changeset (instead of log.parent) since this
5755 # label with log.changeset (instead of log.parent) since this
5756 # shows a working directory parent *changeset*:
5756 # shows a working directory parent *changeset*:
5757 # i18n: column positioning for "hg summary"
5757 # i18n: column positioning for "hg summary"
5758 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
5758 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
5759 label='log.changeset changeset.%s' % p.phasestr())
5759 label='log.changeset changeset.%s' % p.phasestr())
5760 ui.write(' '.join(p.tags()), label='log.tag')
5760 ui.write(' '.join(p.tags()), label='log.tag')
5761 if p.bookmarks():
5761 if p.bookmarks():
5762 marks.extend(p.bookmarks())
5762 marks.extend(p.bookmarks())
5763 if p.rev() == -1:
5763 if p.rev() == -1:
5764 if not len(repo):
5764 if not len(repo):
5765 ui.write(_(' (empty repository)'))
5765 ui.write(_(' (empty repository)'))
5766 else:
5766 else:
5767 ui.write(_(' (no revision checked out)'))
5767 ui.write(_(' (no revision checked out)'))
5768 ui.write('\n')
5768 ui.write('\n')
5769 if p.description():
5769 if p.description():
5770 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5770 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5771 label='log.summary')
5771 label='log.summary')
5772
5772
5773 branch = ctx.branch()
5773 branch = ctx.branch()
5774 bheads = repo.branchheads(branch)
5774 bheads = repo.branchheads(branch)
5775 # i18n: column positioning for "hg summary"
5775 # i18n: column positioning for "hg summary"
5776 m = _('branch: %s\n') % branch
5776 m = _('branch: %s\n') % branch
5777 if branch != 'default':
5777 if branch != 'default':
5778 ui.write(m, label='log.branch')
5778 ui.write(m, label='log.branch')
5779 else:
5779 else:
5780 ui.status(m, label='log.branch')
5780 ui.status(m, label='log.branch')
5781
5781
5782 if marks:
5782 if marks:
5783 current = repo._bookmarkcurrent
5783 current = repo._bookmarkcurrent
5784 # i18n: column positioning for "hg summary"
5784 # i18n: column positioning for "hg summary"
5785 ui.write(_('bookmarks:'), label='log.bookmark')
5785 ui.write(_('bookmarks:'), label='log.bookmark')
5786 if current is not None:
5786 if current is not None:
5787 if current in marks:
5787 if current in marks:
5788 ui.write(' *' + current, label='bookmarks.current')
5788 ui.write(' *' + current, label='bookmarks.current')
5789 marks.remove(current)
5789 marks.remove(current)
5790 else:
5790 else:
5791 ui.write(' [%s]' % current, label='bookmarks.current')
5791 ui.write(' [%s]' % current, label='bookmarks.current')
5792 for m in marks:
5792 for m in marks:
5793 ui.write(' ' + m, label='log.bookmark')
5793 ui.write(' ' + m, label='log.bookmark')
5794 ui.write('\n', label='log.bookmark')
5794 ui.write('\n', label='log.bookmark')
5795
5795
5796 st = list(repo.status(unknown=True))[:6]
5796 st = list(repo.status(unknown=True))[:6]
5797
5797
5798 c = repo.dirstate.copies()
5798 c = repo.dirstate.copies()
5799 copied, renamed = [], []
5799 copied, renamed = [], []
5800 for d, s in c.iteritems():
5800 for d, s in c.iteritems():
5801 if s in st[2]:
5801 if s in st[2]:
5802 st[2].remove(s)
5802 st[2].remove(s)
5803 renamed.append(d)
5803 renamed.append(d)
5804 else:
5804 else:
5805 copied.append(d)
5805 copied.append(d)
5806 if d in st[1]:
5806 if d in st[1]:
5807 st[1].remove(d)
5807 st[1].remove(d)
5808 st.insert(3, renamed)
5808 st.insert(3, renamed)
5809 st.insert(4, copied)
5809 st.insert(4, copied)
5810
5810
5811 ms = mergemod.mergestate(repo)
5811 ms = mergemod.mergestate(repo)
5812 st.append([f for f in ms if ms[f] == 'u'])
5812 st.append([f for f in ms if ms[f] == 'u'])
5813
5813
5814 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5814 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5815 st.append(subs)
5815 st.append(subs)
5816
5816
5817 labels = [ui.label(_('%d modified'), 'status.modified'),
5817 labels = [ui.label(_('%d modified'), 'status.modified'),
5818 ui.label(_('%d added'), 'status.added'),
5818 ui.label(_('%d added'), 'status.added'),
5819 ui.label(_('%d removed'), 'status.removed'),
5819 ui.label(_('%d removed'), 'status.removed'),
5820 ui.label(_('%d renamed'), 'status.copied'),
5820 ui.label(_('%d renamed'), 'status.copied'),
5821 ui.label(_('%d copied'), 'status.copied'),
5821 ui.label(_('%d copied'), 'status.copied'),
5822 ui.label(_('%d deleted'), 'status.deleted'),
5822 ui.label(_('%d deleted'), 'status.deleted'),
5823 ui.label(_('%d unknown'), 'status.unknown'),
5823 ui.label(_('%d unknown'), 'status.unknown'),
5824 ui.label(_('%d ignored'), 'status.ignored'),
5824 ui.label(_('%d ignored'), 'status.ignored'),
5825 ui.label(_('%d unresolved'), 'resolve.unresolved'),
5825 ui.label(_('%d unresolved'), 'resolve.unresolved'),
5826 ui.label(_('%d subrepos'), 'status.modified')]
5826 ui.label(_('%d subrepos'), 'status.modified')]
5827 t = []
5827 t = []
5828 for s, l in zip(st, labels):
5828 for s, l in zip(st, labels):
5829 if s:
5829 if s:
5830 t.append(l % len(s))
5830 t.append(l % len(s))
5831
5831
5832 t = ', '.join(t)
5832 t = ', '.join(t)
5833 cleanworkdir = False
5833 cleanworkdir = False
5834
5834
5835 if repo.vfs.exists('updatestate'):
5835 if repo.vfs.exists('updatestate'):
5836 t += _(' (interrupted update)')
5836 t += _(' (interrupted update)')
5837 elif len(parents) > 1:
5837 elif len(parents) > 1:
5838 t += _(' (merge)')
5838 t += _(' (merge)')
5839 elif branch != parents[0].branch():
5839 elif branch != parents[0].branch():
5840 t += _(' (new branch)')
5840 t += _(' (new branch)')
5841 elif (parents[0].closesbranch() and
5841 elif (parents[0].closesbranch() and
5842 pnode in repo.branchheads(branch, closed=True)):
5842 pnode in repo.branchheads(branch, closed=True)):
5843 t += _(' (head closed)')
5843 t += _(' (head closed)')
5844 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]):
5844 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]):
5845 t += _(' (clean)')
5845 t += _(' (clean)')
5846 cleanworkdir = True
5846 cleanworkdir = True
5847 elif pnode not in bheads:
5847 elif pnode not in bheads:
5848 t += _(' (new branch head)')
5848 t += _(' (new branch head)')
5849
5849
5850 if cleanworkdir:
5850 if cleanworkdir:
5851 # i18n: column positioning for "hg summary"
5851 # i18n: column positioning for "hg summary"
5852 ui.status(_('commit: %s\n') % t.strip())
5852 ui.status(_('commit: %s\n') % t.strip())
5853 else:
5853 else:
5854 # i18n: column positioning for "hg summary"
5854 # i18n: column positioning for "hg summary"
5855 ui.write(_('commit: %s\n') % t.strip())
5855 ui.write(_('commit: %s\n') % t.strip())
5856
5856
5857 # all ancestors of branch heads - all ancestors of parent = new csets
5857 # all ancestors of branch heads - all ancestors of parent = new csets
5858 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
5858 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
5859 bheads))
5859 bheads))
5860
5860
5861 if new == 0:
5861 if new == 0:
5862 # i18n: column positioning for "hg summary"
5862 # i18n: column positioning for "hg summary"
5863 ui.status(_('update: (current)\n'))
5863 ui.status(_('update: (current)\n'))
5864 elif pnode not in bheads:
5864 elif pnode not in bheads:
5865 # i18n: column positioning for "hg summary"
5865 # i18n: column positioning for "hg summary"
5866 ui.write(_('update: %d new changesets (update)\n') % new)
5866 ui.write(_('update: %d new changesets (update)\n') % new)
5867 else:
5867 else:
5868 # i18n: column positioning for "hg summary"
5868 # i18n: column positioning for "hg summary"
5869 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5869 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5870 (new, len(bheads)))
5870 (new, len(bheads)))
5871
5871
5872 cmdutil.summaryhooks(ui, repo)
5872 cmdutil.summaryhooks(ui, repo)
5873
5873
5874 if opts.get('remote'):
5874 if opts.get('remote'):
5875 needsincoming, needsoutgoing = True, True
5875 needsincoming, needsoutgoing = True, True
5876 else:
5876 else:
5877 needsincoming, needsoutgoing = False, False
5877 needsincoming, needsoutgoing = False, False
5878 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
5878 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
5879 if i:
5879 if i:
5880 needsincoming = True
5880 needsincoming = True
5881 if o:
5881 if o:
5882 needsoutgoing = True
5882 needsoutgoing = True
5883 if not needsincoming and not needsoutgoing:
5883 if not needsincoming and not needsoutgoing:
5884 return
5884 return
5885
5885
5886 def getincoming():
5886 def getincoming():
5887 source, branches = hg.parseurl(ui.expandpath('default'))
5887 source, branches = hg.parseurl(ui.expandpath('default'))
5888 sbranch = branches[0]
5888 sbranch = branches[0]
5889 try:
5889 try:
5890 other = hg.peer(repo, {}, source)
5890 other = hg.peer(repo, {}, source)
5891 except error.RepoError:
5891 except error.RepoError:
5892 if opts.get('remote'):
5892 if opts.get('remote'):
5893 raise
5893 raise
5894 return source, sbranch, None, None, None
5894 return source, sbranch, None, None, None
5895 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5895 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5896 if revs:
5896 if revs:
5897 revs = [other.lookup(rev) for rev in revs]
5897 revs = [other.lookup(rev) for rev in revs]
5898 ui.debug('comparing with %s\n' % util.hidepassword(source))
5898 ui.debug('comparing with %s\n' % util.hidepassword(source))
5899 repo.ui.pushbuffer()
5899 repo.ui.pushbuffer()
5900 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5900 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5901 repo.ui.popbuffer()
5901 repo.ui.popbuffer()
5902 return source, sbranch, other, commoninc, commoninc[1]
5902 return source, sbranch, other, commoninc, commoninc[1]
5903
5903
5904 if needsincoming:
5904 if needsincoming:
5905 source, sbranch, sother, commoninc, incoming = getincoming()
5905 source, sbranch, sother, commoninc, incoming = getincoming()
5906 else:
5906 else:
5907 source = sbranch = sother = commoninc = incoming = None
5907 source = sbranch = sother = commoninc = incoming = None
5908
5908
5909 def getoutgoing():
5909 def getoutgoing():
5910 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5910 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5911 dbranch = branches[0]
5911 dbranch = branches[0]
5912 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5912 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5913 if source != dest:
5913 if source != dest:
5914 try:
5914 try:
5915 dother = hg.peer(repo, {}, dest)
5915 dother = hg.peer(repo, {}, dest)
5916 except error.RepoError:
5916 except error.RepoError:
5917 if opts.get('remote'):
5917 if opts.get('remote'):
5918 raise
5918 raise
5919 return dest, dbranch, None, None
5919 return dest, dbranch, None, None
5920 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5920 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5921 elif sother is None:
5921 elif sother is None:
5922 # there is no explicit destination peer, but source one is invalid
5922 # there is no explicit destination peer, but source one is invalid
5923 return dest, dbranch, None, None
5923 return dest, dbranch, None, None
5924 else:
5924 else:
5925 dother = sother
5925 dother = sother
5926 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5926 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5927 common = None
5927 common = None
5928 else:
5928 else:
5929 common = commoninc
5929 common = commoninc
5930 if revs:
5930 if revs:
5931 revs = [repo.lookup(rev) for rev in revs]
5931 revs = [repo.lookup(rev) for rev in revs]
5932 repo.ui.pushbuffer()
5932 repo.ui.pushbuffer()
5933 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5933 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5934 commoninc=common)
5934 commoninc=common)
5935 repo.ui.popbuffer()
5935 repo.ui.popbuffer()
5936 return dest, dbranch, dother, outgoing
5936 return dest, dbranch, dother, outgoing
5937
5937
5938 if needsoutgoing:
5938 if needsoutgoing:
5939 dest, dbranch, dother, outgoing = getoutgoing()
5939 dest, dbranch, dother, outgoing = getoutgoing()
5940 else:
5940 else:
5941 dest = dbranch = dother = outgoing = None
5941 dest = dbranch = dother = outgoing = None
5942
5942
5943 if opts.get('remote'):
5943 if opts.get('remote'):
5944 t = []
5944 t = []
5945 if incoming:
5945 if incoming:
5946 t.append(_('1 or more incoming'))
5946 t.append(_('1 or more incoming'))
5947 o = outgoing.missing
5947 o = outgoing.missing
5948 if o:
5948 if o:
5949 t.append(_('%d outgoing') % len(o))
5949 t.append(_('%d outgoing') % len(o))
5950 other = dother or sother
5950 other = dother or sother
5951 if 'bookmarks' in other.listkeys('namespaces'):
5951 if 'bookmarks' in other.listkeys('namespaces'):
5952 lmarks = repo.listkeys('bookmarks')
5952 lmarks = repo.listkeys('bookmarks')
5953 rmarks = other.listkeys('bookmarks')
5953 rmarks = other.listkeys('bookmarks')
5954 diff = set(rmarks) - set(lmarks)
5954 diff = set(rmarks) - set(lmarks)
5955 if len(diff) > 0:
5955 if len(diff) > 0:
5956 t.append(_('%d incoming bookmarks') % len(diff))
5956 t.append(_('%d incoming bookmarks') % len(diff))
5957 diff = set(lmarks) - set(rmarks)
5957 diff = set(lmarks) - set(rmarks)
5958 if len(diff) > 0:
5958 if len(diff) > 0:
5959 t.append(_('%d outgoing bookmarks') % len(diff))
5959 t.append(_('%d outgoing bookmarks') % len(diff))
5960
5960
5961 if t:
5961 if t:
5962 # i18n: column positioning for "hg summary"
5962 # i18n: column positioning for "hg summary"
5963 ui.write(_('remote: %s\n') % (', '.join(t)))
5963 ui.write(_('remote: %s\n') % (', '.join(t)))
5964 else:
5964 else:
5965 # i18n: column positioning for "hg summary"
5965 # i18n: column positioning for "hg summary"
5966 ui.status(_('remote: (synced)\n'))
5966 ui.status(_('remote: (synced)\n'))
5967
5967
5968 cmdutil.summaryremotehooks(ui, repo, opts,
5968 cmdutil.summaryremotehooks(ui, repo, opts,
5969 ((source, sbranch, sother, commoninc),
5969 ((source, sbranch, sother, commoninc),
5970 (dest, dbranch, dother, outgoing)))
5970 (dest, dbranch, dother, outgoing)))
5971
5971
5972 @command('tag',
5972 @command('tag',
5973 [('f', 'force', None, _('force tag')),
5973 [('f', 'force', None, _('force tag')),
5974 ('l', 'local', None, _('make the tag local')),
5974 ('l', 'local', None, _('make the tag local')),
5975 ('r', 'rev', '', _('revision to tag'), _('REV')),
5975 ('r', 'rev', '', _('revision to tag'), _('REV')),
5976 ('', 'remove', None, _('remove a tag')),
5976 ('', 'remove', None, _('remove a tag')),
5977 # -l/--local is already there, commitopts cannot be used
5977 # -l/--local is already there, commitopts cannot be used
5978 ('e', 'edit', None, _('invoke editor on commit messages')),
5978 ('e', 'edit', None, _('invoke editor on commit messages')),
5979 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5979 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5980 ] + commitopts2,
5980 ] + commitopts2,
5981 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5981 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5982 def tag(ui, repo, name1, *names, **opts):
5982 def tag(ui, repo, name1, *names, **opts):
5983 """add one or more tags for the current or given revision
5983 """add one or more tags for the current or given revision
5984
5984
5985 Name a particular revision using <name>.
5985 Name a particular revision using <name>.
5986
5986
5987 Tags are used to name particular revisions of the repository and are
5987 Tags are used to name particular revisions of the repository and are
5988 very useful to compare different revisions, to go back to significant
5988 very useful to compare different revisions, to go back to significant
5989 earlier versions or to mark branch points as releases, etc. Changing
5989 earlier versions or to mark branch points as releases, etc. Changing
5990 an existing tag is normally disallowed; use -f/--force to override.
5990 an existing tag is normally disallowed; use -f/--force to override.
5991
5991
5992 If no revision is given, the parent of the working directory is
5992 If no revision is given, the parent of the working directory is
5993 used.
5993 used.
5994
5994
5995 To facilitate version control, distribution, and merging of tags,
5995 To facilitate version control, distribution, and merging of tags,
5996 they are stored as a file named ".hgtags" which is managed similarly
5996 they are stored as a file named ".hgtags" which is managed similarly
5997 to other project files and can be hand-edited if necessary. This
5997 to other project files and can be hand-edited if necessary. This
5998 also means that tagging creates a new commit. The file
5998 also means that tagging creates a new commit. The file
5999 ".hg/localtags" is used for local tags (not shared among
5999 ".hg/localtags" is used for local tags (not shared among
6000 repositories).
6000 repositories).
6001
6001
6002 Tag commits are usually made at the head of a branch. If the parent
6002 Tag commits are usually made at the head of a branch. If the parent
6003 of the working directory is not a branch head, :hg:`tag` aborts; use
6003 of the working directory is not a branch head, :hg:`tag` aborts; use
6004 -f/--force to force the tag commit to be based on a non-head
6004 -f/--force to force the tag commit to be based on a non-head
6005 changeset.
6005 changeset.
6006
6006
6007 See :hg:`help dates` for a list of formats valid for -d/--date.
6007 See :hg:`help dates` for a list of formats valid for -d/--date.
6008
6008
6009 Since tag names have priority over branch names during revision
6009 Since tag names have priority over branch names during revision
6010 lookup, using an existing branch name as a tag name is discouraged.
6010 lookup, using an existing branch name as a tag name is discouraged.
6011
6011
6012 Returns 0 on success.
6012 Returns 0 on success.
6013 """
6013 """
6014 wlock = lock = None
6014 wlock = lock = None
6015 try:
6015 try:
6016 wlock = repo.wlock()
6016 wlock = repo.wlock()
6017 lock = repo.lock()
6017 lock = repo.lock()
6018 rev_ = "."
6018 rev_ = "."
6019 names = [t.strip() for t in (name1,) + names]
6019 names = [t.strip() for t in (name1,) + names]
6020 if len(names) != len(set(names)):
6020 if len(names) != len(set(names)):
6021 raise util.Abort(_('tag names must be unique'))
6021 raise util.Abort(_('tag names must be unique'))
6022 for n in names:
6022 for n in names:
6023 scmutil.checknewlabel(repo, n, 'tag')
6023 scmutil.checknewlabel(repo, n, 'tag')
6024 if not n:
6024 if not n:
6025 raise util.Abort(_('tag names cannot consist entirely of '
6025 raise util.Abort(_('tag names cannot consist entirely of '
6026 'whitespace'))
6026 'whitespace'))
6027 if opts.get('rev') and opts.get('remove'):
6027 if opts.get('rev') and opts.get('remove'):
6028 raise util.Abort(_("--rev and --remove are incompatible"))
6028 raise util.Abort(_("--rev and --remove are incompatible"))
6029 if opts.get('rev'):
6029 if opts.get('rev'):
6030 rev_ = opts['rev']
6030 rev_ = opts['rev']
6031 message = opts.get('message')
6031 message = opts.get('message')
6032 if opts.get('remove'):
6032 if opts.get('remove'):
6033 expectedtype = opts.get('local') and 'local' or 'global'
6033 expectedtype = opts.get('local') and 'local' or 'global'
6034 for n in names:
6034 for n in names:
6035 if not repo.tagtype(n):
6035 if not repo.tagtype(n):
6036 raise util.Abort(_("tag '%s' does not exist") % n)
6036 raise util.Abort(_("tag '%s' does not exist") % n)
6037 if repo.tagtype(n) != expectedtype:
6037 if repo.tagtype(n) != expectedtype:
6038 if expectedtype == 'global':
6038 if expectedtype == 'global':
6039 raise util.Abort(_("tag '%s' is not a global tag") % n)
6039 raise util.Abort(_("tag '%s' is not a global tag") % n)
6040 else:
6040 else:
6041 raise util.Abort(_("tag '%s' is not a local tag") % n)
6041 raise util.Abort(_("tag '%s' is not a local tag") % n)
6042 rev_ = nullid
6042 rev_ = nullid
6043 if not message:
6043 if not message:
6044 # we don't translate commit messages
6044 # we don't translate commit messages
6045 message = 'Removed tag %s' % ', '.join(names)
6045 message = 'Removed tag %s' % ', '.join(names)
6046 elif not opts.get('force'):
6046 elif not opts.get('force'):
6047 for n in names:
6047 for n in names:
6048 if n in repo.tags():
6048 if n in repo.tags():
6049 raise util.Abort(_("tag '%s' already exists "
6049 raise util.Abort(_("tag '%s' already exists "
6050 "(use -f to force)") % n)
6050 "(use -f to force)") % n)
6051 if not opts.get('local'):
6051 if not opts.get('local'):
6052 p1, p2 = repo.dirstate.parents()
6052 p1, p2 = repo.dirstate.parents()
6053 if p2 != nullid:
6053 if p2 != nullid:
6054 raise util.Abort(_('uncommitted merge'))
6054 raise util.Abort(_('uncommitted merge'))
6055 bheads = repo.branchheads()
6055 bheads = repo.branchheads()
6056 if not opts.get('force') and bheads and p1 not in bheads:
6056 if not opts.get('force') and bheads and p1 not in bheads:
6057 raise util.Abort(_('not at a branch head (use -f to force)'))
6057 raise util.Abort(_('not at a branch head (use -f to force)'))
6058 r = scmutil.revsingle(repo, rev_).node()
6058 r = scmutil.revsingle(repo, rev_).node()
6059
6059
6060 if not message:
6060 if not message:
6061 # we don't translate commit messages
6061 # we don't translate commit messages
6062 message = ('Added tag %s for changeset %s' %
6062 message = ('Added tag %s for changeset %s' %
6063 (', '.join(names), short(r)))
6063 (', '.join(names), short(r)))
6064
6064
6065 date = opts.get('date')
6065 date = opts.get('date')
6066 if date:
6066 if date:
6067 date = util.parsedate(date)
6067 date = util.parsedate(date)
6068
6068
6069 if opts.get('remove'):
6069 if opts.get('remove'):
6070 editform = 'tag.remove'
6070 editform = 'tag.remove'
6071 else:
6071 else:
6072 editform = 'tag.add'
6072 editform = 'tag.add'
6073 editor = cmdutil.getcommiteditor(editform=editform, **opts)
6073 editor = cmdutil.getcommiteditor(editform=editform, **opts)
6074
6074
6075 # don't allow tagging the null rev
6075 # don't allow tagging the null rev
6076 if (not opts.get('remove') and
6076 if (not opts.get('remove') and
6077 scmutil.revsingle(repo, rev_).rev() == nullrev):
6077 scmutil.revsingle(repo, rev_).rev() == nullrev):
6078 raise util.Abort(_("cannot tag null revision"))
6078 raise util.Abort(_("cannot tag null revision"))
6079
6079
6080 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
6080 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
6081 editor=editor)
6081 editor=editor)
6082 finally:
6082 finally:
6083 release(lock, wlock)
6083 release(lock, wlock)
6084
6084
6085 @command('tags', formatteropts, '')
6085 @command('tags', formatteropts, '')
6086 def tags(ui, repo, **opts):
6086 def tags(ui, repo, **opts):
6087 """list repository tags
6087 """list repository tags
6088
6088
6089 This lists both regular and local tags. When the -v/--verbose
6089 This lists both regular and local tags. When the -v/--verbose
6090 switch is used, a third column "local" is printed for local tags.
6090 switch is used, a third column "local" is printed for local tags.
6091
6091
6092 Returns 0 on success.
6092 Returns 0 on success.
6093 """
6093 """
6094
6094
6095 fm = ui.formatter('tags', opts)
6095 fm = ui.formatter('tags', opts)
6096 if fm or ui.debugflag:
6096 if fm or ui.debugflag:
6097 hexfunc = hex
6097 hexfunc = hex
6098 else:
6098 else:
6099 hexfunc = short
6099 hexfunc = short
6100 tagtype = ""
6100 tagtype = ""
6101
6101
6102 for t, n in reversed(repo.tagslist()):
6102 for t, n in reversed(repo.tagslist()):
6103 hn = hexfunc(n)
6103 hn = hexfunc(n)
6104 label = 'tags.normal'
6104 label = 'tags.normal'
6105 tagtype = ''
6105 tagtype = ''
6106 if repo.tagtype(t) == 'local':
6106 if repo.tagtype(t) == 'local':
6107 label = 'tags.local'
6107 label = 'tags.local'
6108 tagtype = 'local'
6108 tagtype = 'local'
6109
6109
6110 fm.startitem()
6110 fm.startitem()
6111 fm.write('tag', '%s', t, label=label)
6111 fm.write('tag', '%s', t, label=label)
6112 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
6112 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
6113 fm.condwrite(not ui.quiet, 'rev node', fmt,
6113 fm.condwrite(not ui.quiet, 'rev node', fmt,
6114 repo.changelog.rev(n), hn, label=label)
6114 repo.changelog.rev(n), hn, label=label)
6115 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
6115 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
6116 tagtype, label=label)
6116 tagtype, label=label)
6117 fm.plain('\n')
6117 fm.plain('\n')
6118 fm.end()
6118 fm.end()
6119
6119
6120 @command('tip',
6120 @command('tip',
6121 [('p', 'patch', None, _('show patch')),
6121 [('p', 'patch', None, _('show patch')),
6122 ('g', 'git', None, _('use git extended diff format')),
6122 ('g', 'git', None, _('use git extended diff format')),
6123 ] + templateopts,
6123 ] + templateopts,
6124 _('[-p] [-g]'))
6124 _('[-p] [-g]'))
6125 def tip(ui, repo, **opts):
6125 def tip(ui, repo, **opts):
6126 """show the tip revision (DEPRECATED)
6126 """show the tip revision (DEPRECATED)
6127
6127
6128 The tip revision (usually just called the tip) is the changeset
6128 The tip revision (usually just called the tip) is the changeset
6129 most recently added to the repository (and therefore the most
6129 most recently added to the repository (and therefore the most
6130 recently changed head).
6130 recently changed head).
6131
6131
6132 If you have just made a commit, that commit will be the tip. If
6132 If you have just made a commit, that commit will be the tip. If
6133 you have just pulled changes from another repository, the tip of
6133 you have just pulled changes from another repository, the tip of
6134 that repository becomes the current tip. The "tip" tag is special
6134 that repository becomes the current tip. The "tip" tag is special
6135 and cannot be renamed or assigned to a different changeset.
6135 and cannot be renamed or assigned to a different changeset.
6136
6136
6137 This command is deprecated, please use :hg:`heads` instead.
6137 This command is deprecated, please use :hg:`heads` instead.
6138
6138
6139 Returns 0 on success.
6139 Returns 0 on success.
6140 """
6140 """
6141 displayer = cmdutil.show_changeset(ui, repo, opts)
6141 displayer = cmdutil.show_changeset(ui, repo, opts)
6142 displayer.show(repo['tip'])
6142 displayer.show(repo['tip'])
6143 displayer.close()
6143 displayer.close()
6144
6144
6145 @command('unbundle',
6145 @command('unbundle',
6146 [('u', 'update', None,
6146 [('u', 'update', None,
6147 _('update to new branch head if changesets were unbundled'))],
6147 _('update to new branch head if changesets were unbundled'))],
6148 _('[-u] FILE...'))
6148 _('[-u] FILE...'))
6149 def unbundle(ui, repo, fname1, *fnames, **opts):
6149 def unbundle(ui, repo, fname1, *fnames, **opts):
6150 """apply one or more changegroup files
6150 """apply one or more changegroup files
6151
6151
6152 Apply one or more compressed changegroup files generated by the
6152 Apply one or more compressed changegroup files generated by the
6153 bundle command.
6153 bundle command.
6154
6154
6155 Returns 0 on success, 1 if an update has unresolved files.
6155 Returns 0 on success, 1 if an update has unresolved files.
6156 """
6156 """
6157 fnames = (fname1,) + fnames
6157 fnames = (fname1,) + fnames
6158
6158
6159 lock = repo.lock()
6159 lock = repo.lock()
6160 try:
6160 try:
6161 for fname in fnames:
6161 for fname in fnames:
6162 f = hg.openpath(ui, fname)
6162 f = hg.openpath(ui, fname)
6163 gen = exchange.readbundle(ui, f, fname)
6163 gen = exchange.readbundle(ui, f, fname)
6164 modheads = changegroup.addchangegroup(repo, gen, 'unbundle',
6164 modheads = changegroup.addchangegroup(repo, gen, 'unbundle',
6165 'bundle:' + fname)
6165 'bundle:' + fname)
6166 finally:
6166 finally:
6167 lock.release()
6167 lock.release()
6168
6168
6169 return postincoming(ui, repo, modheads, opts.get('update'), None)
6169 return postincoming(ui, repo, modheads, opts.get('update'), None)
6170
6170
6171 @command('^update|up|checkout|co',
6171 @command('^update|up|checkout|co',
6172 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
6172 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
6173 ('c', 'check', None,
6173 ('c', 'check', None,
6174 _('update across branches if no uncommitted changes')),
6174 _('update across branches if no uncommitted changes')),
6175 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6175 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6176 ('r', 'rev', '', _('revision'), _('REV'))
6176 ('r', 'rev', '', _('revision'), _('REV'))
6177 ] + mergetoolopts,
6177 ] + mergetoolopts,
6178 _('[-c] [-C] [-d DATE] [[-r] REV]'))
6178 _('[-c] [-C] [-d DATE] [[-r] REV]'))
6179 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
6179 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
6180 tool=None):
6180 tool=None):
6181 """update working directory (or switch revisions)
6181 """update working directory (or switch revisions)
6182
6182
6183 Update the repository's working directory to the specified
6183 Update the repository's working directory to the specified
6184 changeset. If no changeset is specified, update to the tip of the
6184 changeset. If no changeset is specified, update to the tip of the
6185 current named branch and move the current bookmark (see :hg:`help
6185 current named branch and move the current bookmark (see :hg:`help
6186 bookmarks`).
6186 bookmarks`).
6187
6187
6188 Update sets the working directory's parent revision to the specified
6188 Update sets the working directory's parent revision to the specified
6189 changeset (see :hg:`help parents`).
6189 changeset (see :hg:`help parents`).
6190
6190
6191 If the changeset is not a descendant or ancestor of the working
6191 If the changeset is not a descendant or ancestor of the working
6192 directory's parent, the update is aborted. With the -c/--check
6192 directory's parent, the update is aborted. With the -c/--check
6193 option, the working directory is checked for uncommitted changes; if
6193 option, the working directory is checked for uncommitted changes; if
6194 none are found, the working directory is updated to the specified
6194 none are found, the working directory is updated to the specified
6195 changeset.
6195 changeset.
6196
6196
6197 .. container:: verbose
6197 .. container:: verbose
6198
6198
6199 The following rules apply when the working directory contains
6199 The following rules apply when the working directory contains
6200 uncommitted changes:
6200 uncommitted changes:
6201
6201
6202 1. If neither -c/--check nor -C/--clean is specified, and if
6202 1. If neither -c/--check nor -C/--clean is specified, and if
6203 the requested changeset is an ancestor or descendant of
6203 the requested changeset is an ancestor or descendant of
6204 the working directory's parent, the uncommitted changes
6204 the working directory's parent, the uncommitted changes
6205 are merged into the requested changeset and the merged
6205 are merged into the requested changeset and the merged
6206 result is left uncommitted. If the requested changeset is
6206 result is left uncommitted. If the requested changeset is
6207 not an ancestor or descendant (that is, it is on another
6207 not an ancestor or descendant (that is, it is on another
6208 branch), the update is aborted and the uncommitted changes
6208 branch), the update is aborted and the uncommitted changes
6209 are preserved.
6209 are preserved.
6210
6210
6211 2. With the -c/--check option, the update is aborted and the
6211 2. With the -c/--check option, the update is aborted and the
6212 uncommitted changes are preserved.
6212 uncommitted changes are preserved.
6213
6213
6214 3. With the -C/--clean option, uncommitted changes are discarded and
6214 3. With the -C/--clean option, uncommitted changes are discarded and
6215 the working directory is updated to the requested changeset.
6215 the working directory is updated to the requested changeset.
6216
6216
6217 To cancel an uncommitted merge (and lose your changes), use
6217 To cancel an uncommitted merge (and lose your changes), use
6218 :hg:`update --clean .`.
6218 :hg:`update --clean .`.
6219
6219
6220 Use null as the changeset to remove the working directory (like
6220 Use null as the changeset to remove the working directory (like
6221 :hg:`clone -U`).
6221 :hg:`clone -U`).
6222
6222
6223 If you want to revert just one file to an older revision, use
6223 If you want to revert just one file to an older revision, use
6224 :hg:`revert [-r REV] NAME`.
6224 :hg:`revert [-r REV] NAME`.
6225
6225
6226 See :hg:`help dates` for a list of formats valid for -d/--date.
6226 See :hg:`help dates` for a list of formats valid for -d/--date.
6227
6227
6228 Returns 0 on success, 1 if there are unresolved files.
6228 Returns 0 on success, 1 if there are unresolved files.
6229 """
6229 """
6230 if rev and node:
6230 if rev and node:
6231 raise util.Abort(_("please specify just one revision"))
6231 raise util.Abort(_("please specify just one revision"))
6232
6232
6233 if rev is None or rev == '':
6233 if rev is None or rev == '':
6234 rev = node
6234 rev = node
6235
6235
6236 cmdutil.clearunfinished(repo)
6236 cmdutil.clearunfinished(repo)
6237
6237
6238 # with no argument, we also move the current bookmark, if any
6238 # with no argument, we also move the current bookmark, if any
6239 rev, movemarkfrom = bookmarks.calculateupdate(ui, repo, rev)
6239 rev, movemarkfrom = bookmarks.calculateupdate(ui, repo, rev)
6240
6240
6241 # if we defined a bookmark, we have to remember the original bookmark name
6241 # if we defined a bookmark, we have to remember the original bookmark name
6242 brev = rev
6242 brev = rev
6243 rev = scmutil.revsingle(repo, rev, rev).rev()
6243 rev = scmutil.revsingle(repo, rev, rev).rev()
6244
6244
6245 if check and clean:
6245 if check and clean:
6246 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
6246 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
6247
6247
6248 if date:
6248 if date:
6249 if rev is not None:
6249 if rev is not None:
6250 raise util.Abort(_("you can't specify a revision and a date"))
6250 raise util.Abort(_("you can't specify a revision and a date"))
6251 rev = cmdutil.finddate(ui, repo, date)
6251 rev = cmdutil.finddate(ui, repo, date)
6252
6252
6253 if check:
6253 if check:
6254 c = repo[None]
6254 c = repo[None]
6255 if c.dirty(merge=False, branch=False, missing=True):
6255 if c.dirty(merge=False, branch=False, missing=True):
6256 raise util.Abort(_("uncommitted changes"))
6256 raise util.Abort(_("uncommitted changes"))
6257 if rev is None:
6257 if rev is None:
6258 rev = repo[repo[None].branch()].rev()
6258 rev = repo[repo[None].branch()].rev()
6259 mergemod._checkunknown(repo, repo[None], repo[rev])
6259 mergemod._checkunknown(repo, repo[None], repo[rev])
6260
6260
6261 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
6261 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
6262
6262
6263 if clean:
6263 if clean:
6264 ret = hg.clean(repo, rev)
6264 ret = hg.clean(repo, rev)
6265 else:
6265 else:
6266 ret = hg.update(repo, rev)
6266 ret = hg.update(repo, rev)
6267
6267
6268 if not ret and movemarkfrom:
6268 if not ret and movemarkfrom:
6269 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
6269 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
6270 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
6270 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
6271 elif brev in repo._bookmarks:
6271 elif brev in repo._bookmarks:
6272 bookmarks.setcurrent(repo, brev)
6272 bookmarks.setcurrent(repo, brev)
6273 ui.status(_("(activating bookmark %s)\n") % brev)
6273 ui.status(_("(activating bookmark %s)\n") % brev)
6274 elif brev:
6274 elif brev:
6275 if repo._bookmarkcurrent:
6275 if repo._bookmarkcurrent:
6276 ui.status(_("(leaving bookmark %s)\n") %
6276 ui.status(_("(leaving bookmark %s)\n") %
6277 repo._bookmarkcurrent)
6277 repo._bookmarkcurrent)
6278 bookmarks.unsetcurrent(repo)
6278 bookmarks.unsetcurrent(repo)
6279
6279
6280 return ret
6280 return ret
6281
6281
6282 @command('verify', [])
6282 @command('verify', [])
6283 def verify(ui, repo):
6283 def verify(ui, repo):
6284 """verify the integrity of the repository
6284 """verify the integrity of the repository
6285
6285
6286 Verify the integrity of the current repository.
6286 Verify the integrity of the current repository.
6287
6287
6288 This will perform an extensive check of the repository's
6288 This will perform an extensive check of the repository's
6289 integrity, validating the hashes and checksums of each entry in
6289 integrity, validating the hashes and checksums of each entry in
6290 the changelog, manifest, and tracked files, as well as the
6290 the changelog, manifest, and tracked files, as well as the
6291 integrity of their crosslinks and indices.
6291 integrity of their crosslinks and indices.
6292
6292
6293 Please see http://mercurial.selenic.com/wiki/RepositoryCorruption
6293 Please see http://mercurial.selenic.com/wiki/RepositoryCorruption
6294 for more information about recovery from corruption of the
6294 for more information about recovery from corruption of the
6295 repository.
6295 repository.
6296
6296
6297 Returns 0 on success, 1 if errors are encountered.
6297 Returns 0 on success, 1 if errors are encountered.
6298 """
6298 """
6299 return hg.verify(repo)
6299 return hg.verify(repo)
6300
6300
6301 @command('version', [], norepo=True)
6301 @command('version', [], norepo=True)
6302 def version_(ui):
6302 def version_(ui):
6303 """output version and copyright information"""
6303 """output version and copyright information"""
6304 ui.write(_("Mercurial Distributed SCM (version %s)\n")
6304 ui.write(_("Mercurial Distributed SCM (version %s)\n")
6305 % util.version())
6305 % util.version())
6306 ui.status(_(
6306 ui.status(_(
6307 "(see http://mercurial.selenic.com for more information)\n"
6307 "(see http://mercurial.selenic.com for more information)\n"
6308 "\nCopyright (C) 2005-2014 Matt Mackall and others\n"
6308 "\nCopyright (C) 2005-2014 Matt Mackall and others\n"
6309 "This is free software; see the source for copying conditions. "
6309 "This is free software; see the source for copying conditions. "
6310 "There is NO\nwarranty; "
6310 "There is NO\nwarranty; "
6311 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6311 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6312 ))
6312 ))
6313
6313
6314 ui.note(_("\nEnabled extensions:\n\n"))
6314 ui.note(_("\nEnabled extensions:\n\n"))
6315 if ui.verbose:
6315 if ui.verbose:
6316 # format names and versions into columns
6316 # format names and versions into columns
6317 names = []
6317 names = []
6318 vers = []
6318 vers = []
6319 for name, module in extensions.extensions():
6319 for name, module in extensions.extensions():
6320 names.append(name)
6320 names.append(name)
6321 vers.append(extensions.moduleversion(module))
6321 vers.append(extensions.moduleversion(module))
6322 if names:
6322 if names:
6323 maxnamelen = max(len(n) for n in names)
6323 maxnamelen = max(len(n) for n in names)
6324 for i, name in enumerate(names):
6324 for i, name in enumerate(names):
6325 ui.write(" %-*s %s\n" % (maxnamelen, name, vers[i]))
6325 ui.write(" %-*s %s\n" % (maxnamelen, name, vers[i]))
General Comments 0
You need to be logged in to leave comments. Login now