##// END OF EJS Templates
graft: implement --log (issue3438)
Levi Bard -
r16660:2a71cc53 default
parent child Browse files
Show More
@@ -1,5752 +1,5761 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 _, gettext
10 from i18n import _, gettext
11 import os, re, difflib, time, tempfile, errno
11 import os, re, difflib, time, tempfile, errno
12 import hg, scmutil, util, revlog, extensions, copies, error, bookmarks
12 import hg, scmutil, util, revlog, extensions, copies, error, bookmarks
13 import patch, help, url, encoding, templatekw, discovery
13 import patch, help, url, encoding, templatekw, discovery
14 import archival, changegroup, cmdutil, hbisect
14 import archival, changegroup, cmdutil, hbisect
15 import sshserver, hgweb, hgweb.server, commandserver
15 import sshserver, hgweb, hgweb.server, commandserver
16 import merge as mergemod
16 import merge as mergemod
17 import minirst, revset, fileset
17 import minirst, revset, fileset
18 import dagparser, context, simplemerge
18 import dagparser, context, simplemerge
19 import random, setdiscovery, treediscovery, dagutil, pvec
19 import random, setdiscovery, treediscovery, dagutil, pvec
20 import phases
20 import phases
21
21
22 table = {}
22 table = {}
23
23
24 command = cmdutil.command(table)
24 command = cmdutil.command(table)
25
25
26 # common command options
26 # common command options
27
27
28 globalopts = [
28 globalopts = [
29 ('R', 'repository', '',
29 ('R', 'repository', '',
30 _('repository root directory or name of overlay bundle file'),
30 _('repository root directory or name of overlay bundle file'),
31 _('REPO')),
31 _('REPO')),
32 ('', 'cwd', '',
32 ('', 'cwd', '',
33 _('change working directory'), _('DIR')),
33 _('change working directory'), _('DIR')),
34 ('y', 'noninteractive', None,
34 ('y', 'noninteractive', None,
35 _('do not prompt, automatically pick the first choice for all prompts')),
35 _('do not prompt, automatically pick the first choice for all prompts')),
36 ('q', 'quiet', None, _('suppress output')),
36 ('q', 'quiet', None, _('suppress output')),
37 ('v', 'verbose', None, _('enable additional output')),
37 ('v', 'verbose', None, _('enable additional output')),
38 ('', 'config', [],
38 ('', 'config', [],
39 _('set/override config option (use \'section.name=value\')'),
39 _('set/override config option (use \'section.name=value\')'),
40 _('CONFIG')),
40 _('CONFIG')),
41 ('', 'debug', None, _('enable debugging output')),
41 ('', 'debug', None, _('enable debugging output')),
42 ('', 'debugger', None, _('start debugger')),
42 ('', 'debugger', None, _('start debugger')),
43 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
43 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
44 _('ENCODE')),
44 _('ENCODE')),
45 ('', 'encodingmode', encoding.encodingmode,
45 ('', 'encodingmode', encoding.encodingmode,
46 _('set the charset encoding mode'), _('MODE')),
46 _('set the charset encoding mode'), _('MODE')),
47 ('', 'traceback', None, _('always print a traceback on exception')),
47 ('', 'traceback', None, _('always print a traceback on exception')),
48 ('', 'time', None, _('time how long the command takes')),
48 ('', 'time', None, _('time how long the command takes')),
49 ('', 'profile', None, _('print command execution profile')),
49 ('', 'profile', None, _('print command execution profile')),
50 ('', 'version', None, _('output version information and exit')),
50 ('', 'version', None, _('output version information and exit')),
51 ('h', 'help', None, _('display help and exit')),
51 ('h', 'help', None, _('display help and exit')),
52 ]
52 ]
53
53
54 dryrunopts = [('n', 'dry-run', None,
54 dryrunopts = [('n', 'dry-run', None,
55 _('do not perform actions, just print output'))]
55 _('do not perform actions, just print output'))]
56
56
57 remoteopts = [
57 remoteopts = [
58 ('e', 'ssh', '',
58 ('e', 'ssh', '',
59 _('specify ssh command to use'), _('CMD')),
59 _('specify ssh command to use'), _('CMD')),
60 ('', 'remotecmd', '',
60 ('', 'remotecmd', '',
61 _('specify hg command to run on the remote side'), _('CMD')),
61 _('specify hg command to run on the remote side'), _('CMD')),
62 ('', 'insecure', None,
62 ('', 'insecure', None,
63 _('do not verify server certificate (ignoring web.cacerts config)')),
63 _('do not verify server certificate (ignoring web.cacerts config)')),
64 ]
64 ]
65
65
66 walkopts = [
66 walkopts = [
67 ('I', 'include', [],
67 ('I', 'include', [],
68 _('include names matching the given patterns'), _('PATTERN')),
68 _('include names matching the given patterns'), _('PATTERN')),
69 ('X', 'exclude', [],
69 ('X', 'exclude', [],
70 _('exclude names matching the given patterns'), _('PATTERN')),
70 _('exclude names matching the given patterns'), _('PATTERN')),
71 ]
71 ]
72
72
73 commitopts = [
73 commitopts = [
74 ('m', 'message', '',
74 ('m', 'message', '',
75 _('use text as commit message'), _('TEXT')),
75 _('use text as commit message'), _('TEXT')),
76 ('l', 'logfile', '',
76 ('l', 'logfile', '',
77 _('read commit message from file'), _('FILE')),
77 _('read commit message from file'), _('FILE')),
78 ]
78 ]
79
79
80 commitopts2 = [
80 commitopts2 = [
81 ('d', 'date', '',
81 ('d', 'date', '',
82 _('record the specified date as commit date'), _('DATE')),
82 _('record the specified date as commit date'), _('DATE')),
83 ('u', 'user', '',
83 ('u', 'user', '',
84 _('record the specified user as committer'), _('USER')),
84 _('record the specified user as committer'), _('USER')),
85 ]
85 ]
86
86
87 templateopts = [
87 templateopts = [
88 ('', 'style', '',
88 ('', 'style', '',
89 _('display using template map file'), _('STYLE')),
89 _('display using template map file'), _('STYLE')),
90 ('', 'template', '',
90 ('', 'template', '',
91 _('display with template'), _('TEMPLATE')),
91 _('display with template'), _('TEMPLATE')),
92 ]
92 ]
93
93
94 logopts = [
94 logopts = [
95 ('p', 'patch', None, _('show patch')),
95 ('p', 'patch', None, _('show patch')),
96 ('g', 'git', None, _('use git extended diff format')),
96 ('g', 'git', None, _('use git extended diff format')),
97 ('l', 'limit', '',
97 ('l', 'limit', '',
98 _('limit number of changes displayed'), _('NUM')),
98 _('limit number of changes displayed'), _('NUM')),
99 ('M', 'no-merges', None, _('do not show merges')),
99 ('M', 'no-merges', None, _('do not show merges')),
100 ('', 'stat', None, _('output diffstat-style summary of changes')),
100 ('', 'stat', None, _('output diffstat-style summary of changes')),
101 ] + templateopts
101 ] + templateopts
102
102
103 diffopts = [
103 diffopts = [
104 ('a', 'text', None, _('treat all files as text')),
104 ('a', 'text', None, _('treat all files as text')),
105 ('g', 'git', None, _('use git extended diff format')),
105 ('g', 'git', None, _('use git extended diff format')),
106 ('', 'nodates', None, _('omit dates from diff headers'))
106 ('', 'nodates', None, _('omit dates from diff headers'))
107 ]
107 ]
108
108
109 diffwsopts = [
109 diffwsopts = [
110 ('w', 'ignore-all-space', None,
110 ('w', 'ignore-all-space', None,
111 _('ignore white space when comparing lines')),
111 _('ignore white space when comparing lines')),
112 ('b', 'ignore-space-change', None,
112 ('b', 'ignore-space-change', None,
113 _('ignore changes in the amount of white space')),
113 _('ignore changes in the amount of white space')),
114 ('B', 'ignore-blank-lines', None,
114 ('B', 'ignore-blank-lines', None,
115 _('ignore changes whose lines are all blank')),
115 _('ignore changes whose lines are all blank')),
116 ]
116 ]
117
117
118 diffopts2 = [
118 diffopts2 = [
119 ('p', 'show-function', None, _('show which function each change is in')),
119 ('p', 'show-function', None, _('show which function each change is in')),
120 ('', 'reverse', None, _('produce a diff that undoes the changes')),
120 ('', 'reverse', None, _('produce a diff that undoes the changes')),
121 ] + diffwsopts + [
121 ] + diffwsopts + [
122 ('U', 'unified', '',
122 ('U', 'unified', '',
123 _('number of lines of context to show'), _('NUM')),
123 _('number of lines of context to show'), _('NUM')),
124 ('', 'stat', None, _('output diffstat-style summary of changes')),
124 ('', 'stat', None, _('output diffstat-style summary of changes')),
125 ]
125 ]
126
126
127 mergetoolopts = [
127 mergetoolopts = [
128 ('t', 'tool', '', _('specify merge tool')),
128 ('t', 'tool', '', _('specify merge tool')),
129 ]
129 ]
130
130
131 similarityopts = [
131 similarityopts = [
132 ('s', 'similarity', '',
132 ('s', 'similarity', '',
133 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
133 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
134 ]
134 ]
135
135
136 subrepoopts = [
136 subrepoopts = [
137 ('S', 'subrepos', None,
137 ('S', 'subrepos', None,
138 _('recurse into subrepositories'))
138 _('recurse into subrepositories'))
139 ]
139 ]
140
140
141 # Commands start here, listed alphabetically
141 # Commands start here, listed alphabetically
142
142
143 @command('^add',
143 @command('^add',
144 walkopts + subrepoopts + dryrunopts,
144 walkopts + subrepoopts + dryrunopts,
145 _('[OPTION]... [FILE]...'))
145 _('[OPTION]... [FILE]...'))
146 def add(ui, repo, *pats, **opts):
146 def add(ui, repo, *pats, **opts):
147 """add the specified files on the next commit
147 """add the specified files on the next commit
148
148
149 Schedule files to be version controlled and added to the
149 Schedule files to be version controlled and added to the
150 repository.
150 repository.
151
151
152 The files will be added to the repository at the next commit. To
152 The files will be added to the repository at the next commit. To
153 undo an add before that, see :hg:`forget`.
153 undo an add before that, see :hg:`forget`.
154
154
155 If no names are given, add all files to the repository.
155 If no names are given, add all files to the repository.
156
156
157 .. container:: verbose
157 .. container:: verbose
158
158
159 An example showing how new (unknown) files are added
159 An example showing how new (unknown) files are added
160 automatically by :hg:`add`::
160 automatically by :hg:`add`::
161
161
162 $ ls
162 $ ls
163 foo.c
163 foo.c
164 $ hg status
164 $ hg status
165 ? foo.c
165 ? foo.c
166 $ hg add
166 $ hg add
167 adding foo.c
167 adding foo.c
168 $ hg status
168 $ hg status
169 A foo.c
169 A foo.c
170
170
171 Returns 0 if all files are successfully added.
171 Returns 0 if all files are successfully added.
172 """
172 """
173
173
174 m = scmutil.match(repo[None], pats, opts)
174 m = scmutil.match(repo[None], pats, opts)
175 rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'),
175 rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'),
176 opts.get('subrepos'), prefix="", explicitonly=False)
176 opts.get('subrepos'), prefix="", explicitonly=False)
177 return rejected and 1 or 0
177 return rejected and 1 or 0
178
178
179 @command('addremove',
179 @command('addremove',
180 similarityopts + walkopts + dryrunopts,
180 similarityopts + walkopts + dryrunopts,
181 _('[OPTION]... [FILE]...'))
181 _('[OPTION]... [FILE]...'))
182 def addremove(ui, repo, *pats, **opts):
182 def addremove(ui, repo, *pats, **opts):
183 """add all new files, delete all missing files
183 """add all new files, delete all missing files
184
184
185 Add all new files and remove all missing files from the
185 Add all new files and remove all missing files from the
186 repository.
186 repository.
187
187
188 New files are ignored if they match any of the patterns in
188 New files are ignored if they match any of the patterns in
189 ``.hgignore``. As with add, these changes take effect at the next
189 ``.hgignore``. As with add, these changes take effect at the next
190 commit.
190 commit.
191
191
192 Use the -s/--similarity option to detect renamed files. With a
192 Use the -s/--similarity option to detect renamed files. With a
193 parameter greater than 0, this compares every removed file with
193 parameter greater than 0, this compares every removed file with
194 every added file and records those similar enough as renames. This
194 every added file and records those similar enough as renames. This
195 option takes a percentage between 0 (disabled) and 100 (files must
195 option takes a percentage between 0 (disabled) and 100 (files must
196 be identical) as its parameter. Detecting renamed files this way
196 be identical) as its parameter. Detecting renamed files this way
197 can be expensive. After using this option, :hg:`status -C` can be
197 can be expensive. After using this option, :hg:`status -C` can be
198 used to check which files were identified as moved or renamed.
198 used to check which files were identified as moved or renamed.
199 If this option is not specified, only renames of identical files
199 If this option is not specified, only renames of identical files
200 are detected.
200 are detected.
201
201
202 Returns 0 if all files are successfully added.
202 Returns 0 if all files are successfully added.
203 """
203 """
204 try:
204 try:
205 sim = float(opts.get('similarity') or 100)
205 sim = float(opts.get('similarity') or 100)
206 except ValueError:
206 except ValueError:
207 raise util.Abort(_('similarity must be a number'))
207 raise util.Abort(_('similarity must be a number'))
208 if sim < 0 or sim > 100:
208 if sim < 0 or sim > 100:
209 raise util.Abort(_('similarity must be between 0 and 100'))
209 raise util.Abort(_('similarity must be between 0 and 100'))
210 return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0)
210 return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0)
211
211
212 @command('^annotate|blame',
212 @command('^annotate|blame',
213 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
213 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
214 ('', 'follow', None,
214 ('', 'follow', None,
215 _('follow copies/renames and list the filename (DEPRECATED)')),
215 _('follow copies/renames and list the filename (DEPRECATED)')),
216 ('', 'no-follow', None, _("don't follow copies and renames")),
216 ('', 'no-follow', None, _("don't follow copies and renames")),
217 ('a', 'text', None, _('treat all files as text')),
217 ('a', 'text', None, _('treat all files as text')),
218 ('u', 'user', None, _('list the author (long with -v)')),
218 ('u', 'user', None, _('list the author (long with -v)')),
219 ('f', 'file', None, _('list the filename')),
219 ('f', 'file', None, _('list the filename')),
220 ('d', 'date', None, _('list the date (short with -q)')),
220 ('d', 'date', None, _('list the date (short with -q)')),
221 ('n', 'number', None, _('list the revision number (default)')),
221 ('n', 'number', None, _('list the revision number (default)')),
222 ('c', 'changeset', None, _('list the changeset')),
222 ('c', 'changeset', None, _('list the changeset')),
223 ('l', 'line-number', None, _('show line number at the first appearance'))
223 ('l', 'line-number', None, _('show line number at the first appearance'))
224 ] + diffwsopts + walkopts,
224 ] + diffwsopts + walkopts,
225 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'))
225 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'))
226 def annotate(ui, repo, *pats, **opts):
226 def annotate(ui, repo, *pats, **opts):
227 """show changeset information by line for each file
227 """show changeset information by line for each file
228
228
229 List changes in files, showing the revision id responsible for
229 List changes in files, showing the revision id responsible for
230 each line
230 each line
231
231
232 This command is useful for discovering when a change was made and
232 This command is useful for discovering when a change was made and
233 by whom.
233 by whom.
234
234
235 Without the -a/--text option, annotate will avoid processing files
235 Without the -a/--text option, annotate will avoid processing files
236 it detects as binary. With -a, annotate will annotate the file
236 it detects as binary. With -a, annotate will annotate the file
237 anyway, although the results will probably be neither useful
237 anyway, although the results will probably be neither useful
238 nor desirable.
238 nor desirable.
239
239
240 Returns 0 on success.
240 Returns 0 on success.
241 """
241 """
242 if opts.get('follow'):
242 if opts.get('follow'):
243 # --follow is deprecated and now just an alias for -f/--file
243 # --follow is deprecated and now just an alias for -f/--file
244 # to mimic the behavior of Mercurial before version 1.5
244 # to mimic the behavior of Mercurial before version 1.5
245 opts['file'] = True
245 opts['file'] = True
246
246
247 datefunc = ui.quiet and util.shortdate or util.datestr
247 datefunc = ui.quiet and util.shortdate or util.datestr
248 getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
248 getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
249
249
250 if not pats:
250 if not pats:
251 raise util.Abort(_('at least one filename or pattern is required'))
251 raise util.Abort(_('at least one filename or pattern is required'))
252
252
253 hexfn = ui.debugflag and hex or short
253 hexfn = ui.debugflag and hex or short
254
254
255 opmap = [('user', ' ', lambda x: ui.shortuser(x[0].user())),
255 opmap = [('user', ' ', lambda x: ui.shortuser(x[0].user())),
256 ('number', ' ', lambda x: str(x[0].rev())),
256 ('number', ' ', lambda x: str(x[0].rev())),
257 ('changeset', ' ', lambda x: hexfn(x[0].node())),
257 ('changeset', ' ', lambda x: hexfn(x[0].node())),
258 ('date', ' ', getdate),
258 ('date', ' ', getdate),
259 ('file', ' ', lambda x: x[0].path()),
259 ('file', ' ', lambda x: x[0].path()),
260 ('line_number', ':', lambda x: str(x[1])),
260 ('line_number', ':', lambda x: str(x[1])),
261 ]
261 ]
262
262
263 if (not opts.get('user') and not opts.get('changeset')
263 if (not opts.get('user') and not opts.get('changeset')
264 and not opts.get('date') and not opts.get('file')):
264 and not opts.get('date') and not opts.get('file')):
265 opts['number'] = True
265 opts['number'] = True
266
266
267 linenumber = opts.get('line_number') is not None
267 linenumber = opts.get('line_number') is not None
268 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
268 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
269 raise util.Abort(_('at least one of -n/-c is required for -l'))
269 raise util.Abort(_('at least one of -n/-c is required for -l'))
270
270
271 funcmap = [(func, sep) for op, sep, func in opmap if opts.get(op)]
271 funcmap = [(func, sep) for op, sep, func in opmap if opts.get(op)]
272 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
272 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
273
273
274 def bad(x, y):
274 def bad(x, y):
275 raise util.Abort("%s: %s" % (x, y))
275 raise util.Abort("%s: %s" % (x, y))
276
276
277 ctx = scmutil.revsingle(repo, opts.get('rev'))
277 ctx = scmutil.revsingle(repo, opts.get('rev'))
278 m = scmutil.match(ctx, pats, opts)
278 m = scmutil.match(ctx, pats, opts)
279 m.bad = bad
279 m.bad = bad
280 follow = not opts.get('no_follow')
280 follow = not opts.get('no_follow')
281 diffopts = patch.diffopts(ui, opts, section='annotate')
281 diffopts = patch.diffopts(ui, opts, section='annotate')
282 for abs in ctx.walk(m):
282 for abs in ctx.walk(m):
283 fctx = ctx[abs]
283 fctx = ctx[abs]
284 if not opts.get('text') and util.binary(fctx.data()):
284 if not opts.get('text') and util.binary(fctx.data()):
285 ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
285 ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
286 continue
286 continue
287
287
288 lines = fctx.annotate(follow=follow, linenumber=linenumber,
288 lines = fctx.annotate(follow=follow, linenumber=linenumber,
289 diffopts=diffopts)
289 diffopts=diffopts)
290 pieces = []
290 pieces = []
291
291
292 for f, sep in funcmap:
292 for f, sep in funcmap:
293 l = [f(n) for n, dummy in lines]
293 l = [f(n) for n, dummy in lines]
294 if l:
294 if l:
295 sized = [(x, encoding.colwidth(x)) for x in l]
295 sized = [(x, encoding.colwidth(x)) for x in l]
296 ml = max([w for x, w in sized])
296 ml = max([w for x, w in sized])
297 pieces.append(["%s%s%s" % (sep, ' ' * (ml - w), x)
297 pieces.append(["%s%s%s" % (sep, ' ' * (ml - w), x)
298 for x, w in sized])
298 for x, w in sized])
299
299
300 if pieces:
300 if pieces:
301 for p, l in zip(zip(*pieces), lines):
301 for p, l in zip(zip(*pieces), lines):
302 ui.write("%s: %s" % ("".join(p), l[1]))
302 ui.write("%s: %s" % ("".join(p), l[1]))
303
303
304 if lines and not lines[-1][1].endswith('\n'):
304 if lines and not lines[-1][1].endswith('\n'):
305 ui.write('\n')
305 ui.write('\n')
306
306
307 @command('archive',
307 @command('archive',
308 [('', 'no-decode', None, _('do not pass files through decoders')),
308 [('', 'no-decode', None, _('do not pass files through decoders')),
309 ('p', 'prefix', '', _('directory prefix for files in archive'),
309 ('p', 'prefix', '', _('directory prefix for files in archive'),
310 _('PREFIX')),
310 _('PREFIX')),
311 ('r', 'rev', '', _('revision to distribute'), _('REV')),
311 ('r', 'rev', '', _('revision to distribute'), _('REV')),
312 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
312 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
313 ] + subrepoopts + walkopts,
313 ] + subrepoopts + walkopts,
314 _('[OPTION]... DEST'))
314 _('[OPTION]... DEST'))
315 def archive(ui, repo, dest, **opts):
315 def archive(ui, repo, dest, **opts):
316 '''create an unversioned archive of a repository revision
316 '''create an unversioned archive of a repository revision
317
317
318 By default, the revision used is the parent of the working
318 By default, the revision used is the parent of the working
319 directory; use -r/--rev to specify a different revision.
319 directory; use -r/--rev to specify a different revision.
320
320
321 The archive type is automatically detected based on file
321 The archive type is automatically detected based on file
322 extension (or override using -t/--type).
322 extension (or override using -t/--type).
323
323
324 .. container:: verbose
324 .. container:: verbose
325
325
326 Examples:
326 Examples:
327
327
328 - create a zip file containing the 1.0 release::
328 - create a zip file containing the 1.0 release::
329
329
330 hg archive -r 1.0 project-1.0.zip
330 hg archive -r 1.0 project-1.0.zip
331
331
332 - create a tarball excluding .hg files::
332 - create a tarball excluding .hg files::
333
333
334 hg archive project.tar.gz -X ".hg*"
334 hg archive project.tar.gz -X ".hg*"
335
335
336 Valid types are:
336 Valid types are:
337
337
338 :``files``: a directory full of files (default)
338 :``files``: a directory full of files (default)
339 :``tar``: tar archive, uncompressed
339 :``tar``: tar archive, uncompressed
340 :``tbz2``: tar archive, compressed using bzip2
340 :``tbz2``: tar archive, compressed using bzip2
341 :``tgz``: tar archive, compressed using gzip
341 :``tgz``: tar archive, compressed using gzip
342 :``uzip``: zip archive, uncompressed
342 :``uzip``: zip archive, uncompressed
343 :``zip``: zip archive, compressed using deflate
343 :``zip``: zip archive, compressed using deflate
344
344
345 The exact name of the destination archive or directory is given
345 The exact name of the destination archive or directory is given
346 using a format string; see :hg:`help export` for details.
346 using a format string; see :hg:`help export` for details.
347
347
348 Each member added to an archive file has a directory prefix
348 Each member added to an archive file has a directory prefix
349 prepended. Use -p/--prefix to specify a format string for the
349 prepended. Use -p/--prefix to specify a format string for the
350 prefix. The default is the basename of the archive, with suffixes
350 prefix. The default is the basename of the archive, with suffixes
351 removed.
351 removed.
352
352
353 Returns 0 on success.
353 Returns 0 on success.
354 '''
354 '''
355
355
356 ctx = scmutil.revsingle(repo, opts.get('rev'))
356 ctx = scmutil.revsingle(repo, opts.get('rev'))
357 if not ctx:
357 if not ctx:
358 raise util.Abort(_('no working directory: please specify a revision'))
358 raise util.Abort(_('no working directory: please specify a revision'))
359 node = ctx.node()
359 node = ctx.node()
360 dest = cmdutil.makefilename(repo, dest, node)
360 dest = cmdutil.makefilename(repo, dest, node)
361 if os.path.realpath(dest) == repo.root:
361 if os.path.realpath(dest) == repo.root:
362 raise util.Abort(_('repository root cannot be destination'))
362 raise util.Abort(_('repository root cannot be destination'))
363
363
364 kind = opts.get('type') or archival.guesskind(dest) or 'files'
364 kind = opts.get('type') or archival.guesskind(dest) or 'files'
365 prefix = opts.get('prefix')
365 prefix = opts.get('prefix')
366
366
367 if dest == '-':
367 if dest == '-':
368 if kind == 'files':
368 if kind == 'files':
369 raise util.Abort(_('cannot archive plain files to stdout'))
369 raise util.Abort(_('cannot archive plain files to stdout'))
370 dest = cmdutil.makefileobj(repo, dest)
370 dest = cmdutil.makefileobj(repo, dest)
371 if not prefix:
371 if not prefix:
372 prefix = os.path.basename(repo.root) + '-%h'
372 prefix = os.path.basename(repo.root) + '-%h'
373
373
374 prefix = cmdutil.makefilename(repo, prefix, node)
374 prefix = cmdutil.makefilename(repo, prefix, node)
375 matchfn = scmutil.match(ctx, [], opts)
375 matchfn = scmutil.match(ctx, [], opts)
376 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
376 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
377 matchfn, prefix, subrepos=opts.get('subrepos'))
377 matchfn, prefix, subrepos=opts.get('subrepos'))
378
378
379 @command('backout',
379 @command('backout',
380 [('', 'merge', None, _('merge with old dirstate parent after backout')),
380 [('', 'merge', None, _('merge with old dirstate parent after backout')),
381 ('', 'parent', '',
381 ('', 'parent', '',
382 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
382 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
383 ('r', 'rev', '', _('revision to backout'), _('REV')),
383 ('r', 'rev', '', _('revision to backout'), _('REV')),
384 ] + mergetoolopts + walkopts + commitopts + commitopts2,
384 ] + mergetoolopts + walkopts + commitopts + commitopts2,
385 _('[OPTION]... [-r] REV'))
385 _('[OPTION]... [-r] REV'))
386 def backout(ui, repo, node=None, rev=None, **opts):
386 def backout(ui, repo, node=None, rev=None, **opts):
387 '''reverse effect of earlier changeset
387 '''reverse effect of earlier changeset
388
388
389 Prepare a new changeset with the effect of REV undone in the
389 Prepare a new changeset with the effect of REV undone in the
390 current working directory.
390 current working directory.
391
391
392 If REV is the parent of the working directory, then this new changeset
392 If REV is the parent of the working directory, then this new changeset
393 is committed automatically. Otherwise, hg needs to merge the
393 is committed automatically. Otherwise, hg needs to merge the
394 changes and the merged result is left uncommitted.
394 changes and the merged result is left uncommitted.
395
395
396 .. note::
396 .. note::
397 backout cannot be used to fix either an unwanted or
397 backout cannot be used to fix either an unwanted or
398 incorrect merge.
398 incorrect merge.
399
399
400 .. container:: verbose
400 .. container:: verbose
401
401
402 By default, the pending changeset will have one parent,
402 By default, the pending changeset will have one parent,
403 maintaining a linear history. With --merge, the pending
403 maintaining a linear history. With --merge, the pending
404 changeset will instead have two parents: the old parent of the
404 changeset will instead have two parents: the old parent of the
405 working directory and a new child of REV that simply undoes REV.
405 working directory and a new child of REV that simply undoes REV.
406
406
407 Before version 1.7, the behavior without --merge was equivalent
407 Before version 1.7, the behavior without --merge was equivalent
408 to specifying --merge followed by :hg:`update --clean .` to
408 to specifying --merge followed by :hg:`update --clean .` to
409 cancel the merge and leave the child of REV as a head to be
409 cancel the merge and leave the child of REV as a head to be
410 merged separately.
410 merged separately.
411
411
412 See :hg:`help dates` for a list of formats valid for -d/--date.
412 See :hg:`help dates` for a list of formats valid for -d/--date.
413
413
414 Returns 0 on success.
414 Returns 0 on success.
415 '''
415 '''
416 if rev and node:
416 if rev and node:
417 raise util.Abort(_("please specify just one revision"))
417 raise util.Abort(_("please specify just one revision"))
418
418
419 if not rev:
419 if not rev:
420 rev = node
420 rev = node
421
421
422 if not rev:
422 if not rev:
423 raise util.Abort(_("please specify a revision to backout"))
423 raise util.Abort(_("please specify a revision to backout"))
424
424
425 date = opts.get('date')
425 date = opts.get('date')
426 if date:
426 if date:
427 opts['date'] = util.parsedate(date)
427 opts['date'] = util.parsedate(date)
428
428
429 cmdutil.bailifchanged(repo)
429 cmdutil.bailifchanged(repo)
430 node = scmutil.revsingle(repo, rev).node()
430 node = scmutil.revsingle(repo, rev).node()
431
431
432 op1, op2 = repo.dirstate.parents()
432 op1, op2 = repo.dirstate.parents()
433 a = repo.changelog.ancestor(op1, node)
433 a = repo.changelog.ancestor(op1, node)
434 if a != node:
434 if a != node:
435 raise util.Abort(_('cannot backout change on a different branch'))
435 raise util.Abort(_('cannot backout change on a different branch'))
436
436
437 p1, p2 = repo.changelog.parents(node)
437 p1, p2 = repo.changelog.parents(node)
438 if p1 == nullid:
438 if p1 == nullid:
439 raise util.Abort(_('cannot backout a change with no parents'))
439 raise util.Abort(_('cannot backout a change with no parents'))
440 if p2 != nullid:
440 if p2 != nullid:
441 if not opts.get('parent'):
441 if not opts.get('parent'):
442 raise util.Abort(_('cannot backout a merge changeset'))
442 raise util.Abort(_('cannot backout a merge changeset'))
443 p = repo.lookup(opts['parent'])
443 p = repo.lookup(opts['parent'])
444 if p not in (p1, p2):
444 if p not in (p1, p2):
445 raise util.Abort(_('%s is not a parent of %s') %
445 raise util.Abort(_('%s is not a parent of %s') %
446 (short(p), short(node)))
446 (short(p), short(node)))
447 parent = p
447 parent = p
448 else:
448 else:
449 if opts.get('parent'):
449 if opts.get('parent'):
450 raise util.Abort(_('cannot use --parent on non-merge changeset'))
450 raise util.Abort(_('cannot use --parent on non-merge changeset'))
451 parent = p1
451 parent = p1
452
452
453 # the backout should appear on the same branch
453 # the backout should appear on the same branch
454 wlock = repo.wlock()
454 wlock = repo.wlock()
455 try:
455 try:
456 branch = repo.dirstate.branch()
456 branch = repo.dirstate.branch()
457 hg.clean(repo, node, show_stats=False)
457 hg.clean(repo, node, show_stats=False)
458 repo.dirstate.setbranch(branch)
458 repo.dirstate.setbranch(branch)
459 revert_opts = opts.copy()
459 revert_opts = opts.copy()
460 revert_opts['date'] = None
460 revert_opts['date'] = None
461 revert_opts['all'] = True
461 revert_opts['all'] = True
462 revert_opts['rev'] = hex(parent)
462 revert_opts['rev'] = hex(parent)
463 revert_opts['no_backup'] = None
463 revert_opts['no_backup'] = None
464 revert(ui, repo, **revert_opts)
464 revert(ui, repo, **revert_opts)
465 if not opts.get('merge') and op1 != node:
465 if not opts.get('merge') and op1 != node:
466 try:
466 try:
467 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
467 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
468 return hg.update(repo, op1)
468 return hg.update(repo, op1)
469 finally:
469 finally:
470 ui.setconfig('ui', 'forcemerge', '')
470 ui.setconfig('ui', 'forcemerge', '')
471
471
472 commit_opts = opts.copy()
472 commit_opts = opts.copy()
473 commit_opts['addremove'] = False
473 commit_opts['addremove'] = False
474 if not commit_opts['message'] and not commit_opts['logfile']:
474 if not commit_opts['message'] and not commit_opts['logfile']:
475 # we don't translate commit messages
475 # we don't translate commit messages
476 commit_opts['message'] = "Backed out changeset %s" % short(node)
476 commit_opts['message'] = "Backed out changeset %s" % short(node)
477 commit_opts['force_editor'] = True
477 commit_opts['force_editor'] = True
478 commit(ui, repo, **commit_opts)
478 commit(ui, repo, **commit_opts)
479 def nice(node):
479 def nice(node):
480 return '%d:%s' % (repo.changelog.rev(node), short(node))
480 return '%d:%s' % (repo.changelog.rev(node), short(node))
481 ui.status(_('changeset %s backs out changeset %s\n') %
481 ui.status(_('changeset %s backs out changeset %s\n') %
482 (nice(repo.changelog.tip()), nice(node)))
482 (nice(repo.changelog.tip()), nice(node)))
483 if opts.get('merge') and op1 != node:
483 if opts.get('merge') and op1 != node:
484 hg.clean(repo, op1, show_stats=False)
484 hg.clean(repo, op1, show_stats=False)
485 ui.status(_('merging with changeset %s\n')
485 ui.status(_('merging with changeset %s\n')
486 % nice(repo.changelog.tip()))
486 % nice(repo.changelog.tip()))
487 try:
487 try:
488 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
488 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
489 return hg.merge(repo, hex(repo.changelog.tip()))
489 return hg.merge(repo, hex(repo.changelog.tip()))
490 finally:
490 finally:
491 ui.setconfig('ui', 'forcemerge', '')
491 ui.setconfig('ui', 'forcemerge', '')
492 finally:
492 finally:
493 wlock.release()
493 wlock.release()
494 return 0
494 return 0
495
495
496 @command('bisect',
496 @command('bisect',
497 [('r', 'reset', False, _('reset bisect state')),
497 [('r', 'reset', False, _('reset bisect state')),
498 ('g', 'good', False, _('mark changeset good')),
498 ('g', 'good', False, _('mark changeset good')),
499 ('b', 'bad', False, _('mark changeset bad')),
499 ('b', 'bad', False, _('mark changeset bad')),
500 ('s', 'skip', False, _('skip testing changeset')),
500 ('s', 'skip', False, _('skip testing changeset')),
501 ('e', 'extend', False, _('extend the bisect range')),
501 ('e', 'extend', False, _('extend the bisect range')),
502 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
502 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
503 ('U', 'noupdate', False, _('do not update to target'))],
503 ('U', 'noupdate', False, _('do not update to target'))],
504 _("[-gbsr] [-U] [-c CMD] [REV]"))
504 _("[-gbsr] [-U] [-c CMD] [REV]"))
505 def bisect(ui, repo, rev=None, extra=None, command=None,
505 def bisect(ui, repo, rev=None, extra=None, command=None,
506 reset=None, good=None, bad=None, skip=None, extend=None,
506 reset=None, good=None, bad=None, skip=None, extend=None,
507 noupdate=None):
507 noupdate=None):
508 """subdivision search of changesets
508 """subdivision search of changesets
509
509
510 This command helps to find changesets which introduce problems. To
510 This command helps to find changesets which introduce problems. To
511 use, mark the earliest changeset you know exhibits the problem as
511 use, mark the earliest changeset you know exhibits the problem as
512 bad, then mark the latest changeset which is free from the problem
512 bad, then mark the latest changeset which is free from the problem
513 as good. Bisect will update your working directory to a revision
513 as good. Bisect will update your working directory to a revision
514 for testing (unless the -U/--noupdate option is specified). Once
514 for testing (unless the -U/--noupdate option is specified). Once
515 you have performed tests, mark the working directory as good or
515 you have performed tests, mark the working directory as good or
516 bad, and bisect will either update to another candidate changeset
516 bad, and bisect will either update to another candidate changeset
517 or announce that it has found the bad revision.
517 or announce that it has found the bad revision.
518
518
519 As a shortcut, you can also use the revision argument to mark a
519 As a shortcut, you can also use the revision argument to mark a
520 revision as good or bad without checking it out first.
520 revision as good or bad without checking it out first.
521
521
522 If you supply a command, it will be used for automatic bisection.
522 If you supply a command, it will be used for automatic bisection.
523 The environment variable HG_NODE will contain the ID of the
523 The environment variable HG_NODE will contain the ID of the
524 changeset being tested. The exit status of the command will be
524 changeset being tested. The exit status of the command will be
525 used to mark revisions as good or bad: status 0 means good, 125
525 used to mark revisions as good or bad: status 0 means good, 125
526 means to skip the revision, 127 (command not found) will abort the
526 means to skip the revision, 127 (command not found) will abort the
527 bisection, and any other non-zero exit status means the revision
527 bisection, and any other non-zero exit status means the revision
528 is bad.
528 is bad.
529
529
530 .. container:: verbose
530 .. container:: verbose
531
531
532 Some examples:
532 Some examples:
533
533
534 - start a bisection with known bad revision 12, and good revision 34::
534 - start a bisection with known bad revision 12, and good revision 34::
535
535
536 hg bisect --bad 34
536 hg bisect --bad 34
537 hg bisect --good 12
537 hg bisect --good 12
538
538
539 - advance the current bisection by marking current revision as good or
539 - advance the current bisection by marking current revision as good or
540 bad::
540 bad::
541
541
542 hg bisect --good
542 hg bisect --good
543 hg bisect --bad
543 hg bisect --bad
544
544
545 - mark the current revision, or a known revision, to be skipped (eg. if
545 - mark the current revision, or a known revision, to be skipped (eg. if
546 that revision is not usable because of another issue)::
546 that revision is not usable because of another issue)::
547
547
548 hg bisect --skip
548 hg bisect --skip
549 hg bisect --skip 23
549 hg bisect --skip 23
550
550
551 - forget the current bisection::
551 - forget the current bisection::
552
552
553 hg bisect --reset
553 hg bisect --reset
554
554
555 - use 'make && make tests' to automatically find the first broken
555 - use 'make && make tests' to automatically find the first broken
556 revision::
556 revision::
557
557
558 hg bisect --reset
558 hg bisect --reset
559 hg bisect --bad 34
559 hg bisect --bad 34
560 hg bisect --good 12
560 hg bisect --good 12
561 hg bisect --command 'make && make tests'
561 hg bisect --command 'make && make tests'
562
562
563 - see all changesets whose states are already known in the current
563 - see all changesets whose states are already known in the current
564 bisection::
564 bisection::
565
565
566 hg log -r "bisect(pruned)"
566 hg log -r "bisect(pruned)"
567
567
568 - see the changeset currently being bisected (especially useful
568 - see the changeset currently being bisected (especially useful
569 if running with -U/--noupdate)::
569 if running with -U/--noupdate)::
570
570
571 hg log -r "bisect(current)"
571 hg log -r "bisect(current)"
572
572
573 - see all changesets that took part in the current bisection::
573 - see all changesets that took part in the current bisection::
574
574
575 hg log -r "bisect(range)"
575 hg log -r "bisect(range)"
576
576
577 - with the graphlog extension, you can even get a nice graph::
577 - with the graphlog extension, you can even get a nice graph::
578
578
579 hg log --graph -r "bisect(range)"
579 hg log --graph -r "bisect(range)"
580
580
581 See :hg:`help revsets` for more about the `bisect()` keyword.
581 See :hg:`help revsets` for more about the `bisect()` keyword.
582
582
583 Returns 0 on success.
583 Returns 0 on success.
584 """
584 """
585 def extendbisectrange(nodes, good):
585 def extendbisectrange(nodes, good):
586 # bisect is incomplete when it ends on a merge node and
586 # bisect is incomplete when it ends on a merge node and
587 # one of the parent was not checked.
587 # one of the parent was not checked.
588 parents = repo[nodes[0]].parents()
588 parents = repo[nodes[0]].parents()
589 if len(parents) > 1:
589 if len(parents) > 1:
590 side = good and state['bad'] or state['good']
590 side = good and state['bad'] or state['good']
591 num = len(set(i.node() for i in parents) & set(side))
591 num = len(set(i.node() for i in parents) & set(side))
592 if num == 1:
592 if num == 1:
593 return parents[0].ancestor(parents[1])
593 return parents[0].ancestor(parents[1])
594 return None
594 return None
595
595
596 def print_result(nodes, good):
596 def print_result(nodes, good):
597 displayer = cmdutil.show_changeset(ui, repo, {})
597 displayer = cmdutil.show_changeset(ui, repo, {})
598 if len(nodes) == 1:
598 if len(nodes) == 1:
599 # narrowed it down to a single revision
599 # narrowed it down to a single revision
600 if good:
600 if good:
601 ui.write(_("The first good revision is:\n"))
601 ui.write(_("The first good revision is:\n"))
602 else:
602 else:
603 ui.write(_("The first bad revision is:\n"))
603 ui.write(_("The first bad revision is:\n"))
604 displayer.show(repo[nodes[0]])
604 displayer.show(repo[nodes[0]])
605 extendnode = extendbisectrange(nodes, good)
605 extendnode = extendbisectrange(nodes, good)
606 if extendnode is not None:
606 if extendnode is not None:
607 ui.write(_('Not all ancestors of this changeset have been'
607 ui.write(_('Not all ancestors of this changeset have been'
608 ' checked.\nUse bisect --extend to continue the '
608 ' checked.\nUse bisect --extend to continue the '
609 'bisection from\nthe common ancestor, %s.\n')
609 'bisection from\nthe common ancestor, %s.\n')
610 % extendnode)
610 % extendnode)
611 else:
611 else:
612 # multiple possible revisions
612 # multiple possible revisions
613 if good:
613 if good:
614 ui.write(_("Due to skipped revisions, the first "
614 ui.write(_("Due to skipped revisions, the first "
615 "good revision could be any of:\n"))
615 "good revision could be any of:\n"))
616 else:
616 else:
617 ui.write(_("Due to skipped revisions, the first "
617 ui.write(_("Due to skipped revisions, the first "
618 "bad revision could be any of:\n"))
618 "bad revision could be any of:\n"))
619 for n in nodes:
619 for n in nodes:
620 displayer.show(repo[n])
620 displayer.show(repo[n])
621 displayer.close()
621 displayer.close()
622
622
623 def check_state(state, interactive=True):
623 def check_state(state, interactive=True):
624 if not state['good'] or not state['bad']:
624 if not state['good'] or not state['bad']:
625 if (good or bad or skip or reset) and interactive:
625 if (good or bad or skip or reset) and interactive:
626 return
626 return
627 if not state['good']:
627 if not state['good']:
628 raise util.Abort(_('cannot bisect (no known good revisions)'))
628 raise util.Abort(_('cannot bisect (no known good revisions)'))
629 else:
629 else:
630 raise util.Abort(_('cannot bisect (no known bad revisions)'))
630 raise util.Abort(_('cannot bisect (no known bad revisions)'))
631 return True
631 return True
632
632
633 # backward compatibility
633 # backward compatibility
634 if rev in "good bad reset init".split():
634 if rev in "good bad reset init".split():
635 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
635 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
636 cmd, rev, extra = rev, extra, None
636 cmd, rev, extra = rev, extra, None
637 if cmd == "good":
637 if cmd == "good":
638 good = True
638 good = True
639 elif cmd == "bad":
639 elif cmd == "bad":
640 bad = True
640 bad = True
641 else:
641 else:
642 reset = True
642 reset = True
643 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
643 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
644 raise util.Abort(_('incompatible arguments'))
644 raise util.Abort(_('incompatible arguments'))
645
645
646 if reset:
646 if reset:
647 p = repo.join("bisect.state")
647 p = repo.join("bisect.state")
648 if os.path.exists(p):
648 if os.path.exists(p):
649 os.unlink(p)
649 os.unlink(p)
650 return
650 return
651
651
652 state = hbisect.load_state(repo)
652 state = hbisect.load_state(repo)
653
653
654 if command:
654 if command:
655 changesets = 1
655 changesets = 1
656 try:
656 try:
657 node = state['current'][0]
657 node = state['current'][0]
658 except LookupError:
658 except LookupError:
659 if noupdate:
659 if noupdate:
660 raise util.Abort(_('current bisect revision is unknown - '
660 raise util.Abort(_('current bisect revision is unknown - '
661 'start a new bisect to fix'))
661 'start a new bisect to fix'))
662 node, p2 = repo.dirstate.parents()
662 node, p2 = repo.dirstate.parents()
663 if p2 != nullid:
663 if p2 != nullid:
664 raise util.Abort(_('current bisect revision is a merge'))
664 raise util.Abort(_('current bisect revision is a merge'))
665 try:
665 try:
666 while changesets:
666 while changesets:
667 # update state
667 # update state
668 state['current'] = [node]
668 state['current'] = [node]
669 hbisect.save_state(repo, state)
669 hbisect.save_state(repo, state)
670 status = util.system(command,
670 status = util.system(command,
671 environ={'HG_NODE': hex(node)},
671 environ={'HG_NODE': hex(node)},
672 out=ui.fout)
672 out=ui.fout)
673 if status == 125:
673 if status == 125:
674 transition = "skip"
674 transition = "skip"
675 elif status == 0:
675 elif status == 0:
676 transition = "good"
676 transition = "good"
677 # status < 0 means process was killed
677 # status < 0 means process was killed
678 elif status == 127:
678 elif status == 127:
679 raise util.Abort(_("failed to execute %s") % command)
679 raise util.Abort(_("failed to execute %s") % command)
680 elif status < 0:
680 elif status < 0:
681 raise util.Abort(_("%s killed") % command)
681 raise util.Abort(_("%s killed") % command)
682 else:
682 else:
683 transition = "bad"
683 transition = "bad"
684 ctx = scmutil.revsingle(repo, rev, node)
684 ctx = scmutil.revsingle(repo, rev, node)
685 rev = None # clear for future iterations
685 rev = None # clear for future iterations
686 state[transition].append(ctx.node())
686 state[transition].append(ctx.node())
687 ui.status(_('Changeset %d:%s: %s\n') % (ctx, ctx, transition))
687 ui.status(_('Changeset %d:%s: %s\n') % (ctx, ctx, transition))
688 check_state(state, interactive=False)
688 check_state(state, interactive=False)
689 # bisect
689 # bisect
690 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
690 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
691 # update to next check
691 # update to next check
692 node = nodes[0]
692 node = nodes[0]
693 if not noupdate:
693 if not noupdate:
694 cmdutil.bailifchanged(repo)
694 cmdutil.bailifchanged(repo)
695 hg.clean(repo, node, show_stats=False)
695 hg.clean(repo, node, show_stats=False)
696 finally:
696 finally:
697 state['current'] = [node]
697 state['current'] = [node]
698 hbisect.save_state(repo, state)
698 hbisect.save_state(repo, state)
699 print_result(nodes, good)
699 print_result(nodes, good)
700 return
700 return
701
701
702 # update state
702 # update state
703
703
704 if rev:
704 if rev:
705 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
705 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
706 else:
706 else:
707 nodes = [repo.lookup('.')]
707 nodes = [repo.lookup('.')]
708
708
709 if good or bad or skip:
709 if good or bad or skip:
710 if good:
710 if good:
711 state['good'] += nodes
711 state['good'] += nodes
712 elif bad:
712 elif bad:
713 state['bad'] += nodes
713 state['bad'] += nodes
714 elif skip:
714 elif skip:
715 state['skip'] += nodes
715 state['skip'] += nodes
716 hbisect.save_state(repo, state)
716 hbisect.save_state(repo, state)
717
717
718 if not check_state(state):
718 if not check_state(state):
719 return
719 return
720
720
721 # actually bisect
721 # actually bisect
722 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
722 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
723 if extend:
723 if extend:
724 if not changesets:
724 if not changesets:
725 extendnode = extendbisectrange(nodes, good)
725 extendnode = extendbisectrange(nodes, good)
726 if extendnode is not None:
726 if extendnode is not None:
727 ui.write(_("Extending search to changeset %d:%s\n"
727 ui.write(_("Extending search to changeset %d:%s\n"
728 % (extendnode.rev(), extendnode)))
728 % (extendnode.rev(), extendnode)))
729 state['current'] = [extendnode.node()]
729 state['current'] = [extendnode.node()]
730 hbisect.save_state(repo, state)
730 hbisect.save_state(repo, state)
731 if noupdate:
731 if noupdate:
732 return
732 return
733 cmdutil.bailifchanged(repo)
733 cmdutil.bailifchanged(repo)
734 return hg.clean(repo, extendnode.node())
734 return hg.clean(repo, extendnode.node())
735 raise util.Abort(_("nothing to extend"))
735 raise util.Abort(_("nothing to extend"))
736
736
737 if changesets == 0:
737 if changesets == 0:
738 print_result(nodes, good)
738 print_result(nodes, good)
739 else:
739 else:
740 assert len(nodes) == 1 # only a single node can be tested next
740 assert len(nodes) == 1 # only a single node can be tested next
741 node = nodes[0]
741 node = nodes[0]
742 # compute the approximate number of remaining tests
742 # compute the approximate number of remaining tests
743 tests, size = 0, 2
743 tests, size = 0, 2
744 while size <= changesets:
744 while size <= changesets:
745 tests, size = tests + 1, size * 2
745 tests, size = tests + 1, size * 2
746 rev = repo.changelog.rev(node)
746 rev = repo.changelog.rev(node)
747 ui.write(_("Testing changeset %d:%s "
747 ui.write(_("Testing changeset %d:%s "
748 "(%d changesets remaining, ~%d tests)\n")
748 "(%d changesets remaining, ~%d tests)\n")
749 % (rev, short(node), changesets, tests))
749 % (rev, short(node), changesets, tests))
750 state['current'] = [node]
750 state['current'] = [node]
751 hbisect.save_state(repo, state)
751 hbisect.save_state(repo, state)
752 if not noupdate:
752 if not noupdate:
753 cmdutil.bailifchanged(repo)
753 cmdutil.bailifchanged(repo)
754 return hg.clean(repo, node)
754 return hg.clean(repo, node)
755
755
756 @command('bookmarks',
756 @command('bookmarks',
757 [('f', 'force', False, _('force')),
757 [('f', 'force', False, _('force')),
758 ('r', 'rev', '', _('revision'), _('REV')),
758 ('r', 'rev', '', _('revision'), _('REV')),
759 ('d', 'delete', False, _('delete a given bookmark')),
759 ('d', 'delete', False, _('delete a given bookmark')),
760 ('m', 'rename', '', _('rename a given bookmark'), _('NAME')),
760 ('m', 'rename', '', _('rename a given bookmark'), _('NAME')),
761 ('i', 'inactive', False, _('mark a bookmark inactive'))],
761 ('i', 'inactive', False, _('mark a bookmark inactive'))],
762 _('hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]'))
762 _('hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]'))
763 def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False,
763 def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False,
764 rename=None, inactive=False):
764 rename=None, inactive=False):
765 '''track a line of development with movable markers
765 '''track a line of development with movable markers
766
766
767 Bookmarks are pointers to certain commits that move when committing.
767 Bookmarks are pointers to certain commits that move when committing.
768 Bookmarks are local. They can be renamed, copied and deleted. It is
768 Bookmarks are local. They can be renamed, copied and deleted. It is
769 possible to use :hg:`merge NAME` to merge from a given bookmark, and
769 possible to use :hg:`merge NAME` to merge from a given bookmark, and
770 :hg:`update NAME` to update to a given bookmark.
770 :hg:`update NAME` to update to a given bookmark.
771
771
772 You can use :hg:`bookmark NAME` to set a bookmark on the working
772 You can use :hg:`bookmark NAME` to set a bookmark on the working
773 directory's parent revision with the given name. If you specify
773 directory's parent revision with the given name. If you specify
774 a revision using -r REV (where REV may be an existing bookmark),
774 a revision using -r REV (where REV may be an existing bookmark),
775 the bookmark is assigned to that revision.
775 the bookmark is assigned to that revision.
776
776
777 Bookmarks can be pushed and pulled between repositories (see :hg:`help
777 Bookmarks can be pushed and pulled between repositories (see :hg:`help
778 push` and :hg:`help pull`). This requires both the local and remote
778 push` and :hg:`help pull`). This requires both the local and remote
779 repositories to support bookmarks. For versions prior to 1.8, this means
779 repositories to support bookmarks. For versions prior to 1.8, this means
780 the bookmarks extension must be enabled.
780 the bookmarks extension must be enabled.
781
781
782 With -i/--inactive, the new bookmark will not be made the active
782 With -i/--inactive, the new bookmark will not be made the active
783 bookmark. If -r/--rev is given, the new bookmark will not be made
783 bookmark. If -r/--rev is given, the new bookmark will not be made
784 active even if -i/--inactive is not given. If no NAME is given, the
784 active even if -i/--inactive is not given. If no NAME is given, the
785 current active bookmark will be marked inactive.
785 current active bookmark will be marked inactive.
786 '''
786 '''
787 hexfn = ui.debugflag and hex or short
787 hexfn = ui.debugflag and hex or short
788 marks = repo._bookmarks
788 marks = repo._bookmarks
789 cur = repo.changectx('.').node()
789 cur = repo.changectx('.').node()
790
790
791 if delete:
791 if delete:
792 if mark is None:
792 if mark is None:
793 raise util.Abort(_("bookmark name required"))
793 raise util.Abort(_("bookmark name required"))
794 if mark not in marks:
794 if mark not in marks:
795 raise util.Abort(_("bookmark '%s' does not exist") % mark)
795 raise util.Abort(_("bookmark '%s' does not exist") % mark)
796 if mark == repo._bookmarkcurrent:
796 if mark == repo._bookmarkcurrent:
797 bookmarks.setcurrent(repo, None)
797 bookmarks.setcurrent(repo, None)
798 del marks[mark]
798 del marks[mark]
799 bookmarks.write(repo)
799 bookmarks.write(repo)
800 return
800 return
801
801
802 if rename:
802 if rename:
803 if rename not in marks:
803 if rename not in marks:
804 raise util.Abort(_("bookmark '%s' does not exist") % rename)
804 raise util.Abort(_("bookmark '%s' does not exist") % rename)
805 if mark in marks and not force:
805 if mark in marks and not force:
806 raise util.Abort(_("bookmark '%s' already exists "
806 raise util.Abort(_("bookmark '%s' already exists "
807 "(use -f to force)") % mark)
807 "(use -f to force)") % mark)
808 if mark is None:
808 if mark is None:
809 raise util.Abort(_("new bookmark name required"))
809 raise util.Abort(_("new bookmark name required"))
810 marks[mark] = marks[rename]
810 marks[mark] = marks[rename]
811 if repo._bookmarkcurrent == rename and not inactive:
811 if repo._bookmarkcurrent == rename and not inactive:
812 bookmarks.setcurrent(repo, mark)
812 bookmarks.setcurrent(repo, mark)
813 del marks[rename]
813 del marks[rename]
814 bookmarks.write(repo)
814 bookmarks.write(repo)
815 return
815 return
816
816
817 if mark is not None:
817 if mark is not None:
818 if "\n" in mark:
818 if "\n" in mark:
819 raise util.Abort(_("bookmark name cannot contain newlines"))
819 raise util.Abort(_("bookmark name cannot contain newlines"))
820 mark = mark.strip()
820 mark = mark.strip()
821 if not mark:
821 if not mark:
822 raise util.Abort(_("bookmark names cannot consist entirely of "
822 raise util.Abort(_("bookmark names cannot consist entirely of "
823 "whitespace"))
823 "whitespace"))
824 if inactive and mark == repo._bookmarkcurrent:
824 if inactive and mark == repo._bookmarkcurrent:
825 bookmarks.setcurrent(repo, None)
825 bookmarks.setcurrent(repo, None)
826 return
826 return
827 if mark in marks and not force:
827 if mark in marks and not force:
828 raise util.Abort(_("bookmark '%s' already exists "
828 raise util.Abort(_("bookmark '%s' already exists "
829 "(use -f to force)") % mark)
829 "(use -f to force)") % mark)
830 if ((mark in repo.branchtags() or mark == repo.dirstate.branch())
830 if ((mark in repo.branchtags() or mark == repo.dirstate.branch())
831 and not force):
831 and not force):
832 raise util.Abort(
832 raise util.Abort(
833 _("a bookmark cannot have the name of an existing branch"))
833 _("a bookmark cannot have the name of an existing branch"))
834 if rev:
834 if rev:
835 marks[mark] = repo.lookup(rev)
835 marks[mark] = repo.lookup(rev)
836 else:
836 else:
837 marks[mark] = cur
837 marks[mark] = cur
838 if not inactive and cur == marks[mark]:
838 if not inactive and cur == marks[mark]:
839 bookmarks.setcurrent(repo, mark)
839 bookmarks.setcurrent(repo, mark)
840 bookmarks.write(repo)
840 bookmarks.write(repo)
841 return
841 return
842
842
843 if mark is None:
843 if mark is None:
844 if rev:
844 if rev:
845 raise util.Abort(_("bookmark name required"))
845 raise util.Abort(_("bookmark name required"))
846 if len(marks) == 0:
846 if len(marks) == 0:
847 ui.status(_("no bookmarks set\n"))
847 ui.status(_("no bookmarks set\n"))
848 else:
848 else:
849 for bmark, n in sorted(marks.iteritems()):
849 for bmark, n in sorted(marks.iteritems()):
850 current = repo._bookmarkcurrent
850 current = repo._bookmarkcurrent
851 if bmark == current and n == cur:
851 if bmark == current and n == cur:
852 prefix, label = '*', 'bookmarks.current'
852 prefix, label = '*', 'bookmarks.current'
853 else:
853 else:
854 prefix, label = ' ', ''
854 prefix, label = ' ', ''
855
855
856 if ui.quiet:
856 if ui.quiet:
857 ui.write("%s\n" % bmark, label=label)
857 ui.write("%s\n" % bmark, label=label)
858 else:
858 else:
859 ui.write(" %s %-25s %d:%s\n" % (
859 ui.write(" %s %-25s %d:%s\n" % (
860 prefix, bmark, repo.changelog.rev(n), hexfn(n)),
860 prefix, bmark, repo.changelog.rev(n), hexfn(n)),
861 label=label)
861 label=label)
862 return
862 return
863
863
864 @command('branch',
864 @command('branch',
865 [('f', 'force', None,
865 [('f', 'force', None,
866 _('set branch name even if it shadows an existing branch')),
866 _('set branch name even if it shadows an existing branch')),
867 ('C', 'clean', None, _('reset branch name to parent branch name'))],
867 ('C', 'clean', None, _('reset branch name to parent branch name'))],
868 _('[-fC] [NAME]'))
868 _('[-fC] [NAME]'))
869 def branch(ui, repo, label=None, **opts):
869 def branch(ui, repo, label=None, **opts):
870 """set or show the current branch name
870 """set or show the current branch name
871
871
872 .. note::
872 .. note::
873 Branch names are permanent and global. Use :hg:`bookmark` to create a
873 Branch names are permanent and global. Use :hg:`bookmark` to create a
874 light-weight bookmark instead. See :hg:`help glossary` for more
874 light-weight bookmark instead. See :hg:`help glossary` for more
875 information about named branches and bookmarks.
875 information about named branches and bookmarks.
876
876
877 With no argument, show the current branch name. With one argument,
877 With no argument, show the current branch name. With one argument,
878 set the working directory branch name (the branch will not exist
878 set the working directory branch name (the branch will not exist
879 in the repository until the next commit). Standard practice
879 in the repository until the next commit). Standard practice
880 recommends that primary development take place on the 'default'
880 recommends that primary development take place on the 'default'
881 branch.
881 branch.
882
882
883 Unless -f/--force is specified, branch will not let you set a
883 Unless -f/--force is specified, branch will not let you set a
884 branch name that already exists, even if it's inactive.
884 branch name that already exists, even if it's inactive.
885
885
886 Use -C/--clean to reset the working directory branch to that of
886 Use -C/--clean to reset the working directory branch to that of
887 the parent of the working directory, negating a previous branch
887 the parent of the working directory, negating a previous branch
888 change.
888 change.
889
889
890 Use the command :hg:`update` to switch to an existing branch. Use
890 Use the command :hg:`update` to switch to an existing branch. Use
891 :hg:`commit --close-branch` to mark this branch as closed.
891 :hg:`commit --close-branch` to mark this branch as closed.
892
892
893 Returns 0 on success.
893 Returns 0 on success.
894 """
894 """
895 if not opts.get('clean') and not label:
895 if not opts.get('clean') and not label:
896 ui.write("%s\n" % repo.dirstate.branch())
896 ui.write("%s\n" % repo.dirstate.branch())
897 return
897 return
898
898
899 wlock = repo.wlock()
899 wlock = repo.wlock()
900 try:
900 try:
901 if opts.get('clean'):
901 if opts.get('clean'):
902 label = repo[None].p1().branch()
902 label = repo[None].p1().branch()
903 repo.dirstate.setbranch(label)
903 repo.dirstate.setbranch(label)
904 ui.status(_('reset working directory to branch %s\n') % label)
904 ui.status(_('reset working directory to branch %s\n') % label)
905 elif label:
905 elif label:
906 if not opts.get('force') and label in repo.branchtags():
906 if not opts.get('force') and label in repo.branchtags():
907 if label not in [p.branch() for p in repo.parents()]:
907 if label not in [p.branch() for p in repo.parents()]:
908 raise util.Abort(_('a branch of the same name already'
908 raise util.Abort(_('a branch of the same name already'
909 ' exists'),
909 ' exists'),
910 # i18n: "it" refers to an existing branch
910 # i18n: "it" refers to an existing branch
911 hint=_("use 'hg update' to switch to it"))
911 hint=_("use 'hg update' to switch to it"))
912 repo.dirstate.setbranch(label)
912 repo.dirstate.setbranch(label)
913 ui.status(_('marked working directory as branch %s\n') % label)
913 ui.status(_('marked working directory as branch %s\n') % label)
914 ui.status(_('(branches are permanent and global, '
914 ui.status(_('(branches are permanent and global, '
915 'did you want a bookmark?)\n'))
915 'did you want a bookmark?)\n'))
916 finally:
916 finally:
917 wlock.release()
917 wlock.release()
918
918
919 @command('branches',
919 @command('branches',
920 [('a', 'active', False, _('show only branches that have unmerged heads')),
920 [('a', 'active', False, _('show only branches that have unmerged heads')),
921 ('c', 'closed', False, _('show normal and closed branches'))],
921 ('c', 'closed', False, _('show normal and closed branches'))],
922 _('[-ac]'))
922 _('[-ac]'))
923 def branches(ui, repo, active=False, closed=False):
923 def branches(ui, repo, active=False, closed=False):
924 """list repository named branches
924 """list repository named branches
925
925
926 List the repository's named branches, indicating which ones are
926 List the repository's named branches, indicating which ones are
927 inactive. If -c/--closed is specified, also list branches which have
927 inactive. If -c/--closed is specified, also list branches which have
928 been marked closed (see :hg:`commit --close-branch`).
928 been marked closed (see :hg:`commit --close-branch`).
929
929
930 If -a/--active is specified, only show active branches. A branch
930 If -a/--active is specified, only show active branches. A branch
931 is considered active if it contains repository heads.
931 is considered active if it contains repository heads.
932
932
933 Use the command :hg:`update` to switch to an existing branch.
933 Use the command :hg:`update` to switch to an existing branch.
934
934
935 Returns 0.
935 Returns 0.
936 """
936 """
937
937
938 hexfunc = ui.debugflag and hex or short
938 hexfunc = ui.debugflag and hex or short
939 activebranches = [repo[n].branch() for n in repo.heads()]
939 activebranches = [repo[n].branch() for n in repo.heads()]
940 def testactive(tag, node):
940 def testactive(tag, node):
941 realhead = tag in activebranches
941 realhead = tag in activebranches
942 open = node in repo.branchheads(tag, closed=False)
942 open = node in repo.branchheads(tag, closed=False)
943 return realhead and open
943 return realhead and open
944 branches = sorted([(testactive(tag, node), repo.changelog.rev(node), tag)
944 branches = sorted([(testactive(tag, node), repo.changelog.rev(node), tag)
945 for tag, node in repo.branchtags().items()],
945 for tag, node in repo.branchtags().items()],
946 reverse=True)
946 reverse=True)
947
947
948 for isactive, node, tag in branches:
948 for isactive, node, tag in branches:
949 if (not active) or isactive:
949 if (not active) or isactive:
950 hn = repo.lookup(node)
950 hn = repo.lookup(node)
951 if isactive:
951 if isactive:
952 label = 'branches.active'
952 label = 'branches.active'
953 notice = ''
953 notice = ''
954 elif hn not in repo.branchheads(tag, closed=False):
954 elif hn not in repo.branchheads(tag, closed=False):
955 if not closed:
955 if not closed:
956 continue
956 continue
957 label = 'branches.closed'
957 label = 'branches.closed'
958 notice = _(' (closed)')
958 notice = _(' (closed)')
959 else:
959 else:
960 label = 'branches.inactive'
960 label = 'branches.inactive'
961 notice = _(' (inactive)')
961 notice = _(' (inactive)')
962 if tag == repo.dirstate.branch():
962 if tag == repo.dirstate.branch():
963 label = 'branches.current'
963 label = 'branches.current'
964 rev = str(node).rjust(31 - encoding.colwidth(tag))
964 rev = str(node).rjust(31 - encoding.colwidth(tag))
965 rev = ui.label('%s:%s' % (rev, hexfunc(hn)), 'log.changeset')
965 rev = ui.label('%s:%s' % (rev, hexfunc(hn)), 'log.changeset')
966 tag = ui.label(tag, label)
966 tag = ui.label(tag, label)
967 if ui.quiet:
967 if ui.quiet:
968 ui.write("%s\n" % tag)
968 ui.write("%s\n" % tag)
969 else:
969 else:
970 ui.write("%s %s%s\n" % (tag, rev, notice))
970 ui.write("%s %s%s\n" % (tag, rev, notice))
971
971
972 @command('bundle',
972 @command('bundle',
973 [('f', 'force', None, _('run even when the destination is unrelated')),
973 [('f', 'force', None, _('run even when the destination is unrelated')),
974 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
974 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
975 _('REV')),
975 _('REV')),
976 ('b', 'branch', [], _('a specific branch you would like to bundle'),
976 ('b', 'branch', [], _('a specific branch you would like to bundle'),
977 _('BRANCH')),
977 _('BRANCH')),
978 ('', 'base', [],
978 ('', 'base', [],
979 _('a base changeset assumed to be available at the destination'),
979 _('a base changeset assumed to be available at the destination'),
980 _('REV')),
980 _('REV')),
981 ('a', 'all', None, _('bundle all changesets in the repository')),
981 ('a', 'all', None, _('bundle all changesets in the repository')),
982 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
982 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
983 ] + remoteopts,
983 ] + remoteopts,
984 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
984 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
985 def bundle(ui, repo, fname, dest=None, **opts):
985 def bundle(ui, repo, fname, dest=None, **opts):
986 """create a changegroup file
986 """create a changegroup file
987
987
988 Generate a compressed changegroup file collecting changesets not
988 Generate a compressed changegroup file collecting changesets not
989 known to be in another repository.
989 known to be in another repository.
990
990
991 If you omit the destination repository, then hg assumes the
991 If you omit the destination repository, then hg assumes the
992 destination will have all the nodes you specify with --base
992 destination will have all the nodes you specify with --base
993 parameters. To create a bundle containing all changesets, use
993 parameters. To create a bundle containing all changesets, use
994 -a/--all (or --base null).
994 -a/--all (or --base null).
995
995
996 You can change compression method with the -t/--type option.
996 You can change compression method with the -t/--type option.
997 The available compression methods are: none, bzip2, and
997 The available compression methods are: none, bzip2, and
998 gzip (by default, bundles are compressed using bzip2).
998 gzip (by default, bundles are compressed using bzip2).
999
999
1000 The bundle file can then be transferred using conventional means
1000 The bundle file can then be transferred using conventional means
1001 and applied to another repository with the unbundle or pull
1001 and applied to another repository with the unbundle or pull
1002 command. This is useful when direct push and pull are not
1002 command. This is useful when direct push and pull are not
1003 available or when exporting an entire repository is undesirable.
1003 available or when exporting an entire repository is undesirable.
1004
1004
1005 Applying bundles preserves all changeset contents including
1005 Applying bundles preserves all changeset contents including
1006 permissions, copy/rename information, and revision history.
1006 permissions, copy/rename information, and revision history.
1007
1007
1008 Returns 0 on success, 1 if no changes found.
1008 Returns 0 on success, 1 if no changes found.
1009 """
1009 """
1010 revs = None
1010 revs = None
1011 if 'rev' in opts:
1011 if 'rev' in opts:
1012 revs = scmutil.revrange(repo, opts['rev'])
1012 revs = scmutil.revrange(repo, opts['rev'])
1013
1013
1014 bundletype = opts.get('type', 'bzip2').lower()
1014 bundletype = opts.get('type', 'bzip2').lower()
1015 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1015 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1016 bundletype = btypes.get(bundletype)
1016 bundletype = btypes.get(bundletype)
1017 if bundletype not in changegroup.bundletypes:
1017 if bundletype not in changegroup.bundletypes:
1018 raise util.Abort(_('unknown bundle type specified with --type'))
1018 raise util.Abort(_('unknown bundle type specified with --type'))
1019
1019
1020 if opts.get('all'):
1020 if opts.get('all'):
1021 base = ['null']
1021 base = ['null']
1022 else:
1022 else:
1023 base = scmutil.revrange(repo, opts.get('base'))
1023 base = scmutil.revrange(repo, opts.get('base'))
1024 if base:
1024 if base:
1025 if dest:
1025 if dest:
1026 raise util.Abort(_("--base is incompatible with specifying "
1026 raise util.Abort(_("--base is incompatible with specifying "
1027 "a destination"))
1027 "a destination"))
1028 common = [repo.lookup(rev) for rev in base]
1028 common = [repo.lookup(rev) for rev in base]
1029 heads = revs and map(repo.lookup, revs) or revs
1029 heads = revs and map(repo.lookup, revs) or revs
1030 cg = repo.getbundle('bundle', heads=heads, common=common)
1030 cg = repo.getbundle('bundle', heads=heads, common=common)
1031 outgoing = None
1031 outgoing = None
1032 else:
1032 else:
1033 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1033 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1034 dest, branches = hg.parseurl(dest, opts.get('branch'))
1034 dest, branches = hg.parseurl(dest, opts.get('branch'))
1035 other = hg.peer(repo, opts, dest)
1035 other = hg.peer(repo, opts, dest)
1036 revs, checkout = hg.addbranchrevs(repo, other, branches, revs)
1036 revs, checkout = hg.addbranchrevs(repo, other, branches, revs)
1037 heads = revs and map(repo.lookup, revs) or revs
1037 heads = revs and map(repo.lookup, revs) or revs
1038 outgoing = discovery.findcommonoutgoing(repo, other,
1038 outgoing = discovery.findcommonoutgoing(repo, other,
1039 onlyheads=heads,
1039 onlyheads=heads,
1040 force=opts.get('force'))
1040 force=opts.get('force'))
1041 cg = repo.getlocalbundle('bundle', outgoing)
1041 cg = repo.getlocalbundle('bundle', outgoing)
1042 if not cg:
1042 if not cg:
1043 scmutil.nochangesfound(ui, outgoing and outgoing.excluded)
1043 scmutil.nochangesfound(ui, outgoing and outgoing.excluded)
1044 return 1
1044 return 1
1045
1045
1046 changegroup.writebundle(cg, fname, bundletype)
1046 changegroup.writebundle(cg, fname, bundletype)
1047
1047
1048 @command('cat',
1048 @command('cat',
1049 [('o', 'output', '',
1049 [('o', 'output', '',
1050 _('print output to file with formatted name'), _('FORMAT')),
1050 _('print output to file with formatted name'), _('FORMAT')),
1051 ('r', 'rev', '', _('print the given revision'), _('REV')),
1051 ('r', 'rev', '', _('print the given revision'), _('REV')),
1052 ('', 'decode', None, _('apply any matching decode filter')),
1052 ('', 'decode', None, _('apply any matching decode filter')),
1053 ] + walkopts,
1053 ] + walkopts,
1054 _('[OPTION]... FILE...'))
1054 _('[OPTION]... FILE...'))
1055 def cat(ui, repo, file1, *pats, **opts):
1055 def cat(ui, repo, file1, *pats, **opts):
1056 """output the current or given revision of files
1056 """output the current or given revision of files
1057
1057
1058 Print the specified files as they were at the given revision. If
1058 Print the specified files as they were at the given revision. If
1059 no revision is given, the parent of the working directory is used,
1059 no revision is given, the parent of the working directory is used,
1060 or tip if no revision is checked out.
1060 or tip if no revision is checked out.
1061
1061
1062 Output may be to a file, in which case the name of the file is
1062 Output may be to a file, in which case the name of the file is
1063 given using a format string. The formatting rules are the same as
1063 given using a format string. The formatting rules are the same as
1064 for the export command, with the following additions:
1064 for the export command, with the following additions:
1065
1065
1066 :``%s``: basename of file being printed
1066 :``%s``: basename of file being printed
1067 :``%d``: dirname of file being printed, or '.' if in repository root
1067 :``%d``: dirname of file being printed, or '.' if in repository root
1068 :``%p``: root-relative path name of file being printed
1068 :``%p``: root-relative path name of file being printed
1069
1069
1070 Returns 0 on success.
1070 Returns 0 on success.
1071 """
1071 """
1072 ctx = scmutil.revsingle(repo, opts.get('rev'))
1072 ctx = scmutil.revsingle(repo, opts.get('rev'))
1073 err = 1
1073 err = 1
1074 m = scmutil.match(ctx, (file1,) + pats, opts)
1074 m = scmutil.match(ctx, (file1,) + pats, opts)
1075 for abs in ctx.walk(m):
1075 for abs in ctx.walk(m):
1076 fp = cmdutil.makefileobj(repo, opts.get('output'), ctx.node(),
1076 fp = cmdutil.makefileobj(repo, opts.get('output'), ctx.node(),
1077 pathname=abs)
1077 pathname=abs)
1078 data = ctx[abs].data()
1078 data = ctx[abs].data()
1079 if opts.get('decode'):
1079 if opts.get('decode'):
1080 data = repo.wwritedata(abs, data)
1080 data = repo.wwritedata(abs, data)
1081 fp.write(data)
1081 fp.write(data)
1082 fp.close()
1082 fp.close()
1083 err = 0
1083 err = 0
1084 return err
1084 return err
1085
1085
1086 @command('^clone',
1086 @command('^clone',
1087 [('U', 'noupdate', None,
1087 [('U', 'noupdate', None,
1088 _('the clone will include an empty working copy (only a repository)')),
1088 _('the clone will include an empty working copy (only a repository)')),
1089 ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')),
1089 ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')),
1090 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1090 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1091 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1091 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1092 ('', 'pull', None, _('use pull protocol to copy metadata')),
1092 ('', 'pull', None, _('use pull protocol to copy metadata')),
1093 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1093 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1094 ] + remoteopts,
1094 ] + remoteopts,
1095 _('[OPTION]... SOURCE [DEST]'))
1095 _('[OPTION]... SOURCE [DEST]'))
1096 def clone(ui, source, dest=None, **opts):
1096 def clone(ui, source, dest=None, **opts):
1097 """make a copy of an existing repository
1097 """make a copy of an existing repository
1098
1098
1099 Create a copy of an existing repository in a new directory.
1099 Create a copy of an existing repository in a new directory.
1100
1100
1101 If no destination directory name is specified, it defaults to the
1101 If no destination directory name is specified, it defaults to the
1102 basename of the source.
1102 basename of the source.
1103
1103
1104 The location of the source is added to the new repository's
1104 The location of the source is added to the new repository's
1105 ``.hg/hgrc`` file, as the default to be used for future pulls.
1105 ``.hg/hgrc`` file, as the default to be used for future pulls.
1106
1106
1107 Only local paths and ``ssh://`` URLs are supported as
1107 Only local paths and ``ssh://`` URLs are supported as
1108 destinations. For ``ssh://`` destinations, no working directory or
1108 destinations. For ``ssh://`` destinations, no working directory or
1109 ``.hg/hgrc`` will be created on the remote side.
1109 ``.hg/hgrc`` will be created on the remote side.
1110
1110
1111 To pull only a subset of changesets, specify one or more revisions
1111 To pull only a subset of changesets, specify one or more revisions
1112 identifiers with -r/--rev or branches with -b/--branch. The
1112 identifiers with -r/--rev or branches with -b/--branch. The
1113 resulting clone will contain only the specified changesets and
1113 resulting clone will contain only the specified changesets and
1114 their ancestors. These options (or 'clone src#rev dest') imply
1114 their ancestors. These options (or 'clone src#rev dest') imply
1115 --pull, even for local source repositories. Note that specifying a
1115 --pull, even for local source repositories. Note that specifying a
1116 tag will include the tagged changeset but not the changeset
1116 tag will include the tagged changeset but not the changeset
1117 containing the tag.
1117 containing the tag.
1118
1118
1119 To check out a particular version, use -u/--update, or
1119 To check out a particular version, use -u/--update, or
1120 -U/--noupdate to create a clone with no working directory.
1120 -U/--noupdate to create a clone with no working directory.
1121
1121
1122 .. container:: verbose
1122 .. container:: verbose
1123
1123
1124 For efficiency, hardlinks are used for cloning whenever the
1124 For efficiency, hardlinks are used for cloning whenever the
1125 source and destination are on the same filesystem (note this
1125 source and destination are on the same filesystem (note this
1126 applies only to the repository data, not to the working
1126 applies only to the repository data, not to the working
1127 directory). Some filesystems, such as AFS, implement hardlinking
1127 directory). Some filesystems, such as AFS, implement hardlinking
1128 incorrectly, but do not report errors. In these cases, use the
1128 incorrectly, but do not report errors. In these cases, use the
1129 --pull option to avoid hardlinking.
1129 --pull option to avoid hardlinking.
1130
1130
1131 In some cases, you can clone repositories and the working
1131 In some cases, you can clone repositories and the working
1132 directory using full hardlinks with ::
1132 directory using full hardlinks with ::
1133
1133
1134 $ cp -al REPO REPOCLONE
1134 $ cp -al REPO REPOCLONE
1135
1135
1136 This is the fastest way to clone, but it is not always safe. The
1136 This is the fastest way to clone, but it is not always safe. The
1137 operation is not atomic (making sure REPO is not modified during
1137 operation is not atomic (making sure REPO is not modified during
1138 the operation is up to you) and you have to make sure your
1138 the operation is up to you) and you have to make sure your
1139 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1139 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1140 so). Also, this is not compatible with certain extensions that
1140 so). Also, this is not compatible with certain extensions that
1141 place their metadata under the .hg directory, such as mq.
1141 place their metadata under the .hg directory, such as mq.
1142
1142
1143 Mercurial will update the working directory to the first applicable
1143 Mercurial will update the working directory to the first applicable
1144 revision from this list:
1144 revision from this list:
1145
1145
1146 a) null if -U or the source repository has no changesets
1146 a) null if -U or the source repository has no changesets
1147 b) if -u . and the source repository is local, the first parent of
1147 b) if -u . and the source repository is local, the first parent of
1148 the source repository's working directory
1148 the source repository's working directory
1149 c) the changeset specified with -u (if a branch name, this means the
1149 c) the changeset specified with -u (if a branch name, this means the
1150 latest head of that branch)
1150 latest head of that branch)
1151 d) the changeset specified with -r
1151 d) the changeset specified with -r
1152 e) the tipmost head specified with -b
1152 e) the tipmost head specified with -b
1153 f) the tipmost head specified with the url#branch source syntax
1153 f) the tipmost head specified with the url#branch source syntax
1154 g) the tipmost head of the default branch
1154 g) the tipmost head of the default branch
1155 h) tip
1155 h) tip
1156
1156
1157 Examples:
1157 Examples:
1158
1158
1159 - clone a remote repository to a new directory named hg/::
1159 - clone a remote repository to a new directory named hg/::
1160
1160
1161 hg clone http://selenic.com/hg
1161 hg clone http://selenic.com/hg
1162
1162
1163 - create a lightweight local clone::
1163 - create a lightweight local clone::
1164
1164
1165 hg clone project/ project-feature/
1165 hg clone project/ project-feature/
1166
1166
1167 - clone from an absolute path on an ssh server (note double-slash)::
1167 - clone from an absolute path on an ssh server (note double-slash)::
1168
1168
1169 hg clone ssh://user@server//home/projects/alpha/
1169 hg clone ssh://user@server//home/projects/alpha/
1170
1170
1171 - do a high-speed clone over a LAN while checking out a
1171 - do a high-speed clone over a LAN while checking out a
1172 specified version::
1172 specified version::
1173
1173
1174 hg clone --uncompressed http://server/repo -u 1.5
1174 hg clone --uncompressed http://server/repo -u 1.5
1175
1175
1176 - create a repository without changesets after a particular revision::
1176 - create a repository without changesets after a particular revision::
1177
1177
1178 hg clone -r 04e544 experimental/ good/
1178 hg clone -r 04e544 experimental/ good/
1179
1179
1180 - clone (and track) a particular named branch::
1180 - clone (and track) a particular named branch::
1181
1181
1182 hg clone http://selenic.com/hg#stable
1182 hg clone http://selenic.com/hg#stable
1183
1183
1184 See :hg:`help urls` for details on specifying URLs.
1184 See :hg:`help urls` for details on specifying URLs.
1185
1185
1186 Returns 0 on success.
1186 Returns 0 on success.
1187 """
1187 """
1188 if opts.get('noupdate') and opts.get('updaterev'):
1188 if opts.get('noupdate') and opts.get('updaterev'):
1189 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
1189 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
1190
1190
1191 r = hg.clone(ui, opts, source, dest,
1191 r = hg.clone(ui, opts, source, dest,
1192 pull=opts.get('pull'),
1192 pull=opts.get('pull'),
1193 stream=opts.get('uncompressed'),
1193 stream=opts.get('uncompressed'),
1194 rev=opts.get('rev'),
1194 rev=opts.get('rev'),
1195 update=opts.get('updaterev') or not opts.get('noupdate'),
1195 update=opts.get('updaterev') or not opts.get('noupdate'),
1196 branch=opts.get('branch'))
1196 branch=opts.get('branch'))
1197
1197
1198 return r is None
1198 return r is None
1199
1199
1200 @command('^commit|ci',
1200 @command('^commit|ci',
1201 [('A', 'addremove', None,
1201 [('A', 'addremove', None,
1202 _('mark new/missing files as added/removed before committing')),
1202 _('mark new/missing files as added/removed before committing')),
1203 ('', 'close-branch', None,
1203 ('', 'close-branch', None,
1204 _('mark a branch as closed, hiding it from the branch list')),
1204 _('mark a branch as closed, hiding it from the branch list')),
1205 ('', 'amend', None, _('amend the parent of the working dir')),
1205 ('', 'amend', None, _('amend the parent of the working dir')),
1206 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1206 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1207 _('[OPTION]... [FILE]...'))
1207 _('[OPTION]... [FILE]...'))
1208 def commit(ui, repo, *pats, **opts):
1208 def commit(ui, repo, *pats, **opts):
1209 """commit the specified files or all outstanding changes
1209 """commit the specified files or all outstanding changes
1210
1210
1211 Commit changes to the given files into the repository. Unlike a
1211 Commit changes to the given files into the repository. Unlike a
1212 centralized SCM, this operation is a local operation. See
1212 centralized SCM, this operation is a local operation. See
1213 :hg:`push` for a way to actively distribute your changes.
1213 :hg:`push` for a way to actively distribute your changes.
1214
1214
1215 If a list of files is omitted, all changes reported by :hg:`status`
1215 If a list of files is omitted, all changes reported by :hg:`status`
1216 will be committed.
1216 will be committed.
1217
1217
1218 If you are committing the result of a merge, do not provide any
1218 If you are committing the result of a merge, do not provide any
1219 filenames or -I/-X filters.
1219 filenames or -I/-X filters.
1220
1220
1221 If no commit message is specified, Mercurial starts your
1221 If no commit message is specified, Mercurial starts your
1222 configured editor where you can enter a message. In case your
1222 configured editor where you can enter a message. In case your
1223 commit fails, you will find a backup of your message in
1223 commit fails, you will find a backup of your message in
1224 ``.hg/last-message.txt``.
1224 ``.hg/last-message.txt``.
1225
1225
1226 The --amend flag can be used to amend the parent of the
1226 The --amend flag can be used to amend the parent of the
1227 working directory with a new commit that contains the changes
1227 working directory with a new commit that contains the changes
1228 in the parent in addition to those currently reported by :hg:`status`,
1228 in the parent in addition to those currently reported by :hg:`status`,
1229 if there are any. The old commit is stored in a backup bundle in
1229 if there are any. The old commit is stored in a backup bundle in
1230 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1230 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1231 on how to restore it).
1231 on how to restore it).
1232
1232
1233 Message, user and date are taken from the amended commit unless
1233 Message, user and date are taken from the amended commit unless
1234 specified. When a message isn't specified on the command line,
1234 specified. When a message isn't specified on the command line,
1235 the editor will open with the message of the amended commit.
1235 the editor will open with the message of the amended commit.
1236
1236
1237 It is not possible to amend public changesets (see :hg:`help phases`)
1237 It is not possible to amend public changesets (see :hg:`help phases`)
1238 or changesets that have children.
1238 or changesets that have children.
1239
1239
1240 See :hg:`help dates` for a list of formats valid for -d/--date.
1240 See :hg:`help dates` for a list of formats valid for -d/--date.
1241
1241
1242 Returns 0 on success, 1 if nothing changed.
1242 Returns 0 on success, 1 if nothing changed.
1243 """
1243 """
1244 if opts.get('subrepos'):
1244 if opts.get('subrepos'):
1245 # Let --subrepos on the command line overide config setting.
1245 # Let --subrepos on the command line overide config setting.
1246 ui.setconfig('ui', 'commitsubrepos', True)
1246 ui.setconfig('ui', 'commitsubrepos', True)
1247
1247
1248 extra = {}
1248 extra = {}
1249 if opts.get('close_branch'):
1249 if opts.get('close_branch'):
1250 if repo['.'].node() not in repo.branchheads():
1250 if repo['.'].node() not in repo.branchheads():
1251 # The topo heads set is included in the branch heads set of the
1251 # The topo heads set is included in the branch heads set of the
1252 # current branch, so it's sufficient to test branchheads
1252 # current branch, so it's sufficient to test branchheads
1253 raise util.Abort(_('can only close branch heads'))
1253 raise util.Abort(_('can only close branch heads'))
1254 extra['close'] = 1
1254 extra['close'] = 1
1255
1255
1256 branch = repo[None].branch()
1256 branch = repo[None].branch()
1257 bheads = repo.branchheads(branch)
1257 bheads = repo.branchheads(branch)
1258
1258
1259 if opts.get('amend'):
1259 if opts.get('amend'):
1260 if ui.configbool('ui', 'commitsubrepos'):
1260 if ui.configbool('ui', 'commitsubrepos'):
1261 raise util.Abort(_('cannot amend recursively'))
1261 raise util.Abort(_('cannot amend recursively'))
1262
1262
1263 old = repo['.']
1263 old = repo['.']
1264 if old.phase() == phases.public:
1264 if old.phase() == phases.public:
1265 raise util.Abort(_('cannot amend public changesets'))
1265 raise util.Abort(_('cannot amend public changesets'))
1266 if len(old.parents()) > 1:
1266 if len(old.parents()) > 1:
1267 raise util.Abort(_('cannot amend merge changesets'))
1267 raise util.Abort(_('cannot amend merge changesets'))
1268 if len(repo[None].parents()) > 1:
1268 if len(repo[None].parents()) > 1:
1269 raise util.Abort(_('cannot amend while merging'))
1269 raise util.Abort(_('cannot amend while merging'))
1270 if old.children():
1270 if old.children():
1271 raise util.Abort(_('cannot amend changeset with children'))
1271 raise util.Abort(_('cannot amend changeset with children'))
1272
1272
1273 e = cmdutil.commiteditor
1273 e = cmdutil.commiteditor
1274 if opts.get('force_editor'):
1274 if opts.get('force_editor'):
1275 e = cmdutil.commitforceeditor
1275 e = cmdutil.commitforceeditor
1276
1276
1277 def commitfunc(ui, repo, message, match, opts):
1277 def commitfunc(ui, repo, message, match, opts):
1278 editor = e
1278 editor = e
1279 # message contains text from -m or -l, if it's empty,
1279 # message contains text from -m or -l, if it's empty,
1280 # open the editor with the old message
1280 # open the editor with the old message
1281 if not message:
1281 if not message:
1282 message = old.description()
1282 message = old.description()
1283 editor = cmdutil.commitforceeditor
1283 editor = cmdutil.commitforceeditor
1284 return repo.commit(message,
1284 return repo.commit(message,
1285 opts.get('user') or old.user(),
1285 opts.get('user') or old.user(),
1286 opts.get('date') or old.date(),
1286 opts.get('date') or old.date(),
1287 match,
1287 match,
1288 editor=editor,
1288 editor=editor,
1289 extra=extra)
1289 extra=extra)
1290
1290
1291 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1291 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1292 if node == old.node():
1292 if node == old.node():
1293 ui.status(_("nothing changed\n"))
1293 ui.status(_("nothing changed\n"))
1294 return 1
1294 return 1
1295 else:
1295 else:
1296 e = cmdutil.commiteditor
1296 e = cmdutil.commiteditor
1297 if opts.get('force_editor'):
1297 if opts.get('force_editor'):
1298 e = cmdutil.commitforceeditor
1298 e = cmdutil.commitforceeditor
1299
1299
1300 def commitfunc(ui, repo, message, match, opts):
1300 def commitfunc(ui, repo, message, match, opts):
1301 return repo.commit(message, opts.get('user'), opts.get('date'),
1301 return repo.commit(message, opts.get('user'), opts.get('date'),
1302 match, editor=e, extra=extra)
1302 match, editor=e, extra=extra)
1303
1303
1304 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1304 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1305
1305
1306 if not node:
1306 if not node:
1307 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1307 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1308 if stat[3]:
1308 if stat[3]:
1309 ui.status(_("nothing changed (%d missing files, see "
1309 ui.status(_("nothing changed (%d missing files, see "
1310 "'hg status')\n") % len(stat[3]))
1310 "'hg status')\n") % len(stat[3]))
1311 else:
1311 else:
1312 ui.status(_("nothing changed\n"))
1312 ui.status(_("nothing changed\n"))
1313 return 1
1313 return 1
1314
1314
1315 ctx = repo[node]
1315 ctx = repo[node]
1316 parents = ctx.parents()
1316 parents = ctx.parents()
1317
1317
1318 if (not opts.get('amend') and bheads and node not in bheads and not
1318 if (not opts.get('amend') and bheads and node not in bheads and not
1319 [x for x in parents if x.node() in bheads and x.branch() == branch]):
1319 [x for x in parents if x.node() in bheads and x.branch() == branch]):
1320 ui.status(_('created new head\n'))
1320 ui.status(_('created new head\n'))
1321 # The message is not printed for initial roots. For the other
1321 # The message is not printed for initial roots. For the other
1322 # changesets, it is printed in the following situations:
1322 # changesets, it is printed in the following situations:
1323 #
1323 #
1324 # Par column: for the 2 parents with ...
1324 # Par column: for the 2 parents with ...
1325 # N: null or no parent
1325 # N: null or no parent
1326 # B: parent is on another named branch
1326 # B: parent is on another named branch
1327 # C: parent is a regular non head changeset
1327 # C: parent is a regular non head changeset
1328 # H: parent was a branch head of the current branch
1328 # H: parent was a branch head of the current branch
1329 # Msg column: whether we print "created new head" message
1329 # Msg column: whether we print "created new head" message
1330 # In the following, it is assumed that there already exists some
1330 # In the following, it is assumed that there already exists some
1331 # initial branch heads of the current branch, otherwise nothing is
1331 # initial branch heads of the current branch, otherwise nothing is
1332 # printed anyway.
1332 # printed anyway.
1333 #
1333 #
1334 # Par Msg Comment
1334 # Par Msg Comment
1335 # NN y additional topo root
1335 # NN y additional topo root
1336 #
1336 #
1337 # BN y additional branch root
1337 # BN y additional branch root
1338 # CN y additional topo head
1338 # CN y additional topo head
1339 # HN n usual case
1339 # HN n usual case
1340 #
1340 #
1341 # BB y weird additional branch root
1341 # BB y weird additional branch root
1342 # CB y branch merge
1342 # CB y branch merge
1343 # HB n merge with named branch
1343 # HB n merge with named branch
1344 #
1344 #
1345 # CC y additional head from merge
1345 # CC y additional head from merge
1346 # CH n merge with a head
1346 # CH n merge with a head
1347 #
1347 #
1348 # HH n head merge: head count decreases
1348 # HH n head merge: head count decreases
1349
1349
1350 if not opts.get('close_branch'):
1350 if not opts.get('close_branch'):
1351 for r in parents:
1351 for r in parents:
1352 if r.extra().get('close') and r.branch() == branch:
1352 if r.extra().get('close') and r.branch() == branch:
1353 ui.status(_('reopening closed branch head %d\n') % r)
1353 ui.status(_('reopening closed branch head %d\n') % r)
1354
1354
1355 if ui.debugflag:
1355 if ui.debugflag:
1356 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex()))
1356 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex()))
1357 elif ui.verbose:
1357 elif ui.verbose:
1358 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx))
1358 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx))
1359
1359
1360 @command('copy|cp',
1360 @command('copy|cp',
1361 [('A', 'after', None, _('record a copy that has already occurred')),
1361 [('A', 'after', None, _('record a copy that has already occurred')),
1362 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1362 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1363 ] + walkopts + dryrunopts,
1363 ] + walkopts + dryrunopts,
1364 _('[OPTION]... [SOURCE]... DEST'))
1364 _('[OPTION]... [SOURCE]... DEST'))
1365 def copy(ui, repo, *pats, **opts):
1365 def copy(ui, repo, *pats, **opts):
1366 """mark files as copied for the next commit
1366 """mark files as copied for the next commit
1367
1367
1368 Mark dest as having copies of source files. If dest is a
1368 Mark dest as having copies of source files. If dest is a
1369 directory, copies are put in that directory. If dest is a file,
1369 directory, copies are put in that directory. If dest is a file,
1370 the source must be a single file.
1370 the source must be a single file.
1371
1371
1372 By default, this command copies the contents of files as they
1372 By default, this command copies the contents of files as they
1373 exist in the working directory. If invoked with -A/--after, the
1373 exist in the working directory. If invoked with -A/--after, the
1374 operation is recorded, but no copying is performed.
1374 operation is recorded, but no copying is performed.
1375
1375
1376 This command takes effect with the next commit. To undo a copy
1376 This command takes effect with the next commit. To undo a copy
1377 before that, see :hg:`revert`.
1377 before that, see :hg:`revert`.
1378
1378
1379 Returns 0 on success, 1 if errors are encountered.
1379 Returns 0 on success, 1 if errors are encountered.
1380 """
1380 """
1381 wlock = repo.wlock(False)
1381 wlock = repo.wlock(False)
1382 try:
1382 try:
1383 return cmdutil.copy(ui, repo, pats, opts)
1383 return cmdutil.copy(ui, repo, pats, opts)
1384 finally:
1384 finally:
1385 wlock.release()
1385 wlock.release()
1386
1386
1387 @command('debugancestor', [], _('[INDEX] REV1 REV2'))
1387 @command('debugancestor', [], _('[INDEX] REV1 REV2'))
1388 def debugancestor(ui, repo, *args):
1388 def debugancestor(ui, repo, *args):
1389 """find the ancestor revision of two revisions in a given index"""
1389 """find the ancestor revision of two revisions in a given index"""
1390 if len(args) == 3:
1390 if len(args) == 3:
1391 index, rev1, rev2 = args
1391 index, rev1, rev2 = args
1392 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1392 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1393 lookup = r.lookup
1393 lookup = r.lookup
1394 elif len(args) == 2:
1394 elif len(args) == 2:
1395 if not repo:
1395 if not repo:
1396 raise util.Abort(_("there is no Mercurial repository here "
1396 raise util.Abort(_("there is no Mercurial repository here "
1397 "(.hg not found)"))
1397 "(.hg not found)"))
1398 rev1, rev2 = args
1398 rev1, rev2 = args
1399 r = repo.changelog
1399 r = repo.changelog
1400 lookup = repo.lookup
1400 lookup = repo.lookup
1401 else:
1401 else:
1402 raise util.Abort(_('either two or three arguments required'))
1402 raise util.Abort(_('either two or three arguments required'))
1403 a = r.ancestor(lookup(rev1), lookup(rev2))
1403 a = r.ancestor(lookup(rev1), lookup(rev2))
1404 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1404 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1405
1405
1406 @command('debugbuilddag',
1406 @command('debugbuilddag',
1407 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1407 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1408 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1408 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1409 ('n', 'new-file', None, _('add new file at each rev'))],
1409 ('n', 'new-file', None, _('add new file at each rev'))],
1410 _('[OPTION]... [TEXT]'))
1410 _('[OPTION]... [TEXT]'))
1411 def debugbuilddag(ui, repo, text=None,
1411 def debugbuilddag(ui, repo, text=None,
1412 mergeable_file=False,
1412 mergeable_file=False,
1413 overwritten_file=False,
1413 overwritten_file=False,
1414 new_file=False):
1414 new_file=False):
1415 """builds a repo with a given DAG from scratch in the current empty repo
1415 """builds a repo with a given DAG from scratch in the current empty repo
1416
1416
1417 The description of the DAG is read from stdin if not given on the
1417 The description of the DAG is read from stdin if not given on the
1418 command line.
1418 command line.
1419
1419
1420 Elements:
1420 Elements:
1421
1421
1422 - "+n" is a linear run of n nodes based on the current default parent
1422 - "+n" is a linear run of n nodes based on the current default parent
1423 - "." is a single node based on the current default parent
1423 - "." is a single node based on the current default parent
1424 - "$" resets the default parent to null (implied at the start);
1424 - "$" resets the default parent to null (implied at the start);
1425 otherwise the default parent is always the last node created
1425 otherwise the default parent is always the last node created
1426 - "<p" sets the default parent to the backref p
1426 - "<p" sets the default parent to the backref p
1427 - "*p" is a fork at parent p, which is a backref
1427 - "*p" is a fork at parent p, which is a backref
1428 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1428 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1429 - "/p2" is a merge of the preceding node and p2
1429 - "/p2" is a merge of the preceding node and p2
1430 - ":tag" defines a local tag for the preceding node
1430 - ":tag" defines a local tag for the preceding node
1431 - "@branch" sets the named branch for subsequent nodes
1431 - "@branch" sets the named branch for subsequent nodes
1432 - "#...\\n" is a comment up to the end of the line
1432 - "#...\\n" is a comment up to the end of the line
1433
1433
1434 Whitespace between the above elements is ignored.
1434 Whitespace between the above elements is ignored.
1435
1435
1436 A backref is either
1436 A backref is either
1437
1437
1438 - a number n, which references the node curr-n, where curr is the current
1438 - a number n, which references the node curr-n, where curr is the current
1439 node, or
1439 node, or
1440 - the name of a local tag you placed earlier using ":tag", or
1440 - the name of a local tag you placed earlier using ":tag", or
1441 - empty to denote the default parent.
1441 - empty to denote the default parent.
1442
1442
1443 All string valued-elements are either strictly alphanumeric, or must
1443 All string valued-elements are either strictly alphanumeric, or must
1444 be enclosed in double quotes ("..."), with "\\" as escape character.
1444 be enclosed in double quotes ("..."), with "\\" as escape character.
1445 """
1445 """
1446
1446
1447 if text is None:
1447 if text is None:
1448 ui.status(_("reading DAG from stdin\n"))
1448 ui.status(_("reading DAG from stdin\n"))
1449 text = ui.fin.read()
1449 text = ui.fin.read()
1450
1450
1451 cl = repo.changelog
1451 cl = repo.changelog
1452 if len(cl) > 0:
1452 if len(cl) > 0:
1453 raise util.Abort(_('repository is not empty'))
1453 raise util.Abort(_('repository is not empty'))
1454
1454
1455 # determine number of revs in DAG
1455 # determine number of revs in DAG
1456 total = 0
1456 total = 0
1457 for type, data in dagparser.parsedag(text):
1457 for type, data in dagparser.parsedag(text):
1458 if type == 'n':
1458 if type == 'n':
1459 total += 1
1459 total += 1
1460
1460
1461 if mergeable_file:
1461 if mergeable_file:
1462 linesperrev = 2
1462 linesperrev = 2
1463 # make a file with k lines per rev
1463 # make a file with k lines per rev
1464 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1464 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1465 initialmergedlines.append("")
1465 initialmergedlines.append("")
1466
1466
1467 tags = []
1467 tags = []
1468
1468
1469 lock = tr = None
1469 lock = tr = None
1470 try:
1470 try:
1471 lock = repo.lock()
1471 lock = repo.lock()
1472 tr = repo.transaction("builddag")
1472 tr = repo.transaction("builddag")
1473
1473
1474 at = -1
1474 at = -1
1475 atbranch = 'default'
1475 atbranch = 'default'
1476 nodeids = []
1476 nodeids = []
1477 id = 0
1477 id = 0
1478 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1478 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1479 for type, data in dagparser.parsedag(text):
1479 for type, data in dagparser.parsedag(text):
1480 if type == 'n':
1480 if type == 'n':
1481 ui.note('node %s\n' % str(data))
1481 ui.note('node %s\n' % str(data))
1482 id, ps = data
1482 id, ps = data
1483
1483
1484 files = []
1484 files = []
1485 fctxs = {}
1485 fctxs = {}
1486
1486
1487 p2 = None
1487 p2 = None
1488 if mergeable_file:
1488 if mergeable_file:
1489 fn = "mf"
1489 fn = "mf"
1490 p1 = repo[ps[0]]
1490 p1 = repo[ps[0]]
1491 if len(ps) > 1:
1491 if len(ps) > 1:
1492 p2 = repo[ps[1]]
1492 p2 = repo[ps[1]]
1493 pa = p1.ancestor(p2)
1493 pa = p1.ancestor(p2)
1494 base, local, other = [x[fn].data() for x in pa, p1, p2]
1494 base, local, other = [x[fn].data() for x in pa, p1, p2]
1495 m3 = simplemerge.Merge3Text(base, local, other)
1495 m3 = simplemerge.Merge3Text(base, local, other)
1496 ml = [l.strip() for l in m3.merge_lines()]
1496 ml = [l.strip() for l in m3.merge_lines()]
1497 ml.append("")
1497 ml.append("")
1498 elif at > 0:
1498 elif at > 0:
1499 ml = p1[fn].data().split("\n")
1499 ml = p1[fn].data().split("\n")
1500 else:
1500 else:
1501 ml = initialmergedlines
1501 ml = initialmergedlines
1502 ml[id * linesperrev] += " r%i" % id
1502 ml[id * linesperrev] += " r%i" % id
1503 mergedtext = "\n".join(ml)
1503 mergedtext = "\n".join(ml)
1504 files.append(fn)
1504 files.append(fn)
1505 fctxs[fn] = context.memfilectx(fn, mergedtext)
1505 fctxs[fn] = context.memfilectx(fn, mergedtext)
1506
1506
1507 if overwritten_file:
1507 if overwritten_file:
1508 fn = "of"
1508 fn = "of"
1509 files.append(fn)
1509 files.append(fn)
1510 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1510 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1511
1511
1512 if new_file:
1512 if new_file:
1513 fn = "nf%i" % id
1513 fn = "nf%i" % id
1514 files.append(fn)
1514 files.append(fn)
1515 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1515 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1516 if len(ps) > 1:
1516 if len(ps) > 1:
1517 if not p2:
1517 if not p2:
1518 p2 = repo[ps[1]]
1518 p2 = repo[ps[1]]
1519 for fn in p2:
1519 for fn in p2:
1520 if fn.startswith("nf"):
1520 if fn.startswith("nf"):
1521 files.append(fn)
1521 files.append(fn)
1522 fctxs[fn] = p2[fn]
1522 fctxs[fn] = p2[fn]
1523
1523
1524 def fctxfn(repo, cx, path):
1524 def fctxfn(repo, cx, path):
1525 return fctxs.get(path)
1525 return fctxs.get(path)
1526
1526
1527 if len(ps) == 0 or ps[0] < 0:
1527 if len(ps) == 0 or ps[0] < 0:
1528 pars = [None, None]
1528 pars = [None, None]
1529 elif len(ps) == 1:
1529 elif len(ps) == 1:
1530 pars = [nodeids[ps[0]], None]
1530 pars = [nodeids[ps[0]], None]
1531 else:
1531 else:
1532 pars = [nodeids[p] for p in ps]
1532 pars = [nodeids[p] for p in ps]
1533 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1533 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1534 date=(id, 0),
1534 date=(id, 0),
1535 user="debugbuilddag",
1535 user="debugbuilddag",
1536 extra={'branch': atbranch})
1536 extra={'branch': atbranch})
1537 nodeid = repo.commitctx(cx)
1537 nodeid = repo.commitctx(cx)
1538 nodeids.append(nodeid)
1538 nodeids.append(nodeid)
1539 at = id
1539 at = id
1540 elif type == 'l':
1540 elif type == 'l':
1541 id, name = data
1541 id, name = data
1542 ui.note('tag %s\n' % name)
1542 ui.note('tag %s\n' % name)
1543 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
1543 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
1544 elif type == 'a':
1544 elif type == 'a':
1545 ui.note('branch %s\n' % data)
1545 ui.note('branch %s\n' % data)
1546 atbranch = data
1546 atbranch = data
1547 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1547 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1548 tr.close()
1548 tr.close()
1549
1549
1550 if tags:
1550 if tags:
1551 repo.opener.write("localtags", "".join(tags))
1551 repo.opener.write("localtags", "".join(tags))
1552 finally:
1552 finally:
1553 ui.progress(_('building'), None)
1553 ui.progress(_('building'), None)
1554 release(tr, lock)
1554 release(tr, lock)
1555
1555
1556 @command('debugbundle', [('a', 'all', None, _('show all details'))], _('FILE'))
1556 @command('debugbundle', [('a', 'all', None, _('show all details'))], _('FILE'))
1557 def debugbundle(ui, bundlepath, all=None, **opts):
1557 def debugbundle(ui, bundlepath, all=None, **opts):
1558 """lists the contents of a bundle"""
1558 """lists the contents of a bundle"""
1559 f = url.open(ui, bundlepath)
1559 f = url.open(ui, bundlepath)
1560 try:
1560 try:
1561 gen = changegroup.readbundle(f, bundlepath)
1561 gen = changegroup.readbundle(f, bundlepath)
1562 if all:
1562 if all:
1563 ui.write("format: id, p1, p2, cset, delta base, len(delta)\n")
1563 ui.write("format: id, p1, p2, cset, delta base, len(delta)\n")
1564
1564
1565 def showchunks(named):
1565 def showchunks(named):
1566 ui.write("\n%s\n" % named)
1566 ui.write("\n%s\n" % named)
1567 chain = None
1567 chain = None
1568 while True:
1568 while True:
1569 chunkdata = gen.deltachunk(chain)
1569 chunkdata = gen.deltachunk(chain)
1570 if not chunkdata:
1570 if not chunkdata:
1571 break
1571 break
1572 node = chunkdata['node']
1572 node = chunkdata['node']
1573 p1 = chunkdata['p1']
1573 p1 = chunkdata['p1']
1574 p2 = chunkdata['p2']
1574 p2 = chunkdata['p2']
1575 cs = chunkdata['cs']
1575 cs = chunkdata['cs']
1576 deltabase = chunkdata['deltabase']
1576 deltabase = chunkdata['deltabase']
1577 delta = chunkdata['delta']
1577 delta = chunkdata['delta']
1578 ui.write("%s %s %s %s %s %s\n" %
1578 ui.write("%s %s %s %s %s %s\n" %
1579 (hex(node), hex(p1), hex(p2),
1579 (hex(node), hex(p1), hex(p2),
1580 hex(cs), hex(deltabase), len(delta)))
1580 hex(cs), hex(deltabase), len(delta)))
1581 chain = node
1581 chain = node
1582
1582
1583 chunkdata = gen.changelogheader()
1583 chunkdata = gen.changelogheader()
1584 showchunks("changelog")
1584 showchunks("changelog")
1585 chunkdata = gen.manifestheader()
1585 chunkdata = gen.manifestheader()
1586 showchunks("manifest")
1586 showchunks("manifest")
1587 while True:
1587 while True:
1588 chunkdata = gen.filelogheader()
1588 chunkdata = gen.filelogheader()
1589 if not chunkdata:
1589 if not chunkdata:
1590 break
1590 break
1591 fname = chunkdata['filename']
1591 fname = chunkdata['filename']
1592 showchunks(fname)
1592 showchunks(fname)
1593 else:
1593 else:
1594 chunkdata = gen.changelogheader()
1594 chunkdata = gen.changelogheader()
1595 chain = None
1595 chain = None
1596 while True:
1596 while True:
1597 chunkdata = gen.deltachunk(chain)
1597 chunkdata = gen.deltachunk(chain)
1598 if not chunkdata:
1598 if not chunkdata:
1599 break
1599 break
1600 node = chunkdata['node']
1600 node = chunkdata['node']
1601 ui.write("%s\n" % hex(node))
1601 ui.write("%s\n" % hex(node))
1602 chain = node
1602 chain = node
1603 finally:
1603 finally:
1604 f.close()
1604 f.close()
1605
1605
1606 @command('debugcheckstate', [], '')
1606 @command('debugcheckstate', [], '')
1607 def debugcheckstate(ui, repo):
1607 def debugcheckstate(ui, repo):
1608 """validate the correctness of the current dirstate"""
1608 """validate the correctness of the current dirstate"""
1609 parent1, parent2 = repo.dirstate.parents()
1609 parent1, parent2 = repo.dirstate.parents()
1610 m1 = repo[parent1].manifest()
1610 m1 = repo[parent1].manifest()
1611 m2 = repo[parent2].manifest()
1611 m2 = repo[parent2].manifest()
1612 errors = 0
1612 errors = 0
1613 for f in repo.dirstate:
1613 for f in repo.dirstate:
1614 state = repo.dirstate[f]
1614 state = repo.dirstate[f]
1615 if state in "nr" and f not in m1:
1615 if state in "nr" and f not in m1:
1616 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1616 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1617 errors += 1
1617 errors += 1
1618 if state in "a" and f in m1:
1618 if state in "a" and f in m1:
1619 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1619 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1620 errors += 1
1620 errors += 1
1621 if state in "m" and f not in m1 and f not in m2:
1621 if state in "m" and f not in m1 and f not in m2:
1622 ui.warn(_("%s in state %s, but not in either manifest\n") %
1622 ui.warn(_("%s in state %s, but not in either manifest\n") %
1623 (f, state))
1623 (f, state))
1624 errors += 1
1624 errors += 1
1625 for f in m1:
1625 for f in m1:
1626 state = repo.dirstate[f]
1626 state = repo.dirstate[f]
1627 if state not in "nrm":
1627 if state not in "nrm":
1628 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1628 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1629 errors += 1
1629 errors += 1
1630 if errors:
1630 if errors:
1631 error = _(".hg/dirstate inconsistent with current parent's manifest")
1631 error = _(".hg/dirstate inconsistent with current parent's manifest")
1632 raise util.Abort(error)
1632 raise util.Abort(error)
1633
1633
1634 @command('debugcommands', [], _('[COMMAND]'))
1634 @command('debugcommands', [], _('[COMMAND]'))
1635 def debugcommands(ui, cmd='', *args):
1635 def debugcommands(ui, cmd='', *args):
1636 """list all available commands and options"""
1636 """list all available commands and options"""
1637 for cmd, vals in sorted(table.iteritems()):
1637 for cmd, vals in sorted(table.iteritems()):
1638 cmd = cmd.split('|')[0].strip('^')
1638 cmd = cmd.split('|')[0].strip('^')
1639 opts = ', '.join([i[1] for i in vals[1]])
1639 opts = ', '.join([i[1] for i in vals[1]])
1640 ui.write('%s: %s\n' % (cmd, opts))
1640 ui.write('%s: %s\n' % (cmd, opts))
1641
1641
1642 @command('debugcomplete',
1642 @command('debugcomplete',
1643 [('o', 'options', None, _('show the command options'))],
1643 [('o', 'options', None, _('show the command options'))],
1644 _('[-o] CMD'))
1644 _('[-o] CMD'))
1645 def debugcomplete(ui, cmd='', **opts):
1645 def debugcomplete(ui, cmd='', **opts):
1646 """returns the completion list associated with the given command"""
1646 """returns the completion list associated with the given command"""
1647
1647
1648 if opts.get('options'):
1648 if opts.get('options'):
1649 options = []
1649 options = []
1650 otables = [globalopts]
1650 otables = [globalopts]
1651 if cmd:
1651 if cmd:
1652 aliases, entry = cmdutil.findcmd(cmd, table, False)
1652 aliases, entry = cmdutil.findcmd(cmd, table, False)
1653 otables.append(entry[1])
1653 otables.append(entry[1])
1654 for t in otables:
1654 for t in otables:
1655 for o in t:
1655 for o in t:
1656 if "(DEPRECATED)" in o[3]:
1656 if "(DEPRECATED)" in o[3]:
1657 continue
1657 continue
1658 if o[0]:
1658 if o[0]:
1659 options.append('-%s' % o[0])
1659 options.append('-%s' % o[0])
1660 options.append('--%s' % o[1])
1660 options.append('--%s' % o[1])
1661 ui.write("%s\n" % "\n".join(options))
1661 ui.write("%s\n" % "\n".join(options))
1662 return
1662 return
1663
1663
1664 cmdlist = cmdutil.findpossible(cmd, table)
1664 cmdlist = cmdutil.findpossible(cmd, table)
1665 if ui.verbose:
1665 if ui.verbose:
1666 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1666 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1667 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1667 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1668
1668
1669 @command('debugdag',
1669 @command('debugdag',
1670 [('t', 'tags', None, _('use tags as labels')),
1670 [('t', 'tags', None, _('use tags as labels')),
1671 ('b', 'branches', None, _('annotate with branch names')),
1671 ('b', 'branches', None, _('annotate with branch names')),
1672 ('', 'dots', None, _('use dots for runs')),
1672 ('', 'dots', None, _('use dots for runs')),
1673 ('s', 'spaces', None, _('separate elements by spaces'))],
1673 ('s', 'spaces', None, _('separate elements by spaces'))],
1674 _('[OPTION]... [FILE [REV]...]'))
1674 _('[OPTION]... [FILE [REV]...]'))
1675 def debugdag(ui, repo, file_=None, *revs, **opts):
1675 def debugdag(ui, repo, file_=None, *revs, **opts):
1676 """format the changelog or an index DAG as a concise textual description
1676 """format the changelog or an index DAG as a concise textual description
1677
1677
1678 If you pass a revlog index, the revlog's DAG is emitted. If you list
1678 If you pass a revlog index, the revlog's DAG is emitted. If you list
1679 revision numbers, they get labelled in the output as rN.
1679 revision numbers, they get labelled in the output as rN.
1680
1680
1681 Otherwise, the changelog DAG of the current repo is emitted.
1681 Otherwise, the changelog DAG of the current repo is emitted.
1682 """
1682 """
1683 spaces = opts.get('spaces')
1683 spaces = opts.get('spaces')
1684 dots = opts.get('dots')
1684 dots = opts.get('dots')
1685 if file_:
1685 if file_:
1686 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1686 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1687 revs = set((int(r) for r in revs))
1687 revs = set((int(r) for r in revs))
1688 def events():
1688 def events():
1689 for r in rlog:
1689 for r in rlog:
1690 yield 'n', (r, list(set(p for p in rlog.parentrevs(r) if p != -1)))
1690 yield 'n', (r, list(set(p for p in rlog.parentrevs(r) if p != -1)))
1691 if r in revs:
1691 if r in revs:
1692 yield 'l', (r, "r%i" % r)
1692 yield 'l', (r, "r%i" % r)
1693 elif repo:
1693 elif repo:
1694 cl = repo.changelog
1694 cl = repo.changelog
1695 tags = opts.get('tags')
1695 tags = opts.get('tags')
1696 branches = opts.get('branches')
1696 branches = opts.get('branches')
1697 if tags:
1697 if tags:
1698 labels = {}
1698 labels = {}
1699 for l, n in repo.tags().items():
1699 for l, n in repo.tags().items():
1700 labels.setdefault(cl.rev(n), []).append(l)
1700 labels.setdefault(cl.rev(n), []).append(l)
1701 def events():
1701 def events():
1702 b = "default"
1702 b = "default"
1703 for r in cl:
1703 for r in cl:
1704 if branches:
1704 if branches:
1705 newb = cl.read(cl.node(r))[5]['branch']
1705 newb = cl.read(cl.node(r))[5]['branch']
1706 if newb != b:
1706 if newb != b:
1707 yield 'a', newb
1707 yield 'a', newb
1708 b = newb
1708 b = newb
1709 yield 'n', (r, list(set(p for p in cl.parentrevs(r) if p != -1)))
1709 yield 'n', (r, list(set(p for p in cl.parentrevs(r) if p != -1)))
1710 if tags:
1710 if tags:
1711 ls = labels.get(r)
1711 ls = labels.get(r)
1712 if ls:
1712 if ls:
1713 for l in ls:
1713 for l in ls:
1714 yield 'l', (r, l)
1714 yield 'l', (r, l)
1715 else:
1715 else:
1716 raise util.Abort(_('need repo for changelog dag'))
1716 raise util.Abort(_('need repo for changelog dag'))
1717
1717
1718 for line in dagparser.dagtextlines(events(),
1718 for line in dagparser.dagtextlines(events(),
1719 addspaces=spaces,
1719 addspaces=spaces,
1720 wraplabels=True,
1720 wraplabels=True,
1721 wrapannotations=True,
1721 wrapannotations=True,
1722 wrapnonlinear=dots,
1722 wrapnonlinear=dots,
1723 usedots=dots,
1723 usedots=dots,
1724 maxlinewidth=70):
1724 maxlinewidth=70):
1725 ui.write(line)
1725 ui.write(line)
1726 ui.write("\n")
1726 ui.write("\n")
1727
1727
1728 @command('debugdata',
1728 @command('debugdata',
1729 [('c', 'changelog', False, _('open changelog')),
1729 [('c', 'changelog', False, _('open changelog')),
1730 ('m', 'manifest', False, _('open manifest'))],
1730 ('m', 'manifest', False, _('open manifest'))],
1731 _('-c|-m|FILE REV'))
1731 _('-c|-m|FILE REV'))
1732 def debugdata(ui, repo, file_, rev = None, **opts):
1732 def debugdata(ui, repo, file_, rev = None, **opts):
1733 """dump the contents of a data file revision"""
1733 """dump the contents of a data file revision"""
1734 if opts.get('changelog') or opts.get('manifest'):
1734 if opts.get('changelog') or opts.get('manifest'):
1735 file_, rev = None, file_
1735 file_, rev = None, file_
1736 elif rev is None:
1736 elif rev is None:
1737 raise error.CommandError('debugdata', _('invalid arguments'))
1737 raise error.CommandError('debugdata', _('invalid arguments'))
1738 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
1738 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
1739 try:
1739 try:
1740 ui.write(r.revision(r.lookup(rev)))
1740 ui.write(r.revision(r.lookup(rev)))
1741 except KeyError:
1741 except KeyError:
1742 raise util.Abort(_('invalid revision identifier %s') % rev)
1742 raise util.Abort(_('invalid revision identifier %s') % rev)
1743
1743
1744 @command('debugdate',
1744 @command('debugdate',
1745 [('e', 'extended', None, _('try extended date formats'))],
1745 [('e', 'extended', None, _('try extended date formats'))],
1746 _('[-e] DATE [RANGE]'))
1746 _('[-e] DATE [RANGE]'))
1747 def debugdate(ui, date, range=None, **opts):
1747 def debugdate(ui, date, range=None, **opts):
1748 """parse and display a date"""
1748 """parse and display a date"""
1749 if opts["extended"]:
1749 if opts["extended"]:
1750 d = util.parsedate(date, util.extendeddateformats)
1750 d = util.parsedate(date, util.extendeddateformats)
1751 else:
1751 else:
1752 d = util.parsedate(date)
1752 d = util.parsedate(date)
1753 ui.write("internal: %s %s\n" % d)
1753 ui.write("internal: %s %s\n" % d)
1754 ui.write("standard: %s\n" % util.datestr(d))
1754 ui.write("standard: %s\n" % util.datestr(d))
1755 if range:
1755 if range:
1756 m = util.matchdate(range)
1756 m = util.matchdate(range)
1757 ui.write("match: %s\n" % m(d[0]))
1757 ui.write("match: %s\n" % m(d[0]))
1758
1758
1759 @command('debugdiscovery',
1759 @command('debugdiscovery',
1760 [('', 'old', None, _('use old-style discovery')),
1760 [('', 'old', None, _('use old-style discovery')),
1761 ('', 'nonheads', None,
1761 ('', 'nonheads', None,
1762 _('use old-style discovery with non-heads included')),
1762 _('use old-style discovery with non-heads included')),
1763 ] + remoteopts,
1763 ] + remoteopts,
1764 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
1764 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
1765 def debugdiscovery(ui, repo, remoteurl="default", **opts):
1765 def debugdiscovery(ui, repo, remoteurl="default", **opts):
1766 """runs the changeset discovery protocol in isolation"""
1766 """runs the changeset discovery protocol in isolation"""
1767 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl), opts.get('branch'))
1767 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl), opts.get('branch'))
1768 remote = hg.peer(repo, opts, remoteurl)
1768 remote = hg.peer(repo, opts, remoteurl)
1769 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
1769 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
1770
1770
1771 # make sure tests are repeatable
1771 # make sure tests are repeatable
1772 random.seed(12323)
1772 random.seed(12323)
1773
1773
1774 def doit(localheads, remoteheads):
1774 def doit(localheads, remoteheads):
1775 if opts.get('old'):
1775 if opts.get('old'):
1776 if localheads:
1776 if localheads:
1777 raise util.Abort('cannot use localheads with old style discovery')
1777 raise util.Abort('cannot use localheads with old style discovery')
1778 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
1778 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
1779 force=True)
1779 force=True)
1780 common = set(common)
1780 common = set(common)
1781 if not opts.get('nonheads'):
1781 if not opts.get('nonheads'):
1782 ui.write("unpruned common: %s\n" % " ".join([short(n)
1782 ui.write("unpruned common: %s\n" % " ".join([short(n)
1783 for n in common]))
1783 for n in common]))
1784 dag = dagutil.revlogdag(repo.changelog)
1784 dag = dagutil.revlogdag(repo.changelog)
1785 all = dag.ancestorset(dag.internalizeall(common))
1785 all = dag.ancestorset(dag.internalizeall(common))
1786 common = dag.externalizeall(dag.headsetofconnecteds(all))
1786 common = dag.externalizeall(dag.headsetofconnecteds(all))
1787 else:
1787 else:
1788 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
1788 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
1789 common = set(common)
1789 common = set(common)
1790 rheads = set(hds)
1790 rheads = set(hds)
1791 lheads = set(repo.heads())
1791 lheads = set(repo.heads())
1792 ui.write("common heads: %s\n" % " ".join([short(n) for n in common]))
1792 ui.write("common heads: %s\n" % " ".join([short(n) for n in common]))
1793 if lheads <= common:
1793 if lheads <= common:
1794 ui.write("local is subset\n")
1794 ui.write("local is subset\n")
1795 elif rheads <= common:
1795 elif rheads <= common:
1796 ui.write("remote is subset\n")
1796 ui.write("remote is subset\n")
1797
1797
1798 serverlogs = opts.get('serverlog')
1798 serverlogs = opts.get('serverlog')
1799 if serverlogs:
1799 if serverlogs:
1800 for filename in serverlogs:
1800 for filename in serverlogs:
1801 logfile = open(filename, 'r')
1801 logfile = open(filename, 'r')
1802 try:
1802 try:
1803 line = logfile.readline()
1803 line = logfile.readline()
1804 while line:
1804 while line:
1805 parts = line.strip().split(';')
1805 parts = line.strip().split(';')
1806 op = parts[1]
1806 op = parts[1]
1807 if op == 'cg':
1807 if op == 'cg':
1808 pass
1808 pass
1809 elif op == 'cgss':
1809 elif op == 'cgss':
1810 doit(parts[2].split(' '), parts[3].split(' '))
1810 doit(parts[2].split(' '), parts[3].split(' '))
1811 elif op == 'unb':
1811 elif op == 'unb':
1812 doit(parts[3].split(' '), parts[2].split(' '))
1812 doit(parts[3].split(' '), parts[2].split(' '))
1813 line = logfile.readline()
1813 line = logfile.readline()
1814 finally:
1814 finally:
1815 logfile.close()
1815 logfile.close()
1816
1816
1817 else:
1817 else:
1818 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
1818 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
1819 opts.get('remote_head'))
1819 opts.get('remote_head'))
1820 localrevs = opts.get('local_head')
1820 localrevs = opts.get('local_head')
1821 doit(localrevs, remoterevs)
1821 doit(localrevs, remoterevs)
1822
1822
1823 @command('debugfileset', [], ('REVSPEC'))
1823 @command('debugfileset', [], ('REVSPEC'))
1824 def debugfileset(ui, repo, expr):
1824 def debugfileset(ui, repo, expr):
1825 '''parse and apply a fileset specification'''
1825 '''parse and apply a fileset specification'''
1826 if ui.verbose:
1826 if ui.verbose:
1827 tree = fileset.parse(expr)[0]
1827 tree = fileset.parse(expr)[0]
1828 ui.note(tree, "\n")
1828 ui.note(tree, "\n")
1829
1829
1830 for f in fileset.getfileset(repo[None], expr):
1830 for f in fileset.getfileset(repo[None], expr):
1831 ui.write("%s\n" % f)
1831 ui.write("%s\n" % f)
1832
1832
1833 @command('debugfsinfo', [], _('[PATH]'))
1833 @command('debugfsinfo', [], _('[PATH]'))
1834 def debugfsinfo(ui, path = "."):
1834 def debugfsinfo(ui, path = "."):
1835 """show information detected about current filesystem"""
1835 """show information detected about current filesystem"""
1836 util.writefile('.debugfsinfo', '')
1836 util.writefile('.debugfsinfo', '')
1837 ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
1837 ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
1838 ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
1838 ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
1839 ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
1839 ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
1840 and 'yes' or 'no'))
1840 and 'yes' or 'no'))
1841 os.unlink('.debugfsinfo')
1841 os.unlink('.debugfsinfo')
1842
1842
1843 @command('debuggetbundle',
1843 @command('debuggetbundle',
1844 [('H', 'head', [], _('id of head node'), _('ID')),
1844 [('H', 'head', [], _('id of head node'), _('ID')),
1845 ('C', 'common', [], _('id of common node'), _('ID')),
1845 ('C', 'common', [], _('id of common node'), _('ID')),
1846 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
1846 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
1847 _('REPO FILE [-H|-C ID]...'))
1847 _('REPO FILE [-H|-C ID]...'))
1848 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
1848 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
1849 """retrieves a bundle from a repo
1849 """retrieves a bundle from a repo
1850
1850
1851 Every ID must be a full-length hex node id string. Saves the bundle to the
1851 Every ID must be a full-length hex node id string. Saves the bundle to the
1852 given file.
1852 given file.
1853 """
1853 """
1854 repo = hg.peer(ui, opts, repopath)
1854 repo = hg.peer(ui, opts, repopath)
1855 if not repo.capable('getbundle'):
1855 if not repo.capable('getbundle'):
1856 raise util.Abort("getbundle() not supported by target repository")
1856 raise util.Abort("getbundle() not supported by target repository")
1857 args = {}
1857 args = {}
1858 if common:
1858 if common:
1859 args['common'] = [bin(s) for s in common]
1859 args['common'] = [bin(s) for s in common]
1860 if head:
1860 if head:
1861 args['heads'] = [bin(s) for s in head]
1861 args['heads'] = [bin(s) for s in head]
1862 bundle = repo.getbundle('debug', **args)
1862 bundle = repo.getbundle('debug', **args)
1863
1863
1864 bundletype = opts.get('type', 'bzip2').lower()
1864 bundletype = opts.get('type', 'bzip2').lower()
1865 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1865 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1866 bundletype = btypes.get(bundletype)
1866 bundletype = btypes.get(bundletype)
1867 if bundletype not in changegroup.bundletypes:
1867 if bundletype not in changegroup.bundletypes:
1868 raise util.Abort(_('unknown bundle type specified with --type'))
1868 raise util.Abort(_('unknown bundle type specified with --type'))
1869 changegroup.writebundle(bundle, bundlepath, bundletype)
1869 changegroup.writebundle(bundle, bundlepath, bundletype)
1870
1870
1871 @command('debugignore', [], '')
1871 @command('debugignore', [], '')
1872 def debugignore(ui, repo, *values, **opts):
1872 def debugignore(ui, repo, *values, **opts):
1873 """display the combined ignore pattern"""
1873 """display the combined ignore pattern"""
1874 ignore = repo.dirstate._ignore
1874 ignore = repo.dirstate._ignore
1875 includepat = getattr(ignore, 'includepat', None)
1875 includepat = getattr(ignore, 'includepat', None)
1876 if includepat is not None:
1876 if includepat is not None:
1877 ui.write("%s\n" % includepat)
1877 ui.write("%s\n" % includepat)
1878 else:
1878 else:
1879 raise util.Abort(_("no ignore patterns found"))
1879 raise util.Abort(_("no ignore patterns found"))
1880
1880
1881 @command('debugindex',
1881 @command('debugindex',
1882 [('c', 'changelog', False, _('open changelog')),
1882 [('c', 'changelog', False, _('open changelog')),
1883 ('m', 'manifest', False, _('open manifest')),
1883 ('m', 'manifest', False, _('open manifest')),
1884 ('f', 'format', 0, _('revlog format'), _('FORMAT'))],
1884 ('f', 'format', 0, _('revlog format'), _('FORMAT'))],
1885 _('[-f FORMAT] -c|-m|FILE'))
1885 _('[-f FORMAT] -c|-m|FILE'))
1886 def debugindex(ui, repo, file_ = None, **opts):
1886 def debugindex(ui, repo, file_ = None, **opts):
1887 """dump the contents of an index file"""
1887 """dump the contents of an index file"""
1888 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
1888 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
1889 format = opts.get('format', 0)
1889 format = opts.get('format', 0)
1890 if format not in (0, 1):
1890 if format not in (0, 1):
1891 raise util.Abort(_("unknown format %d") % format)
1891 raise util.Abort(_("unknown format %d") % format)
1892
1892
1893 generaldelta = r.version & revlog.REVLOGGENERALDELTA
1893 generaldelta = r.version & revlog.REVLOGGENERALDELTA
1894 if generaldelta:
1894 if generaldelta:
1895 basehdr = ' delta'
1895 basehdr = ' delta'
1896 else:
1896 else:
1897 basehdr = ' base'
1897 basehdr = ' base'
1898
1898
1899 if format == 0:
1899 if format == 0:
1900 ui.write(" rev offset length " + basehdr + " linkrev"
1900 ui.write(" rev offset length " + basehdr + " linkrev"
1901 " nodeid p1 p2\n")
1901 " nodeid p1 p2\n")
1902 elif format == 1:
1902 elif format == 1:
1903 ui.write(" rev flag offset length"
1903 ui.write(" rev flag offset length"
1904 " size " + basehdr + " link p1 p2 nodeid\n")
1904 " size " + basehdr + " link p1 p2 nodeid\n")
1905
1905
1906 for i in r:
1906 for i in r:
1907 node = r.node(i)
1907 node = r.node(i)
1908 if generaldelta:
1908 if generaldelta:
1909 base = r.deltaparent(i)
1909 base = r.deltaparent(i)
1910 else:
1910 else:
1911 base = r.chainbase(i)
1911 base = r.chainbase(i)
1912 if format == 0:
1912 if format == 0:
1913 try:
1913 try:
1914 pp = r.parents(node)
1914 pp = r.parents(node)
1915 except:
1915 except:
1916 pp = [nullid, nullid]
1916 pp = [nullid, nullid]
1917 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
1917 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
1918 i, r.start(i), r.length(i), base, r.linkrev(i),
1918 i, r.start(i), r.length(i), base, r.linkrev(i),
1919 short(node), short(pp[0]), short(pp[1])))
1919 short(node), short(pp[0]), short(pp[1])))
1920 elif format == 1:
1920 elif format == 1:
1921 pr = r.parentrevs(i)
1921 pr = r.parentrevs(i)
1922 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
1922 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
1923 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
1923 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
1924 base, r.linkrev(i), pr[0], pr[1], short(node)))
1924 base, r.linkrev(i), pr[0], pr[1], short(node)))
1925
1925
1926 @command('debugindexdot', [], _('FILE'))
1926 @command('debugindexdot', [], _('FILE'))
1927 def debugindexdot(ui, repo, file_):
1927 def debugindexdot(ui, repo, file_):
1928 """dump an index DAG as a graphviz dot file"""
1928 """dump an index DAG as a graphviz dot file"""
1929 r = None
1929 r = None
1930 if repo:
1930 if repo:
1931 filelog = repo.file(file_)
1931 filelog = repo.file(file_)
1932 if len(filelog):
1932 if len(filelog):
1933 r = filelog
1933 r = filelog
1934 if not r:
1934 if not r:
1935 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1935 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1936 ui.write("digraph G {\n")
1936 ui.write("digraph G {\n")
1937 for i in r:
1937 for i in r:
1938 node = r.node(i)
1938 node = r.node(i)
1939 pp = r.parents(node)
1939 pp = r.parents(node)
1940 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
1940 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
1941 if pp[1] != nullid:
1941 if pp[1] != nullid:
1942 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
1942 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
1943 ui.write("}\n")
1943 ui.write("}\n")
1944
1944
1945 @command('debuginstall', [], '')
1945 @command('debuginstall', [], '')
1946 def debuginstall(ui):
1946 def debuginstall(ui):
1947 '''test Mercurial installation
1947 '''test Mercurial installation
1948
1948
1949 Returns 0 on success.
1949 Returns 0 on success.
1950 '''
1950 '''
1951
1951
1952 def writetemp(contents):
1952 def writetemp(contents):
1953 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
1953 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
1954 f = os.fdopen(fd, "wb")
1954 f = os.fdopen(fd, "wb")
1955 f.write(contents)
1955 f.write(contents)
1956 f.close()
1956 f.close()
1957 return name
1957 return name
1958
1958
1959 problems = 0
1959 problems = 0
1960
1960
1961 # encoding
1961 # encoding
1962 ui.status(_("Checking encoding (%s)...\n") % encoding.encoding)
1962 ui.status(_("Checking encoding (%s)...\n") % encoding.encoding)
1963 try:
1963 try:
1964 encoding.fromlocal("test")
1964 encoding.fromlocal("test")
1965 except util.Abort, inst:
1965 except util.Abort, inst:
1966 ui.write(" %s\n" % inst)
1966 ui.write(" %s\n" % inst)
1967 ui.write(_(" (check that your locale is properly set)\n"))
1967 ui.write(_(" (check that your locale is properly set)\n"))
1968 problems += 1
1968 problems += 1
1969
1969
1970 # compiled modules
1970 # compiled modules
1971 ui.status(_("Checking installed modules (%s)...\n")
1971 ui.status(_("Checking installed modules (%s)...\n")
1972 % os.path.dirname(__file__))
1972 % os.path.dirname(__file__))
1973 try:
1973 try:
1974 import bdiff, mpatch, base85, osutil
1974 import bdiff, mpatch, base85, osutil
1975 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
1975 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
1976 except Exception, inst:
1976 except Exception, inst:
1977 ui.write(" %s\n" % inst)
1977 ui.write(" %s\n" % inst)
1978 ui.write(_(" One or more extensions could not be found"))
1978 ui.write(_(" One or more extensions could not be found"))
1979 ui.write(_(" (check that you compiled the extensions)\n"))
1979 ui.write(_(" (check that you compiled the extensions)\n"))
1980 problems += 1
1980 problems += 1
1981
1981
1982 # templates
1982 # templates
1983 import templater
1983 import templater
1984 p = templater.templatepath()
1984 p = templater.templatepath()
1985 ui.status(_("Checking templates (%s)...\n") % ' '.join(p))
1985 ui.status(_("Checking templates (%s)...\n") % ' '.join(p))
1986 try:
1986 try:
1987 templater.templater(templater.templatepath("map-cmdline.default"))
1987 templater.templater(templater.templatepath("map-cmdline.default"))
1988 except Exception, inst:
1988 except Exception, inst:
1989 ui.write(" %s\n" % inst)
1989 ui.write(" %s\n" % inst)
1990 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
1990 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
1991 problems += 1
1991 problems += 1
1992
1992
1993 # editor
1993 # editor
1994 ui.status(_("Checking commit editor...\n"))
1994 ui.status(_("Checking commit editor...\n"))
1995 editor = ui.geteditor()
1995 editor = ui.geteditor()
1996 cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
1996 cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
1997 if not cmdpath:
1997 if not cmdpath:
1998 if editor == 'vi':
1998 if editor == 'vi':
1999 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
1999 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
2000 ui.write(_(" (specify a commit editor in your configuration"
2000 ui.write(_(" (specify a commit editor in your configuration"
2001 " file)\n"))
2001 " file)\n"))
2002 else:
2002 else:
2003 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
2003 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
2004 ui.write(_(" (specify a commit editor in your configuration"
2004 ui.write(_(" (specify a commit editor in your configuration"
2005 " file)\n"))
2005 " file)\n"))
2006 problems += 1
2006 problems += 1
2007
2007
2008 # check username
2008 # check username
2009 ui.status(_("Checking username...\n"))
2009 ui.status(_("Checking username...\n"))
2010 try:
2010 try:
2011 ui.username()
2011 ui.username()
2012 except util.Abort, e:
2012 except util.Abort, e:
2013 ui.write(" %s\n" % e)
2013 ui.write(" %s\n" % e)
2014 ui.write(_(" (specify a username in your configuration file)\n"))
2014 ui.write(_(" (specify a username in your configuration file)\n"))
2015 problems += 1
2015 problems += 1
2016
2016
2017 if not problems:
2017 if not problems:
2018 ui.status(_("No problems detected\n"))
2018 ui.status(_("No problems detected\n"))
2019 else:
2019 else:
2020 ui.write(_("%s problems detected,"
2020 ui.write(_("%s problems detected,"
2021 " please check your install!\n") % problems)
2021 " please check your install!\n") % problems)
2022
2022
2023 return problems
2023 return problems
2024
2024
2025 @command('debugknown', [], _('REPO ID...'))
2025 @command('debugknown', [], _('REPO ID...'))
2026 def debugknown(ui, repopath, *ids, **opts):
2026 def debugknown(ui, repopath, *ids, **opts):
2027 """test whether node ids are known to a repo
2027 """test whether node ids are known to a repo
2028
2028
2029 Every ID must be a full-length hex node id string. Returns a list of 0s and 1s
2029 Every ID must be a full-length hex node id string. Returns a list of 0s and 1s
2030 indicating unknown/known.
2030 indicating unknown/known.
2031 """
2031 """
2032 repo = hg.peer(ui, opts, repopath)
2032 repo = hg.peer(ui, opts, repopath)
2033 if not repo.capable('known'):
2033 if not repo.capable('known'):
2034 raise util.Abort("known() not supported by target repository")
2034 raise util.Abort("known() not supported by target repository")
2035 flags = repo.known([bin(s) for s in ids])
2035 flags = repo.known([bin(s) for s in ids])
2036 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2036 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2037
2037
2038 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'))
2038 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'))
2039 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
2039 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
2040 '''access the pushkey key/value protocol
2040 '''access the pushkey key/value protocol
2041
2041
2042 With two args, list the keys in the given namespace.
2042 With two args, list the keys in the given namespace.
2043
2043
2044 With five args, set a key to new if it currently is set to old.
2044 With five args, set a key to new if it currently is set to old.
2045 Reports success or failure.
2045 Reports success or failure.
2046 '''
2046 '''
2047
2047
2048 target = hg.peer(ui, {}, repopath)
2048 target = hg.peer(ui, {}, repopath)
2049 if keyinfo:
2049 if keyinfo:
2050 key, old, new = keyinfo
2050 key, old, new = keyinfo
2051 r = target.pushkey(namespace, key, old, new)
2051 r = target.pushkey(namespace, key, old, new)
2052 ui.status(str(r) + '\n')
2052 ui.status(str(r) + '\n')
2053 return not r
2053 return not r
2054 else:
2054 else:
2055 for k, v in target.listkeys(namespace).iteritems():
2055 for k, v in target.listkeys(namespace).iteritems():
2056 ui.write("%s\t%s\n" % (k.encode('string-escape'),
2056 ui.write("%s\t%s\n" % (k.encode('string-escape'),
2057 v.encode('string-escape')))
2057 v.encode('string-escape')))
2058
2058
2059 @command('debugpvec', [], _('A B'))
2059 @command('debugpvec', [], _('A B'))
2060 def debugpvec(ui, repo, a, b=None):
2060 def debugpvec(ui, repo, a, b=None):
2061 ca = scmutil.revsingle(repo, a)
2061 ca = scmutil.revsingle(repo, a)
2062 cb = scmutil.revsingle(repo, b)
2062 cb = scmutil.revsingle(repo, b)
2063 pa = pvec.ctxpvec(ca)
2063 pa = pvec.ctxpvec(ca)
2064 pb = pvec.ctxpvec(cb)
2064 pb = pvec.ctxpvec(cb)
2065 if pa == pb:
2065 if pa == pb:
2066 rel = "="
2066 rel = "="
2067 elif pa > pb:
2067 elif pa > pb:
2068 rel = ">"
2068 rel = ">"
2069 elif pa < pb:
2069 elif pa < pb:
2070 rel = "<"
2070 rel = "<"
2071 elif pa | pb:
2071 elif pa | pb:
2072 rel = "|"
2072 rel = "|"
2073 ui.write(_("a: %s\n") % pa)
2073 ui.write(_("a: %s\n") % pa)
2074 ui.write(_("b: %s\n") % pb)
2074 ui.write(_("b: %s\n") % pb)
2075 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
2075 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
2076 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
2076 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
2077 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
2077 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
2078 pa.distance(pb), rel))
2078 pa.distance(pb), rel))
2079
2079
2080 @command('debugrebuildstate',
2080 @command('debugrebuildstate',
2081 [('r', 'rev', '', _('revision to rebuild to'), _('REV'))],
2081 [('r', 'rev', '', _('revision to rebuild to'), _('REV'))],
2082 _('[-r REV] [REV]'))
2082 _('[-r REV] [REV]'))
2083 def debugrebuildstate(ui, repo, rev="tip"):
2083 def debugrebuildstate(ui, repo, rev="tip"):
2084 """rebuild the dirstate as it would look like for the given revision"""
2084 """rebuild the dirstate as it would look like for the given revision"""
2085 ctx = scmutil.revsingle(repo, rev)
2085 ctx = scmutil.revsingle(repo, rev)
2086 wlock = repo.wlock()
2086 wlock = repo.wlock()
2087 try:
2087 try:
2088 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
2088 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
2089 finally:
2089 finally:
2090 wlock.release()
2090 wlock.release()
2091
2091
2092 @command('debugrename',
2092 @command('debugrename',
2093 [('r', 'rev', '', _('revision to debug'), _('REV'))],
2093 [('r', 'rev', '', _('revision to debug'), _('REV'))],
2094 _('[-r REV] FILE'))
2094 _('[-r REV] FILE'))
2095 def debugrename(ui, repo, file1, *pats, **opts):
2095 def debugrename(ui, repo, file1, *pats, **opts):
2096 """dump rename information"""
2096 """dump rename information"""
2097
2097
2098 ctx = scmutil.revsingle(repo, opts.get('rev'))
2098 ctx = scmutil.revsingle(repo, opts.get('rev'))
2099 m = scmutil.match(ctx, (file1,) + pats, opts)
2099 m = scmutil.match(ctx, (file1,) + pats, opts)
2100 for abs in ctx.walk(m):
2100 for abs in ctx.walk(m):
2101 fctx = ctx[abs]
2101 fctx = ctx[abs]
2102 o = fctx.filelog().renamed(fctx.filenode())
2102 o = fctx.filelog().renamed(fctx.filenode())
2103 rel = m.rel(abs)
2103 rel = m.rel(abs)
2104 if o:
2104 if o:
2105 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
2105 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
2106 else:
2106 else:
2107 ui.write(_("%s not renamed\n") % rel)
2107 ui.write(_("%s not renamed\n") % rel)
2108
2108
2109 @command('debugrevlog',
2109 @command('debugrevlog',
2110 [('c', 'changelog', False, _('open changelog')),
2110 [('c', 'changelog', False, _('open changelog')),
2111 ('m', 'manifest', False, _('open manifest')),
2111 ('m', 'manifest', False, _('open manifest')),
2112 ('d', 'dump', False, _('dump index data'))],
2112 ('d', 'dump', False, _('dump index data'))],
2113 _('-c|-m|FILE'))
2113 _('-c|-m|FILE'))
2114 def debugrevlog(ui, repo, file_ = None, **opts):
2114 def debugrevlog(ui, repo, file_ = None, **opts):
2115 """show data and statistics about a revlog"""
2115 """show data and statistics about a revlog"""
2116 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
2116 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
2117
2117
2118 if opts.get("dump"):
2118 if opts.get("dump"):
2119 numrevs = len(r)
2119 numrevs = len(r)
2120 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
2120 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
2121 " rawsize totalsize compression heads\n")
2121 " rawsize totalsize compression heads\n")
2122 ts = 0
2122 ts = 0
2123 heads = set()
2123 heads = set()
2124 for rev in xrange(numrevs):
2124 for rev in xrange(numrevs):
2125 dbase = r.deltaparent(rev)
2125 dbase = r.deltaparent(rev)
2126 if dbase == -1:
2126 if dbase == -1:
2127 dbase = rev
2127 dbase = rev
2128 cbase = r.chainbase(rev)
2128 cbase = r.chainbase(rev)
2129 p1, p2 = r.parentrevs(rev)
2129 p1, p2 = r.parentrevs(rev)
2130 rs = r.rawsize(rev)
2130 rs = r.rawsize(rev)
2131 ts = ts + rs
2131 ts = ts + rs
2132 heads -= set(r.parentrevs(rev))
2132 heads -= set(r.parentrevs(rev))
2133 heads.add(rev)
2133 heads.add(rev)
2134 ui.write("%d %d %d %d %d %d %d %d %d %d %d %d %d\n" %
2134 ui.write("%d %d %d %d %d %d %d %d %d %d %d %d %d\n" %
2135 (rev, p1, p2, r.start(rev), r.end(rev),
2135 (rev, p1, p2, r.start(rev), r.end(rev),
2136 r.start(dbase), r.start(cbase),
2136 r.start(dbase), r.start(cbase),
2137 r.start(p1), r.start(p2),
2137 r.start(p1), r.start(p2),
2138 rs, ts, ts / r.end(rev), len(heads)))
2138 rs, ts, ts / r.end(rev), len(heads)))
2139 return 0
2139 return 0
2140
2140
2141 v = r.version
2141 v = r.version
2142 format = v & 0xFFFF
2142 format = v & 0xFFFF
2143 flags = []
2143 flags = []
2144 gdelta = False
2144 gdelta = False
2145 if v & revlog.REVLOGNGINLINEDATA:
2145 if v & revlog.REVLOGNGINLINEDATA:
2146 flags.append('inline')
2146 flags.append('inline')
2147 if v & revlog.REVLOGGENERALDELTA:
2147 if v & revlog.REVLOGGENERALDELTA:
2148 gdelta = True
2148 gdelta = True
2149 flags.append('generaldelta')
2149 flags.append('generaldelta')
2150 if not flags:
2150 if not flags:
2151 flags = ['(none)']
2151 flags = ['(none)']
2152
2152
2153 nummerges = 0
2153 nummerges = 0
2154 numfull = 0
2154 numfull = 0
2155 numprev = 0
2155 numprev = 0
2156 nump1 = 0
2156 nump1 = 0
2157 nump2 = 0
2157 nump2 = 0
2158 numother = 0
2158 numother = 0
2159 nump1prev = 0
2159 nump1prev = 0
2160 nump2prev = 0
2160 nump2prev = 0
2161 chainlengths = []
2161 chainlengths = []
2162
2162
2163 datasize = [None, 0, 0L]
2163 datasize = [None, 0, 0L]
2164 fullsize = [None, 0, 0L]
2164 fullsize = [None, 0, 0L]
2165 deltasize = [None, 0, 0L]
2165 deltasize = [None, 0, 0L]
2166
2166
2167 def addsize(size, l):
2167 def addsize(size, l):
2168 if l[0] is None or size < l[0]:
2168 if l[0] is None or size < l[0]:
2169 l[0] = size
2169 l[0] = size
2170 if size > l[1]:
2170 if size > l[1]:
2171 l[1] = size
2171 l[1] = size
2172 l[2] += size
2172 l[2] += size
2173
2173
2174 numrevs = len(r)
2174 numrevs = len(r)
2175 for rev in xrange(numrevs):
2175 for rev in xrange(numrevs):
2176 p1, p2 = r.parentrevs(rev)
2176 p1, p2 = r.parentrevs(rev)
2177 delta = r.deltaparent(rev)
2177 delta = r.deltaparent(rev)
2178 if format > 0:
2178 if format > 0:
2179 addsize(r.rawsize(rev), datasize)
2179 addsize(r.rawsize(rev), datasize)
2180 if p2 != nullrev:
2180 if p2 != nullrev:
2181 nummerges += 1
2181 nummerges += 1
2182 size = r.length(rev)
2182 size = r.length(rev)
2183 if delta == nullrev:
2183 if delta == nullrev:
2184 chainlengths.append(0)
2184 chainlengths.append(0)
2185 numfull += 1
2185 numfull += 1
2186 addsize(size, fullsize)
2186 addsize(size, fullsize)
2187 else:
2187 else:
2188 chainlengths.append(chainlengths[delta] + 1)
2188 chainlengths.append(chainlengths[delta] + 1)
2189 addsize(size, deltasize)
2189 addsize(size, deltasize)
2190 if delta == rev - 1:
2190 if delta == rev - 1:
2191 numprev += 1
2191 numprev += 1
2192 if delta == p1:
2192 if delta == p1:
2193 nump1prev += 1
2193 nump1prev += 1
2194 elif delta == p2:
2194 elif delta == p2:
2195 nump2prev += 1
2195 nump2prev += 1
2196 elif delta == p1:
2196 elif delta == p1:
2197 nump1 += 1
2197 nump1 += 1
2198 elif delta == p2:
2198 elif delta == p2:
2199 nump2 += 1
2199 nump2 += 1
2200 elif delta != nullrev:
2200 elif delta != nullrev:
2201 numother += 1
2201 numother += 1
2202
2202
2203 numdeltas = numrevs - numfull
2203 numdeltas = numrevs - numfull
2204 numoprev = numprev - nump1prev - nump2prev
2204 numoprev = numprev - nump1prev - nump2prev
2205 totalrawsize = datasize[2]
2205 totalrawsize = datasize[2]
2206 datasize[2] /= numrevs
2206 datasize[2] /= numrevs
2207 fulltotal = fullsize[2]
2207 fulltotal = fullsize[2]
2208 fullsize[2] /= numfull
2208 fullsize[2] /= numfull
2209 deltatotal = deltasize[2]
2209 deltatotal = deltasize[2]
2210 deltasize[2] /= numrevs - numfull
2210 deltasize[2] /= numrevs - numfull
2211 totalsize = fulltotal + deltatotal
2211 totalsize = fulltotal + deltatotal
2212 avgchainlen = sum(chainlengths) / numrevs
2212 avgchainlen = sum(chainlengths) / numrevs
2213 compratio = totalrawsize / totalsize
2213 compratio = totalrawsize / totalsize
2214
2214
2215 basedfmtstr = '%%%dd\n'
2215 basedfmtstr = '%%%dd\n'
2216 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2216 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2217
2217
2218 def dfmtstr(max):
2218 def dfmtstr(max):
2219 return basedfmtstr % len(str(max))
2219 return basedfmtstr % len(str(max))
2220 def pcfmtstr(max, padding=0):
2220 def pcfmtstr(max, padding=0):
2221 return basepcfmtstr % (len(str(max)), ' ' * padding)
2221 return basepcfmtstr % (len(str(max)), ' ' * padding)
2222
2222
2223 def pcfmt(value, total):
2223 def pcfmt(value, total):
2224 return (value, 100 * float(value) / total)
2224 return (value, 100 * float(value) / total)
2225
2225
2226 ui.write('format : %d\n' % format)
2226 ui.write('format : %d\n' % format)
2227 ui.write('flags : %s\n' % ', '.join(flags))
2227 ui.write('flags : %s\n' % ', '.join(flags))
2228
2228
2229 ui.write('\n')
2229 ui.write('\n')
2230 fmt = pcfmtstr(totalsize)
2230 fmt = pcfmtstr(totalsize)
2231 fmt2 = dfmtstr(totalsize)
2231 fmt2 = dfmtstr(totalsize)
2232 ui.write('revisions : ' + fmt2 % numrevs)
2232 ui.write('revisions : ' + fmt2 % numrevs)
2233 ui.write(' merges : ' + fmt % pcfmt(nummerges, numrevs))
2233 ui.write(' merges : ' + fmt % pcfmt(nummerges, numrevs))
2234 ui.write(' normal : ' + fmt % pcfmt(numrevs - nummerges, numrevs))
2234 ui.write(' normal : ' + fmt % pcfmt(numrevs - nummerges, numrevs))
2235 ui.write('revisions : ' + fmt2 % numrevs)
2235 ui.write('revisions : ' + fmt2 % numrevs)
2236 ui.write(' full : ' + fmt % pcfmt(numfull, numrevs))
2236 ui.write(' full : ' + fmt % pcfmt(numfull, numrevs))
2237 ui.write(' deltas : ' + fmt % pcfmt(numdeltas, numrevs))
2237 ui.write(' deltas : ' + fmt % pcfmt(numdeltas, numrevs))
2238 ui.write('revision size : ' + fmt2 % totalsize)
2238 ui.write('revision size : ' + fmt2 % totalsize)
2239 ui.write(' full : ' + fmt % pcfmt(fulltotal, totalsize))
2239 ui.write(' full : ' + fmt % pcfmt(fulltotal, totalsize))
2240 ui.write(' deltas : ' + fmt % pcfmt(deltatotal, totalsize))
2240 ui.write(' deltas : ' + fmt % pcfmt(deltatotal, totalsize))
2241
2241
2242 ui.write('\n')
2242 ui.write('\n')
2243 fmt = dfmtstr(max(avgchainlen, compratio))
2243 fmt = dfmtstr(max(avgchainlen, compratio))
2244 ui.write('avg chain length : ' + fmt % avgchainlen)
2244 ui.write('avg chain length : ' + fmt % avgchainlen)
2245 ui.write('compression ratio : ' + fmt % compratio)
2245 ui.write('compression ratio : ' + fmt % compratio)
2246
2246
2247 if format > 0:
2247 if format > 0:
2248 ui.write('\n')
2248 ui.write('\n')
2249 ui.write('uncompressed data size (min/max/avg) : %d / %d / %d\n'
2249 ui.write('uncompressed data size (min/max/avg) : %d / %d / %d\n'
2250 % tuple(datasize))
2250 % tuple(datasize))
2251 ui.write('full revision size (min/max/avg) : %d / %d / %d\n'
2251 ui.write('full revision size (min/max/avg) : %d / %d / %d\n'
2252 % tuple(fullsize))
2252 % tuple(fullsize))
2253 ui.write('delta size (min/max/avg) : %d / %d / %d\n'
2253 ui.write('delta size (min/max/avg) : %d / %d / %d\n'
2254 % tuple(deltasize))
2254 % tuple(deltasize))
2255
2255
2256 if numdeltas > 0:
2256 if numdeltas > 0:
2257 ui.write('\n')
2257 ui.write('\n')
2258 fmt = pcfmtstr(numdeltas)
2258 fmt = pcfmtstr(numdeltas)
2259 fmt2 = pcfmtstr(numdeltas, 4)
2259 fmt2 = pcfmtstr(numdeltas, 4)
2260 ui.write('deltas against prev : ' + fmt % pcfmt(numprev, numdeltas))
2260 ui.write('deltas against prev : ' + fmt % pcfmt(numprev, numdeltas))
2261 if numprev > 0:
2261 if numprev > 0:
2262 ui.write(' where prev = p1 : ' + fmt2 % pcfmt(nump1prev, numprev))
2262 ui.write(' where prev = p1 : ' + fmt2 % pcfmt(nump1prev, numprev))
2263 ui.write(' where prev = p2 : ' + fmt2 % pcfmt(nump2prev, numprev))
2263 ui.write(' where prev = p2 : ' + fmt2 % pcfmt(nump2prev, numprev))
2264 ui.write(' other : ' + fmt2 % pcfmt(numoprev, numprev))
2264 ui.write(' other : ' + fmt2 % pcfmt(numoprev, numprev))
2265 if gdelta:
2265 if gdelta:
2266 ui.write('deltas against p1 : ' + fmt % pcfmt(nump1, numdeltas))
2266 ui.write('deltas against p1 : ' + fmt % pcfmt(nump1, numdeltas))
2267 ui.write('deltas against p2 : ' + fmt % pcfmt(nump2, numdeltas))
2267 ui.write('deltas against p2 : ' + fmt % pcfmt(nump2, numdeltas))
2268 ui.write('deltas against other : ' + fmt % pcfmt(numother, numdeltas))
2268 ui.write('deltas against other : ' + fmt % pcfmt(numother, numdeltas))
2269
2269
2270 @command('debugrevspec', [], ('REVSPEC'))
2270 @command('debugrevspec', [], ('REVSPEC'))
2271 def debugrevspec(ui, repo, expr):
2271 def debugrevspec(ui, repo, expr):
2272 """parse and apply a revision specification
2272 """parse and apply a revision specification
2273
2273
2274 Use --verbose to print the parsed tree before and after aliases
2274 Use --verbose to print the parsed tree before and after aliases
2275 expansion.
2275 expansion.
2276 """
2276 """
2277 if ui.verbose:
2277 if ui.verbose:
2278 tree = revset.parse(expr)[0]
2278 tree = revset.parse(expr)[0]
2279 ui.note(revset.prettyformat(tree), "\n")
2279 ui.note(revset.prettyformat(tree), "\n")
2280 newtree = revset.findaliases(ui, tree)
2280 newtree = revset.findaliases(ui, tree)
2281 if newtree != tree:
2281 if newtree != tree:
2282 ui.note(revset.prettyformat(newtree), "\n")
2282 ui.note(revset.prettyformat(newtree), "\n")
2283 func = revset.match(ui, expr)
2283 func = revset.match(ui, expr)
2284 for c in func(repo, range(len(repo))):
2284 for c in func(repo, range(len(repo))):
2285 ui.write("%s\n" % c)
2285 ui.write("%s\n" % c)
2286
2286
2287 @command('debugsetparents', [], _('REV1 [REV2]'))
2287 @command('debugsetparents', [], _('REV1 [REV2]'))
2288 def debugsetparents(ui, repo, rev1, rev2=None):
2288 def debugsetparents(ui, repo, rev1, rev2=None):
2289 """manually set the parents of the current working directory
2289 """manually set the parents of the current working directory
2290
2290
2291 This is useful for writing repository conversion tools, but should
2291 This is useful for writing repository conversion tools, but should
2292 be used with care.
2292 be used with care.
2293
2293
2294 Returns 0 on success.
2294 Returns 0 on success.
2295 """
2295 """
2296
2296
2297 r1 = scmutil.revsingle(repo, rev1).node()
2297 r1 = scmutil.revsingle(repo, rev1).node()
2298 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2298 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2299
2299
2300 wlock = repo.wlock()
2300 wlock = repo.wlock()
2301 try:
2301 try:
2302 repo.setparents(r1, r2)
2302 repo.setparents(r1, r2)
2303 finally:
2303 finally:
2304 wlock.release()
2304 wlock.release()
2305
2305
2306 @command('debugstate',
2306 @command('debugstate',
2307 [('', 'nodates', None, _('do not display the saved mtime')),
2307 [('', 'nodates', None, _('do not display the saved mtime')),
2308 ('', 'datesort', None, _('sort by saved mtime'))],
2308 ('', 'datesort', None, _('sort by saved mtime'))],
2309 _('[OPTION]...'))
2309 _('[OPTION]...'))
2310 def debugstate(ui, repo, nodates=None, datesort=None):
2310 def debugstate(ui, repo, nodates=None, datesort=None):
2311 """show the contents of the current dirstate"""
2311 """show the contents of the current dirstate"""
2312 timestr = ""
2312 timestr = ""
2313 showdate = not nodates
2313 showdate = not nodates
2314 if datesort:
2314 if datesort:
2315 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
2315 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
2316 else:
2316 else:
2317 keyfunc = None # sort by filename
2317 keyfunc = None # sort by filename
2318 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
2318 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
2319 if showdate:
2319 if showdate:
2320 if ent[3] == -1:
2320 if ent[3] == -1:
2321 # Pad or slice to locale representation
2321 # Pad or slice to locale representation
2322 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
2322 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
2323 time.localtime(0)))
2323 time.localtime(0)))
2324 timestr = 'unset'
2324 timestr = 'unset'
2325 timestr = (timestr[:locale_len] +
2325 timestr = (timestr[:locale_len] +
2326 ' ' * (locale_len - len(timestr)))
2326 ' ' * (locale_len - len(timestr)))
2327 else:
2327 else:
2328 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
2328 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
2329 time.localtime(ent[3]))
2329 time.localtime(ent[3]))
2330 if ent[1] & 020000:
2330 if ent[1] & 020000:
2331 mode = 'lnk'
2331 mode = 'lnk'
2332 else:
2332 else:
2333 mode = '%3o' % (ent[1] & 0777 & ~util.umask)
2333 mode = '%3o' % (ent[1] & 0777 & ~util.umask)
2334 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
2334 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
2335 for f in repo.dirstate.copies():
2335 for f in repo.dirstate.copies():
2336 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
2336 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
2337
2337
2338 @command('debugsub',
2338 @command('debugsub',
2339 [('r', 'rev', '',
2339 [('r', 'rev', '',
2340 _('revision to check'), _('REV'))],
2340 _('revision to check'), _('REV'))],
2341 _('[-r REV] [REV]'))
2341 _('[-r REV] [REV]'))
2342 def debugsub(ui, repo, rev=None):
2342 def debugsub(ui, repo, rev=None):
2343 ctx = scmutil.revsingle(repo, rev, None)
2343 ctx = scmutil.revsingle(repo, rev, None)
2344 for k, v in sorted(ctx.substate.items()):
2344 for k, v in sorted(ctx.substate.items()):
2345 ui.write('path %s\n' % k)
2345 ui.write('path %s\n' % k)
2346 ui.write(' source %s\n' % v[0])
2346 ui.write(' source %s\n' % v[0])
2347 ui.write(' revision %s\n' % v[1])
2347 ui.write(' revision %s\n' % v[1])
2348
2348
2349 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'))
2349 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'))
2350 def debugwalk(ui, repo, *pats, **opts):
2350 def debugwalk(ui, repo, *pats, **opts):
2351 """show how files match on given patterns"""
2351 """show how files match on given patterns"""
2352 m = scmutil.match(repo[None], pats, opts)
2352 m = scmutil.match(repo[None], pats, opts)
2353 items = list(repo.walk(m))
2353 items = list(repo.walk(m))
2354 if not items:
2354 if not items:
2355 return
2355 return
2356 fmt = 'f %%-%ds %%-%ds %%s' % (
2356 fmt = 'f %%-%ds %%-%ds %%s' % (
2357 max([len(abs) for abs in items]),
2357 max([len(abs) for abs in items]),
2358 max([len(m.rel(abs)) for abs in items]))
2358 max([len(m.rel(abs)) for abs in items]))
2359 for abs in items:
2359 for abs in items:
2360 line = fmt % (abs, m.rel(abs), m.exact(abs) and 'exact' or '')
2360 line = fmt % (abs, m.rel(abs), m.exact(abs) and 'exact' or '')
2361 ui.write("%s\n" % line.rstrip())
2361 ui.write("%s\n" % line.rstrip())
2362
2362
2363 @command('debugwireargs',
2363 @command('debugwireargs',
2364 [('', 'three', '', 'three'),
2364 [('', 'three', '', 'three'),
2365 ('', 'four', '', 'four'),
2365 ('', 'four', '', 'four'),
2366 ('', 'five', '', 'five'),
2366 ('', 'five', '', 'five'),
2367 ] + remoteopts,
2367 ] + remoteopts,
2368 _('REPO [OPTIONS]... [ONE [TWO]]'))
2368 _('REPO [OPTIONS]... [ONE [TWO]]'))
2369 def debugwireargs(ui, repopath, *vals, **opts):
2369 def debugwireargs(ui, repopath, *vals, **opts):
2370 repo = hg.peer(ui, opts, repopath)
2370 repo = hg.peer(ui, opts, repopath)
2371 for opt in remoteopts:
2371 for opt in remoteopts:
2372 del opts[opt[1]]
2372 del opts[opt[1]]
2373 args = {}
2373 args = {}
2374 for k, v in opts.iteritems():
2374 for k, v in opts.iteritems():
2375 if v:
2375 if v:
2376 args[k] = v
2376 args[k] = v
2377 # run twice to check that we don't mess up the stream for the next command
2377 # run twice to check that we don't mess up the stream for the next command
2378 res1 = repo.debugwireargs(*vals, **args)
2378 res1 = repo.debugwireargs(*vals, **args)
2379 res2 = repo.debugwireargs(*vals, **args)
2379 res2 = repo.debugwireargs(*vals, **args)
2380 ui.write("%s\n" % res1)
2380 ui.write("%s\n" % res1)
2381 if res1 != res2:
2381 if res1 != res2:
2382 ui.warn("%s\n" % res2)
2382 ui.warn("%s\n" % res2)
2383
2383
2384 @command('^diff',
2384 @command('^diff',
2385 [('r', 'rev', [], _('revision'), _('REV')),
2385 [('r', 'rev', [], _('revision'), _('REV')),
2386 ('c', 'change', '', _('change made by revision'), _('REV'))
2386 ('c', 'change', '', _('change made by revision'), _('REV'))
2387 ] + diffopts + diffopts2 + walkopts + subrepoopts,
2387 ] + diffopts + diffopts2 + walkopts + subrepoopts,
2388 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'))
2388 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'))
2389 def diff(ui, repo, *pats, **opts):
2389 def diff(ui, repo, *pats, **opts):
2390 """diff repository (or selected files)
2390 """diff repository (or selected files)
2391
2391
2392 Show differences between revisions for the specified files.
2392 Show differences between revisions for the specified files.
2393
2393
2394 Differences between files are shown using the unified diff format.
2394 Differences between files are shown using the unified diff format.
2395
2395
2396 .. note::
2396 .. note::
2397 diff may generate unexpected results for merges, as it will
2397 diff may generate unexpected results for merges, as it will
2398 default to comparing against the working directory's first
2398 default to comparing against the working directory's first
2399 parent changeset if no revisions are specified.
2399 parent changeset if no revisions are specified.
2400
2400
2401 When two revision arguments are given, then changes are shown
2401 When two revision arguments are given, then changes are shown
2402 between those revisions. If only one revision is specified then
2402 between those revisions. If only one revision is specified then
2403 that revision is compared to the working directory, and, when no
2403 that revision is compared to the working directory, and, when no
2404 revisions are specified, the working directory files are compared
2404 revisions are specified, the working directory files are compared
2405 to its parent.
2405 to its parent.
2406
2406
2407 Alternatively you can specify -c/--change with a revision to see
2407 Alternatively you can specify -c/--change with a revision to see
2408 the changes in that changeset relative to its first parent.
2408 the changes in that changeset relative to its first parent.
2409
2409
2410 Without the -a/--text option, diff will avoid generating diffs of
2410 Without the -a/--text option, diff will avoid generating diffs of
2411 files it detects as binary. With -a, diff will generate a diff
2411 files it detects as binary. With -a, diff will generate a diff
2412 anyway, probably with undesirable results.
2412 anyway, probably with undesirable results.
2413
2413
2414 Use the -g/--git option to generate diffs in the git extended diff
2414 Use the -g/--git option to generate diffs in the git extended diff
2415 format. For more information, read :hg:`help diffs`.
2415 format. For more information, read :hg:`help diffs`.
2416
2416
2417 .. container:: verbose
2417 .. container:: verbose
2418
2418
2419 Examples:
2419 Examples:
2420
2420
2421 - compare a file in the current working directory to its parent::
2421 - compare a file in the current working directory to its parent::
2422
2422
2423 hg diff foo.c
2423 hg diff foo.c
2424
2424
2425 - compare two historical versions of a directory, with rename info::
2425 - compare two historical versions of a directory, with rename info::
2426
2426
2427 hg diff --git -r 1.0:1.2 lib/
2427 hg diff --git -r 1.0:1.2 lib/
2428
2428
2429 - get change stats relative to the last change on some date::
2429 - get change stats relative to the last change on some date::
2430
2430
2431 hg diff --stat -r "date('may 2')"
2431 hg diff --stat -r "date('may 2')"
2432
2432
2433 - diff all newly-added files that contain a keyword::
2433 - diff all newly-added files that contain a keyword::
2434
2434
2435 hg diff "set:added() and grep(GNU)"
2435 hg diff "set:added() and grep(GNU)"
2436
2436
2437 - compare a revision and its parents::
2437 - compare a revision and its parents::
2438
2438
2439 hg diff -c 9353 # compare against first parent
2439 hg diff -c 9353 # compare against first parent
2440 hg diff -r 9353^:9353 # same using revset syntax
2440 hg diff -r 9353^:9353 # same using revset syntax
2441 hg diff -r 9353^2:9353 # compare against the second parent
2441 hg diff -r 9353^2:9353 # compare against the second parent
2442
2442
2443 Returns 0 on success.
2443 Returns 0 on success.
2444 """
2444 """
2445
2445
2446 revs = opts.get('rev')
2446 revs = opts.get('rev')
2447 change = opts.get('change')
2447 change = opts.get('change')
2448 stat = opts.get('stat')
2448 stat = opts.get('stat')
2449 reverse = opts.get('reverse')
2449 reverse = opts.get('reverse')
2450
2450
2451 if revs and change:
2451 if revs and change:
2452 msg = _('cannot specify --rev and --change at the same time')
2452 msg = _('cannot specify --rev and --change at the same time')
2453 raise util.Abort(msg)
2453 raise util.Abort(msg)
2454 elif change:
2454 elif change:
2455 node2 = scmutil.revsingle(repo, change, None).node()
2455 node2 = scmutil.revsingle(repo, change, None).node()
2456 node1 = repo[node2].p1().node()
2456 node1 = repo[node2].p1().node()
2457 else:
2457 else:
2458 node1, node2 = scmutil.revpair(repo, revs)
2458 node1, node2 = scmutil.revpair(repo, revs)
2459
2459
2460 if reverse:
2460 if reverse:
2461 node1, node2 = node2, node1
2461 node1, node2 = node2, node1
2462
2462
2463 diffopts = patch.diffopts(ui, opts)
2463 diffopts = patch.diffopts(ui, opts)
2464 m = scmutil.match(repo[node2], pats, opts)
2464 m = scmutil.match(repo[node2], pats, opts)
2465 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
2465 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
2466 listsubrepos=opts.get('subrepos'))
2466 listsubrepos=opts.get('subrepos'))
2467
2467
2468 @command('^export',
2468 @command('^export',
2469 [('o', 'output', '',
2469 [('o', 'output', '',
2470 _('print output to file with formatted name'), _('FORMAT')),
2470 _('print output to file with formatted name'), _('FORMAT')),
2471 ('', 'switch-parent', None, _('diff against the second parent')),
2471 ('', 'switch-parent', None, _('diff against the second parent')),
2472 ('r', 'rev', [], _('revisions to export'), _('REV')),
2472 ('r', 'rev', [], _('revisions to export'), _('REV')),
2473 ] + diffopts,
2473 ] + diffopts,
2474 _('[OPTION]... [-o OUTFILESPEC] REV...'))
2474 _('[OPTION]... [-o OUTFILESPEC] REV...'))
2475 def export(ui, repo, *changesets, **opts):
2475 def export(ui, repo, *changesets, **opts):
2476 """dump the header and diffs for one or more changesets
2476 """dump the header and diffs for one or more changesets
2477
2477
2478 Print the changeset header and diffs for one or more revisions.
2478 Print the changeset header and diffs for one or more revisions.
2479
2479
2480 The information shown in the changeset header is: author, date,
2480 The information shown in the changeset header is: author, date,
2481 branch name (if non-default), changeset hash, parent(s) and commit
2481 branch name (if non-default), changeset hash, parent(s) and commit
2482 comment.
2482 comment.
2483
2483
2484 .. note::
2484 .. note::
2485 export may generate unexpected diff output for merge
2485 export may generate unexpected diff output for merge
2486 changesets, as it will compare the merge changeset against its
2486 changesets, as it will compare the merge changeset against its
2487 first parent only.
2487 first parent only.
2488
2488
2489 Output may be to a file, in which case the name of the file is
2489 Output may be to a file, in which case the name of the file is
2490 given using a format string. The formatting rules are as follows:
2490 given using a format string. The formatting rules are as follows:
2491
2491
2492 :``%%``: literal "%" character
2492 :``%%``: literal "%" character
2493 :``%H``: changeset hash (40 hexadecimal digits)
2493 :``%H``: changeset hash (40 hexadecimal digits)
2494 :``%N``: number of patches being generated
2494 :``%N``: number of patches being generated
2495 :``%R``: changeset revision number
2495 :``%R``: changeset revision number
2496 :``%b``: basename of the exporting repository
2496 :``%b``: basename of the exporting repository
2497 :``%h``: short-form changeset hash (12 hexadecimal digits)
2497 :``%h``: short-form changeset hash (12 hexadecimal digits)
2498 :``%m``: first line of the commit message (only alphanumeric characters)
2498 :``%m``: first line of the commit message (only alphanumeric characters)
2499 :``%n``: zero-padded sequence number, starting at 1
2499 :``%n``: zero-padded sequence number, starting at 1
2500 :``%r``: zero-padded changeset revision number
2500 :``%r``: zero-padded changeset revision number
2501
2501
2502 Without the -a/--text option, export will avoid generating diffs
2502 Without the -a/--text option, export will avoid generating diffs
2503 of files it detects as binary. With -a, export will generate a
2503 of files it detects as binary. With -a, export will generate a
2504 diff anyway, probably with undesirable results.
2504 diff anyway, probably with undesirable results.
2505
2505
2506 Use the -g/--git option to generate diffs in the git extended diff
2506 Use the -g/--git option to generate diffs in the git extended diff
2507 format. See :hg:`help diffs` for more information.
2507 format. See :hg:`help diffs` for more information.
2508
2508
2509 With the --switch-parent option, the diff will be against the
2509 With the --switch-parent option, the diff will be against the
2510 second parent. It can be useful to review a merge.
2510 second parent. It can be useful to review a merge.
2511
2511
2512 .. container:: verbose
2512 .. container:: verbose
2513
2513
2514 Examples:
2514 Examples:
2515
2515
2516 - use export and import to transplant a bugfix to the current
2516 - use export and import to transplant a bugfix to the current
2517 branch::
2517 branch::
2518
2518
2519 hg export -r 9353 | hg import -
2519 hg export -r 9353 | hg import -
2520
2520
2521 - export all the changesets between two revisions to a file with
2521 - export all the changesets between two revisions to a file with
2522 rename information::
2522 rename information::
2523
2523
2524 hg export --git -r 123:150 > changes.txt
2524 hg export --git -r 123:150 > changes.txt
2525
2525
2526 - split outgoing changes into a series of patches with
2526 - split outgoing changes into a series of patches with
2527 descriptive names::
2527 descriptive names::
2528
2528
2529 hg export -r "outgoing()" -o "%n-%m.patch"
2529 hg export -r "outgoing()" -o "%n-%m.patch"
2530
2530
2531 Returns 0 on success.
2531 Returns 0 on success.
2532 """
2532 """
2533 changesets += tuple(opts.get('rev', []))
2533 changesets += tuple(opts.get('rev', []))
2534 revs = scmutil.revrange(repo, changesets)
2534 revs = scmutil.revrange(repo, changesets)
2535 if not revs:
2535 if not revs:
2536 raise util.Abort(_("export requires at least one changeset"))
2536 raise util.Abort(_("export requires at least one changeset"))
2537 if len(revs) > 1:
2537 if len(revs) > 1:
2538 ui.note(_('exporting patches:\n'))
2538 ui.note(_('exporting patches:\n'))
2539 else:
2539 else:
2540 ui.note(_('exporting patch:\n'))
2540 ui.note(_('exporting patch:\n'))
2541 cmdutil.export(repo, revs, template=opts.get('output'),
2541 cmdutil.export(repo, revs, template=opts.get('output'),
2542 switch_parent=opts.get('switch_parent'),
2542 switch_parent=opts.get('switch_parent'),
2543 opts=patch.diffopts(ui, opts))
2543 opts=patch.diffopts(ui, opts))
2544
2544
2545 @command('^forget', walkopts, _('[OPTION]... FILE...'))
2545 @command('^forget', walkopts, _('[OPTION]... FILE...'))
2546 def forget(ui, repo, *pats, **opts):
2546 def forget(ui, repo, *pats, **opts):
2547 """forget the specified files on the next commit
2547 """forget the specified files on the next commit
2548
2548
2549 Mark the specified files so they will no longer be tracked
2549 Mark the specified files so they will no longer be tracked
2550 after the next commit.
2550 after the next commit.
2551
2551
2552 This only removes files from the current branch, not from the
2552 This only removes files from the current branch, not from the
2553 entire project history, and it does not delete them from the
2553 entire project history, and it does not delete them from the
2554 working directory.
2554 working directory.
2555
2555
2556 To undo a forget before the next commit, see :hg:`add`.
2556 To undo a forget before the next commit, see :hg:`add`.
2557
2557
2558 .. container:: verbose
2558 .. container:: verbose
2559
2559
2560 Examples:
2560 Examples:
2561
2561
2562 - forget newly-added binary files::
2562 - forget newly-added binary files::
2563
2563
2564 hg forget "set:added() and binary()"
2564 hg forget "set:added() and binary()"
2565
2565
2566 - forget files that would be excluded by .hgignore::
2566 - forget files that would be excluded by .hgignore::
2567
2567
2568 hg forget "set:hgignore()"
2568 hg forget "set:hgignore()"
2569
2569
2570 Returns 0 on success.
2570 Returns 0 on success.
2571 """
2571 """
2572
2572
2573 if not pats:
2573 if not pats:
2574 raise util.Abort(_('no files specified'))
2574 raise util.Abort(_('no files specified'))
2575
2575
2576 m = scmutil.match(repo[None], pats, opts)
2576 m = scmutil.match(repo[None], pats, opts)
2577 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2577 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2578 return rejected and 1 or 0
2578 return rejected and 1 or 0
2579
2579
2580 @command(
2580 @command(
2581 'graft',
2581 'graft',
2582 [('c', 'continue', False, _('resume interrupted graft')),
2582 [('c', 'continue', False, _('resume interrupted graft')),
2583 ('e', 'edit', False, _('invoke editor on commit messages')),
2583 ('e', 'edit', False, _('invoke editor on commit messages')),
2584 ('', 'log', None, _('append graft info to log message')),
2584 ('D', 'currentdate', False,
2585 ('D', 'currentdate', False,
2585 _('record the current date as commit date')),
2586 _('record the current date as commit date')),
2586 ('U', 'currentuser', False,
2587 ('U', 'currentuser', False,
2587 _('record the current user as committer'), _('DATE'))]
2588 _('record the current user as committer'), _('DATE'))]
2588 + commitopts2 + mergetoolopts + dryrunopts,
2589 + commitopts2 + mergetoolopts + dryrunopts,
2589 _('[OPTION]... REVISION...'))
2590 _('[OPTION]... REVISION...'))
2590 def graft(ui, repo, *revs, **opts):
2591 def graft(ui, repo, *revs, **opts):
2591 '''copy changes from other branches onto the current branch
2592 '''copy changes from other branches onto the current branch
2592
2593
2593 This command uses Mercurial's merge logic to copy individual
2594 This command uses Mercurial's merge logic to copy individual
2594 changes from other branches without merging branches in the
2595 changes from other branches without merging branches in the
2595 history graph. This is sometimes known as 'backporting' or
2596 history graph. This is sometimes known as 'backporting' or
2596 'cherry-picking'. By default, graft will copy user, date, and
2597 'cherry-picking'. By default, graft will copy user, date, and
2597 description from the source changesets.
2598 description from the source changesets.
2598
2599
2599 Changesets that are ancestors of the current revision, that have
2600 Changesets that are ancestors of the current revision, that have
2600 already been grafted, or that are merges will be skipped.
2601 already been grafted, or that are merges will be skipped.
2601
2602
2603 If --log is specified, log messages will have a comment appended
2604 of the form::
2605
2606 (grafted from CHANGESETHASH)
2607
2602 If a graft merge results in conflicts, the graft process is
2608 If a graft merge results in conflicts, the graft process is
2603 interrupted so that the current merge can be manually resolved.
2609 interrupted so that the current merge can be manually resolved.
2604 Once all conflicts are addressed, the graft process can be
2610 Once all conflicts are addressed, the graft process can be
2605 continued with the -c/--continue option.
2611 continued with the -c/--continue option.
2606
2612
2607 .. note::
2613 .. note::
2608 The -c/--continue option does not reapply earlier options.
2614 The -c/--continue option does not reapply earlier options.
2609
2615
2610 .. container:: verbose
2616 .. container:: verbose
2611
2617
2612 Examples:
2618 Examples:
2613
2619
2614 - copy a single change to the stable branch and edit its description::
2620 - copy a single change to the stable branch and edit its description::
2615
2621
2616 hg update stable
2622 hg update stable
2617 hg graft --edit 9393
2623 hg graft --edit 9393
2618
2624
2619 - graft a range of changesets with one exception, updating dates::
2625 - graft a range of changesets with one exception, updating dates::
2620
2626
2621 hg graft -D "2085::2093 and not 2091"
2627 hg graft -D "2085::2093 and not 2091"
2622
2628
2623 - continue a graft after resolving conflicts::
2629 - continue a graft after resolving conflicts::
2624
2630
2625 hg graft -c
2631 hg graft -c
2626
2632
2627 - show the source of a grafted changeset::
2633 - show the source of a grafted changeset::
2628
2634
2629 hg log --debug -r tip
2635 hg log --debug -r tip
2630
2636
2631 Returns 0 on successful completion.
2637 Returns 0 on successful completion.
2632 '''
2638 '''
2633
2639
2634 if not opts.get('user') and opts.get('currentuser'):
2640 if not opts.get('user') and opts.get('currentuser'):
2635 opts['user'] = ui.username()
2641 opts['user'] = ui.username()
2636 if not opts.get('date') and opts.get('currentdate'):
2642 if not opts.get('date') and opts.get('currentdate'):
2637 opts['date'] = "%d %d" % util.makedate()
2643 opts['date'] = "%d %d" % util.makedate()
2638
2644
2639 editor = None
2645 editor = None
2640 if opts.get('edit'):
2646 if opts.get('edit'):
2641 editor = cmdutil.commitforceeditor
2647 editor = cmdutil.commitforceeditor
2642
2648
2643 cont = False
2649 cont = False
2644 if opts['continue']:
2650 if opts['continue']:
2645 cont = True
2651 cont = True
2646 if revs:
2652 if revs:
2647 raise util.Abort(_("can't specify --continue and revisions"))
2653 raise util.Abort(_("can't specify --continue and revisions"))
2648 # read in unfinished revisions
2654 # read in unfinished revisions
2649 try:
2655 try:
2650 nodes = repo.opener.read('graftstate').splitlines()
2656 nodes = repo.opener.read('graftstate').splitlines()
2651 revs = [repo[node].rev() for node in nodes]
2657 revs = [repo[node].rev() for node in nodes]
2652 except IOError, inst:
2658 except IOError, inst:
2653 if inst.errno != errno.ENOENT:
2659 if inst.errno != errno.ENOENT:
2654 raise
2660 raise
2655 raise util.Abort(_("no graft state found, can't continue"))
2661 raise util.Abort(_("no graft state found, can't continue"))
2656 else:
2662 else:
2657 cmdutil.bailifchanged(repo)
2663 cmdutil.bailifchanged(repo)
2658 if not revs:
2664 if not revs:
2659 raise util.Abort(_('no revisions specified'))
2665 raise util.Abort(_('no revisions specified'))
2660 revs = scmutil.revrange(repo, revs)
2666 revs = scmutil.revrange(repo, revs)
2661
2667
2662 # check for merges
2668 # check for merges
2663 for rev in repo.revs('%ld and merge()', revs):
2669 for rev in repo.revs('%ld and merge()', revs):
2664 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2670 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2665 revs.remove(rev)
2671 revs.remove(rev)
2666 if not revs:
2672 if not revs:
2667 return -1
2673 return -1
2668
2674
2669 # check for ancestors of dest branch
2675 # check for ancestors of dest branch
2670 for rev in repo.revs('::. and %ld', revs):
2676 for rev in repo.revs('::. and %ld', revs):
2671 ui.warn(_('skipping ancestor revision %s\n') % rev)
2677 ui.warn(_('skipping ancestor revision %s\n') % rev)
2672 revs.remove(rev)
2678 revs.remove(rev)
2673 if not revs:
2679 if not revs:
2674 return -1
2680 return -1
2675
2681
2676 # analyze revs for earlier grafts
2682 # analyze revs for earlier grafts
2677 ids = {}
2683 ids = {}
2678 for ctx in repo.set("%ld", revs):
2684 for ctx in repo.set("%ld", revs):
2679 ids[ctx.hex()] = ctx.rev()
2685 ids[ctx.hex()] = ctx.rev()
2680 n = ctx.extra().get('source')
2686 n = ctx.extra().get('source')
2681 if n:
2687 if n:
2682 ids[n] = ctx.rev()
2688 ids[n] = ctx.rev()
2683
2689
2684 # check ancestors for earlier grafts
2690 # check ancestors for earlier grafts
2685 ui.debug('scanning for duplicate grafts\n')
2691 ui.debug('scanning for duplicate grafts\n')
2686 for ctx in repo.set("::. - ::%ld", revs):
2692 for ctx in repo.set("::. - ::%ld", revs):
2687 n = ctx.extra().get('source')
2693 n = ctx.extra().get('source')
2688 if n in ids:
2694 if n in ids:
2689 r = repo[n].rev()
2695 r = repo[n].rev()
2690 if r in revs:
2696 if r in revs:
2691 ui.warn(_('skipping already grafted revision %s\n') % r)
2697 ui.warn(_('skipping already grafted revision %s\n') % r)
2692 revs.remove(r)
2698 revs.remove(r)
2693 elif ids[n] in revs:
2699 elif ids[n] in revs:
2694 ui.warn(_('skipping already grafted revision %s '
2700 ui.warn(_('skipping already grafted revision %s '
2695 '(same origin %d)\n') % (ids[n], r))
2701 '(same origin %d)\n') % (ids[n], r))
2696 revs.remove(ids[n])
2702 revs.remove(ids[n])
2697 elif ctx.hex() in ids:
2703 elif ctx.hex() in ids:
2698 r = ids[ctx.hex()]
2704 r = ids[ctx.hex()]
2699 ui.warn(_('skipping already grafted revision %s '
2705 ui.warn(_('skipping already grafted revision %s '
2700 '(was grafted from %d)\n') % (r, ctx.rev()))
2706 '(was grafted from %d)\n') % (r, ctx.rev()))
2701 revs.remove(r)
2707 revs.remove(r)
2702 if not revs:
2708 if not revs:
2703 return -1
2709 return -1
2704
2710
2705 wlock = repo.wlock()
2711 wlock = repo.wlock()
2706 try:
2712 try:
2707 for pos, ctx in enumerate(repo.set("%ld", revs)):
2713 for pos, ctx in enumerate(repo.set("%ld", revs)):
2708 current = repo['.']
2714 current = repo['.']
2709
2715
2710 ui.status(_('grafting revision %s\n') % ctx.rev())
2716 ui.status(_('grafting revision %s\n') % ctx.rev())
2711 if opts.get('dry_run'):
2717 if opts.get('dry_run'):
2712 continue
2718 continue
2713
2719
2714 # we don't merge the first commit when continuing
2720 # we don't merge the first commit when continuing
2715 if not cont:
2721 if not cont:
2716 # perform the graft merge with p1(rev) as 'ancestor'
2722 # perform the graft merge with p1(rev) as 'ancestor'
2717 try:
2723 try:
2718 # ui.forcemerge is an internal variable, do not document
2724 # ui.forcemerge is an internal variable, do not document
2719 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
2725 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
2720 stats = mergemod.update(repo, ctx.node(), True, True, False,
2726 stats = mergemod.update(repo, ctx.node(), True, True, False,
2721 ctx.p1().node())
2727 ctx.p1().node())
2722 finally:
2728 finally:
2723 ui.setconfig('ui', 'forcemerge', '')
2729 ui.setconfig('ui', 'forcemerge', '')
2724 # drop the second merge parent
2730 # drop the second merge parent
2725 repo.setparents(current.node(), nullid)
2731 repo.setparents(current.node(), nullid)
2726 repo.dirstate.write()
2732 repo.dirstate.write()
2727 # fix up dirstate for copies and renames
2733 # fix up dirstate for copies and renames
2728 cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev())
2734 cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev())
2729 # report any conflicts
2735 # report any conflicts
2730 if stats and stats[3] > 0:
2736 if stats and stats[3] > 0:
2731 # write out state for --continue
2737 # write out state for --continue
2732 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2738 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
2733 repo.opener.write('graftstate', ''.join(nodelines))
2739 repo.opener.write('graftstate', ''.join(nodelines))
2734 raise util.Abort(
2740 raise util.Abort(
2735 _("unresolved conflicts, can't continue"),
2741 _("unresolved conflicts, can't continue"),
2736 hint=_('use hg resolve and hg graft --continue'))
2742 hint=_('use hg resolve and hg graft --continue'))
2737 else:
2743 else:
2738 cont = False
2744 cont = False
2739
2745
2740 # commit
2746 # commit
2741 source = ctx.extra().get('source')
2747 source = ctx.extra().get('source')
2742 if not source:
2748 if not source:
2743 source = ctx.hex()
2749 source = ctx.hex()
2744 extra = {'source': source}
2750 extra = {'source': source}
2745 user = ctx.user()
2751 user = ctx.user()
2746 if opts.get('user'):
2752 if opts.get('user'):
2747 user = opts['user']
2753 user = opts['user']
2748 date = ctx.date()
2754 date = ctx.date()
2749 if opts.get('date'):
2755 if opts.get('date'):
2750 date = opts['date']
2756 date = opts['date']
2751 node = repo.commit(text=ctx.description(), user=user,
2757 message = ctx.description()
2758 if opts.get('log'):
2759 message += '\n(grafted from %s)' % ctx.hex()
2760 node = repo.commit(text=message, user=user,
2752 date=date, extra=extra, editor=editor)
2761 date=date, extra=extra, editor=editor)
2753 if node is None:
2762 if node is None:
2754 ui.status(_('graft for revision %s is empty\n') % ctx.rev())
2763 ui.status(_('graft for revision %s is empty\n') % ctx.rev())
2755 finally:
2764 finally:
2756 wlock.release()
2765 wlock.release()
2757
2766
2758 # remove state when we complete successfully
2767 # remove state when we complete successfully
2759 if not opts.get('dry_run') and os.path.exists(repo.join('graftstate')):
2768 if not opts.get('dry_run') and os.path.exists(repo.join('graftstate')):
2760 util.unlinkpath(repo.join('graftstate'))
2769 util.unlinkpath(repo.join('graftstate'))
2761
2770
2762 return 0
2771 return 0
2763
2772
2764 @command('grep',
2773 @command('grep',
2765 [('0', 'print0', None, _('end fields with NUL')),
2774 [('0', 'print0', None, _('end fields with NUL')),
2766 ('', 'all', None, _('print all revisions that match')),
2775 ('', 'all', None, _('print all revisions that match')),
2767 ('a', 'text', None, _('treat all files as text')),
2776 ('a', 'text', None, _('treat all files as text')),
2768 ('f', 'follow', None,
2777 ('f', 'follow', None,
2769 _('follow changeset history,'
2778 _('follow changeset history,'
2770 ' or file history across copies and renames')),
2779 ' or file history across copies and renames')),
2771 ('i', 'ignore-case', None, _('ignore case when matching')),
2780 ('i', 'ignore-case', None, _('ignore case when matching')),
2772 ('l', 'files-with-matches', None,
2781 ('l', 'files-with-matches', None,
2773 _('print only filenames and revisions that match')),
2782 _('print only filenames and revisions that match')),
2774 ('n', 'line-number', None, _('print matching line numbers')),
2783 ('n', 'line-number', None, _('print matching line numbers')),
2775 ('r', 'rev', [],
2784 ('r', 'rev', [],
2776 _('only search files changed within revision range'), _('REV')),
2785 _('only search files changed within revision range'), _('REV')),
2777 ('u', 'user', None, _('list the author (long with -v)')),
2786 ('u', 'user', None, _('list the author (long with -v)')),
2778 ('d', 'date', None, _('list the date (short with -q)')),
2787 ('d', 'date', None, _('list the date (short with -q)')),
2779 ] + walkopts,
2788 ] + walkopts,
2780 _('[OPTION]... PATTERN [FILE]...'))
2789 _('[OPTION]... PATTERN [FILE]...'))
2781 def grep(ui, repo, pattern, *pats, **opts):
2790 def grep(ui, repo, pattern, *pats, **opts):
2782 """search for a pattern in specified files and revisions
2791 """search for a pattern in specified files and revisions
2783
2792
2784 Search revisions of files for a regular expression.
2793 Search revisions of files for a regular expression.
2785
2794
2786 This command behaves differently than Unix grep. It only accepts
2795 This command behaves differently than Unix grep. It only accepts
2787 Python/Perl regexps. It searches repository history, not the
2796 Python/Perl regexps. It searches repository history, not the
2788 working directory. It always prints the revision number in which a
2797 working directory. It always prints the revision number in which a
2789 match appears.
2798 match appears.
2790
2799
2791 By default, grep only prints output for the first revision of a
2800 By default, grep only prints output for the first revision of a
2792 file in which it finds a match. To get it to print every revision
2801 file in which it finds a match. To get it to print every revision
2793 that contains a change in match status ("-" for a match that
2802 that contains a change in match status ("-" for a match that
2794 becomes a non-match, or "+" for a non-match that becomes a match),
2803 becomes a non-match, or "+" for a non-match that becomes a match),
2795 use the --all flag.
2804 use the --all flag.
2796
2805
2797 Returns 0 if a match is found, 1 otherwise.
2806 Returns 0 if a match is found, 1 otherwise.
2798 """
2807 """
2799 reflags = re.M
2808 reflags = re.M
2800 if opts.get('ignore_case'):
2809 if opts.get('ignore_case'):
2801 reflags |= re.I
2810 reflags |= re.I
2802 try:
2811 try:
2803 regexp = re.compile(pattern, reflags)
2812 regexp = re.compile(pattern, reflags)
2804 except re.error, inst:
2813 except re.error, inst:
2805 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2814 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
2806 return 1
2815 return 1
2807 sep, eol = ':', '\n'
2816 sep, eol = ':', '\n'
2808 if opts.get('print0'):
2817 if opts.get('print0'):
2809 sep = eol = '\0'
2818 sep = eol = '\0'
2810
2819
2811 getfile = util.lrucachefunc(repo.file)
2820 getfile = util.lrucachefunc(repo.file)
2812
2821
2813 def matchlines(body):
2822 def matchlines(body):
2814 begin = 0
2823 begin = 0
2815 linenum = 0
2824 linenum = 0
2816 while True:
2825 while True:
2817 match = regexp.search(body, begin)
2826 match = regexp.search(body, begin)
2818 if not match:
2827 if not match:
2819 break
2828 break
2820 mstart, mend = match.span()
2829 mstart, mend = match.span()
2821 linenum += body.count('\n', begin, mstart) + 1
2830 linenum += body.count('\n', begin, mstart) + 1
2822 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2831 lstart = body.rfind('\n', begin, mstart) + 1 or begin
2823 begin = body.find('\n', mend) + 1 or len(body) + 1
2832 begin = body.find('\n', mend) + 1 or len(body) + 1
2824 lend = begin - 1
2833 lend = begin - 1
2825 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2834 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
2826
2835
2827 class linestate(object):
2836 class linestate(object):
2828 def __init__(self, line, linenum, colstart, colend):
2837 def __init__(self, line, linenum, colstart, colend):
2829 self.line = line
2838 self.line = line
2830 self.linenum = linenum
2839 self.linenum = linenum
2831 self.colstart = colstart
2840 self.colstart = colstart
2832 self.colend = colend
2841 self.colend = colend
2833
2842
2834 def __hash__(self):
2843 def __hash__(self):
2835 return hash((self.linenum, self.line))
2844 return hash((self.linenum, self.line))
2836
2845
2837 def __eq__(self, other):
2846 def __eq__(self, other):
2838 return self.line == other.line
2847 return self.line == other.line
2839
2848
2840 matches = {}
2849 matches = {}
2841 copies = {}
2850 copies = {}
2842 def grepbody(fn, rev, body):
2851 def grepbody(fn, rev, body):
2843 matches[rev].setdefault(fn, [])
2852 matches[rev].setdefault(fn, [])
2844 m = matches[rev][fn]
2853 m = matches[rev][fn]
2845 for lnum, cstart, cend, line in matchlines(body):
2854 for lnum, cstart, cend, line in matchlines(body):
2846 s = linestate(line, lnum, cstart, cend)
2855 s = linestate(line, lnum, cstart, cend)
2847 m.append(s)
2856 m.append(s)
2848
2857
2849 def difflinestates(a, b):
2858 def difflinestates(a, b):
2850 sm = difflib.SequenceMatcher(None, a, b)
2859 sm = difflib.SequenceMatcher(None, a, b)
2851 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2860 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
2852 if tag == 'insert':
2861 if tag == 'insert':
2853 for i in xrange(blo, bhi):
2862 for i in xrange(blo, bhi):
2854 yield ('+', b[i])
2863 yield ('+', b[i])
2855 elif tag == 'delete':
2864 elif tag == 'delete':
2856 for i in xrange(alo, ahi):
2865 for i in xrange(alo, ahi):
2857 yield ('-', a[i])
2866 yield ('-', a[i])
2858 elif tag == 'replace':
2867 elif tag == 'replace':
2859 for i in xrange(alo, ahi):
2868 for i in xrange(alo, ahi):
2860 yield ('-', a[i])
2869 yield ('-', a[i])
2861 for i in xrange(blo, bhi):
2870 for i in xrange(blo, bhi):
2862 yield ('+', b[i])
2871 yield ('+', b[i])
2863
2872
2864 def display(fn, ctx, pstates, states):
2873 def display(fn, ctx, pstates, states):
2865 rev = ctx.rev()
2874 rev = ctx.rev()
2866 datefunc = ui.quiet and util.shortdate or util.datestr
2875 datefunc = ui.quiet and util.shortdate or util.datestr
2867 found = False
2876 found = False
2868 filerevmatches = {}
2877 filerevmatches = {}
2869 def binary():
2878 def binary():
2870 flog = getfile(fn)
2879 flog = getfile(fn)
2871 return util.binary(flog.read(ctx.filenode(fn)))
2880 return util.binary(flog.read(ctx.filenode(fn)))
2872
2881
2873 if opts.get('all'):
2882 if opts.get('all'):
2874 iter = difflinestates(pstates, states)
2883 iter = difflinestates(pstates, states)
2875 else:
2884 else:
2876 iter = [('', l) for l in states]
2885 iter = [('', l) for l in states]
2877 for change, l in iter:
2886 for change, l in iter:
2878 cols = [fn, str(rev)]
2887 cols = [fn, str(rev)]
2879 before, match, after = None, None, None
2888 before, match, after = None, None, None
2880 if opts.get('line_number'):
2889 if opts.get('line_number'):
2881 cols.append(str(l.linenum))
2890 cols.append(str(l.linenum))
2882 if opts.get('all'):
2891 if opts.get('all'):
2883 cols.append(change)
2892 cols.append(change)
2884 if opts.get('user'):
2893 if opts.get('user'):
2885 cols.append(ui.shortuser(ctx.user()))
2894 cols.append(ui.shortuser(ctx.user()))
2886 if opts.get('date'):
2895 if opts.get('date'):
2887 cols.append(datefunc(ctx.date()))
2896 cols.append(datefunc(ctx.date()))
2888 if opts.get('files_with_matches'):
2897 if opts.get('files_with_matches'):
2889 c = (fn, rev)
2898 c = (fn, rev)
2890 if c in filerevmatches:
2899 if c in filerevmatches:
2891 continue
2900 continue
2892 filerevmatches[c] = 1
2901 filerevmatches[c] = 1
2893 else:
2902 else:
2894 before = l.line[:l.colstart]
2903 before = l.line[:l.colstart]
2895 match = l.line[l.colstart:l.colend]
2904 match = l.line[l.colstart:l.colend]
2896 after = l.line[l.colend:]
2905 after = l.line[l.colend:]
2897 ui.write(sep.join(cols))
2906 ui.write(sep.join(cols))
2898 if before is not None:
2907 if before is not None:
2899 if not opts.get('text') and binary():
2908 if not opts.get('text') and binary():
2900 ui.write(sep + " Binary file matches")
2909 ui.write(sep + " Binary file matches")
2901 else:
2910 else:
2902 ui.write(sep + before)
2911 ui.write(sep + before)
2903 ui.write(match, label='grep.match')
2912 ui.write(match, label='grep.match')
2904 ui.write(after)
2913 ui.write(after)
2905 ui.write(eol)
2914 ui.write(eol)
2906 found = True
2915 found = True
2907 return found
2916 return found
2908
2917
2909 skip = {}
2918 skip = {}
2910 revfiles = {}
2919 revfiles = {}
2911 matchfn = scmutil.match(repo[None], pats, opts)
2920 matchfn = scmutil.match(repo[None], pats, opts)
2912 found = False
2921 found = False
2913 follow = opts.get('follow')
2922 follow = opts.get('follow')
2914
2923
2915 def prep(ctx, fns):
2924 def prep(ctx, fns):
2916 rev = ctx.rev()
2925 rev = ctx.rev()
2917 pctx = ctx.p1()
2926 pctx = ctx.p1()
2918 parent = pctx.rev()
2927 parent = pctx.rev()
2919 matches.setdefault(rev, {})
2928 matches.setdefault(rev, {})
2920 matches.setdefault(parent, {})
2929 matches.setdefault(parent, {})
2921 files = revfiles.setdefault(rev, [])
2930 files = revfiles.setdefault(rev, [])
2922 for fn in fns:
2931 for fn in fns:
2923 flog = getfile(fn)
2932 flog = getfile(fn)
2924 try:
2933 try:
2925 fnode = ctx.filenode(fn)
2934 fnode = ctx.filenode(fn)
2926 except error.LookupError:
2935 except error.LookupError:
2927 continue
2936 continue
2928
2937
2929 copied = flog.renamed(fnode)
2938 copied = flog.renamed(fnode)
2930 copy = follow and copied and copied[0]
2939 copy = follow and copied and copied[0]
2931 if copy:
2940 if copy:
2932 copies.setdefault(rev, {})[fn] = copy
2941 copies.setdefault(rev, {})[fn] = copy
2933 if fn in skip:
2942 if fn in skip:
2934 if copy:
2943 if copy:
2935 skip[copy] = True
2944 skip[copy] = True
2936 continue
2945 continue
2937 files.append(fn)
2946 files.append(fn)
2938
2947
2939 if fn not in matches[rev]:
2948 if fn not in matches[rev]:
2940 grepbody(fn, rev, flog.read(fnode))
2949 grepbody(fn, rev, flog.read(fnode))
2941
2950
2942 pfn = copy or fn
2951 pfn = copy or fn
2943 if pfn not in matches[parent]:
2952 if pfn not in matches[parent]:
2944 try:
2953 try:
2945 fnode = pctx.filenode(pfn)
2954 fnode = pctx.filenode(pfn)
2946 grepbody(pfn, parent, flog.read(fnode))
2955 grepbody(pfn, parent, flog.read(fnode))
2947 except error.LookupError:
2956 except error.LookupError:
2948 pass
2957 pass
2949
2958
2950 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2959 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2951 rev = ctx.rev()
2960 rev = ctx.rev()
2952 parent = ctx.p1().rev()
2961 parent = ctx.p1().rev()
2953 for fn in sorted(revfiles.get(rev, [])):
2962 for fn in sorted(revfiles.get(rev, [])):
2954 states = matches[rev][fn]
2963 states = matches[rev][fn]
2955 copy = copies.get(rev, {}).get(fn)
2964 copy = copies.get(rev, {}).get(fn)
2956 if fn in skip:
2965 if fn in skip:
2957 if copy:
2966 if copy:
2958 skip[copy] = True
2967 skip[copy] = True
2959 continue
2968 continue
2960 pstates = matches.get(parent, {}).get(copy or fn, [])
2969 pstates = matches.get(parent, {}).get(copy or fn, [])
2961 if pstates or states:
2970 if pstates or states:
2962 r = display(fn, ctx, pstates, states)
2971 r = display(fn, ctx, pstates, states)
2963 found = found or r
2972 found = found or r
2964 if r and not opts.get('all'):
2973 if r and not opts.get('all'):
2965 skip[fn] = True
2974 skip[fn] = True
2966 if copy:
2975 if copy:
2967 skip[copy] = True
2976 skip[copy] = True
2968 del matches[rev]
2977 del matches[rev]
2969 del revfiles[rev]
2978 del revfiles[rev]
2970
2979
2971 return not found
2980 return not found
2972
2981
2973 @command('heads',
2982 @command('heads',
2974 [('r', 'rev', '',
2983 [('r', 'rev', '',
2975 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2984 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
2976 ('t', 'topo', False, _('show topological heads only')),
2985 ('t', 'topo', False, _('show topological heads only')),
2977 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2986 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
2978 ('c', 'closed', False, _('show normal and closed branch heads')),
2987 ('c', 'closed', False, _('show normal and closed branch heads')),
2979 ] + templateopts,
2988 ] + templateopts,
2980 _('[-ac] [-r STARTREV] [REV]...'))
2989 _('[-ac] [-r STARTREV] [REV]...'))
2981 def heads(ui, repo, *branchrevs, **opts):
2990 def heads(ui, repo, *branchrevs, **opts):
2982 """show current repository heads or show branch heads
2991 """show current repository heads or show branch heads
2983
2992
2984 With no arguments, show all repository branch heads.
2993 With no arguments, show all repository branch heads.
2985
2994
2986 Repository "heads" are changesets with no child changesets. They are
2995 Repository "heads" are changesets with no child changesets. They are
2987 where development generally takes place and are the usual targets
2996 where development generally takes place and are the usual targets
2988 for update and merge operations. Branch heads are changesets that have
2997 for update and merge operations. Branch heads are changesets that have
2989 no child changeset on the same branch.
2998 no child changeset on the same branch.
2990
2999
2991 If one or more REVs are given, only branch heads on the branches
3000 If one or more REVs are given, only branch heads on the branches
2992 associated with the specified changesets are shown. This means
3001 associated with the specified changesets are shown. This means
2993 that you can use :hg:`heads foo` to see the heads on a branch
3002 that you can use :hg:`heads foo` to see the heads on a branch
2994 named ``foo``.
3003 named ``foo``.
2995
3004
2996 If -c/--closed is specified, also show branch heads marked closed
3005 If -c/--closed is specified, also show branch heads marked closed
2997 (see :hg:`commit --close-branch`).
3006 (see :hg:`commit --close-branch`).
2998
3007
2999 If STARTREV is specified, only those heads that are descendants of
3008 If STARTREV is specified, only those heads that are descendants of
3000 STARTREV will be displayed.
3009 STARTREV will be displayed.
3001
3010
3002 If -t/--topo is specified, named branch mechanics will be ignored and only
3011 If -t/--topo is specified, named branch mechanics will be ignored and only
3003 changesets without children will be shown.
3012 changesets without children will be shown.
3004
3013
3005 Returns 0 if matching heads are found, 1 if not.
3014 Returns 0 if matching heads are found, 1 if not.
3006 """
3015 """
3007
3016
3008 start = None
3017 start = None
3009 if 'rev' in opts:
3018 if 'rev' in opts:
3010 start = scmutil.revsingle(repo, opts['rev'], None).node()
3019 start = scmutil.revsingle(repo, opts['rev'], None).node()
3011
3020
3012 if opts.get('topo'):
3021 if opts.get('topo'):
3013 heads = [repo[h] for h in repo.heads(start)]
3022 heads = [repo[h] for h in repo.heads(start)]
3014 else:
3023 else:
3015 heads = []
3024 heads = []
3016 for branch in repo.branchmap():
3025 for branch in repo.branchmap():
3017 heads += repo.branchheads(branch, start, opts.get('closed'))
3026 heads += repo.branchheads(branch, start, opts.get('closed'))
3018 heads = [repo[h] for h in heads]
3027 heads = [repo[h] for h in heads]
3019
3028
3020 if branchrevs:
3029 if branchrevs:
3021 branches = set(repo[br].branch() for br in branchrevs)
3030 branches = set(repo[br].branch() for br in branchrevs)
3022 heads = [h for h in heads if h.branch() in branches]
3031 heads = [h for h in heads if h.branch() in branches]
3023
3032
3024 if opts.get('active') and branchrevs:
3033 if opts.get('active') and branchrevs:
3025 dagheads = repo.heads(start)
3034 dagheads = repo.heads(start)
3026 heads = [h for h in heads if h.node() in dagheads]
3035 heads = [h for h in heads if h.node() in dagheads]
3027
3036
3028 if branchrevs:
3037 if branchrevs:
3029 haveheads = set(h.branch() for h in heads)
3038 haveheads = set(h.branch() for h in heads)
3030 if branches - haveheads:
3039 if branches - haveheads:
3031 headless = ', '.join(b for b in branches - haveheads)
3040 headless = ', '.join(b for b in branches - haveheads)
3032 msg = _('no open branch heads found on branches %s')
3041 msg = _('no open branch heads found on branches %s')
3033 if opts.get('rev'):
3042 if opts.get('rev'):
3034 msg += _(' (started at %s)') % opts['rev']
3043 msg += _(' (started at %s)') % opts['rev']
3035 ui.warn((msg + '\n') % headless)
3044 ui.warn((msg + '\n') % headless)
3036
3045
3037 if not heads:
3046 if not heads:
3038 return 1
3047 return 1
3039
3048
3040 heads = sorted(heads, key=lambda x: -x.rev())
3049 heads = sorted(heads, key=lambda x: -x.rev())
3041 displayer = cmdutil.show_changeset(ui, repo, opts)
3050 displayer = cmdutil.show_changeset(ui, repo, opts)
3042 for ctx in heads:
3051 for ctx in heads:
3043 displayer.show(ctx)
3052 displayer.show(ctx)
3044 displayer.close()
3053 displayer.close()
3045
3054
3046 @command('help',
3055 @command('help',
3047 [('e', 'extension', None, _('show only help for extensions')),
3056 [('e', 'extension', None, _('show only help for extensions')),
3048 ('c', 'command', None, _('show only help for commands'))],
3057 ('c', 'command', None, _('show only help for commands'))],
3049 _('[-ec] [TOPIC]'))
3058 _('[-ec] [TOPIC]'))
3050 def help_(ui, name=None, unknowncmd=False, full=True, **opts):
3059 def help_(ui, name=None, unknowncmd=False, full=True, **opts):
3051 """show help for a given topic or a help overview
3060 """show help for a given topic or a help overview
3052
3061
3053 With no arguments, print a list of commands with short help messages.
3062 With no arguments, print a list of commands with short help messages.
3054
3063
3055 Given a topic, extension, or command name, print help for that
3064 Given a topic, extension, or command name, print help for that
3056 topic.
3065 topic.
3057
3066
3058 Returns 0 if successful.
3067 Returns 0 if successful.
3059 """
3068 """
3060
3069
3061 textwidth = min(ui.termwidth(), 80) - 2
3070 textwidth = min(ui.termwidth(), 80) - 2
3062
3071
3063 def optrst(options):
3072 def optrst(options):
3064 data = []
3073 data = []
3065 multioccur = False
3074 multioccur = False
3066 for option in options:
3075 for option in options:
3067 if len(option) == 5:
3076 if len(option) == 5:
3068 shortopt, longopt, default, desc, optlabel = option
3077 shortopt, longopt, default, desc, optlabel = option
3069 else:
3078 else:
3070 shortopt, longopt, default, desc = option
3079 shortopt, longopt, default, desc = option
3071 optlabel = _("VALUE") # default label
3080 optlabel = _("VALUE") # default label
3072
3081
3073 if _("DEPRECATED") in desc and not ui.verbose:
3082 if _("DEPRECATED") in desc and not ui.verbose:
3074 continue
3083 continue
3075
3084
3076 so = ''
3085 so = ''
3077 if shortopt:
3086 if shortopt:
3078 so = '-' + shortopt
3087 so = '-' + shortopt
3079 lo = '--' + longopt
3088 lo = '--' + longopt
3080 if default:
3089 if default:
3081 desc += _(" (default: %s)") % default
3090 desc += _(" (default: %s)") % default
3082
3091
3083 if isinstance(default, list):
3092 if isinstance(default, list):
3084 lo += " %s [+]" % optlabel
3093 lo += " %s [+]" % optlabel
3085 multioccur = True
3094 multioccur = True
3086 elif (default is not None) and not isinstance(default, bool):
3095 elif (default is not None) and not isinstance(default, bool):
3087 lo += " %s" % optlabel
3096 lo += " %s" % optlabel
3088
3097
3089 data.append((so, lo, desc))
3098 data.append((so, lo, desc))
3090
3099
3091 rst = minirst.maketable(data, 1)
3100 rst = minirst.maketable(data, 1)
3092
3101
3093 if multioccur:
3102 if multioccur:
3094 rst += _("\n[+] marked option can be specified multiple times\n")
3103 rst += _("\n[+] marked option can be specified multiple times\n")
3095
3104
3096 return rst
3105 return rst
3097
3106
3098 # list all option lists
3107 # list all option lists
3099 def opttext(optlist, width):
3108 def opttext(optlist, width):
3100 rst = ''
3109 rst = ''
3101 if not optlist:
3110 if not optlist:
3102 return ''
3111 return ''
3103
3112
3104 for title, options in optlist:
3113 for title, options in optlist:
3105 rst += '\n%s\n' % title
3114 rst += '\n%s\n' % title
3106 if options:
3115 if options:
3107 rst += "\n"
3116 rst += "\n"
3108 rst += optrst(options)
3117 rst += optrst(options)
3109 rst += '\n'
3118 rst += '\n'
3110
3119
3111 return '\n' + minirst.format(rst, width)
3120 return '\n' + minirst.format(rst, width)
3112
3121
3113 def addglobalopts(optlist, aliases):
3122 def addglobalopts(optlist, aliases):
3114 if ui.quiet:
3123 if ui.quiet:
3115 return []
3124 return []
3116
3125
3117 if ui.verbose:
3126 if ui.verbose:
3118 optlist.append((_("global options:"), globalopts))
3127 optlist.append((_("global options:"), globalopts))
3119 if name == 'shortlist':
3128 if name == 'shortlist':
3120 optlist.append((_('use "hg help" for the full list '
3129 optlist.append((_('use "hg help" for the full list '
3121 'of commands'), ()))
3130 'of commands'), ()))
3122 else:
3131 else:
3123 if name == 'shortlist':
3132 if name == 'shortlist':
3124 msg = _('use "hg help" for the full list of commands '
3133 msg = _('use "hg help" for the full list of commands '
3125 'or "hg -v" for details')
3134 'or "hg -v" for details')
3126 elif name and not full:
3135 elif name and not full:
3127 msg = _('use "hg help %s" to show the full help text') % name
3136 msg = _('use "hg help %s" to show the full help text') % name
3128 elif aliases:
3137 elif aliases:
3129 msg = _('use "hg -v help%s" to show builtin aliases and '
3138 msg = _('use "hg -v help%s" to show builtin aliases and '
3130 'global options') % (name and " " + name or "")
3139 'global options') % (name and " " + name or "")
3131 else:
3140 else:
3132 msg = _('use "hg -v help %s" to show more info') % name
3141 msg = _('use "hg -v help %s" to show more info') % name
3133 optlist.append((msg, ()))
3142 optlist.append((msg, ()))
3134
3143
3135 def helpcmd(name):
3144 def helpcmd(name):
3136 try:
3145 try:
3137 aliases, entry = cmdutil.findcmd(name, table, strict=unknowncmd)
3146 aliases, entry = cmdutil.findcmd(name, table, strict=unknowncmd)
3138 except error.AmbiguousCommand, inst:
3147 except error.AmbiguousCommand, inst:
3139 # py3k fix: except vars can't be used outside the scope of the
3148 # py3k fix: except vars can't be used outside the scope of the
3140 # except block, nor can be used inside a lambda. python issue4617
3149 # except block, nor can be used inside a lambda. python issue4617
3141 prefix = inst.args[0]
3150 prefix = inst.args[0]
3142 select = lambda c: c.lstrip('^').startswith(prefix)
3151 select = lambda c: c.lstrip('^').startswith(prefix)
3143 helplist(select)
3152 helplist(select)
3144 return
3153 return
3145
3154
3146 # check if it's an invalid alias and display its error if it is
3155 # check if it's an invalid alias and display its error if it is
3147 if getattr(entry[0], 'badalias', False):
3156 if getattr(entry[0], 'badalias', False):
3148 if not unknowncmd:
3157 if not unknowncmd:
3149 entry[0](ui)
3158 entry[0](ui)
3150 return
3159 return
3151
3160
3152 rst = ""
3161 rst = ""
3153
3162
3154 # synopsis
3163 # synopsis
3155 if len(entry) > 2:
3164 if len(entry) > 2:
3156 if entry[2].startswith('hg'):
3165 if entry[2].startswith('hg'):
3157 rst += "%s\n" % entry[2]
3166 rst += "%s\n" % entry[2]
3158 else:
3167 else:
3159 rst += 'hg %s %s\n' % (aliases[0], entry[2])
3168 rst += 'hg %s %s\n' % (aliases[0], entry[2])
3160 else:
3169 else:
3161 rst += 'hg %s\n' % aliases[0]
3170 rst += 'hg %s\n' % aliases[0]
3162
3171
3163 # aliases
3172 # aliases
3164 if full and not ui.quiet and len(aliases) > 1:
3173 if full and not ui.quiet and len(aliases) > 1:
3165 rst += _("\naliases: %s\n") % ', '.join(aliases[1:])
3174 rst += _("\naliases: %s\n") % ', '.join(aliases[1:])
3166
3175
3167 # description
3176 # description
3168 doc = gettext(entry[0].__doc__)
3177 doc = gettext(entry[0].__doc__)
3169 if not doc:
3178 if not doc:
3170 doc = _("(no help text available)")
3179 doc = _("(no help text available)")
3171 if util.safehasattr(entry[0], 'definition'): # aliased command
3180 if util.safehasattr(entry[0], 'definition'): # aliased command
3172 if entry[0].definition.startswith('!'): # shell alias
3181 if entry[0].definition.startswith('!'): # shell alias
3173 doc = _('shell alias for::\n\n %s') % entry[0].definition[1:]
3182 doc = _('shell alias for::\n\n %s') % entry[0].definition[1:]
3174 else:
3183 else:
3175 doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc)
3184 doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc)
3176 if ui.quiet or not full:
3185 if ui.quiet or not full:
3177 doc = doc.splitlines()[0]
3186 doc = doc.splitlines()[0]
3178 rst += "\n" + doc + "\n"
3187 rst += "\n" + doc + "\n"
3179
3188
3180 # check if this command shadows a non-trivial (multi-line)
3189 # check if this command shadows a non-trivial (multi-line)
3181 # extension help text
3190 # extension help text
3182 try:
3191 try:
3183 mod = extensions.find(name)
3192 mod = extensions.find(name)
3184 doc = gettext(mod.__doc__) or ''
3193 doc = gettext(mod.__doc__) or ''
3185 if '\n' in doc.strip():
3194 if '\n' in doc.strip():
3186 msg = _('use "hg help -e %s" to show help for '
3195 msg = _('use "hg help -e %s" to show help for '
3187 'the %s extension') % (name, name)
3196 'the %s extension') % (name, name)
3188 rst += '\n%s\n' % msg
3197 rst += '\n%s\n' % msg
3189 except KeyError:
3198 except KeyError:
3190 pass
3199 pass
3191
3200
3192 # options
3201 # options
3193 if not ui.quiet and entry[1]:
3202 if not ui.quiet and entry[1]:
3194 rst += '\n'
3203 rst += '\n'
3195 rst += _("options:")
3204 rst += _("options:")
3196 rst += '\n\n'
3205 rst += '\n\n'
3197 rst += optrst(entry[1])
3206 rst += optrst(entry[1])
3198
3207
3199 if ui.verbose:
3208 if ui.verbose:
3200 rst += '\n'
3209 rst += '\n'
3201 rst += _("global options:")
3210 rst += _("global options:")
3202 rst += '\n\n'
3211 rst += '\n\n'
3203 rst += optrst(globalopts)
3212 rst += optrst(globalopts)
3204
3213
3205 keep = ui.verbose and ['verbose'] or []
3214 keep = ui.verbose and ['verbose'] or []
3206 formatted, pruned = minirst.format(rst, textwidth, keep=keep)
3215 formatted, pruned = minirst.format(rst, textwidth, keep=keep)
3207 ui.write(formatted)
3216 ui.write(formatted)
3208
3217
3209 if not ui.verbose:
3218 if not ui.verbose:
3210 if not full:
3219 if not full:
3211 ui.write(_('\nuse "hg help %s" to show the full help text\n')
3220 ui.write(_('\nuse "hg help %s" to show the full help text\n')
3212 % name)
3221 % name)
3213 elif not ui.quiet:
3222 elif not ui.quiet:
3214 ui.write(_('\nuse "hg -v help %s" to show more info\n') % name)
3223 ui.write(_('\nuse "hg -v help %s" to show more info\n') % name)
3215
3224
3216
3225
3217 def helplist(select=None):
3226 def helplist(select=None):
3218 # list of commands
3227 # list of commands
3219 if name == "shortlist":
3228 if name == "shortlist":
3220 header = _('basic commands:\n\n')
3229 header = _('basic commands:\n\n')
3221 else:
3230 else:
3222 header = _('list of commands:\n\n')
3231 header = _('list of commands:\n\n')
3223
3232
3224 h = {}
3233 h = {}
3225 cmds = {}
3234 cmds = {}
3226 for c, e in table.iteritems():
3235 for c, e in table.iteritems():
3227 f = c.split("|", 1)[0]
3236 f = c.split("|", 1)[0]
3228 if select and not select(f):
3237 if select and not select(f):
3229 continue
3238 continue
3230 if (not select and name != 'shortlist' and
3239 if (not select and name != 'shortlist' and
3231 e[0].__module__ != __name__):
3240 e[0].__module__ != __name__):
3232 continue
3241 continue
3233 if name == "shortlist" and not f.startswith("^"):
3242 if name == "shortlist" and not f.startswith("^"):
3234 continue
3243 continue
3235 f = f.lstrip("^")
3244 f = f.lstrip("^")
3236 if not ui.debugflag and f.startswith("debug"):
3245 if not ui.debugflag and f.startswith("debug"):
3237 continue
3246 continue
3238 doc = e[0].__doc__
3247 doc = e[0].__doc__
3239 if doc and 'DEPRECATED' in doc and not ui.verbose:
3248 if doc and 'DEPRECATED' in doc and not ui.verbose:
3240 continue
3249 continue
3241 doc = gettext(doc)
3250 doc = gettext(doc)
3242 if not doc:
3251 if not doc:
3243 doc = _("(no help text available)")
3252 doc = _("(no help text available)")
3244 h[f] = doc.splitlines()[0].rstrip()
3253 h[f] = doc.splitlines()[0].rstrip()
3245 cmds[f] = c.lstrip("^")
3254 cmds[f] = c.lstrip("^")
3246
3255
3247 if not h:
3256 if not h:
3248 ui.status(_('no commands defined\n'))
3257 ui.status(_('no commands defined\n'))
3249 return
3258 return
3250
3259
3251 ui.status(header)
3260 ui.status(header)
3252 fns = sorted(h)
3261 fns = sorted(h)
3253 m = max(map(len, fns))
3262 m = max(map(len, fns))
3254 for f in fns:
3263 for f in fns:
3255 if ui.verbose:
3264 if ui.verbose:
3256 commands = cmds[f].replace("|",", ")
3265 commands = cmds[f].replace("|",", ")
3257 ui.write(" %s:\n %s\n"%(commands, h[f]))
3266 ui.write(" %s:\n %s\n"%(commands, h[f]))
3258 else:
3267 else:
3259 ui.write('%s\n' % (util.wrap(h[f], textwidth,
3268 ui.write('%s\n' % (util.wrap(h[f], textwidth,
3260 initindent=' %-*s ' % (m, f),
3269 initindent=' %-*s ' % (m, f),
3261 hangindent=' ' * (m + 4))))
3270 hangindent=' ' * (m + 4))))
3262
3271
3263 if not name:
3272 if not name:
3264 text = help.listexts(_('enabled extensions:'), extensions.enabled())
3273 text = help.listexts(_('enabled extensions:'), extensions.enabled())
3265 if text:
3274 if text:
3266 ui.write("\n%s" % minirst.format(text, textwidth))
3275 ui.write("\n%s" % minirst.format(text, textwidth))
3267
3276
3268 ui.write(_("\nadditional help topics:\n\n"))
3277 ui.write(_("\nadditional help topics:\n\n"))
3269 topics = []
3278 topics = []
3270 for names, header, doc in help.helptable:
3279 for names, header, doc in help.helptable:
3271 topics.append((sorted(names, key=len, reverse=True)[0], header))
3280 topics.append((sorted(names, key=len, reverse=True)[0], header))
3272 topics_len = max([len(s[0]) for s in topics])
3281 topics_len = max([len(s[0]) for s in topics])
3273 for t, desc in topics:
3282 for t, desc in topics:
3274 ui.write(" %-*s %s\n" % (topics_len, t, desc))
3283 ui.write(" %-*s %s\n" % (topics_len, t, desc))
3275
3284
3276 optlist = []
3285 optlist = []
3277 addglobalopts(optlist, True)
3286 addglobalopts(optlist, True)
3278 ui.write(opttext(optlist, textwidth))
3287 ui.write(opttext(optlist, textwidth))
3279
3288
3280 def helptopic(name):
3289 def helptopic(name):
3281 for names, header, doc in help.helptable:
3290 for names, header, doc in help.helptable:
3282 if name in names:
3291 if name in names:
3283 break
3292 break
3284 else:
3293 else:
3285 raise error.UnknownCommand(name)
3294 raise error.UnknownCommand(name)
3286
3295
3287 # description
3296 # description
3288 if not doc:
3297 if not doc:
3289 doc = _("(no help text available)")
3298 doc = _("(no help text available)")
3290 if util.safehasattr(doc, '__call__'):
3299 if util.safehasattr(doc, '__call__'):
3291 doc = doc()
3300 doc = doc()
3292
3301
3293 ui.write("%s\n\n" % header)
3302 ui.write("%s\n\n" % header)
3294 ui.write("%s" % minirst.format(doc, textwidth, indent=4))
3303 ui.write("%s" % minirst.format(doc, textwidth, indent=4))
3295 try:
3304 try:
3296 cmdutil.findcmd(name, table)
3305 cmdutil.findcmd(name, table)
3297 ui.write(_('\nuse "hg help -c %s" to see help for '
3306 ui.write(_('\nuse "hg help -c %s" to see help for '
3298 'the %s command\n') % (name, name))
3307 'the %s command\n') % (name, name))
3299 except error.UnknownCommand:
3308 except error.UnknownCommand:
3300 pass
3309 pass
3301
3310
3302 def helpext(name):
3311 def helpext(name):
3303 try:
3312 try:
3304 mod = extensions.find(name)
3313 mod = extensions.find(name)
3305 doc = gettext(mod.__doc__) or _('no help text available')
3314 doc = gettext(mod.__doc__) or _('no help text available')
3306 except KeyError:
3315 except KeyError:
3307 mod = None
3316 mod = None
3308 doc = extensions.disabledext(name)
3317 doc = extensions.disabledext(name)
3309 if not doc:
3318 if not doc:
3310 raise error.UnknownCommand(name)
3319 raise error.UnknownCommand(name)
3311
3320
3312 if '\n' not in doc:
3321 if '\n' not in doc:
3313 head, tail = doc, ""
3322 head, tail = doc, ""
3314 else:
3323 else:
3315 head, tail = doc.split('\n', 1)
3324 head, tail = doc.split('\n', 1)
3316 ui.write(_('%s extension - %s\n\n') % (name.split('.')[-1], head))
3325 ui.write(_('%s extension - %s\n\n') % (name.split('.')[-1], head))
3317 if tail:
3326 if tail:
3318 ui.write(minirst.format(tail, textwidth))
3327 ui.write(minirst.format(tail, textwidth))
3319 ui.status('\n')
3328 ui.status('\n')
3320
3329
3321 if mod:
3330 if mod:
3322 try:
3331 try:
3323 ct = mod.cmdtable
3332 ct = mod.cmdtable
3324 except AttributeError:
3333 except AttributeError:
3325 ct = {}
3334 ct = {}
3326 modcmds = set([c.split('|', 1)[0] for c in ct])
3335 modcmds = set([c.split('|', 1)[0] for c in ct])
3327 helplist(modcmds.__contains__)
3336 helplist(modcmds.__contains__)
3328 else:
3337 else:
3329 ui.write(_('use "hg help extensions" for information on enabling '
3338 ui.write(_('use "hg help extensions" for information on enabling '
3330 'extensions\n'))
3339 'extensions\n'))
3331
3340
3332 def helpextcmd(name):
3341 def helpextcmd(name):
3333 cmd, ext, mod = extensions.disabledcmd(ui, name,
3342 cmd, ext, mod = extensions.disabledcmd(ui, name,
3334 ui.configbool('ui', 'strict'))
3343 ui.configbool('ui', 'strict'))
3335 doc = gettext(mod.__doc__).splitlines()[0]
3344 doc = gettext(mod.__doc__).splitlines()[0]
3336
3345
3337 msg = help.listexts(_("'%s' is provided by the following "
3346 msg = help.listexts(_("'%s' is provided by the following "
3338 "extension:") % cmd, {ext: doc}, indent=4)
3347 "extension:") % cmd, {ext: doc}, indent=4)
3339 ui.write(minirst.format(msg, textwidth))
3348 ui.write(minirst.format(msg, textwidth))
3340 ui.write('\n')
3349 ui.write('\n')
3341 ui.write(_('use "hg help extensions" for information on enabling '
3350 ui.write(_('use "hg help extensions" for information on enabling '
3342 'extensions\n'))
3351 'extensions\n'))
3343
3352
3344 if name and name != 'shortlist':
3353 if name and name != 'shortlist':
3345 i = None
3354 i = None
3346 if unknowncmd:
3355 if unknowncmd:
3347 queries = (helpextcmd,)
3356 queries = (helpextcmd,)
3348 elif opts.get('extension'):
3357 elif opts.get('extension'):
3349 queries = (helpext,)
3358 queries = (helpext,)
3350 elif opts.get('command'):
3359 elif opts.get('command'):
3351 queries = (helpcmd,)
3360 queries = (helpcmd,)
3352 else:
3361 else:
3353 queries = (helptopic, helpcmd, helpext, helpextcmd)
3362 queries = (helptopic, helpcmd, helpext, helpextcmd)
3354 for f in queries:
3363 for f in queries:
3355 try:
3364 try:
3356 f(name)
3365 f(name)
3357 i = None
3366 i = None
3358 break
3367 break
3359 except error.UnknownCommand, inst:
3368 except error.UnknownCommand, inst:
3360 i = inst
3369 i = inst
3361 if i:
3370 if i:
3362 raise i
3371 raise i
3363 else:
3372 else:
3364 # program name
3373 # program name
3365 ui.status(_("Mercurial Distributed SCM\n"))
3374 ui.status(_("Mercurial Distributed SCM\n"))
3366 ui.status('\n')
3375 ui.status('\n')
3367 helplist()
3376 helplist()
3368
3377
3369
3378
3370 @command('identify|id',
3379 @command('identify|id',
3371 [('r', 'rev', '',
3380 [('r', 'rev', '',
3372 _('identify the specified revision'), _('REV')),
3381 _('identify the specified revision'), _('REV')),
3373 ('n', 'num', None, _('show local revision number')),
3382 ('n', 'num', None, _('show local revision number')),
3374 ('i', 'id', None, _('show global revision id')),
3383 ('i', 'id', None, _('show global revision id')),
3375 ('b', 'branch', None, _('show branch')),
3384 ('b', 'branch', None, _('show branch')),
3376 ('t', 'tags', None, _('show tags')),
3385 ('t', 'tags', None, _('show tags')),
3377 ('B', 'bookmarks', None, _('show bookmarks')),
3386 ('B', 'bookmarks', None, _('show bookmarks')),
3378 ] + remoteopts,
3387 ] + remoteopts,
3379 _('[-nibtB] [-r REV] [SOURCE]'))
3388 _('[-nibtB] [-r REV] [SOURCE]'))
3380 def identify(ui, repo, source=None, rev=None,
3389 def identify(ui, repo, source=None, rev=None,
3381 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
3390 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
3382 """identify the working copy or specified revision
3391 """identify the working copy or specified revision
3383
3392
3384 Print a summary identifying the repository state at REV using one or
3393 Print a summary identifying the repository state at REV using one or
3385 two parent hash identifiers, followed by a "+" if the working
3394 two parent hash identifiers, followed by a "+" if the working
3386 directory has uncommitted changes, the branch name (if not default),
3395 directory has uncommitted changes, the branch name (if not default),
3387 a list of tags, and a list of bookmarks.
3396 a list of tags, and a list of bookmarks.
3388
3397
3389 When REV is not given, print a summary of the current state of the
3398 When REV is not given, print a summary of the current state of the
3390 repository.
3399 repository.
3391
3400
3392 Specifying a path to a repository root or Mercurial bundle will
3401 Specifying a path to a repository root or Mercurial bundle will
3393 cause lookup to operate on that repository/bundle.
3402 cause lookup to operate on that repository/bundle.
3394
3403
3395 .. container:: verbose
3404 .. container:: verbose
3396
3405
3397 Examples:
3406 Examples:
3398
3407
3399 - generate a build identifier for the working directory::
3408 - generate a build identifier for the working directory::
3400
3409
3401 hg id --id > build-id.dat
3410 hg id --id > build-id.dat
3402
3411
3403 - find the revision corresponding to a tag::
3412 - find the revision corresponding to a tag::
3404
3413
3405 hg id -n -r 1.3
3414 hg id -n -r 1.3
3406
3415
3407 - check the most recent revision of a remote repository::
3416 - check the most recent revision of a remote repository::
3408
3417
3409 hg id -r tip http://selenic.com/hg/
3418 hg id -r tip http://selenic.com/hg/
3410
3419
3411 Returns 0 if successful.
3420 Returns 0 if successful.
3412 """
3421 """
3413
3422
3414 if not repo and not source:
3423 if not repo and not source:
3415 raise util.Abort(_("there is no Mercurial repository here "
3424 raise util.Abort(_("there is no Mercurial repository here "
3416 "(.hg not found)"))
3425 "(.hg not found)"))
3417
3426
3418 hexfunc = ui.debugflag and hex or short
3427 hexfunc = ui.debugflag and hex or short
3419 default = not (num or id or branch or tags or bookmarks)
3428 default = not (num or id or branch or tags or bookmarks)
3420 output = []
3429 output = []
3421 revs = []
3430 revs = []
3422
3431
3423 if source:
3432 if source:
3424 source, branches = hg.parseurl(ui.expandpath(source))
3433 source, branches = hg.parseurl(ui.expandpath(source))
3425 repo = hg.peer(ui, opts, source)
3434 repo = hg.peer(ui, opts, source)
3426 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
3435 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
3427
3436
3428 if not repo.local():
3437 if not repo.local():
3429 if num or branch or tags:
3438 if num or branch or tags:
3430 raise util.Abort(
3439 raise util.Abort(
3431 _("can't query remote revision number, branch, or tags"))
3440 _("can't query remote revision number, branch, or tags"))
3432 if not rev and revs:
3441 if not rev and revs:
3433 rev = revs[0]
3442 rev = revs[0]
3434 if not rev:
3443 if not rev:
3435 rev = "tip"
3444 rev = "tip"
3436
3445
3437 remoterev = repo.lookup(rev)
3446 remoterev = repo.lookup(rev)
3438 if default or id:
3447 if default or id:
3439 output = [hexfunc(remoterev)]
3448 output = [hexfunc(remoterev)]
3440
3449
3441 def getbms():
3450 def getbms():
3442 bms = []
3451 bms = []
3443
3452
3444 if 'bookmarks' in repo.listkeys('namespaces'):
3453 if 'bookmarks' in repo.listkeys('namespaces'):
3445 hexremoterev = hex(remoterev)
3454 hexremoterev = hex(remoterev)
3446 bms = [bm for bm, bmr in repo.listkeys('bookmarks').iteritems()
3455 bms = [bm for bm, bmr in repo.listkeys('bookmarks').iteritems()
3447 if bmr == hexremoterev]
3456 if bmr == hexremoterev]
3448
3457
3449 return bms
3458 return bms
3450
3459
3451 if bookmarks:
3460 if bookmarks:
3452 output.extend(getbms())
3461 output.extend(getbms())
3453 elif default and not ui.quiet:
3462 elif default and not ui.quiet:
3454 # multiple bookmarks for a single parent separated by '/'
3463 # multiple bookmarks for a single parent separated by '/'
3455 bm = '/'.join(getbms())
3464 bm = '/'.join(getbms())
3456 if bm:
3465 if bm:
3457 output.append(bm)
3466 output.append(bm)
3458 else:
3467 else:
3459 if not rev:
3468 if not rev:
3460 ctx = repo[None]
3469 ctx = repo[None]
3461 parents = ctx.parents()
3470 parents = ctx.parents()
3462 changed = ""
3471 changed = ""
3463 if default or id or num:
3472 if default or id or num:
3464 changed = util.any(repo.status()) and "+" or ""
3473 changed = util.any(repo.status()) and "+" or ""
3465 if default or id:
3474 if default or id:
3466 output = ["%s%s" %
3475 output = ["%s%s" %
3467 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
3476 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
3468 if num:
3477 if num:
3469 output.append("%s%s" %
3478 output.append("%s%s" %
3470 ('+'.join([str(p.rev()) for p in parents]), changed))
3479 ('+'.join([str(p.rev()) for p in parents]), changed))
3471 else:
3480 else:
3472 ctx = scmutil.revsingle(repo, rev)
3481 ctx = scmutil.revsingle(repo, rev)
3473 if default or id:
3482 if default or id:
3474 output = [hexfunc(ctx.node())]
3483 output = [hexfunc(ctx.node())]
3475 if num:
3484 if num:
3476 output.append(str(ctx.rev()))
3485 output.append(str(ctx.rev()))
3477
3486
3478 if default and not ui.quiet:
3487 if default and not ui.quiet:
3479 b = ctx.branch()
3488 b = ctx.branch()
3480 if b != 'default':
3489 if b != 'default':
3481 output.append("(%s)" % b)
3490 output.append("(%s)" % b)
3482
3491
3483 # multiple tags for a single parent separated by '/'
3492 # multiple tags for a single parent separated by '/'
3484 t = '/'.join(ctx.tags())
3493 t = '/'.join(ctx.tags())
3485 if t:
3494 if t:
3486 output.append(t)
3495 output.append(t)
3487
3496
3488 # multiple bookmarks for a single parent separated by '/'
3497 # multiple bookmarks for a single parent separated by '/'
3489 bm = '/'.join(ctx.bookmarks())
3498 bm = '/'.join(ctx.bookmarks())
3490 if bm:
3499 if bm:
3491 output.append(bm)
3500 output.append(bm)
3492 else:
3501 else:
3493 if branch:
3502 if branch:
3494 output.append(ctx.branch())
3503 output.append(ctx.branch())
3495
3504
3496 if tags:
3505 if tags:
3497 output.extend(ctx.tags())
3506 output.extend(ctx.tags())
3498
3507
3499 if bookmarks:
3508 if bookmarks:
3500 output.extend(ctx.bookmarks())
3509 output.extend(ctx.bookmarks())
3501
3510
3502 ui.write("%s\n" % ' '.join(output))
3511 ui.write("%s\n" % ' '.join(output))
3503
3512
3504 @command('import|patch',
3513 @command('import|patch',
3505 [('p', 'strip', 1,
3514 [('p', 'strip', 1,
3506 _('directory strip option for patch. This has the same '
3515 _('directory strip option for patch. This has the same '
3507 'meaning as the corresponding patch option'), _('NUM')),
3516 'meaning as the corresponding patch option'), _('NUM')),
3508 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
3517 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
3509 ('e', 'edit', False, _('invoke editor on commit messages')),
3518 ('e', 'edit', False, _('invoke editor on commit messages')),
3510 ('f', 'force', None, _('skip check for outstanding uncommitted changes')),
3519 ('f', 'force', None, _('skip check for outstanding uncommitted changes')),
3511 ('', 'no-commit', None,
3520 ('', 'no-commit', None,
3512 _("don't commit, just update the working directory")),
3521 _("don't commit, just update the working directory")),
3513 ('', 'bypass', None,
3522 ('', 'bypass', None,
3514 _("apply patch without touching the working directory")),
3523 _("apply patch without touching the working directory")),
3515 ('', 'exact', None,
3524 ('', 'exact', None,
3516 _('apply patch to the nodes from which it was generated')),
3525 _('apply patch to the nodes from which it was generated')),
3517 ('', 'import-branch', None,
3526 ('', 'import-branch', None,
3518 _('use any branch information in patch (implied by --exact)'))] +
3527 _('use any branch information in patch (implied by --exact)'))] +
3519 commitopts + commitopts2 + similarityopts,
3528 commitopts + commitopts2 + similarityopts,
3520 _('[OPTION]... PATCH...'))
3529 _('[OPTION]... PATCH...'))
3521 def import_(ui, repo, patch1=None, *patches, **opts):
3530 def import_(ui, repo, patch1=None, *patches, **opts):
3522 """import an ordered set of patches
3531 """import an ordered set of patches
3523
3532
3524 Import a list of patches and commit them individually (unless
3533 Import a list of patches and commit them individually (unless
3525 --no-commit is specified).
3534 --no-commit is specified).
3526
3535
3527 If there are outstanding changes in the working directory, import
3536 If there are outstanding changes in the working directory, import
3528 will abort unless given the -f/--force flag.
3537 will abort unless given the -f/--force flag.
3529
3538
3530 You can import a patch straight from a mail message. Even patches
3539 You can import a patch straight from a mail message. Even patches
3531 as attachments work (to use the body part, it must have type
3540 as attachments work (to use the body part, it must have type
3532 text/plain or text/x-patch). From and Subject headers of email
3541 text/plain or text/x-patch). From and Subject headers of email
3533 message are used as default committer and commit message. All
3542 message are used as default committer and commit message. All
3534 text/plain body parts before first diff are added to commit
3543 text/plain body parts before first diff are added to commit
3535 message.
3544 message.
3536
3545
3537 If the imported patch was generated by :hg:`export`, user and
3546 If the imported patch was generated by :hg:`export`, user and
3538 description from patch override values from message headers and
3547 description from patch override values from message headers and
3539 body. Values given on command line with -m/--message and -u/--user
3548 body. Values given on command line with -m/--message and -u/--user
3540 override these.
3549 override these.
3541
3550
3542 If --exact is specified, import will set the working directory to
3551 If --exact is specified, import will set the working directory to
3543 the parent of each patch before applying it, and will abort if the
3552 the parent of each patch before applying it, and will abort if the
3544 resulting changeset has a different ID than the one recorded in
3553 resulting changeset has a different ID than the one recorded in
3545 the patch. This may happen due to character set problems or other
3554 the patch. This may happen due to character set problems or other
3546 deficiencies in the text patch format.
3555 deficiencies in the text patch format.
3547
3556
3548 Use --bypass to apply and commit patches directly to the
3557 Use --bypass to apply and commit patches directly to the
3549 repository, not touching the working directory. Without --exact,
3558 repository, not touching the working directory. Without --exact,
3550 patches will be applied on top of the working directory parent
3559 patches will be applied on top of the working directory parent
3551 revision.
3560 revision.
3552
3561
3553 With -s/--similarity, hg will attempt to discover renames and
3562 With -s/--similarity, hg will attempt to discover renames and
3554 copies in the patch in the same way as :hg:`addremove`.
3563 copies in the patch in the same way as :hg:`addremove`.
3555
3564
3556 To read a patch from standard input, use "-" as the patch name. If
3565 To read a patch from standard input, use "-" as the patch name. If
3557 a URL is specified, the patch will be downloaded from it.
3566 a URL is specified, the patch will be downloaded from it.
3558 See :hg:`help dates` for a list of formats valid for -d/--date.
3567 See :hg:`help dates` for a list of formats valid for -d/--date.
3559
3568
3560 .. container:: verbose
3569 .. container:: verbose
3561
3570
3562 Examples:
3571 Examples:
3563
3572
3564 - import a traditional patch from a website and detect renames::
3573 - import a traditional patch from a website and detect renames::
3565
3574
3566 hg import -s 80 http://example.com/bugfix.patch
3575 hg import -s 80 http://example.com/bugfix.patch
3567
3576
3568 - import a changeset from an hgweb server::
3577 - import a changeset from an hgweb server::
3569
3578
3570 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
3579 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
3571
3580
3572 - import all the patches in an Unix-style mbox::
3581 - import all the patches in an Unix-style mbox::
3573
3582
3574 hg import incoming-patches.mbox
3583 hg import incoming-patches.mbox
3575
3584
3576 - attempt to exactly restore an exported changeset (not always
3585 - attempt to exactly restore an exported changeset (not always
3577 possible)::
3586 possible)::
3578
3587
3579 hg import --exact proposed-fix.patch
3588 hg import --exact proposed-fix.patch
3580
3589
3581 Returns 0 on success.
3590 Returns 0 on success.
3582 """
3591 """
3583
3592
3584 if not patch1:
3593 if not patch1:
3585 raise util.Abort(_('need at least one patch to import'))
3594 raise util.Abort(_('need at least one patch to import'))
3586
3595
3587 patches = (patch1,) + patches
3596 patches = (patch1,) + patches
3588
3597
3589 date = opts.get('date')
3598 date = opts.get('date')
3590 if date:
3599 if date:
3591 opts['date'] = util.parsedate(date)
3600 opts['date'] = util.parsedate(date)
3592
3601
3593 editor = cmdutil.commiteditor
3602 editor = cmdutil.commiteditor
3594 if opts.get('edit'):
3603 if opts.get('edit'):
3595 editor = cmdutil.commitforceeditor
3604 editor = cmdutil.commitforceeditor
3596
3605
3597 update = not opts.get('bypass')
3606 update = not opts.get('bypass')
3598 if not update and opts.get('no_commit'):
3607 if not update and opts.get('no_commit'):
3599 raise util.Abort(_('cannot use --no-commit with --bypass'))
3608 raise util.Abort(_('cannot use --no-commit with --bypass'))
3600 try:
3609 try:
3601 sim = float(opts.get('similarity') or 0)
3610 sim = float(opts.get('similarity') or 0)
3602 except ValueError:
3611 except ValueError:
3603 raise util.Abort(_('similarity must be a number'))
3612 raise util.Abort(_('similarity must be a number'))
3604 if sim < 0 or sim > 100:
3613 if sim < 0 or sim > 100:
3605 raise util.Abort(_('similarity must be between 0 and 100'))
3614 raise util.Abort(_('similarity must be between 0 and 100'))
3606 if sim and not update:
3615 if sim and not update:
3607 raise util.Abort(_('cannot use --similarity with --bypass'))
3616 raise util.Abort(_('cannot use --similarity with --bypass'))
3608
3617
3609 if (opts.get('exact') or not opts.get('force')) and update:
3618 if (opts.get('exact') or not opts.get('force')) and update:
3610 cmdutil.bailifchanged(repo)
3619 cmdutil.bailifchanged(repo)
3611
3620
3612 base = opts["base"]
3621 base = opts["base"]
3613 strip = opts["strip"]
3622 strip = opts["strip"]
3614 wlock = lock = tr = None
3623 wlock = lock = tr = None
3615 msgs = []
3624 msgs = []
3616
3625
3617 def checkexact(repo, n, nodeid):
3626 def checkexact(repo, n, nodeid):
3618 if opts.get('exact') and hex(n) != nodeid:
3627 if opts.get('exact') and hex(n) != nodeid:
3619 repo.rollback()
3628 repo.rollback()
3620 raise util.Abort(_('patch is damaged or loses information'))
3629 raise util.Abort(_('patch is damaged or loses information'))
3621
3630
3622 def tryone(ui, hunk, parents):
3631 def tryone(ui, hunk, parents):
3623 tmpname, message, user, date, branch, nodeid, p1, p2 = \
3632 tmpname, message, user, date, branch, nodeid, p1, p2 = \
3624 patch.extract(ui, hunk)
3633 patch.extract(ui, hunk)
3625
3634
3626 if not tmpname:
3635 if not tmpname:
3627 return (None, None)
3636 return (None, None)
3628 msg = _('applied to working directory')
3637 msg = _('applied to working directory')
3629
3638
3630 try:
3639 try:
3631 cmdline_message = cmdutil.logmessage(ui, opts)
3640 cmdline_message = cmdutil.logmessage(ui, opts)
3632 if cmdline_message:
3641 if cmdline_message:
3633 # pickup the cmdline msg
3642 # pickup the cmdline msg
3634 message = cmdline_message
3643 message = cmdline_message
3635 elif message:
3644 elif message:
3636 # pickup the patch msg
3645 # pickup the patch msg
3637 message = message.strip()
3646 message = message.strip()
3638 else:
3647 else:
3639 # launch the editor
3648 # launch the editor
3640 message = None
3649 message = None
3641 ui.debug('message:\n%s\n' % message)
3650 ui.debug('message:\n%s\n' % message)
3642
3651
3643 if len(parents) == 1:
3652 if len(parents) == 1:
3644 parents.append(repo[nullid])
3653 parents.append(repo[nullid])
3645 if opts.get('exact'):
3654 if opts.get('exact'):
3646 if not nodeid or not p1:
3655 if not nodeid or not p1:
3647 raise util.Abort(_('not a Mercurial patch'))
3656 raise util.Abort(_('not a Mercurial patch'))
3648 p1 = repo[p1]
3657 p1 = repo[p1]
3649 p2 = repo[p2 or nullid]
3658 p2 = repo[p2 or nullid]
3650 elif p2:
3659 elif p2:
3651 try:
3660 try:
3652 p1 = repo[p1]
3661 p1 = repo[p1]
3653 p2 = repo[p2]
3662 p2 = repo[p2]
3654 # Without any options, consider p2 only if the
3663 # Without any options, consider p2 only if the
3655 # patch is being applied on top of the recorded
3664 # patch is being applied on top of the recorded
3656 # first parent.
3665 # first parent.
3657 if p1 != parents[0]:
3666 if p1 != parents[0]:
3658 p1 = parents[0]
3667 p1 = parents[0]
3659 p2 = repo[nullid]
3668 p2 = repo[nullid]
3660 except error.RepoError:
3669 except error.RepoError:
3661 p1, p2 = parents
3670 p1, p2 = parents
3662 else:
3671 else:
3663 p1, p2 = parents
3672 p1, p2 = parents
3664
3673
3665 n = None
3674 n = None
3666 if update:
3675 if update:
3667 if p1 != parents[0]:
3676 if p1 != parents[0]:
3668 hg.clean(repo, p1.node())
3677 hg.clean(repo, p1.node())
3669 if p2 != parents[1]:
3678 if p2 != parents[1]:
3670 repo.setparents(p1.node(), p2.node())
3679 repo.setparents(p1.node(), p2.node())
3671
3680
3672 if opts.get('exact') or opts.get('import_branch'):
3681 if opts.get('exact') or opts.get('import_branch'):
3673 repo.dirstate.setbranch(branch or 'default')
3682 repo.dirstate.setbranch(branch or 'default')
3674
3683
3675 files = set()
3684 files = set()
3676 patch.patch(ui, repo, tmpname, strip=strip, files=files,
3685 patch.patch(ui, repo, tmpname, strip=strip, files=files,
3677 eolmode=None, similarity=sim / 100.0)
3686 eolmode=None, similarity=sim / 100.0)
3678 files = list(files)
3687 files = list(files)
3679 if opts.get('no_commit'):
3688 if opts.get('no_commit'):
3680 if message:
3689 if message:
3681 msgs.append(message)
3690 msgs.append(message)
3682 else:
3691 else:
3683 if opts.get('exact') or p2:
3692 if opts.get('exact') or p2:
3684 # If you got here, you either use --force and know what
3693 # If you got here, you either use --force and know what
3685 # you are doing or used --exact or a merge patch while
3694 # you are doing or used --exact or a merge patch while
3686 # being updated to its first parent.
3695 # being updated to its first parent.
3687 m = None
3696 m = None
3688 else:
3697 else:
3689 m = scmutil.matchfiles(repo, files or [])
3698 m = scmutil.matchfiles(repo, files or [])
3690 n = repo.commit(message, opts.get('user') or user,
3699 n = repo.commit(message, opts.get('user') or user,
3691 opts.get('date') or date, match=m,
3700 opts.get('date') or date, match=m,
3692 editor=editor)
3701 editor=editor)
3693 checkexact(repo, n, nodeid)
3702 checkexact(repo, n, nodeid)
3694 else:
3703 else:
3695 if opts.get('exact') or opts.get('import_branch'):
3704 if opts.get('exact') or opts.get('import_branch'):
3696 branch = branch or 'default'
3705 branch = branch or 'default'
3697 else:
3706 else:
3698 branch = p1.branch()
3707 branch = p1.branch()
3699 store = patch.filestore()
3708 store = patch.filestore()
3700 try:
3709 try:
3701 files = set()
3710 files = set()
3702 try:
3711 try:
3703 patch.patchrepo(ui, repo, p1, store, tmpname, strip,
3712 patch.patchrepo(ui, repo, p1, store, tmpname, strip,
3704 files, eolmode=None)
3713 files, eolmode=None)
3705 except patch.PatchError, e:
3714 except patch.PatchError, e:
3706 raise util.Abort(str(e))
3715 raise util.Abort(str(e))
3707 memctx = patch.makememctx(repo, (p1.node(), p2.node()),
3716 memctx = patch.makememctx(repo, (p1.node(), p2.node()),
3708 message,
3717 message,
3709 opts.get('user') or user,
3718 opts.get('user') or user,
3710 opts.get('date') or date,
3719 opts.get('date') or date,
3711 branch, files, store,
3720 branch, files, store,
3712 editor=cmdutil.commiteditor)
3721 editor=cmdutil.commiteditor)
3713 repo.savecommitmessage(memctx.description())
3722 repo.savecommitmessage(memctx.description())
3714 n = memctx.commit()
3723 n = memctx.commit()
3715 checkexact(repo, n, nodeid)
3724 checkexact(repo, n, nodeid)
3716 finally:
3725 finally:
3717 store.close()
3726 store.close()
3718 if n:
3727 if n:
3719 # i18n: refers to a short changeset id
3728 # i18n: refers to a short changeset id
3720 msg = _('created %s') % short(n)
3729 msg = _('created %s') % short(n)
3721 return (msg, n)
3730 return (msg, n)
3722 finally:
3731 finally:
3723 os.unlink(tmpname)
3732 os.unlink(tmpname)
3724
3733
3725 try:
3734 try:
3726 try:
3735 try:
3727 wlock = repo.wlock()
3736 wlock = repo.wlock()
3728 if not opts.get('no_commit'):
3737 if not opts.get('no_commit'):
3729 lock = repo.lock()
3738 lock = repo.lock()
3730 tr = repo.transaction('import')
3739 tr = repo.transaction('import')
3731 parents = repo.parents()
3740 parents = repo.parents()
3732 for patchurl in patches:
3741 for patchurl in patches:
3733 if patchurl == '-':
3742 if patchurl == '-':
3734 ui.status(_('applying patch from stdin\n'))
3743 ui.status(_('applying patch from stdin\n'))
3735 patchfile = ui.fin
3744 patchfile = ui.fin
3736 patchurl = 'stdin' # for error message
3745 patchurl = 'stdin' # for error message
3737 else:
3746 else:
3738 patchurl = os.path.join(base, patchurl)
3747 patchurl = os.path.join(base, patchurl)
3739 ui.status(_('applying %s\n') % patchurl)
3748 ui.status(_('applying %s\n') % patchurl)
3740 patchfile = url.open(ui, patchurl)
3749 patchfile = url.open(ui, patchurl)
3741
3750
3742 haspatch = False
3751 haspatch = False
3743 for hunk in patch.split(patchfile):
3752 for hunk in patch.split(patchfile):
3744 (msg, node) = tryone(ui, hunk, parents)
3753 (msg, node) = tryone(ui, hunk, parents)
3745 if msg:
3754 if msg:
3746 haspatch = True
3755 haspatch = True
3747 ui.note(msg + '\n')
3756 ui.note(msg + '\n')
3748 if update or opts.get('exact'):
3757 if update or opts.get('exact'):
3749 parents = repo.parents()
3758 parents = repo.parents()
3750 else:
3759 else:
3751 parents = [repo[node]]
3760 parents = [repo[node]]
3752
3761
3753 if not haspatch:
3762 if not haspatch:
3754 raise util.Abort(_('%s: no diffs found') % patchurl)
3763 raise util.Abort(_('%s: no diffs found') % patchurl)
3755
3764
3756 if tr:
3765 if tr:
3757 tr.close()
3766 tr.close()
3758 if msgs:
3767 if msgs:
3759 repo.savecommitmessage('\n* * *\n'.join(msgs))
3768 repo.savecommitmessage('\n* * *\n'.join(msgs))
3760 except:
3769 except:
3761 # wlock.release() indirectly calls dirstate.write(): since
3770 # wlock.release() indirectly calls dirstate.write(): since
3762 # we're crashing, we do not want to change the working dir
3771 # we're crashing, we do not want to change the working dir
3763 # parent after all, so make sure it writes nothing
3772 # parent after all, so make sure it writes nothing
3764 repo.dirstate.invalidate()
3773 repo.dirstate.invalidate()
3765 raise
3774 raise
3766 finally:
3775 finally:
3767 if tr:
3776 if tr:
3768 tr.release()
3777 tr.release()
3769 release(lock, wlock)
3778 release(lock, wlock)
3770
3779
3771 @command('incoming|in',
3780 @command('incoming|in',
3772 [('f', 'force', None,
3781 [('f', 'force', None,
3773 _('run even if remote repository is unrelated')),
3782 _('run even if remote repository is unrelated')),
3774 ('n', 'newest-first', None, _('show newest record first')),
3783 ('n', 'newest-first', None, _('show newest record first')),
3775 ('', 'bundle', '',
3784 ('', 'bundle', '',
3776 _('file to store the bundles into'), _('FILE')),
3785 _('file to store the bundles into'), _('FILE')),
3777 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3786 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3778 ('B', 'bookmarks', False, _("compare bookmarks")),
3787 ('B', 'bookmarks', False, _("compare bookmarks")),
3779 ('b', 'branch', [],
3788 ('b', 'branch', [],
3780 _('a specific branch you would like to pull'), _('BRANCH')),
3789 _('a specific branch you would like to pull'), _('BRANCH')),
3781 ] + logopts + remoteopts + subrepoopts,
3790 ] + logopts + remoteopts + subrepoopts,
3782 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3791 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3783 def incoming(ui, repo, source="default", **opts):
3792 def incoming(ui, repo, source="default", **opts):
3784 """show new changesets found in source
3793 """show new changesets found in source
3785
3794
3786 Show new changesets found in the specified path/URL or the default
3795 Show new changesets found in the specified path/URL or the default
3787 pull location. These are the changesets that would have been pulled
3796 pull location. These are the changesets that would have been pulled
3788 if a pull at the time you issued this command.
3797 if a pull at the time you issued this command.
3789
3798
3790 For remote repository, using --bundle avoids downloading the
3799 For remote repository, using --bundle avoids downloading the
3791 changesets twice if the incoming is followed by a pull.
3800 changesets twice if the incoming is followed by a pull.
3792
3801
3793 See pull for valid source format details.
3802 See pull for valid source format details.
3794
3803
3795 Returns 0 if there are incoming changes, 1 otherwise.
3804 Returns 0 if there are incoming changes, 1 otherwise.
3796 """
3805 """
3797 if opts.get('bundle') and opts.get('subrepos'):
3806 if opts.get('bundle') and opts.get('subrepos'):
3798 raise util.Abort(_('cannot combine --bundle and --subrepos'))
3807 raise util.Abort(_('cannot combine --bundle and --subrepos'))
3799
3808
3800 if opts.get('bookmarks'):
3809 if opts.get('bookmarks'):
3801 source, branches = hg.parseurl(ui.expandpath(source),
3810 source, branches = hg.parseurl(ui.expandpath(source),
3802 opts.get('branch'))
3811 opts.get('branch'))
3803 other = hg.peer(repo, opts, source)
3812 other = hg.peer(repo, opts, source)
3804 if 'bookmarks' not in other.listkeys('namespaces'):
3813 if 'bookmarks' not in other.listkeys('namespaces'):
3805 ui.warn(_("remote doesn't support bookmarks\n"))
3814 ui.warn(_("remote doesn't support bookmarks\n"))
3806 return 0
3815 return 0
3807 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3816 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3808 return bookmarks.diff(ui, repo, other)
3817 return bookmarks.diff(ui, repo, other)
3809
3818
3810 repo._subtoppath = ui.expandpath(source)
3819 repo._subtoppath = ui.expandpath(source)
3811 try:
3820 try:
3812 return hg.incoming(ui, repo, source, opts)
3821 return hg.incoming(ui, repo, source, opts)
3813 finally:
3822 finally:
3814 del repo._subtoppath
3823 del repo._subtoppath
3815
3824
3816
3825
3817 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'))
3826 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'))
3818 def init(ui, dest=".", **opts):
3827 def init(ui, dest=".", **opts):
3819 """create a new repository in the given directory
3828 """create a new repository in the given directory
3820
3829
3821 Initialize a new repository in the given directory. If the given
3830 Initialize a new repository in the given directory. If the given
3822 directory does not exist, it will be created.
3831 directory does not exist, it will be created.
3823
3832
3824 If no directory is given, the current directory is used.
3833 If no directory is given, the current directory is used.
3825
3834
3826 It is possible to specify an ``ssh://`` URL as the destination.
3835 It is possible to specify an ``ssh://`` URL as the destination.
3827 See :hg:`help urls` for more information.
3836 See :hg:`help urls` for more information.
3828
3837
3829 Returns 0 on success.
3838 Returns 0 on success.
3830 """
3839 """
3831 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3840 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3832
3841
3833 @command('locate',
3842 @command('locate',
3834 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3843 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3835 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3844 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3836 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3845 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3837 ] + walkopts,
3846 ] + walkopts,
3838 _('[OPTION]... [PATTERN]...'))
3847 _('[OPTION]... [PATTERN]...'))
3839 def locate(ui, repo, *pats, **opts):
3848 def locate(ui, repo, *pats, **opts):
3840 """locate files matching specific patterns
3849 """locate files matching specific patterns
3841
3850
3842 Print files under Mercurial control in the working directory whose
3851 Print files under Mercurial control in the working directory whose
3843 names match the given patterns.
3852 names match the given patterns.
3844
3853
3845 By default, this command searches all directories in the working
3854 By default, this command searches all directories in the working
3846 directory. To search just the current directory and its
3855 directory. To search just the current directory and its
3847 subdirectories, use "--include .".
3856 subdirectories, use "--include .".
3848
3857
3849 If no patterns are given to match, this command prints the names
3858 If no patterns are given to match, this command prints the names
3850 of all files under Mercurial control in the working directory.
3859 of all files under Mercurial control in the working directory.
3851
3860
3852 If you want to feed the output of this command into the "xargs"
3861 If you want to feed the output of this command into the "xargs"
3853 command, use the -0 option to both this command and "xargs". This
3862 command, use the -0 option to both this command and "xargs". This
3854 will avoid the problem of "xargs" treating single filenames that
3863 will avoid the problem of "xargs" treating single filenames that
3855 contain whitespace as multiple filenames.
3864 contain whitespace as multiple filenames.
3856
3865
3857 Returns 0 if a match is found, 1 otherwise.
3866 Returns 0 if a match is found, 1 otherwise.
3858 """
3867 """
3859 end = opts.get('print0') and '\0' or '\n'
3868 end = opts.get('print0') and '\0' or '\n'
3860 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3869 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3861
3870
3862 ret = 1
3871 ret = 1
3863 m = scmutil.match(repo[rev], pats, opts, default='relglob')
3872 m = scmutil.match(repo[rev], pats, opts, default='relglob')
3864 m.bad = lambda x, y: False
3873 m.bad = lambda x, y: False
3865 for abs in repo[rev].walk(m):
3874 for abs in repo[rev].walk(m):
3866 if not rev and abs not in repo.dirstate:
3875 if not rev and abs not in repo.dirstate:
3867 continue
3876 continue
3868 if opts.get('fullpath'):
3877 if opts.get('fullpath'):
3869 ui.write(repo.wjoin(abs), end)
3878 ui.write(repo.wjoin(abs), end)
3870 else:
3879 else:
3871 ui.write(((pats and m.rel(abs)) or abs), end)
3880 ui.write(((pats and m.rel(abs)) or abs), end)
3872 ret = 0
3881 ret = 0
3873
3882
3874 return ret
3883 return ret
3875
3884
3876 @command('^log|history',
3885 @command('^log|history',
3877 [('f', 'follow', None,
3886 [('f', 'follow', None,
3878 _('follow changeset history, or file history across copies and renames')),
3887 _('follow changeset history, or file history across copies and renames')),
3879 ('', 'follow-first', None,
3888 ('', 'follow-first', None,
3880 _('only follow the first parent of merge changesets (DEPRECATED)')),
3889 _('only follow the first parent of merge changesets (DEPRECATED)')),
3881 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3890 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3882 ('C', 'copies', None, _('show copied files')),
3891 ('C', 'copies', None, _('show copied files')),
3883 ('k', 'keyword', [],
3892 ('k', 'keyword', [],
3884 _('do case-insensitive search for a given text'), _('TEXT')),
3893 _('do case-insensitive search for a given text'), _('TEXT')),
3885 ('r', 'rev', [], _('show the specified revision or range'), _('REV')),
3894 ('r', 'rev', [], _('show the specified revision or range'), _('REV')),
3886 ('', 'removed', None, _('include revisions where files were removed')),
3895 ('', 'removed', None, _('include revisions where files were removed')),
3887 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3896 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3888 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3897 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3889 ('', 'only-branch', [],
3898 ('', 'only-branch', [],
3890 _('show only changesets within the given named branch (DEPRECATED)'),
3899 _('show only changesets within the given named branch (DEPRECATED)'),
3891 _('BRANCH')),
3900 _('BRANCH')),
3892 ('b', 'branch', [],
3901 ('b', 'branch', [],
3893 _('show changesets within the given named branch'), _('BRANCH')),
3902 _('show changesets within the given named branch'), _('BRANCH')),
3894 ('P', 'prune', [],
3903 ('P', 'prune', [],
3895 _('do not display revision or any of its ancestors'), _('REV')),
3904 _('do not display revision or any of its ancestors'), _('REV')),
3896 ('', 'hidden', False, _('show hidden changesets (DEPRECATED)')),
3905 ('', 'hidden', False, _('show hidden changesets (DEPRECATED)')),
3897 ] + logopts + walkopts,
3906 ] + logopts + walkopts,
3898 _('[OPTION]... [FILE]'))
3907 _('[OPTION]... [FILE]'))
3899 def log(ui, repo, *pats, **opts):
3908 def log(ui, repo, *pats, **opts):
3900 """show revision history of entire repository or files
3909 """show revision history of entire repository or files
3901
3910
3902 Print the revision history of the specified files or the entire
3911 Print the revision history of the specified files or the entire
3903 project.
3912 project.
3904
3913
3905 If no revision range is specified, the default is ``tip:0`` unless
3914 If no revision range is specified, the default is ``tip:0`` unless
3906 --follow is set, in which case the working directory parent is
3915 --follow is set, in which case the working directory parent is
3907 used as the starting revision.
3916 used as the starting revision.
3908
3917
3909 File history is shown without following rename or copy history of
3918 File history is shown without following rename or copy history of
3910 files. Use -f/--follow with a filename to follow history across
3919 files. Use -f/--follow with a filename to follow history across
3911 renames and copies. --follow without a filename will only show
3920 renames and copies. --follow without a filename will only show
3912 ancestors or descendants of the starting revision.
3921 ancestors or descendants of the starting revision.
3913
3922
3914 By default this command prints revision number and changeset id,
3923 By default this command prints revision number and changeset id,
3915 tags, non-trivial parents, user, date and time, and a summary for
3924 tags, non-trivial parents, user, date and time, and a summary for
3916 each commit. When the -v/--verbose switch is used, the list of
3925 each commit. When the -v/--verbose switch is used, the list of
3917 changed files and full commit message are shown.
3926 changed files and full commit message are shown.
3918
3927
3919 .. note::
3928 .. note::
3920 log -p/--patch may generate unexpected diff output for merge
3929 log -p/--patch may generate unexpected diff output for merge
3921 changesets, as it will only compare the merge changeset against
3930 changesets, as it will only compare the merge changeset against
3922 its first parent. Also, only files different from BOTH parents
3931 its first parent. Also, only files different from BOTH parents
3923 will appear in files:.
3932 will appear in files:.
3924
3933
3925 .. note::
3934 .. note::
3926 for performance reasons, log FILE may omit duplicate changes
3935 for performance reasons, log FILE may omit duplicate changes
3927 made on branches and will not show deletions. To see all
3936 made on branches and will not show deletions. To see all
3928 changes including duplicates and deletions, use the --removed
3937 changes including duplicates and deletions, use the --removed
3929 switch.
3938 switch.
3930
3939
3931 .. container:: verbose
3940 .. container:: verbose
3932
3941
3933 Some examples:
3942 Some examples:
3934
3943
3935 - changesets with full descriptions and file lists::
3944 - changesets with full descriptions and file lists::
3936
3945
3937 hg log -v
3946 hg log -v
3938
3947
3939 - changesets ancestral to the working directory::
3948 - changesets ancestral to the working directory::
3940
3949
3941 hg log -f
3950 hg log -f
3942
3951
3943 - last 10 commits on the current branch::
3952 - last 10 commits on the current branch::
3944
3953
3945 hg log -l 10 -b .
3954 hg log -l 10 -b .
3946
3955
3947 - changesets showing all modifications of a file, including removals::
3956 - changesets showing all modifications of a file, including removals::
3948
3957
3949 hg log --removed file.c
3958 hg log --removed file.c
3950
3959
3951 - all changesets that touch a directory, with diffs, excluding merges::
3960 - all changesets that touch a directory, with diffs, excluding merges::
3952
3961
3953 hg log -Mp lib/
3962 hg log -Mp lib/
3954
3963
3955 - all revision numbers that match a keyword::
3964 - all revision numbers that match a keyword::
3956
3965
3957 hg log -k bug --template "{rev}\\n"
3966 hg log -k bug --template "{rev}\\n"
3958
3967
3959 - check if a given changeset is included is a tagged release::
3968 - check if a given changeset is included is a tagged release::
3960
3969
3961 hg log -r "a21ccf and ancestor(1.9)"
3970 hg log -r "a21ccf and ancestor(1.9)"
3962
3971
3963 - find all changesets by some user in a date range::
3972 - find all changesets by some user in a date range::
3964
3973
3965 hg log -k alice -d "may 2008 to jul 2008"
3974 hg log -k alice -d "may 2008 to jul 2008"
3966
3975
3967 - summary of all changesets after the last tag::
3976 - summary of all changesets after the last tag::
3968
3977
3969 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3978 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
3970
3979
3971 See :hg:`help dates` for a list of formats valid for -d/--date.
3980 See :hg:`help dates` for a list of formats valid for -d/--date.
3972
3981
3973 See :hg:`help revisions` and :hg:`help revsets` for more about
3982 See :hg:`help revisions` and :hg:`help revsets` for more about
3974 specifying revisions.
3983 specifying revisions.
3975
3984
3976 See :hg:`help templates` for more about pre-packaged styles and
3985 See :hg:`help templates` for more about pre-packaged styles and
3977 specifying custom templates.
3986 specifying custom templates.
3978
3987
3979 Returns 0 on success.
3988 Returns 0 on success.
3980 """
3989 """
3981
3990
3982 matchfn = scmutil.match(repo[None], pats, opts)
3991 matchfn = scmutil.match(repo[None], pats, opts)
3983 limit = cmdutil.loglimit(opts)
3992 limit = cmdutil.loglimit(opts)
3984 count = 0
3993 count = 0
3985
3994
3986 getrenamed, endrev = None, None
3995 getrenamed, endrev = None, None
3987 if opts.get('copies'):
3996 if opts.get('copies'):
3988 if opts.get('rev'):
3997 if opts.get('rev'):
3989 endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1
3998 endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1
3990 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3999 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
3991
4000
3992 df = False
4001 df = False
3993 if opts["date"]:
4002 if opts["date"]:
3994 df = util.matchdate(opts["date"])
4003 df = util.matchdate(opts["date"])
3995
4004
3996 branches = opts.get('branch', []) + opts.get('only_branch', [])
4005 branches = opts.get('branch', []) + opts.get('only_branch', [])
3997 opts['branch'] = [repo.lookupbranch(b) for b in branches]
4006 opts['branch'] = [repo.lookupbranch(b) for b in branches]
3998
4007
3999 displayer = cmdutil.show_changeset(ui, repo, opts, True)
4008 displayer = cmdutil.show_changeset(ui, repo, opts, True)
4000 def prep(ctx, fns):
4009 def prep(ctx, fns):
4001 rev = ctx.rev()
4010 rev = ctx.rev()
4002 parents = [p for p in repo.changelog.parentrevs(rev)
4011 parents = [p for p in repo.changelog.parentrevs(rev)
4003 if p != nullrev]
4012 if p != nullrev]
4004 if opts.get('no_merges') and len(parents) == 2:
4013 if opts.get('no_merges') and len(parents) == 2:
4005 return
4014 return
4006 if opts.get('only_merges') and len(parents) != 2:
4015 if opts.get('only_merges') and len(parents) != 2:
4007 return
4016 return
4008 if opts.get('branch') and ctx.branch() not in opts['branch']:
4017 if opts.get('branch') and ctx.branch() not in opts['branch']:
4009 return
4018 return
4010 if not opts.get('hidden') and ctx.hidden():
4019 if not opts.get('hidden') and ctx.hidden():
4011 return
4020 return
4012 if df and not df(ctx.date()[0]):
4021 if df and not df(ctx.date()[0]):
4013 return
4022 return
4014
4023
4015 lower = encoding.lower
4024 lower = encoding.lower
4016 if opts.get('user'):
4025 if opts.get('user'):
4017 luser = lower(ctx.user())
4026 luser = lower(ctx.user())
4018 for k in [lower(x) for x in opts['user']]:
4027 for k in [lower(x) for x in opts['user']]:
4019 if (k in luser):
4028 if (k in luser):
4020 break
4029 break
4021 else:
4030 else:
4022 return
4031 return
4023 if opts.get('keyword'):
4032 if opts.get('keyword'):
4024 luser = lower(ctx.user())
4033 luser = lower(ctx.user())
4025 ldesc = lower(ctx.description())
4034 ldesc = lower(ctx.description())
4026 lfiles = lower(" ".join(ctx.files()))
4035 lfiles = lower(" ".join(ctx.files()))
4027 for k in [lower(x) for x in opts['keyword']]:
4036 for k in [lower(x) for x in opts['keyword']]:
4028 if (k in luser or k in ldesc or k in lfiles):
4037 if (k in luser or k in ldesc or k in lfiles):
4029 break
4038 break
4030 else:
4039 else:
4031 return
4040 return
4032
4041
4033 copies = None
4042 copies = None
4034 if getrenamed is not None and rev:
4043 if getrenamed is not None and rev:
4035 copies = []
4044 copies = []
4036 for fn in ctx.files():
4045 for fn in ctx.files():
4037 rename = getrenamed(fn, rev)
4046 rename = getrenamed(fn, rev)
4038 if rename:
4047 if rename:
4039 copies.append((fn, rename[0]))
4048 copies.append((fn, rename[0]))
4040
4049
4041 revmatchfn = None
4050 revmatchfn = None
4042 if opts.get('patch') or opts.get('stat'):
4051 if opts.get('patch') or opts.get('stat'):
4043 if opts.get('follow') or opts.get('follow_first'):
4052 if opts.get('follow') or opts.get('follow_first'):
4044 # note: this might be wrong when following through merges
4053 # note: this might be wrong when following through merges
4045 revmatchfn = scmutil.match(repo[None], fns, default='path')
4054 revmatchfn = scmutil.match(repo[None], fns, default='path')
4046 else:
4055 else:
4047 revmatchfn = matchfn
4056 revmatchfn = matchfn
4048
4057
4049 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
4058 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
4050
4059
4051 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4060 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4052 if count == limit:
4061 if count == limit:
4053 break
4062 break
4054 if displayer.flush(ctx.rev()):
4063 if displayer.flush(ctx.rev()):
4055 count += 1
4064 count += 1
4056 displayer.close()
4065 displayer.close()
4057
4066
4058 @command('manifest',
4067 @command('manifest',
4059 [('r', 'rev', '', _('revision to display'), _('REV')),
4068 [('r', 'rev', '', _('revision to display'), _('REV')),
4060 ('', 'all', False, _("list files from all revisions"))],
4069 ('', 'all', False, _("list files from all revisions"))],
4061 _('[-r REV]'))
4070 _('[-r REV]'))
4062 def manifest(ui, repo, node=None, rev=None, **opts):
4071 def manifest(ui, repo, node=None, rev=None, **opts):
4063 """output the current or given revision of the project manifest
4072 """output the current or given revision of the project manifest
4064
4073
4065 Print a list of version controlled files for the given revision.
4074 Print a list of version controlled files for the given revision.
4066 If no revision is given, the first parent of the working directory
4075 If no revision is given, the first parent of the working directory
4067 is used, or the null revision if no revision is checked out.
4076 is used, or the null revision if no revision is checked out.
4068
4077
4069 With -v, print file permissions, symlink and executable bits.
4078 With -v, print file permissions, symlink and executable bits.
4070 With --debug, print file revision hashes.
4079 With --debug, print file revision hashes.
4071
4080
4072 If option --all is specified, the list of all files from all revisions
4081 If option --all is specified, the list of all files from all revisions
4073 is printed. This includes deleted and renamed files.
4082 is printed. This includes deleted and renamed files.
4074
4083
4075 Returns 0 on success.
4084 Returns 0 on success.
4076 """
4085 """
4077 if opts.get('all'):
4086 if opts.get('all'):
4078 if rev or node:
4087 if rev or node:
4079 raise util.Abort(_("can't specify a revision with --all"))
4088 raise util.Abort(_("can't specify a revision with --all"))
4080
4089
4081 res = []
4090 res = []
4082 prefix = "data/"
4091 prefix = "data/"
4083 suffix = ".i"
4092 suffix = ".i"
4084 plen = len(prefix)
4093 plen = len(prefix)
4085 slen = len(suffix)
4094 slen = len(suffix)
4086 lock = repo.lock()
4095 lock = repo.lock()
4087 try:
4096 try:
4088 for fn, b, size in repo.store.datafiles():
4097 for fn, b, size in repo.store.datafiles():
4089 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
4098 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
4090 res.append(fn[plen:-slen])
4099 res.append(fn[plen:-slen])
4091 finally:
4100 finally:
4092 lock.release()
4101 lock.release()
4093 for f in sorted(res):
4102 for f in sorted(res):
4094 ui.write("%s\n" % f)
4103 ui.write("%s\n" % f)
4095 return
4104 return
4096
4105
4097 if rev and node:
4106 if rev and node:
4098 raise util.Abort(_("please specify just one revision"))
4107 raise util.Abort(_("please specify just one revision"))
4099
4108
4100 if not node:
4109 if not node:
4101 node = rev
4110 node = rev
4102
4111
4103 decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '}
4112 decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '}
4104 ctx = scmutil.revsingle(repo, node)
4113 ctx = scmutil.revsingle(repo, node)
4105 for f in ctx:
4114 for f in ctx:
4106 if ui.debugflag:
4115 if ui.debugflag:
4107 ui.write("%40s " % hex(ctx.manifest()[f]))
4116 ui.write("%40s " % hex(ctx.manifest()[f]))
4108 if ui.verbose:
4117 if ui.verbose:
4109 ui.write(decor[ctx.flags(f)])
4118 ui.write(decor[ctx.flags(f)])
4110 ui.write("%s\n" % f)
4119 ui.write("%s\n" % f)
4111
4120
4112 @command('^merge',
4121 @command('^merge',
4113 [('f', 'force', None, _('force a merge with outstanding changes')),
4122 [('f', 'force', None, _('force a merge with outstanding changes')),
4114 ('r', 'rev', '', _('revision to merge'), _('REV')),
4123 ('r', 'rev', '', _('revision to merge'), _('REV')),
4115 ('P', 'preview', None,
4124 ('P', 'preview', None,
4116 _('review revisions to merge (no merge is performed)'))
4125 _('review revisions to merge (no merge is performed)'))
4117 ] + mergetoolopts,
4126 ] + mergetoolopts,
4118 _('[-P] [-f] [[-r] REV]'))
4127 _('[-P] [-f] [[-r] REV]'))
4119 def merge(ui, repo, node=None, **opts):
4128 def merge(ui, repo, node=None, **opts):
4120 """merge working directory with another revision
4129 """merge working directory with another revision
4121
4130
4122 The current working directory is updated with all changes made in
4131 The current working directory is updated with all changes made in
4123 the requested revision since the last common predecessor revision.
4132 the requested revision since the last common predecessor revision.
4124
4133
4125 Files that changed between either parent are marked as changed for
4134 Files that changed between either parent are marked as changed for
4126 the next commit and a commit must be performed before any further
4135 the next commit and a commit must be performed before any further
4127 updates to the repository are allowed. The next commit will have
4136 updates to the repository are allowed. The next commit will have
4128 two parents.
4137 two parents.
4129
4138
4130 ``--tool`` can be used to specify the merge tool used for file
4139 ``--tool`` can be used to specify the merge tool used for file
4131 merges. It overrides the HGMERGE environment variable and your
4140 merges. It overrides the HGMERGE environment variable and your
4132 configuration files. See :hg:`help merge-tools` for options.
4141 configuration files. See :hg:`help merge-tools` for options.
4133
4142
4134 If no revision is specified, the working directory's parent is a
4143 If no revision is specified, the working directory's parent is a
4135 head revision, and the current branch contains exactly one other
4144 head revision, and the current branch contains exactly one other
4136 head, the other head is merged with by default. Otherwise, an
4145 head, the other head is merged with by default. Otherwise, an
4137 explicit revision with which to merge with must be provided.
4146 explicit revision with which to merge with must be provided.
4138
4147
4139 :hg:`resolve` must be used to resolve unresolved files.
4148 :hg:`resolve` must be used to resolve unresolved files.
4140
4149
4141 To undo an uncommitted merge, use :hg:`update --clean .` which
4150 To undo an uncommitted merge, use :hg:`update --clean .` which
4142 will check out a clean copy of the original merge parent, losing
4151 will check out a clean copy of the original merge parent, losing
4143 all changes.
4152 all changes.
4144
4153
4145 Returns 0 on success, 1 if there are unresolved files.
4154 Returns 0 on success, 1 if there are unresolved files.
4146 """
4155 """
4147
4156
4148 if opts.get('rev') and node:
4157 if opts.get('rev') and node:
4149 raise util.Abort(_("please specify just one revision"))
4158 raise util.Abort(_("please specify just one revision"))
4150 if not node:
4159 if not node:
4151 node = opts.get('rev')
4160 node = opts.get('rev')
4152
4161
4153 if not node:
4162 if not node:
4154 branch = repo[None].branch()
4163 branch = repo[None].branch()
4155 bheads = repo.branchheads(branch)
4164 bheads = repo.branchheads(branch)
4156 if len(bheads) > 2:
4165 if len(bheads) > 2:
4157 raise util.Abort(_("branch '%s' has %d heads - "
4166 raise util.Abort(_("branch '%s' has %d heads - "
4158 "please merge with an explicit rev")
4167 "please merge with an explicit rev")
4159 % (branch, len(bheads)),
4168 % (branch, len(bheads)),
4160 hint=_("run 'hg heads .' to see heads"))
4169 hint=_("run 'hg heads .' to see heads"))
4161
4170
4162 parent = repo.dirstate.p1()
4171 parent = repo.dirstate.p1()
4163 if len(bheads) == 1:
4172 if len(bheads) == 1:
4164 if len(repo.heads()) > 1:
4173 if len(repo.heads()) > 1:
4165 raise util.Abort(_("branch '%s' has one head - "
4174 raise util.Abort(_("branch '%s' has one head - "
4166 "please merge with an explicit rev")
4175 "please merge with an explicit rev")
4167 % branch,
4176 % branch,
4168 hint=_("run 'hg heads' to see all heads"))
4177 hint=_("run 'hg heads' to see all heads"))
4169 msg, hint = _('nothing to merge'), None
4178 msg, hint = _('nothing to merge'), None
4170 if parent != repo.lookup(branch):
4179 if parent != repo.lookup(branch):
4171 hint = _("use 'hg update' instead")
4180 hint = _("use 'hg update' instead")
4172 raise util.Abort(msg, hint=hint)
4181 raise util.Abort(msg, hint=hint)
4173
4182
4174 if parent not in bheads:
4183 if parent not in bheads:
4175 raise util.Abort(_('working directory not at a head revision'),
4184 raise util.Abort(_('working directory not at a head revision'),
4176 hint=_("use 'hg update' or merge with an "
4185 hint=_("use 'hg update' or merge with an "
4177 "explicit revision"))
4186 "explicit revision"))
4178 node = parent == bheads[0] and bheads[-1] or bheads[0]
4187 node = parent == bheads[0] and bheads[-1] or bheads[0]
4179 else:
4188 else:
4180 node = scmutil.revsingle(repo, node).node()
4189 node = scmutil.revsingle(repo, node).node()
4181
4190
4182 if opts.get('preview'):
4191 if opts.get('preview'):
4183 # find nodes that are ancestors of p2 but not of p1
4192 # find nodes that are ancestors of p2 but not of p1
4184 p1 = repo.lookup('.')
4193 p1 = repo.lookup('.')
4185 p2 = repo.lookup(node)
4194 p2 = repo.lookup(node)
4186 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4195 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4187
4196
4188 displayer = cmdutil.show_changeset(ui, repo, opts)
4197 displayer = cmdutil.show_changeset(ui, repo, opts)
4189 for node in nodes:
4198 for node in nodes:
4190 displayer.show(repo[node])
4199 displayer.show(repo[node])
4191 displayer.close()
4200 displayer.close()
4192 return 0
4201 return 0
4193
4202
4194 try:
4203 try:
4195 # ui.forcemerge is an internal variable, do not document
4204 # ui.forcemerge is an internal variable, do not document
4196 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4205 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4197 return hg.merge(repo, node, force=opts.get('force'))
4206 return hg.merge(repo, node, force=opts.get('force'))
4198 finally:
4207 finally:
4199 ui.setconfig('ui', 'forcemerge', '')
4208 ui.setconfig('ui', 'forcemerge', '')
4200
4209
4201 @command('outgoing|out',
4210 @command('outgoing|out',
4202 [('f', 'force', None, _('run even when the destination is unrelated')),
4211 [('f', 'force', None, _('run even when the destination is unrelated')),
4203 ('r', 'rev', [],
4212 ('r', 'rev', [],
4204 _('a changeset intended to be included in the destination'), _('REV')),
4213 _('a changeset intended to be included in the destination'), _('REV')),
4205 ('n', 'newest-first', None, _('show newest record first')),
4214 ('n', 'newest-first', None, _('show newest record first')),
4206 ('B', 'bookmarks', False, _('compare bookmarks')),
4215 ('B', 'bookmarks', False, _('compare bookmarks')),
4207 ('b', 'branch', [], _('a specific branch you would like to push'),
4216 ('b', 'branch', [], _('a specific branch you would like to push'),
4208 _('BRANCH')),
4217 _('BRANCH')),
4209 ] + logopts + remoteopts + subrepoopts,
4218 ] + logopts + remoteopts + subrepoopts,
4210 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
4219 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
4211 def outgoing(ui, repo, dest=None, **opts):
4220 def outgoing(ui, repo, dest=None, **opts):
4212 """show changesets not found in the destination
4221 """show changesets not found in the destination
4213
4222
4214 Show changesets not found in the specified destination repository
4223 Show changesets not found in the specified destination repository
4215 or the default push location. These are the changesets that would
4224 or the default push location. These are the changesets that would
4216 be pushed if a push was requested.
4225 be pushed if a push was requested.
4217
4226
4218 See pull for details of valid destination formats.
4227 See pull for details of valid destination formats.
4219
4228
4220 Returns 0 if there are outgoing changes, 1 otherwise.
4229 Returns 0 if there are outgoing changes, 1 otherwise.
4221 """
4230 """
4222
4231
4223 if opts.get('bookmarks'):
4232 if opts.get('bookmarks'):
4224 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4233 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4225 dest, branches = hg.parseurl(dest, opts.get('branch'))
4234 dest, branches = hg.parseurl(dest, opts.get('branch'))
4226 other = hg.peer(repo, opts, dest)
4235 other = hg.peer(repo, opts, dest)
4227 if 'bookmarks' not in other.listkeys('namespaces'):
4236 if 'bookmarks' not in other.listkeys('namespaces'):
4228 ui.warn(_("remote doesn't support bookmarks\n"))
4237 ui.warn(_("remote doesn't support bookmarks\n"))
4229 return 0
4238 return 0
4230 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4239 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4231 return bookmarks.diff(ui, other, repo)
4240 return bookmarks.diff(ui, other, repo)
4232
4241
4233 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
4242 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
4234 try:
4243 try:
4235 return hg.outgoing(ui, repo, dest, opts)
4244 return hg.outgoing(ui, repo, dest, opts)
4236 finally:
4245 finally:
4237 del repo._subtoppath
4246 del repo._subtoppath
4238
4247
4239 @command('parents',
4248 @command('parents',
4240 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4249 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4241 ] + templateopts,
4250 ] + templateopts,
4242 _('[-r REV] [FILE]'))
4251 _('[-r REV] [FILE]'))
4243 def parents(ui, repo, file_=None, **opts):
4252 def parents(ui, repo, file_=None, **opts):
4244 """show the parents of the working directory or revision
4253 """show the parents of the working directory or revision
4245
4254
4246 Print the working directory's parent revisions. If a revision is
4255 Print the working directory's parent revisions. If a revision is
4247 given via -r/--rev, the parent of that revision will be printed.
4256 given via -r/--rev, the parent of that revision will be printed.
4248 If a file argument is given, the revision in which the file was
4257 If a file argument is given, the revision in which the file was
4249 last changed (before the working directory revision or the
4258 last changed (before the working directory revision or the
4250 argument to --rev if given) is printed.
4259 argument to --rev if given) is printed.
4251
4260
4252 Returns 0 on success.
4261 Returns 0 on success.
4253 """
4262 """
4254
4263
4255 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4264 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4256
4265
4257 if file_:
4266 if file_:
4258 m = scmutil.match(ctx, (file_,), opts)
4267 m = scmutil.match(ctx, (file_,), opts)
4259 if m.anypats() or len(m.files()) != 1:
4268 if m.anypats() or len(m.files()) != 1:
4260 raise util.Abort(_('can only specify an explicit filename'))
4269 raise util.Abort(_('can only specify an explicit filename'))
4261 file_ = m.files()[0]
4270 file_ = m.files()[0]
4262 filenodes = []
4271 filenodes = []
4263 for cp in ctx.parents():
4272 for cp in ctx.parents():
4264 if not cp:
4273 if not cp:
4265 continue
4274 continue
4266 try:
4275 try:
4267 filenodes.append(cp.filenode(file_))
4276 filenodes.append(cp.filenode(file_))
4268 except error.LookupError:
4277 except error.LookupError:
4269 pass
4278 pass
4270 if not filenodes:
4279 if not filenodes:
4271 raise util.Abort(_("'%s' not found in manifest!") % file_)
4280 raise util.Abort(_("'%s' not found in manifest!") % file_)
4272 fl = repo.file(file_)
4281 fl = repo.file(file_)
4273 p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes]
4282 p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes]
4274 else:
4283 else:
4275 p = [cp.node() for cp in ctx.parents()]
4284 p = [cp.node() for cp in ctx.parents()]
4276
4285
4277 displayer = cmdutil.show_changeset(ui, repo, opts)
4286 displayer = cmdutil.show_changeset(ui, repo, opts)
4278 for n in p:
4287 for n in p:
4279 if n != nullid:
4288 if n != nullid:
4280 displayer.show(repo[n])
4289 displayer.show(repo[n])
4281 displayer.close()
4290 displayer.close()
4282
4291
4283 @command('paths', [], _('[NAME]'))
4292 @command('paths', [], _('[NAME]'))
4284 def paths(ui, repo, search=None):
4293 def paths(ui, repo, search=None):
4285 """show aliases for remote repositories
4294 """show aliases for remote repositories
4286
4295
4287 Show definition of symbolic path name NAME. If no name is given,
4296 Show definition of symbolic path name NAME. If no name is given,
4288 show definition of all available names.
4297 show definition of all available names.
4289
4298
4290 Option -q/--quiet suppresses all output when searching for NAME
4299 Option -q/--quiet suppresses all output when searching for NAME
4291 and shows only the path names when listing all definitions.
4300 and shows only the path names when listing all definitions.
4292
4301
4293 Path names are defined in the [paths] section of your
4302 Path names are defined in the [paths] section of your
4294 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4303 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4295 repository, ``.hg/hgrc`` is used, too.
4304 repository, ``.hg/hgrc`` is used, too.
4296
4305
4297 The path names ``default`` and ``default-push`` have a special
4306 The path names ``default`` and ``default-push`` have a special
4298 meaning. When performing a push or pull operation, they are used
4307 meaning. When performing a push or pull operation, they are used
4299 as fallbacks if no location is specified on the command-line.
4308 as fallbacks if no location is specified on the command-line.
4300 When ``default-push`` is set, it will be used for push and
4309 When ``default-push`` is set, it will be used for push and
4301 ``default`` will be used for pull; otherwise ``default`` is used
4310 ``default`` will be used for pull; otherwise ``default`` is used
4302 as the fallback for both. When cloning a repository, the clone
4311 as the fallback for both. When cloning a repository, the clone
4303 source is written as ``default`` in ``.hg/hgrc``. Note that
4312 source is written as ``default`` in ``.hg/hgrc``. Note that
4304 ``default`` and ``default-push`` apply to all inbound (e.g.
4313 ``default`` and ``default-push`` apply to all inbound (e.g.
4305 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
4314 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
4306 :hg:`bundle`) operations.
4315 :hg:`bundle`) operations.
4307
4316
4308 See :hg:`help urls` for more information.
4317 See :hg:`help urls` for more information.
4309
4318
4310 Returns 0 on success.
4319 Returns 0 on success.
4311 """
4320 """
4312 if search:
4321 if search:
4313 for name, path in ui.configitems("paths"):
4322 for name, path in ui.configitems("paths"):
4314 if name == search:
4323 if name == search:
4315 ui.status("%s\n" % util.hidepassword(path))
4324 ui.status("%s\n" % util.hidepassword(path))
4316 return
4325 return
4317 if not ui.quiet:
4326 if not ui.quiet:
4318 ui.warn(_("not found!\n"))
4327 ui.warn(_("not found!\n"))
4319 return 1
4328 return 1
4320 else:
4329 else:
4321 for name, path in ui.configitems("paths"):
4330 for name, path in ui.configitems("paths"):
4322 if ui.quiet:
4331 if ui.quiet:
4323 ui.write("%s\n" % name)
4332 ui.write("%s\n" % name)
4324 else:
4333 else:
4325 ui.write("%s = %s\n" % (name, util.hidepassword(path)))
4334 ui.write("%s = %s\n" % (name, util.hidepassword(path)))
4326
4335
4327 @command('^phase',
4336 @command('^phase',
4328 [('p', 'public', False, _('set changeset phase to public')),
4337 [('p', 'public', False, _('set changeset phase to public')),
4329 ('d', 'draft', False, _('set changeset phase to draft')),
4338 ('d', 'draft', False, _('set changeset phase to draft')),
4330 ('s', 'secret', False, _('set changeset phase to secret')),
4339 ('s', 'secret', False, _('set changeset phase to secret')),
4331 ('f', 'force', False, _('allow to move boundary backward')),
4340 ('f', 'force', False, _('allow to move boundary backward')),
4332 ('r', 'rev', [], _('target revision'), _('REV')),
4341 ('r', 'rev', [], _('target revision'), _('REV')),
4333 ],
4342 ],
4334 _('[-p|-d|-s] [-f] [-r] REV...'))
4343 _('[-p|-d|-s] [-f] [-r] REV...'))
4335 def phase(ui, repo, *revs, **opts):
4344 def phase(ui, repo, *revs, **opts):
4336 """set or show the current phase name
4345 """set or show the current phase name
4337
4346
4338 With no argument, show the phase name of specified revisions.
4347 With no argument, show the phase name of specified revisions.
4339
4348
4340 With one of -p/--public, -d/--draft or -s/--secret, change the
4349 With one of -p/--public, -d/--draft or -s/--secret, change the
4341 phase value of the specified revisions.
4350 phase value of the specified revisions.
4342
4351
4343 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
4352 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
4344 lower phase to an higher phase. Phases are ordered as follows::
4353 lower phase to an higher phase. Phases are ordered as follows::
4345
4354
4346 public < draft < secret
4355 public < draft < secret
4347
4356
4348 Return 0 on success, 1 if no phases were changed or some could not
4357 Return 0 on success, 1 if no phases were changed or some could not
4349 be changed.
4358 be changed.
4350 """
4359 """
4351 # search for a unique phase argument
4360 # search for a unique phase argument
4352 targetphase = None
4361 targetphase = None
4353 for idx, name in enumerate(phases.phasenames):
4362 for idx, name in enumerate(phases.phasenames):
4354 if opts[name]:
4363 if opts[name]:
4355 if targetphase is not None:
4364 if targetphase is not None:
4356 raise util.Abort(_('only one phase can be specified'))
4365 raise util.Abort(_('only one phase can be specified'))
4357 targetphase = idx
4366 targetphase = idx
4358
4367
4359 # look for specified revision
4368 # look for specified revision
4360 revs = list(revs)
4369 revs = list(revs)
4361 revs.extend(opts['rev'])
4370 revs.extend(opts['rev'])
4362 if not revs:
4371 if not revs:
4363 raise util.Abort(_('no revisions specified'))
4372 raise util.Abort(_('no revisions specified'))
4364
4373
4365 revs = scmutil.revrange(repo, revs)
4374 revs = scmutil.revrange(repo, revs)
4366
4375
4367 lock = None
4376 lock = None
4368 ret = 0
4377 ret = 0
4369 if targetphase is None:
4378 if targetphase is None:
4370 # display
4379 # display
4371 for r in revs:
4380 for r in revs:
4372 ctx = repo[r]
4381 ctx = repo[r]
4373 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
4382 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
4374 else:
4383 else:
4375 lock = repo.lock()
4384 lock = repo.lock()
4376 try:
4385 try:
4377 # set phase
4386 # set phase
4378 if not revs:
4387 if not revs:
4379 raise util.Abort(_('empty revision set'))
4388 raise util.Abort(_('empty revision set'))
4380 nodes = [repo[r].node() for r in revs]
4389 nodes = [repo[r].node() for r in revs]
4381 olddata = repo._phasecache.getphaserevs(repo)[:]
4390 olddata = repo._phasecache.getphaserevs(repo)[:]
4382 phases.advanceboundary(repo, targetphase, nodes)
4391 phases.advanceboundary(repo, targetphase, nodes)
4383 if opts['force']:
4392 if opts['force']:
4384 phases.retractboundary(repo, targetphase, nodes)
4393 phases.retractboundary(repo, targetphase, nodes)
4385 finally:
4394 finally:
4386 lock.release()
4395 lock.release()
4387 if olddata is not None:
4396 if olddata is not None:
4388 changes = 0
4397 changes = 0
4389 newdata = repo._phasecache.getphaserevs(repo)
4398 newdata = repo._phasecache.getphaserevs(repo)
4390 changes = sum(o != newdata[i] for i, o in enumerate(olddata))
4399 changes = sum(o != newdata[i] for i, o in enumerate(olddata))
4391 rejected = [n for n in nodes
4400 rejected = [n for n in nodes
4392 if newdata[repo[n].rev()] < targetphase]
4401 if newdata[repo[n].rev()] < targetphase]
4393 if rejected:
4402 if rejected:
4394 ui.warn(_('cannot move %i changesets to a more permissive '
4403 ui.warn(_('cannot move %i changesets to a more permissive '
4395 'phase, use --force\n') % len(rejected))
4404 'phase, use --force\n') % len(rejected))
4396 ret = 1
4405 ret = 1
4397 if changes:
4406 if changes:
4398 msg = _('phase changed for %i changesets\n') % changes
4407 msg = _('phase changed for %i changesets\n') % changes
4399 if ret:
4408 if ret:
4400 ui.status(msg)
4409 ui.status(msg)
4401 else:
4410 else:
4402 ui.note(msg)
4411 ui.note(msg)
4403 else:
4412 else:
4404 ui.warn(_('no phases changed\n'))
4413 ui.warn(_('no phases changed\n'))
4405 ret = 1
4414 ret = 1
4406 return ret
4415 return ret
4407
4416
4408 def postincoming(ui, repo, modheads, optupdate, checkout):
4417 def postincoming(ui, repo, modheads, optupdate, checkout):
4409 if modheads == 0:
4418 if modheads == 0:
4410 return
4419 return
4411 if optupdate:
4420 if optupdate:
4412 movemarkfrom = repo['.'].node()
4421 movemarkfrom = repo['.'].node()
4413 try:
4422 try:
4414 ret = hg.update(repo, checkout)
4423 ret = hg.update(repo, checkout)
4415 except util.Abort, inst:
4424 except util.Abort, inst:
4416 ui.warn(_("not updating: %s\n") % str(inst))
4425 ui.warn(_("not updating: %s\n") % str(inst))
4417 return 0
4426 return 0
4418 if not ret and not checkout:
4427 if not ret and not checkout:
4419 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
4428 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
4420 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
4429 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
4421 return ret
4430 return ret
4422 if modheads > 1:
4431 if modheads > 1:
4423 currentbranchheads = len(repo.branchheads())
4432 currentbranchheads = len(repo.branchheads())
4424 if currentbranchheads == modheads:
4433 if currentbranchheads == modheads:
4425 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4434 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4426 elif currentbranchheads > 1:
4435 elif currentbranchheads > 1:
4427 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to merge)\n"))
4436 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to merge)\n"))
4428 else:
4437 else:
4429 ui.status(_("(run 'hg heads' to see heads)\n"))
4438 ui.status(_("(run 'hg heads' to see heads)\n"))
4430 else:
4439 else:
4431 ui.status(_("(run 'hg update' to get a working copy)\n"))
4440 ui.status(_("(run 'hg update' to get a working copy)\n"))
4432
4441
4433 @command('^pull',
4442 @command('^pull',
4434 [('u', 'update', None,
4443 [('u', 'update', None,
4435 _('update to new branch head if changesets were pulled')),
4444 _('update to new branch head if changesets were pulled')),
4436 ('f', 'force', None, _('run even when remote repository is unrelated')),
4445 ('f', 'force', None, _('run even when remote repository is unrelated')),
4437 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4446 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4438 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4447 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4439 ('b', 'branch', [], _('a specific branch you would like to pull'),
4448 ('b', 'branch', [], _('a specific branch you would like to pull'),
4440 _('BRANCH')),
4449 _('BRANCH')),
4441 ] + remoteopts,
4450 ] + remoteopts,
4442 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4451 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4443 def pull(ui, repo, source="default", **opts):
4452 def pull(ui, repo, source="default", **opts):
4444 """pull changes from the specified source
4453 """pull changes from the specified source
4445
4454
4446 Pull changes from a remote repository to a local one.
4455 Pull changes from a remote repository to a local one.
4447
4456
4448 This finds all changes from the repository at the specified path
4457 This finds all changes from the repository at the specified path
4449 or URL and adds them to a local repository (the current one unless
4458 or URL and adds them to a local repository (the current one unless
4450 -R is specified). By default, this does not update the copy of the
4459 -R is specified). By default, this does not update the copy of the
4451 project in the working directory.
4460 project in the working directory.
4452
4461
4453 Use :hg:`incoming` if you want to see what would have been added
4462 Use :hg:`incoming` if you want to see what would have been added
4454 by a pull at the time you issued this command. If you then decide
4463 by a pull at the time you issued this command. If you then decide
4455 to add those changes to the repository, you should use :hg:`pull
4464 to add those changes to the repository, you should use :hg:`pull
4456 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4465 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4457
4466
4458 If SOURCE is omitted, the 'default' path will be used.
4467 If SOURCE is omitted, the 'default' path will be used.
4459 See :hg:`help urls` for more information.
4468 See :hg:`help urls` for more information.
4460
4469
4461 Returns 0 on success, 1 if an update had unresolved files.
4470 Returns 0 on success, 1 if an update had unresolved files.
4462 """
4471 """
4463 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4472 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4464 other = hg.peer(repo, opts, source)
4473 other = hg.peer(repo, opts, source)
4465 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4474 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4466 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
4475 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
4467
4476
4468 if opts.get('bookmark'):
4477 if opts.get('bookmark'):
4469 if not revs:
4478 if not revs:
4470 revs = []
4479 revs = []
4471 rb = other.listkeys('bookmarks')
4480 rb = other.listkeys('bookmarks')
4472 for b in opts['bookmark']:
4481 for b in opts['bookmark']:
4473 if b not in rb:
4482 if b not in rb:
4474 raise util.Abort(_('remote bookmark %s not found!') % b)
4483 raise util.Abort(_('remote bookmark %s not found!') % b)
4475 revs.append(rb[b])
4484 revs.append(rb[b])
4476
4485
4477 if revs:
4486 if revs:
4478 try:
4487 try:
4479 revs = [other.lookup(rev) for rev in revs]
4488 revs = [other.lookup(rev) for rev in revs]
4480 except error.CapabilityError:
4489 except error.CapabilityError:
4481 err = _("other repository doesn't support revision lookup, "
4490 err = _("other repository doesn't support revision lookup, "
4482 "so a rev cannot be specified.")
4491 "so a rev cannot be specified.")
4483 raise util.Abort(err)
4492 raise util.Abort(err)
4484
4493
4485 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
4494 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
4486 bookmarks.updatefromremote(ui, repo, other, source)
4495 bookmarks.updatefromremote(ui, repo, other, source)
4487 if checkout:
4496 if checkout:
4488 checkout = str(repo.changelog.rev(other.lookup(checkout)))
4497 checkout = str(repo.changelog.rev(other.lookup(checkout)))
4489 repo._subtoppath = source
4498 repo._subtoppath = source
4490 try:
4499 try:
4491 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
4500 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
4492
4501
4493 finally:
4502 finally:
4494 del repo._subtoppath
4503 del repo._subtoppath
4495
4504
4496 # update specified bookmarks
4505 # update specified bookmarks
4497 if opts.get('bookmark'):
4506 if opts.get('bookmark'):
4498 for b in opts['bookmark']:
4507 for b in opts['bookmark']:
4499 # explicit pull overrides local bookmark if any
4508 # explicit pull overrides local bookmark if any
4500 ui.status(_("importing bookmark %s\n") % b)
4509 ui.status(_("importing bookmark %s\n") % b)
4501 repo._bookmarks[b] = repo[rb[b]].node()
4510 repo._bookmarks[b] = repo[rb[b]].node()
4502 bookmarks.write(repo)
4511 bookmarks.write(repo)
4503
4512
4504 return ret
4513 return ret
4505
4514
4506 @command('^push',
4515 @command('^push',
4507 [('f', 'force', None, _('force push')),
4516 [('f', 'force', None, _('force push')),
4508 ('r', 'rev', [],
4517 ('r', 'rev', [],
4509 _('a changeset intended to be included in the destination'),
4518 _('a changeset intended to be included in the destination'),
4510 _('REV')),
4519 _('REV')),
4511 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4520 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4512 ('b', 'branch', [],
4521 ('b', 'branch', [],
4513 _('a specific branch you would like to push'), _('BRANCH')),
4522 _('a specific branch you would like to push'), _('BRANCH')),
4514 ('', 'new-branch', False, _('allow pushing a new branch')),
4523 ('', 'new-branch', False, _('allow pushing a new branch')),
4515 ] + remoteopts,
4524 ] + remoteopts,
4516 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4525 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4517 def push(ui, repo, dest=None, **opts):
4526 def push(ui, repo, dest=None, **opts):
4518 """push changes to the specified destination
4527 """push changes to the specified destination
4519
4528
4520 Push changesets from the local repository to the specified
4529 Push changesets from the local repository to the specified
4521 destination.
4530 destination.
4522
4531
4523 This operation is symmetrical to pull: it is identical to a pull
4532 This operation is symmetrical to pull: it is identical to a pull
4524 in the destination repository from the current one.
4533 in the destination repository from the current one.
4525
4534
4526 By default, push will not allow creation of new heads at the
4535 By default, push will not allow creation of new heads at the
4527 destination, since multiple heads would make it unclear which head
4536 destination, since multiple heads would make it unclear which head
4528 to use. In this situation, it is recommended to pull and merge
4537 to use. In this situation, it is recommended to pull and merge
4529 before pushing.
4538 before pushing.
4530
4539
4531 Use --new-branch if you want to allow push to create a new named
4540 Use --new-branch if you want to allow push to create a new named
4532 branch that is not present at the destination. This allows you to
4541 branch that is not present at the destination. This allows you to
4533 only create a new branch without forcing other changes.
4542 only create a new branch without forcing other changes.
4534
4543
4535 Use -f/--force to override the default behavior and push all
4544 Use -f/--force to override the default behavior and push all
4536 changesets on all branches.
4545 changesets on all branches.
4537
4546
4538 If -r/--rev is used, the specified revision and all its ancestors
4547 If -r/--rev is used, the specified revision and all its ancestors
4539 will be pushed to the remote repository.
4548 will be pushed to the remote repository.
4540
4549
4541 Please see :hg:`help urls` for important details about ``ssh://``
4550 Please see :hg:`help urls` for important details about ``ssh://``
4542 URLs. If DESTINATION is omitted, a default path will be used.
4551 URLs. If DESTINATION is omitted, a default path will be used.
4543
4552
4544 Returns 0 if push was successful, 1 if nothing to push.
4553 Returns 0 if push was successful, 1 if nothing to push.
4545 """
4554 """
4546
4555
4547 if opts.get('bookmark'):
4556 if opts.get('bookmark'):
4548 for b in opts['bookmark']:
4557 for b in opts['bookmark']:
4549 # translate -B options to -r so changesets get pushed
4558 # translate -B options to -r so changesets get pushed
4550 if b in repo._bookmarks:
4559 if b in repo._bookmarks:
4551 opts.setdefault('rev', []).append(b)
4560 opts.setdefault('rev', []).append(b)
4552 else:
4561 else:
4553 # if we try to push a deleted bookmark, translate it to null
4562 # if we try to push a deleted bookmark, translate it to null
4554 # this lets simultaneous -r, -b options continue working
4563 # this lets simultaneous -r, -b options continue working
4555 opts.setdefault('rev', []).append("null")
4564 opts.setdefault('rev', []).append("null")
4556
4565
4557 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4566 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4558 dest, branches = hg.parseurl(dest, opts.get('branch'))
4567 dest, branches = hg.parseurl(dest, opts.get('branch'))
4559 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4568 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4560 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4569 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4561 other = hg.peer(repo, opts, dest)
4570 other = hg.peer(repo, opts, dest)
4562 if revs:
4571 if revs:
4563 revs = [repo.lookup(rev) for rev in revs]
4572 revs = [repo.lookup(rev) for rev in revs]
4564
4573
4565 repo._subtoppath = dest
4574 repo._subtoppath = dest
4566 try:
4575 try:
4567 # push subrepos depth-first for coherent ordering
4576 # push subrepos depth-first for coherent ordering
4568 c = repo['']
4577 c = repo['']
4569 subs = c.substate # only repos that are committed
4578 subs = c.substate # only repos that are committed
4570 for s in sorted(subs):
4579 for s in sorted(subs):
4571 if c.sub(s).push(opts) == 0:
4580 if c.sub(s).push(opts) == 0:
4572 return False
4581 return False
4573 finally:
4582 finally:
4574 del repo._subtoppath
4583 del repo._subtoppath
4575 result = repo.push(other, opts.get('force'), revs=revs,
4584 result = repo.push(other, opts.get('force'), revs=revs,
4576 newbranch=opts.get('new_branch'))
4585 newbranch=opts.get('new_branch'))
4577
4586
4578 result = not result
4587 result = not result
4579
4588
4580 if opts.get('bookmark'):
4589 if opts.get('bookmark'):
4581 rb = other.listkeys('bookmarks')
4590 rb = other.listkeys('bookmarks')
4582 for b in opts['bookmark']:
4591 for b in opts['bookmark']:
4583 # explicit push overrides remote bookmark if any
4592 # explicit push overrides remote bookmark if any
4584 if b in repo._bookmarks:
4593 if b in repo._bookmarks:
4585 ui.status(_("exporting bookmark %s\n") % b)
4594 ui.status(_("exporting bookmark %s\n") % b)
4586 new = repo[b].hex()
4595 new = repo[b].hex()
4587 elif b in rb:
4596 elif b in rb:
4588 ui.status(_("deleting remote bookmark %s\n") % b)
4597 ui.status(_("deleting remote bookmark %s\n") % b)
4589 new = '' # delete
4598 new = '' # delete
4590 else:
4599 else:
4591 ui.warn(_('bookmark %s does not exist on the local '
4600 ui.warn(_('bookmark %s does not exist on the local '
4592 'or remote repository!\n') % b)
4601 'or remote repository!\n') % b)
4593 return 2
4602 return 2
4594 old = rb.get(b, '')
4603 old = rb.get(b, '')
4595 r = other.pushkey('bookmarks', b, old, new)
4604 r = other.pushkey('bookmarks', b, old, new)
4596 if not r:
4605 if not r:
4597 ui.warn(_('updating bookmark %s failed!\n') % b)
4606 ui.warn(_('updating bookmark %s failed!\n') % b)
4598 if not result:
4607 if not result:
4599 result = 2
4608 result = 2
4600
4609
4601 return result
4610 return result
4602
4611
4603 @command('recover', [])
4612 @command('recover', [])
4604 def recover(ui, repo):
4613 def recover(ui, repo):
4605 """roll back an interrupted transaction
4614 """roll back an interrupted transaction
4606
4615
4607 Recover from an interrupted commit or pull.
4616 Recover from an interrupted commit or pull.
4608
4617
4609 This command tries to fix the repository status after an
4618 This command tries to fix the repository status after an
4610 interrupted operation. It should only be necessary when Mercurial
4619 interrupted operation. It should only be necessary when Mercurial
4611 suggests it.
4620 suggests it.
4612
4621
4613 Returns 0 if successful, 1 if nothing to recover or verify fails.
4622 Returns 0 if successful, 1 if nothing to recover or verify fails.
4614 """
4623 """
4615 if repo.recover():
4624 if repo.recover():
4616 return hg.verify(repo)
4625 return hg.verify(repo)
4617 return 1
4626 return 1
4618
4627
4619 @command('^remove|rm',
4628 @command('^remove|rm',
4620 [('A', 'after', None, _('record delete for missing files')),
4629 [('A', 'after', None, _('record delete for missing files')),
4621 ('f', 'force', None,
4630 ('f', 'force', None,
4622 _('remove (and delete) file even if added or modified')),
4631 _('remove (and delete) file even if added or modified')),
4623 ] + walkopts,
4632 ] + walkopts,
4624 _('[OPTION]... FILE...'))
4633 _('[OPTION]... FILE...'))
4625 def remove(ui, repo, *pats, **opts):
4634 def remove(ui, repo, *pats, **opts):
4626 """remove the specified files on the next commit
4635 """remove the specified files on the next commit
4627
4636
4628 Schedule the indicated files for removal from the current branch.
4637 Schedule the indicated files for removal from the current branch.
4629
4638
4630 This command schedules the files to be removed at the next commit.
4639 This command schedules the files to be removed at the next commit.
4631 To undo a remove before that, see :hg:`revert`. To undo added
4640 To undo a remove before that, see :hg:`revert`. To undo added
4632 files, see :hg:`forget`.
4641 files, see :hg:`forget`.
4633
4642
4634 .. container:: verbose
4643 .. container:: verbose
4635
4644
4636 -A/--after can be used to remove only files that have already
4645 -A/--after can be used to remove only files that have already
4637 been deleted, -f/--force can be used to force deletion, and -Af
4646 been deleted, -f/--force can be used to force deletion, and -Af
4638 can be used to remove files from the next revision without
4647 can be used to remove files from the next revision without
4639 deleting them from the working directory.
4648 deleting them from the working directory.
4640
4649
4641 The following table details the behavior of remove for different
4650 The following table details the behavior of remove for different
4642 file states (columns) and option combinations (rows). The file
4651 file states (columns) and option combinations (rows). The file
4643 states are Added [A], Clean [C], Modified [M] and Missing [!]
4652 states are Added [A], Clean [C], Modified [M] and Missing [!]
4644 (as reported by :hg:`status`). The actions are Warn, Remove
4653 (as reported by :hg:`status`). The actions are Warn, Remove
4645 (from branch) and Delete (from disk):
4654 (from branch) and Delete (from disk):
4646
4655
4647 ======= == == == ==
4656 ======= == == == ==
4648 A C M !
4657 A C M !
4649 ======= == == == ==
4658 ======= == == == ==
4650 none W RD W R
4659 none W RD W R
4651 -f R RD RD R
4660 -f R RD RD R
4652 -A W W W R
4661 -A W W W R
4653 -Af R R R R
4662 -Af R R R R
4654 ======= == == == ==
4663 ======= == == == ==
4655
4664
4656 Note that remove never deletes files in Added [A] state from the
4665 Note that remove never deletes files in Added [A] state from the
4657 working directory, not even if option --force is specified.
4666 working directory, not even if option --force is specified.
4658
4667
4659 Returns 0 on success, 1 if any warnings encountered.
4668 Returns 0 on success, 1 if any warnings encountered.
4660 """
4669 """
4661
4670
4662 ret = 0
4671 ret = 0
4663 after, force = opts.get('after'), opts.get('force')
4672 after, force = opts.get('after'), opts.get('force')
4664 if not pats and not after:
4673 if not pats and not after:
4665 raise util.Abort(_('no files specified'))
4674 raise util.Abort(_('no files specified'))
4666
4675
4667 m = scmutil.match(repo[None], pats, opts)
4676 m = scmutil.match(repo[None], pats, opts)
4668 s = repo.status(match=m, clean=True)
4677 s = repo.status(match=m, clean=True)
4669 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
4678 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
4670
4679
4671 for f in m.files():
4680 for f in m.files():
4672 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
4681 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
4673 if os.path.exists(m.rel(f)):
4682 if os.path.exists(m.rel(f)):
4674 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
4683 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
4675 ret = 1
4684 ret = 1
4676
4685
4677 if force:
4686 if force:
4678 list = modified + deleted + clean + added
4687 list = modified + deleted + clean + added
4679 elif after:
4688 elif after:
4680 list = deleted
4689 list = deleted
4681 for f in modified + added + clean:
4690 for f in modified + added + clean:
4682 ui.warn(_('not removing %s: file still exists (use -f'
4691 ui.warn(_('not removing %s: file still exists (use -f'
4683 ' to force removal)\n') % m.rel(f))
4692 ' to force removal)\n') % m.rel(f))
4684 ret = 1
4693 ret = 1
4685 else:
4694 else:
4686 list = deleted + clean
4695 list = deleted + clean
4687 for f in modified:
4696 for f in modified:
4688 ui.warn(_('not removing %s: file is modified (use -f'
4697 ui.warn(_('not removing %s: file is modified (use -f'
4689 ' to force removal)\n') % m.rel(f))
4698 ' to force removal)\n') % m.rel(f))
4690 ret = 1
4699 ret = 1
4691 for f in added:
4700 for f in added:
4692 ui.warn(_('not removing %s: file has been marked for add'
4701 ui.warn(_('not removing %s: file has been marked for add'
4693 ' (use forget to undo)\n') % m.rel(f))
4702 ' (use forget to undo)\n') % m.rel(f))
4694 ret = 1
4703 ret = 1
4695
4704
4696 for f in sorted(list):
4705 for f in sorted(list):
4697 if ui.verbose or not m.exact(f):
4706 if ui.verbose or not m.exact(f):
4698 ui.status(_('removing %s\n') % m.rel(f))
4707 ui.status(_('removing %s\n') % m.rel(f))
4699
4708
4700 wlock = repo.wlock()
4709 wlock = repo.wlock()
4701 try:
4710 try:
4702 if not after:
4711 if not after:
4703 for f in list:
4712 for f in list:
4704 if f in added:
4713 if f in added:
4705 continue # we never unlink added files on remove
4714 continue # we never unlink added files on remove
4706 try:
4715 try:
4707 util.unlinkpath(repo.wjoin(f))
4716 util.unlinkpath(repo.wjoin(f))
4708 except OSError, inst:
4717 except OSError, inst:
4709 if inst.errno != errno.ENOENT:
4718 if inst.errno != errno.ENOENT:
4710 raise
4719 raise
4711 repo[None].forget(list)
4720 repo[None].forget(list)
4712 finally:
4721 finally:
4713 wlock.release()
4722 wlock.release()
4714
4723
4715 return ret
4724 return ret
4716
4725
4717 @command('rename|move|mv',
4726 @command('rename|move|mv',
4718 [('A', 'after', None, _('record a rename that has already occurred')),
4727 [('A', 'after', None, _('record a rename that has already occurred')),
4719 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4728 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4720 ] + walkopts + dryrunopts,
4729 ] + walkopts + dryrunopts,
4721 _('[OPTION]... SOURCE... DEST'))
4730 _('[OPTION]... SOURCE... DEST'))
4722 def rename(ui, repo, *pats, **opts):
4731 def rename(ui, repo, *pats, **opts):
4723 """rename files; equivalent of copy + remove
4732 """rename files; equivalent of copy + remove
4724
4733
4725 Mark dest as copies of sources; mark sources for deletion. If dest
4734 Mark dest as copies of sources; mark sources for deletion. If dest
4726 is a directory, copies are put in that directory. If dest is a
4735 is a directory, copies are put in that directory. If dest is a
4727 file, there can only be one source.
4736 file, there can only be one source.
4728
4737
4729 By default, this command copies the contents of files as they
4738 By default, this command copies the contents of files as they
4730 exist in the working directory. If invoked with -A/--after, the
4739 exist in the working directory. If invoked with -A/--after, the
4731 operation is recorded, but no copying is performed.
4740 operation is recorded, but no copying is performed.
4732
4741
4733 This command takes effect at the next commit. To undo a rename
4742 This command takes effect at the next commit. To undo a rename
4734 before that, see :hg:`revert`.
4743 before that, see :hg:`revert`.
4735
4744
4736 Returns 0 on success, 1 if errors are encountered.
4745 Returns 0 on success, 1 if errors are encountered.
4737 """
4746 """
4738 wlock = repo.wlock(False)
4747 wlock = repo.wlock(False)
4739 try:
4748 try:
4740 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4749 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4741 finally:
4750 finally:
4742 wlock.release()
4751 wlock.release()
4743
4752
4744 @command('resolve',
4753 @command('resolve',
4745 [('a', 'all', None, _('select all unresolved files')),
4754 [('a', 'all', None, _('select all unresolved files')),
4746 ('l', 'list', None, _('list state of files needing merge')),
4755 ('l', 'list', None, _('list state of files needing merge')),
4747 ('m', 'mark', None, _('mark files as resolved')),
4756 ('m', 'mark', None, _('mark files as resolved')),
4748 ('u', 'unmark', None, _('mark files as unresolved')),
4757 ('u', 'unmark', None, _('mark files as unresolved')),
4749 ('n', 'no-status', None, _('hide status prefix'))]
4758 ('n', 'no-status', None, _('hide status prefix'))]
4750 + mergetoolopts + walkopts,
4759 + mergetoolopts + walkopts,
4751 _('[OPTION]... [FILE]...'))
4760 _('[OPTION]... [FILE]...'))
4752 def resolve(ui, repo, *pats, **opts):
4761 def resolve(ui, repo, *pats, **opts):
4753 """redo merges or set/view the merge status of files
4762 """redo merges or set/view the merge status of files
4754
4763
4755 Merges with unresolved conflicts are often the result of
4764 Merges with unresolved conflicts are often the result of
4756 non-interactive merging using the ``internal:merge`` configuration
4765 non-interactive merging using the ``internal:merge`` configuration
4757 setting, or a command-line merge tool like ``diff3``. The resolve
4766 setting, or a command-line merge tool like ``diff3``. The resolve
4758 command is used to manage the files involved in a merge, after
4767 command is used to manage the files involved in a merge, after
4759 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4768 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4760 working directory must have two parents). See :hg:`help
4769 working directory must have two parents). See :hg:`help
4761 merge-tools` for information on configuring merge tools.
4770 merge-tools` for information on configuring merge tools.
4762
4771
4763 The resolve command can be used in the following ways:
4772 The resolve command can be used in the following ways:
4764
4773
4765 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4774 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4766 files, discarding any previous merge attempts. Re-merging is not
4775 files, discarding any previous merge attempts. Re-merging is not
4767 performed for files already marked as resolved. Use ``--all/-a``
4776 performed for files already marked as resolved. Use ``--all/-a``
4768 to select all unresolved files. ``--tool`` can be used to specify
4777 to select all unresolved files. ``--tool`` can be used to specify
4769 the merge tool used for the given files. It overrides the HGMERGE
4778 the merge tool used for the given files. It overrides the HGMERGE
4770 environment variable and your configuration files. Previous file
4779 environment variable and your configuration files. Previous file
4771 contents are saved with a ``.orig`` suffix.
4780 contents are saved with a ``.orig`` suffix.
4772
4781
4773 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4782 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4774 (e.g. after having manually fixed-up the files). The default is
4783 (e.g. after having manually fixed-up the files). The default is
4775 to mark all unresolved files.
4784 to mark all unresolved files.
4776
4785
4777 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4786 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4778 default is to mark all resolved files.
4787 default is to mark all resolved files.
4779
4788
4780 - :hg:`resolve -l`: list files which had or still have conflicts.
4789 - :hg:`resolve -l`: list files which had or still have conflicts.
4781 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4790 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4782
4791
4783 Note that Mercurial will not let you commit files with unresolved
4792 Note that Mercurial will not let you commit files with unresolved
4784 merge conflicts. You must use :hg:`resolve -m ...` before you can
4793 merge conflicts. You must use :hg:`resolve -m ...` before you can
4785 commit after a conflicting merge.
4794 commit after a conflicting merge.
4786
4795
4787 Returns 0 on success, 1 if any files fail a resolve attempt.
4796 Returns 0 on success, 1 if any files fail a resolve attempt.
4788 """
4797 """
4789
4798
4790 all, mark, unmark, show, nostatus = \
4799 all, mark, unmark, show, nostatus = \
4791 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
4800 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
4792
4801
4793 if (show and (mark or unmark)) or (mark and unmark):
4802 if (show and (mark or unmark)) or (mark and unmark):
4794 raise util.Abort(_("too many options specified"))
4803 raise util.Abort(_("too many options specified"))
4795 if pats and all:
4804 if pats and all:
4796 raise util.Abort(_("can't specify --all and patterns"))
4805 raise util.Abort(_("can't specify --all and patterns"))
4797 if not (all or pats or show or mark or unmark):
4806 if not (all or pats or show or mark or unmark):
4798 raise util.Abort(_('no files or directories specified; '
4807 raise util.Abort(_('no files or directories specified; '
4799 'use --all to remerge all files'))
4808 'use --all to remerge all files'))
4800
4809
4801 ms = mergemod.mergestate(repo)
4810 ms = mergemod.mergestate(repo)
4802 m = scmutil.match(repo[None], pats, opts)
4811 m = scmutil.match(repo[None], pats, opts)
4803 ret = 0
4812 ret = 0
4804
4813
4805 for f in ms:
4814 for f in ms:
4806 if m(f):
4815 if m(f):
4807 if show:
4816 if show:
4808 if nostatus:
4817 if nostatus:
4809 ui.write("%s\n" % f)
4818 ui.write("%s\n" % f)
4810 else:
4819 else:
4811 ui.write("%s %s\n" % (ms[f].upper(), f),
4820 ui.write("%s %s\n" % (ms[f].upper(), f),
4812 label='resolve.' +
4821 label='resolve.' +
4813 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
4822 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
4814 elif mark:
4823 elif mark:
4815 ms.mark(f, "r")
4824 ms.mark(f, "r")
4816 elif unmark:
4825 elif unmark:
4817 ms.mark(f, "u")
4826 ms.mark(f, "u")
4818 else:
4827 else:
4819 wctx = repo[None]
4828 wctx = repo[None]
4820 mctx = wctx.parents()[-1]
4829 mctx = wctx.parents()[-1]
4821
4830
4822 # backup pre-resolve (merge uses .orig for its own purposes)
4831 # backup pre-resolve (merge uses .orig for its own purposes)
4823 a = repo.wjoin(f)
4832 a = repo.wjoin(f)
4824 util.copyfile(a, a + ".resolve")
4833 util.copyfile(a, a + ".resolve")
4825
4834
4826 try:
4835 try:
4827 # resolve file
4836 # resolve file
4828 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4837 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4829 if ms.resolve(f, wctx, mctx):
4838 if ms.resolve(f, wctx, mctx):
4830 ret = 1
4839 ret = 1
4831 finally:
4840 finally:
4832 ui.setconfig('ui', 'forcemerge', '')
4841 ui.setconfig('ui', 'forcemerge', '')
4833
4842
4834 # replace filemerge's .orig file with our resolve file
4843 # replace filemerge's .orig file with our resolve file
4835 util.rename(a + ".resolve", a + ".orig")
4844 util.rename(a + ".resolve", a + ".orig")
4836
4845
4837 ms.commit()
4846 ms.commit()
4838 return ret
4847 return ret
4839
4848
4840 @command('revert',
4849 @command('revert',
4841 [('a', 'all', None, _('revert all changes when no arguments given')),
4850 [('a', 'all', None, _('revert all changes when no arguments given')),
4842 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4851 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4843 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4852 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4844 ('C', 'no-backup', None, _('do not save backup copies of files')),
4853 ('C', 'no-backup', None, _('do not save backup copies of files')),
4845 ] + walkopts + dryrunopts,
4854 ] + walkopts + dryrunopts,
4846 _('[OPTION]... [-r REV] [NAME]...'))
4855 _('[OPTION]... [-r REV] [NAME]...'))
4847 def revert(ui, repo, *pats, **opts):
4856 def revert(ui, repo, *pats, **opts):
4848 """restore files to their checkout state
4857 """restore files to their checkout state
4849
4858
4850 .. note::
4859 .. note::
4851 To check out earlier revisions, you should use :hg:`update REV`.
4860 To check out earlier revisions, you should use :hg:`update REV`.
4852 To cancel a merge (and lose your changes), use :hg:`update --clean .`.
4861 To cancel a merge (and lose your changes), use :hg:`update --clean .`.
4853
4862
4854 With no revision specified, revert the specified files or directories
4863 With no revision specified, revert the specified files or directories
4855 to the contents they had in the parent of the working directory.
4864 to the contents they had in the parent of the working directory.
4856 This restores the contents of files to an unmodified
4865 This restores the contents of files to an unmodified
4857 state and unschedules adds, removes, copies, and renames. If the
4866 state and unschedules adds, removes, copies, and renames. If the
4858 working directory has two parents, you must explicitly specify a
4867 working directory has two parents, you must explicitly specify a
4859 revision.
4868 revision.
4860
4869
4861 Using the -r/--rev or -d/--date options, revert the given files or
4870 Using the -r/--rev or -d/--date options, revert the given files or
4862 directories to their states as of a specific revision. Because
4871 directories to their states as of a specific revision. Because
4863 revert does not change the working directory parents, this will
4872 revert does not change the working directory parents, this will
4864 cause these files to appear modified. This can be helpful to "back
4873 cause these files to appear modified. This can be helpful to "back
4865 out" some or all of an earlier change. See :hg:`backout` for a
4874 out" some or all of an earlier change. See :hg:`backout` for a
4866 related method.
4875 related method.
4867
4876
4868 Modified files are saved with a .orig suffix before reverting.
4877 Modified files are saved with a .orig suffix before reverting.
4869 To disable these backups, use --no-backup.
4878 To disable these backups, use --no-backup.
4870
4879
4871 See :hg:`help dates` for a list of formats valid for -d/--date.
4880 See :hg:`help dates` for a list of formats valid for -d/--date.
4872
4881
4873 Returns 0 on success.
4882 Returns 0 on success.
4874 """
4883 """
4875
4884
4876 if opts.get("date"):
4885 if opts.get("date"):
4877 if opts.get("rev"):
4886 if opts.get("rev"):
4878 raise util.Abort(_("you can't specify a revision and a date"))
4887 raise util.Abort(_("you can't specify a revision and a date"))
4879 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4888 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
4880
4889
4881 parent, p2 = repo.dirstate.parents()
4890 parent, p2 = repo.dirstate.parents()
4882 if not opts.get('rev') and p2 != nullid:
4891 if not opts.get('rev') and p2 != nullid:
4883 # revert after merge is a trap for new users (issue2915)
4892 # revert after merge is a trap for new users (issue2915)
4884 raise util.Abort(_('uncommitted merge with no revision specified'),
4893 raise util.Abort(_('uncommitted merge with no revision specified'),
4885 hint=_('use "hg update" or see "hg help revert"'))
4894 hint=_('use "hg update" or see "hg help revert"'))
4886
4895
4887 ctx = scmutil.revsingle(repo, opts.get('rev'))
4896 ctx = scmutil.revsingle(repo, opts.get('rev'))
4888
4897
4889 if not pats and not opts.get('all'):
4898 if not pats and not opts.get('all'):
4890 msg = _("no files or directories specified")
4899 msg = _("no files or directories specified")
4891 if p2 != nullid:
4900 if p2 != nullid:
4892 hint = _("uncommitted merge, use --all to discard all changes,"
4901 hint = _("uncommitted merge, use --all to discard all changes,"
4893 " or 'hg update -C .' to abort the merge")
4902 " or 'hg update -C .' to abort the merge")
4894 raise util.Abort(msg, hint=hint)
4903 raise util.Abort(msg, hint=hint)
4895 dirty = util.any(repo.status())
4904 dirty = util.any(repo.status())
4896 node = ctx.node()
4905 node = ctx.node()
4897 if node != parent:
4906 if node != parent:
4898 if dirty:
4907 if dirty:
4899 hint = _("uncommitted changes, use --all to discard all"
4908 hint = _("uncommitted changes, use --all to discard all"
4900 " changes, or 'hg update %s' to update") % ctx.rev()
4909 " changes, or 'hg update %s' to update") % ctx.rev()
4901 else:
4910 else:
4902 hint = _("use --all to revert all files,"
4911 hint = _("use --all to revert all files,"
4903 " or 'hg update %s' to update") % ctx.rev()
4912 " or 'hg update %s' to update") % ctx.rev()
4904 elif dirty:
4913 elif dirty:
4905 hint = _("uncommitted changes, use --all to discard all changes")
4914 hint = _("uncommitted changes, use --all to discard all changes")
4906 else:
4915 else:
4907 hint = _("use --all to revert all files")
4916 hint = _("use --all to revert all files")
4908 raise util.Abort(msg, hint=hint)
4917 raise util.Abort(msg, hint=hint)
4909
4918
4910 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
4919 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
4911
4920
4912 @command('rollback', dryrunopts +
4921 @command('rollback', dryrunopts +
4913 [('f', 'force', False, _('ignore safety measures'))])
4922 [('f', 'force', False, _('ignore safety measures'))])
4914 def rollback(ui, repo, **opts):
4923 def rollback(ui, repo, **opts):
4915 """roll back the last transaction (dangerous)
4924 """roll back the last transaction (dangerous)
4916
4925
4917 This command should be used with care. There is only one level of
4926 This command should be used with care. There is only one level of
4918 rollback, and there is no way to undo a rollback. It will also
4927 rollback, and there is no way to undo a rollback. It will also
4919 restore the dirstate at the time of the last transaction, losing
4928 restore the dirstate at the time of the last transaction, losing
4920 any dirstate changes since that time. This command does not alter
4929 any dirstate changes since that time. This command does not alter
4921 the working directory.
4930 the working directory.
4922
4931
4923 Transactions are used to encapsulate the effects of all commands
4932 Transactions are used to encapsulate the effects of all commands
4924 that create new changesets or propagate existing changesets into a
4933 that create new changesets or propagate existing changesets into a
4925 repository. For example, the following commands are transactional,
4934 repository. For example, the following commands are transactional,
4926 and their effects can be rolled back:
4935 and their effects can be rolled back:
4927
4936
4928 - commit
4937 - commit
4929 - import
4938 - import
4930 - pull
4939 - pull
4931 - push (with this repository as the destination)
4940 - push (with this repository as the destination)
4932 - unbundle
4941 - unbundle
4933
4942
4934 To avoid permanent data loss, rollback will refuse to rollback a
4943 To avoid permanent data loss, rollback will refuse to rollback a
4935 commit transaction if it isn't checked out. Use --force to
4944 commit transaction if it isn't checked out. Use --force to
4936 override this protection.
4945 override this protection.
4937
4946
4938 This command is not intended for use on public repositories. Once
4947 This command is not intended for use on public repositories. Once
4939 changes are visible for pull by other users, rolling a transaction
4948 changes are visible for pull by other users, rolling a transaction
4940 back locally is ineffective (someone else may already have pulled
4949 back locally is ineffective (someone else may already have pulled
4941 the changes). Furthermore, a race is possible with readers of the
4950 the changes). Furthermore, a race is possible with readers of the
4942 repository; for example an in-progress pull from the repository
4951 repository; for example an in-progress pull from the repository
4943 may fail if a rollback is performed.
4952 may fail if a rollback is performed.
4944
4953
4945 Returns 0 on success, 1 if no rollback data is available.
4954 Returns 0 on success, 1 if no rollback data is available.
4946 """
4955 """
4947 return repo.rollback(dryrun=opts.get('dry_run'),
4956 return repo.rollback(dryrun=opts.get('dry_run'),
4948 force=opts.get('force'))
4957 force=opts.get('force'))
4949
4958
4950 @command('root', [])
4959 @command('root', [])
4951 def root(ui, repo):
4960 def root(ui, repo):
4952 """print the root (top) of the current working directory
4961 """print the root (top) of the current working directory
4953
4962
4954 Print the root directory of the current repository.
4963 Print the root directory of the current repository.
4955
4964
4956 Returns 0 on success.
4965 Returns 0 on success.
4957 """
4966 """
4958 ui.write(repo.root + "\n")
4967 ui.write(repo.root + "\n")
4959
4968
4960 @command('^serve',
4969 @command('^serve',
4961 [('A', 'accesslog', '', _('name of access log file to write to'),
4970 [('A', 'accesslog', '', _('name of access log file to write to'),
4962 _('FILE')),
4971 _('FILE')),
4963 ('d', 'daemon', None, _('run server in background')),
4972 ('d', 'daemon', None, _('run server in background')),
4964 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')),
4973 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')),
4965 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4974 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
4966 # use string type, then we can check if something was passed
4975 # use string type, then we can check if something was passed
4967 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4976 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
4968 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4977 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
4969 _('ADDR')),
4978 _('ADDR')),
4970 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4979 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
4971 _('PREFIX')),
4980 _('PREFIX')),
4972 ('n', 'name', '',
4981 ('n', 'name', '',
4973 _('name to show in web pages (default: working directory)'), _('NAME')),
4982 _('name to show in web pages (default: working directory)'), _('NAME')),
4974 ('', 'web-conf', '',
4983 ('', 'web-conf', '',
4975 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
4984 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
4976 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4985 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
4977 _('FILE')),
4986 _('FILE')),
4978 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4987 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
4979 ('', 'stdio', None, _('for remote clients')),
4988 ('', 'stdio', None, _('for remote clients')),
4980 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
4989 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
4981 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4990 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
4982 ('', 'style', '', _('template style to use'), _('STYLE')),
4991 ('', 'style', '', _('template style to use'), _('STYLE')),
4983 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4992 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4984 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
4993 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
4985 _('[OPTION]...'))
4994 _('[OPTION]...'))
4986 def serve(ui, repo, **opts):
4995 def serve(ui, repo, **opts):
4987 """start stand-alone webserver
4996 """start stand-alone webserver
4988
4997
4989 Start a local HTTP repository browser and pull server. You can use
4998 Start a local HTTP repository browser and pull server. You can use
4990 this for ad-hoc sharing and browsing of repositories. It is
4999 this for ad-hoc sharing and browsing of repositories. It is
4991 recommended to use a real web server to serve a repository for
5000 recommended to use a real web server to serve a repository for
4992 longer periods of time.
5001 longer periods of time.
4993
5002
4994 Please note that the server does not implement access control.
5003 Please note that the server does not implement access control.
4995 This means that, by default, anybody can read from the server and
5004 This means that, by default, anybody can read from the server and
4996 nobody can write to it by default. Set the ``web.allow_push``
5005 nobody can write to it by default. Set the ``web.allow_push``
4997 option to ``*`` to allow everybody to push to the server. You
5006 option to ``*`` to allow everybody to push to the server. You
4998 should use a real web server if you need to authenticate users.
5007 should use a real web server if you need to authenticate users.
4999
5008
5000 By default, the server logs accesses to stdout and errors to
5009 By default, the server logs accesses to stdout and errors to
5001 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5010 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5002 files.
5011 files.
5003
5012
5004 To have the server choose a free port number to listen on, specify
5013 To have the server choose a free port number to listen on, specify
5005 a port number of 0; in this case, the server will print the port
5014 a port number of 0; in this case, the server will print the port
5006 number it uses.
5015 number it uses.
5007
5016
5008 Returns 0 on success.
5017 Returns 0 on success.
5009 """
5018 """
5010
5019
5011 if opts["stdio"] and opts["cmdserver"]:
5020 if opts["stdio"] and opts["cmdserver"]:
5012 raise util.Abort(_("cannot use --stdio with --cmdserver"))
5021 raise util.Abort(_("cannot use --stdio with --cmdserver"))
5013
5022
5014 def checkrepo():
5023 def checkrepo():
5015 if repo is None:
5024 if repo is None:
5016 raise error.RepoError(_("There is no Mercurial repository here"
5025 raise error.RepoError(_("There is no Mercurial repository here"
5017 " (.hg not found)"))
5026 " (.hg not found)"))
5018
5027
5019 if opts["stdio"]:
5028 if opts["stdio"]:
5020 checkrepo()
5029 checkrepo()
5021 s = sshserver.sshserver(ui, repo)
5030 s = sshserver.sshserver(ui, repo)
5022 s.serve_forever()
5031 s.serve_forever()
5023
5032
5024 if opts["cmdserver"]:
5033 if opts["cmdserver"]:
5025 checkrepo()
5034 checkrepo()
5026 s = commandserver.server(ui, repo, opts["cmdserver"])
5035 s = commandserver.server(ui, repo, opts["cmdserver"])
5027 return s.serve()
5036 return s.serve()
5028
5037
5029 # this way we can check if something was given in the command-line
5038 # this way we can check if something was given in the command-line
5030 if opts.get('port'):
5039 if opts.get('port'):
5031 opts['port'] = util.getport(opts.get('port'))
5040 opts['port'] = util.getport(opts.get('port'))
5032
5041
5033 baseui = repo and repo.baseui or ui
5042 baseui = repo and repo.baseui or ui
5034 optlist = ("name templates style address port prefix ipv6"
5043 optlist = ("name templates style address port prefix ipv6"
5035 " accesslog errorlog certificate encoding")
5044 " accesslog errorlog certificate encoding")
5036 for o in optlist.split():
5045 for o in optlist.split():
5037 val = opts.get(o, '')
5046 val = opts.get(o, '')
5038 if val in (None, ''): # should check against default options instead
5047 if val in (None, ''): # should check against default options instead
5039 continue
5048 continue
5040 baseui.setconfig("web", o, val)
5049 baseui.setconfig("web", o, val)
5041 if repo and repo.ui != baseui:
5050 if repo and repo.ui != baseui:
5042 repo.ui.setconfig("web", o, val)
5051 repo.ui.setconfig("web", o, val)
5043
5052
5044 o = opts.get('web_conf') or opts.get('webdir_conf')
5053 o = opts.get('web_conf') or opts.get('webdir_conf')
5045 if not o:
5054 if not o:
5046 if not repo:
5055 if not repo:
5047 raise error.RepoError(_("There is no Mercurial repository"
5056 raise error.RepoError(_("There is no Mercurial repository"
5048 " here (.hg not found)"))
5057 " here (.hg not found)"))
5049 o = repo.root
5058 o = repo.root
5050
5059
5051 app = hgweb.hgweb(o, baseui=ui)
5060 app = hgweb.hgweb(o, baseui=ui)
5052
5061
5053 class service(object):
5062 class service(object):
5054 def init(self):
5063 def init(self):
5055 util.setsignalhandler()
5064 util.setsignalhandler()
5056 self.httpd = hgweb.server.create_server(ui, app)
5065 self.httpd = hgweb.server.create_server(ui, app)
5057
5066
5058 if opts['port'] and not ui.verbose:
5067 if opts['port'] and not ui.verbose:
5059 return
5068 return
5060
5069
5061 if self.httpd.prefix:
5070 if self.httpd.prefix:
5062 prefix = self.httpd.prefix.strip('/') + '/'
5071 prefix = self.httpd.prefix.strip('/') + '/'
5063 else:
5072 else:
5064 prefix = ''
5073 prefix = ''
5065
5074
5066 port = ':%d' % self.httpd.port
5075 port = ':%d' % self.httpd.port
5067 if port == ':80':
5076 if port == ':80':
5068 port = ''
5077 port = ''
5069
5078
5070 bindaddr = self.httpd.addr
5079 bindaddr = self.httpd.addr
5071 if bindaddr == '0.0.0.0':
5080 if bindaddr == '0.0.0.0':
5072 bindaddr = '*'
5081 bindaddr = '*'
5073 elif ':' in bindaddr: # IPv6
5082 elif ':' in bindaddr: # IPv6
5074 bindaddr = '[%s]' % bindaddr
5083 bindaddr = '[%s]' % bindaddr
5075
5084
5076 fqaddr = self.httpd.fqaddr
5085 fqaddr = self.httpd.fqaddr
5077 if ':' in fqaddr:
5086 if ':' in fqaddr:
5078 fqaddr = '[%s]' % fqaddr
5087 fqaddr = '[%s]' % fqaddr
5079 if opts['port']:
5088 if opts['port']:
5080 write = ui.status
5089 write = ui.status
5081 else:
5090 else:
5082 write = ui.write
5091 write = ui.write
5083 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
5092 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
5084 (fqaddr, port, prefix, bindaddr, self.httpd.port))
5093 (fqaddr, port, prefix, bindaddr, self.httpd.port))
5085
5094
5086 def run(self):
5095 def run(self):
5087 self.httpd.serve_forever()
5096 self.httpd.serve_forever()
5088
5097
5089 service = service()
5098 service = service()
5090
5099
5091 cmdutil.service(opts, initfn=service.init, runfn=service.run)
5100 cmdutil.service(opts, initfn=service.init, runfn=service.run)
5092
5101
5093 @command('showconfig|debugconfig',
5102 @command('showconfig|debugconfig',
5094 [('u', 'untrusted', None, _('show untrusted configuration options'))],
5103 [('u', 'untrusted', None, _('show untrusted configuration options'))],
5095 _('[-u] [NAME]...'))
5104 _('[-u] [NAME]...'))
5096 def showconfig(ui, repo, *values, **opts):
5105 def showconfig(ui, repo, *values, **opts):
5097 """show combined config settings from all hgrc files
5106 """show combined config settings from all hgrc files
5098
5107
5099 With no arguments, print names and values of all config items.
5108 With no arguments, print names and values of all config items.
5100
5109
5101 With one argument of the form section.name, print just the value
5110 With one argument of the form section.name, print just the value
5102 of that config item.
5111 of that config item.
5103
5112
5104 With multiple arguments, print names and values of all config
5113 With multiple arguments, print names and values of all config
5105 items with matching section names.
5114 items with matching section names.
5106
5115
5107 With --debug, the source (filename and line number) is printed
5116 With --debug, the source (filename and line number) is printed
5108 for each config item.
5117 for each config item.
5109
5118
5110 Returns 0 on success.
5119 Returns 0 on success.
5111 """
5120 """
5112
5121
5113 for f in scmutil.rcpath():
5122 for f in scmutil.rcpath():
5114 ui.debug('read config from: %s\n' % f)
5123 ui.debug('read config from: %s\n' % f)
5115 untrusted = bool(opts.get('untrusted'))
5124 untrusted = bool(opts.get('untrusted'))
5116 if values:
5125 if values:
5117 sections = [v for v in values if '.' not in v]
5126 sections = [v for v in values if '.' not in v]
5118 items = [v for v in values if '.' in v]
5127 items = [v for v in values if '.' in v]
5119 if len(items) > 1 or items and sections:
5128 if len(items) > 1 or items and sections:
5120 raise util.Abort(_('only one config item permitted'))
5129 raise util.Abort(_('only one config item permitted'))
5121 for section, name, value in ui.walkconfig(untrusted=untrusted):
5130 for section, name, value in ui.walkconfig(untrusted=untrusted):
5122 value = str(value).replace('\n', '\\n')
5131 value = str(value).replace('\n', '\\n')
5123 sectname = section + '.' + name
5132 sectname = section + '.' + name
5124 if values:
5133 if values:
5125 for v in values:
5134 for v in values:
5126 if v == section:
5135 if v == section:
5127 ui.debug('%s: ' %
5136 ui.debug('%s: ' %
5128 ui.configsource(section, name, untrusted))
5137 ui.configsource(section, name, untrusted))
5129 ui.write('%s=%s\n' % (sectname, value))
5138 ui.write('%s=%s\n' % (sectname, value))
5130 elif v == sectname:
5139 elif v == sectname:
5131 ui.debug('%s: ' %
5140 ui.debug('%s: ' %
5132 ui.configsource(section, name, untrusted))
5141 ui.configsource(section, name, untrusted))
5133 ui.write(value, '\n')
5142 ui.write(value, '\n')
5134 else:
5143 else:
5135 ui.debug('%s: ' %
5144 ui.debug('%s: ' %
5136 ui.configsource(section, name, untrusted))
5145 ui.configsource(section, name, untrusted))
5137 ui.write('%s=%s\n' % (sectname, value))
5146 ui.write('%s=%s\n' % (sectname, value))
5138
5147
5139 @command('^status|st',
5148 @command('^status|st',
5140 [('A', 'all', None, _('show status of all files')),
5149 [('A', 'all', None, _('show status of all files')),
5141 ('m', 'modified', None, _('show only modified files')),
5150 ('m', 'modified', None, _('show only modified files')),
5142 ('a', 'added', None, _('show only added files')),
5151 ('a', 'added', None, _('show only added files')),
5143 ('r', 'removed', None, _('show only removed files')),
5152 ('r', 'removed', None, _('show only removed files')),
5144 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5153 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5145 ('c', 'clean', None, _('show only files without changes')),
5154 ('c', 'clean', None, _('show only files without changes')),
5146 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5155 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5147 ('i', 'ignored', None, _('show only ignored files')),
5156 ('i', 'ignored', None, _('show only ignored files')),
5148 ('n', 'no-status', None, _('hide status prefix')),
5157 ('n', 'no-status', None, _('hide status prefix')),
5149 ('C', 'copies', None, _('show source of copied files')),
5158 ('C', 'copies', None, _('show source of copied files')),
5150 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5159 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5151 ('', 'rev', [], _('show difference from revision'), _('REV')),
5160 ('', 'rev', [], _('show difference from revision'), _('REV')),
5152 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5161 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5153 ] + walkopts + subrepoopts,
5162 ] + walkopts + subrepoopts,
5154 _('[OPTION]... [FILE]...'))
5163 _('[OPTION]... [FILE]...'))
5155 def status(ui, repo, *pats, **opts):
5164 def status(ui, repo, *pats, **opts):
5156 """show changed files in the working directory
5165 """show changed files in the working directory
5157
5166
5158 Show status of files in the repository. If names are given, only
5167 Show status of files in the repository. If names are given, only
5159 files that match are shown. Files that are clean or ignored or
5168 files that match are shown. Files that are clean or ignored or
5160 the source of a copy/move operation, are not listed unless
5169 the source of a copy/move operation, are not listed unless
5161 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5170 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5162 Unless options described with "show only ..." are given, the
5171 Unless options described with "show only ..." are given, the
5163 options -mardu are used.
5172 options -mardu are used.
5164
5173
5165 Option -q/--quiet hides untracked (unknown and ignored) files
5174 Option -q/--quiet hides untracked (unknown and ignored) files
5166 unless explicitly requested with -u/--unknown or -i/--ignored.
5175 unless explicitly requested with -u/--unknown or -i/--ignored.
5167
5176
5168 .. note::
5177 .. note::
5169 status may appear to disagree with diff if permissions have
5178 status may appear to disagree with diff if permissions have
5170 changed or a merge has occurred. The standard diff format does
5179 changed or a merge has occurred. The standard diff format does
5171 not report permission changes and diff only reports changes
5180 not report permission changes and diff only reports changes
5172 relative to one merge parent.
5181 relative to one merge parent.
5173
5182
5174 If one revision is given, it is used as the base revision.
5183 If one revision is given, it is used as the base revision.
5175 If two revisions are given, the differences between them are
5184 If two revisions are given, the differences between them are
5176 shown. The --change option can also be used as a shortcut to list
5185 shown. The --change option can also be used as a shortcut to list
5177 the changed files of a revision from its first parent.
5186 the changed files of a revision from its first parent.
5178
5187
5179 The codes used to show the status of files are::
5188 The codes used to show the status of files are::
5180
5189
5181 M = modified
5190 M = modified
5182 A = added
5191 A = added
5183 R = removed
5192 R = removed
5184 C = clean
5193 C = clean
5185 ! = missing (deleted by non-hg command, but still tracked)
5194 ! = missing (deleted by non-hg command, but still tracked)
5186 ? = not tracked
5195 ? = not tracked
5187 I = ignored
5196 I = ignored
5188 = origin of the previous file listed as A (added)
5197 = origin of the previous file listed as A (added)
5189
5198
5190 .. container:: verbose
5199 .. container:: verbose
5191
5200
5192 Examples:
5201 Examples:
5193
5202
5194 - show changes in the working directory relative to a
5203 - show changes in the working directory relative to a
5195 changeset::
5204 changeset::
5196
5205
5197 hg status --rev 9353
5206 hg status --rev 9353
5198
5207
5199 - show all changes including copies in an existing changeset::
5208 - show all changes including copies in an existing changeset::
5200
5209
5201 hg status --copies --change 9353
5210 hg status --copies --change 9353
5202
5211
5203 - get a NUL separated list of added files, suitable for xargs::
5212 - get a NUL separated list of added files, suitable for xargs::
5204
5213
5205 hg status -an0
5214 hg status -an0
5206
5215
5207 Returns 0 on success.
5216 Returns 0 on success.
5208 """
5217 """
5209
5218
5210 revs = opts.get('rev')
5219 revs = opts.get('rev')
5211 change = opts.get('change')
5220 change = opts.get('change')
5212
5221
5213 if revs and change:
5222 if revs and change:
5214 msg = _('cannot specify --rev and --change at the same time')
5223 msg = _('cannot specify --rev and --change at the same time')
5215 raise util.Abort(msg)
5224 raise util.Abort(msg)
5216 elif change:
5225 elif change:
5217 node2 = scmutil.revsingle(repo, change, None).node()
5226 node2 = scmutil.revsingle(repo, change, None).node()
5218 node1 = repo[node2].p1().node()
5227 node1 = repo[node2].p1().node()
5219 else:
5228 else:
5220 node1, node2 = scmutil.revpair(repo, revs)
5229 node1, node2 = scmutil.revpair(repo, revs)
5221
5230
5222 cwd = (pats and repo.getcwd()) or ''
5231 cwd = (pats and repo.getcwd()) or ''
5223 end = opts.get('print0') and '\0' or '\n'
5232 end = opts.get('print0') and '\0' or '\n'
5224 copy = {}
5233 copy = {}
5225 states = 'modified added removed deleted unknown ignored clean'.split()
5234 states = 'modified added removed deleted unknown ignored clean'.split()
5226 show = [k for k in states if opts.get(k)]
5235 show = [k for k in states if opts.get(k)]
5227 if opts.get('all'):
5236 if opts.get('all'):
5228 show += ui.quiet and (states[:4] + ['clean']) or states
5237 show += ui.quiet and (states[:4] + ['clean']) or states
5229 if not show:
5238 if not show:
5230 show = ui.quiet and states[:4] or states[:5]
5239 show = ui.quiet and states[:4] or states[:5]
5231
5240
5232 stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts),
5241 stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts),
5233 'ignored' in show, 'clean' in show, 'unknown' in show,
5242 'ignored' in show, 'clean' in show, 'unknown' in show,
5234 opts.get('subrepos'))
5243 opts.get('subrepos'))
5235 changestates = zip(states, 'MAR!?IC', stat)
5244 changestates = zip(states, 'MAR!?IC', stat)
5236
5245
5237 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
5246 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
5238 copy = copies.pathcopies(repo[node1], repo[node2])
5247 copy = copies.pathcopies(repo[node1], repo[node2])
5239
5248
5240 fm = ui.formatter('status', opts)
5249 fm = ui.formatter('status', opts)
5241 format = '%s %s' + end
5250 format = '%s %s' + end
5242 if opts.get('no_status'):
5251 if opts.get('no_status'):
5243 format = '%.0s%s' + end
5252 format = '%.0s%s' + end
5244
5253
5245 for state, char, files in changestates:
5254 for state, char, files in changestates:
5246 if state in show:
5255 if state in show:
5247 label = 'status.' + state
5256 label = 'status.' + state
5248 for f in files:
5257 for f in files:
5249 fm.startitem()
5258 fm.startitem()
5250 fm.write("status path", format, char,
5259 fm.write("status path", format, char,
5251 repo.pathto(f, cwd), label=label)
5260 repo.pathto(f, cwd), label=label)
5252 if f in copy:
5261 if f in copy:
5253 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
5262 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
5254 label='status.copied')
5263 label='status.copied')
5255 fm.end()
5264 fm.end()
5256
5265
5257 @command('^summary|sum',
5266 @command('^summary|sum',
5258 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
5267 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
5259 def summary(ui, repo, **opts):
5268 def summary(ui, repo, **opts):
5260 """summarize working directory state
5269 """summarize working directory state
5261
5270
5262 This generates a brief summary of the working directory state,
5271 This generates a brief summary of the working directory state,
5263 including parents, branch, commit status, and available updates.
5272 including parents, branch, commit status, and available updates.
5264
5273
5265 With the --remote option, this will check the default paths for
5274 With the --remote option, this will check the default paths for
5266 incoming and outgoing changes. This can be time-consuming.
5275 incoming and outgoing changes. This can be time-consuming.
5267
5276
5268 Returns 0 on success.
5277 Returns 0 on success.
5269 """
5278 """
5270
5279
5271 ctx = repo[None]
5280 ctx = repo[None]
5272 parents = ctx.parents()
5281 parents = ctx.parents()
5273 pnode = parents[0].node()
5282 pnode = parents[0].node()
5274 marks = []
5283 marks = []
5275
5284
5276 for p in parents:
5285 for p in parents:
5277 # label with log.changeset (instead of log.parent) since this
5286 # label with log.changeset (instead of log.parent) since this
5278 # shows a working directory parent *changeset*:
5287 # shows a working directory parent *changeset*:
5279 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
5288 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
5280 label='log.changeset')
5289 label='log.changeset')
5281 ui.write(' '.join(p.tags()), label='log.tag')
5290 ui.write(' '.join(p.tags()), label='log.tag')
5282 if p.bookmarks():
5291 if p.bookmarks():
5283 marks.extend(p.bookmarks())
5292 marks.extend(p.bookmarks())
5284 if p.rev() == -1:
5293 if p.rev() == -1:
5285 if not len(repo):
5294 if not len(repo):
5286 ui.write(_(' (empty repository)'))
5295 ui.write(_(' (empty repository)'))
5287 else:
5296 else:
5288 ui.write(_(' (no revision checked out)'))
5297 ui.write(_(' (no revision checked out)'))
5289 ui.write('\n')
5298 ui.write('\n')
5290 if p.description():
5299 if p.description():
5291 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5300 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5292 label='log.summary')
5301 label='log.summary')
5293
5302
5294 branch = ctx.branch()
5303 branch = ctx.branch()
5295 bheads = repo.branchheads(branch)
5304 bheads = repo.branchheads(branch)
5296 m = _('branch: %s\n') % branch
5305 m = _('branch: %s\n') % branch
5297 if branch != 'default':
5306 if branch != 'default':
5298 ui.write(m, label='log.branch')
5307 ui.write(m, label='log.branch')
5299 else:
5308 else:
5300 ui.status(m, label='log.branch')
5309 ui.status(m, label='log.branch')
5301
5310
5302 if marks:
5311 if marks:
5303 current = repo._bookmarkcurrent
5312 current = repo._bookmarkcurrent
5304 ui.write(_('bookmarks:'), label='log.bookmark')
5313 ui.write(_('bookmarks:'), label='log.bookmark')
5305 if current is not None:
5314 if current is not None:
5306 try:
5315 try:
5307 marks.remove(current)
5316 marks.remove(current)
5308 ui.write(' *' + current, label='bookmarks.current')
5317 ui.write(' *' + current, label='bookmarks.current')
5309 except ValueError:
5318 except ValueError:
5310 # current bookmark not in parent ctx marks
5319 # current bookmark not in parent ctx marks
5311 pass
5320 pass
5312 for m in marks:
5321 for m in marks:
5313 ui.write(' ' + m, label='log.bookmark')
5322 ui.write(' ' + m, label='log.bookmark')
5314 ui.write('\n', label='log.bookmark')
5323 ui.write('\n', label='log.bookmark')
5315
5324
5316 st = list(repo.status(unknown=True))[:6]
5325 st = list(repo.status(unknown=True))[:6]
5317
5326
5318 c = repo.dirstate.copies()
5327 c = repo.dirstate.copies()
5319 copied, renamed = [], []
5328 copied, renamed = [], []
5320 for d, s in c.iteritems():
5329 for d, s in c.iteritems():
5321 if s in st[2]:
5330 if s in st[2]:
5322 st[2].remove(s)
5331 st[2].remove(s)
5323 renamed.append(d)
5332 renamed.append(d)
5324 else:
5333 else:
5325 copied.append(d)
5334 copied.append(d)
5326 if d in st[1]:
5335 if d in st[1]:
5327 st[1].remove(d)
5336 st[1].remove(d)
5328 st.insert(3, renamed)
5337 st.insert(3, renamed)
5329 st.insert(4, copied)
5338 st.insert(4, copied)
5330
5339
5331 ms = mergemod.mergestate(repo)
5340 ms = mergemod.mergestate(repo)
5332 st.append([f for f in ms if ms[f] == 'u'])
5341 st.append([f for f in ms if ms[f] == 'u'])
5333
5342
5334 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5343 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5335 st.append(subs)
5344 st.append(subs)
5336
5345
5337 labels = [ui.label(_('%d modified'), 'status.modified'),
5346 labels = [ui.label(_('%d modified'), 'status.modified'),
5338 ui.label(_('%d added'), 'status.added'),
5347 ui.label(_('%d added'), 'status.added'),
5339 ui.label(_('%d removed'), 'status.removed'),
5348 ui.label(_('%d removed'), 'status.removed'),
5340 ui.label(_('%d renamed'), 'status.copied'),
5349 ui.label(_('%d renamed'), 'status.copied'),
5341 ui.label(_('%d copied'), 'status.copied'),
5350 ui.label(_('%d copied'), 'status.copied'),
5342 ui.label(_('%d deleted'), 'status.deleted'),
5351 ui.label(_('%d deleted'), 'status.deleted'),
5343 ui.label(_('%d unknown'), 'status.unknown'),
5352 ui.label(_('%d unknown'), 'status.unknown'),
5344 ui.label(_('%d ignored'), 'status.ignored'),
5353 ui.label(_('%d ignored'), 'status.ignored'),
5345 ui.label(_('%d unresolved'), 'resolve.unresolved'),
5354 ui.label(_('%d unresolved'), 'resolve.unresolved'),
5346 ui.label(_('%d subrepos'), 'status.modified')]
5355 ui.label(_('%d subrepos'), 'status.modified')]
5347 t = []
5356 t = []
5348 for s, l in zip(st, labels):
5357 for s, l in zip(st, labels):
5349 if s:
5358 if s:
5350 t.append(l % len(s))
5359 t.append(l % len(s))
5351
5360
5352 t = ', '.join(t)
5361 t = ', '.join(t)
5353 cleanworkdir = False
5362 cleanworkdir = False
5354
5363
5355 if len(parents) > 1:
5364 if len(parents) > 1:
5356 t += _(' (merge)')
5365 t += _(' (merge)')
5357 elif branch != parents[0].branch():
5366 elif branch != parents[0].branch():
5358 t += _(' (new branch)')
5367 t += _(' (new branch)')
5359 elif (parents[0].extra().get('close') and
5368 elif (parents[0].extra().get('close') and
5360 pnode in repo.branchheads(branch, closed=True)):
5369 pnode in repo.branchheads(branch, closed=True)):
5361 t += _(' (head closed)')
5370 t += _(' (head closed)')
5362 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]):
5371 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]):
5363 t += _(' (clean)')
5372 t += _(' (clean)')
5364 cleanworkdir = True
5373 cleanworkdir = True
5365 elif pnode not in bheads:
5374 elif pnode not in bheads:
5366 t += _(' (new branch head)')
5375 t += _(' (new branch head)')
5367
5376
5368 if cleanworkdir:
5377 if cleanworkdir:
5369 ui.status(_('commit: %s\n') % t.strip())
5378 ui.status(_('commit: %s\n') % t.strip())
5370 else:
5379 else:
5371 ui.write(_('commit: %s\n') % t.strip())
5380 ui.write(_('commit: %s\n') % t.strip())
5372
5381
5373 # all ancestors of branch heads - all ancestors of parent = new csets
5382 # all ancestors of branch heads - all ancestors of parent = new csets
5374 new = [0] * len(repo)
5383 new = [0] * len(repo)
5375 cl = repo.changelog
5384 cl = repo.changelog
5376 for a in [cl.rev(n) for n in bheads]:
5385 for a in [cl.rev(n) for n in bheads]:
5377 new[a] = 1
5386 new[a] = 1
5378 for a in cl.ancestors(*[cl.rev(n) for n in bheads]):
5387 for a in cl.ancestors(*[cl.rev(n) for n in bheads]):
5379 new[a] = 1
5388 new[a] = 1
5380 for a in [p.rev() for p in parents]:
5389 for a in [p.rev() for p in parents]:
5381 if a >= 0:
5390 if a >= 0:
5382 new[a] = 0
5391 new[a] = 0
5383 for a in cl.ancestors(*[p.rev() for p in parents]):
5392 for a in cl.ancestors(*[p.rev() for p in parents]):
5384 new[a] = 0
5393 new[a] = 0
5385 new = sum(new)
5394 new = sum(new)
5386
5395
5387 if new == 0:
5396 if new == 0:
5388 ui.status(_('update: (current)\n'))
5397 ui.status(_('update: (current)\n'))
5389 elif pnode not in bheads:
5398 elif pnode not in bheads:
5390 ui.write(_('update: %d new changesets (update)\n') % new)
5399 ui.write(_('update: %d new changesets (update)\n') % new)
5391 else:
5400 else:
5392 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5401 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5393 (new, len(bheads)))
5402 (new, len(bheads)))
5394
5403
5395 if opts.get('remote'):
5404 if opts.get('remote'):
5396 t = []
5405 t = []
5397 source, branches = hg.parseurl(ui.expandpath('default'))
5406 source, branches = hg.parseurl(ui.expandpath('default'))
5398 other = hg.peer(repo, {}, source)
5407 other = hg.peer(repo, {}, source)
5399 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
5408 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
5400 ui.debug('comparing with %s\n' % util.hidepassword(source))
5409 ui.debug('comparing with %s\n' % util.hidepassword(source))
5401 repo.ui.pushbuffer()
5410 repo.ui.pushbuffer()
5402 commoninc = discovery.findcommonincoming(repo, other)
5411 commoninc = discovery.findcommonincoming(repo, other)
5403 _common, incoming, _rheads = commoninc
5412 _common, incoming, _rheads = commoninc
5404 repo.ui.popbuffer()
5413 repo.ui.popbuffer()
5405 if incoming:
5414 if incoming:
5406 t.append(_('1 or more incoming'))
5415 t.append(_('1 or more incoming'))
5407
5416
5408 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5417 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5409 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5418 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5410 if source != dest:
5419 if source != dest:
5411 other = hg.peer(repo, {}, dest)
5420 other = hg.peer(repo, {}, dest)
5412 commoninc = None
5421 commoninc = None
5413 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5422 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5414 repo.ui.pushbuffer()
5423 repo.ui.pushbuffer()
5415 outgoing = discovery.findcommonoutgoing(repo, other,
5424 outgoing = discovery.findcommonoutgoing(repo, other,
5416 commoninc=commoninc)
5425 commoninc=commoninc)
5417 repo.ui.popbuffer()
5426 repo.ui.popbuffer()
5418 o = outgoing.missing
5427 o = outgoing.missing
5419 if o:
5428 if o:
5420 t.append(_('%d outgoing') % len(o))
5429 t.append(_('%d outgoing') % len(o))
5421 if 'bookmarks' in other.listkeys('namespaces'):
5430 if 'bookmarks' in other.listkeys('namespaces'):
5422 lmarks = repo.listkeys('bookmarks')
5431 lmarks = repo.listkeys('bookmarks')
5423 rmarks = other.listkeys('bookmarks')
5432 rmarks = other.listkeys('bookmarks')
5424 diff = set(rmarks) - set(lmarks)
5433 diff = set(rmarks) - set(lmarks)
5425 if len(diff) > 0:
5434 if len(diff) > 0:
5426 t.append(_('%d incoming bookmarks') % len(diff))
5435 t.append(_('%d incoming bookmarks') % len(diff))
5427 diff = set(lmarks) - set(rmarks)
5436 diff = set(lmarks) - set(rmarks)
5428 if len(diff) > 0:
5437 if len(diff) > 0:
5429 t.append(_('%d outgoing bookmarks') % len(diff))
5438 t.append(_('%d outgoing bookmarks') % len(diff))
5430
5439
5431 if t:
5440 if t:
5432 ui.write(_('remote: %s\n') % (', '.join(t)))
5441 ui.write(_('remote: %s\n') % (', '.join(t)))
5433 else:
5442 else:
5434 ui.status(_('remote: (synced)\n'))
5443 ui.status(_('remote: (synced)\n'))
5435
5444
5436 @command('tag',
5445 @command('tag',
5437 [('f', 'force', None, _('force tag')),
5446 [('f', 'force', None, _('force tag')),
5438 ('l', 'local', None, _('make the tag local')),
5447 ('l', 'local', None, _('make the tag local')),
5439 ('r', 'rev', '', _('revision to tag'), _('REV')),
5448 ('r', 'rev', '', _('revision to tag'), _('REV')),
5440 ('', 'remove', None, _('remove a tag')),
5449 ('', 'remove', None, _('remove a tag')),
5441 # -l/--local is already there, commitopts cannot be used
5450 # -l/--local is already there, commitopts cannot be used
5442 ('e', 'edit', None, _('edit commit message')),
5451 ('e', 'edit', None, _('edit commit message')),
5443 ('m', 'message', '', _('use <text> as commit message'), _('TEXT')),
5452 ('m', 'message', '', _('use <text> as commit message'), _('TEXT')),
5444 ] + commitopts2,
5453 ] + commitopts2,
5445 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5454 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5446 def tag(ui, repo, name1, *names, **opts):
5455 def tag(ui, repo, name1, *names, **opts):
5447 """add one or more tags for the current or given revision
5456 """add one or more tags for the current or given revision
5448
5457
5449 Name a particular revision using <name>.
5458 Name a particular revision using <name>.
5450
5459
5451 Tags are used to name particular revisions of the repository and are
5460 Tags are used to name particular revisions of the repository and are
5452 very useful to compare different revisions, to go back to significant
5461 very useful to compare different revisions, to go back to significant
5453 earlier versions or to mark branch points as releases, etc. Changing
5462 earlier versions or to mark branch points as releases, etc. Changing
5454 an existing tag is normally disallowed; use -f/--force to override.
5463 an existing tag is normally disallowed; use -f/--force to override.
5455
5464
5456 If no revision is given, the parent of the working directory is
5465 If no revision is given, the parent of the working directory is
5457 used, or tip if no revision is checked out.
5466 used, or tip if no revision is checked out.
5458
5467
5459 To facilitate version control, distribution, and merging of tags,
5468 To facilitate version control, distribution, and merging of tags,
5460 they are stored as a file named ".hgtags" which is managed similarly
5469 they are stored as a file named ".hgtags" which is managed similarly
5461 to other project files and can be hand-edited if necessary. This
5470 to other project files and can be hand-edited if necessary. This
5462 also means that tagging creates a new commit. The file
5471 also means that tagging creates a new commit. The file
5463 ".hg/localtags" is used for local tags (not shared among
5472 ".hg/localtags" is used for local tags (not shared among
5464 repositories).
5473 repositories).
5465
5474
5466 Tag commits are usually made at the head of a branch. If the parent
5475 Tag commits are usually made at the head of a branch. If the parent
5467 of the working directory is not a branch head, :hg:`tag` aborts; use
5476 of the working directory is not a branch head, :hg:`tag` aborts; use
5468 -f/--force to force the tag commit to be based on a non-head
5477 -f/--force to force the tag commit to be based on a non-head
5469 changeset.
5478 changeset.
5470
5479
5471 See :hg:`help dates` for a list of formats valid for -d/--date.
5480 See :hg:`help dates` for a list of formats valid for -d/--date.
5472
5481
5473 Since tag names have priority over branch names during revision
5482 Since tag names have priority over branch names during revision
5474 lookup, using an existing branch name as a tag name is discouraged.
5483 lookup, using an existing branch name as a tag name is discouraged.
5475
5484
5476 Returns 0 on success.
5485 Returns 0 on success.
5477 """
5486 """
5478 wlock = lock = None
5487 wlock = lock = None
5479 try:
5488 try:
5480 wlock = repo.wlock()
5489 wlock = repo.wlock()
5481 lock = repo.lock()
5490 lock = repo.lock()
5482 rev_ = "."
5491 rev_ = "."
5483 names = [t.strip() for t in (name1,) + names]
5492 names = [t.strip() for t in (name1,) + names]
5484 if len(names) != len(set(names)):
5493 if len(names) != len(set(names)):
5485 raise util.Abort(_('tag names must be unique'))
5494 raise util.Abort(_('tag names must be unique'))
5486 for n in names:
5495 for n in names:
5487 if n in ['tip', '.', 'null']:
5496 if n in ['tip', '.', 'null']:
5488 raise util.Abort(_("the name '%s' is reserved") % n)
5497 raise util.Abort(_("the name '%s' is reserved") % n)
5489 if not n:
5498 if not n:
5490 raise util.Abort(_('tag names cannot consist entirely of '
5499 raise util.Abort(_('tag names cannot consist entirely of '
5491 'whitespace'))
5500 'whitespace'))
5492 if opts.get('rev') and opts.get('remove'):
5501 if opts.get('rev') and opts.get('remove'):
5493 raise util.Abort(_("--rev and --remove are incompatible"))
5502 raise util.Abort(_("--rev and --remove are incompatible"))
5494 if opts.get('rev'):
5503 if opts.get('rev'):
5495 rev_ = opts['rev']
5504 rev_ = opts['rev']
5496 message = opts.get('message')
5505 message = opts.get('message')
5497 if opts.get('remove'):
5506 if opts.get('remove'):
5498 expectedtype = opts.get('local') and 'local' or 'global'
5507 expectedtype = opts.get('local') and 'local' or 'global'
5499 for n in names:
5508 for n in names:
5500 if not repo.tagtype(n):
5509 if not repo.tagtype(n):
5501 raise util.Abort(_("tag '%s' does not exist") % n)
5510 raise util.Abort(_("tag '%s' does not exist") % n)
5502 if repo.tagtype(n) != expectedtype:
5511 if repo.tagtype(n) != expectedtype:
5503 if expectedtype == 'global':
5512 if expectedtype == 'global':
5504 raise util.Abort(_("tag '%s' is not a global tag") % n)
5513 raise util.Abort(_("tag '%s' is not a global tag") % n)
5505 else:
5514 else:
5506 raise util.Abort(_("tag '%s' is not a local tag") % n)
5515 raise util.Abort(_("tag '%s' is not a local tag") % n)
5507 rev_ = nullid
5516 rev_ = nullid
5508 if not message:
5517 if not message:
5509 # we don't translate commit messages
5518 # we don't translate commit messages
5510 message = 'Removed tag %s' % ', '.join(names)
5519 message = 'Removed tag %s' % ', '.join(names)
5511 elif not opts.get('force'):
5520 elif not opts.get('force'):
5512 for n in names:
5521 for n in names:
5513 if n in repo.tags():
5522 if n in repo.tags():
5514 raise util.Abort(_("tag '%s' already exists "
5523 raise util.Abort(_("tag '%s' already exists "
5515 "(use -f to force)") % n)
5524 "(use -f to force)") % n)
5516 if not opts.get('local'):
5525 if not opts.get('local'):
5517 p1, p2 = repo.dirstate.parents()
5526 p1, p2 = repo.dirstate.parents()
5518 if p2 != nullid:
5527 if p2 != nullid:
5519 raise util.Abort(_('uncommitted merge'))
5528 raise util.Abort(_('uncommitted merge'))
5520 bheads = repo.branchheads()
5529 bheads = repo.branchheads()
5521 if not opts.get('force') and bheads and p1 not in bheads:
5530 if not opts.get('force') and bheads and p1 not in bheads:
5522 raise util.Abort(_('not at a branch head (use -f to force)'))
5531 raise util.Abort(_('not at a branch head (use -f to force)'))
5523 r = scmutil.revsingle(repo, rev_).node()
5532 r = scmutil.revsingle(repo, rev_).node()
5524
5533
5525 if not message:
5534 if not message:
5526 # we don't translate commit messages
5535 # we don't translate commit messages
5527 message = ('Added tag %s for changeset %s' %
5536 message = ('Added tag %s for changeset %s' %
5528 (', '.join(names), short(r)))
5537 (', '.join(names), short(r)))
5529
5538
5530 date = opts.get('date')
5539 date = opts.get('date')
5531 if date:
5540 if date:
5532 date = util.parsedate(date)
5541 date = util.parsedate(date)
5533
5542
5534 if opts.get('edit'):
5543 if opts.get('edit'):
5535 message = ui.edit(message, ui.username())
5544 message = ui.edit(message, ui.username())
5536
5545
5537 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
5546 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
5538 finally:
5547 finally:
5539 release(lock, wlock)
5548 release(lock, wlock)
5540
5549
5541 @command('tags', [], '')
5550 @command('tags', [], '')
5542 def tags(ui, repo):
5551 def tags(ui, repo):
5543 """list repository tags
5552 """list repository tags
5544
5553
5545 This lists both regular and local tags. When the -v/--verbose
5554 This lists both regular and local tags. When the -v/--verbose
5546 switch is used, a third column "local" is printed for local tags.
5555 switch is used, a third column "local" is printed for local tags.
5547
5556
5548 Returns 0 on success.
5557 Returns 0 on success.
5549 """
5558 """
5550
5559
5551 hexfunc = ui.debugflag and hex or short
5560 hexfunc = ui.debugflag and hex or short
5552 tagtype = ""
5561 tagtype = ""
5553
5562
5554 for t, n in reversed(repo.tagslist()):
5563 for t, n in reversed(repo.tagslist()):
5555 if ui.quiet:
5564 if ui.quiet:
5556 ui.write("%s\n" % t, label='tags.normal')
5565 ui.write("%s\n" % t, label='tags.normal')
5557 continue
5566 continue
5558
5567
5559 hn = hexfunc(n)
5568 hn = hexfunc(n)
5560 r = "%5d:%s" % (repo.changelog.rev(n), hn)
5569 r = "%5d:%s" % (repo.changelog.rev(n), hn)
5561 rev = ui.label(r, 'log.changeset')
5570 rev = ui.label(r, 'log.changeset')
5562 spaces = " " * (30 - encoding.colwidth(t))
5571 spaces = " " * (30 - encoding.colwidth(t))
5563
5572
5564 tag = ui.label(t, 'tags.normal')
5573 tag = ui.label(t, 'tags.normal')
5565 if ui.verbose:
5574 if ui.verbose:
5566 if repo.tagtype(t) == 'local':
5575 if repo.tagtype(t) == 'local':
5567 tagtype = " local"
5576 tagtype = " local"
5568 tag = ui.label(t, 'tags.local')
5577 tag = ui.label(t, 'tags.local')
5569 else:
5578 else:
5570 tagtype = ""
5579 tagtype = ""
5571 ui.write("%s%s %s%s\n" % (tag, spaces, rev, tagtype))
5580 ui.write("%s%s %s%s\n" % (tag, spaces, rev, tagtype))
5572
5581
5573 @command('tip',
5582 @command('tip',
5574 [('p', 'patch', None, _('show patch')),
5583 [('p', 'patch', None, _('show patch')),
5575 ('g', 'git', None, _('use git extended diff format')),
5584 ('g', 'git', None, _('use git extended diff format')),
5576 ] + templateopts,
5585 ] + templateopts,
5577 _('[-p] [-g]'))
5586 _('[-p] [-g]'))
5578 def tip(ui, repo, **opts):
5587 def tip(ui, repo, **opts):
5579 """show the tip revision
5588 """show the tip revision
5580
5589
5581 The tip revision (usually just called the tip) is the changeset
5590 The tip revision (usually just called the tip) is the changeset
5582 most recently added to the repository (and therefore the most
5591 most recently added to the repository (and therefore the most
5583 recently changed head).
5592 recently changed head).
5584
5593
5585 If you have just made a commit, that commit will be the tip. If
5594 If you have just made a commit, that commit will be the tip. If
5586 you have just pulled changes from another repository, the tip of
5595 you have just pulled changes from another repository, the tip of
5587 that repository becomes the current tip. The "tip" tag is special
5596 that repository becomes the current tip. The "tip" tag is special
5588 and cannot be renamed or assigned to a different changeset.
5597 and cannot be renamed or assigned to a different changeset.
5589
5598
5590 Returns 0 on success.
5599 Returns 0 on success.
5591 """
5600 """
5592 displayer = cmdutil.show_changeset(ui, repo, opts)
5601 displayer = cmdutil.show_changeset(ui, repo, opts)
5593 displayer.show(repo[len(repo) - 1])
5602 displayer.show(repo[len(repo) - 1])
5594 displayer.close()
5603 displayer.close()
5595
5604
5596 @command('unbundle',
5605 @command('unbundle',
5597 [('u', 'update', None,
5606 [('u', 'update', None,
5598 _('update to new branch head if changesets were unbundled'))],
5607 _('update to new branch head if changesets were unbundled'))],
5599 _('[-u] FILE...'))
5608 _('[-u] FILE...'))
5600 def unbundle(ui, repo, fname1, *fnames, **opts):
5609 def unbundle(ui, repo, fname1, *fnames, **opts):
5601 """apply one or more changegroup files
5610 """apply one or more changegroup files
5602
5611
5603 Apply one or more compressed changegroup files generated by the
5612 Apply one or more compressed changegroup files generated by the
5604 bundle command.
5613 bundle command.
5605
5614
5606 Returns 0 on success, 1 if an update has unresolved files.
5615 Returns 0 on success, 1 if an update has unresolved files.
5607 """
5616 """
5608 fnames = (fname1,) + fnames
5617 fnames = (fname1,) + fnames
5609
5618
5610 lock = repo.lock()
5619 lock = repo.lock()
5611 wc = repo['.']
5620 wc = repo['.']
5612 try:
5621 try:
5613 for fname in fnames:
5622 for fname in fnames:
5614 f = url.open(ui, fname)
5623 f = url.open(ui, fname)
5615 gen = changegroup.readbundle(f, fname)
5624 gen = changegroup.readbundle(f, fname)
5616 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
5625 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
5617 bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch())
5626 bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch())
5618 finally:
5627 finally:
5619 lock.release()
5628 lock.release()
5620 return postincoming(ui, repo, modheads, opts.get('update'), None)
5629 return postincoming(ui, repo, modheads, opts.get('update'), None)
5621
5630
5622 @command('^update|up|checkout|co',
5631 @command('^update|up|checkout|co',
5623 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5632 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5624 ('c', 'check', None,
5633 ('c', 'check', None,
5625 _('update across branches if no uncommitted changes')),
5634 _('update across branches if no uncommitted changes')),
5626 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5635 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5627 ('r', 'rev', '', _('revision'), _('REV'))],
5636 ('r', 'rev', '', _('revision'), _('REV'))],
5628 _('[-c] [-C] [-d DATE] [[-r] REV]'))
5637 _('[-c] [-C] [-d DATE] [[-r] REV]'))
5629 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
5638 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
5630 """update working directory (or switch revisions)
5639 """update working directory (or switch revisions)
5631
5640
5632 Update the repository's working directory to the specified
5641 Update the repository's working directory to the specified
5633 changeset. If no changeset is specified, update to the tip of the
5642 changeset. If no changeset is specified, update to the tip of the
5634 current named branch and move the current bookmark (see :hg:`help
5643 current named branch and move the current bookmark (see :hg:`help
5635 bookmarks`).
5644 bookmarks`).
5636
5645
5637 If the changeset is not a descendant of the working directory's
5646 If the changeset is not a descendant of the working directory's
5638 parent, the update is aborted. With the -c/--check option, the
5647 parent, the update is aborted. With the -c/--check option, the
5639 working directory is checked for uncommitted changes; if none are
5648 working directory is checked for uncommitted changes; if none are
5640 found, the working directory is updated to the specified
5649 found, the working directory is updated to the specified
5641 changeset.
5650 changeset.
5642
5651
5643 Update sets the working directory's parent revison to the specified
5652 Update sets the working directory's parent revison to the specified
5644 changeset (see :hg:`help parents`).
5653 changeset (see :hg:`help parents`).
5645
5654
5646 The following rules apply when the working directory contains
5655 The following rules apply when the working directory contains
5647 uncommitted changes:
5656 uncommitted changes:
5648
5657
5649 1. If neither -c/--check nor -C/--clean is specified, and if
5658 1. If neither -c/--check nor -C/--clean is specified, and if
5650 the requested changeset is an ancestor or descendant of
5659 the requested changeset is an ancestor or descendant of
5651 the working directory's parent, the uncommitted changes
5660 the working directory's parent, the uncommitted changes
5652 are merged into the requested changeset and the merged
5661 are merged into the requested changeset and the merged
5653 result is left uncommitted. If the requested changeset is
5662 result is left uncommitted. If the requested changeset is
5654 not an ancestor or descendant (that is, it is on another
5663 not an ancestor or descendant (that is, it is on another
5655 branch), the update is aborted and the uncommitted changes
5664 branch), the update is aborted and the uncommitted changes
5656 are preserved.
5665 are preserved.
5657
5666
5658 2. With the -c/--check option, the update is aborted and the
5667 2. With the -c/--check option, the update is aborted and the
5659 uncommitted changes are preserved.
5668 uncommitted changes are preserved.
5660
5669
5661 3. With the -C/--clean option, uncommitted changes are discarded and
5670 3. With the -C/--clean option, uncommitted changes are discarded and
5662 the working directory is updated to the requested changeset.
5671 the working directory is updated to the requested changeset.
5663
5672
5664 Use null as the changeset to remove the working directory (like
5673 Use null as the changeset to remove the working directory (like
5665 :hg:`clone -U`).
5674 :hg:`clone -U`).
5666
5675
5667 If you want to revert just one file to an older revision, use
5676 If you want to revert just one file to an older revision, use
5668 :hg:`revert [-r REV] NAME`.
5677 :hg:`revert [-r REV] NAME`.
5669
5678
5670 See :hg:`help dates` for a list of formats valid for -d/--date.
5679 See :hg:`help dates` for a list of formats valid for -d/--date.
5671
5680
5672 Returns 0 on success, 1 if there are unresolved files.
5681 Returns 0 on success, 1 if there are unresolved files.
5673 """
5682 """
5674 if rev and node:
5683 if rev and node:
5675 raise util.Abort(_("please specify just one revision"))
5684 raise util.Abort(_("please specify just one revision"))
5676
5685
5677 if rev is None or rev == '':
5686 if rev is None or rev == '':
5678 rev = node
5687 rev = node
5679
5688
5680 # with no argument, we also move the current bookmark, if any
5689 # with no argument, we also move the current bookmark, if any
5681 movemarkfrom = None
5690 movemarkfrom = None
5682 if rev is None or node == '':
5691 if rev is None or node == '':
5683 movemarkfrom = repo['.'].node()
5692 movemarkfrom = repo['.'].node()
5684
5693
5685 # if we defined a bookmark, we have to remember the original bookmark name
5694 # if we defined a bookmark, we have to remember the original bookmark name
5686 brev = rev
5695 brev = rev
5687 rev = scmutil.revsingle(repo, rev, rev).rev()
5696 rev = scmutil.revsingle(repo, rev, rev).rev()
5688
5697
5689 if check and clean:
5698 if check and clean:
5690 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
5699 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
5691
5700
5692 if date:
5701 if date:
5693 if rev is not None:
5702 if rev is not None:
5694 raise util.Abort(_("you can't specify a revision and a date"))
5703 raise util.Abort(_("you can't specify a revision and a date"))
5695 rev = cmdutil.finddate(ui, repo, date)
5704 rev = cmdutil.finddate(ui, repo, date)
5696
5705
5697 if check:
5706 if check:
5698 c = repo[None]
5707 c = repo[None]
5699 if c.dirty(merge=False, branch=False):
5708 if c.dirty(merge=False, branch=False):
5700 raise util.Abort(_("uncommitted local changes"))
5709 raise util.Abort(_("uncommitted local changes"))
5701 if rev is None:
5710 if rev is None:
5702 rev = repo[repo[None].branch()].rev()
5711 rev = repo[repo[None].branch()].rev()
5703 mergemod._checkunknown(repo, repo[None], repo[rev])
5712 mergemod._checkunknown(repo, repo[None], repo[rev])
5704
5713
5705 if clean:
5714 if clean:
5706 ret = hg.clean(repo, rev)
5715 ret = hg.clean(repo, rev)
5707 else:
5716 else:
5708 ret = hg.update(repo, rev)
5717 ret = hg.update(repo, rev)
5709
5718
5710 if not ret and movemarkfrom:
5719 if not ret and movemarkfrom:
5711 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
5720 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
5712 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
5721 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
5713 elif brev in repo._bookmarks:
5722 elif brev in repo._bookmarks:
5714 bookmarks.setcurrent(repo, brev)
5723 bookmarks.setcurrent(repo, brev)
5715 elif brev:
5724 elif brev:
5716 bookmarks.unsetcurrent(repo)
5725 bookmarks.unsetcurrent(repo)
5717
5726
5718 return ret
5727 return ret
5719
5728
5720 @command('verify', [])
5729 @command('verify', [])
5721 def verify(ui, repo):
5730 def verify(ui, repo):
5722 """verify the integrity of the repository
5731 """verify the integrity of the repository
5723
5732
5724 Verify the integrity of the current repository.
5733 Verify the integrity of the current repository.
5725
5734
5726 This will perform an extensive check of the repository's
5735 This will perform an extensive check of the repository's
5727 integrity, validating the hashes and checksums of each entry in
5736 integrity, validating the hashes and checksums of each entry in
5728 the changelog, manifest, and tracked files, as well as the
5737 the changelog, manifest, and tracked files, as well as the
5729 integrity of their crosslinks and indices.
5738 integrity of their crosslinks and indices.
5730
5739
5731 Returns 0 on success, 1 if errors are encountered.
5740 Returns 0 on success, 1 if errors are encountered.
5732 """
5741 """
5733 return hg.verify(repo)
5742 return hg.verify(repo)
5734
5743
5735 @command('version', [])
5744 @command('version', [])
5736 def version_(ui):
5745 def version_(ui):
5737 """output version and copyright information"""
5746 """output version and copyright information"""
5738 ui.write(_("Mercurial Distributed SCM (version %s)\n")
5747 ui.write(_("Mercurial Distributed SCM (version %s)\n")
5739 % util.version())
5748 % util.version())
5740 ui.status(_(
5749 ui.status(_(
5741 "(see http://mercurial.selenic.com for more information)\n"
5750 "(see http://mercurial.selenic.com for more information)\n"
5742 "\nCopyright (C) 2005-2012 Matt Mackall and others\n"
5751 "\nCopyright (C) 2005-2012 Matt Mackall and others\n"
5743 "This is free software; see the source for copying conditions. "
5752 "This is free software; see the source for copying conditions. "
5744 "There is NO\nwarranty; "
5753 "There is NO\nwarranty; "
5745 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5754 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5746 ))
5755 ))
5747
5756
5748 norepo = ("clone init version help debugcommands debugcomplete"
5757 norepo = ("clone init version help debugcommands debugcomplete"
5749 " debugdate debuginstall debugfsinfo debugpushkey debugwireargs"
5758 " debugdate debuginstall debugfsinfo debugpushkey debugwireargs"
5750 " debugknown debuggetbundle debugbundle")
5759 " debugknown debuggetbundle debugbundle")
5751 optionalrepo = ("identify paths serve showconfig debugancestor debugdag"
5760 optionalrepo = ("identify paths serve showconfig debugancestor debugdag"
5752 " debugdata debugindex debugindexdot debugrevlog")
5761 " debugdata debugindex debugindexdot debugrevlog")
@@ -1,274 +1,274 b''
1 Show all commands except debug commands
1 Show all commands except debug commands
2 $ hg debugcomplete
2 $ hg debugcomplete
3 add
3 add
4 addremove
4 addremove
5 annotate
5 annotate
6 archive
6 archive
7 backout
7 backout
8 bisect
8 bisect
9 bookmarks
9 bookmarks
10 branch
10 branch
11 branches
11 branches
12 bundle
12 bundle
13 cat
13 cat
14 clone
14 clone
15 commit
15 commit
16 copy
16 copy
17 diff
17 diff
18 export
18 export
19 forget
19 forget
20 graft
20 graft
21 grep
21 grep
22 heads
22 heads
23 help
23 help
24 identify
24 identify
25 import
25 import
26 incoming
26 incoming
27 init
27 init
28 locate
28 locate
29 log
29 log
30 manifest
30 manifest
31 merge
31 merge
32 outgoing
32 outgoing
33 parents
33 parents
34 paths
34 paths
35 phase
35 phase
36 pull
36 pull
37 push
37 push
38 recover
38 recover
39 remove
39 remove
40 rename
40 rename
41 resolve
41 resolve
42 revert
42 revert
43 rollback
43 rollback
44 root
44 root
45 serve
45 serve
46 showconfig
46 showconfig
47 status
47 status
48 summary
48 summary
49 tag
49 tag
50 tags
50 tags
51 tip
51 tip
52 unbundle
52 unbundle
53 update
53 update
54 verify
54 verify
55 version
55 version
56
56
57 Show all commands that start with "a"
57 Show all commands that start with "a"
58 $ hg debugcomplete a
58 $ hg debugcomplete a
59 add
59 add
60 addremove
60 addremove
61 annotate
61 annotate
62 archive
62 archive
63
63
64 Do not show debug commands if there are other candidates
64 Do not show debug commands if there are other candidates
65 $ hg debugcomplete d
65 $ hg debugcomplete d
66 diff
66 diff
67
67
68 Show debug commands if there are no other candidates
68 Show debug commands if there are no other candidates
69 $ hg debugcomplete debug
69 $ hg debugcomplete debug
70 debugancestor
70 debugancestor
71 debugbuilddag
71 debugbuilddag
72 debugbundle
72 debugbundle
73 debugcheckstate
73 debugcheckstate
74 debugcommands
74 debugcommands
75 debugcomplete
75 debugcomplete
76 debugconfig
76 debugconfig
77 debugdag
77 debugdag
78 debugdata
78 debugdata
79 debugdate
79 debugdate
80 debugdiscovery
80 debugdiscovery
81 debugfileset
81 debugfileset
82 debugfsinfo
82 debugfsinfo
83 debuggetbundle
83 debuggetbundle
84 debugignore
84 debugignore
85 debugindex
85 debugindex
86 debugindexdot
86 debugindexdot
87 debuginstall
87 debuginstall
88 debugknown
88 debugknown
89 debugpushkey
89 debugpushkey
90 debugpvec
90 debugpvec
91 debugrebuildstate
91 debugrebuildstate
92 debugrename
92 debugrename
93 debugrevlog
93 debugrevlog
94 debugrevspec
94 debugrevspec
95 debugsetparents
95 debugsetparents
96 debugstate
96 debugstate
97 debugsub
97 debugsub
98 debugwalk
98 debugwalk
99 debugwireargs
99 debugwireargs
100
100
101 Do not show the alias of a debug command if there are other candidates
101 Do not show the alias of a debug command if there are other candidates
102 (this should hide rawcommit)
102 (this should hide rawcommit)
103 $ hg debugcomplete r
103 $ hg debugcomplete r
104 recover
104 recover
105 remove
105 remove
106 rename
106 rename
107 resolve
107 resolve
108 revert
108 revert
109 rollback
109 rollback
110 root
110 root
111 Show the alias of a debug command if there are no other candidates
111 Show the alias of a debug command if there are no other candidates
112 $ hg debugcomplete rawc
112 $ hg debugcomplete rawc
113
113
114
114
115 Show the global options
115 Show the global options
116 $ hg debugcomplete --options | sort
116 $ hg debugcomplete --options | sort
117 --config
117 --config
118 --cwd
118 --cwd
119 --debug
119 --debug
120 --debugger
120 --debugger
121 --encoding
121 --encoding
122 --encodingmode
122 --encodingmode
123 --help
123 --help
124 --noninteractive
124 --noninteractive
125 --profile
125 --profile
126 --quiet
126 --quiet
127 --repository
127 --repository
128 --time
128 --time
129 --traceback
129 --traceback
130 --verbose
130 --verbose
131 --version
131 --version
132 -R
132 -R
133 -h
133 -h
134 -q
134 -q
135 -v
135 -v
136 -y
136 -y
137
137
138 Show the options for the "serve" command
138 Show the options for the "serve" command
139 $ hg debugcomplete --options serve | sort
139 $ hg debugcomplete --options serve | sort
140 --accesslog
140 --accesslog
141 --address
141 --address
142 --certificate
142 --certificate
143 --cmdserver
143 --cmdserver
144 --config
144 --config
145 --cwd
145 --cwd
146 --daemon
146 --daemon
147 --daemon-pipefds
147 --daemon-pipefds
148 --debug
148 --debug
149 --debugger
149 --debugger
150 --encoding
150 --encoding
151 --encodingmode
151 --encodingmode
152 --errorlog
152 --errorlog
153 --help
153 --help
154 --ipv6
154 --ipv6
155 --name
155 --name
156 --noninteractive
156 --noninteractive
157 --pid-file
157 --pid-file
158 --port
158 --port
159 --prefix
159 --prefix
160 --profile
160 --profile
161 --quiet
161 --quiet
162 --repository
162 --repository
163 --stdio
163 --stdio
164 --style
164 --style
165 --templates
165 --templates
166 --time
166 --time
167 --traceback
167 --traceback
168 --verbose
168 --verbose
169 --version
169 --version
170 --web-conf
170 --web-conf
171 -6
171 -6
172 -A
172 -A
173 -E
173 -E
174 -R
174 -R
175 -a
175 -a
176 -d
176 -d
177 -h
177 -h
178 -n
178 -n
179 -p
179 -p
180 -q
180 -q
181 -t
181 -t
182 -v
182 -v
183 -y
183 -y
184
184
185 Show an error if we use --options with an ambiguous abbreviation
185 Show an error if we use --options with an ambiguous abbreviation
186 $ hg debugcomplete --options s
186 $ hg debugcomplete --options s
187 hg: command 's' is ambiguous:
187 hg: command 's' is ambiguous:
188 serve showconfig status summary
188 serve showconfig status summary
189 [255]
189 [255]
190
190
191 Show all commands + options
191 Show all commands + options
192 $ hg debugcommands
192 $ hg debugcommands
193 add: include, exclude, subrepos, dry-run
193 add: include, exclude, subrepos, dry-run
194 annotate: rev, follow, no-follow, text, user, file, date, number, changeset, line-number, ignore-all-space, ignore-space-change, ignore-blank-lines, include, exclude
194 annotate: rev, follow, no-follow, text, user, file, date, number, changeset, line-number, ignore-all-space, ignore-space-change, ignore-blank-lines, include, exclude
195 clone: noupdate, updaterev, rev, branch, pull, uncompressed, ssh, remotecmd, insecure
195 clone: noupdate, updaterev, rev, branch, pull, uncompressed, ssh, remotecmd, insecure
196 commit: addremove, close-branch, amend, include, exclude, message, logfile, date, user, subrepos
196 commit: addremove, close-branch, amend, include, exclude, message, logfile, date, user, subrepos
197 diff: rev, change, text, git, nodates, show-function, reverse, ignore-all-space, ignore-space-change, ignore-blank-lines, unified, stat, include, exclude, subrepos
197 diff: rev, change, text, git, nodates, show-function, reverse, ignore-all-space, ignore-space-change, ignore-blank-lines, unified, stat, include, exclude, subrepos
198 export: output, switch-parent, rev, text, git, nodates
198 export: output, switch-parent, rev, text, git, nodates
199 forget: include, exclude
199 forget: include, exclude
200 init: ssh, remotecmd, insecure
200 init: ssh, remotecmd, insecure
201 log: follow, follow-first, date, copies, keyword, rev, removed, only-merges, user, only-branch, branch, prune, hidden, patch, git, limit, no-merges, stat, style, template, include, exclude
201 log: follow, follow-first, date, copies, keyword, rev, removed, only-merges, user, only-branch, branch, prune, hidden, patch, git, limit, no-merges, stat, style, template, include, exclude
202 merge: force, rev, preview, tool
202 merge: force, rev, preview, tool
203 phase: public, draft, secret, force, rev
203 phase: public, draft, secret, force, rev
204 pull: update, force, rev, bookmark, branch, ssh, remotecmd, insecure
204 pull: update, force, rev, bookmark, branch, ssh, remotecmd, insecure
205 push: force, rev, bookmark, branch, new-branch, ssh, remotecmd, insecure
205 push: force, rev, bookmark, branch, new-branch, ssh, remotecmd, insecure
206 remove: after, force, include, exclude
206 remove: after, force, include, exclude
207 serve: accesslog, daemon, daemon-pipefds, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, cmdserver, templates, style, ipv6, certificate
207 serve: accesslog, daemon, daemon-pipefds, errorlog, port, address, prefix, name, web-conf, webdir-conf, pid-file, stdio, cmdserver, templates, style, ipv6, certificate
208 status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, copies, print0, rev, change, include, exclude, subrepos
208 status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, copies, print0, rev, change, include, exclude, subrepos
209 summary: remote
209 summary: remote
210 update: clean, check, date, rev
210 update: clean, check, date, rev
211 addremove: similarity, include, exclude, dry-run
211 addremove: similarity, include, exclude, dry-run
212 archive: no-decode, prefix, rev, type, subrepos, include, exclude
212 archive: no-decode, prefix, rev, type, subrepos, include, exclude
213 backout: merge, parent, rev, tool, include, exclude, message, logfile, date, user
213 backout: merge, parent, rev, tool, include, exclude, message, logfile, date, user
214 bisect: reset, good, bad, skip, extend, command, noupdate
214 bisect: reset, good, bad, skip, extend, command, noupdate
215 bookmarks: force, rev, delete, rename, inactive
215 bookmarks: force, rev, delete, rename, inactive
216 branch: force, clean
216 branch: force, clean
217 branches: active, closed
217 branches: active, closed
218 bundle: force, rev, branch, base, all, type, ssh, remotecmd, insecure
218 bundle: force, rev, branch, base, all, type, ssh, remotecmd, insecure
219 cat: output, rev, decode, include, exclude
219 cat: output, rev, decode, include, exclude
220 copy: after, force, include, exclude, dry-run
220 copy: after, force, include, exclude, dry-run
221 debugancestor:
221 debugancestor:
222 debugbuilddag: mergeable-file, overwritten-file, new-file
222 debugbuilddag: mergeable-file, overwritten-file, new-file
223 debugbundle: all
223 debugbundle: all
224 debugcheckstate:
224 debugcheckstate:
225 debugcommands:
225 debugcommands:
226 debugcomplete: options
226 debugcomplete: options
227 debugdag: tags, branches, dots, spaces
227 debugdag: tags, branches, dots, spaces
228 debugdata: changelog, manifest
228 debugdata: changelog, manifest
229 debugdate: extended
229 debugdate: extended
230 debugdiscovery: old, nonheads, ssh, remotecmd, insecure
230 debugdiscovery: old, nonheads, ssh, remotecmd, insecure
231 debugfileset:
231 debugfileset:
232 debugfsinfo:
232 debugfsinfo:
233 debuggetbundle: head, common, type
233 debuggetbundle: head, common, type
234 debugignore:
234 debugignore:
235 debugindex: changelog, manifest, format
235 debugindex: changelog, manifest, format
236 debugindexdot:
236 debugindexdot:
237 debuginstall:
237 debuginstall:
238 debugknown:
238 debugknown:
239 debugpushkey:
239 debugpushkey:
240 debugpvec:
240 debugpvec:
241 debugrebuildstate: rev
241 debugrebuildstate: rev
242 debugrename: rev
242 debugrename: rev
243 debugrevlog: changelog, manifest, dump
243 debugrevlog: changelog, manifest, dump
244 debugrevspec:
244 debugrevspec:
245 debugsetparents:
245 debugsetparents:
246 debugstate: nodates, datesort
246 debugstate: nodates, datesort
247 debugsub: rev
247 debugsub: rev
248 debugwalk: include, exclude
248 debugwalk: include, exclude
249 debugwireargs: three, four, five, ssh, remotecmd, insecure
249 debugwireargs: three, four, five, ssh, remotecmd, insecure
250 graft: continue, edit, currentdate, currentuser, date, user, tool, dry-run
250 graft: continue, edit, log, currentdate, currentuser, date, user, tool, dry-run
251 grep: print0, all, text, follow, ignore-case, files-with-matches, line-number, rev, user, date, include, exclude
251 grep: print0, all, text, follow, ignore-case, files-with-matches, line-number, rev, user, date, include, exclude
252 heads: rev, topo, active, closed, style, template
252 heads: rev, topo, active, closed, style, template
253 help: extension, command
253 help: extension, command
254 identify: rev, num, id, branch, tags, bookmarks, ssh, remotecmd, insecure
254 identify: rev, num, id, branch, tags, bookmarks, ssh, remotecmd, insecure
255 import: strip, base, edit, force, no-commit, bypass, exact, import-branch, message, logfile, date, user, similarity
255 import: strip, base, edit, force, no-commit, bypass, exact, import-branch, message, logfile, date, user, similarity
256 incoming: force, newest-first, bundle, rev, bookmarks, branch, patch, git, limit, no-merges, stat, style, template, ssh, remotecmd, insecure, subrepos
256 incoming: force, newest-first, bundle, rev, bookmarks, branch, patch, git, limit, no-merges, stat, style, template, ssh, remotecmd, insecure, subrepos
257 locate: rev, print0, fullpath, include, exclude
257 locate: rev, print0, fullpath, include, exclude
258 manifest: rev, all
258 manifest: rev, all
259 outgoing: force, rev, newest-first, bookmarks, branch, patch, git, limit, no-merges, stat, style, template, ssh, remotecmd, insecure, subrepos
259 outgoing: force, rev, newest-first, bookmarks, branch, patch, git, limit, no-merges, stat, style, template, ssh, remotecmd, insecure, subrepos
260 parents: rev, style, template
260 parents: rev, style, template
261 paths:
261 paths:
262 recover:
262 recover:
263 rename: after, force, include, exclude, dry-run
263 rename: after, force, include, exclude, dry-run
264 resolve: all, list, mark, unmark, no-status, tool, include, exclude
264 resolve: all, list, mark, unmark, no-status, tool, include, exclude
265 revert: all, date, rev, no-backup, include, exclude, dry-run
265 revert: all, date, rev, no-backup, include, exclude, dry-run
266 rollback: dry-run, force
266 rollback: dry-run, force
267 root:
267 root:
268 showconfig: untrusted
268 showconfig: untrusted
269 tag: force, local, rev, remove, edit, message, date, user
269 tag: force, local, rev, remove, edit, message, date, user
270 tags:
270 tags:
271 tip: patch, git, style, template
271 tip: patch, git, style, template
272 unbundle: update
272 unbundle: update
273 verify:
273 verify:
274 version:
274 version:
@@ -1,279 +1,289 b''
1 Create a repo with some stuff in it:
1 Create a repo with some stuff in it:
2
2
3 $ hg init a
3 $ hg init a
4 $ cd a
4 $ cd a
5 $ echo a > a
5 $ echo a > a
6 $ echo a > d
6 $ echo a > d
7 $ echo a > e
7 $ echo a > e
8 $ hg ci -qAm0
8 $ hg ci -qAm0
9 $ echo b > a
9 $ echo b > a
10 $ hg ci -m1 -u bar
10 $ hg ci -m1 -u bar
11 $ hg mv a b
11 $ hg mv a b
12 $ hg ci -m2
12 $ hg ci -m2
13 $ hg cp b c
13 $ hg cp b c
14 $ hg ci -m3 -u baz
14 $ hg ci -m3 -u baz
15 $ echo b > d
15 $ echo b > d
16 $ echo f > e
16 $ echo f > e
17 $ hg ci -m4
17 $ hg ci -m4
18 $ hg up -q 3
18 $ hg up -q 3
19 $ echo b > e
19 $ echo b > e
20 $ hg branch -q stable
20 $ hg branch -q stable
21 $ hg ci -m5
21 $ hg ci -m5
22 $ hg merge -q default --tool internal:local
22 $ hg merge -q default --tool internal:local
23 $ hg branch -q default
23 $ hg branch -q default
24 $ hg ci -m6
24 $ hg ci -m6
25 $ hg phase --public 3
25 $ hg phase --public 3
26 $ hg phase --force --secret 6
26 $ hg phase --force --secret 6
27
27
28 $ hg --config extensions.graphlog= log -G --template '{author}@{rev}.{phase}: {desc}\n'
28 $ hg --config extensions.graphlog= log -G --template '{author}@{rev}.{phase}: {desc}\n'
29 @ test@6.secret: 6
29 @ test@6.secret: 6
30 |\
30 |\
31 | o test@5.draft: 5
31 | o test@5.draft: 5
32 | |
32 | |
33 o | test@4.draft: 4
33 o | test@4.draft: 4
34 |/
34 |/
35 o baz@3.public: 3
35 o baz@3.public: 3
36 |
36 |
37 o test@2.public: 2
37 o test@2.public: 2
38 |
38 |
39 o bar@1.public: 1
39 o bar@1.public: 1
40 |
40 |
41 o test@0.public: 0
41 o test@0.public: 0
42
42
43
43
44 Need to specify a rev:
44 Need to specify a rev:
45
45
46 $ hg graft
46 $ hg graft
47 abort: no revisions specified
47 abort: no revisions specified
48 [255]
48 [255]
49
49
50 Can't graft ancestor:
50 Can't graft ancestor:
51
51
52 $ hg graft 1 2
52 $ hg graft 1 2
53 skipping ancestor revision 1
53 skipping ancestor revision 1
54 skipping ancestor revision 2
54 skipping ancestor revision 2
55 [255]
55 [255]
56
56
57 Can't graft with dirty wd:
57 Can't graft with dirty wd:
58
58
59 $ hg up -q 0
59 $ hg up -q 0
60 $ echo foo > a
60 $ echo foo > a
61 $ hg graft 1
61 $ hg graft 1
62 abort: outstanding uncommitted changes
62 abort: outstanding uncommitted changes
63 [255]
63 [255]
64 $ hg revert a
64 $ hg revert a
65
65
66 Graft a rename:
66 Graft a rename:
67
67
68 $ hg graft 2 -u foo
68 $ hg graft 2 -u foo
69 grafting revision 2
69 grafting revision 2
70 merging a and b to b
70 merging a and b to b
71 $ hg export tip --git
71 $ hg export tip --git
72 # HG changeset patch
72 # HG changeset patch
73 # User foo
73 # User foo
74 # Date 0 0
74 # Date 0 0
75 # Node ID ef0ef43d49e79e81ddafdc7997401ba0041efc82
75 # Node ID ef0ef43d49e79e81ddafdc7997401ba0041efc82
76 # Parent 68795b066622ca79a25816a662041d8f78f3cd9e
76 # Parent 68795b066622ca79a25816a662041d8f78f3cd9e
77 2
77 2
78
78
79 diff --git a/a b/b
79 diff --git a/a b/b
80 rename from a
80 rename from a
81 rename to b
81 rename to b
82
82
83 Look for extra:source
83 Look for extra:source
84
84
85 $ hg log --debug -r tip
85 $ hg log --debug -r tip
86 changeset: 7:ef0ef43d49e79e81ddafdc7997401ba0041efc82
86 changeset: 7:ef0ef43d49e79e81ddafdc7997401ba0041efc82
87 tag: tip
87 tag: tip
88 phase: draft
88 phase: draft
89 parent: 0:68795b066622ca79a25816a662041d8f78f3cd9e
89 parent: 0:68795b066622ca79a25816a662041d8f78f3cd9e
90 parent: -1:0000000000000000000000000000000000000000
90 parent: -1:0000000000000000000000000000000000000000
91 manifest: 7:e59b6b228f9cbf9903d5e9abf996e083a1f533eb
91 manifest: 7:e59b6b228f9cbf9903d5e9abf996e083a1f533eb
92 user: foo
92 user: foo
93 date: Thu Jan 01 00:00:00 1970 +0000
93 date: Thu Jan 01 00:00:00 1970 +0000
94 files+: b
94 files+: b
95 files-: a
95 files-: a
96 extra: branch=default
96 extra: branch=default
97 extra: source=5c095ad7e90f871700f02dd1fa5012cb4498a2d4
97 extra: source=5c095ad7e90f871700f02dd1fa5012cb4498a2d4
98 description:
98 description:
99 2
99 2
100
100
101
101
102
102
103 Graft out of order, skipping a merge and a duplicate
103 Graft out of order, skipping a merge and a duplicate
104
104
105 $ hg graft 1 5 4 3 'merge()' 2 -n
105 $ hg graft 1 5 4 3 'merge()' 2 -n
106 skipping ungraftable merge revision 6
106 skipping ungraftable merge revision 6
107 skipping already grafted revision 2
107 skipping already grafted revision 2
108 grafting revision 1
108 grafting revision 1
109 grafting revision 5
109 grafting revision 5
110 grafting revision 4
110 grafting revision 4
111 grafting revision 3
111 grafting revision 3
112
112
113 $ hg graft 1 5 4 3 'merge()' 2 --debug
113 $ hg graft 1 5 4 3 'merge()' 2 --debug
114 skipping ungraftable merge revision 6
114 skipping ungraftable merge revision 6
115 scanning for duplicate grafts
115 scanning for duplicate grafts
116 skipping already grafted revision 2
116 skipping already grafted revision 2
117 grafting revision 1
117 grafting revision 1
118 searching for copies back to rev 1
118 searching for copies back to rev 1
119 unmatched files in local:
119 unmatched files in local:
120 b
120 b
121 all copies found (* = to merge, ! = divergent):
121 all copies found (* = to merge, ! = divergent):
122 b -> a *
122 b -> a *
123 checking for directory renames
123 checking for directory renames
124 resolving manifests
124 resolving manifests
125 overwrite: False, partial: False
125 overwrite: False, partial: False
126 ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6
126 ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6
127 b: local copied/moved to a -> m
127 b: local copied/moved to a -> m
128 preserving b for resolve of b
128 preserving b for resolve of b
129 updating: b 1/1 files (100.00%)
129 updating: b 1/1 files (100.00%)
130 picked tool 'internal:merge' for b (binary False symlink False)
130 picked tool 'internal:merge' for b (binary False symlink False)
131 merging b and a to b
131 merging b and a to b
132 my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622
132 my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622
133 premerge successful
133 premerge successful
134 b
134 b
135 grafting revision 5
135 grafting revision 5
136 searching for copies back to rev 1
136 searching for copies back to rev 1
137 resolving manifests
137 resolving manifests
138 overwrite: False, partial: False
138 overwrite: False, partial: False
139 ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746
139 ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746
140 e: remote is newer -> g
140 e: remote is newer -> g
141 updating: e 1/1 files (100.00%)
141 updating: e 1/1 files (100.00%)
142 getting e
142 getting e
143 e
143 e
144 grafting revision 4
144 grafting revision 4
145 searching for copies back to rev 1
145 searching for copies back to rev 1
146 resolving manifests
146 resolving manifests
147 overwrite: False, partial: False
147 overwrite: False, partial: False
148 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d
148 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d
149 e: versions differ -> m
149 e: versions differ -> m
150 d: remote is newer -> g
150 d: remote is newer -> g
151 preserving e for resolve of e
151 preserving e for resolve of e
152 updating: d 1/2 files (50.00%)
152 updating: d 1/2 files (50.00%)
153 getting d
153 getting d
154 updating: e 2/2 files (100.00%)
154 updating: e 2/2 files (100.00%)
155 picked tool 'internal:merge' for e (binary False symlink False)
155 picked tool 'internal:merge' for e (binary False symlink False)
156 merging e
156 merging e
157 my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622
157 my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622
158 warning: conflicts during merge.
158 warning: conflicts during merge.
159 merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
159 merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
160 abort: unresolved conflicts, can't continue
160 abort: unresolved conflicts, can't continue
161 (use hg resolve and hg graft --continue)
161 (use hg resolve and hg graft --continue)
162 [255]
162 [255]
163
163
164 Continue without resolve should fail:
164 Continue without resolve should fail:
165
165
166 $ hg graft -c
166 $ hg graft -c
167 grafting revision 4
167 grafting revision 4
168 abort: unresolved merge conflicts (see hg help resolve)
168 abort: unresolved merge conflicts (see hg help resolve)
169 [255]
169 [255]
170
170
171 Fix up:
171 Fix up:
172
172
173 $ echo b > e
173 $ echo b > e
174 $ hg resolve -m e
174 $ hg resolve -m e
175
175
176 Continue with a revision should fail:
176 Continue with a revision should fail:
177
177
178 $ hg graft -c 6
178 $ hg graft -c 6
179 abort: can't specify --continue and revisions
179 abort: can't specify --continue and revisions
180 [255]
180 [255]
181
181
182 Continue for real, clobber usernames
182 Continue for real, clobber usernames
183
183
184 $ hg graft -c -U
184 $ hg graft -c -U
185 grafting revision 4
185 grafting revision 4
186 grafting revision 3
186 grafting revision 3
187
187
188 Compare with original:
188 Compare with original:
189
189
190 $ hg diff -r 6
190 $ hg diff -r 6
191 $ hg status --rev 0:. -C
191 $ hg status --rev 0:. -C
192 M d
192 M d
193 M e
193 M e
194 A b
194 A b
195 a
195 a
196 A c
196 A c
197 a
197 a
198 R a
198 R a
199
199
200 View graph:
200 View graph:
201
201
202 $ hg --config extensions.graphlog= log -G --template '{author}@{rev}.{phase}: {desc}\n'
202 $ hg --config extensions.graphlog= log -G --template '{author}@{rev}.{phase}: {desc}\n'
203 @ test@11.draft: 3
203 @ test@11.draft: 3
204 |
204 |
205 o test@10.draft: 4
205 o test@10.draft: 4
206 |
206 |
207 o test@9.draft: 5
207 o test@9.draft: 5
208 |
208 |
209 o bar@8.draft: 1
209 o bar@8.draft: 1
210 |
210 |
211 o foo@7.draft: 2
211 o foo@7.draft: 2
212 |
212 |
213 | o test@6.secret: 6
213 | o test@6.secret: 6
214 | |\
214 | |\
215 | | o test@5.draft: 5
215 | | o test@5.draft: 5
216 | | |
216 | | |
217 | o | test@4.draft: 4
217 | o | test@4.draft: 4
218 | |/
218 | |/
219 | o baz@3.public: 3
219 | o baz@3.public: 3
220 | |
220 | |
221 | o test@2.public: 2
221 | o test@2.public: 2
222 | |
222 | |
223 | o bar@1.public: 1
223 | o bar@1.public: 1
224 |/
224 |/
225 o test@0.public: 0
225 o test@0.public: 0
226
226
227 Graft again onto another branch should preserve the original source
227 Graft again onto another branch should preserve the original source
228 $ hg up -q 0
228 $ hg up -q 0
229 $ echo 'g'>g
229 $ echo 'g'>g
230 $ hg add g
230 $ hg add g
231 $ hg ci -m 7
231 $ hg ci -m 7
232 created new head
232 created new head
233 $ hg graft 7
233 $ hg graft 7
234 grafting revision 7
234 grafting revision 7
235
235
236 $ hg log -r 7 --template '{rev}:{node}\n'
236 $ hg log -r 7 --template '{rev}:{node}\n'
237 7:ef0ef43d49e79e81ddafdc7997401ba0041efc82
237 7:ef0ef43d49e79e81ddafdc7997401ba0041efc82
238 $ hg log -r 2 --template '{rev}:{node}\n'
238 $ hg log -r 2 --template '{rev}:{node}\n'
239 2:5c095ad7e90f871700f02dd1fa5012cb4498a2d4
239 2:5c095ad7e90f871700f02dd1fa5012cb4498a2d4
240
240
241 $ hg log --debug -r tip
241 $ hg log --debug -r tip
242 changeset: 13:9db0f28fd3747e92c57d015f53b5593aeec53c2d
242 changeset: 13:9db0f28fd3747e92c57d015f53b5593aeec53c2d
243 tag: tip
243 tag: tip
244 phase: draft
244 phase: draft
245 parent: 12:b592ea63bb0c19a6c5c44685ee29a2284f9f1b8f
245 parent: 12:b592ea63bb0c19a6c5c44685ee29a2284f9f1b8f
246 parent: -1:0000000000000000000000000000000000000000
246 parent: -1:0000000000000000000000000000000000000000
247 manifest: 13:dc313617b8c32457c0d589e0dbbedfe71f3cd637
247 manifest: 13:dc313617b8c32457c0d589e0dbbedfe71f3cd637
248 user: foo
248 user: foo
249 date: Thu Jan 01 00:00:00 1970 +0000
249 date: Thu Jan 01 00:00:00 1970 +0000
250 files+: b
250 files+: b
251 files-: a
251 files-: a
252 extra: branch=default
252 extra: branch=default
253 extra: source=5c095ad7e90f871700f02dd1fa5012cb4498a2d4
253 extra: source=5c095ad7e90f871700f02dd1fa5012cb4498a2d4
254 description:
254 description:
255 2
255 2
256
256
257
257
258 Disallow grafting an already grafted cset onto its original branch
258 Disallow grafting an already grafted cset onto its original branch
259 $ hg up -q 6
259 $ hg up -q 6
260 $ hg graft 7
260 $ hg graft 7
261 skipping already grafted revision 7 (was grafted from 2)
261 skipping already grafted revision 7 (was grafted from 2)
262 [255]
262 [255]
263
263
264 Disallow grafting already grafted csets with the same origin onto each other
264 Disallow grafting already grafted csets with the same origin onto each other
265 $ hg up -q 13
265 $ hg up -q 13
266 $ hg graft 2
266 $ hg graft 2
267 skipping already grafted revision 2
267 skipping already grafted revision 2
268 [255]
268 [255]
269 $ hg graft 7
269 $ hg graft 7
270 skipping already grafted revision 7 (same origin 2)
270 skipping already grafted revision 7 (same origin 2)
271 [255]
271 [255]
272
272
273 $ hg up -q 7
273 $ hg up -q 7
274 $ hg graft 2
274 $ hg graft 2
275 skipping already grafted revision 2
275 skipping already grafted revision 2
276 [255]
276 [255]
277 $ hg graft tip
277 $ hg graft tip
278 skipping already grafted revision 13 (same origin 2)
278 skipping already grafted revision 13 (same origin 2)
279 [255]
279 [255]
280
281 Graft with --log
282
283 $ hg up -Cq 1
284 $ hg graft 3 --log -u foo
285 grafting revision 3
286 warning: can't find ancestor for 'c' copied from 'b'!
287 $ hg log --template '{rev} {parents} {desc}\n' -r tip
288 14 1:5d205f8b35b6 3
289 (grafted from 4c60f11aa304a54ae1c199feb94e7fc771e51ed8)
General Comments 0
You need to be logged in to leave comments. Login now