Show More
@@ -1,2479 +1,2477 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 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
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, tempfile |
|
10 | import os, sys, errno, re, tempfile | |
11 | import util, scmutil, templater, patch, error, templatekw, revlog, copies |
|
11 | import util, scmutil, templater, patch, error, templatekw, revlog, copies | |
12 | import match as matchmod |
|
12 | import match as matchmod | |
13 | import context, repair, graphmod, revset, phases, obsolete, pathutil |
|
13 | import context, repair, graphmod, revset, phases, obsolete, pathutil | |
14 | import changelog |
|
14 | import changelog | |
15 | import bookmarks |
|
15 | import bookmarks | |
16 | import lock as lockmod |
|
16 | import lock as lockmod | |
17 |
|
17 | |||
18 | def parsealiases(cmd): |
|
18 | def parsealiases(cmd): | |
19 | return cmd.lstrip("^").split("|") |
|
19 | return cmd.lstrip("^").split("|") | |
20 |
|
20 | |||
21 | def findpossible(cmd, table, strict=False): |
|
21 | def findpossible(cmd, table, strict=False): | |
22 | """ |
|
22 | """ | |
23 | Return cmd -> (aliases, command table entry) |
|
23 | Return cmd -> (aliases, command table entry) | |
24 | for each matching command. |
|
24 | for each matching command. | |
25 | Return debug commands (or their aliases) only if no normal command matches. |
|
25 | Return debug commands (or their aliases) only if no normal command matches. | |
26 | """ |
|
26 | """ | |
27 | choice = {} |
|
27 | choice = {} | |
28 | debugchoice = {} |
|
28 | debugchoice = {} | |
29 |
|
29 | |||
30 | if cmd in table: |
|
30 | if cmd in table: | |
31 | # short-circuit exact matches, "log" alias beats "^log|history" |
|
31 | # short-circuit exact matches, "log" alias beats "^log|history" | |
32 | keys = [cmd] |
|
32 | keys = [cmd] | |
33 | else: |
|
33 | else: | |
34 | keys = table.keys() |
|
34 | keys = table.keys() | |
35 |
|
35 | |||
36 | for e in keys: |
|
36 | for e in keys: | |
37 | aliases = parsealiases(e) |
|
37 | aliases = parsealiases(e) | |
38 | found = None |
|
38 | found = None | |
39 | if cmd in aliases: |
|
39 | if cmd in aliases: | |
40 | found = cmd |
|
40 | found = cmd | |
41 | elif not strict: |
|
41 | elif not strict: | |
42 | for a in aliases: |
|
42 | for a in aliases: | |
43 | if a.startswith(cmd): |
|
43 | if a.startswith(cmd): | |
44 | found = a |
|
44 | found = a | |
45 | break |
|
45 | break | |
46 | if found is not None: |
|
46 | if found is not None: | |
47 | if aliases[0].startswith("debug") or found.startswith("debug"): |
|
47 | if aliases[0].startswith("debug") or found.startswith("debug"): | |
48 | debugchoice[found] = (aliases, table[e]) |
|
48 | debugchoice[found] = (aliases, table[e]) | |
49 | else: |
|
49 | else: | |
50 | choice[found] = (aliases, table[e]) |
|
50 | choice[found] = (aliases, table[e]) | |
51 |
|
51 | |||
52 | if not choice and debugchoice: |
|
52 | if not choice and debugchoice: | |
53 | choice = debugchoice |
|
53 | choice = debugchoice | |
54 |
|
54 | |||
55 | return choice |
|
55 | return choice | |
56 |
|
56 | |||
57 | def findcmd(cmd, table, strict=True): |
|
57 | def findcmd(cmd, table, strict=True): | |
58 | """Return (aliases, command table entry) for command string.""" |
|
58 | """Return (aliases, command table entry) for command string.""" | |
59 | choice = findpossible(cmd, table, strict) |
|
59 | choice = findpossible(cmd, table, strict) | |
60 |
|
60 | |||
61 | if cmd in choice: |
|
61 | if cmd in choice: | |
62 | return choice[cmd] |
|
62 | return choice[cmd] | |
63 |
|
63 | |||
64 | if len(choice) > 1: |
|
64 | if len(choice) > 1: | |
65 | clist = choice.keys() |
|
65 | clist = choice.keys() | |
66 | clist.sort() |
|
66 | clist.sort() | |
67 | raise error.AmbiguousCommand(cmd, clist) |
|
67 | raise error.AmbiguousCommand(cmd, clist) | |
68 |
|
68 | |||
69 | if choice: |
|
69 | if choice: | |
70 | return choice.values()[0] |
|
70 | return choice.values()[0] | |
71 |
|
71 | |||
72 | raise error.UnknownCommand(cmd) |
|
72 | raise error.UnknownCommand(cmd) | |
73 |
|
73 | |||
74 | def findrepo(p): |
|
74 | def findrepo(p): | |
75 | while not os.path.isdir(os.path.join(p, ".hg")): |
|
75 | while not os.path.isdir(os.path.join(p, ".hg")): | |
76 | oldp, p = p, os.path.dirname(p) |
|
76 | oldp, p = p, os.path.dirname(p) | |
77 | if p == oldp: |
|
77 | if p == oldp: | |
78 | return None |
|
78 | return None | |
79 |
|
79 | |||
80 | return p |
|
80 | return p | |
81 |
|
81 | |||
82 | def bailifchanged(repo): |
|
82 | def bailifchanged(repo): | |
83 | if repo.dirstate.p2() != nullid: |
|
83 | if repo.dirstate.p2() != nullid: | |
84 | raise util.Abort(_('outstanding uncommitted merge')) |
|
84 | raise util.Abort(_('outstanding uncommitted merge')) | |
85 | modified, added, removed, deleted = repo.status()[:4] |
|
85 | modified, added, removed, deleted = repo.status()[:4] | |
86 | if modified or added or removed or deleted: |
|
86 | if modified or added or removed or deleted: | |
87 | raise util.Abort(_('uncommitted changes')) |
|
87 | raise util.Abort(_('uncommitted changes')) | |
88 | ctx = repo[None] |
|
88 | ctx = repo[None] | |
89 | for s in sorted(ctx.substate): |
|
89 | for s in sorted(ctx.substate): | |
90 | if ctx.sub(s).dirty(): |
|
90 | if ctx.sub(s).dirty(): | |
91 | raise util.Abort(_("uncommitted changes in subrepo %s") % s) |
|
91 | raise util.Abort(_("uncommitted changes in subrepo %s") % s) | |
92 |
|
92 | |||
93 | def logmessage(ui, opts): |
|
93 | def logmessage(ui, opts): | |
94 | """ get the log message according to -m and -l option """ |
|
94 | """ get the log message according to -m and -l option """ | |
95 | message = opts.get('message') |
|
95 | message = opts.get('message') | |
96 | logfile = opts.get('logfile') |
|
96 | logfile = opts.get('logfile') | |
97 |
|
97 | |||
98 | if message and logfile: |
|
98 | if message and logfile: | |
99 | raise util.Abort(_('options --message and --logfile are mutually ' |
|
99 | raise util.Abort(_('options --message and --logfile are mutually ' | |
100 | 'exclusive')) |
|
100 | 'exclusive')) | |
101 | if not message and logfile: |
|
101 | if not message and logfile: | |
102 | try: |
|
102 | try: | |
103 | if logfile == '-': |
|
103 | if logfile == '-': | |
104 | message = ui.fin.read() |
|
104 | message = ui.fin.read() | |
105 | else: |
|
105 | else: | |
106 | message = '\n'.join(util.readfile(logfile).splitlines()) |
|
106 | message = '\n'.join(util.readfile(logfile).splitlines()) | |
107 | except IOError, inst: |
|
107 | except IOError, inst: | |
108 | raise util.Abort(_("can't read commit message '%s': %s") % |
|
108 | raise util.Abort(_("can't read commit message '%s': %s") % | |
109 | (logfile, inst.strerror)) |
|
109 | (logfile, inst.strerror)) | |
110 | return message |
|
110 | return message | |
111 |
|
111 | |||
112 | def loglimit(opts): |
|
112 | def loglimit(opts): | |
113 | """get the log limit according to option -l/--limit""" |
|
113 | """get the log limit according to option -l/--limit""" | |
114 | limit = opts.get('limit') |
|
114 | limit = opts.get('limit') | |
115 | if limit: |
|
115 | if limit: | |
116 | try: |
|
116 | try: | |
117 | limit = int(limit) |
|
117 | limit = int(limit) | |
118 | except ValueError: |
|
118 | except ValueError: | |
119 | raise util.Abort(_('limit must be a positive integer')) |
|
119 | raise util.Abort(_('limit must be a positive integer')) | |
120 | if limit <= 0: |
|
120 | if limit <= 0: | |
121 | raise util.Abort(_('limit must be positive')) |
|
121 | raise util.Abort(_('limit must be positive')) | |
122 | else: |
|
122 | else: | |
123 | limit = None |
|
123 | limit = None | |
124 | return limit |
|
124 | return limit | |
125 |
|
125 | |||
126 | def makefilename(repo, pat, node, desc=None, |
|
126 | def makefilename(repo, pat, node, desc=None, | |
127 | total=None, seqno=None, revwidth=None, pathname=None): |
|
127 | total=None, seqno=None, revwidth=None, pathname=None): | |
128 | node_expander = { |
|
128 | node_expander = { | |
129 | 'H': lambda: hex(node), |
|
129 | 'H': lambda: hex(node), | |
130 | 'R': lambda: str(repo.changelog.rev(node)), |
|
130 | 'R': lambda: str(repo.changelog.rev(node)), | |
131 | 'h': lambda: short(node), |
|
131 | 'h': lambda: short(node), | |
132 | 'm': lambda: re.sub('[^\w]', '_', str(desc)) |
|
132 | 'm': lambda: re.sub('[^\w]', '_', str(desc)) | |
133 | } |
|
133 | } | |
134 | expander = { |
|
134 | expander = { | |
135 | '%': lambda: '%', |
|
135 | '%': lambda: '%', | |
136 | 'b': lambda: os.path.basename(repo.root), |
|
136 | 'b': lambda: os.path.basename(repo.root), | |
137 | } |
|
137 | } | |
138 |
|
138 | |||
139 | try: |
|
139 | try: | |
140 | if node: |
|
140 | if node: | |
141 | expander.update(node_expander) |
|
141 | expander.update(node_expander) | |
142 | if node: |
|
142 | if node: | |
143 | expander['r'] = (lambda: |
|
143 | expander['r'] = (lambda: | |
144 | str(repo.changelog.rev(node)).zfill(revwidth or 0)) |
|
144 | str(repo.changelog.rev(node)).zfill(revwidth or 0)) | |
145 | if total is not None: |
|
145 | if total is not None: | |
146 | expander['N'] = lambda: str(total) |
|
146 | expander['N'] = lambda: str(total) | |
147 | if seqno is not None: |
|
147 | if seqno is not None: | |
148 | expander['n'] = lambda: str(seqno) |
|
148 | expander['n'] = lambda: str(seqno) | |
149 | if total is not None and seqno is not None: |
|
149 | if total is not None and seqno is not None: | |
150 | expander['n'] = lambda: str(seqno).zfill(len(str(total))) |
|
150 | expander['n'] = lambda: str(seqno).zfill(len(str(total))) | |
151 | if pathname is not None: |
|
151 | if pathname is not None: | |
152 | expander['s'] = lambda: os.path.basename(pathname) |
|
152 | expander['s'] = lambda: os.path.basename(pathname) | |
153 | expander['d'] = lambda: os.path.dirname(pathname) or '.' |
|
153 | expander['d'] = lambda: os.path.dirname(pathname) or '.' | |
154 | expander['p'] = lambda: pathname |
|
154 | expander['p'] = lambda: pathname | |
155 |
|
155 | |||
156 | newname = [] |
|
156 | newname = [] | |
157 | patlen = len(pat) |
|
157 | patlen = len(pat) | |
158 | i = 0 |
|
158 | i = 0 | |
159 | while i < patlen: |
|
159 | while i < patlen: | |
160 | c = pat[i] |
|
160 | c = pat[i] | |
161 | if c == '%': |
|
161 | if c == '%': | |
162 | i += 1 |
|
162 | i += 1 | |
163 | c = pat[i] |
|
163 | c = pat[i] | |
164 | c = expander[c]() |
|
164 | c = expander[c]() | |
165 | newname.append(c) |
|
165 | newname.append(c) | |
166 | i += 1 |
|
166 | i += 1 | |
167 | return ''.join(newname) |
|
167 | return ''.join(newname) | |
168 | except KeyError, inst: |
|
168 | except KeyError, inst: | |
169 | raise util.Abort(_("invalid format spec '%%%s' in output filename") % |
|
169 | raise util.Abort(_("invalid format spec '%%%s' in output filename") % | |
170 | inst.args[0]) |
|
170 | inst.args[0]) | |
171 |
|
171 | |||
172 | def makefileobj(repo, pat, node=None, desc=None, total=None, |
|
172 | def makefileobj(repo, pat, node=None, desc=None, total=None, | |
173 | seqno=None, revwidth=None, mode='wb', modemap=None, |
|
173 | seqno=None, revwidth=None, mode='wb', modemap=None, | |
174 | pathname=None): |
|
174 | pathname=None): | |
175 |
|
175 | |||
176 | writable = mode not in ('r', 'rb') |
|
176 | writable = mode not in ('r', 'rb') | |
177 |
|
177 | |||
178 | if not pat or pat == '-': |
|
178 | if not pat or pat == '-': | |
179 | fp = writable and repo.ui.fout or repo.ui.fin |
|
179 | fp = writable and repo.ui.fout or repo.ui.fin | |
180 | if util.safehasattr(fp, 'fileno'): |
|
180 | if util.safehasattr(fp, 'fileno'): | |
181 | return os.fdopen(os.dup(fp.fileno()), mode) |
|
181 | return os.fdopen(os.dup(fp.fileno()), mode) | |
182 | else: |
|
182 | else: | |
183 | # if this fp can't be duped properly, return |
|
183 | # if this fp can't be duped properly, return | |
184 | # a dummy object that can be closed |
|
184 | # a dummy object that can be closed | |
185 | class wrappedfileobj(object): |
|
185 | class wrappedfileobj(object): | |
186 | noop = lambda x: None |
|
186 | noop = lambda x: None | |
187 | def __init__(self, f): |
|
187 | def __init__(self, f): | |
188 | self.f = f |
|
188 | self.f = f | |
189 | def __getattr__(self, attr): |
|
189 | def __getattr__(self, attr): | |
190 | if attr == 'close': |
|
190 | if attr == 'close': | |
191 | return self.noop |
|
191 | return self.noop | |
192 | else: |
|
192 | else: | |
193 | return getattr(self.f, attr) |
|
193 | return getattr(self.f, attr) | |
194 |
|
194 | |||
195 | return wrappedfileobj(fp) |
|
195 | return wrappedfileobj(fp) | |
196 | if util.safehasattr(pat, 'write') and writable: |
|
196 | if util.safehasattr(pat, 'write') and writable: | |
197 | return pat |
|
197 | return pat | |
198 | if util.safehasattr(pat, 'read') and 'r' in mode: |
|
198 | if util.safehasattr(pat, 'read') and 'r' in mode: | |
199 | return pat |
|
199 | return pat | |
200 | fn = makefilename(repo, pat, node, desc, total, seqno, revwidth, pathname) |
|
200 | fn = makefilename(repo, pat, node, desc, total, seqno, revwidth, pathname) | |
201 | if modemap is not None: |
|
201 | if modemap is not None: | |
202 | mode = modemap.get(fn, mode) |
|
202 | mode = modemap.get(fn, mode) | |
203 | if mode == 'wb': |
|
203 | if mode == 'wb': | |
204 | modemap[fn] = 'ab' |
|
204 | modemap[fn] = 'ab' | |
205 | return open(fn, mode) |
|
205 | return open(fn, mode) | |
206 |
|
206 | |||
207 | def openrevlog(repo, cmd, file_, opts): |
|
207 | def openrevlog(repo, cmd, file_, opts): | |
208 | """opens the changelog, manifest, a filelog or a given revlog""" |
|
208 | """opens the changelog, manifest, a filelog or a given revlog""" | |
209 | cl = opts['changelog'] |
|
209 | cl = opts['changelog'] | |
210 | mf = opts['manifest'] |
|
210 | mf = opts['manifest'] | |
211 | msg = None |
|
211 | msg = None | |
212 | if cl and mf: |
|
212 | if cl and mf: | |
213 | msg = _('cannot specify --changelog and --manifest at the same time') |
|
213 | msg = _('cannot specify --changelog and --manifest at the same time') | |
214 | elif cl or mf: |
|
214 | elif cl or mf: | |
215 | if file_: |
|
215 | if file_: | |
216 | msg = _('cannot specify filename with --changelog or --manifest') |
|
216 | msg = _('cannot specify filename with --changelog or --manifest') | |
217 | elif not repo: |
|
217 | elif not repo: | |
218 | msg = _('cannot specify --changelog or --manifest ' |
|
218 | msg = _('cannot specify --changelog or --manifest ' | |
219 | 'without a repository') |
|
219 | 'without a repository') | |
220 | if msg: |
|
220 | if msg: | |
221 | raise util.Abort(msg) |
|
221 | raise util.Abort(msg) | |
222 |
|
222 | |||
223 | r = None |
|
223 | r = None | |
224 | if repo: |
|
224 | if repo: | |
225 | if cl: |
|
225 | if cl: | |
226 | r = repo.unfiltered().changelog |
|
226 | r = repo.unfiltered().changelog | |
227 | elif mf: |
|
227 | elif mf: | |
228 | r = repo.manifest |
|
228 | r = repo.manifest | |
229 | elif file_: |
|
229 | elif file_: | |
230 | filelog = repo.file(file_) |
|
230 | filelog = repo.file(file_) | |
231 | if len(filelog): |
|
231 | if len(filelog): | |
232 | r = filelog |
|
232 | r = filelog | |
233 | if not r: |
|
233 | if not r: | |
234 | if not file_: |
|
234 | if not file_: | |
235 | raise error.CommandError(cmd, _('invalid arguments')) |
|
235 | raise error.CommandError(cmd, _('invalid arguments')) | |
236 | if not os.path.isfile(file_): |
|
236 | if not os.path.isfile(file_): | |
237 | raise util.Abort(_("revlog '%s' not found") % file_) |
|
237 | raise util.Abort(_("revlog '%s' not found") % file_) | |
238 | r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), |
|
238 | r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), | |
239 | file_[:-2] + ".i") |
|
239 | file_[:-2] + ".i") | |
240 | return r |
|
240 | return r | |
241 |
|
241 | |||
242 | def copy(ui, repo, pats, opts, rename=False): |
|
242 | def copy(ui, repo, pats, opts, rename=False): | |
243 | # called with the repo lock held |
|
243 | # called with the repo lock held | |
244 | # |
|
244 | # | |
245 | # hgsep => pathname that uses "/" to separate directories |
|
245 | # hgsep => pathname that uses "/" to separate directories | |
246 | # ossep => pathname that uses os.sep to separate directories |
|
246 | # ossep => pathname that uses os.sep to separate directories | |
247 | cwd = repo.getcwd() |
|
247 | cwd = repo.getcwd() | |
248 | targets = {} |
|
248 | targets = {} | |
249 | after = opts.get("after") |
|
249 | after = opts.get("after") | |
250 | dryrun = opts.get("dry_run") |
|
250 | dryrun = opts.get("dry_run") | |
251 | wctx = repo[None] |
|
251 | wctx = repo[None] | |
252 |
|
252 | |||
253 | def walkpat(pat): |
|
253 | def walkpat(pat): | |
254 | srcs = [] |
|
254 | srcs = [] | |
255 | badstates = after and '?' or '?r' |
|
255 | badstates = after and '?' or '?r' | |
256 | m = scmutil.match(repo[None], [pat], opts, globbed=True) |
|
256 | m = scmutil.match(repo[None], [pat], opts, globbed=True) | |
257 | for abs in repo.walk(m): |
|
257 | for abs in repo.walk(m): | |
258 | state = repo.dirstate[abs] |
|
258 | state = repo.dirstate[abs] | |
259 | rel = m.rel(abs) |
|
259 | rel = m.rel(abs) | |
260 | exact = m.exact(abs) |
|
260 | exact = m.exact(abs) | |
261 | if state in badstates: |
|
261 | if state in badstates: | |
262 | if exact and state == '?': |
|
262 | if exact and state == '?': | |
263 | ui.warn(_('%s: not copying - file is not managed\n') % rel) |
|
263 | ui.warn(_('%s: not copying - file is not managed\n') % rel) | |
264 | if exact and state == 'r': |
|
264 | if exact and state == 'r': | |
265 | ui.warn(_('%s: not copying - file has been marked for' |
|
265 | ui.warn(_('%s: not copying - file has been marked for' | |
266 | ' remove\n') % rel) |
|
266 | ' remove\n') % rel) | |
267 | continue |
|
267 | continue | |
268 | # abs: hgsep |
|
268 | # abs: hgsep | |
269 | # rel: ossep |
|
269 | # rel: ossep | |
270 | srcs.append((abs, rel, exact)) |
|
270 | srcs.append((abs, rel, exact)) | |
271 | return srcs |
|
271 | return srcs | |
272 |
|
272 | |||
273 | # abssrc: hgsep |
|
273 | # abssrc: hgsep | |
274 | # relsrc: ossep |
|
274 | # relsrc: ossep | |
275 | # otarget: ossep |
|
275 | # otarget: ossep | |
276 | def copyfile(abssrc, relsrc, otarget, exact): |
|
276 | def copyfile(abssrc, relsrc, otarget, exact): | |
277 | abstarget = pathutil.canonpath(repo.root, cwd, otarget) |
|
277 | abstarget = pathutil.canonpath(repo.root, cwd, otarget) | |
278 | if '/' in abstarget: |
|
278 | if '/' in abstarget: | |
279 | # We cannot normalize abstarget itself, this would prevent |
|
279 | # We cannot normalize abstarget itself, this would prevent | |
280 | # case only renames, like a => A. |
|
280 | # case only renames, like a => A. | |
281 | abspath, absname = abstarget.rsplit('/', 1) |
|
281 | abspath, absname = abstarget.rsplit('/', 1) | |
282 | abstarget = repo.dirstate.normalize(abspath) + '/' + absname |
|
282 | abstarget = repo.dirstate.normalize(abspath) + '/' + absname | |
283 | reltarget = repo.pathto(abstarget, cwd) |
|
283 | reltarget = repo.pathto(abstarget, cwd) | |
284 | target = repo.wjoin(abstarget) |
|
284 | target = repo.wjoin(abstarget) | |
285 | src = repo.wjoin(abssrc) |
|
285 | src = repo.wjoin(abssrc) | |
286 | state = repo.dirstate[abstarget] |
|
286 | state = repo.dirstate[abstarget] | |
287 |
|
287 | |||
288 | scmutil.checkportable(ui, abstarget) |
|
288 | scmutil.checkportable(ui, abstarget) | |
289 |
|
289 | |||
290 | # check for collisions |
|
290 | # check for collisions | |
291 | prevsrc = targets.get(abstarget) |
|
291 | prevsrc = targets.get(abstarget) | |
292 | if prevsrc is not None: |
|
292 | if prevsrc is not None: | |
293 | ui.warn(_('%s: not overwriting - %s collides with %s\n') % |
|
293 | ui.warn(_('%s: not overwriting - %s collides with %s\n') % | |
294 | (reltarget, repo.pathto(abssrc, cwd), |
|
294 | (reltarget, repo.pathto(abssrc, cwd), | |
295 | repo.pathto(prevsrc, cwd))) |
|
295 | repo.pathto(prevsrc, cwd))) | |
296 | return |
|
296 | return | |
297 |
|
297 | |||
298 | # check for overwrites |
|
298 | # check for overwrites | |
299 | exists = os.path.lexists(target) |
|
299 | exists = os.path.lexists(target) | |
300 | samefile = False |
|
300 | samefile = False | |
301 | if exists and abssrc != abstarget: |
|
301 | if exists and abssrc != abstarget: | |
302 | if (repo.dirstate.normalize(abssrc) == |
|
302 | if (repo.dirstate.normalize(abssrc) == | |
303 | repo.dirstate.normalize(abstarget)): |
|
303 | repo.dirstate.normalize(abstarget)): | |
304 | if not rename: |
|
304 | if not rename: | |
305 | ui.warn(_("%s: can't copy - same file\n") % reltarget) |
|
305 | ui.warn(_("%s: can't copy - same file\n") % reltarget) | |
306 | return |
|
306 | return | |
307 | exists = False |
|
307 | exists = False | |
308 | samefile = True |
|
308 | samefile = True | |
309 |
|
309 | |||
310 | if not after and exists or after and state in 'mn': |
|
310 | if not after and exists or after and state in 'mn': | |
311 | if not opts['force']: |
|
311 | if not opts['force']: | |
312 | ui.warn(_('%s: not overwriting - file exists\n') % |
|
312 | ui.warn(_('%s: not overwriting - file exists\n') % | |
313 | reltarget) |
|
313 | reltarget) | |
314 | return |
|
314 | return | |
315 |
|
315 | |||
316 | if after: |
|
316 | if after: | |
317 | if not exists: |
|
317 | if not exists: | |
318 | if rename: |
|
318 | if rename: | |
319 | ui.warn(_('%s: not recording move - %s does not exist\n') % |
|
319 | ui.warn(_('%s: not recording move - %s does not exist\n') % | |
320 | (relsrc, reltarget)) |
|
320 | (relsrc, reltarget)) | |
321 | else: |
|
321 | else: | |
322 | ui.warn(_('%s: not recording copy - %s does not exist\n') % |
|
322 | ui.warn(_('%s: not recording copy - %s does not exist\n') % | |
323 | (relsrc, reltarget)) |
|
323 | (relsrc, reltarget)) | |
324 | return |
|
324 | return | |
325 | elif not dryrun: |
|
325 | elif not dryrun: | |
326 | try: |
|
326 | try: | |
327 | if exists: |
|
327 | if exists: | |
328 | os.unlink(target) |
|
328 | os.unlink(target) | |
329 | targetdir = os.path.dirname(target) or '.' |
|
329 | targetdir = os.path.dirname(target) or '.' | |
330 | if not os.path.isdir(targetdir): |
|
330 | if not os.path.isdir(targetdir): | |
331 | os.makedirs(targetdir) |
|
331 | os.makedirs(targetdir) | |
332 | if samefile: |
|
332 | if samefile: | |
333 | tmp = target + "~hgrename" |
|
333 | tmp = target + "~hgrename" | |
334 | os.rename(src, tmp) |
|
334 | os.rename(src, tmp) | |
335 | os.rename(tmp, target) |
|
335 | os.rename(tmp, target) | |
336 | else: |
|
336 | else: | |
337 | util.copyfile(src, target) |
|
337 | util.copyfile(src, target) | |
338 | srcexists = True |
|
338 | srcexists = True | |
339 | except IOError, inst: |
|
339 | except IOError, inst: | |
340 | if inst.errno == errno.ENOENT: |
|
340 | if inst.errno == errno.ENOENT: | |
341 | ui.warn(_('%s: deleted in working copy\n') % relsrc) |
|
341 | ui.warn(_('%s: deleted in working copy\n') % relsrc) | |
342 | srcexists = False |
|
342 | srcexists = False | |
343 | else: |
|
343 | else: | |
344 | ui.warn(_('%s: cannot copy - %s\n') % |
|
344 | ui.warn(_('%s: cannot copy - %s\n') % | |
345 | (relsrc, inst.strerror)) |
|
345 | (relsrc, inst.strerror)) | |
346 | return True # report a failure |
|
346 | return True # report a failure | |
347 |
|
347 | |||
348 | if ui.verbose or not exact: |
|
348 | if ui.verbose or not exact: | |
349 | if rename: |
|
349 | if rename: | |
350 | ui.status(_('moving %s to %s\n') % (relsrc, reltarget)) |
|
350 | ui.status(_('moving %s to %s\n') % (relsrc, reltarget)) | |
351 | else: |
|
351 | else: | |
352 | ui.status(_('copying %s to %s\n') % (relsrc, reltarget)) |
|
352 | ui.status(_('copying %s to %s\n') % (relsrc, reltarget)) | |
353 |
|
353 | |||
354 | targets[abstarget] = abssrc |
|
354 | targets[abstarget] = abssrc | |
355 |
|
355 | |||
356 | # fix up dirstate |
|
356 | # fix up dirstate | |
357 | scmutil.dirstatecopy(ui, repo, wctx, abssrc, abstarget, |
|
357 | scmutil.dirstatecopy(ui, repo, wctx, abssrc, abstarget, | |
358 | dryrun=dryrun, cwd=cwd) |
|
358 | dryrun=dryrun, cwd=cwd) | |
359 | if rename and not dryrun: |
|
359 | if rename and not dryrun: | |
360 | if not after and srcexists and not samefile: |
|
360 | if not after and srcexists and not samefile: | |
361 | util.unlinkpath(repo.wjoin(abssrc)) |
|
361 | util.unlinkpath(repo.wjoin(abssrc)) | |
362 | wctx.forget([abssrc]) |
|
362 | wctx.forget([abssrc]) | |
363 |
|
363 | |||
364 | # pat: ossep |
|
364 | # pat: ossep | |
365 | # dest ossep |
|
365 | # dest ossep | |
366 | # srcs: list of (hgsep, hgsep, ossep, bool) |
|
366 | # srcs: list of (hgsep, hgsep, ossep, bool) | |
367 | # return: function that takes hgsep and returns ossep |
|
367 | # return: function that takes hgsep and returns ossep | |
368 | def targetpathfn(pat, dest, srcs): |
|
368 | def targetpathfn(pat, dest, srcs): | |
369 | if os.path.isdir(pat): |
|
369 | if os.path.isdir(pat): | |
370 | abspfx = pathutil.canonpath(repo.root, cwd, pat) |
|
370 | abspfx = pathutil.canonpath(repo.root, cwd, pat) | |
371 | abspfx = util.localpath(abspfx) |
|
371 | abspfx = util.localpath(abspfx) | |
372 | if destdirexists: |
|
372 | if destdirexists: | |
373 | striplen = len(os.path.split(abspfx)[0]) |
|
373 | striplen = len(os.path.split(abspfx)[0]) | |
374 | else: |
|
374 | else: | |
375 | striplen = len(abspfx) |
|
375 | striplen = len(abspfx) | |
376 | if striplen: |
|
376 | if striplen: | |
377 | striplen += len(os.sep) |
|
377 | striplen += len(os.sep) | |
378 | res = lambda p: os.path.join(dest, util.localpath(p)[striplen:]) |
|
378 | res = lambda p: os.path.join(dest, util.localpath(p)[striplen:]) | |
379 | elif destdirexists: |
|
379 | elif destdirexists: | |
380 | res = lambda p: os.path.join(dest, |
|
380 | res = lambda p: os.path.join(dest, | |
381 | os.path.basename(util.localpath(p))) |
|
381 | os.path.basename(util.localpath(p))) | |
382 | else: |
|
382 | else: | |
383 | res = lambda p: dest |
|
383 | res = lambda p: dest | |
384 | return res |
|
384 | return res | |
385 |
|
385 | |||
386 | # pat: ossep |
|
386 | # pat: ossep | |
387 | # dest ossep |
|
387 | # dest ossep | |
388 | # srcs: list of (hgsep, hgsep, ossep, bool) |
|
388 | # srcs: list of (hgsep, hgsep, ossep, bool) | |
389 | # return: function that takes hgsep and returns ossep |
|
389 | # return: function that takes hgsep and returns ossep | |
390 | def targetpathafterfn(pat, dest, srcs): |
|
390 | def targetpathafterfn(pat, dest, srcs): | |
391 | if matchmod.patkind(pat): |
|
391 | if matchmod.patkind(pat): | |
392 | # a mercurial pattern |
|
392 | # a mercurial pattern | |
393 | res = lambda p: os.path.join(dest, |
|
393 | res = lambda p: os.path.join(dest, | |
394 | os.path.basename(util.localpath(p))) |
|
394 | os.path.basename(util.localpath(p))) | |
395 | else: |
|
395 | else: | |
396 | abspfx = pathutil.canonpath(repo.root, cwd, pat) |
|
396 | abspfx = pathutil.canonpath(repo.root, cwd, pat) | |
397 | if len(abspfx) < len(srcs[0][0]): |
|
397 | if len(abspfx) < len(srcs[0][0]): | |
398 | # A directory. Either the target path contains the last |
|
398 | # A directory. Either the target path contains the last | |
399 | # component of the source path or it does not. |
|
399 | # component of the source path or it does not. | |
400 | def evalpath(striplen): |
|
400 | def evalpath(striplen): | |
401 | score = 0 |
|
401 | score = 0 | |
402 | for s in srcs: |
|
402 | for s in srcs: | |
403 | t = os.path.join(dest, util.localpath(s[0])[striplen:]) |
|
403 | t = os.path.join(dest, util.localpath(s[0])[striplen:]) | |
404 | if os.path.lexists(t): |
|
404 | if os.path.lexists(t): | |
405 | score += 1 |
|
405 | score += 1 | |
406 | return score |
|
406 | return score | |
407 |
|
407 | |||
408 | abspfx = util.localpath(abspfx) |
|
408 | abspfx = util.localpath(abspfx) | |
409 | striplen = len(abspfx) |
|
409 | striplen = len(abspfx) | |
410 | if striplen: |
|
410 | if striplen: | |
411 | striplen += len(os.sep) |
|
411 | striplen += len(os.sep) | |
412 | if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])): |
|
412 | if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])): | |
413 | score = evalpath(striplen) |
|
413 | score = evalpath(striplen) | |
414 | striplen1 = len(os.path.split(abspfx)[0]) |
|
414 | striplen1 = len(os.path.split(abspfx)[0]) | |
415 | if striplen1: |
|
415 | if striplen1: | |
416 | striplen1 += len(os.sep) |
|
416 | striplen1 += len(os.sep) | |
417 | if evalpath(striplen1) > score: |
|
417 | if evalpath(striplen1) > score: | |
418 | striplen = striplen1 |
|
418 | striplen = striplen1 | |
419 | res = lambda p: os.path.join(dest, |
|
419 | res = lambda p: os.path.join(dest, | |
420 | util.localpath(p)[striplen:]) |
|
420 | util.localpath(p)[striplen:]) | |
421 | else: |
|
421 | else: | |
422 | # a file |
|
422 | # a file | |
423 | if destdirexists: |
|
423 | if destdirexists: | |
424 | res = lambda p: os.path.join(dest, |
|
424 | res = lambda p: os.path.join(dest, | |
425 | os.path.basename(util.localpath(p))) |
|
425 | os.path.basename(util.localpath(p))) | |
426 | else: |
|
426 | else: | |
427 | res = lambda p: dest |
|
427 | res = lambda p: dest | |
428 | return res |
|
428 | return res | |
429 |
|
429 | |||
430 |
|
430 | |||
431 | pats = scmutil.expandpats(pats) |
|
431 | pats = scmutil.expandpats(pats) | |
432 | if not pats: |
|
432 | if not pats: | |
433 | raise util.Abort(_('no source or destination specified')) |
|
433 | raise util.Abort(_('no source or destination specified')) | |
434 | if len(pats) == 1: |
|
434 | if len(pats) == 1: | |
435 | raise util.Abort(_('no destination specified')) |
|
435 | raise util.Abort(_('no destination specified')) | |
436 | dest = pats.pop() |
|
436 | dest = pats.pop() | |
437 | destdirexists = os.path.isdir(dest) and not os.path.islink(dest) |
|
437 | destdirexists = os.path.isdir(dest) and not os.path.islink(dest) | |
438 | if not destdirexists: |
|
438 | if not destdirexists: | |
439 | if len(pats) > 1 or matchmod.patkind(pats[0]): |
|
439 | if len(pats) > 1 or matchmod.patkind(pats[0]): | |
440 | raise util.Abort(_('with multiple sources, destination must be an ' |
|
440 | raise util.Abort(_('with multiple sources, destination must be an ' | |
441 | 'existing directory')) |
|
441 | 'existing directory')) | |
442 | if util.endswithsep(dest): |
|
442 | if util.endswithsep(dest): | |
443 | raise util.Abort(_('destination %s is not a directory') % dest) |
|
443 | raise util.Abort(_('destination %s is not a directory') % dest) | |
444 |
|
444 | |||
445 | tfn = targetpathfn |
|
445 | tfn = targetpathfn | |
446 | if after: |
|
446 | if after: | |
447 | tfn = targetpathafterfn |
|
447 | tfn = targetpathafterfn | |
448 | copylist = [] |
|
448 | copylist = [] | |
449 | for pat in pats: |
|
449 | for pat in pats: | |
450 | srcs = walkpat(pat) |
|
450 | srcs = walkpat(pat) | |
451 | if not srcs: |
|
451 | if not srcs: | |
452 | continue |
|
452 | continue | |
453 | copylist.append((tfn(pat, dest, srcs), srcs)) |
|
453 | copylist.append((tfn(pat, dest, srcs), srcs)) | |
454 | if not copylist: |
|
454 | if not copylist: | |
455 | raise util.Abort(_('no files to copy')) |
|
455 | raise util.Abort(_('no files to copy')) | |
456 |
|
456 | |||
457 | errors = 0 |
|
457 | errors = 0 | |
458 | for targetpath, srcs in copylist: |
|
458 | for targetpath, srcs in copylist: | |
459 | for abssrc, relsrc, exact in srcs: |
|
459 | for abssrc, relsrc, exact in srcs: | |
460 | if copyfile(abssrc, relsrc, targetpath(abssrc), exact): |
|
460 | if copyfile(abssrc, relsrc, targetpath(abssrc), exact): | |
461 | errors += 1 |
|
461 | errors += 1 | |
462 |
|
462 | |||
463 | if errors: |
|
463 | if errors: | |
464 | ui.warn(_('(consider using --after)\n')) |
|
464 | ui.warn(_('(consider using --after)\n')) | |
465 |
|
465 | |||
466 | return errors != 0 |
|
466 | return errors != 0 | |
467 |
|
467 | |||
468 | def service(opts, parentfn=None, initfn=None, runfn=None, logfile=None, |
|
468 | def service(opts, parentfn=None, initfn=None, runfn=None, logfile=None, | |
469 | runargs=None, appendpid=False): |
|
469 | runargs=None, appendpid=False): | |
470 | '''Run a command as a service.''' |
|
470 | '''Run a command as a service.''' | |
471 |
|
471 | |||
472 | def writepid(pid): |
|
472 | def writepid(pid): | |
473 | if opts['pid_file']: |
|
473 | if opts['pid_file']: | |
474 | mode = appendpid and 'a' or 'w' |
|
474 | mode = appendpid and 'a' or 'w' | |
475 | fp = open(opts['pid_file'], mode) |
|
475 | fp = open(opts['pid_file'], mode) | |
476 | fp.write(str(pid) + '\n') |
|
476 | fp.write(str(pid) + '\n') | |
477 | fp.close() |
|
477 | fp.close() | |
478 |
|
478 | |||
479 | if opts['daemon'] and not opts['daemon_pipefds']: |
|
479 | if opts['daemon'] and not opts['daemon_pipefds']: | |
480 | # Signal child process startup with file removal |
|
480 | # Signal child process startup with file removal | |
481 | lockfd, lockpath = tempfile.mkstemp(prefix='hg-service-') |
|
481 | lockfd, lockpath = tempfile.mkstemp(prefix='hg-service-') | |
482 | os.close(lockfd) |
|
482 | os.close(lockfd) | |
483 | try: |
|
483 | try: | |
484 | if not runargs: |
|
484 | if not runargs: | |
485 | runargs = util.hgcmd() + sys.argv[1:] |
|
485 | runargs = util.hgcmd() + sys.argv[1:] | |
486 | runargs.append('--daemon-pipefds=%s' % lockpath) |
|
486 | runargs.append('--daemon-pipefds=%s' % lockpath) | |
487 | # Don't pass --cwd to the child process, because we've already |
|
487 | # Don't pass --cwd to the child process, because we've already | |
488 | # changed directory. |
|
488 | # changed directory. | |
489 | for i in xrange(1, len(runargs)): |
|
489 | for i in xrange(1, len(runargs)): | |
490 | if runargs[i].startswith('--cwd='): |
|
490 | if runargs[i].startswith('--cwd='): | |
491 | del runargs[i] |
|
491 | del runargs[i] | |
492 | break |
|
492 | break | |
493 | elif runargs[i].startswith('--cwd'): |
|
493 | elif runargs[i].startswith('--cwd'): | |
494 | del runargs[i:i + 2] |
|
494 | del runargs[i:i + 2] | |
495 | break |
|
495 | break | |
496 | def condfn(): |
|
496 | def condfn(): | |
497 | return not os.path.exists(lockpath) |
|
497 | return not os.path.exists(lockpath) | |
498 | pid = util.rundetached(runargs, condfn) |
|
498 | pid = util.rundetached(runargs, condfn) | |
499 | if pid < 0: |
|
499 | if pid < 0: | |
500 | raise util.Abort(_('child process failed to start')) |
|
500 | raise util.Abort(_('child process failed to start')) | |
501 | writepid(pid) |
|
501 | writepid(pid) | |
502 | finally: |
|
502 | finally: | |
503 | try: |
|
503 | try: | |
504 | os.unlink(lockpath) |
|
504 | os.unlink(lockpath) | |
505 | except OSError, e: |
|
505 | except OSError, e: | |
506 | if e.errno != errno.ENOENT: |
|
506 | if e.errno != errno.ENOENT: | |
507 | raise |
|
507 | raise | |
508 | if parentfn: |
|
508 | if parentfn: | |
509 | return parentfn(pid) |
|
509 | return parentfn(pid) | |
510 | else: |
|
510 | else: | |
511 | return |
|
511 | return | |
512 |
|
512 | |||
513 | if initfn: |
|
513 | if initfn: | |
514 | initfn() |
|
514 | initfn() | |
515 |
|
515 | |||
516 | if not opts['daemon']: |
|
516 | if not opts['daemon']: | |
517 | writepid(os.getpid()) |
|
517 | writepid(os.getpid()) | |
518 |
|
518 | |||
519 | if opts['daemon_pipefds']: |
|
519 | if opts['daemon_pipefds']: | |
520 | lockpath = opts['daemon_pipefds'] |
|
520 | lockpath = opts['daemon_pipefds'] | |
521 | try: |
|
521 | try: | |
522 | os.setsid() |
|
522 | os.setsid() | |
523 | except AttributeError: |
|
523 | except AttributeError: | |
524 | pass |
|
524 | pass | |
525 | os.unlink(lockpath) |
|
525 | os.unlink(lockpath) | |
526 | util.hidewindow() |
|
526 | util.hidewindow() | |
527 | sys.stdout.flush() |
|
527 | sys.stdout.flush() | |
528 | sys.stderr.flush() |
|
528 | sys.stderr.flush() | |
529 |
|
529 | |||
530 | nullfd = os.open(os.devnull, os.O_RDWR) |
|
530 | nullfd = os.open(os.devnull, os.O_RDWR) | |
531 | logfilefd = nullfd |
|
531 | logfilefd = nullfd | |
532 | if logfile: |
|
532 | if logfile: | |
533 | logfilefd = os.open(logfile, os.O_RDWR | os.O_CREAT | os.O_APPEND) |
|
533 | logfilefd = os.open(logfile, os.O_RDWR | os.O_CREAT | os.O_APPEND) | |
534 | os.dup2(nullfd, 0) |
|
534 | os.dup2(nullfd, 0) | |
535 | os.dup2(logfilefd, 1) |
|
535 | os.dup2(logfilefd, 1) | |
536 | os.dup2(logfilefd, 2) |
|
536 | os.dup2(logfilefd, 2) | |
537 | if nullfd not in (0, 1, 2): |
|
537 | if nullfd not in (0, 1, 2): | |
538 | os.close(nullfd) |
|
538 | os.close(nullfd) | |
539 | if logfile and logfilefd not in (0, 1, 2): |
|
539 | if logfile and logfilefd not in (0, 1, 2): | |
540 | os.close(logfilefd) |
|
540 | os.close(logfilefd) | |
541 |
|
541 | |||
542 | if runfn: |
|
542 | if runfn: | |
543 | return runfn() |
|
543 | return runfn() | |
544 |
|
544 | |||
545 | def tryimportone(ui, repo, hunk, parents, opts, msgs, updatefunc): |
|
545 | def tryimportone(ui, repo, hunk, parents, opts, msgs, updatefunc): | |
546 | """Utility function used by commands.import to import a single patch |
|
546 | """Utility function used by commands.import to import a single patch | |
547 |
|
547 | |||
548 | This function is explicitly defined here to help the evolve extension to |
|
548 | This function is explicitly defined here to help the evolve extension to | |
549 | wrap this part of the import logic. |
|
549 | wrap this part of the import logic. | |
550 |
|
550 | |||
551 | The API is currently a bit ugly because it a simple code translation from |
|
551 | The API is currently a bit ugly because it a simple code translation from | |
552 | the import command. Feel free to make it better. |
|
552 | the import command. Feel free to make it better. | |
553 |
|
553 | |||
554 | :hunk: a patch (as a binary string) |
|
554 | :hunk: a patch (as a binary string) | |
555 | :parents: nodes that will be parent of the created commit |
|
555 | :parents: nodes that will be parent of the created commit | |
556 | :opts: the full dict of option passed to the import command |
|
556 | :opts: the full dict of option passed to the import command | |
557 | :msgs: list to save commit message to. |
|
557 | :msgs: list to save commit message to. | |
558 | (used in case we need to save it when failing) |
|
558 | (used in case we need to save it when failing) | |
559 | :updatefunc: a function that update a repo to a given node |
|
559 | :updatefunc: a function that update a repo to a given node | |
560 | updatefunc(<repo>, <node>) |
|
560 | updatefunc(<repo>, <node>) | |
561 | """ |
|
561 | """ | |
562 | tmpname, message, user, date, branch, nodeid, p1, p2 = \ |
|
562 | tmpname, message, user, date, branch, nodeid, p1, p2 = \ | |
563 | patch.extract(ui, hunk) |
|
563 | patch.extract(ui, hunk) | |
564 |
|
564 | |||
565 | editor = commiteditor |
|
565 | editor = commiteditor | |
566 | if opts.get('edit'): |
|
566 | if opts.get('edit'): | |
567 | editor = commitforceeditor |
|
567 | editor = commitforceeditor | |
568 | update = not opts.get('bypass') |
|
568 | update = not opts.get('bypass') | |
569 | strip = opts["strip"] |
|
569 | strip = opts["strip"] | |
570 | sim = float(opts.get('similarity') or 0) |
|
570 | sim = float(opts.get('similarity') or 0) | |
571 | if not tmpname: |
|
571 | if not tmpname: | |
572 | return (None, None) |
|
572 | return (None, None) | |
573 | msg = _('applied to working directory') |
|
573 | msg = _('applied to working directory') | |
574 |
|
574 | |||
575 | try: |
|
575 | try: | |
576 | cmdline_message = logmessage(ui, opts) |
|
576 | cmdline_message = logmessage(ui, opts) | |
577 | if cmdline_message: |
|
577 | if cmdline_message: | |
578 | # pickup the cmdline msg |
|
578 | # pickup the cmdline msg | |
579 | message = cmdline_message |
|
579 | message = cmdline_message | |
580 | elif message: |
|
580 | elif message: | |
581 | # pickup the patch msg |
|
581 | # pickup the patch msg | |
582 | message = message.strip() |
|
582 | message = message.strip() | |
583 | else: |
|
583 | else: | |
584 | # launch the editor |
|
584 | # launch the editor | |
585 | message = None |
|
585 | message = None | |
586 | ui.debug('message:\n%s\n' % message) |
|
586 | ui.debug('message:\n%s\n' % message) | |
587 |
|
587 | |||
588 | if len(parents) == 1: |
|
588 | if len(parents) == 1: | |
589 | parents.append(repo[nullid]) |
|
589 | parents.append(repo[nullid]) | |
590 | if opts.get('exact'): |
|
590 | if opts.get('exact'): | |
591 | if not nodeid or not p1: |
|
591 | if not nodeid or not p1: | |
592 | raise util.Abort(_('not a Mercurial patch')) |
|
592 | raise util.Abort(_('not a Mercurial patch')) | |
593 | p1 = repo[p1] |
|
593 | p1 = repo[p1] | |
594 | p2 = repo[p2 or nullid] |
|
594 | p2 = repo[p2 or nullid] | |
595 | elif p2: |
|
595 | elif p2: | |
596 | try: |
|
596 | try: | |
597 | p1 = repo[p1] |
|
597 | p1 = repo[p1] | |
598 | p2 = repo[p2] |
|
598 | p2 = repo[p2] | |
599 | # Without any options, consider p2 only if the |
|
599 | # Without any options, consider p2 only if the | |
600 | # patch is being applied on top of the recorded |
|
600 | # patch is being applied on top of the recorded | |
601 | # first parent. |
|
601 | # first parent. | |
602 | if p1 != parents[0]: |
|
602 | if p1 != parents[0]: | |
603 | p1 = parents[0] |
|
603 | p1 = parents[0] | |
604 | p2 = repo[nullid] |
|
604 | p2 = repo[nullid] | |
605 | except error.RepoError: |
|
605 | except error.RepoError: | |
606 | p1, p2 = parents |
|
606 | p1, p2 = parents | |
607 | else: |
|
607 | else: | |
608 | p1, p2 = parents |
|
608 | p1, p2 = parents | |
609 |
|
609 | |||
610 | n = None |
|
610 | n = None | |
611 | if update: |
|
611 | if update: | |
612 | if p1 != parents[0]: |
|
612 | if p1 != parents[0]: | |
613 | updatefunc(repo, p1.node()) |
|
613 | updatefunc(repo, p1.node()) | |
614 | if p2 != parents[1]: |
|
614 | if p2 != parents[1]: | |
615 | repo.setparents(p1.node(), p2.node()) |
|
615 | repo.setparents(p1.node(), p2.node()) | |
616 |
|
616 | |||
617 | if opts.get('exact') or opts.get('import_branch'): |
|
617 | if opts.get('exact') or opts.get('import_branch'): | |
618 | repo.dirstate.setbranch(branch or 'default') |
|
618 | repo.dirstate.setbranch(branch or 'default') | |
619 |
|
619 | |||
620 | files = set() |
|
620 | files = set() | |
621 | patch.patch(ui, repo, tmpname, strip=strip, files=files, |
|
621 | patch.patch(ui, repo, tmpname, strip=strip, files=files, | |
622 | eolmode=None, similarity=sim / 100.0) |
|
622 | eolmode=None, similarity=sim / 100.0) | |
623 | files = list(files) |
|
623 | files = list(files) | |
624 | if opts.get('no_commit'): |
|
624 | if opts.get('no_commit'): | |
625 | if message: |
|
625 | if message: | |
626 | msgs.append(message) |
|
626 | msgs.append(message) | |
627 | else: |
|
627 | else: | |
628 | if opts.get('exact') or p2: |
|
628 | if opts.get('exact') or p2: | |
629 | # If you got here, you either use --force and know what |
|
629 | # If you got here, you either use --force and know what | |
630 | # you are doing or used --exact or a merge patch while |
|
630 | # you are doing or used --exact or a merge patch while | |
631 | # being updated to its first parent. |
|
631 | # being updated to its first parent. | |
632 | m = None |
|
632 | m = None | |
633 | else: |
|
633 | else: | |
634 | m = scmutil.matchfiles(repo, files or []) |
|
634 | m = scmutil.matchfiles(repo, files or []) | |
635 | n = repo.commit(message, opts.get('user') or user, |
|
635 | n = repo.commit(message, opts.get('user') or user, | |
636 | opts.get('date') or date, match=m, |
|
636 | opts.get('date') or date, match=m, | |
637 | editor=editor) |
|
637 | editor=editor) | |
638 | else: |
|
638 | else: | |
639 | if opts.get('exact') or opts.get('import_branch'): |
|
639 | if opts.get('exact') or opts.get('import_branch'): | |
640 | branch = branch or 'default' |
|
640 | branch = branch or 'default' | |
641 | else: |
|
641 | else: | |
642 | branch = p1.branch() |
|
642 | branch = p1.branch() | |
643 | store = patch.filestore() |
|
643 | store = patch.filestore() | |
644 | try: |
|
644 | try: | |
645 | files = set() |
|
645 | files = set() | |
646 | try: |
|
646 | try: | |
647 | patch.patchrepo(ui, repo, p1, store, tmpname, strip, |
|
647 | patch.patchrepo(ui, repo, p1, store, tmpname, strip, | |
648 | files, eolmode=None) |
|
648 | files, eolmode=None) | |
649 | except patch.PatchError, e: |
|
649 | except patch.PatchError, e: | |
650 | raise util.Abort(str(e)) |
|
650 | raise util.Abort(str(e)) | |
651 | memctx = context.makememctx(repo, (p1.node(), p2.node()), |
|
651 | memctx = context.makememctx(repo, (p1.node(), p2.node()), | |
652 | message, |
|
652 | message, | |
653 | opts.get('user') or user, |
|
653 | opts.get('user') or user, | |
654 | opts.get('date') or date, |
|
654 | opts.get('date') or date, | |
655 | branch, files, store, |
|
655 | branch, files, store, | |
656 | editor=commiteditor) |
|
656 | editor=commiteditor) | |
657 | repo.savecommitmessage(memctx.description()) |
|
657 | repo.savecommitmessage(memctx.description()) | |
658 | n = memctx.commit() |
|
658 | n = memctx.commit() | |
659 | finally: |
|
659 | finally: | |
660 | store.close() |
|
660 | store.close() | |
661 | if opts.get('exact') and hex(n) != nodeid: |
|
661 | if opts.get('exact') and hex(n) != nodeid: | |
662 | raise util.Abort(_('patch is damaged or loses information')) |
|
662 | raise util.Abort(_('patch is damaged or loses information')) | |
663 | if n: |
|
663 | if n: | |
664 | # i18n: refers to a short changeset id |
|
664 | # i18n: refers to a short changeset id | |
665 | msg = _('created %s') % short(n) |
|
665 | msg = _('created %s') % short(n) | |
666 | return (msg, n) |
|
666 | return (msg, n) | |
667 | finally: |
|
667 | finally: | |
668 | os.unlink(tmpname) |
|
668 | os.unlink(tmpname) | |
669 |
|
669 | |||
670 | def export(repo, revs, template='hg-%h.patch', fp=None, switch_parent=False, |
|
670 | def export(repo, revs, template='hg-%h.patch', fp=None, switch_parent=False, | |
671 | opts=None): |
|
671 | opts=None): | |
672 | '''export changesets as hg patches.''' |
|
672 | '''export changesets as hg patches.''' | |
673 |
|
673 | |||
674 | total = len(revs) |
|
674 | total = len(revs) | |
675 | revwidth = max([len(str(rev)) for rev in revs]) |
|
675 | revwidth = max([len(str(rev)) for rev in revs]) | |
676 | filemode = {} |
|
676 | filemode = {} | |
677 |
|
677 | |||
678 | def single(rev, seqno, fp): |
|
678 | def single(rev, seqno, fp): | |
679 | ctx = repo[rev] |
|
679 | ctx = repo[rev] | |
680 | node = ctx.node() |
|
680 | node = ctx.node() | |
681 | parents = [p.node() for p in ctx.parents() if p] |
|
681 | parents = [p.node() for p in ctx.parents() if p] | |
682 | branch = ctx.branch() |
|
682 | branch = ctx.branch() | |
683 | if switch_parent: |
|
683 | if switch_parent: | |
684 | parents.reverse() |
|
684 | parents.reverse() | |
685 | prev = (parents and parents[0]) or nullid |
|
685 | prev = (parents and parents[0]) or nullid | |
686 |
|
686 | |||
687 | shouldclose = False |
|
687 | shouldclose = False | |
688 | if not fp and len(template) > 0: |
|
688 | if not fp and len(template) > 0: | |
689 | desc_lines = ctx.description().rstrip().split('\n') |
|
689 | desc_lines = ctx.description().rstrip().split('\n') | |
690 | desc = desc_lines[0] #Commit always has a first line. |
|
690 | desc = desc_lines[0] #Commit always has a first line. | |
691 | fp = makefileobj(repo, template, node, desc=desc, total=total, |
|
691 | fp = makefileobj(repo, template, node, desc=desc, total=total, | |
692 | seqno=seqno, revwidth=revwidth, mode='wb', |
|
692 | seqno=seqno, revwidth=revwidth, mode='wb', | |
693 | modemap=filemode) |
|
693 | modemap=filemode) | |
694 | if fp != template: |
|
694 | if fp != template: | |
695 | shouldclose = True |
|
695 | shouldclose = True | |
696 | if fp and fp != sys.stdout and util.safehasattr(fp, 'name'): |
|
696 | if fp and fp != sys.stdout and util.safehasattr(fp, 'name'): | |
697 | repo.ui.note("%s\n" % fp.name) |
|
697 | repo.ui.note("%s\n" % fp.name) | |
698 |
|
698 | |||
699 | if not fp: |
|
699 | if not fp: | |
700 | write = repo.ui.write |
|
700 | write = repo.ui.write | |
701 | else: |
|
701 | else: | |
702 | def write(s, **kw): |
|
702 | def write(s, **kw): | |
703 | fp.write(s) |
|
703 | fp.write(s) | |
704 |
|
704 | |||
705 |
|
705 | |||
706 | write("# HG changeset patch\n") |
|
706 | write("# HG changeset patch\n") | |
707 | write("# User %s\n" % ctx.user()) |
|
707 | write("# User %s\n" % ctx.user()) | |
708 | write("# Date %d %d\n" % ctx.date()) |
|
708 | write("# Date %d %d\n" % ctx.date()) | |
709 | write("# %s\n" % util.datestr(ctx.date())) |
|
709 | write("# %s\n" % util.datestr(ctx.date())) | |
710 | if branch and branch != 'default': |
|
710 | if branch and branch != 'default': | |
711 | write("# Branch %s\n" % branch) |
|
711 | write("# Branch %s\n" % branch) | |
712 | write("# Node ID %s\n" % hex(node)) |
|
712 | write("# Node ID %s\n" % hex(node)) | |
713 | write("# Parent %s\n" % hex(prev)) |
|
713 | write("# Parent %s\n" % hex(prev)) | |
714 | if len(parents) > 1: |
|
714 | if len(parents) > 1: | |
715 | write("# Parent %s\n" % hex(parents[1])) |
|
715 | write("# Parent %s\n" % hex(parents[1])) | |
716 | write(ctx.description().rstrip()) |
|
716 | write(ctx.description().rstrip()) | |
717 | write("\n\n") |
|
717 | write("\n\n") | |
718 |
|
718 | |||
719 | for chunk, label in patch.diffui(repo, prev, node, opts=opts): |
|
719 | for chunk, label in patch.diffui(repo, prev, node, opts=opts): | |
720 | write(chunk, label=label) |
|
720 | write(chunk, label=label) | |
721 |
|
721 | |||
722 | if shouldclose: |
|
722 | if shouldclose: | |
723 | fp.close() |
|
723 | fp.close() | |
724 |
|
724 | |||
725 | for seqno, rev in enumerate(revs): |
|
725 | for seqno, rev in enumerate(revs): | |
726 | single(rev, seqno + 1, fp) |
|
726 | single(rev, seqno + 1, fp) | |
727 |
|
727 | |||
728 | def diffordiffstat(ui, repo, diffopts, node1, node2, match, |
|
728 | def diffordiffstat(ui, repo, diffopts, node1, node2, match, | |
729 | changes=None, stat=False, fp=None, prefix='', |
|
729 | changes=None, stat=False, fp=None, prefix='', | |
730 | listsubrepos=False): |
|
730 | listsubrepos=False): | |
731 | '''show diff or diffstat.''' |
|
731 | '''show diff or diffstat.''' | |
732 | if fp is None: |
|
732 | if fp is None: | |
733 | write = ui.write |
|
733 | write = ui.write | |
734 | else: |
|
734 | else: | |
735 | def write(s, **kw): |
|
735 | def write(s, **kw): | |
736 | fp.write(s) |
|
736 | fp.write(s) | |
737 |
|
737 | |||
738 | if stat: |
|
738 | if stat: | |
739 | diffopts = diffopts.copy(context=0) |
|
739 | diffopts = diffopts.copy(context=0) | |
740 | width = 80 |
|
740 | width = 80 | |
741 | if not ui.plain(): |
|
741 | if not ui.plain(): | |
742 | width = ui.termwidth() |
|
742 | width = ui.termwidth() | |
743 | chunks = patch.diff(repo, node1, node2, match, changes, diffopts, |
|
743 | chunks = patch.diff(repo, node1, node2, match, changes, diffopts, | |
744 | prefix=prefix) |
|
744 | prefix=prefix) | |
745 | for chunk, label in patch.diffstatui(util.iterlines(chunks), |
|
745 | for chunk, label in patch.diffstatui(util.iterlines(chunks), | |
746 | width=width, |
|
746 | width=width, | |
747 | git=diffopts.git): |
|
747 | git=diffopts.git): | |
748 | write(chunk, label=label) |
|
748 | write(chunk, label=label) | |
749 | else: |
|
749 | else: | |
750 | for chunk, label in patch.diffui(repo, node1, node2, match, |
|
750 | for chunk, label in patch.diffui(repo, node1, node2, match, | |
751 | changes, diffopts, prefix=prefix): |
|
751 | changes, diffopts, prefix=prefix): | |
752 | write(chunk, label=label) |
|
752 | write(chunk, label=label) | |
753 |
|
753 | |||
754 | if listsubrepos: |
|
754 | if listsubrepos: | |
755 | ctx1 = repo[node1] |
|
755 | ctx1 = repo[node1] | |
756 | ctx2 = repo[node2] |
|
756 | ctx2 = repo[node2] | |
757 | for subpath, sub in scmutil.itersubrepos(ctx1, ctx2): |
|
757 | for subpath, sub in scmutil.itersubrepos(ctx1, ctx2): | |
758 | tempnode2 = node2 |
|
758 | tempnode2 = node2 | |
759 | try: |
|
759 | try: | |
760 | if node2 is not None: |
|
760 | if node2 is not None: | |
761 | tempnode2 = ctx2.substate[subpath][1] |
|
761 | tempnode2 = ctx2.substate[subpath][1] | |
762 | except KeyError: |
|
762 | except KeyError: | |
763 | # A subrepo that existed in node1 was deleted between node1 and |
|
763 | # A subrepo that existed in node1 was deleted between node1 and | |
764 | # node2 (inclusive). Thus, ctx2's substate won't contain that |
|
764 | # node2 (inclusive). Thus, ctx2's substate won't contain that | |
765 | # subpath. The best we can do is to ignore it. |
|
765 | # subpath. The best we can do is to ignore it. | |
766 | tempnode2 = None |
|
766 | tempnode2 = None | |
767 | submatch = matchmod.narrowmatcher(subpath, match) |
|
767 | submatch = matchmod.narrowmatcher(subpath, match) | |
768 | sub.diff(ui, diffopts, tempnode2, submatch, changes=changes, |
|
768 | sub.diff(ui, diffopts, tempnode2, submatch, changes=changes, | |
769 | stat=stat, fp=fp, prefix=prefix) |
|
769 | stat=stat, fp=fp, prefix=prefix) | |
770 |
|
770 | |||
771 | class changeset_printer(object): |
|
771 | class changeset_printer(object): | |
772 | '''show changeset information when templating not requested.''' |
|
772 | '''show changeset information when templating not requested.''' | |
773 |
|
773 | |||
774 | def __init__(self, ui, repo, patch, diffopts, buffered): |
|
774 | def __init__(self, ui, repo, patch, diffopts, buffered): | |
775 | self.ui = ui |
|
775 | self.ui = ui | |
776 | self.repo = repo |
|
776 | self.repo = repo | |
777 | self.buffered = buffered |
|
777 | self.buffered = buffered | |
778 | self.patch = patch |
|
778 | self.patch = patch | |
779 | self.diffopts = diffopts |
|
779 | self.diffopts = diffopts | |
780 | self.header = {} |
|
780 | self.header = {} | |
781 | self.hunk = {} |
|
781 | self.hunk = {} | |
782 | self.lastheader = None |
|
782 | self.lastheader = None | |
783 | self.footer = None |
|
783 | self.footer = None | |
784 |
|
784 | |||
785 | def flush(self, rev): |
|
785 | def flush(self, rev): | |
786 | if rev in self.header: |
|
786 | if rev in self.header: | |
787 | h = self.header[rev] |
|
787 | h = self.header[rev] | |
788 | if h != self.lastheader: |
|
788 | if h != self.lastheader: | |
789 | self.lastheader = h |
|
789 | self.lastheader = h | |
790 | self.ui.write(h) |
|
790 | self.ui.write(h) | |
791 | del self.header[rev] |
|
791 | del self.header[rev] | |
792 | if rev in self.hunk: |
|
792 | if rev in self.hunk: | |
793 | self.ui.write(self.hunk[rev]) |
|
793 | self.ui.write(self.hunk[rev]) | |
794 | del self.hunk[rev] |
|
794 | del self.hunk[rev] | |
795 | return 1 |
|
795 | return 1 | |
796 | return 0 |
|
796 | return 0 | |
797 |
|
797 | |||
798 | def close(self): |
|
798 | def close(self): | |
799 | if self.footer: |
|
799 | if self.footer: | |
800 | self.ui.write(self.footer) |
|
800 | self.ui.write(self.footer) | |
801 |
|
801 | |||
802 | def show(self, ctx, copies=None, matchfn=None, **props): |
|
802 | def show(self, ctx, copies=None, matchfn=None, **props): | |
803 | if self.buffered: |
|
803 | if self.buffered: | |
804 | self.ui.pushbuffer() |
|
804 | self.ui.pushbuffer() | |
805 | self._show(ctx, copies, matchfn, props) |
|
805 | self._show(ctx, copies, matchfn, props) | |
806 | self.hunk[ctx.rev()] = self.ui.popbuffer(labeled=True) |
|
806 | self.hunk[ctx.rev()] = self.ui.popbuffer(labeled=True) | |
807 | else: |
|
807 | else: | |
808 | self._show(ctx, copies, matchfn, props) |
|
808 | self._show(ctx, copies, matchfn, props) | |
809 |
|
809 | |||
810 | def _show(self, ctx, copies, matchfn, props): |
|
810 | def _show(self, ctx, copies, matchfn, props): | |
811 | '''show a single changeset or file revision''' |
|
811 | '''show a single changeset or file revision''' | |
812 | changenode = ctx.node() |
|
812 | changenode = ctx.node() | |
813 | rev = ctx.rev() |
|
813 | rev = ctx.rev() | |
814 |
|
814 | |||
815 | if self.ui.quiet: |
|
815 | if self.ui.quiet: | |
816 | self.ui.write("%d:%s\n" % (rev, short(changenode)), |
|
816 | self.ui.write("%d:%s\n" % (rev, short(changenode)), | |
817 | label='log.node') |
|
817 | label='log.node') | |
818 | return |
|
818 | return | |
819 |
|
819 | |||
820 | log = self.repo.changelog |
|
820 | log = self.repo.changelog | |
821 | date = util.datestr(ctx.date()) |
|
821 | date = util.datestr(ctx.date()) | |
822 |
|
822 | |||
823 | hexfunc = self.ui.debugflag and hex or short |
|
823 | hexfunc = self.ui.debugflag and hex or short | |
824 |
|
824 | |||
825 | parents = [(p, hexfunc(log.node(p))) |
|
825 | parents = [(p, hexfunc(log.node(p))) | |
826 | for p in self._meaningful_parentrevs(log, rev)] |
|
826 | for p in self._meaningful_parentrevs(log, rev)] | |
827 |
|
827 | |||
828 | # i18n: column positioning for "hg log" |
|
828 | # i18n: column positioning for "hg log" | |
829 | self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode)), |
|
829 | self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode)), | |
830 | label='log.changeset changeset.%s' % ctx.phasestr()) |
|
830 | label='log.changeset changeset.%s' % ctx.phasestr()) | |
831 |
|
831 | |||
832 | branch = ctx.branch() |
|
832 | branch = ctx.branch() | |
833 | # don't show the default branch name |
|
833 | # don't show the default branch name | |
834 | if branch != 'default': |
|
834 | if branch != 'default': | |
835 | # i18n: column positioning for "hg log" |
|
835 | # i18n: column positioning for "hg log" | |
836 | self.ui.write(_("branch: %s\n") % branch, |
|
836 | self.ui.write(_("branch: %s\n") % branch, | |
837 | label='log.branch') |
|
837 | label='log.branch') | |
838 | for bookmark in self.repo.nodebookmarks(changenode): |
|
838 | for bookmark in self.repo.nodebookmarks(changenode): | |
839 | # i18n: column positioning for "hg log" |
|
839 | # i18n: column positioning for "hg log" | |
840 | self.ui.write(_("bookmark: %s\n") % bookmark, |
|
840 | self.ui.write(_("bookmark: %s\n") % bookmark, | |
841 | label='log.bookmark') |
|
841 | label='log.bookmark') | |
842 | for tag in self.repo.nodetags(changenode): |
|
842 | for tag in self.repo.nodetags(changenode): | |
843 | # i18n: column positioning for "hg log" |
|
843 | # i18n: column positioning for "hg log" | |
844 | self.ui.write(_("tag: %s\n") % tag, |
|
844 | self.ui.write(_("tag: %s\n") % tag, | |
845 | label='log.tag') |
|
845 | label='log.tag') | |
846 | if self.ui.debugflag and ctx.phase(): |
|
846 | if self.ui.debugflag and ctx.phase(): | |
847 | # i18n: column positioning for "hg log" |
|
847 | # i18n: column positioning for "hg log" | |
848 | self.ui.write(_("phase: %s\n") % _(ctx.phasestr()), |
|
848 | self.ui.write(_("phase: %s\n") % _(ctx.phasestr()), | |
849 | label='log.phase') |
|
849 | label='log.phase') | |
850 | for parent in parents: |
|
850 | for parent in parents: | |
851 | # i18n: column positioning for "hg log" |
|
851 | # i18n: column positioning for "hg log" | |
852 | self.ui.write(_("parent: %d:%s\n") % parent, |
|
852 | self.ui.write(_("parent: %d:%s\n") % parent, | |
853 | label='log.parent changeset.%s' % ctx.phasestr()) |
|
853 | label='log.parent changeset.%s' % ctx.phasestr()) | |
854 |
|
854 | |||
855 | if self.ui.debugflag: |
|
855 | if self.ui.debugflag: | |
856 | mnode = ctx.manifestnode() |
|
856 | mnode = ctx.manifestnode() | |
857 | # i18n: column positioning for "hg log" |
|
857 | # i18n: column positioning for "hg log" | |
858 | self.ui.write(_("manifest: %d:%s\n") % |
|
858 | self.ui.write(_("manifest: %d:%s\n") % | |
859 | (self.repo.manifest.rev(mnode), hex(mnode)), |
|
859 | (self.repo.manifest.rev(mnode), hex(mnode)), | |
860 | label='ui.debug log.manifest') |
|
860 | label='ui.debug log.manifest') | |
861 | # i18n: column positioning for "hg log" |
|
861 | # i18n: column positioning for "hg log" | |
862 | self.ui.write(_("user: %s\n") % ctx.user(), |
|
862 | self.ui.write(_("user: %s\n") % ctx.user(), | |
863 | label='log.user') |
|
863 | label='log.user') | |
864 | # i18n: column positioning for "hg log" |
|
864 | # i18n: column positioning for "hg log" | |
865 | self.ui.write(_("date: %s\n") % date, |
|
865 | self.ui.write(_("date: %s\n") % date, | |
866 | label='log.date') |
|
866 | label='log.date') | |
867 |
|
867 | |||
868 | if self.ui.debugflag: |
|
868 | if self.ui.debugflag: | |
869 | files = self.repo.status(log.parents(changenode)[0], changenode)[:3] |
|
869 | files = self.repo.status(log.parents(changenode)[0], changenode)[:3] | |
870 | for key, value in zip([# i18n: column positioning for "hg log" |
|
870 | for key, value in zip([# i18n: column positioning for "hg log" | |
871 | _("files:"), |
|
871 | _("files:"), | |
872 | # i18n: column positioning for "hg log" |
|
872 | # i18n: column positioning for "hg log" | |
873 | _("files+:"), |
|
873 | _("files+:"), | |
874 | # i18n: column positioning for "hg log" |
|
874 | # i18n: column positioning for "hg log" | |
875 | _("files-:")], files): |
|
875 | _("files-:")], files): | |
876 | if value: |
|
876 | if value: | |
877 | self.ui.write("%-12s %s\n" % (key, " ".join(value)), |
|
877 | self.ui.write("%-12s %s\n" % (key, " ".join(value)), | |
878 | label='ui.debug log.files') |
|
878 | label='ui.debug log.files') | |
879 | elif ctx.files() and self.ui.verbose: |
|
879 | elif ctx.files() and self.ui.verbose: | |
880 | # i18n: column positioning for "hg log" |
|
880 | # i18n: column positioning for "hg log" | |
881 | self.ui.write(_("files: %s\n") % " ".join(ctx.files()), |
|
881 | self.ui.write(_("files: %s\n") % " ".join(ctx.files()), | |
882 | label='ui.note log.files') |
|
882 | label='ui.note log.files') | |
883 | if copies and self.ui.verbose: |
|
883 | if copies and self.ui.verbose: | |
884 | copies = ['%s (%s)' % c for c in copies] |
|
884 | copies = ['%s (%s)' % c for c in copies] | |
885 | # i18n: column positioning for "hg log" |
|
885 | # i18n: column positioning for "hg log" | |
886 | self.ui.write(_("copies: %s\n") % ' '.join(copies), |
|
886 | self.ui.write(_("copies: %s\n") % ' '.join(copies), | |
887 | label='ui.note log.copies') |
|
887 | label='ui.note log.copies') | |
888 |
|
888 | |||
889 | extra = ctx.extra() |
|
889 | extra = ctx.extra() | |
890 | if extra and self.ui.debugflag: |
|
890 | if extra and self.ui.debugflag: | |
891 | for key, value in sorted(extra.items()): |
|
891 | for key, value in sorted(extra.items()): | |
892 | # i18n: column positioning for "hg log" |
|
892 | # i18n: column positioning for "hg log" | |
893 | self.ui.write(_("extra: %s=%s\n") |
|
893 | self.ui.write(_("extra: %s=%s\n") | |
894 | % (key, value.encode('string_escape')), |
|
894 | % (key, value.encode('string_escape')), | |
895 | label='ui.debug log.extra') |
|
895 | label='ui.debug log.extra') | |
896 |
|
896 | |||
897 | description = ctx.description().strip() |
|
897 | description = ctx.description().strip() | |
898 | if description: |
|
898 | if description: | |
899 | if self.ui.verbose: |
|
899 | if self.ui.verbose: | |
900 | self.ui.write(_("description:\n"), |
|
900 | self.ui.write(_("description:\n"), | |
901 | label='ui.note log.description') |
|
901 | label='ui.note log.description') | |
902 | self.ui.write(description, |
|
902 | self.ui.write(description, | |
903 | label='ui.note log.description') |
|
903 | label='ui.note log.description') | |
904 | self.ui.write("\n\n") |
|
904 | self.ui.write("\n\n") | |
905 | else: |
|
905 | else: | |
906 | # i18n: column positioning for "hg log" |
|
906 | # i18n: column positioning for "hg log" | |
907 | self.ui.write(_("summary: %s\n") % |
|
907 | self.ui.write(_("summary: %s\n") % | |
908 | description.splitlines()[0], |
|
908 | description.splitlines()[0], | |
909 | label='log.summary') |
|
909 | label='log.summary') | |
910 | self.ui.write("\n") |
|
910 | self.ui.write("\n") | |
911 |
|
911 | |||
912 | self.showpatch(changenode, matchfn) |
|
912 | self.showpatch(changenode, matchfn) | |
913 |
|
913 | |||
914 | def showpatch(self, node, matchfn): |
|
914 | def showpatch(self, node, matchfn): | |
915 | if not matchfn: |
|
915 | if not matchfn: | |
916 | matchfn = self.patch |
|
916 | matchfn = self.patch | |
917 | if matchfn: |
|
917 | if matchfn: | |
918 | stat = self.diffopts.get('stat') |
|
918 | stat = self.diffopts.get('stat') | |
919 | diff = self.diffopts.get('patch') |
|
919 | diff = self.diffopts.get('patch') | |
920 | diffopts = patch.diffopts(self.ui, self.diffopts) |
|
920 | diffopts = patch.diffopts(self.ui, self.diffopts) | |
921 | prev = self.repo.changelog.parents(node)[0] |
|
921 | prev = self.repo.changelog.parents(node)[0] | |
922 | if stat: |
|
922 | if stat: | |
923 | diffordiffstat(self.ui, self.repo, diffopts, prev, node, |
|
923 | diffordiffstat(self.ui, self.repo, diffopts, prev, node, | |
924 | match=matchfn, stat=True) |
|
924 | match=matchfn, stat=True) | |
925 | if diff: |
|
925 | if diff: | |
926 | if stat: |
|
926 | if stat: | |
927 | self.ui.write("\n") |
|
927 | self.ui.write("\n") | |
928 | diffordiffstat(self.ui, self.repo, diffopts, prev, node, |
|
928 | diffordiffstat(self.ui, self.repo, diffopts, prev, node, | |
929 | match=matchfn, stat=False) |
|
929 | match=matchfn, stat=False) | |
930 | self.ui.write("\n") |
|
930 | self.ui.write("\n") | |
931 |
|
931 | |||
932 | def _meaningful_parentrevs(self, log, rev): |
|
932 | def _meaningful_parentrevs(self, log, rev): | |
933 | """Return list of meaningful (or all if debug) parentrevs for rev. |
|
933 | """Return list of meaningful (or all if debug) parentrevs for rev. | |
934 |
|
934 | |||
935 | For merges (two non-nullrev revisions) both parents are meaningful. |
|
935 | For merges (two non-nullrev revisions) both parents are meaningful. | |
936 | Otherwise the first parent revision is considered meaningful if it |
|
936 | Otherwise the first parent revision is considered meaningful if it | |
937 | is not the preceding revision. |
|
937 | is not the preceding revision. | |
938 | """ |
|
938 | """ | |
939 | parents = log.parentrevs(rev) |
|
939 | parents = log.parentrevs(rev) | |
940 | if not self.ui.debugflag and parents[1] == nullrev: |
|
940 | if not self.ui.debugflag and parents[1] == nullrev: | |
941 | if parents[0] >= rev - 1: |
|
941 | if parents[0] >= rev - 1: | |
942 | parents = [] |
|
942 | parents = [] | |
943 | else: |
|
943 | else: | |
944 | parents = [parents[0]] |
|
944 | parents = [parents[0]] | |
945 | return parents |
|
945 | return parents | |
946 |
|
946 | |||
947 |
|
947 | |||
948 | class changeset_templater(changeset_printer): |
|
948 | class changeset_templater(changeset_printer): | |
949 | '''format changeset information.''' |
|
949 | '''format changeset information.''' | |
950 |
|
950 | |||
951 | def __init__(self, ui, repo, patch, diffopts, tmpl, mapfile, buffered): |
|
951 | def __init__(self, ui, repo, patch, diffopts, tmpl, mapfile, buffered): | |
952 | changeset_printer.__init__(self, ui, repo, patch, diffopts, buffered) |
|
952 | changeset_printer.__init__(self, ui, repo, patch, diffopts, buffered) | |
953 | formatnode = ui.debugflag and (lambda x: x) or (lambda x: x[:12]) |
|
953 | formatnode = ui.debugflag and (lambda x: x) or (lambda x: x[:12]) | |
954 | defaulttempl = { |
|
954 | defaulttempl = { | |
955 | 'parent': '{rev}:{node|formatnode} ', |
|
955 | 'parent': '{rev}:{node|formatnode} ', | |
956 | 'manifest': '{rev}:{node|formatnode}', |
|
956 | 'manifest': '{rev}:{node|formatnode}', | |
957 | 'file_copy': '{name} ({source})', |
|
957 | 'file_copy': '{name} ({source})', | |
958 | 'extra': '{key}={value|stringescape}' |
|
958 | 'extra': '{key}={value|stringescape}' | |
959 | } |
|
959 | } | |
960 | # filecopy is preserved for compatibility reasons |
|
960 | # filecopy is preserved for compatibility reasons | |
961 | defaulttempl['filecopy'] = defaulttempl['file_copy'] |
|
961 | defaulttempl['filecopy'] = defaulttempl['file_copy'] | |
962 | self.t = templater.templater(mapfile, {'formatnode': formatnode}, |
|
962 | self.t = templater.templater(mapfile, {'formatnode': formatnode}, | |
963 | cache=defaulttempl) |
|
963 | cache=defaulttempl) | |
964 | if tmpl: |
|
964 | if tmpl: | |
965 | self.t.cache['changeset'] = tmpl |
|
965 | self.t.cache['changeset'] = tmpl | |
966 |
|
966 | |||
967 | self.cache = {} |
|
967 | self.cache = {} | |
968 |
|
968 | |||
969 | def _meaningful_parentrevs(self, ctx): |
|
969 | def _meaningful_parentrevs(self, ctx): | |
970 | """Return list of meaningful (or all if debug) parentrevs for rev. |
|
970 | """Return list of meaningful (or all if debug) parentrevs for rev. | |
971 | """ |
|
971 | """ | |
972 | parents = ctx.parents() |
|
972 | parents = ctx.parents() | |
973 | if len(parents) > 1: |
|
973 | if len(parents) > 1: | |
974 | return parents |
|
974 | return parents | |
975 | if self.ui.debugflag: |
|
975 | if self.ui.debugflag: | |
976 | return [parents[0], self.repo['null']] |
|
976 | return [parents[0], self.repo['null']] | |
977 | if parents[0].rev() >= ctx.rev() - 1: |
|
977 | if parents[0].rev() >= ctx.rev() - 1: | |
978 | return [] |
|
978 | return [] | |
979 | return parents |
|
979 | return parents | |
980 |
|
980 | |||
981 | def _show(self, ctx, copies, matchfn, props): |
|
981 | def _show(self, ctx, copies, matchfn, props): | |
982 | '''show a single changeset or file revision''' |
|
982 | '''show a single changeset or file revision''' | |
983 |
|
983 | |||
984 | showlist = templatekw.showlist |
|
984 | showlist = templatekw.showlist | |
985 |
|
985 | |||
986 | # showparents() behaviour depends on ui trace level which |
|
986 | # showparents() behaviour depends on ui trace level which | |
987 | # causes unexpected behaviours at templating level and makes |
|
987 | # causes unexpected behaviours at templating level and makes | |
988 | # it harder to extract it in a standalone function. Its |
|
988 | # it harder to extract it in a standalone function. Its | |
989 | # behaviour cannot be changed so leave it here for now. |
|
989 | # behaviour cannot be changed so leave it here for now. | |
990 | def showparents(**args): |
|
990 | def showparents(**args): | |
991 | ctx = args['ctx'] |
|
991 | ctx = args['ctx'] | |
992 | parents = [[('rev', p.rev()), ('node', p.hex())] |
|
992 | parents = [[('rev', p.rev()), ('node', p.hex())] | |
993 | for p in self._meaningful_parentrevs(ctx)] |
|
993 | for p in self._meaningful_parentrevs(ctx)] | |
994 | return showlist('parent', parents, **args) |
|
994 | return showlist('parent', parents, **args) | |
995 |
|
995 | |||
996 | props = props.copy() |
|
996 | props = props.copy() | |
997 | props.update(templatekw.keywords) |
|
997 | props.update(templatekw.keywords) | |
998 | props['parents'] = showparents |
|
998 | props['parents'] = showparents | |
999 | props['templ'] = self.t |
|
999 | props['templ'] = self.t | |
1000 | props['ctx'] = ctx |
|
1000 | props['ctx'] = ctx | |
1001 | props['repo'] = self.repo |
|
1001 | props['repo'] = self.repo | |
1002 | props['revcache'] = {'copies': copies} |
|
1002 | props['revcache'] = {'copies': copies} | |
1003 | props['cache'] = self.cache |
|
1003 | props['cache'] = self.cache | |
1004 |
|
1004 | |||
1005 | # find correct templates for current mode |
|
1005 | # find correct templates for current mode | |
1006 |
|
1006 | |||
1007 | tmplmodes = [ |
|
1007 | tmplmodes = [ | |
1008 | (True, None), |
|
1008 | (True, None), | |
1009 | (self.ui.verbose, 'verbose'), |
|
1009 | (self.ui.verbose, 'verbose'), | |
1010 | (self.ui.quiet, 'quiet'), |
|
1010 | (self.ui.quiet, 'quiet'), | |
1011 | (self.ui.debugflag, 'debug'), |
|
1011 | (self.ui.debugflag, 'debug'), | |
1012 | ] |
|
1012 | ] | |
1013 |
|
1013 | |||
1014 | types = {'header': '', 'footer':'', 'changeset': 'changeset'} |
|
1014 | types = {'header': '', 'footer':'', 'changeset': 'changeset'} | |
1015 | for mode, postfix in tmplmodes: |
|
1015 | for mode, postfix in tmplmodes: | |
1016 | for type in types: |
|
1016 | for type in types: | |
1017 | cur = postfix and ('%s_%s' % (type, postfix)) or type |
|
1017 | cur = postfix and ('%s_%s' % (type, postfix)) or type | |
1018 | if mode and cur in self.t: |
|
1018 | if mode and cur in self.t: | |
1019 | types[type] = cur |
|
1019 | types[type] = cur | |
1020 |
|
1020 | |||
1021 | try: |
|
1021 | try: | |
1022 |
|
1022 | |||
1023 | # write header |
|
1023 | # write header | |
1024 | if types['header']: |
|
1024 | if types['header']: | |
1025 | h = templater.stringify(self.t(types['header'], **props)) |
|
1025 | h = templater.stringify(self.t(types['header'], **props)) | |
1026 | if self.buffered: |
|
1026 | if self.buffered: | |
1027 | self.header[ctx.rev()] = h |
|
1027 | self.header[ctx.rev()] = h | |
1028 | else: |
|
1028 | else: | |
1029 | if self.lastheader != h: |
|
1029 | if self.lastheader != h: | |
1030 | self.lastheader = h |
|
1030 | self.lastheader = h | |
1031 | self.ui.write(h) |
|
1031 | self.ui.write(h) | |
1032 |
|
1032 | |||
1033 | # write changeset metadata, then patch if requested |
|
1033 | # write changeset metadata, then patch if requested | |
1034 | key = types['changeset'] |
|
1034 | key = types['changeset'] | |
1035 | self.ui.write(templater.stringify(self.t(key, **props))) |
|
1035 | self.ui.write(templater.stringify(self.t(key, **props))) | |
1036 | self.showpatch(ctx.node(), matchfn) |
|
1036 | self.showpatch(ctx.node(), matchfn) | |
1037 |
|
1037 | |||
1038 | if types['footer']: |
|
1038 | if types['footer']: | |
1039 | if not self.footer: |
|
1039 | if not self.footer: | |
1040 | self.footer = templater.stringify(self.t(types['footer'], |
|
1040 | self.footer = templater.stringify(self.t(types['footer'], | |
1041 | **props)) |
|
1041 | **props)) | |
1042 |
|
1042 | |||
1043 | except KeyError, inst: |
|
1043 | except KeyError, inst: | |
1044 | msg = _("%s: no key named '%s'") |
|
1044 | msg = _("%s: no key named '%s'") | |
1045 | raise util.Abort(msg % (self.t.mapfile, inst.args[0])) |
|
1045 | raise util.Abort(msg % (self.t.mapfile, inst.args[0])) | |
1046 | except SyntaxError, inst: |
|
1046 | except SyntaxError, inst: | |
1047 | raise util.Abort('%s: %s' % (self.t.mapfile, inst.args[0])) |
|
1047 | raise util.Abort('%s: %s' % (self.t.mapfile, inst.args[0])) | |
1048 |
|
1048 | |||
1049 | def gettemplate(ui, tmpl, style): |
|
1049 | def gettemplate(ui, tmpl, style): | |
1050 | """ |
|
1050 | """ | |
1051 | Find the template matching the given template spec or style. |
|
1051 | Find the template matching the given template spec or style. | |
1052 | """ |
|
1052 | """ | |
1053 |
|
1053 | |||
1054 | # ui settings |
|
1054 | # ui settings | |
1055 | if not tmpl and not style: |
|
1055 | if not tmpl and not style: | |
1056 | tmpl = ui.config('ui', 'logtemplate') |
|
1056 | tmpl = ui.config('ui', 'logtemplate') | |
1057 | if tmpl: |
|
1057 | if tmpl: | |
1058 | try: |
|
1058 | try: | |
1059 | tmpl = templater.parsestring(tmpl) |
|
1059 | tmpl = templater.parsestring(tmpl) | |
1060 | except SyntaxError: |
|
1060 | except SyntaxError: | |
1061 | tmpl = templater.parsestring(tmpl, quoted=False) |
|
1061 | tmpl = templater.parsestring(tmpl, quoted=False) | |
1062 | return tmpl, None |
|
1062 | return tmpl, None | |
1063 | else: |
|
1063 | else: | |
1064 | style = util.expandpath(ui.config('ui', 'style', '')) |
|
1064 | style = util.expandpath(ui.config('ui', 'style', '')) | |
1065 |
|
1065 | |||
1066 | if style: |
|
1066 | if style: | |
1067 | mapfile = style |
|
1067 | mapfile = style | |
1068 | if not os.path.split(mapfile)[0]: |
|
1068 | if not os.path.split(mapfile)[0]: | |
1069 | mapname = (templater.templatepath('map-cmdline.' + mapfile) |
|
1069 | mapname = (templater.templatepath('map-cmdline.' + mapfile) | |
1070 | or templater.templatepath(mapfile)) |
|
1070 | or templater.templatepath(mapfile)) | |
1071 | if mapname: |
|
1071 | if mapname: | |
1072 | mapfile = mapname |
|
1072 | mapfile = mapname | |
1073 | return None, mapfile |
|
1073 | return None, mapfile | |
1074 |
|
1074 | |||
1075 | if not tmpl: |
|
1075 | if not tmpl: | |
1076 | return None, None |
|
1076 | return None, None | |
1077 |
|
1077 | |||
1078 | # looks like a literal template? |
|
1078 | # looks like a literal template? | |
1079 | if '{' in tmpl: |
|
1079 | if '{' in tmpl: | |
1080 | return tmpl, None |
|
1080 | return tmpl, None | |
1081 |
|
1081 | |||
1082 | # perhaps a stock style? |
|
1082 | # perhaps a stock style? | |
1083 | if not os.path.split(tmpl)[0]: |
|
1083 | if not os.path.split(tmpl)[0]: | |
1084 | mapname = (templater.templatepath('map-cmdline.' + tmpl) |
|
1084 | mapname = (templater.templatepath('map-cmdline.' + tmpl) | |
1085 | or templater.templatepath(tmpl)) |
|
1085 | or templater.templatepath(tmpl)) | |
1086 | if mapname and os.path.isfile(mapname): |
|
1086 | if mapname and os.path.isfile(mapname): | |
1087 | return None, mapname |
|
1087 | return None, mapname | |
1088 |
|
1088 | |||
1089 | # perhaps it's a reference to [templates] |
|
1089 | # perhaps it's a reference to [templates] | |
1090 | t = ui.config('templates', tmpl) |
|
1090 | t = ui.config('templates', tmpl) | |
1091 | if t: |
|
1091 | if t: | |
1092 | try: |
|
1092 | try: | |
1093 | tmpl = templater.parsestring(t) |
|
1093 | tmpl = templater.parsestring(t) | |
1094 | except SyntaxError: |
|
1094 | except SyntaxError: | |
1095 | tmpl = templater.parsestring(t, quoted=False) |
|
1095 | tmpl = templater.parsestring(t, quoted=False) | |
1096 | return tmpl, None |
|
1096 | return tmpl, None | |
1097 |
|
1097 | |||
1098 | # perhaps it's a path to a map or a template |
|
1098 | # perhaps it's a path to a map or a template | |
1099 | if ('/' in tmpl or '\\' in tmpl) and os.path.isfile(tmpl): |
|
1099 | if ('/' in tmpl or '\\' in tmpl) and os.path.isfile(tmpl): | |
1100 | # is it a mapfile for a style? |
|
1100 | # is it a mapfile for a style? | |
1101 | if os.path.basename(tmpl).startswith("map-"): |
|
1101 | if os.path.basename(tmpl).startswith("map-"): | |
1102 | return None, os.path.realpath(tmpl) |
|
1102 | return None, os.path.realpath(tmpl) | |
1103 | tmpl = open(tmpl).read() |
|
1103 | tmpl = open(tmpl).read() | |
1104 | return tmpl, None |
|
1104 | return tmpl, None | |
1105 |
|
1105 | |||
1106 | # constant string? |
|
1106 | # constant string? | |
1107 | return tmpl, None |
|
1107 | return tmpl, None | |
1108 |
|
1108 | |||
1109 | def show_changeset(ui, repo, opts, buffered=False): |
|
1109 | def show_changeset(ui, repo, opts, buffered=False): | |
1110 | """show one changeset using template or regular display. |
|
1110 | """show one changeset using template or regular display. | |
1111 |
|
1111 | |||
1112 | Display format will be the first non-empty hit of: |
|
1112 | Display format will be the first non-empty hit of: | |
1113 | 1. option 'template' |
|
1113 | 1. option 'template' | |
1114 | 2. option 'style' |
|
1114 | 2. option 'style' | |
1115 | 3. [ui] setting 'logtemplate' |
|
1115 | 3. [ui] setting 'logtemplate' | |
1116 | 4. [ui] setting 'style' |
|
1116 | 4. [ui] setting 'style' | |
1117 | If all of these values are either the unset or the empty string, |
|
1117 | If all of these values are either the unset or the empty string, | |
1118 | regular display via changeset_printer() is done. |
|
1118 | regular display via changeset_printer() is done. | |
1119 | """ |
|
1119 | """ | |
1120 | # options |
|
1120 | # options | |
1121 | patch = None |
|
1121 | patch = None | |
1122 | if opts.get('patch') or opts.get('stat'): |
|
1122 | if opts.get('patch') or opts.get('stat'): | |
1123 | patch = scmutil.matchall(repo) |
|
1123 | patch = scmutil.matchall(repo) | |
1124 |
|
1124 | |||
1125 | tmpl, mapfile = gettemplate(ui, opts.get('template'), opts.get('style')) |
|
1125 | tmpl, mapfile = gettemplate(ui, opts.get('template'), opts.get('style')) | |
1126 |
|
1126 | |||
1127 | if not tmpl and not mapfile: |
|
1127 | if not tmpl and not mapfile: | |
1128 | return changeset_printer(ui, repo, patch, opts, buffered) |
|
1128 | return changeset_printer(ui, repo, patch, opts, buffered) | |
1129 |
|
1129 | |||
1130 | try: |
|
1130 | try: | |
1131 | t = changeset_templater(ui, repo, patch, opts, tmpl, mapfile, buffered) |
|
1131 | t = changeset_templater(ui, repo, patch, opts, tmpl, mapfile, buffered) | |
1132 | except SyntaxError, inst: |
|
1132 | except SyntaxError, inst: | |
1133 | raise util.Abort(inst.args[0]) |
|
1133 | raise util.Abort(inst.args[0]) | |
1134 | return t |
|
1134 | return t | |
1135 |
|
1135 | |||
1136 | def showmarker(ui, marker): |
|
1136 | def showmarker(ui, marker): | |
1137 | """utility function to display obsolescence marker in a readable way |
|
1137 | """utility function to display obsolescence marker in a readable way | |
1138 |
|
1138 | |||
1139 | To be used by debug function.""" |
|
1139 | To be used by debug function.""" | |
1140 | ui.write(hex(marker.precnode())) |
|
1140 | ui.write(hex(marker.precnode())) | |
1141 | for repl in marker.succnodes(): |
|
1141 | for repl in marker.succnodes(): | |
1142 | ui.write(' ') |
|
1142 | ui.write(' ') | |
1143 | ui.write(hex(repl)) |
|
1143 | ui.write(hex(repl)) | |
1144 | ui.write(' %X ' % marker._data[2]) |
|
1144 | ui.write(' %X ' % marker._data[2]) | |
1145 | ui.write('{%s}' % (', '.join('%r: %r' % t for t in |
|
1145 | ui.write('{%s}' % (', '.join('%r: %r' % t for t in | |
1146 | sorted(marker.metadata().items())))) |
|
1146 | sorted(marker.metadata().items())))) | |
1147 | ui.write('\n') |
|
1147 | ui.write('\n') | |
1148 |
|
1148 | |||
1149 | def finddate(ui, repo, date): |
|
1149 | def finddate(ui, repo, date): | |
1150 | """Find the tipmost changeset that matches the given date spec""" |
|
1150 | """Find the tipmost changeset that matches the given date spec""" | |
1151 |
|
1151 | |||
1152 | df = util.matchdate(date) |
|
1152 | df = util.matchdate(date) | |
1153 | m = scmutil.matchall(repo) |
|
1153 | m = scmutil.matchall(repo) | |
1154 | results = {} |
|
1154 | results = {} | |
1155 |
|
1155 | |||
1156 | def prep(ctx, fns): |
|
1156 | def prep(ctx, fns): | |
1157 | d = ctx.date() |
|
1157 | d = ctx.date() | |
1158 | if df(d[0]): |
|
1158 | if df(d[0]): | |
1159 | results[ctx.rev()] = d |
|
1159 | results[ctx.rev()] = d | |
1160 |
|
1160 | |||
1161 | for ctx in walkchangerevs(repo, m, {'rev': None}, prep): |
|
1161 | for ctx in walkchangerevs(repo, m, {'rev': None}, prep): | |
1162 | rev = ctx.rev() |
|
1162 | rev = ctx.rev() | |
1163 | if rev in results: |
|
1163 | if rev in results: | |
1164 | ui.status(_("found revision %s from %s\n") % |
|
1164 | ui.status(_("found revision %s from %s\n") % | |
1165 | (rev, util.datestr(results[rev]))) |
|
1165 | (rev, util.datestr(results[rev]))) | |
1166 | return str(rev) |
|
1166 | return str(rev) | |
1167 |
|
1167 | |||
1168 | raise util.Abort(_("revision matching date not found")) |
|
1168 | raise util.Abort(_("revision matching date not found")) | |
1169 |
|
1169 | |||
1170 | def increasingwindows(windowsize=8, sizelimit=512): |
|
1170 | def increasingwindows(windowsize=8, sizelimit=512): | |
1171 | while True: |
|
1171 | while True: | |
1172 | yield windowsize |
|
1172 | yield windowsize | |
1173 | if windowsize < sizelimit: |
|
1173 | if windowsize < sizelimit: | |
1174 | windowsize *= 2 |
|
1174 | windowsize *= 2 | |
1175 |
|
1175 | |||
1176 | class FileWalkError(Exception): |
|
1176 | class FileWalkError(Exception): | |
1177 | pass |
|
1177 | pass | |
1178 |
|
1178 | |||
1179 | def walkfilerevs(repo, match, follow, revs, fncache): |
|
1179 | def walkfilerevs(repo, match, follow, revs, fncache): | |
1180 | '''Walks the file history for the matched files. |
|
1180 | '''Walks the file history for the matched files. | |
1181 |
|
1181 | |||
1182 | Returns the changeset revs that are involved in the file history. |
|
1182 | Returns the changeset revs that are involved in the file history. | |
1183 |
|
1183 | |||
1184 | Throws FileWalkError if the file history can't be walked using |
|
1184 | Throws FileWalkError if the file history can't be walked using | |
1185 | filelogs alone. |
|
1185 | filelogs alone. | |
1186 | ''' |
|
1186 | ''' | |
1187 | wanted = set() |
|
1187 | wanted = set() | |
1188 | copies = [] |
|
1188 | copies = [] | |
1189 | minrev, maxrev = min(revs), max(revs) |
|
1189 | minrev, maxrev = min(revs), max(revs) | |
1190 | def filerevgen(filelog, last): |
|
1190 | def filerevgen(filelog, last): | |
1191 | """ |
|
1191 | """ | |
1192 | Only files, no patterns. Check the history of each file. |
|
1192 | Only files, no patterns. Check the history of each file. | |
1193 |
|
1193 | |||
1194 | Examines filelog entries within minrev, maxrev linkrev range |
|
1194 | Examines filelog entries within minrev, maxrev linkrev range | |
1195 | Returns an iterator yielding (linkrev, parentlinkrevs, copied) |
|
1195 | Returns an iterator yielding (linkrev, parentlinkrevs, copied) | |
1196 | tuples in backwards order |
|
1196 | tuples in backwards order | |
1197 | """ |
|
1197 | """ | |
1198 | cl_count = len(repo) |
|
1198 | cl_count = len(repo) | |
1199 | revs = [] |
|
1199 | revs = [] | |
1200 | for j in xrange(0, last + 1): |
|
1200 | for j in xrange(0, last + 1): | |
1201 | linkrev = filelog.linkrev(j) |
|
1201 | linkrev = filelog.linkrev(j) | |
1202 | if linkrev < minrev: |
|
1202 | if linkrev < minrev: | |
1203 | continue |
|
1203 | continue | |
1204 | # only yield rev for which we have the changelog, it can |
|
1204 | # only yield rev for which we have the changelog, it can | |
1205 | # happen while doing "hg log" during a pull or commit |
|
1205 | # happen while doing "hg log" during a pull or commit | |
1206 | if linkrev >= cl_count: |
|
1206 | if linkrev >= cl_count: | |
1207 | break |
|
1207 | break | |
1208 |
|
1208 | |||
1209 | parentlinkrevs = [] |
|
1209 | parentlinkrevs = [] | |
1210 | for p in filelog.parentrevs(j): |
|
1210 | for p in filelog.parentrevs(j): | |
1211 | if p != nullrev: |
|
1211 | if p != nullrev: | |
1212 | parentlinkrevs.append(filelog.linkrev(p)) |
|
1212 | parentlinkrevs.append(filelog.linkrev(p)) | |
1213 | n = filelog.node(j) |
|
1213 | n = filelog.node(j) | |
1214 | revs.append((linkrev, parentlinkrevs, |
|
1214 | revs.append((linkrev, parentlinkrevs, | |
1215 | follow and filelog.renamed(n))) |
|
1215 | follow and filelog.renamed(n))) | |
1216 |
|
1216 | |||
1217 | return reversed(revs) |
|
1217 | return reversed(revs) | |
1218 | def iterfiles(): |
|
1218 | def iterfiles(): | |
1219 | pctx = repo['.'] |
|
1219 | pctx = repo['.'] | |
1220 | for filename in match.files(): |
|
1220 | for filename in match.files(): | |
1221 | if follow: |
|
1221 | if follow: | |
1222 | if filename not in pctx: |
|
1222 | if filename not in pctx: | |
1223 | raise util.Abort(_('cannot follow file not in parent ' |
|
1223 | raise util.Abort(_('cannot follow file not in parent ' | |
1224 | 'revision: "%s"') % filename) |
|
1224 | 'revision: "%s"') % filename) | |
1225 | yield filename, pctx[filename].filenode() |
|
1225 | yield filename, pctx[filename].filenode() | |
1226 | else: |
|
1226 | else: | |
1227 | yield filename, None |
|
1227 | yield filename, None | |
1228 | for filename_node in copies: |
|
1228 | for filename_node in copies: | |
1229 | yield filename_node |
|
1229 | yield filename_node | |
1230 |
|
1230 | |||
1231 | for file_, node in iterfiles(): |
|
1231 | for file_, node in iterfiles(): | |
1232 | filelog = repo.file(file_) |
|
1232 | filelog = repo.file(file_) | |
1233 | if not len(filelog): |
|
1233 | if not len(filelog): | |
1234 | if node is None: |
|
1234 | if node is None: | |
1235 | # A zero count may be a directory or deleted file, so |
|
1235 | # A zero count may be a directory or deleted file, so | |
1236 | # try to find matching entries on the slow path. |
|
1236 | # try to find matching entries on the slow path. | |
1237 | if follow: |
|
1237 | if follow: | |
1238 | raise util.Abort( |
|
1238 | raise util.Abort( | |
1239 | _('cannot follow nonexistent file: "%s"') % file_) |
|
1239 | _('cannot follow nonexistent file: "%s"') % file_) | |
1240 | raise FileWalkError("Cannot walk via filelog") |
|
1240 | raise FileWalkError("Cannot walk via filelog") | |
1241 | else: |
|
1241 | else: | |
1242 | continue |
|
1242 | continue | |
1243 |
|
1243 | |||
1244 | if node is None: |
|
1244 | if node is None: | |
1245 | last = len(filelog) - 1 |
|
1245 | last = len(filelog) - 1 | |
1246 | else: |
|
1246 | else: | |
1247 | last = filelog.rev(node) |
|
1247 | last = filelog.rev(node) | |
1248 |
|
1248 | |||
1249 |
|
1249 | |||
1250 | # keep track of all ancestors of the file |
|
1250 | # keep track of all ancestors of the file | |
1251 | ancestors = set([filelog.linkrev(last)]) |
|
1251 | ancestors = set([filelog.linkrev(last)]) | |
1252 |
|
1252 | |||
1253 | # iterate from latest to oldest revision |
|
1253 | # iterate from latest to oldest revision | |
1254 | for rev, flparentlinkrevs, copied in filerevgen(filelog, last): |
|
1254 | for rev, flparentlinkrevs, copied in filerevgen(filelog, last): | |
1255 | if not follow: |
|
1255 | if not follow: | |
1256 | if rev > maxrev: |
|
1256 | if rev > maxrev: | |
1257 | continue |
|
1257 | continue | |
1258 | else: |
|
1258 | else: | |
1259 | # Note that last might not be the first interesting |
|
1259 | # Note that last might not be the first interesting | |
1260 | # rev to us: |
|
1260 | # rev to us: | |
1261 | # if the file has been changed after maxrev, we'll |
|
1261 | # if the file has been changed after maxrev, we'll | |
1262 | # have linkrev(last) > maxrev, and we still need |
|
1262 | # have linkrev(last) > maxrev, and we still need | |
1263 | # to explore the file graph |
|
1263 | # to explore the file graph | |
1264 | if rev not in ancestors: |
|
1264 | if rev not in ancestors: | |
1265 | continue |
|
1265 | continue | |
1266 | # XXX insert 1327 fix here |
|
1266 | # XXX insert 1327 fix here | |
1267 | if flparentlinkrevs: |
|
1267 | if flparentlinkrevs: | |
1268 | ancestors.update(flparentlinkrevs) |
|
1268 | ancestors.update(flparentlinkrevs) | |
1269 |
|
1269 | |||
1270 | fncache.setdefault(rev, []).append(file_) |
|
1270 | fncache.setdefault(rev, []).append(file_) | |
1271 | wanted.add(rev) |
|
1271 | wanted.add(rev) | |
1272 | if copied: |
|
1272 | if copied: | |
1273 | copies.append(copied) |
|
1273 | copies.append(copied) | |
1274 |
|
1274 | |||
1275 | return wanted |
|
1275 | return wanted | |
1276 |
|
1276 | |||
1277 | def walkchangerevs(repo, match, opts, prepare): |
|
1277 | def walkchangerevs(repo, match, opts, prepare): | |
1278 | '''Iterate over files and the revs in which they changed. |
|
1278 | '''Iterate over files and the revs in which they changed. | |
1279 |
|
1279 | |||
1280 | Callers most commonly need to iterate backwards over the history |
|
1280 | Callers most commonly need to iterate backwards over the history | |
1281 | in which they are interested. Doing so has awful (quadratic-looking) |
|
1281 | in which they are interested. Doing so has awful (quadratic-looking) | |
1282 | performance, so we use iterators in a "windowed" way. |
|
1282 | performance, so we use iterators in a "windowed" way. | |
1283 |
|
1283 | |||
1284 | We walk a window of revisions in the desired order. Within the |
|
1284 | We walk a window of revisions in the desired order. Within the | |
1285 | window, we first walk forwards to gather data, then in the desired |
|
1285 | window, we first walk forwards to gather data, then in the desired | |
1286 | order (usually backwards) to display it. |
|
1286 | order (usually backwards) to display it. | |
1287 |
|
1287 | |||
1288 | This function returns an iterator yielding contexts. Before |
|
1288 | This function returns an iterator yielding contexts. Before | |
1289 | yielding each context, the iterator will first call the prepare |
|
1289 | yielding each context, the iterator will first call the prepare | |
1290 | function on each context in the window in forward order.''' |
|
1290 | function on each context in the window in forward order.''' | |
1291 |
|
1291 | |||
1292 | follow = opts.get('follow') or opts.get('follow_first') |
|
1292 | follow = opts.get('follow') or opts.get('follow_first') | |
1293 |
|
1293 | |||
1294 | if opts.get('rev'): |
|
1294 | if opts.get('rev'): | |
1295 | revs = scmutil.revrange(repo, opts.get('rev')) |
|
1295 | revs = scmutil.revrange(repo, opts.get('rev')) | |
1296 | elif follow: |
|
1296 | elif follow: | |
1297 | revs = repo.revs('reverse(:.)') |
|
1297 | revs = repo.revs('reverse(:.)') | |
1298 | else: |
|
1298 | else: | |
1299 | revs = revset.spanset(repo) |
|
1299 | revs = revset.spanset(repo) | |
1300 | revs.reverse() |
|
1300 | revs.reverse() | |
1301 | if not revs: |
|
1301 | if not revs: | |
1302 | return [] |
|
1302 | return [] | |
1303 | wanted = set() |
|
1303 | wanted = set() | |
1304 | slowpath = match.anypats() or (match.files() and opts.get('removed')) |
|
1304 | slowpath = match.anypats() or (match.files() and opts.get('removed')) | |
1305 | fncache = {} |
|
1305 | fncache = {} | |
1306 | change = repo.changectx |
|
1306 | change = repo.changectx | |
1307 |
|
1307 | |||
1308 | # First step is to fill wanted, the set of revisions that we want to yield. |
|
1308 | # First step is to fill wanted, the set of revisions that we want to yield. | |
1309 | # When it does not induce extra cost, we also fill fncache for revisions in |
|
1309 | # When it does not induce extra cost, we also fill fncache for revisions in | |
1310 | # wanted: a cache of filenames that were changed (ctx.files()) and that |
|
1310 | # wanted: a cache of filenames that were changed (ctx.files()) and that | |
1311 | # match the file filtering conditions. |
|
1311 | # match the file filtering conditions. | |
1312 |
|
1312 | |||
1313 | if not slowpath and not match.files(): |
|
1313 | if not slowpath and not match.files(): | |
1314 | # No files, no patterns. Display all revs. |
|
1314 | # No files, no patterns. Display all revs. | |
1315 | wanted = revs |
|
1315 | wanted = revs | |
1316 |
|
1316 | |||
1317 | if not slowpath and match.files(): |
|
1317 | if not slowpath and match.files(): | |
1318 | # We only have to read through the filelog to find wanted revisions |
|
1318 | # We only have to read through the filelog to find wanted revisions | |
1319 |
|
1319 | |||
1320 | try: |
|
1320 | try: | |
1321 | wanted = walkfilerevs(repo, match, follow, revs, fncache) |
|
1321 | wanted = walkfilerevs(repo, match, follow, revs, fncache) | |
1322 | except FileWalkError: |
|
1322 | except FileWalkError: | |
1323 | slowpath = True |
|
1323 | slowpath = True | |
1324 |
|
1324 | |||
1325 | # We decided to fall back to the slowpath because at least one |
|
1325 | # We decided to fall back to the slowpath because at least one | |
1326 | # of the paths was not a file. Check to see if at least one of them |
|
1326 | # of the paths was not a file. Check to see if at least one of them | |
1327 | # existed in history, otherwise simply return |
|
1327 | # existed in history, otherwise simply return | |
1328 | for path in match.files(): |
|
1328 | for path in match.files(): | |
1329 | if path == '.' or path in repo.store: |
|
1329 | if path == '.' or path in repo.store: | |
1330 | break |
|
1330 | break | |
1331 | else: |
|
1331 | else: | |
1332 | return [] |
|
1332 | return [] | |
1333 |
|
1333 | |||
1334 | if slowpath: |
|
1334 | if slowpath: | |
1335 | # We have to read the changelog to match filenames against |
|
1335 | # We have to read the changelog to match filenames against | |
1336 | # changed files |
|
1336 | # changed files | |
1337 |
|
1337 | |||
1338 | if follow: |
|
1338 | if follow: | |
1339 | raise util.Abort(_('can only follow copies/renames for explicit ' |
|
1339 | raise util.Abort(_('can only follow copies/renames for explicit ' | |
1340 | 'filenames')) |
|
1340 | 'filenames')) | |
1341 |
|
1341 | |||
1342 | # The slow path checks files modified in every changeset. |
|
1342 | # The slow path checks files modified in every changeset. | |
1343 | # This is really slow on large repos, so compute the set lazily. |
|
1343 | # This is really slow on large repos, so compute the set lazily. | |
1344 | class lazywantedset(object): |
|
1344 | class lazywantedset(object): | |
1345 | def __init__(self): |
|
1345 | def __init__(self): | |
1346 | self.set = set() |
|
1346 | self.set = set() | |
1347 | self.revs = set(revs) |
|
1347 | self.revs = set(revs) | |
1348 |
|
1348 | |||
1349 | # No need to worry about locality here because it will be accessed |
|
1349 | # No need to worry about locality here because it will be accessed | |
1350 | # in the same order as the increasing window below. |
|
1350 | # in the same order as the increasing window below. | |
1351 | def __contains__(self, value): |
|
1351 | def __contains__(self, value): | |
1352 | if value in self.set: |
|
1352 | if value in self.set: | |
1353 | return True |
|
1353 | return True | |
1354 | elif not value in self.revs: |
|
1354 | elif not value in self.revs: | |
1355 | return False |
|
1355 | return False | |
1356 | else: |
|
1356 | else: | |
1357 | self.revs.discard(value) |
|
1357 | self.revs.discard(value) | |
1358 | ctx = change(value) |
|
1358 | ctx = change(value) | |
1359 | matches = filter(match, ctx.files()) |
|
1359 | matches = filter(match, ctx.files()) | |
1360 | if matches: |
|
1360 | if matches: | |
1361 | fncache[value] = matches |
|
1361 | fncache[value] = matches | |
1362 | self.set.add(value) |
|
1362 | self.set.add(value) | |
1363 | return True |
|
1363 | return True | |
1364 | return False |
|
1364 | return False | |
1365 |
|
1365 | |||
1366 | def discard(self, value): |
|
1366 | def discard(self, value): | |
1367 | self.revs.discard(value) |
|
1367 | self.revs.discard(value) | |
1368 | self.set.discard(value) |
|
1368 | self.set.discard(value) | |
1369 |
|
1369 | |||
1370 | wanted = lazywantedset() |
|
1370 | wanted = lazywantedset() | |
1371 |
|
1371 | |||
1372 | class followfilter(object): |
|
1372 | class followfilter(object): | |
1373 | def __init__(self, onlyfirst=False): |
|
1373 | def __init__(self, onlyfirst=False): | |
1374 | self.startrev = nullrev |
|
1374 | self.startrev = nullrev | |
1375 | self.roots = set() |
|
1375 | self.roots = set() | |
1376 | self.onlyfirst = onlyfirst |
|
1376 | self.onlyfirst = onlyfirst | |
1377 |
|
1377 | |||
1378 | def match(self, rev): |
|
1378 | def match(self, rev): | |
1379 | def realparents(rev): |
|
1379 | def realparents(rev): | |
1380 | if self.onlyfirst: |
|
1380 | if self.onlyfirst: | |
1381 | return repo.changelog.parentrevs(rev)[0:1] |
|
1381 | return repo.changelog.parentrevs(rev)[0:1] | |
1382 | else: |
|
1382 | else: | |
1383 | return filter(lambda x: x != nullrev, |
|
1383 | return filter(lambda x: x != nullrev, | |
1384 | repo.changelog.parentrevs(rev)) |
|
1384 | repo.changelog.parentrevs(rev)) | |
1385 |
|
1385 | |||
1386 | if self.startrev == nullrev: |
|
1386 | if self.startrev == nullrev: | |
1387 | self.startrev = rev |
|
1387 | self.startrev = rev | |
1388 | return True |
|
1388 | return True | |
1389 |
|
1389 | |||
1390 | if rev > self.startrev: |
|
1390 | if rev > self.startrev: | |
1391 | # forward: all descendants |
|
1391 | # forward: all descendants | |
1392 | if not self.roots: |
|
1392 | if not self.roots: | |
1393 | self.roots.add(self.startrev) |
|
1393 | self.roots.add(self.startrev) | |
1394 | for parent in realparents(rev): |
|
1394 | for parent in realparents(rev): | |
1395 | if parent in self.roots: |
|
1395 | if parent in self.roots: | |
1396 | self.roots.add(rev) |
|
1396 | self.roots.add(rev) | |
1397 | return True |
|
1397 | return True | |
1398 | else: |
|
1398 | else: | |
1399 | # backwards: all parents |
|
1399 | # backwards: all parents | |
1400 | if not self.roots: |
|
1400 | if not self.roots: | |
1401 | self.roots.update(realparents(self.startrev)) |
|
1401 | self.roots.update(realparents(self.startrev)) | |
1402 | if rev in self.roots: |
|
1402 | if rev in self.roots: | |
1403 | self.roots.remove(rev) |
|
1403 | self.roots.remove(rev) | |
1404 | self.roots.update(realparents(rev)) |
|
1404 | self.roots.update(realparents(rev)) | |
1405 | return True |
|
1405 | return True | |
1406 |
|
1406 | |||
1407 | return False |
|
1407 | return False | |
1408 |
|
1408 | |||
1409 | # it might be worthwhile to do this in the iterator if the rev range |
|
1409 | # it might be worthwhile to do this in the iterator if the rev range | |
1410 | # is descending and the prune args are all within that range |
|
1410 | # is descending and the prune args are all within that range | |
1411 | for rev in opts.get('prune', ()): |
|
1411 | for rev in opts.get('prune', ()): | |
1412 | rev = repo[rev].rev() |
|
1412 | rev = repo[rev].rev() | |
1413 | ff = followfilter() |
|
1413 | ff = followfilter() | |
1414 | stop = min(revs[0], revs[-1]) |
|
1414 | stop = min(revs[0], revs[-1]) | |
1415 | for x in xrange(rev, stop - 1, -1): |
|
1415 | for x in xrange(rev, stop - 1, -1): | |
1416 | if ff.match(x): |
|
1416 | if ff.match(x): | |
1417 | wanted = wanted - [x] |
|
1417 | wanted = wanted - [x] | |
1418 |
|
1418 | |||
1419 | # Now that wanted is correctly initialized, we can iterate over the |
|
1419 | # Now that wanted is correctly initialized, we can iterate over the | |
1420 | # revision range, yielding only revisions in wanted. |
|
1420 | # revision range, yielding only revisions in wanted. | |
1421 | def iterate(): |
|
1421 | def iterate(): | |
1422 | if follow and not match.files(): |
|
1422 | if follow and not match.files(): | |
1423 | ff = followfilter(onlyfirst=opts.get('follow_first')) |
|
1423 | ff = followfilter(onlyfirst=opts.get('follow_first')) | |
1424 | def want(rev): |
|
1424 | def want(rev): | |
1425 | return ff.match(rev) and rev in wanted |
|
1425 | return ff.match(rev) and rev in wanted | |
1426 | else: |
|
1426 | else: | |
1427 | def want(rev): |
|
1427 | def want(rev): | |
1428 | return rev in wanted |
|
1428 | return rev in wanted | |
1429 |
|
1429 | |||
1430 | it = iter(revs) |
|
1430 | it = iter(revs) | |
1431 | stopiteration = False |
|
1431 | stopiteration = False | |
1432 | for windowsize in increasingwindows(): |
|
1432 | for windowsize in increasingwindows(): | |
1433 | nrevs = [] |
|
1433 | nrevs = [] | |
1434 | for i in xrange(windowsize): |
|
1434 | for i in xrange(windowsize): | |
1435 | try: |
|
1435 | try: | |
1436 | rev = it.next() |
|
1436 | rev = it.next() | |
1437 | if want(rev): |
|
1437 | if want(rev): | |
1438 | nrevs.append(rev) |
|
1438 | nrevs.append(rev) | |
1439 | except (StopIteration): |
|
1439 | except (StopIteration): | |
1440 | stopiteration = True |
|
1440 | stopiteration = True | |
1441 | break |
|
1441 | break | |
1442 | for rev in sorted(nrevs): |
|
1442 | for rev in sorted(nrevs): | |
1443 | fns = fncache.get(rev) |
|
1443 | fns = fncache.get(rev) | |
1444 | ctx = change(rev) |
|
1444 | ctx = change(rev) | |
1445 | if not fns: |
|
1445 | if not fns: | |
1446 | def fns_generator(): |
|
1446 | def fns_generator(): | |
1447 | for f in ctx.files(): |
|
1447 | for f in ctx.files(): | |
1448 | if match(f): |
|
1448 | if match(f): | |
1449 | yield f |
|
1449 | yield f | |
1450 | fns = fns_generator() |
|
1450 | fns = fns_generator() | |
1451 | prepare(ctx, fns) |
|
1451 | prepare(ctx, fns) | |
1452 | for rev in nrevs: |
|
1452 | for rev in nrevs: | |
1453 | yield change(rev) |
|
1453 | yield change(rev) | |
1454 |
|
1454 | |||
1455 | if stopiteration: |
|
1455 | if stopiteration: | |
1456 | break |
|
1456 | break | |
1457 |
|
1457 | |||
1458 | return iterate() |
|
1458 | return iterate() | |
1459 |
|
1459 | |||
1460 | def _makelogfilematcher(repo, pats, followfirst): |
|
1460 | def _makelogfilematcher(repo, pats, followfirst): | |
1461 | # When displaying a revision with --patch --follow FILE, we have |
|
1461 | # When displaying a revision with --patch --follow FILE, we have | |
1462 | # to know which file of the revision must be diffed. With |
|
1462 | # to know which file of the revision must be diffed. With | |
1463 | # --follow, we want the names of the ancestors of FILE in the |
|
1463 | # --follow, we want the names of the ancestors of FILE in the | |
1464 | # revision, stored in "fcache". "fcache" is populated by |
|
1464 | # revision, stored in "fcache". "fcache" is populated by | |
1465 | # reproducing the graph traversal already done by --follow revset |
|
1465 | # reproducing the graph traversal already done by --follow revset | |
1466 | # and relating linkrevs to file names (which is not "correct" but |
|
1466 | # and relating linkrevs to file names (which is not "correct" but | |
1467 | # good enough). |
|
1467 | # good enough). | |
1468 | fcache = {} |
|
1468 | fcache = {} | |
1469 | fcacheready = [False] |
|
1469 | fcacheready = [False] | |
1470 | pctx = repo['.'] |
|
1470 | pctx = repo['.'] | |
1471 | wctx = repo[None] |
|
1471 | wctx = repo[None] | |
1472 |
|
1472 | |||
1473 | def populate(): |
|
1473 | def populate(): | |
1474 | for fn in pats: |
|
1474 | for fn in pats: | |
1475 | for i in ((pctx[fn],), pctx[fn].ancestors(followfirst=followfirst)): |
|
1475 | for i in ((pctx[fn],), pctx[fn].ancestors(followfirst=followfirst)): | |
1476 | for c in i: |
|
1476 | for c in i: | |
1477 | fcache.setdefault(c.linkrev(), set()).add(c.path()) |
|
1477 | fcache.setdefault(c.linkrev(), set()).add(c.path()) | |
1478 |
|
1478 | |||
1479 | def filematcher(rev): |
|
1479 | def filematcher(rev): | |
1480 | if not fcacheready[0]: |
|
1480 | if not fcacheready[0]: | |
1481 | # Lazy initialization |
|
1481 | # Lazy initialization | |
1482 | fcacheready[0] = True |
|
1482 | fcacheready[0] = True | |
1483 | populate() |
|
1483 | populate() | |
1484 | return scmutil.match(wctx, fcache.get(rev, []), default='path') |
|
1484 | return scmutil.match(wctx, fcache.get(rev, []), default='path') | |
1485 |
|
1485 | |||
1486 | return filematcher |
|
1486 | return filematcher | |
1487 |
|
1487 | |||
1488 | def _makelogrevset(repo, pats, opts, revs): |
|
1488 | def _makelogrevset(repo, pats, opts, revs): | |
1489 | """Return (expr, filematcher) where expr is a revset string built |
|
1489 | """Return (expr, filematcher) where expr is a revset string built | |
1490 | from log options and file patterns or None. If --stat or --patch |
|
1490 | from log options and file patterns or None. If --stat or --patch | |
1491 | are not passed filematcher is None. Otherwise it is a callable |
|
1491 | are not passed filematcher is None. Otherwise it is a callable | |
1492 | taking a revision number and returning a match objects filtering |
|
1492 | taking a revision number and returning a match objects filtering | |
1493 | the files to be detailed when displaying the revision. |
|
1493 | the files to be detailed when displaying the revision. | |
1494 | """ |
|
1494 | """ | |
1495 | opt2revset = { |
|
1495 | opt2revset = { | |
1496 | 'no_merges': ('not merge()', None), |
|
1496 | 'no_merges': ('not merge()', None), | |
1497 | 'only_merges': ('merge()', None), |
|
1497 | 'only_merges': ('merge()', None), | |
1498 | '_ancestors': ('ancestors(%(val)s)', None), |
|
1498 | '_ancestors': ('ancestors(%(val)s)', None), | |
1499 | '_fancestors': ('_firstancestors(%(val)s)', None), |
|
1499 | '_fancestors': ('_firstancestors(%(val)s)', None), | |
1500 | '_descendants': ('descendants(%(val)s)', None), |
|
1500 | '_descendants': ('descendants(%(val)s)', None), | |
1501 | '_fdescendants': ('_firstdescendants(%(val)s)', None), |
|
1501 | '_fdescendants': ('_firstdescendants(%(val)s)', None), | |
1502 | '_matchfiles': ('_matchfiles(%(val)s)', None), |
|
1502 | '_matchfiles': ('_matchfiles(%(val)s)', None), | |
1503 | 'date': ('date(%(val)r)', None), |
|
1503 | 'date': ('date(%(val)r)', None), | |
1504 | 'branch': ('branch(%(val)r)', ' or '), |
|
1504 | 'branch': ('branch(%(val)r)', ' or '), | |
1505 | '_patslog': ('filelog(%(val)r)', ' or '), |
|
1505 | '_patslog': ('filelog(%(val)r)', ' or '), | |
1506 | '_patsfollow': ('follow(%(val)r)', ' or '), |
|
1506 | '_patsfollow': ('follow(%(val)r)', ' or '), | |
1507 | '_patsfollowfirst': ('_followfirst(%(val)r)', ' or '), |
|
1507 | '_patsfollowfirst': ('_followfirst(%(val)r)', ' or '), | |
1508 | 'keyword': ('keyword(%(val)r)', ' or '), |
|
1508 | 'keyword': ('keyword(%(val)r)', ' or '), | |
1509 | 'prune': ('not (%(val)r or ancestors(%(val)r))', ' and '), |
|
1509 | 'prune': ('not (%(val)r or ancestors(%(val)r))', ' and '), | |
1510 | 'user': ('user(%(val)r)', ' or '), |
|
1510 | 'user': ('user(%(val)r)', ' or '), | |
1511 | } |
|
1511 | } | |
1512 |
|
1512 | |||
1513 | opts = dict(opts) |
|
1513 | opts = dict(opts) | |
1514 | # follow or not follow? |
|
1514 | # follow or not follow? | |
1515 | follow = opts.get('follow') or opts.get('follow_first') |
|
1515 | follow = opts.get('follow') or opts.get('follow_first') | |
1516 | followfirst = opts.get('follow_first') and 1 or 0 |
|
1516 | followfirst = opts.get('follow_first') and 1 or 0 | |
1517 | # --follow with FILE behaviour depends on revs... |
|
1517 | # --follow with FILE behaviour depends on revs... | |
1518 | it = iter(revs) |
|
1518 | it = iter(revs) | |
1519 | startrev = it.next() |
|
1519 | startrev = it.next() | |
1520 | try: |
|
1520 | try: | |
1521 | followdescendants = startrev < it.next() |
|
1521 | followdescendants = startrev < it.next() | |
1522 | except (StopIteration): |
|
1522 | except (StopIteration): | |
1523 | followdescendants = False |
|
1523 | followdescendants = False | |
1524 |
|
1524 | |||
1525 | # branch and only_branch are really aliases and must be handled at |
|
1525 | # branch and only_branch are really aliases and must be handled at | |
1526 | # the same time |
|
1526 | # the same time | |
1527 | opts['branch'] = opts.get('branch', []) + opts.get('only_branch', []) |
|
1527 | opts['branch'] = opts.get('branch', []) + opts.get('only_branch', []) | |
1528 | opts['branch'] = [repo.lookupbranch(b) for b in opts['branch']] |
|
1528 | opts['branch'] = [repo.lookupbranch(b) for b in opts['branch']] | |
1529 | # pats/include/exclude are passed to match.match() directly in |
|
1529 | # pats/include/exclude are passed to match.match() directly in | |
1530 | # _matchfiles() revset but walkchangerevs() builds its matcher with |
|
1530 | # _matchfiles() revset but walkchangerevs() builds its matcher with | |
1531 | # scmutil.match(). The difference is input pats are globbed on |
|
1531 | # scmutil.match(). The difference is input pats are globbed on | |
1532 | # platforms without shell expansion (windows). |
|
1532 | # platforms without shell expansion (windows). | |
1533 | pctx = repo[None] |
|
1533 | pctx = repo[None] | |
1534 | match, pats = scmutil.matchandpats(pctx, pats, opts) |
|
1534 | match, pats = scmutil.matchandpats(pctx, pats, opts) | |
1535 | slowpath = match.anypats() or (match.files() and opts.get('removed')) |
|
1535 | slowpath = match.anypats() or (match.files() and opts.get('removed')) | |
1536 | if not slowpath: |
|
1536 | if not slowpath: | |
1537 | for f in match.files(): |
|
1537 | for f in match.files(): | |
1538 | if follow and f not in pctx: |
|
1538 | if follow and f not in pctx: | |
1539 | raise util.Abort(_('cannot follow file not in parent ' |
|
1539 | raise util.Abort(_('cannot follow file not in parent ' | |
1540 | 'revision: "%s"') % f) |
|
1540 | 'revision: "%s"') % f) | |
1541 | filelog = repo.file(f) |
|
1541 | filelog = repo.file(f) | |
1542 | if not filelog: |
|
1542 | if not filelog: | |
1543 | # A zero count may be a directory or deleted file, so |
|
1543 | # A zero count may be a directory or deleted file, so | |
1544 | # try to find matching entries on the slow path. |
|
1544 | # try to find matching entries on the slow path. | |
1545 | if follow: |
|
1545 | if follow: | |
1546 | raise util.Abort( |
|
1546 | raise util.Abort( | |
1547 | _('cannot follow nonexistent file: "%s"') % f) |
|
1547 | _('cannot follow nonexistent file: "%s"') % f) | |
1548 | slowpath = True |
|
1548 | slowpath = True | |
1549 |
|
1549 | |||
1550 | # We decided to fall back to the slowpath because at least one |
|
1550 | # We decided to fall back to the slowpath because at least one | |
1551 | # of the paths was not a file. Check to see if at least one of them |
|
1551 | # of the paths was not a file. Check to see if at least one of them | |
1552 | # existed in history - in that case, we'll continue down the |
|
1552 | # existed in history - in that case, we'll continue down the | |
1553 | # slowpath; otherwise, we can turn off the slowpath |
|
1553 | # slowpath; otherwise, we can turn off the slowpath | |
1554 | if slowpath: |
|
1554 | if slowpath: | |
1555 | for path in match.files(): |
|
1555 | for path in match.files(): | |
1556 | if path == '.' or path in repo.store: |
|
1556 | if path == '.' or path in repo.store: | |
1557 | break |
|
1557 | break | |
1558 | else: |
|
1558 | else: | |
1559 | slowpath = False |
|
1559 | slowpath = False | |
1560 |
|
1560 | |||
1561 | if slowpath: |
|
1561 | if slowpath: | |
1562 | # See walkchangerevs() slow path. |
|
1562 | # See walkchangerevs() slow path. | |
1563 | # |
|
1563 | # | |
1564 | if follow: |
|
1564 | if follow: | |
1565 | raise util.Abort(_('can only follow copies/renames for explicit ' |
|
1565 | raise util.Abort(_('can only follow copies/renames for explicit ' | |
1566 | 'filenames')) |
|
1566 | 'filenames')) | |
1567 | # pats/include/exclude cannot be represented as separate |
|
1567 | # pats/include/exclude cannot be represented as separate | |
1568 | # revset expressions as their filtering logic applies at file |
|
1568 | # revset expressions as their filtering logic applies at file | |
1569 | # level. For instance "-I a -X a" matches a revision touching |
|
1569 | # level. For instance "-I a -X a" matches a revision touching | |
1570 | # "a" and "b" while "file(a) and not file(b)" does |
|
1570 | # "a" and "b" while "file(a) and not file(b)" does | |
1571 | # not. Besides, filesets are evaluated against the working |
|
1571 | # not. Besides, filesets are evaluated against the working | |
1572 | # directory. |
|
1572 | # directory. | |
1573 | matchargs = ['r:', 'd:relpath'] |
|
1573 | matchargs = ['r:', 'd:relpath'] | |
1574 | for p in pats: |
|
1574 | for p in pats: | |
1575 | matchargs.append('p:' + p) |
|
1575 | matchargs.append('p:' + p) | |
1576 | for p in opts.get('include', []): |
|
1576 | for p in opts.get('include', []): | |
1577 | matchargs.append('i:' + p) |
|
1577 | matchargs.append('i:' + p) | |
1578 | for p in opts.get('exclude', []): |
|
1578 | for p in opts.get('exclude', []): | |
1579 | matchargs.append('x:' + p) |
|
1579 | matchargs.append('x:' + p) | |
1580 | matchargs = ','.join(('%r' % p) for p in matchargs) |
|
1580 | matchargs = ','.join(('%r' % p) for p in matchargs) | |
1581 | opts['_matchfiles'] = matchargs |
|
1581 | opts['_matchfiles'] = matchargs | |
1582 | else: |
|
1582 | else: | |
1583 | if follow: |
|
1583 | if follow: | |
1584 | fpats = ('_patsfollow', '_patsfollowfirst') |
|
1584 | fpats = ('_patsfollow', '_patsfollowfirst') | |
1585 | fnopats = (('_ancestors', '_fancestors'), |
|
1585 | fnopats = (('_ancestors', '_fancestors'), | |
1586 | ('_descendants', '_fdescendants')) |
|
1586 | ('_descendants', '_fdescendants')) | |
1587 | if pats: |
|
1587 | if pats: | |
1588 | # follow() revset interprets its file argument as a |
|
1588 | # follow() revset interprets its file argument as a | |
1589 | # manifest entry, so use match.files(), not pats. |
|
1589 | # manifest entry, so use match.files(), not pats. | |
1590 | opts[fpats[followfirst]] = list(match.files()) |
|
1590 | opts[fpats[followfirst]] = list(match.files()) | |
1591 | else: |
|
1591 | else: | |
1592 | opts[fnopats[followdescendants][followfirst]] = str(startrev) |
|
1592 | opts[fnopats[followdescendants][followfirst]] = str(startrev) | |
1593 | else: |
|
1593 | else: | |
1594 | opts['_patslog'] = list(pats) |
|
1594 | opts['_patslog'] = list(pats) | |
1595 |
|
1595 | |||
1596 | filematcher = None |
|
1596 | filematcher = None | |
1597 | if opts.get('patch') or opts.get('stat'): |
|
1597 | if opts.get('patch') or opts.get('stat'): | |
1598 | if follow: |
|
1598 | if follow: | |
1599 | filematcher = _makelogfilematcher(repo, pats, followfirst) |
|
1599 | filematcher = _makelogfilematcher(repo, pats, followfirst) | |
1600 | else: |
|
1600 | else: | |
1601 | filematcher = lambda rev: match |
|
1601 | filematcher = lambda rev: match | |
1602 |
|
1602 | |||
1603 | expr = [] |
|
1603 | expr = [] | |
1604 | for op, val in opts.iteritems(): |
|
1604 | for op, val in opts.iteritems(): | |
1605 | if not val: |
|
1605 | if not val: | |
1606 | continue |
|
1606 | continue | |
1607 | if op not in opt2revset: |
|
1607 | if op not in opt2revset: | |
1608 | continue |
|
1608 | continue | |
1609 | revop, andor = opt2revset[op] |
|
1609 | revop, andor = opt2revset[op] | |
1610 | if '%(val)' not in revop: |
|
1610 | if '%(val)' not in revop: | |
1611 | expr.append(revop) |
|
1611 | expr.append(revop) | |
1612 | else: |
|
1612 | else: | |
1613 | if not isinstance(val, list): |
|
1613 | if not isinstance(val, list): | |
1614 | e = revop % {'val': val} |
|
1614 | e = revop % {'val': val} | |
1615 | else: |
|
1615 | else: | |
1616 | e = '(' + andor.join((revop % {'val': v}) for v in val) + ')' |
|
1616 | e = '(' + andor.join((revop % {'val': v}) for v in val) + ')' | |
1617 | expr.append(e) |
|
1617 | expr.append(e) | |
1618 |
|
1618 | |||
1619 | if expr: |
|
1619 | if expr: | |
1620 | expr = '(' + ' and '.join(expr) + ')' |
|
1620 | expr = '(' + ' and '.join(expr) + ')' | |
1621 | else: |
|
1621 | else: | |
1622 | expr = None |
|
1622 | expr = None | |
1623 | return expr, filematcher |
|
1623 | return expr, filematcher | |
1624 |
|
1624 | |||
1625 | def getgraphlogrevs(repo, pats, opts): |
|
1625 | def getgraphlogrevs(repo, pats, opts): | |
1626 | """Return (revs, expr, filematcher) where revs is an iterable of |
|
1626 | """Return (revs, expr, filematcher) where revs is an iterable of | |
1627 | revision numbers, expr is a revset string built from log options |
|
1627 | revision numbers, expr is a revset string built from log options | |
1628 | and file patterns or None, and used to filter 'revs'. If --stat or |
|
1628 | and file patterns or None, and used to filter 'revs'. If --stat or | |
1629 | --patch are not passed filematcher is None. Otherwise it is a |
|
1629 | --patch are not passed filematcher is None. Otherwise it is a | |
1630 | callable taking a revision number and returning a match objects |
|
1630 | callable taking a revision number and returning a match objects | |
1631 | filtering the files to be detailed when displaying the revision. |
|
1631 | filtering the files to be detailed when displaying the revision. | |
1632 | """ |
|
1632 | """ | |
1633 | if not len(repo): |
|
1633 | if not len(repo): | |
1634 | return [], None, None |
|
1634 | return [], None, None | |
1635 | limit = loglimit(opts) |
|
1635 | limit = loglimit(opts) | |
1636 | # Default --rev value depends on --follow but --follow behaviour |
|
1636 | # Default --rev value depends on --follow but --follow behaviour | |
1637 | # depends on revisions resolved from --rev... |
|
1637 | # depends on revisions resolved from --rev... | |
1638 | follow = opts.get('follow') or opts.get('follow_first') |
|
1638 | follow = opts.get('follow') or opts.get('follow_first') | |
1639 | possiblyunsorted = False # whether revs might need sorting |
|
1639 | possiblyunsorted = False # whether revs might need sorting | |
1640 | if opts.get('rev'): |
|
1640 | if opts.get('rev'): | |
1641 | revs = scmutil.revrange(repo, opts['rev']) |
|
1641 | revs = scmutil.revrange(repo, opts['rev']) | |
1642 | # Don't sort here because _makelogrevset might depend on the |
|
1642 | # Don't sort here because _makelogrevset might depend on the | |
1643 | # order of revs |
|
1643 | # order of revs | |
1644 | possiblyunsorted = True |
|
1644 | possiblyunsorted = True | |
1645 | else: |
|
1645 | else: | |
1646 | if follow and len(repo) > 0: |
|
1646 | if follow and len(repo) > 0: | |
1647 | revs = repo.revs('reverse(:.)') |
|
1647 | revs = repo.revs('reverse(:.)') | |
1648 | else: |
|
1648 | else: | |
1649 | revs = revset.spanset(repo) |
|
1649 | revs = revset.spanset(repo) | |
1650 | revs.reverse() |
|
1650 | revs.reverse() | |
1651 | if not revs: |
|
1651 | if not revs: | |
1652 | return revset.baseset(), None, None |
|
1652 | return revset.baseset(), None, None | |
1653 | expr, filematcher = _makelogrevset(repo, pats, opts, revs) |
|
1653 | expr, filematcher = _makelogrevset(repo, pats, opts, revs) | |
1654 | if possiblyunsorted: |
|
1654 | if possiblyunsorted: | |
1655 | revs.sort(reverse=True) |
|
1655 | revs.sort(reverse=True) | |
1656 | if expr: |
|
1656 | if expr: | |
1657 | # Revset matchers often operate faster on revisions in changelog |
|
1657 | # Revset matchers often operate faster on revisions in changelog | |
1658 | # order, because most filters deal with the changelog. |
|
1658 | # order, because most filters deal with the changelog. | |
1659 | revs.reverse() |
|
1659 | revs.reverse() | |
1660 | matcher = revset.match(repo.ui, expr) |
|
1660 | matcher = revset.match(repo.ui, expr) | |
1661 | # Revset matches can reorder revisions. "A or B" typically returns |
|
1661 | # Revset matches can reorder revisions. "A or B" typically returns | |
1662 | # returns the revision matching A then the revision matching B. Sort |
|
1662 | # returns the revision matching A then the revision matching B. Sort | |
1663 | # again to fix that. |
|
1663 | # again to fix that. | |
1664 | revs = matcher(repo, revs) |
|
1664 | revs = matcher(repo, revs) | |
1665 | revs.sort(reverse=True) |
|
1665 | revs.sort(reverse=True) | |
1666 | if limit is not None: |
|
1666 | if limit is not None: | |
1667 | limitedrevs = revset.baseset() |
|
1667 | limitedrevs = revset.baseset() | |
1668 | for idx, rev in enumerate(revs): |
|
1668 | for idx, rev in enumerate(revs): | |
1669 | if idx >= limit: |
|
1669 | if idx >= limit: | |
1670 | break |
|
1670 | break | |
1671 | limitedrevs.append(rev) |
|
1671 | limitedrevs.append(rev) | |
1672 | revs = limitedrevs |
|
1672 | revs = limitedrevs | |
1673 |
|
1673 | |||
1674 | return revs, expr, filematcher |
|
1674 | return revs, expr, filematcher | |
1675 |
|
1675 | |||
1676 | def getlogrevs(repo, pats, opts): |
|
1676 | def getlogrevs(repo, pats, opts): | |
1677 | """Return (revs, expr, filematcher) where revs is an iterable of |
|
1677 | """Return (revs, expr, filematcher) where revs is an iterable of | |
1678 | revision numbers, expr is a revset string built from log options |
|
1678 | revision numbers, expr is a revset string built from log options | |
1679 | and file patterns or None, and used to filter 'revs'. If --stat or |
|
1679 | and file patterns or None, and used to filter 'revs'. If --stat or | |
1680 | --patch are not passed filematcher is None. Otherwise it is a |
|
1680 | --patch are not passed filematcher is None. Otherwise it is a | |
1681 | callable taking a revision number and returning a match objects |
|
1681 | callable taking a revision number and returning a match objects | |
1682 | filtering the files to be detailed when displaying the revision. |
|
1682 | filtering the files to be detailed when displaying the revision. | |
1683 | """ |
|
1683 | """ | |
1684 | limit = loglimit(opts) |
|
1684 | limit = loglimit(opts) | |
1685 | # Default --rev value depends on --follow but --follow behaviour |
|
1685 | # Default --rev value depends on --follow but --follow behaviour | |
1686 | # depends on revisions resolved from --rev... |
|
1686 | # depends on revisions resolved from --rev... | |
1687 | follow = opts.get('follow') or opts.get('follow_first') |
|
1687 | follow = opts.get('follow') or opts.get('follow_first') | |
1688 | if opts.get('rev'): |
|
1688 | if opts.get('rev'): | |
1689 | revs = scmutil.revrange(repo, opts['rev']) |
|
1689 | revs = scmutil.revrange(repo, opts['rev']) | |
1690 | elif follow: |
|
1690 | elif follow: | |
1691 | revs = revset.baseset(repo.revs('reverse(:.)')) |
|
1691 | revs = revset.baseset(repo.revs('reverse(:.)')) | |
1692 | else: |
|
1692 | else: | |
1693 | revs = revset.spanset(repo) |
|
1693 | revs = revset.spanset(repo) | |
1694 | revs.reverse() |
|
1694 | revs.reverse() | |
1695 | if not revs: |
|
1695 | if not revs: | |
1696 | return revset.baseset([]), None, None |
|
1696 | return revset.baseset([]), None, None | |
1697 | expr, filematcher = _makelogrevset(repo, pats, opts, revs) |
|
1697 | expr, filematcher = _makelogrevset(repo, pats, opts, revs) | |
1698 | if expr: |
|
1698 | if expr: | |
1699 | # Revset matchers often operate faster on revisions in changelog |
|
1699 | # Revset matchers often operate faster on revisions in changelog | |
1700 | # order, because most filters deal with the changelog. |
|
1700 | # order, because most filters deal with the changelog. | |
1701 | if not opts.get('rev'): |
|
1701 | if not opts.get('rev'): | |
1702 | revs.reverse() |
|
1702 | revs.reverse() | |
1703 | matcher = revset.match(repo.ui, expr) |
|
1703 | matcher = revset.match(repo.ui, expr) | |
1704 | # Revset matches can reorder revisions. "A or B" typically returns |
|
1704 | # Revset matches can reorder revisions. "A or B" typically returns | |
1705 | # returns the revision matching A then the revision matching B. Sort |
|
1705 | # returns the revision matching A then the revision matching B. Sort | |
1706 | # again to fix that. |
|
1706 | # again to fix that. | |
1707 | revs = matcher(repo, revs) |
|
1707 | revs = matcher(repo, revs) | |
1708 | if not opts.get('rev'): |
|
1708 | if not opts.get('rev'): | |
1709 | revs.sort(reverse=True) |
|
1709 | revs.sort(reverse=True) | |
1710 | if limit is not None: |
|
1710 | if limit is not None: | |
1711 | count = 0 |
|
1711 | count = 0 | |
1712 | limitedrevs = revset.baseset([]) |
|
1712 | limitedrevs = revset.baseset([]) | |
1713 | it = iter(revs) |
|
1713 | it = iter(revs) | |
1714 | while count < limit: |
|
1714 | while count < limit: | |
1715 | try: |
|
1715 | try: | |
1716 | limitedrevs.append(it.next()) |
|
1716 | limitedrevs.append(it.next()) | |
1717 | except (StopIteration): |
|
1717 | except (StopIteration): | |
1718 | break |
|
1718 | break | |
1719 | count += 1 |
|
1719 | count += 1 | |
1720 | revs = limitedrevs |
|
1720 | revs = limitedrevs | |
1721 |
|
1721 | |||
1722 | return revs, expr, filematcher |
|
1722 | return revs, expr, filematcher | |
1723 |
|
1723 | |||
1724 | def displaygraph(ui, dag, displayer, showparents, edgefn, getrenamed=None, |
|
1724 | def displaygraph(ui, dag, displayer, showparents, edgefn, getrenamed=None, | |
1725 | filematcher=None): |
|
1725 | filematcher=None): | |
1726 | seen, state = [], graphmod.asciistate() |
|
1726 | seen, state = [], graphmod.asciistate() | |
1727 | for rev, type, ctx, parents in dag: |
|
1727 | for rev, type, ctx, parents in dag: | |
1728 | char = 'o' |
|
1728 | char = 'o' | |
1729 | if ctx.node() in showparents: |
|
1729 | if ctx.node() in showparents: | |
1730 | char = '@' |
|
1730 | char = '@' | |
1731 | elif ctx.obsolete(): |
|
1731 | elif ctx.obsolete(): | |
1732 | char = 'x' |
|
1732 | char = 'x' | |
1733 | copies = None |
|
1733 | copies = None | |
1734 | if getrenamed and ctx.rev(): |
|
1734 | if getrenamed and ctx.rev(): | |
1735 | copies = [] |
|
1735 | copies = [] | |
1736 | for fn in ctx.files(): |
|
1736 | for fn in ctx.files(): | |
1737 | rename = getrenamed(fn, ctx.rev()) |
|
1737 | rename = getrenamed(fn, ctx.rev()) | |
1738 | if rename: |
|
1738 | if rename: | |
1739 | copies.append((fn, rename[0])) |
|
1739 | copies.append((fn, rename[0])) | |
1740 | revmatchfn = None |
|
1740 | revmatchfn = None | |
1741 | if filematcher is not None: |
|
1741 | if filematcher is not None: | |
1742 | revmatchfn = filematcher(ctx.rev()) |
|
1742 | revmatchfn = filematcher(ctx.rev()) | |
1743 | displayer.show(ctx, copies=copies, matchfn=revmatchfn) |
|
1743 | displayer.show(ctx, copies=copies, matchfn=revmatchfn) | |
1744 | lines = displayer.hunk.pop(rev).split('\n') |
|
1744 | lines = displayer.hunk.pop(rev).split('\n') | |
1745 | if not lines[-1]: |
|
1745 | if not lines[-1]: | |
1746 | del lines[-1] |
|
1746 | del lines[-1] | |
1747 | displayer.flush(rev) |
|
1747 | displayer.flush(rev) | |
1748 | edges = edgefn(type, char, lines, seen, rev, parents) |
|
1748 | edges = edgefn(type, char, lines, seen, rev, parents) | |
1749 | for type, char, lines, coldata in edges: |
|
1749 | for type, char, lines, coldata in edges: | |
1750 | graphmod.ascii(ui, state, type, char, lines, coldata) |
|
1750 | graphmod.ascii(ui, state, type, char, lines, coldata) | |
1751 | displayer.close() |
|
1751 | displayer.close() | |
1752 |
|
1752 | |||
1753 | def graphlog(ui, repo, *pats, **opts): |
|
1753 | def graphlog(ui, repo, *pats, **opts): | |
1754 | # Parameters are identical to log command ones |
|
1754 | # Parameters are identical to log command ones | |
1755 | revs, expr, filematcher = getgraphlogrevs(repo, pats, opts) |
|
1755 | revs, expr, filematcher = getgraphlogrevs(repo, pats, opts) | |
1756 | revdag = graphmod.dagwalker(repo, revs) |
|
1756 | revdag = graphmod.dagwalker(repo, revs) | |
1757 |
|
1757 | |||
1758 | getrenamed = None |
|
1758 | getrenamed = None | |
1759 | if opts.get('copies'): |
|
1759 | if opts.get('copies'): | |
1760 | endrev = None |
|
1760 | endrev = None | |
1761 | if opts.get('rev'): |
|
1761 | if opts.get('rev'): | |
1762 | endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1 |
|
1762 | endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1 | |
1763 | getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) |
|
1763 | getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) | |
1764 | displayer = show_changeset(ui, repo, opts, buffered=True) |
|
1764 | displayer = show_changeset(ui, repo, opts, buffered=True) | |
1765 | showparents = [ctx.node() for ctx in repo[None].parents()] |
|
1765 | showparents = [ctx.node() for ctx in repo[None].parents()] | |
1766 | displaygraph(ui, revdag, displayer, showparents, |
|
1766 | displaygraph(ui, revdag, displayer, showparents, | |
1767 | graphmod.asciiedges, getrenamed, filematcher) |
|
1767 | graphmod.asciiedges, getrenamed, filematcher) | |
1768 |
|
1768 | |||
1769 | def checkunsupportedgraphflags(pats, opts): |
|
1769 | def checkunsupportedgraphflags(pats, opts): | |
1770 | for op in ["newest_first"]: |
|
1770 | for op in ["newest_first"]: | |
1771 | if op in opts and opts[op]: |
|
1771 | if op in opts and opts[op]: | |
1772 | raise util.Abort(_("-G/--graph option is incompatible with --%s") |
|
1772 | raise util.Abort(_("-G/--graph option is incompatible with --%s") | |
1773 | % op.replace("_", "-")) |
|
1773 | % op.replace("_", "-")) | |
1774 |
|
1774 | |||
1775 | def graphrevs(repo, nodes, opts): |
|
1775 | def graphrevs(repo, nodes, opts): | |
1776 | limit = loglimit(opts) |
|
1776 | limit = loglimit(opts) | |
1777 | nodes.reverse() |
|
1777 | nodes.reverse() | |
1778 | if limit is not None: |
|
1778 | if limit is not None: | |
1779 | nodes = nodes[:limit] |
|
1779 | nodes = nodes[:limit] | |
1780 | return graphmod.nodes(repo, nodes) |
|
1780 | return graphmod.nodes(repo, nodes) | |
1781 |
|
1781 | |||
1782 | def add(ui, repo, match, dryrun, listsubrepos, prefix, explicitonly): |
|
1782 | def add(ui, repo, match, dryrun, listsubrepos, prefix, explicitonly): | |
1783 | join = lambda f: os.path.join(prefix, f) |
|
1783 | join = lambda f: os.path.join(prefix, f) | |
1784 | bad = [] |
|
1784 | bad = [] | |
1785 | oldbad = match.bad |
|
1785 | oldbad = match.bad | |
1786 | match.bad = lambda x, y: bad.append(x) or oldbad(x, y) |
|
1786 | match.bad = lambda x, y: bad.append(x) or oldbad(x, y) | |
1787 | names = [] |
|
1787 | names = [] | |
1788 | wctx = repo[None] |
|
1788 | wctx = repo[None] | |
1789 | cca = None |
|
1789 | cca = None | |
1790 | abort, warn = scmutil.checkportabilityalert(ui) |
|
1790 | abort, warn = scmutil.checkportabilityalert(ui) | |
1791 | if abort or warn: |
|
1791 | if abort or warn: | |
1792 | cca = scmutil.casecollisionauditor(ui, abort, repo.dirstate) |
|
1792 | cca = scmutil.casecollisionauditor(ui, abort, repo.dirstate) | |
1793 | for f in repo.walk(match): |
|
1793 | for f in repo.walk(match): | |
1794 | exact = match.exact(f) |
|
1794 | exact = match.exact(f) | |
1795 | if exact or not explicitonly and f not in repo.dirstate: |
|
1795 | if exact or not explicitonly and f not in repo.dirstate: | |
1796 | if cca: |
|
1796 | if cca: | |
1797 | cca(f) |
|
1797 | cca(f) | |
1798 | names.append(f) |
|
1798 | names.append(f) | |
1799 | if ui.verbose or not exact: |
|
1799 | if ui.verbose or not exact: | |
1800 | ui.status(_('adding %s\n') % match.rel(join(f))) |
|
1800 | ui.status(_('adding %s\n') % match.rel(join(f))) | |
1801 |
|
1801 | |||
1802 | for subpath in sorted(wctx.substate): |
|
1802 | for subpath in sorted(wctx.substate): | |
1803 | sub = wctx.sub(subpath) |
|
1803 | sub = wctx.sub(subpath) | |
1804 | try: |
|
1804 | try: | |
1805 | submatch = matchmod.narrowmatcher(subpath, match) |
|
1805 | submatch = matchmod.narrowmatcher(subpath, match) | |
1806 | if listsubrepos: |
|
1806 | if listsubrepos: | |
1807 | bad.extend(sub.add(ui, submatch, dryrun, listsubrepos, prefix, |
|
1807 | bad.extend(sub.add(ui, submatch, dryrun, listsubrepos, prefix, | |
1808 | False)) |
|
1808 | False)) | |
1809 | else: |
|
1809 | else: | |
1810 | bad.extend(sub.add(ui, submatch, dryrun, listsubrepos, prefix, |
|
1810 | bad.extend(sub.add(ui, submatch, dryrun, listsubrepos, prefix, | |
1811 | True)) |
|
1811 | True)) | |
1812 | except error.LookupError: |
|
1812 | except error.LookupError: | |
1813 | ui.status(_("skipping missing subrepository: %s\n") |
|
1813 | ui.status(_("skipping missing subrepository: %s\n") | |
1814 | % join(subpath)) |
|
1814 | % join(subpath)) | |
1815 |
|
1815 | |||
1816 | if not dryrun: |
|
1816 | if not dryrun: | |
1817 | rejected = wctx.add(names, prefix) |
|
1817 | rejected = wctx.add(names, prefix) | |
1818 | bad.extend(f for f in rejected if f in match.files()) |
|
1818 | bad.extend(f for f in rejected if f in match.files()) | |
1819 | return bad |
|
1819 | return bad | |
1820 |
|
1820 | |||
1821 | def forget(ui, repo, match, prefix, explicitonly): |
|
1821 | def forget(ui, repo, match, prefix, explicitonly): | |
1822 | join = lambda f: os.path.join(prefix, f) |
|
1822 | join = lambda f: os.path.join(prefix, f) | |
1823 | bad = [] |
|
1823 | bad = [] | |
1824 | oldbad = match.bad |
|
1824 | oldbad = match.bad | |
1825 | match.bad = lambda x, y: bad.append(x) or oldbad(x, y) |
|
1825 | match.bad = lambda x, y: bad.append(x) or oldbad(x, y) | |
1826 | wctx = repo[None] |
|
1826 | wctx = repo[None] | |
1827 | forgot = [] |
|
1827 | forgot = [] | |
1828 | s = repo.status(match=match, clean=True) |
|
1828 | s = repo.status(match=match, clean=True) | |
1829 | forget = sorted(s[0] + s[1] + s[3] + s[6]) |
|
1829 | forget = sorted(s[0] + s[1] + s[3] + s[6]) | |
1830 | if explicitonly: |
|
1830 | if explicitonly: | |
1831 | forget = [f for f in forget if match.exact(f)] |
|
1831 | forget = [f for f in forget if match.exact(f)] | |
1832 |
|
1832 | |||
1833 | for subpath in sorted(wctx.substate): |
|
1833 | for subpath in sorted(wctx.substate): | |
1834 | sub = wctx.sub(subpath) |
|
1834 | sub = wctx.sub(subpath) | |
1835 | try: |
|
1835 | try: | |
1836 | submatch = matchmod.narrowmatcher(subpath, match) |
|
1836 | submatch = matchmod.narrowmatcher(subpath, match) | |
1837 | subbad, subforgot = sub.forget(ui, submatch, prefix) |
|
1837 | subbad, subforgot = sub.forget(ui, submatch, prefix) | |
1838 | bad.extend([subpath + '/' + f for f in subbad]) |
|
1838 | bad.extend([subpath + '/' + f for f in subbad]) | |
1839 | forgot.extend([subpath + '/' + f for f in subforgot]) |
|
1839 | forgot.extend([subpath + '/' + f for f in subforgot]) | |
1840 | except error.LookupError: |
|
1840 | except error.LookupError: | |
1841 | ui.status(_("skipping missing subrepository: %s\n") |
|
1841 | ui.status(_("skipping missing subrepository: %s\n") | |
1842 | % join(subpath)) |
|
1842 | % join(subpath)) | |
1843 |
|
1843 | |||
1844 | if not explicitonly: |
|
1844 | if not explicitonly: | |
1845 | for f in match.files(): |
|
1845 | for f in match.files(): | |
1846 | if f not in repo.dirstate and not os.path.isdir(match.rel(join(f))): |
|
1846 | if f not in repo.dirstate and not os.path.isdir(match.rel(join(f))): | |
1847 | if f not in forgot: |
|
1847 | if f not in forgot: | |
1848 | if os.path.exists(match.rel(join(f))): |
|
1848 | if os.path.exists(match.rel(join(f))): | |
1849 | ui.warn(_('not removing %s: ' |
|
1849 | ui.warn(_('not removing %s: ' | |
1850 | 'file is already untracked\n') |
|
1850 | 'file is already untracked\n') | |
1851 | % match.rel(join(f))) |
|
1851 | % match.rel(join(f))) | |
1852 | bad.append(f) |
|
1852 | bad.append(f) | |
1853 |
|
1853 | |||
1854 | for f in forget: |
|
1854 | for f in forget: | |
1855 | if ui.verbose or not match.exact(f): |
|
1855 | if ui.verbose or not match.exact(f): | |
1856 | ui.status(_('removing %s\n') % match.rel(join(f))) |
|
1856 | ui.status(_('removing %s\n') % match.rel(join(f))) | |
1857 |
|
1857 | |||
1858 | rejected = wctx.forget(forget, prefix) |
|
1858 | rejected = wctx.forget(forget, prefix) | |
1859 | bad.extend(f for f in rejected if f in match.files()) |
|
1859 | bad.extend(f for f in rejected if f in match.files()) | |
1860 | forgot.extend(forget) |
|
1860 | forgot.extend(forget) | |
1861 | return bad, forgot |
|
1861 | return bad, forgot | |
1862 |
|
1862 | |||
1863 | def cat(ui, repo, ctx, matcher, prefix, **opts): |
|
1863 | def cat(ui, repo, ctx, matcher, prefix, **opts): | |
1864 | err = 1 |
|
1864 | err = 1 | |
1865 |
|
1865 | |||
1866 | def write(path): |
|
1866 | def write(path): | |
1867 | fp = makefileobj(repo, opts.get('output'), ctx.node(), |
|
1867 | fp = makefileobj(repo, opts.get('output'), ctx.node(), | |
1868 | pathname=os.path.join(prefix, path)) |
|
1868 | pathname=os.path.join(prefix, path)) | |
1869 | data = ctx[path].data() |
|
1869 | data = ctx[path].data() | |
1870 | if opts.get('decode'): |
|
1870 | if opts.get('decode'): | |
1871 | data = repo.wwritedata(path, data) |
|
1871 | data = repo.wwritedata(path, data) | |
1872 | fp.write(data) |
|
1872 | fp.write(data) | |
1873 | fp.close() |
|
1873 | fp.close() | |
1874 |
|
1874 | |||
1875 | # Automation often uses hg cat on single files, so special case it |
|
1875 | # Automation often uses hg cat on single files, so special case it | |
1876 | # for performance to avoid the cost of parsing the manifest. |
|
1876 | # for performance to avoid the cost of parsing the manifest. | |
1877 | if len(matcher.files()) == 1 and not matcher.anypats(): |
|
1877 | if len(matcher.files()) == 1 and not matcher.anypats(): | |
1878 | file = matcher.files()[0] |
|
1878 | file = matcher.files()[0] | |
1879 | mf = repo.manifest |
|
1879 | mf = repo.manifest | |
1880 | mfnode = ctx._changeset[0] |
|
1880 | mfnode = ctx._changeset[0] | |
1881 | if mf.find(mfnode, file)[0]: |
|
1881 | if mf.find(mfnode, file)[0]: | |
1882 | write(file) |
|
1882 | write(file) | |
1883 | return 0 |
|
1883 | return 0 | |
1884 |
|
1884 | |||
1885 | # Don't warn about "missing" files that are really in subrepos |
|
1885 | # Don't warn about "missing" files that are really in subrepos | |
1886 | bad = matcher.bad |
|
1886 | bad = matcher.bad | |
1887 |
|
1887 | |||
1888 | def badfn(path, msg): |
|
1888 | def badfn(path, msg): | |
1889 | for subpath in ctx.substate: |
|
1889 | for subpath in ctx.substate: | |
1890 | if path.startswith(subpath): |
|
1890 | if path.startswith(subpath): | |
1891 | return |
|
1891 | return | |
1892 | bad(path, msg) |
|
1892 | bad(path, msg) | |
1893 |
|
1893 | |||
1894 | matcher.bad = badfn |
|
1894 | matcher.bad = badfn | |
1895 |
|
1895 | |||
1896 | for abs in ctx.walk(matcher): |
|
1896 | for abs in ctx.walk(matcher): | |
1897 | write(abs) |
|
1897 | write(abs) | |
1898 | err = 0 |
|
1898 | err = 0 | |
1899 |
|
1899 | |||
1900 | matcher.bad = bad |
|
1900 | matcher.bad = bad | |
1901 |
|
1901 | |||
1902 | for subpath in sorted(ctx.substate): |
|
1902 | for subpath in sorted(ctx.substate): | |
1903 | sub = ctx.sub(subpath) |
|
1903 | sub = ctx.sub(subpath) | |
1904 | try: |
|
1904 | try: | |
1905 | submatch = matchmod.narrowmatcher(subpath, matcher) |
|
1905 | submatch = matchmod.narrowmatcher(subpath, matcher) | |
1906 |
|
1906 | |||
1907 | if not sub.cat(ui, submatch, os.path.join(prefix, sub._path), |
|
1907 | if not sub.cat(ui, submatch, os.path.join(prefix, sub._path), | |
1908 | **opts): |
|
1908 | **opts): | |
1909 | err = 0 |
|
1909 | err = 0 | |
1910 | except error.RepoLookupError: |
|
1910 | except error.RepoLookupError: | |
1911 | ui.status(_("skipping missing subrepository: %s\n") |
|
1911 | ui.status(_("skipping missing subrepository: %s\n") | |
1912 | % os.path.join(prefix, subpath)) |
|
1912 | % os.path.join(prefix, subpath)) | |
1913 |
|
1913 | |||
1914 | return err |
|
1914 | return err | |
1915 |
|
1915 | |||
1916 | def duplicatecopies(repo, rev, fromrev): |
|
1916 | def duplicatecopies(repo, rev, fromrev): | |
1917 | '''reproduce copies from fromrev to rev in the dirstate''' |
|
1917 | '''reproduce copies from fromrev to rev in the dirstate''' | |
1918 | for dst, src in copies.pathcopies(repo[fromrev], repo[rev]).iteritems(): |
|
1918 | for dst, src in copies.pathcopies(repo[fromrev], repo[rev]).iteritems(): | |
1919 | # copies.pathcopies returns backward renames, so dst might not |
|
1919 | # copies.pathcopies returns backward renames, so dst might not | |
1920 | # actually be in the dirstate |
|
1920 | # actually be in the dirstate | |
1921 | if repo.dirstate[dst] in "nma": |
|
1921 | if repo.dirstate[dst] in "nma": | |
1922 | repo.dirstate.copy(src, dst) |
|
1922 | repo.dirstate.copy(src, dst) | |
1923 |
|
1923 | |||
1924 | def commit(ui, repo, commitfunc, pats, opts): |
|
1924 | def commit(ui, repo, commitfunc, pats, opts): | |
1925 | '''commit the specified files or all outstanding changes''' |
|
1925 | '''commit the specified files or all outstanding changes''' | |
1926 | date = opts.get('date') |
|
1926 | date = opts.get('date') | |
1927 | if date: |
|
1927 | if date: | |
1928 | opts['date'] = util.parsedate(date) |
|
1928 | opts['date'] = util.parsedate(date) | |
1929 | message = logmessage(ui, opts) |
|
1929 | message = logmessage(ui, opts) | |
1930 |
|
1930 | |||
1931 | # extract addremove carefully -- this function can be called from a command |
|
1931 | # extract addremove carefully -- this function can be called from a command | |
1932 | # that doesn't support addremove |
|
1932 | # that doesn't support addremove | |
1933 | if opts.get('addremove'): |
|
1933 | if opts.get('addremove'): | |
1934 | scmutil.addremove(repo, pats, opts) |
|
1934 | scmutil.addremove(repo, pats, opts) | |
1935 |
|
1935 | |||
1936 | return commitfunc(ui, repo, message, |
|
1936 | return commitfunc(ui, repo, message, | |
1937 | scmutil.match(repo[None], pats, opts), opts) |
|
1937 | scmutil.match(repo[None], pats, opts), opts) | |
1938 |
|
1938 | |||
1939 | def amend(ui, repo, commitfunc, old, extra, pats, opts): |
|
1939 | def amend(ui, repo, commitfunc, old, extra, pats, opts): | |
1940 | ui.note(_('amending changeset %s\n') % old) |
|
1940 | ui.note(_('amending changeset %s\n') % old) | |
1941 | base = old.p1() |
|
1941 | base = old.p1() | |
1942 |
|
1942 | |||
1943 | wlock = lock = newid = None |
|
1943 | wlock = lock = newid = None | |
1944 | try: |
|
1944 | try: | |
1945 | wlock = repo.wlock() |
|
1945 | wlock = repo.wlock() | |
1946 | lock = repo.lock() |
|
1946 | lock = repo.lock() | |
1947 | tr = repo.transaction('amend') |
|
1947 | tr = repo.transaction('amend') | |
1948 | try: |
|
1948 | try: | |
1949 | # See if we got a message from -m or -l, if not, open the editor |
|
1949 | # See if we got a message from -m or -l, if not, open the editor | |
1950 | # with the message of the changeset to amend |
|
1950 | # with the message of the changeset to amend | |
1951 | message = logmessage(ui, opts) |
|
1951 | message = logmessage(ui, opts) | |
1952 | # ensure logfile does not conflict with later enforcement of the |
|
1952 | # ensure logfile does not conflict with later enforcement of the | |
1953 | # message. potential logfile content has been processed by |
|
1953 | # message. potential logfile content has been processed by | |
1954 | # `logmessage` anyway. |
|
1954 | # `logmessage` anyway. | |
1955 | opts.pop('logfile') |
|
1955 | opts.pop('logfile') | |
1956 | # First, do a regular commit to record all changes in the working |
|
1956 | # First, do a regular commit to record all changes in the working | |
1957 | # directory (if there are any) |
|
1957 | # directory (if there are any) | |
1958 | ui.callhooks = False |
|
1958 | ui.callhooks = False | |
1959 | currentbookmark = repo._bookmarkcurrent |
|
1959 | currentbookmark = repo._bookmarkcurrent | |
1960 | try: |
|
1960 | try: | |
1961 | repo._bookmarkcurrent = None |
|
1961 | repo._bookmarkcurrent = None | |
1962 | opts['message'] = 'temporary amend commit for %s' % old |
|
1962 | opts['message'] = 'temporary amend commit for %s' % old | |
1963 | node = commit(ui, repo, commitfunc, pats, opts) |
|
1963 | node = commit(ui, repo, commitfunc, pats, opts) | |
1964 | finally: |
|
1964 | finally: | |
1965 | repo._bookmarkcurrent = currentbookmark |
|
1965 | repo._bookmarkcurrent = currentbookmark | |
1966 | ui.callhooks = True |
|
1966 | ui.callhooks = True | |
1967 | ctx = repo[node] |
|
1967 | ctx = repo[node] | |
1968 |
|
1968 | |||
1969 | # Participating changesets: |
|
1969 | # Participating changesets: | |
1970 | # |
|
1970 | # | |
1971 | # node/ctx o - new (intermediate) commit that contains changes |
|
1971 | # node/ctx o - new (intermediate) commit that contains changes | |
1972 | # | from working dir to go into amending commit |
|
1972 | # | from working dir to go into amending commit | |
1973 | # | (or a workingctx if there were no changes) |
|
1973 | # | (or a workingctx if there were no changes) | |
1974 | # | |
|
1974 | # | | |
1975 | # old o - changeset to amend |
|
1975 | # old o - changeset to amend | |
1976 | # | |
|
1976 | # | | |
1977 | # base o - parent of amending changeset |
|
1977 | # base o - parent of amending changeset | |
1978 |
|
1978 | |||
1979 | # Update extra dict from amended commit (e.g. to preserve graft |
|
1979 | # Update extra dict from amended commit (e.g. to preserve graft | |
1980 | # source) |
|
1980 | # source) | |
1981 | extra.update(old.extra()) |
|
1981 | extra.update(old.extra()) | |
1982 |
|
1982 | |||
1983 | # Also update it from the intermediate commit or from the wctx |
|
1983 | # Also update it from the intermediate commit or from the wctx | |
1984 | extra.update(ctx.extra()) |
|
1984 | extra.update(ctx.extra()) | |
1985 |
|
1985 | |||
1986 | if len(old.parents()) > 1: |
|
1986 | if len(old.parents()) > 1: | |
1987 | # ctx.files() isn't reliable for merges, so fall back to the |
|
1987 | # ctx.files() isn't reliable for merges, so fall back to the | |
1988 | # slower repo.status() method |
|
1988 | # slower repo.status() method | |
1989 | files = set([fn for st in repo.status(base, old)[:3] |
|
1989 | files = set([fn for st in repo.status(base, old)[:3] | |
1990 | for fn in st]) |
|
1990 | for fn in st]) | |
1991 | else: |
|
1991 | else: | |
1992 | files = set(old.files()) |
|
1992 | files = set(old.files()) | |
1993 |
|
1993 | |||
1994 | # Second, we use either the commit we just did, or if there were no |
|
1994 | # Second, we use either the commit we just did, or if there were no | |
1995 | # changes the parent of the working directory as the version of the |
|
1995 | # changes the parent of the working directory as the version of the | |
1996 | # files in the final amend commit |
|
1996 | # files in the final amend commit | |
1997 | if node: |
|
1997 | if node: | |
1998 | ui.note(_('copying changeset %s to %s\n') % (ctx, base)) |
|
1998 | ui.note(_('copying changeset %s to %s\n') % (ctx, base)) | |
1999 |
|
1999 | |||
2000 | user = ctx.user() |
|
2000 | user = ctx.user() | |
2001 | date = ctx.date() |
|
2001 | date = ctx.date() | |
2002 | # Recompute copies (avoid recording a -> b -> a) |
|
2002 | # Recompute copies (avoid recording a -> b -> a) | |
2003 | copied = copies.pathcopies(base, ctx) |
|
2003 | copied = copies.pathcopies(base, ctx) | |
2004 |
|
2004 | |||
2005 | # Prune files which were reverted by the updates: if old |
|
2005 | # Prune files which were reverted by the updates: if old | |
2006 | # introduced file X and our intermediate commit, node, |
|
2006 | # introduced file X and our intermediate commit, node, | |
2007 | # renamed that file, then those two files are the same and |
|
2007 | # renamed that file, then those two files are the same and | |
2008 | # we can discard X from our list of files. Likewise if X |
|
2008 | # we can discard X from our list of files. Likewise if X | |
2009 | # was deleted, it's no longer relevant |
|
2009 | # was deleted, it's no longer relevant | |
2010 | files.update(ctx.files()) |
|
2010 | files.update(ctx.files()) | |
2011 |
|
2011 | |||
2012 | def samefile(f): |
|
2012 | def samefile(f): | |
2013 | if f in ctx.manifest(): |
|
2013 | if f in ctx.manifest(): | |
2014 | a = ctx.filectx(f) |
|
2014 | a = ctx.filectx(f) | |
2015 | if f in base.manifest(): |
|
2015 | if f in base.manifest(): | |
2016 | b = base.filectx(f) |
|
2016 | b = base.filectx(f) | |
2017 | return (not a.cmp(b) |
|
2017 | return (not a.cmp(b) | |
2018 | and a.flags() == b.flags()) |
|
2018 | and a.flags() == b.flags()) | |
2019 | else: |
|
2019 | else: | |
2020 | return False |
|
2020 | return False | |
2021 | else: |
|
2021 | else: | |
2022 | return f not in base.manifest() |
|
2022 | return f not in base.manifest() | |
2023 | files = [f for f in files if not samefile(f)] |
|
2023 | files = [f for f in files if not samefile(f)] | |
2024 |
|
2024 | |||
2025 | def filectxfn(repo, ctx_, path): |
|
2025 | def filectxfn(repo, ctx_, path): | |
2026 | try: |
|
2026 | try: | |
2027 | fctx = ctx[path] |
|
2027 | fctx = ctx[path] | |
2028 | flags = fctx.flags() |
|
2028 | flags = fctx.flags() | |
2029 | mctx = context.memfilectx(fctx.path(), fctx.data(), |
|
2029 | mctx = context.memfilectx(fctx.path(), fctx.data(), | |
2030 | islink='l' in flags, |
|
2030 | islink='l' in flags, | |
2031 | isexec='x' in flags, |
|
2031 | isexec='x' in flags, | |
2032 | copied=copied.get(path)) |
|
2032 | copied=copied.get(path)) | |
2033 | return mctx |
|
2033 | return mctx | |
2034 | except KeyError: |
|
2034 | except KeyError: | |
2035 | raise IOError |
|
2035 | raise IOError | |
2036 | else: |
|
2036 | else: | |
2037 | ui.note(_('copying changeset %s to %s\n') % (old, base)) |
|
2037 | ui.note(_('copying changeset %s to %s\n') % (old, base)) | |
2038 |
|
2038 | |||
2039 | # Use version of files as in the old cset |
|
2039 | # Use version of files as in the old cset | |
2040 | def filectxfn(repo, ctx_, path): |
|
2040 | def filectxfn(repo, ctx_, path): | |
2041 | try: |
|
2041 | try: | |
2042 | return old.filectx(path) |
|
2042 | return old.filectx(path) | |
2043 | except KeyError: |
|
2043 | except KeyError: | |
2044 | raise IOError |
|
2044 | raise IOError | |
2045 |
|
2045 | |||
2046 | user = opts.get('user') or old.user() |
|
2046 | user = opts.get('user') or old.user() | |
2047 | date = opts.get('date') or old.date() |
|
2047 | date = opts.get('date') or old.date() | |
2048 |
edit |
|
2048 | editor = commiteditor | |
2049 | if not message: |
|
2049 | if not message: | |
2050 |
edit |
|
2050 | editor = commitforceeditor | |
2051 | message = old.description() |
|
2051 | message = old.description() | |
2052 | elif opts.get('edit'): |
|
2052 | elif opts.get('edit'): | |
2053 |
edit |
|
2053 | editor = commitforceeditor | |
2054 |
|
2054 | |||
2055 | pureextra = extra.copy() |
|
2055 | pureextra = extra.copy() | |
2056 | extra['amend_source'] = old.hex() |
|
2056 | extra['amend_source'] = old.hex() | |
2057 |
|
2057 | |||
2058 | new = context.memctx(repo, |
|
2058 | new = context.memctx(repo, | |
2059 | parents=[base.node(), old.p2().node()], |
|
2059 | parents=[base.node(), old.p2().node()], | |
2060 | text=message, |
|
2060 | text=message, | |
2061 | files=files, |
|
2061 | files=files, | |
2062 | filectxfn=filectxfn, |
|
2062 | filectxfn=filectxfn, | |
2063 | user=user, |
|
2063 | user=user, | |
2064 | date=date, |
|
2064 | date=date, | |
2065 |
extra=extra |
|
2065 | extra=extra, | |
2066 | if editmsg: |
|
2066 | editor=editor) | |
2067 | new._text = commitforceeditor(repo, new, []) |
|
|||
2068 | repo.savecommitmessage(new.description()) |
|
|||
2069 |
|
2067 | |||
2070 | newdesc = changelog.stripdesc(new.description()) |
|
2068 | newdesc = changelog.stripdesc(new.description()) | |
2071 | if ((not node) |
|
2069 | if ((not node) | |
2072 | and newdesc == old.description() |
|
2070 | and newdesc == old.description() | |
2073 | and user == old.user() |
|
2071 | and user == old.user() | |
2074 | and date == old.date() |
|
2072 | and date == old.date() | |
2075 | and pureextra == old.extra()): |
|
2073 | and pureextra == old.extra()): | |
2076 | # nothing changed. continuing here would create a new node |
|
2074 | # nothing changed. continuing here would create a new node | |
2077 | # anyway because of the amend_source noise. |
|
2075 | # anyway because of the amend_source noise. | |
2078 | # |
|
2076 | # | |
2079 | # This not what we expect from amend. |
|
2077 | # This not what we expect from amend. | |
2080 | return old.node() |
|
2078 | return old.node() | |
2081 |
|
2079 | |||
2082 | ph = repo.ui.config('phases', 'new-commit', phases.draft) |
|
2080 | ph = repo.ui.config('phases', 'new-commit', phases.draft) | |
2083 | try: |
|
2081 | try: | |
2084 | if opts.get('secret'): |
|
2082 | if opts.get('secret'): | |
2085 | commitphase = 'secret' |
|
2083 | commitphase = 'secret' | |
2086 | else: |
|
2084 | else: | |
2087 | commitphase = old.phase() |
|
2085 | commitphase = old.phase() | |
2088 | repo.ui.setconfig('phases', 'new-commit', commitphase, 'amend') |
|
2086 | repo.ui.setconfig('phases', 'new-commit', commitphase, 'amend') | |
2089 | newid = repo.commitctx(new) |
|
2087 | newid = repo.commitctx(new) | |
2090 | finally: |
|
2088 | finally: | |
2091 | repo.ui.setconfig('phases', 'new-commit', ph, 'amend') |
|
2089 | repo.ui.setconfig('phases', 'new-commit', ph, 'amend') | |
2092 | if newid != old.node(): |
|
2090 | if newid != old.node(): | |
2093 | # Reroute the working copy parent to the new changeset |
|
2091 | # Reroute the working copy parent to the new changeset | |
2094 | repo.setparents(newid, nullid) |
|
2092 | repo.setparents(newid, nullid) | |
2095 |
|
2093 | |||
2096 | # Move bookmarks from old parent to amend commit |
|
2094 | # Move bookmarks from old parent to amend commit | |
2097 | bms = repo.nodebookmarks(old.node()) |
|
2095 | bms = repo.nodebookmarks(old.node()) | |
2098 | if bms: |
|
2096 | if bms: | |
2099 | marks = repo._bookmarks |
|
2097 | marks = repo._bookmarks | |
2100 | for bm in bms: |
|
2098 | for bm in bms: | |
2101 | marks[bm] = newid |
|
2099 | marks[bm] = newid | |
2102 | marks.write() |
|
2100 | marks.write() | |
2103 | #commit the whole amend process |
|
2101 | #commit the whole amend process | |
2104 | if obsolete._enabled and newid != old.node(): |
|
2102 | if obsolete._enabled and newid != old.node(): | |
2105 | # mark the new changeset as successor of the rewritten one |
|
2103 | # mark the new changeset as successor of the rewritten one | |
2106 | new = repo[newid] |
|
2104 | new = repo[newid] | |
2107 | obs = [(old, (new,))] |
|
2105 | obs = [(old, (new,))] | |
2108 | if node: |
|
2106 | if node: | |
2109 | obs.append((ctx, ())) |
|
2107 | obs.append((ctx, ())) | |
2110 |
|
2108 | |||
2111 | obsolete.createmarkers(repo, obs) |
|
2109 | obsolete.createmarkers(repo, obs) | |
2112 | tr.close() |
|
2110 | tr.close() | |
2113 | finally: |
|
2111 | finally: | |
2114 | tr.release() |
|
2112 | tr.release() | |
2115 | if (not obsolete._enabled) and newid != old.node(): |
|
2113 | if (not obsolete._enabled) and newid != old.node(): | |
2116 | # Strip the intermediate commit (if there was one) and the amended |
|
2114 | # Strip the intermediate commit (if there was one) and the amended | |
2117 | # commit |
|
2115 | # commit | |
2118 | if node: |
|
2116 | if node: | |
2119 | ui.note(_('stripping intermediate changeset %s\n') % ctx) |
|
2117 | ui.note(_('stripping intermediate changeset %s\n') % ctx) | |
2120 | ui.note(_('stripping amended changeset %s\n') % old) |
|
2118 | ui.note(_('stripping amended changeset %s\n') % old) | |
2121 | repair.strip(ui, repo, old.node(), topic='amend-backup') |
|
2119 | repair.strip(ui, repo, old.node(), topic='amend-backup') | |
2122 | finally: |
|
2120 | finally: | |
2123 | if newid is None: |
|
2121 | if newid is None: | |
2124 | repo.dirstate.invalidate() |
|
2122 | repo.dirstate.invalidate() | |
2125 | lockmod.release(lock, wlock) |
|
2123 | lockmod.release(lock, wlock) | |
2126 | return newid |
|
2124 | return newid | |
2127 |
|
2125 | |||
2128 | def commiteditor(repo, ctx, subs): |
|
2126 | def commiteditor(repo, ctx, subs): | |
2129 | if ctx.description(): |
|
2127 | if ctx.description(): | |
2130 | return ctx.description() |
|
2128 | return ctx.description() | |
2131 | return commitforceeditor(repo, ctx, subs) |
|
2129 | return commitforceeditor(repo, ctx, subs) | |
2132 |
|
2130 | |||
2133 | def commitforceeditor(repo, ctx, subs): |
|
2131 | def commitforceeditor(repo, ctx, subs): | |
2134 | edittext = [] |
|
2132 | edittext = [] | |
2135 | modified, added, removed = ctx.modified(), ctx.added(), ctx.removed() |
|
2133 | modified, added, removed = ctx.modified(), ctx.added(), ctx.removed() | |
2136 | if ctx.description(): |
|
2134 | if ctx.description(): | |
2137 | edittext.append(ctx.description()) |
|
2135 | edittext.append(ctx.description()) | |
2138 | edittext.append("") |
|
2136 | edittext.append("") | |
2139 | edittext.append("") # Empty line between message and comments. |
|
2137 | edittext.append("") # Empty line between message and comments. | |
2140 | edittext.append(_("HG: Enter commit message." |
|
2138 | edittext.append(_("HG: Enter commit message." | |
2141 | " Lines beginning with 'HG:' are removed.")) |
|
2139 | " Lines beginning with 'HG:' are removed.")) | |
2142 | edittext.append(_("HG: Leave message empty to abort commit.")) |
|
2140 | edittext.append(_("HG: Leave message empty to abort commit.")) | |
2143 | edittext.append("HG: --") |
|
2141 | edittext.append("HG: --") | |
2144 | edittext.append(_("HG: user: %s") % ctx.user()) |
|
2142 | edittext.append(_("HG: user: %s") % ctx.user()) | |
2145 | if ctx.p2(): |
|
2143 | if ctx.p2(): | |
2146 | edittext.append(_("HG: branch merge")) |
|
2144 | edittext.append(_("HG: branch merge")) | |
2147 | if ctx.branch(): |
|
2145 | if ctx.branch(): | |
2148 | edittext.append(_("HG: branch '%s'") % ctx.branch()) |
|
2146 | edittext.append(_("HG: branch '%s'") % ctx.branch()) | |
2149 | if bookmarks.iscurrent(repo): |
|
2147 | if bookmarks.iscurrent(repo): | |
2150 | edittext.append(_("HG: bookmark '%s'") % repo._bookmarkcurrent) |
|
2148 | edittext.append(_("HG: bookmark '%s'") % repo._bookmarkcurrent) | |
2151 | edittext.extend([_("HG: subrepo %s") % s for s in subs]) |
|
2149 | edittext.extend([_("HG: subrepo %s") % s for s in subs]) | |
2152 | edittext.extend([_("HG: added %s") % f for f in added]) |
|
2150 | edittext.extend([_("HG: added %s") % f for f in added]) | |
2153 | edittext.extend([_("HG: changed %s") % f for f in modified]) |
|
2151 | edittext.extend([_("HG: changed %s") % f for f in modified]) | |
2154 | edittext.extend([_("HG: removed %s") % f for f in removed]) |
|
2152 | edittext.extend([_("HG: removed %s") % f for f in removed]) | |
2155 | if not added and not modified and not removed: |
|
2153 | if not added and not modified and not removed: | |
2156 | edittext.append(_("HG: no files changed")) |
|
2154 | edittext.append(_("HG: no files changed")) | |
2157 | edittext.append("") |
|
2155 | edittext.append("") | |
2158 | # run editor in the repository root |
|
2156 | # run editor in the repository root | |
2159 | olddir = os.getcwd() |
|
2157 | olddir = os.getcwd() | |
2160 | os.chdir(repo.root) |
|
2158 | os.chdir(repo.root) | |
2161 | text = repo.ui.edit("\n".join(edittext), ctx.user(), ctx.extra()) |
|
2159 | text = repo.ui.edit("\n".join(edittext), ctx.user(), ctx.extra()) | |
2162 | text = re.sub("(?m)^HG:.*(\n|$)", "", text) |
|
2160 | text = re.sub("(?m)^HG:.*(\n|$)", "", text) | |
2163 | os.chdir(olddir) |
|
2161 | os.chdir(olddir) | |
2164 |
|
2162 | |||
2165 | if not text.strip(): |
|
2163 | if not text.strip(): | |
2166 | raise util.Abort(_("empty commit message")) |
|
2164 | raise util.Abort(_("empty commit message")) | |
2167 |
|
2165 | |||
2168 | return text |
|
2166 | return text | |
2169 |
|
2167 | |||
2170 | def commitstatus(repo, node, branch, bheads=None, opts={}): |
|
2168 | def commitstatus(repo, node, branch, bheads=None, opts={}): | |
2171 | ctx = repo[node] |
|
2169 | ctx = repo[node] | |
2172 | parents = ctx.parents() |
|
2170 | parents = ctx.parents() | |
2173 |
|
2171 | |||
2174 | if (not opts.get('amend') and bheads and node not in bheads and not |
|
2172 | if (not opts.get('amend') and bheads and node not in bheads and not | |
2175 | [x for x in parents if x.node() in bheads and x.branch() == branch]): |
|
2173 | [x for x in parents if x.node() in bheads and x.branch() == branch]): | |
2176 | repo.ui.status(_('created new head\n')) |
|
2174 | repo.ui.status(_('created new head\n')) | |
2177 | # The message is not printed for initial roots. For the other |
|
2175 | # The message is not printed for initial roots. For the other | |
2178 | # changesets, it is printed in the following situations: |
|
2176 | # changesets, it is printed in the following situations: | |
2179 | # |
|
2177 | # | |
2180 | # Par column: for the 2 parents with ... |
|
2178 | # Par column: for the 2 parents with ... | |
2181 | # N: null or no parent |
|
2179 | # N: null or no parent | |
2182 | # B: parent is on another named branch |
|
2180 | # B: parent is on another named branch | |
2183 | # C: parent is a regular non head changeset |
|
2181 | # C: parent is a regular non head changeset | |
2184 | # H: parent was a branch head of the current branch |
|
2182 | # H: parent was a branch head of the current branch | |
2185 | # Msg column: whether we print "created new head" message |
|
2183 | # Msg column: whether we print "created new head" message | |
2186 | # In the following, it is assumed that there already exists some |
|
2184 | # In the following, it is assumed that there already exists some | |
2187 | # initial branch heads of the current branch, otherwise nothing is |
|
2185 | # initial branch heads of the current branch, otherwise nothing is | |
2188 | # printed anyway. |
|
2186 | # printed anyway. | |
2189 | # |
|
2187 | # | |
2190 | # Par Msg Comment |
|
2188 | # Par Msg Comment | |
2191 | # N N y additional topo root |
|
2189 | # N N y additional topo root | |
2192 | # |
|
2190 | # | |
2193 | # B N y additional branch root |
|
2191 | # B N y additional branch root | |
2194 | # C N y additional topo head |
|
2192 | # C N y additional topo head | |
2195 | # H N n usual case |
|
2193 | # H N n usual case | |
2196 | # |
|
2194 | # | |
2197 | # B B y weird additional branch root |
|
2195 | # B B y weird additional branch root | |
2198 | # C B y branch merge |
|
2196 | # C B y branch merge | |
2199 | # H B n merge with named branch |
|
2197 | # H B n merge with named branch | |
2200 | # |
|
2198 | # | |
2201 | # C C y additional head from merge |
|
2199 | # C C y additional head from merge | |
2202 | # C H n merge with a head |
|
2200 | # C H n merge with a head | |
2203 | # |
|
2201 | # | |
2204 | # H H n head merge: head count decreases |
|
2202 | # H H n head merge: head count decreases | |
2205 |
|
2203 | |||
2206 | if not opts.get('close_branch'): |
|
2204 | if not opts.get('close_branch'): | |
2207 | for r in parents: |
|
2205 | for r in parents: | |
2208 | if r.closesbranch() and r.branch() == branch: |
|
2206 | if r.closesbranch() and r.branch() == branch: | |
2209 | repo.ui.status(_('reopening closed branch head %d\n') % r) |
|
2207 | repo.ui.status(_('reopening closed branch head %d\n') % r) | |
2210 |
|
2208 | |||
2211 | if repo.ui.debugflag: |
|
2209 | if repo.ui.debugflag: | |
2212 | repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex())) |
|
2210 | repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex())) | |
2213 | elif repo.ui.verbose: |
|
2211 | elif repo.ui.verbose: | |
2214 | repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx)) |
|
2212 | repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx)) | |
2215 |
|
2213 | |||
2216 | def revert(ui, repo, ctx, parents, *pats, **opts): |
|
2214 | def revert(ui, repo, ctx, parents, *pats, **opts): | |
2217 | parent, p2 = parents |
|
2215 | parent, p2 = parents | |
2218 | node = ctx.node() |
|
2216 | node = ctx.node() | |
2219 |
|
2217 | |||
2220 | mf = ctx.manifest() |
|
2218 | mf = ctx.manifest() | |
2221 | if node == parent: |
|
2219 | if node == parent: | |
2222 | pmf = mf |
|
2220 | pmf = mf | |
2223 | else: |
|
2221 | else: | |
2224 | pmf = None |
|
2222 | pmf = None | |
2225 |
|
2223 | |||
2226 | # need all matching names in dirstate and manifest of target rev, |
|
2224 | # need all matching names in dirstate and manifest of target rev, | |
2227 | # so have to walk both. do not print errors if files exist in one |
|
2225 | # so have to walk both. do not print errors if files exist in one | |
2228 | # but not other. |
|
2226 | # but not other. | |
2229 |
|
2227 | |||
2230 | names = {} |
|
2228 | names = {} | |
2231 |
|
2229 | |||
2232 | wlock = repo.wlock() |
|
2230 | wlock = repo.wlock() | |
2233 | try: |
|
2231 | try: | |
2234 | # walk dirstate. |
|
2232 | # walk dirstate. | |
2235 |
|
2233 | |||
2236 | m = scmutil.match(repo[None], pats, opts) |
|
2234 | m = scmutil.match(repo[None], pats, opts) | |
2237 | m.bad = lambda x, y: False |
|
2235 | m.bad = lambda x, y: False | |
2238 | for abs in repo.walk(m): |
|
2236 | for abs in repo.walk(m): | |
2239 | names[abs] = m.rel(abs), m.exact(abs) |
|
2237 | names[abs] = m.rel(abs), m.exact(abs) | |
2240 |
|
2238 | |||
2241 | # walk target manifest. |
|
2239 | # walk target manifest. | |
2242 |
|
2240 | |||
2243 | def badfn(path, msg): |
|
2241 | def badfn(path, msg): | |
2244 | if path in names: |
|
2242 | if path in names: | |
2245 | return |
|
2243 | return | |
2246 | if path in ctx.substate: |
|
2244 | if path in ctx.substate: | |
2247 | return |
|
2245 | return | |
2248 | path_ = path + '/' |
|
2246 | path_ = path + '/' | |
2249 | for f in names: |
|
2247 | for f in names: | |
2250 | if f.startswith(path_): |
|
2248 | if f.startswith(path_): | |
2251 | return |
|
2249 | return | |
2252 | ui.warn("%s: %s\n" % (m.rel(path), msg)) |
|
2250 | ui.warn("%s: %s\n" % (m.rel(path), msg)) | |
2253 |
|
2251 | |||
2254 | m = scmutil.match(ctx, pats, opts) |
|
2252 | m = scmutil.match(ctx, pats, opts) | |
2255 | m.bad = badfn |
|
2253 | m.bad = badfn | |
2256 | for abs in ctx.walk(m): |
|
2254 | for abs in ctx.walk(m): | |
2257 | if abs not in names: |
|
2255 | if abs not in names: | |
2258 | names[abs] = m.rel(abs), m.exact(abs) |
|
2256 | names[abs] = m.rel(abs), m.exact(abs) | |
2259 |
|
2257 | |||
2260 | # get the list of subrepos that must be reverted |
|
2258 | # get the list of subrepos that must be reverted | |
2261 | targetsubs = sorted(s for s in ctx.substate if m(s)) |
|
2259 | targetsubs = sorted(s for s in ctx.substate if m(s)) | |
2262 | m = scmutil.matchfiles(repo, names) |
|
2260 | m = scmutil.matchfiles(repo, names) | |
2263 | changes = repo.status(match=m)[:4] |
|
2261 | changes = repo.status(match=m)[:4] | |
2264 | modified, added, removed, deleted = map(set, changes) |
|
2262 | modified, added, removed, deleted = map(set, changes) | |
2265 |
|
2263 | |||
2266 | # if f is a rename, also revert the source |
|
2264 | # if f is a rename, also revert the source | |
2267 | cwd = repo.getcwd() |
|
2265 | cwd = repo.getcwd() | |
2268 | for f in added: |
|
2266 | for f in added: | |
2269 | src = repo.dirstate.copied(f) |
|
2267 | src = repo.dirstate.copied(f) | |
2270 | if src and src not in names and repo.dirstate[src] == 'r': |
|
2268 | if src and src not in names and repo.dirstate[src] == 'r': | |
2271 | removed.add(src) |
|
2269 | removed.add(src) | |
2272 | names[src] = (repo.pathto(src, cwd), True) |
|
2270 | names[src] = (repo.pathto(src, cwd), True) | |
2273 |
|
2271 | |||
2274 | def removeforget(abs): |
|
2272 | def removeforget(abs): | |
2275 | if repo.dirstate[abs] == 'a': |
|
2273 | if repo.dirstate[abs] == 'a': | |
2276 | return _('forgetting %s\n') |
|
2274 | return _('forgetting %s\n') | |
2277 | return _('removing %s\n') |
|
2275 | return _('removing %s\n') | |
2278 |
|
2276 | |||
2279 | revert = ([], _('reverting %s\n')) |
|
2277 | revert = ([], _('reverting %s\n')) | |
2280 | add = ([], _('adding %s\n')) |
|
2278 | add = ([], _('adding %s\n')) | |
2281 | remove = ([], removeforget) |
|
2279 | remove = ([], removeforget) | |
2282 | undelete = ([], _('undeleting %s\n')) |
|
2280 | undelete = ([], _('undeleting %s\n')) | |
2283 |
|
2281 | |||
2284 | disptable = ( |
|
2282 | disptable = ( | |
2285 | # dispatch table: |
|
2283 | # dispatch table: | |
2286 | # file state |
|
2284 | # file state | |
2287 | # action if in target manifest |
|
2285 | # action if in target manifest | |
2288 | # action if not in target manifest |
|
2286 | # action if not in target manifest | |
2289 | # make backup if in target manifest |
|
2287 | # make backup if in target manifest | |
2290 | # make backup if not in target manifest |
|
2288 | # make backup if not in target manifest | |
2291 | (modified, revert, remove, True, True), |
|
2289 | (modified, revert, remove, True, True), | |
2292 | (added, revert, remove, True, False), |
|
2290 | (added, revert, remove, True, False), | |
2293 | (removed, undelete, None, True, False), |
|
2291 | (removed, undelete, None, True, False), | |
2294 | (deleted, revert, remove, False, False), |
|
2292 | (deleted, revert, remove, False, False), | |
2295 | ) |
|
2293 | ) | |
2296 |
|
2294 | |||
2297 | for abs, (rel, exact) in sorted(names.items()): |
|
2295 | for abs, (rel, exact) in sorted(names.items()): | |
2298 | mfentry = mf.get(abs) |
|
2296 | mfentry = mf.get(abs) | |
2299 | target = repo.wjoin(abs) |
|
2297 | target = repo.wjoin(abs) | |
2300 | def handle(xlist, dobackup): |
|
2298 | def handle(xlist, dobackup): | |
2301 | xlist[0].append(abs) |
|
2299 | xlist[0].append(abs) | |
2302 | if (dobackup and not opts.get('no_backup') and |
|
2300 | if (dobackup and not opts.get('no_backup') and | |
2303 | os.path.lexists(target) and |
|
2301 | os.path.lexists(target) and | |
2304 | abs in ctx and repo[None][abs].cmp(ctx[abs])): |
|
2302 | abs in ctx and repo[None][abs].cmp(ctx[abs])): | |
2305 | bakname = "%s.orig" % rel |
|
2303 | bakname = "%s.orig" % rel | |
2306 | ui.note(_('saving current version of %s as %s\n') % |
|
2304 | ui.note(_('saving current version of %s as %s\n') % | |
2307 | (rel, bakname)) |
|
2305 | (rel, bakname)) | |
2308 | if not opts.get('dry_run'): |
|
2306 | if not opts.get('dry_run'): | |
2309 | util.rename(target, bakname) |
|
2307 | util.rename(target, bakname) | |
2310 | if ui.verbose or not exact: |
|
2308 | if ui.verbose or not exact: | |
2311 | msg = xlist[1] |
|
2309 | msg = xlist[1] | |
2312 | if not isinstance(msg, basestring): |
|
2310 | if not isinstance(msg, basestring): | |
2313 | msg = msg(abs) |
|
2311 | msg = msg(abs) | |
2314 | ui.status(msg % rel) |
|
2312 | ui.status(msg % rel) | |
2315 | for table, hitlist, misslist, backuphit, backupmiss in disptable: |
|
2313 | for table, hitlist, misslist, backuphit, backupmiss in disptable: | |
2316 | if abs not in table: |
|
2314 | if abs not in table: | |
2317 | continue |
|
2315 | continue | |
2318 | # file has changed in dirstate |
|
2316 | # file has changed in dirstate | |
2319 | if mfentry: |
|
2317 | if mfentry: | |
2320 | handle(hitlist, backuphit) |
|
2318 | handle(hitlist, backuphit) | |
2321 | elif misslist is not None: |
|
2319 | elif misslist is not None: | |
2322 | handle(misslist, backupmiss) |
|
2320 | handle(misslist, backupmiss) | |
2323 | break |
|
2321 | break | |
2324 | else: |
|
2322 | else: | |
2325 | if abs not in repo.dirstate: |
|
2323 | if abs not in repo.dirstate: | |
2326 | if mfentry: |
|
2324 | if mfentry: | |
2327 | handle(add, True) |
|
2325 | handle(add, True) | |
2328 | elif exact: |
|
2326 | elif exact: | |
2329 | ui.warn(_('file not managed: %s\n') % rel) |
|
2327 | ui.warn(_('file not managed: %s\n') % rel) | |
2330 | continue |
|
2328 | continue | |
2331 | # file has not changed in dirstate |
|
2329 | # file has not changed in dirstate | |
2332 | if node == parent: |
|
2330 | if node == parent: | |
2333 | if exact: |
|
2331 | if exact: | |
2334 | ui.warn(_('no changes needed to %s\n') % rel) |
|
2332 | ui.warn(_('no changes needed to %s\n') % rel) | |
2335 | continue |
|
2333 | continue | |
2336 | if pmf is None: |
|
2334 | if pmf is None: | |
2337 | # only need parent manifest in this unlikely case, |
|
2335 | # only need parent manifest in this unlikely case, | |
2338 | # so do not read by default |
|
2336 | # so do not read by default | |
2339 | pmf = repo[parent].manifest() |
|
2337 | pmf = repo[parent].manifest() | |
2340 | if abs in pmf and mfentry: |
|
2338 | if abs in pmf and mfentry: | |
2341 | # if version of file is same in parent and target |
|
2339 | # if version of file is same in parent and target | |
2342 | # manifests, do nothing |
|
2340 | # manifests, do nothing | |
2343 | if (pmf[abs] != mfentry or |
|
2341 | if (pmf[abs] != mfentry or | |
2344 | pmf.flags(abs) != mf.flags(abs)): |
|
2342 | pmf.flags(abs) != mf.flags(abs)): | |
2345 | handle(revert, False) |
|
2343 | handle(revert, False) | |
2346 | else: |
|
2344 | else: | |
2347 | handle(remove, False) |
|
2345 | handle(remove, False) | |
2348 | if not opts.get('dry_run'): |
|
2346 | if not opts.get('dry_run'): | |
2349 | _performrevert(repo, parents, ctx, revert, add, remove, undelete) |
|
2347 | _performrevert(repo, parents, ctx, revert, add, remove, undelete) | |
2350 |
|
2348 | |||
2351 | if targetsubs: |
|
2349 | if targetsubs: | |
2352 | # Revert the subrepos on the revert list |
|
2350 | # Revert the subrepos on the revert list | |
2353 | for sub in targetsubs: |
|
2351 | for sub in targetsubs: | |
2354 | ctx.sub(sub).revert(ui, ctx.substate[sub], *pats, **opts) |
|
2352 | ctx.sub(sub).revert(ui, ctx.substate[sub], *pats, **opts) | |
2355 | finally: |
|
2353 | finally: | |
2356 | wlock.release() |
|
2354 | wlock.release() | |
2357 |
|
2355 | |||
2358 | def _performrevert(repo, parents, ctx, revert, add, remove, undelete): |
|
2356 | def _performrevert(repo, parents, ctx, revert, add, remove, undelete): | |
2359 | """function that actually perform all the action computed for revert |
|
2357 | """function that actually perform all the action computed for revert | |
2360 |
|
2358 | |||
2361 | This is an independent function to let extension to plug in and react to |
|
2359 | This is an independent function to let extension to plug in and react to | |
2362 | the imminent revert. |
|
2360 | the imminent revert. | |
2363 |
|
2361 | |||
2364 | Make sure you have the working directory locked when calling this function. |
|
2362 | Make sure you have the working directory locked when calling this function. | |
2365 | """ |
|
2363 | """ | |
2366 | parent, p2 = parents |
|
2364 | parent, p2 = parents | |
2367 | node = ctx.node() |
|
2365 | node = ctx.node() | |
2368 | def checkout(f): |
|
2366 | def checkout(f): | |
2369 | fc = ctx[f] |
|
2367 | fc = ctx[f] | |
2370 | repo.wwrite(f, fc.data(), fc.flags()) |
|
2368 | repo.wwrite(f, fc.data(), fc.flags()) | |
2371 |
|
2369 | |||
2372 | audit_path = pathutil.pathauditor(repo.root) |
|
2370 | audit_path = pathutil.pathauditor(repo.root) | |
2373 | for f in remove[0]: |
|
2371 | for f in remove[0]: | |
2374 | if repo.dirstate[f] == 'a': |
|
2372 | if repo.dirstate[f] == 'a': | |
2375 | repo.dirstate.drop(f) |
|
2373 | repo.dirstate.drop(f) | |
2376 | continue |
|
2374 | continue | |
2377 | audit_path(f) |
|
2375 | audit_path(f) | |
2378 | try: |
|
2376 | try: | |
2379 | util.unlinkpath(repo.wjoin(f)) |
|
2377 | util.unlinkpath(repo.wjoin(f)) | |
2380 | except OSError: |
|
2378 | except OSError: | |
2381 | pass |
|
2379 | pass | |
2382 | repo.dirstate.remove(f) |
|
2380 | repo.dirstate.remove(f) | |
2383 |
|
2381 | |||
2384 | normal = None |
|
2382 | normal = None | |
2385 | if node == parent: |
|
2383 | if node == parent: | |
2386 | # We're reverting to our parent. If possible, we'd like status |
|
2384 | # We're reverting to our parent. If possible, we'd like status | |
2387 | # to report the file as clean. We have to use normallookup for |
|
2385 | # to report the file as clean. We have to use normallookup for | |
2388 | # merges to avoid losing information about merged/dirty files. |
|
2386 | # merges to avoid losing information about merged/dirty files. | |
2389 | if p2 != nullid: |
|
2387 | if p2 != nullid: | |
2390 | normal = repo.dirstate.normallookup |
|
2388 | normal = repo.dirstate.normallookup | |
2391 | else: |
|
2389 | else: | |
2392 | normal = repo.dirstate.normal |
|
2390 | normal = repo.dirstate.normal | |
2393 | for f in revert[0]: |
|
2391 | for f in revert[0]: | |
2394 | checkout(f) |
|
2392 | checkout(f) | |
2395 | if normal: |
|
2393 | if normal: | |
2396 | normal(f) |
|
2394 | normal(f) | |
2397 |
|
2395 | |||
2398 | for f in add[0]: |
|
2396 | for f in add[0]: | |
2399 | checkout(f) |
|
2397 | checkout(f) | |
2400 | repo.dirstate.add(f) |
|
2398 | repo.dirstate.add(f) | |
2401 |
|
2399 | |||
2402 | normal = repo.dirstate.normallookup |
|
2400 | normal = repo.dirstate.normallookup | |
2403 | if node == parent and p2 == nullid: |
|
2401 | if node == parent and p2 == nullid: | |
2404 | normal = repo.dirstate.normal |
|
2402 | normal = repo.dirstate.normal | |
2405 | for f in undelete[0]: |
|
2403 | for f in undelete[0]: | |
2406 | checkout(f) |
|
2404 | checkout(f) | |
2407 | normal(f) |
|
2405 | normal(f) | |
2408 |
|
2406 | |||
2409 | copied = copies.pathcopies(repo[parent], ctx) |
|
2407 | copied = copies.pathcopies(repo[parent], ctx) | |
2410 |
|
2408 | |||
2411 | for f in add[0] + undelete[0] + revert[0]: |
|
2409 | for f in add[0] + undelete[0] + revert[0]: | |
2412 | if f in copied: |
|
2410 | if f in copied: | |
2413 | repo.dirstate.copy(copied[f], f) |
|
2411 | repo.dirstate.copy(copied[f], f) | |
2414 |
|
2412 | |||
2415 | def command(table): |
|
2413 | def command(table): | |
2416 | '''returns a function object bound to table which can be used as |
|
2414 | '''returns a function object bound to table which can be used as | |
2417 | a decorator for populating table as a command table''' |
|
2415 | a decorator for populating table as a command table''' | |
2418 |
|
2416 | |||
2419 | def cmd(name, options=(), synopsis=None): |
|
2417 | def cmd(name, options=(), synopsis=None): | |
2420 | def decorator(func): |
|
2418 | def decorator(func): | |
2421 | if synopsis: |
|
2419 | if synopsis: | |
2422 | table[name] = func, list(options), synopsis |
|
2420 | table[name] = func, list(options), synopsis | |
2423 | else: |
|
2421 | else: | |
2424 | table[name] = func, list(options) |
|
2422 | table[name] = func, list(options) | |
2425 | return func |
|
2423 | return func | |
2426 | return decorator |
|
2424 | return decorator | |
2427 |
|
2425 | |||
2428 | return cmd |
|
2426 | return cmd | |
2429 |
|
2427 | |||
2430 | # a list of (ui, repo, otherpeer, opts, missing) functions called by |
|
2428 | # a list of (ui, repo, otherpeer, opts, missing) functions called by | |
2431 | # commands.outgoing. "missing" is "missing" of the result of |
|
2429 | # commands.outgoing. "missing" is "missing" of the result of | |
2432 | # "findcommonoutgoing()" |
|
2430 | # "findcommonoutgoing()" | |
2433 | outgoinghooks = util.hooks() |
|
2431 | outgoinghooks = util.hooks() | |
2434 |
|
2432 | |||
2435 | # a list of (ui, repo) functions called by commands.summary |
|
2433 | # a list of (ui, repo) functions called by commands.summary | |
2436 | summaryhooks = util.hooks() |
|
2434 | summaryhooks = util.hooks() | |
2437 |
|
2435 | |||
2438 | # a list of (ui, repo, opts, changes) functions called by commands.summary. |
|
2436 | # a list of (ui, repo, opts, changes) functions called by commands.summary. | |
2439 | # |
|
2437 | # | |
2440 | # functions should return tuple of booleans below, if 'changes' is None: |
|
2438 | # functions should return tuple of booleans below, if 'changes' is None: | |
2441 | # (whether-incomings-are-needed, whether-outgoings-are-needed) |
|
2439 | # (whether-incomings-are-needed, whether-outgoings-are-needed) | |
2442 | # |
|
2440 | # | |
2443 | # otherwise, 'changes' is a tuple of tuples below: |
|
2441 | # otherwise, 'changes' is a tuple of tuples below: | |
2444 | # - (sourceurl, sourcebranch, sourcepeer, incoming) |
|
2442 | # - (sourceurl, sourcebranch, sourcepeer, incoming) | |
2445 | # - (desturl, destbranch, destpeer, outgoing) |
|
2443 | # - (desturl, destbranch, destpeer, outgoing) | |
2446 | summaryremotehooks = util.hooks() |
|
2444 | summaryremotehooks = util.hooks() | |
2447 |
|
2445 | |||
2448 | # A list of state files kept by multistep operations like graft. |
|
2446 | # A list of state files kept by multistep operations like graft. | |
2449 | # Since graft cannot be aborted, it is considered 'clearable' by update. |
|
2447 | # Since graft cannot be aborted, it is considered 'clearable' by update. | |
2450 | # note: bisect is intentionally excluded |
|
2448 | # note: bisect is intentionally excluded | |
2451 | # (state file, clearable, allowcommit, error, hint) |
|
2449 | # (state file, clearable, allowcommit, error, hint) | |
2452 | unfinishedstates = [ |
|
2450 | unfinishedstates = [ | |
2453 | ('graftstate', True, False, _('graft in progress'), |
|
2451 | ('graftstate', True, False, _('graft in progress'), | |
2454 | _("use 'hg graft --continue' or 'hg update' to abort")), |
|
2452 | _("use 'hg graft --continue' or 'hg update' to abort")), | |
2455 | ('updatestate', True, False, _('last update was interrupted'), |
|
2453 | ('updatestate', True, False, _('last update was interrupted'), | |
2456 | _("use 'hg update' to get a consistent checkout")) |
|
2454 | _("use 'hg update' to get a consistent checkout")) | |
2457 | ] |
|
2455 | ] | |
2458 |
|
2456 | |||
2459 | def checkunfinished(repo, commit=False): |
|
2457 | def checkunfinished(repo, commit=False): | |
2460 | '''Look for an unfinished multistep operation, like graft, and abort |
|
2458 | '''Look for an unfinished multistep operation, like graft, and abort | |
2461 | if found. It's probably good to check this right before |
|
2459 | if found. It's probably good to check this right before | |
2462 | bailifchanged(). |
|
2460 | bailifchanged(). | |
2463 | ''' |
|
2461 | ''' | |
2464 | for f, clearable, allowcommit, msg, hint in unfinishedstates: |
|
2462 | for f, clearable, allowcommit, msg, hint in unfinishedstates: | |
2465 | if commit and allowcommit: |
|
2463 | if commit and allowcommit: | |
2466 | continue |
|
2464 | continue | |
2467 | if repo.vfs.exists(f): |
|
2465 | if repo.vfs.exists(f): | |
2468 | raise util.Abort(msg, hint=hint) |
|
2466 | raise util.Abort(msg, hint=hint) | |
2469 |
|
2467 | |||
2470 | def clearunfinished(repo): |
|
2468 | def clearunfinished(repo): | |
2471 | '''Check for unfinished operations (as above), and clear the ones |
|
2469 | '''Check for unfinished operations (as above), and clear the ones | |
2472 | that are clearable. |
|
2470 | that are clearable. | |
2473 | ''' |
|
2471 | ''' | |
2474 | for f, clearable, allowcommit, msg, hint in unfinishedstates: |
|
2472 | for f, clearable, allowcommit, msg, hint in unfinishedstates: | |
2475 | if not clearable and repo.vfs.exists(f): |
|
2473 | if not clearable and repo.vfs.exists(f): | |
2476 | raise util.Abort(msg, hint=hint) |
|
2474 | raise util.Abort(msg, hint=hint) | |
2477 | for f, clearable, allowcommit, msg, hint in unfinishedstates: |
|
2475 | for f, clearable, allowcommit, msg, hint in unfinishedstates: | |
2478 | if clearable and repo.vfs.exists(f): |
|
2476 | if clearable and repo.vfs.exists(f): | |
2479 | util.unlink(repo.join(f)) |
|
2477 | util.unlink(repo.join(f)) |
General Comments 0
You need to be logged in to leave comments.
Login now