##// END OF EJS Templates
check-code: using and/or/not as a function is bad style
Martin Geisler -
r12964:34034e55 default
parent child Browse files
Show More
@@ -1,296 +1,299
1 1 #!/usr/bin/env python
2 2 #
3 3 # check-code - a style and portability checker for Mercurial
4 4 #
5 5 # Copyright 2010 Matt Mackall <mpm@selenic.com>
6 6 #
7 7 # This software may be used and distributed according to the terms of the
8 8 # GNU General Public License version 2 or any later version.
9 9
10 10 import re, glob, os, sys
11 11 import optparse
12 12
13 13 def repquote(m):
14 14 t = re.sub(r"\w", "x", m.group('text'))
15 15 t = re.sub(r"[^\sx]", "o", t)
16 16 return m.group('quote') + t + m.group('quote')
17 17
18 18 def reppython(m):
19 19 comment = m.group('comment')
20 20 if comment:
21 21 return "#" * len(comment)
22 22 return repquote(m)
23 23
24 24 def repcomment(m):
25 25 return m.group(1) + "#" * len(m.group(2))
26 26
27 27 def repccomment(m):
28 28 t = re.sub(r"((?<=\n) )|\S", "x", m.group(2))
29 29 return m.group(1) + t + "*/"
30 30
31 31 def repcallspaces(m):
32 32 t = re.sub(r"\n\s+", "\n", m.group(2))
33 33 return m.group(1) + t
34 34
35 35 def repinclude(m):
36 36 return m.group(1) + "<foo>"
37 37
38 38 def rephere(m):
39 39 t = re.sub(r"\S", "x", m.group(2))
40 40 return m.group(1) + t
41 41
42 42
43 43 testpats = [
44 44 (r'(pushd|popd)', "don't use 'pushd' or 'popd', use 'cd'"),
45 45 (r'\W\$?\(\([^\)]*\)\)', "don't use (()) or $(()), use 'expr'"),
46 46 (r'^function', "don't use 'function', use old style"),
47 47 (r'grep.*-q', "don't use 'grep -q', redirect to /dev/null"),
48 48 (r'echo.*\\n', "don't use 'echo \\n', use printf"),
49 49 (r'echo -n', "don't use 'echo -n', use printf"),
50 50 (r'^diff.*-\w*N', "don't use 'diff -N'"),
51 51 (r'(^| )wc[^|]*$', "filter wc output"),
52 52 (r'head -c', "don't use 'head -c', use 'dd'"),
53 53 (r'ls.*-\w*R', "don't use 'ls -R', use 'find'"),
54 54 (r'printf.*\\\d\d\d', "don't use 'printf \NNN', use Python"),
55 55 (r'printf.*\\x', "don't use printf \\x, use Python"),
56 56 (r'\$\(.*\)', "don't use $(expr), use `expr`"),
57 57 (r'rm -rf \*', "don't use naked rm -rf, target a directory"),
58 58 (r'(^|\|\s*)grep (-\w\s+)*[^|]*[(|]\w',
59 59 "use egrep for extended grep syntax"),
60 60 (r'/bin/', "don't use explicit paths for tools"),
61 61 (r'\$PWD', "don't use $PWD, use `pwd`"),
62 62 (r'[^\n]\Z', "no trailing newline"),
63 63 (r'export.*=', "don't export and assign at once"),
64 64 ('^([^"\']|("[^"]*")|(\'[^\']*\'))*\\^', "^ must be quoted"),
65 65 (r'^source\b', "don't use 'source', use '.'"),
66 66 (r'touch -d', "don't use 'touch -d', use 'touch -t' instead"),
67 67 ]
68 68
69 69 testfilters = [
70 70 (r"( *)(#([^\n]*\S)?)", repcomment),
71 71 (r"<<(\S+)((.|\n)*?\n\1)", rephere),
72 72 ]
73 73
74 74 uprefix = r"^ \$ "
75 75 uprefixc = r"^ > "
76 76 utestpats = [
77 77 (r'^(\S| $ ).*(\S\s+|^\s+)\n', "trailing whitespace on non-output"),
78 78 (uprefix + r'.*\|\s*sed', "use regex test output patterns instead of sed"),
79 79 (uprefix + r'(true|exit 0)', "explicit zero exit unnecessary"),
80 80 (uprefix + r'.*\$\?', "explicit exit code checks unnecessary"),
81 81 (uprefix + r'.*\|\| echo.*(fail|error)',
82 82 "explicit exit code checks unnecessary"),
83 83 (uprefix + r'set -e', "don't use set -e"),
84 84 (uprefixc + r'( *)\t', "don't use tabs to indent"),
85 85 ]
86 86
87 87 for p, m in testpats:
88 88 if p.startswith('^'):
89 89 p = uprefix + p[1:]
90 90 else:
91 91 p = uprefix + p
92 92 utestpats.append((p, m))
93 93
94 94 utestfilters = [
95 95 (r"( *)(#([^\n]*\S)?)", repcomment),
96 96 ]
97 97
98 98 pypats = [
99 99 (r'^\s*def\s*\w+\s*\(.*,\s*\(',
100 100 "tuple parameter unpacking not available in Python 3+"),
101 101 (r'lambda\s*\(.*,.*\)',
102 102 "tuple parameter unpacking not available in Python 3+"),
103 103 (r'(?<!def)\s+(cmp)\(', "cmp is not available in Python 3+"),
104 104 (r'\breduce\s*\(.*', "reduce is not available in Python 3+"),
105 105 (r'\.has_key\b', "dict.has_key is not available in Python 3+"),
106 106 (r'^\s*\t', "don't use tabs"),
107 107 (r'\S;\s*\n', "semicolon"),
108 108 (r'\w,\w', "missing whitespace after ,"),
109 109 (r'\w[+/*\-<>]\w', "missing whitespace in expression"),
110 110 (r'^\s+\w+=\w+[^,)]$', "missing whitespace in assignment"),
111 111 (r'.{85}', "line too long"),
112 112 (r'.{81}', "warning: line over 80 characters"),
113 113 (r'[^\n]\Z', "no trailing newline"),
114 114 (r'(\S\s+|^\s+)\n', "trailing whitespace"),
115 115 # (r'^\s+[^_ ][^_. ]+_[^_]+\s*=', "don't use underbars in identifiers"),
116 116 # (r'\w*[a-z][A-Z]\w*\s*=', "don't use camelcase in identifiers"),
117 117 (r'^\s*(if|while|def|class|except|try)\s[^[]*:\s*[^\]#\s]+',
118 118 "linebreak after :"),
119 119 (r'class\s[^(]:', "old-style class, use class foo(object)"),
120 120 (r'^\s+del\(', "del isn't a function"),
121 (r'\band\(', "and isn't a function"),
122 (r'\bor\(', "or isn't a function"),
123 (r'\bnot\(', "not isn't a function"),
121 124 (r'^\s+except\(', "except isn't a function"),
122 125 (r',]', "unneeded trailing ',' in list"),
123 126 # (r'class\s[A-Z][^\(]*\((?!Exception)',
124 127 # "don't capitalize non-exception classes"),
125 128 # (r'in range\(', "use xrange"),
126 129 # (r'^\s*print\s+', "avoid using print in core and extensions"),
127 130 (r'[\x80-\xff]', "non-ASCII character literal"),
128 131 (r'("\')\.format\(', "str.format() not available in Python 2.4"),
129 132 (r'^\s*with\s+', "with not available in Python 2.4"),
130 133 (r'(?<!def)\s+(any|all|format)\(',
131 134 "any/all/format not available in Python 2.4"),
132 135 (r'(?<!def)\s+(callable)\(',
133 136 "callable not available in Python 3, use hasattr(f, '__call__')"),
134 137 (r'if\s.*\selse', "if ... else form not available in Python 2.4"),
135 138 (r'([\(\[]\s\S)|(\S\s[\)\]])', "gratuitous whitespace in () or []"),
136 139 # (r'\s\s=', "gratuitous whitespace before ="),
137 140 (r'[^>< ](\+=|-=|!=|<>|<=|>=|<<=|>>=)\S',
138 141 "missing whitespace around operator"),
139 142 (r'[^>< ](\+=|-=|!=|<>|<=|>=|<<=|>>=)\s',
140 143 "missing whitespace around operator"),
141 144 (r'\s(\+=|-=|!=|<>|<=|>=|<<=|>>=)\S',
142 145 "missing whitespace around operator"),
143 146 (r'[^+=*!<>&| -](\s=|=\s)[^= ]',
144 147 "wrong whitespace around ="),
145 148 (r'raise Exception', "don't raise generic exceptions"),
146 149 (r'ui\.(status|progress|write|note|warn)\([\'\"]x',
147 150 "warning: unwrapped ui message"),
148 151 ]
149 152
150 153 pyfilters = [
151 154 (r"""(?msx)(?P<comment>\#.*?$)|
152 155 ((?P<quote>('''|\"\"\"|(?<!')'(?!')|(?<!")"(?!")))
153 156 (?P<text>(([^\\]|\\.)*?))
154 157 (?P=quote))""", reppython),
155 158 ]
156 159
157 160 cpats = [
158 161 (r'//', "don't use //-style comments"),
159 162 (r'^ ', "don't use spaces to indent"),
160 163 (r'\S\t', "don't use tabs except for indent"),
161 164 (r'(\S\s+|^\s+)\n', "trailing whitespace"),
162 165 (r'.{85}', "line too long"),
163 166 (r'(while|if|do|for)\(', "use space after while/if/do/for"),
164 167 (r'return\(', "return is not a function"),
165 168 (r' ;', "no space before ;"),
166 169 (r'\w+\* \w+', "use int *foo, not int* foo"),
167 170 (r'\([^\)]+\) \w+', "use (int)foo, not (int) foo"),
168 171 (r'\S+ (\+\+|--)', "use foo++, not foo ++"),
169 172 (r'\w,\w', "missing whitespace after ,"),
170 173 (r'\w[+/*]\w', "missing whitespace in expression"),
171 174 (r'^#\s+\w', "use #foo, not # foo"),
172 175 (r'[^\n]\Z', "no trailing newline"),
173 176 ]
174 177
175 178 cfilters = [
176 179 (r'(/\*)(((\*(?!/))|[^*])*)\*/', repccomment),
177 180 (r'''(?P<quote>(?<!")")(?P<text>([^"]|\\")+)"(?!")''', repquote),
178 181 (r'''(#\s*include\s+<)([^>]+)>''', repinclude),
179 182 (r'(\()([^)]+\))', repcallspaces),
180 183 ]
181 184
182 185 checks = [
183 186 ('python', r'.*\.(py|cgi)$', pyfilters, pypats),
184 187 ('test script', r'(.*/)?test-[^.~]*$', testfilters, testpats),
185 188 ('c', r'.*\.c$', cfilters, cpats),
186 189 ('unified test', r'.*\.t$', utestfilters, utestpats),
187 190 ]
188 191
189 192 class norepeatlogger(object):
190 193 def __init__(self):
191 194 self._lastseen = None
192 195
193 196 def log(self, fname, lineno, line, msg, blame):
194 197 """print error related a to given line of a given file.
195 198
196 199 The faulty line will also be printed but only once in the case
197 200 of multiple errors.
198 201
199 202 :fname: filename
200 203 :lineno: line number
201 204 :line: actual content of the line
202 205 :msg: error message
203 206 """
204 207 msgid = fname, lineno, line
205 208 if msgid != self._lastseen:
206 209 if blame:
207 210 print "%s:%d (%s):" % (fname, lineno, blame)
208 211 else:
209 212 print "%s:%d:" % (fname, lineno)
210 213 print " > %s" % line
211 214 self._lastseen = msgid
212 215 print " " + msg
213 216
214 217 _defaultlogger = norepeatlogger()
215 218
216 219 def getblame(f):
217 220 lines = []
218 221 for l in os.popen('hg annotate -un %s' % f):
219 222 start, line = l.split(':', 1)
220 223 user, rev = start.split()
221 224 lines.append((line[1:-1], user, rev))
222 225 return lines
223 226
224 227 def checkfile(f, logfunc=_defaultlogger.log, maxerr=None, warnings=False,
225 228 blame=False):
226 229 """checks style and portability of a given file
227 230
228 231 :f: filepath
229 232 :logfunc: function used to report error
230 233 logfunc(filename, linenumber, linecontent, errormessage)
231 234 :maxerr: number of error to display before arborting.
232 235 Set to None (default) to report all errors
233 236
234 237 return True if no error is found, False otherwise.
235 238 """
236 239 blamecache = None
237 240 result = True
238 241 for name, match, filters, pats in checks:
239 242 fc = 0
240 243 if not re.match(match, f):
241 244 continue
242 245 pre = post = open(f).read()
243 246 if "no-" + "check-code" in pre:
244 247 break
245 248 for p, r in filters:
246 249 post = re.sub(p, r, post)
247 250 # print post # uncomment to show filtered version
248 251 z = enumerate(zip(pre.splitlines(), post.splitlines(True)))
249 252 for n, l in z:
250 253 if "check-code" + "-ignore" in l[0]:
251 254 continue
252 255 for p, msg in pats:
253 256 if not warnings and msg.startswith("warning"):
254 257 continue
255 258 if re.search(p, l[1]):
256 259 bd = ""
257 260 if blame:
258 261 bd = 'working directory'
259 262 if not blamecache:
260 263 blamecache = getblame(f)
261 264 if n < len(blamecache):
262 265 bl, bu, br = blamecache[n]
263 266 if bl == l[0]:
264 267 bd = '%s@%s' % (bu, br)
265 268 logfunc(f, n + 1, l[0], msg, bd)
266 269 fc += 1
267 270 result = False
268 271 if maxerr is not None and fc >= maxerr:
269 272 print " (too many errors, giving up)"
270 273 break
271 274 break
272 275 return result
273 276
274 277 if __name__ == "__main__":
275 278 parser = optparse.OptionParser("%prog [options] [files]")
276 279 parser.add_option("-w", "--warnings", action="store_true",
277 280 help="include warning-level checks")
278 281 parser.add_option("-p", "--per-file", type="int",
279 282 help="max warnings per file")
280 283 parser.add_option("-b", "--blame", action="store_true",
281 284 help="use annotate to generate blame info")
282 285
283 286 parser.set_defaults(per_file=15, warnings=False, blame=False)
284 287 (options, args) = parser.parse_args()
285 288
286 289 if len(args) == 0:
287 290 check = glob.glob("*")
288 291 else:
289 292 check = args
290 293
291 294 for f in check:
292 295 ret = 0
293 296 if not checkfile(f, maxerr=options.per_file, warnings=options.warnings,
294 297 blame=options.blame):
295 298 ret = 1
296 299 sys.exit(ret)
@@ -1,4526 +1,4526
1 1 # commands.py - command processing for mercurial
2 2 #
3 3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 4 #
5 5 # This software may be used and distributed according to the terms of the
6 6 # GNU General Public License version 2 or any later version.
7 7
8 8 from node import hex, nullid, nullrev, short
9 9 from lock import release
10 10 from i18n import _, gettext
11 11 import os, re, sys, difflib, time, tempfile
12 12 import hg, util, revlog, extensions, copies, error
13 13 import patch, help, mdiff, url, encoding, templatekw, discovery
14 14 import archival, changegroup, cmdutil, sshserver, hbisect, hgweb, hgweb.server
15 15 import merge as mergemod
16 16 import minirst, revset
17 17 import dagparser
18 18
19 19 # Commands start here, listed alphabetically
20 20
21 21 def add(ui, repo, *pats, **opts):
22 22 """add the specified files on the next commit
23 23
24 24 Schedule files to be version controlled and added to the
25 25 repository.
26 26
27 27 The files will be added to the repository at the next commit. To
28 28 undo an add before that, see :hg:`forget`.
29 29
30 30 If no names are given, add all files to the repository.
31 31
32 32 .. container:: verbose
33 33
34 34 An example showing how new (unknown) files are added
35 35 automatically by :hg:`add`::
36 36
37 37 $ ls
38 38 foo.c
39 39 $ hg status
40 40 ? foo.c
41 41 $ hg add
42 42 adding foo.c
43 43 $ hg status
44 44 A foo.c
45 45
46 46 Returns 0 if all files are successfully added.
47 47 """
48 48
49 49 m = cmdutil.match(repo, pats, opts)
50 50 rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'),
51 51 opts.get('subrepos'), prefix="")
52 52 return rejected and 1 or 0
53 53
54 54 def addremove(ui, repo, *pats, **opts):
55 55 """add all new files, delete all missing files
56 56
57 57 Add all new files and remove all missing files from the
58 58 repository.
59 59
60 60 New files are ignored if they match any of the patterns in
61 61 .hgignore. As with add, these changes take effect at the next
62 62 commit.
63 63
64 64 Use the -s/--similarity option to detect renamed files. With a
65 65 parameter greater than 0, this compares every removed file with
66 66 every added file and records those similar enough as renames. This
67 67 option takes a percentage between 0 (disabled) and 100 (files must
68 68 be identical) as its parameter. Detecting renamed files this way
69 69 can be expensive. After using this option, :hg:`status -C` can be
70 70 used to check which files were identified as moved or renamed.
71 71
72 72 Returns 0 if all files are successfully added.
73 73 """
74 74 try:
75 75 sim = float(opts.get('similarity') or 100)
76 76 except ValueError:
77 77 raise util.Abort(_('similarity must be a number'))
78 78 if sim < 0 or sim > 100:
79 79 raise util.Abort(_('similarity must be between 0 and 100'))
80 80 return cmdutil.addremove(repo, pats, opts, similarity=sim / 100.0)
81 81
82 82 def annotate(ui, repo, *pats, **opts):
83 83 """show changeset information by line for each file
84 84
85 85 List changes in files, showing the revision id responsible for
86 86 each line
87 87
88 88 This command is useful for discovering when a change was made and
89 89 by whom.
90 90
91 91 Without the -a/--text option, annotate will avoid processing files
92 92 it detects as binary. With -a, annotate will annotate the file
93 93 anyway, although the results will probably be neither useful
94 94 nor desirable.
95 95
96 96 Returns 0 on success.
97 97 """
98 98 if opts.get('follow'):
99 99 # --follow is deprecated and now just an alias for -f/--file
100 100 # to mimic the behavior of Mercurial before version 1.5
101 101 opts['file'] = 1
102 102
103 103 datefunc = ui.quiet and util.shortdate or util.datestr
104 104 getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
105 105
106 106 if not pats:
107 107 raise util.Abort(_('at least one filename or pattern is required'))
108 108
109 109 opmap = [('user', lambda x: ui.shortuser(x[0].user())),
110 110 ('number', lambda x: str(x[0].rev())),
111 111 ('changeset', lambda x: short(x[0].node())),
112 112 ('date', getdate),
113 113 ('file', lambda x: x[0].path()),
114 114 ]
115 115
116 116 if (not opts.get('user') and not opts.get('changeset')
117 117 and not opts.get('date') and not opts.get('file')):
118 118 opts['number'] = 1
119 119
120 120 linenumber = opts.get('line_number') is not None
121 121 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
122 122 raise util.Abort(_('at least one of -n/-c is required for -l'))
123 123
124 124 funcmap = [func for op, func in opmap if opts.get(op)]
125 125 if linenumber:
126 126 lastfunc = funcmap[-1]
127 127 funcmap[-1] = lambda x: "%s:%s" % (lastfunc(x), x[1])
128 128
129 129 ctx = cmdutil.revsingle(repo, opts.get('rev'))
130 130 m = cmdutil.match(repo, pats, opts)
131 131 follow = not opts.get('no_follow')
132 132 for abs in ctx.walk(m):
133 133 fctx = ctx[abs]
134 134 if not opts.get('text') and util.binary(fctx.data()):
135 135 ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
136 136 continue
137 137
138 138 lines = fctx.annotate(follow=follow, linenumber=linenumber)
139 139 pieces = []
140 140
141 141 for f in funcmap:
142 142 l = [f(n) for n, dummy in lines]
143 143 if l:
144 144 sized = [(x, encoding.colwidth(x)) for x in l]
145 145 ml = max([w for x, w in sized])
146 146 pieces.append(["%s%s" % (' ' * (ml - w), x) for x, w in sized])
147 147
148 148 if pieces:
149 149 for p, l in zip(zip(*pieces), lines):
150 150 ui.write("%s: %s" % (" ".join(p), l[1]))
151 151
152 152 def archive(ui, repo, dest, **opts):
153 153 '''create an unversioned archive of a repository revision
154 154
155 155 By default, the revision used is the parent of the working
156 156 directory; use -r/--rev to specify a different revision.
157 157
158 158 The archive type is automatically detected based on file
159 159 extension (or override using -t/--type).
160 160
161 161 Valid types are:
162 162
163 163 :``files``: a directory full of files (default)
164 164 :``tar``: tar archive, uncompressed
165 165 :``tbz2``: tar archive, compressed using bzip2
166 166 :``tgz``: tar archive, compressed using gzip
167 167 :``uzip``: zip archive, uncompressed
168 168 :``zip``: zip archive, compressed using deflate
169 169
170 170 The exact name of the destination archive or directory is given
171 171 using a format string; see :hg:`help export` for details.
172 172
173 173 Each member added to an archive file has a directory prefix
174 174 prepended. Use -p/--prefix to specify a format string for the
175 175 prefix. The default is the basename of the archive, with suffixes
176 176 removed.
177 177
178 178 Returns 0 on success.
179 179 '''
180 180
181 181 ctx = cmdutil.revsingle(repo, opts.get('rev'))
182 182 if not ctx:
183 183 raise util.Abort(_('no working directory: please specify a revision'))
184 184 node = ctx.node()
185 185 dest = cmdutil.make_filename(repo, dest, node)
186 186 if os.path.realpath(dest) == repo.root:
187 187 raise util.Abort(_('repository root cannot be destination'))
188 188
189 189 kind = opts.get('type') or archival.guesskind(dest) or 'files'
190 190 prefix = opts.get('prefix')
191 191
192 192 if dest == '-':
193 193 if kind == 'files':
194 194 raise util.Abort(_('cannot archive plain files to stdout'))
195 195 dest = sys.stdout
196 196 if not prefix:
197 197 prefix = os.path.basename(repo.root) + '-%h'
198 198
199 199 prefix = cmdutil.make_filename(repo, prefix, node)
200 200 matchfn = cmdutil.match(repo, [], opts)
201 201 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
202 202 matchfn, prefix, subrepos=opts.get('subrepos'))
203 203
204 204 def backout(ui, repo, node=None, rev=None, **opts):
205 205 '''reverse effect of earlier changeset
206 206
207 207 The backout command merges the reverse effect of the reverted
208 208 changeset into the working directory.
209 209
210 210 With the --merge option, it first commits the reverted changes
211 211 as a new changeset. This new changeset is a child of the reverted
212 212 changeset.
213 213 The --merge option remembers the parent of the working directory
214 214 before starting the backout, then merges the new head with that
215 215 changeset afterwards.
216 216 This will result in an explicit merge in the history.
217 217
218 218 If you backout a changeset other than the original parent of the
219 219 working directory, the result of this merge is not committed,
220 220 as with a normal merge. Otherwise, no merge is needed and the
221 221 commit is automatic.
222 222
223 223 Note that the default behavior (without --merge) has changed in
224 224 version 1.7. To restore the previous default behavior, use
225 225 :hg:`backout --merge` and then :hg:`update --clean .` to get rid of
226 226 the ongoing merge.
227 227
228 228 See :hg:`help dates` for a list of formats valid for -d/--date.
229 229
230 230 Returns 0 on success.
231 231 '''
232 232 if rev and node:
233 233 raise util.Abort(_("please specify just one revision"))
234 234
235 235 if not rev:
236 236 rev = node
237 237
238 238 if not rev:
239 239 raise util.Abort(_("please specify a revision to backout"))
240 240
241 241 date = opts.get('date')
242 242 if date:
243 243 opts['date'] = util.parsedate(date)
244 244
245 245 cmdutil.bail_if_changed(repo)
246 246 node = cmdutil.revsingle(repo, rev).node()
247 247
248 248 op1, op2 = repo.dirstate.parents()
249 249 a = repo.changelog.ancestor(op1, node)
250 250 if a != node:
251 251 raise util.Abort(_('cannot backout change on a different branch'))
252 252
253 253 p1, p2 = repo.changelog.parents(node)
254 254 if p1 == nullid:
255 255 raise util.Abort(_('cannot backout a change with no parents'))
256 256 if p2 != nullid:
257 257 if not opts.get('parent'):
258 258 raise util.Abort(_('cannot backout a merge changeset without '
259 259 '--parent'))
260 260 p = repo.lookup(opts['parent'])
261 261 if p not in (p1, p2):
262 262 raise util.Abort(_('%s is not a parent of %s') %
263 263 (short(p), short(node)))
264 264 parent = p
265 265 else:
266 266 if opts.get('parent'):
267 267 raise util.Abort(_('cannot use --parent on non-merge changeset'))
268 268 parent = p1
269 269
270 270 # the backout should appear on the same branch
271 271 branch = repo.dirstate.branch()
272 272 hg.clean(repo, node, show_stats=False)
273 273 repo.dirstate.setbranch(branch)
274 274 revert_opts = opts.copy()
275 275 revert_opts['date'] = None
276 276 revert_opts['all'] = True
277 277 revert_opts['rev'] = hex(parent)
278 278 revert_opts['no_backup'] = None
279 279 revert(ui, repo, **revert_opts)
280 280 if not opts.get('merge') and op1 != node:
281 281 try:
282 282 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
283 283 return hg.update(repo, op1)
284 284 finally:
285 285 ui.setconfig('ui', 'forcemerge', '')
286 286
287 287 commit_opts = opts.copy()
288 288 commit_opts['addremove'] = False
289 289 if not commit_opts['message'] and not commit_opts['logfile']:
290 290 # we don't translate commit messages
291 291 commit_opts['message'] = "Backed out changeset %s" % short(node)
292 292 commit_opts['force_editor'] = True
293 293 commit(ui, repo, **commit_opts)
294 294 def nice(node):
295 295 return '%d:%s' % (repo.changelog.rev(node), short(node))
296 296 ui.status(_('changeset %s backs out changeset %s\n') %
297 297 (nice(repo.changelog.tip()), nice(node)))
298 298 if opts.get('merge') and op1 != node:
299 299 hg.clean(repo, op1, show_stats=False)
300 300 ui.status(_('merging with changeset %s\n')
301 301 % nice(repo.changelog.tip()))
302 302 try:
303 303 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
304 304 return hg.merge(repo, hex(repo.changelog.tip()))
305 305 finally:
306 306 ui.setconfig('ui', 'forcemerge', '')
307 307 return 0
308 308
309 309 def bisect(ui, repo, rev=None, extra=None, command=None,
310 310 reset=None, good=None, bad=None, skip=None, noupdate=None):
311 311 """subdivision search of changesets
312 312
313 313 This command helps to find changesets which introduce problems. To
314 314 use, mark the earliest changeset you know exhibits the problem as
315 315 bad, then mark the latest changeset which is free from the problem
316 316 as good. Bisect will update your working directory to a revision
317 317 for testing (unless the -U/--noupdate option is specified). Once
318 318 you have performed tests, mark the working directory as good or
319 319 bad, and bisect will either update to another candidate changeset
320 320 or announce that it has found the bad revision.
321 321
322 322 As a shortcut, you can also use the revision argument to mark a
323 323 revision as good or bad without checking it out first.
324 324
325 325 If you supply a command, it will be used for automatic bisection.
326 326 Its exit status will be used to mark revisions as good or bad:
327 327 status 0 means good, 125 means to skip the revision, 127
328 328 (command not found) will abort the bisection, and any other
329 329 non-zero exit status means the revision is bad.
330 330
331 331 Returns 0 on success.
332 332 """
333 333 def print_result(nodes, good):
334 334 displayer = cmdutil.show_changeset(ui, repo, {})
335 335 if len(nodes) == 1:
336 336 # narrowed it down to a single revision
337 337 if good:
338 338 ui.write(_("The first good revision is:\n"))
339 339 else:
340 340 ui.write(_("The first bad revision is:\n"))
341 341 displayer.show(repo[nodes[0]])
342 342 parents = repo[nodes[0]].parents()
343 343 if len(parents) > 1:
344 344 side = good and state['bad'] or state['good']
345 345 num = len(set(i.node() for i in parents) & set(side))
346 346 if num == 1:
347 347 common = parents[0].ancestor(parents[1])
348 348 ui.write(_('Not all ancestors of this changeset have been'
349 349 ' checked.\nTo check the other ancestors, start'
350 350 ' from the common ancestor, %s.\n' % common))
351 351 else:
352 352 # multiple possible revisions
353 353 if good:
354 354 ui.write(_("Due to skipped revisions, the first "
355 355 "good revision could be any of:\n"))
356 356 else:
357 357 ui.write(_("Due to skipped revisions, the first "
358 358 "bad revision could be any of:\n"))
359 359 for n in nodes:
360 360 displayer.show(repo[n])
361 361 displayer.close()
362 362
363 363 def check_state(state, interactive=True):
364 364 if not state['good'] or not state['bad']:
365 365 if (good or bad or skip or reset) and interactive:
366 366 return
367 367 if not state['good']:
368 368 raise util.Abort(_('cannot bisect (no known good revisions)'))
369 369 else:
370 370 raise util.Abort(_('cannot bisect (no known bad revisions)'))
371 371 return True
372 372
373 373 # backward compatibility
374 374 if rev in "good bad reset init".split():
375 375 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
376 376 cmd, rev, extra = rev, extra, None
377 377 if cmd == "good":
378 378 good = True
379 379 elif cmd == "bad":
380 380 bad = True
381 381 else:
382 382 reset = True
383 383 elif extra or good + bad + skip + reset + bool(command) > 1:
384 384 raise util.Abort(_('incompatible arguments'))
385 385
386 386 if reset:
387 387 p = repo.join("bisect.state")
388 388 if os.path.exists(p):
389 389 os.unlink(p)
390 390 return
391 391
392 392 state = hbisect.load_state(repo)
393 393
394 394 if command:
395 395 changesets = 1
396 396 try:
397 397 while changesets:
398 398 # update state
399 399 status = util.system(command)
400 400 if status == 125:
401 401 transition = "skip"
402 402 elif status == 0:
403 403 transition = "good"
404 404 # status < 0 means process was killed
405 405 elif status == 127:
406 406 raise util.Abort(_("failed to execute %s") % command)
407 407 elif status < 0:
408 408 raise util.Abort(_("%s killed") % command)
409 409 else:
410 410 transition = "bad"
411 411 ctx = cmdutil.revsingle(repo, rev)
412 412 rev = None # clear for future iterations
413 413 state[transition].append(ctx.node())
414 414 ui.status(_('Changeset %d:%s: %s\n') % (ctx, ctx, transition))
415 415 check_state(state, interactive=False)
416 416 # bisect
417 417 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
418 418 # update to next check
419 419 cmdutil.bail_if_changed(repo)
420 420 hg.clean(repo, nodes[0], show_stats=False)
421 421 finally:
422 422 hbisect.save_state(repo, state)
423 423 print_result(nodes, good)
424 424 return
425 425
426 426 # update state
427 427
428 428 if rev:
429 429 nodes = [repo.lookup(i) for i in cmdutil.revrange(repo, [rev])]
430 430 else:
431 431 nodes = [repo.lookup('.')]
432 432
433 433 if good or bad or skip:
434 434 if good:
435 435 state['good'] += nodes
436 436 elif bad:
437 437 state['bad'] += nodes
438 438 elif skip:
439 439 state['skip'] += nodes
440 440 hbisect.save_state(repo, state)
441 441
442 442 if not check_state(state):
443 443 return
444 444
445 445 # actually bisect
446 446 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
447 447 if changesets == 0:
448 448 print_result(nodes, good)
449 449 else:
450 450 assert len(nodes) == 1 # only a single node can be tested next
451 451 node = nodes[0]
452 452 # compute the approximate number of remaining tests
453 453 tests, size = 0, 2
454 454 while size <= changesets:
455 455 tests, size = tests + 1, size * 2
456 456 rev = repo.changelog.rev(node)
457 457 ui.write(_("Testing changeset %d:%s "
458 458 "(%d changesets remaining, ~%d tests)\n")
459 459 % (rev, short(node), changesets, tests))
460 460 if not noupdate:
461 461 cmdutil.bail_if_changed(repo)
462 462 return hg.clean(repo, node)
463 463
464 464 def branch(ui, repo, label=None, **opts):
465 465 """set or show the current branch name
466 466
467 467 With no argument, show the current branch name. With one argument,
468 468 set the working directory branch name (the branch will not exist
469 469 in the repository until the next commit). Standard practice
470 470 recommends that primary development take place on the 'default'
471 471 branch.
472 472
473 473 Unless -f/--force is specified, branch will not let you set a
474 474 branch name that already exists, even if it's inactive.
475 475
476 476 Use -C/--clean to reset the working directory branch to that of
477 477 the parent of the working directory, negating a previous branch
478 478 change.
479 479
480 480 Use the command :hg:`update` to switch to an existing branch. Use
481 481 :hg:`commit --close-branch` to mark this branch as closed.
482 482
483 483 Returns 0 on success.
484 484 """
485 485
486 486 if opts.get('clean'):
487 487 label = repo[None].parents()[0].branch()
488 488 repo.dirstate.setbranch(label)
489 489 ui.status(_('reset working directory to branch %s\n') % label)
490 490 elif label:
491 491 utflabel = encoding.fromlocal(label)
492 492 if not opts.get('force') and utflabel in repo.branchtags():
493 493 if label not in [p.branch() for p in repo.parents()]:
494 494 raise util.Abort(_('a branch of the same name already exists'
495 495 " (use 'hg update' to switch to it)"))
496 496 repo.dirstate.setbranch(utflabel)
497 497 ui.status(_('marked working directory as branch %s\n') % label)
498 498 else:
499 499 ui.write("%s\n" % encoding.tolocal(repo.dirstate.branch()))
500 500
501 501 def branches(ui, repo, active=False, closed=False):
502 502 """list repository named branches
503 503
504 504 List the repository's named branches, indicating which ones are
505 505 inactive. If -c/--closed is specified, also list branches which have
506 506 been marked closed (see :hg:`commit --close-branch`).
507 507
508 508 If -a/--active is specified, only show active branches. A branch
509 509 is considered active if it contains repository heads.
510 510
511 511 Use the command :hg:`update` to switch to an existing branch.
512 512
513 513 Returns 0.
514 514 """
515 515
516 516 hexfunc = ui.debugflag and hex or short
517 517 activebranches = [repo[n].branch() for n in repo.heads()]
518 518 def testactive(tag, node):
519 519 realhead = tag in activebranches
520 520 open = node in repo.branchheads(tag, closed=False)
521 521 return realhead and open
522 522 branches = sorted([(testactive(tag, node), repo.changelog.rev(node), tag)
523 523 for tag, node in repo.branchtags().items()],
524 524 reverse=True)
525 525
526 526 for isactive, node, tag in branches:
527 527 if (not active) or isactive:
528 528 encodedtag = encoding.tolocal(tag)
529 529 if ui.quiet:
530 530 ui.write("%s\n" % encodedtag)
531 531 else:
532 532 hn = repo.lookup(node)
533 533 if isactive:
534 534 label = 'branches.active'
535 535 notice = ''
536 536 elif hn not in repo.branchheads(tag, closed=False):
537 537 if not closed:
538 538 continue
539 539 label = 'branches.closed'
540 540 notice = _(' (closed)')
541 541 else:
542 542 label = 'branches.inactive'
543 543 notice = _(' (inactive)')
544 544 if tag == repo.dirstate.branch():
545 545 label = 'branches.current'
546 546 rev = str(node).rjust(31 - encoding.colwidth(encodedtag))
547 547 rev = ui.label('%s:%s' % (rev, hexfunc(hn)), 'log.changeset')
548 548 encodedtag = ui.label(encodedtag, label)
549 549 ui.write("%s %s%s\n" % (encodedtag, rev, notice))
550 550
551 551 def bundle(ui, repo, fname, dest=None, **opts):
552 552 """create a changegroup file
553 553
554 554 Generate a compressed changegroup file collecting changesets not
555 555 known to be in another repository.
556 556
557 557 If you omit the destination repository, then hg assumes the
558 558 destination will have all the nodes you specify with --base
559 559 parameters. To create a bundle containing all changesets, use
560 560 -a/--all (or --base null).
561 561
562 562 You can change compression method with the -t/--type option.
563 563 The available compression methods are: none, bzip2, and
564 564 gzip (by default, bundles are compressed using bzip2).
565 565
566 566 The bundle file can then be transferred using conventional means
567 567 and applied to another repository with the unbundle or pull
568 568 command. This is useful when direct push and pull are not
569 569 available or when exporting an entire repository is undesirable.
570 570
571 571 Applying bundles preserves all changeset contents including
572 572 permissions, copy/rename information, and revision history.
573 573
574 574 Returns 0 on success, 1 if no changes found.
575 575 """
576 576 revs = None
577 577 if 'rev' in opts:
578 578 revs = cmdutil.revrange(repo, opts['rev'])
579 579
580 580 if opts.get('all'):
581 581 base = ['null']
582 582 else:
583 583 base = cmdutil.revrange(repo, opts.get('base'))
584 584 if base:
585 585 if dest:
586 586 raise util.Abort(_("--base is incompatible with specifying "
587 587 "a destination"))
588 588 base = [repo.lookup(rev) for rev in base]
589 589 # create the right base
590 590 # XXX: nodesbetween / changegroup* should be "fixed" instead
591 591 o = []
592 592 has = set((nullid,))
593 593 for n in base:
594 594 has.update(repo.changelog.reachable(n))
595 595 if revs:
596 596 revs = [repo.lookup(rev) for rev in revs]
597 597 visit = revs[:]
598 598 has.difference_update(visit)
599 599 else:
600 600 visit = repo.changelog.heads()
601 601 seen = {}
602 602 while visit:
603 603 n = visit.pop(0)
604 604 parents = [p for p in repo.changelog.parents(n) if p not in has]
605 605 if len(parents) == 0:
606 606 if n not in has:
607 607 o.append(n)
608 608 else:
609 609 for p in parents:
610 610 if p not in seen:
611 611 seen[p] = 1
612 612 visit.append(p)
613 613 else:
614 614 dest = ui.expandpath(dest or 'default-push', dest or 'default')
615 615 dest, branches = hg.parseurl(dest, opts.get('branch'))
616 616 other = hg.repository(hg.remoteui(repo, opts), dest)
617 617 revs, checkout = hg.addbranchrevs(repo, other, branches, revs)
618 618 if revs:
619 619 revs = [repo.lookup(rev) for rev in revs]
620 620 o = discovery.findoutgoing(repo, other, force=opts.get('force'))
621 621
622 622 if not o:
623 623 ui.status(_("no changes found\n"))
624 624 return 1
625 625
626 626 if revs:
627 627 cg = repo.changegroupsubset(o, revs, 'bundle')
628 628 else:
629 629 cg = repo.changegroup(o, 'bundle')
630 630
631 631 bundletype = opts.get('type', 'bzip2').lower()
632 632 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
633 633 bundletype = btypes.get(bundletype)
634 634 if bundletype not in changegroup.bundletypes:
635 635 raise util.Abort(_('unknown bundle type specified with --type'))
636 636
637 637 changegroup.writebundle(cg, fname, bundletype)
638 638
639 639 def cat(ui, repo, file1, *pats, **opts):
640 640 """output the current or given revision of files
641 641
642 642 Print the specified files as they were at the given revision. If
643 643 no revision is given, the parent of the working directory is used,
644 644 or tip if no revision is checked out.
645 645
646 646 Output may be to a file, in which case the name of the file is
647 647 given using a format string. The formatting rules are the same as
648 648 for the export command, with the following additions:
649 649
650 650 :``%s``: basename of file being printed
651 651 :``%d``: dirname of file being printed, or '.' if in repository root
652 652 :``%p``: root-relative path name of file being printed
653 653
654 654 Returns 0 on success.
655 655 """
656 656 ctx = cmdutil.revsingle(repo, opts.get('rev'))
657 657 err = 1
658 658 m = cmdutil.match(repo, (file1,) + pats, opts)
659 659 for abs in ctx.walk(m):
660 660 fp = cmdutil.make_file(repo, opts.get('output'), ctx.node(), pathname=abs)
661 661 data = ctx[abs].data()
662 662 if opts.get('decode'):
663 663 data = repo.wwritedata(abs, data)
664 664 fp.write(data)
665 665 err = 0
666 666 return err
667 667
668 668 def clone(ui, source, dest=None, **opts):
669 669 """make a copy of an existing repository
670 670
671 671 Create a copy of an existing repository in a new directory.
672 672
673 673 If no destination directory name is specified, it defaults to the
674 674 basename of the source.
675 675
676 676 The location of the source is added to the new repository's
677 677 .hg/hgrc file, as the default to be used for future pulls.
678 678
679 679 See :hg:`help urls` for valid source format details.
680 680
681 681 It is possible to specify an ``ssh://`` URL as the destination, but no
682 682 .hg/hgrc and working directory will be created on the remote side.
683 683 Please see :hg:`help urls` for important details about ``ssh://`` URLs.
684 684
685 685 A set of changesets (tags, or branch names) to pull may be specified
686 686 by listing each changeset (tag, or branch name) with -r/--rev.
687 687 If -r/--rev is used, the cloned repository will contain only a subset
688 688 of the changesets of the source repository. Only the set of changesets
689 689 defined by all -r/--rev options (including all their ancestors)
690 690 will be pulled into the destination repository.
691 691 No subsequent changesets (including subsequent tags) will be present
692 692 in the destination.
693 693
694 694 Using -r/--rev (or 'clone src#rev dest') implies --pull, even for
695 695 local source repositories.
696 696
697 697 For efficiency, hardlinks are used for cloning whenever the source
698 698 and destination are on the same filesystem (note this applies only
699 699 to the repository data, not to the working directory). Some
700 700 filesystems, such as AFS, implement hardlinking incorrectly, but
701 701 do not report errors. In these cases, use the --pull option to
702 702 avoid hardlinking.
703 703
704 704 In some cases, you can clone repositories and the working directory
705 705 using full hardlinks with ::
706 706
707 707 $ cp -al REPO REPOCLONE
708 708
709 709 This is the fastest way to clone, but it is not always safe. The
710 710 operation is not atomic (making sure REPO is not modified during
711 711 the operation is up to you) and you have to make sure your editor
712 712 breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,
713 713 this is not compatible with certain extensions that place their
714 714 metadata under the .hg directory, such as mq.
715 715
716 716 Mercurial will update the working directory to the first applicable
717 717 revision from this list:
718 718
719 719 a) null if -U or the source repository has no changesets
720 720 b) if -u . and the source repository is local, the first parent of
721 721 the source repository's working directory
722 722 c) the changeset specified with -u (if a branch name, this means the
723 723 latest head of that branch)
724 724 d) the changeset specified with -r
725 725 e) the tipmost head specified with -b
726 726 f) the tipmost head specified with the url#branch source syntax
727 727 g) the tipmost head of the default branch
728 728 h) tip
729 729
730 730 Returns 0 on success.
731 731 """
732 732 if opts.get('noupdate') and opts.get('updaterev'):
733 733 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
734 734
735 735 r = hg.clone(hg.remoteui(ui, opts), source, dest,
736 736 pull=opts.get('pull'),
737 737 stream=opts.get('uncompressed'),
738 738 rev=opts.get('rev'),
739 739 update=opts.get('updaterev') or not opts.get('noupdate'),
740 740 branch=opts.get('branch'))
741 741
742 742 return r is None
743 743
744 744 def commit(ui, repo, *pats, **opts):
745 745 """commit the specified files or all outstanding changes
746 746
747 747 Commit changes to the given files into the repository. Unlike a
748 748 centralized RCS, this operation is a local operation. See
749 749 :hg:`push` for a way to actively distribute your changes.
750 750
751 751 If a list of files is omitted, all changes reported by :hg:`status`
752 752 will be committed.
753 753
754 754 If you are committing the result of a merge, do not provide any
755 755 filenames or -I/-X filters.
756 756
757 757 If no commit message is specified, Mercurial starts your
758 758 configured editor where you can enter a message. In case your
759 759 commit fails, you will find a backup of your message in
760 760 ``.hg/last-message.txt``.
761 761
762 762 See :hg:`help dates` for a list of formats valid for -d/--date.
763 763
764 764 Returns 0 on success, 1 if nothing changed.
765 765 """
766 766 extra = {}
767 767 if opts.get('close_branch'):
768 768 if repo['.'].node() not in repo.branchheads():
769 769 # The topo heads set is included in the branch heads set of the
770 770 # current branch, so it's sufficient to test branchheads
771 771 raise util.Abort(_('can only close branch heads'))
772 772 extra['close'] = 1
773 773 e = cmdutil.commiteditor
774 774 if opts.get('force_editor'):
775 775 e = cmdutil.commitforceeditor
776 776
777 777 def commitfunc(ui, repo, message, match, opts):
778 778 return repo.commit(message, opts.get('user'), opts.get('date'), match,
779 779 editor=e, extra=extra)
780 780
781 781 branch = repo[None].branch()
782 782 bheads = repo.branchheads(branch)
783 783
784 784 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
785 785 if not node:
786 786 ui.status(_("nothing changed\n"))
787 787 return 1
788 788
789 789 ctx = repo[node]
790 790 parents = ctx.parents()
791 791
792 792 if bheads and not [x for x in parents
793 793 if x.node() in bheads and x.branch() == branch]:
794 794 ui.status(_('created new head\n'))
795 795 # The message is not printed for initial roots. For the other
796 796 # changesets, it is printed in the following situations:
797 797 #
798 798 # Par column: for the 2 parents with ...
799 799 # N: null or no parent
800 800 # B: parent is on another named branch
801 801 # C: parent is a regular non head changeset
802 802 # H: parent was a branch head of the current branch
803 803 # Msg column: whether we print "created new head" message
804 804 # In the following, it is assumed that there already exists some
805 805 # initial branch heads of the current branch, otherwise nothing is
806 806 # printed anyway.
807 807 #
808 808 # Par Msg Comment
809 809 # NN y additional topo root
810 810 #
811 811 # BN y additional branch root
812 812 # CN y additional topo head
813 813 # HN n usual case
814 814 #
815 815 # BB y weird additional branch root
816 816 # CB y branch merge
817 817 # HB n merge with named branch
818 818 #
819 819 # CC y additional head from merge
820 820 # CH n merge with a head
821 821 #
822 822 # HH n head merge: head count decreases
823 823
824 824 if not opts.get('close_branch'):
825 825 for r in parents:
826 826 if r.extra().get('close') and r.branch() == branch:
827 827 ui.status(_('reopening closed branch head %d\n') % r)
828 828
829 829 if ui.debugflag:
830 830 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex()))
831 831 elif ui.verbose:
832 832 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx))
833 833
834 834 def copy(ui, repo, *pats, **opts):
835 835 """mark files as copied for the next commit
836 836
837 837 Mark dest as having copies of source files. If dest is a
838 838 directory, copies are put in that directory. If dest is a file,
839 839 the source must be a single file.
840 840
841 841 By default, this command copies the contents of files as they
842 842 exist in the working directory. If invoked with -A/--after, the
843 843 operation is recorded, but no copying is performed.
844 844
845 845 This command takes effect with the next commit. To undo a copy
846 846 before that, see :hg:`revert`.
847 847
848 848 Returns 0 on success, 1 if errors are encountered.
849 849 """
850 850 wlock = repo.wlock(False)
851 851 try:
852 852 return cmdutil.copy(ui, repo, pats, opts)
853 853 finally:
854 854 wlock.release()
855 855
856 856 def debugancestor(ui, repo, *args):
857 857 """find the ancestor revision of two revisions in a given index"""
858 858 if len(args) == 3:
859 859 index, rev1, rev2 = args
860 860 r = revlog.revlog(util.opener(os.getcwd(), audit=False), index)
861 861 lookup = r.lookup
862 862 elif len(args) == 2:
863 863 if not repo:
864 864 raise util.Abort(_("there is no Mercurial repository here "
865 865 "(.hg not found)"))
866 866 rev1, rev2 = args
867 867 r = repo.changelog
868 868 lookup = repo.lookup
869 869 else:
870 870 raise util.Abort(_('either two or three arguments required'))
871 871 a = r.ancestor(lookup(rev1), lookup(rev2))
872 872 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
873 873
874 874 def debugbuilddag(ui, repo, text,
875 875 mergeable_file=False,
876 876 appended_file=False,
877 877 overwritten_file=False,
878 878 new_file=False):
879 879 """builds a repo with a given dag from scratch in the current empty repo
880 880
881 881 Elements:
882 882
883 883 - "+n" is a linear run of n nodes based on the current default parent
884 884 - "." is a single node based on the current default parent
885 885 - "$" resets the default parent to null (implied at the start);
886 886 otherwise the default parent is always the last node created
887 887 - "<p" sets the default parent to the backref p
888 888 - "*p" is a fork at parent p, which is a backref
889 889 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
890 890 - "/p2" is a merge of the preceding node and p2
891 891 - ":tag" defines a local tag for the preceding node
892 892 - "@branch" sets the named branch for subsequent nodes
893 893 - "!command" runs the command using your shell
894 894 - "!!my command\\n" is like "!", but to the end of the line
895 895 - "#...\\n" is a comment up to the end of the line
896 896
897 897 Whitespace between the above elements is ignored.
898 898
899 899 A backref is either
900 900
901 901 - a number n, which references the node curr-n, where curr is the current
902 902 node, or
903 903 - the name of a local tag you placed earlier using ":tag", or
904 904 - empty to denote the default parent.
905 905
906 906 All string valued-elements are either strictly alphanumeric, or must
907 907 be enclosed in double quotes ("..."), with "\\" as escape character.
908 908
909 909 Note that the --overwritten-file and --appended-file options imply the
910 910 use of "HGMERGE=internal:local" during DAG buildup.
911 911 """
912 912
913 913 if not (mergeable_file or appended_file or overwritten_file or new_file):
914 914 raise util.Abort(_('need at least one of -m, -a, -o, -n'))
915 915
916 916 if len(repo.changelog) > 0:
917 917 raise util.Abort(_('repository is not empty'))
918 918
919 919 if overwritten_file or appended_file:
920 920 # we don't want to fail in merges during buildup
921 921 os.environ['HGMERGE'] = 'internal:local'
922 922
923 923 def writefile(fname, text, fmode="wb"):
924 924 f = open(fname, fmode)
925 925 try:
926 926 f.write(text)
927 927 finally:
928 928 f.close()
929 929
930 930 if mergeable_file:
931 931 linesperrev = 2
932 932 # determine number of revs in DAG
933 933 n = 0
934 934 for type, data in dagparser.parsedag(text):
935 935 if type == 'n':
936 936 n += 1
937 937 # make a file with k lines per rev
938 938 writefile("mf", "\n".join(str(i) for i in xrange(0, n * linesperrev))
939 939 + "\n")
940 940
941 941 at = -1
942 942 atbranch = 'default'
943 943 for type, data in dagparser.parsedag(text):
944 944 if type == 'n':
945 945 ui.status('node %s\n' % str(data))
946 946 id, ps = data
947 947 p1 = ps[0]
948 948 if p1 != at:
949 949 update(ui, repo, node=str(p1), clean=True)
950 950 at = p1
951 951 if repo.dirstate.branch() != atbranch:
952 952 branch(ui, repo, atbranch, force=True)
953 953 if len(ps) > 1:
954 954 p2 = ps[1]
955 955 merge(ui, repo, node=p2)
956 956
957 957 if mergeable_file:
958 958 f = open("mf", "rb+")
959 959 try:
960 960 lines = f.read().split("\n")
961 961 lines[id * linesperrev] += " r%i" % id
962 962 f.seek(0)
963 963 f.write("\n".join(lines))
964 964 finally:
965 965 f.close()
966 966
967 967 if appended_file:
968 968 writefile("af", "r%i\n" % id, "ab")
969 969
970 970 if overwritten_file:
971 971 writefile("of", "r%i\n" % id)
972 972
973 973 if new_file:
974 974 writefile("nf%i" % id, "r%i\n" % id)
975 975
976 976 commit(ui, repo, addremove=True, message="r%i" % id, date=(id, 0))
977 977 at = id
978 978 elif type == 'l':
979 979 id, name = data
980 980 ui.status('tag %s\n' % name)
981 981 tag(ui, repo, name, local=True)
982 982 elif type == 'a':
983 983 ui.status('branch %s\n' % data)
984 984 atbranch = data
985 985 elif type in 'cC':
986 986 r = util.system(data, cwd=repo.root)
987 987 if r:
988 988 desc, r = util.explain_exit(r)
989 989 raise util.Abort(_('%s command %s') % (data, desc))
990 990
991 991 def debugcommands(ui, cmd='', *args):
992 992 """list all available commands and options"""
993 993 for cmd, vals in sorted(table.iteritems()):
994 994 cmd = cmd.split('|')[0].strip('^')
995 995 opts = ', '.join([i[1] for i in vals[1]])
996 996 ui.write('%s: %s\n' % (cmd, opts))
997 997
998 998 def debugcomplete(ui, cmd='', **opts):
999 999 """returns the completion list associated with the given command"""
1000 1000
1001 1001 if opts.get('options'):
1002 1002 options = []
1003 1003 otables = [globalopts]
1004 1004 if cmd:
1005 1005 aliases, entry = cmdutil.findcmd(cmd, table, False)
1006 1006 otables.append(entry[1])
1007 1007 for t in otables:
1008 1008 for o in t:
1009 1009 if "(DEPRECATED)" in o[3]:
1010 1010 continue
1011 1011 if o[0]:
1012 1012 options.append('-%s' % o[0])
1013 1013 options.append('--%s' % o[1])
1014 1014 ui.write("%s\n" % "\n".join(options))
1015 1015 return
1016 1016
1017 1017 cmdlist = cmdutil.findpossible(cmd, table)
1018 1018 if ui.verbose:
1019 1019 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
1020 1020 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1021 1021
1022 1022 def debugfsinfo(ui, path = "."):
1023 1023 """show information detected about current filesystem"""
1024 1024 open('.debugfsinfo', 'w').write('')
1025 1025 ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
1026 1026 ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
1027 1027 ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
1028 1028 and 'yes' or 'no'))
1029 1029 os.unlink('.debugfsinfo')
1030 1030
1031 1031 def debugrebuildstate(ui, repo, rev="tip"):
1032 1032 """rebuild the dirstate as it would look like for the given revision"""
1033 1033 ctx = cmdutil.revsingle(repo, rev)
1034 1034 wlock = repo.wlock()
1035 1035 try:
1036 1036 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
1037 1037 finally:
1038 1038 wlock.release()
1039 1039
1040 1040 def debugcheckstate(ui, repo):
1041 1041 """validate the correctness of the current dirstate"""
1042 1042 parent1, parent2 = repo.dirstate.parents()
1043 1043 m1 = repo[parent1].manifest()
1044 1044 m2 = repo[parent2].manifest()
1045 1045 errors = 0
1046 1046 for f in repo.dirstate:
1047 1047 state = repo.dirstate[f]
1048 1048 if state in "nr" and f not in m1:
1049 1049 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
1050 1050 errors += 1
1051 1051 if state in "a" and f in m1:
1052 1052 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
1053 1053 errors += 1
1054 1054 if state in "m" and f not in m1 and f not in m2:
1055 1055 ui.warn(_("%s in state %s, but not in either manifest\n") %
1056 1056 (f, state))
1057 1057 errors += 1
1058 1058 for f in m1:
1059 1059 state = repo.dirstate[f]
1060 1060 if state not in "nrm":
1061 1061 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
1062 1062 errors += 1
1063 1063 if errors:
1064 1064 error = _(".hg/dirstate inconsistent with current parent's manifest")
1065 1065 raise util.Abort(error)
1066 1066
1067 1067 def showconfig(ui, repo, *values, **opts):
1068 1068 """show combined config settings from all hgrc files
1069 1069
1070 1070 With no arguments, print names and values of all config items.
1071 1071
1072 1072 With one argument of the form section.name, print just the value
1073 1073 of that config item.
1074 1074
1075 1075 With multiple arguments, print names and values of all config
1076 1076 items with matching section names.
1077 1077
1078 1078 With --debug, the source (filename and line number) is printed
1079 1079 for each config item.
1080 1080
1081 1081 Returns 0 on success.
1082 1082 """
1083 1083
1084 1084 for f in util.rcpath():
1085 1085 ui.debug(_('read config from: %s\n') % f)
1086 1086 untrusted = bool(opts.get('untrusted'))
1087 1087 if values:
1088 1088 sections = [v for v in values if '.' not in v]
1089 1089 items = [v for v in values if '.' in v]
1090 1090 if len(items) > 1 or items and sections:
1091 1091 raise util.Abort(_('only one config item permitted'))
1092 1092 for section, name, value in ui.walkconfig(untrusted=untrusted):
1093 1093 sectname = section + '.' + name
1094 1094 if values:
1095 1095 for v in values:
1096 1096 if v == section:
1097 1097 ui.debug('%s: ' %
1098 1098 ui.configsource(section, name, untrusted))
1099 1099 ui.write('%s=%s\n' % (sectname, value))
1100 1100 elif v == sectname:
1101 1101 ui.debug('%s: ' %
1102 1102 ui.configsource(section, name, untrusted))
1103 1103 ui.write(value, '\n')
1104 1104 else:
1105 1105 ui.debug('%s: ' %
1106 1106 ui.configsource(section, name, untrusted))
1107 1107 ui.write('%s=%s\n' % (sectname, value))
1108 1108
1109 1109 def debugpushkey(ui, repopath, namespace, *keyinfo):
1110 1110 '''access the pushkey key/value protocol
1111 1111
1112 1112 With two args, list the keys in the given namespace.
1113 1113
1114 1114 With five args, set a key to new if it currently is set to old.
1115 1115 Reports success or failure.
1116 1116 '''
1117 1117
1118 1118 target = hg.repository(ui, repopath)
1119 1119 if keyinfo:
1120 1120 key, old, new = keyinfo
1121 1121 r = target.pushkey(namespace, key, old, new)
1122 1122 ui.status(str(r) + '\n')
1123 return not(r)
1123 return not r
1124 1124 else:
1125 1125 for k, v in target.listkeys(namespace).iteritems():
1126 1126 ui.write("%s\t%s\n" % (k.encode('string-escape'),
1127 1127 v.encode('string-escape')))
1128 1128
1129 1129 def debugrevspec(ui, repo, expr):
1130 1130 '''parse and apply a revision specification'''
1131 1131 if ui.verbose:
1132 1132 tree = revset.parse(expr)
1133 1133 ui.note(tree, "\n")
1134 1134 func = revset.match(expr)
1135 1135 for c in func(repo, range(len(repo))):
1136 1136 ui.write("%s\n" % c)
1137 1137
1138 1138 def debugsetparents(ui, repo, rev1, rev2=None):
1139 1139 """manually set the parents of the current working directory
1140 1140
1141 1141 This is useful for writing repository conversion tools, but should
1142 1142 be used with care.
1143 1143
1144 1144 Returns 0 on success.
1145 1145 """
1146 1146
1147 1147 r1 = cmdutil.revsingle(repo, rev1).node()
1148 1148 r2 = cmdutil.revsingle(repo, rev2, 'null').node()
1149 1149
1150 1150 wlock = repo.wlock()
1151 1151 try:
1152 1152 repo.dirstate.setparents(r1, r2)
1153 1153 finally:
1154 1154 wlock.release()
1155 1155
1156 1156 def debugstate(ui, repo, nodates=None):
1157 1157 """show the contents of the current dirstate"""
1158 1158 timestr = ""
1159 1159 showdate = not nodates
1160 1160 for file_, ent in sorted(repo.dirstate._map.iteritems()):
1161 1161 if showdate:
1162 1162 if ent[3] == -1:
1163 1163 # Pad or slice to locale representation
1164 1164 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
1165 1165 time.localtime(0)))
1166 1166 timestr = 'unset'
1167 1167 timestr = (timestr[:locale_len] +
1168 1168 ' ' * (locale_len - len(timestr)))
1169 1169 else:
1170 1170 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
1171 1171 time.localtime(ent[3]))
1172 1172 if ent[1] & 020000:
1173 1173 mode = 'lnk'
1174 1174 else:
1175 1175 mode = '%3o' % (ent[1] & 0777)
1176 1176 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
1177 1177 for f in repo.dirstate.copies():
1178 1178 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
1179 1179
1180 1180 def debugsub(ui, repo, rev=None):
1181 1181 ctx = cmdutil.revsingle(repo, rev, None)
1182 1182 for k, v in sorted(ctx.substate.items()):
1183 1183 ui.write('path %s\n' % k)
1184 1184 ui.write(' source %s\n' % v[0])
1185 1185 ui.write(' revision %s\n' % v[1])
1186 1186
1187 1187 def debugdag(ui, repo, file_=None, *revs, **opts):
1188 1188 """format the changelog or an index DAG as a concise textual description
1189 1189
1190 1190 If you pass a revlog index, the revlog's DAG is emitted. If you list
1191 1191 revision numbers, they get labelled in the output as rN.
1192 1192
1193 1193 Otherwise, the changelog DAG of the current repo is emitted.
1194 1194 """
1195 1195 spaces = opts.get('spaces')
1196 1196 dots = opts.get('dots')
1197 1197 if file_:
1198 1198 rlog = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
1199 1199 revs = set((int(r) for r in revs))
1200 1200 def events():
1201 1201 for r in rlog:
1202 1202 yield 'n', (r, list(set(p for p in rlog.parentrevs(r) if p != -1)))
1203 1203 if r in revs:
1204 1204 yield 'l', (r, "r%i" % r)
1205 1205 elif repo:
1206 1206 cl = repo.changelog
1207 1207 tags = opts.get('tags')
1208 1208 branches = opts.get('branches')
1209 1209 if tags:
1210 1210 labels = {}
1211 1211 for l, n in repo.tags().items():
1212 1212 labels.setdefault(cl.rev(n), []).append(l)
1213 1213 def events():
1214 1214 b = "default"
1215 1215 for r in cl:
1216 1216 if branches:
1217 1217 newb = cl.read(cl.node(r))[5]['branch']
1218 1218 if newb != b:
1219 1219 yield 'a', newb
1220 1220 b = newb
1221 1221 yield 'n', (r, list(set(p for p in cl.parentrevs(r) if p != -1)))
1222 1222 if tags:
1223 1223 ls = labels.get(r)
1224 1224 if ls:
1225 1225 for l in ls:
1226 1226 yield 'l', (r, l)
1227 1227 else:
1228 1228 raise util.Abort(_('need repo for changelog dag'))
1229 1229
1230 1230 for line in dagparser.dagtextlines(events(),
1231 1231 addspaces=spaces,
1232 1232 wraplabels=True,
1233 1233 wrapannotations=True,
1234 1234 wrapnonlinear=dots,
1235 1235 usedots=dots,
1236 1236 maxlinewidth=70):
1237 1237 ui.write(line)
1238 1238 ui.write("\n")
1239 1239
1240 1240 def debugdata(ui, repo, file_, rev):
1241 1241 """dump the contents of a data file revision"""
1242 1242 r = None
1243 1243 if repo:
1244 1244 filelog = repo.file(file_)
1245 1245 if len(filelog):
1246 1246 r = filelog
1247 1247 if not r:
1248 1248 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_[:-2] + ".i")
1249 1249 try:
1250 1250 ui.write(r.revision(r.lookup(rev)))
1251 1251 except KeyError:
1252 1252 raise util.Abort(_('invalid revision identifier %s') % rev)
1253 1253
1254 1254 def debugdate(ui, date, range=None, **opts):
1255 1255 """parse and display a date"""
1256 1256 if opts["extended"]:
1257 1257 d = util.parsedate(date, util.extendeddateformats)
1258 1258 else:
1259 1259 d = util.parsedate(date)
1260 1260 ui.write("internal: %s %s\n" % d)
1261 1261 ui.write("standard: %s\n" % util.datestr(d))
1262 1262 if range:
1263 1263 m = util.matchdate(range)
1264 1264 ui.write("match: %s\n" % m(d[0]))
1265 1265
1266 1266 def debugindex(ui, repo, file_, **opts):
1267 1267 """dump the contents of an index file"""
1268 1268 r = None
1269 1269 if repo:
1270 1270 filelog = repo.file(file_)
1271 1271 if len(filelog):
1272 1272 r = filelog
1273 1273
1274 1274 format = opts.get('format', 0)
1275 1275 if format not in (0, 1):
1276 1276 raise util.abort("unknown format %d" % format)
1277 1277
1278 1278 if not r:
1279 1279 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
1280 1280
1281 1281 if format == 0:
1282 1282 ui.write(" rev offset length base linkrev"
1283 1283 " nodeid p1 p2\n")
1284 1284 elif format == 1:
1285 1285 ui.write(" rev flag offset length"
1286 1286 " size base link p1 p2 nodeid\n")
1287 1287
1288 1288 for i in r:
1289 1289 node = r.node(i)
1290 1290 if format == 0:
1291 1291 try:
1292 1292 pp = r.parents(node)
1293 1293 except:
1294 1294 pp = [nullid, nullid]
1295 1295 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
1296 1296 i, r.start(i), r.length(i), r.base(i), r.linkrev(i),
1297 1297 short(node), short(pp[0]), short(pp[1])))
1298 1298 elif format == 1:
1299 1299 pr = r.parentrevs(i)
1300 1300 ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
1301 1301 i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
1302 1302 r.base(i), r.linkrev(i), pr[0], pr[1], short(node)))
1303 1303
1304 1304 def debugindexdot(ui, repo, file_):
1305 1305 """dump an index DAG as a graphviz dot file"""
1306 1306 r = None
1307 1307 if repo:
1308 1308 filelog = repo.file(file_)
1309 1309 if len(filelog):
1310 1310 r = filelog
1311 1311 if not r:
1312 1312 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
1313 1313 ui.write("digraph G {\n")
1314 1314 for i in r:
1315 1315 node = r.node(i)
1316 1316 pp = r.parents(node)
1317 1317 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
1318 1318 if pp[1] != nullid:
1319 1319 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
1320 1320 ui.write("}\n")
1321 1321
1322 1322 def debuginstall(ui):
1323 1323 '''test Mercurial installation
1324 1324
1325 1325 Returns 0 on success.
1326 1326 '''
1327 1327
1328 1328 def writetemp(contents):
1329 1329 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
1330 1330 f = os.fdopen(fd, "wb")
1331 1331 f.write(contents)
1332 1332 f.close()
1333 1333 return name
1334 1334
1335 1335 problems = 0
1336 1336
1337 1337 # encoding
1338 1338 ui.status(_("Checking encoding (%s)...\n") % encoding.encoding)
1339 1339 try:
1340 1340 encoding.fromlocal("test")
1341 1341 except util.Abort, inst:
1342 1342 ui.write(" %s\n" % inst)
1343 1343 ui.write(_(" (check that your locale is properly set)\n"))
1344 1344 problems += 1
1345 1345
1346 1346 # compiled modules
1347 1347 ui.status(_("Checking installed modules (%s)...\n")
1348 1348 % os.path.dirname(__file__))
1349 1349 try:
1350 1350 import bdiff, mpatch, base85, osutil
1351 1351 except Exception, inst:
1352 1352 ui.write(" %s\n" % inst)
1353 1353 ui.write(_(" One or more extensions could not be found"))
1354 1354 ui.write(_(" (check that you compiled the extensions)\n"))
1355 1355 problems += 1
1356 1356
1357 1357 # templates
1358 1358 ui.status(_("Checking templates...\n"))
1359 1359 try:
1360 1360 import templater
1361 1361 templater.templater(templater.templatepath("map-cmdline.default"))
1362 1362 except Exception, inst:
1363 1363 ui.write(" %s\n" % inst)
1364 1364 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
1365 1365 problems += 1
1366 1366
1367 1367 # patch
1368 1368 ui.status(_("Checking patch...\n"))
1369 1369 patchproblems = 0
1370 1370 a = "1\n2\n3\n4\n"
1371 1371 b = "1\n2\n3\ninsert\n4\n"
1372 1372 fa = writetemp(a)
1373 1373 d = mdiff.unidiff(a, None, b, None, os.path.basename(fa),
1374 1374 os.path.basename(fa))
1375 1375 fd = writetemp(d)
1376 1376
1377 1377 files = {}
1378 1378 try:
1379 1379 patch.patch(fd, ui, cwd=os.path.dirname(fa), files=files)
1380 1380 except util.Abort, e:
1381 1381 ui.write(_(" patch call failed:\n"))
1382 1382 ui.write(" " + str(e) + "\n")
1383 1383 patchproblems += 1
1384 1384 else:
1385 1385 if list(files) != [os.path.basename(fa)]:
1386 1386 ui.write(_(" unexpected patch output!\n"))
1387 1387 patchproblems += 1
1388 1388 a = open(fa).read()
1389 1389 if a != b:
1390 1390 ui.write(_(" patch test failed!\n"))
1391 1391 patchproblems += 1
1392 1392
1393 1393 if patchproblems:
1394 1394 if ui.config('ui', 'patch'):
1395 1395 ui.write(_(" (Current patch tool may be incompatible with patch,"
1396 1396 " or misconfigured. Please check your configuration"
1397 1397 " file)\n"))
1398 1398 else:
1399 1399 ui.write(_(" Internal patcher failure, please report this error"
1400 1400 " to http://mercurial.selenic.com/wiki/BugTracker\n"))
1401 1401 problems += patchproblems
1402 1402
1403 1403 os.unlink(fa)
1404 1404 os.unlink(fd)
1405 1405
1406 1406 # editor
1407 1407 ui.status(_("Checking commit editor...\n"))
1408 1408 editor = ui.geteditor()
1409 1409 cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0])
1410 1410 if not cmdpath:
1411 1411 if editor == 'vi':
1412 1412 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
1413 1413 ui.write(_(" (specify a commit editor in your configuration"
1414 1414 " file)\n"))
1415 1415 else:
1416 1416 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
1417 1417 ui.write(_(" (specify a commit editor in your configuration"
1418 1418 " file)\n"))
1419 1419 problems += 1
1420 1420
1421 1421 # check username
1422 1422 ui.status(_("Checking username...\n"))
1423 1423 try:
1424 1424 ui.username()
1425 1425 except util.Abort, e:
1426 1426 ui.write(" %s\n" % e)
1427 1427 ui.write(_(" (specify a username in your configuration file)\n"))
1428 1428 problems += 1
1429 1429
1430 1430 if not problems:
1431 1431 ui.status(_("No problems detected\n"))
1432 1432 else:
1433 1433 ui.write(_("%s problems detected,"
1434 1434 " please check your install!\n") % problems)
1435 1435
1436 1436 return problems
1437 1437
1438 1438 def debugrename(ui, repo, file1, *pats, **opts):
1439 1439 """dump rename information"""
1440 1440
1441 1441 ctx = cmdutil.revsingle(repo, opts.get('rev'))
1442 1442 m = cmdutil.match(repo, (file1,) + pats, opts)
1443 1443 for abs in ctx.walk(m):
1444 1444 fctx = ctx[abs]
1445 1445 o = fctx.filelog().renamed(fctx.filenode())
1446 1446 rel = m.rel(abs)
1447 1447 if o:
1448 1448 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
1449 1449 else:
1450 1450 ui.write(_("%s not renamed\n") % rel)
1451 1451
1452 1452 def debugwalk(ui, repo, *pats, **opts):
1453 1453 """show how files match on given patterns"""
1454 1454 m = cmdutil.match(repo, pats, opts)
1455 1455 items = list(repo.walk(m))
1456 1456 if not items:
1457 1457 return
1458 1458 fmt = 'f %%-%ds %%-%ds %%s' % (
1459 1459 max([len(abs) for abs in items]),
1460 1460 max([len(m.rel(abs)) for abs in items]))
1461 1461 for abs in items:
1462 1462 line = fmt % (abs, m.rel(abs), m.exact(abs) and 'exact' or '')
1463 1463 ui.write("%s\n" % line.rstrip())
1464 1464
1465 1465 def diff(ui, repo, *pats, **opts):
1466 1466 """diff repository (or selected files)
1467 1467
1468 1468 Show differences between revisions for the specified files.
1469 1469
1470 1470 Differences between files are shown using the unified diff format.
1471 1471
1472 1472 .. note::
1473 1473 diff may generate unexpected results for merges, as it will
1474 1474 default to comparing against the working directory's first
1475 1475 parent changeset if no revisions are specified.
1476 1476
1477 1477 When two revision arguments are given, then changes are shown
1478 1478 between those revisions. If only one revision is specified then
1479 1479 that revision is compared to the working directory, and, when no
1480 1480 revisions are specified, the working directory files are compared
1481 1481 to its parent.
1482 1482
1483 1483 Alternatively you can specify -c/--change with a revision to see
1484 1484 the changes in that changeset relative to its first parent.
1485 1485
1486 1486 Without the -a/--text option, diff will avoid generating diffs of
1487 1487 files it detects as binary. With -a, diff will generate a diff
1488 1488 anyway, probably with undesirable results.
1489 1489
1490 1490 Use the -g/--git option to generate diffs in the git extended diff
1491 1491 format. For more information, read :hg:`help diffs`.
1492 1492
1493 1493 Returns 0 on success.
1494 1494 """
1495 1495
1496 1496 revs = opts.get('rev')
1497 1497 change = opts.get('change')
1498 1498 stat = opts.get('stat')
1499 1499 reverse = opts.get('reverse')
1500 1500
1501 1501 if revs and change:
1502 1502 msg = _('cannot specify --rev and --change at the same time')
1503 1503 raise util.Abort(msg)
1504 1504 elif change:
1505 1505 node2 = repo.lookup(change)
1506 1506 node1 = repo[node2].parents()[0].node()
1507 1507 else:
1508 1508 node1, node2 = cmdutil.revpair(repo, revs)
1509 1509
1510 1510 if reverse:
1511 1511 node1, node2 = node2, node1
1512 1512
1513 1513 diffopts = patch.diffopts(ui, opts)
1514 1514 m = cmdutil.match(repo, pats, opts)
1515 1515 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
1516 1516 listsubrepos=opts.get('subrepos'))
1517 1517
1518 1518 def export(ui, repo, *changesets, **opts):
1519 1519 """dump the header and diffs for one or more changesets
1520 1520
1521 1521 Print the changeset header and diffs for one or more revisions.
1522 1522
1523 1523 The information shown in the changeset header is: author, date,
1524 1524 branch name (if non-default), changeset hash, parent(s) and commit
1525 1525 comment.
1526 1526
1527 1527 .. note::
1528 1528 export may generate unexpected diff output for merge
1529 1529 changesets, as it will compare the merge changeset against its
1530 1530 first parent only.
1531 1531
1532 1532 Output may be to a file, in which case the name of the file is
1533 1533 given using a format string. The formatting rules are as follows:
1534 1534
1535 1535 :``%%``: literal "%" character
1536 1536 :``%H``: changeset hash (40 hexadecimal digits)
1537 1537 :``%N``: number of patches being generated
1538 1538 :``%R``: changeset revision number
1539 1539 :``%b``: basename of the exporting repository
1540 1540 :``%h``: short-form changeset hash (12 hexadecimal digits)
1541 1541 :``%n``: zero-padded sequence number, starting at 1
1542 1542 :``%r``: zero-padded changeset revision number
1543 1543
1544 1544 Without the -a/--text option, export will avoid generating diffs
1545 1545 of files it detects as binary. With -a, export will generate a
1546 1546 diff anyway, probably with undesirable results.
1547 1547
1548 1548 Use the -g/--git option to generate diffs in the git extended diff
1549 1549 format. See :hg:`help diffs` for more information.
1550 1550
1551 1551 With the --switch-parent option, the diff will be against the
1552 1552 second parent. It can be useful to review a merge.
1553 1553
1554 1554 Returns 0 on success.
1555 1555 """
1556 1556 changesets += tuple(opts.get('rev', []))
1557 1557 if not changesets:
1558 1558 raise util.Abort(_("export requires at least one changeset"))
1559 1559 revs = cmdutil.revrange(repo, changesets)
1560 1560 if len(revs) > 1:
1561 1561 ui.note(_('exporting patches:\n'))
1562 1562 else:
1563 1563 ui.note(_('exporting patch:\n'))
1564 1564 cmdutil.export(repo, revs, template=opts.get('output'),
1565 1565 switch_parent=opts.get('switch_parent'),
1566 1566 opts=patch.diffopts(ui, opts))
1567 1567
1568 1568 def forget(ui, repo, *pats, **opts):
1569 1569 """forget the specified files on the next commit
1570 1570
1571 1571 Mark the specified files so they will no longer be tracked
1572 1572 after the next commit.
1573 1573
1574 1574 This only removes files from the current branch, not from the
1575 1575 entire project history, and it does not delete them from the
1576 1576 working directory.
1577 1577
1578 1578 To undo a forget before the next commit, see :hg:`add`.
1579 1579
1580 1580 Returns 0 on success.
1581 1581 """
1582 1582
1583 1583 if not pats:
1584 1584 raise util.Abort(_('no files specified'))
1585 1585
1586 1586 m = cmdutil.match(repo, pats, opts)
1587 1587 s = repo.status(match=m, clean=True)
1588 1588 forget = sorted(s[0] + s[1] + s[3] + s[6])
1589 1589 errs = 0
1590 1590
1591 1591 for f in m.files():
1592 1592 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
1593 1593 ui.warn(_('not removing %s: file is already untracked\n')
1594 1594 % m.rel(f))
1595 1595 errs = 1
1596 1596
1597 1597 for f in forget:
1598 1598 if ui.verbose or not m.exact(f):
1599 1599 ui.status(_('removing %s\n') % m.rel(f))
1600 1600
1601 1601 repo[None].remove(forget, unlink=False)
1602 1602 return errs
1603 1603
1604 1604 def grep(ui, repo, pattern, *pats, **opts):
1605 1605 """search for a pattern in specified files and revisions
1606 1606
1607 1607 Search revisions of files for a regular expression.
1608 1608
1609 1609 This command behaves differently than Unix grep. It only accepts
1610 1610 Python/Perl regexps. It searches repository history, not the
1611 1611 working directory. It always prints the revision number in which a
1612 1612 match appears.
1613 1613
1614 1614 By default, grep only prints output for the first revision of a
1615 1615 file in which it finds a match. To get it to print every revision
1616 1616 that contains a change in match status ("-" for a match that
1617 1617 becomes a non-match, or "+" for a non-match that becomes a match),
1618 1618 use the --all flag.
1619 1619
1620 1620 Returns 0 if a match is found, 1 otherwise.
1621 1621 """
1622 1622 reflags = 0
1623 1623 if opts.get('ignore_case'):
1624 1624 reflags |= re.I
1625 1625 try:
1626 1626 regexp = re.compile(pattern, reflags)
1627 1627 except re.error, inst:
1628 1628 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
1629 1629 return 1
1630 1630 sep, eol = ':', '\n'
1631 1631 if opts.get('print0'):
1632 1632 sep = eol = '\0'
1633 1633
1634 1634 getfile = util.lrucachefunc(repo.file)
1635 1635
1636 1636 def matchlines(body):
1637 1637 begin = 0
1638 1638 linenum = 0
1639 1639 while True:
1640 1640 match = regexp.search(body, begin)
1641 1641 if not match:
1642 1642 break
1643 1643 mstart, mend = match.span()
1644 1644 linenum += body.count('\n', begin, mstart) + 1
1645 1645 lstart = body.rfind('\n', begin, mstart) + 1 or begin
1646 1646 begin = body.find('\n', mend) + 1 or len(body)
1647 1647 lend = begin - 1
1648 1648 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
1649 1649
1650 1650 class linestate(object):
1651 1651 def __init__(self, line, linenum, colstart, colend):
1652 1652 self.line = line
1653 1653 self.linenum = linenum
1654 1654 self.colstart = colstart
1655 1655 self.colend = colend
1656 1656
1657 1657 def __hash__(self):
1658 1658 return hash((self.linenum, self.line))
1659 1659
1660 1660 def __eq__(self, other):
1661 1661 return self.line == other.line
1662 1662
1663 1663 matches = {}
1664 1664 copies = {}
1665 1665 def grepbody(fn, rev, body):
1666 1666 matches[rev].setdefault(fn, [])
1667 1667 m = matches[rev][fn]
1668 1668 for lnum, cstart, cend, line in matchlines(body):
1669 1669 s = linestate(line, lnum, cstart, cend)
1670 1670 m.append(s)
1671 1671
1672 1672 def difflinestates(a, b):
1673 1673 sm = difflib.SequenceMatcher(None, a, b)
1674 1674 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
1675 1675 if tag == 'insert':
1676 1676 for i in xrange(blo, bhi):
1677 1677 yield ('+', b[i])
1678 1678 elif tag == 'delete':
1679 1679 for i in xrange(alo, ahi):
1680 1680 yield ('-', a[i])
1681 1681 elif tag == 'replace':
1682 1682 for i in xrange(alo, ahi):
1683 1683 yield ('-', a[i])
1684 1684 for i in xrange(blo, bhi):
1685 1685 yield ('+', b[i])
1686 1686
1687 1687 def display(fn, ctx, pstates, states):
1688 1688 rev = ctx.rev()
1689 1689 datefunc = ui.quiet and util.shortdate or util.datestr
1690 1690 found = False
1691 1691 filerevmatches = {}
1692 1692 if opts.get('all'):
1693 1693 iter = difflinestates(pstates, states)
1694 1694 else:
1695 1695 iter = [('', l) for l in states]
1696 1696 for change, l in iter:
1697 1697 cols = [fn, str(rev)]
1698 1698 before, match, after = None, None, None
1699 1699 if opts.get('line_number'):
1700 1700 cols.append(str(l.linenum))
1701 1701 if opts.get('all'):
1702 1702 cols.append(change)
1703 1703 if opts.get('user'):
1704 1704 cols.append(ui.shortuser(ctx.user()))
1705 1705 if opts.get('date'):
1706 1706 cols.append(datefunc(ctx.date()))
1707 1707 if opts.get('files_with_matches'):
1708 1708 c = (fn, rev)
1709 1709 if c in filerevmatches:
1710 1710 continue
1711 1711 filerevmatches[c] = 1
1712 1712 else:
1713 1713 before = l.line[:l.colstart]
1714 1714 match = l.line[l.colstart:l.colend]
1715 1715 after = l.line[l.colend:]
1716 1716 ui.write(sep.join(cols))
1717 1717 if before is not None:
1718 1718 ui.write(sep + before)
1719 1719 ui.write(match, label='grep.match')
1720 1720 ui.write(after)
1721 1721 ui.write(eol)
1722 1722 found = True
1723 1723 return found
1724 1724
1725 1725 skip = {}
1726 1726 revfiles = {}
1727 1727 matchfn = cmdutil.match(repo, pats, opts)
1728 1728 found = False
1729 1729 follow = opts.get('follow')
1730 1730
1731 1731 def prep(ctx, fns):
1732 1732 rev = ctx.rev()
1733 1733 pctx = ctx.parents()[0]
1734 1734 parent = pctx.rev()
1735 1735 matches.setdefault(rev, {})
1736 1736 matches.setdefault(parent, {})
1737 1737 files = revfiles.setdefault(rev, [])
1738 1738 for fn in fns:
1739 1739 flog = getfile(fn)
1740 1740 try:
1741 1741 fnode = ctx.filenode(fn)
1742 1742 except error.LookupError:
1743 1743 continue
1744 1744
1745 1745 copied = flog.renamed(fnode)
1746 1746 copy = follow and copied and copied[0]
1747 1747 if copy:
1748 1748 copies.setdefault(rev, {})[fn] = copy
1749 1749 if fn in skip:
1750 1750 if copy:
1751 1751 skip[copy] = True
1752 1752 continue
1753 1753 files.append(fn)
1754 1754
1755 1755 if fn not in matches[rev]:
1756 1756 grepbody(fn, rev, flog.read(fnode))
1757 1757
1758 1758 pfn = copy or fn
1759 1759 if pfn not in matches[parent]:
1760 1760 try:
1761 1761 fnode = pctx.filenode(pfn)
1762 1762 grepbody(pfn, parent, flog.read(fnode))
1763 1763 except error.LookupError:
1764 1764 pass
1765 1765
1766 1766 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
1767 1767 rev = ctx.rev()
1768 1768 parent = ctx.parents()[0].rev()
1769 1769 for fn in sorted(revfiles.get(rev, [])):
1770 1770 states = matches[rev][fn]
1771 1771 copy = copies.get(rev, {}).get(fn)
1772 1772 if fn in skip:
1773 1773 if copy:
1774 1774 skip[copy] = True
1775 1775 continue
1776 1776 pstates = matches.get(parent, {}).get(copy or fn, [])
1777 1777 if pstates or states:
1778 1778 r = display(fn, ctx, pstates, states)
1779 1779 found = found or r
1780 1780 if r and not opts.get('all'):
1781 1781 skip[fn] = True
1782 1782 if copy:
1783 1783 skip[copy] = True
1784 1784 del matches[rev]
1785 1785 del revfiles[rev]
1786 1786
1787 1787 return not found
1788 1788
1789 1789 def heads(ui, repo, *branchrevs, **opts):
1790 1790 """show current repository heads or show branch heads
1791 1791
1792 1792 With no arguments, show all repository branch heads.
1793 1793
1794 1794 Repository "heads" are changesets with no child changesets. They are
1795 1795 where development generally takes place and are the usual targets
1796 1796 for update and merge operations. Branch heads are changesets that have
1797 1797 no child changeset on the same branch.
1798 1798
1799 1799 If one or more REVs are given, only branch heads on the branches
1800 1800 associated with the specified changesets are shown.
1801 1801
1802 1802 If -c/--closed is specified, also show branch heads marked closed
1803 1803 (see :hg:`commit --close-branch`).
1804 1804
1805 1805 If STARTREV is specified, only those heads that are descendants of
1806 1806 STARTREV will be displayed.
1807 1807
1808 1808 If -t/--topo is specified, named branch mechanics will be ignored and only
1809 1809 changesets without children will be shown.
1810 1810
1811 1811 Returns 0 if matching heads are found, 1 if not.
1812 1812 """
1813 1813
1814 1814 start = None
1815 1815 if 'rev' in opts:
1816 1816 start = cmdutil.revsingle(repo, opts['rev'], None).node()
1817 1817
1818 1818 if opts.get('topo'):
1819 1819 heads = [repo[h] for h in repo.heads(start)]
1820 1820 else:
1821 1821 heads = []
1822 1822 for b, ls in repo.branchmap().iteritems():
1823 1823 if start is None:
1824 1824 heads += [repo[h] for h in ls]
1825 1825 continue
1826 1826 startrev = repo.changelog.rev(start)
1827 1827 descendants = set(repo.changelog.descendants(startrev))
1828 1828 descendants.add(startrev)
1829 1829 rev = repo.changelog.rev
1830 1830 heads += [repo[h] for h in ls if rev(h) in descendants]
1831 1831
1832 1832 if branchrevs:
1833 1833 decode, encode = encoding.fromlocal, encoding.tolocal
1834 1834 branches = set(repo[decode(br)].branch() for br in branchrevs)
1835 1835 heads = [h for h in heads if h.branch() in branches]
1836 1836
1837 1837 if not opts.get('closed'):
1838 1838 heads = [h for h in heads if not h.extra().get('close')]
1839 1839
1840 1840 if opts.get('active') and branchrevs:
1841 1841 dagheads = repo.heads(start)
1842 1842 heads = [h for h in heads if h.node() in dagheads]
1843 1843
1844 1844 if branchrevs:
1845 1845 haveheads = set(h.branch() for h in heads)
1846 1846 if branches - haveheads:
1847 1847 headless = ', '.join(encode(b) for b in branches - haveheads)
1848 1848 msg = _('no open branch heads found on branches %s')
1849 1849 if opts.get('rev'):
1850 1850 msg += _(' (started at %s)' % opts['rev'])
1851 1851 ui.warn((msg + '\n') % headless)
1852 1852
1853 1853 if not heads:
1854 1854 return 1
1855 1855
1856 1856 heads = sorted(heads, key=lambda x: -x.rev())
1857 1857 displayer = cmdutil.show_changeset(ui, repo, opts)
1858 1858 for ctx in heads:
1859 1859 displayer.show(ctx)
1860 1860 displayer.close()
1861 1861
1862 1862 def help_(ui, name=None, with_version=False, unknowncmd=False):
1863 1863 """show help for a given topic or a help overview
1864 1864
1865 1865 With no arguments, print a list of commands with short help messages.
1866 1866
1867 1867 Given a topic, extension, or command name, print help for that
1868 1868 topic.
1869 1869
1870 1870 Returns 0 if successful.
1871 1871 """
1872 1872 option_lists = []
1873 1873 textwidth = ui.termwidth() - 2
1874 1874
1875 1875 def addglobalopts(aliases):
1876 1876 if ui.verbose:
1877 1877 option_lists.append((_("global options:"), globalopts))
1878 1878 if name == 'shortlist':
1879 1879 option_lists.append((_('use "hg help" for the full list '
1880 1880 'of commands'), ()))
1881 1881 else:
1882 1882 if name == 'shortlist':
1883 1883 msg = _('use "hg help" for the full list of commands '
1884 1884 'or "hg -v" for details')
1885 1885 elif aliases:
1886 1886 msg = _('use "hg -v help%s" to show aliases and '
1887 1887 'global options') % (name and " " + name or "")
1888 1888 else:
1889 1889 msg = _('use "hg -v help %s" to show global options') % name
1890 1890 option_lists.append((msg, ()))
1891 1891
1892 1892 def helpcmd(name):
1893 1893 if with_version:
1894 1894 version_(ui)
1895 1895 ui.write('\n')
1896 1896
1897 1897 try:
1898 1898 aliases, entry = cmdutil.findcmd(name, table, strict=unknowncmd)
1899 1899 except error.AmbiguousCommand, inst:
1900 1900 # py3k fix: except vars can't be used outside the scope of the
1901 1901 # except block, nor can be used inside a lambda. python issue4617
1902 1902 prefix = inst.args[0]
1903 1903 select = lambda c: c.lstrip('^').startswith(prefix)
1904 1904 helplist(_('list of commands:\n\n'), select)
1905 1905 return
1906 1906
1907 1907 # check if it's an invalid alias and display its error if it is
1908 1908 if getattr(entry[0], 'badalias', False):
1909 1909 if not unknowncmd:
1910 1910 entry[0](ui)
1911 1911 return
1912 1912
1913 1913 # synopsis
1914 1914 if len(entry) > 2:
1915 1915 if entry[2].startswith('hg'):
1916 1916 ui.write("%s\n" % entry[2])
1917 1917 else:
1918 1918 ui.write('hg %s %s\n' % (aliases[0], entry[2]))
1919 1919 else:
1920 1920 ui.write('hg %s\n' % aliases[0])
1921 1921
1922 1922 # aliases
1923 1923 if not ui.quiet and len(aliases) > 1:
1924 1924 ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:]))
1925 1925
1926 1926 # description
1927 1927 doc = gettext(entry[0].__doc__)
1928 1928 if not doc:
1929 1929 doc = _("(no help text available)")
1930 1930 if hasattr(entry[0], 'definition'): # aliased command
1931 1931 if entry[0].definition.startswith('!'): # shell alias
1932 1932 doc = _('shell alias for::\n\n %s') % entry[0].definition[1:]
1933 1933 else:
1934 1934 doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc)
1935 1935 if ui.quiet:
1936 1936 doc = doc.splitlines()[0]
1937 1937 keep = ui.verbose and ['verbose'] or []
1938 1938 formatted, pruned = minirst.format(doc, textwidth, keep=keep)
1939 1939 ui.write("\n%s\n" % formatted)
1940 1940 if pruned:
1941 1941 ui.write(_('\nuse "hg -v help %s" to show verbose help\n') % name)
1942 1942
1943 1943 if not ui.quiet:
1944 1944 # options
1945 1945 if entry[1]:
1946 1946 option_lists.append((_("options:\n"), entry[1]))
1947 1947
1948 1948 addglobalopts(False)
1949 1949
1950 1950 def helplist(header, select=None):
1951 1951 h = {}
1952 1952 cmds = {}
1953 1953 for c, e in table.iteritems():
1954 1954 f = c.split("|", 1)[0]
1955 1955 if select and not select(f):
1956 1956 continue
1957 1957 if (not select and name != 'shortlist' and
1958 1958 e[0].__module__ != __name__):
1959 1959 continue
1960 1960 if name == "shortlist" and not f.startswith("^"):
1961 1961 continue
1962 1962 f = f.lstrip("^")
1963 1963 if not ui.debugflag and f.startswith("debug"):
1964 1964 continue
1965 1965 doc = e[0].__doc__
1966 1966 if doc and 'DEPRECATED' in doc and not ui.verbose:
1967 1967 continue
1968 1968 doc = gettext(doc)
1969 1969 if not doc:
1970 1970 doc = _("(no help text available)")
1971 1971 h[f] = doc.splitlines()[0].rstrip()
1972 1972 cmds[f] = c.lstrip("^")
1973 1973
1974 1974 if not h:
1975 1975 ui.status(_('no commands defined\n'))
1976 1976 return
1977 1977
1978 1978 ui.status(header)
1979 1979 fns = sorted(h)
1980 1980 m = max(map(len, fns))
1981 1981 for f in fns:
1982 1982 if ui.verbose:
1983 1983 commands = cmds[f].replace("|",", ")
1984 1984 ui.write(" %s:\n %s\n"%(commands, h[f]))
1985 1985 else:
1986 1986 ui.write('%s\n' % (util.wrap(h[f], textwidth,
1987 1987 initindent=' %-*s ' % (m, f),
1988 1988 hangindent=' ' * (m + 4))))
1989 1989
1990 1990 if not ui.quiet:
1991 1991 addglobalopts(True)
1992 1992
1993 1993 def helptopic(name):
1994 1994 for names, header, doc in help.helptable:
1995 1995 if name in names:
1996 1996 break
1997 1997 else:
1998 1998 raise error.UnknownCommand(name)
1999 1999
2000 2000 # description
2001 2001 if not doc:
2002 2002 doc = _("(no help text available)")
2003 2003 if hasattr(doc, '__call__'):
2004 2004 doc = doc()
2005 2005
2006 2006 ui.write("%s\n\n" % header)
2007 2007 ui.write("%s\n" % minirst.format(doc, textwidth, indent=4))
2008 2008
2009 2009 def helpext(name):
2010 2010 try:
2011 2011 mod = extensions.find(name)
2012 2012 doc = gettext(mod.__doc__) or _('no help text available')
2013 2013 except KeyError:
2014 2014 mod = None
2015 2015 doc = extensions.disabledext(name)
2016 2016 if not doc:
2017 2017 raise error.UnknownCommand(name)
2018 2018
2019 2019 if '\n' not in doc:
2020 2020 head, tail = doc, ""
2021 2021 else:
2022 2022 head, tail = doc.split('\n', 1)
2023 2023 ui.write(_('%s extension - %s\n\n') % (name.split('.')[-1], head))
2024 2024 if tail:
2025 2025 ui.write(minirst.format(tail, textwidth))
2026 2026 ui.status('\n\n')
2027 2027
2028 2028 if mod:
2029 2029 try:
2030 2030 ct = mod.cmdtable
2031 2031 except AttributeError:
2032 2032 ct = {}
2033 2033 modcmds = set([c.split('|', 1)[0] for c in ct])
2034 2034 helplist(_('list of commands:\n\n'), modcmds.__contains__)
2035 2035 else:
2036 2036 ui.write(_('use "hg help extensions" for information on enabling '
2037 2037 'extensions\n'))
2038 2038
2039 2039 def helpextcmd(name):
2040 2040 cmd, ext, mod = extensions.disabledcmd(name, ui.config('ui', 'strict'))
2041 2041 doc = gettext(mod.__doc__).splitlines()[0]
2042 2042
2043 2043 msg = help.listexts(_("'%s' is provided by the following "
2044 2044 "extension:") % cmd, {ext: doc}, len(ext),
2045 2045 indent=4)
2046 2046 ui.write(minirst.format(msg, textwidth))
2047 2047 ui.write('\n\n')
2048 2048 ui.write(_('use "hg help extensions" for information on enabling '
2049 2049 'extensions\n'))
2050 2050
2051 2051 help.addtopichook('revsets', revset.makedoc)
2052 2052
2053 2053 if name and name != 'shortlist':
2054 2054 i = None
2055 2055 if unknowncmd:
2056 2056 queries = (helpextcmd,)
2057 2057 else:
2058 2058 queries = (helptopic, helpcmd, helpext, helpextcmd)
2059 2059 for f in queries:
2060 2060 try:
2061 2061 f(name)
2062 2062 i = None
2063 2063 break
2064 2064 except error.UnknownCommand, inst:
2065 2065 i = inst
2066 2066 if i:
2067 2067 raise i
2068 2068
2069 2069 else:
2070 2070 # program name
2071 2071 if ui.verbose or with_version:
2072 2072 version_(ui)
2073 2073 else:
2074 2074 ui.status(_("Mercurial Distributed SCM\n"))
2075 2075 ui.status('\n')
2076 2076
2077 2077 # list of commands
2078 2078 if name == "shortlist":
2079 2079 header = _('basic commands:\n\n')
2080 2080 else:
2081 2081 header = _('list of commands:\n\n')
2082 2082
2083 2083 helplist(header)
2084 2084 if name != 'shortlist':
2085 2085 exts, maxlength = extensions.enabled()
2086 2086 text = help.listexts(_('enabled extensions:'), exts, maxlength)
2087 2087 if text:
2088 2088 ui.write("\n%s\n" % minirst.format(text, textwidth))
2089 2089
2090 2090 # list all option lists
2091 2091 opt_output = []
2092 2092 multioccur = False
2093 2093 for title, options in option_lists:
2094 2094 opt_output.append(("\n%s" % title, None))
2095 2095 for option in options:
2096 2096 if len(option) == 5:
2097 2097 shortopt, longopt, default, desc, optlabel = option
2098 2098 else:
2099 2099 shortopt, longopt, default, desc = option
2100 2100 optlabel = _("VALUE") # default label
2101 2101
2102 2102 if _("DEPRECATED") in desc and not ui.verbose:
2103 2103 continue
2104 2104 if isinstance(default, list):
2105 2105 numqualifier = " %s [+]" % optlabel
2106 2106 multioccur = True
2107 2107 elif (default is not None) and not isinstance(default, bool):
2108 2108 numqualifier = " %s" % optlabel
2109 2109 else:
2110 2110 numqualifier = ""
2111 2111 opt_output.append(("%2s%s" %
2112 2112 (shortopt and "-%s" % shortopt,
2113 2113 longopt and " --%s%s" %
2114 2114 (longopt, numqualifier)),
2115 2115 "%s%s" % (desc,
2116 2116 default
2117 2117 and _(" (default: %s)") % default
2118 2118 or "")))
2119 2119 if multioccur:
2120 2120 msg = _("\n[+] marked option can be specified multiple times")
2121 2121 if ui.verbose and name != 'shortlist':
2122 2122 opt_output.append((msg, None))
2123 2123 else:
2124 2124 opt_output.insert(-1, (msg, None))
2125 2125
2126 2126 if not name:
2127 2127 ui.write(_("\nadditional help topics:\n\n"))
2128 2128 topics = []
2129 2129 for names, header, doc in help.helptable:
2130 2130 topics.append((sorted(names, key=len, reverse=True)[0], header))
2131 2131 topics_len = max([len(s[0]) for s in topics])
2132 2132 for t, desc in topics:
2133 2133 ui.write(" %-*s %s\n" % (topics_len, t, desc))
2134 2134
2135 2135 if opt_output:
2136 2136 colwidth = encoding.colwidth
2137 2137 # normalize: (opt or message, desc or None, width of opt)
2138 2138 entries = [desc and (opt, desc, colwidth(opt)) or (opt, None, 0)
2139 2139 for opt, desc in opt_output]
2140 2140 hanging = max([e[2] for e in entries])
2141 2141 for opt, desc, width in entries:
2142 2142 if desc:
2143 2143 initindent = ' %s%s ' % (opt, ' ' * (hanging - width))
2144 2144 hangindent = ' ' * (hanging + 3)
2145 2145 ui.write('%s\n' % (util.wrap(desc, textwidth,
2146 2146 initindent=initindent,
2147 2147 hangindent=hangindent)))
2148 2148 else:
2149 2149 ui.write("%s\n" % opt)
2150 2150
2151 2151 def identify(ui, repo, source=None,
2152 2152 rev=None, num=None, id=None, branch=None, tags=None):
2153 2153 """identify the working copy or specified revision
2154 2154
2155 2155 With no revision, print a summary of the current state of the
2156 2156 repository.
2157 2157
2158 2158 Specifying a path to a repository root or Mercurial bundle will
2159 2159 cause lookup to operate on that repository/bundle.
2160 2160
2161 2161 This summary identifies the repository state using one or two
2162 2162 parent hash identifiers, followed by a "+" if there are
2163 2163 uncommitted changes in the working directory, a list of tags for
2164 2164 this revision and a branch name for non-default branches.
2165 2165
2166 2166 Returns 0 if successful.
2167 2167 """
2168 2168
2169 2169 if not repo and not source:
2170 2170 raise util.Abort(_("there is no Mercurial repository here "
2171 2171 "(.hg not found)"))
2172 2172
2173 2173 hexfunc = ui.debugflag and hex or short
2174 2174 default = not (num or id or branch or tags)
2175 2175 output = []
2176 2176
2177 2177 revs = []
2178 2178 if source:
2179 2179 source, branches = hg.parseurl(ui.expandpath(source))
2180 2180 repo = hg.repository(ui, source)
2181 2181 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
2182 2182
2183 2183 if not repo.local():
2184 2184 if not rev and revs:
2185 2185 rev = revs[0]
2186 2186 if not rev:
2187 2187 rev = "tip"
2188 2188 if num or branch or tags:
2189 2189 raise util.Abort(
2190 2190 "can't query remote revision number, branch, or tags")
2191 2191 output = [hexfunc(repo.lookup(rev))]
2192 2192 elif not rev:
2193 2193 ctx = repo[None]
2194 2194 parents = ctx.parents()
2195 2195 changed = False
2196 2196 if default or id or num:
2197 2197 changed = util.any(repo.status())
2198 2198 if default or id:
2199 2199 output = ["%s%s" % ('+'.join([hexfunc(p.node()) for p in parents]),
2200 2200 (changed) and "+" or "")]
2201 2201 if num:
2202 2202 output.append("%s%s" % ('+'.join([str(p.rev()) for p in parents]),
2203 2203 (changed) and "+" or ""))
2204 2204 else:
2205 2205 ctx = cmdutil.revsingle(repo, rev)
2206 2206 if default or id:
2207 2207 output = [hexfunc(ctx.node())]
2208 2208 if num:
2209 2209 output.append(str(ctx.rev()))
2210 2210
2211 2211 if repo.local() and default and not ui.quiet:
2212 2212 b = encoding.tolocal(ctx.branch())
2213 2213 if b != 'default':
2214 2214 output.append("(%s)" % b)
2215 2215
2216 2216 # multiple tags for a single parent separated by '/'
2217 2217 t = "/".join(ctx.tags())
2218 2218 if t:
2219 2219 output.append(t)
2220 2220
2221 2221 if branch:
2222 2222 output.append(encoding.tolocal(ctx.branch()))
2223 2223
2224 2224 if tags:
2225 2225 output.extend(ctx.tags())
2226 2226
2227 2227 ui.write("%s\n" % ' '.join(output))
2228 2228
2229 2229 def import_(ui, repo, patch1, *patches, **opts):
2230 2230 """import an ordered set of patches
2231 2231
2232 2232 Import a list of patches and commit them individually (unless
2233 2233 --no-commit is specified).
2234 2234
2235 2235 If there are outstanding changes in the working directory, import
2236 2236 will abort unless given the -f/--force flag.
2237 2237
2238 2238 You can import a patch straight from a mail message. Even patches
2239 2239 as attachments work (to use the body part, it must have type
2240 2240 text/plain or text/x-patch). From and Subject headers of email
2241 2241 message are used as default committer and commit message. All
2242 2242 text/plain body parts before first diff are added to commit
2243 2243 message.
2244 2244
2245 2245 If the imported patch was generated by :hg:`export`, user and
2246 2246 description from patch override values from message headers and
2247 2247 body. Values given on command line with -m/--message and -u/--user
2248 2248 override these.
2249 2249
2250 2250 If --exact is specified, import will set the working directory to
2251 2251 the parent of each patch before applying it, and will abort if the
2252 2252 resulting changeset has a different ID than the one recorded in
2253 2253 the patch. This may happen due to character set problems or other
2254 2254 deficiencies in the text patch format.
2255 2255
2256 2256 With -s/--similarity, hg will attempt to discover renames and
2257 2257 copies in the patch in the same way as 'addremove'.
2258 2258
2259 2259 To read a patch from standard input, use "-" as the patch name. If
2260 2260 a URL is specified, the patch will be downloaded from it.
2261 2261 See :hg:`help dates` for a list of formats valid for -d/--date.
2262 2262
2263 2263 Returns 0 on success.
2264 2264 """
2265 2265 patches = (patch1,) + patches
2266 2266
2267 2267 date = opts.get('date')
2268 2268 if date:
2269 2269 opts['date'] = util.parsedate(date)
2270 2270
2271 2271 try:
2272 2272 sim = float(opts.get('similarity') or 0)
2273 2273 except ValueError:
2274 2274 raise util.Abort(_('similarity must be a number'))
2275 2275 if sim < 0 or sim > 100:
2276 2276 raise util.Abort(_('similarity must be between 0 and 100'))
2277 2277
2278 2278 if opts.get('exact') or not opts.get('force'):
2279 2279 cmdutil.bail_if_changed(repo)
2280 2280
2281 2281 d = opts["base"]
2282 2282 strip = opts["strip"]
2283 2283 wlock = lock = None
2284 2284 msgs = []
2285 2285
2286 2286 def tryone(ui, hunk):
2287 2287 tmpname, message, user, date, branch, nodeid, p1, p2 = \
2288 2288 patch.extract(ui, hunk)
2289 2289
2290 2290 if not tmpname:
2291 2291 return None
2292 2292 commitid = _('to working directory')
2293 2293
2294 2294 try:
2295 2295 cmdline_message = cmdutil.logmessage(opts)
2296 2296 if cmdline_message:
2297 2297 # pickup the cmdline msg
2298 2298 message = cmdline_message
2299 2299 elif message:
2300 2300 # pickup the patch msg
2301 2301 message = message.strip()
2302 2302 else:
2303 2303 # launch the editor
2304 2304 message = None
2305 2305 ui.debug('message:\n%s\n' % message)
2306 2306
2307 2307 wp = repo.parents()
2308 2308 if opts.get('exact'):
2309 2309 if not nodeid or not p1:
2310 2310 raise util.Abort(_('not a Mercurial patch'))
2311 2311 p1 = repo.lookup(p1)
2312 2312 p2 = repo.lookup(p2 or hex(nullid))
2313 2313
2314 2314 if p1 != wp[0].node():
2315 2315 hg.clean(repo, p1)
2316 2316 repo.dirstate.setparents(p1, p2)
2317 2317 elif p2:
2318 2318 try:
2319 2319 p1 = repo.lookup(p1)
2320 2320 p2 = repo.lookup(p2)
2321 2321 if p1 == wp[0].node():
2322 2322 repo.dirstate.setparents(p1, p2)
2323 2323 except error.RepoError:
2324 2324 pass
2325 2325 if opts.get('exact') or opts.get('import_branch'):
2326 2326 repo.dirstate.setbranch(branch or 'default')
2327 2327
2328 2328 files = {}
2329 2329 try:
2330 2330 patch.patch(tmpname, ui, strip=strip, cwd=repo.root,
2331 2331 files=files, eolmode=None)
2332 2332 finally:
2333 2333 files = cmdutil.updatedir(ui, repo, files,
2334 2334 similarity=sim / 100.0)
2335 2335 if opts.get('no_commit'):
2336 2336 if message:
2337 2337 msgs.append(message)
2338 2338 else:
2339 2339 if opts.get('exact'):
2340 2340 m = None
2341 2341 else:
2342 2342 m = cmdutil.matchfiles(repo, files or [])
2343 2343 n = repo.commit(message, opts.get('user') or user,
2344 2344 opts.get('date') or date, match=m,
2345 2345 editor=cmdutil.commiteditor)
2346 2346 if opts.get('exact'):
2347 2347 if hex(n) != nodeid:
2348 2348 repo.rollback()
2349 2349 raise util.Abort(_('patch is damaged'
2350 2350 ' or loses information'))
2351 2351 # Force a dirstate write so that the next transaction
2352 2352 # backups an up-do-date file.
2353 2353 repo.dirstate.write()
2354 2354 if n:
2355 2355 commitid = short(n)
2356 2356
2357 2357 return commitid
2358 2358 finally:
2359 2359 os.unlink(tmpname)
2360 2360
2361 2361 try:
2362 2362 wlock = repo.wlock()
2363 2363 lock = repo.lock()
2364 2364 lastcommit = None
2365 2365 for p in patches:
2366 2366 pf = os.path.join(d, p)
2367 2367
2368 2368 if pf == '-':
2369 2369 ui.status(_("applying patch from stdin\n"))
2370 2370 pf = sys.stdin
2371 2371 else:
2372 2372 ui.status(_("applying %s\n") % p)
2373 2373 pf = url.open(ui, pf)
2374 2374
2375 2375 haspatch = False
2376 2376 for hunk in patch.split(pf):
2377 2377 commitid = tryone(ui, hunk)
2378 2378 if commitid:
2379 2379 haspatch = True
2380 2380 if lastcommit:
2381 2381 ui.status(_('applied %s\n') % lastcommit)
2382 2382 lastcommit = commitid
2383 2383
2384 2384 if not haspatch:
2385 2385 raise util.Abort(_('no diffs found'))
2386 2386
2387 2387 if msgs:
2388 2388 repo.opener('last-message.txt', 'wb').write('\n* * *\n'.join(msgs))
2389 2389 finally:
2390 2390 release(lock, wlock)
2391 2391
2392 2392 def incoming(ui, repo, source="default", **opts):
2393 2393 """show new changesets found in source
2394 2394
2395 2395 Show new changesets found in the specified path/URL or the default
2396 2396 pull location. These are the changesets that would have been pulled
2397 2397 if a pull at the time you issued this command.
2398 2398
2399 2399 For remote repository, using --bundle avoids downloading the
2400 2400 changesets twice if the incoming is followed by a pull.
2401 2401
2402 2402 See pull for valid source format details.
2403 2403
2404 2404 Returns 0 if there are incoming changes, 1 otherwise.
2405 2405 """
2406 2406 if opts.get('bundle') and opts.get('subrepos'):
2407 2407 raise util.Abort(_('cannot combine --bundle and --subrepos'))
2408 2408
2409 2409 ret = hg.incoming(ui, repo, source, opts)
2410 2410 return ret
2411 2411
2412 2412 def init(ui, dest=".", **opts):
2413 2413 """create a new repository in the given directory
2414 2414
2415 2415 Initialize a new repository in the given directory. If the given
2416 2416 directory does not exist, it will be created.
2417 2417
2418 2418 If no directory is given, the current directory is used.
2419 2419
2420 2420 It is possible to specify an ``ssh://`` URL as the destination.
2421 2421 See :hg:`help urls` for more information.
2422 2422
2423 2423 Returns 0 on success.
2424 2424 """
2425 2425 hg.repository(hg.remoteui(ui, opts), ui.expandpath(dest), create=1)
2426 2426
2427 2427 def locate(ui, repo, *pats, **opts):
2428 2428 """locate files matching specific patterns
2429 2429
2430 2430 Print files under Mercurial control in the working directory whose
2431 2431 names match the given patterns.
2432 2432
2433 2433 By default, this command searches all directories in the working
2434 2434 directory. To search just the current directory and its
2435 2435 subdirectories, use "--include .".
2436 2436
2437 2437 If no patterns are given to match, this command prints the names
2438 2438 of all files under Mercurial control in the working directory.
2439 2439
2440 2440 If you want to feed the output of this command into the "xargs"
2441 2441 command, use the -0 option to both this command and "xargs". This
2442 2442 will avoid the problem of "xargs" treating single filenames that
2443 2443 contain whitespace as multiple filenames.
2444 2444
2445 2445 Returns 0 if a match is found, 1 otherwise.
2446 2446 """
2447 2447 end = opts.get('print0') and '\0' or '\n'
2448 2448 rev = cmdutil.revsingle(repo, opts.get('rev'), None).node()
2449 2449
2450 2450 ret = 1
2451 2451 m = cmdutil.match(repo, pats, opts, default='relglob')
2452 2452 m.bad = lambda x, y: False
2453 2453 for abs in repo[rev].walk(m):
2454 2454 if not rev and abs not in repo.dirstate:
2455 2455 continue
2456 2456 if opts.get('fullpath'):
2457 2457 ui.write(repo.wjoin(abs), end)
2458 2458 else:
2459 2459 ui.write(((pats and m.rel(abs)) or abs), end)
2460 2460 ret = 0
2461 2461
2462 2462 return ret
2463 2463
2464 2464 def log(ui, repo, *pats, **opts):
2465 2465 """show revision history of entire repository or files
2466 2466
2467 2467 Print the revision history of the specified files or the entire
2468 2468 project.
2469 2469
2470 2470 File history is shown without following rename or copy history of
2471 2471 files. Use -f/--follow with a filename to follow history across
2472 2472 renames and copies. --follow without a filename will only show
2473 2473 ancestors or descendants of the starting revision. --follow-first
2474 2474 only follows the first parent of merge revisions.
2475 2475
2476 2476 If no revision range is specified, the default is ``tip:0`` unless
2477 2477 --follow is set, in which case the working directory parent is
2478 2478 used as the starting revision. You can specify a revision set for
2479 2479 log, see :hg:`help revsets` for more information.
2480 2480
2481 2481 See :hg:`help dates` for a list of formats valid for -d/--date.
2482 2482
2483 2483 By default this command prints revision number and changeset id,
2484 2484 tags, non-trivial parents, user, date and time, and a summary for
2485 2485 each commit. When the -v/--verbose switch is used, the list of
2486 2486 changed files and full commit message are shown.
2487 2487
2488 2488 .. note::
2489 2489 log -p/--patch may generate unexpected diff output for merge
2490 2490 changesets, as it will only compare the merge changeset against
2491 2491 its first parent. Also, only files different from BOTH parents
2492 2492 will appear in files:.
2493 2493
2494 2494 Returns 0 on success.
2495 2495 """
2496 2496
2497 2497 matchfn = cmdutil.match(repo, pats, opts)
2498 2498 limit = cmdutil.loglimit(opts)
2499 2499 count = 0
2500 2500
2501 2501 endrev = None
2502 2502 if opts.get('copies') and opts.get('rev'):
2503 2503 endrev = max(cmdutil.revrange(repo, opts.get('rev'))) + 1
2504 2504
2505 2505 df = False
2506 2506 if opts["date"]:
2507 2507 df = util.matchdate(opts["date"])
2508 2508
2509 2509 branches = opts.get('branch', []) + opts.get('only_branch', [])
2510 2510 opts['branch'] = [repo.lookupbranch(b) for b in branches]
2511 2511
2512 2512 displayer = cmdutil.show_changeset(ui, repo, opts, True)
2513 2513 def prep(ctx, fns):
2514 2514 rev = ctx.rev()
2515 2515 parents = [p for p in repo.changelog.parentrevs(rev)
2516 2516 if p != nullrev]
2517 2517 if opts.get('no_merges') and len(parents) == 2:
2518 2518 return
2519 2519 if opts.get('only_merges') and len(parents) != 2:
2520 2520 return
2521 2521 if opts.get('branch') and ctx.branch() not in opts['branch']:
2522 2522 return
2523 2523 if df and not df(ctx.date()[0]):
2524 2524 return
2525 2525 if opts['user'] and not [k for k in opts['user']
2526 2526 if k.lower() in ctx.user().lower()]:
2527 2527 return
2528 2528 if opts.get('keyword'):
2529 2529 for k in [kw.lower() for kw in opts['keyword']]:
2530 2530 if (k in ctx.user().lower() or
2531 2531 k in ctx.description().lower() or
2532 2532 k in " ".join(ctx.files()).lower()):
2533 2533 break
2534 2534 else:
2535 2535 return
2536 2536
2537 2537 copies = None
2538 2538 if opts.get('copies') and rev:
2539 2539 copies = []
2540 2540 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
2541 2541 for fn in ctx.files():
2542 2542 rename = getrenamed(fn, rev)
2543 2543 if rename:
2544 2544 copies.append((fn, rename[0]))
2545 2545
2546 2546 revmatchfn = None
2547 2547 if opts.get('patch') or opts.get('stat'):
2548 2548 if opts.get('follow') or opts.get('follow_first'):
2549 2549 # note: this might be wrong when following through merges
2550 2550 revmatchfn = cmdutil.match(repo, fns, default='path')
2551 2551 else:
2552 2552 revmatchfn = matchfn
2553 2553
2554 2554 displayer.show(ctx, copies=copies, matchfn=revmatchfn)
2555 2555
2556 2556 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
2557 2557 if count == limit:
2558 2558 break
2559 2559 if displayer.flush(ctx.rev()):
2560 2560 count += 1
2561 2561 displayer.close()
2562 2562
2563 2563 def manifest(ui, repo, node=None, rev=None):
2564 2564 """output the current or given revision of the project manifest
2565 2565
2566 2566 Print a list of version controlled files for the given revision.
2567 2567 If no revision is given, the first parent of the working directory
2568 2568 is used, or the null revision if no revision is checked out.
2569 2569
2570 2570 With -v, print file permissions, symlink and executable bits.
2571 2571 With --debug, print file revision hashes.
2572 2572
2573 2573 Returns 0 on success.
2574 2574 """
2575 2575
2576 2576 if rev and node:
2577 2577 raise util.Abort(_("please specify just one revision"))
2578 2578
2579 2579 if not node:
2580 2580 node = rev
2581 2581
2582 2582 decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '}
2583 2583 ctx = cmdutil.revsingle(repo, node)
2584 2584 for f in ctx:
2585 2585 if ui.debugflag:
2586 2586 ui.write("%40s " % hex(ctx.manifest()[f]))
2587 2587 if ui.verbose:
2588 2588 ui.write(decor[ctx.flags(f)])
2589 2589 ui.write("%s\n" % f)
2590 2590
2591 2591 def merge(ui, repo, node=None, **opts):
2592 2592 """merge working directory with another revision
2593 2593
2594 2594 The current working directory is updated with all changes made in
2595 2595 the requested revision since the last common predecessor revision.
2596 2596
2597 2597 Files that changed between either parent are marked as changed for
2598 2598 the next commit and a commit must be performed before any further
2599 2599 updates to the repository are allowed. The next commit will have
2600 2600 two parents.
2601 2601
2602 2602 ``--tool`` can be used to specify the merge tool used for file
2603 2603 merges. It overrides the HGMERGE environment variable and your
2604 2604 configuration files.
2605 2605
2606 2606 If no revision is specified, the working directory's parent is a
2607 2607 head revision, and the current branch contains exactly one other
2608 2608 head, the other head is merged with by default. Otherwise, an
2609 2609 explicit revision with which to merge with must be provided.
2610 2610
2611 2611 :hg:`resolve` must be used to resolve unresolved files.
2612 2612
2613 2613 To undo an uncommitted merge, use :hg:`update --clean .` which
2614 2614 will check out a clean copy of the original merge parent, losing
2615 2615 all changes.
2616 2616
2617 2617 Returns 0 on success, 1 if there are unresolved files.
2618 2618 """
2619 2619
2620 2620 if opts.get('rev') and node:
2621 2621 raise util.Abort(_("please specify just one revision"))
2622 2622 if not node:
2623 2623 node = opts.get('rev')
2624 2624
2625 2625 if not node:
2626 2626 branch = repo.changectx(None).branch()
2627 2627 bheads = repo.branchheads(branch)
2628 2628 if len(bheads) > 2:
2629 2629 raise util.Abort(_(
2630 2630 'branch \'%s\' has %d heads - '
2631 2631 'please merge with an explicit rev\n'
2632 2632 '(run \'hg heads .\' to see heads)')
2633 2633 % (branch, len(bheads)))
2634 2634
2635 2635 parent = repo.dirstate.parents()[0]
2636 2636 if len(bheads) == 1:
2637 2637 if len(repo.heads()) > 1:
2638 2638 raise util.Abort(_(
2639 2639 'branch \'%s\' has one head - '
2640 2640 'please merge with an explicit rev\n'
2641 2641 '(run \'hg heads\' to see all heads)')
2642 2642 % branch)
2643 2643 msg = _('there is nothing to merge')
2644 2644 if parent != repo.lookup(repo[None].branch()):
2645 2645 msg = _('%s - use "hg update" instead') % msg
2646 2646 raise util.Abort(msg)
2647 2647
2648 2648 if parent not in bheads:
2649 2649 raise util.Abort(_('working dir not at a head rev - '
2650 2650 'use "hg update" or merge with an explicit rev'))
2651 2651 node = parent == bheads[0] and bheads[-1] or bheads[0]
2652 2652 else:
2653 2653 node = cmdutil.revsingle(repo, node).node()
2654 2654
2655 2655 if opts.get('preview'):
2656 2656 # find nodes that are ancestors of p2 but not of p1
2657 2657 p1 = repo.lookup('.')
2658 2658 p2 = repo.lookup(node)
2659 2659 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
2660 2660
2661 2661 displayer = cmdutil.show_changeset(ui, repo, opts)
2662 2662 for node in nodes:
2663 2663 displayer.show(repo[node])
2664 2664 displayer.close()
2665 2665 return 0
2666 2666
2667 2667 try:
2668 2668 # ui.forcemerge is an internal variable, do not document
2669 2669 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
2670 2670 return hg.merge(repo, node, force=opts.get('force'))
2671 2671 finally:
2672 2672 ui.setconfig('ui', 'forcemerge', '')
2673 2673
2674 2674 def outgoing(ui, repo, dest=None, **opts):
2675 2675 """show changesets not found in the destination
2676 2676
2677 2677 Show changesets not found in the specified destination repository
2678 2678 or the default push location. These are the changesets that would
2679 2679 be pushed if a push was requested.
2680 2680
2681 2681 See pull for details of valid destination formats.
2682 2682
2683 2683 Returns 0 if there are outgoing changes, 1 otherwise.
2684 2684 """
2685 2685 ret = hg.outgoing(ui, repo, dest, opts)
2686 2686 return ret
2687 2687
2688 2688 def parents(ui, repo, file_=None, **opts):
2689 2689 """show the parents of the working directory or revision
2690 2690
2691 2691 Print the working directory's parent revisions. If a revision is
2692 2692 given via -r/--rev, the parent of that revision will be printed.
2693 2693 If a file argument is given, the revision in which the file was
2694 2694 last changed (before the working directory revision or the
2695 2695 argument to --rev if given) is printed.
2696 2696
2697 2697 Returns 0 on success.
2698 2698 """
2699 2699
2700 2700 ctx = cmdutil.revsingle(repo, opts.get('rev'), None)
2701 2701
2702 2702 if file_:
2703 2703 m = cmdutil.match(repo, (file_,), opts)
2704 2704 if m.anypats() or len(m.files()) != 1:
2705 2705 raise util.Abort(_('can only specify an explicit filename'))
2706 2706 file_ = m.files()[0]
2707 2707 filenodes = []
2708 2708 for cp in ctx.parents():
2709 2709 if not cp:
2710 2710 continue
2711 2711 try:
2712 2712 filenodes.append(cp.filenode(file_))
2713 2713 except error.LookupError:
2714 2714 pass
2715 2715 if not filenodes:
2716 2716 raise util.Abort(_("'%s' not found in manifest!") % file_)
2717 2717 fl = repo.file(file_)
2718 2718 p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes]
2719 2719 else:
2720 2720 p = [cp.node() for cp in ctx.parents()]
2721 2721
2722 2722 displayer = cmdutil.show_changeset(ui, repo, opts)
2723 2723 for n in p:
2724 2724 if n != nullid:
2725 2725 displayer.show(repo[n])
2726 2726 displayer.close()
2727 2727
2728 2728 def paths(ui, repo, search=None):
2729 2729 """show aliases for remote repositories
2730 2730
2731 2731 Show definition of symbolic path name NAME. If no name is given,
2732 2732 show definition of all available names.
2733 2733
2734 2734 Path names are defined in the [paths] section of your
2735 2735 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
2736 2736 repository, ``.hg/hgrc`` is used, too.
2737 2737
2738 2738 The path names ``default`` and ``default-push`` have a special
2739 2739 meaning. When performing a push or pull operation, they are used
2740 2740 as fallbacks if no location is specified on the command-line.
2741 2741 When ``default-push`` is set, it will be used for push and
2742 2742 ``default`` will be used for pull; otherwise ``default`` is used
2743 2743 as the fallback for both. When cloning a repository, the clone
2744 2744 source is written as ``default`` in ``.hg/hgrc``. Note that
2745 2745 ``default`` and ``default-push`` apply to all inbound (e.g.
2746 2746 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
2747 2747 :hg:`bundle`) operations.
2748 2748
2749 2749 See :hg:`help urls` for more information.
2750 2750
2751 2751 Returns 0 on success.
2752 2752 """
2753 2753 if search:
2754 2754 for name, path in ui.configitems("paths"):
2755 2755 if name == search:
2756 2756 ui.write("%s\n" % url.hidepassword(path))
2757 2757 return
2758 2758 ui.warn(_("not found!\n"))
2759 2759 return 1
2760 2760 else:
2761 2761 for name, path in ui.configitems("paths"):
2762 2762 ui.write("%s = %s\n" % (name, url.hidepassword(path)))
2763 2763
2764 2764 def postincoming(ui, repo, modheads, optupdate, checkout):
2765 2765 if modheads == 0:
2766 2766 return
2767 2767 if optupdate:
2768 2768 if (modheads <= 1 or len(repo.branchheads()) == 1) or checkout:
2769 2769 return hg.update(repo, checkout)
2770 2770 else:
2771 2771 ui.status(_("not updating, since new heads added\n"))
2772 2772 if modheads > 1:
2773 2773 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
2774 2774 else:
2775 2775 ui.status(_("(run 'hg update' to get a working copy)\n"))
2776 2776
2777 2777 def pull(ui, repo, source="default", **opts):
2778 2778 """pull changes from the specified source
2779 2779
2780 2780 Pull changes from a remote repository to a local one.
2781 2781
2782 2782 This finds all changes from the repository at the specified path
2783 2783 or URL and adds them to a local repository (the current one unless
2784 2784 -R is specified). By default, this does not update the copy of the
2785 2785 project in the working directory.
2786 2786
2787 2787 Use :hg:`incoming` if you want to see what would have been added
2788 2788 by a pull at the time you issued this command. If you then decide
2789 2789 to add those changes to the repository, you should use :hg:`pull
2790 2790 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
2791 2791
2792 2792 If SOURCE is omitted, the 'default' path will be used.
2793 2793 See :hg:`help urls` for more information.
2794 2794
2795 2795 Returns 0 on success, 1 if an update had unresolved files.
2796 2796 """
2797 2797 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
2798 2798 other = hg.repository(hg.remoteui(repo, opts), source)
2799 2799 ui.status(_('pulling from %s\n') % url.hidepassword(source))
2800 2800 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
2801 2801 if revs:
2802 2802 try:
2803 2803 revs = [other.lookup(rev) for rev in revs]
2804 2804 except error.CapabilityError:
2805 2805 err = _("other repository doesn't support revision lookup, "
2806 2806 "so a rev cannot be specified.")
2807 2807 raise util.Abort(err)
2808 2808
2809 2809 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
2810 2810 if checkout:
2811 2811 checkout = str(repo.changelog.rev(other.lookup(checkout)))
2812 2812 repo._subtoppath = source
2813 2813 try:
2814 2814 return postincoming(ui, repo, modheads, opts.get('update'), checkout)
2815 2815 finally:
2816 2816 del repo._subtoppath
2817 2817
2818 2818 def push(ui, repo, dest=None, **opts):
2819 2819 """push changes to the specified destination
2820 2820
2821 2821 Push changesets from the local repository to the specified
2822 2822 destination.
2823 2823
2824 2824 This operation is symmetrical to pull: it is identical to a pull
2825 2825 in the destination repository from the current one.
2826 2826
2827 2827 By default, push will not allow creation of new heads at the
2828 2828 destination, since multiple heads would make it unclear which head
2829 2829 to use. In this situation, it is recommended to pull and merge
2830 2830 before pushing.
2831 2831
2832 2832 Use --new-branch if you want to allow push to create a new named
2833 2833 branch that is not present at the destination. This allows you to
2834 2834 only create a new branch without forcing other changes.
2835 2835
2836 2836 Use -f/--force to override the default behavior and push all
2837 2837 changesets on all branches.
2838 2838
2839 2839 If -r/--rev is used, the specified revision and all its ancestors
2840 2840 will be pushed to the remote repository.
2841 2841
2842 2842 Please see :hg:`help urls` for important details about ``ssh://``
2843 2843 URLs. If DESTINATION is omitted, a default path will be used.
2844 2844
2845 2845 Returns 0 if push was successful, 1 if nothing to push.
2846 2846 """
2847 2847 dest = ui.expandpath(dest or 'default-push', dest or 'default')
2848 2848 dest, branches = hg.parseurl(dest, opts.get('branch'))
2849 2849 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
2850 2850 other = hg.repository(hg.remoteui(repo, opts), dest)
2851 2851 ui.status(_('pushing to %s\n') % url.hidepassword(dest))
2852 2852 if revs:
2853 2853 revs = [repo.lookup(rev) for rev in revs]
2854 2854
2855 2855 repo._subtoppath = dest
2856 2856 try:
2857 2857 # push subrepos depth-first for coherent ordering
2858 2858 c = repo['']
2859 2859 subs = c.substate # only repos that are committed
2860 2860 for s in sorted(subs):
2861 2861 if not c.sub(s).push(opts.get('force')):
2862 2862 return False
2863 2863 finally:
2864 2864 del repo._subtoppath
2865 2865 r = repo.push(other, opts.get('force'), revs=revs,
2866 2866 newbranch=opts.get('new_branch'))
2867 2867 return r == 0
2868 2868
2869 2869 def recover(ui, repo):
2870 2870 """roll back an interrupted transaction
2871 2871
2872 2872 Recover from an interrupted commit or pull.
2873 2873
2874 2874 This command tries to fix the repository status after an
2875 2875 interrupted operation. It should only be necessary when Mercurial
2876 2876 suggests it.
2877 2877
2878 2878 Returns 0 if successful, 1 if nothing to recover or verify fails.
2879 2879 """
2880 2880 if repo.recover():
2881 2881 return hg.verify(repo)
2882 2882 return 1
2883 2883
2884 2884 def remove(ui, repo, *pats, **opts):
2885 2885 """remove the specified files on the next commit
2886 2886
2887 2887 Schedule the indicated files for removal from the repository.
2888 2888
2889 2889 This only removes files from the current branch, not from the
2890 2890 entire project history. -A/--after can be used to remove only
2891 2891 files that have already been deleted, -f/--force can be used to
2892 2892 force deletion, and -Af can be used to remove files from the next
2893 2893 revision without deleting them from the working directory.
2894 2894
2895 2895 The following table details the behavior of remove for different
2896 2896 file states (columns) and option combinations (rows). The file
2897 2897 states are Added [A], Clean [C], Modified [M] and Missing [!] (as
2898 2898 reported by :hg:`status`). The actions are Warn, Remove (from
2899 2899 branch) and Delete (from disk)::
2900 2900
2901 2901 A C M !
2902 2902 none W RD W R
2903 2903 -f R RD RD R
2904 2904 -A W W W R
2905 2905 -Af R R R R
2906 2906
2907 2907 This command schedules the files to be removed at the next commit.
2908 2908 To undo a remove before that, see :hg:`revert`.
2909 2909
2910 2910 Returns 0 on success, 1 if any warnings encountered.
2911 2911 """
2912 2912
2913 2913 ret = 0
2914 2914 after, force = opts.get('after'), opts.get('force')
2915 2915 if not pats and not after:
2916 2916 raise util.Abort(_('no files specified'))
2917 2917
2918 2918 m = cmdutil.match(repo, pats, opts)
2919 2919 s = repo.status(match=m, clean=True)
2920 2920 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
2921 2921
2922 2922 for f in m.files():
2923 2923 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
2924 2924 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
2925 2925 ret = 1
2926 2926
2927 2927 if force:
2928 2928 remove, forget = modified + deleted + clean, added
2929 2929 elif after:
2930 2930 remove, forget = deleted, []
2931 2931 for f in modified + added + clean:
2932 2932 ui.warn(_('not removing %s: file still exists (use -f'
2933 2933 ' to force removal)\n') % m.rel(f))
2934 2934 ret = 1
2935 2935 else:
2936 2936 remove, forget = deleted + clean, []
2937 2937 for f in modified:
2938 2938 ui.warn(_('not removing %s: file is modified (use -f'
2939 2939 ' to force removal)\n') % m.rel(f))
2940 2940 ret = 1
2941 2941 for f in added:
2942 2942 ui.warn(_('not removing %s: file has been marked for add (use -f'
2943 2943 ' to force removal)\n') % m.rel(f))
2944 2944 ret = 1
2945 2945
2946 2946 for f in sorted(remove + forget):
2947 2947 if ui.verbose or not m.exact(f):
2948 2948 ui.status(_('removing %s\n') % m.rel(f))
2949 2949
2950 2950 repo[None].forget(forget)
2951 2951 repo[None].remove(remove, unlink=not after)
2952 2952 return ret
2953 2953
2954 2954 def rename(ui, repo, *pats, **opts):
2955 2955 """rename files; equivalent of copy + remove
2956 2956
2957 2957 Mark dest as copies of sources; mark sources for deletion. If dest
2958 2958 is a directory, copies are put in that directory. If dest is a
2959 2959 file, there can only be one source.
2960 2960
2961 2961 By default, this command copies the contents of files as they
2962 2962 exist in the working directory. If invoked with -A/--after, the
2963 2963 operation is recorded, but no copying is performed.
2964 2964
2965 2965 This command takes effect at the next commit. To undo a rename
2966 2966 before that, see :hg:`revert`.
2967 2967
2968 2968 Returns 0 on success, 1 if errors are encountered.
2969 2969 """
2970 2970 wlock = repo.wlock(False)
2971 2971 try:
2972 2972 return cmdutil.copy(ui, repo, pats, opts, rename=True)
2973 2973 finally:
2974 2974 wlock.release()
2975 2975
2976 2976 def resolve(ui, repo, *pats, **opts):
2977 2977 """redo merges or set/view the merge status of files
2978 2978
2979 2979 Merges with unresolved conflicts are often the result of
2980 2980 non-interactive merging using the ``internal:merge`` configuration
2981 2981 setting, or a command-line merge tool like ``diff3``. The resolve
2982 2982 command is used to manage the files involved in a merge, after
2983 2983 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
2984 2984 working directory must have two parents).
2985 2985
2986 2986 The resolve command can be used in the following ways:
2987 2987
2988 2988 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
2989 2989 files, discarding any previous merge attempts. Re-merging is not
2990 2990 performed for files already marked as resolved. Use ``--all/-a``
2991 2991 to selects all unresolved files. ``--tool`` can be used to specify
2992 2992 the merge tool used for the given files. It overrides the HGMERGE
2993 2993 environment variable and your configuration files.
2994 2994
2995 2995 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
2996 2996 (e.g. after having manually fixed-up the files). The default is
2997 2997 to mark all unresolved files.
2998 2998
2999 2999 - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The
3000 3000 default is to mark all resolved files.
3001 3001
3002 3002 - :hg:`resolve -l`: list files which had or still have conflicts.
3003 3003 In the printed list, ``U`` = unresolved and ``R`` = resolved.
3004 3004
3005 3005 Note that Mercurial will not let you commit files with unresolved
3006 3006 merge conflicts. You must use :hg:`resolve -m ...` before you can
3007 3007 commit after a conflicting merge.
3008 3008
3009 3009 Returns 0 on success, 1 if any files fail a resolve attempt.
3010 3010 """
3011 3011
3012 3012 all, mark, unmark, show, nostatus = \
3013 3013 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
3014 3014
3015 3015 if (show and (mark or unmark)) or (mark and unmark):
3016 3016 raise util.Abort(_("too many options specified"))
3017 3017 if pats and all:
3018 3018 raise util.Abort(_("can't specify --all and patterns"))
3019 3019 if not (all or pats or show or mark or unmark):
3020 3020 raise util.Abort(_('no files or directories specified; '
3021 3021 'use --all to remerge all files'))
3022 3022
3023 3023 ms = mergemod.mergestate(repo)
3024 3024 m = cmdutil.match(repo, pats, opts)
3025 3025 ret = 0
3026 3026
3027 3027 for f in ms:
3028 3028 if m(f):
3029 3029 if show:
3030 3030 if nostatus:
3031 3031 ui.write("%s\n" % f)
3032 3032 else:
3033 3033 ui.write("%s %s\n" % (ms[f].upper(), f),
3034 3034 label='resolve.' +
3035 3035 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
3036 3036 elif mark:
3037 3037 ms.mark(f, "r")
3038 3038 elif unmark:
3039 3039 ms.mark(f, "u")
3040 3040 else:
3041 3041 wctx = repo[None]
3042 3042 mctx = wctx.parents()[-1]
3043 3043
3044 3044 # backup pre-resolve (merge uses .orig for its own purposes)
3045 3045 a = repo.wjoin(f)
3046 3046 util.copyfile(a, a + ".resolve")
3047 3047
3048 3048 try:
3049 3049 # resolve file
3050 3050 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
3051 3051 if ms.resolve(f, wctx, mctx):
3052 3052 ret = 1
3053 3053 finally:
3054 3054 ui.setconfig('ui', 'forcemerge', '')
3055 3055
3056 3056 # replace filemerge's .orig file with our resolve file
3057 3057 util.rename(a + ".resolve", a + ".orig")
3058 3058
3059 3059 ms.commit()
3060 3060 return ret
3061 3061
3062 3062 def revert(ui, repo, *pats, **opts):
3063 3063 """restore individual files or directories to an earlier state
3064 3064
3065 3065 .. note::
3066 3066 This command is most likely not what you are looking for.
3067 3067 Revert will partially overwrite content in the working
3068 3068 directory without changing the working directory parents. Use
3069 3069 :hg:`update -r rev` to check out earlier revisions, or
3070 3070 :hg:`update --clean .` to undo a merge which has added another
3071 3071 parent.
3072 3072
3073 3073 With no revision specified, revert the named files or directories
3074 3074 to the contents they had in the parent of the working directory.
3075 3075 This restores the contents of the affected files to an unmodified
3076 3076 state and unschedules adds, removes, copies, and renames. If the
3077 3077 working directory has two parents, you must explicitly specify a
3078 3078 revision.
3079 3079
3080 3080 Using the -r/--rev option, revert the given files or directories
3081 3081 to their contents as of a specific revision. This can be helpful
3082 3082 to "roll back" some or all of an earlier change. See :hg:`help
3083 3083 dates` for a list of formats valid for -d/--date.
3084 3084
3085 3085 Revert modifies the working directory. It does not commit any
3086 3086 changes, or change the parent of the working directory. If you
3087 3087 revert to a revision other than the parent of the working
3088 3088 directory, the reverted files will thus appear modified
3089 3089 afterwards.
3090 3090
3091 3091 If a file has been deleted, it is restored. If the executable mode
3092 3092 of a file was changed, it is reset.
3093 3093
3094 3094 If names are given, all files matching the names are reverted.
3095 3095 If no arguments are given, no files are reverted.
3096 3096
3097 3097 Modified files are saved with a .orig suffix before reverting.
3098 3098 To disable these backups, use --no-backup.
3099 3099
3100 3100 Returns 0 on success.
3101 3101 """
3102 3102
3103 3103 if opts.get("date"):
3104 3104 if opts.get("rev"):
3105 3105 raise util.Abort(_("you can't specify a revision and a date"))
3106 3106 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
3107 3107
3108 3108 if not pats and not opts.get('all'):
3109 3109 raise util.Abort(_('no files or directories specified; '
3110 3110 'use --all to revert the whole repo'))
3111 3111
3112 3112 parent, p2 = repo.dirstate.parents()
3113 3113 if not opts.get('rev') and p2 != nullid:
3114 3114 raise util.Abort(_('uncommitted merge - please provide a '
3115 3115 'specific revision'))
3116 3116 ctx = cmdutil.revsingle(repo, opts.get('rev'))
3117 3117 node = ctx.node()
3118 3118 mf = ctx.manifest()
3119 3119 if node == parent:
3120 3120 pmf = mf
3121 3121 else:
3122 3122 pmf = None
3123 3123
3124 3124 # need all matching names in dirstate and manifest of target rev,
3125 3125 # so have to walk both. do not print errors if files exist in one
3126 3126 # but not other.
3127 3127
3128 3128 names = {}
3129 3129
3130 3130 wlock = repo.wlock()
3131 3131 try:
3132 3132 # walk dirstate.
3133 3133
3134 3134 m = cmdutil.match(repo, pats, opts)
3135 3135 m.bad = lambda x, y: False
3136 3136 for abs in repo.walk(m):
3137 3137 names[abs] = m.rel(abs), m.exact(abs)
3138 3138
3139 3139 # walk target manifest.
3140 3140
3141 3141 def badfn(path, msg):
3142 3142 if path in names:
3143 3143 return
3144 3144 path_ = path + '/'
3145 3145 for f in names:
3146 3146 if f.startswith(path_):
3147 3147 return
3148 3148 ui.warn("%s: %s\n" % (m.rel(path), msg))
3149 3149
3150 3150 m = cmdutil.match(repo, pats, opts)
3151 3151 m.bad = badfn
3152 3152 for abs in repo[node].walk(m):
3153 3153 if abs not in names:
3154 3154 names[abs] = m.rel(abs), m.exact(abs)
3155 3155
3156 3156 m = cmdutil.matchfiles(repo, names)
3157 3157 changes = repo.status(match=m)[:4]
3158 3158 modified, added, removed, deleted = map(set, changes)
3159 3159
3160 3160 # if f is a rename, also revert the source
3161 3161 cwd = repo.getcwd()
3162 3162 for f in added:
3163 3163 src = repo.dirstate.copied(f)
3164 3164 if src and src not in names and repo.dirstate[src] == 'r':
3165 3165 removed.add(src)
3166 3166 names[src] = (repo.pathto(src, cwd), True)
3167 3167
3168 3168 def removeforget(abs):
3169 3169 if repo.dirstate[abs] == 'a':
3170 3170 return _('forgetting %s\n')
3171 3171 return _('removing %s\n')
3172 3172
3173 3173 revert = ([], _('reverting %s\n'))
3174 3174 add = ([], _('adding %s\n'))
3175 3175 remove = ([], removeforget)
3176 3176 undelete = ([], _('undeleting %s\n'))
3177 3177
3178 3178 disptable = (
3179 3179 # dispatch table:
3180 3180 # file state
3181 3181 # action if in target manifest
3182 3182 # action if not in target manifest
3183 3183 # make backup if in target manifest
3184 3184 # make backup if not in target manifest
3185 3185 (modified, revert, remove, True, True),
3186 3186 (added, revert, remove, True, False),
3187 3187 (removed, undelete, None, False, False),
3188 3188 (deleted, revert, remove, False, False),
3189 3189 )
3190 3190
3191 3191 for abs, (rel, exact) in sorted(names.items()):
3192 3192 mfentry = mf.get(abs)
3193 3193 target = repo.wjoin(abs)
3194 3194 def handle(xlist, dobackup):
3195 3195 xlist[0].append(abs)
3196 3196 if (dobackup and not opts.get('no_backup') and
3197 3197 os.path.lexists(target)):
3198 3198 bakname = "%s.orig" % rel
3199 3199 ui.note(_('saving current version of %s as %s\n') %
3200 3200 (rel, bakname))
3201 3201 if not opts.get('dry_run'):
3202 3202 util.rename(target, bakname)
3203 3203 if ui.verbose or not exact:
3204 3204 msg = xlist[1]
3205 3205 if not isinstance(msg, basestring):
3206 3206 msg = msg(abs)
3207 3207 ui.status(msg % rel)
3208 3208 for table, hitlist, misslist, backuphit, backupmiss in disptable:
3209 3209 if abs not in table:
3210 3210 continue
3211 3211 # file has changed in dirstate
3212 3212 if mfentry:
3213 3213 handle(hitlist, backuphit)
3214 3214 elif misslist is not None:
3215 3215 handle(misslist, backupmiss)
3216 3216 break
3217 3217 else:
3218 3218 if abs not in repo.dirstate:
3219 3219 if mfentry:
3220 3220 handle(add, True)
3221 3221 elif exact:
3222 3222 ui.warn(_('file not managed: %s\n') % rel)
3223 3223 continue
3224 3224 # file has not changed in dirstate
3225 3225 if node == parent:
3226 3226 if exact:
3227 3227 ui.warn(_('no changes needed to %s\n') % rel)
3228 3228 continue
3229 3229 if pmf is None:
3230 3230 # only need parent manifest in this unlikely case,
3231 3231 # so do not read by default
3232 3232 pmf = repo[parent].manifest()
3233 3233 if abs in pmf:
3234 3234 if mfentry:
3235 3235 # if version of file is same in parent and target
3236 3236 # manifests, do nothing
3237 3237 if (pmf[abs] != mfentry or
3238 3238 pmf.flags(abs) != mf.flags(abs)):
3239 3239 handle(revert, False)
3240 3240 else:
3241 3241 handle(remove, False)
3242 3242
3243 3243 if not opts.get('dry_run'):
3244 3244 def checkout(f):
3245 3245 fc = ctx[f]
3246 3246 repo.wwrite(f, fc.data(), fc.flags())
3247 3247
3248 3248 audit_path = util.path_auditor(repo.root)
3249 3249 for f in remove[0]:
3250 3250 if repo.dirstate[f] == 'a':
3251 3251 repo.dirstate.forget(f)
3252 3252 continue
3253 3253 audit_path(f)
3254 3254 try:
3255 3255 util.unlink(repo.wjoin(f))
3256 3256 except OSError:
3257 3257 pass
3258 3258 repo.dirstate.remove(f)
3259 3259
3260 3260 normal = None
3261 3261 if node == parent:
3262 3262 # We're reverting to our parent. If possible, we'd like status
3263 3263 # to report the file as clean. We have to use normallookup for
3264 3264 # merges to avoid losing information about merged/dirty files.
3265 3265 if p2 != nullid:
3266 3266 normal = repo.dirstate.normallookup
3267 3267 else:
3268 3268 normal = repo.dirstate.normal
3269 3269 for f in revert[0]:
3270 3270 checkout(f)
3271 3271 if normal:
3272 3272 normal(f)
3273 3273
3274 3274 for f in add[0]:
3275 3275 checkout(f)
3276 3276 repo.dirstate.add(f)
3277 3277
3278 3278 normal = repo.dirstate.normallookup
3279 3279 if node == parent and p2 == nullid:
3280 3280 normal = repo.dirstate.normal
3281 3281 for f in undelete[0]:
3282 3282 checkout(f)
3283 3283 normal(f)
3284 3284
3285 3285 finally:
3286 3286 wlock.release()
3287 3287
3288 3288 def rollback(ui, repo, **opts):
3289 3289 """roll back the last transaction (dangerous)
3290 3290
3291 3291 This command should be used with care. There is only one level of
3292 3292 rollback, and there is no way to undo a rollback. It will also
3293 3293 restore the dirstate at the time of the last transaction, losing
3294 3294 any dirstate changes since that time. This command does not alter
3295 3295 the working directory.
3296 3296
3297 3297 Transactions are used to encapsulate the effects of all commands
3298 3298 that create new changesets or propagate existing changesets into a
3299 3299 repository. For example, the following commands are transactional,
3300 3300 and their effects can be rolled back:
3301 3301
3302 3302 - commit
3303 3303 - import
3304 3304 - pull
3305 3305 - push (with this repository as the destination)
3306 3306 - unbundle
3307 3307
3308 3308 This command is not intended for use on public repositories. Once
3309 3309 changes are visible for pull by other users, rolling a transaction
3310 3310 back locally is ineffective (someone else may already have pulled
3311 3311 the changes). Furthermore, a race is possible with readers of the
3312 3312 repository; for example an in-progress pull from the repository
3313 3313 may fail if a rollback is performed.
3314 3314
3315 3315 Returns 0 on success, 1 if no rollback data is available.
3316 3316 """
3317 3317 return repo.rollback(opts.get('dry_run'))
3318 3318
3319 3319 def root(ui, repo):
3320 3320 """print the root (top) of the current working directory
3321 3321
3322 3322 Print the root directory of the current repository.
3323 3323
3324 3324 Returns 0 on success.
3325 3325 """
3326 3326 ui.write(repo.root + "\n")
3327 3327
3328 3328 def serve(ui, repo, **opts):
3329 3329 """start stand-alone webserver
3330 3330
3331 3331 Start a local HTTP repository browser and pull server. You can use
3332 3332 this for ad-hoc sharing and browing of repositories. It is
3333 3333 recommended to use a real web server to serve a repository for
3334 3334 longer periods of time.
3335 3335
3336 3336 Please note that the server does not implement access control.
3337 3337 This means that, by default, anybody can read from the server and
3338 3338 nobody can write to it by default. Set the ``web.allow_push``
3339 3339 option to ``*`` to allow everybody to push to the server. You
3340 3340 should use a real web server if you need to authenticate users.
3341 3341
3342 3342 By default, the server logs accesses to stdout and errors to
3343 3343 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
3344 3344 files.
3345 3345
3346 3346 To have the server choose a free port number to listen on, specify
3347 3347 a port number of 0; in this case, the server will print the port
3348 3348 number it uses.
3349 3349
3350 3350 Returns 0 on success.
3351 3351 """
3352 3352
3353 3353 if opts["stdio"]:
3354 3354 if repo is None:
3355 3355 raise error.RepoError(_("There is no Mercurial repository here"
3356 3356 " (.hg not found)"))
3357 3357 s = sshserver.sshserver(ui, repo)
3358 3358 s.serve_forever()
3359 3359
3360 3360 # this way we can check if something was given in the command-line
3361 3361 if opts.get('port'):
3362 3362 opts['port'] = util.getport(opts.get('port'))
3363 3363
3364 3364 baseui = repo and repo.baseui or ui
3365 3365 optlist = ("name templates style address port prefix ipv6"
3366 3366 " accesslog errorlog certificate encoding")
3367 3367 for o in optlist.split():
3368 3368 val = opts.get(o, '')
3369 3369 if val in (None, ''): # should check against default options instead
3370 3370 continue
3371 3371 baseui.setconfig("web", o, val)
3372 3372 if repo and repo.ui != baseui:
3373 3373 repo.ui.setconfig("web", o, val)
3374 3374
3375 3375 o = opts.get('web_conf') or opts.get('webdir_conf')
3376 3376 if not o:
3377 3377 if not repo:
3378 3378 raise error.RepoError(_("There is no Mercurial repository"
3379 3379 " here (.hg not found)"))
3380 3380 o = repo.root
3381 3381
3382 3382 app = hgweb.hgweb(o, baseui=ui)
3383 3383
3384 3384 class service(object):
3385 3385 def init(self):
3386 3386 util.set_signal_handler()
3387 3387 self.httpd = hgweb.server.create_server(ui, app)
3388 3388
3389 3389 if opts['port'] and not ui.verbose:
3390 3390 return
3391 3391
3392 3392 if self.httpd.prefix:
3393 3393 prefix = self.httpd.prefix.strip('/') + '/'
3394 3394 else:
3395 3395 prefix = ''
3396 3396
3397 3397 port = ':%d' % self.httpd.port
3398 3398 if port == ':80':
3399 3399 port = ''
3400 3400
3401 3401 bindaddr = self.httpd.addr
3402 3402 if bindaddr == '0.0.0.0':
3403 3403 bindaddr = '*'
3404 3404 elif ':' in bindaddr: # IPv6
3405 3405 bindaddr = '[%s]' % bindaddr
3406 3406
3407 3407 fqaddr = self.httpd.fqaddr
3408 3408 if ':' in fqaddr:
3409 3409 fqaddr = '[%s]' % fqaddr
3410 3410 if opts['port']:
3411 3411 write = ui.status
3412 3412 else:
3413 3413 write = ui.write
3414 3414 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
3415 3415 (fqaddr, port, prefix, bindaddr, self.httpd.port))
3416 3416
3417 3417 def run(self):
3418 3418 self.httpd.serve_forever()
3419 3419
3420 3420 service = service()
3421 3421
3422 3422 cmdutil.service(opts, initfn=service.init, runfn=service.run)
3423 3423
3424 3424 def status(ui, repo, *pats, **opts):
3425 3425 """show changed files in the working directory
3426 3426
3427 3427 Show status of files in the repository. If names are given, only
3428 3428 files that match are shown. Files that are clean or ignored or
3429 3429 the source of a copy/move operation, are not listed unless
3430 3430 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
3431 3431 Unless options described with "show only ..." are given, the
3432 3432 options -mardu are used.
3433 3433
3434 3434 Option -q/--quiet hides untracked (unknown and ignored) files
3435 3435 unless explicitly requested with -u/--unknown or -i/--ignored.
3436 3436
3437 3437 .. note::
3438 3438 status may appear to disagree with diff if permissions have
3439 3439 changed or a merge has occurred. The standard diff format does
3440 3440 not report permission changes and diff only reports changes
3441 3441 relative to one merge parent.
3442 3442
3443 3443 If one revision is given, it is used as the base revision.
3444 3444 If two revisions are given, the differences between them are
3445 3445 shown. The --change option can also be used as a shortcut to list
3446 3446 the changed files of a revision from its first parent.
3447 3447
3448 3448 The codes used to show the status of files are::
3449 3449
3450 3450 M = modified
3451 3451 A = added
3452 3452 R = removed
3453 3453 C = clean
3454 3454 ! = missing (deleted by non-hg command, but still tracked)
3455 3455 ? = not tracked
3456 3456 I = ignored
3457 3457 = origin of the previous file listed as A (added)
3458 3458
3459 3459 Returns 0 on success.
3460 3460 """
3461 3461
3462 3462 revs = opts.get('rev')
3463 3463 change = opts.get('change')
3464 3464
3465 3465 if revs and change:
3466 3466 msg = _('cannot specify --rev and --change at the same time')
3467 3467 raise util.Abort(msg)
3468 3468 elif change:
3469 3469 node2 = repo.lookup(change)
3470 3470 node1 = repo[node2].parents()[0].node()
3471 3471 else:
3472 3472 node1, node2 = cmdutil.revpair(repo, revs)
3473 3473
3474 3474 cwd = (pats and repo.getcwd()) or ''
3475 3475 end = opts.get('print0') and '\0' or '\n'
3476 3476 copy = {}
3477 3477 states = 'modified added removed deleted unknown ignored clean'.split()
3478 3478 show = [k for k in states if opts.get(k)]
3479 3479 if opts.get('all'):
3480 3480 show += ui.quiet and (states[:4] + ['clean']) or states
3481 3481 if not show:
3482 3482 show = ui.quiet and states[:4] or states[:5]
3483 3483
3484 3484 stat = repo.status(node1, node2, cmdutil.match(repo, pats, opts),
3485 3485 'ignored' in show, 'clean' in show, 'unknown' in show,
3486 3486 opts.get('subrepos'))
3487 3487 changestates = zip(states, 'MAR!?IC', stat)
3488 3488
3489 3489 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
3490 3490 ctxn = repo[nullid]
3491 3491 ctx1 = repo[node1]
3492 3492 ctx2 = repo[node2]
3493 3493 added = stat[1]
3494 3494 if node2 is None:
3495 3495 added = stat[0] + stat[1] # merged?
3496 3496
3497 3497 for k, v in copies.copies(repo, ctx1, ctx2, ctxn)[0].iteritems():
3498 3498 if k in added:
3499 3499 copy[k] = v
3500 3500 elif v in added:
3501 3501 copy[v] = k
3502 3502
3503 3503 for state, char, files in changestates:
3504 3504 if state in show:
3505 3505 format = "%s %%s%s" % (char, end)
3506 3506 if opts.get('no_status'):
3507 3507 format = "%%s%s" % end
3508 3508
3509 3509 for f in files:
3510 3510 ui.write(format % repo.pathto(f, cwd),
3511 3511 label='status.' + state)
3512 3512 if f in copy:
3513 3513 ui.write(' %s%s' % (repo.pathto(copy[f], cwd), end),
3514 3514 label='status.copied')
3515 3515
3516 3516 def summary(ui, repo, **opts):
3517 3517 """summarize working directory state
3518 3518
3519 3519 This generates a brief summary of the working directory state,
3520 3520 including parents, branch, commit status, and available updates.
3521 3521
3522 3522 With the --remote option, this will check the default paths for
3523 3523 incoming and outgoing changes. This can be time-consuming.
3524 3524
3525 3525 Returns 0 on success.
3526 3526 """
3527 3527
3528 3528 ctx = repo[None]
3529 3529 parents = ctx.parents()
3530 3530 pnode = parents[0].node()
3531 3531
3532 3532 for p in parents:
3533 3533 # label with log.changeset (instead of log.parent) since this
3534 3534 # shows a working directory parent *changeset*:
3535 3535 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
3536 3536 label='log.changeset')
3537 3537 ui.write(' '.join(p.tags()), label='log.tag')
3538 3538 if p.rev() == -1:
3539 3539 if not len(repo):
3540 3540 ui.write(_(' (empty repository)'))
3541 3541 else:
3542 3542 ui.write(_(' (no revision checked out)'))
3543 3543 ui.write('\n')
3544 3544 if p.description():
3545 3545 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
3546 3546 label='log.summary')
3547 3547
3548 3548 branch = ctx.branch()
3549 3549 bheads = repo.branchheads(branch)
3550 3550 m = _('branch: %s\n') % branch
3551 3551 if branch != 'default':
3552 3552 ui.write(m, label='log.branch')
3553 3553 else:
3554 3554 ui.status(m, label='log.branch')
3555 3555
3556 3556 st = list(repo.status(unknown=True))[:6]
3557 3557
3558 3558 c = repo.dirstate.copies()
3559 3559 copied, renamed = [], []
3560 3560 for d, s in c.iteritems():
3561 3561 if s in st[2]:
3562 3562 st[2].remove(s)
3563 3563 renamed.append(d)
3564 3564 else:
3565 3565 copied.append(d)
3566 3566 if d in st[1]:
3567 3567 st[1].remove(d)
3568 3568 st.insert(3, renamed)
3569 3569 st.insert(4, copied)
3570 3570
3571 3571 ms = mergemod.mergestate(repo)
3572 3572 st.append([f for f in ms if ms[f] == 'u'])
3573 3573
3574 3574 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
3575 3575 st.append(subs)
3576 3576
3577 3577 labels = [ui.label(_('%d modified'), 'status.modified'),
3578 3578 ui.label(_('%d added'), 'status.added'),
3579 3579 ui.label(_('%d removed'), 'status.removed'),
3580 3580 ui.label(_('%d renamed'), 'status.copied'),
3581 3581 ui.label(_('%d copied'), 'status.copied'),
3582 3582 ui.label(_('%d deleted'), 'status.deleted'),
3583 3583 ui.label(_('%d unknown'), 'status.unknown'),
3584 3584 ui.label(_('%d ignored'), 'status.ignored'),
3585 3585 ui.label(_('%d unresolved'), 'resolve.unresolved'),
3586 3586 ui.label(_('%d subrepos'), 'status.modified')]
3587 3587 t = []
3588 3588 for s, l in zip(st, labels):
3589 3589 if s:
3590 3590 t.append(l % len(s))
3591 3591
3592 3592 t = ', '.join(t)
3593 3593 cleanworkdir = False
3594 3594
3595 3595 if len(parents) > 1:
3596 3596 t += _(' (merge)')
3597 3597 elif branch != parents[0].branch():
3598 3598 t += _(' (new branch)')
3599 3599 elif (parents[0].extra().get('close') and
3600 3600 pnode in repo.branchheads(branch, closed=True)):
3601 3601 t += _(' (head closed)')
3602 3602 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]):
3603 3603 t += _(' (clean)')
3604 3604 cleanworkdir = True
3605 3605 elif pnode not in bheads:
3606 3606 t += _(' (new branch head)')
3607 3607
3608 3608 if cleanworkdir:
3609 3609 ui.status(_('commit: %s\n') % t.strip())
3610 3610 else:
3611 3611 ui.write(_('commit: %s\n') % t.strip())
3612 3612
3613 3613 # all ancestors of branch heads - all ancestors of parent = new csets
3614 3614 new = [0] * len(repo)
3615 3615 cl = repo.changelog
3616 3616 for a in [cl.rev(n) for n in bheads]:
3617 3617 new[a] = 1
3618 3618 for a in cl.ancestors(*[cl.rev(n) for n in bheads]):
3619 3619 new[a] = 1
3620 3620 for a in [p.rev() for p in parents]:
3621 3621 if a >= 0:
3622 3622 new[a] = 0
3623 3623 for a in cl.ancestors(*[p.rev() for p in parents]):
3624 3624 new[a] = 0
3625 3625 new = sum(new)
3626 3626
3627 3627 if new == 0:
3628 3628 ui.status(_('update: (current)\n'))
3629 3629 elif pnode not in bheads:
3630 3630 ui.write(_('update: %d new changesets (update)\n') % new)
3631 3631 else:
3632 3632 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
3633 3633 (new, len(bheads)))
3634 3634
3635 3635 if opts.get('remote'):
3636 3636 t = []
3637 3637 source, branches = hg.parseurl(ui.expandpath('default'))
3638 3638 other = hg.repository(hg.remoteui(repo, {}), source)
3639 3639 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
3640 3640 ui.debug('comparing with %s\n' % url.hidepassword(source))
3641 3641 repo.ui.pushbuffer()
3642 3642 common, incoming, rheads = discovery.findcommonincoming(repo, other)
3643 3643 repo.ui.popbuffer()
3644 3644 if incoming:
3645 3645 t.append(_('1 or more incoming'))
3646 3646
3647 3647 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
3648 3648 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
3649 3649 other = hg.repository(hg.remoteui(repo, {}), dest)
3650 3650 ui.debug('comparing with %s\n' % url.hidepassword(dest))
3651 3651 repo.ui.pushbuffer()
3652 3652 o = discovery.findoutgoing(repo, other)
3653 3653 repo.ui.popbuffer()
3654 3654 o = repo.changelog.nodesbetween(o, None)[0]
3655 3655 if o:
3656 3656 t.append(_('%d outgoing') % len(o))
3657 3657
3658 3658 if t:
3659 3659 ui.write(_('remote: %s\n') % (', '.join(t)))
3660 3660 else:
3661 3661 ui.status(_('remote: (synced)\n'))
3662 3662
3663 3663 def tag(ui, repo, name1, *names, **opts):
3664 3664 """add one or more tags for the current or given revision
3665 3665
3666 3666 Name a particular revision using <name>.
3667 3667
3668 3668 Tags are used to name particular revisions of the repository and are
3669 3669 very useful to compare different revisions, to go back to significant
3670 3670 earlier versions or to mark branch points as releases, etc.
3671 3671
3672 3672 If no revision is given, the parent of the working directory is
3673 3673 used, or tip if no revision is checked out.
3674 3674
3675 3675 To facilitate version control, distribution, and merging of tags,
3676 3676 they are stored as a file named ".hgtags" which is managed
3677 3677 similarly to other project files and can be hand-edited if
3678 3678 necessary. The file '.hg/localtags' is used for local tags (not
3679 3679 shared among repositories).
3680 3680
3681 3681 See :hg:`help dates` for a list of formats valid for -d/--date.
3682 3682
3683 3683 Since tag names have priority over branch names during revision
3684 3684 lookup, using an existing branch name as a tag name is discouraged.
3685 3685
3686 3686 Returns 0 on success.
3687 3687 """
3688 3688
3689 3689 rev_ = "."
3690 3690 names = [t.strip() for t in (name1,) + names]
3691 3691 if len(names) != len(set(names)):
3692 3692 raise util.Abort(_('tag names must be unique'))
3693 3693 for n in names:
3694 3694 if n in ['tip', '.', 'null']:
3695 3695 raise util.Abort(_('the name \'%s\' is reserved') % n)
3696 3696 if not n:
3697 3697 raise util.Abort(_('tag names cannot consist entirely of whitespace'))
3698 3698 if opts.get('rev') and opts.get('remove'):
3699 3699 raise util.Abort(_("--rev and --remove are incompatible"))
3700 3700 if opts.get('rev'):
3701 3701 rev_ = opts['rev']
3702 3702 message = opts.get('message')
3703 3703 if opts.get('remove'):
3704 3704 expectedtype = opts.get('local') and 'local' or 'global'
3705 3705 for n in names:
3706 3706 if not repo.tagtype(n):
3707 3707 raise util.Abort(_('tag \'%s\' does not exist') % n)
3708 3708 if repo.tagtype(n) != expectedtype:
3709 3709 if expectedtype == 'global':
3710 3710 raise util.Abort(_('tag \'%s\' is not a global tag') % n)
3711 3711 else:
3712 3712 raise util.Abort(_('tag \'%s\' is not a local tag') % n)
3713 3713 rev_ = nullid
3714 3714 if not message:
3715 3715 # we don't translate commit messages
3716 3716 message = 'Removed tag %s' % ', '.join(names)
3717 3717 elif not opts.get('force'):
3718 3718 for n in names:
3719 3719 if n in repo.tags():
3720 3720 raise util.Abort(_('tag \'%s\' already exists '
3721 3721 '(use -f to force)') % n)
3722 3722 if not rev_ and repo.dirstate.parents()[1] != nullid:
3723 3723 raise util.Abort(_('uncommitted merge - please provide a '
3724 3724 'specific revision'))
3725 3725 r = cmdutil.revsingle(repo, rev_).node()
3726 3726
3727 3727 if not message:
3728 3728 # we don't translate commit messages
3729 3729 message = ('Added tag %s for changeset %s' %
3730 3730 (', '.join(names), short(r)))
3731 3731
3732 3732 date = opts.get('date')
3733 3733 if date:
3734 3734 date = util.parsedate(date)
3735 3735
3736 3736 if opts.get('edit'):
3737 3737 message = ui.edit(message, ui.username())
3738 3738
3739 3739 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
3740 3740
3741 3741 def tags(ui, repo):
3742 3742 """list repository tags
3743 3743
3744 3744 This lists both regular and local tags. When the -v/--verbose
3745 3745 switch is used, a third column "local" is printed for local tags.
3746 3746
3747 3747 Returns 0 on success.
3748 3748 """
3749 3749
3750 3750 hexfunc = ui.debugflag and hex or short
3751 3751 tagtype = ""
3752 3752
3753 3753 for t, n in reversed(repo.tagslist()):
3754 3754 if ui.quiet:
3755 3755 ui.write("%s\n" % t)
3756 3756 continue
3757 3757
3758 3758 try:
3759 3759 hn = hexfunc(n)
3760 3760 r = "%5d:%s" % (repo.changelog.rev(n), hn)
3761 3761 except error.LookupError:
3762 3762 r = " ?:%s" % hn
3763 3763 else:
3764 3764 spaces = " " * (30 - encoding.colwidth(t))
3765 3765 if ui.verbose:
3766 3766 if repo.tagtype(t) == 'local':
3767 3767 tagtype = " local"
3768 3768 else:
3769 3769 tagtype = ""
3770 3770 ui.write("%s%s %s%s\n" % (t, spaces, r, tagtype))
3771 3771
3772 3772 def tip(ui, repo, **opts):
3773 3773 """show the tip revision
3774 3774
3775 3775 The tip revision (usually just called the tip) is the changeset
3776 3776 most recently added to the repository (and therefore the most
3777 3777 recently changed head).
3778 3778
3779 3779 If you have just made a commit, that commit will be the tip. If
3780 3780 you have just pulled changes from another repository, the tip of
3781 3781 that repository becomes the current tip. The "tip" tag is special
3782 3782 and cannot be renamed or assigned to a different changeset.
3783 3783
3784 3784 Returns 0 on success.
3785 3785 """
3786 3786 displayer = cmdutil.show_changeset(ui, repo, opts)
3787 3787 displayer.show(repo[len(repo) - 1])
3788 3788 displayer.close()
3789 3789
3790 3790 def unbundle(ui, repo, fname1, *fnames, **opts):
3791 3791 """apply one or more changegroup files
3792 3792
3793 3793 Apply one or more compressed changegroup files generated by the
3794 3794 bundle command.
3795 3795
3796 3796 Returns 0 on success, 1 if an update has unresolved files.
3797 3797 """
3798 3798 fnames = (fname1,) + fnames
3799 3799
3800 3800 lock = repo.lock()
3801 3801 try:
3802 3802 for fname in fnames:
3803 3803 f = url.open(ui, fname)
3804 3804 gen = changegroup.readbundle(f, fname)
3805 3805 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname,
3806 3806 lock=lock)
3807 3807 finally:
3808 3808 lock.release()
3809 3809
3810 3810 return postincoming(ui, repo, modheads, opts.get('update'), None)
3811 3811
3812 3812 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
3813 3813 """update working directory (or switch revisions)
3814 3814
3815 3815 Update the repository's working directory to the specified
3816 3816 changeset. If no changeset is specified, update to the tip of the
3817 3817 current named branch.
3818 3818
3819 3819 If the changeset is not a descendant of the working directory's
3820 3820 parent, the update is aborted. With the -c/--check option, the
3821 3821 working directory is checked for uncommitted changes; if none are
3822 3822 found, the working directory is updated to the specified
3823 3823 changeset.
3824 3824
3825 3825 The following rules apply when the working directory contains
3826 3826 uncommitted changes:
3827 3827
3828 3828 1. If neither -c/--check nor -C/--clean is specified, and if
3829 3829 the requested changeset is an ancestor or descendant of
3830 3830 the working directory's parent, the uncommitted changes
3831 3831 are merged into the requested changeset and the merged
3832 3832 result is left uncommitted. If the requested changeset is
3833 3833 not an ancestor or descendant (that is, it is on another
3834 3834 branch), the update is aborted and the uncommitted changes
3835 3835 are preserved.
3836 3836
3837 3837 2. With the -c/--check option, the update is aborted and the
3838 3838 uncommitted changes are preserved.
3839 3839
3840 3840 3. With the -C/--clean option, uncommitted changes are discarded and
3841 3841 the working directory is updated to the requested changeset.
3842 3842
3843 3843 Use null as the changeset to remove the working directory (like
3844 3844 :hg:`clone -U`).
3845 3845
3846 3846 If you want to update just one file to an older changeset, use
3847 3847 :hg:`revert`.
3848 3848
3849 3849 See :hg:`help dates` for a list of formats valid for -d/--date.
3850 3850
3851 3851 Returns 0 on success, 1 if there are unresolved files.
3852 3852 """
3853 3853 if rev and node:
3854 3854 raise util.Abort(_("please specify just one revision"))
3855 3855
3856 3856 if not rev:
3857 3857 rev = node
3858 3858
3859 3859 rev = cmdutil.revsingle(repo, rev, rev).rev()
3860 3860
3861 3861 if check and clean:
3862 3862 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
3863 3863
3864 3864 if check:
3865 3865 # we could use dirty() but we can ignore merge and branch trivia
3866 3866 c = repo[None]
3867 3867 if c.modified() or c.added() or c.removed():
3868 3868 raise util.Abort(_("uncommitted local changes"))
3869 3869
3870 3870 if date:
3871 3871 if rev:
3872 3872 raise util.Abort(_("you can't specify a revision and a date"))
3873 3873 rev = cmdutil.finddate(ui, repo, date)
3874 3874
3875 3875 if clean or check:
3876 3876 return hg.clean(repo, rev)
3877 3877 else:
3878 3878 return hg.update(repo, rev)
3879 3879
3880 3880 def verify(ui, repo):
3881 3881 """verify the integrity of the repository
3882 3882
3883 3883 Verify the integrity of the current repository.
3884 3884
3885 3885 This will perform an extensive check of the repository's
3886 3886 integrity, validating the hashes and checksums of each entry in
3887 3887 the changelog, manifest, and tracked files, as well as the
3888 3888 integrity of their crosslinks and indices.
3889 3889
3890 3890 Returns 0 on success, 1 if errors are encountered.
3891 3891 """
3892 3892 return hg.verify(repo)
3893 3893
3894 3894 def version_(ui):
3895 3895 """output version and copyright information"""
3896 3896 ui.write(_("Mercurial Distributed SCM (version %s)\n")
3897 3897 % util.version())
3898 3898 ui.status(_(
3899 3899 "(see http://mercurial.selenic.com for more information)\n"
3900 3900 "\nCopyright (C) 2005-2010 Matt Mackall and others\n"
3901 3901 "This is free software; see the source for copying conditions. "
3902 3902 "There is NO\nwarranty; "
3903 3903 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
3904 3904 ))
3905 3905
3906 3906 # Command options and aliases are listed here, alphabetically
3907 3907
3908 3908 globalopts = [
3909 3909 ('R', 'repository', '',
3910 3910 _('repository root directory or name of overlay bundle file'),
3911 3911 _('REPO')),
3912 3912 ('', 'cwd', '',
3913 3913 _('change working directory'), _('DIR')),
3914 3914 ('y', 'noninteractive', None,
3915 3915 _('do not prompt, assume \'yes\' for any required answers')),
3916 3916 ('q', 'quiet', None, _('suppress output')),
3917 3917 ('v', 'verbose', None, _('enable additional output')),
3918 3918 ('', 'config', [],
3919 3919 _('set/override config option (use \'section.name=value\')'),
3920 3920 _('CONFIG')),
3921 3921 ('', 'debug', None, _('enable debugging output')),
3922 3922 ('', 'debugger', None, _('start debugger')),
3923 3923 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
3924 3924 _('ENCODE')),
3925 3925 ('', 'encodingmode', encoding.encodingmode,
3926 3926 _('set the charset encoding mode'), _('MODE')),
3927 3927 ('', 'traceback', None, _('always print a traceback on exception')),
3928 3928 ('', 'time', None, _('time how long the command takes')),
3929 3929 ('', 'profile', None, _('print command execution profile')),
3930 3930 ('', 'version', None, _('output version information and exit')),
3931 3931 ('h', 'help', None, _('display help and exit')),
3932 3932 ]
3933 3933
3934 3934 dryrunopts = [('n', 'dry-run', None,
3935 3935 _('do not perform actions, just print output'))]
3936 3936
3937 3937 remoteopts = [
3938 3938 ('e', 'ssh', '',
3939 3939 _('specify ssh command to use'), _('CMD')),
3940 3940 ('', 'remotecmd', '',
3941 3941 _('specify hg command to run on the remote side'), _('CMD')),
3942 3942 ]
3943 3943
3944 3944 walkopts = [
3945 3945 ('I', 'include', [],
3946 3946 _('include names matching the given patterns'), _('PATTERN')),
3947 3947 ('X', 'exclude', [],
3948 3948 _('exclude names matching the given patterns'), _('PATTERN')),
3949 3949 ]
3950 3950
3951 3951 commitopts = [
3952 3952 ('m', 'message', '',
3953 3953 _('use text as commit message'), _('TEXT')),
3954 3954 ('l', 'logfile', '',
3955 3955 _('read commit message from file'), _('FILE')),
3956 3956 ]
3957 3957
3958 3958 commitopts2 = [
3959 3959 ('d', 'date', '',
3960 3960 _('record datecode as commit date'), _('DATE')),
3961 3961 ('u', 'user', '',
3962 3962 _('record the specified user as committer'), _('USER')),
3963 3963 ]
3964 3964
3965 3965 templateopts = [
3966 3966 ('', 'style', '',
3967 3967 _('display using template map file'), _('STYLE')),
3968 3968 ('', 'template', '',
3969 3969 _('display with template'), _('TEMPLATE')),
3970 3970 ]
3971 3971
3972 3972 logopts = [
3973 3973 ('p', 'patch', None, _('show patch')),
3974 3974 ('g', 'git', None, _('use git extended diff format')),
3975 3975 ('l', 'limit', '',
3976 3976 _('limit number of changes displayed'), _('NUM')),
3977 3977 ('M', 'no-merges', None, _('do not show merges')),
3978 3978 ('', 'stat', None, _('output diffstat-style summary of changes')),
3979 3979 ] + templateopts
3980 3980
3981 3981 diffopts = [
3982 3982 ('a', 'text', None, _('treat all files as text')),
3983 3983 ('g', 'git', None, _('use git extended diff format')),
3984 3984 ('', 'nodates', None, _('omit dates from diff headers'))
3985 3985 ]
3986 3986
3987 3987 diffopts2 = [
3988 3988 ('p', 'show-function', None, _('show which function each change is in')),
3989 3989 ('', 'reverse', None, _('produce a diff that undoes the changes')),
3990 3990 ('w', 'ignore-all-space', None,
3991 3991 _('ignore white space when comparing lines')),
3992 3992 ('b', 'ignore-space-change', None,
3993 3993 _('ignore changes in the amount of white space')),
3994 3994 ('B', 'ignore-blank-lines', None,
3995 3995 _('ignore changes whose lines are all blank')),
3996 3996 ('U', 'unified', '',
3997 3997 _('number of lines of context to show'), _('NUM')),
3998 3998 ('', 'stat', None, _('output diffstat-style summary of changes')),
3999 3999 ]
4000 4000
4001 4001 similarityopts = [
4002 4002 ('s', 'similarity', '',
4003 4003 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
4004 4004 ]
4005 4005
4006 4006 subrepoopts = [
4007 4007 ('S', 'subrepos', None,
4008 4008 _('recurse into subrepositories'))
4009 4009 ]
4010 4010
4011 4011 table = {
4012 4012 "^add": (add, walkopts + subrepoopts + dryrunopts,
4013 4013 _('[OPTION]... [FILE]...')),
4014 4014 "addremove":
4015 4015 (addremove, similarityopts + walkopts + dryrunopts,
4016 4016 _('[OPTION]... [FILE]...')),
4017 4017 "^annotate|blame":
4018 4018 (annotate,
4019 4019 [('r', 'rev', '',
4020 4020 _('annotate the specified revision'), _('REV')),
4021 4021 ('', 'follow', None,
4022 4022 _('follow copies/renames and list the filename (DEPRECATED)')),
4023 4023 ('', 'no-follow', None, _("don't follow copies and renames")),
4024 4024 ('a', 'text', None, _('treat all files as text')),
4025 4025 ('u', 'user', None, _('list the author (long with -v)')),
4026 4026 ('f', 'file', None, _('list the filename')),
4027 4027 ('d', 'date', None, _('list the date (short with -q)')),
4028 4028 ('n', 'number', None, _('list the revision number (default)')),
4029 4029 ('c', 'changeset', None, _('list the changeset')),
4030 4030 ('l', 'line-number', None,
4031 4031 _('show line number at the first appearance'))
4032 4032 ] + walkopts,
4033 4033 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...')),
4034 4034 "archive":
4035 4035 (archive,
4036 4036 [('', 'no-decode', None, _('do not pass files through decoders')),
4037 4037 ('p', 'prefix', '',
4038 4038 _('directory prefix for files in archive'), _('PREFIX')),
4039 4039 ('r', 'rev', '',
4040 4040 _('revision to distribute'), _('REV')),
4041 4041 ('t', 'type', '',
4042 4042 _('type of distribution to create'), _('TYPE')),
4043 4043 ] + subrepoopts + walkopts,
4044 4044 _('[OPTION]... DEST')),
4045 4045 "backout":
4046 4046 (backout,
4047 4047 [('', 'merge', None,
4048 4048 _('merge with old dirstate parent after backout')),
4049 4049 ('', 'parent', '',
4050 4050 _('parent to choose when backing out merge'), _('REV')),
4051 4051 ('t', 'tool', '',
4052 4052 _('specify merge tool')),
4053 4053 ('r', 'rev', '',
4054 4054 _('revision to backout'), _('REV')),
4055 4055 ] + walkopts + commitopts + commitopts2,
4056 4056 _('[OPTION]... [-r] REV')),
4057 4057 "bisect":
4058 4058 (bisect,
4059 4059 [('r', 'reset', False, _('reset bisect state')),
4060 4060 ('g', 'good', False, _('mark changeset good')),
4061 4061 ('b', 'bad', False, _('mark changeset bad')),
4062 4062 ('s', 'skip', False, _('skip testing changeset')),
4063 4063 ('c', 'command', '',
4064 4064 _('use command to check changeset state'), _('CMD')),
4065 4065 ('U', 'noupdate', False, _('do not update to target'))],
4066 4066 _("[-gbsr] [-U] [-c CMD] [REV]")),
4067 4067 "branch":
4068 4068 (branch,
4069 4069 [('f', 'force', None,
4070 4070 _('set branch name even if it shadows an existing branch')),
4071 4071 ('C', 'clean', None, _('reset branch name to parent branch name'))],
4072 4072 _('[-fC] [NAME]')),
4073 4073 "branches":
4074 4074 (branches,
4075 4075 [('a', 'active', False,
4076 4076 _('show only branches that have unmerged heads')),
4077 4077 ('c', 'closed', False,
4078 4078 _('show normal and closed branches'))],
4079 4079 _('[-ac]')),
4080 4080 "bundle":
4081 4081 (bundle,
4082 4082 [('f', 'force', None,
4083 4083 _('run even when the destination is unrelated')),
4084 4084 ('r', 'rev', [],
4085 4085 _('a changeset intended to be added to the destination'),
4086 4086 _('REV')),
4087 4087 ('b', 'branch', [],
4088 4088 _('a specific branch you would like to bundle'),
4089 4089 _('BRANCH')),
4090 4090 ('', 'base', [],
4091 4091 _('a base changeset assumed to be available at the destination'),
4092 4092 _('REV')),
4093 4093 ('a', 'all', None, _('bundle all changesets in the repository')),
4094 4094 ('t', 'type', 'bzip2',
4095 4095 _('bundle compression type to use'), _('TYPE')),
4096 4096 ] + remoteopts,
4097 4097 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]')),
4098 4098 "cat":
4099 4099 (cat,
4100 4100 [('o', 'output', '',
4101 4101 _('print output to file with formatted name'), _('FORMAT')),
4102 4102 ('r', 'rev', '',
4103 4103 _('print the given revision'), _('REV')),
4104 4104 ('', 'decode', None, _('apply any matching decode filter')),
4105 4105 ] + walkopts,
4106 4106 _('[OPTION]... FILE...')),
4107 4107 "^clone":
4108 4108 (clone,
4109 4109 [('U', 'noupdate', None,
4110 4110 _('the clone will include an empty working copy (only a repository)')),
4111 4111 ('u', 'updaterev', '',
4112 4112 _('revision, tag or branch to check out'), _('REV')),
4113 4113 ('r', 'rev', [],
4114 4114 _('include the specified changeset'), _('REV')),
4115 4115 ('b', 'branch', [],
4116 4116 _('clone only the specified branch'), _('BRANCH')),
4117 4117 ('', 'pull', None, _('use pull protocol to copy metadata')),
4118 4118 ('', 'uncompressed', None,
4119 4119 _('use uncompressed transfer (fast over LAN)')),
4120 4120 ] + remoteopts,
4121 4121 _('[OPTION]... SOURCE [DEST]')),
4122 4122 "^commit|ci":
4123 4123 (commit,
4124 4124 [('A', 'addremove', None,
4125 4125 _('mark new/missing files as added/removed before committing')),
4126 4126 ('', 'close-branch', None,
4127 4127 _('mark a branch as closed, hiding it from the branch list')),
4128 4128 ] + walkopts + commitopts + commitopts2,
4129 4129 _('[OPTION]... [FILE]...')),
4130 4130 "copy|cp":
4131 4131 (copy,
4132 4132 [('A', 'after', None, _('record a copy that has already occurred')),
4133 4133 ('f', 'force', None,
4134 4134 _('forcibly copy over an existing managed file')),
4135 4135 ] + walkopts + dryrunopts,
4136 4136 _('[OPTION]... [SOURCE]... DEST')),
4137 4137 "debugancestor": (debugancestor, [], _('[INDEX] REV1 REV2')),
4138 4138 "debugbuilddag":
4139 4139 (debugbuilddag,
4140 4140 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
4141 4141 ('a', 'appended-file', None, _('add single file all revs append to')),
4142 4142 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
4143 4143 ('n', 'new-file', None, _('add new file at each rev')),
4144 4144 ],
4145 4145 _('[OPTION]... TEXT')),
4146 4146 "debugcheckstate": (debugcheckstate, [], ''),
4147 4147 "debugcommands": (debugcommands, [], _('[COMMAND]')),
4148 4148 "debugcomplete":
4149 4149 (debugcomplete,
4150 4150 [('o', 'options', None, _('show the command options'))],
4151 4151 _('[-o] CMD')),
4152 4152 "debugdag":
4153 4153 (debugdag,
4154 4154 [('t', 'tags', None, _('use tags as labels')),
4155 4155 ('b', 'branches', None, _('annotate with branch names')),
4156 4156 ('', 'dots', None, _('use dots for runs')),
4157 4157 ('s', 'spaces', None, _('separate elements by spaces')),
4158 4158 ],
4159 4159 _('[OPTION]... [FILE [REV]...]')),
4160 4160 "debugdate":
4161 4161 (debugdate,
4162 4162 [('e', 'extended', None, _('try extended date formats'))],
4163 4163 _('[-e] DATE [RANGE]')),
4164 4164 "debugdata": (debugdata, [], _('FILE REV')),
4165 4165 "debugfsinfo": (debugfsinfo, [], _('[PATH]')),
4166 4166 "debugindex": (debugindex,
4167 4167 [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
4168 4168 _('FILE')),
4169 4169 "debugindexdot": (debugindexdot, [], _('FILE')),
4170 4170 "debuginstall": (debuginstall, [], ''),
4171 4171 "debugpushkey": (debugpushkey, [], _('REPO NAMESPACE [KEY OLD NEW]')),
4172 4172 "debugrebuildstate":
4173 4173 (debugrebuildstate,
4174 4174 [('r', 'rev', '',
4175 4175 _('revision to rebuild to'), _('REV'))],
4176 4176 _('[-r REV] [REV]')),
4177 4177 "debugrename":
4178 4178 (debugrename,
4179 4179 [('r', 'rev', '',
4180 4180 _('revision to debug'), _('REV'))],
4181 4181 _('[-r REV] FILE')),
4182 4182 "debugrevspec":
4183 4183 (debugrevspec, [], ('REVSPEC')),
4184 4184 "debugsetparents":
4185 4185 (debugsetparents, [], _('REV1 [REV2]')),
4186 4186 "debugstate":
4187 4187 (debugstate,
4188 4188 [('', 'nodates', None, _('do not display the saved mtime'))],
4189 4189 _('[OPTION]...')),
4190 4190 "debugsub":
4191 4191 (debugsub,
4192 4192 [('r', 'rev', '',
4193 4193 _('revision to check'), _('REV'))],
4194 4194 _('[-r REV] [REV]')),
4195 4195 "debugwalk": (debugwalk, walkopts, _('[OPTION]... [FILE]...')),
4196 4196 "^diff":
4197 4197 (diff,
4198 4198 [('r', 'rev', [],
4199 4199 _('revision'), _('REV')),
4200 4200 ('c', 'change', '',
4201 4201 _('change made by revision'), _('REV'))
4202 4202 ] + diffopts + diffopts2 + walkopts + subrepoopts,
4203 4203 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...')),
4204 4204 "^export":
4205 4205 (export,
4206 4206 [('o', 'output', '',
4207 4207 _('print output to file with formatted name'), _('FORMAT')),
4208 4208 ('', 'switch-parent', None, _('diff against the second parent')),
4209 4209 ('r', 'rev', [],
4210 4210 _('revisions to export'), _('REV')),
4211 4211 ] + diffopts,
4212 4212 _('[OPTION]... [-o OUTFILESPEC] REV...')),
4213 4213 "^forget":
4214 4214 (forget,
4215 4215 [] + walkopts,
4216 4216 _('[OPTION]... FILE...')),
4217 4217 "grep":
4218 4218 (grep,
4219 4219 [('0', 'print0', None, _('end fields with NUL')),
4220 4220 ('', 'all', None, _('print all revisions that match')),
4221 4221 ('f', 'follow', None,
4222 4222 _('follow changeset history,'
4223 4223 ' or file history across copies and renames')),
4224 4224 ('i', 'ignore-case', None, _('ignore case when matching')),
4225 4225 ('l', 'files-with-matches', None,
4226 4226 _('print only filenames and revisions that match')),
4227 4227 ('n', 'line-number', None, _('print matching line numbers')),
4228 4228 ('r', 'rev', [],
4229 4229 _('only search files changed within revision range'), _('REV')),
4230 4230 ('u', 'user', None, _('list the author (long with -v)')),
4231 4231 ('d', 'date', None, _('list the date (short with -q)')),
4232 4232 ] + walkopts,
4233 4233 _('[OPTION]... PATTERN [FILE]...')),
4234 4234 "heads":
4235 4235 (heads,
4236 4236 [('r', 'rev', '',
4237 4237 _('show only heads which are descendants of STARTREV'),
4238 4238 _('STARTREV')),
4239 4239 ('t', 'topo', False, _('show topological heads only')),
4240 4240 ('a', 'active', False,
4241 4241 _('show active branchheads only (DEPRECATED)')),
4242 4242 ('c', 'closed', False,
4243 4243 _('show normal and closed branch heads')),
4244 4244 ] + templateopts,
4245 4245 _('[-ac] [-r STARTREV] [REV]...')),
4246 4246 "help": (help_, [], _('[TOPIC]')),
4247 4247 "identify|id":
4248 4248 (identify,
4249 4249 [('r', 'rev', '',
4250 4250 _('identify the specified revision'), _('REV')),
4251 4251 ('n', 'num', None, _('show local revision number')),
4252 4252 ('i', 'id', None, _('show global revision id')),
4253 4253 ('b', 'branch', None, _('show branch')),
4254 4254 ('t', 'tags', None, _('show tags'))],
4255 4255 _('[-nibt] [-r REV] [SOURCE]')),
4256 4256 "import|patch":
4257 4257 (import_,
4258 4258 [('p', 'strip', 1,
4259 4259 _('directory strip option for patch. This has the same '
4260 4260 'meaning as the corresponding patch option'),
4261 4261 _('NUM')),
4262 4262 ('b', 'base', '',
4263 4263 _('base path'), _('PATH')),
4264 4264 ('f', 'force', None,
4265 4265 _('skip check for outstanding uncommitted changes')),
4266 4266 ('', 'no-commit', None,
4267 4267 _("don't commit, just update the working directory")),
4268 4268 ('', 'exact', None,
4269 4269 _('apply patch to the nodes from which it was generated')),
4270 4270 ('', 'import-branch', None,
4271 4271 _('use any branch information in patch (implied by --exact)'))] +
4272 4272 commitopts + commitopts2 + similarityopts,
4273 4273 _('[OPTION]... PATCH...')),
4274 4274 "incoming|in":
4275 4275 (incoming,
4276 4276 [('f', 'force', None,
4277 4277 _('run even if remote repository is unrelated')),
4278 4278 ('n', 'newest-first', None, _('show newest record first')),
4279 4279 ('', 'bundle', '',
4280 4280 _('file to store the bundles into'), _('FILE')),
4281 4281 ('r', 'rev', [],
4282 4282 _('a remote changeset intended to be added'), _('REV')),
4283 4283 ('b', 'branch', [],
4284 4284 _('a specific branch you would like to pull'), _('BRANCH')),
4285 4285 ] + logopts + remoteopts + subrepoopts,
4286 4286 _('[-p] [-n] [-M] [-f] [-r REV]...'
4287 4287 ' [--bundle FILENAME] [SOURCE]')),
4288 4288 "^init":
4289 4289 (init,
4290 4290 remoteopts,
4291 4291 _('[-e CMD] [--remotecmd CMD] [DEST]')),
4292 4292 "locate":
4293 4293 (locate,
4294 4294 [('r', 'rev', '',
4295 4295 _('search the repository as it is in REV'), _('REV')),
4296 4296 ('0', 'print0', None,
4297 4297 _('end filenames with NUL, for use with xargs')),
4298 4298 ('f', 'fullpath', None,
4299 4299 _('print complete paths from the filesystem root')),
4300 4300 ] + walkopts,
4301 4301 _('[OPTION]... [PATTERN]...')),
4302 4302 "^log|history":
4303 4303 (log,
4304 4304 [('f', 'follow', None,
4305 4305 _('follow changeset history,'
4306 4306 ' or file history across copies and renames')),
4307 4307 ('', 'follow-first', None,
4308 4308 _('only follow the first parent of merge changesets')),
4309 4309 ('d', 'date', '',
4310 4310 _('show revisions matching date spec'), _('DATE')),
4311 4311 ('C', 'copies', None, _('show copied files')),
4312 4312 ('k', 'keyword', [],
4313 4313 _('do case-insensitive search for a given text'), _('TEXT')),
4314 4314 ('r', 'rev', [],
4315 4315 _('show the specified revision or range'), _('REV')),
4316 4316 ('', 'removed', None, _('include revisions where files were removed')),
4317 4317 ('m', 'only-merges', None, _('show only merges')),
4318 4318 ('u', 'user', [],
4319 4319 _('revisions committed by user'), _('USER')),
4320 4320 ('', 'only-branch', [],
4321 4321 _('show only changesets within the given named branch (DEPRECATED)'),
4322 4322 _('BRANCH')),
4323 4323 ('b', 'branch', [],
4324 4324 _('show changesets within the given named branch'), _('BRANCH')),
4325 4325 ('P', 'prune', [],
4326 4326 _('do not display revision or any of its ancestors'), _('REV')),
4327 4327 ] + logopts + walkopts,
4328 4328 _('[OPTION]... [FILE]')),
4329 4329 "manifest":
4330 4330 (manifest,
4331 4331 [('r', 'rev', '',
4332 4332 _('revision to display'), _('REV'))],
4333 4333 _('[-r REV]')),
4334 4334 "^merge":
4335 4335 (merge,
4336 4336 [('f', 'force', None, _('force a merge with outstanding changes')),
4337 4337 ('t', 'tool', '', _('specify merge tool')),
4338 4338 ('r', 'rev', '',
4339 4339 _('revision to merge'), _('REV')),
4340 4340 ('P', 'preview', None,
4341 4341 _('review revisions to merge (no merge is performed)'))],
4342 4342 _('[-P] [-f] [[-r] REV]')),
4343 4343 "outgoing|out":
4344 4344 (outgoing,
4345 4345 [('f', 'force', None,
4346 4346 _('run even when the destination is unrelated')),
4347 4347 ('r', 'rev', [],
4348 4348 _('a changeset intended to be included in the destination'),
4349 4349 _('REV')),
4350 4350 ('n', 'newest-first', None, _('show newest record first')),
4351 4351 ('b', 'branch', [],
4352 4352 _('a specific branch you would like to push'), _('BRANCH')),
4353 4353 ] + logopts + remoteopts + subrepoopts,
4354 4354 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')),
4355 4355 "parents":
4356 4356 (parents,
4357 4357 [('r', 'rev', '',
4358 4358 _('show parents of the specified revision'), _('REV')),
4359 4359 ] + templateopts,
4360 4360 _('[-r REV] [FILE]')),
4361 4361 "paths": (paths, [], _('[NAME]')),
4362 4362 "^pull":
4363 4363 (pull,
4364 4364 [('u', 'update', None,
4365 4365 _('update to new branch head if changesets were pulled')),
4366 4366 ('f', 'force', None,
4367 4367 _('run even when remote repository is unrelated')),
4368 4368 ('r', 'rev', [],
4369 4369 _('a remote changeset intended to be added'), _('REV')),
4370 4370 ('b', 'branch', [],
4371 4371 _('a specific branch you would like to pull'), _('BRANCH')),
4372 4372 ] + remoteopts,
4373 4373 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')),
4374 4374 "^push":
4375 4375 (push,
4376 4376 [('f', 'force', None, _('force push')),
4377 4377 ('r', 'rev', [],
4378 4378 _('a changeset intended to be included in the destination'),
4379 4379 _('REV')),
4380 4380 ('b', 'branch', [],
4381 4381 _('a specific branch you would like to push'), _('BRANCH')),
4382 4382 ('', 'new-branch', False, _('allow pushing a new branch')),
4383 4383 ] + remoteopts,
4384 4384 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')),
4385 4385 "recover": (recover, []),
4386 4386 "^remove|rm":
4387 4387 (remove,
4388 4388 [('A', 'after', None, _('record delete for missing files')),
4389 4389 ('f', 'force', None,
4390 4390 _('remove (and delete) file even if added or modified')),
4391 4391 ] + walkopts,
4392 4392 _('[OPTION]... FILE...')),
4393 4393 "rename|move|mv":
4394 4394 (rename,
4395 4395 [('A', 'after', None, _('record a rename that has already occurred')),
4396 4396 ('f', 'force', None,
4397 4397 _('forcibly copy over an existing managed file')),
4398 4398 ] + walkopts + dryrunopts,
4399 4399 _('[OPTION]... SOURCE... DEST')),
4400 4400 "resolve":
4401 4401 (resolve,
4402 4402 [('a', 'all', None, _('select all unresolved files')),
4403 4403 ('l', 'list', None, _('list state of files needing merge')),
4404 4404 ('m', 'mark', None, _('mark files as resolved')),
4405 4405 ('u', 'unmark', None, _('mark files as unresolved')),
4406 4406 ('t', 'tool', '', _('specify merge tool')),
4407 4407 ('n', 'no-status', None, _('hide status prefix'))]
4408 4408 + walkopts,
4409 4409 _('[OPTION]... [FILE]...')),
4410 4410 "revert":
4411 4411 (revert,
4412 4412 [('a', 'all', None, _('revert all changes when no arguments given')),
4413 4413 ('d', 'date', '',
4414 4414 _('tipmost revision matching date'), _('DATE')),
4415 4415 ('r', 'rev', '',
4416 4416 _('revert to the specified revision'), _('REV')),
4417 4417 ('', 'no-backup', None, _('do not save backup copies of files')),
4418 4418 ] + walkopts + dryrunopts,
4419 4419 _('[OPTION]... [-r REV] [NAME]...')),
4420 4420 "rollback": (rollback, dryrunopts),
4421 4421 "root": (root, []),
4422 4422 "^serve":
4423 4423 (serve,
4424 4424 [('A', 'accesslog', '',
4425 4425 _('name of access log file to write to'), _('FILE')),
4426 4426 ('d', 'daemon', None, _('run server in background')),
4427 4427 ('', 'daemon-pipefds', '',
4428 4428 _('used internally by daemon mode'), _('NUM')),
4429 4429 ('E', 'errorlog', '',
4430 4430 _('name of error log file to write to'), _('FILE')),
4431 4431 # use string type, then we can check if something was passed
4432 4432 ('p', 'port', '',
4433 4433 _('port to listen on (default: 8000)'), _('PORT')),
4434 4434 ('a', 'address', '',
4435 4435 _('address to listen on (default: all interfaces)'), _('ADDR')),
4436 4436 ('', 'prefix', '',
4437 4437 _('prefix path to serve from (default: server root)'), _('PREFIX')),
4438 4438 ('n', 'name', '',
4439 4439 _('name to show in web pages (default: working directory)'),
4440 4440 _('NAME')),
4441 4441 ('', 'web-conf', '',
4442 4442 _('name of the hgweb config file (see "hg help hgweb")'),
4443 4443 _('FILE')),
4444 4444 ('', 'webdir-conf', '',
4445 4445 _('name of the hgweb config file (DEPRECATED)'), _('FILE')),
4446 4446 ('', 'pid-file', '',
4447 4447 _('name of file to write process ID to'), _('FILE')),
4448 4448 ('', 'stdio', None, _('for remote clients')),
4449 4449 ('t', 'templates', '',
4450 4450 _('web templates to use'), _('TEMPLATE')),
4451 4451 ('', 'style', '',
4452 4452 _('template style to use'), _('STYLE')),
4453 4453 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
4454 4454 ('', 'certificate', '',
4455 4455 _('SSL certificate file'), _('FILE'))],
4456 4456 _('[OPTION]...')),
4457 4457 "showconfig|debugconfig":
4458 4458 (showconfig,
4459 4459 [('u', 'untrusted', None, _('show untrusted configuration options'))],
4460 4460 _('[-u] [NAME]...')),
4461 4461 "^summary|sum":
4462 4462 (summary,
4463 4463 [('', 'remote', None, _('check for push and pull'))], '[--remote]'),
4464 4464 "^status|st":
4465 4465 (status,
4466 4466 [('A', 'all', None, _('show status of all files')),
4467 4467 ('m', 'modified', None, _('show only modified files')),
4468 4468 ('a', 'added', None, _('show only added files')),
4469 4469 ('r', 'removed', None, _('show only removed files')),
4470 4470 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
4471 4471 ('c', 'clean', None, _('show only files without changes')),
4472 4472 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4473 4473 ('i', 'ignored', None, _('show only ignored files')),
4474 4474 ('n', 'no-status', None, _('hide status prefix')),
4475 4475 ('C', 'copies', None, _('show source of copied files')),
4476 4476 ('0', 'print0', None,
4477 4477 _('end filenames with NUL, for use with xargs')),
4478 4478 ('', 'rev', [],
4479 4479 _('show difference from revision'), _('REV')),
4480 4480 ('', 'change', '',
4481 4481 _('list the changed files of a revision'), _('REV')),
4482 4482 ] + walkopts + subrepoopts,
4483 4483 _('[OPTION]... [FILE]...')),
4484 4484 "tag":
4485 4485 (tag,
4486 4486 [('f', 'force', None, _('replace existing tag')),
4487 4487 ('l', 'local', None, _('make the tag local')),
4488 4488 ('r', 'rev', '',
4489 4489 _('revision to tag'), _('REV')),
4490 4490 ('', 'remove', None, _('remove a tag')),
4491 4491 # -l/--local is already there, commitopts cannot be used
4492 4492 ('e', 'edit', None, _('edit commit message')),
4493 4493 ('m', 'message', '',
4494 4494 _('use <text> as commit message'), _('TEXT')),
4495 4495 ] + commitopts2,
4496 4496 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')),
4497 4497 "tags": (tags, [], ''),
4498 4498 "tip":
4499 4499 (tip,
4500 4500 [('p', 'patch', None, _('show patch')),
4501 4501 ('g', 'git', None, _('use git extended diff format')),
4502 4502 ] + templateopts,
4503 4503 _('[-p] [-g]')),
4504 4504 "unbundle":
4505 4505 (unbundle,
4506 4506 [('u', 'update', None,
4507 4507 _('update to new branch head if changesets were unbundled'))],
4508 4508 _('[-u] FILE...')),
4509 4509 "^update|up|checkout|co":
4510 4510 (update,
4511 4511 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
4512 4512 ('c', 'check', None,
4513 4513 _('update across branches if no uncommitted changes')),
4514 4514 ('d', 'date', '',
4515 4515 _('tipmost revision matching date'), _('DATE')),
4516 4516 ('r', 'rev', '',
4517 4517 _('revision'), _('REV'))],
4518 4518 _('[-c] [-C] [-d DATE] [[-r] REV]')),
4519 4519 "verify": (verify, []),
4520 4520 "version": (version_, []),
4521 4521 }
4522 4522
4523 4523 norepo = ("clone init version help debugcommands debugcomplete"
4524 4524 " debugdate debuginstall debugfsinfo debugpushkey")
4525 4525 optionalrepo = ("identify paths serve showconfig debugancestor debugdag"
4526 4526 " debugdata debugindex debugindexdot")
@@ -1,146 +1,146
1 1 # demandimport.py - global demand-loading of modules for Mercurial
2 2 #
3 3 # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>
4 4 #
5 5 # This software may be used and distributed according to the terms of the
6 6 # GNU General Public License version 2 or any later version.
7 7
8 8 '''
9 9 demandimport - automatic demandloading of modules
10 10
11 11 To enable this module, do:
12 12
13 13 import demandimport; demandimport.enable()
14 14
15 15 Imports of the following forms will be demand-loaded:
16 16
17 17 import a, b.c
18 18 import a.b as c
19 19 from a import b,c # a will be loaded immediately
20 20
21 21 These imports will not be delayed:
22 22
23 23 from a import *
24 24 b = __import__(a)
25 25 '''
26 26
27 27 import __builtin__
28 28 _origimport = __import__
29 29
30 30 class _demandmod(object):
31 31 """module demand-loader and proxy"""
32 32 def __init__(self, name, globals, locals):
33 33 if '.' in name:
34 34 head, rest = name.split('.', 1)
35 35 after = [rest]
36 36 else:
37 37 head = name
38 38 after = []
39 39 object.__setattr__(self, "_data", (head, globals, locals, after))
40 40 object.__setattr__(self, "_module", None)
41 41 def _extend(self, name):
42 42 """add to the list of submodules to load"""
43 43 self._data[3].append(name)
44 44 def _load(self):
45 45 if not self._module:
46 46 head, globals, locals, after = self._data
47 47 mod = _origimport(head, globals, locals)
48 48 # load submodules
49 49 def subload(mod, p):
50 50 h, t = p, None
51 51 if '.' in p:
52 52 h, t = p.split('.', 1)
53 53 if not hasattr(mod, h):
54 54 setattr(mod, h, _demandmod(p, mod.__dict__, mod.__dict__))
55 55 elif t:
56 56 subload(getattr(mod, h), t)
57 57
58 58 for x in after:
59 59 subload(mod, x)
60 60
61 61 # are we in the locals dictionary still?
62 62 if locals and locals.get(head) == self:
63 63 locals[head] = mod
64 64 object.__setattr__(self, "_module", mod)
65 65
66 66 def __repr__(self):
67 67 if self._module:
68 68 return "<proxied module '%s'>" % self._data[0]
69 69 return "<unloaded module '%s'>" % self._data[0]
70 70 def __call__(self, *args, **kwargs):
71 71 raise TypeError("%s object is not callable" % repr(self))
72 72 def __getattribute__(self, attr):
73 73 if attr in ('_data', '_extend', '_load', '_module'):
74 74 return object.__getattribute__(self, attr)
75 75 self._load()
76 76 return getattr(self._module, attr)
77 77 def __setattr__(self, attr, val):
78 78 self._load()
79 79 setattr(self._module, attr, val)
80 80
81 81 def _demandimport(name, globals=None, locals=None, fromlist=None, level=None):
82 82 if not locals or name in ignore or fromlist == ('*',):
83 83 # these cases we can't really delay
84 84 if level is None:
85 85 return _origimport(name, globals, locals, fromlist)
86 86 else:
87 87 return _origimport(name, globals, locals, fromlist, level)
88 88 elif not fromlist:
89 89 # import a [as b]
90 90 if '.' in name: # a.b
91 91 base, rest = name.split('.', 1)
92 92 # email.__init__ loading email.mime
93 93 if globals and globals.get('__name__', None) == base:
94 94 return _origimport(name, globals, locals, fromlist)
95 95 # if a is already demand-loaded, add b to its submodule list
96 96 if base in locals:
97 97 if isinstance(locals[base], _demandmod):
98 98 locals[base]._extend(rest)
99 99 return locals[base]
100 100 return _demandmod(name, globals, locals)
101 101 else:
102 102 if level is not None:
103 103 # from . import b,c,d or from .a import b,c,d
104 104 return _origimport(name, globals, locals, fromlist, level)
105 105 # from a import b,c,d
106 106 mod = _origimport(name, globals, locals)
107 107 # recurse down the module chain
108 108 for comp in name.split('.')[1:]:
109 109 if not hasattr(mod, comp):
110 110 setattr(mod, comp, _demandmod(comp, mod.__dict__, mod.__dict__))
111 111 mod = getattr(mod, comp)
112 112 for x in fromlist:
113 113 # set requested submodules for demand load
114 if not(hasattr(mod, x)):
114 if not hasattr(mod, x):
115 115 setattr(mod, x, _demandmod(x, mod.__dict__, locals))
116 116 return mod
117 117
118 118 ignore = [
119 119 '_hashlib',
120 120 '_xmlplus',
121 121 'fcntl',
122 122 'win32com.gen_py',
123 123 '_winreg', # 2.7 mimetypes needs immediate ImportError
124 124 'pythoncom',
125 125 # imported by tarfile, not available under Windows
126 126 'pwd',
127 127 'grp',
128 128 # imported by profile, itself imported by hotshot.stats,
129 129 # not available under Windows
130 130 'resource',
131 131 # this trips up many extension authors
132 132 'gtk',
133 133 # setuptools' pkg_resources.py expects "from __main__ import x" to
134 134 # raise ImportError if x not defined
135 135 '__main__',
136 136 '_ssl', # conditional imports in the stdlib, issue1964
137 137 ]
138 138
139 139 def enable():
140 140 "enable global demand-loading of modules"
141 141 __builtin__.__import__ = _demandimport
142 142
143 143 def disable():
144 144 "disable global demand-loading of modules"
145 145 __builtin__.__import__ = _origimport
146 146
General Comments 0
You need to be logged in to leave comments. Login now