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