##// END OF EJS Templates
cmdserver: wrap 'pipe' mode server by service object...
Yuya Nishihara -
r22988:32b77aba default
parent child Browse files
Show More
@@ -1,6314 +1,6314 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, copies
21 import dagparser, context, simplemerge, graphmod, copies
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 import ui as uimod
25 import ui as uimod
26
26
27 table = {}
27 table = {}
28
28
29 command = cmdutil.command(table)
29 command = cmdutil.command(table)
30
30
31 # Space delimited list of commands that don't require local repositories.
31 # Space delimited list of commands that don't require local repositories.
32 # This should be populated by passing norepo=True into the @command decorator.
32 # This should be populated by passing norepo=True into the @command decorator.
33 norepo = ''
33 norepo = ''
34 # Space delimited list of commands that optionally require local repositories.
34 # Space delimited list of commands that optionally require local repositories.
35 # This should be populated by passing optionalrepo=True into the @command
35 # This should be populated by passing optionalrepo=True into the @command
36 # decorator.
36 # decorator.
37 optionalrepo = ''
37 optionalrepo = ''
38 # Space delimited list of commands that will examine arguments looking for
38 # Space delimited list of commands that will examine arguments looking for
39 # a repository. This should be populated by passing inferrepo=True into the
39 # a repository. This should be populated by passing inferrepo=True into the
40 # @command decorator.
40 # @command decorator.
41 inferrepo = ''
41 inferrepo = ''
42
42
43 # common command options
43 # common command options
44
44
45 globalopts = [
45 globalopts = [
46 ('R', 'repository', '',
46 ('R', 'repository', '',
47 _('repository root directory or name of overlay bundle file'),
47 _('repository root directory or name of overlay bundle file'),
48 _('REPO')),
48 _('REPO')),
49 ('', 'cwd', '',
49 ('', 'cwd', '',
50 _('change working directory'), _('DIR')),
50 _('change working directory'), _('DIR')),
51 ('y', 'noninteractive', None,
51 ('y', 'noninteractive', None,
52 _('do not prompt, automatically pick the first choice for all prompts')),
52 _('do not prompt, automatically pick the first choice for all prompts')),
53 ('q', 'quiet', None, _('suppress output')),
53 ('q', 'quiet', None, _('suppress output')),
54 ('v', 'verbose', None, _('enable additional output')),
54 ('v', 'verbose', None, _('enable additional output')),
55 ('', 'config', [],
55 ('', 'config', [],
56 _('set/override config option (use \'section.name=value\')'),
56 _('set/override config option (use \'section.name=value\')'),
57 _('CONFIG')),
57 _('CONFIG')),
58 ('', 'debug', None, _('enable debugging output')),
58 ('', 'debug', None, _('enable debugging output')),
59 ('', 'debugger', None, _('start debugger')),
59 ('', 'debugger', None, _('start debugger')),
60 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
60 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
61 _('ENCODE')),
61 _('ENCODE')),
62 ('', 'encodingmode', encoding.encodingmode,
62 ('', 'encodingmode', encoding.encodingmode,
63 _('set the charset encoding mode'), _('MODE')),
63 _('set the charset encoding mode'), _('MODE')),
64 ('', 'traceback', None, _('always print a traceback on exception')),
64 ('', 'traceback', None, _('always print a traceback on exception')),
65 ('', 'time', None, _('time how long the command takes')),
65 ('', 'time', None, _('time how long the command takes')),
66 ('', 'profile', None, _('print command execution profile')),
66 ('', 'profile', None, _('print command execution profile')),
67 ('', 'version', None, _('output version information and exit')),
67 ('', 'version', None, _('output version information and exit')),
68 ('h', 'help', None, _('display help and exit')),
68 ('h', 'help', None, _('display help and exit')),
69 ('', 'hidden', False, _('consider hidden changesets')),
69 ('', 'hidden', False, _('consider hidden changesets')),
70 ]
70 ]
71
71
72 dryrunopts = [('n', 'dry-run', None,
72 dryrunopts = [('n', 'dry-run', None,
73 _('do not perform actions, just print output'))]
73 _('do not perform actions, just print output'))]
74
74
75 remoteopts = [
75 remoteopts = [
76 ('e', 'ssh', '',
76 ('e', 'ssh', '',
77 _('specify ssh command to use'), _('CMD')),
77 _('specify ssh command to use'), _('CMD')),
78 ('', 'remotecmd', '',
78 ('', 'remotecmd', '',
79 _('specify hg command to run on the remote side'), _('CMD')),
79 _('specify hg command to run on the remote side'), _('CMD')),
80 ('', 'insecure', None,
80 ('', 'insecure', None,
81 _('do not verify server certificate (ignoring web.cacerts config)')),
81 _('do not verify server certificate (ignoring web.cacerts config)')),
82 ]
82 ]
83
83
84 walkopts = [
84 walkopts = [
85 ('I', 'include', [],
85 ('I', 'include', [],
86 _('include names matching the given patterns'), _('PATTERN')),
86 _('include names matching the given patterns'), _('PATTERN')),
87 ('X', 'exclude', [],
87 ('X', 'exclude', [],
88 _('exclude names matching the given patterns'), _('PATTERN')),
88 _('exclude names matching the given patterns'), _('PATTERN')),
89 ]
89 ]
90
90
91 commitopts = [
91 commitopts = [
92 ('m', 'message', '',
92 ('m', 'message', '',
93 _('use text as commit message'), _('TEXT')),
93 _('use text as commit message'), _('TEXT')),
94 ('l', 'logfile', '',
94 ('l', 'logfile', '',
95 _('read commit message from file'), _('FILE')),
95 _('read commit message from file'), _('FILE')),
96 ]
96 ]
97
97
98 commitopts2 = [
98 commitopts2 = [
99 ('d', 'date', '',
99 ('d', 'date', '',
100 _('record the specified date as commit date'), _('DATE')),
100 _('record the specified date as commit date'), _('DATE')),
101 ('u', 'user', '',
101 ('u', 'user', '',
102 _('record the specified user as committer'), _('USER')),
102 _('record the specified user as committer'), _('USER')),
103 ]
103 ]
104
104
105 # hidden for now
105 # hidden for now
106 formatteropts = [
106 formatteropts = [
107 ('T', 'template', '',
107 ('T', 'template', '',
108 _('display with template (DEPRECATED)'), _('TEMPLATE')),
108 _('display with template (DEPRECATED)'), _('TEMPLATE')),
109 ]
109 ]
110
110
111 templateopts = [
111 templateopts = [
112 ('', 'style', '',
112 ('', 'style', '',
113 _('display using template map file (DEPRECATED)'), _('STYLE')),
113 _('display using template map file (DEPRECATED)'), _('STYLE')),
114 ('T', 'template', '',
114 ('T', 'template', '',
115 _('display with template'), _('TEMPLATE')),
115 _('display with template'), _('TEMPLATE')),
116 ]
116 ]
117
117
118 logopts = [
118 logopts = [
119 ('p', 'patch', None, _('show patch')),
119 ('p', 'patch', None, _('show patch')),
120 ('g', 'git', None, _('use git extended diff format')),
120 ('g', 'git', None, _('use git extended diff format')),
121 ('l', 'limit', '',
121 ('l', 'limit', '',
122 _('limit number of changes displayed'), _('NUM')),
122 _('limit number of changes displayed'), _('NUM')),
123 ('M', 'no-merges', None, _('do not show merges')),
123 ('M', 'no-merges', None, _('do not show merges')),
124 ('', 'stat', None, _('output diffstat-style summary of changes')),
124 ('', 'stat', None, _('output diffstat-style summary of changes')),
125 ('G', 'graph', None, _("show the revision DAG")),
125 ('G', 'graph', None, _("show the revision DAG")),
126 ] + templateopts
126 ] + templateopts
127
127
128 diffopts = [
128 diffopts = [
129 ('a', 'text', None, _('treat all files as text')),
129 ('a', 'text', None, _('treat all files as text')),
130 ('g', 'git', None, _('use git extended diff format')),
130 ('g', 'git', None, _('use git extended diff format')),
131 ('', 'nodates', None, _('omit dates from diff headers'))
131 ('', 'nodates', None, _('omit dates from diff headers'))
132 ]
132 ]
133
133
134 diffwsopts = [
134 diffwsopts = [
135 ('w', 'ignore-all-space', None,
135 ('w', 'ignore-all-space', None,
136 _('ignore white space when comparing lines')),
136 _('ignore white space when comparing lines')),
137 ('b', 'ignore-space-change', None,
137 ('b', 'ignore-space-change', None,
138 _('ignore changes in the amount of white space')),
138 _('ignore changes in the amount of white space')),
139 ('B', 'ignore-blank-lines', None,
139 ('B', 'ignore-blank-lines', None,
140 _('ignore changes whose lines are all blank')),
140 _('ignore changes whose lines are all blank')),
141 ]
141 ]
142
142
143 diffopts2 = [
143 diffopts2 = [
144 ('p', 'show-function', None, _('show which function each change is in')),
144 ('p', 'show-function', None, _('show which function each change is in')),
145 ('', 'reverse', None, _('produce a diff that undoes the changes')),
145 ('', 'reverse', None, _('produce a diff that undoes the changes')),
146 ] + diffwsopts + [
146 ] + diffwsopts + [
147 ('U', 'unified', '',
147 ('U', 'unified', '',
148 _('number of lines of context to show'), _('NUM')),
148 _('number of lines of context to show'), _('NUM')),
149 ('', 'stat', None, _('output diffstat-style summary of changes')),
149 ('', 'stat', None, _('output diffstat-style summary of changes')),
150 ]
150 ]
151
151
152 mergetoolopts = [
152 mergetoolopts = [
153 ('t', 'tool', '', _('specify merge tool')),
153 ('t', 'tool', '', _('specify merge tool')),
154 ]
154 ]
155
155
156 similarityopts = [
156 similarityopts = [
157 ('s', 'similarity', '',
157 ('s', 'similarity', '',
158 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
158 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
159 ]
159 ]
160
160
161 subrepoopts = [
161 subrepoopts = [
162 ('S', 'subrepos', None,
162 ('S', 'subrepos', None,
163 _('recurse into subrepositories'))
163 _('recurse into subrepositories'))
164 ]
164 ]
165
165
166 # Commands start here, listed alphabetically
166 # Commands start here, listed alphabetically
167
167
168 @command('^add',
168 @command('^add',
169 walkopts + subrepoopts + dryrunopts,
169 walkopts + subrepoopts + dryrunopts,
170 _('[OPTION]... [FILE]...'),
170 _('[OPTION]... [FILE]...'),
171 inferrepo=True)
171 inferrepo=True)
172 def add(ui, repo, *pats, **opts):
172 def add(ui, repo, *pats, **opts):
173 """add the specified files on the next commit
173 """add the specified files on the next commit
174
174
175 Schedule files to be version controlled and added to the
175 Schedule files to be version controlled and added to the
176 repository.
176 repository.
177
177
178 The files will be added to the repository at the next commit. To
178 The files will be added to the repository at the next commit. To
179 undo an add before that, see :hg:`forget`.
179 undo an add before that, see :hg:`forget`.
180
180
181 If no names are given, add all files to the repository.
181 If no names are given, add all files to the repository.
182
182
183 .. container:: verbose
183 .. container:: verbose
184
184
185 An example showing how new (unknown) files are added
185 An example showing how new (unknown) files are added
186 automatically by :hg:`add`::
186 automatically by :hg:`add`::
187
187
188 $ ls
188 $ ls
189 foo.c
189 foo.c
190 $ hg status
190 $ hg status
191 ? foo.c
191 ? foo.c
192 $ hg add
192 $ hg add
193 adding foo.c
193 adding foo.c
194 $ hg status
194 $ hg status
195 A foo.c
195 A foo.c
196
196
197 Returns 0 if all files are successfully added.
197 Returns 0 if all files are successfully added.
198 """
198 """
199
199
200 m = scmutil.match(repo[None], pats, opts)
200 m = scmutil.match(repo[None], pats, opts)
201 rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'),
201 rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'),
202 opts.get('subrepos'), prefix="", explicitonly=False)
202 opts.get('subrepos'), prefix="", explicitonly=False)
203 return rejected and 1 or 0
203 return rejected and 1 or 0
204
204
205 @command('addremove',
205 @command('addremove',
206 similarityopts + walkopts + dryrunopts,
206 similarityopts + walkopts + dryrunopts,
207 _('[OPTION]... [FILE]...'),
207 _('[OPTION]... [FILE]...'),
208 inferrepo=True)
208 inferrepo=True)
209 def addremove(ui, repo, *pats, **opts):
209 def addremove(ui, repo, *pats, **opts):
210 """add all new files, delete all missing files
210 """add all new files, delete all missing files
211
211
212 Add all new files and remove all missing files from the
212 Add all new files and remove all missing files from the
213 repository.
213 repository.
214
214
215 New files are ignored if they match any of the patterns in
215 New files are ignored if they match any of the patterns in
216 ``.hgignore``. As with add, these changes take effect at the next
216 ``.hgignore``. As with add, these changes take effect at the next
217 commit.
217 commit.
218
218
219 Use the -s/--similarity option to detect renamed files. This
219 Use the -s/--similarity option to detect renamed files. This
220 option takes a percentage between 0 (disabled) and 100 (files must
220 option takes a percentage between 0 (disabled) and 100 (files must
221 be identical) as its parameter. With a parameter greater than 0,
221 be identical) as its parameter. With a parameter greater than 0,
222 this compares every removed file with every added file and records
222 this compares every removed file with every added file and records
223 those similar enough as renames. Detecting renamed files this way
223 those similar enough as renames. Detecting renamed files this way
224 can be expensive. After using this option, :hg:`status -C` can be
224 can be expensive. After using this option, :hg:`status -C` can be
225 used to check which files were identified as moved or renamed. If
225 used to check which files were identified as moved or renamed. If
226 not specified, -s/--similarity defaults to 100 and only renames of
226 not specified, -s/--similarity defaults to 100 and only renames of
227 identical files are detected.
227 identical files are detected.
228
228
229 Returns 0 if all files are successfully added.
229 Returns 0 if all files are successfully added.
230 """
230 """
231 try:
231 try:
232 sim = float(opts.get('similarity') or 100)
232 sim = float(opts.get('similarity') or 100)
233 except ValueError:
233 except ValueError:
234 raise util.Abort(_('similarity must be a number'))
234 raise util.Abort(_('similarity must be a number'))
235 if sim < 0 or sim > 100:
235 if sim < 0 or sim > 100:
236 raise util.Abort(_('similarity must be between 0 and 100'))
236 raise util.Abort(_('similarity must be between 0 and 100'))
237 return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0)
237 return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0)
238
238
239 @command('^annotate|blame',
239 @command('^annotate|blame',
240 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
240 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
241 ('', 'follow', None,
241 ('', 'follow', None,
242 _('follow copies/renames and list the filename (DEPRECATED)')),
242 _('follow copies/renames and list the filename (DEPRECATED)')),
243 ('', 'no-follow', None, _("don't follow copies and renames")),
243 ('', 'no-follow', None, _("don't follow copies and renames")),
244 ('a', 'text', None, _('treat all files as text')),
244 ('a', 'text', None, _('treat all files as text')),
245 ('u', 'user', None, _('list the author (long with -v)')),
245 ('u', 'user', None, _('list the author (long with -v)')),
246 ('f', 'file', None, _('list the filename')),
246 ('f', 'file', None, _('list the filename')),
247 ('d', 'date', None, _('list the date (short with -q)')),
247 ('d', 'date', None, _('list the date (short with -q)')),
248 ('n', 'number', None, _('list the revision number (default)')),
248 ('n', 'number', None, _('list the revision number (default)')),
249 ('c', 'changeset', None, _('list the changeset')),
249 ('c', 'changeset', None, _('list the changeset')),
250 ('l', 'line-number', None, _('show line number at the first appearance'))
250 ('l', 'line-number', None, _('show line number at the first appearance'))
251 ] + diffwsopts + walkopts + formatteropts,
251 ] + diffwsopts + walkopts + formatteropts,
252 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
252 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'),
253 inferrepo=True)
253 inferrepo=True)
254 def annotate(ui, repo, *pats, **opts):
254 def annotate(ui, repo, *pats, **opts):
255 """show changeset information by line for each file
255 """show changeset information by line for each file
256
256
257 List changes in files, showing the revision id responsible for
257 List changes in files, showing the revision id responsible for
258 each line
258 each line
259
259
260 This command is useful for discovering when a change was made and
260 This command is useful for discovering when a change was made and
261 by whom.
261 by whom.
262
262
263 Without the -a/--text option, annotate will avoid processing files
263 Without the -a/--text option, annotate will avoid processing files
264 it detects as binary. With -a, annotate will annotate the file
264 it detects as binary. With -a, annotate will annotate the file
265 anyway, although the results will probably be neither useful
265 anyway, although the results will probably be neither useful
266 nor desirable.
266 nor desirable.
267
267
268 Returns 0 on success.
268 Returns 0 on success.
269 """
269 """
270 if not pats:
270 if not pats:
271 raise util.Abort(_('at least one filename or pattern is required'))
271 raise util.Abort(_('at least one filename or pattern is required'))
272
272
273 if opts.get('follow'):
273 if opts.get('follow'):
274 # --follow is deprecated and now just an alias for -f/--file
274 # --follow is deprecated and now just an alias for -f/--file
275 # to mimic the behavior of Mercurial before version 1.5
275 # to mimic the behavior of Mercurial before version 1.5
276 opts['file'] = True
276 opts['file'] = True
277
277
278 fm = ui.formatter('annotate', opts)
278 fm = ui.formatter('annotate', opts)
279 datefunc = ui.quiet and util.shortdate or util.datestr
279 datefunc = ui.quiet and util.shortdate or util.datestr
280 hexfn = fm.hexfunc
280 hexfn = fm.hexfunc
281
281
282 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
282 opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser),
283 ('number', ' ', lambda x: x[0].rev(), str),
283 ('number', ' ', lambda x: x[0].rev(), str),
284 ('changeset', ' ', lambda x: hexfn(x[0].node()), str),
284 ('changeset', ' ', lambda x: hexfn(x[0].node()), str),
285 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
285 ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)),
286 ('file', ' ', lambda x: x[0].path(), str),
286 ('file', ' ', lambda x: x[0].path(), str),
287 ('line_number', ':', lambda x: x[1], str),
287 ('line_number', ':', lambda x: x[1], str),
288 ]
288 ]
289 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
289 fieldnamemap = {'number': 'rev', 'changeset': 'node'}
290
290
291 if (not opts.get('user') and not opts.get('changeset')
291 if (not opts.get('user') and not opts.get('changeset')
292 and not opts.get('date') and not opts.get('file')):
292 and not opts.get('date') and not opts.get('file')):
293 opts['number'] = True
293 opts['number'] = True
294
294
295 linenumber = opts.get('line_number') is not None
295 linenumber = opts.get('line_number') is not None
296 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
296 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
297 raise util.Abort(_('at least one of -n/-c is required for -l'))
297 raise util.Abort(_('at least one of -n/-c is required for -l'))
298
298
299 if fm:
299 if fm:
300 def makefunc(get, fmt):
300 def makefunc(get, fmt):
301 return get
301 return get
302 else:
302 else:
303 def makefunc(get, fmt):
303 def makefunc(get, fmt):
304 return lambda x: fmt(get(x))
304 return lambda x: fmt(get(x))
305 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
305 funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap
306 if opts.get(op)]
306 if opts.get(op)]
307 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
307 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
308 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
308 fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap
309 if opts.get(op))
309 if opts.get(op))
310
310
311 def bad(x, y):
311 def bad(x, y):
312 raise util.Abort("%s: %s" % (x, y))
312 raise util.Abort("%s: %s" % (x, y))
313
313
314 ctx = scmutil.revsingle(repo, opts.get('rev'))
314 ctx = scmutil.revsingle(repo, opts.get('rev'))
315 m = scmutil.match(ctx, pats, opts)
315 m = scmutil.match(ctx, pats, opts)
316 m.bad = bad
316 m.bad = bad
317 follow = not opts.get('no_follow')
317 follow = not opts.get('no_follow')
318 diffopts = patch.diffopts(ui, opts, section='annotate')
318 diffopts = patch.diffopts(ui, opts, section='annotate')
319 for abs in ctx.walk(m):
319 for abs in ctx.walk(m):
320 fctx = ctx[abs]
320 fctx = ctx[abs]
321 if not opts.get('text') and util.binary(fctx.data()):
321 if not opts.get('text') and util.binary(fctx.data()):
322 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
322 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
323 continue
323 continue
324
324
325 lines = fctx.annotate(follow=follow, linenumber=linenumber,
325 lines = fctx.annotate(follow=follow, linenumber=linenumber,
326 diffopts=diffopts)
326 diffopts=diffopts)
327 formats = []
327 formats = []
328 pieces = []
328 pieces = []
329
329
330 for f, sep in funcmap:
330 for f, sep in funcmap:
331 l = [f(n) for n, dummy in lines]
331 l = [f(n) for n, dummy in lines]
332 if l:
332 if l:
333 if fm:
333 if fm:
334 formats.append(['%s' for x in l])
334 formats.append(['%s' for x in l])
335 else:
335 else:
336 sizes = [encoding.colwidth(x) for x in l]
336 sizes = [encoding.colwidth(x) for x in l]
337 ml = max(sizes)
337 ml = max(sizes)
338 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
338 formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes])
339 pieces.append(l)
339 pieces.append(l)
340
340
341 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
341 for f, p, l in zip(zip(*formats), zip(*pieces), lines):
342 fm.startitem()
342 fm.startitem()
343 fm.write(fields, "".join(f), *p)
343 fm.write(fields, "".join(f), *p)
344 fm.write('line', ": %s", l[1])
344 fm.write('line', ": %s", l[1])
345
345
346 if lines and not lines[-1][1].endswith('\n'):
346 if lines and not lines[-1][1].endswith('\n'):
347 fm.plain('\n')
347 fm.plain('\n')
348
348
349 fm.end()
349 fm.end()
350
350
351 @command('archive',
351 @command('archive',
352 [('', 'no-decode', None, _('do not pass files through decoders')),
352 [('', 'no-decode', None, _('do not pass files through decoders')),
353 ('p', 'prefix', '', _('directory prefix for files in archive'),
353 ('p', 'prefix', '', _('directory prefix for files in archive'),
354 _('PREFIX')),
354 _('PREFIX')),
355 ('r', 'rev', '', _('revision to distribute'), _('REV')),
355 ('r', 'rev', '', _('revision to distribute'), _('REV')),
356 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
356 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
357 ] + subrepoopts + walkopts,
357 ] + subrepoopts + walkopts,
358 _('[OPTION]... DEST'))
358 _('[OPTION]... DEST'))
359 def archive(ui, repo, dest, **opts):
359 def archive(ui, repo, dest, **opts):
360 '''create an unversioned archive of a repository revision
360 '''create an unversioned archive of a repository revision
361
361
362 By default, the revision used is the parent of the working
362 By default, the revision used is the parent of the working
363 directory; use -r/--rev to specify a different revision.
363 directory; use -r/--rev to specify a different revision.
364
364
365 The archive type is automatically detected based on file
365 The archive type is automatically detected based on file
366 extension (or override using -t/--type).
366 extension (or override using -t/--type).
367
367
368 .. container:: verbose
368 .. container:: verbose
369
369
370 Examples:
370 Examples:
371
371
372 - create a zip file containing the 1.0 release::
372 - create a zip file containing the 1.0 release::
373
373
374 hg archive -r 1.0 project-1.0.zip
374 hg archive -r 1.0 project-1.0.zip
375
375
376 - create a tarball excluding .hg files::
376 - create a tarball excluding .hg files::
377
377
378 hg archive project.tar.gz -X ".hg*"
378 hg archive project.tar.gz -X ".hg*"
379
379
380 Valid types are:
380 Valid types are:
381
381
382 :``files``: a directory full of files (default)
382 :``files``: a directory full of files (default)
383 :``tar``: tar archive, uncompressed
383 :``tar``: tar archive, uncompressed
384 :``tbz2``: tar archive, compressed using bzip2
384 :``tbz2``: tar archive, compressed using bzip2
385 :``tgz``: tar archive, compressed using gzip
385 :``tgz``: tar archive, compressed using gzip
386 :``uzip``: zip archive, uncompressed
386 :``uzip``: zip archive, uncompressed
387 :``zip``: zip archive, compressed using deflate
387 :``zip``: zip archive, compressed using deflate
388
388
389 The exact name of the destination archive or directory is given
389 The exact name of the destination archive or directory is given
390 using a format string; see :hg:`help export` for details.
390 using a format string; see :hg:`help export` for details.
391
391
392 Each member added to an archive file has a directory prefix
392 Each member added to an archive file has a directory prefix
393 prepended. Use -p/--prefix to specify a format string for the
393 prepended. Use -p/--prefix to specify a format string for the
394 prefix. The default is the basename of the archive, with suffixes
394 prefix. The default is the basename of the archive, with suffixes
395 removed.
395 removed.
396
396
397 Returns 0 on success.
397 Returns 0 on success.
398 '''
398 '''
399
399
400 ctx = scmutil.revsingle(repo, opts.get('rev'))
400 ctx = scmutil.revsingle(repo, opts.get('rev'))
401 if not ctx:
401 if not ctx:
402 raise util.Abort(_('no working directory: please specify a revision'))
402 raise util.Abort(_('no working directory: please specify a revision'))
403 node = ctx.node()
403 node = ctx.node()
404 dest = cmdutil.makefilename(repo, dest, node)
404 dest = cmdutil.makefilename(repo, dest, node)
405 if os.path.realpath(dest) == repo.root:
405 if os.path.realpath(dest) == repo.root:
406 raise util.Abort(_('repository root cannot be destination'))
406 raise util.Abort(_('repository root cannot be destination'))
407
407
408 kind = opts.get('type') or archival.guesskind(dest) or 'files'
408 kind = opts.get('type') or archival.guesskind(dest) or 'files'
409 prefix = opts.get('prefix')
409 prefix = opts.get('prefix')
410
410
411 if dest == '-':
411 if dest == '-':
412 if kind == 'files':
412 if kind == 'files':
413 raise util.Abort(_('cannot archive plain files to stdout'))
413 raise util.Abort(_('cannot archive plain files to stdout'))
414 dest = cmdutil.makefileobj(repo, dest)
414 dest = cmdutil.makefileobj(repo, dest)
415 if not prefix:
415 if not prefix:
416 prefix = os.path.basename(repo.root) + '-%h'
416 prefix = os.path.basename(repo.root) + '-%h'
417
417
418 prefix = cmdutil.makefilename(repo, prefix, node)
418 prefix = cmdutil.makefilename(repo, prefix, node)
419 matchfn = scmutil.match(ctx, [], opts)
419 matchfn = scmutil.match(ctx, [], opts)
420 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
420 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
421 matchfn, prefix, subrepos=opts.get('subrepos'))
421 matchfn, prefix, subrepos=opts.get('subrepos'))
422
422
423 @command('backout',
423 @command('backout',
424 [('', 'merge', None, _('merge with old dirstate parent after backout')),
424 [('', 'merge', None, _('merge with old dirstate parent after backout')),
425 ('', 'parent', '',
425 ('', 'parent', '',
426 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
426 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
427 ('r', 'rev', '', _('revision to backout'), _('REV')),
427 ('r', 'rev', '', _('revision to backout'), _('REV')),
428 ('e', 'edit', False, _('invoke editor on commit messages')),
428 ('e', 'edit', False, _('invoke editor on commit messages')),
429 ] + mergetoolopts + walkopts + commitopts + commitopts2,
429 ] + mergetoolopts + walkopts + commitopts + commitopts2,
430 _('[OPTION]... [-r] REV'))
430 _('[OPTION]... [-r] REV'))
431 def backout(ui, repo, node=None, rev=None, **opts):
431 def backout(ui, repo, node=None, rev=None, **opts):
432 '''reverse effect of earlier changeset
432 '''reverse effect of earlier changeset
433
433
434 Prepare a new changeset with the effect of REV undone in the
434 Prepare a new changeset with the effect of REV undone in the
435 current working directory.
435 current working directory.
436
436
437 If REV is the parent of the working directory, then this new changeset
437 If REV is the parent of the working directory, then this new changeset
438 is committed automatically. Otherwise, hg needs to merge the
438 is committed automatically. Otherwise, hg needs to merge the
439 changes and the merged result is left uncommitted.
439 changes and the merged result is left uncommitted.
440
440
441 .. note::
441 .. note::
442
442
443 backout cannot be used to fix either an unwanted or
443 backout cannot be used to fix either an unwanted or
444 incorrect merge.
444 incorrect merge.
445
445
446 .. container:: verbose
446 .. container:: verbose
447
447
448 By default, the pending changeset will have one parent,
448 By default, the pending changeset will have one parent,
449 maintaining a linear history. With --merge, the pending
449 maintaining a linear history. With --merge, the pending
450 changeset will instead have two parents: the old parent of the
450 changeset will instead have two parents: the old parent of the
451 working directory and a new child of REV that simply undoes REV.
451 working directory and a new child of REV that simply undoes REV.
452
452
453 Before version 1.7, the behavior without --merge was equivalent
453 Before version 1.7, the behavior without --merge was equivalent
454 to specifying --merge followed by :hg:`update --clean .` to
454 to specifying --merge followed by :hg:`update --clean .` to
455 cancel the merge and leave the child of REV as a head to be
455 cancel the merge and leave the child of REV as a head to be
456 merged separately.
456 merged separately.
457
457
458 See :hg:`help dates` for a list of formats valid for -d/--date.
458 See :hg:`help dates` for a list of formats valid for -d/--date.
459
459
460 Returns 0 on success, 1 if nothing to backout or there are unresolved
460 Returns 0 on success, 1 if nothing to backout or there are unresolved
461 files.
461 files.
462 '''
462 '''
463 if rev and node:
463 if rev and node:
464 raise util.Abort(_("please specify just one revision"))
464 raise util.Abort(_("please specify just one revision"))
465
465
466 if not rev:
466 if not rev:
467 rev = node
467 rev = node
468
468
469 if not rev:
469 if not rev:
470 raise util.Abort(_("please specify a revision to backout"))
470 raise util.Abort(_("please specify a revision to backout"))
471
471
472 date = opts.get('date')
472 date = opts.get('date')
473 if date:
473 if date:
474 opts['date'] = util.parsedate(date)
474 opts['date'] = util.parsedate(date)
475
475
476 cmdutil.checkunfinished(repo)
476 cmdutil.checkunfinished(repo)
477 cmdutil.bailifchanged(repo)
477 cmdutil.bailifchanged(repo)
478 node = scmutil.revsingle(repo, rev).node()
478 node = scmutil.revsingle(repo, rev).node()
479
479
480 op1, op2 = repo.dirstate.parents()
480 op1, op2 = repo.dirstate.parents()
481 if not repo.changelog.isancestor(node, op1):
481 if not repo.changelog.isancestor(node, op1):
482 raise util.Abort(_('cannot backout change that is not an ancestor'))
482 raise util.Abort(_('cannot backout change that is not an ancestor'))
483
483
484 p1, p2 = repo.changelog.parents(node)
484 p1, p2 = repo.changelog.parents(node)
485 if p1 == nullid:
485 if p1 == nullid:
486 raise util.Abort(_('cannot backout a change with no parents'))
486 raise util.Abort(_('cannot backout a change with no parents'))
487 if p2 != nullid:
487 if p2 != nullid:
488 if not opts.get('parent'):
488 if not opts.get('parent'):
489 raise util.Abort(_('cannot backout a merge changeset'))
489 raise util.Abort(_('cannot backout a merge changeset'))
490 p = repo.lookup(opts['parent'])
490 p = repo.lookup(opts['parent'])
491 if p not in (p1, p2):
491 if p not in (p1, p2):
492 raise util.Abort(_('%s is not a parent of %s') %
492 raise util.Abort(_('%s is not a parent of %s') %
493 (short(p), short(node)))
493 (short(p), short(node)))
494 parent = p
494 parent = p
495 else:
495 else:
496 if opts.get('parent'):
496 if opts.get('parent'):
497 raise util.Abort(_('cannot use --parent on non-merge changeset'))
497 raise util.Abort(_('cannot use --parent on non-merge changeset'))
498 parent = p1
498 parent = p1
499
499
500 # the backout should appear on the same branch
500 # the backout should appear on the same branch
501 wlock = repo.wlock()
501 wlock = repo.wlock()
502 try:
502 try:
503 branch = repo.dirstate.branch()
503 branch = repo.dirstate.branch()
504 bheads = repo.branchheads(branch)
504 bheads = repo.branchheads(branch)
505 rctx = scmutil.revsingle(repo, hex(parent))
505 rctx = scmutil.revsingle(repo, hex(parent))
506 if not opts.get('merge') and op1 != node:
506 if not opts.get('merge') and op1 != node:
507 try:
507 try:
508 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
508 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
509 'backout')
509 'backout')
510 repo.dirstate.beginparentchange()
510 repo.dirstate.beginparentchange()
511 stats = mergemod.update(repo, parent, True, True, False,
511 stats = mergemod.update(repo, parent, True, True, False,
512 node, False)
512 node, False)
513 repo.setparents(op1, op2)
513 repo.setparents(op1, op2)
514 repo.dirstate.endparentchange()
514 repo.dirstate.endparentchange()
515 hg._showstats(repo, stats)
515 hg._showstats(repo, stats)
516 if stats[3]:
516 if stats[3]:
517 repo.ui.status(_("use 'hg resolve' to retry unresolved "
517 repo.ui.status(_("use 'hg resolve' to retry unresolved "
518 "file merges\n"))
518 "file merges\n"))
519 else:
519 else:
520 msg = _("changeset %s backed out, "
520 msg = _("changeset %s backed out, "
521 "don't forget to commit.\n")
521 "don't forget to commit.\n")
522 ui.status(msg % short(node))
522 ui.status(msg % short(node))
523 return stats[3] > 0
523 return stats[3] > 0
524 finally:
524 finally:
525 ui.setconfig('ui', 'forcemerge', '', '')
525 ui.setconfig('ui', 'forcemerge', '', '')
526 else:
526 else:
527 hg.clean(repo, node, show_stats=False)
527 hg.clean(repo, node, show_stats=False)
528 repo.dirstate.setbranch(branch)
528 repo.dirstate.setbranch(branch)
529 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
529 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
530
530
531
531
532 def commitfunc(ui, repo, message, match, opts):
532 def commitfunc(ui, repo, message, match, opts):
533 editform = 'backout'
533 editform = 'backout'
534 e = cmdutil.getcommiteditor(editform=editform, **opts)
534 e = cmdutil.getcommiteditor(editform=editform, **opts)
535 if not message:
535 if not message:
536 # we don't translate commit messages
536 # we don't translate commit messages
537 message = "Backed out changeset %s" % short(node)
537 message = "Backed out changeset %s" % short(node)
538 e = cmdutil.getcommiteditor(edit=True, editform=editform)
538 e = cmdutil.getcommiteditor(edit=True, editform=editform)
539 return repo.commit(message, opts.get('user'), opts.get('date'),
539 return repo.commit(message, opts.get('user'), opts.get('date'),
540 match, editor=e)
540 match, editor=e)
541 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
541 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
542 if not newnode:
542 if not newnode:
543 ui.status(_("nothing changed\n"))
543 ui.status(_("nothing changed\n"))
544 return 1
544 return 1
545 cmdutil.commitstatus(repo, newnode, branch, bheads)
545 cmdutil.commitstatus(repo, newnode, branch, bheads)
546
546
547 def nice(node):
547 def nice(node):
548 return '%d:%s' % (repo.changelog.rev(node), short(node))
548 return '%d:%s' % (repo.changelog.rev(node), short(node))
549 ui.status(_('changeset %s backs out changeset %s\n') %
549 ui.status(_('changeset %s backs out changeset %s\n') %
550 (nice(repo.changelog.tip()), nice(node)))
550 (nice(repo.changelog.tip()), nice(node)))
551 if opts.get('merge') and op1 != node:
551 if opts.get('merge') and op1 != node:
552 hg.clean(repo, op1, show_stats=False)
552 hg.clean(repo, op1, show_stats=False)
553 ui.status(_('merging with changeset %s\n')
553 ui.status(_('merging with changeset %s\n')
554 % nice(repo.changelog.tip()))
554 % nice(repo.changelog.tip()))
555 try:
555 try:
556 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
556 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
557 'backout')
557 'backout')
558 return hg.merge(repo, hex(repo.changelog.tip()))
558 return hg.merge(repo, hex(repo.changelog.tip()))
559 finally:
559 finally:
560 ui.setconfig('ui', 'forcemerge', '', '')
560 ui.setconfig('ui', 'forcemerge', '', '')
561 finally:
561 finally:
562 wlock.release()
562 wlock.release()
563 return 0
563 return 0
564
564
565 @command('bisect',
565 @command('bisect',
566 [('r', 'reset', False, _('reset bisect state')),
566 [('r', 'reset', False, _('reset bisect state')),
567 ('g', 'good', False, _('mark changeset good')),
567 ('g', 'good', False, _('mark changeset good')),
568 ('b', 'bad', False, _('mark changeset bad')),
568 ('b', 'bad', False, _('mark changeset bad')),
569 ('s', 'skip', False, _('skip testing changeset')),
569 ('s', 'skip', False, _('skip testing changeset')),
570 ('e', 'extend', False, _('extend the bisect range')),
570 ('e', 'extend', False, _('extend the bisect range')),
571 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
571 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
572 ('U', 'noupdate', False, _('do not update to target'))],
572 ('U', 'noupdate', False, _('do not update to target'))],
573 _("[-gbsr] [-U] [-c CMD] [REV]"))
573 _("[-gbsr] [-U] [-c CMD] [REV]"))
574 def bisect(ui, repo, rev=None, extra=None, command=None,
574 def bisect(ui, repo, rev=None, extra=None, command=None,
575 reset=None, good=None, bad=None, skip=None, extend=None,
575 reset=None, good=None, bad=None, skip=None, extend=None,
576 noupdate=None):
576 noupdate=None):
577 """subdivision search of changesets
577 """subdivision search of changesets
578
578
579 This command helps to find changesets which introduce problems. To
579 This command helps to find changesets which introduce problems. To
580 use, mark the earliest changeset you know exhibits the problem as
580 use, mark the earliest changeset you know exhibits the problem as
581 bad, then mark the latest changeset which is free from the problem
581 bad, then mark the latest changeset which is free from the problem
582 as good. Bisect will update your working directory to a revision
582 as good. Bisect will update your working directory to a revision
583 for testing (unless the -U/--noupdate option is specified). Once
583 for testing (unless the -U/--noupdate option is specified). Once
584 you have performed tests, mark the working directory as good or
584 you have performed tests, mark the working directory as good or
585 bad, and bisect will either update to another candidate changeset
585 bad, and bisect will either update to another candidate changeset
586 or announce that it has found the bad revision.
586 or announce that it has found the bad revision.
587
587
588 As a shortcut, you can also use the revision argument to mark a
588 As a shortcut, you can also use the revision argument to mark a
589 revision as good or bad without checking it out first.
589 revision as good or bad without checking it out first.
590
590
591 If you supply a command, it will be used for automatic bisection.
591 If you supply a command, it will be used for automatic bisection.
592 The environment variable HG_NODE will contain the ID of the
592 The environment variable HG_NODE will contain the ID of the
593 changeset being tested. The exit status of the command will be
593 changeset being tested. The exit status of the command will be
594 used to mark revisions as good or bad: status 0 means good, 125
594 used to mark revisions as good or bad: status 0 means good, 125
595 means to skip the revision, 127 (command not found) will abort the
595 means to skip the revision, 127 (command not found) will abort the
596 bisection, and any other non-zero exit status means the revision
596 bisection, and any other non-zero exit status means the revision
597 is bad.
597 is bad.
598
598
599 .. container:: verbose
599 .. container:: verbose
600
600
601 Some examples:
601 Some examples:
602
602
603 - start a bisection with known bad revision 34, and good revision 12::
603 - start a bisection with known bad revision 34, and good revision 12::
604
604
605 hg bisect --bad 34
605 hg bisect --bad 34
606 hg bisect --good 12
606 hg bisect --good 12
607
607
608 - advance the current bisection by marking current revision as good or
608 - advance the current bisection by marking current revision as good or
609 bad::
609 bad::
610
610
611 hg bisect --good
611 hg bisect --good
612 hg bisect --bad
612 hg bisect --bad
613
613
614 - mark the current revision, or a known revision, to be skipped (e.g. if
614 - mark the current revision, or a known revision, to be skipped (e.g. if
615 that revision is not usable because of another issue)::
615 that revision is not usable because of another issue)::
616
616
617 hg bisect --skip
617 hg bisect --skip
618 hg bisect --skip 23
618 hg bisect --skip 23
619
619
620 - skip all revisions that do not touch directories ``foo`` or ``bar``::
620 - skip all revisions that do not touch directories ``foo`` or ``bar``::
621
621
622 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
622 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
623
623
624 - forget the current bisection::
624 - forget the current bisection::
625
625
626 hg bisect --reset
626 hg bisect --reset
627
627
628 - use 'make && make tests' to automatically find the first broken
628 - use 'make && make tests' to automatically find the first broken
629 revision::
629 revision::
630
630
631 hg bisect --reset
631 hg bisect --reset
632 hg bisect --bad 34
632 hg bisect --bad 34
633 hg bisect --good 12
633 hg bisect --good 12
634 hg bisect --command "make && make tests"
634 hg bisect --command "make && make tests"
635
635
636 - see all changesets whose states are already known in the current
636 - see all changesets whose states are already known in the current
637 bisection::
637 bisection::
638
638
639 hg log -r "bisect(pruned)"
639 hg log -r "bisect(pruned)"
640
640
641 - see the changeset currently being bisected (especially useful
641 - see the changeset currently being bisected (especially useful
642 if running with -U/--noupdate)::
642 if running with -U/--noupdate)::
643
643
644 hg log -r "bisect(current)"
644 hg log -r "bisect(current)"
645
645
646 - see all changesets that took part in the current bisection::
646 - see all changesets that took part in the current bisection::
647
647
648 hg log -r "bisect(range)"
648 hg log -r "bisect(range)"
649
649
650 - you can even get a nice graph::
650 - you can even get a nice graph::
651
651
652 hg log --graph -r "bisect(range)"
652 hg log --graph -r "bisect(range)"
653
653
654 See :hg:`help revsets` for more about the `bisect()` keyword.
654 See :hg:`help revsets` for more about the `bisect()` keyword.
655
655
656 Returns 0 on success.
656 Returns 0 on success.
657 """
657 """
658 def extendbisectrange(nodes, good):
658 def extendbisectrange(nodes, good):
659 # bisect is incomplete when it ends on a merge node and
659 # bisect is incomplete when it ends on a merge node and
660 # one of the parent was not checked.
660 # one of the parent was not checked.
661 parents = repo[nodes[0]].parents()
661 parents = repo[nodes[0]].parents()
662 if len(parents) > 1:
662 if len(parents) > 1:
663 side = good and state['bad'] or state['good']
663 side = good and state['bad'] or state['good']
664 num = len(set(i.node() for i in parents) & set(side))
664 num = len(set(i.node() for i in parents) & set(side))
665 if num == 1:
665 if num == 1:
666 return parents[0].ancestor(parents[1])
666 return parents[0].ancestor(parents[1])
667 return None
667 return None
668
668
669 def print_result(nodes, good):
669 def print_result(nodes, good):
670 displayer = cmdutil.show_changeset(ui, repo, {})
670 displayer = cmdutil.show_changeset(ui, repo, {})
671 if len(nodes) == 1:
671 if len(nodes) == 1:
672 # narrowed it down to a single revision
672 # narrowed it down to a single revision
673 if good:
673 if good:
674 ui.write(_("The first good revision is:\n"))
674 ui.write(_("The first good revision is:\n"))
675 else:
675 else:
676 ui.write(_("The first bad revision is:\n"))
676 ui.write(_("The first bad revision is:\n"))
677 displayer.show(repo[nodes[0]])
677 displayer.show(repo[nodes[0]])
678 extendnode = extendbisectrange(nodes, good)
678 extendnode = extendbisectrange(nodes, good)
679 if extendnode is not None:
679 if extendnode is not None:
680 ui.write(_('Not all ancestors of this changeset have been'
680 ui.write(_('Not all ancestors of this changeset have been'
681 ' checked.\nUse bisect --extend to continue the '
681 ' checked.\nUse bisect --extend to continue the '
682 'bisection from\nthe common ancestor, %s.\n')
682 'bisection from\nthe common ancestor, %s.\n')
683 % extendnode)
683 % extendnode)
684 else:
684 else:
685 # multiple possible revisions
685 # multiple possible revisions
686 if good:
686 if good:
687 ui.write(_("Due to skipped revisions, the first "
687 ui.write(_("Due to skipped revisions, the first "
688 "good revision could be any of:\n"))
688 "good revision could be any of:\n"))
689 else:
689 else:
690 ui.write(_("Due to skipped revisions, the first "
690 ui.write(_("Due to skipped revisions, the first "
691 "bad revision could be any of:\n"))
691 "bad revision could be any of:\n"))
692 for n in nodes:
692 for n in nodes:
693 displayer.show(repo[n])
693 displayer.show(repo[n])
694 displayer.close()
694 displayer.close()
695
695
696 def check_state(state, interactive=True):
696 def check_state(state, interactive=True):
697 if not state['good'] or not state['bad']:
697 if not state['good'] or not state['bad']:
698 if (good or bad or skip or reset) and interactive:
698 if (good or bad or skip or reset) and interactive:
699 return
699 return
700 if not state['good']:
700 if not state['good']:
701 raise util.Abort(_('cannot bisect (no known good revisions)'))
701 raise util.Abort(_('cannot bisect (no known good revisions)'))
702 else:
702 else:
703 raise util.Abort(_('cannot bisect (no known bad revisions)'))
703 raise util.Abort(_('cannot bisect (no known bad revisions)'))
704 return True
704 return True
705
705
706 # backward compatibility
706 # backward compatibility
707 if rev in "good bad reset init".split():
707 if rev in "good bad reset init".split():
708 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
708 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
709 cmd, rev, extra = rev, extra, None
709 cmd, rev, extra = rev, extra, None
710 if cmd == "good":
710 if cmd == "good":
711 good = True
711 good = True
712 elif cmd == "bad":
712 elif cmd == "bad":
713 bad = True
713 bad = True
714 else:
714 else:
715 reset = True
715 reset = True
716 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
716 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
717 raise util.Abort(_('incompatible arguments'))
717 raise util.Abort(_('incompatible arguments'))
718
718
719 cmdutil.checkunfinished(repo)
719 cmdutil.checkunfinished(repo)
720
720
721 if reset:
721 if reset:
722 p = repo.join("bisect.state")
722 p = repo.join("bisect.state")
723 if os.path.exists(p):
723 if os.path.exists(p):
724 os.unlink(p)
724 os.unlink(p)
725 return
725 return
726
726
727 state = hbisect.load_state(repo)
727 state = hbisect.load_state(repo)
728
728
729 if command:
729 if command:
730 changesets = 1
730 changesets = 1
731 if noupdate:
731 if noupdate:
732 try:
732 try:
733 node = state['current'][0]
733 node = state['current'][0]
734 except LookupError:
734 except LookupError:
735 raise util.Abort(_('current bisect revision is unknown - '
735 raise util.Abort(_('current bisect revision is unknown - '
736 'start a new bisect to fix'))
736 'start a new bisect to fix'))
737 else:
737 else:
738 node, p2 = repo.dirstate.parents()
738 node, p2 = repo.dirstate.parents()
739 if p2 != nullid:
739 if p2 != nullid:
740 raise util.Abort(_('current bisect revision is a merge'))
740 raise util.Abort(_('current bisect revision is a merge'))
741 try:
741 try:
742 while changesets:
742 while changesets:
743 # update state
743 # update state
744 state['current'] = [node]
744 state['current'] = [node]
745 hbisect.save_state(repo, state)
745 hbisect.save_state(repo, state)
746 status = util.system(command,
746 status = util.system(command,
747 environ={'HG_NODE': hex(node)},
747 environ={'HG_NODE': hex(node)},
748 out=ui.fout)
748 out=ui.fout)
749 if status == 125:
749 if status == 125:
750 transition = "skip"
750 transition = "skip"
751 elif status == 0:
751 elif status == 0:
752 transition = "good"
752 transition = "good"
753 # status < 0 means process was killed
753 # status < 0 means process was killed
754 elif status == 127:
754 elif status == 127:
755 raise util.Abort(_("failed to execute %s") % command)
755 raise util.Abort(_("failed to execute %s") % command)
756 elif status < 0:
756 elif status < 0:
757 raise util.Abort(_("%s killed") % command)
757 raise util.Abort(_("%s killed") % command)
758 else:
758 else:
759 transition = "bad"
759 transition = "bad"
760 ctx = scmutil.revsingle(repo, rev, node)
760 ctx = scmutil.revsingle(repo, rev, node)
761 rev = None # clear for future iterations
761 rev = None # clear for future iterations
762 state[transition].append(ctx.node())
762 state[transition].append(ctx.node())
763 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
763 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
764 check_state(state, interactive=False)
764 check_state(state, interactive=False)
765 # bisect
765 # bisect
766 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
766 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
767 # update to next check
767 # update to next check
768 node = nodes[0]
768 node = nodes[0]
769 if not noupdate:
769 if not noupdate:
770 cmdutil.bailifchanged(repo)
770 cmdutil.bailifchanged(repo)
771 hg.clean(repo, node, show_stats=False)
771 hg.clean(repo, node, show_stats=False)
772 finally:
772 finally:
773 state['current'] = [node]
773 state['current'] = [node]
774 hbisect.save_state(repo, state)
774 hbisect.save_state(repo, state)
775 print_result(nodes, bgood)
775 print_result(nodes, bgood)
776 return
776 return
777
777
778 # update state
778 # update state
779
779
780 if rev:
780 if rev:
781 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
781 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
782 else:
782 else:
783 nodes = [repo.lookup('.')]
783 nodes = [repo.lookup('.')]
784
784
785 if good or bad or skip:
785 if good or bad or skip:
786 if good:
786 if good:
787 state['good'] += nodes
787 state['good'] += nodes
788 elif bad:
788 elif bad:
789 state['bad'] += nodes
789 state['bad'] += nodes
790 elif skip:
790 elif skip:
791 state['skip'] += nodes
791 state['skip'] += nodes
792 hbisect.save_state(repo, state)
792 hbisect.save_state(repo, state)
793
793
794 if not check_state(state):
794 if not check_state(state):
795 return
795 return
796
796
797 # actually bisect
797 # actually bisect
798 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
798 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
799 if extend:
799 if extend:
800 if not changesets:
800 if not changesets:
801 extendnode = extendbisectrange(nodes, good)
801 extendnode = extendbisectrange(nodes, good)
802 if extendnode is not None:
802 if extendnode is not None:
803 ui.write(_("Extending search to changeset %d:%s\n")
803 ui.write(_("Extending search to changeset %d:%s\n")
804 % (extendnode.rev(), extendnode))
804 % (extendnode.rev(), extendnode))
805 state['current'] = [extendnode.node()]
805 state['current'] = [extendnode.node()]
806 hbisect.save_state(repo, state)
806 hbisect.save_state(repo, state)
807 if noupdate:
807 if noupdate:
808 return
808 return
809 cmdutil.bailifchanged(repo)
809 cmdutil.bailifchanged(repo)
810 return hg.clean(repo, extendnode.node())
810 return hg.clean(repo, extendnode.node())
811 raise util.Abort(_("nothing to extend"))
811 raise util.Abort(_("nothing to extend"))
812
812
813 if changesets == 0:
813 if changesets == 0:
814 print_result(nodes, good)
814 print_result(nodes, good)
815 else:
815 else:
816 assert len(nodes) == 1 # only a single node can be tested next
816 assert len(nodes) == 1 # only a single node can be tested next
817 node = nodes[0]
817 node = nodes[0]
818 # compute the approximate number of remaining tests
818 # compute the approximate number of remaining tests
819 tests, size = 0, 2
819 tests, size = 0, 2
820 while size <= changesets:
820 while size <= changesets:
821 tests, size = tests + 1, size * 2
821 tests, size = tests + 1, size * 2
822 rev = repo.changelog.rev(node)
822 rev = repo.changelog.rev(node)
823 ui.write(_("Testing changeset %d:%s "
823 ui.write(_("Testing changeset %d:%s "
824 "(%d changesets remaining, ~%d tests)\n")
824 "(%d changesets remaining, ~%d tests)\n")
825 % (rev, short(node), changesets, tests))
825 % (rev, short(node), changesets, tests))
826 state['current'] = [node]
826 state['current'] = [node]
827 hbisect.save_state(repo, state)
827 hbisect.save_state(repo, state)
828 if not noupdate:
828 if not noupdate:
829 cmdutil.bailifchanged(repo)
829 cmdutil.bailifchanged(repo)
830 return hg.clean(repo, node)
830 return hg.clean(repo, node)
831
831
832 @command('bookmarks|bookmark',
832 @command('bookmarks|bookmark',
833 [('f', 'force', False, _('force')),
833 [('f', 'force', False, _('force')),
834 ('r', 'rev', '', _('revision'), _('REV')),
834 ('r', 'rev', '', _('revision'), _('REV')),
835 ('d', 'delete', False, _('delete a given bookmark')),
835 ('d', 'delete', False, _('delete a given bookmark')),
836 ('m', 'rename', '', _('rename a given bookmark'), _('NAME')),
836 ('m', 'rename', '', _('rename a given bookmark'), _('NAME')),
837 ('i', 'inactive', False, _('mark a bookmark inactive')),
837 ('i', 'inactive', False, _('mark a bookmark inactive')),
838 ] + formatteropts,
838 ] + formatteropts,
839 _('hg bookmarks [OPTIONS]... [NAME]...'))
839 _('hg bookmarks [OPTIONS]... [NAME]...'))
840 def bookmark(ui, repo, *names, **opts):
840 def bookmark(ui, repo, *names, **opts):
841 '''create a new bookmark or list existing bookmarks
841 '''create a new bookmark or list existing bookmarks
842
842
843 Bookmarks are labels on changesets to help track lines of development.
843 Bookmarks are labels on changesets to help track lines of development.
844 Bookmarks are unversioned and can be moved, renamed and deleted.
844 Bookmarks are unversioned and can be moved, renamed and deleted.
845 Deleting or moving a bookmark has no effect on the associated changesets.
845 Deleting or moving a bookmark has no effect on the associated changesets.
846
846
847 Creating or updating to a bookmark causes it to be marked as 'active'.
847 Creating or updating to a bookmark causes it to be marked as 'active'.
848 The active bookmark is indicated with a '*'.
848 The active bookmark is indicated with a '*'.
849 When a commit is made, the active bookmark will advance to the new commit.
849 When a commit is made, the active bookmark will advance to the new commit.
850 A plain :hg:`update` will also advance an active bookmark, if possible.
850 A plain :hg:`update` will also advance an active bookmark, if possible.
851 Updating away from a bookmark will cause it to be deactivated.
851 Updating away from a bookmark will cause it to be deactivated.
852
852
853 Bookmarks can be pushed and pulled between repositories (see
853 Bookmarks can be pushed and pulled between repositories (see
854 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
854 :hg:`help push` and :hg:`help pull`). If a shared bookmark has
855 diverged, a new 'divergent bookmark' of the form 'name@path' will
855 diverged, a new 'divergent bookmark' of the form 'name@path' will
856 be created. Using :hg:'merge' will resolve the divergence.
856 be created. Using :hg:'merge' will resolve the divergence.
857
857
858 A bookmark named '@' has the special property that :hg:`clone` will
858 A bookmark named '@' has the special property that :hg:`clone` will
859 check it out by default if it exists.
859 check it out by default if it exists.
860
860
861 .. container:: verbose
861 .. container:: verbose
862
862
863 Examples:
863 Examples:
864
864
865 - create an active bookmark for a new line of development::
865 - create an active bookmark for a new line of development::
866
866
867 hg book new-feature
867 hg book new-feature
868
868
869 - create an inactive bookmark as a place marker::
869 - create an inactive bookmark as a place marker::
870
870
871 hg book -i reviewed
871 hg book -i reviewed
872
872
873 - create an inactive bookmark on another changeset::
873 - create an inactive bookmark on another changeset::
874
874
875 hg book -r .^ tested
875 hg book -r .^ tested
876
876
877 - move the '@' bookmark from another branch::
877 - move the '@' bookmark from another branch::
878
878
879 hg book -f @
879 hg book -f @
880 '''
880 '''
881 force = opts.get('force')
881 force = opts.get('force')
882 rev = opts.get('rev')
882 rev = opts.get('rev')
883 delete = opts.get('delete')
883 delete = opts.get('delete')
884 rename = opts.get('rename')
884 rename = opts.get('rename')
885 inactive = opts.get('inactive')
885 inactive = opts.get('inactive')
886
886
887 def checkformat(mark):
887 def checkformat(mark):
888 mark = mark.strip()
888 mark = mark.strip()
889 if not mark:
889 if not mark:
890 raise util.Abort(_("bookmark names cannot consist entirely of "
890 raise util.Abort(_("bookmark names cannot consist entirely of "
891 "whitespace"))
891 "whitespace"))
892 scmutil.checknewlabel(repo, mark, 'bookmark')
892 scmutil.checknewlabel(repo, mark, 'bookmark')
893 return mark
893 return mark
894
894
895 def checkconflict(repo, mark, cur, force=False, target=None):
895 def checkconflict(repo, mark, cur, force=False, target=None):
896 if mark in marks and not force:
896 if mark in marks and not force:
897 if target:
897 if target:
898 if marks[mark] == target and target == cur:
898 if marks[mark] == target and target == cur:
899 # re-activating a bookmark
899 # re-activating a bookmark
900 return
900 return
901 anc = repo.changelog.ancestors([repo[target].rev()])
901 anc = repo.changelog.ancestors([repo[target].rev()])
902 bmctx = repo[marks[mark]]
902 bmctx = repo[marks[mark]]
903 divs = [repo[b].node() for b in marks
903 divs = [repo[b].node() for b in marks
904 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
904 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
905
905
906 # allow resolving a single divergent bookmark even if moving
906 # allow resolving a single divergent bookmark even if moving
907 # the bookmark across branches when a revision is specified
907 # the bookmark across branches when a revision is specified
908 # that contains a divergent bookmark
908 # that contains a divergent bookmark
909 if bmctx.rev() not in anc and target in divs:
909 if bmctx.rev() not in anc and target in divs:
910 bookmarks.deletedivergent(repo, [target], mark)
910 bookmarks.deletedivergent(repo, [target], mark)
911 return
911 return
912
912
913 deletefrom = [b for b in divs
913 deletefrom = [b for b in divs
914 if repo[b].rev() in anc or b == target]
914 if repo[b].rev() in anc or b == target]
915 bookmarks.deletedivergent(repo, deletefrom, mark)
915 bookmarks.deletedivergent(repo, deletefrom, mark)
916 if bookmarks.validdest(repo, bmctx, repo[target]):
916 if bookmarks.validdest(repo, bmctx, repo[target]):
917 ui.status(_("moving bookmark '%s' forward from %s\n") %
917 ui.status(_("moving bookmark '%s' forward from %s\n") %
918 (mark, short(bmctx.node())))
918 (mark, short(bmctx.node())))
919 return
919 return
920 raise util.Abort(_("bookmark '%s' already exists "
920 raise util.Abort(_("bookmark '%s' already exists "
921 "(use -f to force)") % mark)
921 "(use -f to force)") % mark)
922 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
922 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
923 and not force):
923 and not force):
924 raise util.Abort(
924 raise util.Abort(
925 _("a bookmark cannot have the name of an existing branch"))
925 _("a bookmark cannot have the name of an existing branch"))
926
926
927 if delete and rename:
927 if delete and rename:
928 raise util.Abort(_("--delete and --rename are incompatible"))
928 raise util.Abort(_("--delete and --rename are incompatible"))
929 if delete and rev:
929 if delete and rev:
930 raise util.Abort(_("--rev is incompatible with --delete"))
930 raise util.Abort(_("--rev is incompatible with --delete"))
931 if rename and rev:
931 if rename and rev:
932 raise util.Abort(_("--rev is incompatible with --rename"))
932 raise util.Abort(_("--rev is incompatible with --rename"))
933 if not names and (delete or rev):
933 if not names and (delete or rev):
934 raise util.Abort(_("bookmark name required"))
934 raise util.Abort(_("bookmark name required"))
935
935
936 if delete or rename or names or inactive:
936 if delete or rename or names or inactive:
937 wlock = repo.wlock()
937 wlock = repo.wlock()
938 try:
938 try:
939 cur = repo.changectx('.').node()
939 cur = repo.changectx('.').node()
940 marks = repo._bookmarks
940 marks = repo._bookmarks
941 if delete:
941 if delete:
942 for mark in names:
942 for mark in names:
943 if mark not in marks:
943 if mark not in marks:
944 raise util.Abort(_("bookmark '%s' does not exist") %
944 raise util.Abort(_("bookmark '%s' does not exist") %
945 mark)
945 mark)
946 if mark == repo._bookmarkcurrent:
946 if mark == repo._bookmarkcurrent:
947 bookmarks.unsetcurrent(repo)
947 bookmarks.unsetcurrent(repo)
948 del marks[mark]
948 del marks[mark]
949 marks.write()
949 marks.write()
950
950
951 elif rename:
951 elif rename:
952 if not names:
952 if not names:
953 raise util.Abort(_("new bookmark name required"))
953 raise util.Abort(_("new bookmark name required"))
954 elif len(names) > 1:
954 elif len(names) > 1:
955 raise util.Abort(_("only one new bookmark name allowed"))
955 raise util.Abort(_("only one new bookmark name allowed"))
956 mark = checkformat(names[0])
956 mark = checkformat(names[0])
957 if rename not in marks:
957 if rename not in marks:
958 raise util.Abort(_("bookmark '%s' does not exist") % rename)
958 raise util.Abort(_("bookmark '%s' does not exist") % rename)
959 checkconflict(repo, mark, cur, force)
959 checkconflict(repo, mark, cur, force)
960 marks[mark] = marks[rename]
960 marks[mark] = marks[rename]
961 if repo._bookmarkcurrent == rename and not inactive:
961 if repo._bookmarkcurrent == rename and not inactive:
962 bookmarks.setcurrent(repo, mark)
962 bookmarks.setcurrent(repo, mark)
963 del marks[rename]
963 del marks[rename]
964 marks.write()
964 marks.write()
965
965
966 elif names:
966 elif names:
967 newact = None
967 newact = None
968 for mark in names:
968 for mark in names:
969 mark = checkformat(mark)
969 mark = checkformat(mark)
970 if newact is None:
970 if newact is None:
971 newact = mark
971 newact = mark
972 if inactive and mark == repo._bookmarkcurrent:
972 if inactive and mark == repo._bookmarkcurrent:
973 bookmarks.unsetcurrent(repo)
973 bookmarks.unsetcurrent(repo)
974 return
974 return
975 tgt = cur
975 tgt = cur
976 if rev:
976 if rev:
977 tgt = scmutil.revsingle(repo, rev).node()
977 tgt = scmutil.revsingle(repo, rev).node()
978 checkconflict(repo, mark, cur, force, tgt)
978 checkconflict(repo, mark, cur, force, tgt)
979 marks[mark] = tgt
979 marks[mark] = tgt
980 if not inactive and cur == marks[newact] and not rev:
980 if not inactive and cur == marks[newact] and not rev:
981 bookmarks.setcurrent(repo, newact)
981 bookmarks.setcurrent(repo, newact)
982 elif cur != tgt and newact == repo._bookmarkcurrent:
982 elif cur != tgt and newact == repo._bookmarkcurrent:
983 bookmarks.unsetcurrent(repo)
983 bookmarks.unsetcurrent(repo)
984 marks.write()
984 marks.write()
985
985
986 elif inactive:
986 elif inactive:
987 if len(marks) == 0:
987 if len(marks) == 0:
988 ui.status(_("no bookmarks set\n"))
988 ui.status(_("no bookmarks set\n"))
989 elif not repo._bookmarkcurrent:
989 elif not repo._bookmarkcurrent:
990 ui.status(_("no active bookmark\n"))
990 ui.status(_("no active bookmark\n"))
991 else:
991 else:
992 bookmarks.unsetcurrent(repo)
992 bookmarks.unsetcurrent(repo)
993 finally:
993 finally:
994 wlock.release()
994 wlock.release()
995 else: # show bookmarks
995 else: # show bookmarks
996 fm = ui.formatter('bookmarks', opts)
996 fm = ui.formatter('bookmarks', opts)
997 hexfn = fm.hexfunc
997 hexfn = fm.hexfunc
998 marks = repo._bookmarks
998 marks = repo._bookmarks
999 if len(marks) == 0 and not fm:
999 if len(marks) == 0 and not fm:
1000 ui.status(_("no bookmarks set\n"))
1000 ui.status(_("no bookmarks set\n"))
1001 for bmark, n in sorted(marks.iteritems()):
1001 for bmark, n in sorted(marks.iteritems()):
1002 current = repo._bookmarkcurrent
1002 current = repo._bookmarkcurrent
1003 if bmark == current:
1003 if bmark == current:
1004 prefix, label = '*', 'bookmarks.current'
1004 prefix, label = '*', 'bookmarks.current'
1005 else:
1005 else:
1006 prefix, label = ' ', ''
1006 prefix, label = ' ', ''
1007
1007
1008 fm.startitem()
1008 fm.startitem()
1009 if not ui.quiet:
1009 if not ui.quiet:
1010 fm.plain(' %s ' % prefix, label=label)
1010 fm.plain(' %s ' % prefix, label=label)
1011 fm.write('bookmark', '%s', bmark, label=label)
1011 fm.write('bookmark', '%s', bmark, label=label)
1012 pad = " " * (25 - encoding.colwidth(bmark))
1012 pad = " " * (25 - encoding.colwidth(bmark))
1013 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1013 fm.condwrite(not ui.quiet, 'rev node', pad + ' %d:%s',
1014 repo.changelog.rev(n), hexfn(n), label=label)
1014 repo.changelog.rev(n), hexfn(n), label=label)
1015 fm.data(active=(bmark == current))
1015 fm.data(active=(bmark == current))
1016 fm.plain('\n')
1016 fm.plain('\n')
1017 fm.end()
1017 fm.end()
1018
1018
1019 @command('branch',
1019 @command('branch',
1020 [('f', 'force', None,
1020 [('f', 'force', None,
1021 _('set branch name even if it shadows an existing branch')),
1021 _('set branch name even if it shadows an existing branch')),
1022 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1022 ('C', 'clean', None, _('reset branch name to parent branch name'))],
1023 _('[-fC] [NAME]'))
1023 _('[-fC] [NAME]'))
1024 def branch(ui, repo, label=None, **opts):
1024 def branch(ui, repo, label=None, **opts):
1025 """set or show the current branch name
1025 """set or show the current branch name
1026
1026
1027 .. note::
1027 .. note::
1028
1028
1029 Branch names are permanent and global. Use :hg:`bookmark` to create a
1029 Branch names are permanent and global. Use :hg:`bookmark` to create a
1030 light-weight bookmark instead. See :hg:`help glossary` for more
1030 light-weight bookmark instead. See :hg:`help glossary` for more
1031 information about named branches and bookmarks.
1031 information about named branches and bookmarks.
1032
1032
1033 With no argument, show the current branch name. With one argument,
1033 With no argument, show the current branch name. With one argument,
1034 set the working directory branch name (the branch will not exist
1034 set the working directory branch name (the branch will not exist
1035 in the repository until the next commit). Standard practice
1035 in the repository until the next commit). Standard practice
1036 recommends that primary development take place on the 'default'
1036 recommends that primary development take place on the 'default'
1037 branch.
1037 branch.
1038
1038
1039 Unless -f/--force is specified, branch will not let you set a
1039 Unless -f/--force is specified, branch will not let you set a
1040 branch name that already exists, even if it's inactive.
1040 branch name that already exists, even if it's inactive.
1041
1041
1042 Use -C/--clean to reset the working directory branch to that of
1042 Use -C/--clean to reset the working directory branch to that of
1043 the parent of the working directory, negating a previous branch
1043 the parent of the working directory, negating a previous branch
1044 change.
1044 change.
1045
1045
1046 Use the command :hg:`update` to switch to an existing branch. Use
1046 Use the command :hg:`update` to switch to an existing branch. Use
1047 :hg:`commit --close-branch` to mark this branch as closed.
1047 :hg:`commit --close-branch` to mark this branch as closed.
1048
1048
1049 Returns 0 on success.
1049 Returns 0 on success.
1050 """
1050 """
1051 if label:
1051 if label:
1052 label = label.strip()
1052 label = label.strip()
1053
1053
1054 if not opts.get('clean') and not label:
1054 if not opts.get('clean') and not label:
1055 ui.write("%s\n" % repo.dirstate.branch())
1055 ui.write("%s\n" % repo.dirstate.branch())
1056 return
1056 return
1057
1057
1058 wlock = repo.wlock()
1058 wlock = repo.wlock()
1059 try:
1059 try:
1060 if opts.get('clean'):
1060 if opts.get('clean'):
1061 label = repo[None].p1().branch()
1061 label = repo[None].p1().branch()
1062 repo.dirstate.setbranch(label)
1062 repo.dirstate.setbranch(label)
1063 ui.status(_('reset working directory to branch %s\n') % label)
1063 ui.status(_('reset working directory to branch %s\n') % label)
1064 elif label:
1064 elif label:
1065 if not opts.get('force') and label in repo.branchmap():
1065 if not opts.get('force') and label in repo.branchmap():
1066 if label not in [p.branch() for p in repo.parents()]:
1066 if label not in [p.branch() for p in repo.parents()]:
1067 raise util.Abort(_('a branch of the same name already'
1067 raise util.Abort(_('a branch of the same name already'
1068 ' exists'),
1068 ' exists'),
1069 # i18n: "it" refers to an existing branch
1069 # i18n: "it" refers to an existing branch
1070 hint=_("use 'hg update' to switch to it"))
1070 hint=_("use 'hg update' to switch to it"))
1071 scmutil.checknewlabel(repo, label, 'branch')
1071 scmutil.checknewlabel(repo, label, 'branch')
1072 repo.dirstate.setbranch(label)
1072 repo.dirstate.setbranch(label)
1073 ui.status(_('marked working directory as branch %s\n') % label)
1073 ui.status(_('marked working directory as branch %s\n') % label)
1074 ui.status(_('(branches are permanent and global, '
1074 ui.status(_('(branches are permanent and global, '
1075 'did you want a bookmark?)\n'))
1075 'did you want a bookmark?)\n'))
1076 finally:
1076 finally:
1077 wlock.release()
1077 wlock.release()
1078
1078
1079 @command('branches',
1079 @command('branches',
1080 [('a', 'active', False, _('show only branches that have unmerged heads')),
1080 [('a', 'active', False, _('show only branches that have unmerged heads')),
1081 ('c', 'closed', False, _('show normal and closed branches')),
1081 ('c', 'closed', False, _('show normal and closed branches')),
1082 ] + formatteropts,
1082 ] + formatteropts,
1083 _('[-ac]'))
1083 _('[-ac]'))
1084 def branches(ui, repo, active=False, closed=False, **opts):
1084 def branches(ui, repo, active=False, closed=False, **opts):
1085 """list repository named branches
1085 """list repository named branches
1086
1086
1087 List the repository's named branches, indicating which ones are
1087 List the repository's named branches, indicating which ones are
1088 inactive. If -c/--closed is specified, also list branches which have
1088 inactive. If -c/--closed is specified, also list branches which have
1089 been marked closed (see :hg:`commit --close-branch`).
1089 been marked closed (see :hg:`commit --close-branch`).
1090
1090
1091 If -a/--active is specified, only show active branches. A branch
1091 If -a/--active is specified, only show active branches. A branch
1092 is considered active if it contains repository heads.
1092 is considered active if it contains repository heads.
1093
1093
1094 Use the command :hg:`update` to switch to an existing branch.
1094 Use the command :hg:`update` to switch to an existing branch.
1095
1095
1096 Returns 0.
1096 Returns 0.
1097 """
1097 """
1098
1098
1099 fm = ui.formatter('branches', opts)
1099 fm = ui.formatter('branches', opts)
1100 hexfunc = fm.hexfunc
1100 hexfunc = fm.hexfunc
1101
1101
1102 allheads = set(repo.heads())
1102 allheads = set(repo.heads())
1103 branches = []
1103 branches = []
1104 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1104 for tag, heads, tip, isclosed in repo.branchmap().iterbranches():
1105 isactive = not isclosed and bool(set(heads) & allheads)
1105 isactive = not isclosed and bool(set(heads) & allheads)
1106 branches.append((tag, repo[tip], isactive, not isclosed))
1106 branches.append((tag, repo[tip], isactive, not isclosed))
1107 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1107 branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]),
1108 reverse=True)
1108 reverse=True)
1109
1109
1110 for tag, ctx, isactive, isopen in branches:
1110 for tag, ctx, isactive, isopen in branches:
1111 if active and not isactive:
1111 if active and not isactive:
1112 continue
1112 continue
1113 if isactive:
1113 if isactive:
1114 label = 'branches.active'
1114 label = 'branches.active'
1115 notice = ''
1115 notice = ''
1116 elif not isopen:
1116 elif not isopen:
1117 if not closed:
1117 if not closed:
1118 continue
1118 continue
1119 label = 'branches.closed'
1119 label = 'branches.closed'
1120 notice = _(' (closed)')
1120 notice = _(' (closed)')
1121 else:
1121 else:
1122 label = 'branches.inactive'
1122 label = 'branches.inactive'
1123 notice = _(' (inactive)')
1123 notice = _(' (inactive)')
1124 current = (tag == repo.dirstate.branch())
1124 current = (tag == repo.dirstate.branch())
1125 if current:
1125 if current:
1126 label = 'branches.current'
1126 label = 'branches.current'
1127
1127
1128 fm.startitem()
1128 fm.startitem()
1129 fm.write('branch', '%s', tag, label=label)
1129 fm.write('branch', '%s', tag, label=label)
1130 rev = ctx.rev()
1130 rev = ctx.rev()
1131 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1131 padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0)
1132 fmt = ' ' * padsize + ' %d:%s'
1132 fmt = ' ' * padsize + ' %d:%s'
1133 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1133 fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()),
1134 label='log.changeset changeset.%s' % ctx.phasestr())
1134 label='log.changeset changeset.%s' % ctx.phasestr())
1135 fm.data(active=isactive, closed=not isopen, current=current)
1135 fm.data(active=isactive, closed=not isopen, current=current)
1136 if not ui.quiet:
1136 if not ui.quiet:
1137 fm.plain(notice)
1137 fm.plain(notice)
1138 fm.plain('\n')
1138 fm.plain('\n')
1139 fm.end()
1139 fm.end()
1140
1140
1141 @command('bundle',
1141 @command('bundle',
1142 [('f', 'force', None, _('run even when the destination is unrelated')),
1142 [('f', 'force', None, _('run even when the destination is unrelated')),
1143 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1143 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1144 _('REV')),
1144 _('REV')),
1145 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1145 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1146 _('BRANCH')),
1146 _('BRANCH')),
1147 ('', 'base', [],
1147 ('', 'base', [],
1148 _('a base changeset assumed to be available at the destination'),
1148 _('a base changeset assumed to be available at the destination'),
1149 _('REV')),
1149 _('REV')),
1150 ('a', 'all', None, _('bundle all changesets in the repository')),
1150 ('a', 'all', None, _('bundle all changesets in the repository')),
1151 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1151 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1152 ] + remoteopts,
1152 ] + remoteopts,
1153 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1153 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1154 def bundle(ui, repo, fname, dest=None, **opts):
1154 def bundle(ui, repo, fname, dest=None, **opts):
1155 """create a changegroup file
1155 """create a changegroup file
1156
1156
1157 Generate a compressed changegroup file collecting changesets not
1157 Generate a compressed changegroup file collecting changesets not
1158 known to be in another repository.
1158 known to be in another repository.
1159
1159
1160 If you omit the destination repository, then hg assumes the
1160 If you omit the destination repository, then hg assumes the
1161 destination will have all the nodes you specify with --base
1161 destination will have all the nodes you specify with --base
1162 parameters. To create a bundle containing all changesets, use
1162 parameters. To create a bundle containing all changesets, use
1163 -a/--all (or --base null).
1163 -a/--all (or --base null).
1164
1164
1165 You can change compression method with the -t/--type option.
1165 You can change compression method with the -t/--type option.
1166 The available compression methods are: none, bzip2, and
1166 The available compression methods are: none, bzip2, and
1167 gzip (by default, bundles are compressed using bzip2).
1167 gzip (by default, bundles are compressed using bzip2).
1168
1168
1169 The bundle file can then be transferred using conventional means
1169 The bundle file can then be transferred using conventional means
1170 and applied to another repository with the unbundle or pull
1170 and applied to another repository with the unbundle or pull
1171 command. This is useful when direct push and pull are not
1171 command. This is useful when direct push and pull are not
1172 available or when exporting an entire repository is undesirable.
1172 available or when exporting an entire repository is undesirable.
1173
1173
1174 Applying bundles preserves all changeset contents including
1174 Applying bundles preserves all changeset contents including
1175 permissions, copy/rename information, and revision history.
1175 permissions, copy/rename information, and revision history.
1176
1176
1177 Returns 0 on success, 1 if no changes found.
1177 Returns 0 on success, 1 if no changes found.
1178 """
1178 """
1179 revs = None
1179 revs = None
1180 if 'rev' in opts:
1180 if 'rev' in opts:
1181 revs = scmutil.revrange(repo, opts['rev'])
1181 revs = scmutil.revrange(repo, opts['rev'])
1182
1182
1183 bundletype = opts.get('type', 'bzip2').lower()
1183 bundletype = opts.get('type', 'bzip2').lower()
1184 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1184 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1185 bundletype = btypes.get(bundletype)
1185 bundletype = btypes.get(bundletype)
1186 if bundletype not in changegroup.bundletypes:
1186 if bundletype not in changegroup.bundletypes:
1187 raise util.Abort(_('unknown bundle type specified with --type'))
1187 raise util.Abort(_('unknown bundle type specified with --type'))
1188
1188
1189 if opts.get('all'):
1189 if opts.get('all'):
1190 base = ['null']
1190 base = ['null']
1191 else:
1191 else:
1192 base = scmutil.revrange(repo, opts.get('base'))
1192 base = scmutil.revrange(repo, opts.get('base'))
1193 # TODO: get desired bundlecaps from command line.
1193 # TODO: get desired bundlecaps from command line.
1194 bundlecaps = None
1194 bundlecaps = None
1195 if base:
1195 if base:
1196 if dest:
1196 if dest:
1197 raise util.Abort(_("--base is incompatible with specifying "
1197 raise util.Abort(_("--base is incompatible with specifying "
1198 "a destination"))
1198 "a destination"))
1199 common = [repo.lookup(rev) for rev in base]
1199 common = [repo.lookup(rev) for rev in base]
1200 heads = revs and map(repo.lookup, revs) or revs
1200 heads = revs and map(repo.lookup, revs) or revs
1201 cg = changegroup.getchangegroup(repo, 'bundle', heads=heads,
1201 cg = changegroup.getchangegroup(repo, 'bundle', heads=heads,
1202 common=common, bundlecaps=bundlecaps)
1202 common=common, bundlecaps=bundlecaps)
1203 outgoing = None
1203 outgoing = None
1204 else:
1204 else:
1205 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1205 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1206 dest, branches = hg.parseurl(dest, opts.get('branch'))
1206 dest, branches = hg.parseurl(dest, opts.get('branch'))
1207 other = hg.peer(repo, opts, dest)
1207 other = hg.peer(repo, opts, dest)
1208 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1208 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1209 heads = revs and map(repo.lookup, revs) or revs
1209 heads = revs and map(repo.lookup, revs) or revs
1210 outgoing = discovery.findcommonoutgoing(repo, other,
1210 outgoing = discovery.findcommonoutgoing(repo, other,
1211 onlyheads=heads,
1211 onlyheads=heads,
1212 force=opts.get('force'),
1212 force=opts.get('force'),
1213 portable=True)
1213 portable=True)
1214 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1214 cg = changegroup.getlocalchangegroup(repo, 'bundle', outgoing,
1215 bundlecaps)
1215 bundlecaps)
1216 if not cg:
1216 if not cg:
1217 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1217 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1218 return 1
1218 return 1
1219
1219
1220 changegroup.writebundle(cg, fname, bundletype)
1220 changegroup.writebundle(cg, fname, bundletype)
1221
1221
1222 @command('cat',
1222 @command('cat',
1223 [('o', 'output', '',
1223 [('o', 'output', '',
1224 _('print output to file with formatted name'), _('FORMAT')),
1224 _('print output to file with formatted name'), _('FORMAT')),
1225 ('r', 'rev', '', _('print the given revision'), _('REV')),
1225 ('r', 'rev', '', _('print the given revision'), _('REV')),
1226 ('', 'decode', None, _('apply any matching decode filter')),
1226 ('', 'decode', None, _('apply any matching decode filter')),
1227 ] + walkopts,
1227 ] + walkopts,
1228 _('[OPTION]... FILE...'),
1228 _('[OPTION]... FILE...'),
1229 inferrepo=True)
1229 inferrepo=True)
1230 def cat(ui, repo, file1, *pats, **opts):
1230 def cat(ui, repo, file1, *pats, **opts):
1231 """output the current or given revision of files
1231 """output the current or given revision of files
1232
1232
1233 Print the specified files as they were at the given revision. If
1233 Print the specified files as they were at the given revision. If
1234 no revision is given, the parent of the working directory is used.
1234 no revision is given, the parent of the working directory is used.
1235
1235
1236 Output may be to a file, in which case the name of the file is
1236 Output may be to a file, in which case the name of the file is
1237 given using a format string. The formatting rules as follows:
1237 given using a format string. The formatting rules as follows:
1238
1238
1239 :``%%``: literal "%" character
1239 :``%%``: literal "%" character
1240 :``%s``: basename of file being printed
1240 :``%s``: basename of file being printed
1241 :``%d``: dirname of file being printed, or '.' if in repository root
1241 :``%d``: dirname of file being printed, or '.' if in repository root
1242 :``%p``: root-relative path name of file being printed
1242 :``%p``: root-relative path name of file being printed
1243 :``%H``: changeset hash (40 hexadecimal digits)
1243 :``%H``: changeset hash (40 hexadecimal digits)
1244 :``%R``: changeset revision number
1244 :``%R``: changeset revision number
1245 :``%h``: short-form changeset hash (12 hexadecimal digits)
1245 :``%h``: short-form changeset hash (12 hexadecimal digits)
1246 :``%r``: zero-padded changeset revision number
1246 :``%r``: zero-padded changeset revision number
1247 :``%b``: basename of the exporting repository
1247 :``%b``: basename of the exporting repository
1248
1248
1249 Returns 0 on success.
1249 Returns 0 on success.
1250 """
1250 """
1251 ctx = scmutil.revsingle(repo, opts.get('rev'))
1251 ctx = scmutil.revsingle(repo, opts.get('rev'))
1252 m = scmutil.match(ctx, (file1,) + pats, opts)
1252 m = scmutil.match(ctx, (file1,) + pats, opts)
1253
1253
1254 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1254 return cmdutil.cat(ui, repo, ctx, m, '', **opts)
1255
1255
1256 @command('^clone',
1256 @command('^clone',
1257 [('U', 'noupdate', None,
1257 [('U', 'noupdate', None,
1258 _('the clone will include an empty working copy (only a repository)')),
1258 _('the clone will include an empty working copy (only a repository)')),
1259 ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')),
1259 ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')),
1260 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1260 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1261 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1261 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1262 ('', 'pull', None, _('use pull protocol to copy metadata')),
1262 ('', 'pull', None, _('use pull protocol to copy metadata')),
1263 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1263 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1264 ] + remoteopts,
1264 ] + remoteopts,
1265 _('[OPTION]... SOURCE [DEST]'),
1265 _('[OPTION]... SOURCE [DEST]'),
1266 norepo=True)
1266 norepo=True)
1267 def clone(ui, source, dest=None, **opts):
1267 def clone(ui, source, dest=None, **opts):
1268 """make a copy of an existing repository
1268 """make a copy of an existing repository
1269
1269
1270 Create a copy of an existing repository in a new directory.
1270 Create a copy of an existing repository in a new directory.
1271
1271
1272 If no destination directory name is specified, it defaults to the
1272 If no destination directory name is specified, it defaults to the
1273 basename of the source.
1273 basename of the source.
1274
1274
1275 The location of the source is added to the new repository's
1275 The location of the source is added to the new repository's
1276 ``.hg/hgrc`` file, as the default to be used for future pulls.
1276 ``.hg/hgrc`` file, as the default to be used for future pulls.
1277
1277
1278 Only local paths and ``ssh://`` URLs are supported as
1278 Only local paths and ``ssh://`` URLs are supported as
1279 destinations. For ``ssh://`` destinations, no working directory or
1279 destinations. For ``ssh://`` destinations, no working directory or
1280 ``.hg/hgrc`` will be created on the remote side.
1280 ``.hg/hgrc`` will be created on the remote side.
1281
1281
1282 To pull only a subset of changesets, specify one or more revisions
1282 To pull only a subset of changesets, specify one or more revisions
1283 identifiers with -r/--rev or branches with -b/--branch. The
1283 identifiers with -r/--rev or branches with -b/--branch. The
1284 resulting clone will contain only the specified changesets and
1284 resulting clone will contain only the specified changesets and
1285 their ancestors. These options (or 'clone src#rev dest') imply
1285 their ancestors. These options (or 'clone src#rev dest') imply
1286 --pull, even for local source repositories. Note that specifying a
1286 --pull, even for local source repositories. Note that specifying a
1287 tag will include the tagged changeset but not the changeset
1287 tag will include the tagged changeset but not the changeset
1288 containing the tag.
1288 containing the tag.
1289
1289
1290 If the source repository has a bookmark called '@' set, that
1290 If the source repository has a bookmark called '@' set, that
1291 revision will be checked out in the new repository by default.
1291 revision will be checked out in the new repository by default.
1292
1292
1293 To check out a particular version, use -u/--update, or
1293 To check out a particular version, use -u/--update, or
1294 -U/--noupdate to create a clone with no working directory.
1294 -U/--noupdate to create a clone with no working directory.
1295
1295
1296 .. container:: verbose
1296 .. container:: verbose
1297
1297
1298 For efficiency, hardlinks are used for cloning whenever the
1298 For efficiency, hardlinks are used for cloning whenever the
1299 source and destination are on the same filesystem (note this
1299 source and destination are on the same filesystem (note this
1300 applies only to the repository data, not to the working
1300 applies only to the repository data, not to the working
1301 directory). Some filesystems, such as AFS, implement hardlinking
1301 directory). Some filesystems, such as AFS, implement hardlinking
1302 incorrectly, but do not report errors. In these cases, use the
1302 incorrectly, but do not report errors. In these cases, use the
1303 --pull option to avoid hardlinking.
1303 --pull option to avoid hardlinking.
1304
1304
1305 In some cases, you can clone repositories and the working
1305 In some cases, you can clone repositories and the working
1306 directory using full hardlinks with ::
1306 directory using full hardlinks with ::
1307
1307
1308 $ cp -al REPO REPOCLONE
1308 $ cp -al REPO REPOCLONE
1309
1309
1310 This is the fastest way to clone, but it is not always safe. The
1310 This is the fastest way to clone, but it is not always safe. The
1311 operation is not atomic (making sure REPO is not modified during
1311 operation is not atomic (making sure REPO is not modified during
1312 the operation is up to you) and you have to make sure your
1312 the operation is up to you) and you have to make sure your
1313 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1313 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1314 so). Also, this is not compatible with certain extensions that
1314 so). Also, this is not compatible with certain extensions that
1315 place their metadata under the .hg directory, such as mq.
1315 place their metadata under the .hg directory, such as mq.
1316
1316
1317 Mercurial will update the working directory to the first applicable
1317 Mercurial will update the working directory to the first applicable
1318 revision from this list:
1318 revision from this list:
1319
1319
1320 a) null if -U or the source repository has no changesets
1320 a) null if -U or the source repository has no changesets
1321 b) if -u . and the source repository is local, the first parent of
1321 b) if -u . and the source repository is local, the first parent of
1322 the source repository's working directory
1322 the source repository's working directory
1323 c) the changeset specified with -u (if a branch name, this means the
1323 c) the changeset specified with -u (if a branch name, this means the
1324 latest head of that branch)
1324 latest head of that branch)
1325 d) the changeset specified with -r
1325 d) the changeset specified with -r
1326 e) the tipmost head specified with -b
1326 e) the tipmost head specified with -b
1327 f) the tipmost head specified with the url#branch source syntax
1327 f) the tipmost head specified with the url#branch source syntax
1328 g) the revision marked with the '@' bookmark, if present
1328 g) the revision marked with the '@' bookmark, if present
1329 h) the tipmost head of the default branch
1329 h) the tipmost head of the default branch
1330 i) tip
1330 i) tip
1331
1331
1332 Examples:
1332 Examples:
1333
1333
1334 - clone a remote repository to a new directory named hg/::
1334 - clone a remote repository to a new directory named hg/::
1335
1335
1336 hg clone http://selenic.com/hg
1336 hg clone http://selenic.com/hg
1337
1337
1338 - create a lightweight local clone::
1338 - create a lightweight local clone::
1339
1339
1340 hg clone project/ project-feature/
1340 hg clone project/ project-feature/
1341
1341
1342 - clone from an absolute path on an ssh server (note double-slash)::
1342 - clone from an absolute path on an ssh server (note double-slash)::
1343
1343
1344 hg clone ssh://user@server//home/projects/alpha/
1344 hg clone ssh://user@server//home/projects/alpha/
1345
1345
1346 - do a high-speed clone over a LAN while checking out a
1346 - do a high-speed clone over a LAN while checking out a
1347 specified version::
1347 specified version::
1348
1348
1349 hg clone --uncompressed http://server/repo -u 1.5
1349 hg clone --uncompressed http://server/repo -u 1.5
1350
1350
1351 - create a repository without changesets after a particular revision::
1351 - create a repository without changesets after a particular revision::
1352
1352
1353 hg clone -r 04e544 experimental/ good/
1353 hg clone -r 04e544 experimental/ good/
1354
1354
1355 - clone (and track) a particular named branch::
1355 - clone (and track) a particular named branch::
1356
1356
1357 hg clone http://selenic.com/hg#stable
1357 hg clone http://selenic.com/hg#stable
1358
1358
1359 See :hg:`help urls` for details on specifying URLs.
1359 See :hg:`help urls` for details on specifying URLs.
1360
1360
1361 Returns 0 on success.
1361 Returns 0 on success.
1362 """
1362 """
1363 if opts.get('noupdate') and opts.get('updaterev'):
1363 if opts.get('noupdate') and opts.get('updaterev'):
1364 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
1364 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
1365
1365
1366 r = hg.clone(ui, opts, source, dest,
1366 r = hg.clone(ui, opts, source, dest,
1367 pull=opts.get('pull'),
1367 pull=opts.get('pull'),
1368 stream=opts.get('uncompressed'),
1368 stream=opts.get('uncompressed'),
1369 rev=opts.get('rev'),
1369 rev=opts.get('rev'),
1370 update=opts.get('updaterev') or not opts.get('noupdate'),
1370 update=opts.get('updaterev') or not opts.get('noupdate'),
1371 branch=opts.get('branch'))
1371 branch=opts.get('branch'))
1372
1372
1373 return r is None
1373 return r is None
1374
1374
1375 @command('^commit|ci',
1375 @command('^commit|ci',
1376 [('A', 'addremove', None,
1376 [('A', 'addremove', None,
1377 _('mark new/missing files as added/removed before committing')),
1377 _('mark new/missing files as added/removed before committing')),
1378 ('', 'close-branch', None,
1378 ('', 'close-branch', None,
1379 _('mark a branch as closed, hiding it from the branch list')),
1379 _('mark a branch as closed, hiding it from the branch list')),
1380 ('', 'amend', None, _('amend the parent of the working dir')),
1380 ('', 'amend', None, _('amend the parent of the working dir')),
1381 ('s', 'secret', None, _('use the secret phase for committing')),
1381 ('s', 'secret', None, _('use the secret phase for committing')),
1382 ('e', 'edit', None, _('invoke editor on commit messages')),
1382 ('e', 'edit', None, _('invoke editor on commit messages')),
1383 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1383 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1384 _('[OPTION]... [FILE]...'),
1384 _('[OPTION]... [FILE]...'),
1385 inferrepo=True)
1385 inferrepo=True)
1386 def commit(ui, repo, *pats, **opts):
1386 def commit(ui, repo, *pats, **opts):
1387 """commit the specified files or all outstanding changes
1387 """commit the specified files or all outstanding changes
1388
1388
1389 Commit changes to the given files into the repository. Unlike a
1389 Commit changes to the given files into the repository. Unlike a
1390 centralized SCM, this operation is a local operation. See
1390 centralized SCM, this operation is a local operation. See
1391 :hg:`push` for a way to actively distribute your changes.
1391 :hg:`push` for a way to actively distribute your changes.
1392
1392
1393 If a list of files is omitted, all changes reported by :hg:`status`
1393 If a list of files is omitted, all changes reported by :hg:`status`
1394 will be committed.
1394 will be committed.
1395
1395
1396 If you are committing the result of a merge, do not provide any
1396 If you are committing the result of a merge, do not provide any
1397 filenames or -I/-X filters.
1397 filenames or -I/-X filters.
1398
1398
1399 If no commit message is specified, Mercurial starts your
1399 If no commit message is specified, Mercurial starts your
1400 configured editor where you can enter a message. In case your
1400 configured editor where you can enter a message. In case your
1401 commit fails, you will find a backup of your message in
1401 commit fails, you will find a backup of your message in
1402 ``.hg/last-message.txt``.
1402 ``.hg/last-message.txt``.
1403
1403
1404 The --amend flag can be used to amend the parent of the
1404 The --amend flag can be used to amend the parent of the
1405 working directory with a new commit that contains the changes
1405 working directory with a new commit that contains the changes
1406 in the parent in addition to those currently reported by :hg:`status`,
1406 in the parent in addition to those currently reported by :hg:`status`,
1407 if there are any. The old commit is stored in a backup bundle in
1407 if there are any. The old commit is stored in a backup bundle in
1408 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1408 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1409 on how to restore it).
1409 on how to restore it).
1410
1410
1411 Message, user and date are taken from the amended commit unless
1411 Message, user and date are taken from the amended commit unless
1412 specified. When a message isn't specified on the command line,
1412 specified. When a message isn't specified on the command line,
1413 the editor will open with the message of the amended commit.
1413 the editor will open with the message of the amended commit.
1414
1414
1415 It is not possible to amend public changesets (see :hg:`help phases`)
1415 It is not possible to amend public changesets (see :hg:`help phases`)
1416 or changesets that have children.
1416 or changesets that have children.
1417
1417
1418 See :hg:`help dates` for a list of formats valid for -d/--date.
1418 See :hg:`help dates` for a list of formats valid for -d/--date.
1419
1419
1420 Returns 0 on success, 1 if nothing changed.
1420 Returns 0 on success, 1 if nothing changed.
1421 """
1421 """
1422 if opts.get('subrepos'):
1422 if opts.get('subrepos'):
1423 if opts.get('amend'):
1423 if opts.get('amend'):
1424 raise util.Abort(_('cannot amend with --subrepos'))
1424 raise util.Abort(_('cannot amend with --subrepos'))
1425 # Let --subrepos on the command line override config setting.
1425 # Let --subrepos on the command line override config setting.
1426 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1426 ui.setconfig('ui', 'commitsubrepos', True, 'commit')
1427
1427
1428 cmdutil.checkunfinished(repo, commit=True)
1428 cmdutil.checkunfinished(repo, commit=True)
1429
1429
1430 branch = repo[None].branch()
1430 branch = repo[None].branch()
1431 bheads = repo.branchheads(branch)
1431 bheads = repo.branchheads(branch)
1432
1432
1433 extra = {}
1433 extra = {}
1434 if opts.get('close_branch'):
1434 if opts.get('close_branch'):
1435 extra['close'] = 1
1435 extra['close'] = 1
1436
1436
1437 if not bheads:
1437 if not bheads:
1438 raise util.Abort(_('can only close branch heads'))
1438 raise util.Abort(_('can only close branch heads'))
1439 elif opts.get('amend'):
1439 elif opts.get('amend'):
1440 if repo.parents()[0].p1().branch() != branch and \
1440 if repo.parents()[0].p1().branch() != branch and \
1441 repo.parents()[0].p2().branch() != branch:
1441 repo.parents()[0].p2().branch() != branch:
1442 raise util.Abort(_('can only close branch heads'))
1442 raise util.Abort(_('can only close branch heads'))
1443
1443
1444 if opts.get('amend'):
1444 if opts.get('amend'):
1445 if ui.configbool('ui', 'commitsubrepos'):
1445 if ui.configbool('ui', 'commitsubrepos'):
1446 raise util.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1446 raise util.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1447
1447
1448 old = repo['.']
1448 old = repo['.']
1449 if not old.mutable():
1449 if not old.mutable():
1450 raise util.Abort(_('cannot amend public changesets'))
1450 raise util.Abort(_('cannot amend public changesets'))
1451 if len(repo[None].parents()) > 1:
1451 if len(repo[None].parents()) > 1:
1452 raise util.Abort(_('cannot amend while merging'))
1452 raise util.Abort(_('cannot amend while merging'))
1453 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1453 allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt)
1454 if not allowunstable and old.children():
1454 if not allowunstable and old.children():
1455 raise util.Abort(_('cannot amend changeset with children'))
1455 raise util.Abort(_('cannot amend changeset with children'))
1456
1456
1457 # commitfunc is used only for temporary amend commit by cmdutil.amend
1457 # commitfunc is used only for temporary amend commit by cmdutil.amend
1458 def commitfunc(ui, repo, message, match, opts):
1458 def commitfunc(ui, repo, message, match, opts):
1459 return repo.commit(message,
1459 return repo.commit(message,
1460 opts.get('user') or old.user(),
1460 opts.get('user') or old.user(),
1461 opts.get('date') or old.date(),
1461 opts.get('date') or old.date(),
1462 match,
1462 match,
1463 extra=extra)
1463 extra=extra)
1464
1464
1465 current = repo._bookmarkcurrent
1465 current = repo._bookmarkcurrent
1466 marks = old.bookmarks()
1466 marks = old.bookmarks()
1467 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1467 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1468 if node == old.node():
1468 if node == old.node():
1469 ui.status(_("nothing changed\n"))
1469 ui.status(_("nothing changed\n"))
1470 return 1
1470 return 1
1471 elif marks:
1471 elif marks:
1472 ui.debug('moving bookmarks %r from %s to %s\n' %
1472 ui.debug('moving bookmarks %r from %s to %s\n' %
1473 (marks, old.hex(), hex(node)))
1473 (marks, old.hex(), hex(node)))
1474 newmarks = repo._bookmarks
1474 newmarks = repo._bookmarks
1475 for bm in marks:
1475 for bm in marks:
1476 newmarks[bm] = node
1476 newmarks[bm] = node
1477 if bm == current:
1477 if bm == current:
1478 bookmarks.setcurrent(repo, bm)
1478 bookmarks.setcurrent(repo, bm)
1479 newmarks.write()
1479 newmarks.write()
1480 else:
1480 else:
1481 def commitfunc(ui, repo, message, match, opts):
1481 def commitfunc(ui, repo, message, match, opts):
1482 backup = ui.backupconfig('phases', 'new-commit')
1482 backup = ui.backupconfig('phases', 'new-commit')
1483 baseui = repo.baseui
1483 baseui = repo.baseui
1484 basebackup = baseui.backupconfig('phases', 'new-commit')
1484 basebackup = baseui.backupconfig('phases', 'new-commit')
1485 try:
1485 try:
1486 if opts.get('secret'):
1486 if opts.get('secret'):
1487 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1487 ui.setconfig('phases', 'new-commit', 'secret', 'commit')
1488 # Propagate to subrepos
1488 # Propagate to subrepos
1489 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1489 baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
1490
1490
1491 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1491 editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
1492 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1492 editor = cmdutil.getcommiteditor(editform=editform, **opts)
1493 return repo.commit(message, opts.get('user'), opts.get('date'),
1493 return repo.commit(message, opts.get('user'), opts.get('date'),
1494 match,
1494 match,
1495 editor=editor,
1495 editor=editor,
1496 extra=extra)
1496 extra=extra)
1497 finally:
1497 finally:
1498 ui.restoreconfig(backup)
1498 ui.restoreconfig(backup)
1499 repo.baseui.restoreconfig(basebackup)
1499 repo.baseui.restoreconfig(basebackup)
1500
1500
1501
1501
1502 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1502 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1503
1503
1504 if not node:
1504 if not node:
1505 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1505 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1506 if stat[3]:
1506 if stat[3]:
1507 ui.status(_("nothing changed (%d missing files, see "
1507 ui.status(_("nothing changed (%d missing files, see "
1508 "'hg status')\n") % len(stat[3]))
1508 "'hg status')\n") % len(stat[3]))
1509 else:
1509 else:
1510 ui.status(_("nothing changed\n"))
1510 ui.status(_("nothing changed\n"))
1511 return 1
1511 return 1
1512
1512
1513 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1513 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1514
1514
1515 @command('config|showconfig|debugconfig',
1515 @command('config|showconfig|debugconfig',
1516 [('u', 'untrusted', None, _('show untrusted configuration options')),
1516 [('u', 'untrusted', None, _('show untrusted configuration options')),
1517 ('e', 'edit', None, _('edit user config')),
1517 ('e', 'edit', None, _('edit user config')),
1518 ('l', 'local', None, _('edit repository config')),
1518 ('l', 'local', None, _('edit repository config')),
1519 ('g', 'global', None, _('edit global config'))],
1519 ('g', 'global', None, _('edit global config'))],
1520 _('[-u] [NAME]...'),
1520 _('[-u] [NAME]...'),
1521 optionalrepo=True)
1521 optionalrepo=True)
1522 def config(ui, repo, *values, **opts):
1522 def config(ui, repo, *values, **opts):
1523 """show combined config settings from all hgrc files
1523 """show combined config settings from all hgrc files
1524
1524
1525 With no arguments, print names and values of all config items.
1525 With no arguments, print names and values of all config items.
1526
1526
1527 With one argument of the form section.name, print just the value
1527 With one argument of the form section.name, print just the value
1528 of that config item.
1528 of that config item.
1529
1529
1530 With multiple arguments, print names and values of all config
1530 With multiple arguments, print names and values of all config
1531 items with matching section names.
1531 items with matching section names.
1532
1532
1533 With --edit, start an editor on the user-level config file. With
1533 With --edit, start an editor on the user-level config file. With
1534 --global, edit the system-wide config file. With --local, edit the
1534 --global, edit the system-wide config file. With --local, edit the
1535 repository-level config file.
1535 repository-level config file.
1536
1536
1537 With --debug, the source (filename and line number) is printed
1537 With --debug, the source (filename and line number) is printed
1538 for each config item.
1538 for each config item.
1539
1539
1540 See :hg:`help config` for more information about config files.
1540 See :hg:`help config` for more information about config files.
1541
1541
1542 Returns 0 on success, 1 if NAME does not exist.
1542 Returns 0 on success, 1 if NAME does not exist.
1543
1543
1544 """
1544 """
1545
1545
1546 if opts.get('edit') or opts.get('local') or opts.get('global'):
1546 if opts.get('edit') or opts.get('local') or opts.get('global'):
1547 if opts.get('local') and opts.get('global'):
1547 if opts.get('local') and opts.get('global'):
1548 raise util.Abort(_("can't use --local and --global together"))
1548 raise util.Abort(_("can't use --local and --global together"))
1549
1549
1550 if opts.get('local'):
1550 if opts.get('local'):
1551 if not repo:
1551 if not repo:
1552 raise util.Abort(_("can't use --local outside a repository"))
1552 raise util.Abort(_("can't use --local outside a repository"))
1553 paths = [repo.join('hgrc')]
1553 paths = [repo.join('hgrc')]
1554 elif opts.get('global'):
1554 elif opts.get('global'):
1555 paths = scmutil.systemrcpath()
1555 paths = scmutil.systemrcpath()
1556 else:
1556 else:
1557 paths = scmutil.userrcpath()
1557 paths = scmutil.userrcpath()
1558
1558
1559 for f in paths:
1559 for f in paths:
1560 if os.path.exists(f):
1560 if os.path.exists(f):
1561 break
1561 break
1562 else:
1562 else:
1563 if opts.get('global'):
1563 if opts.get('global'):
1564 samplehgrc = uimod.samplehgrcs['global']
1564 samplehgrc = uimod.samplehgrcs['global']
1565 elif opts.get('local'):
1565 elif opts.get('local'):
1566 samplehgrc = uimod.samplehgrcs['local']
1566 samplehgrc = uimod.samplehgrcs['local']
1567 else:
1567 else:
1568 samplehgrc = uimod.samplehgrcs['user']
1568 samplehgrc = uimod.samplehgrcs['user']
1569
1569
1570 f = paths[0]
1570 f = paths[0]
1571 fp = open(f, "w")
1571 fp = open(f, "w")
1572 fp.write(samplehgrc)
1572 fp.write(samplehgrc)
1573 fp.close()
1573 fp.close()
1574
1574
1575 editor = ui.geteditor()
1575 editor = ui.geteditor()
1576 util.system("%s \"%s\"" % (editor, f),
1576 util.system("%s \"%s\"" % (editor, f),
1577 onerr=util.Abort, errprefix=_("edit failed"),
1577 onerr=util.Abort, errprefix=_("edit failed"),
1578 out=ui.fout)
1578 out=ui.fout)
1579 return
1579 return
1580
1580
1581 for f in scmutil.rcpath():
1581 for f in scmutil.rcpath():
1582 ui.debug('read config from: %s\n' % f)
1582 ui.debug('read config from: %s\n' % f)
1583 untrusted = bool(opts.get('untrusted'))
1583 untrusted = bool(opts.get('untrusted'))
1584 if values:
1584 if values:
1585 sections = [v for v in values if '.' not in v]
1585 sections = [v for v in values if '.' not in v]
1586 items = [v for v in values if '.' in v]
1586 items = [v for v in values if '.' in v]
1587 if len(items) > 1 or items and sections:
1587 if len(items) > 1 or items and sections:
1588 raise util.Abort(_('only one config item permitted'))
1588 raise util.Abort(_('only one config item permitted'))
1589 matched = False
1589 matched = False
1590 for section, name, value in ui.walkconfig(untrusted=untrusted):
1590 for section, name, value in ui.walkconfig(untrusted=untrusted):
1591 value = str(value).replace('\n', '\\n')
1591 value = str(value).replace('\n', '\\n')
1592 sectname = section + '.' + name
1592 sectname = section + '.' + name
1593 if values:
1593 if values:
1594 for v in values:
1594 for v in values:
1595 if v == section:
1595 if v == section:
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 elif v == sectname:
1600 elif v == sectname:
1601 ui.debug('%s: ' %
1601 ui.debug('%s: ' %
1602 ui.configsource(section, name, untrusted))
1602 ui.configsource(section, name, untrusted))
1603 ui.write(value, '\n')
1603 ui.write(value, '\n')
1604 matched = True
1604 matched = True
1605 else:
1605 else:
1606 ui.debug('%s: ' %
1606 ui.debug('%s: ' %
1607 ui.configsource(section, name, untrusted))
1607 ui.configsource(section, name, untrusted))
1608 ui.write('%s=%s\n' % (sectname, value))
1608 ui.write('%s=%s\n' % (sectname, value))
1609 matched = True
1609 matched = True
1610 if matched:
1610 if matched:
1611 return 0
1611 return 0
1612 return 1
1612 return 1
1613
1613
1614 @command('copy|cp',
1614 @command('copy|cp',
1615 [('A', 'after', None, _('record a copy that has already occurred')),
1615 [('A', 'after', None, _('record a copy that has already occurred')),
1616 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1616 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1617 ] + walkopts + dryrunopts,
1617 ] + walkopts + dryrunopts,
1618 _('[OPTION]... [SOURCE]... DEST'))
1618 _('[OPTION]... [SOURCE]... DEST'))
1619 def copy(ui, repo, *pats, **opts):
1619 def copy(ui, repo, *pats, **opts):
1620 """mark files as copied for the next commit
1620 """mark files as copied for the next commit
1621
1621
1622 Mark dest as having copies of source files. If dest is a
1622 Mark dest as having copies of source files. If dest is a
1623 directory, copies are put in that directory. If dest is a file,
1623 directory, copies are put in that directory. If dest is a file,
1624 the source must be a single file.
1624 the source must be a single file.
1625
1625
1626 By default, this command copies the contents of files as they
1626 By default, this command copies the contents of files as they
1627 exist in the working directory. If invoked with -A/--after, the
1627 exist in the working directory. If invoked with -A/--after, the
1628 operation is recorded, but no copying is performed.
1628 operation is recorded, but no copying is performed.
1629
1629
1630 This command takes effect with the next commit. To undo a copy
1630 This command takes effect with the next commit. To undo a copy
1631 before that, see :hg:`revert`.
1631 before that, see :hg:`revert`.
1632
1632
1633 Returns 0 on success, 1 if errors are encountered.
1633 Returns 0 on success, 1 if errors are encountered.
1634 """
1634 """
1635 wlock = repo.wlock(False)
1635 wlock = repo.wlock(False)
1636 try:
1636 try:
1637 return cmdutil.copy(ui, repo, pats, opts)
1637 return cmdutil.copy(ui, repo, pats, opts)
1638 finally:
1638 finally:
1639 wlock.release()
1639 wlock.release()
1640
1640
1641 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
1641 @command('debugancestor', [], _('[INDEX] REV1 REV2'), optionalrepo=True)
1642 def debugancestor(ui, repo, *args):
1642 def debugancestor(ui, repo, *args):
1643 """find the ancestor revision of two revisions in a given index"""
1643 """find the ancestor revision of two revisions in a given index"""
1644 if len(args) == 3:
1644 if len(args) == 3:
1645 index, rev1, rev2 = args
1645 index, rev1, rev2 = args
1646 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1646 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1647 lookup = r.lookup
1647 lookup = r.lookup
1648 elif len(args) == 2:
1648 elif len(args) == 2:
1649 if not repo:
1649 if not repo:
1650 raise util.Abort(_("there is no Mercurial repository here "
1650 raise util.Abort(_("there is no Mercurial repository here "
1651 "(.hg not found)"))
1651 "(.hg not found)"))
1652 rev1, rev2 = args
1652 rev1, rev2 = args
1653 r = repo.changelog
1653 r = repo.changelog
1654 lookup = repo.lookup
1654 lookup = repo.lookup
1655 else:
1655 else:
1656 raise util.Abort(_('either two or three arguments required'))
1656 raise util.Abort(_('either two or three arguments required'))
1657 a = r.ancestor(lookup(rev1), lookup(rev2))
1657 a = r.ancestor(lookup(rev1), lookup(rev2))
1658 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1658 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1659
1659
1660 @command('debugbuilddag',
1660 @command('debugbuilddag',
1661 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1661 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1662 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1662 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1663 ('n', 'new-file', None, _('add new file at each rev'))],
1663 ('n', 'new-file', None, _('add new file at each rev'))],
1664 _('[OPTION]... [TEXT]'))
1664 _('[OPTION]... [TEXT]'))
1665 def debugbuilddag(ui, repo, text=None,
1665 def debugbuilddag(ui, repo, text=None,
1666 mergeable_file=False,
1666 mergeable_file=False,
1667 overwritten_file=False,
1667 overwritten_file=False,
1668 new_file=False):
1668 new_file=False):
1669 """builds a repo with a given DAG from scratch in the current empty repo
1669 """builds a repo with a given DAG from scratch in the current empty repo
1670
1670
1671 The description of the DAG is read from stdin if not given on the
1671 The description of the DAG is read from stdin if not given on the
1672 command line.
1672 command line.
1673
1673
1674 Elements:
1674 Elements:
1675
1675
1676 - "+n" is a linear run of n nodes based on the current default parent
1676 - "+n" is a linear run of n nodes based on the current default parent
1677 - "." is a single node based on the current default parent
1677 - "." is a single node based on the current default parent
1678 - "$" resets the default parent to null (implied at the start);
1678 - "$" resets the default parent to null (implied at the start);
1679 otherwise the default parent is always the last node created
1679 otherwise the default parent is always the last node created
1680 - "<p" sets the default parent to the backref p
1680 - "<p" sets the default parent to the backref p
1681 - "*p" is a fork at parent p, which is a backref
1681 - "*p" is a fork at parent p, which is a backref
1682 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1682 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1683 - "/p2" is a merge of the preceding node and p2
1683 - "/p2" is a merge of the preceding node and p2
1684 - ":tag" defines a local tag for the preceding node
1684 - ":tag" defines a local tag for the preceding node
1685 - "@branch" sets the named branch for subsequent nodes
1685 - "@branch" sets the named branch for subsequent nodes
1686 - "#...\\n" is a comment up to the end of the line
1686 - "#...\\n" is a comment up to the end of the line
1687
1687
1688 Whitespace between the above elements is ignored.
1688 Whitespace between the above elements is ignored.
1689
1689
1690 A backref is either
1690 A backref is either
1691
1691
1692 - a number n, which references the node curr-n, where curr is the current
1692 - a number n, which references the node curr-n, where curr is the current
1693 node, or
1693 node, or
1694 - the name of a local tag you placed earlier using ":tag", or
1694 - the name of a local tag you placed earlier using ":tag", or
1695 - empty to denote the default parent.
1695 - empty to denote the default parent.
1696
1696
1697 All string valued-elements are either strictly alphanumeric, or must
1697 All string valued-elements are either strictly alphanumeric, or must
1698 be enclosed in double quotes ("..."), with "\\" as escape character.
1698 be enclosed in double quotes ("..."), with "\\" as escape character.
1699 """
1699 """
1700
1700
1701 if text is None:
1701 if text is None:
1702 ui.status(_("reading DAG from stdin\n"))
1702 ui.status(_("reading DAG from stdin\n"))
1703 text = ui.fin.read()
1703 text = ui.fin.read()
1704
1704
1705 cl = repo.changelog
1705 cl = repo.changelog
1706 if len(cl) > 0:
1706 if len(cl) > 0:
1707 raise util.Abort(_('repository is not empty'))
1707 raise util.Abort(_('repository is not empty'))
1708
1708
1709 # determine number of revs in DAG
1709 # determine number of revs in DAG
1710 total = 0
1710 total = 0
1711 for type, data in dagparser.parsedag(text):
1711 for type, data in dagparser.parsedag(text):
1712 if type == 'n':
1712 if type == 'n':
1713 total += 1
1713 total += 1
1714
1714
1715 if mergeable_file:
1715 if mergeable_file:
1716 linesperrev = 2
1716 linesperrev = 2
1717 # make a file with k lines per rev
1717 # make a file with k lines per rev
1718 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1718 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1719 initialmergedlines.append("")
1719 initialmergedlines.append("")
1720
1720
1721 tags = []
1721 tags = []
1722
1722
1723 lock = tr = None
1723 lock = tr = None
1724 try:
1724 try:
1725 lock = repo.lock()
1725 lock = repo.lock()
1726 tr = repo.transaction("builddag")
1726 tr = repo.transaction("builddag")
1727
1727
1728 at = -1
1728 at = -1
1729 atbranch = 'default'
1729 atbranch = 'default'
1730 nodeids = []
1730 nodeids = []
1731 id = 0
1731 id = 0
1732 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1732 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1733 for type, data in dagparser.parsedag(text):
1733 for type, data in dagparser.parsedag(text):
1734 if type == 'n':
1734 if type == 'n':
1735 ui.note(('node %s\n' % str(data)))
1735 ui.note(('node %s\n' % str(data)))
1736 id, ps = data
1736 id, ps = data
1737
1737
1738 files = []
1738 files = []
1739 fctxs = {}
1739 fctxs = {}
1740
1740
1741 p2 = None
1741 p2 = None
1742 if mergeable_file:
1742 if mergeable_file:
1743 fn = "mf"
1743 fn = "mf"
1744 p1 = repo[ps[0]]
1744 p1 = repo[ps[0]]
1745 if len(ps) > 1:
1745 if len(ps) > 1:
1746 p2 = repo[ps[1]]
1746 p2 = repo[ps[1]]
1747 pa = p1.ancestor(p2)
1747 pa = p1.ancestor(p2)
1748 base, local, other = [x[fn].data() for x in (pa, p1,
1748 base, local, other = [x[fn].data() for x in (pa, p1,
1749 p2)]
1749 p2)]
1750 m3 = simplemerge.Merge3Text(base, local, other)
1750 m3 = simplemerge.Merge3Text(base, local, other)
1751 ml = [l.strip() for l in m3.merge_lines()]
1751 ml = [l.strip() for l in m3.merge_lines()]
1752 ml.append("")
1752 ml.append("")
1753 elif at > 0:
1753 elif at > 0:
1754 ml = p1[fn].data().split("\n")
1754 ml = p1[fn].data().split("\n")
1755 else:
1755 else:
1756 ml = initialmergedlines
1756 ml = initialmergedlines
1757 ml[id * linesperrev] += " r%i" % id
1757 ml[id * linesperrev] += " r%i" % id
1758 mergedtext = "\n".join(ml)
1758 mergedtext = "\n".join(ml)
1759 files.append(fn)
1759 files.append(fn)
1760 fctxs[fn] = context.memfilectx(repo, fn, mergedtext)
1760 fctxs[fn] = context.memfilectx(repo, fn, mergedtext)
1761
1761
1762 if overwritten_file:
1762 if overwritten_file:
1763 fn = "of"
1763 fn = "of"
1764 files.append(fn)
1764 files.append(fn)
1765 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1765 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1766
1766
1767 if new_file:
1767 if new_file:
1768 fn = "nf%i" % id
1768 fn = "nf%i" % id
1769 files.append(fn)
1769 files.append(fn)
1770 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1770 fctxs[fn] = context.memfilectx(repo, fn, "r%i\n" % id)
1771 if len(ps) > 1:
1771 if len(ps) > 1:
1772 if not p2:
1772 if not p2:
1773 p2 = repo[ps[1]]
1773 p2 = repo[ps[1]]
1774 for fn in p2:
1774 for fn in p2:
1775 if fn.startswith("nf"):
1775 if fn.startswith("nf"):
1776 files.append(fn)
1776 files.append(fn)
1777 fctxs[fn] = p2[fn]
1777 fctxs[fn] = p2[fn]
1778
1778
1779 def fctxfn(repo, cx, path):
1779 def fctxfn(repo, cx, path):
1780 return fctxs.get(path)
1780 return fctxs.get(path)
1781
1781
1782 if len(ps) == 0 or ps[0] < 0:
1782 if len(ps) == 0 or ps[0] < 0:
1783 pars = [None, None]
1783 pars = [None, None]
1784 elif len(ps) == 1:
1784 elif len(ps) == 1:
1785 pars = [nodeids[ps[0]], None]
1785 pars = [nodeids[ps[0]], None]
1786 else:
1786 else:
1787 pars = [nodeids[p] for p in ps]
1787 pars = [nodeids[p] for p in ps]
1788 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1788 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1789 date=(id, 0),
1789 date=(id, 0),
1790 user="debugbuilddag",
1790 user="debugbuilddag",
1791 extra={'branch': atbranch})
1791 extra={'branch': atbranch})
1792 nodeid = repo.commitctx(cx)
1792 nodeid = repo.commitctx(cx)
1793 nodeids.append(nodeid)
1793 nodeids.append(nodeid)
1794 at = id
1794 at = id
1795 elif type == 'l':
1795 elif type == 'l':
1796 id, name = data
1796 id, name = data
1797 ui.note(('tag %s\n' % name))
1797 ui.note(('tag %s\n' % name))
1798 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
1798 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
1799 elif type == 'a':
1799 elif type == 'a':
1800 ui.note(('branch %s\n' % data))
1800 ui.note(('branch %s\n' % data))
1801 atbranch = data
1801 atbranch = data
1802 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1802 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1803 tr.close()
1803 tr.close()
1804
1804
1805 if tags:
1805 if tags:
1806 repo.opener.write("localtags", "".join(tags))
1806 repo.opener.write("localtags", "".join(tags))
1807 finally:
1807 finally:
1808 ui.progress(_('building'), None)
1808 ui.progress(_('building'), None)
1809 release(tr, lock)
1809 release(tr, lock)
1810
1810
1811 @command('debugbundle',
1811 @command('debugbundle',
1812 [('a', 'all', None, _('show all details'))],
1812 [('a', 'all', None, _('show all details'))],
1813 _('FILE'),
1813 _('FILE'),
1814 norepo=True)
1814 norepo=True)
1815 def debugbundle(ui, bundlepath, all=None, **opts):
1815 def debugbundle(ui, bundlepath, all=None, **opts):
1816 """lists the contents of a bundle"""
1816 """lists the contents of a bundle"""
1817 f = hg.openpath(ui, bundlepath)
1817 f = hg.openpath(ui, bundlepath)
1818 try:
1818 try:
1819 gen = exchange.readbundle(ui, f, bundlepath)
1819 gen = exchange.readbundle(ui, f, bundlepath)
1820 if all:
1820 if all:
1821 ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n"))
1821 ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n"))
1822
1822
1823 def showchunks(named):
1823 def showchunks(named):
1824 ui.write("\n%s\n" % named)
1824 ui.write("\n%s\n" % named)
1825 chain = None
1825 chain = None
1826 while True:
1826 while True:
1827 chunkdata = gen.deltachunk(chain)
1827 chunkdata = gen.deltachunk(chain)
1828 if not chunkdata:
1828 if not chunkdata:
1829 break
1829 break
1830 node = chunkdata['node']
1830 node = chunkdata['node']
1831 p1 = chunkdata['p1']
1831 p1 = chunkdata['p1']
1832 p2 = chunkdata['p2']
1832 p2 = chunkdata['p2']
1833 cs = chunkdata['cs']
1833 cs = chunkdata['cs']
1834 deltabase = chunkdata['deltabase']
1834 deltabase = chunkdata['deltabase']
1835 delta = chunkdata['delta']
1835 delta = chunkdata['delta']
1836 ui.write("%s %s %s %s %s %s\n" %
1836 ui.write("%s %s %s %s %s %s\n" %
1837 (hex(node), hex(p1), hex(p2),
1837 (hex(node), hex(p1), hex(p2),
1838 hex(cs), hex(deltabase), len(delta)))
1838 hex(cs), hex(deltabase), len(delta)))
1839 chain = node
1839 chain = node
1840
1840
1841 chunkdata = gen.changelogheader()
1841 chunkdata = gen.changelogheader()
1842 showchunks("changelog")
1842 showchunks("changelog")
1843 chunkdata = gen.manifestheader()
1843 chunkdata = gen.manifestheader()
1844 showchunks("manifest")
1844 showchunks("manifest")
1845 while True:
1845 while True:
1846 chunkdata = gen.filelogheader()
1846 chunkdata = gen.filelogheader()
1847 if not chunkdata:
1847 if not chunkdata:
1848 break
1848 break
1849 fname = chunkdata['filename']
1849 fname = chunkdata['filename']
1850 showchunks(fname)
1850 showchunks(fname)
1851 else:
1851 else:
1852 chunkdata = gen.changelogheader()
1852 chunkdata = gen.changelogheader()
1853 chain = None
1853 chain = None
1854 while True:
1854 while True:
1855 chunkdata = gen.deltachunk(chain)
1855 chunkdata = gen.deltachunk(chain)
1856 if not chunkdata:
1856 if not chunkdata:
1857 break
1857 break
1858 node = chunkdata['node']
1858 node = chunkdata['node']
1859 ui.write("%s\n" % hex(node))
1859 ui.write("%s\n" % hex(node))
1860 chain = node
1860 chain = node
1861 finally:
1861 finally:
1862 f.close()
1862 f.close()
1863
1863
1864 @command('debugcheckstate', [], '')
1864 @command('debugcheckstate', [], '')
1865 def debugcheckstate(ui, repo):
1865 def debugcheckstate(ui, repo):
1866 """validate the correctness of the current dirstate"""
1866 """validate the correctness of the current dirstate"""
1867 parent1, parent2 = repo.dirstate.parents()
1867 parent1, parent2 = repo.dirstate.parents()
1868 m1 = repo[parent1].manifest()
1868 m1 = repo[parent1].manifest()
1869 m2 = repo[parent2].manifest()
1869 m2 = repo[parent2].manifest()
1870 errors = 0
1870 errors = 0
1871 for f in repo.dirstate:
1871 for f in repo.dirstate:
1872 state = repo.dirstate[f]
1872 state = repo.dirstate[f]
1873 if state in "nr" and f not in m1:
1873 if state in "nr" and f not in m1:
1874 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1874 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1875 errors += 1
1875 errors += 1
1876 if state in "a" and f in m1:
1876 if state in "a" and f in m1:
1877 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1877 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1878 errors += 1
1878 errors += 1
1879 if state in "m" and f not in m1 and f not in m2:
1879 if state in "m" and f not in m1 and f not in m2:
1880 ui.warn(_("%s in state %s, but not in either manifest\n") %
1880 ui.warn(_("%s in state %s, but not in either manifest\n") %
1881 (f, state))
1881 (f, state))
1882 errors += 1
1882 errors += 1
1883 for f in m1:
1883 for f in m1:
1884 state = repo.dirstate[f]
1884 state = repo.dirstate[f]
1885 if state not in "nrm":
1885 if state not in "nrm":
1886 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1886 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1887 errors += 1
1887 errors += 1
1888 if errors:
1888 if errors:
1889 error = _(".hg/dirstate inconsistent with current parent's manifest")
1889 error = _(".hg/dirstate inconsistent with current parent's manifest")
1890 raise util.Abort(error)
1890 raise util.Abort(error)
1891
1891
1892 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
1892 @command('debugcommands', [], _('[COMMAND]'), norepo=True)
1893 def debugcommands(ui, cmd='', *args):
1893 def debugcommands(ui, cmd='', *args):
1894 """list all available commands and options"""
1894 """list all available commands and options"""
1895 for cmd, vals in sorted(table.iteritems()):
1895 for cmd, vals in sorted(table.iteritems()):
1896 cmd = cmd.split('|')[0].strip('^')
1896 cmd = cmd.split('|')[0].strip('^')
1897 opts = ', '.join([i[1] for i in vals[1]])
1897 opts = ', '.join([i[1] for i in vals[1]])
1898 ui.write('%s: %s\n' % (cmd, opts))
1898 ui.write('%s: %s\n' % (cmd, opts))
1899
1899
1900 @command('debugcomplete',
1900 @command('debugcomplete',
1901 [('o', 'options', None, _('show the command options'))],
1901 [('o', 'options', None, _('show the command options'))],
1902 _('[-o] CMD'),
1902 _('[-o] CMD'),
1903 norepo=True)
1903 norepo=True)
1904 def debugcomplete(ui, cmd='', **opts):
1904 def debugcomplete(ui, cmd='', **opts):
1905 """returns the completion list associated with the given command"""
1905 """returns the completion list associated with the given command"""
1906
1906
1907 if opts.get('options'):
1907 if opts.get('options'):
1908 options = []
1908 options = []
1909 otables = [globalopts]
1909 otables = [globalopts]
1910 if cmd:
1910 if cmd:
1911 aliases, entry = cmdutil.findcmd(cmd, table, False)
1911 aliases, entry = cmdutil.findcmd(cmd, table, False)
1912 otables.append(entry[1])
1912 otables.append(entry[1])
1913 for t in otables:
1913 for t in otables:
1914 for o in t:
1914 for o in t:
1915 if "(DEPRECATED)" in o[3]:
1915 if "(DEPRECATED)" in o[3]:
1916 continue
1916 continue
1917 if o[0]:
1917 if o[0]:
1918 options.append('-%s' % o[0])
1918 options.append('-%s' % o[0])
1919 options.append('--%s' % o[1])
1919 options.append('--%s' % o[1])
1920 ui.write("%s\n" % "\n".join(options))
1920 ui.write("%s\n" % "\n".join(options))
1921 return
1921 return
1922
1922
1923 cmdlist = cmdutil.findpossible(cmd, table)
1923 cmdlist = cmdutil.findpossible(cmd, table)
1924 if ui.verbose:
1924 if ui.verbose:
1925 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1925 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1926 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1926 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1927
1927
1928 @command('debugdag',
1928 @command('debugdag',
1929 [('t', 'tags', None, _('use tags as labels')),
1929 [('t', 'tags', None, _('use tags as labels')),
1930 ('b', 'branches', None, _('annotate with branch names')),
1930 ('b', 'branches', None, _('annotate with branch names')),
1931 ('', 'dots', None, _('use dots for runs')),
1931 ('', 'dots', None, _('use dots for runs')),
1932 ('s', 'spaces', None, _('separate elements by spaces'))],
1932 ('s', 'spaces', None, _('separate elements by spaces'))],
1933 _('[OPTION]... [FILE [REV]...]'),
1933 _('[OPTION]... [FILE [REV]...]'),
1934 optionalrepo=True)
1934 optionalrepo=True)
1935 def debugdag(ui, repo, file_=None, *revs, **opts):
1935 def debugdag(ui, repo, file_=None, *revs, **opts):
1936 """format the changelog or an index DAG as a concise textual description
1936 """format the changelog or an index DAG as a concise textual description
1937
1937
1938 If you pass a revlog index, the revlog's DAG is emitted. If you list
1938 If you pass a revlog index, the revlog's DAG is emitted. If you list
1939 revision numbers, they get labeled in the output as rN.
1939 revision numbers, they get labeled in the output as rN.
1940
1940
1941 Otherwise, the changelog DAG of the current repo is emitted.
1941 Otherwise, the changelog DAG of the current repo is emitted.
1942 """
1942 """
1943 spaces = opts.get('spaces')
1943 spaces = opts.get('spaces')
1944 dots = opts.get('dots')
1944 dots = opts.get('dots')
1945 if file_:
1945 if file_:
1946 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1946 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1947 revs = set((int(r) for r in revs))
1947 revs = set((int(r) for r in revs))
1948 def events():
1948 def events():
1949 for r in rlog:
1949 for r in rlog:
1950 yield 'n', (r, list(p for p in rlog.parentrevs(r)
1950 yield 'n', (r, list(p for p in rlog.parentrevs(r)
1951 if p != -1))
1951 if p != -1))
1952 if r in revs:
1952 if r in revs:
1953 yield 'l', (r, "r%i" % r)
1953 yield 'l', (r, "r%i" % r)
1954 elif repo:
1954 elif repo:
1955 cl = repo.changelog
1955 cl = repo.changelog
1956 tags = opts.get('tags')
1956 tags = opts.get('tags')
1957 branches = opts.get('branches')
1957 branches = opts.get('branches')
1958 if tags:
1958 if tags:
1959 labels = {}
1959 labels = {}
1960 for l, n in repo.tags().items():
1960 for l, n in repo.tags().items():
1961 labels.setdefault(cl.rev(n), []).append(l)
1961 labels.setdefault(cl.rev(n), []).append(l)
1962 def events():
1962 def events():
1963 b = "default"
1963 b = "default"
1964 for r in cl:
1964 for r in cl:
1965 if branches:
1965 if branches:
1966 newb = cl.read(cl.node(r))[5]['branch']
1966 newb = cl.read(cl.node(r))[5]['branch']
1967 if newb != b:
1967 if newb != b:
1968 yield 'a', newb
1968 yield 'a', newb
1969 b = newb
1969 b = newb
1970 yield 'n', (r, list(p for p in cl.parentrevs(r)
1970 yield 'n', (r, list(p for p in cl.parentrevs(r)
1971 if p != -1))
1971 if p != -1))
1972 if tags:
1972 if tags:
1973 ls = labels.get(r)
1973 ls = labels.get(r)
1974 if ls:
1974 if ls:
1975 for l in ls:
1975 for l in ls:
1976 yield 'l', (r, l)
1976 yield 'l', (r, l)
1977 else:
1977 else:
1978 raise util.Abort(_('need repo for changelog dag'))
1978 raise util.Abort(_('need repo for changelog dag'))
1979
1979
1980 for line in dagparser.dagtextlines(events(),
1980 for line in dagparser.dagtextlines(events(),
1981 addspaces=spaces,
1981 addspaces=spaces,
1982 wraplabels=True,
1982 wraplabels=True,
1983 wrapannotations=True,
1983 wrapannotations=True,
1984 wrapnonlinear=dots,
1984 wrapnonlinear=dots,
1985 usedots=dots,
1985 usedots=dots,
1986 maxlinewidth=70):
1986 maxlinewidth=70):
1987 ui.write(line)
1987 ui.write(line)
1988 ui.write("\n")
1988 ui.write("\n")
1989
1989
1990 @command('debugdata',
1990 @command('debugdata',
1991 [('c', 'changelog', False, _('open changelog')),
1991 [('c', 'changelog', False, _('open changelog')),
1992 ('m', 'manifest', False, _('open manifest'))],
1992 ('m', 'manifest', False, _('open manifest'))],
1993 _('-c|-m|FILE REV'))
1993 _('-c|-m|FILE REV'))
1994 def debugdata(ui, repo, file_, rev=None, **opts):
1994 def debugdata(ui, repo, file_, rev=None, **opts):
1995 """dump the contents of a data file revision"""
1995 """dump the contents of a data file revision"""
1996 if opts.get('changelog') or opts.get('manifest'):
1996 if opts.get('changelog') or opts.get('manifest'):
1997 file_, rev = None, file_
1997 file_, rev = None, file_
1998 elif rev is None:
1998 elif rev is None:
1999 raise error.CommandError('debugdata', _('invalid arguments'))
1999 raise error.CommandError('debugdata', _('invalid arguments'))
2000 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
2000 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
2001 try:
2001 try:
2002 ui.write(r.revision(r.lookup(rev)))
2002 ui.write(r.revision(r.lookup(rev)))
2003 except KeyError:
2003 except KeyError:
2004 raise util.Abort(_('invalid revision identifier %s') % rev)
2004 raise util.Abort(_('invalid revision identifier %s') % rev)
2005
2005
2006 @command('debugdate',
2006 @command('debugdate',
2007 [('e', 'extended', None, _('try extended date formats'))],
2007 [('e', 'extended', None, _('try extended date formats'))],
2008 _('[-e] DATE [RANGE]'),
2008 _('[-e] DATE [RANGE]'),
2009 norepo=True, optionalrepo=True)
2009 norepo=True, optionalrepo=True)
2010 def debugdate(ui, date, range=None, **opts):
2010 def debugdate(ui, date, range=None, **opts):
2011 """parse and display a date"""
2011 """parse and display a date"""
2012 if opts["extended"]:
2012 if opts["extended"]:
2013 d = util.parsedate(date, util.extendeddateformats)
2013 d = util.parsedate(date, util.extendeddateformats)
2014 else:
2014 else:
2015 d = util.parsedate(date)
2015 d = util.parsedate(date)
2016 ui.write(("internal: %s %s\n") % d)
2016 ui.write(("internal: %s %s\n") % d)
2017 ui.write(("standard: %s\n") % util.datestr(d))
2017 ui.write(("standard: %s\n") % util.datestr(d))
2018 if range:
2018 if range:
2019 m = util.matchdate(range)
2019 m = util.matchdate(range)
2020 ui.write(("match: %s\n") % m(d[0]))
2020 ui.write(("match: %s\n") % m(d[0]))
2021
2021
2022 @command('debugdiscovery',
2022 @command('debugdiscovery',
2023 [('', 'old', None, _('use old-style discovery')),
2023 [('', 'old', None, _('use old-style discovery')),
2024 ('', 'nonheads', None,
2024 ('', 'nonheads', None,
2025 _('use old-style discovery with non-heads included')),
2025 _('use old-style discovery with non-heads included')),
2026 ] + remoteopts,
2026 ] + remoteopts,
2027 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
2027 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
2028 def debugdiscovery(ui, repo, remoteurl="default", **opts):
2028 def debugdiscovery(ui, repo, remoteurl="default", **opts):
2029 """runs the changeset discovery protocol in isolation"""
2029 """runs the changeset discovery protocol in isolation"""
2030 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
2030 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
2031 opts.get('branch'))
2031 opts.get('branch'))
2032 remote = hg.peer(repo, opts, remoteurl)
2032 remote = hg.peer(repo, opts, remoteurl)
2033 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
2033 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
2034
2034
2035 # make sure tests are repeatable
2035 # make sure tests are repeatable
2036 random.seed(12323)
2036 random.seed(12323)
2037
2037
2038 def doit(localheads, remoteheads, remote=remote):
2038 def doit(localheads, remoteheads, remote=remote):
2039 if opts.get('old'):
2039 if opts.get('old'):
2040 if localheads:
2040 if localheads:
2041 raise util.Abort('cannot use localheads with old style '
2041 raise util.Abort('cannot use localheads with old style '
2042 'discovery')
2042 'discovery')
2043 if not util.safehasattr(remote, 'branches'):
2043 if not util.safehasattr(remote, 'branches'):
2044 # enable in-client legacy support
2044 # enable in-client legacy support
2045 remote = localrepo.locallegacypeer(remote.local())
2045 remote = localrepo.locallegacypeer(remote.local())
2046 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
2046 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
2047 force=True)
2047 force=True)
2048 common = set(common)
2048 common = set(common)
2049 if not opts.get('nonheads'):
2049 if not opts.get('nonheads'):
2050 ui.write(("unpruned common: %s\n") %
2050 ui.write(("unpruned common: %s\n") %
2051 " ".join(sorted(short(n) for n in common)))
2051 " ".join(sorted(short(n) for n in common)))
2052 dag = dagutil.revlogdag(repo.changelog)
2052 dag = dagutil.revlogdag(repo.changelog)
2053 all = dag.ancestorset(dag.internalizeall(common))
2053 all = dag.ancestorset(dag.internalizeall(common))
2054 common = dag.externalizeall(dag.headsetofconnecteds(all))
2054 common = dag.externalizeall(dag.headsetofconnecteds(all))
2055 else:
2055 else:
2056 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
2056 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
2057 common = set(common)
2057 common = set(common)
2058 rheads = set(hds)
2058 rheads = set(hds)
2059 lheads = set(repo.heads())
2059 lheads = set(repo.heads())
2060 ui.write(("common heads: %s\n") %
2060 ui.write(("common heads: %s\n") %
2061 " ".join(sorted(short(n) for n in common)))
2061 " ".join(sorted(short(n) for n in common)))
2062 if lheads <= common:
2062 if lheads <= common:
2063 ui.write(("local is subset\n"))
2063 ui.write(("local is subset\n"))
2064 elif rheads <= common:
2064 elif rheads <= common:
2065 ui.write(("remote is subset\n"))
2065 ui.write(("remote is subset\n"))
2066
2066
2067 serverlogs = opts.get('serverlog')
2067 serverlogs = opts.get('serverlog')
2068 if serverlogs:
2068 if serverlogs:
2069 for filename in serverlogs:
2069 for filename in serverlogs:
2070 logfile = open(filename, 'r')
2070 logfile = open(filename, 'r')
2071 try:
2071 try:
2072 line = logfile.readline()
2072 line = logfile.readline()
2073 while line:
2073 while line:
2074 parts = line.strip().split(';')
2074 parts = line.strip().split(';')
2075 op = parts[1]
2075 op = parts[1]
2076 if op == 'cg':
2076 if op == 'cg':
2077 pass
2077 pass
2078 elif op == 'cgss':
2078 elif op == 'cgss':
2079 doit(parts[2].split(' '), parts[3].split(' '))
2079 doit(parts[2].split(' '), parts[3].split(' '))
2080 elif op == 'unb':
2080 elif op == 'unb':
2081 doit(parts[3].split(' '), parts[2].split(' '))
2081 doit(parts[3].split(' '), parts[2].split(' '))
2082 line = logfile.readline()
2082 line = logfile.readline()
2083 finally:
2083 finally:
2084 logfile.close()
2084 logfile.close()
2085
2085
2086 else:
2086 else:
2087 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
2087 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
2088 opts.get('remote_head'))
2088 opts.get('remote_head'))
2089 localrevs = opts.get('local_head')
2089 localrevs = opts.get('local_head')
2090 doit(localrevs, remoterevs)
2090 doit(localrevs, remoterevs)
2091
2091
2092 @command('debugfileset',
2092 @command('debugfileset',
2093 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2093 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
2094 _('[-r REV] FILESPEC'))
2094 _('[-r REV] FILESPEC'))
2095 def debugfileset(ui, repo, expr, **opts):
2095 def debugfileset(ui, repo, expr, **opts):
2096 '''parse and apply a fileset specification'''
2096 '''parse and apply a fileset specification'''
2097 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2097 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
2098 if ui.verbose:
2098 if ui.verbose:
2099 tree = fileset.parse(expr)[0]
2099 tree = fileset.parse(expr)[0]
2100 ui.note(tree, "\n")
2100 ui.note(tree, "\n")
2101
2101
2102 for f in ctx.getfileset(expr):
2102 for f in ctx.getfileset(expr):
2103 ui.write("%s\n" % f)
2103 ui.write("%s\n" % f)
2104
2104
2105 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2105 @command('debugfsinfo', [], _('[PATH]'), norepo=True)
2106 def debugfsinfo(ui, path="."):
2106 def debugfsinfo(ui, path="."):
2107 """show information detected about current filesystem"""
2107 """show information detected about current filesystem"""
2108 util.writefile('.debugfsinfo', '')
2108 util.writefile('.debugfsinfo', '')
2109 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
2109 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
2110 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
2110 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
2111 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
2111 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
2112 ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo')
2112 ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo')
2113 and 'yes' or 'no'))
2113 and 'yes' or 'no'))
2114 os.unlink('.debugfsinfo')
2114 os.unlink('.debugfsinfo')
2115
2115
2116 @command('debuggetbundle',
2116 @command('debuggetbundle',
2117 [('H', 'head', [], _('id of head node'), _('ID')),
2117 [('H', 'head', [], _('id of head node'), _('ID')),
2118 ('C', 'common', [], _('id of common node'), _('ID')),
2118 ('C', 'common', [], _('id of common node'), _('ID')),
2119 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2119 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
2120 _('REPO FILE [-H|-C ID]...'),
2120 _('REPO FILE [-H|-C ID]...'),
2121 norepo=True)
2121 norepo=True)
2122 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2122 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
2123 """retrieves a bundle from a repo
2123 """retrieves a bundle from a repo
2124
2124
2125 Every ID must be a full-length hex node id string. Saves the bundle to the
2125 Every ID must be a full-length hex node id string. Saves the bundle to the
2126 given file.
2126 given file.
2127 """
2127 """
2128 repo = hg.peer(ui, opts, repopath)
2128 repo = hg.peer(ui, opts, repopath)
2129 if not repo.capable('getbundle'):
2129 if not repo.capable('getbundle'):
2130 raise util.Abort("getbundle() not supported by target repository")
2130 raise util.Abort("getbundle() not supported by target repository")
2131 args = {}
2131 args = {}
2132 if common:
2132 if common:
2133 args['common'] = [bin(s) for s in common]
2133 args['common'] = [bin(s) for s in common]
2134 if head:
2134 if head:
2135 args['heads'] = [bin(s) for s in head]
2135 args['heads'] = [bin(s) for s in head]
2136 # TODO: get desired bundlecaps from command line.
2136 # TODO: get desired bundlecaps from command line.
2137 args['bundlecaps'] = None
2137 args['bundlecaps'] = None
2138 bundle = repo.getbundle('debug', **args)
2138 bundle = repo.getbundle('debug', **args)
2139
2139
2140 bundletype = opts.get('type', 'bzip2').lower()
2140 bundletype = opts.get('type', 'bzip2').lower()
2141 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
2141 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
2142 bundletype = btypes.get(bundletype)
2142 bundletype = btypes.get(bundletype)
2143 if bundletype not in changegroup.bundletypes:
2143 if bundletype not in changegroup.bundletypes:
2144 raise util.Abort(_('unknown bundle type specified with --type'))
2144 raise util.Abort(_('unknown bundle type specified with --type'))
2145 changegroup.writebundle(bundle, bundlepath, bundletype)
2145 changegroup.writebundle(bundle, bundlepath, bundletype)
2146
2146
2147 @command('debugignore', [], '')
2147 @command('debugignore', [], '')
2148 def debugignore(ui, repo, *values, **opts):
2148 def debugignore(ui, repo, *values, **opts):
2149 """display the combined ignore pattern"""
2149 """display the combined ignore pattern"""
2150 ignore = repo.dirstate._ignore
2150 ignore = repo.dirstate._ignore
2151 includepat = getattr(ignore, 'includepat', None)
2151 includepat = getattr(ignore, 'includepat', None)
2152 if includepat is not None:
2152 if includepat is not None:
2153 ui.write("%s\n" % includepat)
2153 ui.write("%s\n" % includepat)
2154 else:
2154 else:
2155 raise util.Abort(_("no ignore patterns found"))
2155 raise util.Abort(_("no ignore patterns found"))
2156
2156
2157 @command('debugindex',
2157 @command('debugindex',
2158 [('c', 'changelog', False, _('open changelog')),
2158 [('c', 'changelog', False, _('open changelog')),
2159 ('m', 'manifest', False, _('open manifest')),
2159 ('m', 'manifest', False, _('open manifest')),
2160 ('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2160 ('f', 'format', 0, _('revlog format'), _('FORMAT'))],
2161 _('[-f FORMAT] -c|-m|FILE'),
2161 _('[-f FORMAT] -c|-m|FILE'),
2162 optionalrepo=True)
2162 optionalrepo=True)
2163 def debugindex(ui, repo, file_=None, **opts):
2163 def debugindex(ui, repo, file_=None, **opts):
2164 """dump the contents of an index file"""
2164 """dump the contents of an index file"""
2165 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2165 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
2166 format = opts.get('format', 0)
2166 format = opts.get('format', 0)
2167 if format not in (0, 1):
2167 if format not in (0, 1):
2168 raise util.Abort(_("unknown format %d") % format)
2168 raise util.Abort(_("unknown format %d") % format)
2169
2169
2170 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2170 generaldelta = r.version & revlog.REVLOGGENERALDELTA
2171 if generaldelta:
2171 if generaldelta:
2172 basehdr = ' delta'
2172 basehdr = ' delta'
2173 else:
2173 else:
2174 basehdr = ' base'
2174 basehdr = ' base'
2175
2175
2176 if format == 0:
2176 if format == 0:
2177 ui.write(" rev offset length " + basehdr + " linkrev"
2177 ui.write(" rev offset length " + basehdr + " linkrev"
2178 " nodeid p1 p2\n")
2178 " nodeid p1 p2\n")
2179 elif format == 1:
2179 elif format == 1:
2180 ui.write(" rev flag offset length"
2180 ui.write(" rev flag offset length"
2181 " size " + basehdr + " link p1 p2"
2181 " size " + basehdr + " link p1 p2"
2182 " nodeid\n")
2182 " nodeid\n")
2183
2183
2184 for i in r:
2184 for i in r:
2185 node = r.node(i)
2185 node = r.node(i)
2186 if generaldelta:
2186 if generaldelta:
2187 base = r.deltaparent(i)
2187 base = r.deltaparent(i)
2188 else:
2188 else:
2189 base = r.chainbase(i)
2189 base = r.chainbase(i)
2190 if format == 0:
2190 if format == 0:
2191 try:
2191 try:
2192 pp = r.parents(node)
2192 pp = r.parents(node)
2193 except Exception:
2193 except Exception:
2194 pp = [nullid, nullid]
2194 pp = [nullid, nullid]
2195 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2195 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2196 i, r.start(i), r.length(i), base, r.linkrev(i),
2196 i, r.start(i), r.length(i), base, r.linkrev(i),
2197 short(node), short(pp[0]), short(pp[1])))
2197 short(node), short(pp[0]), short(pp[1])))
2198 elif format == 1:
2198 elif format == 1:
2199 pr = r.parentrevs(i)
2199 pr = r.parentrevs(i)
2200 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2200 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2201 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2201 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2202 base, r.linkrev(i), pr[0], pr[1], short(node)))
2202 base, r.linkrev(i), pr[0], pr[1], short(node)))
2203
2203
2204 @command('debugindexdot', [], _('FILE'), optionalrepo=True)
2204 @command('debugindexdot', [], _('FILE'), optionalrepo=True)
2205 def debugindexdot(ui, repo, file_):
2205 def debugindexdot(ui, repo, file_):
2206 """dump an index DAG as a graphviz dot file"""
2206 """dump an index DAG as a graphviz dot file"""
2207 r = None
2207 r = None
2208 if repo:
2208 if repo:
2209 filelog = repo.file(file_)
2209 filelog = repo.file(file_)
2210 if len(filelog):
2210 if len(filelog):
2211 r = filelog
2211 r = filelog
2212 if not r:
2212 if not r:
2213 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
2213 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
2214 ui.write(("digraph G {\n"))
2214 ui.write(("digraph G {\n"))
2215 for i in r:
2215 for i in r:
2216 node = r.node(i)
2216 node = r.node(i)
2217 pp = r.parents(node)
2217 pp = r.parents(node)
2218 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2218 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2219 if pp[1] != nullid:
2219 if pp[1] != nullid:
2220 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2220 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2221 ui.write("}\n")
2221 ui.write("}\n")
2222
2222
2223 @command('debuginstall', [], '', norepo=True)
2223 @command('debuginstall', [], '', norepo=True)
2224 def debuginstall(ui):
2224 def debuginstall(ui):
2225 '''test Mercurial installation
2225 '''test Mercurial installation
2226
2226
2227 Returns 0 on success.
2227 Returns 0 on success.
2228 '''
2228 '''
2229
2229
2230 def writetemp(contents):
2230 def writetemp(contents):
2231 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2231 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2232 f = os.fdopen(fd, "wb")
2232 f = os.fdopen(fd, "wb")
2233 f.write(contents)
2233 f.write(contents)
2234 f.close()
2234 f.close()
2235 return name
2235 return name
2236
2236
2237 problems = 0
2237 problems = 0
2238
2238
2239 # encoding
2239 # encoding
2240 ui.status(_("checking encoding (%s)...\n") % encoding.encoding)
2240 ui.status(_("checking encoding (%s)...\n") % encoding.encoding)
2241 try:
2241 try:
2242 encoding.fromlocal("test")
2242 encoding.fromlocal("test")
2243 except util.Abort, inst:
2243 except util.Abort, inst:
2244 ui.write(" %s\n" % inst)
2244 ui.write(" %s\n" % inst)
2245 ui.write(_(" (check that your locale is properly set)\n"))
2245 ui.write(_(" (check that your locale is properly set)\n"))
2246 problems += 1
2246 problems += 1
2247
2247
2248 # Python
2248 # Python
2249 ui.status(_("checking Python executable (%s)\n") % sys.executable)
2249 ui.status(_("checking Python executable (%s)\n") % sys.executable)
2250 ui.status(_("checking Python version (%s)\n")
2250 ui.status(_("checking Python version (%s)\n")
2251 % ("%s.%s.%s" % sys.version_info[:3]))
2251 % ("%s.%s.%s" % sys.version_info[:3]))
2252 ui.status(_("checking Python lib (%s)...\n")
2252 ui.status(_("checking Python lib (%s)...\n")
2253 % os.path.dirname(os.__file__))
2253 % os.path.dirname(os.__file__))
2254
2254
2255 # compiled modules
2255 # compiled modules
2256 ui.status(_("checking installed modules (%s)...\n")
2256 ui.status(_("checking installed modules (%s)...\n")
2257 % os.path.dirname(__file__))
2257 % os.path.dirname(__file__))
2258 try:
2258 try:
2259 import bdiff, mpatch, base85, osutil
2259 import bdiff, mpatch, base85, osutil
2260 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2260 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2261 except Exception, inst:
2261 except Exception, inst:
2262 ui.write(" %s\n" % inst)
2262 ui.write(" %s\n" % inst)
2263 ui.write(_(" One or more extensions could not be found"))
2263 ui.write(_(" One or more extensions could not be found"))
2264 ui.write(_(" (check that you compiled the extensions)\n"))
2264 ui.write(_(" (check that you compiled the extensions)\n"))
2265 problems += 1
2265 problems += 1
2266
2266
2267 # templates
2267 # templates
2268 import templater
2268 import templater
2269 p = templater.templatepaths()
2269 p = templater.templatepaths()
2270 ui.status(_("checking templates (%s)...\n") % ' '.join(p))
2270 ui.status(_("checking templates (%s)...\n") % ' '.join(p))
2271 if p:
2271 if p:
2272 m = templater.templatepath("map-cmdline.default")
2272 m = templater.templatepath("map-cmdline.default")
2273 if m:
2273 if m:
2274 # template found, check if it is working
2274 # template found, check if it is working
2275 try:
2275 try:
2276 templater.templater(m)
2276 templater.templater(m)
2277 except Exception, inst:
2277 except Exception, inst:
2278 ui.write(" %s\n" % inst)
2278 ui.write(" %s\n" % inst)
2279 p = None
2279 p = None
2280 else:
2280 else:
2281 ui.write(_(" template 'default' not found\n"))
2281 ui.write(_(" template 'default' not found\n"))
2282 p = None
2282 p = None
2283 else:
2283 else:
2284 ui.write(_(" no template directories found\n"))
2284 ui.write(_(" no template directories found\n"))
2285 if not p:
2285 if not p:
2286 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
2286 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
2287 problems += 1
2287 problems += 1
2288
2288
2289 # editor
2289 # editor
2290 ui.status(_("checking commit editor...\n"))
2290 ui.status(_("checking commit editor...\n"))
2291 editor = ui.geteditor()
2291 editor = ui.geteditor()
2292 cmdpath = util.findexe(shlex.split(editor)[0])
2292 cmdpath = util.findexe(shlex.split(editor)[0])
2293 if not cmdpath:
2293 if not cmdpath:
2294 if editor == 'vi':
2294 if editor == 'vi':
2295 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
2295 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
2296 ui.write(_(" (specify a commit editor in your configuration"
2296 ui.write(_(" (specify a commit editor in your configuration"
2297 " file)\n"))
2297 " file)\n"))
2298 else:
2298 else:
2299 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
2299 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
2300 ui.write(_(" (specify a commit editor in your configuration"
2300 ui.write(_(" (specify a commit editor in your configuration"
2301 " file)\n"))
2301 " file)\n"))
2302 problems += 1
2302 problems += 1
2303
2303
2304 # check username
2304 # check username
2305 ui.status(_("checking username...\n"))
2305 ui.status(_("checking username...\n"))
2306 try:
2306 try:
2307 ui.username()
2307 ui.username()
2308 except util.Abort, e:
2308 except util.Abort, e:
2309 ui.write(" %s\n" % e)
2309 ui.write(" %s\n" % e)
2310 ui.write(_(" (specify a username in your configuration file)\n"))
2310 ui.write(_(" (specify a username in your configuration file)\n"))
2311 problems += 1
2311 problems += 1
2312
2312
2313 if not problems:
2313 if not problems:
2314 ui.status(_("no problems detected\n"))
2314 ui.status(_("no problems detected\n"))
2315 else:
2315 else:
2316 ui.write(_("%s problems detected,"
2316 ui.write(_("%s problems detected,"
2317 " please check your install!\n") % problems)
2317 " please check your install!\n") % problems)
2318
2318
2319 return problems
2319 return problems
2320
2320
2321 @command('debugknown', [], _('REPO ID...'), norepo=True)
2321 @command('debugknown', [], _('REPO ID...'), norepo=True)
2322 def debugknown(ui, repopath, *ids, **opts):
2322 def debugknown(ui, repopath, *ids, **opts):
2323 """test whether node ids are known to a repo
2323 """test whether node ids are known to a repo
2324
2324
2325 Every ID must be a full-length hex node id string. Returns a list of 0s
2325 Every ID must be a full-length hex node id string. Returns a list of 0s
2326 and 1s indicating unknown/known.
2326 and 1s indicating unknown/known.
2327 """
2327 """
2328 repo = hg.peer(ui, opts, repopath)
2328 repo = hg.peer(ui, opts, repopath)
2329 if not repo.capable('known'):
2329 if not repo.capable('known'):
2330 raise util.Abort("known() not supported by target repository")
2330 raise util.Abort("known() not supported by target repository")
2331 flags = repo.known([bin(s) for s in ids])
2331 flags = repo.known([bin(s) for s in ids])
2332 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2332 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2333
2333
2334 @command('debuglabelcomplete', [], _('LABEL...'))
2334 @command('debuglabelcomplete', [], _('LABEL...'))
2335 def debuglabelcomplete(ui, repo, *args):
2335 def debuglabelcomplete(ui, repo, *args):
2336 '''complete "labels" - tags, open branch names, bookmark names'''
2336 '''complete "labels" - tags, open branch names, bookmark names'''
2337
2337
2338 labels = set()
2338 labels = set()
2339 labels.update(t[0] for t in repo.tagslist())
2339 labels.update(t[0] for t in repo.tagslist())
2340 labels.update(repo._bookmarks.keys())
2340 labels.update(repo._bookmarks.keys())
2341 labels.update(tag for (tag, heads, tip, closed)
2341 labels.update(tag for (tag, heads, tip, closed)
2342 in repo.branchmap().iterbranches() if not closed)
2342 in repo.branchmap().iterbranches() if not closed)
2343 completions = set()
2343 completions = set()
2344 if not args:
2344 if not args:
2345 args = ['']
2345 args = ['']
2346 for a in args:
2346 for a in args:
2347 completions.update(l for l in labels if l.startswith(a))
2347 completions.update(l for l in labels if l.startswith(a))
2348 ui.write('\n'.join(sorted(completions)))
2348 ui.write('\n'.join(sorted(completions)))
2349 ui.write('\n')
2349 ui.write('\n')
2350
2350
2351 @command('debuglocks',
2351 @command('debuglocks',
2352 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2352 [('L', 'force-lock', None, _('free the store lock (DANGEROUS)')),
2353 ('W', 'force-wlock', None,
2353 ('W', 'force-wlock', None,
2354 _('free the working state lock (DANGEROUS)'))],
2354 _('free the working state lock (DANGEROUS)'))],
2355 _(''))
2355 _(''))
2356 def debuglocks(ui, repo, **opts):
2356 def debuglocks(ui, repo, **opts):
2357 """show or modify state of locks
2357 """show or modify state of locks
2358
2358
2359 By default, this command will show which locks are held. This
2359 By default, this command will show which locks are held. This
2360 includes the user and process holding the lock, the amount of time
2360 includes the user and process holding the lock, the amount of time
2361 the lock has been held, and the machine name where the process is
2361 the lock has been held, and the machine name where the process is
2362 running if it's not local.
2362 running if it's not local.
2363
2363
2364 Locks protect the integrity of Mercurial's data, so should be
2364 Locks protect the integrity of Mercurial's data, so should be
2365 treated with care. System crashes or other interruptions may cause
2365 treated with care. System crashes or other interruptions may cause
2366 locks to not be properly released, though Mercurial will usually
2366 locks to not be properly released, though Mercurial will usually
2367 detect and remove such stale locks automatically.
2367 detect and remove such stale locks automatically.
2368
2368
2369 However, detecting stale locks may not always be possible (for
2369 However, detecting stale locks may not always be possible (for
2370 instance, on a shared filesystem). Removing locks may also be
2370 instance, on a shared filesystem). Removing locks may also be
2371 blocked by filesystem permissions.
2371 blocked by filesystem permissions.
2372
2372
2373 Returns 0 if no locks are held.
2373 Returns 0 if no locks are held.
2374
2374
2375 """
2375 """
2376
2376
2377 if opts.get('force_lock'):
2377 if opts.get('force_lock'):
2378 repo.svfs.unlink('lock')
2378 repo.svfs.unlink('lock')
2379 if opts.get('force_wlock'):
2379 if opts.get('force_wlock'):
2380 repo.vfs.unlink('wlock')
2380 repo.vfs.unlink('wlock')
2381 if opts.get('force_lock') or opts.get('force_lock'):
2381 if opts.get('force_lock') or opts.get('force_lock'):
2382 return 0
2382 return 0
2383
2383
2384 now = time.time()
2384 now = time.time()
2385 held = 0
2385 held = 0
2386
2386
2387 def report(vfs, name, method):
2387 def report(vfs, name, method):
2388 # this causes stale locks to get reaped for more accurate reporting
2388 # this causes stale locks to get reaped for more accurate reporting
2389 try:
2389 try:
2390 l = method(False)
2390 l = method(False)
2391 except error.LockHeld:
2391 except error.LockHeld:
2392 l = None
2392 l = None
2393
2393
2394 if l:
2394 if l:
2395 l.release()
2395 l.release()
2396 else:
2396 else:
2397 try:
2397 try:
2398 stat = repo.svfs.lstat(name)
2398 stat = repo.svfs.lstat(name)
2399 age = now - stat.st_mtime
2399 age = now - stat.st_mtime
2400 user = util.username(stat.st_uid)
2400 user = util.username(stat.st_uid)
2401 locker = vfs.readlock(name)
2401 locker = vfs.readlock(name)
2402 if ":" in locker:
2402 if ":" in locker:
2403 host, pid = locker.split(':')
2403 host, pid = locker.split(':')
2404 if host == socket.gethostname():
2404 if host == socket.gethostname():
2405 locker = 'user %s, process %s' % (user, pid)
2405 locker = 'user %s, process %s' % (user, pid)
2406 else:
2406 else:
2407 locker = 'user %s, process %s, host %s' \
2407 locker = 'user %s, process %s, host %s' \
2408 % (user, pid, host)
2408 % (user, pid, host)
2409 ui.write("%-6s %s (%ds)\n" % (name + ":", locker, age))
2409 ui.write("%-6s %s (%ds)\n" % (name + ":", locker, age))
2410 return 1
2410 return 1
2411 except OSError, e:
2411 except OSError, e:
2412 if e.errno != errno.ENOENT:
2412 if e.errno != errno.ENOENT:
2413 raise
2413 raise
2414
2414
2415 ui.write("%-6s free\n" % (name + ":"))
2415 ui.write("%-6s free\n" % (name + ":"))
2416 return 0
2416 return 0
2417
2417
2418 held += report(repo.svfs, "lock", repo.lock)
2418 held += report(repo.svfs, "lock", repo.lock)
2419 held += report(repo.vfs, "wlock", repo.wlock)
2419 held += report(repo.vfs, "wlock", repo.wlock)
2420
2420
2421 return held
2421 return held
2422
2422
2423 @command('debugobsolete',
2423 @command('debugobsolete',
2424 [('', 'flags', 0, _('markers flag')),
2424 [('', 'flags', 0, _('markers flag')),
2425 ('', 'record-parents', False,
2425 ('', 'record-parents', False,
2426 _('record parent information for the precursor')),
2426 _('record parent information for the precursor')),
2427 ('r', 'rev', [], _('display markers relevant to REV')),
2427 ('r', 'rev', [], _('display markers relevant to REV')),
2428 ] + commitopts2,
2428 ] + commitopts2,
2429 _('[OBSOLETED [REPLACEMENT] [REPL... ]'))
2429 _('[OBSOLETED [REPLACEMENT] [REPL... ]'))
2430 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
2430 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
2431 """create arbitrary obsolete marker
2431 """create arbitrary obsolete marker
2432
2432
2433 With no arguments, displays the list of obsolescence markers."""
2433 With no arguments, displays the list of obsolescence markers."""
2434
2434
2435 def parsenodeid(s):
2435 def parsenodeid(s):
2436 try:
2436 try:
2437 # We do not use revsingle/revrange functions here to accept
2437 # We do not use revsingle/revrange functions here to accept
2438 # arbitrary node identifiers, possibly not present in the
2438 # arbitrary node identifiers, possibly not present in the
2439 # local repository.
2439 # local repository.
2440 n = bin(s)
2440 n = bin(s)
2441 if len(n) != len(nullid):
2441 if len(n) != len(nullid):
2442 raise TypeError()
2442 raise TypeError()
2443 return n
2443 return n
2444 except TypeError:
2444 except TypeError:
2445 raise util.Abort('changeset references must be full hexadecimal '
2445 raise util.Abort('changeset references must be full hexadecimal '
2446 'node identifiers')
2446 'node identifiers')
2447
2447
2448 if precursor is not None:
2448 if precursor is not None:
2449 if opts['rev']:
2449 if opts['rev']:
2450 raise util.Abort('cannot select revision when creating marker')
2450 raise util.Abort('cannot select revision when creating marker')
2451 metadata = {}
2451 metadata = {}
2452 metadata['user'] = opts['user'] or ui.username()
2452 metadata['user'] = opts['user'] or ui.username()
2453 succs = tuple(parsenodeid(succ) for succ in successors)
2453 succs = tuple(parsenodeid(succ) for succ in successors)
2454 l = repo.lock()
2454 l = repo.lock()
2455 try:
2455 try:
2456 tr = repo.transaction('debugobsolete')
2456 tr = repo.transaction('debugobsolete')
2457 try:
2457 try:
2458 try:
2458 try:
2459 date = opts.get('date')
2459 date = opts.get('date')
2460 if date:
2460 if date:
2461 date = util.parsedate(date)
2461 date = util.parsedate(date)
2462 else:
2462 else:
2463 date = None
2463 date = None
2464 prec = parsenodeid(precursor)
2464 prec = parsenodeid(precursor)
2465 parents = None
2465 parents = None
2466 if opts['record_parents']:
2466 if opts['record_parents']:
2467 if prec not in repo.unfiltered():
2467 if prec not in repo.unfiltered():
2468 raise util.Abort('cannot used --record-parents on '
2468 raise util.Abort('cannot used --record-parents on '
2469 'unknown changesets')
2469 'unknown changesets')
2470 parents = repo.unfiltered()[prec].parents()
2470 parents = repo.unfiltered()[prec].parents()
2471 parents = tuple(p.node() for p in parents)
2471 parents = tuple(p.node() for p in parents)
2472 repo.obsstore.create(tr, prec, succs, opts['flags'],
2472 repo.obsstore.create(tr, prec, succs, opts['flags'],
2473 parents=parents, date=date,
2473 parents=parents, date=date,
2474 metadata=metadata)
2474 metadata=metadata)
2475 tr.close()
2475 tr.close()
2476 except ValueError, exc:
2476 except ValueError, exc:
2477 raise util.Abort(_('bad obsmarker input: %s') % exc)
2477 raise util.Abort(_('bad obsmarker input: %s') % exc)
2478 finally:
2478 finally:
2479 tr.release()
2479 tr.release()
2480 finally:
2480 finally:
2481 l.release()
2481 l.release()
2482 else:
2482 else:
2483 if opts['rev']:
2483 if opts['rev']:
2484 revs = scmutil.revrange(repo, opts['rev'])
2484 revs = scmutil.revrange(repo, opts['rev'])
2485 nodes = [repo[r].node() for r in revs]
2485 nodes = [repo[r].node() for r in revs]
2486 markers = list(obsolete.getmarkers(repo, nodes=nodes))
2486 markers = list(obsolete.getmarkers(repo, nodes=nodes))
2487 markers.sort(key=lambda x: x._data)
2487 markers.sort(key=lambda x: x._data)
2488 else:
2488 else:
2489 markers = obsolete.getmarkers(repo)
2489 markers = obsolete.getmarkers(repo)
2490
2490
2491 for m in markers:
2491 for m in markers:
2492 cmdutil.showmarker(ui, m)
2492 cmdutil.showmarker(ui, m)
2493
2493
2494 @command('debugpathcomplete',
2494 @command('debugpathcomplete',
2495 [('f', 'full', None, _('complete an entire path')),
2495 [('f', 'full', None, _('complete an entire path')),
2496 ('n', 'normal', None, _('show only normal files')),
2496 ('n', 'normal', None, _('show only normal files')),
2497 ('a', 'added', None, _('show only added files')),
2497 ('a', 'added', None, _('show only added files')),
2498 ('r', 'removed', None, _('show only removed files'))],
2498 ('r', 'removed', None, _('show only removed files'))],
2499 _('FILESPEC...'))
2499 _('FILESPEC...'))
2500 def debugpathcomplete(ui, repo, *specs, **opts):
2500 def debugpathcomplete(ui, repo, *specs, **opts):
2501 '''complete part or all of a tracked path
2501 '''complete part or all of a tracked path
2502
2502
2503 This command supports shells that offer path name completion. It
2503 This command supports shells that offer path name completion. It
2504 currently completes only files already known to the dirstate.
2504 currently completes only files already known to the dirstate.
2505
2505
2506 Completion extends only to the next path segment unless
2506 Completion extends only to the next path segment unless
2507 --full is specified, in which case entire paths are used.'''
2507 --full is specified, in which case entire paths are used.'''
2508
2508
2509 def complete(path, acceptable):
2509 def complete(path, acceptable):
2510 dirstate = repo.dirstate
2510 dirstate = repo.dirstate
2511 spec = os.path.normpath(os.path.join(os.getcwd(), path))
2511 spec = os.path.normpath(os.path.join(os.getcwd(), path))
2512 rootdir = repo.root + os.sep
2512 rootdir = repo.root + os.sep
2513 if spec != repo.root and not spec.startswith(rootdir):
2513 if spec != repo.root and not spec.startswith(rootdir):
2514 return [], []
2514 return [], []
2515 if os.path.isdir(spec):
2515 if os.path.isdir(spec):
2516 spec += '/'
2516 spec += '/'
2517 spec = spec[len(rootdir):]
2517 spec = spec[len(rootdir):]
2518 fixpaths = os.sep != '/'
2518 fixpaths = os.sep != '/'
2519 if fixpaths:
2519 if fixpaths:
2520 spec = spec.replace(os.sep, '/')
2520 spec = spec.replace(os.sep, '/')
2521 speclen = len(spec)
2521 speclen = len(spec)
2522 fullpaths = opts['full']
2522 fullpaths = opts['full']
2523 files, dirs = set(), set()
2523 files, dirs = set(), set()
2524 adddir, addfile = dirs.add, files.add
2524 adddir, addfile = dirs.add, files.add
2525 for f, st in dirstate.iteritems():
2525 for f, st in dirstate.iteritems():
2526 if f.startswith(spec) and st[0] in acceptable:
2526 if f.startswith(spec) and st[0] in acceptable:
2527 if fixpaths:
2527 if fixpaths:
2528 f = f.replace('/', os.sep)
2528 f = f.replace('/', os.sep)
2529 if fullpaths:
2529 if fullpaths:
2530 addfile(f)
2530 addfile(f)
2531 continue
2531 continue
2532 s = f.find(os.sep, speclen)
2532 s = f.find(os.sep, speclen)
2533 if s >= 0:
2533 if s >= 0:
2534 adddir(f[:s])
2534 adddir(f[:s])
2535 else:
2535 else:
2536 addfile(f)
2536 addfile(f)
2537 return files, dirs
2537 return files, dirs
2538
2538
2539 acceptable = ''
2539 acceptable = ''
2540 if opts['normal']:
2540 if opts['normal']:
2541 acceptable += 'nm'
2541 acceptable += 'nm'
2542 if opts['added']:
2542 if opts['added']:
2543 acceptable += 'a'
2543 acceptable += 'a'
2544 if opts['removed']:
2544 if opts['removed']:
2545 acceptable += 'r'
2545 acceptable += 'r'
2546 cwd = repo.getcwd()
2546 cwd = repo.getcwd()
2547 if not specs:
2547 if not specs:
2548 specs = ['.']
2548 specs = ['.']
2549
2549
2550 files, dirs = set(), set()
2550 files, dirs = set(), set()
2551 for spec in specs:
2551 for spec in specs:
2552 f, d = complete(spec, acceptable or 'nmar')
2552 f, d = complete(spec, acceptable or 'nmar')
2553 files.update(f)
2553 files.update(f)
2554 dirs.update(d)
2554 dirs.update(d)
2555 files.update(dirs)
2555 files.update(dirs)
2556 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
2556 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
2557 ui.write('\n')
2557 ui.write('\n')
2558
2558
2559 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
2559 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'), norepo=True)
2560 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
2560 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
2561 '''access the pushkey key/value protocol
2561 '''access the pushkey key/value protocol
2562
2562
2563 With two args, list the keys in the given namespace.
2563 With two args, list the keys in the given namespace.
2564
2564
2565 With five args, set a key to new if it currently is set to old.
2565 With five args, set a key to new if it currently is set to old.
2566 Reports success or failure.
2566 Reports success or failure.
2567 '''
2567 '''
2568
2568
2569 target = hg.peer(ui, {}, repopath)
2569 target = hg.peer(ui, {}, repopath)
2570 if keyinfo:
2570 if keyinfo:
2571 key, old, new = keyinfo
2571 key, old, new = keyinfo
2572 r = target.pushkey(namespace, key, old, new)
2572 r = target.pushkey(namespace, key, old, new)
2573 ui.status(str(r) + '\n')
2573 ui.status(str(r) + '\n')
2574 return not r
2574 return not r
2575 else:
2575 else:
2576 for k, v in sorted(target.listkeys(namespace).iteritems()):
2576 for k, v in sorted(target.listkeys(namespace).iteritems()):
2577 ui.write("%s\t%s\n" % (k.encode('string-escape'),
2577 ui.write("%s\t%s\n" % (k.encode('string-escape'),
2578 v.encode('string-escape')))
2578 v.encode('string-escape')))
2579
2579
2580 @command('debugpvec', [], _('A B'))
2580 @command('debugpvec', [], _('A B'))
2581 def debugpvec(ui, repo, a, b=None):
2581 def debugpvec(ui, repo, a, b=None):
2582 ca = scmutil.revsingle(repo, a)
2582 ca = scmutil.revsingle(repo, a)
2583 cb = scmutil.revsingle(repo, b)
2583 cb = scmutil.revsingle(repo, b)
2584 pa = pvec.ctxpvec(ca)
2584 pa = pvec.ctxpvec(ca)
2585 pb = pvec.ctxpvec(cb)
2585 pb = pvec.ctxpvec(cb)
2586 if pa == pb:
2586 if pa == pb:
2587 rel = "="
2587 rel = "="
2588 elif pa > pb:
2588 elif pa > pb:
2589 rel = ">"
2589 rel = ">"
2590 elif pa < pb:
2590 elif pa < pb:
2591 rel = "<"
2591 rel = "<"
2592 elif pa | pb:
2592 elif pa | pb:
2593 rel = "|"
2593 rel = "|"
2594 ui.write(_("a: %s\n") % pa)
2594 ui.write(_("a: %s\n") % pa)
2595 ui.write(_("b: %s\n") % pb)
2595 ui.write(_("b: %s\n") % pb)
2596 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
2596 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
2597 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
2597 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
2598 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
2598 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
2599 pa.distance(pb), rel))
2599 pa.distance(pb), rel))
2600
2600
2601 @command('debugrebuilddirstate|debugrebuildstate',
2601 @command('debugrebuilddirstate|debugrebuildstate',
2602 [('r', 'rev', '', _('revision to rebuild to'), _('REV'))],
2602 [('r', 'rev', '', _('revision to rebuild to'), _('REV'))],
2603 _('[-r REV]'))
2603 _('[-r REV]'))
2604 def debugrebuilddirstate(ui, repo, rev):
2604 def debugrebuilddirstate(ui, repo, rev):
2605 """rebuild the dirstate as it would look like for the given revision
2605 """rebuild the dirstate as it would look like for the given revision
2606
2606
2607 If no revision is specified the first current parent will be used.
2607 If no revision is specified the first current parent will be used.
2608
2608
2609 The dirstate will be set to the files of the given revision.
2609 The dirstate will be set to the files of the given revision.
2610 The actual working directory content or existing dirstate
2610 The actual working directory content or existing dirstate
2611 information such as adds or removes is not considered.
2611 information such as adds or removes is not considered.
2612
2612
2613 One use of this command is to make the next :hg:`status` invocation
2613 One use of this command is to make the next :hg:`status` invocation
2614 check the actual file content.
2614 check the actual file content.
2615 """
2615 """
2616 ctx = scmutil.revsingle(repo, rev)
2616 ctx = scmutil.revsingle(repo, rev)
2617 wlock = repo.wlock()
2617 wlock = repo.wlock()
2618 try:
2618 try:
2619 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
2619 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
2620 finally:
2620 finally:
2621 wlock.release()
2621 wlock.release()
2622
2622
2623 @command('debugrename',
2623 @command('debugrename',
2624 [('r', 'rev', '', _('revision to debug'), _('REV'))],
2624 [('r', 'rev', '', _('revision to debug'), _('REV'))],
2625 _('[-r REV] FILE'))
2625 _('[-r REV] FILE'))
2626 def debugrename(ui, repo, file1, *pats, **opts):
2626 def debugrename(ui, repo, file1, *pats, **opts):
2627 """dump rename information"""
2627 """dump rename information"""
2628
2628
2629 ctx = scmutil.revsingle(repo, opts.get('rev'))
2629 ctx = scmutil.revsingle(repo, opts.get('rev'))
2630 m = scmutil.match(ctx, (file1,) + pats, opts)
2630 m = scmutil.match(ctx, (file1,) + pats, opts)
2631 for abs in ctx.walk(m):
2631 for abs in ctx.walk(m):
2632 fctx = ctx[abs]
2632 fctx = ctx[abs]
2633 o = fctx.filelog().renamed(fctx.filenode())
2633 o = fctx.filelog().renamed(fctx.filenode())
2634 rel = m.rel(abs)
2634 rel = m.rel(abs)
2635 if o:
2635 if o:
2636 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
2636 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
2637 else:
2637 else:
2638 ui.write(_("%s not renamed\n") % rel)
2638 ui.write(_("%s not renamed\n") % rel)
2639
2639
2640 @command('debugrevlog',
2640 @command('debugrevlog',
2641 [('c', 'changelog', False, _('open changelog')),
2641 [('c', 'changelog', False, _('open changelog')),
2642 ('m', 'manifest', False, _('open manifest')),
2642 ('m', 'manifest', False, _('open manifest')),
2643 ('d', 'dump', False, _('dump index data'))],
2643 ('d', 'dump', False, _('dump index data'))],
2644 _('-c|-m|FILE'),
2644 _('-c|-m|FILE'),
2645 optionalrepo=True)
2645 optionalrepo=True)
2646 def debugrevlog(ui, repo, file_=None, **opts):
2646 def debugrevlog(ui, repo, file_=None, **opts):
2647 """show data and statistics about a revlog"""
2647 """show data and statistics about a revlog"""
2648 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
2648 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
2649
2649
2650 if opts.get("dump"):
2650 if opts.get("dump"):
2651 numrevs = len(r)
2651 numrevs = len(r)
2652 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
2652 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
2653 " rawsize totalsize compression heads chainlen\n")
2653 " rawsize totalsize compression heads chainlen\n")
2654 ts = 0
2654 ts = 0
2655 heads = set()
2655 heads = set()
2656 rindex = r.index
2656 rindex = r.index
2657
2657
2658 def chainbaseandlen(rev):
2658 def chainbaseandlen(rev):
2659 clen = 0
2659 clen = 0
2660 base = rindex[rev][3]
2660 base = rindex[rev][3]
2661 while base != rev:
2661 while base != rev:
2662 clen += 1
2662 clen += 1
2663 rev = base
2663 rev = base
2664 base = rindex[rev][3]
2664 base = rindex[rev][3]
2665 return base, clen
2665 return base, clen
2666
2666
2667 for rev in xrange(numrevs):
2667 for rev in xrange(numrevs):
2668 dbase = r.deltaparent(rev)
2668 dbase = r.deltaparent(rev)
2669 if dbase == -1:
2669 if dbase == -1:
2670 dbase = rev
2670 dbase = rev
2671 cbase, clen = chainbaseandlen(rev)
2671 cbase, clen = chainbaseandlen(rev)
2672 p1, p2 = r.parentrevs(rev)
2672 p1, p2 = r.parentrevs(rev)
2673 rs = r.rawsize(rev)
2673 rs = r.rawsize(rev)
2674 ts = ts + rs
2674 ts = ts + rs
2675 heads -= set(r.parentrevs(rev))
2675 heads -= set(r.parentrevs(rev))
2676 heads.add(rev)
2676 heads.add(rev)
2677 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
2677 ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d "
2678 "%11d %5d %8d\n" %
2678 "%11d %5d %8d\n" %
2679 (rev, p1, p2, r.start(rev), r.end(rev),
2679 (rev, p1, p2, r.start(rev), r.end(rev),
2680 r.start(dbase), r.start(cbase),
2680 r.start(dbase), r.start(cbase),
2681 r.start(p1), r.start(p2),
2681 r.start(p1), r.start(p2),
2682 rs, ts, ts / r.end(rev), len(heads), clen))
2682 rs, ts, ts / r.end(rev), len(heads), clen))
2683 return 0
2683 return 0
2684
2684
2685 v = r.version
2685 v = r.version
2686 format = v & 0xFFFF
2686 format = v & 0xFFFF
2687 flags = []
2687 flags = []
2688 gdelta = False
2688 gdelta = False
2689 if v & revlog.REVLOGNGINLINEDATA:
2689 if v & revlog.REVLOGNGINLINEDATA:
2690 flags.append('inline')
2690 flags.append('inline')
2691 if v & revlog.REVLOGGENERALDELTA:
2691 if v & revlog.REVLOGGENERALDELTA:
2692 gdelta = True
2692 gdelta = True
2693 flags.append('generaldelta')
2693 flags.append('generaldelta')
2694 if not flags:
2694 if not flags:
2695 flags = ['(none)']
2695 flags = ['(none)']
2696
2696
2697 nummerges = 0
2697 nummerges = 0
2698 numfull = 0
2698 numfull = 0
2699 numprev = 0
2699 numprev = 0
2700 nump1 = 0
2700 nump1 = 0
2701 nump2 = 0
2701 nump2 = 0
2702 numother = 0
2702 numother = 0
2703 nump1prev = 0
2703 nump1prev = 0
2704 nump2prev = 0
2704 nump2prev = 0
2705 chainlengths = []
2705 chainlengths = []
2706
2706
2707 datasize = [None, 0, 0L]
2707 datasize = [None, 0, 0L]
2708 fullsize = [None, 0, 0L]
2708 fullsize = [None, 0, 0L]
2709 deltasize = [None, 0, 0L]
2709 deltasize = [None, 0, 0L]
2710
2710
2711 def addsize(size, l):
2711 def addsize(size, l):
2712 if l[0] is None or size < l[0]:
2712 if l[0] is None or size < l[0]:
2713 l[0] = size
2713 l[0] = size
2714 if size > l[1]:
2714 if size > l[1]:
2715 l[1] = size
2715 l[1] = size
2716 l[2] += size
2716 l[2] += size
2717
2717
2718 numrevs = len(r)
2718 numrevs = len(r)
2719 for rev in xrange(numrevs):
2719 for rev in xrange(numrevs):
2720 p1, p2 = r.parentrevs(rev)
2720 p1, p2 = r.parentrevs(rev)
2721 delta = r.deltaparent(rev)
2721 delta = r.deltaparent(rev)
2722 if format > 0:
2722 if format > 0:
2723 addsize(r.rawsize(rev), datasize)
2723 addsize(r.rawsize(rev), datasize)
2724 if p2 != nullrev:
2724 if p2 != nullrev:
2725 nummerges += 1
2725 nummerges += 1
2726 size = r.length(rev)
2726 size = r.length(rev)
2727 if delta == nullrev:
2727 if delta == nullrev:
2728 chainlengths.append(0)
2728 chainlengths.append(0)
2729 numfull += 1
2729 numfull += 1
2730 addsize(size, fullsize)
2730 addsize(size, fullsize)
2731 else:
2731 else:
2732 chainlengths.append(chainlengths[delta] + 1)
2732 chainlengths.append(chainlengths[delta] + 1)
2733 addsize(size, deltasize)
2733 addsize(size, deltasize)
2734 if delta == rev - 1:
2734 if delta == rev - 1:
2735 numprev += 1
2735 numprev += 1
2736 if delta == p1:
2736 if delta == p1:
2737 nump1prev += 1
2737 nump1prev += 1
2738 elif delta == p2:
2738 elif delta == p2:
2739 nump2prev += 1
2739 nump2prev += 1
2740 elif delta == p1:
2740 elif delta == p1:
2741 nump1 += 1
2741 nump1 += 1
2742 elif delta == p2:
2742 elif delta == p2:
2743 nump2 += 1
2743 nump2 += 1
2744 elif delta != nullrev:
2744 elif delta != nullrev:
2745 numother += 1
2745 numother += 1
2746
2746
2747 # Adjust size min value for empty cases
2747 # Adjust size min value for empty cases
2748 for size in (datasize, fullsize, deltasize):
2748 for size in (datasize, fullsize, deltasize):
2749 if size[0] is None:
2749 if size[0] is None:
2750 size[0] = 0
2750 size[0] = 0
2751
2751
2752 numdeltas = numrevs - numfull
2752 numdeltas = numrevs - numfull
2753 numoprev = numprev - nump1prev - nump2prev
2753 numoprev = numprev - nump1prev - nump2prev
2754 totalrawsize = datasize[2]
2754 totalrawsize = datasize[2]
2755 datasize[2] /= numrevs
2755 datasize[2] /= numrevs
2756 fulltotal = fullsize[2]
2756 fulltotal = fullsize[2]
2757 fullsize[2] /= numfull
2757 fullsize[2] /= numfull
2758 deltatotal = deltasize[2]
2758 deltatotal = deltasize[2]
2759 if numrevs - numfull > 0:
2759 if numrevs - numfull > 0:
2760 deltasize[2] /= numrevs - numfull
2760 deltasize[2] /= numrevs - numfull
2761 totalsize = fulltotal + deltatotal
2761 totalsize = fulltotal + deltatotal
2762 avgchainlen = sum(chainlengths) / numrevs
2762 avgchainlen = sum(chainlengths) / numrevs
2763 compratio = totalrawsize / totalsize
2763 compratio = totalrawsize / totalsize
2764
2764
2765 basedfmtstr = '%%%dd\n'
2765 basedfmtstr = '%%%dd\n'
2766 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2766 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2767
2767
2768 def dfmtstr(max):
2768 def dfmtstr(max):
2769 return basedfmtstr % len(str(max))
2769 return basedfmtstr % len(str(max))
2770 def pcfmtstr(max, padding=0):
2770 def pcfmtstr(max, padding=0):
2771 return basepcfmtstr % (len(str(max)), ' ' * padding)
2771 return basepcfmtstr % (len(str(max)), ' ' * padding)
2772
2772
2773 def pcfmt(value, total):
2773 def pcfmt(value, total):
2774 return (value, 100 * float(value) / total)
2774 return (value, 100 * float(value) / total)
2775
2775
2776 ui.write(('format : %d\n') % format)
2776 ui.write(('format : %d\n') % format)
2777 ui.write(('flags : %s\n') % ', '.join(flags))
2777 ui.write(('flags : %s\n') % ', '.join(flags))
2778
2778
2779 ui.write('\n')
2779 ui.write('\n')
2780 fmt = pcfmtstr(totalsize)
2780 fmt = pcfmtstr(totalsize)
2781 fmt2 = dfmtstr(totalsize)
2781 fmt2 = dfmtstr(totalsize)
2782 ui.write(('revisions : ') + fmt2 % numrevs)
2782 ui.write(('revisions : ') + fmt2 % numrevs)
2783 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
2783 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
2784 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
2784 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
2785 ui.write(('revisions : ') + fmt2 % numrevs)
2785 ui.write(('revisions : ') + fmt2 % numrevs)
2786 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
2786 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
2787 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
2787 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
2788 ui.write(('revision size : ') + fmt2 % totalsize)
2788 ui.write(('revision size : ') + fmt2 % totalsize)
2789 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
2789 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
2790 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
2790 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
2791
2791
2792 ui.write('\n')
2792 ui.write('\n')
2793 fmt = dfmtstr(max(avgchainlen, compratio))
2793 fmt = dfmtstr(max(avgchainlen, compratio))
2794 ui.write(('avg chain length : ') + fmt % avgchainlen)
2794 ui.write(('avg chain length : ') + fmt % avgchainlen)
2795 ui.write(('compression ratio : ') + fmt % compratio)
2795 ui.write(('compression ratio : ') + fmt % compratio)
2796
2796
2797 if format > 0:
2797 if format > 0:
2798 ui.write('\n')
2798 ui.write('\n')
2799 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
2799 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
2800 % tuple(datasize))
2800 % tuple(datasize))
2801 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
2801 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
2802 % tuple(fullsize))
2802 % tuple(fullsize))
2803 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
2803 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
2804 % tuple(deltasize))
2804 % tuple(deltasize))
2805
2805
2806 if numdeltas > 0:
2806 if numdeltas > 0:
2807 ui.write('\n')
2807 ui.write('\n')
2808 fmt = pcfmtstr(numdeltas)
2808 fmt = pcfmtstr(numdeltas)
2809 fmt2 = pcfmtstr(numdeltas, 4)
2809 fmt2 = pcfmtstr(numdeltas, 4)
2810 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
2810 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
2811 if numprev > 0:
2811 if numprev > 0:
2812 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
2812 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
2813 numprev))
2813 numprev))
2814 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
2814 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
2815 numprev))
2815 numprev))
2816 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
2816 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
2817 numprev))
2817 numprev))
2818 if gdelta:
2818 if gdelta:
2819 ui.write(('deltas against p1 : ')
2819 ui.write(('deltas against p1 : ')
2820 + fmt % pcfmt(nump1, numdeltas))
2820 + fmt % pcfmt(nump1, numdeltas))
2821 ui.write(('deltas against p2 : ')
2821 ui.write(('deltas against p2 : ')
2822 + fmt % pcfmt(nump2, numdeltas))
2822 + fmt % pcfmt(nump2, numdeltas))
2823 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
2823 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
2824 numdeltas))
2824 numdeltas))
2825
2825
2826 @command('debugrevspec',
2826 @command('debugrevspec',
2827 [('', 'optimize', None, _('print parsed tree after optimizing'))],
2827 [('', 'optimize', None, _('print parsed tree after optimizing'))],
2828 ('REVSPEC'))
2828 ('REVSPEC'))
2829 def debugrevspec(ui, repo, expr, **opts):
2829 def debugrevspec(ui, repo, expr, **opts):
2830 """parse and apply a revision specification
2830 """parse and apply a revision specification
2831
2831
2832 Use --verbose to print the parsed tree before and after aliases
2832 Use --verbose to print the parsed tree before and after aliases
2833 expansion.
2833 expansion.
2834 """
2834 """
2835 if ui.verbose:
2835 if ui.verbose:
2836 tree = revset.parse(expr)[0]
2836 tree = revset.parse(expr)[0]
2837 ui.note(revset.prettyformat(tree), "\n")
2837 ui.note(revset.prettyformat(tree), "\n")
2838 newtree = revset.findaliases(ui, tree)
2838 newtree = revset.findaliases(ui, tree)
2839 if newtree != tree:
2839 if newtree != tree:
2840 ui.note(revset.prettyformat(newtree), "\n")
2840 ui.note(revset.prettyformat(newtree), "\n")
2841 if opts["optimize"]:
2841 if opts["optimize"]:
2842 weight, optimizedtree = revset.optimize(newtree, True)
2842 weight, optimizedtree = revset.optimize(newtree, True)
2843 ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n")
2843 ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n")
2844 func = revset.match(ui, expr)
2844 func = revset.match(ui, expr)
2845 for c in func(repo, revset.spanset(repo)):
2845 for c in func(repo, revset.spanset(repo)):
2846 ui.write("%s\n" % c)
2846 ui.write("%s\n" % c)
2847
2847
2848 @command('debugsetparents', [], _('REV1 [REV2]'))
2848 @command('debugsetparents', [], _('REV1 [REV2]'))
2849 def debugsetparents(ui, repo, rev1, rev2=None):
2849 def debugsetparents(ui, repo, rev1, rev2=None):
2850 """manually set the parents of the current working directory
2850 """manually set the parents of the current working directory
2851
2851
2852 This is useful for writing repository conversion tools, but should
2852 This is useful for writing repository conversion tools, but should
2853 be used with care.
2853 be used with care.
2854
2854
2855 Returns 0 on success.
2855 Returns 0 on success.
2856 """
2856 """
2857
2857
2858 r1 = scmutil.revsingle(repo, rev1).node()
2858 r1 = scmutil.revsingle(repo, rev1).node()
2859 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2859 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2860
2860
2861 wlock = repo.wlock()
2861 wlock = repo.wlock()
2862 try:
2862 try:
2863 repo.dirstate.beginparentchange()
2863 repo.dirstate.beginparentchange()
2864 repo.setparents(r1, r2)
2864 repo.setparents(r1, r2)
2865 repo.dirstate.endparentchange()
2865 repo.dirstate.endparentchange()
2866 finally:
2866 finally:
2867 wlock.release()
2867 wlock.release()
2868
2868
2869 @command('debugdirstate|debugstate',
2869 @command('debugdirstate|debugstate',
2870 [('', 'nodates', None, _('do not display the saved mtime')),
2870 [('', 'nodates', None, _('do not display the saved mtime')),
2871 ('', 'datesort', None, _('sort by saved mtime'))],
2871 ('', 'datesort', None, _('sort by saved mtime'))],
2872 _('[OPTION]...'))
2872 _('[OPTION]...'))
2873 def debugstate(ui, repo, nodates=None, datesort=None):
2873 def debugstate(ui, repo, nodates=None, datesort=None):
2874 """show the contents of the current dirstate"""
2874 """show the contents of the current dirstate"""
2875 timestr = ""
2875 timestr = ""
2876 showdate = not nodates
2876 showdate = not nodates
2877 if datesort:
2877 if datesort:
2878 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
2878 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
2879 else:
2879 else:
2880 keyfunc = None # sort by filename
2880 keyfunc = None # sort by filename
2881 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
2881 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
2882 if showdate:
2882 if showdate:
2883 if ent[3] == -1:
2883 if ent[3] == -1:
2884 # Pad or slice to locale representation
2884 # Pad or slice to locale representation
2885 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
2885 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
2886 time.localtime(0)))
2886 time.localtime(0)))
2887 timestr = 'unset'
2887 timestr = 'unset'
2888 timestr = (timestr[:locale_len] +
2888 timestr = (timestr[:locale_len] +
2889 ' ' * (locale_len - len(timestr)))
2889 ' ' * (locale_len - len(timestr)))
2890 else:
2890 else:
2891 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
2891 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
2892 time.localtime(ent[3]))
2892 time.localtime(ent[3]))
2893 if ent[1] & 020000:
2893 if ent[1] & 020000:
2894 mode = 'lnk'
2894 mode = 'lnk'
2895 else:
2895 else:
2896 mode = '%3o' % (ent[1] & 0777 & ~util.umask)
2896 mode = '%3o' % (ent[1] & 0777 & ~util.umask)
2897 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
2897 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
2898 for f in repo.dirstate.copies():
2898 for f in repo.dirstate.copies():
2899 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
2899 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
2900
2900
2901 @command('debugsub',
2901 @command('debugsub',
2902 [('r', 'rev', '',
2902 [('r', 'rev', '',
2903 _('revision to check'), _('REV'))],
2903 _('revision to check'), _('REV'))],
2904 _('[-r REV] [REV]'))
2904 _('[-r REV] [REV]'))
2905 def debugsub(ui, repo, rev=None):
2905 def debugsub(ui, repo, rev=None):
2906 ctx = scmutil.revsingle(repo, rev, None)
2906 ctx = scmutil.revsingle(repo, rev, None)
2907 for k, v in sorted(ctx.substate.items()):
2907 for k, v in sorted(ctx.substate.items()):
2908 ui.write(('path %s\n') % k)
2908 ui.write(('path %s\n') % k)
2909 ui.write((' source %s\n') % v[0])
2909 ui.write((' source %s\n') % v[0])
2910 ui.write((' revision %s\n') % v[1])
2910 ui.write((' revision %s\n') % v[1])
2911
2911
2912 @command('debugsuccessorssets',
2912 @command('debugsuccessorssets',
2913 [],
2913 [],
2914 _('[REV]'))
2914 _('[REV]'))
2915 def debugsuccessorssets(ui, repo, *revs):
2915 def debugsuccessorssets(ui, repo, *revs):
2916 """show set of successors for revision
2916 """show set of successors for revision
2917
2917
2918 A successors set of changeset A is a consistent group of revisions that
2918 A successors set of changeset A is a consistent group of revisions that
2919 succeed A. It contains non-obsolete changesets only.
2919 succeed A. It contains non-obsolete changesets only.
2920
2920
2921 In most cases a changeset A has a single successors set containing a single
2921 In most cases a changeset A has a single successors set containing a single
2922 successor (changeset A replaced by A').
2922 successor (changeset A replaced by A').
2923
2923
2924 A changeset that is made obsolete with no successors are called "pruned".
2924 A changeset that is made obsolete with no successors are called "pruned".
2925 Such changesets have no successors sets at all.
2925 Such changesets have no successors sets at all.
2926
2926
2927 A changeset that has been "split" will have a successors set containing
2927 A changeset that has been "split" will have a successors set containing
2928 more than one successor.
2928 more than one successor.
2929
2929
2930 A changeset that has been rewritten in multiple different ways is called
2930 A changeset that has been rewritten in multiple different ways is called
2931 "divergent". Such changesets have multiple successor sets (each of which
2931 "divergent". Such changesets have multiple successor sets (each of which
2932 may also be split, i.e. have multiple successors).
2932 may also be split, i.e. have multiple successors).
2933
2933
2934 Results are displayed as follows::
2934 Results are displayed as follows::
2935
2935
2936 <rev1>
2936 <rev1>
2937 <successors-1A>
2937 <successors-1A>
2938 <rev2>
2938 <rev2>
2939 <successors-2A>
2939 <successors-2A>
2940 <successors-2B1> <successors-2B2> <successors-2B3>
2940 <successors-2B1> <successors-2B2> <successors-2B3>
2941
2941
2942 Here rev2 has two possible (i.e. divergent) successors sets. The first
2942 Here rev2 has two possible (i.e. divergent) successors sets. The first
2943 holds one element, whereas the second holds three (i.e. the changeset has
2943 holds one element, whereas the second holds three (i.e. the changeset has
2944 been split).
2944 been split).
2945 """
2945 """
2946 # passed to successorssets caching computation from one call to another
2946 # passed to successorssets caching computation from one call to another
2947 cache = {}
2947 cache = {}
2948 ctx2str = str
2948 ctx2str = str
2949 node2str = short
2949 node2str = short
2950 if ui.debug():
2950 if ui.debug():
2951 def ctx2str(ctx):
2951 def ctx2str(ctx):
2952 return ctx.hex()
2952 return ctx.hex()
2953 node2str = hex
2953 node2str = hex
2954 for rev in scmutil.revrange(repo, revs):
2954 for rev in scmutil.revrange(repo, revs):
2955 ctx = repo[rev]
2955 ctx = repo[rev]
2956 ui.write('%s\n'% ctx2str(ctx))
2956 ui.write('%s\n'% ctx2str(ctx))
2957 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
2957 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
2958 if succsset:
2958 if succsset:
2959 ui.write(' ')
2959 ui.write(' ')
2960 ui.write(node2str(succsset[0]))
2960 ui.write(node2str(succsset[0]))
2961 for node in succsset[1:]:
2961 for node in succsset[1:]:
2962 ui.write(' ')
2962 ui.write(' ')
2963 ui.write(node2str(node))
2963 ui.write(node2str(node))
2964 ui.write('\n')
2964 ui.write('\n')
2965
2965
2966 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
2966 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'), inferrepo=True)
2967 def debugwalk(ui, repo, *pats, **opts):
2967 def debugwalk(ui, repo, *pats, **opts):
2968 """show how files match on given patterns"""
2968 """show how files match on given patterns"""
2969 m = scmutil.match(repo[None], pats, opts)
2969 m = scmutil.match(repo[None], pats, opts)
2970 items = list(repo.walk(m))
2970 items = list(repo.walk(m))
2971 if not items:
2971 if not items:
2972 return
2972 return
2973 f = lambda fn: fn
2973 f = lambda fn: fn
2974 if ui.configbool('ui', 'slash') and os.sep != '/':
2974 if ui.configbool('ui', 'slash') and os.sep != '/':
2975 f = lambda fn: util.normpath(fn)
2975 f = lambda fn: util.normpath(fn)
2976 fmt = 'f %%-%ds %%-%ds %%s' % (
2976 fmt = 'f %%-%ds %%-%ds %%s' % (
2977 max([len(abs) for abs in items]),
2977 max([len(abs) for abs in items]),
2978 max([len(m.rel(abs)) for abs in items]))
2978 max([len(m.rel(abs)) for abs in items]))
2979 for abs in items:
2979 for abs in items:
2980 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
2980 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
2981 ui.write("%s\n" % line.rstrip())
2981 ui.write("%s\n" % line.rstrip())
2982
2982
2983 @command('debugwireargs',
2983 @command('debugwireargs',
2984 [('', 'three', '', 'three'),
2984 [('', 'three', '', 'three'),
2985 ('', 'four', '', 'four'),
2985 ('', 'four', '', 'four'),
2986 ('', 'five', '', 'five'),
2986 ('', 'five', '', 'five'),
2987 ] + remoteopts,
2987 ] + remoteopts,
2988 _('REPO [OPTIONS]... [ONE [TWO]]'),
2988 _('REPO [OPTIONS]... [ONE [TWO]]'),
2989 norepo=True)
2989 norepo=True)
2990 def debugwireargs(ui, repopath, *vals, **opts):
2990 def debugwireargs(ui, repopath, *vals, **opts):
2991 repo = hg.peer(ui, opts, repopath)
2991 repo = hg.peer(ui, opts, repopath)
2992 for opt in remoteopts:
2992 for opt in remoteopts:
2993 del opts[opt[1]]
2993 del opts[opt[1]]
2994 args = {}
2994 args = {}
2995 for k, v in opts.iteritems():
2995 for k, v in opts.iteritems():
2996 if v:
2996 if v:
2997 args[k] = v
2997 args[k] = v
2998 # run twice to check that we don't mess up the stream for the next command
2998 # run twice to check that we don't mess up the stream for the next command
2999 res1 = repo.debugwireargs(*vals, **args)
2999 res1 = repo.debugwireargs(*vals, **args)
3000 res2 = repo.debugwireargs(*vals, **args)
3000 res2 = repo.debugwireargs(*vals, **args)
3001 ui.write("%s\n" % res1)
3001 ui.write("%s\n" % res1)
3002 if res1 != res2:
3002 if res1 != res2:
3003 ui.warn("%s\n" % res2)
3003 ui.warn("%s\n" % res2)
3004
3004
3005 @command('^diff',
3005 @command('^diff',
3006 [('r', 'rev', [], _('revision'), _('REV')),
3006 [('r', 'rev', [], _('revision'), _('REV')),
3007 ('c', 'change', '', _('change made by revision'), _('REV'))
3007 ('c', 'change', '', _('change made by revision'), _('REV'))
3008 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3008 ] + diffopts + diffopts2 + walkopts + subrepoopts,
3009 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3009 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
3010 inferrepo=True)
3010 inferrepo=True)
3011 def diff(ui, repo, *pats, **opts):
3011 def diff(ui, repo, *pats, **opts):
3012 """diff repository (or selected files)
3012 """diff repository (or selected files)
3013
3013
3014 Show differences between revisions for the specified files.
3014 Show differences between revisions for the specified files.
3015
3015
3016 Differences between files are shown using the unified diff format.
3016 Differences between files are shown using the unified diff format.
3017
3017
3018 .. note::
3018 .. note::
3019
3019
3020 diff may generate unexpected results for merges, as it will
3020 diff may generate unexpected results for merges, as it will
3021 default to comparing against the working directory's first
3021 default to comparing against the working directory's first
3022 parent changeset if no revisions are specified.
3022 parent changeset if no revisions are specified.
3023
3023
3024 When two revision arguments are given, then changes are shown
3024 When two revision arguments are given, then changes are shown
3025 between those revisions. If only one revision is specified then
3025 between those revisions. If only one revision is specified then
3026 that revision is compared to the working directory, and, when no
3026 that revision is compared to the working directory, and, when no
3027 revisions are specified, the working directory files are compared
3027 revisions are specified, the working directory files are compared
3028 to its parent.
3028 to its parent.
3029
3029
3030 Alternatively you can specify -c/--change with a revision to see
3030 Alternatively you can specify -c/--change with a revision to see
3031 the changes in that changeset relative to its first parent.
3031 the changes in that changeset relative to its first parent.
3032
3032
3033 Without the -a/--text option, diff will avoid generating diffs of
3033 Without the -a/--text option, diff will avoid generating diffs of
3034 files it detects as binary. With -a, diff will generate a diff
3034 files it detects as binary. With -a, diff will generate a diff
3035 anyway, probably with undesirable results.
3035 anyway, probably with undesirable results.
3036
3036
3037 Use the -g/--git option to generate diffs in the git extended diff
3037 Use the -g/--git option to generate diffs in the git extended diff
3038 format. For more information, read :hg:`help diffs`.
3038 format. For more information, read :hg:`help diffs`.
3039
3039
3040 .. container:: verbose
3040 .. container:: verbose
3041
3041
3042 Examples:
3042 Examples:
3043
3043
3044 - compare a file in the current working directory to its parent::
3044 - compare a file in the current working directory to its parent::
3045
3045
3046 hg diff foo.c
3046 hg diff foo.c
3047
3047
3048 - compare two historical versions of a directory, with rename info::
3048 - compare two historical versions of a directory, with rename info::
3049
3049
3050 hg diff --git -r 1.0:1.2 lib/
3050 hg diff --git -r 1.0:1.2 lib/
3051
3051
3052 - get change stats relative to the last change on some date::
3052 - get change stats relative to the last change on some date::
3053
3053
3054 hg diff --stat -r "date('may 2')"
3054 hg diff --stat -r "date('may 2')"
3055
3055
3056 - diff all newly-added files that contain a keyword::
3056 - diff all newly-added files that contain a keyword::
3057
3057
3058 hg diff "set:added() and grep(GNU)"
3058 hg diff "set:added() and grep(GNU)"
3059
3059
3060 - compare a revision and its parents::
3060 - compare a revision and its parents::
3061
3061
3062 hg diff -c 9353 # compare against first parent
3062 hg diff -c 9353 # compare against first parent
3063 hg diff -r 9353^:9353 # same using revset syntax
3063 hg diff -r 9353^:9353 # same using revset syntax
3064 hg diff -r 9353^2:9353 # compare against the second parent
3064 hg diff -r 9353^2:9353 # compare against the second parent
3065
3065
3066 Returns 0 on success.
3066 Returns 0 on success.
3067 """
3067 """
3068
3068
3069 revs = opts.get('rev')
3069 revs = opts.get('rev')
3070 change = opts.get('change')
3070 change = opts.get('change')
3071 stat = opts.get('stat')
3071 stat = opts.get('stat')
3072 reverse = opts.get('reverse')
3072 reverse = opts.get('reverse')
3073
3073
3074 if revs and change:
3074 if revs and change:
3075 msg = _('cannot specify --rev and --change at the same time')
3075 msg = _('cannot specify --rev and --change at the same time')
3076 raise util.Abort(msg)
3076 raise util.Abort(msg)
3077 elif change:
3077 elif change:
3078 node2 = scmutil.revsingle(repo, change, None).node()
3078 node2 = scmutil.revsingle(repo, change, None).node()
3079 node1 = repo[node2].p1().node()
3079 node1 = repo[node2].p1().node()
3080 else:
3080 else:
3081 node1, node2 = scmutil.revpair(repo, revs)
3081 node1, node2 = scmutil.revpair(repo, revs)
3082
3082
3083 if reverse:
3083 if reverse:
3084 node1, node2 = node2, node1
3084 node1, node2 = node2, node1
3085
3085
3086 diffopts = patch.diffopts(ui, opts)
3086 diffopts = patch.diffopts(ui, opts)
3087 m = scmutil.match(repo[node2], pats, opts)
3087 m = scmutil.match(repo[node2], pats, opts)
3088 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3088 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
3089 listsubrepos=opts.get('subrepos'))
3089 listsubrepos=opts.get('subrepos'))
3090
3090
3091 @command('^export',
3091 @command('^export',
3092 [('o', 'output', '',
3092 [('o', 'output', '',
3093 _('print output to file with formatted name'), _('FORMAT')),
3093 _('print output to file with formatted name'), _('FORMAT')),
3094 ('', 'switch-parent', None, _('diff against the second parent')),
3094 ('', 'switch-parent', None, _('diff against the second parent')),
3095 ('r', 'rev', [], _('revisions to export'), _('REV')),
3095 ('r', 'rev', [], _('revisions to export'), _('REV')),
3096 ] + diffopts,
3096 ] + diffopts,
3097 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3097 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
3098 def export(ui, repo, *changesets, **opts):
3098 def export(ui, repo, *changesets, **opts):
3099 """dump the header and diffs for one or more changesets
3099 """dump the header and diffs for one or more changesets
3100
3100
3101 Print the changeset header and diffs for one or more revisions.
3101 Print the changeset header and diffs for one or more revisions.
3102 If no revision is given, the parent of the working directory is used.
3102 If no revision is given, the parent of the working directory is used.
3103
3103
3104 The information shown in the changeset header is: author, date,
3104 The information shown in the changeset header is: author, date,
3105 branch name (if non-default), changeset hash, parent(s) and commit
3105 branch name (if non-default), changeset hash, parent(s) and commit
3106 comment.
3106 comment.
3107
3107
3108 .. note::
3108 .. note::
3109
3109
3110 export may generate unexpected diff output for merge
3110 export may generate unexpected diff output for merge
3111 changesets, as it will compare the merge changeset against its
3111 changesets, as it will compare the merge changeset against its
3112 first parent only.
3112 first parent only.
3113
3113
3114 Output may be to a file, in which case the name of the file is
3114 Output may be to a file, in which case the name of the file is
3115 given using a format string. The formatting rules are as follows:
3115 given using a format string. The formatting rules are as follows:
3116
3116
3117 :``%%``: literal "%" character
3117 :``%%``: literal "%" character
3118 :``%H``: changeset hash (40 hexadecimal digits)
3118 :``%H``: changeset hash (40 hexadecimal digits)
3119 :``%N``: number of patches being generated
3119 :``%N``: number of patches being generated
3120 :``%R``: changeset revision number
3120 :``%R``: changeset revision number
3121 :``%b``: basename of the exporting repository
3121 :``%b``: basename of the exporting repository
3122 :``%h``: short-form changeset hash (12 hexadecimal digits)
3122 :``%h``: short-form changeset hash (12 hexadecimal digits)
3123 :``%m``: first line of the commit message (only alphanumeric characters)
3123 :``%m``: first line of the commit message (only alphanumeric characters)
3124 :``%n``: zero-padded sequence number, starting at 1
3124 :``%n``: zero-padded sequence number, starting at 1
3125 :``%r``: zero-padded changeset revision number
3125 :``%r``: zero-padded changeset revision number
3126
3126
3127 Without the -a/--text option, export will avoid generating diffs
3127 Without the -a/--text option, export will avoid generating diffs
3128 of files it detects as binary. With -a, export will generate a
3128 of files it detects as binary. With -a, export will generate a
3129 diff anyway, probably with undesirable results.
3129 diff anyway, probably with undesirable results.
3130
3130
3131 Use the -g/--git option to generate diffs in the git extended diff
3131 Use the -g/--git option to generate diffs in the git extended diff
3132 format. See :hg:`help diffs` for more information.
3132 format. See :hg:`help diffs` for more information.
3133
3133
3134 With the --switch-parent option, the diff will be against the
3134 With the --switch-parent option, the diff will be against the
3135 second parent. It can be useful to review a merge.
3135 second parent. It can be useful to review a merge.
3136
3136
3137 .. container:: verbose
3137 .. container:: verbose
3138
3138
3139 Examples:
3139 Examples:
3140
3140
3141 - use export and import to transplant a bugfix to the current
3141 - use export and import to transplant a bugfix to the current
3142 branch::
3142 branch::
3143
3143
3144 hg export -r 9353 | hg import -
3144 hg export -r 9353 | hg import -
3145
3145
3146 - export all the changesets between two revisions to a file with
3146 - export all the changesets between two revisions to a file with
3147 rename information::
3147 rename information::
3148
3148
3149 hg export --git -r 123:150 > changes.txt
3149 hg export --git -r 123:150 > changes.txt
3150
3150
3151 - split outgoing changes into a series of patches with
3151 - split outgoing changes into a series of patches with
3152 descriptive names::
3152 descriptive names::
3153
3153
3154 hg export -r "outgoing()" -o "%n-%m.patch"
3154 hg export -r "outgoing()" -o "%n-%m.patch"
3155
3155
3156 Returns 0 on success.
3156 Returns 0 on success.
3157 """
3157 """
3158 changesets += tuple(opts.get('rev', []))
3158 changesets += tuple(opts.get('rev', []))
3159 if not changesets:
3159 if not changesets:
3160 changesets = ['.']
3160 changesets = ['.']
3161 revs = scmutil.revrange(repo, changesets)
3161 revs = scmutil.revrange(repo, changesets)
3162 if not revs:
3162 if not revs:
3163 raise util.Abort(_("export requires at least one changeset"))
3163 raise util.Abort(_("export requires at least one changeset"))
3164 if len(revs) > 1:
3164 if len(revs) > 1:
3165 ui.note(_('exporting patches:\n'))
3165 ui.note(_('exporting patches:\n'))
3166 else:
3166 else:
3167 ui.note(_('exporting patch:\n'))
3167 ui.note(_('exporting patch:\n'))
3168 cmdutil.export(repo, revs, template=opts.get('output'),
3168 cmdutil.export(repo, revs, template=opts.get('output'),
3169 switch_parent=opts.get('switch_parent'),
3169 switch_parent=opts.get('switch_parent'),
3170 opts=patch.diffopts(ui, opts))
3170 opts=patch.diffopts(ui, opts))
3171
3171
3172 @command('files',
3172 @command('files',
3173 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3173 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3174 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3174 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3175 ] + walkopts + formatteropts,
3175 ] + walkopts + formatteropts,
3176 _('[OPTION]... [PATTERN]...'))
3176 _('[OPTION]... [PATTERN]...'))
3177 def files(ui, repo, *pats, **opts):
3177 def files(ui, repo, *pats, **opts):
3178 """list tracked files
3178 """list tracked files
3179
3179
3180 Print files under Mercurial control in the working directory or
3180 Print files under Mercurial control in the working directory or
3181 specified revision whose names match the given patterns (excluding
3181 specified revision whose names match the given patterns (excluding
3182 removed files).
3182 removed files).
3183
3183
3184 If no patterns are given to match, this command prints the names
3184 If no patterns are given to match, this command prints the names
3185 of all files under Mercurial control in the working copy.
3185 of all files under Mercurial control in the working copy.
3186
3186
3187 .. container:: verbose
3187 .. container:: verbose
3188
3188
3189 Examples:
3189 Examples:
3190
3190
3191 - list all files under the current directory::
3191 - list all files under the current directory::
3192
3192
3193 hg files .
3193 hg files .
3194
3194
3195 - shows sizes and flags for current revision::
3195 - shows sizes and flags for current revision::
3196
3196
3197 hg files -vr .
3197 hg files -vr .
3198
3198
3199 - list all files named README::
3199 - list all files named README::
3200
3200
3201 hg files -I "**/README"
3201 hg files -I "**/README"
3202
3202
3203 - list all binary files::
3203 - list all binary files::
3204
3204
3205 hg files "set:binary()"
3205 hg files "set:binary()"
3206
3206
3207 - find files containing a regular expression:
3207 - find files containing a regular expression:
3208
3208
3209 hg files "set:grep('bob')"
3209 hg files "set:grep('bob')"
3210
3210
3211 - search tracked file contents with xargs and grep::
3211 - search tracked file contents with xargs and grep::
3212
3212
3213 hg files -0 | xargs -0 grep foo
3213 hg files -0 | xargs -0 grep foo
3214
3214
3215 See :hg:'help pattern' and :hg:'help revsets' for more information
3215 See :hg:'help pattern' and :hg:'help revsets' for more information
3216 on specifying file patterns.
3216 on specifying file patterns.
3217
3217
3218 Returns 0 if a match is found, 1 otherwise.
3218 Returns 0 if a match is found, 1 otherwise.
3219
3219
3220 """
3220 """
3221 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3221 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
3222 rev = ctx.rev()
3222 rev = ctx.rev()
3223 ret = 1
3223 ret = 1
3224
3224
3225 end = '\n'
3225 end = '\n'
3226 if opts.get('print0'):
3226 if opts.get('print0'):
3227 end = '\0'
3227 end = '\0'
3228 fm = ui.formatter('files', opts)
3228 fm = ui.formatter('files', opts)
3229 fmt = '%s' + end
3229 fmt = '%s' + end
3230
3230
3231 m = scmutil.match(ctx, pats, opts)
3231 m = scmutil.match(ctx, pats, opts)
3232 ds = repo.dirstate
3232 ds = repo.dirstate
3233 for f in ctx.matches(m):
3233 for f in ctx.matches(m):
3234 if rev is None and ds[f] == 'r':
3234 if rev is None and ds[f] == 'r':
3235 continue
3235 continue
3236 fm.startitem()
3236 fm.startitem()
3237 if ui.verbose:
3237 if ui.verbose:
3238 fc = ctx[f]
3238 fc = ctx[f]
3239 fm.write('size flags', '% 10d % 1s ', fc.size(), fc.flags())
3239 fm.write('size flags', '% 10d % 1s ', fc.size(), fc.flags())
3240 fm.data(abspath=f)
3240 fm.data(abspath=f)
3241 fm.write('path', fmt, m.rel(f))
3241 fm.write('path', fmt, m.rel(f))
3242 ret = 0
3242 ret = 0
3243
3243
3244 fm.end()
3244 fm.end()
3245
3245
3246 return ret
3246 return ret
3247
3247
3248 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3248 @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True)
3249 def forget(ui, repo, *pats, **opts):
3249 def forget(ui, repo, *pats, **opts):
3250 """forget the specified files on the next commit
3250 """forget the specified files on the next commit
3251
3251
3252 Mark the specified files so they will no longer be tracked
3252 Mark the specified files so they will no longer be tracked
3253 after the next commit.
3253 after the next commit.
3254
3254
3255 This only removes files from the current branch, not from the
3255 This only removes files from the current branch, not from the
3256 entire project history, and it does not delete them from the
3256 entire project history, and it does not delete them from the
3257 working directory.
3257 working directory.
3258
3258
3259 To undo a forget before the next commit, see :hg:`add`.
3259 To undo a forget before the next commit, see :hg:`add`.
3260
3260
3261 .. container:: verbose
3261 .. container:: verbose
3262
3262
3263 Examples:
3263 Examples:
3264
3264
3265 - forget newly-added binary files::
3265 - forget newly-added binary files::
3266
3266
3267 hg forget "set:added() and binary()"
3267 hg forget "set:added() and binary()"
3268
3268
3269 - forget files that would be excluded by .hgignore::
3269 - forget files that would be excluded by .hgignore::
3270
3270
3271 hg forget "set:hgignore()"
3271 hg forget "set:hgignore()"
3272
3272
3273 Returns 0 on success.
3273 Returns 0 on success.
3274 """
3274 """
3275
3275
3276 if not pats:
3276 if not pats:
3277 raise util.Abort(_('no files specified'))
3277 raise util.Abort(_('no files specified'))
3278
3278
3279 m = scmutil.match(repo[None], pats, opts)
3279 m = scmutil.match(repo[None], pats, opts)
3280 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
3280 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
3281 return rejected and 1 or 0
3281 return rejected and 1 or 0
3282
3282
3283 @command(
3283 @command(
3284 'graft',
3284 'graft',
3285 [('r', 'rev', [], _('revisions to graft'), _('REV')),
3285 [('r', 'rev', [], _('revisions to graft'), _('REV')),
3286 ('c', 'continue', False, _('resume interrupted graft')),
3286 ('c', 'continue', False, _('resume interrupted graft')),
3287 ('e', 'edit', False, _('invoke editor on commit messages')),
3287 ('e', 'edit', False, _('invoke editor on commit messages')),
3288 ('', 'log', None, _('append graft info to log message')),
3288 ('', 'log', None, _('append graft info to log message')),
3289 ('f', 'force', False, _('force graft')),
3289 ('f', 'force', False, _('force graft')),
3290 ('D', 'currentdate', False,
3290 ('D', 'currentdate', False,
3291 _('record the current date as commit date')),
3291 _('record the current date as commit date')),
3292 ('U', 'currentuser', False,
3292 ('U', 'currentuser', False,
3293 _('record the current user as committer'), _('DATE'))]
3293 _('record the current user as committer'), _('DATE'))]
3294 + commitopts2 + mergetoolopts + dryrunopts,
3294 + commitopts2 + mergetoolopts + dryrunopts,
3295 _('[OPTION]... [-r] REV...'))
3295 _('[OPTION]... [-r] REV...'))
3296 def graft(ui, repo, *revs, **opts):
3296 def graft(ui, repo, *revs, **opts):
3297 '''copy changes from other branches onto the current branch
3297 '''copy changes from other branches onto the current branch
3298
3298
3299 This command uses Mercurial's merge logic to copy individual
3299 This command uses Mercurial's merge logic to copy individual
3300 changes from other branches without merging branches in the
3300 changes from other branches without merging branches in the
3301 history graph. This is sometimes known as 'backporting' or
3301 history graph. This is sometimes known as 'backporting' or
3302 'cherry-picking'. By default, graft will copy user, date, and
3302 'cherry-picking'. By default, graft will copy user, date, and
3303 description from the source changesets.
3303 description from the source changesets.
3304
3304
3305 Changesets that are ancestors of the current revision, that have
3305 Changesets that are ancestors of the current revision, that have
3306 already been grafted, or that are merges will be skipped.
3306 already been grafted, or that are merges will be skipped.
3307
3307
3308 If --log is specified, log messages will have a comment appended
3308 If --log is specified, log messages will have a comment appended
3309 of the form::
3309 of the form::
3310
3310
3311 (grafted from CHANGESETHASH)
3311 (grafted from CHANGESETHASH)
3312
3312
3313 If --force is specified, revisions will be grafted even if they
3313 If --force is specified, revisions will be grafted even if they
3314 are already ancestors of or have been grafted to the destination.
3314 are already ancestors of or have been grafted to the destination.
3315 This is useful when the revisions have since been backed out.
3315 This is useful when the revisions have since been backed out.
3316
3316
3317 If a graft merge results in conflicts, the graft process is
3317 If a graft merge results in conflicts, the graft process is
3318 interrupted so that the current merge can be manually resolved.
3318 interrupted so that the current merge can be manually resolved.
3319 Once all conflicts are addressed, the graft process can be
3319 Once all conflicts are addressed, the graft process can be
3320 continued with the -c/--continue option.
3320 continued with the -c/--continue option.
3321
3321
3322 .. note::
3322 .. note::
3323
3323
3324 The -c/--continue option does not reapply earlier options, except
3324 The -c/--continue option does not reapply earlier options, except
3325 for --force.
3325 for --force.
3326
3326
3327 .. container:: verbose
3327 .. container:: verbose
3328
3328
3329 Examples:
3329 Examples:
3330
3330
3331 - copy a single change to the stable branch and edit its description::
3331 - copy a single change to the stable branch and edit its description::
3332
3332
3333 hg update stable
3333 hg update stable
3334 hg graft --edit 9393
3334 hg graft --edit 9393
3335
3335
3336 - graft a range of changesets with one exception, updating dates::
3336 - graft a range of changesets with one exception, updating dates::
3337
3337
3338 hg graft -D "2085::2093 and not 2091"
3338 hg graft -D "2085::2093 and not 2091"
3339
3339
3340 - continue a graft after resolving conflicts::
3340 - continue a graft after resolving conflicts::
3341
3341
3342 hg graft -c
3342 hg graft -c
3343
3343
3344 - show the source of a grafted changeset::
3344 - show the source of a grafted changeset::
3345
3345
3346 hg log --debug -r .
3346 hg log --debug -r .
3347
3347
3348 See :hg:`help revisions` and :hg:`help revsets` for more about
3348 See :hg:`help revisions` and :hg:`help revsets` for more about
3349 specifying revisions.
3349 specifying revisions.
3350
3350
3351 Returns 0 on successful completion.
3351 Returns 0 on successful completion.
3352 '''
3352 '''
3353
3353
3354 revs = list(revs)
3354 revs = list(revs)
3355 revs.extend(opts['rev'])
3355 revs.extend(opts['rev'])
3356
3356
3357 if not opts.get('user') and opts.get('currentuser'):
3357 if not opts.get('user') and opts.get('currentuser'):
3358 opts['user'] = ui.username()
3358 opts['user'] = ui.username()
3359 if not opts.get('date') and opts.get('currentdate'):
3359 if not opts.get('date') and opts.get('currentdate'):
3360 opts['date'] = "%d %d" % util.makedate()
3360 opts['date'] = "%d %d" % util.makedate()
3361
3361
3362 editor = cmdutil.getcommiteditor(editform='graft', **opts)
3362 editor = cmdutil.getcommiteditor(editform='graft', **opts)
3363
3363
3364 cont = False
3364 cont = False
3365 if opts['continue']:
3365 if opts['continue']:
3366 cont = True
3366 cont = True
3367 if revs:
3367 if revs:
3368 raise util.Abort(_("can't specify --continue and revisions"))
3368 raise util.Abort(_("can't specify --continue and revisions"))
3369 # read in unfinished revisions
3369 # read in unfinished revisions
3370 try:
3370 try:
3371 nodes = repo.opener.read('graftstate').splitlines()
3371 nodes = repo.opener.read('graftstate').splitlines()
3372 revs = [repo[node].rev() for node in nodes]
3372 revs = [repo[node].rev() for node in nodes]
3373 except IOError, inst:
3373 except IOError, inst:
3374 if inst.errno != errno.ENOENT:
3374 if inst.errno != errno.ENOENT:
3375 raise
3375 raise
3376 raise util.Abort(_("no graft state found, can't continue"))
3376 raise util.Abort(_("no graft state found, can't continue"))
3377 else:
3377 else:
3378 cmdutil.checkunfinished(repo)
3378 cmdutil.checkunfinished(repo)
3379 cmdutil.bailifchanged(repo)
3379 cmdutil.bailifchanged(repo)
3380 if not revs:
3380 if not revs:
3381 raise util.Abort(_('no revisions specified'))
3381 raise util.Abort(_('no revisions specified'))
3382 revs = scmutil.revrange(repo, revs)
3382 revs = scmutil.revrange(repo, revs)
3383
3383
3384 skipped = set()
3384 skipped = set()
3385 # check for merges
3385 # check for merges
3386 for rev in repo.revs('%ld and merge()', revs):
3386 for rev in repo.revs('%ld and merge()', revs):
3387 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
3387 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
3388 skipped.add(rev)
3388 skipped.add(rev)
3389 revs = [r for r in revs if r not in skipped]
3389 revs = [r for r in revs if r not in skipped]
3390 if not revs:
3390 if not revs:
3391 return -1
3391 return -1
3392
3392
3393 # Don't check in the --continue case, in effect retaining --force across
3393 # Don't check in the --continue case, in effect retaining --force across
3394 # --continues. That's because without --force, any revisions we decided to
3394 # --continues. That's because without --force, any revisions we decided to
3395 # skip would have been filtered out here, so they wouldn't have made their
3395 # skip would have been filtered out here, so they wouldn't have made their
3396 # way to the graftstate. With --force, any revisions we would have otherwise
3396 # way to the graftstate. With --force, any revisions we would have otherwise
3397 # skipped would not have been filtered out, and if they hadn't been applied
3397 # skipped would not have been filtered out, and if they hadn't been applied
3398 # already, they'd have been in the graftstate.
3398 # already, they'd have been in the graftstate.
3399 if not (cont or opts.get('force')):
3399 if not (cont or opts.get('force')):
3400 # check for ancestors of dest branch
3400 # check for ancestors of dest branch
3401 crev = repo['.'].rev()
3401 crev = repo['.'].rev()
3402 ancestors = repo.changelog.ancestors([crev], inclusive=True)
3402 ancestors = repo.changelog.ancestors([crev], inclusive=True)
3403 # Cannot use x.remove(y) on smart set, this has to be a list.
3403 # Cannot use x.remove(y) on smart set, this has to be a list.
3404 # XXX make this lazy in the future
3404 # XXX make this lazy in the future
3405 revs = list(revs)
3405 revs = list(revs)
3406 # don't mutate while iterating, create a copy
3406 # don't mutate while iterating, create a copy
3407 for rev in list(revs):
3407 for rev in list(revs):
3408 if rev in ancestors:
3408 if rev in ancestors:
3409 ui.warn(_('skipping ancestor revision %s\n') % rev)
3409 ui.warn(_('skipping ancestor revision %s\n') % rev)
3410 # XXX remove on list is slow
3410 # XXX remove on list is slow
3411 revs.remove(rev)
3411 revs.remove(rev)
3412 if not revs:
3412 if not revs:
3413 return -1
3413 return -1
3414
3414
3415 # analyze revs for earlier grafts
3415 # analyze revs for earlier grafts
3416 ids = {}
3416 ids = {}
3417 for ctx in repo.set("%ld", revs):
3417 for ctx in repo.set("%ld", revs):
3418 ids[ctx.hex()] = ctx.rev()
3418 ids[ctx.hex()] = ctx.rev()
3419 n = ctx.extra().get('source')
3419 n = ctx.extra().get('source')
3420 if n:
3420 if n:
3421 ids[n] = ctx.rev()
3421 ids[n] = ctx.rev()
3422
3422
3423 # check ancestors for earlier grafts
3423 # check ancestors for earlier grafts
3424 ui.debug('scanning for duplicate grafts\n')
3424 ui.debug('scanning for duplicate grafts\n')
3425
3425
3426 for rev in repo.changelog.findmissingrevs(revs, [crev]):
3426 for rev in repo.changelog.findmissingrevs(revs, [crev]):
3427 ctx = repo[rev]
3427 ctx = repo[rev]
3428 n = ctx.extra().get('source')
3428 n = ctx.extra().get('source')
3429 if n in ids:
3429 if n in ids:
3430 try:
3430 try:
3431 r = repo[n].rev()
3431 r = repo[n].rev()
3432 except error.RepoLookupError:
3432 except error.RepoLookupError:
3433 r = None
3433 r = None
3434 if r in revs:
3434 if r in revs:
3435 ui.warn(_('skipping revision %s (already grafted to %s)\n')
3435 ui.warn(_('skipping revision %s (already grafted to %s)\n')
3436 % (r, rev))
3436 % (r, rev))
3437 revs.remove(r)
3437 revs.remove(r)
3438 elif ids[n] in revs:
3438 elif ids[n] in revs:
3439 if r is None:
3439 if r is None:
3440 ui.warn(_('skipping already grafted revision %s '
3440 ui.warn(_('skipping already grafted revision %s '
3441 '(%s also has unknown origin %s)\n')
3441 '(%s also has unknown origin %s)\n')
3442 % (ids[n], rev, n))
3442 % (ids[n], rev, n))
3443 else:
3443 else:
3444 ui.warn(_('skipping already grafted revision %s '
3444 ui.warn(_('skipping already grafted revision %s '
3445 '(%s also has origin %d)\n')
3445 '(%s also has origin %d)\n')
3446 % (ids[n], rev, r))
3446 % (ids[n], rev, r))
3447 revs.remove(ids[n])
3447 revs.remove(ids[n])
3448 elif ctx.hex() in ids:
3448 elif ctx.hex() in ids:
3449 r = ids[ctx.hex()]
3449 r = ids[ctx.hex()]
3450 ui.warn(_('skipping already grafted revision %s '
3450 ui.warn(_('skipping already grafted revision %s '
3451 '(was grafted from %d)\n') % (r, rev))
3451 '(was grafted from %d)\n') % (r, rev))
3452 revs.remove(r)
3452 revs.remove(r)
3453 if not revs:
3453 if not revs:
3454 return -1
3454 return -1
3455
3455
3456 wlock = repo.wlock()
3456 wlock = repo.wlock()
3457 try:
3457 try:
3458 for pos, ctx in enumerate(repo.set("%ld", revs)):
3458 for pos, ctx in enumerate(repo.set("%ld", revs)):
3459
3459
3460 ui.status(_('grafting revision %s\n') % ctx.rev())
3460 ui.status(_('grafting revision %s\n') % ctx.rev())
3461 if opts.get('dry_run'):
3461 if opts.get('dry_run'):
3462 continue
3462 continue
3463
3463
3464 source = ctx.extra().get('source')
3464 source = ctx.extra().get('source')
3465 if not source:
3465 if not source:
3466 source = ctx.hex()
3466 source = ctx.hex()
3467 extra = {'source': source}
3467 extra = {'source': source}
3468 user = ctx.user()
3468 user = ctx.user()
3469 if opts.get('user'):
3469 if opts.get('user'):
3470 user = opts['user']
3470 user = opts['user']
3471 date = ctx.date()
3471 date = ctx.date()
3472 if opts.get('date'):
3472 if opts.get('date'):
3473 date = opts['date']
3473 date = opts['date']
3474 message = ctx.description()
3474 message = ctx.description()
3475 if opts.get('log'):
3475 if opts.get('log'):
3476 message += '\n(grafted from %s)' % ctx.hex()
3476 message += '\n(grafted from %s)' % ctx.hex()
3477
3477
3478 # we don't merge the first commit when continuing
3478 # we don't merge the first commit when continuing
3479 if not cont:
3479 if not cont:
3480 # perform the graft merge with p1(rev) as 'ancestor'
3480 # perform the graft merge with p1(rev) as 'ancestor'
3481 try:
3481 try:
3482 # ui.forcemerge is an internal variable, do not document
3482 # ui.forcemerge is an internal variable, do not document
3483 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
3483 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
3484 'graft')
3484 'graft')
3485 stats = mergemod.graft(repo, ctx, ctx.p1(),
3485 stats = mergemod.graft(repo, ctx, ctx.p1(),
3486 ['local', 'graft'])
3486 ['local', 'graft'])
3487 finally:
3487 finally:
3488 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
3488 repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
3489 # report any conflicts
3489 # report any conflicts
3490 if stats and stats[3] > 0:
3490 if stats and stats[3] > 0:
3491 # write out state for --continue
3491 # write out state for --continue
3492 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
3492 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
3493 repo.opener.write('graftstate', ''.join(nodelines))
3493 repo.opener.write('graftstate', ''.join(nodelines))
3494 raise util.Abort(
3494 raise util.Abort(
3495 _("unresolved conflicts, can't continue"),
3495 _("unresolved conflicts, can't continue"),
3496 hint=_('use hg resolve and hg graft --continue'))
3496 hint=_('use hg resolve and hg graft --continue'))
3497 else:
3497 else:
3498 cont = False
3498 cont = False
3499
3499
3500 # commit
3500 # commit
3501 node = repo.commit(text=message, user=user,
3501 node = repo.commit(text=message, user=user,
3502 date=date, extra=extra, editor=editor)
3502 date=date, extra=extra, editor=editor)
3503 if node is None:
3503 if node is None:
3504 ui.status(_('graft for revision %s is empty\n') % ctx.rev())
3504 ui.status(_('graft for revision %s is empty\n') % ctx.rev())
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 # moving revision from public to draft may hide them
4847 # moving revision from public to draft may hide them
4848 # We have to check result on an unfiltered repository
4848 # We have to check result on an unfiltered repository
4849 unfi = repo.unfiltered()
4849 unfi = repo.unfiltered()
4850 getphase = unfi._phasecache.phase
4850 getphase = unfi._phasecache.phase
4851 olddata = [getphase(unfi, r) for r in unfi]
4851 olddata = [getphase(unfi, r) for r in unfi]
4852 phases.advanceboundary(repo, tr, targetphase, nodes)
4852 phases.advanceboundary(repo, tr, targetphase, nodes)
4853 if opts['force']:
4853 if opts['force']:
4854 phases.retractboundary(repo, tr, targetphase, nodes)
4854 phases.retractboundary(repo, tr, targetphase, nodes)
4855 tr.close()
4855 tr.close()
4856 finally:
4856 finally:
4857 if tr is not None:
4857 if tr is not None:
4858 tr.release()
4858 tr.release()
4859 lock.release()
4859 lock.release()
4860 getphase = unfi._phasecache.phase
4860 getphase = unfi._phasecache.phase
4861 newdata = [getphase(unfi, r) for r in unfi]
4861 newdata = [getphase(unfi, r) for r in unfi]
4862 changes = sum(newdata[r] != olddata[r] for r in unfi)
4862 changes = sum(newdata[r] != olddata[r] for r in unfi)
4863 cl = unfi.changelog
4863 cl = unfi.changelog
4864 rejected = [n for n in nodes
4864 rejected = [n for n in nodes
4865 if newdata[cl.rev(n)] < targetphase]
4865 if newdata[cl.rev(n)] < targetphase]
4866 if rejected:
4866 if rejected:
4867 ui.warn(_('cannot move %i changesets to a higher '
4867 ui.warn(_('cannot move %i changesets to a higher '
4868 'phase, use --force\n') % len(rejected))
4868 'phase, use --force\n') % len(rejected))
4869 ret = 1
4869 ret = 1
4870 if changes:
4870 if changes:
4871 msg = _('phase changed for %i changesets\n') % changes
4871 msg = _('phase changed for %i changesets\n') % changes
4872 if ret:
4872 if ret:
4873 ui.status(msg)
4873 ui.status(msg)
4874 else:
4874 else:
4875 ui.note(msg)
4875 ui.note(msg)
4876 else:
4876 else:
4877 ui.warn(_('no phases changed\n'))
4877 ui.warn(_('no phases changed\n'))
4878 ret = 1
4878 ret = 1
4879 return ret
4879 return ret
4880
4880
4881 def postincoming(ui, repo, modheads, optupdate, checkout):
4881 def postincoming(ui, repo, modheads, optupdate, checkout):
4882 if modheads == 0:
4882 if modheads == 0:
4883 return
4883 return
4884 if optupdate:
4884 if optupdate:
4885 checkout, movemarkfrom = bookmarks.calculateupdate(ui, repo, checkout)
4885 checkout, movemarkfrom = bookmarks.calculateupdate(ui, repo, checkout)
4886 try:
4886 try:
4887 ret = hg.update(repo, checkout)
4887 ret = hg.update(repo, checkout)
4888 except util.Abort, inst:
4888 except util.Abort, inst:
4889 ui.warn(_("not updating: %s\n") % str(inst))
4889 ui.warn(_("not updating: %s\n") % str(inst))
4890 if inst.hint:
4890 if inst.hint:
4891 ui.warn(_("(%s)\n") % inst.hint)
4891 ui.warn(_("(%s)\n") % inst.hint)
4892 return 0
4892 return 0
4893 if not ret and not checkout:
4893 if not ret and not checkout:
4894 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
4894 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
4895 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
4895 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
4896 return ret
4896 return ret
4897 if modheads > 1:
4897 if modheads > 1:
4898 currentbranchheads = len(repo.branchheads())
4898 currentbranchheads = len(repo.branchheads())
4899 if currentbranchheads == modheads:
4899 if currentbranchheads == modheads:
4900 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4900 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4901 elif currentbranchheads > 1:
4901 elif currentbranchheads > 1:
4902 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
4902 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
4903 "merge)\n"))
4903 "merge)\n"))
4904 else:
4904 else:
4905 ui.status(_("(run 'hg heads' to see heads)\n"))
4905 ui.status(_("(run 'hg heads' to see heads)\n"))
4906 else:
4906 else:
4907 ui.status(_("(run 'hg update' to get a working copy)\n"))
4907 ui.status(_("(run 'hg update' to get a working copy)\n"))
4908
4908
4909 @command('^pull',
4909 @command('^pull',
4910 [('u', 'update', None,
4910 [('u', 'update', None,
4911 _('update to new branch head if changesets were pulled')),
4911 _('update to new branch head if changesets were pulled')),
4912 ('f', 'force', None, _('run even when remote repository is unrelated')),
4912 ('f', 'force', None, _('run even when remote repository is unrelated')),
4913 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4913 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4914 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4914 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4915 ('b', 'branch', [], _('a specific branch you would like to pull'),
4915 ('b', 'branch', [], _('a specific branch you would like to pull'),
4916 _('BRANCH')),
4916 _('BRANCH')),
4917 ] + remoteopts,
4917 ] + remoteopts,
4918 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4918 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4919 def pull(ui, repo, source="default", **opts):
4919 def pull(ui, repo, source="default", **opts):
4920 """pull changes from the specified source
4920 """pull changes from the specified source
4921
4921
4922 Pull changes from a remote repository to a local one.
4922 Pull changes from a remote repository to a local one.
4923
4923
4924 This finds all changes from the repository at the specified path
4924 This finds all changes from the repository at the specified path
4925 or URL and adds them to a local repository (the current one unless
4925 or URL and adds them to a local repository (the current one unless
4926 -R is specified). By default, this does not update the copy of the
4926 -R is specified). By default, this does not update the copy of the
4927 project in the working directory.
4927 project in the working directory.
4928
4928
4929 Use :hg:`incoming` if you want to see what would have been added
4929 Use :hg:`incoming` if you want to see what would have been added
4930 by a pull at the time you issued this command. If you then decide
4930 by a pull at the time you issued this command. If you then decide
4931 to add those changes to the repository, you should use :hg:`pull
4931 to add those changes to the repository, you should use :hg:`pull
4932 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4932 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4933
4933
4934 If SOURCE is omitted, the 'default' path will be used.
4934 If SOURCE is omitted, the 'default' path will be used.
4935 See :hg:`help urls` for more information.
4935 See :hg:`help urls` for more information.
4936
4936
4937 Returns 0 on success, 1 if an update had unresolved files.
4937 Returns 0 on success, 1 if an update had unresolved files.
4938 """
4938 """
4939 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4939 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4940 other = hg.peer(repo, opts, source)
4940 other = hg.peer(repo, opts, source)
4941 try:
4941 try:
4942 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4942 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4943 revs, checkout = hg.addbranchrevs(repo, other, branches,
4943 revs, checkout = hg.addbranchrevs(repo, other, branches,
4944 opts.get('rev'))
4944 opts.get('rev'))
4945
4945
4946 remotebookmarks = other.listkeys('bookmarks')
4946 remotebookmarks = other.listkeys('bookmarks')
4947
4947
4948 if opts.get('bookmark'):
4948 if opts.get('bookmark'):
4949 if not revs:
4949 if not revs:
4950 revs = []
4950 revs = []
4951 for b in opts['bookmark']:
4951 for b in opts['bookmark']:
4952 if b not in remotebookmarks:
4952 if b not in remotebookmarks:
4953 raise util.Abort(_('remote bookmark %s not found!') % b)
4953 raise util.Abort(_('remote bookmark %s not found!') % b)
4954 revs.append(remotebookmarks[b])
4954 revs.append(remotebookmarks[b])
4955
4955
4956 if revs:
4956 if revs:
4957 try:
4957 try:
4958 revs = [other.lookup(rev) for rev in revs]
4958 revs = [other.lookup(rev) for rev in revs]
4959 except error.CapabilityError:
4959 except error.CapabilityError:
4960 err = _("other repository doesn't support revision lookup, "
4960 err = _("other repository doesn't support revision lookup, "
4961 "so a rev cannot be specified.")
4961 "so a rev cannot be specified.")
4962 raise util.Abort(err)
4962 raise util.Abort(err)
4963
4963
4964 modheads = exchange.pull(repo, other, heads=revs,
4964 modheads = exchange.pull(repo, other, heads=revs,
4965 force=opts.get('force'),
4965 force=opts.get('force'),
4966 bookmarks=opts.get('bookmark', ())).cgresult
4966 bookmarks=opts.get('bookmark', ())).cgresult
4967 if checkout:
4967 if checkout:
4968 checkout = str(repo.changelog.rev(other.lookup(checkout)))
4968 checkout = str(repo.changelog.rev(other.lookup(checkout)))
4969 repo._subtoppath = source
4969 repo._subtoppath = source
4970 try:
4970 try:
4971 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
4971 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
4972
4972
4973 finally:
4973 finally:
4974 del repo._subtoppath
4974 del repo._subtoppath
4975
4975
4976 finally:
4976 finally:
4977 other.close()
4977 other.close()
4978 return ret
4978 return ret
4979
4979
4980 @command('^push',
4980 @command('^push',
4981 [('f', 'force', None, _('force push')),
4981 [('f', 'force', None, _('force push')),
4982 ('r', 'rev', [],
4982 ('r', 'rev', [],
4983 _('a changeset intended to be included in the destination'),
4983 _('a changeset intended to be included in the destination'),
4984 _('REV')),
4984 _('REV')),
4985 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4985 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4986 ('b', 'branch', [],
4986 ('b', 'branch', [],
4987 _('a specific branch you would like to push'), _('BRANCH')),
4987 _('a specific branch you would like to push'), _('BRANCH')),
4988 ('', 'new-branch', False, _('allow pushing a new branch')),
4988 ('', 'new-branch', False, _('allow pushing a new branch')),
4989 ] + remoteopts,
4989 ] + remoteopts,
4990 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4990 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4991 def push(ui, repo, dest=None, **opts):
4991 def push(ui, repo, dest=None, **opts):
4992 """push changes to the specified destination
4992 """push changes to the specified destination
4993
4993
4994 Push changesets from the local repository to the specified
4994 Push changesets from the local repository to the specified
4995 destination.
4995 destination.
4996
4996
4997 This operation is symmetrical to pull: it is identical to a pull
4997 This operation is symmetrical to pull: it is identical to a pull
4998 in the destination repository from the current one.
4998 in the destination repository from the current one.
4999
4999
5000 By default, push will not allow creation of new heads at the
5000 By default, push will not allow creation of new heads at the
5001 destination, since multiple heads would make it unclear which head
5001 destination, since multiple heads would make it unclear which head
5002 to use. In this situation, it is recommended to pull and merge
5002 to use. In this situation, it is recommended to pull and merge
5003 before pushing.
5003 before pushing.
5004
5004
5005 Use --new-branch if you want to allow push to create a new named
5005 Use --new-branch if you want to allow push to create a new named
5006 branch that is not present at the destination. This allows you to
5006 branch that is not present at the destination. This allows you to
5007 only create a new branch without forcing other changes.
5007 only create a new branch without forcing other changes.
5008
5008
5009 .. note::
5009 .. note::
5010
5010
5011 Extra care should be taken with the -f/--force option,
5011 Extra care should be taken with the -f/--force option,
5012 which will push all new heads on all branches, an action which will
5012 which will push all new heads on all branches, an action which will
5013 almost always cause confusion for collaborators.
5013 almost always cause confusion for collaborators.
5014
5014
5015 If -r/--rev is used, the specified revision and all its ancestors
5015 If -r/--rev is used, the specified revision and all its ancestors
5016 will be pushed to the remote repository.
5016 will be pushed to the remote repository.
5017
5017
5018 If -B/--bookmark is used, the specified bookmarked revision, its
5018 If -B/--bookmark is used, the specified bookmarked revision, its
5019 ancestors, and the bookmark will be pushed to the remote
5019 ancestors, and the bookmark will be pushed to the remote
5020 repository.
5020 repository.
5021
5021
5022 Please see :hg:`help urls` for important details about ``ssh://``
5022 Please see :hg:`help urls` for important details about ``ssh://``
5023 URLs. If DESTINATION is omitted, a default path will be used.
5023 URLs. If DESTINATION is omitted, a default path will be used.
5024
5024
5025 Returns 0 if push was successful, 1 if nothing to push.
5025 Returns 0 if push was successful, 1 if nothing to push.
5026 """
5026 """
5027
5027
5028 if opts.get('bookmark'):
5028 if opts.get('bookmark'):
5029 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5029 ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push')
5030 for b in opts['bookmark']:
5030 for b in opts['bookmark']:
5031 # translate -B options to -r so changesets get pushed
5031 # translate -B options to -r so changesets get pushed
5032 if b in repo._bookmarks:
5032 if b in repo._bookmarks:
5033 opts.setdefault('rev', []).append(b)
5033 opts.setdefault('rev', []).append(b)
5034 else:
5034 else:
5035 # if we try to push a deleted bookmark, translate it to null
5035 # if we try to push a deleted bookmark, translate it to null
5036 # this lets simultaneous -r, -b options continue working
5036 # this lets simultaneous -r, -b options continue working
5037 opts.setdefault('rev', []).append("null")
5037 opts.setdefault('rev', []).append("null")
5038
5038
5039 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5039 dest = ui.expandpath(dest or 'default-push', dest or 'default')
5040 dest, branches = hg.parseurl(dest, opts.get('branch'))
5040 dest, branches = hg.parseurl(dest, opts.get('branch'))
5041 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5041 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
5042 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5042 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
5043 try:
5043 try:
5044 other = hg.peer(repo, opts, dest)
5044 other = hg.peer(repo, opts, dest)
5045 except error.RepoError:
5045 except error.RepoError:
5046 if dest == "default-push":
5046 if dest == "default-push":
5047 raise util.Abort(_("default repository not configured!"),
5047 raise util.Abort(_("default repository not configured!"),
5048 hint=_('see the "path" section in "hg help config"'))
5048 hint=_('see the "path" section in "hg help config"'))
5049 else:
5049 else:
5050 raise
5050 raise
5051
5051
5052 if revs:
5052 if revs:
5053 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5053 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
5054
5054
5055 repo._subtoppath = dest
5055 repo._subtoppath = dest
5056 try:
5056 try:
5057 # push subrepos depth-first for coherent ordering
5057 # push subrepos depth-first for coherent ordering
5058 c = repo['']
5058 c = repo['']
5059 subs = c.substate # only repos that are committed
5059 subs = c.substate # only repos that are committed
5060 for s in sorted(subs):
5060 for s in sorted(subs):
5061 result = c.sub(s).push(opts)
5061 result = c.sub(s).push(opts)
5062 if result == 0:
5062 if result == 0:
5063 return not result
5063 return not result
5064 finally:
5064 finally:
5065 del repo._subtoppath
5065 del repo._subtoppath
5066 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5066 pushop = exchange.push(repo, other, opts.get('force'), revs=revs,
5067 newbranch=opts.get('new_branch'),
5067 newbranch=opts.get('new_branch'),
5068 bookmarks=opts.get('bookmark', ()))
5068 bookmarks=opts.get('bookmark', ()))
5069
5069
5070 result = not pushop.cgresult
5070 result = not pushop.cgresult
5071
5071
5072 if pushop.bkresult is not None:
5072 if pushop.bkresult is not None:
5073 if pushop.bkresult == 2:
5073 if pushop.bkresult == 2:
5074 result = 2
5074 result = 2
5075 elif not result and pushop.bkresult:
5075 elif not result and pushop.bkresult:
5076 result = 2
5076 result = 2
5077
5077
5078 return result
5078 return result
5079
5079
5080 @command('recover', [])
5080 @command('recover', [])
5081 def recover(ui, repo):
5081 def recover(ui, repo):
5082 """roll back an interrupted transaction
5082 """roll back an interrupted transaction
5083
5083
5084 Recover from an interrupted commit or pull.
5084 Recover from an interrupted commit or pull.
5085
5085
5086 This command tries to fix the repository status after an
5086 This command tries to fix the repository status after an
5087 interrupted operation. It should only be necessary when Mercurial
5087 interrupted operation. It should only be necessary when Mercurial
5088 suggests it.
5088 suggests it.
5089
5089
5090 Returns 0 if successful, 1 if nothing to recover or verify fails.
5090 Returns 0 if successful, 1 if nothing to recover or verify fails.
5091 """
5091 """
5092 if repo.recover():
5092 if repo.recover():
5093 return hg.verify(repo)
5093 return hg.verify(repo)
5094 return 1
5094 return 1
5095
5095
5096 @command('^remove|rm',
5096 @command('^remove|rm',
5097 [('A', 'after', None, _('record delete for missing files')),
5097 [('A', 'after', None, _('record delete for missing files')),
5098 ('f', 'force', None,
5098 ('f', 'force', None,
5099 _('remove (and delete) file even if added or modified')),
5099 _('remove (and delete) file even if added or modified')),
5100 ] + walkopts,
5100 ] + walkopts,
5101 _('[OPTION]... FILE...'),
5101 _('[OPTION]... FILE...'),
5102 inferrepo=True)
5102 inferrepo=True)
5103 def remove(ui, repo, *pats, **opts):
5103 def remove(ui, repo, *pats, **opts):
5104 """remove the specified files on the next commit
5104 """remove the specified files on the next commit
5105
5105
5106 Schedule the indicated files for removal from the current branch.
5106 Schedule the indicated files for removal from the current branch.
5107
5107
5108 This command schedules the files to be removed at the next commit.
5108 This command schedules the files to be removed at the next commit.
5109 To undo a remove before that, see :hg:`revert`. To undo added
5109 To undo a remove before that, see :hg:`revert`. To undo added
5110 files, see :hg:`forget`.
5110 files, see :hg:`forget`.
5111
5111
5112 .. container:: verbose
5112 .. container:: verbose
5113
5113
5114 -A/--after can be used to remove only files that have already
5114 -A/--after can be used to remove only files that have already
5115 been deleted, -f/--force can be used to force deletion, and -Af
5115 been deleted, -f/--force can be used to force deletion, and -Af
5116 can be used to remove files from the next revision without
5116 can be used to remove files from the next revision without
5117 deleting them from the working directory.
5117 deleting them from the working directory.
5118
5118
5119 The following table details the behavior of remove for different
5119 The following table details the behavior of remove for different
5120 file states (columns) and option combinations (rows). The file
5120 file states (columns) and option combinations (rows). The file
5121 states are Added [A], Clean [C], Modified [M] and Missing [!]
5121 states are Added [A], Clean [C], Modified [M] and Missing [!]
5122 (as reported by :hg:`status`). The actions are Warn, Remove
5122 (as reported by :hg:`status`). The actions are Warn, Remove
5123 (from branch) and Delete (from disk):
5123 (from branch) and Delete (from disk):
5124
5124
5125 ========= == == == ==
5125 ========= == == == ==
5126 opt/state A C M !
5126 opt/state A C M !
5127 ========= == == == ==
5127 ========= == == == ==
5128 none W RD W R
5128 none W RD W R
5129 -f R RD RD R
5129 -f R RD RD R
5130 -A W W W R
5130 -A W W W R
5131 -Af R R R R
5131 -Af R R R R
5132 ========= == == == ==
5132 ========= == == == ==
5133
5133
5134 Note that remove never deletes files in Added [A] state from the
5134 Note that remove never deletes files in Added [A] state from the
5135 working directory, not even if option --force is specified.
5135 working directory, not even if option --force is specified.
5136
5136
5137 Returns 0 on success, 1 if any warnings encountered.
5137 Returns 0 on success, 1 if any warnings encountered.
5138 """
5138 """
5139
5139
5140 ret = 0
5140 ret = 0
5141 after, force = opts.get('after'), opts.get('force')
5141 after, force = opts.get('after'), opts.get('force')
5142 if not pats and not after:
5142 if not pats and not after:
5143 raise util.Abort(_('no files specified'))
5143 raise util.Abort(_('no files specified'))
5144
5144
5145 m = scmutil.match(repo[None], pats, opts)
5145 m = scmutil.match(repo[None], pats, opts)
5146 s = repo.status(match=m, clean=True)
5146 s = repo.status(match=m, clean=True)
5147 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
5147 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
5148
5148
5149 # warn about failure to delete explicit files/dirs
5149 # warn about failure to delete explicit files/dirs
5150 wctx = repo[None]
5150 wctx = repo[None]
5151 for f in m.files():
5151 for f in m.files():
5152 if f in repo.dirstate or f in wctx.dirs():
5152 if f in repo.dirstate or f in wctx.dirs():
5153 continue
5153 continue
5154 if os.path.exists(m.rel(f)):
5154 if os.path.exists(m.rel(f)):
5155 if os.path.isdir(m.rel(f)):
5155 if os.path.isdir(m.rel(f)):
5156 ui.warn(_('not removing %s: no tracked files\n') % m.rel(f))
5156 ui.warn(_('not removing %s: no tracked files\n') % m.rel(f))
5157 else:
5157 else:
5158 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
5158 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
5159 # missing files will generate a warning elsewhere
5159 # missing files will generate a warning elsewhere
5160 ret = 1
5160 ret = 1
5161
5161
5162 if force:
5162 if force:
5163 list = modified + deleted + clean + added
5163 list = modified + deleted + clean + added
5164 elif after:
5164 elif after:
5165 list = deleted
5165 list = deleted
5166 for f in modified + added + clean:
5166 for f in modified + added + clean:
5167 ui.warn(_('not removing %s: file still exists\n') % m.rel(f))
5167 ui.warn(_('not removing %s: file still exists\n') % m.rel(f))
5168 ret = 1
5168 ret = 1
5169 else:
5169 else:
5170 list = deleted + clean
5170 list = deleted + clean
5171 for f in modified:
5171 for f in modified:
5172 ui.warn(_('not removing %s: file is modified (use -f'
5172 ui.warn(_('not removing %s: file is modified (use -f'
5173 ' to force removal)\n') % m.rel(f))
5173 ' to force removal)\n') % m.rel(f))
5174 ret = 1
5174 ret = 1
5175 for f in added:
5175 for f in added:
5176 ui.warn(_('not removing %s: file has been marked for add'
5176 ui.warn(_('not removing %s: file has been marked for add'
5177 ' (use forget to undo)\n') % m.rel(f))
5177 ' (use forget to undo)\n') % m.rel(f))
5178 ret = 1
5178 ret = 1
5179
5179
5180 for f in sorted(list):
5180 for f in sorted(list):
5181 if ui.verbose or not m.exact(f):
5181 if ui.verbose or not m.exact(f):
5182 ui.status(_('removing %s\n') % m.rel(f))
5182 ui.status(_('removing %s\n') % m.rel(f))
5183
5183
5184 wlock = repo.wlock()
5184 wlock = repo.wlock()
5185 try:
5185 try:
5186 if not after:
5186 if not after:
5187 for f in list:
5187 for f in list:
5188 if f in added:
5188 if f in added:
5189 continue # we never unlink added files on remove
5189 continue # we never unlink added files on remove
5190 util.unlinkpath(repo.wjoin(f), ignoremissing=True)
5190 util.unlinkpath(repo.wjoin(f), ignoremissing=True)
5191 repo[None].forget(list)
5191 repo[None].forget(list)
5192 finally:
5192 finally:
5193 wlock.release()
5193 wlock.release()
5194
5194
5195 return ret
5195 return ret
5196
5196
5197 @command('rename|move|mv',
5197 @command('rename|move|mv',
5198 [('A', 'after', None, _('record a rename that has already occurred')),
5198 [('A', 'after', None, _('record a rename that has already occurred')),
5199 ('f', 'force', None, _('forcibly copy over an existing managed file')),
5199 ('f', 'force', None, _('forcibly copy over an existing managed file')),
5200 ] + walkopts + dryrunopts,
5200 ] + walkopts + dryrunopts,
5201 _('[OPTION]... SOURCE... DEST'))
5201 _('[OPTION]... SOURCE... DEST'))
5202 def rename(ui, repo, *pats, **opts):
5202 def rename(ui, repo, *pats, **opts):
5203 """rename files; equivalent of copy + remove
5203 """rename files; equivalent of copy + remove
5204
5204
5205 Mark dest as copies of sources; mark sources for deletion. If dest
5205 Mark dest as copies of sources; mark sources for deletion. If dest
5206 is a directory, copies are put in that directory. If dest is a
5206 is a directory, copies are put in that directory. If dest is a
5207 file, there can only be one source.
5207 file, there can only be one source.
5208
5208
5209 By default, this command copies the contents of files as they
5209 By default, this command copies the contents of files as they
5210 exist in the working directory. If invoked with -A/--after, the
5210 exist in the working directory. If invoked with -A/--after, the
5211 operation is recorded, but no copying is performed.
5211 operation is recorded, but no copying is performed.
5212
5212
5213 This command takes effect at the next commit. To undo a rename
5213 This command takes effect at the next commit. To undo a rename
5214 before that, see :hg:`revert`.
5214 before that, see :hg:`revert`.
5215
5215
5216 Returns 0 on success, 1 if errors are encountered.
5216 Returns 0 on success, 1 if errors are encountered.
5217 """
5217 """
5218 wlock = repo.wlock(False)
5218 wlock = repo.wlock(False)
5219 try:
5219 try:
5220 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5220 return cmdutil.copy(ui, repo, pats, opts, rename=True)
5221 finally:
5221 finally:
5222 wlock.release()
5222 wlock.release()
5223
5223
5224 @command('resolve',
5224 @command('resolve',
5225 [('a', 'all', None, _('select all unresolved files')),
5225 [('a', 'all', None, _('select all unresolved files')),
5226 ('l', 'list', None, _('list state of files needing merge')),
5226 ('l', 'list', None, _('list state of files needing merge')),
5227 ('m', 'mark', None, _('mark files as resolved')),
5227 ('m', 'mark', None, _('mark files as resolved')),
5228 ('u', 'unmark', None, _('mark files as unresolved')),
5228 ('u', 'unmark', None, _('mark files as unresolved')),
5229 ('n', 'no-status', None, _('hide status prefix'))]
5229 ('n', 'no-status', None, _('hide status prefix'))]
5230 + mergetoolopts + walkopts,
5230 + mergetoolopts + walkopts,
5231 _('[OPTION]... [FILE]...'),
5231 _('[OPTION]... [FILE]...'),
5232 inferrepo=True)
5232 inferrepo=True)
5233 def resolve(ui, repo, *pats, **opts):
5233 def resolve(ui, repo, *pats, **opts):
5234 """redo merges or set/view the merge status of files
5234 """redo merges or set/view the merge status of files
5235
5235
5236 Merges with unresolved conflicts are often the result of
5236 Merges with unresolved conflicts are often the result of
5237 non-interactive merging using the ``internal:merge`` configuration
5237 non-interactive merging using the ``internal:merge`` configuration
5238 setting, or a command-line merge tool like ``diff3``. The resolve
5238 setting, or a command-line merge tool like ``diff3``. The resolve
5239 command is used to manage the files involved in a merge, after
5239 command is used to manage the files involved in a merge, after
5240 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5240 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
5241 working directory must have two parents). See :hg:`help
5241 working directory must have two parents). See :hg:`help
5242 merge-tools` for information on configuring merge tools.
5242 merge-tools` for information on configuring merge tools.
5243
5243
5244 The resolve command can be used in the following ways:
5244 The resolve command can be used in the following ways:
5245
5245
5246 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
5246 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
5247 files, discarding any previous merge attempts. Re-merging is not
5247 files, discarding any previous merge attempts. Re-merging is not
5248 performed for files already marked as resolved. Use ``--all/-a``
5248 performed for files already marked as resolved. Use ``--all/-a``
5249 to select all unresolved files. ``--tool`` can be used to specify
5249 to select all unresolved files. ``--tool`` can be used to specify
5250 the merge tool used for the given files. It overrides the HGMERGE
5250 the merge tool used for the given files. It overrides the HGMERGE
5251 environment variable and your configuration files. Previous file
5251 environment variable and your configuration files. Previous file
5252 contents are saved with a ``.orig`` suffix.
5252 contents are saved with a ``.orig`` suffix.
5253
5253
5254 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5254 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
5255 (e.g. after having manually fixed-up the files). The default is
5255 (e.g. after having manually fixed-up the files). The default is
5256 to mark all unresolved files.
5256 to mark all unresolved files.
5257
5257
5258 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5258 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
5259 default is to mark all resolved files.
5259 default is to mark all resolved files.
5260
5260
5261 - :hg:`resolve -l`: list files which had or still have conflicts.
5261 - :hg:`resolve -l`: list files which had or still have conflicts.
5262 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5262 In the printed list, ``U`` = unresolved and ``R`` = resolved.
5263
5263
5264 Note that Mercurial will not let you commit files with unresolved
5264 Note that Mercurial will not let you commit files with unresolved
5265 merge conflicts. You must use :hg:`resolve -m ...` before you can
5265 merge conflicts. You must use :hg:`resolve -m ...` before you can
5266 commit after a conflicting merge.
5266 commit after a conflicting merge.
5267
5267
5268 Returns 0 on success, 1 if any files fail a resolve attempt.
5268 Returns 0 on success, 1 if any files fail a resolve attempt.
5269 """
5269 """
5270
5270
5271 all, mark, unmark, show, nostatus = \
5271 all, mark, unmark, show, nostatus = \
5272 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
5272 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
5273
5273
5274 if (show and (mark or unmark)) or (mark and unmark):
5274 if (show and (mark or unmark)) or (mark and unmark):
5275 raise util.Abort(_("too many options specified"))
5275 raise util.Abort(_("too many options specified"))
5276 if pats and all:
5276 if pats and all:
5277 raise util.Abort(_("can't specify --all and patterns"))
5277 raise util.Abort(_("can't specify --all and patterns"))
5278 if not (all or pats or show or mark or unmark):
5278 if not (all or pats or show or mark or unmark):
5279 raise util.Abort(_('no files or directories specified'),
5279 raise util.Abort(_('no files or directories specified'),
5280 hint=('use --all to remerge all files'))
5280 hint=('use --all to remerge all files'))
5281
5281
5282 wlock = repo.wlock()
5282 wlock = repo.wlock()
5283 try:
5283 try:
5284 ms = mergemod.mergestate(repo)
5284 ms = mergemod.mergestate(repo)
5285
5285
5286 if not ms.active() and not show:
5286 if not ms.active() and not show:
5287 raise util.Abort(
5287 raise util.Abort(
5288 _('resolve command not applicable when not merging'))
5288 _('resolve command not applicable when not merging'))
5289
5289
5290 m = scmutil.match(repo[None], pats, opts)
5290 m = scmutil.match(repo[None], pats, opts)
5291 ret = 0
5291 ret = 0
5292 didwork = False
5292 didwork = False
5293
5293
5294 for f in ms:
5294 for f in ms:
5295 if not m(f):
5295 if not m(f):
5296 continue
5296 continue
5297
5297
5298 didwork = True
5298 didwork = True
5299
5299
5300 if show:
5300 if show:
5301 if nostatus:
5301 if nostatus:
5302 ui.write("%s\n" % f)
5302 ui.write("%s\n" % f)
5303 else:
5303 else:
5304 ui.write("%s %s\n" % (ms[f].upper(), f),
5304 ui.write("%s %s\n" % (ms[f].upper(), f),
5305 label='resolve.' +
5305 label='resolve.' +
5306 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
5306 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
5307 elif mark:
5307 elif mark:
5308 ms.mark(f, "r")
5308 ms.mark(f, "r")
5309 elif unmark:
5309 elif unmark:
5310 ms.mark(f, "u")
5310 ms.mark(f, "u")
5311 else:
5311 else:
5312 wctx = repo[None]
5312 wctx = repo[None]
5313
5313
5314 # backup pre-resolve (merge uses .orig for its own purposes)
5314 # backup pre-resolve (merge uses .orig for its own purposes)
5315 a = repo.wjoin(f)
5315 a = repo.wjoin(f)
5316 util.copyfile(a, a + ".resolve")
5316 util.copyfile(a, a + ".resolve")
5317
5317
5318 try:
5318 try:
5319 # resolve file
5319 # resolve file
5320 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5320 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
5321 'resolve')
5321 'resolve')
5322 if ms.resolve(f, wctx):
5322 if ms.resolve(f, wctx):
5323 ret = 1
5323 ret = 1
5324 finally:
5324 finally:
5325 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5325 ui.setconfig('ui', 'forcemerge', '', 'resolve')
5326 ms.commit()
5326 ms.commit()
5327
5327
5328 # replace filemerge's .orig file with our resolve file
5328 # replace filemerge's .orig file with our resolve file
5329 util.rename(a + ".resolve", a + ".orig")
5329 util.rename(a + ".resolve", a + ".orig")
5330
5330
5331 ms.commit()
5331 ms.commit()
5332
5332
5333 if not didwork and pats:
5333 if not didwork and pats:
5334 ui.warn(_("arguments do not match paths that need resolving\n"))
5334 ui.warn(_("arguments do not match paths that need resolving\n"))
5335
5335
5336 finally:
5336 finally:
5337 wlock.release()
5337 wlock.release()
5338
5338
5339 # Nudge users into finishing an unfinished operation. We don't print
5339 # Nudge users into finishing an unfinished operation. We don't print
5340 # this with the list/show operation because we want list/show to remain
5340 # this with the list/show operation because we want list/show to remain
5341 # machine readable.
5341 # machine readable.
5342 if not list(ms.unresolved()) and not show:
5342 if not list(ms.unresolved()) and not show:
5343 ui.status(_('(no more unresolved files)\n'))
5343 ui.status(_('(no more unresolved files)\n'))
5344
5344
5345 return ret
5345 return ret
5346
5346
5347 @command('revert',
5347 @command('revert',
5348 [('a', 'all', None, _('revert all changes when no arguments given')),
5348 [('a', 'all', None, _('revert all changes when no arguments given')),
5349 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5349 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5350 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
5350 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
5351 ('C', 'no-backup', None, _('do not save backup copies of files')),
5351 ('C', 'no-backup', None, _('do not save backup copies of files')),
5352 ] + walkopts + dryrunopts,
5352 ] + walkopts + dryrunopts,
5353 _('[OPTION]... [-r REV] [NAME]...'))
5353 _('[OPTION]... [-r REV] [NAME]...'))
5354 def revert(ui, repo, *pats, **opts):
5354 def revert(ui, repo, *pats, **opts):
5355 """restore files to their checkout state
5355 """restore files to their checkout state
5356
5356
5357 .. note::
5357 .. note::
5358
5358
5359 To check out earlier revisions, you should use :hg:`update REV`.
5359 To check out earlier revisions, you should use :hg:`update REV`.
5360 To cancel an uncommitted merge (and lose your changes),
5360 To cancel an uncommitted merge (and lose your changes),
5361 use :hg:`update --clean .`.
5361 use :hg:`update --clean .`.
5362
5362
5363 With no revision specified, revert the specified files or directories
5363 With no revision specified, revert the specified files or directories
5364 to the contents they had in the parent of the working directory.
5364 to the contents they had in the parent of the working directory.
5365 This restores the contents of files to an unmodified
5365 This restores the contents of files to an unmodified
5366 state and unschedules adds, removes, copies, and renames. If the
5366 state and unschedules adds, removes, copies, and renames. If the
5367 working directory has two parents, you must explicitly specify a
5367 working directory has two parents, you must explicitly specify a
5368 revision.
5368 revision.
5369
5369
5370 Using the -r/--rev or -d/--date options, revert the given files or
5370 Using the -r/--rev or -d/--date options, revert the given files or
5371 directories to their states as of a specific revision. Because
5371 directories to their states as of a specific revision. Because
5372 revert does not change the working directory parents, this will
5372 revert does not change the working directory parents, this will
5373 cause these files to appear modified. This can be helpful to "back
5373 cause these files to appear modified. This can be helpful to "back
5374 out" some or all of an earlier change. See :hg:`backout` for a
5374 out" some or all of an earlier change. See :hg:`backout` for a
5375 related method.
5375 related method.
5376
5376
5377 Modified files are saved with a .orig suffix before reverting.
5377 Modified files are saved with a .orig suffix before reverting.
5378 To disable these backups, use --no-backup.
5378 To disable these backups, use --no-backup.
5379
5379
5380 See :hg:`help dates` for a list of formats valid for -d/--date.
5380 See :hg:`help dates` for a list of formats valid for -d/--date.
5381
5381
5382 Returns 0 on success.
5382 Returns 0 on success.
5383 """
5383 """
5384
5384
5385 if opts.get("date"):
5385 if opts.get("date"):
5386 if opts.get("rev"):
5386 if opts.get("rev"):
5387 raise util.Abort(_("you can't specify a revision and a date"))
5387 raise util.Abort(_("you can't specify a revision and a date"))
5388 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
5388 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
5389
5389
5390 parent, p2 = repo.dirstate.parents()
5390 parent, p2 = repo.dirstate.parents()
5391 if not opts.get('rev') and p2 != nullid:
5391 if not opts.get('rev') and p2 != nullid:
5392 # revert after merge is a trap for new users (issue2915)
5392 # revert after merge is a trap for new users (issue2915)
5393 raise util.Abort(_('uncommitted merge with no revision specified'),
5393 raise util.Abort(_('uncommitted merge with no revision specified'),
5394 hint=_('use "hg update" or see "hg help revert"'))
5394 hint=_('use "hg update" or see "hg help revert"'))
5395
5395
5396 ctx = scmutil.revsingle(repo, opts.get('rev'))
5396 ctx = scmutil.revsingle(repo, opts.get('rev'))
5397
5397
5398 if not pats and not opts.get('all'):
5398 if not pats and not opts.get('all'):
5399 msg = _("no files or directories specified")
5399 msg = _("no files or directories specified")
5400 if p2 != nullid:
5400 if p2 != nullid:
5401 hint = _("uncommitted merge, use --all to discard all changes,"
5401 hint = _("uncommitted merge, use --all to discard all changes,"
5402 " or 'hg update -C .' to abort the merge")
5402 " or 'hg update -C .' to abort the merge")
5403 raise util.Abort(msg, hint=hint)
5403 raise util.Abort(msg, hint=hint)
5404 dirty = util.any(repo.status())
5404 dirty = util.any(repo.status())
5405 node = ctx.node()
5405 node = ctx.node()
5406 if node != parent:
5406 if node != parent:
5407 if dirty:
5407 if dirty:
5408 hint = _("uncommitted changes, use --all to discard all"
5408 hint = _("uncommitted changes, use --all to discard all"
5409 " changes, or 'hg update %s' to update") % ctx.rev()
5409 " changes, or 'hg update %s' to update") % ctx.rev()
5410 else:
5410 else:
5411 hint = _("use --all to revert all files,"
5411 hint = _("use --all to revert all files,"
5412 " or 'hg update %s' to update") % ctx.rev()
5412 " or 'hg update %s' to update") % ctx.rev()
5413 elif dirty:
5413 elif dirty:
5414 hint = _("uncommitted changes, use --all to discard all changes")
5414 hint = _("uncommitted changes, use --all to discard all changes")
5415 else:
5415 else:
5416 hint = _("use --all to revert all files")
5416 hint = _("use --all to revert all files")
5417 raise util.Abort(msg, hint=hint)
5417 raise util.Abort(msg, hint=hint)
5418
5418
5419 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
5419 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
5420
5420
5421 @command('rollback', dryrunopts +
5421 @command('rollback', dryrunopts +
5422 [('f', 'force', False, _('ignore safety measures'))])
5422 [('f', 'force', False, _('ignore safety measures'))])
5423 def rollback(ui, repo, **opts):
5423 def rollback(ui, repo, **opts):
5424 """roll back the last transaction (DANGEROUS) (DEPRECATED)
5424 """roll back the last transaction (DANGEROUS) (DEPRECATED)
5425
5425
5426 Please use :hg:`commit --amend` instead of rollback to correct
5426 Please use :hg:`commit --amend` instead of rollback to correct
5427 mistakes in the last commit.
5427 mistakes in the last commit.
5428
5428
5429 This command should be used with care. There is only one level of
5429 This command should be used with care. There is only one level of
5430 rollback, and there is no way to undo a rollback. It will also
5430 rollback, and there is no way to undo a rollback. It will also
5431 restore the dirstate at the time of the last transaction, losing
5431 restore the dirstate at the time of the last transaction, losing
5432 any dirstate changes since that time. This command does not alter
5432 any dirstate changes since that time. This command does not alter
5433 the working directory.
5433 the working directory.
5434
5434
5435 Transactions are used to encapsulate the effects of all commands
5435 Transactions are used to encapsulate the effects of all commands
5436 that create new changesets or propagate existing changesets into a
5436 that create new changesets or propagate existing changesets into a
5437 repository.
5437 repository.
5438
5438
5439 .. container:: verbose
5439 .. container:: verbose
5440
5440
5441 For example, the following commands are transactional, and their
5441 For example, the following commands are transactional, and their
5442 effects can be rolled back:
5442 effects can be rolled back:
5443
5443
5444 - commit
5444 - commit
5445 - import
5445 - import
5446 - pull
5446 - pull
5447 - push (with this repository as the destination)
5447 - push (with this repository as the destination)
5448 - unbundle
5448 - unbundle
5449
5449
5450 To avoid permanent data loss, rollback will refuse to rollback a
5450 To avoid permanent data loss, rollback will refuse to rollback a
5451 commit transaction if it isn't checked out. Use --force to
5451 commit transaction if it isn't checked out. Use --force to
5452 override this protection.
5452 override this protection.
5453
5453
5454 This command is not intended for use on public repositories. Once
5454 This command is not intended for use on public repositories. Once
5455 changes are visible for pull by other users, rolling a transaction
5455 changes are visible for pull by other users, rolling a transaction
5456 back locally is ineffective (someone else may already have pulled
5456 back locally is ineffective (someone else may already have pulled
5457 the changes). Furthermore, a race is possible with readers of the
5457 the changes). Furthermore, a race is possible with readers of the
5458 repository; for example an in-progress pull from the repository
5458 repository; for example an in-progress pull from the repository
5459 may fail if a rollback is performed.
5459 may fail if a rollback is performed.
5460
5460
5461 Returns 0 on success, 1 if no rollback data is available.
5461 Returns 0 on success, 1 if no rollback data is available.
5462 """
5462 """
5463 return repo.rollback(dryrun=opts.get('dry_run'),
5463 return repo.rollback(dryrun=opts.get('dry_run'),
5464 force=opts.get('force'))
5464 force=opts.get('force'))
5465
5465
5466 @command('root', [])
5466 @command('root', [])
5467 def root(ui, repo):
5467 def root(ui, repo):
5468 """print the root (top) of the current working directory
5468 """print the root (top) of the current working directory
5469
5469
5470 Print the root directory of the current repository.
5470 Print the root directory of the current repository.
5471
5471
5472 Returns 0 on success.
5472 Returns 0 on success.
5473 """
5473 """
5474 ui.write(repo.root + "\n")
5474 ui.write(repo.root + "\n")
5475
5475
5476 @command('^serve',
5476 @command('^serve',
5477 [('A', 'accesslog', '', _('name of access log file to write to'),
5477 [('A', 'accesslog', '', _('name of access log file to write to'),
5478 _('FILE')),
5478 _('FILE')),
5479 ('d', 'daemon', None, _('run server in background')),
5479 ('d', 'daemon', None, _('run server in background')),
5480 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')),
5480 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')),
5481 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
5481 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
5482 # use string type, then we can check if something was passed
5482 # use string type, then we can check if something was passed
5483 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
5483 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
5484 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
5484 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
5485 _('ADDR')),
5485 _('ADDR')),
5486 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
5486 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
5487 _('PREFIX')),
5487 _('PREFIX')),
5488 ('n', 'name', '',
5488 ('n', 'name', '',
5489 _('name to show in web pages (default: working directory)'), _('NAME')),
5489 _('name to show in web pages (default: working directory)'), _('NAME')),
5490 ('', 'web-conf', '',
5490 ('', 'web-conf', '',
5491 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
5491 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
5492 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
5492 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
5493 _('FILE')),
5493 _('FILE')),
5494 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
5494 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
5495 ('', 'stdio', None, _('for remote clients')),
5495 ('', 'stdio', None, _('for remote clients')),
5496 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
5496 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
5497 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
5497 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
5498 ('', 'style', '', _('template style to use'), _('STYLE')),
5498 ('', 'style', '', _('template style to use'), _('STYLE')),
5499 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
5499 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
5500 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
5500 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
5501 _('[OPTION]...'),
5501 _('[OPTION]...'),
5502 optionalrepo=True)
5502 optionalrepo=True)
5503 def serve(ui, repo, **opts):
5503 def serve(ui, repo, **opts):
5504 """start stand-alone webserver
5504 """start stand-alone webserver
5505
5505
5506 Start a local HTTP repository browser and pull server. You can use
5506 Start a local HTTP repository browser and pull server. You can use
5507 this for ad-hoc sharing and browsing of repositories. It is
5507 this for ad-hoc sharing and browsing of repositories. It is
5508 recommended to use a real web server to serve a repository for
5508 recommended to use a real web server to serve a repository for
5509 longer periods of time.
5509 longer periods of time.
5510
5510
5511 Please note that the server does not implement access control.
5511 Please note that the server does not implement access control.
5512 This means that, by default, anybody can read from the server and
5512 This means that, by default, anybody can read from the server and
5513 nobody can write to it by default. Set the ``web.allow_push``
5513 nobody can write to it by default. Set the ``web.allow_push``
5514 option to ``*`` to allow everybody to push to the server. You
5514 option to ``*`` to allow everybody to push to the server. You
5515 should use a real web server if you need to authenticate users.
5515 should use a real web server if you need to authenticate users.
5516
5516
5517 By default, the server logs accesses to stdout and errors to
5517 By default, the server logs accesses to stdout and errors to
5518 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5518 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5519 files.
5519 files.
5520
5520
5521 To have the server choose a free port number to listen on, specify
5521 To have the server choose a free port number to listen on, specify
5522 a port number of 0; in this case, the server will print the port
5522 a port number of 0; in this case, the server will print the port
5523 number it uses.
5523 number it uses.
5524
5524
5525 Returns 0 on success.
5525 Returns 0 on success.
5526 """
5526 """
5527
5527
5528 if opts["stdio"] and opts["cmdserver"]:
5528 if opts["stdio"] and opts["cmdserver"]:
5529 raise util.Abort(_("cannot use --stdio with --cmdserver"))
5529 raise util.Abort(_("cannot use --stdio with --cmdserver"))
5530
5530
5531 if opts["stdio"]:
5531 if opts["stdio"]:
5532 if repo is None:
5532 if repo is None:
5533 raise error.RepoError(_("there is no Mercurial repository here"
5533 raise error.RepoError(_("there is no Mercurial repository here"
5534 " (.hg not found)"))
5534 " (.hg not found)"))
5535 s = sshserver.sshserver(ui, repo)
5535 s = sshserver.sshserver(ui, repo)
5536 s.serve_forever()
5536 s.serve_forever()
5537
5537
5538 if opts["cmdserver"]:
5538 if opts["cmdserver"]:
5539 s = commandserver.server(ui, repo, opts["cmdserver"])
5539 service = commandserver.pipeservice(ui, repo, opts)
5540 return s.serve()
5540 return cmdutil.service(opts, initfn=service.init, runfn=service.run)
5541
5541
5542 # this way we can check if something was given in the command-line
5542 # this way we can check if something was given in the command-line
5543 if opts.get('port'):
5543 if opts.get('port'):
5544 opts['port'] = util.getport(opts.get('port'))
5544 opts['port'] = util.getport(opts.get('port'))
5545
5545
5546 baseui = repo and repo.baseui or ui
5546 baseui = repo and repo.baseui or ui
5547 optlist = ("name templates style address port prefix ipv6"
5547 optlist = ("name templates style address port prefix ipv6"
5548 " accesslog errorlog certificate encoding")
5548 " accesslog errorlog certificate encoding")
5549 for o in optlist.split():
5549 for o in optlist.split():
5550 val = opts.get(o, '')
5550 val = opts.get(o, '')
5551 if val in (None, ''): # should check against default options instead
5551 if val in (None, ''): # should check against default options instead
5552 continue
5552 continue
5553 baseui.setconfig("web", o, val, 'serve')
5553 baseui.setconfig("web", o, val, 'serve')
5554 if repo and repo.ui != baseui:
5554 if repo and repo.ui != baseui:
5555 repo.ui.setconfig("web", o, val, 'serve')
5555 repo.ui.setconfig("web", o, val, 'serve')
5556
5556
5557 o = opts.get('web_conf') or opts.get('webdir_conf')
5557 o = opts.get('web_conf') or opts.get('webdir_conf')
5558 if not o:
5558 if not o:
5559 if not repo:
5559 if not repo:
5560 raise error.RepoError(_("there is no Mercurial repository"
5560 raise error.RepoError(_("there is no Mercurial repository"
5561 " here (.hg not found)"))
5561 " here (.hg not found)"))
5562 o = repo
5562 o = repo
5563
5563
5564 app = hgweb.hgweb(o, baseui=baseui)
5564 app = hgweb.hgweb(o, baseui=baseui)
5565 service = httpservice(ui, app, opts)
5565 service = httpservice(ui, app, opts)
5566 cmdutil.service(opts, initfn=service.init, runfn=service.run)
5566 cmdutil.service(opts, initfn=service.init, runfn=service.run)
5567
5567
5568 class httpservice(object):
5568 class httpservice(object):
5569 def __init__(self, ui, app, opts):
5569 def __init__(self, ui, app, opts):
5570 self.ui = ui
5570 self.ui = ui
5571 self.app = app
5571 self.app = app
5572 self.opts = opts
5572 self.opts = opts
5573
5573
5574 def init(self):
5574 def init(self):
5575 util.setsignalhandler()
5575 util.setsignalhandler()
5576 self.httpd = hgweb_server.create_server(self.ui, self.app)
5576 self.httpd = hgweb_server.create_server(self.ui, self.app)
5577
5577
5578 if self.opts['port'] and not self.ui.verbose:
5578 if self.opts['port'] and not self.ui.verbose:
5579 return
5579 return
5580
5580
5581 if self.httpd.prefix:
5581 if self.httpd.prefix:
5582 prefix = self.httpd.prefix.strip('/') + '/'
5582 prefix = self.httpd.prefix.strip('/') + '/'
5583 else:
5583 else:
5584 prefix = ''
5584 prefix = ''
5585
5585
5586 port = ':%d' % self.httpd.port
5586 port = ':%d' % self.httpd.port
5587 if port == ':80':
5587 if port == ':80':
5588 port = ''
5588 port = ''
5589
5589
5590 bindaddr = self.httpd.addr
5590 bindaddr = self.httpd.addr
5591 if bindaddr == '0.0.0.0':
5591 if bindaddr == '0.0.0.0':
5592 bindaddr = '*'
5592 bindaddr = '*'
5593 elif ':' in bindaddr: # IPv6
5593 elif ':' in bindaddr: # IPv6
5594 bindaddr = '[%s]' % bindaddr
5594 bindaddr = '[%s]' % bindaddr
5595
5595
5596 fqaddr = self.httpd.fqaddr
5596 fqaddr = self.httpd.fqaddr
5597 if ':' in fqaddr:
5597 if ':' in fqaddr:
5598 fqaddr = '[%s]' % fqaddr
5598 fqaddr = '[%s]' % fqaddr
5599 if self.opts['port']:
5599 if self.opts['port']:
5600 write = self.ui.status
5600 write = self.ui.status
5601 else:
5601 else:
5602 write = self.ui.write
5602 write = self.ui.write
5603 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
5603 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
5604 (fqaddr, port, prefix, bindaddr, self.httpd.port))
5604 (fqaddr, port, prefix, bindaddr, self.httpd.port))
5605 self.ui.flush() # avoid buffering of status message
5605 self.ui.flush() # avoid buffering of status message
5606
5606
5607 def run(self):
5607 def run(self):
5608 self.httpd.serve_forever()
5608 self.httpd.serve_forever()
5609
5609
5610
5610
5611 @command('^status|st',
5611 @command('^status|st',
5612 [('A', 'all', None, _('show status of all files')),
5612 [('A', 'all', None, _('show status of all files')),
5613 ('m', 'modified', None, _('show only modified files')),
5613 ('m', 'modified', None, _('show only modified files')),
5614 ('a', 'added', None, _('show only added files')),
5614 ('a', 'added', None, _('show only added files')),
5615 ('r', 'removed', None, _('show only removed files')),
5615 ('r', 'removed', None, _('show only removed files')),
5616 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5616 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5617 ('c', 'clean', None, _('show only files without changes')),
5617 ('c', 'clean', None, _('show only files without changes')),
5618 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5618 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5619 ('i', 'ignored', None, _('show only ignored files')),
5619 ('i', 'ignored', None, _('show only ignored files')),
5620 ('n', 'no-status', None, _('hide status prefix')),
5620 ('n', 'no-status', None, _('hide status prefix')),
5621 ('C', 'copies', None, _('show source of copied files')),
5621 ('C', 'copies', None, _('show source of copied files')),
5622 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5622 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5623 ('', 'rev', [], _('show difference from revision'), _('REV')),
5623 ('', 'rev', [], _('show difference from revision'), _('REV')),
5624 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5624 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5625 ] + walkopts + subrepoopts + formatteropts,
5625 ] + walkopts + subrepoopts + formatteropts,
5626 _('[OPTION]... [FILE]...'),
5626 _('[OPTION]... [FILE]...'),
5627 inferrepo=True)
5627 inferrepo=True)
5628 def status(ui, repo, *pats, **opts):
5628 def status(ui, repo, *pats, **opts):
5629 """show changed files in the working directory
5629 """show changed files in the working directory
5630
5630
5631 Show status of files in the repository. If names are given, only
5631 Show status of files in the repository. If names are given, only
5632 files that match are shown. Files that are clean or ignored or
5632 files that match are shown. Files that are clean or ignored or
5633 the source of a copy/move operation, are not listed unless
5633 the source of a copy/move operation, are not listed unless
5634 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5634 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5635 Unless options described with "show only ..." are given, the
5635 Unless options described with "show only ..." are given, the
5636 options -mardu are used.
5636 options -mardu are used.
5637
5637
5638 Option -q/--quiet hides untracked (unknown and ignored) files
5638 Option -q/--quiet hides untracked (unknown and ignored) files
5639 unless explicitly requested with -u/--unknown or -i/--ignored.
5639 unless explicitly requested with -u/--unknown or -i/--ignored.
5640
5640
5641 .. note::
5641 .. note::
5642
5642
5643 status may appear to disagree with diff if permissions have
5643 status may appear to disagree with diff if permissions have
5644 changed or a merge has occurred. The standard diff format does
5644 changed or a merge has occurred. The standard diff format does
5645 not report permission changes and diff only reports changes
5645 not report permission changes and diff only reports changes
5646 relative to one merge parent.
5646 relative to one merge parent.
5647
5647
5648 If one revision is given, it is used as the base revision.
5648 If one revision is given, it is used as the base revision.
5649 If two revisions are given, the differences between them are
5649 If two revisions are given, the differences between them are
5650 shown. The --change option can also be used as a shortcut to list
5650 shown. The --change option can also be used as a shortcut to list
5651 the changed files of a revision from its first parent.
5651 the changed files of a revision from its first parent.
5652
5652
5653 The codes used to show the status of files are::
5653 The codes used to show the status of files are::
5654
5654
5655 M = modified
5655 M = modified
5656 A = added
5656 A = added
5657 R = removed
5657 R = removed
5658 C = clean
5658 C = clean
5659 ! = missing (deleted by non-hg command, but still tracked)
5659 ! = missing (deleted by non-hg command, but still tracked)
5660 ? = not tracked
5660 ? = not tracked
5661 I = ignored
5661 I = ignored
5662 = origin of the previous file (with --copies)
5662 = origin of the previous file (with --copies)
5663
5663
5664 .. container:: verbose
5664 .. container:: verbose
5665
5665
5666 Examples:
5666 Examples:
5667
5667
5668 - show changes in the working directory relative to a
5668 - show changes in the working directory relative to a
5669 changeset::
5669 changeset::
5670
5670
5671 hg status --rev 9353
5671 hg status --rev 9353
5672
5672
5673 - show all changes including copies in an existing changeset::
5673 - show all changes including copies in an existing changeset::
5674
5674
5675 hg status --copies --change 9353
5675 hg status --copies --change 9353
5676
5676
5677 - get a NUL separated list of added files, suitable for xargs::
5677 - get a NUL separated list of added files, suitable for xargs::
5678
5678
5679 hg status -an0
5679 hg status -an0
5680
5680
5681 Returns 0 on success.
5681 Returns 0 on success.
5682 """
5682 """
5683
5683
5684 revs = opts.get('rev')
5684 revs = opts.get('rev')
5685 change = opts.get('change')
5685 change = opts.get('change')
5686
5686
5687 if revs and change:
5687 if revs and change:
5688 msg = _('cannot specify --rev and --change at the same time')
5688 msg = _('cannot specify --rev and --change at the same time')
5689 raise util.Abort(msg)
5689 raise util.Abort(msg)
5690 elif change:
5690 elif change:
5691 node2 = scmutil.revsingle(repo, change, None).node()
5691 node2 = scmutil.revsingle(repo, change, None).node()
5692 node1 = repo[node2].p1().node()
5692 node1 = repo[node2].p1().node()
5693 else:
5693 else:
5694 node1, node2 = scmutil.revpair(repo, revs)
5694 node1, node2 = scmutil.revpair(repo, revs)
5695
5695
5696 cwd = (pats and repo.getcwd()) or ''
5696 cwd = (pats and repo.getcwd()) or ''
5697 end = opts.get('print0') and '\0' or '\n'
5697 end = opts.get('print0') and '\0' or '\n'
5698 copy = {}
5698 copy = {}
5699 states = 'modified added removed deleted unknown ignored clean'.split()
5699 states = 'modified added removed deleted unknown ignored clean'.split()
5700 show = [k for k in states if opts.get(k)]
5700 show = [k for k in states if opts.get(k)]
5701 if opts.get('all'):
5701 if opts.get('all'):
5702 show += ui.quiet and (states[:4] + ['clean']) or states
5702 show += ui.quiet and (states[:4] + ['clean']) or states
5703 if not show:
5703 if not show:
5704 show = ui.quiet and states[:4] or states[:5]
5704 show = ui.quiet and states[:4] or states[:5]
5705
5705
5706 stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts),
5706 stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts),
5707 'ignored' in show, 'clean' in show, 'unknown' in show,
5707 'ignored' in show, 'clean' in show, 'unknown' in show,
5708 opts.get('subrepos'))
5708 opts.get('subrepos'))
5709 changestates = zip(states, 'MAR!?IC', stat)
5709 changestates = zip(states, 'MAR!?IC', stat)
5710
5710
5711 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
5711 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
5712 copy = copies.pathcopies(repo[node1], repo[node2])
5712 copy = copies.pathcopies(repo[node1], repo[node2])
5713
5713
5714 fm = ui.formatter('status', opts)
5714 fm = ui.formatter('status', opts)
5715 fmt = '%s' + end
5715 fmt = '%s' + end
5716 showchar = not opts.get('no_status')
5716 showchar = not opts.get('no_status')
5717
5717
5718 for state, char, files in changestates:
5718 for state, char, files in changestates:
5719 if state in show:
5719 if state in show:
5720 label = 'status.' + state
5720 label = 'status.' + state
5721 for f in files:
5721 for f in files:
5722 fm.startitem()
5722 fm.startitem()
5723 fm.condwrite(showchar, 'status', '%s ', char, label=label)
5723 fm.condwrite(showchar, 'status', '%s ', char, label=label)
5724 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
5724 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
5725 if f in copy:
5725 if f in copy:
5726 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
5726 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
5727 label='status.copied')
5727 label='status.copied')
5728 fm.end()
5728 fm.end()
5729
5729
5730 @command('^summary|sum',
5730 @command('^summary|sum',
5731 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
5731 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
5732 def summary(ui, repo, **opts):
5732 def summary(ui, repo, **opts):
5733 """summarize working directory state
5733 """summarize working directory state
5734
5734
5735 This generates a brief summary of the working directory state,
5735 This generates a brief summary of the working directory state,
5736 including parents, branch, commit status, and available updates.
5736 including parents, branch, commit status, and available updates.
5737
5737
5738 With the --remote option, this will check the default paths for
5738 With the --remote option, this will check the default paths for
5739 incoming and outgoing changes. This can be time-consuming.
5739 incoming and outgoing changes. This can be time-consuming.
5740
5740
5741 Returns 0 on success.
5741 Returns 0 on success.
5742 """
5742 """
5743
5743
5744 ctx = repo[None]
5744 ctx = repo[None]
5745 parents = ctx.parents()
5745 parents = ctx.parents()
5746 pnode = parents[0].node()
5746 pnode = parents[0].node()
5747 marks = []
5747 marks = []
5748
5748
5749 for p in parents:
5749 for p in parents:
5750 # label with log.changeset (instead of log.parent) since this
5750 # label with log.changeset (instead of log.parent) since this
5751 # shows a working directory parent *changeset*:
5751 # shows a working directory parent *changeset*:
5752 # i18n: column positioning for "hg summary"
5752 # i18n: column positioning for "hg summary"
5753 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
5753 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
5754 label='log.changeset changeset.%s' % p.phasestr())
5754 label='log.changeset changeset.%s' % p.phasestr())
5755 ui.write(' '.join(p.tags()), label='log.tag')
5755 ui.write(' '.join(p.tags()), label='log.tag')
5756 if p.bookmarks():
5756 if p.bookmarks():
5757 marks.extend(p.bookmarks())
5757 marks.extend(p.bookmarks())
5758 if p.rev() == -1:
5758 if p.rev() == -1:
5759 if not len(repo):
5759 if not len(repo):
5760 ui.write(_(' (empty repository)'))
5760 ui.write(_(' (empty repository)'))
5761 else:
5761 else:
5762 ui.write(_(' (no revision checked out)'))
5762 ui.write(_(' (no revision checked out)'))
5763 ui.write('\n')
5763 ui.write('\n')
5764 if p.description():
5764 if p.description():
5765 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5765 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5766 label='log.summary')
5766 label='log.summary')
5767
5767
5768 branch = ctx.branch()
5768 branch = ctx.branch()
5769 bheads = repo.branchheads(branch)
5769 bheads = repo.branchheads(branch)
5770 # i18n: column positioning for "hg summary"
5770 # i18n: column positioning for "hg summary"
5771 m = _('branch: %s\n') % branch
5771 m = _('branch: %s\n') % branch
5772 if branch != 'default':
5772 if branch != 'default':
5773 ui.write(m, label='log.branch')
5773 ui.write(m, label='log.branch')
5774 else:
5774 else:
5775 ui.status(m, label='log.branch')
5775 ui.status(m, label='log.branch')
5776
5776
5777 if marks:
5777 if marks:
5778 current = repo._bookmarkcurrent
5778 current = repo._bookmarkcurrent
5779 # i18n: column positioning for "hg summary"
5779 # i18n: column positioning for "hg summary"
5780 ui.write(_('bookmarks:'), label='log.bookmark')
5780 ui.write(_('bookmarks:'), label='log.bookmark')
5781 if current is not None:
5781 if current is not None:
5782 if current in marks:
5782 if current in marks:
5783 ui.write(' *' + current, label='bookmarks.current')
5783 ui.write(' *' + current, label='bookmarks.current')
5784 marks.remove(current)
5784 marks.remove(current)
5785 else:
5785 else:
5786 ui.write(' [%s]' % current, label='bookmarks.current')
5786 ui.write(' [%s]' % current, label='bookmarks.current')
5787 for m in marks:
5787 for m in marks:
5788 ui.write(' ' + m, label='log.bookmark')
5788 ui.write(' ' + m, label='log.bookmark')
5789 ui.write('\n', label='log.bookmark')
5789 ui.write('\n', label='log.bookmark')
5790
5790
5791 status = repo.status(unknown=True)
5791 status = repo.status(unknown=True)
5792
5792
5793 c = repo.dirstate.copies()
5793 c = repo.dirstate.copies()
5794 copied, renamed = [], []
5794 copied, renamed = [], []
5795 for d, s in c.iteritems():
5795 for d, s in c.iteritems():
5796 if s in status.removed:
5796 if s in status.removed:
5797 status.removed.remove(s)
5797 status.removed.remove(s)
5798 renamed.append(d)
5798 renamed.append(d)
5799 else:
5799 else:
5800 copied.append(d)
5800 copied.append(d)
5801 if d in status.added:
5801 if d in status.added:
5802 status.added.remove(d)
5802 status.added.remove(d)
5803
5803
5804 ms = mergemod.mergestate(repo)
5804 ms = mergemod.mergestate(repo)
5805 unresolved = [f for f in ms if ms[f] == 'u']
5805 unresolved = [f for f in ms if ms[f] == 'u']
5806
5806
5807 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5807 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5808
5808
5809 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
5809 labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified),
5810 (ui.label(_('%d added'), 'status.added'), status.added),
5810 (ui.label(_('%d added'), 'status.added'), status.added),
5811 (ui.label(_('%d removed'), 'status.removed'), status.removed),
5811 (ui.label(_('%d removed'), 'status.removed'), status.removed),
5812 (ui.label(_('%d renamed'), 'status.copied'), renamed),
5812 (ui.label(_('%d renamed'), 'status.copied'), renamed),
5813 (ui.label(_('%d copied'), 'status.copied'), copied),
5813 (ui.label(_('%d copied'), 'status.copied'), copied),
5814 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
5814 (ui.label(_('%d deleted'), 'status.deleted'), status.deleted),
5815 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
5815 (ui.label(_('%d unknown'), 'status.unknown'), status.unknown),
5816 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
5816 (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved),
5817 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
5817 (ui.label(_('%d subrepos'), 'status.modified'), subs)]
5818 t = []
5818 t = []
5819 for l, s in labels:
5819 for l, s in labels:
5820 if s:
5820 if s:
5821 t.append(l % len(s))
5821 t.append(l % len(s))
5822
5822
5823 t = ', '.join(t)
5823 t = ', '.join(t)
5824 cleanworkdir = False
5824 cleanworkdir = False
5825
5825
5826 if repo.vfs.exists('updatestate'):
5826 if repo.vfs.exists('updatestate'):
5827 t += _(' (interrupted update)')
5827 t += _(' (interrupted update)')
5828 elif len(parents) > 1:
5828 elif len(parents) > 1:
5829 t += _(' (merge)')
5829 t += _(' (merge)')
5830 elif branch != parents[0].branch():
5830 elif branch != parents[0].branch():
5831 t += _(' (new branch)')
5831 t += _(' (new branch)')
5832 elif (parents[0].closesbranch() and
5832 elif (parents[0].closesbranch() and
5833 pnode in repo.branchheads(branch, closed=True)):
5833 pnode in repo.branchheads(branch, closed=True)):
5834 t += _(' (head closed)')
5834 t += _(' (head closed)')
5835 elif not (status.modified or status.added or status.removed or renamed or
5835 elif not (status.modified or status.added or status.removed or renamed or
5836 copied or subs):
5836 copied or subs):
5837 t += _(' (clean)')
5837 t += _(' (clean)')
5838 cleanworkdir = True
5838 cleanworkdir = True
5839 elif pnode not in bheads:
5839 elif pnode not in bheads:
5840 t += _(' (new branch head)')
5840 t += _(' (new branch head)')
5841
5841
5842 if cleanworkdir:
5842 if cleanworkdir:
5843 # i18n: column positioning for "hg summary"
5843 # i18n: column positioning for "hg summary"
5844 ui.status(_('commit: %s\n') % t.strip())
5844 ui.status(_('commit: %s\n') % t.strip())
5845 else:
5845 else:
5846 # i18n: column positioning for "hg summary"
5846 # i18n: column positioning for "hg summary"
5847 ui.write(_('commit: %s\n') % t.strip())
5847 ui.write(_('commit: %s\n') % t.strip())
5848
5848
5849 # all ancestors of branch heads - all ancestors of parent = new csets
5849 # all ancestors of branch heads - all ancestors of parent = new csets
5850 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
5850 new = len(repo.changelog.findmissing([pctx.node() for pctx in parents],
5851 bheads))
5851 bheads))
5852
5852
5853 if new == 0:
5853 if new == 0:
5854 # i18n: column positioning for "hg summary"
5854 # i18n: column positioning for "hg summary"
5855 ui.status(_('update: (current)\n'))
5855 ui.status(_('update: (current)\n'))
5856 elif pnode not in bheads:
5856 elif pnode not in bheads:
5857 # i18n: column positioning for "hg summary"
5857 # i18n: column positioning for "hg summary"
5858 ui.write(_('update: %d new changesets (update)\n') % new)
5858 ui.write(_('update: %d new changesets (update)\n') % new)
5859 else:
5859 else:
5860 # i18n: column positioning for "hg summary"
5860 # i18n: column positioning for "hg summary"
5861 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5861 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5862 (new, len(bheads)))
5862 (new, len(bheads)))
5863
5863
5864 cmdutil.summaryhooks(ui, repo)
5864 cmdutil.summaryhooks(ui, repo)
5865
5865
5866 if opts.get('remote'):
5866 if opts.get('remote'):
5867 needsincoming, needsoutgoing = True, True
5867 needsincoming, needsoutgoing = True, True
5868 else:
5868 else:
5869 needsincoming, needsoutgoing = False, False
5869 needsincoming, needsoutgoing = False, False
5870 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
5870 for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None):
5871 if i:
5871 if i:
5872 needsincoming = True
5872 needsincoming = True
5873 if o:
5873 if o:
5874 needsoutgoing = True
5874 needsoutgoing = True
5875 if not needsincoming and not needsoutgoing:
5875 if not needsincoming and not needsoutgoing:
5876 return
5876 return
5877
5877
5878 def getincoming():
5878 def getincoming():
5879 source, branches = hg.parseurl(ui.expandpath('default'))
5879 source, branches = hg.parseurl(ui.expandpath('default'))
5880 sbranch = branches[0]
5880 sbranch = branches[0]
5881 try:
5881 try:
5882 other = hg.peer(repo, {}, source)
5882 other = hg.peer(repo, {}, source)
5883 except error.RepoError:
5883 except error.RepoError:
5884 if opts.get('remote'):
5884 if opts.get('remote'):
5885 raise
5885 raise
5886 return source, sbranch, None, None, None
5886 return source, sbranch, None, None, None
5887 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5887 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5888 if revs:
5888 if revs:
5889 revs = [other.lookup(rev) for rev in revs]
5889 revs = [other.lookup(rev) for rev in revs]
5890 ui.debug('comparing with %s\n' % util.hidepassword(source))
5890 ui.debug('comparing with %s\n' % util.hidepassword(source))
5891 repo.ui.pushbuffer()
5891 repo.ui.pushbuffer()
5892 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5892 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5893 repo.ui.popbuffer()
5893 repo.ui.popbuffer()
5894 return source, sbranch, other, commoninc, commoninc[1]
5894 return source, sbranch, other, commoninc, commoninc[1]
5895
5895
5896 if needsincoming:
5896 if needsincoming:
5897 source, sbranch, sother, commoninc, incoming = getincoming()
5897 source, sbranch, sother, commoninc, incoming = getincoming()
5898 else:
5898 else:
5899 source = sbranch = sother = commoninc = incoming = None
5899 source = sbranch = sother = commoninc = incoming = None
5900
5900
5901 def getoutgoing():
5901 def getoutgoing():
5902 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5902 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5903 dbranch = branches[0]
5903 dbranch = branches[0]
5904 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5904 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5905 if source != dest:
5905 if source != dest:
5906 try:
5906 try:
5907 dother = hg.peer(repo, {}, dest)
5907 dother = hg.peer(repo, {}, dest)
5908 except error.RepoError:
5908 except error.RepoError:
5909 if opts.get('remote'):
5909 if opts.get('remote'):
5910 raise
5910 raise
5911 return dest, dbranch, None, None
5911 return dest, dbranch, None, None
5912 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5912 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5913 elif sother is None:
5913 elif sother is None:
5914 # there is no explicit destination peer, but source one is invalid
5914 # there is no explicit destination peer, but source one is invalid
5915 return dest, dbranch, None, None
5915 return dest, dbranch, None, None
5916 else:
5916 else:
5917 dother = sother
5917 dother = sother
5918 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5918 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5919 common = None
5919 common = None
5920 else:
5920 else:
5921 common = commoninc
5921 common = commoninc
5922 if revs:
5922 if revs:
5923 revs = [repo.lookup(rev) for rev in revs]
5923 revs = [repo.lookup(rev) for rev in revs]
5924 repo.ui.pushbuffer()
5924 repo.ui.pushbuffer()
5925 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5925 outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs,
5926 commoninc=common)
5926 commoninc=common)
5927 repo.ui.popbuffer()
5927 repo.ui.popbuffer()
5928 return dest, dbranch, dother, outgoing
5928 return dest, dbranch, dother, outgoing
5929
5929
5930 if needsoutgoing:
5930 if needsoutgoing:
5931 dest, dbranch, dother, outgoing = getoutgoing()
5931 dest, dbranch, dother, outgoing = getoutgoing()
5932 else:
5932 else:
5933 dest = dbranch = dother = outgoing = None
5933 dest = dbranch = dother = outgoing = None
5934
5934
5935 if opts.get('remote'):
5935 if opts.get('remote'):
5936 t = []
5936 t = []
5937 if incoming:
5937 if incoming:
5938 t.append(_('1 or more incoming'))
5938 t.append(_('1 or more incoming'))
5939 o = outgoing.missing
5939 o = outgoing.missing
5940 if o:
5940 if o:
5941 t.append(_('%d outgoing') % len(o))
5941 t.append(_('%d outgoing') % len(o))
5942 other = dother or sother
5942 other = dother or sother
5943 if 'bookmarks' in other.listkeys('namespaces'):
5943 if 'bookmarks' in other.listkeys('namespaces'):
5944 lmarks = repo.listkeys('bookmarks')
5944 lmarks = repo.listkeys('bookmarks')
5945 rmarks = other.listkeys('bookmarks')
5945 rmarks = other.listkeys('bookmarks')
5946 diff = set(rmarks) - set(lmarks)
5946 diff = set(rmarks) - set(lmarks)
5947 if len(diff) > 0:
5947 if len(diff) > 0:
5948 t.append(_('%d incoming bookmarks') % len(diff))
5948 t.append(_('%d incoming bookmarks') % len(diff))
5949 diff = set(lmarks) - set(rmarks)
5949 diff = set(lmarks) - set(rmarks)
5950 if len(diff) > 0:
5950 if len(diff) > 0:
5951 t.append(_('%d outgoing bookmarks') % len(diff))
5951 t.append(_('%d outgoing bookmarks') % len(diff))
5952
5952
5953 if t:
5953 if t:
5954 # i18n: column positioning for "hg summary"
5954 # i18n: column positioning for "hg summary"
5955 ui.write(_('remote: %s\n') % (', '.join(t)))
5955 ui.write(_('remote: %s\n') % (', '.join(t)))
5956 else:
5956 else:
5957 # i18n: column positioning for "hg summary"
5957 # i18n: column positioning for "hg summary"
5958 ui.status(_('remote: (synced)\n'))
5958 ui.status(_('remote: (synced)\n'))
5959
5959
5960 cmdutil.summaryremotehooks(ui, repo, opts,
5960 cmdutil.summaryremotehooks(ui, repo, opts,
5961 ((source, sbranch, sother, commoninc),
5961 ((source, sbranch, sother, commoninc),
5962 (dest, dbranch, dother, outgoing)))
5962 (dest, dbranch, dother, outgoing)))
5963
5963
5964 @command('tag',
5964 @command('tag',
5965 [('f', 'force', None, _('force tag')),
5965 [('f', 'force', None, _('force tag')),
5966 ('l', 'local', None, _('make the tag local')),
5966 ('l', 'local', None, _('make the tag local')),
5967 ('r', 'rev', '', _('revision to tag'), _('REV')),
5967 ('r', 'rev', '', _('revision to tag'), _('REV')),
5968 ('', 'remove', None, _('remove a tag')),
5968 ('', 'remove', None, _('remove a tag')),
5969 # -l/--local is already there, commitopts cannot be used
5969 # -l/--local is already there, commitopts cannot be used
5970 ('e', 'edit', None, _('invoke editor on commit messages')),
5970 ('e', 'edit', None, _('invoke editor on commit messages')),
5971 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5971 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5972 ] + commitopts2,
5972 ] + commitopts2,
5973 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5973 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5974 def tag(ui, repo, name1, *names, **opts):
5974 def tag(ui, repo, name1, *names, **opts):
5975 """add one or more tags for the current or given revision
5975 """add one or more tags for the current or given revision
5976
5976
5977 Name a particular revision using <name>.
5977 Name a particular revision using <name>.
5978
5978
5979 Tags are used to name particular revisions of the repository and are
5979 Tags are used to name particular revisions of the repository and are
5980 very useful to compare different revisions, to go back to significant
5980 very useful to compare different revisions, to go back to significant
5981 earlier versions or to mark branch points as releases, etc. Changing
5981 earlier versions or to mark branch points as releases, etc. Changing
5982 an existing tag is normally disallowed; use -f/--force to override.
5982 an existing tag is normally disallowed; use -f/--force to override.
5983
5983
5984 If no revision is given, the parent of the working directory is
5984 If no revision is given, the parent of the working directory is
5985 used.
5985 used.
5986
5986
5987 To facilitate version control, distribution, and merging of tags,
5987 To facilitate version control, distribution, and merging of tags,
5988 they are stored as a file named ".hgtags" which is managed similarly
5988 they are stored as a file named ".hgtags" which is managed similarly
5989 to other project files and can be hand-edited if necessary. This
5989 to other project files and can be hand-edited if necessary. This
5990 also means that tagging creates a new commit. The file
5990 also means that tagging creates a new commit. The file
5991 ".hg/localtags" is used for local tags (not shared among
5991 ".hg/localtags" is used for local tags (not shared among
5992 repositories).
5992 repositories).
5993
5993
5994 Tag commits are usually made at the head of a branch. If the parent
5994 Tag commits are usually made at the head of a branch. If the parent
5995 of the working directory is not a branch head, :hg:`tag` aborts; use
5995 of the working directory is not a branch head, :hg:`tag` aborts; use
5996 -f/--force to force the tag commit to be based on a non-head
5996 -f/--force to force the tag commit to be based on a non-head
5997 changeset.
5997 changeset.
5998
5998
5999 See :hg:`help dates` for a list of formats valid for -d/--date.
5999 See :hg:`help dates` for a list of formats valid for -d/--date.
6000
6000
6001 Since tag names have priority over branch names during revision
6001 Since tag names have priority over branch names during revision
6002 lookup, using an existing branch name as a tag name is discouraged.
6002 lookup, using an existing branch name as a tag name is discouraged.
6003
6003
6004 Returns 0 on success.
6004 Returns 0 on success.
6005 """
6005 """
6006 wlock = lock = None
6006 wlock = lock = None
6007 try:
6007 try:
6008 wlock = repo.wlock()
6008 wlock = repo.wlock()
6009 lock = repo.lock()
6009 lock = repo.lock()
6010 rev_ = "."
6010 rev_ = "."
6011 names = [t.strip() for t in (name1,) + names]
6011 names = [t.strip() for t in (name1,) + names]
6012 if len(names) != len(set(names)):
6012 if len(names) != len(set(names)):
6013 raise util.Abort(_('tag names must be unique'))
6013 raise util.Abort(_('tag names must be unique'))
6014 for n in names:
6014 for n in names:
6015 scmutil.checknewlabel(repo, n, 'tag')
6015 scmutil.checknewlabel(repo, n, 'tag')
6016 if not n:
6016 if not n:
6017 raise util.Abort(_('tag names cannot consist entirely of '
6017 raise util.Abort(_('tag names cannot consist entirely of '
6018 'whitespace'))
6018 'whitespace'))
6019 if opts.get('rev') and opts.get('remove'):
6019 if opts.get('rev') and opts.get('remove'):
6020 raise util.Abort(_("--rev and --remove are incompatible"))
6020 raise util.Abort(_("--rev and --remove are incompatible"))
6021 if opts.get('rev'):
6021 if opts.get('rev'):
6022 rev_ = opts['rev']
6022 rev_ = opts['rev']
6023 message = opts.get('message')
6023 message = opts.get('message')
6024 if opts.get('remove'):
6024 if opts.get('remove'):
6025 expectedtype = opts.get('local') and 'local' or 'global'
6025 expectedtype = opts.get('local') and 'local' or 'global'
6026 for n in names:
6026 for n in names:
6027 if not repo.tagtype(n):
6027 if not repo.tagtype(n):
6028 raise util.Abort(_("tag '%s' does not exist") % n)
6028 raise util.Abort(_("tag '%s' does not exist") % n)
6029 if repo.tagtype(n) != expectedtype:
6029 if repo.tagtype(n) != expectedtype:
6030 if expectedtype == 'global':
6030 if expectedtype == 'global':
6031 raise util.Abort(_("tag '%s' is not a global tag") % n)
6031 raise util.Abort(_("tag '%s' is not a global tag") % n)
6032 else:
6032 else:
6033 raise util.Abort(_("tag '%s' is not a local tag") % n)
6033 raise util.Abort(_("tag '%s' is not a local tag") % n)
6034 rev_ = nullid
6034 rev_ = nullid
6035 if not message:
6035 if not message:
6036 # we don't translate commit messages
6036 # we don't translate commit messages
6037 message = 'Removed tag %s' % ', '.join(names)
6037 message = 'Removed tag %s' % ', '.join(names)
6038 elif not opts.get('force'):
6038 elif not opts.get('force'):
6039 for n in names:
6039 for n in names:
6040 if n in repo.tags():
6040 if n in repo.tags():
6041 raise util.Abort(_("tag '%s' already exists "
6041 raise util.Abort(_("tag '%s' already exists "
6042 "(use -f to force)") % n)
6042 "(use -f to force)") % n)
6043 if not opts.get('local'):
6043 if not opts.get('local'):
6044 p1, p2 = repo.dirstate.parents()
6044 p1, p2 = repo.dirstate.parents()
6045 if p2 != nullid:
6045 if p2 != nullid:
6046 raise util.Abort(_('uncommitted merge'))
6046 raise util.Abort(_('uncommitted merge'))
6047 bheads = repo.branchheads()
6047 bheads = repo.branchheads()
6048 if not opts.get('force') and bheads and p1 not in bheads:
6048 if not opts.get('force') and bheads and p1 not in bheads:
6049 raise util.Abort(_('not at a branch head (use -f to force)'))
6049 raise util.Abort(_('not at a branch head (use -f to force)'))
6050 r = scmutil.revsingle(repo, rev_).node()
6050 r = scmutil.revsingle(repo, rev_).node()
6051
6051
6052 if not message:
6052 if not message:
6053 # we don't translate commit messages
6053 # we don't translate commit messages
6054 message = ('Added tag %s for changeset %s' %
6054 message = ('Added tag %s for changeset %s' %
6055 (', '.join(names), short(r)))
6055 (', '.join(names), short(r)))
6056
6056
6057 date = opts.get('date')
6057 date = opts.get('date')
6058 if date:
6058 if date:
6059 date = util.parsedate(date)
6059 date = util.parsedate(date)
6060
6060
6061 if opts.get('remove'):
6061 if opts.get('remove'):
6062 editform = 'tag.remove'
6062 editform = 'tag.remove'
6063 else:
6063 else:
6064 editform = 'tag.add'
6064 editform = 'tag.add'
6065 editor = cmdutil.getcommiteditor(editform=editform, **opts)
6065 editor = cmdutil.getcommiteditor(editform=editform, **opts)
6066
6066
6067 # don't allow tagging the null rev
6067 # don't allow tagging the null rev
6068 if (not opts.get('remove') and
6068 if (not opts.get('remove') and
6069 scmutil.revsingle(repo, rev_).rev() == nullrev):
6069 scmutil.revsingle(repo, rev_).rev() == nullrev):
6070 raise util.Abort(_("cannot tag null revision"))
6070 raise util.Abort(_("cannot tag null revision"))
6071
6071
6072 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
6072 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date,
6073 editor=editor)
6073 editor=editor)
6074 finally:
6074 finally:
6075 release(lock, wlock)
6075 release(lock, wlock)
6076
6076
6077 @command('tags', formatteropts, '')
6077 @command('tags', formatteropts, '')
6078 def tags(ui, repo, **opts):
6078 def tags(ui, repo, **opts):
6079 """list repository tags
6079 """list repository tags
6080
6080
6081 This lists both regular and local tags. When the -v/--verbose
6081 This lists both regular and local tags. When the -v/--verbose
6082 switch is used, a third column "local" is printed for local tags.
6082 switch is used, a third column "local" is printed for local tags.
6083
6083
6084 Returns 0 on success.
6084 Returns 0 on success.
6085 """
6085 """
6086
6086
6087 fm = ui.formatter('tags', opts)
6087 fm = ui.formatter('tags', opts)
6088 hexfunc = fm.hexfunc
6088 hexfunc = fm.hexfunc
6089 tagtype = ""
6089 tagtype = ""
6090
6090
6091 for t, n in reversed(repo.tagslist()):
6091 for t, n in reversed(repo.tagslist()):
6092 hn = hexfunc(n)
6092 hn = hexfunc(n)
6093 label = 'tags.normal'
6093 label = 'tags.normal'
6094 tagtype = ''
6094 tagtype = ''
6095 if repo.tagtype(t) == 'local':
6095 if repo.tagtype(t) == 'local':
6096 label = 'tags.local'
6096 label = 'tags.local'
6097 tagtype = 'local'
6097 tagtype = 'local'
6098
6098
6099 fm.startitem()
6099 fm.startitem()
6100 fm.write('tag', '%s', t, label=label)
6100 fm.write('tag', '%s', t, label=label)
6101 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
6101 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
6102 fm.condwrite(not ui.quiet, 'rev node', fmt,
6102 fm.condwrite(not ui.quiet, 'rev node', fmt,
6103 repo.changelog.rev(n), hn, label=label)
6103 repo.changelog.rev(n), hn, label=label)
6104 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
6104 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
6105 tagtype, label=label)
6105 tagtype, label=label)
6106 fm.plain('\n')
6106 fm.plain('\n')
6107 fm.end()
6107 fm.end()
6108
6108
6109 @command('tip',
6109 @command('tip',
6110 [('p', 'patch', None, _('show patch')),
6110 [('p', 'patch', None, _('show patch')),
6111 ('g', 'git', None, _('use git extended diff format')),
6111 ('g', 'git', None, _('use git extended diff format')),
6112 ] + templateopts,
6112 ] + templateopts,
6113 _('[-p] [-g]'))
6113 _('[-p] [-g]'))
6114 def tip(ui, repo, **opts):
6114 def tip(ui, repo, **opts):
6115 """show the tip revision (DEPRECATED)
6115 """show the tip revision (DEPRECATED)
6116
6116
6117 The tip revision (usually just called the tip) is the changeset
6117 The tip revision (usually just called the tip) is the changeset
6118 most recently added to the repository (and therefore the most
6118 most recently added to the repository (and therefore the most
6119 recently changed head).
6119 recently changed head).
6120
6120
6121 If you have just made a commit, that commit will be the tip. If
6121 If you have just made a commit, that commit will be the tip. If
6122 you have just pulled changes from another repository, the tip of
6122 you have just pulled changes from another repository, the tip of
6123 that repository becomes the current tip. The "tip" tag is special
6123 that repository becomes the current tip. The "tip" tag is special
6124 and cannot be renamed or assigned to a different changeset.
6124 and cannot be renamed or assigned to a different changeset.
6125
6125
6126 This command is deprecated, please use :hg:`heads` instead.
6126 This command is deprecated, please use :hg:`heads` instead.
6127
6127
6128 Returns 0 on success.
6128 Returns 0 on success.
6129 """
6129 """
6130 displayer = cmdutil.show_changeset(ui, repo, opts)
6130 displayer = cmdutil.show_changeset(ui, repo, opts)
6131 displayer.show(repo['tip'])
6131 displayer.show(repo['tip'])
6132 displayer.close()
6132 displayer.close()
6133
6133
6134 @command('unbundle',
6134 @command('unbundle',
6135 [('u', 'update', None,
6135 [('u', 'update', None,
6136 _('update to new branch head if changesets were unbundled'))],
6136 _('update to new branch head if changesets were unbundled'))],
6137 _('[-u] FILE...'))
6137 _('[-u] FILE...'))
6138 def unbundle(ui, repo, fname1, *fnames, **opts):
6138 def unbundle(ui, repo, fname1, *fnames, **opts):
6139 """apply one or more changegroup files
6139 """apply one or more changegroup files
6140
6140
6141 Apply one or more compressed changegroup files generated by the
6141 Apply one or more compressed changegroup files generated by the
6142 bundle command.
6142 bundle command.
6143
6143
6144 Returns 0 on success, 1 if an update has unresolved files.
6144 Returns 0 on success, 1 if an update has unresolved files.
6145 """
6145 """
6146 fnames = (fname1,) + fnames
6146 fnames = (fname1,) + fnames
6147
6147
6148 lock = repo.lock()
6148 lock = repo.lock()
6149 try:
6149 try:
6150 for fname in fnames:
6150 for fname in fnames:
6151 f = hg.openpath(ui, fname)
6151 f = hg.openpath(ui, fname)
6152 gen = exchange.readbundle(ui, f, fname)
6152 gen = exchange.readbundle(ui, f, fname)
6153 modheads = changegroup.addchangegroup(repo, gen, 'unbundle',
6153 modheads = changegroup.addchangegroup(repo, gen, 'unbundle',
6154 'bundle:' + fname)
6154 'bundle:' + fname)
6155 finally:
6155 finally:
6156 lock.release()
6156 lock.release()
6157
6157
6158 return postincoming(ui, repo, modheads, opts.get('update'), None)
6158 return postincoming(ui, repo, modheads, opts.get('update'), None)
6159
6159
6160 @command('^update|up|checkout|co',
6160 @command('^update|up|checkout|co',
6161 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
6161 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
6162 ('c', 'check', None,
6162 ('c', 'check', None,
6163 _('update across branches if no uncommitted changes')),
6163 _('update across branches if no uncommitted changes')),
6164 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6164 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
6165 ('r', 'rev', '', _('revision'), _('REV'))
6165 ('r', 'rev', '', _('revision'), _('REV'))
6166 ] + mergetoolopts,
6166 ] + mergetoolopts,
6167 _('[-c] [-C] [-d DATE] [[-r] REV]'))
6167 _('[-c] [-C] [-d DATE] [[-r] REV]'))
6168 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
6168 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
6169 tool=None):
6169 tool=None):
6170 """update working directory (or switch revisions)
6170 """update working directory (or switch revisions)
6171
6171
6172 Update the repository's working directory to the specified
6172 Update the repository's working directory to the specified
6173 changeset. If no changeset is specified, update to the tip of the
6173 changeset. If no changeset is specified, update to the tip of the
6174 current named branch and move the current bookmark (see :hg:`help
6174 current named branch and move the current bookmark (see :hg:`help
6175 bookmarks`).
6175 bookmarks`).
6176
6176
6177 Update sets the working directory's parent revision to the specified
6177 Update sets the working directory's parent revision to the specified
6178 changeset (see :hg:`help parents`).
6178 changeset (see :hg:`help parents`).
6179
6179
6180 If the changeset is not a descendant or ancestor of the working
6180 If the changeset is not a descendant or ancestor of the working
6181 directory's parent, the update is aborted. With the -c/--check
6181 directory's parent, the update is aborted. With the -c/--check
6182 option, the working directory is checked for uncommitted changes; if
6182 option, the working directory is checked for uncommitted changes; if
6183 none are found, the working directory is updated to the specified
6183 none are found, the working directory is updated to the specified
6184 changeset.
6184 changeset.
6185
6185
6186 .. container:: verbose
6186 .. container:: verbose
6187
6187
6188 The following rules apply when the working directory contains
6188 The following rules apply when the working directory contains
6189 uncommitted changes:
6189 uncommitted changes:
6190
6190
6191 1. If neither -c/--check nor -C/--clean is specified, and if
6191 1. If neither -c/--check nor -C/--clean is specified, and if
6192 the requested changeset is an ancestor or descendant of
6192 the requested changeset is an ancestor or descendant of
6193 the working directory's parent, the uncommitted changes
6193 the working directory's parent, the uncommitted changes
6194 are merged into the requested changeset and the merged
6194 are merged into the requested changeset and the merged
6195 result is left uncommitted. If the requested changeset is
6195 result is left uncommitted. If the requested changeset is
6196 not an ancestor or descendant (that is, it is on another
6196 not an ancestor or descendant (that is, it is on another
6197 branch), the update is aborted and the uncommitted changes
6197 branch), the update is aborted and the uncommitted changes
6198 are preserved.
6198 are preserved.
6199
6199
6200 2. With the -c/--check option, the update is aborted and the
6200 2. With the -c/--check option, the update is aborted and the
6201 uncommitted changes are preserved.
6201 uncommitted changes are preserved.
6202
6202
6203 3. With the -C/--clean option, uncommitted changes are discarded and
6203 3. With the -C/--clean option, uncommitted changes are discarded and
6204 the working directory is updated to the requested changeset.
6204 the working directory is updated to the requested changeset.
6205
6205
6206 To cancel an uncommitted merge (and lose your changes), use
6206 To cancel an uncommitted merge (and lose your changes), use
6207 :hg:`update --clean .`.
6207 :hg:`update --clean .`.
6208
6208
6209 Use null as the changeset to remove the working directory (like
6209 Use null as the changeset to remove the working directory (like
6210 :hg:`clone -U`).
6210 :hg:`clone -U`).
6211
6211
6212 If you want to revert just one file to an older revision, use
6212 If you want to revert just one file to an older revision, use
6213 :hg:`revert [-r REV] NAME`.
6213 :hg:`revert [-r REV] NAME`.
6214
6214
6215 See :hg:`help dates` for a list of formats valid for -d/--date.
6215 See :hg:`help dates` for a list of formats valid for -d/--date.
6216
6216
6217 Returns 0 on success, 1 if there are unresolved files.
6217 Returns 0 on success, 1 if there are unresolved files.
6218 """
6218 """
6219 if rev and node:
6219 if rev and node:
6220 raise util.Abort(_("please specify just one revision"))
6220 raise util.Abort(_("please specify just one revision"))
6221
6221
6222 if rev is None or rev == '':
6222 if rev is None or rev == '':
6223 rev = node
6223 rev = node
6224
6224
6225 cmdutil.clearunfinished(repo)
6225 cmdutil.clearunfinished(repo)
6226
6226
6227 # with no argument, we also move the current bookmark, if any
6227 # with no argument, we also move the current bookmark, if any
6228 rev, movemarkfrom = bookmarks.calculateupdate(ui, repo, rev)
6228 rev, movemarkfrom = bookmarks.calculateupdate(ui, repo, rev)
6229
6229
6230 # if we defined a bookmark, we have to remember the original bookmark name
6230 # if we defined a bookmark, we have to remember the original bookmark name
6231 brev = rev
6231 brev = rev
6232 rev = scmutil.revsingle(repo, rev, rev).rev()
6232 rev = scmutil.revsingle(repo, rev, rev).rev()
6233
6233
6234 if check and clean:
6234 if check and clean:
6235 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
6235 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
6236
6236
6237 if date:
6237 if date:
6238 if rev is not None:
6238 if rev is not None:
6239 raise util.Abort(_("you can't specify a revision and a date"))
6239 raise util.Abort(_("you can't specify a revision and a date"))
6240 rev = cmdutil.finddate(ui, repo, date)
6240 rev = cmdutil.finddate(ui, repo, date)
6241
6241
6242 if check:
6242 if check:
6243 c = repo[None]
6243 c = repo[None]
6244 if c.dirty(merge=False, branch=False, missing=True):
6244 if c.dirty(merge=False, branch=False, missing=True):
6245 raise util.Abort(_("uncommitted changes"))
6245 raise util.Abort(_("uncommitted changes"))
6246 if rev is None:
6246 if rev is None:
6247 rev = repo[repo[None].branch()].rev()
6247 rev = repo[repo[None].branch()].rev()
6248 mergemod._checkunknown(repo, repo[None], repo[rev])
6248 mergemod._checkunknown(repo, repo[None], repo[rev])
6249
6249
6250 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
6250 repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
6251
6251
6252 if clean:
6252 if clean:
6253 ret = hg.clean(repo, rev)
6253 ret = hg.clean(repo, rev)
6254 else:
6254 else:
6255 ret = hg.update(repo, rev)
6255 ret = hg.update(repo, rev)
6256
6256
6257 if not ret and movemarkfrom:
6257 if not ret and movemarkfrom:
6258 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
6258 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
6259 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
6259 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
6260 elif brev in repo._bookmarks:
6260 elif brev in repo._bookmarks:
6261 bookmarks.setcurrent(repo, brev)
6261 bookmarks.setcurrent(repo, brev)
6262 ui.status(_("(activating bookmark %s)\n") % brev)
6262 ui.status(_("(activating bookmark %s)\n") % brev)
6263 elif brev:
6263 elif brev:
6264 if repo._bookmarkcurrent:
6264 if repo._bookmarkcurrent:
6265 ui.status(_("(leaving bookmark %s)\n") %
6265 ui.status(_("(leaving bookmark %s)\n") %
6266 repo._bookmarkcurrent)
6266 repo._bookmarkcurrent)
6267 bookmarks.unsetcurrent(repo)
6267 bookmarks.unsetcurrent(repo)
6268
6268
6269 return ret
6269 return ret
6270
6270
6271 @command('verify', [])
6271 @command('verify', [])
6272 def verify(ui, repo):
6272 def verify(ui, repo):
6273 """verify the integrity of the repository
6273 """verify the integrity of the repository
6274
6274
6275 Verify the integrity of the current repository.
6275 Verify the integrity of the current repository.
6276
6276
6277 This will perform an extensive check of the repository's
6277 This will perform an extensive check of the repository's
6278 integrity, validating the hashes and checksums of each entry in
6278 integrity, validating the hashes and checksums of each entry in
6279 the changelog, manifest, and tracked files, as well as the
6279 the changelog, manifest, and tracked files, as well as the
6280 integrity of their crosslinks and indices.
6280 integrity of their crosslinks and indices.
6281
6281
6282 Please see http://mercurial.selenic.com/wiki/RepositoryCorruption
6282 Please see http://mercurial.selenic.com/wiki/RepositoryCorruption
6283 for more information about recovery from corruption of the
6283 for more information about recovery from corruption of the
6284 repository.
6284 repository.
6285
6285
6286 Returns 0 on success, 1 if errors are encountered.
6286 Returns 0 on success, 1 if errors are encountered.
6287 """
6287 """
6288 return hg.verify(repo)
6288 return hg.verify(repo)
6289
6289
6290 @command('version', [], norepo=True)
6290 @command('version', [], norepo=True)
6291 def version_(ui):
6291 def version_(ui):
6292 """output version and copyright information"""
6292 """output version and copyright information"""
6293 ui.write(_("Mercurial Distributed SCM (version %s)\n")
6293 ui.write(_("Mercurial Distributed SCM (version %s)\n")
6294 % util.version())
6294 % util.version())
6295 ui.status(_(
6295 ui.status(_(
6296 "(see http://mercurial.selenic.com for more information)\n"
6296 "(see http://mercurial.selenic.com for more information)\n"
6297 "\nCopyright (C) 2005-2014 Matt Mackall and others\n"
6297 "\nCopyright (C) 2005-2014 Matt Mackall and others\n"
6298 "This is free software; see the source for copying conditions. "
6298 "This is free software; see the source for copying conditions. "
6299 "There is NO\nwarranty; "
6299 "There is NO\nwarranty; "
6300 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6300 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6301 ))
6301 ))
6302
6302
6303 ui.note(_("\nEnabled extensions:\n\n"))
6303 ui.note(_("\nEnabled extensions:\n\n"))
6304 if ui.verbose:
6304 if ui.verbose:
6305 # format names and versions into columns
6305 # format names and versions into columns
6306 names = []
6306 names = []
6307 vers = []
6307 vers = []
6308 for name, module in extensions.extensions():
6308 for name, module in extensions.extensions():
6309 names.append(name)
6309 names.append(name)
6310 vers.append(extensions.moduleversion(module))
6310 vers.append(extensions.moduleversion(module))
6311 if names:
6311 if names:
6312 maxnamelen = max(len(n) for n in names)
6312 maxnamelen = max(len(n) for n in names)
6313 for i, name in enumerate(names):
6313 for i, name in enumerate(names):
6314 ui.write(" %-*s %s\n" % (maxnamelen, name, vers[i]))
6314 ui.write(" %-*s %s\n" % (maxnamelen, name, vers[i]))
@@ -1,250 +1,260 b''
1 # commandserver.py - communicate with Mercurial's API over a pipe
1 # commandserver.py - communicate with Mercurial's API over a pipe
2 #
2 #
3 # Copyright Matt Mackall <mpm@selenic.com>
3 # Copyright 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 i18n import _
8 from i18n import _
9 import struct
9 import struct
10 import sys, os
10 import sys, os
11 import dispatch, encoding, util
11 import dispatch, encoding, util
12
12
13 logfile = None
13 logfile = None
14
14
15 def log(*args):
15 def log(*args):
16 if not logfile:
16 if not logfile:
17 return
17 return
18
18
19 for a in args:
19 for a in args:
20 logfile.write(str(a))
20 logfile.write(str(a))
21
21
22 logfile.flush()
22 logfile.flush()
23
23
24 class channeledoutput(object):
24 class channeledoutput(object):
25 """
25 """
26 Write data to out in the following format:
26 Write data to out in the following format:
27
27
28 data length (unsigned int),
28 data length (unsigned int),
29 data
29 data
30 """
30 """
31 def __init__(self, out, channel):
31 def __init__(self, out, channel):
32 self.out = out
32 self.out = out
33 self.channel = channel
33 self.channel = channel
34
34
35 def write(self, data):
35 def write(self, data):
36 if not data:
36 if not data:
37 return
37 return
38 self.out.write(struct.pack('>cI', self.channel, len(data)))
38 self.out.write(struct.pack('>cI', self.channel, len(data)))
39 self.out.write(data)
39 self.out.write(data)
40 self.out.flush()
40 self.out.flush()
41
41
42 def __getattr__(self, attr):
42 def __getattr__(self, attr):
43 if attr in ('isatty', 'fileno'):
43 if attr in ('isatty', 'fileno'):
44 raise AttributeError(attr)
44 raise AttributeError(attr)
45 return getattr(self.out, attr)
45 return getattr(self.out, attr)
46
46
47 class channeledinput(object):
47 class channeledinput(object):
48 """
48 """
49 Read data from in_.
49 Read data from in_.
50
50
51 Requests for input are written to out in the following format:
51 Requests for input are written to out in the following format:
52 channel identifier - 'I' for plain input, 'L' line based (1 byte)
52 channel identifier - 'I' for plain input, 'L' line based (1 byte)
53 how many bytes to send at most (unsigned int),
53 how many bytes to send at most (unsigned int),
54
54
55 The client replies with:
55 The client replies with:
56 data length (unsigned int), 0 meaning EOF
56 data length (unsigned int), 0 meaning EOF
57 data
57 data
58 """
58 """
59
59
60 maxchunksize = 4 * 1024
60 maxchunksize = 4 * 1024
61
61
62 def __init__(self, in_, out, channel):
62 def __init__(self, in_, out, channel):
63 self.in_ = in_
63 self.in_ = in_
64 self.out = out
64 self.out = out
65 self.channel = channel
65 self.channel = channel
66
66
67 def read(self, size=-1):
67 def read(self, size=-1):
68 if size < 0:
68 if size < 0:
69 # if we need to consume all the clients input, ask for 4k chunks
69 # if we need to consume all the clients input, ask for 4k chunks
70 # so the pipe doesn't fill up risking a deadlock
70 # so the pipe doesn't fill up risking a deadlock
71 size = self.maxchunksize
71 size = self.maxchunksize
72 s = self._read(size, self.channel)
72 s = self._read(size, self.channel)
73 buf = s
73 buf = s
74 while s:
74 while s:
75 s = self._read(size, self.channel)
75 s = self._read(size, self.channel)
76 buf += s
76 buf += s
77
77
78 return buf
78 return buf
79 else:
79 else:
80 return self._read(size, self.channel)
80 return self._read(size, self.channel)
81
81
82 def _read(self, size, channel):
82 def _read(self, size, channel):
83 if not size:
83 if not size:
84 return ''
84 return ''
85 assert size > 0
85 assert size > 0
86
86
87 # tell the client we need at most size bytes
87 # tell the client we need at most size bytes
88 self.out.write(struct.pack('>cI', channel, size))
88 self.out.write(struct.pack('>cI', channel, size))
89 self.out.flush()
89 self.out.flush()
90
90
91 length = self.in_.read(4)
91 length = self.in_.read(4)
92 length = struct.unpack('>I', length)[0]
92 length = struct.unpack('>I', length)[0]
93 if not length:
93 if not length:
94 return ''
94 return ''
95 else:
95 else:
96 return self.in_.read(length)
96 return self.in_.read(length)
97
97
98 def readline(self, size=-1):
98 def readline(self, size=-1):
99 if size < 0:
99 if size < 0:
100 size = self.maxchunksize
100 size = self.maxchunksize
101 s = self._read(size, 'L')
101 s = self._read(size, 'L')
102 buf = s
102 buf = s
103 # keep asking for more until there's either no more or
103 # keep asking for more until there's either no more or
104 # we got a full line
104 # we got a full line
105 while s and s[-1] != '\n':
105 while s and s[-1] != '\n':
106 s = self._read(size, 'L')
106 s = self._read(size, 'L')
107 buf += s
107 buf += s
108
108
109 return buf
109 return buf
110 else:
110 else:
111 return self._read(size, 'L')
111 return self._read(size, 'L')
112
112
113 def __iter__(self):
113 def __iter__(self):
114 return self
114 return self
115
115
116 def next(self):
116 def next(self):
117 l = self.readline()
117 l = self.readline()
118 if not l:
118 if not l:
119 raise StopIteration
119 raise StopIteration
120 return l
120 return l
121
121
122 def __getattr__(self, attr):
122 def __getattr__(self, attr):
123 if attr in ('isatty', 'fileno'):
123 if attr in ('isatty', 'fileno'):
124 raise AttributeError(attr)
124 raise AttributeError(attr)
125 return getattr(self.in_, attr)
125 return getattr(self.in_, attr)
126
126
127 class server(object):
127 class server(object):
128 """
128 """
129 Listens for commands on stdin, runs them and writes the output on a channel
129 Listens for commands on stdin, runs them and writes the output on a channel
130 based stream to stdout.
130 based stream to stdout.
131 """
131 """
132 def __init__(self, ui, repo, mode):
132 def __init__(self, ui, repo, mode):
133 self.cwd = os.getcwd()
133 self.cwd = os.getcwd()
134
134
135 logpath = ui.config("cmdserver", "log", None)
135 logpath = ui.config("cmdserver", "log", None)
136 if logpath:
136 if logpath:
137 global logfile
137 global logfile
138 if logpath == '-':
138 if logpath == '-':
139 # write log on a special 'd' (debug) channel
139 # write log on a special 'd' (debug) channel
140 logfile = channeledoutput(sys.stdout, 'd')
140 logfile = channeledoutput(sys.stdout, 'd')
141 else:
141 else:
142 logfile = open(logpath, 'a')
142 logfile = open(logpath, 'a')
143
143
144 if repo:
144 if repo:
145 # the ui here is really the repo ui so take its baseui so we don't
145 # the ui here is really the repo ui so take its baseui so we don't
146 # end up with its local configuration
146 # end up with its local configuration
147 self.ui = repo.baseui
147 self.ui = repo.baseui
148 self.repo = repo
148 self.repo = repo
149 self.repoui = repo.ui
149 self.repoui = repo.ui
150 else:
150 else:
151 self.ui = ui
151 self.ui = ui
152 self.repo = self.repoui = None
152 self.repo = self.repoui = None
153
153
154 if mode == 'pipe':
154 if mode == 'pipe':
155 self.cerr = channeledoutput(sys.stdout, 'e')
155 self.cerr = channeledoutput(sys.stdout, 'e')
156 self.cout = channeledoutput(sys.stdout, 'o')
156 self.cout = channeledoutput(sys.stdout, 'o')
157 self.cin = channeledinput(sys.stdin, sys.stdout, 'I')
157 self.cin = channeledinput(sys.stdin, sys.stdout, 'I')
158 self.cresult = channeledoutput(sys.stdout, 'r')
158 self.cresult = channeledoutput(sys.stdout, 'r')
159
159
160 self.client = sys.stdin
160 self.client = sys.stdin
161 else:
161 else:
162 raise util.Abort(_('unknown mode %s') % mode)
162 raise util.Abort(_('unknown mode %s') % mode)
163
163
164 def _read(self, size):
164 def _read(self, size):
165 if not size:
165 if not size:
166 return ''
166 return ''
167
167
168 data = self.client.read(size)
168 data = self.client.read(size)
169
169
170 # is the other end closed?
170 # is the other end closed?
171 if not data:
171 if not data:
172 raise EOFError
172 raise EOFError
173
173
174 return data
174 return data
175
175
176 def runcommand(self):
176 def runcommand(self):
177 """ reads a list of \0 terminated arguments, executes
177 """ reads a list of \0 terminated arguments, executes
178 and writes the return code to the result channel """
178 and writes the return code to the result channel """
179
179
180 length = struct.unpack('>I', self._read(4))[0]
180 length = struct.unpack('>I', self._read(4))[0]
181 if not length:
181 if not length:
182 args = []
182 args = []
183 else:
183 else:
184 args = self._read(length).split('\0')
184 args = self._read(length).split('\0')
185
185
186 # copy the uis so changes (e.g. --config or --verbose) don't
186 # copy the uis so changes (e.g. --config or --verbose) don't
187 # persist between requests
187 # persist between requests
188 copiedui = self.ui.copy()
188 copiedui = self.ui.copy()
189 uis = [copiedui]
189 uis = [copiedui]
190 if self.repo:
190 if self.repo:
191 self.repo.baseui = copiedui
191 self.repo.baseui = copiedui
192 # clone ui without using ui.copy because this is protected
192 # clone ui without using ui.copy because this is protected
193 repoui = self.repoui.__class__(self.repoui)
193 repoui = self.repoui.__class__(self.repoui)
194 repoui.copy = copiedui.copy # redo copy protection
194 repoui.copy = copiedui.copy # redo copy protection
195 uis.append(repoui)
195 uis.append(repoui)
196 self.repo.ui = self.repo.dirstate._ui = repoui
196 self.repo.ui = self.repo.dirstate._ui = repoui
197 self.repo.invalidateall()
197 self.repo.invalidateall()
198
198
199 for ui in uis:
199 for ui in uis:
200 # any kind of interaction must use server channels
200 # any kind of interaction must use server channels
201 ui.setconfig('ui', 'nontty', 'true', 'commandserver')
201 ui.setconfig('ui', 'nontty', 'true', 'commandserver')
202
202
203 req = dispatch.request(args[:], copiedui, self.repo, self.cin,
203 req = dispatch.request(args[:], copiedui, self.repo, self.cin,
204 self.cout, self.cerr)
204 self.cout, self.cerr)
205
205
206 ret = (dispatch.dispatch(req) or 0) & 255 # might return None
206 ret = (dispatch.dispatch(req) or 0) & 255 # might return None
207
207
208 # restore old cwd
208 # restore old cwd
209 if '--cwd' in args:
209 if '--cwd' in args:
210 os.chdir(self.cwd)
210 os.chdir(self.cwd)
211
211
212 self.cresult.write(struct.pack('>i', int(ret)))
212 self.cresult.write(struct.pack('>i', int(ret)))
213
213
214 def getencoding(self):
214 def getencoding(self):
215 """ writes the current encoding to the result channel """
215 """ writes the current encoding to the result channel """
216 self.cresult.write(encoding.encoding)
216 self.cresult.write(encoding.encoding)
217
217
218 def serveone(self):
218 def serveone(self):
219 cmd = self.client.readline()[:-1]
219 cmd = self.client.readline()[:-1]
220 if cmd:
220 if cmd:
221 handler = self.capabilities.get(cmd)
221 handler = self.capabilities.get(cmd)
222 if handler:
222 if handler:
223 handler(self)
223 handler(self)
224 else:
224 else:
225 # clients are expected to check what commands are supported by
225 # clients are expected to check what commands are supported by
226 # looking at the servers capabilities
226 # looking at the servers capabilities
227 raise util.Abort(_('unknown command %s') % cmd)
227 raise util.Abort(_('unknown command %s') % cmd)
228
228
229 return cmd != ''
229 return cmd != ''
230
230
231 capabilities = {'runcommand' : runcommand,
231 capabilities = {'runcommand' : runcommand,
232 'getencoding' : getencoding}
232 'getencoding' : getencoding}
233
233
234 def serve(self):
234 def serve(self):
235 hellomsg = 'capabilities: ' + ' '.join(sorted(self.capabilities))
235 hellomsg = 'capabilities: ' + ' '.join(sorted(self.capabilities))
236 hellomsg += '\n'
236 hellomsg += '\n'
237 hellomsg += 'encoding: ' + encoding.encoding
237 hellomsg += 'encoding: ' + encoding.encoding
238
238
239 # write the hello msg in -one- chunk
239 # write the hello msg in -one- chunk
240 self.cout.write(hellomsg)
240 self.cout.write(hellomsg)
241
241
242 try:
242 try:
243 while self.serveone():
243 while self.serveone():
244 pass
244 pass
245 except EOFError:
245 except EOFError:
246 # we'll get here if the client disconnected while we were reading
246 # we'll get here if the client disconnected while we were reading
247 # its request
247 # its request
248 return 1
248 return 1
249
249
250 return 0
250 return 0
251
252 class pipeservice(object):
253 def __init__(self, ui, repo, opts):
254 self.server = server(ui, repo, opts['cmdserver'])
255
256 def init(self):
257 pass
258
259 def run(self):
260 return self.server.serve()
General Comments 0
You need to be logged in to leave comments. Login now