##// END OF EJS Templates
remoteui: properly create dst with copy()
Matt Mackall -
r8798:92fc57c9 default
parent child Browse files
Show More
@@ -1,1244 +1,1244 b''
1 # cmdutil.py - help for command processing in mercurial
1 # cmdutil.py - help for command processing in mercurial
2 #
2 #
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
4 #
4 #
5 # This software may be used and distributed according to the terms of the
5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2, incorporated herein by reference.
6 # GNU General Public License version 2, incorporated herein by reference.
7
7
8 from node import hex, nullid, nullrev, short
8 from node import hex, nullid, nullrev, short
9 from i18n import _
9 from i18n import _
10 import os, sys, errno, re, glob
10 import os, sys, errno, re, glob
11 import mdiff, bdiff, util, templater, patch, error, encoding
11 import mdiff, bdiff, util, templater, patch, error, encoding
12 import match as _match
12 import match as _match
13
13
14 revrangesep = ':'
14 revrangesep = ':'
15
15
16 def findpossible(cmd, table, strict=False):
16 def findpossible(cmd, table, strict=False):
17 """
17 """
18 Return cmd -> (aliases, command table entry)
18 Return cmd -> (aliases, command table entry)
19 for each matching command.
19 for each matching command.
20 Return debug commands (or their aliases) only if no normal command matches.
20 Return debug commands (or their aliases) only if no normal command matches.
21 """
21 """
22 choice = {}
22 choice = {}
23 debugchoice = {}
23 debugchoice = {}
24 for e in table.keys():
24 for e in table.keys():
25 aliases = e.lstrip("^").split("|")
25 aliases = e.lstrip("^").split("|")
26 found = None
26 found = None
27 if cmd in aliases:
27 if cmd in aliases:
28 found = cmd
28 found = cmd
29 elif not strict:
29 elif not strict:
30 for a in aliases:
30 for a in aliases:
31 if a.startswith(cmd):
31 if a.startswith(cmd):
32 found = a
32 found = a
33 break
33 break
34 if found is not None:
34 if found is not None:
35 if aliases[0].startswith("debug") or found.startswith("debug"):
35 if aliases[0].startswith("debug") or found.startswith("debug"):
36 debugchoice[found] = (aliases, table[e])
36 debugchoice[found] = (aliases, table[e])
37 else:
37 else:
38 choice[found] = (aliases, table[e])
38 choice[found] = (aliases, table[e])
39
39
40 if not choice and debugchoice:
40 if not choice and debugchoice:
41 choice = debugchoice
41 choice = debugchoice
42
42
43 return choice
43 return choice
44
44
45 def findcmd(cmd, table, strict=True):
45 def findcmd(cmd, table, strict=True):
46 """Return (aliases, command table entry) for command string."""
46 """Return (aliases, command table entry) for command string."""
47 choice = findpossible(cmd, table, strict)
47 choice = findpossible(cmd, table, strict)
48
48
49 if cmd in choice:
49 if cmd in choice:
50 return choice[cmd]
50 return choice[cmd]
51
51
52 if len(choice) > 1:
52 if len(choice) > 1:
53 clist = choice.keys()
53 clist = choice.keys()
54 clist.sort()
54 clist.sort()
55 raise error.AmbiguousCommand(cmd, clist)
55 raise error.AmbiguousCommand(cmd, clist)
56
56
57 if choice:
57 if choice:
58 return choice.values()[0]
58 return choice.values()[0]
59
59
60 raise error.UnknownCommand(cmd)
60 raise error.UnknownCommand(cmd)
61
61
62 def bail_if_changed(repo):
62 def bail_if_changed(repo):
63 if repo.dirstate.parents()[1] != nullid:
63 if repo.dirstate.parents()[1] != nullid:
64 raise util.Abort(_('outstanding uncommitted merge'))
64 raise util.Abort(_('outstanding uncommitted merge'))
65 modified, added, removed, deleted = repo.status()[:4]
65 modified, added, removed, deleted = repo.status()[:4]
66 if modified or added or removed or deleted:
66 if modified or added or removed or deleted:
67 raise util.Abort(_("outstanding uncommitted changes"))
67 raise util.Abort(_("outstanding uncommitted changes"))
68
68
69 def logmessage(opts):
69 def logmessage(opts):
70 """ get the log message according to -m and -l option """
70 """ get the log message according to -m and -l option """
71 message = opts.get('message')
71 message = opts.get('message')
72 logfile = opts.get('logfile')
72 logfile = opts.get('logfile')
73
73
74 if message and logfile:
74 if message and logfile:
75 raise util.Abort(_('options --message and --logfile are mutually '
75 raise util.Abort(_('options --message and --logfile are mutually '
76 'exclusive'))
76 'exclusive'))
77 if not message and logfile:
77 if not message and logfile:
78 try:
78 try:
79 if logfile == '-':
79 if logfile == '-':
80 message = sys.stdin.read()
80 message = sys.stdin.read()
81 else:
81 else:
82 message = open(logfile).read()
82 message = open(logfile).read()
83 except IOError, inst:
83 except IOError, inst:
84 raise util.Abort(_("can't read commit message '%s': %s") %
84 raise util.Abort(_("can't read commit message '%s': %s") %
85 (logfile, inst.strerror))
85 (logfile, inst.strerror))
86 return message
86 return message
87
87
88 def loglimit(opts):
88 def loglimit(opts):
89 """get the log limit according to option -l/--limit"""
89 """get the log limit according to option -l/--limit"""
90 limit = opts.get('limit')
90 limit = opts.get('limit')
91 if limit:
91 if limit:
92 try:
92 try:
93 limit = int(limit)
93 limit = int(limit)
94 except ValueError:
94 except ValueError:
95 raise util.Abort(_('limit must be a positive integer'))
95 raise util.Abort(_('limit must be a positive integer'))
96 if limit <= 0: raise util.Abort(_('limit must be positive'))
96 if limit <= 0: raise util.Abort(_('limit must be positive'))
97 else:
97 else:
98 limit = sys.maxint
98 limit = sys.maxint
99 return limit
99 return limit
100
100
101 def remoteui(src, opts):
101 def remoteui(src, opts):
102 'build a remote ui from ui or repo and opts'
102 'build a remote ui from ui or repo and opts'
103 if hasattr(src, 'baseui'): # looks like a repository
103 if hasattr(src, 'baseui'): # looks like a repository
104 dst = src.baseui # drop repo-specific config
104 dst = src.baseui.copy() # drop repo-specific config
105 src = src.ui # copy target options from repo
105 src = src.ui # copy target options from repo
106 else: # assume it's a global ui object
106 else: # assume it's a global ui object
107 dst = src # keep all global options
107 dst = src.copy() # keep all global options
108
108
109 # copy ssh-specific options
109 # copy ssh-specific options
110 for o in 'ssh', 'remotecmd':
110 for o in 'ssh', 'remotecmd':
111 v = opts.get(o) or src.config('ui', o)
111 v = opts.get(o) or src.config('ui', o)
112 if v:
112 if v:
113 dst.setconfig("ui", o, v)
113 dst.setconfig("ui", o, v)
114 # copy bundle-specific options
114 # copy bundle-specific options
115 r = src.config('bundle', 'mainreporoot')
115 r = src.config('bundle', 'mainreporoot')
116 if r:
116 if r:
117 dst.setconfig('bundle', 'mainreporoot', r)
117 dst.setconfig('bundle', 'mainreporoot', r)
118
118
119 return dst
119 return dst
120
120
121 def revpair(repo, revs):
121 def revpair(repo, revs):
122 '''return pair of nodes, given list of revisions. second item can
122 '''return pair of nodes, given list of revisions. second item can
123 be None, meaning use working dir.'''
123 be None, meaning use working dir.'''
124
124
125 def revfix(repo, val, defval):
125 def revfix(repo, val, defval):
126 if not val and val != 0 and defval is not None:
126 if not val and val != 0 and defval is not None:
127 val = defval
127 val = defval
128 return repo.lookup(val)
128 return repo.lookup(val)
129
129
130 if not revs:
130 if not revs:
131 return repo.dirstate.parents()[0], None
131 return repo.dirstate.parents()[0], None
132 end = None
132 end = None
133 if len(revs) == 1:
133 if len(revs) == 1:
134 if revrangesep in revs[0]:
134 if revrangesep in revs[0]:
135 start, end = revs[0].split(revrangesep, 1)
135 start, end = revs[0].split(revrangesep, 1)
136 start = revfix(repo, start, 0)
136 start = revfix(repo, start, 0)
137 end = revfix(repo, end, len(repo) - 1)
137 end = revfix(repo, end, len(repo) - 1)
138 else:
138 else:
139 start = revfix(repo, revs[0], None)
139 start = revfix(repo, revs[0], None)
140 elif len(revs) == 2:
140 elif len(revs) == 2:
141 if revrangesep in revs[0] or revrangesep in revs[1]:
141 if revrangesep in revs[0] or revrangesep in revs[1]:
142 raise util.Abort(_('too many revisions specified'))
142 raise util.Abort(_('too many revisions specified'))
143 start = revfix(repo, revs[0], None)
143 start = revfix(repo, revs[0], None)
144 end = revfix(repo, revs[1], None)
144 end = revfix(repo, revs[1], None)
145 else:
145 else:
146 raise util.Abort(_('too many revisions specified'))
146 raise util.Abort(_('too many revisions specified'))
147 return start, end
147 return start, end
148
148
149 def revrange(repo, revs):
149 def revrange(repo, revs):
150 """Yield revision as strings from a list of revision specifications."""
150 """Yield revision as strings from a list of revision specifications."""
151
151
152 def revfix(repo, val, defval):
152 def revfix(repo, val, defval):
153 if not val and val != 0 and defval is not None:
153 if not val and val != 0 and defval is not None:
154 return defval
154 return defval
155 return repo.changelog.rev(repo.lookup(val))
155 return repo.changelog.rev(repo.lookup(val))
156
156
157 seen, l = set(), []
157 seen, l = set(), []
158 for spec in revs:
158 for spec in revs:
159 if revrangesep in spec:
159 if revrangesep in spec:
160 start, end = spec.split(revrangesep, 1)
160 start, end = spec.split(revrangesep, 1)
161 start = revfix(repo, start, 0)
161 start = revfix(repo, start, 0)
162 end = revfix(repo, end, len(repo) - 1)
162 end = revfix(repo, end, len(repo) - 1)
163 step = start > end and -1 or 1
163 step = start > end and -1 or 1
164 for rev in xrange(start, end+step, step):
164 for rev in xrange(start, end+step, step):
165 if rev in seen:
165 if rev in seen:
166 continue
166 continue
167 seen.add(rev)
167 seen.add(rev)
168 l.append(rev)
168 l.append(rev)
169 else:
169 else:
170 rev = revfix(repo, spec, None)
170 rev = revfix(repo, spec, None)
171 if rev in seen:
171 if rev in seen:
172 continue
172 continue
173 seen.add(rev)
173 seen.add(rev)
174 l.append(rev)
174 l.append(rev)
175
175
176 return l
176 return l
177
177
178 def make_filename(repo, pat, node,
178 def make_filename(repo, pat, node,
179 total=None, seqno=None, revwidth=None, pathname=None):
179 total=None, seqno=None, revwidth=None, pathname=None):
180 node_expander = {
180 node_expander = {
181 'H': lambda: hex(node),
181 'H': lambda: hex(node),
182 'R': lambda: str(repo.changelog.rev(node)),
182 'R': lambda: str(repo.changelog.rev(node)),
183 'h': lambda: short(node),
183 'h': lambda: short(node),
184 }
184 }
185 expander = {
185 expander = {
186 '%': lambda: '%',
186 '%': lambda: '%',
187 'b': lambda: os.path.basename(repo.root),
187 'b': lambda: os.path.basename(repo.root),
188 }
188 }
189
189
190 try:
190 try:
191 if node:
191 if node:
192 expander.update(node_expander)
192 expander.update(node_expander)
193 if node:
193 if node:
194 expander['r'] = (lambda:
194 expander['r'] = (lambda:
195 str(repo.changelog.rev(node)).zfill(revwidth or 0))
195 str(repo.changelog.rev(node)).zfill(revwidth or 0))
196 if total is not None:
196 if total is not None:
197 expander['N'] = lambda: str(total)
197 expander['N'] = lambda: str(total)
198 if seqno is not None:
198 if seqno is not None:
199 expander['n'] = lambda: str(seqno)
199 expander['n'] = lambda: str(seqno)
200 if total is not None and seqno is not None:
200 if total is not None and seqno is not None:
201 expander['n'] = lambda: str(seqno).zfill(len(str(total)))
201 expander['n'] = lambda: str(seqno).zfill(len(str(total)))
202 if pathname is not None:
202 if pathname is not None:
203 expander['s'] = lambda: os.path.basename(pathname)
203 expander['s'] = lambda: os.path.basename(pathname)
204 expander['d'] = lambda: os.path.dirname(pathname) or '.'
204 expander['d'] = lambda: os.path.dirname(pathname) or '.'
205 expander['p'] = lambda: pathname
205 expander['p'] = lambda: pathname
206
206
207 newname = []
207 newname = []
208 patlen = len(pat)
208 patlen = len(pat)
209 i = 0
209 i = 0
210 while i < patlen:
210 while i < patlen:
211 c = pat[i]
211 c = pat[i]
212 if c == '%':
212 if c == '%':
213 i += 1
213 i += 1
214 c = pat[i]
214 c = pat[i]
215 c = expander[c]()
215 c = expander[c]()
216 newname.append(c)
216 newname.append(c)
217 i += 1
217 i += 1
218 return ''.join(newname)
218 return ''.join(newname)
219 except KeyError, inst:
219 except KeyError, inst:
220 raise util.Abort(_("invalid format spec '%%%s' in output filename") %
220 raise util.Abort(_("invalid format spec '%%%s' in output filename") %
221 inst.args[0])
221 inst.args[0])
222
222
223 def make_file(repo, pat, node=None,
223 def make_file(repo, pat, node=None,
224 total=None, seqno=None, revwidth=None, mode='wb', pathname=None):
224 total=None, seqno=None, revwidth=None, mode='wb', pathname=None):
225
225
226 writable = 'w' in mode or 'a' in mode
226 writable = 'w' in mode or 'a' in mode
227
227
228 if not pat or pat == '-':
228 if not pat or pat == '-':
229 return writable and sys.stdout or sys.stdin
229 return writable and sys.stdout or sys.stdin
230 if hasattr(pat, 'write') and writable:
230 if hasattr(pat, 'write') and writable:
231 return pat
231 return pat
232 if hasattr(pat, 'read') and 'r' in mode:
232 if hasattr(pat, 'read') and 'r' in mode:
233 return pat
233 return pat
234 return open(make_filename(repo, pat, node, total, seqno, revwidth,
234 return open(make_filename(repo, pat, node, total, seqno, revwidth,
235 pathname),
235 pathname),
236 mode)
236 mode)
237
237
238 def expandpats(pats):
238 def expandpats(pats):
239 if not util.expandglobs:
239 if not util.expandglobs:
240 return list(pats)
240 return list(pats)
241 ret = []
241 ret = []
242 for p in pats:
242 for p in pats:
243 kind, name = _match._patsplit(p, None)
243 kind, name = _match._patsplit(p, None)
244 if kind is None:
244 if kind is None:
245 globbed = glob.glob(name)
245 globbed = glob.glob(name)
246 if globbed:
246 if globbed:
247 ret.extend(globbed)
247 ret.extend(globbed)
248 continue
248 continue
249 ret.append(p)
249 ret.append(p)
250 return ret
250 return ret
251
251
252 def match(repo, pats=[], opts={}, globbed=False, default='relpath'):
252 def match(repo, pats=[], opts={}, globbed=False, default='relpath'):
253 if not globbed and default == 'relpath':
253 if not globbed and default == 'relpath':
254 pats = expandpats(pats or [])
254 pats = expandpats(pats or [])
255 m = _match.match(repo.root, repo.getcwd(), pats,
255 m = _match.match(repo.root, repo.getcwd(), pats,
256 opts.get('include'), opts.get('exclude'), default)
256 opts.get('include'), opts.get('exclude'), default)
257 def badfn(f, msg):
257 def badfn(f, msg):
258 repo.ui.warn("%s: %s\n" % (m.rel(f), msg))
258 repo.ui.warn("%s: %s\n" % (m.rel(f), msg))
259 m.bad = badfn
259 m.bad = badfn
260 return m
260 return m
261
261
262 def matchall(repo):
262 def matchall(repo):
263 return _match.always(repo.root, repo.getcwd())
263 return _match.always(repo.root, repo.getcwd())
264
264
265 def matchfiles(repo, files):
265 def matchfiles(repo, files):
266 return _match.exact(repo.root, repo.getcwd(), files)
266 return _match.exact(repo.root, repo.getcwd(), files)
267
267
268 def findrenames(repo, match=None, threshold=0.5):
268 def findrenames(repo, match=None, threshold=0.5):
269 '''find renamed files -- yields (before, after, score) tuples'''
269 '''find renamed files -- yields (before, after, score) tuples'''
270 added, removed = repo.status(match=match)[1:3]
270 added, removed = repo.status(match=match)[1:3]
271 ctx = repo['.']
271 ctx = repo['.']
272 for a in added:
272 for a in added:
273 aa = repo.wread(a)
273 aa = repo.wread(a)
274 bestname, bestscore = None, threshold
274 bestname, bestscore = None, threshold
275 for r in removed:
275 for r in removed:
276 rr = ctx.filectx(r).data()
276 rr = ctx.filectx(r).data()
277
277
278 # bdiff.blocks() returns blocks of matching lines
278 # bdiff.blocks() returns blocks of matching lines
279 # count the number of bytes in each
279 # count the number of bytes in each
280 equal = 0
280 equal = 0
281 alines = mdiff.splitnewlines(aa)
281 alines = mdiff.splitnewlines(aa)
282 matches = bdiff.blocks(aa, rr)
282 matches = bdiff.blocks(aa, rr)
283 for x1,x2,y1,y2 in matches:
283 for x1,x2,y1,y2 in matches:
284 for line in alines[x1:x2]:
284 for line in alines[x1:x2]:
285 equal += len(line)
285 equal += len(line)
286
286
287 lengths = len(aa) + len(rr)
287 lengths = len(aa) + len(rr)
288 if lengths:
288 if lengths:
289 myscore = equal*2.0 / lengths
289 myscore = equal*2.0 / lengths
290 if myscore >= bestscore:
290 if myscore >= bestscore:
291 bestname, bestscore = r, myscore
291 bestname, bestscore = r, myscore
292 if bestname:
292 if bestname:
293 yield bestname, a, bestscore
293 yield bestname, a, bestscore
294
294
295 def addremove(repo, pats=[], opts={}, dry_run=None, similarity=None):
295 def addremove(repo, pats=[], opts={}, dry_run=None, similarity=None):
296 if dry_run is None:
296 if dry_run is None:
297 dry_run = opts.get('dry_run')
297 dry_run = opts.get('dry_run')
298 if similarity is None:
298 if similarity is None:
299 similarity = float(opts.get('similarity') or 0)
299 similarity = float(opts.get('similarity') or 0)
300 add, remove = [], []
300 add, remove = [], []
301 audit_path = util.path_auditor(repo.root)
301 audit_path = util.path_auditor(repo.root)
302 m = match(repo, pats, opts)
302 m = match(repo, pats, opts)
303 for abs in repo.walk(m):
303 for abs in repo.walk(m):
304 target = repo.wjoin(abs)
304 target = repo.wjoin(abs)
305 good = True
305 good = True
306 try:
306 try:
307 audit_path(abs)
307 audit_path(abs)
308 except:
308 except:
309 good = False
309 good = False
310 rel = m.rel(abs)
310 rel = m.rel(abs)
311 exact = m.exact(abs)
311 exact = m.exact(abs)
312 if good and abs not in repo.dirstate:
312 if good and abs not in repo.dirstate:
313 add.append(abs)
313 add.append(abs)
314 if repo.ui.verbose or not exact:
314 if repo.ui.verbose or not exact:
315 repo.ui.status(_('adding %s\n') % ((pats and rel) or abs))
315 repo.ui.status(_('adding %s\n') % ((pats and rel) or abs))
316 if repo.dirstate[abs] != 'r' and (not good or not util.lexists(target)
316 if repo.dirstate[abs] != 'r' and (not good or not util.lexists(target)
317 or (os.path.isdir(target) and not os.path.islink(target))):
317 or (os.path.isdir(target) and not os.path.islink(target))):
318 remove.append(abs)
318 remove.append(abs)
319 if repo.ui.verbose or not exact:
319 if repo.ui.verbose or not exact:
320 repo.ui.status(_('removing %s\n') % ((pats and rel) or abs))
320 repo.ui.status(_('removing %s\n') % ((pats and rel) or abs))
321 if not dry_run:
321 if not dry_run:
322 repo.remove(remove)
322 repo.remove(remove)
323 repo.add(add)
323 repo.add(add)
324 if similarity > 0:
324 if similarity > 0:
325 for old, new, score in findrenames(repo, m, similarity):
325 for old, new, score in findrenames(repo, m, similarity):
326 oldexact, newexact = m.exact(old), m.exact(new)
326 oldexact, newexact = m.exact(old), m.exact(new)
327 if repo.ui.verbose or not oldexact or not newexact:
327 if repo.ui.verbose or not oldexact or not newexact:
328 oldrel, newrel = m.rel(old), m.rel(new)
328 oldrel, newrel = m.rel(old), m.rel(new)
329 repo.ui.status(_('recording removal of %s as rename to %s '
329 repo.ui.status(_('recording removal of %s as rename to %s '
330 '(%d%% similar)\n') %
330 '(%d%% similar)\n') %
331 (oldrel, newrel, score * 100))
331 (oldrel, newrel, score * 100))
332 if not dry_run:
332 if not dry_run:
333 repo.copy(old, new)
333 repo.copy(old, new)
334
334
335 def copy(ui, repo, pats, opts, rename=False):
335 def copy(ui, repo, pats, opts, rename=False):
336 # called with the repo lock held
336 # called with the repo lock held
337 #
337 #
338 # hgsep => pathname that uses "/" to separate directories
338 # hgsep => pathname that uses "/" to separate directories
339 # ossep => pathname that uses os.sep to separate directories
339 # ossep => pathname that uses os.sep to separate directories
340 cwd = repo.getcwd()
340 cwd = repo.getcwd()
341 targets = {}
341 targets = {}
342 after = opts.get("after")
342 after = opts.get("after")
343 dryrun = opts.get("dry_run")
343 dryrun = opts.get("dry_run")
344
344
345 def walkpat(pat):
345 def walkpat(pat):
346 srcs = []
346 srcs = []
347 m = match(repo, [pat], opts, globbed=True)
347 m = match(repo, [pat], opts, globbed=True)
348 for abs in repo.walk(m):
348 for abs in repo.walk(m):
349 state = repo.dirstate[abs]
349 state = repo.dirstate[abs]
350 rel = m.rel(abs)
350 rel = m.rel(abs)
351 exact = m.exact(abs)
351 exact = m.exact(abs)
352 if state in '?r':
352 if state in '?r':
353 if exact and state == '?':
353 if exact and state == '?':
354 ui.warn(_('%s: not copying - file is not managed\n') % rel)
354 ui.warn(_('%s: not copying - file is not managed\n') % rel)
355 if exact and state == 'r':
355 if exact and state == 'r':
356 ui.warn(_('%s: not copying - file has been marked for'
356 ui.warn(_('%s: not copying - file has been marked for'
357 ' remove\n') % rel)
357 ' remove\n') % rel)
358 continue
358 continue
359 # abs: hgsep
359 # abs: hgsep
360 # rel: ossep
360 # rel: ossep
361 srcs.append((abs, rel, exact))
361 srcs.append((abs, rel, exact))
362 return srcs
362 return srcs
363
363
364 # abssrc: hgsep
364 # abssrc: hgsep
365 # relsrc: ossep
365 # relsrc: ossep
366 # otarget: ossep
366 # otarget: ossep
367 def copyfile(abssrc, relsrc, otarget, exact):
367 def copyfile(abssrc, relsrc, otarget, exact):
368 abstarget = util.canonpath(repo.root, cwd, otarget)
368 abstarget = util.canonpath(repo.root, cwd, otarget)
369 reltarget = repo.pathto(abstarget, cwd)
369 reltarget = repo.pathto(abstarget, cwd)
370 target = repo.wjoin(abstarget)
370 target = repo.wjoin(abstarget)
371 src = repo.wjoin(abssrc)
371 src = repo.wjoin(abssrc)
372 state = repo.dirstate[abstarget]
372 state = repo.dirstate[abstarget]
373
373
374 # check for collisions
374 # check for collisions
375 prevsrc = targets.get(abstarget)
375 prevsrc = targets.get(abstarget)
376 if prevsrc is not None:
376 if prevsrc is not None:
377 ui.warn(_('%s: not overwriting - %s collides with %s\n') %
377 ui.warn(_('%s: not overwriting - %s collides with %s\n') %
378 (reltarget, repo.pathto(abssrc, cwd),
378 (reltarget, repo.pathto(abssrc, cwd),
379 repo.pathto(prevsrc, cwd)))
379 repo.pathto(prevsrc, cwd)))
380 return
380 return
381
381
382 # check for overwrites
382 # check for overwrites
383 exists = os.path.exists(target)
383 exists = os.path.exists(target)
384 if not after and exists or after and state in 'mn':
384 if not after and exists or after and state in 'mn':
385 if not opts['force']:
385 if not opts['force']:
386 ui.warn(_('%s: not overwriting - file exists\n') %
386 ui.warn(_('%s: not overwriting - file exists\n') %
387 reltarget)
387 reltarget)
388 return
388 return
389
389
390 if after:
390 if after:
391 if not exists:
391 if not exists:
392 return
392 return
393 elif not dryrun:
393 elif not dryrun:
394 try:
394 try:
395 if exists:
395 if exists:
396 os.unlink(target)
396 os.unlink(target)
397 targetdir = os.path.dirname(target) or '.'
397 targetdir = os.path.dirname(target) or '.'
398 if not os.path.isdir(targetdir):
398 if not os.path.isdir(targetdir):
399 os.makedirs(targetdir)
399 os.makedirs(targetdir)
400 util.copyfile(src, target)
400 util.copyfile(src, target)
401 except IOError, inst:
401 except IOError, inst:
402 if inst.errno == errno.ENOENT:
402 if inst.errno == errno.ENOENT:
403 ui.warn(_('%s: deleted in working copy\n') % relsrc)
403 ui.warn(_('%s: deleted in working copy\n') % relsrc)
404 else:
404 else:
405 ui.warn(_('%s: cannot copy - %s\n') %
405 ui.warn(_('%s: cannot copy - %s\n') %
406 (relsrc, inst.strerror))
406 (relsrc, inst.strerror))
407 return True # report a failure
407 return True # report a failure
408
408
409 if ui.verbose or not exact:
409 if ui.verbose or not exact:
410 if rename:
410 if rename:
411 ui.status(_('moving %s to %s\n') % (relsrc, reltarget))
411 ui.status(_('moving %s to %s\n') % (relsrc, reltarget))
412 else:
412 else:
413 ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
413 ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
414
414
415 targets[abstarget] = abssrc
415 targets[abstarget] = abssrc
416
416
417 # fix up dirstate
417 # fix up dirstate
418 origsrc = repo.dirstate.copied(abssrc) or abssrc
418 origsrc = repo.dirstate.copied(abssrc) or abssrc
419 if abstarget == origsrc: # copying back a copy?
419 if abstarget == origsrc: # copying back a copy?
420 if state not in 'mn' and not dryrun:
420 if state not in 'mn' and not dryrun:
421 repo.dirstate.normallookup(abstarget)
421 repo.dirstate.normallookup(abstarget)
422 else:
422 else:
423 if repo.dirstate[origsrc] == 'a' and origsrc == abssrc:
423 if repo.dirstate[origsrc] == 'a' and origsrc == abssrc:
424 if not ui.quiet:
424 if not ui.quiet:
425 ui.warn(_("%s has not been committed yet, so no copy "
425 ui.warn(_("%s has not been committed yet, so no copy "
426 "data will be stored for %s.\n")
426 "data will be stored for %s.\n")
427 % (repo.pathto(origsrc, cwd), reltarget))
427 % (repo.pathto(origsrc, cwd), reltarget))
428 if repo.dirstate[abstarget] in '?r' and not dryrun:
428 if repo.dirstate[abstarget] in '?r' and not dryrun:
429 repo.add([abstarget])
429 repo.add([abstarget])
430 elif not dryrun:
430 elif not dryrun:
431 repo.copy(origsrc, abstarget)
431 repo.copy(origsrc, abstarget)
432
432
433 if rename and not dryrun:
433 if rename and not dryrun:
434 repo.remove([abssrc], not after)
434 repo.remove([abssrc], not after)
435
435
436 # pat: ossep
436 # pat: ossep
437 # dest ossep
437 # dest ossep
438 # srcs: list of (hgsep, hgsep, ossep, bool)
438 # srcs: list of (hgsep, hgsep, ossep, bool)
439 # return: function that takes hgsep and returns ossep
439 # return: function that takes hgsep and returns ossep
440 def targetpathfn(pat, dest, srcs):
440 def targetpathfn(pat, dest, srcs):
441 if os.path.isdir(pat):
441 if os.path.isdir(pat):
442 abspfx = util.canonpath(repo.root, cwd, pat)
442 abspfx = util.canonpath(repo.root, cwd, pat)
443 abspfx = util.localpath(abspfx)
443 abspfx = util.localpath(abspfx)
444 if destdirexists:
444 if destdirexists:
445 striplen = len(os.path.split(abspfx)[0])
445 striplen = len(os.path.split(abspfx)[0])
446 else:
446 else:
447 striplen = len(abspfx)
447 striplen = len(abspfx)
448 if striplen:
448 if striplen:
449 striplen += len(os.sep)
449 striplen += len(os.sep)
450 res = lambda p: os.path.join(dest, util.localpath(p)[striplen:])
450 res = lambda p: os.path.join(dest, util.localpath(p)[striplen:])
451 elif destdirexists:
451 elif destdirexists:
452 res = lambda p: os.path.join(dest,
452 res = lambda p: os.path.join(dest,
453 os.path.basename(util.localpath(p)))
453 os.path.basename(util.localpath(p)))
454 else:
454 else:
455 res = lambda p: dest
455 res = lambda p: dest
456 return res
456 return res
457
457
458 # pat: ossep
458 # pat: ossep
459 # dest ossep
459 # dest ossep
460 # srcs: list of (hgsep, hgsep, ossep, bool)
460 # srcs: list of (hgsep, hgsep, ossep, bool)
461 # return: function that takes hgsep and returns ossep
461 # return: function that takes hgsep and returns ossep
462 def targetpathafterfn(pat, dest, srcs):
462 def targetpathafterfn(pat, dest, srcs):
463 if _match.patkind(pat):
463 if _match.patkind(pat):
464 # a mercurial pattern
464 # a mercurial pattern
465 res = lambda p: os.path.join(dest,
465 res = lambda p: os.path.join(dest,
466 os.path.basename(util.localpath(p)))
466 os.path.basename(util.localpath(p)))
467 else:
467 else:
468 abspfx = util.canonpath(repo.root, cwd, pat)
468 abspfx = util.canonpath(repo.root, cwd, pat)
469 if len(abspfx) < len(srcs[0][0]):
469 if len(abspfx) < len(srcs[0][0]):
470 # A directory. Either the target path contains the last
470 # A directory. Either the target path contains the last
471 # component of the source path or it does not.
471 # component of the source path or it does not.
472 def evalpath(striplen):
472 def evalpath(striplen):
473 score = 0
473 score = 0
474 for s in srcs:
474 for s in srcs:
475 t = os.path.join(dest, util.localpath(s[0])[striplen:])
475 t = os.path.join(dest, util.localpath(s[0])[striplen:])
476 if os.path.exists(t):
476 if os.path.exists(t):
477 score += 1
477 score += 1
478 return score
478 return score
479
479
480 abspfx = util.localpath(abspfx)
480 abspfx = util.localpath(abspfx)
481 striplen = len(abspfx)
481 striplen = len(abspfx)
482 if striplen:
482 if striplen:
483 striplen += len(os.sep)
483 striplen += len(os.sep)
484 if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])):
484 if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])):
485 score = evalpath(striplen)
485 score = evalpath(striplen)
486 striplen1 = len(os.path.split(abspfx)[0])
486 striplen1 = len(os.path.split(abspfx)[0])
487 if striplen1:
487 if striplen1:
488 striplen1 += len(os.sep)
488 striplen1 += len(os.sep)
489 if evalpath(striplen1) > score:
489 if evalpath(striplen1) > score:
490 striplen = striplen1
490 striplen = striplen1
491 res = lambda p: os.path.join(dest,
491 res = lambda p: os.path.join(dest,
492 util.localpath(p)[striplen:])
492 util.localpath(p)[striplen:])
493 else:
493 else:
494 # a file
494 # a file
495 if destdirexists:
495 if destdirexists:
496 res = lambda p: os.path.join(dest,
496 res = lambda p: os.path.join(dest,
497 os.path.basename(util.localpath(p)))
497 os.path.basename(util.localpath(p)))
498 else:
498 else:
499 res = lambda p: dest
499 res = lambda p: dest
500 return res
500 return res
501
501
502
502
503 pats = expandpats(pats)
503 pats = expandpats(pats)
504 if not pats:
504 if not pats:
505 raise util.Abort(_('no source or destination specified'))
505 raise util.Abort(_('no source or destination specified'))
506 if len(pats) == 1:
506 if len(pats) == 1:
507 raise util.Abort(_('no destination specified'))
507 raise util.Abort(_('no destination specified'))
508 dest = pats.pop()
508 dest = pats.pop()
509 destdirexists = os.path.isdir(dest) and not os.path.islink(dest)
509 destdirexists = os.path.isdir(dest) and not os.path.islink(dest)
510 if not destdirexists:
510 if not destdirexists:
511 if len(pats) > 1 or _match.patkind(pats[0]):
511 if len(pats) > 1 or _match.patkind(pats[0]):
512 raise util.Abort(_('with multiple sources, destination must be an '
512 raise util.Abort(_('with multiple sources, destination must be an '
513 'existing directory'))
513 'existing directory'))
514 if util.endswithsep(dest):
514 if util.endswithsep(dest):
515 raise util.Abort(_('destination %s is not a directory') % dest)
515 raise util.Abort(_('destination %s is not a directory') % dest)
516
516
517 tfn = targetpathfn
517 tfn = targetpathfn
518 if after:
518 if after:
519 tfn = targetpathafterfn
519 tfn = targetpathafterfn
520 copylist = []
520 copylist = []
521 for pat in pats:
521 for pat in pats:
522 srcs = walkpat(pat)
522 srcs = walkpat(pat)
523 if not srcs:
523 if not srcs:
524 continue
524 continue
525 copylist.append((tfn(pat, dest, srcs), srcs))
525 copylist.append((tfn(pat, dest, srcs), srcs))
526 if not copylist:
526 if not copylist:
527 raise util.Abort(_('no files to copy'))
527 raise util.Abort(_('no files to copy'))
528
528
529 errors = 0
529 errors = 0
530 for targetpath, srcs in copylist:
530 for targetpath, srcs in copylist:
531 for abssrc, relsrc, exact in srcs:
531 for abssrc, relsrc, exact in srcs:
532 if copyfile(abssrc, relsrc, targetpath(abssrc), exact):
532 if copyfile(abssrc, relsrc, targetpath(abssrc), exact):
533 errors += 1
533 errors += 1
534
534
535 if errors:
535 if errors:
536 ui.warn(_('(consider using --after)\n'))
536 ui.warn(_('(consider using --after)\n'))
537
537
538 return errors
538 return errors
539
539
540 def service(opts, parentfn=None, initfn=None, runfn=None, logfile=None):
540 def service(opts, parentfn=None, initfn=None, runfn=None, logfile=None):
541 '''Run a command as a service.'''
541 '''Run a command as a service.'''
542
542
543 if opts['daemon'] and not opts['daemon_pipefds']:
543 if opts['daemon'] and not opts['daemon_pipefds']:
544 rfd, wfd = os.pipe()
544 rfd, wfd = os.pipe()
545 args = sys.argv[:]
545 args = sys.argv[:]
546 args.append('--daemon-pipefds=%d,%d' % (rfd, wfd))
546 args.append('--daemon-pipefds=%d,%d' % (rfd, wfd))
547 # Don't pass --cwd to the child process, because we've already
547 # Don't pass --cwd to the child process, because we've already
548 # changed directory.
548 # changed directory.
549 for i in xrange(1,len(args)):
549 for i in xrange(1,len(args)):
550 if args[i].startswith('--cwd='):
550 if args[i].startswith('--cwd='):
551 del args[i]
551 del args[i]
552 break
552 break
553 elif args[i].startswith('--cwd'):
553 elif args[i].startswith('--cwd'):
554 del args[i:i+2]
554 del args[i:i+2]
555 break
555 break
556 pid = os.spawnvp(os.P_NOWAIT | getattr(os, 'P_DETACH', 0),
556 pid = os.spawnvp(os.P_NOWAIT | getattr(os, 'P_DETACH', 0),
557 args[0], args)
557 args[0], args)
558 os.close(wfd)
558 os.close(wfd)
559 os.read(rfd, 1)
559 os.read(rfd, 1)
560 if parentfn:
560 if parentfn:
561 return parentfn(pid)
561 return parentfn(pid)
562 else:
562 else:
563 os._exit(0)
563 os._exit(0)
564
564
565 if initfn:
565 if initfn:
566 initfn()
566 initfn()
567
567
568 if opts['pid_file']:
568 if opts['pid_file']:
569 fp = open(opts['pid_file'], 'w')
569 fp = open(opts['pid_file'], 'w')
570 fp.write(str(os.getpid()) + '\n')
570 fp.write(str(os.getpid()) + '\n')
571 fp.close()
571 fp.close()
572
572
573 if opts['daemon_pipefds']:
573 if opts['daemon_pipefds']:
574 rfd, wfd = [int(x) for x in opts['daemon_pipefds'].split(',')]
574 rfd, wfd = [int(x) for x in opts['daemon_pipefds'].split(',')]
575 os.close(rfd)
575 os.close(rfd)
576 try:
576 try:
577 os.setsid()
577 os.setsid()
578 except AttributeError:
578 except AttributeError:
579 pass
579 pass
580 os.write(wfd, 'y')
580 os.write(wfd, 'y')
581 os.close(wfd)
581 os.close(wfd)
582 sys.stdout.flush()
582 sys.stdout.flush()
583 sys.stderr.flush()
583 sys.stderr.flush()
584
584
585 nullfd = os.open(util.nulldev, os.O_RDWR)
585 nullfd = os.open(util.nulldev, os.O_RDWR)
586 logfilefd = nullfd
586 logfilefd = nullfd
587 if logfile:
587 if logfile:
588 logfilefd = os.open(logfile, os.O_RDWR | os.O_CREAT | os.O_APPEND)
588 logfilefd = os.open(logfile, os.O_RDWR | os.O_CREAT | os.O_APPEND)
589 os.dup2(nullfd, 0)
589 os.dup2(nullfd, 0)
590 os.dup2(logfilefd, 1)
590 os.dup2(logfilefd, 1)
591 os.dup2(logfilefd, 2)
591 os.dup2(logfilefd, 2)
592 if nullfd not in (0, 1, 2):
592 if nullfd not in (0, 1, 2):
593 os.close(nullfd)
593 os.close(nullfd)
594 if logfile and logfilefd not in (0, 1, 2):
594 if logfile and logfilefd not in (0, 1, 2):
595 os.close(logfilefd)
595 os.close(logfilefd)
596
596
597 if runfn:
597 if runfn:
598 return runfn()
598 return runfn()
599
599
600 class changeset_printer(object):
600 class changeset_printer(object):
601 '''show changeset information when templating not requested.'''
601 '''show changeset information when templating not requested.'''
602
602
603 def __init__(self, ui, repo, patch, diffopts, buffered):
603 def __init__(self, ui, repo, patch, diffopts, buffered):
604 self.ui = ui
604 self.ui = ui
605 self.repo = repo
605 self.repo = repo
606 self.buffered = buffered
606 self.buffered = buffered
607 self.patch = patch
607 self.patch = patch
608 self.diffopts = diffopts
608 self.diffopts = diffopts
609 self.header = {}
609 self.header = {}
610 self.hunk = {}
610 self.hunk = {}
611 self.lastheader = None
611 self.lastheader = None
612
612
613 def flush(self, rev):
613 def flush(self, rev):
614 if rev in self.header:
614 if rev in self.header:
615 h = self.header[rev]
615 h = self.header[rev]
616 if h != self.lastheader:
616 if h != self.lastheader:
617 self.lastheader = h
617 self.lastheader = h
618 self.ui.write(h)
618 self.ui.write(h)
619 del self.header[rev]
619 del self.header[rev]
620 if rev in self.hunk:
620 if rev in self.hunk:
621 self.ui.write(self.hunk[rev])
621 self.ui.write(self.hunk[rev])
622 del self.hunk[rev]
622 del self.hunk[rev]
623 return 1
623 return 1
624 return 0
624 return 0
625
625
626 def show(self, ctx, copies=(), **props):
626 def show(self, ctx, copies=(), **props):
627 if self.buffered:
627 if self.buffered:
628 self.ui.pushbuffer()
628 self.ui.pushbuffer()
629 self._show(ctx, copies, props)
629 self._show(ctx, copies, props)
630 self.hunk[ctx.rev()] = self.ui.popbuffer()
630 self.hunk[ctx.rev()] = self.ui.popbuffer()
631 else:
631 else:
632 self._show(ctx, copies, props)
632 self._show(ctx, copies, props)
633
633
634 def _show(self, ctx, copies, props):
634 def _show(self, ctx, copies, props):
635 '''show a single changeset or file revision'''
635 '''show a single changeset or file revision'''
636 changenode = ctx.node()
636 changenode = ctx.node()
637 rev = ctx.rev()
637 rev = ctx.rev()
638
638
639 if self.ui.quiet:
639 if self.ui.quiet:
640 self.ui.write("%d:%s\n" % (rev, short(changenode)))
640 self.ui.write("%d:%s\n" % (rev, short(changenode)))
641 return
641 return
642
642
643 log = self.repo.changelog
643 log = self.repo.changelog
644 changes = log.read(changenode)
644 changes = log.read(changenode)
645 date = util.datestr(changes[2])
645 date = util.datestr(changes[2])
646 extra = changes[5]
646 extra = changes[5]
647 branch = extra.get("branch")
647 branch = extra.get("branch")
648
648
649 hexfunc = self.ui.debugflag and hex or short
649 hexfunc = self.ui.debugflag and hex or short
650
650
651 parents = [(p, hexfunc(log.node(p)))
651 parents = [(p, hexfunc(log.node(p)))
652 for p in self._meaningful_parentrevs(log, rev)]
652 for p in self._meaningful_parentrevs(log, rev)]
653
653
654 self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode)))
654 self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode)))
655
655
656 # don't show the default branch name
656 # don't show the default branch name
657 if branch != 'default':
657 if branch != 'default':
658 branch = encoding.tolocal(branch)
658 branch = encoding.tolocal(branch)
659 self.ui.write(_("branch: %s\n") % branch)
659 self.ui.write(_("branch: %s\n") % branch)
660 for tag in self.repo.nodetags(changenode):
660 for tag in self.repo.nodetags(changenode):
661 self.ui.write(_("tag: %s\n") % tag)
661 self.ui.write(_("tag: %s\n") % tag)
662 for parent in parents:
662 for parent in parents:
663 self.ui.write(_("parent: %d:%s\n") % parent)
663 self.ui.write(_("parent: %d:%s\n") % parent)
664
664
665 if self.ui.debugflag:
665 if self.ui.debugflag:
666 self.ui.write(_("manifest: %d:%s\n") %
666 self.ui.write(_("manifest: %d:%s\n") %
667 (self.repo.manifest.rev(changes[0]), hex(changes[0])))
667 (self.repo.manifest.rev(changes[0]), hex(changes[0])))
668 self.ui.write(_("user: %s\n") % changes[1])
668 self.ui.write(_("user: %s\n") % changes[1])
669 self.ui.write(_("date: %s\n") % date)
669 self.ui.write(_("date: %s\n") % date)
670
670
671 if self.ui.debugflag:
671 if self.ui.debugflag:
672 files = self.repo.status(log.parents(changenode)[0], changenode)[:3]
672 files = self.repo.status(log.parents(changenode)[0], changenode)[:3]
673 for key, value in zip([_("files:"), _("files+:"), _("files-:")],
673 for key, value in zip([_("files:"), _("files+:"), _("files-:")],
674 files):
674 files):
675 if value:
675 if value:
676 self.ui.write("%-12s %s\n" % (key, " ".join(value)))
676 self.ui.write("%-12s %s\n" % (key, " ".join(value)))
677 elif changes[3] and self.ui.verbose:
677 elif changes[3] and self.ui.verbose:
678 self.ui.write(_("files: %s\n") % " ".join(changes[3]))
678 self.ui.write(_("files: %s\n") % " ".join(changes[3]))
679 if copies and self.ui.verbose:
679 if copies and self.ui.verbose:
680 copies = ['%s (%s)' % c for c in copies]
680 copies = ['%s (%s)' % c for c in copies]
681 self.ui.write(_("copies: %s\n") % ' '.join(copies))
681 self.ui.write(_("copies: %s\n") % ' '.join(copies))
682
682
683 if extra and self.ui.debugflag:
683 if extra and self.ui.debugflag:
684 for key, value in sorted(extra.items()):
684 for key, value in sorted(extra.items()):
685 self.ui.write(_("extra: %s=%s\n")
685 self.ui.write(_("extra: %s=%s\n")
686 % (key, value.encode('string_escape')))
686 % (key, value.encode('string_escape')))
687
687
688 description = changes[4].strip()
688 description = changes[4].strip()
689 if description:
689 if description:
690 if self.ui.verbose:
690 if self.ui.verbose:
691 self.ui.write(_("description:\n"))
691 self.ui.write(_("description:\n"))
692 self.ui.write(description)
692 self.ui.write(description)
693 self.ui.write("\n\n")
693 self.ui.write("\n\n")
694 else:
694 else:
695 self.ui.write(_("summary: %s\n") %
695 self.ui.write(_("summary: %s\n") %
696 description.splitlines()[0])
696 description.splitlines()[0])
697 self.ui.write("\n")
697 self.ui.write("\n")
698
698
699 self.showpatch(changenode)
699 self.showpatch(changenode)
700
700
701 def showpatch(self, node):
701 def showpatch(self, node):
702 if self.patch:
702 if self.patch:
703 prev = self.repo.changelog.parents(node)[0]
703 prev = self.repo.changelog.parents(node)[0]
704 chunks = patch.diff(self.repo, prev, node, match=self.patch,
704 chunks = patch.diff(self.repo, prev, node, match=self.patch,
705 opts=patch.diffopts(self.ui, self.diffopts))
705 opts=patch.diffopts(self.ui, self.diffopts))
706 for chunk in chunks:
706 for chunk in chunks:
707 self.ui.write(chunk)
707 self.ui.write(chunk)
708 self.ui.write("\n")
708 self.ui.write("\n")
709
709
710 def _meaningful_parentrevs(self, log, rev):
710 def _meaningful_parentrevs(self, log, rev):
711 """Return list of meaningful (or all if debug) parentrevs for rev.
711 """Return list of meaningful (or all if debug) parentrevs for rev.
712
712
713 For merges (two non-nullrev revisions) both parents are meaningful.
713 For merges (two non-nullrev revisions) both parents are meaningful.
714 Otherwise the first parent revision is considered meaningful if it
714 Otherwise the first parent revision is considered meaningful if it
715 is not the preceding revision.
715 is not the preceding revision.
716 """
716 """
717 parents = log.parentrevs(rev)
717 parents = log.parentrevs(rev)
718 if not self.ui.debugflag and parents[1] == nullrev:
718 if not self.ui.debugflag and parents[1] == nullrev:
719 if parents[0] >= rev - 1:
719 if parents[0] >= rev - 1:
720 parents = []
720 parents = []
721 else:
721 else:
722 parents = [parents[0]]
722 parents = [parents[0]]
723 return parents
723 return parents
724
724
725
725
726 class changeset_templater(changeset_printer):
726 class changeset_templater(changeset_printer):
727 '''format changeset information.'''
727 '''format changeset information.'''
728
728
729 def __init__(self, ui, repo, patch, diffopts, mapfile, buffered):
729 def __init__(self, ui, repo, patch, diffopts, mapfile, buffered):
730 changeset_printer.__init__(self, ui, repo, patch, diffopts, buffered)
730 changeset_printer.__init__(self, ui, repo, patch, diffopts, buffered)
731 formatnode = ui.debugflag and (lambda x: x) or (lambda x: x[:12])
731 formatnode = ui.debugflag and (lambda x: x) or (lambda x: x[:12])
732 self.t = templater.templater(mapfile, {'formatnode': formatnode},
732 self.t = templater.templater(mapfile, {'formatnode': formatnode},
733 cache={
733 cache={
734 'parent': '{rev}:{node|formatnode} ',
734 'parent': '{rev}:{node|formatnode} ',
735 'manifest': '{rev}:{node|formatnode}',
735 'manifest': '{rev}:{node|formatnode}',
736 'filecopy': '{name} ({source})'})
736 'filecopy': '{name} ({source})'})
737
737
738 def use_template(self, t):
738 def use_template(self, t):
739 '''set template string to use'''
739 '''set template string to use'''
740 self.t.cache['changeset'] = t
740 self.t.cache['changeset'] = t
741
741
742 def _meaningful_parentrevs(self, ctx):
742 def _meaningful_parentrevs(self, ctx):
743 """Return list of meaningful (or all if debug) parentrevs for rev.
743 """Return list of meaningful (or all if debug) parentrevs for rev.
744 """
744 """
745 parents = ctx.parents()
745 parents = ctx.parents()
746 if len(parents) > 1:
746 if len(parents) > 1:
747 return parents
747 return parents
748 if self.ui.debugflag:
748 if self.ui.debugflag:
749 return [parents[0], self.repo['null']]
749 return [parents[0], self.repo['null']]
750 if parents[0].rev() >= ctx.rev() - 1:
750 if parents[0].rev() >= ctx.rev() - 1:
751 return []
751 return []
752 return parents
752 return parents
753
753
754 def _show(self, ctx, copies, props):
754 def _show(self, ctx, copies, props):
755 '''show a single changeset or file revision'''
755 '''show a single changeset or file revision'''
756
756
757 def showlist(name, values, plural=None, **args):
757 def showlist(name, values, plural=None, **args):
758 '''expand set of values.
758 '''expand set of values.
759 name is name of key in template map.
759 name is name of key in template map.
760 values is list of strings or dicts.
760 values is list of strings or dicts.
761 plural is plural of name, if not simply name + 's'.
761 plural is plural of name, if not simply name + 's'.
762
762
763 expansion works like this, given name 'foo'.
763 expansion works like this, given name 'foo'.
764
764
765 if values is empty, expand 'no_foos'.
765 if values is empty, expand 'no_foos'.
766
766
767 if 'foo' not in template map, return values as a string,
767 if 'foo' not in template map, return values as a string,
768 joined by space.
768 joined by space.
769
769
770 expand 'start_foos'.
770 expand 'start_foos'.
771
771
772 for each value, expand 'foo'. if 'last_foo' in template
772 for each value, expand 'foo'. if 'last_foo' in template
773 map, expand it instead of 'foo' for last key.
773 map, expand it instead of 'foo' for last key.
774
774
775 expand 'end_foos'.
775 expand 'end_foos'.
776 '''
776 '''
777 if plural: names = plural
777 if plural: names = plural
778 else: names = name + 's'
778 else: names = name + 's'
779 if not values:
779 if not values:
780 noname = 'no_' + names
780 noname = 'no_' + names
781 if noname in self.t:
781 if noname in self.t:
782 yield self.t(noname, **args)
782 yield self.t(noname, **args)
783 return
783 return
784 if name not in self.t:
784 if name not in self.t:
785 if isinstance(values[0], str):
785 if isinstance(values[0], str):
786 yield ' '.join(values)
786 yield ' '.join(values)
787 else:
787 else:
788 for v in values:
788 for v in values:
789 yield dict(v, **args)
789 yield dict(v, **args)
790 return
790 return
791 startname = 'start_' + names
791 startname = 'start_' + names
792 if startname in self.t:
792 if startname in self.t:
793 yield self.t(startname, **args)
793 yield self.t(startname, **args)
794 vargs = args.copy()
794 vargs = args.copy()
795 def one(v, tag=name):
795 def one(v, tag=name):
796 try:
796 try:
797 vargs.update(v)
797 vargs.update(v)
798 except (AttributeError, ValueError):
798 except (AttributeError, ValueError):
799 try:
799 try:
800 for a, b in v:
800 for a, b in v:
801 vargs[a] = b
801 vargs[a] = b
802 except ValueError:
802 except ValueError:
803 vargs[name] = v
803 vargs[name] = v
804 return self.t(tag, **vargs)
804 return self.t(tag, **vargs)
805 lastname = 'last_' + name
805 lastname = 'last_' + name
806 if lastname in self.t:
806 if lastname in self.t:
807 last = values.pop()
807 last = values.pop()
808 else:
808 else:
809 last = None
809 last = None
810 for v in values:
810 for v in values:
811 yield one(v)
811 yield one(v)
812 if last is not None:
812 if last is not None:
813 yield one(last, tag=lastname)
813 yield one(last, tag=lastname)
814 endname = 'end_' + names
814 endname = 'end_' + names
815 if endname in self.t:
815 if endname in self.t:
816 yield self.t(endname, **args)
816 yield self.t(endname, **args)
817
817
818 def showbranches(**args):
818 def showbranches(**args):
819 branch = ctx.branch()
819 branch = ctx.branch()
820 if branch != 'default':
820 if branch != 'default':
821 branch = encoding.tolocal(branch)
821 branch = encoding.tolocal(branch)
822 return showlist('branch', [branch], plural='branches', **args)
822 return showlist('branch', [branch], plural='branches', **args)
823
823
824 def showparents(**args):
824 def showparents(**args):
825 parents = [[('rev', p.rev()), ('node', p.hex())]
825 parents = [[('rev', p.rev()), ('node', p.hex())]
826 for p in self._meaningful_parentrevs(ctx)]
826 for p in self._meaningful_parentrevs(ctx)]
827 return showlist('parent', parents, **args)
827 return showlist('parent', parents, **args)
828
828
829 def showtags(**args):
829 def showtags(**args):
830 return showlist('tag', ctx.tags(), **args)
830 return showlist('tag', ctx.tags(), **args)
831
831
832 def showextras(**args):
832 def showextras(**args):
833 for key, value in sorted(ctx.extra().items()):
833 for key, value in sorted(ctx.extra().items()):
834 args = args.copy()
834 args = args.copy()
835 args.update(dict(key=key, value=value))
835 args.update(dict(key=key, value=value))
836 yield self.t('extra', **args)
836 yield self.t('extra', **args)
837
837
838 def showcopies(**args):
838 def showcopies(**args):
839 c = [{'name': x[0], 'source': x[1]} for x in copies]
839 c = [{'name': x[0], 'source': x[1]} for x in copies]
840 return showlist('file_copy', c, plural='file_copies', **args)
840 return showlist('file_copy', c, plural='file_copies', **args)
841
841
842 files = []
842 files = []
843 def getfiles():
843 def getfiles():
844 if not files:
844 if not files:
845 files[:] = self.repo.status(ctx.parents()[0].node(),
845 files[:] = self.repo.status(ctx.parents()[0].node(),
846 ctx.node())[:3]
846 ctx.node())[:3]
847 return files
847 return files
848 def showfiles(**args):
848 def showfiles(**args):
849 return showlist('file', ctx.files(), **args)
849 return showlist('file', ctx.files(), **args)
850 def showmods(**args):
850 def showmods(**args):
851 return showlist('file_mod', getfiles()[0], **args)
851 return showlist('file_mod', getfiles()[0], **args)
852 def showadds(**args):
852 def showadds(**args):
853 return showlist('file_add', getfiles()[1], **args)
853 return showlist('file_add', getfiles()[1], **args)
854 def showdels(**args):
854 def showdels(**args):
855 return showlist('file_del', getfiles()[2], **args)
855 return showlist('file_del', getfiles()[2], **args)
856 def showmanifest(**args):
856 def showmanifest(**args):
857 args = args.copy()
857 args = args.copy()
858 args.update(dict(rev=self.repo.manifest.rev(ctx.changeset()[0]),
858 args.update(dict(rev=self.repo.manifest.rev(ctx.changeset()[0]),
859 node=hex(ctx.changeset()[0])))
859 node=hex(ctx.changeset()[0])))
860 return self.t('manifest', **args)
860 return self.t('manifest', **args)
861
861
862 def showdiffstat(**args):
862 def showdiffstat(**args):
863 diff = patch.diff(self.repo, ctx.parents()[0].node(), ctx.node())
863 diff = patch.diff(self.repo, ctx.parents()[0].node(), ctx.node())
864 files, adds, removes = 0, 0, 0
864 files, adds, removes = 0, 0, 0
865 for i in patch.diffstatdata(util.iterlines(diff)):
865 for i in patch.diffstatdata(util.iterlines(diff)):
866 files += 1
866 files += 1
867 adds += i[1]
867 adds += i[1]
868 removes += i[2]
868 removes += i[2]
869 return '%s: +%s/-%s' % (files, adds, removes)
869 return '%s: +%s/-%s' % (files, adds, removes)
870
870
871 defprops = {
871 defprops = {
872 'author': ctx.user(),
872 'author': ctx.user(),
873 'branches': showbranches,
873 'branches': showbranches,
874 'date': ctx.date(),
874 'date': ctx.date(),
875 'desc': ctx.description().strip(),
875 'desc': ctx.description().strip(),
876 'file_adds': showadds,
876 'file_adds': showadds,
877 'file_dels': showdels,
877 'file_dels': showdels,
878 'file_mods': showmods,
878 'file_mods': showmods,
879 'files': showfiles,
879 'files': showfiles,
880 'file_copies': showcopies,
880 'file_copies': showcopies,
881 'manifest': showmanifest,
881 'manifest': showmanifest,
882 'node': ctx.hex(),
882 'node': ctx.hex(),
883 'parents': showparents,
883 'parents': showparents,
884 'rev': ctx.rev(),
884 'rev': ctx.rev(),
885 'tags': showtags,
885 'tags': showtags,
886 'extras': showextras,
886 'extras': showextras,
887 'diffstat': showdiffstat,
887 'diffstat': showdiffstat,
888 }
888 }
889 props = props.copy()
889 props = props.copy()
890 props.update(defprops)
890 props.update(defprops)
891
891
892 # find correct templates for current mode
892 # find correct templates for current mode
893
893
894 tmplmodes = [
894 tmplmodes = [
895 (True, None),
895 (True, None),
896 (self.ui.verbose, 'verbose'),
896 (self.ui.verbose, 'verbose'),
897 (self.ui.quiet, 'quiet'),
897 (self.ui.quiet, 'quiet'),
898 (self.ui.debugflag, 'debug'),
898 (self.ui.debugflag, 'debug'),
899 ]
899 ]
900
900
901 types = {'header': '', 'changeset': 'changeset'}
901 types = {'header': '', 'changeset': 'changeset'}
902 for mode, postfix in tmplmodes:
902 for mode, postfix in tmplmodes:
903 for type in types:
903 for type in types:
904 cur = postfix and ('%s_%s' % (type, postfix)) or type
904 cur = postfix and ('%s_%s' % (type, postfix)) or type
905 if mode and cur in self.t:
905 if mode and cur in self.t:
906 types[type] = cur
906 types[type] = cur
907
907
908 try:
908 try:
909
909
910 # write header
910 # write header
911 if types['header']:
911 if types['header']:
912 h = templater.stringify(self.t(types['header'], **props))
912 h = templater.stringify(self.t(types['header'], **props))
913 if self.buffered:
913 if self.buffered:
914 self.header[ctx.rev()] = h
914 self.header[ctx.rev()] = h
915 else:
915 else:
916 self.ui.write(h)
916 self.ui.write(h)
917
917
918 # write changeset metadata, then patch if requested
918 # write changeset metadata, then patch if requested
919 key = types['changeset']
919 key = types['changeset']
920 self.ui.write(templater.stringify(self.t(key, **props)))
920 self.ui.write(templater.stringify(self.t(key, **props)))
921 self.showpatch(ctx.node())
921 self.showpatch(ctx.node())
922
922
923 except KeyError, inst:
923 except KeyError, inst:
924 msg = _("%s: no key named '%s'")
924 msg = _("%s: no key named '%s'")
925 raise util.Abort(msg % (self.t.mapfile, inst.args[0]))
925 raise util.Abort(msg % (self.t.mapfile, inst.args[0]))
926 except SyntaxError, inst:
926 except SyntaxError, inst:
927 raise util.Abort(_('%s: %s') % (self.t.mapfile, inst.args[0]))
927 raise util.Abort(_('%s: %s') % (self.t.mapfile, inst.args[0]))
928
928
929 def show_changeset(ui, repo, opts, buffered=False, matchfn=False):
929 def show_changeset(ui, repo, opts, buffered=False, matchfn=False):
930 """show one changeset using template or regular display.
930 """show one changeset using template or regular display.
931
931
932 Display format will be the first non-empty hit of:
932 Display format will be the first non-empty hit of:
933 1. option 'template'
933 1. option 'template'
934 2. option 'style'
934 2. option 'style'
935 3. [ui] setting 'logtemplate'
935 3. [ui] setting 'logtemplate'
936 4. [ui] setting 'style'
936 4. [ui] setting 'style'
937 If all of these values are either the unset or the empty string,
937 If all of these values are either the unset or the empty string,
938 regular display via changeset_printer() is done.
938 regular display via changeset_printer() is done.
939 """
939 """
940 # options
940 # options
941 patch = False
941 patch = False
942 if opts.get('patch'):
942 if opts.get('patch'):
943 patch = matchfn or matchall(repo)
943 patch = matchfn or matchall(repo)
944
944
945 tmpl = opts.get('template')
945 tmpl = opts.get('template')
946 style = None
946 style = None
947 if tmpl:
947 if tmpl:
948 tmpl = templater.parsestring(tmpl, quoted=False)
948 tmpl = templater.parsestring(tmpl, quoted=False)
949 else:
949 else:
950 style = opts.get('style')
950 style = opts.get('style')
951
951
952 # ui settings
952 # ui settings
953 if not (tmpl or style):
953 if not (tmpl or style):
954 tmpl = ui.config('ui', 'logtemplate')
954 tmpl = ui.config('ui', 'logtemplate')
955 if tmpl:
955 if tmpl:
956 tmpl = templater.parsestring(tmpl)
956 tmpl = templater.parsestring(tmpl)
957 else:
957 else:
958 style = ui.config('ui', 'style')
958 style = ui.config('ui', 'style')
959
959
960 if not (tmpl or style):
960 if not (tmpl or style):
961 return changeset_printer(ui, repo, patch, opts, buffered)
961 return changeset_printer(ui, repo, patch, opts, buffered)
962
962
963 mapfile = None
963 mapfile = None
964 if style and not tmpl:
964 if style and not tmpl:
965 mapfile = style
965 mapfile = style
966 if not os.path.split(mapfile)[0]:
966 if not os.path.split(mapfile)[0]:
967 mapname = (templater.templatepath('map-cmdline.' + mapfile)
967 mapname = (templater.templatepath('map-cmdline.' + mapfile)
968 or templater.templatepath(mapfile))
968 or templater.templatepath(mapfile))
969 if mapname: mapfile = mapname
969 if mapname: mapfile = mapname
970
970
971 try:
971 try:
972 t = changeset_templater(ui, repo, patch, opts, mapfile, buffered)
972 t = changeset_templater(ui, repo, patch, opts, mapfile, buffered)
973 except SyntaxError, inst:
973 except SyntaxError, inst:
974 raise util.Abort(inst.args[0])
974 raise util.Abort(inst.args[0])
975 if tmpl: t.use_template(tmpl)
975 if tmpl: t.use_template(tmpl)
976 return t
976 return t
977
977
978 def finddate(ui, repo, date):
978 def finddate(ui, repo, date):
979 """Find the tipmost changeset that matches the given date spec"""
979 """Find the tipmost changeset that matches the given date spec"""
980 df = util.matchdate(date)
980 df = util.matchdate(date)
981 get = util.cachefunc(lambda r: repo[r].changeset())
981 get = util.cachefunc(lambda r: repo[r].changeset())
982 changeiter, matchfn = walkchangerevs(ui, repo, [], get, {'rev':None})
982 changeiter, matchfn = walkchangerevs(ui, repo, [], get, {'rev':None})
983 results = {}
983 results = {}
984 for st, rev, fns in changeiter:
984 for st, rev, fns in changeiter:
985 if st == 'add':
985 if st == 'add':
986 d = get(rev)[2]
986 d = get(rev)[2]
987 if df(d[0]):
987 if df(d[0]):
988 results[rev] = d
988 results[rev] = d
989 elif st == 'iter':
989 elif st == 'iter':
990 if rev in results:
990 if rev in results:
991 ui.status(_("Found revision %s from %s\n") %
991 ui.status(_("Found revision %s from %s\n") %
992 (rev, util.datestr(results[rev])))
992 (rev, util.datestr(results[rev])))
993 return str(rev)
993 return str(rev)
994
994
995 raise util.Abort(_("revision matching date not found"))
995 raise util.Abort(_("revision matching date not found"))
996
996
997 def walkchangerevs(ui, repo, pats, change, opts):
997 def walkchangerevs(ui, repo, pats, change, opts):
998 '''Iterate over files and the revs in which they changed.
998 '''Iterate over files and the revs in which they changed.
999
999
1000 Callers most commonly need to iterate backwards over the history
1000 Callers most commonly need to iterate backwards over the history
1001 in which they are interested. Doing so has awful (quadratic-looking)
1001 in which they are interested. Doing so has awful (quadratic-looking)
1002 performance, so we use iterators in a "windowed" way.
1002 performance, so we use iterators in a "windowed" way.
1003
1003
1004 We walk a window of revisions in the desired order. Within the
1004 We walk a window of revisions in the desired order. Within the
1005 window, we first walk forwards to gather data, then in the desired
1005 window, we first walk forwards to gather data, then in the desired
1006 order (usually backwards) to display it.
1006 order (usually backwards) to display it.
1007
1007
1008 This function returns an (iterator, matchfn) tuple. The iterator
1008 This function returns an (iterator, matchfn) tuple. The iterator
1009 yields 3-tuples. They will be of one of the following forms:
1009 yields 3-tuples. They will be of one of the following forms:
1010
1010
1011 "window", incrementing, lastrev: stepping through a window,
1011 "window", incrementing, lastrev: stepping through a window,
1012 positive if walking forwards through revs, last rev in the
1012 positive if walking forwards through revs, last rev in the
1013 sequence iterated over - use to reset state for the current window
1013 sequence iterated over - use to reset state for the current window
1014
1014
1015 "add", rev, fns: out-of-order traversal of the given filenames
1015 "add", rev, fns: out-of-order traversal of the given filenames
1016 fns, which changed during revision rev - use to gather data for
1016 fns, which changed during revision rev - use to gather data for
1017 possible display
1017 possible display
1018
1018
1019 "iter", rev, None: in-order traversal of the revs earlier iterated
1019 "iter", rev, None: in-order traversal of the revs earlier iterated
1020 over with "add" - use to display data'''
1020 over with "add" - use to display data'''
1021
1021
1022 def increasing_windows(start, end, windowsize=8, sizelimit=512):
1022 def increasing_windows(start, end, windowsize=8, sizelimit=512):
1023 if start < end:
1023 if start < end:
1024 while start < end:
1024 while start < end:
1025 yield start, min(windowsize, end-start)
1025 yield start, min(windowsize, end-start)
1026 start += windowsize
1026 start += windowsize
1027 if windowsize < sizelimit:
1027 if windowsize < sizelimit:
1028 windowsize *= 2
1028 windowsize *= 2
1029 else:
1029 else:
1030 while start > end:
1030 while start > end:
1031 yield start, min(windowsize, start-end-1)
1031 yield start, min(windowsize, start-end-1)
1032 start -= windowsize
1032 start -= windowsize
1033 if windowsize < sizelimit:
1033 if windowsize < sizelimit:
1034 windowsize *= 2
1034 windowsize *= 2
1035
1035
1036 m = match(repo, pats, opts)
1036 m = match(repo, pats, opts)
1037 follow = opts.get('follow') or opts.get('follow_first')
1037 follow = opts.get('follow') or opts.get('follow_first')
1038
1038
1039 if not len(repo):
1039 if not len(repo):
1040 return [], m
1040 return [], m
1041
1041
1042 if follow:
1042 if follow:
1043 defrange = '%s:0' % repo['.'].rev()
1043 defrange = '%s:0' % repo['.'].rev()
1044 else:
1044 else:
1045 defrange = '-1:0'
1045 defrange = '-1:0'
1046 revs = revrange(repo, opts['rev'] or [defrange])
1046 revs = revrange(repo, opts['rev'] or [defrange])
1047 wanted = set()
1047 wanted = set()
1048 slowpath = m.anypats() or (m.files() and opts.get('removed'))
1048 slowpath = m.anypats() or (m.files() and opts.get('removed'))
1049 fncache = {}
1049 fncache = {}
1050
1050
1051 if not slowpath and not m.files():
1051 if not slowpath and not m.files():
1052 # No files, no patterns. Display all revs.
1052 # No files, no patterns. Display all revs.
1053 wanted = set(revs)
1053 wanted = set(revs)
1054 copies = []
1054 copies = []
1055 if not slowpath:
1055 if not slowpath:
1056 # Only files, no patterns. Check the history of each file.
1056 # Only files, no patterns. Check the history of each file.
1057 def filerevgen(filelog, node):
1057 def filerevgen(filelog, node):
1058 cl_count = len(repo)
1058 cl_count = len(repo)
1059 if node is None:
1059 if node is None:
1060 last = len(filelog) - 1
1060 last = len(filelog) - 1
1061 else:
1061 else:
1062 last = filelog.rev(node)
1062 last = filelog.rev(node)
1063 for i, window in increasing_windows(last, nullrev):
1063 for i, window in increasing_windows(last, nullrev):
1064 revs = []
1064 revs = []
1065 for j in xrange(i - window, i + 1):
1065 for j in xrange(i - window, i + 1):
1066 n = filelog.node(j)
1066 n = filelog.node(j)
1067 revs.append((filelog.linkrev(j),
1067 revs.append((filelog.linkrev(j),
1068 follow and filelog.renamed(n)))
1068 follow and filelog.renamed(n)))
1069 for rev in reversed(revs):
1069 for rev in reversed(revs):
1070 # only yield rev for which we have the changelog, it can
1070 # only yield rev for which we have the changelog, it can
1071 # happen while doing "hg log" during a pull or commit
1071 # happen while doing "hg log" during a pull or commit
1072 if rev[0] < cl_count:
1072 if rev[0] < cl_count:
1073 yield rev
1073 yield rev
1074 def iterfiles():
1074 def iterfiles():
1075 for filename in m.files():
1075 for filename in m.files():
1076 yield filename, None
1076 yield filename, None
1077 for filename_node in copies:
1077 for filename_node in copies:
1078 yield filename_node
1078 yield filename_node
1079 minrev, maxrev = min(revs), max(revs)
1079 minrev, maxrev = min(revs), max(revs)
1080 for file_, node in iterfiles():
1080 for file_, node in iterfiles():
1081 filelog = repo.file(file_)
1081 filelog = repo.file(file_)
1082 if not len(filelog):
1082 if not len(filelog):
1083 if node is None:
1083 if node is None:
1084 # A zero count may be a directory or deleted file, so
1084 # A zero count may be a directory or deleted file, so
1085 # try to find matching entries on the slow path.
1085 # try to find matching entries on the slow path.
1086 if follow:
1086 if follow:
1087 raise util.Abort(_('cannot follow nonexistent file: "%s"') % file_)
1087 raise util.Abort(_('cannot follow nonexistent file: "%s"') % file_)
1088 slowpath = True
1088 slowpath = True
1089 break
1089 break
1090 else:
1090 else:
1091 ui.warn(_('%s:%s copy source revision cannot be found!\n')
1091 ui.warn(_('%s:%s copy source revision cannot be found!\n')
1092 % (file_, short(node)))
1092 % (file_, short(node)))
1093 continue
1093 continue
1094 for rev, copied in filerevgen(filelog, node):
1094 for rev, copied in filerevgen(filelog, node):
1095 if rev <= maxrev:
1095 if rev <= maxrev:
1096 if rev < minrev:
1096 if rev < minrev:
1097 break
1097 break
1098 fncache.setdefault(rev, [])
1098 fncache.setdefault(rev, [])
1099 fncache[rev].append(file_)
1099 fncache[rev].append(file_)
1100 wanted.add(rev)
1100 wanted.add(rev)
1101 if follow and copied:
1101 if follow and copied:
1102 copies.append(copied)
1102 copies.append(copied)
1103 if slowpath:
1103 if slowpath:
1104 if follow:
1104 if follow:
1105 raise util.Abort(_('can only follow copies/renames for explicit '
1105 raise util.Abort(_('can only follow copies/renames for explicit '
1106 'filenames'))
1106 'filenames'))
1107
1107
1108 # The slow path checks files modified in every changeset.
1108 # The slow path checks files modified in every changeset.
1109 def changerevgen():
1109 def changerevgen():
1110 for i, window in increasing_windows(len(repo) - 1, nullrev):
1110 for i, window in increasing_windows(len(repo) - 1, nullrev):
1111 for j in xrange(i - window, i + 1):
1111 for j in xrange(i - window, i + 1):
1112 yield j, change(j)[3]
1112 yield j, change(j)[3]
1113
1113
1114 for rev, changefiles in changerevgen():
1114 for rev, changefiles in changerevgen():
1115 matches = filter(m, changefiles)
1115 matches = filter(m, changefiles)
1116 if matches:
1116 if matches:
1117 fncache[rev] = matches
1117 fncache[rev] = matches
1118 wanted.add(rev)
1118 wanted.add(rev)
1119
1119
1120 class followfilter(object):
1120 class followfilter(object):
1121 def __init__(self, onlyfirst=False):
1121 def __init__(self, onlyfirst=False):
1122 self.startrev = nullrev
1122 self.startrev = nullrev
1123 self.roots = []
1123 self.roots = []
1124 self.onlyfirst = onlyfirst
1124 self.onlyfirst = onlyfirst
1125
1125
1126 def match(self, rev):
1126 def match(self, rev):
1127 def realparents(rev):
1127 def realparents(rev):
1128 if self.onlyfirst:
1128 if self.onlyfirst:
1129 return repo.changelog.parentrevs(rev)[0:1]
1129 return repo.changelog.parentrevs(rev)[0:1]
1130 else:
1130 else:
1131 return filter(lambda x: x != nullrev,
1131 return filter(lambda x: x != nullrev,
1132 repo.changelog.parentrevs(rev))
1132 repo.changelog.parentrevs(rev))
1133
1133
1134 if self.startrev == nullrev:
1134 if self.startrev == nullrev:
1135 self.startrev = rev
1135 self.startrev = rev
1136 return True
1136 return True
1137
1137
1138 if rev > self.startrev:
1138 if rev > self.startrev:
1139 # forward: all descendants
1139 # forward: all descendants
1140 if not self.roots:
1140 if not self.roots:
1141 self.roots.append(self.startrev)
1141 self.roots.append(self.startrev)
1142 for parent in realparents(rev):
1142 for parent in realparents(rev):
1143 if parent in self.roots:
1143 if parent in self.roots:
1144 self.roots.append(rev)
1144 self.roots.append(rev)
1145 return True
1145 return True
1146 else:
1146 else:
1147 # backwards: all parents
1147 # backwards: all parents
1148 if not self.roots:
1148 if not self.roots:
1149 self.roots.extend(realparents(self.startrev))
1149 self.roots.extend(realparents(self.startrev))
1150 if rev in self.roots:
1150 if rev in self.roots:
1151 self.roots.remove(rev)
1151 self.roots.remove(rev)
1152 self.roots.extend(realparents(rev))
1152 self.roots.extend(realparents(rev))
1153 return True
1153 return True
1154
1154
1155 return False
1155 return False
1156
1156
1157 # it might be worthwhile to do this in the iterator if the rev range
1157 # it might be worthwhile to do this in the iterator if the rev range
1158 # is descending and the prune args are all within that range
1158 # is descending and the prune args are all within that range
1159 for rev in opts.get('prune', ()):
1159 for rev in opts.get('prune', ()):
1160 rev = repo.changelog.rev(repo.lookup(rev))
1160 rev = repo.changelog.rev(repo.lookup(rev))
1161 ff = followfilter()
1161 ff = followfilter()
1162 stop = min(revs[0], revs[-1])
1162 stop = min(revs[0], revs[-1])
1163 for x in xrange(rev, stop-1, -1):
1163 for x in xrange(rev, stop-1, -1):
1164 if ff.match(x):
1164 if ff.match(x):
1165 wanted.discard(x)
1165 wanted.discard(x)
1166
1166
1167 def iterate():
1167 def iterate():
1168 if follow and not m.files():
1168 if follow and not m.files():
1169 ff = followfilter(onlyfirst=opts.get('follow_first'))
1169 ff = followfilter(onlyfirst=opts.get('follow_first'))
1170 def want(rev):
1170 def want(rev):
1171 return ff.match(rev) and rev in wanted
1171 return ff.match(rev) and rev in wanted
1172 else:
1172 else:
1173 def want(rev):
1173 def want(rev):
1174 return rev in wanted
1174 return rev in wanted
1175
1175
1176 for i, window in increasing_windows(0, len(revs)):
1176 for i, window in increasing_windows(0, len(revs)):
1177 yield 'window', revs[0] < revs[-1], revs[-1]
1177 yield 'window', revs[0] < revs[-1], revs[-1]
1178 nrevs = [rev for rev in revs[i:i+window] if want(rev)]
1178 nrevs = [rev for rev in revs[i:i+window] if want(rev)]
1179 for rev in sorted(nrevs):
1179 for rev in sorted(nrevs):
1180 fns = fncache.get(rev)
1180 fns = fncache.get(rev)
1181 if not fns:
1181 if not fns:
1182 def fns_generator():
1182 def fns_generator():
1183 for f in change(rev)[3]:
1183 for f in change(rev)[3]:
1184 if m(f):
1184 if m(f):
1185 yield f
1185 yield f
1186 fns = fns_generator()
1186 fns = fns_generator()
1187 yield 'add', rev, fns
1187 yield 'add', rev, fns
1188 for rev in nrevs:
1188 for rev in nrevs:
1189 yield 'iter', rev, None
1189 yield 'iter', rev, None
1190 return iterate(), m
1190 return iterate(), m
1191
1191
1192 def commit(ui, repo, commitfunc, pats, opts):
1192 def commit(ui, repo, commitfunc, pats, opts):
1193 '''commit the specified files or all outstanding changes'''
1193 '''commit the specified files or all outstanding changes'''
1194 date = opts.get('date')
1194 date = opts.get('date')
1195 if date:
1195 if date:
1196 opts['date'] = util.parsedate(date)
1196 opts['date'] = util.parsedate(date)
1197 message = logmessage(opts)
1197 message = logmessage(opts)
1198
1198
1199 # extract addremove carefully -- this function can be called from a command
1199 # extract addremove carefully -- this function can be called from a command
1200 # that doesn't support addremove
1200 # that doesn't support addremove
1201 if opts.get('addremove'):
1201 if opts.get('addremove'):
1202 addremove(repo, pats, opts)
1202 addremove(repo, pats, opts)
1203
1203
1204 return commitfunc(ui, repo, message, match(repo, pats, opts), opts)
1204 return commitfunc(ui, repo, message, match(repo, pats, opts), opts)
1205
1205
1206 def commiteditor(repo, ctx):
1206 def commiteditor(repo, ctx):
1207 if ctx.description():
1207 if ctx.description():
1208 return ctx.description()
1208 return ctx.description()
1209 return commitforceeditor(repo, ctx)
1209 return commitforceeditor(repo, ctx)
1210
1210
1211 def commitforceeditor(repo, ctx):
1211 def commitforceeditor(repo, ctx):
1212 edittext = []
1212 edittext = []
1213 modified, added, removed = ctx.modified(), ctx.added(), ctx.removed()
1213 modified, added, removed = ctx.modified(), ctx.added(), ctx.removed()
1214 if ctx.description():
1214 if ctx.description():
1215 edittext.append(ctx.description())
1215 edittext.append(ctx.description())
1216 edittext.append("")
1216 edittext.append("")
1217 edittext.append("") # Empty line between message and comments.
1217 edittext.append("") # Empty line between message and comments.
1218 edittext.append(_("HG: Enter commit message."
1218 edittext.append(_("HG: Enter commit message."
1219 " Lines beginning with 'HG:' are removed."))
1219 " Lines beginning with 'HG:' are removed."))
1220 edittext.append(_("HG: Leave message empty to abort commit."))
1220 edittext.append(_("HG: Leave message empty to abort commit."))
1221 edittext.append("HG: --")
1221 edittext.append("HG: --")
1222 edittext.append(_("HG: user: %s") % ctx.user())
1222 edittext.append(_("HG: user: %s") % ctx.user())
1223 if ctx.p2():
1223 if ctx.p2():
1224 edittext.append(_("HG: branch merge"))
1224 edittext.append(_("HG: branch merge"))
1225 if ctx.branch():
1225 if ctx.branch():
1226 edittext.append(_("HG: branch '%s'")
1226 edittext.append(_("HG: branch '%s'")
1227 % encoding.tolocal(ctx.branch()))
1227 % encoding.tolocal(ctx.branch()))
1228 edittext.extend([_("HG: added %s") % f for f in added])
1228 edittext.extend([_("HG: added %s") % f for f in added])
1229 edittext.extend([_("HG: changed %s") % f for f in modified])
1229 edittext.extend([_("HG: changed %s") % f for f in modified])
1230 edittext.extend([_("HG: removed %s") % f for f in removed])
1230 edittext.extend([_("HG: removed %s") % f for f in removed])
1231 if not added and not modified and not removed:
1231 if not added and not modified and not removed:
1232 edittext.append(_("HG: no files changed"))
1232 edittext.append(_("HG: no files changed"))
1233 edittext.append("")
1233 edittext.append("")
1234 # run editor in the repository root
1234 # run editor in the repository root
1235 olddir = os.getcwd()
1235 olddir = os.getcwd()
1236 os.chdir(repo.root)
1236 os.chdir(repo.root)
1237 text = repo.ui.edit("\n".join(edittext), ctx.user())
1237 text = repo.ui.edit("\n".join(edittext), ctx.user())
1238 text = re.sub("(?m)^HG:.*\n", "", text)
1238 text = re.sub("(?m)^HG:.*\n", "", text)
1239 os.chdir(olddir)
1239 os.chdir(olddir)
1240
1240
1241 if not text.strip():
1241 if not text.strip():
1242 raise util.Abort(_("empty commit message"))
1242 raise util.Abort(_("empty commit message"))
1243
1243
1244 return text
1244 return text
General Comments 0
You need to be logged in to leave comments. Login now