##// END OF EJS Templates
Fix annotate breakage
Matt Mackall -
r2568:82e3b296 default
parent child Browse files
Show More
@@ -1,3612 +1,3612 b''
1 # commands.py - command processing for mercurial
1 # commands.py - command processing for mercurial
2 #
2 #
3 # Copyright 2005 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms
5 # This software may be used and distributed according to the terms
6 # of the GNU General Public License, incorporated herein by reference.
6 # of the GNU General Public License, incorporated herein by reference.
7
7
8 from demandload import demandload
8 from demandload import demandload
9 from node import *
9 from node import *
10 from i18n import gettext as _
10 from i18n import gettext as _
11 demandload(globals(), "os re sys signal shutil imp urllib pdb")
11 demandload(globals(), "os re sys signal shutil imp urllib pdb")
12 demandload(globals(), "fancyopts ui hg util lock revlog templater bundlerepo")
12 demandload(globals(), "fancyopts ui hg util lock revlog templater bundlerepo")
13 demandload(globals(), "fnmatch mdiff random signal tempfile time")
13 demandload(globals(), "fnmatch mdiff random signal tempfile time")
14 demandload(globals(), "traceback errno socket version struct atexit sets bz2")
14 demandload(globals(), "traceback errno socket version struct atexit sets bz2")
15 demandload(globals(), "archival cStringIO changegroup email.Parser")
15 demandload(globals(), "archival cStringIO changegroup email.Parser")
16 demandload(globals(), "hgweb.server sshserver")
16 demandload(globals(), "hgweb.server sshserver")
17
17
18 class UnknownCommand(Exception):
18 class UnknownCommand(Exception):
19 """Exception raised if command is not in the command table."""
19 """Exception raised if command is not in the command table."""
20 class AmbiguousCommand(Exception):
20 class AmbiguousCommand(Exception):
21 """Exception raised if command shortcut matches more than one command."""
21 """Exception raised if command shortcut matches more than one command."""
22
22
23 def bail_if_changed(repo):
23 def bail_if_changed(repo):
24 modified, added, removed, deleted, unknown = repo.changes()
24 modified, added, removed, deleted, unknown = repo.changes()
25 if modified or added or removed or deleted:
25 if modified or added or removed or deleted:
26 raise util.Abort(_("outstanding uncommitted changes"))
26 raise util.Abort(_("outstanding uncommitted changes"))
27
27
28 def filterfiles(filters, files):
28 def filterfiles(filters, files):
29 l = [x for x in files if x in filters]
29 l = [x for x in files if x in filters]
30
30
31 for t in filters:
31 for t in filters:
32 if t and t[-1] != "/":
32 if t and t[-1] != "/":
33 t += "/"
33 t += "/"
34 l += [x for x in files if x.startswith(t)]
34 l += [x for x in files if x.startswith(t)]
35 return l
35 return l
36
36
37 def relpath(repo, args):
37 def relpath(repo, args):
38 cwd = repo.getcwd()
38 cwd = repo.getcwd()
39 if cwd:
39 if cwd:
40 return [util.normpath(os.path.join(cwd, x)) for x in args]
40 return [util.normpath(os.path.join(cwd, x)) for x in args]
41 return args
41 return args
42
42
43 def matchpats(repo, pats=[], opts={}, head=''):
43 def matchpats(repo, pats=[], opts={}, head=''):
44 cwd = repo.getcwd()
44 cwd = repo.getcwd()
45 if not pats and cwd:
45 if not pats and cwd:
46 opts['include'] = [os.path.join(cwd, i) for i in opts['include']]
46 opts['include'] = [os.path.join(cwd, i) for i in opts['include']]
47 opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']]
47 opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']]
48 cwd = ''
48 cwd = ''
49 return util.cmdmatcher(repo.root, cwd, pats or ['.'], opts.get('include'),
49 return util.cmdmatcher(repo.root, cwd, pats or ['.'], opts.get('include'),
50 opts.get('exclude'), head)
50 opts.get('exclude'), head)
51
51
52 def makewalk(repo, pats, opts, node=None, head='', badmatch=None):
52 def makewalk(repo, pats, opts, node=None, head='', badmatch=None):
53 files, matchfn, anypats = matchpats(repo, pats, opts, head)
53 files, matchfn, anypats = matchpats(repo, pats, opts, head)
54 exact = dict(zip(files, files))
54 exact = dict(zip(files, files))
55 def walk():
55 def walk():
56 for src, fn in repo.walk(node=node, files=files, match=matchfn,
56 for src, fn in repo.walk(node=node, files=files, match=matchfn,
57 badmatch=badmatch):
57 badmatch=badmatch):
58 yield src, fn, util.pathto(repo.getcwd(), fn), fn in exact
58 yield src, fn, util.pathto(repo.getcwd(), fn), fn in exact
59 return files, matchfn, walk()
59 return files, matchfn, walk()
60
60
61 def walk(repo, pats, opts, node=None, head='', badmatch=None):
61 def walk(repo, pats, opts, node=None, head='', badmatch=None):
62 files, matchfn, results = makewalk(repo, pats, opts, node, head, badmatch)
62 files, matchfn, results = makewalk(repo, pats, opts, node, head, badmatch)
63 for r in results:
63 for r in results:
64 yield r
64 yield r
65
65
66 def walkchangerevs(ui, repo, pats, opts):
66 def walkchangerevs(ui, repo, pats, opts):
67 '''Iterate over files and the revs they changed in.
67 '''Iterate over files and the revs they changed in.
68
68
69 Callers most commonly need to iterate backwards over the history
69 Callers most commonly need to iterate backwards over the history
70 it is interested in. Doing so has awful (quadratic-looking)
70 it is interested in. Doing so has awful (quadratic-looking)
71 performance, so we use iterators in a "windowed" way.
71 performance, so we use iterators in a "windowed" way.
72
72
73 We walk a window of revisions in the desired order. Within the
73 We walk a window of revisions in the desired order. Within the
74 window, we first walk forwards to gather data, then in the desired
74 window, we first walk forwards to gather data, then in the desired
75 order (usually backwards) to display it.
75 order (usually backwards) to display it.
76
76
77 This function returns an (iterator, getchange, matchfn) tuple. The
77 This function returns an (iterator, getchange, matchfn) tuple. The
78 getchange function returns the changelog entry for a numeric
78 getchange function returns the changelog entry for a numeric
79 revision. The iterator yields 3-tuples. They will be of one of
79 revision. The iterator yields 3-tuples. They will be of one of
80 the following forms:
80 the following forms:
81
81
82 "window", incrementing, lastrev: stepping through a window,
82 "window", incrementing, lastrev: stepping through a window,
83 positive if walking forwards through revs, last rev in the
83 positive if walking forwards through revs, last rev in the
84 sequence iterated over - use to reset state for the current window
84 sequence iterated over - use to reset state for the current window
85
85
86 "add", rev, fns: out-of-order traversal of the given file names
86 "add", rev, fns: out-of-order traversal of the given file names
87 fns, which changed during revision rev - use to gather data for
87 fns, which changed during revision rev - use to gather data for
88 possible display
88 possible display
89
89
90 "iter", rev, None: in-order traversal of the revs earlier iterated
90 "iter", rev, None: in-order traversal of the revs earlier iterated
91 over with "add" - use to display data'''
91 over with "add" - use to display data'''
92
92
93 def increasing_windows(start, end, windowsize=8, sizelimit=512):
93 def increasing_windows(start, end, windowsize=8, sizelimit=512):
94 if start < end:
94 if start < end:
95 while start < end:
95 while start < end:
96 yield start, min(windowsize, end-start)
96 yield start, min(windowsize, end-start)
97 start += windowsize
97 start += windowsize
98 if windowsize < sizelimit:
98 if windowsize < sizelimit:
99 windowsize *= 2
99 windowsize *= 2
100 else:
100 else:
101 while start > end:
101 while start > end:
102 yield start, min(windowsize, start-end-1)
102 yield start, min(windowsize, start-end-1)
103 start -= windowsize
103 start -= windowsize
104 if windowsize < sizelimit:
104 if windowsize < sizelimit:
105 windowsize *= 2
105 windowsize *= 2
106
106
107
107
108 files, matchfn, anypats = matchpats(repo, pats, opts)
108 files, matchfn, anypats = matchpats(repo, pats, opts)
109
109
110 if repo.changelog.count() == 0:
110 if repo.changelog.count() == 0:
111 return [], False, matchfn
111 return [], False, matchfn
112
112
113 revs = map(int, revrange(ui, repo, opts['rev'] or ['tip:0']))
113 revs = map(int, revrange(ui, repo, opts['rev'] or ['tip:0']))
114 wanted = {}
114 wanted = {}
115 slowpath = anypats
115 slowpath = anypats
116 fncache = {}
116 fncache = {}
117
117
118 chcache = {}
118 chcache = {}
119 def getchange(rev):
119 def getchange(rev):
120 ch = chcache.get(rev)
120 ch = chcache.get(rev)
121 if ch is None:
121 if ch is None:
122 chcache[rev] = ch = repo.changelog.read(repo.lookup(str(rev)))
122 chcache[rev] = ch = repo.changelog.read(repo.lookup(str(rev)))
123 return ch
123 return ch
124
124
125 if not slowpath and not files:
125 if not slowpath and not files:
126 # No files, no patterns. Display all revs.
126 # No files, no patterns. Display all revs.
127 wanted = dict(zip(revs, revs))
127 wanted = dict(zip(revs, revs))
128 if not slowpath:
128 if not slowpath:
129 # Only files, no patterns. Check the history of each file.
129 # Only files, no patterns. Check the history of each file.
130 def filerevgen(filelog):
130 def filerevgen(filelog):
131 for i, window in increasing_windows(filelog.count()-1, -1):
131 for i, window in increasing_windows(filelog.count()-1, -1):
132 revs = []
132 revs = []
133 for j in xrange(i - window, i + 1):
133 for j in xrange(i - window, i + 1):
134 revs.append(filelog.linkrev(filelog.node(j)))
134 revs.append(filelog.linkrev(filelog.node(j)))
135 revs.reverse()
135 revs.reverse()
136 for rev in revs:
136 for rev in revs:
137 yield rev
137 yield rev
138
138
139 minrev, maxrev = min(revs), max(revs)
139 minrev, maxrev = min(revs), max(revs)
140 for file_ in files:
140 for file_ in files:
141 filelog = repo.file(file_)
141 filelog = repo.file(file_)
142 # A zero count may be a directory or deleted file, so
142 # A zero count may be a directory or deleted file, so
143 # try to find matching entries on the slow path.
143 # try to find matching entries on the slow path.
144 if filelog.count() == 0:
144 if filelog.count() == 0:
145 slowpath = True
145 slowpath = True
146 break
146 break
147 for rev in filerevgen(filelog):
147 for rev in filerevgen(filelog):
148 if rev <= maxrev:
148 if rev <= maxrev:
149 if rev < minrev:
149 if rev < minrev:
150 break
150 break
151 fncache.setdefault(rev, [])
151 fncache.setdefault(rev, [])
152 fncache[rev].append(file_)
152 fncache[rev].append(file_)
153 wanted[rev] = 1
153 wanted[rev] = 1
154 if slowpath:
154 if slowpath:
155 # The slow path checks files modified in every changeset.
155 # The slow path checks files modified in every changeset.
156 def changerevgen():
156 def changerevgen():
157 for i, window in increasing_windows(repo.changelog.count()-1, -1):
157 for i, window in increasing_windows(repo.changelog.count()-1, -1):
158 for j in xrange(i - window, i + 1):
158 for j in xrange(i - window, i + 1):
159 yield j, getchange(j)[3]
159 yield j, getchange(j)[3]
160
160
161 for rev, changefiles in changerevgen():
161 for rev, changefiles in changerevgen():
162 matches = filter(matchfn, changefiles)
162 matches = filter(matchfn, changefiles)
163 if matches:
163 if matches:
164 fncache[rev] = matches
164 fncache[rev] = matches
165 wanted[rev] = 1
165 wanted[rev] = 1
166
166
167 def iterate():
167 def iterate():
168 for i, window in increasing_windows(0, len(revs)):
168 for i, window in increasing_windows(0, len(revs)):
169 yield 'window', revs[0] < revs[-1], revs[-1]
169 yield 'window', revs[0] < revs[-1], revs[-1]
170 nrevs = [rev for rev in revs[i:i+window]
170 nrevs = [rev for rev in revs[i:i+window]
171 if rev in wanted]
171 if rev in wanted]
172 srevs = list(nrevs)
172 srevs = list(nrevs)
173 srevs.sort()
173 srevs.sort()
174 for rev in srevs:
174 for rev in srevs:
175 fns = fncache.get(rev) or filter(matchfn, getchange(rev)[3])
175 fns = fncache.get(rev) or filter(matchfn, getchange(rev)[3])
176 yield 'add', rev, fns
176 yield 'add', rev, fns
177 for rev in nrevs:
177 for rev in nrevs:
178 yield 'iter', rev, None
178 yield 'iter', rev, None
179 return iterate(), getchange, matchfn
179 return iterate(), getchange, matchfn
180
180
181 revrangesep = ':'
181 revrangesep = ':'
182
182
183 def revfix(repo, val, defval):
183 def revfix(repo, val, defval):
184 '''turn user-level id of changeset into rev number.
184 '''turn user-level id of changeset into rev number.
185 user-level id can be tag, changeset, rev number, or negative rev
185 user-level id can be tag, changeset, rev number, or negative rev
186 number relative to number of revs (-1 is tip, etc).'''
186 number relative to number of revs (-1 is tip, etc).'''
187 if not val:
187 if not val:
188 return defval
188 return defval
189 try:
189 try:
190 num = int(val)
190 num = int(val)
191 if str(num) != val:
191 if str(num) != val:
192 raise ValueError
192 raise ValueError
193 if num < 0:
193 if num < 0:
194 num += repo.changelog.count()
194 num += repo.changelog.count()
195 if num < 0:
195 if num < 0:
196 num = 0
196 num = 0
197 elif num >= repo.changelog.count():
197 elif num >= repo.changelog.count():
198 raise ValueError
198 raise ValueError
199 except ValueError:
199 except ValueError:
200 try:
200 try:
201 num = repo.changelog.rev(repo.lookup(val))
201 num = repo.changelog.rev(repo.lookup(val))
202 except KeyError:
202 except KeyError:
203 raise util.Abort(_('invalid revision identifier %s'), val)
203 raise util.Abort(_('invalid revision identifier %s'), val)
204 return num
204 return num
205
205
206 def revpair(ui, repo, revs):
206 def revpair(ui, repo, revs):
207 '''return pair of nodes, given list of revisions. second item can
207 '''return pair of nodes, given list of revisions. second item can
208 be None, meaning use working dir.'''
208 be None, meaning use working dir.'''
209 if not revs:
209 if not revs:
210 return repo.dirstate.parents()[0], None
210 return repo.dirstate.parents()[0], None
211 end = None
211 end = None
212 if len(revs) == 1:
212 if len(revs) == 1:
213 start = revs[0]
213 start = revs[0]
214 if revrangesep in start:
214 if revrangesep in start:
215 start, end = start.split(revrangesep, 1)
215 start, end = start.split(revrangesep, 1)
216 start = revfix(repo, start, 0)
216 start = revfix(repo, start, 0)
217 end = revfix(repo, end, repo.changelog.count() - 1)
217 end = revfix(repo, end, repo.changelog.count() - 1)
218 else:
218 else:
219 start = revfix(repo, start, None)
219 start = revfix(repo, start, None)
220 elif len(revs) == 2:
220 elif len(revs) == 2:
221 if revrangesep in revs[0] or revrangesep in revs[1]:
221 if revrangesep in revs[0] or revrangesep in revs[1]:
222 raise util.Abort(_('too many revisions specified'))
222 raise util.Abort(_('too many revisions specified'))
223 start = revfix(repo, revs[0], None)
223 start = revfix(repo, revs[0], None)
224 end = revfix(repo, revs[1], None)
224 end = revfix(repo, revs[1], None)
225 else:
225 else:
226 raise util.Abort(_('too many revisions specified'))
226 raise util.Abort(_('too many revisions specified'))
227 if end is not None: end = repo.lookup(str(end))
227 if end is not None: end = repo.lookup(str(end))
228 return repo.lookup(str(start)), end
228 return repo.lookup(str(start)), end
229
229
230 def revrange(ui, repo, revs):
230 def revrange(ui, repo, revs):
231 """Yield revision as strings from a list of revision specifications."""
231 """Yield revision as strings from a list of revision specifications."""
232 seen = {}
232 seen = {}
233 for spec in revs:
233 for spec in revs:
234 if spec.find(revrangesep) >= 0:
234 if spec.find(revrangesep) >= 0:
235 start, end = spec.split(revrangesep, 1)
235 start, end = spec.split(revrangesep, 1)
236 start = revfix(repo, start, 0)
236 start = revfix(repo, start, 0)
237 end = revfix(repo, end, repo.changelog.count() - 1)
237 end = revfix(repo, end, repo.changelog.count() - 1)
238 step = start > end and -1 or 1
238 step = start > end and -1 or 1
239 for rev in xrange(start, end+step, step):
239 for rev in xrange(start, end+step, step):
240 if rev in seen:
240 if rev in seen:
241 continue
241 continue
242 seen[rev] = 1
242 seen[rev] = 1
243 yield str(rev)
243 yield str(rev)
244 else:
244 else:
245 rev = revfix(repo, spec, None)
245 rev = revfix(repo, spec, None)
246 if rev in seen:
246 if rev in seen:
247 continue
247 continue
248 seen[rev] = 1
248 seen[rev] = 1
249 yield str(rev)
249 yield str(rev)
250
250
251 def make_filename(repo, pat, node,
251 def make_filename(repo, pat, node,
252 total=None, seqno=None, revwidth=None, pathname=None):
252 total=None, seqno=None, revwidth=None, pathname=None):
253 node_expander = {
253 node_expander = {
254 'H': lambda: hex(node),
254 'H': lambda: hex(node),
255 'R': lambda: str(repo.changelog.rev(node)),
255 'R': lambda: str(repo.changelog.rev(node)),
256 'h': lambda: short(node),
256 'h': lambda: short(node),
257 }
257 }
258 expander = {
258 expander = {
259 '%': lambda: '%',
259 '%': lambda: '%',
260 'b': lambda: os.path.basename(repo.root),
260 'b': lambda: os.path.basename(repo.root),
261 }
261 }
262
262
263 try:
263 try:
264 if node:
264 if node:
265 expander.update(node_expander)
265 expander.update(node_expander)
266 if node and revwidth is not None:
266 if node and revwidth is not None:
267 expander['r'] = lambda: str(r.rev(node)).zfill(revwidth)
267 expander['r'] = lambda: str(r.rev(node)).zfill(revwidth)
268 if total is not None:
268 if total is not None:
269 expander['N'] = lambda: str(total)
269 expander['N'] = lambda: str(total)
270 if seqno is not None:
270 if seqno is not None:
271 expander['n'] = lambda: str(seqno)
271 expander['n'] = lambda: str(seqno)
272 if total is not None and seqno is not None:
272 if total is not None and seqno is not None:
273 expander['n'] = lambda:str(seqno).zfill(len(str(total)))
273 expander['n'] = lambda:str(seqno).zfill(len(str(total)))
274 if pathname is not None:
274 if pathname is not None:
275 expander['s'] = lambda: os.path.basename(pathname)
275 expander['s'] = lambda: os.path.basename(pathname)
276 expander['d'] = lambda: os.path.dirname(pathname) or '.'
276 expander['d'] = lambda: os.path.dirname(pathname) or '.'
277 expander['p'] = lambda: pathname
277 expander['p'] = lambda: pathname
278
278
279 newname = []
279 newname = []
280 patlen = len(pat)
280 patlen = len(pat)
281 i = 0
281 i = 0
282 while i < patlen:
282 while i < patlen:
283 c = pat[i]
283 c = pat[i]
284 if c == '%':
284 if c == '%':
285 i += 1
285 i += 1
286 c = pat[i]
286 c = pat[i]
287 c = expander[c]()
287 c = expander[c]()
288 newname.append(c)
288 newname.append(c)
289 i += 1
289 i += 1
290 return ''.join(newname)
290 return ''.join(newname)
291 except KeyError, inst:
291 except KeyError, inst:
292 raise util.Abort(_("invalid format spec '%%%s' in output file name"),
292 raise util.Abort(_("invalid format spec '%%%s' in output file name"),
293 inst.args[0])
293 inst.args[0])
294
294
295 def make_file(repo, pat, node=None,
295 def make_file(repo, pat, node=None,
296 total=None, seqno=None, revwidth=None, mode='wb', pathname=None):
296 total=None, seqno=None, revwidth=None, mode='wb', pathname=None):
297 if not pat or pat == '-':
297 if not pat or pat == '-':
298 return 'w' in mode and sys.stdout or sys.stdin
298 return 'w' in mode and sys.stdout or sys.stdin
299 if hasattr(pat, 'write') and 'w' in mode:
299 if hasattr(pat, 'write') and 'w' in mode:
300 return pat
300 return pat
301 if hasattr(pat, 'read') and 'r' in mode:
301 if hasattr(pat, 'read') and 'r' in mode:
302 return pat
302 return pat
303 return open(make_filename(repo, pat, node, total, seqno, revwidth,
303 return open(make_filename(repo, pat, node, total, seqno, revwidth,
304 pathname),
304 pathname),
305 mode)
305 mode)
306
306
307 def write_bundle(cg, filename=None, compress=True):
307 def write_bundle(cg, filename=None, compress=True):
308 """Write a bundle file and return its filename.
308 """Write a bundle file and return its filename.
309
309
310 Existing files will not be overwritten.
310 Existing files will not be overwritten.
311 If no filename is specified, a temporary file is created.
311 If no filename is specified, a temporary file is created.
312 bz2 compression can be turned off.
312 bz2 compression can be turned off.
313 The bundle file will be deleted in case of errors.
313 The bundle file will be deleted in case of errors.
314 """
314 """
315 class nocompress(object):
315 class nocompress(object):
316 def compress(self, x):
316 def compress(self, x):
317 return x
317 return x
318 def flush(self):
318 def flush(self):
319 return ""
319 return ""
320
320
321 fh = None
321 fh = None
322 cleanup = None
322 cleanup = None
323 try:
323 try:
324 if filename:
324 if filename:
325 if os.path.exists(filename):
325 if os.path.exists(filename):
326 raise util.Abort(_("file '%s' already exists"), filename)
326 raise util.Abort(_("file '%s' already exists"), filename)
327 fh = open(filename, "wb")
327 fh = open(filename, "wb")
328 else:
328 else:
329 fd, filename = tempfile.mkstemp(prefix="hg-bundle-", suffix=".hg")
329 fd, filename = tempfile.mkstemp(prefix="hg-bundle-", suffix=".hg")
330 fh = os.fdopen(fd, "wb")
330 fh = os.fdopen(fd, "wb")
331 cleanup = filename
331 cleanup = filename
332
332
333 if compress:
333 if compress:
334 fh.write("HG10")
334 fh.write("HG10")
335 z = bz2.BZ2Compressor(9)
335 z = bz2.BZ2Compressor(9)
336 else:
336 else:
337 fh.write("HG10UN")
337 fh.write("HG10UN")
338 z = nocompress()
338 z = nocompress()
339 # parse the changegroup data, otherwise we will block
339 # parse the changegroup data, otherwise we will block
340 # in case of sshrepo because we don't know the end of the stream
340 # in case of sshrepo because we don't know the end of the stream
341
341
342 # an empty chunkiter is the end of the changegroup
342 # an empty chunkiter is the end of the changegroup
343 empty = False
343 empty = False
344 while not empty:
344 while not empty:
345 empty = True
345 empty = True
346 for chunk in changegroup.chunkiter(cg):
346 for chunk in changegroup.chunkiter(cg):
347 empty = False
347 empty = False
348 fh.write(z.compress(changegroup.genchunk(chunk)))
348 fh.write(z.compress(changegroup.genchunk(chunk)))
349 fh.write(z.compress(changegroup.closechunk()))
349 fh.write(z.compress(changegroup.closechunk()))
350 fh.write(z.flush())
350 fh.write(z.flush())
351 cleanup = None
351 cleanup = None
352 return filename
352 return filename
353 finally:
353 finally:
354 if fh is not None:
354 if fh is not None:
355 fh.close()
355 fh.close()
356 if cleanup is not None:
356 if cleanup is not None:
357 os.unlink(cleanup)
357 os.unlink(cleanup)
358
358
359 def dodiff(fp, ui, repo, node1, node2, files=None, match=util.always,
359 def dodiff(fp, ui, repo, node1, node2, files=None, match=util.always,
360 changes=None, text=False, opts={}):
360 changes=None, text=False, opts={}):
361 if not node1:
361 if not node1:
362 node1 = repo.dirstate.parents()[0]
362 node1 = repo.dirstate.parents()[0]
363 # reading the data for node1 early allows it to play nicely
363 # reading the data for node1 early allows it to play nicely
364 # with repo.changes and the revlog cache.
364 # with repo.changes and the revlog cache.
365 change = repo.changelog.read(node1)
365 change = repo.changelog.read(node1)
366 mmap = repo.manifest.read(change[0])
366 mmap = repo.manifest.read(change[0])
367 date1 = util.datestr(change[2])
367 date1 = util.datestr(change[2])
368
368
369 if not changes:
369 if not changes:
370 changes = repo.changes(node1, node2, files, match=match)
370 changes = repo.changes(node1, node2, files, match=match)
371 modified, added, removed, deleted, unknown = changes
371 modified, added, removed, deleted, unknown = changes
372 if files:
372 if files:
373 modified, added, removed = map(lambda x: filterfiles(files, x),
373 modified, added, removed = map(lambda x: filterfiles(files, x),
374 (modified, added, removed))
374 (modified, added, removed))
375
375
376 if not modified and not added and not removed:
376 if not modified and not added and not removed:
377 return
377 return
378
378
379 if node2:
379 if node2:
380 change = repo.changelog.read(node2)
380 change = repo.changelog.read(node2)
381 mmap2 = repo.manifest.read(change[0])
381 mmap2 = repo.manifest.read(change[0])
382 _date2 = util.datestr(change[2])
382 _date2 = util.datestr(change[2])
383 def date2(f):
383 def date2(f):
384 return _date2
384 return _date2
385 def read(f):
385 def read(f):
386 return repo.file(f).read(mmap2[f])
386 return repo.file(f).read(mmap2[f])
387 else:
387 else:
388 tz = util.makedate()[1]
388 tz = util.makedate()[1]
389 _date2 = util.datestr()
389 _date2 = util.datestr()
390 def date2(f):
390 def date2(f):
391 try:
391 try:
392 return util.datestr((os.lstat(repo.wjoin(f)).st_mtime, tz))
392 return util.datestr((os.lstat(repo.wjoin(f)).st_mtime, tz))
393 except OSError, err:
393 except OSError, err:
394 if err.errno != errno.ENOENT: raise
394 if err.errno != errno.ENOENT: raise
395 return _date2
395 return _date2
396 def read(f):
396 def read(f):
397 return repo.wread(f)
397 return repo.wread(f)
398
398
399 if ui.quiet:
399 if ui.quiet:
400 r = None
400 r = None
401 else:
401 else:
402 hexfunc = ui.verbose and hex or short
402 hexfunc = ui.verbose and hex or short
403 r = [hexfunc(node) for node in [node1, node2] if node]
403 r = [hexfunc(node) for node in [node1, node2] if node]
404
404
405 diffopts = ui.diffopts()
405 diffopts = ui.diffopts()
406 showfunc = opts.get('show_function') or diffopts['showfunc']
406 showfunc = opts.get('show_function') or diffopts['showfunc']
407 ignorews = opts.get('ignore_all_space') or diffopts['ignorews']
407 ignorews = opts.get('ignore_all_space') or diffopts['ignorews']
408 for f in modified:
408 for f in modified:
409 to = None
409 to = None
410 if f in mmap:
410 if f in mmap:
411 to = repo.file(f).read(mmap[f])
411 to = repo.file(f).read(mmap[f])
412 tn = read(f)
412 tn = read(f)
413 fp.write(mdiff.unidiff(to, date1, tn, date2(f), f, r, text=text,
413 fp.write(mdiff.unidiff(to, date1, tn, date2(f), f, r, text=text,
414 showfunc=showfunc, ignorews=ignorews))
414 showfunc=showfunc, ignorews=ignorews))
415 for f in added:
415 for f in added:
416 to = None
416 to = None
417 tn = read(f)
417 tn = read(f)
418 fp.write(mdiff.unidiff(to, date1, tn, date2(f), f, r, text=text,
418 fp.write(mdiff.unidiff(to, date1, tn, date2(f), f, r, text=text,
419 showfunc=showfunc, ignorews=ignorews))
419 showfunc=showfunc, ignorews=ignorews))
420 for f in removed:
420 for f in removed:
421 to = repo.file(f).read(mmap[f])
421 to = repo.file(f).read(mmap[f])
422 tn = None
422 tn = None
423 fp.write(mdiff.unidiff(to, date1, tn, date2(f), f, r, text=text,
423 fp.write(mdiff.unidiff(to, date1, tn, date2(f), f, r, text=text,
424 showfunc=showfunc, ignorews=ignorews))
424 showfunc=showfunc, ignorews=ignorews))
425
425
426 def trimuser(ui, name, rev, revcache):
426 def trimuser(ui, name, rev, revcache):
427 """trim the name of the user who committed a change"""
427 """trim the name of the user who committed a change"""
428 user = revcache.get(rev)
428 user = revcache.get(rev)
429 if user is None:
429 if user is None:
430 user = revcache[rev] = ui.shortuser(name)
430 user = revcache[rev] = ui.shortuser(name)
431 return user
431 return user
432
432
433 class changeset_printer(object):
433 class changeset_printer(object):
434 '''show changeset information when templating not requested.'''
434 '''show changeset information when templating not requested.'''
435
435
436 def __init__(self, ui, repo):
436 def __init__(self, ui, repo):
437 self.ui = ui
437 self.ui = ui
438 self.repo = repo
438 self.repo = repo
439
439
440 def show(self, rev=0, changenode=None, brinfo=None):
440 def show(self, rev=0, changenode=None, brinfo=None):
441 '''show a single changeset or file revision'''
441 '''show a single changeset or file revision'''
442 log = self.repo.changelog
442 log = self.repo.changelog
443 if changenode is None:
443 if changenode is None:
444 changenode = log.node(rev)
444 changenode = log.node(rev)
445 elif not rev:
445 elif not rev:
446 rev = log.rev(changenode)
446 rev = log.rev(changenode)
447
447
448 if self.ui.quiet:
448 if self.ui.quiet:
449 self.ui.write("%d:%s\n" % (rev, short(changenode)))
449 self.ui.write("%d:%s\n" % (rev, short(changenode)))
450 return
450 return
451
451
452 changes = log.read(changenode)
452 changes = log.read(changenode)
453 date = util.datestr(changes[2])
453 date = util.datestr(changes[2])
454
454
455 parents = [(log.rev(p), self.ui.verbose and hex(p) or short(p))
455 parents = [(log.rev(p), self.ui.verbose and hex(p) or short(p))
456 for p in log.parents(changenode)
456 for p in log.parents(changenode)
457 if self.ui.debugflag or p != nullid]
457 if self.ui.debugflag or p != nullid]
458 if (not self.ui.debugflag and len(parents) == 1 and
458 if (not self.ui.debugflag and len(parents) == 1 and
459 parents[0][0] == rev-1):
459 parents[0][0] == rev-1):
460 parents = []
460 parents = []
461
461
462 if self.ui.verbose:
462 if self.ui.verbose:
463 self.ui.write(_("changeset: %d:%s\n") % (rev, hex(changenode)))
463 self.ui.write(_("changeset: %d:%s\n") % (rev, hex(changenode)))
464 else:
464 else:
465 self.ui.write(_("changeset: %d:%s\n") % (rev, short(changenode)))
465 self.ui.write(_("changeset: %d:%s\n") % (rev, short(changenode)))
466
466
467 for tag in self.repo.nodetags(changenode):
467 for tag in self.repo.nodetags(changenode):
468 self.ui.status(_("tag: %s\n") % tag)
468 self.ui.status(_("tag: %s\n") % tag)
469 for parent in parents:
469 for parent in parents:
470 self.ui.write(_("parent: %d:%s\n") % parent)
470 self.ui.write(_("parent: %d:%s\n") % parent)
471
471
472 if brinfo and changenode in brinfo:
472 if brinfo and changenode in brinfo:
473 br = brinfo[changenode]
473 br = brinfo[changenode]
474 self.ui.write(_("branch: %s\n") % " ".join(br))
474 self.ui.write(_("branch: %s\n") % " ".join(br))
475
475
476 self.ui.debug(_("manifest: %d:%s\n") %
476 self.ui.debug(_("manifest: %d:%s\n") %
477 (self.repo.manifest.rev(changes[0]), hex(changes[0])))
477 (self.repo.manifest.rev(changes[0]), hex(changes[0])))
478 self.ui.status(_("user: %s\n") % changes[1])
478 self.ui.status(_("user: %s\n") % changes[1])
479 self.ui.status(_("date: %s\n") % date)
479 self.ui.status(_("date: %s\n") % date)
480
480
481 if self.ui.debugflag:
481 if self.ui.debugflag:
482 files = self.repo.changes(log.parents(changenode)[0], changenode)
482 files = self.repo.changes(log.parents(changenode)[0], changenode)
483 for key, value in zip([_("files:"), _("files+:"), _("files-:")],
483 for key, value in zip([_("files:"), _("files+:"), _("files-:")],
484 files):
484 files):
485 if value:
485 if value:
486 self.ui.note("%-12s %s\n" % (key, " ".join(value)))
486 self.ui.note("%-12s %s\n" % (key, " ".join(value)))
487 else:
487 else:
488 self.ui.note(_("files: %s\n") % " ".join(changes[3]))
488 self.ui.note(_("files: %s\n") % " ".join(changes[3]))
489
489
490 description = changes[4].strip()
490 description = changes[4].strip()
491 if description:
491 if description:
492 if self.ui.verbose:
492 if self.ui.verbose:
493 self.ui.status(_("description:\n"))
493 self.ui.status(_("description:\n"))
494 self.ui.status(description)
494 self.ui.status(description)
495 self.ui.status("\n\n")
495 self.ui.status("\n\n")
496 else:
496 else:
497 self.ui.status(_("summary: %s\n") %
497 self.ui.status(_("summary: %s\n") %
498 description.splitlines()[0])
498 description.splitlines()[0])
499 self.ui.status("\n")
499 self.ui.status("\n")
500
500
501 def show_changeset(ui, repo, opts):
501 def show_changeset(ui, repo, opts):
502 '''show one changeset. uses template or regular display. caller
502 '''show one changeset. uses template or regular display. caller
503 can pass in 'style' and 'template' options in opts.'''
503 can pass in 'style' and 'template' options in opts.'''
504
504
505 tmpl = opts.get('template')
505 tmpl = opts.get('template')
506 if tmpl:
506 if tmpl:
507 tmpl = templater.parsestring(tmpl, quoted=False)
507 tmpl = templater.parsestring(tmpl, quoted=False)
508 else:
508 else:
509 tmpl = ui.config('ui', 'logtemplate')
509 tmpl = ui.config('ui', 'logtemplate')
510 if tmpl: tmpl = templater.parsestring(tmpl)
510 if tmpl: tmpl = templater.parsestring(tmpl)
511 mapfile = opts.get('style') or ui.config('ui', 'style')
511 mapfile = opts.get('style') or ui.config('ui', 'style')
512 if tmpl or mapfile:
512 if tmpl or mapfile:
513 if mapfile:
513 if mapfile:
514 if not os.path.isfile(mapfile):
514 if not os.path.isfile(mapfile):
515 mapname = templater.templatepath('map-cmdline.' + mapfile)
515 mapname = templater.templatepath('map-cmdline.' + mapfile)
516 if not mapname: mapname = templater.templatepath(mapfile)
516 if not mapname: mapname = templater.templatepath(mapfile)
517 if mapname: mapfile = mapname
517 if mapname: mapfile = mapname
518 try:
518 try:
519 t = templater.changeset_templater(ui, repo, mapfile)
519 t = templater.changeset_templater(ui, repo, mapfile)
520 except SyntaxError, inst:
520 except SyntaxError, inst:
521 raise util.Abort(inst.args[0])
521 raise util.Abort(inst.args[0])
522 if tmpl: t.use_template(tmpl)
522 if tmpl: t.use_template(tmpl)
523 return t
523 return t
524 return changeset_printer(ui, repo)
524 return changeset_printer(ui, repo)
525
525
526 def show_version(ui):
526 def show_version(ui):
527 """output version and copyright information"""
527 """output version and copyright information"""
528 ui.write(_("Mercurial Distributed SCM (version %s)\n")
528 ui.write(_("Mercurial Distributed SCM (version %s)\n")
529 % version.get_version())
529 % version.get_version())
530 ui.status(_(
530 ui.status(_(
531 "\nCopyright (C) 2005 Matt Mackall <mpm@selenic.com>\n"
531 "\nCopyright (C) 2005 Matt Mackall <mpm@selenic.com>\n"
532 "This is free software; see the source for copying conditions. "
532 "This is free software; see the source for copying conditions. "
533 "There is NO\nwarranty; "
533 "There is NO\nwarranty; "
534 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
534 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
535 ))
535 ))
536
536
537 def help_(ui, name=None, with_version=False):
537 def help_(ui, name=None, with_version=False):
538 """show help for a command, extension, or list of commands
538 """show help for a command, extension, or list of commands
539
539
540 With no arguments, print a list of commands and short help.
540 With no arguments, print a list of commands and short help.
541
541
542 Given a command name, print help for that command.
542 Given a command name, print help for that command.
543
543
544 Given an extension name, print help for that extension, and the
544 Given an extension name, print help for that extension, and the
545 commands it provides."""
545 commands it provides."""
546 option_lists = []
546 option_lists = []
547
547
548 def helpcmd(name):
548 def helpcmd(name):
549 if with_version:
549 if with_version:
550 show_version(ui)
550 show_version(ui)
551 ui.write('\n')
551 ui.write('\n')
552 aliases, i = findcmd(name)
552 aliases, i = findcmd(name)
553 # synopsis
553 # synopsis
554 ui.write("%s\n\n" % i[2])
554 ui.write("%s\n\n" % i[2])
555
555
556 # description
556 # description
557 doc = i[0].__doc__
557 doc = i[0].__doc__
558 if not doc:
558 if not doc:
559 doc = _("(No help text available)")
559 doc = _("(No help text available)")
560 if ui.quiet:
560 if ui.quiet:
561 doc = doc.splitlines(0)[0]
561 doc = doc.splitlines(0)[0]
562 ui.write("%s\n" % doc.rstrip())
562 ui.write("%s\n" % doc.rstrip())
563
563
564 if not ui.quiet:
564 if not ui.quiet:
565 # aliases
565 # aliases
566 if len(aliases) > 1:
566 if len(aliases) > 1:
567 ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:]))
567 ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:]))
568
568
569 # options
569 # options
570 if i[1]:
570 if i[1]:
571 option_lists.append(("options", i[1]))
571 option_lists.append(("options", i[1]))
572
572
573 def helplist(select=None):
573 def helplist(select=None):
574 h = {}
574 h = {}
575 cmds = {}
575 cmds = {}
576 for c, e in table.items():
576 for c, e in table.items():
577 f = c.split("|", 1)[0]
577 f = c.split("|", 1)[0]
578 if select and not select(f):
578 if select and not select(f):
579 continue
579 continue
580 if name == "shortlist" and not f.startswith("^"):
580 if name == "shortlist" and not f.startswith("^"):
581 continue
581 continue
582 f = f.lstrip("^")
582 f = f.lstrip("^")
583 if not ui.debugflag and f.startswith("debug"):
583 if not ui.debugflag and f.startswith("debug"):
584 continue
584 continue
585 doc = e[0].__doc__
585 doc = e[0].__doc__
586 if not doc:
586 if not doc:
587 doc = _("(No help text available)")
587 doc = _("(No help text available)")
588 h[f] = doc.splitlines(0)[0].rstrip()
588 h[f] = doc.splitlines(0)[0].rstrip()
589 cmds[f] = c.lstrip("^")
589 cmds[f] = c.lstrip("^")
590
590
591 fns = h.keys()
591 fns = h.keys()
592 fns.sort()
592 fns.sort()
593 m = max(map(len, fns))
593 m = max(map(len, fns))
594 for f in fns:
594 for f in fns:
595 if ui.verbose:
595 if ui.verbose:
596 commands = cmds[f].replace("|",", ")
596 commands = cmds[f].replace("|",", ")
597 ui.write(" %s:\n %s\n"%(commands, h[f]))
597 ui.write(" %s:\n %s\n"%(commands, h[f]))
598 else:
598 else:
599 ui.write(' %-*s %s\n' % (m, f, h[f]))
599 ui.write(' %-*s %s\n' % (m, f, h[f]))
600
600
601 def helpext(name):
601 def helpext(name):
602 try:
602 try:
603 mod = findext(name)
603 mod = findext(name)
604 except KeyError:
604 except KeyError:
605 raise UnknownCommand(name)
605 raise UnknownCommand(name)
606
606
607 doc = (mod.__doc__ or _('No help text available')).splitlines(0)
607 doc = (mod.__doc__ or _('No help text available')).splitlines(0)
608 ui.write(_('%s extension - %s\n') % (name.split('.')[-1], doc[0]))
608 ui.write(_('%s extension - %s\n') % (name.split('.')[-1], doc[0]))
609 for d in doc[1:]:
609 for d in doc[1:]:
610 ui.write(d, '\n')
610 ui.write(d, '\n')
611
611
612 ui.status('\n')
612 ui.status('\n')
613 if ui.verbose:
613 if ui.verbose:
614 ui.status(_('list of commands:\n\n'))
614 ui.status(_('list of commands:\n\n'))
615 else:
615 else:
616 ui.status(_('list of commands (use "hg help -v %s" '
616 ui.status(_('list of commands (use "hg help -v %s" '
617 'to show aliases and global options):\n\n') % name)
617 'to show aliases and global options):\n\n') % name)
618
618
619 modcmds = dict.fromkeys([c.split('|', 1)[0] for c in mod.cmdtable])
619 modcmds = dict.fromkeys([c.split('|', 1)[0] for c in mod.cmdtable])
620 helplist(modcmds.has_key)
620 helplist(modcmds.has_key)
621
621
622 if name and name != 'shortlist':
622 if name and name != 'shortlist':
623 try:
623 try:
624 helpcmd(name)
624 helpcmd(name)
625 except UnknownCommand:
625 except UnknownCommand:
626 helpext(name)
626 helpext(name)
627
627
628 else:
628 else:
629 # program name
629 # program name
630 if ui.verbose or with_version:
630 if ui.verbose or with_version:
631 show_version(ui)
631 show_version(ui)
632 else:
632 else:
633 ui.status(_("Mercurial Distributed SCM\n"))
633 ui.status(_("Mercurial Distributed SCM\n"))
634 ui.status('\n')
634 ui.status('\n')
635
635
636 # list of commands
636 # list of commands
637 if name == "shortlist":
637 if name == "shortlist":
638 ui.status(_('basic commands (use "hg help" '
638 ui.status(_('basic commands (use "hg help" '
639 'for the full list or option "-v" for details):\n\n'))
639 'for the full list or option "-v" for details):\n\n'))
640 elif ui.verbose:
640 elif ui.verbose:
641 ui.status(_('list of commands:\n\n'))
641 ui.status(_('list of commands:\n\n'))
642 else:
642 else:
643 ui.status(_('list of commands (use "hg help -v" '
643 ui.status(_('list of commands (use "hg help -v" '
644 'to show aliases and global options):\n\n'))
644 'to show aliases and global options):\n\n'))
645
645
646 helplist()
646 helplist()
647
647
648 # global options
648 # global options
649 if ui.verbose:
649 if ui.verbose:
650 option_lists.append(("global options", globalopts))
650 option_lists.append(("global options", globalopts))
651
651
652 # list all option lists
652 # list all option lists
653 opt_output = []
653 opt_output = []
654 for title, options in option_lists:
654 for title, options in option_lists:
655 opt_output.append(("\n%s:\n" % title, None))
655 opt_output.append(("\n%s:\n" % title, None))
656 for shortopt, longopt, default, desc in options:
656 for shortopt, longopt, default, desc in options:
657 opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt,
657 opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt,
658 longopt and " --%s" % longopt),
658 longopt and " --%s" % longopt),
659 "%s%s" % (desc,
659 "%s%s" % (desc,
660 default
660 default
661 and _(" (default: %s)") % default
661 and _(" (default: %s)") % default
662 or "")))
662 or "")))
663
663
664 if opt_output:
664 if opt_output:
665 opts_len = max([len(line[0]) for line in opt_output if line[1]])
665 opts_len = max([len(line[0]) for line in opt_output if line[1]])
666 for first, second in opt_output:
666 for first, second in opt_output:
667 if second:
667 if second:
668 ui.write(" %-*s %s\n" % (opts_len, first, second))
668 ui.write(" %-*s %s\n" % (opts_len, first, second))
669 else:
669 else:
670 ui.write("%s\n" % first)
670 ui.write("%s\n" % first)
671
671
672 # Commands start here, listed alphabetically
672 # Commands start here, listed alphabetically
673
673
674 def add(ui, repo, *pats, **opts):
674 def add(ui, repo, *pats, **opts):
675 """add the specified files on the next commit
675 """add the specified files on the next commit
676
676
677 Schedule files to be version controlled and added to the repository.
677 Schedule files to be version controlled and added to the repository.
678
678
679 The files will be added to the repository at the next commit.
679 The files will be added to the repository at the next commit.
680
680
681 If no names are given, add all files in the repository.
681 If no names are given, add all files in the repository.
682 """
682 """
683
683
684 names = []
684 names = []
685 for src, abs, rel, exact in walk(repo, pats, opts):
685 for src, abs, rel, exact in walk(repo, pats, opts):
686 if exact:
686 if exact:
687 if ui.verbose:
687 if ui.verbose:
688 ui.status(_('adding %s\n') % rel)
688 ui.status(_('adding %s\n') % rel)
689 names.append(abs)
689 names.append(abs)
690 elif repo.dirstate.state(abs) == '?':
690 elif repo.dirstate.state(abs) == '?':
691 ui.status(_('adding %s\n') % rel)
691 ui.status(_('adding %s\n') % rel)
692 names.append(abs)
692 names.append(abs)
693 if not opts.get('dry_run'):
693 if not opts.get('dry_run'):
694 repo.add(names)
694 repo.add(names)
695
695
696 def addremove(ui, repo, *pats, **opts):
696 def addremove(ui, repo, *pats, **opts):
697 """add all new files, delete all missing files (DEPRECATED)
697 """add all new files, delete all missing files (DEPRECATED)
698
698
699 (DEPRECATED)
699 (DEPRECATED)
700 Add all new files and remove all missing files from the repository.
700 Add all new files and remove all missing files from the repository.
701
701
702 New files are ignored if they match any of the patterns in .hgignore. As
702 New files are ignored if they match any of the patterns in .hgignore. As
703 with add, these changes take effect at the next commit.
703 with add, these changes take effect at the next commit.
704
704
705 This command is now deprecated and will be removed in a future
705 This command is now deprecated and will be removed in a future
706 release. Please use add and remove --after instead.
706 release. Please use add and remove --after instead.
707 """
707 """
708 ui.warn(_('(the addremove command is deprecated; use add and remove '
708 ui.warn(_('(the addremove command is deprecated; use add and remove '
709 '--after instead)\n'))
709 '--after instead)\n'))
710 return addremove_lock(ui, repo, pats, opts)
710 return addremove_lock(ui, repo, pats, opts)
711
711
712 def addremove_lock(ui, repo, pats, opts, wlock=None):
712 def addremove_lock(ui, repo, pats, opts, wlock=None):
713 add, remove = [], []
713 add, remove = [], []
714 for src, abs, rel, exact in walk(repo, pats, opts):
714 for src, abs, rel, exact in walk(repo, pats, opts):
715 if src == 'f' and repo.dirstate.state(abs) == '?':
715 if src == 'f' and repo.dirstate.state(abs) == '?':
716 add.append(abs)
716 add.append(abs)
717 if ui.verbose or not exact:
717 if ui.verbose or not exact:
718 ui.status(_('adding %s\n') % ((pats and rel) or abs))
718 ui.status(_('adding %s\n') % ((pats and rel) or abs))
719 if repo.dirstate.state(abs) != 'r' and not os.path.exists(rel):
719 if repo.dirstate.state(abs) != 'r' and not os.path.exists(rel):
720 remove.append(abs)
720 remove.append(abs)
721 if ui.verbose or not exact:
721 if ui.verbose or not exact:
722 ui.status(_('removing %s\n') % ((pats and rel) or abs))
722 ui.status(_('removing %s\n') % ((pats and rel) or abs))
723 if not opts.get('dry_run'):
723 if not opts.get('dry_run'):
724 repo.add(add, wlock=wlock)
724 repo.add(add, wlock=wlock)
725 repo.remove(remove, wlock=wlock)
725 repo.remove(remove, wlock=wlock)
726
726
727 def annotate(ui, repo, *pats, **opts):
727 def annotate(ui, repo, *pats, **opts):
728 """show changeset information per file line
728 """show changeset information per file line
729
729
730 List changes in files, showing the revision id responsible for each line
730 List changes in files, showing the revision id responsible for each line
731
731
732 This command is useful to discover who did a change or when a change took
732 This command is useful to discover who did a change or when a change took
733 place.
733 place.
734
734
735 Without the -a option, annotate will avoid processing files it
735 Without the -a option, annotate will avoid processing files it
736 detects as binary. With -a, annotate will generate an annotation
736 detects as binary. With -a, annotate will generate an annotation
737 anyway, probably with undesirable results.
737 anyway, probably with undesirable results.
738 """
738 """
739 def getnode(rev):
739 def getnode(rev):
740 return short(repo.changelog.node(rev))
740 return short(repo.changelog.node(rev))
741
741
742 ucache = {}
742 ucache = {}
743 def getname(rev):
743 def getname(rev):
744 try:
744 try:
745 return ucache[rev]
745 return ucache[rev]
746 except:
746 except:
747 u = trimuser(ui, repo.changectx(rev).user(), rev, ucache)
747 u = trimuser(ui, repo.changectx(rev).user(), rev, ucache)
748 ucache[rev] = u
748 ucache[rev] = u
749 return u
749 return u
750
750
751 dcache = {}
751 dcache = {}
752 def getdate(rev):
752 def getdate(rev):
753 datestr = dcache.get(rev)
753 datestr = dcache.get(rev)
754 if datestr is None:
754 if datestr is None:
755 datestr = dcache[rev] = util.datestr(repo.changectx(rev).date())
755 datestr = dcache[rev] = util.datestr(repo.changectx(rev).date())
756 return datestr
756 return datestr
757
757
758 if not pats:
758 if not pats:
759 raise util.Abort(_('at least one file name or pattern required'))
759 raise util.Abort(_('at least one file name or pattern required'))
760
760
761 opmap = [['user', getname], ['number', str], ['changeset', getnode],
761 opmap = [['user', getname], ['number', str], ['changeset', getnode],
762 ['date', getdate]]
762 ['date', getdate]]
763 if not opts['user'] and not opts['changeset'] and not opts['date']:
763 if not opts['user'] and not opts['changeset'] and not opts['date']:
764 opts['number'] = 1
764 opts['number'] = 1
765
765
766 ctx = repo.changectx(opts['rev'] or repo.dirstate.parents()[0])
766 ctx = repo.changectx(opts['rev'] or repo.dirstate.parents()[0])
767
767
768 for src, abs, rel, exact in walk(repo, pats, opts, node=node):
768 for src, abs, rel, exact in walk(repo, pats, opts, node=ctx.node()):
769 fctx = ctx.filectx(abs)
769 fctx = ctx.filectx(abs)
770 if not opts['text'] and util.binary(fctx.data()):
770 if not opts['text'] and util.binary(fctx.data()):
771 ui.write(_("%s: binary file\n") % ((pats and rel) or abs))
771 ui.write(_("%s: binary file\n") % ((pats and rel) or abs))
772 continue
772 continue
773
773
774 lines = fctx.annotate()
774 lines = fctx.annotate()
775 pieces = []
775 pieces = []
776
776
777 for o, f in opmap:
777 for o, f in opmap:
778 if opts[o]:
778 if opts[o]:
779 l = [f(n) for n, dummy in lines]
779 l = [f(n) for n, dummy in lines]
780 if l:
780 if l:
781 m = max(map(len, l))
781 m = max(map(len, l))
782 pieces.append(["%*s" % (m, x) for x in l])
782 pieces.append(["%*s" % (m, x) for x in l])
783
783
784 if pieces:
784 if pieces:
785 for p, l in zip(zip(*pieces), lines):
785 for p, l in zip(zip(*pieces), lines):
786 ui.write("%s: %s" % (" ".join(p), l[1]))
786 ui.write("%s: %s" % (" ".join(p), l[1]))
787
787
788 def archive(ui, repo, dest, **opts):
788 def archive(ui, repo, dest, **opts):
789 '''create unversioned archive of a repository revision
789 '''create unversioned archive of a repository revision
790
790
791 By default, the revision used is the parent of the working
791 By default, the revision used is the parent of the working
792 directory; use "-r" to specify a different revision.
792 directory; use "-r" to specify a different revision.
793
793
794 To specify the type of archive to create, use "-t". Valid
794 To specify the type of archive to create, use "-t". Valid
795 types are:
795 types are:
796
796
797 "files" (default): a directory full of files
797 "files" (default): a directory full of files
798 "tar": tar archive, uncompressed
798 "tar": tar archive, uncompressed
799 "tbz2": tar archive, compressed using bzip2
799 "tbz2": tar archive, compressed using bzip2
800 "tgz": tar archive, compressed using gzip
800 "tgz": tar archive, compressed using gzip
801 "uzip": zip archive, uncompressed
801 "uzip": zip archive, uncompressed
802 "zip": zip archive, compressed using deflate
802 "zip": zip archive, compressed using deflate
803
803
804 The exact name of the destination archive or directory is given
804 The exact name of the destination archive or directory is given
805 using a format string; see "hg help export" for details.
805 using a format string; see "hg help export" for details.
806
806
807 Each member added to an archive file has a directory prefix
807 Each member added to an archive file has a directory prefix
808 prepended. Use "-p" to specify a format string for the prefix.
808 prepended. Use "-p" to specify a format string for the prefix.
809 The default is the basename of the archive, with suffixes removed.
809 The default is the basename of the archive, with suffixes removed.
810 '''
810 '''
811
811
812 if opts['rev']:
812 if opts['rev']:
813 node = repo.lookup(opts['rev'])
813 node = repo.lookup(opts['rev'])
814 else:
814 else:
815 node, p2 = repo.dirstate.parents()
815 node, p2 = repo.dirstate.parents()
816 if p2 != nullid:
816 if p2 != nullid:
817 raise util.Abort(_('uncommitted merge - please provide a '
817 raise util.Abort(_('uncommitted merge - please provide a '
818 'specific revision'))
818 'specific revision'))
819
819
820 dest = make_filename(repo, dest, node)
820 dest = make_filename(repo, dest, node)
821 if os.path.realpath(dest) == repo.root:
821 if os.path.realpath(dest) == repo.root:
822 raise util.Abort(_('repository root cannot be destination'))
822 raise util.Abort(_('repository root cannot be destination'))
823 dummy, matchfn, dummy = matchpats(repo, [], opts)
823 dummy, matchfn, dummy = matchpats(repo, [], opts)
824 kind = opts.get('type') or 'files'
824 kind = opts.get('type') or 'files'
825 prefix = opts['prefix']
825 prefix = opts['prefix']
826 if dest == '-':
826 if dest == '-':
827 if kind == 'files':
827 if kind == 'files':
828 raise util.Abort(_('cannot archive plain files to stdout'))
828 raise util.Abort(_('cannot archive plain files to stdout'))
829 dest = sys.stdout
829 dest = sys.stdout
830 if not prefix: prefix = os.path.basename(repo.root) + '-%h'
830 if not prefix: prefix = os.path.basename(repo.root) + '-%h'
831 prefix = make_filename(repo, prefix, node)
831 prefix = make_filename(repo, prefix, node)
832 archival.archive(repo, dest, node, kind, not opts['no_decode'],
832 archival.archive(repo, dest, node, kind, not opts['no_decode'],
833 matchfn, prefix)
833 matchfn, prefix)
834
834
835 def backout(ui, repo, rev, **opts):
835 def backout(ui, repo, rev, **opts):
836 '''reverse effect of earlier changeset
836 '''reverse effect of earlier changeset
837
837
838 Commit the backed out changes as a new changeset. The new
838 Commit the backed out changes as a new changeset. The new
839 changeset is a child of the backed out changeset.
839 changeset is a child of the backed out changeset.
840
840
841 If you back out a changeset other than the tip, a new head is
841 If you back out a changeset other than the tip, a new head is
842 created. This head is the parent of the working directory. If
842 created. This head is the parent of the working directory. If
843 you back out an old changeset, your working directory will appear
843 you back out an old changeset, your working directory will appear
844 old after the backout. You should merge the backout changeset
844 old after the backout. You should merge the backout changeset
845 with another head.
845 with another head.
846
846
847 The --merge option remembers the parent of the working directory
847 The --merge option remembers the parent of the working directory
848 before starting the backout, then merges the new head with that
848 before starting the backout, then merges the new head with that
849 changeset afterwards. This saves you from doing the merge by
849 changeset afterwards. This saves you from doing the merge by
850 hand. The result of this merge is not committed, as for a normal
850 hand. The result of this merge is not committed, as for a normal
851 merge.'''
851 merge.'''
852
852
853 bail_if_changed(repo)
853 bail_if_changed(repo)
854 op1, op2 = repo.dirstate.parents()
854 op1, op2 = repo.dirstate.parents()
855 if op2 != nullid:
855 if op2 != nullid:
856 raise util.Abort(_('outstanding uncommitted merge'))
856 raise util.Abort(_('outstanding uncommitted merge'))
857 node = repo.lookup(rev)
857 node = repo.lookup(rev)
858 parent, p2 = repo.changelog.parents(node)
858 parent, p2 = repo.changelog.parents(node)
859 if parent == nullid:
859 if parent == nullid:
860 raise util.Abort(_('cannot back out a change with no parents'))
860 raise util.Abort(_('cannot back out a change with no parents'))
861 if p2 != nullid:
861 if p2 != nullid:
862 raise util.Abort(_('cannot back out a merge'))
862 raise util.Abort(_('cannot back out a merge'))
863 repo.update(node, force=True, show_stats=False)
863 repo.update(node, force=True, show_stats=False)
864 revert_opts = opts.copy()
864 revert_opts = opts.copy()
865 revert_opts['rev'] = hex(parent)
865 revert_opts['rev'] = hex(parent)
866 revert(ui, repo, **revert_opts)
866 revert(ui, repo, **revert_opts)
867 commit_opts = opts.copy()
867 commit_opts = opts.copy()
868 commit_opts['addremove'] = False
868 commit_opts['addremove'] = False
869 if not commit_opts['message'] and not commit_opts['logfile']:
869 if not commit_opts['message'] and not commit_opts['logfile']:
870 commit_opts['message'] = _("Backed out changeset %s") % (hex(node))
870 commit_opts['message'] = _("Backed out changeset %s") % (hex(node))
871 commit_opts['force_editor'] = True
871 commit_opts['force_editor'] = True
872 commit(ui, repo, **commit_opts)
872 commit(ui, repo, **commit_opts)
873 def nice(node):
873 def nice(node):
874 return '%d:%s' % (repo.changelog.rev(node), short(node))
874 return '%d:%s' % (repo.changelog.rev(node), short(node))
875 ui.status(_('changeset %s backs out changeset %s\n') %
875 ui.status(_('changeset %s backs out changeset %s\n') %
876 (nice(repo.changelog.tip()), nice(node)))
876 (nice(repo.changelog.tip()), nice(node)))
877 if op1 != node:
877 if op1 != node:
878 if opts['merge']:
878 if opts['merge']:
879 ui.status(_('merging with changeset %s\n') % nice(op1))
879 ui.status(_('merging with changeset %s\n') % nice(op1))
880 doupdate(ui, repo, hex(op1), **opts)
880 doupdate(ui, repo, hex(op1), **opts)
881 else:
881 else:
882 ui.status(_('the backout changeset is a new head - '
882 ui.status(_('the backout changeset is a new head - '
883 'do not forget to merge\n'))
883 'do not forget to merge\n'))
884 ui.status(_('(use "backout -m" if you want to auto-merge)\n'))
884 ui.status(_('(use "backout -m" if you want to auto-merge)\n'))
885
885
886 def bundle(ui, repo, fname, dest=None, **opts):
886 def bundle(ui, repo, fname, dest=None, **opts):
887 """create a changegroup file
887 """create a changegroup file
888
888
889 Generate a compressed changegroup file collecting all changesets
889 Generate a compressed changegroup file collecting all changesets
890 not found in the other repository.
890 not found in the other repository.
891
891
892 This file can then be transferred using conventional means and
892 This file can then be transferred using conventional means and
893 applied to another repository with the unbundle command. This is
893 applied to another repository with the unbundle command. This is
894 useful when native push and pull are not available or when
894 useful when native push and pull are not available or when
895 exporting an entire repository is undesirable. The standard file
895 exporting an entire repository is undesirable. The standard file
896 extension is ".hg".
896 extension is ".hg".
897
897
898 Unlike import/export, this exactly preserves all changeset
898 Unlike import/export, this exactly preserves all changeset
899 contents including permissions, rename data, and revision history.
899 contents including permissions, rename data, and revision history.
900 """
900 """
901 dest = ui.expandpath(dest or 'default-push', dest or 'default')
901 dest = ui.expandpath(dest or 'default-push', dest or 'default')
902 other = hg.repository(ui, dest)
902 other = hg.repository(ui, dest)
903 o = repo.findoutgoing(other, force=opts['force'])
903 o = repo.findoutgoing(other, force=opts['force'])
904 cg = repo.changegroup(o, 'bundle')
904 cg = repo.changegroup(o, 'bundle')
905 write_bundle(cg, fname)
905 write_bundle(cg, fname)
906
906
907 def cat(ui, repo, file1, *pats, **opts):
907 def cat(ui, repo, file1, *pats, **opts):
908 """output the latest or given revisions of files
908 """output the latest or given revisions of files
909
909
910 Print the specified files as they were at the given revision.
910 Print the specified files as they were at the given revision.
911 If no revision is given then the tip is used.
911 If no revision is given then the tip is used.
912
912
913 Output may be to a file, in which case the name of the file is
913 Output may be to a file, in which case the name of the file is
914 given using a format string. The formatting rules are the same as
914 given using a format string. The formatting rules are the same as
915 for the export command, with the following additions:
915 for the export command, with the following additions:
916
916
917 %s basename of file being printed
917 %s basename of file being printed
918 %d dirname of file being printed, or '.' if in repo root
918 %d dirname of file being printed, or '.' if in repo root
919 %p root-relative path name of file being printed
919 %p root-relative path name of file being printed
920 """
920 """
921 ctx = repo.changectx(opts['rev'] or -1)
921 ctx = repo.changectx(opts['rev'] or -1)
922 for src, abs, rel, exact in walk(repo, (file1,) + pats, opts, ctx.node()):
922 for src, abs, rel, exact in walk(repo, (file1,) + pats, opts, ctx.node()):
923 fp = make_file(repo, opts['output'], ctx.node(), pathname=abs)
923 fp = make_file(repo, opts['output'], ctx.node(), pathname=abs)
924 fp.write(ctx.filectx(abs).data())
924 fp.write(ctx.filectx(abs).data())
925
925
926 def clone(ui, source, dest=None, **opts):
926 def clone(ui, source, dest=None, **opts):
927 """make a copy of an existing repository
927 """make a copy of an existing repository
928
928
929 Create a copy of an existing repository in a new directory.
929 Create a copy of an existing repository in a new directory.
930
930
931 If no destination directory name is specified, it defaults to the
931 If no destination directory name is specified, it defaults to the
932 basename of the source.
932 basename of the source.
933
933
934 The location of the source is added to the new repository's
934 The location of the source is added to the new repository's
935 .hg/hgrc file, as the default to be used for future pulls.
935 .hg/hgrc file, as the default to be used for future pulls.
936
936
937 For efficiency, hardlinks are used for cloning whenever the source
937 For efficiency, hardlinks are used for cloning whenever the source
938 and destination are on the same filesystem. Some filesystems,
938 and destination are on the same filesystem. Some filesystems,
939 such as AFS, implement hardlinking incorrectly, but do not report
939 such as AFS, implement hardlinking incorrectly, but do not report
940 errors. In these cases, use the --pull option to avoid
940 errors. In these cases, use the --pull option to avoid
941 hardlinking.
941 hardlinking.
942
942
943 See pull for valid source format details.
943 See pull for valid source format details.
944 """
944 """
945 if dest is None:
945 if dest is None:
946 dest = os.path.basename(os.path.normpath(source))
946 dest = os.path.basename(os.path.normpath(source))
947
947
948 if os.path.exists(dest):
948 if os.path.exists(dest):
949 raise util.Abort(_("destination '%s' already exists"), dest)
949 raise util.Abort(_("destination '%s' already exists"), dest)
950
950
951 class Dircleanup(object):
951 class Dircleanup(object):
952 def __init__(self, dir_):
952 def __init__(self, dir_):
953 self.rmtree = shutil.rmtree
953 self.rmtree = shutil.rmtree
954 self.dir_ = dir_
954 self.dir_ = dir_
955 def close(self):
955 def close(self):
956 self.dir_ = None
956 self.dir_ = None
957 def __del__(self):
957 def __del__(self):
958 if self.dir_:
958 if self.dir_:
959 self.rmtree(self.dir_, True)
959 self.rmtree(self.dir_, True)
960
960
961 if opts['ssh']:
961 if opts['ssh']:
962 ui.setconfig("ui", "ssh", opts['ssh'])
962 ui.setconfig("ui", "ssh", opts['ssh'])
963 if opts['remotecmd']:
963 if opts['remotecmd']:
964 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
964 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
965
965
966 source = ui.expandpath(source)
966 source = ui.expandpath(source)
967 src_repo = hg.repository(ui, source)
967 src_repo = hg.repository(ui, source)
968
968
969 dest_repo = None
969 dest_repo = None
970 try:
970 try:
971 dest_repo = hg.repository(ui, dest)
971 dest_repo = hg.repository(ui, dest)
972 raise util.Abort(_("destination '%s' already exists." % dest))
972 raise util.Abort(_("destination '%s' already exists." % dest))
973 except hg.RepoError:
973 except hg.RepoError:
974 dest_repo = hg.repository(ui, dest, create=1)
974 dest_repo = hg.repository(ui, dest, create=1)
975
975
976 dest_path = None
976 dest_path = None
977 d = None
977 d = None
978 if dest_repo.local():
978 if dest_repo.local():
979 dest_path = os.path.realpath(dest)
979 dest_path = os.path.realpath(dest)
980 d = Dircleanup(dest_path)
980 d = Dircleanup(dest_path)
981
981
982 abspath = source
982 abspath = source
983 copy = False
983 copy = False
984 if src_repo.local() and dest_repo.local():
984 if src_repo.local() and dest_repo.local():
985 abspath = os.path.abspath(source)
985 abspath = os.path.abspath(source)
986 if not opts['pull'] and not opts['rev']:
986 if not opts['pull'] and not opts['rev']:
987 copy = True
987 copy = True
988
988
989 if copy:
989 if copy:
990 try:
990 try:
991 # we use a lock here because if we race with commit, we
991 # we use a lock here because if we race with commit, we
992 # can end up with extra data in the cloned revlogs that's
992 # can end up with extra data in the cloned revlogs that's
993 # not pointed to by changesets, thus causing verify to
993 # not pointed to by changesets, thus causing verify to
994 # fail
994 # fail
995 l1 = src_repo.lock()
995 l1 = src_repo.lock()
996 except lock.LockException:
996 except lock.LockException:
997 copy = False
997 copy = False
998
998
999 if copy:
999 if copy:
1000 # we lock here to avoid premature writing to the target
1000 # we lock here to avoid premature writing to the target
1001 l2 = lock.lock(os.path.join(dest_path, ".hg", "lock"))
1001 l2 = lock.lock(os.path.join(dest_path, ".hg", "lock"))
1002
1002
1003 # we need to remove the (empty) data dir in dest so copyfiles can do it's work
1003 # we need to remove the (empty) data dir in dest so copyfiles can do it's work
1004 os.rmdir( os.path.join(dest_path, ".hg", "data") )
1004 os.rmdir( os.path.join(dest_path, ".hg", "data") )
1005 files = "data 00manifest.d 00manifest.i 00changelog.d 00changelog.i"
1005 files = "data 00manifest.d 00manifest.i 00changelog.d 00changelog.i"
1006 for f in files.split():
1006 for f in files.split():
1007 src = os.path.join(source, ".hg", f)
1007 src = os.path.join(source, ".hg", f)
1008 dst = os.path.join(dest_path, ".hg", f)
1008 dst = os.path.join(dest_path, ".hg", f)
1009 try:
1009 try:
1010 util.copyfiles(src, dst)
1010 util.copyfiles(src, dst)
1011 except OSError, inst:
1011 except OSError, inst:
1012 if inst.errno != errno.ENOENT:
1012 if inst.errno != errno.ENOENT:
1013 raise
1013 raise
1014
1014
1015 # we need to re-init the repo after manually copying the data into it
1015 # we need to re-init the repo after manually copying the data into it
1016 dest_repo = hg.repository(ui, dest)
1016 dest_repo = hg.repository(ui, dest)
1017
1017
1018 else:
1018 else:
1019 revs = None
1019 revs = None
1020 if opts['rev']:
1020 if opts['rev']:
1021 if not src_repo.local():
1021 if not src_repo.local():
1022 error = _("clone -r not supported yet for remote repositories.")
1022 error = _("clone -r not supported yet for remote repositories.")
1023 raise util.Abort(error)
1023 raise util.Abort(error)
1024 else:
1024 else:
1025 revs = [src_repo.lookup(rev) for rev in opts['rev']]
1025 revs = [src_repo.lookup(rev) for rev in opts['rev']]
1026
1026
1027 if dest_repo.local():
1027 if dest_repo.local():
1028 dest_repo.pull(src_repo, heads = revs)
1028 dest_repo.pull(src_repo, heads = revs)
1029 elif src_repo.local():
1029 elif src_repo.local():
1030 src_repo.push(dest_repo, revs = revs)
1030 src_repo.push(dest_repo, revs = revs)
1031 else:
1031 else:
1032 error = _("clone from remote to remote not supported.")
1032 error = _("clone from remote to remote not supported.")
1033 raise util.Abort(error)
1033 raise util.Abort(error)
1034
1034
1035 if dest_repo.local():
1035 if dest_repo.local():
1036 f = dest_repo.opener("hgrc", "w", text=True)
1036 f = dest_repo.opener("hgrc", "w", text=True)
1037 f.write("[paths]\n")
1037 f.write("[paths]\n")
1038 f.write("default = %s\n" % abspath)
1038 f.write("default = %s\n" % abspath)
1039 f.close()
1039 f.close()
1040
1040
1041 if not opts['noupdate']:
1041 if not opts['noupdate']:
1042 doupdate(dest_repo.ui, dest_repo)
1042 doupdate(dest_repo.ui, dest_repo)
1043
1043
1044 if d:
1044 if d:
1045 d.close()
1045 d.close()
1046
1046
1047 def commit(ui, repo, *pats, **opts):
1047 def commit(ui, repo, *pats, **opts):
1048 """commit the specified files or all outstanding changes
1048 """commit the specified files or all outstanding changes
1049
1049
1050 Commit changes to the given files into the repository.
1050 Commit changes to the given files into the repository.
1051
1051
1052 If a list of files is omitted, all changes reported by "hg status"
1052 If a list of files is omitted, all changes reported by "hg status"
1053 will be committed.
1053 will be committed.
1054
1054
1055 If no commit message is specified, the editor configured in your hgrc
1055 If no commit message is specified, the editor configured in your hgrc
1056 or in the EDITOR environment variable is started to enter a message.
1056 or in the EDITOR environment variable is started to enter a message.
1057 """
1057 """
1058 message = opts['message']
1058 message = opts['message']
1059 logfile = opts['logfile']
1059 logfile = opts['logfile']
1060
1060
1061 if message and logfile:
1061 if message and logfile:
1062 raise util.Abort(_('options --message and --logfile are mutually '
1062 raise util.Abort(_('options --message and --logfile are mutually '
1063 'exclusive'))
1063 'exclusive'))
1064 if not message and logfile:
1064 if not message and logfile:
1065 try:
1065 try:
1066 if logfile == '-':
1066 if logfile == '-':
1067 message = sys.stdin.read()
1067 message = sys.stdin.read()
1068 else:
1068 else:
1069 message = open(logfile).read()
1069 message = open(logfile).read()
1070 except IOError, inst:
1070 except IOError, inst:
1071 raise util.Abort(_("can't read commit message '%s': %s") %
1071 raise util.Abort(_("can't read commit message '%s': %s") %
1072 (logfile, inst.strerror))
1072 (logfile, inst.strerror))
1073
1073
1074 if opts['addremove']:
1074 if opts['addremove']:
1075 addremove_lock(ui, repo, pats, opts)
1075 addremove_lock(ui, repo, pats, opts)
1076 fns, match, anypats = matchpats(repo, pats, opts)
1076 fns, match, anypats = matchpats(repo, pats, opts)
1077 if pats:
1077 if pats:
1078 modified, added, removed, deleted, unknown = (
1078 modified, added, removed, deleted, unknown = (
1079 repo.changes(files=fns, match=match))
1079 repo.changes(files=fns, match=match))
1080 files = modified + added + removed
1080 files = modified + added + removed
1081 else:
1081 else:
1082 files = []
1082 files = []
1083 try:
1083 try:
1084 repo.commit(files, message, opts['user'], opts['date'], match,
1084 repo.commit(files, message, opts['user'], opts['date'], match,
1085 force_editor=opts.get('force_editor'))
1085 force_editor=opts.get('force_editor'))
1086 except ValueError, inst:
1086 except ValueError, inst:
1087 raise util.Abort(str(inst))
1087 raise util.Abort(str(inst))
1088
1088
1089 def docopy(ui, repo, pats, opts, wlock):
1089 def docopy(ui, repo, pats, opts, wlock):
1090 # called with the repo lock held
1090 # called with the repo lock held
1091 cwd = repo.getcwd()
1091 cwd = repo.getcwd()
1092 errors = 0
1092 errors = 0
1093 copied = []
1093 copied = []
1094 targets = {}
1094 targets = {}
1095
1095
1096 def okaytocopy(abs, rel, exact):
1096 def okaytocopy(abs, rel, exact):
1097 reasons = {'?': _('is not managed'),
1097 reasons = {'?': _('is not managed'),
1098 'a': _('has been marked for add'),
1098 'a': _('has been marked for add'),
1099 'r': _('has been marked for remove')}
1099 'r': _('has been marked for remove')}
1100 state = repo.dirstate.state(abs)
1100 state = repo.dirstate.state(abs)
1101 reason = reasons.get(state)
1101 reason = reasons.get(state)
1102 if reason:
1102 if reason:
1103 if state == 'a':
1103 if state == 'a':
1104 origsrc = repo.dirstate.copied(abs)
1104 origsrc = repo.dirstate.copied(abs)
1105 if origsrc is not None:
1105 if origsrc is not None:
1106 return origsrc
1106 return origsrc
1107 if exact:
1107 if exact:
1108 ui.warn(_('%s: not copying - file %s\n') % (rel, reason))
1108 ui.warn(_('%s: not copying - file %s\n') % (rel, reason))
1109 else:
1109 else:
1110 return abs
1110 return abs
1111
1111
1112 def copy(origsrc, abssrc, relsrc, target, exact):
1112 def copy(origsrc, abssrc, relsrc, target, exact):
1113 abstarget = util.canonpath(repo.root, cwd, target)
1113 abstarget = util.canonpath(repo.root, cwd, target)
1114 reltarget = util.pathto(cwd, abstarget)
1114 reltarget = util.pathto(cwd, abstarget)
1115 prevsrc = targets.get(abstarget)
1115 prevsrc = targets.get(abstarget)
1116 if prevsrc is not None:
1116 if prevsrc is not None:
1117 ui.warn(_('%s: not overwriting - %s collides with %s\n') %
1117 ui.warn(_('%s: not overwriting - %s collides with %s\n') %
1118 (reltarget, abssrc, prevsrc))
1118 (reltarget, abssrc, prevsrc))
1119 return
1119 return
1120 if (not opts['after'] and os.path.exists(reltarget) or
1120 if (not opts['after'] and os.path.exists(reltarget) or
1121 opts['after'] and repo.dirstate.state(abstarget) not in '?r'):
1121 opts['after'] and repo.dirstate.state(abstarget) not in '?r'):
1122 if not opts['force']:
1122 if not opts['force']:
1123 ui.warn(_('%s: not overwriting - file exists\n') %
1123 ui.warn(_('%s: not overwriting - file exists\n') %
1124 reltarget)
1124 reltarget)
1125 return
1125 return
1126 if not opts['after'] and not opts.get('dry_run'):
1126 if not opts['after'] and not opts.get('dry_run'):
1127 os.unlink(reltarget)
1127 os.unlink(reltarget)
1128 if opts['after']:
1128 if opts['after']:
1129 if not os.path.exists(reltarget):
1129 if not os.path.exists(reltarget):
1130 return
1130 return
1131 else:
1131 else:
1132 targetdir = os.path.dirname(reltarget) or '.'
1132 targetdir = os.path.dirname(reltarget) or '.'
1133 if not os.path.isdir(targetdir) and not opts.get('dry_run'):
1133 if not os.path.isdir(targetdir) and not opts.get('dry_run'):
1134 os.makedirs(targetdir)
1134 os.makedirs(targetdir)
1135 try:
1135 try:
1136 restore = repo.dirstate.state(abstarget) == 'r'
1136 restore = repo.dirstate.state(abstarget) == 'r'
1137 if restore and not opts.get('dry_run'):
1137 if restore and not opts.get('dry_run'):
1138 repo.undelete([abstarget], wlock)
1138 repo.undelete([abstarget], wlock)
1139 try:
1139 try:
1140 if not opts.get('dry_run'):
1140 if not opts.get('dry_run'):
1141 shutil.copyfile(relsrc, reltarget)
1141 shutil.copyfile(relsrc, reltarget)
1142 shutil.copymode(relsrc, reltarget)
1142 shutil.copymode(relsrc, reltarget)
1143 restore = False
1143 restore = False
1144 finally:
1144 finally:
1145 if restore:
1145 if restore:
1146 repo.remove([abstarget], wlock)
1146 repo.remove([abstarget], wlock)
1147 except shutil.Error, inst:
1147 except shutil.Error, inst:
1148 raise util.Abort(str(inst))
1148 raise util.Abort(str(inst))
1149 except IOError, inst:
1149 except IOError, inst:
1150 if inst.errno == errno.ENOENT:
1150 if inst.errno == errno.ENOENT:
1151 ui.warn(_('%s: deleted in working copy\n') % relsrc)
1151 ui.warn(_('%s: deleted in working copy\n') % relsrc)
1152 else:
1152 else:
1153 ui.warn(_('%s: cannot copy - %s\n') %
1153 ui.warn(_('%s: cannot copy - %s\n') %
1154 (relsrc, inst.strerror))
1154 (relsrc, inst.strerror))
1155 errors += 1
1155 errors += 1
1156 return
1156 return
1157 if ui.verbose or not exact:
1157 if ui.verbose or not exact:
1158 ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
1158 ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
1159 targets[abstarget] = abssrc
1159 targets[abstarget] = abssrc
1160 if abstarget != origsrc and not opts.get('dry_run'):
1160 if abstarget != origsrc and not opts.get('dry_run'):
1161 repo.copy(origsrc, abstarget, wlock)
1161 repo.copy(origsrc, abstarget, wlock)
1162 copied.append((abssrc, relsrc, exact))
1162 copied.append((abssrc, relsrc, exact))
1163
1163
1164 def targetpathfn(pat, dest, srcs):
1164 def targetpathfn(pat, dest, srcs):
1165 if os.path.isdir(pat):
1165 if os.path.isdir(pat):
1166 abspfx = util.canonpath(repo.root, cwd, pat)
1166 abspfx = util.canonpath(repo.root, cwd, pat)
1167 if destdirexists:
1167 if destdirexists:
1168 striplen = len(os.path.split(abspfx)[0])
1168 striplen = len(os.path.split(abspfx)[0])
1169 else:
1169 else:
1170 striplen = len(abspfx)
1170 striplen = len(abspfx)
1171 if striplen:
1171 if striplen:
1172 striplen += len(os.sep)
1172 striplen += len(os.sep)
1173 res = lambda p: os.path.join(dest, p[striplen:])
1173 res = lambda p: os.path.join(dest, p[striplen:])
1174 elif destdirexists:
1174 elif destdirexists:
1175 res = lambda p: os.path.join(dest, os.path.basename(p))
1175 res = lambda p: os.path.join(dest, os.path.basename(p))
1176 else:
1176 else:
1177 res = lambda p: dest
1177 res = lambda p: dest
1178 return res
1178 return res
1179
1179
1180 def targetpathafterfn(pat, dest, srcs):
1180 def targetpathafterfn(pat, dest, srcs):
1181 if util.patkind(pat, None)[0]:
1181 if util.patkind(pat, None)[0]:
1182 # a mercurial pattern
1182 # a mercurial pattern
1183 res = lambda p: os.path.join(dest, os.path.basename(p))
1183 res = lambda p: os.path.join(dest, os.path.basename(p))
1184 else:
1184 else:
1185 abspfx = util.canonpath(repo.root, cwd, pat)
1185 abspfx = util.canonpath(repo.root, cwd, pat)
1186 if len(abspfx) < len(srcs[0][0]):
1186 if len(abspfx) < len(srcs[0][0]):
1187 # A directory. Either the target path contains the last
1187 # A directory. Either the target path contains the last
1188 # component of the source path or it does not.
1188 # component of the source path or it does not.
1189 def evalpath(striplen):
1189 def evalpath(striplen):
1190 score = 0
1190 score = 0
1191 for s in srcs:
1191 for s in srcs:
1192 t = os.path.join(dest, s[0][striplen:])
1192 t = os.path.join(dest, s[0][striplen:])
1193 if os.path.exists(t):
1193 if os.path.exists(t):
1194 score += 1
1194 score += 1
1195 return score
1195 return score
1196
1196
1197 striplen = len(abspfx)
1197 striplen = len(abspfx)
1198 if striplen:
1198 if striplen:
1199 striplen += len(os.sep)
1199 striplen += len(os.sep)
1200 if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])):
1200 if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])):
1201 score = evalpath(striplen)
1201 score = evalpath(striplen)
1202 striplen1 = len(os.path.split(abspfx)[0])
1202 striplen1 = len(os.path.split(abspfx)[0])
1203 if striplen1:
1203 if striplen1:
1204 striplen1 += len(os.sep)
1204 striplen1 += len(os.sep)
1205 if evalpath(striplen1) > score:
1205 if evalpath(striplen1) > score:
1206 striplen = striplen1
1206 striplen = striplen1
1207 res = lambda p: os.path.join(dest, p[striplen:])
1207 res = lambda p: os.path.join(dest, p[striplen:])
1208 else:
1208 else:
1209 # a file
1209 # a file
1210 if destdirexists:
1210 if destdirexists:
1211 res = lambda p: os.path.join(dest, os.path.basename(p))
1211 res = lambda p: os.path.join(dest, os.path.basename(p))
1212 else:
1212 else:
1213 res = lambda p: dest
1213 res = lambda p: dest
1214 return res
1214 return res
1215
1215
1216
1216
1217 pats = list(pats)
1217 pats = list(pats)
1218 if not pats:
1218 if not pats:
1219 raise util.Abort(_('no source or destination specified'))
1219 raise util.Abort(_('no source or destination specified'))
1220 if len(pats) == 1:
1220 if len(pats) == 1:
1221 raise util.Abort(_('no destination specified'))
1221 raise util.Abort(_('no destination specified'))
1222 dest = pats.pop()
1222 dest = pats.pop()
1223 destdirexists = os.path.isdir(dest)
1223 destdirexists = os.path.isdir(dest)
1224 if (len(pats) > 1 or util.patkind(pats[0], None)[0]) and not destdirexists:
1224 if (len(pats) > 1 or util.patkind(pats[0], None)[0]) and not destdirexists:
1225 raise util.Abort(_('with multiple sources, destination must be an '
1225 raise util.Abort(_('with multiple sources, destination must be an '
1226 'existing directory'))
1226 'existing directory'))
1227 if opts['after']:
1227 if opts['after']:
1228 tfn = targetpathafterfn
1228 tfn = targetpathafterfn
1229 else:
1229 else:
1230 tfn = targetpathfn
1230 tfn = targetpathfn
1231 copylist = []
1231 copylist = []
1232 for pat in pats:
1232 for pat in pats:
1233 srcs = []
1233 srcs = []
1234 for tag, abssrc, relsrc, exact in walk(repo, [pat], opts):
1234 for tag, abssrc, relsrc, exact in walk(repo, [pat], opts):
1235 origsrc = okaytocopy(abssrc, relsrc, exact)
1235 origsrc = okaytocopy(abssrc, relsrc, exact)
1236 if origsrc:
1236 if origsrc:
1237 srcs.append((origsrc, abssrc, relsrc, exact))
1237 srcs.append((origsrc, abssrc, relsrc, exact))
1238 if not srcs:
1238 if not srcs:
1239 continue
1239 continue
1240 copylist.append((tfn(pat, dest, srcs), srcs))
1240 copylist.append((tfn(pat, dest, srcs), srcs))
1241 if not copylist:
1241 if not copylist:
1242 raise util.Abort(_('no files to copy'))
1242 raise util.Abort(_('no files to copy'))
1243
1243
1244 for targetpath, srcs in copylist:
1244 for targetpath, srcs in copylist:
1245 for origsrc, abssrc, relsrc, exact in srcs:
1245 for origsrc, abssrc, relsrc, exact in srcs:
1246 copy(origsrc, abssrc, relsrc, targetpath(abssrc), exact)
1246 copy(origsrc, abssrc, relsrc, targetpath(abssrc), exact)
1247
1247
1248 if errors:
1248 if errors:
1249 ui.warn(_('(consider using --after)\n'))
1249 ui.warn(_('(consider using --after)\n'))
1250 return errors, copied
1250 return errors, copied
1251
1251
1252 def copy(ui, repo, *pats, **opts):
1252 def copy(ui, repo, *pats, **opts):
1253 """mark files as copied for the next commit
1253 """mark files as copied for the next commit
1254
1254
1255 Mark dest as having copies of source files. If dest is a
1255 Mark dest as having copies of source files. If dest is a
1256 directory, copies are put in that directory. If dest is a file,
1256 directory, copies are put in that directory. If dest is a file,
1257 there can only be one source.
1257 there can only be one source.
1258
1258
1259 By default, this command copies the contents of files as they
1259 By default, this command copies the contents of files as they
1260 stand in the working directory. If invoked with --after, the
1260 stand in the working directory. If invoked with --after, the
1261 operation is recorded, but no copying is performed.
1261 operation is recorded, but no copying is performed.
1262
1262
1263 This command takes effect in the next commit.
1263 This command takes effect in the next commit.
1264
1264
1265 NOTE: This command should be treated as experimental. While it
1265 NOTE: This command should be treated as experimental. While it
1266 should properly record copied files, this information is not yet
1266 should properly record copied files, this information is not yet
1267 fully used by merge, nor fully reported by log.
1267 fully used by merge, nor fully reported by log.
1268 """
1268 """
1269 wlock = repo.wlock(0)
1269 wlock = repo.wlock(0)
1270 errs, copied = docopy(ui, repo, pats, opts, wlock)
1270 errs, copied = docopy(ui, repo, pats, opts, wlock)
1271 return errs
1271 return errs
1272
1272
1273 def debugancestor(ui, index, rev1, rev2):
1273 def debugancestor(ui, index, rev1, rev2):
1274 """find the ancestor revision of two revisions in a given index"""
1274 """find the ancestor revision of two revisions in a given index"""
1275 r = revlog.revlog(util.opener(os.getcwd(), audit=False), index, "", 0)
1275 r = revlog.revlog(util.opener(os.getcwd(), audit=False), index, "", 0)
1276 a = r.ancestor(r.lookup(rev1), r.lookup(rev2))
1276 a = r.ancestor(r.lookup(rev1), r.lookup(rev2))
1277 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1277 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
1278
1278
1279 def debugcomplete(ui, cmd='', **opts):
1279 def debugcomplete(ui, cmd='', **opts):
1280 """returns the completion list associated with the given command"""
1280 """returns the completion list associated with the given command"""
1281
1281
1282 if opts['options']:
1282 if opts['options']:
1283 options = []
1283 options = []
1284 otables = [globalopts]
1284 otables = [globalopts]
1285 if cmd:
1285 if cmd:
1286 aliases, entry = findcmd(cmd)
1286 aliases, entry = findcmd(cmd)
1287 otables.append(entry[1])
1287 otables.append(entry[1])
1288 for t in otables:
1288 for t in otables:
1289 for o in t:
1289 for o in t:
1290 if o[0]:
1290 if o[0]:
1291 options.append('-%s' % o[0])
1291 options.append('-%s' % o[0])
1292 options.append('--%s' % o[1])
1292 options.append('--%s' % o[1])
1293 ui.write("%s\n" % "\n".join(options))
1293 ui.write("%s\n" % "\n".join(options))
1294 return
1294 return
1295
1295
1296 clist = findpossible(cmd).keys()
1296 clist = findpossible(cmd).keys()
1297 clist.sort()
1297 clist.sort()
1298 ui.write("%s\n" % "\n".join(clist))
1298 ui.write("%s\n" % "\n".join(clist))
1299
1299
1300 def debugrebuildstate(ui, repo, rev=None):
1300 def debugrebuildstate(ui, repo, rev=None):
1301 """rebuild the dirstate as it would look like for the given revision"""
1301 """rebuild the dirstate as it would look like for the given revision"""
1302 if not rev:
1302 if not rev:
1303 rev = repo.changelog.tip()
1303 rev = repo.changelog.tip()
1304 else:
1304 else:
1305 rev = repo.lookup(rev)
1305 rev = repo.lookup(rev)
1306 change = repo.changelog.read(rev)
1306 change = repo.changelog.read(rev)
1307 n = change[0]
1307 n = change[0]
1308 files = repo.manifest.readflags(n)
1308 files = repo.manifest.readflags(n)
1309 wlock = repo.wlock()
1309 wlock = repo.wlock()
1310 repo.dirstate.rebuild(rev, files.iteritems())
1310 repo.dirstate.rebuild(rev, files.iteritems())
1311
1311
1312 def debugcheckstate(ui, repo):
1312 def debugcheckstate(ui, repo):
1313 """validate the correctness of the current dirstate"""
1313 """validate the correctness of the current dirstate"""
1314 parent1, parent2 = repo.dirstate.parents()
1314 parent1, parent2 = repo.dirstate.parents()
1315 repo.dirstate.read()
1315 repo.dirstate.read()
1316 dc = repo.dirstate.map
1316 dc = repo.dirstate.map
1317 keys = dc.keys()
1317 keys = dc.keys()
1318 keys.sort()
1318 keys.sort()
1319 m1n = repo.changelog.read(parent1)[0]
1319 m1n = repo.changelog.read(parent1)[0]
1320 m2n = repo.changelog.read(parent2)[0]
1320 m2n = repo.changelog.read(parent2)[0]
1321 m1 = repo.manifest.read(m1n)
1321 m1 = repo.manifest.read(m1n)
1322 m2 = repo.manifest.read(m2n)
1322 m2 = repo.manifest.read(m2n)
1323 errors = 0
1323 errors = 0
1324 for f in dc:
1324 for f in dc:
1325 state = repo.dirstate.state(f)
1325 state = repo.dirstate.state(f)
1326 if state in "nr" and f not in m1:
1326 if state in "nr" and f not in m1:
1327 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1327 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1328 errors += 1
1328 errors += 1
1329 if state in "a" and f in m1:
1329 if state in "a" and f in m1:
1330 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1330 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1331 errors += 1
1331 errors += 1
1332 if state in "m" and f not in m1 and f not in m2:
1332 if state in "m" and f not in m1 and f not in m2:
1333 ui.warn(_("%s in state %s, but not in either manifest\n") %
1333 ui.warn(_("%s in state %s, but not in either manifest\n") %
1334 (f, state))
1334 (f, state))
1335 errors += 1
1335 errors += 1
1336 for f in m1:
1336 for f in m1:
1337 state = repo.dirstate.state(f)
1337 state = repo.dirstate.state(f)
1338 if state not in "nrm":
1338 if state not in "nrm":
1339 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1339 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1340 errors += 1
1340 errors += 1
1341 if errors:
1341 if errors:
1342 error = _(".hg/dirstate inconsistent with current parent's manifest")
1342 error = _(".hg/dirstate inconsistent with current parent's manifest")
1343 raise util.Abort(error)
1343 raise util.Abort(error)
1344
1344
1345 def debugconfig(ui, repo, *values):
1345 def debugconfig(ui, repo, *values):
1346 """show combined config settings from all hgrc files
1346 """show combined config settings from all hgrc files
1347
1347
1348 With no args, print names and values of all config items.
1348 With no args, print names and values of all config items.
1349
1349
1350 With one arg of the form section.name, print just the value of
1350 With one arg of the form section.name, print just the value of
1351 that config item.
1351 that config item.
1352
1352
1353 With multiple args, print names and values of all config items
1353 With multiple args, print names and values of all config items
1354 with matching section names."""
1354 with matching section names."""
1355
1355
1356 if values:
1356 if values:
1357 if len([v for v in values if '.' in v]) > 1:
1357 if len([v for v in values if '.' in v]) > 1:
1358 raise util.Abort(_('only one config item permitted'))
1358 raise util.Abort(_('only one config item permitted'))
1359 for section, name, value in ui.walkconfig():
1359 for section, name, value in ui.walkconfig():
1360 sectname = section + '.' + name
1360 sectname = section + '.' + name
1361 if values:
1361 if values:
1362 for v in values:
1362 for v in values:
1363 if v == section:
1363 if v == section:
1364 ui.write('%s=%s\n' % (sectname, value))
1364 ui.write('%s=%s\n' % (sectname, value))
1365 elif v == sectname:
1365 elif v == sectname:
1366 ui.write(value, '\n')
1366 ui.write(value, '\n')
1367 else:
1367 else:
1368 ui.write('%s=%s\n' % (sectname, value))
1368 ui.write('%s=%s\n' % (sectname, value))
1369
1369
1370 def debugsetparents(ui, repo, rev1, rev2=None):
1370 def debugsetparents(ui, repo, rev1, rev2=None):
1371 """manually set the parents of the current working directory
1371 """manually set the parents of the current working directory
1372
1372
1373 This is useful for writing repository conversion tools, but should
1373 This is useful for writing repository conversion tools, but should
1374 be used with care.
1374 be used with care.
1375 """
1375 """
1376
1376
1377 if not rev2:
1377 if not rev2:
1378 rev2 = hex(nullid)
1378 rev2 = hex(nullid)
1379
1379
1380 repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2))
1380 repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2))
1381
1381
1382 def debugstate(ui, repo):
1382 def debugstate(ui, repo):
1383 """show the contents of the current dirstate"""
1383 """show the contents of the current dirstate"""
1384 repo.dirstate.read()
1384 repo.dirstate.read()
1385 dc = repo.dirstate.map
1385 dc = repo.dirstate.map
1386 keys = dc.keys()
1386 keys = dc.keys()
1387 keys.sort()
1387 keys.sort()
1388 for file_ in keys:
1388 for file_ in keys:
1389 ui.write("%c %3o %10d %s %s\n"
1389 ui.write("%c %3o %10d %s %s\n"
1390 % (dc[file_][0], dc[file_][1] & 0777, dc[file_][2],
1390 % (dc[file_][0], dc[file_][1] & 0777, dc[file_][2],
1391 time.strftime("%x %X",
1391 time.strftime("%x %X",
1392 time.localtime(dc[file_][3])), file_))
1392 time.localtime(dc[file_][3])), file_))
1393 for f in repo.dirstate.copies:
1393 for f in repo.dirstate.copies:
1394 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copies[f], f))
1394 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copies[f], f))
1395
1395
1396 def debugdata(ui, file_, rev):
1396 def debugdata(ui, file_, rev):
1397 """dump the contents of an data file revision"""
1397 """dump the contents of an data file revision"""
1398 r = revlog.revlog(util.opener(os.getcwd(), audit=False),
1398 r = revlog.revlog(util.opener(os.getcwd(), audit=False),
1399 file_[:-2] + ".i", file_, 0)
1399 file_[:-2] + ".i", file_, 0)
1400 try:
1400 try:
1401 ui.write(r.revision(r.lookup(rev)))
1401 ui.write(r.revision(r.lookup(rev)))
1402 except KeyError:
1402 except KeyError:
1403 raise util.Abort(_('invalid revision identifier %s'), rev)
1403 raise util.Abort(_('invalid revision identifier %s'), rev)
1404
1404
1405 def debugindex(ui, file_):
1405 def debugindex(ui, file_):
1406 """dump the contents of an index file"""
1406 """dump the contents of an index file"""
1407 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_, "", 0)
1407 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_, "", 0)
1408 ui.write(" rev offset length base linkrev" +
1408 ui.write(" rev offset length base linkrev" +
1409 " nodeid p1 p2\n")
1409 " nodeid p1 p2\n")
1410 for i in range(r.count()):
1410 for i in range(r.count()):
1411 node = r.node(i)
1411 node = r.node(i)
1412 pp = r.parents(node)
1412 pp = r.parents(node)
1413 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
1413 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
1414 i, r.start(i), r.length(i), r.base(i), r.linkrev(node),
1414 i, r.start(i), r.length(i), r.base(i), r.linkrev(node),
1415 short(node), short(pp[0]), short(pp[1])))
1415 short(node), short(pp[0]), short(pp[1])))
1416
1416
1417 def debugindexdot(ui, file_):
1417 def debugindexdot(ui, file_):
1418 """dump an index DAG as a .dot file"""
1418 """dump an index DAG as a .dot file"""
1419 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_, "", 0)
1419 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_, "", 0)
1420 ui.write("digraph G {\n")
1420 ui.write("digraph G {\n")
1421 for i in range(r.count()):
1421 for i in range(r.count()):
1422 node = r.node(i)
1422 node = r.node(i)
1423 pp = r.parents(node)
1423 pp = r.parents(node)
1424 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
1424 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
1425 if pp[1] != nullid:
1425 if pp[1] != nullid:
1426 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
1426 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
1427 ui.write("}\n")
1427 ui.write("}\n")
1428
1428
1429 def debugrename(ui, repo, file, rev=None):
1429 def debugrename(ui, repo, file, rev=None):
1430 """dump rename information"""
1430 """dump rename information"""
1431 r = repo.file(relpath(repo, [file])[0])
1431 r = repo.file(relpath(repo, [file])[0])
1432 if rev:
1432 if rev:
1433 try:
1433 try:
1434 # assume all revision numbers are for changesets
1434 # assume all revision numbers are for changesets
1435 n = repo.lookup(rev)
1435 n = repo.lookup(rev)
1436 change = repo.changelog.read(n)
1436 change = repo.changelog.read(n)
1437 m = repo.manifest.read(change[0])
1437 m = repo.manifest.read(change[0])
1438 n = m[relpath(repo, [file])[0]]
1438 n = m[relpath(repo, [file])[0]]
1439 except (hg.RepoError, KeyError):
1439 except (hg.RepoError, KeyError):
1440 n = r.lookup(rev)
1440 n = r.lookup(rev)
1441 else:
1441 else:
1442 n = r.tip()
1442 n = r.tip()
1443 m = r.renamed(n)
1443 m = r.renamed(n)
1444 if m:
1444 if m:
1445 ui.write(_("renamed from %s:%s\n") % (m[0], hex(m[1])))
1445 ui.write(_("renamed from %s:%s\n") % (m[0], hex(m[1])))
1446 else:
1446 else:
1447 ui.write(_("not renamed\n"))
1447 ui.write(_("not renamed\n"))
1448
1448
1449 def debugwalk(ui, repo, *pats, **opts):
1449 def debugwalk(ui, repo, *pats, **opts):
1450 """show how files match on given patterns"""
1450 """show how files match on given patterns"""
1451 items = list(walk(repo, pats, opts))
1451 items = list(walk(repo, pats, opts))
1452 if not items:
1452 if not items:
1453 return
1453 return
1454 fmt = '%%s %%-%ds %%-%ds %%s' % (
1454 fmt = '%%s %%-%ds %%-%ds %%s' % (
1455 max([len(abs) for (src, abs, rel, exact) in items]),
1455 max([len(abs) for (src, abs, rel, exact) in items]),
1456 max([len(rel) for (src, abs, rel, exact) in items]))
1456 max([len(rel) for (src, abs, rel, exact) in items]))
1457 for src, abs, rel, exact in items:
1457 for src, abs, rel, exact in items:
1458 line = fmt % (src, abs, rel, exact and 'exact' or '')
1458 line = fmt % (src, abs, rel, exact and 'exact' or '')
1459 ui.write("%s\n" % line.rstrip())
1459 ui.write("%s\n" % line.rstrip())
1460
1460
1461 def diff(ui, repo, *pats, **opts):
1461 def diff(ui, repo, *pats, **opts):
1462 """diff repository (or selected files)
1462 """diff repository (or selected files)
1463
1463
1464 Show differences between revisions for the specified files.
1464 Show differences between revisions for the specified files.
1465
1465
1466 Differences between files are shown using the unified diff format.
1466 Differences between files are shown using the unified diff format.
1467
1467
1468 When two revision arguments are given, then changes are shown
1468 When two revision arguments are given, then changes are shown
1469 between those revisions. If only one revision is specified then
1469 between those revisions. If only one revision is specified then
1470 that revision is compared to the working directory, and, when no
1470 that revision is compared to the working directory, and, when no
1471 revisions are specified, the working directory files are compared
1471 revisions are specified, the working directory files are compared
1472 to its parent.
1472 to its parent.
1473
1473
1474 Without the -a option, diff will avoid generating diffs of files
1474 Without the -a option, diff will avoid generating diffs of files
1475 it detects as binary. With -a, diff will generate a diff anyway,
1475 it detects as binary. With -a, diff will generate a diff anyway,
1476 probably with undesirable results.
1476 probably with undesirable results.
1477 """
1477 """
1478 node1, node2 = revpair(ui, repo, opts['rev'])
1478 node1, node2 = revpair(ui, repo, opts['rev'])
1479
1479
1480 fns, matchfn, anypats = matchpats(repo, pats, opts)
1480 fns, matchfn, anypats = matchpats(repo, pats, opts)
1481
1481
1482 dodiff(sys.stdout, ui, repo, node1, node2, fns, match=matchfn,
1482 dodiff(sys.stdout, ui, repo, node1, node2, fns, match=matchfn,
1483 text=opts['text'], opts=opts)
1483 text=opts['text'], opts=opts)
1484
1484
1485 def doexport(ui, repo, changeset, seqno, total, revwidth, opts):
1485 def doexport(ui, repo, changeset, seqno, total, revwidth, opts):
1486 node = repo.lookup(changeset)
1486 node = repo.lookup(changeset)
1487 parents = [p for p in repo.changelog.parents(node) if p != nullid]
1487 parents = [p for p in repo.changelog.parents(node) if p != nullid]
1488 if opts['switch_parent']:
1488 if opts['switch_parent']:
1489 parents.reverse()
1489 parents.reverse()
1490 prev = (parents and parents[0]) or nullid
1490 prev = (parents and parents[0]) or nullid
1491 change = repo.changelog.read(node)
1491 change = repo.changelog.read(node)
1492
1492
1493 fp = make_file(repo, opts['output'], node, total=total, seqno=seqno,
1493 fp = make_file(repo, opts['output'], node, total=total, seqno=seqno,
1494 revwidth=revwidth)
1494 revwidth=revwidth)
1495 if fp != sys.stdout:
1495 if fp != sys.stdout:
1496 ui.note("%s\n" % fp.name)
1496 ui.note("%s\n" % fp.name)
1497
1497
1498 fp.write("# HG changeset patch\n")
1498 fp.write("# HG changeset patch\n")
1499 fp.write("# User %s\n" % change[1])
1499 fp.write("# User %s\n" % change[1])
1500 fp.write("# Date %d %d\n" % change[2])
1500 fp.write("# Date %d %d\n" % change[2])
1501 fp.write("# Node ID %s\n" % hex(node))
1501 fp.write("# Node ID %s\n" % hex(node))
1502 fp.write("# Parent %s\n" % hex(prev))
1502 fp.write("# Parent %s\n" % hex(prev))
1503 if len(parents) > 1:
1503 if len(parents) > 1:
1504 fp.write("# Parent %s\n" % hex(parents[1]))
1504 fp.write("# Parent %s\n" % hex(parents[1]))
1505 fp.write(change[4].rstrip())
1505 fp.write(change[4].rstrip())
1506 fp.write("\n\n")
1506 fp.write("\n\n")
1507
1507
1508 dodiff(fp, ui, repo, prev, node, text=opts['text'])
1508 dodiff(fp, ui, repo, prev, node, text=opts['text'])
1509 if fp != sys.stdout:
1509 if fp != sys.stdout:
1510 fp.close()
1510 fp.close()
1511
1511
1512 def export(ui, repo, *changesets, **opts):
1512 def export(ui, repo, *changesets, **opts):
1513 """dump the header and diffs for one or more changesets
1513 """dump the header and diffs for one or more changesets
1514
1514
1515 Print the changeset header and diffs for one or more revisions.
1515 Print the changeset header and diffs for one or more revisions.
1516
1516
1517 The information shown in the changeset header is: author,
1517 The information shown in the changeset header is: author,
1518 changeset hash, parent and commit comment.
1518 changeset hash, parent and commit comment.
1519
1519
1520 Output may be to a file, in which case the name of the file is
1520 Output may be to a file, in which case the name of the file is
1521 given using a format string. The formatting rules are as follows:
1521 given using a format string. The formatting rules are as follows:
1522
1522
1523 %% literal "%" character
1523 %% literal "%" character
1524 %H changeset hash (40 bytes of hexadecimal)
1524 %H changeset hash (40 bytes of hexadecimal)
1525 %N number of patches being generated
1525 %N number of patches being generated
1526 %R changeset revision number
1526 %R changeset revision number
1527 %b basename of the exporting repository
1527 %b basename of the exporting repository
1528 %h short-form changeset hash (12 bytes of hexadecimal)
1528 %h short-form changeset hash (12 bytes of hexadecimal)
1529 %n zero-padded sequence number, starting at 1
1529 %n zero-padded sequence number, starting at 1
1530 %r zero-padded changeset revision number
1530 %r zero-padded changeset revision number
1531
1531
1532 Without the -a option, export will avoid generating diffs of files
1532 Without the -a option, export will avoid generating diffs of files
1533 it detects as binary. With -a, export will generate a diff anyway,
1533 it detects as binary. With -a, export will generate a diff anyway,
1534 probably with undesirable results.
1534 probably with undesirable results.
1535
1535
1536 With the --switch-parent option, the diff will be against the second
1536 With the --switch-parent option, the diff will be against the second
1537 parent. It can be useful to review a merge.
1537 parent. It can be useful to review a merge.
1538 """
1538 """
1539 if not changesets:
1539 if not changesets:
1540 raise util.Abort(_("export requires at least one changeset"))
1540 raise util.Abort(_("export requires at least one changeset"))
1541 seqno = 0
1541 seqno = 0
1542 revs = list(revrange(ui, repo, changesets))
1542 revs = list(revrange(ui, repo, changesets))
1543 total = len(revs)
1543 total = len(revs)
1544 revwidth = max(map(len, revs))
1544 revwidth = max(map(len, revs))
1545 msg = len(revs) > 1 and _("Exporting patches:\n") or _("Exporting patch:\n")
1545 msg = len(revs) > 1 and _("Exporting patches:\n") or _("Exporting patch:\n")
1546 ui.note(msg)
1546 ui.note(msg)
1547 for cset in revs:
1547 for cset in revs:
1548 seqno += 1
1548 seqno += 1
1549 doexport(ui, repo, cset, seqno, total, revwidth, opts)
1549 doexport(ui, repo, cset, seqno, total, revwidth, opts)
1550
1550
1551 def forget(ui, repo, *pats, **opts):
1551 def forget(ui, repo, *pats, **opts):
1552 """don't add the specified files on the next commit (DEPRECATED)
1552 """don't add the specified files on the next commit (DEPRECATED)
1553
1553
1554 (DEPRECATED)
1554 (DEPRECATED)
1555 Undo an 'hg add' scheduled for the next commit.
1555 Undo an 'hg add' scheduled for the next commit.
1556
1556
1557 This command is now deprecated and will be removed in a future
1557 This command is now deprecated and will be removed in a future
1558 release. Please use revert instead.
1558 release. Please use revert instead.
1559 """
1559 """
1560 ui.warn(_("(the forget command is deprecated; use revert instead)\n"))
1560 ui.warn(_("(the forget command is deprecated; use revert instead)\n"))
1561 forget = []
1561 forget = []
1562 for src, abs, rel, exact in walk(repo, pats, opts):
1562 for src, abs, rel, exact in walk(repo, pats, opts):
1563 if repo.dirstate.state(abs) == 'a':
1563 if repo.dirstate.state(abs) == 'a':
1564 forget.append(abs)
1564 forget.append(abs)
1565 if ui.verbose or not exact:
1565 if ui.verbose or not exact:
1566 ui.status(_('forgetting %s\n') % ((pats and rel) or abs))
1566 ui.status(_('forgetting %s\n') % ((pats and rel) or abs))
1567 repo.forget(forget)
1567 repo.forget(forget)
1568
1568
1569 def grep(ui, repo, pattern, *pats, **opts):
1569 def grep(ui, repo, pattern, *pats, **opts):
1570 """search for a pattern in specified files and revisions
1570 """search for a pattern in specified files and revisions
1571
1571
1572 Search revisions of files for a regular expression.
1572 Search revisions of files for a regular expression.
1573
1573
1574 This command behaves differently than Unix grep. It only accepts
1574 This command behaves differently than Unix grep. It only accepts
1575 Python/Perl regexps. It searches repository history, not the
1575 Python/Perl regexps. It searches repository history, not the
1576 working directory. It always prints the revision number in which
1576 working directory. It always prints the revision number in which
1577 a match appears.
1577 a match appears.
1578
1578
1579 By default, grep only prints output for the first revision of a
1579 By default, grep only prints output for the first revision of a
1580 file in which it finds a match. To get it to print every revision
1580 file in which it finds a match. To get it to print every revision
1581 that contains a change in match status ("-" for a match that
1581 that contains a change in match status ("-" for a match that
1582 becomes a non-match, or "+" for a non-match that becomes a match),
1582 becomes a non-match, or "+" for a non-match that becomes a match),
1583 use the --all flag.
1583 use the --all flag.
1584 """
1584 """
1585 reflags = 0
1585 reflags = 0
1586 if opts['ignore_case']:
1586 if opts['ignore_case']:
1587 reflags |= re.I
1587 reflags |= re.I
1588 regexp = re.compile(pattern, reflags)
1588 regexp = re.compile(pattern, reflags)
1589 sep, eol = ':', '\n'
1589 sep, eol = ':', '\n'
1590 if opts['print0']:
1590 if opts['print0']:
1591 sep = eol = '\0'
1591 sep = eol = '\0'
1592
1592
1593 fcache = {}
1593 fcache = {}
1594 def getfile(fn):
1594 def getfile(fn):
1595 if fn not in fcache:
1595 if fn not in fcache:
1596 fcache[fn] = repo.file(fn)
1596 fcache[fn] = repo.file(fn)
1597 return fcache[fn]
1597 return fcache[fn]
1598
1598
1599 def matchlines(body):
1599 def matchlines(body):
1600 begin = 0
1600 begin = 0
1601 linenum = 0
1601 linenum = 0
1602 while True:
1602 while True:
1603 match = regexp.search(body, begin)
1603 match = regexp.search(body, begin)
1604 if not match:
1604 if not match:
1605 break
1605 break
1606 mstart, mend = match.span()
1606 mstart, mend = match.span()
1607 linenum += body.count('\n', begin, mstart) + 1
1607 linenum += body.count('\n', begin, mstart) + 1
1608 lstart = body.rfind('\n', begin, mstart) + 1 or begin
1608 lstart = body.rfind('\n', begin, mstart) + 1 or begin
1609 lend = body.find('\n', mend)
1609 lend = body.find('\n', mend)
1610 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
1610 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
1611 begin = lend + 1
1611 begin = lend + 1
1612
1612
1613 class linestate(object):
1613 class linestate(object):
1614 def __init__(self, line, linenum, colstart, colend):
1614 def __init__(self, line, linenum, colstart, colend):
1615 self.line = line
1615 self.line = line
1616 self.linenum = linenum
1616 self.linenum = linenum
1617 self.colstart = colstart
1617 self.colstart = colstart
1618 self.colend = colend
1618 self.colend = colend
1619 def __eq__(self, other):
1619 def __eq__(self, other):
1620 return self.line == other.line
1620 return self.line == other.line
1621 def __hash__(self):
1621 def __hash__(self):
1622 return hash(self.line)
1622 return hash(self.line)
1623
1623
1624 matches = {}
1624 matches = {}
1625 def grepbody(fn, rev, body):
1625 def grepbody(fn, rev, body):
1626 matches[rev].setdefault(fn, {})
1626 matches[rev].setdefault(fn, {})
1627 m = matches[rev][fn]
1627 m = matches[rev][fn]
1628 for lnum, cstart, cend, line in matchlines(body):
1628 for lnum, cstart, cend, line in matchlines(body):
1629 s = linestate(line, lnum, cstart, cend)
1629 s = linestate(line, lnum, cstart, cend)
1630 m[s] = s
1630 m[s] = s
1631
1631
1632 # FIXME: prev isn't used, why ?
1632 # FIXME: prev isn't used, why ?
1633 prev = {}
1633 prev = {}
1634 ucache = {}
1634 ucache = {}
1635 def display(fn, rev, states, prevstates):
1635 def display(fn, rev, states, prevstates):
1636 diff = list(sets.Set(states).symmetric_difference(sets.Set(prevstates)))
1636 diff = list(sets.Set(states).symmetric_difference(sets.Set(prevstates)))
1637 diff.sort(lambda x, y: cmp(x.linenum, y.linenum))
1637 diff.sort(lambda x, y: cmp(x.linenum, y.linenum))
1638 counts = {'-': 0, '+': 0}
1638 counts = {'-': 0, '+': 0}
1639 filerevmatches = {}
1639 filerevmatches = {}
1640 for l in diff:
1640 for l in diff:
1641 if incrementing or not opts['all']:
1641 if incrementing or not opts['all']:
1642 change = ((l in prevstates) and '-') or '+'
1642 change = ((l in prevstates) and '-') or '+'
1643 r = rev
1643 r = rev
1644 else:
1644 else:
1645 change = ((l in states) and '-') or '+'
1645 change = ((l in states) and '-') or '+'
1646 r = prev[fn]
1646 r = prev[fn]
1647 cols = [fn, str(rev)]
1647 cols = [fn, str(rev)]
1648 if opts['line_number']:
1648 if opts['line_number']:
1649 cols.append(str(l.linenum))
1649 cols.append(str(l.linenum))
1650 if opts['all']:
1650 if opts['all']:
1651 cols.append(change)
1651 cols.append(change)
1652 if opts['user']:
1652 if opts['user']:
1653 cols.append(trimuser(ui, getchange(rev)[1], rev,
1653 cols.append(trimuser(ui, getchange(rev)[1], rev,
1654 ucache))
1654 ucache))
1655 if opts['files_with_matches']:
1655 if opts['files_with_matches']:
1656 c = (fn, rev)
1656 c = (fn, rev)
1657 if c in filerevmatches:
1657 if c in filerevmatches:
1658 continue
1658 continue
1659 filerevmatches[c] = 1
1659 filerevmatches[c] = 1
1660 else:
1660 else:
1661 cols.append(l.line)
1661 cols.append(l.line)
1662 ui.write(sep.join(cols), eol)
1662 ui.write(sep.join(cols), eol)
1663 counts[change] += 1
1663 counts[change] += 1
1664 return counts['+'], counts['-']
1664 return counts['+'], counts['-']
1665
1665
1666 fstate = {}
1666 fstate = {}
1667 skip = {}
1667 skip = {}
1668 changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)
1668 changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)
1669 count = 0
1669 count = 0
1670 incrementing = False
1670 incrementing = False
1671 for st, rev, fns in changeiter:
1671 for st, rev, fns in changeiter:
1672 if st == 'window':
1672 if st == 'window':
1673 incrementing = rev
1673 incrementing = rev
1674 matches.clear()
1674 matches.clear()
1675 elif st == 'add':
1675 elif st == 'add':
1676 change = repo.changelog.read(repo.lookup(str(rev)))
1676 change = repo.changelog.read(repo.lookup(str(rev)))
1677 mf = repo.manifest.read(change[0])
1677 mf = repo.manifest.read(change[0])
1678 matches[rev] = {}
1678 matches[rev] = {}
1679 for fn in fns:
1679 for fn in fns:
1680 if fn in skip:
1680 if fn in skip:
1681 continue
1681 continue
1682 fstate.setdefault(fn, {})
1682 fstate.setdefault(fn, {})
1683 try:
1683 try:
1684 grepbody(fn, rev, getfile(fn).read(mf[fn]))
1684 grepbody(fn, rev, getfile(fn).read(mf[fn]))
1685 except KeyError:
1685 except KeyError:
1686 pass
1686 pass
1687 elif st == 'iter':
1687 elif st == 'iter':
1688 states = matches[rev].items()
1688 states = matches[rev].items()
1689 states.sort()
1689 states.sort()
1690 for fn, m in states:
1690 for fn, m in states:
1691 if fn in skip:
1691 if fn in skip:
1692 continue
1692 continue
1693 if incrementing or not opts['all'] or fstate[fn]:
1693 if incrementing or not opts['all'] or fstate[fn]:
1694 pos, neg = display(fn, rev, m, fstate[fn])
1694 pos, neg = display(fn, rev, m, fstate[fn])
1695 count += pos + neg
1695 count += pos + neg
1696 if pos and not opts['all']:
1696 if pos and not opts['all']:
1697 skip[fn] = True
1697 skip[fn] = True
1698 fstate[fn] = m
1698 fstate[fn] = m
1699 prev[fn] = rev
1699 prev[fn] = rev
1700
1700
1701 if not incrementing:
1701 if not incrementing:
1702 fstate = fstate.items()
1702 fstate = fstate.items()
1703 fstate.sort()
1703 fstate.sort()
1704 for fn, state in fstate:
1704 for fn, state in fstate:
1705 if fn in skip:
1705 if fn in skip:
1706 continue
1706 continue
1707 display(fn, rev, {}, state)
1707 display(fn, rev, {}, state)
1708 return (count == 0 and 1) or 0
1708 return (count == 0 and 1) or 0
1709
1709
1710 def heads(ui, repo, **opts):
1710 def heads(ui, repo, **opts):
1711 """show current repository heads
1711 """show current repository heads
1712
1712
1713 Show all repository head changesets.
1713 Show all repository head changesets.
1714
1714
1715 Repository "heads" are changesets that don't have children
1715 Repository "heads" are changesets that don't have children
1716 changesets. They are where development generally takes place and
1716 changesets. They are where development generally takes place and
1717 are the usual targets for update and merge operations.
1717 are the usual targets for update and merge operations.
1718 """
1718 """
1719 if opts['rev']:
1719 if opts['rev']:
1720 heads = repo.heads(repo.lookup(opts['rev']))
1720 heads = repo.heads(repo.lookup(opts['rev']))
1721 else:
1721 else:
1722 heads = repo.heads()
1722 heads = repo.heads()
1723 br = None
1723 br = None
1724 if opts['branches']:
1724 if opts['branches']:
1725 br = repo.branchlookup(heads)
1725 br = repo.branchlookup(heads)
1726 displayer = show_changeset(ui, repo, opts)
1726 displayer = show_changeset(ui, repo, opts)
1727 for n in heads:
1727 for n in heads:
1728 displayer.show(changenode=n, brinfo=br)
1728 displayer.show(changenode=n, brinfo=br)
1729
1729
1730 def identify(ui, repo):
1730 def identify(ui, repo):
1731 """print information about the working copy
1731 """print information about the working copy
1732
1732
1733 Print a short summary of the current state of the repo.
1733 Print a short summary of the current state of the repo.
1734
1734
1735 This summary identifies the repository state using one or two parent
1735 This summary identifies the repository state using one or two parent
1736 hash identifiers, followed by a "+" if there are uncommitted changes
1736 hash identifiers, followed by a "+" if there are uncommitted changes
1737 in the working directory, followed by a list of tags for this revision.
1737 in the working directory, followed by a list of tags for this revision.
1738 """
1738 """
1739 parents = [p for p in repo.dirstate.parents() if p != nullid]
1739 parents = [p for p in repo.dirstate.parents() if p != nullid]
1740 if not parents:
1740 if not parents:
1741 ui.write(_("unknown\n"))
1741 ui.write(_("unknown\n"))
1742 return
1742 return
1743
1743
1744 hexfunc = ui.verbose and hex or short
1744 hexfunc = ui.verbose and hex or short
1745 modified, added, removed, deleted, unknown = repo.changes()
1745 modified, added, removed, deleted, unknown = repo.changes()
1746 output = ["%s%s" %
1746 output = ["%s%s" %
1747 ('+'.join([hexfunc(parent) for parent in parents]),
1747 ('+'.join([hexfunc(parent) for parent in parents]),
1748 (modified or added or removed or deleted) and "+" or "")]
1748 (modified or added or removed or deleted) and "+" or "")]
1749
1749
1750 if not ui.quiet:
1750 if not ui.quiet:
1751 # multiple tags for a single parent separated by '/'
1751 # multiple tags for a single parent separated by '/'
1752 parenttags = ['/'.join(tags)
1752 parenttags = ['/'.join(tags)
1753 for tags in map(repo.nodetags, parents) if tags]
1753 for tags in map(repo.nodetags, parents) if tags]
1754 # tags for multiple parents separated by ' + '
1754 # tags for multiple parents separated by ' + '
1755 if parenttags:
1755 if parenttags:
1756 output.append(' + '.join(parenttags))
1756 output.append(' + '.join(parenttags))
1757
1757
1758 ui.write("%s\n" % ' '.join(output))
1758 ui.write("%s\n" % ' '.join(output))
1759
1759
1760 def import_(ui, repo, patch1, *patches, **opts):
1760 def import_(ui, repo, patch1, *patches, **opts):
1761 """import an ordered set of patches
1761 """import an ordered set of patches
1762
1762
1763 Import a list of patches and commit them individually.
1763 Import a list of patches and commit them individually.
1764
1764
1765 If there are outstanding changes in the working directory, import
1765 If there are outstanding changes in the working directory, import
1766 will abort unless given the -f flag.
1766 will abort unless given the -f flag.
1767
1767
1768 You can import a patch straight from a mail message. Even patches
1768 You can import a patch straight from a mail message. Even patches
1769 as attachments work (body part must be type text/plain or
1769 as attachments work (body part must be type text/plain or
1770 text/x-patch to be used). From and Subject headers of email
1770 text/x-patch to be used). From and Subject headers of email
1771 message are used as default committer and commit message. All
1771 message are used as default committer and commit message. All
1772 text/plain body parts before first diff are added to commit
1772 text/plain body parts before first diff are added to commit
1773 message.
1773 message.
1774
1774
1775 If imported patch was generated by hg export, user and description
1775 If imported patch was generated by hg export, user and description
1776 from patch override values from message headers and body. Values
1776 from patch override values from message headers and body. Values
1777 given on command line with -m and -u override these.
1777 given on command line with -m and -u override these.
1778
1778
1779 To read a patch from standard input, use patch name "-".
1779 To read a patch from standard input, use patch name "-".
1780 """
1780 """
1781 patches = (patch1,) + patches
1781 patches = (patch1,) + patches
1782
1782
1783 if not opts['force']:
1783 if not opts['force']:
1784 bail_if_changed(repo)
1784 bail_if_changed(repo)
1785
1785
1786 d = opts["base"]
1786 d = opts["base"]
1787 strip = opts["strip"]
1787 strip = opts["strip"]
1788
1788
1789 mailre = re.compile(r'(?:From |[\w-]+:)')
1789 mailre = re.compile(r'(?:From |[\w-]+:)')
1790
1790
1791 # attempt to detect the start of a patch
1791 # attempt to detect the start of a patch
1792 # (this heuristic is borrowed from quilt)
1792 # (this heuristic is borrowed from quilt)
1793 diffre = re.compile(r'^(?:Index:[ \t]|diff[ \t]|RCS file: |' +
1793 diffre = re.compile(r'^(?:Index:[ \t]|diff[ \t]|RCS file: |' +
1794 'retrieving revision [0-9]+(\.[0-9]+)*$|' +
1794 'retrieving revision [0-9]+(\.[0-9]+)*$|' +
1795 '(---|\*\*\*)[ \t])', re.MULTILINE)
1795 '(---|\*\*\*)[ \t])', re.MULTILINE)
1796
1796
1797 for patch in patches:
1797 for patch in patches:
1798 pf = os.path.join(d, patch)
1798 pf = os.path.join(d, patch)
1799
1799
1800 message = None
1800 message = None
1801 user = None
1801 user = None
1802 date = None
1802 date = None
1803 hgpatch = False
1803 hgpatch = False
1804
1804
1805 p = email.Parser.Parser()
1805 p = email.Parser.Parser()
1806 if pf == '-':
1806 if pf == '-':
1807 msg = p.parse(sys.stdin)
1807 msg = p.parse(sys.stdin)
1808 ui.status(_("applying patch from stdin\n"))
1808 ui.status(_("applying patch from stdin\n"))
1809 else:
1809 else:
1810 msg = p.parse(file(pf))
1810 msg = p.parse(file(pf))
1811 ui.status(_("applying %s\n") % patch)
1811 ui.status(_("applying %s\n") % patch)
1812
1812
1813 fd, tmpname = tempfile.mkstemp(prefix='hg-patch-')
1813 fd, tmpname = tempfile.mkstemp(prefix='hg-patch-')
1814 tmpfp = os.fdopen(fd, 'w')
1814 tmpfp = os.fdopen(fd, 'w')
1815 try:
1815 try:
1816 message = msg['Subject']
1816 message = msg['Subject']
1817 if message:
1817 if message:
1818 message = message.replace('\n\t', ' ')
1818 message = message.replace('\n\t', ' ')
1819 ui.debug('Subject: %s\n' % message)
1819 ui.debug('Subject: %s\n' % message)
1820 user = msg['From']
1820 user = msg['From']
1821 if user:
1821 if user:
1822 ui.debug('From: %s\n' % user)
1822 ui.debug('From: %s\n' % user)
1823 diffs_seen = 0
1823 diffs_seen = 0
1824 ok_types = ('text/plain', 'text/x-patch')
1824 ok_types = ('text/plain', 'text/x-patch')
1825 for part in msg.walk():
1825 for part in msg.walk():
1826 content_type = part.get_content_type()
1826 content_type = part.get_content_type()
1827 ui.debug('Content-Type: %s\n' % content_type)
1827 ui.debug('Content-Type: %s\n' % content_type)
1828 if content_type not in ok_types:
1828 if content_type not in ok_types:
1829 continue
1829 continue
1830 payload = part.get_payload(decode=True)
1830 payload = part.get_payload(decode=True)
1831 m = diffre.search(payload)
1831 m = diffre.search(payload)
1832 if m:
1832 if m:
1833 ui.debug(_('found patch at byte %d\n') % m.start(0))
1833 ui.debug(_('found patch at byte %d\n') % m.start(0))
1834 diffs_seen += 1
1834 diffs_seen += 1
1835 hgpatch = False
1835 hgpatch = False
1836 fp = cStringIO.StringIO()
1836 fp = cStringIO.StringIO()
1837 if message:
1837 if message:
1838 fp.write(message)
1838 fp.write(message)
1839 fp.write('\n')
1839 fp.write('\n')
1840 for line in payload[:m.start(0)].splitlines():
1840 for line in payload[:m.start(0)].splitlines():
1841 if line.startswith('# HG changeset patch'):
1841 if line.startswith('# HG changeset patch'):
1842 ui.debug(_('patch generated by hg export\n'))
1842 ui.debug(_('patch generated by hg export\n'))
1843 hgpatch = True
1843 hgpatch = True
1844 # drop earlier commit message content
1844 # drop earlier commit message content
1845 fp.seek(0)
1845 fp.seek(0)
1846 fp.truncate()
1846 fp.truncate()
1847 elif hgpatch:
1847 elif hgpatch:
1848 if line.startswith('# User '):
1848 if line.startswith('# User '):
1849 user = line[7:]
1849 user = line[7:]
1850 ui.debug('From: %s\n' % user)
1850 ui.debug('From: %s\n' % user)
1851 elif line.startswith("# Date "):
1851 elif line.startswith("# Date "):
1852 date = line[7:]
1852 date = line[7:]
1853 if not line.startswith('# '):
1853 if not line.startswith('# '):
1854 fp.write(line)
1854 fp.write(line)
1855 fp.write('\n')
1855 fp.write('\n')
1856 message = fp.getvalue()
1856 message = fp.getvalue()
1857 if tmpfp:
1857 if tmpfp:
1858 tmpfp.write(payload)
1858 tmpfp.write(payload)
1859 if not payload.endswith('\n'):
1859 if not payload.endswith('\n'):
1860 tmpfp.write('\n')
1860 tmpfp.write('\n')
1861 elif not diffs_seen and message and content_type == 'text/plain':
1861 elif not diffs_seen and message and content_type == 'text/plain':
1862 message += '\n' + payload
1862 message += '\n' + payload
1863
1863
1864 if opts['message']:
1864 if opts['message']:
1865 # pickup the cmdline msg
1865 # pickup the cmdline msg
1866 message = opts['message']
1866 message = opts['message']
1867 elif message:
1867 elif message:
1868 # pickup the patch msg
1868 # pickup the patch msg
1869 message = message.strip()
1869 message = message.strip()
1870 else:
1870 else:
1871 # launch the editor
1871 # launch the editor
1872 message = None
1872 message = None
1873 ui.debug(_('message:\n%s\n') % message)
1873 ui.debug(_('message:\n%s\n') % message)
1874
1874
1875 tmpfp.close()
1875 tmpfp.close()
1876 if not diffs_seen:
1876 if not diffs_seen:
1877 raise util.Abort(_('no diffs found'))
1877 raise util.Abort(_('no diffs found'))
1878
1878
1879 files = util.patch(strip, tmpname, ui)
1879 files = util.patch(strip, tmpname, ui)
1880 if len(files) > 0:
1880 if len(files) > 0:
1881 addremove_lock(ui, repo, files, {})
1881 addremove_lock(ui, repo, files, {})
1882 repo.commit(files, message, user, date)
1882 repo.commit(files, message, user, date)
1883 finally:
1883 finally:
1884 os.unlink(tmpname)
1884 os.unlink(tmpname)
1885
1885
1886 def incoming(ui, repo, source="default", **opts):
1886 def incoming(ui, repo, source="default", **opts):
1887 """show new changesets found in source
1887 """show new changesets found in source
1888
1888
1889 Show new changesets found in the specified path/URL or the default
1889 Show new changesets found in the specified path/URL or the default
1890 pull location. These are the changesets that would be pulled if a pull
1890 pull location. These are the changesets that would be pulled if a pull
1891 was requested.
1891 was requested.
1892
1892
1893 For remote repository, using --bundle avoids downloading the changesets
1893 For remote repository, using --bundle avoids downloading the changesets
1894 twice if the incoming is followed by a pull.
1894 twice if the incoming is followed by a pull.
1895
1895
1896 See pull for valid source format details.
1896 See pull for valid source format details.
1897 """
1897 """
1898 source = ui.expandpath(source)
1898 source = ui.expandpath(source)
1899 if opts['ssh']:
1899 if opts['ssh']:
1900 ui.setconfig("ui", "ssh", opts['ssh'])
1900 ui.setconfig("ui", "ssh", opts['ssh'])
1901 if opts['remotecmd']:
1901 if opts['remotecmd']:
1902 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
1902 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
1903
1903
1904 other = hg.repository(ui, source)
1904 other = hg.repository(ui, source)
1905 incoming = repo.findincoming(other, force=opts["force"])
1905 incoming = repo.findincoming(other, force=opts["force"])
1906 if not incoming:
1906 if not incoming:
1907 ui.status(_("no changes found\n"))
1907 ui.status(_("no changes found\n"))
1908 return
1908 return
1909
1909
1910 cleanup = None
1910 cleanup = None
1911 try:
1911 try:
1912 fname = opts["bundle"]
1912 fname = opts["bundle"]
1913 if fname or not other.local():
1913 if fname or not other.local():
1914 # create a bundle (uncompressed if other repo is not local)
1914 # create a bundle (uncompressed if other repo is not local)
1915 cg = other.changegroup(incoming, "incoming")
1915 cg = other.changegroup(incoming, "incoming")
1916 fname = cleanup = write_bundle(cg, fname, compress=other.local())
1916 fname = cleanup = write_bundle(cg, fname, compress=other.local())
1917 # keep written bundle?
1917 # keep written bundle?
1918 if opts["bundle"]:
1918 if opts["bundle"]:
1919 cleanup = None
1919 cleanup = None
1920 if not other.local():
1920 if not other.local():
1921 # use the created uncompressed bundlerepo
1921 # use the created uncompressed bundlerepo
1922 other = bundlerepo.bundlerepository(ui, repo.root, fname)
1922 other = bundlerepo.bundlerepository(ui, repo.root, fname)
1923
1923
1924 revs = None
1924 revs = None
1925 if opts['rev']:
1925 if opts['rev']:
1926 revs = [other.lookup(rev) for rev in opts['rev']]
1926 revs = [other.lookup(rev) for rev in opts['rev']]
1927 o = other.changelog.nodesbetween(incoming, revs)[0]
1927 o = other.changelog.nodesbetween(incoming, revs)[0]
1928 if opts['newest_first']:
1928 if opts['newest_first']:
1929 o.reverse()
1929 o.reverse()
1930 displayer = show_changeset(ui, other, opts)
1930 displayer = show_changeset(ui, other, opts)
1931 for n in o:
1931 for n in o:
1932 parents = [p for p in other.changelog.parents(n) if p != nullid]
1932 parents = [p for p in other.changelog.parents(n) if p != nullid]
1933 if opts['no_merges'] and len(parents) == 2:
1933 if opts['no_merges'] and len(parents) == 2:
1934 continue
1934 continue
1935 displayer.show(changenode=n)
1935 displayer.show(changenode=n)
1936 if opts['patch']:
1936 if opts['patch']:
1937 prev = (parents and parents[0]) or nullid
1937 prev = (parents and parents[0]) or nullid
1938 dodiff(ui, ui, other, prev, n)
1938 dodiff(ui, ui, other, prev, n)
1939 ui.write("\n")
1939 ui.write("\n")
1940 finally:
1940 finally:
1941 if hasattr(other, 'close'):
1941 if hasattr(other, 'close'):
1942 other.close()
1942 other.close()
1943 if cleanup:
1943 if cleanup:
1944 os.unlink(cleanup)
1944 os.unlink(cleanup)
1945
1945
1946 def init(ui, dest="."):
1946 def init(ui, dest="."):
1947 """create a new repository in the given directory
1947 """create a new repository in the given directory
1948
1948
1949 Initialize a new repository in the given directory. If the given
1949 Initialize a new repository in the given directory. If the given
1950 directory does not exist, it is created.
1950 directory does not exist, it is created.
1951
1951
1952 If no directory is given, the current directory is used.
1952 If no directory is given, the current directory is used.
1953 """
1953 """
1954 hg.repository(ui, dest, create=1)
1954 hg.repository(ui, dest, create=1)
1955
1955
1956 def locate(ui, repo, *pats, **opts):
1956 def locate(ui, repo, *pats, **opts):
1957 """locate files matching specific patterns
1957 """locate files matching specific patterns
1958
1958
1959 Print all files under Mercurial control whose names match the
1959 Print all files under Mercurial control whose names match the
1960 given patterns.
1960 given patterns.
1961
1961
1962 This command searches the current directory and its
1962 This command searches the current directory and its
1963 subdirectories. To search an entire repository, move to the root
1963 subdirectories. To search an entire repository, move to the root
1964 of the repository.
1964 of the repository.
1965
1965
1966 If no patterns are given to match, this command prints all file
1966 If no patterns are given to match, this command prints all file
1967 names.
1967 names.
1968
1968
1969 If you want to feed the output of this command into the "xargs"
1969 If you want to feed the output of this command into the "xargs"
1970 command, use the "-0" option to both this command and "xargs".
1970 command, use the "-0" option to both this command and "xargs".
1971 This will avoid the problem of "xargs" treating single filenames
1971 This will avoid the problem of "xargs" treating single filenames
1972 that contain white space as multiple filenames.
1972 that contain white space as multiple filenames.
1973 """
1973 """
1974 end = opts['print0'] and '\0' or '\n'
1974 end = opts['print0'] and '\0' or '\n'
1975 rev = opts['rev']
1975 rev = opts['rev']
1976 if rev:
1976 if rev:
1977 node = repo.lookup(rev)
1977 node = repo.lookup(rev)
1978 else:
1978 else:
1979 node = None
1979 node = None
1980
1980
1981 for src, abs, rel, exact in walk(repo, pats, opts, node=node,
1981 for src, abs, rel, exact in walk(repo, pats, opts, node=node,
1982 head='(?:.*/|)'):
1982 head='(?:.*/|)'):
1983 if not node and repo.dirstate.state(abs) == '?':
1983 if not node and repo.dirstate.state(abs) == '?':
1984 continue
1984 continue
1985 if opts['fullpath']:
1985 if opts['fullpath']:
1986 ui.write(os.path.join(repo.root, abs), end)
1986 ui.write(os.path.join(repo.root, abs), end)
1987 else:
1987 else:
1988 ui.write(((pats and rel) or abs), end)
1988 ui.write(((pats and rel) or abs), end)
1989
1989
1990 def log(ui, repo, *pats, **opts):
1990 def log(ui, repo, *pats, **opts):
1991 """show revision history of entire repository or files
1991 """show revision history of entire repository or files
1992
1992
1993 Print the revision history of the specified files or the entire project.
1993 Print the revision history of the specified files or the entire project.
1994
1994
1995 By default this command outputs: changeset id and hash, tags,
1995 By default this command outputs: changeset id and hash, tags,
1996 non-trivial parents, user, date and time, and a summary for each
1996 non-trivial parents, user, date and time, and a summary for each
1997 commit. When the -v/--verbose switch is used, the list of changed
1997 commit. When the -v/--verbose switch is used, the list of changed
1998 files and full commit message is shown.
1998 files and full commit message is shown.
1999 """
1999 """
2000 class dui(object):
2000 class dui(object):
2001 # Implement and delegate some ui protocol. Save hunks of
2001 # Implement and delegate some ui protocol. Save hunks of
2002 # output for later display in the desired order.
2002 # output for later display in the desired order.
2003 def __init__(self, ui):
2003 def __init__(self, ui):
2004 self.ui = ui
2004 self.ui = ui
2005 self.hunk = {}
2005 self.hunk = {}
2006 self.header = {}
2006 self.header = {}
2007 def bump(self, rev):
2007 def bump(self, rev):
2008 self.rev = rev
2008 self.rev = rev
2009 self.hunk[rev] = []
2009 self.hunk[rev] = []
2010 self.header[rev] = []
2010 self.header[rev] = []
2011 def note(self, *args):
2011 def note(self, *args):
2012 if self.verbose:
2012 if self.verbose:
2013 self.write(*args)
2013 self.write(*args)
2014 def status(self, *args):
2014 def status(self, *args):
2015 if not self.quiet:
2015 if not self.quiet:
2016 self.write(*args)
2016 self.write(*args)
2017 def write(self, *args):
2017 def write(self, *args):
2018 self.hunk[self.rev].append(args)
2018 self.hunk[self.rev].append(args)
2019 def write_header(self, *args):
2019 def write_header(self, *args):
2020 self.header[self.rev].append(args)
2020 self.header[self.rev].append(args)
2021 def debug(self, *args):
2021 def debug(self, *args):
2022 if self.debugflag:
2022 if self.debugflag:
2023 self.write(*args)
2023 self.write(*args)
2024 def __getattr__(self, key):
2024 def __getattr__(self, key):
2025 return getattr(self.ui, key)
2025 return getattr(self.ui, key)
2026
2026
2027 changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)
2027 changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)
2028
2028
2029 if opts['limit']:
2029 if opts['limit']:
2030 try:
2030 try:
2031 limit = int(opts['limit'])
2031 limit = int(opts['limit'])
2032 except ValueError:
2032 except ValueError:
2033 raise util.Abort(_('limit must be a positive integer'))
2033 raise util.Abort(_('limit must be a positive integer'))
2034 if limit <= 0: raise util.Abort(_('limit must be positive'))
2034 if limit <= 0: raise util.Abort(_('limit must be positive'))
2035 else:
2035 else:
2036 limit = sys.maxint
2036 limit = sys.maxint
2037 count = 0
2037 count = 0
2038
2038
2039 displayer = show_changeset(ui, repo, opts)
2039 displayer = show_changeset(ui, repo, opts)
2040 for st, rev, fns in changeiter:
2040 for st, rev, fns in changeiter:
2041 if st == 'window':
2041 if st == 'window':
2042 du = dui(ui)
2042 du = dui(ui)
2043 displayer.ui = du
2043 displayer.ui = du
2044 elif st == 'add':
2044 elif st == 'add':
2045 du.bump(rev)
2045 du.bump(rev)
2046 changenode = repo.changelog.node(rev)
2046 changenode = repo.changelog.node(rev)
2047 parents = [p for p in repo.changelog.parents(changenode)
2047 parents = [p for p in repo.changelog.parents(changenode)
2048 if p != nullid]
2048 if p != nullid]
2049 if opts['no_merges'] and len(parents) == 2:
2049 if opts['no_merges'] and len(parents) == 2:
2050 continue
2050 continue
2051 if opts['only_merges'] and len(parents) != 2:
2051 if opts['only_merges'] and len(parents) != 2:
2052 continue
2052 continue
2053
2053
2054 if opts['keyword']:
2054 if opts['keyword']:
2055 changes = getchange(rev)
2055 changes = getchange(rev)
2056 miss = 0
2056 miss = 0
2057 for k in [kw.lower() for kw in opts['keyword']]:
2057 for k in [kw.lower() for kw in opts['keyword']]:
2058 if not (k in changes[1].lower() or
2058 if not (k in changes[1].lower() or
2059 k in changes[4].lower() or
2059 k in changes[4].lower() or
2060 k in " ".join(changes[3][:20]).lower()):
2060 k in " ".join(changes[3][:20]).lower()):
2061 miss = 1
2061 miss = 1
2062 break
2062 break
2063 if miss:
2063 if miss:
2064 continue
2064 continue
2065
2065
2066 br = None
2066 br = None
2067 if opts['branches']:
2067 if opts['branches']:
2068 br = repo.branchlookup([repo.changelog.node(rev)])
2068 br = repo.branchlookup([repo.changelog.node(rev)])
2069
2069
2070 displayer.show(rev, brinfo=br)
2070 displayer.show(rev, brinfo=br)
2071 if opts['patch']:
2071 if opts['patch']:
2072 prev = (parents and parents[0]) or nullid
2072 prev = (parents and parents[0]) or nullid
2073 dodiff(du, du, repo, prev, changenode, match=matchfn)
2073 dodiff(du, du, repo, prev, changenode, match=matchfn)
2074 du.write("\n\n")
2074 du.write("\n\n")
2075 elif st == 'iter':
2075 elif st == 'iter':
2076 if count == limit: break
2076 if count == limit: break
2077 if du.header[rev]:
2077 if du.header[rev]:
2078 for args in du.header[rev]:
2078 for args in du.header[rev]:
2079 ui.write_header(*args)
2079 ui.write_header(*args)
2080 if du.hunk[rev]:
2080 if du.hunk[rev]:
2081 count += 1
2081 count += 1
2082 for args in du.hunk[rev]:
2082 for args in du.hunk[rev]:
2083 ui.write(*args)
2083 ui.write(*args)
2084
2084
2085 def manifest(ui, repo, rev=None):
2085 def manifest(ui, repo, rev=None):
2086 """output the latest or given revision of the project manifest
2086 """output the latest or given revision of the project manifest
2087
2087
2088 Print a list of version controlled files for the given revision.
2088 Print a list of version controlled files for the given revision.
2089
2089
2090 The manifest is the list of files being version controlled. If no revision
2090 The manifest is the list of files being version controlled. If no revision
2091 is given then the tip is used.
2091 is given then the tip is used.
2092 """
2092 """
2093 if rev:
2093 if rev:
2094 try:
2094 try:
2095 # assume all revision numbers are for changesets
2095 # assume all revision numbers are for changesets
2096 n = repo.lookup(rev)
2096 n = repo.lookup(rev)
2097 change = repo.changelog.read(n)
2097 change = repo.changelog.read(n)
2098 n = change[0]
2098 n = change[0]
2099 except hg.RepoError:
2099 except hg.RepoError:
2100 n = repo.manifest.lookup(rev)
2100 n = repo.manifest.lookup(rev)
2101 else:
2101 else:
2102 n = repo.manifest.tip()
2102 n = repo.manifest.tip()
2103 m = repo.manifest.read(n)
2103 m = repo.manifest.read(n)
2104 mf = repo.manifest.readflags(n)
2104 mf = repo.manifest.readflags(n)
2105 files = m.keys()
2105 files = m.keys()
2106 files.sort()
2106 files.sort()
2107
2107
2108 for f in files:
2108 for f in files:
2109 ui.write("%40s %3s %s\n" % (hex(m[f]), mf[f] and "755" or "644", f))
2109 ui.write("%40s %3s %s\n" % (hex(m[f]), mf[f] and "755" or "644", f))
2110
2110
2111 def merge(ui, repo, node=None, **opts):
2111 def merge(ui, repo, node=None, **opts):
2112 """Merge working directory with another revision
2112 """Merge working directory with another revision
2113
2113
2114 Merge the contents of the current working directory and the
2114 Merge the contents of the current working directory and the
2115 requested revision. Files that changed between either parent are
2115 requested revision. Files that changed between either parent are
2116 marked as changed for the next commit and a commit must be
2116 marked as changed for the next commit and a commit must be
2117 performed before any further updates are allowed.
2117 performed before any further updates are allowed.
2118 """
2118 """
2119 return doupdate(ui, repo, node=node, merge=True, **opts)
2119 return doupdate(ui, repo, node=node, merge=True, **opts)
2120
2120
2121 def outgoing(ui, repo, dest=None, **opts):
2121 def outgoing(ui, repo, dest=None, **opts):
2122 """show changesets not found in destination
2122 """show changesets not found in destination
2123
2123
2124 Show changesets not found in the specified destination repository or
2124 Show changesets not found in the specified destination repository or
2125 the default push location. These are the changesets that would be pushed
2125 the default push location. These are the changesets that would be pushed
2126 if a push was requested.
2126 if a push was requested.
2127
2127
2128 See pull for valid destination format details.
2128 See pull for valid destination format details.
2129 """
2129 """
2130 dest = ui.expandpath(dest or 'default-push', dest or 'default')
2130 dest = ui.expandpath(dest or 'default-push', dest or 'default')
2131 if opts['ssh']:
2131 if opts['ssh']:
2132 ui.setconfig("ui", "ssh", opts['ssh'])
2132 ui.setconfig("ui", "ssh", opts['ssh'])
2133 if opts['remotecmd']:
2133 if opts['remotecmd']:
2134 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
2134 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
2135 revs = None
2135 revs = None
2136 if opts['rev']:
2136 if opts['rev']:
2137 revs = [repo.lookup(rev) for rev in opts['rev']]
2137 revs = [repo.lookup(rev) for rev in opts['rev']]
2138
2138
2139 other = hg.repository(ui, dest)
2139 other = hg.repository(ui, dest)
2140 o = repo.findoutgoing(other, force=opts['force'])
2140 o = repo.findoutgoing(other, force=opts['force'])
2141 if not o:
2141 if not o:
2142 ui.status(_("no changes found\n"))
2142 ui.status(_("no changes found\n"))
2143 return
2143 return
2144 o = repo.changelog.nodesbetween(o, revs)[0]
2144 o = repo.changelog.nodesbetween(o, revs)[0]
2145 if opts['newest_first']:
2145 if opts['newest_first']:
2146 o.reverse()
2146 o.reverse()
2147 displayer = show_changeset(ui, repo, opts)
2147 displayer = show_changeset(ui, repo, opts)
2148 for n in o:
2148 for n in o:
2149 parents = [p for p in repo.changelog.parents(n) if p != nullid]
2149 parents = [p for p in repo.changelog.parents(n) if p != nullid]
2150 if opts['no_merges'] and len(parents) == 2:
2150 if opts['no_merges'] and len(parents) == 2:
2151 continue
2151 continue
2152 displayer.show(changenode=n)
2152 displayer.show(changenode=n)
2153 if opts['patch']:
2153 if opts['patch']:
2154 prev = (parents and parents[0]) or nullid
2154 prev = (parents and parents[0]) or nullid
2155 dodiff(ui, ui, repo, prev, n)
2155 dodiff(ui, ui, repo, prev, n)
2156 ui.write("\n")
2156 ui.write("\n")
2157
2157
2158 def parents(ui, repo, rev=None, branches=None, **opts):
2158 def parents(ui, repo, rev=None, branches=None, **opts):
2159 """show the parents of the working dir or revision
2159 """show the parents of the working dir or revision
2160
2160
2161 Print the working directory's parent revisions.
2161 Print the working directory's parent revisions.
2162 """
2162 """
2163 if rev:
2163 if rev:
2164 p = repo.changelog.parents(repo.lookup(rev))
2164 p = repo.changelog.parents(repo.lookup(rev))
2165 else:
2165 else:
2166 p = repo.dirstate.parents()
2166 p = repo.dirstate.parents()
2167
2167
2168 br = None
2168 br = None
2169 if branches is not None:
2169 if branches is not None:
2170 br = repo.branchlookup(p)
2170 br = repo.branchlookup(p)
2171 displayer = show_changeset(ui, repo, opts)
2171 displayer = show_changeset(ui, repo, opts)
2172 for n in p:
2172 for n in p:
2173 if n != nullid:
2173 if n != nullid:
2174 displayer.show(changenode=n, brinfo=br)
2174 displayer.show(changenode=n, brinfo=br)
2175
2175
2176 def paths(ui, repo, search=None):
2176 def paths(ui, repo, search=None):
2177 """show definition of symbolic path names
2177 """show definition of symbolic path names
2178
2178
2179 Show definition of symbolic path name NAME. If no name is given, show
2179 Show definition of symbolic path name NAME. If no name is given, show
2180 definition of available names.
2180 definition of available names.
2181
2181
2182 Path names are defined in the [paths] section of /etc/mercurial/hgrc
2182 Path names are defined in the [paths] section of /etc/mercurial/hgrc
2183 and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.
2183 and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.
2184 """
2184 """
2185 if search:
2185 if search:
2186 for name, path in ui.configitems("paths"):
2186 for name, path in ui.configitems("paths"):
2187 if name == search:
2187 if name == search:
2188 ui.write("%s\n" % path)
2188 ui.write("%s\n" % path)
2189 return
2189 return
2190 ui.warn(_("not found!\n"))
2190 ui.warn(_("not found!\n"))
2191 return 1
2191 return 1
2192 else:
2192 else:
2193 for name, path in ui.configitems("paths"):
2193 for name, path in ui.configitems("paths"):
2194 ui.write("%s = %s\n" % (name, path))
2194 ui.write("%s = %s\n" % (name, path))
2195
2195
2196 def postincoming(ui, repo, modheads, optupdate):
2196 def postincoming(ui, repo, modheads, optupdate):
2197 if modheads == 0:
2197 if modheads == 0:
2198 return
2198 return
2199 if optupdate:
2199 if optupdate:
2200 if modheads == 1:
2200 if modheads == 1:
2201 return doupdate(ui, repo)
2201 return doupdate(ui, repo)
2202 else:
2202 else:
2203 ui.status(_("not updating, since new heads added\n"))
2203 ui.status(_("not updating, since new heads added\n"))
2204 if modheads > 1:
2204 if modheads > 1:
2205 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
2205 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
2206 else:
2206 else:
2207 ui.status(_("(run 'hg update' to get a working copy)\n"))
2207 ui.status(_("(run 'hg update' to get a working copy)\n"))
2208
2208
2209 def pull(ui, repo, source="default", **opts):
2209 def pull(ui, repo, source="default", **opts):
2210 """pull changes from the specified source
2210 """pull changes from the specified source
2211
2211
2212 Pull changes from a remote repository to a local one.
2212 Pull changes from a remote repository to a local one.
2213
2213
2214 This finds all changes from the repository at the specified path
2214 This finds all changes from the repository at the specified path
2215 or URL and adds them to the local repository. By default, this
2215 or URL and adds them to the local repository. By default, this
2216 does not update the copy of the project in the working directory.
2216 does not update the copy of the project in the working directory.
2217
2217
2218 Valid URLs are of the form:
2218 Valid URLs are of the form:
2219
2219
2220 local/filesystem/path
2220 local/filesystem/path
2221 http://[user@]host[:port][/path]
2221 http://[user@]host[:port][/path]
2222 https://[user@]host[:port][/path]
2222 https://[user@]host[:port][/path]
2223 ssh://[user@]host[:port][/path]
2223 ssh://[user@]host[:port][/path]
2224
2224
2225 Some notes about using SSH with Mercurial:
2225 Some notes about using SSH with Mercurial:
2226 - SSH requires an accessible shell account on the destination machine
2226 - SSH requires an accessible shell account on the destination machine
2227 and a copy of hg in the remote path or specified with as remotecmd.
2227 and a copy of hg in the remote path or specified with as remotecmd.
2228 - /path is relative to the remote user's home directory by default.
2228 - /path is relative to the remote user's home directory by default.
2229 Use two slashes at the start of a path to specify an absolute path.
2229 Use two slashes at the start of a path to specify an absolute path.
2230 - Mercurial doesn't use its own compression via SSH; the right thing
2230 - Mercurial doesn't use its own compression via SSH; the right thing
2231 to do is to configure it in your ~/.ssh/ssh_config, e.g.:
2231 to do is to configure it in your ~/.ssh/ssh_config, e.g.:
2232 Host *.mylocalnetwork.example.com
2232 Host *.mylocalnetwork.example.com
2233 Compression off
2233 Compression off
2234 Host *
2234 Host *
2235 Compression on
2235 Compression on
2236 Alternatively specify "ssh -C" as your ssh command in your hgrc or
2236 Alternatively specify "ssh -C" as your ssh command in your hgrc or
2237 with the --ssh command line option.
2237 with the --ssh command line option.
2238 """
2238 """
2239 source = ui.expandpath(source)
2239 source = ui.expandpath(source)
2240
2240
2241 if opts['ssh']:
2241 if opts['ssh']:
2242 ui.setconfig("ui", "ssh", opts['ssh'])
2242 ui.setconfig("ui", "ssh", opts['ssh'])
2243 if opts['remotecmd']:
2243 if opts['remotecmd']:
2244 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
2244 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
2245
2245
2246 other = hg.repository(ui, source)
2246 other = hg.repository(ui, source)
2247 ui.status(_('pulling from %s\n') % (source))
2247 ui.status(_('pulling from %s\n') % (source))
2248 revs = None
2248 revs = None
2249 if opts['rev'] and not other.local():
2249 if opts['rev'] and not other.local():
2250 raise util.Abort(_("pull -r doesn't work for remote repositories yet"))
2250 raise util.Abort(_("pull -r doesn't work for remote repositories yet"))
2251 elif opts['rev']:
2251 elif opts['rev']:
2252 revs = [other.lookup(rev) for rev in opts['rev']]
2252 revs = [other.lookup(rev) for rev in opts['rev']]
2253 modheads = repo.pull(other, heads=revs, force=opts['force'])
2253 modheads = repo.pull(other, heads=revs, force=opts['force'])
2254 return postincoming(ui, repo, modheads, opts['update'])
2254 return postincoming(ui, repo, modheads, opts['update'])
2255
2255
2256 def push(ui, repo, dest=None, **opts):
2256 def push(ui, repo, dest=None, **opts):
2257 """push changes to the specified destination
2257 """push changes to the specified destination
2258
2258
2259 Push changes from the local repository to the given destination.
2259 Push changes from the local repository to the given destination.
2260
2260
2261 This is the symmetrical operation for pull. It helps to move
2261 This is the symmetrical operation for pull. It helps to move
2262 changes from the current repository to a different one. If the
2262 changes from the current repository to a different one. If the
2263 destination is local this is identical to a pull in that directory
2263 destination is local this is identical to a pull in that directory
2264 from the current one.
2264 from the current one.
2265
2265
2266 By default, push will refuse to run if it detects the result would
2266 By default, push will refuse to run if it detects the result would
2267 increase the number of remote heads. This generally indicates the
2267 increase the number of remote heads. This generally indicates the
2268 the client has forgotten to sync and merge before pushing.
2268 the client has forgotten to sync and merge before pushing.
2269
2269
2270 Valid URLs are of the form:
2270 Valid URLs are of the form:
2271
2271
2272 local/filesystem/path
2272 local/filesystem/path
2273 ssh://[user@]host[:port][/path]
2273 ssh://[user@]host[:port][/path]
2274
2274
2275 Look at the help text for the pull command for important details
2275 Look at the help text for the pull command for important details
2276 about ssh:// URLs.
2276 about ssh:// URLs.
2277 """
2277 """
2278 dest = ui.expandpath(dest or 'default-push', dest or 'default')
2278 dest = ui.expandpath(dest or 'default-push', dest or 'default')
2279
2279
2280 if opts['ssh']:
2280 if opts['ssh']:
2281 ui.setconfig("ui", "ssh", opts['ssh'])
2281 ui.setconfig("ui", "ssh", opts['ssh'])
2282 if opts['remotecmd']:
2282 if opts['remotecmd']:
2283 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
2283 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
2284
2284
2285 other = hg.repository(ui, dest)
2285 other = hg.repository(ui, dest)
2286 ui.status('pushing to %s\n' % (dest))
2286 ui.status('pushing to %s\n' % (dest))
2287 revs = None
2287 revs = None
2288 if opts['rev']:
2288 if opts['rev']:
2289 revs = [repo.lookup(rev) for rev in opts['rev']]
2289 revs = [repo.lookup(rev) for rev in opts['rev']]
2290 r = repo.push(other, opts['force'], revs=revs)
2290 r = repo.push(other, opts['force'], revs=revs)
2291 return r == 0
2291 return r == 0
2292
2292
2293 def rawcommit(ui, repo, *flist, **rc):
2293 def rawcommit(ui, repo, *flist, **rc):
2294 """raw commit interface (DEPRECATED)
2294 """raw commit interface (DEPRECATED)
2295
2295
2296 (DEPRECATED)
2296 (DEPRECATED)
2297 Lowlevel commit, for use in helper scripts.
2297 Lowlevel commit, for use in helper scripts.
2298
2298
2299 This command is not intended to be used by normal users, as it is
2299 This command is not intended to be used by normal users, as it is
2300 primarily useful for importing from other SCMs.
2300 primarily useful for importing from other SCMs.
2301
2301
2302 This command is now deprecated and will be removed in a future
2302 This command is now deprecated and will be removed in a future
2303 release, please use debugsetparents and commit instead.
2303 release, please use debugsetparents and commit instead.
2304 """
2304 """
2305
2305
2306 ui.warn(_("(the rawcommit command is deprecated)\n"))
2306 ui.warn(_("(the rawcommit command is deprecated)\n"))
2307
2307
2308 message = rc['message']
2308 message = rc['message']
2309 if not message and rc['logfile']:
2309 if not message and rc['logfile']:
2310 try:
2310 try:
2311 message = open(rc['logfile']).read()
2311 message = open(rc['logfile']).read()
2312 except IOError:
2312 except IOError:
2313 pass
2313 pass
2314 if not message and not rc['logfile']:
2314 if not message and not rc['logfile']:
2315 raise util.Abort(_("missing commit message"))
2315 raise util.Abort(_("missing commit message"))
2316
2316
2317 files = relpath(repo, list(flist))
2317 files = relpath(repo, list(flist))
2318 if rc['files']:
2318 if rc['files']:
2319 files += open(rc['files']).read().splitlines()
2319 files += open(rc['files']).read().splitlines()
2320
2320
2321 rc['parent'] = map(repo.lookup, rc['parent'])
2321 rc['parent'] = map(repo.lookup, rc['parent'])
2322
2322
2323 try:
2323 try:
2324 repo.rawcommit(files, message, rc['user'], rc['date'], *rc['parent'])
2324 repo.rawcommit(files, message, rc['user'], rc['date'], *rc['parent'])
2325 except ValueError, inst:
2325 except ValueError, inst:
2326 raise util.Abort(str(inst))
2326 raise util.Abort(str(inst))
2327
2327
2328 def recover(ui, repo):
2328 def recover(ui, repo):
2329 """roll back an interrupted transaction
2329 """roll back an interrupted transaction
2330
2330
2331 Recover from an interrupted commit or pull.
2331 Recover from an interrupted commit or pull.
2332
2332
2333 This command tries to fix the repository status after an interrupted
2333 This command tries to fix the repository status after an interrupted
2334 operation. It should only be necessary when Mercurial suggests it.
2334 operation. It should only be necessary when Mercurial suggests it.
2335 """
2335 """
2336 if repo.recover():
2336 if repo.recover():
2337 return repo.verify()
2337 return repo.verify()
2338 return 1
2338 return 1
2339
2339
2340 def remove(ui, repo, *pats, **opts):
2340 def remove(ui, repo, *pats, **opts):
2341 """remove the specified files on the next commit
2341 """remove the specified files on the next commit
2342
2342
2343 Schedule the indicated files for removal from the repository.
2343 Schedule the indicated files for removal from the repository.
2344
2344
2345 This command schedules the files to be removed at the next commit.
2345 This command schedules the files to be removed at the next commit.
2346 This only removes files from the current branch, not from the
2346 This only removes files from the current branch, not from the
2347 entire project history. If the files still exist in the working
2347 entire project history. If the files still exist in the working
2348 directory, they will be deleted from it. If invoked with --after,
2348 directory, they will be deleted from it. If invoked with --after,
2349 files that have been manually deleted are marked as removed.
2349 files that have been manually deleted are marked as removed.
2350
2350
2351 Modified files and added files are not removed by default. To
2351 Modified files and added files are not removed by default. To
2352 remove them, use the -f/--force option.
2352 remove them, use the -f/--force option.
2353 """
2353 """
2354 names = []
2354 names = []
2355 if not opts['after'] and not pats:
2355 if not opts['after'] and not pats:
2356 raise util.Abort(_('no files specified'))
2356 raise util.Abort(_('no files specified'))
2357 files, matchfn, anypats = matchpats(repo, pats, opts)
2357 files, matchfn, anypats = matchpats(repo, pats, opts)
2358 exact = dict.fromkeys(files)
2358 exact = dict.fromkeys(files)
2359 mardu = map(dict.fromkeys, repo.changes(files=files, match=matchfn))
2359 mardu = map(dict.fromkeys, repo.changes(files=files, match=matchfn))
2360 modified, added, removed, deleted, unknown = mardu
2360 modified, added, removed, deleted, unknown = mardu
2361 remove, forget = [], []
2361 remove, forget = [], []
2362 for src, abs, rel, exact in walk(repo, pats, opts):
2362 for src, abs, rel, exact in walk(repo, pats, opts):
2363 reason = None
2363 reason = None
2364 if abs not in deleted and opts['after']:
2364 if abs not in deleted and opts['after']:
2365 reason = _('is still present')
2365 reason = _('is still present')
2366 elif abs in modified and not opts['force']:
2366 elif abs in modified and not opts['force']:
2367 reason = _('is modified (use -f to force removal)')
2367 reason = _('is modified (use -f to force removal)')
2368 elif abs in added:
2368 elif abs in added:
2369 if opts['force']:
2369 if opts['force']:
2370 forget.append(abs)
2370 forget.append(abs)
2371 continue
2371 continue
2372 reason = _('has been marked for add (use -f to force removal)')
2372 reason = _('has been marked for add (use -f to force removal)')
2373 elif abs in unknown:
2373 elif abs in unknown:
2374 reason = _('is not managed')
2374 reason = _('is not managed')
2375 elif abs in removed:
2375 elif abs in removed:
2376 continue
2376 continue
2377 if reason:
2377 if reason:
2378 if exact:
2378 if exact:
2379 ui.warn(_('not removing %s: file %s\n') % (rel, reason))
2379 ui.warn(_('not removing %s: file %s\n') % (rel, reason))
2380 else:
2380 else:
2381 if ui.verbose or not exact:
2381 if ui.verbose or not exact:
2382 ui.status(_('removing %s\n') % rel)
2382 ui.status(_('removing %s\n') % rel)
2383 remove.append(abs)
2383 remove.append(abs)
2384 repo.forget(forget)
2384 repo.forget(forget)
2385 repo.remove(remove, unlink=not opts['after'])
2385 repo.remove(remove, unlink=not opts['after'])
2386
2386
2387 def rename(ui, repo, *pats, **opts):
2387 def rename(ui, repo, *pats, **opts):
2388 """rename files; equivalent of copy + remove
2388 """rename files; equivalent of copy + remove
2389
2389
2390 Mark dest as copies of sources; mark sources for deletion. If
2390 Mark dest as copies of sources; mark sources for deletion. If
2391 dest is a directory, copies are put in that directory. If dest is
2391 dest is a directory, copies are put in that directory. If dest is
2392 a file, there can only be one source.
2392 a file, there can only be one source.
2393
2393
2394 By default, this command copies the contents of files as they
2394 By default, this command copies the contents of files as they
2395 stand in the working directory. If invoked with --after, the
2395 stand in the working directory. If invoked with --after, the
2396 operation is recorded, but no copying is performed.
2396 operation is recorded, but no copying is performed.
2397
2397
2398 This command takes effect in the next commit.
2398 This command takes effect in the next commit.
2399
2399
2400 NOTE: This command should be treated as experimental. While it
2400 NOTE: This command should be treated as experimental. While it
2401 should properly record rename files, this information is not yet
2401 should properly record rename files, this information is not yet
2402 fully used by merge, nor fully reported by log.
2402 fully used by merge, nor fully reported by log.
2403 """
2403 """
2404 wlock = repo.wlock(0)
2404 wlock = repo.wlock(0)
2405 errs, copied = docopy(ui, repo, pats, opts, wlock)
2405 errs, copied = docopy(ui, repo, pats, opts, wlock)
2406 names = []
2406 names = []
2407 for abs, rel, exact in copied:
2407 for abs, rel, exact in copied:
2408 if ui.verbose or not exact:
2408 if ui.verbose or not exact:
2409 ui.status(_('removing %s\n') % rel)
2409 ui.status(_('removing %s\n') % rel)
2410 names.append(abs)
2410 names.append(abs)
2411 if not opts.get('dry_run'):
2411 if not opts.get('dry_run'):
2412 repo.remove(names, True, wlock)
2412 repo.remove(names, True, wlock)
2413 return errs
2413 return errs
2414
2414
2415 def revert(ui, repo, *pats, **opts):
2415 def revert(ui, repo, *pats, **opts):
2416 """revert files or dirs to their states as of some revision
2416 """revert files or dirs to their states as of some revision
2417
2417
2418 With no revision specified, revert the named files or directories
2418 With no revision specified, revert the named files or directories
2419 to the contents they had in the parent of the working directory.
2419 to the contents they had in the parent of the working directory.
2420 This restores the contents of the affected files to an unmodified
2420 This restores the contents of the affected files to an unmodified
2421 state. If the working directory has two parents, you must
2421 state. If the working directory has two parents, you must
2422 explicitly specify the revision to revert to.
2422 explicitly specify the revision to revert to.
2423
2423
2424 Modified files are saved with a .orig suffix before reverting.
2424 Modified files are saved with a .orig suffix before reverting.
2425 To disable these backups, use --no-backup.
2425 To disable these backups, use --no-backup.
2426
2426
2427 Using the -r option, revert the given files or directories to
2427 Using the -r option, revert the given files or directories to
2428 their contents as of a specific revision. This can be helpful to"roll
2428 their contents as of a specific revision. This can be helpful to"roll
2429 back" some or all of a change that should not have been committed.
2429 back" some or all of a change that should not have been committed.
2430
2430
2431 Revert modifies the working directory. It does not commit any
2431 Revert modifies the working directory. It does not commit any
2432 changes, or change the parent of the working directory. If you
2432 changes, or change the parent of the working directory. If you
2433 revert to a revision other than the parent of the working
2433 revert to a revision other than the parent of the working
2434 directory, the reverted files will thus appear modified
2434 directory, the reverted files will thus appear modified
2435 afterwards.
2435 afterwards.
2436
2436
2437 If a file has been deleted, it is recreated. If the executable
2437 If a file has been deleted, it is recreated. If the executable
2438 mode of a file was changed, it is reset.
2438 mode of a file was changed, it is reset.
2439
2439
2440 If names are given, all files matching the names are reverted.
2440 If names are given, all files matching the names are reverted.
2441
2441
2442 If no arguments are given, all files in the repository are reverted.
2442 If no arguments are given, all files in the repository are reverted.
2443 """
2443 """
2444 parent, p2 = repo.dirstate.parents()
2444 parent, p2 = repo.dirstate.parents()
2445 if opts['rev']:
2445 if opts['rev']:
2446 node = repo.lookup(opts['rev'])
2446 node = repo.lookup(opts['rev'])
2447 elif p2 != nullid:
2447 elif p2 != nullid:
2448 raise util.Abort(_('working dir has two parents; '
2448 raise util.Abort(_('working dir has two parents; '
2449 'you must specify the revision to revert to'))
2449 'you must specify the revision to revert to'))
2450 else:
2450 else:
2451 node = parent
2451 node = parent
2452 mf = repo.manifest.read(repo.changelog.read(node)[0])
2452 mf = repo.manifest.read(repo.changelog.read(node)[0])
2453 if node == parent:
2453 if node == parent:
2454 pmf = mf
2454 pmf = mf
2455 else:
2455 else:
2456 pmf = None
2456 pmf = None
2457
2457
2458 wlock = repo.wlock()
2458 wlock = repo.wlock()
2459
2459
2460 # need all matching names in dirstate and manifest of target rev,
2460 # need all matching names in dirstate and manifest of target rev,
2461 # so have to walk both. do not print errors if files exist in one
2461 # so have to walk both. do not print errors if files exist in one
2462 # but not other.
2462 # but not other.
2463
2463
2464 names = {}
2464 names = {}
2465 target_only = {}
2465 target_only = {}
2466
2466
2467 # walk dirstate.
2467 # walk dirstate.
2468
2468
2469 for src, abs, rel, exact in walk(repo, pats, opts, badmatch=mf.has_key):
2469 for src, abs, rel, exact in walk(repo, pats, opts, badmatch=mf.has_key):
2470 names[abs] = (rel, exact)
2470 names[abs] = (rel, exact)
2471 if src == 'b':
2471 if src == 'b':
2472 target_only[abs] = True
2472 target_only[abs] = True
2473
2473
2474 # walk target manifest.
2474 # walk target manifest.
2475
2475
2476 for src, abs, rel, exact in walk(repo, pats, opts, node=node,
2476 for src, abs, rel, exact in walk(repo, pats, opts, node=node,
2477 badmatch=names.has_key):
2477 badmatch=names.has_key):
2478 if abs in names: continue
2478 if abs in names: continue
2479 names[abs] = (rel, exact)
2479 names[abs] = (rel, exact)
2480 target_only[abs] = True
2480 target_only[abs] = True
2481
2481
2482 changes = repo.changes(match=names.has_key, wlock=wlock)
2482 changes = repo.changes(match=names.has_key, wlock=wlock)
2483 modified, added, removed, deleted, unknown = map(dict.fromkeys, changes)
2483 modified, added, removed, deleted, unknown = map(dict.fromkeys, changes)
2484
2484
2485 revert = ([], _('reverting %s\n'))
2485 revert = ([], _('reverting %s\n'))
2486 add = ([], _('adding %s\n'))
2486 add = ([], _('adding %s\n'))
2487 remove = ([], _('removing %s\n'))
2487 remove = ([], _('removing %s\n'))
2488 forget = ([], _('forgetting %s\n'))
2488 forget = ([], _('forgetting %s\n'))
2489 undelete = ([], _('undeleting %s\n'))
2489 undelete = ([], _('undeleting %s\n'))
2490 update = {}
2490 update = {}
2491
2491
2492 disptable = (
2492 disptable = (
2493 # dispatch table:
2493 # dispatch table:
2494 # file state
2494 # file state
2495 # action if in target manifest
2495 # action if in target manifest
2496 # action if not in target manifest
2496 # action if not in target manifest
2497 # make backup if in target manifest
2497 # make backup if in target manifest
2498 # make backup if not in target manifest
2498 # make backup if not in target manifest
2499 (modified, revert, remove, True, True),
2499 (modified, revert, remove, True, True),
2500 (added, revert, forget, True, False),
2500 (added, revert, forget, True, False),
2501 (removed, undelete, None, False, False),
2501 (removed, undelete, None, False, False),
2502 (deleted, revert, remove, False, False),
2502 (deleted, revert, remove, False, False),
2503 (unknown, add, None, True, False),
2503 (unknown, add, None, True, False),
2504 (target_only, add, None, False, False),
2504 (target_only, add, None, False, False),
2505 )
2505 )
2506
2506
2507 entries = names.items()
2507 entries = names.items()
2508 entries.sort()
2508 entries.sort()
2509
2509
2510 for abs, (rel, exact) in entries:
2510 for abs, (rel, exact) in entries:
2511 mfentry = mf.get(abs)
2511 mfentry = mf.get(abs)
2512 def handle(xlist, dobackup):
2512 def handle(xlist, dobackup):
2513 xlist[0].append(abs)
2513 xlist[0].append(abs)
2514 update[abs] = 1
2514 update[abs] = 1
2515 if dobackup and not opts['no_backup'] and os.path.exists(rel):
2515 if dobackup and not opts['no_backup'] and os.path.exists(rel):
2516 bakname = "%s.orig" % rel
2516 bakname = "%s.orig" % rel
2517 ui.note(_('saving current version of %s as %s\n') %
2517 ui.note(_('saving current version of %s as %s\n') %
2518 (rel, bakname))
2518 (rel, bakname))
2519 if not opts.get('dry_run'):
2519 if not opts.get('dry_run'):
2520 shutil.copyfile(rel, bakname)
2520 shutil.copyfile(rel, bakname)
2521 shutil.copymode(rel, bakname)
2521 shutil.copymode(rel, bakname)
2522 if ui.verbose or not exact:
2522 if ui.verbose or not exact:
2523 ui.status(xlist[1] % rel)
2523 ui.status(xlist[1] % rel)
2524 for table, hitlist, misslist, backuphit, backupmiss in disptable:
2524 for table, hitlist, misslist, backuphit, backupmiss in disptable:
2525 if abs not in table: continue
2525 if abs not in table: continue
2526 # file has changed in dirstate
2526 # file has changed in dirstate
2527 if mfentry:
2527 if mfentry:
2528 handle(hitlist, backuphit)
2528 handle(hitlist, backuphit)
2529 elif misslist is not None:
2529 elif misslist is not None:
2530 handle(misslist, backupmiss)
2530 handle(misslist, backupmiss)
2531 else:
2531 else:
2532 if exact: ui.warn(_('file not managed: %s\n' % rel))
2532 if exact: ui.warn(_('file not managed: %s\n' % rel))
2533 break
2533 break
2534 else:
2534 else:
2535 # file has not changed in dirstate
2535 # file has not changed in dirstate
2536 if node == parent:
2536 if node == parent:
2537 if exact: ui.warn(_('no changes needed to %s\n' % rel))
2537 if exact: ui.warn(_('no changes needed to %s\n' % rel))
2538 continue
2538 continue
2539 if pmf is None:
2539 if pmf is None:
2540 # only need parent manifest in this unlikely case,
2540 # only need parent manifest in this unlikely case,
2541 # so do not read by default
2541 # so do not read by default
2542 pmf = repo.manifest.read(repo.changelog.read(parent)[0])
2542 pmf = repo.manifest.read(repo.changelog.read(parent)[0])
2543 if abs in pmf:
2543 if abs in pmf:
2544 if mfentry:
2544 if mfentry:
2545 # if version of file is same in parent and target
2545 # if version of file is same in parent and target
2546 # manifests, do nothing
2546 # manifests, do nothing
2547 if pmf[abs] != mfentry:
2547 if pmf[abs] != mfentry:
2548 handle(revert, False)
2548 handle(revert, False)
2549 else:
2549 else:
2550 handle(remove, False)
2550 handle(remove, False)
2551
2551
2552 if not opts.get('dry_run'):
2552 if not opts.get('dry_run'):
2553 repo.dirstate.forget(forget[0])
2553 repo.dirstate.forget(forget[0])
2554 r = repo.update(node, False, True, update.has_key, False, wlock=wlock,
2554 r = repo.update(node, False, True, update.has_key, False, wlock=wlock,
2555 show_stats=False)
2555 show_stats=False)
2556 repo.dirstate.update(add[0], 'a')
2556 repo.dirstate.update(add[0], 'a')
2557 repo.dirstate.update(undelete[0], 'n')
2557 repo.dirstate.update(undelete[0], 'n')
2558 repo.dirstate.update(remove[0], 'r')
2558 repo.dirstate.update(remove[0], 'r')
2559 return r
2559 return r
2560
2560
2561 def rollback(ui, repo):
2561 def rollback(ui, repo):
2562 """roll back the last transaction in this repository
2562 """roll back the last transaction in this repository
2563
2563
2564 Roll back the last transaction in this repository, restoring the
2564 Roll back the last transaction in this repository, restoring the
2565 project to its state prior to the transaction.
2565 project to its state prior to the transaction.
2566
2566
2567 Transactions are used to encapsulate the effects of all commands
2567 Transactions are used to encapsulate the effects of all commands
2568 that create new changesets or propagate existing changesets into a
2568 that create new changesets or propagate existing changesets into a
2569 repository. For example, the following commands are transactional,
2569 repository. For example, the following commands are transactional,
2570 and their effects can be rolled back:
2570 and their effects can be rolled back:
2571
2571
2572 commit
2572 commit
2573 import
2573 import
2574 pull
2574 pull
2575 push (with this repository as destination)
2575 push (with this repository as destination)
2576 unbundle
2576 unbundle
2577
2577
2578 This command should be used with care. There is only one level of
2578 This command should be used with care. There is only one level of
2579 rollback, and there is no way to undo a rollback.
2579 rollback, and there is no way to undo a rollback.
2580
2580
2581 This command is not intended for use on public repositories. Once
2581 This command is not intended for use on public repositories. Once
2582 changes are visible for pull by other users, rolling a transaction
2582 changes are visible for pull by other users, rolling a transaction
2583 back locally is ineffective (someone else may already have pulled
2583 back locally is ineffective (someone else may already have pulled
2584 the changes). Furthermore, a race is possible with readers of the
2584 the changes). Furthermore, a race is possible with readers of the
2585 repository; for example an in-progress pull from the repository
2585 repository; for example an in-progress pull from the repository
2586 may fail if a rollback is performed.
2586 may fail if a rollback is performed.
2587 """
2587 """
2588 repo.rollback()
2588 repo.rollback()
2589
2589
2590 def root(ui, repo):
2590 def root(ui, repo):
2591 """print the root (top) of the current working dir
2591 """print the root (top) of the current working dir
2592
2592
2593 Print the root directory of the current repository.
2593 Print the root directory of the current repository.
2594 """
2594 """
2595 ui.write(repo.root + "\n")
2595 ui.write(repo.root + "\n")
2596
2596
2597 def serve(ui, repo, **opts):
2597 def serve(ui, repo, **opts):
2598 """export the repository via HTTP
2598 """export the repository via HTTP
2599
2599
2600 Start a local HTTP repository browser and pull server.
2600 Start a local HTTP repository browser and pull server.
2601
2601
2602 By default, the server logs accesses to stdout and errors to
2602 By default, the server logs accesses to stdout and errors to
2603 stderr. Use the "-A" and "-E" options to log to files.
2603 stderr. Use the "-A" and "-E" options to log to files.
2604 """
2604 """
2605
2605
2606 if opts["stdio"]:
2606 if opts["stdio"]:
2607 if repo is None:
2607 if repo is None:
2608 raise hg.RepoError(_('no repo found'))
2608 raise hg.RepoError(_('no repo found'))
2609 s = sshserver.sshserver(ui, repo)
2609 s = sshserver.sshserver(ui, repo)
2610 s.serve_forever()
2610 s.serve_forever()
2611
2611
2612 optlist = ("name templates style address port ipv6"
2612 optlist = ("name templates style address port ipv6"
2613 " accesslog errorlog webdir_conf")
2613 " accesslog errorlog webdir_conf")
2614 for o in optlist.split():
2614 for o in optlist.split():
2615 if opts[o]:
2615 if opts[o]:
2616 ui.setconfig("web", o, opts[o])
2616 ui.setconfig("web", o, opts[o])
2617
2617
2618 if repo is None and not ui.config("web", "webdir_conf"):
2618 if repo is None and not ui.config("web", "webdir_conf"):
2619 raise hg.RepoError(_('no repo found'))
2619 raise hg.RepoError(_('no repo found'))
2620
2620
2621 if opts['daemon'] and not opts['daemon_pipefds']:
2621 if opts['daemon'] and not opts['daemon_pipefds']:
2622 rfd, wfd = os.pipe()
2622 rfd, wfd = os.pipe()
2623 args = sys.argv[:]
2623 args = sys.argv[:]
2624 args.append('--daemon-pipefds=%d,%d' % (rfd, wfd))
2624 args.append('--daemon-pipefds=%d,%d' % (rfd, wfd))
2625 pid = os.spawnvp(os.P_NOWAIT | getattr(os, 'P_DETACH', 0),
2625 pid = os.spawnvp(os.P_NOWAIT | getattr(os, 'P_DETACH', 0),
2626 args[0], args)
2626 args[0], args)
2627 os.close(wfd)
2627 os.close(wfd)
2628 os.read(rfd, 1)
2628 os.read(rfd, 1)
2629 os._exit(0)
2629 os._exit(0)
2630
2630
2631 try:
2631 try:
2632 httpd = hgweb.server.create_server(ui, repo)
2632 httpd = hgweb.server.create_server(ui, repo)
2633 except socket.error, inst:
2633 except socket.error, inst:
2634 raise util.Abort(_('cannot start server: ') + inst.args[1])
2634 raise util.Abort(_('cannot start server: ') + inst.args[1])
2635
2635
2636 if ui.verbose:
2636 if ui.verbose:
2637 addr, port = httpd.socket.getsockname()
2637 addr, port = httpd.socket.getsockname()
2638 if addr == '0.0.0.0':
2638 if addr == '0.0.0.0':
2639 addr = socket.gethostname()
2639 addr = socket.gethostname()
2640 else:
2640 else:
2641 try:
2641 try:
2642 addr = socket.gethostbyaddr(addr)[0]
2642 addr = socket.gethostbyaddr(addr)[0]
2643 except socket.error:
2643 except socket.error:
2644 pass
2644 pass
2645 if port != 80:
2645 if port != 80:
2646 ui.status(_('listening at http://%s:%d/\n') % (addr, port))
2646 ui.status(_('listening at http://%s:%d/\n') % (addr, port))
2647 else:
2647 else:
2648 ui.status(_('listening at http://%s/\n') % addr)
2648 ui.status(_('listening at http://%s/\n') % addr)
2649
2649
2650 if opts['pid_file']:
2650 if opts['pid_file']:
2651 fp = open(opts['pid_file'], 'w')
2651 fp = open(opts['pid_file'], 'w')
2652 fp.write(str(os.getpid()))
2652 fp.write(str(os.getpid()))
2653 fp.close()
2653 fp.close()
2654
2654
2655 if opts['daemon_pipefds']:
2655 if opts['daemon_pipefds']:
2656 rfd, wfd = [int(x) for x in opts['daemon_pipefds'].split(',')]
2656 rfd, wfd = [int(x) for x in opts['daemon_pipefds'].split(',')]
2657 os.close(rfd)
2657 os.close(rfd)
2658 os.write(wfd, 'y')
2658 os.write(wfd, 'y')
2659 os.close(wfd)
2659 os.close(wfd)
2660 sys.stdout.flush()
2660 sys.stdout.flush()
2661 sys.stderr.flush()
2661 sys.stderr.flush()
2662 fd = os.open(util.nulldev, os.O_RDWR)
2662 fd = os.open(util.nulldev, os.O_RDWR)
2663 if fd != 0: os.dup2(fd, 0)
2663 if fd != 0: os.dup2(fd, 0)
2664 if fd != 1: os.dup2(fd, 1)
2664 if fd != 1: os.dup2(fd, 1)
2665 if fd != 2: os.dup2(fd, 2)
2665 if fd != 2: os.dup2(fd, 2)
2666 if fd not in (0, 1, 2): os.close(fd)
2666 if fd not in (0, 1, 2): os.close(fd)
2667
2667
2668 httpd.serve_forever()
2668 httpd.serve_forever()
2669
2669
2670 def status(ui, repo, *pats, **opts):
2670 def status(ui, repo, *pats, **opts):
2671 """show changed files in the working directory
2671 """show changed files in the working directory
2672
2672
2673 Show changed files in the repository. If names are
2673 Show changed files in the repository. If names are
2674 given, only files that match are shown.
2674 given, only files that match are shown.
2675
2675
2676 The codes used to show the status of files are:
2676 The codes used to show the status of files are:
2677 M = modified
2677 M = modified
2678 A = added
2678 A = added
2679 R = removed
2679 R = removed
2680 ! = deleted, but still tracked
2680 ! = deleted, but still tracked
2681 ? = not tracked
2681 ? = not tracked
2682 I = ignored (not shown by default)
2682 I = ignored (not shown by default)
2683 """
2683 """
2684
2684
2685 show_ignored = opts['ignored'] and True or False
2685 show_ignored = opts['ignored'] and True or False
2686 files, matchfn, anypats = matchpats(repo, pats, opts)
2686 files, matchfn, anypats = matchpats(repo, pats, opts)
2687 cwd = (pats and repo.getcwd()) or ''
2687 cwd = (pats and repo.getcwd()) or ''
2688 modified, added, removed, deleted, unknown, ignored = [
2688 modified, added, removed, deleted, unknown, ignored = [
2689 [util.pathto(cwd, x) for x in n]
2689 [util.pathto(cwd, x) for x in n]
2690 for n in repo.changes(files=files, match=matchfn,
2690 for n in repo.changes(files=files, match=matchfn,
2691 show_ignored=show_ignored)]
2691 show_ignored=show_ignored)]
2692
2692
2693 changetypes = [('modified', 'M', modified),
2693 changetypes = [('modified', 'M', modified),
2694 ('added', 'A', added),
2694 ('added', 'A', added),
2695 ('removed', 'R', removed),
2695 ('removed', 'R', removed),
2696 ('deleted', '!', deleted),
2696 ('deleted', '!', deleted),
2697 ('unknown', '?', unknown),
2697 ('unknown', '?', unknown),
2698 ('ignored', 'I', ignored)]
2698 ('ignored', 'I', ignored)]
2699
2699
2700 end = opts['print0'] and '\0' or '\n'
2700 end = opts['print0'] and '\0' or '\n'
2701
2701
2702 for opt, char, changes in ([ct for ct in changetypes if opts[ct[0]]]
2702 for opt, char, changes in ([ct for ct in changetypes if opts[ct[0]]]
2703 or changetypes):
2703 or changetypes):
2704 if opts['no_status']:
2704 if opts['no_status']:
2705 format = "%%s%s" % end
2705 format = "%%s%s" % end
2706 else:
2706 else:
2707 format = "%s %%s%s" % (char, end)
2707 format = "%s %%s%s" % (char, end)
2708
2708
2709 for f in changes:
2709 for f in changes:
2710 ui.write(format % f)
2710 ui.write(format % f)
2711
2711
2712 def tag(ui, repo, name, rev_=None, **opts):
2712 def tag(ui, repo, name, rev_=None, **opts):
2713 """add a tag for the current tip or a given revision
2713 """add a tag for the current tip or a given revision
2714
2714
2715 Name a particular revision using <name>.
2715 Name a particular revision using <name>.
2716
2716
2717 Tags are used to name particular revisions of the repository and are
2717 Tags are used to name particular revisions of the repository and are
2718 very useful to compare different revision, to go back to significant
2718 very useful to compare different revision, to go back to significant
2719 earlier versions or to mark branch points as releases, etc.
2719 earlier versions or to mark branch points as releases, etc.
2720
2720
2721 If no revision is given, the tip is used.
2721 If no revision is given, the tip is used.
2722
2722
2723 To facilitate version control, distribution, and merging of tags,
2723 To facilitate version control, distribution, and merging of tags,
2724 they are stored as a file named ".hgtags" which is managed
2724 they are stored as a file named ".hgtags" which is managed
2725 similarly to other project files and can be hand-edited if
2725 similarly to other project files and can be hand-edited if
2726 necessary. The file '.hg/localtags' is used for local tags (not
2726 necessary. The file '.hg/localtags' is used for local tags (not
2727 shared among repositories).
2727 shared among repositories).
2728 """
2728 """
2729 if name == "tip":
2729 if name == "tip":
2730 raise util.Abort(_("the name 'tip' is reserved"))
2730 raise util.Abort(_("the name 'tip' is reserved"))
2731 if rev_ is not None:
2731 if rev_ is not None:
2732 ui.warn(_("use of 'hg tag NAME [REV]' is deprecated, "
2732 ui.warn(_("use of 'hg tag NAME [REV]' is deprecated, "
2733 "please use 'hg tag [-r REV] NAME' instead\n"))
2733 "please use 'hg tag [-r REV] NAME' instead\n"))
2734 if opts['rev']:
2734 if opts['rev']:
2735 raise util.Abort(_("use only one form to specify the revision"))
2735 raise util.Abort(_("use only one form to specify the revision"))
2736 if opts['rev']:
2736 if opts['rev']:
2737 rev_ = opts['rev']
2737 rev_ = opts['rev']
2738 if rev_:
2738 if rev_:
2739 r = hex(repo.lookup(rev_))
2739 r = hex(repo.lookup(rev_))
2740 else:
2740 else:
2741 r = hex(repo.changelog.tip())
2741 r = hex(repo.changelog.tip())
2742
2742
2743 disallowed = (revrangesep, '\r', '\n')
2743 disallowed = (revrangesep, '\r', '\n')
2744 for c in disallowed:
2744 for c in disallowed:
2745 if name.find(c) >= 0:
2745 if name.find(c) >= 0:
2746 raise util.Abort(_("%s cannot be used in a tag name") % repr(c))
2746 raise util.Abort(_("%s cannot be used in a tag name") % repr(c))
2747
2747
2748 repo.hook('pretag', throw=True, node=r, tag=name,
2748 repo.hook('pretag', throw=True, node=r, tag=name,
2749 local=int(not not opts['local']))
2749 local=int(not not opts['local']))
2750
2750
2751 if opts['local']:
2751 if opts['local']:
2752 repo.opener("localtags", "a").write("%s %s\n" % (r, name))
2752 repo.opener("localtags", "a").write("%s %s\n" % (r, name))
2753 repo.hook('tag', node=r, tag=name, local=1)
2753 repo.hook('tag', node=r, tag=name, local=1)
2754 return
2754 return
2755
2755
2756 for x in repo.changes():
2756 for x in repo.changes():
2757 if ".hgtags" in x:
2757 if ".hgtags" in x:
2758 raise util.Abort(_("working copy of .hgtags is changed "
2758 raise util.Abort(_("working copy of .hgtags is changed "
2759 "(please commit .hgtags manually)"))
2759 "(please commit .hgtags manually)"))
2760
2760
2761 repo.wfile(".hgtags", "ab").write("%s %s\n" % (r, name))
2761 repo.wfile(".hgtags", "ab").write("%s %s\n" % (r, name))
2762 if repo.dirstate.state(".hgtags") == '?':
2762 if repo.dirstate.state(".hgtags") == '?':
2763 repo.add([".hgtags"])
2763 repo.add([".hgtags"])
2764
2764
2765 message = (opts['message'] or
2765 message = (opts['message'] or
2766 _("Added tag %s for changeset %s") % (name, r))
2766 _("Added tag %s for changeset %s") % (name, r))
2767 try:
2767 try:
2768 repo.commit([".hgtags"], message, opts['user'], opts['date'])
2768 repo.commit([".hgtags"], message, opts['user'], opts['date'])
2769 repo.hook('tag', node=r, tag=name, local=0)
2769 repo.hook('tag', node=r, tag=name, local=0)
2770 except ValueError, inst:
2770 except ValueError, inst:
2771 raise util.Abort(str(inst))
2771 raise util.Abort(str(inst))
2772
2772
2773 def tags(ui, repo):
2773 def tags(ui, repo):
2774 """list repository tags
2774 """list repository tags
2775
2775
2776 List the repository tags.
2776 List the repository tags.
2777
2777
2778 This lists both regular and local tags.
2778 This lists both regular and local tags.
2779 """
2779 """
2780
2780
2781 l = repo.tagslist()
2781 l = repo.tagslist()
2782 l.reverse()
2782 l.reverse()
2783 for t, n in l:
2783 for t, n in l:
2784 try:
2784 try:
2785 r = "%5d:%s" % (repo.changelog.rev(n), hex(n))
2785 r = "%5d:%s" % (repo.changelog.rev(n), hex(n))
2786 except KeyError:
2786 except KeyError:
2787 r = " ?:?"
2787 r = " ?:?"
2788 if ui.quiet:
2788 if ui.quiet:
2789 ui.write("%s\n" % t)
2789 ui.write("%s\n" % t)
2790 else:
2790 else:
2791 ui.write("%-30s %s\n" % (t, r))
2791 ui.write("%-30s %s\n" % (t, r))
2792
2792
2793 def tip(ui, repo, **opts):
2793 def tip(ui, repo, **opts):
2794 """show the tip revision
2794 """show the tip revision
2795
2795
2796 Show the tip revision.
2796 Show the tip revision.
2797 """
2797 """
2798 n = repo.changelog.tip()
2798 n = repo.changelog.tip()
2799 br = None
2799 br = None
2800 if opts['branches']:
2800 if opts['branches']:
2801 br = repo.branchlookup([n])
2801 br = repo.branchlookup([n])
2802 show_changeset(ui, repo, opts).show(changenode=n, brinfo=br)
2802 show_changeset(ui, repo, opts).show(changenode=n, brinfo=br)
2803 if opts['patch']:
2803 if opts['patch']:
2804 dodiff(ui, ui, repo, repo.changelog.parents(n)[0], n)
2804 dodiff(ui, ui, repo, repo.changelog.parents(n)[0], n)
2805
2805
2806 def unbundle(ui, repo, fname, **opts):
2806 def unbundle(ui, repo, fname, **opts):
2807 """apply a changegroup file
2807 """apply a changegroup file
2808
2808
2809 Apply a compressed changegroup file generated by the bundle
2809 Apply a compressed changegroup file generated by the bundle
2810 command.
2810 command.
2811 """
2811 """
2812 f = urllib.urlopen(fname)
2812 f = urllib.urlopen(fname)
2813
2813
2814 header = f.read(6)
2814 header = f.read(6)
2815 if not header.startswith("HG"):
2815 if not header.startswith("HG"):
2816 raise util.Abort(_("%s: not a Mercurial bundle file") % fname)
2816 raise util.Abort(_("%s: not a Mercurial bundle file") % fname)
2817 elif not header.startswith("HG10"):
2817 elif not header.startswith("HG10"):
2818 raise util.Abort(_("%s: unknown bundle version") % fname)
2818 raise util.Abort(_("%s: unknown bundle version") % fname)
2819 elif header == "HG10BZ":
2819 elif header == "HG10BZ":
2820 def generator(f):
2820 def generator(f):
2821 zd = bz2.BZ2Decompressor()
2821 zd = bz2.BZ2Decompressor()
2822 zd.decompress("BZ")
2822 zd.decompress("BZ")
2823 for chunk in f:
2823 for chunk in f:
2824 yield zd.decompress(chunk)
2824 yield zd.decompress(chunk)
2825 elif header == "HG10UN":
2825 elif header == "HG10UN":
2826 def generator(f):
2826 def generator(f):
2827 for chunk in f:
2827 for chunk in f:
2828 yield chunk
2828 yield chunk
2829 else:
2829 else:
2830 raise util.Abort(_("%s: unknown bundle compression type")
2830 raise util.Abort(_("%s: unknown bundle compression type")
2831 % fname)
2831 % fname)
2832 gen = generator(util.filechunkiter(f, 4096))
2832 gen = generator(util.filechunkiter(f, 4096))
2833 modheads = repo.addchangegroup(util.chunkbuffer(gen), 'unbundle')
2833 modheads = repo.addchangegroup(util.chunkbuffer(gen), 'unbundle')
2834 return postincoming(ui, repo, modheads, opts['update'])
2834 return postincoming(ui, repo, modheads, opts['update'])
2835
2835
2836 def undo(ui, repo):
2836 def undo(ui, repo):
2837 """undo the last commit or pull (DEPRECATED)
2837 """undo the last commit or pull (DEPRECATED)
2838
2838
2839 (DEPRECATED)
2839 (DEPRECATED)
2840 This command is now deprecated and will be removed in a future
2840 This command is now deprecated and will be removed in a future
2841 release. Please use the rollback command instead. For usage
2841 release. Please use the rollback command instead. For usage
2842 instructions, see the rollback command.
2842 instructions, see the rollback command.
2843 """
2843 """
2844 ui.warn(_('(the undo command is deprecated; use rollback instead)\n'))
2844 ui.warn(_('(the undo command is deprecated; use rollback instead)\n'))
2845 repo.rollback()
2845 repo.rollback()
2846
2846
2847 def update(ui, repo, node=None, merge=False, clean=False, force=None,
2847 def update(ui, repo, node=None, merge=False, clean=False, force=None,
2848 branch=None, **opts):
2848 branch=None, **opts):
2849 """update or merge working directory
2849 """update or merge working directory
2850
2850
2851 Update the working directory to the specified revision.
2851 Update the working directory to the specified revision.
2852
2852
2853 If there are no outstanding changes in the working directory and
2853 If there are no outstanding changes in the working directory and
2854 there is a linear relationship between the current version and the
2854 there is a linear relationship between the current version and the
2855 requested version, the result is the requested version.
2855 requested version, the result is the requested version.
2856
2856
2857 To merge the working directory with another revision, use the
2857 To merge the working directory with another revision, use the
2858 merge command.
2858 merge command.
2859
2859
2860 By default, update will refuse to run if doing so would require
2860 By default, update will refuse to run if doing so would require
2861 merging or discarding local changes.
2861 merging or discarding local changes.
2862 """
2862 """
2863 if merge:
2863 if merge:
2864 ui.warn(_('(the -m/--merge option is deprecated; '
2864 ui.warn(_('(the -m/--merge option is deprecated; '
2865 'use the merge command instead)\n'))
2865 'use the merge command instead)\n'))
2866 return doupdate(ui, repo, node, merge, clean, force, branch, **opts)
2866 return doupdate(ui, repo, node, merge, clean, force, branch, **opts)
2867
2867
2868 def doupdate(ui, repo, node=None, merge=False, clean=False, force=None,
2868 def doupdate(ui, repo, node=None, merge=False, clean=False, force=None,
2869 branch=None, **opts):
2869 branch=None, **opts):
2870 if branch:
2870 if branch:
2871 br = repo.branchlookup(branch=branch)
2871 br = repo.branchlookup(branch=branch)
2872 found = []
2872 found = []
2873 for x in br:
2873 for x in br:
2874 if branch in br[x]:
2874 if branch in br[x]:
2875 found.append(x)
2875 found.append(x)
2876 if len(found) > 1:
2876 if len(found) > 1:
2877 ui.warn(_("Found multiple heads for %s\n") % branch)
2877 ui.warn(_("Found multiple heads for %s\n") % branch)
2878 for x in found:
2878 for x in found:
2879 show_changeset(ui, repo, opts).show(changenode=x, brinfo=br)
2879 show_changeset(ui, repo, opts).show(changenode=x, brinfo=br)
2880 return 1
2880 return 1
2881 if len(found) == 1:
2881 if len(found) == 1:
2882 node = found[0]
2882 node = found[0]
2883 ui.warn(_("Using head %s for branch %s\n") % (short(node), branch))
2883 ui.warn(_("Using head %s for branch %s\n") % (short(node), branch))
2884 else:
2884 else:
2885 ui.warn(_("branch %s not found\n") % (branch))
2885 ui.warn(_("branch %s not found\n") % (branch))
2886 return 1
2886 return 1
2887 else:
2887 else:
2888 node = node and repo.lookup(node) or repo.changelog.tip()
2888 node = node and repo.lookup(node) or repo.changelog.tip()
2889 return repo.update(node, allow=merge, force=clean, forcemerge=force)
2889 return repo.update(node, allow=merge, force=clean, forcemerge=force)
2890
2890
2891 def verify(ui, repo):
2891 def verify(ui, repo):
2892 """verify the integrity of the repository
2892 """verify the integrity of the repository
2893
2893
2894 Verify the integrity of the current repository.
2894 Verify the integrity of the current repository.
2895
2895
2896 This will perform an extensive check of the repository's
2896 This will perform an extensive check of the repository's
2897 integrity, validating the hashes and checksums of each entry in
2897 integrity, validating the hashes and checksums of each entry in
2898 the changelog, manifest, and tracked files, as well as the
2898 the changelog, manifest, and tracked files, as well as the
2899 integrity of their crosslinks and indices.
2899 integrity of their crosslinks and indices.
2900 """
2900 """
2901 return repo.verify()
2901 return repo.verify()
2902
2902
2903 # Command options and aliases are listed here, alphabetically
2903 # Command options and aliases are listed here, alphabetically
2904
2904
2905 table = {
2905 table = {
2906 "^add":
2906 "^add":
2907 (add,
2907 (add,
2908 [('I', 'include', [], _('include names matching the given patterns')),
2908 [('I', 'include', [], _('include names matching the given patterns')),
2909 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2909 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2910 ('n', 'dry-run', None, _('do not perform actions, just print output'))],
2910 ('n', 'dry-run', None, _('do not perform actions, just print output'))],
2911 _('hg add [OPTION]... [FILE]...')),
2911 _('hg add [OPTION]... [FILE]...')),
2912 "debugaddremove|addremove":
2912 "debugaddremove|addremove":
2913 (addremove,
2913 (addremove,
2914 [('I', 'include', [], _('include names matching the given patterns')),
2914 [('I', 'include', [], _('include names matching the given patterns')),
2915 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2915 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2916 ('n', 'dry-run', None, _('do not perform actions, just print output'))],
2916 ('n', 'dry-run', None, _('do not perform actions, just print output'))],
2917 _('hg addremove [OPTION]... [FILE]...')),
2917 _('hg addremove [OPTION]... [FILE]...')),
2918 "^annotate":
2918 "^annotate":
2919 (annotate,
2919 (annotate,
2920 [('r', 'rev', '', _('annotate the specified revision')),
2920 [('r', 'rev', '', _('annotate the specified revision')),
2921 ('a', 'text', None, _('treat all files as text')),
2921 ('a', 'text', None, _('treat all files as text')),
2922 ('u', 'user', None, _('list the author')),
2922 ('u', 'user', None, _('list the author')),
2923 ('d', 'date', None, _('list the date')),
2923 ('d', 'date', None, _('list the date')),
2924 ('n', 'number', None, _('list the revision number (default)')),
2924 ('n', 'number', None, _('list the revision number (default)')),
2925 ('c', 'changeset', None, _('list the changeset')),
2925 ('c', 'changeset', None, _('list the changeset')),
2926 ('I', 'include', [], _('include names matching the given patterns')),
2926 ('I', 'include', [], _('include names matching the given patterns')),
2927 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2927 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2928 _('hg annotate [-r REV] [-a] [-u] [-d] [-n] [-c] FILE...')),
2928 _('hg annotate [-r REV] [-a] [-u] [-d] [-n] [-c] FILE...')),
2929 "archive":
2929 "archive":
2930 (archive,
2930 (archive,
2931 [('', 'no-decode', None, _('do not pass files through decoders')),
2931 [('', 'no-decode', None, _('do not pass files through decoders')),
2932 ('p', 'prefix', '', _('directory prefix for files in archive')),
2932 ('p', 'prefix', '', _('directory prefix for files in archive')),
2933 ('r', 'rev', '', _('revision to distribute')),
2933 ('r', 'rev', '', _('revision to distribute')),
2934 ('t', 'type', '', _('type of distribution to create')),
2934 ('t', 'type', '', _('type of distribution to create')),
2935 ('I', 'include', [], _('include names matching the given patterns')),
2935 ('I', 'include', [], _('include names matching the given patterns')),
2936 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2936 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2937 _('hg archive [OPTION]... DEST')),
2937 _('hg archive [OPTION]... DEST')),
2938 "backout":
2938 "backout":
2939 (backout,
2939 (backout,
2940 [('', 'merge', None,
2940 [('', 'merge', None,
2941 _('merge with old dirstate parent after backout')),
2941 _('merge with old dirstate parent after backout')),
2942 ('m', 'message', '', _('use <text> as commit message')),
2942 ('m', 'message', '', _('use <text> as commit message')),
2943 ('l', 'logfile', '', _('read commit message from <file>')),
2943 ('l', 'logfile', '', _('read commit message from <file>')),
2944 ('d', 'date', '', _('record datecode as commit date')),
2944 ('d', 'date', '', _('record datecode as commit date')),
2945 ('u', 'user', '', _('record user as committer')),
2945 ('u', 'user', '', _('record user as committer')),
2946 ('I', 'include', [], _('include names matching the given patterns')),
2946 ('I', 'include', [], _('include names matching the given patterns')),
2947 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2947 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2948 _('hg backout [OPTION]... REV')),
2948 _('hg backout [OPTION]... REV')),
2949 "bundle":
2949 "bundle":
2950 (bundle,
2950 (bundle,
2951 [('f', 'force', None,
2951 [('f', 'force', None,
2952 _('run even when remote repository is unrelated'))],
2952 _('run even when remote repository is unrelated'))],
2953 _('hg bundle FILE DEST')),
2953 _('hg bundle FILE DEST')),
2954 "cat":
2954 "cat":
2955 (cat,
2955 (cat,
2956 [('o', 'output', '', _('print output to file with formatted name')),
2956 [('o', 'output', '', _('print output to file with formatted name')),
2957 ('r', 'rev', '', _('print the given revision')),
2957 ('r', 'rev', '', _('print the given revision')),
2958 ('I', 'include', [], _('include names matching the given patterns')),
2958 ('I', 'include', [], _('include names matching the given patterns')),
2959 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2959 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2960 _('hg cat [OPTION]... FILE...')),
2960 _('hg cat [OPTION]... FILE...')),
2961 "^clone":
2961 "^clone":
2962 (clone,
2962 (clone,
2963 [('U', 'noupdate', None, _('do not update the new working directory')),
2963 [('U', 'noupdate', None, _('do not update the new working directory')),
2964 ('r', 'rev', [],
2964 ('r', 'rev', [],
2965 _('a changeset you would like to have after cloning')),
2965 _('a changeset you would like to have after cloning')),
2966 ('', 'pull', None, _('use pull protocol to copy metadata')),
2966 ('', 'pull', None, _('use pull protocol to copy metadata')),
2967 ('e', 'ssh', '', _('specify ssh command to use')),
2967 ('e', 'ssh', '', _('specify ssh command to use')),
2968 ('', 'remotecmd', '',
2968 ('', 'remotecmd', '',
2969 _('specify hg command to run on the remote side'))],
2969 _('specify hg command to run on the remote side'))],
2970 _('hg clone [OPTION]... SOURCE [DEST]')),
2970 _('hg clone [OPTION]... SOURCE [DEST]')),
2971 "^commit|ci":
2971 "^commit|ci":
2972 (commit,
2972 (commit,
2973 [('A', 'addremove', None,
2973 [('A', 'addremove', None,
2974 _('mark new/missing files as added/removed before committing')),
2974 _('mark new/missing files as added/removed before committing')),
2975 ('m', 'message', '', _('use <text> as commit message')),
2975 ('m', 'message', '', _('use <text> as commit message')),
2976 ('l', 'logfile', '', _('read the commit message from <file>')),
2976 ('l', 'logfile', '', _('read the commit message from <file>')),
2977 ('d', 'date', '', _('record datecode as commit date')),
2977 ('d', 'date', '', _('record datecode as commit date')),
2978 ('u', 'user', '', _('record user as commiter')),
2978 ('u', 'user', '', _('record user as commiter')),
2979 ('I', 'include', [], _('include names matching the given patterns')),
2979 ('I', 'include', [], _('include names matching the given patterns')),
2980 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2980 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
2981 _('hg commit [OPTION]... [FILE]...')),
2981 _('hg commit [OPTION]... [FILE]...')),
2982 "copy|cp":
2982 "copy|cp":
2983 (copy,
2983 (copy,
2984 [('A', 'after', None, _('record a copy that has already occurred')),
2984 [('A', 'after', None, _('record a copy that has already occurred')),
2985 ('f', 'force', None,
2985 ('f', 'force', None,
2986 _('forcibly copy over an existing managed file')),
2986 _('forcibly copy over an existing managed file')),
2987 ('I', 'include', [], _('include names matching the given patterns')),
2987 ('I', 'include', [], _('include names matching the given patterns')),
2988 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2988 ('X', 'exclude', [], _('exclude names matching the given patterns')),
2989 ('n', 'dry-run', None, _('do not perform actions, just print output'))],
2989 ('n', 'dry-run', None, _('do not perform actions, just print output'))],
2990 _('hg copy [OPTION]... [SOURCE]... DEST')),
2990 _('hg copy [OPTION]... [SOURCE]... DEST')),
2991 "debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')),
2991 "debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')),
2992 "debugcomplete":
2992 "debugcomplete":
2993 (debugcomplete,
2993 (debugcomplete,
2994 [('o', 'options', None, _('show the command options'))],
2994 [('o', 'options', None, _('show the command options'))],
2995 _('debugcomplete [-o] CMD')),
2995 _('debugcomplete [-o] CMD')),
2996 "debugrebuildstate":
2996 "debugrebuildstate":
2997 (debugrebuildstate,
2997 (debugrebuildstate,
2998 [('r', 'rev', '', _('revision to rebuild to'))],
2998 [('r', 'rev', '', _('revision to rebuild to'))],
2999 _('debugrebuildstate [-r REV] [REV]')),
2999 _('debugrebuildstate [-r REV] [REV]')),
3000 "debugcheckstate": (debugcheckstate, [], _('debugcheckstate')),
3000 "debugcheckstate": (debugcheckstate, [], _('debugcheckstate')),
3001 "debugconfig": (debugconfig, [], _('debugconfig [NAME]...')),
3001 "debugconfig": (debugconfig, [], _('debugconfig [NAME]...')),
3002 "debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')),
3002 "debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')),
3003 "debugstate": (debugstate, [], _('debugstate')),
3003 "debugstate": (debugstate, [], _('debugstate')),
3004 "debugdata": (debugdata, [], _('debugdata FILE REV')),
3004 "debugdata": (debugdata, [], _('debugdata FILE REV')),
3005 "debugindex": (debugindex, [], _('debugindex FILE')),
3005 "debugindex": (debugindex, [], _('debugindex FILE')),
3006 "debugindexdot": (debugindexdot, [], _('debugindexdot FILE')),
3006 "debugindexdot": (debugindexdot, [], _('debugindexdot FILE')),
3007 "debugrename": (debugrename, [], _('debugrename FILE [REV]')),
3007 "debugrename": (debugrename, [], _('debugrename FILE [REV]')),
3008 "debugwalk":
3008 "debugwalk":
3009 (debugwalk,
3009 (debugwalk,
3010 [('I', 'include', [], _('include names matching the given patterns')),
3010 [('I', 'include', [], _('include names matching the given patterns')),
3011 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
3011 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
3012 _('debugwalk [OPTION]... [FILE]...')),
3012 _('debugwalk [OPTION]... [FILE]...')),
3013 "^diff":
3013 "^diff":
3014 (diff,
3014 (diff,
3015 [('r', 'rev', [], _('revision')),
3015 [('r', 'rev', [], _('revision')),
3016 ('a', 'text', None, _('treat all files as text')),
3016 ('a', 'text', None, _('treat all files as text')),
3017 ('p', 'show-function', None,
3017 ('p', 'show-function', None,
3018 _('show which function each change is in')),
3018 _('show which function each change is in')),
3019 ('w', 'ignore-all-space', None,
3019 ('w', 'ignore-all-space', None,
3020 _('ignore white space when comparing lines')),
3020 _('ignore white space when comparing lines')),
3021 ('I', 'include', [], _('include names matching the given patterns')),
3021 ('I', 'include', [], _('include names matching the given patterns')),
3022 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
3022 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
3023 _('hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...')),
3023 _('hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...')),
3024 "^export":
3024 "^export":
3025 (export,
3025 (export,
3026 [('o', 'output', '', _('print output to file with formatted name')),
3026 [('o', 'output', '', _('print output to file with formatted name')),
3027 ('a', 'text', None, _('treat all files as text')),
3027 ('a', 'text', None, _('treat all files as text')),
3028 ('', 'switch-parent', None, _('diff against the second parent'))],
3028 ('', 'switch-parent', None, _('diff against the second parent'))],
3029 _('hg export [-a] [-o OUTFILESPEC] REV...')),
3029 _('hg export [-a] [-o OUTFILESPEC] REV...')),
3030 "debugforget|forget":
3030 "debugforget|forget":
3031 (forget,
3031 (forget,
3032 [('I', 'include', [], _('include names matching the given patterns')),
3032 [('I', 'include', [], _('include names matching the given patterns')),
3033 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
3033 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
3034 _('hg forget [OPTION]... FILE...')),
3034 _('hg forget [OPTION]... FILE...')),
3035 "grep":
3035 "grep":
3036 (grep,
3036 (grep,
3037 [('0', 'print0', None, _('end fields with NUL')),
3037 [('0', 'print0', None, _('end fields with NUL')),
3038 ('', 'all', None, _('print all revisions that match')),
3038 ('', 'all', None, _('print all revisions that match')),
3039 ('i', 'ignore-case', None, _('ignore case when matching')),
3039 ('i', 'ignore-case', None, _('ignore case when matching')),
3040 ('l', 'files-with-matches', None,
3040 ('l', 'files-with-matches', None,
3041 _('print only filenames and revs that match')),
3041 _('print only filenames and revs that match')),
3042 ('n', 'line-number', None, _('print matching line numbers')),
3042 ('n', 'line-number', None, _('print matching line numbers')),
3043 ('r', 'rev', [], _('search in given revision range')),
3043 ('r', 'rev', [], _('search in given revision range')),
3044 ('u', 'user', None, _('print user who committed change')),
3044 ('u', 'user', None, _('print user who committed change')),
3045 ('I', 'include', [], _('include names matching the given patterns')),
3045 ('I', 'include', [], _('include names matching the given patterns')),
3046 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
3046 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
3047 _('hg grep [OPTION]... PATTERN [FILE]...')),
3047 _('hg grep [OPTION]... PATTERN [FILE]...')),
3048 "heads":
3048 "heads":
3049 (heads,
3049 (heads,
3050 [('b', 'branches', None, _('show branches')),
3050 [('b', 'branches', None, _('show branches')),
3051 ('', 'style', '', _('display using template map file')),
3051 ('', 'style', '', _('display using template map file')),
3052 ('r', 'rev', '', _('show only heads which are descendants of rev')),
3052 ('r', 'rev', '', _('show only heads which are descendants of rev')),
3053 ('', 'template', '', _('display with template'))],
3053 ('', 'template', '', _('display with template'))],
3054 _('hg heads [-b] [-r <rev>]')),
3054 _('hg heads [-b] [-r <rev>]')),
3055 "help": (help_, [], _('hg help [COMMAND]')),
3055 "help": (help_, [], _('hg help [COMMAND]')),
3056 "identify|id": (identify, [], _('hg identify')),
3056 "identify|id": (identify, [], _('hg identify')),
3057 "import|patch":
3057 "import|patch":
3058 (import_,
3058 (import_,
3059 [('p', 'strip', 1,
3059 [('p', 'strip', 1,
3060 _('directory strip option for patch. This has the same\n'
3060 _('directory strip option for patch. This has the same\n'
3061 'meaning as the corresponding patch option')),
3061 'meaning as the corresponding patch option')),
3062 ('m', 'message', '', _('use <text> as commit message')),
3062 ('m', 'message', '', _('use <text> as commit message')),
3063 ('b', 'base', '', _('base path')),
3063 ('b', 'base', '', _('base path')),
3064 ('f', 'force', None,
3064 ('f', 'force', None,
3065 _('skip check for outstanding uncommitted changes'))],
3065 _('skip check for outstanding uncommitted changes'))],
3066 _('hg import [-p NUM] [-b BASE] [-m MESSAGE] [-f] PATCH...')),
3066 _('hg import [-p NUM] [-b BASE] [-m MESSAGE] [-f] PATCH...')),
3067 "incoming|in": (incoming,
3067 "incoming|in": (incoming,
3068 [('M', 'no-merges', None, _('do not show merges')),
3068 [('M', 'no-merges', None, _('do not show merges')),
3069 ('f', 'force', None,
3069 ('f', 'force', None,
3070 _('run even when remote repository is unrelated')),
3070 _('run even when remote repository is unrelated')),
3071 ('', 'style', '', _('display using template map file')),
3071 ('', 'style', '', _('display using template map file')),
3072 ('n', 'newest-first', None, _('show newest record first')),
3072 ('n', 'newest-first', None, _('show newest record first')),
3073 ('', 'bundle', '', _('file to store the bundles into')),
3073 ('', 'bundle', '', _('file to store the bundles into')),
3074 ('p', 'patch', None, _('show patch')),
3074 ('p', 'patch', None, _('show patch')),
3075 ('r', 'rev', [], _('a specific revision you would like to pull')),
3075 ('r', 'rev', [], _('a specific revision you would like to pull')),
3076 ('', 'template', '', _('display with template')),
3076 ('', 'template', '', _('display with template')),
3077 ('e', 'ssh', '', _('specify ssh command to use')),
3077 ('e', 'ssh', '', _('specify ssh command to use')),
3078 ('', 'remotecmd', '',
3078 ('', 'remotecmd', '',
3079 _('specify hg command to run on the remote side'))],
3079 _('specify hg command to run on the remote side'))],
3080 _('hg incoming [-p] [-n] [-M] [-r REV]...'
3080 _('hg incoming [-p] [-n] [-M] [-r REV]...'
3081 ' [--bundle FILENAME] [SOURCE]')),
3081 ' [--bundle FILENAME] [SOURCE]')),
3082 "^init": (init, [], _('hg init [DEST]')),
3082 "^init": (init, [], _('hg init [DEST]')),
3083 "locate":
3083 "locate":
3084 (locate,
3084 (locate,
3085 [('r', 'rev', '', _('search the repository as it stood at rev')),
3085 [('r', 'rev', '', _('search the repository as it stood at rev')),
3086 ('0', 'print0', None,
3086 ('0', 'print0', None,
3087 _('end filenames with NUL, for use with xargs')),
3087 _('end filenames with NUL, for use with xargs')),
3088 ('f', 'fullpath', None,
3088 ('f', 'fullpath', None,
3089 _('print complete paths from the filesystem root')),
3089 _('print complete paths from the filesystem root')),
3090 ('I', 'include', [], _('include names matching the given patterns')),
3090 ('I', 'include', [], _('include names matching the given patterns')),
3091 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
3091 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
3092 _('hg locate [OPTION]... [PATTERN]...')),
3092 _('hg locate [OPTION]... [PATTERN]...')),
3093 "^log|history":
3093 "^log|history":
3094 (log,
3094 (log,
3095 [('b', 'branches', None, _('show branches')),
3095 [('b', 'branches', None, _('show branches')),
3096 ('k', 'keyword', [], _('search for a keyword')),
3096 ('k', 'keyword', [], _('search for a keyword')),
3097 ('l', 'limit', '', _('limit number of changes displayed')),
3097 ('l', 'limit', '', _('limit number of changes displayed')),
3098 ('r', 'rev', [], _('show the specified revision or range')),
3098 ('r', 'rev', [], _('show the specified revision or range')),
3099 ('M', 'no-merges', None, _('do not show merges')),
3099 ('M', 'no-merges', None, _('do not show merges')),
3100 ('', 'style', '', _('display using template map file')),
3100 ('', 'style', '', _('display using template map file')),
3101 ('m', 'only-merges', None, _('show only merges')),
3101 ('m', 'only-merges', None, _('show only merges')),
3102 ('p', 'patch', None, _('show patch')),
3102 ('p', 'patch', None, _('show patch')),
3103 ('', 'template', '', _('display with template')),
3103 ('', 'template', '', _('display with template')),
3104 ('I', 'include', [], _('include names matching the given patterns')),
3104 ('I', 'include', [], _('include names matching the given patterns')),
3105 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
3105 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
3106 _('hg log [OPTION]... [FILE]')),
3106 _('hg log [OPTION]... [FILE]')),
3107 "manifest": (manifest, [], _('hg manifest [REV]')),
3107 "manifest": (manifest, [], _('hg manifest [REV]')),
3108 "merge":
3108 "merge":
3109 (merge,
3109 (merge,
3110 [('b', 'branch', '', _('merge with head of a specific branch')),
3110 [('b', 'branch', '', _('merge with head of a specific branch')),
3111 ('f', 'force', None, _('force a merge with outstanding changes'))],
3111 ('f', 'force', None, _('force a merge with outstanding changes'))],
3112 _('hg merge [-b TAG] [-f] [REV]')),
3112 _('hg merge [-b TAG] [-f] [REV]')),
3113 "outgoing|out": (outgoing,
3113 "outgoing|out": (outgoing,
3114 [('M', 'no-merges', None, _('do not show merges')),
3114 [('M', 'no-merges', None, _('do not show merges')),
3115 ('f', 'force', None,
3115 ('f', 'force', None,
3116 _('run even when remote repository is unrelated')),
3116 _('run even when remote repository is unrelated')),
3117 ('p', 'patch', None, _('show patch')),
3117 ('p', 'patch', None, _('show patch')),
3118 ('', 'style', '', _('display using template map file')),
3118 ('', 'style', '', _('display using template map file')),
3119 ('r', 'rev', [], _('a specific revision you would like to push')),
3119 ('r', 'rev', [], _('a specific revision you would like to push')),
3120 ('n', 'newest-first', None, _('show newest record first')),
3120 ('n', 'newest-first', None, _('show newest record first')),
3121 ('', 'template', '', _('display with template')),
3121 ('', 'template', '', _('display with template')),
3122 ('e', 'ssh', '', _('specify ssh command to use')),
3122 ('e', 'ssh', '', _('specify ssh command to use')),
3123 ('', 'remotecmd', '',
3123 ('', 'remotecmd', '',
3124 _('specify hg command to run on the remote side'))],
3124 _('specify hg command to run on the remote side'))],
3125 _('hg outgoing [-M] [-p] [-n] [-r REV]... [DEST]')),
3125 _('hg outgoing [-M] [-p] [-n] [-r REV]... [DEST]')),
3126 "^parents":
3126 "^parents":
3127 (parents,
3127 (parents,
3128 [('b', 'branches', None, _('show branches')),
3128 [('b', 'branches', None, _('show branches')),
3129 ('', 'style', '', _('display using template map file')),
3129 ('', 'style', '', _('display using template map file')),
3130 ('', 'template', '', _('display with template'))],
3130 ('', 'template', '', _('display with template'))],
3131 _('hg parents [-b] [REV]')),
3131 _('hg parents [-b] [REV]')),
3132 "paths": (paths, [], _('hg paths [NAME]')),
3132 "paths": (paths, [], _('hg paths [NAME]')),
3133 "^pull":
3133 "^pull":
3134 (pull,
3134 (pull,
3135 [('u', 'update', None,
3135 [('u', 'update', None,
3136 _('update the working directory to tip after pull')),
3136 _('update the working directory to tip after pull')),
3137 ('e', 'ssh', '', _('specify ssh command to use')),
3137 ('e', 'ssh', '', _('specify ssh command to use')),
3138 ('f', 'force', None,
3138 ('f', 'force', None,
3139 _('run even when remote repository is unrelated')),
3139 _('run even when remote repository is unrelated')),
3140 ('r', 'rev', [], _('a specific revision you would like to pull')),
3140 ('r', 'rev', [], _('a specific revision you would like to pull')),
3141 ('', 'remotecmd', '',
3141 ('', 'remotecmd', '',
3142 _('specify hg command to run on the remote side'))],
3142 _('specify hg command to run on the remote side'))],
3143 _('hg pull [-u] [-e FILE] [-r REV]... [--remotecmd FILE] [SOURCE]')),
3143 _('hg pull [-u] [-e FILE] [-r REV]... [--remotecmd FILE] [SOURCE]')),
3144 "^push":
3144 "^push":
3145 (push,
3145 (push,
3146 [('f', 'force', None, _('force push')),
3146 [('f', 'force', None, _('force push')),
3147 ('e', 'ssh', '', _('specify ssh command to use')),
3147 ('e', 'ssh', '', _('specify ssh command to use')),
3148 ('r', 'rev', [], _('a specific revision you would like to push')),
3148 ('r', 'rev', [], _('a specific revision you would like to push')),
3149 ('', 'remotecmd', '',
3149 ('', 'remotecmd', '',
3150 _('specify hg command to run on the remote side'))],
3150 _('specify hg command to run on the remote side'))],
3151 _('hg push [-f] [-e FILE] [-r REV]... [--remotecmd FILE] [DEST]')),
3151 _('hg push [-f] [-e FILE] [-r REV]... [--remotecmd FILE] [DEST]')),
3152 "debugrawcommit|rawcommit":
3152 "debugrawcommit|rawcommit":
3153 (rawcommit,
3153 (rawcommit,
3154 [('p', 'parent', [], _('parent')),
3154 [('p', 'parent', [], _('parent')),
3155 ('d', 'date', '', _('date code')),
3155 ('d', 'date', '', _('date code')),
3156 ('u', 'user', '', _('user')),
3156 ('u', 'user', '', _('user')),
3157 ('F', 'files', '', _('file list')),
3157 ('F', 'files', '', _('file list')),
3158 ('m', 'message', '', _('commit message')),
3158 ('m', 'message', '', _('commit message')),
3159 ('l', 'logfile', '', _('commit message file'))],
3159 ('l', 'logfile', '', _('commit message file'))],
3160 _('hg debugrawcommit [OPTION]... [FILE]...')),
3160 _('hg debugrawcommit [OPTION]... [FILE]...')),
3161 "recover": (recover, [], _('hg recover')),
3161 "recover": (recover, [], _('hg recover')),
3162 "^remove|rm":
3162 "^remove|rm":
3163 (remove,
3163 (remove,
3164 [('A', 'after', None, _('record remove that has already occurred')),
3164 [('A', 'after', None, _('record remove that has already occurred')),
3165 ('f', 'force', None, _('remove file even if modified')),
3165 ('f', 'force', None, _('remove file even if modified')),
3166 ('I', 'include', [], _('include names matching the given patterns')),
3166 ('I', 'include', [], _('include names matching the given patterns')),
3167 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
3167 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
3168 _('hg remove [OPTION]... FILE...')),
3168 _('hg remove [OPTION]... FILE...')),
3169 "rename|mv":
3169 "rename|mv":
3170 (rename,
3170 (rename,
3171 [('A', 'after', None, _('record a rename that has already occurred')),
3171 [('A', 'after', None, _('record a rename that has already occurred')),
3172 ('f', 'force', None,
3172 ('f', 'force', None,
3173 _('forcibly copy over an existing managed file')),
3173 _('forcibly copy over an existing managed file')),
3174 ('I', 'include', [], _('include names matching the given patterns')),
3174 ('I', 'include', [], _('include names matching the given patterns')),
3175 ('X', 'exclude', [], _('exclude names matching the given patterns')),
3175 ('X', 'exclude', [], _('exclude names matching the given patterns')),
3176 ('n', 'dry-run', None, _('do not perform actions, just print output'))],
3176 ('n', 'dry-run', None, _('do not perform actions, just print output'))],
3177 _('hg rename [OPTION]... SOURCE... DEST')),
3177 _('hg rename [OPTION]... SOURCE... DEST')),
3178 "^revert":
3178 "^revert":
3179 (revert,
3179 (revert,
3180 [('r', 'rev', '', _('revision to revert to')),
3180 [('r', 'rev', '', _('revision to revert to')),
3181 ('', 'no-backup', None, _('do not save backup copies of files')),
3181 ('', 'no-backup', None, _('do not save backup copies of files')),
3182 ('I', 'include', [], _('include names matching given patterns')),
3182 ('I', 'include', [], _('include names matching given patterns')),
3183 ('X', 'exclude', [], _('exclude names matching given patterns')),
3183 ('X', 'exclude', [], _('exclude names matching given patterns')),
3184 ('n', 'dry-run', None, _('do not perform actions, just print output'))],
3184 ('n', 'dry-run', None, _('do not perform actions, just print output'))],
3185 _('hg revert [-r REV] [NAME]...')),
3185 _('hg revert [-r REV] [NAME]...')),
3186 "rollback": (rollback, [], _('hg rollback')),
3186 "rollback": (rollback, [], _('hg rollback')),
3187 "root": (root, [], _('hg root')),
3187 "root": (root, [], _('hg root')),
3188 "^serve":
3188 "^serve":
3189 (serve,
3189 (serve,
3190 [('A', 'accesslog', '', _('name of access log file to write to')),
3190 [('A', 'accesslog', '', _('name of access log file to write to')),
3191 ('d', 'daemon', None, _('run server in background')),
3191 ('d', 'daemon', None, _('run server in background')),
3192 ('', 'daemon-pipefds', '', _('used internally by daemon mode')),
3192 ('', 'daemon-pipefds', '', _('used internally by daemon mode')),
3193 ('E', 'errorlog', '', _('name of error log file to write to')),
3193 ('E', 'errorlog', '', _('name of error log file to write to')),
3194 ('p', 'port', 0, _('port to use (default: 8000)')),
3194 ('p', 'port', 0, _('port to use (default: 8000)')),
3195 ('a', 'address', '', _('address to use')),
3195 ('a', 'address', '', _('address to use')),
3196 ('n', 'name', '',
3196 ('n', 'name', '',
3197 _('name to show in web pages (default: working dir)')),
3197 _('name to show in web pages (default: working dir)')),
3198 ('', 'webdir-conf', '', _('name of the webdir config file'
3198 ('', 'webdir-conf', '', _('name of the webdir config file'
3199 ' (serve more than one repo)')),
3199 ' (serve more than one repo)')),
3200 ('', 'pid-file', '', _('name of file to write process ID to')),
3200 ('', 'pid-file', '', _('name of file to write process ID to')),
3201 ('', 'stdio', None, _('for remote clients')),
3201 ('', 'stdio', None, _('for remote clients')),
3202 ('t', 'templates', '', _('web templates to use')),
3202 ('t', 'templates', '', _('web templates to use')),
3203 ('', 'style', '', _('template style to use')),
3203 ('', 'style', '', _('template style to use')),
3204 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4'))],
3204 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4'))],
3205 _('hg serve [OPTION]...')),
3205 _('hg serve [OPTION]...')),
3206 "^status|st":
3206 "^status|st":
3207 (status,
3207 (status,
3208 [('m', 'modified', None, _('show only modified files')),
3208 [('m', 'modified', None, _('show only modified files')),
3209 ('a', 'added', None, _('show only added files')),
3209 ('a', 'added', None, _('show only added files')),
3210 ('r', 'removed', None, _('show only removed files')),
3210 ('r', 'removed', None, _('show only removed files')),
3211 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
3211 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
3212 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
3212 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
3213 ('i', 'ignored', None, _('show ignored files')),
3213 ('i', 'ignored', None, _('show ignored files')),
3214 ('n', 'no-status', None, _('hide status prefix')),
3214 ('n', 'no-status', None, _('hide status prefix')),
3215 ('0', 'print0', None,
3215 ('0', 'print0', None,
3216 _('end filenames with NUL, for use with xargs')),
3216 _('end filenames with NUL, for use with xargs')),
3217 ('I', 'include', [], _('include names matching the given patterns')),
3217 ('I', 'include', [], _('include names matching the given patterns')),
3218 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
3218 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
3219 _('hg status [OPTION]... [FILE]...')),
3219 _('hg status [OPTION]... [FILE]...')),
3220 "tag":
3220 "tag":
3221 (tag,
3221 (tag,
3222 [('l', 'local', None, _('make the tag local')),
3222 [('l', 'local', None, _('make the tag local')),
3223 ('m', 'message', '', _('message for tag commit log entry')),
3223 ('m', 'message', '', _('message for tag commit log entry')),
3224 ('d', 'date', '', _('record datecode as commit date')),
3224 ('d', 'date', '', _('record datecode as commit date')),
3225 ('u', 'user', '', _('record user as commiter')),
3225 ('u', 'user', '', _('record user as commiter')),
3226 ('r', 'rev', '', _('revision to tag'))],
3226 ('r', 'rev', '', _('revision to tag'))],
3227 _('hg tag [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME')),
3227 _('hg tag [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME')),
3228 "tags": (tags, [], _('hg tags')),
3228 "tags": (tags, [], _('hg tags')),
3229 "tip":
3229 "tip":
3230 (tip,
3230 (tip,
3231 [('b', 'branches', None, _('show branches')),
3231 [('b', 'branches', None, _('show branches')),
3232 ('', 'style', '', _('display using template map file')),
3232 ('', 'style', '', _('display using template map file')),
3233 ('p', 'patch', None, _('show patch')),
3233 ('p', 'patch', None, _('show patch')),
3234 ('', 'template', '', _('display with template'))],
3234 ('', 'template', '', _('display with template'))],
3235 _('hg tip [-b] [-p]')),
3235 _('hg tip [-b] [-p]')),
3236 "unbundle":
3236 "unbundle":
3237 (unbundle,
3237 (unbundle,
3238 [('u', 'update', None,
3238 [('u', 'update', None,
3239 _('update the working directory to tip after unbundle'))],
3239 _('update the working directory to tip after unbundle'))],
3240 _('hg unbundle [-u] FILE')),
3240 _('hg unbundle [-u] FILE')),
3241 "debugundo|undo": (undo, [], _('hg undo')),
3241 "debugundo|undo": (undo, [], _('hg undo')),
3242 "^update|up|checkout|co":
3242 "^update|up|checkout|co":
3243 (update,
3243 (update,
3244 [('b', 'branch', '', _('checkout the head of a specific branch')),
3244 [('b', 'branch', '', _('checkout the head of a specific branch')),
3245 ('m', 'merge', None, _('allow merging of branches (DEPRECATED)')),
3245 ('m', 'merge', None, _('allow merging of branches (DEPRECATED)')),
3246 ('C', 'clean', None, _('overwrite locally modified files')),
3246 ('C', 'clean', None, _('overwrite locally modified files')),
3247 ('f', 'force', None, _('force a merge with outstanding changes'))],
3247 ('f', 'force', None, _('force a merge with outstanding changes'))],
3248 _('hg update [-b TAG] [-m] [-C] [-f] [REV]')),
3248 _('hg update [-b TAG] [-m] [-C] [-f] [REV]')),
3249 "verify": (verify, [], _('hg verify')),
3249 "verify": (verify, [], _('hg verify')),
3250 "version": (show_version, [], _('hg version')),
3250 "version": (show_version, [], _('hg version')),
3251 }
3251 }
3252
3252
3253 globalopts = [
3253 globalopts = [
3254 ('R', 'repository', '',
3254 ('R', 'repository', '',
3255 _('repository root directory or symbolic path name')),
3255 _('repository root directory or symbolic path name')),
3256 ('', 'cwd', '', _('change working directory')),
3256 ('', 'cwd', '', _('change working directory')),
3257 ('y', 'noninteractive', None,
3257 ('y', 'noninteractive', None,
3258 _('do not prompt, assume \'yes\' for any required answers')),
3258 _('do not prompt, assume \'yes\' for any required answers')),
3259 ('q', 'quiet', None, _('suppress output')),
3259 ('q', 'quiet', None, _('suppress output')),
3260 ('v', 'verbose', None, _('enable additional output')),
3260 ('v', 'verbose', None, _('enable additional output')),
3261 ('', 'config', [], _('set/override config option')),
3261 ('', 'config', [], _('set/override config option')),
3262 ('', 'debug', None, _('enable debugging output')),
3262 ('', 'debug', None, _('enable debugging output')),
3263 ('', 'debugger', None, _('start debugger')),
3263 ('', 'debugger', None, _('start debugger')),
3264 ('', 'lsprof', None, _('print improved command execution profile')),
3264 ('', 'lsprof', None, _('print improved command execution profile')),
3265 ('', 'traceback', None, _('print traceback on exception')),
3265 ('', 'traceback', None, _('print traceback on exception')),
3266 ('', 'time', None, _('time how long the command takes')),
3266 ('', 'time', None, _('time how long the command takes')),
3267 ('', 'profile', None, _('print command execution profile')),
3267 ('', 'profile', None, _('print command execution profile')),
3268 ('', 'version', None, _('output version information and exit')),
3268 ('', 'version', None, _('output version information and exit')),
3269 ('h', 'help', None, _('display help and exit')),
3269 ('h', 'help', None, _('display help and exit')),
3270 ]
3270 ]
3271
3271
3272 norepo = ("clone init version help debugancestor debugcomplete debugdata"
3272 norepo = ("clone init version help debugancestor debugcomplete debugdata"
3273 " debugindex debugindexdot")
3273 " debugindex debugindexdot")
3274 optionalrepo = ("paths serve debugconfig")
3274 optionalrepo = ("paths serve debugconfig")
3275
3275
3276 def findpossible(cmd):
3276 def findpossible(cmd):
3277 """
3277 """
3278 Return cmd -> (aliases, command table entry)
3278 Return cmd -> (aliases, command table entry)
3279 for each matching command.
3279 for each matching command.
3280 Return debug commands (or their aliases) only if no normal command matches.
3280 Return debug commands (or their aliases) only if no normal command matches.
3281 """
3281 """
3282 choice = {}
3282 choice = {}
3283 debugchoice = {}
3283 debugchoice = {}
3284 for e in table.keys():
3284 for e in table.keys():
3285 aliases = e.lstrip("^").split("|")
3285 aliases = e.lstrip("^").split("|")
3286 found = None
3286 found = None
3287 if cmd in aliases:
3287 if cmd in aliases:
3288 found = cmd
3288 found = cmd
3289 else:
3289 else:
3290 for a in aliases:
3290 for a in aliases:
3291 if a.startswith(cmd):
3291 if a.startswith(cmd):
3292 found = a
3292 found = a
3293 break
3293 break
3294 if found is not None:
3294 if found is not None:
3295 if aliases[0].startswith("debug"):
3295 if aliases[0].startswith("debug"):
3296 debugchoice[found] = (aliases, table[e])
3296 debugchoice[found] = (aliases, table[e])
3297 else:
3297 else:
3298 choice[found] = (aliases, table[e])
3298 choice[found] = (aliases, table[e])
3299
3299
3300 if not choice and debugchoice:
3300 if not choice and debugchoice:
3301 choice = debugchoice
3301 choice = debugchoice
3302
3302
3303 return choice
3303 return choice
3304
3304
3305 def findcmd(cmd):
3305 def findcmd(cmd):
3306 """Return (aliases, command table entry) for command string."""
3306 """Return (aliases, command table entry) for command string."""
3307 choice = findpossible(cmd)
3307 choice = findpossible(cmd)
3308
3308
3309 if choice.has_key(cmd):
3309 if choice.has_key(cmd):
3310 return choice[cmd]
3310 return choice[cmd]
3311
3311
3312 if len(choice) > 1:
3312 if len(choice) > 1:
3313 clist = choice.keys()
3313 clist = choice.keys()
3314 clist.sort()
3314 clist.sort()
3315 raise AmbiguousCommand(cmd, clist)
3315 raise AmbiguousCommand(cmd, clist)
3316
3316
3317 if choice:
3317 if choice:
3318 return choice.values()[0]
3318 return choice.values()[0]
3319
3319
3320 raise UnknownCommand(cmd)
3320 raise UnknownCommand(cmd)
3321
3321
3322 def catchterm(*args):
3322 def catchterm(*args):
3323 raise util.SignalInterrupt
3323 raise util.SignalInterrupt
3324
3324
3325 def run():
3325 def run():
3326 sys.exit(dispatch(sys.argv[1:]))
3326 sys.exit(dispatch(sys.argv[1:]))
3327
3327
3328 class ParseError(Exception):
3328 class ParseError(Exception):
3329 """Exception raised on errors in parsing the command line."""
3329 """Exception raised on errors in parsing the command line."""
3330
3330
3331 def parse(ui, args):
3331 def parse(ui, args):
3332 options = {}
3332 options = {}
3333 cmdoptions = {}
3333 cmdoptions = {}
3334
3334
3335 try:
3335 try:
3336 args = fancyopts.fancyopts(args, globalopts, options)
3336 args = fancyopts.fancyopts(args, globalopts, options)
3337 except fancyopts.getopt.GetoptError, inst:
3337 except fancyopts.getopt.GetoptError, inst:
3338 raise ParseError(None, inst)
3338 raise ParseError(None, inst)
3339
3339
3340 if args:
3340 if args:
3341 cmd, args = args[0], args[1:]
3341 cmd, args = args[0], args[1:]
3342 aliases, i = findcmd(cmd)
3342 aliases, i = findcmd(cmd)
3343 cmd = aliases[0]
3343 cmd = aliases[0]
3344 defaults = ui.config("defaults", cmd)
3344 defaults = ui.config("defaults", cmd)
3345 if defaults:
3345 if defaults:
3346 args = defaults.split() + args
3346 args = defaults.split() + args
3347 c = list(i[1])
3347 c = list(i[1])
3348 else:
3348 else:
3349 cmd = None
3349 cmd = None
3350 c = []
3350 c = []
3351
3351
3352 # combine global options into local
3352 # combine global options into local
3353 for o in globalopts:
3353 for o in globalopts:
3354 c.append((o[0], o[1], options[o[1]], o[3]))
3354 c.append((o[0], o[1], options[o[1]], o[3]))
3355
3355
3356 try:
3356 try:
3357 args = fancyopts.fancyopts(args, c, cmdoptions)
3357 args = fancyopts.fancyopts(args, c, cmdoptions)
3358 except fancyopts.getopt.GetoptError, inst:
3358 except fancyopts.getopt.GetoptError, inst:
3359 raise ParseError(cmd, inst)
3359 raise ParseError(cmd, inst)
3360
3360
3361 # separate global options back out
3361 # separate global options back out
3362 for o in globalopts:
3362 for o in globalopts:
3363 n = o[1]
3363 n = o[1]
3364 options[n] = cmdoptions[n]
3364 options[n] = cmdoptions[n]
3365 del cmdoptions[n]
3365 del cmdoptions[n]
3366
3366
3367 return (cmd, cmd and i[0] or None, args, options, cmdoptions)
3367 return (cmd, cmd and i[0] or None, args, options, cmdoptions)
3368
3368
3369 external = {}
3369 external = {}
3370
3370
3371 def findext(name):
3371 def findext(name):
3372 '''return module with given extension name'''
3372 '''return module with given extension name'''
3373 try:
3373 try:
3374 return external[name]
3374 return external[name]
3375 except KeyError:
3375 except KeyError:
3376 dotname = '.' + name
3376 dotname = '.' + name
3377 for k, v in external.iteritems():
3377 for k, v in external.iteritems():
3378 if k.endswith('.' + name) or v.__name__ == name:
3378 if k.endswith('.' + name) or v.__name__ == name:
3379 return v
3379 return v
3380 raise KeyError(name)
3380 raise KeyError(name)
3381
3381
3382 def dispatch(args):
3382 def dispatch(args):
3383 for name in 'SIGBREAK', 'SIGHUP', 'SIGTERM':
3383 for name in 'SIGBREAK', 'SIGHUP', 'SIGTERM':
3384 num = getattr(signal, name, None)
3384 num = getattr(signal, name, None)
3385 if num: signal.signal(num, catchterm)
3385 if num: signal.signal(num, catchterm)
3386
3386
3387 try:
3387 try:
3388 u = ui.ui(traceback='--traceback' in sys.argv[1:])
3388 u = ui.ui(traceback='--traceback' in sys.argv[1:])
3389 except util.Abort, inst:
3389 except util.Abort, inst:
3390 sys.stderr.write(_("abort: %s\n") % inst)
3390 sys.stderr.write(_("abort: %s\n") % inst)
3391 return -1
3391 return -1
3392
3392
3393 for x in u.extensions():
3393 for x in u.extensions():
3394 try:
3394 try:
3395 if x[1]:
3395 if x[1]:
3396 # the module will be loaded in sys.modules
3396 # the module will be loaded in sys.modules
3397 # choose an unique name so that it doesn't
3397 # choose an unique name so that it doesn't
3398 # conflicts with other modules
3398 # conflicts with other modules
3399 module_name = "hgext_%s" % x[0].replace('.', '_')
3399 module_name = "hgext_%s" % x[0].replace('.', '_')
3400 mod = imp.load_source(module_name, x[1])
3400 mod = imp.load_source(module_name, x[1])
3401 else:
3401 else:
3402 def importh(name):
3402 def importh(name):
3403 mod = __import__(name)
3403 mod = __import__(name)
3404 components = name.split('.')
3404 components = name.split('.')
3405 for comp in components[1:]:
3405 for comp in components[1:]:
3406 mod = getattr(mod, comp)
3406 mod = getattr(mod, comp)
3407 return mod
3407 return mod
3408 try:
3408 try:
3409 name = 'hgext.' + x[0]
3409 name = 'hgext.' + x[0]
3410 mod = importh(name)
3410 mod = importh(name)
3411 except ImportError:
3411 except ImportError:
3412 name = x[0]
3412 name = x[0]
3413 mod = importh(name)
3413 mod = importh(name)
3414 external[name] = mod
3414 external[name] = mod
3415 except (util.SignalInterrupt, KeyboardInterrupt):
3415 except (util.SignalInterrupt, KeyboardInterrupt):
3416 raise
3416 raise
3417 except Exception, inst:
3417 except Exception, inst:
3418 u.warn(_("*** failed to import extension %s: %s\n") % (x[0], inst))
3418 u.warn(_("*** failed to import extension %s: %s\n") % (x[0], inst))
3419 if u.print_exc():
3419 if u.print_exc():
3420 return 1
3420 return 1
3421
3421
3422 for x in external.itervalues():
3422 for x in external.itervalues():
3423 uisetup = getattr(x, 'uisetup', None)
3423 uisetup = getattr(x, 'uisetup', None)
3424 if uisetup:
3424 if uisetup:
3425 uisetup(u)
3425 uisetup(u)
3426 cmdtable = getattr(x, 'cmdtable', {})
3426 cmdtable = getattr(x, 'cmdtable', {})
3427 for t in cmdtable:
3427 for t in cmdtable:
3428 if t in table:
3428 if t in table:
3429 u.warn(_("module %s overrides %s\n") % (x.__name__, t))
3429 u.warn(_("module %s overrides %s\n") % (x.__name__, t))
3430 table.update(cmdtable)
3430 table.update(cmdtable)
3431
3431
3432 try:
3432 try:
3433 cmd, func, args, options, cmdoptions = parse(u, args)
3433 cmd, func, args, options, cmdoptions = parse(u, args)
3434 if options["time"]:
3434 if options["time"]:
3435 def get_times():
3435 def get_times():
3436 t = os.times()
3436 t = os.times()
3437 if t[4] == 0.0: # Windows leaves this as zero, so use time.clock()
3437 if t[4] == 0.0: # Windows leaves this as zero, so use time.clock()
3438 t = (t[0], t[1], t[2], t[3], time.clock())
3438 t = (t[0], t[1], t[2], t[3], time.clock())
3439 return t
3439 return t
3440 s = get_times()
3440 s = get_times()
3441 def print_time():
3441 def print_time():
3442 t = get_times()
3442 t = get_times()
3443 u.warn(_("Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") %
3443 u.warn(_("Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") %
3444 (t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3]))
3444 (t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3]))
3445 atexit.register(print_time)
3445 atexit.register(print_time)
3446
3446
3447 u.updateopts(options["verbose"], options["debug"], options["quiet"],
3447 u.updateopts(options["verbose"], options["debug"], options["quiet"],
3448 not options["noninteractive"], options["traceback"],
3448 not options["noninteractive"], options["traceback"],
3449 options["config"])
3449 options["config"])
3450
3450
3451 # enter the debugger before command execution
3451 # enter the debugger before command execution
3452 if options['debugger']:
3452 if options['debugger']:
3453 pdb.set_trace()
3453 pdb.set_trace()
3454
3454
3455 try:
3455 try:
3456 if options['cwd']:
3456 if options['cwd']:
3457 try:
3457 try:
3458 os.chdir(options['cwd'])
3458 os.chdir(options['cwd'])
3459 except OSError, inst:
3459 except OSError, inst:
3460 raise util.Abort('%s: %s' %
3460 raise util.Abort('%s: %s' %
3461 (options['cwd'], inst.strerror))
3461 (options['cwd'], inst.strerror))
3462
3462
3463 path = u.expandpath(options["repository"]) or ""
3463 path = u.expandpath(options["repository"]) or ""
3464 repo = path and hg.repository(u, path=path) or None
3464 repo = path and hg.repository(u, path=path) or None
3465
3465
3466 if options['help']:
3466 if options['help']:
3467 return help_(u, cmd, options['version'])
3467 return help_(u, cmd, options['version'])
3468 elif options['version']:
3468 elif options['version']:
3469 return show_version(u)
3469 return show_version(u)
3470 elif not cmd:
3470 elif not cmd:
3471 return help_(u, 'shortlist')
3471 return help_(u, 'shortlist')
3472
3472
3473 if cmd not in norepo.split():
3473 if cmd not in norepo.split():
3474 try:
3474 try:
3475 if not repo:
3475 if not repo:
3476 repo = hg.repository(u, path=path)
3476 repo = hg.repository(u, path=path)
3477 u = repo.ui
3477 u = repo.ui
3478 for x in external.itervalues():
3478 for x in external.itervalues():
3479 if hasattr(x, 'reposetup'):
3479 if hasattr(x, 'reposetup'):
3480 x.reposetup(u, repo)
3480 x.reposetup(u, repo)
3481 except hg.RepoError:
3481 except hg.RepoError:
3482 if cmd not in optionalrepo.split():
3482 if cmd not in optionalrepo.split():
3483 raise
3483 raise
3484 d = lambda: func(u, repo, *args, **cmdoptions)
3484 d = lambda: func(u, repo, *args, **cmdoptions)
3485 else:
3485 else:
3486 d = lambda: func(u, *args, **cmdoptions)
3486 d = lambda: func(u, *args, **cmdoptions)
3487
3487
3488 try:
3488 try:
3489 if options['profile']:
3489 if options['profile']:
3490 import hotshot, hotshot.stats
3490 import hotshot, hotshot.stats
3491 prof = hotshot.Profile("hg.prof")
3491 prof = hotshot.Profile("hg.prof")
3492 try:
3492 try:
3493 try:
3493 try:
3494 return prof.runcall(d)
3494 return prof.runcall(d)
3495 except:
3495 except:
3496 try:
3496 try:
3497 u.warn(_('exception raised - generating '
3497 u.warn(_('exception raised - generating '
3498 'profile anyway\n'))
3498 'profile anyway\n'))
3499 except:
3499 except:
3500 pass
3500 pass
3501 raise
3501 raise
3502 finally:
3502 finally:
3503 prof.close()
3503 prof.close()
3504 stats = hotshot.stats.load("hg.prof")
3504 stats = hotshot.stats.load("hg.prof")
3505 stats.strip_dirs()
3505 stats.strip_dirs()
3506 stats.sort_stats('time', 'calls')
3506 stats.sort_stats('time', 'calls')
3507 stats.print_stats(40)
3507 stats.print_stats(40)
3508 elif options['lsprof']:
3508 elif options['lsprof']:
3509 try:
3509 try:
3510 from mercurial import lsprof
3510 from mercurial import lsprof
3511 except ImportError:
3511 except ImportError:
3512 raise util.Abort(_(
3512 raise util.Abort(_(
3513 'lsprof not available - install from '
3513 'lsprof not available - install from '
3514 'http://codespeak.net/svn/user/arigo/hack/misc/lsprof/'))
3514 'http://codespeak.net/svn/user/arigo/hack/misc/lsprof/'))
3515 p = lsprof.Profiler()
3515 p = lsprof.Profiler()
3516 p.enable(subcalls=True)
3516 p.enable(subcalls=True)
3517 try:
3517 try:
3518 return d()
3518 return d()
3519 finally:
3519 finally:
3520 p.disable()
3520 p.disable()
3521 stats = lsprof.Stats(p.getstats())
3521 stats = lsprof.Stats(p.getstats())
3522 stats.sort()
3522 stats.sort()
3523 stats.pprint(top=10, file=sys.stderr, climit=5)
3523 stats.pprint(top=10, file=sys.stderr, climit=5)
3524 else:
3524 else:
3525 return d()
3525 return d()
3526 finally:
3526 finally:
3527 u.flush()
3527 u.flush()
3528 except:
3528 except:
3529 # enter the debugger when we hit an exception
3529 # enter the debugger when we hit an exception
3530 if options['debugger']:
3530 if options['debugger']:
3531 pdb.post_mortem(sys.exc_info()[2])
3531 pdb.post_mortem(sys.exc_info()[2])
3532 u.print_exc()
3532 u.print_exc()
3533 raise
3533 raise
3534 except ParseError, inst:
3534 except ParseError, inst:
3535 if inst.args[0]:
3535 if inst.args[0]:
3536 u.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1]))
3536 u.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1]))
3537 help_(u, inst.args[0])
3537 help_(u, inst.args[0])
3538 else:
3538 else:
3539 u.warn(_("hg: %s\n") % inst.args[1])
3539 u.warn(_("hg: %s\n") % inst.args[1])
3540 help_(u, 'shortlist')
3540 help_(u, 'shortlist')
3541 except AmbiguousCommand, inst:
3541 except AmbiguousCommand, inst:
3542 u.warn(_("hg: command '%s' is ambiguous:\n %s\n") %
3542 u.warn(_("hg: command '%s' is ambiguous:\n %s\n") %
3543 (inst.args[0], " ".join(inst.args[1])))
3543 (inst.args[0], " ".join(inst.args[1])))
3544 except UnknownCommand, inst:
3544 except UnknownCommand, inst:
3545 u.warn(_("hg: unknown command '%s'\n") % inst.args[0])
3545 u.warn(_("hg: unknown command '%s'\n") % inst.args[0])
3546 help_(u, 'shortlist')
3546 help_(u, 'shortlist')
3547 except hg.RepoError, inst:
3547 except hg.RepoError, inst:
3548 u.warn(_("abort: %s!\n") % inst)
3548 u.warn(_("abort: %s!\n") % inst)
3549 except lock.LockHeld, inst:
3549 except lock.LockHeld, inst:
3550 if inst.errno == errno.ETIMEDOUT:
3550 if inst.errno == errno.ETIMEDOUT:
3551 reason = _('timed out waiting for lock held by %s') % inst.locker
3551 reason = _('timed out waiting for lock held by %s') % inst.locker
3552 else:
3552 else:
3553 reason = _('lock held by %s') % inst.locker
3553 reason = _('lock held by %s') % inst.locker
3554 u.warn(_("abort: %s: %s\n") % (inst.desc or inst.filename, reason))
3554 u.warn(_("abort: %s: %s\n") % (inst.desc or inst.filename, reason))
3555 except lock.LockUnavailable, inst:
3555 except lock.LockUnavailable, inst:
3556 u.warn(_("abort: could not lock %s: %s\n") %
3556 u.warn(_("abort: could not lock %s: %s\n") %
3557 (inst.desc or inst.filename, inst.strerror))
3557 (inst.desc or inst.filename, inst.strerror))
3558 except revlog.RevlogError, inst:
3558 except revlog.RevlogError, inst:
3559 u.warn(_("abort: "), inst, "!\n")
3559 u.warn(_("abort: "), inst, "!\n")
3560 except util.SignalInterrupt:
3560 except util.SignalInterrupt:
3561 u.warn(_("killed!\n"))
3561 u.warn(_("killed!\n"))
3562 except KeyboardInterrupt:
3562 except KeyboardInterrupt:
3563 try:
3563 try:
3564 u.warn(_("interrupted!\n"))
3564 u.warn(_("interrupted!\n"))
3565 except IOError, inst:
3565 except IOError, inst:
3566 if inst.errno == errno.EPIPE:
3566 if inst.errno == errno.EPIPE:
3567 if u.debugflag:
3567 if u.debugflag:
3568 u.warn(_("\nbroken pipe\n"))
3568 u.warn(_("\nbroken pipe\n"))
3569 else:
3569 else:
3570 raise
3570 raise
3571 except IOError, inst:
3571 except IOError, inst:
3572 if hasattr(inst, "code"):
3572 if hasattr(inst, "code"):
3573 u.warn(_("abort: %s\n") % inst)
3573 u.warn(_("abort: %s\n") % inst)
3574 elif hasattr(inst, "reason"):
3574 elif hasattr(inst, "reason"):
3575 u.warn(_("abort: error: %s\n") % inst.reason[1])
3575 u.warn(_("abort: error: %s\n") % inst.reason[1])
3576 elif hasattr(inst, "args") and inst[0] == errno.EPIPE:
3576 elif hasattr(inst, "args") and inst[0] == errno.EPIPE:
3577 if u.debugflag:
3577 if u.debugflag:
3578 u.warn(_("broken pipe\n"))
3578 u.warn(_("broken pipe\n"))
3579 elif getattr(inst, "strerror", None):
3579 elif getattr(inst, "strerror", None):
3580 if getattr(inst, "filename", None):
3580 if getattr(inst, "filename", None):
3581 u.warn(_("abort: %s - %s\n") % (inst.strerror, inst.filename))
3581 u.warn(_("abort: %s - %s\n") % (inst.strerror, inst.filename))
3582 else:
3582 else:
3583 u.warn(_("abort: %s\n") % inst.strerror)
3583 u.warn(_("abort: %s\n") % inst.strerror)
3584 else:
3584 else:
3585 raise
3585 raise
3586 except OSError, inst:
3586 except OSError, inst:
3587 if hasattr(inst, "filename"):
3587 if hasattr(inst, "filename"):
3588 u.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename))
3588 u.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename))
3589 else:
3589 else:
3590 u.warn(_("abort: %s\n") % inst.strerror)
3590 u.warn(_("abort: %s\n") % inst.strerror)
3591 except util.Abort, inst:
3591 except util.Abort, inst:
3592 u.warn(_('abort: '), inst.args[0] % inst.args[1:], '\n')
3592 u.warn(_('abort: '), inst.args[0] % inst.args[1:], '\n')
3593 except TypeError, inst:
3593 except TypeError, inst:
3594 # was this an argument error?
3594 # was this an argument error?
3595 tb = traceback.extract_tb(sys.exc_info()[2])
3595 tb = traceback.extract_tb(sys.exc_info()[2])
3596 if len(tb) > 2: # no
3596 if len(tb) > 2: # no
3597 raise
3597 raise
3598 u.debug(inst, "\n")
3598 u.debug(inst, "\n")
3599 u.warn(_("%s: invalid arguments\n") % cmd)
3599 u.warn(_("%s: invalid arguments\n") % cmd)
3600 help_(u, cmd)
3600 help_(u, cmd)
3601 except SystemExit, inst:
3601 except SystemExit, inst:
3602 # Commands shouldn't sys.exit directly, but give a return code.
3602 # Commands shouldn't sys.exit directly, but give a return code.
3603 # Just in case catch this and and pass exit code to caller.
3603 # Just in case catch this and and pass exit code to caller.
3604 return inst.code
3604 return inst.code
3605 except:
3605 except:
3606 u.warn(_("** unknown exception encountered, details follow\n"))
3606 u.warn(_("** unknown exception encountered, details follow\n"))
3607 u.warn(_("** report bug details to mercurial@selenic.com\n"))
3607 u.warn(_("** report bug details to mercurial@selenic.com\n"))
3608 u.warn(_("** Mercurial Distributed SCM (version %s)\n")
3608 u.warn(_("** Mercurial Distributed SCM (version %s)\n")
3609 % version.get_version())
3609 % version.get_version())
3610 raise
3610 raise
3611
3611
3612 return -1
3612 return -1
General Comments 0
You need to be logged in to leave comments. Login now