##// END OF EJS Templates
bisect: avoid confusing use of variables with same names in nested local scopes
Mads Kiilerich -
r20052:79d3b6a4 default
parent child Browse files
Show More
@@ -1,5915 +1,5915
1 # commands.py - command processing for mercurial
1 # commands.py - command processing for mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version.
6 # GNU General Public License version 2 or any later version.
7
7
8 from node import hex, bin, nullid, nullrev, short
8 from node import hex, bin, nullid, nullrev, short
9 from lock import release
9 from lock import release
10 from i18n import _
10 from i18n import _
11 import os, re, difflib, time, tempfile, errno
11 import os, re, difflib, time, tempfile, errno
12 import hg, scmutil, util, revlog, copies, error, bookmarks
12 import hg, scmutil, util, revlog, copies, error, bookmarks
13 import patch, help, encoding, templatekw, discovery
13 import patch, help, encoding, templatekw, discovery
14 import archival, changegroup, cmdutil, hbisect
14 import archival, changegroup, cmdutil, hbisect
15 import sshserver, hgweb, commandserver
15 import sshserver, hgweb, commandserver
16 from hgweb import server as hgweb_server
16 from hgweb import server as hgweb_server
17 import merge as mergemod
17 import merge as mergemod
18 import minirst, revset, fileset
18 import minirst, revset, fileset
19 import dagparser, context, simplemerge, graphmod
19 import dagparser, context, simplemerge, graphmod
20 import random
20 import random
21 import setdiscovery, treediscovery, dagutil, pvec, localrepo
21 import setdiscovery, treediscovery, dagutil, pvec, localrepo
22 import phases, obsolete
22 import phases, obsolete
23
23
24 table = {}
24 table = {}
25
25
26 command = cmdutil.command(table)
26 command = cmdutil.command(table)
27
27
28 # common command options
28 # common command options
29
29
30 globalopts = [
30 globalopts = [
31 ('R', 'repository', '',
31 ('R', 'repository', '',
32 _('repository root directory or name of overlay bundle file'),
32 _('repository root directory or name of overlay bundle file'),
33 _('REPO')),
33 _('REPO')),
34 ('', 'cwd', '',
34 ('', 'cwd', '',
35 _('change working directory'), _('DIR')),
35 _('change working directory'), _('DIR')),
36 ('y', 'noninteractive', None,
36 ('y', 'noninteractive', None,
37 _('do not prompt, automatically pick the first choice for all prompts')),
37 _('do not prompt, automatically pick the first choice for all prompts')),
38 ('q', 'quiet', None, _('suppress output')),
38 ('q', 'quiet', None, _('suppress output')),
39 ('v', 'verbose', None, _('enable additional output')),
39 ('v', 'verbose', None, _('enable additional output')),
40 ('', 'config', [],
40 ('', 'config', [],
41 _('set/override config option (use \'section.name=value\')'),
41 _('set/override config option (use \'section.name=value\')'),
42 _('CONFIG')),
42 _('CONFIG')),
43 ('', 'debug', None, _('enable debugging output')),
43 ('', 'debug', None, _('enable debugging output')),
44 ('', 'debugger', None, _('start debugger')),
44 ('', 'debugger', None, _('start debugger')),
45 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
45 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
46 _('ENCODE')),
46 _('ENCODE')),
47 ('', 'encodingmode', encoding.encodingmode,
47 ('', 'encodingmode', encoding.encodingmode,
48 _('set the charset encoding mode'), _('MODE')),
48 _('set the charset encoding mode'), _('MODE')),
49 ('', 'traceback', None, _('always print a traceback on exception')),
49 ('', 'traceback', None, _('always print a traceback on exception')),
50 ('', 'time', None, _('time how long the command takes')),
50 ('', 'time', None, _('time how long the command takes')),
51 ('', 'profile', None, _('print command execution profile')),
51 ('', 'profile', None, _('print command execution profile')),
52 ('', 'version', None, _('output version information and exit')),
52 ('', 'version', None, _('output version information and exit')),
53 ('h', 'help', None, _('display help and exit')),
53 ('h', 'help', None, _('display help and exit')),
54 ('', 'hidden', False, _('consider hidden changesets')),
54 ('', 'hidden', False, _('consider hidden changesets')),
55 ]
55 ]
56
56
57 dryrunopts = [('n', 'dry-run', None,
57 dryrunopts = [('n', 'dry-run', None,
58 _('do not perform actions, just print output'))]
58 _('do not perform actions, just print output'))]
59
59
60 remoteopts = [
60 remoteopts = [
61 ('e', 'ssh', '',
61 ('e', 'ssh', '',
62 _('specify ssh command to use'), _('CMD')),
62 _('specify ssh command to use'), _('CMD')),
63 ('', 'remotecmd', '',
63 ('', 'remotecmd', '',
64 _('specify hg command to run on the remote side'), _('CMD')),
64 _('specify hg command to run on the remote side'), _('CMD')),
65 ('', 'insecure', None,
65 ('', 'insecure', None,
66 _('do not verify server certificate (ignoring web.cacerts config)')),
66 _('do not verify server certificate (ignoring web.cacerts config)')),
67 ]
67 ]
68
68
69 walkopts = [
69 walkopts = [
70 ('I', 'include', [],
70 ('I', 'include', [],
71 _('include names matching the given patterns'), _('PATTERN')),
71 _('include names matching the given patterns'), _('PATTERN')),
72 ('X', 'exclude', [],
72 ('X', 'exclude', [],
73 _('exclude names matching the given patterns'), _('PATTERN')),
73 _('exclude names matching the given patterns'), _('PATTERN')),
74 ]
74 ]
75
75
76 commitopts = [
76 commitopts = [
77 ('m', 'message', '',
77 ('m', 'message', '',
78 _('use text as commit message'), _('TEXT')),
78 _('use text as commit message'), _('TEXT')),
79 ('l', 'logfile', '',
79 ('l', 'logfile', '',
80 _('read commit message from file'), _('FILE')),
80 _('read commit message from file'), _('FILE')),
81 ]
81 ]
82
82
83 commitopts2 = [
83 commitopts2 = [
84 ('d', 'date', '',
84 ('d', 'date', '',
85 _('record the specified date as commit date'), _('DATE')),
85 _('record the specified date as commit date'), _('DATE')),
86 ('u', 'user', '',
86 ('u', 'user', '',
87 _('record the specified user as committer'), _('USER')),
87 _('record the specified user as committer'), _('USER')),
88 ]
88 ]
89
89
90 templateopts = [
90 templateopts = [
91 ('', 'style', '',
91 ('', 'style', '',
92 _('display using template map file'), _('STYLE')),
92 _('display using template map file'), _('STYLE')),
93 ('', 'template', '',
93 ('', 'template', '',
94 _('display with template'), _('TEMPLATE')),
94 _('display with template'), _('TEMPLATE')),
95 ]
95 ]
96
96
97 logopts = [
97 logopts = [
98 ('p', 'patch', None, _('show patch')),
98 ('p', 'patch', None, _('show patch')),
99 ('g', 'git', None, _('use git extended diff format')),
99 ('g', 'git', None, _('use git extended diff format')),
100 ('l', 'limit', '',
100 ('l', 'limit', '',
101 _('limit number of changes displayed'), _('NUM')),
101 _('limit number of changes displayed'), _('NUM')),
102 ('M', 'no-merges', None, _('do not show merges')),
102 ('M', 'no-merges', None, _('do not show merges')),
103 ('', 'stat', None, _('output diffstat-style summary of changes')),
103 ('', 'stat', None, _('output diffstat-style summary of changes')),
104 ('G', 'graph', None, _("show the revision DAG")),
104 ('G', 'graph', None, _("show the revision DAG")),
105 ] + templateopts
105 ] + templateopts
106
106
107 diffopts = [
107 diffopts = [
108 ('a', 'text', None, _('treat all files as text')),
108 ('a', 'text', None, _('treat all files as text')),
109 ('g', 'git', None, _('use git extended diff format')),
109 ('g', 'git', None, _('use git extended diff format')),
110 ('', 'nodates', None, _('omit dates from diff headers'))
110 ('', 'nodates', None, _('omit dates from diff headers'))
111 ]
111 ]
112
112
113 diffwsopts = [
113 diffwsopts = [
114 ('w', 'ignore-all-space', None,
114 ('w', 'ignore-all-space', None,
115 _('ignore white space when comparing lines')),
115 _('ignore white space when comparing lines')),
116 ('b', 'ignore-space-change', None,
116 ('b', 'ignore-space-change', None,
117 _('ignore changes in the amount of white space')),
117 _('ignore changes in the amount of white space')),
118 ('B', 'ignore-blank-lines', None,
118 ('B', 'ignore-blank-lines', None,
119 _('ignore changes whose lines are all blank')),
119 _('ignore changes whose lines are all blank')),
120 ]
120 ]
121
121
122 diffopts2 = [
122 diffopts2 = [
123 ('p', 'show-function', None, _('show which function each change is in')),
123 ('p', 'show-function', None, _('show which function each change is in')),
124 ('', 'reverse', None, _('produce a diff that undoes the changes')),
124 ('', 'reverse', None, _('produce a diff that undoes the changes')),
125 ] + diffwsopts + [
125 ] + diffwsopts + [
126 ('U', 'unified', '',
126 ('U', 'unified', '',
127 _('number of lines of context to show'), _('NUM')),
127 _('number of lines of context to show'), _('NUM')),
128 ('', 'stat', None, _('output diffstat-style summary of changes')),
128 ('', 'stat', None, _('output diffstat-style summary of changes')),
129 ]
129 ]
130
130
131 mergetoolopts = [
131 mergetoolopts = [
132 ('t', 'tool', '', _('specify merge tool')),
132 ('t', 'tool', '', _('specify merge tool')),
133 ]
133 ]
134
134
135 similarityopts = [
135 similarityopts = [
136 ('s', 'similarity', '',
136 ('s', 'similarity', '',
137 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
137 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
138 ]
138 ]
139
139
140 subrepoopts = [
140 subrepoopts = [
141 ('S', 'subrepos', None,
141 ('S', 'subrepos', None,
142 _('recurse into subrepositories'))
142 _('recurse into subrepositories'))
143 ]
143 ]
144
144
145 # Commands start here, listed alphabetically
145 # Commands start here, listed alphabetically
146
146
147 @command('^add',
147 @command('^add',
148 walkopts + subrepoopts + dryrunopts,
148 walkopts + subrepoopts + dryrunopts,
149 _('[OPTION]... [FILE]...'))
149 _('[OPTION]... [FILE]...'))
150 def add(ui, repo, *pats, **opts):
150 def add(ui, repo, *pats, **opts):
151 """add the specified files on the next commit
151 """add the specified files on the next commit
152
152
153 Schedule files to be version controlled and added to the
153 Schedule files to be version controlled and added to the
154 repository.
154 repository.
155
155
156 The files will be added to the repository at the next commit. To
156 The files will be added to the repository at the next commit. To
157 undo an add before that, see :hg:`forget`.
157 undo an add before that, see :hg:`forget`.
158
158
159 If no names are given, add all files to the repository.
159 If no names are given, add all files to the repository.
160
160
161 .. container:: verbose
161 .. container:: verbose
162
162
163 An example showing how new (unknown) files are added
163 An example showing how new (unknown) files are added
164 automatically by :hg:`add`::
164 automatically by :hg:`add`::
165
165
166 $ ls
166 $ ls
167 foo.c
167 foo.c
168 $ hg status
168 $ hg status
169 ? foo.c
169 ? foo.c
170 $ hg add
170 $ hg add
171 adding foo.c
171 adding foo.c
172 $ hg status
172 $ hg status
173 A foo.c
173 A foo.c
174
174
175 Returns 0 if all files are successfully added.
175 Returns 0 if all files are successfully added.
176 """
176 """
177
177
178 m = scmutil.match(repo[None], pats, opts)
178 m = scmutil.match(repo[None], pats, opts)
179 rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'),
179 rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'),
180 opts.get('subrepos'), prefix="", explicitonly=False)
180 opts.get('subrepos'), prefix="", explicitonly=False)
181 return rejected and 1 or 0
181 return rejected and 1 or 0
182
182
183 @command('addremove',
183 @command('addremove',
184 similarityopts + walkopts + dryrunopts,
184 similarityopts + walkopts + dryrunopts,
185 _('[OPTION]... [FILE]...'))
185 _('[OPTION]... [FILE]...'))
186 def addremove(ui, repo, *pats, **opts):
186 def addremove(ui, repo, *pats, **opts):
187 """add all new files, delete all missing files
187 """add all new files, delete all missing files
188
188
189 Add all new files and remove all missing files from the
189 Add all new files and remove all missing files from the
190 repository.
190 repository.
191
191
192 New files are ignored if they match any of the patterns in
192 New files are ignored if they match any of the patterns in
193 ``.hgignore``. As with add, these changes take effect at the next
193 ``.hgignore``. As with add, these changes take effect at the next
194 commit.
194 commit.
195
195
196 Use the -s/--similarity option to detect renamed files. This
196 Use the -s/--similarity option to detect renamed files. This
197 option takes a percentage between 0 (disabled) and 100 (files must
197 option takes a percentage between 0 (disabled) and 100 (files must
198 be identical) as its parameter. With a parameter greater than 0,
198 be identical) as its parameter. With a parameter greater than 0,
199 this compares every removed file with every added file and records
199 this compares every removed file with every added file and records
200 those similar enough as renames. Detecting renamed files this way
200 those similar enough as renames. Detecting renamed files this way
201 can be expensive. After using this option, :hg:`status -C` can be
201 can be expensive. After using this option, :hg:`status -C` can be
202 used to check which files were identified as moved or renamed. If
202 used to check which files were identified as moved or renamed. If
203 not specified, -s/--similarity defaults to 100 and only renames of
203 not specified, -s/--similarity defaults to 100 and only renames of
204 identical files are detected.
204 identical files are detected.
205
205
206 Returns 0 if all files are successfully added.
206 Returns 0 if all files are successfully added.
207 """
207 """
208 try:
208 try:
209 sim = float(opts.get('similarity') or 100)
209 sim = float(opts.get('similarity') or 100)
210 except ValueError:
210 except ValueError:
211 raise util.Abort(_('similarity must be a number'))
211 raise util.Abort(_('similarity must be a number'))
212 if sim < 0 or sim > 100:
212 if sim < 0 or sim > 100:
213 raise util.Abort(_('similarity must be between 0 and 100'))
213 raise util.Abort(_('similarity must be between 0 and 100'))
214 return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0)
214 return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0)
215
215
216 @command('^annotate|blame',
216 @command('^annotate|blame',
217 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
217 [('r', 'rev', '', _('annotate the specified revision'), _('REV')),
218 ('', 'follow', None,
218 ('', 'follow', None,
219 _('follow copies/renames and list the filename (DEPRECATED)')),
219 _('follow copies/renames and list the filename (DEPRECATED)')),
220 ('', 'no-follow', None, _("don't follow copies and renames")),
220 ('', 'no-follow', None, _("don't follow copies and renames")),
221 ('a', 'text', None, _('treat all files as text')),
221 ('a', 'text', None, _('treat all files as text')),
222 ('u', 'user', None, _('list the author (long with -v)')),
222 ('u', 'user', None, _('list the author (long with -v)')),
223 ('f', 'file', None, _('list the filename')),
223 ('f', 'file', None, _('list the filename')),
224 ('d', 'date', None, _('list the date (short with -q)')),
224 ('d', 'date', None, _('list the date (short with -q)')),
225 ('n', 'number', None, _('list the revision number (default)')),
225 ('n', 'number', None, _('list the revision number (default)')),
226 ('c', 'changeset', None, _('list the changeset')),
226 ('c', 'changeset', None, _('list the changeset')),
227 ('l', 'line-number', None, _('show line number at the first appearance'))
227 ('l', 'line-number', None, _('show line number at the first appearance'))
228 ] + diffwsopts + walkopts,
228 ] + diffwsopts + walkopts,
229 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'))
229 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'))
230 def annotate(ui, repo, *pats, **opts):
230 def annotate(ui, repo, *pats, **opts):
231 """show changeset information by line for each file
231 """show changeset information by line for each file
232
232
233 List changes in files, showing the revision id responsible for
233 List changes in files, showing the revision id responsible for
234 each line
234 each line
235
235
236 This command is useful for discovering when a change was made and
236 This command is useful for discovering when a change was made and
237 by whom.
237 by whom.
238
238
239 Without the -a/--text option, annotate will avoid processing files
239 Without the -a/--text option, annotate will avoid processing files
240 it detects as binary. With -a, annotate will annotate the file
240 it detects as binary. With -a, annotate will annotate the file
241 anyway, although the results will probably be neither useful
241 anyway, although the results will probably be neither useful
242 nor desirable.
242 nor desirable.
243
243
244 Returns 0 on success.
244 Returns 0 on success.
245 """
245 """
246 if opts.get('follow'):
246 if opts.get('follow'):
247 # --follow is deprecated and now just an alias for -f/--file
247 # --follow is deprecated and now just an alias for -f/--file
248 # to mimic the behavior of Mercurial before version 1.5
248 # to mimic the behavior of Mercurial before version 1.5
249 opts['file'] = True
249 opts['file'] = True
250
250
251 datefunc = ui.quiet and util.shortdate or util.datestr
251 datefunc = ui.quiet and util.shortdate or util.datestr
252 getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
252 getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
253
253
254 if not pats:
254 if not pats:
255 raise util.Abort(_('at least one filename or pattern is required'))
255 raise util.Abort(_('at least one filename or pattern is required'))
256
256
257 hexfn = ui.debugflag and hex or short
257 hexfn = ui.debugflag and hex or short
258
258
259 opmap = [('user', ' ', lambda x: ui.shortuser(x[0].user())),
259 opmap = [('user', ' ', lambda x: ui.shortuser(x[0].user())),
260 ('number', ' ', lambda x: str(x[0].rev())),
260 ('number', ' ', lambda x: str(x[0].rev())),
261 ('changeset', ' ', lambda x: hexfn(x[0].node())),
261 ('changeset', ' ', lambda x: hexfn(x[0].node())),
262 ('date', ' ', getdate),
262 ('date', ' ', getdate),
263 ('file', ' ', lambda x: x[0].path()),
263 ('file', ' ', lambda x: x[0].path()),
264 ('line_number', ':', lambda x: str(x[1])),
264 ('line_number', ':', lambda x: str(x[1])),
265 ]
265 ]
266
266
267 if (not opts.get('user') and not opts.get('changeset')
267 if (not opts.get('user') and not opts.get('changeset')
268 and not opts.get('date') and not opts.get('file')):
268 and not opts.get('date') and not opts.get('file')):
269 opts['number'] = True
269 opts['number'] = True
270
270
271 linenumber = opts.get('line_number') is not None
271 linenumber = opts.get('line_number') is not None
272 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
272 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
273 raise util.Abort(_('at least one of -n/-c is required for -l'))
273 raise util.Abort(_('at least one of -n/-c is required for -l'))
274
274
275 funcmap = [(func, sep) for op, sep, func in opmap if opts.get(op)]
275 funcmap = [(func, sep) for op, sep, func in opmap if opts.get(op)]
276 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
276 funcmap[0] = (funcmap[0][0], '') # no separator in front of first column
277
277
278 def bad(x, y):
278 def bad(x, y):
279 raise util.Abort("%s: %s" % (x, y))
279 raise util.Abort("%s: %s" % (x, y))
280
280
281 ctx = scmutil.revsingle(repo, opts.get('rev'))
281 ctx = scmutil.revsingle(repo, opts.get('rev'))
282 m = scmutil.match(ctx, pats, opts)
282 m = scmutil.match(ctx, pats, opts)
283 m.bad = bad
283 m.bad = bad
284 follow = not opts.get('no_follow')
284 follow = not opts.get('no_follow')
285 diffopts = patch.diffopts(ui, opts, section='annotate')
285 diffopts = patch.diffopts(ui, opts, section='annotate')
286 for abs in ctx.walk(m):
286 for abs in ctx.walk(m):
287 fctx = ctx[abs]
287 fctx = ctx[abs]
288 if not opts.get('text') and util.binary(fctx.data()):
288 if not opts.get('text') and util.binary(fctx.data()):
289 ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
289 ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
290 continue
290 continue
291
291
292 lines = fctx.annotate(follow=follow, linenumber=linenumber,
292 lines = fctx.annotate(follow=follow, linenumber=linenumber,
293 diffopts=diffopts)
293 diffopts=diffopts)
294 pieces = []
294 pieces = []
295
295
296 for f, sep in funcmap:
296 for f, sep in funcmap:
297 l = [f(n) for n, dummy in lines]
297 l = [f(n) for n, dummy in lines]
298 if l:
298 if l:
299 sized = [(x, encoding.colwidth(x)) for x in l]
299 sized = [(x, encoding.colwidth(x)) for x in l]
300 ml = max([w for x, w in sized])
300 ml = max([w for x, w in sized])
301 pieces.append(["%s%s%s" % (sep, ' ' * (ml - w), x)
301 pieces.append(["%s%s%s" % (sep, ' ' * (ml - w), x)
302 for x, w in sized])
302 for x, w in sized])
303
303
304 if pieces:
304 if pieces:
305 for p, l in zip(zip(*pieces), lines):
305 for p, l in zip(zip(*pieces), lines):
306 ui.write("%s: %s" % ("".join(p), l[1]))
306 ui.write("%s: %s" % ("".join(p), l[1]))
307
307
308 if lines and not lines[-1][1].endswith('\n'):
308 if lines and not lines[-1][1].endswith('\n'):
309 ui.write('\n')
309 ui.write('\n')
310
310
311 @command('archive',
311 @command('archive',
312 [('', 'no-decode', None, _('do not pass files through decoders')),
312 [('', 'no-decode', None, _('do not pass files through decoders')),
313 ('p', 'prefix', '', _('directory prefix for files in archive'),
313 ('p', 'prefix', '', _('directory prefix for files in archive'),
314 _('PREFIX')),
314 _('PREFIX')),
315 ('r', 'rev', '', _('revision to distribute'), _('REV')),
315 ('r', 'rev', '', _('revision to distribute'), _('REV')),
316 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
316 ('t', 'type', '', _('type of distribution to create'), _('TYPE')),
317 ] + subrepoopts + walkopts,
317 ] + subrepoopts + walkopts,
318 _('[OPTION]... DEST'))
318 _('[OPTION]... DEST'))
319 def archive(ui, repo, dest, **opts):
319 def archive(ui, repo, dest, **opts):
320 '''create an unversioned archive of a repository revision
320 '''create an unversioned archive of a repository revision
321
321
322 By default, the revision used is the parent of the working
322 By default, the revision used is the parent of the working
323 directory; use -r/--rev to specify a different revision.
323 directory; use -r/--rev to specify a different revision.
324
324
325 The archive type is automatically detected based on file
325 The archive type is automatically detected based on file
326 extension (or override using -t/--type).
326 extension (or override using -t/--type).
327
327
328 .. container:: verbose
328 .. container:: verbose
329
329
330 Examples:
330 Examples:
331
331
332 - create a zip file containing the 1.0 release::
332 - create a zip file containing the 1.0 release::
333
333
334 hg archive -r 1.0 project-1.0.zip
334 hg archive -r 1.0 project-1.0.zip
335
335
336 - create a tarball excluding .hg files::
336 - create a tarball excluding .hg files::
337
337
338 hg archive project.tar.gz -X ".hg*"
338 hg archive project.tar.gz -X ".hg*"
339
339
340 Valid types are:
340 Valid types are:
341
341
342 :``files``: a directory full of files (default)
342 :``files``: a directory full of files (default)
343 :``tar``: tar archive, uncompressed
343 :``tar``: tar archive, uncompressed
344 :``tbz2``: tar archive, compressed using bzip2
344 :``tbz2``: tar archive, compressed using bzip2
345 :``tgz``: tar archive, compressed using gzip
345 :``tgz``: tar archive, compressed using gzip
346 :``uzip``: zip archive, uncompressed
346 :``uzip``: zip archive, uncompressed
347 :``zip``: zip archive, compressed using deflate
347 :``zip``: zip archive, compressed using deflate
348
348
349 The exact name of the destination archive or directory is given
349 The exact name of the destination archive or directory is given
350 using a format string; see :hg:`help export` for details.
350 using a format string; see :hg:`help export` for details.
351
351
352 Each member added to an archive file has a directory prefix
352 Each member added to an archive file has a directory prefix
353 prepended. Use -p/--prefix to specify a format string for the
353 prepended. Use -p/--prefix to specify a format string for the
354 prefix. The default is the basename of the archive, with suffixes
354 prefix. The default is the basename of the archive, with suffixes
355 removed.
355 removed.
356
356
357 Returns 0 on success.
357 Returns 0 on success.
358 '''
358 '''
359
359
360 ctx = scmutil.revsingle(repo, opts.get('rev'))
360 ctx = scmutil.revsingle(repo, opts.get('rev'))
361 if not ctx:
361 if not ctx:
362 raise util.Abort(_('no working directory: please specify a revision'))
362 raise util.Abort(_('no working directory: please specify a revision'))
363 node = ctx.node()
363 node = ctx.node()
364 dest = cmdutil.makefilename(repo, dest, node)
364 dest = cmdutil.makefilename(repo, dest, node)
365 if os.path.realpath(dest) == repo.root:
365 if os.path.realpath(dest) == repo.root:
366 raise util.Abort(_('repository root cannot be destination'))
366 raise util.Abort(_('repository root cannot be destination'))
367
367
368 kind = opts.get('type') or archival.guesskind(dest) or 'files'
368 kind = opts.get('type') or archival.guesskind(dest) or 'files'
369 prefix = opts.get('prefix')
369 prefix = opts.get('prefix')
370
370
371 if dest == '-':
371 if dest == '-':
372 if kind == 'files':
372 if kind == 'files':
373 raise util.Abort(_('cannot archive plain files to stdout'))
373 raise util.Abort(_('cannot archive plain files to stdout'))
374 dest = cmdutil.makefileobj(repo, dest)
374 dest = cmdutil.makefileobj(repo, dest)
375 if not prefix:
375 if not prefix:
376 prefix = os.path.basename(repo.root) + '-%h'
376 prefix = os.path.basename(repo.root) + '-%h'
377
377
378 prefix = cmdutil.makefilename(repo, prefix, node)
378 prefix = cmdutil.makefilename(repo, prefix, node)
379 matchfn = scmutil.match(ctx, [], opts)
379 matchfn = scmutil.match(ctx, [], opts)
380 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
380 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
381 matchfn, prefix, subrepos=opts.get('subrepos'))
381 matchfn, prefix, subrepos=opts.get('subrepos'))
382
382
383 @command('backout',
383 @command('backout',
384 [('', 'merge', None, _('merge with old dirstate parent after backout')),
384 [('', 'merge', None, _('merge with old dirstate parent after backout')),
385 ('', 'parent', '',
385 ('', 'parent', '',
386 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
386 _('parent to choose when backing out merge (DEPRECATED)'), _('REV')),
387 ('r', 'rev', '', _('revision to backout'), _('REV')),
387 ('r', 'rev', '', _('revision to backout'), _('REV')),
388 ] + mergetoolopts + walkopts + commitopts + commitopts2,
388 ] + mergetoolopts + walkopts + commitopts + commitopts2,
389 _('[OPTION]... [-r] REV'))
389 _('[OPTION]... [-r] REV'))
390 def backout(ui, repo, node=None, rev=None, **opts):
390 def backout(ui, repo, node=None, rev=None, **opts):
391 '''reverse effect of earlier changeset
391 '''reverse effect of earlier changeset
392
392
393 Prepare a new changeset with the effect of REV undone in the
393 Prepare a new changeset with the effect of REV undone in the
394 current working directory.
394 current working directory.
395
395
396 If REV is the parent of the working directory, then this new changeset
396 If REV is the parent of the working directory, then this new changeset
397 is committed automatically. Otherwise, hg needs to merge the
397 is committed automatically. Otherwise, hg needs to merge the
398 changes and the merged result is left uncommitted.
398 changes and the merged result is left uncommitted.
399
399
400 .. note::
400 .. note::
401
401
402 backout cannot be used to fix either an unwanted or
402 backout cannot be used to fix either an unwanted or
403 incorrect merge.
403 incorrect merge.
404
404
405 .. container:: verbose
405 .. container:: verbose
406
406
407 By default, the pending changeset will have one parent,
407 By default, the pending changeset will have one parent,
408 maintaining a linear history. With --merge, the pending
408 maintaining a linear history. With --merge, the pending
409 changeset will instead have two parents: the old parent of the
409 changeset will instead have two parents: the old parent of the
410 working directory and a new child of REV that simply undoes REV.
410 working directory and a new child of REV that simply undoes REV.
411
411
412 Before version 1.7, the behavior without --merge was equivalent
412 Before version 1.7, the behavior without --merge was equivalent
413 to specifying --merge followed by :hg:`update --clean .` to
413 to specifying --merge followed by :hg:`update --clean .` to
414 cancel the merge and leave the child of REV as a head to be
414 cancel the merge and leave the child of REV as a head to be
415 merged separately.
415 merged separately.
416
416
417 See :hg:`help dates` for a list of formats valid for -d/--date.
417 See :hg:`help dates` for a list of formats valid for -d/--date.
418
418
419 Returns 0 on success.
419 Returns 0 on success.
420 '''
420 '''
421 if rev and node:
421 if rev and node:
422 raise util.Abort(_("please specify just one revision"))
422 raise util.Abort(_("please specify just one revision"))
423
423
424 if not rev:
424 if not rev:
425 rev = node
425 rev = node
426
426
427 if not rev:
427 if not rev:
428 raise util.Abort(_("please specify a revision to backout"))
428 raise util.Abort(_("please specify a revision to backout"))
429
429
430 date = opts.get('date')
430 date = opts.get('date')
431 if date:
431 if date:
432 opts['date'] = util.parsedate(date)
432 opts['date'] = util.parsedate(date)
433
433
434 cmdutil.checkunfinished(repo)
434 cmdutil.checkunfinished(repo)
435 cmdutil.bailifchanged(repo)
435 cmdutil.bailifchanged(repo)
436 node = scmutil.revsingle(repo, rev).node()
436 node = scmutil.revsingle(repo, rev).node()
437
437
438 op1, op2 = repo.dirstate.parents()
438 op1, op2 = repo.dirstate.parents()
439 a = repo.changelog.ancestor(op1, node)
439 a = repo.changelog.ancestor(op1, node)
440 if a != node:
440 if a != node:
441 raise util.Abort(_('cannot backout change on a different branch'))
441 raise util.Abort(_('cannot backout change on a different branch'))
442
442
443 p1, p2 = repo.changelog.parents(node)
443 p1, p2 = repo.changelog.parents(node)
444 if p1 == nullid:
444 if p1 == nullid:
445 raise util.Abort(_('cannot backout a change with no parents'))
445 raise util.Abort(_('cannot backout a change with no parents'))
446 if p2 != nullid:
446 if p2 != nullid:
447 if not opts.get('parent'):
447 if not opts.get('parent'):
448 raise util.Abort(_('cannot backout a merge changeset'))
448 raise util.Abort(_('cannot backout a merge changeset'))
449 p = repo.lookup(opts['parent'])
449 p = repo.lookup(opts['parent'])
450 if p not in (p1, p2):
450 if p not in (p1, p2):
451 raise util.Abort(_('%s is not a parent of %s') %
451 raise util.Abort(_('%s is not a parent of %s') %
452 (short(p), short(node)))
452 (short(p), short(node)))
453 parent = p
453 parent = p
454 else:
454 else:
455 if opts.get('parent'):
455 if opts.get('parent'):
456 raise util.Abort(_('cannot use --parent on non-merge changeset'))
456 raise util.Abort(_('cannot use --parent on non-merge changeset'))
457 parent = p1
457 parent = p1
458
458
459 # the backout should appear on the same branch
459 # the backout should appear on the same branch
460 wlock = repo.wlock()
460 wlock = repo.wlock()
461 try:
461 try:
462 branch = repo.dirstate.branch()
462 branch = repo.dirstate.branch()
463 bheads = repo.branchheads(branch)
463 bheads = repo.branchheads(branch)
464 hg.clean(repo, node, show_stats=False)
464 hg.clean(repo, node, show_stats=False)
465 repo.dirstate.setbranch(branch)
465 repo.dirstate.setbranch(branch)
466 rctx = scmutil.revsingle(repo, hex(parent))
466 rctx = scmutil.revsingle(repo, hex(parent))
467 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
467 cmdutil.revert(ui, repo, rctx, repo.dirstate.parents())
468 if not opts.get('merge') and op1 != node:
468 if not opts.get('merge') and op1 != node:
469 try:
469 try:
470 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
470 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
471 return hg.update(repo, op1)
471 return hg.update(repo, op1)
472 finally:
472 finally:
473 ui.setconfig('ui', 'forcemerge', '')
473 ui.setconfig('ui', 'forcemerge', '')
474
474
475 e = cmdutil.commiteditor
475 e = cmdutil.commiteditor
476 if not opts['message'] and not opts['logfile']:
476 if not opts['message'] and not opts['logfile']:
477 # we don't translate commit messages
477 # we don't translate commit messages
478 opts['message'] = "Backed out changeset %s" % short(node)
478 opts['message'] = "Backed out changeset %s" % short(node)
479 e = cmdutil.commitforceeditor
479 e = cmdutil.commitforceeditor
480
480
481 def commitfunc(ui, repo, message, match, opts):
481 def commitfunc(ui, repo, message, match, opts):
482 return repo.commit(message, opts.get('user'), opts.get('date'),
482 return repo.commit(message, opts.get('user'), opts.get('date'),
483 match, editor=e)
483 match, editor=e)
484 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
484 newnode = cmdutil.commit(ui, repo, commitfunc, [], opts)
485 cmdutil.commitstatus(repo, newnode, branch, bheads)
485 cmdutil.commitstatus(repo, newnode, branch, bheads)
486
486
487 def nice(node):
487 def nice(node):
488 return '%d:%s' % (repo.changelog.rev(node), short(node))
488 return '%d:%s' % (repo.changelog.rev(node), short(node))
489 ui.status(_('changeset %s backs out changeset %s\n') %
489 ui.status(_('changeset %s backs out changeset %s\n') %
490 (nice(repo.changelog.tip()), nice(node)))
490 (nice(repo.changelog.tip()), nice(node)))
491 if opts.get('merge') and op1 != node:
491 if opts.get('merge') and op1 != node:
492 hg.clean(repo, op1, show_stats=False)
492 hg.clean(repo, op1, show_stats=False)
493 ui.status(_('merging with changeset %s\n')
493 ui.status(_('merging with changeset %s\n')
494 % nice(repo.changelog.tip()))
494 % nice(repo.changelog.tip()))
495 try:
495 try:
496 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
496 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
497 return hg.merge(repo, hex(repo.changelog.tip()))
497 return hg.merge(repo, hex(repo.changelog.tip()))
498 finally:
498 finally:
499 ui.setconfig('ui', 'forcemerge', '')
499 ui.setconfig('ui', 'forcemerge', '')
500 finally:
500 finally:
501 wlock.release()
501 wlock.release()
502 return 0
502 return 0
503
503
504 @command('bisect',
504 @command('bisect',
505 [('r', 'reset', False, _('reset bisect state')),
505 [('r', 'reset', False, _('reset bisect state')),
506 ('g', 'good', False, _('mark changeset good')),
506 ('g', 'good', False, _('mark changeset good')),
507 ('b', 'bad', False, _('mark changeset bad')),
507 ('b', 'bad', False, _('mark changeset bad')),
508 ('s', 'skip', False, _('skip testing changeset')),
508 ('s', 'skip', False, _('skip testing changeset')),
509 ('e', 'extend', False, _('extend the bisect range')),
509 ('e', 'extend', False, _('extend the bisect range')),
510 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
510 ('c', 'command', '', _('use command to check changeset state'), _('CMD')),
511 ('U', 'noupdate', False, _('do not update to target'))],
511 ('U', 'noupdate', False, _('do not update to target'))],
512 _("[-gbsr] [-U] [-c CMD] [REV]"))
512 _("[-gbsr] [-U] [-c CMD] [REV]"))
513 def bisect(ui, repo, rev=None, extra=None, command=None,
513 def bisect(ui, repo, rev=None, extra=None, command=None,
514 reset=None, good=None, bad=None, skip=None, extend=None,
514 reset=None, good=None, bad=None, skip=None, extend=None,
515 noupdate=None):
515 noupdate=None):
516 """subdivision search of changesets
516 """subdivision search of changesets
517
517
518 This command helps to find changesets which introduce problems. To
518 This command helps to find changesets which introduce problems. To
519 use, mark the earliest changeset you know exhibits the problem as
519 use, mark the earliest changeset you know exhibits the problem as
520 bad, then mark the latest changeset which is free from the problem
520 bad, then mark the latest changeset which is free from the problem
521 as good. Bisect will update your working directory to a revision
521 as good. Bisect will update your working directory to a revision
522 for testing (unless the -U/--noupdate option is specified). Once
522 for testing (unless the -U/--noupdate option is specified). Once
523 you have performed tests, mark the working directory as good or
523 you have performed tests, mark the working directory as good or
524 bad, and bisect will either update to another candidate changeset
524 bad, and bisect will either update to another candidate changeset
525 or announce that it has found the bad revision.
525 or announce that it has found the bad revision.
526
526
527 As a shortcut, you can also use the revision argument to mark a
527 As a shortcut, you can also use the revision argument to mark a
528 revision as good or bad without checking it out first.
528 revision as good or bad without checking it out first.
529
529
530 If you supply a command, it will be used for automatic bisection.
530 If you supply a command, it will be used for automatic bisection.
531 The environment variable HG_NODE will contain the ID of the
531 The environment variable HG_NODE will contain the ID of the
532 changeset being tested. The exit status of the command will be
532 changeset being tested. The exit status of the command will be
533 used to mark revisions as good or bad: status 0 means good, 125
533 used to mark revisions as good or bad: status 0 means good, 125
534 means to skip the revision, 127 (command not found) will abort the
534 means to skip the revision, 127 (command not found) will abort the
535 bisection, and any other non-zero exit status means the revision
535 bisection, and any other non-zero exit status means the revision
536 is bad.
536 is bad.
537
537
538 .. container:: verbose
538 .. container:: verbose
539
539
540 Some examples:
540 Some examples:
541
541
542 - start a bisection with known bad revision 12, and good revision 34::
542 - start a bisection with known bad revision 12, and good revision 34::
543
543
544 hg bisect --bad 34
544 hg bisect --bad 34
545 hg bisect --good 12
545 hg bisect --good 12
546
546
547 - advance the current bisection by marking current revision as good or
547 - advance the current bisection by marking current revision as good or
548 bad::
548 bad::
549
549
550 hg bisect --good
550 hg bisect --good
551 hg bisect --bad
551 hg bisect --bad
552
552
553 - mark the current revision, or a known revision, to be skipped (e.g. if
553 - mark the current revision, or a known revision, to be skipped (e.g. if
554 that revision is not usable because of another issue)::
554 that revision is not usable because of another issue)::
555
555
556 hg bisect --skip
556 hg bisect --skip
557 hg bisect --skip 23
557 hg bisect --skip 23
558
558
559 - skip all revisions that do not touch directories ``foo`` or ``bar``::
559 - skip all revisions that do not touch directories ``foo`` or ``bar``::
560
560
561 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
561 hg bisect --skip "!( file('path:foo') & file('path:bar') )"
562
562
563 - forget the current bisection::
563 - forget the current bisection::
564
564
565 hg bisect --reset
565 hg bisect --reset
566
566
567 - use 'make && make tests' to automatically find the first broken
567 - use 'make && make tests' to automatically find the first broken
568 revision::
568 revision::
569
569
570 hg bisect --reset
570 hg bisect --reset
571 hg bisect --bad 34
571 hg bisect --bad 34
572 hg bisect --good 12
572 hg bisect --good 12
573 hg bisect --command "make && make tests"
573 hg bisect --command "make && make tests"
574
574
575 - see all changesets whose states are already known in the current
575 - see all changesets whose states are already known in the current
576 bisection::
576 bisection::
577
577
578 hg log -r "bisect(pruned)"
578 hg log -r "bisect(pruned)"
579
579
580 - see the changeset currently being bisected (especially useful
580 - see the changeset currently being bisected (especially useful
581 if running with -U/--noupdate)::
581 if running with -U/--noupdate)::
582
582
583 hg log -r "bisect(current)"
583 hg log -r "bisect(current)"
584
584
585 - see all changesets that took part in the current bisection::
585 - see all changesets that took part in the current bisection::
586
586
587 hg log -r "bisect(range)"
587 hg log -r "bisect(range)"
588
588
589 - with the graphlog extension, you can even get a nice graph::
589 - with the graphlog extension, you can even get a nice graph::
590
590
591 hg log --graph -r "bisect(range)"
591 hg log --graph -r "bisect(range)"
592
592
593 See :hg:`help revsets` for more about the `bisect()` keyword.
593 See :hg:`help revsets` for more about the `bisect()` keyword.
594
594
595 Returns 0 on success.
595 Returns 0 on success.
596 """
596 """
597 def extendbisectrange(nodes, good):
597 def extendbisectrange(nodes, good):
598 # bisect is incomplete when it ends on a merge node and
598 # bisect is incomplete when it ends on a merge node and
599 # one of the parent was not checked.
599 # one of the parent was not checked.
600 parents = repo[nodes[0]].parents()
600 parents = repo[nodes[0]].parents()
601 if len(parents) > 1:
601 if len(parents) > 1:
602 side = good and state['bad'] or state['good']
602 side = good and state['bad'] or state['good']
603 num = len(set(i.node() for i in parents) & set(side))
603 num = len(set(i.node() for i in parents) & set(side))
604 if num == 1:
604 if num == 1:
605 return parents[0].ancestor(parents[1])
605 return parents[0].ancestor(parents[1])
606 return None
606 return None
607
607
608 def print_result(nodes, good):
608 def print_result(nodes, good):
609 displayer = cmdutil.show_changeset(ui, repo, {})
609 displayer = cmdutil.show_changeset(ui, repo, {})
610 if len(nodes) == 1:
610 if len(nodes) == 1:
611 # narrowed it down to a single revision
611 # narrowed it down to a single revision
612 if good:
612 if good:
613 ui.write(_("The first good revision is:\n"))
613 ui.write(_("The first good revision is:\n"))
614 else:
614 else:
615 ui.write(_("The first bad revision is:\n"))
615 ui.write(_("The first bad revision is:\n"))
616 displayer.show(repo[nodes[0]])
616 displayer.show(repo[nodes[0]])
617 extendnode = extendbisectrange(nodes, good)
617 extendnode = extendbisectrange(nodes, good)
618 if extendnode is not None:
618 if extendnode is not None:
619 ui.write(_('Not all ancestors of this changeset have been'
619 ui.write(_('Not all ancestors of this changeset have been'
620 ' checked.\nUse bisect --extend to continue the '
620 ' checked.\nUse bisect --extend to continue the '
621 'bisection from\nthe common ancestor, %s.\n')
621 'bisection from\nthe common ancestor, %s.\n')
622 % extendnode)
622 % extendnode)
623 else:
623 else:
624 # multiple possible revisions
624 # multiple possible revisions
625 if good:
625 if good:
626 ui.write(_("Due to skipped revisions, the first "
626 ui.write(_("Due to skipped revisions, the first "
627 "good revision could be any of:\n"))
627 "good revision could be any of:\n"))
628 else:
628 else:
629 ui.write(_("Due to skipped revisions, the first "
629 ui.write(_("Due to skipped revisions, the first "
630 "bad revision could be any of:\n"))
630 "bad revision could be any of:\n"))
631 for n in nodes:
631 for n in nodes:
632 displayer.show(repo[n])
632 displayer.show(repo[n])
633 displayer.close()
633 displayer.close()
634
634
635 def check_state(state, interactive=True):
635 def check_state(state, interactive=True):
636 if not state['good'] or not state['bad']:
636 if not state['good'] or not state['bad']:
637 if (good or bad or skip or reset) and interactive:
637 if (good or bad or skip or reset) and interactive:
638 return
638 return
639 if not state['good']:
639 if not state['good']:
640 raise util.Abort(_('cannot bisect (no known good revisions)'))
640 raise util.Abort(_('cannot bisect (no known good revisions)'))
641 else:
641 else:
642 raise util.Abort(_('cannot bisect (no known bad revisions)'))
642 raise util.Abort(_('cannot bisect (no known bad revisions)'))
643 return True
643 return True
644
644
645 # backward compatibility
645 # backward compatibility
646 if rev in "good bad reset init".split():
646 if rev in "good bad reset init".split():
647 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
647 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
648 cmd, rev, extra = rev, extra, None
648 cmd, rev, extra = rev, extra, None
649 if cmd == "good":
649 if cmd == "good":
650 good = True
650 good = True
651 elif cmd == "bad":
651 elif cmd == "bad":
652 bad = True
652 bad = True
653 else:
653 else:
654 reset = True
654 reset = True
655 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
655 elif extra or good + bad + skip + reset + extend + bool(command) > 1:
656 raise util.Abort(_('incompatible arguments'))
656 raise util.Abort(_('incompatible arguments'))
657
657
658 cmdutil.checkunfinished(repo)
658 cmdutil.checkunfinished(repo)
659
659
660 if reset:
660 if reset:
661 p = repo.join("bisect.state")
661 p = repo.join("bisect.state")
662 if os.path.exists(p):
662 if os.path.exists(p):
663 os.unlink(p)
663 os.unlink(p)
664 return
664 return
665
665
666 state = hbisect.load_state(repo)
666 state = hbisect.load_state(repo)
667
667
668 if command:
668 if command:
669 changesets = 1
669 changesets = 1
670 try:
670 try:
671 node = state['current'][0]
671 node = state['current'][0]
672 except LookupError:
672 except LookupError:
673 if noupdate:
673 if noupdate:
674 raise util.Abort(_('current bisect revision is unknown - '
674 raise util.Abort(_('current bisect revision is unknown - '
675 'start a new bisect to fix'))
675 'start a new bisect to fix'))
676 node, p2 = repo.dirstate.parents()
676 node, p2 = repo.dirstate.parents()
677 if p2 != nullid:
677 if p2 != nullid:
678 raise util.Abort(_('current bisect revision is a merge'))
678 raise util.Abort(_('current bisect revision is a merge'))
679 try:
679 try:
680 while changesets:
680 while changesets:
681 # update state
681 # update state
682 state['current'] = [node]
682 state['current'] = [node]
683 hbisect.save_state(repo, state)
683 hbisect.save_state(repo, state)
684 status = util.system(command,
684 status = util.system(command,
685 environ={'HG_NODE': hex(node)},
685 environ={'HG_NODE': hex(node)},
686 out=ui.fout)
686 out=ui.fout)
687 if status == 125:
687 if status == 125:
688 transition = "skip"
688 transition = "skip"
689 elif status == 0:
689 elif status == 0:
690 transition = "good"
690 transition = "good"
691 # status < 0 means process was killed
691 # status < 0 means process was killed
692 elif status == 127:
692 elif status == 127:
693 raise util.Abort(_("failed to execute %s") % command)
693 raise util.Abort(_("failed to execute %s") % command)
694 elif status < 0:
694 elif status < 0:
695 raise util.Abort(_("%s killed") % command)
695 raise util.Abort(_("%s killed") % command)
696 else:
696 else:
697 transition = "bad"
697 transition = "bad"
698 ctx = scmutil.revsingle(repo, rev, node)
698 ctx = scmutil.revsingle(repo, rev, node)
699 rev = None # clear for future iterations
699 rev = None # clear for future iterations
700 state[transition].append(ctx.node())
700 state[transition].append(ctx.node())
701 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
701 ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition))
702 check_state(state, interactive=False)
702 check_state(state, interactive=False)
703 # bisect
703 # bisect
704 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
704 nodes, changesets, bgood = hbisect.bisect(repo.changelog, state)
705 # update to next check
705 # update to next check
706 node = nodes[0]
706 node = nodes[0]
707 if not noupdate:
707 if not noupdate:
708 cmdutil.bailifchanged(repo)
708 cmdutil.bailifchanged(repo)
709 hg.clean(repo, node, show_stats=False)
709 hg.clean(repo, node, show_stats=False)
710 finally:
710 finally:
711 state['current'] = [node]
711 state['current'] = [node]
712 hbisect.save_state(repo, state)
712 hbisect.save_state(repo, state)
713 print_result(nodes, good)
713 print_result(nodes, bgood)
714 return
714 return
715
715
716 # update state
716 # update state
717
717
718 if rev:
718 if rev:
719 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
719 nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])]
720 else:
720 else:
721 nodes = [repo.lookup('.')]
721 nodes = [repo.lookup('.')]
722
722
723 if good or bad or skip:
723 if good or bad or skip:
724 if good:
724 if good:
725 state['good'] += nodes
725 state['good'] += nodes
726 elif bad:
726 elif bad:
727 state['bad'] += nodes
727 state['bad'] += nodes
728 elif skip:
728 elif skip:
729 state['skip'] += nodes
729 state['skip'] += nodes
730 hbisect.save_state(repo, state)
730 hbisect.save_state(repo, state)
731
731
732 if not check_state(state):
732 if not check_state(state):
733 return
733 return
734
734
735 # actually bisect
735 # actually bisect
736 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
736 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
737 if extend:
737 if extend:
738 if not changesets:
738 if not changesets:
739 extendnode = extendbisectrange(nodes, good)
739 extendnode = extendbisectrange(nodes, good)
740 if extendnode is not None:
740 if extendnode is not None:
741 ui.write(_("Extending search to changeset %d:%s\n"
741 ui.write(_("Extending search to changeset %d:%s\n"
742 % (extendnode.rev(), extendnode)))
742 % (extendnode.rev(), extendnode)))
743 state['current'] = [extendnode.node()]
743 state['current'] = [extendnode.node()]
744 hbisect.save_state(repo, state)
744 hbisect.save_state(repo, state)
745 if noupdate:
745 if noupdate:
746 return
746 return
747 cmdutil.bailifchanged(repo)
747 cmdutil.bailifchanged(repo)
748 return hg.clean(repo, extendnode.node())
748 return hg.clean(repo, extendnode.node())
749 raise util.Abort(_("nothing to extend"))
749 raise util.Abort(_("nothing to extend"))
750
750
751 if changesets == 0:
751 if changesets == 0:
752 print_result(nodes, good)
752 print_result(nodes, good)
753 else:
753 else:
754 assert len(nodes) == 1 # only a single node can be tested next
754 assert len(nodes) == 1 # only a single node can be tested next
755 node = nodes[0]
755 node = nodes[0]
756 # compute the approximate number of remaining tests
756 # compute the approximate number of remaining tests
757 tests, size = 0, 2
757 tests, size = 0, 2
758 while size <= changesets:
758 while size <= changesets:
759 tests, size = tests + 1, size * 2
759 tests, size = tests + 1, size * 2
760 rev = repo.changelog.rev(node)
760 rev = repo.changelog.rev(node)
761 ui.write(_("Testing changeset %d:%s "
761 ui.write(_("Testing changeset %d:%s "
762 "(%d changesets remaining, ~%d tests)\n")
762 "(%d changesets remaining, ~%d tests)\n")
763 % (rev, short(node), changesets, tests))
763 % (rev, short(node), changesets, tests))
764 state['current'] = [node]
764 state['current'] = [node]
765 hbisect.save_state(repo, state)
765 hbisect.save_state(repo, state)
766 if not noupdate:
766 if not noupdate:
767 cmdutil.bailifchanged(repo)
767 cmdutil.bailifchanged(repo)
768 return hg.clean(repo, node)
768 return hg.clean(repo, node)
769
769
770 @command('bookmarks|bookmark',
770 @command('bookmarks|bookmark',
771 [('f', 'force', False, _('force')),
771 [('f', 'force', False, _('force')),
772 ('r', 'rev', '', _('revision'), _('REV')),
772 ('r', 'rev', '', _('revision'), _('REV')),
773 ('d', 'delete', False, _('delete a given bookmark')),
773 ('d', 'delete', False, _('delete a given bookmark')),
774 ('m', 'rename', '', _('rename a given bookmark'), _('NAME')),
774 ('m', 'rename', '', _('rename a given bookmark'), _('NAME')),
775 ('i', 'inactive', False, _('mark a bookmark inactive'))],
775 ('i', 'inactive', False, _('mark a bookmark inactive'))],
776 _('hg bookmarks [OPTIONS]... [NAME]...'))
776 _('hg bookmarks [OPTIONS]... [NAME]...'))
777 def bookmark(ui, repo, *names, **opts):
777 def bookmark(ui, repo, *names, **opts):
778 '''track a line of development with movable markers
778 '''track a line of development with movable markers
779
779
780 Bookmarks are pointers to certain commits that move when committing.
780 Bookmarks are pointers to certain commits that move when committing.
781 Bookmarks are local. They can be renamed, copied and deleted. It is
781 Bookmarks are local. They can be renamed, copied and deleted. It is
782 possible to use :hg:`merge NAME` to merge from a given bookmark, and
782 possible to use :hg:`merge NAME` to merge from a given bookmark, and
783 :hg:`update NAME` to update to a given bookmark.
783 :hg:`update NAME` to update to a given bookmark.
784
784
785 You can use :hg:`bookmark NAME` to set a bookmark on the working
785 You can use :hg:`bookmark NAME` to set a bookmark on the working
786 directory's parent revision with the given name. If you specify
786 directory's parent revision with the given name. If you specify
787 a revision using -r REV (where REV may be an existing bookmark),
787 a revision using -r REV (where REV may be an existing bookmark),
788 the bookmark is assigned to that revision.
788 the bookmark is assigned to that revision.
789
789
790 Bookmarks can be pushed and pulled between repositories (see :hg:`help
790 Bookmarks can be pushed and pulled between repositories (see :hg:`help
791 push` and :hg:`help pull`). This requires both the local and remote
791 push` and :hg:`help pull`). This requires both the local and remote
792 repositories to support bookmarks. For versions prior to 1.8, this means
792 repositories to support bookmarks. For versions prior to 1.8, this means
793 the bookmarks extension must be enabled.
793 the bookmarks extension must be enabled.
794
794
795 If you set a bookmark called '@', new clones of the repository will
795 If you set a bookmark called '@', new clones of the repository will
796 have that revision checked out (and the bookmark made active) by
796 have that revision checked out (and the bookmark made active) by
797 default.
797 default.
798
798
799 With -i/--inactive, the new bookmark will not be made the active
799 With -i/--inactive, the new bookmark will not be made the active
800 bookmark. If -r/--rev is given, the new bookmark will not be made
800 bookmark. If -r/--rev is given, the new bookmark will not be made
801 active even if -i/--inactive is not given. If no NAME is given, the
801 active even if -i/--inactive is not given. If no NAME is given, the
802 current active bookmark will be marked inactive.
802 current active bookmark will be marked inactive.
803 '''
803 '''
804 force = opts.get('force')
804 force = opts.get('force')
805 rev = opts.get('rev')
805 rev = opts.get('rev')
806 delete = opts.get('delete')
806 delete = opts.get('delete')
807 rename = opts.get('rename')
807 rename = opts.get('rename')
808 inactive = opts.get('inactive')
808 inactive = opts.get('inactive')
809
809
810 hexfn = ui.debugflag and hex or short
810 hexfn = ui.debugflag and hex or short
811 marks = repo._bookmarks
811 marks = repo._bookmarks
812 cur = repo.changectx('.').node()
812 cur = repo.changectx('.').node()
813
813
814 def checkformat(mark):
814 def checkformat(mark):
815 mark = mark.strip()
815 mark = mark.strip()
816 if not mark:
816 if not mark:
817 raise util.Abort(_("bookmark names cannot consist entirely of "
817 raise util.Abort(_("bookmark names cannot consist entirely of "
818 "whitespace"))
818 "whitespace"))
819 scmutil.checknewlabel(repo, mark, 'bookmark')
819 scmutil.checknewlabel(repo, mark, 'bookmark')
820 return mark
820 return mark
821
821
822 def checkconflict(repo, mark, force=False, target=None):
822 def checkconflict(repo, mark, force=False, target=None):
823 if mark in marks and not force:
823 if mark in marks and not force:
824 if target:
824 if target:
825 if marks[mark] == target and target == cur:
825 if marks[mark] == target and target == cur:
826 # re-activating a bookmark
826 # re-activating a bookmark
827 return
827 return
828 anc = repo.changelog.ancestors([repo[target].rev()])
828 anc = repo.changelog.ancestors([repo[target].rev()])
829 bmctx = repo[marks[mark]]
829 bmctx = repo[marks[mark]]
830 divs = [repo[b].node() for b in marks
830 divs = [repo[b].node() for b in marks
831 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
831 if b.split('@', 1)[0] == mark.split('@', 1)[0]]
832
832
833 # allow resolving a single divergent bookmark even if moving
833 # allow resolving a single divergent bookmark even if moving
834 # the bookmark across branches when a revision is specified
834 # the bookmark across branches when a revision is specified
835 # that contains a divergent bookmark
835 # that contains a divergent bookmark
836 if bmctx.rev() not in anc and target in divs:
836 if bmctx.rev() not in anc and target in divs:
837 bookmarks.deletedivergent(repo, [target], mark)
837 bookmarks.deletedivergent(repo, [target], mark)
838 return
838 return
839
839
840 deletefrom = [b for b in divs
840 deletefrom = [b for b in divs
841 if repo[b].rev() in anc or b == target]
841 if repo[b].rev() in anc or b == target]
842 bookmarks.deletedivergent(repo, deletefrom, mark)
842 bookmarks.deletedivergent(repo, deletefrom, mark)
843 if bmctx.rev() in anc:
843 if bmctx.rev() in anc:
844 ui.status(_("moving bookmark '%s' forward from %s\n") %
844 ui.status(_("moving bookmark '%s' forward from %s\n") %
845 (mark, short(bmctx.node())))
845 (mark, short(bmctx.node())))
846 return
846 return
847 raise util.Abort(_("bookmark '%s' already exists "
847 raise util.Abort(_("bookmark '%s' already exists "
848 "(use -f to force)") % mark)
848 "(use -f to force)") % mark)
849 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
849 if ((mark in repo.branchmap() or mark == repo.dirstate.branch())
850 and not force):
850 and not force):
851 raise util.Abort(
851 raise util.Abort(
852 _("a bookmark cannot have the name of an existing branch"))
852 _("a bookmark cannot have the name of an existing branch"))
853
853
854 if delete and rename:
854 if delete and rename:
855 raise util.Abort(_("--delete and --rename are incompatible"))
855 raise util.Abort(_("--delete and --rename are incompatible"))
856 if delete and rev:
856 if delete and rev:
857 raise util.Abort(_("--rev is incompatible with --delete"))
857 raise util.Abort(_("--rev is incompatible with --delete"))
858 if rename and rev:
858 if rename and rev:
859 raise util.Abort(_("--rev is incompatible with --rename"))
859 raise util.Abort(_("--rev is incompatible with --rename"))
860 if not names and (delete or rev):
860 if not names and (delete or rev):
861 raise util.Abort(_("bookmark name required"))
861 raise util.Abort(_("bookmark name required"))
862
862
863 if delete:
863 if delete:
864 for mark in names:
864 for mark in names:
865 if mark not in marks:
865 if mark not in marks:
866 raise util.Abort(_("bookmark '%s' does not exist") % mark)
866 raise util.Abort(_("bookmark '%s' does not exist") % mark)
867 if mark == repo._bookmarkcurrent:
867 if mark == repo._bookmarkcurrent:
868 bookmarks.setcurrent(repo, None)
868 bookmarks.setcurrent(repo, None)
869 del marks[mark]
869 del marks[mark]
870 marks.write()
870 marks.write()
871
871
872 elif rename:
872 elif rename:
873 if not names:
873 if not names:
874 raise util.Abort(_("new bookmark name required"))
874 raise util.Abort(_("new bookmark name required"))
875 elif len(names) > 1:
875 elif len(names) > 1:
876 raise util.Abort(_("only one new bookmark name allowed"))
876 raise util.Abort(_("only one new bookmark name allowed"))
877 mark = checkformat(names[0])
877 mark = checkformat(names[0])
878 if rename not in marks:
878 if rename not in marks:
879 raise util.Abort(_("bookmark '%s' does not exist") % rename)
879 raise util.Abort(_("bookmark '%s' does not exist") % rename)
880 checkconflict(repo, mark, force)
880 checkconflict(repo, mark, force)
881 marks[mark] = marks[rename]
881 marks[mark] = marks[rename]
882 if repo._bookmarkcurrent == rename and not inactive:
882 if repo._bookmarkcurrent == rename and not inactive:
883 bookmarks.setcurrent(repo, mark)
883 bookmarks.setcurrent(repo, mark)
884 del marks[rename]
884 del marks[rename]
885 marks.write()
885 marks.write()
886
886
887 elif names:
887 elif names:
888 newact = None
888 newact = None
889 for mark in names:
889 for mark in names:
890 mark = checkformat(mark)
890 mark = checkformat(mark)
891 if newact is None:
891 if newact is None:
892 newact = mark
892 newact = mark
893 if inactive and mark == repo._bookmarkcurrent:
893 if inactive and mark == repo._bookmarkcurrent:
894 bookmarks.setcurrent(repo, None)
894 bookmarks.setcurrent(repo, None)
895 return
895 return
896 tgt = cur
896 tgt = cur
897 if rev:
897 if rev:
898 tgt = scmutil.revsingle(repo, rev).node()
898 tgt = scmutil.revsingle(repo, rev).node()
899 checkconflict(repo, mark, force, tgt)
899 checkconflict(repo, mark, force, tgt)
900 marks[mark] = tgt
900 marks[mark] = tgt
901 if not inactive and cur == marks[newact] and not rev:
901 if not inactive and cur == marks[newact] and not rev:
902 bookmarks.setcurrent(repo, newact)
902 bookmarks.setcurrent(repo, newact)
903 elif cur != tgt and newact == repo._bookmarkcurrent:
903 elif cur != tgt and newact == repo._bookmarkcurrent:
904 bookmarks.setcurrent(repo, None)
904 bookmarks.setcurrent(repo, None)
905 marks.write()
905 marks.write()
906
906
907 # Same message whether trying to deactivate the current bookmark (-i
907 # Same message whether trying to deactivate the current bookmark (-i
908 # with no NAME) or listing bookmarks
908 # with no NAME) or listing bookmarks
909 elif len(marks) == 0:
909 elif len(marks) == 0:
910 ui.status(_("no bookmarks set\n"))
910 ui.status(_("no bookmarks set\n"))
911
911
912 elif inactive:
912 elif inactive:
913 if not repo._bookmarkcurrent:
913 if not repo._bookmarkcurrent:
914 ui.status(_("no active bookmark\n"))
914 ui.status(_("no active bookmark\n"))
915 else:
915 else:
916 bookmarks.setcurrent(repo, None)
916 bookmarks.setcurrent(repo, None)
917
917
918 else: # show bookmarks
918 else: # show bookmarks
919 for bmark, n in sorted(marks.iteritems()):
919 for bmark, n in sorted(marks.iteritems()):
920 current = repo._bookmarkcurrent
920 current = repo._bookmarkcurrent
921 if bmark == current:
921 if bmark == current:
922 prefix, label = '*', 'bookmarks.current'
922 prefix, label = '*', 'bookmarks.current'
923 else:
923 else:
924 prefix, label = ' ', ''
924 prefix, label = ' ', ''
925
925
926 if ui.quiet:
926 if ui.quiet:
927 ui.write("%s\n" % bmark, label=label)
927 ui.write("%s\n" % bmark, label=label)
928 else:
928 else:
929 ui.write(" %s %-25s %d:%s\n" % (
929 ui.write(" %s %-25s %d:%s\n" % (
930 prefix, bmark, repo.changelog.rev(n), hexfn(n)),
930 prefix, bmark, repo.changelog.rev(n), hexfn(n)),
931 label=label)
931 label=label)
932
932
933 @command('branch',
933 @command('branch',
934 [('f', 'force', None,
934 [('f', 'force', None,
935 _('set branch name even if it shadows an existing branch')),
935 _('set branch name even if it shadows an existing branch')),
936 ('C', 'clean', None, _('reset branch name to parent branch name'))],
936 ('C', 'clean', None, _('reset branch name to parent branch name'))],
937 _('[-fC] [NAME]'))
937 _('[-fC] [NAME]'))
938 def branch(ui, repo, label=None, **opts):
938 def branch(ui, repo, label=None, **opts):
939 """set or show the current branch name
939 """set or show the current branch name
940
940
941 .. note::
941 .. note::
942
942
943 Branch names are permanent and global. Use :hg:`bookmark` to create a
943 Branch names are permanent and global. Use :hg:`bookmark` to create a
944 light-weight bookmark instead. See :hg:`help glossary` for more
944 light-weight bookmark instead. See :hg:`help glossary` for more
945 information about named branches and bookmarks.
945 information about named branches and bookmarks.
946
946
947 With no argument, show the current branch name. With one argument,
947 With no argument, show the current branch name. With one argument,
948 set the working directory branch name (the branch will not exist
948 set the working directory branch name (the branch will not exist
949 in the repository until the next commit). Standard practice
949 in the repository until the next commit). Standard practice
950 recommends that primary development take place on the 'default'
950 recommends that primary development take place on the 'default'
951 branch.
951 branch.
952
952
953 Unless -f/--force is specified, branch will not let you set a
953 Unless -f/--force is specified, branch will not let you set a
954 branch name that already exists, even if it's inactive.
954 branch name that already exists, even if it's inactive.
955
955
956 Use -C/--clean to reset the working directory branch to that of
956 Use -C/--clean to reset the working directory branch to that of
957 the parent of the working directory, negating a previous branch
957 the parent of the working directory, negating a previous branch
958 change.
958 change.
959
959
960 Use the command :hg:`update` to switch to an existing branch. Use
960 Use the command :hg:`update` to switch to an existing branch. Use
961 :hg:`commit --close-branch` to mark this branch as closed.
961 :hg:`commit --close-branch` to mark this branch as closed.
962
962
963 Returns 0 on success.
963 Returns 0 on success.
964 """
964 """
965 if label:
965 if label:
966 label = label.strip()
966 label = label.strip()
967
967
968 if not opts.get('clean') and not label:
968 if not opts.get('clean') and not label:
969 ui.write("%s\n" % repo.dirstate.branch())
969 ui.write("%s\n" % repo.dirstate.branch())
970 return
970 return
971
971
972 wlock = repo.wlock()
972 wlock = repo.wlock()
973 try:
973 try:
974 if opts.get('clean'):
974 if opts.get('clean'):
975 label = repo[None].p1().branch()
975 label = repo[None].p1().branch()
976 repo.dirstate.setbranch(label)
976 repo.dirstate.setbranch(label)
977 ui.status(_('reset working directory to branch %s\n') % label)
977 ui.status(_('reset working directory to branch %s\n') % label)
978 elif label:
978 elif label:
979 if not opts.get('force') and label in repo.branchmap():
979 if not opts.get('force') and label in repo.branchmap():
980 if label not in [p.branch() for p in repo.parents()]:
980 if label not in [p.branch() for p in repo.parents()]:
981 raise util.Abort(_('a branch of the same name already'
981 raise util.Abort(_('a branch of the same name already'
982 ' exists'),
982 ' exists'),
983 # i18n: "it" refers to an existing branch
983 # i18n: "it" refers to an existing branch
984 hint=_("use 'hg update' to switch to it"))
984 hint=_("use 'hg update' to switch to it"))
985 scmutil.checknewlabel(repo, label, 'branch')
985 scmutil.checknewlabel(repo, label, 'branch')
986 repo.dirstate.setbranch(label)
986 repo.dirstate.setbranch(label)
987 ui.status(_('marked working directory as branch %s\n') % label)
987 ui.status(_('marked working directory as branch %s\n') % label)
988 ui.status(_('(branches are permanent and global, '
988 ui.status(_('(branches are permanent and global, '
989 'did you want a bookmark?)\n'))
989 'did you want a bookmark?)\n'))
990 finally:
990 finally:
991 wlock.release()
991 wlock.release()
992
992
993 @command('branches',
993 @command('branches',
994 [('a', 'active', False, _('show only branches that have unmerged heads')),
994 [('a', 'active', False, _('show only branches that have unmerged heads')),
995 ('c', 'closed', False, _('show normal and closed branches'))],
995 ('c', 'closed', False, _('show normal and closed branches'))],
996 _('[-ac]'))
996 _('[-ac]'))
997 def branches(ui, repo, active=False, closed=False):
997 def branches(ui, repo, active=False, closed=False):
998 """list repository named branches
998 """list repository named branches
999
999
1000 List the repository's named branches, indicating which ones are
1000 List the repository's named branches, indicating which ones are
1001 inactive. If -c/--closed is specified, also list branches which have
1001 inactive. If -c/--closed is specified, also list branches which have
1002 been marked closed (see :hg:`commit --close-branch`).
1002 been marked closed (see :hg:`commit --close-branch`).
1003
1003
1004 If -a/--active is specified, only show active branches. A branch
1004 If -a/--active is specified, only show active branches. A branch
1005 is considered active if it contains repository heads.
1005 is considered active if it contains repository heads.
1006
1006
1007 Use the command :hg:`update` to switch to an existing branch.
1007 Use the command :hg:`update` to switch to an existing branch.
1008
1008
1009 Returns 0.
1009 Returns 0.
1010 """
1010 """
1011
1011
1012 hexfunc = ui.debugflag and hex or short
1012 hexfunc = ui.debugflag and hex or short
1013
1013
1014 activebranches = set([repo[n].branch() for n in repo.heads()])
1014 activebranches = set([repo[n].branch() for n in repo.heads()])
1015 branches = []
1015 branches = []
1016 for tag, heads in repo.branchmap().iteritems():
1016 for tag, heads in repo.branchmap().iteritems():
1017 for h in reversed(heads):
1017 for h in reversed(heads):
1018 ctx = repo[h]
1018 ctx = repo[h]
1019 isopen = not ctx.closesbranch()
1019 isopen = not ctx.closesbranch()
1020 if isopen:
1020 if isopen:
1021 tip = ctx
1021 tip = ctx
1022 break
1022 break
1023 else:
1023 else:
1024 tip = repo[heads[-1]]
1024 tip = repo[heads[-1]]
1025 isactive = tag in activebranches and isopen
1025 isactive = tag in activebranches and isopen
1026 branches.append((tip, isactive, isopen))
1026 branches.append((tip, isactive, isopen))
1027 branches.sort(key=lambda i: (i[1], i[0].rev(), i[0].branch(), i[2]),
1027 branches.sort(key=lambda i: (i[1], i[0].rev(), i[0].branch(), i[2]),
1028 reverse=True)
1028 reverse=True)
1029
1029
1030 for ctx, isactive, isopen in branches:
1030 for ctx, isactive, isopen in branches:
1031 if (not active) or isactive:
1031 if (not active) or isactive:
1032 if isactive:
1032 if isactive:
1033 label = 'branches.active'
1033 label = 'branches.active'
1034 notice = ''
1034 notice = ''
1035 elif not isopen:
1035 elif not isopen:
1036 if not closed:
1036 if not closed:
1037 continue
1037 continue
1038 label = 'branches.closed'
1038 label = 'branches.closed'
1039 notice = _(' (closed)')
1039 notice = _(' (closed)')
1040 else:
1040 else:
1041 label = 'branches.inactive'
1041 label = 'branches.inactive'
1042 notice = _(' (inactive)')
1042 notice = _(' (inactive)')
1043 if ctx.branch() == repo.dirstate.branch():
1043 if ctx.branch() == repo.dirstate.branch():
1044 label = 'branches.current'
1044 label = 'branches.current'
1045 rev = str(ctx.rev()).rjust(31 - encoding.colwidth(ctx.branch()))
1045 rev = str(ctx.rev()).rjust(31 - encoding.colwidth(ctx.branch()))
1046 rev = ui.label('%s:%s' % (rev, hexfunc(ctx.node())),
1046 rev = ui.label('%s:%s' % (rev, hexfunc(ctx.node())),
1047 'log.changeset changeset.%s' % ctx.phasestr())
1047 'log.changeset changeset.%s' % ctx.phasestr())
1048 tag = ui.label(ctx.branch(), label)
1048 tag = ui.label(ctx.branch(), label)
1049 if ui.quiet:
1049 if ui.quiet:
1050 ui.write("%s\n" % tag)
1050 ui.write("%s\n" % tag)
1051 else:
1051 else:
1052 ui.write("%s %s%s\n" % (tag, rev, notice))
1052 ui.write("%s %s%s\n" % (tag, rev, notice))
1053
1053
1054 @command('bundle',
1054 @command('bundle',
1055 [('f', 'force', None, _('run even when the destination is unrelated')),
1055 [('f', 'force', None, _('run even when the destination is unrelated')),
1056 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1056 ('r', 'rev', [], _('a changeset intended to be added to the destination'),
1057 _('REV')),
1057 _('REV')),
1058 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1058 ('b', 'branch', [], _('a specific branch you would like to bundle'),
1059 _('BRANCH')),
1059 _('BRANCH')),
1060 ('', 'base', [],
1060 ('', 'base', [],
1061 _('a base changeset assumed to be available at the destination'),
1061 _('a base changeset assumed to be available at the destination'),
1062 _('REV')),
1062 _('REV')),
1063 ('a', 'all', None, _('bundle all changesets in the repository')),
1063 ('a', 'all', None, _('bundle all changesets in the repository')),
1064 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1064 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')),
1065 ] + remoteopts,
1065 ] + remoteopts,
1066 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1066 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]'))
1067 def bundle(ui, repo, fname, dest=None, **opts):
1067 def bundle(ui, repo, fname, dest=None, **opts):
1068 """create a changegroup file
1068 """create a changegroup file
1069
1069
1070 Generate a compressed changegroup file collecting changesets not
1070 Generate a compressed changegroup file collecting changesets not
1071 known to be in another repository.
1071 known to be in another repository.
1072
1072
1073 If you omit the destination repository, then hg assumes the
1073 If you omit the destination repository, then hg assumes the
1074 destination will have all the nodes you specify with --base
1074 destination will have all the nodes you specify with --base
1075 parameters. To create a bundle containing all changesets, use
1075 parameters. To create a bundle containing all changesets, use
1076 -a/--all (or --base null).
1076 -a/--all (or --base null).
1077
1077
1078 You can change compression method with the -t/--type option.
1078 You can change compression method with the -t/--type option.
1079 The available compression methods are: none, bzip2, and
1079 The available compression methods are: none, bzip2, and
1080 gzip (by default, bundles are compressed using bzip2).
1080 gzip (by default, bundles are compressed using bzip2).
1081
1081
1082 The bundle file can then be transferred using conventional means
1082 The bundle file can then be transferred using conventional means
1083 and applied to another repository with the unbundle or pull
1083 and applied to another repository with the unbundle or pull
1084 command. This is useful when direct push and pull are not
1084 command. This is useful when direct push and pull are not
1085 available or when exporting an entire repository is undesirable.
1085 available or when exporting an entire repository is undesirable.
1086
1086
1087 Applying bundles preserves all changeset contents including
1087 Applying bundles preserves all changeset contents including
1088 permissions, copy/rename information, and revision history.
1088 permissions, copy/rename information, and revision history.
1089
1089
1090 Returns 0 on success, 1 if no changes found.
1090 Returns 0 on success, 1 if no changes found.
1091 """
1091 """
1092 revs = None
1092 revs = None
1093 if 'rev' in opts:
1093 if 'rev' in opts:
1094 revs = scmutil.revrange(repo, opts['rev'])
1094 revs = scmutil.revrange(repo, opts['rev'])
1095
1095
1096 bundletype = opts.get('type', 'bzip2').lower()
1096 bundletype = opts.get('type', 'bzip2').lower()
1097 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1097 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1098 bundletype = btypes.get(bundletype)
1098 bundletype = btypes.get(bundletype)
1099 if bundletype not in changegroup.bundletypes:
1099 if bundletype not in changegroup.bundletypes:
1100 raise util.Abort(_('unknown bundle type specified with --type'))
1100 raise util.Abort(_('unknown bundle type specified with --type'))
1101
1101
1102 if opts.get('all'):
1102 if opts.get('all'):
1103 base = ['null']
1103 base = ['null']
1104 else:
1104 else:
1105 base = scmutil.revrange(repo, opts.get('base'))
1105 base = scmutil.revrange(repo, opts.get('base'))
1106 # TODO: get desired bundlecaps from command line.
1106 # TODO: get desired bundlecaps from command line.
1107 bundlecaps = None
1107 bundlecaps = None
1108 if base:
1108 if base:
1109 if dest:
1109 if dest:
1110 raise util.Abort(_("--base is incompatible with specifying "
1110 raise util.Abort(_("--base is incompatible with specifying "
1111 "a destination"))
1111 "a destination"))
1112 common = [repo.lookup(rev) for rev in base]
1112 common = [repo.lookup(rev) for rev in base]
1113 heads = revs and map(repo.lookup, revs) or revs
1113 heads = revs and map(repo.lookup, revs) or revs
1114 cg = repo.getbundle('bundle', heads=heads, common=common,
1114 cg = repo.getbundle('bundle', heads=heads, common=common,
1115 bundlecaps=bundlecaps)
1115 bundlecaps=bundlecaps)
1116 outgoing = None
1116 outgoing = None
1117 else:
1117 else:
1118 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1118 dest = ui.expandpath(dest or 'default-push', dest or 'default')
1119 dest, branches = hg.parseurl(dest, opts.get('branch'))
1119 dest, branches = hg.parseurl(dest, opts.get('branch'))
1120 other = hg.peer(repo, opts, dest)
1120 other = hg.peer(repo, opts, dest)
1121 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1121 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1122 heads = revs and map(repo.lookup, revs) or revs
1122 heads = revs and map(repo.lookup, revs) or revs
1123 outgoing = discovery.findcommonoutgoing(repo, other,
1123 outgoing = discovery.findcommonoutgoing(repo, other,
1124 onlyheads=heads,
1124 onlyheads=heads,
1125 force=opts.get('force'),
1125 force=opts.get('force'),
1126 portable=True)
1126 portable=True)
1127 cg = repo.getlocalbundle('bundle', outgoing, bundlecaps)
1127 cg = repo.getlocalbundle('bundle', outgoing, bundlecaps)
1128 if not cg:
1128 if not cg:
1129 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1129 scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded)
1130 return 1
1130 return 1
1131
1131
1132 changegroup.writebundle(cg, fname, bundletype)
1132 changegroup.writebundle(cg, fname, bundletype)
1133
1133
1134 @command('cat',
1134 @command('cat',
1135 [('o', 'output', '',
1135 [('o', 'output', '',
1136 _('print output to file with formatted name'), _('FORMAT')),
1136 _('print output to file with formatted name'), _('FORMAT')),
1137 ('r', 'rev', '', _('print the given revision'), _('REV')),
1137 ('r', 'rev', '', _('print the given revision'), _('REV')),
1138 ('', 'decode', None, _('apply any matching decode filter')),
1138 ('', 'decode', None, _('apply any matching decode filter')),
1139 ] + walkopts,
1139 ] + walkopts,
1140 _('[OPTION]... FILE...'))
1140 _('[OPTION]... FILE...'))
1141 def cat(ui, repo, file1, *pats, **opts):
1141 def cat(ui, repo, file1, *pats, **opts):
1142 """output the current or given revision of files
1142 """output the current or given revision of files
1143
1143
1144 Print the specified files as they were at the given revision. If
1144 Print the specified files as they were at the given revision. If
1145 no revision is given, the parent of the working directory is used.
1145 no revision is given, the parent of the working directory is used.
1146
1146
1147 Output may be to a file, in which case the name of the file is
1147 Output may be to a file, in which case the name of the file is
1148 given using a format string. The formatting rules are the same as
1148 given using a format string. The formatting rules are the same as
1149 for the export command, with the following additions:
1149 for the export command, with the following additions:
1150
1150
1151 :``%s``: basename of file being printed
1151 :``%s``: basename of file being printed
1152 :``%d``: dirname of file being printed, or '.' if in repository root
1152 :``%d``: dirname of file being printed, or '.' if in repository root
1153 :``%p``: root-relative path name of file being printed
1153 :``%p``: root-relative path name of file being printed
1154
1154
1155 Returns 0 on success.
1155 Returns 0 on success.
1156 """
1156 """
1157 ctx = scmutil.revsingle(repo, opts.get('rev'))
1157 ctx = scmutil.revsingle(repo, opts.get('rev'))
1158 err = 1
1158 err = 1
1159 m = scmutil.match(ctx, (file1,) + pats, opts)
1159 m = scmutil.match(ctx, (file1,) + pats, opts)
1160 for abs in ctx.walk(m):
1160 for abs in ctx.walk(m):
1161 fp = cmdutil.makefileobj(repo, opts.get('output'), ctx.node(),
1161 fp = cmdutil.makefileobj(repo, opts.get('output'), ctx.node(),
1162 pathname=abs)
1162 pathname=abs)
1163 data = ctx[abs].data()
1163 data = ctx[abs].data()
1164 if opts.get('decode'):
1164 if opts.get('decode'):
1165 data = repo.wwritedata(abs, data)
1165 data = repo.wwritedata(abs, data)
1166 fp.write(data)
1166 fp.write(data)
1167 fp.close()
1167 fp.close()
1168 err = 0
1168 err = 0
1169 return err
1169 return err
1170
1170
1171 @command('^clone',
1171 @command('^clone',
1172 [('U', 'noupdate', None,
1172 [('U', 'noupdate', None,
1173 _('the clone will include an empty working copy (only a repository)')),
1173 _('the clone will include an empty working copy (only a repository)')),
1174 ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')),
1174 ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')),
1175 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1175 ('r', 'rev', [], _('include the specified changeset'), _('REV')),
1176 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1176 ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')),
1177 ('', 'pull', None, _('use pull protocol to copy metadata')),
1177 ('', 'pull', None, _('use pull protocol to copy metadata')),
1178 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1178 ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')),
1179 ] + remoteopts,
1179 ] + remoteopts,
1180 _('[OPTION]... SOURCE [DEST]'))
1180 _('[OPTION]... SOURCE [DEST]'))
1181 def clone(ui, source, dest=None, **opts):
1181 def clone(ui, source, dest=None, **opts):
1182 """make a copy of an existing repository
1182 """make a copy of an existing repository
1183
1183
1184 Create a copy of an existing repository in a new directory.
1184 Create a copy of an existing repository in a new directory.
1185
1185
1186 If no destination directory name is specified, it defaults to the
1186 If no destination directory name is specified, it defaults to the
1187 basename of the source.
1187 basename of the source.
1188
1188
1189 The location of the source is added to the new repository's
1189 The location of the source is added to the new repository's
1190 ``.hg/hgrc`` file, as the default to be used for future pulls.
1190 ``.hg/hgrc`` file, as the default to be used for future pulls.
1191
1191
1192 Only local paths and ``ssh://`` URLs are supported as
1192 Only local paths and ``ssh://`` URLs are supported as
1193 destinations. For ``ssh://`` destinations, no working directory or
1193 destinations. For ``ssh://`` destinations, no working directory or
1194 ``.hg/hgrc`` will be created on the remote side.
1194 ``.hg/hgrc`` will be created on the remote side.
1195
1195
1196 To pull only a subset of changesets, specify one or more revisions
1196 To pull only a subset of changesets, specify one or more revisions
1197 identifiers with -r/--rev or branches with -b/--branch. The
1197 identifiers with -r/--rev or branches with -b/--branch. The
1198 resulting clone will contain only the specified changesets and
1198 resulting clone will contain only the specified changesets and
1199 their ancestors. These options (or 'clone src#rev dest') imply
1199 their ancestors. These options (or 'clone src#rev dest') imply
1200 --pull, even for local source repositories. Note that specifying a
1200 --pull, even for local source repositories. Note that specifying a
1201 tag will include the tagged changeset but not the changeset
1201 tag will include the tagged changeset but not the changeset
1202 containing the tag.
1202 containing the tag.
1203
1203
1204 If the source repository has a bookmark called '@' set, that
1204 If the source repository has a bookmark called '@' set, that
1205 revision will be checked out in the new repository by default.
1205 revision will be checked out in the new repository by default.
1206
1206
1207 To check out a particular version, use -u/--update, or
1207 To check out a particular version, use -u/--update, or
1208 -U/--noupdate to create a clone with no working directory.
1208 -U/--noupdate to create a clone with no working directory.
1209
1209
1210 .. container:: verbose
1210 .. container:: verbose
1211
1211
1212 For efficiency, hardlinks are used for cloning whenever the
1212 For efficiency, hardlinks are used for cloning whenever the
1213 source and destination are on the same filesystem (note this
1213 source and destination are on the same filesystem (note this
1214 applies only to the repository data, not to the working
1214 applies only to the repository data, not to the working
1215 directory). Some filesystems, such as AFS, implement hardlinking
1215 directory). Some filesystems, such as AFS, implement hardlinking
1216 incorrectly, but do not report errors. In these cases, use the
1216 incorrectly, but do not report errors. In these cases, use the
1217 --pull option to avoid hardlinking.
1217 --pull option to avoid hardlinking.
1218
1218
1219 In some cases, you can clone repositories and the working
1219 In some cases, you can clone repositories and the working
1220 directory using full hardlinks with ::
1220 directory using full hardlinks with ::
1221
1221
1222 $ cp -al REPO REPOCLONE
1222 $ cp -al REPO REPOCLONE
1223
1223
1224 This is the fastest way to clone, but it is not always safe. The
1224 This is the fastest way to clone, but it is not always safe. The
1225 operation is not atomic (making sure REPO is not modified during
1225 operation is not atomic (making sure REPO is not modified during
1226 the operation is up to you) and you have to make sure your
1226 the operation is up to you) and you have to make sure your
1227 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1227 editor breaks hardlinks (Emacs and most Linux Kernel tools do
1228 so). Also, this is not compatible with certain extensions that
1228 so). Also, this is not compatible with certain extensions that
1229 place their metadata under the .hg directory, such as mq.
1229 place their metadata under the .hg directory, such as mq.
1230
1230
1231 Mercurial will update the working directory to the first applicable
1231 Mercurial will update the working directory to the first applicable
1232 revision from this list:
1232 revision from this list:
1233
1233
1234 a) null if -U or the source repository has no changesets
1234 a) null if -U or the source repository has no changesets
1235 b) if -u . and the source repository is local, the first parent of
1235 b) if -u . and the source repository is local, the first parent of
1236 the source repository's working directory
1236 the source repository's working directory
1237 c) the changeset specified with -u (if a branch name, this means the
1237 c) the changeset specified with -u (if a branch name, this means the
1238 latest head of that branch)
1238 latest head of that branch)
1239 d) the changeset specified with -r
1239 d) the changeset specified with -r
1240 e) the tipmost head specified with -b
1240 e) the tipmost head specified with -b
1241 f) the tipmost head specified with the url#branch source syntax
1241 f) the tipmost head specified with the url#branch source syntax
1242 g) the revision marked with the '@' bookmark, if present
1242 g) the revision marked with the '@' bookmark, if present
1243 h) the tipmost head of the default branch
1243 h) the tipmost head of the default branch
1244 i) tip
1244 i) tip
1245
1245
1246 Examples:
1246 Examples:
1247
1247
1248 - clone a remote repository to a new directory named hg/::
1248 - clone a remote repository to a new directory named hg/::
1249
1249
1250 hg clone http://selenic.com/hg
1250 hg clone http://selenic.com/hg
1251
1251
1252 - create a lightweight local clone::
1252 - create a lightweight local clone::
1253
1253
1254 hg clone project/ project-feature/
1254 hg clone project/ project-feature/
1255
1255
1256 - clone from an absolute path on an ssh server (note double-slash)::
1256 - clone from an absolute path on an ssh server (note double-slash)::
1257
1257
1258 hg clone ssh://user@server//home/projects/alpha/
1258 hg clone ssh://user@server//home/projects/alpha/
1259
1259
1260 - do a high-speed clone over a LAN while checking out a
1260 - do a high-speed clone over a LAN while checking out a
1261 specified version::
1261 specified version::
1262
1262
1263 hg clone --uncompressed http://server/repo -u 1.5
1263 hg clone --uncompressed http://server/repo -u 1.5
1264
1264
1265 - create a repository without changesets after a particular revision::
1265 - create a repository without changesets after a particular revision::
1266
1266
1267 hg clone -r 04e544 experimental/ good/
1267 hg clone -r 04e544 experimental/ good/
1268
1268
1269 - clone (and track) a particular named branch::
1269 - clone (and track) a particular named branch::
1270
1270
1271 hg clone http://selenic.com/hg#stable
1271 hg clone http://selenic.com/hg#stable
1272
1272
1273 See :hg:`help urls` for details on specifying URLs.
1273 See :hg:`help urls` for details on specifying URLs.
1274
1274
1275 Returns 0 on success.
1275 Returns 0 on success.
1276 """
1276 """
1277 if opts.get('noupdate') and opts.get('updaterev'):
1277 if opts.get('noupdate') and opts.get('updaterev'):
1278 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
1278 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
1279
1279
1280 r = hg.clone(ui, opts, source, dest,
1280 r = hg.clone(ui, opts, source, dest,
1281 pull=opts.get('pull'),
1281 pull=opts.get('pull'),
1282 stream=opts.get('uncompressed'),
1282 stream=opts.get('uncompressed'),
1283 rev=opts.get('rev'),
1283 rev=opts.get('rev'),
1284 update=opts.get('updaterev') or not opts.get('noupdate'),
1284 update=opts.get('updaterev') or not opts.get('noupdate'),
1285 branch=opts.get('branch'))
1285 branch=opts.get('branch'))
1286
1286
1287 return r is None
1287 return r is None
1288
1288
1289 @command('^commit|ci',
1289 @command('^commit|ci',
1290 [('A', 'addremove', None,
1290 [('A', 'addremove', None,
1291 _('mark new/missing files as added/removed before committing')),
1291 _('mark new/missing files as added/removed before committing')),
1292 ('', 'close-branch', None,
1292 ('', 'close-branch', None,
1293 _('mark a branch as closed, hiding it from the branch list')),
1293 _('mark a branch as closed, hiding it from the branch list')),
1294 ('', 'amend', None, _('amend the parent of the working dir')),
1294 ('', 'amend', None, _('amend the parent of the working dir')),
1295 ('s', 'secret', None, _('use the secret phase for committing')),
1295 ('s', 'secret', None, _('use the secret phase for committing')),
1296 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1296 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1297 _('[OPTION]... [FILE]...'))
1297 _('[OPTION]... [FILE]...'))
1298 def commit(ui, repo, *pats, **opts):
1298 def commit(ui, repo, *pats, **opts):
1299 """commit the specified files or all outstanding changes
1299 """commit the specified files or all outstanding changes
1300
1300
1301 Commit changes to the given files into the repository. Unlike a
1301 Commit changes to the given files into the repository. Unlike a
1302 centralized SCM, this operation is a local operation. See
1302 centralized SCM, this operation is a local operation. See
1303 :hg:`push` for a way to actively distribute your changes.
1303 :hg:`push` for a way to actively distribute your changes.
1304
1304
1305 If a list of files is omitted, all changes reported by :hg:`status`
1305 If a list of files is omitted, all changes reported by :hg:`status`
1306 will be committed.
1306 will be committed.
1307
1307
1308 If you are committing the result of a merge, do not provide any
1308 If you are committing the result of a merge, do not provide any
1309 filenames or -I/-X filters.
1309 filenames or -I/-X filters.
1310
1310
1311 If no commit message is specified, Mercurial starts your
1311 If no commit message is specified, Mercurial starts your
1312 configured editor where you can enter a message. In case your
1312 configured editor where you can enter a message. In case your
1313 commit fails, you will find a backup of your message in
1313 commit fails, you will find a backup of your message in
1314 ``.hg/last-message.txt``.
1314 ``.hg/last-message.txt``.
1315
1315
1316 The --amend flag can be used to amend the parent of the
1316 The --amend flag can be used to amend the parent of the
1317 working directory with a new commit that contains the changes
1317 working directory with a new commit that contains the changes
1318 in the parent in addition to those currently reported by :hg:`status`,
1318 in the parent in addition to those currently reported by :hg:`status`,
1319 if there are any. The old commit is stored in a backup bundle in
1319 if there are any. The old commit is stored in a backup bundle in
1320 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1320 ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`
1321 on how to restore it).
1321 on how to restore it).
1322
1322
1323 Message, user and date are taken from the amended commit unless
1323 Message, user and date are taken from the amended commit unless
1324 specified. When a message isn't specified on the command line,
1324 specified. When a message isn't specified on the command line,
1325 the editor will open with the message of the amended commit.
1325 the editor will open with the message of the amended commit.
1326
1326
1327 It is not possible to amend public changesets (see :hg:`help phases`)
1327 It is not possible to amend public changesets (see :hg:`help phases`)
1328 or changesets that have children.
1328 or changesets that have children.
1329
1329
1330 See :hg:`help dates` for a list of formats valid for -d/--date.
1330 See :hg:`help dates` for a list of formats valid for -d/--date.
1331
1331
1332 Returns 0 on success, 1 if nothing changed.
1332 Returns 0 on success, 1 if nothing changed.
1333 """
1333 """
1334 if opts.get('subrepos'):
1334 if opts.get('subrepos'):
1335 if opts.get('amend'):
1335 if opts.get('amend'):
1336 raise util.Abort(_('cannot amend with --subrepos'))
1336 raise util.Abort(_('cannot amend with --subrepos'))
1337 # Let --subrepos on the command line override config setting.
1337 # Let --subrepos on the command line override config setting.
1338 ui.setconfig('ui', 'commitsubrepos', True)
1338 ui.setconfig('ui', 'commitsubrepos', True)
1339
1339
1340 # Save this for restoring it later
1340 # Save this for restoring it later
1341 oldcommitphase = ui.config('phases', 'new-commit')
1341 oldcommitphase = ui.config('phases', 'new-commit')
1342
1342
1343 cmdutil.checkunfinished(repo, commit=True)
1343 cmdutil.checkunfinished(repo, commit=True)
1344
1344
1345 branch = repo[None].branch()
1345 branch = repo[None].branch()
1346 bheads = repo.branchheads(branch)
1346 bheads = repo.branchheads(branch)
1347
1347
1348 extra = {}
1348 extra = {}
1349 if opts.get('close_branch'):
1349 if opts.get('close_branch'):
1350 extra['close'] = 1
1350 extra['close'] = 1
1351
1351
1352 if not bheads:
1352 if not bheads:
1353 raise util.Abort(_('can only close branch heads'))
1353 raise util.Abort(_('can only close branch heads'))
1354 elif opts.get('amend'):
1354 elif opts.get('amend'):
1355 if repo.parents()[0].p1().branch() != branch and \
1355 if repo.parents()[0].p1().branch() != branch and \
1356 repo.parents()[0].p2().branch() != branch:
1356 repo.parents()[0].p2().branch() != branch:
1357 raise util.Abort(_('can only close branch heads'))
1357 raise util.Abort(_('can only close branch heads'))
1358
1358
1359 if opts.get('amend'):
1359 if opts.get('amend'):
1360 if ui.configbool('ui', 'commitsubrepos'):
1360 if ui.configbool('ui', 'commitsubrepos'):
1361 raise util.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1361 raise util.Abort(_('cannot amend with ui.commitsubrepos enabled'))
1362
1362
1363 old = repo['.']
1363 old = repo['.']
1364 if old.phase() == phases.public:
1364 if old.phase() == phases.public:
1365 raise util.Abort(_('cannot amend public changesets'))
1365 raise util.Abort(_('cannot amend public changesets'))
1366 if len(repo[None].parents()) > 1:
1366 if len(repo[None].parents()) > 1:
1367 raise util.Abort(_('cannot amend while merging'))
1367 raise util.Abort(_('cannot amend while merging'))
1368 if (not obsolete._enabled) and old.children():
1368 if (not obsolete._enabled) and old.children():
1369 raise util.Abort(_('cannot amend changeset with children'))
1369 raise util.Abort(_('cannot amend changeset with children'))
1370
1370
1371 e = cmdutil.commiteditor
1371 e = cmdutil.commiteditor
1372 if opts.get('force_editor'):
1372 if opts.get('force_editor'):
1373 e = cmdutil.commitforceeditor
1373 e = cmdutil.commitforceeditor
1374
1374
1375 def commitfunc(ui, repo, message, match, opts):
1375 def commitfunc(ui, repo, message, match, opts):
1376 editor = e
1376 editor = e
1377 # message contains text from -m or -l, if it's empty,
1377 # message contains text from -m or -l, if it's empty,
1378 # open the editor with the old message
1378 # open the editor with the old message
1379 if not message:
1379 if not message:
1380 message = old.description()
1380 message = old.description()
1381 editor = cmdutil.commitforceeditor
1381 editor = cmdutil.commitforceeditor
1382 try:
1382 try:
1383 if opts.get('secret'):
1383 if opts.get('secret'):
1384 ui.setconfig('phases', 'new-commit', 'secret')
1384 ui.setconfig('phases', 'new-commit', 'secret')
1385
1385
1386 return repo.commit(message,
1386 return repo.commit(message,
1387 opts.get('user') or old.user(),
1387 opts.get('user') or old.user(),
1388 opts.get('date') or old.date(),
1388 opts.get('date') or old.date(),
1389 match,
1389 match,
1390 editor=editor,
1390 editor=editor,
1391 extra=extra)
1391 extra=extra)
1392 finally:
1392 finally:
1393 ui.setconfig('phases', 'new-commit', oldcommitphase)
1393 ui.setconfig('phases', 'new-commit', oldcommitphase)
1394
1394
1395 current = repo._bookmarkcurrent
1395 current = repo._bookmarkcurrent
1396 marks = old.bookmarks()
1396 marks = old.bookmarks()
1397 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1397 node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
1398 if node == old.node():
1398 if node == old.node():
1399 ui.status(_("nothing changed\n"))
1399 ui.status(_("nothing changed\n"))
1400 return 1
1400 return 1
1401 elif marks:
1401 elif marks:
1402 ui.debug('moving bookmarks %r from %s to %s\n' %
1402 ui.debug('moving bookmarks %r from %s to %s\n' %
1403 (marks, old.hex(), hex(node)))
1403 (marks, old.hex(), hex(node)))
1404 newmarks = repo._bookmarks
1404 newmarks = repo._bookmarks
1405 for bm in marks:
1405 for bm in marks:
1406 newmarks[bm] = node
1406 newmarks[bm] = node
1407 if bm == current:
1407 if bm == current:
1408 bookmarks.setcurrent(repo, bm)
1408 bookmarks.setcurrent(repo, bm)
1409 newmarks.write()
1409 newmarks.write()
1410 else:
1410 else:
1411 e = cmdutil.commiteditor
1411 e = cmdutil.commiteditor
1412 if opts.get('force_editor'):
1412 if opts.get('force_editor'):
1413 e = cmdutil.commitforceeditor
1413 e = cmdutil.commitforceeditor
1414
1414
1415 def commitfunc(ui, repo, message, match, opts):
1415 def commitfunc(ui, repo, message, match, opts):
1416 try:
1416 try:
1417 if opts.get('secret'):
1417 if opts.get('secret'):
1418 ui.setconfig('phases', 'new-commit', 'secret')
1418 ui.setconfig('phases', 'new-commit', 'secret')
1419
1419
1420 return repo.commit(message, opts.get('user'), opts.get('date'),
1420 return repo.commit(message, opts.get('user'), opts.get('date'),
1421 match, editor=e, extra=extra)
1421 match, editor=e, extra=extra)
1422 finally:
1422 finally:
1423 ui.setconfig('phases', 'new-commit', oldcommitphase)
1423 ui.setconfig('phases', 'new-commit', oldcommitphase)
1424
1424
1425
1425
1426 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1426 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
1427
1427
1428 if not node:
1428 if not node:
1429 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1429 stat = repo.status(match=scmutil.match(repo[None], pats, opts))
1430 if stat[3]:
1430 if stat[3]:
1431 ui.status(_("nothing changed (%d missing files, see "
1431 ui.status(_("nothing changed (%d missing files, see "
1432 "'hg status')\n") % len(stat[3]))
1432 "'hg status')\n") % len(stat[3]))
1433 else:
1433 else:
1434 ui.status(_("nothing changed\n"))
1434 ui.status(_("nothing changed\n"))
1435 return 1
1435 return 1
1436
1436
1437 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1437 cmdutil.commitstatus(repo, node, branch, bheads, opts)
1438
1438
1439 @command('copy|cp',
1439 @command('copy|cp',
1440 [('A', 'after', None, _('record a copy that has already occurred')),
1440 [('A', 'after', None, _('record a copy that has already occurred')),
1441 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1441 ('f', 'force', None, _('forcibly copy over an existing managed file')),
1442 ] + walkopts + dryrunopts,
1442 ] + walkopts + dryrunopts,
1443 _('[OPTION]... [SOURCE]... DEST'))
1443 _('[OPTION]... [SOURCE]... DEST'))
1444 def copy(ui, repo, *pats, **opts):
1444 def copy(ui, repo, *pats, **opts):
1445 """mark files as copied for the next commit
1445 """mark files as copied for the next commit
1446
1446
1447 Mark dest as having copies of source files. If dest is a
1447 Mark dest as having copies of source files. If dest is a
1448 directory, copies are put in that directory. If dest is a file,
1448 directory, copies are put in that directory. If dest is a file,
1449 the source must be a single file.
1449 the source must be a single file.
1450
1450
1451 By default, this command copies the contents of files as they
1451 By default, this command copies the contents of files as they
1452 exist in the working directory. If invoked with -A/--after, the
1452 exist in the working directory. If invoked with -A/--after, the
1453 operation is recorded, but no copying is performed.
1453 operation is recorded, but no copying is performed.
1454
1454
1455 This command takes effect with the next commit. To undo a copy
1455 This command takes effect with the next commit. To undo a copy
1456 before that, see :hg:`revert`.
1456 before that, see :hg:`revert`.
1457
1457
1458 Returns 0 on success, 1 if errors are encountered.
1458 Returns 0 on success, 1 if errors are encountered.
1459 """
1459 """
1460 wlock = repo.wlock(False)
1460 wlock = repo.wlock(False)
1461 try:
1461 try:
1462 return cmdutil.copy(ui, repo, pats, opts)
1462 return cmdutil.copy(ui, repo, pats, opts)
1463 finally:
1463 finally:
1464 wlock.release()
1464 wlock.release()
1465
1465
1466 @command('debugancestor', [], _('[INDEX] REV1 REV2'))
1466 @command('debugancestor', [], _('[INDEX] REV1 REV2'))
1467 def debugancestor(ui, repo, *args):
1467 def debugancestor(ui, repo, *args):
1468 """find the ancestor revision of two revisions in a given index"""
1468 """find the ancestor revision of two revisions in a given index"""
1469 if len(args) == 3:
1469 if len(args) == 3:
1470 index, rev1, rev2 = args
1470 index, rev1, rev2 = args
1471 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1471 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index)
1472 lookup = r.lookup
1472 lookup = r.lookup
1473 elif len(args) == 2:
1473 elif len(args) == 2:
1474 if not repo:
1474 if not repo:
1475 raise util.Abort(_("there is no Mercurial repository here "
1475 raise util.Abort(_("there is no Mercurial repository here "
1476 "(.hg not found)"))
1476 "(.hg not found)"))
1477 rev1, rev2 = args
1477 rev1, rev2 = args
1478 r = repo.changelog
1478 r = repo.changelog
1479 lookup = repo.lookup
1479 lookup = repo.lookup
1480 else:
1480 else:
1481 raise util.Abort(_('either two or three arguments required'))
1481 raise util.Abort(_('either two or three arguments required'))
1482 a = r.ancestor(lookup(rev1), lookup(rev2))
1482 a = r.ancestor(lookup(rev1), lookup(rev2))
1483 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1483 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1484
1484
1485 @command('debugbuilddag',
1485 @command('debugbuilddag',
1486 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1486 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
1487 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1487 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
1488 ('n', 'new-file', None, _('add new file at each rev'))],
1488 ('n', 'new-file', None, _('add new file at each rev'))],
1489 _('[OPTION]... [TEXT]'))
1489 _('[OPTION]... [TEXT]'))
1490 def debugbuilddag(ui, repo, text=None,
1490 def debugbuilddag(ui, repo, text=None,
1491 mergeable_file=False,
1491 mergeable_file=False,
1492 overwritten_file=False,
1492 overwritten_file=False,
1493 new_file=False):
1493 new_file=False):
1494 """builds a repo with a given DAG from scratch in the current empty repo
1494 """builds a repo with a given DAG from scratch in the current empty repo
1495
1495
1496 The description of the DAG is read from stdin if not given on the
1496 The description of the DAG is read from stdin if not given on the
1497 command line.
1497 command line.
1498
1498
1499 Elements:
1499 Elements:
1500
1500
1501 - "+n" is a linear run of n nodes based on the current default parent
1501 - "+n" is a linear run of n nodes based on the current default parent
1502 - "." is a single node based on the current default parent
1502 - "." is a single node based on the current default parent
1503 - "$" resets the default parent to null (implied at the start);
1503 - "$" resets the default parent to null (implied at the start);
1504 otherwise the default parent is always the last node created
1504 otherwise the default parent is always the last node created
1505 - "<p" sets the default parent to the backref p
1505 - "<p" sets the default parent to the backref p
1506 - "*p" is a fork at parent p, which is a backref
1506 - "*p" is a fork at parent p, which is a backref
1507 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1507 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
1508 - "/p2" is a merge of the preceding node and p2
1508 - "/p2" is a merge of the preceding node and p2
1509 - ":tag" defines a local tag for the preceding node
1509 - ":tag" defines a local tag for the preceding node
1510 - "@branch" sets the named branch for subsequent nodes
1510 - "@branch" sets the named branch for subsequent nodes
1511 - "#...\\n" is a comment up to the end of the line
1511 - "#...\\n" is a comment up to the end of the line
1512
1512
1513 Whitespace between the above elements is ignored.
1513 Whitespace between the above elements is ignored.
1514
1514
1515 A backref is either
1515 A backref is either
1516
1516
1517 - a number n, which references the node curr-n, where curr is the current
1517 - a number n, which references the node curr-n, where curr is the current
1518 node, or
1518 node, or
1519 - the name of a local tag you placed earlier using ":tag", or
1519 - the name of a local tag you placed earlier using ":tag", or
1520 - empty to denote the default parent.
1520 - empty to denote the default parent.
1521
1521
1522 All string valued-elements are either strictly alphanumeric, or must
1522 All string valued-elements are either strictly alphanumeric, or must
1523 be enclosed in double quotes ("..."), with "\\" as escape character.
1523 be enclosed in double quotes ("..."), with "\\" as escape character.
1524 """
1524 """
1525
1525
1526 if text is None:
1526 if text is None:
1527 ui.status(_("reading DAG from stdin\n"))
1527 ui.status(_("reading DAG from stdin\n"))
1528 text = ui.fin.read()
1528 text = ui.fin.read()
1529
1529
1530 cl = repo.changelog
1530 cl = repo.changelog
1531 if len(cl) > 0:
1531 if len(cl) > 0:
1532 raise util.Abort(_('repository is not empty'))
1532 raise util.Abort(_('repository is not empty'))
1533
1533
1534 # determine number of revs in DAG
1534 # determine number of revs in DAG
1535 total = 0
1535 total = 0
1536 for type, data in dagparser.parsedag(text):
1536 for type, data in dagparser.parsedag(text):
1537 if type == 'n':
1537 if type == 'n':
1538 total += 1
1538 total += 1
1539
1539
1540 if mergeable_file:
1540 if mergeable_file:
1541 linesperrev = 2
1541 linesperrev = 2
1542 # make a file with k lines per rev
1542 # make a file with k lines per rev
1543 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1543 initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]
1544 initialmergedlines.append("")
1544 initialmergedlines.append("")
1545
1545
1546 tags = []
1546 tags = []
1547
1547
1548 lock = tr = None
1548 lock = tr = None
1549 try:
1549 try:
1550 lock = repo.lock()
1550 lock = repo.lock()
1551 tr = repo.transaction("builddag")
1551 tr = repo.transaction("builddag")
1552
1552
1553 at = -1
1553 at = -1
1554 atbranch = 'default'
1554 atbranch = 'default'
1555 nodeids = []
1555 nodeids = []
1556 id = 0
1556 id = 0
1557 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1557 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1558 for type, data in dagparser.parsedag(text):
1558 for type, data in dagparser.parsedag(text):
1559 if type == 'n':
1559 if type == 'n':
1560 ui.note(('node %s\n' % str(data)))
1560 ui.note(('node %s\n' % str(data)))
1561 id, ps = data
1561 id, ps = data
1562
1562
1563 files = []
1563 files = []
1564 fctxs = {}
1564 fctxs = {}
1565
1565
1566 p2 = None
1566 p2 = None
1567 if mergeable_file:
1567 if mergeable_file:
1568 fn = "mf"
1568 fn = "mf"
1569 p1 = repo[ps[0]]
1569 p1 = repo[ps[0]]
1570 if len(ps) > 1:
1570 if len(ps) > 1:
1571 p2 = repo[ps[1]]
1571 p2 = repo[ps[1]]
1572 pa = p1.ancestor(p2)
1572 pa = p1.ancestor(p2)
1573 base, local, other = [x[fn].data() for x in (pa, p1,
1573 base, local, other = [x[fn].data() for x in (pa, p1,
1574 p2)]
1574 p2)]
1575 m3 = simplemerge.Merge3Text(base, local, other)
1575 m3 = simplemerge.Merge3Text(base, local, other)
1576 ml = [l.strip() for l in m3.merge_lines()]
1576 ml = [l.strip() for l in m3.merge_lines()]
1577 ml.append("")
1577 ml.append("")
1578 elif at > 0:
1578 elif at > 0:
1579 ml = p1[fn].data().split("\n")
1579 ml = p1[fn].data().split("\n")
1580 else:
1580 else:
1581 ml = initialmergedlines
1581 ml = initialmergedlines
1582 ml[id * linesperrev] += " r%i" % id
1582 ml[id * linesperrev] += " r%i" % id
1583 mergedtext = "\n".join(ml)
1583 mergedtext = "\n".join(ml)
1584 files.append(fn)
1584 files.append(fn)
1585 fctxs[fn] = context.memfilectx(fn, mergedtext)
1585 fctxs[fn] = context.memfilectx(fn, mergedtext)
1586
1586
1587 if overwritten_file:
1587 if overwritten_file:
1588 fn = "of"
1588 fn = "of"
1589 files.append(fn)
1589 files.append(fn)
1590 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1590 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1591
1591
1592 if new_file:
1592 if new_file:
1593 fn = "nf%i" % id
1593 fn = "nf%i" % id
1594 files.append(fn)
1594 files.append(fn)
1595 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1595 fctxs[fn] = context.memfilectx(fn, "r%i\n" % id)
1596 if len(ps) > 1:
1596 if len(ps) > 1:
1597 if not p2:
1597 if not p2:
1598 p2 = repo[ps[1]]
1598 p2 = repo[ps[1]]
1599 for fn in p2:
1599 for fn in p2:
1600 if fn.startswith("nf"):
1600 if fn.startswith("nf"):
1601 files.append(fn)
1601 files.append(fn)
1602 fctxs[fn] = p2[fn]
1602 fctxs[fn] = p2[fn]
1603
1603
1604 def fctxfn(repo, cx, path):
1604 def fctxfn(repo, cx, path):
1605 return fctxs.get(path)
1605 return fctxs.get(path)
1606
1606
1607 if len(ps) == 0 or ps[0] < 0:
1607 if len(ps) == 0 or ps[0] < 0:
1608 pars = [None, None]
1608 pars = [None, None]
1609 elif len(ps) == 1:
1609 elif len(ps) == 1:
1610 pars = [nodeids[ps[0]], None]
1610 pars = [nodeids[ps[0]], None]
1611 else:
1611 else:
1612 pars = [nodeids[p] for p in ps]
1612 pars = [nodeids[p] for p in ps]
1613 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1613 cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn,
1614 date=(id, 0),
1614 date=(id, 0),
1615 user="debugbuilddag",
1615 user="debugbuilddag",
1616 extra={'branch': atbranch})
1616 extra={'branch': atbranch})
1617 nodeid = repo.commitctx(cx)
1617 nodeid = repo.commitctx(cx)
1618 nodeids.append(nodeid)
1618 nodeids.append(nodeid)
1619 at = id
1619 at = id
1620 elif type == 'l':
1620 elif type == 'l':
1621 id, name = data
1621 id, name = data
1622 ui.note(('tag %s\n' % name))
1622 ui.note(('tag %s\n' % name))
1623 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
1623 tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name))
1624 elif type == 'a':
1624 elif type == 'a':
1625 ui.note(('branch %s\n' % data))
1625 ui.note(('branch %s\n' % data))
1626 atbranch = data
1626 atbranch = data
1627 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1627 ui.progress(_('building'), id, unit=_('revisions'), total=total)
1628 tr.close()
1628 tr.close()
1629
1629
1630 if tags:
1630 if tags:
1631 repo.opener.write("localtags", "".join(tags))
1631 repo.opener.write("localtags", "".join(tags))
1632 finally:
1632 finally:
1633 ui.progress(_('building'), None)
1633 ui.progress(_('building'), None)
1634 release(tr, lock)
1634 release(tr, lock)
1635
1635
1636 @command('debugbundle', [('a', 'all', None, _('show all details'))], _('FILE'))
1636 @command('debugbundle', [('a', 'all', None, _('show all details'))], _('FILE'))
1637 def debugbundle(ui, bundlepath, all=None, **opts):
1637 def debugbundle(ui, bundlepath, all=None, **opts):
1638 """lists the contents of a bundle"""
1638 """lists the contents of a bundle"""
1639 f = hg.openpath(ui, bundlepath)
1639 f = hg.openpath(ui, bundlepath)
1640 try:
1640 try:
1641 gen = changegroup.readbundle(f, bundlepath)
1641 gen = changegroup.readbundle(f, bundlepath)
1642 if all:
1642 if all:
1643 ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n"))
1643 ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n"))
1644
1644
1645 def showchunks(named):
1645 def showchunks(named):
1646 ui.write("\n%s\n" % named)
1646 ui.write("\n%s\n" % named)
1647 chain = None
1647 chain = None
1648 while True:
1648 while True:
1649 chunkdata = gen.deltachunk(chain)
1649 chunkdata = gen.deltachunk(chain)
1650 if not chunkdata:
1650 if not chunkdata:
1651 break
1651 break
1652 node = chunkdata['node']
1652 node = chunkdata['node']
1653 p1 = chunkdata['p1']
1653 p1 = chunkdata['p1']
1654 p2 = chunkdata['p2']
1654 p2 = chunkdata['p2']
1655 cs = chunkdata['cs']
1655 cs = chunkdata['cs']
1656 deltabase = chunkdata['deltabase']
1656 deltabase = chunkdata['deltabase']
1657 delta = chunkdata['delta']
1657 delta = chunkdata['delta']
1658 ui.write("%s %s %s %s %s %s\n" %
1658 ui.write("%s %s %s %s %s %s\n" %
1659 (hex(node), hex(p1), hex(p2),
1659 (hex(node), hex(p1), hex(p2),
1660 hex(cs), hex(deltabase), len(delta)))
1660 hex(cs), hex(deltabase), len(delta)))
1661 chain = node
1661 chain = node
1662
1662
1663 chunkdata = gen.changelogheader()
1663 chunkdata = gen.changelogheader()
1664 showchunks("changelog")
1664 showchunks("changelog")
1665 chunkdata = gen.manifestheader()
1665 chunkdata = gen.manifestheader()
1666 showchunks("manifest")
1666 showchunks("manifest")
1667 while True:
1667 while True:
1668 chunkdata = gen.filelogheader()
1668 chunkdata = gen.filelogheader()
1669 if not chunkdata:
1669 if not chunkdata:
1670 break
1670 break
1671 fname = chunkdata['filename']
1671 fname = chunkdata['filename']
1672 showchunks(fname)
1672 showchunks(fname)
1673 else:
1673 else:
1674 chunkdata = gen.changelogheader()
1674 chunkdata = gen.changelogheader()
1675 chain = None
1675 chain = None
1676 while True:
1676 while True:
1677 chunkdata = gen.deltachunk(chain)
1677 chunkdata = gen.deltachunk(chain)
1678 if not chunkdata:
1678 if not chunkdata:
1679 break
1679 break
1680 node = chunkdata['node']
1680 node = chunkdata['node']
1681 ui.write("%s\n" % hex(node))
1681 ui.write("%s\n" % hex(node))
1682 chain = node
1682 chain = node
1683 finally:
1683 finally:
1684 f.close()
1684 f.close()
1685
1685
1686 @command('debugcheckstate', [], '')
1686 @command('debugcheckstate', [], '')
1687 def debugcheckstate(ui, repo):
1687 def debugcheckstate(ui, repo):
1688 """validate the correctness of the current dirstate"""
1688 """validate the correctness of the current dirstate"""
1689 parent1, parent2 = repo.dirstate.parents()
1689 parent1, parent2 = repo.dirstate.parents()
1690 m1 = repo[parent1].manifest()
1690 m1 = repo[parent1].manifest()
1691 m2 = repo[parent2].manifest()
1691 m2 = repo[parent2].manifest()
1692 errors = 0
1692 errors = 0
1693 for f in repo.dirstate:
1693 for f in repo.dirstate:
1694 state = repo.dirstate[f]
1694 state = repo.dirstate[f]
1695 if state in "nr" and f not in m1:
1695 if state in "nr" and f not in m1:
1696 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1696 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1697 errors += 1
1697 errors += 1
1698 if state in "a" and f in m1:
1698 if state in "a" and f in m1:
1699 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1699 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1700 errors += 1
1700 errors += 1
1701 if state in "m" and f not in m1 and f not in m2:
1701 if state in "m" and f not in m1 and f not in m2:
1702 ui.warn(_("%s in state %s, but not in either manifest\n") %
1702 ui.warn(_("%s in state %s, but not in either manifest\n") %
1703 (f, state))
1703 (f, state))
1704 errors += 1
1704 errors += 1
1705 for f in m1:
1705 for f in m1:
1706 state = repo.dirstate[f]
1706 state = repo.dirstate[f]
1707 if state not in "nrm":
1707 if state not in "nrm":
1708 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1708 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1709 errors += 1
1709 errors += 1
1710 if errors:
1710 if errors:
1711 error = _(".hg/dirstate inconsistent with current parent's manifest")
1711 error = _(".hg/dirstate inconsistent with current parent's manifest")
1712 raise util.Abort(error)
1712 raise util.Abort(error)
1713
1713
1714 @command('debugcommands', [], _('[COMMAND]'))
1714 @command('debugcommands', [], _('[COMMAND]'))
1715 def debugcommands(ui, cmd='', *args):
1715 def debugcommands(ui, cmd='', *args):
1716 """list all available commands and options"""
1716 """list all available commands and options"""
1717 for cmd, vals in sorted(table.iteritems()):
1717 for cmd, vals in sorted(table.iteritems()):
1718 cmd = cmd.split('|')[0].strip('^')
1718 cmd = cmd.split('|')[0].strip('^')
1719 opts = ', '.join([i[1] for i in vals[1]])
1719 opts = ', '.join([i[1] for i in vals[1]])
1720 ui.write('%s: %s\n' % (cmd, opts))
1720 ui.write('%s: %s\n' % (cmd, opts))
1721
1721
1722 @command('debugcomplete',
1722 @command('debugcomplete',
1723 [('o', 'options', None, _('show the command options'))],
1723 [('o', 'options', None, _('show the command options'))],
1724 _('[-o] CMD'))
1724 _('[-o] CMD'))
1725 def debugcomplete(ui, cmd='', **opts):
1725 def debugcomplete(ui, cmd='', **opts):
1726 """returns the completion list associated with the given command"""
1726 """returns the completion list associated with the given command"""
1727
1727
1728 if opts.get('options'):
1728 if opts.get('options'):
1729 options = []
1729 options = []
1730 otables = [globalopts]
1730 otables = [globalopts]
1731 if cmd:
1731 if cmd:
1732 aliases, entry = cmdutil.findcmd(cmd, table, False)
1732 aliases, entry = cmdutil.findcmd(cmd, table, False)
1733 otables.append(entry[1])
1733 otables.append(entry[1])
1734 for t in otables:
1734 for t in otables:
1735 for o in t:
1735 for o in t:
1736 if "(DEPRECATED)" in o[3]:
1736 if "(DEPRECATED)" in o[3]:
1737 continue
1737 continue
1738 if o[0]:
1738 if o[0]:
1739 options.append('-%s' % o[0])
1739 options.append('-%s' % o[0])
1740 options.append('--%s' % o[1])
1740 options.append('--%s' % o[1])
1741 ui.write("%s\n" % "\n".join(options))
1741 ui.write("%s\n" % "\n".join(options))
1742 return
1742 return
1743
1743
1744 cmdlist = cmdutil.findpossible(cmd, table)
1744 cmdlist = cmdutil.findpossible(cmd, table)
1745 if ui.verbose:
1745 if ui.verbose:
1746 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1746 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1747 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1747 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1748
1748
1749 @command('debugdag',
1749 @command('debugdag',
1750 [('t', 'tags', None, _('use tags as labels')),
1750 [('t', 'tags', None, _('use tags as labels')),
1751 ('b', 'branches', None, _('annotate with branch names')),
1751 ('b', 'branches', None, _('annotate with branch names')),
1752 ('', 'dots', None, _('use dots for runs')),
1752 ('', 'dots', None, _('use dots for runs')),
1753 ('s', 'spaces', None, _('separate elements by spaces'))],
1753 ('s', 'spaces', None, _('separate elements by spaces'))],
1754 _('[OPTION]... [FILE [REV]...]'))
1754 _('[OPTION]... [FILE [REV]...]'))
1755 def debugdag(ui, repo, file_=None, *revs, **opts):
1755 def debugdag(ui, repo, file_=None, *revs, **opts):
1756 """format the changelog or an index DAG as a concise textual description
1756 """format the changelog or an index DAG as a concise textual description
1757
1757
1758 If you pass a revlog index, the revlog's DAG is emitted. If you list
1758 If you pass a revlog index, the revlog's DAG is emitted. If you list
1759 revision numbers, they get labeled in the output as rN.
1759 revision numbers, they get labeled in the output as rN.
1760
1760
1761 Otherwise, the changelog DAG of the current repo is emitted.
1761 Otherwise, the changelog DAG of the current repo is emitted.
1762 """
1762 """
1763 spaces = opts.get('spaces')
1763 spaces = opts.get('spaces')
1764 dots = opts.get('dots')
1764 dots = opts.get('dots')
1765 if file_:
1765 if file_:
1766 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1766 rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
1767 revs = set((int(r) for r in revs))
1767 revs = set((int(r) for r in revs))
1768 def events():
1768 def events():
1769 for r in rlog:
1769 for r in rlog:
1770 yield 'n', (r, list(set(p for p in rlog.parentrevs(r)
1770 yield 'n', (r, list(set(p for p in rlog.parentrevs(r)
1771 if p != -1)))
1771 if p != -1)))
1772 if r in revs:
1772 if r in revs:
1773 yield 'l', (r, "r%i" % r)
1773 yield 'l', (r, "r%i" % r)
1774 elif repo:
1774 elif repo:
1775 cl = repo.changelog
1775 cl = repo.changelog
1776 tags = opts.get('tags')
1776 tags = opts.get('tags')
1777 branches = opts.get('branches')
1777 branches = opts.get('branches')
1778 if tags:
1778 if tags:
1779 labels = {}
1779 labels = {}
1780 for l, n in repo.tags().items():
1780 for l, n in repo.tags().items():
1781 labels.setdefault(cl.rev(n), []).append(l)
1781 labels.setdefault(cl.rev(n), []).append(l)
1782 def events():
1782 def events():
1783 b = "default"
1783 b = "default"
1784 for r in cl:
1784 for r in cl:
1785 if branches:
1785 if branches:
1786 newb = cl.read(cl.node(r))[5]['branch']
1786 newb = cl.read(cl.node(r))[5]['branch']
1787 if newb != b:
1787 if newb != b:
1788 yield 'a', newb
1788 yield 'a', newb
1789 b = newb
1789 b = newb
1790 yield 'n', (r, list(set(p for p in cl.parentrevs(r)
1790 yield 'n', (r, list(set(p for p in cl.parentrevs(r)
1791 if p != -1)))
1791 if p != -1)))
1792 if tags:
1792 if tags:
1793 ls = labels.get(r)
1793 ls = labels.get(r)
1794 if ls:
1794 if ls:
1795 for l in ls:
1795 for l in ls:
1796 yield 'l', (r, l)
1796 yield 'l', (r, l)
1797 else:
1797 else:
1798 raise util.Abort(_('need repo for changelog dag'))
1798 raise util.Abort(_('need repo for changelog dag'))
1799
1799
1800 for line in dagparser.dagtextlines(events(),
1800 for line in dagparser.dagtextlines(events(),
1801 addspaces=spaces,
1801 addspaces=spaces,
1802 wraplabels=True,
1802 wraplabels=True,
1803 wrapannotations=True,
1803 wrapannotations=True,
1804 wrapnonlinear=dots,
1804 wrapnonlinear=dots,
1805 usedots=dots,
1805 usedots=dots,
1806 maxlinewidth=70):
1806 maxlinewidth=70):
1807 ui.write(line)
1807 ui.write(line)
1808 ui.write("\n")
1808 ui.write("\n")
1809
1809
1810 @command('debugdata',
1810 @command('debugdata',
1811 [('c', 'changelog', False, _('open changelog')),
1811 [('c', 'changelog', False, _('open changelog')),
1812 ('m', 'manifest', False, _('open manifest'))],
1812 ('m', 'manifest', False, _('open manifest'))],
1813 _('-c|-m|FILE REV'))
1813 _('-c|-m|FILE REV'))
1814 def debugdata(ui, repo, file_, rev=None, **opts):
1814 def debugdata(ui, repo, file_, rev=None, **opts):
1815 """dump the contents of a data file revision"""
1815 """dump the contents of a data file revision"""
1816 if opts.get('changelog') or opts.get('manifest'):
1816 if opts.get('changelog') or opts.get('manifest'):
1817 file_, rev = None, file_
1817 file_, rev = None, file_
1818 elif rev is None:
1818 elif rev is None:
1819 raise error.CommandError('debugdata', _('invalid arguments'))
1819 raise error.CommandError('debugdata', _('invalid arguments'))
1820 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
1820 r = cmdutil.openrevlog(repo, 'debugdata', file_, opts)
1821 try:
1821 try:
1822 ui.write(r.revision(r.lookup(rev)))
1822 ui.write(r.revision(r.lookup(rev)))
1823 except KeyError:
1823 except KeyError:
1824 raise util.Abort(_('invalid revision identifier %s') % rev)
1824 raise util.Abort(_('invalid revision identifier %s') % rev)
1825
1825
1826 @command('debugdate',
1826 @command('debugdate',
1827 [('e', 'extended', None, _('try extended date formats'))],
1827 [('e', 'extended', None, _('try extended date formats'))],
1828 _('[-e] DATE [RANGE]'))
1828 _('[-e] DATE [RANGE]'))
1829 def debugdate(ui, date, range=None, **opts):
1829 def debugdate(ui, date, range=None, **opts):
1830 """parse and display a date"""
1830 """parse and display a date"""
1831 if opts["extended"]:
1831 if opts["extended"]:
1832 d = util.parsedate(date, util.extendeddateformats)
1832 d = util.parsedate(date, util.extendeddateformats)
1833 else:
1833 else:
1834 d = util.parsedate(date)
1834 d = util.parsedate(date)
1835 ui.write(("internal: %s %s\n") % d)
1835 ui.write(("internal: %s %s\n") % d)
1836 ui.write(("standard: %s\n") % util.datestr(d))
1836 ui.write(("standard: %s\n") % util.datestr(d))
1837 if range:
1837 if range:
1838 m = util.matchdate(range)
1838 m = util.matchdate(range)
1839 ui.write(("match: %s\n") % m(d[0]))
1839 ui.write(("match: %s\n") % m(d[0]))
1840
1840
1841 @command('debugdiscovery',
1841 @command('debugdiscovery',
1842 [('', 'old', None, _('use old-style discovery')),
1842 [('', 'old', None, _('use old-style discovery')),
1843 ('', 'nonheads', None,
1843 ('', 'nonheads', None,
1844 _('use old-style discovery with non-heads included')),
1844 _('use old-style discovery with non-heads included')),
1845 ] + remoteopts,
1845 ] + remoteopts,
1846 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
1846 _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]'))
1847 def debugdiscovery(ui, repo, remoteurl="default", **opts):
1847 def debugdiscovery(ui, repo, remoteurl="default", **opts):
1848 """runs the changeset discovery protocol in isolation"""
1848 """runs the changeset discovery protocol in isolation"""
1849 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
1849 remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl),
1850 opts.get('branch'))
1850 opts.get('branch'))
1851 remote = hg.peer(repo, opts, remoteurl)
1851 remote = hg.peer(repo, opts, remoteurl)
1852 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
1852 ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl))
1853
1853
1854 # make sure tests are repeatable
1854 # make sure tests are repeatable
1855 random.seed(12323)
1855 random.seed(12323)
1856
1856
1857 def doit(localheads, remoteheads, remote=remote):
1857 def doit(localheads, remoteheads, remote=remote):
1858 if opts.get('old'):
1858 if opts.get('old'):
1859 if localheads:
1859 if localheads:
1860 raise util.Abort('cannot use localheads with old style '
1860 raise util.Abort('cannot use localheads with old style '
1861 'discovery')
1861 'discovery')
1862 if not util.safehasattr(remote, 'branches'):
1862 if not util.safehasattr(remote, 'branches'):
1863 # enable in-client legacy support
1863 # enable in-client legacy support
1864 remote = localrepo.locallegacypeer(remote.local())
1864 remote = localrepo.locallegacypeer(remote.local())
1865 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
1865 common, _in, hds = treediscovery.findcommonincoming(repo, remote,
1866 force=True)
1866 force=True)
1867 common = set(common)
1867 common = set(common)
1868 if not opts.get('nonheads'):
1868 if not opts.get('nonheads'):
1869 ui.write(("unpruned common: %s\n") %
1869 ui.write(("unpruned common: %s\n") %
1870 " ".join(sorted(short(n) for n in common)))
1870 " ".join(sorted(short(n) for n in common)))
1871 dag = dagutil.revlogdag(repo.changelog)
1871 dag = dagutil.revlogdag(repo.changelog)
1872 all = dag.ancestorset(dag.internalizeall(common))
1872 all = dag.ancestorset(dag.internalizeall(common))
1873 common = dag.externalizeall(dag.headsetofconnecteds(all))
1873 common = dag.externalizeall(dag.headsetofconnecteds(all))
1874 else:
1874 else:
1875 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
1875 common, any, hds = setdiscovery.findcommonheads(ui, repo, remote)
1876 common = set(common)
1876 common = set(common)
1877 rheads = set(hds)
1877 rheads = set(hds)
1878 lheads = set(repo.heads())
1878 lheads = set(repo.heads())
1879 ui.write(("common heads: %s\n") %
1879 ui.write(("common heads: %s\n") %
1880 " ".join(sorted(short(n) for n in common)))
1880 " ".join(sorted(short(n) for n in common)))
1881 if lheads <= common:
1881 if lheads <= common:
1882 ui.write(("local is subset\n"))
1882 ui.write(("local is subset\n"))
1883 elif rheads <= common:
1883 elif rheads <= common:
1884 ui.write(("remote is subset\n"))
1884 ui.write(("remote is subset\n"))
1885
1885
1886 serverlogs = opts.get('serverlog')
1886 serverlogs = opts.get('serverlog')
1887 if serverlogs:
1887 if serverlogs:
1888 for filename in serverlogs:
1888 for filename in serverlogs:
1889 logfile = open(filename, 'r')
1889 logfile = open(filename, 'r')
1890 try:
1890 try:
1891 line = logfile.readline()
1891 line = logfile.readline()
1892 while line:
1892 while line:
1893 parts = line.strip().split(';')
1893 parts = line.strip().split(';')
1894 op = parts[1]
1894 op = parts[1]
1895 if op == 'cg':
1895 if op == 'cg':
1896 pass
1896 pass
1897 elif op == 'cgss':
1897 elif op == 'cgss':
1898 doit(parts[2].split(' '), parts[3].split(' '))
1898 doit(parts[2].split(' '), parts[3].split(' '))
1899 elif op == 'unb':
1899 elif op == 'unb':
1900 doit(parts[3].split(' '), parts[2].split(' '))
1900 doit(parts[3].split(' '), parts[2].split(' '))
1901 line = logfile.readline()
1901 line = logfile.readline()
1902 finally:
1902 finally:
1903 logfile.close()
1903 logfile.close()
1904
1904
1905 else:
1905 else:
1906 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
1906 remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches,
1907 opts.get('remote_head'))
1907 opts.get('remote_head'))
1908 localrevs = opts.get('local_head')
1908 localrevs = opts.get('local_head')
1909 doit(localrevs, remoterevs)
1909 doit(localrevs, remoterevs)
1910
1910
1911 @command('debugfileset',
1911 @command('debugfileset',
1912 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
1912 [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))],
1913 _('[-r REV] FILESPEC'))
1913 _('[-r REV] FILESPEC'))
1914 def debugfileset(ui, repo, expr, **opts):
1914 def debugfileset(ui, repo, expr, **opts):
1915 '''parse and apply a fileset specification'''
1915 '''parse and apply a fileset specification'''
1916 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
1916 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
1917 if ui.verbose:
1917 if ui.verbose:
1918 tree = fileset.parse(expr)[0]
1918 tree = fileset.parse(expr)[0]
1919 ui.note(tree, "\n")
1919 ui.note(tree, "\n")
1920
1920
1921 for f in fileset.getfileset(ctx, expr):
1921 for f in fileset.getfileset(ctx, expr):
1922 ui.write("%s\n" % f)
1922 ui.write("%s\n" % f)
1923
1923
1924 @command('debugfsinfo', [], _('[PATH]'))
1924 @command('debugfsinfo', [], _('[PATH]'))
1925 def debugfsinfo(ui, path="."):
1925 def debugfsinfo(ui, path="."):
1926 """show information detected about current filesystem"""
1926 """show information detected about current filesystem"""
1927 util.writefile('.debugfsinfo', '')
1927 util.writefile('.debugfsinfo', '')
1928 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
1928 ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no'))
1929 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
1929 ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no'))
1930 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
1930 ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no'))
1931 ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo')
1931 ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo')
1932 and 'yes' or 'no'))
1932 and 'yes' or 'no'))
1933 os.unlink('.debugfsinfo')
1933 os.unlink('.debugfsinfo')
1934
1934
1935 @command('debuggetbundle',
1935 @command('debuggetbundle',
1936 [('H', 'head', [], _('id of head node'), _('ID')),
1936 [('H', 'head', [], _('id of head node'), _('ID')),
1937 ('C', 'common', [], _('id of common node'), _('ID')),
1937 ('C', 'common', [], _('id of common node'), _('ID')),
1938 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
1938 ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))],
1939 _('REPO FILE [-H|-C ID]...'))
1939 _('REPO FILE [-H|-C ID]...'))
1940 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
1940 def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts):
1941 """retrieves a bundle from a repo
1941 """retrieves a bundle from a repo
1942
1942
1943 Every ID must be a full-length hex node id string. Saves the bundle to the
1943 Every ID must be a full-length hex node id string. Saves the bundle to the
1944 given file.
1944 given file.
1945 """
1945 """
1946 repo = hg.peer(ui, opts, repopath)
1946 repo = hg.peer(ui, opts, repopath)
1947 if not repo.capable('getbundle'):
1947 if not repo.capable('getbundle'):
1948 raise util.Abort("getbundle() not supported by target repository")
1948 raise util.Abort("getbundle() not supported by target repository")
1949 args = {}
1949 args = {}
1950 if common:
1950 if common:
1951 args['common'] = [bin(s) for s in common]
1951 args['common'] = [bin(s) for s in common]
1952 if head:
1952 if head:
1953 args['heads'] = [bin(s) for s in head]
1953 args['heads'] = [bin(s) for s in head]
1954 # TODO: get desired bundlecaps from command line.
1954 # TODO: get desired bundlecaps from command line.
1955 args['bundlecaps'] = None
1955 args['bundlecaps'] = None
1956 bundle = repo.getbundle('debug', **args)
1956 bundle = repo.getbundle('debug', **args)
1957
1957
1958 bundletype = opts.get('type', 'bzip2').lower()
1958 bundletype = opts.get('type', 'bzip2').lower()
1959 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1959 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
1960 bundletype = btypes.get(bundletype)
1960 bundletype = btypes.get(bundletype)
1961 if bundletype not in changegroup.bundletypes:
1961 if bundletype not in changegroup.bundletypes:
1962 raise util.Abort(_('unknown bundle type specified with --type'))
1962 raise util.Abort(_('unknown bundle type specified with --type'))
1963 changegroup.writebundle(bundle, bundlepath, bundletype)
1963 changegroup.writebundle(bundle, bundlepath, bundletype)
1964
1964
1965 @command('debugignore', [], '')
1965 @command('debugignore', [], '')
1966 def debugignore(ui, repo, *values, **opts):
1966 def debugignore(ui, repo, *values, **opts):
1967 """display the combined ignore pattern"""
1967 """display the combined ignore pattern"""
1968 ignore = repo.dirstate._ignore
1968 ignore = repo.dirstate._ignore
1969 includepat = getattr(ignore, 'includepat', None)
1969 includepat = getattr(ignore, 'includepat', None)
1970 if includepat is not None:
1970 if includepat is not None:
1971 ui.write("%s\n" % includepat)
1971 ui.write("%s\n" % includepat)
1972 else:
1972 else:
1973 raise util.Abort(_("no ignore patterns found"))
1973 raise util.Abort(_("no ignore patterns found"))
1974
1974
1975 @command('debugindex',
1975 @command('debugindex',
1976 [('c', 'changelog', False, _('open changelog')),
1976 [('c', 'changelog', False, _('open changelog')),
1977 ('m', 'manifest', False, _('open manifest')),
1977 ('m', 'manifest', False, _('open manifest')),
1978 ('f', 'format', 0, _('revlog format'), _('FORMAT'))],
1978 ('f', 'format', 0, _('revlog format'), _('FORMAT'))],
1979 _('[-f FORMAT] -c|-m|FILE'))
1979 _('[-f FORMAT] -c|-m|FILE'))
1980 def debugindex(ui, repo, file_=None, **opts):
1980 def debugindex(ui, repo, file_=None, **opts):
1981 """dump the contents of an index file"""
1981 """dump the contents of an index file"""
1982 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
1982 r = cmdutil.openrevlog(repo, 'debugindex', file_, opts)
1983 format = opts.get('format', 0)
1983 format = opts.get('format', 0)
1984 if format not in (0, 1):
1984 if format not in (0, 1):
1985 raise util.Abort(_("unknown format %d") % format)
1985 raise util.Abort(_("unknown format %d") % format)
1986
1986
1987 generaldelta = r.version & revlog.REVLOGGENERALDELTA
1987 generaldelta = r.version & revlog.REVLOGGENERALDELTA
1988 if generaldelta:
1988 if generaldelta:
1989 basehdr = ' delta'
1989 basehdr = ' delta'
1990 else:
1990 else:
1991 basehdr = ' base'
1991 basehdr = ' base'
1992
1992
1993 if format == 0:
1993 if format == 0:
1994 ui.write(" rev offset length " + basehdr + " linkrev"
1994 ui.write(" rev offset length " + basehdr + " linkrev"
1995 " nodeid p1 p2\n")
1995 " nodeid p1 p2\n")
1996 elif format == 1:
1996 elif format == 1:
1997 ui.write(" rev flag offset length"
1997 ui.write(" rev flag offset length"
1998 " size " + basehdr + " link p1 p2"
1998 " size " + basehdr + " link p1 p2"
1999 " nodeid\n")
1999 " nodeid\n")
2000
2000
2001 for i in r:
2001 for i in r:
2002 node = r.node(i)
2002 node = r.node(i)
2003 if generaldelta:
2003 if generaldelta:
2004 base = r.deltaparent(i)
2004 base = r.deltaparent(i)
2005 else:
2005 else:
2006 base = r.chainbase(i)
2006 base = r.chainbase(i)
2007 if format == 0:
2007 if format == 0:
2008 try:
2008 try:
2009 pp = r.parents(node)
2009 pp = r.parents(node)
2010 except Exception:
2010 except Exception:
2011 pp = [nullid, nullid]
2011 pp = [nullid, nullid]
2012 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2012 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2013 i, r.start(i), r.length(i), base, r.linkrev(i),
2013 i, r.start(i), r.length(i), base, r.linkrev(i),
2014 short(node), short(pp[0]), short(pp[1])))
2014 short(node), short(pp[0]), short(pp[1])))
2015 elif format == 1:
2015 elif format == 1:
2016 pr = r.parentrevs(i)
2016 pr = r.parentrevs(i)
2017 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2017 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
2018 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2018 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
2019 base, r.linkrev(i), pr[0], pr[1], short(node)))
2019 base, r.linkrev(i), pr[0], pr[1], short(node)))
2020
2020
2021 @command('debugindexdot', [], _('FILE'))
2021 @command('debugindexdot', [], _('FILE'))
2022 def debugindexdot(ui, repo, file_):
2022 def debugindexdot(ui, repo, file_):
2023 """dump an index DAG as a graphviz dot file"""
2023 """dump an index DAG as a graphviz dot file"""
2024 r = None
2024 r = None
2025 if repo:
2025 if repo:
2026 filelog = repo.file(file_)
2026 filelog = repo.file(file_)
2027 if len(filelog):
2027 if len(filelog):
2028 r = filelog
2028 r = filelog
2029 if not r:
2029 if not r:
2030 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
2030 r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_)
2031 ui.write(("digraph G {\n"))
2031 ui.write(("digraph G {\n"))
2032 for i in r:
2032 for i in r:
2033 node = r.node(i)
2033 node = r.node(i)
2034 pp = r.parents(node)
2034 pp = r.parents(node)
2035 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2035 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
2036 if pp[1] != nullid:
2036 if pp[1] != nullid:
2037 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2037 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
2038 ui.write("}\n")
2038 ui.write("}\n")
2039
2039
2040 @command('debuginstall', [], '')
2040 @command('debuginstall', [], '')
2041 def debuginstall(ui):
2041 def debuginstall(ui):
2042 '''test Mercurial installation
2042 '''test Mercurial installation
2043
2043
2044 Returns 0 on success.
2044 Returns 0 on success.
2045 '''
2045 '''
2046
2046
2047 def writetemp(contents):
2047 def writetemp(contents):
2048 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2048 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
2049 f = os.fdopen(fd, "wb")
2049 f = os.fdopen(fd, "wb")
2050 f.write(contents)
2050 f.write(contents)
2051 f.close()
2051 f.close()
2052 return name
2052 return name
2053
2053
2054 problems = 0
2054 problems = 0
2055
2055
2056 # encoding
2056 # encoding
2057 ui.status(_("checking encoding (%s)...\n") % encoding.encoding)
2057 ui.status(_("checking encoding (%s)...\n") % encoding.encoding)
2058 try:
2058 try:
2059 encoding.fromlocal("test")
2059 encoding.fromlocal("test")
2060 except util.Abort, inst:
2060 except util.Abort, inst:
2061 ui.write(" %s\n" % inst)
2061 ui.write(" %s\n" % inst)
2062 ui.write(_(" (check that your locale is properly set)\n"))
2062 ui.write(_(" (check that your locale is properly set)\n"))
2063 problems += 1
2063 problems += 1
2064
2064
2065 # Python lib
2065 # Python lib
2066 ui.status(_("checking Python lib (%s)...\n")
2066 ui.status(_("checking Python lib (%s)...\n")
2067 % os.path.dirname(os.__file__))
2067 % os.path.dirname(os.__file__))
2068
2068
2069 # compiled modules
2069 # compiled modules
2070 ui.status(_("checking installed modules (%s)...\n")
2070 ui.status(_("checking installed modules (%s)...\n")
2071 % os.path.dirname(__file__))
2071 % os.path.dirname(__file__))
2072 try:
2072 try:
2073 import bdiff, mpatch, base85, osutil
2073 import bdiff, mpatch, base85, osutil
2074 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2074 dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes
2075 except Exception, inst:
2075 except Exception, inst:
2076 ui.write(" %s\n" % inst)
2076 ui.write(" %s\n" % inst)
2077 ui.write(_(" One or more extensions could not be found"))
2077 ui.write(_(" One or more extensions could not be found"))
2078 ui.write(_(" (check that you compiled the extensions)\n"))
2078 ui.write(_(" (check that you compiled the extensions)\n"))
2079 problems += 1
2079 problems += 1
2080
2080
2081 # templates
2081 # templates
2082 import templater
2082 import templater
2083 p = templater.templatepath()
2083 p = templater.templatepath()
2084 ui.status(_("checking templates (%s)...\n") % ' '.join(p))
2084 ui.status(_("checking templates (%s)...\n") % ' '.join(p))
2085 try:
2085 try:
2086 templater.templater(templater.templatepath("map-cmdline.default"))
2086 templater.templater(templater.templatepath("map-cmdline.default"))
2087 except Exception, inst:
2087 except Exception, inst:
2088 ui.write(" %s\n" % inst)
2088 ui.write(" %s\n" % inst)
2089 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
2089 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
2090 problems += 1
2090 problems += 1
2091
2091
2092 # editor
2092 # editor
2093 ui.status(_("checking commit editor...\n"))
2093 ui.status(_("checking commit editor...\n"))
2094 editor = ui.geteditor()
2094 editor = ui.geteditor()
2095 cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
2095 cmdpath = util.findexe(editor) or util.findexe(editor.split()[0])
2096 if not cmdpath:
2096 if not cmdpath:
2097 if editor == 'vi':
2097 if editor == 'vi':
2098 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
2098 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
2099 ui.write(_(" (specify a commit editor in your configuration"
2099 ui.write(_(" (specify a commit editor in your configuration"
2100 " file)\n"))
2100 " file)\n"))
2101 else:
2101 else:
2102 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
2102 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
2103 ui.write(_(" (specify a commit editor in your configuration"
2103 ui.write(_(" (specify a commit editor in your configuration"
2104 " file)\n"))
2104 " file)\n"))
2105 problems += 1
2105 problems += 1
2106
2106
2107 # check username
2107 # check username
2108 ui.status(_("checking username...\n"))
2108 ui.status(_("checking username...\n"))
2109 try:
2109 try:
2110 ui.username()
2110 ui.username()
2111 except util.Abort, e:
2111 except util.Abort, e:
2112 ui.write(" %s\n" % e)
2112 ui.write(" %s\n" % e)
2113 ui.write(_(" (specify a username in your configuration file)\n"))
2113 ui.write(_(" (specify a username in your configuration file)\n"))
2114 problems += 1
2114 problems += 1
2115
2115
2116 if not problems:
2116 if not problems:
2117 ui.status(_("no problems detected\n"))
2117 ui.status(_("no problems detected\n"))
2118 else:
2118 else:
2119 ui.write(_("%s problems detected,"
2119 ui.write(_("%s problems detected,"
2120 " please check your install!\n") % problems)
2120 " please check your install!\n") % problems)
2121
2121
2122 return problems
2122 return problems
2123
2123
2124 @command('debugknown', [], _('REPO ID...'))
2124 @command('debugknown', [], _('REPO ID...'))
2125 def debugknown(ui, repopath, *ids, **opts):
2125 def debugknown(ui, repopath, *ids, **opts):
2126 """test whether node ids are known to a repo
2126 """test whether node ids are known to a repo
2127
2127
2128 Every ID must be a full-length hex node id string. Returns a list of 0s
2128 Every ID must be a full-length hex node id string. Returns a list of 0s
2129 and 1s indicating unknown/known.
2129 and 1s indicating unknown/known.
2130 """
2130 """
2131 repo = hg.peer(ui, opts, repopath)
2131 repo = hg.peer(ui, opts, repopath)
2132 if not repo.capable('known'):
2132 if not repo.capable('known'):
2133 raise util.Abort("known() not supported by target repository")
2133 raise util.Abort("known() not supported by target repository")
2134 flags = repo.known([bin(s) for s in ids])
2134 flags = repo.known([bin(s) for s in ids])
2135 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2135 ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags])))
2136
2136
2137 @command('debuglabelcomplete', [], _('LABEL...'))
2137 @command('debuglabelcomplete', [], _('LABEL...'))
2138 def debuglabelcomplete(ui, repo, *args):
2138 def debuglabelcomplete(ui, repo, *args):
2139 '''complete "labels" - tags, open branch names, bookmark names'''
2139 '''complete "labels" - tags, open branch names, bookmark names'''
2140
2140
2141 labels = set()
2141 labels = set()
2142 labels.update(t[0] for t in repo.tagslist())
2142 labels.update(t[0] for t in repo.tagslist())
2143 labels.update(repo._bookmarks.keys())
2143 labels.update(repo._bookmarks.keys())
2144 for heads in repo.branchmap().itervalues():
2144 for heads in repo.branchmap().itervalues():
2145 for h in heads:
2145 for h in heads:
2146 ctx = repo[h]
2146 ctx = repo[h]
2147 if not ctx.closesbranch():
2147 if not ctx.closesbranch():
2148 labels.add(ctx.branch())
2148 labels.add(ctx.branch())
2149 completions = set()
2149 completions = set()
2150 if not args:
2150 if not args:
2151 args = ['']
2151 args = ['']
2152 for a in args:
2152 for a in args:
2153 completions.update(l for l in labels if l.startswith(a))
2153 completions.update(l for l in labels if l.startswith(a))
2154 ui.write('\n'.join(sorted(completions)))
2154 ui.write('\n'.join(sorted(completions)))
2155 ui.write('\n')
2155 ui.write('\n')
2156
2156
2157 @command('debugobsolete',
2157 @command('debugobsolete',
2158 [('', 'flags', 0, _('markers flag')),
2158 [('', 'flags', 0, _('markers flag')),
2159 ] + commitopts2,
2159 ] + commitopts2,
2160 _('[OBSOLETED [REPLACEMENT] [REPL... ]'))
2160 _('[OBSOLETED [REPLACEMENT] [REPL... ]'))
2161 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
2161 def debugobsolete(ui, repo, precursor=None, *successors, **opts):
2162 """create arbitrary obsolete marker
2162 """create arbitrary obsolete marker
2163
2163
2164 With no arguments, displays the list of obsolescence markers."""
2164 With no arguments, displays the list of obsolescence markers."""
2165 def parsenodeid(s):
2165 def parsenodeid(s):
2166 try:
2166 try:
2167 # We do not use revsingle/revrange functions here to accept
2167 # We do not use revsingle/revrange functions here to accept
2168 # arbitrary node identifiers, possibly not present in the
2168 # arbitrary node identifiers, possibly not present in the
2169 # local repository.
2169 # local repository.
2170 n = bin(s)
2170 n = bin(s)
2171 if len(n) != len(nullid):
2171 if len(n) != len(nullid):
2172 raise TypeError()
2172 raise TypeError()
2173 return n
2173 return n
2174 except TypeError:
2174 except TypeError:
2175 raise util.Abort('changeset references must be full hexadecimal '
2175 raise util.Abort('changeset references must be full hexadecimal '
2176 'node identifiers')
2176 'node identifiers')
2177
2177
2178 if precursor is not None:
2178 if precursor is not None:
2179 metadata = {}
2179 metadata = {}
2180 if 'date' in opts:
2180 if 'date' in opts:
2181 metadata['date'] = opts['date']
2181 metadata['date'] = opts['date']
2182 metadata['user'] = opts['user'] or ui.username()
2182 metadata['user'] = opts['user'] or ui.username()
2183 succs = tuple(parsenodeid(succ) for succ in successors)
2183 succs = tuple(parsenodeid(succ) for succ in successors)
2184 l = repo.lock()
2184 l = repo.lock()
2185 try:
2185 try:
2186 tr = repo.transaction('debugobsolete')
2186 tr = repo.transaction('debugobsolete')
2187 try:
2187 try:
2188 repo.obsstore.create(tr, parsenodeid(precursor), succs,
2188 repo.obsstore.create(tr, parsenodeid(precursor), succs,
2189 opts['flags'], metadata)
2189 opts['flags'], metadata)
2190 tr.close()
2190 tr.close()
2191 finally:
2191 finally:
2192 tr.release()
2192 tr.release()
2193 finally:
2193 finally:
2194 l.release()
2194 l.release()
2195 else:
2195 else:
2196 for m in obsolete.allmarkers(repo):
2196 for m in obsolete.allmarkers(repo):
2197 ui.write(hex(m.precnode()))
2197 ui.write(hex(m.precnode()))
2198 for repl in m.succnodes():
2198 for repl in m.succnodes():
2199 ui.write(' ')
2199 ui.write(' ')
2200 ui.write(hex(repl))
2200 ui.write(hex(repl))
2201 ui.write(' %X ' % m._data[2])
2201 ui.write(' %X ' % m._data[2])
2202 ui.write('{%s}' % (', '.join('%r: %r' % t for t in
2202 ui.write('{%s}' % (', '.join('%r: %r' % t for t in
2203 sorted(m.metadata().items()))))
2203 sorted(m.metadata().items()))))
2204 ui.write('\n')
2204 ui.write('\n')
2205
2205
2206 @command('debugpathcomplete',
2206 @command('debugpathcomplete',
2207 [('f', 'full', None, _('complete an entire path')),
2207 [('f', 'full', None, _('complete an entire path')),
2208 ('n', 'normal', None, _('show only normal files')),
2208 ('n', 'normal', None, _('show only normal files')),
2209 ('a', 'added', None, _('show only added files')),
2209 ('a', 'added', None, _('show only added files')),
2210 ('r', 'removed', None, _('show only removed files'))],
2210 ('r', 'removed', None, _('show only removed files'))],
2211 _('FILESPEC...'))
2211 _('FILESPEC...'))
2212 def debugpathcomplete(ui, repo, *specs, **opts):
2212 def debugpathcomplete(ui, repo, *specs, **opts):
2213 '''complete part or all of a tracked path
2213 '''complete part or all of a tracked path
2214
2214
2215 This command supports shells that offer path name completion. It
2215 This command supports shells that offer path name completion. It
2216 currently completes only files already known to the dirstate.
2216 currently completes only files already known to the dirstate.
2217
2217
2218 Completion extends only to the next path segment unless
2218 Completion extends only to the next path segment unless
2219 --full is specified, in which case entire paths are used.'''
2219 --full is specified, in which case entire paths are used.'''
2220
2220
2221 def complete(path, acceptable):
2221 def complete(path, acceptable):
2222 dirstate = repo.dirstate
2222 dirstate = repo.dirstate
2223 spec = os.path.normpath(os.path.join(os.getcwd(), path))
2223 spec = os.path.normpath(os.path.join(os.getcwd(), path))
2224 rootdir = repo.root + os.sep
2224 rootdir = repo.root + os.sep
2225 if spec != repo.root and not spec.startswith(rootdir):
2225 if spec != repo.root and not spec.startswith(rootdir):
2226 return [], []
2226 return [], []
2227 if os.path.isdir(spec):
2227 if os.path.isdir(spec):
2228 spec += '/'
2228 spec += '/'
2229 spec = spec[len(rootdir):]
2229 spec = spec[len(rootdir):]
2230 fixpaths = os.sep != '/'
2230 fixpaths = os.sep != '/'
2231 if fixpaths:
2231 if fixpaths:
2232 spec = spec.replace(os.sep, '/')
2232 spec = spec.replace(os.sep, '/')
2233 speclen = len(spec)
2233 speclen = len(spec)
2234 fullpaths = opts['full']
2234 fullpaths = opts['full']
2235 files, dirs = set(), set()
2235 files, dirs = set(), set()
2236 adddir, addfile = dirs.add, files.add
2236 adddir, addfile = dirs.add, files.add
2237 for f, st in dirstate.iteritems():
2237 for f, st in dirstate.iteritems():
2238 if f.startswith(spec) and st[0] in acceptable:
2238 if f.startswith(spec) and st[0] in acceptable:
2239 if fixpaths:
2239 if fixpaths:
2240 f = f.replace('/', os.sep)
2240 f = f.replace('/', os.sep)
2241 if fullpaths:
2241 if fullpaths:
2242 addfile(f)
2242 addfile(f)
2243 continue
2243 continue
2244 s = f.find(os.sep, speclen)
2244 s = f.find(os.sep, speclen)
2245 if s >= 0:
2245 if s >= 0:
2246 adddir(f[:s + 1])
2246 adddir(f[:s + 1])
2247 else:
2247 else:
2248 addfile(f)
2248 addfile(f)
2249 return files, dirs
2249 return files, dirs
2250
2250
2251 acceptable = ''
2251 acceptable = ''
2252 if opts['normal']:
2252 if opts['normal']:
2253 acceptable += 'nm'
2253 acceptable += 'nm'
2254 if opts['added']:
2254 if opts['added']:
2255 acceptable += 'a'
2255 acceptable += 'a'
2256 if opts['removed']:
2256 if opts['removed']:
2257 acceptable += 'r'
2257 acceptable += 'r'
2258 cwd = repo.getcwd()
2258 cwd = repo.getcwd()
2259 if not specs:
2259 if not specs:
2260 specs = ['.']
2260 specs = ['.']
2261
2261
2262 files, dirs = set(), set()
2262 files, dirs = set(), set()
2263 for spec in specs:
2263 for spec in specs:
2264 f, d = complete(spec, acceptable or 'nmar')
2264 f, d = complete(spec, acceptable or 'nmar')
2265 files.update(f)
2265 files.update(f)
2266 dirs.update(d)
2266 dirs.update(d)
2267 if not files and len(dirs) == 1:
2267 if not files and len(dirs) == 1:
2268 # force the shell to consider a completion that matches one
2268 # force the shell to consider a completion that matches one
2269 # directory and zero files to be ambiguous
2269 # directory and zero files to be ambiguous
2270 dirs.add(iter(dirs).next() + '.')
2270 dirs.add(iter(dirs).next() + '.')
2271 files.update(dirs)
2271 files.update(dirs)
2272 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
2272 ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files)))
2273 ui.write('\n')
2273 ui.write('\n')
2274
2274
2275 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'))
2275 @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]'))
2276 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
2276 def debugpushkey(ui, repopath, namespace, *keyinfo, **opts):
2277 '''access the pushkey key/value protocol
2277 '''access the pushkey key/value protocol
2278
2278
2279 With two args, list the keys in the given namespace.
2279 With two args, list the keys in the given namespace.
2280
2280
2281 With five args, set a key to new if it currently is set to old.
2281 With five args, set a key to new if it currently is set to old.
2282 Reports success or failure.
2282 Reports success or failure.
2283 '''
2283 '''
2284
2284
2285 target = hg.peer(ui, {}, repopath)
2285 target = hg.peer(ui, {}, repopath)
2286 if keyinfo:
2286 if keyinfo:
2287 key, old, new = keyinfo
2287 key, old, new = keyinfo
2288 r = target.pushkey(namespace, key, old, new)
2288 r = target.pushkey(namespace, key, old, new)
2289 ui.status(str(r) + '\n')
2289 ui.status(str(r) + '\n')
2290 return not r
2290 return not r
2291 else:
2291 else:
2292 for k, v in sorted(target.listkeys(namespace).iteritems()):
2292 for k, v in sorted(target.listkeys(namespace).iteritems()):
2293 ui.write("%s\t%s\n" % (k.encode('string-escape'),
2293 ui.write("%s\t%s\n" % (k.encode('string-escape'),
2294 v.encode('string-escape')))
2294 v.encode('string-escape')))
2295
2295
2296 @command('debugpvec', [], _('A B'))
2296 @command('debugpvec', [], _('A B'))
2297 def debugpvec(ui, repo, a, b=None):
2297 def debugpvec(ui, repo, a, b=None):
2298 ca = scmutil.revsingle(repo, a)
2298 ca = scmutil.revsingle(repo, a)
2299 cb = scmutil.revsingle(repo, b)
2299 cb = scmutil.revsingle(repo, b)
2300 pa = pvec.ctxpvec(ca)
2300 pa = pvec.ctxpvec(ca)
2301 pb = pvec.ctxpvec(cb)
2301 pb = pvec.ctxpvec(cb)
2302 if pa == pb:
2302 if pa == pb:
2303 rel = "="
2303 rel = "="
2304 elif pa > pb:
2304 elif pa > pb:
2305 rel = ">"
2305 rel = ">"
2306 elif pa < pb:
2306 elif pa < pb:
2307 rel = "<"
2307 rel = "<"
2308 elif pa | pb:
2308 elif pa | pb:
2309 rel = "|"
2309 rel = "|"
2310 ui.write(_("a: %s\n") % pa)
2310 ui.write(_("a: %s\n") % pa)
2311 ui.write(_("b: %s\n") % pb)
2311 ui.write(_("b: %s\n") % pb)
2312 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
2312 ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth))
2313 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
2313 ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") %
2314 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
2314 (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec),
2315 pa.distance(pb), rel))
2315 pa.distance(pb), rel))
2316
2316
2317 @command('debugrebuilddirstate|debugrebuildstate',
2317 @command('debugrebuilddirstate|debugrebuildstate',
2318 [('r', 'rev', '', _('revision to rebuild to'), _('REV'))],
2318 [('r', 'rev', '', _('revision to rebuild to'), _('REV'))],
2319 _('[-r REV]'))
2319 _('[-r REV]'))
2320 def debugrebuilddirstate(ui, repo, rev):
2320 def debugrebuilddirstate(ui, repo, rev):
2321 """rebuild the dirstate as it would look like for the given revision
2321 """rebuild the dirstate as it would look like for the given revision
2322
2322
2323 If no revision is specified the first current parent will be used.
2323 If no revision is specified the first current parent will be used.
2324
2324
2325 The dirstate will be set to the files of the given revision.
2325 The dirstate will be set to the files of the given revision.
2326 The actual working directory content or existing dirstate
2326 The actual working directory content or existing dirstate
2327 information such as adds or removes is not considered.
2327 information such as adds or removes is not considered.
2328
2328
2329 One use of this command is to make the next :hg:`status` invocation
2329 One use of this command is to make the next :hg:`status` invocation
2330 check the actual file content.
2330 check the actual file content.
2331 """
2331 """
2332 ctx = scmutil.revsingle(repo, rev)
2332 ctx = scmutil.revsingle(repo, rev)
2333 wlock = repo.wlock()
2333 wlock = repo.wlock()
2334 try:
2334 try:
2335 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
2335 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
2336 finally:
2336 finally:
2337 wlock.release()
2337 wlock.release()
2338
2338
2339 @command('debugrename',
2339 @command('debugrename',
2340 [('r', 'rev', '', _('revision to debug'), _('REV'))],
2340 [('r', 'rev', '', _('revision to debug'), _('REV'))],
2341 _('[-r REV] FILE'))
2341 _('[-r REV] FILE'))
2342 def debugrename(ui, repo, file1, *pats, **opts):
2342 def debugrename(ui, repo, file1, *pats, **opts):
2343 """dump rename information"""
2343 """dump rename information"""
2344
2344
2345 ctx = scmutil.revsingle(repo, opts.get('rev'))
2345 ctx = scmutil.revsingle(repo, opts.get('rev'))
2346 m = scmutil.match(ctx, (file1,) + pats, opts)
2346 m = scmutil.match(ctx, (file1,) + pats, opts)
2347 for abs in ctx.walk(m):
2347 for abs in ctx.walk(m):
2348 fctx = ctx[abs]
2348 fctx = ctx[abs]
2349 o = fctx.filelog().renamed(fctx.filenode())
2349 o = fctx.filelog().renamed(fctx.filenode())
2350 rel = m.rel(abs)
2350 rel = m.rel(abs)
2351 if o:
2351 if o:
2352 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
2352 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
2353 else:
2353 else:
2354 ui.write(_("%s not renamed\n") % rel)
2354 ui.write(_("%s not renamed\n") % rel)
2355
2355
2356 @command('debugrevlog',
2356 @command('debugrevlog',
2357 [('c', 'changelog', False, _('open changelog')),
2357 [('c', 'changelog', False, _('open changelog')),
2358 ('m', 'manifest', False, _('open manifest')),
2358 ('m', 'manifest', False, _('open manifest')),
2359 ('d', 'dump', False, _('dump index data'))],
2359 ('d', 'dump', False, _('dump index data'))],
2360 _('-c|-m|FILE'))
2360 _('-c|-m|FILE'))
2361 def debugrevlog(ui, repo, file_=None, **opts):
2361 def debugrevlog(ui, repo, file_=None, **opts):
2362 """show data and statistics about a revlog"""
2362 """show data and statistics about a revlog"""
2363 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
2363 r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts)
2364
2364
2365 if opts.get("dump"):
2365 if opts.get("dump"):
2366 numrevs = len(r)
2366 numrevs = len(r)
2367 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
2367 ui.write("# rev p1rev p2rev start end deltastart base p1 p2"
2368 " rawsize totalsize compression heads\n")
2368 " rawsize totalsize compression heads\n")
2369 ts = 0
2369 ts = 0
2370 heads = set()
2370 heads = set()
2371 for rev in xrange(numrevs):
2371 for rev in xrange(numrevs):
2372 dbase = r.deltaparent(rev)
2372 dbase = r.deltaparent(rev)
2373 if dbase == -1:
2373 if dbase == -1:
2374 dbase = rev
2374 dbase = rev
2375 cbase = r.chainbase(rev)
2375 cbase = r.chainbase(rev)
2376 p1, p2 = r.parentrevs(rev)
2376 p1, p2 = r.parentrevs(rev)
2377 rs = r.rawsize(rev)
2377 rs = r.rawsize(rev)
2378 ts = ts + rs
2378 ts = ts + rs
2379 heads -= set(r.parentrevs(rev))
2379 heads -= set(r.parentrevs(rev))
2380 heads.add(rev)
2380 heads.add(rev)
2381 ui.write("%d %d %d %d %d %d %d %d %d %d %d %d %d\n" %
2381 ui.write("%d %d %d %d %d %d %d %d %d %d %d %d %d\n" %
2382 (rev, p1, p2, r.start(rev), r.end(rev),
2382 (rev, p1, p2, r.start(rev), r.end(rev),
2383 r.start(dbase), r.start(cbase),
2383 r.start(dbase), r.start(cbase),
2384 r.start(p1), r.start(p2),
2384 r.start(p1), r.start(p2),
2385 rs, ts, ts / r.end(rev), len(heads)))
2385 rs, ts, ts / r.end(rev), len(heads)))
2386 return 0
2386 return 0
2387
2387
2388 v = r.version
2388 v = r.version
2389 format = v & 0xFFFF
2389 format = v & 0xFFFF
2390 flags = []
2390 flags = []
2391 gdelta = False
2391 gdelta = False
2392 if v & revlog.REVLOGNGINLINEDATA:
2392 if v & revlog.REVLOGNGINLINEDATA:
2393 flags.append('inline')
2393 flags.append('inline')
2394 if v & revlog.REVLOGGENERALDELTA:
2394 if v & revlog.REVLOGGENERALDELTA:
2395 gdelta = True
2395 gdelta = True
2396 flags.append('generaldelta')
2396 flags.append('generaldelta')
2397 if not flags:
2397 if not flags:
2398 flags = ['(none)']
2398 flags = ['(none)']
2399
2399
2400 nummerges = 0
2400 nummerges = 0
2401 numfull = 0
2401 numfull = 0
2402 numprev = 0
2402 numprev = 0
2403 nump1 = 0
2403 nump1 = 0
2404 nump2 = 0
2404 nump2 = 0
2405 numother = 0
2405 numother = 0
2406 nump1prev = 0
2406 nump1prev = 0
2407 nump2prev = 0
2407 nump2prev = 0
2408 chainlengths = []
2408 chainlengths = []
2409
2409
2410 datasize = [None, 0, 0L]
2410 datasize = [None, 0, 0L]
2411 fullsize = [None, 0, 0L]
2411 fullsize = [None, 0, 0L]
2412 deltasize = [None, 0, 0L]
2412 deltasize = [None, 0, 0L]
2413
2413
2414 def addsize(size, l):
2414 def addsize(size, l):
2415 if l[0] is None or size < l[0]:
2415 if l[0] is None or size < l[0]:
2416 l[0] = size
2416 l[0] = size
2417 if size > l[1]:
2417 if size > l[1]:
2418 l[1] = size
2418 l[1] = size
2419 l[2] += size
2419 l[2] += size
2420
2420
2421 numrevs = len(r)
2421 numrevs = len(r)
2422 for rev in xrange(numrevs):
2422 for rev in xrange(numrevs):
2423 p1, p2 = r.parentrevs(rev)
2423 p1, p2 = r.parentrevs(rev)
2424 delta = r.deltaparent(rev)
2424 delta = r.deltaparent(rev)
2425 if format > 0:
2425 if format > 0:
2426 addsize(r.rawsize(rev), datasize)
2426 addsize(r.rawsize(rev), datasize)
2427 if p2 != nullrev:
2427 if p2 != nullrev:
2428 nummerges += 1
2428 nummerges += 1
2429 size = r.length(rev)
2429 size = r.length(rev)
2430 if delta == nullrev:
2430 if delta == nullrev:
2431 chainlengths.append(0)
2431 chainlengths.append(0)
2432 numfull += 1
2432 numfull += 1
2433 addsize(size, fullsize)
2433 addsize(size, fullsize)
2434 else:
2434 else:
2435 chainlengths.append(chainlengths[delta] + 1)
2435 chainlengths.append(chainlengths[delta] + 1)
2436 addsize(size, deltasize)
2436 addsize(size, deltasize)
2437 if delta == rev - 1:
2437 if delta == rev - 1:
2438 numprev += 1
2438 numprev += 1
2439 if delta == p1:
2439 if delta == p1:
2440 nump1prev += 1
2440 nump1prev += 1
2441 elif delta == p2:
2441 elif delta == p2:
2442 nump2prev += 1
2442 nump2prev += 1
2443 elif delta == p1:
2443 elif delta == p1:
2444 nump1 += 1
2444 nump1 += 1
2445 elif delta == p2:
2445 elif delta == p2:
2446 nump2 += 1
2446 nump2 += 1
2447 elif delta != nullrev:
2447 elif delta != nullrev:
2448 numother += 1
2448 numother += 1
2449
2449
2450 # Adjust size min value for empty cases
2450 # Adjust size min value for empty cases
2451 for size in (datasize, fullsize, deltasize):
2451 for size in (datasize, fullsize, deltasize):
2452 if size[0] is None:
2452 if size[0] is None:
2453 size[0] = 0
2453 size[0] = 0
2454
2454
2455 numdeltas = numrevs - numfull
2455 numdeltas = numrevs - numfull
2456 numoprev = numprev - nump1prev - nump2prev
2456 numoprev = numprev - nump1prev - nump2prev
2457 totalrawsize = datasize[2]
2457 totalrawsize = datasize[2]
2458 datasize[2] /= numrevs
2458 datasize[2] /= numrevs
2459 fulltotal = fullsize[2]
2459 fulltotal = fullsize[2]
2460 fullsize[2] /= numfull
2460 fullsize[2] /= numfull
2461 deltatotal = deltasize[2]
2461 deltatotal = deltasize[2]
2462 if numrevs - numfull > 0:
2462 if numrevs - numfull > 0:
2463 deltasize[2] /= numrevs - numfull
2463 deltasize[2] /= numrevs - numfull
2464 totalsize = fulltotal + deltatotal
2464 totalsize = fulltotal + deltatotal
2465 avgchainlen = sum(chainlengths) / numrevs
2465 avgchainlen = sum(chainlengths) / numrevs
2466 compratio = totalrawsize / totalsize
2466 compratio = totalrawsize / totalsize
2467
2467
2468 basedfmtstr = '%%%dd\n'
2468 basedfmtstr = '%%%dd\n'
2469 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2469 basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n'
2470
2470
2471 def dfmtstr(max):
2471 def dfmtstr(max):
2472 return basedfmtstr % len(str(max))
2472 return basedfmtstr % len(str(max))
2473 def pcfmtstr(max, padding=0):
2473 def pcfmtstr(max, padding=0):
2474 return basepcfmtstr % (len(str(max)), ' ' * padding)
2474 return basepcfmtstr % (len(str(max)), ' ' * padding)
2475
2475
2476 def pcfmt(value, total):
2476 def pcfmt(value, total):
2477 return (value, 100 * float(value) / total)
2477 return (value, 100 * float(value) / total)
2478
2478
2479 ui.write(('format : %d\n') % format)
2479 ui.write(('format : %d\n') % format)
2480 ui.write(('flags : %s\n') % ', '.join(flags))
2480 ui.write(('flags : %s\n') % ', '.join(flags))
2481
2481
2482 ui.write('\n')
2482 ui.write('\n')
2483 fmt = pcfmtstr(totalsize)
2483 fmt = pcfmtstr(totalsize)
2484 fmt2 = dfmtstr(totalsize)
2484 fmt2 = dfmtstr(totalsize)
2485 ui.write(('revisions : ') + fmt2 % numrevs)
2485 ui.write(('revisions : ') + fmt2 % numrevs)
2486 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
2486 ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs))
2487 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
2487 ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs))
2488 ui.write(('revisions : ') + fmt2 % numrevs)
2488 ui.write(('revisions : ') + fmt2 % numrevs)
2489 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
2489 ui.write((' full : ') + fmt % pcfmt(numfull, numrevs))
2490 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
2490 ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs))
2491 ui.write(('revision size : ') + fmt2 % totalsize)
2491 ui.write(('revision size : ') + fmt2 % totalsize)
2492 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
2492 ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize))
2493 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
2493 ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize))
2494
2494
2495 ui.write('\n')
2495 ui.write('\n')
2496 fmt = dfmtstr(max(avgchainlen, compratio))
2496 fmt = dfmtstr(max(avgchainlen, compratio))
2497 ui.write(('avg chain length : ') + fmt % avgchainlen)
2497 ui.write(('avg chain length : ') + fmt % avgchainlen)
2498 ui.write(('compression ratio : ') + fmt % compratio)
2498 ui.write(('compression ratio : ') + fmt % compratio)
2499
2499
2500 if format > 0:
2500 if format > 0:
2501 ui.write('\n')
2501 ui.write('\n')
2502 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
2502 ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n')
2503 % tuple(datasize))
2503 % tuple(datasize))
2504 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
2504 ui.write(('full revision size (min/max/avg) : %d / %d / %d\n')
2505 % tuple(fullsize))
2505 % tuple(fullsize))
2506 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
2506 ui.write(('delta size (min/max/avg) : %d / %d / %d\n')
2507 % tuple(deltasize))
2507 % tuple(deltasize))
2508
2508
2509 if numdeltas > 0:
2509 if numdeltas > 0:
2510 ui.write('\n')
2510 ui.write('\n')
2511 fmt = pcfmtstr(numdeltas)
2511 fmt = pcfmtstr(numdeltas)
2512 fmt2 = pcfmtstr(numdeltas, 4)
2512 fmt2 = pcfmtstr(numdeltas, 4)
2513 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
2513 ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas))
2514 if numprev > 0:
2514 if numprev > 0:
2515 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
2515 ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev,
2516 numprev))
2516 numprev))
2517 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
2517 ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev,
2518 numprev))
2518 numprev))
2519 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
2519 ui.write((' other : ') + fmt2 % pcfmt(numoprev,
2520 numprev))
2520 numprev))
2521 if gdelta:
2521 if gdelta:
2522 ui.write(('deltas against p1 : ')
2522 ui.write(('deltas against p1 : ')
2523 + fmt % pcfmt(nump1, numdeltas))
2523 + fmt % pcfmt(nump1, numdeltas))
2524 ui.write(('deltas against p2 : ')
2524 ui.write(('deltas against p2 : ')
2525 + fmt % pcfmt(nump2, numdeltas))
2525 + fmt % pcfmt(nump2, numdeltas))
2526 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
2526 ui.write(('deltas against other : ') + fmt % pcfmt(numother,
2527 numdeltas))
2527 numdeltas))
2528
2528
2529 @command('debugrevspec', [], ('REVSPEC'))
2529 @command('debugrevspec', [], ('REVSPEC'))
2530 def debugrevspec(ui, repo, expr):
2530 def debugrevspec(ui, repo, expr):
2531 """parse and apply a revision specification
2531 """parse and apply a revision specification
2532
2532
2533 Use --verbose to print the parsed tree before and after aliases
2533 Use --verbose to print the parsed tree before and after aliases
2534 expansion.
2534 expansion.
2535 """
2535 """
2536 if ui.verbose:
2536 if ui.verbose:
2537 tree = revset.parse(expr)[0]
2537 tree = revset.parse(expr)[0]
2538 ui.note(revset.prettyformat(tree), "\n")
2538 ui.note(revset.prettyformat(tree), "\n")
2539 newtree = revset.findaliases(ui, tree)
2539 newtree = revset.findaliases(ui, tree)
2540 if newtree != tree:
2540 if newtree != tree:
2541 ui.note(revset.prettyformat(newtree), "\n")
2541 ui.note(revset.prettyformat(newtree), "\n")
2542 func = revset.match(ui, expr)
2542 func = revset.match(ui, expr)
2543 for c in func(repo, range(len(repo))):
2543 for c in func(repo, range(len(repo))):
2544 ui.write("%s\n" % c)
2544 ui.write("%s\n" % c)
2545
2545
2546 @command('debugsetparents', [], _('REV1 [REV2]'))
2546 @command('debugsetparents', [], _('REV1 [REV2]'))
2547 def debugsetparents(ui, repo, rev1, rev2=None):
2547 def debugsetparents(ui, repo, rev1, rev2=None):
2548 """manually set the parents of the current working directory
2548 """manually set the parents of the current working directory
2549
2549
2550 This is useful for writing repository conversion tools, but should
2550 This is useful for writing repository conversion tools, but should
2551 be used with care.
2551 be used with care.
2552
2552
2553 Returns 0 on success.
2553 Returns 0 on success.
2554 """
2554 """
2555
2555
2556 r1 = scmutil.revsingle(repo, rev1).node()
2556 r1 = scmutil.revsingle(repo, rev1).node()
2557 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2557 r2 = scmutil.revsingle(repo, rev2, 'null').node()
2558
2558
2559 wlock = repo.wlock()
2559 wlock = repo.wlock()
2560 try:
2560 try:
2561 repo.setparents(r1, r2)
2561 repo.setparents(r1, r2)
2562 finally:
2562 finally:
2563 wlock.release()
2563 wlock.release()
2564
2564
2565 @command('debugdirstate|debugstate',
2565 @command('debugdirstate|debugstate',
2566 [('', 'nodates', None, _('do not display the saved mtime')),
2566 [('', 'nodates', None, _('do not display the saved mtime')),
2567 ('', 'datesort', None, _('sort by saved mtime'))],
2567 ('', 'datesort', None, _('sort by saved mtime'))],
2568 _('[OPTION]...'))
2568 _('[OPTION]...'))
2569 def debugstate(ui, repo, nodates=None, datesort=None):
2569 def debugstate(ui, repo, nodates=None, datesort=None):
2570 """show the contents of the current dirstate"""
2570 """show the contents of the current dirstate"""
2571 timestr = ""
2571 timestr = ""
2572 showdate = not nodates
2572 showdate = not nodates
2573 if datesort:
2573 if datesort:
2574 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
2574 keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename
2575 else:
2575 else:
2576 keyfunc = None # sort by filename
2576 keyfunc = None # sort by filename
2577 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
2577 for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc):
2578 if showdate:
2578 if showdate:
2579 if ent[3] == -1:
2579 if ent[3] == -1:
2580 # Pad or slice to locale representation
2580 # Pad or slice to locale representation
2581 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
2581 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
2582 time.localtime(0)))
2582 time.localtime(0)))
2583 timestr = 'unset'
2583 timestr = 'unset'
2584 timestr = (timestr[:locale_len] +
2584 timestr = (timestr[:locale_len] +
2585 ' ' * (locale_len - len(timestr)))
2585 ' ' * (locale_len - len(timestr)))
2586 else:
2586 else:
2587 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
2587 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
2588 time.localtime(ent[3]))
2588 time.localtime(ent[3]))
2589 if ent[1] & 020000:
2589 if ent[1] & 020000:
2590 mode = 'lnk'
2590 mode = 'lnk'
2591 else:
2591 else:
2592 mode = '%3o' % (ent[1] & 0777 & ~util.umask)
2592 mode = '%3o' % (ent[1] & 0777 & ~util.umask)
2593 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
2593 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
2594 for f in repo.dirstate.copies():
2594 for f in repo.dirstate.copies():
2595 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
2595 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
2596
2596
2597 @command('debugsub',
2597 @command('debugsub',
2598 [('r', 'rev', '',
2598 [('r', 'rev', '',
2599 _('revision to check'), _('REV'))],
2599 _('revision to check'), _('REV'))],
2600 _('[-r REV] [REV]'))
2600 _('[-r REV] [REV]'))
2601 def debugsub(ui, repo, rev=None):
2601 def debugsub(ui, repo, rev=None):
2602 ctx = scmutil.revsingle(repo, rev, None)
2602 ctx = scmutil.revsingle(repo, rev, None)
2603 for k, v in sorted(ctx.substate.items()):
2603 for k, v in sorted(ctx.substate.items()):
2604 ui.write(('path %s\n') % k)
2604 ui.write(('path %s\n') % k)
2605 ui.write((' source %s\n') % v[0])
2605 ui.write((' source %s\n') % v[0])
2606 ui.write((' revision %s\n') % v[1])
2606 ui.write((' revision %s\n') % v[1])
2607
2607
2608 @command('debugsuccessorssets',
2608 @command('debugsuccessorssets',
2609 [],
2609 [],
2610 _('[REV]'))
2610 _('[REV]'))
2611 def debugsuccessorssets(ui, repo, *revs):
2611 def debugsuccessorssets(ui, repo, *revs):
2612 """show set of successors for revision
2612 """show set of successors for revision
2613
2613
2614 A successors set of changeset A is a consistent group of revisions that
2614 A successors set of changeset A is a consistent group of revisions that
2615 succeed A. It contains non-obsolete changesets only.
2615 succeed A. It contains non-obsolete changesets only.
2616
2616
2617 In most cases a changeset A has a single successors set containing a single
2617 In most cases a changeset A has a single successors set containing a single
2618 successor (changeset A replaced by A').
2618 successor (changeset A replaced by A').
2619
2619
2620 A changeset that is made obsolete with no successors are called "pruned".
2620 A changeset that is made obsolete with no successors are called "pruned".
2621 Such changesets have no successors sets at all.
2621 Such changesets have no successors sets at all.
2622
2622
2623 A changeset that has been "split" will have a successors set containing
2623 A changeset that has been "split" will have a successors set containing
2624 more than one successor.
2624 more than one successor.
2625
2625
2626 A changeset that has been rewritten in multiple different ways is called
2626 A changeset that has been rewritten in multiple different ways is called
2627 "divergent". Such changesets have multiple successor sets (each of which
2627 "divergent". Such changesets have multiple successor sets (each of which
2628 may also be split, i.e. have multiple successors).
2628 may also be split, i.e. have multiple successors).
2629
2629
2630 Results are displayed as follows::
2630 Results are displayed as follows::
2631
2631
2632 <rev1>
2632 <rev1>
2633 <successors-1A>
2633 <successors-1A>
2634 <rev2>
2634 <rev2>
2635 <successors-2A>
2635 <successors-2A>
2636 <successors-2B1> <successors-2B2> <successors-2B3>
2636 <successors-2B1> <successors-2B2> <successors-2B3>
2637
2637
2638 Here rev2 has two possible (i.e. divergent) successors sets. The first
2638 Here rev2 has two possible (i.e. divergent) successors sets. The first
2639 holds one element, whereas the second holds three (i.e. the changeset has
2639 holds one element, whereas the second holds three (i.e. the changeset has
2640 been split).
2640 been split).
2641 """
2641 """
2642 # passed to successorssets caching computation from one call to another
2642 # passed to successorssets caching computation from one call to another
2643 cache = {}
2643 cache = {}
2644 ctx2str = str
2644 ctx2str = str
2645 node2str = short
2645 node2str = short
2646 if ui.debug():
2646 if ui.debug():
2647 def ctx2str(ctx):
2647 def ctx2str(ctx):
2648 return ctx.hex()
2648 return ctx.hex()
2649 node2str = hex
2649 node2str = hex
2650 for rev in scmutil.revrange(repo, revs):
2650 for rev in scmutil.revrange(repo, revs):
2651 ctx = repo[rev]
2651 ctx = repo[rev]
2652 ui.write('%s\n'% ctx2str(ctx))
2652 ui.write('%s\n'% ctx2str(ctx))
2653 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
2653 for succsset in obsolete.successorssets(repo, ctx.node(), cache):
2654 if succsset:
2654 if succsset:
2655 ui.write(' ')
2655 ui.write(' ')
2656 ui.write(node2str(succsset[0]))
2656 ui.write(node2str(succsset[0]))
2657 for node in succsset[1:]:
2657 for node in succsset[1:]:
2658 ui.write(' ')
2658 ui.write(' ')
2659 ui.write(node2str(node))
2659 ui.write(node2str(node))
2660 ui.write('\n')
2660 ui.write('\n')
2661
2661
2662 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'))
2662 @command('debugwalk', walkopts, _('[OPTION]... [FILE]...'))
2663 def debugwalk(ui, repo, *pats, **opts):
2663 def debugwalk(ui, repo, *pats, **opts):
2664 """show how files match on given patterns"""
2664 """show how files match on given patterns"""
2665 m = scmutil.match(repo[None], pats, opts)
2665 m = scmutil.match(repo[None], pats, opts)
2666 items = list(repo.walk(m))
2666 items = list(repo.walk(m))
2667 if not items:
2667 if not items:
2668 return
2668 return
2669 f = lambda fn: fn
2669 f = lambda fn: fn
2670 if ui.configbool('ui', 'slash') and os.sep != '/':
2670 if ui.configbool('ui', 'slash') and os.sep != '/':
2671 f = lambda fn: util.normpath(fn)
2671 f = lambda fn: util.normpath(fn)
2672 fmt = 'f %%-%ds %%-%ds %%s' % (
2672 fmt = 'f %%-%ds %%-%ds %%s' % (
2673 max([len(abs) for abs in items]),
2673 max([len(abs) for abs in items]),
2674 max([len(m.rel(abs)) for abs in items]))
2674 max([len(m.rel(abs)) for abs in items]))
2675 for abs in items:
2675 for abs in items:
2676 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
2676 line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '')
2677 ui.write("%s\n" % line.rstrip())
2677 ui.write("%s\n" % line.rstrip())
2678
2678
2679 @command('debugwireargs',
2679 @command('debugwireargs',
2680 [('', 'three', '', 'three'),
2680 [('', 'three', '', 'three'),
2681 ('', 'four', '', 'four'),
2681 ('', 'four', '', 'four'),
2682 ('', 'five', '', 'five'),
2682 ('', 'five', '', 'five'),
2683 ] + remoteopts,
2683 ] + remoteopts,
2684 _('REPO [OPTIONS]... [ONE [TWO]]'))
2684 _('REPO [OPTIONS]... [ONE [TWO]]'))
2685 def debugwireargs(ui, repopath, *vals, **opts):
2685 def debugwireargs(ui, repopath, *vals, **opts):
2686 repo = hg.peer(ui, opts, repopath)
2686 repo = hg.peer(ui, opts, repopath)
2687 for opt in remoteopts:
2687 for opt in remoteopts:
2688 del opts[opt[1]]
2688 del opts[opt[1]]
2689 args = {}
2689 args = {}
2690 for k, v in opts.iteritems():
2690 for k, v in opts.iteritems():
2691 if v:
2691 if v:
2692 args[k] = v
2692 args[k] = v
2693 # run twice to check that we don't mess up the stream for the next command
2693 # run twice to check that we don't mess up the stream for the next command
2694 res1 = repo.debugwireargs(*vals, **args)
2694 res1 = repo.debugwireargs(*vals, **args)
2695 res2 = repo.debugwireargs(*vals, **args)
2695 res2 = repo.debugwireargs(*vals, **args)
2696 ui.write("%s\n" % res1)
2696 ui.write("%s\n" % res1)
2697 if res1 != res2:
2697 if res1 != res2:
2698 ui.warn("%s\n" % res2)
2698 ui.warn("%s\n" % res2)
2699
2699
2700 @command('^diff',
2700 @command('^diff',
2701 [('r', 'rev', [], _('revision'), _('REV')),
2701 [('r', 'rev', [], _('revision'), _('REV')),
2702 ('c', 'change', '', _('change made by revision'), _('REV'))
2702 ('c', 'change', '', _('change made by revision'), _('REV'))
2703 ] + diffopts + diffopts2 + walkopts + subrepoopts,
2703 ] + diffopts + diffopts2 + walkopts + subrepoopts,
2704 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'))
2704 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'))
2705 def diff(ui, repo, *pats, **opts):
2705 def diff(ui, repo, *pats, **opts):
2706 """diff repository (or selected files)
2706 """diff repository (or selected files)
2707
2707
2708 Show differences between revisions for the specified files.
2708 Show differences between revisions for the specified files.
2709
2709
2710 Differences between files are shown using the unified diff format.
2710 Differences between files are shown using the unified diff format.
2711
2711
2712 .. note::
2712 .. note::
2713
2713
2714 diff may generate unexpected results for merges, as it will
2714 diff may generate unexpected results for merges, as it will
2715 default to comparing against the working directory's first
2715 default to comparing against the working directory's first
2716 parent changeset if no revisions are specified.
2716 parent changeset if no revisions are specified.
2717
2717
2718 When two revision arguments are given, then changes are shown
2718 When two revision arguments are given, then changes are shown
2719 between those revisions. If only one revision is specified then
2719 between those revisions. If only one revision is specified then
2720 that revision is compared to the working directory, and, when no
2720 that revision is compared to the working directory, and, when no
2721 revisions are specified, the working directory files are compared
2721 revisions are specified, the working directory files are compared
2722 to its parent.
2722 to its parent.
2723
2723
2724 Alternatively you can specify -c/--change with a revision to see
2724 Alternatively you can specify -c/--change with a revision to see
2725 the changes in that changeset relative to its first parent.
2725 the changes in that changeset relative to its first parent.
2726
2726
2727 Without the -a/--text option, diff will avoid generating diffs of
2727 Without the -a/--text option, diff will avoid generating diffs of
2728 files it detects as binary. With -a, diff will generate a diff
2728 files it detects as binary. With -a, diff will generate a diff
2729 anyway, probably with undesirable results.
2729 anyway, probably with undesirable results.
2730
2730
2731 Use the -g/--git option to generate diffs in the git extended diff
2731 Use the -g/--git option to generate diffs in the git extended diff
2732 format. For more information, read :hg:`help diffs`.
2732 format. For more information, read :hg:`help diffs`.
2733
2733
2734 .. container:: verbose
2734 .. container:: verbose
2735
2735
2736 Examples:
2736 Examples:
2737
2737
2738 - compare a file in the current working directory to its parent::
2738 - compare a file in the current working directory to its parent::
2739
2739
2740 hg diff foo.c
2740 hg diff foo.c
2741
2741
2742 - compare two historical versions of a directory, with rename info::
2742 - compare two historical versions of a directory, with rename info::
2743
2743
2744 hg diff --git -r 1.0:1.2 lib/
2744 hg diff --git -r 1.0:1.2 lib/
2745
2745
2746 - get change stats relative to the last change on some date::
2746 - get change stats relative to the last change on some date::
2747
2747
2748 hg diff --stat -r "date('may 2')"
2748 hg diff --stat -r "date('may 2')"
2749
2749
2750 - diff all newly-added files that contain a keyword::
2750 - diff all newly-added files that contain a keyword::
2751
2751
2752 hg diff "set:added() and grep(GNU)"
2752 hg diff "set:added() and grep(GNU)"
2753
2753
2754 - compare a revision and its parents::
2754 - compare a revision and its parents::
2755
2755
2756 hg diff -c 9353 # compare against first parent
2756 hg diff -c 9353 # compare against first parent
2757 hg diff -r 9353^:9353 # same using revset syntax
2757 hg diff -r 9353^:9353 # same using revset syntax
2758 hg diff -r 9353^2:9353 # compare against the second parent
2758 hg diff -r 9353^2:9353 # compare against the second parent
2759
2759
2760 Returns 0 on success.
2760 Returns 0 on success.
2761 """
2761 """
2762
2762
2763 revs = opts.get('rev')
2763 revs = opts.get('rev')
2764 change = opts.get('change')
2764 change = opts.get('change')
2765 stat = opts.get('stat')
2765 stat = opts.get('stat')
2766 reverse = opts.get('reverse')
2766 reverse = opts.get('reverse')
2767
2767
2768 if revs and change:
2768 if revs and change:
2769 msg = _('cannot specify --rev and --change at the same time')
2769 msg = _('cannot specify --rev and --change at the same time')
2770 raise util.Abort(msg)
2770 raise util.Abort(msg)
2771 elif change:
2771 elif change:
2772 node2 = scmutil.revsingle(repo, change, None).node()
2772 node2 = scmutil.revsingle(repo, change, None).node()
2773 node1 = repo[node2].p1().node()
2773 node1 = repo[node2].p1().node()
2774 else:
2774 else:
2775 node1, node2 = scmutil.revpair(repo, revs)
2775 node1, node2 = scmutil.revpair(repo, revs)
2776
2776
2777 if reverse:
2777 if reverse:
2778 node1, node2 = node2, node1
2778 node1, node2 = node2, node1
2779
2779
2780 diffopts = patch.diffopts(ui, opts)
2780 diffopts = patch.diffopts(ui, opts)
2781 m = scmutil.match(repo[node2], pats, opts)
2781 m = scmutil.match(repo[node2], pats, opts)
2782 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
2782 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
2783 listsubrepos=opts.get('subrepos'))
2783 listsubrepos=opts.get('subrepos'))
2784
2784
2785 @command('^export',
2785 @command('^export',
2786 [('o', 'output', '',
2786 [('o', 'output', '',
2787 _('print output to file with formatted name'), _('FORMAT')),
2787 _('print output to file with formatted name'), _('FORMAT')),
2788 ('', 'switch-parent', None, _('diff against the second parent')),
2788 ('', 'switch-parent', None, _('diff against the second parent')),
2789 ('r', 'rev', [], _('revisions to export'), _('REV')),
2789 ('r', 'rev', [], _('revisions to export'), _('REV')),
2790 ] + diffopts,
2790 ] + diffopts,
2791 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
2791 _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'))
2792 def export(ui, repo, *changesets, **opts):
2792 def export(ui, repo, *changesets, **opts):
2793 """dump the header and diffs for one or more changesets
2793 """dump the header and diffs for one or more changesets
2794
2794
2795 Print the changeset header and diffs for one or more revisions.
2795 Print the changeset header and diffs for one or more revisions.
2796 If no revision is given, the parent of the working directory is used.
2796 If no revision is given, the parent of the working directory is used.
2797
2797
2798 The information shown in the changeset header is: author, date,
2798 The information shown in the changeset header is: author, date,
2799 branch name (if non-default), changeset hash, parent(s) and commit
2799 branch name (if non-default), changeset hash, parent(s) and commit
2800 comment.
2800 comment.
2801
2801
2802 .. note::
2802 .. note::
2803
2803
2804 export may generate unexpected diff output for merge
2804 export may generate unexpected diff output for merge
2805 changesets, as it will compare the merge changeset against its
2805 changesets, as it will compare the merge changeset against its
2806 first parent only.
2806 first parent only.
2807
2807
2808 Output may be to a file, in which case the name of the file is
2808 Output may be to a file, in which case the name of the file is
2809 given using a format string. The formatting rules are as follows:
2809 given using a format string. The formatting rules are as follows:
2810
2810
2811 :``%%``: literal "%" character
2811 :``%%``: literal "%" character
2812 :``%H``: changeset hash (40 hexadecimal digits)
2812 :``%H``: changeset hash (40 hexadecimal digits)
2813 :``%N``: number of patches being generated
2813 :``%N``: number of patches being generated
2814 :``%R``: changeset revision number
2814 :``%R``: changeset revision number
2815 :``%b``: basename of the exporting repository
2815 :``%b``: basename of the exporting repository
2816 :``%h``: short-form changeset hash (12 hexadecimal digits)
2816 :``%h``: short-form changeset hash (12 hexadecimal digits)
2817 :``%m``: first line of the commit message (only alphanumeric characters)
2817 :``%m``: first line of the commit message (only alphanumeric characters)
2818 :``%n``: zero-padded sequence number, starting at 1
2818 :``%n``: zero-padded sequence number, starting at 1
2819 :``%r``: zero-padded changeset revision number
2819 :``%r``: zero-padded changeset revision number
2820
2820
2821 Without the -a/--text option, export will avoid generating diffs
2821 Without the -a/--text option, export will avoid generating diffs
2822 of files it detects as binary. With -a, export will generate a
2822 of files it detects as binary. With -a, export will generate a
2823 diff anyway, probably with undesirable results.
2823 diff anyway, probably with undesirable results.
2824
2824
2825 Use the -g/--git option to generate diffs in the git extended diff
2825 Use the -g/--git option to generate diffs in the git extended diff
2826 format. See :hg:`help diffs` for more information.
2826 format. See :hg:`help diffs` for more information.
2827
2827
2828 With the --switch-parent option, the diff will be against the
2828 With the --switch-parent option, the diff will be against the
2829 second parent. It can be useful to review a merge.
2829 second parent. It can be useful to review a merge.
2830
2830
2831 .. container:: verbose
2831 .. container:: verbose
2832
2832
2833 Examples:
2833 Examples:
2834
2834
2835 - use export and import to transplant a bugfix to the current
2835 - use export and import to transplant a bugfix to the current
2836 branch::
2836 branch::
2837
2837
2838 hg export -r 9353 | hg import -
2838 hg export -r 9353 | hg import -
2839
2839
2840 - export all the changesets between two revisions to a file with
2840 - export all the changesets between two revisions to a file with
2841 rename information::
2841 rename information::
2842
2842
2843 hg export --git -r 123:150 > changes.txt
2843 hg export --git -r 123:150 > changes.txt
2844
2844
2845 - split outgoing changes into a series of patches with
2845 - split outgoing changes into a series of patches with
2846 descriptive names::
2846 descriptive names::
2847
2847
2848 hg export -r "outgoing()" -o "%n-%m.patch"
2848 hg export -r "outgoing()" -o "%n-%m.patch"
2849
2849
2850 Returns 0 on success.
2850 Returns 0 on success.
2851 """
2851 """
2852 changesets += tuple(opts.get('rev', []))
2852 changesets += tuple(opts.get('rev', []))
2853 if not changesets:
2853 if not changesets:
2854 changesets = ['.']
2854 changesets = ['.']
2855 revs = scmutil.revrange(repo, changesets)
2855 revs = scmutil.revrange(repo, changesets)
2856 if not revs:
2856 if not revs:
2857 raise util.Abort(_("export requires at least one changeset"))
2857 raise util.Abort(_("export requires at least one changeset"))
2858 if len(revs) > 1:
2858 if len(revs) > 1:
2859 ui.note(_('exporting patches:\n'))
2859 ui.note(_('exporting patches:\n'))
2860 else:
2860 else:
2861 ui.note(_('exporting patch:\n'))
2861 ui.note(_('exporting patch:\n'))
2862 cmdutil.export(repo, revs, template=opts.get('output'),
2862 cmdutil.export(repo, revs, template=opts.get('output'),
2863 switch_parent=opts.get('switch_parent'),
2863 switch_parent=opts.get('switch_parent'),
2864 opts=patch.diffopts(ui, opts))
2864 opts=patch.diffopts(ui, opts))
2865
2865
2866 @command('^forget', walkopts, _('[OPTION]... FILE...'))
2866 @command('^forget', walkopts, _('[OPTION]... FILE...'))
2867 def forget(ui, repo, *pats, **opts):
2867 def forget(ui, repo, *pats, **opts):
2868 """forget the specified files on the next commit
2868 """forget the specified files on the next commit
2869
2869
2870 Mark the specified files so they will no longer be tracked
2870 Mark the specified files so they will no longer be tracked
2871 after the next commit.
2871 after the next commit.
2872
2872
2873 This only removes files from the current branch, not from the
2873 This only removes files from the current branch, not from the
2874 entire project history, and it does not delete them from the
2874 entire project history, and it does not delete them from the
2875 working directory.
2875 working directory.
2876
2876
2877 To undo a forget before the next commit, see :hg:`add`.
2877 To undo a forget before the next commit, see :hg:`add`.
2878
2878
2879 .. container:: verbose
2879 .. container:: verbose
2880
2880
2881 Examples:
2881 Examples:
2882
2882
2883 - forget newly-added binary files::
2883 - forget newly-added binary files::
2884
2884
2885 hg forget "set:added() and binary()"
2885 hg forget "set:added() and binary()"
2886
2886
2887 - forget files that would be excluded by .hgignore::
2887 - forget files that would be excluded by .hgignore::
2888
2888
2889 hg forget "set:hgignore()"
2889 hg forget "set:hgignore()"
2890
2890
2891 Returns 0 on success.
2891 Returns 0 on success.
2892 """
2892 """
2893
2893
2894 if not pats:
2894 if not pats:
2895 raise util.Abort(_('no files specified'))
2895 raise util.Abort(_('no files specified'))
2896
2896
2897 m = scmutil.match(repo[None], pats, opts)
2897 m = scmutil.match(repo[None], pats, opts)
2898 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2898 rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0]
2899 return rejected and 1 or 0
2899 return rejected and 1 or 0
2900
2900
2901 @command(
2901 @command(
2902 'graft',
2902 'graft',
2903 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2903 [('r', 'rev', [], _('revisions to graft'), _('REV')),
2904 ('c', 'continue', False, _('resume interrupted graft')),
2904 ('c', 'continue', False, _('resume interrupted graft')),
2905 ('e', 'edit', False, _('invoke editor on commit messages')),
2905 ('e', 'edit', False, _('invoke editor on commit messages')),
2906 ('', 'log', None, _('append graft info to log message')),
2906 ('', 'log', None, _('append graft info to log message')),
2907 ('D', 'currentdate', False,
2907 ('D', 'currentdate', False,
2908 _('record the current date as commit date')),
2908 _('record the current date as commit date')),
2909 ('U', 'currentuser', False,
2909 ('U', 'currentuser', False,
2910 _('record the current user as committer'), _('DATE'))]
2910 _('record the current user as committer'), _('DATE'))]
2911 + commitopts2 + mergetoolopts + dryrunopts,
2911 + commitopts2 + mergetoolopts + dryrunopts,
2912 _('[OPTION]... [-r] REV...'))
2912 _('[OPTION]... [-r] REV...'))
2913 def graft(ui, repo, *revs, **opts):
2913 def graft(ui, repo, *revs, **opts):
2914 '''copy changes from other branches onto the current branch
2914 '''copy changes from other branches onto the current branch
2915
2915
2916 This command uses Mercurial's merge logic to copy individual
2916 This command uses Mercurial's merge logic to copy individual
2917 changes from other branches without merging branches in the
2917 changes from other branches without merging branches in the
2918 history graph. This is sometimes known as 'backporting' or
2918 history graph. This is sometimes known as 'backporting' or
2919 'cherry-picking'. By default, graft will copy user, date, and
2919 'cherry-picking'. By default, graft will copy user, date, and
2920 description from the source changesets.
2920 description from the source changesets.
2921
2921
2922 Changesets that are ancestors of the current revision, that have
2922 Changesets that are ancestors of the current revision, that have
2923 already been grafted, or that are merges will be skipped.
2923 already been grafted, or that are merges will be skipped.
2924
2924
2925 If --log is specified, log messages will have a comment appended
2925 If --log is specified, log messages will have a comment appended
2926 of the form::
2926 of the form::
2927
2927
2928 (grafted from CHANGESETHASH)
2928 (grafted from CHANGESETHASH)
2929
2929
2930 If a graft merge results in conflicts, the graft process is
2930 If a graft merge results in conflicts, the graft process is
2931 interrupted so that the current merge can be manually resolved.
2931 interrupted so that the current merge can be manually resolved.
2932 Once all conflicts are addressed, the graft process can be
2932 Once all conflicts are addressed, the graft process can be
2933 continued with the -c/--continue option.
2933 continued with the -c/--continue option.
2934
2934
2935 .. note::
2935 .. note::
2936
2936
2937 The -c/--continue option does not reapply earlier options.
2937 The -c/--continue option does not reapply earlier options.
2938
2938
2939 .. container:: verbose
2939 .. container:: verbose
2940
2940
2941 Examples:
2941 Examples:
2942
2942
2943 - copy a single change to the stable branch and edit its description::
2943 - copy a single change to the stable branch and edit its description::
2944
2944
2945 hg update stable
2945 hg update stable
2946 hg graft --edit 9393
2946 hg graft --edit 9393
2947
2947
2948 - graft a range of changesets with one exception, updating dates::
2948 - graft a range of changesets with one exception, updating dates::
2949
2949
2950 hg graft -D "2085::2093 and not 2091"
2950 hg graft -D "2085::2093 and not 2091"
2951
2951
2952 - continue a graft after resolving conflicts::
2952 - continue a graft after resolving conflicts::
2953
2953
2954 hg graft -c
2954 hg graft -c
2955
2955
2956 - show the source of a grafted changeset::
2956 - show the source of a grafted changeset::
2957
2957
2958 hg log --debug -r .
2958 hg log --debug -r .
2959
2959
2960 Returns 0 on successful completion.
2960 Returns 0 on successful completion.
2961 '''
2961 '''
2962
2962
2963 revs = list(revs)
2963 revs = list(revs)
2964 revs.extend(opts['rev'])
2964 revs.extend(opts['rev'])
2965
2965
2966 if not opts.get('user') and opts.get('currentuser'):
2966 if not opts.get('user') and opts.get('currentuser'):
2967 opts['user'] = ui.username()
2967 opts['user'] = ui.username()
2968 if not opts.get('date') and opts.get('currentdate'):
2968 if not opts.get('date') and opts.get('currentdate'):
2969 opts['date'] = "%d %d" % util.makedate()
2969 opts['date'] = "%d %d" % util.makedate()
2970
2970
2971 editor = None
2971 editor = None
2972 if opts.get('edit'):
2972 if opts.get('edit'):
2973 editor = cmdutil.commitforceeditor
2973 editor = cmdutil.commitforceeditor
2974
2974
2975 cont = False
2975 cont = False
2976 if opts['continue']:
2976 if opts['continue']:
2977 cont = True
2977 cont = True
2978 if revs:
2978 if revs:
2979 raise util.Abort(_("can't specify --continue and revisions"))
2979 raise util.Abort(_("can't specify --continue and revisions"))
2980 # read in unfinished revisions
2980 # read in unfinished revisions
2981 try:
2981 try:
2982 nodes = repo.opener.read('graftstate').splitlines()
2982 nodes = repo.opener.read('graftstate').splitlines()
2983 revs = [repo[node].rev() for node in nodes]
2983 revs = [repo[node].rev() for node in nodes]
2984 except IOError, inst:
2984 except IOError, inst:
2985 if inst.errno != errno.ENOENT:
2985 if inst.errno != errno.ENOENT:
2986 raise
2986 raise
2987 raise util.Abort(_("no graft state found, can't continue"))
2987 raise util.Abort(_("no graft state found, can't continue"))
2988 else:
2988 else:
2989 cmdutil.checkunfinished(repo)
2989 cmdutil.checkunfinished(repo)
2990 cmdutil.bailifchanged(repo)
2990 cmdutil.bailifchanged(repo)
2991 if not revs:
2991 if not revs:
2992 raise util.Abort(_('no revisions specified'))
2992 raise util.Abort(_('no revisions specified'))
2993 revs = scmutil.revrange(repo, revs)
2993 revs = scmutil.revrange(repo, revs)
2994
2994
2995 # check for merges
2995 # check for merges
2996 for rev in repo.revs('%ld and merge()', revs):
2996 for rev in repo.revs('%ld and merge()', revs):
2997 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2997 ui.warn(_('skipping ungraftable merge revision %s\n') % rev)
2998 revs.remove(rev)
2998 revs.remove(rev)
2999 if not revs:
2999 if not revs:
3000 return -1
3000 return -1
3001
3001
3002 # check for ancestors of dest branch
3002 # check for ancestors of dest branch
3003 crev = repo['.'].rev()
3003 crev = repo['.'].rev()
3004 ancestors = repo.changelog.ancestors([crev], inclusive=True)
3004 ancestors = repo.changelog.ancestors([crev], inclusive=True)
3005 # don't mutate while iterating, create a copy
3005 # don't mutate while iterating, create a copy
3006 for rev in list(revs):
3006 for rev in list(revs):
3007 if rev in ancestors:
3007 if rev in ancestors:
3008 ui.warn(_('skipping ancestor revision %s\n') % rev)
3008 ui.warn(_('skipping ancestor revision %s\n') % rev)
3009 revs.remove(rev)
3009 revs.remove(rev)
3010 if not revs:
3010 if not revs:
3011 return -1
3011 return -1
3012
3012
3013 # analyze revs for earlier grafts
3013 # analyze revs for earlier grafts
3014 ids = {}
3014 ids = {}
3015 for ctx in repo.set("%ld", revs):
3015 for ctx in repo.set("%ld", revs):
3016 ids[ctx.hex()] = ctx.rev()
3016 ids[ctx.hex()] = ctx.rev()
3017 n = ctx.extra().get('source')
3017 n = ctx.extra().get('source')
3018 if n:
3018 if n:
3019 ids[n] = ctx.rev()
3019 ids[n] = ctx.rev()
3020
3020
3021 # check ancestors for earlier grafts
3021 # check ancestors for earlier grafts
3022 ui.debug('scanning for duplicate grafts\n')
3022 ui.debug('scanning for duplicate grafts\n')
3023
3023
3024 for rev in repo.changelog.findmissingrevs(revs, [crev]):
3024 for rev in repo.changelog.findmissingrevs(revs, [crev]):
3025 ctx = repo[rev]
3025 ctx = repo[rev]
3026 n = ctx.extra().get('source')
3026 n = ctx.extra().get('source')
3027 if n in ids:
3027 if n in ids:
3028 r = repo[n].rev()
3028 r = repo[n].rev()
3029 if r in revs:
3029 if r in revs:
3030 ui.warn(_('skipping revision %s (already grafted to %s)\n')
3030 ui.warn(_('skipping revision %s (already grafted to %s)\n')
3031 % (r, rev))
3031 % (r, rev))
3032 revs.remove(r)
3032 revs.remove(r)
3033 elif ids[n] in revs:
3033 elif ids[n] in revs:
3034 ui.warn(_('skipping already grafted revision %s '
3034 ui.warn(_('skipping already grafted revision %s '
3035 '(%s also has origin %d)\n') % (ids[n], rev, r))
3035 '(%s also has origin %d)\n') % (ids[n], rev, r))
3036 revs.remove(ids[n])
3036 revs.remove(ids[n])
3037 elif ctx.hex() in ids:
3037 elif ctx.hex() in ids:
3038 r = ids[ctx.hex()]
3038 r = ids[ctx.hex()]
3039 ui.warn(_('skipping already grafted revision %s '
3039 ui.warn(_('skipping already grafted revision %s '
3040 '(was grafted from %d)\n') % (r, rev))
3040 '(was grafted from %d)\n') % (r, rev))
3041 revs.remove(r)
3041 revs.remove(r)
3042 if not revs:
3042 if not revs:
3043 return -1
3043 return -1
3044
3044
3045 wlock = repo.wlock()
3045 wlock = repo.wlock()
3046 try:
3046 try:
3047 current = repo['.']
3047 current = repo['.']
3048 for pos, ctx in enumerate(repo.set("%ld", revs)):
3048 for pos, ctx in enumerate(repo.set("%ld", revs)):
3049
3049
3050 ui.status(_('grafting revision %s\n') % ctx.rev())
3050 ui.status(_('grafting revision %s\n') % ctx.rev())
3051 if opts.get('dry_run'):
3051 if opts.get('dry_run'):
3052 continue
3052 continue
3053
3053
3054 source = ctx.extra().get('source')
3054 source = ctx.extra().get('source')
3055 if not source:
3055 if not source:
3056 source = ctx.hex()
3056 source = ctx.hex()
3057 extra = {'source': source}
3057 extra = {'source': source}
3058 user = ctx.user()
3058 user = ctx.user()
3059 if opts.get('user'):
3059 if opts.get('user'):
3060 user = opts['user']
3060 user = opts['user']
3061 date = ctx.date()
3061 date = ctx.date()
3062 if opts.get('date'):
3062 if opts.get('date'):
3063 date = opts['date']
3063 date = opts['date']
3064 message = ctx.description()
3064 message = ctx.description()
3065 if opts.get('log'):
3065 if opts.get('log'):
3066 message += '\n(grafted from %s)' % ctx.hex()
3066 message += '\n(grafted from %s)' % ctx.hex()
3067
3067
3068 # we don't merge the first commit when continuing
3068 # we don't merge the first commit when continuing
3069 if not cont:
3069 if not cont:
3070 # perform the graft merge with p1(rev) as 'ancestor'
3070 # perform the graft merge with p1(rev) as 'ancestor'
3071 try:
3071 try:
3072 # ui.forcemerge is an internal variable, do not document
3072 # ui.forcemerge is an internal variable, do not document
3073 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
3073 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
3074 stats = mergemod.update(repo, ctx.node(), True, True, False,
3074 stats = mergemod.update(repo, ctx.node(), True, True, False,
3075 ctx.p1().node())
3075 ctx.p1().node())
3076 finally:
3076 finally:
3077 repo.ui.setconfig('ui', 'forcemerge', '')
3077 repo.ui.setconfig('ui', 'forcemerge', '')
3078 # report any conflicts
3078 # report any conflicts
3079 if stats and stats[3] > 0:
3079 if stats and stats[3] > 0:
3080 # write out state for --continue
3080 # write out state for --continue
3081 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
3081 nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]]
3082 repo.opener.write('graftstate', ''.join(nodelines))
3082 repo.opener.write('graftstate', ''.join(nodelines))
3083 raise util.Abort(
3083 raise util.Abort(
3084 _("unresolved conflicts, can't continue"),
3084 _("unresolved conflicts, can't continue"),
3085 hint=_('use hg resolve and hg graft --continue'))
3085 hint=_('use hg resolve and hg graft --continue'))
3086 else:
3086 else:
3087 cont = False
3087 cont = False
3088
3088
3089 # drop the second merge parent
3089 # drop the second merge parent
3090 repo.setparents(current.node(), nullid)
3090 repo.setparents(current.node(), nullid)
3091 repo.dirstate.write()
3091 repo.dirstate.write()
3092 # fix up dirstate for copies and renames
3092 # fix up dirstate for copies and renames
3093 cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev())
3093 cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev())
3094
3094
3095 # commit
3095 # commit
3096 node = repo.commit(text=message, user=user,
3096 node = repo.commit(text=message, user=user,
3097 date=date, extra=extra, editor=editor)
3097 date=date, extra=extra, editor=editor)
3098 if node is None:
3098 if node is None:
3099 ui.status(_('graft for revision %s is empty\n') % ctx.rev())
3099 ui.status(_('graft for revision %s is empty\n') % ctx.rev())
3100 else:
3100 else:
3101 current = repo[node]
3101 current = repo[node]
3102 finally:
3102 finally:
3103 wlock.release()
3103 wlock.release()
3104
3104
3105 # remove state when we complete successfully
3105 # remove state when we complete successfully
3106 if not opts.get('dry_run'):
3106 if not opts.get('dry_run'):
3107 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
3107 util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
3108
3108
3109 return 0
3109 return 0
3110
3110
3111 @command('grep',
3111 @command('grep',
3112 [('0', 'print0', None, _('end fields with NUL')),
3112 [('0', 'print0', None, _('end fields with NUL')),
3113 ('', 'all', None, _('print all revisions that match')),
3113 ('', 'all', None, _('print all revisions that match')),
3114 ('a', 'text', None, _('treat all files as text')),
3114 ('a', 'text', None, _('treat all files as text')),
3115 ('f', 'follow', None,
3115 ('f', 'follow', None,
3116 _('follow changeset history,'
3116 _('follow changeset history,'
3117 ' or file history across copies and renames')),
3117 ' or file history across copies and renames')),
3118 ('i', 'ignore-case', None, _('ignore case when matching')),
3118 ('i', 'ignore-case', None, _('ignore case when matching')),
3119 ('l', 'files-with-matches', None,
3119 ('l', 'files-with-matches', None,
3120 _('print only filenames and revisions that match')),
3120 _('print only filenames and revisions that match')),
3121 ('n', 'line-number', None, _('print matching line numbers')),
3121 ('n', 'line-number', None, _('print matching line numbers')),
3122 ('r', 'rev', [],
3122 ('r', 'rev', [],
3123 _('only search files changed within revision range'), _('REV')),
3123 _('only search files changed within revision range'), _('REV')),
3124 ('u', 'user', None, _('list the author (long with -v)')),
3124 ('u', 'user', None, _('list the author (long with -v)')),
3125 ('d', 'date', None, _('list the date (short with -q)')),
3125 ('d', 'date', None, _('list the date (short with -q)')),
3126 ] + walkopts,
3126 ] + walkopts,
3127 _('[OPTION]... PATTERN [FILE]...'))
3127 _('[OPTION]... PATTERN [FILE]...'))
3128 def grep(ui, repo, pattern, *pats, **opts):
3128 def grep(ui, repo, pattern, *pats, **opts):
3129 """search for a pattern in specified files and revisions
3129 """search for a pattern in specified files and revisions
3130
3130
3131 Search revisions of files for a regular expression.
3131 Search revisions of files for a regular expression.
3132
3132
3133 This command behaves differently than Unix grep. It only accepts
3133 This command behaves differently than Unix grep. It only accepts
3134 Python/Perl regexps. It searches repository history, not the
3134 Python/Perl regexps. It searches repository history, not the
3135 working directory. It always prints the revision number in which a
3135 working directory. It always prints the revision number in which a
3136 match appears.
3136 match appears.
3137
3137
3138 By default, grep only prints output for the first revision of a
3138 By default, grep only prints output for the first revision of a
3139 file in which it finds a match. To get it to print every revision
3139 file in which it finds a match. To get it to print every revision
3140 that contains a change in match status ("-" for a match that
3140 that contains a change in match status ("-" for a match that
3141 becomes a non-match, or "+" for a non-match that becomes a match),
3141 becomes a non-match, or "+" for a non-match that becomes a match),
3142 use the --all flag.
3142 use the --all flag.
3143
3143
3144 Returns 0 if a match is found, 1 otherwise.
3144 Returns 0 if a match is found, 1 otherwise.
3145 """
3145 """
3146 reflags = re.M
3146 reflags = re.M
3147 if opts.get('ignore_case'):
3147 if opts.get('ignore_case'):
3148 reflags |= re.I
3148 reflags |= re.I
3149 try:
3149 try:
3150 regexp = util.compilere(pattern, reflags)
3150 regexp = util.compilere(pattern, reflags)
3151 except re.error, inst:
3151 except re.error, inst:
3152 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
3152 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
3153 return 1
3153 return 1
3154 sep, eol = ':', '\n'
3154 sep, eol = ':', '\n'
3155 if opts.get('print0'):
3155 if opts.get('print0'):
3156 sep = eol = '\0'
3156 sep = eol = '\0'
3157
3157
3158 getfile = util.lrucachefunc(repo.file)
3158 getfile = util.lrucachefunc(repo.file)
3159
3159
3160 def matchlines(body):
3160 def matchlines(body):
3161 begin = 0
3161 begin = 0
3162 linenum = 0
3162 linenum = 0
3163 while begin < len(body):
3163 while begin < len(body):
3164 match = regexp.search(body, begin)
3164 match = regexp.search(body, begin)
3165 if not match:
3165 if not match:
3166 break
3166 break
3167 mstart, mend = match.span()
3167 mstart, mend = match.span()
3168 linenum += body.count('\n', begin, mstart) + 1
3168 linenum += body.count('\n', begin, mstart) + 1
3169 lstart = body.rfind('\n', begin, mstart) + 1 or begin
3169 lstart = body.rfind('\n', begin, mstart) + 1 or begin
3170 begin = body.find('\n', mend) + 1 or len(body) + 1
3170 begin = body.find('\n', mend) + 1 or len(body) + 1
3171 lend = begin - 1
3171 lend = begin - 1
3172 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3172 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
3173
3173
3174 class linestate(object):
3174 class linestate(object):
3175 def __init__(self, line, linenum, colstart, colend):
3175 def __init__(self, line, linenum, colstart, colend):
3176 self.line = line
3176 self.line = line
3177 self.linenum = linenum
3177 self.linenum = linenum
3178 self.colstart = colstart
3178 self.colstart = colstart
3179 self.colend = colend
3179 self.colend = colend
3180
3180
3181 def __hash__(self):
3181 def __hash__(self):
3182 return hash((self.linenum, self.line))
3182 return hash((self.linenum, self.line))
3183
3183
3184 def __eq__(self, other):
3184 def __eq__(self, other):
3185 return self.line == other.line
3185 return self.line == other.line
3186
3186
3187 matches = {}
3187 matches = {}
3188 copies = {}
3188 copies = {}
3189 def grepbody(fn, rev, body):
3189 def grepbody(fn, rev, body):
3190 matches[rev].setdefault(fn, [])
3190 matches[rev].setdefault(fn, [])
3191 m = matches[rev][fn]
3191 m = matches[rev][fn]
3192 for lnum, cstart, cend, line in matchlines(body):
3192 for lnum, cstart, cend, line in matchlines(body):
3193 s = linestate(line, lnum, cstart, cend)
3193 s = linestate(line, lnum, cstart, cend)
3194 m.append(s)
3194 m.append(s)
3195
3195
3196 def difflinestates(a, b):
3196 def difflinestates(a, b):
3197 sm = difflib.SequenceMatcher(None, a, b)
3197 sm = difflib.SequenceMatcher(None, a, b)
3198 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3198 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
3199 if tag == 'insert':
3199 if tag == 'insert':
3200 for i in xrange(blo, bhi):
3200 for i in xrange(blo, bhi):
3201 yield ('+', b[i])
3201 yield ('+', b[i])
3202 elif tag == 'delete':
3202 elif tag == 'delete':
3203 for i in xrange(alo, ahi):
3203 for i in xrange(alo, ahi):
3204 yield ('-', a[i])
3204 yield ('-', a[i])
3205 elif tag == 'replace':
3205 elif tag == 'replace':
3206 for i in xrange(alo, ahi):
3206 for i in xrange(alo, ahi):
3207 yield ('-', a[i])
3207 yield ('-', a[i])
3208 for i in xrange(blo, bhi):
3208 for i in xrange(blo, bhi):
3209 yield ('+', b[i])
3209 yield ('+', b[i])
3210
3210
3211 def display(fn, ctx, pstates, states):
3211 def display(fn, ctx, pstates, states):
3212 rev = ctx.rev()
3212 rev = ctx.rev()
3213 datefunc = ui.quiet and util.shortdate or util.datestr
3213 datefunc = ui.quiet and util.shortdate or util.datestr
3214 found = False
3214 found = False
3215 filerevmatches = {}
3215 filerevmatches = {}
3216 def binary():
3216 def binary():
3217 flog = getfile(fn)
3217 flog = getfile(fn)
3218 return util.binary(flog.read(ctx.filenode(fn)))
3218 return util.binary(flog.read(ctx.filenode(fn)))
3219
3219
3220 if opts.get('all'):
3220 if opts.get('all'):
3221 iter = difflinestates(pstates, states)
3221 iter = difflinestates(pstates, states)
3222 else:
3222 else:
3223 iter = [('', l) for l in states]
3223 iter = [('', l) for l in states]
3224 for change, l in iter:
3224 for change, l in iter:
3225 cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')]
3225 cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')]
3226 before, match, after = None, None, None
3226 before, match, after = None, None, None
3227
3227
3228 if opts.get('line_number'):
3228 if opts.get('line_number'):
3229 cols.append((str(l.linenum), 'grep.linenumber'))
3229 cols.append((str(l.linenum), 'grep.linenumber'))
3230 if opts.get('all'):
3230 if opts.get('all'):
3231 cols.append((change, 'grep.change'))
3231 cols.append((change, 'grep.change'))
3232 if opts.get('user'):
3232 if opts.get('user'):
3233 cols.append((ui.shortuser(ctx.user()), 'grep.user'))
3233 cols.append((ui.shortuser(ctx.user()), 'grep.user'))
3234 if opts.get('date'):
3234 if opts.get('date'):
3235 cols.append((datefunc(ctx.date()), 'grep.date'))
3235 cols.append((datefunc(ctx.date()), 'grep.date'))
3236 if opts.get('files_with_matches'):
3236 if opts.get('files_with_matches'):
3237 c = (fn, rev)
3237 c = (fn, rev)
3238 if c in filerevmatches:
3238 if c in filerevmatches:
3239 continue
3239 continue
3240 filerevmatches[c] = 1
3240 filerevmatches[c] = 1
3241 else:
3241 else:
3242 before = l.line[:l.colstart]
3242 before = l.line[:l.colstart]
3243 match = l.line[l.colstart:l.colend]
3243 match = l.line[l.colstart:l.colend]
3244 after = l.line[l.colend:]
3244 after = l.line[l.colend:]
3245 for col, label in cols[:-1]:
3245 for col, label in cols[:-1]:
3246 ui.write(col, label=label)
3246 ui.write(col, label=label)
3247 ui.write(sep, label='grep.sep')
3247 ui.write(sep, label='grep.sep')
3248 ui.write(cols[-1][0], label=cols[-1][1])
3248 ui.write(cols[-1][0], label=cols[-1][1])
3249 if before is not None:
3249 if before is not None:
3250 ui.write(sep, label='grep.sep')
3250 ui.write(sep, label='grep.sep')
3251 if not opts.get('text') and binary():
3251 if not opts.get('text') and binary():
3252 ui.write(" Binary file matches")
3252 ui.write(" Binary file matches")
3253 else:
3253 else:
3254 ui.write(before)
3254 ui.write(before)
3255 ui.write(match, label='grep.match')
3255 ui.write(match, label='grep.match')
3256 ui.write(after)
3256 ui.write(after)
3257 ui.write(eol)
3257 ui.write(eol)
3258 found = True
3258 found = True
3259 return found
3259 return found
3260
3260
3261 skip = {}
3261 skip = {}
3262 revfiles = {}
3262 revfiles = {}
3263 matchfn = scmutil.match(repo[None], pats, opts)
3263 matchfn = scmutil.match(repo[None], pats, opts)
3264 found = False
3264 found = False
3265 follow = opts.get('follow')
3265 follow = opts.get('follow')
3266
3266
3267 def prep(ctx, fns):
3267 def prep(ctx, fns):
3268 rev = ctx.rev()
3268 rev = ctx.rev()
3269 pctx = ctx.p1()
3269 pctx = ctx.p1()
3270 parent = pctx.rev()
3270 parent = pctx.rev()
3271 matches.setdefault(rev, {})
3271 matches.setdefault(rev, {})
3272 matches.setdefault(parent, {})
3272 matches.setdefault(parent, {})
3273 files = revfiles.setdefault(rev, [])
3273 files = revfiles.setdefault(rev, [])
3274 for fn in fns:
3274 for fn in fns:
3275 flog = getfile(fn)
3275 flog = getfile(fn)
3276 try:
3276 try:
3277 fnode = ctx.filenode(fn)
3277 fnode = ctx.filenode(fn)
3278 except error.LookupError:
3278 except error.LookupError:
3279 continue
3279 continue
3280
3280
3281 copied = flog.renamed(fnode)
3281 copied = flog.renamed(fnode)
3282 copy = follow and copied and copied[0]
3282 copy = follow and copied and copied[0]
3283 if copy:
3283 if copy:
3284 copies.setdefault(rev, {})[fn] = copy
3284 copies.setdefault(rev, {})[fn] = copy
3285 if fn in skip:
3285 if fn in skip:
3286 if copy:
3286 if copy:
3287 skip[copy] = True
3287 skip[copy] = True
3288 continue
3288 continue
3289 files.append(fn)
3289 files.append(fn)
3290
3290
3291 if fn not in matches[rev]:
3291 if fn not in matches[rev]:
3292 grepbody(fn, rev, flog.read(fnode))
3292 grepbody(fn, rev, flog.read(fnode))
3293
3293
3294 pfn = copy or fn
3294 pfn = copy or fn
3295 if pfn not in matches[parent]:
3295 if pfn not in matches[parent]:
3296 try:
3296 try:
3297 fnode = pctx.filenode(pfn)
3297 fnode = pctx.filenode(pfn)
3298 grepbody(pfn, parent, flog.read(fnode))
3298 grepbody(pfn, parent, flog.read(fnode))
3299 except error.LookupError:
3299 except error.LookupError:
3300 pass
3300 pass
3301
3301
3302 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
3302 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
3303 rev = ctx.rev()
3303 rev = ctx.rev()
3304 parent = ctx.p1().rev()
3304 parent = ctx.p1().rev()
3305 for fn in sorted(revfiles.get(rev, [])):
3305 for fn in sorted(revfiles.get(rev, [])):
3306 states = matches[rev][fn]
3306 states = matches[rev][fn]
3307 copy = copies.get(rev, {}).get(fn)
3307 copy = copies.get(rev, {}).get(fn)
3308 if fn in skip:
3308 if fn in skip:
3309 if copy:
3309 if copy:
3310 skip[copy] = True
3310 skip[copy] = True
3311 continue
3311 continue
3312 pstates = matches.get(parent, {}).get(copy or fn, [])
3312 pstates = matches.get(parent, {}).get(copy or fn, [])
3313 if pstates or states:
3313 if pstates or states:
3314 r = display(fn, ctx, pstates, states)
3314 r = display(fn, ctx, pstates, states)
3315 found = found or r
3315 found = found or r
3316 if r and not opts.get('all'):
3316 if r and not opts.get('all'):
3317 skip[fn] = True
3317 skip[fn] = True
3318 if copy:
3318 if copy:
3319 skip[copy] = True
3319 skip[copy] = True
3320 del matches[rev]
3320 del matches[rev]
3321 del revfiles[rev]
3321 del revfiles[rev]
3322
3322
3323 return not found
3323 return not found
3324
3324
3325 @command('heads',
3325 @command('heads',
3326 [('r', 'rev', '',
3326 [('r', 'rev', '',
3327 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
3327 _('show only heads which are descendants of STARTREV'), _('STARTREV')),
3328 ('t', 'topo', False, _('show topological heads only')),
3328 ('t', 'topo', False, _('show topological heads only')),
3329 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
3329 ('a', 'active', False, _('show active branchheads only (DEPRECATED)')),
3330 ('c', 'closed', False, _('show normal and closed branch heads')),
3330 ('c', 'closed', False, _('show normal and closed branch heads')),
3331 ] + templateopts,
3331 ] + templateopts,
3332 _('[-ct] [-r STARTREV] [REV]...'))
3332 _('[-ct] [-r STARTREV] [REV]...'))
3333 def heads(ui, repo, *branchrevs, **opts):
3333 def heads(ui, repo, *branchrevs, **opts):
3334 """show branch heads
3334 """show branch heads
3335
3335
3336 With no arguments, show all open branch heads in the repository.
3336 With no arguments, show all open branch heads in the repository.
3337 Branch heads are changesets that have no descendants on the
3337 Branch heads are changesets that have no descendants on the
3338 same branch. They are where development generally takes place and
3338 same branch. They are where development generally takes place and
3339 are the usual targets for update and merge operations.
3339 are the usual targets for update and merge operations.
3340
3340
3341 If one or more REVs are given, only open branch heads on the
3341 If one or more REVs are given, only open branch heads on the
3342 branches associated with the specified changesets are shown. This
3342 branches associated with the specified changesets are shown. This
3343 means that you can use :hg:`heads .` to see the heads on the
3343 means that you can use :hg:`heads .` to see the heads on the
3344 currently checked-out branch.
3344 currently checked-out branch.
3345
3345
3346 If -c/--closed is specified, also show branch heads marked closed
3346 If -c/--closed is specified, also show branch heads marked closed
3347 (see :hg:`commit --close-branch`).
3347 (see :hg:`commit --close-branch`).
3348
3348
3349 If STARTREV is specified, only those heads that are descendants of
3349 If STARTREV is specified, only those heads that are descendants of
3350 STARTREV will be displayed.
3350 STARTREV will be displayed.
3351
3351
3352 If -t/--topo is specified, named branch mechanics will be ignored and only
3352 If -t/--topo is specified, named branch mechanics will be ignored and only
3353 topological heads (changesets with no children) will be shown.
3353 topological heads (changesets with no children) will be shown.
3354
3354
3355 Returns 0 if matching heads are found, 1 if not.
3355 Returns 0 if matching heads are found, 1 if not.
3356 """
3356 """
3357
3357
3358 start = None
3358 start = None
3359 if 'rev' in opts:
3359 if 'rev' in opts:
3360 start = scmutil.revsingle(repo, opts['rev'], None).node()
3360 start = scmutil.revsingle(repo, opts['rev'], None).node()
3361
3361
3362 if opts.get('topo'):
3362 if opts.get('topo'):
3363 heads = [repo[h] for h in repo.heads(start)]
3363 heads = [repo[h] for h in repo.heads(start)]
3364 else:
3364 else:
3365 heads = []
3365 heads = []
3366 for branch in repo.branchmap():
3366 for branch in repo.branchmap():
3367 heads += repo.branchheads(branch, start, opts.get('closed'))
3367 heads += repo.branchheads(branch, start, opts.get('closed'))
3368 heads = [repo[h] for h in heads]
3368 heads = [repo[h] for h in heads]
3369
3369
3370 if branchrevs:
3370 if branchrevs:
3371 branches = set(repo[br].branch() for br in branchrevs)
3371 branches = set(repo[br].branch() for br in branchrevs)
3372 heads = [h for h in heads if h.branch() in branches]
3372 heads = [h for h in heads if h.branch() in branches]
3373
3373
3374 if opts.get('active') and branchrevs:
3374 if opts.get('active') and branchrevs:
3375 dagheads = repo.heads(start)
3375 dagheads = repo.heads(start)
3376 heads = [h for h in heads if h.node() in dagheads]
3376 heads = [h for h in heads if h.node() in dagheads]
3377
3377
3378 if branchrevs:
3378 if branchrevs:
3379 haveheads = set(h.branch() for h in heads)
3379 haveheads = set(h.branch() for h in heads)
3380 if branches - haveheads:
3380 if branches - haveheads:
3381 headless = ', '.join(b for b in branches - haveheads)
3381 headless = ', '.join(b for b in branches - haveheads)
3382 msg = _('no open branch heads found on branches %s')
3382 msg = _('no open branch heads found on branches %s')
3383 if opts.get('rev'):
3383 if opts.get('rev'):
3384 msg += _(' (started at %s)') % opts['rev']
3384 msg += _(' (started at %s)') % opts['rev']
3385 ui.warn((msg + '\n') % headless)
3385 ui.warn((msg + '\n') % headless)
3386
3386
3387 if not heads:
3387 if not heads:
3388 return 1
3388 return 1
3389
3389
3390 heads = sorted(heads, key=lambda x: -x.rev())
3390 heads = sorted(heads, key=lambda x: -x.rev())
3391 displayer = cmdutil.show_changeset(ui, repo, opts)
3391 displayer = cmdutil.show_changeset(ui, repo, opts)
3392 for ctx in heads:
3392 for ctx in heads:
3393 displayer.show(ctx)
3393 displayer.show(ctx)
3394 displayer.close()
3394 displayer.close()
3395
3395
3396 @command('help',
3396 @command('help',
3397 [('e', 'extension', None, _('show only help for extensions')),
3397 [('e', 'extension', None, _('show only help for extensions')),
3398 ('c', 'command', None, _('show only help for commands')),
3398 ('c', 'command', None, _('show only help for commands')),
3399 ('k', 'keyword', '', _('show topics matching keyword')),
3399 ('k', 'keyword', '', _('show topics matching keyword')),
3400 ],
3400 ],
3401 _('[-ec] [TOPIC]'))
3401 _('[-ec] [TOPIC]'))
3402 def help_(ui, name=None, **opts):
3402 def help_(ui, name=None, **opts):
3403 """show help for a given topic or a help overview
3403 """show help for a given topic or a help overview
3404
3404
3405 With no arguments, print a list of commands with short help messages.
3405 With no arguments, print a list of commands with short help messages.
3406
3406
3407 Given a topic, extension, or command name, print help for that
3407 Given a topic, extension, or command name, print help for that
3408 topic.
3408 topic.
3409
3409
3410 Returns 0 if successful.
3410 Returns 0 if successful.
3411 """
3411 """
3412
3412
3413 textwidth = min(ui.termwidth(), 80) - 2
3413 textwidth = min(ui.termwidth(), 80) - 2
3414
3414
3415 keep = ui.verbose and ['verbose'] or []
3415 keep = ui.verbose and ['verbose'] or []
3416 text = help.help_(ui, name, **opts)
3416 text = help.help_(ui, name, **opts)
3417
3417
3418 formatted, pruned = minirst.format(text, textwidth, keep=keep)
3418 formatted, pruned = minirst.format(text, textwidth, keep=keep)
3419 if 'verbose' in pruned:
3419 if 'verbose' in pruned:
3420 keep.append('omitted')
3420 keep.append('omitted')
3421 else:
3421 else:
3422 keep.append('notomitted')
3422 keep.append('notomitted')
3423 formatted, pruned = minirst.format(text, textwidth, keep=keep)
3423 formatted, pruned = minirst.format(text, textwidth, keep=keep)
3424 ui.write(formatted)
3424 ui.write(formatted)
3425
3425
3426
3426
3427 @command('identify|id',
3427 @command('identify|id',
3428 [('r', 'rev', '',
3428 [('r', 'rev', '',
3429 _('identify the specified revision'), _('REV')),
3429 _('identify the specified revision'), _('REV')),
3430 ('n', 'num', None, _('show local revision number')),
3430 ('n', 'num', None, _('show local revision number')),
3431 ('i', 'id', None, _('show global revision id')),
3431 ('i', 'id', None, _('show global revision id')),
3432 ('b', 'branch', None, _('show branch')),
3432 ('b', 'branch', None, _('show branch')),
3433 ('t', 'tags', None, _('show tags')),
3433 ('t', 'tags', None, _('show tags')),
3434 ('B', 'bookmarks', None, _('show bookmarks')),
3434 ('B', 'bookmarks', None, _('show bookmarks')),
3435 ] + remoteopts,
3435 ] + remoteopts,
3436 _('[-nibtB] [-r REV] [SOURCE]'))
3436 _('[-nibtB] [-r REV] [SOURCE]'))
3437 def identify(ui, repo, source=None, rev=None,
3437 def identify(ui, repo, source=None, rev=None,
3438 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
3438 num=None, id=None, branch=None, tags=None, bookmarks=None, **opts):
3439 """identify the working copy or specified revision
3439 """identify the working copy or specified revision
3440
3440
3441 Print a summary identifying the repository state at REV using one or
3441 Print a summary identifying the repository state at REV using one or
3442 two parent hash identifiers, followed by a "+" if the working
3442 two parent hash identifiers, followed by a "+" if the working
3443 directory has uncommitted changes, the branch name (if not default),
3443 directory has uncommitted changes, the branch name (if not default),
3444 a list of tags, and a list of bookmarks.
3444 a list of tags, and a list of bookmarks.
3445
3445
3446 When REV is not given, print a summary of the current state of the
3446 When REV is not given, print a summary of the current state of the
3447 repository.
3447 repository.
3448
3448
3449 Specifying a path to a repository root or Mercurial bundle will
3449 Specifying a path to a repository root or Mercurial bundle will
3450 cause lookup to operate on that repository/bundle.
3450 cause lookup to operate on that repository/bundle.
3451
3451
3452 .. container:: verbose
3452 .. container:: verbose
3453
3453
3454 Examples:
3454 Examples:
3455
3455
3456 - generate a build identifier for the working directory::
3456 - generate a build identifier for the working directory::
3457
3457
3458 hg id --id > build-id.dat
3458 hg id --id > build-id.dat
3459
3459
3460 - find the revision corresponding to a tag::
3460 - find the revision corresponding to a tag::
3461
3461
3462 hg id -n -r 1.3
3462 hg id -n -r 1.3
3463
3463
3464 - check the most recent revision of a remote repository::
3464 - check the most recent revision of a remote repository::
3465
3465
3466 hg id -r tip http://selenic.com/hg/
3466 hg id -r tip http://selenic.com/hg/
3467
3467
3468 Returns 0 if successful.
3468 Returns 0 if successful.
3469 """
3469 """
3470
3470
3471 if not repo and not source:
3471 if not repo and not source:
3472 raise util.Abort(_("there is no Mercurial repository here "
3472 raise util.Abort(_("there is no Mercurial repository here "
3473 "(.hg not found)"))
3473 "(.hg not found)"))
3474
3474
3475 hexfunc = ui.debugflag and hex or short
3475 hexfunc = ui.debugflag and hex or short
3476 default = not (num or id or branch or tags or bookmarks)
3476 default = not (num or id or branch or tags or bookmarks)
3477 output = []
3477 output = []
3478 revs = []
3478 revs = []
3479
3479
3480 if source:
3480 if source:
3481 source, branches = hg.parseurl(ui.expandpath(source))
3481 source, branches = hg.parseurl(ui.expandpath(source))
3482 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3482 peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo
3483 repo = peer.local()
3483 repo = peer.local()
3484 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3484 revs, checkout = hg.addbranchrevs(repo, peer, branches, None)
3485
3485
3486 if not repo:
3486 if not repo:
3487 if num or branch or tags:
3487 if num or branch or tags:
3488 raise util.Abort(
3488 raise util.Abort(
3489 _("can't query remote revision number, branch, or tags"))
3489 _("can't query remote revision number, branch, or tags"))
3490 if not rev and revs:
3490 if not rev and revs:
3491 rev = revs[0]
3491 rev = revs[0]
3492 if not rev:
3492 if not rev:
3493 rev = "tip"
3493 rev = "tip"
3494
3494
3495 remoterev = peer.lookup(rev)
3495 remoterev = peer.lookup(rev)
3496 if default or id:
3496 if default or id:
3497 output = [hexfunc(remoterev)]
3497 output = [hexfunc(remoterev)]
3498
3498
3499 def getbms():
3499 def getbms():
3500 bms = []
3500 bms = []
3501
3501
3502 if 'bookmarks' in peer.listkeys('namespaces'):
3502 if 'bookmarks' in peer.listkeys('namespaces'):
3503 hexremoterev = hex(remoterev)
3503 hexremoterev = hex(remoterev)
3504 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
3504 bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems()
3505 if bmr == hexremoterev]
3505 if bmr == hexremoterev]
3506
3506
3507 return sorted(bms)
3507 return sorted(bms)
3508
3508
3509 if bookmarks:
3509 if bookmarks:
3510 output.extend(getbms())
3510 output.extend(getbms())
3511 elif default and not ui.quiet:
3511 elif default and not ui.quiet:
3512 # multiple bookmarks for a single parent separated by '/'
3512 # multiple bookmarks for a single parent separated by '/'
3513 bm = '/'.join(getbms())
3513 bm = '/'.join(getbms())
3514 if bm:
3514 if bm:
3515 output.append(bm)
3515 output.append(bm)
3516 else:
3516 else:
3517 if not rev:
3517 if not rev:
3518 ctx = repo[None]
3518 ctx = repo[None]
3519 parents = ctx.parents()
3519 parents = ctx.parents()
3520 changed = ""
3520 changed = ""
3521 if default or id or num:
3521 if default or id or num:
3522 if (util.any(repo.status())
3522 if (util.any(repo.status())
3523 or util.any(ctx.sub(s).dirty() for s in ctx.substate)):
3523 or util.any(ctx.sub(s).dirty() for s in ctx.substate)):
3524 changed = '+'
3524 changed = '+'
3525 if default or id:
3525 if default or id:
3526 output = ["%s%s" %
3526 output = ["%s%s" %
3527 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
3527 ('+'.join([hexfunc(p.node()) for p in parents]), changed)]
3528 if num:
3528 if num:
3529 output.append("%s%s" %
3529 output.append("%s%s" %
3530 ('+'.join([str(p.rev()) for p in parents]), changed))
3530 ('+'.join([str(p.rev()) for p in parents]), changed))
3531 else:
3531 else:
3532 ctx = scmutil.revsingle(repo, rev)
3532 ctx = scmutil.revsingle(repo, rev)
3533 if default or id:
3533 if default or id:
3534 output = [hexfunc(ctx.node())]
3534 output = [hexfunc(ctx.node())]
3535 if num:
3535 if num:
3536 output.append(str(ctx.rev()))
3536 output.append(str(ctx.rev()))
3537
3537
3538 if default and not ui.quiet:
3538 if default and not ui.quiet:
3539 b = ctx.branch()
3539 b = ctx.branch()
3540 if b != 'default':
3540 if b != 'default':
3541 output.append("(%s)" % b)
3541 output.append("(%s)" % b)
3542
3542
3543 # multiple tags for a single parent separated by '/'
3543 # multiple tags for a single parent separated by '/'
3544 t = '/'.join(ctx.tags())
3544 t = '/'.join(ctx.tags())
3545 if t:
3545 if t:
3546 output.append(t)
3546 output.append(t)
3547
3547
3548 # multiple bookmarks for a single parent separated by '/'
3548 # multiple bookmarks for a single parent separated by '/'
3549 bm = '/'.join(ctx.bookmarks())
3549 bm = '/'.join(ctx.bookmarks())
3550 if bm:
3550 if bm:
3551 output.append(bm)
3551 output.append(bm)
3552 else:
3552 else:
3553 if branch:
3553 if branch:
3554 output.append(ctx.branch())
3554 output.append(ctx.branch())
3555
3555
3556 if tags:
3556 if tags:
3557 output.extend(ctx.tags())
3557 output.extend(ctx.tags())
3558
3558
3559 if bookmarks:
3559 if bookmarks:
3560 output.extend(ctx.bookmarks())
3560 output.extend(ctx.bookmarks())
3561
3561
3562 ui.write("%s\n" % ' '.join(output))
3562 ui.write("%s\n" % ' '.join(output))
3563
3563
3564 @command('import|patch',
3564 @command('import|patch',
3565 [('p', 'strip', 1,
3565 [('p', 'strip', 1,
3566 _('directory strip option for patch. This has the same '
3566 _('directory strip option for patch. This has the same '
3567 'meaning as the corresponding patch option'), _('NUM')),
3567 'meaning as the corresponding patch option'), _('NUM')),
3568 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
3568 ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')),
3569 ('e', 'edit', False, _('invoke editor on commit messages')),
3569 ('e', 'edit', False, _('invoke editor on commit messages')),
3570 ('f', 'force', None,
3570 ('f', 'force', None,
3571 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
3571 _('skip check for outstanding uncommitted changes (DEPRECATED)')),
3572 ('', 'no-commit', None,
3572 ('', 'no-commit', None,
3573 _("don't commit, just update the working directory")),
3573 _("don't commit, just update the working directory")),
3574 ('', 'bypass', None,
3574 ('', 'bypass', None,
3575 _("apply patch without touching the working directory")),
3575 _("apply patch without touching the working directory")),
3576 ('', 'exact', None,
3576 ('', 'exact', None,
3577 _('apply patch to the nodes from which it was generated')),
3577 _('apply patch to the nodes from which it was generated')),
3578 ('', 'import-branch', None,
3578 ('', 'import-branch', None,
3579 _('use any branch information in patch (implied by --exact)'))] +
3579 _('use any branch information in patch (implied by --exact)'))] +
3580 commitopts + commitopts2 + similarityopts,
3580 commitopts + commitopts2 + similarityopts,
3581 _('[OPTION]... PATCH...'))
3581 _('[OPTION]... PATCH...'))
3582 def import_(ui, repo, patch1=None, *patches, **opts):
3582 def import_(ui, repo, patch1=None, *patches, **opts):
3583 """import an ordered set of patches
3583 """import an ordered set of patches
3584
3584
3585 Import a list of patches and commit them individually (unless
3585 Import a list of patches and commit them individually (unless
3586 --no-commit is specified).
3586 --no-commit is specified).
3587
3587
3588 Because import first applies changes to the working directory,
3588 Because import first applies changes to the working directory,
3589 import will abort if there are outstanding changes.
3589 import will abort if there are outstanding changes.
3590
3590
3591 You can import a patch straight from a mail message. Even patches
3591 You can import a patch straight from a mail message. Even patches
3592 as attachments work (to use the body part, it must have type
3592 as attachments work (to use the body part, it must have type
3593 text/plain or text/x-patch). From and Subject headers of email
3593 text/plain or text/x-patch). From and Subject headers of email
3594 message are used as default committer and commit message. All
3594 message are used as default committer and commit message. All
3595 text/plain body parts before first diff are added to commit
3595 text/plain body parts before first diff are added to commit
3596 message.
3596 message.
3597
3597
3598 If the imported patch was generated by :hg:`export`, user and
3598 If the imported patch was generated by :hg:`export`, user and
3599 description from patch override values from message headers and
3599 description from patch override values from message headers and
3600 body. Values given on command line with -m/--message and -u/--user
3600 body. Values given on command line with -m/--message and -u/--user
3601 override these.
3601 override these.
3602
3602
3603 If --exact is specified, import will set the working directory to
3603 If --exact is specified, import will set the working directory to
3604 the parent of each patch before applying it, and will abort if the
3604 the parent of each patch before applying it, and will abort if the
3605 resulting changeset has a different ID than the one recorded in
3605 resulting changeset has a different ID than the one recorded in
3606 the patch. This may happen due to character set problems or other
3606 the patch. This may happen due to character set problems or other
3607 deficiencies in the text patch format.
3607 deficiencies in the text patch format.
3608
3608
3609 Use --bypass to apply and commit patches directly to the
3609 Use --bypass to apply and commit patches directly to the
3610 repository, not touching the working directory. Without --exact,
3610 repository, not touching the working directory. Without --exact,
3611 patches will be applied on top of the working directory parent
3611 patches will be applied on top of the working directory parent
3612 revision.
3612 revision.
3613
3613
3614 With -s/--similarity, hg will attempt to discover renames and
3614 With -s/--similarity, hg will attempt to discover renames and
3615 copies in the patch in the same way as :hg:`addremove`.
3615 copies in the patch in the same way as :hg:`addremove`.
3616
3616
3617 To read a patch from standard input, use "-" as the patch name. If
3617 To read a patch from standard input, use "-" as the patch name. If
3618 a URL is specified, the patch will be downloaded from it.
3618 a URL is specified, the patch will be downloaded from it.
3619 See :hg:`help dates` for a list of formats valid for -d/--date.
3619 See :hg:`help dates` for a list of formats valid for -d/--date.
3620
3620
3621 .. container:: verbose
3621 .. container:: verbose
3622
3622
3623 Examples:
3623 Examples:
3624
3624
3625 - import a traditional patch from a website and detect renames::
3625 - import a traditional patch from a website and detect renames::
3626
3626
3627 hg import -s 80 http://example.com/bugfix.patch
3627 hg import -s 80 http://example.com/bugfix.patch
3628
3628
3629 - import a changeset from an hgweb server::
3629 - import a changeset from an hgweb server::
3630
3630
3631 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
3631 hg import http://www.selenic.com/hg/rev/5ca8c111e9aa
3632
3632
3633 - import all the patches in an Unix-style mbox::
3633 - import all the patches in an Unix-style mbox::
3634
3634
3635 hg import incoming-patches.mbox
3635 hg import incoming-patches.mbox
3636
3636
3637 - attempt to exactly restore an exported changeset (not always
3637 - attempt to exactly restore an exported changeset (not always
3638 possible)::
3638 possible)::
3639
3639
3640 hg import --exact proposed-fix.patch
3640 hg import --exact proposed-fix.patch
3641
3641
3642 Returns 0 on success.
3642 Returns 0 on success.
3643 """
3643 """
3644
3644
3645 if not patch1:
3645 if not patch1:
3646 raise util.Abort(_('need at least one patch to import'))
3646 raise util.Abort(_('need at least one patch to import'))
3647
3647
3648 patches = (patch1,) + patches
3648 patches = (patch1,) + patches
3649
3649
3650 date = opts.get('date')
3650 date = opts.get('date')
3651 if date:
3651 if date:
3652 opts['date'] = util.parsedate(date)
3652 opts['date'] = util.parsedate(date)
3653
3653
3654 editor = cmdutil.commiteditor
3654 editor = cmdutil.commiteditor
3655 if opts.get('edit'):
3655 if opts.get('edit'):
3656 editor = cmdutil.commitforceeditor
3656 editor = cmdutil.commitforceeditor
3657
3657
3658 update = not opts.get('bypass')
3658 update = not opts.get('bypass')
3659 if not update and opts.get('no_commit'):
3659 if not update and opts.get('no_commit'):
3660 raise util.Abort(_('cannot use --no-commit with --bypass'))
3660 raise util.Abort(_('cannot use --no-commit with --bypass'))
3661 try:
3661 try:
3662 sim = float(opts.get('similarity') or 0)
3662 sim = float(opts.get('similarity') or 0)
3663 except ValueError:
3663 except ValueError:
3664 raise util.Abort(_('similarity must be a number'))
3664 raise util.Abort(_('similarity must be a number'))
3665 if sim < 0 or sim > 100:
3665 if sim < 0 or sim > 100:
3666 raise util.Abort(_('similarity must be between 0 and 100'))
3666 raise util.Abort(_('similarity must be between 0 and 100'))
3667 if sim and not update:
3667 if sim and not update:
3668 raise util.Abort(_('cannot use --similarity with --bypass'))
3668 raise util.Abort(_('cannot use --similarity with --bypass'))
3669
3669
3670 if update:
3670 if update:
3671 cmdutil.checkunfinished(repo)
3671 cmdutil.checkunfinished(repo)
3672 if (opts.get('exact') or not opts.get('force')) and update:
3672 if (opts.get('exact') or not opts.get('force')) and update:
3673 cmdutil.bailifchanged(repo)
3673 cmdutil.bailifchanged(repo)
3674
3674
3675 base = opts["base"]
3675 base = opts["base"]
3676 strip = opts["strip"]
3676 strip = opts["strip"]
3677 wlock = lock = tr = None
3677 wlock = lock = tr = None
3678 msgs = []
3678 msgs = []
3679
3679
3680 def tryone(ui, hunk, parents):
3680 def tryone(ui, hunk, parents):
3681 tmpname, message, user, date, branch, nodeid, p1, p2 = \
3681 tmpname, message, user, date, branch, nodeid, p1, p2 = \
3682 patch.extract(ui, hunk)
3682 patch.extract(ui, hunk)
3683
3683
3684 if not tmpname:
3684 if not tmpname:
3685 return (None, None)
3685 return (None, None)
3686 msg = _('applied to working directory')
3686 msg = _('applied to working directory')
3687
3687
3688 try:
3688 try:
3689 cmdline_message = cmdutil.logmessage(ui, opts)
3689 cmdline_message = cmdutil.logmessage(ui, opts)
3690 if cmdline_message:
3690 if cmdline_message:
3691 # pickup the cmdline msg
3691 # pickup the cmdline msg
3692 message = cmdline_message
3692 message = cmdline_message
3693 elif message:
3693 elif message:
3694 # pickup the patch msg
3694 # pickup the patch msg
3695 message = message.strip()
3695 message = message.strip()
3696 else:
3696 else:
3697 # launch the editor
3697 # launch the editor
3698 message = None
3698 message = None
3699 ui.debug('message:\n%s\n' % message)
3699 ui.debug('message:\n%s\n' % message)
3700
3700
3701 if len(parents) == 1:
3701 if len(parents) == 1:
3702 parents.append(repo[nullid])
3702 parents.append(repo[nullid])
3703 if opts.get('exact'):
3703 if opts.get('exact'):
3704 if not nodeid or not p1:
3704 if not nodeid or not p1:
3705 raise util.Abort(_('not a Mercurial patch'))
3705 raise util.Abort(_('not a Mercurial patch'))
3706 p1 = repo[p1]
3706 p1 = repo[p1]
3707 p2 = repo[p2 or nullid]
3707 p2 = repo[p2 or nullid]
3708 elif p2:
3708 elif p2:
3709 try:
3709 try:
3710 p1 = repo[p1]
3710 p1 = repo[p1]
3711 p2 = repo[p2]
3711 p2 = repo[p2]
3712 # Without any options, consider p2 only if the
3712 # Without any options, consider p2 only if the
3713 # patch is being applied on top of the recorded
3713 # patch is being applied on top of the recorded
3714 # first parent.
3714 # first parent.
3715 if p1 != parents[0]:
3715 if p1 != parents[0]:
3716 p1 = parents[0]
3716 p1 = parents[0]
3717 p2 = repo[nullid]
3717 p2 = repo[nullid]
3718 except error.RepoError:
3718 except error.RepoError:
3719 p1, p2 = parents
3719 p1, p2 = parents
3720 else:
3720 else:
3721 p1, p2 = parents
3721 p1, p2 = parents
3722
3722
3723 n = None
3723 n = None
3724 if update:
3724 if update:
3725 if p1 != parents[0]:
3725 if p1 != parents[0]:
3726 hg.clean(repo, p1.node())
3726 hg.clean(repo, p1.node())
3727 if p2 != parents[1]:
3727 if p2 != parents[1]:
3728 repo.setparents(p1.node(), p2.node())
3728 repo.setparents(p1.node(), p2.node())
3729
3729
3730 if opts.get('exact') or opts.get('import_branch'):
3730 if opts.get('exact') or opts.get('import_branch'):
3731 repo.dirstate.setbranch(branch or 'default')
3731 repo.dirstate.setbranch(branch or 'default')
3732
3732
3733 files = set()
3733 files = set()
3734 patch.patch(ui, repo, tmpname, strip=strip, files=files,
3734 patch.patch(ui, repo, tmpname, strip=strip, files=files,
3735 eolmode=None, similarity=sim / 100.0)
3735 eolmode=None, similarity=sim / 100.0)
3736 files = list(files)
3736 files = list(files)
3737 if opts.get('no_commit'):
3737 if opts.get('no_commit'):
3738 if message:
3738 if message:
3739 msgs.append(message)
3739 msgs.append(message)
3740 else:
3740 else:
3741 if opts.get('exact') or p2:
3741 if opts.get('exact') or p2:
3742 # If you got here, you either use --force and know what
3742 # If you got here, you either use --force and know what
3743 # you are doing or used --exact or a merge patch while
3743 # you are doing or used --exact or a merge patch while
3744 # being updated to its first parent.
3744 # being updated to its first parent.
3745 m = None
3745 m = None
3746 else:
3746 else:
3747 m = scmutil.matchfiles(repo, files or [])
3747 m = scmutil.matchfiles(repo, files or [])
3748 n = repo.commit(message, opts.get('user') or user,
3748 n = repo.commit(message, opts.get('user') or user,
3749 opts.get('date') or date, match=m,
3749 opts.get('date') or date, match=m,
3750 editor=editor)
3750 editor=editor)
3751 else:
3751 else:
3752 if opts.get('exact') or opts.get('import_branch'):
3752 if opts.get('exact') or opts.get('import_branch'):
3753 branch = branch or 'default'
3753 branch = branch or 'default'
3754 else:
3754 else:
3755 branch = p1.branch()
3755 branch = p1.branch()
3756 store = patch.filestore()
3756 store = patch.filestore()
3757 try:
3757 try:
3758 files = set()
3758 files = set()
3759 try:
3759 try:
3760 patch.patchrepo(ui, repo, p1, store, tmpname, strip,
3760 patch.patchrepo(ui, repo, p1, store, tmpname, strip,
3761 files, eolmode=None)
3761 files, eolmode=None)
3762 except patch.PatchError, e:
3762 except patch.PatchError, e:
3763 raise util.Abort(str(e))
3763 raise util.Abort(str(e))
3764 memctx = context.makememctx(repo, (p1.node(), p2.node()),
3764 memctx = context.makememctx(repo, (p1.node(), p2.node()),
3765 message,
3765 message,
3766 opts.get('user') or user,
3766 opts.get('user') or user,
3767 opts.get('date') or date,
3767 opts.get('date') or date,
3768 branch, files, store,
3768 branch, files, store,
3769 editor=cmdutil.commiteditor)
3769 editor=cmdutil.commiteditor)
3770 repo.savecommitmessage(memctx.description())
3770 repo.savecommitmessage(memctx.description())
3771 n = memctx.commit()
3771 n = memctx.commit()
3772 finally:
3772 finally:
3773 store.close()
3773 store.close()
3774 if opts.get('exact') and hex(n) != nodeid:
3774 if opts.get('exact') and hex(n) != nodeid:
3775 raise util.Abort(_('patch is damaged or loses information'))
3775 raise util.Abort(_('patch is damaged or loses information'))
3776 if n:
3776 if n:
3777 # i18n: refers to a short changeset id
3777 # i18n: refers to a short changeset id
3778 msg = _('created %s') % short(n)
3778 msg = _('created %s') % short(n)
3779 return (msg, n)
3779 return (msg, n)
3780 finally:
3780 finally:
3781 os.unlink(tmpname)
3781 os.unlink(tmpname)
3782
3782
3783 try:
3783 try:
3784 try:
3784 try:
3785 wlock = repo.wlock()
3785 wlock = repo.wlock()
3786 if not opts.get('no_commit'):
3786 if not opts.get('no_commit'):
3787 lock = repo.lock()
3787 lock = repo.lock()
3788 tr = repo.transaction('import')
3788 tr = repo.transaction('import')
3789 parents = repo.parents()
3789 parents = repo.parents()
3790 for patchurl in patches:
3790 for patchurl in patches:
3791 if patchurl == '-':
3791 if patchurl == '-':
3792 ui.status(_('applying patch from stdin\n'))
3792 ui.status(_('applying patch from stdin\n'))
3793 patchfile = ui.fin
3793 patchfile = ui.fin
3794 patchurl = 'stdin' # for error message
3794 patchurl = 'stdin' # for error message
3795 else:
3795 else:
3796 patchurl = os.path.join(base, patchurl)
3796 patchurl = os.path.join(base, patchurl)
3797 ui.status(_('applying %s\n') % patchurl)
3797 ui.status(_('applying %s\n') % patchurl)
3798 patchfile = hg.openpath(ui, patchurl)
3798 patchfile = hg.openpath(ui, patchurl)
3799
3799
3800 haspatch = False
3800 haspatch = False
3801 for hunk in patch.split(patchfile):
3801 for hunk in patch.split(patchfile):
3802 (msg, node) = tryone(ui, hunk, parents)
3802 (msg, node) = tryone(ui, hunk, parents)
3803 if msg:
3803 if msg:
3804 haspatch = True
3804 haspatch = True
3805 ui.note(msg + '\n')
3805 ui.note(msg + '\n')
3806 if update or opts.get('exact'):
3806 if update or opts.get('exact'):
3807 parents = repo.parents()
3807 parents = repo.parents()
3808 else:
3808 else:
3809 parents = [repo[node]]
3809 parents = [repo[node]]
3810
3810
3811 if not haspatch:
3811 if not haspatch:
3812 raise util.Abort(_('%s: no diffs found') % patchurl)
3812 raise util.Abort(_('%s: no diffs found') % patchurl)
3813
3813
3814 if tr:
3814 if tr:
3815 tr.close()
3815 tr.close()
3816 if msgs:
3816 if msgs:
3817 repo.savecommitmessage('\n* * *\n'.join(msgs))
3817 repo.savecommitmessage('\n* * *\n'.join(msgs))
3818 except: # re-raises
3818 except: # re-raises
3819 # wlock.release() indirectly calls dirstate.write(): since
3819 # wlock.release() indirectly calls dirstate.write(): since
3820 # we're crashing, we do not want to change the working dir
3820 # we're crashing, we do not want to change the working dir
3821 # parent after all, so make sure it writes nothing
3821 # parent after all, so make sure it writes nothing
3822 repo.dirstate.invalidate()
3822 repo.dirstate.invalidate()
3823 raise
3823 raise
3824 finally:
3824 finally:
3825 if tr:
3825 if tr:
3826 tr.release()
3826 tr.release()
3827 release(lock, wlock)
3827 release(lock, wlock)
3828
3828
3829 @command('incoming|in',
3829 @command('incoming|in',
3830 [('f', 'force', None,
3830 [('f', 'force', None,
3831 _('run even if remote repository is unrelated')),
3831 _('run even if remote repository is unrelated')),
3832 ('n', 'newest-first', None, _('show newest record first')),
3832 ('n', 'newest-first', None, _('show newest record first')),
3833 ('', 'bundle', '',
3833 ('', 'bundle', '',
3834 _('file to store the bundles into'), _('FILE')),
3834 _('file to store the bundles into'), _('FILE')),
3835 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3835 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
3836 ('B', 'bookmarks', False, _("compare bookmarks")),
3836 ('B', 'bookmarks', False, _("compare bookmarks")),
3837 ('b', 'branch', [],
3837 ('b', 'branch', [],
3838 _('a specific branch you would like to pull'), _('BRANCH')),
3838 _('a specific branch you would like to pull'), _('BRANCH')),
3839 ] + logopts + remoteopts + subrepoopts,
3839 ] + logopts + remoteopts + subrepoopts,
3840 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3840 _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]'))
3841 def incoming(ui, repo, source="default", **opts):
3841 def incoming(ui, repo, source="default", **opts):
3842 """show new changesets found in source
3842 """show new changesets found in source
3843
3843
3844 Show new changesets found in the specified path/URL or the default
3844 Show new changesets found in the specified path/URL or the default
3845 pull location. These are the changesets that would have been pulled
3845 pull location. These are the changesets that would have been pulled
3846 if a pull at the time you issued this command.
3846 if a pull at the time you issued this command.
3847
3847
3848 For remote repository, using --bundle avoids downloading the
3848 For remote repository, using --bundle avoids downloading the
3849 changesets twice if the incoming is followed by a pull.
3849 changesets twice if the incoming is followed by a pull.
3850
3850
3851 See pull for valid source format details.
3851 See pull for valid source format details.
3852
3852
3853 Returns 0 if there are incoming changes, 1 otherwise.
3853 Returns 0 if there are incoming changes, 1 otherwise.
3854 """
3854 """
3855 if opts.get('graph'):
3855 if opts.get('graph'):
3856 cmdutil.checkunsupportedgraphflags([], opts)
3856 cmdutil.checkunsupportedgraphflags([], opts)
3857 def display(other, chlist, displayer):
3857 def display(other, chlist, displayer):
3858 revdag = cmdutil.graphrevs(other, chlist, opts)
3858 revdag = cmdutil.graphrevs(other, chlist, opts)
3859 showparents = [ctx.node() for ctx in repo[None].parents()]
3859 showparents = [ctx.node() for ctx in repo[None].parents()]
3860 cmdutil.displaygraph(ui, revdag, displayer, showparents,
3860 cmdutil.displaygraph(ui, revdag, displayer, showparents,
3861 graphmod.asciiedges)
3861 graphmod.asciiedges)
3862
3862
3863 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3863 hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True)
3864 return 0
3864 return 0
3865
3865
3866 if opts.get('bundle') and opts.get('subrepos'):
3866 if opts.get('bundle') and opts.get('subrepos'):
3867 raise util.Abort(_('cannot combine --bundle and --subrepos'))
3867 raise util.Abort(_('cannot combine --bundle and --subrepos'))
3868
3868
3869 if opts.get('bookmarks'):
3869 if opts.get('bookmarks'):
3870 source, branches = hg.parseurl(ui.expandpath(source),
3870 source, branches = hg.parseurl(ui.expandpath(source),
3871 opts.get('branch'))
3871 opts.get('branch'))
3872 other = hg.peer(repo, opts, source)
3872 other = hg.peer(repo, opts, source)
3873 if 'bookmarks' not in other.listkeys('namespaces'):
3873 if 'bookmarks' not in other.listkeys('namespaces'):
3874 ui.warn(_("remote doesn't support bookmarks\n"))
3874 ui.warn(_("remote doesn't support bookmarks\n"))
3875 return 0
3875 return 0
3876 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3876 ui.status(_('comparing with %s\n') % util.hidepassword(source))
3877 return bookmarks.diff(ui, repo, other)
3877 return bookmarks.diff(ui, repo, other)
3878
3878
3879 repo._subtoppath = ui.expandpath(source)
3879 repo._subtoppath = ui.expandpath(source)
3880 try:
3880 try:
3881 return hg.incoming(ui, repo, source, opts)
3881 return hg.incoming(ui, repo, source, opts)
3882 finally:
3882 finally:
3883 del repo._subtoppath
3883 del repo._subtoppath
3884
3884
3885
3885
3886 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'))
3886 @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'))
3887 def init(ui, dest=".", **opts):
3887 def init(ui, dest=".", **opts):
3888 """create a new repository in the given directory
3888 """create a new repository in the given directory
3889
3889
3890 Initialize a new repository in the given directory. If the given
3890 Initialize a new repository in the given directory. If the given
3891 directory does not exist, it will be created.
3891 directory does not exist, it will be created.
3892
3892
3893 If no directory is given, the current directory is used.
3893 If no directory is given, the current directory is used.
3894
3894
3895 It is possible to specify an ``ssh://`` URL as the destination.
3895 It is possible to specify an ``ssh://`` URL as the destination.
3896 See :hg:`help urls` for more information.
3896 See :hg:`help urls` for more information.
3897
3897
3898 Returns 0 on success.
3898 Returns 0 on success.
3899 """
3899 """
3900 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3900 hg.peer(ui, opts, ui.expandpath(dest), create=True)
3901
3901
3902 @command('locate',
3902 @command('locate',
3903 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3903 [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')),
3904 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3904 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
3905 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3905 ('f', 'fullpath', None, _('print complete paths from the filesystem root')),
3906 ] + walkopts,
3906 ] + walkopts,
3907 _('[OPTION]... [PATTERN]...'))
3907 _('[OPTION]... [PATTERN]...'))
3908 def locate(ui, repo, *pats, **opts):
3908 def locate(ui, repo, *pats, **opts):
3909 """locate files matching specific patterns
3909 """locate files matching specific patterns
3910
3910
3911 Print files under Mercurial control in the working directory whose
3911 Print files under Mercurial control in the working directory whose
3912 names match the given patterns.
3912 names match the given patterns.
3913
3913
3914 By default, this command searches all directories in the working
3914 By default, this command searches all directories in the working
3915 directory. To search just the current directory and its
3915 directory. To search just the current directory and its
3916 subdirectories, use "--include .".
3916 subdirectories, use "--include .".
3917
3917
3918 If no patterns are given to match, this command prints the names
3918 If no patterns are given to match, this command prints the names
3919 of all files under Mercurial control in the working directory.
3919 of all files under Mercurial control in the working directory.
3920
3920
3921 If you want to feed the output of this command into the "xargs"
3921 If you want to feed the output of this command into the "xargs"
3922 command, use the -0 option to both this command and "xargs". This
3922 command, use the -0 option to both this command and "xargs". This
3923 will avoid the problem of "xargs" treating single filenames that
3923 will avoid the problem of "xargs" treating single filenames that
3924 contain whitespace as multiple filenames.
3924 contain whitespace as multiple filenames.
3925
3925
3926 Returns 0 if a match is found, 1 otherwise.
3926 Returns 0 if a match is found, 1 otherwise.
3927 """
3927 """
3928 end = opts.get('print0') and '\0' or '\n'
3928 end = opts.get('print0') and '\0' or '\n'
3929 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3929 rev = scmutil.revsingle(repo, opts.get('rev'), None).node()
3930
3930
3931 ret = 1
3931 ret = 1
3932 m = scmutil.match(repo[rev], pats, opts, default='relglob')
3932 m = scmutil.match(repo[rev], pats, opts, default='relglob')
3933 m.bad = lambda x, y: False
3933 m.bad = lambda x, y: False
3934 for abs in repo[rev].walk(m):
3934 for abs in repo[rev].walk(m):
3935 if not rev and abs not in repo.dirstate:
3935 if not rev and abs not in repo.dirstate:
3936 continue
3936 continue
3937 if opts.get('fullpath'):
3937 if opts.get('fullpath'):
3938 ui.write(repo.wjoin(abs), end)
3938 ui.write(repo.wjoin(abs), end)
3939 else:
3939 else:
3940 ui.write(((pats and m.rel(abs)) or abs), end)
3940 ui.write(((pats and m.rel(abs)) or abs), end)
3941 ret = 0
3941 ret = 0
3942
3942
3943 return ret
3943 return ret
3944
3944
3945 @command('^log|history',
3945 @command('^log|history',
3946 [('f', 'follow', None,
3946 [('f', 'follow', None,
3947 _('follow changeset history, or file history across copies and renames')),
3947 _('follow changeset history, or file history across copies and renames')),
3948 ('', 'follow-first', None,
3948 ('', 'follow-first', None,
3949 _('only follow the first parent of merge changesets (DEPRECATED)')),
3949 _('only follow the first parent of merge changesets (DEPRECATED)')),
3950 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3950 ('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
3951 ('C', 'copies', None, _('show copied files')),
3951 ('C', 'copies', None, _('show copied files')),
3952 ('k', 'keyword', [],
3952 ('k', 'keyword', [],
3953 _('do case-insensitive search for a given text'), _('TEXT')),
3953 _('do case-insensitive search for a given text'), _('TEXT')),
3954 ('r', 'rev', [], _('show the specified revision or range'), _('REV')),
3954 ('r', 'rev', [], _('show the specified revision or range'), _('REV')),
3955 ('', 'removed', None, _('include revisions where files were removed')),
3955 ('', 'removed', None, _('include revisions where files were removed')),
3956 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3956 ('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
3957 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3957 ('u', 'user', [], _('revisions committed by user'), _('USER')),
3958 ('', 'only-branch', [],
3958 ('', 'only-branch', [],
3959 _('show only changesets within the given named branch (DEPRECATED)'),
3959 _('show only changesets within the given named branch (DEPRECATED)'),
3960 _('BRANCH')),
3960 _('BRANCH')),
3961 ('b', 'branch', [],
3961 ('b', 'branch', [],
3962 _('show changesets within the given named branch'), _('BRANCH')),
3962 _('show changesets within the given named branch'), _('BRANCH')),
3963 ('P', 'prune', [],
3963 ('P', 'prune', [],
3964 _('do not display revision or any of its ancestors'), _('REV')),
3964 _('do not display revision or any of its ancestors'), _('REV')),
3965 ] + logopts + walkopts,
3965 ] + logopts + walkopts,
3966 _('[OPTION]... [FILE]'))
3966 _('[OPTION]... [FILE]'))
3967 def log(ui, repo, *pats, **opts):
3967 def log(ui, repo, *pats, **opts):
3968 """show revision history of entire repository or files
3968 """show revision history of entire repository or files
3969
3969
3970 Print the revision history of the specified files or the entire
3970 Print the revision history of the specified files or the entire
3971 project.
3971 project.
3972
3972
3973 If no revision range is specified, the default is ``tip:0`` unless
3973 If no revision range is specified, the default is ``tip:0`` unless
3974 --follow is set, in which case the working directory parent is
3974 --follow is set, in which case the working directory parent is
3975 used as the starting revision.
3975 used as the starting revision.
3976
3976
3977 File history is shown without following rename or copy history of
3977 File history is shown without following rename or copy history of
3978 files. Use -f/--follow with a filename to follow history across
3978 files. Use -f/--follow with a filename to follow history across
3979 renames and copies. --follow without a filename will only show
3979 renames and copies. --follow without a filename will only show
3980 ancestors or descendants of the starting revision.
3980 ancestors or descendants of the starting revision.
3981
3981
3982 By default this command prints revision number and changeset id,
3982 By default this command prints revision number and changeset id,
3983 tags, non-trivial parents, user, date and time, and a summary for
3983 tags, non-trivial parents, user, date and time, and a summary for
3984 each commit. When the -v/--verbose switch is used, the list of
3984 each commit. When the -v/--verbose switch is used, the list of
3985 changed files and full commit message are shown.
3985 changed files and full commit message are shown.
3986
3986
3987 .. note::
3987 .. note::
3988
3988
3989 log -p/--patch may generate unexpected diff output for merge
3989 log -p/--patch may generate unexpected diff output for merge
3990 changesets, as it will only compare the merge changeset against
3990 changesets, as it will only compare the merge changeset against
3991 its first parent. Also, only files different from BOTH parents
3991 its first parent. Also, only files different from BOTH parents
3992 will appear in files:.
3992 will appear in files:.
3993
3993
3994 .. note::
3994 .. note::
3995
3995
3996 for performance reasons, log FILE may omit duplicate changes
3996 for performance reasons, log FILE may omit duplicate changes
3997 made on branches and will not show deletions. To see all
3997 made on branches and will not show deletions. To see all
3998 changes including duplicates and deletions, use the --removed
3998 changes including duplicates and deletions, use the --removed
3999 switch.
3999 switch.
4000
4000
4001 .. container:: verbose
4001 .. container:: verbose
4002
4002
4003 Some examples:
4003 Some examples:
4004
4004
4005 - changesets with full descriptions and file lists::
4005 - changesets with full descriptions and file lists::
4006
4006
4007 hg log -v
4007 hg log -v
4008
4008
4009 - changesets ancestral to the working directory::
4009 - changesets ancestral to the working directory::
4010
4010
4011 hg log -f
4011 hg log -f
4012
4012
4013 - last 10 commits on the current branch::
4013 - last 10 commits on the current branch::
4014
4014
4015 hg log -l 10 -b .
4015 hg log -l 10 -b .
4016
4016
4017 - changesets showing all modifications of a file, including removals::
4017 - changesets showing all modifications of a file, including removals::
4018
4018
4019 hg log --removed file.c
4019 hg log --removed file.c
4020
4020
4021 - all changesets that touch a directory, with diffs, excluding merges::
4021 - all changesets that touch a directory, with diffs, excluding merges::
4022
4022
4023 hg log -Mp lib/
4023 hg log -Mp lib/
4024
4024
4025 - all revision numbers that match a keyword::
4025 - all revision numbers that match a keyword::
4026
4026
4027 hg log -k bug --template "{rev}\\n"
4027 hg log -k bug --template "{rev}\\n"
4028
4028
4029 - check if a given changeset is included is a tagged release::
4029 - check if a given changeset is included is a tagged release::
4030
4030
4031 hg log -r "a21ccf and ancestor(1.9)"
4031 hg log -r "a21ccf and ancestor(1.9)"
4032
4032
4033 - find all changesets by some user in a date range::
4033 - find all changesets by some user in a date range::
4034
4034
4035 hg log -k alice -d "may 2008 to jul 2008"
4035 hg log -k alice -d "may 2008 to jul 2008"
4036
4036
4037 - summary of all changesets after the last tag::
4037 - summary of all changesets after the last tag::
4038
4038
4039 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4039 hg log -r "last(tagged())::" --template "{desc|firstline}\\n"
4040
4040
4041 See :hg:`help dates` for a list of formats valid for -d/--date.
4041 See :hg:`help dates` for a list of formats valid for -d/--date.
4042
4042
4043 See :hg:`help revisions` and :hg:`help revsets` for more about
4043 See :hg:`help revisions` and :hg:`help revsets` for more about
4044 specifying revisions.
4044 specifying revisions.
4045
4045
4046 See :hg:`help templates` for more about pre-packaged styles and
4046 See :hg:`help templates` for more about pre-packaged styles and
4047 specifying custom templates.
4047 specifying custom templates.
4048
4048
4049 Returns 0 on success.
4049 Returns 0 on success.
4050 """
4050 """
4051 if opts.get('graph'):
4051 if opts.get('graph'):
4052 return cmdutil.graphlog(ui, repo, *pats, **opts)
4052 return cmdutil.graphlog(ui, repo, *pats, **opts)
4053
4053
4054 matchfn = scmutil.match(repo[None], pats, opts)
4054 matchfn = scmutil.match(repo[None], pats, opts)
4055 limit = cmdutil.loglimit(opts)
4055 limit = cmdutil.loglimit(opts)
4056 count = 0
4056 count = 0
4057
4057
4058 getrenamed, endrev = None, None
4058 getrenamed, endrev = None, None
4059 if opts.get('copies'):
4059 if opts.get('copies'):
4060 if opts.get('rev'):
4060 if opts.get('rev'):
4061 endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1
4061 endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1
4062 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
4062 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
4063
4063
4064 df = False
4064 df = False
4065 if opts.get("date"):
4065 if opts.get("date"):
4066 df = util.matchdate(opts["date"])
4066 df = util.matchdate(opts["date"])
4067
4067
4068 branches = opts.get('branch', []) + opts.get('only_branch', [])
4068 branches = opts.get('branch', []) + opts.get('only_branch', [])
4069 opts['branch'] = [repo.lookupbranch(b) for b in branches]
4069 opts['branch'] = [repo.lookupbranch(b) for b in branches]
4070
4070
4071 displayer = cmdutil.show_changeset(ui, repo, opts, True)
4071 displayer = cmdutil.show_changeset(ui, repo, opts, True)
4072 def prep(ctx, fns):
4072 def prep(ctx, fns):
4073 rev = ctx.rev()
4073 rev = ctx.rev()
4074 parents = [p for p in repo.changelog.parentrevs(rev)
4074 parents = [p for p in repo.changelog.parentrevs(rev)
4075 if p != nullrev]
4075 if p != nullrev]
4076 if opts.get('no_merges') and len(parents) == 2:
4076 if opts.get('no_merges') and len(parents) == 2:
4077 return
4077 return
4078 if opts.get('only_merges') and len(parents) != 2:
4078 if opts.get('only_merges') and len(parents) != 2:
4079 return
4079 return
4080 if opts.get('branch') and ctx.branch() not in opts['branch']:
4080 if opts.get('branch') and ctx.branch() not in opts['branch']:
4081 return
4081 return
4082 if df and not df(ctx.date()[0]):
4082 if df and not df(ctx.date()[0]):
4083 return
4083 return
4084
4084
4085 lower = encoding.lower
4085 lower = encoding.lower
4086 if opts.get('user'):
4086 if opts.get('user'):
4087 luser = lower(ctx.user())
4087 luser = lower(ctx.user())
4088 for k in [lower(x) for x in opts['user']]:
4088 for k in [lower(x) for x in opts['user']]:
4089 if (k in luser):
4089 if (k in luser):
4090 break
4090 break
4091 else:
4091 else:
4092 return
4092 return
4093 if opts.get('keyword'):
4093 if opts.get('keyword'):
4094 luser = lower(ctx.user())
4094 luser = lower(ctx.user())
4095 ldesc = lower(ctx.description())
4095 ldesc = lower(ctx.description())
4096 lfiles = lower(" ".join(ctx.files()))
4096 lfiles = lower(" ".join(ctx.files()))
4097 for k in [lower(x) for x in opts['keyword']]:
4097 for k in [lower(x) for x in opts['keyword']]:
4098 if (k in luser or k in ldesc or k in lfiles):
4098 if (k in luser or k in ldesc or k in lfiles):
4099 break
4099 break
4100 else:
4100 else:
4101 return
4101 return
4102
4102
4103 copies = None
4103 copies = None
4104 if getrenamed is not None and rev:
4104 if getrenamed is not None and rev:
4105 copies = []
4105 copies = []
4106 for fn in ctx.files():
4106 for fn in ctx.files():
4107 rename = getrenamed(fn, rev)
4107 rename = getrenamed(fn, rev)
4108 if rename:
4108 if rename:
4109 copies.append((fn, rename[0]))
4109 copies.append((fn, rename[0]))
4110
4110
4111 revmatchfn = None
4111 revmatchfn = None
4112 if opts.get('patch') or opts.get('stat'):
4112 if opts.get('patch') or opts.get('stat'):
4113 if opts.get('follow') or opts.get('follow_first'):
4113 if opts.get('follow') or opts.get('follow_first'):
4114 # note: this might be wrong when following through merges
4114 # note: this might be wrong when following through merges
4115 revmatchfn = scmutil.match(repo[None], fns, default='path')
4115 revmatchfn = scmutil.match(repo[None], fns, default='path')
4116 else:
4116 else:
4117 revmatchfn = matchfn
4117 revmatchfn = matchfn
4118
4118
4119 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
4119 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
4120
4120
4121 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4121 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
4122 if displayer.flush(ctx.rev()):
4122 if displayer.flush(ctx.rev()):
4123 count += 1
4123 count += 1
4124 if count == limit:
4124 if count == limit:
4125 break
4125 break
4126 displayer.close()
4126 displayer.close()
4127
4127
4128 @command('manifest',
4128 @command('manifest',
4129 [('r', 'rev', '', _('revision to display'), _('REV')),
4129 [('r', 'rev', '', _('revision to display'), _('REV')),
4130 ('', 'all', False, _("list files from all revisions"))],
4130 ('', 'all', False, _("list files from all revisions"))],
4131 _('[-r REV]'))
4131 _('[-r REV]'))
4132 def manifest(ui, repo, node=None, rev=None, **opts):
4132 def manifest(ui, repo, node=None, rev=None, **opts):
4133 """output the current or given revision of the project manifest
4133 """output the current or given revision of the project manifest
4134
4134
4135 Print a list of version controlled files for the given revision.
4135 Print a list of version controlled files for the given revision.
4136 If no revision is given, the first parent of the working directory
4136 If no revision is given, the first parent of the working directory
4137 is used, or the null revision if no revision is checked out.
4137 is used, or the null revision if no revision is checked out.
4138
4138
4139 With -v, print file permissions, symlink and executable bits.
4139 With -v, print file permissions, symlink and executable bits.
4140 With --debug, print file revision hashes.
4140 With --debug, print file revision hashes.
4141
4141
4142 If option --all is specified, the list of all files from all revisions
4142 If option --all is specified, the list of all files from all revisions
4143 is printed. This includes deleted and renamed files.
4143 is printed. This includes deleted and renamed files.
4144
4144
4145 Returns 0 on success.
4145 Returns 0 on success.
4146 """
4146 """
4147
4147
4148 fm = ui.formatter('manifest', opts)
4148 fm = ui.formatter('manifest', opts)
4149
4149
4150 if opts.get('all'):
4150 if opts.get('all'):
4151 if rev or node:
4151 if rev or node:
4152 raise util.Abort(_("can't specify a revision with --all"))
4152 raise util.Abort(_("can't specify a revision with --all"))
4153
4153
4154 res = []
4154 res = []
4155 prefix = "data/"
4155 prefix = "data/"
4156 suffix = ".i"
4156 suffix = ".i"
4157 plen = len(prefix)
4157 plen = len(prefix)
4158 slen = len(suffix)
4158 slen = len(suffix)
4159 lock = repo.lock()
4159 lock = repo.lock()
4160 try:
4160 try:
4161 for fn, b, size in repo.store.datafiles():
4161 for fn, b, size in repo.store.datafiles():
4162 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
4162 if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix:
4163 res.append(fn[plen:-slen])
4163 res.append(fn[plen:-slen])
4164 finally:
4164 finally:
4165 lock.release()
4165 lock.release()
4166 for f in res:
4166 for f in res:
4167 fm.startitem()
4167 fm.startitem()
4168 fm.write("path", '%s\n', f)
4168 fm.write("path", '%s\n', f)
4169 fm.end()
4169 fm.end()
4170 return
4170 return
4171
4171
4172 if rev and node:
4172 if rev and node:
4173 raise util.Abort(_("please specify just one revision"))
4173 raise util.Abort(_("please specify just one revision"))
4174
4174
4175 if not node:
4175 if not node:
4176 node = rev
4176 node = rev
4177
4177
4178 char = {'l': '@', 'x': '*', '': ''}
4178 char = {'l': '@', 'x': '*', '': ''}
4179 mode = {'l': '644', 'x': '755', '': '644'}
4179 mode = {'l': '644', 'x': '755', '': '644'}
4180 ctx = scmutil.revsingle(repo, node)
4180 ctx = scmutil.revsingle(repo, node)
4181 mf = ctx.manifest()
4181 mf = ctx.manifest()
4182 for f in ctx:
4182 for f in ctx:
4183 fm.startitem()
4183 fm.startitem()
4184 fl = ctx[f].flags()
4184 fl = ctx[f].flags()
4185 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
4185 fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f]))
4186 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
4186 fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl])
4187 fm.write('path', '%s\n', f)
4187 fm.write('path', '%s\n', f)
4188 fm.end()
4188 fm.end()
4189
4189
4190 @command('^merge',
4190 @command('^merge',
4191 [('f', 'force', None,
4191 [('f', 'force', None,
4192 _('force a merge including outstanding changes (DEPRECATED)')),
4192 _('force a merge including outstanding changes (DEPRECATED)')),
4193 ('r', 'rev', '', _('revision to merge'), _('REV')),
4193 ('r', 'rev', '', _('revision to merge'), _('REV')),
4194 ('P', 'preview', None,
4194 ('P', 'preview', None,
4195 _('review revisions to merge (no merge is performed)'))
4195 _('review revisions to merge (no merge is performed)'))
4196 ] + mergetoolopts,
4196 ] + mergetoolopts,
4197 _('[-P] [-f] [[-r] REV]'))
4197 _('[-P] [-f] [[-r] REV]'))
4198 def merge(ui, repo, node=None, **opts):
4198 def merge(ui, repo, node=None, **opts):
4199 """merge working directory with another revision
4199 """merge working directory with another revision
4200
4200
4201 The current working directory is updated with all changes made in
4201 The current working directory is updated with all changes made in
4202 the requested revision since the last common predecessor revision.
4202 the requested revision since the last common predecessor revision.
4203
4203
4204 Files that changed between either parent are marked as changed for
4204 Files that changed between either parent are marked as changed for
4205 the next commit and a commit must be performed before any further
4205 the next commit and a commit must be performed before any further
4206 updates to the repository are allowed. The next commit will have
4206 updates to the repository are allowed. The next commit will have
4207 two parents.
4207 two parents.
4208
4208
4209 ``--tool`` can be used to specify the merge tool used for file
4209 ``--tool`` can be used to specify the merge tool used for file
4210 merges. It overrides the HGMERGE environment variable and your
4210 merges. It overrides the HGMERGE environment variable and your
4211 configuration files. See :hg:`help merge-tools` for options.
4211 configuration files. See :hg:`help merge-tools` for options.
4212
4212
4213 If no revision is specified, the working directory's parent is a
4213 If no revision is specified, the working directory's parent is a
4214 head revision, and the current branch contains exactly one other
4214 head revision, and the current branch contains exactly one other
4215 head, the other head is merged with by default. Otherwise, an
4215 head, the other head is merged with by default. Otherwise, an
4216 explicit revision with which to merge with must be provided.
4216 explicit revision with which to merge with must be provided.
4217
4217
4218 :hg:`resolve` must be used to resolve unresolved files.
4218 :hg:`resolve` must be used to resolve unresolved files.
4219
4219
4220 To undo an uncommitted merge, use :hg:`update --clean .` which
4220 To undo an uncommitted merge, use :hg:`update --clean .` which
4221 will check out a clean copy of the original merge parent, losing
4221 will check out a clean copy of the original merge parent, losing
4222 all changes.
4222 all changes.
4223
4223
4224 Returns 0 on success, 1 if there are unresolved files.
4224 Returns 0 on success, 1 if there are unresolved files.
4225 """
4225 """
4226
4226
4227 if opts.get('rev') and node:
4227 if opts.get('rev') and node:
4228 raise util.Abort(_("please specify just one revision"))
4228 raise util.Abort(_("please specify just one revision"))
4229 if not node:
4229 if not node:
4230 node = opts.get('rev')
4230 node = opts.get('rev')
4231
4231
4232 if node:
4232 if node:
4233 node = scmutil.revsingle(repo, node).node()
4233 node = scmutil.revsingle(repo, node).node()
4234
4234
4235 if not node and repo._bookmarkcurrent:
4235 if not node and repo._bookmarkcurrent:
4236 bmheads = repo.bookmarkheads(repo._bookmarkcurrent)
4236 bmheads = repo.bookmarkheads(repo._bookmarkcurrent)
4237 curhead = repo[repo._bookmarkcurrent].node()
4237 curhead = repo[repo._bookmarkcurrent].node()
4238 if len(bmheads) == 2:
4238 if len(bmheads) == 2:
4239 if curhead == bmheads[0]:
4239 if curhead == bmheads[0]:
4240 node = bmheads[1]
4240 node = bmheads[1]
4241 else:
4241 else:
4242 node = bmheads[0]
4242 node = bmheads[0]
4243 elif len(bmheads) > 2:
4243 elif len(bmheads) > 2:
4244 raise util.Abort(_("multiple matching bookmarks to merge - "
4244 raise util.Abort(_("multiple matching bookmarks to merge - "
4245 "please merge with an explicit rev or bookmark"),
4245 "please merge with an explicit rev or bookmark"),
4246 hint=_("run 'hg heads' to see all heads"))
4246 hint=_("run 'hg heads' to see all heads"))
4247 elif len(bmheads) <= 1:
4247 elif len(bmheads) <= 1:
4248 raise util.Abort(_("no matching bookmark to merge - "
4248 raise util.Abort(_("no matching bookmark to merge - "
4249 "please merge with an explicit rev or bookmark"),
4249 "please merge with an explicit rev or bookmark"),
4250 hint=_("run 'hg heads' to see all heads"))
4250 hint=_("run 'hg heads' to see all heads"))
4251
4251
4252 if not node and not repo._bookmarkcurrent:
4252 if not node and not repo._bookmarkcurrent:
4253 branch = repo[None].branch()
4253 branch = repo[None].branch()
4254 bheads = repo.branchheads(branch)
4254 bheads = repo.branchheads(branch)
4255 nbhs = [bh for bh in bheads if not repo[bh].bookmarks()]
4255 nbhs = [bh for bh in bheads if not repo[bh].bookmarks()]
4256
4256
4257 if len(nbhs) > 2:
4257 if len(nbhs) > 2:
4258 raise util.Abort(_("branch '%s' has %d heads - "
4258 raise util.Abort(_("branch '%s' has %d heads - "
4259 "please merge with an explicit rev")
4259 "please merge with an explicit rev")
4260 % (branch, len(bheads)),
4260 % (branch, len(bheads)),
4261 hint=_("run 'hg heads .' to see heads"))
4261 hint=_("run 'hg heads .' to see heads"))
4262
4262
4263 parent = repo.dirstate.p1()
4263 parent = repo.dirstate.p1()
4264 if len(nbhs) <= 1:
4264 if len(nbhs) <= 1:
4265 if len(bheads) > 1:
4265 if len(bheads) > 1:
4266 raise util.Abort(_("heads are bookmarked - "
4266 raise util.Abort(_("heads are bookmarked - "
4267 "please merge with an explicit rev"),
4267 "please merge with an explicit rev"),
4268 hint=_("run 'hg heads' to see all heads"))
4268 hint=_("run 'hg heads' to see all heads"))
4269 if len(repo.heads()) > 1:
4269 if len(repo.heads()) > 1:
4270 raise util.Abort(_("branch '%s' has one head - "
4270 raise util.Abort(_("branch '%s' has one head - "
4271 "please merge with an explicit rev")
4271 "please merge with an explicit rev")
4272 % branch,
4272 % branch,
4273 hint=_("run 'hg heads' to see all heads"))
4273 hint=_("run 'hg heads' to see all heads"))
4274 msg, hint = _('nothing to merge'), None
4274 msg, hint = _('nothing to merge'), None
4275 if parent != repo.lookup(branch):
4275 if parent != repo.lookup(branch):
4276 hint = _("use 'hg update' instead")
4276 hint = _("use 'hg update' instead")
4277 raise util.Abort(msg, hint=hint)
4277 raise util.Abort(msg, hint=hint)
4278
4278
4279 if parent not in bheads:
4279 if parent not in bheads:
4280 raise util.Abort(_('working directory not at a head revision'),
4280 raise util.Abort(_('working directory not at a head revision'),
4281 hint=_("use 'hg update' or merge with an "
4281 hint=_("use 'hg update' or merge with an "
4282 "explicit revision"))
4282 "explicit revision"))
4283 if parent == nbhs[0]:
4283 if parent == nbhs[0]:
4284 node = nbhs[-1]
4284 node = nbhs[-1]
4285 else:
4285 else:
4286 node = nbhs[0]
4286 node = nbhs[0]
4287
4287
4288 if opts.get('preview'):
4288 if opts.get('preview'):
4289 # find nodes that are ancestors of p2 but not of p1
4289 # find nodes that are ancestors of p2 but not of p1
4290 p1 = repo.lookup('.')
4290 p1 = repo.lookup('.')
4291 p2 = repo.lookup(node)
4291 p2 = repo.lookup(node)
4292 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4292 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
4293
4293
4294 displayer = cmdutil.show_changeset(ui, repo, opts)
4294 displayer = cmdutil.show_changeset(ui, repo, opts)
4295 for node in nodes:
4295 for node in nodes:
4296 displayer.show(repo[node])
4296 displayer.show(repo[node])
4297 displayer.close()
4297 displayer.close()
4298 return 0
4298 return 0
4299
4299
4300 try:
4300 try:
4301 # ui.forcemerge is an internal variable, do not document
4301 # ui.forcemerge is an internal variable, do not document
4302 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4302 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4303 return hg.merge(repo, node, force=opts.get('force'))
4303 return hg.merge(repo, node, force=opts.get('force'))
4304 finally:
4304 finally:
4305 ui.setconfig('ui', 'forcemerge', '')
4305 ui.setconfig('ui', 'forcemerge', '')
4306
4306
4307 @command('outgoing|out',
4307 @command('outgoing|out',
4308 [('f', 'force', None, _('run even when the destination is unrelated')),
4308 [('f', 'force', None, _('run even when the destination is unrelated')),
4309 ('r', 'rev', [],
4309 ('r', 'rev', [],
4310 _('a changeset intended to be included in the destination'), _('REV')),
4310 _('a changeset intended to be included in the destination'), _('REV')),
4311 ('n', 'newest-first', None, _('show newest record first')),
4311 ('n', 'newest-first', None, _('show newest record first')),
4312 ('B', 'bookmarks', False, _('compare bookmarks')),
4312 ('B', 'bookmarks', False, _('compare bookmarks')),
4313 ('b', 'branch', [], _('a specific branch you would like to push'),
4313 ('b', 'branch', [], _('a specific branch you would like to push'),
4314 _('BRANCH')),
4314 _('BRANCH')),
4315 ] + logopts + remoteopts + subrepoopts,
4315 ] + logopts + remoteopts + subrepoopts,
4316 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
4316 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]'))
4317 def outgoing(ui, repo, dest=None, **opts):
4317 def outgoing(ui, repo, dest=None, **opts):
4318 """show changesets not found in the destination
4318 """show changesets not found in the destination
4319
4319
4320 Show changesets not found in the specified destination repository
4320 Show changesets not found in the specified destination repository
4321 or the default push location. These are the changesets that would
4321 or the default push location. These are the changesets that would
4322 be pushed if a push was requested.
4322 be pushed if a push was requested.
4323
4323
4324 See pull for details of valid destination formats.
4324 See pull for details of valid destination formats.
4325
4325
4326 Returns 0 if there are outgoing changes, 1 otherwise.
4326 Returns 0 if there are outgoing changes, 1 otherwise.
4327 """
4327 """
4328 if opts.get('graph'):
4328 if opts.get('graph'):
4329 cmdutil.checkunsupportedgraphflags([], opts)
4329 cmdutil.checkunsupportedgraphflags([], opts)
4330 o = hg._outgoing(ui, repo, dest, opts)
4330 o = hg._outgoing(ui, repo, dest, opts)
4331 if o is None:
4331 if o is None:
4332 return
4332 return
4333
4333
4334 revdag = cmdutil.graphrevs(repo, o, opts)
4334 revdag = cmdutil.graphrevs(repo, o, opts)
4335 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
4335 displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True)
4336 showparents = [ctx.node() for ctx in repo[None].parents()]
4336 showparents = [ctx.node() for ctx in repo[None].parents()]
4337 cmdutil.displaygraph(ui, revdag, displayer, showparents,
4337 cmdutil.displaygraph(ui, revdag, displayer, showparents,
4338 graphmod.asciiedges)
4338 graphmod.asciiedges)
4339 return 0
4339 return 0
4340
4340
4341 if opts.get('bookmarks'):
4341 if opts.get('bookmarks'):
4342 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4342 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4343 dest, branches = hg.parseurl(dest, opts.get('branch'))
4343 dest, branches = hg.parseurl(dest, opts.get('branch'))
4344 other = hg.peer(repo, opts, dest)
4344 other = hg.peer(repo, opts, dest)
4345 if 'bookmarks' not in other.listkeys('namespaces'):
4345 if 'bookmarks' not in other.listkeys('namespaces'):
4346 ui.warn(_("remote doesn't support bookmarks\n"))
4346 ui.warn(_("remote doesn't support bookmarks\n"))
4347 return 0
4347 return 0
4348 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4348 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
4349 return bookmarks.diff(ui, other, repo)
4349 return bookmarks.diff(ui, other, repo)
4350
4350
4351 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
4351 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
4352 try:
4352 try:
4353 return hg.outgoing(ui, repo, dest, opts)
4353 return hg.outgoing(ui, repo, dest, opts)
4354 finally:
4354 finally:
4355 del repo._subtoppath
4355 del repo._subtoppath
4356
4356
4357 @command('parents',
4357 @command('parents',
4358 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4358 [('r', 'rev', '', _('show parents of the specified revision'), _('REV')),
4359 ] + templateopts,
4359 ] + templateopts,
4360 _('[-r REV] [FILE]'))
4360 _('[-r REV] [FILE]'))
4361 def parents(ui, repo, file_=None, **opts):
4361 def parents(ui, repo, file_=None, **opts):
4362 """show the parents of the working directory or revision
4362 """show the parents of the working directory or revision
4363
4363
4364 Print the working directory's parent revisions. If a revision is
4364 Print the working directory's parent revisions. If a revision is
4365 given via -r/--rev, the parent of that revision will be printed.
4365 given via -r/--rev, the parent of that revision will be printed.
4366 If a file argument is given, the revision in which the file was
4366 If a file argument is given, the revision in which the file was
4367 last changed (before the working directory revision or the
4367 last changed (before the working directory revision or the
4368 argument to --rev if given) is printed.
4368 argument to --rev if given) is printed.
4369
4369
4370 Returns 0 on success.
4370 Returns 0 on success.
4371 """
4371 """
4372
4372
4373 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4373 ctx = scmutil.revsingle(repo, opts.get('rev'), None)
4374
4374
4375 if file_:
4375 if file_:
4376 m = scmutil.match(ctx, (file_,), opts)
4376 m = scmutil.match(ctx, (file_,), opts)
4377 if m.anypats() or len(m.files()) != 1:
4377 if m.anypats() or len(m.files()) != 1:
4378 raise util.Abort(_('can only specify an explicit filename'))
4378 raise util.Abort(_('can only specify an explicit filename'))
4379 file_ = m.files()[0]
4379 file_ = m.files()[0]
4380 filenodes = []
4380 filenodes = []
4381 for cp in ctx.parents():
4381 for cp in ctx.parents():
4382 if not cp:
4382 if not cp:
4383 continue
4383 continue
4384 try:
4384 try:
4385 filenodes.append(cp.filenode(file_))
4385 filenodes.append(cp.filenode(file_))
4386 except error.LookupError:
4386 except error.LookupError:
4387 pass
4387 pass
4388 if not filenodes:
4388 if not filenodes:
4389 raise util.Abort(_("'%s' not found in manifest!") % file_)
4389 raise util.Abort(_("'%s' not found in manifest!") % file_)
4390 p = []
4390 p = []
4391 for fn in filenodes:
4391 for fn in filenodes:
4392 fctx = repo.filectx(file_, fileid=fn)
4392 fctx = repo.filectx(file_, fileid=fn)
4393 p.append(fctx.node())
4393 p.append(fctx.node())
4394 else:
4394 else:
4395 p = [cp.node() for cp in ctx.parents()]
4395 p = [cp.node() for cp in ctx.parents()]
4396
4396
4397 displayer = cmdutil.show_changeset(ui, repo, opts)
4397 displayer = cmdutil.show_changeset(ui, repo, opts)
4398 for n in p:
4398 for n in p:
4399 if n != nullid:
4399 if n != nullid:
4400 displayer.show(repo[n])
4400 displayer.show(repo[n])
4401 displayer.close()
4401 displayer.close()
4402
4402
4403 @command('paths', [], _('[NAME]'))
4403 @command('paths', [], _('[NAME]'))
4404 def paths(ui, repo, search=None):
4404 def paths(ui, repo, search=None):
4405 """show aliases for remote repositories
4405 """show aliases for remote repositories
4406
4406
4407 Show definition of symbolic path name NAME. If no name is given,
4407 Show definition of symbolic path name NAME. If no name is given,
4408 show definition of all available names.
4408 show definition of all available names.
4409
4409
4410 Option -q/--quiet suppresses all output when searching for NAME
4410 Option -q/--quiet suppresses all output when searching for NAME
4411 and shows only the path names when listing all definitions.
4411 and shows only the path names when listing all definitions.
4412
4412
4413 Path names are defined in the [paths] section of your
4413 Path names are defined in the [paths] section of your
4414 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4414 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
4415 repository, ``.hg/hgrc`` is used, too.
4415 repository, ``.hg/hgrc`` is used, too.
4416
4416
4417 The path names ``default`` and ``default-push`` have a special
4417 The path names ``default`` and ``default-push`` have a special
4418 meaning. When performing a push or pull operation, they are used
4418 meaning. When performing a push or pull operation, they are used
4419 as fallbacks if no location is specified on the command-line.
4419 as fallbacks if no location is specified on the command-line.
4420 When ``default-push`` is set, it will be used for push and
4420 When ``default-push`` is set, it will be used for push and
4421 ``default`` will be used for pull; otherwise ``default`` is used
4421 ``default`` will be used for pull; otherwise ``default`` is used
4422 as the fallback for both. When cloning a repository, the clone
4422 as the fallback for both. When cloning a repository, the clone
4423 source is written as ``default`` in ``.hg/hgrc``. Note that
4423 source is written as ``default`` in ``.hg/hgrc``. Note that
4424 ``default`` and ``default-push`` apply to all inbound (e.g.
4424 ``default`` and ``default-push`` apply to all inbound (e.g.
4425 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
4425 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
4426 :hg:`bundle`) operations.
4426 :hg:`bundle`) operations.
4427
4427
4428 See :hg:`help urls` for more information.
4428 See :hg:`help urls` for more information.
4429
4429
4430 Returns 0 on success.
4430 Returns 0 on success.
4431 """
4431 """
4432 if search:
4432 if search:
4433 for name, path in ui.configitems("paths"):
4433 for name, path in ui.configitems("paths"):
4434 if name == search:
4434 if name == search:
4435 ui.status("%s\n" % util.hidepassword(path))
4435 ui.status("%s\n" % util.hidepassword(path))
4436 return
4436 return
4437 if not ui.quiet:
4437 if not ui.quiet:
4438 ui.warn(_("not found!\n"))
4438 ui.warn(_("not found!\n"))
4439 return 1
4439 return 1
4440 else:
4440 else:
4441 for name, path in ui.configitems("paths"):
4441 for name, path in ui.configitems("paths"):
4442 if ui.quiet:
4442 if ui.quiet:
4443 ui.write("%s\n" % name)
4443 ui.write("%s\n" % name)
4444 else:
4444 else:
4445 ui.write("%s = %s\n" % (name, util.hidepassword(path)))
4445 ui.write("%s = %s\n" % (name, util.hidepassword(path)))
4446
4446
4447 @command('phase',
4447 @command('phase',
4448 [('p', 'public', False, _('set changeset phase to public')),
4448 [('p', 'public', False, _('set changeset phase to public')),
4449 ('d', 'draft', False, _('set changeset phase to draft')),
4449 ('d', 'draft', False, _('set changeset phase to draft')),
4450 ('s', 'secret', False, _('set changeset phase to secret')),
4450 ('s', 'secret', False, _('set changeset phase to secret')),
4451 ('f', 'force', False, _('allow to move boundary backward')),
4451 ('f', 'force', False, _('allow to move boundary backward')),
4452 ('r', 'rev', [], _('target revision'), _('REV')),
4452 ('r', 'rev', [], _('target revision'), _('REV')),
4453 ],
4453 ],
4454 _('[-p|-d|-s] [-f] [-r] REV...'))
4454 _('[-p|-d|-s] [-f] [-r] REV...'))
4455 def phase(ui, repo, *revs, **opts):
4455 def phase(ui, repo, *revs, **opts):
4456 """set or show the current phase name
4456 """set or show the current phase name
4457
4457
4458 With no argument, show the phase name of specified revisions.
4458 With no argument, show the phase name of specified revisions.
4459
4459
4460 With one of -p/--public, -d/--draft or -s/--secret, change the
4460 With one of -p/--public, -d/--draft or -s/--secret, change the
4461 phase value of the specified revisions.
4461 phase value of the specified revisions.
4462
4462
4463 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
4463 Unless -f/--force is specified, :hg:`phase` won't move changeset from a
4464 lower phase to an higher phase. Phases are ordered as follows::
4464 lower phase to an higher phase. Phases are ordered as follows::
4465
4465
4466 public < draft < secret
4466 public < draft < secret
4467
4467
4468 Return 0 on success, 1 if no phases were changed or some could not
4468 Return 0 on success, 1 if no phases were changed or some could not
4469 be changed.
4469 be changed.
4470 """
4470 """
4471 # search for a unique phase argument
4471 # search for a unique phase argument
4472 targetphase = None
4472 targetphase = None
4473 for idx, name in enumerate(phases.phasenames):
4473 for idx, name in enumerate(phases.phasenames):
4474 if opts[name]:
4474 if opts[name]:
4475 if targetphase is not None:
4475 if targetphase is not None:
4476 raise util.Abort(_('only one phase can be specified'))
4476 raise util.Abort(_('only one phase can be specified'))
4477 targetphase = idx
4477 targetphase = idx
4478
4478
4479 # look for specified revision
4479 # look for specified revision
4480 revs = list(revs)
4480 revs = list(revs)
4481 revs.extend(opts['rev'])
4481 revs.extend(opts['rev'])
4482 if not revs:
4482 if not revs:
4483 raise util.Abort(_('no revisions specified'))
4483 raise util.Abort(_('no revisions specified'))
4484
4484
4485 revs = scmutil.revrange(repo, revs)
4485 revs = scmutil.revrange(repo, revs)
4486
4486
4487 lock = None
4487 lock = None
4488 ret = 0
4488 ret = 0
4489 if targetphase is None:
4489 if targetphase is None:
4490 # display
4490 # display
4491 for r in revs:
4491 for r in revs:
4492 ctx = repo[r]
4492 ctx = repo[r]
4493 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
4493 ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr()))
4494 else:
4494 else:
4495 lock = repo.lock()
4495 lock = repo.lock()
4496 try:
4496 try:
4497 # set phase
4497 # set phase
4498 if not revs:
4498 if not revs:
4499 raise util.Abort(_('empty revision set'))
4499 raise util.Abort(_('empty revision set'))
4500 nodes = [repo[r].node() for r in revs]
4500 nodes = [repo[r].node() for r in revs]
4501 olddata = repo._phasecache.getphaserevs(repo)[:]
4501 olddata = repo._phasecache.getphaserevs(repo)[:]
4502 phases.advanceboundary(repo, targetphase, nodes)
4502 phases.advanceboundary(repo, targetphase, nodes)
4503 if opts['force']:
4503 if opts['force']:
4504 phases.retractboundary(repo, targetphase, nodes)
4504 phases.retractboundary(repo, targetphase, nodes)
4505 finally:
4505 finally:
4506 lock.release()
4506 lock.release()
4507 # moving revision from public to draft may hide them
4507 # moving revision from public to draft may hide them
4508 # We have to check result on an unfiltered repository
4508 # We have to check result on an unfiltered repository
4509 unfi = repo.unfiltered()
4509 unfi = repo.unfiltered()
4510 newdata = repo._phasecache.getphaserevs(unfi)
4510 newdata = repo._phasecache.getphaserevs(unfi)
4511 changes = sum(o != newdata[i] for i, o in enumerate(olddata))
4511 changes = sum(o != newdata[i] for i, o in enumerate(olddata))
4512 cl = unfi.changelog
4512 cl = unfi.changelog
4513 rejected = [n for n in nodes
4513 rejected = [n for n in nodes
4514 if newdata[cl.rev(n)] < targetphase]
4514 if newdata[cl.rev(n)] < targetphase]
4515 if rejected:
4515 if rejected:
4516 ui.warn(_('cannot move %i changesets to a more permissive '
4516 ui.warn(_('cannot move %i changesets to a more permissive '
4517 'phase, use --force\n') % len(rejected))
4517 'phase, use --force\n') % len(rejected))
4518 ret = 1
4518 ret = 1
4519 if changes:
4519 if changes:
4520 msg = _('phase changed for %i changesets\n') % changes
4520 msg = _('phase changed for %i changesets\n') % changes
4521 if ret:
4521 if ret:
4522 ui.status(msg)
4522 ui.status(msg)
4523 else:
4523 else:
4524 ui.note(msg)
4524 ui.note(msg)
4525 else:
4525 else:
4526 ui.warn(_('no phases changed\n'))
4526 ui.warn(_('no phases changed\n'))
4527 ret = 1
4527 ret = 1
4528 return ret
4528 return ret
4529
4529
4530 def postincoming(ui, repo, modheads, optupdate, checkout):
4530 def postincoming(ui, repo, modheads, optupdate, checkout):
4531 if modheads == 0:
4531 if modheads == 0:
4532 return
4532 return
4533 if optupdate:
4533 if optupdate:
4534 checkout, movemarkfrom = bookmarks.calculateupdate(ui, repo, checkout)
4534 checkout, movemarkfrom = bookmarks.calculateupdate(ui, repo, checkout)
4535 try:
4535 try:
4536 ret = hg.update(repo, checkout)
4536 ret = hg.update(repo, checkout)
4537 except util.Abort, inst:
4537 except util.Abort, inst:
4538 ui.warn(_("not updating: %s\n") % str(inst))
4538 ui.warn(_("not updating: %s\n") % str(inst))
4539 if inst.hint:
4539 if inst.hint:
4540 ui.warn(_("(%s)\n") % inst.hint)
4540 ui.warn(_("(%s)\n") % inst.hint)
4541 return 0
4541 return 0
4542 if not ret and not checkout:
4542 if not ret and not checkout:
4543 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
4543 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
4544 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
4544 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
4545 return ret
4545 return ret
4546 if modheads > 1:
4546 if modheads > 1:
4547 currentbranchheads = len(repo.branchheads())
4547 currentbranchheads = len(repo.branchheads())
4548 if currentbranchheads == modheads:
4548 if currentbranchheads == modheads:
4549 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4549 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
4550 elif currentbranchheads > 1:
4550 elif currentbranchheads > 1:
4551 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
4551 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to "
4552 "merge)\n"))
4552 "merge)\n"))
4553 else:
4553 else:
4554 ui.status(_("(run 'hg heads' to see heads)\n"))
4554 ui.status(_("(run 'hg heads' to see heads)\n"))
4555 else:
4555 else:
4556 ui.status(_("(run 'hg update' to get a working copy)\n"))
4556 ui.status(_("(run 'hg update' to get a working copy)\n"))
4557
4557
4558 @command('^pull',
4558 @command('^pull',
4559 [('u', 'update', None,
4559 [('u', 'update', None,
4560 _('update to new branch head if changesets were pulled')),
4560 _('update to new branch head if changesets were pulled')),
4561 ('f', 'force', None, _('run even when remote repository is unrelated')),
4561 ('f', 'force', None, _('run even when remote repository is unrelated')),
4562 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4562 ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')),
4563 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4563 ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')),
4564 ('b', 'branch', [], _('a specific branch you would like to pull'),
4564 ('b', 'branch', [], _('a specific branch you would like to pull'),
4565 _('BRANCH')),
4565 _('BRANCH')),
4566 ] + remoteopts,
4566 ] + remoteopts,
4567 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4567 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]'))
4568 def pull(ui, repo, source="default", **opts):
4568 def pull(ui, repo, source="default", **opts):
4569 """pull changes from the specified source
4569 """pull changes from the specified source
4570
4570
4571 Pull changes from a remote repository to a local one.
4571 Pull changes from a remote repository to a local one.
4572
4572
4573 This finds all changes from the repository at the specified path
4573 This finds all changes from the repository at the specified path
4574 or URL and adds them to a local repository (the current one unless
4574 or URL and adds them to a local repository (the current one unless
4575 -R is specified). By default, this does not update the copy of the
4575 -R is specified). By default, this does not update the copy of the
4576 project in the working directory.
4576 project in the working directory.
4577
4577
4578 Use :hg:`incoming` if you want to see what would have been added
4578 Use :hg:`incoming` if you want to see what would have been added
4579 by a pull at the time you issued this command. If you then decide
4579 by a pull at the time you issued this command. If you then decide
4580 to add those changes to the repository, you should use :hg:`pull
4580 to add those changes to the repository, you should use :hg:`pull
4581 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4581 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
4582
4582
4583 If SOURCE is omitted, the 'default' path will be used.
4583 If SOURCE is omitted, the 'default' path will be used.
4584 See :hg:`help urls` for more information.
4584 See :hg:`help urls` for more information.
4585
4585
4586 Returns 0 on success, 1 if an update had unresolved files.
4586 Returns 0 on success, 1 if an update had unresolved files.
4587 """
4587 """
4588 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4588 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
4589 other = hg.peer(repo, opts, source)
4589 other = hg.peer(repo, opts, source)
4590 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4590 ui.status(_('pulling from %s\n') % util.hidepassword(source))
4591 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
4591 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
4592
4592
4593 remotebookmarks = other.listkeys('bookmarks')
4593 remotebookmarks = other.listkeys('bookmarks')
4594
4594
4595 if opts.get('bookmark'):
4595 if opts.get('bookmark'):
4596 if not revs:
4596 if not revs:
4597 revs = []
4597 revs = []
4598 for b in opts['bookmark']:
4598 for b in opts['bookmark']:
4599 if b not in remotebookmarks:
4599 if b not in remotebookmarks:
4600 raise util.Abort(_('remote bookmark %s not found!') % b)
4600 raise util.Abort(_('remote bookmark %s not found!') % b)
4601 revs.append(remotebookmarks[b])
4601 revs.append(remotebookmarks[b])
4602
4602
4603 if revs:
4603 if revs:
4604 try:
4604 try:
4605 revs = [other.lookup(rev) for rev in revs]
4605 revs = [other.lookup(rev) for rev in revs]
4606 except error.CapabilityError:
4606 except error.CapabilityError:
4607 err = _("other repository doesn't support revision lookup, "
4607 err = _("other repository doesn't support revision lookup, "
4608 "so a rev cannot be specified.")
4608 "so a rev cannot be specified.")
4609 raise util.Abort(err)
4609 raise util.Abort(err)
4610
4610
4611 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
4611 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
4612 bookmarks.updatefromremote(ui, repo, remotebookmarks, source)
4612 bookmarks.updatefromremote(ui, repo, remotebookmarks, source)
4613 if checkout:
4613 if checkout:
4614 checkout = str(repo.changelog.rev(other.lookup(checkout)))
4614 checkout = str(repo.changelog.rev(other.lookup(checkout)))
4615 repo._subtoppath = source
4615 repo._subtoppath = source
4616 try:
4616 try:
4617 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
4617 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout)
4618
4618
4619 finally:
4619 finally:
4620 del repo._subtoppath
4620 del repo._subtoppath
4621
4621
4622 # update specified bookmarks
4622 # update specified bookmarks
4623 if opts.get('bookmark'):
4623 if opts.get('bookmark'):
4624 marks = repo._bookmarks
4624 marks = repo._bookmarks
4625 for b in opts['bookmark']:
4625 for b in opts['bookmark']:
4626 # explicit pull overrides local bookmark if any
4626 # explicit pull overrides local bookmark if any
4627 ui.status(_("importing bookmark %s\n") % b)
4627 ui.status(_("importing bookmark %s\n") % b)
4628 marks[b] = repo[remotebookmarks[b]].node()
4628 marks[b] = repo[remotebookmarks[b]].node()
4629 marks.write()
4629 marks.write()
4630
4630
4631 return ret
4631 return ret
4632
4632
4633 @command('^push',
4633 @command('^push',
4634 [('f', 'force', None, _('force push')),
4634 [('f', 'force', None, _('force push')),
4635 ('r', 'rev', [],
4635 ('r', 'rev', [],
4636 _('a changeset intended to be included in the destination'),
4636 _('a changeset intended to be included in the destination'),
4637 _('REV')),
4637 _('REV')),
4638 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4638 ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')),
4639 ('b', 'branch', [],
4639 ('b', 'branch', [],
4640 _('a specific branch you would like to push'), _('BRANCH')),
4640 _('a specific branch you would like to push'), _('BRANCH')),
4641 ('', 'new-branch', False, _('allow pushing a new branch')),
4641 ('', 'new-branch', False, _('allow pushing a new branch')),
4642 ] + remoteopts,
4642 ] + remoteopts,
4643 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4643 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]'))
4644 def push(ui, repo, dest=None, **opts):
4644 def push(ui, repo, dest=None, **opts):
4645 """push changes to the specified destination
4645 """push changes to the specified destination
4646
4646
4647 Push changesets from the local repository to the specified
4647 Push changesets from the local repository to the specified
4648 destination.
4648 destination.
4649
4649
4650 This operation is symmetrical to pull: it is identical to a pull
4650 This operation is symmetrical to pull: it is identical to a pull
4651 in the destination repository from the current one.
4651 in the destination repository from the current one.
4652
4652
4653 By default, push will not allow creation of new heads at the
4653 By default, push will not allow creation of new heads at the
4654 destination, since multiple heads would make it unclear which head
4654 destination, since multiple heads would make it unclear which head
4655 to use. In this situation, it is recommended to pull and merge
4655 to use. In this situation, it is recommended to pull and merge
4656 before pushing.
4656 before pushing.
4657
4657
4658 Use --new-branch if you want to allow push to create a new named
4658 Use --new-branch if you want to allow push to create a new named
4659 branch that is not present at the destination. This allows you to
4659 branch that is not present at the destination. This allows you to
4660 only create a new branch without forcing other changes.
4660 only create a new branch without forcing other changes.
4661
4661
4662 .. note::
4662 .. note::
4663
4663
4664 Extra care should be taken with the -f/--force option,
4664 Extra care should be taken with the -f/--force option,
4665 which will push all new heads on all branches, an action which will
4665 which will push all new heads on all branches, an action which will
4666 almost always cause confusion for collaborators.
4666 almost always cause confusion for collaborators.
4667
4667
4668 If -r/--rev is used, the specified revision and all its ancestors
4668 If -r/--rev is used, the specified revision and all its ancestors
4669 will be pushed to the remote repository.
4669 will be pushed to the remote repository.
4670
4670
4671 If -B/--bookmark is used, the specified bookmarked revision, its
4671 If -B/--bookmark is used, the specified bookmarked revision, its
4672 ancestors, and the bookmark will be pushed to the remote
4672 ancestors, and the bookmark will be pushed to the remote
4673 repository.
4673 repository.
4674
4674
4675 Please see :hg:`help urls` for important details about ``ssh://``
4675 Please see :hg:`help urls` for important details about ``ssh://``
4676 URLs. If DESTINATION is omitted, a default path will be used.
4676 URLs. If DESTINATION is omitted, a default path will be used.
4677
4677
4678 Returns 0 if push was successful, 1 if nothing to push.
4678 Returns 0 if push was successful, 1 if nothing to push.
4679 """
4679 """
4680
4680
4681 if opts.get('bookmark'):
4681 if opts.get('bookmark'):
4682 for b in opts['bookmark']:
4682 for b in opts['bookmark']:
4683 # translate -B options to -r so changesets get pushed
4683 # translate -B options to -r so changesets get pushed
4684 if b in repo._bookmarks:
4684 if b in repo._bookmarks:
4685 opts.setdefault('rev', []).append(b)
4685 opts.setdefault('rev', []).append(b)
4686 else:
4686 else:
4687 # if we try to push a deleted bookmark, translate it to null
4687 # if we try to push a deleted bookmark, translate it to null
4688 # this lets simultaneous -r, -b options continue working
4688 # this lets simultaneous -r, -b options continue working
4689 opts.setdefault('rev', []).append("null")
4689 opts.setdefault('rev', []).append("null")
4690
4690
4691 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4691 dest = ui.expandpath(dest or 'default-push', dest or 'default')
4692 dest, branches = hg.parseurl(dest, opts.get('branch'))
4692 dest, branches = hg.parseurl(dest, opts.get('branch'))
4693 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4693 ui.status(_('pushing to %s\n') % util.hidepassword(dest))
4694 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4694 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4695 other = hg.peer(repo, opts, dest)
4695 other = hg.peer(repo, opts, dest)
4696 if revs:
4696 if revs:
4697 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4697 revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)]
4698
4698
4699 repo._subtoppath = dest
4699 repo._subtoppath = dest
4700 try:
4700 try:
4701 # push subrepos depth-first for coherent ordering
4701 # push subrepos depth-first for coherent ordering
4702 c = repo['']
4702 c = repo['']
4703 subs = c.substate # only repos that are committed
4703 subs = c.substate # only repos that are committed
4704 for s in sorted(subs):
4704 for s in sorted(subs):
4705 if c.sub(s).push(opts) == 0:
4705 if c.sub(s).push(opts) == 0:
4706 return False
4706 return False
4707 finally:
4707 finally:
4708 del repo._subtoppath
4708 del repo._subtoppath
4709 result = repo.push(other, opts.get('force'), revs=revs,
4709 result = repo.push(other, opts.get('force'), revs=revs,
4710 newbranch=opts.get('new_branch'))
4710 newbranch=opts.get('new_branch'))
4711
4711
4712 result = not result
4712 result = not result
4713
4713
4714 if opts.get('bookmark'):
4714 if opts.get('bookmark'):
4715 bresult = bookmarks.pushtoremote(ui, repo, other, opts['bookmark'])
4715 bresult = bookmarks.pushtoremote(ui, repo, other, opts['bookmark'])
4716 if bresult == 2:
4716 if bresult == 2:
4717 return 2
4717 return 2
4718 if not result and bresult:
4718 if not result and bresult:
4719 result = 2
4719 result = 2
4720
4720
4721 return result
4721 return result
4722
4722
4723 @command('recover', [])
4723 @command('recover', [])
4724 def recover(ui, repo):
4724 def recover(ui, repo):
4725 """roll back an interrupted transaction
4725 """roll back an interrupted transaction
4726
4726
4727 Recover from an interrupted commit or pull.
4727 Recover from an interrupted commit or pull.
4728
4728
4729 This command tries to fix the repository status after an
4729 This command tries to fix the repository status after an
4730 interrupted operation. It should only be necessary when Mercurial
4730 interrupted operation. It should only be necessary when Mercurial
4731 suggests it.
4731 suggests it.
4732
4732
4733 Returns 0 if successful, 1 if nothing to recover or verify fails.
4733 Returns 0 if successful, 1 if nothing to recover or verify fails.
4734 """
4734 """
4735 if repo.recover():
4735 if repo.recover():
4736 return hg.verify(repo)
4736 return hg.verify(repo)
4737 return 1
4737 return 1
4738
4738
4739 @command('^remove|rm',
4739 @command('^remove|rm',
4740 [('A', 'after', None, _('record delete for missing files')),
4740 [('A', 'after', None, _('record delete for missing files')),
4741 ('f', 'force', None,
4741 ('f', 'force', None,
4742 _('remove (and delete) file even if added or modified')),
4742 _('remove (and delete) file even if added or modified')),
4743 ] + walkopts,
4743 ] + walkopts,
4744 _('[OPTION]... FILE...'))
4744 _('[OPTION]... FILE...'))
4745 def remove(ui, repo, *pats, **opts):
4745 def remove(ui, repo, *pats, **opts):
4746 """remove the specified files on the next commit
4746 """remove the specified files on the next commit
4747
4747
4748 Schedule the indicated files for removal from the current branch.
4748 Schedule the indicated files for removal from the current branch.
4749
4749
4750 This command schedules the files to be removed at the next commit.
4750 This command schedules the files to be removed at the next commit.
4751 To undo a remove before that, see :hg:`revert`. To undo added
4751 To undo a remove before that, see :hg:`revert`. To undo added
4752 files, see :hg:`forget`.
4752 files, see :hg:`forget`.
4753
4753
4754 .. container:: verbose
4754 .. container:: verbose
4755
4755
4756 -A/--after can be used to remove only files that have already
4756 -A/--after can be used to remove only files that have already
4757 been deleted, -f/--force can be used to force deletion, and -Af
4757 been deleted, -f/--force can be used to force deletion, and -Af
4758 can be used to remove files from the next revision without
4758 can be used to remove files from the next revision without
4759 deleting them from the working directory.
4759 deleting them from the working directory.
4760
4760
4761 The following table details the behavior of remove for different
4761 The following table details the behavior of remove for different
4762 file states (columns) and option combinations (rows). The file
4762 file states (columns) and option combinations (rows). The file
4763 states are Added [A], Clean [C], Modified [M] and Missing [!]
4763 states are Added [A], Clean [C], Modified [M] and Missing [!]
4764 (as reported by :hg:`status`). The actions are Warn, Remove
4764 (as reported by :hg:`status`). The actions are Warn, Remove
4765 (from branch) and Delete (from disk):
4765 (from branch) and Delete (from disk):
4766
4766
4767 ========= == == == ==
4767 ========= == == == ==
4768 opt/state A C M !
4768 opt/state A C M !
4769 ========= == == == ==
4769 ========= == == == ==
4770 none W RD W R
4770 none W RD W R
4771 -f R RD RD R
4771 -f R RD RD R
4772 -A W W W R
4772 -A W W W R
4773 -Af R R R R
4773 -Af R R R R
4774 ========= == == == ==
4774 ========= == == == ==
4775
4775
4776 Note that remove never deletes files in Added [A] state from the
4776 Note that remove never deletes files in Added [A] state from the
4777 working directory, not even if option --force is specified.
4777 working directory, not even if option --force is specified.
4778
4778
4779 Returns 0 on success, 1 if any warnings encountered.
4779 Returns 0 on success, 1 if any warnings encountered.
4780 """
4780 """
4781
4781
4782 ret = 0
4782 ret = 0
4783 after, force = opts.get('after'), opts.get('force')
4783 after, force = opts.get('after'), opts.get('force')
4784 if not pats and not after:
4784 if not pats and not after:
4785 raise util.Abort(_('no files specified'))
4785 raise util.Abort(_('no files specified'))
4786
4786
4787 m = scmutil.match(repo[None], pats, opts)
4787 m = scmutil.match(repo[None], pats, opts)
4788 s = repo.status(match=m, clean=True)
4788 s = repo.status(match=m, clean=True)
4789 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
4789 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
4790
4790
4791 # warn about failure to delete explicit files/dirs
4791 # warn about failure to delete explicit files/dirs
4792 wctx = repo[None]
4792 wctx = repo[None]
4793 for f in m.files():
4793 for f in m.files():
4794 if f in repo.dirstate or f in wctx.dirs():
4794 if f in repo.dirstate or f in wctx.dirs():
4795 continue
4795 continue
4796 if os.path.exists(m.rel(f)):
4796 if os.path.exists(m.rel(f)):
4797 if os.path.isdir(m.rel(f)):
4797 if os.path.isdir(m.rel(f)):
4798 ui.warn(_('not removing %s: no tracked files\n') % m.rel(f))
4798 ui.warn(_('not removing %s: no tracked files\n') % m.rel(f))
4799 else:
4799 else:
4800 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
4800 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
4801 # missing files will generate a warning elsewhere
4801 # missing files will generate a warning elsewhere
4802 ret = 1
4802 ret = 1
4803
4803
4804 if force:
4804 if force:
4805 list = modified + deleted + clean + added
4805 list = modified + deleted + clean + added
4806 elif after:
4806 elif after:
4807 list = deleted
4807 list = deleted
4808 for f in modified + added + clean:
4808 for f in modified + added + clean:
4809 ui.warn(_('not removing %s: file still exists\n') % m.rel(f))
4809 ui.warn(_('not removing %s: file still exists\n') % m.rel(f))
4810 ret = 1
4810 ret = 1
4811 else:
4811 else:
4812 list = deleted + clean
4812 list = deleted + clean
4813 for f in modified:
4813 for f in modified:
4814 ui.warn(_('not removing %s: file is modified (use -f'
4814 ui.warn(_('not removing %s: file is modified (use -f'
4815 ' to force removal)\n') % m.rel(f))
4815 ' to force removal)\n') % m.rel(f))
4816 ret = 1
4816 ret = 1
4817 for f in added:
4817 for f in added:
4818 ui.warn(_('not removing %s: file has been marked for add'
4818 ui.warn(_('not removing %s: file has been marked for add'
4819 ' (use forget to undo)\n') % m.rel(f))
4819 ' (use forget to undo)\n') % m.rel(f))
4820 ret = 1
4820 ret = 1
4821
4821
4822 for f in sorted(list):
4822 for f in sorted(list):
4823 if ui.verbose or not m.exact(f):
4823 if ui.verbose or not m.exact(f):
4824 ui.status(_('removing %s\n') % m.rel(f))
4824 ui.status(_('removing %s\n') % m.rel(f))
4825
4825
4826 wlock = repo.wlock()
4826 wlock = repo.wlock()
4827 try:
4827 try:
4828 if not after:
4828 if not after:
4829 for f in list:
4829 for f in list:
4830 if f in added:
4830 if f in added:
4831 continue # we never unlink added files on remove
4831 continue # we never unlink added files on remove
4832 util.unlinkpath(repo.wjoin(f), ignoremissing=True)
4832 util.unlinkpath(repo.wjoin(f), ignoremissing=True)
4833 repo[None].forget(list)
4833 repo[None].forget(list)
4834 finally:
4834 finally:
4835 wlock.release()
4835 wlock.release()
4836
4836
4837 return ret
4837 return ret
4838
4838
4839 @command('rename|move|mv',
4839 @command('rename|move|mv',
4840 [('A', 'after', None, _('record a rename that has already occurred')),
4840 [('A', 'after', None, _('record a rename that has already occurred')),
4841 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4841 ('f', 'force', None, _('forcibly copy over an existing managed file')),
4842 ] + walkopts + dryrunopts,
4842 ] + walkopts + dryrunopts,
4843 _('[OPTION]... SOURCE... DEST'))
4843 _('[OPTION]... SOURCE... DEST'))
4844 def rename(ui, repo, *pats, **opts):
4844 def rename(ui, repo, *pats, **opts):
4845 """rename files; equivalent of copy + remove
4845 """rename files; equivalent of copy + remove
4846
4846
4847 Mark dest as copies of sources; mark sources for deletion. If dest
4847 Mark dest as copies of sources; mark sources for deletion. If dest
4848 is a directory, copies are put in that directory. If dest is a
4848 is a directory, copies are put in that directory. If dest is a
4849 file, there can only be one source.
4849 file, there can only be one source.
4850
4850
4851 By default, this command copies the contents of files as they
4851 By default, this command copies the contents of files as they
4852 exist in the working directory. If invoked with -A/--after, the
4852 exist in the working directory. If invoked with -A/--after, the
4853 operation is recorded, but no copying is performed.
4853 operation is recorded, but no copying is performed.
4854
4854
4855 This command takes effect at the next commit. To undo a rename
4855 This command takes effect at the next commit. To undo a rename
4856 before that, see :hg:`revert`.
4856 before that, see :hg:`revert`.
4857
4857
4858 Returns 0 on success, 1 if errors are encountered.
4858 Returns 0 on success, 1 if errors are encountered.
4859 """
4859 """
4860 wlock = repo.wlock(False)
4860 wlock = repo.wlock(False)
4861 try:
4861 try:
4862 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4862 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4863 finally:
4863 finally:
4864 wlock.release()
4864 wlock.release()
4865
4865
4866 @command('resolve',
4866 @command('resolve',
4867 [('a', 'all', None, _('select all unresolved files')),
4867 [('a', 'all', None, _('select all unresolved files')),
4868 ('l', 'list', None, _('list state of files needing merge')),
4868 ('l', 'list', None, _('list state of files needing merge')),
4869 ('m', 'mark', None, _('mark files as resolved')),
4869 ('m', 'mark', None, _('mark files as resolved')),
4870 ('u', 'unmark', None, _('mark files as unresolved')),
4870 ('u', 'unmark', None, _('mark files as unresolved')),
4871 ('n', 'no-status', None, _('hide status prefix'))]
4871 ('n', 'no-status', None, _('hide status prefix'))]
4872 + mergetoolopts + walkopts,
4872 + mergetoolopts + walkopts,
4873 _('[OPTION]... [FILE]...'))
4873 _('[OPTION]... [FILE]...'))
4874 def resolve(ui, repo, *pats, **opts):
4874 def resolve(ui, repo, *pats, **opts):
4875 """redo merges or set/view the merge status of files
4875 """redo merges or set/view the merge status of files
4876
4876
4877 Merges with unresolved conflicts are often the result of
4877 Merges with unresolved conflicts are often the result of
4878 non-interactive merging using the ``internal:merge`` configuration
4878 non-interactive merging using the ``internal:merge`` configuration
4879 setting, or a command-line merge tool like ``diff3``. The resolve
4879 setting, or a command-line merge tool like ``diff3``. The resolve
4880 command is used to manage the files involved in a merge, after
4880 command is used to manage the files involved in a merge, after
4881 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4881 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4882 working directory must have two parents). See :hg:`help
4882 working directory must have two parents). See :hg:`help
4883 merge-tools` for information on configuring merge tools.
4883 merge-tools` for information on configuring merge tools.
4884
4884
4885 The resolve command can be used in the following ways:
4885 The resolve command can be used in the following ways:
4886
4886
4887 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4887 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4888 files, discarding any previous merge attempts. Re-merging is not
4888 files, discarding any previous merge attempts. Re-merging is not
4889 performed for files already marked as resolved. Use ``--all/-a``
4889 performed for files already marked as resolved. Use ``--all/-a``
4890 to select all unresolved files. ``--tool`` can be used to specify
4890 to select all unresolved files. ``--tool`` can be used to specify
4891 the merge tool used for the given files. It overrides the HGMERGE
4891 the merge tool used for the given files. It overrides the HGMERGE
4892 environment variable and your configuration files. Previous file
4892 environment variable and your configuration files. Previous file
4893 contents are saved with a ``.orig`` suffix.
4893 contents are saved with a ``.orig`` suffix.
4894
4894
4895 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4895 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4896 (e.g. after having manually fixed-up the files). The default is
4896 (e.g. after having manually fixed-up the files). The default is
4897 to mark all unresolved files.
4897 to mark all unresolved files.
4898
4898
4899 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4899 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
4900 default is to mark all resolved files.
4900 default is to mark all resolved files.
4901
4901
4902 - :hg:`resolve -l`: list files which had or still have conflicts.
4902 - :hg:`resolve -l`: list files which had or still have conflicts.
4903 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4903 In the printed list, ``U`` = unresolved and ``R`` = resolved.
4904
4904
4905 Note that Mercurial will not let you commit files with unresolved
4905 Note that Mercurial will not let you commit files with unresolved
4906 merge conflicts. You must use :hg:`resolve -m ...` before you can
4906 merge conflicts. You must use :hg:`resolve -m ...` before you can
4907 commit after a conflicting merge.
4907 commit after a conflicting merge.
4908
4908
4909 Returns 0 on success, 1 if any files fail a resolve attempt.
4909 Returns 0 on success, 1 if any files fail a resolve attempt.
4910 """
4910 """
4911
4911
4912 all, mark, unmark, show, nostatus = \
4912 all, mark, unmark, show, nostatus = \
4913 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
4913 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
4914
4914
4915 if (show and (mark or unmark)) or (mark and unmark):
4915 if (show and (mark or unmark)) or (mark and unmark):
4916 raise util.Abort(_("too many options specified"))
4916 raise util.Abort(_("too many options specified"))
4917 if pats and all:
4917 if pats and all:
4918 raise util.Abort(_("can't specify --all and patterns"))
4918 raise util.Abort(_("can't specify --all and patterns"))
4919 if not (all or pats or show or mark or unmark):
4919 if not (all or pats or show or mark or unmark):
4920 raise util.Abort(_('no files or directories specified; '
4920 raise util.Abort(_('no files or directories specified; '
4921 'use --all to remerge all files'))
4921 'use --all to remerge all files'))
4922
4922
4923 ms = mergemod.mergestate(repo)
4923 ms = mergemod.mergestate(repo)
4924 m = scmutil.match(repo[None], pats, opts)
4924 m = scmutil.match(repo[None], pats, opts)
4925 ret = 0
4925 ret = 0
4926
4926
4927 for f in ms:
4927 for f in ms:
4928 if m(f):
4928 if m(f):
4929 if show:
4929 if show:
4930 if nostatus:
4930 if nostatus:
4931 ui.write("%s\n" % f)
4931 ui.write("%s\n" % f)
4932 else:
4932 else:
4933 ui.write("%s %s\n" % (ms[f].upper(), f),
4933 ui.write("%s %s\n" % (ms[f].upper(), f),
4934 label='resolve.' +
4934 label='resolve.' +
4935 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
4935 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
4936 elif mark:
4936 elif mark:
4937 ms.mark(f, "r")
4937 ms.mark(f, "r")
4938 elif unmark:
4938 elif unmark:
4939 ms.mark(f, "u")
4939 ms.mark(f, "u")
4940 else:
4940 else:
4941 wctx = repo[None]
4941 wctx = repo[None]
4942 mctx = wctx.parents()[-1]
4942 mctx = wctx.parents()[-1]
4943
4943
4944 # backup pre-resolve (merge uses .orig for its own purposes)
4944 # backup pre-resolve (merge uses .orig for its own purposes)
4945 a = repo.wjoin(f)
4945 a = repo.wjoin(f)
4946 util.copyfile(a, a + ".resolve")
4946 util.copyfile(a, a + ".resolve")
4947
4947
4948 try:
4948 try:
4949 # resolve file
4949 # resolve file
4950 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4950 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
4951 if ms.resolve(f, wctx, mctx):
4951 if ms.resolve(f, wctx, mctx):
4952 ret = 1
4952 ret = 1
4953 finally:
4953 finally:
4954 ui.setconfig('ui', 'forcemerge', '')
4954 ui.setconfig('ui', 'forcemerge', '')
4955 ms.commit()
4955 ms.commit()
4956
4956
4957 # replace filemerge's .orig file with our resolve file
4957 # replace filemerge's .orig file with our resolve file
4958 util.rename(a + ".resolve", a + ".orig")
4958 util.rename(a + ".resolve", a + ".orig")
4959
4959
4960 ms.commit()
4960 ms.commit()
4961 return ret
4961 return ret
4962
4962
4963 @command('revert',
4963 @command('revert',
4964 [('a', 'all', None, _('revert all changes when no arguments given')),
4964 [('a', 'all', None, _('revert all changes when no arguments given')),
4965 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4965 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
4966 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4966 ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
4967 ('C', 'no-backup', None, _('do not save backup copies of files')),
4967 ('C', 'no-backup', None, _('do not save backup copies of files')),
4968 ] + walkopts + dryrunopts,
4968 ] + walkopts + dryrunopts,
4969 _('[OPTION]... [-r REV] [NAME]...'))
4969 _('[OPTION]... [-r REV] [NAME]...'))
4970 def revert(ui, repo, *pats, **opts):
4970 def revert(ui, repo, *pats, **opts):
4971 """restore files to their checkout state
4971 """restore files to their checkout state
4972
4972
4973 .. note::
4973 .. note::
4974
4974
4975 To check out earlier revisions, you should use :hg:`update REV`.
4975 To check out earlier revisions, you should use :hg:`update REV`.
4976 To cancel an uncommitted merge (and lose your changes),
4976 To cancel an uncommitted merge (and lose your changes),
4977 use :hg:`update --clean .`.
4977 use :hg:`update --clean .`.
4978
4978
4979 With no revision specified, revert the specified files or directories
4979 With no revision specified, revert the specified files or directories
4980 to the contents they had in the parent of the working directory.
4980 to the contents they had in the parent of the working directory.
4981 This restores the contents of files to an unmodified
4981 This restores the contents of files to an unmodified
4982 state and unschedules adds, removes, copies, and renames. If the
4982 state and unschedules adds, removes, copies, and renames. If the
4983 working directory has two parents, you must explicitly specify a
4983 working directory has two parents, you must explicitly specify a
4984 revision.
4984 revision.
4985
4985
4986 Using the -r/--rev or -d/--date options, revert the given files or
4986 Using the -r/--rev or -d/--date options, revert the given files or
4987 directories to their states as of a specific revision. Because
4987 directories to their states as of a specific revision. Because
4988 revert does not change the working directory parents, this will
4988 revert does not change the working directory parents, this will
4989 cause these files to appear modified. This can be helpful to "back
4989 cause these files to appear modified. This can be helpful to "back
4990 out" some or all of an earlier change. See :hg:`backout` for a
4990 out" some or all of an earlier change. See :hg:`backout` for a
4991 related method.
4991 related method.
4992
4992
4993 Modified files are saved with a .orig suffix before reverting.
4993 Modified files are saved with a .orig suffix before reverting.
4994 To disable these backups, use --no-backup.
4994 To disable these backups, use --no-backup.
4995
4995
4996 See :hg:`help dates` for a list of formats valid for -d/--date.
4996 See :hg:`help dates` for a list of formats valid for -d/--date.
4997
4997
4998 Returns 0 on success.
4998 Returns 0 on success.
4999 """
4999 """
5000
5000
5001 if opts.get("date"):
5001 if opts.get("date"):
5002 if opts.get("rev"):
5002 if opts.get("rev"):
5003 raise util.Abort(_("you can't specify a revision and a date"))
5003 raise util.Abort(_("you can't specify a revision and a date"))
5004 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
5004 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
5005
5005
5006 parent, p2 = repo.dirstate.parents()
5006 parent, p2 = repo.dirstate.parents()
5007 if not opts.get('rev') and p2 != nullid:
5007 if not opts.get('rev') and p2 != nullid:
5008 # revert after merge is a trap for new users (issue2915)
5008 # revert after merge is a trap for new users (issue2915)
5009 raise util.Abort(_('uncommitted merge with no revision specified'),
5009 raise util.Abort(_('uncommitted merge with no revision specified'),
5010 hint=_('use "hg update" or see "hg help revert"'))
5010 hint=_('use "hg update" or see "hg help revert"'))
5011
5011
5012 ctx = scmutil.revsingle(repo, opts.get('rev'))
5012 ctx = scmutil.revsingle(repo, opts.get('rev'))
5013
5013
5014 if not pats and not opts.get('all'):
5014 if not pats and not opts.get('all'):
5015 msg = _("no files or directories specified")
5015 msg = _("no files or directories specified")
5016 if p2 != nullid:
5016 if p2 != nullid:
5017 hint = _("uncommitted merge, use --all to discard all changes,"
5017 hint = _("uncommitted merge, use --all to discard all changes,"
5018 " or 'hg update -C .' to abort the merge")
5018 " or 'hg update -C .' to abort the merge")
5019 raise util.Abort(msg, hint=hint)
5019 raise util.Abort(msg, hint=hint)
5020 dirty = util.any(repo.status())
5020 dirty = util.any(repo.status())
5021 node = ctx.node()
5021 node = ctx.node()
5022 if node != parent:
5022 if node != parent:
5023 if dirty:
5023 if dirty:
5024 hint = _("uncommitted changes, use --all to discard all"
5024 hint = _("uncommitted changes, use --all to discard all"
5025 " changes, or 'hg update %s' to update") % ctx.rev()
5025 " changes, or 'hg update %s' to update") % ctx.rev()
5026 else:
5026 else:
5027 hint = _("use --all to revert all files,"
5027 hint = _("use --all to revert all files,"
5028 " or 'hg update %s' to update") % ctx.rev()
5028 " or 'hg update %s' to update") % ctx.rev()
5029 elif dirty:
5029 elif dirty:
5030 hint = _("uncommitted changes, use --all to discard all changes")
5030 hint = _("uncommitted changes, use --all to discard all changes")
5031 else:
5031 else:
5032 hint = _("use --all to revert all files")
5032 hint = _("use --all to revert all files")
5033 raise util.Abort(msg, hint=hint)
5033 raise util.Abort(msg, hint=hint)
5034
5034
5035 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
5035 return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts)
5036
5036
5037 @command('rollback', dryrunopts +
5037 @command('rollback', dryrunopts +
5038 [('f', 'force', False, _('ignore safety measures'))])
5038 [('f', 'force', False, _('ignore safety measures'))])
5039 def rollback(ui, repo, **opts):
5039 def rollback(ui, repo, **opts):
5040 """roll back the last transaction (DANGEROUS) (DEPRECATED)
5040 """roll back the last transaction (DANGEROUS) (DEPRECATED)
5041
5041
5042 Please use :hg:`commit --amend` instead of rollback to correct
5042 Please use :hg:`commit --amend` instead of rollback to correct
5043 mistakes in the last commit.
5043 mistakes in the last commit.
5044
5044
5045 This command should be used with care. There is only one level of
5045 This command should be used with care. There is only one level of
5046 rollback, and there is no way to undo a rollback. It will also
5046 rollback, and there is no way to undo a rollback. It will also
5047 restore the dirstate at the time of the last transaction, losing
5047 restore the dirstate at the time of the last transaction, losing
5048 any dirstate changes since that time. This command does not alter
5048 any dirstate changes since that time. This command does not alter
5049 the working directory.
5049 the working directory.
5050
5050
5051 Transactions are used to encapsulate the effects of all commands
5051 Transactions are used to encapsulate the effects of all commands
5052 that create new changesets or propagate existing changesets into a
5052 that create new changesets or propagate existing changesets into a
5053 repository.
5053 repository.
5054
5054
5055 .. container:: verbose
5055 .. container:: verbose
5056
5056
5057 For example, the following commands are transactional, and their
5057 For example, the following commands are transactional, and their
5058 effects can be rolled back:
5058 effects can be rolled back:
5059
5059
5060 - commit
5060 - commit
5061 - import
5061 - import
5062 - pull
5062 - pull
5063 - push (with this repository as the destination)
5063 - push (with this repository as the destination)
5064 - unbundle
5064 - unbundle
5065
5065
5066 To avoid permanent data loss, rollback will refuse to rollback a
5066 To avoid permanent data loss, rollback will refuse to rollback a
5067 commit transaction if it isn't checked out. Use --force to
5067 commit transaction if it isn't checked out. Use --force to
5068 override this protection.
5068 override this protection.
5069
5069
5070 This command is not intended for use on public repositories. Once
5070 This command is not intended for use on public repositories. Once
5071 changes are visible for pull by other users, rolling a transaction
5071 changes are visible for pull by other users, rolling a transaction
5072 back locally is ineffective (someone else may already have pulled
5072 back locally is ineffective (someone else may already have pulled
5073 the changes). Furthermore, a race is possible with readers of the
5073 the changes). Furthermore, a race is possible with readers of the
5074 repository; for example an in-progress pull from the repository
5074 repository; for example an in-progress pull from the repository
5075 may fail if a rollback is performed.
5075 may fail if a rollback is performed.
5076
5076
5077 Returns 0 on success, 1 if no rollback data is available.
5077 Returns 0 on success, 1 if no rollback data is available.
5078 """
5078 """
5079 return repo.rollback(dryrun=opts.get('dry_run'),
5079 return repo.rollback(dryrun=opts.get('dry_run'),
5080 force=opts.get('force'))
5080 force=opts.get('force'))
5081
5081
5082 @command('root', [])
5082 @command('root', [])
5083 def root(ui, repo):
5083 def root(ui, repo):
5084 """print the root (top) of the current working directory
5084 """print the root (top) of the current working directory
5085
5085
5086 Print the root directory of the current repository.
5086 Print the root directory of the current repository.
5087
5087
5088 Returns 0 on success.
5088 Returns 0 on success.
5089 """
5089 """
5090 ui.write(repo.root + "\n")
5090 ui.write(repo.root + "\n")
5091
5091
5092 @command('^serve',
5092 @command('^serve',
5093 [('A', 'accesslog', '', _('name of access log file to write to'),
5093 [('A', 'accesslog', '', _('name of access log file to write to'),
5094 _('FILE')),
5094 _('FILE')),
5095 ('d', 'daemon', None, _('run server in background')),
5095 ('d', 'daemon', None, _('run server in background')),
5096 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')),
5096 ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')),
5097 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
5097 ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')),
5098 # use string type, then we can check if something was passed
5098 # use string type, then we can check if something was passed
5099 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
5099 ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')),
5100 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
5100 ('a', 'address', '', _('address to listen on (default: all interfaces)'),
5101 _('ADDR')),
5101 _('ADDR')),
5102 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
5102 ('', 'prefix', '', _('prefix path to serve from (default: server root)'),
5103 _('PREFIX')),
5103 _('PREFIX')),
5104 ('n', 'name', '',
5104 ('n', 'name', '',
5105 _('name to show in web pages (default: working directory)'), _('NAME')),
5105 _('name to show in web pages (default: working directory)'), _('NAME')),
5106 ('', 'web-conf', '',
5106 ('', 'web-conf', '',
5107 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
5107 _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')),
5108 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
5108 ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'),
5109 _('FILE')),
5109 _('FILE')),
5110 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
5110 ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')),
5111 ('', 'stdio', None, _('for remote clients')),
5111 ('', 'stdio', None, _('for remote clients')),
5112 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
5112 ('', 'cmdserver', '', _('for remote clients'), _('MODE')),
5113 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
5113 ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')),
5114 ('', 'style', '', _('template style to use'), _('STYLE')),
5114 ('', 'style', '', _('template style to use'), _('STYLE')),
5115 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
5115 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
5116 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
5116 ('', 'certificate', '', _('SSL certificate file'), _('FILE'))],
5117 _('[OPTION]...'))
5117 _('[OPTION]...'))
5118 def serve(ui, repo, **opts):
5118 def serve(ui, repo, **opts):
5119 """start stand-alone webserver
5119 """start stand-alone webserver
5120
5120
5121 Start a local HTTP repository browser and pull server. You can use
5121 Start a local HTTP repository browser and pull server. You can use
5122 this for ad-hoc sharing and browsing of repositories. It is
5122 this for ad-hoc sharing and browsing of repositories. It is
5123 recommended to use a real web server to serve a repository for
5123 recommended to use a real web server to serve a repository for
5124 longer periods of time.
5124 longer periods of time.
5125
5125
5126 Please note that the server does not implement access control.
5126 Please note that the server does not implement access control.
5127 This means that, by default, anybody can read from the server and
5127 This means that, by default, anybody can read from the server and
5128 nobody can write to it by default. Set the ``web.allow_push``
5128 nobody can write to it by default. Set the ``web.allow_push``
5129 option to ``*`` to allow everybody to push to the server. You
5129 option to ``*`` to allow everybody to push to the server. You
5130 should use a real web server if you need to authenticate users.
5130 should use a real web server if you need to authenticate users.
5131
5131
5132 By default, the server logs accesses to stdout and errors to
5132 By default, the server logs accesses to stdout and errors to
5133 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5133 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
5134 files.
5134 files.
5135
5135
5136 To have the server choose a free port number to listen on, specify
5136 To have the server choose a free port number to listen on, specify
5137 a port number of 0; in this case, the server will print the port
5137 a port number of 0; in this case, the server will print the port
5138 number it uses.
5138 number it uses.
5139
5139
5140 Returns 0 on success.
5140 Returns 0 on success.
5141 """
5141 """
5142
5142
5143 if opts["stdio"] and opts["cmdserver"]:
5143 if opts["stdio"] and opts["cmdserver"]:
5144 raise util.Abort(_("cannot use --stdio with --cmdserver"))
5144 raise util.Abort(_("cannot use --stdio with --cmdserver"))
5145
5145
5146 def checkrepo():
5146 def checkrepo():
5147 if repo is None:
5147 if repo is None:
5148 raise error.RepoError(_("there is no Mercurial repository here"
5148 raise error.RepoError(_("there is no Mercurial repository here"
5149 " (.hg not found)"))
5149 " (.hg not found)"))
5150
5150
5151 if opts["stdio"]:
5151 if opts["stdio"]:
5152 checkrepo()
5152 checkrepo()
5153 s = sshserver.sshserver(ui, repo)
5153 s = sshserver.sshserver(ui, repo)
5154 s.serve_forever()
5154 s.serve_forever()
5155
5155
5156 if opts["cmdserver"]:
5156 if opts["cmdserver"]:
5157 checkrepo()
5157 checkrepo()
5158 s = commandserver.server(ui, repo, opts["cmdserver"])
5158 s = commandserver.server(ui, repo, opts["cmdserver"])
5159 return s.serve()
5159 return s.serve()
5160
5160
5161 # this way we can check if something was given in the command-line
5161 # this way we can check if something was given in the command-line
5162 if opts.get('port'):
5162 if opts.get('port'):
5163 opts['port'] = util.getport(opts.get('port'))
5163 opts['port'] = util.getport(opts.get('port'))
5164
5164
5165 baseui = repo and repo.baseui or ui
5165 baseui = repo and repo.baseui or ui
5166 optlist = ("name templates style address port prefix ipv6"
5166 optlist = ("name templates style address port prefix ipv6"
5167 " accesslog errorlog certificate encoding")
5167 " accesslog errorlog certificate encoding")
5168 for o in optlist.split():
5168 for o in optlist.split():
5169 val = opts.get(o, '')
5169 val = opts.get(o, '')
5170 if val in (None, ''): # should check against default options instead
5170 if val in (None, ''): # should check against default options instead
5171 continue
5171 continue
5172 baseui.setconfig("web", o, val)
5172 baseui.setconfig("web", o, val)
5173 if repo and repo.ui != baseui:
5173 if repo and repo.ui != baseui:
5174 repo.ui.setconfig("web", o, val)
5174 repo.ui.setconfig("web", o, val)
5175
5175
5176 o = opts.get('web_conf') or opts.get('webdir_conf')
5176 o = opts.get('web_conf') or opts.get('webdir_conf')
5177 if not o:
5177 if not o:
5178 if not repo:
5178 if not repo:
5179 raise error.RepoError(_("there is no Mercurial repository"
5179 raise error.RepoError(_("there is no Mercurial repository"
5180 " here (.hg not found)"))
5180 " here (.hg not found)"))
5181 o = repo
5181 o = repo
5182
5182
5183 app = hgweb.hgweb(o, baseui=baseui)
5183 app = hgweb.hgweb(o, baseui=baseui)
5184 service = httpservice(ui, app, opts)
5184 service = httpservice(ui, app, opts)
5185 cmdutil.service(opts, initfn=service.init, runfn=service.run)
5185 cmdutil.service(opts, initfn=service.init, runfn=service.run)
5186
5186
5187 class httpservice(object):
5187 class httpservice(object):
5188 def __init__(self, ui, app, opts):
5188 def __init__(self, ui, app, opts):
5189 self.ui = ui
5189 self.ui = ui
5190 self.app = app
5190 self.app = app
5191 self.opts = opts
5191 self.opts = opts
5192
5192
5193 def init(self):
5193 def init(self):
5194 util.setsignalhandler()
5194 util.setsignalhandler()
5195 self.httpd = hgweb_server.create_server(self.ui, self.app)
5195 self.httpd = hgweb_server.create_server(self.ui, self.app)
5196
5196
5197 if self.opts['port'] and not self.ui.verbose:
5197 if self.opts['port'] and not self.ui.verbose:
5198 return
5198 return
5199
5199
5200 if self.httpd.prefix:
5200 if self.httpd.prefix:
5201 prefix = self.httpd.prefix.strip('/') + '/'
5201 prefix = self.httpd.prefix.strip('/') + '/'
5202 else:
5202 else:
5203 prefix = ''
5203 prefix = ''
5204
5204
5205 port = ':%d' % self.httpd.port
5205 port = ':%d' % self.httpd.port
5206 if port == ':80':
5206 if port == ':80':
5207 port = ''
5207 port = ''
5208
5208
5209 bindaddr = self.httpd.addr
5209 bindaddr = self.httpd.addr
5210 if bindaddr == '0.0.0.0':
5210 if bindaddr == '0.0.0.0':
5211 bindaddr = '*'
5211 bindaddr = '*'
5212 elif ':' in bindaddr: # IPv6
5212 elif ':' in bindaddr: # IPv6
5213 bindaddr = '[%s]' % bindaddr
5213 bindaddr = '[%s]' % bindaddr
5214
5214
5215 fqaddr = self.httpd.fqaddr
5215 fqaddr = self.httpd.fqaddr
5216 if ':' in fqaddr:
5216 if ':' in fqaddr:
5217 fqaddr = '[%s]' % fqaddr
5217 fqaddr = '[%s]' % fqaddr
5218 if self.opts['port']:
5218 if self.opts['port']:
5219 write = self.ui.status
5219 write = self.ui.status
5220 else:
5220 else:
5221 write = self.ui.write
5221 write = self.ui.write
5222 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
5222 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
5223 (fqaddr, port, prefix, bindaddr, self.httpd.port))
5223 (fqaddr, port, prefix, bindaddr, self.httpd.port))
5224
5224
5225 def run(self):
5225 def run(self):
5226 self.httpd.serve_forever()
5226 self.httpd.serve_forever()
5227
5227
5228
5228
5229 @command('showconfig|debugconfig',
5229 @command('showconfig|debugconfig',
5230 [('u', 'untrusted', None, _('show untrusted configuration options'))],
5230 [('u', 'untrusted', None, _('show untrusted configuration options'))],
5231 _('[-u] [NAME]...'))
5231 _('[-u] [NAME]...'))
5232 def showconfig(ui, repo, *values, **opts):
5232 def showconfig(ui, repo, *values, **opts):
5233 """show combined config settings from all hgrc files
5233 """show combined config settings from all hgrc files
5234
5234
5235 With no arguments, print names and values of all config items.
5235 With no arguments, print names and values of all config items.
5236
5236
5237 With one argument of the form section.name, print just the value
5237 With one argument of the form section.name, print just the value
5238 of that config item.
5238 of that config item.
5239
5239
5240 With multiple arguments, print names and values of all config
5240 With multiple arguments, print names and values of all config
5241 items with matching section names.
5241 items with matching section names.
5242
5242
5243 With --debug, the source (filename and line number) is printed
5243 With --debug, the source (filename and line number) is printed
5244 for each config item.
5244 for each config item.
5245
5245
5246 Returns 0 on success.
5246 Returns 0 on success.
5247 """
5247 """
5248
5248
5249 for f in scmutil.rcpath():
5249 for f in scmutil.rcpath():
5250 ui.debug('read config from: %s\n' % f)
5250 ui.debug('read config from: %s\n' % f)
5251 untrusted = bool(opts.get('untrusted'))
5251 untrusted = bool(opts.get('untrusted'))
5252 if values:
5252 if values:
5253 sections = [v for v in values if '.' not in v]
5253 sections = [v for v in values if '.' not in v]
5254 items = [v for v in values if '.' in v]
5254 items = [v for v in values if '.' in v]
5255 if len(items) > 1 or items and sections:
5255 if len(items) > 1 or items and sections:
5256 raise util.Abort(_('only one config item permitted'))
5256 raise util.Abort(_('only one config item permitted'))
5257 for section, name, value in ui.walkconfig(untrusted=untrusted):
5257 for section, name, value in ui.walkconfig(untrusted=untrusted):
5258 value = str(value).replace('\n', '\\n')
5258 value = str(value).replace('\n', '\\n')
5259 sectname = section + '.' + name
5259 sectname = section + '.' + name
5260 if values:
5260 if values:
5261 for v in values:
5261 for v in values:
5262 if v == section:
5262 if v == section:
5263 ui.debug('%s: ' %
5263 ui.debug('%s: ' %
5264 ui.configsource(section, name, untrusted))
5264 ui.configsource(section, name, untrusted))
5265 ui.write('%s=%s\n' % (sectname, value))
5265 ui.write('%s=%s\n' % (sectname, value))
5266 elif v == sectname:
5266 elif v == sectname:
5267 ui.debug('%s: ' %
5267 ui.debug('%s: ' %
5268 ui.configsource(section, name, untrusted))
5268 ui.configsource(section, name, untrusted))
5269 ui.write(value, '\n')
5269 ui.write(value, '\n')
5270 else:
5270 else:
5271 ui.debug('%s: ' %
5271 ui.debug('%s: ' %
5272 ui.configsource(section, name, untrusted))
5272 ui.configsource(section, name, untrusted))
5273 ui.write('%s=%s\n' % (sectname, value))
5273 ui.write('%s=%s\n' % (sectname, value))
5274
5274
5275 @command('^status|st',
5275 @command('^status|st',
5276 [('A', 'all', None, _('show status of all files')),
5276 [('A', 'all', None, _('show status of all files')),
5277 ('m', 'modified', None, _('show only modified files')),
5277 ('m', 'modified', None, _('show only modified files')),
5278 ('a', 'added', None, _('show only added files')),
5278 ('a', 'added', None, _('show only added files')),
5279 ('r', 'removed', None, _('show only removed files')),
5279 ('r', 'removed', None, _('show only removed files')),
5280 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5280 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
5281 ('c', 'clean', None, _('show only files without changes')),
5281 ('c', 'clean', None, _('show only files without changes')),
5282 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5282 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
5283 ('i', 'ignored', None, _('show only ignored files')),
5283 ('i', 'ignored', None, _('show only ignored files')),
5284 ('n', 'no-status', None, _('hide status prefix')),
5284 ('n', 'no-status', None, _('hide status prefix')),
5285 ('C', 'copies', None, _('show source of copied files')),
5285 ('C', 'copies', None, _('show source of copied files')),
5286 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5286 ('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
5287 ('', 'rev', [], _('show difference from revision'), _('REV')),
5287 ('', 'rev', [], _('show difference from revision'), _('REV')),
5288 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5288 ('', 'change', '', _('list the changed files of a revision'), _('REV')),
5289 ] + walkopts + subrepoopts,
5289 ] + walkopts + subrepoopts,
5290 _('[OPTION]... [FILE]...'))
5290 _('[OPTION]... [FILE]...'))
5291 def status(ui, repo, *pats, **opts):
5291 def status(ui, repo, *pats, **opts):
5292 """show changed files in the working directory
5292 """show changed files in the working directory
5293
5293
5294 Show status of files in the repository. If names are given, only
5294 Show status of files in the repository. If names are given, only
5295 files that match are shown. Files that are clean or ignored or
5295 files that match are shown. Files that are clean or ignored or
5296 the source of a copy/move operation, are not listed unless
5296 the source of a copy/move operation, are not listed unless
5297 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5297 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
5298 Unless options described with "show only ..." are given, the
5298 Unless options described with "show only ..." are given, the
5299 options -mardu are used.
5299 options -mardu are used.
5300
5300
5301 Option -q/--quiet hides untracked (unknown and ignored) files
5301 Option -q/--quiet hides untracked (unknown and ignored) files
5302 unless explicitly requested with -u/--unknown or -i/--ignored.
5302 unless explicitly requested with -u/--unknown or -i/--ignored.
5303
5303
5304 .. note::
5304 .. note::
5305
5305
5306 status may appear to disagree with diff if permissions have
5306 status may appear to disagree with diff if permissions have
5307 changed or a merge has occurred. The standard diff format does
5307 changed or a merge has occurred. The standard diff format does
5308 not report permission changes and diff only reports changes
5308 not report permission changes and diff only reports changes
5309 relative to one merge parent.
5309 relative to one merge parent.
5310
5310
5311 If one revision is given, it is used as the base revision.
5311 If one revision is given, it is used as the base revision.
5312 If two revisions are given, the differences between them are
5312 If two revisions are given, the differences between them are
5313 shown. The --change option can also be used as a shortcut to list
5313 shown. The --change option can also be used as a shortcut to list
5314 the changed files of a revision from its first parent.
5314 the changed files of a revision from its first parent.
5315
5315
5316 The codes used to show the status of files are::
5316 The codes used to show the status of files are::
5317
5317
5318 M = modified
5318 M = modified
5319 A = added
5319 A = added
5320 R = removed
5320 R = removed
5321 C = clean
5321 C = clean
5322 ! = missing (deleted by non-hg command, but still tracked)
5322 ! = missing (deleted by non-hg command, but still tracked)
5323 ? = not tracked
5323 ? = not tracked
5324 I = ignored
5324 I = ignored
5325 = origin of the previous file listed as A (added)
5325 = origin of the previous file listed as A (added)
5326
5326
5327 .. container:: verbose
5327 .. container:: verbose
5328
5328
5329 Examples:
5329 Examples:
5330
5330
5331 - show changes in the working directory relative to a
5331 - show changes in the working directory relative to a
5332 changeset::
5332 changeset::
5333
5333
5334 hg status --rev 9353
5334 hg status --rev 9353
5335
5335
5336 - show all changes including copies in an existing changeset::
5336 - show all changes including copies in an existing changeset::
5337
5337
5338 hg status --copies --change 9353
5338 hg status --copies --change 9353
5339
5339
5340 - get a NUL separated list of added files, suitable for xargs::
5340 - get a NUL separated list of added files, suitable for xargs::
5341
5341
5342 hg status -an0
5342 hg status -an0
5343
5343
5344 Returns 0 on success.
5344 Returns 0 on success.
5345 """
5345 """
5346
5346
5347 revs = opts.get('rev')
5347 revs = opts.get('rev')
5348 change = opts.get('change')
5348 change = opts.get('change')
5349
5349
5350 if revs and change:
5350 if revs and change:
5351 msg = _('cannot specify --rev and --change at the same time')
5351 msg = _('cannot specify --rev and --change at the same time')
5352 raise util.Abort(msg)
5352 raise util.Abort(msg)
5353 elif change:
5353 elif change:
5354 node2 = scmutil.revsingle(repo, change, None).node()
5354 node2 = scmutil.revsingle(repo, change, None).node()
5355 node1 = repo[node2].p1().node()
5355 node1 = repo[node2].p1().node()
5356 else:
5356 else:
5357 node1, node2 = scmutil.revpair(repo, revs)
5357 node1, node2 = scmutil.revpair(repo, revs)
5358
5358
5359 cwd = (pats and repo.getcwd()) or ''
5359 cwd = (pats and repo.getcwd()) or ''
5360 end = opts.get('print0') and '\0' or '\n'
5360 end = opts.get('print0') and '\0' or '\n'
5361 copy = {}
5361 copy = {}
5362 states = 'modified added removed deleted unknown ignored clean'.split()
5362 states = 'modified added removed deleted unknown ignored clean'.split()
5363 show = [k for k in states if opts.get(k)]
5363 show = [k for k in states if opts.get(k)]
5364 if opts.get('all'):
5364 if opts.get('all'):
5365 show += ui.quiet and (states[:4] + ['clean']) or states
5365 show += ui.quiet and (states[:4] + ['clean']) or states
5366 if not show:
5366 if not show:
5367 show = ui.quiet and states[:4] or states[:5]
5367 show = ui.quiet and states[:4] or states[:5]
5368
5368
5369 stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts),
5369 stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts),
5370 'ignored' in show, 'clean' in show, 'unknown' in show,
5370 'ignored' in show, 'clean' in show, 'unknown' in show,
5371 opts.get('subrepos'))
5371 opts.get('subrepos'))
5372 changestates = zip(states, 'MAR!?IC', stat)
5372 changestates = zip(states, 'MAR!?IC', stat)
5373
5373
5374 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
5374 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
5375 copy = copies.pathcopies(repo[node1], repo[node2])
5375 copy = copies.pathcopies(repo[node1], repo[node2])
5376
5376
5377 fm = ui.formatter('status', opts)
5377 fm = ui.formatter('status', opts)
5378 fmt = '%s' + end
5378 fmt = '%s' + end
5379 showchar = not opts.get('no_status')
5379 showchar = not opts.get('no_status')
5380
5380
5381 for state, char, files in changestates:
5381 for state, char, files in changestates:
5382 if state in show:
5382 if state in show:
5383 label = 'status.' + state
5383 label = 'status.' + state
5384 for f in files:
5384 for f in files:
5385 fm.startitem()
5385 fm.startitem()
5386 fm.condwrite(showchar, 'status', '%s ', char, label=label)
5386 fm.condwrite(showchar, 'status', '%s ', char, label=label)
5387 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
5387 fm.write('path', fmt, repo.pathto(f, cwd), label=label)
5388 if f in copy:
5388 if f in copy:
5389 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
5389 fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd),
5390 label='status.copied')
5390 label='status.copied')
5391 fm.end()
5391 fm.end()
5392
5392
5393 @command('^summary|sum',
5393 @command('^summary|sum',
5394 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
5394 [('', 'remote', None, _('check for push and pull'))], '[--remote]')
5395 def summary(ui, repo, **opts):
5395 def summary(ui, repo, **opts):
5396 """summarize working directory state
5396 """summarize working directory state
5397
5397
5398 This generates a brief summary of the working directory state,
5398 This generates a brief summary of the working directory state,
5399 including parents, branch, commit status, and available updates.
5399 including parents, branch, commit status, and available updates.
5400
5400
5401 With the --remote option, this will check the default paths for
5401 With the --remote option, this will check the default paths for
5402 incoming and outgoing changes. This can be time-consuming.
5402 incoming and outgoing changes. This can be time-consuming.
5403
5403
5404 Returns 0 on success.
5404 Returns 0 on success.
5405 """
5405 """
5406
5406
5407 ctx = repo[None]
5407 ctx = repo[None]
5408 parents = ctx.parents()
5408 parents = ctx.parents()
5409 pnode = parents[0].node()
5409 pnode = parents[0].node()
5410 marks = []
5410 marks = []
5411
5411
5412 for p in parents:
5412 for p in parents:
5413 # label with log.changeset (instead of log.parent) since this
5413 # label with log.changeset (instead of log.parent) since this
5414 # shows a working directory parent *changeset*:
5414 # shows a working directory parent *changeset*:
5415 # i18n: column positioning for "hg summary"
5415 # i18n: column positioning for "hg summary"
5416 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
5416 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
5417 label='log.changeset changeset.%s' % p.phasestr())
5417 label='log.changeset changeset.%s' % p.phasestr())
5418 ui.write(' '.join(p.tags()), label='log.tag')
5418 ui.write(' '.join(p.tags()), label='log.tag')
5419 if p.bookmarks():
5419 if p.bookmarks():
5420 marks.extend(p.bookmarks())
5420 marks.extend(p.bookmarks())
5421 if p.rev() == -1:
5421 if p.rev() == -1:
5422 if not len(repo):
5422 if not len(repo):
5423 ui.write(_(' (empty repository)'))
5423 ui.write(_(' (empty repository)'))
5424 else:
5424 else:
5425 ui.write(_(' (no revision checked out)'))
5425 ui.write(_(' (no revision checked out)'))
5426 ui.write('\n')
5426 ui.write('\n')
5427 if p.description():
5427 if p.description():
5428 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5428 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
5429 label='log.summary')
5429 label='log.summary')
5430
5430
5431 branch = ctx.branch()
5431 branch = ctx.branch()
5432 bheads = repo.branchheads(branch)
5432 bheads = repo.branchheads(branch)
5433 # i18n: column positioning for "hg summary"
5433 # i18n: column positioning for "hg summary"
5434 m = _('branch: %s\n') % branch
5434 m = _('branch: %s\n') % branch
5435 if branch != 'default':
5435 if branch != 'default':
5436 ui.write(m, label='log.branch')
5436 ui.write(m, label='log.branch')
5437 else:
5437 else:
5438 ui.status(m, label='log.branch')
5438 ui.status(m, label='log.branch')
5439
5439
5440 if marks:
5440 if marks:
5441 current = repo._bookmarkcurrent
5441 current = repo._bookmarkcurrent
5442 # i18n: column positioning for "hg summary"
5442 # i18n: column positioning for "hg summary"
5443 ui.write(_('bookmarks:'), label='log.bookmark')
5443 ui.write(_('bookmarks:'), label='log.bookmark')
5444 if current is not None:
5444 if current is not None:
5445 if current in marks:
5445 if current in marks:
5446 ui.write(' *' + current, label='bookmarks.current')
5446 ui.write(' *' + current, label='bookmarks.current')
5447 marks.remove(current)
5447 marks.remove(current)
5448 else:
5448 else:
5449 ui.write(' [%s]' % current, label='bookmarks.current')
5449 ui.write(' [%s]' % current, label='bookmarks.current')
5450 for m in marks:
5450 for m in marks:
5451 ui.write(' ' + m, label='log.bookmark')
5451 ui.write(' ' + m, label='log.bookmark')
5452 ui.write('\n', label='log.bookmark')
5452 ui.write('\n', label='log.bookmark')
5453
5453
5454 st = list(repo.status(unknown=True))[:6]
5454 st = list(repo.status(unknown=True))[:6]
5455
5455
5456 c = repo.dirstate.copies()
5456 c = repo.dirstate.copies()
5457 copied, renamed = [], []
5457 copied, renamed = [], []
5458 for d, s in c.iteritems():
5458 for d, s in c.iteritems():
5459 if s in st[2]:
5459 if s in st[2]:
5460 st[2].remove(s)
5460 st[2].remove(s)
5461 renamed.append(d)
5461 renamed.append(d)
5462 else:
5462 else:
5463 copied.append(d)
5463 copied.append(d)
5464 if d in st[1]:
5464 if d in st[1]:
5465 st[1].remove(d)
5465 st[1].remove(d)
5466 st.insert(3, renamed)
5466 st.insert(3, renamed)
5467 st.insert(4, copied)
5467 st.insert(4, copied)
5468
5468
5469 ms = mergemod.mergestate(repo)
5469 ms = mergemod.mergestate(repo)
5470 st.append([f for f in ms if ms[f] == 'u'])
5470 st.append([f for f in ms if ms[f] == 'u'])
5471
5471
5472 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5472 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
5473 st.append(subs)
5473 st.append(subs)
5474
5474
5475 labels = [ui.label(_('%d modified'), 'status.modified'),
5475 labels = [ui.label(_('%d modified'), 'status.modified'),
5476 ui.label(_('%d added'), 'status.added'),
5476 ui.label(_('%d added'), 'status.added'),
5477 ui.label(_('%d removed'), 'status.removed'),
5477 ui.label(_('%d removed'), 'status.removed'),
5478 ui.label(_('%d renamed'), 'status.copied'),
5478 ui.label(_('%d renamed'), 'status.copied'),
5479 ui.label(_('%d copied'), 'status.copied'),
5479 ui.label(_('%d copied'), 'status.copied'),
5480 ui.label(_('%d deleted'), 'status.deleted'),
5480 ui.label(_('%d deleted'), 'status.deleted'),
5481 ui.label(_('%d unknown'), 'status.unknown'),
5481 ui.label(_('%d unknown'), 'status.unknown'),
5482 ui.label(_('%d ignored'), 'status.ignored'),
5482 ui.label(_('%d ignored'), 'status.ignored'),
5483 ui.label(_('%d unresolved'), 'resolve.unresolved'),
5483 ui.label(_('%d unresolved'), 'resolve.unresolved'),
5484 ui.label(_('%d subrepos'), 'status.modified')]
5484 ui.label(_('%d subrepos'), 'status.modified')]
5485 t = []
5485 t = []
5486 for s, l in zip(st, labels):
5486 for s, l in zip(st, labels):
5487 if s:
5487 if s:
5488 t.append(l % len(s))
5488 t.append(l % len(s))
5489
5489
5490 t = ', '.join(t)
5490 t = ', '.join(t)
5491 cleanworkdir = False
5491 cleanworkdir = False
5492
5492
5493 if repo.vfs.exists('updatestate'):
5493 if repo.vfs.exists('updatestate'):
5494 t += _(' (interrupted update)')
5494 t += _(' (interrupted update)')
5495 elif len(parents) > 1:
5495 elif len(parents) > 1:
5496 t += _(' (merge)')
5496 t += _(' (merge)')
5497 elif branch != parents[0].branch():
5497 elif branch != parents[0].branch():
5498 t += _(' (new branch)')
5498 t += _(' (new branch)')
5499 elif (parents[0].closesbranch() and
5499 elif (parents[0].closesbranch() and
5500 pnode in repo.branchheads(branch, closed=True)):
5500 pnode in repo.branchheads(branch, closed=True)):
5501 t += _(' (head closed)')
5501 t += _(' (head closed)')
5502 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]):
5502 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]):
5503 t += _(' (clean)')
5503 t += _(' (clean)')
5504 cleanworkdir = True
5504 cleanworkdir = True
5505 elif pnode not in bheads:
5505 elif pnode not in bheads:
5506 t += _(' (new branch head)')
5506 t += _(' (new branch head)')
5507
5507
5508 if cleanworkdir:
5508 if cleanworkdir:
5509 # i18n: column positioning for "hg summary"
5509 # i18n: column positioning for "hg summary"
5510 ui.status(_('commit: %s\n') % t.strip())
5510 ui.status(_('commit: %s\n') % t.strip())
5511 else:
5511 else:
5512 # i18n: column positioning for "hg summary"
5512 # i18n: column positioning for "hg summary"
5513 ui.write(_('commit: %s\n') % t.strip())
5513 ui.write(_('commit: %s\n') % t.strip())
5514
5514
5515 # all ancestors of branch heads - all ancestors of parent = new csets
5515 # all ancestors of branch heads - all ancestors of parent = new csets
5516 new = len(repo.changelog.findmissing([ctx.node() for ctx in parents],
5516 new = len(repo.changelog.findmissing([ctx.node() for ctx in parents],
5517 bheads))
5517 bheads))
5518
5518
5519 if new == 0:
5519 if new == 0:
5520 # i18n: column positioning for "hg summary"
5520 # i18n: column positioning for "hg summary"
5521 ui.status(_('update: (current)\n'))
5521 ui.status(_('update: (current)\n'))
5522 elif pnode not in bheads:
5522 elif pnode not in bheads:
5523 # i18n: column positioning for "hg summary"
5523 # i18n: column positioning for "hg summary"
5524 ui.write(_('update: %d new changesets (update)\n') % new)
5524 ui.write(_('update: %d new changesets (update)\n') % new)
5525 else:
5525 else:
5526 # i18n: column positioning for "hg summary"
5526 # i18n: column positioning for "hg summary"
5527 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5527 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
5528 (new, len(bheads)))
5528 (new, len(bheads)))
5529
5529
5530 cmdutil.summaryhooks(ui, repo)
5530 cmdutil.summaryhooks(ui, repo)
5531
5531
5532 if opts.get('remote'):
5532 if opts.get('remote'):
5533 t = []
5533 t = []
5534 source, branches = hg.parseurl(ui.expandpath('default'))
5534 source, branches = hg.parseurl(ui.expandpath('default'))
5535 sbranch = branches[0]
5535 sbranch = branches[0]
5536 other = hg.peer(repo, {}, source)
5536 other = hg.peer(repo, {}, source)
5537 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5537 revs, checkout = hg.addbranchrevs(repo, other, branches, None)
5538 if revs:
5538 if revs:
5539 revs = [other.lookup(rev) for rev in revs]
5539 revs = [other.lookup(rev) for rev in revs]
5540 ui.debug('comparing with %s\n' % util.hidepassword(source))
5540 ui.debug('comparing with %s\n' % util.hidepassword(source))
5541 repo.ui.pushbuffer()
5541 repo.ui.pushbuffer()
5542 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5542 commoninc = discovery.findcommonincoming(repo, other, heads=revs)
5543 _common, incoming, _rheads = commoninc
5543 _common, incoming, _rheads = commoninc
5544 repo.ui.popbuffer()
5544 repo.ui.popbuffer()
5545 if incoming:
5545 if incoming:
5546 t.append(_('1 or more incoming'))
5546 t.append(_('1 or more incoming'))
5547
5547
5548 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5548 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
5549 dbranch = branches[0]
5549 dbranch = branches[0]
5550 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5550 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
5551 if source != dest:
5551 if source != dest:
5552 other = hg.peer(repo, {}, dest)
5552 other = hg.peer(repo, {}, dest)
5553 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5553 ui.debug('comparing with %s\n' % util.hidepassword(dest))
5554 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5554 if (source != dest or (sbranch is not None and sbranch != dbranch)):
5555 commoninc = None
5555 commoninc = None
5556 if revs:
5556 if revs:
5557 revs = [repo.lookup(rev) for rev in revs]
5557 revs = [repo.lookup(rev) for rev in revs]
5558 repo.ui.pushbuffer()
5558 repo.ui.pushbuffer()
5559 outgoing = discovery.findcommonoutgoing(repo, other, onlyheads=revs,
5559 outgoing = discovery.findcommonoutgoing(repo, other, onlyheads=revs,
5560 commoninc=commoninc)
5560 commoninc=commoninc)
5561 repo.ui.popbuffer()
5561 repo.ui.popbuffer()
5562 o = outgoing.missing
5562 o = outgoing.missing
5563 if o:
5563 if o:
5564 t.append(_('%d outgoing') % len(o))
5564 t.append(_('%d outgoing') % len(o))
5565 if 'bookmarks' in other.listkeys('namespaces'):
5565 if 'bookmarks' in other.listkeys('namespaces'):
5566 lmarks = repo.listkeys('bookmarks')
5566 lmarks = repo.listkeys('bookmarks')
5567 rmarks = other.listkeys('bookmarks')
5567 rmarks = other.listkeys('bookmarks')
5568 diff = set(rmarks) - set(lmarks)
5568 diff = set(rmarks) - set(lmarks)
5569 if len(diff) > 0:
5569 if len(diff) > 0:
5570 t.append(_('%d incoming bookmarks') % len(diff))
5570 t.append(_('%d incoming bookmarks') % len(diff))
5571 diff = set(lmarks) - set(rmarks)
5571 diff = set(lmarks) - set(rmarks)
5572 if len(diff) > 0:
5572 if len(diff) > 0:
5573 t.append(_('%d outgoing bookmarks') % len(diff))
5573 t.append(_('%d outgoing bookmarks') % len(diff))
5574
5574
5575 if t:
5575 if t:
5576 # i18n: column positioning for "hg summary"
5576 # i18n: column positioning for "hg summary"
5577 ui.write(_('remote: %s\n') % (', '.join(t)))
5577 ui.write(_('remote: %s\n') % (', '.join(t)))
5578 else:
5578 else:
5579 # i18n: column positioning for "hg summary"
5579 # i18n: column positioning for "hg summary"
5580 ui.status(_('remote: (synced)\n'))
5580 ui.status(_('remote: (synced)\n'))
5581
5581
5582 @command('tag',
5582 @command('tag',
5583 [('f', 'force', None, _('force tag')),
5583 [('f', 'force', None, _('force tag')),
5584 ('l', 'local', None, _('make the tag local')),
5584 ('l', 'local', None, _('make the tag local')),
5585 ('r', 'rev', '', _('revision to tag'), _('REV')),
5585 ('r', 'rev', '', _('revision to tag'), _('REV')),
5586 ('', 'remove', None, _('remove a tag')),
5586 ('', 'remove', None, _('remove a tag')),
5587 # -l/--local is already there, commitopts cannot be used
5587 # -l/--local is already there, commitopts cannot be used
5588 ('e', 'edit', None, _('edit commit message')),
5588 ('e', 'edit', None, _('edit commit message')),
5589 ('m', 'message', '', _('use <text> as commit message'), _('TEXT')),
5589 ('m', 'message', '', _('use <text> as commit message'), _('TEXT')),
5590 ] + commitopts2,
5590 ] + commitopts2,
5591 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5591 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5592 def tag(ui, repo, name1, *names, **opts):
5592 def tag(ui, repo, name1, *names, **opts):
5593 """add one or more tags for the current or given revision
5593 """add one or more tags for the current or given revision
5594
5594
5595 Name a particular revision using <name>.
5595 Name a particular revision using <name>.
5596
5596
5597 Tags are used to name particular revisions of the repository and are
5597 Tags are used to name particular revisions of the repository and are
5598 very useful to compare different revisions, to go back to significant
5598 very useful to compare different revisions, to go back to significant
5599 earlier versions or to mark branch points as releases, etc. Changing
5599 earlier versions or to mark branch points as releases, etc. Changing
5600 an existing tag is normally disallowed; use -f/--force to override.
5600 an existing tag is normally disallowed; use -f/--force to override.
5601
5601
5602 If no revision is given, the parent of the working directory is
5602 If no revision is given, the parent of the working directory is
5603 used.
5603 used.
5604
5604
5605 To facilitate version control, distribution, and merging of tags,
5605 To facilitate version control, distribution, and merging of tags,
5606 they are stored as a file named ".hgtags" which is managed similarly
5606 they are stored as a file named ".hgtags" which is managed similarly
5607 to other project files and can be hand-edited if necessary. This
5607 to other project files and can be hand-edited if necessary. This
5608 also means that tagging creates a new commit. The file
5608 also means that tagging creates a new commit. The file
5609 ".hg/localtags" is used for local tags (not shared among
5609 ".hg/localtags" is used for local tags (not shared among
5610 repositories).
5610 repositories).
5611
5611
5612 Tag commits are usually made at the head of a branch. If the parent
5612 Tag commits are usually made at the head of a branch. If the parent
5613 of the working directory is not a branch head, :hg:`tag` aborts; use
5613 of the working directory is not a branch head, :hg:`tag` aborts; use
5614 -f/--force to force the tag commit to be based on a non-head
5614 -f/--force to force the tag commit to be based on a non-head
5615 changeset.
5615 changeset.
5616
5616
5617 See :hg:`help dates` for a list of formats valid for -d/--date.
5617 See :hg:`help dates` for a list of formats valid for -d/--date.
5618
5618
5619 Since tag names have priority over branch names during revision
5619 Since tag names have priority over branch names during revision
5620 lookup, using an existing branch name as a tag name is discouraged.
5620 lookup, using an existing branch name as a tag name is discouraged.
5621
5621
5622 Returns 0 on success.
5622 Returns 0 on success.
5623 """
5623 """
5624 wlock = lock = None
5624 wlock = lock = None
5625 try:
5625 try:
5626 wlock = repo.wlock()
5626 wlock = repo.wlock()
5627 lock = repo.lock()
5627 lock = repo.lock()
5628 rev_ = "."
5628 rev_ = "."
5629 names = [t.strip() for t in (name1,) + names]
5629 names = [t.strip() for t in (name1,) + names]
5630 if len(names) != len(set(names)):
5630 if len(names) != len(set(names)):
5631 raise util.Abort(_('tag names must be unique'))
5631 raise util.Abort(_('tag names must be unique'))
5632 for n in names:
5632 for n in names:
5633 scmutil.checknewlabel(repo, n, 'tag')
5633 scmutil.checknewlabel(repo, n, 'tag')
5634 if not n:
5634 if not n:
5635 raise util.Abort(_('tag names cannot consist entirely of '
5635 raise util.Abort(_('tag names cannot consist entirely of '
5636 'whitespace'))
5636 'whitespace'))
5637 if opts.get('rev') and opts.get('remove'):
5637 if opts.get('rev') and opts.get('remove'):
5638 raise util.Abort(_("--rev and --remove are incompatible"))
5638 raise util.Abort(_("--rev and --remove are incompatible"))
5639 if opts.get('rev'):
5639 if opts.get('rev'):
5640 rev_ = opts['rev']
5640 rev_ = opts['rev']
5641 message = opts.get('message')
5641 message = opts.get('message')
5642 if opts.get('remove'):
5642 if opts.get('remove'):
5643 expectedtype = opts.get('local') and 'local' or 'global'
5643 expectedtype = opts.get('local') and 'local' or 'global'
5644 for n in names:
5644 for n in names:
5645 if not repo.tagtype(n):
5645 if not repo.tagtype(n):
5646 raise util.Abort(_("tag '%s' does not exist") % n)
5646 raise util.Abort(_("tag '%s' does not exist") % n)
5647 if repo.tagtype(n) != expectedtype:
5647 if repo.tagtype(n) != expectedtype:
5648 if expectedtype == 'global':
5648 if expectedtype == 'global':
5649 raise util.Abort(_("tag '%s' is not a global tag") % n)
5649 raise util.Abort(_("tag '%s' is not a global tag") % n)
5650 else:
5650 else:
5651 raise util.Abort(_("tag '%s' is not a local tag") % n)
5651 raise util.Abort(_("tag '%s' is not a local tag") % n)
5652 rev_ = nullid
5652 rev_ = nullid
5653 if not message:
5653 if not message:
5654 # we don't translate commit messages
5654 # we don't translate commit messages
5655 message = 'Removed tag %s' % ', '.join(names)
5655 message = 'Removed tag %s' % ', '.join(names)
5656 elif not opts.get('force'):
5656 elif not opts.get('force'):
5657 for n in names:
5657 for n in names:
5658 if n in repo.tags():
5658 if n in repo.tags():
5659 raise util.Abort(_("tag '%s' already exists "
5659 raise util.Abort(_("tag '%s' already exists "
5660 "(use -f to force)") % n)
5660 "(use -f to force)") % n)
5661 if not opts.get('local'):
5661 if not opts.get('local'):
5662 p1, p2 = repo.dirstate.parents()
5662 p1, p2 = repo.dirstate.parents()
5663 if p2 != nullid:
5663 if p2 != nullid:
5664 raise util.Abort(_('uncommitted merge'))
5664 raise util.Abort(_('uncommitted merge'))
5665 bheads = repo.branchheads()
5665 bheads = repo.branchheads()
5666 if not opts.get('force') and bheads and p1 not in bheads:
5666 if not opts.get('force') and bheads and p1 not in bheads:
5667 raise util.Abort(_('not at a branch head (use -f to force)'))
5667 raise util.Abort(_('not at a branch head (use -f to force)'))
5668 r = scmutil.revsingle(repo, rev_).node()
5668 r = scmutil.revsingle(repo, rev_).node()
5669
5669
5670 if not message:
5670 if not message:
5671 # we don't translate commit messages
5671 # we don't translate commit messages
5672 message = ('Added tag %s for changeset %s' %
5672 message = ('Added tag %s for changeset %s' %
5673 (', '.join(names), short(r)))
5673 (', '.join(names), short(r)))
5674
5674
5675 date = opts.get('date')
5675 date = opts.get('date')
5676 if date:
5676 if date:
5677 date = util.parsedate(date)
5677 date = util.parsedate(date)
5678
5678
5679 if opts.get('edit'):
5679 if opts.get('edit'):
5680 message = ui.edit(message, ui.username())
5680 message = ui.edit(message, ui.username())
5681
5681
5682 # don't allow tagging the null rev
5682 # don't allow tagging the null rev
5683 if (not opts.get('remove') and
5683 if (not opts.get('remove') and
5684 scmutil.revsingle(repo, rev_).rev() == nullrev):
5684 scmutil.revsingle(repo, rev_).rev() == nullrev):
5685 raise util.Abort(_("cannot tag null revision"))
5685 raise util.Abort(_("cannot tag null revision"))
5686
5686
5687 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
5687 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
5688 finally:
5688 finally:
5689 release(lock, wlock)
5689 release(lock, wlock)
5690
5690
5691 @command('tags', [], '')
5691 @command('tags', [], '')
5692 def tags(ui, repo, **opts):
5692 def tags(ui, repo, **opts):
5693 """list repository tags
5693 """list repository tags
5694
5694
5695 This lists both regular and local tags. When the -v/--verbose
5695 This lists both regular and local tags. When the -v/--verbose
5696 switch is used, a third column "local" is printed for local tags.
5696 switch is used, a third column "local" is printed for local tags.
5697
5697
5698 Returns 0 on success.
5698 Returns 0 on success.
5699 """
5699 """
5700
5700
5701 fm = ui.formatter('tags', opts)
5701 fm = ui.formatter('tags', opts)
5702 hexfunc = ui.debugflag and hex or short
5702 hexfunc = ui.debugflag and hex or short
5703 tagtype = ""
5703 tagtype = ""
5704
5704
5705 for t, n in reversed(repo.tagslist()):
5705 for t, n in reversed(repo.tagslist()):
5706 hn = hexfunc(n)
5706 hn = hexfunc(n)
5707 label = 'tags.normal'
5707 label = 'tags.normal'
5708 tagtype = ''
5708 tagtype = ''
5709 if repo.tagtype(t) == 'local':
5709 if repo.tagtype(t) == 'local':
5710 label = 'tags.local'
5710 label = 'tags.local'
5711 tagtype = 'local'
5711 tagtype = 'local'
5712
5712
5713 fm.startitem()
5713 fm.startitem()
5714 fm.write('tag', '%s', t, label=label)
5714 fm.write('tag', '%s', t, label=label)
5715 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5715 fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s'
5716 fm.condwrite(not ui.quiet, 'rev id', fmt,
5716 fm.condwrite(not ui.quiet, 'rev id', fmt,
5717 repo.changelog.rev(n), hn, label=label)
5717 repo.changelog.rev(n), hn, label=label)
5718 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5718 fm.condwrite(ui.verbose and tagtype, 'type', ' %s',
5719 tagtype, label=label)
5719 tagtype, label=label)
5720 fm.plain('\n')
5720 fm.plain('\n')
5721 fm.end()
5721 fm.end()
5722
5722
5723 @command('tip',
5723 @command('tip',
5724 [('p', 'patch', None, _('show patch')),
5724 [('p', 'patch', None, _('show patch')),
5725 ('g', 'git', None, _('use git extended diff format')),
5725 ('g', 'git', None, _('use git extended diff format')),
5726 ] + templateopts,
5726 ] + templateopts,
5727 _('[-p] [-g]'))
5727 _('[-p] [-g]'))
5728 def tip(ui, repo, **opts):
5728 def tip(ui, repo, **opts):
5729 """show the tip revision (DEPRECATED)
5729 """show the tip revision (DEPRECATED)
5730
5730
5731 The tip revision (usually just called the tip) is the changeset
5731 The tip revision (usually just called the tip) is the changeset
5732 most recently added to the repository (and therefore the most
5732 most recently added to the repository (and therefore the most
5733 recently changed head).
5733 recently changed head).
5734
5734
5735 If you have just made a commit, that commit will be the tip. If
5735 If you have just made a commit, that commit will be the tip. If
5736 you have just pulled changes from another repository, the tip of
5736 you have just pulled changes from another repository, the tip of
5737 that repository becomes the current tip. The "tip" tag is special
5737 that repository becomes the current tip. The "tip" tag is special
5738 and cannot be renamed or assigned to a different changeset.
5738 and cannot be renamed or assigned to a different changeset.
5739
5739
5740 This command is deprecated, please use :hg:`heads` instead.
5740 This command is deprecated, please use :hg:`heads` instead.
5741
5741
5742 Returns 0 on success.
5742 Returns 0 on success.
5743 """
5743 """
5744 displayer = cmdutil.show_changeset(ui, repo, opts)
5744 displayer = cmdutil.show_changeset(ui, repo, opts)
5745 displayer.show(repo['tip'])
5745 displayer.show(repo['tip'])
5746 displayer.close()
5746 displayer.close()
5747
5747
5748 @command('unbundle',
5748 @command('unbundle',
5749 [('u', 'update', None,
5749 [('u', 'update', None,
5750 _('update to new branch head if changesets were unbundled'))],
5750 _('update to new branch head if changesets were unbundled'))],
5751 _('[-u] FILE...'))
5751 _('[-u] FILE...'))
5752 def unbundle(ui, repo, fname1, *fnames, **opts):
5752 def unbundle(ui, repo, fname1, *fnames, **opts):
5753 """apply one or more changegroup files
5753 """apply one or more changegroup files
5754
5754
5755 Apply one or more compressed changegroup files generated by the
5755 Apply one or more compressed changegroup files generated by the
5756 bundle command.
5756 bundle command.
5757
5757
5758 Returns 0 on success, 1 if an update has unresolved files.
5758 Returns 0 on success, 1 if an update has unresolved files.
5759 """
5759 """
5760 fnames = (fname1,) + fnames
5760 fnames = (fname1,) + fnames
5761
5761
5762 lock = repo.lock()
5762 lock = repo.lock()
5763 wc = repo['.']
5763 wc = repo['.']
5764 try:
5764 try:
5765 for fname in fnames:
5765 for fname in fnames:
5766 f = hg.openpath(ui, fname)
5766 f = hg.openpath(ui, fname)
5767 gen = changegroup.readbundle(f, fname)
5767 gen = changegroup.readbundle(f, fname)
5768 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
5768 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
5769 finally:
5769 finally:
5770 lock.release()
5770 lock.release()
5771 bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch())
5771 bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch())
5772 return postincoming(ui, repo, modheads, opts.get('update'), None)
5772 return postincoming(ui, repo, modheads, opts.get('update'), None)
5773
5773
5774 @command('^update|up|checkout|co',
5774 @command('^update|up|checkout|co',
5775 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5775 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
5776 ('c', 'check', None,
5776 ('c', 'check', None,
5777 _('update across branches if no uncommitted changes')),
5777 _('update across branches if no uncommitted changes')),
5778 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5778 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5779 ('r', 'rev', '', _('revision'), _('REV'))],
5779 ('r', 'rev', '', _('revision'), _('REV'))],
5780 _('[-c] [-C] [-d DATE] [[-r] REV]'))
5780 _('[-c] [-C] [-d DATE] [[-r] REV]'))
5781 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
5781 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
5782 """update working directory (or switch revisions)
5782 """update working directory (or switch revisions)
5783
5783
5784 Update the repository's working directory to the specified
5784 Update the repository's working directory to the specified
5785 changeset. If no changeset is specified, update to the tip of the
5785 changeset. If no changeset is specified, update to the tip of the
5786 current named branch and move the current bookmark (see :hg:`help
5786 current named branch and move the current bookmark (see :hg:`help
5787 bookmarks`).
5787 bookmarks`).
5788
5788
5789 Update sets the working directory's parent revision to the specified
5789 Update sets the working directory's parent revision to the specified
5790 changeset (see :hg:`help parents`).
5790 changeset (see :hg:`help parents`).
5791
5791
5792 If the changeset is not a descendant or ancestor of the working
5792 If the changeset is not a descendant or ancestor of the working
5793 directory's parent, the update is aborted. With the -c/--check
5793 directory's parent, the update is aborted. With the -c/--check
5794 option, the working directory is checked for uncommitted changes; if
5794 option, the working directory is checked for uncommitted changes; if
5795 none are found, the working directory is updated to the specified
5795 none are found, the working directory is updated to the specified
5796 changeset.
5796 changeset.
5797
5797
5798 .. container:: verbose
5798 .. container:: verbose
5799
5799
5800 The following rules apply when the working directory contains
5800 The following rules apply when the working directory contains
5801 uncommitted changes:
5801 uncommitted changes:
5802
5802
5803 1. If neither -c/--check nor -C/--clean is specified, and if
5803 1. If neither -c/--check nor -C/--clean is specified, and if
5804 the requested changeset is an ancestor or descendant of
5804 the requested changeset is an ancestor or descendant of
5805 the working directory's parent, the uncommitted changes
5805 the working directory's parent, the uncommitted changes
5806 are merged into the requested changeset and the merged
5806 are merged into the requested changeset and the merged
5807 result is left uncommitted. If the requested changeset is
5807 result is left uncommitted. If the requested changeset is
5808 not an ancestor or descendant (that is, it is on another
5808 not an ancestor or descendant (that is, it is on another
5809 branch), the update is aborted and the uncommitted changes
5809 branch), the update is aborted and the uncommitted changes
5810 are preserved.
5810 are preserved.
5811
5811
5812 2. With the -c/--check option, the update is aborted and the
5812 2. With the -c/--check option, the update is aborted and the
5813 uncommitted changes are preserved.
5813 uncommitted changes are preserved.
5814
5814
5815 3. With the -C/--clean option, uncommitted changes are discarded and
5815 3. With the -C/--clean option, uncommitted changes are discarded and
5816 the working directory is updated to the requested changeset.
5816 the working directory is updated to the requested changeset.
5817
5817
5818 To cancel an uncommitted merge (and lose your changes), use
5818 To cancel an uncommitted merge (and lose your changes), use
5819 :hg:`update --clean .`.
5819 :hg:`update --clean .`.
5820
5820
5821 Use null as the changeset to remove the working directory (like
5821 Use null as the changeset to remove the working directory (like
5822 :hg:`clone -U`).
5822 :hg:`clone -U`).
5823
5823
5824 If you want to revert just one file to an older revision, use
5824 If you want to revert just one file to an older revision, use
5825 :hg:`revert [-r REV] NAME`.
5825 :hg:`revert [-r REV] NAME`.
5826
5826
5827 See :hg:`help dates` for a list of formats valid for -d/--date.
5827 See :hg:`help dates` for a list of formats valid for -d/--date.
5828
5828
5829 Returns 0 on success, 1 if there are unresolved files.
5829 Returns 0 on success, 1 if there are unresolved files.
5830 """
5830 """
5831 if rev and node:
5831 if rev and node:
5832 raise util.Abort(_("please specify just one revision"))
5832 raise util.Abort(_("please specify just one revision"))
5833
5833
5834 if rev is None or rev == '':
5834 if rev is None or rev == '':
5835 rev = node
5835 rev = node
5836
5836
5837 cmdutil.clearunfinished(repo)
5837 cmdutil.clearunfinished(repo)
5838
5838
5839 # with no argument, we also move the current bookmark, if any
5839 # with no argument, we also move the current bookmark, if any
5840 rev, movemarkfrom = bookmarks.calculateupdate(ui, repo, rev)
5840 rev, movemarkfrom = bookmarks.calculateupdate(ui, repo, rev)
5841
5841
5842 # if we defined a bookmark, we have to remember the original bookmark name
5842 # if we defined a bookmark, we have to remember the original bookmark name
5843 brev = rev
5843 brev = rev
5844 rev = scmutil.revsingle(repo, rev, rev).rev()
5844 rev = scmutil.revsingle(repo, rev, rev).rev()
5845
5845
5846 if check and clean:
5846 if check and clean:
5847 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
5847 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
5848
5848
5849 if date:
5849 if date:
5850 if rev is not None:
5850 if rev is not None:
5851 raise util.Abort(_("you can't specify a revision and a date"))
5851 raise util.Abort(_("you can't specify a revision and a date"))
5852 rev = cmdutil.finddate(ui, repo, date)
5852 rev = cmdutil.finddate(ui, repo, date)
5853
5853
5854 if check:
5854 if check:
5855 c = repo[None]
5855 c = repo[None]
5856 if c.dirty(merge=False, branch=False, missing=True):
5856 if c.dirty(merge=False, branch=False, missing=True):
5857 raise util.Abort(_("uncommitted changes"))
5857 raise util.Abort(_("uncommitted changes"))
5858 if rev is None:
5858 if rev is None:
5859 rev = repo[repo[None].branch()].rev()
5859 rev = repo[repo[None].branch()].rev()
5860 mergemod._checkunknown(repo, repo[None], repo[rev])
5860 mergemod._checkunknown(repo, repo[None], repo[rev])
5861
5861
5862 if clean:
5862 if clean:
5863 ret = hg.clean(repo, rev)
5863 ret = hg.clean(repo, rev)
5864 else:
5864 else:
5865 ret = hg.update(repo, rev)
5865 ret = hg.update(repo, rev)
5866
5866
5867 if not ret and movemarkfrom:
5867 if not ret and movemarkfrom:
5868 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
5868 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()):
5869 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
5869 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent)
5870 elif brev in repo._bookmarks:
5870 elif brev in repo._bookmarks:
5871 bookmarks.setcurrent(repo, brev)
5871 bookmarks.setcurrent(repo, brev)
5872 elif brev:
5872 elif brev:
5873 bookmarks.unsetcurrent(repo)
5873 bookmarks.unsetcurrent(repo)
5874
5874
5875 return ret
5875 return ret
5876
5876
5877 @command('verify', [])
5877 @command('verify', [])
5878 def verify(ui, repo):
5878 def verify(ui, repo):
5879 """verify the integrity of the repository
5879 """verify the integrity of the repository
5880
5880
5881 Verify the integrity of the current repository.
5881 Verify the integrity of the current repository.
5882
5882
5883 This will perform an extensive check of the repository's
5883 This will perform an extensive check of the repository's
5884 integrity, validating the hashes and checksums of each entry in
5884 integrity, validating the hashes and checksums of each entry in
5885 the changelog, manifest, and tracked files, as well as the
5885 the changelog, manifest, and tracked files, as well as the
5886 integrity of their crosslinks and indices.
5886 integrity of their crosslinks and indices.
5887
5887
5888 Please see http://mercurial.selenic.com/wiki/RepositoryCorruption
5888 Please see http://mercurial.selenic.com/wiki/RepositoryCorruption
5889 for more information about recovery from corruption of the
5889 for more information about recovery from corruption of the
5890 repository.
5890 repository.
5891
5891
5892 Returns 0 on success, 1 if errors are encountered.
5892 Returns 0 on success, 1 if errors are encountered.
5893 """
5893 """
5894 return hg.verify(repo)
5894 return hg.verify(repo)
5895
5895
5896 @command('version', [])
5896 @command('version', [])
5897 def version_(ui):
5897 def version_(ui):
5898 """output version and copyright information"""
5898 """output version and copyright information"""
5899 ui.write(_("Mercurial Distributed SCM (version %s)\n")
5899 ui.write(_("Mercurial Distributed SCM (version %s)\n")
5900 % util.version())
5900 % util.version())
5901 ui.status(_(
5901 ui.status(_(
5902 "(see http://mercurial.selenic.com for more information)\n"
5902 "(see http://mercurial.selenic.com for more information)\n"
5903 "\nCopyright (C) 2005-2013 Matt Mackall and others\n"
5903 "\nCopyright (C) 2005-2013 Matt Mackall and others\n"
5904 "This is free software; see the source for copying conditions. "
5904 "This is free software; see the source for copying conditions. "
5905 "There is NO\nwarranty; "
5905 "There is NO\nwarranty; "
5906 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5906 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
5907 ))
5907 ))
5908
5908
5909 norepo = ("clone init version help debugcommands debugcomplete"
5909 norepo = ("clone init version help debugcommands debugcomplete"
5910 " debugdate debuginstall debugfsinfo debugpushkey debugwireargs"
5910 " debugdate debuginstall debugfsinfo debugpushkey debugwireargs"
5911 " debugknown debuggetbundle debugbundle")
5911 " debugknown debuggetbundle debugbundle")
5912 optionalrepo = ("identify paths serve showconfig debugancestor debugdag"
5912 optionalrepo = ("identify paths serve showconfig debugancestor debugdag"
5913 " debugdata debugindex debugindexdot debugrevlog")
5913 " debugdata debugindex debugindexdot debugrevlog")
5914 inferrepo = ("add addremove annotate cat commit diff grep forget log parents"
5914 inferrepo = ("add addremove annotate cat commit diff grep forget log parents"
5915 " remove resolve status debugwalk")
5915 " remove resolve status debugwalk")
General Comments 0
You need to be logged in to leave comments. Login now