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