Show More
The requested changes are too big and content was truncated. Show full diff
@@ -1,439 +1,447 b'' | |||
|
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 keyword |
|
12 | 12 | import optparse |
|
13 | 13 | |
|
14 | 14 | def repquote(m): |
|
15 | 15 | t = re.sub(r"\w", "x", m.group('text')) |
|
16 | 16 | t = re.sub(r"[^\s\nx]", "o", t) |
|
17 | 17 | return m.group('quote') + t + m.group('quote') |
|
18 | 18 | |
|
19 | 19 | def reppython(m): |
|
20 | 20 | comment = m.group('comment') |
|
21 | 21 | if comment: |
|
22 | 22 | return "#" * len(comment) |
|
23 | 23 | return repquote(m) |
|
24 | 24 | |
|
25 | 25 | def repcomment(m): |
|
26 | 26 | return m.group(1) + "#" * len(m.group(2)) |
|
27 | 27 | |
|
28 | 28 | def repccomment(m): |
|
29 | 29 | t = re.sub(r"((?<=\n) )|\S", "x", m.group(2)) |
|
30 | 30 | return m.group(1) + t + "*/" |
|
31 | 31 | |
|
32 | 32 | def repcallspaces(m): |
|
33 | 33 | t = re.sub(r"\n\s+", "\n", m.group(2)) |
|
34 | 34 | return m.group(1) + t |
|
35 | 35 | |
|
36 | 36 | def repinclude(m): |
|
37 | 37 | return m.group(1) + "<foo>" |
|
38 | 38 | |
|
39 | 39 | def rephere(m): |
|
40 | 40 | t = re.sub(r"\S", "x", m.group(2)) |
|
41 | 41 | return m.group(1) + t |
|
42 | 42 | |
|
43 | 43 | |
|
44 | 44 | testpats = [ |
|
45 | 45 | [ |
|
46 | 46 | (r'pushd|popd', "don't use 'pushd' or 'popd', use 'cd'"), |
|
47 | 47 | (r'\W\$?\(\([^\)\n]*\)\)', "don't use (()) or $(()), use 'expr'"), |
|
48 | 48 | (r'grep.*-q', "don't use 'grep -q', redirect to /dev/null"), |
|
49 | 49 | (r'sed.*-i', "don't use 'sed -i', use a temporary file"), |
|
50 | 50 | (r'echo.*\\n', "don't use 'echo \\n', use printf"), |
|
51 | 51 | (r'echo -n', "don't use 'echo -n', use printf"), |
|
52 | 52 | (r'(^| )wc[^|]*$\n(?!.*\(re\))', "filter wc output"), |
|
53 | 53 | (r'head -c', "don't use 'head -c', use 'dd'"), |
|
54 | 54 | (r'sha1sum', "don't use sha1sum, use $TESTDIR/md5sum.py"), |
|
55 | 55 | (r'ls.*-\w*R', "don't use 'ls -R', use 'find'"), |
|
56 | 56 | (r'printf.*\\([1-9]|0\d)', "don't use 'printf \NNN', use Python"), |
|
57 | 57 | (r'printf.*\\x', "don't use printf \\x, use Python"), |
|
58 | 58 | (r'\$\(.*\)', "don't use $(expr), use `expr`"), |
|
59 | 59 | (r'rm -rf \*', "don't use naked rm -rf, target a directory"), |
|
60 | 60 | (r'(^|\|\s*)grep (-\w\s+)*[^|]*[(|]\w', |
|
61 | 61 | "use egrep for extended grep syntax"), |
|
62 | 62 | (r'/bin/', "don't use explicit paths for tools"), |
|
63 | 63 | (r'[^\n]\Z', "no trailing newline"), |
|
64 | 64 | (r'export.*=', "don't export and assign at once"), |
|
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 | (r'ls +[^|\n-]+ +-', "options to 'ls' must come before filenames"), |
|
68 | 68 | (r'[^>\n]>\s*\$HGRCPATH', "don't overwrite $HGRCPATH, append to it"), |
|
69 | 69 | (r'^stop\(\)', "don't use 'stop' as a shell function name"), |
|
70 | 70 | (r'(\[|\btest\b).*-e ', "don't use 'test -e', use 'test -f'"), |
|
71 | 71 | (r'^alias\b.*=', "don't use alias, use a function"), |
|
72 | 72 | (r'if\s*!', "don't use '!' to negate exit status"), |
|
73 | 73 | (r'/dev/u?random', "don't use entropy, use /dev/zero"), |
|
74 | 74 | (r'do\s*true;\s*done', "don't use true as loop body, use sleep 0"), |
|
75 | 75 | (r'^( *)\t', "don't use tabs to indent"), |
|
76 | 76 | ], |
|
77 | 77 | # warnings |
|
78 | 78 | [ |
|
79 | 79 | (r'^function', "don't use 'function', use old style"), |
|
80 | 80 | (r'^diff.*-\w*N', "don't use 'diff -N'"), |
|
81 | 81 | (r'\$PWD', "don't use $PWD, use `pwd`"), |
|
82 | 82 | (r'^([^"\'\n]|("[^"\n]*")|(\'[^\'\n]*\'))*\^', "^ must be quoted"), |
|
83 | 83 | ] |
|
84 | 84 | ] |
|
85 | 85 | |
|
86 | 86 | testfilters = [ |
|
87 | 87 | (r"( *)(#([^\n]*\S)?)", repcomment), |
|
88 | 88 | (r"<<(\S+)((.|\n)*?\n\1)", rephere), |
|
89 | 89 | ] |
|
90 | 90 | |
|
91 | 91 | uprefix = r"^ \$ " |
|
92 | 92 | utestpats = [ |
|
93 | 93 | [ |
|
94 | 94 | (r'^(\S| $ ).*(\S[ \t]+|^[ \t]+)\n', "trailing whitespace on non-output"), |
|
95 | 95 | (uprefix + r'.*\|\s*sed[^|>\n]*\n', |
|
96 | 96 | "use regex test output patterns instead of sed"), |
|
97 | 97 | (uprefix + r'(true|exit 0)', "explicit zero exit unnecessary"), |
|
98 | 98 | (uprefix + r'.*(?<!\[)\$\?', "explicit exit code checks unnecessary"), |
|
99 | 99 | (uprefix + r'.*\|\| echo.*(fail|error)', |
|
100 | 100 | "explicit exit code checks unnecessary"), |
|
101 | 101 | (uprefix + r'set -e', "don't use set -e"), |
|
102 | 102 | (uprefix + r'\s', "don't indent commands, use > for continued lines"), |
|
103 | 103 | ], |
|
104 | 104 | # warnings |
|
105 | 105 | [] |
|
106 | 106 | ] |
|
107 | 107 | |
|
108 | 108 | for i in [0, 1]: |
|
109 | 109 | for p, m in testpats[i]: |
|
110 | 110 | if p.startswith(r'^'): |
|
111 | 111 | p = r"^ [$>] (%s)" % p[1:] |
|
112 | 112 | else: |
|
113 | 113 | p = r"^ [$>] .*(%s)" % p |
|
114 | 114 | utestpats[i].append((p, m)) |
|
115 | 115 | |
|
116 | 116 | utestfilters = [ |
|
117 | 117 | (r"( *)(#([^\n]*\S)?)", repcomment), |
|
118 | 118 | ] |
|
119 | 119 | |
|
120 | 120 | pypats = [ |
|
121 | 121 | [ |
|
122 | 122 | (r'^\s*def\s*\w+\s*\(.*,\s*\(', |
|
123 | 123 | "tuple parameter unpacking not available in Python 3+"), |
|
124 | 124 | (r'lambda\s*\(.*,.*\)', |
|
125 | 125 | "tuple parameter unpacking not available in Python 3+"), |
|
126 | 126 | (r'(?<!def)\s+(cmp)\(', "cmp is not available in Python 3+"), |
|
127 | 127 | (r'\breduce\s*\(.*', "reduce is not available in Python 3+"), |
|
128 | 128 | (r'\.has_key\b', "dict.has_key is not available in Python 3+"), |
|
129 | 129 | (r'^\s*\t', "don't use tabs"), |
|
130 | 130 | (r'\S;\s*\n', "semicolon"), |
|
131 | 131 | (r'[^_]_\("[^"]+"\s*%', "don't use % inside _()"), |
|
132 | 132 | (r"[^_]_\('[^']+'\s*%", "don't use % inside _()"), |
|
133 | 133 | (r'\w,\w', "missing whitespace after ,"), |
|
134 | 134 | (r'\w[+/*\-<>]\w', "missing whitespace in expression"), |
|
135 | 135 | (r'^\s+\w+=\w+[^,)\n]$', "missing whitespace in assignment"), |
|
136 | 136 | (r'(\s+)try:\n((?:\n|\1\s.*\n)+?)\1except.*?:\n' |
|
137 | 137 | r'((?:\n|\1\s.*\n)+?)\1finally:', 'no try/except/finally in Py2.4'), |
|
138 | 138 | (r'.{81}', "line too long"), |
|
139 | 139 | (r' x+[xo][\'"]\n\s+[\'"]x', 'string join across lines with no space'), |
|
140 | 140 | (r'[^\n]\Z', "no trailing newline"), |
|
141 | 141 | (r'(\S[ \t]+|^[ \t]+)\n', "trailing whitespace"), |
|
142 | 142 | # (r'^\s+[^_ \n][^_. \n]+_[^_\n]+\s*=', |
|
143 | 143 | # "don't use underbars in identifiers"), |
|
144 | 144 | (r'^\s+(self\.)?[A-za-z][a-z0-9]+[A-Z]\w* = ', |
|
145 | 145 | "don't use camelcase in identifiers"), |
|
146 | 146 | (r'^\s*(if|while|def|class|except|try)\s[^[\n]*:\s*[^\\n]#\s]+', |
|
147 | 147 | "linebreak after :"), |
|
148 | 148 | (r'class\s[^( \n]+:', "old-style class, use class foo(object)"), |
|
149 | 149 | (r'class\s[^( \n]+\(\):', |
|
150 | 150 | "class foo() not available in Python 2.4, use class foo(object)"), |
|
151 | 151 | (r'\b(%s)\(' % '|'.join(keyword.kwlist), |
|
152 | 152 | "Python keyword is not a function"), |
|
153 | 153 | (r',]', "unneeded trailing ',' in list"), |
|
154 | 154 | # (r'class\s[A-Z][^\(]*\((?!Exception)', |
|
155 | 155 | # "don't capitalize non-exception classes"), |
|
156 | 156 | # (r'in range\(', "use xrange"), |
|
157 | 157 | # (r'^\s*print\s+', "avoid using print in core and extensions"), |
|
158 | 158 | (r'[\x80-\xff]', "non-ASCII character literal"), |
|
159 | 159 | (r'("\')\.format\(', "str.format() not available in Python 2.4"), |
|
160 | 160 | (r'^\s*with\s+', "with not available in Python 2.4"), |
|
161 | 161 | (r'\.isdisjoint\(', "set.isdisjoint not available in Python 2.4"), |
|
162 | 162 | (r'^\s*except.* as .*:', "except as not available in Python 2.4"), |
|
163 | 163 | (r'^\s*os\.path\.relpath', "relpath not available in Python 2.4"), |
|
164 | 164 | (r'(?<!def)\s+(any|all|format)\(', |
|
165 | 165 | "any/all/format not available in Python 2.4"), |
|
166 | 166 | (r'(?<!def)\s+(callable)\(', |
|
167 | 167 | "callable not available in Python 3, use getattr(f, '__call__', None)"), |
|
168 | 168 | (r'if\s.*\selse', "if ... else form not available in Python 2.4"), |
|
169 | 169 | (r'^\s*(%s)\s\s' % '|'.join(keyword.kwlist), |
|
170 | 170 | "gratuitous whitespace after Python keyword"), |
|
171 | 171 | (r'([\(\[][ \t]\S)|(\S[ \t][\)\]])', "gratuitous whitespace in () or []"), |
|
172 | 172 | # (r'\s\s=', "gratuitous whitespace before ="), |
|
173 | 173 | (r'[^>< ](\+=|-=|!=|<>|<=|>=|<<=|>>=)\S', |
|
174 | 174 | "missing whitespace around operator"), |
|
175 | 175 | (r'[^>< ](\+=|-=|!=|<>|<=|>=|<<=|>>=)\s', |
|
176 | 176 | "missing whitespace around operator"), |
|
177 | 177 | (r'\s(\+=|-=|!=|<>|<=|>=|<<=|>>=)\S', |
|
178 | 178 | "missing whitespace around operator"), |
|
179 | 179 | (r'[^^+=*/!<>&| -](\s=|=\s)[^= ]', |
|
180 | 180 | "wrong whitespace around ="), |
|
181 | 181 | (r'raise Exception', "don't raise generic exceptions"), |
|
182 | 182 | (r' is\s+(not\s+)?["\'0-9-]', "object comparison with literal"), |
|
183 | 183 | (r' [=!]=\s+(True|False|None)', |
|
184 | 184 | "comparison with singleton, use 'is' or 'is not' instead"), |
|
185 | 185 | (r'^\s*(while|if) [01]:', |
|
186 | 186 | "use True/False for constant Boolean expression"), |
|
187 | 187 | (r'(?:(?<!def)\s+|\()hasattr', |
|
188 | 188 | 'hasattr(foo, bar) is broken, use util.safehasattr(foo, bar) instead'), |
|
189 | 189 | (r'opener\([^)]*\).read\(', |
|
190 | 190 | "use opener.read() instead"), |
|
191 | 191 | (r'BaseException', 'not in Py2.4, use Exception'), |
|
192 | 192 | (r'os\.path\.relpath', 'os.path.relpath is not in Py2.5'), |
|
193 | 193 | (r'opener\([^)]*\).write\(', |
|
194 | 194 | "use opener.write() instead"), |
|
195 | 195 | (r'[\s\(](open|file)\([^)]*\)\.read\(', |
|
196 | 196 | "use util.readfile() instead"), |
|
197 | 197 | (r'[\s\(](open|file)\([^)]*\)\.write\(', |
|
198 | 198 | "use util.readfile() instead"), |
|
199 | 199 | (r'^[\s\(]*(open(er)?|file)\([^)]*\)', |
|
200 | 200 | "always assign an opened file to a variable, and close it afterwards"), |
|
201 | 201 | (r'[\s\(](open|file)\([^)]*\)\.', |
|
202 | 202 | "always assign an opened file to a variable, and close it afterwards"), |
|
203 | 203 | (r'(?i)descendent', "the proper spelling is descendAnt"), |
|
204 | 204 | (r'\.debug\(\_', "don't mark debug messages for translation"), |
|
205 | 205 | (r'\.strip\(\)\.split\(\)', "no need to strip before splitting"), |
|
206 | (r'^\s*except\s*:', "warning: naked except clause", r'#.*re-raises'), | |
|
206 | 207 | ], |
|
207 | 208 | # warnings |
|
208 | 209 | [ |
|
209 | (r'^\s*except\s*:', "warning: naked except clause"), | |
|
210 | 210 | (r'ui\.(status|progress|write|note|warn)\([\'\"]x', |
|
211 | 211 | "warning: unwrapped ui message"), |
|
212 | 212 | ] |
|
213 | 213 | ] |
|
214 | 214 | |
|
215 | 215 | pyfilters = [ |
|
216 | 216 | (r"""(?msx)(?P<comment>\#.*?$)| |
|
217 | 217 | ((?P<quote>('''|\"\"\"|(?<!')'(?!')|(?<!")"(?!"))) |
|
218 | 218 | (?P<text>(([^\\]|\\.)*?)) |
|
219 | 219 | (?P=quote))""", reppython), |
|
220 | 220 | ] |
|
221 | 221 | |
|
222 | 222 | cpats = [ |
|
223 | 223 | [ |
|
224 | 224 | (r'//', "don't use //-style comments"), |
|
225 | 225 | (r'^ ', "don't use spaces to indent"), |
|
226 | 226 | (r'\S\t', "don't use tabs except for indent"), |
|
227 | 227 | (r'(\S[ \t]+|^[ \t]+)\n', "trailing whitespace"), |
|
228 | 228 | (r'.{81}', "line too long"), |
|
229 | 229 | (r'(while|if|do|for)\(', "use space after while/if/do/for"), |
|
230 | 230 | (r'return\(', "return is not a function"), |
|
231 | 231 | (r' ;', "no space before ;"), |
|
232 | 232 | (r'\w+\* \w+', "use int *foo, not int* foo"), |
|
233 | 233 | (r'\([^\)]+\) \w+', "use (int)foo, not (int) foo"), |
|
234 | 234 | (r'\w+ (\+\+|--)', "use foo++, not foo ++"), |
|
235 | 235 | (r'\w,\w', "missing whitespace after ,"), |
|
236 | 236 | (r'^[^#]\w[+/*]\w', "missing whitespace in expression"), |
|
237 | 237 | (r'^#\s+\w', "use #foo, not # foo"), |
|
238 | 238 | (r'[^\n]\Z', "no trailing newline"), |
|
239 | 239 | (r'^\s*#import\b', "use only #include in standard C code"), |
|
240 | 240 | ], |
|
241 | 241 | # warnings |
|
242 | 242 | [] |
|
243 | 243 | ] |
|
244 | 244 | |
|
245 | 245 | cfilters = [ |
|
246 | 246 | (r'(/\*)(((\*(?!/))|[^*])*)\*/', repccomment), |
|
247 | 247 | (r'''(?P<quote>(?<!")")(?P<text>([^"]|\\")+)"(?!")''', repquote), |
|
248 | 248 | (r'''(#\s*include\s+<)([^>]+)>''', repinclude), |
|
249 | 249 | (r'(\()([^)]+\))', repcallspaces), |
|
250 | 250 | ] |
|
251 | 251 | |
|
252 | 252 | inutilpats = [ |
|
253 | 253 | [ |
|
254 | 254 | (r'\bui\.', "don't use ui in util"), |
|
255 | 255 | ], |
|
256 | 256 | # warnings |
|
257 | 257 | [] |
|
258 | 258 | ] |
|
259 | 259 | |
|
260 | 260 | inrevlogpats = [ |
|
261 | 261 | [ |
|
262 | 262 | (r'\brepo\.', "don't use repo in revlog"), |
|
263 | 263 | ], |
|
264 | 264 | # warnings |
|
265 | 265 | [] |
|
266 | 266 | ] |
|
267 | 267 | |
|
268 | 268 | checks = [ |
|
269 | 269 | ('python', r'.*\.(py|cgi)$', pyfilters, pypats), |
|
270 | 270 | ('test script', r'(.*/)?test-[^.~]*$', testfilters, testpats), |
|
271 | 271 | ('c', r'.*\.c$', cfilters, cpats), |
|
272 | 272 | ('unified test', r'.*\.t$', utestfilters, utestpats), |
|
273 | 273 | ('layering violation repo in revlog', r'mercurial/revlog\.py', pyfilters, |
|
274 | 274 | inrevlogpats), |
|
275 | 275 | ('layering violation ui in util', r'mercurial/util\.py', pyfilters, |
|
276 | 276 | inutilpats), |
|
277 | 277 | ] |
|
278 | 278 | |
|
279 | 279 | class norepeatlogger(object): |
|
280 | 280 | def __init__(self): |
|
281 | 281 | self._lastseen = None |
|
282 | 282 | |
|
283 | 283 | def log(self, fname, lineno, line, msg, blame): |
|
284 | 284 | """print error related a to given line of a given file. |
|
285 | 285 | |
|
286 | 286 | The faulty line will also be printed but only once in the case |
|
287 | 287 | of multiple errors. |
|
288 | 288 | |
|
289 | 289 | :fname: filename |
|
290 | 290 | :lineno: line number |
|
291 | 291 | :line: actual content of the line |
|
292 | 292 | :msg: error message |
|
293 | 293 | """ |
|
294 | 294 | msgid = fname, lineno, line |
|
295 | 295 | if msgid != self._lastseen: |
|
296 | 296 | if blame: |
|
297 | 297 | print "%s:%d (%s):" % (fname, lineno, blame) |
|
298 | 298 | else: |
|
299 | 299 | print "%s:%d:" % (fname, lineno) |
|
300 | 300 | print " > %s" % line |
|
301 | 301 | self._lastseen = msgid |
|
302 | 302 | print " " + msg |
|
303 | 303 | |
|
304 | 304 | _defaultlogger = norepeatlogger() |
|
305 | 305 | |
|
306 | 306 | def getblame(f): |
|
307 | 307 | lines = [] |
|
308 | 308 | for l in os.popen('hg annotate -un %s' % f): |
|
309 | 309 | start, line = l.split(':', 1) |
|
310 | 310 | user, rev = start.split() |
|
311 | 311 | lines.append((line[1:-1], user, rev)) |
|
312 | 312 | return lines |
|
313 | 313 | |
|
314 | 314 | def checkfile(f, logfunc=_defaultlogger.log, maxerr=None, warnings=False, |
|
315 | 315 | blame=False, debug=False, lineno=True): |
|
316 | 316 | """checks style and portability of a given file |
|
317 | 317 | |
|
318 | 318 | :f: filepath |
|
319 | 319 | :logfunc: function used to report error |
|
320 | 320 | logfunc(filename, linenumber, linecontent, errormessage) |
|
321 | 321 | :maxerr: number of error to display before arborting. |
|
322 | 322 | Set to false (default) to report all errors |
|
323 | 323 | |
|
324 | 324 | return True if no error is found, False otherwise. |
|
325 | 325 | """ |
|
326 | 326 | blamecache = None |
|
327 | 327 | result = True |
|
328 | 328 | for name, match, filters, pats in checks: |
|
329 | 329 | if debug: |
|
330 | 330 | print name, f |
|
331 | 331 | fc = 0 |
|
332 | 332 | if not re.match(match, f): |
|
333 | 333 | if debug: |
|
334 | 334 | print "Skipping %s for %s it doesn't match %s" % ( |
|
335 | 335 | name, match, f) |
|
336 | 336 | continue |
|
337 | 337 | fp = open(f) |
|
338 | 338 | pre = post = fp.read() |
|
339 | 339 | fp.close() |
|
340 | 340 | if "no-" + "check-code" in pre: |
|
341 | 341 | if debug: |
|
342 | 342 | print "Skipping %s for %s it has no- and check-code" % ( |
|
343 | 343 | name, f) |
|
344 | 344 | break |
|
345 | 345 | for p, r in filters: |
|
346 | 346 | post = re.sub(p, r, post) |
|
347 | 347 | if warnings: |
|
348 | 348 | pats = pats[0] + pats[1] |
|
349 | 349 | else: |
|
350 | 350 | pats = pats[0] |
|
351 | 351 | # print post # uncomment to show filtered version |
|
352 | 352 | |
|
353 | 353 | if debug: |
|
354 | 354 | print "Checking %s for %s" % (name, f) |
|
355 | 355 | |
|
356 | 356 | prelines = None |
|
357 | 357 | errors = [] |
|
358 |
for p |
|
|
358 | for pat in pats: | |
|
359 | if len(pat) == 3: | |
|
360 | p, msg, ignore = pat | |
|
361 | else: | |
|
362 | p, msg = pat | |
|
363 | ignore = None | |
|
364 | ||
|
359 | 365 | # fix-up regexes for multiline searches |
|
360 | 366 | po = p |
|
361 | 367 | # \s doesn't match \n |
|
362 | 368 | p = re.sub(r'(?<!\\)\\s', r'[ \\t]', p) |
|
363 | 369 | # [^...] doesn't match newline |
|
364 | 370 | p = re.sub(r'(?<!\\)\[\^', r'[^\\n', p) |
|
365 | 371 | |
|
366 | 372 | #print po, '=>', p |
|
367 | 373 | |
|
368 | 374 | pos = 0 |
|
369 | 375 | n = 0 |
|
370 | 376 | for m in re.finditer(p, post, re.MULTILINE): |
|
371 | 377 | if prelines is None: |
|
372 | 378 | prelines = pre.splitlines() |
|
373 | 379 | postlines = post.splitlines(True) |
|
374 | 380 | |
|
375 | 381 | start = m.start() |
|
376 | 382 | while n < len(postlines): |
|
377 | 383 | step = len(postlines[n]) |
|
378 | 384 | if pos + step > start: |
|
379 | 385 | break |
|
380 | 386 | pos += step |
|
381 | 387 | n += 1 |
|
382 | 388 | l = prelines[n] |
|
383 | 389 | |
|
384 | 390 | if "check-code" + "-ignore" in l: |
|
385 | 391 | if debug: |
|
386 | 392 | print "Skipping %s for %s:%s (check-code -ignore)" % ( |
|
387 | 393 | name, f, n) |
|
388 | 394 | continue |
|
395 | elif ignore and re.search(ignore, l, re.MULTILINE): | |
|
396 | continue | |
|
389 | 397 | bd = "" |
|
390 | 398 | if blame: |
|
391 | 399 | bd = 'working directory' |
|
392 | 400 | if not blamecache: |
|
393 | 401 | blamecache = getblame(f) |
|
394 | 402 | if n < len(blamecache): |
|
395 | 403 | bl, bu, br = blamecache[n] |
|
396 | 404 | if bl == l: |
|
397 | 405 | bd = '%s@%s' % (bu, br) |
|
398 | 406 | errors.append((f, lineno and n + 1, l, msg, bd)) |
|
399 | 407 | result = False |
|
400 | 408 | |
|
401 | 409 | errors.sort() |
|
402 | 410 | for e in errors: |
|
403 | 411 | logfunc(*e) |
|
404 | 412 | fc += 1 |
|
405 | 413 | if maxerr and fc >= maxerr: |
|
406 | 414 | print " (too many errors, giving up)" |
|
407 | 415 | break |
|
408 | 416 | |
|
409 | 417 | return result |
|
410 | 418 | |
|
411 | 419 | if __name__ == "__main__": |
|
412 | 420 | parser = optparse.OptionParser("%prog [options] [files]") |
|
413 | 421 | parser.add_option("-w", "--warnings", action="store_true", |
|
414 | 422 | help="include warning-level checks") |
|
415 | 423 | parser.add_option("-p", "--per-file", type="int", |
|
416 | 424 | help="max warnings per file") |
|
417 | 425 | parser.add_option("-b", "--blame", action="store_true", |
|
418 | 426 | help="use annotate to generate blame info") |
|
419 | 427 | parser.add_option("", "--debug", action="store_true", |
|
420 | 428 | help="show debug information") |
|
421 | 429 | parser.add_option("", "--nolineno", action="store_false", |
|
422 | 430 | dest='lineno', help="don't show line numbers") |
|
423 | 431 | |
|
424 | 432 | parser.set_defaults(per_file=15, warnings=False, blame=False, debug=False, |
|
425 | 433 | lineno=True) |
|
426 | 434 | (options, args) = parser.parse_args() |
|
427 | 435 | |
|
428 | 436 | if len(args) == 0: |
|
429 | 437 | check = glob.glob("*") |
|
430 | 438 | else: |
|
431 | 439 | check = args |
|
432 | 440 | |
|
433 | 441 | ret = 0 |
|
434 | 442 | for f in check: |
|
435 | 443 | if not checkfile(f, maxerr=options.per_file, warnings=options.warnings, |
|
436 | 444 | blame=options.blame, debug=options.debug, |
|
437 | 445 | lineno=options.lineno): |
|
438 | 446 | ret = 1 |
|
439 | 447 | sys.exit(ret) |
@@ -1,294 +1,294 b'' | |||
|
1 | 1 | """reorder a revlog (the manifest by default) to save space |
|
2 | 2 | |
|
3 | 3 | Specifically, this topologically sorts the revisions in the revlog so that |
|
4 | 4 | revisions on the same branch are adjacent as much as possible. This is a |
|
5 | 5 | workaround for the fact that Mercurial computes deltas relative to the |
|
6 | 6 | previous revision rather than relative to a parent revision. |
|
7 | 7 | |
|
8 | 8 | This is *not* safe to run on a changelog. |
|
9 | 9 | """ |
|
10 | 10 | |
|
11 | 11 | # Originally written by Benoit Boissinot <benoit.boissinot at ens-lyon.org> |
|
12 | 12 | # as a patch to rewrite-log. Cleaned up, refactored, documented, and |
|
13 | 13 | # renamed by Greg Ward <greg at gerg.ca>. |
|
14 | 14 | |
|
15 | 15 | # XXX would be nice to have a way to verify the repository after shrinking, |
|
16 | 16 | # e.g. by comparing "before" and "after" states of random changesets |
|
17 | 17 | # (maybe: export before, shrink, export after, diff). |
|
18 | 18 | |
|
19 | 19 | import os, errno |
|
20 | 20 | from mercurial import revlog, transaction, node, util, scmutil |
|
21 | 21 | from mercurial import changegroup |
|
22 | 22 | from mercurial.i18n import _ |
|
23 | 23 | |
|
24 | 24 | |
|
25 | 25 | def postorder(start, edges): |
|
26 | 26 | result = [] |
|
27 | 27 | visit = list(start) |
|
28 | 28 | finished = set() |
|
29 | 29 | |
|
30 | 30 | while visit: |
|
31 | 31 | cur = visit[-1] |
|
32 | 32 | for p in edges[cur]: |
|
33 | 33 | # defend against node.nullrev because it's occasionally |
|
34 | 34 | # possible for a node to have parents (null, something) |
|
35 | 35 | # rather than (something, null) |
|
36 | 36 | if p not in finished and p != node.nullrev: |
|
37 | 37 | visit.append(p) |
|
38 | 38 | break |
|
39 | 39 | else: |
|
40 | 40 | result.append(cur) |
|
41 | 41 | finished.add(cur) |
|
42 | 42 | visit.pop() |
|
43 | 43 | |
|
44 | 44 | return result |
|
45 | 45 | |
|
46 | 46 | def toposort_reversepostorder(ui, rl): |
|
47 | 47 | # postorder of the reverse directed graph |
|
48 | 48 | |
|
49 | 49 | # map rev to list of parent revs (p2 first) |
|
50 | 50 | parents = {} |
|
51 | 51 | heads = set() |
|
52 | 52 | ui.status(_('reading revs\n')) |
|
53 | 53 | try: |
|
54 | 54 | for rev in rl: |
|
55 | 55 | ui.progress(_('reading'), rev, total=len(rl)) |
|
56 | 56 | (p1, p2) = rl.parentrevs(rev) |
|
57 | 57 | if p1 == p2 == node.nullrev: |
|
58 | 58 | parents[rev] = () # root node |
|
59 | 59 | elif p1 == p2 or p2 == node.nullrev: |
|
60 | 60 | parents[rev] = (p1,) # normal node |
|
61 | 61 | else: |
|
62 | 62 | parents[rev] = (p2, p1) # merge node |
|
63 | 63 | heads.add(rev) |
|
64 | 64 | for p in parents[rev]: |
|
65 | 65 | heads.discard(p) |
|
66 | 66 | finally: |
|
67 | 67 | ui.progress(_('reading'), None) |
|
68 | 68 | |
|
69 | 69 | heads = list(heads) |
|
70 | 70 | heads.sort(reverse=True) |
|
71 | 71 | |
|
72 | 72 | ui.status(_('sorting revs\n')) |
|
73 | 73 | return postorder(heads, parents) |
|
74 | 74 | |
|
75 | 75 | def toposort_postorderreverse(ui, rl): |
|
76 | 76 | # reverse-postorder of the reverse directed graph |
|
77 | 77 | |
|
78 | 78 | children = {} |
|
79 | 79 | roots = set() |
|
80 | 80 | ui.status(_('reading revs\n')) |
|
81 | 81 | try: |
|
82 | 82 | for rev in rl: |
|
83 | 83 | ui.progress(_('reading'), rev, total=len(rl)) |
|
84 | 84 | (p1, p2) = rl.parentrevs(rev) |
|
85 | 85 | if p1 == p2 == node.nullrev: |
|
86 | 86 | roots.add(rev) |
|
87 | 87 | children[rev] = [] |
|
88 | 88 | if p1 != node.nullrev: |
|
89 | 89 | children[p1].append(rev) |
|
90 | 90 | if p2 != node.nullrev: |
|
91 | 91 | children[p2].append(rev) |
|
92 | 92 | finally: |
|
93 | 93 | ui.progress(_('reading'), None) |
|
94 | 94 | |
|
95 | 95 | roots = list(roots) |
|
96 | 96 | roots.sort() |
|
97 | 97 | |
|
98 | 98 | ui.status(_('sorting revs\n')) |
|
99 | 99 | result = postorder(roots, children) |
|
100 | 100 | result.reverse() |
|
101 | 101 | return result |
|
102 | 102 | |
|
103 | 103 | def writerevs(ui, r1, r2, order, tr): |
|
104 | 104 | |
|
105 | 105 | ui.status(_('writing revs\n')) |
|
106 | 106 | |
|
107 | 107 | |
|
108 | 108 | order = [r1.node(r) for r in order] |
|
109 | 109 | |
|
110 | 110 | # this is a bit ugly, but it works |
|
111 | 111 | count = [0] |
|
112 | 112 | def lookup(revl, x): |
|
113 | 113 | count[0] += 1 |
|
114 | 114 | ui.progress(_('writing'), count[0], total=len(order)) |
|
115 | 115 | return "%020d" % revl.linkrev(revl.rev(x)) |
|
116 | 116 | |
|
117 | 117 | unlookup = lambda x: int(x, 10) |
|
118 | 118 | |
|
119 | 119 | try: |
|
120 | 120 | bundler = changegroup.bundle10(lookup) |
|
121 | 121 | group = util.chunkbuffer(r1.group(order, bundler)) |
|
122 | 122 | group = changegroup.unbundle10(group, "UN") |
|
123 | 123 | r2.addgroup(group, unlookup, tr) |
|
124 | 124 | finally: |
|
125 | 125 | ui.progress(_('writing'), None) |
|
126 | 126 | |
|
127 | 127 | def report(ui, r1, r2): |
|
128 | 128 | def getsize(r): |
|
129 | 129 | s = 0 |
|
130 | 130 | for fn in (r.indexfile, r.datafile): |
|
131 | 131 | try: |
|
132 | 132 | s += os.stat(fn).st_size |
|
133 | 133 | except OSError, inst: |
|
134 | 134 | if inst.errno != errno.ENOENT: |
|
135 | 135 | raise |
|
136 | 136 | return s |
|
137 | 137 | |
|
138 | 138 | oldsize = float(getsize(r1)) |
|
139 | 139 | newsize = float(getsize(r2)) |
|
140 | 140 | |
|
141 | 141 | # argh: have to pass an int to %d, because a float >= 2^32 |
|
142 | 142 | # blows up under Python 2.5 or earlier |
|
143 | 143 | ui.write(_('old file size: %12d bytes (%6.1f MiB)\n') |
|
144 | 144 | % (int(oldsize), oldsize / 1024 / 1024)) |
|
145 | 145 | ui.write(_('new file size: %12d bytes (%6.1f MiB)\n') |
|
146 | 146 | % (int(newsize), newsize / 1024 / 1024)) |
|
147 | 147 | |
|
148 | 148 | shrink_percent = (oldsize - newsize) / oldsize * 100 |
|
149 | 149 | shrink_factor = oldsize / newsize |
|
150 | 150 | ui.write(_('shrinkage: %.1f%% (%.1fx)\n') |
|
151 | 151 | % (shrink_percent, shrink_factor)) |
|
152 | 152 | |
|
153 | 153 | def shrink(ui, repo, **opts): |
|
154 | 154 | """shrink a revlog by reordering revisions |
|
155 | 155 | |
|
156 | 156 | Rewrites all the entries in some revlog of the current repository |
|
157 | 157 | (by default, the manifest log) to save space. |
|
158 | 158 | |
|
159 | 159 | Different sort algorithms have different performance |
|
160 | 160 | characteristics. Use ``--sort`` to select a sort algorithm so you |
|
161 | 161 | can determine which works best for your data. |
|
162 | 162 | """ |
|
163 | 163 | |
|
164 | 164 | if not repo.local(): |
|
165 | 165 | raise util.Abort(_('not a local repository: %s') % repo.root) |
|
166 | 166 | |
|
167 | 167 | fn = opts.get('revlog') |
|
168 | 168 | if not fn: |
|
169 | 169 | indexfn = repo.sjoin('00manifest.i') |
|
170 | 170 | else: |
|
171 | 171 | if not fn.endswith('.i'): |
|
172 | 172 | raise util.Abort(_('--revlog option must specify the revlog index ' |
|
173 | 173 | 'file (*.i), not %s') % opts.get('revlog')) |
|
174 | 174 | |
|
175 | 175 | indexfn = os.path.realpath(fn) |
|
176 | 176 | store = repo.sjoin('') |
|
177 | 177 | if not indexfn.startswith(store): |
|
178 | 178 | raise util.Abort(_('--revlog option must specify a revlog in %s, ' |
|
179 | 179 | 'not %s') % (store, indexfn)) |
|
180 | 180 | |
|
181 | 181 | sortname = opts['sort'] |
|
182 | 182 | try: |
|
183 | 183 | toposort = globals()['toposort_' + sortname] |
|
184 | 184 | except KeyError: |
|
185 | 185 | raise util.Abort(_('no such toposort algorithm: %s') % sortname) |
|
186 | 186 | |
|
187 | 187 | if not os.path.exists(indexfn): |
|
188 | 188 | raise util.Abort(_('no such file: %s') % indexfn) |
|
189 | 189 | if '00changelog' in indexfn: |
|
190 | 190 | raise util.Abort(_('shrinking the changelog ' |
|
191 | 191 | 'will corrupt your repository')) |
|
192 | 192 | |
|
193 | 193 | ui.write(_('shrinking %s\n') % indexfn) |
|
194 | 194 | tmpindexfn = util.mktempcopy(indexfn, emptyok=True) |
|
195 | 195 | |
|
196 | 196 | r1 = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), indexfn) |
|
197 | 197 | r2 = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), tmpindexfn) |
|
198 | 198 | |
|
199 | 199 | datafn, tmpdatafn = r1.datafile, r2.datafile |
|
200 | 200 | |
|
201 | 201 | oldindexfn = indexfn + '.old' |
|
202 | 202 | olddatafn = datafn + '.old' |
|
203 | 203 | if os.path.exists(oldindexfn) or os.path.exists(olddatafn): |
|
204 | 204 | raise util.Abort(_('one or both of\n' |
|
205 | 205 | ' %s\n' |
|
206 | 206 | ' %s\n' |
|
207 | 207 | 'exists from a previous run; please clean up ' |
|
208 | 208 | 'before running again') % (oldindexfn, olddatafn)) |
|
209 | 209 | |
|
210 | 210 | # Don't use repo.transaction(), because then things get hairy with |
|
211 | 211 | # paths: some need to be relative to .hg, and some need to be |
|
212 | 212 | # absolute. Doing it this way keeps things simple: everything is an |
|
213 | 213 | # absolute path. |
|
214 | 214 | lock = repo.lock(wait=False) |
|
215 | 215 | tr = transaction.transaction(ui.warn, |
|
216 | 216 | open, |
|
217 | 217 | repo.sjoin('journal')) |
|
218 | 218 | |
|
219 | 219 | def ignoremissing(func): |
|
220 | 220 | def f(*args, **kw): |
|
221 | 221 | try: |
|
222 | 222 | return func(*args, **kw) |
|
223 | 223 | except OSError, inst: |
|
224 | 224 | if inst.errno != errno.ENOENT: |
|
225 | 225 | raise |
|
226 | 226 | return f |
|
227 | 227 | |
|
228 | 228 | try: |
|
229 | 229 | try: |
|
230 | 230 | order = toposort(ui, r1) |
|
231 | 231 | |
|
232 | 232 | suboptimal = 0 |
|
233 | 233 | for i in xrange(1, len(order)): |
|
234 | 234 | parents = [p for p in r1.parentrevs(order[i]) |
|
235 | 235 | if p != node.nullrev] |
|
236 | 236 | if parents and order[i - 1] not in parents: |
|
237 | 237 | suboptimal += 1 |
|
238 | 238 | ui.note(_('%d suboptimal nodes\n') % suboptimal) |
|
239 | 239 | |
|
240 | 240 | writerevs(ui, r1, r2, order, tr) |
|
241 | 241 | report(ui, r1, r2) |
|
242 | 242 | tr.close() |
|
243 | except: | |
|
243 | except: # re-raises | |
|
244 | 244 | # Abort transaction first, so we truncate the files before |
|
245 | 245 | # deleting them. |
|
246 | 246 | tr.abort() |
|
247 | 247 | for fn in (tmpindexfn, tmpdatafn): |
|
248 | 248 | ignoremissing(os.unlink)(fn) |
|
249 | 249 | raise |
|
250 | 250 | if not opts.get('dry_run'): |
|
251 | 251 | # racy, both files cannot be renamed atomically |
|
252 | 252 | # copy files |
|
253 | 253 | util.oslink(indexfn, oldindexfn) |
|
254 | 254 | ignoremissing(util.oslink)(datafn, olddatafn) |
|
255 | 255 | |
|
256 | 256 | # rename |
|
257 | 257 | util.rename(tmpindexfn, indexfn) |
|
258 | 258 | try: |
|
259 | 259 | os.chmod(tmpdatafn, os.stat(datafn).st_mode) |
|
260 | 260 | util.rename(tmpdatafn, datafn) |
|
261 | 261 | except OSError, inst: |
|
262 | 262 | if inst.errno != errno.ENOENT: |
|
263 | 263 | raise |
|
264 | 264 | ignoremissing(os.unlink)(datafn) |
|
265 | 265 | else: |
|
266 | 266 | for fn in (tmpindexfn, tmpdatafn): |
|
267 | 267 | ignoremissing(os.unlink)(fn) |
|
268 | 268 | finally: |
|
269 | 269 | lock.release() |
|
270 | 270 | |
|
271 | 271 | if not opts.get('dry_run'): |
|
272 | 272 | ui.write( |
|
273 | 273 | _('note: old revlog saved in:\n' |
|
274 | 274 | ' %s\n' |
|
275 | 275 | ' %s\n' |
|
276 | 276 | '(You can delete those files when you are satisfied that your\n' |
|
277 | 277 | 'repository is still sane. ' |
|
278 | 278 | 'Running \'hg verify\' is strongly recommended.)\n') |
|
279 | 279 | % (oldindexfn, olddatafn)) |
|
280 | 280 | |
|
281 | 281 | cmdtable = { |
|
282 | 282 | 'shrink': (shrink, |
|
283 | 283 | [('', 'revlog', '', |
|
284 | 284 | _('the revlog to shrink (.i)')), |
|
285 | 285 | ('n', 'dry-run', None, |
|
286 | 286 | _('do not shrink, simulate only')), |
|
287 | 287 | ('', 'sort', 'reversepostorder', |
|
288 | 288 | _('name of sort algorithm to use')), |
|
289 | 289 | ], |
|
290 | 290 | _('hg shrink [--revlog PATH]')) |
|
291 | 291 | } |
|
292 | 292 | |
|
293 | 293 | if __name__ == "__main__": |
|
294 | 294 | print "shrink-revlog.py is now an extension (see hg help extensions)" |
@@ -1,3532 +1,3532 b'' | |||
|
1 | 1 | # mq.py - patch queues for mercurial |
|
2 | 2 | # |
|
3 | 3 | # Copyright 2005, 2006 Chris Mason <mason@suse.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 | '''manage a stack of patches |
|
9 | 9 | |
|
10 | 10 | This extension lets you work with a stack of patches in a Mercurial |
|
11 | 11 | repository. It manages two stacks of patches - all known patches, and |
|
12 | 12 | applied patches (subset of known patches). |
|
13 | 13 | |
|
14 | 14 | Known patches are represented as patch files in the .hg/patches |
|
15 | 15 | directory. Applied patches are both patch files and changesets. |
|
16 | 16 | |
|
17 | 17 | Common tasks (use :hg:`help command` for more details):: |
|
18 | 18 | |
|
19 | 19 | create new patch qnew |
|
20 | 20 | import existing patch qimport |
|
21 | 21 | |
|
22 | 22 | print patch series qseries |
|
23 | 23 | print applied patches qapplied |
|
24 | 24 | |
|
25 | 25 | add known patch to applied stack qpush |
|
26 | 26 | remove patch from applied stack qpop |
|
27 | 27 | refresh contents of top applied patch qrefresh |
|
28 | 28 | |
|
29 | 29 | By default, mq will automatically use git patches when required to |
|
30 | 30 | avoid losing file mode changes, copy records, binary files or empty |
|
31 | 31 | files creations or deletions. This behaviour can be configured with:: |
|
32 | 32 | |
|
33 | 33 | [mq] |
|
34 | 34 | git = auto/keep/yes/no |
|
35 | 35 | |
|
36 | 36 | If set to 'keep', mq will obey the [diff] section configuration while |
|
37 | 37 | preserving existing git patches upon qrefresh. If set to 'yes' or |
|
38 | 38 | 'no', mq will override the [diff] section and always generate git or |
|
39 | 39 | regular patches, possibly losing data in the second case. |
|
40 | 40 | |
|
41 | 41 | It may be desirable for mq changesets to be kept in the secret phase (see |
|
42 | 42 | :hg:`help phases`), which can be enabled with the following setting:: |
|
43 | 43 | |
|
44 | 44 | [mq] |
|
45 | 45 | secret = True |
|
46 | 46 | |
|
47 | 47 | You will by default be managing a patch queue named "patches". You can |
|
48 | 48 | create other, independent patch queues with the :hg:`qqueue` command. |
|
49 | 49 | |
|
50 | 50 | If the working directory contains uncommitted files, qpush, qpop and |
|
51 | 51 | qgoto abort immediately. If -f/--force is used, the changes are |
|
52 | 52 | discarded. Setting: |
|
53 | 53 | |
|
54 | 54 | [mq] |
|
55 | 55 | check = True |
|
56 | 56 | |
|
57 | 57 | make them behave as if -c/--check were passed, and non-conflicting |
|
58 | 58 | local changes will be tolerated and preserved. If incompatible options |
|
59 | 59 | such as -f/--force or --exact are passed, this setting is ignored. |
|
60 | 60 | ''' |
|
61 | 61 | |
|
62 | 62 | from mercurial.i18n import _ |
|
63 | 63 | from mercurial.node import bin, hex, short, nullid, nullrev |
|
64 | 64 | from mercurial.lock import release |
|
65 | 65 | from mercurial import commands, cmdutil, hg, scmutil, util, revset |
|
66 | 66 | from mercurial import repair, extensions, url, error, phases |
|
67 | 67 | from mercurial import patch as patchmod |
|
68 | 68 | import os, re, errno, shutil |
|
69 | 69 | |
|
70 | 70 | commands.norepo += " qclone" |
|
71 | 71 | |
|
72 | 72 | seriesopts = [('s', 'summary', None, _('print first line of patch header'))] |
|
73 | 73 | |
|
74 | 74 | cmdtable = {} |
|
75 | 75 | command = cmdutil.command(cmdtable) |
|
76 | 76 | |
|
77 | 77 | # Patch names looks like unix-file names. |
|
78 | 78 | # They must be joinable with queue directory and result in the patch path. |
|
79 | 79 | normname = util.normpath |
|
80 | 80 | |
|
81 | 81 | class statusentry(object): |
|
82 | 82 | def __init__(self, node, name): |
|
83 | 83 | self.node, self.name = node, name |
|
84 | 84 | def __repr__(self): |
|
85 | 85 | return hex(self.node) + ':' + self.name |
|
86 | 86 | |
|
87 | 87 | class patchheader(object): |
|
88 | 88 | def __init__(self, pf, plainmode=False): |
|
89 | 89 | def eatdiff(lines): |
|
90 | 90 | while lines: |
|
91 | 91 | l = lines[-1] |
|
92 | 92 | if (l.startswith("diff -") or |
|
93 | 93 | l.startswith("Index:") or |
|
94 | 94 | l.startswith("===========")): |
|
95 | 95 | del lines[-1] |
|
96 | 96 | else: |
|
97 | 97 | break |
|
98 | 98 | def eatempty(lines): |
|
99 | 99 | while lines: |
|
100 | 100 | if not lines[-1].strip(): |
|
101 | 101 | del lines[-1] |
|
102 | 102 | else: |
|
103 | 103 | break |
|
104 | 104 | |
|
105 | 105 | message = [] |
|
106 | 106 | comments = [] |
|
107 | 107 | user = None |
|
108 | 108 | date = None |
|
109 | 109 | parent = None |
|
110 | 110 | format = None |
|
111 | 111 | subject = None |
|
112 | 112 | branch = None |
|
113 | 113 | nodeid = None |
|
114 | 114 | diffstart = 0 |
|
115 | 115 | |
|
116 | 116 | for line in file(pf): |
|
117 | 117 | line = line.rstrip() |
|
118 | 118 | if (line.startswith('diff --git') |
|
119 | 119 | or (diffstart and line.startswith('+++ '))): |
|
120 | 120 | diffstart = 2 |
|
121 | 121 | break |
|
122 | 122 | diffstart = 0 # reset |
|
123 | 123 | if line.startswith("--- "): |
|
124 | 124 | diffstart = 1 |
|
125 | 125 | continue |
|
126 | 126 | elif format == "hgpatch": |
|
127 | 127 | # parse values when importing the result of an hg export |
|
128 | 128 | if line.startswith("# User "): |
|
129 | 129 | user = line[7:] |
|
130 | 130 | elif line.startswith("# Date "): |
|
131 | 131 | date = line[7:] |
|
132 | 132 | elif line.startswith("# Parent "): |
|
133 | 133 | parent = line[9:].lstrip() |
|
134 | 134 | elif line.startswith("# Branch "): |
|
135 | 135 | branch = line[9:] |
|
136 | 136 | elif line.startswith("# Node ID "): |
|
137 | 137 | nodeid = line[10:] |
|
138 | 138 | elif not line.startswith("# ") and line: |
|
139 | 139 | message.append(line) |
|
140 | 140 | format = None |
|
141 | 141 | elif line == '# HG changeset patch': |
|
142 | 142 | message = [] |
|
143 | 143 | format = "hgpatch" |
|
144 | 144 | elif (format != "tagdone" and (line.startswith("Subject: ") or |
|
145 | 145 | line.startswith("subject: "))): |
|
146 | 146 | subject = line[9:] |
|
147 | 147 | format = "tag" |
|
148 | 148 | elif (format != "tagdone" and (line.startswith("From: ") or |
|
149 | 149 | line.startswith("from: "))): |
|
150 | 150 | user = line[6:] |
|
151 | 151 | format = "tag" |
|
152 | 152 | elif (format != "tagdone" and (line.startswith("Date: ") or |
|
153 | 153 | line.startswith("date: "))): |
|
154 | 154 | date = line[6:] |
|
155 | 155 | format = "tag" |
|
156 | 156 | elif format == "tag" and line == "": |
|
157 | 157 | # when looking for tags (subject: from: etc) they |
|
158 | 158 | # end once you find a blank line in the source |
|
159 | 159 | format = "tagdone" |
|
160 | 160 | elif message or line: |
|
161 | 161 | message.append(line) |
|
162 | 162 | comments.append(line) |
|
163 | 163 | |
|
164 | 164 | eatdiff(message) |
|
165 | 165 | eatdiff(comments) |
|
166 | 166 | # Remember the exact starting line of the patch diffs before consuming |
|
167 | 167 | # empty lines, for external use by TortoiseHg and others |
|
168 | 168 | self.diffstartline = len(comments) |
|
169 | 169 | eatempty(message) |
|
170 | 170 | eatempty(comments) |
|
171 | 171 | |
|
172 | 172 | # make sure message isn't empty |
|
173 | 173 | if format and format.startswith("tag") and subject: |
|
174 | 174 | message.insert(0, "") |
|
175 | 175 | message.insert(0, subject) |
|
176 | 176 | |
|
177 | 177 | self.message = message |
|
178 | 178 | self.comments = comments |
|
179 | 179 | self.user = user |
|
180 | 180 | self.date = date |
|
181 | 181 | self.parent = parent |
|
182 | 182 | # nodeid and branch are for external use by TortoiseHg and others |
|
183 | 183 | self.nodeid = nodeid |
|
184 | 184 | self.branch = branch |
|
185 | 185 | self.haspatch = diffstart > 1 |
|
186 | 186 | self.plainmode = plainmode |
|
187 | 187 | |
|
188 | 188 | def setuser(self, user): |
|
189 | 189 | if not self.updateheader(['From: ', '# User '], user): |
|
190 | 190 | try: |
|
191 | 191 | patchheaderat = self.comments.index('# HG changeset patch') |
|
192 | 192 | self.comments.insert(patchheaderat + 1, '# User ' + user) |
|
193 | 193 | except ValueError: |
|
194 | 194 | if self.plainmode or self._hasheader(['Date: ']): |
|
195 | 195 | self.comments = ['From: ' + user] + self.comments |
|
196 | 196 | else: |
|
197 | 197 | tmp = ['# HG changeset patch', '# User ' + user, ''] |
|
198 | 198 | self.comments = tmp + self.comments |
|
199 | 199 | self.user = user |
|
200 | 200 | |
|
201 | 201 | def setdate(self, date): |
|
202 | 202 | if not self.updateheader(['Date: ', '# Date '], date): |
|
203 | 203 | try: |
|
204 | 204 | patchheaderat = self.comments.index('# HG changeset patch') |
|
205 | 205 | self.comments.insert(patchheaderat + 1, '# Date ' + date) |
|
206 | 206 | except ValueError: |
|
207 | 207 | if self.plainmode or self._hasheader(['From: ']): |
|
208 | 208 | self.comments = ['Date: ' + date] + self.comments |
|
209 | 209 | else: |
|
210 | 210 | tmp = ['# HG changeset patch', '# Date ' + date, ''] |
|
211 | 211 | self.comments = tmp + self.comments |
|
212 | 212 | self.date = date |
|
213 | 213 | |
|
214 | 214 | def setparent(self, parent): |
|
215 | 215 | if not self.updateheader(['# Parent '], parent): |
|
216 | 216 | try: |
|
217 | 217 | patchheaderat = self.comments.index('# HG changeset patch') |
|
218 | 218 | self.comments.insert(patchheaderat + 1, '# Parent ' + parent) |
|
219 | 219 | except ValueError: |
|
220 | 220 | pass |
|
221 | 221 | self.parent = parent |
|
222 | 222 | |
|
223 | 223 | def setmessage(self, message): |
|
224 | 224 | if self.comments: |
|
225 | 225 | self._delmsg() |
|
226 | 226 | self.message = [message] |
|
227 | 227 | self.comments += self.message |
|
228 | 228 | |
|
229 | 229 | def updateheader(self, prefixes, new): |
|
230 | 230 | '''Update all references to a field in the patch header. |
|
231 | 231 | Return whether the field is present.''' |
|
232 | 232 | res = False |
|
233 | 233 | for prefix in prefixes: |
|
234 | 234 | for i in xrange(len(self.comments)): |
|
235 | 235 | if self.comments[i].startswith(prefix): |
|
236 | 236 | self.comments[i] = prefix + new |
|
237 | 237 | res = True |
|
238 | 238 | break |
|
239 | 239 | return res |
|
240 | 240 | |
|
241 | 241 | def _hasheader(self, prefixes): |
|
242 | 242 | '''Check if a header starts with any of the given prefixes.''' |
|
243 | 243 | for prefix in prefixes: |
|
244 | 244 | for comment in self.comments: |
|
245 | 245 | if comment.startswith(prefix): |
|
246 | 246 | return True |
|
247 | 247 | return False |
|
248 | 248 | |
|
249 | 249 | def __str__(self): |
|
250 | 250 | if not self.comments: |
|
251 | 251 | return '' |
|
252 | 252 | return '\n'.join(self.comments) + '\n\n' |
|
253 | 253 | |
|
254 | 254 | def _delmsg(self): |
|
255 | 255 | '''Remove existing message, keeping the rest of the comments fields. |
|
256 | 256 | If comments contains 'subject: ', message will prepend |
|
257 | 257 | the field and a blank line.''' |
|
258 | 258 | if self.message: |
|
259 | 259 | subj = 'subject: ' + self.message[0].lower() |
|
260 | 260 | for i in xrange(len(self.comments)): |
|
261 | 261 | if subj == self.comments[i].lower(): |
|
262 | 262 | del self.comments[i] |
|
263 | 263 | self.message = self.message[2:] |
|
264 | 264 | break |
|
265 | 265 | ci = 0 |
|
266 | 266 | for mi in self.message: |
|
267 | 267 | while mi != self.comments[ci]: |
|
268 | 268 | ci += 1 |
|
269 | 269 | del self.comments[ci] |
|
270 | 270 | |
|
271 | 271 | def newcommit(repo, phase, *args, **kwargs): |
|
272 | 272 | """helper dedicated to ensure a commit respect mq.secret setting |
|
273 | 273 | |
|
274 | 274 | It should be used instead of repo.commit inside the mq source for operation |
|
275 | 275 | creating new changeset. |
|
276 | 276 | """ |
|
277 | 277 | if phase is None: |
|
278 | 278 | if repo.ui.configbool('mq', 'secret', False): |
|
279 | 279 | phase = phases.secret |
|
280 | 280 | if phase is not None: |
|
281 | 281 | backup = repo.ui.backupconfig('phases', 'new-commit') |
|
282 | 282 | # Marking the repository as committing an mq patch can be used |
|
283 | 283 | # to optimize operations like _branchtags(). |
|
284 | 284 | repo._committingpatch = True |
|
285 | 285 | try: |
|
286 | 286 | if phase is not None: |
|
287 | 287 | repo.ui.setconfig('phases', 'new-commit', phase) |
|
288 | 288 | return repo.commit(*args, **kwargs) |
|
289 | 289 | finally: |
|
290 | 290 | repo._committingpatch = False |
|
291 | 291 | if phase is not None: |
|
292 | 292 | repo.ui.restoreconfig(backup) |
|
293 | 293 | |
|
294 | 294 | class AbortNoCleanup(error.Abort): |
|
295 | 295 | pass |
|
296 | 296 | |
|
297 | 297 | class queue(object): |
|
298 | 298 | def __init__(self, ui, path, patchdir=None): |
|
299 | 299 | self.basepath = path |
|
300 | 300 | try: |
|
301 | 301 | fh = open(os.path.join(path, 'patches.queue')) |
|
302 | 302 | cur = fh.read().rstrip() |
|
303 | 303 | fh.close() |
|
304 | 304 | if not cur: |
|
305 | 305 | curpath = os.path.join(path, 'patches') |
|
306 | 306 | else: |
|
307 | 307 | curpath = os.path.join(path, 'patches-' + cur) |
|
308 | 308 | except IOError: |
|
309 | 309 | curpath = os.path.join(path, 'patches') |
|
310 | 310 | self.path = patchdir or curpath |
|
311 | 311 | self.opener = scmutil.opener(self.path) |
|
312 | 312 | self.ui = ui |
|
313 | 313 | self.applieddirty = False |
|
314 | 314 | self.seriesdirty = False |
|
315 | 315 | self.added = [] |
|
316 | 316 | self.seriespath = "series" |
|
317 | 317 | self.statuspath = "status" |
|
318 | 318 | self.guardspath = "guards" |
|
319 | 319 | self.activeguards = None |
|
320 | 320 | self.guardsdirty = False |
|
321 | 321 | # Handle mq.git as a bool with extended values |
|
322 | 322 | try: |
|
323 | 323 | gitmode = ui.configbool('mq', 'git', None) |
|
324 | 324 | if gitmode is None: |
|
325 | 325 | raise error.ConfigError |
|
326 | 326 | self.gitmode = gitmode and 'yes' or 'no' |
|
327 | 327 | except error.ConfigError: |
|
328 | 328 | self.gitmode = ui.config('mq', 'git', 'auto').lower() |
|
329 | 329 | self.plainmode = ui.configbool('mq', 'plain', False) |
|
330 | 330 | |
|
331 | 331 | @util.propertycache |
|
332 | 332 | def applied(self): |
|
333 | 333 | def parselines(lines): |
|
334 | 334 | for l in lines: |
|
335 | 335 | entry = l.split(':', 1) |
|
336 | 336 | if len(entry) > 1: |
|
337 | 337 | n, name = entry |
|
338 | 338 | yield statusentry(bin(n), name) |
|
339 | 339 | elif l.strip(): |
|
340 | 340 | self.ui.warn(_('malformated mq status line: %s\n') % entry) |
|
341 | 341 | # else we ignore empty lines |
|
342 | 342 | try: |
|
343 | 343 | lines = self.opener.read(self.statuspath).splitlines() |
|
344 | 344 | return list(parselines(lines)) |
|
345 | 345 | except IOError, e: |
|
346 | 346 | if e.errno == errno.ENOENT: |
|
347 | 347 | return [] |
|
348 | 348 | raise |
|
349 | 349 | |
|
350 | 350 | @util.propertycache |
|
351 | 351 | def fullseries(self): |
|
352 | 352 | try: |
|
353 | 353 | return self.opener.read(self.seriespath).splitlines() |
|
354 | 354 | except IOError, e: |
|
355 | 355 | if e.errno == errno.ENOENT: |
|
356 | 356 | return [] |
|
357 | 357 | raise |
|
358 | 358 | |
|
359 | 359 | @util.propertycache |
|
360 | 360 | def series(self): |
|
361 | 361 | self.parseseries() |
|
362 | 362 | return self.series |
|
363 | 363 | |
|
364 | 364 | @util.propertycache |
|
365 | 365 | def seriesguards(self): |
|
366 | 366 | self.parseseries() |
|
367 | 367 | return self.seriesguards |
|
368 | 368 | |
|
369 | 369 | def invalidate(self): |
|
370 | 370 | for a in 'applied fullseries series seriesguards'.split(): |
|
371 | 371 | if a in self.__dict__: |
|
372 | 372 | delattr(self, a) |
|
373 | 373 | self.applieddirty = False |
|
374 | 374 | self.seriesdirty = False |
|
375 | 375 | self.guardsdirty = False |
|
376 | 376 | self.activeguards = None |
|
377 | 377 | |
|
378 | 378 | def diffopts(self, opts={}, patchfn=None): |
|
379 | 379 | diffopts = patchmod.diffopts(self.ui, opts) |
|
380 | 380 | if self.gitmode == 'auto': |
|
381 | 381 | diffopts.upgrade = True |
|
382 | 382 | elif self.gitmode == 'keep': |
|
383 | 383 | pass |
|
384 | 384 | elif self.gitmode in ('yes', 'no'): |
|
385 | 385 | diffopts.git = self.gitmode == 'yes' |
|
386 | 386 | else: |
|
387 | 387 | raise util.Abort(_('mq.git option can be auto/keep/yes/no' |
|
388 | 388 | ' got %s') % self.gitmode) |
|
389 | 389 | if patchfn: |
|
390 | 390 | diffopts = self.patchopts(diffopts, patchfn) |
|
391 | 391 | return diffopts |
|
392 | 392 | |
|
393 | 393 | def patchopts(self, diffopts, *patches): |
|
394 | 394 | """Return a copy of input diff options with git set to true if |
|
395 | 395 | referenced patch is a git patch and should be preserved as such. |
|
396 | 396 | """ |
|
397 | 397 | diffopts = diffopts.copy() |
|
398 | 398 | if not diffopts.git and self.gitmode == 'keep': |
|
399 | 399 | for patchfn in patches: |
|
400 | 400 | patchf = self.opener(patchfn, 'r') |
|
401 | 401 | # if the patch was a git patch, refresh it as a git patch |
|
402 | 402 | for line in patchf: |
|
403 | 403 | if line.startswith('diff --git'): |
|
404 | 404 | diffopts.git = True |
|
405 | 405 | break |
|
406 | 406 | patchf.close() |
|
407 | 407 | return diffopts |
|
408 | 408 | |
|
409 | 409 | def join(self, *p): |
|
410 | 410 | return os.path.join(self.path, *p) |
|
411 | 411 | |
|
412 | 412 | def findseries(self, patch): |
|
413 | 413 | def matchpatch(l): |
|
414 | 414 | l = l.split('#', 1)[0] |
|
415 | 415 | return l.strip() == patch |
|
416 | 416 | for index, l in enumerate(self.fullseries): |
|
417 | 417 | if matchpatch(l): |
|
418 | 418 | return index |
|
419 | 419 | return None |
|
420 | 420 | |
|
421 | 421 | guard_re = re.compile(r'\s?#([-+][^-+# \t\r\n\f][^# \t\r\n\f]*)') |
|
422 | 422 | |
|
423 | 423 | def parseseries(self): |
|
424 | 424 | self.series = [] |
|
425 | 425 | self.seriesguards = [] |
|
426 | 426 | for l in self.fullseries: |
|
427 | 427 | h = l.find('#') |
|
428 | 428 | if h == -1: |
|
429 | 429 | patch = l |
|
430 | 430 | comment = '' |
|
431 | 431 | elif h == 0: |
|
432 | 432 | continue |
|
433 | 433 | else: |
|
434 | 434 | patch = l[:h] |
|
435 | 435 | comment = l[h:] |
|
436 | 436 | patch = patch.strip() |
|
437 | 437 | if patch: |
|
438 | 438 | if patch in self.series: |
|
439 | 439 | raise util.Abort(_('%s appears more than once in %s') % |
|
440 | 440 | (patch, self.join(self.seriespath))) |
|
441 | 441 | self.series.append(patch) |
|
442 | 442 | self.seriesguards.append(self.guard_re.findall(comment)) |
|
443 | 443 | |
|
444 | 444 | def checkguard(self, guard): |
|
445 | 445 | if not guard: |
|
446 | 446 | return _('guard cannot be an empty string') |
|
447 | 447 | bad_chars = '# \t\r\n\f' |
|
448 | 448 | first = guard[0] |
|
449 | 449 | if first in '-+': |
|
450 | 450 | return (_('guard %r starts with invalid character: %r') % |
|
451 | 451 | (guard, first)) |
|
452 | 452 | for c in bad_chars: |
|
453 | 453 | if c in guard: |
|
454 | 454 | return _('invalid character in guard %r: %r') % (guard, c) |
|
455 | 455 | |
|
456 | 456 | def setactive(self, guards): |
|
457 | 457 | for guard in guards: |
|
458 | 458 | bad = self.checkguard(guard) |
|
459 | 459 | if bad: |
|
460 | 460 | raise util.Abort(bad) |
|
461 | 461 | guards = sorted(set(guards)) |
|
462 | 462 | self.ui.debug('active guards: %s\n' % ' '.join(guards)) |
|
463 | 463 | self.activeguards = guards |
|
464 | 464 | self.guardsdirty = True |
|
465 | 465 | |
|
466 | 466 | def active(self): |
|
467 | 467 | if self.activeguards is None: |
|
468 | 468 | self.activeguards = [] |
|
469 | 469 | try: |
|
470 | 470 | guards = self.opener.read(self.guardspath).split() |
|
471 | 471 | except IOError, err: |
|
472 | 472 | if err.errno != errno.ENOENT: |
|
473 | 473 | raise |
|
474 | 474 | guards = [] |
|
475 | 475 | for i, guard in enumerate(guards): |
|
476 | 476 | bad = self.checkguard(guard) |
|
477 | 477 | if bad: |
|
478 | 478 | self.ui.warn('%s:%d: %s\n' % |
|
479 | 479 | (self.join(self.guardspath), i + 1, bad)) |
|
480 | 480 | else: |
|
481 | 481 | self.activeguards.append(guard) |
|
482 | 482 | return self.activeguards |
|
483 | 483 | |
|
484 | 484 | def setguards(self, idx, guards): |
|
485 | 485 | for g in guards: |
|
486 | 486 | if len(g) < 2: |
|
487 | 487 | raise util.Abort(_('guard %r too short') % g) |
|
488 | 488 | if g[0] not in '-+': |
|
489 | 489 | raise util.Abort(_('guard %r starts with invalid char') % g) |
|
490 | 490 | bad = self.checkguard(g[1:]) |
|
491 | 491 | if bad: |
|
492 | 492 | raise util.Abort(bad) |
|
493 | 493 | drop = self.guard_re.sub('', self.fullseries[idx]) |
|
494 | 494 | self.fullseries[idx] = drop + ''.join([' #' + g for g in guards]) |
|
495 | 495 | self.parseseries() |
|
496 | 496 | self.seriesdirty = True |
|
497 | 497 | |
|
498 | 498 | def pushable(self, idx): |
|
499 | 499 | if isinstance(idx, str): |
|
500 | 500 | idx = self.series.index(idx) |
|
501 | 501 | patchguards = self.seriesguards[idx] |
|
502 | 502 | if not patchguards: |
|
503 | 503 | return True, None |
|
504 | 504 | guards = self.active() |
|
505 | 505 | exactneg = [g for g in patchguards if g[0] == '-' and g[1:] in guards] |
|
506 | 506 | if exactneg: |
|
507 | 507 | return False, repr(exactneg[0]) |
|
508 | 508 | pos = [g for g in patchguards if g[0] == '+'] |
|
509 | 509 | exactpos = [g for g in pos if g[1:] in guards] |
|
510 | 510 | if pos: |
|
511 | 511 | if exactpos: |
|
512 | 512 | return True, repr(exactpos[0]) |
|
513 | 513 | return False, ' '.join(map(repr, pos)) |
|
514 | 514 | return True, '' |
|
515 | 515 | |
|
516 | 516 | def explainpushable(self, idx, all_patches=False): |
|
517 | 517 | write = all_patches and self.ui.write or self.ui.warn |
|
518 | 518 | if all_patches or self.ui.verbose: |
|
519 | 519 | if isinstance(idx, str): |
|
520 | 520 | idx = self.series.index(idx) |
|
521 | 521 | pushable, why = self.pushable(idx) |
|
522 | 522 | if all_patches and pushable: |
|
523 | 523 | if why is None: |
|
524 | 524 | write(_('allowing %s - no guards in effect\n') % |
|
525 | 525 | self.series[idx]) |
|
526 | 526 | else: |
|
527 | 527 | if not why: |
|
528 | 528 | write(_('allowing %s - no matching negative guards\n') % |
|
529 | 529 | self.series[idx]) |
|
530 | 530 | else: |
|
531 | 531 | write(_('allowing %s - guarded by %s\n') % |
|
532 | 532 | (self.series[idx], why)) |
|
533 | 533 | if not pushable: |
|
534 | 534 | if why: |
|
535 | 535 | write(_('skipping %s - guarded by %s\n') % |
|
536 | 536 | (self.series[idx], why)) |
|
537 | 537 | else: |
|
538 | 538 | write(_('skipping %s - no matching guards\n') % |
|
539 | 539 | self.series[idx]) |
|
540 | 540 | |
|
541 | 541 | def savedirty(self): |
|
542 | 542 | def writelist(items, path): |
|
543 | 543 | fp = self.opener(path, 'w') |
|
544 | 544 | for i in items: |
|
545 | 545 | fp.write("%s\n" % i) |
|
546 | 546 | fp.close() |
|
547 | 547 | if self.applieddirty: |
|
548 | 548 | writelist(map(str, self.applied), self.statuspath) |
|
549 | 549 | self.applieddirty = False |
|
550 | 550 | if self.seriesdirty: |
|
551 | 551 | writelist(self.fullseries, self.seriespath) |
|
552 | 552 | self.seriesdirty = False |
|
553 | 553 | if self.guardsdirty: |
|
554 | 554 | writelist(self.activeguards, self.guardspath) |
|
555 | 555 | self.guardsdirty = False |
|
556 | 556 | if self.added: |
|
557 | 557 | qrepo = self.qrepo() |
|
558 | 558 | if qrepo: |
|
559 | 559 | qrepo[None].add(f for f in self.added if f not in qrepo[None]) |
|
560 | 560 | self.added = [] |
|
561 | 561 | |
|
562 | 562 | def removeundo(self, repo): |
|
563 | 563 | undo = repo.sjoin('undo') |
|
564 | 564 | if not os.path.exists(undo): |
|
565 | 565 | return |
|
566 | 566 | try: |
|
567 | 567 | os.unlink(undo) |
|
568 | 568 | except OSError, inst: |
|
569 | 569 | self.ui.warn(_('error removing undo: %s\n') % str(inst)) |
|
570 | 570 | |
|
571 | 571 | def backup(self, repo, files, copy=False): |
|
572 | 572 | # backup local changes in --force case |
|
573 | 573 | for f in sorted(files): |
|
574 | 574 | absf = repo.wjoin(f) |
|
575 | 575 | if os.path.lexists(absf): |
|
576 | 576 | self.ui.note(_('saving current version of %s as %s\n') % |
|
577 | 577 | (f, f + '.orig')) |
|
578 | 578 | if copy: |
|
579 | 579 | util.copyfile(absf, absf + '.orig') |
|
580 | 580 | else: |
|
581 | 581 | util.rename(absf, absf + '.orig') |
|
582 | 582 | |
|
583 | 583 | def printdiff(self, repo, diffopts, node1, node2=None, files=None, |
|
584 | 584 | fp=None, changes=None, opts={}): |
|
585 | 585 | stat = opts.get('stat') |
|
586 | 586 | m = scmutil.match(repo[node1], files, opts) |
|
587 | 587 | cmdutil.diffordiffstat(self.ui, repo, diffopts, node1, node2, m, |
|
588 | 588 | changes, stat, fp) |
|
589 | 589 | |
|
590 | 590 | def mergeone(self, repo, mergeq, head, patch, rev, diffopts): |
|
591 | 591 | # first try just applying the patch |
|
592 | 592 | (err, n) = self.apply(repo, [patch], update_status=False, |
|
593 | 593 | strict=True, merge=rev) |
|
594 | 594 | |
|
595 | 595 | if err == 0: |
|
596 | 596 | return (err, n) |
|
597 | 597 | |
|
598 | 598 | if n is None: |
|
599 | 599 | raise util.Abort(_("apply failed for patch %s") % patch) |
|
600 | 600 | |
|
601 | 601 | self.ui.warn(_("patch didn't work out, merging %s\n") % patch) |
|
602 | 602 | |
|
603 | 603 | # apply failed, strip away that rev and merge. |
|
604 | 604 | hg.clean(repo, head) |
|
605 | 605 | self.strip(repo, [n], update=False, backup='strip') |
|
606 | 606 | |
|
607 | 607 | ctx = repo[rev] |
|
608 | 608 | ret = hg.merge(repo, rev) |
|
609 | 609 | if ret: |
|
610 | 610 | raise util.Abort(_("update returned %d") % ret) |
|
611 | 611 | n = newcommit(repo, None, ctx.description(), ctx.user(), force=True) |
|
612 | 612 | if n is None: |
|
613 | 613 | raise util.Abort(_("repo commit failed")) |
|
614 | 614 | try: |
|
615 | 615 | ph = patchheader(mergeq.join(patch), self.plainmode) |
|
616 | 616 | except Exception: |
|
617 | 617 | raise util.Abort(_("unable to read %s") % patch) |
|
618 | 618 | |
|
619 | 619 | diffopts = self.patchopts(diffopts, patch) |
|
620 | 620 | patchf = self.opener(patch, "w") |
|
621 | 621 | comments = str(ph) |
|
622 | 622 | if comments: |
|
623 | 623 | patchf.write(comments) |
|
624 | 624 | self.printdiff(repo, diffopts, head, n, fp=patchf) |
|
625 | 625 | patchf.close() |
|
626 | 626 | self.removeundo(repo) |
|
627 | 627 | return (0, n) |
|
628 | 628 | |
|
629 | 629 | def qparents(self, repo, rev=None): |
|
630 | 630 | if rev is None: |
|
631 | 631 | (p1, p2) = repo.dirstate.parents() |
|
632 | 632 | if p2 == nullid: |
|
633 | 633 | return p1 |
|
634 | 634 | if not self.applied: |
|
635 | 635 | return None |
|
636 | 636 | return self.applied[-1].node |
|
637 | 637 | p1, p2 = repo.changelog.parents(rev) |
|
638 | 638 | if p2 != nullid and p2 in [x.node for x in self.applied]: |
|
639 | 639 | return p2 |
|
640 | 640 | return p1 |
|
641 | 641 | |
|
642 | 642 | def mergepatch(self, repo, mergeq, series, diffopts): |
|
643 | 643 | if not self.applied: |
|
644 | 644 | # each of the patches merged in will have two parents. This |
|
645 | 645 | # can confuse the qrefresh, qdiff, and strip code because it |
|
646 | 646 | # needs to know which parent is actually in the patch queue. |
|
647 | 647 | # so, we insert a merge marker with only one parent. This way |
|
648 | 648 | # the first patch in the queue is never a merge patch |
|
649 | 649 | # |
|
650 | 650 | pname = ".hg.patches.merge.marker" |
|
651 | 651 | n = newcommit(repo, None, '[mq]: merge marker', force=True) |
|
652 | 652 | self.removeundo(repo) |
|
653 | 653 | self.applied.append(statusentry(n, pname)) |
|
654 | 654 | self.applieddirty = True |
|
655 | 655 | |
|
656 | 656 | head = self.qparents(repo) |
|
657 | 657 | |
|
658 | 658 | for patch in series: |
|
659 | 659 | patch = mergeq.lookup(patch, strict=True) |
|
660 | 660 | if not patch: |
|
661 | 661 | self.ui.warn(_("patch %s does not exist\n") % patch) |
|
662 | 662 | return (1, None) |
|
663 | 663 | pushable, reason = self.pushable(patch) |
|
664 | 664 | if not pushable: |
|
665 | 665 | self.explainpushable(patch, all_patches=True) |
|
666 | 666 | continue |
|
667 | 667 | info = mergeq.isapplied(patch) |
|
668 | 668 | if not info: |
|
669 | 669 | self.ui.warn(_("patch %s is not applied\n") % patch) |
|
670 | 670 | return (1, None) |
|
671 | 671 | rev = info[1] |
|
672 | 672 | err, head = self.mergeone(repo, mergeq, head, patch, rev, diffopts) |
|
673 | 673 | if head: |
|
674 | 674 | self.applied.append(statusentry(head, patch)) |
|
675 | 675 | self.applieddirty = True |
|
676 | 676 | if err: |
|
677 | 677 | return (err, head) |
|
678 | 678 | self.savedirty() |
|
679 | 679 | return (0, head) |
|
680 | 680 | |
|
681 | 681 | def patch(self, repo, patchfile): |
|
682 | 682 | '''Apply patchfile to the working directory. |
|
683 | 683 | patchfile: name of patch file''' |
|
684 | 684 | files = set() |
|
685 | 685 | try: |
|
686 | 686 | fuzz = patchmod.patch(self.ui, repo, patchfile, strip=1, |
|
687 | 687 | files=files, eolmode=None) |
|
688 | 688 | return (True, list(files), fuzz) |
|
689 | 689 | except Exception, inst: |
|
690 | 690 | self.ui.note(str(inst) + '\n') |
|
691 | 691 | if not self.ui.verbose: |
|
692 | 692 | self.ui.warn(_("patch failed, unable to continue (try -v)\n")) |
|
693 | 693 | self.ui.traceback() |
|
694 | 694 | return (False, list(files), False) |
|
695 | 695 | |
|
696 | 696 | def apply(self, repo, series, list=False, update_status=True, |
|
697 | 697 | strict=False, patchdir=None, merge=None, all_files=None, |
|
698 | 698 | tobackup=None, check=False): |
|
699 | 699 | wlock = lock = tr = None |
|
700 | 700 | try: |
|
701 | 701 | wlock = repo.wlock() |
|
702 | 702 | lock = repo.lock() |
|
703 | 703 | tr = repo.transaction("qpush") |
|
704 | 704 | try: |
|
705 | 705 | ret = self._apply(repo, series, list, update_status, |
|
706 | 706 | strict, patchdir, merge, all_files=all_files, |
|
707 | 707 | tobackup=tobackup, check=check) |
|
708 | 708 | tr.close() |
|
709 | 709 | self.savedirty() |
|
710 | 710 | return ret |
|
711 | 711 | except AbortNoCleanup: |
|
712 | 712 | tr.close() |
|
713 | 713 | self.savedirty() |
|
714 | 714 | return 2, repo.dirstate.p1() |
|
715 | except: | |
|
715 | except: # re-raises | |
|
716 | 716 | try: |
|
717 | 717 | tr.abort() |
|
718 | 718 | finally: |
|
719 | 719 | repo.invalidate() |
|
720 | 720 | repo.dirstate.invalidate() |
|
721 | 721 | self.invalidate() |
|
722 | 722 | raise |
|
723 | 723 | finally: |
|
724 | 724 | release(tr, lock, wlock) |
|
725 | 725 | self.removeundo(repo) |
|
726 | 726 | |
|
727 | 727 | def _apply(self, repo, series, list=False, update_status=True, |
|
728 | 728 | strict=False, patchdir=None, merge=None, all_files=None, |
|
729 | 729 | tobackup=None, check=False): |
|
730 | 730 | """returns (error, hash) |
|
731 | 731 | |
|
732 | 732 | error = 1 for unable to read, 2 for patch failed, 3 for patch |
|
733 | 733 | fuzz. tobackup is None or a set of files to backup before they |
|
734 | 734 | are modified by a patch. |
|
735 | 735 | """ |
|
736 | 736 | # TODO unify with commands.py |
|
737 | 737 | if not patchdir: |
|
738 | 738 | patchdir = self.path |
|
739 | 739 | err = 0 |
|
740 | 740 | n = None |
|
741 | 741 | for patchname in series: |
|
742 | 742 | pushable, reason = self.pushable(patchname) |
|
743 | 743 | if not pushable: |
|
744 | 744 | self.explainpushable(patchname, all_patches=True) |
|
745 | 745 | continue |
|
746 | 746 | self.ui.status(_("applying %s\n") % patchname) |
|
747 | 747 | pf = os.path.join(patchdir, patchname) |
|
748 | 748 | |
|
749 | 749 | try: |
|
750 | 750 | ph = patchheader(self.join(patchname), self.plainmode) |
|
751 | 751 | except IOError: |
|
752 | 752 | self.ui.warn(_("unable to read %s\n") % patchname) |
|
753 | 753 | err = 1 |
|
754 | 754 | break |
|
755 | 755 | |
|
756 | 756 | message = ph.message |
|
757 | 757 | if not message: |
|
758 | 758 | # The commit message should not be translated |
|
759 | 759 | message = "imported patch %s\n" % patchname |
|
760 | 760 | else: |
|
761 | 761 | if list: |
|
762 | 762 | # The commit message should not be translated |
|
763 | 763 | message.append("\nimported patch %s" % patchname) |
|
764 | 764 | message = '\n'.join(message) |
|
765 | 765 | |
|
766 | 766 | if ph.haspatch: |
|
767 | 767 | if tobackup: |
|
768 | 768 | touched = patchmod.changedfiles(self.ui, repo, pf) |
|
769 | 769 | touched = set(touched) & tobackup |
|
770 | 770 | if touched and check: |
|
771 | 771 | raise AbortNoCleanup( |
|
772 | 772 | _("local changes found, refresh first")) |
|
773 | 773 | self.backup(repo, touched, copy=True) |
|
774 | 774 | tobackup = tobackup - touched |
|
775 | 775 | (patcherr, files, fuzz) = self.patch(repo, pf) |
|
776 | 776 | if all_files is not None: |
|
777 | 777 | all_files.update(files) |
|
778 | 778 | patcherr = not patcherr |
|
779 | 779 | else: |
|
780 | 780 | self.ui.warn(_("patch %s is empty\n") % patchname) |
|
781 | 781 | patcherr, files, fuzz = 0, [], 0 |
|
782 | 782 | |
|
783 | 783 | if merge and files: |
|
784 | 784 | # Mark as removed/merged and update dirstate parent info |
|
785 | 785 | removed = [] |
|
786 | 786 | merged = [] |
|
787 | 787 | for f in files: |
|
788 | 788 | if os.path.lexists(repo.wjoin(f)): |
|
789 | 789 | merged.append(f) |
|
790 | 790 | else: |
|
791 | 791 | removed.append(f) |
|
792 | 792 | for f in removed: |
|
793 | 793 | repo.dirstate.remove(f) |
|
794 | 794 | for f in merged: |
|
795 | 795 | repo.dirstate.merge(f) |
|
796 | 796 | p1, p2 = repo.dirstate.parents() |
|
797 | 797 | repo.setparents(p1, merge) |
|
798 | 798 | |
|
799 | 799 | match = scmutil.matchfiles(repo, files or []) |
|
800 | 800 | oldtip = repo['tip'] |
|
801 | 801 | n = newcommit(repo, None, message, ph.user, ph.date, match=match, |
|
802 | 802 | force=True) |
|
803 | 803 | if repo['tip'] == oldtip: |
|
804 | 804 | raise util.Abort(_("qpush exactly duplicates child changeset")) |
|
805 | 805 | if n is None: |
|
806 | 806 | raise util.Abort(_("repository commit failed")) |
|
807 | 807 | |
|
808 | 808 | if update_status: |
|
809 | 809 | self.applied.append(statusentry(n, patchname)) |
|
810 | 810 | |
|
811 | 811 | if patcherr: |
|
812 | 812 | self.ui.warn(_("patch failed, rejects left in working dir\n")) |
|
813 | 813 | err = 2 |
|
814 | 814 | break |
|
815 | 815 | |
|
816 | 816 | if fuzz and strict: |
|
817 | 817 | self.ui.warn(_("fuzz found when applying patch, stopping\n")) |
|
818 | 818 | err = 3 |
|
819 | 819 | break |
|
820 | 820 | return (err, n) |
|
821 | 821 | |
|
822 | 822 | def _cleanup(self, patches, numrevs, keep=False): |
|
823 | 823 | if not keep: |
|
824 | 824 | r = self.qrepo() |
|
825 | 825 | if r: |
|
826 | 826 | r[None].forget(patches) |
|
827 | 827 | for p in patches: |
|
828 | 828 | os.unlink(self.join(p)) |
|
829 | 829 | |
|
830 | 830 | qfinished = [] |
|
831 | 831 | if numrevs: |
|
832 | 832 | qfinished = self.applied[:numrevs] |
|
833 | 833 | del self.applied[:numrevs] |
|
834 | 834 | self.applieddirty = True |
|
835 | 835 | |
|
836 | 836 | unknown = [] |
|
837 | 837 | |
|
838 | 838 | for (i, p) in sorted([(self.findseries(p), p) for p in patches], |
|
839 | 839 | reverse=True): |
|
840 | 840 | if i is not None: |
|
841 | 841 | del self.fullseries[i] |
|
842 | 842 | else: |
|
843 | 843 | unknown.append(p) |
|
844 | 844 | |
|
845 | 845 | if unknown: |
|
846 | 846 | if numrevs: |
|
847 | 847 | rev = dict((entry.name, entry.node) for entry in qfinished) |
|
848 | 848 | for p in unknown: |
|
849 | 849 | msg = _('revision %s refers to unknown patches: %s\n') |
|
850 | 850 | self.ui.warn(msg % (short(rev[p]), p)) |
|
851 | 851 | else: |
|
852 | 852 | msg = _('unknown patches: %s\n') |
|
853 | 853 | raise util.Abort(''.join(msg % p for p in unknown)) |
|
854 | 854 | |
|
855 | 855 | self.parseseries() |
|
856 | 856 | self.seriesdirty = True |
|
857 | 857 | return [entry.node for entry in qfinished] |
|
858 | 858 | |
|
859 | 859 | def _revpatches(self, repo, revs): |
|
860 | 860 | firstrev = repo[self.applied[0].node].rev() |
|
861 | 861 | patches = [] |
|
862 | 862 | for i, rev in enumerate(revs): |
|
863 | 863 | |
|
864 | 864 | if rev < firstrev: |
|
865 | 865 | raise util.Abort(_('revision %d is not managed') % rev) |
|
866 | 866 | |
|
867 | 867 | ctx = repo[rev] |
|
868 | 868 | base = self.applied[i].node |
|
869 | 869 | if ctx.node() != base: |
|
870 | 870 | msg = _('cannot delete revision %d above applied patches') |
|
871 | 871 | raise util.Abort(msg % rev) |
|
872 | 872 | |
|
873 | 873 | patch = self.applied[i].name |
|
874 | 874 | for fmt in ('[mq]: %s', 'imported patch %s'): |
|
875 | 875 | if ctx.description() == fmt % patch: |
|
876 | 876 | msg = _('patch %s finalized without changeset message\n') |
|
877 | 877 | repo.ui.status(msg % patch) |
|
878 | 878 | break |
|
879 | 879 | |
|
880 | 880 | patches.append(patch) |
|
881 | 881 | return patches |
|
882 | 882 | |
|
883 | 883 | def finish(self, repo, revs): |
|
884 | 884 | # Manually trigger phase computation to ensure phasedefaults is |
|
885 | 885 | # executed before we remove the patches. |
|
886 | 886 | repo._phasecache |
|
887 | 887 | patches = self._revpatches(repo, sorted(revs)) |
|
888 | 888 | qfinished = self._cleanup(patches, len(patches)) |
|
889 | 889 | if qfinished and repo.ui.configbool('mq', 'secret', False): |
|
890 | 890 | # only use this logic when the secret option is added |
|
891 | 891 | oldqbase = repo[qfinished[0]] |
|
892 | 892 | tphase = repo.ui.config('phases', 'new-commit', phases.draft) |
|
893 | 893 | if oldqbase.phase() > tphase and oldqbase.p1().phase() <= tphase: |
|
894 | 894 | phases.advanceboundary(repo, tphase, qfinished) |
|
895 | 895 | |
|
896 | 896 | def delete(self, repo, patches, opts): |
|
897 | 897 | if not patches and not opts.get('rev'): |
|
898 | 898 | raise util.Abort(_('qdelete requires at least one revision or ' |
|
899 | 899 | 'patch name')) |
|
900 | 900 | |
|
901 | 901 | realpatches = [] |
|
902 | 902 | for patch in patches: |
|
903 | 903 | patch = self.lookup(patch, strict=True) |
|
904 | 904 | info = self.isapplied(patch) |
|
905 | 905 | if info: |
|
906 | 906 | raise util.Abort(_("cannot delete applied patch %s") % patch) |
|
907 | 907 | if patch not in self.series: |
|
908 | 908 | raise util.Abort(_("patch %s not in series file") % patch) |
|
909 | 909 | if patch not in realpatches: |
|
910 | 910 | realpatches.append(patch) |
|
911 | 911 | |
|
912 | 912 | numrevs = 0 |
|
913 | 913 | if opts.get('rev'): |
|
914 | 914 | if not self.applied: |
|
915 | 915 | raise util.Abort(_('no patches applied')) |
|
916 | 916 | revs = scmutil.revrange(repo, opts.get('rev')) |
|
917 | 917 | if len(revs) > 1 and revs[0] > revs[1]: |
|
918 | 918 | revs.reverse() |
|
919 | 919 | revpatches = self._revpatches(repo, revs) |
|
920 | 920 | realpatches += revpatches |
|
921 | 921 | numrevs = len(revpatches) |
|
922 | 922 | |
|
923 | 923 | self._cleanup(realpatches, numrevs, opts.get('keep')) |
|
924 | 924 | |
|
925 | 925 | def checktoppatch(self, repo): |
|
926 | 926 | if self.applied: |
|
927 | 927 | top = self.applied[-1].node |
|
928 | 928 | patch = self.applied[-1].name |
|
929 | 929 | pp = repo.dirstate.parents() |
|
930 | 930 | if top not in pp: |
|
931 | 931 | raise util.Abort(_("working directory revision is not qtip")) |
|
932 | 932 | return top, patch |
|
933 | 933 | return None, None |
|
934 | 934 | |
|
935 | 935 | def checksubstate(self, repo): |
|
936 | 936 | '''return list of subrepos at a different revision than substate. |
|
937 | 937 | Abort if any subrepos have uncommitted changes.''' |
|
938 | 938 | inclsubs = [] |
|
939 | 939 | wctx = repo[None] |
|
940 | 940 | for s in wctx.substate: |
|
941 | 941 | if wctx.sub(s).dirty(True): |
|
942 | 942 | raise util.Abort( |
|
943 | 943 | _("uncommitted changes in subrepository %s") % s) |
|
944 | 944 | elif wctx.sub(s).dirty(): |
|
945 | 945 | inclsubs.append(s) |
|
946 | 946 | return inclsubs |
|
947 | 947 | |
|
948 | 948 | def localchangesfound(self, refresh=True): |
|
949 | 949 | if refresh: |
|
950 | 950 | raise util.Abort(_("local changes found, refresh first")) |
|
951 | 951 | else: |
|
952 | 952 | raise util.Abort(_("local changes found")) |
|
953 | 953 | |
|
954 | 954 | def checklocalchanges(self, repo, force=False, refresh=True): |
|
955 | 955 | m, a, r, d = repo.status()[:4] |
|
956 | 956 | if (m or a or r or d) and not force: |
|
957 | 957 | self.localchangesfound(refresh) |
|
958 | 958 | return m, a, r, d |
|
959 | 959 | |
|
960 | 960 | _reserved = ('series', 'status', 'guards', '.', '..') |
|
961 | 961 | def checkreservedname(self, name): |
|
962 | 962 | if name in self._reserved: |
|
963 | 963 | raise util.Abort(_('"%s" cannot be used as the name of a patch') |
|
964 | 964 | % name) |
|
965 | 965 | for prefix in ('.hg', '.mq'): |
|
966 | 966 | if name.startswith(prefix): |
|
967 | 967 | raise util.Abort(_('patch name cannot begin with "%s"') |
|
968 | 968 | % prefix) |
|
969 | 969 | for c in ('#', ':'): |
|
970 | 970 | if c in name: |
|
971 | 971 | raise util.Abort(_('"%s" cannot be used in the name of a patch') |
|
972 | 972 | % c) |
|
973 | 973 | |
|
974 | 974 | def checkpatchname(self, name, force=False): |
|
975 | 975 | self.checkreservedname(name) |
|
976 | 976 | if not force and os.path.exists(self.join(name)): |
|
977 | 977 | if os.path.isdir(self.join(name)): |
|
978 | 978 | raise util.Abort(_('"%s" already exists as a directory') |
|
979 | 979 | % name) |
|
980 | 980 | else: |
|
981 | 981 | raise util.Abort(_('patch "%s" already exists') % name) |
|
982 | 982 | |
|
983 | 983 | def checkforcecheck(self, check, force): |
|
984 | 984 | if force and check: |
|
985 | 985 | raise util.Abort(_('cannot use both --force and --check')) |
|
986 | 986 | |
|
987 | 987 | def new(self, repo, patchfn, *pats, **opts): |
|
988 | 988 | """options: |
|
989 | 989 | msg: a string or a no-argument function returning a string |
|
990 | 990 | """ |
|
991 | 991 | msg = opts.get('msg') |
|
992 | 992 | user = opts.get('user') |
|
993 | 993 | date = opts.get('date') |
|
994 | 994 | if date: |
|
995 | 995 | date = util.parsedate(date) |
|
996 | 996 | diffopts = self.diffopts({'git': opts.get('git')}) |
|
997 | 997 | if opts.get('checkname', True): |
|
998 | 998 | self.checkpatchname(patchfn) |
|
999 | 999 | inclsubs = self.checksubstate(repo) |
|
1000 | 1000 | if inclsubs: |
|
1001 | 1001 | inclsubs.append('.hgsubstate') |
|
1002 | 1002 | substatestate = repo.dirstate['.hgsubstate'] |
|
1003 | 1003 | if opts.get('include') or opts.get('exclude') or pats: |
|
1004 | 1004 | if inclsubs: |
|
1005 | 1005 | pats = list(pats or []) + inclsubs |
|
1006 | 1006 | match = scmutil.match(repo[None], pats, opts) |
|
1007 | 1007 | # detect missing files in pats |
|
1008 | 1008 | def badfn(f, msg): |
|
1009 | 1009 | if f != '.hgsubstate': # .hgsubstate is auto-created |
|
1010 | 1010 | raise util.Abort('%s: %s' % (f, msg)) |
|
1011 | 1011 | match.bad = badfn |
|
1012 | 1012 | changes = repo.status(match=match) |
|
1013 | 1013 | m, a, r, d = changes[:4] |
|
1014 | 1014 | else: |
|
1015 | 1015 | changes = self.checklocalchanges(repo, force=True) |
|
1016 | 1016 | m, a, r, d = changes |
|
1017 | 1017 | match = scmutil.matchfiles(repo, m + a + r + inclsubs) |
|
1018 | 1018 | if len(repo[None].parents()) > 1: |
|
1019 | 1019 | raise util.Abort(_('cannot manage merge changesets')) |
|
1020 | 1020 | commitfiles = m + a + r |
|
1021 | 1021 | self.checktoppatch(repo) |
|
1022 | 1022 | insert = self.fullseriesend() |
|
1023 | 1023 | wlock = repo.wlock() |
|
1024 | 1024 | try: |
|
1025 | 1025 | try: |
|
1026 | 1026 | # if patch file write fails, abort early |
|
1027 | 1027 | p = self.opener(patchfn, "w") |
|
1028 | 1028 | except IOError, e: |
|
1029 | 1029 | raise util.Abort(_('cannot write patch "%s": %s') |
|
1030 | 1030 | % (patchfn, e.strerror)) |
|
1031 | 1031 | try: |
|
1032 | 1032 | if self.plainmode: |
|
1033 | 1033 | if user: |
|
1034 | 1034 | p.write("From: " + user + "\n") |
|
1035 | 1035 | if not date: |
|
1036 | 1036 | p.write("\n") |
|
1037 | 1037 | if date: |
|
1038 | 1038 | p.write("Date: %d %d\n\n" % date) |
|
1039 | 1039 | else: |
|
1040 | 1040 | p.write("# HG changeset patch\n") |
|
1041 | 1041 | p.write("# Parent " |
|
1042 | 1042 | + hex(repo[None].p1().node()) + "\n") |
|
1043 | 1043 | if user: |
|
1044 | 1044 | p.write("# User " + user + "\n") |
|
1045 | 1045 | if date: |
|
1046 | 1046 | p.write("# Date %s %s\n\n" % date) |
|
1047 | 1047 | if util.safehasattr(msg, '__call__'): |
|
1048 | 1048 | msg = msg() |
|
1049 | 1049 | commitmsg = msg and msg or ("[mq]: %s" % patchfn) |
|
1050 | 1050 | n = newcommit(repo, None, commitmsg, user, date, match=match, |
|
1051 | 1051 | force=True) |
|
1052 | 1052 | if n is None: |
|
1053 | 1053 | raise util.Abort(_("repo commit failed")) |
|
1054 | 1054 | try: |
|
1055 | 1055 | self.fullseries[insert:insert] = [patchfn] |
|
1056 | 1056 | self.applied.append(statusentry(n, patchfn)) |
|
1057 | 1057 | self.parseseries() |
|
1058 | 1058 | self.seriesdirty = True |
|
1059 | 1059 | self.applieddirty = True |
|
1060 | 1060 | if msg: |
|
1061 | 1061 | msg = msg + "\n\n" |
|
1062 | 1062 | p.write(msg) |
|
1063 | 1063 | if commitfiles: |
|
1064 | 1064 | parent = self.qparents(repo, n) |
|
1065 | 1065 | if inclsubs: |
|
1066 | 1066 | if substatestate in 'a?': |
|
1067 | 1067 | changes[1].append('.hgsubstate') |
|
1068 | 1068 | elif substatestate in 'r': |
|
1069 | 1069 | changes[2].append('.hgsubstate') |
|
1070 | 1070 | else: # modified |
|
1071 | 1071 | changes[0].append('.hgsubstate') |
|
1072 | 1072 | chunks = patchmod.diff(repo, node1=parent, node2=n, |
|
1073 | 1073 | changes=changes, opts=diffopts) |
|
1074 | 1074 | for chunk in chunks: |
|
1075 | 1075 | p.write(chunk) |
|
1076 | 1076 | p.close() |
|
1077 | 1077 | r = self.qrepo() |
|
1078 | 1078 | if r: |
|
1079 | 1079 | r[None].add([patchfn]) |
|
1080 | except: | |
|
1080 | except: # re-raises | |
|
1081 | 1081 | repo.rollback() |
|
1082 | 1082 | raise |
|
1083 | 1083 | except Exception: |
|
1084 | 1084 | patchpath = self.join(patchfn) |
|
1085 | 1085 | try: |
|
1086 | 1086 | os.unlink(patchpath) |
|
1087 | 1087 | except OSError: |
|
1088 | 1088 | self.ui.warn(_('error unlinking %s\n') % patchpath) |
|
1089 | 1089 | raise |
|
1090 | 1090 | self.removeundo(repo) |
|
1091 | 1091 | finally: |
|
1092 | 1092 | release(wlock) |
|
1093 | 1093 | |
|
1094 | 1094 | def strip(self, repo, revs, update=True, backup="all", force=None): |
|
1095 | 1095 | wlock = lock = None |
|
1096 | 1096 | try: |
|
1097 | 1097 | wlock = repo.wlock() |
|
1098 | 1098 | lock = repo.lock() |
|
1099 | 1099 | |
|
1100 | 1100 | if update: |
|
1101 | 1101 | self.checklocalchanges(repo, force=force, refresh=False) |
|
1102 | 1102 | urev = self.qparents(repo, revs[0]) |
|
1103 | 1103 | hg.clean(repo, urev) |
|
1104 | 1104 | repo.dirstate.write() |
|
1105 | 1105 | |
|
1106 | 1106 | repair.strip(self.ui, repo, revs, backup) |
|
1107 | 1107 | finally: |
|
1108 | 1108 | release(lock, wlock) |
|
1109 | 1109 | |
|
1110 | 1110 | def isapplied(self, patch): |
|
1111 | 1111 | """returns (index, rev, patch)""" |
|
1112 | 1112 | for i, a in enumerate(self.applied): |
|
1113 | 1113 | if a.name == patch: |
|
1114 | 1114 | return (i, a.node, a.name) |
|
1115 | 1115 | return None |
|
1116 | 1116 | |
|
1117 | 1117 | # if the exact patch name does not exist, we try a few |
|
1118 | 1118 | # variations. If strict is passed, we try only #1 |
|
1119 | 1119 | # |
|
1120 | 1120 | # 1) a number (as string) to indicate an offset in the series file |
|
1121 | 1121 | # 2) a unique substring of the patch name was given |
|
1122 | 1122 | # 3) patchname[-+]num to indicate an offset in the series file |
|
1123 | 1123 | def lookup(self, patch, strict=False): |
|
1124 | 1124 | def partialname(s): |
|
1125 | 1125 | if s in self.series: |
|
1126 | 1126 | return s |
|
1127 | 1127 | matches = [x for x in self.series if s in x] |
|
1128 | 1128 | if len(matches) > 1: |
|
1129 | 1129 | self.ui.warn(_('patch name "%s" is ambiguous:\n') % s) |
|
1130 | 1130 | for m in matches: |
|
1131 | 1131 | self.ui.warn(' %s\n' % m) |
|
1132 | 1132 | return None |
|
1133 | 1133 | if matches: |
|
1134 | 1134 | return matches[0] |
|
1135 | 1135 | if self.series and self.applied: |
|
1136 | 1136 | if s == 'qtip': |
|
1137 | 1137 | return self.series[self.seriesend(True)-1] |
|
1138 | 1138 | if s == 'qbase': |
|
1139 | 1139 | return self.series[0] |
|
1140 | 1140 | return None |
|
1141 | 1141 | |
|
1142 | 1142 | if patch in self.series: |
|
1143 | 1143 | return patch |
|
1144 | 1144 | |
|
1145 | 1145 | if not os.path.isfile(self.join(patch)): |
|
1146 | 1146 | try: |
|
1147 | 1147 | sno = int(patch) |
|
1148 | 1148 | except (ValueError, OverflowError): |
|
1149 | 1149 | pass |
|
1150 | 1150 | else: |
|
1151 | 1151 | if -len(self.series) <= sno < len(self.series): |
|
1152 | 1152 | return self.series[sno] |
|
1153 | 1153 | |
|
1154 | 1154 | if not strict: |
|
1155 | 1155 | res = partialname(patch) |
|
1156 | 1156 | if res: |
|
1157 | 1157 | return res |
|
1158 | 1158 | minus = patch.rfind('-') |
|
1159 | 1159 | if minus >= 0: |
|
1160 | 1160 | res = partialname(patch[:minus]) |
|
1161 | 1161 | if res: |
|
1162 | 1162 | i = self.series.index(res) |
|
1163 | 1163 | try: |
|
1164 | 1164 | off = int(patch[minus + 1:] or 1) |
|
1165 | 1165 | except (ValueError, OverflowError): |
|
1166 | 1166 | pass |
|
1167 | 1167 | else: |
|
1168 | 1168 | if i - off >= 0: |
|
1169 | 1169 | return self.series[i - off] |
|
1170 | 1170 | plus = patch.rfind('+') |
|
1171 | 1171 | if plus >= 0: |
|
1172 | 1172 | res = partialname(patch[:plus]) |
|
1173 | 1173 | if res: |
|
1174 | 1174 | i = self.series.index(res) |
|
1175 | 1175 | try: |
|
1176 | 1176 | off = int(patch[plus + 1:] or 1) |
|
1177 | 1177 | except (ValueError, OverflowError): |
|
1178 | 1178 | pass |
|
1179 | 1179 | else: |
|
1180 | 1180 | if i + off < len(self.series): |
|
1181 | 1181 | return self.series[i + off] |
|
1182 | 1182 | raise util.Abort(_("patch %s not in series") % patch) |
|
1183 | 1183 | |
|
1184 | 1184 | def push(self, repo, patch=None, force=False, list=False, mergeq=None, |
|
1185 | 1185 | all=False, move=False, exact=False, nobackup=False, check=False): |
|
1186 | 1186 | self.checkforcecheck(check, force) |
|
1187 | 1187 | diffopts = self.diffopts() |
|
1188 | 1188 | wlock = repo.wlock() |
|
1189 | 1189 | try: |
|
1190 | 1190 | heads = [] |
|
1191 | 1191 | for b, ls in repo.branchmap().iteritems(): |
|
1192 | 1192 | heads += ls |
|
1193 | 1193 | if not heads: |
|
1194 | 1194 | heads = [nullid] |
|
1195 | 1195 | if repo.dirstate.p1() not in heads and not exact: |
|
1196 | 1196 | self.ui.status(_("(working directory not at a head)\n")) |
|
1197 | 1197 | |
|
1198 | 1198 | if not self.series: |
|
1199 | 1199 | self.ui.warn(_('no patches in series\n')) |
|
1200 | 1200 | return 0 |
|
1201 | 1201 | |
|
1202 | 1202 | # Suppose our series file is: A B C and the current 'top' |
|
1203 | 1203 | # patch is B. qpush C should be performed (moving forward) |
|
1204 | 1204 | # qpush B is a NOP (no change) qpush A is an error (can't |
|
1205 | 1205 | # go backwards with qpush) |
|
1206 | 1206 | if patch: |
|
1207 | 1207 | patch = self.lookup(patch) |
|
1208 | 1208 | info = self.isapplied(patch) |
|
1209 | 1209 | if info and info[0] >= len(self.applied) - 1: |
|
1210 | 1210 | self.ui.warn( |
|
1211 | 1211 | _('qpush: %s is already at the top\n') % patch) |
|
1212 | 1212 | return 0 |
|
1213 | 1213 | |
|
1214 | 1214 | pushable, reason = self.pushable(patch) |
|
1215 | 1215 | if pushable: |
|
1216 | 1216 | if self.series.index(patch) < self.seriesend(): |
|
1217 | 1217 | raise util.Abort( |
|
1218 | 1218 | _("cannot push to a previous patch: %s") % patch) |
|
1219 | 1219 | else: |
|
1220 | 1220 | if reason: |
|
1221 | 1221 | reason = _('guarded by %s') % reason |
|
1222 | 1222 | else: |
|
1223 | 1223 | reason = _('no matching guards') |
|
1224 | 1224 | self.ui.warn(_("cannot push '%s' - %s\n") % (patch, reason)) |
|
1225 | 1225 | return 1 |
|
1226 | 1226 | elif all: |
|
1227 | 1227 | patch = self.series[-1] |
|
1228 | 1228 | if self.isapplied(patch): |
|
1229 | 1229 | self.ui.warn(_('all patches are currently applied\n')) |
|
1230 | 1230 | return 0 |
|
1231 | 1231 | |
|
1232 | 1232 | # Following the above example, starting at 'top' of B: |
|
1233 | 1233 | # qpush should be performed (pushes C), but a subsequent |
|
1234 | 1234 | # qpush without an argument is an error (nothing to |
|
1235 | 1235 | # apply). This allows a loop of "...while hg qpush..." to |
|
1236 | 1236 | # work as it detects an error when done |
|
1237 | 1237 | start = self.seriesend() |
|
1238 | 1238 | if start == len(self.series): |
|
1239 | 1239 | self.ui.warn(_('patch series already fully applied\n')) |
|
1240 | 1240 | return 1 |
|
1241 | 1241 | if not force and not check: |
|
1242 | 1242 | self.checklocalchanges(repo, refresh=self.applied) |
|
1243 | 1243 | |
|
1244 | 1244 | if exact: |
|
1245 | 1245 | if check: |
|
1246 | 1246 | raise util.Abort( |
|
1247 | 1247 | _("cannot use --exact and --check together")) |
|
1248 | 1248 | if move: |
|
1249 | 1249 | raise util.Abort(_('cannot use --exact and --move ' |
|
1250 | 1250 | 'together')) |
|
1251 | 1251 | if self.applied: |
|
1252 | 1252 | raise util.Abort(_('cannot push --exact with applied ' |
|
1253 | 1253 | 'patches')) |
|
1254 | 1254 | root = self.series[start] |
|
1255 | 1255 | target = patchheader(self.join(root), self.plainmode).parent |
|
1256 | 1256 | if not target: |
|
1257 | 1257 | raise util.Abort( |
|
1258 | 1258 | _("%s does not have a parent recorded") % root) |
|
1259 | 1259 | if not repo[target] == repo['.']: |
|
1260 | 1260 | hg.update(repo, target) |
|
1261 | 1261 | |
|
1262 | 1262 | if move: |
|
1263 | 1263 | if not patch: |
|
1264 | 1264 | raise util.Abort(_("please specify the patch to move")) |
|
1265 | 1265 | for fullstart, rpn in enumerate(self.fullseries): |
|
1266 | 1266 | # strip markers for patch guards |
|
1267 | 1267 | if self.guard_re.split(rpn, 1)[0] == self.series[start]: |
|
1268 | 1268 | break |
|
1269 | 1269 | for i, rpn in enumerate(self.fullseries[fullstart:]): |
|
1270 | 1270 | # strip markers for patch guards |
|
1271 | 1271 | if self.guard_re.split(rpn, 1)[0] == patch: |
|
1272 | 1272 | break |
|
1273 | 1273 | index = fullstart + i |
|
1274 | 1274 | assert index < len(self.fullseries) |
|
1275 | 1275 | fullpatch = self.fullseries[index] |
|
1276 | 1276 | del self.fullseries[index] |
|
1277 | 1277 | self.fullseries.insert(fullstart, fullpatch) |
|
1278 | 1278 | self.parseseries() |
|
1279 | 1279 | self.seriesdirty = True |
|
1280 | 1280 | |
|
1281 | 1281 | self.applieddirty = True |
|
1282 | 1282 | if start > 0: |
|
1283 | 1283 | self.checktoppatch(repo) |
|
1284 | 1284 | if not patch: |
|
1285 | 1285 | patch = self.series[start] |
|
1286 | 1286 | end = start + 1 |
|
1287 | 1287 | else: |
|
1288 | 1288 | end = self.series.index(patch, start) + 1 |
|
1289 | 1289 | |
|
1290 | 1290 | tobackup = set() |
|
1291 | 1291 | if (not nobackup and force) or check: |
|
1292 | 1292 | m, a, r, d = self.checklocalchanges(repo, force=True) |
|
1293 | 1293 | if check: |
|
1294 | 1294 | tobackup.update(m + a + r + d) |
|
1295 | 1295 | else: |
|
1296 | 1296 | tobackup.update(m + a) |
|
1297 | 1297 | |
|
1298 | 1298 | s = self.series[start:end] |
|
1299 | 1299 | all_files = set() |
|
1300 | 1300 | try: |
|
1301 | 1301 | if mergeq: |
|
1302 | 1302 | ret = self.mergepatch(repo, mergeq, s, diffopts) |
|
1303 | 1303 | else: |
|
1304 | 1304 | ret = self.apply(repo, s, list, all_files=all_files, |
|
1305 | 1305 | tobackup=tobackup, check=check) |
|
1306 | except: | |
|
1306 | except: # re-raises | |
|
1307 | 1307 | self.ui.warn(_('cleaning up working directory...')) |
|
1308 | 1308 | node = repo.dirstate.p1() |
|
1309 | 1309 | hg.revert(repo, node, None) |
|
1310 | 1310 | # only remove unknown files that we know we touched or |
|
1311 | 1311 | # created while patching |
|
1312 | 1312 | for f in all_files: |
|
1313 | 1313 | if f not in repo.dirstate: |
|
1314 | 1314 | try: |
|
1315 | 1315 | util.unlinkpath(repo.wjoin(f)) |
|
1316 | 1316 | except OSError, inst: |
|
1317 | 1317 | if inst.errno != errno.ENOENT: |
|
1318 | 1318 | raise |
|
1319 | 1319 | self.ui.warn(_('done\n')) |
|
1320 | 1320 | raise |
|
1321 | 1321 | |
|
1322 | 1322 | if not self.applied: |
|
1323 | 1323 | return ret[0] |
|
1324 | 1324 | top = self.applied[-1].name |
|
1325 | 1325 | if ret[0] and ret[0] > 1: |
|
1326 | 1326 | msg = _("errors during apply, please fix and refresh %s\n") |
|
1327 | 1327 | self.ui.write(msg % top) |
|
1328 | 1328 | else: |
|
1329 | 1329 | self.ui.write(_("now at: %s\n") % top) |
|
1330 | 1330 | return ret[0] |
|
1331 | 1331 | |
|
1332 | 1332 | finally: |
|
1333 | 1333 | wlock.release() |
|
1334 | 1334 | |
|
1335 | 1335 | def pop(self, repo, patch=None, force=False, update=True, all=False, |
|
1336 | 1336 | nobackup=False, check=False): |
|
1337 | 1337 | self.checkforcecheck(check, force) |
|
1338 | 1338 | wlock = repo.wlock() |
|
1339 | 1339 | try: |
|
1340 | 1340 | if patch: |
|
1341 | 1341 | # index, rev, patch |
|
1342 | 1342 | info = self.isapplied(patch) |
|
1343 | 1343 | if not info: |
|
1344 | 1344 | patch = self.lookup(patch) |
|
1345 | 1345 | info = self.isapplied(patch) |
|
1346 | 1346 | if not info: |
|
1347 | 1347 | raise util.Abort(_("patch %s is not applied") % patch) |
|
1348 | 1348 | |
|
1349 | 1349 | if not self.applied: |
|
1350 | 1350 | # Allow qpop -a to work repeatedly, |
|
1351 | 1351 | # but not qpop without an argument |
|
1352 | 1352 | self.ui.warn(_("no patches applied\n")) |
|
1353 | 1353 | return not all |
|
1354 | 1354 | |
|
1355 | 1355 | if all: |
|
1356 | 1356 | start = 0 |
|
1357 | 1357 | elif patch: |
|
1358 | 1358 | start = info[0] + 1 |
|
1359 | 1359 | else: |
|
1360 | 1360 | start = len(self.applied) - 1 |
|
1361 | 1361 | |
|
1362 | 1362 | if start >= len(self.applied): |
|
1363 | 1363 | self.ui.warn(_("qpop: %s is already at the top\n") % patch) |
|
1364 | 1364 | return |
|
1365 | 1365 | |
|
1366 | 1366 | if not update: |
|
1367 | 1367 | parents = repo.dirstate.parents() |
|
1368 | 1368 | rr = [x.node for x in self.applied] |
|
1369 | 1369 | for p in parents: |
|
1370 | 1370 | if p in rr: |
|
1371 | 1371 | self.ui.warn(_("qpop: forcing dirstate update\n")) |
|
1372 | 1372 | update = True |
|
1373 | 1373 | else: |
|
1374 | 1374 | parents = [p.node() for p in repo[None].parents()] |
|
1375 | 1375 | needupdate = False |
|
1376 | 1376 | for entry in self.applied[start:]: |
|
1377 | 1377 | if entry.node in parents: |
|
1378 | 1378 | needupdate = True |
|
1379 | 1379 | break |
|
1380 | 1380 | update = needupdate |
|
1381 | 1381 | |
|
1382 | 1382 | tobackup = set() |
|
1383 | 1383 | if update: |
|
1384 | 1384 | m, a, r, d = self.checklocalchanges(repo, force=force or check) |
|
1385 | 1385 | if force: |
|
1386 | 1386 | if not nobackup: |
|
1387 | 1387 | tobackup.update(m + a) |
|
1388 | 1388 | elif check: |
|
1389 | 1389 | tobackup.update(m + a + r + d) |
|
1390 | 1390 | |
|
1391 | 1391 | self.applieddirty = True |
|
1392 | 1392 | end = len(self.applied) |
|
1393 | 1393 | rev = self.applied[start].node |
|
1394 | 1394 | if update: |
|
1395 | 1395 | top = self.checktoppatch(repo)[0] |
|
1396 | 1396 | |
|
1397 | 1397 | try: |
|
1398 | 1398 | heads = repo.changelog.heads(rev) |
|
1399 | 1399 | except error.LookupError: |
|
1400 | 1400 | node = short(rev) |
|
1401 | 1401 | raise util.Abort(_('trying to pop unknown node %s') % node) |
|
1402 | 1402 | |
|
1403 | 1403 | if heads != [self.applied[-1].node]: |
|
1404 | 1404 | raise util.Abort(_("popping would remove a revision not " |
|
1405 | 1405 | "managed by this patch queue")) |
|
1406 | 1406 | if not repo[self.applied[-1].node].mutable(): |
|
1407 | 1407 | raise util.Abort( |
|
1408 | 1408 | _("popping would remove an immutable revision"), |
|
1409 | 1409 | hint=_('see "hg help phases" for details')) |
|
1410 | 1410 | |
|
1411 | 1411 | # we know there are no local changes, so we can make a simplified |
|
1412 | 1412 | # form of hg.update. |
|
1413 | 1413 | if update: |
|
1414 | 1414 | qp = self.qparents(repo, rev) |
|
1415 | 1415 | ctx = repo[qp] |
|
1416 | 1416 | m, a, r, d = repo.status(qp, top)[:4] |
|
1417 | 1417 | if d: |
|
1418 | 1418 | raise util.Abort(_("deletions found between repo revs")) |
|
1419 | 1419 | |
|
1420 | 1420 | tobackup = set(a + m + r) & tobackup |
|
1421 | 1421 | if check and tobackup: |
|
1422 | 1422 | self.localchangesfound() |
|
1423 | 1423 | self.backup(repo, tobackup) |
|
1424 | 1424 | |
|
1425 | 1425 | for f in a: |
|
1426 | 1426 | try: |
|
1427 | 1427 | util.unlinkpath(repo.wjoin(f)) |
|
1428 | 1428 | except OSError, e: |
|
1429 | 1429 | if e.errno != errno.ENOENT: |
|
1430 | 1430 | raise |
|
1431 | 1431 | repo.dirstate.drop(f) |
|
1432 | 1432 | for f in m + r: |
|
1433 | 1433 | fctx = ctx[f] |
|
1434 | 1434 | repo.wwrite(f, fctx.data(), fctx.flags()) |
|
1435 | 1435 | repo.dirstate.normal(f) |
|
1436 | 1436 | repo.setparents(qp, nullid) |
|
1437 | 1437 | for patch in reversed(self.applied[start:end]): |
|
1438 | 1438 | self.ui.status(_("popping %s\n") % patch.name) |
|
1439 | 1439 | del self.applied[start:end] |
|
1440 | 1440 | self.strip(repo, [rev], update=False, backup='strip') |
|
1441 | 1441 | if self.applied: |
|
1442 | 1442 | self.ui.write(_("now at: %s\n") % self.applied[-1].name) |
|
1443 | 1443 | else: |
|
1444 | 1444 | self.ui.write(_("patch queue now empty\n")) |
|
1445 | 1445 | finally: |
|
1446 | 1446 | wlock.release() |
|
1447 | 1447 | |
|
1448 | 1448 | def diff(self, repo, pats, opts): |
|
1449 | 1449 | top, patch = self.checktoppatch(repo) |
|
1450 | 1450 | if not top: |
|
1451 | 1451 | self.ui.write(_("no patches applied\n")) |
|
1452 | 1452 | return |
|
1453 | 1453 | qp = self.qparents(repo, top) |
|
1454 | 1454 | if opts.get('reverse'): |
|
1455 | 1455 | node1, node2 = None, qp |
|
1456 | 1456 | else: |
|
1457 | 1457 | node1, node2 = qp, None |
|
1458 | 1458 | diffopts = self.diffopts(opts, patch) |
|
1459 | 1459 | self.printdiff(repo, diffopts, node1, node2, files=pats, opts=opts) |
|
1460 | 1460 | |
|
1461 | 1461 | def refresh(self, repo, pats=None, **opts): |
|
1462 | 1462 | if not self.applied: |
|
1463 | 1463 | self.ui.write(_("no patches applied\n")) |
|
1464 | 1464 | return 1 |
|
1465 | 1465 | msg = opts.get('msg', '').rstrip() |
|
1466 | 1466 | newuser = opts.get('user') |
|
1467 | 1467 | newdate = opts.get('date') |
|
1468 | 1468 | if newdate: |
|
1469 | 1469 | newdate = '%d %d' % util.parsedate(newdate) |
|
1470 | 1470 | wlock = repo.wlock() |
|
1471 | 1471 | |
|
1472 | 1472 | try: |
|
1473 | 1473 | self.checktoppatch(repo) |
|
1474 | 1474 | (top, patchfn) = (self.applied[-1].node, self.applied[-1].name) |
|
1475 | 1475 | if repo.changelog.heads(top) != [top]: |
|
1476 | 1476 | raise util.Abort(_("cannot refresh a revision with children")) |
|
1477 | 1477 | if not repo[top].mutable(): |
|
1478 | 1478 | raise util.Abort(_("cannot refresh immutable revision"), |
|
1479 | 1479 | hint=_('see "hg help phases" for details')) |
|
1480 | 1480 | |
|
1481 | 1481 | inclsubs = self.checksubstate(repo) |
|
1482 | 1482 | |
|
1483 | 1483 | cparents = repo.changelog.parents(top) |
|
1484 | 1484 | patchparent = self.qparents(repo, top) |
|
1485 | 1485 | ph = patchheader(self.join(patchfn), self.plainmode) |
|
1486 | 1486 | diffopts = self.diffopts({'git': opts.get('git')}, patchfn) |
|
1487 | 1487 | if msg: |
|
1488 | 1488 | ph.setmessage(msg) |
|
1489 | 1489 | if newuser: |
|
1490 | 1490 | ph.setuser(newuser) |
|
1491 | 1491 | if newdate: |
|
1492 | 1492 | ph.setdate(newdate) |
|
1493 | 1493 | ph.setparent(hex(patchparent)) |
|
1494 | 1494 | |
|
1495 | 1495 | # only commit new patch when write is complete |
|
1496 | 1496 | patchf = self.opener(patchfn, 'w', atomictemp=True) |
|
1497 | 1497 | |
|
1498 | 1498 | comments = str(ph) |
|
1499 | 1499 | if comments: |
|
1500 | 1500 | patchf.write(comments) |
|
1501 | 1501 | |
|
1502 | 1502 | # update the dirstate in place, strip off the qtip commit |
|
1503 | 1503 | # and then commit. |
|
1504 | 1504 | # |
|
1505 | 1505 | # this should really read: |
|
1506 | 1506 | # mm, dd, aa = repo.status(top, patchparent)[:3] |
|
1507 | 1507 | # but we do it backwards to take advantage of manifest/chlog |
|
1508 | 1508 | # caching against the next repo.status call |
|
1509 | 1509 | mm, aa, dd = repo.status(patchparent, top)[:3] |
|
1510 | 1510 | changes = repo.changelog.read(top) |
|
1511 | 1511 | man = repo.manifest.read(changes[0]) |
|
1512 | 1512 | aaa = aa[:] |
|
1513 | 1513 | matchfn = scmutil.match(repo[None], pats, opts) |
|
1514 | 1514 | # in short mode, we only diff the files included in the |
|
1515 | 1515 | # patch already plus specified files |
|
1516 | 1516 | if opts.get('short'): |
|
1517 | 1517 | # if amending a patch, we start with existing |
|
1518 | 1518 | # files plus specified files - unfiltered |
|
1519 | 1519 | match = scmutil.matchfiles(repo, mm + aa + dd + matchfn.files()) |
|
1520 | 1520 | # filter with inc/exl options |
|
1521 | 1521 | matchfn = scmutil.match(repo[None], opts=opts) |
|
1522 | 1522 | else: |
|
1523 | 1523 | match = scmutil.matchall(repo) |
|
1524 | 1524 | m, a, r, d = repo.status(match=match)[:4] |
|
1525 | 1525 | mm = set(mm) |
|
1526 | 1526 | aa = set(aa) |
|
1527 | 1527 | dd = set(dd) |
|
1528 | 1528 | |
|
1529 | 1529 | # we might end up with files that were added between |
|
1530 | 1530 | # qtip and the dirstate parent, but then changed in the |
|
1531 | 1531 | # local dirstate. in this case, we want them to only |
|
1532 | 1532 | # show up in the added section |
|
1533 | 1533 | for x in m: |
|
1534 | 1534 | if x not in aa: |
|
1535 | 1535 | mm.add(x) |
|
1536 | 1536 | # we might end up with files added by the local dirstate that |
|
1537 | 1537 | # were deleted by the patch. In this case, they should only |
|
1538 | 1538 | # show up in the changed section. |
|
1539 | 1539 | for x in a: |
|
1540 | 1540 | if x in dd: |
|
1541 | 1541 | dd.remove(x) |
|
1542 | 1542 | mm.add(x) |
|
1543 | 1543 | else: |
|
1544 | 1544 | aa.add(x) |
|
1545 | 1545 | # make sure any files deleted in the local dirstate |
|
1546 | 1546 | # are not in the add or change column of the patch |
|
1547 | 1547 | forget = [] |
|
1548 | 1548 | for x in d + r: |
|
1549 | 1549 | if x in aa: |
|
1550 | 1550 | aa.remove(x) |
|
1551 | 1551 | forget.append(x) |
|
1552 | 1552 | continue |
|
1553 | 1553 | else: |
|
1554 | 1554 | mm.discard(x) |
|
1555 | 1555 | dd.add(x) |
|
1556 | 1556 | |
|
1557 | 1557 | m = list(mm) |
|
1558 | 1558 | r = list(dd) |
|
1559 | 1559 | a = list(aa) |
|
1560 | 1560 | c = [filter(matchfn, l) for l in (m, a, r)] |
|
1561 | 1561 | match = scmutil.matchfiles(repo, set(c[0] + c[1] + c[2] + inclsubs)) |
|
1562 | 1562 | chunks = patchmod.diff(repo, patchparent, match=match, |
|
1563 | 1563 | changes=c, opts=diffopts) |
|
1564 | 1564 | for chunk in chunks: |
|
1565 | 1565 | patchf.write(chunk) |
|
1566 | 1566 | |
|
1567 | 1567 | try: |
|
1568 | 1568 | if diffopts.git or diffopts.upgrade: |
|
1569 | 1569 | copies = {} |
|
1570 | 1570 | for dst in a: |
|
1571 | 1571 | src = repo.dirstate.copied(dst) |
|
1572 | 1572 | # during qfold, the source file for copies may |
|
1573 | 1573 | # be removed. Treat this as a simple add. |
|
1574 | 1574 | if src is not None and src in repo.dirstate: |
|
1575 | 1575 | copies.setdefault(src, []).append(dst) |
|
1576 | 1576 | repo.dirstate.add(dst) |
|
1577 | 1577 | # remember the copies between patchparent and qtip |
|
1578 | 1578 | for dst in aaa: |
|
1579 | 1579 | f = repo.file(dst) |
|
1580 | 1580 | src = f.renamed(man[dst]) |
|
1581 | 1581 | if src: |
|
1582 | 1582 | copies.setdefault(src[0], []).extend( |
|
1583 | 1583 | copies.get(dst, [])) |
|
1584 | 1584 | if dst in a: |
|
1585 | 1585 | copies[src[0]].append(dst) |
|
1586 | 1586 | # we can't copy a file created by the patch itself |
|
1587 | 1587 | if dst in copies: |
|
1588 | 1588 | del copies[dst] |
|
1589 | 1589 | for src, dsts in copies.iteritems(): |
|
1590 | 1590 | for dst in dsts: |
|
1591 | 1591 | repo.dirstate.copy(src, dst) |
|
1592 | 1592 | else: |
|
1593 | 1593 | for dst in a: |
|
1594 | 1594 | repo.dirstate.add(dst) |
|
1595 | 1595 | # Drop useless copy information |
|
1596 | 1596 | for f in list(repo.dirstate.copies()): |
|
1597 | 1597 | repo.dirstate.copy(None, f) |
|
1598 | 1598 | for f in r: |
|
1599 | 1599 | repo.dirstate.remove(f) |
|
1600 | 1600 | # if the patch excludes a modified file, mark that |
|
1601 | 1601 | # file with mtime=0 so status can see it. |
|
1602 | 1602 | mm = [] |
|
1603 | 1603 | for i in xrange(len(m)-1, -1, -1): |
|
1604 | 1604 | if not matchfn(m[i]): |
|
1605 | 1605 | mm.append(m[i]) |
|
1606 | 1606 | del m[i] |
|
1607 | 1607 | for f in m: |
|
1608 | 1608 | repo.dirstate.normal(f) |
|
1609 | 1609 | for f in mm: |
|
1610 | 1610 | repo.dirstate.normallookup(f) |
|
1611 | 1611 | for f in forget: |
|
1612 | 1612 | repo.dirstate.drop(f) |
|
1613 | 1613 | |
|
1614 | 1614 | if not msg: |
|
1615 | 1615 | if not ph.message: |
|
1616 | 1616 | message = "[mq]: %s\n" % patchfn |
|
1617 | 1617 | else: |
|
1618 | 1618 | message = "\n".join(ph.message) |
|
1619 | 1619 | else: |
|
1620 | 1620 | message = msg |
|
1621 | 1621 | |
|
1622 | 1622 | user = ph.user or changes[1] |
|
1623 | 1623 | |
|
1624 | 1624 | oldphase = repo[top].phase() |
|
1625 | 1625 | |
|
1626 | 1626 | # assumes strip can roll itself back if interrupted |
|
1627 | 1627 | repo.setparents(*cparents) |
|
1628 | 1628 | self.applied.pop() |
|
1629 | 1629 | self.applieddirty = True |
|
1630 | 1630 | self.strip(repo, [top], update=False, |
|
1631 | 1631 | backup='strip') |
|
1632 | except: | |
|
1632 | except: # re-raises | |
|
1633 | 1633 | repo.dirstate.invalidate() |
|
1634 | 1634 | raise |
|
1635 | 1635 | |
|
1636 | 1636 | try: |
|
1637 | 1637 | # might be nice to attempt to roll back strip after this |
|
1638 | 1638 | |
|
1639 | 1639 | # Ensure we create a new changeset in the same phase than |
|
1640 | 1640 | # the old one. |
|
1641 | 1641 | n = newcommit(repo, oldphase, message, user, ph.date, |
|
1642 | 1642 | match=match, force=True) |
|
1643 | 1643 | # only write patch after a successful commit |
|
1644 | 1644 | patchf.close() |
|
1645 | 1645 | self.applied.append(statusentry(n, patchfn)) |
|
1646 | except: | |
|
1646 | except: # re-raises | |
|
1647 | 1647 | ctx = repo[cparents[0]] |
|
1648 | 1648 | repo.dirstate.rebuild(ctx.node(), ctx.manifest()) |
|
1649 | 1649 | self.savedirty() |
|
1650 | 1650 | self.ui.warn(_('refresh interrupted while patch was popped! ' |
|
1651 | 1651 | '(revert --all, qpush to recover)\n')) |
|
1652 | 1652 | raise |
|
1653 | 1653 | finally: |
|
1654 | 1654 | wlock.release() |
|
1655 | 1655 | self.removeundo(repo) |
|
1656 | 1656 | |
|
1657 | 1657 | def init(self, repo, create=False): |
|
1658 | 1658 | if not create and os.path.isdir(self.path): |
|
1659 | 1659 | raise util.Abort(_("patch queue directory already exists")) |
|
1660 | 1660 | try: |
|
1661 | 1661 | os.mkdir(self.path) |
|
1662 | 1662 | except OSError, inst: |
|
1663 | 1663 | if inst.errno != errno.EEXIST or not create: |
|
1664 | 1664 | raise |
|
1665 | 1665 | if create: |
|
1666 | 1666 | return self.qrepo(create=True) |
|
1667 | 1667 | |
|
1668 | 1668 | def unapplied(self, repo, patch=None): |
|
1669 | 1669 | if patch and patch not in self.series: |
|
1670 | 1670 | raise util.Abort(_("patch %s is not in series file") % patch) |
|
1671 | 1671 | if not patch: |
|
1672 | 1672 | start = self.seriesend() |
|
1673 | 1673 | else: |
|
1674 | 1674 | start = self.series.index(patch) + 1 |
|
1675 | 1675 | unapplied = [] |
|
1676 | 1676 | for i in xrange(start, len(self.series)): |
|
1677 | 1677 | pushable, reason = self.pushable(i) |
|
1678 | 1678 | if pushable: |
|
1679 | 1679 | unapplied.append((i, self.series[i])) |
|
1680 | 1680 | self.explainpushable(i) |
|
1681 | 1681 | return unapplied |
|
1682 | 1682 | |
|
1683 | 1683 | def qseries(self, repo, missing=None, start=0, length=None, status=None, |
|
1684 | 1684 | summary=False): |
|
1685 | 1685 | def displayname(pfx, patchname, state): |
|
1686 | 1686 | if pfx: |
|
1687 | 1687 | self.ui.write(pfx) |
|
1688 | 1688 | if summary: |
|
1689 | 1689 | ph = patchheader(self.join(patchname), self.plainmode) |
|
1690 | 1690 | msg = ph.message and ph.message[0] or '' |
|
1691 | 1691 | if self.ui.formatted(): |
|
1692 | 1692 | width = self.ui.termwidth() - len(pfx) - len(patchname) - 2 |
|
1693 | 1693 | if width > 0: |
|
1694 | 1694 | msg = util.ellipsis(msg, width) |
|
1695 | 1695 | else: |
|
1696 | 1696 | msg = '' |
|
1697 | 1697 | self.ui.write(patchname, label='qseries.' + state) |
|
1698 | 1698 | self.ui.write(': ') |
|
1699 | 1699 | self.ui.write(msg, label='qseries.message.' + state) |
|
1700 | 1700 | else: |
|
1701 | 1701 | self.ui.write(patchname, label='qseries.' + state) |
|
1702 | 1702 | self.ui.write('\n') |
|
1703 | 1703 | |
|
1704 | 1704 | applied = set([p.name for p in self.applied]) |
|
1705 | 1705 | if length is None: |
|
1706 | 1706 | length = len(self.series) - start |
|
1707 | 1707 | if not missing: |
|
1708 | 1708 | if self.ui.verbose: |
|
1709 | 1709 | idxwidth = len(str(start + length - 1)) |
|
1710 | 1710 | for i in xrange(start, start + length): |
|
1711 | 1711 | patch = self.series[i] |
|
1712 | 1712 | if patch in applied: |
|
1713 | 1713 | char, state = 'A', 'applied' |
|
1714 | 1714 | elif self.pushable(i)[0]: |
|
1715 | 1715 | char, state = 'U', 'unapplied' |
|
1716 | 1716 | else: |
|
1717 | 1717 | char, state = 'G', 'guarded' |
|
1718 | 1718 | pfx = '' |
|
1719 | 1719 | if self.ui.verbose: |
|
1720 | 1720 | pfx = '%*d %s ' % (idxwidth, i, char) |
|
1721 | 1721 | elif status and status != char: |
|
1722 | 1722 | continue |
|
1723 | 1723 | displayname(pfx, patch, state) |
|
1724 | 1724 | else: |
|
1725 | 1725 | msng_list = [] |
|
1726 | 1726 | for root, dirs, files in os.walk(self.path): |
|
1727 | 1727 | d = root[len(self.path) + 1:] |
|
1728 | 1728 | for f in files: |
|
1729 | 1729 | fl = os.path.join(d, f) |
|
1730 | 1730 | if (fl not in self.series and |
|
1731 | 1731 | fl not in (self.statuspath, self.seriespath, |
|
1732 | 1732 | self.guardspath) |
|
1733 | 1733 | and not fl.startswith('.')): |
|
1734 | 1734 | msng_list.append(fl) |
|
1735 | 1735 | for x in sorted(msng_list): |
|
1736 | 1736 | pfx = self.ui.verbose and ('D ') or '' |
|
1737 | 1737 | displayname(pfx, x, 'missing') |
|
1738 | 1738 | |
|
1739 | 1739 | def issaveline(self, l): |
|
1740 | 1740 | if l.name == '.hg.patches.save.line': |
|
1741 | 1741 | return True |
|
1742 | 1742 | |
|
1743 | 1743 | def qrepo(self, create=False): |
|
1744 | 1744 | ui = self.ui.copy() |
|
1745 | 1745 | ui.setconfig('paths', 'default', '', overlay=False) |
|
1746 | 1746 | ui.setconfig('paths', 'default-push', '', overlay=False) |
|
1747 | 1747 | if create or os.path.isdir(self.join(".hg")): |
|
1748 | 1748 | return hg.repository(ui, path=self.path, create=create) |
|
1749 | 1749 | |
|
1750 | 1750 | def restore(self, repo, rev, delete=None, qupdate=None): |
|
1751 | 1751 | desc = repo[rev].description().strip() |
|
1752 | 1752 | lines = desc.splitlines() |
|
1753 | 1753 | i = 0 |
|
1754 | 1754 | datastart = None |
|
1755 | 1755 | series = [] |
|
1756 | 1756 | applied = [] |
|
1757 | 1757 | qpp = None |
|
1758 | 1758 | for i, line in enumerate(lines): |
|
1759 | 1759 | if line == 'Patch Data:': |
|
1760 | 1760 | datastart = i + 1 |
|
1761 | 1761 | elif line.startswith('Dirstate:'): |
|
1762 | 1762 | l = line.rstrip() |
|
1763 | 1763 | l = l[10:].split(' ') |
|
1764 | 1764 | qpp = [bin(x) for x in l] |
|
1765 | 1765 | elif datastart is not None: |
|
1766 | 1766 | l = line.rstrip() |
|
1767 | 1767 | n, name = l.split(':', 1) |
|
1768 | 1768 | if n: |
|
1769 | 1769 | applied.append(statusentry(bin(n), name)) |
|
1770 | 1770 | else: |
|
1771 | 1771 | series.append(l) |
|
1772 | 1772 | if datastart is None: |
|
1773 | 1773 | self.ui.warn(_("No saved patch data found\n")) |
|
1774 | 1774 | return 1 |
|
1775 | 1775 | self.ui.warn(_("restoring status: %s\n") % lines[0]) |
|
1776 | 1776 | self.fullseries = series |
|
1777 | 1777 | self.applied = applied |
|
1778 | 1778 | self.parseseries() |
|
1779 | 1779 | self.seriesdirty = True |
|
1780 | 1780 | self.applieddirty = True |
|
1781 | 1781 | heads = repo.changelog.heads() |
|
1782 | 1782 | if delete: |
|
1783 | 1783 | if rev not in heads: |
|
1784 | 1784 | self.ui.warn(_("save entry has children, leaving it alone\n")) |
|
1785 | 1785 | else: |
|
1786 | 1786 | self.ui.warn(_("removing save entry %s\n") % short(rev)) |
|
1787 | 1787 | pp = repo.dirstate.parents() |
|
1788 | 1788 | if rev in pp: |
|
1789 | 1789 | update = True |
|
1790 | 1790 | else: |
|
1791 | 1791 | update = False |
|
1792 | 1792 | self.strip(repo, [rev], update=update, backup='strip') |
|
1793 | 1793 | if qpp: |
|
1794 | 1794 | self.ui.warn(_("saved queue repository parents: %s %s\n") % |
|
1795 | 1795 | (short(qpp[0]), short(qpp[1]))) |
|
1796 | 1796 | if qupdate: |
|
1797 | 1797 | self.ui.status(_("updating queue directory\n")) |
|
1798 | 1798 | r = self.qrepo() |
|
1799 | 1799 | if not r: |
|
1800 | 1800 | self.ui.warn(_("Unable to load queue repository\n")) |
|
1801 | 1801 | return 1 |
|
1802 | 1802 | hg.clean(r, qpp[0]) |
|
1803 | 1803 | |
|
1804 | 1804 | def save(self, repo, msg=None): |
|
1805 | 1805 | if not self.applied: |
|
1806 | 1806 | self.ui.warn(_("save: no patches applied, exiting\n")) |
|
1807 | 1807 | return 1 |
|
1808 | 1808 | if self.issaveline(self.applied[-1]): |
|
1809 | 1809 | self.ui.warn(_("status is already saved\n")) |
|
1810 | 1810 | return 1 |
|
1811 | 1811 | |
|
1812 | 1812 | if not msg: |
|
1813 | 1813 | msg = _("hg patches saved state") |
|
1814 | 1814 | else: |
|
1815 | 1815 | msg = "hg patches: " + msg.rstrip('\r\n') |
|
1816 | 1816 | r = self.qrepo() |
|
1817 | 1817 | if r: |
|
1818 | 1818 | pp = r.dirstate.parents() |
|
1819 | 1819 | msg += "\nDirstate: %s %s" % (hex(pp[0]), hex(pp[1])) |
|
1820 | 1820 | msg += "\n\nPatch Data:\n" |
|
1821 | 1821 | msg += ''.join('%s\n' % x for x in self.applied) |
|
1822 | 1822 | msg += ''.join(':%s\n' % x for x in self.fullseries) |
|
1823 | 1823 | n = repo.commit(msg, force=True) |
|
1824 | 1824 | if not n: |
|
1825 | 1825 | self.ui.warn(_("repo commit failed\n")) |
|
1826 | 1826 | return 1 |
|
1827 | 1827 | self.applied.append(statusentry(n, '.hg.patches.save.line')) |
|
1828 | 1828 | self.applieddirty = True |
|
1829 | 1829 | self.removeundo(repo) |
|
1830 | 1830 | |
|
1831 | 1831 | def fullseriesend(self): |
|
1832 | 1832 | if self.applied: |
|
1833 | 1833 | p = self.applied[-1].name |
|
1834 | 1834 | end = self.findseries(p) |
|
1835 | 1835 | if end is None: |
|
1836 | 1836 | return len(self.fullseries) |
|
1837 | 1837 | return end + 1 |
|
1838 | 1838 | return 0 |
|
1839 | 1839 | |
|
1840 | 1840 | def seriesend(self, all_patches=False): |
|
1841 | 1841 | """If all_patches is False, return the index of the next pushable patch |
|
1842 | 1842 | in the series, or the series length. If all_patches is True, return the |
|
1843 | 1843 | index of the first patch past the last applied one. |
|
1844 | 1844 | """ |
|
1845 | 1845 | end = 0 |
|
1846 | 1846 | def next(start): |
|
1847 | 1847 | if all_patches or start >= len(self.series): |
|
1848 | 1848 | return start |
|
1849 | 1849 | for i in xrange(start, len(self.series)): |
|
1850 | 1850 | p, reason = self.pushable(i) |
|
1851 | 1851 | if p: |
|
1852 | 1852 | return i |
|
1853 | 1853 | self.explainpushable(i) |
|
1854 | 1854 | return len(self.series) |
|
1855 | 1855 | if self.applied: |
|
1856 | 1856 | p = self.applied[-1].name |
|
1857 | 1857 | try: |
|
1858 | 1858 | end = self.series.index(p) |
|
1859 | 1859 | except ValueError: |
|
1860 | 1860 | return 0 |
|
1861 | 1861 | return next(end + 1) |
|
1862 | 1862 | return next(end) |
|
1863 | 1863 | |
|
1864 | 1864 | def appliedname(self, index): |
|
1865 | 1865 | pname = self.applied[index].name |
|
1866 | 1866 | if not self.ui.verbose: |
|
1867 | 1867 | p = pname |
|
1868 | 1868 | else: |
|
1869 | 1869 | p = str(self.series.index(pname)) + " " + pname |
|
1870 | 1870 | return p |
|
1871 | 1871 | |
|
1872 | 1872 | def qimport(self, repo, files, patchname=None, rev=None, existing=None, |
|
1873 | 1873 | force=None, git=False): |
|
1874 | 1874 | def checkseries(patchname): |
|
1875 | 1875 | if patchname in self.series: |
|
1876 | 1876 | raise util.Abort(_('patch %s is already in the series file') |
|
1877 | 1877 | % patchname) |
|
1878 | 1878 | |
|
1879 | 1879 | if rev: |
|
1880 | 1880 | if files: |
|
1881 | 1881 | raise util.Abort(_('option "-r" not valid when importing ' |
|
1882 | 1882 | 'files')) |
|
1883 | 1883 | rev = scmutil.revrange(repo, rev) |
|
1884 | 1884 | rev.sort(reverse=True) |
|
1885 | 1885 | if (len(files) > 1 or len(rev) > 1) and patchname: |
|
1886 | 1886 | raise util.Abort(_('option "-n" not valid when importing multiple ' |
|
1887 | 1887 | 'patches')) |
|
1888 | 1888 | imported = [] |
|
1889 | 1889 | if rev: |
|
1890 | 1890 | # If mq patches are applied, we can only import revisions |
|
1891 | 1891 | # that form a linear path to qbase. |
|
1892 | 1892 | # Otherwise, they should form a linear path to a head. |
|
1893 | 1893 | heads = repo.changelog.heads(repo.changelog.node(rev[-1])) |
|
1894 | 1894 | if len(heads) > 1: |
|
1895 | 1895 | raise util.Abort(_('revision %d is the root of more than one ' |
|
1896 | 1896 | 'branch') % rev[-1]) |
|
1897 | 1897 | if self.applied: |
|
1898 | 1898 | base = repo.changelog.node(rev[0]) |
|
1899 | 1899 | if base in [n.node for n in self.applied]: |
|
1900 | 1900 | raise util.Abort(_('revision %d is already managed') |
|
1901 | 1901 | % rev[0]) |
|
1902 | 1902 | if heads != [self.applied[-1].node]: |
|
1903 | 1903 | raise util.Abort(_('revision %d is not the parent of ' |
|
1904 | 1904 | 'the queue') % rev[0]) |
|
1905 | 1905 | base = repo.changelog.rev(self.applied[0].node) |
|
1906 | 1906 | lastparent = repo.changelog.parentrevs(base)[0] |
|
1907 | 1907 | else: |
|
1908 | 1908 | if heads != [repo.changelog.node(rev[0])]: |
|
1909 | 1909 | raise util.Abort(_('revision %d has unmanaged children') |
|
1910 | 1910 | % rev[0]) |
|
1911 | 1911 | lastparent = None |
|
1912 | 1912 | |
|
1913 | 1913 | diffopts = self.diffopts({'git': git}) |
|
1914 | 1914 | for r in rev: |
|
1915 | 1915 | if not repo[r].mutable(): |
|
1916 | 1916 | raise util.Abort(_('revision %d is not mutable') % r, |
|
1917 | 1917 | hint=_('see "hg help phases" for details')) |
|
1918 | 1918 | p1, p2 = repo.changelog.parentrevs(r) |
|
1919 | 1919 | n = repo.changelog.node(r) |
|
1920 | 1920 | if p2 != nullrev: |
|
1921 | 1921 | raise util.Abort(_('cannot import merge revision %d') % r) |
|
1922 | 1922 | if lastparent and lastparent != r: |
|
1923 | 1923 | raise util.Abort(_('revision %d is not the parent of %d') |
|
1924 | 1924 | % (r, lastparent)) |
|
1925 | 1925 | lastparent = p1 |
|
1926 | 1926 | |
|
1927 | 1927 | if not patchname: |
|
1928 | 1928 | patchname = normname('%d.diff' % r) |
|
1929 | 1929 | checkseries(patchname) |
|
1930 | 1930 | self.checkpatchname(patchname, force) |
|
1931 | 1931 | self.fullseries.insert(0, patchname) |
|
1932 | 1932 | |
|
1933 | 1933 | patchf = self.opener(patchname, "w") |
|
1934 | 1934 | cmdutil.export(repo, [n], fp=patchf, opts=diffopts) |
|
1935 | 1935 | patchf.close() |
|
1936 | 1936 | |
|
1937 | 1937 | se = statusentry(n, patchname) |
|
1938 | 1938 | self.applied.insert(0, se) |
|
1939 | 1939 | |
|
1940 | 1940 | self.added.append(patchname) |
|
1941 | 1941 | imported.append(patchname) |
|
1942 | 1942 | patchname = None |
|
1943 | 1943 | if rev and repo.ui.configbool('mq', 'secret', False): |
|
1944 | 1944 | # if we added anything with --rev, we must move the secret root |
|
1945 | 1945 | phases.retractboundary(repo, phases.secret, [n]) |
|
1946 | 1946 | self.parseseries() |
|
1947 | 1947 | self.applieddirty = True |
|
1948 | 1948 | self.seriesdirty = True |
|
1949 | 1949 | |
|
1950 | 1950 | for i, filename in enumerate(files): |
|
1951 | 1951 | if existing: |
|
1952 | 1952 | if filename == '-': |
|
1953 | 1953 | raise util.Abort(_('-e is incompatible with import from -')) |
|
1954 | 1954 | filename = normname(filename) |
|
1955 | 1955 | self.checkreservedname(filename) |
|
1956 | 1956 | originpath = self.join(filename) |
|
1957 | 1957 | if not os.path.isfile(originpath): |
|
1958 | 1958 | raise util.Abort(_("patch %s does not exist") % filename) |
|
1959 | 1959 | |
|
1960 | 1960 | if patchname: |
|
1961 | 1961 | self.checkpatchname(patchname, force) |
|
1962 | 1962 | |
|
1963 | 1963 | self.ui.write(_('renaming %s to %s\n') |
|
1964 | 1964 | % (filename, patchname)) |
|
1965 | 1965 | util.rename(originpath, self.join(patchname)) |
|
1966 | 1966 | else: |
|
1967 | 1967 | patchname = filename |
|
1968 | 1968 | |
|
1969 | 1969 | else: |
|
1970 | 1970 | if filename == '-' and not patchname: |
|
1971 | 1971 | raise util.Abort(_('need --name to import a patch from -')) |
|
1972 | 1972 | elif not patchname: |
|
1973 | 1973 | patchname = normname(os.path.basename(filename.rstrip('/'))) |
|
1974 | 1974 | self.checkpatchname(patchname, force) |
|
1975 | 1975 | try: |
|
1976 | 1976 | if filename == '-': |
|
1977 | 1977 | text = self.ui.fin.read() |
|
1978 | 1978 | else: |
|
1979 | 1979 | fp = url.open(self.ui, filename) |
|
1980 | 1980 | text = fp.read() |
|
1981 | 1981 | fp.close() |
|
1982 | 1982 | except (OSError, IOError): |
|
1983 | 1983 | raise util.Abort(_("unable to read file %s") % filename) |
|
1984 | 1984 | patchf = self.opener(patchname, "w") |
|
1985 | 1985 | patchf.write(text) |
|
1986 | 1986 | patchf.close() |
|
1987 | 1987 | if not force: |
|
1988 | 1988 | checkseries(patchname) |
|
1989 | 1989 | if patchname not in self.series: |
|
1990 | 1990 | index = self.fullseriesend() + i |
|
1991 | 1991 | self.fullseries[index:index] = [patchname] |
|
1992 | 1992 | self.parseseries() |
|
1993 | 1993 | self.seriesdirty = True |
|
1994 | 1994 | self.ui.warn(_("adding %s to series file\n") % patchname) |
|
1995 | 1995 | self.added.append(patchname) |
|
1996 | 1996 | imported.append(patchname) |
|
1997 | 1997 | patchname = None |
|
1998 | 1998 | |
|
1999 | 1999 | self.removeundo(repo) |
|
2000 | 2000 | return imported |
|
2001 | 2001 | |
|
2002 | 2002 | def fixcheckopts(ui, opts): |
|
2003 | 2003 | if (not ui.configbool('mq', 'check') or opts.get('force') |
|
2004 | 2004 | or opts.get('exact')): |
|
2005 | 2005 | return opts |
|
2006 | 2006 | opts = dict(opts) |
|
2007 | 2007 | opts['check'] = True |
|
2008 | 2008 | return opts |
|
2009 | 2009 | |
|
2010 | 2010 | @command("qdelete|qremove|qrm", |
|
2011 | 2011 | [('k', 'keep', None, _('keep patch file')), |
|
2012 | 2012 | ('r', 'rev', [], |
|
2013 | 2013 | _('stop managing a revision (DEPRECATED)'), _('REV'))], |
|
2014 | 2014 | _('hg qdelete [-k] [PATCH]...')) |
|
2015 | 2015 | def delete(ui, repo, *patches, **opts): |
|
2016 | 2016 | """remove patches from queue |
|
2017 | 2017 | |
|
2018 | 2018 | The patches must not be applied, and at least one patch is required. Exact |
|
2019 | 2019 | patch identifiers must be given. With -k/--keep, the patch files are |
|
2020 | 2020 | preserved in the patch directory. |
|
2021 | 2021 | |
|
2022 | 2022 | To stop managing a patch and move it into permanent history, |
|
2023 | 2023 | use the :hg:`qfinish` command.""" |
|
2024 | 2024 | q = repo.mq |
|
2025 | 2025 | q.delete(repo, patches, opts) |
|
2026 | 2026 | q.savedirty() |
|
2027 | 2027 | return 0 |
|
2028 | 2028 | |
|
2029 | 2029 | @command("qapplied", |
|
2030 | 2030 | [('1', 'last', None, _('show only the preceding applied patch')) |
|
2031 | 2031 | ] + seriesopts, |
|
2032 | 2032 | _('hg qapplied [-1] [-s] [PATCH]')) |
|
2033 | 2033 | def applied(ui, repo, patch=None, **opts): |
|
2034 | 2034 | """print the patches already applied |
|
2035 | 2035 | |
|
2036 | 2036 | Returns 0 on success.""" |
|
2037 | 2037 | |
|
2038 | 2038 | q = repo.mq |
|
2039 | 2039 | |
|
2040 | 2040 | if patch: |
|
2041 | 2041 | if patch not in q.series: |
|
2042 | 2042 | raise util.Abort(_("patch %s is not in series file") % patch) |
|
2043 | 2043 | end = q.series.index(patch) + 1 |
|
2044 | 2044 | else: |
|
2045 | 2045 | end = q.seriesend(True) |
|
2046 | 2046 | |
|
2047 | 2047 | if opts.get('last') and not end: |
|
2048 | 2048 | ui.write(_("no patches applied\n")) |
|
2049 | 2049 | return 1 |
|
2050 | 2050 | elif opts.get('last') and end == 1: |
|
2051 | 2051 | ui.write(_("only one patch applied\n")) |
|
2052 | 2052 | return 1 |
|
2053 | 2053 | elif opts.get('last'): |
|
2054 | 2054 | start = end - 2 |
|
2055 | 2055 | end = 1 |
|
2056 | 2056 | else: |
|
2057 | 2057 | start = 0 |
|
2058 | 2058 | |
|
2059 | 2059 | q.qseries(repo, length=end, start=start, status='A', |
|
2060 | 2060 | summary=opts.get('summary')) |
|
2061 | 2061 | |
|
2062 | 2062 | |
|
2063 | 2063 | @command("qunapplied", |
|
2064 | 2064 | [('1', 'first', None, _('show only the first patch'))] + seriesopts, |
|
2065 | 2065 | _('hg qunapplied [-1] [-s] [PATCH]')) |
|
2066 | 2066 | def unapplied(ui, repo, patch=None, **opts): |
|
2067 | 2067 | """print the patches not yet applied |
|
2068 | 2068 | |
|
2069 | 2069 | Returns 0 on success.""" |
|
2070 | 2070 | |
|
2071 | 2071 | q = repo.mq |
|
2072 | 2072 | if patch: |
|
2073 | 2073 | if patch not in q.series: |
|
2074 | 2074 | raise util.Abort(_("patch %s is not in series file") % patch) |
|
2075 | 2075 | start = q.series.index(patch) + 1 |
|
2076 | 2076 | else: |
|
2077 | 2077 | start = q.seriesend(True) |
|
2078 | 2078 | |
|
2079 | 2079 | if start == len(q.series) and opts.get('first'): |
|
2080 | 2080 | ui.write(_("all patches applied\n")) |
|
2081 | 2081 | return 1 |
|
2082 | 2082 | |
|
2083 | 2083 | length = opts.get('first') and 1 or None |
|
2084 | 2084 | q.qseries(repo, start=start, length=length, status='U', |
|
2085 | 2085 | summary=opts.get('summary')) |
|
2086 | 2086 | |
|
2087 | 2087 | @command("qimport", |
|
2088 | 2088 | [('e', 'existing', None, _('import file in patch directory')), |
|
2089 | 2089 | ('n', 'name', '', |
|
2090 | 2090 | _('name of patch file'), _('NAME')), |
|
2091 | 2091 | ('f', 'force', None, _('overwrite existing files')), |
|
2092 | 2092 | ('r', 'rev', [], |
|
2093 | 2093 | _('place existing revisions under mq control'), _('REV')), |
|
2094 | 2094 | ('g', 'git', None, _('use git extended diff format')), |
|
2095 | 2095 | ('P', 'push', None, _('qpush after importing'))], |
|
2096 | 2096 | _('hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE...')) |
|
2097 | 2097 | def qimport(ui, repo, *filename, **opts): |
|
2098 | 2098 | """import a patch or existing changeset |
|
2099 | 2099 | |
|
2100 | 2100 | The patch is inserted into the series after the last applied |
|
2101 | 2101 | patch. If no patches have been applied, qimport prepends the patch |
|
2102 | 2102 | to the series. |
|
2103 | 2103 | |
|
2104 | 2104 | The patch will have the same name as its source file unless you |
|
2105 | 2105 | give it a new one with -n/--name. |
|
2106 | 2106 | |
|
2107 | 2107 | You can register an existing patch inside the patch directory with |
|
2108 | 2108 | the -e/--existing flag. |
|
2109 | 2109 | |
|
2110 | 2110 | With -f/--force, an existing patch of the same name will be |
|
2111 | 2111 | overwritten. |
|
2112 | 2112 | |
|
2113 | 2113 | An existing changeset may be placed under mq control with -r/--rev |
|
2114 | 2114 | (e.g. qimport --rev tip -n patch will place tip under mq control). |
|
2115 | 2115 | With -g/--git, patches imported with --rev will use the git diff |
|
2116 | 2116 | format. See the diffs help topic for information on why this is |
|
2117 | 2117 | important for preserving rename/copy information and permission |
|
2118 | 2118 | changes. Use :hg:`qfinish` to remove changesets from mq control. |
|
2119 | 2119 | |
|
2120 | 2120 | To import a patch from standard input, pass - as the patch file. |
|
2121 | 2121 | When importing from standard input, a patch name must be specified |
|
2122 | 2122 | using the --name flag. |
|
2123 | 2123 | |
|
2124 | 2124 | To import an existing patch while renaming it:: |
|
2125 | 2125 | |
|
2126 | 2126 | hg qimport -e existing-patch -n new-name |
|
2127 | 2127 | |
|
2128 | 2128 | Returns 0 if import succeeded. |
|
2129 | 2129 | """ |
|
2130 | 2130 | lock = repo.lock() # cause this may move phase |
|
2131 | 2131 | try: |
|
2132 | 2132 | q = repo.mq |
|
2133 | 2133 | try: |
|
2134 | 2134 | imported = q.qimport( |
|
2135 | 2135 | repo, filename, patchname=opts.get('name'), |
|
2136 | 2136 | existing=opts.get('existing'), force=opts.get('force'), |
|
2137 | 2137 | rev=opts.get('rev'), git=opts.get('git')) |
|
2138 | 2138 | finally: |
|
2139 | 2139 | q.savedirty() |
|
2140 | 2140 | finally: |
|
2141 | 2141 | lock.release() |
|
2142 | 2142 | |
|
2143 | 2143 | if imported and opts.get('push') and not opts.get('rev'): |
|
2144 | 2144 | return q.push(repo, imported[-1]) |
|
2145 | 2145 | return 0 |
|
2146 | 2146 | |
|
2147 | 2147 | def qinit(ui, repo, create): |
|
2148 | 2148 | """initialize a new queue repository |
|
2149 | 2149 | |
|
2150 | 2150 | This command also creates a series file for ordering patches, and |
|
2151 | 2151 | an mq-specific .hgignore file in the queue repository, to exclude |
|
2152 | 2152 | the status and guards files (these contain mostly transient state). |
|
2153 | 2153 | |
|
2154 | 2154 | Returns 0 if initialization succeeded.""" |
|
2155 | 2155 | q = repo.mq |
|
2156 | 2156 | r = q.init(repo, create) |
|
2157 | 2157 | q.savedirty() |
|
2158 | 2158 | if r: |
|
2159 | 2159 | if not os.path.exists(r.wjoin('.hgignore')): |
|
2160 | 2160 | fp = r.wopener('.hgignore', 'w') |
|
2161 | 2161 | fp.write('^\\.hg\n') |
|
2162 | 2162 | fp.write('^\\.mq\n') |
|
2163 | 2163 | fp.write('syntax: glob\n') |
|
2164 | 2164 | fp.write('status\n') |
|
2165 | 2165 | fp.write('guards\n') |
|
2166 | 2166 | fp.close() |
|
2167 | 2167 | if not os.path.exists(r.wjoin('series')): |
|
2168 | 2168 | r.wopener('series', 'w').close() |
|
2169 | 2169 | r[None].add(['.hgignore', 'series']) |
|
2170 | 2170 | commands.add(ui, r) |
|
2171 | 2171 | return 0 |
|
2172 | 2172 | |
|
2173 | 2173 | @command("^qinit", |
|
2174 | 2174 | [('c', 'create-repo', None, _('create queue repository'))], |
|
2175 | 2175 | _('hg qinit [-c]')) |
|
2176 | 2176 | def init(ui, repo, **opts): |
|
2177 | 2177 | """init a new queue repository (DEPRECATED) |
|
2178 | 2178 | |
|
2179 | 2179 | The queue repository is unversioned by default. If |
|
2180 | 2180 | -c/--create-repo is specified, qinit will create a separate nested |
|
2181 | 2181 | repository for patches (qinit -c may also be run later to convert |
|
2182 | 2182 | an unversioned patch repository into a versioned one). You can use |
|
2183 | 2183 | qcommit to commit changes to this queue repository. |
|
2184 | 2184 | |
|
2185 | 2185 | This command is deprecated. Without -c, it's implied by other relevant |
|
2186 | 2186 | commands. With -c, use :hg:`init --mq` instead.""" |
|
2187 | 2187 | return qinit(ui, repo, create=opts.get('create_repo')) |
|
2188 | 2188 | |
|
2189 | 2189 | @command("qclone", |
|
2190 | 2190 | [('', 'pull', None, _('use pull protocol to copy metadata')), |
|
2191 | 2191 | ('U', 'noupdate', None, |
|
2192 | 2192 | _('do not update the new working directories')), |
|
2193 | 2193 | ('', 'uncompressed', None, |
|
2194 | 2194 | _('use uncompressed transfer (fast over LAN)')), |
|
2195 | 2195 | ('p', 'patches', '', |
|
2196 | 2196 | _('location of source patch repository'), _('REPO')), |
|
2197 | 2197 | ] + commands.remoteopts, |
|
2198 | 2198 | _('hg qclone [OPTION]... SOURCE [DEST]')) |
|
2199 | 2199 | def clone(ui, source, dest=None, **opts): |
|
2200 | 2200 | '''clone main and patch repository at same time |
|
2201 | 2201 | |
|
2202 | 2202 | If source is local, destination will have no patches applied. If |
|
2203 | 2203 | source is remote, this command can not check if patches are |
|
2204 | 2204 | applied in source, so cannot guarantee that patches are not |
|
2205 | 2205 | applied in destination. If you clone remote repository, be sure |
|
2206 | 2206 | before that it has no patches applied. |
|
2207 | 2207 | |
|
2208 | 2208 | Source patch repository is looked for in <src>/.hg/patches by |
|
2209 | 2209 | default. Use -p <url> to change. |
|
2210 | 2210 | |
|
2211 | 2211 | The patch directory must be a nested Mercurial repository, as |
|
2212 | 2212 | would be created by :hg:`init --mq`. |
|
2213 | 2213 | |
|
2214 | 2214 | Return 0 on success. |
|
2215 | 2215 | ''' |
|
2216 | 2216 | def patchdir(repo): |
|
2217 | 2217 | """compute a patch repo url from a repo object""" |
|
2218 | 2218 | url = repo.url() |
|
2219 | 2219 | if url.endswith('/'): |
|
2220 | 2220 | url = url[:-1] |
|
2221 | 2221 | return url + '/.hg/patches' |
|
2222 | 2222 | |
|
2223 | 2223 | # main repo (destination and sources) |
|
2224 | 2224 | if dest is None: |
|
2225 | 2225 | dest = hg.defaultdest(source) |
|
2226 | 2226 | sr = hg.repository(hg.remoteui(ui, opts), ui.expandpath(source)) |
|
2227 | 2227 | |
|
2228 | 2228 | # patches repo (source only) |
|
2229 | 2229 | if opts.get('patches'): |
|
2230 | 2230 | patchespath = ui.expandpath(opts.get('patches')) |
|
2231 | 2231 | else: |
|
2232 | 2232 | patchespath = patchdir(sr) |
|
2233 | 2233 | try: |
|
2234 | 2234 | hg.repository(ui, patchespath) |
|
2235 | 2235 | except error.RepoError: |
|
2236 | 2236 | raise util.Abort(_('versioned patch repository not found' |
|
2237 | 2237 | ' (see init --mq)')) |
|
2238 | 2238 | qbase, destrev = None, None |
|
2239 | 2239 | if sr.local(): |
|
2240 | 2240 | if sr.mq.applied and sr[qbase].phase() != phases.secret: |
|
2241 | 2241 | qbase = sr.mq.applied[0].node |
|
2242 | 2242 | if not hg.islocal(dest): |
|
2243 | 2243 | heads = set(sr.heads()) |
|
2244 | 2244 | destrev = list(heads.difference(sr.heads(qbase))) |
|
2245 | 2245 | destrev.append(sr.changelog.parents(qbase)[0]) |
|
2246 | 2246 | elif sr.capable('lookup'): |
|
2247 | 2247 | try: |
|
2248 | 2248 | qbase = sr.lookup('qbase') |
|
2249 | 2249 | except error.RepoError: |
|
2250 | 2250 | pass |
|
2251 | 2251 | |
|
2252 | 2252 | ui.note(_('cloning main repository\n')) |
|
2253 | 2253 | sr, dr = hg.clone(ui, opts, sr.url(), dest, |
|
2254 | 2254 | pull=opts.get('pull'), |
|
2255 | 2255 | rev=destrev, |
|
2256 | 2256 | update=False, |
|
2257 | 2257 | stream=opts.get('uncompressed')) |
|
2258 | 2258 | |
|
2259 | 2259 | ui.note(_('cloning patch repository\n')) |
|
2260 | 2260 | hg.clone(ui, opts, opts.get('patches') or patchdir(sr), patchdir(dr), |
|
2261 | 2261 | pull=opts.get('pull'), update=not opts.get('noupdate'), |
|
2262 | 2262 | stream=opts.get('uncompressed')) |
|
2263 | 2263 | |
|
2264 | 2264 | if dr.local(): |
|
2265 | 2265 | if qbase: |
|
2266 | 2266 | ui.note(_('stripping applied patches from destination ' |
|
2267 | 2267 | 'repository\n')) |
|
2268 | 2268 | dr.mq.strip(dr, [qbase], update=False, backup=None) |
|
2269 | 2269 | if not opts.get('noupdate'): |
|
2270 | 2270 | ui.note(_('updating destination repository\n')) |
|
2271 | 2271 | hg.update(dr, dr.changelog.tip()) |
|
2272 | 2272 | |
|
2273 | 2273 | @command("qcommit|qci", |
|
2274 | 2274 | commands.table["^commit|ci"][1], |
|
2275 | 2275 | _('hg qcommit [OPTION]... [FILE]...')) |
|
2276 | 2276 | def commit(ui, repo, *pats, **opts): |
|
2277 | 2277 | """commit changes in the queue repository (DEPRECATED) |
|
2278 | 2278 | |
|
2279 | 2279 | This command is deprecated; use :hg:`commit --mq` instead.""" |
|
2280 | 2280 | q = repo.mq |
|
2281 | 2281 | r = q.qrepo() |
|
2282 | 2282 | if not r: |
|
2283 | 2283 | raise util.Abort('no queue repository') |
|
2284 | 2284 | commands.commit(r.ui, r, *pats, **opts) |
|
2285 | 2285 | |
|
2286 | 2286 | @command("qseries", |
|
2287 | 2287 | [('m', 'missing', None, _('print patches not in series')), |
|
2288 | 2288 | ] + seriesopts, |
|
2289 | 2289 | _('hg qseries [-ms]')) |
|
2290 | 2290 | def series(ui, repo, **opts): |
|
2291 | 2291 | """print the entire series file |
|
2292 | 2292 | |
|
2293 | 2293 | Returns 0 on success.""" |
|
2294 | 2294 | repo.mq.qseries(repo, missing=opts.get('missing'), |
|
2295 | 2295 | summary=opts.get('summary')) |
|
2296 | 2296 | return 0 |
|
2297 | 2297 | |
|
2298 | 2298 | @command("qtop", seriesopts, _('hg qtop [-s]')) |
|
2299 | 2299 | def top(ui, repo, **opts): |
|
2300 | 2300 | """print the name of the current patch |
|
2301 | 2301 | |
|
2302 | 2302 | Returns 0 on success.""" |
|
2303 | 2303 | q = repo.mq |
|
2304 | 2304 | t = q.applied and q.seriesend(True) or 0 |
|
2305 | 2305 | if t: |
|
2306 | 2306 | q.qseries(repo, start=t - 1, length=1, status='A', |
|
2307 | 2307 | summary=opts.get('summary')) |
|
2308 | 2308 | else: |
|
2309 | 2309 | ui.write(_("no patches applied\n")) |
|
2310 | 2310 | return 1 |
|
2311 | 2311 | |
|
2312 | 2312 | @command("qnext", seriesopts, _('hg qnext [-s]')) |
|
2313 | 2313 | def next(ui, repo, **opts): |
|
2314 | 2314 | """print the name of the next pushable patch |
|
2315 | 2315 | |
|
2316 | 2316 | Returns 0 on success.""" |
|
2317 | 2317 | q = repo.mq |
|
2318 | 2318 | end = q.seriesend() |
|
2319 | 2319 | if end == len(q.series): |
|
2320 | 2320 | ui.write(_("all patches applied\n")) |
|
2321 | 2321 | return 1 |
|
2322 | 2322 | q.qseries(repo, start=end, length=1, summary=opts.get('summary')) |
|
2323 | 2323 | |
|
2324 | 2324 | @command("qprev", seriesopts, _('hg qprev [-s]')) |
|
2325 | 2325 | def prev(ui, repo, **opts): |
|
2326 | 2326 | """print the name of the preceding applied patch |
|
2327 | 2327 | |
|
2328 | 2328 | Returns 0 on success.""" |
|
2329 | 2329 | q = repo.mq |
|
2330 | 2330 | l = len(q.applied) |
|
2331 | 2331 | if l == 1: |
|
2332 | 2332 | ui.write(_("only one patch applied\n")) |
|
2333 | 2333 | return 1 |
|
2334 | 2334 | if not l: |
|
2335 | 2335 | ui.write(_("no patches applied\n")) |
|
2336 | 2336 | return 1 |
|
2337 | 2337 | idx = q.series.index(q.applied[-2].name) |
|
2338 | 2338 | q.qseries(repo, start=idx, length=1, status='A', |
|
2339 | 2339 | summary=opts.get('summary')) |
|
2340 | 2340 | |
|
2341 | 2341 | def setupheaderopts(ui, opts): |
|
2342 | 2342 | if not opts.get('user') and opts.get('currentuser'): |
|
2343 | 2343 | opts['user'] = ui.username() |
|
2344 | 2344 | if not opts.get('date') and opts.get('currentdate'): |
|
2345 | 2345 | opts['date'] = "%d %d" % util.makedate() |
|
2346 | 2346 | |
|
2347 | 2347 | @command("^qnew", |
|
2348 | 2348 | [('e', 'edit', None, _('edit commit message')), |
|
2349 | 2349 | ('f', 'force', None, _('import uncommitted changes (DEPRECATED)')), |
|
2350 | 2350 | ('g', 'git', None, _('use git extended diff format')), |
|
2351 | 2351 | ('U', 'currentuser', None, _('add "From: <current user>" to patch')), |
|
2352 | 2352 | ('u', 'user', '', |
|
2353 | 2353 | _('add "From: <USER>" to patch'), _('USER')), |
|
2354 | 2354 | ('D', 'currentdate', None, _('add "Date: <current date>" to patch')), |
|
2355 | 2355 | ('d', 'date', '', |
|
2356 | 2356 | _('add "Date: <DATE>" to patch'), _('DATE')) |
|
2357 | 2357 | ] + commands.walkopts + commands.commitopts, |
|
2358 | 2358 | _('hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]...')) |
|
2359 | 2359 | def new(ui, repo, patch, *args, **opts): |
|
2360 | 2360 | """create a new patch |
|
2361 | 2361 | |
|
2362 | 2362 | qnew creates a new patch on top of the currently-applied patch (if |
|
2363 | 2363 | any). The patch will be initialized with any outstanding changes |
|
2364 | 2364 | in the working directory. You may also use -I/--include, |
|
2365 | 2365 | -X/--exclude, and/or a list of files after the patch name to add |
|
2366 | 2366 | only changes to matching files to the new patch, leaving the rest |
|
2367 | 2367 | as uncommitted modifications. |
|
2368 | 2368 | |
|
2369 | 2369 | -u/--user and -d/--date can be used to set the (given) user and |
|
2370 | 2370 | date, respectively. -U/--currentuser and -D/--currentdate set user |
|
2371 | 2371 | to current user and date to current date. |
|
2372 | 2372 | |
|
2373 | 2373 | -e/--edit, -m/--message or -l/--logfile set the patch header as |
|
2374 | 2374 | well as the commit message. If none is specified, the header is |
|
2375 | 2375 | empty and the commit message is '[mq]: PATCH'. |
|
2376 | 2376 | |
|
2377 | 2377 | Use the -g/--git option to keep the patch in the git extended diff |
|
2378 | 2378 | format. Read the diffs help topic for more information on why this |
|
2379 | 2379 | is important for preserving permission changes and copy/rename |
|
2380 | 2380 | information. |
|
2381 | 2381 | |
|
2382 | 2382 | Returns 0 on successful creation of a new patch. |
|
2383 | 2383 | """ |
|
2384 | 2384 | msg = cmdutil.logmessage(ui, opts) |
|
2385 | 2385 | def getmsg(): |
|
2386 | 2386 | return ui.edit(msg, opts.get('user') or ui.username()) |
|
2387 | 2387 | q = repo.mq |
|
2388 | 2388 | opts['msg'] = msg |
|
2389 | 2389 | if opts.get('edit'): |
|
2390 | 2390 | opts['msg'] = getmsg |
|
2391 | 2391 | else: |
|
2392 | 2392 | opts['msg'] = msg |
|
2393 | 2393 | setupheaderopts(ui, opts) |
|
2394 | 2394 | q.new(repo, patch, *args, **opts) |
|
2395 | 2395 | q.savedirty() |
|
2396 | 2396 | return 0 |
|
2397 | 2397 | |
|
2398 | 2398 | @command("^qrefresh", |
|
2399 | 2399 | [('e', 'edit', None, _('edit commit message')), |
|
2400 | 2400 | ('g', 'git', None, _('use git extended diff format')), |
|
2401 | 2401 | ('s', 'short', None, |
|
2402 | 2402 | _('refresh only files already in the patch and specified files')), |
|
2403 | 2403 | ('U', 'currentuser', None, |
|
2404 | 2404 | _('add/update author field in patch with current user')), |
|
2405 | 2405 | ('u', 'user', '', |
|
2406 | 2406 | _('add/update author field in patch with given user'), _('USER')), |
|
2407 | 2407 | ('D', 'currentdate', None, |
|
2408 | 2408 | _('add/update date field in patch with current date')), |
|
2409 | 2409 | ('d', 'date', '', |
|
2410 | 2410 | _('add/update date field in patch with given date'), _('DATE')) |
|
2411 | 2411 | ] + commands.walkopts + commands.commitopts, |
|
2412 | 2412 | _('hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...')) |
|
2413 | 2413 | def refresh(ui, repo, *pats, **opts): |
|
2414 | 2414 | """update the current patch |
|
2415 | 2415 | |
|
2416 | 2416 | If any file patterns are provided, the refreshed patch will |
|
2417 | 2417 | contain only the modifications that match those patterns; the |
|
2418 | 2418 | remaining modifications will remain in the working directory. |
|
2419 | 2419 | |
|
2420 | 2420 | If -s/--short is specified, files currently included in the patch |
|
2421 | 2421 | will be refreshed just like matched files and remain in the patch. |
|
2422 | 2422 | |
|
2423 | 2423 | If -e/--edit is specified, Mercurial will start your configured editor for |
|
2424 | 2424 | you to enter a message. In case qrefresh fails, you will find a backup of |
|
2425 | 2425 | your message in ``.hg/last-message.txt``. |
|
2426 | 2426 | |
|
2427 | 2427 | hg add/remove/copy/rename work as usual, though you might want to |
|
2428 | 2428 | use git-style patches (-g/--git or [diff] git=1) to track copies |
|
2429 | 2429 | and renames. See the diffs help topic for more information on the |
|
2430 | 2430 | git diff format. |
|
2431 | 2431 | |
|
2432 | 2432 | Returns 0 on success. |
|
2433 | 2433 | """ |
|
2434 | 2434 | q = repo.mq |
|
2435 | 2435 | message = cmdutil.logmessage(ui, opts) |
|
2436 | 2436 | if opts.get('edit'): |
|
2437 | 2437 | if not q.applied: |
|
2438 | 2438 | ui.write(_("no patches applied\n")) |
|
2439 | 2439 | return 1 |
|
2440 | 2440 | if message: |
|
2441 | 2441 | raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) |
|
2442 | 2442 | patch = q.applied[-1].name |
|
2443 | 2443 | ph = patchheader(q.join(patch), q.plainmode) |
|
2444 | 2444 | message = ui.edit('\n'.join(ph.message), ph.user or ui.username()) |
|
2445 | 2445 | # We don't want to lose the patch message if qrefresh fails (issue2062) |
|
2446 | 2446 | repo.savecommitmessage(message) |
|
2447 | 2447 | setupheaderopts(ui, opts) |
|
2448 | 2448 | wlock = repo.wlock() |
|
2449 | 2449 | try: |
|
2450 | 2450 | ret = q.refresh(repo, pats, msg=message, **opts) |
|
2451 | 2451 | q.savedirty() |
|
2452 | 2452 | return ret |
|
2453 | 2453 | finally: |
|
2454 | 2454 | wlock.release() |
|
2455 | 2455 | |
|
2456 | 2456 | @command("^qdiff", |
|
2457 | 2457 | commands.diffopts + commands.diffopts2 + commands.walkopts, |
|
2458 | 2458 | _('hg qdiff [OPTION]... [FILE]...')) |
|
2459 | 2459 | def diff(ui, repo, *pats, **opts): |
|
2460 | 2460 | """diff of the current patch and subsequent modifications |
|
2461 | 2461 | |
|
2462 | 2462 | Shows a diff which includes the current patch as well as any |
|
2463 | 2463 | changes which have been made in the working directory since the |
|
2464 | 2464 | last refresh (thus showing what the current patch would become |
|
2465 | 2465 | after a qrefresh). |
|
2466 | 2466 | |
|
2467 | 2467 | Use :hg:`diff` if you only want to see the changes made since the |
|
2468 | 2468 | last qrefresh, or :hg:`export qtip` if you want to see changes |
|
2469 | 2469 | made by the current patch without including changes made since the |
|
2470 | 2470 | qrefresh. |
|
2471 | 2471 | |
|
2472 | 2472 | Returns 0 on success. |
|
2473 | 2473 | """ |
|
2474 | 2474 | repo.mq.diff(repo, pats, opts) |
|
2475 | 2475 | return 0 |
|
2476 | 2476 | |
|
2477 | 2477 | @command('qfold', |
|
2478 | 2478 | [('e', 'edit', None, _('edit patch header')), |
|
2479 | 2479 | ('k', 'keep', None, _('keep folded patch files')), |
|
2480 | 2480 | ] + commands.commitopts, |
|
2481 | 2481 | _('hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH...')) |
|
2482 | 2482 | def fold(ui, repo, *files, **opts): |
|
2483 | 2483 | """fold the named patches into the current patch |
|
2484 | 2484 | |
|
2485 | 2485 | Patches must not yet be applied. Each patch will be successively |
|
2486 | 2486 | applied to the current patch in the order given. If all the |
|
2487 | 2487 | patches apply successfully, the current patch will be refreshed |
|
2488 | 2488 | with the new cumulative patch, and the folded patches will be |
|
2489 | 2489 | deleted. With -k/--keep, the folded patch files will not be |
|
2490 | 2490 | removed afterwards. |
|
2491 | 2491 | |
|
2492 | 2492 | The header for each folded patch will be concatenated with the |
|
2493 | 2493 | current patch header, separated by a line of ``* * *``. |
|
2494 | 2494 | |
|
2495 | 2495 | Returns 0 on success.""" |
|
2496 | 2496 | q = repo.mq |
|
2497 | 2497 | if not files: |
|
2498 | 2498 | raise util.Abort(_('qfold requires at least one patch name')) |
|
2499 | 2499 | if not q.checktoppatch(repo)[0]: |
|
2500 | 2500 | raise util.Abort(_('no patches applied')) |
|
2501 | 2501 | q.checklocalchanges(repo) |
|
2502 | 2502 | |
|
2503 | 2503 | message = cmdutil.logmessage(ui, opts) |
|
2504 | 2504 | if opts.get('edit'): |
|
2505 | 2505 | if message: |
|
2506 | 2506 | raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) |
|
2507 | 2507 | |
|
2508 | 2508 | parent = q.lookup('qtip') |
|
2509 | 2509 | patches = [] |
|
2510 | 2510 | messages = [] |
|
2511 | 2511 | for f in files: |
|
2512 | 2512 | p = q.lookup(f) |
|
2513 | 2513 | if p in patches or p == parent: |
|
2514 | 2514 | ui.warn(_('Skipping already folded patch %s\n') % p) |
|
2515 | 2515 | if q.isapplied(p): |
|
2516 | 2516 | raise util.Abort(_('qfold cannot fold already applied patch %s') |
|
2517 | 2517 | % p) |
|
2518 | 2518 | patches.append(p) |
|
2519 | 2519 | |
|
2520 | 2520 | for p in patches: |
|
2521 | 2521 | if not message: |
|
2522 | 2522 | ph = patchheader(q.join(p), q.plainmode) |
|
2523 | 2523 | if ph.message: |
|
2524 | 2524 | messages.append(ph.message) |
|
2525 | 2525 | pf = q.join(p) |
|
2526 | 2526 | (patchsuccess, files, fuzz) = q.patch(repo, pf) |
|
2527 | 2527 | if not patchsuccess: |
|
2528 | 2528 | raise util.Abort(_('error folding patch %s') % p) |
|
2529 | 2529 | |
|
2530 | 2530 | if not message: |
|
2531 | 2531 | ph = patchheader(q.join(parent), q.plainmode) |
|
2532 | 2532 | message, user = ph.message, ph.user |
|
2533 | 2533 | for msg in messages: |
|
2534 | 2534 | message.append('* * *') |
|
2535 | 2535 | message.extend(msg) |
|
2536 | 2536 | message = '\n'.join(message) |
|
2537 | 2537 | |
|
2538 | 2538 | if opts.get('edit'): |
|
2539 | 2539 | message = ui.edit(message, user or ui.username()) |
|
2540 | 2540 | |
|
2541 | 2541 | diffopts = q.patchopts(q.diffopts(), *patches) |
|
2542 | 2542 | wlock = repo.wlock() |
|
2543 | 2543 | try: |
|
2544 | 2544 | q.refresh(repo, msg=message, git=diffopts.git) |
|
2545 | 2545 | q.delete(repo, patches, opts) |
|
2546 | 2546 | q.savedirty() |
|
2547 | 2547 | finally: |
|
2548 | 2548 | wlock.release() |
|
2549 | 2549 | |
|
2550 | 2550 | @command("qgoto", |
|
2551 | 2551 | [('c', 'check', None, _('tolerate non-conflicting local changes')), |
|
2552 | 2552 | ('f', 'force', None, _('overwrite any local changes')), |
|
2553 | 2553 | ('', 'no-backup', None, _('do not save backup copies of files'))], |
|
2554 | 2554 | _('hg qgoto [OPTION]... PATCH')) |
|
2555 | 2555 | def goto(ui, repo, patch, **opts): |
|
2556 | 2556 | '''push or pop patches until named patch is at top of stack |
|
2557 | 2557 | |
|
2558 | 2558 | Returns 0 on success.''' |
|
2559 | 2559 | opts = fixcheckopts(ui, opts) |
|
2560 | 2560 | q = repo.mq |
|
2561 | 2561 | patch = q.lookup(patch) |
|
2562 | 2562 | nobackup = opts.get('no_backup') |
|
2563 | 2563 | check = opts.get('check') |
|
2564 | 2564 | if q.isapplied(patch): |
|
2565 | 2565 | ret = q.pop(repo, patch, force=opts.get('force'), nobackup=nobackup, |
|
2566 | 2566 | check=check) |
|
2567 | 2567 | else: |
|
2568 | 2568 | ret = q.push(repo, patch, force=opts.get('force'), nobackup=nobackup, |
|
2569 | 2569 | check=check) |
|
2570 | 2570 | q.savedirty() |
|
2571 | 2571 | return ret |
|
2572 | 2572 | |
|
2573 | 2573 | @command("qguard", |
|
2574 | 2574 | [('l', 'list', None, _('list all patches and guards')), |
|
2575 | 2575 | ('n', 'none', None, _('drop all guards'))], |
|
2576 | 2576 | _('hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]')) |
|
2577 | 2577 | def guard(ui, repo, *args, **opts): |
|
2578 | 2578 | '''set or print guards for a patch |
|
2579 | 2579 | |
|
2580 | 2580 | Guards control whether a patch can be pushed. A patch with no |
|
2581 | 2581 | guards is always pushed. A patch with a positive guard ("+foo") is |
|
2582 | 2582 | pushed only if the :hg:`qselect` command has activated it. A patch with |
|
2583 | 2583 | a negative guard ("-foo") is never pushed if the :hg:`qselect` command |
|
2584 | 2584 | has activated it. |
|
2585 | 2585 | |
|
2586 | 2586 | With no arguments, print the currently active guards. |
|
2587 | 2587 | With arguments, set guards for the named patch. |
|
2588 | 2588 | |
|
2589 | 2589 | .. note:: |
|
2590 | 2590 | Specifying negative guards now requires '--'. |
|
2591 | 2591 | |
|
2592 | 2592 | To set guards on another patch:: |
|
2593 | 2593 | |
|
2594 | 2594 | hg qguard other.patch -- +2.6.17 -stable |
|
2595 | 2595 | |
|
2596 | 2596 | Returns 0 on success. |
|
2597 | 2597 | ''' |
|
2598 | 2598 | def status(idx): |
|
2599 | 2599 | guards = q.seriesguards[idx] or ['unguarded'] |
|
2600 | 2600 | if q.series[idx] in applied: |
|
2601 | 2601 | state = 'applied' |
|
2602 | 2602 | elif q.pushable(idx)[0]: |
|
2603 | 2603 | state = 'unapplied' |
|
2604 | 2604 | else: |
|
2605 | 2605 | state = 'guarded' |
|
2606 | 2606 | label = 'qguard.patch qguard.%s qseries.%s' % (state, state) |
|
2607 | 2607 | ui.write('%s: ' % ui.label(q.series[idx], label)) |
|
2608 | 2608 | |
|
2609 | 2609 | for i, guard in enumerate(guards): |
|
2610 | 2610 | if guard.startswith('+'): |
|
2611 | 2611 | ui.write(guard, label='qguard.positive') |
|
2612 | 2612 | elif guard.startswith('-'): |
|
2613 | 2613 | ui.write(guard, label='qguard.negative') |
|
2614 | 2614 | else: |
|
2615 | 2615 | ui.write(guard, label='qguard.unguarded') |
|
2616 | 2616 | if i != len(guards) - 1: |
|
2617 | 2617 | ui.write(' ') |
|
2618 | 2618 | ui.write('\n') |
|
2619 | 2619 | q = repo.mq |
|
2620 | 2620 | applied = set(p.name for p in q.applied) |
|
2621 | 2621 | patch = None |
|
2622 | 2622 | args = list(args) |
|
2623 | 2623 | if opts.get('list'): |
|
2624 | 2624 | if args or opts.get('none'): |
|
2625 | 2625 | raise util.Abort(_('cannot mix -l/--list with options or ' |
|
2626 | 2626 | 'arguments')) |
|
2627 | 2627 | for i in xrange(len(q.series)): |
|
2628 | 2628 | status(i) |
|
2629 | 2629 | return |
|
2630 | 2630 | if not args or args[0][0:1] in '-+': |
|
2631 | 2631 | if not q.applied: |
|
2632 | 2632 | raise util.Abort(_('no patches applied')) |
|
2633 | 2633 | patch = q.applied[-1].name |
|
2634 | 2634 | if patch is None and args[0][0:1] not in '-+': |
|
2635 | 2635 | patch = args.pop(0) |
|
2636 | 2636 | if patch is None: |
|
2637 | 2637 | raise util.Abort(_('no patch to work with')) |
|
2638 | 2638 | if args or opts.get('none'): |
|
2639 | 2639 | idx = q.findseries(patch) |
|
2640 | 2640 | if idx is None: |
|
2641 | 2641 | raise util.Abort(_('no patch named %s') % patch) |
|
2642 | 2642 | q.setguards(idx, args) |
|
2643 | 2643 | q.savedirty() |
|
2644 | 2644 | else: |
|
2645 | 2645 | status(q.series.index(q.lookup(patch))) |
|
2646 | 2646 | |
|
2647 | 2647 | @command("qheader", [], _('hg qheader [PATCH]')) |
|
2648 | 2648 | def header(ui, repo, patch=None): |
|
2649 | 2649 | """print the header of the topmost or specified patch |
|
2650 | 2650 | |
|
2651 | 2651 | Returns 0 on success.""" |
|
2652 | 2652 | q = repo.mq |
|
2653 | 2653 | |
|
2654 | 2654 | if patch: |
|
2655 | 2655 | patch = q.lookup(patch) |
|
2656 | 2656 | else: |
|
2657 | 2657 | if not q.applied: |
|
2658 | 2658 | ui.write(_('no patches applied\n')) |
|
2659 | 2659 | return 1 |
|
2660 | 2660 | patch = q.lookup('qtip') |
|
2661 | 2661 | ph = patchheader(q.join(patch), q.plainmode) |
|
2662 | 2662 | |
|
2663 | 2663 | ui.write('\n'.join(ph.message) + '\n') |
|
2664 | 2664 | |
|
2665 | 2665 | def lastsavename(path): |
|
2666 | 2666 | (directory, base) = os.path.split(path) |
|
2667 | 2667 | names = os.listdir(directory) |
|
2668 | 2668 | namere = re.compile("%s.([0-9]+)" % base) |
|
2669 | 2669 | maxindex = None |
|
2670 | 2670 | maxname = None |
|
2671 | 2671 | for f in names: |
|
2672 | 2672 | m = namere.match(f) |
|
2673 | 2673 | if m: |
|
2674 | 2674 | index = int(m.group(1)) |
|
2675 | 2675 | if maxindex is None or index > maxindex: |
|
2676 | 2676 | maxindex = index |
|
2677 | 2677 | maxname = f |
|
2678 | 2678 | if maxname: |
|
2679 | 2679 | return (os.path.join(directory, maxname), maxindex) |
|
2680 | 2680 | return (None, None) |
|
2681 | 2681 | |
|
2682 | 2682 | def savename(path): |
|
2683 | 2683 | (last, index) = lastsavename(path) |
|
2684 | 2684 | if last is None: |
|
2685 | 2685 | index = 0 |
|
2686 | 2686 | newpath = path + ".%d" % (index + 1) |
|
2687 | 2687 | return newpath |
|
2688 | 2688 | |
|
2689 | 2689 | @command("^qpush", |
|
2690 | 2690 | [('c', 'check', None, _('tolerate non-conflicting local changes')), |
|
2691 | 2691 | ('f', 'force', None, _('apply on top of local changes')), |
|
2692 | 2692 | ('e', 'exact', None, |
|
2693 | 2693 | _('apply the target patch to its recorded parent')), |
|
2694 | 2694 | ('l', 'list', None, _('list patch name in commit text')), |
|
2695 | 2695 | ('a', 'all', None, _('apply all patches')), |
|
2696 | 2696 | ('m', 'merge', None, _('merge from another queue (DEPRECATED)')), |
|
2697 | 2697 | ('n', 'name', '', |
|
2698 | 2698 | _('merge queue name (DEPRECATED)'), _('NAME')), |
|
2699 | 2699 | ('', 'move', None, |
|
2700 | 2700 | _('reorder patch series and apply only the patch')), |
|
2701 | 2701 | ('', 'no-backup', None, _('do not save backup copies of files'))], |
|
2702 | 2702 | _('hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]')) |
|
2703 | 2703 | def push(ui, repo, patch=None, **opts): |
|
2704 | 2704 | """push the next patch onto the stack |
|
2705 | 2705 | |
|
2706 | 2706 | By default, abort if the working directory contains uncommitted |
|
2707 | 2707 | changes. With -c/--check, abort only if the uncommitted files |
|
2708 | 2708 | overlap with patched files. With -f/--force, backup and patch over |
|
2709 | 2709 | uncommitted changes. |
|
2710 | 2710 | |
|
2711 | 2711 | Return 0 on success. |
|
2712 | 2712 | """ |
|
2713 | 2713 | q = repo.mq |
|
2714 | 2714 | mergeq = None |
|
2715 | 2715 | |
|
2716 | 2716 | opts = fixcheckopts(ui, opts) |
|
2717 | 2717 | if opts.get('merge'): |
|
2718 | 2718 | if opts.get('name'): |
|
2719 | 2719 | newpath = repo.join(opts.get('name')) |
|
2720 | 2720 | else: |
|
2721 | 2721 | newpath, i = lastsavename(q.path) |
|
2722 | 2722 | if not newpath: |
|
2723 | 2723 | ui.warn(_("no saved queues found, please use -n\n")) |
|
2724 | 2724 | return 1 |
|
2725 | 2725 | mergeq = queue(ui, repo.path, newpath) |
|
2726 | 2726 | ui.warn(_("merging with queue at: %s\n") % mergeq.path) |
|
2727 | 2727 | ret = q.push(repo, patch, force=opts.get('force'), list=opts.get('list'), |
|
2728 | 2728 | mergeq=mergeq, all=opts.get('all'), move=opts.get('move'), |
|
2729 | 2729 | exact=opts.get('exact'), nobackup=opts.get('no_backup'), |
|
2730 | 2730 | check=opts.get('check')) |
|
2731 | 2731 | return ret |
|
2732 | 2732 | |
|
2733 | 2733 | @command("^qpop", |
|
2734 | 2734 | [('a', 'all', None, _('pop all patches')), |
|
2735 | 2735 | ('n', 'name', '', |
|
2736 | 2736 | _('queue name to pop (DEPRECATED)'), _('NAME')), |
|
2737 | 2737 | ('c', 'check', None, _('tolerate non-conflicting local changes')), |
|
2738 | 2738 | ('f', 'force', None, _('forget any local changes to patched files')), |
|
2739 | 2739 | ('', 'no-backup', None, _('do not save backup copies of files'))], |
|
2740 | 2740 | _('hg qpop [-a] [-f] [PATCH | INDEX]')) |
|
2741 | 2741 | def pop(ui, repo, patch=None, **opts): |
|
2742 | 2742 | """pop the current patch off the stack |
|
2743 | 2743 | |
|
2744 | 2744 | Without argument, pops off the top of the patch stack. If given a |
|
2745 | 2745 | patch name, keeps popping off patches until the named patch is at |
|
2746 | 2746 | the top of the stack. |
|
2747 | 2747 | |
|
2748 | 2748 | By default, abort if the working directory contains uncommitted |
|
2749 | 2749 | changes. With -c/--check, abort only if the uncommitted files |
|
2750 | 2750 | overlap with patched files. With -f/--force, backup and discard |
|
2751 | 2751 | changes made to such files. |
|
2752 | 2752 | |
|
2753 | 2753 | Return 0 on success. |
|
2754 | 2754 | """ |
|
2755 | 2755 | opts = fixcheckopts(ui, opts) |
|
2756 | 2756 | localupdate = True |
|
2757 | 2757 | if opts.get('name'): |
|
2758 | 2758 | q = queue(ui, repo.path, repo.join(opts.get('name'))) |
|
2759 | 2759 | ui.warn(_('using patch queue: %s\n') % q.path) |
|
2760 | 2760 | localupdate = False |
|
2761 | 2761 | else: |
|
2762 | 2762 | q = repo.mq |
|
2763 | 2763 | ret = q.pop(repo, patch, force=opts.get('force'), update=localupdate, |
|
2764 | 2764 | all=opts.get('all'), nobackup=opts.get('no_backup'), |
|
2765 | 2765 | check=opts.get('check')) |
|
2766 | 2766 | q.savedirty() |
|
2767 | 2767 | return ret |
|
2768 | 2768 | |
|
2769 | 2769 | @command("qrename|qmv", [], _('hg qrename PATCH1 [PATCH2]')) |
|
2770 | 2770 | def rename(ui, repo, patch, name=None, **opts): |
|
2771 | 2771 | """rename a patch |
|
2772 | 2772 | |
|
2773 | 2773 | With one argument, renames the current patch to PATCH1. |
|
2774 | 2774 | With two arguments, renames PATCH1 to PATCH2. |
|
2775 | 2775 | |
|
2776 | 2776 | Returns 0 on success.""" |
|
2777 | 2777 | q = repo.mq |
|
2778 | 2778 | if not name: |
|
2779 | 2779 | name = patch |
|
2780 | 2780 | patch = None |
|
2781 | 2781 | |
|
2782 | 2782 | if patch: |
|
2783 | 2783 | patch = q.lookup(patch) |
|
2784 | 2784 | else: |
|
2785 | 2785 | if not q.applied: |
|
2786 | 2786 | ui.write(_('no patches applied\n')) |
|
2787 | 2787 | return |
|
2788 | 2788 | patch = q.lookup('qtip') |
|
2789 | 2789 | absdest = q.join(name) |
|
2790 | 2790 | if os.path.isdir(absdest): |
|
2791 | 2791 | name = normname(os.path.join(name, os.path.basename(patch))) |
|
2792 | 2792 | absdest = q.join(name) |
|
2793 | 2793 | q.checkpatchname(name) |
|
2794 | 2794 | |
|
2795 | 2795 | ui.note(_('renaming %s to %s\n') % (patch, name)) |
|
2796 | 2796 | i = q.findseries(patch) |
|
2797 | 2797 | guards = q.guard_re.findall(q.fullseries[i]) |
|
2798 | 2798 | q.fullseries[i] = name + ''.join([' #' + g for g in guards]) |
|
2799 | 2799 | q.parseseries() |
|
2800 | 2800 | q.seriesdirty = True |
|
2801 | 2801 | |
|
2802 | 2802 | info = q.isapplied(patch) |
|
2803 | 2803 | if info: |
|
2804 | 2804 | q.applied[info[0]] = statusentry(info[1], name) |
|
2805 | 2805 | q.applieddirty = True |
|
2806 | 2806 | |
|
2807 | 2807 | destdir = os.path.dirname(absdest) |
|
2808 | 2808 | if not os.path.isdir(destdir): |
|
2809 | 2809 | os.makedirs(destdir) |
|
2810 | 2810 | util.rename(q.join(patch), absdest) |
|
2811 | 2811 | r = q.qrepo() |
|
2812 | 2812 | if r and patch in r.dirstate: |
|
2813 | 2813 | wctx = r[None] |
|
2814 | 2814 | wlock = r.wlock() |
|
2815 | 2815 | try: |
|
2816 | 2816 | if r.dirstate[patch] == 'a': |
|
2817 | 2817 | r.dirstate.drop(patch) |
|
2818 | 2818 | r.dirstate.add(name) |
|
2819 | 2819 | else: |
|
2820 | 2820 | wctx.copy(patch, name) |
|
2821 | 2821 | wctx.forget([patch]) |
|
2822 | 2822 | finally: |
|
2823 | 2823 | wlock.release() |
|
2824 | 2824 | |
|
2825 | 2825 | q.savedirty() |
|
2826 | 2826 | |
|
2827 | 2827 | @command("qrestore", |
|
2828 | 2828 | [('d', 'delete', None, _('delete save entry')), |
|
2829 | 2829 | ('u', 'update', None, _('update queue working directory'))], |
|
2830 | 2830 | _('hg qrestore [-d] [-u] REV')) |
|
2831 | 2831 | def restore(ui, repo, rev, **opts): |
|
2832 | 2832 | """restore the queue state saved by a revision (DEPRECATED) |
|
2833 | 2833 | |
|
2834 | 2834 | This command is deprecated, use :hg:`rebase` instead.""" |
|
2835 | 2835 | rev = repo.lookup(rev) |
|
2836 | 2836 | q = repo.mq |
|
2837 | 2837 | q.restore(repo, rev, delete=opts.get('delete'), |
|
2838 | 2838 | qupdate=opts.get('update')) |
|
2839 | 2839 | q.savedirty() |
|
2840 | 2840 | return 0 |
|
2841 | 2841 | |
|
2842 | 2842 | @command("qsave", |
|
2843 | 2843 | [('c', 'copy', None, _('copy patch directory')), |
|
2844 | 2844 | ('n', 'name', '', |
|
2845 | 2845 | _('copy directory name'), _('NAME')), |
|
2846 | 2846 | ('e', 'empty', None, _('clear queue status file')), |
|
2847 | 2847 | ('f', 'force', None, _('force copy'))] + commands.commitopts, |
|
2848 | 2848 | _('hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]')) |
|
2849 | 2849 | def save(ui, repo, **opts): |
|
2850 | 2850 | """save current queue state (DEPRECATED) |
|
2851 | 2851 | |
|
2852 | 2852 | This command is deprecated, use :hg:`rebase` instead.""" |
|
2853 | 2853 | q = repo.mq |
|
2854 | 2854 | message = cmdutil.logmessage(ui, opts) |
|
2855 | 2855 | ret = q.save(repo, msg=message) |
|
2856 | 2856 | if ret: |
|
2857 | 2857 | return ret |
|
2858 | 2858 | q.savedirty() # save to .hg/patches before copying |
|
2859 | 2859 | if opts.get('copy'): |
|
2860 | 2860 | path = q.path |
|
2861 | 2861 | if opts.get('name'): |
|
2862 | 2862 | newpath = os.path.join(q.basepath, opts.get('name')) |
|
2863 | 2863 | if os.path.exists(newpath): |
|
2864 | 2864 | if not os.path.isdir(newpath): |
|
2865 | 2865 | raise util.Abort(_('destination %s exists and is not ' |
|
2866 | 2866 | 'a directory') % newpath) |
|
2867 | 2867 | if not opts.get('force'): |
|
2868 | 2868 | raise util.Abort(_('destination %s exists, ' |
|
2869 | 2869 | 'use -f to force') % newpath) |
|
2870 | 2870 | else: |
|
2871 | 2871 | newpath = savename(path) |
|
2872 | 2872 | ui.warn(_("copy %s to %s\n") % (path, newpath)) |
|
2873 | 2873 | util.copyfiles(path, newpath) |
|
2874 | 2874 | if opts.get('empty'): |
|
2875 | 2875 | del q.applied[:] |
|
2876 | 2876 | q.applieddirty = True |
|
2877 | 2877 | q.savedirty() |
|
2878 | 2878 | return 0 |
|
2879 | 2879 | |
|
2880 | 2880 | @command("strip", |
|
2881 | 2881 | [ |
|
2882 | 2882 | ('r', 'rev', [], _('strip specified revision (optional, ' |
|
2883 | 2883 | 'can specify revisions without this ' |
|
2884 | 2884 | 'option)'), _('REV')), |
|
2885 | 2885 | ('f', 'force', None, _('force removal of changesets, discard ' |
|
2886 | 2886 | 'uncommitted changes (no backup)')), |
|
2887 | 2887 | ('b', 'backup', None, _('bundle only changesets with local revision' |
|
2888 | 2888 | ' number greater than REV which are not' |
|
2889 | 2889 | ' descendants of REV (DEPRECATED)')), |
|
2890 | 2890 | ('', 'no-backup', None, _('no backups')), |
|
2891 | 2891 | ('', 'nobackup', None, _('no backups (DEPRECATED)')), |
|
2892 | 2892 | ('n', '', None, _('ignored (DEPRECATED)')), |
|
2893 | 2893 | ('k', 'keep', None, _("do not modify working copy during strip"))], |
|
2894 | 2894 | _('hg strip [-k] [-f] [-n] REV...')) |
|
2895 | 2895 | def strip(ui, repo, *revs, **opts): |
|
2896 | 2896 | """strip changesets and all their descendants from the repository |
|
2897 | 2897 | |
|
2898 | 2898 | The strip command removes the specified changesets and all their |
|
2899 | 2899 | descendants. If the working directory has uncommitted changes, the |
|
2900 | 2900 | operation is aborted unless the --force flag is supplied, in which |
|
2901 | 2901 | case changes will be discarded. |
|
2902 | 2902 | |
|
2903 | 2903 | If a parent of the working directory is stripped, then the working |
|
2904 | 2904 | directory will automatically be updated to the most recent |
|
2905 | 2905 | available ancestor of the stripped parent after the operation |
|
2906 | 2906 | completes. |
|
2907 | 2907 | |
|
2908 | 2908 | Any stripped changesets are stored in ``.hg/strip-backup`` as a |
|
2909 | 2909 | bundle (see :hg:`help bundle` and :hg:`help unbundle`). They can |
|
2910 | 2910 | be restored by running :hg:`unbundle .hg/strip-backup/BUNDLE`, |
|
2911 | 2911 | where BUNDLE is the bundle file created by the strip. Note that |
|
2912 | 2912 | the local revision numbers will in general be different after the |
|
2913 | 2913 | restore. |
|
2914 | 2914 | |
|
2915 | 2915 | Use the --no-backup option to discard the backup bundle once the |
|
2916 | 2916 | operation completes. |
|
2917 | 2917 | |
|
2918 | 2918 | Return 0 on success. |
|
2919 | 2919 | """ |
|
2920 | 2920 | backup = 'all' |
|
2921 | 2921 | if opts.get('backup'): |
|
2922 | 2922 | backup = 'strip' |
|
2923 | 2923 | elif opts.get('no_backup') or opts.get('nobackup'): |
|
2924 | 2924 | backup = 'none' |
|
2925 | 2925 | |
|
2926 | 2926 | cl = repo.changelog |
|
2927 | 2927 | revs = list(revs) + opts.get('rev') |
|
2928 | 2928 | revs = set(scmutil.revrange(repo, revs)) |
|
2929 | 2929 | if not revs: |
|
2930 | 2930 | raise util.Abort(_('empty revision set')) |
|
2931 | 2931 | |
|
2932 | 2932 | descendants = set(cl.descendants(*revs)) |
|
2933 | 2933 | strippedrevs = revs.union(descendants) |
|
2934 | 2934 | roots = revs.difference(descendants) |
|
2935 | 2935 | |
|
2936 | 2936 | update = False |
|
2937 | 2937 | # if one of the wdir parent is stripped we'll need |
|
2938 | 2938 | # to update away to an earlier revision |
|
2939 | 2939 | for p in repo.dirstate.parents(): |
|
2940 | 2940 | if p != nullid and cl.rev(p) in strippedrevs: |
|
2941 | 2941 | update = True |
|
2942 | 2942 | break |
|
2943 | 2943 | |
|
2944 | 2944 | rootnodes = set(cl.node(r) for r in roots) |
|
2945 | 2945 | |
|
2946 | 2946 | q = repo.mq |
|
2947 | 2947 | if q.applied: |
|
2948 | 2948 | # refresh queue state if we're about to strip |
|
2949 | 2949 | # applied patches |
|
2950 | 2950 | if cl.rev(repo.lookup('qtip')) in strippedrevs: |
|
2951 | 2951 | q.applieddirty = True |
|
2952 | 2952 | start = 0 |
|
2953 | 2953 | end = len(q.applied) |
|
2954 | 2954 | for i, statusentry in enumerate(q.applied): |
|
2955 | 2955 | if statusentry.node in rootnodes: |
|
2956 | 2956 | # if one of the stripped roots is an applied |
|
2957 | 2957 | # patch, only part of the queue is stripped |
|
2958 | 2958 | start = i |
|
2959 | 2959 | break |
|
2960 | 2960 | del q.applied[start:end] |
|
2961 | 2961 | q.savedirty() |
|
2962 | 2962 | |
|
2963 | 2963 | revs = list(rootnodes) |
|
2964 | 2964 | if update and opts.get('keep'): |
|
2965 | 2965 | wlock = repo.wlock() |
|
2966 | 2966 | try: |
|
2967 | 2967 | urev = repo.mq.qparents(repo, revs[0]) |
|
2968 | 2968 | repo.dirstate.rebuild(urev, repo[urev].manifest()) |
|
2969 | 2969 | repo.dirstate.write() |
|
2970 | 2970 | update = False |
|
2971 | 2971 | finally: |
|
2972 | 2972 | wlock.release() |
|
2973 | 2973 | |
|
2974 | 2974 | repo.mq.strip(repo, revs, backup=backup, update=update, |
|
2975 | 2975 | force=opts.get('force')) |
|
2976 | 2976 | return 0 |
|
2977 | 2977 | |
|
2978 | 2978 | @command("qselect", |
|
2979 | 2979 | [('n', 'none', None, _('disable all guards')), |
|
2980 | 2980 | ('s', 'series', None, _('list all guards in series file')), |
|
2981 | 2981 | ('', 'pop', None, _('pop to before first guarded applied patch')), |
|
2982 | 2982 | ('', 'reapply', None, _('pop, then reapply patches'))], |
|
2983 | 2983 | _('hg qselect [OPTION]... [GUARD]...')) |
|
2984 | 2984 | def select(ui, repo, *args, **opts): |
|
2985 | 2985 | '''set or print guarded patches to push |
|
2986 | 2986 | |
|
2987 | 2987 | Use the :hg:`qguard` command to set or print guards on patch, then use |
|
2988 | 2988 | qselect to tell mq which guards to use. A patch will be pushed if |
|
2989 | 2989 | it has no guards or any positive guards match the currently |
|
2990 | 2990 | selected guard, but will not be pushed if any negative guards |
|
2991 | 2991 | match the current guard. For example:: |
|
2992 | 2992 | |
|
2993 | 2993 | qguard foo.patch -- -stable (negative guard) |
|
2994 | 2994 | qguard bar.patch +stable (positive guard) |
|
2995 | 2995 | qselect stable |
|
2996 | 2996 | |
|
2997 | 2997 | This activates the "stable" guard. mq will skip foo.patch (because |
|
2998 | 2998 | it has a negative match) but push bar.patch (because it has a |
|
2999 | 2999 | positive match). |
|
3000 | 3000 | |
|
3001 | 3001 | With no arguments, prints the currently active guards. |
|
3002 | 3002 | With one argument, sets the active guard. |
|
3003 | 3003 | |
|
3004 | 3004 | Use -n/--none to deactivate guards (no other arguments needed). |
|
3005 | 3005 | When no guards are active, patches with positive guards are |
|
3006 | 3006 | skipped and patches with negative guards are pushed. |
|
3007 | 3007 | |
|
3008 | 3008 | qselect can change the guards on applied patches. It does not pop |
|
3009 | 3009 | guarded patches by default. Use --pop to pop back to the last |
|
3010 | 3010 | applied patch that is not guarded. Use --reapply (which implies |
|
3011 | 3011 | --pop) to push back to the current patch afterwards, but skip |
|
3012 | 3012 | guarded patches. |
|
3013 | 3013 | |
|
3014 | 3014 | Use -s/--series to print a list of all guards in the series file |
|
3015 | 3015 | (no other arguments needed). Use -v for more information. |
|
3016 | 3016 | |
|
3017 | 3017 | Returns 0 on success.''' |
|
3018 | 3018 | |
|
3019 | 3019 | q = repo.mq |
|
3020 | 3020 | guards = q.active() |
|
3021 | 3021 | if args or opts.get('none'): |
|
3022 | 3022 | old_unapplied = q.unapplied(repo) |
|
3023 | 3023 | old_guarded = [i for i in xrange(len(q.applied)) if |
|
3024 | 3024 | not q.pushable(i)[0]] |
|
3025 | 3025 | q.setactive(args) |
|
3026 | 3026 | q.savedirty() |
|
3027 | 3027 | if not args: |
|
3028 | 3028 | ui.status(_('guards deactivated\n')) |
|
3029 | 3029 | if not opts.get('pop') and not opts.get('reapply'): |
|
3030 | 3030 | unapplied = q.unapplied(repo) |
|
3031 | 3031 | guarded = [i for i in xrange(len(q.applied)) |
|
3032 | 3032 | if not q.pushable(i)[0]] |
|
3033 | 3033 | if len(unapplied) != len(old_unapplied): |
|
3034 | 3034 | ui.status(_('number of unguarded, unapplied patches has ' |
|
3035 | 3035 | 'changed from %d to %d\n') % |
|
3036 | 3036 | (len(old_unapplied), len(unapplied))) |
|
3037 | 3037 | if len(guarded) != len(old_guarded): |
|
3038 | 3038 | ui.status(_('number of guarded, applied patches has changed ' |
|
3039 | 3039 | 'from %d to %d\n') % |
|
3040 | 3040 | (len(old_guarded), len(guarded))) |
|
3041 | 3041 | elif opts.get('series'): |
|
3042 | 3042 | guards = {} |
|
3043 | 3043 | noguards = 0 |
|
3044 | 3044 | for gs in q.seriesguards: |
|
3045 | 3045 | if not gs: |
|
3046 | 3046 | noguards += 1 |
|
3047 | 3047 | for g in gs: |
|
3048 | 3048 | guards.setdefault(g, 0) |
|
3049 | 3049 | guards[g] += 1 |
|
3050 | 3050 | if ui.verbose: |
|
3051 | 3051 | guards['NONE'] = noguards |
|
3052 | 3052 | guards = guards.items() |
|
3053 | 3053 | guards.sort(key=lambda x: x[0][1:]) |
|
3054 | 3054 | if guards: |
|
3055 | 3055 | ui.note(_('guards in series file:\n')) |
|
3056 | 3056 | for guard, count in guards: |
|
3057 | 3057 | ui.note('%2d ' % count) |
|
3058 | 3058 | ui.write(guard, '\n') |
|
3059 | 3059 | else: |
|
3060 | 3060 | ui.note(_('no guards in series file\n')) |
|
3061 | 3061 | else: |
|
3062 | 3062 | if guards: |
|
3063 | 3063 | ui.note(_('active guards:\n')) |
|
3064 | 3064 | for g in guards: |
|
3065 | 3065 | ui.write(g, '\n') |
|
3066 | 3066 | else: |
|
3067 | 3067 | ui.write(_('no active guards\n')) |
|
3068 | 3068 | reapply = opts.get('reapply') and q.applied and q.appliedname(-1) |
|
3069 | 3069 | popped = False |
|
3070 | 3070 | if opts.get('pop') or opts.get('reapply'): |
|
3071 | 3071 | for i in xrange(len(q.applied)): |
|
3072 | 3072 | pushable, reason = q.pushable(i) |
|
3073 | 3073 | if not pushable: |
|
3074 | 3074 | ui.status(_('popping guarded patches\n')) |
|
3075 | 3075 | popped = True |
|
3076 | 3076 | if i == 0: |
|
3077 | 3077 | q.pop(repo, all=True) |
|
3078 | 3078 | else: |
|
3079 | 3079 | q.pop(repo, str(i - 1)) |
|
3080 | 3080 | break |
|
3081 | 3081 | if popped: |
|
3082 | 3082 | try: |
|
3083 | 3083 | if reapply: |
|
3084 | 3084 | ui.status(_('reapplying unguarded patches\n')) |
|
3085 | 3085 | q.push(repo, reapply) |
|
3086 | 3086 | finally: |
|
3087 | 3087 | q.savedirty() |
|
3088 | 3088 | |
|
3089 | 3089 | @command("qfinish", |
|
3090 | 3090 | [('a', 'applied', None, _('finish all applied changesets'))], |
|
3091 | 3091 | _('hg qfinish [-a] [REV]...')) |
|
3092 | 3092 | def finish(ui, repo, *revrange, **opts): |
|
3093 | 3093 | """move applied patches into repository history |
|
3094 | 3094 | |
|
3095 | 3095 | Finishes the specified revisions (corresponding to applied |
|
3096 | 3096 | patches) by moving them out of mq control into regular repository |
|
3097 | 3097 | history. |
|
3098 | 3098 | |
|
3099 | 3099 | Accepts a revision range or the -a/--applied option. If --applied |
|
3100 | 3100 | is specified, all applied mq revisions are removed from mq |
|
3101 | 3101 | control. Otherwise, the given revisions must be at the base of the |
|
3102 | 3102 | stack of applied patches. |
|
3103 | 3103 | |
|
3104 | 3104 | This can be especially useful if your changes have been applied to |
|
3105 | 3105 | an upstream repository, or if you are about to push your changes |
|
3106 | 3106 | to upstream. |
|
3107 | 3107 | |
|
3108 | 3108 | Returns 0 on success. |
|
3109 | 3109 | """ |
|
3110 | 3110 | if not opts.get('applied') and not revrange: |
|
3111 | 3111 | raise util.Abort(_('no revisions specified')) |
|
3112 | 3112 | elif opts.get('applied'): |
|
3113 | 3113 | revrange = ('qbase::qtip',) + revrange |
|
3114 | 3114 | |
|
3115 | 3115 | q = repo.mq |
|
3116 | 3116 | if not q.applied: |
|
3117 | 3117 | ui.status(_('no patches applied\n')) |
|
3118 | 3118 | return 0 |
|
3119 | 3119 | |
|
3120 | 3120 | revs = scmutil.revrange(repo, revrange) |
|
3121 | 3121 | if repo['.'].rev() in revs and repo[None].files(): |
|
3122 | 3122 | ui.warn(_('warning: uncommitted changes in the working directory\n')) |
|
3123 | 3123 | # queue.finish may changes phases but leave the responsability to lock the |
|
3124 | 3124 | # repo to the caller to avoid deadlock with wlock. This command code is |
|
3125 | 3125 | # responsability for this locking. |
|
3126 | 3126 | lock = repo.lock() |
|
3127 | 3127 | try: |
|
3128 | 3128 | q.finish(repo, revs) |
|
3129 | 3129 | q.savedirty() |
|
3130 | 3130 | finally: |
|
3131 | 3131 | lock.release() |
|
3132 | 3132 | return 0 |
|
3133 | 3133 | |
|
3134 | 3134 | @command("qqueue", |
|
3135 | 3135 | [('l', 'list', False, _('list all available queues')), |
|
3136 | 3136 | ('', 'active', False, _('print name of active queue')), |
|
3137 | 3137 | ('c', 'create', False, _('create new queue')), |
|
3138 | 3138 | ('', 'rename', False, _('rename active queue')), |
|
3139 | 3139 | ('', 'delete', False, _('delete reference to queue')), |
|
3140 | 3140 | ('', 'purge', False, _('delete queue, and remove patch dir')), |
|
3141 | 3141 | ], |
|
3142 | 3142 | _('[OPTION] [QUEUE]')) |
|
3143 | 3143 | def qqueue(ui, repo, name=None, **opts): |
|
3144 | 3144 | '''manage multiple patch queues |
|
3145 | 3145 | |
|
3146 | 3146 | Supports switching between different patch queues, as well as creating |
|
3147 | 3147 | new patch queues and deleting existing ones. |
|
3148 | 3148 | |
|
3149 | 3149 | Omitting a queue name or specifying -l/--list will show you the registered |
|
3150 | 3150 | queues - by default the "normal" patches queue is registered. The currently |
|
3151 | 3151 | active queue will be marked with "(active)". Specifying --active will print |
|
3152 | 3152 | only the name of the active queue. |
|
3153 | 3153 | |
|
3154 | 3154 | To create a new queue, use -c/--create. The queue is automatically made |
|
3155 | 3155 | active, except in the case where there are applied patches from the |
|
3156 | 3156 | currently active queue in the repository. Then the queue will only be |
|
3157 | 3157 | created and switching will fail. |
|
3158 | 3158 | |
|
3159 | 3159 | To delete an existing queue, use --delete. You cannot delete the currently |
|
3160 | 3160 | active queue. |
|
3161 | 3161 | |
|
3162 | 3162 | Returns 0 on success. |
|
3163 | 3163 | ''' |
|
3164 | 3164 | q = repo.mq |
|
3165 | 3165 | _defaultqueue = 'patches' |
|
3166 | 3166 | _allqueues = 'patches.queues' |
|
3167 | 3167 | _activequeue = 'patches.queue' |
|
3168 | 3168 | |
|
3169 | 3169 | def _getcurrent(): |
|
3170 | 3170 | cur = os.path.basename(q.path) |
|
3171 | 3171 | if cur.startswith('patches-'): |
|
3172 | 3172 | cur = cur[8:] |
|
3173 | 3173 | return cur |
|
3174 | 3174 | |
|
3175 | 3175 | def _noqueues(): |
|
3176 | 3176 | try: |
|
3177 | 3177 | fh = repo.opener(_allqueues, 'r') |
|
3178 | 3178 | fh.close() |
|
3179 | 3179 | except IOError: |
|
3180 | 3180 | return True |
|
3181 | 3181 | |
|
3182 | 3182 | return False |
|
3183 | 3183 | |
|
3184 | 3184 | def _getqueues(): |
|
3185 | 3185 | current = _getcurrent() |
|
3186 | 3186 | |
|
3187 | 3187 | try: |
|
3188 | 3188 | fh = repo.opener(_allqueues, 'r') |
|
3189 | 3189 | queues = [queue.strip() for queue in fh if queue.strip()] |
|
3190 | 3190 | fh.close() |
|
3191 | 3191 | if current not in queues: |
|
3192 | 3192 | queues.append(current) |
|
3193 | 3193 | except IOError: |
|
3194 | 3194 | queues = [_defaultqueue] |
|
3195 | 3195 | |
|
3196 | 3196 | return sorted(queues) |
|
3197 | 3197 | |
|
3198 | 3198 | def _setactive(name): |
|
3199 | 3199 | if q.applied: |
|
3200 | 3200 | raise util.Abort(_('patches applied - cannot set new queue active')) |
|
3201 | 3201 | _setactivenocheck(name) |
|
3202 | 3202 | |
|
3203 | 3203 | def _setactivenocheck(name): |
|
3204 | 3204 | fh = repo.opener(_activequeue, 'w') |
|
3205 | 3205 | if name != 'patches': |
|
3206 | 3206 | fh.write(name) |
|
3207 | 3207 | fh.close() |
|
3208 | 3208 | |
|
3209 | 3209 | def _addqueue(name): |
|
3210 | 3210 | fh = repo.opener(_allqueues, 'a') |
|
3211 | 3211 | fh.write('%s\n' % (name,)) |
|
3212 | 3212 | fh.close() |
|
3213 | 3213 | |
|
3214 | 3214 | def _queuedir(name): |
|
3215 | 3215 | if name == 'patches': |
|
3216 | 3216 | return repo.join('patches') |
|
3217 | 3217 | else: |
|
3218 | 3218 | return repo.join('patches-' + name) |
|
3219 | 3219 | |
|
3220 | 3220 | def _validname(name): |
|
3221 | 3221 | for n in name: |
|
3222 | 3222 | if n in ':\\/.': |
|
3223 | 3223 | return False |
|
3224 | 3224 | return True |
|
3225 | 3225 | |
|
3226 | 3226 | def _delete(name): |
|
3227 | 3227 | if name not in existing: |
|
3228 | 3228 | raise util.Abort(_('cannot delete queue that does not exist')) |
|
3229 | 3229 | |
|
3230 | 3230 | current = _getcurrent() |
|
3231 | 3231 | |
|
3232 | 3232 | if name == current: |
|
3233 | 3233 | raise util.Abort(_('cannot delete currently active queue')) |
|
3234 | 3234 | |
|
3235 | 3235 | fh = repo.opener('patches.queues.new', 'w') |
|
3236 | 3236 | for queue in existing: |
|
3237 | 3237 | if queue == name: |
|
3238 | 3238 | continue |
|
3239 | 3239 | fh.write('%s\n' % (queue,)) |
|
3240 | 3240 | fh.close() |
|
3241 | 3241 | util.rename(repo.join('patches.queues.new'), repo.join(_allqueues)) |
|
3242 | 3242 | |
|
3243 | 3243 | if not name or opts.get('list') or opts.get('active'): |
|
3244 | 3244 | current = _getcurrent() |
|
3245 | 3245 | if opts.get('active'): |
|
3246 | 3246 | ui.write('%s\n' % (current,)) |
|
3247 | 3247 | return |
|
3248 | 3248 | for queue in _getqueues(): |
|
3249 | 3249 | ui.write('%s' % (queue,)) |
|
3250 | 3250 | if queue == current and not ui.quiet: |
|
3251 | 3251 | ui.write(_(' (active)\n')) |
|
3252 | 3252 | else: |
|
3253 | 3253 | ui.write('\n') |
|
3254 | 3254 | return |
|
3255 | 3255 | |
|
3256 | 3256 | if not _validname(name): |
|
3257 | 3257 | raise util.Abort( |
|
3258 | 3258 | _('invalid queue name, may not contain the characters ":\\/."')) |
|
3259 | 3259 | |
|
3260 | 3260 | existing = _getqueues() |
|
3261 | 3261 | |
|
3262 | 3262 | if opts.get('create'): |
|
3263 | 3263 | if name in existing: |
|
3264 | 3264 | raise util.Abort(_('queue "%s" already exists') % name) |
|
3265 | 3265 | if _noqueues(): |
|
3266 | 3266 | _addqueue(_defaultqueue) |
|
3267 | 3267 | _addqueue(name) |
|
3268 | 3268 | _setactive(name) |
|
3269 | 3269 | elif opts.get('rename'): |
|
3270 | 3270 | current = _getcurrent() |
|
3271 | 3271 | if name == current: |
|
3272 | 3272 | raise util.Abort(_('can\'t rename "%s" to its current name') % name) |
|
3273 | 3273 | if name in existing: |
|
3274 | 3274 | raise util.Abort(_('queue "%s" already exists') % name) |
|
3275 | 3275 | |
|
3276 | 3276 | olddir = _queuedir(current) |
|
3277 | 3277 | newdir = _queuedir(name) |
|
3278 | 3278 | |
|
3279 | 3279 | if os.path.exists(newdir): |
|
3280 | 3280 | raise util.Abort(_('non-queue directory "%s" already exists') % |
|
3281 | 3281 | newdir) |
|
3282 | 3282 | |
|
3283 | 3283 | fh = repo.opener('patches.queues.new', 'w') |
|
3284 | 3284 | for queue in existing: |
|
3285 | 3285 | if queue == current: |
|
3286 | 3286 | fh.write('%s\n' % (name,)) |
|
3287 | 3287 | if os.path.exists(olddir): |
|
3288 | 3288 | util.rename(olddir, newdir) |
|
3289 | 3289 | else: |
|
3290 | 3290 | fh.write('%s\n' % (queue,)) |
|
3291 | 3291 | fh.close() |
|
3292 | 3292 | util.rename(repo.join('patches.queues.new'), repo.join(_allqueues)) |
|
3293 | 3293 | _setactivenocheck(name) |
|
3294 | 3294 | elif opts.get('delete'): |
|
3295 | 3295 | _delete(name) |
|
3296 | 3296 | elif opts.get('purge'): |
|
3297 | 3297 | if name in existing: |
|
3298 | 3298 | _delete(name) |
|
3299 | 3299 | qdir = _queuedir(name) |
|
3300 | 3300 | if os.path.exists(qdir): |
|
3301 | 3301 | shutil.rmtree(qdir) |
|
3302 | 3302 | else: |
|
3303 | 3303 | if name not in existing: |
|
3304 | 3304 | raise util.Abort(_('use --create to create a new queue')) |
|
3305 | 3305 | _setactive(name) |
|
3306 | 3306 | |
|
3307 | 3307 | def mqphasedefaults(repo, roots): |
|
3308 | 3308 | """callback used to set mq changeset as secret when no phase data exists""" |
|
3309 | 3309 | if repo.mq.applied: |
|
3310 | 3310 | if repo.ui.configbool('mq', 'secret', False): |
|
3311 | 3311 | mqphase = phases.secret |
|
3312 | 3312 | else: |
|
3313 | 3313 | mqphase = phases.draft |
|
3314 | 3314 | qbase = repo[repo.mq.applied[0].node] |
|
3315 | 3315 | roots[mqphase].add(qbase.node()) |
|
3316 | 3316 | return roots |
|
3317 | 3317 | |
|
3318 | 3318 | def reposetup(ui, repo): |
|
3319 | 3319 | class mqrepo(repo.__class__): |
|
3320 | 3320 | @util.propertycache |
|
3321 | 3321 | def mq(self): |
|
3322 | 3322 | return queue(self.ui, self.path) |
|
3323 | 3323 | |
|
3324 | 3324 | def abortifwdirpatched(self, errmsg, force=False): |
|
3325 | 3325 | if self.mq.applied and not force: |
|
3326 | 3326 | parents = self.dirstate.parents() |
|
3327 | 3327 | patches = [s.node for s in self.mq.applied] |
|
3328 | 3328 | if parents[0] in patches or parents[1] in patches: |
|
3329 | 3329 | raise util.Abort(errmsg) |
|
3330 | 3330 | |
|
3331 | 3331 | def commit(self, text="", user=None, date=None, match=None, |
|
3332 | 3332 | force=False, editor=False, extra={}): |
|
3333 | 3333 | self.abortifwdirpatched( |
|
3334 | 3334 | _('cannot commit over an applied mq patch'), |
|
3335 | 3335 | force) |
|
3336 | 3336 | |
|
3337 | 3337 | return super(mqrepo, self).commit(text, user, date, match, force, |
|
3338 | 3338 | editor, extra) |
|
3339 | 3339 | |
|
3340 | 3340 | def checkpush(self, force, revs): |
|
3341 | 3341 | if self.mq.applied and not force: |
|
3342 | 3342 | outapplied = [e.node for e in self.mq.applied] |
|
3343 | 3343 | if revs: |
|
3344 | 3344 | # Assume applied patches have no non-patch descendants and |
|
3345 | 3345 | # are not on remote already. Filtering any changeset not |
|
3346 | 3346 | # pushed. |
|
3347 | 3347 | heads = set(revs) |
|
3348 | 3348 | for node in reversed(outapplied): |
|
3349 | 3349 | if node in heads: |
|
3350 | 3350 | break |
|
3351 | 3351 | else: |
|
3352 | 3352 | outapplied.pop() |
|
3353 | 3353 | # looking for pushed and shared changeset |
|
3354 | 3354 | for node in outapplied: |
|
3355 | 3355 | if repo[node].phase() < phases.secret: |
|
3356 | 3356 | raise util.Abort(_('source has mq patches applied')) |
|
3357 | 3357 | # no non-secret patches pushed |
|
3358 | 3358 | super(mqrepo, self).checkpush(force, revs) |
|
3359 | 3359 | |
|
3360 | 3360 | def _findtags(self): |
|
3361 | 3361 | '''augment tags from base class with patch tags''' |
|
3362 | 3362 | result = super(mqrepo, self)._findtags() |
|
3363 | 3363 | |
|
3364 | 3364 | q = self.mq |
|
3365 | 3365 | if not q.applied: |
|
3366 | 3366 | return result |
|
3367 | 3367 | |
|
3368 | 3368 | mqtags = [(patch.node, patch.name) for patch in q.applied] |
|
3369 | 3369 | |
|
3370 | 3370 | try: |
|
3371 | 3371 | self.changelog.rev(mqtags[-1][0]) |
|
3372 | 3372 | except error.LookupError: |
|
3373 | 3373 | self.ui.warn(_('mq status file refers to unknown node %s\n') |
|
3374 | 3374 | % short(mqtags[-1][0])) |
|
3375 | 3375 | return result |
|
3376 | 3376 | |
|
3377 | 3377 | mqtags.append((mqtags[-1][0], 'qtip')) |
|
3378 | 3378 | mqtags.append((mqtags[0][0], 'qbase')) |
|
3379 | 3379 | mqtags.append((self.changelog.parents(mqtags[0][0])[0], 'qparent')) |
|
3380 | 3380 | tags = result[0] |
|
3381 | 3381 | for patch in mqtags: |
|
3382 | 3382 | if patch[1] in tags: |
|
3383 | 3383 | self.ui.warn(_('Tag %s overrides mq patch of the same ' |
|
3384 | 3384 | 'name\n') % patch[1]) |
|
3385 | 3385 | else: |
|
3386 | 3386 | tags[patch[1]] = patch[0] |
|
3387 | 3387 | |
|
3388 | 3388 | return result |
|
3389 | 3389 | |
|
3390 | 3390 | def _branchtags(self, partial, lrev): |
|
3391 | 3391 | q = self.mq |
|
3392 | 3392 | cl = self.changelog |
|
3393 | 3393 | qbase = None |
|
3394 | 3394 | if not q.applied: |
|
3395 | 3395 | if getattr(self, '_committingpatch', False): |
|
3396 | 3396 | # Committing a new patch, must be tip |
|
3397 | 3397 | qbase = len(cl) - 1 |
|
3398 | 3398 | else: |
|
3399 | 3399 | qbasenode = q.applied[0].node |
|
3400 | 3400 | try: |
|
3401 | 3401 | qbase = cl.rev(qbasenode) |
|
3402 | 3402 | except error.LookupError: |
|
3403 | 3403 | self.ui.warn(_('mq status file refers to unknown node %s\n') |
|
3404 | 3404 | % short(qbasenode)) |
|
3405 | 3405 | if qbase is None: |
|
3406 | 3406 | return super(mqrepo, self)._branchtags(partial, lrev) |
|
3407 | 3407 | |
|
3408 | 3408 | start = lrev + 1 |
|
3409 | 3409 | if start < qbase: |
|
3410 | 3410 | # update the cache (excluding the patches) and save it |
|
3411 | 3411 | ctxgen = (self[r] for r in xrange(lrev + 1, qbase)) |
|
3412 | 3412 | self._updatebranchcache(partial, ctxgen) |
|
3413 | 3413 | self._writebranchcache(partial, cl.node(qbase - 1), qbase - 1) |
|
3414 | 3414 | start = qbase |
|
3415 | 3415 | # if start = qbase, the cache is as updated as it should be. |
|
3416 | 3416 | # if start > qbase, the cache includes (part of) the patches. |
|
3417 | 3417 | # we might as well use it, but we won't save it. |
|
3418 | 3418 | |
|
3419 | 3419 | # update the cache up to the tip |
|
3420 | 3420 | ctxgen = (self[r] for r in xrange(start, len(cl))) |
|
3421 | 3421 | self._updatebranchcache(partial, ctxgen) |
|
3422 | 3422 | |
|
3423 | 3423 | return partial |
|
3424 | 3424 | |
|
3425 | 3425 | if repo.local(): |
|
3426 | 3426 | repo.__class__ = mqrepo |
|
3427 | 3427 | |
|
3428 | 3428 | repo._phasedefaults.append(mqphasedefaults) |
|
3429 | 3429 | |
|
3430 | 3430 | def mqimport(orig, ui, repo, *args, **kwargs): |
|
3431 | 3431 | if (util.safehasattr(repo, 'abortifwdirpatched') |
|
3432 | 3432 | and not kwargs.get('no_commit', False)): |
|
3433 | 3433 | repo.abortifwdirpatched(_('cannot import over an applied patch'), |
|
3434 | 3434 | kwargs.get('force')) |
|
3435 | 3435 | return orig(ui, repo, *args, **kwargs) |
|
3436 | 3436 | |
|
3437 | 3437 | def mqinit(orig, ui, *args, **kwargs): |
|
3438 | 3438 | mq = kwargs.pop('mq', None) |
|
3439 | 3439 | |
|
3440 | 3440 | if not mq: |
|
3441 | 3441 | return orig(ui, *args, **kwargs) |
|
3442 | 3442 | |
|
3443 | 3443 | if args: |
|
3444 | 3444 | repopath = args[0] |
|
3445 | 3445 | if not hg.islocal(repopath): |
|
3446 | 3446 | raise util.Abort(_('only a local queue repository ' |
|
3447 | 3447 | 'may be initialized')) |
|
3448 | 3448 | else: |
|
3449 | 3449 | repopath = cmdutil.findrepo(os.getcwd()) |
|
3450 | 3450 | if not repopath: |
|
3451 | 3451 | raise util.Abort(_('there is no Mercurial repository here ' |
|
3452 | 3452 | '(.hg not found)')) |
|
3453 | 3453 | repo = hg.repository(ui, repopath) |
|
3454 | 3454 | return qinit(ui, repo, True) |
|
3455 | 3455 | |
|
3456 | 3456 | def mqcommand(orig, ui, repo, *args, **kwargs): |
|
3457 | 3457 | """Add --mq option to operate on patch repository instead of main""" |
|
3458 | 3458 | |
|
3459 | 3459 | # some commands do not like getting unknown options |
|
3460 | 3460 | mq = kwargs.pop('mq', None) |
|
3461 | 3461 | |
|
3462 | 3462 | if not mq: |
|
3463 | 3463 | return orig(ui, repo, *args, **kwargs) |
|
3464 | 3464 | |
|
3465 | 3465 | q = repo.mq |
|
3466 | 3466 | r = q.qrepo() |
|
3467 | 3467 | if not r: |
|
3468 | 3468 | raise util.Abort(_('no queue repository')) |
|
3469 | 3469 | return orig(r.ui, r, *args, **kwargs) |
|
3470 | 3470 | |
|
3471 | 3471 | def summary(orig, ui, repo, *args, **kwargs): |
|
3472 | 3472 | r = orig(ui, repo, *args, **kwargs) |
|
3473 | 3473 | q = repo.mq |
|
3474 | 3474 | m = [] |
|
3475 | 3475 | a, u = len(q.applied), len(q.unapplied(repo)) |
|
3476 | 3476 | if a: |
|
3477 | 3477 | m.append(ui.label(_("%d applied"), 'qseries.applied') % a) |
|
3478 | 3478 | if u: |
|
3479 | 3479 | m.append(ui.label(_("%d unapplied"), 'qseries.unapplied') % u) |
|
3480 | 3480 | if m: |
|
3481 | 3481 | ui.write("mq: %s\n" % ', '.join(m)) |
|
3482 | 3482 | else: |
|
3483 | 3483 | ui.note(_("mq: (empty queue)\n")) |
|
3484 | 3484 | return r |
|
3485 | 3485 | |
|
3486 | 3486 | def revsetmq(repo, subset, x): |
|
3487 | 3487 | """``mq()`` |
|
3488 | 3488 | Changesets managed by MQ. |
|
3489 | 3489 | """ |
|
3490 | 3490 | revset.getargs(x, 0, 0, _("mq takes no arguments")) |
|
3491 | 3491 | applied = set([repo[r.node].rev() for r in repo.mq.applied]) |
|
3492 | 3492 | return [r for r in subset if r in applied] |
|
3493 | 3493 | |
|
3494 | 3494 | def extsetup(ui): |
|
3495 | 3495 | revset.symbols['mq'] = revsetmq |
|
3496 | 3496 | |
|
3497 | 3497 | # tell hggettext to extract docstrings from these functions: |
|
3498 | 3498 | i18nfunctions = [revsetmq] |
|
3499 | 3499 | |
|
3500 | 3500 | def uisetup(ui): |
|
3501 | 3501 | mqopt = [('', 'mq', None, _("operate on patch repository"))] |
|
3502 | 3502 | |
|
3503 | 3503 | extensions.wrapcommand(commands.table, 'import', mqimport) |
|
3504 | 3504 | extensions.wrapcommand(commands.table, 'summary', summary) |
|
3505 | 3505 | |
|
3506 | 3506 | entry = extensions.wrapcommand(commands.table, 'init', mqinit) |
|
3507 | 3507 | entry[1].extend(mqopt) |
|
3508 | 3508 | |
|
3509 | 3509 | nowrap = set(commands.norepo.split(" ")) |
|
3510 | 3510 | |
|
3511 | 3511 | def dotable(cmdtable): |
|
3512 | 3512 | for cmd in cmdtable.keys(): |
|
3513 | 3513 | cmd = cmdutil.parsealiases(cmd)[0] |
|
3514 | 3514 | if cmd in nowrap: |
|
3515 | 3515 | continue |
|
3516 | 3516 | entry = extensions.wrapcommand(cmdtable, cmd, mqcommand) |
|
3517 | 3517 | entry[1].extend(mqopt) |
|
3518 | 3518 | |
|
3519 | 3519 | dotable(commands.table) |
|
3520 | 3520 | |
|
3521 | 3521 | for extname, extmodule in extensions.extensions(): |
|
3522 | 3522 | if extmodule.__file__ != __file__: |
|
3523 | 3523 | dotable(getattr(extmodule, 'cmdtable', {})) |
|
3524 | 3524 | |
|
3525 | 3525 | |
|
3526 | 3526 | colortable = {'qguard.negative': 'red', |
|
3527 | 3527 | 'qguard.positive': 'yellow', |
|
3528 | 3528 | 'qguard.unguarded': 'green', |
|
3529 | 3529 | 'qseries.applied': 'blue bold underline', |
|
3530 | 3530 | 'qseries.guarded': 'black bold', |
|
3531 | 3531 | 'qseries.missing': 'red bold', |
|
3532 | 3532 | 'qseries.unapplied': 'black bold'} |
@@ -1,5772 +1,5772 b'' | |||
|
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, bin, nullid, nullrev, short |
|
9 | 9 | from lock import release |
|
10 | 10 | from i18n import _, gettext |
|
11 | 11 | import os, re, difflib, time, tempfile, errno |
|
12 | 12 | import hg, scmutil, util, revlog, extensions, copies, error, bookmarks |
|
13 | 13 | import patch, help, url, encoding, templatekw, discovery |
|
14 | 14 | import archival, changegroup, cmdutil, hbisect |
|
15 | 15 | import sshserver, hgweb, hgweb.server, commandserver |
|
16 | 16 | import merge as mergemod |
|
17 | 17 | import minirst, revset, fileset |
|
18 | 18 | import dagparser, context, simplemerge |
|
19 | 19 | import random, setdiscovery, treediscovery, dagutil, pvec |
|
20 | 20 | import phases |
|
21 | 21 | |
|
22 | 22 | table = {} |
|
23 | 23 | |
|
24 | 24 | command = cmdutil.command(table) |
|
25 | 25 | |
|
26 | 26 | # common command options |
|
27 | 27 | |
|
28 | 28 | globalopts = [ |
|
29 | 29 | ('R', 'repository', '', |
|
30 | 30 | _('repository root directory or name of overlay bundle file'), |
|
31 | 31 | _('REPO')), |
|
32 | 32 | ('', 'cwd', '', |
|
33 | 33 | _('change working directory'), _('DIR')), |
|
34 | 34 | ('y', 'noninteractive', None, |
|
35 | 35 | _('do not prompt, automatically pick the first choice for all prompts')), |
|
36 | 36 | ('q', 'quiet', None, _('suppress output')), |
|
37 | 37 | ('v', 'verbose', None, _('enable additional output')), |
|
38 | 38 | ('', 'config', [], |
|
39 | 39 | _('set/override config option (use \'section.name=value\')'), |
|
40 | 40 | _('CONFIG')), |
|
41 | 41 | ('', 'debug', None, _('enable debugging output')), |
|
42 | 42 | ('', 'debugger', None, _('start debugger')), |
|
43 | 43 | ('', 'encoding', encoding.encoding, _('set the charset encoding'), |
|
44 | 44 | _('ENCODE')), |
|
45 | 45 | ('', 'encodingmode', encoding.encodingmode, |
|
46 | 46 | _('set the charset encoding mode'), _('MODE')), |
|
47 | 47 | ('', 'traceback', None, _('always print a traceback on exception')), |
|
48 | 48 | ('', 'time', None, _('time how long the command takes')), |
|
49 | 49 | ('', 'profile', None, _('print command execution profile')), |
|
50 | 50 | ('', 'version', None, _('output version information and exit')), |
|
51 | 51 | ('h', 'help', None, _('display help and exit')), |
|
52 | 52 | ] |
|
53 | 53 | |
|
54 | 54 | dryrunopts = [('n', 'dry-run', None, |
|
55 | 55 | _('do not perform actions, just print output'))] |
|
56 | 56 | |
|
57 | 57 | remoteopts = [ |
|
58 | 58 | ('e', 'ssh', '', |
|
59 | 59 | _('specify ssh command to use'), _('CMD')), |
|
60 | 60 | ('', 'remotecmd', '', |
|
61 | 61 | _('specify hg command to run on the remote side'), _('CMD')), |
|
62 | 62 | ('', 'insecure', None, |
|
63 | 63 | _('do not verify server certificate (ignoring web.cacerts config)')), |
|
64 | 64 | ] |
|
65 | 65 | |
|
66 | 66 | walkopts = [ |
|
67 | 67 | ('I', 'include', [], |
|
68 | 68 | _('include names matching the given patterns'), _('PATTERN')), |
|
69 | 69 | ('X', 'exclude', [], |
|
70 | 70 | _('exclude names matching the given patterns'), _('PATTERN')), |
|
71 | 71 | ] |
|
72 | 72 | |
|
73 | 73 | commitopts = [ |
|
74 | 74 | ('m', 'message', '', |
|
75 | 75 | _('use text as commit message'), _('TEXT')), |
|
76 | 76 | ('l', 'logfile', '', |
|
77 | 77 | _('read commit message from file'), _('FILE')), |
|
78 | 78 | ] |
|
79 | 79 | |
|
80 | 80 | commitopts2 = [ |
|
81 | 81 | ('d', 'date', '', |
|
82 | 82 | _('record the specified date as commit date'), _('DATE')), |
|
83 | 83 | ('u', 'user', '', |
|
84 | 84 | _('record the specified user as committer'), _('USER')), |
|
85 | 85 | ] |
|
86 | 86 | |
|
87 | 87 | templateopts = [ |
|
88 | 88 | ('', 'style', '', |
|
89 | 89 | _('display using template map file'), _('STYLE')), |
|
90 | 90 | ('', 'template', '', |
|
91 | 91 | _('display with template'), _('TEMPLATE')), |
|
92 | 92 | ] |
|
93 | 93 | |
|
94 | 94 | logopts = [ |
|
95 | 95 | ('p', 'patch', None, _('show patch')), |
|
96 | 96 | ('g', 'git', None, _('use git extended diff format')), |
|
97 | 97 | ('l', 'limit', '', |
|
98 | 98 | _('limit number of changes displayed'), _('NUM')), |
|
99 | 99 | ('M', 'no-merges', None, _('do not show merges')), |
|
100 | 100 | ('', 'stat', None, _('output diffstat-style summary of changes')), |
|
101 | 101 | ] + templateopts |
|
102 | 102 | |
|
103 | 103 | diffopts = [ |
|
104 | 104 | ('a', 'text', None, _('treat all files as text')), |
|
105 | 105 | ('g', 'git', None, _('use git extended diff format')), |
|
106 | 106 | ('', 'nodates', None, _('omit dates from diff headers')) |
|
107 | 107 | ] |
|
108 | 108 | |
|
109 | 109 | diffwsopts = [ |
|
110 | 110 | ('w', 'ignore-all-space', None, |
|
111 | 111 | _('ignore white space when comparing lines')), |
|
112 | 112 | ('b', 'ignore-space-change', None, |
|
113 | 113 | _('ignore changes in the amount of white space')), |
|
114 | 114 | ('B', 'ignore-blank-lines', None, |
|
115 | 115 | _('ignore changes whose lines are all blank')), |
|
116 | 116 | ] |
|
117 | 117 | |
|
118 | 118 | diffopts2 = [ |
|
119 | 119 | ('p', 'show-function', None, _('show which function each change is in')), |
|
120 | 120 | ('', 'reverse', None, _('produce a diff that undoes the changes')), |
|
121 | 121 | ] + diffwsopts + [ |
|
122 | 122 | ('U', 'unified', '', |
|
123 | 123 | _('number of lines of context to show'), _('NUM')), |
|
124 | 124 | ('', 'stat', None, _('output diffstat-style summary of changes')), |
|
125 | 125 | ] |
|
126 | 126 | |
|
127 | 127 | mergetoolopts = [ |
|
128 | 128 | ('t', 'tool', '', _('specify merge tool')), |
|
129 | 129 | ] |
|
130 | 130 | |
|
131 | 131 | similarityopts = [ |
|
132 | 132 | ('s', 'similarity', '', |
|
133 | 133 | _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY')) |
|
134 | 134 | ] |
|
135 | 135 | |
|
136 | 136 | subrepoopts = [ |
|
137 | 137 | ('S', 'subrepos', None, |
|
138 | 138 | _('recurse into subrepositories')) |
|
139 | 139 | ] |
|
140 | 140 | |
|
141 | 141 | # Commands start here, listed alphabetically |
|
142 | 142 | |
|
143 | 143 | @command('^add', |
|
144 | 144 | walkopts + subrepoopts + dryrunopts, |
|
145 | 145 | _('[OPTION]... [FILE]...')) |
|
146 | 146 | def add(ui, repo, *pats, **opts): |
|
147 | 147 | """add the specified files on the next commit |
|
148 | 148 | |
|
149 | 149 | Schedule files to be version controlled and added to the |
|
150 | 150 | repository. |
|
151 | 151 | |
|
152 | 152 | The files will be added to the repository at the next commit. To |
|
153 | 153 | undo an add before that, see :hg:`forget`. |
|
154 | 154 | |
|
155 | 155 | If no names are given, add all files to the repository. |
|
156 | 156 | |
|
157 | 157 | .. container:: verbose |
|
158 | 158 | |
|
159 | 159 | An example showing how new (unknown) files are added |
|
160 | 160 | automatically by :hg:`add`:: |
|
161 | 161 | |
|
162 | 162 | $ ls |
|
163 | 163 | foo.c |
|
164 | 164 | $ hg status |
|
165 | 165 | ? foo.c |
|
166 | 166 | $ hg add |
|
167 | 167 | adding foo.c |
|
168 | 168 | $ hg status |
|
169 | 169 | A foo.c |
|
170 | 170 | |
|
171 | 171 | Returns 0 if all files are successfully added. |
|
172 | 172 | """ |
|
173 | 173 | |
|
174 | 174 | m = scmutil.match(repo[None], pats, opts) |
|
175 | 175 | rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'), |
|
176 | 176 | opts.get('subrepos'), prefix="", explicitonly=False) |
|
177 | 177 | return rejected and 1 or 0 |
|
178 | 178 | |
|
179 | 179 | @command('addremove', |
|
180 | 180 | similarityopts + walkopts + dryrunopts, |
|
181 | 181 | _('[OPTION]... [FILE]...')) |
|
182 | 182 | def addremove(ui, repo, *pats, **opts): |
|
183 | 183 | """add all new files, delete all missing files |
|
184 | 184 | |
|
185 | 185 | Add all new files and remove all missing files from the |
|
186 | 186 | repository. |
|
187 | 187 | |
|
188 | 188 | New files are ignored if they match any of the patterns in |
|
189 | 189 | ``.hgignore``. As with add, these changes take effect at the next |
|
190 | 190 | commit. |
|
191 | 191 | |
|
192 | 192 | Use the -s/--similarity option to detect renamed files. With a |
|
193 | 193 | parameter greater than 0, this compares every removed file with |
|
194 | 194 | every added file and records those similar enough as renames. This |
|
195 | 195 | option takes a percentage between 0 (disabled) and 100 (files must |
|
196 | 196 | be identical) as its parameter. Detecting renamed files this way |
|
197 | 197 | can be expensive. After using this option, :hg:`status -C` can be |
|
198 | 198 | used to check which files were identified as moved or renamed. |
|
199 | 199 | If this option is not specified, only renames of identical files |
|
200 | 200 | are detected. |
|
201 | 201 | |
|
202 | 202 | Returns 0 if all files are successfully added. |
|
203 | 203 | """ |
|
204 | 204 | try: |
|
205 | 205 | sim = float(opts.get('similarity') or 100) |
|
206 | 206 | except ValueError: |
|
207 | 207 | raise util.Abort(_('similarity must be a number')) |
|
208 | 208 | if sim < 0 or sim > 100: |
|
209 | 209 | raise util.Abort(_('similarity must be between 0 and 100')) |
|
210 | 210 | return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0) |
|
211 | 211 | |
|
212 | 212 | @command('^annotate|blame', |
|
213 | 213 | [('r', 'rev', '', _('annotate the specified revision'), _('REV')), |
|
214 | 214 | ('', 'follow', None, |
|
215 | 215 | _('follow copies/renames and list the filename (DEPRECATED)')), |
|
216 | 216 | ('', 'no-follow', None, _("don't follow copies and renames")), |
|
217 | 217 | ('a', 'text', None, _('treat all files as text')), |
|
218 | 218 | ('u', 'user', None, _('list the author (long with -v)')), |
|
219 | 219 | ('f', 'file', None, _('list the filename')), |
|
220 | 220 | ('d', 'date', None, _('list the date (short with -q)')), |
|
221 | 221 | ('n', 'number', None, _('list the revision number (default)')), |
|
222 | 222 | ('c', 'changeset', None, _('list the changeset')), |
|
223 | 223 | ('l', 'line-number', None, _('show line number at the first appearance')) |
|
224 | 224 | ] + diffwsopts + walkopts, |
|
225 | 225 | _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...')) |
|
226 | 226 | def annotate(ui, repo, *pats, **opts): |
|
227 | 227 | """show changeset information by line for each file |
|
228 | 228 | |
|
229 | 229 | List changes in files, showing the revision id responsible for |
|
230 | 230 | each line |
|
231 | 231 | |
|
232 | 232 | This command is useful for discovering when a change was made and |
|
233 | 233 | by whom. |
|
234 | 234 | |
|
235 | 235 | Without the -a/--text option, annotate will avoid processing files |
|
236 | 236 | it detects as binary. With -a, annotate will annotate the file |
|
237 | 237 | anyway, although the results will probably be neither useful |
|
238 | 238 | nor desirable. |
|
239 | 239 | |
|
240 | 240 | Returns 0 on success. |
|
241 | 241 | """ |
|
242 | 242 | if opts.get('follow'): |
|
243 | 243 | # --follow is deprecated and now just an alias for -f/--file |
|
244 | 244 | # to mimic the behavior of Mercurial before version 1.5 |
|
245 | 245 | opts['file'] = True |
|
246 | 246 | |
|
247 | 247 | datefunc = ui.quiet and util.shortdate or util.datestr |
|
248 | 248 | getdate = util.cachefunc(lambda x: datefunc(x[0].date())) |
|
249 | 249 | |
|
250 | 250 | if not pats: |
|
251 | 251 | raise util.Abort(_('at least one filename or pattern is required')) |
|
252 | 252 | |
|
253 | 253 | hexfn = ui.debugflag and hex or short |
|
254 | 254 | |
|
255 | 255 | opmap = [('user', ' ', lambda x: ui.shortuser(x[0].user())), |
|
256 | 256 | ('number', ' ', lambda x: str(x[0].rev())), |
|
257 | 257 | ('changeset', ' ', lambda x: hexfn(x[0].node())), |
|
258 | 258 | ('date', ' ', getdate), |
|
259 | 259 | ('file', ' ', lambda x: x[0].path()), |
|
260 | 260 | ('line_number', ':', lambda x: str(x[1])), |
|
261 | 261 | ] |
|
262 | 262 | |
|
263 | 263 | if (not opts.get('user') and not opts.get('changeset') |
|
264 | 264 | and not opts.get('date') and not opts.get('file')): |
|
265 | 265 | opts['number'] = True |
|
266 | 266 | |
|
267 | 267 | linenumber = opts.get('line_number') is not None |
|
268 | 268 | if linenumber and (not opts.get('changeset')) and (not opts.get('number')): |
|
269 | 269 | raise util.Abort(_('at least one of -n/-c is required for -l')) |
|
270 | 270 | |
|
271 | 271 | funcmap = [(func, sep) for op, sep, func in opmap if opts.get(op)] |
|
272 | 272 | funcmap[0] = (funcmap[0][0], '') # no separator in front of first column |
|
273 | 273 | |
|
274 | 274 | def bad(x, y): |
|
275 | 275 | raise util.Abort("%s: %s" % (x, y)) |
|
276 | 276 | |
|
277 | 277 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
278 | 278 | m = scmutil.match(ctx, pats, opts) |
|
279 | 279 | m.bad = bad |
|
280 | 280 | follow = not opts.get('no_follow') |
|
281 | 281 | diffopts = patch.diffopts(ui, opts, section='annotate') |
|
282 | 282 | for abs in ctx.walk(m): |
|
283 | 283 | fctx = ctx[abs] |
|
284 | 284 | if not opts.get('text') and util.binary(fctx.data()): |
|
285 | 285 | ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs)) |
|
286 | 286 | continue |
|
287 | 287 | |
|
288 | 288 | lines = fctx.annotate(follow=follow, linenumber=linenumber, |
|
289 | 289 | diffopts=diffopts) |
|
290 | 290 | pieces = [] |
|
291 | 291 | |
|
292 | 292 | for f, sep in funcmap: |
|
293 | 293 | l = [f(n) for n, dummy in lines] |
|
294 | 294 | if l: |
|
295 | 295 | sized = [(x, encoding.colwidth(x)) for x in l] |
|
296 | 296 | ml = max([w for x, w in sized]) |
|
297 | 297 | pieces.append(["%s%s%s" % (sep, ' ' * (ml - w), x) |
|
298 | 298 | for x, w in sized]) |
|
299 | 299 | |
|
300 | 300 | if pieces: |
|
301 | 301 | for p, l in zip(zip(*pieces), lines): |
|
302 | 302 | ui.write("%s: %s" % ("".join(p), l[1])) |
|
303 | 303 | |
|
304 | 304 | if lines and not lines[-1][1].endswith('\n'): |
|
305 | 305 | ui.write('\n') |
|
306 | 306 | |
|
307 | 307 | @command('archive', |
|
308 | 308 | [('', 'no-decode', None, _('do not pass files through decoders')), |
|
309 | 309 | ('p', 'prefix', '', _('directory prefix for files in archive'), |
|
310 | 310 | _('PREFIX')), |
|
311 | 311 | ('r', 'rev', '', _('revision to distribute'), _('REV')), |
|
312 | 312 | ('t', 'type', '', _('type of distribution to create'), _('TYPE')), |
|
313 | 313 | ] + subrepoopts + walkopts, |
|
314 | 314 | _('[OPTION]... DEST')) |
|
315 | 315 | def archive(ui, repo, dest, **opts): |
|
316 | 316 | '''create an unversioned archive of a repository revision |
|
317 | 317 | |
|
318 | 318 | By default, the revision used is the parent of the working |
|
319 | 319 | directory; use -r/--rev to specify a different revision. |
|
320 | 320 | |
|
321 | 321 | The archive type is automatically detected based on file |
|
322 | 322 | extension (or override using -t/--type). |
|
323 | 323 | |
|
324 | 324 | .. container:: verbose |
|
325 | 325 | |
|
326 | 326 | Examples: |
|
327 | 327 | |
|
328 | 328 | - create a zip file containing the 1.0 release:: |
|
329 | 329 | |
|
330 | 330 | hg archive -r 1.0 project-1.0.zip |
|
331 | 331 | |
|
332 | 332 | - create a tarball excluding .hg files:: |
|
333 | 333 | |
|
334 | 334 | hg archive project.tar.gz -X ".hg*" |
|
335 | 335 | |
|
336 | 336 | Valid types are: |
|
337 | 337 | |
|
338 | 338 | :``files``: a directory full of files (default) |
|
339 | 339 | :``tar``: tar archive, uncompressed |
|
340 | 340 | :``tbz2``: tar archive, compressed using bzip2 |
|
341 | 341 | :``tgz``: tar archive, compressed using gzip |
|
342 | 342 | :``uzip``: zip archive, uncompressed |
|
343 | 343 | :``zip``: zip archive, compressed using deflate |
|
344 | 344 | |
|
345 | 345 | The exact name of the destination archive or directory is given |
|
346 | 346 | using a format string; see :hg:`help export` for details. |
|
347 | 347 | |
|
348 | 348 | Each member added to an archive file has a directory prefix |
|
349 | 349 | prepended. Use -p/--prefix to specify a format string for the |
|
350 | 350 | prefix. The default is the basename of the archive, with suffixes |
|
351 | 351 | removed. |
|
352 | 352 | |
|
353 | 353 | Returns 0 on success. |
|
354 | 354 | ''' |
|
355 | 355 | |
|
356 | 356 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
357 | 357 | if not ctx: |
|
358 | 358 | raise util.Abort(_('no working directory: please specify a revision')) |
|
359 | 359 | node = ctx.node() |
|
360 | 360 | dest = cmdutil.makefilename(repo, dest, node) |
|
361 | 361 | if os.path.realpath(dest) == repo.root: |
|
362 | 362 | raise util.Abort(_('repository root cannot be destination')) |
|
363 | 363 | |
|
364 | 364 | kind = opts.get('type') or archival.guesskind(dest) or 'files' |
|
365 | 365 | prefix = opts.get('prefix') |
|
366 | 366 | |
|
367 | 367 | if dest == '-': |
|
368 | 368 | if kind == 'files': |
|
369 | 369 | raise util.Abort(_('cannot archive plain files to stdout')) |
|
370 | 370 | dest = cmdutil.makefileobj(repo, dest) |
|
371 | 371 | if not prefix: |
|
372 | 372 | prefix = os.path.basename(repo.root) + '-%h' |
|
373 | 373 | |
|
374 | 374 | prefix = cmdutil.makefilename(repo, prefix, node) |
|
375 | 375 | matchfn = scmutil.match(ctx, [], opts) |
|
376 | 376 | archival.archive(repo, dest, node, kind, not opts.get('no_decode'), |
|
377 | 377 | matchfn, prefix, subrepos=opts.get('subrepos')) |
|
378 | 378 | |
|
379 | 379 | @command('backout', |
|
380 | 380 | [('', 'merge', None, _('merge with old dirstate parent after backout')), |
|
381 | 381 | ('', 'parent', '', |
|
382 | 382 | _('parent to choose when backing out merge (DEPRECATED)'), _('REV')), |
|
383 | 383 | ('r', 'rev', '', _('revision to backout'), _('REV')), |
|
384 | 384 | ] + mergetoolopts + walkopts + commitopts + commitopts2, |
|
385 | 385 | _('[OPTION]... [-r] REV')) |
|
386 | 386 | def backout(ui, repo, node=None, rev=None, **opts): |
|
387 | 387 | '''reverse effect of earlier changeset |
|
388 | 388 | |
|
389 | 389 | Prepare a new changeset with the effect of REV undone in the |
|
390 | 390 | current working directory. |
|
391 | 391 | |
|
392 | 392 | If REV is the parent of the working directory, then this new changeset |
|
393 | 393 | is committed automatically. Otherwise, hg needs to merge the |
|
394 | 394 | changes and the merged result is left uncommitted. |
|
395 | 395 | |
|
396 | 396 | .. note:: |
|
397 | 397 | backout cannot be used to fix either an unwanted or |
|
398 | 398 | incorrect merge. |
|
399 | 399 | |
|
400 | 400 | .. container:: verbose |
|
401 | 401 | |
|
402 | 402 | By default, the pending changeset will have one parent, |
|
403 | 403 | maintaining a linear history. With --merge, the pending |
|
404 | 404 | changeset will instead have two parents: the old parent of the |
|
405 | 405 | working directory and a new child of REV that simply undoes REV. |
|
406 | 406 | |
|
407 | 407 | Before version 1.7, the behavior without --merge was equivalent |
|
408 | 408 | to specifying --merge followed by :hg:`update --clean .` to |
|
409 | 409 | cancel the merge and leave the child of REV as a head to be |
|
410 | 410 | merged separately. |
|
411 | 411 | |
|
412 | 412 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
413 | 413 | |
|
414 | 414 | Returns 0 on success. |
|
415 | 415 | ''' |
|
416 | 416 | if rev and node: |
|
417 | 417 | raise util.Abort(_("please specify just one revision")) |
|
418 | 418 | |
|
419 | 419 | if not rev: |
|
420 | 420 | rev = node |
|
421 | 421 | |
|
422 | 422 | if not rev: |
|
423 | 423 | raise util.Abort(_("please specify a revision to backout")) |
|
424 | 424 | |
|
425 | 425 | date = opts.get('date') |
|
426 | 426 | if date: |
|
427 | 427 | opts['date'] = util.parsedate(date) |
|
428 | 428 | |
|
429 | 429 | cmdutil.bailifchanged(repo) |
|
430 | 430 | node = scmutil.revsingle(repo, rev).node() |
|
431 | 431 | |
|
432 | 432 | op1, op2 = repo.dirstate.parents() |
|
433 | 433 | a = repo.changelog.ancestor(op1, node) |
|
434 | 434 | if a != node: |
|
435 | 435 | raise util.Abort(_('cannot backout change on a different branch')) |
|
436 | 436 | |
|
437 | 437 | p1, p2 = repo.changelog.parents(node) |
|
438 | 438 | if p1 == nullid: |
|
439 | 439 | raise util.Abort(_('cannot backout a change with no parents')) |
|
440 | 440 | if p2 != nullid: |
|
441 | 441 | if not opts.get('parent'): |
|
442 | 442 | raise util.Abort(_('cannot backout a merge changeset')) |
|
443 | 443 | p = repo.lookup(opts['parent']) |
|
444 | 444 | if p not in (p1, p2): |
|
445 | 445 | raise util.Abort(_('%s is not a parent of %s') % |
|
446 | 446 | (short(p), short(node))) |
|
447 | 447 | parent = p |
|
448 | 448 | else: |
|
449 | 449 | if opts.get('parent'): |
|
450 | 450 | raise util.Abort(_('cannot use --parent on non-merge changeset')) |
|
451 | 451 | parent = p1 |
|
452 | 452 | |
|
453 | 453 | # the backout should appear on the same branch |
|
454 | 454 | wlock = repo.wlock() |
|
455 | 455 | try: |
|
456 | 456 | branch = repo.dirstate.branch() |
|
457 | 457 | hg.clean(repo, node, show_stats=False) |
|
458 | 458 | repo.dirstate.setbranch(branch) |
|
459 | 459 | revert_opts = opts.copy() |
|
460 | 460 | revert_opts['date'] = None |
|
461 | 461 | revert_opts['all'] = True |
|
462 | 462 | revert_opts['rev'] = hex(parent) |
|
463 | 463 | revert_opts['no_backup'] = None |
|
464 | 464 | revert(ui, repo, **revert_opts) |
|
465 | 465 | if not opts.get('merge') and op1 != node: |
|
466 | 466 | try: |
|
467 | 467 | ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |
|
468 | 468 | return hg.update(repo, op1) |
|
469 | 469 | finally: |
|
470 | 470 | ui.setconfig('ui', 'forcemerge', '') |
|
471 | 471 | |
|
472 | 472 | commit_opts = opts.copy() |
|
473 | 473 | commit_opts['addremove'] = False |
|
474 | 474 | if not commit_opts['message'] and not commit_opts['logfile']: |
|
475 | 475 | # we don't translate commit messages |
|
476 | 476 | commit_opts['message'] = "Backed out changeset %s" % short(node) |
|
477 | 477 | commit_opts['force_editor'] = True |
|
478 | 478 | commit(ui, repo, **commit_opts) |
|
479 | 479 | def nice(node): |
|
480 | 480 | return '%d:%s' % (repo.changelog.rev(node), short(node)) |
|
481 | 481 | ui.status(_('changeset %s backs out changeset %s\n') % |
|
482 | 482 | (nice(repo.changelog.tip()), nice(node))) |
|
483 | 483 | if opts.get('merge') and op1 != node: |
|
484 | 484 | hg.clean(repo, op1, show_stats=False) |
|
485 | 485 | ui.status(_('merging with changeset %s\n') |
|
486 | 486 | % nice(repo.changelog.tip())) |
|
487 | 487 | try: |
|
488 | 488 | ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |
|
489 | 489 | return hg.merge(repo, hex(repo.changelog.tip())) |
|
490 | 490 | finally: |
|
491 | 491 | ui.setconfig('ui', 'forcemerge', '') |
|
492 | 492 | finally: |
|
493 | 493 | wlock.release() |
|
494 | 494 | return 0 |
|
495 | 495 | |
|
496 | 496 | @command('bisect', |
|
497 | 497 | [('r', 'reset', False, _('reset bisect state')), |
|
498 | 498 | ('g', 'good', False, _('mark changeset good')), |
|
499 | 499 | ('b', 'bad', False, _('mark changeset bad')), |
|
500 | 500 | ('s', 'skip', False, _('skip testing changeset')), |
|
501 | 501 | ('e', 'extend', False, _('extend the bisect range')), |
|
502 | 502 | ('c', 'command', '', _('use command to check changeset state'), _('CMD')), |
|
503 | 503 | ('U', 'noupdate', False, _('do not update to target'))], |
|
504 | 504 | _("[-gbsr] [-U] [-c CMD] [REV]")) |
|
505 | 505 | def bisect(ui, repo, rev=None, extra=None, command=None, |
|
506 | 506 | reset=None, good=None, bad=None, skip=None, extend=None, |
|
507 | 507 | noupdate=None): |
|
508 | 508 | """subdivision search of changesets |
|
509 | 509 | |
|
510 | 510 | This command helps to find changesets which introduce problems. To |
|
511 | 511 | use, mark the earliest changeset you know exhibits the problem as |
|
512 | 512 | bad, then mark the latest changeset which is free from the problem |
|
513 | 513 | as good. Bisect will update your working directory to a revision |
|
514 | 514 | for testing (unless the -U/--noupdate option is specified). Once |
|
515 | 515 | you have performed tests, mark the working directory as good or |
|
516 | 516 | bad, and bisect will either update to another candidate changeset |
|
517 | 517 | or announce that it has found the bad revision. |
|
518 | 518 | |
|
519 | 519 | As a shortcut, you can also use the revision argument to mark a |
|
520 | 520 | revision as good or bad without checking it out first. |
|
521 | 521 | |
|
522 | 522 | If you supply a command, it will be used for automatic bisection. |
|
523 | 523 | The environment variable HG_NODE will contain the ID of the |
|
524 | 524 | changeset being tested. The exit status of the command will be |
|
525 | 525 | used to mark revisions as good or bad: status 0 means good, 125 |
|
526 | 526 | means to skip the revision, 127 (command not found) will abort the |
|
527 | 527 | bisection, and any other non-zero exit status means the revision |
|
528 | 528 | is bad. |
|
529 | 529 | |
|
530 | 530 | .. container:: verbose |
|
531 | 531 | |
|
532 | 532 | Some examples: |
|
533 | 533 | |
|
534 | 534 | - start a bisection with known bad revision 12, and good revision 34:: |
|
535 | 535 | |
|
536 | 536 | hg bisect --bad 34 |
|
537 | 537 | hg bisect --good 12 |
|
538 | 538 | |
|
539 | 539 | - advance the current bisection by marking current revision as good or |
|
540 | 540 | bad:: |
|
541 | 541 | |
|
542 | 542 | hg bisect --good |
|
543 | 543 | hg bisect --bad |
|
544 | 544 | |
|
545 | 545 | - mark the current revision, or a known revision, to be skipped (eg. if |
|
546 | 546 | that revision is not usable because of another issue):: |
|
547 | 547 | |
|
548 | 548 | hg bisect --skip |
|
549 | 549 | hg bisect --skip 23 |
|
550 | 550 | |
|
551 | 551 | - forget the current bisection:: |
|
552 | 552 | |
|
553 | 553 | hg bisect --reset |
|
554 | 554 | |
|
555 | 555 | - use 'make && make tests' to automatically find the first broken |
|
556 | 556 | revision:: |
|
557 | 557 | |
|
558 | 558 | hg bisect --reset |
|
559 | 559 | hg bisect --bad 34 |
|
560 | 560 | hg bisect --good 12 |
|
561 | 561 | hg bisect --command 'make && make tests' |
|
562 | 562 | |
|
563 | 563 | - see all changesets whose states are already known in the current |
|
564 | 564 | bisection:: |
|
565 | 565 | |
|
566 | 566 | hg log -r "bisect(pruned)" |
|
567 | 567 | |
|
568 | 568 | - see the changeset currently being bisected (especially useful |
|
569 | 569 | if running with -U/--noupdate):: |
|
570 | 570 | |
|
571 | 571 | hg log -r "bisect(current)" |
|
572 | 572 | |
|
573 | 573 | - see all changesets that took part in the current bisection:: |
|
574 | 574 | |
|
575 | 575 | hg log -r "bisect(range)" |
|
576 | 576 | |
|
577 | 577 | - with the graphlog extension, you can even get a nice graph:: |
|
578 | 578 | |
|
579 | 579 | hg log --graph -r "bisect(range)" |
|
580 | 580 | |
|
581 | 581 | See :hg:`help revsets` for more about the `bisect()` keyword. |
|
582 | 582 | |
|
583 | 583 | Returns 0 on success. |
|
584 | 584 | """ |
|
585 | 585 | def extendbisectrange(nodes, good): |
|
586 | 586 | # bisect is incomplete when it ends on a merge node and |
|
587 | 587 | # one of the parent was not checked. |
|
588 | 588 | parents = repo[nodes[0]].parents() |
|
589 | 589 | if len(parents) > 1: |
|
590 | 590 | side = good and state['bad'] or state['good'] |
|
591 | 591 | num = len(set(i.node() for i in parents) & set(side)) |
|
592 | 592 | if num == 1: |
|
593 | 593 | return parents[0].ancestor(parents[1]) |
|
594 | 594 | return None |
|
595 | 595 | |
|
596 | 596 | def print_result(nodes, good): |
|
597 | 597 | displayer = cmdutil.show_changeset(ui, repo, {}) |
|
598 | 598 | if len(nodes) == 1: |
|
599 | 599 | # narrowed it down to a single revision |
|
600 | 600 | if good: |
|
601 | 601 | ui.write(_("The first good revision is:\n")) |
|
602 | 602 | else: |
|
603 | 603 | ui.write(_("The first bad revision is:\n")) |
|
604 | 604 | displayer.show(repo[nodes[0]]) |
|
605 | 605 | extendnode = extendbisectrange(nodes, good) |
|
606 | 606 | if extendnode is not None: |
|
607 | 607 | ui.write(_('Not all ancestors of this changeset have been' |
|
608 | 608 | ' checked.\nUse bisect --extend to continue the ' |
|
609 | 609 | 'bisection from\nthe common ancestor, %s.\n') |
|
610 | 610 | % extendnode) |
|
611 | 611 | else: |
|
612 | 612 | # multiple possible revisions |
|
613 | 613 | if good: |
|
614 | 614 | ui.write(_("Due to skipped revisions, the first " |
|
615 | 615 | "good revision could be any of:\n")) |
|
616 | 616 | else: |
|
617 | 617 | ui.write(_("Due to skipped revisions, the first " |
|
618 | 618 | "bad revision could be any of:\n")) |
|
619 | 619 | for n in nodes: |
|
620 | 620 | displayer.show(repo[n]) |
|
621 | 621 | displayer.close() |
|
622 | 622 | |
|
623 | 623 | def check_state(state, interactive=True): |
|
624 | 624 | if not state['good'] or not state['bad']: |
|
625 | 625 | if (good or bad or skip or reset) and interactive: |
|
626 | 626 | return |
|
627 | 627 | if not state['good']: |
|
628 | 628 | raise util.Abort(_('cannot bisect (no known good revisions)')) |
|
629 | 629 | else: |
|
630 | 630 | raise util.Abort(_('cannot bisect (no known bad revisions)')) |
|
631 | 631 | return True |
|
632 | 632 | |
|
633 | 633 | # backward compatibility |
|
634 | 634 | if rev in "good bad reset init".split(): |
|
635 | 635 | ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n")) |
|
636 | 636 | cmd, rev, extra = rev, extra, None |
|
637 | 637 | if cmd == "good": |
|
638 | 638 | good = True |
|
639 | 639 | elif cmd == "bad": |
|
640 | 640 | bad = True |
|
641 | 641 | else: |
|
642 | 642 | reset = True |
|
643 | 643 | elif extra or good + bad + skip + reset + extend + bool(command) > 1: |
|
644 | 644 | raise util.Abort(_('incompatible arguments')) |
|
645 | 645 | |
|
646 | 646 | if reset: |
|
647 | 647 | p = repo.join("bisect.state") |
|
648 | 648 | if os.path.exists(p): |
|
649 | 649 | os.unlink(p) |
|
650 | 650 | return |
|
651 | 651 | |
|
652 | 652 | state = hbisect.load_state(repo) |
|
653 | 653 | |
|
654 | 654 | if command: |
|
655 | 655 | changesets = 1 |
|
656 | 656 | try: |
|
657 | 657 | node = state['current'][0] |
|
658 | 658 | except LookupError: |
|
659 | 659 | if noupdate: |
|
660 | 660 | raise util.Abort(_('current bisect revision is unknown - ' |
|
661 | 661 | 'start a new bisect to fix')) |
|
662 | 662 | node, p2 = repo.dirstate.parents() |
|
663 | 663 | if p2 != nullid: |
|
664 | 664 | raise util.Abort(_('current bisect revision is a merge')) |
|
665 | 665 | try: |
|
666 | 666 | while changesets: |
|
667 | 667 | # update state |
|
668 | 668 | state['current'] = [node] |
|
669 | 669 | hbisect.save_state(repo, state) |
|
670 | 670 | status = util.system(command, |
|
671 | 671 | environ={'HG_NODE': hex(node)}, |
|
672 | 672 | out=ui.fout) |
|
673 | 673 | if status == 125: |
|
674 | 674 | transition = "skip" |
|
675 | 675 | elif status == 0: |
|
676 | 676 | transition = "good" |
|
677 | 677 | # status < 0 means process was killed |
|
678 | 678 | elif status == 127: |
|
679 | 679 | raise util.Abort(_("failed to execute %s") % command) |
|
680 | 680 | elif status < 0: |
|
681 | 681 | raise util.Abort(_("%s killed") % command) |
|
682 | 682 | else: |
|
683 | 683 | transition = "bad" |
|
684 | 684 | ctx = scmutil.revsingle(repo, rev, node) |
|
685 | 685 | rev = None # clear for future iterations |
|
686 | 686 | state[transition].append(ctx.node()) |
|
687 | 687 | ui.status(_('Changeset %d:%s: %s\n') % (ctx, ctx, transition)) |
|
688 | 688 | check_state(state, interactive=False) |
|
689 | 689 | # bisect |
|
690 | 690 | nodes, changesets, good = hbisect.bisect(repo.changelog, state) |
|
691 | 691 | # update to next check |
|
692 | 692 | node = nodes[0] |
|
693 | 693 | if not noupdate: |
|
694 | 694 | cmdutil.bailifchanged(repo) |
|
695 | 695 | hg.clean(repo, node, show_stats=False) |
|
696 | 696 | finally: |
|
697 | 697 | state['current'] = [node] |
|
698 | 698 | hbisect.save_state(repo, state) |
|
699 | 699 | print_result(nodes, good) |
|
700 | 700 | return |
|
701 | 701 | |
|
702 | 702 | # update state |
|
703 | 703 | |
|
704 | 704 | if rev: |
|
705 | 705 | nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])] |
|
706 | 706 | else: |
|
707 | 707 | nodes = [repo.lookup('.')] |
|
708 | 708 | |
|
709 | 709 | if good or bad or skip: |
|
710 | 710 | if good: |
|
711 | 711 | state['good'] += nodes |
|
712 | 712 | elif bad: |
|
713 | 713 | state['bad'] += nodes |
|
714 | 714 | elif skip: |
|
715 | 715 | state['skip'] += nodes |
|
716 | 716 | hbisect.save_state(repo, state) |
|
717 | 717 | |
|
718 | 718 | if not check_state(state): |
|
719 | 719 | return |
|
720 | 720 | |
|
721 | 721 | # actually bisect |
|
722 | 722 | nodes, changesets, good = hbisect.bisect(repo.changelog, state) |
|
723 | 723 | if extend: |
|
724 | 724 | if not changesets: |
|
725 | 725 | extendnode = extendbisectrange(nodes, good) |
|
726 | 726 | if extendnode is not None: |
|
727 | 727 | ui.write(_("Extending search to changeset %d:%s\n" |
|
728 | 728 | % (extendnode.rev(), extendnode))) |
|
729 | 729 | state['current'] = [extendnode.node()] |
|
730 | 730 | hbisect.save_state(repo, state) |
|
731 | 731 | if noupdate: |
|
732 | 732 | return |
|
733 | 733 | cmdutil.bailifchanged(repo) |
|
734 | 734 | return hg.clean(repo, extendnode.node()) |
|
735 | 735 | raise util.Abort(_("nothing to extend")) |
|
736 | 736 | |
|
737 | 737 | if changesets == 0: |
|
738 | 738 | print_result(nodes, good) |
|
739 | 739 | else: |
|
740 | 740 | assert len(nodes) == 1 # only a single node can be tested next |
|
741 | 741 | node = nodes[0] |
|
742 | 742 | # compute the approximate number of remaining tests |
|
743 | 743 | tests, size = 0, 2 |
|
744 | 744 | while size <= changesets: |
|
745 | 745 | tests, size = tests + 1, size * 2 |
|
746 | 746 | rev = repo.changelog.rev(node) |
|
747 | 747 | ui.write(_("Testing changeset %d:%s " |
|
748 | 748 | "(%d changesets remaining, ~%d tests)\n") |
|
749 | 749 | % (rev, short(node), changesets, tests)) |
|
750 | 750 | state['current'] = [node] |
|
751 | 751 | hbisect.save_state(repo, state) |
|
752 | 752 | if not noupdate: |
|
753 | 753 | cmdutil.bailifchanged(repo) |
|
754 | 754 | return hg.clean(repo, node) |
|
755 | 755 | |
|
756 | 756 | @command('bookmarks', |
|
757 | 757 | [('f', 'force', False, _('force')), |
|
758 | 758 | ('r', 'rev', '', _('revision'), _('REV')), |
|
759 | 759 | ('d', 'delete', False, _('delete a given bookmark')), |
|
760 | 760 | ('m', 'rename', '', _('rename a given bookmark'), _('NAME')), |
|
761 | 761 | ('i', 'inactive', False, _('mark a bookmark inactive'))], |
|
762 | 762 | _('hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]')) |
|
763 | 763 | def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False, |
|
764 | 764 | rename=None, inactive=False): |
|
765 | 765 | '''track a line of development with movable markers |
|
766 | 766 | |
|
767 | 767 | Bookmarks are pointers to certain commits that move when committing. |
|
768 | 768 | Bookmarks are local. They can be renamed, copied and deleted. It is |
|
769 | 769 | possible to use :hg:`merge NAME` to merge from a given bookmark, and |
|
770 | 770 | :hg:`update NAME` to update to a given bookmark. |
|
771 | 771 | |
|
772 | 772 | You can use :hg:`bookmark NAME` to set a bookmark on the working |
|
773 | 773 | directory's parent revision with the given name. If you specify |
|
774 | 774 | a revision using -r REV (where REV may be an existing bookmark), |
|
775 | 775 | the bookmark is assigned to that revision. |
|
776 | 776 | |
|
777 | 777 | Bookmarks can be pushed and pulled between repositories (see :hg:`help |
|
778 | 778 | push` and :hg:`help pull`). This requires both the local and remote |
|
779 | 779 | repositories to support bookmarks. For versions prior to 1.8, this means |
|
780 | 780 | the bookmarks extension must be enabled. |
|
781 | 781 | |
|
782 | 782 | With -i/--inactive, the new bookmark will not be made the active |
|
783 | 783 | bookmark. If -r/--rev is given, the new bookmark will not be made |
|
784 | 784 | active even if -i/--inactive is not given. If no NAME is given, the |
|
785 | 785 | current active bookmark will be marked inactive. |
|
786 | 786 | ''' |
|
787 | 787 | hexfn = ui.debugflag and hex or short |
|
788 | 788 | marks = repo._bookmarks |
|
789 | 789 | cur = repo.changectx('.').node() |
|
790 | 790 | |
|
791 | 791 | if delete: |
|
792 | 792 | if mark is None: |
|
793 | 793 | raise util.Abort(_("bookmark name required")) |
|
794 | 794 | if mark not in marks: |
|
795 | 795 | raise util.Abort(_("bookmark '%s' does not exist") % mark) |
|
796 | 796 | if mark == repo._bookmarkcurrent: |
|
797 | 797 | bookmarks.setcurrent(repo, None) |
|
798 | 798 | del marks[mark] |
|
799 | 799 | bookmarks.write(repo) |
|
800 | 800 | return |
|
801 | 801 | |
|
802 | 802 | if rename: |
|
803 | 803 | if rename not in marks: |
|
804 | 804 | raise util.Abort(_("bookmark '%s' does not exist") % rename) |
|
805 | 805 | if mark in marks and not force: |
|
806 | 806 | raise util.Abort(_("bookmark '%s' already exists " |
|
807 | 807 | "(use -f to force)") % mark) |
|
808 | 808 | if mark is None: |
|
809 | 809 | raise util.Abort(_("new bookmark name required")) |
|
810 | 810 | marks[mark] = marks[rename] |
|
811 | 811 | if repo._bookmarkcurrent == rename and not inactive: |
|
812 | 812 | bookmarks.setcurrent(repo, mark) |
|
813 | 813 | del marks[rename] |
|
814 | 814 | bookmarks.write(repo) |
|
815 | 815 | return |
|
816 | 816 | |
|
817 | 817 | if mark is not None: |
|
818 | 818 | if "\n" in mark: |
|
819 | 819 | raise util.Abort(_("bookmark name cannot contain newlines")) |
|
820 | 820 | mark = mark.strip() |
|
821 | 821 | if not mark: |
|
822 | 822 | raise util.Abort(_("bookmark names cannot consist entirely of " |
|
823 | 823 | "whitespace")) |
|
824 | 824 | if inactive and mark == repo._bookmarkcurrent: |
|
825 | 825 | bookmarks.setcurrent(repo, None) |
|
826 | 826 | return |
|
827 | 827 | if mark in marks and not force: |
|
828 | 828 | raise util.Abort(_("bookmark '%s' already exists " |
|
829 | 829 | "(use -f to force)") % mark) |
|
830 | 830 | if ((mark in repo.branchtags() or mark == repo.dirstate.branch()) |
|
831 | 831 | and not force): |
|
832 | 832 | raise util.Abort( |
|
833 | 833 | _("a bookmark cannot have the name of an existing branch")) |
|
834 | 834 | if rev: |
|
835 | 835 | marks[mark] = repo.lookup(rev) |
|
836 | 836 | else: |
|
837 | 837 | marks[mark] = cur |
|
838 | 838 | if not inactive and cur == marks[mark]: |
|
839 | 839 | bookmarks.setcurrent(repo, mark) |
|
840 | 840 | bookmarks.write(repo) |
|
841 | 841 | return |
|
842 | 842 | |
|
843 | 843 | if mark is None: |
|
844 | 844 | if rev: |
|
845 | 845 | raise util.Abort(_("bookmark name required")) |
|
846 | 846 | if len(marks) == 0: |
|
847 | 847 | ui.status(_("no bookmarks set\n")) |
|
848 | 848 | else: |
|
849 | 849 | for bmark, n in sorted(marks.iteritems()): |
|
850 | 850 | current = repo._bookmarkcurrent |
|
851 | 851 | if bmark == current and n == cur: |
|
852 | 852 | prefix, label = '*', 'bookmarks.current' |
|
853 | 853 | else: |
|
854 | 854 | prefix, label = ' ', '' |
|
855 | 855 | |
|
856 | 856 | if ui.quiet: |
|
857 | 857 | ui.write("%s\n" % bmark, label=label) |
|
858 | 858 | else: |
|
859 | 859 | ui.write(" %s %-25s %d:%s\n" % ( |
|
860 | 860 | prefix, bmark, repo.changelog.rev(n), hexfn(n)), |
|
861 | 861 | label=label) |
|
862 | 862 | return |
|
863 | 863 | |
|
864 | 864 | @command('branch', |
|
865 | 865 | [('f', 'force', None, |
|
866 | 866 | _('set branch name even if it shadows an existing branch')), |
|
867 | 867 | ('C', 'clean', None, _('reset branch name to parent branch name'))], |
|
868 | 868 | _('[-fC] [NAME]')) |
|
869 | 869 | def branch(ui, repo, label=None, **opts): |
|
870 | 870 | """set or show the current branch name |
|
871 | 871 | |
|
872 | 872 | .. note:: |
|
873 | 873 | Branch names are permanent and global. Use :hg:`bookmark` to create a |
|
874 | 874 | light-weight bookmark instead. See :hg:`help glossary` for more |
|
875 | 875 | information about named branches and bookmarks. |
|
876 | 876 | |
|
877 | 877 | With no argument, show the current branch name. With one argument, |
|
878 | 878 | set the working directory branch name (the branch will not exist |
|
879 | 879 | in the repository until the next commit). Standard practice |
|
880 | 880 | recommends that primary development take place on the 'default' |
|
881 | 881 | branch. |
|
882 | 882 | |
|
883 | 883 | Unless -f/--force is specified, branch will not let you set a |
|
884 | 884 | branch name that already exists, even if it's inactive. |
|
885 | 885 | |
|
886 | 886 | Use -C/--clean to reset the working directory branch to that of |
|
887 | 887 | the parent of the working directory, negating a previous branch |
|
888 | 888 | change. |
|
889 | 889 | |
|
890 | 890 | Use the command :hg:`update` to switch to an existing branch. Use |
|
891 | 891 | :hg:`commit --close-branch` to mark this branch as closed. |
|
892 | 892 | |
|
893 | 893 | Returns 0 on success. |
|
894 | 894 | """ |
|
895 | 895 | if not opts.get('clean') and not label: |
|
896 | 896 | ui.write("%s\n" % repo.dirstate.branch()) |
|
897 | 897 | return |
|
898 | 898 | |
|
899 | 899 | wlock = repo.wlock() |
|
900 | 900 | try: |
|
901 | 901 | if opts.get('clean'): |
|
902 | 902 | label = repo[None].p1().branch() |
|
903 | 903 | repo.dirstate.setbranch(label) |
|
904 | 904 | ui.status(_('reset working directory to branch %s\n') % label) |
|
905 | 905 | elif label: |
|
906 | 906 | if not opts.get('force') and label in repo.branchtags(): |
|
907 | 907 | if label not in [p.branch() for p in repo.parents()]: |
|
908 | 908 | raise util.Abort(_('a branch of the same name already' |
|
909 | 909 | ' exists'), |
|
910 | 910 | # i18n: "it" refers to an existing branch |
|
911 | 911 | hint=_("use 'hg update' to switch to it")) |
|
912 | 912 | repo.dirstate.setbranch(label) |
|
913 | 913 | ui.status(_('marked working directory as branch %s\n') % label) |
|
914 | 914 | ui.status(_('(branches are permanent and global, ' |
|
915 | 915 | 'did you want a bookmark?)\n')) |
|
916 | 916 | finally: |
|
917 | 917 | wlock.release() |
|
918 | 918 | |
|
919 | 919 | @command('branches', |
|
920 | 920 | [('a', 'active', False, _('show only branches that have unmerged heads')), |
|
921 | 921 | ('c', 'closed', False, _('show normal and closed branches'))], |
|
922 | 922 | _('[-ac]')) |
|
923 | 923 | def branches(ui, repo, active=False, closed=False): |
|
924 | 924 | """list repository named branches |
|
925 | 925 | |
|
926 | 926 | List the repository's named branches, indicating which ones are |
|
927 | 927 | inactive. If -c/--closed is specified, also list branches which have |
|
928 | 928 | been marked closed (see :hg:`commit --close-branch`). |
|
929 | 929 | |
|
930 | 930 | If -a/--active is specified, only show active branches. A branch |
|
931 | 931 | is considered active if it contains repository heads. |
|
932 | 932 | |
|
933 | 933 | Use the command :hg:`update` to switch to an existing branch. |
|
934 | 934 | |
|
935 | 935 | Returns 0. |
|
936 | 936 | """ |
|
937 | 937 | |
|
938 | 938 | hexfunc = ui.debugflag and hex or short |
|
939 | 939 | activebranches = [repo[n].branch() for n in repo.heads()] |
|
940 | 940 | def testactive(tag, node): |
|
941 | 941 | realhead = tag in activebranches |
|
942 | 942 | open = node in repo.branchheads(tag, closed=False) |
|
943 | 943 | return realhead and open |
|
944 | 944 | branches = sorted([(testactive(tag, node), repo.changelog.rev(node), tag) |
|
945 | 945 | for tag, node in repo.branchtags().items()], |
|
946 | 946 | reverse=True) |
|
947 | 947 | |
|
948 | 948 | for isactive, node, tag in branches: |
|
949 | 949 | if (not active) or isactive: |
|
950 | 950 | hn = repo.lookup(node) |
|
951 | 951 | if isactive: |
|
952 | 952 | label = 'branches.active' |
|
953 | 953 | notice = '' |
|
954 | 954 | elif hn not in repo.branchheads(tag, closed=False): |
|
955 | 955 | if not closed: |
|
956 | 956 | continue |
|
957 | 957 | label = 'branches.closed' |
|
958 | 958 | notice = _(' (closed)') |
|
959 | 959 | else: |
|
960 | 960 | label = 'branches.inactive' |
|
961 | 961 | notice = _(' (inactive)') |
|
962 | 962 | if tag == repo.dirstate.branch(): |
|
963 | 963 | label = 'branches.current' |
|
964 | 964 | rev = str(node).rjust(31 - encoding.colwidth(tag)) |
|
965 | 965 | rev = ui.label('%s:%s' % (rev, hexfunc(hn)), 'log.changeset') |
|
966 | 966 | tag = ui.label(tag, label) |
|
967 | 967 | if ui.quiet: |
|
968 | 968 | ui.write("%s\n" % tag) |
|
969 | 969 | else: |
|
970 | 970 | ui.write("%s %s%s\n" % (tag, rev, notice)) |
|
971 | 971 | |
|
972 | 972 | @command('bundle', |
|
973 | 973 | [('f', 'force', None, _('run even when the destination is unrelated')), |
|
974 | 974 | ('r', 'rev', [], _('a changeset intended to be added to the destination'), |
|
975 | 975 | _('REV')), |
|
976 | 976 | ('b', 'branch', [], _('a specific branch you would like to bundle'), |
|
977 | 977 | _('BRANCH')), |
|
978 | 978 | ('', 'base', [], |
|
979 | 979 | _('a base changeset assumed to be available at the destination'), |
|
980 | 980 | _('REV')), |
|
981 | 981 | ('a', 'all', None, _('bundle all changesets in the repository')), |
|
982 | 982 | ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')), |
|
983 | 983 | ] + remoteopts, |
|
984 | 984 | _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]')) |
|
985 | 985 | def bundle(ui, repo, fname, dest=None, **opts): |
|
986 | 986 | """create a changegroup file |
|
987 | 987 | |
|
988 | 988 | Generate a compressed changegroup file collecting changesets not |
|
989 | 989 | known to be in another repository. |
|
990 | 990 | |
|
991 | 991 | If you omit the destination repository, then hg assumes the |
|
992 | 992 | destination will have all the nodes you specify with --base |
|
993 | 993 | parameters. To create a bundle containing all changesets, use |
|
994 | 994 | -a/--all (or --base null). |
|
995 | 995 | |
|
996 | 996 | You can change compression method with the -t/--type option. |
|
997 | 997 | The available compression methods are: none, bzip2, and |
|
998 | 998 | gzip (by default, bundles are compressed using bzip2). |
|
999 | 999 | |
|
1000 | 1000 | The bundle file can then be transferred using conventional means |
|
1001 | 1001 | and applied to another repository with the unbundle or pull |
|
1002 | 1002 | command. This is useful when direct push and pull are not |
|
1003 | 1003 | available or when exporting an entire repository is undesirable. |
|
1004 | 1004 | |
|
1005 | 1005 | Applying bundles preserves all changeset contents including |
|
1006 | 1006 | permissions, copy/rename information, and revision history. |
|
1007 | 1007 | |
|
1008 | 1008 | Returns 0 on success, 1 if no changes found. |
|
1009 | 1009 | """ |
|
1010 | 1010 | revs = None |
|
1011 | 1011 | if 'rev' in opts: |
|
1012 | 1012 | revs = scmutil.revrange(repo, opts['rev']) |
|
1013 | 1013 | |
|
1014 | 1014 | bundletype = opts.get('type', 'bzip2').lower() |
|
1015 | 1015 | btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'} |
|
1016 | 1016 | bundletype = btypes.get(bundletype) |
|
1017 | 1017 | if bundletype not in changegroup.bundletypes: |
|
1018 | 1018 | raise util.Abort(_('unknown bundle type specified with --type')) |
|
1019 | 1019 | |
|
1020 | 1020 | if opts.get('all'): |
|
1021 | 1021 | base = ['null'] |
|
1022 | 1022 | else: |
|
1023 | 1023 | base = scmutil.revrange(repo, opts.get('base')) |
|
1024 | 1024 | if base: |
|
1025 | 1025 | if dest: |
|
1026 | 1026 | raise util.Abort(_("--base is incompatible with specifying " |
|
1027 | 1027 | "a destination")) |
|
1028 | 1028 | common = [repo.lookup(rev) for rev in base] |
|
1029 | 1029 | heads = revs and map(repo.lookup, revs) or revs |
|
1030 | 1030 | cg = repo.getbundle('bundle', heads=heads, common=common) |
|
1031 | 1031 | outgoing = None |
|
1032 | 1032 | else: |
|
1033 | 1033 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
1034 | 1034 | dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
1035 | 1035 | other = hg.peer(repo, opts, dest) |
|
1036 | 1036 | revs, checkout = hg.addbranchrevs(repo, other, branches, revs) |
|
1037 | 1037 | heads = revs and map(repo.lookup, revs) or revs |
|
1038 | 1038 | outgoing = discovery.findcommonoutgoing(repo, other, |
|
1039 | 1039 | onlyheads=heads, |
|
1040 | 1040 | force=opts.get('force')) |
|
1041 | 1041 | cg = repo.getlocalbundle('bundle', outgoing) |
|
1042 | 1042 | if not cg: |
|
1043 | 1043 | scmutil.nochangesfound(ui, outgoing and outgoing.excluded) |
|
1044 | 1044 | return 1 |
|
1045 | 1045 | |
|
1046 | 1046 | changegroup.writebundle(cg, fname, bundletype) |
|
1047 | 1047 | |
|
1048 | 1048 | @command('cat', |
|
1049 | 1049 | [('o', 'output', '', |
|
1050 | 1050 | _('print output to file with formatted name'), _('FORMAT')), |
|
1051 | 1051 | ('r', 'rev', '', _('print the given revision'), _('REV')), |
|
1052 | 1052 | ('', 'decode', None, _('apply any matching decode filter')), |
|
1053 | 1053 | ] + walkopts, |
|
1054 | 1054 | _('[OPTION]... FILE...')) |
|
1055 | 1055 | def cat(ui, repo, file1, *pats, **opts): |
|
1056 | 1056 | """output the current or given revision of files |
|
1057 | 1057 | |
|
1058 | 1058 | Print the specified files as they were at the given revision. If |
|
1059 | 1059 | no revision is given, the parent of the working directory is used, |
|
1060 | 1060 | or tip if no revision is checked out. |
|
1061 | 1061 | |
|
1062 | 1062 | Output may be to a file, in which case the name of the file is |
|
1063 | 1063 | given using a format string. The formatting rules are the same as |
|
1064 | 1064 | for the export command, with the following additions: |
|
1065 | 1065 | |
|
1066 | 1066 | :``%s``: basename of file being printed |
|
1067 | 1067 | :``%d``: dirname of file being printed, or '.' if in repository root |
|
1068 | 1068 | :``%p``: root-relative path name of file being printed |
|
1069 | 1069 | |
|
1070 | 1070 | Returns 0 on success. |
|
1071 | 1071 | """ |
|
1072 | 1072 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
1073 | 1073 | err = 1 |
|
1074 | 1074 | m = scmutil.match(ctx, (file1,) + pats, opts) |
|
1075 | 1075 | for abs in ctx.walk(m): |
|
1076 | 1076 | fp = cmdutil.makefileobj(repo, opts.get('output'), ctx.node(), |
|
1077 | 1077 | pathname=abs) |
|
1078 | 1078 | data = ctx[abs].data() |
|
1079 | 1079 | if opts.get('decode'): |
|
1080 | 1080 | data = repo.wwritedata(abs, data) |
|
1081 | 1081 | fp.write(data) |
|
1082 | 1082 | fp.close() |
|
1083 | 1083 | err = 0 |
|
1084 | 1084 | return err |
|
1085 | 1085 | |
|
1086 | 1086 | @command('^clone', |
|
1087 | 1087 | [('U', 'noupdate', None, |
|
1088 | 1088 | _('the clone will include an empty working copy (only a repository)')), |
|
1089 | 1089 | ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')), |
|
1090 | 1090 | ('r', 'rev', [], _('include the specified changeset'), _('REV')), |
|
1091 | 1091 | ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')), |
|
1092 | 1092 | ('', 'pull', None, _('use pull protocol to copy metadata')), |
|
1093 | 1093 | ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')), |
|
1094 | 1094 | ] + remoteopts, |
|
1095 | 1095 | _('[OPTION]... SOURCE [DEST]')) |
|
1096 | 1096 | def clone(ui, source, dest=None, **opts): |
|
1097 | 1097 | """make a copy of an existing repository |
|
1098 | 1098 | |
|
1099 | 1099 | Create a copy of an existing repository in a new directory. |
|
1100 | 1100 | |
|
1101 | 1101 | If no destination directory name is specified, it defaults to the |
|
1102 | 1102 | basename of the source. |
|
1103 | 1103 | |
|
1104 | 1104 | The location of the source is added to the new repository's |
|
1105 | 1105 | ``.hg/hgrc`` file, as the default to be used for future pulls. |
|
1106 | 1106 | |
|
1107 | 1107 | Only local paths and ``ssh://`` URLs are supported as |
|
1108 | 1108 | destinations. For ``ssh://`` destinations, no working directory or |
|
1109 | 1109 | ``.hg/hgrc`` will be created on the remote side. |
|
1110 | 1110 | |
|
1111 | 1111 | To pull only a subset of changesets, specify one or more revisions |
|
1112 | 1112 | identifiers with -r/--rev or branches with -b/--branch. The |
|
1113 | 1113 | resulting clone will contain only the specified changesets and |
|
1114 | 1114 | their ancestors. These options (or 'clone src#rev dest') imply |
|
1115 | 1115 | --pull, even for local source repositories. Note that specifying a |
|
1116 | 1116 | tag will include the tagged changeset but not the changeset |
|
1117 | 1117 | containing the tag. |
|
1118 | 1118 | |
|
1119 | 1119 | To check out a particular version, use -u/--update, or |
|
1120 | 1120 | -U/--noupdate to create a clone with no working directory. |
|
1121 | 1121 | |
|
1122 | 1122 | .. container:: verbose |
|
1123 | 1123 | |
|
1124 | 1124 | For efficiency, hardlinks are used for cloning whenever the |
|
1125 | 1125 | source and destination are on the same filesystem (note this |
|
1126 | 1126 | applies only to the repository data, not to the working |
|
1127 | 1127 | directory). Some filesystems, such as AFS, implement hardlinking |
|
1128 | 1128 | incorrectly, but do not report errors. In these cases, use the |
|
1129 | 1129 | --pull option to avoid hardlinking. |
|
1130 | 1130 | |
|
1131 | 1131 | In some cases, you can clone repositories and the working |
|
1132 | 1132 | directory using full hardlinks with :: |
|
1133 | 1133 | |
|
1134 | 1134 | $ cp -al REPO REPOCLONE |
|
1135 | 1135 | |
|
1136 | 1136 | This is the fastest way to clone, but it is not always safe. The |
|
1137 | 1137 | operation is not atomic (making sure REPO is not modified during |
|
1138 | 1138 | the operation is up to you) and you have to make sure your |
|
1139 | 1139 | editor breaks hardlinks (Emacs and most Linux Kernel tools do |
|
1140 | 1140 | so). Also, this is not compatible with certain extensions that |
|
1141 | 1141 | place their metadata under the .hg directory, such as mq. |
|
1142 | 1142 | |
|
1143 | 1143 | Mercurial will update the working directory to the first applicable |
|
1144 | 1144 | revision from this list: |
|
1145 | 1145 | |
|
1146 | 1146 | a) null if -U or the source repository has no changesets |
|
1147 | 1147 | b) if -u . and the source repository is local, the first parent of |
|
1148 | 1148 | the source repository's working directory |
|
1149 | 1149 | c) the changeset specified with -u (if a branch name, this means the |
|
1150 | 1150 | latest head of that branch) |
|
1151 | 1151 | d) the changeset specified with -r |
|
1152 | 1152 | e) the tipmost head specified with -b |
|
1153 | 1153 | f) the tipmost head specified with the url#branch source syntax |
|
1154 | 1154 | g) the tipmost head of the default branch |
|
1155 | 1155 | h) tip |
|
1156 | 1156 | |
|
1157 | 1157 | Examples: |
|
1158 | 1158 | |
|
1159 | 1159 | - clone a remote repository to a new directory named hg/:: |
|
1160 | 1160 | |
|
1161 | 1161 | hg clone http://selenic.com/hg |
|
1162 | 1162 | |
|
1163 | 1163 | - create a lightweight local clone:: |
|
1164 | 1164 | |
|
1165 | 1165 | hg clone project/ project-feature/ |
|
1166 | 1166 | |
|
1167 | 1167 | - clone from an absolute path on an ssh server (note double-slash):: |
|
1168 | 1168 | |
|
1169 | 1169 | hg clone ssh://user@server//home/projects/alpha/ |
|
1170 | 1170 | |
|
1171 | 1171 | - do a high-speed clone over a LAN while checking out a |
|
1172 | 1172 | specified version:: |
|
1173 | 1173 | |
|
1174 | 1174 | hg clone --uncompressed http://server/repo -u 1.5 |
|
1175 | 1175 | |
|
1176 | 1176 | - create a repository without changesets after a particular revision:: |
|
1177 | 1177 | |
|
1178 | 1178 | hg clone -r 04e544 experimental/ good/ |
|
1179 | 1179 | |
|
1180 | 1180 | - clone (and track) a particular named branch:: |
|
1181 | 1181 | |
|
1182 | 1182 | hg clone http://selenic.com/hg#stable |
|
1183 | 1183 | |
|
1184 | 1184 | See :hg:`help urls` for details on specifying URLs. |
|
1185 | 1185 | |
|
1186 | 1186 | Returns 0 on success. |
|
1187 | 1187 | """ |
|
1188 | 1188 | if opts.get('noupdate') and opts.get('updaterev'): |
|
1189 | 1189 | raise util.Abort(_("cannot specify both --noupdate and --updaterev")) |
|
1190 | 1190 | |
|
1191 | 1191 | r = hg.clone(ui, opts, source, dest, |
|
1192 | 1192 | pull=opts.get('pull'), |
|
1193 | 1193 | stream=opts.get('uncompressed'), |
|
1194 | 1194 | rev=opts.get('rev'), |
|
1195 | 1195 | update=opts.get('updaterev') or not opts.get('noupdate'), |
|
1196 | 1196 | branch=opts.get('branch')) |
|
1197 | 1197 | |
|
1198 | 1198 | return r is None |
|
1199 | 1199 | |
|
1200 | 1200 | @command('^commit|ci', |
|
1201 | 1201 | [('A', 'addremove', None, |
|
1202 | 1202 | _('mark new/missing files as added/removed before committing')), |
|
1203 | 1203 | ('', 'close-branch', None, |
|
1204 | 1204 | _('mark a branch as closed, hiding it from the branch list')), |
|
1205 | 1205 | ('', 'amend', None, _('amend the parent of the working dir')), |
|
1206 | 1206 | ] + walkopts + commitopts + commitopts2 + subrepoopts, |
|
1207 | 1207 | _('[OPTION]... [FILE]...')) |
|
1208 | 1208 | def commit(ui, repo, *pats, **opts): |
|
1209 | 1209 | """commit the specified files or all outstanding changes |
|
1210 | 1210 | |
|
1211 | 1211 | Commit changes to the given files into the repository. Unlike a |
|
1212 | 1212 | centralized SCM, this operation is a local operation. See |
|
1213 | 1213 | :hg:`push` for a way to actively distribute your changes. |
|
1214 | 1214 | |
|
1215 | 1215 | If a list of files is omitted, all changes reported by :hg:`status` |
|
1216 | 1216 | will be committed. |
|
1217 | 1217 | |
|
1218 | 1218 | If you are committing the result of a merge, do not provide any |
|
1219 | 1219 | filenames or -I/-X filters. |
|
1220 | 1220 | |
|
1221 | 1221 | If no commit message is specified, Mercurial starts your |
|
1222 | 1222 | configured editor where you can enter a message. In case your |
|
1223 | 1223 | commit fails, you will find a backup of your message in |
|
1224 | 1224 | ``.hg/last-message.txt``. |
|
1225 | 1225 | |
|
1226 | 1226 | The --amend flag can be used to amend the parent of the |
|
1227 | 1227 | working directory with a new commit that contains the changes |
|
1228 | 1228 | in the parent in addition to those currently reported by :hg:`status`, |
|
1229 | 1229 | if there are any. The old commit is stored in a backup bundle in |
|
1230 | 1230 | ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle` |
|
1231 | 1231 | on how to restore it). |
|
1232 | 1232 | |
|
1233 | 1233 | Message, user and date are taken from the amended commit unless |
|
1234 | 1234 | specified. When a message isn't specified on the command line, |
|
1235 | 1235 | the editor will open with the message of the amended commit. |
|
1236 | 1236 | |
|
1237 | 1237 | It is not possible to amend public changesets (see :hg:`help phases`) |
|
1238 | 1238 | or changesets that have children. |
|
1239 | 1239 | |
|
1240 | 1240 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
1241 | 1241 | |
|
1242 | 1242 | Returns 0 on success, 1 if nothing changed. |
|
1243 | 1243 | """ |
|
1244 | 1244 | if opts.get('subrepos'): |
|
1245 | 1245 | # Let --subrepos on the command line overide config setting. |
|
1246 | 1246 | ui.setconfig('ui', 'commitsubrepos', True) |
|
1247 | 1247 | |
|
1248 | 1248 | extra = {} |
|
1249 | 1249 | if opts.get('close_branch'): |
|
1250 | 1250 | if repo['.'].node() not in repo.branchheads(): |
|
1251 | 1251 | # The topo heads set is included in the branch heads set of the |
|
1252 | 1252 | # current branch, so it's sufficient to test branchheads |
|
1253 | 1253 | raise util.Abort(_('can only close branch heads')) |
|
1254 | 1254 | extra['close'] = 1 |
|
1255 | 1255 | |
|
1256 | 1256 | branch = repo[None].branch() |
|
1257 | 1257 | bheads = repo.branchheads(branch) |
|
1258 | 1258 | |
|
1259 | 1259 | if opts.get('amend'): |
|
1260 | 1260 | if ui.configbool('ui', 'commitsubrepos'): |
|
1261 | 1261 | raise util.Abort(_('cannot amend recursively')) |
|
1262 | 1262 | |
|
1263 | 1263 | old = repo['.'] |
|
1264 | 1264 | if old.phase() == phases.public: |
|
1265 | 1265 | raise util.Abort(_('cannot amend public changesets')) |
|
1266 | 1266 | if len(old.parents()) > 1: |
|
1267 | 1267 | raise util.Abort(_('cannot amend merge changesets')) |
|
1268 | 1268 | if len(repo[None].parents()) > 1: |
|
1269 | 1269 | raise util.Abort(_('cannot amend while merging')) |
|
1270 | 1270 | if old.children(): |
|
1271 | 1271 | raise util.Abort(_('cannot amend changeset with children')) |
|
1272 | 1272 | |
|
1273 | 1273 | e = cmdutil.commiteditor |
|
1274 | 1274 | if opts.get('force_editor'): |
|
1275 | 1275 | e = cmdutil.commitforceeditor |
|
1276 | 1276 | |
|
1277 | 1277 | def commitfunc(ui, repo, message, match, opts): |
|
1278 | 1278 | editor = e |
|
1279 | 1279 | # message contains text from -m or -l, if it's empty, |
|
1280 | 1280 | # open the editor with the old message |
|
1281 | 1281 | if not message: |
|
1282 | 1282 | message = old.description() |
|
1283 | 1283 | editor = cmdutil.commitforceeditor |
|
1284 | 1284 | return repo.commit(message, |
|
1285 | 1285 | opts.get('user') or old.user(), |
|
1286 | 1286 | opts.get('date') or old.date(), |
|
1287 | 1287 | match, |
|
1288 | 1288 | editor=editor, |
|
1289 | 1289 | extra=extra) |
|
1290 | 1290 | |
|
1291 | 1291 | node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts) |
|
1292 | 1292 | if node == old.node(): |
|
1293 | 1293 | ui.status(_("nothing changed\n")) |
|
1294 | 1294 | return 1 |
|
1295 | 1295 | else: |
|
1296 | 1296 | e = cmdutil.commiteditor |
|
1297 | 1297 | if opts.get('force_editor'): |
|
1298 | 1298 | e = cmdutil.commitforceeditor |
|
1299 | 1299 | |
|
1300 | 1300 | def commitfunc(ui, repo, message, match, opts): |
|
1301 | 1301 | return repo.commit(message, opts.get('user'), opts.get('date'), |
|
1302 | 1302 | match, editor=e, extra=extra) |
|
1303 | 1303 | |
|
1304 | 1304 | node = cmdutil.commit(ui, repo, commitfunc, pats, opts) |
|
1305 | 1305 | |
|
1306 | 1306 | if not node: |
|
1307 | 1307 | stat = repo.status(match=scmutil.match(repo[None], pats, opts)) |
|
1308 | 1308 | if stat[3]: |
|
1309 | 1309 | ui.status(_("nothing changed (%d missing files, see " |
|
1310 | 1310 | "'hg status')\n") % len(stat[3])) |
|
1311 | 1311 | else: |
|
1312 | 1312 | ui.status(_("nothing changed\n")) |
|
1313 | 1313 | return 1 |
|
1314 | 1314 | |
|
1315 | 1315 | ctx = repo[node] |
|
1316 | 1316 | parents = ctx.parents() |
|
1317 | 1317 | |
|
1318 | 1318 | if (not opts.get('amend') and bheads and node not in bheads and not |
|
1319 | 1319 | [x for x in parents if x.node() in bheads and x.branch() == branch]): |
|
1320 | 1320 | ui.status(_('created new head\n')) |
|
1321 | 1321 | # The message is not printed for initial roots. For the other |
|
1322 | 1322 | # changesets, it is printed in the following situations: |
|
1323 | 1323 | # |
|
1324 | 1324 | # Par column: for the 2 parents with ... |
|
1325 | 1325 | # N: null or no parent |
|
1326 | 1326 | # B: parent is on another named branch |
|
1327 | 1327 | # C: parent is a regular non head changeset |
|
1328 | 1328 | # H: parent was a branch head of the current branch |
|
1329 | 1329 | # Msg column: whether we print "created new head" message |
|
1330 | 1330 | # In the following, it is assumed that there already exists some |
|
1331 | 1331 | # initial branch heads of the current branch, otherwise nothing is |
|
1332 | 1332 | # printed anyway. |
|
1333 | 1333 | # |
|
1334 | 1334 | # Par Msg Comment |
|
1335 | 1335 | # NN y additional topo root |
|
1336 | 1336 | # |
|
1337 | 1337 | # BN y additional branch root |
|
1338 | 1338 | # CN y additional topo head |
|
1339 | 1339 | # HN n usual case |
|
1340 | 1340 | # |
|
1341 | 1341 | # BB y weird additional branch root |
|
1342 | 1342 | # CB y branch merge |
|
1343 | 1343 | # HB n merge with named branch |
|
1344 | 1344 | # |
|
1345 | 1345 | # CC y additional head from merge |
|
1346 | 1346 | # CH n merge with a head |
|
1347 | 1347 | # |
|
1348 | 1348 | # HH n head merge: head count decreases |
|
1349 | 1349 | |
|
1350 | 1350 | if not opts.get('close_branch'): |
|
1351 | 1351 | for r in parents: |
|
1352 | 1352 | if r.extra().get('close') and r.branch() == branch: |
|
1353 | 1353 | ui.status(_('reopening closed branch head %d\n') % r) |
|
1354 | 1354 | |
|
1355 | 1355 | if ui.debugflag: |
|
1356 | 1356 | ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex())) |
|
1357 | 1357 | elif ui.verbose: |
|
1358 | 1358 | ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx)) |
|
1359 | 1359 | |
|
1360 | 1360 | @command('copy|cp', |
|
1361 | 1361 | [('A', 'after', None, _('record a copy that has already occurred')), |
|
1362 | 1362 | ('f', 'force', None, _('forcibly copy over an existing managed file')), |
|
1363 | 1363 | ] + walkopts + dryrunopts, |
|
1364 | 1364 | _('[OPTION]... [SOURCE]... DEST')) |
|
1365 | 1365 | def copy(ui, repo, *pats, **opts): |
|
1366 | 1366 | """mark files as copied for the next commit |
|
1367 | 1367 | |
|
1368 | 1368 | Mark dest as having copies of source files. If dest is a |
|
1369 | 1369 | directory, copies are put in that directory. If dest is a file, |
|
1370 | 1370 | the source must be a single file. |
|
1371 | 1371 | |
|
1372 | 1372 | By default, this command copies the contents of files as they |
|
1373 | 1373 | exist in the working directory. If invoked with -A/--after, the |
|
1374 | 1374 | operation is recorded, but no copying is performed. |
|
1375 | 1375 | |
|
1376 | 1376 | This command takes effect with the next commit. To undo a copy |
|
1377 | 1377 | before that, see :hg:`revert`. |
|
1378 | 1378 | |
|
1379 | 1379 | Returns 0 on success, 1 if errors are encountered. |
|
1380 | 1380 | """ |
|
1381 | 1381 | wlock = repo.wlock(False) |
|
1382 | 1382 | try: |
|
1383 | 1383 | return cmdutil.copy(ui, repo, pats, opts) |
|
1384 | 1384 | finally: |
|
1385 | 1385 | wlock.release() |
|
1386 | 1386 | |
|
1387 | 1387 | @command('debugancestor', [], _('[INDEX] REV1 REV2')) |
|
1388 | 1388 | def debugancestor(ui, repo, *args): |
|
1389 | 1389 | """find the ancestor revision of two revisions in a given index""" |
|
1390 | 1390 | if len(args) == 3: |
|
1391 | 1391 | index, rev1, rev2 = args |
|
1392 | 1392 | r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index) |
|
1393 | 1393 | lookup = r.lookup |
|
1394 | 1394 | elif len(args) == 2: |
|
1395 | 1395 | if not repo: |
|
1396 | 1396 | raise util.Abort(_("there is no Mercurial repository here " |
|
1397 | 1397 | "(.hg not found)")) |
|
1398 | 1398 | rev1, rev2 = args |
|
1399 | 1399 | r = repo.changelog |
|
1400 | 1400 | lookup = repo.lookup |
|
1401 | 1401 | else: |
|
1402 | 1402 | raise util.Abort(_('either two or three arguments required')) |
|
1403 | 1403 | a = r.ancestor(lookup(rev1), lookup(rev2)) |
|
1404 | 1404 | ui.write("%d:%s\n" % (r.rev(a), hex(a))) |
|
1405 | 1405 | |
|
1406 | 1406 | @command('debugbuilddag', |
|
1407 | 1407 | [('m', 'mergeable-file', None, _('add single file mergeable changes')), |
|
1408 | 1408 | ('o', 'overwritten-file', None, _('add single file all revs overwrite')), |
|
1409 | 1409 | ('n', 'new-file', None, _('add new file at each rev'))], |
|
1410 | 1410 | _('[OPTION]... [TEXT]')) |
|
1411 | 1411 | def debugbuilddag(ui, repo, text=None, |
|
1412 | 1412 | mergeable_file=False, |
|
1413 | 1413 | overwritten_file=False, |
|
1414 | 1414 | new_file=False): |
|
1415 | 1415 | """builds a repo with a given DAG from scratch in the current empty repo |
|
1416 | 1416 | |
|
1417 | 1417 | The description of the DAG is read from stdin if not given on the |
|
1418 | 1418 | command line. |
|
1419 | 1419 | |
|
1420 | 1420 | Elements: |
|
1421 | 1421 | |
|
1422 | 1422 | - "+n" is a linear run of n nodes based on the current default parent |
|
1423 | 1423 | - "." is a single node based on the current default parent |
|
1424 | 1424 | - "$" resets the default parent to null (implied at the start); |
|
1425 | 1425 | otherwise the default parent is always the last node created |
|
1426 | 1426 | - "<p" sets the default parent to the backref p |
|
1427 | 1427 | - "*p" is a fork at parent p, which is a backref |
|
1428 | 1428 | - "*p1/p2" is a merge of parents p1 and p2, which are backrefs |
|
1429 | 1429 | - "/p2" is a merge of the preceding node and p2 |
|
1430 | 1430 | - ":tag" defines a local tag for the preceding node |
|
1431 | 1431 | - "@branch" sets the named branch for subsequent nodes |
|
1432 | 1432 | - "#...\\n" is a comment up to the end of the line |
|
1433 | 1433 | |
|
1434 | 1434 | Whitespace between the above elements is ignored. |
|
1435 | 1435 | |
|
1436 | 1436 | A backref is either |
|
1437 | 1437 | |
|
1438 | 1438 | - a number n, which references the node curr-n, where curr is the current |
|
1439 | 1439 | node, or |
|
1440 | 1440 | - the name of a local tag you placed earlier using ":tag", or |
|
1441 | 1441 | - empty to denote the default parent. |
|
1442 | 1442 | |
|
1443 | 1443 | All string valued-elements are either strictly alphanumeric, or must |
|
1444 | 1444 | be enclosed in double quotes ("..."), with "\\" as escape character. |
|
1445 | 1445 | """ |
|
1446 | 1446 | |
|
1447 | 1447 | if text is None: |
|
1448 | 1448 | ui.status(_("reading DAG from stdin\n")) |
|
1449 | 1449 | text = ui.fin.read() |
|
1450 | 1450 | |
|
1451 | 1451 | cl = repo.changelog |
|
1452 | 1452 | if len(cl) > 0: |
|
1453 | 1453 | raise util.Abort(_('repository is not empty')) |
|
1454 | 1454 | |
|
1455 | 1455 | # determine number of revs in DAG |
|
1456 | 1456 | total = 0 |
|
1457 | 1457 | for type, data in dagparser.parsedag(text): |
|
1458 | 1458 | if type == 'n': |
|
1459 | 1459 | total += 1 |
|
1460 | 1460 | |
|
1461 | 1461 | if mergeable_file: |
|
1462 | 1462 | linesperrev = 2 |
|
1463 | 1463 | # make a file with k lines per rev |
|
1464 | 1464 | initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)] |
|
1465 | 1465 | initialmergedlines.append("") |
|
1466 | 1466 | |
|
1467 | 1467 | tags = [] |
|
1468 | 1468 | |
|
1469 | 1469 | lock = tr = None |
|
1470 | 1470 | try: |
|
1471 | 1471 | lock = repo.lock() |
|
1472 | 1472 | tr = repo.transaction("builddag") |
|
1473 | 1473 | |
|
1474 | 1474 | at = -1 |
|
1475 | 1475 | atbranch = 'default' |
|
1476 | 1476 | nodeids = [] |
|
1477 | 1477 | id = 0 |
|
1478 | 1478 | ui.progress(_('building'), id, unit=_('revisions'), total=total) |
|
1479 | 1479 | for type, data in dagparser.parsedag(text): |
|
1480 | 1480 | if type == 'n': |
|
1481 | 1481 | ui.note('node %s\n' % str(data)) |
|
1482 | 1482 | id, ps = data |
|
1483 | 1483 | |
|
1484 | 1484 | files = [] |
|
1485 | 1485 | fctxs = {} |
|
1486 | 1486 | |
|
1487 | 1487 | p2 = None |
|
1488 | 1488 | if mergeable_file: |
|
1489 | 1489 | fn = "mf" |
|
1490 | 1490 | p1 = repo[ps[0]] |
|
1491 | 1491 | if len(ps) > 1: |
|
1492 | 1492 | p2 = repo[ps[1]] |
|
1493 | 1493 | pa = p1.ancestor(p2) |
|
1494 | 1494 | base, local, other = [x[fn].data() for x in pa, p1, p2] |
|
1495 | 1495 | m3 = simplemerge.Merge3Text(base, local, other) |
|
1496 | 1496 | ml = [l.strip() for l in m3.merge_lines()] |
|
1497 | 1497 | ml.append("") |
|
1498 | 1498 | elif at > 0: |
|
1499 | 1499 | ml = p1[fn].data().split("\n") |
|
1500 | 1500 | else: |
|
1501 | 1501 | ml = initialmergedlines |
|
1502 | 1502 | ml[id * linesperrev] += " r%i" % id |
|
1503 | 1503 | mergedtext = "\n".join(ml) |
|
1504 | 1504 | files.append(fn) |
|
1505 | 1505 | fctxs[fn] = context.memfilectx(fn, mergedtext) |
|
1506 | 1506 | |
|
1507 | 1507 | if overwritten_file: |
|
1508 | 1508 | fn = "of" |
|
1509 | 1509 | files.append(fn) |
|
1510 | 1510 | fctxs[fn] = context.memfilectx(fn, "r%i\n" % id) |
|
1511 | 1511 | |
|
1512 | 1512 | if new_file: |
|
1513 | 1513 | fn = "nf%i" % id |
|
1514 | 1514 | files.append(fn) |
|
1515 | 1515 | fctxs[fn] = context.memfilectx(fn, "r%i\n" % id) |
|
1516 | 1516 | if len(ps) > 1: |
|
1517 | 1517 | if not p2: |
|
1518 | 1518 | p2 = repo[ps[1]] |
|
1519 | 1519 | for fn in p2: |
|
1520 | 1520 | if fn.startswith("nf"): |
|
1521 | 1521 | files.append(fn) |
|
1522 | 1522 | fctxs[fn] = p2[fn] |
|
1523 | 1523 | |
|
1524 | 1524 | def fctxfn(repo, cx, path): |
|
1525 | 1525 | return fctxs.get(path) |
|
1526 | 1526 | |
|
1527 | 1527 | if len(ps) == 0 or ps[0] < 0: |
|
1528 | 1528 | pars = [None, None] |
|
1529 | 1529 | elif len(ps) == 1: |
|
1530 | 1530 | pars = [nodeids[ps[0]], None] |
|
1531 | 1531 | else: |
|
1532 | 1532 | pars = [nodeids[p] for p in ps] |
|
1533 | 1533 | cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn, |
|
1534 | 1534 | date=(id, 0), |
|
1535 | 1535 | user="debugbuilddag", |
|
1536 | 1536 | extra={'branch': atbranch}) |
|
1537 | 1537 | nodeid = repo.commitctx(cx) |
|
1538 | 1538 | nodeids.append(nodeid) |
|
1539 | 1539 | at = id |
|
1540 | 1540 | elif type == 'l': |
|
1541 | 1541 | id, name = data |
|
1542 | 1542 | ui.note('tag %s\n' % name) |
|
1543 | 1543 | tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name)) |
|
1544 | 1544 | elif type == 'a': |
|
1545 | 1545 | ui.note('branch %s\n' % data) |
|
1546 | 1546 | atbranch = data |
|
1547 | 1547 | ui.progress(_('building'), id, unit=_('revisions'), total=total) |
|
1548 | 1548 | tr.close() |
|
1549 | 1549 | |
|
1550 | 1550 | if tags: |
|
1551 | 1551 | repo.opener.write("localtags", "".join(tags)) |
|
1552 | 1552 | finally: |
|
1553 | 1553 | ui.progress(_('building'), None) |
|
1554 | 1554 | release(tr, lock) |
|
1555 | 1555 | |
|
1556 | 1556 | @command('debugbundle', [('a', 'all', None, _('show all details'))], _('FILE')) |
|
1557 | 1557 | def debugbundle(ui, bundlepath, all=None, **opts): |
|
1558 | 1558 | """lists the contents of a bundle""" |
|
1559 | 1559 | f = url.open(ui, bundlepath) |
|
1560 | 1560 | try: |
|
1561 | 1561 | gen = changegroup.readbundle(f, bundlepath) |
|
1562 | 1562 | if all: |
|
1563 | 1563 | ui.write("format: id, p1, p2, cset, delta base, len(delta)\n") |
|
1564 | 1564 | |
|
1565 | 1565 | def showchunks(named): |
|
1566 | 1566 | ui.write("\n%s\n" % named) |
|
1567 | 1567 | chain = None |
|
1568 | 1568 | while True: |
|
1569 | 1569 | chunkdata = gen.deltachunk(chain) |
|
1570 | 1570 | if not chunkdata: |
|
1571 | 1571 | break |
|
1572 | 1572 | node = chunkdata['node'] |
|
1573 | 1573 | p1 = chunkdata['p1'] |
|
1574 | 1574 | p2 = chunkdata['p2'] |
|
1575 | 1575 | cs = chunkdata['cs'] |
|
1576 | 1576 | deltabase = chunkdata['deltabase'] |
|
1577 | 1577 | delta = chunkdata['delta'] |
|
1578 | 1578 | ui.write("%s %s %s %s %s %s\n" % |
|
1579 | 1579 | (hex(node), hex(p1), hex(p2), |
|
1580 | 1580 | hex(cs), hex(deltabase), len(delta))) |
|
1581 | 1581 | chain = node |
|
1582 | 1582 | |
|
1583 | 1583 | chunkdata = gen.changelogheader() |
|
1584 | 1584 | showchunks("changelog") |
|
1585 | 1585 | chunkdata = gen.manifestheader() |
|
1586 | 1586 | showchunks("manifest") |
|
1587 | 1587 | while True: |
|
1588 | 1588 | chunkdata = gen.filelogheader() |
|
1589 | 1589 | if not chunkdata: |
|
1590 | 1590 | break |
|
1591 | 1591 | fname = chunkdata['filename'] |
|
1592 | 1592 | showchunks(fname) |
|
1593 | 1593 | else: |
|
1594 | 1594 | chunkdata = gen.changelogheader() |
|
1595 | 1595 | chain = None |
|
1596 | 1596 | while True: |
|
1597 | 1597 | chunkdata = gen.deltachunk(chain) |
|
1598 | 1598 | if not chunkdata: |
|
1599 | 1599 | break |
|
1600 | 1600 | node = chunkdata['node'] |
|
1601 | 1601 | ui.write("%s\n" % hex(node)) |
|
1602 | 1602 | chain = node |
|
1603 | 1603 | finally: |
|
1604 | 1604 | f.close() |
|
1605 | 1605 | |
|
1606 | 1606 | @command('debugcheckstate', [], '') |
|
1607 | 1607 | def debugcheckstate(ui, repo): |
|
1608 | 1608 | """validate the correctness of the current dirstate""" |
|
1609 | 1609 | parent1, parent2 = repo.dirstate.parents() |
|
1610 | 1610 | m1 = repo[parent1].manifest() |
|
1611 | 1611 | m2 = repo[parent2].manifest() |
|
1612 | 1612 | errors = 0 |
|
1613 | 1613 | for f in repo.dirstate: |
|
1614 | 1614 | state = repo.dirstate[f] |
|
1615 | 1615 | if state in "nr" and f not in m1: |
|
1616 | 1616 | ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state)) |
|
1617 | 1617 | errors += 1 |
|
1618 | 1618 | if state in "a" and f in m1: |
|
1619 | 1619 | ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state)) |
|
1620 | 1620 | errors += 1 |
|
1621 | 1621 | if state in "m" and f not in m1 and f not in m2: |
|
1622 | 1622 | ui.warn(_("%s in state %s, but not in either manifest\n") % |
|
1623 | 1623 | (f, state)) |
|
1624 | 1624 | errors += 1 |
|
1625 | 1625 | for f in m1: |
|
1626 | 1626 | state = repo.dirstate[f] |
|
1627 | 1627 | if state not in "nrm": |
|
1628 | 1628 | ui.warn(_("%s in manifest1, but listed as state %s") % (f, state)) |
|
1629 | 1629 | errors += 1 |
|
1630 | 1630 | if errors: |
|
1631 | 1631 | error = _(".hg/dirstate inconsistent with current parent's manifest") |
|
1632 | 1632 | raise util.Abort(error) |
|
1633 | 1633 | |
|
1634 | 1634 | @command('debugcommands', [], _('[COMMAND]')) |
|
1635 | 1635 | def debugcommands(ui, cmd='', *args): |
|
1636 | 1636 | """list all available commands and options""" |
|
1637 | 1637 | for cmd, vals in sorted(table.iteritems()): |
|
1638 | 1638 | cmd = cmd.split('|')[0].strip('^') |
|
1639 | 1639 | opts = ', '.join([i[1] for i in vals[1]]) |
|
1640 | 1640 | ui.write('%s: %s\n' % (cmd, opts)) |
|
1641 | 1641 | |
|
1642 | 1642 | @command('debugcomplete', |
|
1643 | 1643 | [('o', 'options', None, _('show the command options'))], |
|
1644 | 1644 | _('[-o] CMD')) |
|
1645 | 1645 | def debugcomplete(ui, cmd='', **opts): |
|
1646 | 1646 | """returns the completion list associated with the given command""" |
|
1647 | 1647 | |
|
1648 | 1648 | if opts.get('options'): |
|
1649 | 1649 | options = [] |
|
1650 | 1650 | otables = [globalopts] |
|
1651 | 1651 | if cmd: |
|
1652 | 1652 | aliases, entry = cmdutil.findcmd(cmd, table, False) |
|
1653 | 1653 | otables.append(entry[1]) |
|
1654 | 1654 | for t in otables: |
|
1655 | 1655 | for o in t: |
|
1656 | 1656 | if "(DEPRECATED)" in o[3]: |
|
1657 | 1657 | continue |
|
1658 | 1658 | if o[0]: |
|
1659 | 1659 | options.append('-%s' % o[0]) |
|
1660 | 1660 | options.append('--%s' % o[1]) |
|
1661 | 1661 | ui.write("%s\n" % "\n".join(options)) |
|
1662 | 1662 | return |
|
1663 | 1663 | |
|
1664 | 1664 | cmdlist = cmdutil.findpossible(cmd, table) |
|
1665 | 1665 | if ui.verbose: |
|
1666 | 1666 | cmdlist = [' '.join(c[0]) for c in cmdlist.values()] |
|
1667 | 1667 | ui.write("%s\n" % "\n".join(sorted(cmdlist))) |
|
1668 | 1668 | |
|
1669 | 1669 | @command('debugdag', |
|
1670 | 1670 | [('t', 'tags', None, _('use tags as labels')), |
|
1671 | 1671 | ('b', 'branches', None, _('annotate with branch names')), |
|
1672 | 1672 | ('', 'dots', None, _('use dots for runs')), |
|
1673 | 1673 | ('s', 'spaces', None, _('separate elements by spaces'))], |
|
1674 | 1674 | _('[OPTION]... [FILE [REV]...]')) |
|
1675 | 1675 | def debugdag(ui, repo, file_=None, *revs, **opts): |
|
1676 | 1676 | """format the changelog or an index DAG as a concise textual description |
|
1677 | 1677 | |
|
1678 | 1678 | If you pass a revlog index, the revlog's DAG is emitted. If you list |
|
1679 | 1679 | revision numbers, they get labelled in the output as rN. |
|
1680 | 1680 | |
|
1681 | 1681 | Otherwise, the changelog DAG of the current repo is emitted. |
|
1682 | 1682 | """ |
|
1683 | 1683 | spaces = opts.get('spaces') |
|
1684 | 1684 | dots = opts.get('dots') |
|
1685 | 1685 | if file_: |
|
1686 | 1686 | rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_) |
|
1687 | 1687 | revs = set((int(r) for r in revs)) |
|
1688 | 1688 | def events(): |
|
1689 | 1689 | for r in rlog: |
|
1690 | 1690 | yield 'n', (r, list(set(p for p in rlog.parentrevs(r) |
|
1691 | 1691 | if p != -1))) |
|
1692 | 1692 | if r in revs: |
|
1693 | 1693 | yield 'l', (r, "r%i" % r) |
|
1694 | 1694 | elif repo: |
|
1695 | 1695 | cl = repo.changelog |
|
1696 | 1696 | tags = opts.get('tags') |
|
1697 | 1697 | branches = opts.get('branches') |
|
1698 | 1698 | if tags: |
|
1699 | 1699 | labels = {} |
|
1700 | 1700 | for l, n in repo.tags().items(): |
|
1701 | 1701 | labels.setdefault(cl.rev(n), []).append(l) |
|
1702 | 1702 | def events(): |
|
1703 | 1703 | b = "default" |
|
1704 | 1704 | for r in cl: |
|
1705 | 1705 | if branches: |
|
1706 | 1706 | newb = cl.read(cl.node(r))[5]['branch'] |
|
1707 | 1707 | if newb != b: |
|
1708 | 1708 | yield 'a', newb |
|
1709 | 1709 | b = newb |
|
1710 | 1710 | yield 'n', (r, list(set(p for p in cl.parentrevs(r) |
|
1711 | 1711 | if p != -1))) |
|
1712 | 1712 | if tags: |
|
1713 | 1713 | ls = labels.get(r) |
|
1714 | 1714 | if ls: |
|
1715 | 1715 | for l in ls: |
|
1716 | 1716 | yield 'l', (r, l) |
|
1717 | 1717 | else: |
|
1718 | 1718 | raise util.Abort(_('need repo for changelog dag')) |
|
1719 | 1719 | |
|
1720 | 1720 | for line in dagparser.dagtextlines(events(), |
|
1721 | 1721 | addspaces=spaces, |
|
1722 | 1722 | wraplabels=True, |
|
1723 | 1723 | wrapannotations=True, |
|
1724 | 1724 | wrapnonlinear=dots, |
|
1725 | 1725 | usedots=dots, |
|
1726 | 1726 | maxlinewidth=70): |
|
1727 | 1727 | ui.write(line) |
|
1728 | 1728 | ui.write("\n") |
|
1729 | 1729 | |
|
1730 | 1730 | @command('debugdata', |
|
1731 | 1731 | [('c', 'changelog', False, _('open changelog')), |
|
1732 | 1732 | ('m', 'manifest', False, _('open manifest'))], |
|
1733 | 1733 | _('-c|-m|FILE REV')) |
|
1734 | 1734 | def debugdata(ui, repo, file_, rev = None, **opts): |
|
1735 | 1735 | """dump the contents of a data file revision""" |
|
1736 | 1736 | if opts.get('changelog') or opts.get('manifest'): |
|
1737 | 1737 | file_, rev = None, file_ |
|
1738 | 1738 | elif rev is None: |
|
1739 | 1739 | raise error.CommandError('debugdata', _('invalid arguments')) |
|
1740 | 1740 | r = cmdutil.openrevlog(repo, 'debugdata', file_, opts) |
|
1741 | 1741 | try: |
|
1742 | 1742 | ui.write(r.revision(r.lookup(rev))) |
|
1743 | 1743 | except KeyError: |
|
1744 | 1744 | raise util.Abort(_('invalid revision identifier %s') % rev) |
|
1745 | 1745 | |
|
1746 | 1746 | @command('debugdate', |
|
1747 | 1747 | [('e', 'extended', None, _('try extended date formats'))], |
|
1748 | 1748 | _('[-e] DATE [RANGE]')) |
|
1749 | 1749 | def debugdate(ui, date, range=None, **opts): |
|
1750 | 1750 | """parse and display a date""" |
|
1751 | 1751 | if opts["extended"]: |
|
1752 | 1752 | d = util.parsedate(date, util.extendeddateformats) |
|
1753 | 1753 | else: |
|
1754 | 1754 | d = util.parsedate(date) |
|
1755 | 1755 | ui.write("internal: %s %s\n" % d) |
|
1756 | 1756 | ui.write("standard: %s\n" % util.datestr(d)) |
|
1757 | 1757 | if range: |
|
1758 | 1758 | m = util.matchdate(range) |
|
1759 | 1759 | ui.write("match: %s\n" % m(d[0])) |
|
1760 | 1760 | |
|
1761 | 1761 | @command('debugdiscovery', |
|
1762 | 1762 | [('', 'old', None, _('use old-style discovery')), |
|
1763 | 1763 | ('', 'nonheads', None, |
|
1764 | 1764 | _('use old-style discovery with non-heads included')), |
|
1765 | 1765 | ] + remoteopts, |
|
1766 | 1766 | _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]')) |
|
1767 | 1767 | def debugdiscovery(ui, repo, remoteurl="default", **opts): |
|
1768 | 1768 | """runs the changeset discovery protocol in isolation""" |
|
1769 | 1769 | remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl), |
|
1770 | 1770 | opts.get('branch')) |
|
1771 | 1771 | remote = hg.peer(repo, opts, remoteurl) |
|
1772 | 1772 | ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl)) |
|
1773 | 1773 | |
|
1774 | 1774 | # make sure tests are repeatable |
|
1775 | 1775 | random.seed(12323) |
|
1776 | 1776 | |
|
1777 | 1777 | def doit(localheads, remoteheads): |
|
1778 | 1778 | if opts.get('old'): |
|
1779 | 1779 | if localheads: |
|
1780 | 1780 | raise util.Abort('cannot use localheads with old style ' |
|
1781 | 1781 | 'discovery') |
|
1782 | 1782 | common, _in, hds = treediscovery.findcommonincoming(repo, remote, |
|
1783 | 1783 | force=True) |
|
1784 | 1784 | common = set(common) |
|
1785 | 1785 | if not opts.get('nonheads'): |
|
1786 | 1786 | ui.write("unpruned common: %s\n" % " ".join([short(n) |
|
1787 | 1787 | for n in common])) |
|
1788 | 1788 | dag = dagutil.revlogdag(repo.changelog) |
|
1789 | 1789 | all = dag.ancestorset(dag.internalizeall(common)) |
|
1790 | 1790 | common = dag.externalizeall(dag.headsetofconnecteds(all)) |
|
1791 | 1791 | else: |
|
1792 | 1792 | common, any, hds = setdiscovery.findcommonheads(ui, repo, remote) |
|
1793 | 1793 | common = set(common) |
|
1794 | 1794 | rheads = set(hds) |
|
1795 | 1795 | lheads = set(repo.heads()) |
|
1796 | 1796 | ui.write("common heads: %s\n" % " ".join([short(n) for n in common])) |
|
1797 | 1797 | if lheads <= common: |
|
1798 | 1798 | ui.write("local is subset\n") |
|
1799 | 1799 | elif rheads <= common: |
|
1800 | 1800 | ui.write("remote is subset\n") |
|
1801 | 1801 | |
|
1802 | 1802 | serverlogs = opts.get('serverlog') |
|
1803 | 1803 | if serverlogs: |
|
1804 | 1804 | for filename in serverlogs: |
|
1805 | 1805 | logfile = open(filename, 'r') |
|
1806 | 1806 | try: |
|
1807 | 1807 | line = logfile.readline() |
|
1808 | 1808 | while line: |
|
1809 | 1809 | parts = line.strip().split(';') |
|
1810 | 1810 | op = parts[1] |
|
1811 | 1811 | if op == 'cg': |
|
1812 | 1812 | pass |
|
1813 | 1813 | elif op == 'cgss': |
|
1814 | 1814 | doit(parts[2].split(' '), parts[3].split(' ')) |
|
1815 | 1815 | elif op == 'unb': |
|
1816 | 1816 | doit(parts[3].split(' '), parts[2].split(' ')) |
|
1817 | 1817 | line = logfile.readline() |
|
1818 | 1818 | finally: |
|
1819 | 1819 | logfile.close() |
|
1820 | 1820 | |
|
1821 | 1821 | else: |
|
1822 | 1822 | remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches, |
|
1823 | 1823 | opts.get('remote_head')) |
|
1824 | 1824 | localrevs = opts.get('local_head') |
|
1825 | 1825 | doit(localrevs, remoterevs) |
|
1826 | 1826 | |
|
1827 | 1827 | @command('debugfileset', [], ('REVSPEC')) |
|
1828 | 1828 | def debugfileset(ui, repo, expr): |
|
1829 | 1829 | '''parse and apply a fileset specification''' |
|
1830 | 1830 | if ui.verbose: |
|
1831 | 1831 | tree = fileset.parse(expr)[0] |
|
1832 | 1832 | ui.note(tree, "\n") |
|
1833 | 1833 | |
|
1834 | 1834 | for f in fileset.getfileset(repo[None], expr): |
|
1835 | 1835 | ui.write("%s\n" % f) |
|
1836 | 1836 | |
|
1837 | 1837 | @command('debugfsinfo', [], _('[PATH]')) |
|
1838 | 1838 | def debugfsinfo(ui, path = "."): |
|
1839 | 1839 | """show information detected about current filesystem""" |
|
1840 | 1840 | util.writefile('.debugfsinfo', '') |
|
1841 | 1841 | ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no')) |
|
1842 | 1842 | ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no')) |
|
1843 | 1843 | ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo') |
|
1844 | 1844 | and 'yes' or 'no')) |
|
1845 | 1845 | os.unlink('.debugfsinfo') |
|
1846 | 1846 | |
|
1847 | 1847 | @command('debuggetbundle', |
|
1848 | 1848 | [('H', 'head', [], _('id of head node'), _('ID')), |
|
1849 | 1849 | ('C', 'common', [], _('id of common node'), _('ID')), |
|
1850 | 1850 | ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))], |
|
1851 | 1851 | _('REPO FILE [-H|-C ID]...')) |
|
1852 | 1852 | def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts): |
|
1853 | 1853 | """retrieves a bundle from a repo |
|
1854 | 1854 | |
|
1855 | 1855 | Every ID must be a full-length hex node id string. Saves the bundle to the |
|
1856 | 1856 | given file. |
|
1857 | 1857 | """ |
|
1858 | 1858 | repo = hg.peer(ui, opts, repopath) |
|
1859 | 1859 | if not repo.capable('getbundle'): |
|
1860 | 1860 | raise util.Abort("getbundle() not supported by target repository") |
|
1861 | 1861 | args = {} |
|
1862 | 1862 | if common: |
|
1863 | 1863 | args['common'] = [bin(s) for s in common] |
|
1864 | 1864 | if head: |
|
1865 | 1865 | args['heads'] = [bin(s) for s in head] |
|
1866 | 1866 | bundle = repo.getbundle('debug', **args) |
|
1867 | 1867 | |
|
1868 | 1868 | bundletype = opts.get('type', 'bzip2').lower() |
|
1869 | 1869 | btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'} |
|
1870 | 1870 | bundletype = btypes.get(bundletype) |
|
1871 | 1871 | if bundletype not in changegroup.bundletypes: |
|
1872 | 1872 | raise util.Abort(_('unknown bundle type specified with --type')) |
|
1873 | 1873 | changegroup.writebundle(bundle, bundlepath, bundletype) |
|
1874 | 1874 | |
|
1875 | 1875 | @command('debugignore', [], '') |
|
1876 | 1876 | def debugignore(ui, repo, *values, **opts): |
|
1877 | 1877 | """display the combined ignore pattern""" |
|
1878 | 1878 | ignore = repo.dirstate._ignore |
|
1879 | 1879 | includepat = getattr(ignore, 'includepat', None) |
|
1880 | 1880 | if includepat is not None: |
|
1881 | 1881 | ui.write("%s\n" % includepat) |
|
1882 | 1882 | else: |
|
1883 | 1883 | raise util.Abort(_("no ignore patterns found")) |
|
1884 | 1884 | |
|
1885 | 1885 | @command('debugindex', |
|
1886 | 1886 | [('c', 'changelog', False, _('open changelog')), |
|
1887 | 1887 | ('m', 'manifest', False, _('open manifest')), |
|
1888 | 1888 | ('f', 'format', 0, _('revlog format'), _('FORMAT'))], |
|
1889 | 1889 | _('[-f FORMAT] -c|-m|FILE')) |
|
1890 | 1890 | def debugindex(ui, repo, file_ = None, **opts): |
|
1891 | 1891 | """dump the contents of an index file""" |
|
1892 | 1892 | r = cmdutil.openrevlog(repo, 'debugindex', file_, opts) |
|
1893 | 1893 | format = opts.get('format', 0) |
|
1894 | 1894 | if format not in (0, 1): |
|
1895 | 1895 | raise util.Abort(_("unknown format %d") % format) |
|
1896 | 1896 | |
|
1897 | 1897 | generaldelta = r.version & revlog.REVLOGGENERALDELTA |
|
1898 | 1898 | if generaldelta: |
|
1899 | 1899 | basehdr = ' delta' |
|
1900 | 1900 | else: |
|
1901 | 1901 | basehdr = ' base' |
|
1902 | 1902 | |
|
1903 | 1903 | if format == 0: |
|
1904 | 1904 | ui.write(" rev offset length " + basehdr + " linkrev" |
|
1905 | 1905 | " nodeid p1 p2\n") |
|
1906 | 1906 | elif format == 1: |
|
1907 | 1907 | ui.write(" rev flag offset length" |
|
1908 | 1908 | " size " + basehdr + " link p1 p2" |
|
1909 | 1909 | " nodeid\n") |
|
1910 | 1910 | |
|
1911 | 1911 | for i in r: |
|
1912 | 1912 | node = r.node(i) |
|
1913 | 1913 | if generaldelta: |
|
1914 | 1914 | base = r.deltaparent(i) |
|
1915 | 1915 | else: |
|
1916 | 1916 | base = r.chainbase(i) |
|
1917 | 1917 | if format == 0: |
|
1918 | 1918 | try: |
|
1919 | 1919 | pp = r.parents(node) |
|
1920 | 1920 | except Exception: |
|
1921 | 1921 | pp = [nullid, nullid] |
|
1922 | 1922 | ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % ( |
|
1923 | 1923 | i, r.start(i), r.length(i), base, r.linkrev(i), |
|
1924 | 1924 | short(node), short(pp[0]), short(pp[1]))) |
|
1925 | 1925 | elif format == 1: |
|
1926 | 1926 | pr = r.parentrevs(i) |
|
1927 | 1927 | ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % ( |
|
1928 | 1928 | i, r.flags(i), r.start(i), r.length(i), r.rawsize(i), |
|
1929 | 1929 | base, r.linkrev(i), pr[0], pr[1], short(node))) |
|
1930 | 1930 | |
|
1931 | 1931 | @command('debugindexdot', [], _('FILE')) |
|
1932 | 1932 | def debugindexdot(ui, repo, file_): |
|
1933 | 1933 | """dump an index DAG as a graphviz dot file""" |
|
1934 | 1934 | r = None |
|
1935 | 1935 | if repo: |
|
1936 | 1936 | filelog = repo.file(file_) |
|
1937 | 1937 | if len(filelog): |
|
1938 | 1938 | r = filelog |
|
1939 | 1939 | if not r: |
|
1940 | 1940 | r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_) |
|
1941 | 1941 | ui.write("digraph G {\n") |
|
1942 | 1942 | for i in r: |
|
1943 | 1943 | node = r.node(i) |
|
1944 | 1944 | pp = r.parents(node) |
|
1945 | 1945 | ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i)) |
|
1946 | 1946 | if pp[1] != nullid: |
|
1947 | 1947 | ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i)) |
|
1948 | 1948 | ui.write("}\n") |
|
1949 | 1949 | |
|
1950 | 1950 | @command('debuginstall', [], '') |
|
1951 | 1951 | def debuginstall(ui): |
|
1952 | 1952 | '''test Mercurial installation |
|
1953 | 1953 | |
|
1954 | 1954 | Returns 0 on success. |
|
1955 | 1955 | ''' |
|
1956 | 1956 | |
|
1957 | 1957 | def writetemp(contents): |
|
1958 | 1958 | (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-") |
|
1959 | 1959 | f = os.fdopen(fd, "wb") |
|
1960 | 1960 | f.write(contents) |
|
1961 | 1961 | f.close() |
|
1962 | 1962 | return name |
|
1963 | 1963 | |
|
1964 | 1964 | problems = 0 |
|
1965 | 1965 | |
|
1966 | 1966 | # encoding |
|
1967 | 1967 | ui.status(_("Checking encoding (%s)...\n") % encoding.encoding) |
|
1968 | 1968 | try: |
|
1969 | 1969 | encoding.fromlocal("test") |
|
1970 | 1970 | except util.Abort, inst: |
|
1971 | 1971 | ui.write(" %s\n" % inst) |
|
1972 | 1972 | ui.write(_(" (check that your locale is properly set)\n")) |
|
1973 | 1973 | problems += 1 |
|
1974 | 1974 | |
|
1975 | 1975 | # compiled modules |
|
1976 | 1976 | ui.status(_("Checking installed modules (%s)...\n") |
|
1977 | 1977 | % os.path.dirname(__file__)) |
|
1978 | 1978 | try: |
|
1979 | 1979 | import bdiff, mpatch, base85, osutil |
|
1980 | 1980 | dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes |
|
1981 | 1981 | except Exception, inst: |
|
1982 | 1982 | ui.write(" %s\n" % inst) |
|
1983 | 1983 | ui.write(_(" One or more extensions could not be found")) |
|
1984 | 1984 | ui.write(_(" (check that you compiled the extensions)\n")) |
|
1985 | 1985 | problems += 1 |
|
1986 | 1986 | |
|
1987 | 1987 | # templates |
|
1988 | 1988 | import templater |
|
1989 | 1989 | p = templater.templatepath() |
|
1990 | 1990 | ui.status(_("Checking templates (%s)...\n") % ' '.join(p)) |
|
1991 | 1991 | try: |
|
1992 | 1992 | templater.templater(templater.templatepath("map-cmdline.default")) |
|
1993 | 1993 | except Exception, inst: |
|
1994 | 1994 | ui.write(" %s\n" % inst) |
|
1995 | 1995 | ui.write(_(" (templates seem to have been installed incorrectly)\n")) |
|
1996 | 1996 | problems += 1 |
|
1997 | 1997 | |
|
1998 | 1998 | # editor |
|
1999 | 1999 | ui.status(_("Checking commit editor...\n")) |
|
2000 | 2000 | editor = ui.geteditor() |
|
2001 | 2001 | cmdpath = util.findexe(editor) or util.findexe(editor.split()[0]) |
|
2002 | 2002 | if not cmdpath: |
|
2003 | 2003 | if editor == 'vi': |
|
2004 | 2004 | ui.write(_(" No commit editor set and can't find vi in PATH\n")) |
|
2005 | 2005 | ui.write(_(" (specify a commit editor in your configuration" |
|
2006 | 2006 | " file)\n")) |
|
2007 | 2007 | else: |
|
2008 | 2008 | ui.write(_(" Can't find editor '%s' in PATH\n") % editor) |
|
2009 | 2009 | ui.write(_(" (specify a commit editor in your configuration" |
|
2010 | 2010 | " file)\n")) |
|
2011 | 2011 | problems += 1 |
|
2012 | 2012 | |
|
2013 | 2013 | # check username |
|
2014 | 2014 | ui.status(_("Checking username...\n")) |
|
2015 | 2015 | try: |
|
2016 | 2016 | ui.username() |
|
2017 | 2017 | except util.Abort, e: |
|
2018 | 2018 | ui.write(" %s\n" % e) |
|
2019 | 2019 | ui.write(_(" (specify a username in your configuration file)\n")) |
|
2020 | 2020 | problems += 1 |
|
2021 | 2021 | |
|
2022 | 2022 | if not problems: |
|
2023 | 2023 | ui.status(_("No problems detected\n")) |
|
2024 | 2024 | else: |
|
2025 | 2025 | ui.write(_("%s problems detected," |
|
2026 | 2026 | " please check your install!\n") % problems) |
|
2027 | 2027 | |
|
2028 | 2028 | return problems |
|
2029 | 2029 | |
|
2030 | 2030 | @command('debugknown', [], _('REPO ID...')) |
|
2031 | 2031 | def debugknown(ui, repopath, *ids, **opts): |
|
2032 | 2032 | """test whether node ids are known to a repo |
|
2033 | 2033 | |
|
2034 | 2034 | Every ID must be a full-length hex node id string. Returns a list of 0s |
|
2035 | 2035 | and 1s indicating unknown/known. |
|
2036 | 2036 | """ |
|
2037 | 2037 | repo = hg.peer(ui, opts, repopath) |
|
2038 | 2038 | if not repo.capable('known'): |
|
2039 | 2039 | raise util.Abort("known() not supported by target repository") |
|
2040 | 2040 | flags = repo.known([bin(s) for s in ids]) |
|
2041 | 2041 | ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags]))) |
|
2042 | 2042 | |
|
2043 | 2043 | @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]')) |
|
2044 | 2044 | def debugpushkey(ui, repopath, namespace, *keyinfo, **opts): |
|
2045 | 2045 | '''access the pushkey key/value protocol |
|
2046 | 2046 | |
|
2047 | 2047 | With two args, list the keys in the given namespace. |
|
2048 | 2048 | |
|
2049 | 2049 | With five args, set a key to new if it currently is set to old. |
|
2050 | 2050 | Reports success or failure. |
|
2051 | 2051 | ''' |
|
2052 | 2052 | |
|
2053 | 2053 | target = hg.peer(ui, {}, repopath) |
|
2054 | 2054 | if keyinfo: |
|
2055 | 2055 | key, old, new = keyinfo |
|
2056 | 2056 | r = target.pushkey(namespace, key, old, new) |
|
2057 | 2057 | ui.status(str(r) + '\n') |
|
2058 | 2058 | return not r |
|
2059 | 2059 | else: |
|
2060 | 2060 | for k, v in target.listkeys(namespace).iteritems(): |
|
2061 | 2061 | ui.write("%s\t%s\n" % (k.encode('string-escape'), |
|
2062 | 2062 | v.encode('string-escape'))) |
|
2063 | 2063 | |
|
2064 | 2064 | @command('debugpvec', [], _('A B')) |
|
2065 | 2065 | def debugpvec(ui, repo, a, b=None): |
|
2066 | 2066 | ca = scmutil.revsingle(repo, a) |
|
2067 | 2067 | cb = scmutil.revsingle(repo, b) |
|
2068 | 2068 | pa = pvec.ctxpvec(ca) |
|
2069 | 2069 | pb = pvec.ctxpvec(cb) |
|
2070 | 2070 | if pa == pb: |
|
2071 | 2071 | rel = "=" |
|
2072 | 2072 | elif pa > pb: |
|
2073 | 2073 | rel = ">" |
|
2074 | 2074 | elif pa < pb: |
|
2075 | 2075 | rel = "<" |
|
2076 | 2076 | elif pa | pb: |
|
2077 | 2077 | rel = "|" |
|
2078 | 2078 | ui.write(_("a: %s\n") % pa) |
|
2079 | 2079 | ui.write(_("b: %s\n") % pb) |
|
2080 | 2080 | ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth)) |
|
2081 | 2081 | ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") % |
|
2082 | 2082 | (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec), |
|
2083 | 2083 | pa.distance(pb), rel)) |
|
2084 | 2084 | |
|
2085 | 2085 | @command('debugrebuildstate', |
|
2086 | 2086 | [('r', 'rev', '', _('revision to rebuild to'), _('REV'))], |
|
2087 | 2087 | _('[-r REV] [REV]')) |
|
2088 | 2088 | def debugrebuildstate(ui, repo, rev="tip"): |
|
2089 | 2089 | """rebuild the dirstate as it would look like for the given revision""" |
|
2090 | 2090 | ctx = scmutil.revsingle(repo, rev) |
|
2091 | 2091 | wlock = repo.wlock() |
|
2092 | 2092 | try: |
|
2093 | 2093 | repo.dirstate.rebuild(ctx.node(), ctx.manifest()) |
|
2094 | 2094 | finally: |
|
2095 | 2095 | wlock.release() |
|
2096 | 2096 | |
|
2097 | 2097 | @command('debugrename', |
|
2098 | 2098 | [('r', 'rev', '', _('revision to debug'), _('REV'))], |
|
2099 | 2099 | _('[-r REV] FILE')) |
|
2100 | 2100 | def debugrename(ui, repo, file1, *pats, **opts): |
|
2101 | 2101 | """dump rename information""" |
|
2102 | 2102 | |
|
2103 | 2103 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
2104 | 2104 | m = scmutil.match(ctx, (file1,) + pats, opts) |
|
2105 | 2105 | for abs in ctx.walk(m): |
|
2106 | 2106 | fctx = ctx[abs] |
|
2107 | 2107 | o = fctx.filelog().renamed(fctx.filenode()) |
|
2108 | 2108 | rel = m.rel(abs) |
|
2109 | 2109 | if o: |
|
2110 | 2110 | ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1]))) |
|
2111 | 2111 | else: |
|
2112 | 2112 | ui.write(_("%s not renamed\n") % rel) |
|
2113 | 2113 | |
|
2114 | 2114 | @command('debugrevlog', |
|
2115 | 2115 | [('c', 'changelog', False, _('open changelog')), |
|
2116 | 2116 | ('m', 'manifest', False, _('open manifest')), |
|
2117 | 2117 | ('d', 'dump', False, _('dump index data'))], |
|
2118 | 2118 | _('-c|-m|FILE')) |
|
2119 | 2119 | def debugrevlog(ui, repo, file_ = None, **opts): |
|
2120 | 2120 | """show data and statistics about a revlog""" |
|
2121 | 2121 | r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts) |
|
2122 | 2122 | |
|
2123 | 2123 | if opts.get("dump"): |
|
2124 | 2124 | numrevs = len(r) |
|
2125 | 2125 | ui.write("# rev p1rev p2rev start end deltastart base p1 p2" |
|
2126 | 2126 | " rawsize totalsize compression heads\n") |
|
2127 | 2127 | ts = 0 |
|
2128 | 2128 | heads = set() |
|
2129 | 2129 | for rev in xrange(numrevs): |
|
2130 | 2130 | dbase = r.deltaparent(rev) |
|
2131 | 2131 | if dbase == -1: |
|
2132 | 2132 | dbase = rev |
|
2133 | 2133 | cbase = r.chainbase(rev) |
|
2134 | 2134 | p1, p2 = r.parentrevs(rev) |
|
2135 | 2135 | rs = r.rawsize(rev) |
|
2136 | 2136 | ts = ts + rs |
|
2137 | 2137 | heads -= set(r.parentrevs(rev)) |
|
2138 | 2138 | heads.add(rev) |
|
2139 | 2139 | ui.write("%d %d %d %d %d %d %d %d %d %d %d %d %d\n" % |
|
2140 | 2140 | (rev, p1, p2, r.start(rev), r.end(rev), |
|
2141 | 2141 | r.start(dbase), r.start(cbase), |
|
2142 | 2142 | r.start(p1), r.start(p2), |
|
2143 | 2143 | rs, ts, ts / r.end(rev), len(heads))) |
|
2144 | 2144 | return 0 |
|
2145 | 2145 | |
|
2146 | 2146 | v = r.version |
|
2147 | 2147 | format = v & 0xFFFF |
|
2148 | 2148 | flags = [] |
|
2149 | 2149 | gdelta = False |
|
2150 | 2150 | if v & revlog.REVLOGNGINLINEDATA: |
|
2151 | 2151 | flags.append('inline') |
|
2152 | 2152 | if v & revlog.REVLOGGENERALDELTA: |
|
2153 | 2153 | gdelta = True |
|
2154 | 2154 | flags.append('generaldelta') |
|
2155 | 2155 | if not flags: |
|
2156 | 2156 | flags = ['(none)'] |
|
2157 | 2157 | |
|
2158 | 2158 | nummerges = 0 |
|
2159 | 2159 | numfull = 0 |
|
2160 | 2160 | numprev = 0 |
|
2161 | 2161 | nump1 = 0 |
|
2162 | 2162 | nump2 = 0 |
|
2163 | 2163 | numother = 0 |
|
2164 | 2164 | nump1prev = 0 |
|
2165 | 2165 | nump2prev = 0 |
|
2166 | 2166 | chainlengths = [] |
|
2167 | 2167 | |
|
2168 | 2168 | datasize = [None, 0, 0L] |
|
2169 | 2169 | fullsize = [None, 0, 0L] |
|
2170 | 2170 | deltasize = [None, 0, 0L] |
|
2171 | 2171 | |
|
2172 | 2172 | def addsize(size, l): |
|
2173 | 2173 | if l[0] is None or size < l[0]: |
|
2174 | 2174 | l[0] = size |
|
2175 | 2175 | if size > l[1]: |
|
2176 | 2176 | l[1] = size |
|
2177 | 2177 | l[2] += size |
|
2178 | 2178 | |
|
2179 | 2179 | numrevs = len(r) |
|
2180 | 2180 | for rev in xrange(numrevs): |
|
2181 | 2181 | p1, p2 = r.parentrevs(rev) |
|
2182 | 2182 | delta = r.deltaparent(rev) |
|
2183 | 2183 | if format > 0: |
|
2184 | 2184 | addsize(r.rawsize(rev), datasize) |
|
2185 | 2185 | if p2 != nullrev: |
|
2186 | 2186 | nummerges += 1 |
|
2187 | 2187 | size = r.length(rev) |
|
2188 | 2188 | if delta == nullrev: |
|
2189 | 2189 | chainlengths.append(0) |
|
2190 | 2190 | numfull += 1 |
|
2191 | 2191 | addsize(size, fullsize) |
|
2192 | 2192 | else: |
|
2193 | 2193 | chainlengths.append(chainlengths[delta] + 1) |
|
2194 | 2194 | addsize(size, deltasize) |
|
2195 | 2195 | if delta == rev - 1: |
|
2196 | 2196 | numprev += 1 |
|
2197 | 2197 | if delta == p1: |
|
2198 | 2198 | nump1prev += 1 |
|
2199 | 2199 | elif delta == p2: |
|
2200 | 2200 | nump2prev += 1 |
|
2201 | 2201 | elif delta == p1: |
|
2202 | 2202 | nump1 += 1 |
|
2203 | 2203 | elif delta == p2: |
|
2204 | 2204 | nump2 += 1 |
|
2205 | 2205 | elif delta != nullrev: |
|
2206 | 2206 | numother += 1 |
|
2207 | 2207 | |
|
2208 | 2208 | numdeltas = numrevs - numfull |
|
2209 | 2209 | numoprev = numprev - nump1prev - nump2prev |
|
2210 | 2210 | totalrawsize = datasize[2] |
|
2211 | 2211 | datasize[2] /= numrevs |
|
2212 | 2212 | fulltotal = fullsize[2] |
|
2213 | 2213 | fullsize[2] /= numfull |
|
2214 | 2214 | deltatotal = deltasize[2] |
|
2215 | 2215 | deltasize[2] /= numrevs - numfull |
|
2216 | 2216 | totalsize = fulltotal + deltatotal |
|
2217 | 2217 | avgchainlen = sum(chainlengths) / numrevs |
|
2218 | 2218 | compratio = totalrawsize / totalsize |
|
2219 | 2219 | |
|
2220 | 2220 | basedfmtstr = '%%%dd\n' |
|
2221 | 2221 | basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n' |
|
2222 | 2222 | |
|
2223 | 2223 | def dfmtstr(max): |
|
2224 | 2224 | return basedfmtstr % len(str(max)) |
|
2225 | 2225 | def pcfmtstr(max, padding=0): |
|
2226 | 2226 | return basepcfmtstr % (len(str(max)), ' ' * padding) |
|
2227 | 2227 | |
|
2228 | 2228 | def pcfmt(value, total): |
|
2229 | 2229 | return (value, 100 * float(value) / total) |
|
2230 | 2230 | |
|
2231 | 2231 | ui.write('format : %d\n' % format) |
|
2232 | 2232 | ui.write('flags : %s\n' % ', '.join(flags)) |
|
2233 | 2233 | |
|
2234 | 2234 | ui.write('\n') |
|
2235 | 2235 | fmt = pcfmtstr(totalsize) |
|
2236 | 2236 | fmt2 = dfmtstr(totalsize) |
|
2237 | 2237 | ui.write('revisions : ' + fmt2 % numrevs) |
|
2238 | 2238 | ui.write(' merges : ' + fmt % pcfmt(nummerges, numrevs)) |
|
2239 | 2239 | ui.write(' normal : ' + fmt % pcfmt(numrevs - nummerges, numrevs)) |
|
2240 | 2240 | ui.write('revisions : ' + fmt2 % numrevs) |
|
2241 | 2241 | ui.write(' full : ' + fmt % pcfmt(numfull, numrevs)) |
|
2242 | 2242 | ui.write(' deltas : ' + fmt % pcfmt(numdeltas, numrevs)) |
|
2243 | 2243 | ui.write('revision size : ' + fmt2 % totalsize) |
|
2244 | 2244 | ui.write(' full : ' + fmt % pcfmt(fulltotal, totalsize)) |
|
2245 | 2245 | ui.write(' deltas : ' + fmt % pcfmt(deltatotal, totalsize)) |
|
2246 | 2246 | |
|
2247 | 2247 | ui.write('\n') |
|
2248 | 2248 | fmt = dfmtstr(max(avgchainlen, compratio)) |
|
2249 | 2249 | ui.write('avg chain length : ' + fmt % avgchainlen) |
|
2250 | 2250 | ui.write('compression ratio : ' + fmt % compratio) |
|
2251 | 2251 | |
|
2252 | 2252 | if format > 0: |
|
2253 | 2253 | ui.write('\n') |
|
2254 | 2254 | ui.write('uncompressed data size (min/max/avg) : %d / %d / %d\n' |
|
2255 | 2255 | % tuple(datasize)) |
|
2256 | 2256 | ui.write('full revision size (min/max/avg) : %d / %d / %d\n' |
|
2257 | 2257 | % tuple(fullsize)) |
|
2258 | 2258 | ui.write('delta size (min/max/avg) : %d / %d / %d\n' |
|
2259 | 2259 | % tuple(deltasize)) |
|
2260 | 2260 | |
|
2261 | 2261 | if numdeltas > 0: |
|
2262 | 2262 | ui.write('\n') |
|
2263 | 2263 | fmt = pcfmtstr(numdeltas) |
|
2264 | 2264 | fmt2 = pcfmtstr(numdeltas, 4) |
|
2265 | 2265 | ui.write('deltas against prev : ' + fmt % pcfmt(numprev, numdeltas)) |
|
2266 | 2266 | if numprev > 0: |
|
2267 | 2267 | ui.write(' where prev = p1 : ' + fmt2 % pcfmt(nump1prev, |
|
2268 | 2268 | numprev)) |
|
2269 | 2269 | ui.write(' where prev = p2 : ' + fmt2 % pcfmt(nump2prev, |
|
2270 | 2270 | numprev)) |
|
2271 | 2271 | ui.write(' other : ' + fmt2 % pcfmt(numoprev, |
|
2272 | 2272 | numprev)) |
|
2273 | 2273 | if gdelta: |
|
2274 | 2274 | ui.write('deltas against p1 : ' + fmt % pcfmt(nump1, numdeltas)) |
|
2275 | 2275 | ui.write('deltas against p2 : ' + fmt % pcfmt(nump2, numdeltas)) |
|
2276 | 2276 | ui.write('deltas against other : ' + fmt % pcfmt(numother, |
|
2277 | 2277 | numdeltas)) |
|
2278 | 2278 | |
|
2279 | 2279 | @command('debugrevspec', [], ('REVSPEC')) |
|
2280 | 2280 | def debugrevspec(ui, repo, expr): |
|
2281 | 2281 | """parse and apply a revision specification |
|
2282 | 2282 | |
|
2283 | 2283 | Use --verbose to print the parsed tree before and after aliases |
|
2284 | 2284 | expansion. |
|
2285 | 2285 | """ |
|
2286 | 2286 | if ui.verbose: |
|
2287 | 2287 | tree = revset.parse(expr)[0] |
|
2288 | 2288 | ui.note(revset.prettyformat(tree), "\n") |
|
2289 | 2289 | newtree = revset.findaliases(ui, tree) |
|
2290 | 2290 | if newtree != tree: |
|
2291 | 2291 | ui.note(revset.prettyformat(newtree), "\n") |
|
2292 | 2292 | func = revset.match(ui, expr) |
|
2293 | 2293 | for c in func(repo, range(len(repo))): |
|
2294 | 2294 | ui.write("%s\n" % c) |
|
2295 | 2295 | |
|
2296 | 2296 | @command('debugsetparents', [], _('REV1 [REV2]')) |
|
2297 | 2297 | def debugsetparents(ui, repo, rev1, rev2=None): |
|
2298 | 2298 | """manually set the parents of the current working directory |
|
2299 | 2299 | |
|
2300 | 2300 | This is useful for writing repository conversion tools, but should |
|
2301 | 2301 | be used with care. |
|
2302 | 2302 | |
|
2303 | 2303 | Returns 0 on success. |
|
2304 | 2304 | """ |
|
2305 | 2305 | |
|
2306 | 2306 | r1 = scmutil.revsingle(repo, rev1).node() |
|
2307 | 2307 | r2 = scmutil.revsingle(repo, rev2, 'null').node() |
|
2308 | 2308 | |
|
2309 | 2309 | wlock = repo.wlock() |
|
2310 | 2310 | try: |
|
2311 | 2311 | repo.setparents(r1, r2) |
|
2312 | 2312 | finally: |
|
2313 | 2313 | wlock.release() |
|
2314 | 2314 | |
|
2315 | 2315 | @command('debugstate', |
|
2316 | 2316 | [('', 'nodates', None, _('do not display the saved mtime')), |
|
2317 | 2317 | ('', 'datesort', None, _('sort by saved mtime'))], |
|
2318 | 2318 | _('[OPTION]...')) |
|
2319 | 2319 | def debugstate(ui, repo, nodates=None, datesort=None): |
|
2320 | 2320 | """show the contents of the current dirstate""" |
|
2321 | 2321 | timestr = "" |
|
2322 | 2322 | showdate = not nodates |
|
2323 | 2323 | if datesort: |
|
2324 | 2324 | keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename |
|
2325 | 2325 | else: |
|
2326 | 2326 | keyfunc = None # sort by filename |
|
2327 | 2327 | for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc): |
|
2328 | 2328 | if showdate: |
|
2329 | 2329 | if ent[3] == -1: |
|
2330 | 2330 | # Pad or slice to locale representation |
|
2331 | 2331 | locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ", |
|
2332 | 2332 | time.localtime(0))) |
|
2333 | 2333 | timestr = 'unset' |
|
2334 | 2334 | timestr = (timestr[:locale_len] + |
|
2335 | 2335 | ' ' * (locale_len - len(timestr))) |
|
2336 | 2336 | else: |
|
2337 | 2337 | timestr = time.strftime("%Y-%m-%d %H:%M:%S ", |
|
2338 | 2338 | time.localtime(ent[3])) |
|
2339 | 2339 | if ent[1] & 020000: |
|
2340 | 2340 | mode = 'lnk' |
|
2341 | 2341 | else: |
|
2342 | 2342 | mode = '%3o' % (ent[1] & 0777 & ~util.umask) |
|
2343 | 2343 | ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_)) |
|
2344 | 2344 | for f in repo.dirstate.copies(): |
|
2345 | 2345 | ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f)) |
|
2346 | 2346 | |
|
2347 | 2347 | @command('debugsub', |
|
2348 | 2348 | [('r', 'rev', '', |
|
2349 | 2349 | _('revision to check'), _('REV'))], |
|
2350 | 2350 | _('[-r REV] [REV]')) |
|
2351 | 2351 | def debugsub(ui, repo, rev=None): |
|
2352 | 2352 | ctx = scmutil.revsingle(repo, rev, None) |
|
2353 | 2353 | for k, v in sorted(ctx.substate.items()): |
|
2354 | 2354 | ui.write('path %s\n' % k) |
|
2355 | 2355 | ui.write(' source %s\n' % v[0]) |
|
2356 | 2356 | ui.write(' revision %s\n' % v[1]) |
|
2357 | 2357 | |
|
2358 | 2358 | @command('debugwalk', walkopts, _('[OPTION]... [FILE]...')) |
|
2359 | 2359 | def debugwalk(ui, repo, *pats, **opts): |
|
2360 | 2360 | """show how files match on given patterns""" |
|
2361 | 2361 | m = scmutil.match(repo[None], pats, opts) |
|
2362 | 2362 | items = list(repo.walk(m)) |
|
2363 | 2363 | if not items: |
|
2364 | 2364 | return |
|
2365 | 2365 | fmt = 'f %%-%ds %%-%ds %%s' % ( |
|
2366 | 2366 | max([len(abs) for abs in items]), |
|
2367 | 2367 | max([len(m.rel(abs)) for abs in items])) |
|
2368 | 2368 | for abs in items: |
|
2369 | 2369 | line = fmt % (abs, m.rel(abs), m.exact(abs) and 'exact' or '') |
|
2370 | 2370 | ui.write("%s\n" % line.rstrip()) |
|
2371 | 2371 | |
|
2372 | 2372 | @command('debugwireargs', |
|
2373 | 2373 | [('', 'three', '', 'three'), |
|
2374 | 2374 | ('', 'four', '', 'four'), |
|
2375 | 2375 | ('', 'five', '', 'five'), |
|
2376 | 2376 | ] + remoteopts, |
|
2377 | 2377 | _('REPO [OPTIONS]... [ONE [TWO]]')) |
|
2378 | 2378 | def debugwireargs(ui, repopath, *vals, **opts): |
|
2379 | 2379 | repo = hg.peer(ui, opts, repopath) |
|
2380 | 2380 | for opt in remoteopts: |
|
2381 | 2381 | del opts[opt[1]] |
|
2382 | 2382 | args = {} |
|
2383 | 2383 | for k, v in opts.iteritems(): |
|
2384 | 2384 | if v: |
|
2385 | 2385 | args[k] = v |
|
2386 | 2386 | # run twice to check that we don't mess up the stream for the next command |
|
2387 | 2387 | res1 = repo.debugwireargs(*vals, **args) |
|
2388 | 2388 | res2 = repo.debugwireargs(*vals, **args) |
|
2389 | 2389 | ui.write("%s\n" % res1) |
|
2390 | 2390 | if res1 != res2: |
|
2391 | 2391 | ui.warn("%s\n" % res2) |
|
2392 | 2392 | |
|
2393 | 2393 | @command('^diff', |
|
2394 | 2394 | [('r', 'rev', [], _('revision'), _('REV')), |
|
2395 | 2395 | ('c', 'change', '', _('change made by revision'), _('REV')) |
|
2396 | 2396 | ] + diffopts + diffopts2 + walkopts + subrepoopts, |
|
2397 | 2397 | _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...')) |
|
2398 | 2398 | def diff(ui, repo, *pats, **opts): |
|
2399 | 2399 | """diff repository (or selected files) |
|
2400 | 2400 | |
|
2401 | 2401 | Show differences between revisions for the specified files. |
|
2402 | 2402 | |
|
2403 | 2403 | Differences between files are shown using the unified diff format. |
|
2404 | 2404 | |
|
2405 | 2405 | .. note:: |
|
2406 | 2406 | diff may generate unexpected results for merges, as it will |
|
2407 | 2407 | default to comparing against the working directory's first |
|
2408 | 2408 | parent changeset if no revisions are specified. |
|
2409 | 2409 | |
|
2410 | 2410 | When two revision arguments are given, then changes are shown |
|
2411 | 2411 | between those revisions. If only one revision is specified then |
|
2412 | 2412 | that revision is compared to the working directory, and, when no |
|
2413 | 2413 | revisions are specified, the working directory files are compared |
|
2414 | 2414 | to its parent. |
|
2415 | 2415 | |
|
2416 | 2416 | Alternatively you can specify -c/--change with a revision to see |
|
2417 | 2417 | the changes in that changeset relative to its first parent. |
|
2418 | 2418 | |
|
2419 | 2419 | Without the -a/--text option, diff will avoid generating diffs of |
|
2420 | 2420 | files it detects as binary. With -a, diff will generate a diff |
|
2421 | 2421 | anyway, probably with undesirable results. |
|
2422 | 2422 | |
|
2423 | 2423 | Use the -g/--git option to generate diffs in the git extended diff |
|
2424 | 2424 | format. For more information, read :hg:`help diffs`. |
|
2425 | 2425 | |
|
2426 | 2426 | .. container:: verbose |
|
2427 | 2427 | |
|
2428 | 2428 | Examples: |
|
2429 | 2429 | |
|
2430 | 2430 | - compare a file in the current working directory to its parent:: |
|
2431 | 2431 | |
|
2432 | 2432 | hg diff foo.c |
|
2433 | 2433 | |
|
2434 | 2434 | - compare two historical versions of a directory, with rename info:: |
|
2435 | 2435 | |
|
2436 | 2436 | hg diff --git -r 1.0:1.2 lib/ |
|
2437 | 2437 | |
|
2438 | 2438 | - get change stats relative to the last change on some date:: |
|
2439 | 2439 | |
|
2440 | 2440 | hg diff --stat -r "date('may 2')" |
|
2441 | 2441 | |
|
2442 | 2442 | - diff all newly-added files that contain a keyword:: |
|
2443 | 2443 | |
|
2444 | 2444 | hg diff "set:added() and grep(GNU)" |
|
2445 | 2445 | |
|
2446 | 2446 | - compare a revision and its parents:: |
|
2447 | 2447 | |
|
2448 | 2448 | hg diff -c 9353 # compare against first parent |
|
2449 | 2449 | hg diff -r 9353^:9353 # same using revset syntax |
|
2450 | 2450 | hg diff -r 9353^2:9353 # compare against the second parent |
|
2451 | 2451 | |
|
2452 | 2452 | Returns 0 on success. |
|
2453 | 2453 | """ |
|
2454 | 2454 | |
|
2455 | 2455 | revs = opts.get('rev') |
|
2456 | 2456 | change = opts.get('change') |
|
2457 | 2457 | stat = opts.get('stat') |
|
2458 | 2458 | reverse = opts.get('reverse') |
|
2459 | 2459 | |
|
2460 | 2460 | if revs and change: |
|
2461 | 2461 | msg = _('cannot specify --rev and --change at the same time') |
|
2462 | 2462 | raise util.Abort(msg) |
|
2463 | 2463 | elif change: |
|
2464 | 2464 | node2 = scmutil.revsingle(repo, change, None).node() |
|
2465 | 2465 | node1 = repo[node2].p1().node() |
|
2466 | 2466 | else: |
|
2467 | 2467 | node1, node2 = scmutil.revpair(repo, revs) |
|
2468 | 2468 | |
|
2469 | 2469 | if reverse: |
|
2470 | 2470 | node1, node2 = node2, node1 |
|
2471 | 2471 | |
|
2472 | 2472 | diffopts = patch.diffopts(ui, opts) |
|
2473 | 2473 | m = scmutil.match(repo[node2], pats, opts) |
|
2474 | 2474 | cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat, |
|
2475 | 2475 | listsubrepos=opts.get('subrepos')) |
|
2476 | 2476 | |
|
2477 | 2477 | @command('^export', |
|
2478 | 2478 | [('o', 'output', '', |
|
2479 | 2479 | _('print output to file with formatted name'), _('FORMAT')), |
|
2480 | 2480 | ('', 'switch-parent', None, _('diff against the second parent')), |
|
2481 | 2481 | ('r', 'rev', [], _('revisions to export'), _('REV')), |
|
2482 | 2482 | ] + diffopts, |
|
2483 | 2483 | _('[OPTION]... [-o OUTFILESPEC] REV...')) |
|
2484 | 2484 | def export(ui, repo, *changesets, **opts): |
|
2485 | 2485 | """dump the header and diffs for one or more changesets |
|
2486 | 2486 | |
|
2487 | 2487 | Print the changeset header and diffs for one or more revisions. |
|
2488 | 2488 | |
|
2489 | 2489 | The information shown in the changeset header is: author, date, |
|
2490 | 2490 | branch name (if non-default), changeset hash, parent(s) and commit |
|
2491 | 2491 | comment. |
|
2492 | 2492 | |
|
2493 | 2493 | .. note:: |
|
2494 | 2494 | export may generate unexpected diff output for merge |
|
2495 | 2495 | changesets, as it will compare the merge changeset against its |
|
2496 | 2496 | first parent only. |
|
2497 | 2497 | |
|
2498 | 2498 | Output may be to a file, in which case the name of the file is |
|
2499 | 2499 | given using a format string. The formatting rules are as follows: |
|
2500 | 2500 | |
|
2501 | 2501 | :``%%``: literal "%" character |
|
2502 | 2502 | :``%H``: changeset hash (40 hexadecimal digits) |
|
2503 | 2503 | :``%N``: number of patches being generated |
|
2504 | 2504 | :``%R``: changeset revision number |
|
2505 | 2505 | :``%b``: basename of the exporting repository |
|
2506 | 2506 | :``%h``: short-form changeset hash (12 hexadecimal digits) |
|
2507 | 2507 | :``%m``: first line of the commit message (only alphanumeric characters) |
|
2508 | 2508 | :``%n``: zero-padded sequence number, starting at 1 |
|
2509 | 2509 | :``%r``: zero-padded changeset revision number |
|
2510 | 2510 | |
|
2511 | 2511 | Without the -a/--text option, export will avoid generating diffs |
|
2512 | 2512 | of files it detects as binary. With -a, export will generate a |
|
2513 | 2513 | diff anyway, probably with undesirable results. |
|
2514 | 2514 | |
|
2515 | 2515 | Use the -g/--git option to generate diffs in the git extended diff |
|
2516 | 2516 | format. See :hg:`help diffs` for more information. |
|
2517 | 2517 | |
|
2518 | 2518 | With the --switch-parent option, the diff will be against the |
|
2519 | 2519 | second parent. It can be useful to review a merge. |
|
2520 | 2520 | |
|
2521 | 2521 | .. container:: verbose |
|
2522 | 2522 | |
|
2523 | 2523 | Examples: |
|
2524 | 2524 | |
|
2525 | 2525 | - use export and import to transplant a bugfix to the current |
|
2526 | 2526 | branch:: |
|
2527 | 2527 | |
|
2528 | 2528 | hg export -r 9353 | hg import - |
|
2529 | 2529 | |
|
2530 | 2530 | - export all the changesets between two revisions to a file with |
|
2531 | 2531 | rename information:: |
|
2532 | 2532 | |
|
2533 | 2533 | hg export --git -r 123:150 > changes.txt |
|
2534 | 2534 | |
|
2535 | 2535 | - split outgoing changes into a series of patches with |
|
2536 | 2536 | descriptive names:: |
|
2537 | 2537 | |
|
2538 | 2538 | hg export -r "outgoing()" -o "%n-%m.patch" |
|
2539 | 2539 | |
|
2540 | 2540 | Returns 0 on success. |
|
2541 | 2541 | """ |
|
2542 | 2542 | changesets += tuple(opts.get('rev', [])) |
|
2543 | 2543 | revs = scmutil.revrange(repo, changesets) |
|
2544 | 2544 | if not revs: |
|
2545 | 2545 | raise util.Abort(_("export requires at least one changeset")) |
|
2546 | 2546 | if len(revs) > 1: |
|
2547 | 2547 | ui.note(_('exporting patches:\n')) |
|
2548 | 2548 | else: |
|
2549 | 2549 | ui.note(_('exporting patch:\n')) |
|
2550 | 2550 | cmdutil.export(repo, revs, template=opts.get('output'), |
|
2551 | 2551 | switch_parent=opts.get('switch_parent'), |
|
2552 | 2552 | opts=patch.diffopts(ui, opts)) |
|
2553 | 2553 | |
|
2554 | 2554 | @command('^forget', walkopts, _('[OPTION]... FILE...')) |
|
2555 | 2555 | def forget(ui, repo, *pats, **opts): |
|
2556 | 2556 | """forget the specified files on the next commit |
|
2557 | 2557 | |
|
2558 | 2558 | Mark the specified files so they will no longer be tracked |
|
2559 | 2559 | after the next commit. |
|
2560 | 2560 | |
|
2561 | 2561 | This only removes files from the current branch, not from the |
|
2562 | 2562 | entire project history, and it does not delete them from the |
|
2563 | 2563 | working directory. |
|
2564 | 2564 | |
|
2565 | 2565 | To undo a forget before the next commit, see :hg:`add`. |
|
2566 | 2566 | |
|
2567 | 2567 | .. container:: verbose |
|
2568 | 2568 | |
|
2569 | 2569 | Examples: |
|
2570 | 2570 | |
|
2571 | 2571 | - forget newly-added binary files:: |
|
2572 | 2572 | |
|
2573 | 2573 | hg forget "set:added() and binary()" |
|
2574 | 2574 | |
|
2575 | 2575 | - forget files that would be excluded by .hgignore:: |
|
2576 | 2576 | |
|
2577 | 2577 | hg forget "set:hgignore()" |
|
2578 | 2578 | |
|
2579 | 2579 | Returns 0 on success. |
|
2580 | 2580 | """ |
|
2581 | 2581 | |
|
2582 | 2582 | if not pats: |
|
2583 | 2583 | raise util.Abort(_('no files specified')) |
|
2584 | 2584 | |
|
2585 | 2585 | m = scmutil.match(repo[None], pats, opts) |
|
2586 | 2586 | rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0] |
|
2587 | 2587 | return rejected and 1 or 0 |
|
2588 | 2588 | |
|
2589 | 2589 | @command( |
|
2590 | 2590 | 'graft', |
|
2591 | 2591 | [('c', 'continue', False, _('resume interrupted graft')), |
|
2592 | 2592 | ('e', 'edit', False, _('invoke editor on commit messages')), |
|
2593 | 2593 | ('', 'log', None, _('append graft info to log message')), |
|
2594 | 2594 | ('D', 'currentdate', False, |
|
2595 | 2595 | _('record the current date as commit date')), |
|
2596 | 2596 | ('U', 'currentuser', False, |
|
2597 | 2597 | _('record the current user as committer'), _('DATE'))] |
|
2598 | 2598 | + commitopts2 + mergetoolopts + dryrunopts, |
|
2599 | 2599 | _('[OPTION]... REVISION...')) |
|
2600 | 2600 | def graft(ui, repo, *revs, **opts): |
|
2601 | 2601 | '''copy changes from other branches onto the current branch |
|
2602 | 2602 | |
|
2603 | 2603 | This command uses Mercurial's merge logic to copy individual |
|
2604 | 2604 | changes from other branches without merging branches in the |
|
2605 | 2605 | history graph. This is sometimes known as 'backporting' or |
|
2606 | 2606 | 'cherry-picking'. By default, graft will copy user, date, and |
|
2607 | 2607 | description from the source changesets. |
|
2608 | 2608 | |
|
2609 | 2609 | Changesets that are ancestors of the current revision, that have |
|
2610 | 2610 | already been grafted, or that are merges will be skipped. |
|
2611 | 2611 | |
|
2612 | 2612 | If --log is specified, log messages will have a comment appended |
|
2613 | 2613 | of the form:: |
|
2614 | 2614 | |
|
2615 | 2615 | (grafted from CHANGESETHASH) |
|
2616 | 2616 | |
|
2617 | 2617 | If a graft merge results in conflicts, the graft process is |
|
2618 | 2618 | interrupted so that the current merge can be manually resolved. |
|
2619 | 2619 | Once all conflicts are addressed, the graft process can be |
|
2620 | 2620 | continued with the -c/--continue option. |
|
2621 | 2621 | |
|
2622 | 2622 | .. note:: |
|
2623 | 2623 | The -c/--continue option does not reapply earlier options. |
|
2624 | 2624 | |
|
2625 | 2625 | .. container:: verbose |
|
2626 | 2626 | |
|
2627 | 2627 | Examples: |
|
2628 | 2628 | |
|
2629 | 2629 | - copy a single change to the stable branch and edit its description:: |
|
2630 | 2630 | |
|
2631 | 2631 | hg update stable |
|
2632 | 2632 | hg graft --edit 9393 |
|
2633 | 2633 | |
|
2634 | 2634 | - graft a range of changesets with one exception, updating dates:: |
|
2635 | 2635 | |
|
2636 | 2636 | hg graft -D "2085::2093 and not 2091" |
|
2637 | 2637 | |
|
2638 | 2638 | - continue a graft after resolving conflicts:: |
|
2639 | 2639 | |
|
2640 | 2640 | hg graft -c |
|
2641 | 2641 | |
|
2642 | 2642 | - show the source of a grafted changeset:: |
|
2643 | 2643 | |
|
2644 | 2644 | hg log --debug -r tip |
|
2645 | 2645 | |
|
2646 | 2646 | Returns 0 on successful completion. |
|
2647 | 2647 | ''' |
|
2648 | 2648 | |
|
2649 | 2649 | if not opts.get('user') and opts.get('currentuser'): |
|
2650 | 2650 | opts['user'] = ui.username() |
|
2651 | 2651 | if not opts.get('date') and opts.get('currentdate'): |
|
2652 | 2652 | opts['date'] = "%d %d" % util.makedate() |
|
2653 | 2653 | |
|
2654 | 2654 | editor = None |
|
2655 | 2655 | if opts.get('edit'): |
|
2656 | 2656 | editor = cmdutil.commitforceeditor |
|
2657 | 2657 | |
|
2658 | 2658 | cont = False |
|
2659 | 2659 | if opts['continue']: |
|
2660 | 2660 | cont = True |
|
2661 | 2661 | if revs: |
|
2662 | 2662 | raise util.Abort(_("can't specify --continue and revisions")) |
|
2663 | 2663 | # read in unfinished revisions |
|
2664 | 2664 | try: |
|
2665 | 2665 | nodes = repo.opener.read('graftstate').splitlines() |
|
2666 | 2666 | revs = [repo[node].rev() for node in nodes] |
|
2667 | 2667 | except IOError, inst: |
|
2668 | 2668 | if inst.errno != errno.ENOENT: |
|
2669 | 2669 | raise |
|
2670 | 2670 | raise util.Abort(_("no graft state found, can't continue")) |
|
2671 | 2671 | else: |
|
2672 | 2672 | cmdutil.bailifchanged(repo) |
|
2673 | 2673 | if not revs: |
|
2674 | 2674 | raise util.Abort(_('no revisions specified')) |
|
2675 | 2675 | revs = scmutil.revrange(repo, revs) |
|
2676 | 2676 | |
|
2677 | 2677 | # check for merges |
|
2678 | 2678 | for rev in repo.revs('%ld and merge()', revs): |
|
2679 | 2679 | ui.warn(_('skipping ungraftable merge revision %s\n') % rev) |
|
2680 | 2680 | revs.remove(rev) |
|
2681 | 2681 | if not revs: |
|
2682 | 2682 | return -1 |
|
2683 | 2683 | |
|
2684 | 2684 | # check for ancestors of dest branch |
|
2685 | 2685 | for rev in repo.revs('::. and %ld', revs): |
|
2686 | 2686 | ui.warn(_('skipping ancestor revision %s\n') % rev) |
|
2687 | 2687 | revs.remove(rev) |
|
2688 | 2688 | if not revs: |
|
2689 | 2689 | return -1 |
|
2690 | 2690 | |
|
2691 | 2691 | # analyze revs for earlier grafts |
|
2692 | 2692 | ids = {} |
|
2693 | 2693 | for ctx in repo.set("%ld", revs): |
|
2694 | 2694 | ids[ctx.hex()] = ctx.rev() |
|
2695 | 2695 | n = ctx.extra().get('source') |
|
2696 | 2696 | if n: |
|
2697 | 2697 | ids[n] = ctx.rev() |
|
2698 | 2698 | |
|
2699 | 2699 | # check ancestors for earlier grafts |
|
2700 | 2700 | ui.debug('scanning for duplicate grafts\n') |
|
2701 | 2701 | for ctx in repo.set("::. - ::%ld", revs): |
|
2702 | 2702 | n = ctx.extra().get('source') |
|
2703 | 2703 | if n in ids: |
|
2704 | 2704 | r = repo[n].rev() |
|
2705 | 2705 | if r in revs: |
|
2706 | 2706 | ui.warn(_('skipping already grafted revision %s\n') % r) |
|
2707 | 2707 | revs.remove(r) |
|
2708 | 2708 | elif ids[n] in revs: |
|
2709 | 2709 | ui.warn(_('skipping already grafted revision %s ' |
|
2710 | 2710 | '(same origin %d)\n') % (ids[n], r)) |
|
2711 | 2711 | revs.remove(ids[n]) |
|
2712 | 2712 | elif ctx.hex() in ids: |
|
2713 | 2713 | r = ids[ctx.hex()] |
|
2714 | 2714 | ui.warn(_('skipping already grafted revision %s ' |
|
2715 | 2715 | '(was grafted from %d)\n') % (r, ctx.rev())) |
|
2716 | 2716 | revs.remove(r) |
|
2717 | 2717 | if not revs: |
|
2718 | 2718 | return -1 |
|
2719 | 2719 | |
|
2720 | 2720 | wlock = repo.wlock() |
|
2721 | 2721 | try: |
|
2722 | 2722 | for pos, ctx in enumerate(repo.set("%ld", revs)): |
|
2723 | 2723 | current = repo['.'] |
|
2724 | 2724 | |
|
2725 | 2725 | ui.status(_('grafting revision %s\n') % ctx.rev()) |
|
2726 | 2726 | if opts.get('dry_run'): |
|
2727 | 2727 | continue |
|
2728 | 2728 | |
|
2729 | 2729 | # we don't merge the first commit when continuing |
|
2730 | 2730 | if not cont: |
|
2731 | 2731 | # perform the graft merge with p1(rev) as 'ancestor' |
|
2732 | 2732 | try: |
|
2733 | 2733 | # ui.forcemerge is an internal variable, do not document |
|
2734 | 2734 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |
|
2735 | 2735 | stats = mergemod.update(repo, ctx.node(), True, True, False, |
|
2736 | 2736 | ctx.p1().node()) |
|
2737 | 2737 | finally: |
|
2738 | 2738 | ui.setconfig('ui', 'forcemerge', '') |
|
2739 | 2739 | # drop the second merge parent |
|
2740 | 2740 | repo.setparents(current.node(), nullid) |
|
2741 | 2741 | repo.dirstate.write() |
|
2742 | 2742 | # fix up dirstate for copies and renames |
|
2743 | 2743 | cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev()) |
|
2744 | 2744 | # report any conflicts |
|
2745 | 2745 | if stats and stats[3] > 0: |
|
2746 | 2746 | # write out state for --continue |
|
2747 | 2747 | nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] |
|
2748 | 2748 | repo.opener.write('graftstate', ''.join(nodelines)) |
|
2749 | 2749 | raise util.Abort( |
|
2750 | 2750 | _("unresolved conflicts, can't continue"), |
|
2751 | 2751 | hint=_('use hg resolve and hg graft --continue')) |
|
2752 | 2752 | else: |
|
2753 | 2753 | cont = False |
|
2754 | 2754 | |
|
2755 | 2755 | # commit |
|
2756 | 2756 | source = ctx.extra().get('source') |
|
2757 | 2757 | if not source: |
|
2758 | 2758 | source = ctx.hex() |
|
2759 | 2759 | extra = {'source': source} |
|
2760 | 2760 | user = ctx.user() |
|
2761 | 2761 | if opts.get('user'): |
|
2762 | 2762 | user = opts['user'] |
|
2763 | 2763 | date = ctx.date() |
|
2764 | 2764 | if opts.get('date'): |
|
2765 | 2765 | date = opts['date'] |
|
2766 | 2766 | message = ctx.description() |
|
2767 | 2767 | if opts.get('log'): |
|
2768 | 2768 | message += '\n(grafted from %s)' % ctx.hex() |
|
2769 | 2769 | node = repo.commit(text=message, user=user, |
|
2770 | 2770 | date=date, extra=extra, editor=editor) |
|
2771 | 2771 | if node is None: |
|
2772 | 2772 | ui.status(_('graft for revision %s is empty\n') % ctx.rev()) |
|
2773 | 2773 | finally: |
|
2774 | 2774 | wlock.release() |
|
2775 | 2775 | |
|
2776 | 2776 | # remove state when we complete successfully |
|
2777 | 2777 | if not opts.get('dry_run') and os.path.exists(repo.join('graftstate')): |
|
2778 | 2778 | util.unlinkpath(repo.join('graftstate')) |
|
2779 | 2779 | |
|
2780 | 2780 | return 0 |
|
2781 | 2781 | |
|
2782 | 2782 | @command('grep', |
|
2783 | 2783 | [('0', 'print0', None, _('end fields with NUL')), |
|
2784 | 2784 | ('', 'all', None, _('print all revisions that match')), |
|
2785 | 2785 | ('a', 'text', None, _('treat all files as text')), |
|
2786 | 2786 | ('f', 'follow', None, |
|
2787 | 2787 | _('follow changeset history,' |
|
2788 | 2788 | ' or file history across copies and renames')), |
|
2789 | 2789 | ('i', 'ignore-case', None, _('ignore case when matching')), |
|
2790 | 2790 | ('l', 'files-with-matches', None, |
|
2791 | 2791 | _('print only filenames and revisions that match')), |
|
2792 | 2792 | ('n', 'line-number', None, _('print matching line numbers')), |
|
2793 | 2793 | ('r', 'rev', [], |
|
2794 | 2794 | _('only search files changed within revision range'), _('REV')), |
|
2795 | 2795 | ('u', 'user', None, _('list the author (long with -v)')), |
|
2796 | 2796 | ('d', 'date', None, _('list the date (short with -q)')), |
|
2797 | 2797 | ] + walkopts, |
|
2798 | 2798 | _('[OPTION]... PATTERN [FILE]...')) |
|
2799 | 2799 | def grep(ui, repo, pattern, *pats, **opts): |
|
2800 | 2800 | """search for a pattern in specified files and revisions |
|
2801 | 2801 | |
|
2802 | 2802 | Search revisions of files for a regular expression. |
|
2803 | 2803 | |
|
2804 | 2804 | This command behaves differently than Unix grep. It only accepts |
|
2805 | 2805 | Python/Perl regexps. It searches repository history, not the |
|
2806 | 2806 | working directory. It always prints the revision number in which a |
|
2807 | 2807 | match appears. |
|
2808 | 2808 | |
|
2809 | 2809 | By default, grep only prints output for the first revision of a |
|
2810 | 2810 | file in which it finds a match. To get it to print every revision |
|
2811 | 2811 | that contains a change in match status ("-" for a match that |
|
2812 | 2812 | becomes a non-match, or "+" for a non-match that becomes a match), |
|
2813 | 2813 | use the --all flag. |
|
2814 | 2814 | |
|
2815 | 2815 | Returns 0 if a match is found, 1 otherwise. |
|
2816 | 2816 | """ |
|
2817 | 2817 | reflags = re.M |
|
2818 | 2818 | if opts.get('ignore_case'): |
|
2819 | 2819 | reflags |= re.I |
|
2820 | 2820 | try: |
|
2821 | 2821 | regexp = re.compile(pattern, reflags) |
|
2822 | 2822 | except re.error, inst: |
|
2823 | 2823 | ui.warn(_("grep: invalid match pattern: %s\n") % inst) |
|
2824 | 2824 | return 1 |
|
2825 | 2825 | sep, eol = ':', '\n' |
|
2826 | 2826 | if opts.get('print0'): |
|
2827 | 2827 | sep = eol = '\0' |
|
2828 | 2828 | |
|
2829 | 2829 | getfile = util.lrucachefunc(repo.file) |
|
2830 | 2830 | |
|
2831 | 2831 | def matchlines(body): |
|
2832 | 2832 | begin = 0 |
|
2833 | 2833 | linenum = 0 |
|
2834 | 2834 | while True: |
|
2835 | 2835 | match = regexp.search(body, begin) |
|
2836 | 2836 | if not match: |
|
2837 | 2837 | break |
|
2838 | 2838 | mstart, mend = match.span() |
|
2839 | 2839 | linenum += body.count('\n', begin, mstart) + 1 |
|
2840 | 2840 | lstart = body.rfind('\n', begin, mstart) + 1 or begin |
|
2841 | 2841 | begin = body.find('\n', mend) + 1 or len(body) + 1 |
|
2842 | 2842 | lend = begin - 1 |
|
2843 | 2843 | yield linenum, mstart - lstart, mend - lstart, body[lstart:lend] |
|
2844 | 2844 | |
|
2845 | 2845 | class linestate(object): |
|
2846 | 2846 | def __init__(self, line, linenum, colstart, colend): |
|
2847 | 2847 | self.line = line |
|
2848 | 2848 | self.linenum = linenum |
|
2849 | 2849 | self.colstart = colstart |
|
2850 | 2850 | self.colend = colend |
|
2851 | 2851 | |
|
2852 | 2852 | def __hash__(self): |
|
2853 | 2853 | return hash((self.linenum, self.line)) |
|
2854 | 2854 | |
|
2855 | 2855 | def __eq__(self, other): |
|
2856 | 2856 | return self.line == other.line |
|
2857 | 2857 | |
|
2858 | 2858 | matches = {} |
|
2859 | 2859 | copies = {} |
|
2860 | 2860 | def grepbody(fn, rev, body): |
|
2861 | 2861 | matches[rev].setdefault(fn, []) |
|
2862 | 2862 | m = matches[rev][fn] |
|
2863 | 2863 | for lnum, cstart, cend, line in matchlines(body): |
|
2864 | 2864 | s = linestate(line, lnum, cstart, cend) |
|
2865 | 2865 | m.append(s) |
|
2866 | 2866 | |
|
2867 | 2867 | def difflinestates(a, b): |
|
2868 | 2868 | sm = difflib.SequenceMatcher(None, a, b) |
|
2869 | 2869 | for tag, alo, ahi, blo, bhi in sm.get_opcodes(): |
|
2870 | 2870 | if tag == 'insert': |
|
2871 | 2871 | for i in xrange(blo, bhi): |
|
2872 | 2872 | yield ('+', b[i]) |
|
2873 | 2873 | elif tag == 'delete': |
|
2874 | 2874 | for i in xrange(alo, ahi): |
|
2875 | 2875 | yield ('-', a[i]) |
|
2876 | 2876 | elif tag == 'replace': |
|
2877 | 2877 | for i in xrange(alo, ahi): |
|
2878 | 2878 | yield ('-', a[i]) |
|
2879 | 2879 | for i in xrange(blo, bhi): |
|
2880 | 2880 | yield ('+', b[i]) |
|
2881 | 2881 | |
|
2882 | 2882 | def display(fn, ctx, pstates, states): |
|
2883 | 2883 | rev = ctx.rev() |
|
2884 | 2884 | datefunc = ui.quiet and util.shortdate or util.datestr |
|
2885 | 2885 | found = False |
|
2886 | 2886 | filerevmatches = {} |
|
2887 | 2887 | def binary(): |
|
2888 | 2888 | flog = getfile(fn) |
|
2889 | 2889 | return util.binary(flog.read(ctx.filenode(fn))) |
|
2890 | 2890 | |
|
2891 | 2891 | if opts.get('all'): |
|
2892 | 2892 | iter = difflinestates(pstates, states) |
|
2893 | 2893 | else: |
|
2894 | 2894 | iter = [('', l) for l in states] |
|
2895 | 2895 | for change, l in iter: |
|
2896 | 2896 | cols = [fn, str(rev)] |
|
2897 | 2897 | before, match, after = None, None, None |
|
2898 | 2898 | if opts.get('line_number'): |
|
2899 | 2899 | cols.append(str(l.linenum)) |
|
2900 | 2900 | if opts.get('all'): |
|
2901 | 2901 | cols.append(change) |
|
2902 | 2902 | if opts.get('user'): |
|
2903 | 2903 | cols.append(ui.shortuser(ctx.user())) |
|
2904 | 2904 | if opts.get('date'): |
|
2905 | 2905 | cols.append(datefunc(ctx.date())) |
|
2906 | 2906 | if opts.get('files_with_matches'): |
|
2907 | 2907 | c = (fn, rev) |
|
2908 | 2908 | if c in filerevmatches: |
|
2909 | 2909 | continue |
|
2910 | 2910 | filerevmatches[c] = 1 |
|
2911 | 2911 | else: |
|
2912 | 2912 | before = l.line[:l.colstart] |
|
2913 | 2913 | match = l.line[l.colstart:l.colend] |
|
2914 | 2914 | after = l.line[l.colend:] |
|
2915 | 2915 | ui.write(sep.join(cols)) |
|
2916 | 2916 | if before is not None: |
|
2917 | 2917 | if not opts.get('text') and binary(): |
|
2918 | 2918 | ui.write(sep + " Binary file matches") |
|
2919 | 2919 | else: |
|
2920 | 2920 | ui.write(sep + before) |
|
2921 | 2921 | ui.write(match, label='grep.match') |
|
2922 | 2922 | ui.write(after) |
|
2923 | 2923 | ui.write(eol) |
|
2924 | 2924 | found = True |
|
2925 | 2925 | return found |
|
2926 | 2926 | |
|
2927 | 2927 | skip = {} |
|
2928 | 2928 | revfiles = {} |
|
2929 | 2929 | matchfn = scmutil.match(repo[None], pats, opts) |
|
2930 | 2930 | found = False |
|
2931 | 2931 | follow = opts.get('follow') |
|
2932 | 2932 | |
|
2933 | 2933 | def prep(ctx, fns): |
|
2934 | 2934 | rev = ctx.rev() |
|
2935 | 2935 | pctx = ctx.p1() |
|
2936 | 2936 | parent = pctx.rev() |
|
2937 | 2937 | matches.setdefault(rev, {}) |
|
2938 | 2938 | matches.setdefault(parent, {}) |
|
2939 | 2939 | files = revfiles.setdefault(rev, []) |
|
2940 | 2940 | for fn in fns: |
|
2941 | 2941 | flog = getfile(fn) |
|
2942 | 2942 | try: |
|
2943 | 2943 | fnode = ctx.filenode(fn) |
|
2944 | 2944 | except error.LookupError: |
|
2945 | 2945 | continue |
|
2946 | 2946 | |
|
2947 | 2947 | copied = flog.renamed(fnode) |
|
2948 | 2948 | copy = follow and copied and copied[0] |
|
2949 | 2949 | if copy: |
|
2950 | 2950 | copies.setdefault(rev, {})[fn] = copy |
|
2951 | 2951 | if fn in skip: |
|
2952 | 2952 | if copy: |
|
2953 | 2953 | skip[copy] = True |
|
2954 | 2954 | continue |
|
2955 | 2955 | files.append(fn) |
|
2956 | 2956 | |
|
2957 | 2957 | if fn not in matches[rev]: |
|
2958 | 2958 | grepbody(fn, rev, flog.read(fnode)) |
|
2959 | 2959 | |
|
2960 | 2960 | pfn = copy or fn |
|
2961 | 2961 | if pfn not in matches[parent]: |
|
2962 | 2962 | try: |
|
2963 | 2963 | fnode = pctx.filenode(pfn) |
|
2964 | 2964 | grepbody(pfn, parent, flog.read(fnode)) |
|
2965 | 2965 | except error.LookupError: |
|
2966 | 2966 | pass |
|
2967 | 2967 | |
|
2968 | 2968 | for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep): |
|
2969 | 2969 | rev = ctx.rev() |
|
2970 | 2970 | parent = ctx.p1().rev() |
|
2971 | 2971 | for fn in sorted(revfiles.get(rev, [])): |
|
2972 | 2972 | states = matches[rev][fn] |
|
2973 | 2973 | copy = copies.get(rev, {}).get(fn) |
|
2974 | 2974 | if fn in skip: |
|
2975 | 2975 | if copy: |
|
2976 | 2976 | skip[copy] = True |
|
2977 | 2977 | continue |
|
2978 | 2978 | pstates = matches.get(parent, {}).get(copy or fn, []) |
|
2979 | 2979 | if pstates or states: |
|
2980 | 2980 | r = display(fn, ctx, pstates, states) |
|
2981 | 2981 | found = found or r |
|
2982 | 2982 | if r and not opts.get('all'): |
|
2983 | 2983 | skip[fn] = True |
|
2984 | 2984 | if copy: |
|
2985 | 2985 | skip[copy] = True |
|
2986 | 2986 | del matches[rev] |
|
2987 | 2987 | del revfiles[rev] |
|
2988 | 2988 | |
|
2989 | 2989 | return not found |
|
2990 | 2990 | |
|
2991 | 2991 | @command('heads', |
|
2992 | 2992 | [('r', 'rev', '', |
|
2993 | 2993 | _('show only heads which are descendants of STARTREV'), _('STARTREV')), |
|
2994 | 2994 | ('t', 'topo', False, _('show topological heads only')), |
|
2995 | 2995 | ('a', 'active', False, _('show active branchheads only (DEPRECATED)')), |
|
2996 | 2996 | ('c', 'closed', False, _('show normal and closed branch heads')), |
|
2997 | 2997 | ] + templateopts, |
|
2998 | 2998 | _('[-ac] [-r STARTREV] [REV]...')) |
|
2999 | 2999 | def heads(ui, repo, *branchrevs, **opts): |
|
3000 | 3000 | """show current repository heads or show branch heads |
|
3001 | 3001 | |
|
3002 | 3002 | With no arguments, show all repository branch heads. |
|
3003 | 3003 | |
|
3004 | 3004 | Repository "heads" are changesets with no child changesets. They are |
|
3005 | 3005 | where development generally takes place and are the usual targets |
|
3006 | 3006 | for update and merge operations. Branch heads are changesets that have |
|
3007 | 3007 | no child changeset on the same branch. |
|
3008 | 3008 | |
|
3009 | 3009 | If one or more REVs are given, only branch heads on the branches |
|
3010 | 3010 | associated with the specified changesets are shown. This means |
|
3011 | 3011 | that you can use :hg:`heads foo` to see the heads on a branch |
|
3012 | 3012 | named ``foo``. |
|
3013 | 3013 | |
|
3014 | 3014 | If -c/--closed is specified, also show branch heads marked closed |
|
3015 | 3015 | (see :hg:`commit --close-branch`). |
|
3016 | 3016 | |
|
3017 | 3017 | If STARTREV is specified, only those heads that are descendants of |
|
3018 | 3018 | STARTREV will be displayed. |
|
3019 | 3019 | |
|
3020 | 3020 | If -t/--topo is specified, named branch mechanics will be ignored and only |
|
3021 | 3021 | changesets without children will be shown. |
|
3022 | 3022 | |
|
3023 | 3023 | Returns 0 if matching heads are found, 1 if not. |
|
3024 | 3024 | """ |
|
3025 | 3025 | |
|
3026 | 3026 | start = None |
|
3027 | 3027 | if 'rev' in opts: |
|
3028 | 3028 | start = scmutil.revsingle(repo, opts['rev'], None).node() |
|
3029 | 3029 | |
|
3030 | 3030 | if opts.get('topo'): |
|
3031 | 3031 | heads = [repo[h] for h in repo.heads(start)] |
|
3032 | 3032 | else: |
|
3033 | 3033 | heads = [] |
|
3034 | 3034 | for branch in repo.branchmap(): |
|
3035 | 3035 | heads += repo.branchheads(branch, start, opts.get('closed')) |
|
3036 | 3036 | heads = [repo[h] for h in heads] |
|
3037 | 3037 | |
|
3038 | 3038 | if branchrevs: |
|
3039 | 3039 | branches = set(repo[br].branch() for br in branchrevs) |
|
3040 | 3040 | heads = [h for h in heads if h.branch() in branches] |
|
3041 | 3041 | |
|
3042 | 3042 | if opts.get('active') and branchrevs: |
|
3043 | 3043 | dagheads = repo.heads(start) |
|
3044 | 3044 | heads = [h for h in heads if h.node() in dagheads] |
|
3045 | 3045 | |
|
3046 | 3046 | if branchrevs: |
|
3047 | 3047 | haveheads = set(h.branch() for h in heads) |
|
3048 | 3048 | if branches - haveheads: |
|
3049 | 3049 | headless = ', '.join(b for b in branches - haveheads) |
|
3050 | 3050 | msg = _('no open branch heads found on branches %s') |
|
3051 | 3051 | if opts.get('rev'): |
|
3052 | 3052 | msg += _(' (started at %s)') % opts['rev'] |
|
3053 | 3053 | ui.warn((msg + '\n') % headless) |
|
3054 | 3054 | |
|
3055 | 3055 | if not heads: |
|
3056 | 3056 | return 1 |
|
3057 | 3057 | |
|
3058 | 3058 | heads = sorted(heads, key=lambda x: -x.rev()) |
|
3059 | 3059 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
3060 | 3060 | for ctx in heads: |
|
3061 | 3061 | displayer.show(ctx) |
|
3062 | 3062 | displayer.close() |
|
3063 | 3063 | |
|
3064 | 3064 | @command('help', |
|
3065 | 3065 | [('e', 'extension', None, _('show only help for extensions')), |
|
3066 | 3066 | ('c', 'command', None, _('show only help for commands'))], |
|
3067 | 3067 | _('[-ec] [TOPIC]')) |
|
3068 | 3068 | def help_(ui, name=None, unknowncmd=False, full=True, **opts): |
|
3069 | 3069 | """show help for a given topic or a help overview |
|
3070 | 3070 | |
|
3071 | 3071 | With no arguments, print a list of commands with short help messages. |
|
3072 | 3072 | |
|
3073 | 3073 | Given a topic, extension, or command name, print help for that |
|
3074 | 3074 | topic. |
|
3075 | 3075 | |
|
3076 | 3076 | Returns 0 if successful. |
|
3077 | 3077 | """ |
|
3078 | 3078 | |
|
3079 | 3079 | textwidth = min(ui.termwidth(), 80) - 2 |
|
3080 | 3080 | |
|
3081 | 3081 | def optrst(options): |
|
3082 | 3082 | data = [] |
|
3083 | 3083 | multioccur = False |
|
3084 | 3084 | for option in options: |
|
3085 | 3085 | if len(option) == 5: |
|
3086 | 3086 | shortopt, longopt, default, desc, optlabel = option |
|
3087 | 3087 | else: |
|
3088 | 3088 | shortopt, longopt, default, desc = option |
|
3089 | 3089 | optlabel = _("VALUE") # default label |
|
3090 | 3090 | |
|
3091 | 3091 | if _("DEPRECATED") in desc and not ui.verbose: |
|
3092 | 3092 | continue |
|
3093 | 3093 | |
|
3094 | 3094 | so = '' |
|
3095 | 3095 | if shortopt: |
|
3096 | 3096 | so = '-' + shortopt |
|
3097 | 3097 | lo = '--' + longopt |
|
3098 | 3098 | if default: |
|
3099 | 3099 | desc += _(" (default: %s)") % default |
|
3100 | 3100 | |
|
3101 | 3101 | if isinstance(default, list): |
|
3102 | 3102 | lo += " %s [+]" % optlabel |
|
3103 | 3103 | multioccur = True |
|
3104 | 3104 | elif (default is not None) and not isinstance(default, bool): |
|
3105 | 3105 | lo += " %s" % optlabel |
|
3106 | 3106 | |
|
3107 | 3107 | data.append((so, lo, desc)) |
|
3108 | 3108 | |
|
3109 | 3109 | rst = minirst.maketable(data, 1) |
|
3110 | 3110 | |
|
3111 | 3111 | if multioccur: |
|
3112 | 3112 | rst += _("\n[+] marked option can be specified multiple times\n") |
|
3113 | 3113 | |
|
3114 | 3114 | return rst |
|
3115 | 3115 | |
|
3116 | 3116 | # list all option lists |
|
3117 | 3117 | def opttext(optlist, width): |
|
3118 | 3118 | rst = '' |
|
3119 | 3119 | if not optlist: |
|
3120 | 3120 | return '' |
|
3121 | 3121 | |
|
3122 | 3122 | for title, options in optlist: |
|
3123 | 3123 | rst += '\n%s\n' % title |
|
3124 | 3124 | if options: |
|
3125 | 3125 | rst += "\n" |
|
3126 | 3126 | rst += optrst(options) |
|
3127 | 3127 | rst += '\n' |
|
3128 | 3128 | |
|
3129 | 3129 | return '\n' + minirst.format(rst, width) |
|
3130 | 3130 | |
|
3131 | 3131 | def addglobalopts(optlist, aliases): |
|
3132 | 3132 | if ui.quiet: |
|
3133 | 3133 | return [] |
|
3134 | 3134 | |
|
3135 | 3135 | if ui.verbose: |
|
3136 | 3136 | optlist.append((_("global options:"), globalopts)) |
|
3137 | 3137 | if name == 'shortlist': |
|
3138 | 3138 | optlist.append((_('use "hg help" for the full list ' |
|
3139 | 3139 | 'of commands'), ())) |
|
3140 | 3140 | else: |
|
3141 | 3141 | if name == 'shortlist': |
|
3142 | 3142 | msg = _('use "hg help" for the full list of commands ' |
|
3143 | 3143 | 'or "hg -v" for details') |
|
3144 | 3144 | elif name and not full: |
|
3145 | 3145 | msg = _('use "hg help %s" to show the full help text') % name |
|
3146 | 3146 | elif aliases: |
|
3147 | 3147 | msg = _('use "hg -v help%s" to show builtin aliases and ' |
|
3148 | 3148 | 'global options') % (name and " " + name or "") |
|
3149 | 3149 | else: |
|
3150 | 3150 | msg = _('use "hg -v help %s" to show more info') % name |
|
3151 | 3151 | optlist.append((msg, ())) |
|
3152 | 3152 | |
|
3153 | 3153 | def helpcmd(name): |
|
3154 | 3154 | try: |
|
3155 | 3155 | aliases, entry = cmdutil.findcmd(name, table, strict=unknowncmd) |
|
3156 | 3156 | except error.AmbiguousCommand, inst: |
|
3157 | 3157 | # py3k fix: except vars can't be used outside the scope of the |
|
3158 | 3158 | # except block, nor can be used inside a lambda. python issue4617 |
|
3159 | 3159 | prefix = inst.args[0] |
|
3160 | 3160 | select = lambda c: c.lstrip('^').startswith(prefix) |
|
3161 | 3161 | helplist(select) |
|
3162 | 3162 | return |
|
3163 | 3163 | |
|
3164 | 3164 | # check if it's an invalid alias and display its error if it is |
|
3165 | 3165 | if getattr(entry[0], 'badalias', False): |
|
3166 | 3166 | if not unknowncmd: |
|
3167 | 3167 | entry[0](ui) |
|
3168 | 3168 | return |
|
3169 | 3169 | |
|
3170 | 3170 | rst = "" |
|
3171 | 3171 | |
|
3172 | 3172 | # synopsis |
|
3173 | 3173 | if len(entry) > 2: |
|
3174 | 3174 | if entry[2].startswith('hg'): |
|
3175 | 3175 | rst += "%s\n" % entry[2] |
|
3176 | 3176 | else: |
|
3177 | 3177 | rst += 'hg %s %s\n' % (aliases[0], entry[2]) |
|
3178 | 3178 | else: |
|
3179 | 3179 | rst += 'hg %s\n' % aliases[0] |
|
3180 | 3180 | |
|
3181 | 3181 | # aliases |
|
3182 | 3182 | if full and not ui.quiet and len(aliases) > 1: |
|
3183 | 3183 | rst += _("\naliases: %s\n") % ', '.join(aliases[1:]) |
|
3184 | 3184 | |
|
3185 | 3185 | # description |
|
3186 | 3186 | doc = gettext(entry[0].__doc__) |
|
3187 | 3187 | if not doc: |
|
3188 | 3188 | doc = _("(no help text available)") |
|
3189 | 3189 | if util.safehasattr(entry[0], 'definition'): # aliased command |
|
3190 | 3190 | if entry[0].definition.startswith('!'): # shell alias |
|
3191 | 3191 | doc = _('shell alias for::\n\n %s') % entry[0].definition[1:] |
|
3192 | 3192 | else: |
|
3193 | 3193 | doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc) |
|
3194 | 3194 | if ui.quiet or not full: |
|
3195 | 3195 | doc = doc.splitlines()[0] |
|
3196 | 3196 | rst += "\n" + doc + "\n" |
|
3197 | 3197 | |
|
3198 | 3198 | # check if this command shadows a non-trivial (multi-line) |
|
3199 | 3199 | # extension help text |
|
3200 | 3200 | try: |
|
3201 | 3201 | mod = extensions.find(name) |
|
3202 | 3202 | doc = gettext(mod.__doc__) or '' |
|
3203 | 3203 | if '\n' in doc.strip(): |
|
3204 | 3204 | msg = _('use "hg help -e %s" to show help for ' |
|
3205 | 3205 | 'the %s extension') % (name, name) |
|
3206 | 3206 | rst += '\n%s\n' % msg |
|
3207 | 3207 | except KeyError: |
|
3208 | 3208 | pass |
|
3209 | 3209 | |
|
3210 | 3210 | # options |
|
3211 | 3211 | if not ui.quiet and entry[1]: |
|
3212 | 3212 | rst += '\n' |
|
3213 | 3213 | rst += _("options:") |
|
3214 | 3214 | rst += '\n\n' |
|
3215 | 3215 | rst += optrst(entry[1]) |
|
3216 | 3216 | |
|
3217 | 3217 | if ui.verbose: |
|
3218 | 3218 | rst += '\n' |
|
3219 | 3219 | rst += _("global options:") |
|
3220 | 3220 | rst += '\n\n' |
|
3221 | 3221 | rst += optrst(globalopts) |
|
3222 | 3222 | |
|
3223 | 3223 | keep = ui.verbose and ['verbose'] or [] |
|
3224 | 3224 | formatted, pruned = minirst.format(rst, textwidth, keep=keep) |
|
3225 | 3225 | ui.write(formatted) |
|
3226 | 3226 | |
|
3227 | 3227 | if not ui.verbose: |
|
3228 | 3228 | if not full: |
|
3229 | 3229 | ui.write(_('\nuse "hg help %s" to show the full help text\n') |
|
3230 | 3230 | % name) |
|
3231 | 3231 | elif not ui.quiet: |
|
3232 | 3232 | ui.write(_('\nuse "hg -v help %s" to show more info\n') % name) |
|
3233 | 3233 | |
|
3234 | 3234 | |
|
3235 | 3235 | def helplist(select=None): |
|
3236 | 3236 | # list of commands |
|
3237 | 3237 | if name == "shortlist": |
|
3238 | 3238 | header = _('basic commands:\n\n') |
|
3239 | 3239 | else: |
|
3240 | 3240 | header = _('list of commands:\n\n') |
|
3241 | 3241 | |
|
3242 | 3242 | h = {} |
|
3243 | 3243 | cmds = {} |
|
3244 | 3244 | for c, e in table.iteritems(): |
|
3245 | 3245 | f = c.split("|", 1)[0] |
|
3246 | 3246 | if select and not select(f): |
|
3247 | 3247 | continue |
|
3248 | 3248 | if (not select and name != 'shortlist' and |
|
3249 | 3249 | e[0].__module__ != __name__): |
|
3250 | 3250 | continue |
|
3251 | 3251 | if name == "shortlist" and not f.startswith("^"): |
|
3252 | 3252 | continue |
|
3253 | 3253 | f = f.lstrip("^") |
|
3254 | 3254 | if not ui.debugflag and f.startswith("debug"): |
|
3255 | 3255 | continue |
|
3256 | 3256 | doc = e[0].__doc__ |
|
3257 | 3257 | if doc and 'DEPRECATED' in doc and not ui.verbose: |
|
3258 | 3258 | continue |
|
3259 | 3259 | doc = gettext(doc) |
|
3260 | 3260 | if not doc: |
|
3261 | 3261 | doc = _("(no help text available)") |
|
3262 | 3262 | h[f] = doc.splitlines()[0].rstrip() |
|
3263 | 3263 | cmds[f] = c.lstrip("^") |
|
3264 | 3264 | |
|
3265 | 3265 | if not h: |
|
3266 | 3266 | ui.status(_('no commands defined\n')) |
|
3267 | 3267 | return |
|
3268 | 3268 | |
|
3269 | 3269 | ui.status(header) |
|
3270 | 3270 | fns = sorted(h) |
|
3271 | 3271 | m = max(map(len, fns)) |
|
3272 | 3272 | for f in fns: |
|
3273 | 3273 | if ui.verbose: |
|
3274 | 3274 | commands = cmds[f].replace("|",", ") |
|
3275 | 3275 | ui.write(" %s:\n %s\n"%(commands, h[f])) |
|
3276 | 3276 | else: |
|
3277 | 3277 | ui.write('%s\n' % (util.wrap(h[f], textwidth, |
|
3278 | 3278 | initindent=' %-*s ' % (m, f), |
|
3279 | 3279 | hangindent=' ' * (m + 4)))) |
|
3280 | 3280 | |
|
3281 | 3281 | if not name: |
|
3282 | 3282 | text = help.listexts(_('enabled extensions:'), extensions.enabled()) |
|
3283 | 3283 | if text: |
|
3284 | 3284 | ui.write("\n%s" % minirst.format(text, textwidth)) |
|
3285 | 3285 | |
|
3286 | 3286 | ui.write(_("\nadditional help topics:\n\n")) |
|
3287 | 3287 | topics = [] |
|
3288 | 3288 | for names, header, doc in help.helptable: |
|
3289 | 3289 | topics.append((sorted(names, key=len, reverse=True)[0], header)) |
|
3290 | 3290 | topics_len = max([len(s[0]) for s in topics]) |
|
3291 | 3291 | for t, desc in topics: |
|
3292 | 3292 | ui.write(" %-*s %s\n" % (topics_len, t, desc)) |
|
3293 | 3293 | |
|
3294 | 3294 | optlist = [] |
|
3295 | 3295 | addglobalopts(optlist, True) |
|
3296 | 3296 | ui.write(opttext(optlist, textwidth)) |
|
3297 | 3297 | |
|
3298 | 3298 | def helptopic(name): |
|
3299 | 3299 | for names, header, doc in help.helptable: |
|
3300 | 3300 | if name in names: |
|
3301 | 3301 | break |
|
3302 | 3302 | else: |
|
3303 | 3303 | raise error.UnknownCommand(name) |
|
3304 | 3304 | |
|
3305 | 3305 | # description |
|
3306 | 3306 | if not doc: |
|
3307 | 3307 | doc = _("(no help text available)") |
|
3308 | 3308 | if util.safehasattr(doc, '__call__'): |
|
3309 | 3309 | doc = doc() |
|
3310 | 3310 | |
|
3311 | 3311 | ui.write("%s\n\n" % header) |
|
3312 | 3312 | ui.write("%s" % minirst.format(doc, textwidth, indent=4)) |
|
3313 | 3313 | try: |
|
3314 | 3314 | cmdutil.findcmd(name, table) |
|
3315 | 3315 | ui.write(_('\nuse "hg help -c %s" to see help for ' |
|
3316 | 3316 | 'the %s command\n') % (name, name)) |
|
3317 | 3317 | except error.UnknownCommand: |
|
3318 | 3318 | pass |
|
3319 | 3319 | |
|
3320 | 3320 | def helpext(name): |
|
3321 | 3321 | try: |
|
3322 | 3322 | mod = extensions.find(name) |
|
3323 | 3323 | doc = gettext(mod.__doc__) or _('no help text available') |
|
3324 | 3324 | except KeyError: |
|
3325 | 3325 | mod = None |
|
3326 | 3326 | doc = extensions.disabledext(name) |
|
3327 | 3327 | if not doc: |
|
3328 | 3328 | raise error.UnknownCommand(name) |
|
3329 | 3329 | |
|
3330 | 3330 | if '\n' not in doc: |
|
3331 | 3331 | head, tail = doc, "" |
|
3332 | 3332 | else: |
|
3333 | 3333 | head, tail = doc.split('\n', 1) |
|
3334 | 3334 | ui.write(_('%s extension - %s\n\n') % (name.split('.')[-1], head)) |
|
3335 | 3335 | if tail: |
|
3336 | 3336 | ui.write(minirst.format(tail, textwidth)) |
|
3337 | 3337 | ui.status('\n') |
|
3338 | 3338 | |
|
3339 | 3339 | if mod: |
|
3340 | 3340 | try: |
|
3341 | 3341 | ct = mod.cmdtable |
|
3342 | 3342 | except AttributeError: |
|
3343 | 3343 | ct = {} |
|
3344 | 3344 | modcmds = set([c.split('|', 1)[0] for c in ct]) |
|
3345 | 3345 | helplist(modcmds.__contains__) |
|
3346 | 3346 | else: |
|
3347 | 3347 | ui.write(_('use "hg help extensions" for information on enabling ' |
|
3348 | 3348 | 'extensions\n')) |
|
3349 | 3349 | |
|
3350 | 3350 | def helpextcmd(name): |
|
3351 | 3351 | cmd, ext, mod = extensions.disabledcmd(ui, name, |
|
3352 | 3352 | ui.configbool('ui', 'strict')) |
|
3353 | 3353 | doc = gettext(mod.__doc__).splitlines()[0] |
|
3354 | 3354 | |
|
3355 | 3355 | msg = help.listexts(_("'%s' is provided by the following " |
|
3356 | 3356 | "extension:") % cmd, {ext: doc}, indent=4) |
|
3357 | 3357 | ui.write(minirst.format(msg, textwidth)) |
|
3358 | 3358 | ui.write('\n') |
|
3359 | 3359 | ui.write(_('use "hg help extensions" for information on enabling ' |
|
3360 | 3360 | 'extensions\n')) |
|
3361 | 3361 | |
|
3362 | 3362 | if name and name != 'shortlist': |
|
3363 | 3363 | i = None |
|
3364 | 3364 | if unknowncmd: |
|
3365 | 3365 | queries = (helpextcmd,) |
|
3366 | 3366 | elif opts.get('extension'): |
|
3367 | 3367 | queries = (helpext,) |
|
3368 | 3368 | elif opts.get('command'): |
|
3369 | 3369 | queries = (helpcmd,) |
|
3370 | 3370 | else: |
|
3371 | 3371 | queries = (helptopic, helpcmd, helpext, helpextcmd) |
|
3372 | 3372 | for f in queries: |
|
3373 | 3373 | try: |
|
3374 | 3374 | f(name) |
|
3375 | 3375 | i = None |
|
3376 | 3376 | break |
|
3377 | 3377 | except error.UnknownCommand, inst: |
|
3378 | 3378 | i = inst |
|
3379 | 3379 | if i: |
|
3380 | 3380 | raise i |
|
3381 | 3381 | else: |
|
3382 | 3382 | # program name |
|
3383 | 3383 | ui.status(_("Mercurial Distributed SCM\n")) |
|
3384 | 3384 | ui.status('\n') |
|
3385 | 3385 | helplist() |
|
3386 | 3386 | |
|
3387 | 3387 | |
|
3388 | 3388 | @command('identify|id', |
|
3389 | 3389 | [('r', 'rev', '', |
|
3390 | 3390 | _('identify the specified revision'), _('REV')), |
|
3391 | 3391 | ('n', 'num', None, _('show local revision number')), |
|
3392 | 3392 | ('i', 'id', None, _('show global revision id')), |
|
3393 | 3393 | ('b', 'branch', None, _('show branch')), |
|
3394 | 3394 | ('t', 'tags', None, _('show tags')), |
|
3395 | 3395 | ('B', 'bookmarks', None, _('show bookmarks')), |
|
3396 | 3396 | ] + remoteopts, |
|
3397 | 3397 | _('[-nibtB] [-r REV] [SOURCE]')) |
|
3398 | 3398 | def identify(ui, repo, source=None, rev=None, |
|
3399 | 3399 | num=None, id=None, branch=None, tags=None, bookmarks=None, **opts): |
|
3400 | 3400 | """identify the working copy or specified revision |
|
3401 | 3401 | |
|
3402 | 3402 | Print a summary identifying the repository state at REV using one or |
|
3403 | 3403 | two parent hash identifiers, followed by a "+" if the working |
|
3404 | 3404 | directory has uncommitted changes, the branch name (if not default), |
|
3405 | 3405 | a list of tags, and a list of bookmarks. |
|
3406 | 3406 | |
|
3407 | 3407 | When REV is not given, print a summary of the current state of the |
|
3408 | 3408 | repository. |
|
3409 | 3409 | |
|
3410 | 3410 | Specifying a path to a repository root or Mercurial bundle will |
|
3411 | 3411 | cause lookup to operate on that repository/bundle. |
|
3412 | 3412 | |
|
3413 | 3413 | .. container:: verbose |
|
3414 | 3414 | |
|
3415 | 3415 | Examples: |
|
3416 | 3416 | |
|
3417 | 3417 | - generate a build identifier for the working directory:: |
|
3418 | 3418 | |
|
3419 | 3419 | hg id --id > build-id.dat |
|
3420 | 3420 | |
|
3421 | 3421 | - find the revision corresponding to a tag:: |
|
3422 | 3422 | |
|
3423 | 3423 | hg id -n -r 1.3 |
|
3424 | 3424 | |
|
3425 | 3425 | - check the most recent revision of a remote repository:: |
|
3426 | 3426 | |
|
3427 | 3427 | hg id -r tip http://selenic.com/hg/ |
|
3428 | 3428 | |
|
3429 | 3429 | Returns 0 if successful. |
|
3430 | 3430 | """ |
|
3431 | 3431 | |
|
3432 | 3432 | if not repo and not source: |
|
3433 | 3433 | raise util.Abort(_("there is no Mercurial repository here " |
|
3434 | 3434 | "(.hg not found)")) |
|
3435 | 3435 | |
|
3436 | 3436 | hexfunc = ui.debugflag and hex or short |
|
3437 | 3437 | default = not (num or id or branch or tags or bookmarks) |
|
3438 | 3438 | output = [] |
|
3439 | 3439 | revs = [] |
|
3440 | 3440 | |
|
3441 | 3441 | if source: |
|
3442 | 3442 | source, branches = hg.parseurl(ui.expandpath(source)) |
|
3443 | 3443 | repo = hg.peer(ui, opts, source) |
|
3444 | 3444 | revs, checkout = hg.addbranchrevs(repo, repo, branches, None) |
|
3445 | 3445 | |
|
3446 | 3446 | if not repo.local(): |
|
3447 | 3447 | if num or branch or tags: |
|
3448 | 3448 | raise util.Abort( |
|
3449 | 3449 | _("can't query remote revision number, branch, or tags")) |
|
3450 | 3450 | if not rev and revs: |
|
3451 | 3451 | rev = revs[0] |
|
3452 | 3452 | if not rev: |
|
3453 | 3453 | rev = "tip" |
|
3454 | 3454 | |
|
3455 | 3455 | remoterev = repo.lookup(rev) |
|
3456 | 3456 | if default or id: |
|
3457 | 3457 | output = [hexfunc(remoterev)] |
|
3458 | 3458 | |
|
3459 | 3459 | def getbms(): |
|
3460 | 3460 | bms = [] |
|
3461 | 3461 | |
|
3462 | 3462 | if 'bookmarks' in repo.listkeys('namespaces'): |
|
3463 | 3463 | hexremoterev = hex(remoterev) |
|
3464 | 3464 | bms = [bm for bm, bmr in repo.listkeys('bookmarks').iteritems() |
|
3465 | 3465 | if bmr == hexremoterev] |
|
3466 | 3466 | |
|
3467 | 3467 | return bms |
|
3468 | 3468 | |
|
3469 | 3469 | if bookmarks: |
|
3470 | 3470 | output.extend(getbms()) |
|
3471 | 3471 | elif default and not ui.quiet: |
|
3472 | 3472 | # multiple bookmarks for a single parent separated by '/' |
|
3473 | 3473 | bm = '/'.join(getbms()) |
|
3474 | 3474 | if bm: |
|
3475 | 3475 | output.append(bm) |
|
3476 | 3476 | else: |
|
3477 | 3477 | if not rev: |
|
3478 | 3478 | ctx = repo[None] |
|
3479 | 3479 | parents = ctx.parents() |
|
3480 | 3480 | changed = "" |
|
3481 | 3481 | if default or id or num: |
|
3482 | 3482 | changed = util.any(repo.status()) and "+" or "" |
|
3483 | 3483 | if default or id: |
|
3484 | 3484 | output = ["%s%s" % |
|
3485 | 3485 | ('+'.join([hexfunc(p.node()) for p in parents]), changed)] |
|
3486 | 3486 | if num: |
|
3487 | 3487 | output.append("%s%s" % |
|
3488 | 3488 | ('+'.join([str(p.rev()) for p in parents]), changed)) |
|
3489 | 3489 | else: |
|
3490 | 3490 | ctx = scmutil.revsingle(repo, rev) |
|
3491 | 3491 | if default or id: |
|
3492 | 3492 | output = [hexfunc(ctx.node())] |
|
3493 | 3493 | if num: |
|
3494 | 3494 | output.append(str(ctx.rev())) |
|
3495 | 3495 | |
|
3496 | 3496 | if default and not ui.quiet: |
|
3497 | 3497 | b = ctx.branch() |
|
3498 | 3498 | if b != 'default': |
|
3499 | 3499 | output.append("(%s)" % b) |
|
3500 | 3500 | |
|
3501 | 3501 | # multiple tags for a single parent separated by '/' |
|
3502 | 3502 | t = '/'.join(ctx.tags()) |
|
3503 | 3503 | if t: |
|
3504 | 3504 | output.append(t) |
|
3505 | 3505 | |
|
3506 | 3506 | # multiple bookmarks for a single parent separated by '/' |
|
3507 | 3507 | bm = '/'.join(ctx.bookmarks()) |
|
3508 | 3508 | if bm: |
|
3509 | 3509 | output.append(bm) |
|
3510 | 3510 | else: |
|
3511 | 3511 | if branch: |
|
3512 | 3512 | output.append(ctx.branch()) |
|
3513 | 3513 | |
|
3514 | 3514 | if tags: |
|
3515 | 3515 | output.extend(ctx.tags()) |
|
3516 | 3516 | |
|
3517 | 3517 | if bookmarks: |
|
3518 | 3518 | output.extend(ctx.bookmarks()) |
|
3519 | 3519 | |
|
3520 | 3520 | ui.write("%s\n" % ' '.join(output)) |
|
3521 | 3521 | |
|
3522 | 3522 | @command('import|patch', |
|
3523 | 3523 | [('p', 'strip', 1, |
|
3524 | 3524 | _('directory strip option for patch. This has the same ' |
|
3525 | 3525 | 'meaning as the corresponding patch option'), _('NUM')), |
|
3526 | 3526 | ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')), |
|
3527 | 3527 | ('e', 'edit', False, _('invoke editor on commit messages')), |
|
3528 | 3528 | ('f', 'force', None, _('skip check for outstanding uncommitted changes')), |
|
3529 | 3529 | ('', 'no-commit', None, |
|
3530 | 3530 | _("don't commit, just update the working directory")), |
|
3531 | 3531 | ('', 'bypass', None, |
|
3532 | 3532 | _("apply patch without touching the working directory")), |
|
3533 | 3533 | ('', 'exact', None, |
|
3534 | 3534 | _('apply patch to the nodes from which it was generated')), |
|
3535 | 3535 | ('', 'import-branch', None, |
|
3536 | 3536 | _('use any branch information in patch (implied by --exact)'))] + |
|
3537 | 3537 | commitopts + commitopts2 + similarityopts, |
|
3538 | 3538 | _('[OPTION]... PATCH...')) |
|
3539 | 3539 | def import_(ui, repo, patch1=None, *patches, **opts): |
|
3540 | 3540 | """import an ordered set of patches |
|
3541 | 3541 | |
|
3542 | 3542 | Import a list of patches and commit them individually (unless |
|
3543 | 3543 | --no-commit is specified). |
|
3544 | 3544 | |
|
3545 | 3545 | If there are outstanding changes in the working directory, import |
|
3546 | 3546 | will abort unless given the -f/--force flag. |
|
3547 | 3547 | |
|
3548 | 3548 | You can import a patch straight from a mail message. Even patches |
|
3549 | 3549 | as attachments work (to use the body part, it must have type |
|
3550 | 3550 | text/plain or text/x-patch). From and Subject headers of email |
|
3551 | 3551 | message are used as default committer and commit message. All |
|
3552 | 3552 | text/plain body parts before first diff are added to commit |
|
3553 | 3553 | message. |
|
3554 | 3554 | |
|
3555 | 3555 | If the imported patch was generated by :hg:`export`, user and |
|
3556 | 3556 | description from patch override values from message headers and |
|
3557 | 3557 | body. Values given on command line with -m/--message and -u/--user |
|
3558 | 3558 | override these. |
|
3559 | 3559 | |
|
3560 | 3560 | If --exact is specified, import will set the working directory to |
|
3561 | 3561 | the parent of each patch before applying it, and will abort if the |
|
3562 | 3562 | resulting changeset has a different ID than the one recorded in |
|
3563 | 3563 | the patch. This may happen due to character set problems or other |
|
3564 | 3564 | deficiencies in the text patch format. |
|
3565 | 3565 | |
|
3566 | 3566 | Use --bypass to apply and commit patches directly to the |
|
3567 | 3567 | repository, not touching the working directory. Without --exact, |
|
3568 | 3568 | patches will be applied on top of the working directory parent |
|
3569 | 3569 | revision. |
|
3570 | 3570 | |
|
3571 | 3571 | With -s/--similarity, hg will attempt to discover renames and |
|
3572 | 3572 | copies in the patch in the same way as :hg:`addremove`. |
|
3573 | 3573 | |
|
3574 | 3574 | To read a patch from standard input, use "-" as the patch name. If |
|
3575 | 3575 | a URL is specified, the patch will be downloaded from it. |
|
3576 | 3576 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
3577 | 3577 | |
|
3578 | 3578 | .. container:: verbose |
|
3579 | 3579 | |
|
3580 | 3580 | Examples: |
|
3581 | 3581 | |
|
3582 | 3582 | - import a traditional patch from a website and detect renames:: |
|
3583 | 3583 | |
|
3584 | 3584 | hg import -s 80 http://example.com/bugfix.patch |
|
3585 | 3585 | |
|
3586 | 3586 | - import a changeset from an hgweb server:: |
|
3587 | 3587 | |
|
3588 | 3588 | hg import http://www.selenic.com/hg/rev/5ca8c111e9aa |
|
3589 | 3589 | |
|
3590 | 3590 | - import all the patches in an Unix-style mbox:: |
|
3591 | 3591 | |
|
3592 | 3592 | hg import incoming-patches.mbox |
|
3593 | 3593 | |
|
3594 | 3594 | - attempt to exactly restore an exported changeset (not always |
|
3595 | 3595 | possible):: |
|
3596 | 3596 | |
|
3597 | 3597 | hg import --exact proposed-fix.patch |
|
3598 | 3598 | |
|
3599 | 3599 | Returns 0 on success. |
|
3600 | 3600 | """ |
|
3601 | 3601 | |
|
3602 | 3602 | if not patch1: |
|
3603 | 3603 | raise util.Abort(_('need at least one patch to import')) |
|
3604 | 3604 | |
|
3605 | 3605 | patches = (patch1,) + patches |
|
3606 | 3606 | |
|
3607 | 3607 | date = opts.get('date') |
|
3608 | 3608 | if date: |
|
3609 | 3609 | opts['date'] = util.parsedate(date) |
|
3610 | 3610 | |
|
3611 | 3611 | editor = cmdutil.commiteditor |
|
3612 | 3612 | if opts.get('edit'): |
|
3613 | 3613 | editor = cmdutil.commitforceeditor |
|
3614 | 3614 | |
|
3615 | 3615 | update = not opts.get('bypass') |
|
3616 | 3616 | if not update and opts.get('no_commit'): |
|
3617 | 3617 | raise util.Abort(_('cannot use --no-commit with --bypass')) |
|
3618 | 3618 | try: |
|
3619 | 3619 | sim = float(opts.get('similarity') or 0) |
|
3620 | 3620 | except ValueError: |
|
3621 | 3621 | raise util.Abort(_('similarity must be a number')) |
|
3622 | 3622 | if sim < 0 or sim > 100: |
|
3623 | 3623 | raise util.Abort(_('similarity must be between 0 and 100')) |
|
3624 | 3624 | if sim and not update: |
|
3625 | 3625 | raise util.Abort(_('cannot use --similarity with --bypass')) |
|
3626 | 3626 | |
|
3627 | 3627 | if (opts.get('exact') or not opts.get('force')) and update: |
|
3628 | 3628 | cmdutil.bailifchanged(repo) |
|
3629 | 3629 | |
|
3630 | 3630 | base = opts["base"] |
|
3631 | 3631 | strip = opts["strip"] |
|
3632 | 3632 | wlock = lock = tr = None |
|
3633 | 3633 | msgs = [] |
|
3634 | 3634 | |
|
3635 | 3635 | def checkexact(repo, n, nodeid): |
|
3636 | 3636 | if opts.get('exact') and hex(n) != nodeid: |
|
3637 | 3637 | repo.rollback() |
|
3638 | 3638 | raise util.Abort(_('patch is damaged or loses information')) |
|
3639 | 3639 | |
|
3640 | 3640 | def tryone(ui, hunk, parents): |
|
3641 | 3641 | tmpname, message, user, date, branch, nodeid, p1, p2 = \ |
|
3642 | 3642 | patch.extract(ui, hunk) |
|
3643 | 3643 | |
|
3644 | 3644 | if not tmpname: |
|
3645 | 3645 | return (None, None) |
|
3646 | 3646 | msg = _('applied to working directory') |
|
3647 | 3647 | |
|
3648 | 3648 | try: |
|
3649 | 3649 | cmdline_message = cmdutil.logmessage(ui, opts) |
|
3650 | 3650 | if cmdline_message: |
|
3651 | 3651 | # pickup the cmdline msg |
|
3652 | 3652 | message = cmdline_message |
|
3653 | 3653 | elif message: |
|
3654 | 3654 | # pickup the patch msg |
|
3655 | 3655 | message = message.strip() |
|
3656 | 3656 | else: |
|
3657 | 3657 | # launch the editor |
|
3658 | 3658 | message = None |
|
3659 | 3659 | ui.debug('message:\n%s\n' % message) |
|
3660 | 3660 | |
|
3661 | 3661 | if len(parents) == 1: |
|
3662 | 3662 | parents.append(repo[nullid]) |
|
3663 | 3663 | if opts.get('exact'): |
|
3664 | 3664 | if not nodeid or not p1: |
|
3665 | 3665 | raise util.Abort(_('not a Mercurial patch')) |
|
3666 | 3666 | p1 = repo[p1] |
|
3667 | 3667 | p2 = repo[p2 or nullid] |
|
3668 | 3668 | elif p2: |
|
3669 | 3669 | try: |
|
3670 | 3670 | p1 = repo[p1] |
|
3671 | 3671 | p2 = repo[p2] |
|
3672 | 3672 | # Without any options, consider p2 only if the |
|
3673 | 3673 | # patch is being applied on top of the recorded |
|
3674 | 3674 | # first parent. |
|
3675 | 3675 | if p1 != parents[0]: |
|
3676 | 3676 | p1 = parents[0] |
|
3677 | 3677 | p2 = repo[nullid] |
|
3678 | 3678 | except error.RepoError: |
|
3679 | 3679 | p1, p2 = parents |
|
3680 | 3680 | else: |
|
3681 | 3681 | p1, p2 = parents |
|
3682 | 3682 | |
|
3683 | 3683 | n = None |
|
3684 | 3684 | if update: |
|
3685 | 3685 | if p1 != parents[0]: |
|
3686 | 3686 | hg.clean(repo, p1.node()) |
|
3687 | 3687 | if p2 != parents[1]: |
|
3688 | 3688 | repo.setparents(p1.node(), p2.node()) |
|
3689 | 3689 | |
|
3690 | 3690 | if opts.get('exact') or opts.get('import_branch'): |
|
3691 | 3691 | repo.dirstate.setbranch(branch or 'default') |
|
3692 | 3692 | |
|
3693 | 3693 | files = set() |
|
3694 | 3694 | patch.patch(ui, repo, tmpname, strip=strip, files=files, |
|
3695 | 3695 | eolmode=None, similarity=sim / 100.0) |
|
3696 | 3696 | files = list(files) |
|
3697 | 3697 | if opts.get('no_commit'): |
|
3698 | 3698 | if message: |
|
3699 | 3699 | msgs.append(message) |
|
3700 | 3700 | else: |
|
3701 | 3701 | if opts.get('exact') or p2: |
|
3702 | 3702 | # If you got here, you either use --force and know what |
|
3703 | 3703 | # you are doing or used --exact or a merge patch while |
|
3704 | 3704 | # being updated to its first parent. |
|
3705 | 3705 | m = None |
|
3706 | 3706 | else: |
|
3707 | 3707 | m = scmutil.matchfiles(repo, files or []) |
|
3708 | 3708 | n = repo.commit(message, opts.get('user') or user, |
|
3709 | 3709 | opts.get('date') or date, match=m, |
|
3710 | 3710 | editor=editor) |
|
3711 | 3711 | checkexact(repo, n, nodeid) |
|
3712 | 3712 | else: |
|
3713 | 3713 | if opts.get('exact') or opts.get('import_branch'): |
|
3714 | 3714 | branch = branch or 'default' |
|
3715 | 3715 | else: |
|
3716 | 3716 | branch = p1.branch() |
|
3717 | 3717 | store = patch.filestore() |
|
3718 | 3718 | try: |
|
3719 | 3719 | files = set() |
|
3720 | 3720 | try: |
|
3721 | 3721 | patch.patchrepo(ui, repo, p1, store, tmpname, strip, |
|
3722 | 3722 | files, eolmode=None) |
|
3723 | 3723 | except patch.PatchError, e: |
|
3724 | 3724 | raise util.Abort(str(e)) |
|
3725 | 3725 | memctx = patch.makememctx(repo, (p1.node(), p2.node()), |
|
3726 | 3726 | message, |
|
3727 | 3727 | opts.get('user') or user, |
|
3728 | 3728 | opts.get('date') or date, |
|
3729 | 3729 | branch, files, store, |
|
3730 | 3730 | editor=cmdutil.commiteditor) |
|
3731 | 3731 | repo.savecommitmessage(memctx.description()) |
|
3732 | 3732 | n = memctx.commit() |
|
3733 | 3733 | checkexact(repo, n, nodeid) |
|
3734 | 3734 | finally: |
|
3735 | 3735 | store.close() |
|
3736 | 3736 | if n: |
|
3737 | 3737 | # i18n: refers to a short changeset id |
|
3738 | 3738 | msg = _('created %s') % short(n) |
|
3739 | 3739 | return (msg, n) |
|
3740 | 3740 | finally: |
|
3741 | 3741 | os.unlink(tmpname) |
|
3742 | 3742 | |
|
3743 | 3743 | try: |
|
3744 | 3744 | try: |
|
3745 | 3745 | wlock = repo.wlock() |
|
3746 | 3746 | if not opts.get('no_commit'): |
|
3747 | 3747 | lock = repo.lock() |
|
3748 | 3748 | tr = repo.transaction('import') |
|
3749 | 3749 | parents = repo.parents() |
|
3750 | 3750 | for patchurl in patches: |
|
3751 | 3751 | if patchurl == '-': |
|
3752 | 3752 | ui.status(_('applying patch from stdin\n')) |
|
3753 | 3753 | patchfile = ui.fin |
|
3754 | 3754 | patchurl = 'stdin' # for error message |
|
3755 | 3755 | else: |
|
3756 | 3756 | patchurl = os.path.join(base, patchurl) |
|
3757 | 3757 | ui.status(_('applying %s\n') % patchurl) |
|
3758 | 3758 | patchfile = url.open(ui, patchurl) |
|
3759 | 3759 | |
|
3760 | 3760 | haspatch = False |
|
3761 | 3761 | for hunk in patch.split(patchfile): |
|
3762 | 3762 | (msg, node) = tryone(ui, hunk, parents) |
|
3763 | 3763 | if msg: |
|
3764 | 3764 | haspatch = True |
|
3765 | 3765 | ui.note(msg + '\n') |
|
3766 | 3766 | if update or opts.get('exact'): |
|
3767 | 3767 | parents = repo.parents() |
|
3768 | 3768 | else: |
|
3769 | 3769 | parents = [repo[node]] |
|
3770 | 3770 | |
|
3771 | 3771 | if not haspatch: |
|
3772 | 3772 | raise util.Abort(_('%s: no diffs found') % patchurl) |
|
3773 | 3773 | |
|
3774 | 3774 | if tr: |
|
3775 | 3775 | tr.close() |
|
3776 | 3776 | if msgs: |
|
3777 | 3777 | repo.savecommitmessage('\n* * *\n'.join(msgs)) |
|
3778 | except: | |
|
3778 | except: # re-raises | |
|
3779 | 3779 | # wlock.release() indirectly calls dirstate.write(): since |
|
3780 | 3780 | # we're crashing, we do not want to change the working dir |
|
3781 | 3781 | # parent after all, so make sure it writes nothing |
|
3782 | 3782 | repo.dirstate.invalidate() |
|
3783 | 3783 | raise |
|
3784 | 3784 | finally: |
|
3785 | 3785 | if tr: |
|
3786 | 3786 | tr.release() |
|
3787 | 3787 | release(lock, wlock) |
|
3788 | 3788 | |
|
3789 | 3789 | @command('incoming|in', |
|
3790 | 3790 | [('f', 'force', None, |
|
3791 | 3791 | _('run even if remote repository is unrelated')), |
|
3792 | 3792 | ('n', 'newest-first', None, _('show newest record first')), |
|
3793 | 3793 | ('', 'bundle', '', |
|
3794 | 3794 | _('file to store the bundles into'), _('FILE')), |
|
3795 | 3795 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), |
|
3796 | 3796 | ('B', 'bookmarks', False, _("compare bookmarks")), |
|
3797 | 3797 | ('b', 'branch', [], |
|
3798 | 3798 | _('a specific branch you would like to pull'), _('BRANCH')), |
|
3799 | 3799 | ] + logopts + remoteopts + subrepoopts, |
|
3800 | 3800 | _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]')) |
|
3801 | 3801 | def incoming(ui, repo, source="default", **opts): |
|
3802 | 3802 | """show new changesets found in source |
|
3803 | 3803 | |
|
3804 | 3804 | Show new changesets found in the specified path/URL or the default |
|
3805 | 3805 | pull location. These are the changesets that would have been pulled |
|
3806 | 3806 | if a pull at the time you issued this command. |
|
3807 | 3807 | |
|
3808 | 3808 | For remote repository, using --bundle avoids downloading the |
|
3809 | 3809 | changesets twice if the incoming is followed by a pull. |
|
3810 | 3810 | |
|
3811 | 3811 | See pull for valid source format details. |
|
3812 | 3812 | |
|
3813 | 3813 | Returns 0 if there are incoming changes, 1 otherwise. |
|
3814 | 3814 | """ |
|
3815 | 3815 | if opts.get('bundle') and opts.get('subrepos'): |
|
3816 | 3816 | raise util.Abort(_('cannot combine --bundle and --subrepos')) |
|
3817 | 3817 | |
|
3818 | 3818 | if opts.get('bookmarks'): |
|
3819 | 3819 | source, branches = hg.parseurl(ui.expandpath(source), |
|
3820 | 3820 | opts.get('branch')) |
|
3821 | 3821 | other = hg.peer(repo, opts, source) |
|
3822 | 3822 | if 'bookmarks' not in other.listkeys('namespaces'): |
|
3823 | 3823 | ui.warn(_("remote doesn't support bookmarks\n")) |
|
3824 | 3824 | return 0 |
|
3825 | 3825 | ui.status(_('comparing with %s\n') % util.hidepassword(source)) |
|
3826 | 3826 | return bookmarks.diff(ui, repo, other) |
|
3827 | 3827 | |
|
3828 | 3828 | repo._subtoppath = ui.expandpath(source) |
|
3829 | 3829 | try: |
|
3830 | 3830 | return hg.incoming(ui, repo, source, opts) |
|
3831 | 3831 | finally: |
|
3832 | 3832 | del repo._subtoppath |
|
3833 | 3833 | |
|
3834 | 3834 | |
|
3835 | 3835 | @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]')) |
|
3836 | 3836 | def init(ui, dest=".", **opts): |
|
3837 | 3837 | """create a new repository in the given directory |
|
3838 | 3838 | |
|
3839 | 3839 | Initialize a new repository in the given directory. If the given |
|
3840 | 3840 | directory does not exist, it will be created. |
|
3841 | 3841 | |
|
3842 | 3842 | If no directory is given, the current directory is used. |
|
3843 | 3843 | |
|
3844 | 3844 | It is possible to specify an ``ssh://`` URL as the destination. |
|
3845 | 3845 | See :hg:`help urls` for more information. |
|
3846 | 3846 | |
|
3847 | 3847 | Returns 0 on success. |
|
3848 | 3848 | """ |
|
3849 | 3849 | hg.peer(ui, opts, ui.expandpath(dest), create=True) |
|
3850 | 3850 | |
|
3851 | 3851 | @command('locate', |
|
3852 | 3852 | [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')), |
|
3853 | 3853 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), |
|
3854 | 3854 | ('f', 'fullpath', None, _('print complete paths from the filesystem root')), |
|
3855 | 3855 | ] + walkopts, |
|
3856 | 3856 | _('[OPTION]... [PATTERN]...')) |
|
3857 | 3857 | def locate(ui, repo, *pats, **opts): |
|
3858 | 3858 | """locate files matching specific patterns |
|
3859 | 3859 | |
|
3860 | 3860 | Print files under Mercurial control in the working directory whose |
|
3861 | 3861 | names match the given patterns. |
|
3862 | 3862 | |
|
3863 | 3863 | By default, this command searches all directories in the working |
|
3864 | 3864 | directory. To search just the current directory and its |
|
3865 | 3865 | subdirectories, use "--include .". |
|
3866 | 3866 | |
|
3867 | 3867 | If no patterns are given to match, this command prints the names |
|
3868 | 3868 | of all files under Mercurial control in the working directory. |
|
3869 | 3869 | |
|
3870 | 3870 | If you want to feed the output of this command into the "xargs" |
|
3871 | 3871 | command, use the -0 option to both this command and "xargs". This |
|
3872 | 3872 | will avoid the problem of "xargs" treating single filenames that |
|
3873 | 3873 | contain whitespace as multiple filenames. |
|
3874 | 3874 | |
|
3875 | 3875 | Returns 0 if a match is found, 1 otherwise. |
|
3876 | 3876 | """ |
|
3877 | 3877 | end = opts.get('print0') and '\0' or '\n' |
|
3878 | 3878 | rev = scmutil.revsingle(repo, opts.get('rev'), None).node() |
|
3879 | 3879 | |
|
3880 | 3880 | ret = 1 |
|
3881 | 3881 | m = scmutil.match(repo[rev], pats, opts, default='relglob') |
|
3882 | 3882 | m.bad = lambda x, y: False |
|
3883 | 3883 | for abs in repo[rev].walk(m): |
|
3884 | 3884 | if not rev and abs not in repo.dirstate: |
|
3885 | 3885 | continue |
|
3886 | 3886 | if opts.get('fullpath'): |
|
3887 | 3887 | ui.write(repo.wjoin(abs), end) |
|
3888 | 3888 | else: |
|
3889 | 3889 | ui.write(((pats and m.rel(abs)) or abs), end) |
|
3890 | 3890 | ret = 0 |
|
3891 | 3891 | |
|
3892 | 3892 | return ret |
|
3893 | 3893 | |
|
3894 | 3894 | @command('^log|history', |
|
3895 | 3895 | [('f', 'follow', None, |
|
3896 | 3896 | _('follow changeset history, or file history across copies and renames')), |
|
3897 | 3897 | ('', 'follow-first', None, |
|
3898 | 3898 | _('only follow the first parent of merge changesets (DEPRECATED)')), |
|
3899 | 3899 | ('d', 'date', '', _('show revisions matching date spec'), _('DATE')), |
|
3900 | 3900 | ('C', 'copies', None, _('show copied files')), |
|
3901 | 3901 | ('k', 'keyword', [], |
|
3902 | 3902 | _('do case-insensitive search for a given text'), _('TEXT')), |
|
3903 | 3903 | ('r', 'rev', [], _('show the specified revision or range'), _('REV')), |
|
3904 | 3904 | ('', 'removed', None, _('include revisions where files were removed')), |
|
3905 | 3905 | ('m', 'only-merges', None, _('show only merges (DEPRECATED)')), |
|
3906 | 3906 | ('u', 'user', [], _('revisions committed by user'), _('USER')), |
|
3907 | 3907 | ('', 'only-branch', [], |
|
3908 | 3908 | _('show only changesets within the given named branch (DEPRECATED)'), |
|
3909 | 3909 | _('BRANCH')), |
|
3910 | 3910 | ('b', 'branch', [], |
|
3911 | 3911 | _('show changesets within the given named branch'), _('BRANCH')), |
|
3912 | 3912 | ('P', 'prune', [], |
|
3913 | 3913 | _('do not display revision or any of its ancestors'), _('REV')), |
|
3914 | 3914 | ('', 'hidden', False, _('show hidden changesets (DEPRECATED)')), |
|
3915 | 3915 | ] + logopts + walkopts, |
|
3916 | 3916 | _('[OPTION]... [FILE]')) |
|
3917 | 3917 | def log(ui, repo, *pats, **opts): |
|
3918 | 3918 | """show revision history of entire repository or files |
|
3919 | 3919 | |
|
3920 | 3920 | Print the revision history of the specified files or the entire |
|
3921 | 3921 | project. |
|
3922 | 3922 | |
|
3923 | 3923 | If no revision range is specified, the default is ``tip:0`` unless |
|
3924 | 3924 | --follow is set, in which case the working directory parent is |
|
3925 | 3925 | used as the starting revision. |
|
3926 | 3926 | |
|
3927 | 3927 | File history is shown without following rename or copy history of |
|
3928 | 3928 | files. Use -f/--follow with a filename to follow history across |
|
3929 | 3929 | renames and copies. --follow without a filename will only show |
|
3930 | 3930 | ancestors or descendants of the starting revision. |
|
3931 | 3931 | |
|
3932 | 3932 | By default this command prints revision number and changeset id, |
|
3933 | 3933 | tags, non-trivial parents, user, date and time, and a summary for |
|
3934 | 3934 | each commit. When the -v/--verbose switch is used, the list of |
|
3935 | 3935 | changed files and full commit message are shown. |
|
3936 | 3936 | |
|
3937 | 3937 | .. note:: |
|
3938 | 3938 | log -p/--patch may generate unexpected diff output for merge |
|
3939 | 3939 | changesets, as it will only compare the merge changeset against |
|
3940 | 3940 | its first parent. Also, only files different from BOTH parents |
|
3941 | 3941 | will appear in files:. |
|
3942 | 3942 | |
|
3943 | 3943 | .. note:: |
|
3944 | 3944 | for performance reasons, log FILE may omit duplicate changes |
|
3945 | 3945 | made on branches and will not show deletions. To see all |
|
3946 | 3946 | changes including duplicates and deletions, use the --removed |
|
3947 | 3947 | switch. |
|
3948 | 3948 | |
|
3949 | 3949 | .. container:: verbose |
|
3950 | 3950 | |
|
3951 | 3951 | Some examples: |
|
3952 | 3952 | |
|
3953 | 3953 | - changesets with full descriptions and file lists:: |
|
3954 | 3954 | |
|
3955 | 3955 | hg log -v |
|
3956 | 3956 | |
|
3957 | 3957 | - changesets ancestral to the working directory:: |
|
3958 | 3958 | |
|
3959 | 3959 | hg log -f |
|
3960 | 3960 | |
|
3961 | 3961 | - last 10 commits on the current branch:: |
|
3962 | 3962 | |
|
3963 | 3963 | hg log -l 10 -b . |
|
3964 | 3964 | |
|
3965 | 3965 | - changesets showing all modifications of a file, including removals:: |
|
3966 | 3966 | |
|
3967 | 3967 | hg log --removed file.c |
|
3968 | 3968 | |
|
3969 | 3969 | - all changesets that touch a directory, with diffs, excluding merges:: |
|
3970 | 3970 | |
|
3971 | 3971 | hg log -Mp lib/ |
|
3972 | 3972 | |
|
3973 | 3973 | - all revision numbers that match a keyword:: |
|
3974 | 3974 | |
|
3975 | 3975 | hg log -k bug --template "{rev}\\n" |
|
3976 | 3976 | |
|
3977 | 3977 | - check if a given changeset is included is a tagged release:: |
|
3978 | 3978 | |
|
3979 | 3979 | hg log -r "a21ccf and ancestor(1.9)" |
|
3980 | 3980 | |
|
3981 | 3981 | - find all changesets by some user in a date range:: |
|
3982 | 3982 | |
|
3983 | 3983 | hg log -k alice -d "may 2008 to jul 2008" |
|
3984 | 3984 | |
|
3985 | 3985 | - summary of all changesets after the last tag:: |
|
3986 | 3986 | |
|
3987 | 3987 | hg log -r "last(tagged())::" --template "{desc|firstline}\\n" |
|
3988 | 3988 | |
|
3989 | 3989 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
3990 | 3990 | |
|
3991 | 3991 | See :hg:`help revisions` and :hg:`help revsets` for more about |
|
3992 | 3992 | specifying revisions. |
|
3993 | 3993 | |
|
3994 | 3994 | See :hg:`help templates` for more about pre-packaged styles and |
|
3995 | 3995 | specifying custom templates. |
|
3996 | 3996 | |
|
3997 | 3997 | Returns 0 on success. |
|
3998 | 3998 | """ |
|
3999 | 3999 | |
|
4000 | 4000 | matchfn = scmutil.match(repo[None], pats, opts) |
|
4001 | 4001 | limit = cmdutil.loglimit(opts) |
|
4002 | 4002 | count = 0 |
|
4003 | 4003 | |
|
4004 | 4004 | getrenamed, endrev = None, None |
|
4005 | 4005 | if opts.get('copies'): |
|
4006 | 4006 | if opts.get('rev'): |
|
4007 | 4007 | endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1 |
|
4008 | 4008 | getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) |
|
4009 | 4009 | |
|
4010 | 4010 | df = False |
|
4011 | 4011 | if opts["date"]: |
|
4012 | 4012 | df = util.matchdate(opts["date"]) |
|
4013 | 4013 | |
|
4014 | 4014 | branches = opts.get('branch', []) + opts.get('only_branch', []) |
|
4015 | 4015 | opts['branch'] = [repo.lookupbranch(b) for b in branches] |
|
4016 | 4016 | |
|
4017 | 4017 | displayer = cmdutil.show_changeset(ui, repo, opts, True) |
|
4018 | 4018 | def prep(ctx, fns): |
|
4019 | 4019 | rev = ctx.rev() |
|
4020 | 4020 | parents = [p for p in repo.changelog.parentrevs(rev) |
|
4021 | 4021 | if p != nullrev] |
|
4022 | 4022 | if opts.get('no_merges') and len(parents) == 2: |
|
4023 | 4023 | return |
|
4024 | 4024 | if opts.get('only_merges') and len(parents) != 2: |
|
4025 | 4025 | return |
|
4026 | 4026 | if opts.get('branch') and ctx.branch() not in opts['branch']: |
|
4027 | 4027 | return |
|
4028 | 4028 | if not opts.get('hidden') and ctx.hidden(): |
|
4029 | 4029 | return |
|
4030 | 4030 | if df and not df(ctx.date()[0]): |
|
4031 | 4031 | return |
|
4032 | 4032 | |
|
4033 | 4033 | lower = encoding.lower |
|
4034 | 4034 | if opts.get('user'): |
|
4035 | 4035 | luser = lower(ctx.user()) |
|
4036 | 4036 | for k in [lower(x) for x in opts['user']]: |
|
4037 | 4037 | if (k in luser): |
|
4038 | 4038 | break |
|
4039 | 4039 | else: |
|
4040 | 4040 | return |
|
4041 | 4041 | if opts.get('keyword'): |
|
4042 | 4042 | luser = lower(ctx.user()) |
|
4043 | 4043 | ldesc = lower(ctx.description()) |
|
4044 | 4044 | lfiles = lower(" ".join(ctx.files())) |
|
4045 | 4045 | for k in [lower(x) for x in opts['keyword']]: |
|
4046 | 4046 | if (k in luser or k in ldesc or k in lfiles): |
|
4047 | 4047 | break |
|
4048 | 4048 | else: |
|
4049 | 4049 | return |
|
4050 | 4050 | |
|
4051 | 4051 | copies = None |
|
4052 | 4052 | if getrenamed is not None and rev: |
|
4053 | 4053 | copies = [] |
|
4054 | 4054 | for fn in ctx.files(): |
|
4055 | 4055 | rename = getrenamed(fn, rev) |
|
4056 | 4056 | if rename: |
|
4057 | 4057 | copies.append((fn, rename[0])) |
|
4058 | 4058 | |
|
4059 | 4059 | revmatchfn = None |
|
4060 | 4060 | if opts.get('patch') or opts.get('stat'): |
|
4061 | 4061 | if opts.get('follow') or opts.get('follow_first'): |
|
4062 | 4062 | # note: this might be wrong when following through merges |
|
4063 | 4063 | revmatchfn = scmutil.match(repo[None], fns, default='path') |
|
4064 | 4064 | else: |
|
4065 | 4065 | revmatchfn = matchfn |
|
4066 | 4066 | |
|
4067 | 4067 | displayer.show(ctx, copies=copies, matchfn=revmatchfn) |
|
4068 | 4068 | |
|
4069 | 4069 | for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep): |
|
4070 | 4070 | if count == limit: |
|
4071 | 4071 | break |
|
4072 | 4072 | if displayer.flush(ctx.rev()): |
|
4073 | 4073 | count += 1 |
|
4074 | 4074 | displayer.close() |
|
4075 | 4075 | |
|
4076 | 4076 | @command('manifest', |
|
4077 | 4077 | [('r', 'rev', '', _('revision to display'), _('REV')), |
|
4078 | 4078 | ('', 'all', False, _("list files from all revisions"))], |
|
4079 | 4079 | _('[-r REV]')) |
|
4080 | 4080 | def manifest(ui, repo, node=None, rev=None, **opts): |
|
4081 | 4081 | """output the current or given revision of the project manifest |
|
4082 | 4082 | |
|
4083 | 4083 | Print a list of version controlled files for the given revision. |
|
4084 | 4084 | If no revision is given, the first parent of the working directory |
|
4085 | 4085 | is used, or the null revision if no revision is checked out. |
|
4086 | 4086 | |
|
4087 | 4087 | With -v, print file permissions, symlink and executable bits. |
|
4088 | 4088 | With --debug, print file revision hashes. |
|
4089 | 4089 | |
|
4090 | 4090 | If option --all is specified, the list of all files from all revisions |
|
4091 | 4091 | is printed. This includes deleted and renamed files. |
|
4092 | 4092 | |
|
4093 | 4093 | Returns 0 on success. |
|
4094 | 4094 | """ |
|
4095 | 4095 | if opts.get('all'): |
|
4096 | 4096 | if rev or node: |
|
4097 | 4097 | raise util.Abort(_("can't specify a revision with --all")) |
|
4098 | 4098 | |
|
4099 | 4099 | res = [] |
|
4100 | 4100 | prefix = "data/" |
|
4101 | 4101 | suffix = ".i" |
|
4102 | 4102 | plen = len(prefix) |
|
4103 | 4103 | slen = len(suffix) |
|
4104 | 4104 | lock = repo.lock() |
|
4105 | 4105 | try: |
|
4106 | 4106 | for fn, b, size in repo.store.datafiles(): |
|
4107 | 4107 | if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix: |
|
4108 | 4108 | res.append(fn[plen:-slen]) |
|
4109 | 4109 | finally: |
|
4110 | 4110 | lock.release() |
|
4111 | 4111 | for f in sorted(res): |
|
4112 | 4112 | ui.write("%s\n" % f) |
|
4113 | 4113 | return |
|
4114 | 4114 | |
|
4115 | 4115 | if rev and node: |
|
4116 | 4116 | raise util.Abort(_("please specify just one revision")) |
|
4117 | 4117 | |
|
4118 | 4118 | if not node: |
|
4119 | 4119 | node = rev |
|
4120 | 4120 | |
|
4121 | 4121 | decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '} |
|
4122 | 4122 | ctx = scmutil.revsingle(repo, node) |
|
4123 | 4123 | for f in ctx: |
|
4124 | 4124 | if ui.debugflag: |
|
4125 | 4125 | ui.write("%40s " % hex(ctx.manifest()[f])) |
|
4126 | 4126 | if ui.verbose: |
|
4127 | 4127 | ui.write(decor[ctx.flags(f)]) |
|
4128 | 4128 | ui.write("%s\n" % f) |
|
4129 | 4129 | |
|
4130 | 4130 | @command('^merge', |
|
4131 | 4131 | [('f', 'force', None, _('force a merge with outstanding changes')), |
|
4132 | 4132 | ('r', 'rev', '', _('revision to merge'), _('REV')), |
|
4133 | 4133 | ('P', 'preview', None, |
|
4134 | 4134 | _('review revisions to merge (no merge is performed)')) |
|
4135 | 4135 | ] + mergetoolopts, |
|
4136 | 4136 | _('[-P] [-f] [[-r] REV]')) |
|
4137 | 4137 | def merge(ui, repo, node=None, **opts): |
|
4138 | 4138 | """merge working directory with another revision |
|
4139 | 4139 | |
|
4140 | 4140 | The current working directory is updated with all changes made in |
|
4141 | 4141 | the requested revision since the last common predecessor revision. |
|
4142 | 4142 | |
|
4143 | 4143 | Files that changed between either parent are marked as changed for |
|
4144 | 4144 | the next commit and a commit must be performed before any further |
|
4145 | 4145 | updates to the repository are allowed. The next commit will have |
|
4146 | 4146 | two parents. |
|
4147 | 4147 | |
|
4148 | 4148 | ``--tool`` can be used to specify the merge tool used for file |
|
4149 | 4149 | merges. It overrides the HGMERGE environment variable and your |
|
4150 | 4150 | configuration files. See :hg:`help merge-tools` for options. |
|
4151 | 4151 | |
|
4152 | 4152 | If no revision is specified, the working directory's parent is a |
|
4153 | 4153 | head revision, and the current branch contains exactly one other |
|
4154 | 4154 | head, the other head is merged with by default. Otherwise, an |
|
4155 | 4155 | explicit revision with which to merge with must be provided. |
|
4156 | 4156 | |
|
4157 | 4157 | :hg:`resolve` must be used to resolve unresolved files. |
|
4158 | 4158 | |
|
4159 | 4159 | To undo an uncommitted merge, use :hg:`update --clean .` which |
|
4160 | 4160 | will check out a clean copy of the original merge parent, losing |
|
4161 | 4161 | all changes. |
|
4162 | 4162 | |
|
4163 | 4163 | Returns 0 on success, 1 if there are unresolved files. |
|
4164 | 4164 | """ |
|
4165 | 4165 | |
|
4166 | 4166 | if opts.get('rev') and node: |
|
4167 | 4167 | raise util.Abort(_("please specify just one revision")) |
|
4168 | 4168 | if not node: |
|
4169 | 4169 | node = opts.get('rev') |
|
4170 | 4170 | |
|
4171 | 4171 | if not node: |
|
4172 | 4172 | branch = repo[None].branch() |
|
4173 | 4173 | bheads = repo.branchheads(branch) |
|
4174 | 4174 | if len(bheads) > 2: |
|
4175 | 4175 | raise util.Abort(_("branch '%s' has %d heads - " |
|
4176 | 4176 | "please merge with an explicit rev") |
|
4177 | 4177 | % (branch, len(bheads)), |
|
4178 | 4178 | hint=_("run 'hg heads .' to see heads")) |
|
4179 | 4179 | |
|
4180 | 4180 | parent = repo.dirstate.p1() |
|
4181 | 4181 | if len(bheads) == 1: |
|
4182 | 4182 | if len(repo.heads()) > 1: |
|
4183 | 4183 | raise util.Abort(_("branch '%s' has one head - " |
|
4184 | 4184 | "please merge with an explicit rev") |
|
4185 | 4185 | % branch, |
|
4186 | 4186 | hint=_("run 'hg heads' to see all heads")) |
|
4187 | 4187 | msg, hint = _('nothing to merge'), None |
|
4188 | 4188 | if parent != repo.lookup(branch): |
|
4189 | 4189 | hint = _("use 'hg update' instead") |
|
4190 | 4190 | raise util.Abort(msg, hint=hint) |
|
4191 | 4191 | |
|
4192 | 4192 | if parent not in bheads: |
|
4193 | 4193 | raise util.Abort(_('working directory not at a head revision'), |
|
4194 | 4194 | hint=_("use 'hg update' or merge with an " |
|
4195 | 4195 | "explicit revision")) |
|
4196 | 4196 | node = parent == bheads[0] and bheads[-1] or bheads[0] |
|
4197 | 4197 | else: |
|
4198 | 4198 | node = scmutil.revsingle(repo, node).node() |
|
4199 | 4199 | |
|
4200 | 4200 | if opts.get('preview'): |
|
4201 | 4201 | # find nodes that are ancestors of p2 but not of p1 |
|
4202 | 4202 | p1 = repo.lookup('.') |
|
4203 | 4203 | p2 = repo.lookup(node) |
|
4204 | 4204 | nodes = repo.changelog.findmissing(common=[p1], heads=[p2]) |
|
4205 | 4205 | |
|
4206 | 4206 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
4207 | 4207 | for node in nodes: |
|
4208 | 4208 | displayer.show(repo[node]) |
|
4209 | 4209 | displayer.close() |
|
4210 | 4210 | return 0 |
|
4211 | 4211 | |
|
4212 | 4212 | try: |
|
4213 | 4213 | # ui.forcemerge is an internal variable, do not document |
|
4214 | 4214 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |
|
4215 | 4215 | return hg.merge(repo, node, force=opts.get('force')) |
|
4216 | 4216 | finally: |
|
4217 | 4217 | ui.setconfig('ui', 'forcemerge', '') |
|
4218 | 4218 | |
|
4219 | 4219 | @command('outgoing|out', |
|
4220 | 4220 | [('f', 'force', None, _('run even when the destination is unrelated')), |
|
4221 | 4221 | ('r', 'rev', [], |
|
4222 | 4222 | _('a changeset intended to be included in the destination'), _('REV')), |
|
4223 | 4223 | ('n', 'newest-first', None, _('show newest record first')), |
|
4224 | 4224 | ('B', 'bookmarks', False, _('compare bookmarks')), |
|
4225 | 4225 | ('b', 'branch', [], _('a specific branch you would like to push'), |
|
4226 | 4226 | _('BRANCH')), |
|
4227 | 4227 | ] + logopts + remoteopts + subrepoopts, |
|
4228 | 4228 | _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')) |
|
4229 | 4229 | def outgoing(ui, repo, dest=None, **opts): |
|
4230 | 4230 | """show changesets not found in the destination |
|
4231 | 4231 | |
|
4232 | 4232 | Show changesets not found in the specified destination repository |
|
4233 | 4233 | or the default push location. These are the changesets that would |
|
4234 | 4234 | be pushed if a push was requested. |
|
4235 | 4235 | |
|
4236 | 4236 | See pull for details of valid destination formats. |
|
4237 | 4237 | |
|
4238 | 4238 | Returns 0 if there are outgoing changes, 1 otherwise. |
|
4239 | 4239 | """ |
|
4240 | 4240 | |
|
4241 | 4241 | if opts.get('bookmarks'): |
|
4242 | 4242 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
4243 | 4243 | dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
4244 | 4244 | other = hg.peer(repo, opts, dest) |
|
4245 | 4245 | if 'bookmarks' not in other.listkeys('namespaces'): |
|
4246 | 4246 | ui.warn(_("remote doesn't support bookmarks\n")) |
|
4247 | 4247 | return 0 |
|
4248 | 4248 | ui.status(_('comparing with %s\n') % util.hidepassword(dest)) |
|
4249 | 4249 | return bookmarks.diff(ui, other, repo) |
|
4250 | 4250 | |
|
4251 | 4251 | repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default') |
|
4252 | 4252 | try: |
|
4253 | 4253 | return hg.outgoing(ui, repo, dest, opts) |
|
4254 | 4254 | finally: |
|
4255 | 4255 | del repo._subtoppath |
|
4256 | 4256 | |
|
4257 | 4257 | @command('parents', |
|
4258 | 4258 | [('r', 'rev', '', _('show parents of the specified revision'), _('REV')), |
|
4259 | 4259 | ] + templateopts, |
|
4260 | 4260 | _('[-r REV] [FILE]')) |
|
4261 | 4261 | def parents(ui, repo, file_=None, **opts): |
|
4262 | 4262 | """show the parents of the working directory or revision |
|
4263 | 4263 | |
|
4264 | 4264 | Print the working directory's parent revisions. If a revision is |
|
4265 | 4265 | given via -r/--rev, the parent of that revision will be printed. |
|
4266 | 4266 | If a file argument is given, the revision in which the file was |
|
4267 | 4267 | last changed (before the working directory revision or the |
|
4268 | 4268 | argument to --rev if given) is printed. |
|
4269 | 4269 | |
|
4270 | 4270 | Returns 0 on success. |
|
4271 | 4271 | """ |
|
4272 | 4272 | |
|
4273 | 4273 | ctx = scmutil.revsingle(repo, opts.get('rev'), None) |
|
4274 | 4274 | |
|
4275 | 4275 | if file_: |
|
4276 | 4276 | m = scmutil.match(ctx, (file_,), opts) |
|
4277 | 4277 | if m.anypats() or len(m.files()) != 1: |
|
4278 | 4278 | raise util.Abort(_('can only specify an explicit filename')) |
|
4279 | 4279 | file_ = m.files()[0] |
|
4280 | 4280 | filenodes = [] |
|
4281 | 4281 | for cp in ctx.parents(): |
|
4282 | 4282 | if not cp: |
|
4283 | 4283 | continue |
|
4284 | 4284 | try: |
|
4285 | 4285 | filenodes.append(cp.filenode(file_)) |
|
4286 | 4286 | except error.LookupError: |
|
4287 | 4287 | pass |
|
4288 | 4288 | if not filenodes: |
|
4289 | 4289 | raise util.Abort(_("'%s' not found in manifest!") % file_) |
|
4290 | 4290 | fl = repo.file(file_) |
|
4291 | 4291 | p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes] |
|
4292 | 4292 | else: |
|
4293 | 4293 | p = [cp.node() for cp in ctx.parents()] |
|
4294 | 4294 | |
|
4295 | 4295 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
4296 | 4296 | for n in p: |
|
4297 | 4297 | if n != nullid: |
|
4298 | 4298 | displayer.show(repo[n]) |
|
4299 | 4299 | displayer.close() |
|
4300 | 4300 | |
|
4301 | 4301 | @command('paths', [], _('[NAME]')) |
|
4302 | 4302 | def paths(ui, repo, search=None): |
|
4303 | 4303 | """show aliases for remote repositories |
|
4304 | 4304 | |
|
4305 | 4305 | Show definition of symbolic path name NAME. If no name is given, |
|
4306 | 4306 | show definition of all available names. |
|
4307 | 4307 | |
|
4308 | 4308 | Option -q/--quiet suppresses all output when searching for NAME |
|
4309 | 4309 | and shows only the path names when listing all definitions. |
|
4310 | 4310 | |
|
4311 | 4311 | Path names are defined in the [paths] section of your |
|
4312 | 4312 | configuration file and in ``/etc/mercurial/hgrc``. If run inside a |
|
4313 | 4313 | repository, ``.hg/hgrc`` is used, too. |
|
4314 | 4314 | |
|
4315 | 4315 | The path names ``default`` and ``default-push`` have a special |
|
4316 | 4316 | meaning. When performing a push or pull operation, they are used |
|
4317 | 4317 | as fallbacks if no location is specified on the command-line. |
|
4318 | 4318 | When ``default-push`` is set, it will be used for push and |
|
4319 | 4319 | ``default`` will be used for pull; otherwise ``default`` is used |
|
4320 | 4320 | as the fallback for both. When cloning a repository, the clone |
|
4321 | 4321 | source is written as ``default`` in ``.hg/hgrc``. Note that |
|
4322 | 4322 | ``default`` and ``default-push`` apply to all inbound (e.g. |
|
4323 | 4323 | :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and |
|
4324 | 4324 | :hg:`bundle`) operations. |
|
4325 | 4325 | |
|
4326 | 4326 | See :hg:`help urls` for more information. |
|
4327 | 4327 | |
|
4328 | 4328 | Returns 0 on success. |
|
4329 | 4329 | """ |
|
4330 | 4330 | if search: |
|
4331 | 4331 | for name, path in ui.configitems("paths"): |
|
4332 | 4332 | if name == search: |
|
4333 | 4333 | ui.status("%s\n" % util.hidepassword(path)) |
|
4334 | 4334 | return |
|
4335 | 4335 | if not ui.quiet: |
|
4336 | 4336 | ui.warn(_("not found!\n")) |
|
4337 | 4337 | return 1 |
|
4338 | 4338 | else: |
|
4339 | 4339 | for name, path in ui.configitems("paths"): |
|
4340 | 4340 | if ui.quiet: |
|
4341 | 4341 | ui.write("%s\n" % name) |
|
4342 | 4342 | else: |
|
4343 | 4343 | ui.write("%s = %s\n" % (name, util.hidepassword(path))) |
|
4344 | 4344 | |
|
4345 | 4345 | @command('^phase', |
|
4346 | 4346 | [('p', 'public', False, _('set changeset phase to public')), |
|
4347 | 4347 | ('d', 'draft', False, _('set changeset phase to draft')), |
|
4348 | 4348 | ('s', 'secret', False, _('set changeset phase to secret')), |
|
4349 | 4349 | ('f', 'force', False, _('allow to move boundary backward')), |
|
4350 | 4350 | ('r', 'rev', [], _('target revision'), _('REV')), |
|
4351 | 4351 | ], |
|
4352 | 4352 | _('[-p|-d|-s] [-f] [-r] REV...')) |
|
4353 | 4353 | def phase(ui, repo, *revs, **opts): |
|
4354 | 4354 | """set or show the current phase name |
|
4355 | 4355 | |
|
4356 | 4356 | With no argument, show the phase name of specified revisions. |
|
4357 | 4357 | |
|
4358 | 4358 | With one of -p/--public, -d/--draft or -s/--secret, change the |
|
4359 | 4359 | phase value of the specified revisions. |
|
4360 | 4360 | |
|
4361 | 4361 | Unless -f/--force is specified, :hg:`phase` won't move changeset from a |
|
4362 | 4362 | lower phase to an higher phase. Phases are ordered as follows:: |
|
4363 | 4363 | |
|
4364 | 4364 | public < draft < secret |
|
4365 | 4365 | |
|
4366 | 4366 | Return 0 on success, 1 if no phases were changed or some could not |
|
4367 | 4367 | be changed. |
|
4368 | 4368 | """ |
|
4369 | 4369 | # search for a unique phase argument |
|
4370 | 4370 | targetphase = None |
|
4371 | 4371 | for idx, name in enumerate(phases.phasenames): |
|
4372 | 4372 | if opts[name]: |
|
4373 | 4373 | if targetphase is not None: |
|
4374 | 4374 | raise util.Abort(_('only one phase can be specified')) |
|
4375 | 4375 | targetphase = idx |
|
4376 | 4376 | |
|
4377 | 4377 | # look for specified revision |
|
4378 | 4378 | revs = list(revs) |
|
4379 | 4379 | revs.extend(opts['rev']) |
|
4380 | 4380 | if not revs: |
|
4381 | 4381 | raise util.Abort(_('no revisions specified')) |
|
4382 | 4382 | |
|
4383 | 4383 | revs = scmutil.revrange(repo, revs) |
|
4384 | 4384 | |
|
4385 | 4385 | lock = None |
|
4386 | 4386 | ret = 0 |
|
4387 | 4387 | if targetphase is None: |
|
4388 | 4388 | # display |
|
4389 | 4389 | for r in revs: |
|
4390 | 4390 | ctx = repo[r] |
|
4391 | 4391 | ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr())) |
|
4392 | 4392 | else: |
|
4393 | 4393 | lock = repo.lock() |
|
4394 | 4394 | try: |
|
4395 | 4395 | # set phase |
|
4396 | 4396 | if not revs: |
|
4397 | 4397 | raise util.Abort(_('empty revision set')) |
|
4398 | 4398 | nodes = [repo[r].node() for r in revs] |
|
4399 | 4399 | olddata = repo._phasecache.getphaserevs(repo)[:] |
|
4400 | 4400 | phases.advanceboundary(repo, targetphase, nodes) |
|
4401 | 4401 | if opts['force']: |
|
4402 | 4402 | phases.retractboundary(repo, targetphase, nodes) |
|
4403 | 4403 | finally: |
|
4404 | 4404 | lock.release() |
|
4405 | 4405 | if olddata is not None: |
|
4406 | 4406 | changes = 0 |
|
4407 | 4407 | newdata = repo._phasecache.getphaserevs(repo) |
|
4408 | 4408 | changes = sum(o != newdata[i] for i, o in enumerate(olddata)) |
|
4409 | 4409 | rejected = [n for n in nodes |
|
4410 | 4410 | if newdata[repo[n].rev()] < targetphase] |
|
4411 | 4411 | if rejected: |
|
4412 | 4412 | ui.warn(_('cannot move %i changesets to a more permissive ' |
|
4413 | 4413 | 'phase, use --force\n') % len(rejected)) |
|
4414 | 4414 | ret = 1 |
|
4415 | 4415 | if changes: |
|
4416 | 4416 | msg = _('phase changed for %i changesets\n') % changes |
|
4417 | 4417 | if ret: |
|
4418 | 4418 | ui.status(msg) |
|
4419 | 4419 | else: |
|
4420 | 4420 | ui.note(msg) |
|
4421 | 4421 | else: |
|
4422 | 4422 | ui.warn(_('no phases changed\n')) |
|
4423 | 4423 | ret = 1 |
|
4424 | 4424 | return ret |
|
4425 | 4425 | |
|
4426 | 4426 | def postincoming(ui, repo, modheads, optupdate, checkout): |
|
4427 | 4427 | if modheads == 0: |
|
4428 | 4428 | return |
|
4429 | 4429 | if optupdate: |
|
4430 | 4430 | movemarkfrom = repo['.'].node() |
|
4431 | 4431 | try: |
|
4432 | 4432 | ret = hg.update(repo, checkout) |
|
4433 | 4433 | except util.Abort, inst: |
|
4434 | 4434 | ui.warn(_("not updating: %s\n") % str(inst)) |
|
4435 | 4435 | return 0 |
|
4436 | 4436 | if not ret and not checkout: |
|
4437 | 4437 | if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): |
|
4438 | 4438 | ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent) |
|
4439 | 4439 | return ret |
|
4440 | 4440 | if modheads > 1: |
|
4441 | 4441 | currentbranchheads = len(repo.branchheads()) |
|
4442 | 4442 | if currentbranchheads == modheads: |
|
4443 | 4443 | ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) |
|
4444 | 4444 | elif currentbranchheads > 1: |
|
4445 | 4445 | ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to " |
|
4446 | 4446 | "merge)\n")) |
|
4447 | 4447 | else: |
|
4448 | 4448 | ui.status(_("(run 'hg heads' to see heads)\n")) |
|
4449 | 4449 | else: |
|
4450 | 4450 | ui.status(_("(run 'hg update' to get a working copy)\n")) |
|
4451 | 4451 | |
|
4452 | 4452 | @command('^pull', |
|
4453 | 4453 | [('u', 'update', None, |
|
4454 | 4454 | _('update to new branch head if changesets were pulled')), |
|
4455 | 4455 | ('f', 'force', None, _('run even when remote repository is unrelated')), |
|
4456 | 4456 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), |
|
4457 | 4457 | ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')), |
|
4458 | 4458 | ('b', 'branch', [], _('a specific branch you would like to pull'), |
|
4459 | 4459 | _('BRANCH')), |
|
4460 | 4460 | ] + remoteopts, |
|
4461 | 4461 | _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')) |
|
4462 | 4462 | def pull(ui, repo, source="default", **opts): |
|
4463 | 4463 | """pull changes from the specified source |
|
4464 | 4464 | |
|
4465 | 4465 | Pull changes from a remote repository to a local one. |
|
4466 | 4466 | |
|
4467 | 4467 | This finds all changes from the repository at the specified path |
|
4468 | 4468 | or URL and adds them to a local repository (the current one unless |
|
4469 | 4469 | -R is specified). By default, this does not update the copy of the |
|
4470 | 4470 | project in the working directory. |
|
4471 | 4471 | |
|
4472 | 4472 | Use :hg:`incoming` if you want to see what would have been added |
|
4473 | 4473 | by a pull at the time you issued this command. If you then decide |
|
4474 | 4474 | to add those changes to the repository, you should use :hg:`pull |
|
4475 | 4475 | -r X` where ``X`` is the last changeset listed by :hg:`incoming`. |
|
4476 | 4476 | |
|
4477 | 4477 | If SOURCE is omitted, the 'default' path will be used. |
|
4478 | 4478 | See :hg:`help urls` for more information. |
|
4479 | 4479 | |
|
4480 | 4480 | Returns 0 on success, 1 if an update had unresolved files. |
|
4481 | 4481 | """ |
|
4482 | 4482 | source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) |
|
4483 | 4483 | other = hg.peer(repo, opts, source) |
|
4484 | 4484 | ui.status(_('pulling from %s\n') % util.hidepassword(source)) |
|
4485 | 4485 | revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev')) |
|
4486 | 4486 | |
|
4487 | 4487 | if opts.get('bookmark'): |
|
4488 | 4488 | if not revs: |
|
4489 | 4489 | revs = [] |
|
4490 | 4490 | rb = other.listkeys('bookmarks') |
|
4491 | 4491 | for b in opts['bookmark']: |
|
4492 | 4492 | if b not in rb: |
|
4493 | 4493 | raise util.Abort(_('remote bookmark %s not found!') % b) |
|
4494 | 4494 | revs.append(rb[b]) |
|
4495 | 4495 | |
|
4496 | 4496 | if revs: |
|
4497 | 4497 | try: |
|
4498 | 4498 | revs = [other.lookup(rev) for rev in revs] |
|
4499 | 4499 | except error.CapabilityError: |
|
4500 | 4500 | err = _("other repository doesn't support revision lookup, " |
|
4501 | 4501 | "so a rev cannot be specified.") |
|
4502 | 4502 | raise util.Abort(err) |
|
4503 | 4503 | |
|
4504 | 4504 | modheads = repo.pull(other, heads=revs, force=opts.get('force')) |
|
4505 | 4505 | bookmarks.updatefromremote(ui, repo, other, source) |
|
4506 | 4506 | if checkout: |
|
4507 | 4507 | checkout = str(repo.changelog.rev(other.lookup(checkout))) |
|
4508 | 4508 | repo._subtoppath = source |
|
4509 | 4509 | try: |
|
4510 | 4510 | ret = postincoming(ui, repo, modheads, opts.get('update'), checkout) |
|
4511 | 4511 | |
|
4512 | 4512 | finally: |
|
4513 | 4513 | del repo._subtoppath |
|
4514 | 4514 | |
|
4515 | 4515 | # update specified bookmarks |
|
4516 | 4516 | if opts.get('bookmark'): |
|
4517 | 4517 | for b in opts['bookmark']: |
|
4518 | 4518 | # explicit pull overrides local bookmark if any |
|
4519 | 4519 | ui.status(_("importing bookmark %s\n") % b) |
|
4520 | 4520 | repo._bookmarks[b] = repo[rb[b]].node() |
|
4521 | 4521 | bookmarks.write(repo) |
|
4522 | 4522 | |
|
4523 | 4523 | return ret |
|
4524 | 4524 | |
|
4525 | 4525 | @command('^push', |
|
4526 | 4526 | [('f', 'force', None, _('force push')), |
|
4527 | 4527 | ('r', 'rev', [], |
|
4528 | 4528 | _('a changeset intended to be included in the destination'), |
|
4529 | 4529 | _('REV')), |
|
4530 | 4530 | ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')), |
|
4531 | 4531 | ('b', 'branch', [], |
|
4532 | 4532 | _('a specific branch you would like to push'), _('BRANCH')), |
|
4533 | 4533 | ('', 'new-branch', False, _('allow pushing a new branch')), |
|
4534 | 4534 | ] + remoteopts, |
|
4535 | 4535 | _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')) |
|
4536 | 4536 | def push(ui, repo, dest=None, **opts): |
|
4537 | 4537 | """push changes to the specified destination |
|
4538 | 4538 | |
|
4539 | 4539 | Push changesets from the local repository to the specified |
|
4540 | 4540 | destination. |
|
4541 | 4541 | |
|
4542 | 4542 | This operation is symmetrical to pull: it is identical to a pull |
|
4543 | 4543 | in the destination repository from the current one. |
|
4544 | 4544 | |
|
4545 | 4545 | By default, push will not allow creation of new heads at the |
|
4546 | 4546 | destination, since multiple heads would make it unclear which head |
|
4547 | 4547 | to use. In this situation, it is recommended to pull and merge |
|
4548 | 4548 | before pushing. |
|
4549 | 4549 | |
|
4550 | 4550 | Use --new-branch if you want to allow push to create a new named |
|
4551 | 4551 | branch that is not present at the destination. This allows you to |
|
4552 | 4552 | only create a new branch without forcing other changes. |
|
4553 | 4553 | |
|
4554 | 4554 | Use -f/--force to override the default behavior and push all |
|
4555 | 4555 | changesets on all branches. |
|
4556 | 4556 | |
|
4557 | 4557 | If -r/--rev is used, the specified revision and all its ancestors |
|
4558 | 4558 | will be pushed to the remote repository. |
|
4559 | 4559 | |
|
4560 | 4560 | Please see :hg:`help urls` for important details about ``ssh://`` |
|
4561 | 4561 | URLs. If DESTINATION is omitted, a default path will be used. |
|
4562 | 4562 | |
|
4563 | 4563 | Returns 0 if push was successful, 1 if nothing to push. |
|
4564 | 4564 | """ |
|
4565 | 4565 | |
|
4566 | 4566 | if opts.get('bookmark'): |
|
4567 | 4567 | for b in opts['bookmark']: |
|
4568 | 4568 | # translate -B options to -r so changesets get pushed |
|
4569 | 4569 | if b in repo._bookmarks: |
|
4570 | 4570 | opts.setdefault('rev', []).append(b) |
|
4571 | 4571 | else: |
|
4572 | 4572 | # if we try to push a deleted bookmark, translate it to null |
|
4573 | 4573 | # this lets simultaneous -r, -b options continue working |
|
4574 | 4574 | opts.setdefault('rev', []).append("null") |
|
4575 | 4575 | |
|
4576 | 4576 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
4577 | 4577 | dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
4578 | 4578 | ui.status(_('pushing to %s\n') % util.hidepassword(dest)) |
|
4579 | 4579 | revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev')) |
|
4580 | 4580 | other = hg.peer(repo, opts, dest) |
|
4581 | 4581 | if revs: |
|
4582 | 4582 | revs = [repo.lookup(rev) for rev in revs] |
|
4583 | 4583 | |
|
4584 | 4584 | repo._subtoppath = dest |
|
4585 | 4585 | try: |
|
4586 | 4586 | # push subrepos depth-first for coherent ordering |
|
4587 | 4587 | c = repo[''] |
|
4588 | 4588 | subs = c.substate # only repos that are committed |
|
4589 | 4589 | for s in sorted(subs): |
|
4590 | 4590 | if c.sub(s).push(opts) == 0: |
|
4591 | 4591 | return False |
|
4592 | 4592 | finally: |
|
4593 | 4593 | del repo._subtoppath |
|
4594 | 4594 | result = repo.push(other, opts.get('force'), revs=revs, |
|
4595 | 4595 | newbranch=opts.get('new_branch')) |
|
4596 | 4596 | |
|
4597 | 4597 | result = not result |
|
4598 | 4598 | |
|
4599 | 4599 | if opts.get('bookmark'): |
|
4600 | 4600 | rb = other.listkeys('bookmarks') |
|
4601 | 4601 | for b in opts['bookmark']: |
|
4602 | 4602 | # explicit push overrides remote bookmark if any |
|
4603 | 4603 | if b in repo._bookmarks: |
|
4604 | 4604 | ui.status(_("exporting bookmark %s\n") % b) |
|
4605 | 4605 | new = repo[b].hex() |
|
4606 | 4606 | elif b in rb: |
|
4607 | 4607 | ui.status(_("deleting remote bookmark %s\n") % b) |
|
4608 | 4608 | new = '' # delete |
|
4609 | 4609 | else: |
|
4610 | 4610 | ui.warn(_('bookmark %s does not exist on the local ' |
|
4611 | 4611 | 'or remote repository!\n') % b) |
|
4612 | 4612 | return 2 |
|
4613 | 4613 | old = rb.get(b, '') |
|
4614 | 4614 | r = other.pushkey('bookmarks', b, old, new) |
|
4615 | 4615 | if not r: |
|
4616 | 4616 | ui.warn(_('updating bookmark %s failed!\n') % b) |
|
4617 | 4617 | if not result: |
|
4618 | 4618 | result = 2 |
|
4619 | 4619 | |
|
4620 | 4620 | return result |
|
4621 | 4621 | |
|
4622 | 4622 | @command('recover', []) |
|
4623 | 4623 | def recover(ui, repo): |
|
4624 | 4624 | """roll back an interrupted transaction |
|
4625 | 4625 | |
|
4626 | 4626 | Recover from an interrupted commit or pull. |
|
4627 | 4627 | |
|
4628 | 4628 | This command tries to fix the repository status after an |
|
4629 | 4629 | interrupted operation. It should only be necessary when Mercurial |
|
4630 | 4630 | suggests it. |
|
4631 | 4631 | |
|
4632 | 4632 | Returns 0 if successful, 1 if nothing to recover or verify fails. |
|
4633 | 4633 | """ |
|
4634 | 4634 | if repo.recover(): |
|
4635 | 4635 | return hg.verify(repo) |
|
4636 | 4636 | return 1 |
|
4637 | 4637 | |
|
4638 | 4638 | @command('^remove|rm', |
|
4639 | 4639 | [('A', 'after', None, _('record delete for missing files')), |
|
4640 | 4640 | ('f', 'force', None, |
|
4641 | 4641 | _('remove (and delete) file even if added or modified')), |
|
4642 | 4642 | ] + walkopts, |
|
4643 | 4643 | _('[OPTION]... FILE...')) |
|
4644 | 4644 | def remove(ui, repo, *pats, **opts): |
|
4645 | 4645 | """remove the specified files on the next commit |
|
4646 | 4646 | |
|
4647 | 4647 | Schedule the indicated files for removal from the current branch. |
|
4648 | 4648 | |
|
4649 | 4649 | This command schedules the files to be removed at the next commit. |
|
4650 | 4650 | To undo a remove before that, see :hg:`revert`. To undo added |
|
4651 | 4651 | files, see :hg:`forget`. |
|
4652 | 4652 | |
|
4653 | 4653 | .. container:: verbose |
|
4654 | 4654 | |
|
4655 | 4655 | -A/--after can be used to remove only files that have already |
|
4656 | 4656 | been deleted, -f/--force can be used to force deletion, and -Af |
|
4657 | 4657 | can be used to remove files from the next revision without |
|
4658 | 4658 | deleting them from the working directory. |
|
4659 | 4659 | |
|
4660 | 4660 | The following table details the behavior of remove for different |
|
4661 | 4661 | file states (columns) and option combinations (rows). The file |
|
4662 | 4662 | states are Added [A], Clean [C], Modified [M] and Missing [!] |
|
4663 | 4663 | (as reported by :hg:`status`). The actions are Warn, Remove |
|
4664 | 4664 | (from branch) and Delete (from disk): |
|
4665 | 4665 | |
|
4666 | 4666 | ======= == == == == |
|
4667 | 4667 | A C M ! |
|
4668 | 4668 | ======= == == == == |
|
4669 | 4669 | none W RD W R |
|
4670 | 4670 | -f R RD RD R |
|
4671 | 4671 | -A W W W R |
|
4672 | 4672 | -Af R R R R |
|
4673 | 4673 | ======= == == == == |
|
4674 | 4674 | |
|
4675 | 4675 | Note that remove never deletes files in Added [A] state from the |
|
4676 | 4676 | working directory, not even if option --force is specified. |
|
4677 | 4677 | |
|
4678 | 4678 | Returns 0 on success, 1 if any warnings encountered. |
|
4679 | 4679 | """ |
|
4680 | 4680 | |
|
4681 | 4681 | ret = 0 |
|
4682 | 4682 | after, force = opts.get('after'), opts.get('force') |
|
4683 | 4683 | if not pats and not after: |
|
4684 | 4684 | raise util.Abort(_('no files specified')) |
|
4685 | 4685 | |
|
4686 | 4686 | m = scmutil.match(repo[None], pats, opts) |
|
4687 | 4687 | s = repo.status(match=m, clean=True) |
|
4688 | 4688 | modified, added, deleted, clean = s[0], s[1], s[3], s[6] |
|
4689 | 4689 | |
|
4690 | 4690 | for f in m.files(): |
|
4691 | 4691 | if f not in repo.dirstate and not os.path.isdir(m.rel(f)): |
|
4692 | 4692 | if os.path.exists(m.rel(f)): |
|
4693 | 4693 | ui.warn(_('not removing %s: file is untracked\n') % m.rel(f)) |
|
4694 | 4694 | ret = 1 |
|
4695 | 4695 | |
|
4696 | 4696 | if force: |
|
4697 | 4697 | list = modified + deleted + clean + added |
|
4698 | 4698 | elif after: |
|
4699 | 4699 | list = deleted |
|
4700 | 4700 | for f in modified + added + clean: |
|
4701 | 4701 | ui.warn(_('not removing %s: file still exists (use -f' |
|
4702 | 4702 | ' to force removal)\n') % m.rel(f)) |
|
4703 | 4703 | ret = 1 |
|
4704 | 4704 | else: |
|
4705 | 4705 | list = deleted + clean |
|
4706 | 4706 | for f in modified: |
|
4707 | 4707 | ui.warn(_('not removing %s: file is modified (use -f' |
|
4708 | 4708 | ' to force removal)\n') % m.rel(f)) |
|
4709 | 4709 | ret = 1 |
|
4710 | 4710 | for f in added: |
|
4711 | 4711 | ui.warn(_('not removing %s: file has been marked for add' |
|
4712 | 4712 | ' (use forget to undo)\n') % m.rel(f)) |
|
4713 | 4713 | ret = 1 |
|
4714 | 4714 | |
|
4715 | 4715 | for f in sorted(list): |
|
4716 | 4716 | if ui.verbose or not m.exact(f): |
|
4717 | 4717 | ui.status(_('removing %s\n') % m.rel(f)) |
|
4718 | 4718 | |
|
4719 | 4719 | wlock = repo.wlock() |
|
4720 | 4720 | try: |
|
4721 | 4721 | if not after: |
|
4722 | 4722 | for f in list: |
|
4723 | 4723 | if f in added: |
|
4724 | 4724 | continue # we never unlink added files on remove |
|
4725 | 4725 | try: |
|
4726 | 4726 | util.unlinkpath(repo.wjoin(f)) |
|
4727 | 4727 | except OSError, inst: |
|
4728 | 4728 | if inst.errno != errno.ENOENT: |
|
4729 | 4729 | raise |
|
4730 | 4730 | repo[None].forget(list) |
|
4731 | 4731 | finally: |
|
4732 | 4732 | wlock.release() |
|
4733 | 4733 | |
|
4734 | 4734 | return ret |
|
4735 | 4735 | |
|
4736 | 4736 | @command('rename|move|mv', |
|
4737 | 4737 | [('A', 'after', None, _('record a rename that has already occurred')), |
|
4738 | 4738 | ('f', 'force', None, _('forcibly copy over an existing managed file')), |
|
4739 | 4739 | ] + walkopts + dryrunopts, |
|
4740 | 4740 | _('[OPTION]... SOURCE... DEST')) |
|
4741 | 4741 | def rename(ui, repo, *pats, **opts): |
|
4742 | 4742 | """rename files; equivalent of copy + remove |
|
4743 | 4743 | |
|
4744 | 4744 | Mark dest as copies of sources; mark sources for deletion. If dest |
|
4745 | 4745 | is a directory, copies are put in that directory. If dest is a |
|
4746 | 4746 | file, there can only be one source. |
|
4747 | 4747 | |
|
4748 | 4748 | By default, this command copies the contents of files as they |
|
4749 | 4749 | exist in the working directory. If invoked with -A/--after, the |
|
4750 | 4750 | operation is recorded, but no copying is performed. |
|
4751 | 4751 | |
|
4752 | 4752 | This command takes effect at the next commit. To undo a rename |
|
4753 | 4753 | before that, see :hg:`revert`. |
|
4754 | 4754 | |
|
4755 | 4755 | Returns 0 on success, 1 if errors are encountered. |
|
4756 | 4756 | """ |
|
4757 | 4757 | wlock = repo.wlock(False) |
|
4758 | 4758 | try: |
|
4759 | 4759 | return cmdutil.copy(ui, repo, pats, opts, rename=True) |
|
4760 | 4760 | finally: |
|
4761 | 4761 | wlock.release() |
|
4762 | 4762 | |
|
4763 | 4763 | @command('resolve', |
|
4764 | 4764 | [('a', 'all', None, _('select all unresolved files')), |
|
4765 | 4765 | ('l', 'list', None, _('list state of files needing merge')), |
|
4766 | 4766 | ('m', 'mark', None, _('mark files as resolved')), |
|
4767 | 4767 | ('u', 'unmark', None, _('mark files as unresolved')), |
|
4768 | 4768 | ('n', 'no-status', None, _('hide status prefix'))] |
|
4769 | 4769 | + mergetoolopts + walkopts, |
|
4770 | 4770 | _('[OPTION]... [FILE]...')) |
|
4771 | 4771 | def resolve(ui, repo, *pats, **opts): |
|
4772 | 4772 | """redo merges or set/view the merge status of files |
|
4773 | 4773 | |
|
4774 | 4774 | Merges with unresolved conflicts are often the result of |
|
4775 | 4775 | non-interactive merging using the ``internal:merge`` configuration |
|
4776 | 4776 | setting, or a command-line merge tool like ``diff3``. The resolve |
|
4777 | 4777 | command is used to manage the files involved in a merge, after |
|
4778 | 4778 | :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the |
|
4779 | 4779 | working directory must have two parents). See :hg:`help |
|
4780 | 4780 | merge-tools` for information on configuring merge tools. |
|
4781 | 4781 | |
|
4782 | 4782 | The resolve command can be used in the following ways: |
|
4783 | 4783 | |
|
4784 | 4784 | - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified |
|
4785 | 4785 | files, discarding any previous merge attempts. Re-merging is not |
|
4786 | 4786 | performed for files already marked as resolved. Use ``--all/-a`` |
|
4787 | 4787 | to select all unresolved files. ``--tool`` can be used to specify |
|
4788 | 4788 | the merge tool used for the given files. It overrides the HGMERGE |
|
4789 | 4789 | environment variable and your configuration files. Previous file |
|
4790 | 4790 | contents are saved with a ``.orig`` suffix. |
|
4791 | 4791 | |
|
4792 | 4792 | - :hg:`resolve -m [FILE]`: mark a file as having been resolved |
|
4793 | 4793 | (e.g. after having manually fixed-up the files). The default is |
|
4794 | 4794 | to mark all unresolved files. |
|
4795 | 4795 | |
|
4796 | 4796 | - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The |
|
4797 | 4797 | default is to mark all resolved files. |
|
4798 | 4798 | |
|
4799 | 4799 | - :hg:`resolve -l`: list files which had or still have conflicts. |
|
4800 | 4800 | In the printed list, ``U`` = unresolved and ``R`` = resolved. |
|
4801 | 4801 | |
|
4802 | 4802 | Note that Mercurial will not let you commit files with unresolved |
|
4803 | 4803 | merge conflicts. You must use :hg:`resolve -m ...` before you can |
|
4804 | 4804 | commit after a conflicting merge. |
|
4805 | 4805 | |
|
4806 | 4806 | Returns 0 on success, 1 if any files fail a resolve attempt. |
|
4807 | 4807 | """ |
|
4808 | 4808 | |
|
4809 | 4809 | all, mark, unmark, show, nostatus = \ |
|
4810 | 4810 | [opts.get(o) for o in 'all mark unmark list no_status'.split()] |
|
4811 | 4811 | |
|
4812 | 4812 | if (show and (mark or unmark)) or (mark and unmark): |
|
4813 | 4813 | raise util.Abort(_("too many options specified")) |
|
4814 | 4814 | if pats and all: |
|
4815 | 4815 | raise util.Abort(_("can't specify --all and patterns")) |
|
4816 | 4816 | if not (all or pats or show or mark or unmark): |
|
4817 | 4817 | raise util.Abort(_('no files or directories specified; ' |
|
4818 | 4818 | 'use --all to remerge all files')) |
|
4819 | 4819 | |
|
4820 | 4820 | ms = mergemod.mergestate(repo) |
|
4821 | 4821 | m = scmutil.match(repo[None], pats, opts) |
|
4822 | 4822 | ret = 0 |
|
4823 | 4823 | |
|
4824 | 4824 | for f in ms: |
|
4825 | 4825 | if m(f): |
|
4826 | 4826 | if show: |
|
4827 | 4827 | if nostatus: |
|
4828 | 4828 | ui.write("%s\n" % f) |
|
4829 | 4829 | else: |
|
4830 | 4830 | ui.write("%s %s\n" % (ms[f].upper(), f), |
|
4831 | 4831 | label='resolve.' + |
|
4832 | 4832 | {'u': 'unresolved', 'r': 'resolved'}[ms[f]]) |
|
4833 | 4833 | elif mark: |
|
4834 | 4834 | ms.mark(f, "r") |
|
4835 | 4835 | elif unmark: |
|
4836 | 4836 | ms.mark(f, "u") |
|
4837 | 4837 | else: |
|
4838 | 4838 | wctx = repo[None] |
|
4839 | 4839 | mctx = wctx.parents()[-1] |
|
4840 | 4840 | |
|
4841 | 4841 | # backup pre-resolve (merge uses .orig for its own purposes) |
|
4842 | 4842 | a = repo.wjoin(f) |
|
4843 | 4843 | util.copyfile(a, a + ".resolve") |
|
4844 | 4844 | |
|
4845 | 4845 | try: |
|
4846 | 4846 | # resolve file |
|
4847 | 4847 | ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |
|
4848 | 4848 | if ms.resolve(f, wctx, mctx): |
|
4849 | 4849 | ret = 1 |
|
4850 | 4850 | finally: |
|
4851 | 4851 | ui.setconfig('ui', 'forcemerge', '') |
|
4852 | 4852 | |
|
4853 | 4853 | # replace filemerge's .orig file with our resolve file |
|
4854 | 4854 | util.rename(a + ".resolve", a + ".orig") |
|
4855 | 4855 | |
|
4856 | 4856 | ms.commit() |
|
4857 | 4857 | return ret |
|
4858 | 4858 | |
|
4859 | 4859 | @command('revert', |
|
4860 | 4860 | [('a', 'all', None, _('revert all changes when no arguments given')), |
|
4861 | 4861 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), |
|
4862 | 4862 | ('r', 'rev', '', _('revert to the specified revision'), _('REV')), |
|
4863 | 4863 | ('C', 'no-backup', None, _('do not save backup copies of files')), |
|
4864 | 4864 | ] + walkopts + dryrunopts, |
|
4865 | 4865 | _('[OPTION]... [-r REV] [NAME]...')) |
|
4866 | 4866 | def revert(ui, repo, *pats, **opts): |
|
4867 | 4867 | """restore files to their checkout state |
|
4868 | 4868 | |
|
4869 | 4869 | .. note:: |
|
4870 | 4870 | To check out earlier revisions, you should use :hg:`update REV`. |
|
4871 | 4871 | To cancel a merge (and lose your changes), use :hg:`update --clean .`. |
|
4872 | 4872 | |
|
4873 | 4873 | With no revision specified, revert the specified files or directories |
|
4874 | 4874 | to the contents they had in the parent of the working directory. |
|
4875 | 4875 | This restores the contents of files to an unmodified |
|
4876 | 4876 | state and unschedules adds, removes, copies, and renames. If the |
|
4877 | 4877 | working directory has two parents, you must explicitly specify a |
|
4878 | 4878 | revision. |
|
4879 | 4879 | |
|
4880 | 4880 | Using the -r/--rev or -d/--date options, revert the given files or |
|
4881 | 4881 | directories to their states as of a specific revision. Because |
|
4882 | 4882 | revert does not change the working directory parents, this will |
|
4883 | 4883 | cause these files to appear modified. This can be helpful to "back |
|
4884 | 4884 | out" some or all of an earlier change. See :hg:`backout` for a |
|
4885 | 4885 | related method. |
|
4886 | 4886 | |
|
4887 | 4887 | Modified files are saved with a .orig suffix before reverting. |
|
4888 | 4888 | To disable these backups, use --no-backup. |
|
4889 | 4889 | |
|
4890 | 4890 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
4891 | 4891 | |
|
4892 | 4892 | Returns 0 on success. |
|
4893 | 4893 | """ |
|
4894 | 4894 | |
|
4895 | 4895 | if opts.get("date"): |
|
4896 | 4896 | if opts.get("rev"): |
|
4897 | 4897 | raise util.Abort(_("you can't specify a revision and a date")) |
|
4898 | 4898 | opts["rev"] = cmdutil.finddate(ui, repo, opts["date"]) |
|
4899 | 4899 | |
|
4900 | 4900 | parent, p2 = repo.dirstate.parents() |
|
4901 | 4901 | if not opts.get('rev') and p2 != nullid: |
|
4902 | 4902 | # revert after merge is a trap for new users (issue2915) |
|
4903 | 4903 | raise util.Abort(_('uncommitted merge with no revision specified'), |
|
4904 | 4904 | hint=_('use "hg update" or see "hg help revert"')) |
|
4905 | 4905 | |
|
4906 | 4906 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
4907 | 4907 | |
|
4908 | 4908 | if not pats and not opts.get('all'): |
|
4909 | 4909 | msg = _("no files or directories specified") |
|
4910 | 4910 | if p2 != nullid: |
|
4911 | 4911 | hint = _("uncommitted merge, use --all to discard all changes," |
|
4912 | 4912 | " or 'hg update -C .' to abort the merge") |
|
4913 | 4913 | raise util.Abort(msg, hint=hint) |
|
4914 | 4914 | dirty = util.any(repo.status()) |
|
4915 | 4915 | node = ctx.node() |
|
4916 | 4916 | if node != parent: |
|
4917 | 4917 | if dirty: |
|
4918 | 4918 | hint = _("uncommitted changes, use --all to discard all" |
|
4919 | 4919 | " changes, or 'hg update %s' to update") % ctx.rev() |
|
4920 | 4920 | else: |
|
4921 | 4921 | hint = _("use --all to revert all files," |
|
4922 | 4922 | " or 'hg update %s' to update") % ctx.rev() |
|
4923 | 4923 | elif dirty: |
|
4924 | 4924 | hint = _("uncommitted changes, use --all to discard all changes") |
|
4925 | 4925 | else: |
|
4926 | 4926 | hint = _("use --all to revert all files") |
|
4927 | 4927 | raise util.Abort(msg, hint=hint) |
|
4928 | 4928 | |
|
4929 | 4929 | return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts) |
|
4930 | 4930 | |
|
4931 | 4931 | @command('rollback', dryrunopts + |
|
4932 | 4932 | [('f', 'force', False, _('ignore safety measures'))]) |
|
4933 | 4933 | def rollback(ui, repo, **opts): |
|
4934 | 4934 | """roll back the last transaction (dangerous) |
|
4935 | 4935 | |
|
4936 | 4936 | This command should be used with care. There is only one level of |
|
4937 | 4937 | rollback, and there is no way to undo a rollback. It will also |
|
4938 | 4938 | restore the dirstate at the time of the last transaction, losing |
|
4939 | 4939 | any dirstate changes since that time. This command does not alter |
|
4940 | 4940 | the working directory. |
|
4941 | 4941 | |
|
4942 | 4942 | Transactions are used to encapsulate the effects of all commands |
|
4943 | 4943 | that create new changesets or propagate existing changesets into a |
|
4944 | 4944 | repository. For example, the following commands are transactional, |
|
4945 | 4945 | and their effects can be rolled back: |
|
4946 | 4946 | |
|
4947 | 4947 | - commit |
|
4948 | 4948 | - import |
|
4949 | 4949 | - pull |
|
4950 | 4950 | - push (with this repository as the destination) |
|
4951 | 4951 | - unbundle |
|
4952 | 4952 | |
|
4953 | 4953 | To avoid permanent data loss, rollback will refuse to rollback a |
|
4954 | 4954 | commit transaction if it isn't checked out. Use --force to |
|
4955 | 4955 | override this protection. |
|
4956 | 4956 | |
|
4957 | 4957 | This command is not intended for use on public repositories. Once |
|
4958 | 4958 | changes are visible for pull by other users, rolling a transaction |
|
4959 | 4959 | back locally is ineffective (someone else may already have pulled |
|
4960 | 4960 | the changes). Furthermore, a race is possible with readers of the |
|
4961 | 4961 | repository; for example an in-progress pull from the repository |
|
4962 | 4962 | may fail if a rollback is performed. |
|
4963 | 4963 | |
|
4964 | 4964 | Returns 0 on success, 1 if no rollback data is available. |
|
4965 | 4965 | """ |
|
4966 | 4966 | return repo.rollback(dryrun=opts.get('dry_run'), |
|
4967 | 4967 | force=opts.get('force')) |
|
4968 | 4968 | |
|
4969 | 4969 | @command('root', []) |
|
4970 | 4970 | def root(ui, repo): |
|
4971 | 4971 | """print the root (top) of the current working directory |
|
4972 | 4972 | |
|
4973 | 4973 | Print the root directory of the current repository. |
|
4974 | 4974 | |
|
4975 | 4975 | Returns 0 on success. |
|
4976 | 4976 | """ |
|
4977 | 4977 | ui.write(repo.root + "\n") |
|
4978 | 4978 | |
|
4979 | 4979 | @command('^serve', |
|
4980 | 4980 | [('A', 'accesslog', '', _('name of access log file to write to'), |
|
4981 | 4981 | _('FILE')), |
|
4982 | 4982 | ('d', 'daemon', None, _('run server in background')), |
|
4983 | 4983 | ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')), |
|
4984 | 4984 | ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')), |
|
4985 | 4985 | # use string type, then we can check if something was passed |
|
4986 | 4986 | ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')), |
|
4987 | 4987 | ('a', 'address', '', _('address to listen on (default: all interfaces)'), |
|
4988 | 4988 | _('ADDR')), |
|
4989 | 4989 | ('', 'prefix', '', _('prefix path to serve from (default: server root)'), |
|
4990 | 4990 | _('PREFIX')), |
|
4991 | 4991 | ('n', 'name', '', |
|
4992 | 4992 | _('name to show in web pages (default: working directory)'), _('NAME')), |
|
4993 | 4993 | ('', 'web-conf', '', |
|
4994 | 4994 | _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')), |
|
4995 | 4995 | ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'), |
|
4996 | 4996 | _('FILE')), |
|
4997 | 4997 | ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')), |
|
4998 | 4998 | ('', 'stdio', None, _('for remote clients')), |
|
4999 | 4999 | ('', 'cmdserver', '', _('for remote clients'), _('MODE')), |
|
5000 | 5000 | ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')), |
|
5001 | 5001 | ('', 'style', '', _('template style to use'), _('STYLE')), |
|
5002 | 5002 | ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')), |
|
5003 | 5003 | ('', 'certificate', '', _('SSL certificate file'), _('FILE'))], |
|
5004 | 5004 | _('[OPTION]...')) |
|
5005 | 5005 | def serve(ui, repo, **opts): |
|
5006 | 5006 | """start stand-alone webserver |
|
5007 | 5007 | |
|
5008 | 5008 | Start a local HTTP repository browser and pull server. You can use |
|
5009 | 5009 | this for ad-hoc sharing and browsing of repositories. It is |
|
5010 | 5010 | recommended to use a real web server to serve a repository for |
|
5011 | 5011 | longer periods of time. |
|
5012 | 5012 | |
|
5013 | 5013 | Please note that the server does not implement access control. |
|
5014 | 5014 | This means that, by default, anybody can read from the server and |
|
5015 | 5015 | nobody can write to it by default. Set the ``web.allow_push`` |
|
5016 | 5016 | option to ``*`` to allow everybody to push to the server. You |
|
5017 | 5017 | should use a real web server if you need to authenticate users. |
|
5018 | 5018 | |
|
5019 | 5019 | By default, the server logs accesses to stdout and errors to |
|
5020 | 5020 | stderr. Use the -A/--accesslog and -E/--errorlog options to log to |
|
5021 | 5021 | files. |
|
5022 | 5022 | |
|
5023 | 5023 | To have the server choose a free port number to listen on, specify |
|
5024 | 5024 | a port number of 0; in this case, the server will print the port |
|
5025 | 5025 | number it uses. |
|
5026 | 5026 | |
|
5027 | 5027 | Returns 0 on success. |
|
5028 | 5028 | """ |
|
5029 | 5029 | |
|
5030 | 5030 | if opts["stdio"] and opts["cmdserver"]: |
|
5031 | 5031 | raise util.Abort(_("cannot use --stdio with --cmdserver")) |
|
5032 | 5032 | |
|
5033 | 5033 | def checkrepo(): |
|
5034 | 5034 | if repo is None: |
|
5035 | 5035 | raise error.RepoError(_("There is no Mercurial repository here" |
|
5036 | 5036 | " (.hg not found)")) |
|
5037 | 5037 | |
|
5038 | 5038 | if opts["stdio"]: |
|
5039 | 5039 | checkrepo() |
|
5040 | 5040 | s = sshserver.sshserver(ui, repo) |
|
5041 | 5041 | s.serve_forever() |
|
5042 | 5042 | |
|
5043 | 5043 | if opts["cmdserver"]: |
|
5044 | 5044 | checkrepo() |
|
5045 | 5045 | s = commandserver.server(ui, repo, opts["cmdserver"]) |
|
5046 | 5046 | return s.serve() |
|
5047 | 5047 | |
|
5048 | 5048 | # this way we can check if something was given in the command-line |
|
5049 | 5049 | if opts.get('port'): |
|
5050 | 5050 | opts['port'] = util.getport(opts.get('port')) |
|
5051 | 5051 | |
|
5052 | 5052 | baseui = repo and repo.baseui or ui |
|
5053 | 5053 | optlist = ("name templates style address port prefix ipv6" |
|
5054 | 5054 | " accesslog errorlog certificate encoding") |
|
5055 | 5055 | for o in optlist.split(): |
|
5056 | 5056 | val = opts.get(o, '') |
|
5057 | 5057 | if val in (None, ''): # should check against default options instead |
|
5058 | 5058 | continue |
|
5059 | 5059 | baseui.setconfig("web", o, val) |
|
5060 | 5060 | if repo and repo.ui != baseui: |
|
5061 | 5061 | repo.ui.setconfig("web", o, val) |
|
5062 | 5062 | |
|
5063 | 5063 | o = opts.get('web_conf') or opts.get('webdir_conf') |
|
5064 | 5064 | if not o: |
|
5065 | 5065 | if not repo: |
|
5066 | 5066 | raise error.RepoError(_("There is no Mercurial repository" |
|
5067 | 5067 | " here (.hg not found)")) |
|
5068 | 5068 | o = repo.root |
|
5069 | 5069 | |
|
5070 | 5070 | app = hgweb.hgweb(o, baseui=ui) |
|
5071 | 5071 | |
|
5072 | 5072 | class service(object): |
|
5073 | 5073 | def init(self): |
|
5074 | 5074 | util.setsignalhandler() |
|
5075 | 5075 | self.httpd = hgweb.server.create_server(ui, app) |
|
5076 | 5076 | |
|
5077 | 5077 | if opts['port'] and not ui.verbose: |
|
5078 | 5078 | return |
|
5079 | 5079 | |
|
5080 | 5080 | if self.httpd.prefix: |
|
5081 | 5081 | prefix = self.httpd.prefix.strip('/') + '/' |
|
5082 | 5082 | else: |
|
5083 | 5083 | prefix = '' |
|
5084 | 5084 | |
|
5085 | 5085 | port = ':%d' % self.httpd.port |
|
5086 | 5086 | if port == ':80': |
|
5087 | 5087 | port = '' |
|
5088 | 5088 | |
|
5089 | 5089 | bindaddr = self.httpd.addr |
|
5090 | 5090 | if bindaddr == '0.0.0.0': |
|
5091 | 5091 | bindaddr = '*' |
|
5092 | 5092 | elif ':' in bindaddr: # IPv6 |
|
5093 | 5093 | bindaddr = '[%s]' % bindaddr |
|
5094 | 5094 | |
|
5095 | 5095 | fqaddr = self.httpd.fqaddr |
|
5096 | 5096 | if ':' in fqaddr: |
|
5097 | 5097 | fqaddr = '[%s]' % fqaddr |
|
5098 | 5098 | if opts['port']: |
|
5099 | 5099 | write = ui.status |
|
5100 | 5100 | else: |
|
5101 | 5101 | write = ui.write |
|
5102 | 5102 | write(_('listening at http://%s%s/%s (bound to %s:%d)\n') % |
|
5103 | 5103 | (fqaddr, port, prefix, bindaddr, self.httpd.port)) |
|
5104 | 5104 | |
|
5105 | 5105 | def run(self): |
|
5106 | 5106 | self.httpd.serve_forever() |
|
5107 | 5107 | |
|
5108 | 5108 | service = service() |
|
5109 | 5109 | |
|
5110 | 5110 | cmdutil.service(opts, initfn=service.init, runfn=service.run) |
|
5111 | 5111 | |
|
5112 | 5112 | @command('showconfig|debugconfig', |
|
5113 | 5113 | [('u', 'untrusted', None, _('show untrusted configuration options'))], |
|
5114 | 5114 | _('[-u] [NAME]...')) |
|
5115 | 5115 | def showconfig(ui, repo, *values, **opts): |
|
5116 | 5116 | """show combined config settings from all hgrc files |
|
5117 | 5117 | |
|
5118 | 5118 | With no arguments, print names and values of all config items. |
|
5119 | 5119 | |
|
5120 | 5120 | With one argument of the form section.name, print just the value |
|
5121 | 5121 | of that config item. |
|
5122 | 5122 | |
|
5123 | 5123 | With multiple arguments, print names and values of all config |
|
5124 | 5124 | items with matching section names. |
|
5125 | 5125 | |
|
5126 | 5126 | With --debug, the source (filename and line number) is printed |
|
5127 | 5127 | for each config item. |
|
5128 | 5128 | |
|
5129 | 5129 | Returns 0 on success. |
|
5130 | 5130 | """ |
|
5131 | 5131 | |
|
5132 | 5132 | for f in scmutil.rcpath(): |
|
5133 | 5133 | ui.debug('read config from: %s\n' % f) |
|
5134 | 5134 | untrusted = bool(opts.get('untrusted')) |
|
5135 | 5135 | if values: |
|
5136 | 5136 | sections = [v for v in values if '.' not in v] |
|
5137 | 5137 | items = [v for v in values if '.' in v] |
|
5138 | 5138 | if len(items) > 1 or items and sections: |
|
5139 | 5139 | raise util.Abort(_('only one config item permitted')) |
|
5140 | 5140 | for section, name, value in ui.walkconfig(untrusted=untrusted): |
|
5141 | 5141 | value = str(value).replace('\n', '\\n') |
|
5142 | 5142 | sectname = section + '.' + name |
|
5143 | 5143 | if values: |
|
5144 | 5144 | for v in values: |
|
5145 | 5145 | if v == section: |
|
5146 | 5146 | ui.debug('%s: ' % |
|
5147 | 5147 | ui.configsource(section, name, untrusted)) |
|
5148 | 5148 | ui.write('%s=%s\n' % (sectname, value)) |
|
5149 | 5149 | elif v == sectname: |
|
5150 | 5150 | ui.debug('%s: ' % |
|
5151 | 5151 | ui.configsource(section, name, untrusted)) |
|
5152 | 5152 | ui.write(value, '\n') |
|
5153 | 5153 | else: |
|
5154 | 5154 | ui.debug('%s: ' % |
|
5155 | 5155 | ui.configsource(section, name, untrusted)) |
|
5156 | 5156 | ui.write('%s=%s\n' % (sectname, value)) |
|
5157 | 5157 | |
|
5158 | 5158 | @command('^status|st', |
|
5159 | 5159 | [('A', 'all', None, _('show status of all files')), |
|
5160 | 5160 | ('m', 'modified', None, _('show only modified files')), |
|
5161 | 5161 | ('a', 'added', None, _('show only added files')), |
|
5162 | 5162 | ('r', 'removed', None, _('show only removed files')), |
|
5163 | 5163 | ('d', 'deleted', None, _('show only deleted (but tracked) files')), |
|
5164 | 5164 | ('c', 'clean', None, _('show only files without changes')), |
|
5165 | 5165 | ('u', 'unknown', None, _('show only unknown (not tracked) files')), |
|
5166 | 5166 | ('i', 'ignored', None, _('show only ignored files')), |
|
5167 | 5167 | ('n', 'no-status', None, _('hide status prefix')), |
|
5168 | 5168 | ('C', 'copies', None, _('show source of copied files')), |
|
5169 | 5169 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), |
|
5170 | 5170 | ('', 'rev', [], _('show difference from revision'), _('REV')), |
|
5171 | 5171 | ('', 'change', '', _('list the changed files of a revision'), _('REV')), |
|
5172 | 5172 | ] + walkopts + subrepoopts, |
|
5173 | 5173 | _('[OPTION]... [FILE]...')) |
|
5174 | 5174 | def status(ui, repo, *pats, **opts): |
|
5175 | 5175 | """show changed files in the working directory |
|
5176 | 5176 | |
|
5177 | 5177 | Show status of files in the repository. If names are given, only |
|
5178 | 5178 | files that match are shown. Files that are clean or ignored or |
|
5179 | 5179 | the source of a copy/move operation, are not listed unless |
|
5180 | 5180 | -c/--clean, -i/--ignored, -C/--copies or -A/--all are given. |
|
5181 | 5181 | Unless options described with "show only ..." are given, the |
|
5182 | 5182 | options -mardu are used. |
|
5183 | 5183 | |
|
5184 | 5184 | Option -q/--quiet hides untracked (unknown and ignored) files |
|
5185 | 5185 | unless explicitly requested with -u/--unknown or -i/--ignored. |
|
5186 | 5186 | |
|
5187 | 5187 | .. note:: |
|
5188 | 5188 | status may appear to disagree with diff if permissions have |
|
5189 | 5189 | changed or a merge has occurred. The standard diff format does |
|
5190 | 5190 | not report permission changes and diff only reports changes |
|
5191 | 5191 | relative to one merge parent. |
|
5192 | 5192 | |
|
5193 | 5193 | If one revision is given, it is used as the base revision. |
|
5194 | 5194 | If two revisions are given, the differences between them are |
|
5195 | 5195 | shown. The --change option can also be used as a shortcut to list |
|
5196 | 5196 | the changed files of a revision from its first parent. |
|
5197 | 5197 | |
|
5198 | 5198 | The codes used to show the status of files are:: |
|
5199 | 5199 | |
|
5200 | 5200 | M = modified |
|
5201 | 5201 | A = added |
|
5202 | 5202 | R = removed |
|
5203 | 5203 | C = clean |
|
5204 | 5204 | ! = missing (deleted by non-hg command, but still tracked) |
|
5205 | 5205 | ? = not tracked |
|
5206 | 5206 | I = ignored |
|
5207 | 5207 | = origin of the previous file listed as A (added) |
|
5208 | 5208 | |
|
5209 | 5209 | .. container:: verbose |
|
5210 | 5210 | |
|
5211 | 5211 | Examples: |
|
5212 | 5212 | |
|
5213 | 5213 | - show changes in the working directory relative to a |
|
5214 | 5214 | changeset:: |
|
5215 | 5215 | |
|
5216 | 5216 | hg status --rev 9353 |
|
5217 | 5217 | |
|
5218 | 5218 | - show all changes including copies in an existing changeset:: |
|
5219 | 5219 | |
|
5220 | 5220 | hg status --copies --change 9353 |
|
5221 | 5221 | |
|
5222 | 5222 | - get a NUL separated list of added files, suitable for xargs:: |
|
5223 | 5223 | |
|
5224 | 5224 | hg status -an0 |
|
5225 | 5225 | |
|
5226 | 5226 | Returns 0 on success. |
|
5227 | 5227 | """ |
|
5228 | 5228 | |
|
5229 | 5229 | revs = opts.get('rev') |
|
5230 | 5230 | change = opts.get('change') |
|
5231 | 5231 | |
|
5232 | 5232 | if revs and change: |
|
5233 | 5233 | msg = _('cannot specify --rev and --change at the same time') |
|
5234 | 5234 | raise util.Abort(msg) |
|
5235 | 5235 | elif change: |
|
5236 | 5236 | node2 = scmutil.revsingle(repo, change, None).node() |
|
5237 | 5237 | node1 = repo[node2].p1().node() |
|
5238 | 5238 | else: |
|
5239 | 5239 | node1, node2 = scmutil.revpair(repo, revs) |
|
5240 | 5240 | |
|
5241 | 5241 | cwd = (pats and repo.getcwd()) or '' |
|
5242 | 5242 | end = opts.get('print0') and '\0' or '\n' |
|
5243 | 5243 | copy = {} |
|
5244 | 5244 | states = 'modified added removed deleted unknown ignored clean'.split() |
|
5245 | 5245 | show = [k for k in states if opts.get(k)] |
|
5246 | 5246 | if opts.get('all'): |
|
5247 | 5247 | show += ui.quiet and (states[:4] + ['clean']) or states |
|
5248 | 5248 | if not show: |
|
5249 | 5249 | show = ui.quiet and states[:4] or states[:5] |
|
5250 | 5250 | |
|
5251 | 5251 | stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts), |
|
5252 | 5252 | 'ignored' in show, 'clean' in show, 'unknown' in show, |
|
5253 | 5253 | opts.get('subrepos')) |
|
5254 | 5254 | changestates = zip(states, 'MAR!?IC', stat) |
|
5255 | 5255 | |
|
5256 | 5256 | if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'): |
|
5257 | 5257 | copy = copies.pathcopies(repo[node1], repo[node2]) |
|
5258 | 5258 | |
|
5259 | 5259 | fm = ui.formatter('status', opts) |
|
5260 | 5260 | format = '%s %s' + end |
|
5261 | 5261 | if opts.get('no_status'): |
|
5262 | 5262 | format = '%.0s%s' + end |
|
5263 | 5263 | |
|
5264 | 5264 | for state, char, files in changestates: |
|
5265 | 5265 | if state in show: |
|
5266 | 5266 | label = 'status.' + state |
|
5267 | 5267 | for f in files: |
|
5268 | 5268 | fm.startitem() |
|
5269 | 5269 | fm.write("status path", format, char, |
|
5270 | 5270 | repo.pathto(f, cwd), label=label) |
|
5271 | 5271 | if f in copy: |
|
5272 | 5272 | fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd), |
|
5273 | 5273 | label='status.copied') |
|
5274 | 5274 | fm.end() |
|
5275 | 5275 | |
|
5276 | 5276 | @command('^summary|sum', |
|
5277 | 5277 | [('', 'remote', None, _('check for push and pull'))], '[--remote]') |
|
5278 | 5278 | def summary(ui, repo, **opts): |
|
5279 | 5279 | """summarize working directory state |
|
5280 | 5280 | |
|
5281 | 5281 | This generates a brief summary of the working directory state, |
|
5282 | 5282 | including parents, branch, commit status, and available updates. |
|
5283 | 5283 | |
|
5284 | 5284 | With the --remote option, this will check the default paths for |
|
5285 | 5285 | incoming and outgoing changes. This can be time-consuming. |
|
5286 | 5286 | |
|
5287 | 5287 | Returns 0 on success. |
|
5288 | 5288 | """ |
|
5289 | 5289 | |
|
5290 | 5290 | ctx = repo[None] |
|
5291 | 5291 | parents = ctx.parents() |
|
5292 | 5292 | pnode = parents[0].node() |
|
5293 | 5293 | marks = [] |
|
5294 | 5294 | |
|
5295 | 5295 | for p in parents: |
|
5296 | 5296 | # label with log.changeset (instead of log.parent) since this |
|
5297 | 5297 | # shows a working directory parent *changeset*: |
|
5298 | 5298 | ui.write(_('parent: %d:%s ') % (p.rev(), str(p)), |
|
5299 | 5299 | label='log.changeset') |
|
5300 | 5300 | ui.write(' '.join(p.tags()), label='log.tag') |
|
5301 | 5301 | if p.bookmarks(): |
|
5302 | 5302 | marks.extend(p.bookmarks()) |
|
5303 | 5303 | if p.rev() == -1: |
|
5304 | 5304 | if not len(repo): |
|
5305 | 5305 | ui.write(_(' (empty repository)')) |
|
5306 | 5306 | else: |
|
5307 | 5307 | ui.write(_(' (no revision checked out)')) |
|
5308 | 5308 | ui.write('\n') |
|
5309 | 5309 | if p.description(): |
|
5310 | 5310 | ui.status(' ' + p.description().splitlines()[0].strip() + '\n', |
|
5311 | 5311 | label='log.summary') |
|
5312 | 5312 | |
|
5313 | 5313 | branch = ctx.branch() |
|
5314 | 5314 | bheads = repo.branchheads(branch) |
|
5315 | 5315 | m = _('branch: %s\n') % branch |
|
5316 | 5316 | if branch != 'default': |
|
5317 | 5317 | ui.write(m, label='log.branch') |
|
5318 | 5318 | else: |
|
5319 | 5319 | ui.status(m, label='log.branch') |
|
5320 | 5320 | |
|
5321 | 5321 | if marks: |
|
5322 | 5322 | current = repo._bookmarkcurrent |
|
5323 | 5323 | ui.write(_('bookmarks:'), label='log.bookmark') |
|
5324 | 5324 | if current is not None: |
|
5325 | 5325 | try: |
|
5326 | 5326 | marks.remove(current) |
|
5327 | 5327 | ui.write(' *' + current, label='bookmarks.current') |
|
5328 | 5328 | except ValueError: |
|
5329 | 5329 | # current bookmark not in parent ctx marks |
|
5330 | 5330 | pass |
|
5331 | 5331 | for m in marks: |
|
5332 | 5332 | ui.write(' ' + m, label='log.bookmark') |
|
5333 | 5333 | ui.write('\n', label='log.bookmark') |
|
5334 | 5334 | |
|
5335 | 5335 | st = list(repo.status(unknown=True))[:6] |
|
5336 | 5336 | |
|
5337 | 5337 | c = repo.dirstate.copies() |
|
5338 | 5338 | copied, renamed = [], [] |
|
5339 | 5339 | for d, s in c.iteritems(): |
|
5340 | 5340 | if s in st[2]: |
|
5341 | 5341 | st[2].remove(s) |
|
5342 | 5342 | renamed.append(d) |
|
5343 | 5343 | else: |
|
5344 | 5344 | copied.append(d) |
|
5345 | 5345 | if d in st[1]: |
|
5346 | 5346 | st[1].remove(d) |
|
5347 | 5347 | st.insert(3, renamed) |
|
5348 | 5348 | st.insert(4, copied) |
|
5349 | 5349 | |
|
5350 | 5350 | ms = mergemod.mergestate(repo) |
|
5351 | 5351 | st.append([f for f in ms if ms[f] == 'u']) |
|
5352 | 5352 | |
|
5353 | 5353 | subs = [s for s in ctx.substate if ctx.sub(s).dirty()] |
|
5354 | 5354 | st.append(subs) |
|
5355 | 5355 | |
|
5356 | 5356 | labels = [ui.label(_('%d modified'), 'status.modified'), |
|
5357 | 5357 | ui.label(_('%d added'), 'status.added'), |
|
5358 | 5358 | ui.label(_('%d removed'), 'status.removed'), |
|
5359 | 5359 | ui.label(_('%d renamed'), 'status.copied'), |
|
5360 | 5360 | ui.label(_('%d copied'), 'status.copied'), |
|
5361 | 5361 | ui.label(_('%d deleted'), 'status.deleted'), |
|
5362 | 5362 | ui.label(_('%d unknown'), 'status.unknown'), |
|
5363 | 5363 | ui.label(_('%d ignored'), 'status.ignored'), |
|
5364 | 5364 | ui.label(_('%d unresolved'), 'resolve.unresolved'), |
|
5365 | 5365 | ui.label(_('%d subrepos'), 'status.modified')] |
|
5366 | 5366 | t = [] |
|
5367 | 5367 | for s, l in zip(st, labels): |
|
5368 | 5368 | if s: |
|
5369 | 5369 | t.append(l % len(s)) |
|
5370 | 5370 | |
|
5371 | 5371 | t = ', '.join(t) |
|
5372 | 5372 | cleanworkdir = False |
|
5373 | 5373 | |
|
5374 | 5374 | if len(parents) > 1: |
|
5375 | 5375 | t += _(' (merge)') |
|
5376 | 5376 | elif branch != parents[0].branch(): |
|
5377 | 5377 | t += _(' (new branch)') |
|
5378 | 5378 | elif (parents[0].extra().get('close') and |
|
5379 | 5379 | pnode in repo.branchheads(branch, closed=True)): |
|
5380 | 5380 | t += _(' (head closed)') |
|
5381 | 5381 | elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]): |
|
5382 | 5382 | t += _(' (clean)') |
|
5383 | 5383 | cleanworkdir = True |
|
5384 | 5384 | elif pnode not in bheads: |
|
5385 | 5385 | t += _(' (new branch head)') |
|
5386 | 5386 | |
|
5387 | 5387 | if cleanworkdir: |
|
5388 | 5388 | ui.status(_('commit: %s\n') % t.strip()) |
|
5389 | 5389 | else: |
|
5390 | 5390 | ui.write(_('commit: %s\n') % t.strip()) |
|
5391 | 5391 | |
|
5392 | 5392 | # all ancestors of branch heads - all ancestors of parent = new csets |
|
5393 | 5393 | new = [0] * len(repo) |
|
5394 | 5394 | cl = repo.changelog |
|
5395 | 5395 | for a in [cl.rev(n) for n in bheads]: |
|
5396 | 5396 | new[a] = 1 |
|
5397 | 5397 | for a in cl.ancestors(*[cl.rev(n) for n in bheads]): |
|
5398 | 5398 | new[a] = 1 |
|
5399 | 5399 | for a in [p.rev() for p in parents]: |
|
5400 | 5400 | if a >= 0: |
|
5401 | 5401 | new[a] = 0 |
|
5402 | 5402 | for a in cl.ancestors(*[p.rev() for p in parents]): |
|
5403 | 5403 | new[a] = 0 |
|
5404 | 5404 | new = sum(new) |
|
5405 | 5405 | |
|
5406 | 5406 | if new == 0: |
|
5407 | 5407 | ui.status(_('update: (current)\n')) |
|
5408 | 5408 | elif pnode not in bheads: |
|
5409 | 5409 | ui.write(_('update: %d new changesets (update)\n') % new) |
|
5410 | 5410 | else: |
|
5411 | 5411 | ui.write(_('update: %d new changesets, %d branch heads (merge)\n') % |
|
5412 | 5412 | (new, len(bheads))) |
|
5413 | 5413 | |
|
5414 | 5414 | if opts.get('remote'): |
|
5415 | 5415 | t = [] |
|
5416 | 5416 | source, branches = hg.parseurl(ui.expandpath('default')) |
|
5417 | 5417 | other = hg.peer(repo, {}, source) |
|
5418 | 5418 | revs, checkout = hg.addbranchrevs(repo, other, branches, |
|
5419 | 5419 | opts.get('rev')) |
|
5420 | 5420 | ui.debug('comparing with %s\n' % util.hidepassword(source)) |
|
5421 | 5421 | repo.ui.pushbuffer() |
|
5422 | 5422 | commoninc = discovery.findcommonincoming(repo, other) |
|
5423 | 5423 | _common, incoming, _rheads = commoninc |
|
5424 | 5424 | repo.ui.popbuffer() |
|
5425 | 5425 | if incoming: |
|
5426 | 5426 | t.append(_('1 or more incoming')) |
|
5427 | 5427 | |
|
5428 | 5428 | dest, branches = hg.parseurl(ui.expandpath('default-push', 'default')) |
|
5429 | 5429 | revs, checkout = hg.addbranchrevs(repo, repo, branches, None) |
|
5430 | 5430 | if source != dest: |
|
5431 | 5431 | other = hg.peer(repo, {}, dest) |
|
5432 | 5432 | commoninc = None |
|
5433 | 5433 | ui.debug('comparing with %s\n' % util.hidepassword(dest)) |
|
5434 | 5434 | repo.ui.pushbuffer() |
|
5435 | 5435 | outgoing = discovery.findcommonoutgoing(repo, other, |
|
5436 | 5436 | commoninc=commoninc) |
|
5437 | 5437 | repo.ui.popbuffer() |
|
5438 | 5438 | o = outgoing.missing |
|
5439 | 5439 | if o: |
|
5440 | 5440 | t.append(_('%d outgoing') % len(o)) |
|
5441 | 5441 | if 'bookmarks' in other.listkeys('namespaces'): |
|
5442 | 5442 | lmarks = repo.listkeys('bookmarks') |
|
5443 | 5443 | rmarks = other.listkeys('bookmarks') |
|
5444 | 5444 | diff = set(rmarks) - set(lmarks) |
|
5445 | 5445 | if len(diff) > 0: |
|
5446 | 5446 | t.append(_('%d incoming bookmarks') % len(diff)) |
|
5447 | 5447 | diff = set(lmarks) - set(rmarks) |
|
5448 | 5448 | if len(diff) > 0: |
|
5449 | 5449 | t.append(_('%d outgoing bookmarks') % len(diff)) |
|
5450 | 5450 | |
|
5451 | 5451 | if t: |
|
5452 | 5452 | ui.write(_('remote: %s\n') % (', '.join(t))) |
|
5453 | 5453 | else: |
|
5454 | 5454 | ui.status(_('remote: (synced)\n')) |
|
5455 | 5455 | |
|
5456 | 5456 | @command('tag', |
|
5457 | 5457 | [('f', 'force', None, _('force tag')), |
|
5458 | 5458 | ('l', 'local', None, _('make the tag local')), |
|
5459 | 5459 | ('r', 'rev', '', _('revision to tag'), _('REV')), |
|
5460 | 5460 | ('', 'remove', None, _('remove a tag')), |
|
5461 | 5461 | # -l/--local is already there, commitopts cannot be used |
|
5462 | 5462 | ('e', 'edit', None, _('edit commit message')), |
|
5463 | 5463 | ('m', 'message', '', _('use <text> as commit message'), _('TEXT')), |
|
5464 | 5464 | ] + commitopts2, |
|
5465 | 5465 | _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')) |
|
5466 | 5466 | def tag(ui, repo, name1, *names, **opts): |
|
5467 | 5467 | """add one or more tags for the current or given revision |
|
5468 | 5468 | |
|
5469 | 5469 | Name a particular revision using <name>. |
|
5470 | 5470 | |
|
5471 | 5471 | Tags are used to name particular revisions of the repository and are |
|
5472 | 5472 | very useful to compare different revisions, to go back to significant |
|
5473 | 5473 | earlier versions or to mark branch points as releases, etc. Changing |
|
5474 | 5474 | an existing tag is normally disallowed; use -f/--force to override. |
|
5475 | 5475 | |
|
5476 | 5476 | If no revision is given, the parent of the working directory is |
|
5477 | 5477 | used, or tip if no revision is checked out. |
|
5478 | 5478 | |
|
5479 | 5479 | To facilitate version control, distribution, and merging of tags, |
|
5480 | 5480 | they are stored as a file named ".hgtags" which is managed similarly |
|
5481 | 5481 | to other project files and can be hand-edited if necessary. This |
|
5482 | 5482 | also means that tagging creates a new commit. The file |
|
5483 | 5483 | ".hg/localtags" is used for local tags (not shared among |
|
5484 | 5484 | repositories). |
|
5485 | 5485 | |
|
5486 | 5486 | Tag commits are usually made at the head of a branch. If the parent |
|
5487 | 5487 | of the working directory is not a branch head, :hg:`tag` aborts; use |
|
5488 | 5488 | -f/--force to force the tag commit to be based on a non-head |
|
5489 | 5489 | changeset. |
|
5490 | 5490 | |
|
5491 | 5491 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
5492 | 5492 | |
|
5493 | 5493 | Since tag names have priority over branch names during revision |
|
5494 | 5494 | lookup, using an existing branch name as a tag name is discouraged. |
|
5495 | 5495 | |
|
5496 | 5496 | Returns 0 on success. |
|
5497 | 5497 | """ |
|
5498 | 5498 | wlock = lock = None |
|
5499 | 5499 | try: |
|
5500 | 5500 | wlock = repo.wlock() |
|
5501 | 5501 | lock = repo.lock() |
|
5502 | 5502 | rev_ = "." |
|
5503 | 5503 | names = [t.strip() for t in (name1,) + names] |
|
5504 | 5504 | if len(names) != len(set(names)): |
|
5505 | 5505 | raise util.Abort(_('tag names must be unique')) |
|
5506 | 5506 | for n in names: |
|
5507 | 5507 | if n in ['tip', '.', 'null']: |
|
5508 | 5508 | raise util.Abort(_("the name '%s' is reserved") % n) |
|
5509 | 5509 | if not n: |
|
5510 | 5510 | raise util.Abort(_('tag names cannot consist entirely of ' |
|
5511 | 5511 | 'whitespace')) |
|
5512 | 5512 | if opts.get('rev') and opts.get('remove'): |
|
5513 | 5513 | raise util.Abort(_("--rev and --remove are incompatible")) |
|
5514 | 5514 | if opts.get('rev'): |
|
5515 | 5515 | rev_ = opts['rev'] |
|
5516 | 5516 | message = opts.get('message') |
|
5517 | 5517 | if opts.get('remove'): |
|
5518 | 5518 | expectedtype = opts.get('local') and 'local' or 'global' |
|
5519 | 5519 | for n in names: |
|
5520 | 5520 | if not repo.tagtype(n): |
|
5521 | 5521 | raise util.Abort(_("tag '%s' does not exist") % n) |
|
5522 | 5522 | if repo.tagtype(n) != expectedtype: |
|
5523 | 5523 | if expectedtype == 'global': |
|
5524 | 5524 | raise util.Abort(_("tag '%s' is not a global tag") % n) |
|
5525 | 5525 | else: |
|
5526 | 5526 | raise util.Abort(_("tag '%s' is not a local tag") % n) |
|
5527 | 5527 | rev_ = nullid |
|
5528 | 5528 | if not message: |
|
5529 | 5529 | # we don't translate commit messages |
|
5530 | 5530 | message = 'Removed tag %s' % ', '.join(names) |
|
5531 | 5531 | elif not opts.get('force'): |
|
5532 | 5532 | for n in names: |
|
5533 | 5533 | if n in repo.tags(): |
|
5534 | 5534 | raise util.Abort(_("tag '%s' already exists " |
|
5535 | 5535 | "(use -f to force)") % n) |
|
5536 | 5536 | if not opts.get('local'): |
|
5537 | 5537 | p1, p2 = repo.dirstate.parents() |
|
5538 | 5538 | if p2 != nullid: |
|
5539 | 5539 | raise util.Abort(_('uncommitted merge')) |
|
5540 | 5540 | bheads = repo.branchheads() |
|
5541 | 5541 | if not opts.get('force') and bheads and p1 not in bheads: |
|
5542 | 5542 | raise util.Abort(_('not at a branch head (use -f to force)')) |
|
5543 | 5543 | r = scmutil.revsingle(repo, rev_).node() |
|
5544 | 5544 | |
|
5545 | 5545 | if not message: |
|
5546 | 5546 | # we don't translate commit messages |
|
5547 | 5547 | message = ('Added tag %s for changeset %s' % |
|
5548 | 5548 | (', '.join(names), short(r))) |
|
5549 | 5549 | |
|
5550 | 5550 | date = opts.get('date') |
|
5551 | 5551 | if date: |
|
5552 | 5552 | date = util.parsedate(date) |
|
5553 | 5553 | |
|
5554 | 5554 | if opts.get('edit'): |
|
5555 | 5555 | message = ui.edit(message, ui.username()) |
|
5556 | 5556 | |
|
5557 | 5557 | repo.tag(names, r, message, opts.get('local'), opts.get('user'), date) |
|
5558 | 5558 | finally: |
|
5559 | 5559 | release(lock, wlock) |
|
5560 | 5560 | |
|
5561 | 5561 | @command('tags', [], '') |
|
5562 | 5562 | def tags(ui, repo): |
|
5563 | 5563 | """list repository tags |
|
5564 | 5564 | |
|
5565 | 5565 | This lists both regular and local tags. When the -v/--verbose |
|
5566 | 5566 | switch is used, a third column "local" is printed for local tags. |
|
5567 | 5567 | |
|
5568 | 5568 | Returns 0 on success. |
|
5569 | 5569 | """ |
|
5570 | 5570 | |
|
5571 | 5571 | hexfunc = ui.debugflag and hex or short |
|
5572 | 5572 | tagtype = "" |
|
5573 | 5573 | |
|
5574 | 5574 | for t, n in reversed(repo.tagslist()): |
|
5575 | 5575 | if ui.quiet: |
|
5576 | 5576 | ui.write("%s\n" % t, label='tags.normal') |
|
5577 | 5577 | continue |
|
5578 | 5578 | |
|
5579 | 5579 | hn = hexfunc(n) |
|
5580 | 5580 | r = "%5d:%s" % (repo.changelog.rev(n), hn) |
|
5581 | 5581 | rev = ui.label(r, 'log.changeset') |
|
5582 | 5582 | spaces = " " * (30 - encoding.colwidth(t)) |
|
5583 | 5583 | |
|
5584 | 5584 | tag = ui.label(t, 'tags.normal') |
|
5585 | 5585 | if ui.verbose: |
|
5586 | 5586 | if repo.tagtype(t) == 'local': |
|
5587 | 5587 | tagtype = " local" |
|
5588 | 5588 | tag = ui.label(t, 'tags.local') |
|
5589 | 5589 | else: |
|
5590 | 5590 | tagtype = "" |
|
5591 | 5591 | ui.write("%s%s %s%s\n" % (tag, spaces, rev, tagtype)) |
|
5592 | 5592 | |
|
5593 | 5593 | @command('tip', |
|
5594 | 5594 | [('p', 'patch', None, _('show patch')), |
|
5595 | 5595 | ('g', 'git', None, _('use git extended diff format')), |
|
5596 | 5596 | ] + templateopts, |
|
5597 | 5597 | _('[-p] [-g]')) |
|
5598 | 5598 | def tip(ui, repo, **opts): |
|
5599 | 5599 | """show the tip revision |
|
5600 | 5600 | |
|
5601 | 5601 | The tip revision (usually just called the tip) is the changeset |
|
5602 | 5602 | most recently added to the repository (and therefore the most |
|
5603 | 5603 | recently changed head). |
|
5604 | 5604 | |
|
5605 | 5605 | If you have just made a commit, that commit will be the tip. If |
|
5606 | 5606 | you have just pulled changes from another repository, the tip of |
|
5607 | 5607 | that repository becomes the current tip. The "tip" tag is special |
|
5608 | 5608 | and cannot be renamed or assigned to a different changeset. |
|
5609 | 5609 | |
|
5610 | 5610 | Returns 0 on success. |
|
5611 | 5611 | """ |
|
5612 | 5612 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
5613 | 5613 | displayer.show(repo[len(repo) - 1]) |
|
5614 | 5614 | displayer.close() |
|
5615 | 5615 | |
|
5616 | 5616 | @command('unbundle', |
|
5617 | 5617 | [('u', 'update', None, |
|
5618 | 5618 | _('update to new branch head if changesets were unbundled'))], |
|
5619 | 5619 | _('[-u] FILE...')) |
|
5620 | 5620 | def unbundle(ui, repo, fname1, *fnames, **opts): |
|
5621 | 5621 | """apply one or more changegroup files |
|
5622 | 5622 | |
|
5623 | 5623 | Apply one or more compressed changegroup files generated by the |
|
5624 | 5624 | bundle command. |
|
5625 | 5625 | |
|
5626 | 5626 | Returns 0 on success, 1 if an update has unresolved files. |
|
5627 | 5627 | """ |
|
5628 | 5628 | fnames = (fname1,) + fnames |
|
5629 | 5629 | |
|
5630 | 5630 | lock = repo.lock() |
|
5631 | 5631 | wc = repo['.'] |
|
5632 | 5632 | try: |
|
5633 | 5633 | for fname in fnames: |
|
5634 | 5634 | f = url.open(ui, fname) |
|
5635 | 5635 | gen = changegroup.readbundle(f, fname) |
|
5636 | 5636 | modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname) |
|
5637 | 5637 | finally: |
|
5638 | 5638 | lock.release() |
|
5639 | 5639 | bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch()) |
|
5640 | 5640 | return postincoming(ui, repo, modheads, opts.get('update'), None) |
|
5641 | 5641 | |
|
5642 | 5642 | @command('^update|up|checkout|co', |
|
5643 | 5643 | [('C', 'clean', None, _('discard uncommitted changes (no backup)')), |
|
5644 | 5644 | ('c', 'check', None, |
|
5645 | 5645 | _('update across branches if no uncommitted changes')), |
|
5646 | 5646 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), |
|
5647 | 5647 | ('r', 'rev', '', _('revision'), _('REV'))], |
|
5648 | 5648 | _('[-c] [-C] [-d DATE] [[-r] REV]')) |
|
5649 | 5649 | def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False): |
|
5650 | 5650 | """update working directory (or switch revisions) |
|
5651 | 5651 | |
|
5652 | 5652 | Update the repository's working directory to the specified |
|
5653 | 5653 | changeset. If no changeset is specified, update to the tip of the |
|
5654 | 5654 | current named branch and move the current bookmark (see :hg:`help |
|
5655 | 5655 | bookmarks`). |
|
5656 | 5656 | |
|
5657 | 5657 | If the changeset is not a descendant of the working directory's |
|
5658 | 5658 | parent, the update is aborted. With the -c/--check option, the |
|
5659 | 5659 | working directory is checked for uncommitted changes; if none are |
|
5660 | 5660 | found, the working directory is updated to the specified |
|
5661 | 5661 | changeset. |
|
5662 | 5662 | |
|
5663 | 5663 | Update sets the working directory's parent revison to the specified |
|
5664 | 5664 | changeset (see :hg:`help parents`). |
|
5665 | 5665 | |
|
5666 | 5666 | The following rules apply when the working directory contains |
|
5667 | 5667 | uncommitted changes: |
|
5668 | 5668 | |
|
5669 | 5669 | 1. If neither -c/--check nor -C/--clean is specified, and if |
|
5670 | 5670 | the requested changeset is an ancestor or descendant of |
|
5671 | 5671 | the working directory's parent, the uncommitted changes |
|
5672 | 5672 | are merged into the requested changeset and the merged |
|
5673 | 5673 | result is left uncommitted. If the requested changeset is |
|
5674 | 5674 | not an ancestor or descendant (that is, it is on another |
|
5675 | 5675 | branch), the update is aborted and the uncommitted changes |
|
5676 | 5676 | are preserved. |
|
5677 | 5677 | |
|
5678 | 5678 | 2. With the -c/--check option, the update is aborted and the |
|
5679 | 5679 | uncommitted changes are preserved. |
|
5680 | 5680 | |
|
5681 | 5681 | 3. With the -C/--clean option, uncommitted changes are discarded and |
|
5682 | 5682 | the working directory is updated to the requested changeset. |
|
5683 | 5683 | |
|
5684 | 5684 | Use null as the changeset to remove the working directory (like |
|
5685 | 5685 | :hg:`clone -U`). |
|
5686 | 5686 | |
|
5687 | 5687 | If you want to revert just one file to an older revision, use |
|
5688 | 5688 | :hg:`revert [-r REV] NAME`. |
|
5689 | 5689 | |
|
5690 | 5690 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
5691 | 5691 | |
|
5692 | 5692 | Returns 0 on success, 1 if there are unresolved files. |
|
5693 | 5693 | """ |
|
5694 | 5694 | if rev and node: |
|
5695 | 5695 | raise util.Abort(_("please specify just one revision")) |
|
5696 | 5696 | |
|
5697 | 5697 | if rev is None or rev == '': |
|
5698 | 5698 | rev = node |
|
5699 | 5699 | |
|
5700 | 5700 | # with no argument, we also move the current bookmark, if any |
|
5701 | 5701 | movemarkfrom = None |
|
5702 | 5702 | if rev is None or node == '': |
|
5703 | 5703 | movemarkfrom = repo['.'].node() |
|
5704 | 5704 | |
|
5705 | 5705 | # if we defined a bookmark, we have to remember the original bookmark name |
|
5706 | 5706 | brev = rev |
|
5707 | 5707 | rev = scmutil.revsingle(repo, rev, rev).rev() |
|
5708 | 5708 | |
|
5709 | 5709 | if check and clean: |
|
5710 | 5710 | raise util.Abort(_("cannot specify both -c/--check and -C/--clean")) |
|
5711 | 5711 | |
|
5712 | 5712 | if date: |
|
5713 | 5713 | if rev is not None: |
|
5714 | 5714 | raise util.Abort(_("you can't specify a revision and a date")) |
|
5715 | 5715 | rev = cmdutil.finddate(ui, repo, date) |
|
5716 | 5716 | |
|
5717 | 5717 | if check: |
|
5718 | 5718 | c = repo[None] |
|
5719 | 5719 | if c.dirty(merge=False, branch=False): |
|
5720 | 5720 | raise util.Abort(_("uncommitted local changes")) |
|
5721 | 5721 | if rev is None: |
|
5722 | 5722 | rev = repo[repo[None].branch()].rev() |
|
5723 | 5723 | mergemod._checkunknown(repo, repo[None], repo[rev]) |
|
5724 | 5724 | |
|
5725 | 5725 | if clean: |
|
5726 | 5726 | ret = hg.clean(repo, rev) |
|
5727 | 5727 | else: |
|
5728 | 5728 | ret = hg.update(repo, rev) |
|
5729 | 5729 | |
|
5730 | 5730 | if not ret and movemarkfrom: |
|
5731 | 5731 | if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): |
|
5732 | 5732 | ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent) |
|
5733 | 5733 | elif brev in repo._bookmarks: |
|
5734 | 5734 | bookmarks.setcurrent(repo, brev) |
|
5735 | 5735 | elif brev: |
|
5736 | 5736 | bookmarks.unsetcurrent(repo) |
|
5737 | 5737 | |
|
5738 | 5738 | return ret |
|
5739 | 5739 | |
|
5740 | 5740 | @command('verify', []) |
|
5741 | 5741 | def verify(ui, repo): |
|
5742 | 5742 | """verify the integrity of the repository |
|
5743 | 5743 | |
|
5744 | 5744 | Verify the integrity of the current repository. |
|
5745 | 5745 | |
|
5746 | 5746 | This will perform an extensive check of the repository's |
|
5747 | 5747 | integrity, validating the hashes and checksums of each entry in |
|
5748 | 5748 | the changelog, manifest, and tracked files, as well as the |
|
5749 | 5749 | integrity of their crosslinks and indices. |
|
5750 | 5750 | |
|
5751 | 5751 | Returns 0 on success, 1 if errors are encountered. |
|
5752 | 5752 | """ |
|
5753 | 5753 | return hg.verify(repo) |
|
5754 | 5754 | |
|
5755 | 5755 | @command('version', []) |
|
5756 | 5756 | def version_(ui): |
|
5757 | 5757 | """output version and copyright information""" |
|
5758 | 5758 | ui.write(_("Mercurial Distributed SCM (version %s)\n") |
|
5759 | 5759 | % util.version()) |
|
5760 | 5760 | ui.status(_( |
|
5761 | 5761 | "(see http://mercurial.selenic.com for more information)\n" |
|
5762 | 5762 | "\nCopyright (C) 2005-2012 Matt Mackall and others\n" |
|
5763 | 5763 | "This is free software; see the source for copying conditions. " |
|
5764 | 5764 | "There is NO\nwarranty; " |
|
5765 | 5765 | "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" |
|
5766 | 5766 | )) |
|
5767 | 5767 | |
|
5768 | 5768 | norepo = ("clone init version help debugcommands debugcomplete" |
|
5769 | 5769 | " debugdate debuginstall debugfsinfo debugpushkey debugwireargs" |
|
5770 | 5770 | " debugknown debuggetbundle debugbundle") |
|
5771 | 5771 | optionalrepo = ("identify paths serve showconfig debugancestor debugdag" |
|
5772 | 5772 | " debugdata debugindex debugindexdot debugrevlog") |
@@ -1,789 +1,789 b'' | |||
|
1 | 1 | # dispatch.py - command dispatching 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 i18n import _ |
|
9 | 9 | import os, sys, atexit, signal, pdb, socket, errno, shlex, time, traceback, re |
|
10 | 10 | import util, commands, hg, fancyopts, extensions, hook, error |
|
11 | 11 | import cmdutil, encoding |
|
12 | 12 | import ui as uimod |
|
13 | 13 | |
|
14 | 14 | class request(object): |
|
15 | 15 | def __init__(self, args, ui=None, repo=None, fin=None, fout=None, |
|
16 | 16 | ferr=None): |
|
17 | 17 | self.args = args |
|
18 | 18 | self.ui = ui |
|
19 | 19 | self.repo = repo |
|
20 | 20 | |
|
21 | 21 | # input/output/error streams |
|
22 | 22 | self.fin = fin |
|
23 | 23 | self.fout = fout |
|
24 | 24 | self.ferr = ferr |
|
25 | 25 | |
|
26 | 26 | def run(): |
|
27 | 27 | "run the command in sys.argv" |
|
28 | 28 | sys.exit((dispatch(request(sys.argv[1:])) or 0) & 255) |
|
29 | 29 | |
|
30 | 30 | def dispatch(req): |
|
31 | 31 | "run the command specified in req.args" |
|
32 | 32 | if req.ferr: |
|
33 | 33 | ferr = req.ferr |
|
34 | 34 | elif req.ui: |
|
35 | 35 | ferr = req.ui.ferr |
|
36 | 36 | else: |
|
37 | 37 | ferr = sys.stderr |
|
38 | 38 | |
|
39 | 39 | try: |
|
40 | 40 | if not req.ui: |
|
41 | 41 | req.ui = uimod.ui() |
|
42 | 42 | if '--traceback' in req.args: |
|
43 | 43 | req.ui.setconfig('ui', 'traceback', 'on') |
|
44 | 44 | |
|
45 | 45 | # set ui streams from the request |
|
46 | 46 | if req.fin: |
|
47 | 47 | req.ui.fin = req.fin |
|
48 | 48 | if req.fout: |
|
49 | 49 | req.ui.fout = req.fout |
|
50 | 50 | if req.ferr: |
|
51 | 51 | req.ui.ferr = req.ferr |
|
52 | 52 | except util.Abort, inst: |
|
53 | 53 | ferr.write(_("abort: %s\n") % inst) |
|
54 | 54 | if inst.hint: |
|
55 | 55 | ferr.write(_("(%s)\n") % inst.hint) |
|
56 | 56 | return -1 |
|
57 | 57 | except error.ParseError, inst: |
|
58 | 58 | if len(inst.args) > 1: |
|
59 | 59 | ferr.write(_("hg: parse error at %s: %s\n") % |
|
60 | 60 | (inst.args[1], inst.args[0])) |
|
61 | 61 | else: |
|
62 | 62 | ferr.write(_("hg: parse error: %s\n") % inst.args[0]) |
|
63 | 63 | return -1 |
|
64 | 64 | |
|
65 | 65 | return _runcatch(req) |
|
66 | 66 | |
|
67 | 67 | def _runcatch(req): |
|
68 | 68 | def catchterm(*args): |
|
69 | 69 | raise error.SignalInterrupt |
|
70 | 70 | |
|
71 | 71 | ui = req.ui |
|
72 | 72 | try: |
|
73 | 73 | for name in 'SIGBREAK', 'SIGHUP', 'SIGTERM': |
|
74 | 74 | num = getattr(signal, name, None) |
|
75 | 75 | if num: |
|
76 | 76 | signal.signal(num, catchterm) |
|
77 | 77 | except ValueError: |
|
78 | 78 | pass # happens if called in a thread |
|
79 | 79 | |
|
80 | 80 | try: |
|
81 | 81 | try: |
|
82 | 82 | # enter the debugger before command execution |
|
83 | 83 | if '--debugger' in req.args: |
|
84 | 84 | ui.warn(_("entering debugger - " |
|
85 | 85 | "type c to continue starting hg or h for help\n")) |
|
86 | 86 | pdb.set_trace() |
|
87 | 87 | try: |
|
88 | 88 | return _dispatch(req) |
|
89 | 89 | finally: |
|
90 | 90 | ui.flush() |
|
91 | except: | |
|
91 | except: # re-raises | |
|
92 | 92 | # enter the debugger when we hit an exception |
|
93 | 93 | if '--debugger' in req.args: |
|
94 | 94 | traceback.print_exc() |
|
95 | 95 | pdb.post_mortem(sys.exc_info()[2]) |
|
96 | 96 | ui.traceback() |
|
97 | 97 | raise |
|
98 | 98 | |
|
99 | 99 | # Global exception handling, alphabetically |
|
100 | 100 | # Mercurial-specific first, followed by built-in and library exceptions |
|
101 | 101 | except error.AmbiguousCommand, inst: |
|
102 | 102 | ui.warn(_("hg: command '%s' is ambiguous:\n %s\n") % |
|
103 | 103 | (inst.args[0], " ".join(inst.args[1]))) |
|
104 | 104 | except error.ParseError, inst: |
|
105 | 105 | if len(inst.args) > 1: |
|
106 | 106 | ui.warn(_("hg: parse error at %s: %s\n") % |
|
107 | 107 | (inst.args[1], inst.args[0])) |
|
108 | 108 | else: |
|
109 | 109 | ui.warn(_("hg: parse error: %s\n") % inst.args[0]) |
|
110 | 110 | return -1 |
|
111 | 111 | except error.LockHeld, inst: |
|
112 | 112 | if inst.errno == errno.ETIMEDOUT: |
|
113 | 113 | reason = _('timed out waiting for lock held by %s') % inst.locker |
|
114 | 114 | else: |
|
115 | 115 | reason = _('lock held by %s') % inst.locker |
|
116 | 116 | ui.warn(_("abort: %s: %s\n") % (inst.desc or inst.filename, reason)) |
|
117 | 117 | except error.LockUnavailable, inst: |
|
118 | 118 | ui.warn(_("abort: could not lock %s: %s\n") % |
|
119 | 119 | (inst.desc or inst.filename, inst.strerror)) |
|
120 | 120 | except error.CommandError, inst: |
|
121 | 121 | if inst.args[0]: |
|
122 | 122 | ui.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1])) |
|
123 | 123 | commands.help_(ui, inst.args[0], full=False, command=True) |
|
124 | 124 | else: |
|
125 | 125 | ui.warn(_("hg: %s\n") % inst.args[1]) |
|
126 | 126 | commands.help_(ui, 'shortlist') |
|
127 | 127 | except error.OutOfBandError, inst: |
|
128 | 128 | ui.warn(_("abort: remote error:\n")) |
|
129 | 129 | ui.warn(''.join(inst.args)) |
|
130 | 130 | except error.RepoError, inst: |
|
131 | 131 | ui.warn(_("abort: %s!\n") % inst) |
|
132 | 132 | if inst.hint: |
|
133 | 133 | ui.warn(_("(%s)\n") % inst.hint) |
|
134 | 134 | except error.ResponseError, inst: |
|
135 | 135 | ui.warn(_("abort: %s") % inst.args[0]) |
|
136 | 136 | if not isinstance(inst.args[1], basestring): |
|
137 | 137 | ui.warn(" %r\n" % (inst.args[1],)) |
|
138 | 138 | elif not inst.args[1]: |
|
139 | 139 | ui.warn(_(" empty string\n")) |
|
140 | 140 | else: |
|
141 | 141 | ui.warn("\n%r\n" % util.ellipsis(inst.args[1])) |
|
142 | 142 | except error.RevlogError, inst: |
|
143 | 143 | ui.warn(_("abort: %s!\n") % inst) |
|
144 | 144 | except error.SignalInterrupt: |
|
145 | 145 | ui.warn(_("killed!\n")) |
|
146 | 146 | except error.UnknownCommand, inst: |
|
147 | 147 | ui.warn(_("hg: unknown command '%s'\n") % inst.args[0]) |
|
148 | 148 | try: |
|
149 | 149 | # check if the command is in a disabled extension |
|
150 | 150 | # (but don't check for extensions themselves) |
|
151 | 151 | commands.help_(ui, inst.args[0], unknowncmd=True) |
|
152 | 152 | except error.UnknownCommand: |
|
153 | 153 | commands.help_(ui, 'shortlist') |
|
154 | 154 | except util.Abort, inst: |
|
155 | 155 | ui.warn(_("abort: %s\n") % inst) |
|
156 | 156 | if inst.hint: |
|
157 | 157 | ui.warn(_("(%s)\n") % inst.hint) |
|
158 | 158 | except ImportError, inst: |
|
159 | 159 | ui.warn(_("abort: %s!\n") % inst) |
|
160 | 160 | m = str(inst).split()[-1] |
|
161 | 161 | if m in "mpatch bdiff".split(): |
|
162 | 162 | ui.warn(_("(did you forget to compile extensions?)\n")) |
|
163 | 163 | elif m in "zlib".split(): |
|
164 | 164 | ui.warn(_("(is your Python install correct?)\n")) |
|
165 | 165 | except IOError, inst: |
|
166 | 166 | if util.safehasattr(inst, "code"): |
|
167 | 167 | ui.warn(_("abort: %s\n") % inst) |
|
168 | 168 | elif util.safehasattr(inst, "reason"): |
|
169 | 169 | try: # usually it is in the form (errno, strerror) |
|
170 | 170 | reason = inst.reason.args[1] |
|
171 | 171 | except (AttributeError, IndexError): |
|
172 | 172 | # it might be anything, for example a string |
|
173 | 173 | reason = inst.reason |
|
174 | 174 | ui.warn(_("abort: error: %s\n") % reason) |
|
175 | 175 | elif util.safehasattr(inst, "args") and inst.args[0] == errno.EPIPE: |
|
176 | 176 | if ui.debugflag: |
|
177 | 177 | ui.warn(_("broken pipe\n")) |
|
178 | 178 | elif getattr(inst, "strerror", None): |
|
179 | 179 | if getattr(inst, "filename", None): |
|
180 | 180 | ui.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename)) |
|
181 | 181 | else: |
|
182 | 182 | ui.warn(_("abort: %s\n") % inst.strerror) |
|
183 | 183 | else: |
|
184 | 184 | raise |
|
185 | 185 | except OSError, inst: |
|
186 | 186 | if getattr(inst, "filename", None): |
|
187 | 187 | ui.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename)) |
|
188 | 188 | else: |
|
189 | 189 | ui.warn(_("abort: %s\n") % inst.strerror) |
|
190 | 190 | except KeyboardInterrupt: |
|
191 | 191 | try: |
|
192 | 192 | ui.warn(_("interrupted!\n")) |
|
193 | 193 | except IOError, inst: |
|
194 | 194 | if inst.errno == errno.EPIPE: |
|
195 | 195 | if ui.debugflag: |
|
196 | 196 | ui.warn(_("\nbroken pipe\n")) |
|
197 | 197 | else: |
|
198 | 198 | raise |
|
199 | 199 | except MemoryError: |
|
200 | 200 | ui.warn(_("abort: out of memory\n")) |
|
201 | 201 | except SystemExit, inst: |
|
202 | 202 | # Commands shouldn't sys.exit directly, but give a return code. |
|
203 | 203 | # Just in case catch this and and pass exit code to caller. |
|
204 | 204 | return inst.code |
|
205 | 205 | except socket.error, inst: |
|
206 | 206 | ui.warn(_("abort: %s\n") % inst.args[-1]) |
|
207 | except: | |
|
207 | except: # re-raises | |
|
208 | 208 | ui.warn(_("** unknown exception encountered," |
|
209 | 209 | " please report by visiting\n")) |
|
210 | 210 | ui.warn(_("** http://mercurial.selenic.com/wiki/BugTracker\n")) |
|
211 | 211 | ui.warn(_("** Python %s\n") % sys.version.replace('\n', '')) |
|
212 | 212 | ui.warn(_("** Mercurial Distributed SCM (version %s)\n") |
|
213 | 213 | % util.version()) |
|
214 | 214 | ui.warn(_("** Extensions loaded: %s\n") |
|
215 | 215 | % ", ".join([x[0] for x in extensions.extensions()])) |
|
216 | 216 | raise |
|
217 | 217 | |
|
218 | 218 | return -1 |
|
219 | 219 | |
|
220 | 220 | def aliasargs(fn, givenargs): |
|
221 | 221 | args = getattr(fn, 'args', []) |
|
222 | 222 | if args: |
|
223 | 223 | cmd = ' '.join(map(util.shellquote, args)) |
|
224 | 224 | |
|
225 | 225 | nums = [] |
|
226 | 226 | def replacer(m): |
|
227 | 227 | num = int(m.group(1)) - 1 |
|
228 | 228 | nums.append(num) |
|
229 | 229 | if num < len(givenargs): |
|
230 | 230 | return givenargs[num] |
|
231 | 231 | raise util.Abort(_('too few arguments for command alias')) |
|
232 | 232 | cmd = re.sub(r'\$(\d+|\$)', replacer, cmd) |
|
233 | 233 | givenargs = [x for i, x in enumerate(givenargs) |
|
234 | 234 | if i not in nums] |
|
235 | 235 | args = shlex.split(cmd) |
|
236 | 236 | return args + givenargs |
|
237 | 237 | |
|
238 | 238 | class cmdalias(object): |
|
239 | 239 | def __init__(self, name, definition, cmdtable): |
|
240 | 240 | self.name = self.cmd = name |
|
241 | 241 | self.cmdname = '' |
|
242 | 242 | self.definition = definition |
|
243 | 243 | self.args = [] |
|
244 | 244 | self.opts = [] |
|
245 | 245 | self.help = '' |
|
246 | 246 | self.norepo = True |
|
247 | 247 | self.optionalrepo = False |
|
248 | 248 | self.badalias = False |
|
249 | 249 | |
|
250 | 250 | try: |
|
251 | 251 | aliases, entry = cmdutil.findcmd(self.name, cmdtable) |
|
252 | 252 | for alias, e in cmdtable.iteritems(): |
|
253 | 253 | if e is entry: |
|
254 | 254 | self.cmd = alias |
|
255 | 255 | break |
|
256 | 256 | self.shadows = True |
|
257 | 257 | except error.UnknownCommand: |
|
258 | 258 | self.shadows = False |
|
259 | 259 | |
|
260 | 260 | if not self.definition: |
|
261 | 261 | def fn(ui, *args): |
|
262 | 262 | ui.warn(_("no definition for alias '%s'\n") % self.name) |
|
263 | 263 | return 1 |
|
264 | 264 | self.fn = fn |
|
265 | 265 | self.badalias = True |
|
266 | 266 | return |
|
267 | 267 | |
|
268 | 268 | if self.definition.startswith('!'): |
|
269 | 269 | self.shell = True |
|
270 | 270 | def fn(ui, *args): |
|
271 | 271 | env = {'HG_ARGS': ' '.join((self.name,) + args)} |
|
272 | 272 | def _checkvar(m): |
|
273 | 273 | if m.groups()[0] == '$': |
|
274 | 274 | return m.group() |
|
275 | 275 | elif int(m.groups()[0]) <= len(args): |
|
276 | 276 | return m.group() |
|
277 | 277 | else: |
|
278 | 278 | ui.debug("No argument found for substitution " |
|
279 | 279 | "of %i variable in alias '%s' definition." |
|
280 | 280 | % (int(m.groups()[0]), self.name)) |
|
281 | 281 | return '' |
|
282 | 282 | cmd = re.sub(r'\$(\d+|\$)', _checkvar, self.definition[1:]) |
|
283 | 283 | replace = dict((str(i + 1), arg) for i, arg in enumerate(args)) |
|
284 | 284 | replace['0'] = self.name |
|
285 | 285 | replace['@'] = ' '.join(args) |
|
286 | 286 | cmd = util.interpolate(r'\$', replace, cmd, escape_prefix=True) |
|
287 | 287 | return util.system(cmd, environ=env, out=ui.fout) |
|
288 | 288 | self.fn = fn |
|
289 | 289 | return |
|
290 | 290 | |
|
291 | 291 | args = shlex.split(self.definition) |
|
292 | 292 | self.cmdname = cmd = args.pop(0) |
|
293 | 293 | args = map(util.expandpath, args) |
|
294 | 294 | |
|
295 | 295 | for invalidarg in ("--cwd", "-R", "--repository", "--repo"): |
|
296 | 296 | if _earlygetopt([invalidarg], args): |
|
297 | 297 | def fn(ui, *args): |
|
298 | 298 | ui.warn(_("error in definition for alias '%s': %s may only " |
|
299 | 299 | "be given on the command line\n") |
|
300 | 300 | % (self.name, invalidarg)) |
|
301 | 301 | return 1 |
|
302 | 302 | |
|
303 | 303 | self.fn = fn |
|
304 | 304 | self.badalias = True |
|
305 | 305 | return |
|
306 | 306 | |
|
307 | 307 | try: |
|
308 | 308 | tableentry = cmdutil.findcmd(cmd, cmdtable, False)[1] |
|
309 | 309 | if len(tableentry) > 2: |
|
310 | 310 | self.fn, self.opts, self.help = tableentry |
|
311 | 311 | else: |
|
312 | 312 | self.fn, self.opts = tableentry |
|
313 | 313 | |
|
314 | 314 | self.args = aliasargs(self.fn, args) |
|
315 | 315 | if cmd not in commands.norepo.split(' '): |
|
316 | 316 | self.norepo = False |
|
317 | 317 | if cmd in commands.optionalrepo.split(' '): |
|
318 | 318 | self.optionalrepo = True |
|
319 | 319 | if self.help.startswith("hg " + cmd): |
|
320 | 320 | # drop prefix in old-style help lines so hg shows the alias |
|
321 | 321 | self.help = self.help[4 + len(cmd):] |
|
322 | 322 | self.__doc__ = self.fn.__doc__ |
|
323 | 323 | |
|
324 | 324 | except error.UnknownCommand: |
|
325 | 325 | def fn(ui, *args): |
|
326 | 326 | ui.warn(_("alias '%s' resolves to unknown command '%s'\n") \ |
|
327 | 327 | % (self.name, cmd)) |
|
328 | 328 | try: |
|
329 | 329 | # check if the command is in a disabled extension |
|
330 | 330 | commands.help_(ui, cmd, unknowncmd=True) |
|
331 | 331 | except error.UnknownCommand: |
|
332 | 332 | pass |
|
333 | 333 | return 1 |
|
334 | 334 | self.fn = fn |
|
335 | 335 | self.badalias = True |
|
336 | 336 | except error.AmbiguousCommand: |
|
337 | 337 | def fn(ui, *args): |
|
338 | 338 | ui.warn(_("alias '%s' resolves to ambiguous command '%s'\n") \ |
|
339 | 339 | % (self.name, cmd)) |
|
340 | 340 | return 1 |
|
341 | 341 | self.fn = fn |
|
342 | 342 | self.badalias = True |
|
343 | 343 | |
|
344 | 344 | def __call__(self, ui, *args, **opts): |
|
345 | 345 | if self.shadows: |
|
346 | 346 | ui.debug("alias '%s' shadows command '%s'\n" % |
|
347 | 347 | (self.name, self.cmdname)) |
|
348 | 348 | |
|
349 | 349 | if util.safehasattr(self, 'shell'): |
|
350 | 350 | return self.fn(ui, *args, **opts) |
|
351 | 351 | else: |
|
352 | 352 | try: |
|
353 | 353 | util.checksignature(self.fn)(ui, *args, **opts) |
|
354 | 354 | except error.SignatureError: |
|
355 | 355 | args = ' '.join([self.cmdname] + self.args) |
|
356 | 356 | ui.debug("alias '%s' expands to '%s'\n" % (self.name, args)) |
|
357 | 357 | raise |
|
358 | 358 | |
|
359 | 359 | def addaliases(ui, cmdtable): |
|
360 | 360 | # aliases are processed after extensions have been loaded, so they |
|
361 | 361 | # may use extension commands. Aliases can also use other alias definitions, |
|
362 | 362 | # but only if they have been defined prior to the current definition. |
|
363 | 363 | for alias, definition in ui.configitems('alias'): |
|
364 | 364 | aliasdef = cmdalias(alias, definition, cmdtable) |
|
365 | 365 | |
|
366 | 366 | try: |
|
367 | 367 | olddef = cmdtable[aliasdef.cmd][0] |
|
368 | 368 | if olddef.definition == aliasdef.definition: |
|
369 | 369 | continue |
|
370 | 370 | except (KeyError, AttributeError): |
|
371 | 371 | # definition might not exist or it might not be a cmdalias |
|
372 | 372 | pass |
|
373 | 373 | |
|
374 | 374 | cmdtable[aliasdef.name] = (aliasdef, aliasdef.opts, aliasdef.help) |
|
375 | 375 | if aliasdef.norepo: |
|
376 | 376 | commands.norepo += ' %s' % alias |
|
377 | 377 | if aliasdef.optionalrepo: |
|
378 | 378 | commands.optionalrepo += ' %s' % alias |
|
379 | 379 | |
|
380 | 380 | def _parse(ui, args): |
|
381 | 381 | options = {} |
|
382 | 382 | cmdoptions = {} |
|
383 | 383 | |
|
384 | 384 | try: |
|
385 | 385 | args = fancyopts.fancyopts(args, commands.globalopts, options) |
|
386 | 386 | except fancyopts.getopt.GetoptError, inst: |
|
387 | 387 | raise error.CommandError(None, inst) |
|
388 | 388 | |
|
389 | 389 | if args: |
|
390 | 390 | cmd, args = args[0], args[1:] |
|
391 | 391 | aliases, entry = cmdutil.findcmd(cmd, commands.table, |
|
392 | 392 | ui.configbool("ui", "strict")) |
|
393 | 393 | cmd = aliases[0] |
|
394 | 394 | args = aliasargs(entry[0], args) |
|
395 | 395 | defaults = ui.config("defaults", cmd) |
|
396 | 396 | if defaults: |
|
397 | 397 | args = map(util.expandpath, shlex.split(defaults)) + args |
|
398 | 398 | c = list(entry[1]) |
|
399 | 399 | else: |
|
400 | 400 | cmd = None |
|
401 | 401 | c = [] |
|
402 | 402 | |
|
403 | 403 | # combine global options into local |
|
404 | 404 | for o in commands.globalopts: |
|
405 | 405 | c.append((o[0], o[1], options[o[1]], o[3])) |
|
406 | 406 | |
|
407 | 407 | try: |
|
408 | 408 | args = fancyopts.fancyopts(args, c, cmdoptions, True) |
|
409 | 409 | except fancyopts.getopt.GetoptError, inst: |
|
410 | 410 | raise error.CommandError(cmd, inst) |
|
411 | 411 | |
|
412 | 412 | # separate global options back out |
|
413 | 413 | for o in commands.globalopts: |
|
414 | 414 | n = o[1] |
|
415 | 415 | options[n] = cmdoptions[n] |
|
416 | 416 | del cmdoptions[n] |
|
417 | 417 | |
|
418 | 418 | return (cmd, cmd and entry[0] or None, args, options, cmdoptions) |
|
419 | 419 | |
|
420 | 420 | def _parseconfig(ui, config): |
|
421 | 421 | """parse the --config options from the command line""" |
|
422 | 422 | configs = [] |
|
423 | 423 | |
|
424 | 424 | for cfg in config: |
|
425 | 425 | try: |
|
426 | 426 | name, value = cfg.split('=', 1) |
|
427 | 427 | section, name = name.split('.', 1) |
|
428 | 428 | if not section or not name: |
|
429 | 429 | raise IndexError |
|
430 | 430 | ui.setconfig(section, name, value) |
|
431 | 431 | configs.append((section, name, value)) |
|
432 | 432 | except (IndexError, ValueError): |
|
433 | 433 | raise util.Abort(_('malformed --config option: %r ' |
|
434 | 434 | '(use --config section.name=value)') % cfg) |
|
435 | 435 | |
|
436 | 436 | return configs |
|
437 | 437 | |
|
438 | 438 | def _earlygetopt(aliases, args): |
|
439 | 439 | """Return list of values for an option (or aliases). |
|
440 | 440 | |
|
441 | 441 | The values are listed in the order they appear in args. |
|
442 | 442 | The options and values are removed from args. |
|
443 | 443 | """ |
|
444 | 444 | try: |
|
445 | 445 | argcount = args.index("--") |
|
446 | 446 | except ValueError: |
|
447 | 447 | argcount = len(args) |
|
448 | 448 | shortopts = [opt for opt in aliases if len(opt) == 2] |
|
449 | 449 | values = [] |
|
450 | 450 | pos = 0 |
|
451 | 451 | while pos < argcount: |
|
452 | 452 | if args[pos] in aliases: |
|
453 | 453 | if pos + 1 >= argcount: |
|
454 | 454 | # ignore and let getopt report an error if there is no value |
|
455 | 455 | break |
|
456 | 456 | del args[pos] |
|
457 | 457 | values.append(args.pop(pos)) |
|
458 | 458 | argcount -= 2 |
|
459 | 459 | elif args[pos][:2] in shortopts: |
|
460 | 460 | # short option can have no following space, e.g. hg log -Rfoo |
|
461 | 461 | values.append(args.pop(pos)[2:]) |
|
462 | 462 | argcount -= 1 |
|
463 | 463 | else: |
|
464 | 464 | pos += 1 |
|
465 | 465 | return values |
|
466 | 466 | |
|
467 | 467 | def runcommand(lui, repo, cmd, fullargs, ui, options, d, cmdpats, cmdoptions): |
|
468 | 468 | # run pre-hook, and abort if it fails |
|
469 | 469 | ret = hook.hook(lui, repo, "pre-%s" % cmd, False, args=" ".join(fullargs), |
|
470 | 470 | pats=cmdpats, opts=cmdoptions) |
|
471 | 471 | if ret: |
|
472 | 472 | return ret |
|
473 | 473 | ret = _runcommand(ui, options, cmd, d) |
|
474 | 474 | # run post-hook, passing command result |
|
475 | 475 | hook.hook(lui, repo, "post-%s" % cmd, False, args=" ".join(fullargs), |
|
476 | 476 | result=ret, pats=cmdpats, opts=cmdoptions) |
|
477 | 477 | return ret |
|
478 | 478 | |
|
479 | 479 | def _getlocal(ui, rpath): |
|
480 | 480 | """Return (path, local ui object) for the given target path. |
|
481 | 481 | |
|
482 | 482 | Takes paths in [cwd]/.hg/hgrc into account." |
|
483 | 483 | """ |
|
484 | 484 | try: |
|
485 | 485 | wd = os.getcwd() |
|
486 | 486 | except OSError, e: |
|
487 | 487 | raise util.Abort(_("error getting current working directory: %s") % |
|
488 | 488 | e.strerror) |
|
489 | 489 | path = cmdutil.findrepo(wd) or "" |
|
490 | 490 | if not path: |
|
491 | 491 | lui = ui |
|
492 | 492 | else: |
|
493 | 493 | lui = ui.copy() |
|
494 | 494 | lui.readconfig(os.path.join(path, ".hg", "hgrc"), path) |
|
495 | 495 | |
|
496 | 496 | if rpath and rpath[-1]: |
|
497 | 497 | path = lui.expandpath(rpath[-1]) |
|
498 | 498 | lui = ui.copy() |
|
499 | 499 | lui.readconfig(os.path.join(path, ".hg", "hgrc"), path) |
|
500 | 500 | |
|
501 | 501 | return path, lui |
|
502 | 502 | |
|
503 | 503 | def _checkshellalias(lui, ui, args): |
|
504 | 504 | options = {} |
|
505 | 505 | |
|
506 | 506 | try: |
|
507 | 507 | args = fancyopts.fancyopts(args, commands.globalopts, options) |
|
508 | 508 | except fancyopts.getopt.GetoptError: |
|
509 | 509 | return |
|
510 | 510 | |
|
511 | 511 | if not args: |
|
512 | 512 | return |
|
513 | 513 | |
|
514 | 514 | norepo = commands.norepo |
|
515 | 515 | optionalrepo = commands.optionalrepo |
|
516 | 516 | def restorecommands(): |
|
517 | 517 | commands.norepo = norepo |
|
518 | 518 | commands.optionalrepo = optionalrepo |
|
519 | 519 | |
|
520 | 520 | cmdtable = commands.table.copy() |
|
521 | 521 | addaliases(lui, cmdtable) |
|
522 | 522 | |
|
523 | 523 | cmd = args[0] |
|
524 | 524 | try: |
|
525 | 525 | aliases, entry = cmdutil.findcmd(cmd, cmdtable, |
|
526 | 526 | lui.configbool("ui", "strict")) |
|
527 | 527 | except (error.AmbiguousCommand, error.UnknownCommand): |
|
528 | 528 | restorecommands() |
|
529 | 529 | return |
|
530 | 530 | |
|
531 | 531 | cmd = aliases[0] |
|
532 | 532 | fn = entry[0] |
|
533 | 533 | |
|
534 | 534 | if cmd and util.safehasattr(fn, 'shell'): |
|
535 | 535 | d = lambda: fn(ui, *args[1:]) |
|
536 | 536 | return lambda: runcommand(lui, None, cmd, args[:1], ui, options, d, |
|
537 | 537 | [], {}) |
|
538 | 538 | |
|
539 | 539 | restorecommands() |
|
540 | 540 | |
|
541 | 541 | _loaded = set() |
|
542 | 542 | def _dispatch(req): |
|
543 | 543 | args = req.args |
|
544 | 544 | ui = req.ui |
|
545 | 545 | |
|
546 | 546 | # read --config before doing anything else |
|
547 | 547 | # (e.g. to change trust settings for reading .hg/hgrc) |
|
548 | 548 | cfgs = _parseconfig(ui, _earlygetopt(['--config'], args)) |
|
549 | 549 | |
|
550 | 550 | # check for cwd |
|
551 | 551 | cwd = _earlygetopt(['--cwd'], args) |
|
552 | 552 | if cwd: |
|
553 | 553 | os.chdir(cwd[-1]) |
|
554 | 554 | |
|
555 | 555 | rpath = _earlygetopt(["-R", "--repository", "--repo"], args) |
|
556 | 556 | path, lui = _getlocal(ui, rpath) |
|
557 | 557 | |
|
558 | 558 | # Now that we're operating in the right directory/repository with |
|
559 | 559 | # the right config settings, check for shell aliases |
|
560 | 560 | shellaliasfn = _checkshellalias(lui, ui, args) |
|
561 | 561 | if shellaliasfn: |
|
562 | 562 | return shellaliasfn() |
|
563 | 563 | |
|
564 | 564 | # Configure extensions in phases: uisetup, extsetup, cmdtable, and |
|
565 | 565 | # reposetup. Programs like TortoiseHg will call _dispatch several |
|
566 | 566 | # times so we keep track of configured extensions in _loaded. |
|
567 | 567 | extensions.loadall(lui) |
|
568 | 568 | exts = [ext for ext in extensions.extensions() if ext[0] not in _loaded] |
|
569 | 569 | # Propagate any changes to lui.__class__ by extensions |
|
570 | 570 | ui.__class__ = lui.__class__ |
|
571 | 571 | |
|
572 | 572 | # (uisetup and extsetup are handled in extensions.loadall) |
|
573 | 573 | |
|
574 | 574 | for name, module in exts: |
|
575 | 575 | cmdtable = getattr(module, 'cmdtable', {}) |
|
576 | 576 | overrides = [cmd for cmd in cmdtable if cmd in commands.table] |
|
577 | 577 | if overrides: |
|
578 | 578 | ui.warn(_("extension '%s' overrides commands: %s\n") |
|
579 | 579 | % (name, " ".join(overrides))) |
|
580 | 580 | commands.table.update(cmdtable) |
|
581 | 581 | _loaded.add(name) |
|
582 | 582 | |
|
583 | 583 | # (reposetup is handled in hg.repository) |
|
584 | 584 | |
|
585 | 585 | addaliases(lui, commands.table) |
|
586 | 586 | |
|
587 | 587 | # check for fallback encoding |
|
588 | 588 | fallback = lui.config('ui', 'fallbackencoding') |
|
589 | 589 | if fallback: |
|
590 | 590 | encoding.fallbackencoding = fallback |
|
591 | 591 | |
|
592 | 592 | fullargs = args |
|
593 | 593 | cmd, func, args, options, cmdoptions = _parse(lui, args) |
|
594 | 594 | |
|
595 | 595 | if options["config"]: |
|
596 | 596 | raise util.Abort(_("option --config may not be abbreviated!")) |
|
597 | 597 | if options["cwd"]: |
|
598 | 598 | raise util.Abort(_("option --cwd may not be abbreviated!")) |
|
599 | 599 | if options["repository"]: |
|
600 | 600 | raise util.Abort(_( |
|
601 | 601 | "option -R has to be separated from other options (e.g. not -qR) " |
|
602 | 602 | "and --repository may only be abbreviated as --repo!")) |
|
603 | 603 | |
|
604 | 604 | if options["encoding"]: |
|
605 | 605 | encoding.encoding = options["encoding"] |
|
606 | 606 | if options["encodingmode"]: |
|
607 | 607 | encoding.encodingmode = options["encodingmode"] |
|
608 | 608 | if options["time"]: |
|
609 | 609 | def get_times(): |
|
610 | 610 | t = os.times() |
|
611 | 611 | if t[4] == 0.0: # Windows leaves this as zero, so use time.clock() |
|
612 | 612 | t = (t[0], t[1], t[2], t[3], time.clock()) |
|
613 | 613 | return t |
|
614 | 614 | s = get_times() |
|
615 | 615 | def print_time(): |
|
616 | 616 | t = get_times() |
|
617 | 617 | ui.warn(_("Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") % |
|
618 | 618 | (t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3])) |
|
619 | 619 | atexit.register(print_time) |
|
620 | 620 | |
|
621 | 621 | uis = set([ui, lui]) |
|
622 | 622 | |
|
623 | 623 | if req.repo: |
|
624 | 624 | uis.add(req.repo.ui) |
|
625 | 625 | |
|
626 | 626 | # copy configs that were passed on the cmdline (--config) to the repo ui |
|
627 | 627 | for cfg in cfgs: |
|
628 | 628 | req.repo.ui.setconfig(*cfg) |
|
629 | 629 | |
|
630 | 630 | if options['verbose'] or options['debug'] or options['quiet']: |
|
631 | 631 | for opt in ('verbose', 'debug', 'quiet'): |
|
632 | 632 | val = str(bool(options[opt])) |
|
633 | 633 | for ui_ in uis: |
|
634 | 634 | ui_.setconfig('ui', opt, val) |
|
635 | 635 | |
|
636 | 636 | if options['traceback']: |
|
637 | 637 | for ui_ in uis: |
|
638 | 638 | ui_.setconfig('ui', 'traceback', 'on') |
|
639 | 639 | |
|
640 | 640 | if options['noninteractive']: |
|
641 | 641 | for ui_ in uis: |
|
642 | 642 | ui_.setconfig('ui', 'interactive', 'off') |
|
643 | 643 | |
|
644 | 644 | if cmdoptions.get('insecure', False): |
|
645 | 645 | for ui_ in uis: |
|
646 | 646 | ui_.setconfig('web', 'cacerts', '') |
|
647 | 647 | |
|
648 | 648 | if options['version']: |
|
649 | 649 | return commands.version_(ui) |
|
650 | 650 | if options['help']: |
|
651 | 651 | return commands.help_(ui, cmd) |
|
652 | 652 | elif not cmd: |
|
653 | 653 | return commands.help_(ui, 'shortlist') |
|
654 | 654 | |
|
655 | 655 | repo = None |
|
656 | 656 | cmdpats = args[:] |
|
657 | 657 | if cmd not in commands.norepo.split(): |
|
658 | 658 | # use the repo from the request only if we don't have -R |
|
659 | 659 | if not rpath and not cwd: |
|
660 | 660 | repo = req.repo |
|
661 | 661 | |
|
662 | 662 | if repo: |
|
663 | 663 | # set the descriptors of the repo ui to those of ui |
|
664 | 664 | repo.ui.fin = ui.fin |
|
665 | 665 | repo.ui.fout = ui.fout |
|
666 | 666 | repo.ui.ferr = ui.ferr |
|
667 | 667 | else: |
|
668 | 668 | try: |
|
669 | 669 | repo = hg.repository(ui, path=path) |
|
670 | 670 | if not repo.local(): |
|
671 | 671 | raise util.Abort(_("repository '%s' is not local") % path) |
|
672 | 672 | repo.ui.setconfig("bundle", "mainreporoot", repo.root) |
|
673 | 673 | except error.RequirementError: |
|
674 | 674 | raise |
|
675 | 675 | except error.RepoError: |
|
676 | 676 | if cmd not in commands.optionalrepo.split(): |
|
677 | 677 | if args and not path: # try to infer -R from command args |
|
678 | 678 | repos = map(cmdutil.findrepo, args) |
|
679 | 679 | guess = repos[0] |
|
680 | 680 | if guess and repos.count(guess) == len(repos): |
|
681 | 681 | req.args = ['--repository', guess] + fullargs |
|
682 | 682 | return _dispatch(req) |
|
683 | 683 | if not path: |
|
684 | 684 | raise error.RepoError(_("no repository found in '%s'" |
|
685 | 685 | " (.hg not found)") |
|
686 | 686 | % os.getcwd()) |
|
687 | 687 | raise |
|
688 | 688 | if repo: |
|
689 | 689 | ui = repo.ui |
|
690 | 690 | args.insert(0, repo) |
|
691 | 691 | elif rpath: |
|
692 | 692 | ui.warn(_("warning: --repository ignored\n")) |
|
693 | 693 | |
|
694 | 694 | msg = ' '.join(' ' in a and repr(a) or a for a in fullargs) |
|
695 | 695 | ui.log("command", msg + "\n") |
|
696 | 696 | d = lambda: util.checksignature(func)(ui, *args, **cmdoptions) |
|
697 | 697 | try: |
|
698 | 698 | return runcommand(lui, repo, cmd, fullargs, ui, options, d, |
|
699 | 699 | cmdpats, cmdoptions) |
|
700 | 700 | finally: |
|
701 | 701 | if repo and repo != req.repo: |
|
702 | 702 | repo.close() |
|
703 | 703 | |
|
704 | 704 | def lsprofile(ui, func, fp): |
|
705 | 705 | format = ui.config('profiling', 'format', default='text') |
|
706 | 706 | field = ui.config('profiling', 'sort', default='inlinetime') |
|
707 | 707 | climit = ui.configint('profiling', 'nested', default=5) |
|
708 | 708 | |
|
709 | 709 | if format not in ['text', 'kcachegrind']: |
|
710 | 710 | ui.warn(_("unrecognized profiling format '%s'" |
|
711 | 711 | " - Ignored\n") % format) |
|
712 | 712 | format = 'text' |
|
713 | 713 | |
|
714 | 714 | try: |
|
715 | 715 | from mercurial import lsprof |
|
716 | 716 | except ImportError: |
|
717 | 717 | raise util.Abort(_( |
|
718 | 718 | 'lsprof not available - install from ' |
|
719 | 719 | 'http://codespeak.net/svn/user/arigo/hack/misc/lsprof/')) |
|
720 | 720 | p = lsprof.Profiler() |
|
721 | 721 | p.enable(subcalls=True) |
|
722 | 722 | try: |
|
723 | 723 | return func() |
|
724 | 724 | finally: |
|
725 | 725 | p.disable() |
|
726 | 726 | |
|
727 | 727 | if format == 'kcachegrind': |
|
728 | 728 | import lsprofcalltree |
|
729 | 729 | calltree = lsprofcalltree.KCacheGrind(p) |
|
730 | 730 | calltree.output(fp) |
|
731 | 731 | else: |
|
732 | 732 | # format == 'text' |
|
733 | 733 | stats = lsprof.Stats(p.getstats()) |
|
734 | 734 | stats.sort(field) |
|
735 | 735 | stats.pprint(limit=30, file=fp, climit=climit) |
|
736 | 736 | |
|
737 | 737 | def statprofile(ui, func, fp): |
|
738 | 738 | try: |
|
739 | 739 | import statprof |
|
740 | 740 | except ImportError: |
|
741 | 741 | raise util.Abort(_( |
|
742 | 742 | 'statprof not available - install using "easy_install statprof"')) |
|
743 | 743 | |
|
744 | 744 | freq = ui.configint('profiling', 'freq', default=1000) |
|
745 | 745 | if freq > 0: |
|
746 | 746 | statprof.reset(freq) |
|
747 | 747 | else: |
|
748 | 748 | ui.warn(_("invalid sampling frequency '%s' - ignoring\n") % freq) |
|
749 | 749 | |
|
750 | 750 | statprof.start() |
|
751 | 751 | try: |
|
752 | 752 | return func() |
|
753 | 753 | finally: |
|
754 | 754 | statprof.stop() |
|
755 | 755 | statprof.display(fp) |
|
756 | 756 | |
|
757 | 757 | def _runcommand(ui, options, cmd, cmdfunc): |
|
758 | 758 | def checkargs(): |
|
759 | 759 | try: |
|
760 | 760 | return cmdfunc() |
|
761 | 761 | except error.SignatureError: |
|
762 | 762 | raise error.CommandError(cmd, _("invalid arguments")) |
|
763 | 763 | |
|
764 | 764 | if options['profile']: |
|
765 | 765 | profiler = os.getenv('HGPROF') |
|
766 | 766 | if profiler is None: |
|
767 | 767 | profiler = ui.config('profiling', 'type', default='ls') |
|
768 | 768 | if profiler not in ('ls', 'stat'): |
|
769 | 769 | ui.warn(_("unrecognized profiler '%s' - ignored\n") % profiler) |
|
770 | 770 | profiler = 'ls' |
|
771 | 771 | |
|
772 | 772 | output = ui.config('profiling', 'output') |
|
773 | 773 | |
|
774 | 774 | if output: |
|
775 | 775 | path = ui.expandpath(output) |
|
776 | 776 | fp = open(path, 'wb') |
|
777 | 777 | else: |
|
778 | 778 | fp = sys.stderr |
|
779 | 779 | |
|
780 | 780 | try: |
|
781 | 781 | if profiler == 'ls': |
|
782 | 782 | return lsprofile(ui, checkargs, fp) |
|
783 | 783 | else: |
|
784 | 784 | return statprofile(ui, checkargs, fp) |
|
785 | 785 | finally: |
|
786 | 786 | if output: |
|
787 | 787 | fp.close() |
|
788 | 788 | else: |
|
789 | 789 | return checkargs() |
@@ -1,586 +1,586 b'' | |||
|
1 | 1 | # hg.py - repository classes for mercurial |
|
2 | 2 | # |
|
3 | 3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
4 | 4 | # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com> |
|
5 | 5 | # |
|
6 | 6 | # This software may be used and distributed according to the terms of the |
|
7 | 7 | # GNU General Public License version 2 or any later version. |
|
8 | 8 | |
|
9 | 9 | from i18n import _ |
|
10 | 10 | from lock import release |
|
11 | 11 | from node import hex, nullid |
|
12 | 12 | import localrepo, bundlerepo, httprepo, sshrepo, statichttprepo, bookmarks |
|
13 | 13 | import lock, util, extensions, error, node, scmutil |
|
14 | 14 | import cmdutil, discovery |
|
15 | 15 | import merge as mergemod |
|
16 | 16 | import verify as verifymod |
|
17 | 17 | import errno, os, shutil |
|
18 | 18 | |
|
19 | 19 | def _local(path): |
|
20 | 20 | path = util.expandpath(util.urllocalpath(path)) |
|
21 | 21 | return (os.path.isfile(path) and bundlerepo or localrepo) |
|
22 | 22 | |
|
23 | 23 | def addbranchrevs(lrepo, repo, branches, revs): |
|
24 | 24 | hashbranch, branches = branches |
|
25 | 25 | if not hashbranch and not branches: |
|
26 | 26 | return revs or None, revs and revs[0] or None |
|
27 | 27 | revs = revs and list(revs) or [] |
|
28 | 28 | if not repo.capable('branchmap'): |
|
29 | 29 | if branches: |
|
30 | 30 | raise util.Abort(_("remote branch lookup not supported")) |
|
31 | 31 | revs.append(hashbranch) |
|
32 | 32 | return revs, revs[0] |
|
33 | 33 | branchmap = repo.branchmap() |
|
34 | 34 | |
|
35 | 35 | def primary(branch): |
|
36 | 36 | if branch == '.': |
|
37 | 37 | if not lrepo or not lrepo.local(): |
|
38 | 38 | raise util.Abort(_("dirstate branch not accessible")) |
|
39 | 39 | branch = lrepo.dirstate.branch() |
|
40 | 40 | if branch in branchmap: |
|
41 | 41 | revs.extend(node.hex(r) for r in reversed(branchmap[branch])) |
|
42 | 42 | return True |
|
43 | 43 | else: |
|
44 | 44 | return False |
|
45 | 45 | |
|
46 | 46 | for branch in branches: |
|
47 | 47 | if not primary(branch): |
|
48 | 48 | raise error.RepoLookupError(_("unknown branch '%s'") % branch) |
|
49 | 49 | if hashbranch: |
|
50 | 50 | if not primary(hashbranch): |
|
51 | 51 | revs.append(hashbranch) |
|
52 | 52 | return revs, revs[0] |
|
53 | 53 | |
|
54 | 54 | def parseurl(path, branches=None): |
|
55 | 55 | '''parse url#branch, returning (url, (branch, branches))''' |
|
56 | 56 | |
|
57 | 57 | u = util.url(path) |
|
58 | 58 | branch = None |
|
59 | 59 | if u.fragment: |
|
60 | 60 | branch = u.fragment |
|
61 | 61 | u.fragment = None |
|
62 | 62 | return str(u), (branch, branches or []) |
|
63 | 63 | |
|
64 | 64 | schemes = { |
|
65 | 65 | 'bundle': bundlerepo, |
|
66 | 66 | 'file': _local, |
|
67 | 67 | 'http': httprepo, |
|
68 | 68 | 'https': httprepo, |
|
69 | 69 | 'ssh': sshrepo, |
|
70 | 70 | 'static-http': statichttprepo, |
|
71 | 71 | } |
|
72 | 72 | |
|
73 | 73 | def _peerlookup(path): |
|
74 | 74 | u = util.url(path) |
|
75 | 75 | scheme = u.scheme or 'file' |
|
76 | 76 | thing = schemes.get(scheme) or schemes['file'] |
|
77 | 77 | try: |
|
78 | 78 | return thing(path) |
|
79 | 79 | except TypeError: |
|
80 | 80 | return thing |
|
81 | 81 | |
|
82 | 82 | def islocal(repo): |
|
83 | 83 | '''return true if repo or path is local''' |
|
84 | 84 | if isinstance(repo, str): |
|
85 | 85 | try: |
|
86 | 86 | return _peerlookup(repo).islocal(repo) |
|
87 | 87 | except AttributeError: |
|
88 | 88 | return False |
|
89 | 89 | return repo.local() |
|
90 | 90 | |
|
91 | 91 | def repository(ui, path='', create=False): |
|
92 | 92 | """return a repository object for the specified path""" |
|
93 | 93 | repo = _peerlookup(path).instance(ui, path, create) |
|
94 | 94 | ui = getattr(repo, "ui", ui) |
|
95 | 95 | for name, module in extensions.extensions(): |
|
96 | 96 | hook = getattr(module, 'reposetup', None) |
|
97 | 97 | if hook: |
|
98 | 98 | hook(ui, repo) |
|
99 | 99 | return repo |
|
100 | 100 | |
|
101 | 101 | def peer(uiorrepo, opts, path, create=False): |
|
102 | 102 | '''return a repository peer for the specified path''' |
|
103 | 103 | rui = remoteui(uiorrepo, opts) |
|
104 | 104 | return repository(rui, path, create) |
|
105 | 105 | |
|
106 | 106 | def defaultdest(source): |
|
107 | 107 | '''return default destination of clone if none is given''' |
|
108 | 108 | return os.path.basename(os.path.normpath(source)) |
|
109 | 109 | |
|
110 | 110 | def share(ui, source, dest=None, update=True): |
|
111 | 111 | '''create a shared repository''' |
|
112 | 112 | |
|
113 | 113 | if not islocal(source): |
|
114 | 114 | raise util.Abort(_('can only share local repositories')) |
|
115 | 115 | |
|
116 | 116 | if not dest: |
|
117 | 117 | dest = defaultdest(source) |
|
118 | 118 | else: |
|
119 | 119 | dest = ui.expandpath(dest) |
|
120 | 120 | |
|
121 | 121 | if isinstance(source, str): |
|
122 | 122 | origsource = ui.expandpath(source) |
|
123 | 123 | source, branches = parseurl(origsource) |
|
124 | 124 | srcrepo = repository(ui, source) |
|
125 | 125 | rev, checkout = addbranchrevs(srcrepo, srcrepo, branches, None) |
|
126 | 126 | else: |
|
127 | 127 | srcrepo = source |
|
128 | 128 | origsource = source = srcrepo.url() |
|
129 | 129 | checkout = None |
|
130 | 130 | |
|
131 | 131 | sharedpath = srcrepo.sharedpath # if our source is already sharing |
|
132 | 132 | |
|
133 | 133 | root = os.path.realpath(dest) |
|
134 | 134 | roothg = os.path.join(root, '.hg') |
|
135 | 135 | |
|
136 | 136 | if os.path.exists(roothg): |
|
137 | 137 | raise util.Abort(_('destination already exists')) |
|
138 | 138 | |
|
139 | 139 | if not os.path.isdir(root): |
|
140 | 140 | os.mkdir(root) |
|
141 | 141 | util.makedir(roothg, notindexed=True) |
|
142 | 142 | |
|
143 | 143 | requirements = '' |
|
144 | 144 | try: |
|
145 | 145 | requirements = srcrepo.opener.read('requires') |
|
146 | 146 | except IOError, inst: |
|
147 | 147 | if inst.errno != errno.ENOENT: |
|
148 | 148 | raise |
|
149 | 149 | |
|
150 | 150 | requirements += 'shared\n' |
|
151 | 151 | util.writefile(os.path.join(roothg, 'requires'), requirements) |
|
152 | 152 | util.writefile(os.path.join(roothg, 'sharedpath'), sharedpath) |
|
153 | 153 | |
|
154 | 154 | r = repository(ui, root) |
|
155 | 155 | |
|
156 | 156 | default = srcrepo.ui.config('paths', 'default') |
|
157 | 157 | if default: |
|
158 | 158 | fp = r.opener("hgrc", "w", text=True) |
|
159 | 159 | fp.write("[paths]\n") |
|
160 | 160 | fp.write("default = %s\n" % default) |
|
161 | 161 | fp.close() |
|
162 | 162 | |
|
163 | 163 | if update: |
|
164 | 164 | r.ui.status(_("updating working directory\n")) |
|
165 | 165 | if update is not True: |
|
166 | 166 | checkout = update |
|
167 | 167 | for test in (checkout, 'default', 'tip'): |
|
168 | 168 | if test is None: |
|
169 | 169 | continue |
|
170 | 170 | try: |
|
171 | 171 | uprev = r.lookup(test) |
|
172 | 172 | break |
|
173 | 173 | except error.RepoLookupError: |
|
174 | 174 | continue |
|
175 | 175 | _update(r, uprev) |
|
176 | 176 | |
|
177 | 177 | def copystore(ui, srcrepo, destpath): |
|
178 | 178 | '''copy files from store of srcrepo in destpath |
|
179 | 179 | |
|
180 | 180 | returns destlock |
|
181 | 181 | ''' |
|
182 | 182 | destlock = None |
|
183 | 183 | try: |
|
184 | 184 | hardlink = None |
|
185 | 185 | num = 0 |
|
186 | 186 | srcpublishing = srcrepo.ui.configbool('phases', 'publish', True) |
|
187 | 187 | for f in srcrepo.store.copylist(): |
|
188 | 188 | if srcpublishing and f.endswith('phaseroots'): |
|
189 | 189 | continue |
|
190 | 190 | src = os.path.join(srcrepo.sharedpath, f) |
|
191 | 191 | dst = os.path.join(destpath, f) |
|
192 | 192 | dstbase = os.path.dirname(dst) |
|
193 | 193 | if dstbase and not os.path.exists(dstbase): |
|
194 | 194 | os.mkdir(dstbase) |
|
195 | 195 | if os.path.exists(src): |
|
196 | 196 | if dst.endswith('data'): |
|
197 | 197 | # lock to avoid premature writing to the target |
|
198 | 198 | destlock = lock.lock(os.path.join(dstbase, "lock")) |
|
199 | 199 | hardlink, n = util.copyfiles(src, dst, hardlink) |
|
200 | 200 | num += n |
|
201 | 201 | if hardlink: |
|
202 | 202 | ui.debug("linked %d files\n" % num) |
|
203 | 203 | else: |
|
204 | 204 | ui.debug("copied %d files\n" % num) |
|
205 | 205 | return destlock |
|
206 | except: | |
|
206 | except: # re-raises | |
|
207 | 207 | release(destlock) |
|
208 | 208 | raise |
|
209 | 209 | |
|
210 | 210 | def clone(ui, peeropts, source, dest=None, pull=False, rev=None, |
|
211 | 211 | update=True, stream=False, branch=None): |
|
212 | 212 | """Make a copy of an existing repository. |
|
213 | 213 | |
|
214 | 214 | Create a copy of an existing repository in a new directory. The |
|
215 | 215 | source and destination are URLs, as passed to the repository |
|
216 | 216 | function. Returns a pair of repository objects, the source and |
|
217 | 217 | newly created destination. |
|
218 | 218 | |
|
219 | 219 | The location of the source is added to the new repository's |
|
220 | 220 | .hg/hgrc file, as the default to be used for future pulls and |
|
221 | 221 | pushes. |
|
222 | 222 | |
|
223 | 223 | If an exception is raised, the partly cloned/updated destination |
|
224 | 224 | repository will be deleted. |
|
225 | 225 | |
|
226 | 226 | Arguments: |
|
227 | 227 | |
|
228 | 228 | source: repository object or URL |
|
229 | 229 | |
|
230 | 230 | dest: URL of destination repository to create (defaults to base |
|
231 | 231 | name of source repository) |
|
232 | 232 | |
|
233 | 233 | pull: always pull from source repository, even in local case |
|
234 | 234 | |
|
235 | 235 | stream: stream raw data uncompressed from repository (fast over |
|
236 | 236 | LAN, slow over WAN) |
|
237 | 237 | |
|
238 | 238 | rev: revision to clone up to (implies pull=True) |
|
239 | 239 | |
|
240 | 240 | update: update working directory after clone completes, if |
|
241 | 241 | destination is local repository (True means update to default rev, |
|
242 | 242 | anything else is treated as a revision) |
|
243 | 243 | |
|
244 | 244 | branch: branches to clone |
|
245 | 245 | """ |
|
246 | 246 | |
|
247 | 247 | if isinstance(source, str): |
|
248 | 248 | origsource = ui.expandpath(source) |
|
249 | 249 | source, branch = parseurl(origsource, branch) |
|
250 | 250 | srcrepo = repository(remoteui(ui, peeropts), source) |
|
251 | 251 | else: |
|
252 | 252 | srcrepo = source |
|
253 | 253 | branch = (None, branch or []) |
|
254 | 254 | origsource = source = srcrepo.url() |
|
255 | 255 | rev, checkout = addbranchrevs(srcrepo, srcrepo, branch, rev) |
|
256 | 256 | |
|
257 | 257 | if dest is None: |
|
258 | 258 | dest = defaultdest(source) |
|
259 | 259 | ui.status(_("destination directory: %s\n") % dest) |
|
260 | 260 | else: |
|
261 | 261 | dest = ui.expandpath(dest) |
|
262 | 262 | |
|
263 | 263 | dest = util.urllocalpath(dest) |
|
264 | 264 | source = util.urllocalpath(source) |
|
265 | 265 | |
|
266 | 266 | if os.path.exists(dest): |
|
267 | 267 | if not os.path.isdir(dest): |
|
268 | 268 | raise util.Abort(_("destination '%s' already exists") % dest) |
|
269 | 269 | elif os.listdir(dest): |
|
270 | 270 | raise util.Abort(_("destination '%s' is not empty") % dest) |
|
271 | 271 | |
|
272 | 272 | class DirCleanup(object): |
|
273 | 273 | def __init__(self, dir_): |
|
274 | 274 | self.rmtree = shutil.rmtree |
|
275 | 275 | self.dir_ = dir_ |
|
276 | 276 | def close(self): |
|
277 | 277 | self.dir_ = None |
|
278 | 278 | def cleanup(self): |
|
279 | 279 | if self.dir_: |
|
280 | 280 | self.rmtree(self.dir_, True) |
|
281 | 281 | |
|
282 | 282 | srclock = destlock = dircleanup = None |
|
283 | 283 | try: |
|
284 | 284 | abspath = origsource |
|
285 | 285 | if islocal(origsource): |
|
286 | 286 | abspath = os.path.abspath(util.urllocalpath(origsource)) |
|
287 | 287 | |
|
288 | 288 | if islocal(dest): |
|
289 | 289 | dircleanup = DirCleanup(dest) |
|
290 | 290 | |
|
291 | 291 | copy = False |
|
292 | 292 | if srcrepo.cancopy() and islocal(dest) and not srcrepo.revs("secret()"): |
|
293 | 293 | copy = not pull and not rev |
|
294 | 294 | |
|
295 | 295 | if copy: |
|
296 | 296 | try: |
|
297 | 297 | # we use a lock here because if we race with commit, we |
|
298 | 298 | # can end up with extra data in the cloned revlogs that's |
|
299 | 299 | # not pointed to by changesets, thus causing verify to |
|
300 | 300 | # fail |
|
301 | 301 | srclock = srcrepo.lock(wait=False) |
|
302 | 302 | except error.LockError: |
|
303 | 303 | copy = False |
|
304 | 304 | |
|
305 | 305 | if copy: |
|
306 | 306 | srcrepo.hook('preoutgoing', throw=True, source='clone') |
|
307 | 307 | hgdir = os.path.realpath(os.path.join(dest, ".hg")) |
|
308 | 308 | if not os.path.exists(dest): |
|
309 | 309 | os.mkdir(dest) |
|
310 | 310 | else: |
|
311 | 311 | # only clean up directories we create ourselves |
|
312 | 312 | dircleanup.dir_ = hgdir |
|
313 | 313 | try: |
|
314 | 314 | destpath = hgdir |
|
315 | 315 | util.makedir(destpath, notindexed=True) |
|
316 | 316 | except OSError, inst: |
|
317 | 317 | if inst.errno == errno.EEXIST: |
|
318 | 318 | dircleanup.close() |
|
319 | 319 | raise util.Abort(_("destination '%s' already exists") |
|
320 | 320 | % dest) |
|
321 | 321 | raise |
|
322 | 322 | |
|
323 | 323 | destlock = copystore(ui, srcrepo, destpath) |
|
324 | 324 | |
|
325 | 325 | # we need to re-init the repo after manually copying the data |
|
326 | 326 | # into it |
|
327 | 327 | destrepo = repository(remoteui(ui, peeropts), dest) |
|
328 | 328 | srcrepo.hook('outgoing', source='clone', |
|
329 | 329 | node=node.hex(node.nullid)) |
|
330 | 330 | else: |
|
331 | 331 | try: |
|
332 | 332 | destrepo = repository(remoteui(ui, peeropts), dest, |
|
333 | 333 | create=True) |
|
334 | 334 | except OSError, inst: |
|
335 | 335 | if inst.errno == errno.EEXIST: |
|
336 | 336 | dircleanup.close() |
|
337 | 337 | raise util.Abort(_("destination '%s' already exists") |
|
338 | 338 | % dest) |
|
339 | 339 | raise |
|
340 | 340 | |
|
341 | 341 | revs = None |
|
342 | 342 | if rev: |
|
343 | 343 | if not srcrepo.capable('lookup'): |
|
344 | 344 | raise util.Abort(_("src repository does not support " |
|
345 | 345 | "revision lookup and so doesn't " |
|
346 | 346 | "support clone by revision")) |
|
347 | 347 | revs = [srcrepo.lookup(r) for r in rev] |
|
348 | 348 | checkout = revs[0] |
|
349 | 349 | if destrepo.local(): |
|
350 | 350 | destrepo.clone(srcrepo, heads=revs, stream=stream) |
|
351 | 351 | elif srcrepo.local(): |
|
352 | 352 | srcrepo.push(destrepo, revs=revs) |
|
353 | 353 | else: |
|
354 | 354 | raise util.Abort(_("clone from remote to remote not supported")) |
|
355 | 355 | |
|
356 | 356 | if dircleanup: |
|
357 | 357 | dircleanup.close() |
|
358 | 358 | |
|
359 | 359 | # clone all bookmarks except divergent ones |
|
360 | 360 | if destrepo.local() and srcrepo.capable("pushkey"): |
|
361 | 361 | rb = srcrepo.listkeys('bookmarks') |
|
362 | 362 | for k, n in rb.iteritems(): |
|
363 | 363 | try: |
|
364 | 364 | m = destrepo.lookup(n) |
|
365 | 365 | destrepo._bookmarks[k] = m |
|
366 | 366 | except error.RepoLookupError: |
|
367 | 367 | pass |
|
368 | 368 | if rb: |
|
369 | 369 | bookmarks.write(destrepo) |
|
370 | 370 | elif srcrepo.local() and destrepo.capable("pushkey"): |
|
371 | 371 | for k, n in srcrepo._bookmarks.iteritems(): |
|
372 | 372 | destrepo.pushkey('bookmarks', k, '', hex(n)) |
|
373 | 373 | |
|
374 | 374 | if destrepo.local(): |
|
375 | 375 | fp = destrepo.opener("hgrc", "w", text=True) |
|
376 | 376 | fp.write("[paths]\n") |
|
377 | 377 | u = util.url(abspath) |
|
378 | 378 | u.passwd = None |
|
379 | 379 | defaulturl = str(u) |
|
380 | 380 | fp.write("default = %s\n" % defaulturl) |
|
381 | 381 | fp.close() |
|
382 | 382 | |
|
383 | 383 | destrepo.ui.setconfig('paths', 'default', defaulturl) |
|
384 | 384 | |
|
385 | 385 | if update: |
|
386 | 386 | if update is not True: |
|
387 | 387 | checkout = update |
|
388 | 388 | if srcrepo.local(): |
|
389 | 389 | checkout = srcrepo.lookup(update) |
|
390 | 390 | for test in (checkout, 'default', 'tip'): |
|
391 | 391 | if test is None: |
|
392 | 392 | continue |
|
393 | 393 | try: |
|
394 | 394 | uprev = destrepo.lookup(test) |
|
395 | 395 | break |
|
396 | 396 | except error.RepoLookupError: |
|
397 | 397 | continue |
|
398 | 398 | bn = destrepo[uprev].branch() |
|
399 | 399 | destrepo.ui.status(_("updating to branch %s\n") % bn) |
|
400 | 400 | _update(destrepo, uprev) |
|
401 | 401 | |
|
402 | 402 | return srcrepo, destrepo |
|
403 | 403 | finally: |
|
404 | 404 | release(srclock, destlock) |
|
405 | 405 | if dircleanup is not None: |
|
406 | 406 | dircleanup.cleanup() |
|
407 | 407 | if srcrepo is not None: |
|
408 | 408 | srcrepo.close() |
|
409 | 409 | |
|
410 | 410 | def _showstats(repo, stats): |
|
411 | 411 | repo.ui.status(_("%d files updated, %d files merged, " |
|
412 | 412 | "%d files removed, %d files unresolved\n") % stats) |
|
413 | 413 | |
|
414 | 414 | def update(repo, node): |
|
415 | 415 | """update the working directory to node, merging linear changes""" |
|
416 | 416 | stats = mergemod.update(repo, node, False, False, None) |
|
417 | 417 | _showstats(repo, stats) |
|
418 | 418 | if stats[3]: |
|
419 | 419 | repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n")) |
|
420 | 420 | return stats[3] > 0 |
|
421 | 421 | |
|
422 | 422 | # naming conflict in clone() |
|
423 | 423 | _update = update |
|
424 | 424 | |
|
425 | 425 | def clean(repo, node, show_stats=True): |
|
426 | 426 | """forcibly switch the working directory to node, clobbering changes""" |
|
427 | 427 | stats = mergemod.update(repo, node, False, True, None) |
|
428 | 428 | if show_stats: |
|
429 | 429 | _showstats(repo, stats) |
|
430 | 430 | return stats[3] > 0 |
|
431 | 431 | |
|
432 | 432 | def merge(repo, node, force=None, remind=True): |
|
433 | 433 | """Branch merge with node, resolving changes. Return true if any |
|
434 | 434 | unresolved conflicts.""" |
|
435 | 435 | stats = mergemod.update(repo, node, True, force, False) |
|
436 | 436 | _showstats(repo, stats) |
|
437 | 437 | if stats[3]: |
|
438 | 438 | repo.ui.status(_("use 'hg resolve' to retry unresolved file merges " |
|
439 | 439 | "or 'hg update -C .' to abandon\n")) |
|
440 | 440 | elif remind: |
|
441 | 441 | repo.ui.status(_("(branch merge, don't forget to commit)\n")) |
|
442 | 442 | return stats[3] > 0 |
|
443 | 443 | |
|
444 | 444 | def _incoming(displaychlist, subreporecurse, ui, repo, source, |
|
445 | 445 | opts, buffered=False): |
|
446 | 446 | """ |
|
447 | 447 | Helper for incoming / gincoming. |
|
448 | 448 | displaychlist gets called with |
|
449 | 449 | (remoterepo, incomingchangesetlist, displayer) parameters, |
|
450 | 450 | and is supposed to contain only code that can't be unified. |
|
451 | 451 | """ |
|
452 | 452 | source, branches = parseurl(ui.expandpath(source), opts.get('branch')) |
|
453 | 453 | other = peer(repo, opts, source) |
|
454 | 454 | ui.status(_('comparing with %s\n') % util.hidepassword(source)) |
|
455 | 455 | revs, checkout = addbranchrevs(repo, other, branches, opts.get('rev')) |
|
456 | 456 | |
|
457 | 457 | if revs: |
|
458 | 458 | revs = [other.lookup(rev) for rev in revs] |
|
459 | 459 | other, chlist, cleanupfn = bundlerepo.getremotechanges(ui, repo, other, |
|
460 | 460 | revs, opts["bundle"], opts["force"]) |
|
461 | 461 | try: |
|
462 | 462 | if not chlist: |
|
463 | 463 | ui.status(_("no changes found\n")) |
|
464 | 464 | return subreporecurse() |
|
465 | 465 | |
|
466 | 466 | displayer = cmdutil.show_changeset(ui, other, opts, buffered) |
|
467 | 467 | |
|
468 | 468 | # XXX once graphlog extension makes it into core, |
|
469 | 469 | # should be replaced by a if graph/else |
|
470 | 470 | displaychlist(other, chlist, displayer) |
|
471 | 471 | |
|
472 | 472 | displayer.close() |
|
473 | 473 | finally: |
|
474 | 474 | cleanupfn() |
|
475 | 475 | subreporecurse() |
|
476 | 476 | return 0 # exit code is zero since we found incoming changes |
|
477 | 477 | |
|
478 | 478 | def incoming(ui, repo, source, opts): |
|
479 | 479 | def subreporecurse(): |
|
480 | 480 | ret = 1 |
|
481 | 481 | if opts.get('subrepos'): |
|
482 | 482 | ctx = repo[None] |
|
483 | 483 | for subpath in sorted(ctx.substate): |
|
484 | 484 | sub = ctx.sub(subpath) |
|
485 | 485 | ret = min(ret, sub.incoming(ui, source, opts)) |
|
486 | 486 | return ret |
|
487 | 487 | |
|
488 | 488 | def display(other, chlist, displayer): |
|
489 | 489 | limit = cmdutil.loglimit(opts) |
|
490 | 490 | if opts.get('newest_first'): |
|
491 | 491 | chlist.reverse() |
|
492 | 492 | count = 0 |
|
493 | 493 | for n in chlist: |
|
494 | 494 | if limit is not None and count >= limit: |
|
495 | 495 | break |
|
496 | 496 | parents = [p for p in other.changelog.parents(n) if p != nullid] |
|
497 | 497 | if opts.get('no_merges') and len(parents) == 2: |
|
498 | 498 | continue |
|
499 | 499 | count += 1 |
|
500 | 500 | displayer.show(other[n]) |
|
501 | 501 | return _incoming(display, subreporecurse, ui, repo, source, opts) |
|
502 | 502 | |
|
503 | 503 | def _outgoing(ui, repo, dest, opts): |
|
504 | 504 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
505 | 505 | dest, branches = parseurl(dest, opts.get('branch')) |
|
506 | 506 | ui.status(_('comparing with %s\n') % util.hidepassword(dest)) |
|
507 | 507 | revs, checkout = addbranchrevs(repo, repo, branches, opts.get('rev')) |
|
508 | 508 | if revs: |
|
509 | 509 | revs = [repo.lookup(rev) for rev in revs] |
|
510 | 510 | |
|
511 | 511 | other = peer(repo, opts, dest) |
|
512 | 512 | outgoing = discovery.findcommonoutgoing(repo, other, revs, |
|
513 | 513 | force=opts.get('force')) |
|
514 | 514 | o = outgoing.missing |
|
515 | 515 | if not o: |
|
516 | 516 | scmutil.nochangesfound(repo.ui, outgoing.excluded) |
|
517 | 517 | return None |
|
518 | 518 | return o |
|
519 | 519 | |
|
520 | 520 | def outgoing(ui, repo, dest, opts): |
|
521 | 521 | def recurse(): |
|
522 | 522 | ret = 1 |
|
523 | 523 | if opts.get('subrepos'): |
|
524 | 524 | ctx = repo[None] |
|
525 | 525 | for subpath in sorted(ctx.substate): |
|
526 | 526 | sub = ctx.sub(subpath) |
|
527 | 527 | ret = min(ret, sub.outgoing(ui, dest, opts)) |
|
528 | 528 | return ret |
|
529 | 529 | |
|
530 | 530 | limit = cmdutil.loglimit(opts) |
|
531 | 531 | o = _outgoing(ui, repo, dest, opts) |
|
532 | 532 | if o is None: |
|
533 | 533 | return recurse() |
|
534 | 534 | |
|
535 | 535 | if opts.get('newest_first'): |
|
536 | 536 | o.reverse() |
|
537 | 537 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
538 | 538 | count = 0 |
|
539 | 539 | for n in o: |
|
540 | 540 | if limit is not None and count >= limit: |
|
541 | 541 | break |
|
542 | 542 | parents = [p for p in repo.changelog.parents(n) if p != nullid] |
|
543 | 543 | if opts.get('no_merges') and len(parents) == 2: |
|
544 | 544 | continue |
|
545 | 545 | count += 1 |
|
546 | 546 | displayer.show(repo[n]) |
|
547 | 547 | displayer.close() |
|
548 | 548 | recurse() |
|
549 | 549 | return 0 # exit code is zero since we found outgoing changes |
|
550 | 550 | |
|
551 | 551 | def revert(repo, node, choose): |
|
552 | 552 | """revert changes to revision in node without updating dirstate""" |
|
553 | 553 | return mergemod.update(repo, node, False, True, choose)[3] > 0 |
|
554 | 554 | |
|
555 | 555 | def verify(repo): |
|
556 | 556 | """verify the consistency of a repository""" |
|
557 | 557 | return verifymod.verify(repo) |
|
558 | 558 | |
|
559 | 559 | def remoteui(src, opts): |
|
560 | 560 | 'build a remote ui from ui or repo and opts' |
|
561 | 561 | if util.safehasattr(src, 'baseui'): # looks like a repository |
|
562 | 562 | dst = src.baseui.copy() # drop repo-specific config |
|
563 | 563 | src = src.ui # copy target options from repo |
|
564 | 564 | else: # assume it's a global ui object |
|
565 | 565 | dst = src.copy() # keep all global options |
|
566 | 566 | |
|
567 | 567 | # copy ssh-specific options |
|
568 | 568 | for o in 'ssh', 'remotecmd': |
|
569 | 569 | v = opts.get(o) or src.config('ui', o) |
|
570 | 570 | if v: |
|
571 | 571 | dst.setconfig("ui", o, v) |
|
572 | 572 | |
|
573 | 573 | # copy bundle-specific options |
|
574 | 574 | r = src.config('bundle', 'mainreporoot') |
|
575 | 575 | if r: |
|
576 | 576 | dst.setconfig('bundle', 'mainreporoot', r) |
|
577 | 577 | |
|
578 | 578 | # copy selected local settings to the remote ui |
|
579 | 579 | for sect in ('auth', 'hostfingerprints', 'http_proxy'): |
|
580 | 580 | for key, val in src.configitems(sect): |
|
581 | 581 | dst.setconfig(sect, key, val) |
|
582 | 582 | v = src.config('web', 'cacerts') |
|
583 | 583 | if v: |
|
584 | 584 | dst.setconfig('web', 'cacerts', util.expandpath(v)) |
|
585 | 585 | |
|
586 | 586 | return dst |
@@ -1,764 +1,764 b'' | |||
|
1 | 1 | # This library is free software; you can redistribute it and/or |
|
2 | 2 | # modify it under the terms of the GNU Lesser General Public |
|
3 | 3 | # License as published by the Free Software Foundation; either |
|
4 | 4 | # version 2.1 of the License, or (at your option) any later version. |
|
5 | 5 | # |
|
6 | 6 | # This library is distributed in the hope that it will be useful, |
|
7 | 7 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
8 | 8 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
9 | 9 | # Lesser General Public License for more details. |
|
10 | 10 | # |
|
11 | 11 | # You should have received a copy of the GNU Lesser General Public |
|
12 | 12 | # License along with this library; if not, see |
|
13 | 13 | # <http://www.gnu.org/licenses/>. |
|
14 | 14 | |
|
15 | 15 | # This file is part of urlgrabber, a high-level cross-protocol url-grabber |
|
16 | 16 | # Copyright 2002-2004 Michael D. Stenner, Ryan Tomayko |
|
17 | 17 | |
|
18 | 18 | # Modified by Benoit Boissinot: |
|
19 | 19 | # - fix for digest auth (inspired from urllib2.py @ Python v2.4) |
|
20 | 20 | # Modified by Dirkjan Ochtman: |
|
21 | 21 | # - import md5 function from a local util module |
|
22 | 22 | # Modified by Martin Geisler: |
|
23 | 23 | # - moved md5 function from local util module to this module |
|
24 | 24 | # Modified by Augie Fackler: |
|
25 | 25 | # - add safesend method and use it to prevent broken pipe errors |
|
26 | 26 | # on large POST requests |
|
27 | 27 | |
|
28 | 28 | """An HTTP handler for urllib2 that supports HTTP 1.1 and keepalive. |
|
29 | 29 | |
|
30 | 30 | >>> import urllib2 |
|
31 | 31 | >>> from keepalive import HTTPHandler |
|
32 | 32 | >>> keepalive_handler = HTTPHandler() |
|
33 | 33 | >>> opener = urllib2.build_opener(keepalive_handler) |
|
34 | 34 | >>> urllib2.install_opener(opener) |
|
35 | 35 | >>> |
|
36 | 36 | >>> fo = urllib2.urlopen('http://www.python.org') |
|
37 | 37 | |
|
38 | 38 | If a connection to a given host is requested, and all of the existing |
|
39 | 39 | connections are still in use, another connection will be opened. If |
|
40 | 40 | the handler tries to use an existing connection but it fails in some |
|
41 | 41 | way, it will be closed and removed from the pool. |
|
42 | 42 | |
|
43 | 43 | To remove the handler, simply re-run build_opener with no arguments, and |
|
44 | 44 | install that opener. |
|
45 | 45 | |
|
46 | 46 | You can explicitly close connections by using the close_connection() |
|
47 | 47 | method of the returned file-like object (described below) or you can |
|
48 | 48 | use the handler methods: |
|
49 | 49 | |
|
50 | 50 | close_connection(host) |
|
51 | 51 | close_all() |
|
52 | 52 | open_connections() |
|
53 | 53 | |
|
54 | 54 | NOTE: using the close_connection and close_all methods of the handler |
|
55 | 55 | should be done with care when using multiple threads. |
|
56 | 56 | * there is nothing that prevents another thread from creating new |
|
57 | 57 | connections immediately after connections are closed |
|
58 | 58 | * no checks are done to prevent in-use connections from being closed |
|
59 | 59 | |
|
60 | 60 | >>> keepalive_handler.close_all() |
|
61 | 61 | |
|
62 | 62 | EXTRA ATTRIBUTES AND METHODS |
|
63 | 63 | |
|
64 | 64 | Upon a status of 200, the object returned has a few additional |
|
65 | 65 | attributes and methods, which should not be used if you want to |
|
66 | 66 | remain consistent with the normal urllib2-returned objects: |
|
67 | 67 | |
|
68 | 68 | close_connection() - close the connection to the host |
|
69 | 69 | readlines() - you know, readlines() |
|
70 | 70 | status - the return status (ie 404) |
|
71 | 71 | reason - english translation of status (ie 'File not found') |
|
72 | 72 | |
|
73 | 73 | If you want the best of both worlds, use this inside an |
|
74 | 74 | AttributeError-catching try: |
|
75 | 75 | |
|
76 | 76 | >>> try: status = fo.status |
|
77 | 77 | >>> except AttributeError: status = None |
|
78 | 78 | |
|
79 | 79 | Unfortunately, these are ONLY there if status == 200, so it's not |
|
80 | 80 | easy to distinguish between non-200 responses. The reason is that |
|
81 | 81 | urllib2 tries to do clever things with error codes 301, 302, 401, |
|
82 | 82 | and 407, and it wraps the object upon return. |
|
83 | 83 | |
|
84 | 84 | For python versions earlier than 2.4, you can avoid this fancy error |
|
85 | 85 | handling by setting the module-level global HANDLE_ERRORS to zero. |
|
86 | 86 | You see, prior to 2.4, it's the HTTP Handler's job to determine what |
|
87 | 87 | to handle specially, and what to just pass up. HANDLE_ERRORS == 0 |
|
88 | 88 | means "pass everything up". In python 2.4, however, this job no |
|
89 | 89 | longer belongs to the HTTP Handler and is now done by a NEW handler, |
|
90 | 90 | HTTPErrorProcessor. Here's the bottom line: |
|
91 | 91 | |
|
92 | 92 | python version < 2.4 |
|
93 | 93 | HANDLE_ERRORS == 1 (default) pass up 200, treat the rest as |
|
94 | 94 | errors |
|
95 | 95 | HANDLE_ERRORS == 0 pass everything up, error processing is |
|
96 | 96 | left to the calling code |
|
97 | 97 | python version >= 2.4 |
|
98 | 98 | HANDLE_ERRORS == 1 pass up 200, treat the rest as errors |
|
99 | 99 | HANDLE_ERRORS == 0 (default) pass everything up, let the |
|
100 | 100 | other handlers (specifically, |
|
101 | 101 | HTTPErrorProcessor) decide what to do |
|
102 | 102 | |
|
103 | 103 | In practice, setting the variable either way makes little difference |
|
104 | 104 | in python 2.4, so for the most consistent behavior across versions, |
|
105 | 105 | you probably just want to use the defaults, which will give you |
|
106 | 106 | exceptions on errors. |
|
107 | 107 | |
|
108 | 108 | """ |
|
109 | 109 | |
|
110 | 110 | # $Id: keepalive.py,v 1.14 2006/04/04 21:00:32 mstenner Exp $ |
|
111 | 111 | |
|
112 | 112 | import errno |
|
113 | 113 | import httplib |
|
114 | 114 | import socket |
|
115 | 115 | import thread |
|
116 | 116 | import urllib2 |
|
117 | 117 | |
|
118 | 118 | DEBUG = None |
|
119 | 119 | |
|
120 | 120 | import sys |
|
121 | 121 | if sys.version_info < (2, 4): |
|
122 | 122 | HANDLE_ERRORS = 1 |
|
123 | 123 | else: HANDLE_ERRORS = 0 |
|
124 | 124 | |
|
125 | 125 | class ConnectionManager(object): |
|
126 | 126 | """ |
|
127 | 127 | The connection manager must be able to: |
|
128 | 128 | * keep track of all existing |
|
129 | 129 | """ |
|
130 | 130 | def __init__(self): |
|
131 | 131 | self._lock = thread.allocate_lock() |
|
132 | 132 | self._hostmap = {} # map hosts to a list of connections |
|
133 | 133 | self._connmap = {} # map connections to host |
|
134 | 134 | self._readymap = {} # map connection to ready state |
|
135 | 135 | |
|
136 | 136 | def add(self, host, connection, ready): |
|
137 | 137 | self._lock.acquire() |
|
138 | 138 | try: |
|
139 | 139 | if host not in self._hostmap: |
|
140 | 140 | self._hostmap[host] = [] |
|
141 | 141 | self._hostmap[host].append(connection) |
|
142 | 142 | self._connmap[connection] = host |
|
143 | 143 | self._readymap[connection] = ready |
|
144 | 144 | finally: |
|
145 | 145 | self._lock.release() |
|
146 | 146 | |
|
147 | 147 | def remove(self, connection): |
|
148 | 148 | self._lock.acquire() |
|
149 | 149 | try: |
|
150 | 150 | try: |
|
151 | 151 | host = self._connmap[connection] |
|
152 | 152 | except KeyError: |
|
153 | 153 | pass |
|
154 | 154 | else: |
|
155 | 155 | del self._connmap[connection] |
|
156 | 156 | del self._readymap[connection] |
|
157 | 157 | self._hostmap[host].remove(connection) |
|
158 | 158 | if not self._hostmap[host]: del self._hostmap[host] |
|
159 | 159 | finally: |
|
160 | 160 | self._lock.release() |
|
161 | 161 | |
|
162 | 162 | def set_ready(self, connection, ready): |
|
163 | 163 | try: |
|
164 | 164 | self._readymap[connection] = ready |
|
165 | 165 | except KeyError: |
|
166 | 166 | pass |
|
167 | 167 | |
|
168 | 168 | def get_ready_conn(self, host): |
|
169 | 169 | conn = None |
|
170 | 170 | self._lock.acquire() |
|
171 | 171 | try: |
|
172 | 172 | if host in self._hostmap: |
|
173 | 173 | for c in self._hostmap[host]: |
|
174 | 174 | if self._readymap[c]: |
|
175 | 175 | self._readymap[c] = 0 |
|
176 | 176 | conn = c |
|
177 | 177 | break |
|
178 | 178 | finally: |
|
179 | 179 | self._lock.release() |
|
180 | 180 | return conn |
|
181 | 181 | |
|
182 | 182 | def get_all(self, host=None): |
|
183 | 183 | if host: |
|
184 | 184 | return list(self._hostmap.get(host, [])) |
|
185 | 185 | else: |
|
186 | 186 | return dict(self._hostmap) |
|
187 | 187 | |
|
188 | 188 | class KeepAliveHandler(object): |
|
189 | 189 | def __init__(self): |
|
190 | 190 | self._cm = ConnectionManager() |
|
191 | 191 | |
|
192 | 192 | #### Connection Management |
|
193 | 193 | def open_connections(self): |
|
194 | 194 | """return a list of connected hosts and the number of connections |
|
195 | 195 | to each. [('foo.com:80', 2), ('bar.org', 1)]""" |
|
196 | 196 | return [(host, len(li)) for (host, li) in self._cm.get_all().items()] |
|
197 | 197 | |
|
198 | 198 | def close_connection(self, host): |
|
199 | 199 | """close connection(s) to <host> |
|
200 | 200 | host is the host:port spec, as in 'www.cnn.com:8080' as passed in. |
|
201 | 201 | no error occurs if there is no connection to that host.""" |
|
202 | 202 | for h in self._cm.get_all(host): |
|
203 | 203 | self._cm.remove(h) |
|
204 | 204 | h.close() |
|
205 | 205 | |
|
206 | 206 | def close_all(self): |
|
207 | 207 | """close all open connections""" |
|
208 | 208 | for host, conns in self._cm.get_all().iteritems(): |
|
209 | 209 | for h in conns: |
|
210 | 210 | self._cm.remove(h) |
|
211 | 211 | h.close() |
|
212 | 212 | |
|
213 | 213 | def _request_closed(self, request, host, connection): |
|
214 | 214 | """tells us that this request is now closed and the the |
|
215 | 215 | connection is ready for another request""" |
|
216 | 216 | self._cm.set_ready(connection, 1) |
|
217 | 217 | |
|
218 | 218 | def _remove_connection(self, host, connection, close=0): |
|
219 | 219 | if close: |
|
220 | 220 | connection.close() |
|
221 | 221 | self._cm.remove(connection) |
|
222 | 222 | |
|
223 | 223 | #### Transaction Execution |
|
224 | 224 | def http_open(self, req): |
|
225 | 225 | return self.do_open(HTTPConnection, req) |
|
226 | 226 | |
|
227 | 227 | def do_open(self, http_class, req): |
|
228 | 228 | host = req.get_host() |
|
229 | 229 | if not host: |
|
230 | 230 | raise urllib2.URLError('no host given') |
|
231 | 231 | |
|
232 | 232 | try: |
|
233 | 233 | h = self._cm.get_ready_conn(host) |
|
234 | 234 | while h: |
|
235 | 235 | r = self._reuse_connection(h, req, host) |
|
236 | 236 | |
|
237 | 237 | # if this response is non-None, then it worked and we're |
|
238 | 238 | # done. Break out, skipping the else block. |
|
239 | 239 | if r: |
|
240 | 240 | break |
|
241 | 241 | |
|
242 | 242 | # connection is bad - possibly closed by server |
|
243 | 243 | # discard it and ask for the next free connection |
|
244 | 244 | h.close() |
|
245 | 245 | self._cm.remove(h) |
|
246 | 246 | h = self._cm.get_ready_conn(host) |
|
247 | 247 | else: |
|
248 | 248 | # no (working) free connections were found. Create a new one. |
|
249 | 249 | h = http_class(host) |
|
250 | 250 | if DEBUG: |
|
251 | 251 | DEBUG.info("creating new connection to %s (%d)", |
|
252 | 252 | host, id(h)) |
|
253 | 253 | self._cm.add(host, h, 0) |
|
254 | 254 | self._start_transaction(h, req) |
|
255 | 255 | r = h.getresponse() |
|
256 | 256 | except (socket.error, httplib.HTTPException), err: |
|
257 | 257 | raise urllib2.URLError(err) |
|
258 | 258 | |
|
259 | 259 | # if not a persistent connection, don't try to reuse it |
|
260 | 260 | if r.will_close: |
|
261 | 261 | self._cm.remove(h) |
|
262 | 262 | |
|
263 | 263 | if DEBUG: |
|
264 | 264 | DEBUG.info("STATUS: %s, %s", r.status, r.reason) |
|
265 | 265 | r._handler = self |
|
266 | 266 | r._host = host |
|
267 | 267 | r._url = req.get_full_url() |
|
268 | 268 | r._connection = h |
|
269 | 269 | r.code = r.status |
|
270 | 270 | r.headers = r.msg |
|
271 | 271 | r.msg = r.reason |
|
272 | 272 | |
|
273 | 273 | if r.status == 200 or not HANDLE_ERRORS: |
|
274 | 274 | return r |
|
275 | 275 | else: |
|
276 | 276 | return self.parent.error('http', req, r, |
|
277 | 277 | r.status, r.msg, r.headers) |
|
278 | 278 | |
|
279 | 279 | def _reuse_connection(self, h, req, host): |
|
280 | 280 | """start the transaction with a re-used connection |
|
281 | 281 | return a response object (r) upon success or None on failure. |
|
282 | 282 | This DOES not close or remove bad connections in cases where |
|
283 | 283 | it returns. However, if an unexpected exception occurs, it |
|
284 | 284 | will close and remove the connection before re-raising. |
|
285 | 285 | """ |
|
286 | 286 | try: |
|
287 | 287 | self._start_transaction(h, req) |
|
288 | 288 | r = h.getresponse() |
|
289 | 289 | # note: just because we got something back doesn't mean it |
|
290 | 290 | # worked. We'll check the version below, too. |
|
291 | 291 | except (socket.error, httplib.HTTPException): |
|
292 | 292 | r = None |
|
293 | except: | |
|
293 | except: # re-raises | |
|
294 | 294 | # adding this block just in case we've missed |
|
295 | 295 | # something we will still raise the exception, but |
|
296 | 296 | # lets try and close the connection and remove it |
|
297 | 297 | # first. We previously got into a nasty loop |
|
298 | 298 | # where an exception was uncaught, and so the |
|
299 | 299 | # connection stayed open. On the next try, the |
|
300 | 300 | # same exception was raised, etc. The tradeoff is |
|
301 | 301 | # that it's now possible this call will raise |
|
302 | 302 | # a DIFFERENT exception |
|
303 | 303 | if DEBUG: |
|
304 | 304 | DEBUG.error("unexpected exception - closing " |
|
305 | 305 | "connection to %s (%d)", host, id(h)) |
|
306 | 306 | self._cm.remove(h) |
|
307 | 307 | h.close() |
|
308 | 308 | raise |
|
309 | 309 | |
|
310 | 310 | if r is None or r.version == 9: |
|
311 | 311 | # httplib falls back to assuming HTTP 0.9 if it gets a |
|
312 | 312 | # bad header back. This is most likely to happen if |
|
313 | 313 | # the socket has been closed by the server since we |
|
314 | 314 | # last used the connection. |
|
315 | 315 | if DEBUG: |
|
316 | 316 | DEBUG.info("failed to re-use connection to %s (%d)", |
|
317 | 317 | host, id(h)) |
|
318 | 318 | r = None |
|
319 | 319 | else: |
|
320 | 320 | if DEBUG: |
|
321 | 321 | DEBUG.info("re-using connection to %s (%d)", host, id(h)) |
|
322 | 322 | |
|
323 | 323 | return r |
|
324 | 324 | |
|
325 | 325 | def _start_transaction(self, h, req): |
|
326 | 326 | # What follows mostly reimplements HTTPConnection.request() |
|
327 | 327 | # except it adds self.parent.addheaders in the mix. |
|
328 | 328 | headers = req.headers.copy() |
|
329 | 329 | if sys.version_info >= (2, 4): |
|
330 | 330 | headers.update(req.unredirected_hdrs) |
|
331 | 331 | headers.update(self.parent.addheaders) |
|
332 | 332 | headers = dict((n.lower(), v) for n, v in headers.items()) |
|
333 | 333 | skipheaders = {} |
|
334 | 334 | for n in ('host', 'accept-encoding'): |
|
335 | 335 | if n in headers: |
|
336 | 336 | skipheaders['skip_' + n.replace('-', '_')] = 1 |
|
337 | 337 | try: |
|
338 | 338 | if req.has_data(): |
|
339 | 339 | data = req.get_data() |
|
340 | 340 | h.putrequest('POST', req.get_selector(), **skipheaders) |
|
341 | 341 | if 'content-type' not in headers: |
|
342 | 342 | h.putheader('Content-type', |
|
343 | 343 | 'application/x-www-form-urlencoded') |
|
344 | 344 | if 'content-length' not in headers: |
|
345 | 345 | h.putheader('Content-length', '%d' % len(data)) |
|
346 | 346 | else: |
|
347 | 347 | h.putrequest('GET', req.get_selector(), **skipheaders) |
|
348 | 348 | except (socket.error), err: |
|
349 | 349 | raise urllib2.URLError(err) |
|
350 | 350 | for k, v in headers.items(): |
|
351 | 351 | h.putheader(k, v) |
|
352 | 352 | h.endheaders() |
|
353 | 353 | if req.has_data(): |
|
354 | 354 | h.send(data) |
|
355 | 355 | |
|
356 | 356 | class HTTPHandler(KeepAliveHandler, urllib2.HTTPHandler): |
|
357 | 357 | pass |
|
358 | 358 | |
|
359 | 359 | class HTTPResponse(httplib.HTTPResponse): |
|
360 | 360 | # we need to subclass HTTPResponse in order to |
|
361 | 361 | # 1) add readline() and readlines() methods |
|
362 | 362 | # 2) add close_connection() methods |
|
363 | 363 | # 3) add info() and geturl() methods |
|
364 | 364 | |
|
365 | 365 | # in order to add readline(), read must be modified to deal with a |
|
366 | 366 | # buffer. example: readline must read a buffer and then spit back |
|
367 | 367 | # one line at a time. The only real alternative is to read one |
|
368 | 368 | # BYTE at a time (ick). Once something has been read, it can't be |
|
369 | 369 | # put back (ok, maybe it can, but that's even uglier than this), |
|
370 | 370 | # so if you THEN do a normal read, you must first take stuff from |
|
371 | 371 | # the buffer. |
|
372 | 372 | |
|
373 | 373 | # the read method wraps the original to accomodate buffering, |
|
374 | 374 | # although read() never adds to the buffer. |
|
375 | 375 | # Both readline and readlines have been stolen with almost no |
|
376 | 376 | # modification from socket.py |
|
377 | 377 | |
|
378 | 378 | |
|
379 | 379 | def __init__(self, sock, debuglevel=0, strict=0, method=None): |
|
380 | 380 | if method: # the httplib in python 2.3 uses the method arg |
|
381 | 381 | httplib.HTTPResponse.__init__(self, sock, debuglevel, method) |
|
382 | 382 | else: # 2.2 doesn't |
|
383 | 383 | httplib.HTTPResponse.__init__(self, sock, debuglevel) |
|
384 | 384 | self.fileno = sock.fileno |
|
385 | 385 | self.code = None |
|
386 | 386 | self._rbuf = '' |
|
387 | 387 | self._rbufsize = 8096 |
|
388 | 388 | self._handler = None # inserted by the handler later |
|
389 | 389 | self._host = None # (same) |
|
390 | 390 | self._url = None # (same) |
|
391 | 391 | self._connection = None # (same) |
|
392 | 392 | |
|
393 | 393 | _raw_read = httplib.HTTPResponse.read |
|
394 | 394 | |
|
395 | 395 | def close(self): |
|
396 | 396 | if self.fp: |
|
397 | 397 | self.fp.close() |
|
398 | 398 | self.fp = None |
|
399 | 399 | if self._handler: |
|
400 | 400 | self._handler._request_closed(self, self._host, |
|
401 | 401 | self._connection) |
|
402 | 402 | |
|
403 | 403 | def close_connection(self): |
|
404 | 404 | self._handler._remove_connection(self._host, self._connection, close=1) |
|
405 | 405 | self.close() |
|
406 | 406 | |
|
407 | 407 | def info(self): |
|
408 | 408 | return self.headers |
|
409 | 409 | |
|
410 | 410 | def geturl(self): |
|
411 | 411 | return self._url |
|
412 | 412 | |
|
413 | 413 | def read(self, amt=None): |
|
414 | 414 | # the _rbuf test is only in this first if for speed. It's not |
|
415 | 415 | # logically necessary |
|
416 | 416 | if self._rbuf and not amt is None: |
|
417 | 417 | L = len(self._rbuf) |
|
418 | 418 | if amt > L: |
|
419 | 419 | amt -= L |
|
420 | 420 | else: |
|
421 | 421 | s = self._rbuf[:amt] |
|
422 | 422 | self._rbuf = self._rbuf[amt:] |
|
423 | 423 | return s |
|
424 | 424 | |
|
425 | 425 | s = self._rbuf + self._raw_read(amt) |
|
426 | 426 | self._rbuf = '' |
|
427 | 427 | return s |
|
428 | 428 | |
|
429 | 429 | # stolen from Python SVN #68532 to fix issue1088 |
|
430 | 430 | def _read_chunked(self, amt): |
|
431 | 431 | chunk_left = self.chunk_left |
|
432 | 432 | value = '' |
|
433 | 433 | |
|
434 | 434 | # XXX This accumulates chunks by repeated string concatenation, |
|
435 | 435 | # which is not efficient as the number or size of chunks gets big. |
|
436 | 436 | while True: |
|
437 | 437 | if chunk_left is None: |
|
438 | 438 | line = self.fp.readline() |
|
439 | 439 | i = line.find(';') |
|
440 | 440 | if i >= 0: |
|
441 | 441 | line = line[:i] # strip chunk-extensions |
|
442 | 442 | try: |
|
443 | 443 | chunk_left = int(line, 16) |
|
444 | 444 | except ValueError: |
|
445 | 445 | # close the connection as protocol synchronisation is |
|
446 | 446 | # probably lost |
|
447 | 447 | self.close() |
|
448 | 448 | raise httplib.IncompleteRead(value) |
|
449 | 449 | if chunk_left == 0: |
|
450 | 450 | break |
|
451 | 451 | if amt is None: |
|
452 | 452 | value += self._safe_read(chunk_left) |
|
453 | 453 | elif amt < chunk_left: |
|
454 | 454 | value += self._safe_read(amt) |
|
455 | 455 | self.chunk_left = chunk_left - amt |
|
456 | 456 | return value |
|
457 | 457 | elif amt == chunk_left: |
|
458 | 458 | value += self._safe_read(amt) |
|
459 | 459 | self._safe_read(2) # toss the CRLF at the end of the chunk |
|
460 | 460 | self.chunk_left = None |
|
461 | 461 | return value |
|
462 | 462 | else: |
|
463 | 463 | value += self._safe_read(chunk_left) |
|
464 | 464 | amt -= chunk_left |
|
465 | 465 | |
|
466 | 466 | # we read the whole chunk, get another |
|
467 | 467 | self._safe_read(2) # toss the CRLF at the end of the chunk |
|
468 | 468 | chunk_left = None |
|
469 | 469 | |
|
470 | 470 | # read and discard trailer up to the CRLF terminator |
|
471 | 471 | ### note: we shouldn't have any trailers! |
|
472 | 472 | while True: |
|
473 | 473 | line = self.fp.readline() |
|
474 | 474 | if not line: |
|
475 | 475 | # a vanishingly small number of sites EOF without |
|
476 | 476 | # sending the trailer |
|
477 | 477 | break |
|
478 | 478 | if line == '\r\n': |
|
479 | 479 | break |
|
480 | 480 | |
|
481 | 481 | # we read everything; close the "file" |
|
482 | 482 | self.close() |
|
483 | 483 | |
|
484 | 484 | return value |
|
485 | 485 | |
|
486 | 486 | def readline(self, limit=-1): |
|
487 | 487 | i = self._rbuf.find('\n') |
|
488 | 488 | while i < 0 and not (0 < limit <= len(self._rbuf)): |
|
489 | 489 | new = self._raw_read(self._rbufsize) |
|
490 | 490 | if not new: |
|
491 | 491 | break |
|
492 | 492 | i = new.find('\n') |
|
493 | 493 | if i >= 0: |
|
494 | 494 | i = i + len(self._rbuf) |
|
495 | 495 | self._rbuf = self._rbuf + new |
|
496 | 496 | if i < 0: |
|
497 | 497 | i = len(self._rbuf) |
|
498 | 498 | else: |
|
499 | 499 | i = i + 1 |
|
500 | 500 | if 0 <= limit < len(self._rbuf): |
|
501 | 501 | i = limit |
|
502 | 502 | data, self._rbuf = self._rbuf[:i], self._rbuf[i:] |
|
503 | 503 | return data |
|
504 | 504 | |
|
505 | 505 | def readlines(self, sizehint = 0): |
|
506 | 506 | total = 0 |
|
507 | 507 | list = [] |
|
508 | 508 | while True: |
|
509 | 509 | line = self.readline() |
|
510 | 510 | if not line: |
|
511 | 511 | break |
|
512 | 512 | list.append(line) |
|
513 | 513 | total += len(line) |
|
514 | 514 | if sizehint and total >= sizehint: |
|
515 | 515 | break |
|
516 | 516 | return list |
|
517 | 517 | |
|
518 | 518 | def safesend(self, str): |
|
519 | 519 | """Send `str' to the server. |
|
520 | 520 | |
|
521 | 521 | Shamelessly ripped off from httplib to patch a bad behavior. |
|
522 | 522 | """ |
|
523 | 523 | # _broken_pipe_resp is an attribute we set in this function |
|
524 | 524 | # if the socket is closed while we're sending data but |
|
525 | 525 | # the server sent us a response before hanging up. |
|
526 | 526 | # In that case, we want to pretend to send the rest of the |
|
527 | 527 | # outgoing data, and then let the user use getresponse() |
|
528 | 528 | # (which we wrap) to get this last response before |
|
529 | 529 | # opening a new socket. |
|
530 | 530 | if getattr(self, '_broken_pipe_resp', None) is not None: |
|
531 | 531 | return |
|
532 | 532 | |
|
533 | 533 | if self.sock is None: |
|
534 | 534 | if self.auto_open: |
|
535 | 535 | self.connect() |
|
536 | 536 | else: |
|
537 | 537 | raise httplib.NotConnected |
|
538 | 538 | |
|
539 | 539 | # send the data to the server. if we get a broken pipe, then close |
|
540 | 540 | # the socket. we want to reconnect when somebody tries to send again. |
|
541 | 541 | # |
|
542 | 542 | # NOTE: we DO propagate the error, though, because we cannot simply |
|
543 | 543 | # ignore the error... the caller will know if they can retry. |
|
544 | 544 | if self.debuglevel > 0: |
|
545 | 545 | print "send:", repr(str) |
|
546 | 546 | try: |
|
547 | 547 | blocksize = 8192 |
|
548 | 548 | read = getattr(str, 'read', None) |
|
549 | 549 | if read is not None: |
|
550 | 550 | if self.debuglevel > 0: |
|
551 | 551 | print "sendIng a read()able" |
|
552 | 552 | data = read(blocksize) |
|
553 | 553 | while data: |
|
554 | 554 | self.sock.sendall(data) |
|
555 | 555 | data = read(blocksize) |
|
556 | 556 | else: |
|
557 | 557 | self.sock.sendall(str) |
|
558 | 558 | except socket.error, v: |
|
559 | 559 | reraise = True |
|
560 | 560 | if v[0] == errno.EPIPE: # Broken pipe |
|
561 | 561 | if self._HTTPConnection__state == httplib._CS_REQ_SENT: |
|
562 | 562 | self._broken_pipe_resp = None |
|
563 | 563 | self._broken_pipe_resp = self.getresponse() |
|
564 | 564 | reraise = False |
|
565 | 565 | self.close() |
|
566 | 566 | if reraise: |
|
567 | 567 | raise |
|
568 | 568 | |
|
569 | 569 | def wrapgetresponse(cls): |
|
570 | 570 | """Wraps getresponse in cls with a broken-pipe sane version. |
|
571 | 571 | """ |
|
572 | 572 | def safegetresponse(self): |
|
573 | 573 | # In safesend() we might set the _broken_pipe_resp |
|
574 | 574 | # attribute, in which case the socket has already |
|
575 | 575 | # been closed and we just need to give them the response |
|
576 | 576 | # back. Otherwise, we use the normal response path. |
|
577 | 577 | r = getattr(self, '_broken_pipe_resp', None) |
|
578 | 578 | if r is not None: |
|
579 | 579 | return r |
|
580 | 580 | return cls.getresponse(self) |
|
581 | 581 | safegetresponse.__doc__ = cls.getresponse.__doc__ |
|
582 | 582 | return safegetresponse |
|
583 | 583 | |
|
584 | 584 | class HTTPConnection(httplib.HTTPConnection): |
|
585 | 585 | # use the modified response class |
|
586 | 586 | response_class = HTTPResponse |
|
587 | 587 | send = safesend |
|
588 | 588 | getresponse = wrapgetresponse(httplib.HTTPConnection) |
|
589 | 589 | |
|
590 | 590 | |
|
591 | 591 | ######################################################################### |
|
592 | 592 | ##### TEST FUNCTIONS |
|
593 | 593 | ######################################################################### |
|
594 | 594 | |
|
595 | 595 | def error_handler(url): |
|
596 | 596 | global HANDLE_ERRORS |
|
597 | 597 | orig = HANDLE_ERRORS |
|
598 | 598 | keepalive_handler = HTTPHandler() |
|
599 | 599 | opener = urllib2.build_opener(keepalive_handler) |
|
600 | 600 | urllib2.install_opener(opener) |
|
601 | 601 | pos = {0: 'off', 1: 'on'} |
|
602 | 602 | for i in (0, 1): |
|
603 | 603 | print " fancy error handling %s (HANDLE_ERRORS = %i)" % (pos[i], i) |
|
604 | 604 | HANDLE_ERRORS = i |
|
605 | 605 | try: |
|
606 | 606 | fo = urllib2.urlopen(url) |
|
607 | 607 | fo.read() |
|
608 | 608 | fo.close() |
|
609 | 609 | try: |
|
610 | 610 | status, reason = fo.status, fo.reason |
|
611 | 611 | except AttributeError: |
|
612 | 612 | status, reason = None, None |
|
613 | 613 | except IOError, e: |
|
614 | 614 | print " EXCEPTION: %s" % e |
|
615 | 615 | raise |
|
616 | 616 | else: |
|
617 | 617 | print " status = %s, reason = %s" % (status, reason) |
|
618 | 618 | HANDLE_ERRORS = orig |
|
619 | 619 | hosts = keepalive_handler.open_connections() |
|
620 | 620 | print "open connections:", hosts |
|
621 | 621 | keepalive_handler.close_all() |
|
622 | 622 | |
|
623 | 623 | def md5(s): |
|
624 | 624 | try: |
|
625 | 625 | from hashlib import md5 as _md5 |
|
626 | 626 | except ImportError: |
|
627 | 627 | from md5 import md5 as _md5 |
|
628 | 628 | global md5 |
|
629 | 629 | md5 = _md5 |
|
630 | 630 | return _md5(s) |
|
631 | 631 | |
|
632 | 632 | def continuity(url): |
|
633 | 633 | format = '%25s: %s' |
|
634 | 634 | |
|
635 | 635 | # first fetch the file with the normal http handler |
|
636 | 636 | opener = urllib2.build_opener() |
|
637 | 637 | urllib2.install_opener(opener) |
|
638 | 638 | fo = urllib2.urlopen(url) |
|
639 | 639 | foo = fo.read() |
|
640 | 640 | fo.close() |
|
641 | 641 | m = md5.new(foo) |
|
642 | 642 | print format % ('normal urllib', m.hexdigest()) |
|
643 | 643 | |
|
644 | 644 | # now install the keepalive handler and try again |
|
645 | 645 | opener = urllib2.build_opener(HTTPHandler()) |
|
646 | 646 | urllib2.install_opener(opener) |
|
647 | 647 | |
|
648 | 648 | fo = urllib2.urlopen(url) |
|
649 | 649 | foo = fo.read() |
|
650 | 650 | fo.close() |
|
651 | 651 | m = md5.new(foo) |
|
652 | 652 | print format % ('keepalive read', m.hexdigest()) |
|
653 | 653 | |
|
654 | 654 | fo = urllib2.urlopen(url) |
|
655 | 655 | foo = '' |
|
656 | 656 | while True: |
|
657 | 657 | f = fo.readline() |
|
658 | 658 | if f: |
|
659 | 659 | foo = foo + f |
|
660 | 660 | else: break |
|
661 | 661 | fo.close() |
|
662 | 662 | m = md5.new(foo) |
|
663 | 663 | print format % ('keepalive readline', m.hexdigest()) |
|
664 | 664 | |
|
665 | 665 | def comp(N, url): |
|
666 | 666 | print ' making %i connections to:\n %s' % (N, url) |
|
667 | 667 | |
|
668 | 668 | sys.stdout.write(' first using the normal urllib handlers') |
|
669 | 669 | # first use normal opener |
|
670 | 670 | opener = urllib2.build_opener() |
|
671 | 671 | urllib2.install_opener(opener) |
|
672 | 672 | t1 = fetch(N, url) |
|
673 | 673 | print ' TIME: %.3f s' % t1 |
|
674 | 674 | |
|
675 | 675 | sys.stdout.write(' now using the keepalive handler ') |
|
676 | 676 | # now install the keepalive handler and try again |
|
677 | 677 | opener = urllib2.build_opener(HTTPHandler()) |
|
678 | 678 | urllib2.install_opener(opener) |
|
679 | 679 | t2 = fetch(N, url) |
|
680 | 680 | print ' TIME: %.3f s' % t2 |
|
681 | 681 | print ' improvement factor: %.2f' % (t1 / t2) |
|
682 | 682 | |
|
683 | 683 | def fetch(N, url, delay=0): |
|
684 | 684 | import time |
|
685 | 685 | lens = [] |
|
686 | 686 | starttime = time.time() |
|
687 | 687 | for i in range(N): |
|
688 | 688 | if delay and i > 0: |
|
689 | 689 | time.sleep(delay) |
|
690 | 690 | fo = urllib2.urlopen(url) |
|
691 | 691 | foo = fo.read() |
|
692 | 692 | fo.close() |
|
693 | 693 | lens.append(len(foo)) |
|
694 | 694 | diff = time.time() - starttime |
|
695 | 695 | |
|
696 | 696 | j = 0 |
|
697 | 697 | for i in lens[1:]: |
|
698 | 698 | j = j + 1 |
|
699 | 699 | if not i == lens[0]: |
|
700 | 700 | print "WARNING: inconsistent length on read %i: %i" % (j, i) |
|
701 | 701 | |
|
702 | 702 | return diff |
|
703 | 703 | |
|
704 | 704 | def test_timeout(url): |
|
705 | 705 | global DEBUG |
|
706 | 706 | dbbackup = DEBUG |
|
707 | 707 | class FakeLogger(object): |
|
708 | 708 | def debug(self, msg, *args): |
|
709 | 709 | print msg % args |
|
710 | 710 | info = warning = error = debug |
|
711 | 711 | DEBUG = FakeLogger() |
|
712 | 712 | print " fetching the file to establish a connection" |
|
713 | 713 | fo = urllib2.urlopen(url) |
|
714 | 714 | data1 = fo.read() |
|
715 | 715 | fo.close() |
|
716 | 716 | |
|
717 | 717 | i = 20 |
|
718 | 718 | print " waiting %i seconds for the server to close the connection" % i |
|
719 | 719 | while i > 0: |
|
720 | 720 | sys.stdout.write('\r %2i' % i) |
|
721 | 721 | sys.stdout.flush() |
|
722 | 722 | time.sleep(1) |
|
723 | 723 | i -= 1 |
|
724 | 724 | sys.stderr.write('\r') |
|
725 | 725 | |
|
726 | 726 | print " fetching the file a second time" |
|
727 | 727 | fo = urllib2.urlopen(url) |
|
728 | 728 | data2 = fo.read() |
|
729 | 729 | fo.close() |
|
730 | 730 | |
|
731 | 731 | if data1 == data2: |
|
732 | 732 | print ' data are identical' |
|
733 | 733 | else: |
|
734 | 734 | print ' ERROR: DATA DIFFER' |
|
735 | 735 | |
|
736 | 736 | DEBUG = dbbackup |
|
737 | 737 | |
|
738 | 738 | |
|
739 | 739 | def test(url, N=10): |
|
740 | 740 | print "checking error hander (do this on a non-200)" |
|
741 | 741 | try: error_handler(url) |
|
742 | 742 | except IOError: |
|
743 | 743 | print "exiting - exception will prevent further tests" |
|
744 | 744 | sys.exit() |
|
745 | 745 | |
|
746 | 746 | print "performing continuity test (making sure stuff isn't corrupted)" |
|
747 | 747 | continuity(url) |
|
748 | 748 | |
|
749 | 749 | print "performing speed comparison" |
|
750 | 750 | comp(N, url) |
|
751 | 751 | |
|
752 | 752 | print "performing dropped-connection check" |
|
753 | 753 | test_timeout(url) |
|
754 | 754 | |
|
755 | 755 | if __name__ == '__main__': |
|
756 | 756 | import time |
|
757 | 757 | import sys |
|
758 | 758 | try: |
|
759 | 759 | N = int(sys.argv[1]) |
|
760 | 760 | url = sys.argv[2] |
|
761 | 761 | except (IndexError, ValueError): |
|
762 | 762 | print "%s <integer> <url>" % sys.argv[0] |
|
763 | 763 | else: |
|
764 | 764 | test(url, N) |
|
1 | NO CONTENT: modified file | |
The requested commit or file is too big and content was truncated. Show full diff |
|
1 | NO CONTENT: modified file | |
The requested commit or file is too big and content was truncated. Show full diff |
|
1 | NO CONTENT: modified file | |
The requested commit or file is too big and content was truncated. Show full diff |
|
1 | NO CONTENT: modified file | |
The requested commit or file is too big and content was truncated. Show full diff |
|
1 | NO CONTENT: modified file | |
The requested commit or file is too big and content was truncated. Show full diff |
General Comments 0
You need to be logged in to leave comments.
Login now