Show More
@@ -1,3258 +1,3261 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, cStringIO, shutil |
|
10 | import os, sys, errno, re, tempfile, cStringIO, shutil | |
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 encoding |
|
16 | import encoding | |
17 | import crecord as crecordmod |
|
17 | import crecord as crecordmod | |
18 | import lock as lockmod |
|
18 | import lock as lockmod | |
19 |
|
19 | |||
20 | def parsealiases(cmd): |
|
20 | def parsealiases(cmd): | |
21 | return cmd.lstrip("^").split("|") |
|
21 | return cmd.lstrip("^").split("|") | |
22 |
|
22 | |||
23 | def setupwrapcolorwrite(ui): |
|
23 | def setupwrapcolorwrite(ui): | |
24 | # wrap ui.write so diff output can be labeled/colorized |
|
24 | # wrap ui.write so diff output can be labeled/colorized | |
25 | def wrapwrite(orig, *args, **kw): |
|
25 | def wrapwrite(orig, *args, **kw): | |
26 | label = kw.pop('label', '') |
|
26 | label = kw.pop('label', '') | |
27 | for chunk, l in patch.difflabel(lambda: args): |
|
27 | for chunk, l in patch.difflabel(lambda: args): | |
28 | orig(chunk, label=label + l) |
|
28 | orig(chunk, label=label + l) | |
29 |
|
29 | |||
30 | oldwrite = ui.write |
|
30 | oldwrite = ui.write | |
31 | def wrap(*args, **kwargs): |
|
31 | def wrap(*args, **kwargs): | |
32 | return wrapwrite(oldwrite, *args, **kwargs) |
|
32 | return wrapwrite(oldwrite, *args, **kwargs) | |
33 | setattr(ui, 'write', wrap) |
|
33 | setattr(ui, 'write', wrap) | |
34 | return oldwrite |
|
34 | return oldwrite | |
35 |
|
35 | |||
36 | def filterchunks(ui, originalhunks, usecurses, testfile): |
|
36 | def filterchunks(ui, originalhunks, usecurses, testfile): | |
37 | if usecurses: |
|
37 | if usecurses: | |
38 | if testfile: |
|
38 | if testfile: | |
39 | recordfn = crecordmod.testdecorator(testfile, |
|
39 | recordfn = crecordmod.testdecorator(testfile, | |
40 | crecordmod.testchunkselector) |
|
40 | crecordmod.testchunkselector) | |
41 | else: |
|
41 | else: | |
42 | recordfn = crecordmod.chunkselector |
|
42 | recordfn = crecordmod.chunkselector | |
43 |
|
43 | |||
44 | return crecordmod.filterpatch(ui, originalhunks, recordfn) |
|
44 | return crecordmod.filterpatch(ui, originalhunks, recordfn) | |
45 |
|
45 | |||
46 | else: |
|
46 | else: | |
47 | return patch.filterpatch(ui, originalhunks) |
|
47 | return patch.filterpatch(ui, originalhunks) | |
48 |
|
48 | |||
49 | def recordfilter(ui, originalhunks): |
|
49 | def recordfilter(ui, originalhunks): | |
50 | usecurses = ui.configbool('experimental', 'crecord', False) |
|
50 | usecurses = ui.configbool('experimental', 'crecord', False) | |
51 | testfile = ui.config('experimental', 'crecordtest', None) |
|
51 | testfile = ui.config('experimental', 'crecordtest', None) | |
52 | oldwrite = setupwrapcolorwrite(ui) |
|
52 | oldwrite = setupwrapcolorwrite(ui) | |
53 | try: |
|
53 | try: | |
54 | newchunks = filterchunks(ui, originalhunks, usecurses, testfile) |
|
54 | newchunks = filterchunks(ui, originalhunks, usecurses, testfile) | |
55 | finally: |
|
55 | finally: | |
56 | ui.write = oldwrite |
|
56 | ui.write = oldwrite | |
57 | return newchunks |
|
57 | return newchunks | |
58 |
|
58 | |||
59 | def dorecord(ui, repo, commitfunc, cmdsuggest, backupall, |
|
59 | def dorecord(ui, repo, commitfunc, cmdsuggest, backupall, | |
60 | filterfn, *pats, **opts): |
|
60 | filterfn, *pats, **opts): | |
61 | import merge as mergemod |
|
61 | import merge as mergemod | |
62 | hunkclasses = (crecordmod.uihunk, patch.recordhunk) |
|
62 | hunkclasses = (crecordmod.uihunk, patch.recordhunk) | |
63 | ishunk = lambda x: isinstance(x, hunkclasses) |
|
63 | ishunk = lambda x: isinstance(x, hunkclasses) | |
64 |
|
64 | |||
65 | if not ui.interactive(): |
|
65 | if not ui.interactive(): | |
66 | raise util.Abort(_('running non-interactively, use %s instead') % |
|
66 | raise util.Abort(_('running non-interactively, use %s instead') % | |
67 | cmdsuggest) |
|
67 | cmdsuggest) | |
68 |
|
68 | |||
69 | # make sure username is set before going interactive |
|
69 | # make sure username is set before going interactive | |
70 | if not opts.get('user'): |
|
70 | if not opts.get('user'): | |
71 | ui.username() # raise exception, username not provided |
|
71 | ui.username() # raise exception, username not provided | |
72 |
|
72 | |||
73 | def recordfunc(ui, repo, message, match, opts): |
|
73 | def recordfunc(ui, repo, message, match, opts): | |
74 | """This is generic record driver. |
|
74 | """This is generic record driver. | |
75 |
|
75 | |||
76 | Its job is to interactively filter local changes, and |
|
76 | Its job is to interactively filter local changes, and | |
77 | accordingly prepare working directory into a state in which the |
|
77 | accordingly prepare working directory into a state in which the | |
78 | job can be delegated to a non-interactive commit command such as |
|
78 | job can be delegated to a non-interactive commit command such as | |
79 | 'commit' or 'qrefresh'. |
|
79 | 'commit' or 'qrefresh'. | |
80 |
|
80 | |||
81 | After the actual job is done by non-interactive command, the |
|
81 | After the actual job is done by non-interactive command, the | |
82 | working directory is restored to its original state. |
|
82 | working directory is restored to its original state. | |
83 |
|
83 | |||
84 | In the end we'll record interesting changes, and everything else |
|
84 | In the end we'll record interesting changes, and everything else | |
85 | will be left in place, so the user can continue working. |
|
85 | will be left in place, so the user can continue working. | |
86 | """ |
|
86 | """ | |
87 |
|
87 | |||
88 | checkunfinished(repo, commit=True) |
|
88 | checkunfinished(repo, commit=True) | |
89 | merge = len(repo[None].parents()) > 1 |
|
89 | merge = len(repo[None].parents()) > 1 | |
90 | if merge: |
|
90 | if merge: | |
91 | raise util.Abort(_('cannot partially commit a merge ' |
|
91 | raise util.Abort(_('cannot partially commit a merge ' | |
92 | '(use "hg commit" instead)')) |
|
92 | '(use "hg commit" instead)')) | |
93 |
|
93 | |||
94 | status = repo.status(match=match) |
|
94 | status = repo.status(match=match) | |
95 | diffopts = patch.difffeatureopts(ui, opts=opts, whitespace=True) |
|
95 | diffopts = patch.difffeatureopts(ui, opts=opts, whitespace=True) | |
96 | diffopts.nodates = True |
|
96 | diffopts.nodates = True | |
97 | diffopts.git = True |
|
97 | diffopts.git = True | |
98 | originaldiff = patch.diff(repo, changes=status, opts=diffopts) |
|
98 | originaldiff = patch.diff(repo, changes=status, opts=diffopts) | |
99 | originalchunks = patch.parsepatch(originaldiff) |
|
99 | originalchunks = patch.parsepatch(originaldiff) | |
100 |
|
100 | |||
101 | # 1. filter patch, so we have intending-to apply subset of it |
|
101 | # 1. filter patch, so we have intending-to apply subset of it | |
102 | try: |
|
102 | try: | |
103 | chunks = filterfn(ui, originalchunks) |
|
103 | chunks = filterfn(ui, originalchunks) | |
104 | except patch.PatchError, err: |
|
104 | except patch.PatchError, err: | |
105 | raise util.Abort(_('error parsing patch: %s') % err) |
|
105 | raise util.Abort(_('error parsing patch: %s') % err) | |
106 |
|
106 | |||
107 | # We need to keep a backup of files that have been newly added and |
|
107 | # We need to keep a backup of files that have been newly added and | |
108 | # modified during the recording process because there is a previous |
|
108 | # modified during the recording process because there is a previous | |
109 | # version without the edit in the workdir |
|
109 | # version without the edit in the workdir | |
110 | newlyaddedandmodifiedfiles = set() |
|
110 | newlyaddedandmodifiedfiles = set() | |
111 | for chunk in chunks: |
|
111 | for chunk in chunks: | |
112 | if ishunk(chunk) and chunk.header.isnewfile() and chunk not in \ |
|
112 | if ishunk(chunk) and chunk.header.isnewfile() and chunk not in \ | |
113 | originalchunks: |
|
113 | originalchunks: | |
114 | newlyaddedandmodifiedfiles.add(chunk.header.filename()) |
|
114 | newlyaddedandmodifiedfiles.add(chunk.header.filename()) | |
115 | contenders = set() |
|
115 | contenders = set() | |
116 | for h in chunks: |
|
116 | for h in chunks: | |
117 | try: |
|
117 | try: | |
118 | contenders.update(set(h.files())) |
|
118 | contenders.update(set(h.files())) | |
119 | except AttributeError: |
|
119 | except AttributeError: | |
120 | pass |
|
120 | pass | |
121 |
|
121 | |||
122 | changed = status.modified + status.added + status.removed |
|
122 | changed = status.modified + status.added + status.removed | |
123 | newfiles = [f for f in changed if f in contenders] |
|
123 | newfiles = [f for f in changed if f in contenders] | |
124 | if not newfiles: |
|
124 | if not newfiles: | |
125 | ui.status(_('no changes to record\n')) |
|
125 | ui.status(_('no changes to record\n')) | |
126 | return 0 |
|
126 | return 0 | |
127 |
|
127 | |||
128 | modified = set(status.modified) |
|
128 | modified = set(status.modified) | |
129 |
|
129 | |||
130 | # 2. backup changed files, so we can restore them in the end |
|
130 | # 2. backup changed files, so we can restore them in the end | |
131 |
|
131 | |||
132 | if backupall: |
|
132 | if backupall: | |
133 | tobackup = changed |
|
133 | tobackup = changed | |
134 | else: |
|
134 | else: | |
135 | tobackup = [f for f in newfiles if f in modified or f in \ |
|
135 | tobackup = [f for f in newfiles if f in modified or f in \ | |
136 | newlyaddedandmodifiedfiles] |
|
136 | newlyaddedandmodifiedfiles] | |
137 | backups = {} |
|
137 | backups = {} | |
138 | if tobackup: |
|
138 | if tobackup: | |
139 | backupdir = repo.join('record-backups') |
|
139 | backupdir = repo.join('record-backups') | |
140 | try: |
|
140 | try: | |
141 | os.mkdir(backupdir) |
|
141 | os.mkdir(backupdir) | |
142 | except OSError, err: |
|
142 | except OSError, err: | |
143 | if err.errno != errno.EEXIST: |
|
143 | if err.errno != errno.EEXIST: | |
144 | raise |
|
144 | raise | |
145 | try: |
|
145 | try: | |
146 | # backup continues |
|
146 | # backup continues | |
147 | for f in tobackup: |
|
147 | for f in tobackup: | |
148 | fd, tmpname = tempfile.mkstemp(prefix=f.replace('/', '_')+'.', |
|
148 | fd, tmpname = tempfile.mkstemp(prefix=f.replace('/', '_')+'.', | |
149 | dir=backupdir) |
|
149 | dir=backupdir) | |
150 | os.close(fd) |
|
150 | os.close(fd) | |
151 | ui.debug('backup %r as %r\n' % (f, tmpname)) |
|
151 | ui.debug('backup %r as %r\n' % (f, tmpname)) | |
152 | util.copyfile(repo.wjoin(f), tmpname) |
|
152 | util.copyfile(repo.wjoin(f), tmpname) | |
153 | shutil.copystat(repo.wjoin(f), tmpname) |
|
153 | shutil.copystat(repo.wjoin(f), tmpname) | |
154 | backups[f] = tmpname |
|
154 | backups[f] = tmpname | |
155 |
|
155 | |||
156 | fp = cStringIO.StringIO() |
|
156 | fp = cStringIO.StringIO() | |
157 | for c in chunks: |
|
157 | for c in chunks: | |
158 | fname = c.filename() |
|
158 | fname = c.filename() | |
159 | if fname in backups: |
|
159 | if fname in backups: | |
160 | c.write(fp) |
|
160 | c.write(fp) | |
161 | dopatch = fp.tell() |
|
161 | dopatch = fp.tell() | |
162 | fp.seek(0) |
|
162 | fp.seek(0) | |
163 |
|
163 | |||
164 | [os.unlink(c) for c in newlyaddedandmodifiedfiles] |
|
164 | [os.unlink(c) for c in newlyaddedandmodifiedfiles] | |
165 | # 3a. apply filtered patch to clean repo (clean) |
|
165 | # 3a. apply filtered patch to clean repo (clean) | |
166 | if backups: |
|
166 | if backups: | |
167 | # Equivalent to hg.revert |
|
167 | # Equivalent to hg.revert | |
168 | choices = lambda key: key in backups |
|
168 | choices = lambda key: key in backups | |
169 | mergemod.update(repo, repo.dirstate.p1(), |
|
169 | mergemod.update(repo, repo.dirstate.p1(), | |
170 | False, True, choices) |
|
170 | False, True, choices) | |
171 |
|
171 | |||
172 | # 3b. (apply) |
|
172 | # 3b. (apply) | |
173 | if dopatch: |
|
173 | if dopatch: | |
174 | try: |
|
174 | try: | |
175 | ui.debug('applying patch\n') |
|
175 | ui.debug('applying patch\n') | |
176 | ui.debug(fp.getvalue()) |
|
176 | ui.debug(fp.getvalue()) | |
177 | patch.internalpatch(ui, repo, fp, 1, eolmode=None) |
|
177 | patch.internalpatch(ui, repo, fp, 1, eolmode=None) | |
178 | except patch.PatchError, err: |
|
178 | except patch.PatchError, err: | |
179 | raise util.Abort(str(err)) |
|
179 | raise util.Abort(str(err)) | |
180 | del fp |
|
180 | del fp | |
181 |
|
181 | |||
182 | # 4. We prepared working directory according to filtered |
|
182 | # 4. We prepared working directory according to filtered | |
183 | # patch. Now is the time to delegate the job to |
|
183 | # patch. Now is the time to delegate the job to | |
184 | # commit/qrefresh or the like! |
|
184 | # commit/qrefresh or the like! | |
185 |
|
185 | |||
186 | # Make all of the pathnames absolute. |
|
186 | # Make all of the pathnames absolute. | |
187 | newfiles = [repo.wjoin(nf) for nf in newfiles] |
|
187 | newfiles = [repo.wjoin(nf) for nf in newfiles] | |
188 | return commitfunc(ui, repo, *newfiles, **opts) |
|
188 | return commitfunc(ui, repo, *newfiles, **opts) | |
189 | finally: |
|
189 | finally: | |
190 | # 5. finally restore backed-up files |
|
190 | # 5. finally restore backed-up files | |
191 | try: |
|
191 | try: | |
192 | for realname, tmpname in backups.iteritems(): |
|
192 | for realname, tmpname in backups.iteritems(): | |
193 | ui.debug('restoring %r to %r\n' % (tmpname, realname)) |
|
193 | ui.debug('restoring %r to %r\n' % (tmpname, realname)) | |
194 | util.copyfile(tmpname, repo.wjoin(realname)) |
|
194 | util.copyfile(tmpname, repo.wjoin(realname)) | |
195 | # Our calls to copystat() here and above are a |
|
195 | # Our calls to copystat() here and above are a | |
196 | # hack to trick any editors that have f open that |
|
196 | # hack to trick any editors that have f open that | |
197 | # we haven't modified them. |
|
197 | # we haven't modified them. | |
198 | # |
|
198 | # | |
199 | # Also note that this racy as an editor could |
|
199 | # Also note that this racy as an editor could | |
200 | # notice the file's mtime before we've finished |
|
200 | # notice the file's mtime before we've finished | |
201 | # writing it. |
|
201 | # writing it. | |
202 | shutil.copystat(tmpname, repo.wjoin(realname)) |
|
202 | shutil.copystat(tmpname, repo.wjoin(realname)) | |
203 | os.unlink(tmpname) |
|
203 | os.unlink(tmpname) | |
204 | if tobackup: |
|
204 | if tobackup: | |
205 | os.rmdir(backupdir) |
|
205 | os.rmdir(backupdir) | |
206 | except OSError: |
|
206 | except OSError: | |
207 | pass |
|
207 | pass | |
208 |
|
208 | |||
209 | return commit(ui, repo, recordfunc, pats, opts) |
|
209 | return commit(ui, repo, recordfunc, pats, opts) | |
210 |
|
210 | |||
211 | def findpossible(cmd, table, strict=False): |
|
211 | def findpossible(cmd, table, strict=False): | |
212 | """ |
|
212 | """ | |
213 | Return cmd -> (aliases, command table entry) |
|
213 | Return cmd -> (aliases, command table entry) | |
214 | for each matching command. |
|
214 | for each matching command. | |
215 | Return debug commands (or their aliases) only if no normal command matches. |
|
215 | Return debug commands (or their aliases) only if no normal command matches. | |
216 | """ |
|
216 | """ | |
217 | choice = {} |
|
217 | choice = {} | |
218 | debugchoice = {} |
|
218 | debugchoice = {} | |
219 |
|
219 | |||
220 | if cmd in table: |
|
220 | if cmd in table: | |
221 | # short-circuit exact matches, "log" alias beats "^log|history" |
|
221 | # short-circuit exact matches, "log" alias beats "^log|history" | |
222 | keys = [cmd] |
|
222 | keys = [cmd] | |
223 | else: |
|
223 | else: | |
224 | keys = table.keys() |
|
224 | keys = table.keys() | |
225 |
|
225 | |||
226 | allcmds = [] |
|
226 | allcmds = [] | |
227 | for e in keys: |
|
227 | for e in keys: | |
228 | aliases = parsealiases(e) |
|
228 | aliases = parsealiases(e) | |
229 | allcmds.extend(aliases) |
|
229 | allcmds.extend(aliases) | |
230 | found = None |
|
230 | found = None | |
231 | if cmd in aliases: |
|
231 | if cmd in aliases: | |
232 | found = cmd |
|
232 | found = cmd | |
233 | elif not strict: |
|
233 | elif not strict: | |
234 | for a in aliases: |
|
234 | for a in aliases: | |
235 | if a.startswith(cmd): |
|
235 | if a.startswith(cmd): | |
236 | found = a |
|
236 | found = a | |
237 | break |
|
237 | break | |
238 | if found is not None: |
|
238 | if found is not None: | |
239 | if aliases[0].startswith("debug") or found.startswith("debug"): |
|
239 | if aliases[0].startswith("debug") or found.startswith("debug"): | |
240 | debugchoice[found] = (aliases, table[e]) |
|
240 | debugchoice[found] = (aliases, table[e]) | |
241 | else: |
|
241 | else: | |
242 | choice[found] = (aliases, table[e]) |
|
242 | choice[found] = (aliases, table[e]) | |
243 |
|
243 | |||
244 | if not choice and debugchoice: |
|
244 | if not choice and debugchoice: | |
245 | choice = debugchoice |
|
245 | choice = debugchoice | |
246 |
|
246 | |||
247 | return choice, allcmds |
|
247 | return choice, allcmds | |
248 |
|
248 | |||
249 | def findcmd(cmd, table, strict=True): |
|
249 | def findcmd(cmd, table, strict=True): | |
250 | """Return (aliases, command table entry) for command string.""" |
|
250 | """Return (aliases, command table entry) for command string.""" | |
251 | choice, allcmds = findpossible(cmd, table, strict) |
|
251 | choice, allcmds = findpossible(cmd, table, strict) | |
252 |
|
252 | |||
253 | if cmd in choice: |
|
253 | if cmd in choice: | |
254 | return choice[cmd] |
|
254 | return choice[cmd] | |
255 |
|
255 | |||
256 | if len(choice) > 1: |
|
256 | if len(choice) > 1: | |
257 | clist = choice.keys() |
|
257 | clist = choice.keys() | |
258 | clist.sort() |
|
258 | clist.sort() | |
259 | raise error.AmbiguousCommand(cmd, clist) |
|
259 | raise error.AmbiguousCommand(cmd, clist) | |
260 |
|
260 | |||
261 | if choice: |
|
261 | if choice: | |
262 | return choice.values()[0] |
|
262 | return choice.values()[0] | |
263 |
|
263 | |||
264 | raise error.UnknownCommand(cmd, allcmds) |
|
264 | raise error.UnknownCommand(cmd, allcmds) | |
265 |
|
265 | |||
266 | def findrepo(p): |
|
266 | def findrepo(p): | |
267 | while not os.path.isdir(os.path.join(p, ".hg")): |
|
267 | while not os.path.isdir(os.path.join(p, ".hg")): | |
268 | oldp, p = p, os.path.dirname(p) |
|
268 | oldp, p = p, os.path.dirname(p) | |
269 | if p == oldp: |
|
269 | if p == oldp: | |
270 | return None |
|
270 | return None | |
271 |
|
271 | |||
272 | return p |
|
272 | return p | |
273 |
|
273 | |||
274 | def bailifchanged(repo, merge=True): |
|
274 | def bailifchanged(repo, merge=True): | |
275 | if merge and repo.dirstate.p2() != nullid: |
|
275 | if merge and repo.dirstate.p2() != nullid: | |
276 | raise util.Abort(_('outstanding uncommitted merge')) |
|
276 | raise util.Abort(_('outstanding uncommitted merge')) | |
277 | modified, added, removed, deleted = repo.status()[:4] |
|
277 | modified, added, removed, deleted = repo.status()[:4] | |
278 | if modified or added or removed or deleted: |
|
278 | if modified or added or removed or deleted: | |
279 | raise util.Abort(_('uncommitted changes')) |
|
279 | raise util.Abort(_('uncommitted changes')) | |
280 | ctx = repo[None] |
|
280 | ctx = repo[None] | |
281 | for s in sorted(ctx.substate): |
|
281 | for s in sorted(ctx.substate): | |
282 | ctx.sub(s).bailifchanged() |
|
282 | ctx.sub(s).bailifchanged() | |
283 |
|
283 | |||
284 | def logmessage(ui, opts): |
|
284 | def logmessage(ui, opts): | |
285 | """ get the log message according to -m and -l option """ |
|
285 | """ get the log message according to -m and -l option """ | |
286 | message = opts.get('message') |
|
286 | message = opts.get('message') | |
287 | logfile = opts.get('logfile') |
|
287 | logfile = opts.get('logfile') | |
288 |
|
288 | |||
289 | if message and logfile: |
|
289 | if message and logfile: | |
290 | raise util.Abort(_('options --message and --logfile are mutually ' |
|
290 | raise util.Abort(_('options --message and --logfile are mutually ' | |
291 | 'exclusive')) |
|
291 | 'exclusive')) | |
292 | if not message and logfile: |
|
292 | if not message and logfile: | |
293 | try: |
|
293 | try: | |
294 | if logfile == '-': |
|
294 | if logfile == '-': | |
295 | message = ui.fin.read() |
|
295 | message = ui.fin.read() | |
296 | else: |
|
296 | else: | |
297 | message = '\n'.join(util.readfile(logfile).splitlines()) |
|
297 | message = '\n'.join(util.readfile(logfile).splitlines()) | |
298 | except IOError, inst: |
|
298 | except IOError, inst: | |
299 | raise util.Abort(_("can't read commit message '%s': %s") % |
|
299 | raise util.Abort(_("can't read commit message '%s': %s") % | |
300 | (logfile, inst.strerror)) |
|
300 | (logfile, inst.strerror)) | |
301 | return message |
|
301 | return message | |
302 |
|
302 | |||
303 | def mergeeditform(ctxorbool, baseformname): |
|
303 | def mergeeditform(ctxorbool, baseformname): | |
304 | """return appropriate editform name (referencing a committemplate) |
|
304 | """return appropriate editform name (referencing a committemplate) | |
305 |
|
305 | |||
306 | 'ctxorbool' is either a ctx to be committed, or a bool indicating whether |
|
306 | 'ctxorbool' is either a ctx to be committed, or a bool indicating whether | |
307 | merging is committed. |
|
307 | merging is committed. | |
308 |
|
308 | |||
309 | This returns baseformname with '.merge' appended if it is a merge, |
|
309 | This returns baseformname with '.merge' appended if it is a merge, | |
310 | otherwise '.normal' is appended. |
|
310 | otherwise '.normal' is appended. | |
311 | """ |
|
311 | """ | |
312 | if isinstance(ctxorbool, bool): |
|
312 | if isinstance(ctxorbool, bool): | |
313 | if ctxorbool: |
|
313 | if ctxorbool: | |
314 | return baseformname + ".merge" |
|
314 | return baseformname + ".merge" | |
315 | elif 1 < len(ctxorbool.parents()): |
|
315 | elif 1 < len(ctxorbool.parents()): | |
316 | return baseformname + ".merge" |
|
316 | return baseformname + ".merge" | |
317 |
|
317 | |||
318 | return baseformname + ".normal" |
|
318 | return baseformname + ".normal" | |
319 |
|
319 | |||
320 | def getcommiteditor(edit=False, finishdesc=None, extramsg=None, |
|
320 | def getcommiteditor(edit=False, finishdesc=None, extramsg=None, | |
321 | editform='', **opts): |
|
321 | editform='', **opts): | |
322 | """get appropriate commit message editor according to '--edit' option |
|
322 | """get appropriate commit message editor according to '--edit' option | |
323 |
|
323 | |||
324 | 'finishdesc' is a function to be called with edited commit message |
|
324 | 'finishdesc' is a function to be called with edited commit message | |
325 | (= 'description' of the new changeset) just after editing, but |
|
325 | (= 'description' of the new changeset) just after editing, but | |
326 | before checking empty-ness. It should return actual text to be |
|
326 | before checking empty-ness. It should return actual text to be | |
327 | stored into history. This allows to change description before |
|
327 | stored into history. This allows to change description before | |
328 | storing. |
|
328 | storing. | |
329 |
|
329 | |||
330 | 'extramsg' is a extra message to be shown in the editor instead of |
|
330 | 'extramsg' is a extra message to be shown in the editor instead of | |
331 | 'Leave message empty to abort commit' line. 'HG: ' prefix and EOL |
|
331 | 'Leave message empty to abort commit' line. 'HG: ' prefix and EOL | |
332 | is automatically added. |
|
332 | is automatically added. | |
333 |
|
333 | |||
334 | 'editform' is a dot-separated list of names, to distinguish |
|
334 | 'editform' is a dot-separated list of names, to distinguish | |
335 | the purpose of commit text editing. |
|
335 | the purpose of commit text editing. | |
336 |
|
336 | |||
337 | 'getcommiteditor' returns 'commitforceeditor' regardless of |
|
337 | 'getcommiteditor' returns 'commitforceeditor' regardless of | |
338 | 'edit', if one of 'finishdesc' or 'extramsg' is specified, because |
|
338 | 'edit', if one of 'finishdesc' or 'extramsg' is specified, because | |
339 | they are specific for usage in MQ. |
|
339 | they are specific for usage in MQ. | |
340 | """ |
|
340 | """ | |
341 | if edit or finishdesc or extramsg: |
|
341 | if edit or finishdesc or extramsg: | |
342 | return lambda r, c, s: commitforceeditor(r, c, s, |
|
342 | return lambda r, c, s: commitforceeditor(r, c, s, | |
343 | finishdesc=finishdesc, |
|
343 | finishdesc=finishdesc, | |
344 | extramsg=extramsg, |
|
344 | extramsg=extramsg, | |
345 | editform=editform) |
|
345 | editform=editform) | |
346 | elif editform: |
|
346 | elif editform: | |
347 | return lambda r, c, s: commiteditor(r, c, s, editform=editform) |
|
347 | return lambda r, c, s: commiteditor(r, c, s, editform=editform) | |
348 | else: |
|
348 | else: | |
349 | return commiteditor |
|
349 | return commiteditor | |
350 |
|
350 | |||
351 | def loglimit(opts): |
|
351 | def loglimit(opts): | |
352 | """get the log limit according to option -l/--limit""" |
|
352 | """get the log limit according to option -l/--limit""" | |
353 | limit = opts.get('limit') |
|
353 | limit = opts.get('limit') | |
354 | if limit: |
|
354 | if limit: | |
355 | try: |
|
355 | try: | |
356 | limit = int(limit) |
|
356 | limit = int(limit) | |
357 | except ValueError: |
|
357 | except ValueError: | |
358 | raise util.Abort(_('limit must be a positive integer')) |
|
358 | raise util.Abort(_('limit must be a positive integer')) | |
359 | if limit <= 0: |
|
359 | if limit <= 0: | |
360 | raise util.Abort(_('limit must be positive')) |
|
360 | raise util.Abort(_('limit must be positive')) | |
361 | else: |
|
361 | else: | |
362 | limit = None |
|
362 | limit = None | |
363 | return limit |
|
363 | return limit | |
364 |
|
364 | |||
365 | def makefilename(repo, pat, node, desc=None, |
|
365 | def makefilename(repo, pat, node, desc=None, | |
366 | total=None, seqno=None, revwidth=None, pathname=None): |
|
366 | total=None, seqno=None, revwidth=None, pathname=None): | |
367 | node_expander = { |
|
367 | node_expander = { | |
368 | 'H': lambda: hex(node), |
|
368 | 'H': lambda: hex(node), | |
369 | 'R': lambda: str(repo.changelog.rev(node)), |
|
369 | 'R': lambda: str(repo.changelog.rev(node)), | |
370 | 'h': lambda: short(node), |
|
370 | 'h': lambda: short(node), | |
371 | 'm': lambda: re.sub('[^\w]', '_', str(desc)) |
|
371 | 'm': lambda: re.sub('[^\w]', '_', str(desc)) | |
372 | } |
|
372 | } | |
373 | expander = { |
|
373 | expander = { | |
374 | '%': lambda: '%', |
|
374 | '%': lambda: '%', | |
375 | 'b': lambda: os.path.basename(repo.root), |
|
375 | 'b': lambda: os.path.basename(repo.root), | |
376 | } |
|
376 | } | |
377 |
|
377 | |||
378 | try: |
|
378 | try: | |
379 | if node: |
|
379 | if node: | |
380 | expander.update(node_expander) |
|
380 | expander.update(node_expander) | |
381 | if node: |
|
381 | if node: | |
382 | expander['r'] = (lambda: |
|
382 | expander['r'] = (lambda: | |
383 | str(repo.changelog.rev(node)).zfill(revwidth or 0)) |
|
383 | str(repo.changelog.rev(node)).zfill(revwidth or 0)) | |
384 | if total is not None: |
|
384 | if total is not None: | |
385 | expander['N'] = lambda: str(total) |
|
385 | expander['N'] = lambda: str(total) | |
386 | if seqno is not None: |
|
386 | if seqno is not None: | |
387 | expander['n'] = lambda: str(seqno) |
|
387 | expander['n'] = lambda: str(seqno) | |
388 | if total is not None and seqno is not None: |
|
388 | if total is not None and seqno is not None: | |
389 | expander['n'] = lambda: str(seqno).zfill(len(str(total))) |
|
389 | expander['n'] = lambda: str(seqno).zfill(len(str(total))) | |
390 | if pathname is not None: |
|
390 | if pathname is not None: | |
391 | expander['s'] = lambda: os.path.basename(pathname) |
|
391 | expander['s'] = lambda: os.path.basename(pathname) | |
392 | expander['d'] = lambda: os.path.dirname(pathname) or '.' |
|
392 | expander['d'] = lambda: os.path.dirname(pathname) or '.' | |
393 | expander['p'] = lambda: pathname |
|
393 | expander['p'] = lambda: pathname | |
394 |
|
394 | |||
395 | newname = [] |
|
395 | newname = [] | |
396 | patlen = len(pat) |
|
396 | patlen = len(pat) | |
397 | i = 0 |
|
397 | i = 0 | |
398 | while i < patlen: |
|
398 | while i < patlen: | |
399 | c = pat[i] |
|
399 | c = pat[i] | |
400 | if c == '%': |
|
400 | if c == '%': | |
401 | i += 1 |
|
401 | i += 1 | |
402 | c = pat[i] |
|
402 | c = pat[i] | |
403 | c = expander[c]() |
|
403 | c = expander[c]() | |
404 | newname.append(c) |
|
404 | newname.append(c) | |
405 | i += 1 |
|
405 | i += 1 | |
406 | return ''.join(newname) |
|
406 | return ''.join(newname) | |
407 | except KeyError, inst: |
|
407 | except KeyError, inst: | |
408 | raise util.Abort(_("invalid format spec '%%%s' in output filename") % |
|
408 | raise util.Abort(_("invalid format spec '%%%s' in output filename") % | |
409 | inst.args[0]) |
|
409 | inst.args[0]) | |
410 |
|
410 | |||
411 | def makefileobj(repo, pat, node=None, desc=None, total=None, |
|
411 | def makefileobj(repo, pat, node=None, desc=None, total=None, | |
412 | seqno=None, revwidth=None, mode='wb', modemap=None, |
|
412 | seqno=None, revwidth=None, mode='wb', modemap=None, | |
413 | pathname=None): |
|
413 | pathname=None): | |
414 |
|
414 | |||
415 | writable = mode not in ('r', 'rb') |
|
415 | writable = mode not in ('r', 'rb') | |
416 |
|
416 | |||
417 | if not pat or pat == '-': |
|
417 | if not pat or pat == '-': | |
418 | if writable: |
|
418 | if writable: | |
419 | fp = repo.ui.fout |
|
419 | fp = repo.ui.fout | |
420 | else: |
|
420 | else: | |
421 | fp = repo.ui.fin |
|
421 | fp = repo.ui.fin | |
422 | if util.safehasattr(fp, 'fileno'): |
|
422 | if util.safehasattr(fp, 'fileno'): | |
423 | return os.fdopen(os.dup(fp.fileno()), mode) |
|
423 | return os.fdopen(os.dup(fp.fileno()), mode) | |
424 | else: |
|
424 | else: | |
425 | # if this fp can't be duped properly, return |
|
425 | # if this fp can't be duped properly, return | |
426 | # a dummy object that can be closed |
|
426 | # a dummy object that can be closed | |
427 | class wrappedfileobj(object): |
|
427 | class wrappedfileobj(object): | |
428 | noop = lambda x: None |
|
428 | noop = lambda x: None | |
429 | def __init__(self, f): |
|
429 | def __init__(self, f): | |
430 | self.f = f |
|
430 | self.f = f | |
431 | def __getattr__(self, attr): |
|
431 | def __getattr__(self, attr): | |
432 | if attr == 'close': |
|
432 | if attr == 'close': | |
433 | return self.noop |
|
433 | return self.noop | |
434 | else: |
|
434 | else: | |
435 | return getattr(self.f, attr) |
|
435 | return getattr(self.f, attr) | |
436 |
|
436 | |||
437 | return wrappedfileobj(fp) |
|
437 | return wrappedfileobj(fp) | |
438 | if util.safehasattr(pat, 'write') and writable: |
|
438 | if util.safehasattr(pat, 'write') and writable: | |
439 | return pat |
|
439 | return pat | |
440 | if util.safehasattr(pat, 'read') and 'r' in mode: |
|
440 | if util.safehasattr(pat, 'read') and 'r' in mode: | |
441 | return pat |
|
441 | return pat | |
442 | fn = makefilename(repo, pat, node, desc, total, seqno, revwidth, pathname) |
|
442 | fn = makefilename(repo, pat, node, desc, total, seqno, revwidth, pathname) | |
443 | if modemap is not None: |
|
443 | if modemap is not None: | |
444 | mode = modemap.get(fn, mode) |
|
444 | mode = modemap.get(fn, mode) | |
445 | if mode == 'wb': |
|
445 | if mode == 'wb': | |
446 | modemap[fn] = 'ab' |
|
446 | modemap[fn] = 'ab' | |
447 | return open(fn, mode) |
|
447 | return open(fn, mode) | |
448 |
|
448 | |||
449 | def openrevlog(repo, cmd, file_, opts): |
|
449 | def openrevlog(repo, cmd, file_, opts): | |
450 | """opens the changelog, manifest, a filelog or a given revlog""" |
|
450 | """opens the changelog, manifest, a filelog or a given revlog""" | |
451 | cl = opts['changelog'] |
|
451 | cl = opts['changelog'] | |
452 | mf = opts['manifest'] |
|
452 | mf = opts['manifest'] | |
453 | msg = None |
|
453 | msg = None | |
454 | if cl and mf: |
|
454 | if cl and mf: | |
455 | msg = _('cannot specify --changelog and --manifest at the same time') |
|
455 | msg = _('cannot specify --changelog and --manifest at the same time') | |
456 | elif cl or mf: |
|
456 | elif cl or mf: | |
457 | if file_: |
|
457 | if file_: | |
458 | msg = _('cannot specify filename with --changelog or --manifest') |
|
458 | msg = _('cannot specify filename with --changelog or --manifest') | |
459 | elif not repo: |
|
459 | elif not repo: | |
460 | msg = _('cannot specify --changelog or --manifest ' |
|
460 | msg = _('cannot specify --changelog or --manifest ' | |
461 | 'without a repository') |
|
461 | 'without a repository') | |
462 | if msg: |
|
462 | if msg: | |
463 | raise util.Abort(msg) |
|
463 | raise util.Abort(msg) | |
464 |
|
464 | |||
465 | r = None |
|
465 | r = None | |
466 | if repo: |
|
466 | if repo: | |
467 | if cl: |
|
467 | if cl: | |
468 | r = repo.unfiltered().changelog |
|
468 | r = repo.unfiltered().changelog | |
469 | elif mf: |
|
469 | elif mf: | |
470 | r = repo.manifest |
|
470 | r = repo.manifest | |
471 | elif file_: |
|
471 | elif file_: | |
472 | filelog = repo.file(file_) |
|
472 | filelog = repo.file(file_) | |
473 | if len(filelog): |
|
473 | if len(filelog): | |
474 | r = filelog |
|
474 | r = filelog | |
475 | if not r: |
|
475 | if not r: | |
476 | if not file_: |
|
476 | if not file_: | |
477 | raise error.CommandError(cmd, _('invalid arguments')) |
|
477 | raise error.CommandError(cmd, _('invalid arguments')) | |
478 | if not os.path.isfile(file_): |
|
478 | if not os.path.isfile(file_): | |
479 | raise util.Abort(_("revlog '%s' not found") % file_) |
|
479 | raise util.Abort(_("revlog '%s' not found") % file_) | |
480 | r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), |
|
480 | r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), | |
481 | file_[:-2] + ".i") |
|
481 | file_[:-2] + ".i") | |
482 | return r |
|
482 | return r | |
483 |
|
483 | |||
484 | def copy(ui, repo, pats, opts, rename=False): |
|
484 | def copy(ui, repo, pats, opts, rename=False): | |
485 | # called with the repo lock held |
|
485 | # called with the repo lock held | |
486 | # |
|
486 | # | |
487 | # hgsep => pathname that uses "/" to separate directories |
|
487 | # hgsep => pathname that uses "/" to separate directories | |
488 | # ossep => pathname that uses os.sep to separate directories |
|
488 | # ossep => pathname that uses os.sep to separate directories | |
489 | cwd = repo.getcwd() |
|
489 | cwd = repo.getcwd() | |
490 | targets = {} |
|
490 | targets = {} | |
491 | after = opts.get("after") |
|
491 | after = opts.get("after") | |
492 | dryrun = opts.get("dry_run") |
|
492 | dryrun = opts.get("dry_run") | |
493 | wctx = repo[None] |
|
493 | wctx = repo[None] | |
494 |
|
494 | |||
495 | def walkpat(pat): |
|
495 | def walkpat(pat): | |
496 | srcs = [] |
|
496 | srcs = [] | |
497 | if after: |
|
497 | if after: | |
498 | badstates = '?' |
|
498 | badstates = '?' | |
499 | else: |
|
499 | else: | |
500 | badstates = '?r' |
|
500 | badstates = '?r' | |
501 | m = scmutil.match(repo[None], [pat], opts, globbed=True) |
|
501 | m = scmutil.match(repo[None], [pat], opts, globbed=True) | |
502 | for abs in repo.walk(m): |
|
502 | for abs in repo.walk(m): | |
503 | state = repo.dirstate[abs] |
|
503 | state = repo.dirstate[abs] | |
504 | rel = m.rel(abs) |
|
504 | rel = m.rel(abs) | |
505 | exact = m.exact(abs) |
|
505 | exact = m.exact(abs) | |
506 | if state in badstates: |
|
506 | if state in badstates: | |
507 | if exact and state == '?': |
|
507 | if exact and state == '?': | |
508 | ui.warn(_('%s: not copying - file is not managed\n') % rel) |
|
508 | ui.warn(_('%s: not copying - file is not managed\n') % rel) | |
509 | if exact and state == 'r': |
|
509 | if exact and state == 'r': | |
510 | ui.warn(_('%s: not copying - file has been marked for' |
|
510 | ui.warn(_('%s: not copying - file has been marked for' | |
511 | ' remove\n') % rel) |
|
511 | ' remove\n') % rel) | |
512 | continue |
|
512 | continue | |
513 | # abs: hgsep |
|
513 | # abs: hgsep | |
514 | # rel: ossep |
|
514 | # rel: ossep | |
515 | srcs.append((abs, rel, exact)) |
|
515 | srcs.append((abs, rel, exact)) | |
516 | return srcs |
|
516 | return srcs | |
517 |
|
517 | |||
518 | # abssrc: hgsep |
|
518 | # abssrc: hgsep | |
519 | # relsrc: ossep |
|
519 | # relsrc: ossep | |
520 | # otarget: ossep |
|
520 | # otarget: ossep | |
521 | def copyfile(abssrc, relsrc, otarget, exact): |
|
521 | def copyfile(abssrc, relsrc, otarget, exact): | |
522 | abstarget = pathutil.canonpath(repo.root, cwd, otarget) |
|
522 | abstarget = pathutil.canonpath(repo.root, cwd, otarget) | |
523 | if '/' in abstarget: |
|
523 | if '/' in abstarget: | |
524 | # We cannot normalize abstarget itself, this would prevent |
|
524 | # We cannot normalize abstarget itself, this would prevent | |
525 | # case only renames, like a => A. |
|
525 | # case only renames, like a => A. | |
526 | abspath, absname = abstarget.rsplit('/', 1) |
|
526 | abspath, absname = abstarget.rsplit('/', 1) | |
527 | abstarget = repo.dirstate.normalize(abspath) + '/' + absname |
|
527 | abstarget = repo.dirstate.normalize(abspath) + '/' + absname | |
528 | reltarget = repo.pathto(abstarget, cwd) |
|
528 | reltarget = repo.pathto(abstarget, cwd) | |
529 | target = repo.wjoin(abstarget) |
|
529 | target = repo.wjoin(abstarget) | |
530 | src = repo.wjoin(abssrc) |
|
530 | src = repo.wjoin(abssrc) | |
531 | state = repo.dirstate[abstarget] |
|
531 | state = repo.dirstate[abstarget] | |
532 |
|
532 | |||
533 | scmutil.checkportable(ui, abstarget) |
|
533 | scmutil.checkportable(ui, abstarget) | |
534 |
|
534 | |||
535 | # check for collisions |
|
535 | # check for collisions | |
536 | prevsrc = targets.get(abstarget) |
|
536 | prevsrc = targets.get(abstarget) | |
537 | if prevsrc is not None: |
|
537 | if prevsrc is not None: | |
538 | ui.warn(_('%s: not overwriting - %s collides with %s\n') % |
|
538 | ui.warn(_('%s: not overwriting - %s collides with %s\n') % | |
539 | (reltarget, repo.pathto(abssrc, cwd), |
|
539 | (reltarget, repo.pathto(abssrc, cwd), | |
540 | repo.pathto(prevsrc, cwd))) |
|
540 | repo.pathto(prevsrc, cwd))) | |
541 | return |
|
541 | return | |
542 |
|
542 | |||
543 | # check for overwrites |
|
543 | # check for overwrites | |
544 | exists = os.path.lexists(target) |
|
544 | exists = os.path.lexists(target) | |
545 | samefile = False |
|
545 | samefile = False | |
546 | if exists and abssrc != abstarget: |
|
546 | if exists and abssrc != abstarget: | |
547 | if (repo.dirstate.normalize(abssrc) == |
|
547 | if (repo.dirstate.normalize(abssrc) == | |
548 | repo.dirstate.normalize(abstarget)): |
|
548 | repo.dirstate.normalize(abstarget)): | |
549 | if not rename: |
|
549 | if not rename: | |
550 | ui.warn(_("%s: can't copy - same file\n") % reltarget) |
|
550 | ui.warn(_("%s: can't copy - same file\n") % reltarget) | |
551 | return |
|
551 | return | |
552 | exists = False |
|
552 | exists = False | |
553 | samefile = True |
|
553 | samefile = True | |
554 |
|
554 | |||
555 | if not after and exists or after and state in 'mn': |
|
555 | if not after and exists or after and state in 'mn': | |
556 | if not opts['force']: |
|
556 | if not opts['force']: | |
557 | ui.warn(_('%s: not overwriting - file exists\n') % |
|
557 | ui.warn(_('%s: not overwriting - file exists\n') % | |
558 | reltarget) |
|
558 | reltarget) | |
559 | return |
|
559 | return | |
560 |
|
560 | |||
561 | if after: |
|
561 | if after: | |
562 | if not exists: |
|
562 | if not exists: | |
563 | if rename: |
|
563 | if rename: | |
564 | ui.warn(_('%s: not recording move - %s does not exist\n') % |
|
564 | ui.warn(_('%s: not recording move - %s does not exist\n') % | |
565 | (relsrc, reltarget)) |
|
565 | (relsrc, reltarget)) | |
566 | else: |
|
566 | else: | |
567 | ui.warn(_('%s: not recording copy - %s does not exist\n') % |
|
567 | ui.warn(_('%s: not recording copy - %s does not exist\n') % | |
568 | (relsrc, reltarget)) |
|
568 | (relsrc, reltarget)) | |
569 | return |
|
569 | return | |
570 | elif not dryrun: |
|
570 | elif not dryrun: | |
571 | try: |
|
571 | try: | |
572 | if exists: |
|
572 | if exists: | |
573 | os.unlink(target) |
|
573 | os.unlink(target) | |
574 | targetdir = os.path.dirname(target) or '.' |
|
574 | targetdir = os.path.dirname(target) or '.' | |
575 | if not os.path.isdir(targetdir): |
|
575 | if not os.path.isdir(targetdir): | |
576 | os.makedirs(targetdir) |
|
576 | os.makedirs(targetdir) | |
577 | if samefile: |
|
577 | if samefile: | |
578 | tmp = target + "~hgrename" |
|
578 | tmp = target + "~hgrename" | |
579 | os.rename(src, tmp) |
|
579 | os.rename(src, tmp) | |
580 | os.rename(tmp, target) |
|
580 | os.rename(tmp, target) | |
581 | else: |
|
581 | else: | |
582 | util.copyfile(src, target) |
|
582 | util.copyfile(src, target) | |
583 | srcexists = True |
|
583 | srcexists = True | |
584 | except IOError, inst: |
|
584 | except IOError, inst: | |
585 | if inst.errno == errno.ENOENT: |
|
585 | if inst.errno == errno.ENOENT: | |
586 | ui.warn(_('%s: deleted in working directory\n') % relsrc) |
|
586 | ui.warn(_('%s: deleted in working directory\n') % relsrc) | |
587 | srcexists = False |
|
587 | srcexists = False | |
588 | else: |
|
588 | else: | |
589 | ui.warn(_('%s: cannot copy - %s\n') % |
|
589 | ui.warn(_('%s: cannot copy - %s\n') % | |
590 | (relsrc, inst.strerror)) |
|
590 | (relsrc, inst.strerror)) | |
591 | return True # report a failure |
|
591 | return True # report a failure | |
592 |
|
592 | |||
593 | if ui.verbose or not exact: |
|
593 | if ui.verbose or not exact: | |
594 | if rename: |
|
594 | if rename: | |
595 | ui.status(_('moving %s to %s\n') % (relsrc, reltarget)) |
|
595 | ui.status(_('moving %s to %s\n') % (relsrc, reltarget)) | |
596 | else: |
|
596 | else: | |
597 | ui.status(_('copying %s to %s\n') % (relsrc, reltarget)) |
|
597 | ui.status(_('copying %s to %s\n') % (relsrc, reltarget)) | |
598 |
|
598 | |||
599 | targets[abstarget] = abssrc |
|
599 | targets[abstarget] = abssrc | |
600 |
|
600 | |||
601 | # fix up dirstate |
|
601 | # fix up dirstate | |
602 | scmutil.dirstatecopy(ui, repo, wctx, abssrc, abstarget, |
|
602 | scmutil.dirstatecopy(ui, repo, wctx, abssrc, abstarget, | |
603 | dryrun=dryrun, cwd=cwd) |
|
603 | dryrun=dryrun, cwd=cwd) | |
604 | if rename and not dryrun: |
|
604 | if rename and not dryrun: | |
605 | if not after and srcexists and not samefile: |
|
605 | if not after and srcexists and not samefile: | |
606 | util.unlinkpath(repo.wjoin(abssrc)) |
|
606 | util.unlinkpath(repo.wjoin(abssrc)) | |
607 | wctx.forget([abssrc]) |
|
607 | wctx.forget([abssrc]) | |
608 |
|
608 | |||
609 | # pat: ossep |
|
609 | # pat: ossep | |
610 | # dest ossep |
|
610 | # dest ossep | |
611 | # srcs: list of (hgsep, hgsep, ossep, bool) |
|
611 | # srcs: list of (hgsep, hgsep, ossep, bool) | |
612 | # return: function that takes hgsep and returns ossep |
|
612 | # return: function that takes hgsep and returns ossep | |
613 | def targetpathfn(pat, dest, srcs): |
|
613 | def targetpathfn(pat, dest, srcs): | |
614 | if os.path.isdir(pat): |
|
614 | if os.path.isdir(pat): | |
615 | abspfx = pathutil.canonpath(repo.root, cwd, pat) |
|
615 | abspfx = pathutil.canonpath(repo.root, cwd, pat) | |
616 | abspfx = util.localpath(abspfx) |
|
616 | abspfx = util.localpath(abspfx) | |
617 | if destdirexists: |
|
617 | if destdirexists: | |
618 | striplen = len(os.path.split(abspfx)[0]) |
|
618 | striplen = len(os.path.split(abspfx)[0]) | |
619 | else: |
|
619 | else: | |
620 | striplen = len(abspfx) |
|
620 | striplen = len(abspfx) | |
621 | if striplen: |
|
621 | if striplen: | |
622 | striplen += len(os.sep) |
|
622 | striplen += len(os.sep) | |
623 | res = lambda p: os.path.join(dest, util.localpath(p)[striplen:]) |
|
623 | res = lambda p: os.path.join(dest, util.localpath(p)[striplen:]) | |
624 | elif destdirexists: |
|
624 | elif destdirexists: | |
625 | res = lambda p: os.path.join(dest, |
|
625 | res = lambda p: os.path.join(dest, | |
626 | os.path.basename(util.localpath(p))) |
|
626 | os.path.basename(util.localpath(p))) | |
627 | else: |
|
627 | else: | |
628 | res = lambda p: dest |
|
628 | res = lambda p: dest | |
629 | return res |
|
629 | return res | |
630 |
|
630 | |||
631 | # pat: ossep |
|
631 | # pat: ossep | |
632 | # dest ossep |
|
632 | # dest ossep | |
633 | # srcs: list of (hgsep, hgsep, ossep, bool) |
|
633 | # srcs: list of (hgsep, hgsep, ossep, bool) | |
634 | # return: function that takes hgsep and returns ossep |
|
634 | # return: function that takes hgsep and returns ossep | |
635 | def targetpathafterfn(pat, dest, srcs): |
|
635 | def targetpathafterfn(pat, dest, srcs): | |
636 | if matchmod.patkind(pat): |
|
636 | if matchmod.patkind(pat): | |
637 | # a mercurial pattern |
|
637 | # a mercurial pattern | |
638 | res = lambda p: os.path.join(dest, |
|
638 | res = lambda p: os.path.join(dest, | |
639 | os.path.basename(util.localpath(p))) |
|
639 | os.path.basename(util.localpath(p))) | |
640 | else: |
|
640 | else: | |
641 | abspfx = pathutil.canonpath(repo.root, cwd, pat) |
|
641 | abspfx = pathutil.canonpath(repo.root, cwd, pat) | |
642 | if len(abspfx) < len(srcs[0][0]): |
|
642 | if len(abspfx) < len(srcs[0][0]): | |
643 | # A directory. Either the target path contains the last |
|
643 | # A directory. Either the target path contains the last | |
644 | # component of the source path or it does not. |
|
644 | # component of the source path or it does not. | |
645 | def evalpath(striplen): |
|
645 | def evalpath(striplen): | |
646 | score = 0 |
|
646 | score = 0 | |
647 | for s in srcs: |
|
647 | for s in srcs: | |
648 | t = os.path.join(dest, util.localpath(s[0])[striplen:]) |
|
648 | t = os.path.join(dest, util.localpath(s[0])[striplen:]) | |
649 | if os.path.lexists(t): |
|
649 | if os.path.lexists(t): | |
650 | score += 1 |
|
650 | score += 1 | |
651 | return score |
|
651 | return score | |
652 |
|
652 | |||
653 | abspfx = util.localpath(abspfx) |
|
653 | abspfx = util.localpath(abspfx) | |
654 | striplen = len(abspfx) |
|
654 | striplen = len(abspfx) | |
655 | if striplen: |
|
655 | if striplen: | |
656 | striplen += len(os.sep) |
|
656 | striplen += len(os.sep) | |
657 | if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])): |
|
657 | if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])): | |
658 | score = evalpath(striplen) |
|
658 | score = evalpath(striplen) | |
659 | striplen1 = len(os.path.split(abspfx)[0]) |
|
659 | striplen1 = len(os.path.split(abspfx)[0]) | |
660 | if striplen1: |
|
660 | if striplen1: | |
661 | striplen1 += len(os.sep) |
|
661 | striplen1 += len(os.sep) | |
662 | if evalpath(striplen1) > score: |
|
662 | if evalpath(striplen1) > score: | |
663 | striplen = striplen1 |
|
663 | striplen = striplen1 | |
664 | res = lambda p: os.path.join(dest, |
|
664 | res = lambda p: os.path.join(dest, | |
665 | util.localpath(p)[striplen:]) |
|
665 | util.localpath(p)[striplen:]) | |
666 | else: |
|
666 | else: | |
667 | # a file |
|
667 | # a file | |
668 | if destdirexists: |
|
668 | if destdirexists: | |
669 | res = lambda p: os.path.join(dest, |
|
669 | res = lambda p: os.path.join(dest, | |
670 | os.path.basename(util.localpath(p))) |
|
670 | os.path.basename(util.localpath(p))) | |
671 | else: |
|
671 | else: | |
672 | res = lambda p: dest |
|
672 | res = lambda p: dest | |
673 | return res |
|
673 | return res | |
674 |
|
674 | |||
675 | pats = scmutil.expandpats(pats) |
|
675 | pats = scmutil.expandpats(pats) | |
676 | if not pats: |
|
676 | if not pats: | |
677 | raise util.Abort(_('no source or destination specified')) |
|
677 | raise util.Abort(_('no source or destination specified')) | |
678 | if len(pats) == 1: |
|
678 | if len(pats) == 1: | |
679 | raise util.Abort(_('no destination specified')) |
|
679 | raise util.Abort(_('no destination specified')) | |
680 | dest = pats.pop() |
|
680 | dest = pats.pop() | |
681 | destdirexists = os.path.isdir(dest) and not os.path.islink(dest) |
|
681 | destdirexists = os.path.isdir(dest) and not os.path.islink(dest) | |
682 | if not destdirexists: |
|
682 | if not destdirexists: | |
683 | if len(pats) > 1 or matchmod.patkind(pats[0]): |
|
683 | if len(pats) > 1 or matchmod.patkind(pats[0]): | |
684 | raise util.Abort(_('with multiple sources, destination must be an ' |
|
684 | raise util.Abort(_('with multiple sources, destination must be an ' | |
685 | 'existing directory')) |
|
685 | 'existing directory')) | |
686 | if util.endswithsep(dest): |
|
686 | if util.endswithsep(dest): | |
687 | raise util.Abort(_('destination %s is not a directory') % dest) |
|
687 | raise util.Abort(_('destination %s is not a directory') % dest) | |
688 |
|
688 | |||
689 | tfn = targetpathfn |
|
689 | tfn = targetpathfn | |
690 | if after: |
|
690 | if after: | |
691 | tfn = targetpathafterfn |
|
691 | tfn = targetpathafterfn | |
692 | copylist = [] |
|
692 | copylist = [] | |
693 | for pat in pats: |
|
693 | for pat in pats: | |
694 | srcs = walkpat(pat) |
|
694 | srcs = walkpat(pat) | |
695 | if not srcs: |
|
695 | if not srcs: | |
696 | continue |
|
696 | continue | |
697 | copylist.append((tfn(pat, dest, srcs), srcs)) |
|
697 | copylist.append((tfn(pat, dest, srcs), srcs)) | |
698 | if not copylist: |
|
698 | if not copylist: | |
699 | raise util.Abort(_('no files to copy')) |
|
699 | raise util.Abort(_('no files to copy')) | |
700 |
|
700 | |||
701 | errors = 0 |
|
701 | errors = 0 | |
702 | for targetpath, srcs in copylist: |
|
702 | for targetpath, srcs in copylist: | |
703 | for abssrc, relsrc, exact in srcs: |
|
703 | for abssrc, relsrc, exact in srcs: | |
704 | if copyfile(abssrc, relsrc, targetpath(abssrc), exact): |
|
704 | if copyfile(abssrc, relsrc, targetpath(abssrc), exact): | |
705 | errors += 1 |
|
705 | errors += 1 | |
706 |
|
706 | |||
707 | if errors: |
|
707 | if errors: | |
708 | ui.warn(_('(consider using --after)\n')) |
|
708 | ui.warn(_('(consider using --after)\n')) | |
709 |
|
709 | |||
710 | return errors != 0 |
|
710 | return errors != 0 | |
711 |
|
711 | |||
712 | def service(opts, parentfn=None, initfn=None, runfn=None, logfile=None, |
|
712 | def service(opts, parentfn=None, initfn=None, runfn=None, logfile=None, | |
713 | runargs=None, appendpid=False): |
|
713 | runargs=None, appendpid=False): | |
714 | '''Run a command as a service.''' |
|
714 | '''Run a command as a service.''' | |
715 |
|
715 | |||
716 | def writepid(pid): |
|
716 | def writepid(pid): | |
717 | if opts['pid_file']: |
|
717 | if opts['pid_file']: | |
718 | if appendpid: |
|
718 | if appendpid: | |
719 | mode = 'a' |
|
719 | mode = 'a' | |
720 | else: |
|
720 | else: | |
721 | mode = 'w' |
|
721 | mode = 'w' | |
722 | fp = open(opts['pid_file'], mode) |
|
722 | fp = open(opts['pid_file'], mode) | |
723 | fp.write(str(pid) + '\n') |
|
723 | fp.write(str(pid) + '\n') | |
724 | fp.close() |
|
724 | fp.close() | |
725 |
|
725 | |||
726 | if opts['daemon'] and not opts['daemon_pipefds']: |
|
726 | if opts['daemon'] and not opts['daemon_pipefds']: | |
727 | # Signal child process startup with file removal |
|
727 | # Signal child process startup with file removal | |
728 | lockfd, lockpath = tempfile.mkstemp(prefix='hg-service-') |
|
728 | lockfd, lockpath = tempfile.mkstemp(prefix='hg-service-') | |
729 | os.close(lockfd) |
|
729 | os.close(lockfd) | |
730 | try: |
|
730 | try: | |
731 | if not runargs: |
|
731 | if not runargs: | |
732 | runargs = util.hgcmd() + sys.argv[1:] |
|
732 | runargs = util.hgcmd() + sys.argv[1:] | |
733 | runargs.append('--daemon-pipefds=%s' % lockpath) |
|
733 | runargs.append('--daemon-pipefds=%s' % lockpath) | |
734 | # Don't pass --cwd to the child process, because we've already |
|
734 | # Don't pass --cwd to the child process, because we've already | |
735 | # changed directory. |
|
735 | # changed directory. | |
736 | for i in xrange(1, len(runargs)): |
|
736 | for i in xrange(1, len(runargs)): | |
737 | if runargs[i].startswith('--cwd='): |
|
737 | if runargs[i].startswith('--cwd='): | |
738 | del runargs[i] |
|
738 | del runargs[i] | |
739 | break |
|
739 | break | |
740 | elif runargs[i].startswith('--cwd'): |
|
740 | elif runargs[i].startswith('--cwd'): | |
741 | del runargs[i:i + 2] |
|
741 | del runargs[i:i + 2] | |
742 | break |
|
742 | break | |
743 | def condfn(): |
|
743 | def condfn(): | |
744 | return not os.path.exists(lockpath) |
|
744 | return not os.path.exists(lockpath) | |
745 | pid = util.rundetached(runargs, condfn) |
|
745 | pid = util.rundetached(runargs, condfn) | |
746 | if pid < 0: |
|
746 | if pid < 0: | |
747 | raise util.Abort(_('child process failed to start')) |
|
747 | raise util.Abort(_('child process failed to start')) | |
748 | writepid(pid) |
|
748 | writepid(pid) | |
749 | finally: |
|
749 | finally: | |
750 | try: |
|
750 | try: | |
751 | os.unlink(lockpath) |
|
751 | os.unlink(lockpath) | |
752 | except OSError, e: |
|
752 | except OSError, e: | |
753 | if e.errno != errno.ENOENT: |
|
753 | if e.errno != errno.ENOENT: | |
754 | raise |
|
754 | raise | |
755 | if parentfn: |
|
755 | if parentfn: | |
756 | return parentfn(pid) |
|
756 | return parentfn(pid) | |
757 | else: |
|
757 | else: | |
758 | return |
|
758 | return | |
759 |
|
759 | |||
760 | if initfn: |
|
760 | if initfn: | |
761 | initfn() |
|
761 | initfn() | |
762 |
|
762 | |||
763 | if not opts['daemon']: |
|
763 | if not opts['daemon']: | |
764 | writepid(os.getpid()) |
|
764 | writepid(os.getpid()) | |
765 |
|
765 | |||
766 | if opts['daemon_pipefds']: |
|
766 | if opts['daemon_pipefds']: | |
767 | lockpath = opts['daemon_pipefds'] |
|
767 | lockpath = opts['daemon_pipefds'] | |
768 | try: |
|
768 | try: | |
769 | os.setsid() |
|
769 | os.setsid() | |
770 | except AttributeError: |
|
770 | except AttributeError: | |
771 | pass |
|
771 | pass | |
772 | os.unlink(lockpath) |
|
772 | os.unlink(lockpath) | |
773 | util.hidewindow() |
|
773 | util.hidewindow() | |
774 | sys.stdout.flush() |
|
774 | sys.stdout.flush() | |
775 | sys.stderr.flush() |
|
775 | sys.stderr.flush() | |
776 |
|
776 | |||
777 | nullfd = os.open(os.devnull, os.O_RDWR) |
|
777 | nullfd = os.open(os.devnull, os.O_RDWR) | |
778 | logfilefd = nullfd |
|
778 | logfilefd = nullfd | |
779 | if logfile: |
|
779 | if logfile: | |
780 | logfilefd = os.open(logfile, os.O_RDWR | os.O_CREAT | os.O_APPEND) |
|
780 | logfilefd = os.open(logfile, os.O_RDWR | os.O_CREAT | os.O_APPEND) | |
781 | os.dup2(nullfd, 0) |
|
781 | os.dup2(nullfd, 0) | |
782 | os.dup2(logfilefd, 1) |
|
782 | os.dup2(logfilefd, 1) | |
783 | os.dup2(logfilefd, 2) |
|
783 | os.dup2(logfilefd, 2) | |
784 | if nullfd not in (0, 1, 2): |
|
784 | if nullfd not in (0, 1, 2): | |
785 | os.close(nullfd) |
|
785 | os.close(nullfd) | |
786 | if logfile and logfilefd not in (0, 1, 2): |
|
786 | if logfile and logfilefd not in (0, 1, 2): | |
787 | os.close(logfilefd) |
|
787 | os.close(logfilefd) | |
788 |
|
788 | |||
789 | if runfn: |
|
789 | if runfn: | |
790 | return runfn() |
|
790 | return runfn() | |
791 |
|
791 | |||
792 | def tryimportone(ui, repo, hunk, parents, opts, msgs, updatefunc): |
|
792 | def tryimportone(ui, repo, hunk, parents, opts, msgs, updatefunc): | |
793 | """Utility function used by commands.import to import a single patch |
|
793 | """Utility function used by commands.import to import a single patch | |
794 |
|
794 | |||
795 | This function is explicitly defined here to help the evolve extension to |
|
795 | This function is explicitly defined here to help the evolve extension to | |
796 | wrap this part of the import logic. |
|
796 | wrap this part of the import logic. | |
797 |
|
797 | |||
798 | The API is currently a bit ugly because it a simple code translation from |
|
798 | The API is currently a bit ugly because it a simple code translation from | |
799 | the import command. Feel free to make it better. |
|
799 | the import command. Feel free to make it better. | |
800 |
|
800 | |||
801 | :hunk: a patch (as a binary string) |
|
801 | :hunk: a patch (as a binary string) | |
802 | :parents: nodes that will be parent of the created commit |
|
802 | :parents: nodes that will be parent of the created commit | |
803 | :opts: the full dict of option passed to the import command |
|
803 | :opts: the full dict of option passed to the import command | |
804 | :msgs: list to save commit message to. |
|
804 | :msgs: list to save commit message to. | |
805 | (used in case we need to save it when failing) |
|
805 | (used in case we need to save it when failing) | |
806 | :updatefunc: a function that update a repo to a given node |
|
806 | :updatefunc: a function that update a repo to a given node | |
807 | updatefunc(<repo>, <node>) |
|
807 | updatefunc(<repo>, <node>) | |
808 | """ |
|
808 | """ | |
809 | tmpname, message, user, date, branch, nodeid, p1, p2 = \ |
|
809 | tmpname, message, user, date, branch, nodeid, p1, p2 = \ | |
810 | patch.extract(ui, hunk) |
|
810 | patch.extract(ui, hunk) | |
811 |
|
811 | |||
812 | update = not opts.get('bypass') |
|
812 | update = not opts.get('bypass') | |
813 | strip = opts["strip"] |
|
813 | strip = opts["strip"] | |
814 | prefix = opts["prefix"] |
|
814 | prefix = opts["prefix"] | |
815 | sim = float(opts.get('similarity') or 0) |
|
815 | sim = float(opts.get('similarity') or 0) | |
816 | if not tmpname: |
|
816 | if not tmpname: | |
817 | return (None, None, False) |
|
817 | return (None, None, False) | |
818 | msg = _('applied to working directory') |
|
818 | msg = _('applied to working directory') | |
819 |
|
819 | |||
820 | rejects = False |
|
820 | rejects = False | |
821 |
|
821 | |||
822 | try: |
|
822 | try: | |
823 | cmdline_message = logmessage(ui, opts) |
|
823 | cmdline_message = logmessage(ui, opts) | |
824 | if cmdline_message: |
|
824 | if cmdline_message: | |
825 | # pickup the cmdline msg |
|
825 | # pickup the cmdline msg | |
826 | message = cmdline_message |
|
826 | message = cmdline_message | |
827 | elif message: |
|
827 | elif message: | |
828 | # pickup the patch msg |
|
828 | # pickup the patch msg | |
829 | message = message.strip() |
|
829 | message = message.strip() | |
830 | else: |
|
830 | else: | |
831 | # launch the editor |
|
831 | # launch the editor | |
832 | message = None |
|
832 | message = None | |
833 | ui.debug('message:\n%s\n' % message) |
|
833 | ui.debug('message:\n%s\n' % message) | |
834 |
|
834 | |||
835 | if len(parents) == 1: |
|
835 | if len(parents) == 1: | |
836 | parents.append(repo[nullid]) |
|
836 | parents.append(repo[nullid]) | |
837 | if opts.get('exact'): |
|
837 | if opts.get('exact'): | |
838 | if not nodeid or not p1: |
|
838 | if not nodeid or not p1: | |
839 | raise util.Abort(_('not a Mercurial patch')) |
|
839 | raise util.Abort(_('not a Mercurial patch')) | |
840 | p1 = repo[p1] |
|
840 | p1 = repo[p1] | |
841 | p2 = repo[p2 or nullid] |
|
841 | p2 = repo[p2 or nullid] | |
842 | elif p2: |
|
842 | elif p2: | |
843 | try: |
|
843 | try: | |
844 | p1 = repo[p1] |
|
844 | p1 = repo[p1] | |
845 | p2 = repo[p2] |
|
845 | p2 = repo[p2] | |
846 | # Without any options, consider p2 only if the |
|
846 | # Without any options, consider p2 only if the | |
847 | # patch is being applied on top of the recorded |
|
847 | # patch is being applied on top of the recorded | |
848 | # first parent. |
|
848 | # first parent. | |
849 | if p1 != parents[0]: |
|
849 | if p1 != parents[0]: | |
850 | p1 = parents[0] |
|
850 | p1 = parents[0] | |
851 | p2 = repo[nullid] |
|
851 | p2 = repo[nullid] | |
852 | except error.RepoError: |
|
852 | except error.RepoError: | |
853 | p1, p2 = parents |
|
853 | p1, p2 = parents | |
854 | if p2.node() == nullid: |
|
854 | if p2.node() == nullid: | |
855 | ui.warn(_("warning: import the patch as a normal revision\n" |
|
855 | ui.warn(_("warning: import the patch as a normal revision\n" | |
856 | "(use --exact to import the patch as a merge)\n")) |
|
856 | "(use --exact to import the patch as a merge)\n")) | |
857 | else: |
|
857 | else: | |
858 | p1, p2 = parents |
|
858 | p1, p2 = parents | |
859 |
|
859 | |||
860 | n = None |
|
860 | n = None | |
861 | if update: |
|
861 | if update: | |
862 | repo.dirstate.beginparentchange() |
|
862 | repo.dirstate.beginparentchange() | |
863 | if p1 != parents[0]: |
|
863 | if p1 != parents[0]: | |
864 | updatefunc(repo, p1.node()) |
|
864 | updatefunc(repo, p1.node()) | |
865 | if p2 != parents[1]: |
|
865 | if p2 != parents[1]: | |
866 | repo.setparents(p1.node(), p2.node()) |
|
866 | repo.setparents(p1.node(), p2.node()) | |
867 |
|
867 | |||
868 | if opts.get('exact') or opts.get('import_branch'): |
|
868 | if opts.get('exact') or opts.get('import_branch'): | |
869 | repo.dirstate.setbranch(branch or 'default') |
|
869 | repo.dirstate.setbranch(branch or 'default') | |
870 |
|
870 | |||
871 | partial = opts.get('partial', False) |
|
871 | partial = opts.get('partial', False) | |
872 | files = set() |
|
872 | files = set() | |
873 | try: |
|
873 | try: | |
874 | patch.patch(ui, repo, tmpname, strip=strip, prefix=prefix, |
|
874 | patch.patch(ui, repo, tmpname, strip=strip, prefix=prefix, | |
875 | files=files, eolmode=None, similarity=sim / 100.0) |
|
875 | files=files, eolmode=None, similarity=sim / 100.0) | |
876 | except patch.PatchError, e: |
|
876 | except patch.PatchError, e: | |
877 | if not partial: |
|
877 | if not partial: | |
878 | raise util.Abort(str(e)) |
|
878 | raise util.Abort(str(e)) | |
879 | if partial: |
|
879 | if partial: | |
880 | rejects = True |
|
880 | rejects = True | |
881 |
|
881 | |||
882 | files = list(files) |
|
882 | files = list(files) | |
883 | if opts.get('no_commit'): |
|
883 | if opts.get('no_commit'): | |
884 | if message: |
|
884 | if message: | |
885 | msgs.append(message) |
|
885 | msgs.append(message) | |
886 | else: |
|
886 | else: | |
887 | if opts.get('exact') or p2: |
|
887 | if opts.get('exact') or p2: | |
888 | # If you got here, you either use --force and know what |
|
888 | # If you got here, you either use --force and know what | |
889 | # you are doing or used --exact or a merge patch while |
|
889 | # you are doing or used --exact or a merge patch while | |
890 | # being updated to its first parent. |
|
890 | # being updated to its first parent. | |
891 | m = None |
|
891 | m = None | |
892 | else: |
|
892 | else: | |
893 | m = scmutil.matchfiles(repo, files or []) |
|
893 | m = scmutil.matchfiles(repo, files or []) | |
894 | editform = mergeeditform(repo[None], 'import.normal') |
|
894 | editform = mergeeditform(repo[None], 'import.normal') | |
895 | if opts.get('exact'): |
|
895 | if opts.get('exact'): | |
896 | editor = None |
|
896 | editor = None | |
897 | else: |
|
897 | else: | |
898 | editor = getcommiteditor(editform=editform, **opts) |
|
898 | editor = getcommiteditor(editform=editform, **opts) | |
899 | n = repo.commit(message, opts.get('user') or user, |
|
899 | n = repo.commit(message, opts.get('user') or user, | |
900 | opts.get('date') or date, match=m, |
|
900 | opts.get('date') or date, match=m, | |
901 | editor=editor, force=partial) |
|
901 | editor=editor, force=partial) | |
902 | repo.dirstate.endparentchange() |
|
902 | repo.dirstate.endparentchange() | |
903 | else: |
|
903 | else: | |
904 | if opts.get('exact') or opts.get('import_branch'): |
|
904 | if opts.get('exact') or opts.get('import_branch'): | |
905 | branch = branch or 'default' |
|
905 | branch = branch or 'default' | |
906 | else: |
|
906 | else: | |
907 | branch = p1.branch() |
|
907 | branch = p1.branch() | |
908 | store = patch.filestore() |
|
908 | store = patch.filestore() | |
909 | try: |
|
909 | try: | |
910 | files = set() |
|
910 | files = set() | |
911 | try: |
|
911 | try: | |
912 | patch.patchrepo(ui, repo, p1, store, tmpname, strip, prefix, |
|
912 | patch.patchrepo(ui, repo, p1, store, tmpname, strip, prefix, | |
913 | files, eolmode=None) |
|
913 | files, eolmode=None) | |
914 | except patch.PatchError, e: |
|
914 | except patch.PatchError, e: | |
915 | raise util.Abort(str(e)) |
|
915 | raise util.Abort(str(e)) | |
916 | if opts.get('exact'): |
|
916 | if opts.get('exact'): | |
917 | editor = None |
|
917 | editor = None | |
918 | else: |
|
918 | else: | |
919 | editor = getcommiteditor(editform='import.bypass') |
|
919 | editor = getcommiteditor(editform='import.bypass') | |
920 | memctx = context.makememctx(repo, (p1.node(), p2.node()), |
|
920 | memctx = context.makememctx(repo, (p1.node(), p2.node()), | |
921 | message, |
|
921 | message, | |
922 | opts.get('user') or user, |
|
922 | opts.get('user') or user, | |
923 | opts.get('date') or date, |
|
923 | opts.get('date') or date, | |
924 | branch, files, store, |
|
924 | branch, files, store, | |
925 | editor=editor) |
|
925 | editor=editor) | |
926 | n = memctx.commit() |
|
926 | n = memctx.commit() | |
927 | finally: |
|
927 | finally: | |
928 | store.close() |
|
928 | store.close() | |
929 | if opts.get('exact') and opts.get('no_commit'): |
|
929 | if opts.get('exact') and opts.get('no_commit'): | |
930 | # --exact with --no-commit is still useful in that it does merge |
|
930 | # --exact with --no-commit is still useful in that it does merge | |
931 | # and branch bits |
|
931 | # and branch bits | |
932 | ui.warn(_("warning: can't check exact import with --no-commit\n")) |
|
932 | ui.warn(_("warning: can't check exact import with --no-commit\n")) | |
933 | elif opts.get('exact') and hex(n) != nodeid: |
|
933 | elif opts.get('exact') and hex(n) != nodeid: | |
934 | raise util.Abort(_('patch is damaged or loses information')) |
|
934 | raise util.Abort(_('patch is damaged or loses information')) | |
935 | if n: |
|
935 | if n: | |
936 | # i18n: refers to a short changeset id |
|
936 | # i18n: refers to a short changeset id | |
937 | msg = _('created %s') % short(n) |
|
937 | msg = _('created %s') % short(n) | |
938 | return (msg, n, rejects) |
|
938 | return (msg, n, rejects) | |
939 | finally: |
|
939 | finally: | |
940 | os.unlink(tmpname) |
|
940 | os.unlink(tmpname) | |
941 |
|
941 | |||
942 | def export(repo, revs, template='hg-%h.patch', fp=None, switch_parent=False, |
|
942 | def export(repo, revs, template='hg-%h.patch', fp=None, switch_parent=False, | |
943 | opts=None): |
|
943 | opts=None): | |
944 | '''export changesets as hg patches.''' |
|
944 | '''export changesets as hg patches.''' | |
945 |
|
945 | |||
946 | total = len(revs) |
|
946 | total = len(revs) | |
947 | revwidth = max([len(str(rev)) for rev in revs]) |
|
947 | revwidth = max([len(str(rev)) for rev in revs]) | |
948 | filemode = {} |
|
948 | filemode = {} | |
949 |
|
949 | |||
950 | def single(rev, seqno, fp): |
|
950 | def single(rev, seqno, fp): | |
951 | ctx = repo[rev] |
|
951 | ctx = repo[rev] | |
952 | node = ctx.node() |
|
952 | node = ctx.node() | |
953 | parents = [p.node() for p in ctx.parents() if p] |
|
953 | parents = [p.node() for p in ctx.parents() if p] | |
954 | branch = ctx.branch() |
|
954 | branch = ctx.branch() | |
955 | if switch_parent: |
|
955 | if switch_parent: | |
956 | parents.reverse() |
|
956 | parents.reverse() | |
957 |
|
957 | |||
958 | if parents: |
|
958 | if parents: | |
959 | prev = parents[0] |
|
959 | prev = parents[0] | |
960 | else: |
|
960 | else: | |
961 | prev = nullid |
|
961 | prev = nullid | |
962 |
|
962 | |||
963 | shouldclose = False |
|
963 | shouldclose = False | |
964 | if not fp and len(template) > 0: |
|
964 | if not fp and len(template) > 0: | |
965 | desc_lines = ctx.description().rstrip().split('\n') |
|
965 | desc_lines = ctx.description().rstrip().split('\n') | |
966 | desc = desc_lines[0] #Commit always has a first line. |
|
966 | desc = desc_lines[0] #Commit always has a first line. | |
967 | fp = makefileobj(repo, template, node, desc=desc, total=total, |
|
967 | fp = makefileobj(repo, template, node, desc=desc, total=total, | |
968 | seqno=seqno, revwidth=revwidth, mode='wb', |
|
968 | seqno=seqno, revwidth=revwidth, mode='wb', | |
969 | modemap=filemode) |
|
969 | modemap=filemode) | |
970 | if fp != template: |
|
970 | if fp != template: | |
971 | shouldclose = True |
|
971 | shouldclose = True | |
972 | if fp and fp != sys.stdout and util.safehasattr(fp, 'name'): |
|
972 | if fp and fp != sys.stdout and util.safehasattr(fp, 'name'): | |
973 | repo.ui.note("%s\n" % fp.name) |
|
973 | repo.ui.note("%s\n" % fp.name) | |
974 |
|
974 | |||
975 | if not fp: |
|
975 | if not fp: | |
976 | write = repo.ui.write |
|
976 | write = repo.ui.write | |
977 | else: |
|
977 | else: | |
978 | def write(s, **kw): |
|
978 | def write(s, **kw): | |
979 | fp.write(s) |
|
979 | fp.write(s) | |
980 |
|
980 | |||
981 | write("# HG changeset patch\n") |
|
981 | write("# HG changeset patch\n") | |
982 | write("# User %s\n" % ctx.user()) |
|
982 | write("# User %s\n" % ctx.user()) | |
983 | write("# Date %d %d\n" % ctx.date()) |
|
983 | write("# Date %d %d\n" % ctx.date()) | |
984 | write("# %s\n" % util.datestr(ctx.date())) |
|
984 | write("# %s\n" % util.datestr(ctx.date())) | |
985 | if branch and branch != 'default': |
|
985 | if branch and branch != 'default': | |
986 | write("# Branch %s\n" % branch) |
|
986 | write("# Branch %s\n" % branch) | |
987 | write("# Node ID %s\n" % hex(node)) |
|
987 | write("# Node ID %s\n" % hex(node)) | |
988 | write("# Parent %s\n" % hex(prev)) |
|
988 | write("# Parent %s\n" % hex(prev)) | |
989 | if len(parents) > 1: |
|
989 | if len(parents) > 1: | |
990 | write("# Parent %s\n" % hex(parents[1])) |
|
990 | write("# Parent %s\n" % hex(parents[1])) | |
991 | write(ctx.description().rstrip()) |
|
991 | write(ctx.description().rstrip()) | |
992 | write("\n\n") |
|
992 | write("\n\n") | |
993 |
|
993 | |||
994 | for chunk, label in patch.diffui(repo, prev, node, opts=opts): |
|
994 | for chunk, label in patch.diffui(repo, prev, node, opts=opts): | |
995 | write(chunk, label=label) |
|
995 | write(chunk, label=label) | |
996 |
|
996 | |||
997 | if shouldclose: |
|
997 | if shouldclose: | |
998 | fp.close() |
|
998 | fp.close() | |
999 |
|
999 | |||
1000 | for seqno, rev in enumerate(revs): |
|
1000 | for seqno, rev in enumerate(revs): | |
1001 | single(rev, seqno + 1, fp) |
|
1001 | single(rev, seqno + 1, fp) | |
1002 |
|
1002 | |||
1003 | def diffordiffstat(ui, repo, diffopts, node1, node2, match, |
|
1003 | def diffordiffstat(ui, repo, diffopts, node1, node2, match, | |
1004 | changes=None, stat=False, fp=None, prefix='', |
|
1004 | changes=None, stat=False, fp=None, prefix='', | |
1005 | root='', listsubrepos=False): |
|
1005 | root='', listsubrepos=False): | |
1006 | '''show diff or diffstat.''' |
|
1006 | '''show diff or diffstat.''' | |
1007 | if fp is None: |
|
1007 | if fp is None: | |
1008 | write = ui.write |
|
1008 | write = ui.write | |
1009 | else: |
|
1009 | else: | |
1010 | def write(s, **kw): |
|
1010 | def write(s, **kw): | |
1011 | fp.write(s) |
|
1011 | fp.write(s) | |
1012 |
|
1012 | |||
1013 | if root: |
|
1013 | if root: | |
1014 | relroot = pathutil.canonpath(repo.root, repo.getcwd(), root) |
|
1014 | relroot = pathutil.canonpath(repo.root, repo.getcwd(), root) | |
1015 | else: |
|
1015 | else: | |
1016 | relroot = '' |
|
1016 | relroot = '' | |
1017 | if relroot != '': |
|
1017 | if relroot != '': | |
1018 | # XXX relative roots currently don't work if the root is within a |
|
1018 | # XXX relative roots currently don't work if the root is within a | |
1019 | # subrepo |
|
1019 | # subrepo | |
1020 | uirelroot = match.uipath(relroot) |
|
1020 | uirelroot = match.uipath(relroot) | |
1021 | relroot += '/' |
|
1021 | relroot += '/' | |
1022 | for matchroot in match.files(): |
|
1022 | for matchroot in match.files(): | |
1023 | if not matchroot.startswith(relroot): |
|
1023 | if not matchroot.startswith(relroot): | |
1024 | ui.warn(_('warning: %s not inside relative root %s\n') % ( |
|
1024 | ui.warn(_('warning: %s not inside relative root %s\n') % ( | |
1025 | match.uipath(matchroot), uirelroot)) |
|
1025 | match.uipath(matchroot), uirelroot)) | |
1026 |
|
1026 | |||
1027 | if stat: |
|
1027 | if stat: | |
1028 | diffopts = diffopts.copy(context=0) |
|
1028 | diffopts = diffopts.copy(context=0) | |
1029 | width = 80 |
|
1029 | width = 80 | |
1030 | if not ui.plain(): |
|
1030 | if not ui.plain(): | |
1031 | width = ui.termwidth() |
|
1031 | width = ui.termwidth() | |
1032 | chunks = patch.diff(repo, node1, node2, match, changes, diffopts, |
|
1032 | chunks = patch.diff(repo, node1, node2, match, changes, diffopts, | |
1033 | prefix=prefix, relroot=relroot) |
|
1033 | prefix=prefix, relroot=relroot) | |
1034 | for chunk, label in patch.diffstatui(util.iterlines(chunks), |
|
1034 | for chunk, label in patch.diffstatui(util.iterlines(chunks), | |
1035 | width=width, |
|
1035 | width=width, | |
1036 | git=diffopts.git): |
|
1036 | git=diffopts.git): | |
1037 | write(chunk, label=label) |
|
1037 | write(chunk, label=label) | |
1038 | else: |
|
1038 | else: | |
1039 | for chunk, label in patch.diffui(repo, node1, node2, match, |
|
1039 | for chunk, label in patch.diffui(repo, node1, node2, match, | |
1040 | changes, diffopts, prefix=prefix, |
|
1040 | changes, diffopts, prefix=prefix, | |
1041 | relroot=relroot): |
|
1041 | relroot=relroot): | |
1042 | write(chunk, label=label) |
|
1042 | write(chunk, label=label) | |
1043 |
|
1043 | |||
1044 | if listsubrepos: |
|
1044 | if listsubrepos: | |
1045 | ctx1 = repo[node1] |
|
1045 | ctx1 = repo[node1] | |
1046 | ctx2 = repo[node2] |
|
1046 | ctx2 = repo[node2] | |
1047 | for subpath, sub in scmutil.itersubrepos(ctx1, ctx2): |
|
1047 | for subpath, sub in scmutil.itersubrepos(ctx1, ctx2): | |
1048 | tempnode2 = node2 |
|
1048 | tempnode2 = node2 | |
1049 | try: |
|
1049 | try: | |
1050 | if node2 is not None: |
|
1050 | if node2 is not None: | |
1051 | tempnode2 = ctx2.substate[subpath][1] |
|
1051 | tempnode2 = ctx2.substate[subpath][1] | |
1052 | except KeyError: |
|
1052 | except KeyError: | |
1053 | # A subrepo that existed in node1 was deleted between node1 and |
|
1053 | # A subrepo that existed in node1 was deleted between node1 and | |
1054 | # node2 (inclusive). Thus, ctx2's substate won't contain that |
|
1054 | # node2 (inclusive). Thus, ctx2's substate won't contain that | |
1055 | # subpath. The best we can do is to ignore it. |
|
1055 | # subpath. The best we can do is to ignore it. | |
1056 | tempnode2 = None |
|
1056 | tempnode2 = None | |
1057 | submatch = matchmod.narrowmatcher(subpath, match) |
|
1057 | submatch = matchmod.narrowmatcher(subpath, match) | |
1058 | sub.diff(ui, diffopts, tempnode2, submatch, changes=changes, |
|
1058 | sub.diff(ui, diffopts, tempnode2, submatch, changes=changes, | |
1059 | stat=stat, fp=fp, prefix=prefix) |
|
1059 | stat=stat, fp=fp, prefix=prefix) | |
1060 |
|
1060 | |||
1061 | class changeset_printer(object): |
|
1061 | class changeset_printer(object): | |
1062 | '''show changeset information when templating not requested.''' |
|
1062 | '''show changeset information when templating not requested.''' | |
1063 |
|
1063 | |||
1064 | def __init__(self, ui, repo, matchfn, diffopts, buffered): |
|
1064 | def __init__(self, ui, repo, matchfn, diffopts, buffered): | |
1065 | self.ui = ui |
|
1065 | self.ui = ui | |
1066 | self.repo = repo |
|
1066 | self.repo = repo | |
1067 | self.buffered = buffered |
|
1067 | self.buffered = buffered | |
1068 | self.matchfn = matchfn |
|
1068 | self.matchfn = matchfn | |
1069 | self.diffopts = diffopts |
|
1069 | self.diffopts = diffopts | |
1070 | self.header = {} |
|
1070 | self.header = {} | |
1071 | self.hunk = {} |
|
1071 | self.hunk = {} | |
1072 | self.lastheader = None |
|
1072 | self.lastheader = None | |
1073 | self.footer = None |
|
1073 | self.footer = None | |
1074 |
|
1074 | |||
1075 | def flush(self, rev): |
|
1075 | def flush(self, rev): | |
1076 | if rev in self.header: |
|
1076 | if rev in self.header: | |
1077 | h = self.header[rev] |
|
1077 | h = self.header[rev] | |
1078 | if h != self.lastheader: |
|
1078 | if h != self.lastheader: | |
1079 | self.lastheader = h |
|
1079 | self.lastheader = h | |
1080 | self.ui.write(h) |
|
1080 | self.ui.write(h) | |
1081 | del self.header[rev] |
|
1081 | del self.header[rev] | |
1082 | if rev in self.hunk: |
|
1082 | if rev in self.hunk: | |
1083 | self.ui.write(self.hunk[rev]) |
|
1083 | self.ui.write(self.hunk[rev]) | |
1084 | del self.hunk[rev] |
|
1084 | del self.hunk[rev] | |
1085 | return 1 |
|
1085 | return 1 | |
1086 | return 0 |
|
1086 | return 0 | |
1087 |
|
1087 | |||
1088 | def close(self): |
|
1088 | def close(self): | |
1089 | if self.footer: |
|
1089 | if self.footer: | |
1090 | self.ui.write(self.footer) |
|
1090 | self.ui.write(self.footer) | |
1091 |
|
1091 | |||
1092 | def show(self, ctx, copies=None, matchfn=None, **props): |
|
1092 | def show(self, ctx, copies=None, matchfn=None, **props): | |
1093 | if self.buffered: |
|
1093 | if self.buffered: | |
1094 | self.ui.pushbuffer() |
|
1094 | self.ui.pushbuffer() | |
1095 | self._show(ctx, copies, matchfn, props) |
|
1095 | self._show(ctx, copies, matchfn, props) | |
1096 | self.hunk[ctx.rev()] = self.ui.popbuffer(labeled=True) |
|
1096 | self.hunk[ctx.rev()] = self.ui.popbuffer(labeled=True) | |
1097 | else: |
|
1097 | else: | |
1098 | self._show(ctx, copies, matchfn, props) |
|
1098 | self._show(ctx, copies, matchfn, props) | |
1099 |
|
1099 | |||
1100 | def _show(self, ctx, copies, matchfn, props): |
|
1100 | def _show(self, ctx, copies, matchfn, props): | |
1101 | '''show a single changeset or file revision''' |
|
1101 | '''show a single changeset or file revision''' | |
1102 | changenode = ctx.node() |
|
1102 | changenode = ctx.node() | |
1103 | rev = ctx.rev() |
|
1103 | rev = ctx.rev() | |
1104 | if self.ui.debugflag: |
|
1104 | if self.ui.debugflag: | |
1105 | hexfunc = hex |
|
1105 | hexfunc = hex | |
1106 | else: |
|
1106 | else: | |
1107 | hexfunc = short |
|
1107 | hexfunc = short | |
1108 | if rev is None: |
|
1108 | if rev is None: | |
1109 | pctx = ctx.p1() |
|
1109 | pctx = ctx.p1() | |
1110 | revnode = (pctx.rev(), hexfunc(pctx.node()) + '+') |
|
1110 | revnode = (pctx.rev(), hexfunc(pctx.node()) + '+') | |
1111 | else: |
|
1111 | else: | |
1112 | revnode = (rev, hexfunc(changenode)) |
|
1112 | revnode = (rev, hexfunc(changenode)) | |
1113 |
|
1113 | |||
1114 | if self.ui.quiet: |
|
1114 | if self.ui.quiet: | |
1115 | self.ui.write("%d:%s\n" % revnode, label='log.node') |
|
1115 | self.ui.write("%d:%s\n" % revnode, label='log.node') | |
1116 | return |
|
1116 | return | |
1117 |
|
1117 | |||
1118 | date = util.datestr(ctx.date()) |
|
1118 | date = util.datestr(ctx.date()) | |
1119 |
|
1119 | |||
1120 | # i18n: column positioning for "hg log" |
|
1120 | # i18n: column positioning for "hg log" | |
1121 | self.ui.write(_("changeset: %d:%s\n") % revnode, |
|
1121 | self.ui.write(_("changeset: %d:%s\n") % revnode, | |
1122 | label='log.changeset changeset.%s' % ctx.phasestr()) |
|
1122 | label='log.changeset changeset.%s' % ctx.phasestr()) | |
1123 |
|
1123 | |||
1124 | # branches are shown first before any other names due to backwards |
|
1124 | # branches are shown first before any other names due to backwards | |
1125 | # compatibility |
|
1125 | # compatibility | |
1126 | branch = ctx.branch() |
|
1126 | branch = ctx.branch() | |
1127 | # don't show the default branch name |
|
1127 | # don't show the default branch name | |
1128 | if branch != 'default': |
|
1128 | if branch != 'default': | |
1129 | # i18n: column positioning for "hg log" |
|
1129 | # i18n: column positioning for "hg log" | |
1130 | self.ui.write(_("branch: %s\n") % branch, |
|
1130 | self.ui.write(_("branch: %s\n") % branch, | |
1131 | label='log.branch') |
|
1131 | label='log.branch') | |
1132 |
|
1132 | |||
1133 | for name, ns in self.repo.names.iteritems(): |
|
1133 | for name, ns in self.repo.names.iteritems(): | |
1134 | # branches has special logic already handled above, so here we just |
|
1134 | # branches has special logic already handled above, so here we just | |
1135 | # skip it |
|
1135 | # skip it | |
1136 | if name == 'branches': |
|
1136 | if name == 'branches': | |
1137 | continue |
|
1137 | continue | |
1138 | # we will use the templatename as the color name since those two |
|
1138 | # we will use the templatename as the color name since those two | |
1139 | # should be the same |
|
1139 | # should be the same | |
1140 | for name in ns.names(self.repo, changenode): |
|
1140 | for name in ns.names(self.repo, changenode): | |
1141 | self.ui.write(ns.logfmt % name, |
|
1141 | self.ui.write(ns.logfmt % name, | |
1142 | label='log.%s' % ns.colorname) |
|
1142 | label='log.%s' % ns.colorname) | |
1143 | if self.ui.debugflag: |
|
1143 | if self.ui.debugflag: | |
1144 | # i18n: column positioning for "hg log" |
|
1144 | # i18n: column positioning for "hg log" | |
1145 | self.ui.write(_("phase: %s\n") % _(ctx.phasestr()), |
|
1145 | self.ui.write(_("phase: %s\n") % _(ctx.phasestr()), | |
1146 | label='log.phase') |
|
1146 | label='log.phase') | |
1147 | for pctx in self._meaningful_parentrevs(ctx): |
|
1147 | for pctx in self._meaningful_parentrevs(ctx): | |
1148 | label = 'log.parent changeset.%s' % pctx.phasestr() |
|
1148 | label = 'log.parent changeset.%s' % pctx.phasestr() | |
1149 | # i18n: column positioning for "hg log" |
|
1149 | # i18n: column positioning for "hg log" | |
1150 | self.ui.write(_("parent: %d:%s\n") |
|
1150 | self.ui.write(_("parent: %d:%s\n") | |
1151 | % (pctx.rev(), hexfunc(pctx.node())), |
|
1151 | % (pctx.rev(), hexfunc(pctx.node())), | |
1152 | label=label) |
|
1152 | label=label) | |
1153 |
|
1153 | |||
1154 | if self.ui.debugflag and rev is not None: |
|
1154 | if self.ui.debugflag and rev is not None: | |
1155 | mnode = ctx.manifestnode() |
|
1155 | mnode = ctx.manifestnode() | |
1156 | # i18n: column positioning for "hg log" |
|
1156 | # i18n: column positioning for "hg log" | |
1157 | self.ui.write(_("manifest: %d:%s\n") % |
|
1157 | self.ui.write(_("manifest: %d:%s\n") % | |
1158 | (self.repo.manifest.rev(mnode), hex(mnode)), |
|
1158 | (self.repo.manifest.rev(mnode), hex(mnode)), | |
1159 | label='ui.debug log.manifest') |
|
1159 | label='ui.debug log.manifest') | |
1160 | # i18n: column positioning for "hg log" |
|
1160 | # i18n: column positioning for "hg log" | |
1161 | self.ui.write(_("user: %s\n") % ctx.user(), |
|
1161 | self.ui.write(_("user: %s\n") % ctx.user(), | |
1162 | label='log.user') |
|
1162 | label='log.user') | |
1163 | # i18n: column positioning for "hg log" |
|
1163 | # i18n: column positioning for "hg log" | |
1164 | self.ui.write(_("date: %s\n") % date, |
|
1164 | self.ui.write(_("date: %s\n") % date, | |
1165 | label='log.date') |
|
1165 | label='log.date') | |
1166 |
|
1166 | |||
1167 | if self.ui.debugflag: |
|
1167 | if self.ui.debugflag: | |
1168 | files = ctx.p1().status(ctx)[:3] |
|
1168 | files = ctx.p1().status(ctx)[:3] | |
1169 | for key, value in zip([# i18n: column positioning for "hg log" |
|
1169 | for key, value in zip([# i18n: column positioning for "hg log" | |
1170 | _("files:"), |
|
1170 | _("files:"), | |
1171 | # i18n: column positioning for "hg log" |
|
1171 | # i18n: column positioning for "hg log" | |
1172 | _("files+:"), |
|
1172 | _("files+:"), | |
1173 | # i18n: column positioning for "hg log" |
|
1173 | # i18n: column positioning for "hg log" | |
1174 | _("files-:")], files): |
|
1174 | _("files-:")], files): | |
1175 | if value: |
|
1175 | if value: | |
1176 | self.ui.write("%-12s %s\n" % (key, " ".join(value)), |
|
1176 | self.ui.write("%-12s %s\n" % (key, " ".join(value)), | |
1177 | label='ui.debug log.files') |
|
1177 | label='ui.debug log.files') | |
1178 | elif ctx.files() and self.ui.verbose: |
|
1178 | elif ctx.files() and self.ui.verbose: | |
1179 | # i18n: column positioning for "hg log" |
|
1179 | # i18n: column positioning for "hg log" | |
1180 | self.ui.write(_("files: %s\n") % " ".join(ctx.files()), |
|
1180 | self.ui.write(_("files: %s\n") % " ".join(ctx.files()), | |
1181 | label='ui.note log.files') |
|
1181 | label='ui.note log.files') | |
1182 | if copies and self.ui.verbose: |
|
1182 | if copies and self.ui.verbose: | |
1183 | copies = ['%s (%s)' % c for c in copies] |
|
1183 | copies = ['%s (%s)' % c for c in copies] | |
1184 | # i18n: column positioning for "hg log" |
|
1184 | # i18n: column positioning for "hg log" | |
1185 | self.ui.write(_("copies: %s\n") % ' '.join(copies), |
|
1185 | self.ui.write(_("copies: %s\n") % ' '.join(copies), | |
1186 | label='ui.note log.copies') |
|
1186 | label='ui.note log.copies') | |
1187 |
|
1187 | |||
1188 | extra = ctx.extra() |
|
1188 | extra = ctx.extra() | |
1189 | if extra and self.ui.debugflag: |
|
1189 | if extra and self.ui.debugflag: | |
1190 | for key, value in sorted(extra.items()): |
|
1190 | for key, value in sorted(extra.items()): | |
1191 | # i18n: column positioning for "hg log" |
|
1191 | # i18n: column positioning for "hg log" | |
1192 | self.ui.write(_("extra: %s=%s\n") |
|
1192 | self.ui.write(_("extra: %s=%s\n") | |
1193 | % (key, value.encode('string_escape')), |
|
1193 | % (key, value.encode('string_escape')), | |
1194 | label='ui.debug log.extra') |
|
1194 | label='ui.debug log.extra') | |
1195 |
|
1195 | |||
1196 | description = ctx.description().strip() |
|
1196 | description = ctx.description().strip() | |
1197 | if description: |
|
1197 | if description: | |
1198 | if self.ui.verbose: |
|
1198 | if self.ui.verbose: | |
1199 | self.ui.write(_("description:\n"), |
|
1199 | self.ui.write(_("description:\n"), | |
1200 | label='ui.note log.description') |
|
1200 | label='ui.note log.description') | |
1201 | self.ui.write(description, |
|
1201 | self.ui.write(description, | |
1202 | label='ui.note log.description') |
|
1202 | label='ui.note log.description') | |
1203 | self.ui.write("\n\n") |
|
1203 | self.ui.write("\n\n") | |
1204 | else: |
|
1204 | else: | |
1205 | # i18n: column positioning for "hg log" |
|
1205 | # i18n: column positioning for "hg log" | |
1206 | self.ui.write(_("summary: %s\n") % |
|
1206 | self.ui.write(_("summary: %s\n") % | |
1207 | description.splitlines()[0], |
|
1207 | description.splitlines()[0], | |
1208 | label='log.summary') |
|
1208 | label='log.summary') | |
1209 | self.ui.write("\n") |
|
1209 | self.ui.write("\n") | |
1210 |
|
1210 | |||
1211 | self.showpatch(changenode, matchfn) |
|
1211 | self.showpatch(changenode, matchfn) | |
1212 |
|
1212 | |||
1213 | def showpatch(self, node, matchfn): |
|
1213 | def showpatch(self, node, matchfn): | |
1214 | if not matchfn: |
|
1214 | if not matchfn: | |
1215 | matchfn = self.matchfn |
|
1215 | matchfn = self.matchfn | |
1216 | if matchfn: |
|
1216 | if matchfn: | |
1217 | stat = self.diffopts.get('stat') |
|
1217 | stat = self.diffopts.get('stat') | |
1218 | diff = self.diffopts.get('patch') |
|
1218 | diff = self.diffopts.get('patch') | |
1219 | diffopts = patch.diffallopts(self.ui, self.diffopts) |
|
1219 | diffopts = patch.diffallopts(self.ui, self.diffopts) | |
1220 | prev = self.repo.changelog.parents(node)[0] |
|
1220 | prev = self.repo.changelog.parents(node)[0] | |
1221 | if stat: |
|
1221 | if stat: | |
1222 | diffordiffstat(self.ui, self.repo, diffopts, prev, node, |
|
1222 | diffordiffstat(self.ui, self.repo, diffopts, prev, node, | |
1223 | match=matchfn, stat=True) |
|
1223 | match=matchfn, stat=True) | |
1224 | if diff: |
|
1224 | if diff: | |
1225 | if stat: |
|
1225 | if stat: | |
1226 | self.ui.write("\n") |
|
1226 | self.ui.write("\n") | |
1227 | diffordiffstat(self.ui, self.repo, diffopts, prev, node, |
|
1227 | diffordiffstat(self.ui, self.repo, diffopts, prev, node, | |
1228 | match=matchfn, stat=False) |
|
1228 | match=matchfn, stat=False) | |
1229 | self.ui.write("\n") |
|
1229 | self.ui.write("\n") | |
1230 |
|
1230 | |||
1231 | def _meaningful_parentrevs(self, ctx): |
|
1231 | def _meaningful_parentrevs(self, ctx): | |
1232 | """Return list of meaningful (or all if debug) parentrevs for rev. |
|
1232 | """Return list of meaningful (or all if debug) parentrevs for rev. | |
1233 |
|
1233 | |||
1234 | For merges (two non-nullrev revisions) both parents are meaningful. |
|
1234 | For merges (two non-nullrev revisions) both parents are meaningful. | |
1235 | Otherwise the first parent revision is considered meaningful if it |
|
1235 | Otherwise the first parent revision is considered meaningful if it | |
1236 | is not the preceding revision. |
|
1236 | is not the preceding revision. | |
1237 | """ |
|
1237 | """ | |
1238 | parents = ctx.parents() |
|
1238 | parents = ctx.parents() | |
1239 | if len(parents) > 1: |
|
1239 | if len(parents) > 1: | |
1240 | return parents |
|
1240 | return parents | |
1241 | if self.ui.debugflag: |
|
1241 | if self.ui.debugflag: | |
1242 | return [parents[0], self.repo['null']] |
|
1242 | return [parents[0], self.repo['null']] | |
1243 | if parents[0].rev() >= scmutil.intrev(self.repo, ctx.rev()) - 1: |
|
1243 | if parents[0].rev() >= scmutil.intrev(self.repo, ctx.rev()) - 1: | |
1244 | return [] |
|
1244 | return [] | |
1245 | return parents |
|
1245 | return parents | |
1246 |
|
1246 | |||
1247 | class jsonchangeset(changeset_printer): |
|
1247 | class jsonchangeset(changeset_printer): | |
1248 | '''format changeset information.''' |
|
1248 | '''format changeset information.''' | |
1249 |
|
1249 | |||
1250 | def __init__(self, ui, repo, matchfn, diffopts, buffered): |
|
1250 | def __init__(self, ui, repo, matchfn, diffopts, buffered): | |
1251 | changeset_printer.__init__(self, ui, repo, matchfn, diffopts, buffered) |
|
1251 | changeset_printer.__init__(self, ui, repo, matchfn, diffopts, buffered) | |
1252 | self.cache = {} |
|
1252 | self.cache = {} | |
1253 | self._first = True |
|
1253 | self._first = True | |
1254 |
|
1254 | |||
1255 | def close(self): |
|
1255 | def close(self): | |
1256 | if not self._first: |
|
1256 | if not self._first: | |
1257 | self.ui.write("\n]\n") |
|
1257 | self.ui.write("\n]\n") | |
1258 | else: |
|
1258 | else: | |
1259 | self.ui.write("[]\n") |
|
1259 | self.ui.write("[]\n") | |
1260 |
|
1260 | |||
1261 | def _show(self, ctx, copies, matchfn, props): |
|
1261 | def _show(self, ctx, copies, matchfn, props): | |
1262 | '''show a single changeset or file revision''' |
|
1262 | '''show a single changeset or file revision''' | |
1263 | rev = ctx.rev() |
|
1263 | rev = ctx.rev() | |
1264 | if rev is None: |
|
1264 | if rev is None: | |
1265 | jrev = jnode = 'null' |
|
1265 | jrev = jnode = 'null' | |
1266 | else: |
|
1266 | else: | |
1267 | jrev = str(rev) |
|
1267 | jrev = str(rev) | |
1268 | jnode = '"%s"' % hex(ctx.node()) |
|
1268 | jnode = '"%s"' % hex(ctx.node()) | |
1269 | j = encoding.jsonescape |
|
1269 | j = encoding.jsonescape | |
1270 |
|
1270 | |||
1271 | if self._first: |
|
1271 | if self._first: | |
1272 | self.ui.write("[\n {") |
|
1272 | self.ui.write("[\n {") | |
1273 | self._first = False |
|
1273 | self._first = False | |
1274 | else: |
|
1274 | else: | |
1275 | self.ui.write(",\n {") |
|
1275 | self.ui.write(",\n {") | |
1276 |
|
1276 | |||
1277 | if self.ui.quiet: |
|
1277 | if self.ui.quiet: | |
1278 | self.ui.write('\n "rev": %s' % jrev) |
|
1278 | self.ui.write('\n "rev": %s' % jrev) | |
1279 | self.ui.write(',\n "node": %s' % jnode) |
|
1279 | self.ui.write(',\n "node": %s' % jnode) | |
1280 | self.ui.write('\n }') |
|
1280 | self.ui.write('\n }') | |
1281 | return |
|
1281 | return | |
1282 |
|
1282 | |||
1283 | self.ui.write('\n "rev": %s' % jrev) |
|
1283 | self.ui.write('\n "rev": %s' % jrev) | |
1284 | self.ui.write(',\n "node": %s' % jnode) |
|
1284 | self.ui.write(',\n "node": %s' % jnode) | |
1285 | self.ui.write(',\n "branch": "%s"' % j(ctx.branch())) |
|
1285 | self.ui.write(',\n "branch": "%s"' % j(ctx.branch())) | |
1286 | self.ui.write(',\n "phase": "%s"' % ctx.phasestr()) |
|
1286 | self.ui.write(',\n "phase": "%s"' % ctx.phasestr()) | |
1287 | self.ui.write(',\n "user": "%s"' % j(ctx.user())) |
|
1287 | self.ui.write(',\n "user": "%s"' % j(ctx.user())) | |
1288 | self.ui.write(',\n "date": [%d, %d]' % ctx.date()) |
|
1288 | self.ui.write(',\n "date": [%d, %d]' % ctx.date()) | |
1289 | self.ui.write(',\n "desc": "%s"' % j(ctx.description())) |
|
1289 | self.ui.write(',\n "desc": "%s"' % j(ctx.description())) | |
1290 |
|
1290 | |||
1291 | self.ui.write(',\n "bookmarks": [%s]' % |
|
1291 | self.ui.write(',\n "bookmarks": [%s]' % | |
1292 | ", ".join('"%s"' % j(b) for b in ctx.bookmarks())) |
|
1292 | ", ".join('"%s"' % j(b) for b in ctx.bookmarks())) | |
1293 | self.ui.write(',\n "tags": [%s]' % |
|
1293 | self.ui.write(',\n "tags": [%s]' % | |
1294 | ", ".join('"%s"' % j(t) for t in ctx.tags())) |
|
1294 | ", ".join('"%s"' % j(t) for t in ctx.tags())) | |
1295 | self.ui.write(',\n "parents": [%s]' % |
|
1295 | self.ui.write(',\n "parents": [%s]' % | |
1296 | ", ".join('"%s"' % c.hex() for c in ctx.parents())) |
|
1296 | ", ".join('"%s"' % c.hex() for c in ctx.parents())) | |
1297 |
|
1297 | |||
1298 | if self.ui.debugflag: |
|
1298 | if self.ui.debugflag: | |
1299 | if rev is None: |
|
1299 | if rev is None: | |
1300 | jmanifestnode = 'null' |
|
1300 | jmanifestnode = 'null' | |
1301 | else: |
|
1301 | else: | |
1302 | jmanifestnode = '"%s"' % hex(ctx.manifestnode()) |
|
1302 | jmanifestnode = '"%s"' % hex(ctx.manifestnode()) | |
1303 | self.ui.write(',\n "manifest": %s' % jmanifestnode) |
|
1303 | self.ui.write(',\n "manifest": %s' % jmanifestnode) | |
1304 |
|
1304 | |||
1305 | self.ui.write(',\n "extra": {%s}' % |
|
1305 | self.ui.write(',\n "extra": {%s}' % | |
1306 | ", ".join('"%s": "%s"' % (j(k), j(v)) |
|
1306 | ", ".join('"%s": "%s"' % (j(k), j(v)) | |
1307 | for k, v in ctx.extra().items())) |
|
1307 | for k, v in ctx.extra().items())) | |
1308 |
|
1308 | |||
1309 | files = ctx.p1().status(ctx) |
|
1309 | files = ctx.p1().status(ctx) | |
1310 | self.ui.write(',\n "modified": [%s]' % |
|
1310 | self.ui.write(',\n "modified": [%s]' % | |
1311 | ", ".join('"%s"' % j(f) for f in files[0])) |
|
1311 | ", ".join('"%s"' % j(f) for f in files[0])) | |
1312 | self.ui.write(',\n "added": [%s]' % |
|
1312 | self.ui.write(',\n "added": [%s]' % | |
1313 | ", ".join('"%s"' % j(f) for f in files[1])) |
|
1313 | ", ".join('"%s"' % j(f) for f in files[1])) | |
1314 | self.ui.write(',\n "removed": [%s]' % |
|
1314 | self.ui.write(',\n "removed": [%s]' % | |
1315 | ", ".join('"%s"' % j(f) for f in files[2])) |
|
1315 | ", ".join('"%s"' % j(f) for f in files[2])) | |
1316 |
|
1316 | |||
1317 | elif self.ui.verbose: |
|
1317 | elif self.ui.verbose: | |
1318 | self.ui.write(',\n "files": [%s]' % |
|
1318 | self.ui.write(',\n "files": [%s]' % | |
1319 | ", ".join('"%s"' % j(f) for f in ctx.files())) |
|
1319 | ", ".join('"%s"' % j(f) for f in ctx.files())) | |
1320 |
|
1320 | |||
1321 | if copies: |
|
1321 | if copies: | |
1322 | self.ui.write(',\n "copies": {%s}' % |
|
1322 | self.ui.write(',\n "copies": {%s}' % | |
1323 | ", ".join('"%s": "%s"' % (j(k), j(v)) |
|
1323 | ", ".join('"%s": "%s"' % (j(k), j(v)) | |
1324 | for k, v in copies)) |
|
1324 | for k, v in copies)) | |
1325 |
|
1325 | |||
1326 | matchfn = self.matchfn |
|
1326 | matchfn = self.matchfn | |
1327 | if matchfn: |
|
1327 | if matchfn: | |
1328 | stat = self.diffopts.get('stat') |
|
1328 | stat = self.diffopts.get('stat') | |
1329 | diff = self.diffopts.get('patch') |
|
1329 | diff = self.diffopts.get('patch') | |
1330 | diffopts = patch.difffeatureopts(self.ui, self.diffopts, git=True) |
|
1330 | diffopts = patch.difffeatureopts(self.ui, self.diffopts, git=True) | |
1331 | node, prev = ctx.node(), ctx.p1().node() |
|
1331 | node, prev = ctx.node(), ctx.p1().node() | |
1332 | if stat: |
|
1332 | if stat: | |
1333 | self.ui.pushbuffer() |
|
1333 | self.ui.pushbuffer() | |
1334 | diffordiffstat(self.ui, self.repo, diffopts, prev, node, |
|
1334 | diffordiffstat(self.ui, self.repo, diffopts, prev, node, | |
1335 | match=matchfn, stat=True) |
|
1335 | match=matchfn, stat=True) | |
1336 | self.ui.write(',\n "diffstat": "%s"' % j(self.ui.popbuffer())) |
|
1336 | self.ui.write(',\n "diffstat": "%s"' % j(self.ui.popbuffer())) | |
1337 | if diff: |
|
1337 | if diff: | |
1338 | self.ui.pushbuffer() |
|
1338 | self.ui.pushbuffer() | |
1339 | diffordiffstat(self.ui, self.repo, diffopts, prev, node, |
|
1339 | diffordiffstat(self.ui, self.repo, diffopts, prev, node, | |
1340 | match=matchfn, stat=False) |
|
1340 | match=matchfn, stat=False) | |
1341 | self.ui.write(',\n "diff": "%s"' % j(self.ui.popbuffer())) |
|
1341 | self.ui.write(',\n "diff": "%s"' % j(self.ui.popbuffer())) | |
1342 |
|
1342 | |||
1343 | self.ui.write("\n }") |
|
1343 | self.ui.write("\n }") | |
1344 |
|
1344 | |||
1345 | class changeset_templater(changeset_printer): |
|
1345 | class changeset_templater(changeset_printer): | |
1346 | '''format changeset information.''' |
|
1346 | '''format changeset information.''' | |
1347 |
|
1347 | |||
1348 | def __init__(self, ui, repo, matchfn, diffopts, tmpl, mapfile, buffered): |
|
1348 | def __init__(self, ui, repo, matchfn, diffopts, tmpl, mapfile, buffered): | |
1349 | changeset_printer.__init__(self, ui, repo, matchfn, diffopts, buffered) |
|
1349 | changeset_printer.__init__(self, ui, repo, matchfn, diffopts, buffered) | |
1350 | formatnode = ui.debugflag and (lambda x: x) or (lambda x: x[:12]) |
|
1350 | formatnode = ui.debugflag and (lambda x: x) or (lambda x: x[:12]) | |
1351 | defaulttempl = { |
|
1351 | defaulttempl = { | |
1352 | 'parent': '{rev}:{node|formatnode} ', |
|
1352 | 'parent': '{rev}:{node|formatnode} ', | |
1353 | 'manifest': '{rev}:{node|formatnode}', |
|
1353 | 'manifest': '{rev}:{node|formatnode}', | |
1354 | 'file_copy': '{name} ({source})', |
|
1354 | 'file_copy': '{name} ({source})', | |
1355 | 'extra': '{key}={value|stringescape}' |
|
1355 | 'extra': '{key}={value|stringescape}' | |
1356 | } |
|
1356 | } | |
1357 | # filecopy is preserved for compatibility reasons |
|
1357 | # filecopy is preserved for compatibility reasons | |
1358 | defaulttempl['filecopy'] = defaulttempl['file_copy'] |
|
1358 | defaulttempl['filecopy'] = defaulttempl['file_copy'] | |
1359 | self.t = templater.templater(mapfile, {'formatnode': formatnode}, |
|
1359 | self.t = templater.templater(mapfile, {'formatnode': formatnode}, | |
1360 | cache=defaulttempl) |
|
1360 | cache=defaulttempl) | |
1361 | if tmpl: |
|
1361 | if tmpl: | |
1362 | self.t.cache['changeset'] = tmpl |
|
1362 | self.t.cache['changeset'] = tmpl | |
1363 |
|
1363 | |||
1364 | self.cache = {} |
|
1364 | self.cache = {} | |
1365 |
|
1365 | |||
1366 | def _show(self, ctx, copies, matchfn, props): |
|
1366 | def _show(self, ctx, copies, matchfn, props): | |
1367 | '''show a single changeset or file revision''' |
|
1367 | '''show a single changeset or file revision''' | |
1368 |
|
1368 | |||
1369 | showlist = templatekw.showlist |
|
1369 | showlist = templatekw.showlist | |
1370 |
|
1370 | |||
1371 | # showparents() behaviour depends on ui trace level which |
|
1371 | # showparents() behaviour depends on ui trace level which | |
1372 | # causes unexpected behaviours at templating level and makes |
|
1372 | # causes unexpected behaviours at templating level and makes | |
1373 | # it harder to extract it in a standalone function. Its |
|
1373 | # it harder to extract it in a standalone function. Its | |
1374 | # behaviour cannot be changed so leave it here for now. |
|
1374 | # behaviour cannot be changed so leave it here for now. | |
1375 | def showparents(**args): |
|
1375 | def showparents(**args): | |
1376 | ctx = args['ctx'] |
|
1376 | ctx = args['ctx'] | |
1377 | parents = [[('rev', p.rev()), |
|
1377 | parents = [[('rev', p.rev()), | |
1378 | ('node', p.hex()), |
|
1378 | ('node', p.hex()), | |
1379 | ('phase', p.phasestr())] |
|
1379 | ('phase', p.phasestr())] | |
1380 | for p in self._meaningful_parentrevs(ctx)] |
|
1380 | for p in self._meaningful_parentrevs(ctx)] | |
1381 | return showlist('parent', parents, **args) |
|
1381 | return showlist('parent', parents, **args) | |
1382 |
|
1382 | |||
1383 | props = props.copy() |
|
1383 | props = props.copy() | |
1384 | props.update(templatekw.keywords) |
|
1384 | props.update(templatekw.keywords) | |
1385 | props['parents'] = showparents |
|
1385 | props['parents'] = showparents | |
1386 | props['templ'] = self.t |
|
1386 | props['templ'] = self.t | |
1387 | props['ctx'] = ctx |
|
1387 | props['ctx'] = ctx | |
1388 | props['repo'] = self.repo |
|
1388 | props['repo'] = self.repo | |
1389 | props['revcache'] = {'copies': copies} |
|
1389 | props['revcache'] = {'copies': copies} | |
1390 | props['cache'] = self.cache |
|
1390 | props['cache'] = self.cache | |
1391 |
|
1391 | |||
1392 | # find correct templates for current mode |
|
1392 | # find correct templates for current mode | |
1393 |
|
1393 | |||
1394 | tmplmodes = [ |
|
1394 | tmplmodes = [ | |
1395 | (True, None), |
|
1395 | (True, None), | |
1396 | (self.ui.verbose, 'verbose'), |
|
1396 | (self.ui.verbose, 'verbose'), | |
1397 | (self.ui.quiet, 'quiet'), |
|
1397 | (self.ui.quiet, 'quiet'), | |
1398 | (self.ui.debugflag, 'debug'), |
|
1398 | (self.ui.debugflag, 'debug'), | |
1399 | ] |
|
1399 | ] | |
1400 |
|
1400 | |||
1401 | types = {'header': '', 'footer':'', 'changeset': 'changeset'} |
|
1401 | types = {'header': '', 'footer':'', 'changeset': 'changeset'} | |
1402 | for mode, postfix in tmplmodes: |
|
1402 | for mode, postfix in tmplmodes: | |
1403 | for type in types: |
|
1403 | for type in types: | |
1404 | cur = postfix and ('%s_%s' % (type, postfix)) or type |
|
1404 | cur = postfix and ('%s_%s' % (type, postfix)) or type | |
1405 | if mode and cur in self.t: |
|
1405 | if mode and cur in self.t: | |
1406 | types[type] = cur |
|
1406 | types[type] = cur | |
1407 |
|
1407 | |||
1408 | try: |
|
1408 | try: | |
1409 |
|
1409 | |||
1410 | # write header |
|
1410 | # write header | |
1411 | if types['header']: |
|
1411 | if types['header']: | |
1412 | h = templater.stringify(self.t(types['header'], **props)) |
|
1412 | h = templater.stringify(self.t(types['header'], **props)) | |
1413 | if self.buffered: |
|
1413 | if self.buffered: | |
1414 | self.header[ctx.rev()] = h |
|
1414 | self.header[ctx.rev()] = h | |
1415 | else: |
|
1415 | else: | |
1416 | if self.lastheader != h: |
|
1416 | if self.lastheader != h: | |
1417 | self.lastheader = h |
|
1417 | self.lastheader = h | |
1418 | self.ui.write(h) |
|
1418 | self.ui.write(h) | |
1419 |
|
1419 | |||
1420 | # write changeset metadata, then patch if requested |
|
1420 | # write changeset metadata, then patch if requested | |
1421 | key = types['changeset'] |
|
1421 | key = types['changeset'] | |
1422 | self.ui.write(templater.stringify(self.t(key, **props))) |
|
1422 | self.ui.write(templater.stringify(self.t(key, **props))) | |
1423 | self.showpatch(ctx.node(), matchfn) |
|
1423 | self.showpatch(ctx.node(), matchfn) | |
1424 |
|
1424 | |||
1425 | if types['footer']: |
|
1425 | if types['footer']: | |
1426 | if not self.footer: |
|
1426 | if not self.footer: | |
1427 | self.footer = templater.stringify(self.t(types['footer'], |
|
1427 | self.footer = templater.stringify(self.t(types['footer'], | |
1428 | **props)) |
|
1428 | **props)) | |
1429 |
|
1429 | |||
1430 | except KeyError, inst: |
|
1430 | except KeyError, inst: | |
1431 | msg = _("%s: no key named '%s'") |
|
1431 | msg = _("%s: no key named '%s'") | |
1432 | raise util.Abort(msg % (self.t.mapfile, inst.args[0])) |
|
1432 | raise util.Abort(msg % (self.t.mapfile, inst.args[0])) | |
1433 | except SyntaxError, inst: |
|
1433 | except SyntaxError, inst: | |
1434 | raise util.Abort('%s: %s' % (self.t.mapfile, inst.args[0])) |
|
1434 | raise util.Abort('%s: %s' % (self.t.mapfile, inst.args[0])) | |
1435 |
|
1435 | |||
1436 | def gettemplate(ui, tmpl, style): |
|
1436 | def gettemplate(ui, tmpl, style): | |
1437 | """ |
|
1437 | """ | |
1438 | Find the template matching the given template spec or style. |
|
1438 | Find the template matching the given template spec or style. | |
1439 | """ |
|
1439 | """ | |
1440 |
|
1440 | |||
1441 | # ui settings |
|
1441 | # ui settings | |
1442 | if not tmpl and not style: # template are stronger than style |
|
1442 | if not tmpl and not style: # template are stronger than style | |
1443 | tmpl = ui.config('ui', 'logtemplate') |
|
1443 | tmpl = ui.config('ui', 'logtemplate') | |
1444 | if tmpl: |
|
1444 | if tmpl: | |
1445 | try: |
|
1445 | try: | |
1446 | tmpl = templater.parsestring(tmpl) |
|
1446 | tmpl = templater.parsestring(tmpl) | |
1447 | except SyntaxError: |
|
1447 | except SyntaxError: | |
1448 | tmpl = templater.parsestring(tmpl, quoted=False) |
|
1448 | tmpl = templater.parsestring(tmpl, quoted=False) | |
1449 | return tmpl, None |
|
1449 | return tmpl, None | |
1450 | else: |
|
1450 | else: | |
1451 | style = util.expandpath(ui.config('ui', 'style', '')) |
|
1451 | style = util.expandpath(ui.config('ui', 'style', '')) | |
1452 |
|
1452 | |||
1453 | if not tmpl and style: |
|
1453 | if not tmpl and style: | |
1454 | mapfile = style |
|
1454 | mapfile = style | |
1455 | if not os.path.split(mapfile)[0]: |
|
1455 | if not os.path.split(mapfile)[0]: | |
1456 | mapname = (templater.templatepath('map-cmdline.' + mapfile) |
|
1456 | mapname = (templater.templatepath('map-cmdline.' + mapfile) | |
1457 | or templater.templatepath(mapfile)) |
|
1457 | or templater.templatepath(mapfile)) | |
1458 | if mapname: |
|
1458 | if mapname: | |
1459 | mapfile = mapname |
|
1459 | mapfile = mapname | |
1460 | return None, mapfile |
|
1460 | return None, mapfile | |
1461 |
|
1461 | |||
1462 | if not tmpl: |
|
1462 | if not tmpl: | |
1463 | return None, None |
|
1463 | return None, None | |
1464 |
|
1464 | |||
1465 | # looks like a literal template? |
|
1465 | # looks like a literal template? | |
1466 | if '{' in tmpl: |
|
1466 | if '{' in tmpl: | |
1467 | return tmpl, None |
|
1467 | return tmpl, None | |
1468 |
|
1468 | |||
1469 | # perhaps a stock style? |
|
1469 | # perhaps a stock style? | |
1470 | if not os.path.split(tmpl)[0]: |
|
1470 | if not os.path.split(tmpl)[0]: | |
1471 | mapname = (templater.templatepath('map-cmdline.' + tmpl) |
|
1471 | mapname = (templater.templatepath('map-cmdline.' + tmpl) | |
1472 | or templater.templatepath(tmpl)) |
|
1472 | or templater.templatepath(tmpl)) | |
1473 | if mapname and os.path.isfile(mapname): |
|
1473 | if mapname and os.path.isfile(mapname): | |
1474 | return None, mapname |
|
1474 | return None, mapname | |
1475 |
|
1475 | |||
1476 | # perhaps it's a reference to [templates] |
|
1476 | # perhaps it's a reference to [templates] | |
1477 | t = ui.config('templates', tmpl) |
|
1477 | t = ui.config('templates', tmpl) | |
1478 | if t: |
|
1478 | if t: | |
1479 | try: |
|
1479 | try: | |
1480 | tmpl = templater.parsestring(t) |
|
1480 | tmpl = templater.parsestring(t) | |
1481 | except SyntaxError: |
|
1481 | except SyntaxError: | |
1482 | tmpl = templater.parsestring(t, quoted=False) |
|
1482 | tmpl = templater.parsestring(t, quoted=False) | |
1483 | return tmpl, None |
|
1483 | return tmpl, None | |
1484 |
|
1484 | |||
1485 | if tmpl == 'list': |
|
1485 | if tmpl == 'list': | |
1486 | ui.write(_("available styles: %s\n") % templater.stylelist()) |
|
1486 | ui.write(_("available styles: %s\n") % templater.stylelist()) | |
1487 | raise util.Abort(_("specify a template")) |
|
1487 | raise util.Abort(_("specify a template")) | |
1488 |
|
1488 | |||
1489 | # perhaps it's a path to a map or a template |
|
1489 | # perhaps it's a path to a map or a template | |
1490 | if ('/' in tmpl or '\\' in tmpl) and os.path.isfile(tmpl): |
|
1490 | if ('/' in tmpl or '\\' in tmpl) and os.path.isfile(tmpl): | |
1491 | # is it a mapfile for a style? |
|
1491 | # is it a mapfile for a style? | |
1492 | if os.path.basename(tmpl).startswith("map-"): |
|
1492 | if os.path.basename(tmpl).startswith("map-"): | |
1493 | return None, os.path.realpath(tmpl) |
|
1493 | return None, os.path.realpath(tmpl) | |
1494 | tmpl = open(tmpl).read() |
|
1494 | tmpl = open(tmpl).read() | |
1495 | return tmpl, None |
|
1495 | return tmpl, None | |
1496 |
|
1496 | |||
1497 | # constant string? |
|
1497 | # constant string? | |
1498 | return tmpl, None |
|
1498 | return tmpl, None | |
1499 |
|
1499 | |||
1500 | def show_changeset(ui, repo, opts, buffered=False): |
|
1500 | def show_changeset(ui, repo, opts, buffered=False): | |
1501 | """show one changeset using template or regular display. |
|
1501 | """show one changeset using template or regular display. | |
1502 |
|
1502 | |||
1503 | Display format will be the first non-empty hit of: |
|
1503 | Display format will be the first non-empty hit of: | |
1504 | 1. option 'template' |
|
1504 | 1. option 'template' | |
1505 | 2. option 'style' |
|
1505 | 2. option 'style' | |
1506 | 3. [ui] setting 'logtemplate' |
|
1506 | 3. [ui] setting 'logtemplate' | |
1507 | 4. [ui] setting 'style' |
|
1507 | 4. [ui] setting 'style' | |
1508 | If all of these values are either the unset or the empty string, |
|
1508 | If all of these values are either the unset or the empty string, | |
1509 | regular display via changeset_printer() is done. |
|
1509 | regular display via changeset_printer() is done. | |
1510 | """ |
|
1510 | """ | |
1511 | # options |
|
1511 | # options | |
1512 | matchfn = None |
|
1512 | matchfn = None | |
1513 | if opts.get('patch') or opts.get('stat'): |
|
1513 | if opts.get('patch') or opts.get('stat'): | |
1514 | matchfn = scmutil.matchall(repo) |
|
1514 | matchfn = scmutil.matchall(repo) | |
1515 |
|
1515 | |||
1516 | if opts.get('template') == 'json': |
|
1516 | if opts.get('template') == 'json': | |
1517 | return jsonchangeset(ui, repo, matchfn, opts, buffered) |
|
1517 | return jsonchangeset(ui, repo, matchfn, opts, buffered) | |
1518 |
|
1518 | |||
1519 | tmpl, mapfile = gettemplate(ui, opts.get('template'), opts.get('style')) |
|
1519 | tmpl, mapfile = gettemplate(ui, opts.get('template'), opts.get('style')) | |
1520 |
|
1520 | |||
1521 | if not tmpl and not mapfile: |
|
1521 | if not tmpl and not mapfile: | |
1522 | return changeset_printer(ui, repo, matchfn, opts, buffered) |
|
1522 | return changeset_printer(ui, repo, matchfn, opts, buffered) | |
1523 |
|
1523 | |||
1524 | try: |
|
1524 | try: | |
1525 | t = changeset_templater(ui, repo, matchfn, opts, tmpl, mapfile, |
|
1525 | t = changeset_templater(ui, repo, matchfn, opts, tmpl, mapfile, | |
1526 | buffered) |
|
1526 | buffered) | |
1527 | except SyntaxError, inst: |
|
1527 | except SyntaxError, inst: | |
1528 | raise util.Abort(inst.args[0]) |
|
1528 | raise util.Abort(inst.args[0]) | |
1529 | return t |
|
1529 | return t | |
1530 |
|
1530 | |||
1531 | def showmarker(ui, marker): |
|
1531 | def showmarker(ui, marker): | |
1532 | """utility function to display obsolescence marker in a readable way |
|
1532 | """utility function to display obsolescence marker in a readable way | |
1533 |
|
1533 | |||
1534 | To be used by debug function.""" |
|
1534 | To be used by debug function.""" | |
1535 | ui.write(hex(marker.precnode())) |
|
1535 | ui.write(hex(marker.precnode())) | |
1536 | for repl in marker.succnodes(): |
|
1536 | for repl in marker.succnodes(): | |
1537 | ui.write(' ') |
|
1537 | ui.write(' ') | |
1538 | ui.write(hex(repl)) |
|
1538 | ui.write(hex(repl)) | |
1539 | ui.write(' %X ' % marker.flags()) |
|
1539 | ui.write(' %X ' % marker.flags()) | |
1540 | parents = marker.parentnodes() |
|
1540 | parents = marker.parentnodes() | |
1541 | if parents is not None: |
|
1541 | if parents is not None: | |
1542 | ui.write('{%s} ' % ', '.join(hex(p) for p in parents)) |
|
1542 | ui.write('{%s} ' % ', '.join(hex(p) for p in parents)) | |
1543 | ui.write('(%s) ' % util.datestr(marker.date())) |
|
1543 | ui.write('(%s) ' % util.datestr(marker.date())) | |
1544 | ui.write('{%s}' % (', '.join('%r: %r' % t for t in |
|
1544 | ui.write('{%s}' % (', '.join('%r: %r' % t for t in | |
1545 | sorted(marker.metadata().items()) |
|
1545 | sorted(marker.metadata().items()) | |
1546 | if t[0] != 'date'))) |
|
1546 | if t[0] != 'date'))) | |
1547 | ui.write('\n') |
|
1547 | ui.write('\n') | |
1548 |
|
1548 | |||
1549 | def finddate(ui, repo, date): |
|
1549 | def finddate(ui, repo, date): | |
1550 | """Find the tipmost changeset that matches the given date spec""" |
|
1550 | """Find the tipmost changeset that matches the given date spec""" | |
1551 |
|
1551 | |||
1552 | df = util.matchdate(date) |
|
1552 | df = util.matchdate(date) | |
1553 | m = scmutil.matchall(repo) |
|
1553 | m = scmutil.matchall(repo) | |
1554 | results = {} |
|
1554 | results = {} | |
1555 |
|
1555 | |||
1556 | def prep(ctx, fns): |
|
1556 | def prep(ctx, fns): | |
1557 | d = ctx.date() |
|
1557 | d = ctx.date() | |
1558 | if df(d[0]): |
|
1558 | if df(d[0]): | |
1559 | results[ctx.rev()] = d |
|
1559 | results[ctx.rev()] = d | |
1560 |
|
1560 | |||
1561 | for ctx in walkchangerevs(repo, m, {'rev': None}, prep): |
|
1561 | for ctx in walkchangerevs(repo, m, {'rev': None}, prep): | |
1562 | rev = ctx.rev() |
|
1562 | rev = ctx.rev() | |
1563 | if rev in results: |
|
1563 | if rev in results: | |
1564 | ui.status(_("found revision %s from %s\n") % |
|
1564 | ui.status(_("found revision %s from %s\n") % | |
1565 | (rev, util.datestr(results[rev]))) |
|
1565 | (rev, util.datestr(results[rev]))) | |
1566 | return str(rev) |
|
1566 | return str(rev) | |
1567 |
|
1567 | |||
1568 | raise util.Abort(_("revision matching date not found")) |
|
1568 | raise util.Abort(_("revision matching date not found")) | |
1569 |
|
1569 | |||
1570 | def increasingwindows(windowsize=8, sizelimit=512): |
|
1570 | def increasingwindows(windowsize=8, sizelimit=512): | |
1571 | while True: |
|
1571 | while True: | |
1572 | yield windowsize |
|
1572 | yield windowsize | |
1573 | if windowsize < sizelimit: |
|
1573 | if windowsize < sizelimit: | |
1574 | windowsize *= 2 |
|
1574 | windowsize *= 2 | |
1575 |
|
1575 | |||
1576 | class FileWalkError(Exception): |
|
1576 | class FileWalkError(Exception): | |
1577 | pass |
|
1577 | pass | |
1578 |
|
1578 | |||
1579 | def walkfilerevs(repo, match, follow, revs, fncache): |
|
1579 | def walkfilerevs(repo, match, follow, revs, fncache): | |
1580 | '''Walks the file history for the matched files. |
|
1580 | '''Walks the file history for the matched files. | |
1581 |
|
1581 | |||
1582 | Returns the changeset revs that are involved in the file history. |
|
1582 | Returns the changeset revs that are involved in the file history. | |
1583 |
|
1583 | |||
1584 | Throws FileWalkError if the file history can't be walked using |
|
1584 | Throws FileWalkError if the file history can't be walked using | |
1585 | filelogs alone. |
|
1585 | filelogs alone. | |
1586 | ''' |
|
1586 | ''' | |
1587 | wanted = set() |
|
1587 | wanted = set() | |
1588 | copies = [] |
|
1588 | copies = [] | |
1589 | minrev, maxrev = min(revs), max(revs) |
|
1589 | minrev, maxrev = min(revs), max(revs) | |
1590 | def filerevgen(filelog, last): |
|
1590 | def filerevgen(filelog, last): | |
1591 | """ |
|
1591 | """ | |
1592 | Only files, no patterns. Check the history of each file. |
|
1592 | Only files, no patterns. Check the history of each file. | |
1593 |
|
1593 | |||
1594 | Examines filelog entries within minrev, maxrev linkrev range |
|
1594 | Examines filelog entries within minrev, maxrev linkrev range | |
1595 | Returns an iterator yielding (linkrev, parentlinkrevs, copied) |
|
1595 | Returns an iterator yielding (linkrev, parentlinkrevs, copied) | |
1596 | tuples in backwards order |
|
1596 | tuples in backwards order | |
1597 | """ |
|
1597 | """ | |
1598 | cl_count = len(repo) |
|
1598 | cl_count = len(repo) | |
1599 | revs = [] |
|
1599 | revs = [] | |
1600 | for j in xrange(0, last + 1): |
|
1600 | for j in xrange(0, last + 1): | |
1601 | linkrev = filelog.linkrev(j) |
|
1601 | linkrev = filelog.linkrev(j) | |
1602 | if linkrev < minrev: |
|
1602 | if linkrev < minrev: | |
1603 | continue |
|
1603 | continue | |
1604 | # only yield rev for which we have the changelog, it can |
|
1604 | # only yield rev for which we have the changelog, it can | |
1605 | # happen while doing "hg log" during a pull or commit |
|
1605 | # happen while doing "hg log" during a pull or commit | |
1606 | if linkrev >= cl_count: |
|
1606 | if linkrev >= cl_count: | |
1607 | break |
|
1607 | break | |
1608 |
|
1608 | |||
1609 | parentlinkrevs = [] |
|
1609 | parentlinkrevs = [] | |
1610 | for p in filelog.parentrevs(j): |
|
1610 | for p in filelog.parentrevs(j): | |
1611 | if p != nullrev: |
|
1611 | if p != nullrev: | |
1612 | parentlinkrevs.append(filelog.linkrev(p)) |
|
1612 | parentlinkrevs.append(filelog.linkrev(p)) | |
1613 | n = filelog.node(j) |
|
1613 | n = filelog.node(j) | |
1614 | revs.append((linkrev, parentlinkrevs, |
|
1614 | revs.append((linkrev, parentlinkrevs, | |
1615 | follow and filelog.renamed(n))) |
|
1615 | follow and filelog.renamed(n))) | |
1616 |
|
1616 | |||
1617 | return reversed(revs) |
|
1617 | return reversed(revs) | |
1618 | def iterfiles(): |
|
1618 | def iterfiles(): | |
1619 | pctx = repo['.'] |
|
1619 | pctx = repo['.'] | |
1620 | for filename in match.files(): |
|
1620 | for filename in match.files(): | |
1621 | if follow: |
|
1621 | if follow: | |
1622 | if filename not in pctx: |
|
1622 | if filename not in pctx: | |
1623 | raise util.Abort(_('cannot follow file not in parent ' |
|
1623 | raise util.Abort(_('cannot follow file not in parent ' | |
1624 | 'revision: "%s"') % filename) |
|
1624 | 'revision: "%s"') % filename) | |
1625 | yield filename, pctx[filename].filenode() |
|
1625 | yield filename, pctx[filename].filenode() | |
1626 | else: |
|
1626 | else: | |
1627 | yield filename, None |
|
1627 | yield filename, None | |
1628 | for filename_node in copies: |
|
1628 | for filename_node in copies: | |
1629 | yield filename_node |
|
1629 | yield filename_node | |
1630 |
|
1630 | |||
1631 | for file_, node in iterfiles(): |
|
1631 | for file_, node in iterfiles(): | |
1632 | filelog = repo.file(file_) |
|
1632 | filelog = repo.file(file_) | |
1633 | if not len(filelog): |
|
1633 | if not len(filelog): | |
1634 | if node is None: |
|
1634 | if node is None: | |
1635 | # A zero count may be a directory or deleted file, so |
|
1635 | # A zero count may be a directory or deleted file, so | |
1636 | # try to find matching entries on the slow path. |
|
1636 | # try to find matching entries on the slow path. | |
1637 | if follow: |
|
1637 | if follow: | |
1638 | raise util.Abort( |
|
1638 | raise util.Abort( | |
1639 | _('cannot follow nonexistent file: "%s"') % file_) |
|
1639 | _('cannot follow nonexistent file: "%s"') % file_) | |
1640 | raise FileWalkError("Cannot walk via filelog") |
|
1640 | raise FileWalkError("Cannot walk via filelog") | |
1641 | else: |
|
1641 | else: | |
1642 | continue |
|
1642 | continue | |
1643 |
|
1643 | |||
1644 | if node is None: |
|
1644 | if node is None: | |
1645 | last = len(filelog) - 1 |
|
1645 | last = len(filelog) - 1 | |
1646 | else: |
|
1646 | else: | |
1647 | last = filelog.rev(node) |
|
1647 | last = filelog.rev(node) | |
1648 |
|
1648 | |||
1649 | # keep track of all ancestors of the file |
|
1649 | # keep track of all ancestors of the file | |
1650 | ancestors = set([filelog.linkrev(last)]) |
|
1650 | ancestors = set([filelog.linkrev(last)]) | |
1651 |
|
1651 | |||
1652 | # iterate from latest to oldest revision |
|
1652 | # iterate from latest to oldest revision | |
1653 | for rev, flparentlinkrevs, copied in filerevgen(filelog, last): |
|
1653 | for rev, flparentlinkrevs, copied in filerevgen(filelog, last): | |
1654 | if not follow: |
|
1654 | if not follow: | |
1655 | if rev > maxrev: |
|
1655 | if rev > maxrev: | |
1656 | continue |
|
1656 | continue | |
1657 | else: |
|
1657 | else: | |
1658 | # Note that last might not be the first interesting |
|
1658 | # Note that last might not be the first interesting | |
1659 | # rev to us: |
|
1659 | # rev to us: | |
1660 | # if the file has been changed after maxrev, we'll |
|
1660 | # if the file has been changed after maxrev, we'll | |
1661 | # have linkrev(last) > maxrev, and we still need |
|
1661 | # have linkrev(last) > maxrev, and we still need | |
1662 | # to explore the file graph |
|
1662 | # to explore the file graph | |
1663 | if rev not in ancestors: |
|
1663 | if rev not in ancestors: | |
1664 | continue |
|
1664 | continue | |
1665 | # XXX insert 1327 fix here |
|
1665 | # XXX insert 1327 fix here | |
1666 | if flparentlinkrevs: |
|
1666 | if flparentlinkrevs: | |
1667 | ancestors.update(flparentlinkrevs) |
|
1667 | ancestors.update(flparentlinkrevs) | |
1668 |
|
1668 | |||
1669 | fncache.setdefault(rev, []).append(file_) |
|
1669 | fncache.setdefault(rev, []).append(file_) | |
1670 | wanted.add(rev) |
|
1670 | wanted.add(rev) | |
1671 | if copied: |
|
1671 | if copied: | |
1672 | copies.append(copied) |
|
1672 | copies.append(copied) | |
1673 |
|
1673 | |||
1674 | return wanted |
|
1674 | return wanted | |
1675 |
|
1675 | |||
1676 | class _followfilter(object): |
|
1676 | class _followfilter(object): | |
1677 | def __init__(self, repo, onlyfirst=False): |
|
1677 | def __init__(self, repo, onlyfirst=False): | |
1678 | self.repo = repo |
|
1678 | self.repo = repo | |
1679 | self.startrev = nullrev |
|
1679 | self.startrev = nullrev | |
1680 | self.roots = set() |
|
1680 | self.roots = set() | |
1681 | self.onlyfirst = onlyfirst |
|
1681 | self.onlyfirst = onlyfirst | |
1682 |
|
1682 | |||
1683 | def match(self, rev): |
|
1683 | def match(self, rev): | |
1684 | def realparents(rev): |
|
1684 | def realparents(rev): | |
1685 | if self.onlyfirst: |
|
1685 | if self.onlyfirst: | |
1686 | return self.repo.changelog.parentrevs(rev)[0:1] |
|
1686 | return self.repo.changelog.parentrevs(rev)[0:1] | |
1687 | else: |
|
1687 | else: | |
1688 | return filter(lambda x: x != nullrev, |
|
1688 | return filter(lambda x: x != nullrev, | |
1689 | self.repo.changelog.parentrevs(rev)) |
|
1689 | self.repo.changelog.parentrevs(rev)) | |
1690 |
|
1690 | |||
1691 | if self.startrev == nullrev: |
|
1691 | if self.startrev == nullrev: | |
1692 | self.startrev = rev |
|
1692 | self.startrev = rev | |
1693 | return True |
|
1693 | return True | |
1694 |
|
1694 | |||
1695 | if rev > self.startrev: |
|
1695 | if rev > self.startrev: | |
1696 | # forward: all descendants |
|
1696 | # forward: all descendants | |
1697 | if not self.roots: |
|
1697 | if not self.roots: | |
1698 | self.roots.add(self.startrev) |
|
1698 | self.roots.add(self.startrev) | |
1699 | for parent in realparents(rev): |
|
1699 | for parent in realparents(rev): | |
1700 | if parent in self.roots: |
|
1700 | if parent in self.roots: | |
1701 | self.roots.add(rev) |
|
1701 | self.roots.add(rev) | |
1702 | return True |
|
1702 | return True | |
1703 | else: |
|
1703 | else: | |
1704 | # backwards: all parents |
|
1704 | # backwards: all parents | |
1705 | if not self.roots: |
|
1705 | if not self.roots: | |
1706 | self.roots.update(realparents(self.startrev)) |
|
1706 | self.roots.update(realparents(self.startrev)) | |
1707 | if rev in self.roots: |
|
1707 | if rev in self.roots: | |
1708 | self.roots.remove(rev) |
|
1708 | self.roots.remove(rev) | |
1709 | self.roots.update(realparents(rev)) |
|
1709 | self.roots.update(realparents(rev)) | |
1710 | return True |
|
1710 | return True | |
1711 |
|
1711 | |||
1712 | return False |
|
1712 | return False | |
1713 |
|
1713 | |||
1714 | def walkchangerevs(repo, match, opts, prepare): |
|
1714 | def walkchangerevs(repo, match, opts, prepare): | |
1715 | '''Iterate over files and the revs in which they changed. |
|
1715 | '''Iterate over files and the revs in which they changed. | |
1716 |
|
1716 | |||
1717 | Callers most commonly need to iterate backwards over the history |
|
1717 | Callers most commonly need to iterate backwards over the history | |
1718 | in which they are interested. Doing so has awful (quadratic-looking) |
|
1718 | in which they are interested. Doing so has awful (quadratic-looking) | |
1719 | performance, so we use iterators in a "windowed" way. |
|
1719 | performance, so we use iterators in a "windowed" way. | |
1720 |
|
1720 | |||
1721 | We walk a window of revisions in the desired order. Within the |
|
1721 | We walk a window of revisions in the desired order. Within the | |
1722 | window, we first walk forwards to gather data, then in the desired |
|
1722 | window, we first walk forwards to gather data, then in the desired | |
1723 | order (usually backwards) to display it. |
|
1723 | order (usually backwards) to display it. | |
1724 |
|
1724 | |||
1725 | This function returns an iterator yielding contexts. Before |
|
1725 | This function returns an iterator yielding contexts. Before | |
1726 | yielding each context, the iterator will first call the prepare |
|
1726 | yielding each context, the iterator will first call the prepare | |
1727 | function on each context in the window in forward order.''' |
|
1727 | function on each context in the window in forward order.''' | |
1728 |
|
1728 | |||
1729 | follow = opts.get('follow') or opts.get('follow_first') |
|
1729 | follow = opts.get('follow') or opts.get('follow_first') | |
1730 | revs = _logrevs(repo, opts) |
|
1730 | revs = _logrevs(repo, opts) | |
1731 | if not revs: |
|
1731 | if not revs: | |
1732 | return [] |
|
1732 | return [] | |
1733 | wanted = set() |
|
1733 | wanted = set() | |
1734 | slowpath = match.anypats() or (match.files() and opts.get('removed')) |
|
1734 | slowpath = match.anypats() or (match.files() and opts.get('removed')) | |
1735 | fncache = {} |
|
1735 | fncache = {} | |
1736 | change = repo.changectx |
|
1736 | change = repo.changectx | |
1737 |
|
1737 | |||
1738 | # First step is to fill wanted, the set of revisions that we want to yield. |
|
1738 | # First step is to fill wanted, the set of revisions that we want to yield. | |
1739 | # When it does not induce extra cost, we also fill fncache for revisions in |
|
1739 | # When it does not induce extra cost, we also fill fncache for revisions in | |
1740 | # wanted: a cache of filenames that were changed (ctx.files()) and that |
|
1740 | # wanted: a cache of filenames that were changed (ctx.files()) and that | |
1741 | # match the file filtering conditions. |
|
1741 | # match the file filtering conditions. | |
1742 |
|
1742 | |||
1743 | if match.always(): |
|
1743 | if match.always(): | |
1744 | # No files, no patterns. Display all revs. |
|
1744 | # No files, no patterns. Display all revs. | |
1745 | wanted = revs |
|
1745 | wanted = revs | |
1746 |
|
1746 | |||
1747 | if not slowpath and match.files(): |
|
1747 | if not slowpath and match.files(): | |
1748 | # We only have to read through the filelog to find wanted revisions |
|
1748 | # We only have to read through the filelog to find wanted revisions | |
1749 |
|
1749 | |||
1750 | try: |
|
1750 | try: | |
1751 | wanted = walkfilerevs(repo, match, follow, revs, fncache) |
|
1751 | wanted = walkfilerevs(repo, match, follow, revs, fncache) | |
1752 | except FileWalkError: |
|
1752 | except FileWalkError: | |
1753 | slowpath = True |
|
1753 | slowpath = True | |
1754 |
|
1754 | |||
1755 | # We decided to fall back to the slowpath because at least one |
|
1755 | # We decided to fall back to the slowpath because at least one | |
1756 | # of the paths was not a file. Check to see if at least one of them |
|
1756 | # of the paths was not a file. Check to see if at least one of them | |
1757 | # existed in history, otherwise simply return |
|
1757 | # existed in history, otherwise simply return | |
1758 | for path in match.files(): |
|
1758 | for path in match.files(): | |
1759 | if path == '.' or path in repo.store: |
|
1759 | if path == '.' or path in repo.store: | |
1760 | break |
|
1760 | break | |
1761 | else: |
|
1761 | else: | |
1762 | return [] |
|
1762 | return [] | |
1763 |
|
1763 | |||
1764 | if slowpath: |
|
1764 | if slowpath: | |
1765 | # We have to read the changelog to match filenames against |
|
1765 | # We have to read the changelog to match filenames against | |
1766 | # changed files |
|
1766 | # changed files | |
1767 |
|
1767 | |||
1768 | if follow: |
|
1768 | if follow: | |
1769 | raise util.Abort(_('can only follow copies/renames for explicit ' |
|
1769 | raise util.Abort(_('can only follow copies/renames for explicit ' | |
1770 | 'filenames')) |
|
1770 | 'filenames')) | |
1771 |
|
1771 | |||
1772 | # The slow path checks files modified in every changeset. |
|
1772 | # The slow path checks files modified in every changeset. | |
1773 | # This is really slow on large repos, so compute the set lazily. |
|
1773 | # This is really slow on large repos, so compute the set lazily. | |
1774 | class lazywantedset(object): |
|
1774 | class lazywantedset(object): | |
1775 | def __init__(self): |
|
1775 | def __init__(self): | |
1776 | self.set = set() |
|
1776 | self.set = set() | |
1777 | self.revs = set(revs) |
|
1777 | self.revs = set(revs) | |
1778 |
|
1778 | |||
1779 | # No need to worry about locality here because it will be accessed |
|
1779 | # No need to worry about locality here because it will be accessed | |
1780 | # in the same order as the increasing window below. |
|
1780 | # in the same order as the increasing window below. | |
1781 | def __contains__(self, value): |
|
1781 | def __contains__(self, value): | |
1782 | if value in self.set: |
|
1782 | if value in self.set: | |
1783 | return True |
|
1783 | return True | |
1784 | elif not value in self.revs: |
|
1784 | elif not value in self.revs: | |
1785 | return False |
|
1785 | return False | |
1786 | else: |
|
1786 | else: | |
1787 | self.revs.discard(value) |
|
1787 | self.revs.discard(value) | |
1788 | ctx = change(value) |
|
1788 | ctx = change(value) | |
1789 | matches = filter(match, ctx.files()) |
|
1789 | matches = filter(match, ctx.files()) | |
1790 | if matches: |
|
1790 | if matches: | |
1791 | fncache[value] = matches |
|
1791 | fncache[value] = matches | |
1792 | self.set.add(value) |
|
1792 | self.set.add(value) | |
1793 | return True |
|
1793 | return True | |
1794 | return False |
|
1794 | return False | |
1795 |
|
1795 | |||
1796 | def discard(self, value): |
|
1796 | def discard(self, value): | |
1797 | self.revs.discard(value) |
|
1797 | self.revs.discard(value) | |
1798 | self.set.discard(value) |
|
1798 | self.set.discard(value) | |
1799 |
|
1799 | |||
1800 | wanted = lazywantedset() |
|
1800 | wanted = lazywantedset() | |
1801 |
|
1801 | |||
1802 | # it might be worthwhile to do this in the iterator if the rev range |
|
1802 | # it might be worthwhile to do this in the iterator if the rev range | |
1803 | # is descending and the prune args are all within that range |
|
1803 | # is descending and the prune args are all within that range | |
1804 | for rev in opts.get('prune', ()): |
|
1804 | for rev in opts.get('prune', ()): | |
1805 | rev = repo[rev].rev() |
|
1805 | rev = repo[rev].rev() | |
1806 | ff = _followfilter(repo) |
|
1806 | ff = _followfilter(repo) | |
1807 | stop = min(revs[0], revs[-1]) |
|
1807 | stop = min(revs[0], revs[-1]) | |
1808 | for x in xrange(rev, stop - 1, -1): |
|
1808 | for x in xrange(rev, stop - 1, -1): | |
1809 | if ff.match(x): |
|
1809 | if ff.match(x): | |
1810 | wanted = wanted - [x] |
|
1810 | wanted = wanted - [x] | |
1811 |
|
1811 | |||
1812 | # Now that wanted is correctly initialized, we can iterate over the |
|
1812 | # Now that wanted is correctly initialized, we can iterate over the | |
1813 | # revision range, yielding only revisions in wanted. |
|
1813 | # revision range, yielding only revisions in wanted. | |
1814 | def iterate(): |
|
1814 | def iterate(): | |
1815 | if follow and not match.files(): |
|
1815 | if follow and not match.files(): | |
1816 | ff = _followfilter(repo, onlyfirst=opts.get('follow_first')) |
|
1816 | ff = _followfilter(repo, onlyfirst=opts.get('follow_first')) | |
1817 | def want(rev): |
|
1817 | def want(rev): | |
1818 | return ff.match(rev) and rev in wanted |
|
1818 | return ff.match(rev) and rev in wanted | |
1819 | else: |
|
1819 | else: | |
1820 | def want(rev): |
|
1820 | def want(rev): | |
1821 | return rev in wanted |
|
1821 | return rev in wanted | |
1822 |
|
1822 | |||
1823 | it = iter(revs) |
|
1823 | it = iter(revs) | |
1824 | stopiteration = False |
|
1824 | stopiteration = False | |
1825 | for windowsize in increasingwindows(): |
|
1825 | for windowsize in increasingwindows(): | |
1826 | nrevs = [] |
|
1826 | nrevs = [] | |
1827 | for i in xrange(windowsize): |
|
1827 | for i in xrange(windowsize): | |
1828 | try: |
|
1828 | try: | |
1829 | rev = it.next() |
|
1829 | rev = it.next() | |
1830 | if want(rev): |
|
1830 | if want(rev): | |
1831 | nrevs.append(rev) |
|
1831 | nrevs.append(rev) | |
1832 | except (StopIteration): |
|
1832 | except (StopIteration): | |
1833 | stopiteration = True |
|
1833 | stopiteration = True | |
1834 | break |
|
1834 | break | |
1835 | for rev in sorted(nrevs): |
|
1835 | for rev in sorted(nrevs): | |
1836 | fns = fncache.get(rev) |
|
1836 | fns = fncache.get(rev) | |
1837 | ctx = change(rev) |
|
1837 | ctx = change(rev) | |
1838 | if not fns: |
|
1838 | if not fns: | |
1839 | def fns_generator(): |
|
1839 | def fns_generator(): | |
1840 | for f in ctx.files(): |
|
1840 | for f in ctx.files(): | |
1841 | if match(f): |
|
1841 | if match(f): | |
1842 | yield f |
|
1842 | yield f | |
1843 | fns = fns_generator() |
|
1843 | fns = fns_generator() | |
1844 | prepare(ctx, fns) |
|
1844 | prepare(ctx, fns) | |
1845 | for rev in nrevs: |
|
1845 | for rev in nrevs: | |
1846 | yield change(rev) |
|
1846 | yield change(rev) | |
1847 |
|
1847 | |||
1848 | if stopiteration: |
|
1848 | if stopiteration: | |
1849 | break |
|
1849 | break | |
1850 |
|
1850 | |||
1851 | return iterate() |
|
1851 | return iterate() | |
1852 |
|
1852 | |||
1853 | def _makefollowlogfilematcher(repo, files, followfirst): |
|
1853 | def _makefollowlogfilematcher(repo, files, followfirst): | |
1854 | # When displaying a revision with --patch --follow FILE, we have |
|
1854 | # When displaying a revision with --patch --follow FILE, we have | |
1855 | # to know which file of the revision must be diffed. With |
|
1855 | # to know which file of the revision must be diffed. With | |
1856 | # --follow, we want the names of the ancestors of FILE in the |
|
1856 | # --follow, we want the names of the ancestors of FILE in the | |
1857 | # revision, stored in "fcache". "fcache" is populated by |
|
1857 | # revision, stored in "fcache". "fcache" is populated by | |
1858 | # reproducing the graph traversal already done by --follow revset |
|
1858 | # reproducing the graph traversal already done by --follow revset | |
1859 | # and relating linkrevs to file names (which is not "correct" but |
|
1859 | # and relating linkrevs to file names (which is not "correct" but | |
1860 | # good enough). |
|
1860 | # good enough). | |
1861 | fcache = {} |
|
1861 | fcache = {} | |
1862 | fcacheready = [False] |
|
1862 | fcacheready = [False] | |
1863 | pctx = repo['.'] |
|
1863 | pctx = repo['.'] | |
1864 |
|
1864 | |||
1865 | def populate(): |
|
1865 | def populate(): | |
1866 | for fn in files: |
|
1866 | for fn in files: | |
1867 | for i in ((pctx[fn],), pctx[fn].ancestors(followfirst=followfirst)): |
|
1867 | for i in ((pctx[fn],), pctx[fn].ancestors(followfirst=followfirst)): | |
1868 | for c in i: |
|
1868 | for c in i: | |
1869 | fcache.setdefault(c.linkrev(), set()).add(c.path()) |
|
1869 | fcache.setdefault(c.linkrev(), set()).add(c.path()) | |
1870 |
|
1870 | |||
1871 | def filematcher(rev): |
|
1871 | def filematcher(rev): | |
1872 | if not fcacheready[0]: |
|
1872 | if not fcacheready[0]: | |
1873 | # Lazy initialization |
|
1873 | # Lazy initialization | |
1874 | fcacheready[0] = True |
|
1874 | fcacheready[0] = True | |
1875 | populate() |
|
1875 | populate() | |
1876 | return scmutil.matchfiles(repo, fcache.get(rev, [])) |
|
1876 | return scmutil.matchfiles(repo, fcache.get(rev, [])) | |
1877 |
|
1877 | |||
1878 | return filematcher |
|
1878 | return filematcher | |
1879 |
|
1879 | |||
1880 | def _makenofollowlogfilematcher(repo, pats, opts): |
|
1880 | def _makenofollowlogfilematcher(repo, pats, opts): | |
1881 | '''hook for extensions to override the filematcher for non-follow cases''' |
|
1881 | '''hook for extensions to override the filematcher for non-follow cases''' | |
1882 | return None |
|
1882 | return None | |
1883 |
|
1883 | |||
1884 | def _makelogrevset(repo, pats, opts, revs): |
|
1884 | def _makelogrevset(repo, pats, opts, revs): | |
1885 | """Return (expr, filematcher) where expr is a revset string built |
|
1885 | """Return (expr, filematcher) where expr is a revset string built | |
1886 | from log options and file patterns or None. If --stat or --patch |
|
1886 | from log options and file patterns or None. If --stat or --patch | |
1887 | are not passed filematcher is None. Otherwise it is a callable |
|
1887 | are not passed filematcher is None. Otherwise it is a callable | |
1888 | taking a revision number and returning a match objects filtering |
|
1888 | taking a revision number and returning a match objects filtering | |
1889 | the files to be detailed when displaying the revision. |
|
1889 | the files to be detailed when displaying the revision. | |
1890 | """ |
|
1890 | """ | |
1891 | opt2revset = { |
|
1891 | opt2revset = { | |
1892 | 'no_merges': ('not merge()', None), |
|
1892 | 'no_merges': ('not merge()', None), | |
1893 | 'only_merges': ('merge()', None), |
|
1893 | 'only_merges': ('merge()', None), | |
1894 | '_ancestors': ('ancestors(%(val)s)', None), |
|
1894 | '_ancestors': ('ancestors(%(val)s)', None), | |
1895 | '_fancestors': ('_firstancestors(%(val)s)', None), |
|
1895 | '_fancestors': ('_firstancestors(%(val)s)', None), | |
1896 | '_descendants': ('descendants(%(val)s)', None), |
|
1896 | '_descendants': ('descendants(%(val)s)', None), | |
1897 | '_fdescendants': ('_firstdescendants(%(val)s)', None), |
|
1897 | '_fdescendants': ('_firstdescendants(%(val)s)', None), | |
1898 | '_matchfiles': ('_matchfiles(%(val)s)', None), |
|
1898 | '_matchfiles': ('_matchfiles(%(val)s)', None), | |
1899 | 'date': ('date(%(val)r)', None), |
|
1899 | 'date': ('date(%(val)r)', None), | |
1900 | 'branch': ('branch(%(val)r)', ' or '), |
|
1900 | 'branch': ('branch(%(val)r)', ' or '), | |
1901 | '_patslog': ('filelog(%(val)r)', ' or '), |
|
1901 | '_patslog': ('filelog(%(val)r)', ' or '), | |
1902 | '_patsfollow': ('follow(%(val)r)', ' or '), |
|
1902 | '_patsfollow': ('follow(%(val)r)', ' or '), | |
1903 | '_patsfollowfirst': ('_followfirst(%(val)r)', ' or '), |
|
1903 | '_patsfollowfirst': ('_followfirst(%(val)r)', ' or '), | |
1904 | 'keyword': ('keyword(%(val)r)', ' or '), |
|
1904 | 'keyword': ('keyword(%(val)r)', ' or '), | |
1905 | 'prune': ('not (%(val)r or ancestors(%(val)r))', ' and '), |
|
1905 | 'prune': ('not (%(val)r or ancestors(%(val)r))', ' and '), | |
1906 | 'user': ('user(%(val)r)', ' or '), |
|
1906 | 'user': ('user(%(val)r)', ' or '), | |
1907 | } |
|
1907 | } | |
1908 |
|
1908 | |||
1909 | opts = dict(opts) |
|
1909 | opts = dict(opts) | |
1910 | # follow or not follow? |
|
1910 | # follow or not follow? | |
1911 | follow = opts.get('follow') or opts.get('follow_first') |
|
1911 | follow = opts.get('follow') or opts.get('follow_first') | |
1912 | if opts.get('follow_first'): |
|
1912 | if opts.get('follow_first'): | |
1913 | followfirst = 1 |
|
1913 | followfirst = 1 | |
1914 | else: |
|
1914 | else: | |
1915 | followfirst = 0 |
|
1915 | followfirst = 0 | |
1916 | # --follow with FILE behaviour depends on revs... |
|
1916 | # --follow with FILE behaviour depends on revs... | |
1917 | it = iter(revs) |
|
1917 | it = iter(revs) | |
1918 | startrev = it.next() |
|
1918 | startrev = it.next() | |
1919 | try: |
|
1919 | try: | |
1920 | followdescendants = startrev < it.next() |
|
1920 | followdescendants = startrev < it.next() | |
1921 | except (StopIteration): |
|
1921 | except (StopIteration): | |
1922 | followdescendants = False |
|
1922 | followdescendants = False | |
1923 |
|
1923 | |||
1924 | # branch and only_branch are really aliases and must be handled at |
|
1924 | # branch and only_branch are really aliases and must be handled at | |
1925 | # the same time |
|
1925 | # the same time | |
1926 | opts['branch'] = opts.get('branch', []) + opts.get('only_branch', []) |
|
1926 | opts['branch'] = opts.get('branch', []) + opts.get('only_branch', []) | |
1927 | opts['branch'] = [repo.lookupbranch(b) for b in opts['branch']] |
|
1927 | opts['branch'] = [repo.lookupbranch(b) for b in opts['branch']] | |
1928 | # pats/include/exclude are passed to match.match() directly in |
|
1928 | # pats/include/exclude are passed to match.match() directly in | |
1929 | # _matchfiles() revset but walkchangerevs() builds its matcher with |
|
1929 | # _matchfiles() revset but walkchangerevs() builds its matcher with | |
1930 | # scmutil.match(). The difference is input pats are globbed on |
|
1930 | # scmutil.match(). The difference is input pats are globbed on | |
1931 | # platforms without shell expansion (windows). |
|
1931 | # platforms without shell expansion (windows). | |
1932 | wctx = repo[None] |
|
1932 | wctx = repo[None] | |
1933 | match, pats = scmutil.matchandpats(wctx, pats, opts) |
|
1933 | match, pats = scmutil.matchandpats(wctx, pats, opts) | |
1934 | slowpath = match.anypats() or (match.files() and opts.get('removed')) |
|
1934 | slowpath = match.anypats() or (match.files() and opts.get('removed')) | |
1935 | if not slowpath: |
|
1935 | if not slowpath: | |
1936 | for f in match.files(): |
|
1936 | for f in match.files(): | |
1937 | if follow and f not in wctx: |
|
1937 | if follow and f not in wctx: | |
1938 | # If the file exists, it may be a directory, so let it |
|
1938 | # If the file exists, it may be a directory, so let it | |
1939 | # take the slow path. |
|
1939 | # take the slow path. | |
1940 | if os.path.exists(repo.wjoin(f)): |
|
1940 | if os.path.exists(repo.wjoin(f)): | |
1941 | slowpath = True |
|
1941 | slowpath = True | |
1942 | continue |
|
1942 | continue | |
1943 | else: |
|
1943 | else: | |
1944 | raise util.Abort(_('cannot follow file not in parent ' |
|
1944 | raise util.Abort(_('cannot follow file not in parent ' | |
1945 | 'revision: "%s"') % f) |
|
1945 | 'revision: "%s"') % f) | |
1946 | filelog = repo.file(f) |
|
1946 | filelog = repo.file(f) | |
1947 | if not filelog: |
|
1947 | if not filelog: | |
1948 | # A zero count may be a directory or deleted file, so |
|
1948 | # A zero count may be a directory or deleted file, so | |
1949 | # try to find matching entries on the slow path. |
|
1949 | # try to find matching entries on the slow path. | |
1950 | if follow: |
|
1950 | if follow: | |
1951 | raise util.Abort( |
|
1951 | raise util.Abort( | |
1952 | _('cannot follow nonexistent file: "%s"') % f) |
|
1952 | _('cannot follow nonexistent file: "%s"') % f) | |
1953 | slowpath = True |
|
1953 | slowpath = True | |
1954 |
|
1954 | |||
1955 | # We decided to fall back to the slowpath because at least one |
|
1955 | # We decided to fall back to the slowpath because at least one | |
1956 | # of the paths was not a file. Check to see if at least one of them |
|
1956 | # of the paths was not a file. Check to see if at least one of them | |
1957 | # existed in history - in that case, we'll continue down the |
|
1957 | # existed in history - in that case, we'll continue down the | |
1958 | # slowpath; otherwise, we can turn off the slowpath |
|
1958 | # slowpath; otherwise, we can turn off the slowpath | |
1959 | if slowpath: |
|
1959 | if slowpath: | |
1960 | for path in match.files(): |
|
1960 | for path in match.files(): | |
1961 | if path == '.' or path in repo.store: |
|
1961 | if path == '.' or path in repo.store: | |
1962 | break |
|
1962 | break | |
1963 | else: |
|
1963 | else: | |
1964 | slowpath = False |
|
1964 | slowpath = False | |
1965 |
|
1965 | |||
1966 | fpats = ('_patsfollow', '_patsfollowfirst') |
|
1966 | fpats = ('_patsfollow', '_patsfollowfirst') | |
1967 | fnopats = (('_ancestors', '_fancestors'), |
|
1967 | fnopats = (('_ancestors', '_fancestors'), | |
1968 | ('_descendants', '_fdescendants')) |
|
1968 | ('_descendants', '_fdescendants')) | |
1969 | if slowpath: |
|
1969 | if slowpath: | |
1970 | # See walkchangerevs() slow path. |
|
1970 | # See walkchangerevs() slow path. | |
1971 | # |
|
1971 | # | |
1972 | # pats/include/exclude cannot be represented as separate |
|
1972 | # pats/include/exclude cannot be represented as separate | |
1973 | # revset expressions as their filtering logic applies at file |
|
1973 | # revset expressions as their filtering logic applies at file | |
1974 | # level. For instance "-I a -X a" matches a revision touching |
|
1974 | # level. For instance "-I a -X a" matches a revision touching | |
1975 | # "a" and "b" while "file(a) and not file(b)" does |
|
1975 | # "a" and "b" while "file(a) and not file(b)" does | |
1976 | # not. Besides, filesets are evaluated against the working |
|
1976 | # not. Besides, filesets are evaluated against the working | |
1977 | # directory. |
|
1977 | # directory. | |
1978 | matchargs = ['r:', 'd:relpath'] |
|
1978 | matchargs = ['r:', 'd:relpath'] | |
1979 | for p in pats: |
|
1979 | for p in pats: | |
1980 | matchargs.append('p:' + p) |
|
1980 | matchargs.append('p:' + p) | |
1981 | for p in opts.get('include', []): |
|
1981 | for p in opts.get('include', []): | |
1982 | matchargs.append('i:' + p) |
|
1982 | matchargs.append('i:' + p) | |
1983 | for p in opts.get('exclude', []): |
|
1983 | for p in opts.get('exclude', []): | |
1984 | matchargs.append('x:' + p) |
|
1984 | matchargs.append('x:' + p) | |
1985 | matchargs = ','.join(('%r' % p) for p in matchargs) |
|
1985 | matchargs = ','.join(('%r' % p) for p in matchargs) | |
1986 | opts['_matchfiles'] = matchargs |
|
1986 | opts['_matchfiles'] = matchargs | |
1987 | if follow: |
|
1987 | if follow: | |
1988 | opts[fnopats[0][followfirst]] = '.' |
|
1988 | opts[fnopats[0][followfirst]] = '.' | |
1989 | else: |
|
1989 | else: | |
1990 | if follow: |
|
1990 | if follow: | |
1991 | if pats: |
|
1991 | if pats: | |
1992 | # follow() revset interprets its file argument as a |
|
1992 | # follow() revset interprets its file argument as a | |
1993 | # manifest entry, so use match.files(), not pats. |
|
1993 | # manifest entry, so use match.files(), not pats. | |
1994 | opts[fpats[followfirst]] = list(match.files()) |
|
1994 | opts[fpats[followfirst]] = list(match.files()) | |
1995 | else: |
|
1995 | else: | |
1996 | op = fnopats[followdescendants][followfirst] |
|
1996 | op = fnopats[followdescendants][followfirst] | |
1997 | opts[op] = 'rev(%d)' % startrev |
|
1997 | opts[op] = 'rev(%d)' % startrev | |
1998 | else: |
|
1998 | else: | |
1999 | opts['_patslog'] = list(pats) |
|
1999 | opts['_patslog'] = list(pats) | |
2000 |
|
2000 | |||
2001 | filematcher = None |
|
2001 | filematcher = None | |
2002 | if opts.get('patch') or opts.get('stat'): |
|
2002 | if opts.get('patch') or opts.get('stat'): | |
2003 | # When following files, track renames via a special matcher. |
|
2003 | # When following files, track renames via a special matcher. | |
2004 | # If we're forced to take the slowpath it means we're following |
|
2004 | # If we're forced to take the slowpath it means we're following | |
2005 | # at least one pattern/directory, so don't bother with rename tracking. |
|
2005 | # at least one pattern/directory, so don't bother with rename tracking. | |
2006 | if follow and not match.always() and not slowpath: |
|
2006 | if follow and not match.always() and not slowpath: | |
2007 | # _makefollowlogfilematcher expects its files argument to be |
|
2007 | # _makefollowlogfilematcher expects its files argument to be | |
2008 | # relative to the repo root, so use match.files(), not pats. |
|
2008 | # relative to the repo root, so use match.files(), not pats. | |
2009 | filematcher = _makefollowlogfilematcher(repo, match.files(), |
|
2009 | filematcher = _makefollowlogfilematcher(repo, match.files(), | |
2010 | followfirst) |
|
2010 | followfirst) | |
2011 | else: |
|
2011 | else: | |
2012 | filematcher = _makenofollowlogfilematcher(repo, pats, opts) |
|
2012 | filematcher = _makenofollowlogfilematcher(repo, pats, opts) | |
2013 | if filematcher is None: |
|
2013 | if filematcher is None: | |
2014 | filematcher = lambda rev: match |
|
2014 | filematcher = lambda rev: match | |
2015 |
|
2015 | |||
2016 | expr = [] |
|
2016 | expr = [] | |
2017 | for op, val in sorted(opts.iteritems()): |
|
2017 | for op, val in sorted(opts.iteritems()): | |
2018 | if not val: |
|
2018 | if not val: | |
2019 | continue |
|
2019 | continue | |
2020 | if op not in opt2revset: |
|
2020 | if op not in opt2revset: | |
2021 | continue |
|
2021 | continue | |
2022 | revop, andor = opt2revset[op] |
|
2022 | revop, andor = opt2revset[op] | |
2023 | if '%(val)' not in revop: |
|
2023 | if '%(val)' not in revop: | |
2024 | expr.append(revop) |
|
2024 | expr.append(revop) | |
2025 | else: |
|
2025 | else: | |
2026 | if not isinstance(val, list): |
|
2026 | if not isinstance(val, list): | |
2027 | e = revop % {'val': val} |
|
2027 | e = revop % {'val': val} | |
2028 | else: |
|
2028 | else: | |
2029 | e = '(' + andor.join((revop % {'val': v}) for v in val) + ')' |
|
2029 | e = '(' + andor.join((revop % {'val': v}) for v in val) + ')' | |
2030 | expr.append(e) |
|
2030 | expr.append(e) | |
2031 |
|
2031 | |||
2032 | if expr: |
|
2032 | if expr: | |
2033 | expr = '(' + ' and '.join(expr) + ')' |
|
2033 | expr = '(' + ' and '.join(expr) + ')' | |
2034 | else: |
|
2034 | else: | |
2035 | expr = None |
|
2035 | expr = None | |
2036 | return expr, filematcher |
|
2036 | return expr, filematcher | |
2037 |
|
2037 | |||
2038 | def _logrevs(repo, opts): |
|
2038 | def _logrevs(repo, opts): | |
2039 | # Default --rev value depends on --follow but --follow behaviour |
|
2039 | # Default --rev value depends on --follow but --follow behaviour | |
2040 | # depends on revisions resolved from --rev... |
|
2040 | # depends on revisions resolved from --rev... | |
2041 | follow = opts.get('follow') or opts.get('follow_first') |
|
2041 | follow = opts.get('follow') or opts.get('follow_first') | |
2042 | if opts.get('rev'): |
|
2042 | if opts.get('rev'): | |
2043 | revs = scmutil.revrange(repo, opts['rev']) |
|
2043 | revs = scmutil.revrange(repo, opts['rev']) | |
2044 | elif follow and repo.dirstate.p1() == nullid: |
|
2044 | elif follow and repo.dirstate.p1() == nullid: | |
2045 | revs = revset.baseset() |
|
2045 | revs = revset.baseset() | |
2046 | elif follow: |
|
2046 | elif follow: | |
2047 | revs = repo.revs('reverse(:.)') |
|
2047 | revs = repo.revs('reverse(:.)') | |
2048 | else: |
|
2048 | else: | |
2049 | revs = revset.spanset(repo) |
|
2049 | revs = revset.spanset(repo) | |
2050 | revs.reverse() |
|
2050 | revs.reverse() | |
2051 | return revs |
|
2051 | return revs | |
2052 |
|
2052 | |||
2053 | def getgraphlogrevs(repo, pats, opts): |
|
2053 | def getgraphlogrevs(repo, pats, opts): | |
2054 | """Return (revs, expr, filematcher) where revs is an iterable of |
|
2054 | """Return (revs, expr, filematcher) where revs is an iterable of | |
2055 | revision numbers, expr is a revset string built from log options |
|
2055 | revision numbers, expr is a revset string built from log options | |
2056 | and file patterns or None, and used to filter 'revs'. If --stat or |
|
2056 | and file patterns or None, and used to filter 'revs'. If --stat or | |
2057 | --patch are not passed filematcher is None. Otherwise it is a |
|
2057 | --patch are not passed filematcher is None. Otherwise it is a | |
2058 | callable taking a revision number and returning a match objects |
|
2058 | callable taking a revision number and returning a match objects | |
2059 | filtering the files to be detailed when displaying the revision. |
|
2059 | filtering the files to be detailed when displaying the revision. | |
2060 | """ |
|
2060 | """ | |
2061 | limit = loglimit(opts) |
|
2061 | limit = loglimit(opts) | |
2062 | revs = _logrevs(repo, opts) |
|
2062 | revs = _logrevs(repo, opts) | |
2063 | if not revs: |
|
2063 | if not revs: | |
2064 | return revset.baseset(), None, None |
|
2064 | return revset.baseset(), None, None | |
2065 | expr, filematcher = _makelogrevset(repo, pats, opts, revs) |
|
2065 | expr, filematcher = _makelogrevset(repo, pats, opts, revs) | |
2066 | if opts.get('rev'): |
|
2066 | if opts.get('rev'): | |
2067 | # User-specified revs might be unsorted, but don't sort before |
|
2067 | # User-specified revs might be unsorted, but don't sort before | |
2068 | # _makelogrevset because it might depend on the order of revs |
|
2068 | # _makelogrevset because it might depend on the order of revs | |
2069 | revs.sort(reverse=True) |
|
2069 | revs.sort(reverse=True) | |
2070 | if expr: |
|
2070 | if expr: | |
2071 | # Revset matchers often operate faster on revisions in changelog |
|
2071 | # Revset matchers often operate faster on revisions in changelog | |
2072 | # order, because most filters deal with the changelog. |
|
2072 | # order, because most filters deal with the changelog. | |
2073 | revs.reverse() |
|
2073 | revs.reverse() | |
2074 | matcher = revset.match(repo.ui, expr) |
|
2074 | matcher = revset.match(repo.ui, expr) | |
2075 | # Revset matches can reorder revisions. "A or B" typically returns |
|
2075 | # Revset matches can reorder revisions. "A or B" typically returns | |
2076 | # returns the revision matching A then the revision matching B. Sort |
|
2076 | # returns the revision matching A then the revision matching B. Sort | |
2077 | # again to fix that. |
|
2077 | # again to fix that. | |
2078 | revs = matcher(repo, revs) |
|
2078 | revs = matcher(repo, revs) | |
2079 | revs.sort(reverse=True) |
|
2079 | revs.sort(reverse=True) | |
2080 | if limit is not None: |
|
2080 | if limit is not None: | |
2081 | limitedrevs = [] |
|
2081 | limitedrevs = [] | |
2082 | for idx, rev in enumerate(revs): |
|
2082 | for idx, rev in enumerate(revs): | |
2083 | if idx >= limit: |
|
2083 | if idx >= limit: | |
2084 | break |
|
2084 | break | |
2085 | limitedrevs.append(rev) |
|
2085 | limitedrevs.append(rev) | |
2086 | revs = revset.baseset(limitedrevs) |
|
2086 | revs = revset.baseset(limitedrevs) | |
2087 |
|
2087 | |||
2088 | return revs, expr, filematcher |
|
2088 | return revs, expr, filematcher | |
2089 |
|
2089 | |||
2090 | def getlogrevs(repo, pats, opts): |
|
2090 | def getlogrevs(repo, pats, opts): | |
2091 | """Return (revs, expr, filematcher) where revs is an iterable of |
|
2091 | """Return (revs, expr, filematcher) where revs is an iterable of | |
2092 | revision numbers, expr is a revset string built from log options |
|
2092 | revision numbers, expr is a revset string built from log options | |
2093 | and file patterns or None, and used to filter 'revs'. If --stat or |
|
2093 | and file patterns or None, and used to filter 'revs'. If --stat or | |
2094 | --patch are not passed filematcher is None. Otherwise it is a |
|
2094 | --patch are not passed filematcher is None. Otherwise it is a | |
2095 | callable taking a revision number and returning a match objects |
|
2095 | callable taking a revision number and returning a match objects | |
2096 | filtering the files to be detailed when displaying the revision. |
|
2096 | filtering the files to be detailed when displaying the revision. | |
2097 | """ |
|
2097 | """ | |
2098 | limit = loglimit(opts) |
|
2098 | limit = loglimit(opts) | |
2099 | revs = _logrevs(repo, opts) |
|
2099 | revs = _logrevs(repo, opts) | |
2100 | if not revs: |
|
2100 | if not revs: | |
2101 | return revset.baseset([]), None, None |
|
2101 | return revset.baseset([]), None, None | |
2102 | expr, filematcher = _makelogrevset(repo, pats, opts, revs) |
|
2102 | expr, filematcher = _makelogrevset(repo, pats, opts, revs) | |
2103 | if expr: |
|
2103 | if expr: | |
2104 | # Revset matchers often operate faster on revisions in changelog |
|
2104 | # Revset matchers often operate faster on revisions in changelog | |
2105 | # order, because most filters deal with the changelog. |
|
2105 | # order, because most filters deal with the changelog. | |
2106 | if not opts.get('rev'): |
|
2106 | if not opts.get('rev'): | |
2107 | revs.reverse() |
|
2107 | revs.reverse() | |
2108 | matcher = revset.match(repo.ui, expr) |
|
2108 | matcher = revset.match(repo.ui, expr) | |
2109 | # Revset matches can reorder revisions. "A or B" typically returns |
|
2109 | # Revset matches can reorder revisions. "A or B" typically returns | |
2110 | # returns the revision matching A then the revision matching B. Sort |
|
2110 | # returns the revision matching A then the revision matching B. Sort | |
2111 | # again to fix that. |
|
2111 | # again to fix that. | |
2112 | revs = matcher(repo, revs) |
|
2112 | revs = matcher(repo, revs) | |
2113 | if not opts.get('rev'): |
|
2113 | if not opts.get('rev'): | |
2114 | revs.sort(reverse=True) |
|
2114 | revs.sort(reverse=True) | |
2115 | if limit is not None: |
|
2115 | if limit is not None: | |
2116 | count = 0 |
|
2116 | count = 0 | |
2117 | limitedrevs = [] |
|
2117 | limitedrevs = [] | |
2118 | it = iter(revs) |
|
2118 | it = iter(revs) | |
2119 | while count < limit: |
|
2119 | while count < limit: | |
2120 | try: |
|
2120 | try: | |
2121 | limitedrevs.append(it.next()) |
|
2121 | limitedrevs.append(it.next()) | |
2122 | except (StopIteration): |
|
2122 | except (StopIteration): | |
2123 | break |
|
2123 | break | |
2124 | count += 1 |
|
2124 | count += 1 | |
2125 | revs = revset.baseset(limitedrevs) |
|
2125 | revs = revset.baseset(limitedrevs) | |
2126 |
|
2126 | |||
2127 | return revs, expr, filematcher |
|
2127 | return revs, expr, filematcher | |
2128 |
|
2128 | |||
2129 | def displaygraph(ui, dag, displayer, showparents, edgefn, getrenamed=None, |
|
2129 | def displaygraph(ui, dag, displayer, showparents, edgefn, getrenamed=None, | |
2130 | filematcher=None): |
|
2130 | filematcher=None): | |
2131 | seen, state = [], graphmod.asciistate() |
|
2131 | seen, state = [], graphmod.asciistate() | |
2132 | for rev, type, ctx, parents in dag: |
|
2132 | for rev, type, ctx, parents in dag: | |
2133 | char = 'o' |
|
2133 | char = 'o' | |
2134 | if ctx.node() in showparents: |
|
2134 | if ctx.node() in showparents: | |
2135 | char = '@' |
|
2135 | char = '@' | |
2136 | elif ctx.obsolete(): |
|
2136 | elif ctx.obsolete(): | |
2137 | char = 'x' |
|
2137 | char = 'x' | |
2138 | elif ctx.closesbranch(): |
|
2138 | elif ctx.closesbranch(): | |
2139 | char = '_' |
|
2139 | char = '_' | |
2140 | copies = None |
|
2140 | copies = None | |
2141 | if getrenamed and ctx.rev(): |
|
2141 | if getrenamed and ctx.rev(): | |
2142 | copies = [] |
|
2142 | copies = [] | |
2143 | for fn in ctx.files(): |
|
2143 | for fn in ctx.files(): | |
2144 | rename = getrenamed(fn, ctx.rev()) |
|
2144 | rename = getrenamed(fn, ctx.rev()) | |
2145 | if rename: |
|
2145 | if rename: | |
2146 | copies.append((fn, rename[0])) |
|
2146 | copies.append((fn, rename[0])) | |
2147 | revmatchfn = None |
|
2147 | revmatchfn = None | |
2148 | if filematcher is not None: |
|
2148 | if filematcher is not None: | |
2149 | revmatchfn = filematcher(ctx.rev()) |
|
2149 | revmatchfn = filematcher(ctx.rev()) | |
2150 | displayer.show(ctx, copies=copies, matchfn=revmatchfn) |
|
2150 | displayer.show(ctx, copies=copies, matchfn=revmatchfn) | |
2151 | lines = displayer.hunk.pop(rev).split('\n') |
|
2151 | lines = displayer.hunk.pop(rev).split('\n') | |
2152 | if not lines[-1]: |
|
2152 | if not lines[-1]: | |
2153 | del lines[-1] |
|
2153 | del lines[-1] | |
2154 | displayer.flush(rev) |
|
2154 | displayer.flush(rev) | |
2155 | edges = edgefn(type, char, lines, seen, rev, parents) |
|
2155 | edges = edgefn(type, char, lines, seen, rev, parents) | |
2156 | for type, char, lines, coldata in edges: |
|
2156 | for type, char, lines, coldata in edges: | |
2157 | graphmod.ascii(ui, state, type, char, lines, coldata) |
|
2157 | graphmod.ascii(ui, state, type, char, lines, coldata) | |
2158 | displayer.close() |
|
2158 | displayer.close() | |
2159 |
|
2159 | |||
2160 | def graphlog(ui, repo, *pats, **opts): |
|
2160 | def graphlog(ui, repo, *pats, **opts): | |
2161 | # Parameters are identical to log command ones |
|
2161 | # Parameters are identical to log command ones | |
2162 | revs, expr, filematcher = getgraphlogrevs(repo, pats, opts) |
|
2162 | revs, expr, filematcher = getgraphlogrevs(repo, pats, opts) | |
2163 | revdag = graphmod.dagwalker(repo, revs) |
|
2163 | revdag = graphmod.dagwalker(repo, revs) | |
2164 |
|
2164 | |||
2165 | getrenamed = None |
|
2165 | getrenamed = None | |
2166 | if opts.get('copies'): |
|
2166 | if opts.get('copies'): | |
2167 | endrev = None |
|
2167 | endrev = None | |
2168 | if opts.get('rev'): |
|
2168 | if opts.get('rev'): | |
2169 | endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1 |
|
2169 | endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1 | |
2170 | getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) |
|
2170 | getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) | |
2171 | displayer = show_changeset(ui, repo, opts, buffered=True) |
|
2171 | displayer = show_changeset(ui, repo, opts, buffered=True) | |
2172 | showparents = [ctx.node() for ctx in repo[None].parents()] |
|
2172 | showparents = [ctx.node() for ctx in repo[None].parents()] | |
2173 | displaygraph(ui, revdag, displayer, showparents, |
|
2173 | displaygraph(ui, revdag, displayer, showparents, | |
2174 | graphmod.asciiedges, getrenamed, filematcher) |
|
2174 | graphmod.asciiedges, getrenamed, filematcher) | |
2175 |
|
2175 | |||
2176 | def checkunsupportedgraphflags(pats, opts): |
|
2176 | def checkunsupportedgraphflags(pats, opts): | |
2177 | for op in ["newest_first"]: |
|
2177 | for op in ["newest_first"]: | |
2178 | if op in opts and opts[op]: |
|
2178 | if op in opts and opts[op]: | |
2179 | raise util.Abort(_("-G/--graph option is incompatible with --%s") |
|
2179 | raise util.Abort(_("-G/--graph option is incompatible with --%s") | |
2180 | % op.replace("_", "-")) |
|
2180 | % op.replace("_", "-")) | |
2181 |
|
2181 | |||
2182 | def graphrevs(repo, nodes, opts): |
|
2182 | def graphrevs(repo, nodes, opts): | |
2183 | limit = loglimit(opts) |
|
2183 | limit = loglimit(opts) | |
2184 | nodes.reverse() |
|
2184 | nodes.reverse() | |
2185 | if limit is not None: |
|
2185 | if limit is not None: | |
2186 | nodes = nodes[:limit] |
|
2186 | nodes = nodes[:limit] | |
2187 | return graphmod.nodes(repo, nodes) |
|
2187 | return graphmod.nodes(repo, nodes) | |
2188 |
|
2188 | |||
2189 | def add(ui, repo, match, prefix, explicitonly, **opts): |
|
2189 | def add(ui, repo, match, prefix, explicitonly, **opts): | |
2190 | join = lambda f: os.path.join(prefix, f) |
|
2190 | join = lambda f: os.path.join(prefix, f) | |
2191 | bad = [] |
|
2191 | bad = [] | |
2192 | oldbad = match.bad |
|
2192 | oldbad = match.bad | |
2193 | match.bad = lambda x, y: bad.append(x) or oldbad(x, y) |
|
2193 | match.bad = lambda x, y: bad.append(x) or oldbad(x, y) | |
2194 | names = [] |
|
2194 | names = [] | |
2195 | wctx = repo[None] |
|
2195 | wctx = repo[None] | |
2196 | cca = None |
|
2196 | cca = None | |
2197 | abort, warn = scmutil.checkportabilityalert(ui) |
|
2197 | abort, warn = scmutil.checkportabilityalert(ui) | |
2198 | if abort or warn: |
|
2198 | if abort or warn: | |
2199 | cca = scmutil.casecollisionauditor(ui, abort, repo.dirstate) |
|
2199 | cca = scmutil.casecollisionauditor(ui, abort, repo.dirstate) | |
2200 | for f in wctx.walk(match): |
|
2200 | for f in wctx.walk(match): | |
2201 | exact = match.exact(f) |
|
2201 | exact = match.exact(f) | |
2202 | if exact or not explicitonly and f not in wctx and repo.wvfs.lexists(f): |
|
2202 | if exact or not explicitonly and f not in wctx and repo.wvfs.lexists(f): | |
2203 | if cca: |
|
2203 | if cca: | |
2204 | cca(f) |
|
2204 | cca(f) | |
2205 | names.append(f) |
|
2205 | names.append(f) | |
2206 | if ui.verbose or not exact: |
|
2206 | if ui.verbose or not exact: | |
2207 | ui.status(_('adding %s\n') % match.rel(f)) |
|
2207 | ui.status(_('adding %s\n') % match.rel(f)) | |
2208 |
|
2208 | |||
2209 | for subpath in sorted(wctx.substate): |
|
2209 | for subpath in sorted(wctx.substate): | |
2210 | sub = wctx.sub(subpath) |
|
2210 | sub = wctx.sub(subpath) | |
2211 | try: |
|
2211 | try: | |
2212 | submatch = matchmod.narrowmatcher(subpath, match) |
|
2212 | submatch = matchmod.narrowmatcher(subpath, match) | |
2213 | if opts.get('subrepos'): |
|
2213 | if opts.get('subrepos'): | |
2214 | bad.extend(sub.add(ui, submatch, prefix, False, **opts)) |
|
2214 | bad.extend(sub.add(ui, submatch, prefix, False, **opts)) | |
2215 | else: |
|
2215 | else: | |
2216 | bad.extend(sub.add(ui, submatch, prefix, True, **opts)) |
|
2216 | bad.extend(sub.add(ui, submatch, prefix, True, **opts)) | |
2217 | except error.LookupError: |
|
2217 | except error.LookupError: | |
2218 | ui.status(_("skipping missing subrepository: %s\n") |
|
2218 | ui.status(_("skipping missing subrepository: %s\n") | |
2219 | % join(subpath)) |
|
2219 | % join(subpath)) | |
2220 |
|
2220 | |||
2221 | if not opts.get('dry_run'): |
|
2221 | if not opts.get('dry_run'): | |
2222 | rejected = wctx.add(names, prefix) |
|
2222 | rejected = wctx.add(names, prefix) | |
2223 | bad.extend(f for f in rejected if f in match.files()) |
|
2223 | bad.extend(f for f in rejected if f in match.files()) | |
2224 | return bad |
|
2224 | return bad | |
2225 |
|
2225 | |||
2226 | def forget(ui, repo, match, prefix, explicitonly): |
|
2226 | def forget(ui, repo, match, prefix, explicitonly): | |
2227 | join = lambda f: os.path.join(prefix, f) |
|
2227 | join = lambda f: os.path.join(prefix, f) | |
2228 | bad = [] |
|
2228 | bad = [] | |
2229 | oldbad = match.bad |
|
2229 | oldbad = match.bad | |
2230 | match.bad = lambda x, y: bad.append(x) or oldbad(x, y) |
|
2230 | match.bad = lambda x, y: bad.append(x) or oldbad(x, y) | |
2231 | wctx = repo[None] |
|
2231 | wctx = repo[None] | |
2232 | forgot = [] |
|
2232 | forgot = [] | |
2233 | s = repo.status(match=match, clean=True) |
|
2233 | s = repo.status(match=match, clean=True) | |
2234 | forget = sorted(s[0] + s[1] + s[3] + s[6]) |
|
2234 | forget = sorted(s[0] + s[1] + s[3] + s[6]) | |
2235 | if explicitonly: |
|
2235 | if explicitonly: | |
2236 | forget = [f for f in forget if match.exact(f)] |
|
2236 | forget = [f for f in forget if match.exact(f)] | |
2237 |
|
2237 | |||
2238 | for subpath in sorted(wctx.substate): |
|
2238 | for subpath in sorted(wctx.substate): | |
2239 | sub = wctx.sub(subpath) |
|
2239 | sub = wctx.sub(subpath) | |
2240 | try: |
|
2240 | try: | |
2241 | submatch = matchmod.narrowmatcher(subpath, match) |
|
2241 | submatch = matchmod.narrowmatcher(subpath, match) | |
2242 | subbad, subforgot = sub.forget(submatch, prefix) |
|
2242 | subbad, subforgot = sub.forget(submatch, prefix) | |
2243 | bad.extend([subpath + '/' + f for f in subbad]) |
|
2243 | bad.extend([subpath + '/' + f for f in subbad]) | |
2244 | forgot.extend([subpath + '/' + f for f in subforgot]) |
|
2244 | forgot.extend([subpath + '/' + f for f in subforgot]) | |
2245 | except error.LookupError: |
|
2245 | except error.LookupError: | |
2246 | ui.status(_("skipping missing subrepository: %s\n") |
|
2246 | ui.status(_("skipping missing subrepository: %s\n") | |
2247 | % join(subpath)) |
|
2247 | % join(subpath)) | |
2248 |
|
2248 | |||
2249 | if not explicitonly: |
|
2249 | if not explicitonly: | |
2250 | for f in match.files(): |
|
2250 | for f in match.files(): | |
2251 | if f not in repo.dirstate and not repo.wvfs.isdir(f): |
|
2251 | if f not in repo.dirstate and not repo.wvfs.isdir(f): | |
2252 | if f not in forgot: |
|
2252 | if f not in forgot: | |
2253 | if repo.wvfs.exists(f): |
|
2253 | if repo.wvfs.exists(f): | |
2254 | # Don't complain if the exact case match wasn't given. |
|
2254 | # Don't complain if the exact case match wasn't given. | |
2255 | # But don't do this until after checking 'forgot', so |
|
2255 | # But don't do this until after checking 'forgot', so | |
2256 | # that subrepo files aren't normalized, and this op is |
|
2256 | # that subrepo files aren't normalized, and this op is | |
2257 | # purely from data cached by the status walk above. |
|
2257 | # purely from data cached by the status walk above. | |
2258 | if repo.dirstate.normalize(f) in repo.dirstate: |
|
2258 | if repo.dirstate.normalize(f) in repo.dirstate: | |
2259 | continue |
|
2259 | continue | |
2260 | ui.warn(_('not removing %s: ' |
|
2260 | ui.warn(_('not removing %s: ' | |
2261 | 'file is already untracked\n') |
|
2261 | 'file is already untracked\n') | |
2262 | % match.rel(f)) |
|
2262 | % match.rel(f)) | |
2263 | bad.append(f) |
|
2263 | bad.append(f) | |
2264 |
|
2264 | |||
2265 | for f in forget: |
|
2265 | for f in forget: | |
2266 | if ui.verbose or not match.exact(f): |
|
2266 | if ui.verbose or not match.exact(f): | |
2267 | ui.status(_('removing %s\n') % match.rel(f)) |
|
2267 | ui.status(_('removing %s\n') % match.rel(f)) | |
2268 |
|
2268 | |||
2269 | rejected = wctx.forget(forget, prefix) |
|
2269 | rejected = wctx.forget(forget, prefix) | |
2270 | bad.extend(f for f in rejected if f in match.files()) |
|
2270 | bad.extend(f for f in rejected if f in match.files()) | |
2271 | forgot.extend(f for f in forget if f not in rejected) |
|
2271 | forgot.extend(f for f in forget if f not in rejected) | |
2272 | return bad, forgot |
|
2272 | return bad, forgot | |
2273 |
|
2273 | |||
2274 | def files(ui, ctx, m, fm, fmt, subrepos): |
|
2274 | def files(ui, ctx, m, fm, fmt, subrepos): | |
2275 | rev = ctx.rev() |
|
2275 | rev = ctx.rev() | |
2276 | ret = 1 |
|
2276 | ret = 1 | |
2277 | ds = ctx.repo().dirstate |
|
2277 | ds = ctx.repo().dirstate | |
2278 |
|
2278 | |||
2279 | for f in ctx.matches(m): |
|
2279 | for f in ctx.matches(m): | |
2280 | if rev is None and ds[f] == 'r': |
|
2280 | if rev is None and ds[f] == 'r': | |
2281 | continue |
|
2281 | continue | |
2282 | fm.startitem() |
|
2282 | fm.startitem() | |
2283 | if ui.verbose: |
|
2283 | if ui.verbose: | |
2284 | fc = ctx[f] |
|
2284 | fc = ctx[f] | |
2285 | fm.write('size flags', '% 10d % 1s ', fc.size(), fc.flags()) |
|
2285 | fm.write('size flags', '% 10d % 1s ', fc.size(), fc.flags()) | |
2286 | fm.data(abspath=f) |
|
2286 | fm.data(abspath=f) | |
2287 | fm.write('path', fmt, m.rel(f)) |
|
2287 | fm.write('path', fmt, m.rel(f)) | |
2288 | ret = 0 |
|
2288 | ret = 0 | |
2289 |
|
2289 | |||
2290 | if subrepos: |
|
2290 | if subrepos: | |
2291 | for subpath in sorted(ctx.substate): |
|
2291 | for subpath in sorted(ctx.substate): | |
2292 | sub = ctx.sub(subpath) |
|
2292 | sub = ctx.sub(subpath) | |
2293 | try: |
|
2293 | try: | |
2294 | submatch = matchmod.narrowmatcher(subpath, m) |
|
2294 | submatch = matchmod.narrowmatcher(subpath, m) | |
2295 | if sub.printfiles(ui, submatch, fm, fmt) == 0: |
|
2295 | if sub.printfiles(ui, submatch, fm, fmt) == 0: | |
2296 | ret = 0 |
|
2296 | ret = 0 | |
2297 | except error.LookupError: |
|
2297 | except error.LookupError: | |
2298 | ui.status(_("skipping missing subrepository: %s\n") |
|
2298 | ui.status(_("skipping missing subrepository: %s\n") | |
2299 | % m.abs(subpath)) |
|
2299 | % m.abs(subpath)) | |
2300 |
|
2300 | |||
2301 | return ret |
|
2301 | return ret | |
2302 |
|
2302 | |||
2303 | def remove(ui, repo, m, prefix, after, force, subrepos): |
|
2303 | def remove(ui, repo, m, prefix, after, force, subrepos): | |
2304 | join = lambda f: os.path.join(prefix, f) |
|
2304 | join = lambda f: os.path.join(prefix, f) | |
2305 | ret = 0 |
|
2305 | ret = 0 | |
2306 | s = repo.status(match=m, clean=True) |
|
2306 | s = repo.status(match=m, clean=True) | |
2307 | modified, added, deleted, clean = s[0], s[1], s[3], s[6] |
|
2307 | modified, added, deleted, clean = s[0], s[1], s[3], s[6] | |
2308 |
|
2308 | |||
2309 | wctx = repo[None] |
|
2309 | wctx = repo[None] | |
2310 |
|
2310 | |||
2311 | for subpath in sorted(wctx.substate): |
|
2311 | for subpath in sorted(wctx.substate): | |
2312 | def matchessubrepo(matcher, subpath): |
|
2312 | def matchessubrepo(matcher, subpath): | |
2313 | if matcher.exact(subpath): |
|
2313 | if matcher.exact(subpath): | |
2314 | return True |
|
2314 | return True | |
2315 | for f in matcher.files(): |
|
2315 | for f in matcher.files(): | |
2316 | if f.startswith(subpath): |
|
2316 | if f.startswith(subpath): | |
2317 | return True |
|
2317 | return True | |
2318 | return False |
|
2318 | return False | |
2319 |
|
2319 | |||
2320 | if subrepos or matchessubrepo(m, subpath): |
|
2320 | if subrepos or matchessubrepo(m, subpath): | |
2321 | sub = wctx.sub(subpath) |
|
2321 | sub = wctx.sub(subpath) | |
2322 | try: |
|
2322 | try: | |
2323 | submatch = matchmod.narrowmatcher(subpath, m) |
|
2323 | submatch = matchmod.narrowmatcher(subpath, m) | |
2324 | if sub.removefiles(submatch, prefix, after, force, subrepos): |
|
2324 | if sub.removefiles(submatch, prefix, after, force, subrepos): | |
2325 | ret = 1 |
|
2325 | ret = 1 | |
2326 | except error.LookupError: |
|
2326 | except error.LookupError: | |
2327 | ui.status(_("skipping missing subrepository: %s\n") |
|
2327 | ui.status(_("skipping missing subrepository: %s\n") | |
2328 | % join(subpath)) |
|
2328 | % join(subpath)) | |
2329 |
|
2329 | |||
2330 | # warn about failure to delete explicit files/dirs |
|
2330 | # warn about failure to delete explicit files/dirs | |
2331 | deleteddirs = util.dirs(deleted) |
|
2331 | deleteddirs = util.dirs(deleted) | |
2332 | for f in m.files(): |
|
2332 | for f in m.files(): | |
2333 | def insubrepo(): |
|
2333 | def insubrepo(): | |
2334 | for subpath in wctx.substate: |
|
2334 | for subpath in wctx.substate: | |
2335 | if f.startswith(subpath): |
|
2335 | if f.startswith(subpath): | |
2336 | return True |
|
2336 | return True | |
2337 | return False |
|
2337 | return False | |
2338 |
|
2338 | |||
2339 | isdir = f in deleteddirs or f in wctx.dirs() |
|
2339 | isdir = f in deleteddirs or f in wctx.dirs() | |
2340 | if f in repo.dirstate or isdir or f == '.' or insubrepo(): |
|
2340 | if f in repo.dirstate or isdir or f == '.' or insubrepo(): | |
2341 | continue |
|
2341 | continue | |
2342 |
|
2342 | |||
2343 | if repo.wvfs.exists(f): |
|
2343 | if repo.wvfs.exists(f): | |
2344 | if repo.wvfs.isdir(f): |
|
2344 | if repo.wvfs.isdir(f): | |
2345 | ui.warn(_('not removing %s: no tracked files\n') |
|
2345 | ui.warn(_('not removing %s: no tracked files\n') | |
2346 | % m.rel(f)) |
|
2346 | % m.rel(f)) | |
2347 | else: |
|
2347 | else: | |
2348 | ui.warn(_('not removing %s: file is untracked\n') |
|
2348 | ui.warn(_('not removing %s: file is untracked\n') | |
2349 | % m.rel(f)) |
|
2349 | % m.rel(f)) | |
2350 | # missing files will generate a warning elsewhere |
|
2350 | # missing files will generate a warning elsewhere | |
2351 | ret = 1 |
|
2351 | ret = 1 | |
2352 |
|
2352 | |||
2353 | if force: |
|
2353 | if force: | |
2354 | list = modified + deleted + clean + added |
|
2354 | list = modified + deleted + clean + added | |
2355 | elif after: |
|
2355 | elif after: | |
2356 | list = deleted |
|
2356 | list = deleted | |
2357 | for f in modified + added + clean: |
|
2357 | for f in modified + added + clean: | |
2358 | ui.warn(_('not removing %s: file still exists\n') % m.rel(f)) |
|
2358 | ui.warn(_('not removing %s: file still exists\n') % m.rel(f)) | |
2359 | ret = 1 |
|
2359 | ret = 1 | |
2360 | else: |
|
2360 | else: | |
2361 | list = deleted + clean |
|
2361 | list = deleted + clean | |
2362 | for f in modified: |
|
2362 | for f in modified: | |
2363 | ui.warn(_('not removing %s: file is modified (use -f' |
|
2363 | ui.warn(_('not removing %s: file is modified (use -f' | |
2364 | ' to force removal)\n') % m.rel(f)) |
|
2364 | ' to force removal)\n') % m.rel(f)) | |
2365 | ret = 1 |
|
2365 | ret = 1 | |
2366 | for f in added: |
|
2366 | for f in added: | |
2367 | ui.warn(_('not removing %s: file has been marked for add' |
|
2367 | ui.warn(_('not removing %s: file has been marked for add' | |
2368 | ' (use forget to undo)\n') % m.rel(f)) |
|
2368 | ' (use forget to undo)\n') % m.rel(f)) | |
2369 | ret = 1 |
|
2369 | ret = 1 | |
2370 |
|
2370 | |||
2371 | for f in sorted(list): |
|
2371 | for f in sorted(list): | |
2372 | if ui.verbose or not m.exact(f): |
|
2372 | if ui.verbose or not m.exact(f): | |
2373 | ui.status(_('removing %s\n') % m.rel(f)) |
|
2373 | ui.status(_('removing %s\n') % m.rel(f)) | |
2374 |
|
2374 | |||
2375 | wlock = repo.wlock() |
|
2375 | wlock = repo.wlock() | |
2376 | try: |
|
2376 | try: | |
2377 | if not after: |
|
2377 | if not after: | |
2378 | for f in list: |
|
2378 | for f in list: | |
2379 | if f in added: |
|
2379 | if f in added: | |
2380 | continue # we never unlink added files on remove |
|
2380 | continue # we never unlink added files on remove | |
2381 | util.unlinkpath(repo.wjoin(f), ignoremissing=True) |
|
2381 | util.unlinkpath(repo.wjoin(f), ignoremissing=True) | |
2382 | repo[None].forget(list) |
|
2382 | repo[None].forget(list) | |
2383 | finally: |
|
2383 | finally: | |
2384 | wlock.release() |
|
2384 | wlock.release() | |
2385 |
|
2385 | |||
2386 | return ret |
|
2386 | return ret | |
2387 |
|
2387 | |||
2388 | def cat(ui, repo, ctx, matcher, prefix, **opts): |
|
2388 | def cat(ui, repo, ctx, matcher, prefix, **opts): | |
2389 | err = 1 |
|
2389 | err = 1 | |
2390 |
|
2390 | |||
2391 | def write(path): |
|
2391 | def write(path): | |
2392 | fp = makefileobj(repo, opts.get('output'), ctx.node(), |
|
2392 | fp = makefileobj(repo, opts.get('output'), ctx.node(), | |
2393 | pathname=os.path.join(prefix, path)) |
|
2393 | pathname=os.path.join(prefix, path)) | |
2394 | data = ctx[path].data() |
|
2394 | data = ctx[path].data() | |
2395 | if opts.get('decode'): |
|
2395 | if opts.get('decode'): | |
2396 | data = repo.wwritedata(path, data) |
|
2396 | data = repo.wwritedata(path, data) | |
2397 | fp.write(data) |
|
2397 | fp.write(data) | |
2398 | fp.close() |
|
2398 | fp.close() | |
2399 |
|
2399 | |||
2400 | # Automation often uses hg cat on single files, so special case it |
|
2400 | # Automation often uses hg cat on single files, so special case it | |
2401 | # for performance to avoid the cost of parsing the manifest. |
|
2401 | # for performance to avoid the cost of parsing the manifest. | |
2402 | if len(matcher.files()) == 1 and not matcher.anypats(): |
|
2402 | if len(matcher.files()) == 1 and not matcher.anypats(): | |
2403 | file = matcher.files()[0] |
|
2403 | file = matcher.files()[0] | |
2404 | mf = repo.manifest |
|
2404 | mf = repo.manifest | |
2405 | mfnode = ctx.manifestnode() |
|
2405 | mfnode = ctx.manifestnode() | |
2406 | if mfnode and mf.find(mfnode, file)[0]: |
|
2406 | if mfnode and mf.find(mfnode, file)[0]: | |
2407 | write(file) |
|
2407 | write(file) | |
2408 | return 0 |
|
2408 | return 0 | |
2409 |
|
2409 | |||
2410 | # Don't warn about "missing" files that are really in subrepos |
|
2410 | # Don't warn about "missing" files that are really in subrepos | |
2411 | bad = matcher.bad |
|
2411 | bad = matcher.bad | |
2412 |
|
2412 | |||
2413 | def badfn(path, msg): |
|
2413 | def badfn(path, msg): | |
2414 | for subpath in ctx.substate: |
|
2414 | for subpath in ctx.substate: | |
2415 | if path.startswith(subpath): |
|
2415 | if path.startswith(subpath): | |
2416 | return |
|
2416 | return | |
2417 | bad(path, msg) |
|
2417 | bad(path, msg) | |
2418 |
|
2418 | |||
2419 | matcher.bad = badfn |
|
2419 | matcher.bad = badfn | |
2420 |
|
2420 | |||
2421 | for abs in ctx.walk(matcher): |
|
2421 | for abs in ctx.walk(matcher): | |
2422 | write(abs) |
|
2422 | write(abs) | |
2423 | err = 0 |
|
2423 | err = 0 | |
2424 |
|
2424 | |||
2425 | matcher.bad = bad |
|
2425 | matcher.bad = bad | |
2426 |
|
2426 | |||
2427 | for subpath in sorted(ctx.substate): |
|
2427 | for subpath in sorted(ctx.substate): | |
2428 | sub = ctx.sub(subpath) |
|
2428 | sub = ctx.sub(subpath) | |
2429 | try: |
|
2429 | try: | |
2430 | submatch = matchmod.narrowmatcher(subpath, matcher) |
|
2430 | submatch = matchmod.narrowmatcher(subpath, matcher) | |
2431 |
|
2431 | |||
2432 | if not sub.cat(submatch, os.path.join(prefix, sub._path), |
|
2432 | if not sub.cat(submatch, os.path.join(prefix, sub._path), | |
2433 | **opts): |
|
2433 | **opts): | |
2434 | err = 0 |
|
2434 | err = 0 | |
2435 | except error.RepoLookupError: |
|
2435 | except error.RepoLookupError: | |
2436 | ui.status(_("skipping missing subrepository: %s\n") |
|
2436 | ui.status(_("skipping missing subrepository: %s\n") | |
2437 | % os.path.join(prefix, subpath)) |
|
2437 | % os.path.join(prefix, subpath)) | |
2438 |
|
2438 | |||
2439 | return err |
|
2439 | return err | |
2440 |
|
2440 | |||
2441 | def commit(ui, repo, commitfunc, pats, opts): |
|
2441 | def commit(ui, repo, commitfunc, pats, opts): | |
2442 | '''commit the specified files or all outstanding changes''' |
|
2442 | '''commit the specified files or all outstanding changes''' | |
2443 | date = opts.get('date') |
|
2443 | date = opts.get('date') | |
2444 | if date: |
|
2444 | if date: | |
2445 | opts['date'] = util.parsedate(date) |
|
2445 | opts['date'] = util.parsedate(date) | |
2446 | message = logmessage(ui, opts) |
|
2446 | message = logmessage(ui, opts) | |
2447 | matcher = scmutil.match(repo[None], pats, opts) |
|
2447 | matcher = scmutil.match(repo[None], pats, opts) | |
2448 |
|
2448 | |||
2449 | # extract addremove carefully -- this function can be called from a command |
|
2449 | # extract addremove carefully -- this function can be called from a command | |
2450 | # that doesn't support addremove |
|
2450 | # that doesn't support addremove | |
2451 | if opts.get('addremove'): |
|
2451 | if opts.get('addremove'): | |
2452 | if scmutil.addremove(repo, matcher, "", opts) != 0: |
|
2452 | if scmutil.addremove(repo, matcher, "", opts) != 0: | |
2453 | raise util.Abort( |
|
2453 | raise util.Abort( | |
2454 | _("failed to mark all new/missing files as added/removed")) |
|
2454 | _("failed to mark all new/missing files as added/removed")) | |
2455 |
|
2455 | |||
2456 | return commitfunc(ui, repo, message, matcher, opts) |
|
2456 | return commitfunc(ui, repo, message, matcher, opts) | |
2457 |
|
2457 | |||
2458 | def amend(ui, repo, commitfunc, old, extra, pats, opts): |
|
2458 | def amend(ui, repo, commitfunc, old, extra, pats, opts): | |
2459 | # amend will reuse the existing user if not specified, but the obsolete |
|
2459 | # amend will reuse the existing user if not specified, but the obsolete | |
2460 | # marker creation requires that the current user's name is specified. |
|
2460 | # marker creation requires that the current user's name is specified. | |
2461 | if obsolete.isenabled(repo, obsolete.createmarkersopt): |
|
2461 | if obsolete.isenabled(repo, obsolete.createmarkersopt): | |
2462 | ui.username() # raise exception if username not set |
|
2462 | ui.username() # raise exception if username not set | |
2463 |
|
2463 | |||
2464 | ui.note(_('amending changeset %s\n') % old) |
|
2464 | ui.note(_('amending changeset %s\n') % old) | |
2465 | base = old.p1() |
|
2465 | base = old.p1() | |
2466 |
|
2466 | |||
2467 | wlock = lock = newid = None |
|
2467 | wlock = lock = newid = None | |
2468 | try: |
|
2468 | try: | |
2469 | wlock = repo.wlock() |
|
2469 | wlock = repo.wlock() | |
2470 | lock = repo.lock() |
|
2470 | lock = repo.lock() | |
2471 | tr = repo.transaction('amend') |
|
2471 | tr = repo.transaction('amend') | |
2472 | try: |
|
2472 | try: | |
2473 | # See if we got a message from -m or -l, if not, open the editor |
|
2473 | # See if we got a message from -m or -l, if not, open the editor | |
2474 | # with the message of the changeset to amend |
|
2474 | # with the message of the changeset to amend | |
2475 | message = logmessage(ui, opts) |
|
2475 | message = logmessage(ui, opts) | |
2476 | # ensure logfile does not conflict with later enforcement of the |
|
2476 | # ensure logfile does not conflict with later enforcement of the | |
2477 | # message. potential logfile content has been processed by |
|
2477 | # message. potential logfile content has been processed by | |
2478 | # `logmessage` anyway. |
|
2478 | # `logmessage` anyway. | |
2479 | opts.pop('logfile') |
|
2479 | opts.pop('logfile') | |
2480 | # First, do a regular commit to record all changes in the working |
|
2480 | # First, do a regular commit to record all changes in the working | |
2481 | # directory (if there are any) |
|
2481 | # directory (if there are any) | |
2482 | ui.callhooks = False |
|
2482 | ui.callhooks = False | |
2483 | currentbookmark = repo._bookmarkcurrent |
|
2483 | currentbookmark = repo._bookmarkcurrent | |
2484 | try: |
|
2484 | try: | |
2485 | repo._bookmarkcurrent = None |
|
2485 | repo._bookmarkcurrent = None | |
2486 | opts['message'] = 'temporary amend commit for %s' % old |
|
2486 | opts['message'] = 'temporary amend commit for %s' % old | |
2487 | node = commit(ui, repo, commitfunc, pats, opts) |
|
2487 | node = commit(ui, repo, commitfunc, pats, opts) | |
2488 | finally: |
|
2488 | finally: | |
2489 | repo._bookmarkcurrent = currentbookmark |
|
2489 | repo._bookmarkcurrent = currentbookmark | |
2490 | ui.callhooks = True |
|
2490 | ui.callhooks = True | |
2491 | ctx = repo[node] |
|
2491 | ctx = repo[node] | |
2492 |
|
2492 | |||
2493 | # Participating changesets: |
|
2493 | # Participating changesets: | |
2494 | # |
|
2494 | # | |
2495 | # node/ctx o - new (intermediate) commit that contains changes |
|
2495 | # node/ctx o - new (intermediate) commit that contains changes | |
2496 | # | from working dir to go into amending commit |
|
2496 | # | from working dir to go into amending commit | |
2497 | # | (or a workingctx if there were no changes) |
|
2497 | # | (or a workingctx if there were no changes) | |
2498 | # | |
|
2498 | # | | |
2499 | # old o - changeset to amend |
|
2499 | # old o - changeset to amend | |
2500 | # | |
|
2500 | # | | |
2501 | # base o - parent of amending changeset |
|
2501 | # base o - parent of amending changeset | |
2502 |
|
2502 | |||
2503 | # Update extra dict from amended commit (e.g. to preserve graft |
|
2503 | # Update extra dict from amended commit (e.g. to preserve graft | |
2504 | # source) |
|
2504 | # source) | |
2505 | extra.update(old.extra()) |
|
2505 | extra.update(old.extra()) | |
2506 |
|
2506 | |||
2507 | # Also update it from the intermediate commit or from the wctx |
|
2507 | # Also update it from the intermediate commit or from the wctx | |
2508 | extra.update(ctx.extra()) |
|
2508 | extra.update(ctx.extra()) | |
2509 |
|
2509 | |||
2510 | if len(old.parents()) > 1: |
|
2510 | if len(old.parents()) > 1: | |
2511 | # ctx.files() isn't reliable for merges, so fall back to the |
|
2511 | # ctx.files() isn't reliable for merges, so fall back to the | |
2512 | # slower repo.status() method |
|
2512 | # slower repo.status() method | |
2513 | files = set([fn for st in repo.status(base, old)[:3] |
|
2513 | files = set([fn for st in repo.status(base, old)[:3] | |
2514 | for fn in st]) |
|
2514 | for fn in st]) | |
2515 | else: |
|
2515 | else: | |
2516 | files = set(old.files()) |
|
2516 | files = set(old.files()) | |
2517 |
|
2517 | |||
2518 | # Second, we use either the commit we just did, or if there were no |
|
2518 | # Second, we use either the commit we just did, or if there were no | |
2519 | # changes the parent of the working directory as the version of the |
|
2519 | # changes the parent of the working directory as the version of the | |
2520 | # files in the final amend commit |
|
2520 | # files in the final amend commit | |
2521 | if node: |
|
2521 | if node: | |
2522 | ui.note(_('copying changeset %s to %s\n') % (ctx, base)) |
|
2522 | ui.note(_('copying changeset %s to %s\n') % (ctx, base)) | |
2523 |
|
2523 | |||
2524 | user = ctx.user() |
|
2524 | user = ctx.user() | |
2525 | date = ctx.date() |
|
2525 | date = ctx.date() | |
2526 | # Recompute copies (avoid recording a -> b -> a) |
|
2526 | # Recompute copies (avoid recording a -> b -> a) | |
2527 | copied = copies.pathcopies(base, ctx) |
|
2527 | copied = copies.pathcopies(base, ctx) | |
2528 | if old.p2: |
|
2528 | if old.p2: | |
2529 | copied.update(copies.pathcopies(old.p2(), ctx)) |
|
2529 | copied.update(copies.pathcopies(old.p2(), ctx)) | |
2530 |
|
2530 | |||
2531 | # Prune files which were reverted by the updates: if old |
|
2531 | # Prune files which were reverted by the updates: if old | |
2532 | # introduced file X and our intermediate commit, node, |
|
2532 | # introduced file X and our intermediate commit, node, | |
2533 | # renamed that file, then those two files are the same and |
|
2533 | # renamed that file, then those two files are the same and | |
2534 | # we can discard X from our list of files. Likewise if X |
|
2534 | # we can discard X from our list of files. Likewise if X | |
2535 | # was deleted, it's no longer relevant |
|
2535 | # was deleted, it's no longer relevant | |
2536 | files.update(ctx.files()) |
|
2536 | files.update(ctx.files()) | |
2537 |
|
2537 | |||
2538 | def samefile(f): |
|
2538 | def samefile(f): | |
2539 | if f in ctx.manifest(): |
|
2539 | if f in ctx.manifest(): | |
2540 | a = ctx.filectx(f) |
|
2540 | a = ctx.filectx(f) | |
2541 | if f in base.manifest(): |
|
2541 | if f in base.manifest(): | |
2542 | b = base.filectx(f) |
|
2542 | b = base.filectx(f) | |
2543 | return (not a.cmp(b) |
|
2543 | return (not a.cmp(b) | |
2544 | and a.flags() == b.flags()) |
|
2544 | and a.flags() == b.flags()) | |
2545 | else: |
|
2545 | else: | |
2546 | return False |
|
2546 | return False | |
2547 | else: |
|
2547 | else: | |
2548 | return f not in base.manifest() |
|
2548 | return f not in base.manifest() | |
2549 | files = [f for f in files if not samefile(f)] |
|
2549 | files = [f for f in files if not samefile(f)] | |
2550 |
|
2550 | |||
2551 | def filectxfn(repo, ctx_, path): |
|
2551 | def filectxfn(repo, ctx_, path): | |
2552 | try: |
|
2552 | try: | |
2553 | fctx = ctx[path] |
|
2553 | fctx = ctx[path] | |
2554 | flags = fctx.flags() |
|
2554 | flags = fctx.flags() | |
2555 | mctx = context.memfilectx(repo, |
|
2555 | mctx = context.memfilectx(repo, | |
2556 | fctx.path(), fctx.data(), |
|
2556 | fctx.path(), fctx.data(), | |
2557 | islink='l' in flags, |
|
2557 | islink='l' in flags, | |
2558 | isexec='x' in flags, |
|
2558 | isexec='x' in flags, | |
2559 | copied=copied.get(path)) |
|
2559 | copied=copied.get(path)) | |
2560 | return mctx |
|
2560 | return mctx | |
2561 | except KeyError: |
|
2561 | except KeyError: | |
2562 | return None |
|
2562 | return None | |
2563 | else: |
|
2563 | else: | |
2564 | ui.note(_('copying changeset %s to %s\n') % (old, base)) |
|
2564 | ui.note(_('copying changeset %s to %s\n') % (old, base)) | |
2565 |
|
2565 | |||
2566 | # Use version of files as in the old cset |
|
2566 | # Use version of files as in the old cset | |
2567 | def filectxfn(repo, ctx_, path): |
|
2567 | def filectxfn(repo, ctx_, path): | |
2568 | try: |
|
2568 | try: | |
2569 | return old.filectx(path) |
|
2569 | return old.filectx(path) | |
2570 | except KeyError: |
|
2570 | except KeyError: | |
2571 | return None |
|
2571 | return None | |
2572 |
|
2572 | |||
2573 | user = opts.get('user') or old.user() |
|
2573 | user = opts.get('user') or old.user() | |
2574 | date = opts.get('date') or old.date() |
|
2574 | date = opts.get('date') or old.date() | |
2575 | editform = mergeeditform(old, 'commit.amend') |
|
2575 | editform = mergeeditform(old, 'commit.amend') | |
2576 | editor = getcommiteditor(editform=editform, **opts) |
|
2576 | editor = getcommiteditor(editform=editform, **opts) | |
2577 | if not message: |
|
2577 | if not message: | |
2578 | editor = getcommiteditor(edit=True, editform=editform) |
|
2578 | editor = getcommiteditor(edit=True, editform=editform) | |
2579 | message = old.description() |
|
2579 | message = old.description() | |
2580 |
|
2580 | |||
2581 | pureextra = extra.copy() |
|
2581 | pureextra = extra.copy() | |
2582 | extra['amend_source'] = old.hex() |
|
2582 | extra['amend_source'] = old.hex() | |
2583 |
|
2583 | |||
2584 | new = context.memctx(repo, |
|
2584 | new = context.memctx(repo, | |
2585 | parents=[base.node(), old.p2().node()], |
|
2585 | parents=[base.node(), old.p2().node()], | |
2586 | text=message, |
|
2586 | text=message, | |
2587 | files=files, |
|
2587 | files=files, | |
2588 | filectxfn=filectxfn, |
|
2588 | filectxfn=filectxfn, | |
2589 | user=user, |
|
2589 | user=user, | |
2590 | date=date, |
|
2590 | date=date, | |
2591 | extra=extra, |
|
2591 | extra=extra, | |
2592 | editor=editor) |
|
2592 | editor=editor) | |
2593 |
|
2593 | |||
2594 | newdesc = changelog.stripdesc(new.description()) |
|
2594 | newdesc = changelog.stripdesc(new.description()) | |
2595 | if ((not node) |
|
2595 | if ((not node) | |
2596 | and newdesc == old.description() |
|
2596 | and newdesc == old.description() | |
2597 | and user == old.user() |
|
2597 | and user == old.user() | |
2598 | and date == old.date() |
|
2598 | and date == old.date() | |
2599 | and pureextra == old.extra()): |
|
2599 | and pureextra == old.extra()): | |
2600 | # nothing changed. continuing here would create a new node |
|
2600 | # nothing changed. continuing here would create a new node | |
2601 | # anyway because of the amend_source noise. |
|
2601 | # anyway because of the amend_source noise. | |
2602 | # |
|
2602 | # | |
2603 | # This not what we expect from amend. |
|
2603 | # This not what we expect from amend. | |
2604 | return old.node() |
|
2604 | return old.node() | |
2605 |
|
2605 | |||
2606 | ph = repo.ui.config('phases', 'new-commit', phases.draft) |
|
2606 | ph = repo.ui.config('phases', 'new-commit', phases.draft) | |
2607 | try: |
|
2607 | try: | |
2608 | if opts.get('secret'): |
|
2608 | if opts.get('secret'): | |
2609 | commitphase = 'secret' |
|
2609 | commitphase = 'secret' | |
2610 | else: |
|
2610 | else: | |
2611 | commitphase = old.phase() |
|
2611 | commitphase = old.phase() | |
2612 | repo.ui.setconfig('phases', 'new-commit', commitphase, 'amend') |
|
2612 | repo.ui.setconfig('phases', 'new-commit', commitphase, 'amend') | |
2613 | newid = repo.commitctx(new) |
|
2613 | newid = repo.commitctx(new) | |
2614 | finally: |
|
2614 | finally: | |
2615 | repo.ui.setconfig('phases', 'new-commit', ph, 'amend') |
|
2615 | repo.ui.setconfig('phases', 'new-commit', ph, 'amend') | |
2616 | if newid != old.node(): |
|
2616 | if newid != old.node(): | |
2617 | # Reroute the working copy parent to the new changeset |
|
2617 | # Reroute the working copy parent to the new changeset | |
2618 | repo.setparents(newid, nullid) |
|
2618 | repo.setparents(newid, nullid) | |
2619 |
|
2619 | |||
2620 | # Move bookmarks from old parent to amend commit |
|
2620 | # Move bookmarks from old parent to amend commit | |
2621 | bms = repo.nodebookmarks(old.node()) |
|
2621 | bms = repo.nodebookmarks(old.node()) | |
2622 | if bms: |
|
2622 | if bms: | |
2623 | marks = repo._bookmarks |
|
2623 | marks = repo._bookmarks | |
2624 | for bm in bms: |
|
2624 | for bm in bms: | |
2625 | marks[bm] = newid |
|
2625 | marks[bm] = newid | |
2626 | marks.write() |
|
2626 | marks.write() | |
2627 | #commit the whole amend process |
|
2627 | #commit the whole amend process | |
2628 | createmarkers = obsolete.isenabled(repo, obsolete.createmarkersopt) |
|
2628 | createmarkers = obsolete.isenabled(repo, obsolete.createmarkersopt) | |
2629 | if createmarkers and newid != old.node(): |
|
2629 | if createmarkers and newid != old.node(): | |
2630 | # mark the new changeset as successor of the rewritten one |
|
2630 | # mark the new changeset as successor of the rewritten one | |
2631 | new = repo[newid] |
|
2631 | new = repo[newid] | |
2632 | obs = [(old, (new,))] |
|
2632 | obs = [(old, (new,))] | |
2633 | if node: |
|
2633 | if node: | |
2634 | obs.append((ctx, ())) |
|
2634 | obs.append((ctx, ())) | |
2635 |
|
2635 | |||
2636 | obsolete.createmarkers(repo, obs) |
|
2636 | obsolete.createmarkers(repo, obs) | |
2637 | tr.close() |
|
2637 | tr.close() | |
2638 | finally: |
|
2638 | finally: | |
2639 | tr.release() |
|
2639 | tr.release() | |
2640 | if not createmarkers and newid != old.node(): |
|
2640 | if not createmarkers and newid != old.node(): | |
2641 | # Strip the intermediate commit (if there was one) and the amended |
|
2641 | # Strip the intermediate commit (if there was one) and the amended | |
2642 | # commit |
|
2642 | # commit | |
2643 | if node: |
|
2643 | if node: | |
2644 | ui.note(_('stripping intermediate changeset %s\n') % ctx) |
|
2644 | ui.note(_('stripping intermediate changeset %s\n') % ctx) | |
2645 | ui.note(_('stripping amended changeset %s\n') % old) |
|
2645 | ui.note(_('stripping amended changeset %s\n') % old) | |
2646 | repair.strip(ui, repo, old.node(), topic='amend-backup') |
|
2646 | repair.strip(ui, repo, old.node(), topic='amend-backup') | |
2647 | finally: |
|
2647 | finally: | |
2648 | if newid is None: |
|
2648 | if newid is None: | |
2649 | repo.dirstate.invalidate() |
|
2649 | repo.dirstate.invalidate() | |
2650 | lockmod.release(lock, wlock) |
|
2650 | lockmod.release(lock, wlock) | |
2651 | return newid |
|
2651 | return newid | |
2652 |
|
2652 | |||
2653 | def commiteditor(repo, ctx, subs, editform=''): |
|
2653 | def commiteditor(repo, ctx, subs, editform=''): | |
2654 | if ctx.description(): |
|
2654 | if ctx.description(): | |
2655 | return ctx.description() |
|
2655 | return ctx.description() | |
2656 | return commitforceeditor(repo, ctx, subs, editform=editform) |
|
2656 | return commitforceeditor(repo, ctx, subs, editform=editform) | |
2657 |
|
2657 | |||
2658 | def commitforceeditor(repo, ctx, subs, finishdesc=None, extramsg=None, |
|
2658 | def commitforceeditor(repo, ctx, subs, finishdesc=None, extramsg=None, | |
2659 | editform=''): |
|
2659 | editform=''): | |
2660 | if not extramsg: |
|
2660 | if not extramsg: | |
2661 | extramsg = _("Leave message empty to abort commit.") |
|
2661 | extramsg = _("Leave message empty to abort commit.") | |
2662 |
|
2662 | |||
2663 | forms = [e for e in editform.split('.') if e] |
|
2663 | forms = [e for e in editform.split('.') if e] | |
2664 | forms.insert(0, 'changeset') |
|
2664 | forms.insert(0, 'changeset') | |
2665 | while forms: |
|
2665 | while forms: | |
2666 | tmpl = repo.ui.config('committemplate', '.'.join(forms)) |
|
2666 | tmpl = repo.ui.config('committemplate', '.'.join(forms)) | |
2667 | if tmpl: |
|
2667 | if tmpl: | |
2668 | committext = buildcommittemplate(repo, ctx, subs, extramsg, tmpl) |
|
2668 | committext = buildcommittemplate(repo, ctx, subs, extramsg, tmpl) | |
2669 | break |
|
2669 | break | |
2670 | forms.pop() |
|
2670 | forms.pop() | |
2671 | else: |
|
2671 | else: | |
2672 | committext = buildcommittext(repo, ctx, subs, extramsg) |
|
2672 | committext = buildcommittext(repo, ctx, subs, extramsg) | |
2673 |
|
2673 | |||
2674 | # run editor in the repository root |
|
2674 | # run editor in the repository root | |
2675 | olddir = os.getcwd() |
|
2675 | olddir = os.getcwd() | |
2676 | os.chdir(repo.root) |
|
2676 | os.chdir(repo.root) | |
2677 | text = repo.ui.edit(committext, ctx.user(), ctx.extra(), editform=editform) |
|
2677 | text = repo.ui.edit(committext, ctx.user(), ctx.extra(), editform=editform) | |
2678 | text = re.sub("(?m)^HG:.*(\n|$)", "", text) |
|
2678 | text = re.sub("(?m)^HG:.*(\n|$)", "", text) | |
2679 | os.chdir(olddir) |
|
2679 | os.chdir(olddir) | |
2680 |
|
2680 | |||
2681 | if finishdesc: |
|
2681 | if finishdesc: | |
2682 | text = finishdesc(text) |
|
2682 | text = finishdesc(text) | |
2683 | if not text.strip(): |
|
2683 | if not text.strip(): | |
2684 | raise util.Abort(_("empty commit message")) |
|
2684 | raise util.Abort(_("empty commit message")) | |
2685 |
|
2685 | |||
2686 | return text |
|
2686 | return text | |
2687 |
|
2687 | |||
2688 | def buildcommittemplate(repo, ctx, subs, extramsg, tmpl): |
|
2688 | def buildcommittemplate(repo, ctx, subs, extramsg, tmpl): | |
2689 | ui = repo.ui |
|
2689 | ui = repo.ui | |
2690 | tmpl, mapfile = gettemplate(ui, tmpl, None) |
|
2690 | tmpl, mapfile = gettemplate(ui, tmpl, None) | |
2691 |
|
2691 | |||
2692 | try: |
|
2692 | try: | |
2693 | t = changeset_templater(ui, repo, None, {}, tmpl, mapfile, False) |
|
2693 | t = changeset_templater(ui, repo, None, {}, tmpl, mapfile, False) | |
2694 | except SyntaxError, inst: |
|
2694 | except SyntaxError, inst: | |
2695 | raise util.Abort(inst.args[0]) |
|
2695 | raise util.Abort(inst.args[0]) | |
2696 |
|
2696 | |||
2697 | for k, v in repo.ui.configitems('committemplate'): |
|
2697 | for k, v in repo.ui.configitems('committemplate'): | |
2698 | if k != 'changeset': |
|
2698 | if k != 'changeset': | |
2699 | t.t.cache[k] = v |
|
2699 | t.t.cache[k] = v | |
2700 |
|
2700 | |||
2701 | if not extramsg: |
|
2701 | if not extramsg: | |
2702 | extramsg = '' # ensure that extramsg is string |
|
2702 | extramsg = '' # ensure that extramsg is string | |
2703 |
|
2703 | |||
2704 | ui.pushbuffer() |
|
2704 | ui.pushbuffer() | |
2705 | t.show(ctx, extramsg=extramsg) |
|
2705 | t.show(ctx, extramsg=extramsg) | |
2706 | return ui.popbuffer() |
|
2706 | return ui.popbuffer() | |
2707 |
|
2707 | |||
2708 | def buildcommittext(repo, ctx, subs, extramsg): |
|
2708 | def buildcommittext(repo, ctx, subs, extramsg): | |
2709 | edittext = [] |
|
2709 | edittext = [] | |
2710 | modified, added, removed = ctx.modified(), ctx.added(), ctx.removed() |
|
2710 | modified, added, removed = ctx.modified(), ctx.added(), ctx.removed() | |
2711 | if ctx.description(): |
|
2711 | if ctx.description(): | |
2712 | edittext.append(ctx.description()) |
|
2712 | edittext.append(ctx.description()) | |
2713 | edittext.append("") |
|
2713 | edittext.append("") | |
2714 | edittext.append("") # Empty line between message and comments. |
|
2714 | edittext.append("") # Empty line between message and comments. | |
2715 | edittext.append(_("HG: Enter commit message." |
|
2715 | edittext.append(_("HG: Enter commit message." | |
2716 | " Lines beginning with 'HG:' are removed.")) |
|
2716 | " Lines beginning with 'HG:' are removed.")) | |
2717 | edittext.append("HG: %s" % extramsg) |
|
2717 | edittext.append("HG: %s" % extramsg) | |
2718 | edittext.append("HG: --") |
|
2718 | edittext.append("HG: --") | |
2719 | edittext.append(_("HG: user: %s") % ctx.user()) |
|
2719 | edittext.append(_("HG: user: %s") % ctx.user()) | |
2720 | if ctx.p2(): |
|
2720 | if ctx.p2(): | |
2721 | edittext.append(_("HG: branch merge")) |
|
2721 | edittext.append(_("HG: branch merge")) | |
2722 | if ctx.branch(): |
|
2722 | if ctx.branch(): | |
2723 | edittext.append(_("HG: branch '%s'") % ctx.branch()) |
|
2723 | edittext.append(_("HG: branch '%s'") % ctx.branch()) | |
2724 | if bookmarks.iscurrent(repo): |
|
2724 | if bookmarks.iscurrent(repo): | |
2725 | edittext.append(_("HG: bookmark '%s'") % repo._bookmarkcurrent) |
|
2725 | edittext.append(_("HG: bookmark '%s'") % repo._bookmarkcurrent) | |
2726 | edittext.extend([_("HG: subrepo %s") % s for s in subs]) |
|
2726 | edittext.extend([_("HG: subrepo %s") % s for s in subs]) | |
2727 | edittext.extend([_("HG: added %s") % f for f in added]) |
|
2727 | edittext.extend([_("HG: added %s") % f for f in added]) | |
2728 | edittext.extend([_("HG: changed %s") % f for f in modified]) |
|
2728 | edittext.extend([_("HG: changed %s") % f for f in modified]) | |
2729 | edittext.extend([_("HG: removed %s") % f for f in removed]) |
|
2729 | edittext.extend([_("HG: removed %s") % f for f in removed]) | |
2730 | if not added and not modified and not removed: |
|
2730 | if not added and not modified and not removed: | |
2731 | edittext.append(_("HG: no files changed")) |
|
2731 | edittext.append(_("HG: no files changed")) | |
2732 | edittext.append("") |
|
2732 | edittext.append("") | |
2733 |
|
2733 | |||
2734 | return "\n".join(edittext) |
|
2734 | return "\n".join(edittext) | |
2735 |
|
2735 | |||
2736 | def commitstatus(repo, node, branch, bheads=None, opts={}): |
|
2736 | def commitstatus(repo, node, branch, bheads=None, opts={}): | |
2737 | ctx = repo[node] |
|
2737 | ctx = repo[node] | |
2738 | parents = ctx.parents() |
|
2738 | parents = ctx.parents() | |
2739 |
|
2739 | |||
2740 | if (not opts.get('amend') and bheads and node not in bheads and not |
|
2740 | if (not opts.get('amend') and bheads and node not in bheads and not | |
2741 | [x for x in parents if x.node() in bheads and x.branch() == branch]): |
|
2741 | [x for x in parents if x.node() in bheads and x.branch() == branch]): | |
2742 | repo.ui.status(_('created new head\n')) |
|
2742 | repo.ui.status(_('created new head\n')) | |
2743 | # The message is not printed for initial roots. For the other |
|
2743 | # The message is not printed for initial roots. For the other | |
2744 | # changesets, it is printed in the following situations: |
|
2744 | # changesets, it is printed in the following situations: | |
2745 | # |
|
2745 | # | |
2746 | # Par column: for the 2 parents with ... |
|
2746 | # Par column: for the 2 parents with ... | |
2747 | # N: null or no parent |
|
2747 | # N: null or no parent | |
2748 | # B: parent is on another named branch |
|
2748 | # B: parent is on another named branch | |
2749 | # C: parent is a regular non head changeset |
|
2749 | # C: parent is a regular non head changeset | |
2750 | # H: parent was a branch head of the current branch |
|
2750 | # H: parent was a branch head of the current branch | |
2751 | # Msg column: whether we print "created new head" message |
|
2751 | # Msg column: whether we print "created new head" message | |
2752 | # In the following, it is assumed that there already exists some |
|
2752 | # In the following, it is assumed that there already exists some | |
2753 | # initial branch heads of the current branch, otherwise nothing is |
|
2753 | # initial branch heads of the current branch, otherwise nothing is | |
2754 | # printed anyway. |
|
2754 | # printed anyway. | |
2755 | # |
|
2755 | # | |
2756 | # Par Msg Comment |
|
2756 | # Par Msg Comment | |
2757 | # N N y additional topo root |
|
2757 | # N N y additional topo root | |
2758 | # |
|
2758 | # | |
2759 | # B N y additional branch root |
|
2759 | # B N y additional branch root | |
2760 | # C N y additional topo head |
|
2760 | # C N y additional topo head | |
2761 | # H N n usual case |
|
2761 | # H N n usual case | |
2762 | # |
|
2762 | # | |
2763 | # B B y weird additional branch root |
|
2763 | # B B y weird additional branch root | |
2764 | # C B y branch merge |
|
2764 | # C B y branch merge | |
2765 | # H B n merge with named branch |
|
2765 | # H B n merge with named branch | |
2766 | # |
|
2766 | # | |
2767 | # C C y additional head from merge |
|
2767 | # C C y additional head from merge | |
2768 | # C H n merge with a head |
|
2768 | # C H n merge with a head | |
2769 | # |
|
2769 | # | |
2770 | # H H n head merge: head count decreases |
|
2770 | # H H n head merge: head count decreases | |
2771 |
|
2771 | |||
2772 | if not opts.get('close_branch'): |
|
2772 | if not opts.get('close_branch'): | |
2773 | for r in parents: |
|
2773 | for r in parents: | |
2774 | if r.closesbranch() and r.branch() == branch: |
|
2774 | if r.closesbranch() and r.branch() == branch: | |
2775 | repo.ui.status(_('reopening closed branch head %d\n') % r) |
|
2775 | repo.ui.status(_('reopening closed branch head %d\n') % r) | |
2776 |
|
2776 | |||
2777 | if repo.ui.debugflag: |
|
2777 | if repo.ui.debugflag: | |
2778 | repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex())) |
|
2778 | repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex())) | |
2779 | elif repo.ui.verbose: |
|
2779 | elif repo.ui.verbose: | |
2780 | repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx)) |
|
2780 | repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx)) | |
2781 |
|
2781 | |||
2782 | def revert(ui, repo, ctx, parents, *pats, **opts): |
|
2782 | def revert(ui, repo, ctx, parents, *pats, **opts): | |
2783 | parent, p2 = parents |
|
2783 | parent, p2 = parents | |
2784 | node = ctx.node() |
|
2784 | node = ctx.node() | |
2785 |
|
2785 | |||
2786 | mf = ctx.manifest() |
|
2786 | mf = ctx.manifest() | |
2787 | if node == p2: |
|
2787 | if node == p2: | |
2788 | parent = p2 |
|
2788 | parent = p2 | |
2789 | if node == parent: |
|
2789 | if node == parent: | |
2790 | pmf = mf |
|
2790 | pmf = mf | |
2791 | else: |
|
2791 | else: | |
2792 | pmf = None |
|
2792 | pmf = None | |
2793 |
|
2793 | |||
2794 | # need all matching names in dirstate and manifest of target rev, |
|
2794 | # need all matching names in dirstate and manifest of target rev, | |
2795 | # so have to walk both. do not print errors if files exist in one |
|
2795 | # so have to walk both. do not print errors if files exist in one | |
2796 | # but not other. in both cases, filesets should be evaluated against |
|
2796 | # but not other. in both cases, filesets should be evaluated against | |
2797 | # workingctx to get consistent result (issue4497). this means 'set:**' |
|
2797 | # workingctx to get consistent result (issue4497). this means 'set:**' | |
2798 | # cannot be used to select missing files from target rev. |
|
2798 | # cannot be used to select missing files from target rev. | |
2799 |
|
2799 | |||
2800 | # `names` is a mapping for all elements in working copy and target revision |
|
2800 | # `names` is a mapping for all elements in working copy and target revision | |
2801 | # The mapping is in the form: |
|
2801 | # The mapping is in the form: | |
2802 | # <asb path in repo> -> (<path from CWD>, <exactly specified by matcher?>) |
|
2802 | # <asb path in repo> -> (<path from CWD>, <exactly specified by matcher?>) | |
2803 | names = {} |
|
2803 | names = {} | |
2804 |
|
2804 | |||
2805 | wlock = repo.wlock() |
|
2805 | wlock = repo.wlock() | |
2806 | try: |
|
2806 | try: | |
2807 | ## filling of the `names` mapping |
|
2807 | ## filling of the `names` mapping | |
2808 | # walk dirstate to fill `names` |
|
2808 | # walk dirstate to fill `names` | |
2809 |
|
2809 | |||
2810 | interactive = opts.get('interactive', False) |
|
2810 | interactive = opts.get('interactive', False) | |
2811 | wctx = repo[None] |
|
2811 | wctx = repo[None] | |
2812 | m = scmutil.match(wctx, pats, opts) |
|
2812 | m = scmutil.match(wctx, pats, opts) | |
2813 |
|
2813 | |||
2814 | # we'll need this later |
|
2814 | # we'll need this later | |
2815 | targetsubs = sorted(s for s in wctx.substate if m(s)) |
|
2815 | targetsubs = sorted(s for s in wctx.substate if m(s)) | |
2816 |
|
2816 | |||
2817 | if not m.always(): |
|
2817 | if not m.always(): | |
2818 | m.bad = lambda x, y: False |
|
2818 | m.bad = lambda x, y: False | |
2819 | for abs in repo.walk(m): |
|
2819 | for abs in repo.walk(m): | |
2820 | names[abs] = m.rel(abs), m.exact(abs) |
|
2820 | names[abs] = m.rel(abs), m.exact(abs) | |
2821 |
|
2821 | |||
2822 | # walk target manifest to fill `names` |
|
2822 | # walk target manifest to fill `names` | |
2823 |
|
2823 | |||
2824 | def badfn(path, msg): |
|
2824 | def badfn(path, msg): | |
2825 | if path in names: |
|
2825 | if path in names: | |
2826 | return |
|
2826 | return | |
2827 | if path in ctx.substate: |
|
2827 | if path in ctx.substate: | |
2828 | return |
|
2828 | return | |
2829 | path_ = path + '/' |
|
2829 | path_ = path + '/' | |
2830 | for f in names: |
|
2830 | for f in names: | |
2831 | if f.startswith(path_): |
|
2831 | if f.startswith(path_): | |
2832 | return |
|
2832 | return | |
2833 | ui.warn("%s: %s\n" % (m.rel(path), msg)) |
|
2833 | ui.warn("%s: %s\n" % (m.rel(path), msg)) | |
2834 |
|
2834 | |||
2835 | m.bad = badfn |
|
2835 | m.bad = badfn | |
2836 | for abs in ctx.walk(m): |
|
2836 | for abs in ctx.walk(m): | |
2837 | if abs not in names: |
|
2837 | if abs not in names: | |
2838 | names[abs] = m.rel(abs), m.exact(abs) |
|
2838 | names[abs] = m.rel(abs), m.exact(abs) | |
2839 |
|
2839 | |||
2840 | # Find status of all file in `names`. |
|
2840 | # Find status of all file in `names`. | |
2841 | m = scmutil.matchfiles(repo, names) |
|
2841 | m = scmutil.matchfiles(repo, names) | |
2842 |
|
2842 | |||
2843 | changes = repo.status(node1=node, match=m, |
|
2843 | changes = repo.status(node1=node, match=m, | |
2844 | unknown=True, ignored=True, clean=True) |
|
2844 | unknown=True, ignored=True, clean=True) | |
2845 | else: |
|
2845 | else: | |
2846 | changes = repo.status(node1=node, match=m) |
|
2846 | changes = repo.status(node1=node, match=m) | |
2847 | for kind in changes: |
|
2847 | for kind in changes: | |
2848 | for abs in kind: |
|
2848 | for abs in kind: | |
2849 | names[abs] = m.rel(abs), m.exact(abs) |
|
2849 | names[abs] = m.rel(abs), m.exact(abs) | |
2850 |
|
2850 | |||
2851 | m = scmutil.matchfiles(repo, names) |
|
2851 | m = scmutil.matchfiles(repo, names) | |
2852 |
|
2852 | |||
2853 | modified = set(changes.modified) |
|
2853 | modified = set(changes.modified) | |
2854 | added = set(changes.added) |
|
2854 | added = set(changes.added) | |
2855 | removed = set(changes.removed) |
|
2855 | removed = set(changes.removed) | |
2856 | _deleted = set(changes.deleted) |
|
2856 | _deleted = set(changes.deleted) | |
2857 | unknown = set(changes.unknown) |
|
2857 | unknown = set(changes.unknown) | |
2858 | unknown.update(changes.ignored) |
|
2858 | unknown.update(changes.ignored) | |
2859 | clean = set(changes.clean) |
|
2859 | clean = set(changes.clean) | |
2860 | modadded = set() |
|
2860 | modadded = set() | |
2861 |
|
2861 | |||
2862 | # split between files known in target manifest and the others |
|
2862 | # split between files known in target manifest and the others | |
2863 | smf = set(mf) |
|
2863 | smf = set(mf) | |
2864 |
|
2864 | |||
2865 | # determine the exact nature of the deleted changesets |
|
2865 | # determine the exact nature of the deleted changesets | |
2866 | deladded = _deleted - smf |
|
2866 | deladded = _deleted - smf | |
2867 | deleted = _deleted - deladded |
|
2867 | deleted = _deleted - deladded | |
2868 |
|
2868 | |||
2869 | # We need to account for the state of the file in the dirstate, |
|
2869 | # We need to account for the state of the file in the dirstate, | |
2870 | # even when we revert against something else than parent. This will |
|
2870 | # even when we revert against something else than parent. This will | |
2871 | # slightly alter the behavior of revert (doing back up or not, delete |
|
2871 | # slightly alter the behavior of revert (doing back up or not, delete | |
2872 | # or just forget etc). |
|
2872 | # or just forget etc). | |
2873 | if parent == node: |
|
2873 | if parent == node: | |
2874 | dsmodified = modified |
|
2874 | dsmodified = modified | |
2875 | dsadded = added |
|
2875 | dsadded = added | |
2876 | dsremoved = removed |
|
2876 | dsremoved = removed | |
2877 | # store all local modifications, useful later for rename detection |
|
2877 | # store all local modifications, useful later for rename detection | |
2878 | localchanges = dsmodified | dsadded |
|
2878 | localchanges = dsmodified | dsadded | |
2879 | modified, added, removed = set(), set(), set() |
|
2879 | modified, added, removed = set(), set(), set() | |
2880 | else: |
|
2880 | else: | |
2881 | changes = repo.status(node1=parent, match=m) |
|
2881 | changes = repo.status(node1=parent, match=m) | |
2882 | dsmodified = set(changes.modified) |
|
2882 | dsmodified = set(changes.modified) | |
2883 | dsadded = set(changes.added) |
|
2883 | dsadded = set(changes.added) | |
2884 | dsremoved = set(changes.removed) |
|
2884 | dsremoved = set(changes.removed) | |
2885 | # store all local modifications, useful later for rename detection |
|
2885 | # store all local modifications, useful later for rename detection | |
2886 | localchanges = dsmodified | dsadded |
|
2886 | localchanges = dsmodified | dsadded | |
2887 |
|
2887 | |||
2888 | # only take into account for removes between wc and target |
|
2888 | # only take into account for removes between wc and target | |
2889 | clean |= dsremoved - removed |
|
2889 | clean |= dsremoved - removed | |
2890 | dsremoved &= removed |
|
2890 | dsremoved &= removed | |
2891 | # distinct between dirstate remove and other |
|
2891 | # distinct between dirstate remove and other | |
2892 | removed -= dsremoved |
|
2892 | removed -= dsremoved | |
2893 |
|
2893 | |||
2894 | modadded = added & dsmodified |
|
2894 | modadded = added & dsmodified | |
2895 | added -= modadded |
|
2895 | added -= modadded | |
2896 |
|
2896 | |||
2897 | # tell newly modified apart. |
|
2897 | # tell newly modified apart. | |
2898 | dsmodified &= modified |
|
2898 | dsmodified &= modified | |
2899 | dsmodified |= modified & dsadded # dirstate added may needs backup |
|
2899 | dsmodified |= modified & dsadded # dirstate added may needs backup | |
2900 | modified -= dsmodified |
|
2900 | modified -= dsmodified | |
2901 |
|
2901 | |||
2902 | # We need to wait for some post-processing to update this set |
|
2902 | # We need to wait for some post-processing to update this set | |
2903 | # before making the distinction. The dirstate will be used for |
|
2903 | # before making the distinction. The dirstate will be used for | |
2904 | # that purpose. |
|
2904 | # that purpose. | |
2905 | dsadded = added |
|
2905 | dsadded = added | |
2906 |
|
2906 | |||
2907 | # in case of merge, files that are actually added can be reported as |
|
2907 | # in case of merge, files that are actually added can be reported as | |
2908 | # modified, we need to post process the result |
|
2908 | # modified, we need to post process the result | |
2909 | if p2 != nullid: |
|
2909 | if p2 != nullid: | |
2910 | if pmf is None: |
|
2910 | if pmf is None: | |
2911 | # only need parent manifest in the merge case, |
|
2911 | # only need parent manifest in the merge case, | |
2912 | # so do not read by default |
|
2912 | # so do not read by default | |
2913 | pmf = repo[parent].manifest() |
|
2913 | pmf = repo[parent].manifest() | |
2914 | mergeadd = dsmodified - set(pmf) |
|
2914 | mergeadd = dsmodified - set(pmf) | |
2915 | dsadded |= mergeadd |
|
2915 | dsadded |= mergeadd | |
2916 | dsmodified -= mergeadd |
|
2916 | dsmodified -= mergeadd | |
2917 |
|
2917 | |||
2918 | # if f is a rename, update `names` to also revert the source |
|
2918 | # if f is a rename, update `names` to also revert the source | |
2919 | cwd = repo.getcwd() |
|
2919 | cwd = repo.getcwd() | |
2920 | for f in localchanges: |
|
2920 | for f in localchanges: | |
2921 | src = repo.dirstate.copied(f) |
|
2921 | src = repo.dirstate.copied(f) | |
2922 | # XXX should we check for rename down to target node? |
|
2922 | # XXX should we check for rename down to target node? | |
2923 | if src and src not in names and repo.dirstate[src] == 'r': |
|
2923 | if src and src not in names and repo.dirstate[src] == 'r': | |
2924 | dsremoved.add(src) |
|
2924 | dsremoved.add(src) | |
2925 | names[src] = (repo.pathto(src, cwd), True) |
|
2925 | names[src] = (repo.pathto(src, cwd), True) | |
2926 |
|
2926 | |||
2927 | # distinguish between file to forget and the other |
|
2927 | # distinguish between file to forget and the other | |
2928 | added = set() |
|
2928 | added = set() | |
2929 | for abs in dsadded: |
|
2929 | for abs in dsadded: | |
2930 | if repo.dirstate[abs] != 'a': |
|
2930 | if repo.dirstate[abs] != 'a': | |
2931 | added.add(abs) |
|
2931 | added.add(abs) | |
2932 | dsadded -= added |
|
2932 | dsadded -= added | |
2933 |
|
2933 | |||
2934 | for abs in deladded: |
|
2934 | for abs in deladded: | |
2935 | if repo.dirstate[abs] == 'a': |
|
2935 | if repo.dirstate[abs] == 'a': | |
2936 | dsadded.add(abs) |
|
2936 | dsadded.add(abs) | |
2937 | deladded -= dsadded |
|
2937 | deladded -= dsadded | |
2938 |
|
2938 | |||
2939 | # For files marked as removed, we check if an unknown file is present at |
|
2939 | # For files marked as removed, we check if an unknown file is present at | |
2940 | # the same path. If a such file exists it may need to be backed up. |
|
2940 | # the same path. If a such file exists it may need to be backed up. | |
2941 | # Making the distinction at this stage helps have simpler backup |
|
2941 | # Making the distinction at this stage helps have simpler backup | |
2942 | # logic. |
|
2942 | # logic. | |
2943 | removunk = set() |
|
2943 | removunk = set() | |
2944 | for abs in removed: |
|
2944 | for abs in removed: | |
2945 | target = repo.wjoin(abs) |
|
2945 | target = repo.wjoin(abs) | |
2946 | if os.path.lexists(target): |
|
2946 | if os.path.lexists(target): | |
2947 | removunk.add(abs) |
|
2947 | removunk.add(abs) | |
2948 | removed -= removunk |
|
2948 | removed -= removunk | |
2949 |
|
2949 | |||
2950 | dsremovunk = set() |
|
2950 | dsremovunk = set() | |
2951 | for abs in dsremoved: |
|
2951 | for abs in dsremoved: | |
2952 | target = repo.wjoin(abs) |
|
2952 | target = repo.wjoin(abs) | |
2953 | if os.path.lexists(target): |
|
2953 | if os.path.lexists(target): | |
2954 | dsremovunk.add(abs) |
|
2954 | dsremovunk.add(abs) | |
2955 | dsremoved -= dsremovunk |
|
2955 | dsremoved -= dsremovunk | |
2956 |
|
2956 | |||
2957 | # action to be actually performed by revert |
|
2957 | # action to be actually performed by revert | |
2958 | # (<list of file>, message>) tuple |
|
2958 | # (<list of file>, message>) tuple | |
2959 | actions = {'revert': ([], _('reverting %s\n')), |
|
2959 | actions = {'revert': ([], _('reverting %s\n')), | |
2960 | 'add': ([], _('adding %s\n')), |
|
2960 | 'add': ([], _('adding %s\n')), | |
2961 | 'remove': ([], _('removing %s\n')), |
|
2961 | 'remove': ([], _('removing %s\n')), | |
2962 | 'drop': ([], _('removing %s\n')), |
|
2962 | 'drop': ([], _('removing %s\n')), | |
2963 | 'forget': ([], _('forgetting %s\n')), |
|
2963 | 'forget': ([], _('forgetting %s\n')), | |
2964 | 'undelete': ([], _('undeleting %s\n')), |
|
2964 | 'undelete': ([], _('undeleting %s\n')), | |
2965 | 'noop': (None, _('no changes needed to %s\n')), |
|
2965 | 'noop': (None, _('no changes needed to %s\n')), | |
2966 | 'unknown': (None, _('file not managed: %s\n')), |
|
2966 | 'unknown': (None, _('file not managed: %s\n')), | |
2967 | } |
|
2967 | } | |
2968 |
|
2968 | |||
2969 | # "constant" that convey the backup strategy. |
|
2969 | # "constant" that convey the backup strategy. | |
2970 | # All set to `discard` if `no-backup` is set do avoid checking |
|
2970 | # All set to `discard` if `no-backup` is set do avoid checking | |
2971 | # no_backup lower in the code. |
|
2971 | # no_backup lower in the code. | |
2972 | # These values are ordered for comparison purposes |
|
2972 | # These values are ordered for comparison purposes | |
2973 | backup = 2 # unconditionally do backup |
|
2973 | backup = 2 # unconditionally do backup | |
2974 | check = 1 # check if the existing file differs from target |
|
2974 | check = 1 # check if the existing file differs from target | |
2975 | discard = 0 # never do backup |
|
2975 | discard = 0 # never do backup | |
2976 | if opts.get('no_backup'): |
|
2976 | if opts.get('no_backup'): | |
2977 | backup = check = discard |
|
2977 | backup = check = discard | |
2978 |
|
2978 | |||
2979 | backupanddel = actions['remove'] |
|
2979 | backupanddel = actions['remove'] | |
2980 | if not opts.get('no_backup'): |
|
2980 | if not opts.get('no_backup'): | |
2981 | backupanddel = actions['drop'] |
|
2981 | backupanddel = actions['drop'] | |
2982 |
|
2982 | |||
2983 | disptable = ( |
|
2983 | disptable = ( | |
2984 | # dispatch table: |
|
2984 | # dispatch table: | |
2985 | # file state |
|
2985 | # file state | |
2986 | # action |
|
2986 | # action | |
2987 | # make backup |
|
2987 | # make backup | |
2988 |
|
2988 | |||
2989 | ## Sets that results that will change file on disk |
|
2989 | ## Sets that results that will change file on disk | |
2990 | # Modified compared to target, no local change |
|
2990 | # Modified compared to target, no local change | |
2991 | (modified, actions['revert'], discard), |
|
2991 | (modified, actions['revert'], discard), | |
2992 | # Modified compared to target, but local file is deleted |
|
2992 | # Modified compared to target, but local file is deleted | |
2993 | (deleted, actions['revert'], discard), |
|
2993 | (deleted, actions['revert'], discard), | |
2994 | # Modified compared to target, local change |
|
2994 | # Modified compared to target, local change | |
2995 | (dsmodified, actions['revert'], backup), |
|
2995 | (dsmodified, actions['revert'], backup), | |
2996 | # Added since target |
|
2996 | # Added since target | |
2997 | (added, actions['remove'], discard), |
|
2997 | (added, actions['remove'], discard), | |
2998 | # Added in working directory |
|
2998 | # Added in working directory | |
2999 | (dsadded, actions['forget'], discard), |
|
2999 | (dsadded, actions['forget'], discard), | |
3000 | # Added since target, have local modification |
|
3000 | # Added since target, have local modification | |
3001 | (modadded, backupanddel, backup), |
|
3001 | (modadded, backupanddel, backup), | |
3002 | # Added since target but file is missing in working directory |
|
3002 | # Added since target but file is missing in working directory | |
3003 | (deladded, actions['drop'], discard), |
|
3003 | (deladded, actions['drop'], discard), | |
3004 | # Removed since target, before working copy parent |
|
3004 | # Removed since target, before working copy parent | |
3005 | (removed, actions['add'], discard), |
|
3005 | (removed, actions['add'], discard), | |
3006 | # Same as `removed` but an unknown file exists at the same path |
|
3006 | # Same as `removed` but an unknown file exists at the same path | |
3007 | (removunk, actions['add'], check), |
|
3007 | (removunk, actions['add'], check), | |
3008 | # Removed since targe, marked as such in working copy parent |
|
3008 | # Removed since targe, marked as such in working copy parent | |
3009 | (dsremoved, actions['undelete'], discard), |
|
3009 | (dsremoved, actions['undelete'], discard), | |
3010 | # Same as `dsremoved` but an unknown file exists at the same path |
|
3010 | # Same as `dsremoved` but an unknown file exists at the same path | |
3011 | (dsremovunk, actions['undelete'], check), |
|
3011 | (dsremovunk, actions['undelete'], check), | |
3012 | ## the following sets does not result in any file changes |
|
3012 | ## the following sets does not result in any file changes | |
3013 | # File with no modification |
|
3013 | # File with no modification | |
3014 | (clean, actions['noop'], discard), |
|
3014 | (clean, actions['noop'], discard), | |
3015 | # Existing file, not tracked anywhere |
|
3015 | # Existing file, not tracked anywhere | |
3016 | (unknown, actions['unknown'], discard), |
|
3016 | (unknown, actions['unknown'], discard), | |
3017 | ) |
|
3017 | ) | |
3018 |
|
3018 | |||
3019 | for abs, (rel, exact) in sorted(names.items()): |
|
3019 | for abs, (rel, exact) in sorted(names.items()): | |
3020 | # target file to be touch on disk (relative to cwd) |
|
3020 | # target file to be touch on disk (relative to cwd) | |
3021 | target = repo.wjoin(abs) |
|
3021 | target = repo.wjoin(abs) | |
3022 | # search the entry in the dispatch table. |
|
3022 | # search the entry in the dispatch table. | |
3023 | # if the file is in any of these sets, it was touched in the working |
|
3023 | # if the file is in any of these sets, it was touched in the working | |
3024 | # directory parent and we are sure it needs to be reverted. |
|
3024 | # directory parent and we are sure it needs to be reverted. | |
3025 | for table, (xlist, msg), dobackup in disptable: |
|
3025 | for table, (xlist, msg), dobackup in disptable: | |
3026 | if abs not in table: |
|
3026 | if abs not in table: | |
3027 | continue |
|
3027 | continue | |
3028 | if xlist is not None: |
|
3028 | if xlist is not None: | |
3029 | xlist.append(abs) |
|
3029 | xlist.append(abs) | |
3030 | if dobackup and (backup <= dobackup |
|
3030 | if dobackup and (backup <= dobackup | |
3031 | or wctx[abs].cmp(ctx[abs])): |
|
3031 | or wctx[abs].cmp(ctx[abs])): | |
3032 | bakname = "%s.orig" % rel |
|
3032 | bakname = "%s.orig" % rel | |
3033 | ui.note(_('saving current version of %s as %s\n') % |
|
3033 | ui.note(_('saving current version of %s as %s\n') % | |
3034 | (rel, bakname)) |
|
3034 | (rel, bakname)) | |
3035 | if not opts.get('dry_run'): |
|
3035 | if not opts.get('dry_run'): | |
3036 | if interactive: |
|
3036 | if interactive: | |
3037 | util.copyfile(target, bakname) |
|
3037 | util.copyfile(target, bakname) | |
3038 | else: |
|
3038 | else: | |
3039 | util.rename(target, bakname) |
|
3039 | util.rename(target, bakname) | |
3040 | if ui.verbose or not exact: |
|
3040 | if ui.verbose or not exact: | |
3041 | if not isinstance(msg, basestring): |
|
3041 | if not isinstance(msg, basestring): | |
3042 | msg = msg(abs) |
|
3042 | msg = msg(abs) | |
3043 | ui.status(msg % rel) |
|
3043 | ui.status(msg % rel) | |
3044 | elif exact: |
|
3044 | elif exact: | |
3045 | ui.warn(msg % rel) |
|
3045 | ui.warn(msg % rel) | |
3046 | break |
|
3046 | break | |
3047 |
|
3047 | |||
3048 | if not opts.get('dry_run'): |
|
3048 | if not opts.get('dry_run'): | |
3049 | needdata = ('revert', 'add', 'undelete') |
|
3049 | needdata = ('revert', 'add', 'undelete') | |
3050 | _revertprefetch(repo, ctx, *[actions[name][0] for name in needdata]) |
|
3050 | _revertprefetch(repo, ctx, *[actions[name][0] for name in needdata]) | |
3051 | _performrevert(repo, parents, ctx, actions, interactive) |
|
3051 | _performrevert(repo, parents, ctx, actions, interactive) | |
3052 |
|
3052 | |||
3053 | if targetsubs: |
|
3053 | if targetsubs: | |
3054 | # Revert the subrepos on the revert list |
|
3054 | # Revert the subrepos on the revert list | |
3055 | for sub in targetsubs: |
|
3055 | for sub in targetsubs: | |
3056 | try: |
|
3056 | try: | |
3057 | wctx.sub(sub).revert(ctx.substate[sub], *pats, **opts) |
|
3057 | wctx.sub(sub).revert(ctx.substate[sub], *pats, **opts) | |
3058 | except KeyError: |
|
3058 | except KeyError: | |
3059 | raise util.Abort("subrepository '%s' does not exist in %s!" |
|
3059 | raise util.Abort("subrepository '%s' does not exist in %s!" | |
3060 | % (sub, short(ctx.node()))) |
|
3060 | % (sub, short(ctx.node()))) | |
3061 | finally: |
|
3061 | finally: | |
3062 | wlock.release() |
|
3062 | wlock.release() | |
3063 |
|
3063 | |||
3064 | def _revertprefetch(repo, ctx, *files): |
|
3064 | def _revertprefetch(repo, ctx, *files): | |
3065 | """Let extension changing the storage layer prefetch content""" |
|
3065 | """Let extension changing the storage layer prefetch content""" | |
3066 | pass |
|
3066 | pass | |
3067 |
|
3067 | |||
3068 | def _performrevert(repo, parents, ctx, actions, interactive=False): |
|
3068 | def _performrevert(repo, parents, ctx, actions, interactive=False): | |
3069 | """function that actually perform all the actions computed for revert |
|
3069 | """function that actually perform all the actions computed for revert | |
3070 |
|
3070 | |||
3071 | This is an independent function to let extension to plug in and react to |
|
3071 | This is an independent function to let extension to plug in and react to | |
3072 | the imminent revert. |
|
3072 | the imminent revert. | |
3073 |
|
3073 | |||
3074 | Make sure you have the working directory locked when calling this function. |
|
3074 | Make sure you have the working directory locked when calling this function. | |
3075 | """ |
|
3075 | """ | |
3076 | parent, p2 = parents |
|
3076 | parent, p2 = parents | |
3077 | node = ctx.node() |
|
3077 | node = ctx.node() | |
3078 | def checkout(f): |
|
3078 | def checkout(f): | |
3079 | fc = ctx[f] |
|
3079 | fc = ctx[f] | |
3080 | return repo.wwrite(f, fc.data(), fc.flags()) |
|
3080 | return repo.wwrite(f, fc.data(), fc.flags()) | |
3081 |
|
3081 | |||
3082 | audit_path = pathutil.pathauditor(repo.root) |
|
3082 | audit_path = pathutil.pathauditor(repo.root) | |
3083 | for f in actions['forget'][0]: |
|
3083 | for f in actions['forget'][0]: | |
3084 | repo.dirstate.drop(f) |
|
3084 | repo.dirstate.drop(f) | |
3085 | for f in actions['remove'][0]: |
|
3085 | for f in actions['remove'][0]: | |
3086 | audit_path(f) |
|
3086 | audit_path(f) | |
|
3087 | try: | |||
3087 | util.unlinkpath(repo.wjoin(f)) |
|
3088 | util.unlinkpath(repo.wjoin(f)) | |
|
3089 | except OSError: | |||
|
3090 | pass | |||
3088 | repo.dirstate.remove(f) |
|
3091 | repo.dirstate.remove(f) | |
3089 | for f in actions['drop'][0]: |
|
3092 | for f in actions['drop'][0]: | |
3090 | audit_path(f) |
|
3093 | audit_path(f) | |
3091 | repo.dirstate.remove(f) |
|
3094 | repo.dirstate.remove(f) | |
3092 |
|
3095 | |||
3093 | normal = None |
|
3096 | normal = None | |
3094 | if node == parent: |
|
3097 | if node == parent: | |
3095 | # We're reverting to our parent. If possible, we'd like status |
|
3098 | # We're reverting to our parent. If possible, we'd like status | |
3096 | # to report the file as clean. We have to use normallookup for |
|
3099 | # to report the file as clean. We have to use normallookup for | |
3097 | # merges to avoid losing information about merged/dirty files. |
|
3100 | # merges to avoid losing information about merged/dirty files. | |
3098 | if p2 != nullid: |
|
3101 | if p2 != nullid: | |
3099 | normal = repo.dirstate.normallookup |
|
3102 | normal = repo.dirstate.normallookup | |
3100 | else: |
|
3103 | else: | |
3101 | normal = repo.dirstate.normal |
|
3104 | normal = repo.dirstate.normal | |
3102 |
|
3105 | |||
3103 | if interactive: |
|
3106 | if interactive: | |
3104 | # Prompt the user for changes to revert |
|
3107 | # Prompt the user for changes to revert | |
3105 | torevert = [repo.wjoin(f) for f in actions['revert'][0]] |
|
3108 | torevert = [repo.wjoin(f) for f in actions['revert'][0]] | |
3106 | m = scmutil.match(ctx, torevert, {}) |
|
3109 | m = scmutil.match(ctx, torevert, {}) | |
3107 | diff = patch.diff(repo, None, ctx.node(), m) |
|
3110 | diff = patch.diff(repo, None, ctx.node(), m) | |
3108 | originalchunks = patch.parsepatch(diff) |
|
3111 | originalchunks = patch.parsepatch(diff) | |
3109 | try: |
|
3112 | try: | |
3110 | chunks = recordfilter(repo.ui, originalchunks) |
|
3113 | chunks = recordfilter(repo.ui, originalchunks) | |
3111 | except patch.PatchError, err: |
|
3114 | except patch.PatchError, err: | |
3112 | raise util.Abort(_('error parsing patch: %s') % err) |
|
3115 | raise util.Abort(_('error parsing patch: %s') % err) | |
3113 |
|
3116 | |||
3114 | # Apply changes |
|
3117 | # Apply changes | |
3115 | fp = cStringIO.StringIO() |
|
3118 | fp = cStringIO.StringIO() | |
3116 | for c in chunks: |
|
3119 | for c in chunks: | |
3117 | c.write(fp) |
|
3120 | c.write(fp) | |
3118 | dopatch = fp.tell() |
|
3121 | dopatch = fp.tell() | |
3119 | fp.seek(0) |
|
3122 | fp.seek(0) | |
3120 | if dopatch: |
|
3123 | if dopatch: | |
3121 | try: |
|
3124 | try: | |
3122 | patch.internalpatch(repo.ui, repo, fp, 1, eolmode=None) |
|
3125 | patch.internalpatch(repo.ui, repo, fp, 1, eolmode=None) | |
3123 | except patch.PatchError, err: |
|
3126 | except patch.PatchError, err: | |
3124 | raise util.Abort(str(err)) |
|
3127 | raise util.Abort(str(err)) | |
3125 | del fp |
|
3128 | del fp | |
3126 | else: |
|
3129 | else: | |
3127 | for f in actions['revert'][0]: |
|
3130 | for f in actions['revert'][0]: | |
3128 | wsize = checkout(f) |
|
3131 | wsize = checkout(f) | |
3129 | if normal: |
|
3132 | if normal: | |
3130 | normal(f) |
|
3133 | normal(f) | |
3131 | elif wsize == repo.dirstate._map[f][2]: |
|
3134 | elif wsize == repo.dirstate._map[f][2]: | |
3132 | # changes may be overlooked without normallookup, |
|
3135 | # changes may be overlooked without normallookup, | |
3133 | # if size isn't changed at reverting |
|
3136 | # if size isn't changed at reverting | |
3134 | repo.dirstate.normallookup(f) |
|
3137 | repo.dirstate.normallookup(f) | |
3135 |
|
3138 | |||
3136 | for f in actions['add'][0]: |
|
3139 | for f in actions['add'][0]: | |
3137 | checkout(f) |
|
3140 | checkout(f) | |
3138 | repo.dirstate.add(f) |
|
3141 | repo.dirstate.add(f) | |
3139 |
|
3142 | |||
3140 | normal = repo.dirstate.normallookup |
|
3143 | normal = repo.dirstate.normallookup | |
3141 | if node == parent and p2 == nullid: |
|
3144 | if node == parent and p2 == nullid: | |
3142 | normal = repo.dirstate.normal |
|
3145 | normal = repo.dirstate.normal | |
3143 | for f in actions['undelete'][0]: |
|
3146 | for f in actions['undelete'][0]: | |
3144 | checkout(f) |
|
3147 | checkout(f) | |
3145 | normal(f) |
|
3148 | normal(f) | |
3146 |
|
3149 | |||
3147 | copied = copies.pathcopies(repo[parent], ctx) |
|
3150 | copied = copies.pathcopies(repo[parent], ctx) | |
3148 |
|
3151 | |||
3149 | for f in actions['add'][0] + actions['undelete'][0] + actions['revert'][0]: |
|
3152 | for f in actions['add'][0] + actions['undelete'][0] + actions['revert'][0]: | |
3150 | if f in copied: |
|
3153 | if f in copied: | |
3151 | repo.dirstate.copy(copied[f], f) |
|
3154 | repo.dirstate.copy(copied[f], f) | |
3152 |
|
3155 | |||
3153 | def command(table): |
|
3156 | def command(table): | |
3154 | """Returns a function object to be used as a decorator for making commands. |
|
3157 | """Returns a function object to be used as a decorator for making commands. | |
3155 |
|
3158 | |||
3156 | This function receives a command table as its argument. The table should |
|
3159 | This function receives a command table as its argument. The table should | |
3157 | be a dict. |
|
3160 | be a dict. | |
3158 |
|
3161 | |||
3159 | The returned function can be used as a decorator for adding commands |
|
3162 | The returned function can be used as a decorator for adding commands | |
3160 | to that command table. This function accepts multiple arguments to define |
|
3163 | to that command table. This function accepts multiple arguments to define | |
3161 | a command. |
|
3164 | a command. | |
3162 |
|
3165 | |||
3163 | The first argument is the command name. |
|
3166 | The first argument is the command name. | |
3164 |
|
3167 | |||
3165 | The options argument is an iterable of tuples defining command arguments. |
|
3168 | The options argument is an iterable of tuples defining command arguments. | |
3166 | See ``mercurial.fancyopts.fancyopts()`` for the format of each tuple. |
|
3169 | See ``mercurial.fancyopts.fancyopts()`` for the format of each tuple. | |
3167 |
|
3170 | |||
3168 | The synopsis argument defines a short, one line summary of how to use the |
|
3171 | The synopsis argument defines a short, one line summary of how to use the | |
3169 | command. This shows up in the help output. |
|
3172 | command. This shows up in the help output. | |
3170 |
|
3173 | |||
3171 | The norepo argument defines whether the command does not require a |
|
3174 | The norepo argument defines whether the command does not require a | |
3172 | local repository. Most commands operate against a repository, thus the |
|
3175 | local repository. Most commands operate against a repository, thus the | |
3173 | default is False. |
|
3176 | default is False. | |
3174 |
|
3177 | |||
3175 | The optionalrepo argument defines whether the command optionally requires |
|
3178 | The optionalrepo argument defines whether the command optionally requires | |
3176 | a local repository. |
|
3179 | a local repository. | |
3177 |
|
3180 | |||
3178 | The inferrepo argument defines whether to try to find a repository from the |
|
3181 | The inferrepo argument defines whether to try to find a repository from the | |
3179 | command line arguments. If True, arguments will be examined for potential |
|
3182 | command line arguments. If True, arguments will be examined for potential | |
3180 | repository locations. See ``findrepo()``. If a repository is found, it |
|
3183 | repository locations. See ``findrepo()``. If a repository is found, it | |
3181 | will be used. |
|
3184 | will be used. | |
3182 | """ |
|
3185 | """ | |
3183 | def cmd(name, options=(), synopsis=None, norepo=False, optionalrepo=False, |
|
3186 | def cmd(name, options=(), synopsis=None, norepo=False, optionalrepo=False, | |
3184 | inferrepo=False): |
|
3187 | inferrepo=False): | |
3185 | def decorator(func): |
|
3188 | def decorator(func): | |
3186 | if synopsis: |
|
3189 | if synopsis: | |
3187 | table[name] = func, list(options), synopsis |
|
3190 | table[name] = func, list(options), synopsis | |
3188 | else: |
|
3191 | else: | |
3189 | table[name] = func, list(options) |
|
3192 | table[name] = func, list(options) | |
3190 |
|
3193 | |||
3191 | if norepo: |
|
3194 | if norepo: | |
3192 | # Avoid import cycle. |
|
3195 | # Avoid import cycle. | |
3193 | import commands |
|
3196 | import commands | |
3194 | commands.norepo += ' %s' % ' '.join(parsealiases(name)) |
|
3197 | commands.norepo += ' %s' % ' '.join(parsealiases(name)) | |
3195 |
|
3198 | |||
3196 | if optionalrepo: |
|
3199 | if optionalrepo: | |
3197 | import commands |
|
3200 | import commands | |
3198 | commands.optionalrepo += ' %s' % ' '.join(parsealiases(name)) |
|
3201 | commands.optionalrepo += ' %s' % ' '.join(parsealiases(name)) | |
3199 |
|
3202 | |||
3200 | if inferrepo: |
|
3203 | if inferrepo: | |
3201 | import commands |
|
3204 | import commands | |
3202 | commands.inferrepo += ' %s' % ' '.join(parsealiases(name)) |
|
3205 | commands.inferrepo += ' %s' % ' '.join(parsealiases(name)) | |
3203 |
|
3206 | |||
3204 | return func |
|
3207 | return func | |
3205 | return decorator |
|
3208 | return decorator | |
3206 |
|
3209 | |||
3207 | return cmd |
|
3210 | return cmd | |
3208 |
|
3211 | |||
3209 | # a list of (ui, repo, otherpeer, opts, missing) functions called by |
|
3212 | # a list of (ui, repo, otherpeer, opts, missing) functions called by | |
3210 | # commands.outgoing. "missing" is "missing" of the result of |
|
3213 | # commands.outgoing. "missing" is "missing" of the result of | |
3211 | # "findcommonoutgoing()" |
|
3214 | # "findcommonoutgoing()" | |
3212 | outgoinghooks = util.hooks() |
|
3215 | outgoinghooks = util.hooks() | |
3213 |
|
3216 | |||
3214 | # a list of (ui, repo) functions called by commands.summary |
|
3217 | # a list of (ui, repo) functions called by commands.summary | |
3215 | summaryhooks = util.hooks() |
|
3218 | summaryhooks = util.hooks() | |
3216 |
|
3219 | |||
3217 | # a list of (ui, repo, opts, changes) functions called by commands.summary. |
|
3220 | # a list of (ui, repo, opts, changes) functions called by commands.summary. | |
3218 | # |
|
3221 | # | |
3219 | # functions should return tuple of booleans below, if 'changes' is None: |
|
3222 | # functions should return tuple of booleans below, if 'changes' is None: | |
3220 | # (whether-incomings-are-needed, whether-outgoings-are-needed) |
|
3223 | # (whether-incomings-are-needed, whether-outgoings-are-needed) | |
3221 | # |
|
3224 | # | |
3222 | # otherwise, 'changes' is a tuple of tuples below: |
|
3225 | # otherwise, 'changes' is a tuple of tuples below: | |
3223 | # - (sourceurl, sourcebranch, sourcepeer, incoming) |
|
3226 | # - (sourceurl, sourcebranch, sourcepeer, incoming) | |
3224 | # - (desturl, destbranch, destpeer, outgoing) |
|
3227 | # - (desturl, destbranch, destpeer, outgoing) | |
3225 | summaryremotehooks = util.hooks() |
|
3228 | summaryremotehooks = util.hooks() | |
3226 |
|
3229 | |||
3227 | # A list of state files kept by multistep operations like graft. |
|
3230 | # A list of state files kept by multistep operations like graft. | |
3228 | # Since graft cannot be aborted, it is considered 'clearable' by update. |
|
3231 | # Since graft cannot be aborted, it is considered 'clearable' by update. | |
3229 | # note: bisect is intentionally excluded |
|
3232 | # note: bisect is intentionally excluded | |
3230 | # (state file, clearable, allowcommit, error, hint) |
|
3233 | # (state file, clearable, allowcommit, error, hint) | |
3231 | unfinishedstates = [ |
|
3234 | unfinishedstates = [ | |
3232 | ('graftstate', True, False, _('graft in progress'), |
|
3235 | ('graftstate', True, False, _('graft in progress'), | |
3233 | _("use 'hg graft --continue' or 'hg update' to abort")), |
|
3236 | _("use 'hg graft --continue' or 'hg update' to abort")), | |
3234 | ('updatestate', True, False, _('last update was interrupted'), |
|
3237 | ('updatestate', True, False, _('last update was interrupted'), | |
3235 | _("use 'hg update' to get a consistent checkout")) |
|
3238 | _("use 'hg update' to get a consistent checkout")) | |
3236 | ] |
|
3239 | ] | |
3237 |
|
3240 | |||
3238 | def checkunfinished(repo, commit=False): |
|
3241 | def checkunfinished(repo, commit=False): | |
3239 | '''Look for an unfinished multistep operation, like graft, and abort |
|
3242 | '''Look for an unfinished multistep operation, like graft, and abort | |
3240 | if found. It's probably good to check this right before |
|
3243 | if found. It's probably good to check this right before | |
3241 | bailifchanged(). |
|
3244 | bailifchanged(). | |
3242 | ''' |
|
3245 | ''' | |
3243 | for f, clearable, allowcommit, msg, hint in unfinishedstates: |
|
3246 | for f, clearable, allowcommit, msg, hint in unfinishedstates: | |
3244 | if commit and allowcommit: |
|
3247 | if commit and allowcommit: | |
3245 | continue |
|
3248 | continue | |
3246 | if repo.vfs.exists(f): |
|
3249 | if repo.vfs.exists(f): | |
3247 | raise util.Abort(msg, hint=hint) |
|
3250 | raise util.Abort(msg, hint=hint) | |
3248 |
|
3251 | |||
3249 | def clearunfinished(repo): |
|
3252 | def clearunfinished(repo): | |
3250 | '''Check for unfinished operations (as above), and clear the ones |
|
3253 | '''Check for unfinished operations (as above), and clear the ones | |
3251 | that are clearable. |
|
3254 | that are clearable. | |
3252 | ''' |
|
3255 | ''' | |
3253 | for f, clearable, allowcommit, msg, hint in unfinishedstates: |
|
3256 | for f, clearable, allowcommit, msg, hint in unfinishedstates: | |
3254 | if not clearable and repo.vfs.exists(f): |
|
3257 | if not clearable and repo.vfs.exists(f): | |
3255 | raise util.Abort(msg, hint=hint) |
|
3258 | raise util.Abort(msg, hint=hint) | |
3256 | for f, clearable, allowcommit, msg, hint in unfinishedstates: |
|
3259 | for f, clearable, allowcommit, msg, hint in unfinishedstates: | |
3257 | if clearable and repo.vfs.exists(f): |
|
3260 | if clearable and repo.vfs.exists(f): | |
3258 | util.unlink(repo.join(f)) |
|
3261 | util.unlink(repo.join(f)) |
@@ -1,222 +1,239 b'' | |||||
1 | #require icasefs |
|
1 | #require icasefs | |
2 |
|
2 | |||
3 | $ hg debugfs | grep 'case-sensitive:' |
|
3 | $ hg debugfs | grep 'case-sensitive:' | |
4 | case-sensitive: no |
|
4 | case-sensitive: no | |
5 |
|
5 | |||
6 | test file addition with bad case |
|
6 | test file addition with bad case | |
7 |
|
7 | |||
8 | $ hg init repo1 |
|
8 | $ hg init repo1 | |
9 | $ cd repo1 |
|
9 | $ cd repo1 | |
10 | $ echo a > a |
|
10 | $ echo a > a | |
11 | $ hg add A |
|
11 | $ hg add A | |
12 | adding a |
|
12 | adding a | |
13 | $ hg st |
|
13 | $ hg st | |
14 | A a |
|
14 | A a | |
15 | $ hg ci -m adda |
|
15 | $ hg ci -m adda | |
16 | $ hg manifest |
|
16 | $ hg manifest | |
17 | a |
|
17 | a | |
18 | $ cd .. |
|
18 | $ cd .. | |
19 |
|
19 | |||
20 | test case collision on rename (issue750) |
|
20 | test case collision on rename (issue750) | |
21 |
|
21 | |||
22 | $ hg init repo2 |
|
22 | $ hg init repo2 | |
23 | $ cd repo2 |
|
23 | $ cd repo2 | |
24 | $ echo a > a |
|
24 | $ echo a > a | |
25 | $ hg --debug ci -Am adda |
|
25 | $ hg --debug ci -Am adda | |
26 | adding a |
|
26 | adding a | |
27 | committing files: |
|
27 | committing files: | |
28 | a |
|
28 | a | |
29 | committing manifest |
|
29 | committing manifest | |
30 | committing changelog |
|
30 | committing changelog | |
31 | committed changeset 0:07f4944404050f47db2e5c5071e0e84e7a27bba9 |
|
31 | committed changeset 0:07f4944404050f47db2e5c5071e0e84e7a27bba9 | |
32 |
|
32 | |||
33 | Case-changing renames should work: |
|
33 | Case-changing renames should work: | |
34 |
|
34 | |||
35 | $ hg mv a A |
|
35 | $ hg mv a A | |
36 | $ hg mv A a |
|
36 | $ hg mv A a | |
37 | $ hg st |
|
37 | $ hg st | |
38 |
|
38 | |||
39 | addremove after case-changing rename has no effect (issue4590) |
|
39 | addremove after case-changing rename has no effect (issue4590) | |
40 |
|
40 | |||
41 | $ hg mv a A |
|
41 | $ hg mv a A | |
42 | $ hg addremove |
|
42 | $ hg addremove | |
43 | recording removal of a as rename to A (100% similar) |
|
43 | recording removal of a as rename to A (100% similar) | |
44 | $ hg revert --all |
|
44 | $ hg revert --all | |
45 | forgetting A |
|
45 | forgetting A | |
46 | undeleting a |
|
46 | undeleting a | |
47 |
|
47 | |||
48 | test changing case of path components |
|
48 | test changing case of path components | |
49 |
|
49 | |||
50 | $ mkdir D |
|
50 | $ mkdir D | |
51 | $ echo b > D/b |
|
51 | $ echo b > D/b | |
52 | $ hg ci -Am addb D/b |
|
52 | $ hg ci -Am addb D/b | |
53 | $ hg mv D/b d/b |
|
53 | $ hg mv D/b d/b | |
54 | D/b: not overwriting - file exists |
|
54 | D/b: not overwriting - file exists | |
55 | $ hg mv D/b d/c |
|
55 | $ hg mv D/b d/c | |
56 | $ hg st |
|
56 | $ hg st | |
57 | A D/c |
|
57 | A D/c | |
58 | R D/b |
|
58 | R D/b | |
59 | $ mv D temp |
|
59 | $ mv D temp | |
60 | $ mv temp d |
|
60 | $ mv temp d | |
61 | $ hg st |
|
61 | $ hg st | |
62 | A D/c |
|
62 | A D/c | |
63 | R D/b |
|
63 | R D/b | |
64 | $ hg revert -aq |
|
64 | $ hg revert -aq | |
65 | $ rm d/c |
|
65 | $ rm d/c | |
66 | $ echo c > D/c |
|
66 | $ echo c > D/c | |
67 | $ hg add D/c |
|
67 | $ hg add D/c | |
68 | $ hg st |
|
68 | $ hg st | |
69 | A D/c |
|
69 | A D/c | |
70 | $ hg ci -m addc D/c |
|
70 | $ hg ci -m addc D/c | |
71 | $ hg mv d/b d/e |
|
71 | $ hg mv d/b d/e | |
72 | moving D/b to D/e (glob) |
|
72 | moving D/b to D/e (glob) | |
73 | $ hg st |
|
73 | $ hg st | |
74 | A D/e |
|
74 | A D/e | |
75 | R D/b |
|
75 | R D/b | |
76 | $ hg revert -aq |
|
76 | $ hg revert -aq | |
77 | $ rm d/e |
|
77 | $ rm d/e | |
78 | $ hg mv d/b D/B |
|
78 | $ hg mv d/b D/B | |
79 | moving D/b to D/B (glob) |
|
79 | moving D/b to D/B (glob) | |
80 | $ hg st |
|
80 | $ hg st | |
81 | A D/B |
|
81 | A D/B | |
82 | R D/b |
|
82 | R D/b | |
83 | $ cd .. |
|
83 | $ cd .. | |
84 |
|
84 | |||
85 | test case collision between revisions (issue912) |
|
85 | test case collision between revisions (issue912) | |
86 |
|
86 | |||
87 | $ hg init repo3 |
|
87 | $ hg init repo3 | |
88 | $ cd repo3 |
|
88 | $ cd repo3 | |
89 | $ echo a > a |
|
89 | $ echo a > a | |
90 | $ hg ci -Am adda |
|
90 | $ hg ci -Am adda | |
91 | adding a |
|
91 | adding a | |
92 | $ hg rm a |
|
92 | $ hg rm a | |
93 | $ hg ci -Am removea |
|
93 | $ hg ci -Am removea | |
94 | $ echo A > A |
|
94 | $ echo A > A | |
95 |
|
95 | |||
96 | on linux hfs keeps the old case stored, force it |
|
96 | on linux hfs keeps the old case stored, force it | |
97 |
|
97 | |||
98 | $ mv a aa |
|
98 | $ mv a aa | |
99 | $ mv aa A |
|
99 | $ mv aa A | |
100 | $ hg ci -Am addA |
|
100 | $ hg ci -Am addA | |
101 | adding A |
|
101 | adding A | |
102 |
|
102 | |||
103 | used to fail under case insensitive fs |
|
103 | used to fail under case insensitive fs | |
104 |
|
104 | |||
105 | $ hg up -C 0 |
|
105 | $ hg up -C 0 | |
106 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
106 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
107 | $ hg up -C |
|
107 | $ hg up -C | |
108 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
108 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
109 |
|
109 | |||
110 | no clobbering of untracked files with wrong casing |
|
110 | no clobbering of untracked files with wrong casing | |
111 |
|
111 | |||
112 | $ hg up -r null |
|
112 | $ hg up -r null | |
113 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
113 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
114 | $ echo gold > a |
|
114 | $ echo gold > a | |
115 | $ hg up |
|
115 | $ hg up | |
116 | A: untracked file differs |
|
116 | A: untracked file differs | |
117 | abort: untracked files in working directory differ from files in requested revision |
|
117 | abort: untracked files in working directory differ from files in requested revision | |
118 | [255] |
|
118 | [255] | |
119 | $ cat a |
|
119 | $ cat a | |
120 | gold |
|
120 | gold | |
121 | $ rm a |
|
121 | $ rm a | |
122 |
|
122 | |||
123 | test that normal file in different case on target context is not |
|
123 | test that normal file in different case on target context is not | |
124 | unlinked by largefiles extension. |
|
124 | unlinked by largefiles extension. | |
125 |
|
125 | |||
126 | $ cat >> .hg/hgrc <<EOF |
|
126 | $ cat >> .hg/hgrc <<EOF | |
127 | > [extensions] |
|
127 | > [extensions] | |
128 | > largefiles= |
|
128 | > largefiles= | |
129 | > EOF |
|
129 | > EOF | |
130 | $ hg update -q -C 1 |
|
130 | $ hg update -q -C 1 | |
131 | $ hg status -A |
|
131 | $ hg status -A | |
132 | $ echo 'A as largefiles' > A |
|
132 | $ echo 'A as largefiles' > A | |
133 | $ hg add --large A |
|
133 | $ hg add --large A | |
134 | $ hg commit -m '#3' |
|
134 | $ hg commit -m '#3' | |
135 | created new head |
|
135 | created new head | |
136 | $ hg manifest -r 3 |
|
136 | $ hg manifest -r 3 | |
137 | .hglf/A |
|
137 | .hglf/A | |
138 | $ hg manifest -r 0 |
|
138 | $ hg manifest -r 0 | |
139 | a |
|
139 | a | |
140 | $ hg update -q -C 0 |
|
140 | $ hg update -q -C 0 | |
141 | $ hg status -A |
|
141 | $ hg status -A | |
142 | C a |
|
142 | C a | |
143 | $ hg update -q -C 3 |
|
143 | $ hg update -q -C 3 | |
144 | $ hg update -q 0 |
|
144 | $ hg update -q 0 | |
145 |
|
145 | |||
146 | $ cd .. |
|
146 | $ cd .. | |
147 |
|
147 | |||
148 | issue 3342: file in nested directory causes unexpected abort |
|
148 | issue 3342: file in nested directory causes unexpected abort | |
149 |
|
149 | |||
150 | $ hg init issue3342 |
|
150 | $ hg init issue3342 | |
151 | $ cd issue3342 |
|
151 | $ cd issue3342 | |
152 |
|
152 | |||
153 | $ mkdir -p a/B/c/D |
|
153 | $ mkdir -p a/B/c/D | |
154 | $ echo e > a/B/c/D/e |
|
154 | $ echo e > a/B/c/D/e | |
155 | $ hg add a/B/c/D/e |
|
155 | $ hg add a/B/c/D/e | |
|
156 | $ hg ci -m 'add e' | |||
|
157 | ||||
|
158 | issue 4481: revert across case only renames | |||
|
159 | $ hg mv a/B/c/D/e a/B/c/d/E | |||
|
160 | $ hg ci -m "uppercase E" | |||
|
161 | $ echo 'foo' > a/B/c/D/E | |||
|
162 | $ hg ci -m 'e content change' | |||
|
163 | $ hg revert --all -r 0 | |||
|
164 | removing a\B\c\D\E | |||
|
165 | adding a\B\c\D\e | |||
|
166 | $ find * | sort | |||
|
167 | a | |||
|
168 | a/B | |||
|
169 | a/B/c | |||
|
170 | a/B/c/D | |||
|
171 | a/B/c/D/e | |||
|
172 | a/B/c/D/e.orig | |||
156 |
|
173 | |||
157 | $ cd .. |
|
174 | $ cd .. | |
158 |
|
175 | |||
159 | issue 3340: mq does not handle case changes correctly |
|
176 | issue 3340: mq does not handle case changes correctly | |
160 |
|
177 | |||
161 | in addition to reported case, 'hg qrefresh' is also tested against |
|
178 | in addition to reported case, 'hg qrefresh' is also tested against | |
162 | case changes. |
|
179 | case changes. | |
163 |
|
180 | |||
164 | $ echo "[extensions]" >> $HGRCPATH |
|
181 | $ echo "[extensions]" >> $HGRCPATH | |
165 | $ echo "mq=" >> $HGRCPATH |
|
182 | $ echo "mq=" >> $HGRCPATH | |
166 |
|
183 | |||
167 | $ hg init issue3340 |
|
184 | $ hg init issue3340 | |
168 | $ cd issue3340 |
|
185 | $ cd issue3340 | |
169 |
|
186 | |||
170 | $ echo a > mIxEdCaSe |
|
187 | $ echo a > mIxEdCaSe | |
171 | $ hg add mIxEdCaSe |
|
188 | $ hg add mIxEdCaSe | |
172 | $ hg commit -m '#0' |
|
189 | $ hg commit -m '#0' | |
173 | $ hg rename mIxEdCaSe tmp |
|
190 | $ hg rename mIxEdCaSe tmp | |
174 | $ hg rename tmp MiXeDcAsE |
|
191 | $ hg rename tmp MiXeDcAsE | |
175 | $ hg status -A |
|
192 | $ hg status -A | |
176 | A MiXeDcAsE |
|
193 | A MiXeDcAsE | |
177 | mIxEdCaSe |
|
194 | mIxEdCaSe | |
178 | R mIxEdCaSe |
|
195 | R mIxEdCaSe | |
179 | $ hg qnew changecase |
|
196 | $ hg qnew changecase | |
180 | $ hg status -A |
|
197 | $ hg status -A | |
181 | C MiXeDcAsE |
|
198 | C MiXeDcAsE | |
182 |
|
199 | |||
183 | $ hg qpop -a |
|
200 | $ hg qpop -a | |
184 | popping changecase |
|
201 | popping changecase | |
185 | patch queue now empty |
|
202 | patch queue now empty | |
186 | $ hg qnew refresh-casechange |
|
203 | $ hg qnew refresh-casechange | |
187 | $ hg status -A |
|
204 | $ hg status -A | |
188 | C mIxEdCaSe |
|
205 | C mIxEdCaSe | |
189 | $ hg rename mIxEdCaSe tmp |
|
206 | $ hg rename mIxEdCaSe tmp | |
190 | $ hg rename tmp MiXeDcAsE |
|
207 | $ hg rename tmp MiXeDcAsE | |
191 | $ hg status -A |
|
208 | $ hg status -A | |
192 | A MiXeDcAsE |
|
209 | A MiXeDcAsE | |
193 | mIxEdCaSe |
|
210 | mIxEdCaSe | |
194 | R mIxEdCaSe |
|
211 | R mIxEdCaSe | |
195 | $ hg qrefresh |
|
212 | $ hg qrefresh | |
196 | $ hg status -A |
|
213 | $ hg status -A | |
197 | C MiXeDcAsE |
|
214 | C MiXeDcAsE | |
198 |
|
215 | |||
199 | $ hg qpop -a |
|
216 | $ hg qpop -a | |
200 | popping refresh-casechange |
|
217 | popping refresh-casechange | |
201 | patch queue now empty |
|
218 | patch queue now empty | |
202 | $ hg qnew refresh-pattern |
|
219 | $ hg qnew refresh-pattern | |
203 | $ hg status |
|
220 | $ hg status | |
204 | $ echo A > A |
|
221 | $ echo A > A | |
205 | $ hg add |
|
222 | $ hg add | |
206 | adding A |
|
223 | adding A | |
207 | $ hg qrefresh a # issue 3271, qrefresh with file handled case wrong |
|
224 | $ hg qrefresh a # issue 3271, qrefresh with file handled case wrong | |
208 | $ hg status # empty status means the qrefresh worked |
|
225 | $ hg status # empty status means the qrefresh worked | |
209 |
|
226 | |||
210 | #if osx |
|
227 | #if osx | |
211 |
|
228 | |||
212 | We assume anyone running the tests on a case-insensitive volume on OS |
|
229 | We assume anyone running the tests on a case-insensitive volume on OS | |
213 | X will be using HFS+. If that's not true, this test will fail. |
|
230 | X will be using HFS+. If that's not true, this test will fail. | |
214 |
|
231 | |||
215 | $ rm A |
|
232 | $ rm A | |
216 | >>> open(u'a\u200c'.encode('utf-8'), 'w').write('unicode is fun') |
|
233 | >>> open(u'a\u200c'.encode('utf-8'), 'w').write('unicode is fun') | |
217 | $ hg status |
|
234 | $ hg status | |
218 | M A |
|
235 | M A | |
219 |
|
236 | |||
220 | #endif |
|
237 | #endif | |
221 |
|
238 | |||
222 | $ cd .. |
|
239 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now