Show More
@@ -1,2426 +1,2431 b'' | |||||
1 | # cmdutil.py - help for command processing in mercurial |
|
1 | # cmdutil.py - help for command processing in mercurial | |
2 | # |
|
2 | # | |
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 |
|
7 | |||
8 | from node import hex, nullid, nullrev, short |
|
8 | from node import hex, nullid, nullrev, short | |
9 | from i18n import _ |
|
9 | from i18n import _ | |
10 | import os, sys, errno, re, tempfile |
|
10 | import os, sys, errno, re, tempfile | |
11 | import util, scmutil, templater, patch, error, templatekw, revlog, copies |
|
11 | import util, scmutil, templater, patch, error, templatekw, revlog, copies | |
12 | import match as matchmod |
|
12 | import match as matchmod | |
13 | import context, repair, graphmod, revset, phases, obsolete, pathutil |
|
13 | import context, repair, graphmod, revset, phases, obsolete, pathutil | |
14 | import changelog |
|
14 | import changelog | |
15 | import bookmarks |
|
15 | import bookmarks | |
16 | import lock as lockmod |
|
16 | import lock as lockmod | |
17 |
|
17 | |||
18 | def parsealiases(cmd): |
|
18 | def parsealiases(cmd): | |
19 | return cmd.lstrip("^").split("|") |
|
19 | return cmd.lstrip("^").split("|") | |
20 |
|
20 | |||
21 | def findpossible(cmd, table, strict=False): |
|
21 | def findpossible(cmd, table, strict=False): | |
22 | """ |
|
22 | """ | |
23 | Return cmd -> (aliases, command table entry) |
|
23 | Return cmd -> (aliases, command table entry) | |
24 | for each matching command. |
|
24 | for each matching command. | |
25 | Return debug commands (or their aliases) only if no normal command matches. |
|
25 | Return debug commands (or their aliases) only if no normal command matches. | |
26 | """ |
|
26 | """ | |
27 | choice = {} |
|
27 | choice = {} | |
28 | debugchoice = {} |
|
28 | debugchoice = {} | |
29 |
|
29 | |||
30 | if cmd in table: |
|
30 | if cmd in table: | |
31 | # short-circuit exact matches, "log" alias beats "^log|history" |
|
31 | # short-circuit exact matches, "log" alias beats "^log|history" | |
32 | keys = [cmd] |
|
32 | keys = [cmd] | |
33 | else: |
|
33 | else: | |
34 | keys = table.keys() |
|
34 | keys = table.keys() | |
35 |
|
35 | |||
36 | for e in keys: |
|
36 | for e in keys: | |
37 | aliases = parsealiases(e) |
|
37 | aliases = parsealiases(e) | |
38 | found = None |
|
38 | found = None | |
39 | if cmd in aliases: |
|
39 | if cmd in aliases: | |
40 | found = cmd |
|
40 | found = cmd | |
41 | elif not strict: |
|
41 | elif not strict: | |
42 | for a in aliases: |
|
42 | for a in aliases: | |
43 | if a.startswith(cmd): |
|
43 | if a.startswith(cmd): | |
44 | found = a |
|
44 | found = a | |
45 | break |
|
45 | break | |
46 | if found is not None: |
|
46 | if found is not None: | |
47 | if aliases[0].startswith("debug") or found.startswith("debug"): |
|
47 | if aliases[0].startswith("debug") or found.startswith("debug"): | |
48 | debugchoice[found] = (aliases, table[e]) |
|
48 | debugchoice[found] = (aliases, table[e]) | |
49 | else: |
|
49 | else: | |
50 | choice[found] = (aliases, table[e]) |
|
50 | choice[found] = (aliases, table[e]) | |
51 |
|
51 | |||
52 | if not choice and debugchoice: |
|
52 | if not choice and debugchoice: | |
53 | choice = debugchoice |
|
53 | choice = debugchoice | |
54 |
|
54 | |||
55 | return choice |
|
55 | return choice | |
56 |
|
56 | |||
57 | def findcmd(cmd, table, strict=True): |
|
57 | def findcmd(cmd, table, strict=True): | |
58 | """Return (aliases, command table entry) for command string.""" |
|
58 | """Return (aliases, command table entry) for command string.""" | |
59 | choice = findpossible(cmd, table, strict) |
|
59 | choice = findpossible(cmd, table, strict) | |
60 |
|
60 | |||
61 | if cmd in choice: |
|
61 | if cmd in choice: | |
62 | return choice[cmd] |
|
62 | return choice[cmd] | |
63 |
|
63 | |||
64 | if len(choice) > 1: |
|
64 | if len(choice) > 1: | |
65 | clist = choice.keys() |
|
65 | clist = choice.keys() | |
66 | clist.sort() |
|
66 | clist.sort() | |
67 | raise error.AmbiguousCommand(cmd, clist) |
|
67 | raise error.AmbiguousCommand(cmd, clist) | |
68 |
|
68 | |||
69 | if choice: |
|
69 | if choice: | |
70 | return choice.values()[0] |
|
70 | return choice.values()[0] | |
71 |
|
71 | |||
72 | raise error.UnknownCommand(cmd) |
|
72 | raise error.UnknownCommand(cmd) | |
73 |
|
73 | |||
74 | def findrepo(p): |
|
74 | def findrepo(p): | |
75 | while not os.path.isdir(os.path.join(p, ".hg")): |
|
75 | while not os.path.isdir(os.path.join(p, ".hg")): | |
76 | oldp, p = p, os.path.dirname(p) |
|
76 | oldp, p = p, os.path.dirname(p) | |
77 | if p == oldp: |
|
77 | if p == oldp: | |
78 | return None |
|
78 | return None | |
79 |
|
79 | |||
80 | return p |
|
80 | return p | |
81 |
|
81 | |||
82 | def bailifchanged(repo): |
|
82 | def bailifchanged(repo): | |
83 | if repo.dirstate.p2() != nullid: |
|
83 | if repo.dirstate.p2() != nullid: | |
84 | raise util.Abort(_('outstanding uncommitted merge')) |
|
84 | raise util.Abort(_('outstanding uncommitted merge')) | |
85 | modified, added, removed, deleted = repo.status()[:4] |
|
85 | modified, added, removed, deleted = repo.status()[:4] | |
86 | if modified or added or removed or deleted: |
|
86 | if modified or added or removed or deleted: | |
87 | raise util.Abort(_('uncommitted changes')) |
|
87 | raise util.Abort(_('uncommitted changes')) | |
88 | ctx = repo[None] |
|
88 | ctx = repo[None] | |
89 | for s in sorted(ctx.substate): |
|
89 | for s in sorted(ctx.substate): | |
90 | if ctx.sub(s).dirty(): |
|
90 | if ctx.sub(s).dirty(): | |
91 | raise util.Abort(_("uncommitted changes in subrepo %s") % s) |
|
91 | raise util.Abort(_("uncommitted changes in subrepo %s") % s) | |
92 |
|
92 | |||
93 | def logmessage(ui, opts): |
|
93 | def logmessage(ui, opts): | |
94 | """ get the log message according to -m and -l option """ |
|
94 | """ get the log message according to -m and -l option """ | |
95 | message = opts.get('message') |
|
95 | message = opts.get('message') | |
96 | logfile = opts.get('logfile') |
|
96 | logfile = opts.get('logfile') | |
97 |
|
97 | |||
98 | if message and logfile: |
|
98 | if message and logfile: | |
99 | raise util.Abort(_('options --message and --logfile are mutually ' |
|
99 | raise util.Abort(_('options --message and --logfile are mutually ' | |
100 | 'exclusive')) |
|
100 | 'exclusive')) | |
101 | if not message and logfile: |
|
101 | if not message and logfile: | |
102 | try: |
|
102 | try: | |
103 | if logfile == '-': |
|
103 | if logfile == '-': | |
104 | message = ui.fin.read() |
|
104 | message = ui.fin.read() | |
105 | else: |
|
105 | else: | |
106 | message = '\n'.join(util.readfile(logfile).splitlines()) |
|
106 | message = '\n'.join(util.readfile(logfile).splitlines()) | |
107 | except IOError, inst: |
|
107 | except IOError, inst: | |
108 | raise util.Abort(_("can't read commit message '%s': %s") % |
|
108 | raise util.Abort(_("can't read commit message '%s': %s") % | |
109 | (logfile, inst.strerror)) |
|
109 | (logfile, inst.strerror)) | |
110 | return message |
|
110 | return message | |
111 |
|
111 | |||
112 | def loglimit(opts): |
|
112 | def loglimit(opts): | |
113 | """get the log limit according to option -l/--limit""" |
|
113 | """get the log limit according to option -l/--limit""" | |
114 | limit = opts.get('limit') |
|
114 | limit = opts.get('limit') | |
115 | if limit: |
|
115 | if limit: | |
116 | try: |
|
116 | try: | |
117 | limit = int(limit) |
|
117 | limit = int(limit) | |
118 | except ValueError: |
|
118 | except ValueError: | |
119 | raise util.Abort(_('limit must be a positive integer')) |
|
119 | raise util.Abort(_('limit must be a positive integer')) | |
120 | if limit <= 0: |
|
120 | if limit <= 0: | |
121 | raise util.Abort(_('limit must be positive')) |
|
121 | raise util.Abort(_('limit must be positive')) | |
122 | else: |
|
122 | else: | |
123 | limit = None |
|
123 | limit = None | |
124 | return limit |
|
124 | return limit | |
125 |
|
125 | |||
126 | def makefilename(repo, pat, node, desc=None, |
|
126 | def makefilename(repo, pat, node, desc=None, | |
127 | total=None, seqno=None, revwidth=None, pathname=None): |
|
127 | total=None, seqno=None, revwidth=None, pathname=None): | |
128 | node_expander = { |
|
128 | node_expander = { | |
129 | 'H': lambda: hex(node), |
|
129 | 'H': lambda: hex(node), | |
130 | 'R': lambda: str(repo.changelog.rev(node)), |
|
130 | 'R': lambda: str(repo.changelog.rev(node)), | |
131 | 'h': lambda: short(node), |
|
131 | 'h': lambda: short(node), | |
132 | 'm': lambda: re.sub('[^\w]', '_', str(desc)) |
|
132 | 'm': lambda: re.sub('[^\w]', '_', str(desc)) | |
133 | } |
|
133 | } | |
134 | expander = { |
|
134 | expander = { | |
135 | '%': lambda: '%', |
|
135 | '%': lambda: '%', | |
136 | 'b': lambda: os.path.basename(repo.root), |
|
136 | 'b': lambda: os.path.basename(repo.root), | |
137 | } |
|
137 | } | |
138 |
|
138 | |||
139 | try: |
|
139 | try: | |
140 | if node: |
|
140 | if node: | |
141 | expander.update(node_expander) |
|
141 | expander.update(node_expander) | |
142 | if node: |
|
142 | if node: | |
143 | expander['r'] = (lambda: |
|
143 | expander['r'] = (lambda: | |
144 | str(repo.changelog.rev(node)).zfill(revwidth or 0)) |
|
144 | str(repo.changelog.rev(node)).zfill(revwidth or 0)) | |
145 | if total is not None: |
|
145 | if total is not None: | |
146 | expander['N'] = lambda: str(total) |
|
146 | expander['N'] = lambda: str(total) | |
147 | if seqno is not None: |
|
147 | if seqno is not None: | |
148 | expander['n'] = lambda: str(seqno) |
|
148 | expander['n'] = lambda: str(seqno) | |
149 | if total is not None and seqno is not None: |
|
149 | if total is not None and seqno is not None: | |
150 | expander['n'] = lambda: str(seqno).zfill(len(str(total))) |
|
150 | expander['n'] = lambda: str(seqno).zfill(len(str(total))) | |
151 | if pathname is not None: |
|
151 | if pathname is not None: | |
152 | expander['s'] = lambda: os.path.basename(pathname) |
|
152 | expander['s'] = lambda: os.path.basename(pathname) | |
153 | expander['d'] = lambda: os.path.dirname(pathname) or '.' |
|
153 | expander['d'] = lambda: os.path.dirname(pathname) or '.' | |
154 | expander['p'] = lambda: pathname |
|
154 | expander['p'] = lambda: pathname | |
155 |
|
155 | |||
156 | newname = [] |
|
156 | newname = [] | |
157 | patlen = len(pat) |
|
157 | patlen = len(pat) | |
158 | i = 0 |
|
158 | i = 0 | |
159 | while i < patlen: |
|
159 | while i < patlen: | |
160 | c = pat[i] |
|
160 | c = pat[i] | |
161 | if c == '%': |
|
161 | if c == '%': | |
162 | i += 1 |
|
162 | i += 1 | |
163 | c = pat[i] |
|
163 | c = pat[i] | |
164 | c = expander[c]() |
|
164 | c = expander[c]() | |
165 | newname.append(c) |
|
165 | newname.append(c) | |
166 | i += 1 |
|
166 | i += 1 | |
167 | return ''.join(newname) |
|
167 | return ''.join(newname) | |
168 | except KeyError, inst: |
|
168 | except KeyError, inst: | |
169 | raise util.Abort(_("invalid format spec '%%%s' in output filename") % |
|
169 | raise util.Abort(_("invalid format spec '%%%s' in output filename") % | |
170 | inst.args[0]) |
|
170 | inst.args[0]) | |
171 |
|
171 | |||
172 | def makefileobj(repo, pat, node=None, desc=None, total=None, |
|
172 | def makefileobj(repo, pat, node=None, desc=None, total=None, | |
173 | seqno=None, revwidth=None, mode='wb', modemap=None, |
|
173 | seqno=None, revwidth=None, mode='wb', modemap=None, | |
174 | pathname=None): |
|
174 | pathname=None): | |
175 |
|
175 | |||
176 | writable = mode not in ('r', 'rb') |
|
176 | writable = mode not in ('r', 'rb') | |
177 |
|
177 | |||
178 | if not pat or pat == '-': |
|
178 | if not pat or pat == '-': | |
179 | fp = writable and repo.ui.fout or repo.ui.fin |
|
179 | fp = writable and repo.ui.fout or repo.ui.fin | |
180 | if util.safehasattr(fp, 'fileno'): |
|
180 | if util.safehasattr(fp, 'fileno'): | |
181 | return os.fdopen(os.dup(fp.fileno()), mode) |
|
181 | return os.fdopen(os.dup(fp.fileno()), mode) | |
182 | else: |
|
182 | else: | |
183 | # if this fp can't be duped properly, return |
|
183 | # if this fp can't be duped properly, return | |
184 | # a dummy object that can be closed |
|
184 | # a dummy object that can be closed | |
185 | class wrappedfileobj(object): |
|
185 | class wrappedfileobj(object): | |
186 | noop = lambda x: None |
|
186 | noop = lambda x: None | |
187 | def __init__(self, f): |
|
187 | def __init__(self, f): | |
188 | self.f = f |
|
188 | self.f = f | |
189 | def __getattr__(self, attr): |
|
189 | def __getattr__(self, attr): | |
190 | if attr == 'close': |
|
190 | if attr == 'close': | |
191 | return self.noop |
|
191 | return self.noop | |
192 | else: |
|
192 | else: | |
193 | return getattr(self.f, attr) |
|
193 | return getattr(self.f, attr) | |
194 |
|
194 | |||
195 | return wrappedfileobj(fp) |
|
195 | return wrappedfileobj(fp) | |
196 | if util.safehasattr(pat, 'write') and writable: |
|
196 | if util.safehasattr(pat, 'write') and writable: | |
197 | return pat |
|
197 | return pat | |
198 | if util.safehasattr(pat, 'read') and 'r' in mode: |
|
198 | if util.safehasattr(pat, 'read') and 'r' in mode: | |
199 | return pat |
|
199 | return pat | |
200 | fn = makefilename(repo, pat, node, desc, total, seqno, revwidth, pathname) |
|
200 | fn = makefilename(repo, pat, node, desc, total, seqno, revwidth, pathname) | |
201 | if modemap is not None: |
|
201 | if modemap is not None: | |
202 | mode = modemap.get(fn, mode) |
|
202 | mode = modemap.get(fn, mode) | |
203 | if mode == 'wb': |
|
203 | if mode == 'wb': | |
204 | modemap[fn] = 'ab' |
|
204 | modemap[fn] = 'ab' | |
205 | return open(fn, mode) |
|
205 | return open(fn, mode) | |
206 |
|
206 | |||
207 | def openrevlog(repo, cmd, file_, opts): |
|
207 | def openrevlog(repo, cmd, file_, opts): | |
208 | """opens the changelog, manifest, a filelog or a given revlog""" |
|
208 | """opens the changelog, manifest, a filelog or a given revlog""" | |
209 | cl = opts['changelog'] |
|
209 | cl = opts['changelog'] | |
210 | mf = opts['manifest'] |
|
210 | mf = opts['manifest'] | |
211 | msg = None |
|
211 | msg = None | |
212 | if cl and mf: |
|
212 | if cl and mf: | |
213 | msg = _('cannot specify --changelog and --manifest at the same time') |
|
213 | msg = _('cannot specify --changelog and --manifest at the same time') | |
214 | elif cl or mf: |
|
214 | elif cl or mf: | |
215 | if file_: |
|
215 | if file_: | |
216 | msg = _('cannot specify filename with --changelog or --manifest') |
|
216 | msg = _('cannot specify filename with --changelog or --manifest') | |
217 | elif not repo: |
|
217 | elif not repo: | |
218 | msg = _('cannot specify --changelog or --manifest ' |
|
218 | msg = _('cannot specify --changelog or --manifest ' | |
219 | 'without a repository') |
|
219 | 'without a repository') | |
220 | if msg: |
|
220 | if msg: | |
221 | raise util.Abort(msg) |
|
221 | raise util.Abort(msg) | |
222 |
|
222 | |||
223 | r = None |
|
223 | r = None | |
224 | if repo: |
|
224 | if repo: | |
225 | if cl: |
|
225 | if cl: | |
226 | r = repo.unfiltered().changelog |
|
226 | r = repo.unfiltered().changelog | |
227 | elif mf: |
|
227 | elif mf: | |
228 | r = repo.manifest |
|
228 | r = repo.manifest | |
229 | elif file_: |
|
229 | elif file_: | |
230 | filelog = repo.file(file_) |
|
230 | filelog = repo.file(file_) | |
231 | if len(filelog): |
|
231 | if len(filelog): | |
232 | r = filelog |
|
232 | r = filelog | |
233 | if not r: |
|
233 | if not r: | |
234 | if not file_: |
|
234 | if not file_: | |
235 | raise error.CommandError(cmd, _('invalid arguments')) |
|
235 | raise error.CommandError(cmd, _('invalid arguments')) | |
236 | if not os.path.isfile(file_): |
|
236 | if not os.path.isfile(file_): | |
237 | raise util.Abort(_("revlog '%s' not found") % file_) |
|
237 | raise util.Abort(_("revlog '%s' not found") % file_) | |
238 | r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), |
|
238 | r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), | |
239 | file_[:-2] + ".i") |
|
239 | file_[:-2] + ".i") | |
240 | return r |
|
240 | return r | |
241 |
|
241 | |||
242 | def copy(ui, repo, pats, opts, rename=False): |
|
242 | def copy(ui, repo, pats, opts, rename=False): | |
243 | # called with the repo lock held |
|
243 | # called with the repo lock held | |
244 | # |
|
244 | # | |
245 | # hgsep => pathname that uses "/" to separate directories |
|
245 | # hgsep => pathname that uses "/" to separate directories | |
246 | # ossep => pathname that uses os.sep to separate directories |
|
246 | # ossep => pathname that uses os.sep to separate directories | |
247 | cwd = repo.getcwd() |
|
247 | cwd = repo.getcwd() | |
248 | targets = {} |
|
248 | targets = {} | |
249 | after = opts.get("after") |
|
249 | after = opts.get("after") | |
250 | dryrun = opts.get("dry_run") |
|
250 | dryrun = opts.get("dry_run") | |
251 | wctx = repo[None] |
|
251 | wctx = repo[None] | |
252 |
|
252 | |||
253 | def walkpat(pat): |
|
253 | def walkpat(pat): | |
254 | srcs = [] |
|
254 | srcs = [] | |
255 | badstates = after and '?' or '?r' |
|
255 | badstates = after and '?' or '?r' | |
256 | m = scmutil.match(repo[None], [pat], opts, globbed=True) |
|
256 | m = scmutil.match(repo[None], [pat], opts, globbed=True) | |
257 | for abs in repo.walk(m): |
|
257 | for abs in repo.walk(m): | |
258 | state = repo.dirstate[abs] |
|
258 | state = repo.dirstate[abs] | |
259 | rel = m.rel(abs) |
|
259 | rel = m.rel(abs) | |
260 | exact = m.exact(abs) |
|
260 | exact = m.exact(abs) | |
261 | if state in badstates: |
|
261 | if state in badstates: | |
262 | if exact and state == '?': |
|
262 | if exact and state == '?': | |
263 | ui.warn(_('%s: not copying - file is not managed\n') % rel) |
|
263 | ui.warn(_('%s: not copying - file is not managed\n') % rel) | |
264 | if exact and state == 'r': |
|
264 | if exact and state == 'r': | |
265 | ui.warn(_('%s: not copying - file has been marked for' |
|
265 | ui.warn(_('%s: not copying - file has been marked for' | |
266 | ' remove\n') % rel) |
|
266 | ' remove\n') % rel) | |
267 | continue |
|
267 | continue | |
268 | # abs: hgsep |
|
268 | # abs: hgsep | |
269 | # rel: ossep |
|
269 | # rel: ossep | |
270 | srcs.append((abs, rel, exact)) |
|
270 | srcs.append((abs, rel, exact)) | |
271 | return srcs |
|
271 | return srcs | |
272 |
|
272 | |||
273 | # abssrc: hgsep |
|
273 | # abssrc: hgsep | |
274 | # relsrc: ossep |
|
274 | # relsrc: ossep | |
275 | # otarget: ossep |
|
275 | # otarget: ossep | |
276 | def copyfile(abssrc, relsrc, otarget, exact): |
|
276 | def copyfile(abssrc, relsrc, otarget, exact): | |
277 | abstarget = pathutil.canonpath(repo.root, cwd, otarget) |
|
277 | abstarget = pathutil.canonpath(repo.root, cwd, otarget) | |
278 | if '/' in abstarget: |
|
278 | if '/' in abstarget: | |
279 | # We cannot normalize abstarget itself, this would prevent |
|
279 | # We cannot normalize abstarget itself, this would prevent | |
280 | # case only renames, like a => A. |
|
280 | # case only renames, like a => A. | |
281 | abspath, absname = abstarget.rsplit('/', 1) |
|
281 | abspath, absname = abstarget.rsplit('/', 1) | |
282 | abstarget = repo.dirstate.normalize(abspath) + '/' + absname |
|
282 | abstarget = repo.dirstate.normalize(abspath) + '/' + absname | |
283 | reltarget = repo.pathto(abstarget, cwd) |
|
283 | reltarget = repo.pathto(abstarget, cwd) | |
284 | target = repo.wjoin(abstarget) |
|
284 | target = repo.wjoin(abstarget) | |
285 | src = repo.wjoin(abssrc) |
|
285 | src = repo.wjoin(abssrc) | |
286 | state = repo.dirstate[abstarget] |
|
286 | state = repo.dirstate[abstarget] | |
287 |
|
287 | |||
288 | scmutil.checkportable(ui, abstarget) |
|
288 | scmutil.checkportable(ui, abstarget) | |
289 |
|
289 | |||
290 | # check for collisions |
|
290 | # check for collisions | |
291 | prevsrc = targets.get(abstarget) |
|
291 | prevsrc = targets.get(abstarget) | |
292 | if prevsrc is not None: |
|
292 | if prevsrc is not None: | |
293 | ui.warn(_('%s: not overwriting - %s collides with %s\n') % |
|
293 | ui.warn(_('%s: not overwriting - %s collides with %s\n') % | |
294 | (reltarget, repo.pathto(abssrc, cwd), |
|
294 | (reltarget, repo.pathto(abssrc, cwd), | |
295 | repo.pathto(prevsrc, cwd))) |
|
295 | repo.pathto(prevsrc, cwd))) | |
296 | return |
|
296 | return | |
297 |
|
297 | |||
298 | # check for overwrites |
|
298 | # check for overwrites | |
299 | exists = os.path.lexists(target) |
|
299 | exists = os.path.lexists(target) | |
300 | samefile = False |
|
300 | samefile = False | |
301 | if exists and abssrc != abstarget: |
|
301 | if exists and abssrc != abstarget: | |
302 | if (repo.dirstate.normalize(abssrc) == |
|
302 | if (repo.dirstate.normalize(abssrc) == | |
303 | repo.dirstate.normalize(abstarget)): |
|
303 | repo.dirstate.normalize(abstarget)): | |
304 | if not rename: |
|
304 | if not rename: | |
305 | ui.warn(_("%s: can't copy - same file\n") % reltarget) |
|
305 | ui.warn(_("%s: can't copy - same file\n") % reltarget) | |
306 | return |
|
306 | return | |
307 | exists = False |
|
307 | exists = False | |
308 | samefile = True |
|
308 | samefile = True | |
309 |
|
309 | |||
310 | if not after and exists or after and state in 'mn': |
|
310 | if not after and exists or after and state in 'mn': | |
311 | if not opts['force']: |
|
311 | if not opts['force']: | |
312 | ui.warn(_('%s: not overwriting - file exists\n') % |
|
312 | ui.warn(_('%s: not overwriting - file exists\n') % | |
313 | reltarget) |
|
313 | reltarget) | |
314 | return |
|
314 | return | |
315 |
|
315 | |||
316 | if after: |
|
316 | if after: | |
317 | if not exists: |
|
317 | if not exists: | |
318 | if rename: |
|
318 | if rename: | |
319 | ui.warn(_('%s: not recording move - %s does not exist\n') % |
|
319 | ui.warn(_('%s: not recording move - %s does not exist\n') % | |
320 | (relsrc, reltarget)) |
|
320 | (relsrc, reltarget)) | |
321 | else: |
|
321 | else: | |
322 | ui.warn(_('%s: not recording copy - %s does not exist\n') % |
|
322 | ui.warn(_('%s: not recording copy - %s does not exist\n') % | |
323 | (relsrc, reltarget)) |
|
323 | (relsrc, reltarget)) | |
324 | return |
|
324 | return | |
325 | elif not dryrun: |
|
325 | elif not dryrun: | |
326 | try: |
|
326 | try: | |
327 | if exists: |
|
327 | if exists: | |
328 | os.unlink(target) |
|
328 | os.unlink(target) | |
329 | targetdir = os.path.dirname(target) or '.' |
|
329 | targetdir = os.path.dirname(target) or '.' | |
330 | if not os.path.isdir(targetdir): |
|
330 | if not os.path.isdir(targetdir): | |
331 | os.makedirs(targetdir) |
|
331 | os.makedirs(targetdir) | |
332 | if samefile: |
|
332 | if samefile: | |
333 | tmp = target + "~hgrename" |
|
333 | tmp = target + "~hgrename" | |
334 | os.rename(src, tmp) |
|
334 | os.rename(src, tmp) | |
335 | os.rename(tmp, target) |
|
335 | os.rename(tmp, target) | |
336 | else: |
|
336 | else: | |
337 | util.copyfile(src, target) |
|
337 | util.copyfile(src, target) | |
338 | srcexists = True |
|
338 | srcexists = True | |
339 | except IOError, inst: |
|
339 | except IOError, inst: | |
340 | if inst.errno == errno.ENOENT: |
|
340 | if inst.errno == errno.ENOENT: | |
341 | ui.warn(_('%s: deleted in working copy\n') % relsrc) |
|
341 | ui.warn(_('%s: deleted in working copy\n') % relsrc) | |
342 | srcexists = False |
|
342 | srcexists = False | |
343 | else: |
|
343 | else: | |
344 | ui.warn(_('%s: cannot copy - %s\n') % |
|
344 | ui.warn(_('%s: cannot copy - %s\n') % | |
345 | (relsrc, inst.strerror)) |
|
345 | (relsrc, inst.strerror)) | |
346 | return True # report a failure |
|
346 | return True # report a failure | |
347 |
|
347 | |||
348 | if ui.verbose or not exact: |
|
348 | if ui.verbose or not exact: | |
349 | if rename: |
|
349 | if rename: | |
350 | ui.status(_('moving %s to %s\n') % (relsrc, reltarget)) |
|
350 | ui.status(_('moving %s to %s\n') % (relsrc, reltarget)) | |
351 | else: |
|
351 | else: | |
352 | ui.status(_('copying %s to %s\n') % (relsrc, reltarget)) |
|
352 | ui.status(_('copying %s to %s\n') % (relsrc, reltarget)) | |
353 |
|
353 | |||
354 | targets[abstarget] = abssrc |
|
354 | targets[abstarget] = abssrc | |
355 |
|
355 | |||
356 | # fix up dirstate |
|
356 | # fix up dirstate | |
357 | scmutil.dirstatecopy(ui, repo, wctx, abssrc, abstarget, |
|
357 | scmutil.dirstatecopy(ui, repo, wctx, abssrc, abstarget, | |
358 | dryrun=dryrun, cwd=cwd) |
|
358 | dryrun=dryrun, cwd=cwd) | |
359 | if rename and not dryrun: |
|
359 | if rename and not dryrun: | |
360 | if not after and srcexists and not samefile: |
|
360 | if not after and srcexists and not samefile: | |
361 | util.unlinkpath(repo.wjoin(abssrc)) |
|
361 | util.unlinkpath(repo.wjoin(abssrc)) | |
362 | wctx.forget([abssrc]) |
|
362 | wctx.forget([abssrc]) | |
363 |
|
363 | |||
364 | # pat: ossep |
|
364 | # pat: ossep | |
365 | # dest ossep |
|
365 | # dest ossep | |
366 | # srcs: list of (hgsep, hgsep, ossep, bool) |
|
366 | # srcs: list of (hgsep, hgsep, ossep, bool) | |
367 | # return: function that takes hgsep and returns ossep |
|
367 | # return: function that takes hgsep and returns ossep | |
368 | def targetpathfn(pat, dest, srcs): |
|
368 | def targetpathfn(pat, dest, srcs): | |
369 | if os.path.isdir(pat): |
|
369 | if os.path.isdir(pat): | |
370 | abspfx = pathutil.canonpath(repo.root, cwd, pat) |
|
370 | abspfx = pathutil.canonpath(repo.root, cwd, pat) | |
371 | abspfx = util.localpath(abspfx) |
|
371 | abspfx = util.localpath(abspfx) | |
372 | if destdirexists: |
|
372 | if destdirexists: | |
373 | striplen = len(os.path.split(abspfx)[0]) |
|
373 | striplen = len(os.path.split(abspfx)[0]) | |
374 | else: |
|
374 | else: | |
375 | striplen = len(abspfx) |
|
375 | striplen = len(abspfx) | |
376 | if striplen: |
|
376 | if striplen: | |
377 | striplen += len(os.sep) |
|
377 | striplen += len(os.sep) | |
378 | res = lambda p: os.path.join(dest, util.localpath(p)[striplen:]) |
|
378 | res = lambda p: os.path.join(dest, util.localpath(p)[striplen:]) | |
379 | elif destdirexists: |
|
379 | elif destdirexists: | |
380 | res = lambda p: os.path.join(dest, |
|
380 | res = lambda p: os.path.join(dest, | |
381 | os.path.basename(util.localpath(p))) |
|
381 | os.path.basename(util.localpath(p))) | |
382 | else: |
|
382 | else: | |
383 | res = lambda p: dest |
|
383 | res = lambda p: dest | |
384 | return res |
|
384 | return res | |
385 |
|
385 | |||
386 | # pat: ossep |
|
386 | # pat: ossep | |
387 | # dest ossep |
|
387 | # dest ossep | |
388 | # srcs: list of (hgsep, hgsep, ossep, bool) |
|
388 | # srcs: list of (hgsep, hgsep, ossep, bool) | |
389 | # return: function that takes hgsep and returns ossep |
|
389 | # return: function that takes hgsep and returns ossep | |
390 | def targetpathafterfn(pat, dest, srcs): |
|
390 | def targetpathafterfn(pat, dest, srcs): | |
391 | if matchmod.patkind(pat): |
|
391 | if matchmod.patkind(pat): | |
392 | # a mercurial pattern |
|
392 | # a mercurial pattern | |
393 | res = lambda p: os.path.join(dest, |
|
393 | res = lambda p: os.path.join(dest, | |
394 | os.path.basename(util.localpath(p))) |
|
394 | os.path.basename(util.localpath(p))) | |
395 | else: |
|
395 | else: | |
396 | abspfx = pathutil.canonpath(repo.root, cwd, pat) |
|
396 | abspfx = pathutil.canonpath(repo.root, cwd, pat) | |
397 | if len(abspfx) < len(srcs[0][0]): |
|
397 | if len(abspfx) < len(srcs[0][0]): | |
398 | # A directory. Either the target path contains the last |
|
398 | # A directory. Either the target path contains the last | |
399 | # component of the source path or it does not. |
|
399 | # component of the source path or it does not. | |
400 | def evalpath(striplen): |
|
400 | def evalpath(striplen): | |
401 | score = 0 |
|
401 | score = 0 | |
402 | for s in srcs: |
|
402 | for s in srcs: | |
403 | t = os.path.join(dest, util.localpath(s[0])[striplen:]) |
|
403 | t = os.path.join(dest, util.localpath(s[0])[striplen:]) | |
404 | if os.path.lexists(t): |
|
404 | if os.path.lexists(t): | |
405 | score += 1 |
|
405 | score += 1 | |
406 | return score |
|
406 | return score | |
407 |
|
407 | |||
408 | abspfx = util.localpath(abspfx) |
|
408 | abspfx = util.localpath(abspfx) | |
409 | striplen = len(abspfx) |
|
409 | striplen = len(abspfx) | |
410 | if striplen: |
|
410 | if striplen: | |
411 | striplen += len(os.sep) |
|
411 | striplen += len(os.sep) | |
412 | if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])): |
|
412 | if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])): | |
413 | score = evalpath(striplen) |
|
413 | score = evalpath(striplen) | |
414 | striplen1 = len(os.path.split(abspfx)[0]) |
|
414 | striplen1 = len(os.path.split(abspfx)[0]) | |
415 | if striplen1: |
|
415 | if striplen1: | |
416 | striplen1 += len(os.sep) |
|
416 | striplen1 += len(os.sep) | |
417 | if evalpath(striplen1) > score: |
|
417 | if evalpath(striplen1) > score: | |
418 | striplen = striplen1 |
|
418 | striplen = striplen1 | |
419 | res = lambda p: os.path.join(dest, |
|
419 | res = lambda p: os.path.join(dest, | |
420 | util.localpath(p)[striplen:]) |
|
420 | util.localpath(p)[striplen:]) | |
421 | else: |
|
421 | else: | |
422 | # a file |
|
422 | # a file | |
423 | if destdirexists: |
|
423 | if destdirexists: | |
424 | res = lambda p: os.path.join(dest, |
|
424 | res = lambda p: os.path.join(dest, | |
425 | os.path.basename(util.localpath(p))) |
|
425 | os.path.basename(util.localpath(p))) | |
426 | else: |
|
426 | else: | |
427 | res = lambda p: dest |
|
427 | res = lambda p: dest | |
428 | return res |
|
428 | return res | |
429 |
|
429 | |||
430 |
|
430 | |||
431 | pats = scmutil.expandpats(pats) |
|
431 | pats = scmutil.expandpats(pats) | |
432 | if not pats: |
|
432 | if not pats: | |
433 | raise util.Abort(_('no source or destination specified')) |
|
433 | raise util.Abort(_('no source or destination specified')) | |
434 | if len(pats) == 1: |
|
434 | if len(pats) == 1: | |
435 | raise util.Abort(_('no destination specified')) |
|
435 | raise util.Abort(_('no destination specified')) | |
436 | dest = pats.pop() |
|
436 | dest = pats.pop() | |
437 | destdirexists = os.path.isdir(dest) and not os.path.islink(dest) |
|
437 | destdirexists = os.path.isdir(dest) and not os.path.islink(dest) | |
438 | if not destdirexists: |
|
438 | if not destdirexists: | |
439 | if len(pats) > 1 or matchmod.patkind(pats[0]): |
|
439 | if len(pats) > 1 or matchmod.patkind(pats[0]): | |
440 | raise util.Abort(_('with multiple sources, destination must be an ' |
|
440 | raise util.Abort(_('with multiple sources, destination must be an ' | |
441 | 'existing directory')) |
|
441 | 'existing directory')) | |
442 | if util.endswithsep(dest): |
|
442 | if util.endswithsep(dest): | |
443 | raise util.Abort(_('destination %s is not a directory') % dest) |
|
443 | raise util.Abort(_('destination %s is not a directory') % dest) | |
444 |
|
444 | |||
445 | tfn = targetpathfn |
|
445 | tfn = targetpathfn | |
446 | if after: |
|
446 | if after: | |
447 | tfn = targetpathafterfn |
|
447 | tfn = targetpathafterfn | |
448 | copylist = [] |
|
448 | copylist = [] | |
449 | for pat in pats: |
|
449 | for pat in pats: | |
450 | srcs = walkpat(pat) |
|
450 | srcs = walkpat(pat) | |
451 | if not srcs: |
|
451 | if not srcs: | |
452 | continue |
|
452 | continue | |
453 | copylist.append((tfn(pat, dest, srcs), srcs)) |
|
453 | copylist.append((tfn(pat, dest, srcs), srcs)) | |
454 | if not copylist: |
|
454 | if not copylist: | |
455 | raise util.Abort(_('no files to copy')) |
|
455 | raise util.Abort(_('no files to copy')) | |
456 |
|
456 | |||
457 | errors = 0 |
|
457 | errors = 0 | |
458 | for targetpath, srcs in copylist: |
|
458 | for targetpath, srcs in copylist: | |
459 | for abssrc, relsrc, exact in srcs: |
|
459 | for abssrc, relsrc, exact in srcs: | |
460 | if copyfile(abssrc, relsrc, targetpath(abssrc), exact): |
|
460 | if copyfile(abssrc, relsrc, targetpath(abssrc), exact): | |
461 | errors += 1 |
|
461 | errors += 1 | |
462 |
|
462 | |||
463 | if errors: |
|
463 | if errors: | |
464 | ui.warn(_('(consider using --after)\n')) |
|
464 | ui.warn(_('(consider using --after)\n')) | |
465 |
|
465 | |||
466 | return errors != 0 |
|
466 | return errors != 0 | |
467 |
|
467 | |||
468 | def service(opts, parentfn=None, initfn=None, runfn=None, logfile=None, |
|
468 | def service(opts, parentfn=None, initfn=None, runfn=None, logfile=None, | |
469 | runargs=None, appendpid=False): |
|
469 | runargs=None, appendpid=False): | |
470 | '''Run a command as a service.''' |
|
470 | '''Run a command as a service.''' | |
471 |
|
471 | |||
472 | def writepid(pid): |
|
472 | def writepid(pid): | |
473 | if opts['pid_file']: |
|
473 | if opts['pid_file']: | |
474 | mode = appendpid and 'a' or 'w' |
|
474 | mode = appendpid and 'a' or 'w' | |
475 | fp = open(opts['pid_file'], mode) |
|
475 | fp = open(opts['pid_file'], mode) | |
476 | fp.write(str(pid) + '\n') |
|
476 | fp.write(str(pid) + '\n') | |
477 | fp.close() |
|
477 | fp.close() | |
478 |
|
478 | |||
479 | if opts['daemon'] and not opts['daemon_pipefds']: |
|
479 | if opts['daemon'] and not opts['daemon_pipefds']: | |
480 | # Signal child process startup with file removal |
|
480 | # Signal child process startup with file removal | |
481 | lockfd, lockpath = tempfile.mkstemp(prefix='hg-service-') |
|
481 | lockfd, lockpath = tempfile.mkstemp(prefix='hg-service-') | |
482 | os.close(lockfd) |
|
482 | os.close(lockfd) | |
483 | try: |
|
483 | try: | |
484 | if not runargs: |
|
484 | if not runargs: | |
485 | runargs = util.hgcmd() + sys.argv[1:] |
|
485 | runargs = util.hgcmd() + sys.argv[1:] | |
486 | runargs.append('--daemon-pipefds=%s' % lockpath) |
|
486 | runargs.append('--daemon-pipefds=%s' % lockpath) | |
487 | # Don't pass --cwd to the child process, because we've already |
|
487 | # Don't pass --cwd to the child process, because we've already | |
488 | # changed directory. |
|
488 | # changed directory. | |
489 | for i in xrange(1, len(runargs)): |
|
489 | for i in xrange(1, len(runargs)): | |
490 | if runargs[i].startswith('--cwd='): |
|
490 | if runargs[i].startswith('--cwd='): | |
491 | del runargs[i] |
|
491 | del runargs[i] | |
492 | break |
|
492 | break | |
493 | elif runargs[i].startswith('--cwd'): |
|
493 | elif runargs[i].startswith('--cwd'): | |
494 | del runargs[i:i + 2] |
|
494 | del runargs[i:i + 2] | |
495 | break |
|
495 | break | |
496 | def condfn(): |
|
496 | def condfn(): | |
497 | return not os.path.exists(lockpath) |
|
497 | return not os.path.exists(lockpath) | |
498 | pid = util.rundetached(runargs, condfn) |
|
498 | pid = util.rundetached(runargs, condfn) | |
499 | if pid < 0: |
|
499 | if pid < 0: | |
500 | raise util.Abort(_('child process failed to start')) |
|
500 | raise util.Abort(_('child process failed to start')) | |
501 | writepid(pid) |
|
501 | writepid(pid) | |
502 | finally: |
|
502 | finally: | |
503 | try: |
|
503 | try: | |
504 | os.unlink(lockpath) |
|
504 | os.unlink(lockpath) | |
505 | except OSError, e: |
|
505 | except OSError, e: | |
506 | if e.errno != errno.ENOENT: |
|
506 | if e.errno != errno.ENOENT: | |
507 | raise |
|
507 | raise | |
508 | if parentfn: |
|
508 | if parentfn: | |
509 | return parentfn(pid) |
|
509 | return parentfn(pid) | |
510 | else: |
|
510 | else: | |
511 | return |
|
511 | return | |
512 |
|
512 | |||
513 | if initfn: |
|
513 | if initfn: | |
514 | initfn() |
|
514 | initfn() | |
515 |
|
515 | |||
516 | if not opts['daemon']: |
|
516 | if not opts['daemon']: | |
517 | writepid(os.getpid()) |
|
517 | writepid(os.getpid()) | |
518 |
|
518 | |||
519 | if opts['daemon_pipefds']: |
|
519 | if opts['daemon_pipefds']: | |
520 | lockpath = opts['daemon_pipefds'] |
|
520 | lockpath = opts['daemon_pipefds'] | |
521 | try: |
|
521 | try: | |
522 | os.setsid() |
|
522 | os.setsid() | |
523 | except AttributeError: |
|
523 | except AttributeError: | |
524 | pass |
|
524 | pass | |
525 | os.unlink(lockpath) |
|
525 | os.unlink(lockpath) | |
526 | util.hidewindow() |
|
526 | util.hidewindow() | |
527 | sys.stdout.flush() |
|
527 | sys.stdout.flush() | |
528 | sys.stderr.flush() |
|
528 | sys.stderr.flush() | |
529 |
|
529 | |||
530 | nullfd = os.open(os.devnull, os.O_RDWR) |
|
530 | nullfd = os.open(os.devnull, os.O_RDWR) | |
531 | logfilefd = nullfd |
|
531 | logfilefd = nullfd | |
532 | if logfile: |
|
532 | if logfile: | |
533 | logfilefd = os.open(logfile, os.O_RDWR | os.O_CREAT | os.O_APPEND) |
|
533 | logfilefd = os.open(logfile, os.O_RDWR | os.O_CREAT | os.O_APPEND) | |
534 | os.dup2(nullfd, 0) |
|
534 | os.dup2(nullfd, 0) | |
535 | os.dup2(logfilefd, 1) |
|
535 | os.dup2(logfilefd, 1) | |
536 | os.dup2(logfilefd, 2) |
|
536 | os.dup2(logfilefd, 2) | |
537 | if nullfd not in (0, 1, 2): |
|
537 | if nullfd not in (0, 1, 2): | |
538 | os.close(nullfd) |
|
538 | os.close(nullfd) | |
539 | if logfile and logfilefd not in (0, 1, 2): |
|
539 | if logfile and logfilefd not in (0, 1, 2): | |
540 | os.close(logfilefd) |
|
540 | os.close(logfilefd) | |
541 |
|
541 | |||
542 | if runfn: |
|
542 | if runfn: | |
543 | return runfn() |
|
543 | return runfn() | |
544 |
|
544 | |||
545 | def tryimportone(ui, repo, hunk, parents, opts, msgs, updatefunc): |
|
545 | def tryimportone(ui, repo, hunk, parents, opts, msgs, updatefunc): | |
546 | """Utility function used by commands.import to import a single patch |
|
546 | """Utility function used by commands.import to import a single patch | |
547 |
|
547 | |||
548 | This function is explicitly defined here to help the evolve extension to |
|
548 | This function is explicitly defined here to help the evolve extension to | |
549 | wrap this part of the import logic. |
|
549 | wrap this part of the import logic. | |
550 |
|
550 | |||
551 | The API is currently a bit ugly because it a simple code translation from |
|
551 | The API is currently a bit ugly because it a simple code translation from | |
552 | the import command. Feel free to make it better. |
|
552 | the import command. Feel free to make it better. | |
553 |
|
553 | |||
554 | :hunk: a patch (as a binary string) |
|
554 | :hunk: a patch (as a binary string) | |
555 | :parents: nodes that will be parent of the created commit |
|
555 | :parents: nodes that will be parent of the created commit | |
556 | :opts: the full dict of option passed to the import command |
|
556 | :opts: the full dict of option passed to the import command | |
557 | :msgs: list to save commit message to. |
|
557 | :msgs: list to save commit message to. | |
558 | (used in case we need to save it when failing) |
|
558 | (used in case we need to save it when failing) | |
559 | :updatefunc: a function that update a repo to a given node |
|
559 | :updatefunc: a function that update a repo to a given node | |
560 | updatefunc(<repo>, <node>) |
|
560 | updatefunc(<repo>, <node>) | |
561 | """ |
|
561 | """ | |
562 | tmpname, message, user, date, branch, nodeid, p1, p2 = \ |
|
562 | tmpname, message, user, date, branch, nodeid, p1, p2 = \ | |
563 | patch.extract(ui, hunk) |
|
563 | patch.extract(ui, hunk) | |
564 |
|
564 | |||
565 | editor = commiteditor |
|
565 | editor = commiteditor | |
566 | if opts.get('edit'): |
|
566 | if opts.get('edit'): | |
567 | editor = commitforceeditor |
|
567 | editor = commitforceeditor | |
568 | update = not opts.get('bypass') |
|
568 | update = not opts.get('bypass') | |
569 | strip = opts["strip"] |
|
569 | strip = opts["strip"] | |
570 | sim = float(opts.get('similarity') or 0) |
|
570 | sim = float(opts.get('similarity') or 0) | |
571 | if not tmpname: |
|
571 | if not tmpname: | |
572 | return (None, None) |
|
572 | return (None, None) | |
573 | msg = _('applied to working directory') |
|
573 | msg = _('applied to working directory') | |
574 |
|
574 | |||
575 | try: |
|
575 | try: | |
576 | cmdline_message = logmessage(ui, opts) |
|
576 | cmdline_message = logmessage(ui, opts) | |
577 | if cmdline_message: |
|
577 | if cmdline_message: | |
578 | # pickup the cmdline msg |
|
578 | # pickup the cmdline msg | |
579 | message = cmdline_message |
|
579 | message = cmdline_message | |
580 | elif message: |
|
580 | elif message: | |
581 | # pickup the patch msg |
|
581 | # pickup the patch msg | |
582 | message = message.strip() |
|
582 | message = message.strip() | |
583 | else: |
|
583 | else: | |
584 | # launch the editor |
|
584 | # launch the editor | |
585 | message = None |
|
585 | message = None | |
586 | ui.debug('message:\n%s\n' % message) |
|
586 | ui.debug('message:\n%s\n' % message) | |
587 |
|
587 | |||
588 | if len(parents) == 1: |
|
588 | if len(parents) == 1: | |
589 | parents.append(repo[nullid]) |
|
589 | parents.append(repo[nullid]) | |
590 | if opts.get('exact'): |
|
590 | if opts.get('exact'): | |
591 | if not nodeid or not p1: |
|
591 | if not nodeid or not p1: | |
592 | raise util.Abort(_('not a Mercurial patch')) |
|
592 | raise util.Abort(_('not a Mercurial patch')) | |
593 | p1 = repo[p1] |
|
593 | p1 = repo[p1] | |
594 | p2 = repo[p2 or nullid] |
|
594 | p2 = repo[p2 or nullid] | |
595 | elif p2: |
|
595 | elif p2: | |
596 | try: |
|
596 | try: | |
597 | p1 = repo[p1] |
|
597 | p1 = repo[p1] | |
598 | p2 = repo[p2] |
|
598 | p2 = repo[p2] | |
599 | # Without any options, consider p2 only if the |
|
599 | # Without any options, consider p2 only if the | |
600 | # patch is being applied on top of the recorded |
|
600 | # patch is being applied on top of the recorded | |
601 | # first parent. |
|
601 | # first parent. | |
602 | if p1 != parents[0]: |
|
602 | if p1 != parents[0]: | |
603 | p1 = parents[0] |
|
603 | p1 = parents[0] | |
604 | p2 = repo[nullid] |
|
604 | p2 = repo[nullid] | |
605 | except error.RepoError: |
|
605 | except error.RepoError: | |
606 | p1, p2 = parents |
|
606 | p1, p2 = parents | |
607 | else: |
|
607 | else: | |
608 | p1, p2 = parents |
|
608 | p1, p2 = parents | |
609 |
|
609 | |||
610 | n = None |
|
610 | n = None | |
611 | if update: |
|
611 | if update: | |
612 | if p1 != parents[0]: |
|
612 | if p1 != parents[0]: | |
613 | updatefunc(repo, p1.node()) |
|
613 | updatefunc(repo, p1.node()) | |
614 | if p2 != parents[1]: |
|
614 | if p2 != parents[1]: | |
615 | repo.setparents(p1.node(), p2.node()) |
|
615 | repo.setparents(p1.node(), p2.node()) | |
616 |
|
616 | |||
617 | if opts.get('exact') or opts.get('import_branch'): |
|
617 | if opts.get('exact') or opts.get('import_branch'): | |
618 | repo.dirstate.setbranch(branch or 'default') |
|
618 | repo.dirstate.setbranch(branch or 'default') | |
619 |
|
619 | |||
620 | files = set() |
|
620 | files = set() | |
621 | patch.patch(ui, repo, tmpname, strip=strip, files=files, |
|
621 | patch.patch(ui, repo, tmpname, strip=strip, files=files, | |
622 | eolmode=None, similarity=sim / 100.0) |
|
622 | eolmode=None, similarity=sim / 100.0) | |
623 | files = list(files) |
|
623 | files = list(files) | |
624 | if opts.get('no_commit'): |
|
624 | if opts.get('no_commit'): | |
625 | if message: |
|
625 | if message: | |
626 | msgs.append(message) |
|
626 | msgs.append(message) | |
627 | else: |
|
627 | else: | |
628 | if opts.get('exact') or p2: |
|
628 | if opts.get('exact') or p2: | |
629 | # If you got here, you either use --force and know what |
|
629 | # If you got here, you either use --force and know what | |
630 | # you are doing or used --exact or a merge patch while |
|
630 | # you are doing or used --exact or a merge patch while | |
631 | # being updated to its first parent. |
|
631 | # being updated to its first parent. | |
632 | m = None |
|
632 | m = None | |
633 | else: |
|
633 | else: | |
634 | m = scmutil.matchfiles(repo, files or []) |
|
634 | m = scmutil.matchfiles(repo, files or []) | |
635 | n = repo.commit(message, opts.get('user') or user, |
|
635 | n = repo.commit(message, opts.get('user') or user, | |
636 | opts.get('date') or date, match=m, |
|
636 | opts.get('date') or date, match=m, | |
637 | editor=editor) |
|
637 | editor=editor) | |
638 | else: |
|
638 | else: | |
639 | if opts.get('exact') or opts.get('import_branch'): |
|
639 | if opts.get('exact') or opts.get('import_branch'): | |
640 | branch = branch or 'default' |
|
640 | branch = branch or 'default' | |
641 | else: |
|
641 | else: | |
642 | branch = p1.branch() |
|
642 | branch = p1.branch() | |
643 | store = patch.filestore() |
|
643 | store = patch.filestore() | |
644 | try: |
|
644 | try: | |
645 | files = set() |
|
645 | files = set() | |
646 | try: |
|
646 | try: | |
647 | patch.patchrepo(ui, repo, p1, store, tmpname, strip, |
|
647 | patch.patchrepo(ui, repo, p1, store, tmpname, strip, | |
648 | files, eolmode=None) |
|
648 | files, eolmode=None) | |
649 | except patch.PatchError, e: |
|
649 | except patch.PatchError, e: | |
650 | raise util.Abort(str(e)) |
|
650 | raise util.Abort(str(e)) | |
651 | memctx = context.makememctx(repo, (p1.node(), p2.node()), |
|
651 | memctx = context.makememctx(repo, (p1.node(), p2.node()), | |
652 | message, |
|
652 | message, | |
653 | opts.get('user') or user, |
|
653 | opts.get('user') or user, | |
654 | opts.get('date') or date, |
|
654 | opts.get('date') or date, | |
655 | branch, files, store, |
|
655 | branch, files, store, | |
656 | editor=commiteditor) |
|
656 | editor=commiteditor) | |
657 | repo.savecommitmessage(memctx.description()) |
|
657 | repo.savecommitmessage(memctx.description()) | |
658 | n = memctx.commit() |
|
658 | n = memctx.commit() | |
659 | finally: |
|
659 | finally: | |
660 | store.close() |
|
660 | store.close() | |
661 | if opts.get('exact') and hex(n) != nodeid: |
|
661 | if opts.get('exact') and hex(n) != nodeid: | |
662 | raise util.Abort(_('patch is damaged or loses information')) |
|
662 | raise util.Abort(_('patch is damaged or loses information')) | |
663 | if n: |
|
663 | if n: | |
664 | # i18n: refers to a short changeset id |
|
664 | # i18n: refers to a short changeset id | |
665 | msg = _('created %s') % short(n) |
|
665 | msg = _('created %s') % short(n) | |
666 | return (msg, n) |
|
666 | return (msg, n) | |
667 | finally: |
|
667 | finally: | |
668 | os.unlink(tmpname) |
|
668 | os.unlink(tmpname) | |
669 |
|
669 | |||
670 | def export(repo, revs, template='hg-%h.patch', fp=None, switch_parent=False, |
|
670 | def export(repo, revs, template='hg-%h.patch', fp=None, switch_parent=False, | |
671 | opts=None): |
|
671 | opts=None): | |
672 | '''export changesets as hg patches.''' |
|
672 | '''export changesets as hg patches.''' | |
673 |
|
673 | |||
674 | total = len(revs) |
|
674 | total = len(revs) | |
675 | revwidth = max([len(str(rev)) for rev in revs]) |
|
675 | revwidth = max([len(str(rev)) for rev in revs]) | |
676 | filemode = {} |
|
676 | filemode = {} | |
677 |
|
677 | |||
678 | def single(rev, seqno, fp): |
|
678 | def single(rev, seqno, fp): | |
679 | ctx = repo[rev] |
|
679 | ctx = repo[rev] | |
680 | node = ctx.node() |
|
680 | node = ctx.node() | |
681 | parents = [p.node() for p in ctx.parents() if p] |
|
681 | parents = [p.node() for p in ctx.parents() if p] | |
682 | branch = ctx.branch() |
|
682 | branch = ctx.branch() | |
683 | if switch_parent: |
|
683 | if switch_parent: | |
684 | parents.reverse() |
|
684 | parents.reverse() | |
685 | prev = (parents and parents[0]) or nullid |
|
685 | prev = (parents and parents[0]) or nullid | |
686 |
|
686 | |||
687 | shouldclose = False |
|
687 | shouldclose = False | |
688 | if not fp and len(template) > 0: |
|
688 | if not fp and len(template) > 0: | |
689 | desc_lines = ctx.description().rstrip().split('\n') |
|
689 | desc_lines = ctx.description().rstrip().split('\n') | |
690 | desc = desc_lines[0] #Commit always has a first line. |
|
690 | desc = desc_lines[0] #Commit always has a first line. | |
691 | fp = makefileobj(repo, template, node, desc=desc, total=total, |
|
691 | fp = makefileobj(repo, template, node, desc=desc, total=total, | |
692 | seqno=seqno, revwidth=revwidth, mode='wb', |
|
692 | seqno=seqno, revwidth=revwidth, mode='wb', | |
693 | modemap=filemode) |
|
693 | modemap=filemode) | |
694 | if fp != template: |
|
694 | if fp != template: | |
695 | shouldclose = True |
|
695 | shouldclose = True | |
696 | if fp and fp != sys.stdout and util.safehasattr(fp, 'name'): |
|
696 | if fp and fp != sys.stdout and util.safehasattr(fp, 'name'): | |
697 | repo.ui.note("%s\n" % fp.name) |
|
697 | repo.ui.note("%s\n" % fp.name) | |
698 |
|
698 | |||
699 | if not fp: |
|
699 | if not fp: | |
700 | write = repo.ui.write |
|
700 | write = repo.ui.write | |
701 | else: |
|
701 | else: | |
702 | def write(s, **kw): |
|
702 | def write(s, **kw): | |
703 | fp.write(s) |
|
703 | fp.write(s) | |
704 |
|
704 | |||
705 |
|
705 | |||
706 | write("# HG changeset patch\n") |
|
706 | write("# HG changeset patch\n") | |
707 | write("# User %s\n" % ctx.user()) |
|
707 | write("# User %s\n" % ctx.user()) | |
708 | write("# Date %d %d\n" % ctx.date()) |
|
708 | write("# Date %d %d\n" % ctx.date()) | |
709 | write("# %s\n" % util.datestr(ctx.date())) |
|
709 | write("# %s\n" % util.datestr(ctx.date())) | |
710 | if branch and branch != 'default': |
|
710 | if branch and branch != 'default': | |
711 | write("# Branch %s\n" % branch) |
|
711 | write("# Branch %s\n" % branch) | |
712 | write("# Node ID %s\n" % hex(node)) |
|
712 | write("# Node ID %s\n" % hex(node)) | |
713 | write("# Parent %s\n" % hex(prev)) |
|
713 | write("# Parent %s\n" % hex(prev)) | |
714 | if len(parents) > 1: |
|
714 | if len(parents) > 1: | |
715 | write("# Parent %s\n" % hex(parents[1])) |
|
715 | write("# Parent %s\n" % hex(parents[1])) | |
716 | write(ctx.description().rstrip()) |
|
716 | write(ctx.description().rstrip()) | |
717 | write("\n\n") |
|
717 | write("\n\n") | |
718 |
|
718 | |||
719 | for chunk, label in patch.diffui(repo, prev, node, opts=opts): |
|
719 | for chunk, label in patch.diffui(repo, prev, node, opts=opts): | |
720 | write(chunk, label=label) |
|
720 | write(chunk, label=label) | |
721 |
|
721 | |||
722 | if shouldclose: |
|
722 | if shouldclose: | |
723 | fp.close() |
|
723 | fp.close() | |
724 |
|
724 | |||
725 | for seqno, rev in enumerate(revs): |
|
725 | for seqno, rev in enumerate(revs): | |
726 | single(rev, seqno + 1, fp) |
|
726 | single(rev, seqno + 1, fp) | |
727 |
|
727 | |||
728 | def diffordiffstat(ui, repo, diffopts, node1, node2, match, |
|
728 | def diffordiffstat(ui, repo, diffopts, node1, node2, match, | |
729 | changes=None, stat=False, fp=None, prefix='', |
|
729 | changes=None, stat=False, fp=None, prefix='', | |
730 | listsubrepos=False): |
|
730 | listsubrepos=False): | |
731 | '''show diff or diffstat.''' |
|
731 | '''show diff or diffstat.''' | |
732 | if fp is None: |
|
732 | if fp is None: | |
733 | write = ui.write |
|
733 | write = ui.write | |
734 | else: |
|
734 | else: | |
735 | def write(s, **kw): |
|
735 | def write(s, **kw): | |
736 | fp.write(s) |
|
736 | fp.write(s) | |
737 |
|
737 | |||
738 | if stat: |
|
738 | if stat: | |
739 | diffopts = diffopts.copy(context=0) |
|
739 | diffopts = diffopts.copy(context=0) | |
740 | width = 80 |
|
740 | width = 80 | |
741 | if not ui.plain(): |
|
741 | if not ui.plain(): | |
742 | width = ui.termwidth() |
|
742 | width = ui.termwidth() | |
743 | chunks = patch.diff(repo, node1, node2, match, changes, diffopts, |
|
743 | chunks = patch.diff(repo, node1, node2, match, changes, diffopts, | |
744 | prefix=prefix) |
|
744 | prefix=prefix) | |
745 | for chunk, label in patch.diffstatui(util.iterlines(chunks), |
|
745 | for chunk, label in patch.diffstatui(util.iterlines(chunks), | |
746 | width=width, |
|
746 | width=width, | |
747 | git=diffopts.git): |
|
747 | git=diffopts.git): | |
748 | write(chunk, label=label) |
|
748 | write(chunk, label=label) | |
749 | else: |
|
749 | else: | |
750 | for chunk, label in patch.diffui(repo, node1, node2, match, |
|
750 | for chunk, label in patch.diffui(repo, node1, node2, match, | |
751 | changes, diffopts, prefix=prefix): |
|
751 | changes, diffopts, prefix=prefix): | |
752 | write(chunk, label=label) |
|
752 | write(chunk, label=label) | |
753 |
|
753 | |||
754 | if listsubrepos: |
|
754 | if listsubrepos: | |
755 | ctx1 = repo[node1] |
|
755 | ctx1 = repo[node1] | |
756 | ctx2 = repo[node2] |
|
756 | ctx2 = repo[node2] | |
757 | for subpath, sub in scmutil.itersubrepos(ctx1, ctx2): |
|
757 | for subpath, sub in scmutil.itersubrepos(ctx1, ctx2): | |
758 | tempnode2 = node2 |
|
758 | tempnode2 = node2 | |
759 | try: |
|
759 | try: | |
760 | if node2 is not None: |
|
760 | if node2 is not None: | |
761 | tempnode2 = ctx2.substate[subpath][1] |
|
761 | tempnode2 = ctx2.substate[subpath][1] | |
762 | except KeyError: |
|
762 | except KeyError: | |
763 | # A subrepo that existed in node1 was deleted between node1 and |
|
763 | # A subrepo that existed in node1 was deleted between node1 and | |
764 | # node2 (inclusive). Thus, ctx2's substate won't contain that |
|
764 | # node2 (inclusive). Thus, ctx2's substate won't contain that | |
765 | # subpath. The best we can do is to ignore it. |
|
765 | # subpath. The best we can do is to ignore it. | |
766 | tempnode2 = None |
|
766 | tempnode2 = None | |
767 | submatch = matchmod.narrowmatcher(subpath, match) |
|
767 | submatch = matchmod.narrowmatcher(subpath, match) | |
768 | sub.diff(ui, diffopts, tempnode2, submatch, changes=changes, |
|
768 | sub.diff(ui, diffopts, tempnode2, submatch, changes=changes, | |
769 | stat=stat, fp=fp, prefix=prefix) |
|
769 | stat=stat, fp=fp, prefix=prefix) | |
770 |
|
770 | |||
771 | class changeset_printer(object): |
|
771 | class changeset_printer(object): | |
772 | '''show changeset information when templating not requested.''' |
|
772 | '''show changeset information when templating not requested.''' | |
773 |
|
773 | |||
774 | def __init__(self, ui, repo, patch, diffopts, buffered): |
|
774 | def __init__(self, ui, repo, patch, diffopts, buffered): | |
775 | self.ui = ui |
|
775 | self.ui = ui | |
776 | self.repo = repo |
|
776 | self.repo = repo | |
777 | self.buffered = buffered |
|
777 | self.buffered = buffered | |
778 | self.patch = patch |
|
778 | self.patch = patch | |
779 | self.diffopts = diffopts |
|
779 | self.diffopts = diffopts | |
780 | self.header = {} |
|
780 | self.header = {} | |
781 | self.hunk = {} |
|
781 | self.hunk = {} | |
782 | self.lastheader = None |
|
782 | self.lastheader = None | |
783 | self.footer = None |
|
783 | self.footer = None | |
784 |
|
784 | |||
785 | def flush(self, rev): |
|
785 | def flush(self, rev): | |
786 | if rev in self.header: |
|
786 | if rev in self.header: | |
787 | h = self.header[rev] |
|
787 | h = self.header[rev] | |
788 | if h != self.lastheader: |
|
788 | if h != self.lastheader: | |
789 | self.lastheader = h |
|
789 | self.lastheader = h | |
790 | self.ui.write(h) |
|
790 | self.ui.write(h) | |
791 | del self.header[rev] |
|
791 | del self.header[rev] | |
792 | if rev in self.hunk: |
|
792 | if rev in self.hunk: | |
793 | self.ui.write(self.hunk[rev]) |
|
793 | self.ui.write(self.hunk[rev]) | |
794 | del self.hunk[rev] |
|
794 | del self.hunk[rev] | |
795 | return 1 |
|
795 | return 1 | |
796 | return 0 |
|
796 | return 0 | |
797 |
|
797 | |||
798 | def close(self): |
|
798 | def close(self): | |
799 | if self.footer: |
|
799 | if self.footer: | |
800 | self.ui.write(self.footer) |
|
800 | self.ui.write(self.footer) | |
801 |
|
801 | |||
802 | def show(self, ctx, copies=None, matchfn=None, **props): |
|
802 | def show(self, ctx, copies=None, matchfn=None, **props): | |
803 | if self.buffered: |
|
803 | if self.buffered: | |
804 | self.ui.pushbuffer() |
|
804 | self.ui.pushbuffer() | |
805 | self._show(ctx, copies, matchfn, props) |
|
805 | self._show(ctx, copies, matchfn, props) | |
806 | self.hunk[ctx.rev()] = self.ui.popbuffer(labeled=True) |
|
806 | self.hunk[ctx.rev()] = self.ui.popbuffer(labeled=True) | |
807 | else: |
|
807 | else: | |
808 | self._show(ctx, copies, matchfn, props) |
|
808 | self._show(ctx, copies, matchfn, props) | |
809 |
|
809 | |||
810 | def _show(self, ctx, copies, matchfn, props): |
|
810 | def _show(self, ctx, copies, matchfn, props): | |
811 | '''show a single changeset or file revision''' |
|
811 | '''show a single changeset or file revision''' | |
812 | changenode = ctx.node() |
|
812 | changenode = ctx.node() | |
813 | rev = ctx.rev() |
|
813 | rev = ctx.rev() | |
814 |
|
814 | |||
815 | if self.ui.quiet: |
|
815 | if self.ui.quiet: | |
816 | self.ui.write("%d:%s\n" % (rev, short(changenode)), |
|
816 | self.ui.write("%d:%s\n" % (rev, short(changenode)), | |
817 | label='log.node') |
|
817 | label='log.node') | |
818 | return |
|
818 | return | |
819 |
|
819 | |||
820 | log = self.repo.changelog |
|
820 | log = self.repo.changelog | |
821 | date = util.datestr(ctx.date()) |
|
821 | date = util.datestr(ctx.date()) | |
822 |
|
822 | |||
823 | hexfunc = self.ui.debugflag and hex or short |
|
823 | hexfunc = self.ui.debugflag and hex or short | |
824 |
|
824 | |||
825 | parents = [(p, hexfunc(log.node(p))) |
|
825 | parents = [(p, hexfunc(log.node(p))) | |
826 | for p in self._meaningful_parentrevs(log, rev)] |
|
826 | for p in self._meaningful_parentrevs(log, rev)] | |
827 |
|
827 | |||
828 | # i18n: column positioning for "hg log" |
|
828 | # i18n: column positioning for "hg log" | |
829 | self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode)), |
|
829 | self.ui.write(_("changeset: %d:%s\n") % (rev, hexfunc(changenode)), | |
830 | label='log.changeset changeset.%s' % ctx.phasestr()) |
|
830 | label='log.changeset changeset.%s' % ctx.phasestr()) | |
831 |
|
831 | |||
832 | branch = ctx.branch() |
|
832 | branch = ctx.branch() | |
833 | # don't show the default branch name |
|
833 | # don't show the default branch name | |
834 | if branch != 'default': |
|
834 | if branch != 'default': | |
835 | # i18n: column positioning for "hg log" |
|
835 | # i18n: column positioning for "hg log" | |
836 | self.ui.write(_("branch: %s\n") % branch, |
|
836 | self.ui.write(_("branch: %s\n") % branch, | |
837 | label='log.branch') |
|
837 | label='log.branch') | |
838 | for bookmark in self.repo.nodebookmarks(changenode): |
|
838 | for bookmark in self.repo.nodebookmarks(changenode): | |
839 | # i18n: column positioning for "hg log" |
|
839 | # i18n: column positioning for "hg log" | |
840 | self.ui.write(_("bookmark: %s\n") % bookmark, |
|
840 | self.ui.write(_("bookmark: %s\n") % bookmark, | |
841 | label='log.bookmark') |
|
841 | label='log.bookmark') | |
842 | for tag in self.repo.nodetags(changenode): |
|
842 | for tag in self.repo.nodetags(changenode): | |
843 | # i18n: column positioning for "hg log" |
|
843 | # i18n: column positioning for "hg log" | |
844 | self.ui.write(_("tag: %s\n") % tag, |
|
844 | self.ui.write(_("tag: %s\n") % tag, | |
845 | label='log.tag') |
|
845 | label='log.tag') | |
846 | if self.ui.debugflag and ctx.phase(): |
|
846 | if self.ui.debugflag and ctx.phase(): | |
847 | # i18n: column positioning for "hg log" |
|
847 | # i18n: column positioning for "hg log" | |
848 | self.ui.write(_("phase: %s\n") % _(ctx.phasestr()), |
|
848 | self.ui.write(_("phase: %s\n") % _(ctx.phasestr()), | |
849 | label='log.phase') |
|
849 | label='log.phase') | |
850 | for parent in parents: |
|
850 | for parent in parents: | |
851 | # i18n: column positioning for "hg log" |
|
851 | # i18n: column positioning for "hg log" | |
852 | self.ui.write(_("parent: %d:%s\n") % parent, |
|
852 | self.ui.write(_("parent: %d:%s\n") % parent, | |
853 | label='log.parent changeset.%s' % ctx.phasestr()) |
|
853 | label='log.parent changeset.%s' % ctx.phasestr()) | |
854 |
|
854 | |||
855 | if self.ui.debugflag: |
|
855 | if self.ui.debugflag: | |
856 | mnode = ctx.manifestnode() |
|
856 | mnode = ctx.manifestnode() | |
857 | # i18n: column positioning for "hg log" |
|
857 | # i18n: column positioning for "hg log" | |
858 | self.ui.write(_("manifest: %d:%s\n") % |
|
858 | self.ui.write(_("manifest: %d:%s\n") % | |
859 | (self.repo.manifest.rev(mnode), hex(mnode)), |
|
859 | (self.repo.manifest.rev(mnode), hex(mnode)), | |
860 | label='ui.debug log.manifest') |
|
860 | label='ui.debug log.manifest') | |
861 | # i18n: column positioning for "hg log" |
|
861 | # i18n: column positioning for "hg log" | |
862 | self.ui.write(_("user: %s\n") % ctx.user(), |
|
862 | self.ui.write(_("user: %s\n") % ctx.user(), | |
863 | label='log.user') |
|
863 | label='log.user') | |
864 | # i18n: column positioning for "hg log" |
|
864 | # i18n: column positioning for "hg log" | |
865 | self.ui.write(_("date: %s\n") % date, |
|
865 | self.ui.write(_("date: %s\n") % date, | |
866 | label='log.date') |
|
866 | label='log.date') | |
867 |
|
867 | |||
868 | if self.ui.debugflag: |
|
868 | if self.ui.debugflag: | |
869 | files = self.repo.status(log.parents(changenode)[0], changenode)[:3] |
|
869 | files = self.repo.status(log.parents(changenode)[0], changenode)[:3] | |
870 | for key, value in zip([# i18n: column positioning for "hg log" |
|
870 | for key, value in zip([# i18n: column positioning for "hg log" | |
871 | _("files:"), |
|
871 | _("files:"), | |
872 | # i18n: column positioning for "hg log" |
|
872 | # i18n: column positioning for "hg log" | |
873 | _("files+:"), |
|
873 | _("files+:"), | |
874 | # i18n: column positioning for "hg log" |
|
874 | # i18n: column positioning for "hg log" | |
875 | _("files-:")], files): |
|
875 | _("files-:")], files): | |
876 | if value: |
|
876 | if value: | |
877 | self.ui.write("%-12s %s\n" % (key, " ".join(value)), |
|
877 | self.ui.write("%-12s %s\n" % (key, " ".join(value)), | |
878 | label='ui.debug log.files') |
|
878 | label='ui.debug log.files') | |
879 | elif ctx.files() and self.ui.verbose: |
|
879 | elif ctx.files() and self.ui.verbose: | |
880 | # i18n: column positioning for "hg log" |
|
880 | # i18n: column positioning for "hg log" | |
881 | self.ui.write(_("files: %s\n") % " ".join(ctx.files()), |
|
881 | self.ui.write(_("files: %s\n") % " ".join(ctx.files()), | |
882 | label='ui.note log.files') |
|
882 | label='ui.note log.files') | |
883 | if copies and self.ui.verbose: |
|
883 | if copies and self.ui.verbose: | |
884 | copies = ['%s (%s)' % c for c in copies] |
|
884 | copies = ['%s (%s)' % c for c in copies] | |
885 | # i18n: column positioning for "hg log" |
|
885 | # i18n: column positioning for "hg log" | |
886 | self.ui.write(_("copies: %s\n") % ' '.join(copies), |
|
886 | self.ui.write(_("copies: %s\n") % ' '.join(copies), | |
887 | label='ui.note log.copies') |
|
887 | label='ui.note log.copies') | |
888 |
|
888 | |||
889 | extra = ctx.extra() |
|
889 | extra = ctx.extra() | |
890 | if extra and self.ui.debugflag: |
|
890 | if extra and self.ui.debugflag: | |
891 | for key, value in sorted(extra.items()): |
|
891 | for key, value in sorted(extra.items()): | |
892 | # i18n: column positioning for "hg log" |
|
892 | # i18n: column positioning for "hg log" | |
893 | self.ui.write(_("extra: %s=%s\n") |
|
893 | self.ui.write(_("extra: %s=%s\n") | |
894 | % (key, value.encode('string_escape')), |
|
894 | % (key, value.encode('string_escape')), | |
895 | label='ui.debug log.extra') |
|
895 | label='ui.debug log.extra') | |
896 |
|
896 | |||
897 | description = ctx.description().strip() |
|
897 | description = ctx.description().strip() | |
898 | if description: |
|
898 | if description: | |
899 | if self.ui.verbose: |
|
899 | if self.ui.verbose: | |
900 | self.ui.write(_("description:\n"), |
|
900 | self.ui.write(_("description:\n"), | |
901 | label='ui.note log.description') |
|
901 | label='ui.note log.description') | |
902 | self.ui.write(description, |
|
902 | self.ui.write(description, | |
903 | label='ui.note log.description') |
|
903 | label='ui.note log.description') | |
904 | self.ui.write("\n\n") |
|
904 | self.ui.write("\n\n") | |
905 | else: |
|
905 | else: | |
906 | # i18n: column positioning for "hg log" |
|
906 | # i18n: column positioning for "hg log" | |
907 | self.ui.write(_("summary: %s\n") % |
|
907 | self.ui.write(_("summary: %s\n") % | |
908 | description.splitlines()[0], |
|
908 | description.splitlines()[0], | |
909 | label='log.summary') |
|
909 | label='log.summary') | |
910 | self.ui.write("\n") |
|
910 | self.ui.write("\n") | |
911 |
|
911 | |||
912 | self.showpatch(changenode, matchfn) |
|
912 | self.showpatch(changenode, matchfn) | |
913 |
|
913 | |||
914 | def showpatch(self, node, matchfn): |
|
914 | def showpatch(self, node, matchfn): | |
915 | if not matchfn: |
|
915 | if not matchfn: | |
916 | matchfn = self.patch |
|
916 | matchfn = self.patch | |
917 | if matchfn: |
|
917 | if matchfn: | |
918 | stat = self.diffopts.get('stat') |
|
918 | stat = self.diffopts.get('stat') | |
919 | diff = self.diffopts.get('patch') |
|
919 | diff = self.diffopts.get('patch') | |
920 | diffopts = patch.diffopts(self.ui, self.diffopts) |
|
920 | diffopts = patch.diffopts(self.ui, self.diffopts) | |
921 | prev = self.repo.changelog.parents(node)[0] |
|
921 | prev = self.repo.changelog.parents(node)[0] | |
922 | if stat: |
|
922 | if stat: | |
923 | diffordiffstat(self.ui, self.repo, diffopts, prev, node, |
|
923 | diffordiffstat(self.ui, self.repo, diffopts, prev, node, | |
924 | match=matchfn, stat=True) |
|
924 | match=matchfn, stat=True) | |
925 | if diff: |
|
925 | if diff: | |
926 | if stat: |
|
926 | if stat: | |
927 | self.ui.write("\n") |
|
927 | self.ui.write("\n") | |
928 | diffordiffstat(self.ui, self.repo, diffopts, prev, node, |
|
928 | diffordiffstat(self.ui, self.repo, diffopts, prev, node, | |
929 | match=matchfn, stat=False) |
|
929 | match=matchfn, stat=False) | |
930 | self.ui.write("\n") |
|
930 | self.ui.write("\n") | |
931 |
|
931 | |||
932 | def _meaningful_parentrevs(self, log, rev): |
|
932 | def _meaningful_parentrevs(self, log, rev): | |
933 | """Return list of meaningful (or all if debug) parentrevs for rev. |
|
933 | """Return list of meaningful (or all if debug) parentrevs for rev. | |
934 |
|
934 | |||
935 | For merges (two non-nullrev revisions) both parents are meaningful. |
|
935 | For merges (two non-nullrev revisions) both parents are meaningful. | |
936 | Otherwise the first parent revision is considered meaningful if it |
|
936 | Otherwise the first parent revision is considered meaningful if it | |
937 | is not the preceding revision. |
|
937 | is not the preceding revision. | |
938 | """ |
|
938 | """ | |
939 | parents = log.parentrevs(rev) |
|
939 | parents = log.parentrevs(rev) | |
940 | if not self.ui.debugflag and parents[1] == nullrev: |
|
940 | if not self.ui.debugflag and parents[1] == nullrev: | |
941 | if parents[0] >= rev - 1: |
|
941 | if parents[0] >= rev - 1: | |
942 | parents = [] |
|
942 | parents = [] | |
943 | else: |
|
943 | else: | |
944 | parents = [parents[0]] |
|
944 | parents = [parents[0]] | |
945 | return parents |
|
945 | return parents | |
946 |
|
946 | |||
947 |
|
947 | |||
948 | class changeset_templater(changeset_printer): |
|
948 | class changeset_templater(changeset_printer): | |
949 | '''format changeset information.''' |
|
949 | '''format changeset information.''' | |
950 |
|
950 | |||
951 | def __init__(self, ui, repo, patch, diffopts, tmpl, mapfile, buffered): |
|
951 | def __init__(self, ui, repo, patch, diffopts, tmpl, mapfile, buffered): | |
952 | changeset_printer.__init__(self, ui, repo, patch, diffopts, buffered) |
|
952 | changeset_printer.__init__(self, ui, repo, patch, diffopts, buffered) | |
953 | formatnode = ui.debugflag and (lambda x: x) or (lambda x: x[:12]) |
|
953 | formatnode = ui.debugflag and (lambda x: x) or (lambda x: x[:12]) | |
954 | defaulttempl = { |
|
954 | defaulttempl = { | |
955 | 'parent': '{rev}:{node|formatnode} ', |
|
955 | 'parent': '{rev}:{node|formatnode} ', | |
956 | 'manifest': '{rev}:{node|formatnode}', |
|
956 | 'manifest': '{rev}:{node|formatnode}', | |
957 | 'file_copy': '{name} ({source})', |
|
957 | 'file_copy': '{name} ({source})', | |
958 | 'extra': '{key}={value|stringescape}' |
|
958 | 'extra': '{key}={value|stringescape}' | |
959 | } |
|
959 | } | |
960 | # filecopy is preserved for compatibility reasons |
|
960 | # filecopy is preserved for compatibility reasons | |
961 | defaulttempl['filecopy'] = defaulttempl['file_copy'] |
|
961 | defaulttempl['filecopy'] = defaulttempl['file_copy'] | |
962 | self.t = templater.templater(mapfile, {'formatnode': formatnode}, |
|
962 | self.t = templater.templater(mapfile, {'formatnode': formatnode}, | |
963 | cache=defaulttempl) |
|
963 | cache=defaulttempl) | |
964 | if tmpl: |
|
964 | if tmpl: | |
965 | self.t.cache['changeset'] = tmpl |
|
965 | self.t.cache['changeset'] = tmpl | |
966 |
|
966 | |||
967 | self.cache = {} |
|
967 | self.cache = {} | |
968 |
|
968 | |||
969 | def _meaningful_parentrevs(self, ctx): |
|
969 | def _meaningful_parentrevs(self, ctx): | |
970 | """Return list of meaningful (or all if debug) parentrevs for rev. |
|
970 | """Return list of meaningful (or all if debug) parentrevs for rev. | |
971 | """ |
|
971 | """ | |
972 | parents = ctx.parents() |
|
972 | parents = ctx.parents() | |
973 | if len(parents) > 1: |
|
973 | if len(parents) > 1: | |
974 | return parents |
|
974 | return parents | |
975 | if self.ui.debugflag: |
|
975 | if self.ui.debugflag: | |
976 | return [parents[0], self.repo['null']] |
|
976 | return [parents[0], self.repo['null']] | |
977 | if parents[0].rev() >= ctx.rev() - 1: |
|
977 | if parents[0].rev() >= ctx.rev() - 1: | |
978 | return [] |
|
978 | return [] | |
979 | return parents |
|
979 | return parents | |
980 |
|
980 | |||
981 | def _show(self, ctx, copies, matchfn, props): |
|
981 | def _show(self, ctx, copies, matchfn, props): | |
982 | '''show a single changeset or file revision''' |
|
982 | '''show a single changeset or file revision''' | |
983 |
|
983 | |||
984 | showlist = templatekw.showlist |
|
984 | showlist = templatekw.showlist | |
985 |
|
985 | |||
986 | # showparents() behaviour depends on ui trace level which |
|
986 | # showparents() behaviour depends on ui trace level which | |
987 | # causes unexpected behaviours at templating level and makes |
|
987 | # causes unexpected behaviours at templating level and makes | |
988 | # it harder to extract it in a standalone function. Its |
|
988 | # it harder to extract it in a standalone function. Its | |
989 | # behaviour cannot be changed so leave it here for now. |
|
989 | # behaviour cannot be changed so leave it here for now. | |
990 | def showparents(**args): |
|
990 | def showparents(**args): | |
991 | ctx = args['ctx'] |
|
991 | ctx = args['ctx'] | |
992 | parents = [[('rev', p.rev()), ('node', p.hex())] |
|
992 | parents = [[('rev', p.rev()), ('node', p.hex())] | |
993 | for p in self._meaningful_parentrevs(ctx)] |
|
993 | for p in self._meaningful_parentrevs(ctx)] | |
994 | return showlist('parent', parents, **args) |
|
994 | return showlist('parent', parents, **args) | |
995 |
|
995 | |||
996 | props = props.copy() |
|
996 | props = props.copy() | |
997 | props.update(templatekw.keywords) |
|
997 | props.update(templatekw.keywords) | |
998 | props['parents'] = showparents |
|
998 | props['parents'] = showparents | |
999 | props['templ'] = self.t |
|
999 | props['templ'] = self.t | |
1000 | props['ctx'] = ctx |
|
1000 | props['ctx'] = ctx | |
1001 | props['repo'] = self.repo |
|
1001 | props['repo'] = self.repo | |
1002 | props['revcache'] = {'copies': copies} |
|
1002 | props['revcache'] = {'copies': copies} | |
1003 | props['cache'] = self.cache |
|
1003 | props['cache'] = self.cache | |
1004 |
|
1004 | |||
1005 | # find correct templates for current mode |
|
1005 | # find correct templates for current mode | |
1006 |
|
1006 | |||
1007 | tmplmodes = [ |
|
1007 | tmplmodes = [ | |
1008 | (True, None), |
|
1008 | (True, None), | |
1009 | (self.ui.verbose, 'verbose'), |
|
1009 | (self.ui.verbose, 'verbose'), | |
1010 | (self.ui.quiet, 'quiet'), |
|
1010 | (self.ui.quiet, 'quiet'), | |
1011 | (self.ui.debugflag, 'debug'), |
|
1011 | (self.ui.debugflag, 'debug'), | |
1012 | ] |
|
1012 | ] | |
1013 |
|
1013 | |||
1014 | types = {'header': '', 'footer':'', 'changeset': 'changeset'} |
|
1014 | types = {'header': '', 'footer':'', 'changeset': 'changeset'} | |
1015 | for mode, postfix in tmplmodes: |
|
1015 | for mode, postfix in tmplmodes: | |
1016 | for type in types: |
|
1016 | for type in types: | |
1017 | cur = postfix and ('%s_%s' % (type, postfix)) or type |
|
1017 | cur = postfix and ('%s_%s' % (type, postfix)) or type | |
1018 | if mode and cur in self.t: |
|
1018 | if mode and cur in self.t: | |
1019 | types[type] = cur |
|
1019 | types[type] = cur | |
1020 |
|
1020 | |||
1021 | try: |
|
1021 | try: | |
1022 |
|
1022 | |||
1023 | # write header |
|
1023 | # write header | |
1024 | if types['header']: |
|
1024 | if types['header']: | |
1025 | h = templater.stringify(self.t(types['header'], **props)) |
|
1025 | h = templater.stringify(self.t(types['header'], **props)) | |
1026 | if self.buffered: |
|
1026 | if self.buffered: | |
1027 | self.header[ctx.rev()] = h |
|
1027 | self.header[ctx.rev()] = h | |
1028 | else: |
|
1028 | else: | |
1029 | if self.lastheader != h: |
|
1029 | if self.lastheader != h: | |
1030 | self.lastheader = h |
|
1030 | self.lastheader = h | |
1031 | self.ui.write(h) |
|
1031 | self.ui.write(h) | |
1032 |
|
1032 | |||
1033 | # write changeset metadata, then patch if requested |
|
1033 | # write changeset metadata, then patch if requested | |
1034 | key = types['changeset'] |
|
1034 | key = types['changeset'] | |
1035 | self.ui.write(templater.stringify(self.t(key, **props))) |
|
1035 | self.ui.write(templater.stringify(self.t(key, **props))) | |
1036 | self.showpatch(ctx.node(), matchfn) |
|
1036 | self.showpatch(ctx.node(), matchfn) | |
1037 |
|
1037 | |||
1038 | if types['footer']: |
|
1038 | if types['footer']: | |
1039 | if not self.footer: |
|
1039 | if not self.footer: | |
1040 | self.footer = templater.stringify(self.t(types['footer'], |
|
1040 | self.footer = templater.stringify(self.t(types['footer'], | |
1041 | **props)) |
|
1041 | **props)) | |
1042 |
|
1042 | |||
1043 | except KeyError, inst: |
|
1043 | except KeyError, inst: | |
1044 | msg = _("%s: no key named '%s'") |
|
1044 | msg = _("%s: no key named '%s'") | |
1045 | raise util.Abort(msg % (self.t.mapfile, inst.args[0])) |
|
1045 | raise util.Abort(msg % (self.t.mapfile, inst.args[0])) | |
1046 | except SyntaxError, inst: |
|
1046 | except SyntaxError, inst: | |
1047 | raise util.Abort('%s: %s' % (self.t.mapfile, inst.args[0])) |
|
1047 | raise util.Abort('%s: %s' % (self.t.mapfile, inst.args[0])) | |
1048 |
|
1048 | |||
1049 | def gettemplate(ui, tmpl, style): |
|
1049 | def gettemplate(ui, tmpl, style): | |
1050 | """ |
|
1050 | """ | |
1051 | Find the template matching the given template spec or style. |
|
1051 | Find the template matching the given template spec or style. | |
1052 | """ |
|
1052 | """ | |
1053 |
|
1053 | |||
1054 | # ui settings |
|
1054 | # ui settings | |
1055 | if not tmpl and not style: |
|
1055 | if not tmpl and not style: | |
1056 | tmpl = ui.config('ui', 'logtemplate') |
|
1056 | tmpl = ui.config('ui', 'logtemplate') | |
1057 | if tmpl: |
|
1057 | if tmpl: | |
1058 | try: |
|
1058 | try: | |
1059 | tmpl = templater.parsestring(tmpl) |
|
1059 | tmpl = templater.parsestring(tmpl) | |
1060 | except SyntaxError: |
|
1060 | except SyntaxError: | |
1061 | tmpl = templater.parsestring(tmpl, quoted=False) |
|
1061 | tmpl = templater.parsestring(tmpl, quoted=False) | |
1062 | return tmpl, None |
|
1062 | return tmpl, None | |
1063 | else: |
|
1063 | else: | |
1064 | style = util.expandpath(ui.config('ui', 'style', '')) |
|
1064 | style = util.expandpath(ui.config('ui', 'style', '')) | |
1065 |
|
1065 | |||
1066 | if style: |
|
1066 | if style: | |
1067 | mapfile = style |
|
1067 | mapfile = style | |
1068 | if not os.path.split(mapfile)[0]: |
|
1068 | if not os.path.split(mapfile)[0]: | |
1069 | mapname = (templater.templatepath('map-cmdline.' + mapfile) |
|
1069 | mapname = (templater.templatepath('map-cmdline.' + mapfile) | |
1070 | or templater.templatepath(mapfile)) |
|
1070 | or templater.templatepath(mapfile)) | |
1071 | if mapname: |
|
1071 | if mapname: | |
1072 | mapfile = mapname |
|
1072 | mapfile = mapname | |
1073 | return None, mapfile |
|
1073 | return None, mapfile | |
1074 |
|
1074 | |||
1075 | if not tmpl: |
|
1075 | if not tmpl: | |
1076 | return None, None |
|
1076 | return None, None | |
1077 |
|
1077 | |||
1078 | # looks like a literal template? |
|
1078 | # looks like a literal template? | |
1079 | if '{' in tmpl: |
|
1079 | if '{' in tmpl: | |
1080 | return tmpl, None |
|
1080 | return tmpl, None | |
1081 |
|
1081 | |||
1082 | # perhaps a stock style? |
|
1082 | # perhaps a stock style? | |
1083 | if not os.path.split(tmpl)[0]: |
|
1083 | if not os.path.split(tmpl)[0]: | |
1084 | mapname = (templater.templatepath('map-cmdline.' + tmpl) |
|
1084 | mapname = (templater.templatepath('map-cmdline.' + tmpl) | |
1085 | or templater.templatepath(tmpl)) |
|
1085 | or templater.templatepath(tmpl)) | |
1086 | if mapname and os.path.isfile(mapname): |
|
1086 | if mapname and os.path.isfile(mapname): | |
1087 | return None, mapname |
|
1087 | return None, mapname | |
1088 |
|
1088 | |||
1089 | # perhaps it's a reference to [templates] |
|
1089 | # perhaps it's a reference to [templates] | |
1090 | t = ui.config('templates', tmpl) |
|
1090 | t = ui.config('templates', tmpl) | |
1091 | if t: |
|
1091 | if t: | |
1092 | try: |
|
1092 | try: | |
1093 | tmpl = templater.parsestring(t) |
|
1093 | tmpl = templater.parsestring(t) | |
1094 | except SyntaxError: |
|
1094 | except SyntaxError: | |
1095 | tmpl = templater.parsestring(t, quoted=False) |
|
1095 | tmpl = templater.parsestring(t, quoted=False) | |
1096 | return tmpl, None |
|
1096 | return tmpl, None | |
1097 |
|
1097 | |||
1098 | # perhaps it's a path to a map or a template |
|
1098 | # perhaps it's a path to a map or a template | |
1099 | if ('/' in tmpl or '\\' in tmpl) and os.path.isfile(tmpl): |
|
1099 | if ('/' in tmpl or '\\' in tmpl) and os.path.isfile(tmpl): | |
1100 | # is it a mapfile for a style? |
|
1100 | # is it a mapfile for a style? | |
1101 | if os.path.basename(tmpl).startswith("map-"): |
|
1101 | if os.path.basename(tmpl).startswith("map-"): | |
1102 | return None, os.path.realpath(tmpl) |
|
1102 | return None, os.path.realpath(tmpl) | |
1103 | tmpl = open(tmpl).read() |
|
1103 | tmpl = open(tmpl).read() | |
1104 | return tmpl, None |
|
1104 | return tmpl, None | |
1105 |
|
1105 | |||
1106 | # constant string? |
|
1106 | # constant string? | |
1107 | return tmpl, None |
|
1107 | return tmpl, None | |
1108 |
|
1108 | |||
1109 | def show_changeset(ui, repo, opts, buffered=False): |
|
1109 | def show_changeset(ui, repo, opts, buffered=False): | |
1110 | """show one changeset using template or regular display. |
|
1110 | """show one changeset using template or regular display. | |
1111 |
|
1111 | |||
1112 | Display format will be the first non-empty hit of: |
|
1112 | Display format will be the first non-empty hit of: | |
1113 | 1. option 'template' |
|
1113 | 1. option 'template' | |
1114 | 2. option 'style' |
|
1114 | 2. option 'style' | |
1115 | 3. [ui] setting 'logtemplate' |
|
1115 | 3. [ui] setting 'logtemplate' | |
1116 | 4. [ui] setting 'style' |
|
1116 | 4. [ui] setting 'style' | |
1117 | If all of these values are either the unset or the empty string, |
|
1117 | If all of these values are either the unset or the empty string, | |
1118 | regular display via changeset_printer() is done. |
|
1118 | regular display via changeset_printer() is done. | |
1119 | """ |
|
1119 | """ | |
1120 | # options |
|
1120 | # options | |
1121 | patch = None |
|
1121 | patch = None | |
1122 | if opts.get('patch') or opts.get('stat'): |
|
1122 | if opts.get('patch') or opts.get('stat'): | |
1123 | patch = scmutil.matchall(repo) |
|
1123 | patch = scmutil.matchall(repo) | |
1124 |
|
1124 | |||
1125 | tmpl, mapfile = gettemplate(ui, opts.get('template'), opts.get('style')) |
|
1125 | tmpl, mapfile = gettemplate(ui, opts.get('template'), opts.get('style')) | |
1126 |
|
1126 | |||
1127 | if not tmpl and not mapfile: |
|
1127 | if not tmpl and not mapfile: | |
1128 | return changeset_printer(ui, repo, patch, opts, buffered) |
|
1128 | return changeset_printer(ui, repo, patch, opts, buffered) | |
1129 |
|
1129 | |||
1130 | try: |
|
1130 | try: | |
1131 | t = changeset_templater(ui, repo, patch, opts, tmpl, mapfile, buffered) |
|
1131 | t = changeset_templater(ui, repo, patch, opts, tmpl, mapfile, buffered) | |
1132 | except SyntaxError, inst: |
|
1132 | except SyntaxError, inst: | |
1133 | raise util.Abort(inst.args[0]) |
|
1133 | raise util.Abort(inst.args[0]) | |
1134 | return t |
|
1134 | return t | |
1135 |
|
1135 | |||
1136 | def showmarker(ui, marker): |
|
1136 | def showmarker(ui, marker): | |
1137 | """utility function to display obsolescence marker in a readable way |
|
1137 | """utility function to display obsolescence marker in a readable way | |
1138 |
|
1138 | |||
1139 | To be used by debug function.""" |
|
1139 | To be used by debug function.""" | |
1140 | ui.write(hex(marker.precnode())) |
|
1140 | ui.write(hex(marker.precnode())) | |
1141 | for repl in marker.succnodes(): |
|
1141 | for repl in marker.succnodes(): | |
1142 | ui.write(' ') |
|
1142 | ui.write(' ') | |
1143 | ui.write(hex(repl)) |
|
1143 | ui.write(hex(repl)) | |
1144 | ui.write(' %X ' % marker._data[2]) |
|
1144 | ui.write(' %X ' % marker._data[2]) | |
1145 | ui.write('{%s}' % (', '.join('%r: %r' % t for t in |
|
1145 | ui.write('{%s}' % (', '.join('%r: %r' % t for t in | |
1146 | sorted(marker.metadata().items())))) |
|
1146 | sorted(marker.metadata().items())))) | |
1147 | ui.write('\n') |
|
1147 | ui.write('\n') | |
1148 |
|
1148 | |||
1149 | def finddate(ui, repo, date): |
|
1149 | def finddate(ui, repo, date): | |
1150 | """Find the tipmost changeset that matches the given date spec""" |
|
1150 | """Find the tipmost changeset that matches the given date spec""" | |
1151 |
|
1151 | |||
1152 | df = util.matchdate(date) |
|
1152 | df = util.matchdate(date) | |
1153 | m = scmutil.matchall(repo) |
|
1153 | m = scmutil.matchall(repo) | |
1154 | results = {} |
|
1154 | results = {} | |
1155 |
|
1155 | |||
1156 | def prep(ctx, fns): |
|
1156 | def prep(ctx, fns): | |
1157 | d = ctx.date() |
|
1157 | d = ctx.date() | |
1158 | if df(d[0]): |
|
1158 | if df(d[0]): | |
1159 | results[ctx.rev()] = d |
|
1159 | results[ctx.rev()] = d | |
1160 |
|
1160 | |||
1161 | for ctx in walkchangerevs(repo, m, {'rev': None}, prep): |
|
1161 | for ctx in walkchangerevs(repo, m, {'rev': None}, prep): | |
1162 | rev = ctx.rev() |
|
1162 | rev = ctx.rev() | |
1163 | if rev in results: |
|
1163 | if rev in results: | |
1164 | ui.status(_("found revision %s from %s\n") % |
|
1164 | ui.status(_("found revision %s from %s\n") % | |
1165 | (rev, util.datestr(results[rev]))) |
|
1165 | (rev, util.datestr(results[rev]))) | |
1166 | return str(rev) |
|
1166 | return str(rev) | |
1167 |
|
1167 | |||
1168 | raise util.Abort(_("revision matching date not found")) |
|
1168 | raise util.Abort(_("revision matching date not found")) | |
1169 |
|
1169 | |||
1170 | def increasingwindows(windowsize=8, sizelimit=512): |
|
1170 | def increasingwindows(windowsize=8, sizelimit=512): | |
1171 | while True: |
|
1171 | while True: | |
1172 | yield windowsize |
|
1172 | yield windowsize | |
1173 | if windowsize < sizelimit: |
|
1173 | if windowsize < sizelimit: | |
1174 | windowsize *= 2 |
|
1174 | windowsize *= 2 | |
1175 |
|
1175 | |||
1176 | class FileWalkError(Exception): |
|
1176 | class FileWalkError(Exception): | |
1177 | pass |
|
1177 | pass | |
1178 |
|
1178 | |||
1179 | def walkfilerevs(repo, match, follow, revs, fncache): |
|
1179 | def walkfilerevs(repo, match, follow, revs, fncache): | |
1180 | '''Walks the file history for the matched files. |
|
1180 | '''Walks the file history for the matched files. | |
1181 |
|
1181 | |||
1182 | Returns the changeset revs that are involved in the file history. |
|
1182 | Returns the changeset revs that are involved in the file history. | |
1183 |
|
1183 | |||
1184 | Throws FileWalkError if the file history can't be walked using |
|
1184 | Throws FileWalkError if the file history can't be walked using | |
1185 | filelogs alone. |
|
1185 | filelogs alone. | |
1186 | ''' |
|
1186 | ''' | |
1187 | wanted = set() |
|
1187 | wanted = set() | |
1188 | copies = [] |
|
1188 | copies = [] | |
1189 | minrev, maxrev = min(revs), max(revs) |
|
1189 | minrev, maxrev = min(revs), max(revs) | |
1190 | def filerevgen(filelog, last): |
|
1190 | def filerevgen(filelog, last): | |
1191 | """ |
|
1191 | """ | |
1192 | Only files, no patterns. Check the history of each file. |
|
1192 | Only files, no patterns. Check the history of each file. | |
1193 |
|
1193 | |||
1194 | Examines filelog entries within minrev, maxrev linkrev range |
|
1194 | Examines filelog entries within minrev, maxrev linkrev range | |
1195 | Returns an iterator yielding (linkrev, parentlinkrevs, copied) |
|
1195 | Returns an iterator yielding (linkrev, parentlinkrevs, copied) | |
1196 | tuples in backwards order |
|
1196 | tuples in backwards order | |
1197 | """ |
|
1197 | """ | |
1198 | cl_count = len(repo) |
|
1198 | cl_count = len(repo) | |
1199 | revs = [] |
|
1199 | revs = [] | |
1200 | for j in xrange(0, last + 1): |
|
1200 | for j in xrange(0, last + 1): | |
1201 | linkrev = filelog.linkrev(j) |
|
1201 | linkrev = filelog.linkrev(j) | |
1202 | if linkrev < minrev: |
|
1202 | if linkrev < minrev: | |
1203 | continue |
|
1203 | continue | |
1204 | # only yield rev for which we have the changelog, it can |
|
1204 | # only yield rev for which we have the changelog, it can | |
1205 | # happen while doing "hg log" during a pull or commit |
|
1205 | # happen while doing "hg log" during a pull or commit | |
1206 | if linkrev >= cl_count: |
|
1206 | if linkrev >= cl_count: | |
1207 | break |
|
1207 | break | |
1208 |
|
1208 | |||
1209 | parentlinkrevs = [] |
|
1209 | parentlinkrevs = [] | |
1210 | for p in filelog.parentrevs(j): |
|
1210 | for p in filelog.parentrevs(j): | |
1211 | if p != nullrev: |
|
1211 | if p != nullrev: | |
1212 | parentlinkrevs.append(filelog.linkrev(p)) |
|
1212 | parentlinkrevs.append(filelog.linkrev(p)) | |
1213 | n = filelog.node(j) |
|
1213 | n = filelog.node(j) | |
1214 | revs.append((linkrev, parentlinkrevs, |
|
1214 | revs.append((linkrev, parentlinkrevs, | |
1215 | follow and filelog.renamed(n))) |
|
1215 | follow and filelog.renamed(n))) | |
1216 |
|
1216 | |||
1217 | return reversed(revs) |
|
1217 | return reversed(revs) | |
1218 | def iterfiles(): |
|
1218 | def iterfiles(): | |
1219 | pctx = repo['.'] |
|
1219 | pctx = repo['.'] | |
1220 | for filename in match.files(): |
|
1220 | for filename in match.files(): | |
1221 | if follow: |
|
1221 | if follow: | |
1222 | if filename not in pctx: |
|
1222 | if filename not in pctx: | |
1223 | raise util.Abort(_('cannot follow file not in parent ' |
|
1223 | raise util.Abort(_('cannot follow file not in parent ' | |
1224 | 'revision: "%s"') % filename) |
|
1224 | 'revision: "%s"') % filename) | |
1225 | yield filename, pctx[filename].filenode() |
|
1225 | yield filename, pctx[filename].filenode() | |
1226 | else: |
|
1226 | else: | |
1227 | yield filename, None |
|
1227 | yield filename, None | |
1228 | for filename_node in copies: |
|
1228 | for filename_node in copies: | |
1229 | yield filename_node |
|
1229 | yield filename_node | |
1230 |
|
1230 | |||
1231 | for file_, node in iterfiles(): |
|
1231 | for file_, node in iterfiles(): | |
1232 | filelog = repo.file(file_) |
|
1232 | filelog = repo.file(file_) | |
1233 | if not len(filelog): |
|
1233 | if not len(filelog): | |
1234 | if node is None: |
|
1234 | if node is None: | |
1235 | # A zero count may be a directory or deleted file, so |
|
1235 | # A zero count may be a directory or deleted file, so | |
1236 | # try to find matching entries on the slow path. |
|
1236 | # try to find matching entries on the slow path. | |
1237 | if follow: |
|
1237 | if follow: | |
1238 | raise util.Abort( |
|
1238 | raise util.Abort( | |
1239 | _('cannot follow nonexistent file: "%s"') % file_) |
|
1239 | _('cannot follow nonexistent file: "%s"') % file_) | |
1240 | raise FileWalkError("Cannot walk via filelog") |
|
1240 | raise FileWalkError("Cannot walk via filelog") | |
1241 | else: |
|
1241 | else: | |
1242 | continue |
|
1242 | continue | |
1243 |
|
1243 | |||
1244 | if node is None: |
|
1244 | if node is None: | |
1245 | last = len(filelog) - 1 |
|
1245 | last = len(filelog) - 1 | |
1246 | else: |
|
1246 | else: | |
1247 | last = filelog.rev(node) |
|
1247 | last = filelog.rev(node) | |
1248 |
|
1248 | |||
1249 |
|
1249 | |||
1250 | # keep track of all ancestors of the file |
|
1250 | # keep track of all ancestors of the file | |
1251 | ancestors = set([filelog.linkrev(last)]) |
|
1251 | ancestors = set([filelog.linkrev(last)]) | |
1252 |
|
1252 | |||
1253 | # iterate from latest to oldest revision |
|
1253 | # iterate from latest to oldest revision | |
1254 | for rev, flparentlinkrevs, copied in filerevgen(filelog, last): |
|
1254 | for rev, flparentlinkrevs, copied in filerevgen(filelog, last): | |
1255 | if not follow: |
|
1255 | if not follow: | |
1256 | if rev > maxrev: |
|
1256 | if rev > maxrev: | |
1257 | continue |
|
1257 | continue | |
1258 | else: |
|
1258 | else: | |
1259 | # Note that last might not be the first interesting |
|
1259 | # Note that last might not be the first interesting | |
1260 | # rev to us: |
|
1260 | # rev to us: | |
1261 | # if the file has been changed after maxrev, we'll |
|
1261 | # if the file has been changed after maxrev, we'll | |
1262 | # have linkrev(last) > maxrev, and we still need |
|
1262 | # have linkrev(last) > maxrev, and we still need | |
1263 | # to explore the file graph |
|
1263 | # to explore the file graph | |
1264 | if rev not in ancestors: |
|
1264 | if rev not in ancestors: | |
1265 | continue |
|
1265 | continue | |
1266 | # XXX insert 1327 fix here |
|
1266 | # XXX insert 1327 fix here | |
1267 | if flparentlinkrevs: |
|
1267 | if flparentlinkrevs: | |
1268 | ancestors.update(flparentlinkrevs) |
|
1268 | ancestors.update(flparentlinkrevs) | |
1269 |
|
1269 | |||
1270 | fncache.setdefault(rev, []).append(file_) |
|
1270 | fncache.setdefault(rev, []).append(file_) | |
1271 | wanted.add(rev) |
|
1271 | wanted.add(rev) | |
1272 | if copied: |
|
1272 | if copied: | |
1273 | copies.append(copied) |
|
1273 | copies.append(copied) | |
1274 |
|
1274 | |||
1275 | return wanted |
|
1275 | return wanted | |
1276 |
|
1276 | |||
1277 | def walkchangerevs(repo, match, opts, prepare): |
|
1277 | def walkchangerevs(repo, match, opts, prepare): | |
1278 | '''Iterate over files and the revs in which they changed. |
|
1278 | '''Iterate over files and the revs in which they changed. | |
1279 |
|
1279 | |||
1280 | Callers most commonly need to iterate backwards over the history |
|
1280 | Callers most commonly need to iterate backwards over the history | |
1281 | in which they are interested. Doing so has awful (quadratic-looking) |
|
1281 | in which they are interested. Doing so has awful (quadratic-looking) | |
1282 | performance, so we use iterators in a "windowed" way. |
|
1282 | performance, so we use iterators in a "windowed" way. | |
1283 |
|
1283 | |||
1284 | We walk a window of revisions in the desired order. Within the |
|
1284 | We walk a window of revisions in the desired order. Within the | |
1285 | window, we first walk forwards to gather data, then in the desired |
|
1285 | window, we first walk forwards to gather data, then in the desired | |
1286 | order (usually backwards) to display it. |
|
1286 | order (usually backwards) to display it. | |
1287 |
|
1287 | |||
1288 | This function returns an iterator yielding contexts. Before |
|
1288 | This function returns an iterator yielding contexts. Before | |
1289 | yielding each context, the iterator will first call the prepare |
|
1289 | yielding each context, the iterator will first call the prepare | |
1290 | function on each context in the window in forward order.''' |
|
1290 | function on each context in the window in forward order.''' | |
1291 |
|
1291 | |||
1292 | follow = opts.get('follow') or opts.get('follow_first') |
|
1292 | follow = opts.get('follow') or opts.get('follow_first') | |
1293 |
|
1293 | |||
1294 | if opts.get('rev'): |
|
1294 | if opts.get('rev'): | |
1295 | revs = scmutil.revrange(repo, opts.get('rev')) |
|
1295 | revs = scmutil.revrange(repo, opts.get('rev')) | |
1296 | elif follow: |
|
1296 | elif follow: | |
1297 | revs = repo.revs('reverse(:.)') |
|
1297 | revs = repo.revs('reverse(:.)') | |
1298 | else: |
|
1298 | else: | |
1299 | revs = revset.spanset(repo) |
|
1299 | revs = revset.spanset(repo) | |
1300 | revs.reverse() |
|
1300 | revs.reverse() | |
1301 | if not revs: |
|
1301 | if not revs: | |
1302 | return [] |
|
1302 | return [] | |
1303 | wanted = set() |
|
1303 | wanted = set() | |
1304 | slowpath = match.anypats() or (match.files() and opts.get('removed')) |
|
1304 | slowpath = match.anypats() or (match.files() and opts.get('removed')) | |
1305 | fncache = {} |
|
1305 | fncache = {} | |
1306 | change = repo.changectx |
|
1306 | change = repo.changectx | |
1307 |
|
1307 | |||
1308 | # First step is to fill wanted, the set of revisions that we want to yield. |
|
1308 | # First step is to fill wanted, the set of revisions that we want to yield. | |
1309 | # When it does not induce extra cost, we also fill fncache for revisions in |
|
1309 | # When it does not induce extra cost, we also fill fncache for revisions in | |
1310 | # wanted: a cache of filenames that were changed (ctx.files()) and that |
|
1310 | # wanted: a cache of filenames that were changed (ctx.files()) and that | |
1311 | # match the file filtering conditions. |
|
1311 | # match the file filtering conditions. | |
1312 |
|
1312 | |||
1313 | if not slowpath and not match.files(): |
|
1313 | if not slowpath and not match.files(): | |
1314 | # No files, no patterns. Display all revs. |
|
1314 | # No files, no patterns. Display all revs. | |
1315 | wanted = revs |
|
1315 | wanted = revs | |
1316 |
|
1316 | |||
1317 | if not slowpath and match.files(): |
|
1317 | if not slowpath and match.files(): | |
1318 | # We only have to read through the filelog to find wanted revisions |
|
1318 | # We only have to read through the filelog to find wanted revisions | |
1319 |
|
1319 | |||
1320 | try: |
|
1320 | try: | |
1321 | wanted = walkfilerevs(repo, match, follow, revs, fncache) |
|
1321 | wanted = walkfilerevs(repo, match, follow, revs, fncache) | |
1322 | except FileWalkError: |
|
1322 | except FileWalkError: | |
1323 | slowpath = True |
|
1323 | slowpath = True | |
1324 |
|
1324 | |||
1325 | # We decided to fall back to the slowpath because at least one |
|
1325 | # We decided to fall back to the slowpath because at least one | |
1326 | # of the paths was not a file. Check to see if at least one of them |
|
1326 | # of the paths was not a file. Check to see if at least one of them | |
1327 | # existed in history, otherwise simply return |
|
1327 | # existed in history, otherwise simply return | |
1328 | for path in match.files(): |
|
1328 | for path in match.files(): | |
1329 | if path == '.' or path in repo.store: |
|
1329 | if path == '.' or path in repo.store: | |
1330 | break |
|
1330 | break | |
1331 | else: |
|
1331 | else: | |
1332 | return [] |
|
1332 | return [] | |
1333 |
|
1333 | |||
1334 | if slowpath: |
|
1334 | if slowpath: | |
1335 | # We have to read the changelog to match filenames against |
|
1335 | # We have to read the changelog to match filenames against | |
1336 | # changed files |
|
1336 | # changed files | |
1337 |
|
1337 | |||
1338 | if follow: |
|
1338 | if follow: | |
1339 | raise util.Abort(_('can only follow copies/renames for explicit ' |
|
1339 | raise util.Abort(_('can only follow copies/renames for explicit ' | |
1340 | 'filenames')) |
|
1340 | 'filenames')) | |
1341 |
|
1341 | |||
1342 | # The slow path checks files modified in every changeset. |
|
1342 | # The slow path checks files modified in every changeset. | |
1343 | # This is really slow on large repos, so compute the set lazily. |
|
1343 | # This is really slow on large repos, so compute the set lazily. | |
1344 | class lazywantedset(object): |
|
1344 | class lazywantedset(object): | |
1345 | def __init__(self): |
|
1345 | def __init__(self): | |
1346 | self.set = set() |
|
1346 | self.set = set() | |
1347 | self.revs = set(revs) |
|
1347 | self.revs = set(revs) | |
1348 |
|
1348 | |||
1349 | # No need to worry about locality here because it will be accessed |
|
1349 | # No need to worry about locality here because it will be accessed | |
1350 | # in the same order as the increasing window below. |
|
1350 | # in the same order as the increasing window below. | |
1351 | def __contains__(self, value): |
|
1351 | def __contains__(self, value): | |
1352 | if value in self.set: |
|
1352 | if value in self.set: | |
1353 | return True |
|
1353 | return True | |
1354 | elif not value in self.revs: |
|
1354 | elif not value in self.revs: | |
1355 | return False |
|
1355 | return False | |
1356 | else: |
|
1356 | else: | |
1357 | self.revs.discard(value) |
|
1357 | self.revs.discard(value) | |
1358 | ctx = change(value) |
|
1358 | ctx = change(value) | |
1359 | matches = filter(match, ctx.files()) |
|
1359 | matches = filter(match, ctx.files()) | |
1360 | if matches: |
|
1360 | if matches: | |
1361 | fncache[value] = matches |
|
1361 | fncache[value] = matches | |
1362 | self.set.add(value) |
|
1362 | self.set.add(value) | |
1363 | return True |
|
1363 | return True | |
1364 | return False |
|
1364 | return False | |
1365 |
|
1365 | |||
1366 | def discard(self, value): |
|
1366 | def discard(self, value): | |
1367 | self.revs.discard(value) |
|
1367 | self.revs.discard(value) | |
1368 | self.set.discard(value) |
|
1368 | self.set.discard(value) | |
1369 |
|
1369 | |||
1370 | wanted = lazywantedset() |
|
1370 | wanted = lazywantedset() | |
1371 |
|
1371 | |||
1372 | class followfilter(object): |
|
1372 | class followfilter(object): | |
1373 | def __init__(self, onlyfirst=False): |
|
1373 | def __init__(self, onlyfirst=False): | |
1374 | self.startrev = nullrev |
|
1374 | self.startrev = nullrev | |
1375 | self.roots = set() |
|
1375 | self.roots = set() | |
1376 | self.onlyfirst = onlyfirst |
|
1376 | self.onlyfirst = onlyfirst | |
1377 |
|
1377 | |||
1378 | def match(self, rev): |
|
1378 | def match(self, rev): | |
1379 | def realparents(rev): |
|
1379 | def realparents(rev): | |
1380 | if self.onlyfirst: |
|
1380 | if self.onlyfirst: | |
1381 | return repo.changelog.parentrevs(rev)[0:1] |
|
1381 | return repo.changelog.parentrevs(rev)[0:1] | |
1382 | else: |
|
1382 | else: | |
1383 | return filter(lambda x: x != nullrev, |
|
1383 | return filter(lambda x: x != nullrev, | |
1384 | repo.changelog.parentrevs(rev)) |
|
1384 | repo.changelog.parentrevs(rev)) | |
1385 |
|
1385 | |||
1386 | if self.startrev == nullrev: |
|
1386 | if self.startrev == nullrev: | |
1387 | self.startrev = rev |
|
1387 | self.startrev = rev | |
1388 | return True |
|
1388 | return True | |
1389 |
|
1389 | |||
1390 | if rev > self.startrev: |
|
1390 | if rev > self.startrev: | |
1391 | # forward: all descendants |
|
1391 | # forward: all descendants | |
1392 | if not self.roots: |
|
1392 | if not self.roots: | |
1393 | self.roots.add(self.startrev) |
|
1393 | self.roots.add(self.startrev) | |
1394 | for parent in realparents(rev): |
|
1394 | for parent in realparents(rev): | |
1395 | if parent in self.roots: |
|
1395 | if parent in self.roots: | |
1396 | self.roots.add(rev) |
|
1396 | self.roots.add(rev) | |
1397 | return True |
|
1397 | return True | |
1398 | else: |
|
1398 | else: | |
1399 | # backwards: all parents |
|
1399 | # backwards: all parents | |
1400 | if not self.roots: |
|
1400 | if not self.roots: | |
1401 | self.roots.update(realparents(self.startrev)) |
|
1401 | self.roots.update(realparents(self.startrev)) | |
1402 | if rev in self.roots: |
|
1402 | if rev in self.roots: | |
1403 | self.roots.remove(rev) |
|
1403 | self.roots.remove(rev) | |
1404 | self.roots.update(realparents(rev)) |
|
1404 | self.roots.update(realparents(rev)) | |
1405 | return True |
|
1405 | return True | |
1406 |
|
1406 | |||
1407 | return False |
|
1407 | return False | |
1408 |
|
1408 | |||
1409 | # it might be worthwhile to do this in the iterator if the rev range |
|
1409 | # it might be worthwhile to do this in the iterator if the rev range | |
1410 | # is descending and the prune args are all within that range |
|
1410 | # is descending and the prune args are all within that range | |
1411 | for rev in opts.get('prune', ()): |
|
1411 | for rev in opts.get('prune', ()): | |
1412 | rev = repo[rev].rev() |
|
1412 | rev = repo[rev].rev() | |
1413 | ff = followfilter() |
|
1413 | ff = followfilter() | |
1414 | stop = min(revs[0], revs[-1]) |
|
1414 | stop = min(revs[0], revs[-1]) | |
1415 | for x in xrange(rev, stop - 1, -1): |
|
1415 | for x in xrange(rev, stop - 1, -1): | |
1416 | if ff.match(x): |
|
1416 | if ff.match(x): | |
1417 | wanted = wanted - [x] |
|
1417 | wanted = wanted - [x] | |
1418 |
|
1418 | |||
1419 | # Now that wanted is correctly initialized, we can iterate over the |
|
1419 | # Now that wanted is correctly initialized, we can iterate over the | |
1420 | # revision range, yielding only revisions in wanted. |
|
1420 | # revision range, yielding only revisions in wanted. | |
1421 | def iterate(): |
|
1421 | def iterate(): | |
1422 | if follow and not match.files(): |
|
1422 | if follow and not match.files(): | |
1423 | ff = followfilter(onlyfirst=opts.get('follow_first')) |
|
1423 | ff = followfilter(onlyfirst=opts.get('follow_first')) | |
1424 | def want(rev): |
|
1424 | def want(rev): | |
1425 | return ff.match(rev) and rev in wanted |
|
1425 | return ff.match(rev) and rev in wanted | |
1426 | else: |
|
1426 | else: | |
1427 | def want(rev): |
|
1427 | def want(rev): | |
1428 | return rev in wanted |
|
1428 | return rev in wanted | |
1429 |
|
1429 | |||
1430 | it = iter(revs) |
|
1430 | it = iter(revs) | |
1431 | stopiteration = False |
|
1431 | stopiteration = False | |
1432 | for windowsize in increasingwindows(): |
|
1432 | for windowsize in increasingwindows(): | |
1433 | nrevs = [] |
|
1433 | nrevs = [] | |
1434 | for i in xrange(windowsize): |
|
1434 | for i in xrange(windowsize): | |
1435 | try: |
|
1435 | try: | |
1436 | rev = it.next() |
|
1436 | rev = it.next() | |
1437 | if want(rev): |
|
1437 | if want(rev): | |
1438 | nrevs.append(rev) |
|
1438 | nrevs.append(rev) | |
1439 | except (StopIteration): |
|
1439 | except (StopIteration): | |
1440 | stopiteration = True |
|
1440 | stopiteration = True | |
1441 | break |
|
1441 | break | |
1442 | for rev in sorted(nrevs): |
|
1442 | for rev in sorted(nrevs): | |
1443 | fns = fncache.get(rev) |
|
1443 | fns = fncache.get(rev) | |
1444 | ctx = change(rev) |
|
1444 | ctx = change(rev) | |
1445 | if not fns: |
|
1445 | if not fns: | |
1446 | def fns_generator(): |
|
1446 | def fns_generator(): | |
1447 | for f in ctx.files(): |
|
1447 | for f in ctx.files(): | |
1448 | if match(f): |
|
1448 | if match(f): | |
1449 | yield f |
|
1449 | yield f | |
1450 | fns = fns_generator() |
|
1450 | fns = fns_generator() | |
1451 | prepare(ctx, fns) |
|
1451 | prepare(ctx, fns) | |
1452 | for rev in nrevs: |
|
1452 | for rev in nrevs: | |
1453 | yield change(rev) |
|
1453 | yield change(rev) | |
1454 |
|
1454 | |||
1455 | if stopiteration: |
|
1455 | if stopiteration: | |
1456 | break |
|
1456 | break | |
1457 |
|
1457 | |||
1458 | return iterate() |
|
1458 | return iterate() | |
1459 |
|
1459 | |||
1460 | def _makegraphfilematcher(repo, pats, followfirst): |
|
1460 | def _makegraphfilematcher(repo, pats, followfirst): | |
1461 | # When displaying a revision with --patch --follow FILE, we have |
|
1461 | # When displaying a revision with --patch --follow FILE, we have | |
1462 | # to know which file of the revision must be diffed. With |
|
1462 | # to know which file of the revision must be diffed. With | |
1463 | # --follow, we want the names of the ancestors of FILE in the |
|
1463 | # --follow, we want the names of the ancestors of FILE in the | |
1464 | # revision, stored in "fcache". "fcache" is populated by |
|
1464 | # revision, stored in "fcache". "fcache" is populated by | |
1465 | # reproducing the graph traversal already done by --follow revset |
|
1465 | # reproducing the graph traversal already done by --follow revset | |
1466 | # and relating linkrevs to file names (which is not "correct" but |
|
1466 | # and relating linkrevs to file names (which is not "correct" but | |
1467 | # good enough). |
|
1467 | # good enough). | |
1468 | fcache = {} |
|
1468 | fcache = {} | |
1469 | fcacheready = [False] |
|
1469 | fcacheready = [False] | |
1470 | pctx = repo['.'] |
|
1470 | pctx = repo['.'] | |
1471 | wctx = repo[None] |
|
1471 | wctx = repo[None] | |
1472 |
|
1472 | |||
1473 | def populate(): |
|
1473 | def populate(): | |
1474 | for fn in pats: |
|
1474 | for fn in pats: | |
1475 | for i in ((pctx[fn],), pctx[fn].ancestors(followfirst=followfirst)): |
|
1475 | for i in ((pctx[fn],), pctx[fn].ancestors(followfirst=followfirst)): | |
1476 | for c in i: |
|
1476 | for c in i: | |
1477 | fcache.setdefault(c.linkrev(), set()).add(c.path()) |
|
1477 | fcache.setdefault(c.linkrev(), set()).add(c.path()) | |
1478 |
|
1478 | |||
1479 | def filematcher(rev): |
|
1479 | def filematcher(rev): | |
1480 | if not fcacheready[0]: |
|
1480 | if not fcacheready[0]: | |
1481 | # Lazy initialization |
|
1481 | # Lazy initialization | |
1482 | fcacheready[0] = True |
|
1482 | fcacheready[0] = True | |
1483 | populate() |
|
1483 | populate() | |
1484 | return scmutil.match(wctx, fcache.get(rev, []), default='path') |
|
1484 | return scmutil.match(wctx, fcache.get(rev, []), default='path') | |
1485 |
|
1485 | |||
1486 | return filematcher |
|
1486 | return filematcher | |
1487 |
|
1487 | |||
1488 | def _makegraphlogrevset(repo, pats, opts, revs): |
|
1488 | def _makegraphlogrevset(repo, pats, opts, revs): | |
1489 | """Return (expr, filematcher) where expr is a revset string built |
|
1489 | """Return (expr, filematcher) where expr is a revset string built | |
1490 | from log options and file patterns or None. If --stat or --patch |
|
1490 | from log options and file patterns or None. If --stat or --patch | |
1491 | are not passed filematcher is None. Otherwise it is a callable |
|
1491 | are not passed filematcher is None. Otherwise it is a callable | |
1492 | taking a revision number and returning a match objects filtering |
|
1492 | taking a revision number and returning a match objects filtering | |
1493 | the files to be detailed when displaying the revision. |
|
1493 | the files to be detailed when displaying the revision. | |
1494 | """ |
|
1494 | """ | |
1495 | opt2revset = { |
|
1495 | opt2revset = { | |
1496 | 'no_merges': ('not merge()', None), |
|
1496 | 'no_merges': ('not merge()', None), | |
1497 | 'only_merges': ('merge()', None), |
|
1497 | 'only_merges': ('merge()', None), | |
1498 | '_ancestors': ('ancestors(%(val)s)', None), |
|
1498 | '_ancestors': ('ancestors(%(val)s)', None), | |
1499 | '_fancestors': ('_firstancestors(%(val)s)', None), |
|
1499 | '_fancestors': ('_firstancestors(%(val)s)', None), | |
1500 | '_descendants': ('descendants(%(val)s)', None), |
|
1500 | '_descendants': ('descendants(%(val)s)', None), | |
1501 | '_fdescendants': ('_firstdescendants(%(val)s)', None), |
|
1501 | '_fdescendants': ('_firstdescendants(%(val)s)', None), | |
1502 | '_matchfiles': ('_matchfiles(%(val)s)', None), |
|
1502 | '_matchfiles': ('_matchfiles(%(val)s)', None), | |
1503 | 'date': ('date(%(val)r)', None), |
|
1503 | 'date': ('date(%(val)r)', None), | |
1504 | 'branch': ('branch(%(val)r)', ' or '), |
|
1504 | 'branch': ('branch(%(val)r)', ' or '), | |
1505 | '_patslog': ('filelog(%(val)r)', ' or '), |
|
1505 | '_patslog': ('filelog(%(val)r)', ' or '), | |
1506 | '_patsfollow': ('follow(%(val)r)', ' or '), |
|
1506 | '_patsfollow': ('follow(%(val)r)', ' or '), | |
1507 | '_patsfollowfirst': ('_followfirst(%(val)r)', ' or '), |
|
1507 | '_patsfollowfirst': ('_followfirst(%(val)r)', ' or '), | |
1508 | 'keyword': ('keyword(%(val)r)', ' or '), |
|
1508 | 'keyword': ('keyword(%(val)r)', ' or '), | |
1509 | 'prune': ('not (%(val)r or ancestors(%(val)r))', ' and '), |
|
1509 | 'prune': ('not (%(val)r or ancestors(%(val)r))', ' and '), | |
1510 | 'user': ('user(%(val)r)', ' or '), |
|
1510 | 'user': ('user(%(val)r)', ' or '), | |
1511 | } |
|
1511 | } | |
1512 |
|
1512 | |||
1513 | opts = dict(opts) |
|
1513 | opts = dict(opts) | |
1514 | # follow or not follow? |
|
1514 | # follow or not follow? | |
1515 | follow = opts.get('follow') or opts.get('follow_first') |
|
1515 | follow = opts.get('follow') or opts.get('follow_first') | |
1516 | followfirst = opts.get('follow_first') and 1 or 0 |
|
1516 | followfirst = opts.get('follow_first') and 1 or 0 | |
1517 | # --follow with FILE behaviour depends on revs... |
|
1517 | # --follow with FILE behaviour depends on revs... | |
1518 | it = iter(revs) |
|
1518 | it = iter(revs) | |
1519 | startrev = it.next() |
|
1519 | startrev = it.next() | |
1520 | try: |
|
1520 | try: | |
1521 | followdescendants = startrev < it.next() |
|
1521 | followdescendants = startrev < it.next() | |
1522 | except (StopIteration): |
|
1522 | except (StopIteration): | |
1523 | followdescendants = False |
|
1523 | followdescendants = False | |
1524 |
|
1524 | |||
1525 | # branch and only_branch are really aliases and must be handled at |
|
1525 | # branch and only_branch are really aliases and must be handled at | |
1526 | # the same time |
|
1526 | # the same time | |
1527 | opts['branch'] = opts.get('branch', []) + opts.get('only_branch', []) |
|
1527 | opts['branch'] = opts.get('branch', []) + opts.get('only_branch', []) | |
1528 | opts['branch'] = [repo.lookupbranch(b) for b in opts['branch']] |
|
1528 | opts['branch'] = [repo.lookupbranch(b) for b in opts['branch']] | |
1529 | # pats/include/exclude are passed to match.match() directly in |
|
1529 | # pats/include/exclude are passed to match.match() directly in | |
1530 | # _matchfiles() revset but walkchangerevs() builds its matcher with |
|
1530 | # _matchfiles() revset but walkchangerevs() builds its matcher with | |
1531 | # scmutil.match(). The difference is input pats are globbed on |
|
1531 | # scmutil.match(). The difference is input pats are globbed on | |
1532 | # platforms without shell expansion (windows). |
|
1532 | # platforms without shell expansion (windows). | |
1533 | pctx = repo[None] |
|
1533 | pctx = repo[None] | |
1534 | match, pats = scmutil.matchandpats(pctx, pats, opts) |
|
1534 | match, pats = scmutil.matchandpats(pctx, pats, opts) | |
1535 | slowpath = match.anypats() or (match.files() and opts.get('removed')) |
|
1535 | slowpath = match.anypats() or (match.files() and opts.get('removed')) | |
1536 | if not slowpath: |
|
1536 | if not slowpath: | |
1537 | for f in match.files(): |
|
1537 | for f in match.files(): | |
1538 | if follow and f not in pctx: |
|
1538 | if follow and f not in pctx: | |
1539 | raise util.Abort(_('cannot follow file not in parent ' |
|
1539 | raise util.Abort(_('cannot follow file not in parent ' | |
1540 | 'revision: "%s"') % f) |
|
1540 | 'revision: "%s"') % f) | |
1541 | filelog = repo.file(f) |
|
1541 | filelog = repo.file(f) | |
1542 | if not filelog: |
|
1542 | if not filelog: | |
1543 | # A zero count may be a directory or deleted file, so |
|
1543 | # A zero count may be a directory or deleted file, so | |
1544 | # try to find matching entries on the slow path. |
|
1544 | # try to find matching entries on the slow path. | |
1545 | if follow: |
|
1545 | if follow: | |
1546 | raise util.Abort( |
|
1546 | raise util.Abort( | |
1547 | _('cannot follow nonexistent file: "%s"') % f) |
|
1547 | _('cannot follow nonexistent file: "%s"') % f) | |
1548 | slowpath = True |
|
1548 | slowpath = True | |
1549 |
|
1549 | |||
1550 | # We decided to fall back to the slowpath because at least one |
|
1550 | # We decided to fall back to the slowpath because at least one | |
1551 | # of the paths was not a file. Check to see if at least one of them |
|
1551 | # of the paths was not a file. Check to see if at least one of them | |
1552 | # existed in history - in that case, we'll continue down the |
|
1552 | # existed in history - in that case, we'll continue down the | |
1553 | # slowpath; otherwise, we can turn off the slowpath |
|
1553 | # slowpath; otherwise, we can turn off the slowpath | |
1554 | if slowpath: |
|
1554 | if slowpath: | |
1555 | for path in match.files(): |
|
1555 | for path in match.files(): | |
1556 | if path == '.' or path in repo.store: |
|
1556 | if path == '.' or path in repo.store: | |
1557 | break |
|
1557 | break | |
1558 | else: |
|
1558 | else: | |
1559 | slowpath = False |
|
1559 | slowpath = False | |
1560 |
|
1560 | |||
1561 | if slowpath: |
|
1561 | if slowpath: | |
1562 | # See walkchangerevs() slow path. |
|
1562 | # See walkchangerevs() slow path. | |
1563 | # |
|
1563 | # | |
1564 | if follow: |
|
1564 | if follow: | |
1565 | raise util.Abort(_('can only follow copies/renames for explicit ' |
|
1565 | raise util.Abort(_('can only follow copies/renames for explicit ' | |
1566 | 'filenames')) |
|
1566 | 'filenames')) | |
1567 | # pats/include/exclude cannot be represented as separate |
|
1567 | # pats/include/exclude cannot be represented as separate | |
1568 | # revset expressions as their filtering logic applies at file |
|
1568 | # revset expressions as their filtering logic applies at file | |
1569 | # level. For instance "-I a -X a" matches a revision touching |
|
1569 | # level. For instance "-I a -X a" matches a revision touching | |
1570 | # "a" and "b" while "file(a) and not file(b)" does |
|
1570 | # "a" and "b" while "file(a) and not file(b)" does | |
1571 | # not. Besides, filesets are evaluated against the working |
|
1571 | # not. Besides, filesets are evaluated against the working | |
1572 | # directory. |
|
1572 | # directory. | |
1573 | matchargs = ['r:', 'd:relpath'] |
|
1573 | matchargs = ['r:', 'd:relpath'] | |
1574 | for p in pats: |
|
1574 | for p in pats: | |
1575 | matchargs.append('p:' + p) |
|
1575 | matchargs.append('p:' + p) | |
1576 | for p in opts.get('include', []): |
|
1576 | for p in opts.get('include', []): | |
1577 | matchargs.append('i:' + p) |
|
1577 | matchargs.append('i:' + p) | |
1578 | for p in opts.get('exclude', []): |
|
1578 | for p in opts.get('exclude', []): | |
1579 | matchargs.append('x:' + p) |
|
1579 | matchargs.append('x:' + p) | |
1580 | matchargs = ','.join(('%r' % p) for p in matchargs) |
|
1580 | matchargs = ','.join(('%r' % p) for p in matchargs) | |
1581 | opts['_matchfiles'] = matchargs |
|
1581 | opts['_matchfiles'] = matchargs | |
1582 | else: |
|
1582 | else: | |
1583 | if follow: |
|
1583 | if follow: | |
1584 | fpats = ('_patsfollow', '_patsfollowfirst') |
|
1584 | fpats = ('_patsfollow', '_patsfollowfirst') | |
1585 | fnopats = (('_ancestors', '_fancestors'), |
|
1585 | fnopats = (('_ancestors', '_fancestors'), | |
1586 | ('_descendants', '_fdescendants')) |
|
1586 | ('_descendants', '_fdescendants')) | |
1587 | if pats: |
|
1587 | if pats: | |
1588 | # follow() revset interprets its file argument as a |
|
1588 | # follow() revset interprets its file argument as a | |
1589 | # manifest entry, so use match.files(), not pats. |
|
1589 | # manifest entry, so use match.files(), not pats. | |
1590 | opts[fpats[followfirst]] = list(match.files()) |
|
1590 | opts[fpats[followfirst]] = list(match.files()) | |
1591 | else: |
|
1591 | else: | |
1592 | opts[fnopats[followdescendants][followfirst]] = str(startrev) |
|
1592 | opts[fnopats[followdescendants][followfirst]] = str(startrev) | |
1593 | else: |
|
1593 | else: | |
1594 | opts['_patslog'] = list(pats) |
|
1594 | opts['_patslog'] = list(pats) | |
1595 |
|
1595 | |||
1596 | filematcher = None |
|
1596 | filematcher = None | |
1597 | if opts.get('patch') or opts.get('stat'): |
|
1597 | if opts.get('patch') or opts.get('stat'): | |
1598 | if follow: |
|
1598 | if follow: | |
1599 | filematcher = _makegraphfilematcher(repo, pats, followfirst) |
|
1599 | filematcher = _makegraphfilematcher(repo, pats, followfirst) | |
1600 | else: |
|
1600 | else: | |
1601 | filematcher = lambda rev: match |
|
1601 | filematcher = lambda rev: match | |
1602 |
|
1602 | |||
1603 | expr = [] |
|
1603 | expr = [] | |
1604 | for op, val in opts.iteritems(): |
|
1604 | for op, val in opts.iteritems(): | |
1605 | if not val: |
|
1605 | if not val: | |
1606 | continue |
|
1606 | continue | |
1607 | if op not in opt2revset: |
|
1607 | if op not in opt2revset: | |
1608 | continue |
|
1608 | continue | |
1609 | revop, andor = opt2revset[op] |
|
1609 | revop, andor = opt2revset[op] | |
1610 | if '%(val)' not in revop: |
|
1610 | if '%(val)' not in revop: | |
1611 | expr.append(revop) |
|
1611 | expr.append(revop) | |
1612 | else: |
|
1612 | else: | |
1613 | if not isinstance(val, list): |
|
1613 | if not isinstance(val, list): | |
1614 | e = revop % {'val': val} |
|
1614 | e = revop % {'val': val} | |
1615 | else: |
|
1615 | else: | |
1616 | e = '(' + andor.join((revop % {'val': v}) for v in val) + ')' |
|
1616 | e = '(' + andor.join((revop % {'val': v}) for v in val) + ')' | |
1617 | expr.append(e) |
|
1617 | expr.append(e) | |
1618 |
|
1618 | |||
1619 | if expr: |
|
1619 | if expr: | |
1620 | expr = '(' + ' and '.join(expr) + ')' |
|
1620 | expr = '(' + ' and '.join(expr) + ')' | |
1621 | else: |
|
1621 | else: | |
1622 | expr = None |
|
1622 | expr = None | |
1623 | return expr, filematcher |
|
1623 | return expr, filematcher | |
1624 |
|
1624 | |||
1625 | def getgraphlogrevs(repo, pats, opts): |
|
1625 | def getgraphlogrevs(repo, pats, opts): | |
1626 | """Return (revs, expr, filematcher) where revs is an iterable of |
|
1626 | """Return (revs, expr, filematcher) where revs is an iterable of | |
1627 | revision numbers, expr is a revset string built from log options |
|
1627 | revision numbers, expr is a revset string built from log options | |
1628 | and file patterns or None, and used to filter 'revs'. If --stat or |
|
1628 | and file patterns or None, and used to filter 'revs'. If --stat or | |
1629 | --patch are not passed filematcher is None. Otherwise it is a |
|
1629 | --patch are not passed filematcher is None. Otherwise it is a | |
1630 | callable taking a revision number and returning a match objects |
|
1630 | callable taking a revision number and returning a match objects | |
1631 | filtering the files to be detailed when displaying the revision. |
|
1631 | filtering the files to be detailed when displaying the revision. | |
1632 | """ |
|
1632 | """ | |
1633 | if not len(repo): |
|
1633 | if not len(repo): | |
1634 | return [], None, None |
|
1634 | return [], None, None | |
1635 | limit = loglimit(opts) |
|
1635 | limit = loglimit(opts) | |
1636 | # Default --rev value depends on --follow but --follow behaviour |
|
1636 | # Default --rev value depends on --follow but --follow behaviour | |
1637 | # depends on revisions resolved from --rev... |
|
1637 | # depends on revisions resolved from --rev... | |
1638 | follow = opts.get('follow') or opts.get('follow_first') |
|
1638 | follow = opts.get('follow') or opts.get('follow_first') | |
1639 | possiblyunsorted = False # whether revs might need sorting |
|
1639 | possiblyunsorted = False # whether revs might need sorting | |
1640 | if opts.get('rev'): |
|
1640 | if opts.get('rev'): | |
1641 | revs = scmutil.revrange(repo, opts['rev']) |
|
1641 | revs = scmutil.revrange(repo, opts['rev']) | |
1642 | # Don't sort here because _makegraphlogrevset might depend on the |
|
1642 | # Don't sort here because _makegraphlogrevset might depend on the | |
1643 | # order of revs |
|
1643 | # order of revs | |
1644 | possiblyunsorted = True |
|
1644 | possiblyunsorted = True | |
1645 | else: |
|
1645 | else: | |
1646 | if follow and len(repo) > 0: |
|
1646 | if follow and len(repo) > 0: | |
1647 | revs = repo.revs('reverse(:.)') |
|
1647 | revs = repo.revs('reverse(:.)') | |
1648 | else: |
|
1648 | else: | |
1649 | revs = revset.spanset(repo) |
|
1649 | revs = revset.spanset(repo) | |
1650 | revs.reverse() |
|
1650 | revs.reverse() | |
1651 | if not revs: |
|
1651 | if not revs: | |
1652 | return revset.baseset(), None, None |
|
1652 | return revset.baseset(), None, None | |
1653 | expr, filematcher = _makegraphlogrevset(repo, pats, opts, revs) |
|
1653 | expr, filematcher = _makegraphlogrevset(repo, pats, opts, revs) | |
1654 | if possiblyunsorted: |
|
1654 | if possiblyunsorted: | |
1655 | revs.sort(reverse=True) |
|
1655 | revs.sort(reverse=True) | |
1656 | if expr: |
|
1656 | if expr: | |
1657 | # Revset matchers often operate faster on revisions in changelog |
|
1657 | # Revset matchers often operate faster on revisions in changelog | |
1658 | # order, because most filters deal with the changelog. |
|
1658 | # order, because most filters deal with the changelog. | |
1659 | revs.reverse() |
|
1659 | revs.reverse() | |
1660 | matcher = revset.match(repo.ui, expr) |
|
1660 | matcher = revset.match(repo.ui, expr) | |
1661 | # Revset matches can reorder revisions. "A or B" typically returns |
|
1661 | # Revset matches can reorder revisions. "A or B" typically returns | |
1662 | # returns the revision matching A then the revision matching B. Sort |
|
1662 | # returns the revision matching A then the revision matching B. Sort | |
1663 | # again to fix that. |
|
1663 | # again to fix that. | |
1664 | revs = matcher(repo, revs) |
|
1664 | revs = matcher(repo, revs) | |
1665 | revs.sort(reverse=True) |
|
1665 | revs.sort(reverse=True) | |
1666 | if limit is not None: |
|
1666 | if limit is not None: | |
1667 | limitedrevs = revset.baseset() |
|
1667 | limitedrevs = revset.baseset() | |
1668 | for idx, rev in enumerate(revs): |
|
1668 | for idx, rev in enumerate(revs): | |
1669 | if idx >= limit: |
|
1669 | if idx >= limit: | |
1670 | break |
|
1670 | break | |
1671 | limitedrevs.append(rev) |
|
1671 | limitedrevs.append(rev) | |
1672 | revs = limitedrevs |
|
1672 | revs = limitedrevs | |
1673 |
|
1673 | |||
1674 | return revs, expr, filematcher |
|
1674 | return revs, expr, filematcher | |
1675 |
|
1675 | |||
1676 | def displaygraph(ui, dag, displayer, showparents, edgefn, getrenamed=None, |
|
1676 | def displaygraph(ui, dag, displayer, showparents, edgefn, getrenamed=None, | |
1677 | filematcher=None): |
|
1677 | filematcher=None): | |
1678 | seen, state = [], graphmod.asciistate() |
|
1678 | seen, state = [], graphmod.asciistate() | |
1679 | for rev, type, ctx, parents in dag: |
|
1679 | for rev, type, ctx, parents in dag: | |
1680 | char = 'o' |
|
1680 | char = 'o' | |
1681 | if ctx.node() in showparents: |
|
1681 | if ctx.node() in showparents: | |
1682 | char = '@' |
|
1682 | char = '@' | |
1683 | elif ctx.obsolete(): |
|
1683 | elif ctx.obsolete(): | |
1684 | char = 'x' |
|
1684 | char = 'x' | |
1685 | copies = None |
|
1685 | copies = None | |
1686 | if getrenamed and ctx.rev(): |
|
1686 | if getrenamed and ctx.rev(): | |
1687 | copies = [] |
|
1687 | copies = [] | |
1688 | for fn in ctx.files(): |
|
1688 | for fn in ctx.files(): | |
1689 | rename = getrenamed(fn, ctx.rev()) |
|
1689 | rename = getrenamed(fn, ctx.rev()) | |
1690 | if rename: |
|
1690 | if rename: | |
1691 | copies.append((fn, rename[0])) |
|
1691 | copies.append((fn, rename[0])) | |
1692 | revmatchfn = None |
|
1692 | revmatchfn = None | |
1693 | if filematcher is not None: |
|
1693 | if filematcher is not None: | |
1694 | revmatchfn = filematcher(ctx.rev()) |
|
1694 | revmatchfn = filematcher(ctx.rev()) | |
1695 | displayer.show(ctx, copies=copies, matchfn=revmatchfn) |
|
1695 | displayer.show(ctx, copies=copies, matchfn=revmatchfn) | |
1696 | lines = displayer.hunk.pop(rev).split('\n') |
|
1696 | lines = displayer.hunk.pop(rev).split('\n') | |
1697 | if not lines[-1]: |
|
1697 | if not lines[-1]: | |
1698 | del lines[-1] |
|
1698 | del lines[-1] | |
1699 | displayer.flush(rev) |
|
1699 | displayer.flush(rev) | |
1700 | edges = edgefn(type, char, lines, seen, rev, parents) |
|
1700 | edges = edgefn(type, char, lines, seen, rev, parents) | |
1701 | for type, char, lines, coldata in edges: |
|
1701 | for type, char, lines, coldata in edges: | |
1702 | graphmod.ascii(ui, state, type, char, lines, coldata) |
|
1702 | graphmod.ascii(ui, state, type, char, lines, coldata) | |
1703 | displayer.close() |
|
1703 | displayer.close() | |
1704 |
|
1704 | |||
1705 | def graphlog(ui, repo, *pats, **opts): |
|
1705 | def graphlog(ui, repo, *pats, **opts): | |
1706 | # Parameters are identical to log command ones |
|
1706 | # Parameters are identical to log command ones | |
1707 | revs, expr, filematcher = getgraphlogrevs(repo, pats, opts) |
|
1707 | revs, expr, filematcher = getgraphlogrevs(repo, pats, opts) | |
1708 | revdag = graphmod.dagwalker(repo, revs) |
|
1708 | revdag = graphmod.dagwalker(repo, revs) | |
1709 |
|
1709 | |||
1710 | getrenamed = None |
|
1710 | getrenamed = None | |
1711 | if opts.get('copies'): |
|
1711 | if opts.get('copies'): | |
1712 | endrev = None |
|
1712 | endrev = None | |
1713 | if opts.get('rev'): |
|
1713 | if opts.get('rev'): | |
1714 | endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1 |
|
1714 | endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1 | |
1715 | getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) |
|
1715 | getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) | |
1716 | displayer = show_changeset(ui, repo, opts, buffered=True) |
|
1716 | displayer = show_changeset(ui, repo, opts, buffered=True) | |
1717 | showparents = [ctx.node() for ctx in repo[None].parents()] |
|
1717 | showparents = [ctx.node() for ctx in repo[None].parents()] | |
1718 | displaygraph(ui, revdag, displayer, showparents, |
|
1718 | displaygraph(ui, revdag, displayer, showparents, | |
1719 | graphmod.asciiedges, getrenamed, filematcher) |
|
1719 | graphmod.asciiedges, getrenamed, filematcher) | |
1720 |
|
1720 | |||
1721 | def checkunsupportedgraphflags(pats, opts): |
|
1721 | def checkunsupportedgraphflags(pats, opts): | |
1722 | for op in ["newest_first"]: |
|
1722 | for op in ["newest_first"]: | |
1723 | if op in opts and opts[op]: |
|
1723 | if op in opts and opts[op]: | |
1724 | raise util.Abort(_("-G/--graph option is incompatible with --%s") |
|
1724 | raise util.Abort(_("-G/--graph option is incompatible with --%s") | |
1725 | % op.replace("_", "-")) |
|
1725 | % op.replace("_", "-")) | |
1726 |
|
1726 | |||
1727 | def graphrevs(repo, nodes, opts): |
|
1727 | def graphrevs(repo, nodes, opts): | |
1728 | limit = loglimit(opts) |
|
1728 | limit = loglimit(opts) | |
1729 | nodes.reverse() |
|
1729 | nodes.reverse() | |
1730 | if limit is not None: |
|
1730 | if limit is not None: | |
1731 | nodes = nodes[:limit] |
|
1731 | nodes = nodes[:limit] | |
1732 | return graphmod.nodes(repo, nodes) |
|
1732 | return graphmod.nodes(repo, nodes) | |
1733 |
|
1733 | |||
1734 | def add(ui, repo, match, dryrun, listsubrepos, prefix, explicitonly): |
|
1734 | def add(ui, repo, match, dryrun, listsubrepos, prefix, explicitonly): | |
1735 | join = lambda f: os.path.join(prefix, f) |
|
1735 | join = lambda f: os.path.join(prefix, f) | |
1736 | bad = [] |
|
1736 | bad = [] | |
1737 | oldbad = match.bad |
|
1737 | oldbad = match.bad | |
1738 | match.bad = lambda x, y: bad.append(x) or oldbad(x, y) |
|
1738 | match.bad = lambda x, y: bad.append(x) or oldbad(x, y) | |
1739 | names = [] |
|
1739 | names = [] | |
1740 | wctx = repo[None] |
|
1740 | wctx = repo[None] | |
1741 | cca = None |
|
1741 | cca = None | |
1742 | abort, warn = scmutil.checkportabilityalert(ui) |
|
1742 | abort, warn = scmutil.checkportabilityalert(ui) | |
1743 | if abort or warn: |
|
1743 | if abort or warn: | |
1744 | cca = scmutil.casecollisionauditor(ui, abort, repo.dirstate) |
|
1744 | cca = scmutil.casecollisionauditor(ui, abort, repo.dirstate) | |
1745 | for f in repo.walk(match): |
|
1745 | for f in repo.walk(match): | |
1746 | exact = match.exact(f) |
|
1746 | exact = match.exact(f) | |
1747 | if exact or not explicitonly and f not in repo.dirstate: |
|
1747 | if exact or not explicitonly and f not in repo.dirstate: | |
1748 | if cca: |
|
1748 | if cca: | |
1749 | cca(f) |
|
1749 | cca(f) | |
1750 | names.append(f) |
|
1750 | names.append(f) | |
1751 | if ui.verbose or not exact: |
|
1751 | if ui.verbose or not exact: | |
1752 | ui.status(_('adding %s\n') % match.rel(join(f))) |
|
1752 | ui.status(_('adding %s\n') % match.rel(join(f))) | |
1753 |
|
1753 | |||
1754 | for subpath in sorted(wctx.substate): |
|
1754 | for subpath in sorted(wctx.substate): | |
1755 | sub = wctx.sub(subpath) |
|
1755 | sub = wctx.sub(subpath) | |
1756 | try: |
|
1756 | try: | |
1757 | submatch = matchmod.narrowmatcher(subpath, match) |
|
1757 | submatch = matchmod.narrowmatcher(subpath, match) | |
1758 | if listsubrepos: |
|
1758 | if listsubrepos: | |
1759 | bad.extend(sub.add(ui, submatch, dryrun, listsubrepos, prefix, |
|
1759 | bad.extend(sub.add(ui, submatch, dryrun, listsubrepos, prefix, | |
1760 | False)) |
|
1760 | False)) | |
1761 | else: |
|
1761 | else: | |
1762 | bad.extend(sub.add(ui, submatch, dryrun, listsubrepos, prefix, |
|
1762 | bad.extend(sub.add(ui, submatch, dryrun, listsubrepos, prefix, | |
1763 | True)) |
|
1763 | True)) | |
1764 | except error.LookupError: |
|
1764 | except error.LookupError: | |
1765 | ui.status(_("skipping missing subrepository: %s\n") |
|
1765 | ui.status(_("skipping missing subrepository: %s\n") | |
1766 | % join(subpath)) |
|
1766 | % join(subpath)) | |
1767 |
|
1767 | |||
1768 | if not dryrun: |
|
1768 | if not dryrun: | |
1769 | rejected = wctx.add(names, prefix) |
|
1769 | rejected = wctx.add(names, prefix) | |
1770 | bad.extend(f for f in rejected if f in match.files()) |
|
1770 | bad.extend(f for f in rejected if f in match.files()) | |
1771 | return bad |
|
1771 | return bad | |
1772 |
|
1772 | |||
1773 | def forget(ui, repo, match, prefix, explicitonly): |
|
1773 | def forget(ui, repo, match, prefix, explicitonly): | |
1774 | join = lambda f: os.path.join(prefix, f) |
|
1774 | join = lambda f: os.path.join(prefix, f) | |
1775 | bad = [] |
|
1775 | bad = [] | |
1776 | oldbad = match.bad |
|
1776 | oldbad = match.bad | |
1777 | match.bad = lambda x, y: bad.append(x) or oldbad(x, y) |
|
1777 | match.bad = lambda x, y: bad.append(x) or oldbad(x, y) | |
1778 | wctx = repo[None] |
|
1778 | wctx = repo[None] | |
1779 | forgot = [] |
|
1779 | forgot = [] | |
1780 | s = repo.status(match=match, clean=True) |
|
1780 | s = repo.status(match=match, clean=True) | |
1781 | forget = sorted(s[0] + s[1] + s[3] + s[6]) |
|
1781 | forget = sorted(s[0] + s[1] + s[3] + s[6]) | |
1782 | if explicitonly: |
|
1782 | if explicitonly: | |
1783 | forget = [f for f in forget if match.exact(f)] |
|
1783 | forget = [f for f in forget if match.exact(f)] | |
1784 |
|
1784 | |||
1785 | for subpath in sorted(wctx.substate): |
|
1785 | for subpath in sorted(wctx.substate): | |
1786 | sub = wctx.sub(subpath) |
|
1786 | sub = wctx.sub(subpath) | |
1787 | try: |
|
1787 | try: | |
1788 | submatch = matchmod.narrowmatcher(subpath, match) |
|
1788 | submatch = matchmod.narrowmatcher(subpath, match) | |
1789 | subbad, subforgot = sub.forget(ui, submatch, prefix) |
|
1789 | subbad, subforgot = sub.forget(ui, submatch, prefix) | |
1790 | bad.extend([subpath + '/' + f for f in subbad]) |
|
1790 | bad.extend([subpath + '/' + f for f in subbad]) | |
1791 | forgot.extend([subpath + '/' + f for f in subforgot]) |
|
1791 | forgot.extend([subpath + '/' + f for f in subforgot]) | |
1792 | except error.LookupError: |
|
1792 | except error.LookupError: | |
1793 | ui.status(_("skipping missing subrepository: %s\n") |
|
1793 | ui.status(_("skipping missing subrepository: %s\n") | |
1794 | % join(subpath)) |
|
1794 | % join(subpath)) | |
1795 |
|
1795 | |||
1796 | if not explicitonly: |
|
1796 | if not explicitonly: | |
1797 | for f in match.files(): |
|
1797 | for f in match.files(): | |
1798 | if f not in repo.dirstate and not os.path.isdir(match.rel(join(f))): |
|
1798 | if f not in repo.dirstate and not os.path.isdir(match.rel(join(f))): | |
1799 | if f not in forgot: |
|
1799 | if f not in forgot: | |
1800 | if os.path.exists(match.rel(join(f))): |
|
1800 | if os.path.exists(match.rel(join(f))): | |
1801 | ui.warn(_('not removing %s: ' |
|
1801 | ui.warn(_('not removing %s: ' | |
1802 | 'file is already untracked\n') |
|
1802 | 'file is already untracked\n') | |
1803 | % match.rel(join(f))) |
|
1803 | % match.rel(join(f))) | |
1804 | bad.append(f) |
|
1804 | bad.append(f) | |
1805 |
|
1805 | |||
1806 | for f in forget: |
|
1806 | for f in forget: | |
1807 | if ui.verbose or not match.exact(f): |
|
1807 | if ui.verbose or not match.exact(f): | |
1808 | ui.status(_('removing %s\n') % match.rel(join(f))) |
|
1808 | ui.status(_('removing %s\n') % match.rel(join(f))) | |
1809 |
|
1809 | |||
1810 | rejected = wctx.forget(forget, prefix) |
|
1810 | rejected = wctx.forget(forget, prefix) | |
1811 | bad.extend(f for f in rejected if f in match.files()) |
|
1811 | bad.extend(f for f in rejected if f in match.files()) | |
1812 | forgot.extend(forget) |
|
1812 | forgot.extend(forget) | |
1813 | return bad, forgot |
|
1813 | return bad, forgot | |
1814 |
|
1814 | |||
1815 | def cat(ui, repo, ctx, matcher, prefix, **opts): |
|
1815 | def cat(ui, repo, ctx, matcher, prefix, **opts): | |
1816 | err = 1 |
|
1816 | err = 1 | |
1817 |
|
1817 | |||
1818 | def write(path): |
|
1818 | def write(path): | |
1819 | fp = makefileobj(repo, opts.get('output'), ctx.node(), |
|
1819 | fp = makefileobj(repo, opts.get('output'), ctx.node(), | |
1820 | pathname=os.path.join(prefix, path)) |
|
1820 | pathname=os.path.join(prefix, path)) | |
1821 | data = ctx[path].data() |
|
1821 | data = ctx[path].data() | |
1822 | if opts.get('decode'): |
|
1822 | if opts.get('decode'): | |
1823 | data = repo.wwritedata(path, data) |
|
1823 | data = repo.wwritedata(path, data) | |
1824 | fp.write(data) |
|
1824 | fp.write(data) | |
1825 | fp.close() |
|
1825 | fp.close() | |
1826 |
|
1826 | |||
1827 | # Automation often uses hg cat on single files, so special case it |
|
1827 | # Automation often uses hg cat on single files, so special case it | |
1828 | # for performance to avoid the cost of parsing the manifest. |
|
1828 | # for performance to avoid the cost of parsing the manifest. | |
1829 | if len(matcher.files()) == 1 and not matcher.anypats(): |
|
1829 | if len(matcher.files()) == 1 and not matcher.anypats(): | |
1830 | file = matcher.files()[0] |
|
1830 | file = matcher.files()[0] | |
1831 | mf = repo.manifest |
|
1831 | mf = repo.manifest | |
1832 | mfnode = ctx._changeset[0] |
|
1832 | mfnode = ctx._changeset[0] | |
1833 | if mf.find(mfnode, file)[0]: |
|
1833 | if mf.find(mfnode, file)[0]: | |
1834 | write(file) |
|
1834 | write(file) | |
1835 | return 0 |
|
1835 | return 0 | |
1836 |
|
1836 | |||
1837 | # Don't warn about "missing" files that are really in subrepos |
|
1837 | # Don't warn about "missing" files that are really in subrepos | |
1838 | bad = matcher.bad |
|
1838 | bad = matcher.bad | |
1839 |
|
1839 | |||
1840 | def badfn(path, msg): |
|
1840 | def badfn(path, msg): | |
1841 | for subpath in ctx.substate: |
|
1841 | for subpath in ctx.substate: | |
1842 | if path.startswith(subpath): |
|
1842 | if path.startswith(subpath): | |
1843 | return |
|
1843 | return | |
1844 | bad(path, msg) |
|
1844 | bad(path, msg) | |
1845 |
|
1845 | |||
1846 | matcher.bad = badfn |
|
1846 | matcher.bad = badfn | |
1847 |
|
1847 | |||
1848 | for abs in ctx.walk(matcher): |
|
1848 | for abs in ctx.walk(matcher): | |
1849 | write(abs) |
|
1849 | write(abs) | |
1850 | err = 0 |
|
1850 | err = 0 | |
1851 |
|
1851 | |||
1852 | matcher.bad = bad |
|
1852 | matcher.bad = bad | |
1853 |
|
1853 | |||
1854 | for subpath in sorted(ctx.substate): |
|
1854 | for subpath in sorted(ctx.substate): | |
1855 | sub = ctx.sub(subpath) |
|
1855 | sub = ctx.sub(subpath) | |
1856 | try: |
|
1856 | try: | |
1857 | submatch = matchmod.narrowmatcher(subpath, matcher) |
|
1857 | submatch = matchmod.narrowmatcher(subpath, matcher) | |
1858 |
|
1858 | |||
1859 | if not sub.cat(ui, submatch, os.path.join(prefix, sub._path), |
|
1859 | if not sub.cat(ui, submatch, os.path.join(prefix, sub._path), | |
1860 | **opts): |
|
1860 | **opts): | |
1861 | err = 0 |
|
1861 | err = 0 | |
1862 | except error.RepoLookupError: |
|
1862 | except error.RepoLookupError: | |
1863 | ui.status(_("skipping missing subrepository: %s\n") |
|
1863 | ui.status(_("skipping missing subrepository: %s\n") | |
1864 | % os.path.join(prefix, subpath)) |
|
1864 | % os.path.join(prefix, subpath)) | |
1865 |
|
1865 | |||
1866 | return err |
|
1866 | return err | |
1867 |
|
1867 | |||
1868 | def duplicatecopies(repo, rev, fromrev): |
|
1868 | def duplicatecopies(repo, rev, fromrev): | |
1869 | '''reproduce copies from fromrev to rev in the dirstate''' |
|
1869 | '''reproduce copies from fromrev to rev in the dirstate''' | |
1870 | for dst, src in copies.pathcopies(repo[fromrev], repo[rev]).iteritems(): |
|
1870 | for dst, src in copies.pathcopies(repo[fromrev], repo[rev]).iteritems(): | |
1871 | # copies.pathcopies returns backward renames, so dst might not |
|
1871 | # copies.pathcopies returns backward renames, so dst might not | |
1872 | # actually be in the dirstate |
|
1872 | # actually be in the dirstate | |
1873 | if repo.dirstate[dst] in "nma": |
|
1873 | if repo.dirstate[dst] in "nma": | |
1874 | repo.dirstate.copy(src, dst) |
|
1874 | repo.dirstate.copy(src, dst) | |
1875 |
|
1875 | |||
1876 | def commit(ui, repo, commitfunc, pats, opts): |
|
1876 | def commit(ui, repo, commitfunc, pats, opts): | |
1877 | '''commit the specified files or all outstanding changes''' |
|
1877 | '''commit the specified files or all outstanding changes''' | |
1878 | date = opts.get('date') |
|
1878 | date = opts.get('date') | |
1879 | if date: |
|
1879 | if date: | |
1880 | opts['date'] = util.parsedate(date) |
|
1880 | opts['date'] = util.parsedate(date) | |
1881 | message = logmessage(ui, opts) |
|
1881 | message = logmessage(ui, opts) | |
1882 |
|
1882 | |||
1883 | # extract addremove carefully -- this function can be called from a command |
|
1883 | # extract addremove carefully -- this function can be called from a command | |
1884 | # that doesn't support addremove |
|
1884 | # that doesn't support addremove | |
1885 | if opts.get('addremove'): |
|
1885 | if opts.get('addremove'): | |
1886 | scmutil.addremove(repo, pats, opts) |
|
1886 | scmutil.addremove(repo, pats, opts) | |
1887 |
|
1887 | |||
1888 | return commitfunc(ui, repo, message, |
|
1888 | return commitfunc(ui, repo, message, | |
1889 | scmutil.match(repo[None], pats, opts), opts) |
|
1889 | scmutil.match(repo[None], pats, opts), opts) | |
1890 |
|
1890 | |||
1891 | def amend(ui, repo, commitfunc, old, extra, pats, opts): |
|
1891 | def amend(ui, repo, commitfunc, old, extra, pats, opts): | |
1892 | ui.note(_('amending changeset %s\n') % old) |
|
1892 | ui.note(_('amending changeset %s\n') % old) | |
1893 | base = old.p1() |
|
1893 | base = old.p1() | |
1894 |
|
1894 | |||
1895 | wlock = lock = newid = None |
|
1895 | wlock = lock = newid = None | |
1896 | try: |
|
1896 | try: | |
1897 | wlock = repo.wlock() |
|
1897 | wlock = repo.wlock() | |
1898 | lock = repo.lock() |
|
1898 | lock = repo.lock() | |
1899 | tr = repo.transaction('amend') |
|
1899 | tr = repo.transaction('amend') | |
1900 | try: |
|
1900 | try: | |
1901 | # See if we got a message from -m or -l, if not, open the editor |
|
1901 | # See if we got a message from -m or -l, if not, open the editor | |
1902 | # with the message of the changeset to amend |
|
1902 | # with the message of the changeset to amend | |
1903 | message = logmessage(ui, opts) |
|
1903 | message = logmessage(ui, opts) | |
1904 | # ensure logfile does not conflict with later enforcement of the |
|
1904 | # ensure logfile does not conflict with later enforcement of the | |
1905 | # message. potential logfile content has been processed by |
|
1905 | # message. potential logfile content has been processed by | |
1906 | # `logmessage` anyway. |
|
1906 | # `logmessage` anyway. | |
1907 | opts.pop('logfile') |
|
1907 | opts.pop('logfile') | |
1908 | # First, do a regular commit to record all changes in the working |
|
1908 | # First, do a regular commit to record all changes in the working | |
1909 | # directory (if there are any) |
|
1909 | # directory (if there are any) | |
1910 | ui.callhooks = False |
|
1910 | ui.callhooks = False | |
1911 | currentbookmark = repo._bookmarkcurrent |
|
1911 | currentbookmark = repo._bookmarkcurrent | |
1912 | try: |
|
1912 | try: | |
1913 | repo._bookmarkcurrent = None |
|
1913 | repo._bookmarkcurrent = None | |
1914 | opts['message'] = 'temporary amend commit for %s' % old |
|
1914 | opts['message'] = 'temporary amend commit for %s' % old | |
1915 | node = commit(ui, repo, commitfunc, pats, opts) |
|
1915 | node = commit(ui, repo, commitfunc, pats, opts) | |
1916 | finally: |
|
1916 | finally: | |
1917 | repo._bookmarkcurrent = currentbookmark |
|
1917 | repo._bookmarkcurrent = currentbookmark | |
1918 | ui.callhooks = True |
|
1918 | ui.callhooks = True | |
1919 | ctx = repo[node] |
|
1919 | ctx = repo[node] | |
1920 |
|
1920 | |||
1921 | # Participating changesets: |
|
1921 | # Participating changesets: | |
1922 | # |
|
1922 | # | |
1923 | # node/ctx o - new (intermediate) commit that contains changes |
|
1923 | # node/ctx o - new (intermediate) commit that contains changes | |
1924 | # | from working dir to go into amending commit |
|
1924 | # | from working dir to go into amending commit | |
1925 | # | (or a workingctx if there were no changes) |
|
1925 | # | (or a workingctx if there were no changes) | |
1926 | # | |
|
1926 | # | | |
1927 | # old o - changeset to amend |
|
1927 | # old o - changeset to amend | |
1928 | # | |
|
1928 | # | | |
1929 | # base o - parent of amending changeset |
|
1929 | # base o - parent of amending changeset | |
1930 |
|
1930 | |||
1931 | # Update extra dict from amended commit (e.g. to preserve graft |
|
1931 | # Update extra dict from amended commit (e.g. to preserve graft | |
1932 | # source) |
|
1932 | # source) | |
1933 | extra.update(old.extra()) |
|
1933 | extra.update(old.extra()) | |
1934 |
|
1934 | |||
1935 | # Also update it from the intermediate commit or from the wctx |
|
1935 | # Also update it from the intermediate commit or from the wctx | |
1936 | extra.update(ctx.extra()) |
|
1936 | extra.update(ctx.extra()) | |
1937 |
|
1937 | |||
1938 | if len(old.parents()) > 1: |
|
1938 | if len(old.parents()) > 1: | |
1939 | # ctx.files() isn't reliable for merges, so fall back to the |
|
1939 | # ctx.files() isn't reliable for merges, so fall back to the | |
1940 | # slower repo.status() method |
|
1940 | # slower repo.status() method | |
1941 | files = set([fn for st in repo.status(base, old)[:3] |
|
1941 | files = set([fn for st in repo.status(base, old)[:3] | |
1942 | for fn in st]) |
|
1942 | for fn in st]) | |
1943 | else: |
|
1943 | else: | |
1944 | files = set(old.files()) |
|
1944 | files = set(old.files()) | |
1945 |
|
1945 | |||
1946 | # Second, we use either the commit we just did, or if there were no |
|
1946 | # Second, we use either the commit we just did, or if there were no | |
1947 | # changes the parent of the working directory as the version of the |
|
1947 | # changes the parent of the working directory as the version of the | |
1948 | # files in the final amend commit |
|
1948 | # files in the final amend commit | |
1949 | if node: |
|
1949 | if node: | |
1950 | ui.note(_('copying changeset %s to %s\n') % (ctx, base)) |
|
1950 | ui.note(_('copying changeset %s to %s\n') % (ctx, base)) | |
1951 |
|
1951 | |||
1952 | user = ctx.user() |
|
1952 | user = ctx.user() | |
1953 | date = ctx.date() |
|
1953 | date = ctx.date() | |
1954 | # Recompute copies (avoid recording a -> b -> a) |
|
1954 | # Recompute copies (avoid recording a -> b -> a) | |
1955 | copied = copies.pathcopies(base, ctx) |
|
1955 | copied = copies.pathcopies(base, ctx) | |
1956 |
|
1956 | |||
1957 | # Prune files which were reverted by the updates: if old |
|
1957 | # Prune files which were reverted by the updates: if old | |
1958 | # introduced file X and our intermediate commit, node, |
|
1958 | # introduced file X and our intermediate commit, node, | |
1959 | # renamed that file, then those two files are the same and |
|
1959 | # renamed that file, then those two files are the same and | |
1960 | # we can discard X from our list of files. Likewise if X |
|
1960 | # we can discard X from our list of files. Likewise if X | |
1961 | # was deleted, it's no longer relevant |
|
1961 | # was deleted, it's no longer relevant | |
1962 | files.update(ctx.files()) |
|
1962 | files.update(ctx.files()) | |
1963 |
|
1963 | |||
1964 | def samefile(f): |
|
1964 | def samefile(f): | |
1965 | if f in ctx.manifest(): |
|
1965 | if f in ctx.manifest(): | |
1966 | a = ctx.filectx(f) |
|
1966 | a = ctx.filectx(f) | |
1967 | if f in base.manifest(): |
|
1967 | if f in base.manifest(): | |
1968 | b = base.filectx(f) |
|
1968 | b = base.filectx(f) | |
1969 | return (not a.cmp(b) |
|
1969 | return (not a.cmp(b) | |
1970 | and a.flags() == b.flags()) |
|
1970 | and a.flags() == b.flags()) | |
1971 | else: |
|
1971 | else: | |
1972 | return False |
|
1972 | return False | |
1973 | else: |
|
1973 | else: | |
1974 | return f not in base.manifest() |
|
1974 | return f not in base.manifest() | |
1975 | files = [f for f in files if not samefile(f)] |
|
1975 | files = [f for f in files if not samefile(f)] | |
1976 |
|
1976 | |||
1977 | def filectxfn(repo, ctx_, path): |
|
1977 | def filectxfn(repo, ctx_, path): | |
1978 | try: |
|
1978 | try: | |
1979 | fctx = ctx[path] |
|
1979 | fctx = ctx[path] | |
1980 | flags = fctx.flags() |
|
1980 | flags = fctx.flags() | |
1981 | mctx = context.memfilectx(fctx.path(), fctx.data(), |
|
1981 | mctx = context.memfilectx(fctx.path(), fctx.data(), | |
1982 | islink='l' in flags, |
|
1982 | islink='l' in flags, | |
1983 | isexec='x' in flags, |
|
1983 | isexec='x' in flags, | |
1984 | copied=copied.get(path)) |
|
1984 | copied=copied.get(path)) | |
1985 | return mctx |
|
1985 | return mctx | |
1986 | except KeyError: |
|
1986 | except KeyError: | |
1987 | raise IOError |
|
1987 | raise IOError | |
1988 | else: |
|
1988 | else: | |
1989 | ui.note(_('copying changeset %s to %s\n') % (old, base)) |
|
1989 | ui.note(_('copying changeset %s to %s\n') % (old, base)) | |
1990 |
|
1990 | |||
1991 | # Use version of files as in the old cset |
|
1991 | # Use version of files as in the old cset | |
1992 | def filectxfn(repo, ctx_, path): |
|
1992 | def filectxfn(repo, ctx_, path): | |
1993 | try: |
|
1993 | try: | |
1994 | return old.filectx(path) |
|
1994 | return old.filectx(path) | |
1995 | except KeyError: |
|
1995 | except KeyError: | |
1996 | raise IOError |
|
1996 | raise IOError | |
1997 |
|
1997 | |||
1998 | user = opts.get('user') or old.user() |
|
1998 | user = opts.get('user') or old.user() | |
1999 | date = opts.get('date') or old.date() |
|
1999 | date = opts.get('date') or old.date() | |
2000 | editmsg = False |
|
2000 | editmsg = False | |
2001 | if not message: |
|
2001 | if not message: | |
2002 | editmsg = True |
|
2002 | editmsg = True | |
2003 | message = old.description() |
|
2003 | message = old.description() | |
2004 | elif opts.get('edit'): |
|
2004 | elif opts.get('edit'): | |
2005 | editmsg = True |
|
2005 | editmsg = True | |
2006 |
|
2006 | |||
2007 | pureextra = extra.copy() |
|
2007 | pureextra = extra.copy() | |
2008 | extra['amend_source'] = old.hex() |
|
2008 | extra['amend_source'] = old.hex() | |
2009 |
|
2009 | |||
2010 | new = context.memctx(repo, |
|
2010 | new = context.memctx(repo, | |
2011 | parents=[base.node(), old.p2().node()], |
|
2011 | parents=[base.node(), old.p2().node()], | |
2012 | text=message, |
|
2012 | text=message, | |
2013 | files=files, |
|
2013 | files=files, | |
2014 | filectxfn=filectxfn, |
|
2014 | filectxfn=filectxfn, | |
2015 | user=user, |
|
2015 | user=user, | |
2016 | date=date, |
|
2016 | date=date, | |
2017 | extra=extra) |
|
2017 | extra=extra) | |
2018 | if editmsg: |
|
2018 | if editmsg: | |
2019 | new._text = commitforceeditor(repo, new, []) |
|
2019 | new._text = commitforceeditor(repo, new, []) | |
2020 | repo.savecommitmessage(new.description()) |
|
2020 | repo.savecommitmessage(new.description()) | |
2021 |
|
2021 | |||
2022 | newdesc = changelog.stripdesc(new.description()) |
|
2022 | newdesc = changelog.stripdesc(new.description()) | |
2023 | if ((not node) |
|
2023 | if ((not node) | |
2024 | and newdesc == old.description() |
|
2024 | and newdesc == old.description() | |
2025 | and user == old.user() |
|
2025 | and user == old.user() | |
2026 | and date == old.date() |
|
2026 | and date == old.date() | |
2027 | and pureextra == old.extra()): |
|
2027 | and pureextra == old.extra()): | |
2028 | # nothing changed. continuing here would create a new node |
|
2028 | # nothing changed. continuing here would create a new node | |
2029 | # anyway because of the amend_source noise. |
|
2029 | # anyway because of the amend_source noise. | |
2030 | # |
|
2030 | # | |
2031 | # This not what we expect from amend. |
|
2031 | # This not what we expect from amend. | |
2032 | return old.node() |
|
2032 | return old.node() | |
2033 |
|
2033 | |||
2034 | ph = repo.ui.config('phases', 'new-commit', phases.draft) |
|
2034 | ph = repo.ui.config('phases', 'new-commit', phases.draft) | |
2035 | try: |
|
2035 | try: | |
2036 | if opts.get('secret'): |
|
2036 | if opts.get('secret'): | |
2037 | commitphase = 'secret' |
|
2037 | commitphase = 'secret' | |
2038 | else: |
|
2038 | else: | |
2039 | commitphase = old.phase() |
|
2039 | commitphase = old.phase() | |
2040 | repo.ui.setconfig('phases', 'new-commit', commitphase, 'amend') |
|
2040 | repo.ui.setconfig('phases', 'new-commit', commitphase, 'amend') | |
2041 | newid = repo.commitctx(new) |
|
2041 | newid = repo.commitctx(new) | |
2042 | finally: |
|
2042 | finally: | |
2043 | repo.ui.setconfig('phases', 'new-commit', ph, 'amend') |
|
2043 | repo.ui.setconfig('phases', 'new-commit', ph, 'amend') | |
2044 | if newid != old.node(): |
|
2044 | if newid != old.node(): | |
2045 | # Reroute the working copy parent to the new changeset |
|
2045 | # Reroute the working copy parent to the new changeset | |
2046 | repo.setparents(newid, nullid) |
|
2046 | repo.setparents(newid, nullid) | |
2047 |
|
2047 | |||
2048 | # Move bookmarks from old parent to amend commit |
|
2048 | # Move bookmarks from old parent to amend commit | |
2049 | bms = repo.nodebookmarks(old.node()) |
|
2049 | bms = repo.nodebookmarks(old.node()) | |
2050 | if bms: |
|
2050 | if bms: | |
2051 | marks = repo._bookmarks |
|
2051 | marks = repo._bookmarks | |
2052 | for bm in bms: |
|
2052 | for bm in bms: | |
2053 | marks[bm] = newid |
|
2053 | marks[bm] = newid | |
2054 | marks.write() |
|
2054 | marks.write() | |
2055 | #commit the whole amend process |
|
2055 | #commit the whole amend process | |
2056 | if obsolete._enabled and newid != old.node(): |
|
2056 | if obsolete._enabled and newid != old.node(): | |
2057 | # mark the new changeset as successor of the rewritten one |
|
2057 | # mark the new changeset as successor of the rewritten one | |
2058 | new = repo[newid] |
|
2058 | new = repo[newid] | |
2059 | obs = [(old, (new,))] |
|
2059 | obs = [(old, (new,))] | |
2060 | if node: |
|
2060 | if node: | |
2061 | obs.append((ctx, ())) |
|
2061 | obs.append((ctx, ())) | |
2062 |
|
2062 | |||
2063 | obsolete.createmarkers(repo, obs) |
|
2063 | obsolete.createmarkers(repo, obs) | |
2064 | tr.close() |
|
2064 | tr.close() | |
2065 | finally: |
|
2065 | finally: | |
2066 | tr.release() |
|
2066 | tr.release() | |
2067 | if (not obsolete._enabled) and newid != old.node(): |
|
2067 | if (not obsolete._enabled) and newid != old.node(): | |
2068 | # Strip the intermediate commit (if there was one) and the amended |
|
2068 | # Strip the intermediate commit (if there was one) and the amended | |
2069 | # commit |
|
2069 | # commit | |
2070 | if node: |
|
2070 | if node: | |
2071 | ui.note(_('stripping intermediate changeset %s\n') % ctx) |
|
2071 | ui.note(_('stripping intermediate changeset %s\n') % ctx) | |
2072 | ui.note(_('stripping amended changeset %s\n') % old) |
|
2072 | ui.note(_('stripping amended changeset %s\n') % old) | |
2073 | repair.strip(ui, repo, old.node(), topic='amend-backup') |
|
2073 | repair.strip(ui, repo, old.node(), topic='amend-backup') | |
2074 | finally: |
|
2074 | finally: | |
2075 | if newid is None: |
|
2075 | if newid is None: | |
2076 | repo.dirstate.invalidate() |
|
2076 | repo.dirstate.invalidate() | |
2077 | lockmod.release(lock, wlock) |
|
2077 | lockmod.release(lock, wlock) | |
2078 | return newid |
|
2078 | return newid | |
2079 |
|
2079 | |||
2080 | def commiteditor(repo, ctx, subs): |
|
2080 | def commiteditor(repo, ctx, subs): | |
2081 | if ctx.description(): |
|
2081 | if ctx.description(): | |
2082 | return ctx.description() |
|
2082 | return ctx.description() | |
2083 | return commitforceeditor(repo, ctx, subs) |
|
2083 | return commitforceeditor(repo, ctx, subs) | |
2084 |
|
2084 | |||
2085 | def commitforceeditor(repo, ctx, subs): |
|
2085 | def commitforceeditor(repo, ctx, subs): | |
2086 | edittext = [] |
|
2086 | edittext = [] | |
2087 | modified, added, removed = ctx.modified(), ctx.added(), ctx.removed() |
|
2087 | modified, added, removed = ctx.modified(), ctx.added(), ctx.removed() | |
2088 | if ctx.description(): |
|
2088 | if ctx.description(): | |
2089 | edittext.append(ctx.description()) |
|
2089 | edittext.append(ctx.description()) | |
2090 | edittext.append("") |
|
2090 | edittext.append("") | |
2091 | edittext.append("") # Empty line between message and comments. |
|
2091 | edittext.append("") # Empty line between message and comments. | |
2092 | edittext.append(_("HG: Enter commit message." |
|
2092 | edittext.append(_("HG: Enter commit message." | |
2093 | " Lines beginning with 'HG:' are removed.")) |
|
2093 | " Lines beginning with 'HG:' are removed.")) | |
2094 | edittext.append(_("HG: Leave message empty to abort commit.")) |
|
2094 | edittext.append(_("HG: Leave message empty to abort commit.")) | |
2095 | edittext.append("HG: --") |
|
2095 | edittext.append("HG: --") | |
2096 | edittext.append(_("HG: user: %s") % ctx.user()) |
|
2096 | edittext.append(_("HG: user: %s") % ctx.user()) | |
2097 | if ctx.p2(): |
|
2097 | if ctx.p2(): | |
2098 | edittext.append(_("HG: branch merge")) |
|
2098 | edittext.append(_("HG: branch merge")) | |
2099 | if ctx.branch(): |
|
2099 | if ctx.branch(): | |
2100 | edittext.append(_("HG: branch '%s'") % ctx.branch()) |
|
2100 | edittext.append(_("HG: branch '%s'") % ctx.branch()) | |
2101 | if bookmarks.iscurrent(repo): |
|
2101 | if bookmarks.iscurrent(repo): | |
2102 | edittext.append(_("HG: bookmark '%s'") % repo._bookmarkcurrent) |
|
2102 | edittext.append(_("HG: bookmark '%s'") % repo._bookmarkcurrent) | |
2103 | edittext.extend([_("HG: subrepo %s") % s for s in subs]) |
|
2103 | edittext.extend([_("HG: subrepo %s") % s for s in subs]) | |
2104 | edittext.extend([_("HG: added %s") % f for f in added]) |
|
2104 | edittext.extend([_("HG: added %s") % f for f in added]) | |
2105 | edittext.extend([_("HG: changed %s") % f for f in modified]) |
|
2105 | edittext.extend([_("HG: changed %s") % f for f in modified]) | |
2106 | edittext.extend([_("HG: removed %s") % f for f in removed]) |
|
2106 | edittext.extend([_("HG: removed %s") % f for f in removed]) | |
2107 | if not added and not modified and not removed: |
|
2107 | if not added and not modified and not removed: | |
2108 | edittext.append(_("HG: no files changed")) |
|
2108 | edittext.append(_("HG: no files changed")) | |
2109 | edittext.append("") |
|
2109 | edittext.append("") | |
2110 | # run editor in the repository root |
|
2110 | # run editor in the repository root | |
2111 | olddir = os.getcwd() |
|
2111 | olddir = os.getcwd() | |
2112 | os.chdir(repo.root) |
|
2112 | os.chdir(repo.root) | |
2113 | text = repo.ui.edit("\n".join(edittext), ctx.user(), ctx.extra()) |
|
2113 | text = repo.ui.edit("\n".join(edittext), ctx.user(), ctx.extra()) | |
2114 | text = re.sub("(?m)^HG:.*(\n|$)", "", text) |
|
2114 | text = re.sub("(?m)^HG:.*(\n|$)", "", text) | |
2115 | os.chdir(olddir) |
|
2115 | os.chdir(olddir) | |
2116 |
|
2116 | |||
2117 | if not text.strip(): |
|
2117 | if not text.strip(): | |
2118 | raise util.Abort(_("empty commit message")) |
|
2118 | raise util.Abort(_("empty commit message")) | |
2119 |
|
2119 | |||
2120 | return text |
|
2120 | return text | |
2121 |
|
2121 | |||
2122 | def commitstatus(repo, node, branch, bheads=None, opts={}): |
|
2122 | def commitstatus(repo, node, branch, bheads=None, opts={}): | |
2123 | ctx = repo[node] |
|
2123 | ctx = repo[node] | |
2124 | parents = ctx.parents() |
|
2124 | parents = ctx.parents() | |
2125 |
|
2125 | |||
2126 | if (not opts.get('amend') and bheads and node not in bheads and not |
|
2126 | if (not opts.get('amend') and bheads and node not in bheads and not | |
2127 | [x for x in parents if x.node() in bheads and x.branch() == branch]): |
|
2127 | [x for x in parents if x.node() in bheads and x.branch() == branch]): | |
2128 | repo.ui.status(_('created new head\n')) |
|
2128 | repo.ui.status(_('created new head\n')) | |
2129 | # The message is not printed for initial roots. For the other |
|
2129 | # The message is not printed for initial roots. For the other | |
2130 | # changesets, it is printed in the following situations: |
|
2130 | # changesets, it is printed in the following situations: | |
2131 | # |
|
2131 | # | |
2132 | # Par column: for the 2 parents with ... |
|
2132 | # Par column: for the 2 parents with ... | |
2133 | # N: null or no parent |
|
2133 | # N: null or no parent | |
2134 | # B: parent is on another named branch |
|
2134 | # B: parent is on another named branch | |
2135 | # C: parent is a regular non head changeset |
|
2135 | # C: parent is a regular non head changeset | |
2136 | # H: parent was a branch head of the current branch |
|
2136 | # H: parent was a branch head of the current branch | |
2137 | # Msg column: whether we print "created new head" message |
|
2137 | # Msg column: whether we print "created new head" message | |
2138 | # In the following, it is assumed that there already exists some |
|
2138 | # In the following, it is assumed that there already exists some | |
2139 | # initial branch heads of the current branch, otherwise nothing is |
|
2139 | # initial branch heads of the current branch, otherwise nothing is | |
2140 | # printed anyway. |
|
2140 | # printed anyway. | |
2141 | # |
|
2141 | # | |
2142 | # Par Msg Comment |
|
2142 | # Par Msg Comment | |
2143 | # N N y additional topo root |
|
2143 | # N N y additional topo root | |
2144 | # |
|
2144 | # | |
2145 | # B N y additional branch root |
|
2145 | # B N y additional branch root | |
2146 | # C N y additional topo head |
|
2146 | # C N y additional topo head | |
2147 | # H N n usual case |
|
2147 | # H N n usual case | |
2148 | # |
|
2148 | # | |
2149 | # B B y weird additional branch root |
|
2149 | # B B y weird additional branch root | |
2150 | # C B y branch merge |
|
2150 | # C B y branch merge | |
2151 | # H B n merge with named branch |
|
2151 | # H B n merge with named branch | |
2152 | # |
|
2152 | # | |
2153 | # C C y additional head from merge |
|
2153 | # C C y additional head from merge | |
2154 | # C H n merge with a head |
|
2154 | # C H n merge with a head | |
2155 | # |
|
2155 | # | |
2156 | # H H n head merge: head count decreases |
|
2156 | # H H n head merge: head count decreases | |
2157 |
|
2157 | |||
2158 | if not opts.get('close_branch'): |
|
2158 | if not opts.get('close_branch'): | |
2159 | for r in parents: |
|
2159 | for r in parents: | |
2160 | if r.closesbranch() and r.branch() == branch: |
|
2160 | if r.closesbranch() and r.branch() == branch: | |
2161 | repo.ui.status(_('reopening closed branch head %d\n') % r) |
|
2161 | repo.ui.status(_('reopening closed branch head %d\n') % r) | |
2162 |
|
2162 | |||
2163 | if repo.ui.debugflag: |
|
2163 | if repo.ui.debugflag: | |
2164 | repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex())) |
|
2164 | repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex())) | |
2165 | elif repo.ui.verbose: |
|
2165 | elif repo.ui.verbose: | |
2166 | repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx)) |
|
2166 | repo.ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx)) | |
2167 |
|
2167 | |||
2168 | def revert(ui, repo, ctx, parents, *pats, **opts): |
|
2168 | def revert(ui, repo, ctx, parents, *pats, **opts): | |
2169 | parent, p2 = parents |
|
2169 | parent, p2 = parents | |
2170 | node = ctx.node() |
|
2170 | node = ctx.node() | |
2171 |
|
2171 | |||
2172 | mf = ctx.manifest() |
|
2172 | mf = ctx.manifest() | |
2173 | if node == parent: |
|
2173 | if node == parent: | |
2174 | pmf = mf |
|
2174 | pmf = mf | |
2175 | else: |
|
2175 | else: | |
2176 | pmf = None |
|
2176 | pmf = None | |
2177 |
|
2177 | |||
2178 | # need all matching names in dirstate and manifest of target rev, |
|
2178 | # need all matching names in dirstate and manifest of target rev, | |
2179 | # so have to walk both. do not print errors if files exist in one |
|
2179 | # so have to walk both. do not print errors if files exist in one | |
2180 | # but not other. |
|
2180 | # but not other. | |
2181 |
|
2181 | |||
2182 | names = {} |
|
2182 | names = {} | |
2183 |
|
2183 | |||
2184 | wlock = repo.wlock() |
|
2184 | wlock = repo.wlock() | |
2185 | try: |
|
2185 | try: | |
2186 | # walk dirstate. |
|
2186 | # walk dirstate. | |
2187 |
|
2187 | |||
2188 | m = scmutil.match(repo[None], pats, opts) |
|
2188 | m = scmutil.match(repo[None], pats, opts) | |
2189 | m.bad = lambda x, y: False |
|
2189 | m.bad = lambda x, y: False | |
2190 | for abs in repo.walk(m): |
|
2190 | for abs in repo.walk(m): | |
2191 | names[abs] = m.rel(abs), m.exact(abs) |
|
2191 | names[abs] = m.rel(abs), m.exact(abs) | |
2192 |
|
2192 | |||
2193 | # walk target manifest. |
|
2193 | # walk target manifest. | |
2194 |
|
2194 | |||
2195 | def badfn(path, msg): |
|
2195 | def badfn(path, msg): | |
2196 | if path in names: |
|
2196 | if path in names: | |
2197 | return |
|
2197 | return | |
2198 | if path in ctx.substate: |
|
2198 | if path in ctx.substate: | |
2199 | return |
|
2199 | return | |
2200 | path_ = path + '/' |
|
2200 | path_ = path + '/' | |
2201 | for f in names: |
|
2201 | for f in names: | |
2202 | if f.startswith(path_): |
|
2202 | if f.startswith(path_): | |
2203 | return |
|
2203 | return | |
2204 | ui.warn("%s: %s\n" % (m.rel(path), msg)) |
|
2204 | ui.warn("%s: %s\n" % (m.rel(path), msg)) | |
2205 |
|
2205 | |||
2206 | m = scmutil.match(ctx, pats, opts) |
|
2206 | m = scmutil.match(ctx, pats, opts) | |
2207 | m.bad = badfn |
|
2207 | m.bad = badfn | |
2208 | for abs in ctx.walk(m): |
|
2208 | for abs in ctx.walk(m): | |
2209 | if abs not in names: |
|
2209 | if abs not in names: | |
2210 | names[abs] = m.rel(abs), m.exact(abs) |
|
2210 | names[abs] = m.rel(abs), m.exact(abs) | |
2211 |
|
2211 | |||
2212 | # get the list of subrepos that must be reverted |
|
2212 | # get the list of subrepos that must be reverted | |
2213 | targetsubs = sorted(s for s in ctx.substate if m(s)) |
|
2213 | targetsubs = sorted(s for s in ctx.substate if m(s)) | |
2214 | m = scmutil.matchfiles(repo, names) |
|
2214 | m = scmutil.matchfiles(repo, names) | |
2215 | changes = repo.status(match=m)[:4] |
|
2215 | changes = repo.status(match=m)[:4] | |
2216 | modified, added, removed, deleted = map(set, changes) |
|
2216 | modified, added, removed, deleted = map(set, changes) | |
2217 |
|
2217 | |||
2218 | # if f is a rename, also revert the source |
|
2218 | # if f is a rename, also revert the source | |
2219 | cwd = repo.getcwd() |
|
2219 | cwd = repo.getcwd() | |
2220 | for f in added: |
|
2220 | for f in added: | |
2221 | src = repo.dirstate.copied(f) |
|
2221 | src = repo.dirstate.copied(f) | |
2222 | if src and src not in names and repo.dirstate[src] == 'r': |
|
2222 | if src and src not in names and repo.dirstate[src] == 'r': | |
2223 | removed.add(src) |
|
2223 | removed.add(src) | |
2224 | names[src] = (repo.pathto(src, cwd), True) |
|
2224 | names[src] = (repo.pathto(src, cwd), True) | |
2225 |
|
2225 | |||
2226 | def removeforget(abs): |
|
2226 | def removeforget(abs): | |
2227 | if repo.dirstate[abs] == 'a': |
|
2227 | if repo.dirstate[abs] == 'a': | |
2228 | return _('forgetting %s\n') |
|
2228 | return _('forgetting %s\n') | |
2229 | return _('removing %s\n') |
|
2229 | return _('removing %s\n') | |
2230 |
|
2230 | |||
2231 | revert = ([], _('reverting %s\n')) |
|
2231 | revert = ([], _('reverting %s\n')) | |
2232 | add = ([], _('adding %s\n')) |
|
2232 | add = ([], _('adding %s\n')) | |
2233 | remove = ([], removeforget) |
|
2233 | remove = ([], removeforget) | |
2234 | undelete = ([], _('undeleting %s\n')) |
|
2234 | undelete = ([], _('undeleting %s\n')) | |
2235 |
|
2235 | |||
2236 | disptable = ( |
|
2236 | disptable = ( | |
2237 | # dispatch table: |
|
2237 | # dispatch table: | |
2238 | # file state |
|
2238 | # file state | |
2239 | # action if in target manifest |
|
2239 | # action if in target manifest | |
2240 | # action if not in target manifest |
|
2240 | # action if not in target manifest | |
2241 | # make backup if in target manifest |
|
2241 | # make backup if in target manifest | |
2242 | # make backup if not in target manifest |
|
2242 | # make backup if not in target manifest | |
2243 | (modified, revert, remove, True, True), |
|
2243 | (modified, revert, remove, True, True), | |
2244 | (added, revert, remove, True, False), |
|
2244 | (added, revert, remove, True, False), | |
2245 | (removed, undelete, None, True, False), |
|
2245 | (removed, undelete, None, True, False), | |
2246 | (deleted, revert, remove, False, False), |
|
2246 | (deleted, revert, remove, False, False), | |
2247 | ) |
|
2247 | ) | |
2248 |
|
2248 | |||
2249 | for abs, (rel, exact) in sorted(names.items()): |
|
2249 | for abs, (rel, exact) in sorted(names.items()): | |
2250 | mfentry = mf.get(abs) |
|
2250 | mfentry = mf.get(abs) | |
2251 | target = repo.wjoin(abs) |
|
2251 | target = repo.wjoin(abs) | |
2252 | def handle(xlist, dobackup): |
|
2252 | def handle(xlist, dobackup): | |
2253 | xlist[0].append(abs) |
|
2253 | xlist[0].append(abs) | |
2254 | if (dobackup and not opts.get('no_backup') and |
|
2254 | if (dobackup and not opts.get('no_backup') and | |
2255 | os.path.lexists(target) and |
|
2255 | os.path.lexists(target) and | |
2256 | abs in ctx and repo[None][abs].cmp(ctx[abs])): |
|
2256 | abs in ctx and repo[None][abs].cmp(ctx[abs])): | |
2257 | bakname = "%s.orig" % rel |
|
2257 | bakname = "%s.orig" % rel | |
2258 | ui.note(_('saving current version of %s as %s\n') % |
|
2258 | ui.note(_('saving current version of %s as %s\n') % | |
2259 | (rel, bakname)) |
|
2259 | (rel, bakname)) | |
2260 | if not opts.get('dry_run'): |
|
2260 | if not opts.get('dry_run'): | |
2261 | util.rename(target, bakname) |
|
2261 | util.rename(target, bakname) | |
2262 | if ui.verbose or not exact: |
|
2262 | if ui.verbose or not exact: | |
2263 | msg = xlist[1] |
|
2263 | msg = xlist[1] | |
2264 | if not isinstance(msg, basestring): |
|
2264 | if not isinstance(msg, basestring): | |
2265 | msg = msg(abs) |
|
2265 | msg = msg(abs) | |
2266 | ui.status(msg % rel) |
|
2266 | ui.status(msg % rel) | |
2267 | for table, hitlist, misslist, backuphit, backupmiss in disptable: |
|
2267 | for table, hitlist, misslist, backuphit, backupmiss in disptable: | |
2268 | if abs not in table: |
|
2268 | if abs not in table: | |
2269 | continue |
|
2269 | continue | |
2270 | # file has changed in dirstate |
|
2270 | # file has changed in dirstate | |
2271 | if mfentry: |
|
2271 | if mfentry: | |
2272 | handle(hitlist, backuphit) |
|
2272 | handle(hitlist, backuphit) | |
2273 | elif misslist is not None: |
|
2273 | elif misslist is not None: | |
2274 | handle(misslist, backupmiss) |
|
2274 | handle(misslist, backupmiss) | |
2275 | break |
|
2275 | break | |
2276 | else: |
|
2276 | else: | |
2277 | if abs not in repo.dirstate: |
|
2277 | if abs not in repo.dirstate: | |
2278 | if mfentry: |
|
2278 | if mfentry: | |
2279 | handle(add, True) |
|
2279 | handle(add, True) | |
2280 | elif exact: |
|
2280 | elif exact: | |
2281 | ui.warn(_('file not managed: %s\n') % rel) |
|
2281 | ui.warn(_('file not managed: %s\n') % rel) | |
2282 | continue |
|
2282 | continue | |
2283 | # file has not changed in dirstate |
|
2283 | # file has not changed in dirstate | |
2284 | if node == parent: |
|
2284 | if node == parent: | |
2285 | if exact: |
|
2285 | if exact: | |
2286 | ui.warn(_('no changes needed to %s\n') % rel) |
|
2286 | ui.warn(_('no changes needed to %s\n') % rel) | |
2287 | continue |
|
2287 | continue | |
2288 | if pmf is None: |
|
2288 | if pmf is None: | |
2289 | # only need parent manifest in this unlikely case, |
|
2289 | # only need parent manifest in this unlikely case, | |
2290 | # so do not read by default |
|
2290 | # so do not read by default | |
2291 | pmf = repo[parent].manifest() |
|
2291 | pmf = repo[parent].manifest() | |
2292 | if abs in pmf and mfentry: |
|
2292 | if abs in pmf and mfentry: | |
2293 | # if version of file is same in parent and target |
|
2293 | # if version of file is same in parent and target | |
2294 | # manifests, do nothing |
|
2294 | # manifests, do nothing | |
2295 | if (pmf[abs] != mfentry or |
|
2295 | if (pmf[abs] != mfentry or | |
2296 | pmf.flags(abs) != mf.flags(abs)): |
|
2296 | pmf.flags(abs) != mf.flags(abs)): | |
2297 | handle(revert, False) |
|
2297 | handle(revert, False) | |
2298 | else: |
|
2298 | else: | |
2299 | handle(remove, False) |
|
2299 | handle(remove, False) | |
2300 | if not opts.get('dry_run'): |
|
2300 | if not opts.get('dry_run'): | |
2301 | _performrevert(repo, parents, ctx, revert, add, remove, undelete) |
|
2301 | _performrevert(repo, parents, ctx, revert, add, remove, undelete) | |
2302 |
|
2302 | |||
2303 | if targetsubs: |
|
2303 | if targetsubs: | |
2304 | # Revert the subrepos on the revert list |
|
2304 | # Revert the subrepos on the revert list | |
2305 | for sub in targetsubs: |
|
2305 | for sub in targetsubs: | |
2306 | ctx.sub(sub).revert(ui, ctx.substate[sub], *pats, **opts) |
|
2306 | ctx.sub(sub).revert(ui, ctx.substate[sub], *pats, **opts) | |
2307 | finally: |
|
2307 | finally: | |
2308 | wlock.release() |
|
2308 | wlock.release() | |
2309 |
|
2309 | |||
2310 | def _performrevert(repo, parents, ctx, revert, add, remove, undelete): |
|
2310 | def _performrevert(repo, parents, ctx, revert, add, remove, undelete): | |
2311 | """function that actually perform all the action computed for revert |
|
2311 | """function that actually perform all the action computed for revert | |
2312 |
|
2312 | |||
2313 | This is an independent function to let extension to plug in and react to |
|
2313 | This is an independent function to let extension to plug in and react to | |
2314 | the imminent revert. |
|
2314 | the imminent revert. | |
2315 |
|
2315 | |||
2316 | Make sure you have the working directory locked when calling this function. |
|
2316 | Make sure you have the working directory locked when calling this function. | |
2317 | """ |
|
2317 | """ | |
2318 | parent, p2 = parents |
|
2318 | parent, p2 = parents | |
2319 | node = ctx.node() |
|
2319 | node = ctx.node() | |
2320 | def checkout(f): |
|
2320 | def checkout(f): | |
2321 | fc = ctx[f] |
|
2321 | fc = ctx[f] | |
2322 | repo.wwrite(f, fc.data(), fc.flags()) |
|
2322 | repo.wwrite(f, fc.data(), fc.flags()) | |
2323 |
|
2323 | |||
2324 | audit_path = pathutil.pathauditor(repo.root) |
|
2324 | audit_path = pathutil.pathauditor(repo.root) | |
2325 | for f in remove[0]: |
|
2325 | for f in remove[0]: | |
2326 | if repo.dirstate[f] == 'a': |
|
2326 | if repo.dirstate[f] == 'a': | |
2327 | repo.dirstate.drop(f) |
|
2327 | repo.dirstate.drop(f) | |
2328 | continue |
|
2328 | continue | |
2329 | audit_path(f) |
|
2329 | audit_path(f) | |
2330 | try: |
|
2330 | try: | |
2331 | util.unlinkpath(repo.wjoin(f)) |
|
2331 | util.unlinkpath(repo.wjoin(f)) | |
2332 | except OSError: |
|
2332 | except OSError: | |
2333 | pass |
|
2333 | pass | |
2334 | repo.dirstate.remove(f) |
|
2334 | repo.dirstate.remove(f) | |
2335 |
|
2335 | |||
2336 | normal = None |
|
2336 | normal = None | |
2337 | if node == parent: |
|
2337 | if node == parent: | |
2338 | # We're reverting to our parent. If possible, we'd like status |
|
2338 | # We're reverting to our parent. If possible, we'd like status | |
2339 | # to report the file as clean. We have to use normallookup for |
|
2339 | # to report the file as clean. We have to use normallookup for | |
2340 | # merges to avoid losing information about merged/dirty files. |
|
2340 | # merges to avoid losing information about merged/dirty files. | |
2341 | if p2 != nullid: |
|
2341 | if p2 != nullid: | |
2342 | normal = repo.dirstate.normallookup |
|
2342 | normal = repo.dirstate.normallookup | |
2343 | else: |
|
2343 | else: | |
2344 | normal = repo.dirstate.normal |
|
2344 | normal = repo.dirstate.normal | |
2345 | for f in revert[0]: |
|
2345 | for f in revert[0]: | |
2346 | checkout(f) |
|
2346 | checkout(f) | |
2347 | if normal: |
|
2347 | if normal: | |
2348 | normal(f) |
|
2348 | normal(f) | |
2349 |
|
2349 | |||
2350 | for f in add[0]: |
|
2350 | for f in add[0]: | |
2351 | checkout(f) |
|
2351 | checkout(f) | |
2352 | repo.dirstate.add(f) |
|
2352 | repo.dirstate.add(f) | |
2353 |
|
2353 | |||
2354 | normal = repo.dirstate.normallookup |
|
2354 | normal = repo.dirstate.normallookup | |
2355 | if node == parent and p2 == nullid: |
|
2355 | if node == parent and p2 == nullid: | |
2356 | normal = repo.dirstate.normal |
|
2356 | normal = repo.dirstate.normal | |
2357 | for f in undelete[0]: |
|
2357 | for f in undelete[0]: | |
2358 | checkout(f) |
|
2358 | checkout(f) | |
2359 | normal(f) |
|
2359 | normal(f) | |
2360 |
|
2360 | |||
2361 | copied = copies.pathcopies(repo[parent], ctx) |
|
2361 | copied = copies.pathcopies(repo[parent], ctx) | |
2362 |
|
2362 | |||
2363 | for f in add[0] + undelete[0] + revert[0]: |
|
2363 | for f in add[0] + undelete[0] + revert[0]: | |
2364 | if f in copied: |
|
2364 | if f in copied: | |
2365 | repo.dirstate.copy(copied[f], f) |
|
2365 | repo.dirstate.copy(copied[f], f) | |
2366 |
|
2366 | |||
2367 | def command(table): |
|
2367 | def command(table): | |
2368 | '''returns a function object bound to table which can be used as |
|
2368 | '''returns a function object bound to table which can be used as | |
2369 | a decorator for populating table as a command table''' |
|
2369 | a decorator for populating table as a command table''' | |
2370 |
|
2370 | |||
2371 | def cmd(name, options=(), synopsis=None): |
|
2371 | def cmd(name, options=(), synopsis=None): | |
2372 | def decorator(func): |
|
2372 | def decorator(func): | |
2373 | if synopsis: |
|
2373 | if synopsis: | |
2374 | table[name] = func, list(options), synopsis |
|
2374 | table[name] = func, list(options), synopsis | |
2375 | else: |
|
2375 | else: | |
2376 | table[name] = func, list(options) |
|
2376 | table[name] = func, list(options) | |
2377 | return func |
|
2377 | return func | |
2378 | return decorator |
|
2378 | return decorator | |
2379 |
|
2379 | |||
2380 | return cmd |
|
2380 | return cmd | |
2381 |
|
2381 | |||
|
2382 | # a list of (ui, repo, otherpeer, opts, missing) functions called by | |||
|
2383 | # commands.outgoing. "missing" is "missing" of the result of | |||
|
2384 | # "findcommonoutgoing()" | |||
|
2385 | outgoinghooks = util.hooks() | |||
|
2386 | ||||
2382 | # a list of (ui, repo) functions called by commands.summary |
|
2387 | # a list of (ui, repo) functions called by commands.summary | |
2383 | summaryhooks = util.hooks() |
|
2388 | summaryhooks = util.hooks() | |
2384 |
|
2389 | |||
2385 | # a list of (ui, repo, opts, changes) functions called by commands.summary. |
|
2390 | # a list of (ui, repo, opts, changes) functions called by commands.summary. | |
2386 | # |
|
2391 | # | |
2387 | # functions should return tuple of booleans below, if 'changes' is None: |
|
2392 | # functions should return tuple of booleans below, if 'changes' is None: | |
2388 | # (whether-incomings-are-needed, whether-outgoings-are-needed) |
|
2393 | # (whether-incomings-are-needed, whether-outgoings-are-needed) | |
2389 | # |
|
2394 | # | |
2390 | # otherwise, 'changes' is a tuple of tuples below: |
|
2395 | # otherwise, 'changes' is a tuple of tuples below: | |
2391 | # - (sourceurl, sourcebranch, sourcepeer, incoming) |
|
2396 | # - (sourceurl, sourcebranch, sourcepeer, incoming) | |
2392 | # - (desturl, destbranch, destpeer, outgoing) |
|
2397 | # - (desturl, destbranch, destpeer, outgoing) | |
2393 | summaryremotehooks = util.hooks() |
|
2398 | summaryremotehooks = util.hooks() | |
2394 |
|
2399 | |||
2395 | # A list of state files kept by multistep operations like graft. |
|
2400 | # A list of state files kept by multistep operations like graft. | |
2396 | # Since graft cannot be aborted, it is considered 'clearable' by update. |
|
2401 | # Since graft cannot be aborted, it is considered 'clearable' by update. | |
2397 | # note: bisect is intentionally excluded |
|
2402 | # note: bisect is intentionally excluded | |
2398 | # (state file, clearable, allowcommit, error, hint) |
|
2403 | # (state file, clearable, allowcommit, error, hint) | |
2399 | unfinishedstates = [ |
|
2404 | unfinishedstates = [ | |
2400 | ('graftstate', True, False, _('graft in progress'), |
|
2405 | ('graftstate', True, False, _('graft in progress'), | |
2401 | _("use 'hg graft --continue' or 'hg update' to abort")), |
|
2406 | _("use 'hg graft --continue' or 'hg update' to abort")), | |
2402 | ('updatestate', True, False, _('last update was interrupted'), |
|
2407 | ('updatestate', True, False, _('last update was interrupted'), | |
2403 | _("use 'hg update' to get a consistent checkout")) |
|
2408 | _("use 'hg update' to get a consistent checkout")) | |
2404 | ] |
|
2409 | ] | |
2405 |
|
2410 | |||
2406 | def checkunfinished(repo, commit=False): |
|
2411 | def checkunfinished(repo, commit=False): | |
2407 | '''Look for an unfinished multistep operation, like graft, and abort |
|
2412 | '''Look for an unfinished multistep operation, like graft, and abort | |
2408 | if found. It's probably good to check this right before |
|
2413 | if found. It's probably good to check this right before | |
2409 | bailifchanged(). |
|
2414 | bailifchanged(). | |
2410 | ''' |
|
2415 | ''' | |
2411 | for f, clearable, allowcommit, msg, hint in unfinishedstates: |
|
2416 | for f, clearable, allowcommit, msg, hint in unfinishedstates: | |
2412 | if commit and allowcommit: |
|
2417 | if commit and allowcommit: | |
2413 | continue |
|
2418 | continue | |
2414 | if repo.vfs.exists(f): |
|
2419 | if repo.vfs.exists(f): | |
2415 | raise util.Abort(msg, hint=hint) |
|
2420 | raise util.Abort(msg, hint=hint) | |
2416 |
|
2421 | |||
2417 | def clearunfinished(repo): |
|
2422 | def clearunfinished(repo): | |
2418 | '''Check for unfinished operations (as above), and clear the ones |
|
2423 | '''Check for unfinished operations (as above), and clear the ones | |
2419 | that are clearable. |
|
2424 | that are clearable. | |
2420 | ''' |
|
2425 | ''' | |
2421 | for f, clearable, allowcommit, msg, hint in unfinishedstates: |
|
2426 | for f, clearable, allowcommit, msg, hint in unfinishedstates: | |
2422 | if not clearable and repo.vfs.exists(f): |
|
2427 | if not clearable and repo.vfs.exists(f): | |
2423 | raise util.Abort(msg, hint=hint) |
|
2428 | raise util.Abort(msg, hint=hint) | |
2424 | for f, clearable, allowcommit, msg, hint in unfinishedstates: |
|
2429 | for f, clearable, allowcommit, msg, hint in unfinishedstates: | |
2425 | if clearable and repo.vfs.exists(f): |
|
2430 | if clearable and repo.vfs.exists(f): | |
2426 | util.unlink(repo.join(f)) |
|
2431 | util.unlink(repo.join(f)) |
@@ -1,5957 +1,5959 b'' | |||||
1 | # commands.py - command processing for mercurial |
|
1 | # commands.py - command processing for 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, bin, nullid, nullrev, short |
|
8 | from node import hex, bin, nullid, nullrev, short | |
9 | from lock import release |
|
9 | from lock import release | |
10 | from i18n import _ |
|
10 | from i18n import _ | |
11 | import os, re, difflib, time, tempfile, errno |
|
11 | import os, re, difflib, time, tempfile, errno | |
12 | import sys |
|
12 | import sys | |
13 | import hg, scmutil, util, revlog, copies, error, bookmarks |
|
13 | import hg, scmutil, util, revlog, copies, error, bookmarks | |
14 | import patch, help, encoding, templatekw, discovery |
|
14 | import patch, help, encoding, templatekw, discovery | |
15 | import archival, changegroup, cmdutil, hbisect |
|
15 | import archival, changegroup, cmdutil, hbisect | |
16 | import sshserver, hgweb, commandserver |
|
16 | import sshserver, hgweb, commandserver | |
17 | from hgweb import server as hgweb_server |
|
17 | from hgweb import server as hgweb_server | |
18 | import merge as mergemod |
|
18 | import merge as mergemod | |
19 | import minirst, revset, fileset |
|
19 | import minirst, revset, fileset | |
20 | import dagparser, context, simplemerge, graphmod |
|
20 | import dagparser, context, simplemerge, graphmod | |
21 | import random |
|
21 | import random | |
22 | import setdiscovery, treediscovery, dagutil, pvec, localrepo |
|
22 | import setdiscovery, treediscovery, dagutil, pvec, localrepo | |
23 | import phases, obsolete |
|
23 | import phases, obsolete | |
24 |
|
24 | |||
25 | table = {} |
|
25 | table = {} | |
26 |
|
26 | |||
27 | command = cmdutil.command(table) |
|
27 | command = cmdutil.command(table) | |
28 |
|
28 | |||
29 | # common command options |
|
29 | # common command options | |
30 |
|
30 | |||
31 | globalopts = [ |
|
31 | globalopts = [ | |
32 | ('R', 'repository', '', |
|
32 | ('R', 'repository', '', | |
33 | _('repository root directory or name of overlay bundle file'), |
|
33 | _('repository root directory or name of overlay bundle file'), | |
34 | _('REPO')), |
|
34 | _('REPO')), | |
35 | ('', 'cwd', '', |
|
35 | ('', 'cwd', '', | |
36 | _('change working directory'), _('DIR')), |
|
36 | _('change working directory'), _('DIR')), | |
37 | ('y', 'noninteractive', None, |
|
37 | ('y', 'noninteractive', None, | |
38 | _('do not prompt, automatically pick the first choice for all prompts')), |
|
38 | _('do not prompt, automatically pick the first choice for all prompts')), | |
39 | ('q', 'quiet', None, _('suppress output')), |
|
39 | ('q', 'quiet', None, _('suppress output')), | |
40 | ('v', 'verbose', None, _('enable additional output')), |
|
40 | ('v', 'verbose', None, _('enable additional output')), | |
41 | ('', 'config', [], |
|
41 | ('', 'config', [], | |
42 | _('set/override config option (use \'section.name=value\')'), |
|
42 | _('set/override config option (use \'section.name=value\')'), | |
43 | _('CONFIG')), |
|
43 | _('CONFIG')), | |
44 | ('', 'debug', None, _('enable debugging output')), |
|
44 | ('', 'debug', None, _('enable debugging output')), | |
45 | ('', 'debugger', None, _('start debugger')), |
|
45 | ('', 'debugger', None, _('start debugger')), | |
46 | ('', 'encoding', encoding.encoding, _('set the charset encoding'), |
|
46 | ('', 'encoding', encoding.encoding, _('set the charset encoding'), | |
47 | _('ENCODE')), |
|
47 | _('ENCODE')), | |
48 | ('', 'encodingmode', encoding.encodingmode, |
|
48 | ('', 'encodingmode', encoding.encodingmode, | |
49 | _('set the charset encoding mode'), _('MODE')), |
|
49 | _('set the charset encoding mode'), _('MODE')), | |
50 | ('', 'traceback', None, _('always print a traceback on exception')), |
|
50 | ('', 'traceback', None, _('always print a traceback on exception')), | |
51 | ('', 'time', None, _('time how long the command takes')), |
|
51 | ('', 'time', None, _('time how long the command takes')), | |
52 | ('', 'profile', None, _('print command execution profile')), |
|
52 | ('', 'profile', None, _('print command execution profile')), | |
53 | ('', 'version', None, _('output version information and exit')), |
|
53 | ('', 'version', None, _('output version information and exit')), | |
54 | ('h', 'help', None, _('display help and exit')), |
|
54 | ('h', 'help', None, _('display help and exit')), | |
55 | ('', 'hidden', False, _('consider hidden changesets')), |
|
55 | ('', 'hidden', False, _('consider hidden changesets')), | |
56 | ] |
|
56 | ] | |
57 |
|
57 | |||
58 | dryrunopts = [('n', 'dry-run', None, |
|
58 | dryrunopts = [('n', 'dry-run', None, | |
59 | _('do not perform actions, just print output'))] |
|
59 | _('do not perform actions, just print output'))] | |
60 |
|
60 | |||
61 | remoteopts = [ |
|
61 | remoteopts = [ | |
62 | ('e', 'ssh', '', |
|
62 | ('e', 'ssh', '', | |
63 | _('specify ssh command to use'), _('CMD')), |
|
63 | _('specify ssh command to use'), _('CMD')), | |
64 | ('', 'remotecmd', '', |
|
64 | ('', 'remotecmd', '', | |
65 | _('specify hg command to run on the remote side'), _('CMD')), |
|
65 | _('specify hg command to run on the remote side'), _('CMD')), | |
66 | ('', 'insecure', None, |
|
66 | ('', 'insecure', None, | |
67 | _('do not verify server certificate (ignoring web.cacerts config)')), |
|
67 | _('do not verify server certificate (ignoring web.cacerts config)')), | |
68 | ] |
|
68 | ] | |
69 |
|
69 | |||
70 | walkopts = [ |
|
70 | walkopts = [ | |
71 | ('I', 'include', [], |
|
71 | ('I', 'include', [], | |
72 | _('include names matching the given patterns'), _('PATTERN')), |
|
72 | _('include names matching the given patterns'), _('PATTERN')), | |
73 | ('X', 'exclude', [], |
|
73 | ('X', 'exclude', [], | |
74 | _('exclude names matching the given patterns'), _('PATTERN')), |
|
74 | _('exclude names matching the given patterns'), _('PATTERN')), | |
75 | ] |
|
75 | ] | |
76 |
|
76 | |||
77 | commitopts = [ |
|
77 | commitopts = [ | |
78 | ('m', 'message', '', |
|
78 | ('m', 'message', '', | |
79 | _('use text as commit message'), _('TEXT')), |
|
79 | _('use text as commit message'), _('TEXT')), | |
80 | ('l', 'logfile', '', |
|
80 | ('l', 'logfile', '', | |
81 | _('read commit message from file'), _('FILE')), |
|
81 | _('read commit message from file'), _('FILE')), | |
82 | ] |
|
82 | ] | |
83 |
|
83 | |||
84 | commitopts2 = [ |
|
84 | commitopts2 = [ | |
85 | ('d', 'date', '', |
|
85 | ('d', 'date', '', | |
86 | _('record the specified date as commit date'), _('DATE')), |
|
86 | _('record the specified date as commit date'), _('DATE')), | |
87 | ('u', 'user', '', |
|
87 | ('u', 'user', '', | |
88 | _('record the specified user as committer'), _('USER')), |
|
88 | _('record the specified user as committer'), _('USER')), | |
89 | ] |
|
89 | ] | |
90 |
|
90 | |||
91 | templateopts = [ |
|
91 | templateopts = [ | |
92 | ('', 'style', '', |
|
92 | ('', 'style', '', | |
93 | _('display using template map file (DEPRECATED)'), _('STYLE')), |
|
93 | _('display using template map file (DEPRECATED)'), _('STYLE')), | |
94 | ('T', 'template', '', |
|
94 | ('T', 'template', '', | |
95 | _('display with template'), _('TEMPLATE')), |
|
95 | _('display with template'), _('TEMPLATE')), | |
96 | ] |
|
96 | ] | |
97 |
|
97 | |||
98 | logopts = [ |
|
98 | logopts = [ | |
99 | ('p', 'patch', None, _('show patch')), |
|
99 | ('p', 'patch', None, _('show patch')), | |
100 | ('g', 'git', None, _('use git extended diff format')), |
|
100 | ('g', 'git', None, _('use git extended diff format')), | |
101 | ('l', 'limit', '', |
|
101 | ('l', 'limit', '', | |
102 | _('limit number of changes displayed'), _('NUM')), |
|
102 | _('limit number of changes displayed'), _('NUM')), | |
103 | ('M', 'no-merges', None, _('do not show merges')), |
|
103 | ('M', 'no-merges', None, _('do not show merges')), | |
104 | ('', 'stat', None, _('output diffstat-style summary of changes')), |
|
104 | ('', 'stat', None, _('output diffstat-style summary of changes')), | |
105 | ('G', 'graph', None, _("show the revision DAG")), |
|
105 | ('G', 'graph', None, _("show the revision DAG")), | |
106 | ] + templateopts |
|
106 | ] + templateopts | |
107 |
|
107 | |||
108 | diffopts = [ |
|
108 | diffopts = [ | |
109 | ('a', 'text', None, _('treat all files as text')), |
|
109 | ('a', 'text', None, _('treat all files as text')), | |
110 | ('g', 'git', None, _('use git extended diff format')), |
|
110 | ('g', 'git', None, _('use git extended diff format')), | |
111 | ('', 'nodates', None, _('omit dates from diff headers')) |
|
111 | ('', 'nodates', None, _('omit dates from diff headers')) | |
112 | ] |
|
112 | ] | |
113 |
|
113 | |||
114 | diffwsopts = [ |
|
114 | diffwsopts = [ | |
115 | ('w', 'ignore-all-space', None, |
|
115 | ('w', 'ignore-all-space', None, | |
116 | _('ignore white space when comparing lines')), |
|
116 | _('ignore white space when comparing lines')), | |
117 | ('b', 'ignore-space-change', None, |
|
117 | ('b', 'ignore-space-change', None, | |
118 | _('ignore changes in the amount of white space')), |
|
118 | _('ignore changes in the amount of white space')), | |
119 | ('B', 'ignore-blank-lines', None, |
|
119 | ('B', 'ignore-blank-lines', None, | |
120 | _('ignore changes whose lines are all blank')), |
|
120 | _('ignore changes whose lines are all blank')), | |
121 | ] |
|
121 | ] | |
122 |
|
122 | |||
123 | diffopts2 = [ |
|
123 | diffopts2 = [ | |
124 | ('p', 'show-function', None, _('show which function each change is in')), |
|
124 | ('p', 'show-function', None, _('show which function each change is in')), | |
125 | ('', 'reverse', None, _('produce a diff that undoes the changes')), |
|
125 | ('', 'reverse', None, _('produce a diff that undoes the changes')), | |
126 | ] + diffwsopts + [ |
|
126 | ] + diffwsopts + [ | |
127 | ('U', 'unified', '', |
|
127 | ('U', 'unified', '', | |
128 | _('number of lines of context to show'), _('NUM')), |
|
128 | _('number of lines of context to show'), _('NUM')), | |
129 | ('', 'stat', None, _('output diffstat-style summary of changes')), |
|
129 | ('', 'stat', None, _('output diffstat-style summary of changes')), | |
130 | ] |
|
130 | ] | |
131 |
|
131 | |||
132 | mergetoolopts = [ |
|
132 | mergetoolopts = [ | |
133 | ('t', 'tool', '', _('specify merge tool')), |
|
133 | ('t', 'tool', '', _('specify merge tool')), | |
134 | ] |
|
134 | ] | |
135 |
|
135 | |||
136 | similarityopts = [ |
|
136 | similarityopts = [ | |
137 | ('s', 'similarity', '', |
|
137 | ('s', 'similarity', '', | |
138 | _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY')) |
|
138 | _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY')) | |
139 | ] |
|
139 | ] | |
140 |
|
140 | |||
141 | subrepoopts = [ |
|
141 | subrepoopts = [ | |
142 | ('S', 'subrepos', None, |
|
142 | ('S', 'subrepos', None, | |
143 | _('recurse into subrepositories')) |
|
143 | _('recurse into subrepositories')) | |
144 | ] |
|
144 | ] | |
145 |
|
145 | |||
146 | # Commands start here, listed alphabetically |
|
146 | # Commands start here, listed alphabetically | |
147 |
|
147 | |||
148 | @command('^add', |
|
148 | @command('^add', | |
149 | walkopts + subrepoopts + dryrunopts, |
|
149 | walkopts + subrepoopts + dryrunopts, | |
150 | _('[OPTION]... [FILE]...')) |
|
150 | _('[OPTION]... [FILE]...')) | |
151 | def add(ui, repo, *pats, **opts): |
|
151 | def add(ui, repo, *pats, **opts): | |
152 | """add the specified files on the next commit |
|
152 | """add the specified files on the next commit | |
153 |
|
153 | |||
154 | Schedule files to be version controlled and added to the |
|
154 | Schedule files to be version controlled and added to the | |
155 | repository. |
|
155 | repository. | |
156 |
|
156 | |||
157 | The files will be added to the repository at the next commit. To |
|
157 | The files will be added to the repository at the next commit. To | |
158 | undo an add before that, see :hg:`forget`. |
|
158 | undo an add before that, see :hg:`forget`. | |
159 |
|
159 | |||
160 | If no names are given, add all files to the repository. |
|
160 | If no names are given, add all files to the repository. | |
161 |
|
161 | |||
162 | .. container:: verbose |
|
162 | .. container:: verbose | |
163 |
|
163 | |||
164 | An example showing how new (unknown) files are added |
|
164 | An example showing how new (unknown) files are added | |
165 | automatically by :hg:`add`:: |
|
165 | automatically by :hg:`add`:: | |
166 |
|
166 | |||
167 | $ ls |
|
167 | $ ls | |
168 | foo.c |
|
168 | foo.c | |
169 | $ hg status |
|
169 | $ hg status | |
170 | ? foo.c |
|
170 | ? foo.c | |
171 | $ hg add |
|
171 | $ hg add | |
172 | adding foo.c |
|
172 | adding foo.c | |
173 | $ hg status |
|
173 | $ hg status | |
174 | A foo.c |
|
174 | A foo.c | |
175 |
|
175 | |||
176 | Returns 0 if all files are successfully added. |
|
176 | Returns 0 if all files are successfully added. | |
177 | """ |
|
177 | """ | |
178 |
|
178 | |||
179 | m = scmutil.match(repo[None], pats, opts) |
|
179 | m = scmutil.match(repo[None], pats, opts) | |
180 | rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'), |
|
180 | rejected = cmdutil.add(ui, repo, m, opts.get('dry_run'), | |
181 | opts.get('subrepos'), prefix="", explicitonly=False) |
|
181 | opts.get('subrepos'), prefix="", explicitonly=False) | |
182 | return rejected and 1 or 0 |
|
182 | return rejected and 1 or 0 | |
183 |
|
183 | |||
184 | @command('addremove', |
|
184 | @command('addremove', | |
185 | similarityopts + walkopts + dryrunopts, |
|
185 | similarityopts + walkopts + dryrunopts, | |
186 | _('[OPTION]... [FILE]...')) |
|
186 | _('[OPTION]... [FILE]...')) | |
187 | def addremove(ui, repo, *pats, **opts): |
|
187 | def addremove(ui, repo, *pats, **opts): | |
188 | """add all new files, delete all missing files |
|
188 | """add all new files, delete all missing files | |
189 |
|
189 | |||
190 | Add all new files and remove all missing files from the |
|
190 | Add all new files and remove all missing files from the | |
191 | repository. |
|
191 | repository. | |
192 |
|
192 | |||
193 | New files are ignored if they match any of the patterns in |
|
193 | New files are ignored if they match any of the patterns in | |
194 | ``.hgignore``. As with add, these changes take effect at the next |
|
194 | ``.hgignore``. As with add, these changes take effect at the next | |
195 | commit. |
|
195 | commit. | |
196 |
|
196 | |||
197 | Use the -s/--similarity option to detect renamed files. This |
|
197 | Use the -s/--similarity option to detect renamed files. This | |
198 | option takes a percentage between 0 (disabled) and 100 (files must |
|
198 | option takes a percentage between 0 (disabled) and 100 (files must | |
199 | be identical) as its parameter. With a parameter greater than 0, |
|
199 | be identical) as its parameter. With a parameter greater than 0, | |
200 | this compares every removed file with every added file and records |
|
200 | this compares every removed file with every added file and records | |
201 | those similar enough as renames. Detecting renamed files this way |
|
201 | those similar enough as renames. Detecting renamed files this way | |
202 | can be expensive. After using this option, :hg:`status -C` can be |
|
202 | can be expensive. After using this option, :hg:`status -C` can be | |
203 | used to check which files were identified as moved or renamed. If |
|
203 | used to check which files were identified as moved or renamed. If | |
204 | not specified, -s/--similarity defaults to 100 and only renames of |
|
204 | not specified, -s/--similarity defaults to 100 and only renames of | |
205 | identical files are detected. |
|
205 | identical files are detected. | |
206 |
|
206 | |||
207 | Returns 0 if all files are successfully added. |
|
207 | Returns 0 if all files are successfully added. | |
208 | """ |
|
208 | """ | |
209 | try: |
|
209 | try: | |
210 | sim = float(opts.get('similarity') or 100) |
|
210 | sim = float(opts.get('similarity') or 100) | |
211 | except ValueError: |
|
211 | except ValueError: | |
212 | raise util.Abort(_('similarity must be a number')) |
|
212 | raise util.Abort(_('similarity must be a number')) | |
213 | if sim < 0 or sim > 100: |
|
213 | if sim < 0 or sim > 100: | |
214 | raise util.Abort(_('similarity must be between 0 and 100')) |
|
214 | raise util.Abort(_('similarity must be between 0 and 100')) | |
215 | return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0) |
|
215 | return scmutil.addremove(repo, pats, opts, similarity=sim / 100.0) | |
216 |
|
216 | |||
217 | @command('^annotate|blame', |
|
217 | @command('^annotate|blame', | |
218 | [('r', 'rev', '', _('annotate the specified revision'), _('REV')), |
|
218 | [('r', 'rev', '', _('annotate the specified revision'), _('REV')), | |
219 | ('', 'follow', None, |
|
219 | ('', 'follow', None, | |
220 | _('follow copies/renames and list the filename (DEPRECATED)')), |
|
220 | _('follow copies/renames and list the filename (DEPRECATED)')), | |
221 | ('', 'no-follow', None, _("don't follow copies and renames")), |
|
221 | ('', 'no-follow', None, _("don't follow copies and renames")), | |
222 | ('a', 'text', None, _('treat all files as text')), |
|
222 | ('a', 'text', None, _('treat all files as text')), | |
223 | ('u', 'user', None, _('list the author (long with -v)')), |
|
223 | ('u', 'user', None, _('list the author (long with -v)')), | |
224 | ('f', 'file', None, _('list the filename')), |
|
224 | ('f', 'file', None, _('list the filename')), | |
225 | ('d', 'date', None, _('list the date (short with -q)')), |
|
225 | ('d', 'date', None, _('list the date (short with -q)')), | |
226 | ('n', 'number', None, _('list the revision number (default)')), |
|
226 | ('n', 'number', None, _('list the revision number (default)')), | |
227 | ('c', 'changeset', None, _('list the changeset')), |
|
227 | ('c', 'changeset', None, _('list the changeset')), | |
228 | ('l', 'line-number', None, _('show line number at the first appearance')) |
|
228 | ('l', 'line-number', None, _('show line number at the first appearance')) | |
229 | ] + diffwsopts + walkopts, |
|
229 | ] + diffwsopts + walkopts, | |
230 | _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...')) |
|
230 | _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...')) | |
231 | def annotate(ui, repo, *pats, **opts): |
|
231 | def annotate(ui, repo, *pats, **opts): | |
232 | """show changeset information by line for each file |
|
232 | """show changeset information by line for each file | |
233 |
|
233 | |||
234 | List changes in files, showing the revision id responsible for |
|
234 | List changes in files, showing the revision id responsible for | |
235 | each line |
|
235 | each line | |
236 |
|
236 | |||
237 | This command is useful for discovering when a change was made and |
|
237 | This command is useful for discovering when a change was made and | |
238 | by whom. |
|
238 | by whom. | |
239 |
|
239 | |||
240 | Without the -a/--text option, annotate will avoid processing files |
|
240 | Without the -a/--text option, annotate will avoid processing files | |
241 | it detects as binary. With -a, annotate will annotate the file |
|
241 | it detects as binary. With -a, annotate will annotate the file | |
242 | anyway, although the results will probably be neither useful |
|
242 | anyway, although the results will probably be neither useful | |
243 | nor desirable. |
|
243 | nor desirable. | |
244 |
|
244 | |||
245 | Returns 0 on success. |
|
245 | Returns 0 on success. | |
246 | """ |
|
246 | """ | |
247 | if opts.get('follow'): |
|
247 | if opts.get('follow'): | |
248 | # --follow is deprecated and now just an alias for -f/--file |
|
248 | # --follow is deprecated and now just an alias for -f/--file | |
249 | # to mimic the behavior of Mercurial before version 1.5 |
|
249 | # to mimic the behavior of Mercurial before version 1.5 | |
250 | opts['file'] = True |
|
250 | opts['file'] = True | |
251 |
|
251 | |||
252 | datefunc = ui.quiet and util.shortdate or util.datestr |
|
252 | datefunc = ui.quiet and util.shortdate or util.datestr | |
253 | getdate = util.cachefunc(lambda x: datefunc(x[0].date())) |
|
253 | getdate = util.cachefunc(lambda x: datefunc(x[0].date())) | |
254 |
|
254 | |||
255 | if not pats: |
|
255 | if not pats: | |
256 | raise util.Abort(_('at least one filename or pattern is required')) |
|
256 | raise util.Abort(_('at least one filename or pattern is required')) | |
257 |
|
257 | |||
258 | hexfn = ui.debugflag and hex or short |
|
258 | hexfn = ui.debugflag and hex or short | |
259 |
|
259 | |||
260 | opmap = [('user', ' ', lambda x: ui.shortuser(x[0].user())), |
|
260 | opmap = [('user', ' ', lambda x: ui.shortuser(x[0].user())), | |
261 | ('number', ' ', lambda x: str(x[0].rev())), |
|
261 | ('number', ' ', lambda x: str(x[0].rev())), | |
262 | ('changeset', ' ', lambda x: hexfn(x[0].node())), |
|
262 | ('changeset', ' ', lambda x: hexfn(x[0].node())), | |
263 | ('date', ' ', getdate), |
|
263 | ('date', ' ', getdate), | |
264 | ('file', ' ', lambda x: x[0].path()), |
|
264 | ('file', ' ', lambda x: x[0].path()), | |
265 | ('line_number', ':', lambda x: str(x[1])), |
|
265 | ('line_number', ':', lambda x: str(x[1])), | |
266 | ] |
|
266 | ] | |
267 |
|
267 | |||
268 | if (not opts.get('user') and not opts.get('changeset') |
|
268 | if (not opts.get('user') and not opts.get('changeset') | |
269 | and not opts.get('date') and not opts.get('file')): |
|
269 | and not opts.get('date') and not opts.get('file')): | |
270 | opts['number'] = True |
|
270 | opts['number'] = True | |
271 |
|
271 | |||
272 | linenumber = opts.get('line_number') is not None |
|
272 | linenumber = opts.get('line_number') is not None | |
273 | if linenumber and (not opts.get('changeset')) and (not opts.get('number')): |
|
273 | if linenumber and (not opts.get('changeset')) and (not opts.get('number')): | |
274 | raise util.Abort(_('at least one of -n/-c is required for -l')) |
|
274 | raise util.Abort(_('at least one of -n/-c is required for -l')) | |
275 |
|
275 | |||
276 | funcmap = [(func, sep) for op, sep, func in opmap if opts.get(op)] |
|
276 | funcmap = [(func, sep) for op, sep, func in opmap if opts.get(op)] | |
277 | funcmap[0] = (funcmap[0][0], '') # no separator in front of first column |
|
277 | funcmap[0] = (funcmap[0][0], '') # no separator in front of first column | |
278 |
|
278 | |||
279 | def bad(x, y): |
|
279 | def bad(x, y): | |
280 | raise util.Abort("%s: %s" % (x, y)) |
|
280 | raise util.Abort("%s: %s" % (x, y)) | |
281 |
|
281 | |||
282 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
282 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
283 | m = scmutil.match(ctx, pats, opts) |
|
283 | m = scmutil.match(ctx, pats, opts) | |
284 | m.bad = bad |
|
284 | m.bad = bad | |
285 | follow = not opts.get('no_follow') |
|
285 | follow = not opts.get('no_follow') | |
286 | diffopts = patch.diffopts(ui, opts, section='annotate') |
|
286 | diffopts = patch.diffopts(ui, opts, section='annotate') | |
287 | for abs in ctx.walk(m): |
|
287 | for abs in ctx.walk(m): | |
288 | fctx = ctx[abs] |
|
288 | fctx = ctx[abs] | |
289 | if not opts.get('text') and util.binary(fctx.data()): |
|
289 | if not opts.get('text') and util.binary(fctx.data()): | |
290 | ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs)) |
|
290 | ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs)) | |
291 | continue |
|
291 | continue | |
292 |
|
292 | |||
293 | lines = fctx.annotate(follow=follow, linenumber=linenumber, |
|
293 | lines = fctx.annotate(follow=follow, linenumber=linenumber, | |
294 | diffopts=diffopts) |
|
294 | diffopts=diffopts) | |
295 | pieces = [] |
|
295 | pieces = [] | |
296 |
|
296 | |||
297 | for f, sep in funcmap: |
|
297 | for f, sep in funcmap: | |
298 | l = [f(n) for n, dummy in lines] |
|
298 | l = [f(n) for n, dummy in lines] | |
299 | if l: |
|
299 | if l: | |
300 | sized = [(x, encoding.colwidth(x)) for x in l] |
|
300 | sized = [(x, encoding.colwidth(x)) for x in l] | |
301 | ml = max([w for x, w in sized]) |
|
301 | ml = max([w for x, w in sized]) | |
302 | pieces.append(["%s%s%s" % (sep, ' ' * (ml - w), x) |
|
302 | pieces.append(["%s%s%s" % (sep, ' ' * (ml - w), x) | |
303 | for x, w in sized]) |
|
303 | for x, w in sized]) | |
304 |
|
304 | |||
305 | if pieces: |
|
305 | if pieces: | |
306 | for p, l in zip(zip(*pieces), lines): |
|
306 | for p, l in zip(zip(*pieces), lines): | |
307 | ui.write("%s: %s" % ("".join(p), l[1])) |
|
307 | ui.write("%s: %s" % ("".join(p), l[1])) | |
308 |
|
308 | |||
309 | if lines and not lines[-1][1].endswith('\n'): |
|
309 | if lines and not lines[-1][1].endswith('\n'): | |
310 | ui.write('\n') |
|
310 | ui.write('\n') | |
311 |
|
311 | |||
312 | @command('archive', |
|
312 | @command('archive', | |
313 | [('', 'no-decode', None, _('do not pass files through decoders')), |
|
313 | [('', 'no-decode', None, _('do not pass files through decoders')), | |
314 | ('p', 'prefix', '', _('directory prefix for files in archive'), |
|
314 | ('p', 'prefix', '', _('directory prefix for files in archive'), | |
315 | _('PREFIX')), |
|
315 | _('PREFIX')), | |
316 | ('r', 'rev', '', _('revision to distribute'), _('REV')), |
|
316 | ('r', 'rev', '', _('revision to distribute'), _('REV')), | |
317 | ('t', 'type', '', _('type of distribution to create'), _('TYPE')), |
|
317 | ('t', 'type', '', _('type of distribution to create'), _('TYPE')), | |
318 | ] + subrepoopts + walkopts, |
|
318 | ] + subrepoopts + walkopts, | |
319 | _('[OPTION]... DEST')) |
|
319 | _('[OPTION]... DEST')) | |
320 | def archive(ui, repo, dest, **opts): |
|
320 | def archive(ui, repo, dest, **opts): | |
321 | '''create an unversioned archive of a repository revision |
|
321 | '''create an unversioned archive of a repository revision | |
322 |
|
322 | |||
323 | By default, the revision used is the parent of the working |
|
323 | By default, the revision used is the parent of the working | |
324 | directory; use -r/--rev to specify a different revision. |
|
324 | directory; use -r/--rev to specify a different revision. | |
325 |
|
325 | |||
326 | The archive type is automatically detected based on file |
|
326 | The archive type is automatically detected based on file | |
327 | extension (or override using -t/--type). |
|
327 | extension (or override using -t/--type). | |
328 |
|
328 | |||
329 | .. container:: verbose |
|
329 | .. container:: verbose | |
330 |
|
330 | |||
331 | Examples: |
|
331 | Examples: | |
332 |
|
332 | |||
333 | - create a zip file containing the 1.0 release:: |
|
333 | - create a zip file containing the 1.0 release:: | |
334 |
|
334 | |||
335 | hg archive -r 1.0 project-1.0.zip |
|
335 | hg archive -r 1.0 project-1.0.zip | |
336 |
|
336 | |||
337 | - create a tarball excluding .hg files:: |
|
337 | - create a tarball excluding .hg files:: | |
338 |
|
338 | |||
339 | hg archive project.tar.gz -X ".hg*" |
|
339 | hg archive project.tar.gz -X ".hg*" | |
340 |
|
340 | |||
341 | Valid types are: |
|
341 | Valid types are: | |
342 |
|
342 | |||
343 | :``files``: a directory full of files (default) |
|
343 | :``files``: a directory full of files (default) | |
344 | :``tar``: tar archive, uncompressed |
|
344 | :``tar``: tar archive, uncompressed | |
345 | :``tbz2``: tar archive, compressed using bzip2 |
|
345 | :``tbz2``: tar archive, compressed using bzip2 | |
346 | :``tgz``: tar archive, compressed using gzip |
|
346 | :``tgz``: tar archive, compressed using gzip | |
347 | :``uzip``: zip archive, uncompressed |
|
347 | :``uzip``: zip archive, uncompressed | |
348 | :``zip``: zip archive, compressed using deflate |
|
348 | :``zip``: zip archive, compressed using deflate | |
349 |
|
349 | |||
350 | The exact name of the destination archive or directory is given |
|
350 | The exact name of the destination archive or directory is given | |
351 | using a format string; see :hg:`help export` for details. |
|
351 | using a format string; see :hg:`help export` for details. | |
352 |
|
352 | |||
353 | Each member added to an archive file has a directory prefix |
|
353 | Each member added to an archive file has a directory prefix | |
354 | prepended. Use -p/--prefix to specify a format string for the |
|
354 | prepended. Use -p/--prefix to specify a format string for the | |
355 | prefix. The default is the basename of the archive, with suffixes |
|
355 | prefix. The default is the basename of the archive, with suffixes | |
356 | removed. |
|
356 | removed. | |
357 |
|
357 | |||
358 | Returns 0 on success. |
|
358 | Returns 0 on success. | |
359 | ''' |
|
359 | ''' | |
360 |
|
360 | |||
361 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
361 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
362 | if not ctx: |
|
362 | if not ctx: | |
363 | raise util.Abort(_('no working directory: please specify a revision')) |
|
363 | raise util.Abort(_('no working directory: please specify a revision')) | |
364 | node = ctx.node() |
|
364 | node = ctx.node() | |
365 | dest = cmdutil.makefilename(repo, dest, node) |
|
365 | dest = cmdutil.makefilename(repo, dest, node) | |
366 | if os.path.realpath(dest) == repo.root: |
|
366 | if os.path.realpath(dest) == repo.root: | |
367 | raise util.Abort(_('repository root cannot be destination')) |
|
367 | raise util.Abort(_('repository root cannot be destination')) | |
368 |
|
368 | |||
369 | kind = opts.get('type') or archival.guesskind(dest) or 'files' |
|
369 | kind = opts.get('type') or archival.guesskind(dest) or 'files' | |
370 | prefix = opts.get('prefix') |
|
370 | prefix = opts.get('prefix') | |
371 |
|
371 | |||
372 | if dest == '-': |
|
372 | if dest == '-': | |
373 | if kind == 'files': |
|
373 | if kind == 'files': | |
374 | raise util.Abort(_('cannot archive plain files to stdout')) |
|
374 | raise util.Abort(_('cannot archive plain files to stdout')) | |
375 | dest = cmdutil.makefileobj(repo, dest) |
|
375 | dest = cmdutil.makefileobj(repo, dest) | |
376 | if not prefix: |
|
376 | if not prefix: | |
377 | prefix = os.path.basename(repo.root) + '-%h' |
|
377 | prefix = os.path.basename(repo.root) + '-%h' | |
378 |
|
378 | |||
379 | prefix = cmdutil.makefilename(repo, prefix, node) |
|
379 | prefix = cmdutil.makefilename(repo, prefix, node) | |
380 | matchfn = scmutil.match(ctx, [], opts) |
|
380 | matchfn = scmutil.match(ctx, [], opts) | |
381 | archival.archive(repo, dest, node, kind, not opts.get('no_decode'), |
|
381 | archival.archive(repo, dest, node, kind, not opts.get('no_decode'), | |
382 | matchfn, prefix, subrepos=opts.get('subrepos')) |
|
382 | matchfn, prefix, subrepos=opts.get('subrepos')) | |
383 |
|
383 | |||
384 | @command('backout', |
|
384 | @command('backout', | |
385 | [('', 'merge', None, _('merge with old dirstate parent after backout')), |
|
385 | [('', 'merge', None, _('merge with old dirstate parent after backout')), | |
386 | ('', 'parent', '', |
|
386 | ('', 'parent', '', | |
387 | _('parent to choose when backing out merge (DEPRECATED)'), _('REV')), |
|
387 | _('parent to choose when backing out merge (DEPRECATED)'), _('REV')), | |
388 | ('r', 'rev', '', _('revision to backout'), _('REV')), |
|
388 | ('r', 'rev', '', _('revision to backout'), _('REV')), | |
389 | ] + mergetoolopts + walkopts + commitopts + commitopts2, |
|
389 | ] + mergetoolopts + walkopts + commitopts + commitopts2, | |
390 | _('[OPTION]... [-r] REV')) |
|
390 | _('[OPTION]... [-r] REV')) | |
391 | def backout(ui, repo, node=None, rev=None, **opts): |
|
391 | def backout(ui, repo, node=None, rev=None, **opts): | |
392 | '''reverse effect of earlier changeset |
|
392 | '''reverse effect of earlier changeset | |
393 |
|
393 | |||
394 | Prepare a new changeset with the effect of REV undone in the |
|
394 | Prepare a new changeset with the effect of REV undone in the | |
395 | current working directory. |
|
395 | current working directory. | |
396 |
|
396 | |||
397 | If REV is the parent of the working directory, then this new changeset |
|
397 | If REV is the parent of the working directory, then this new changeset | |
398 | is committed automatically. Otherwise, hg needs to merge the |
|
398 | is committed automatically. Otherwise, hg needs to merge the | |
399 | changes and the merged result is left uncommitted. |
|
399 | changes and the merged result is left uncommitted. | |
400 |
|
400 | |||
401 | .. note:: |
|
401 | .. note:: | |
402 |
|
402 | |||
403 | backout cannot be used to fix either an unwanted or |
|
403 | backout cannot be used to fix either an unwanted or | |
404 | incorrect merge. |
|
404 | incorrect merge. | |
405 |
|
405 | |||
406 | .. container:: verbose |
|
406 | .. container:: verbose | |
407 |
|
407 | |||
408 | By default, the pending changeset will have one parent, |
|
408 | By default, the pending changeset will have one parent, | |
409 | maintaining a linear history. With --merge, the pending |
|
409 | maintaining a linear history. With --merge, the pending | |
410 | changeset will instead have two parents: the old parent of the |
|
410 | changeset will instead have two parents: the old parent of the | |
411 | working directory and a new child of REV that simply undoes REV. |
|
411 | working directory and a new child of REV that simply undoes REV. | |
412 |
|
412 | |||
413 | Before version 1.7, the behavior without --merge was equivalent |
|
413 | Before version 1.7, the behavior without --merge was equivalent | |
414 | to specifying --merge followed by :hg:`update --clean .` to |
|
414 | to specifying --merge followed by :hg:`update --clean .` to | |
415 | cancel the merge and leave the child of REV as a head to be |
|
415 | cancel the merge and leave the child of REV as a head to be | |
416 | merged separately. |
|
416 | merged separately. | |
417 |
|
417 | |||
418 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
418 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
419 |
|
419 | |||
420 | Returns 0 on success, 1 if nothing to backout or there are unresolved |
|
420 | Returns 0 on success, 1 if nothing to backout or there are unresolved | |
421 | files. |
|
421 | files. | |
422 | ''' |
|
422 | ''' | |
423 | if rev and node: |
|
423 | if rev and node: | |
424 | raise util.Abort(_("please specify just one revision")) |
|
424 | raise util.Abort(_("please specify just one revision")) | |
425 |
|
425 | |||
426 | if not rev: |
|
426 | if not rev: | |
427 | rev = node |
|
427 | rev = node | |
428 |
|
428 | |||
429 | if not rev: |
|
429 | if not rev: | |
430 | raise util.Abort(_("please specify a revision to backout")) |
|
430 | raise util.Abort(_("please specify a revision to backout")) | |
431 |
|
431 | |||
432 | date = opts.get('date') |
|
432 | date = opts.get('date') | |
433 | if date: |
|
433 | if date: | |
434 | opts['date'] = util.parsedate(date) |
|
434 | opts['date'] = util.parsedate(date) | |
435 |
|
435 | |||
436 | cmdutil.checkunfinished(repo) |
|
436 | cmdutil.checkunfinished(repo) | |
437 | cmdutil.bailifchanged(repo) |
|
437 | cmdutil.bailifchanged(repo) | |
438 | node = scmutil.revsingle(repo, rev).node() |
|
438 | node = scmutil.revsingle(repo, rev).node() | |
439 |
|
439 | |||
440 | op1, op2 = repo.dirstate.parents() |
|
440 | op1, op2 = repo.dirstate.parents() | |
441 | if node not in repo.changelog.commonancestors(op1, node): |
|
441 | if node not in repo.changelog.commonancestors(op1, node): | |
442 | raise util.Abort(_('cannot backout change that is not an ancestor')) |
|
442 | raise util.Abort(_('cannot backout change that is not an ancestor')) | |
443 |
|
443 | |||
444 | p1, p2 = repo.changelog.parents(node) |
|
444 | p1, p2 = repo.changelog.parents(node) | |
445 | if p1 == nullid: |
|
445 | if p1 == nullid: | |
446 | raise util.Abort(_('cannot backout a change with no parents')) |
|
446 | raise util.Abort(_('cannot backout a change with no parents')) | |
447 | if p2 != nullid: |
|
447 | if p2 != nullid: | |
448 | if not opts.get('parent'): |
|
448 | if not opts.get('parent'): | |
449 | raise util.Abort(_('cannot backout a merge changeset')) |
|
449 | raise util.Abort(_('cannot backout a merge changeset')) | |
450 | p = repo.lookup(opts['parent']) |
|
450 | p = repo.lookup(opts['parent']) | |
451 | if p not in (p1, p2): |
|
451 | if p not in (p1, p2): | |
452 | raise util.Abort(_('%s is not a parent of %s') % |
|
452 | raise util.Abort(_('%s is not a parent of %s') % | |
453 | (short(p), short(node))) |
|
453 | (short(p), short(node))) | |
454 | parent = p |
|
454 | parent = p | |
455 | else: |
|
455 | else: | |
456 | if opts.get('parent'): |
|
456 | if opts.get('parent'): | |
457 | raise util.Abort(_('cannot use --parent on non-merge changeset')) |
|
457 | raise util.Abort(_('cannot use --parent on non-merge changeset')) | |
458 | parent = p1 |
|
458 | parent = p1 | |
459 |
|
459 | |||
460 | # the backout should appear on the same branch |
|
460 | # the backout should appear on the same branch | |
461 | wlock = repo.wlock() |
|
461 | wlock = repo.wlock() | |
462 | try: |
|
462 | try: | |
463 | branch = repo.dirstate.branch() |
|
463 | branch = repo.dirstate.branch() | |
464 | bheads = repo.branchheads(branch) |
|
464 | bheads = repo.branchheads(branch) | |
465 | rctx = scmutil.revsingle(repo, hex(parent)) |
|
465 | rctx = scmutil.revsingle(repo, hex(parent)) | |
466 | if not opts.get('merge') and op1 != node: |
|
466 | if not opts.get('merge') and op1 != node: | |
467 | try: |
|
467 | try: | |
468 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
468 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | |
469 | 'backout') |
|
469 | 'backout') | |
470 | stats = mergemod.update(repo, parent, True, True, False, |
|
470 | stats = mergemod.update(repo, parent, True, True, False, | |
471 | node, False) |
|
471 | node, False) | |
472 | repo.setparents(op1, op2) |
|
472 | repo.setparents(op1, op2) | |
473 | hg._showstats(repo, stats) |
|
473 | hg._showstats(repo, stats) | |
474 | if stats[3]: |
|
474 | if stats[3]: | |
475 | repo.ui.status(_("use 'hg resolve' to retry unresolved " |
|
475 | repo.ui.status(_("use 'hg resolve' to retry unresolved " | |
476 | "file merges\n")) |
|
476 | "file merges\n")) | |
477 | else: |
|
477 | else: | |
478 | msg = _("changeset %s backed out, " |
|
478 | msg = _("changeset %s backed out, " | |
479 | "don't forget to commit.\n") |
|
479 | "don't forget to commit.\n") | |
480 | ui.status(msg % short(node)) |
|
480 | ui.status(msg % short(node)) | |
481 | return stats[3] > 0 |
|
481 | return stats[3] > 0 | |
482 | finally: |
|
482 | finally: | |
483 | ui.setconfig('ui', 'forcemerge', '', '') |
|
483 | ui.setconfig('ui', 'forcemerge', '', '') | |
484 | else: |
|
484 | else: | |
485 | hg.clean(repo, node, show_stats=False) |
|
485 | hg.clean(repo, node, show_stats=False) | |
486 | repo.dirstate.setbranch(branch) |
|
486 | repo.dirstate.setbranch(branch) | |
487 | cmdutil.revert(ui, repo, rctx, repo.dirstate.parents()) |
|
487 | cmdutil.revert(ui, repo, rctx, repo.dirstate.parents()) | |
488 |
|
488 | |||
489 |
|
489 | |||
490 | e = cmdutil.commiteditor |
|
490 | e = cmdutil.commiteditor | |
491 | if not opts['message'] and not opts['logfile']: |
|
491 | if not opts['message'] and not opts['logfile']: | |
492 | # we don't translate commit messages |
|
492 | # we don't translate commit messages | |
493 | opts['message'] = "Backed out changeset %s" % short(node) |
|
493 | opts['message'] = "Backed out changeset %s" % short(node) | |
494 | e = cmdutil.commitforceeditor |
|
494 | e = cmdutil.commitforceeditor | |
495 |
|
495 | |||
496 | def commitfunc(ui, repo, message, match, opts): |
|
496 | def commitfunc(ui, repo, message, match, opts): | |
497 | return repo.commit(message, opts.get('user'), opts.get('date'), |
|
497 | return repo.commit(message, opts.get('user'), opts.get('date'), | |
498 | match, editor=e) |
|
498 | match, editor=e) | |
499 | newnode = cmdutil.commit(ui, repo, commitfunc, [], opts) |
|
499 | newnode = cmdutil.commit(ui, repo, commitfunc, [], opts) | |
500 | if not newnode: |
|
500 | if not newnode: | |
501 | ui.status(_("nothing changed\n")) |
|
501 | ui.status(_("nothing changed\n")) | |
502 | return 1 |
|
502 | return 1 | |
503 | cmdutil.commitstatus(repo, newnode, branch, bheads) |
|
503 | cmdutil.commitstatus(repo, newnode, branch, bheads) | |
504 |
|
504 | |||
505 | def nice(node): |
|
505 | def nice(node): | |
506 | return '%d:%s' % (repo.changelog.rev(node), short(node)) |
|
506 | return '%d:%s' % (repo.changelog.rev(node), short(node)) | |
507 | ui.status(_('changeset %s backs out changeset %s\n') % |
|
507 | ui.status(_('changeset %s backs out changeset %s\n') % | |
508 | (nice(repo.changelog.tip()), nice(node))) |
|
508 | (nice(repo.changelog.tip()), nice(node))) | |
509 | if opts.get('merge') and op1 != node: |
|
509 | if opts.get('merge') and op1 != node: | |
510 | hg.clean(repo, op1, show_stats=False) |
|
510 | hg.clean(repo, op1, show_stats=False) | |
511 | ui.status(_('merging with changeset %s\n') |
|
511 | ui.status(_('merging with changeset %s\n') | |
512 | % nice(repo.changelog.tip())) |
|
512 | % nice(repo.changelog.tip())) | |
513 | try: |
|
513 | try: | |
514 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
514 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | |
515 | 'backout') |
|
515 | 'backout') | |
516 | return hg.merge(repo, hex(repo.changelog.tip())) |
|
516 | return hg.merge(repo, hex(repo.changelog.tip())) | |
517 | finally: |
|
517 | finally: | |
518 | ui.setconfig('ui', 'forcemerge', '', '') |
|
518 | ui.setconfig('ui', 'forcemerge', '', '') | |
519 | finally: |
|
519 | finally: | |
520 | wlock.release() |
|
520 | wlock.release() | |
521 | return 0 |
|
521 | return 0 | |
522 |
|
522 | |||
523 | @command('bisect', |
|
523 | @command('bisect', | |
524 | [('r', 'reset', False, _('reset bisect state')), |
|
524 | [('r', 'reset', False, _('reset bisect state')), | |
525 | ('g', 'good', False, _('mark changeset good')), |
|
525 | ('g', 'good', False, _('mark changeset good')), | |
526 | ('b', 'bad', False, _('mark changeset bad')), |
|
526 | ('b', 'bad', False, _('mark changeset bad')), | |
527 | ('s', 'skip', False, _('skip testing changeset')), |
|
527 | ('s', 'skip', False, _('skip testing changeset')), | |
528 | ('e', 'extend', False, _('extend the bisect range')), |
|
528 | ('e', 'extend', False, _('extend the bisect range')), | |
529 | ('c', 'command', '', _('use command to check changeset state'), _('CMD')), |
|
529 | ('c', 'command', '', _('use command to check changeset state'), _('CMD')), | |
530 | ('U', 'noupdate', False, _('do not update to target'))], |
|
530 | ('U', 'noupdate', False, _('do not update to target'))], | |
531 | _("[-gbsr] [-U] [-c CMD] [REV]")) |
|
531 | _("[-gbsr] [-U] [-c CMD] [REV]")) | |
532 | def bisect(ui, repo, rev=None, extra=None, command=None, |
|
532 | def bisect(ui, repo, rev=None, extra=None, command=None, | |
533 | reset=None, good=None, bad=None, skip=None, extend=None, |
|
533 | reset=None, good=None, bad=None, skip=None, extend=None, | |
534 | noupdate=None): |
|
534 | noupdate=None): | |
535 | """subdivision search of changesets |
|
535 | """subdivision search of changesets | |
536 |
|
536 | |||
537 | This command helps to find changesets which introduce problems. To |
|
537 | This command helps to find changesets which introduce problems. To | |
538 | use, mark the earliest changeset you know exhibits the problem as |
|
538 | use, mark the earliest changeset you know exhibits the problem as | |
539 | bad, then mark the latest changeset which is free from the problem |
|
539 | bad, then mark the latest changeset which is free from the problem | |
540 | as good. Bisect will update your working directory to a revision |
|
540 | as good. Bisect will update your working directory to a revision | |
541 | for testing (unless the -U/--noupdate option is specified). Once |
|
541 | for testing (unless the -U/--noupdate option is specified). Once | |
542 | you have performed tests, mark the working directory as good or |
|
542 | you have performed tests, mark the working directory as good or | |
543 | bad, and bisect will either update to another candidate changeset |
|
543 | bad, and bisect will either update to another candidate changeset | |
544 | or announce that it has found the bad revision. |
|
544 | or announce that it has found the bad revision. | |
545 |
|
545 | |||
546 | As a shortcut, you can also use the revision argument to mark a |
|
546 | As a shortcut, you can also use the revision argument to mark a | |
547 | revision as good or bad without checking it out first. |
|
547 | revision as good or bad without checking it out first. | |
548 |
|
548 | |||
549 | If you supply a command, it will be used for automatic bisection. |
|
549 | If you supply a command, it will be used for automatic bisection. | |
550 | The environment variable HG_NODE will contain the ID of the |
|
550 | The environment variable HG_NODE will contain the ID of the | |
551 | changeset being tested. The exit status of the command will be |
|
551 | changeset being tested. The exit status of the command will be | |
552 | used to mark revisions as good or bad: status 0 means good, 125 |
|
552 | used to mark revisions as good or bad: status 0 means good, 125 | |
553 | means to skip the revision, 127 (command not found) will abort the |
|
553 | means to skip the revision, 127 (command not found) will abort the | |
554 | bisection, and any other non-zero exit status means the revision |
|
554 | bisection, and any other non-zero exit status means the revision | |
555 | is bad. |
|
555 | is bad. | |
556 |
|
556 | |||
557 | .. container:: verbose |
|
557 | .. container:: verbose | |
558 |
|
558 | |||
559 | Some examples: |
|
559 | Some examples: | |
560 |
|
560 | |||
561 | - start a bisection with known bad revision 34, and good revision 12:: |
|
561 | - start a bisection with known bad revision 34, and good revision 12:: | |
562 |
|
562 | |||
563 | hg bisect --bad 34 |
|
563 | hg bisect --bad 34 | |
564 | hg bisect --good 12 |
|
564 | hg bisect --good 12 | |
565 |
|
565 | |||
566 | - advance the current bisection by marking current revision as good or |
|
566 | - advance the current bisection by marking current revision as good or | |
567 | bad:: |
|
567 | bad:: | |
568 |
|
568 | |||
569 | hg bisect --good |
|
569 | hg bisect --good | |
570 | hg bisect --bad |
|
570 | hg bisect --bad | |
571 |
|
571 | |||
572 | - mark the current revision, or a known revision, to be skipped (e.g. if |
|
572 | - mark the current revision, or a known revision, to be skipped (e.g. if | |
573 | that revision is not usable because of another issue):: |
|
573 | that revision is not usable because of another issue):: | |
574 |
|
574 | |||
575 | hg bisect --skip |
|
575 | hg bisect --skip | |
576 | hg bisect --skip 23 |
|
576 | hg bisect --skip 23 | |
577 |
|
577 | |||
578 | - skip all revisions that do not touch directories ``foo`` or ``bar``:: |
|
578 | - skip all revisions that do not touch directories ``foo`` or ``bar``:: | |
579 |
|
579 | |||
580 | hg bisect --skip "!( file('path:foo') & file('path:bar') )" |
|
580 | hg bisect --skip "!( file('path:foo') & file('path:bar') )" | |
581 |
|
581 | |||
582 | - forget the current bisection:: |
|
582 | - forget the current bisection:: | |
583 |
|
583 | |||
584 | hg bisect --reset |
|
584 | hg bisect --reset | |
585 |
|
585 | |||
586 | - use 'make && make tests' to automatically find the first broken |
|
586 | - use 'make && make tests' to automatically find the first broken | |
587 | revision:: |
|
587 | revision:: | |
588 |
|
588 | |||
589 | hg bisect --reset |
|
589 | hg bisect --reset | |
590 | hg bisect --bad 34 |
|
590 | hg bisect --bad 34 | |
591 | hg bisect --good 12 |
|
591 | hg bisect --good 12 | |
592 | hg bisect --command "make && make tests" |
|
592 | hg bisect --command "make && make tests" | |
593 |
|
593 | |||
594 | - see all changesets whose states are already known in the current |
|
594 | - see all changesets whose states are already known in the current | |
595 | bisection:: |
|
595 | bisection:: | |
596 |
|
596 | |||
597 | hg log -r "bisect(pruned)" |
|
597 | hg log -r "bisect(pruned)" | |
598 |
|
598 | |||
599 | - see the changeset currently being bisected (especially useful |
|
599 | - see the changeset currently being bisected (especially useful | |
600 | if running with -U/--noupdate):: |
|
600 | if running with -U/--noupdate):: | |
601 |
|
601 | |||
602 | hg log -r "bisect(current)" |
|
602 | hg log -r "bisect(current)" | |
603 |
|
603 | |||
604 | - see all changesets that took part in the current bisection:: |
|
604 | - see all changesets that took part in the current bisection:: | |
605 |
|
605 | |||
606 | hg log -r "bisect(range)" |
|
606 | hg log -r "bisect(range)" | |
607 |
|
607 | |||
608 | - you can even get a nice graph:: |
|
608 | - you can even get a nice graph:: | |
609 |
|
609 | |||
610 | hg log --graph -r "bisect(range)" |
|
610 | hg log --graph -r "bisect(range)" | |
611 |
|
611 | |||
612 | See :hg:`help revsets` for more about the `bisect()` keyword. |
|
612 | See :hg:`help revsets` for more about the `bisect()` keyword. | |
613 |
|
613 | |||
614 | Returns 0 on success. |
|
614 | Returns 0 on success. | |
615 | """ |
|
615 | """ | |
616 | def extendbisectrange(nodes, good): |
|
616 | def extendbisectrange(nodes, good): | |
617 | # bisect is incomplete when it ends on a merge node and |
|
617 | # bisect is incomplete when it ends on a merge node and | |
618 | # one of the parent was not checked. |
|
618 | # one of the parent was not checked. | |
619 | parents = repo[nodes[0]].parents() |
|
619 | parents = repo[nodes[0]].parents() | |
620 | if len(parents) > 1: |
|
620 | if len(parents) > 1: | |
621 | side = good and state['bad'] or state['good'] |
|
621 | side = good and state['bad'] or state['good'] | |
622 | num = len(set(i.node() for i in parents) & set(side)) |
|
622 | num = len(set(i.node() for i in parents) & set(side)) | |
623 | if num == 1: |
|
623 | if num == 1: | |
624 | return parents[0].ancestor(parents[1]) |
|
624 | return parents[0].ancestor(parents[1]) | |
625 | return None |
|
625 | return None | |
626 |
|
626 | |||
627 | def print_result(nodes, good): |
|
627 | def print_result(nodes, good): | |
628 | displayer = cmdutil.show_changeset(ui, repo, {}) |
|
628 | displayer = cmdutil.show_changeset(ui, repo, {}) | |
629 | if len(nodes) == 1: |
|
629 | if len(nodes) == 1: | |
630 | # narrowed it down to a single revision |
|
630 | # narrowed it down to a single revision | |
631 | if good: |
|
631 | if good: | |
632 | ui.write(_("The first good revision is:\n")) |
|
632 | ui.write(_("The first good revision is:\n")) | |
633 | else: |
|
633 | else: | |
634 | ui.write(_("The first bad revision is:\n")) |
|
634 | ui.write(_("The first bad revision is:\n")) | |
635 | displayer.show(repo[nodes[0]]) |
|
635 | displayer.show(repo[nodes[0]]) | |
636 | extendnode = extendbisectrange(nodes, good) |
|
636 | extendnode = extendbisectrange(nodes, good) | |
637 | if extendnode is not None: |
|
637 | if extendnode is not None: | |
638 | ui.write(_('Not all ancestors of this changeset have been' |
|
638 | ui.write(_('Not all ancestors of this changeset have been' | |
639 | ' checked.\nUse bisect --extend to continue the ' |
|
639 | ' checked.\nUse bisect --extend to continue the ' | |
640 | 'bisection from\nthe common ancestor, %s.\n') |
|
640 | 'bisection from\nthe common ancestor, %s.\n') | |
641 | % extendnode) |
|
641 | % extendnode) | |
642 | else: |
|
642 | else: | |
643 | # multiple possible revisions |
|
643 | # multiple possible revisions | |
644 | if good: |
|
644 | if good: | |
645 | ui.write(_("Due to skipped revisions, the first " |
|
645 | ui.write(_("Due to skipped revisions, the first " | |
646 | "good revision could be any of:\n")) |
|
646 | "good revision could be any of:\n")) | |
647 | else: |
|
647 | else: | |
648 | ui.write(_("Due to skipped revisions, the first " |
|
648 | ui.write(_("Due to skipped revisions, the first " | |
649 | "bad revision could be any of:\n")) |
|
649 | "bad revision could be any of:\n")) | |
650 | for n in nodes: |
|
650 | for n in nodes: | |
651 | displayer.show(repo[n]) |
|
651 | displayer.show(repo[n]) | |
652 | displayer.close() |
|
652 | displayer.close() | |
653 |
|
653 | |||
654 | def check_state(state, interactive=True): |
|
654 | def check_state(state, interactive=True): | |
655 | if not state['good'] or not state['bad']: |
|
655 | if not state['good'] or not state['bad']: | |
656 | if (good or bad or skip or reset) and interactive: |
|
656 | if (good or bad or skip or reset) and interactive: | |
657 | return |
|
657 | return | |
658 | if not state['good']: |
|
658 | if not state['good']: | |
659 | raise util.Abort(_('cannot bisect (no known good revisions)')) |
|
659 | raise util.Abort(_('cannot bisect (no known good revisions)')) | |
660 | else: |
|
660 | else: | |
661 | raise util.Abort(_('cannot bisect (no known bad revisions)')) |
|
661 | raise util.Abort(_('cannot bisect (no known bad revisions)')) | |
662 | return True |
|
662 | return True | |
663 |
|
663 | |||
664 | # backward compatibility |
|
664 | # backward compatibility | |
665 | if rev in "good bad reset init".split(): |
|
665 | if rev in "good bad reset init".split(): | |
666 | ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n")) |
|
666 | ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n")) | |
667 | cmd, rev, extra = rev, extra, None |
|
667 | cmd, rev, extra = rev, extra, None | |
668 | if cmd == "good": |
|
668 | if cmd == "good": | |
669 | good = True |
|
669 | good = True | |
670 | elif cmd == "bad": |
|
670 | elif cmd == "bad": | |
671 | bad = True |
|
671 | bad = True | |
672 | else: |
|
672 | else: | |
673 | reset = True |
|
673 | reset = True | |
674 | elif extra or good + bad + skip + reset + extend + bool(command) > 1: |
|
674 | elif extra or good + bad + skip + reset + extend + bool(command) > 1: | |
675 | raise util.Abort(_('incompatible arguments')) |
|
675 | raise util.Abort(_('incompatible arguments')) | |
676 |
|
676 | |||
677 | cmdutil.checkunfinished(repo) |
|
677 | cmdutil.checkunfinished(repo) | |
678 |
|
678 | |||
679 | if reset: |
|
679 | if reset: | |
680 | p = repo.join("bisect.state") |
|
680 | p = repo.join("bisect.state") | |
681 | if os.path.exists(p): |
|
681 | if os.path.exists(p): | |
682 | os.unlink(p) |
|
682 | os.unlink(p) | |
683 | return |
|
683 | return | |
684 |
|
684 | |||
685 | state = hbisect.load_state(repo) |
|
685 | state = hbisect.load_state(repo) | |
686 |
|
686 | |||
687 | if command: |
|
687 | if command: | |
688 | changesets = 1 |
|
688 | changesets = 1 | |
689 | if noupdate: |
|
689 | if noupdate: | |
690 | try: |
|
690 | try: | |
691 | node = state['current'][0] |
|
691 | node = state['current'][0] | |
692 | except LookupError: |
|
692 | except LookupError: | |
693 | raise util.Abort(_('current bisect revision is unknown - ' |
|
693 | raise util.Abort(_('current bisect revision is unknown - ' | |
694 | 'start a new bisect to fix')) |
|
694 | 'start a new bisect to fix')) | |
695 | else: |
|
695 | else: | |
696 | node, p2 = repo.dirstate.parents() |
|
696 | node, p2 = repo.dirstate.parents() | |
697 | if p2 != nullid: |
|
697 | if p2 != nullid: | |
698 | raise util.Abort(_('current bisect revision is a merge')) |
|
698 | raise util.Abort(_('current bisect revision is a merge')) | |
699 | try: |
|
699 | try: | |
700 | while changesets: |
|
700 | while changesets: | |
701 | # update state |
|
701 | # update state | |
702 | state['current'] = [node] |
|
702 | state['current'] = [node] | |
703 | hbisect.save_state(repo, state) |
|
703 | hbisect.save_state(repo, state) | |
704 | status = util.system(command, |
|
704 | status = util.system(command, | |
705 | environ={'HG_NODE': hex(node)}, |
|
705 | environ={'HG_NODE': hex(node)}, | |
706 | out=ui.fout) |
|
706 | out=ui.fout) | |
707 | if status == 125: |
|
707 | if status == 125: | |
708 | transition = "skip" |
|
708 | transition = "skip" | |
709 | elif status == 0: |
|
709 | elif status == 0: | |
710 | transition = "good" |
|
710 | transition = "good" | |
711 | # status < 0 means process was killed |
|
711 | # status < 0 means process was killed | |
712 | elif status == 127: |
|
712 | elif status == 127: | |
713 | raise util.Abort(_("failed to execute %s") % command) |
|
713 | raise util.Abort(_("failed to execute %s") % command) | |
714 | elif status < 0: |
|
714 | elif status < 0: | |
715 | raise util.Abort(_("%s killed") % command) |
|
715 | raise util.Abort(_("%s killed") % command) | |
716 | else: |
|
716 | else: | |
717 | transition = "bad" |
|
717 | transition = "bad" | |
718 | ctx = scmutil.revsingle(repo, rev, node) |
|
718 | ctx = scmutil.revsingle(repo, rev, node) | |
719 | rev = None # clear for future iterations |
|
719 | rev = None # clear for future iterations | |
720 | state[transition].append(ctx.node()) |
|
720 | state[transition].append(ctx.node()) | |
721 | ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition)) |
|
721 | ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition)) | |
722 | check_state(state, interactive=False) |
|
722 | check_state(state, interactive=False) | |
723 | # bisect |
|
723 | # bisect | |
724 | nodes, changesets, bgood = hbisect.bisect(repo.changelog, state) |
|
724 | nodes, changesets, bgood = hbisect.bisect(repo.changelog, state) | |
725 | # update to next check |
|
725 | # update to next check | |
726 | node = nodes[0] |
|
726 | node = nodes[0] | |
727 | if not noupdate: |
|
727 | if not noupdate: | |
728 | cmdutil.bailifchanged(repo) |
|
728 | cmdutil.bailifchanged(repo) | |
729 | hg.clean(repo, node, show_stats=False) |
|
729 | hg.clean(repo, node, show_stats=False) | |
730 | finally: |
|
730 | finally: | |
731 | state['current'] = [node] |
|
731 | state['current'] = [node] | |
732 | hbisect.save_state(repo, state) |
|
732 | hbisect.save_state(repo, state) | |
733 | print_result(nodes, bgood) |
|
733 | print_result(nodes, bgood) | |
734 | return |
|
734 | return | |
735 |
|
735 | |||
736 | # update state |
|
736 | # update state | |
737 |
|
737 | |||
738 | if rev: |
|
738 | if rev: | |
739 | nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])] |
|
739 | nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])] | |
740 | else: |
|
740 | else: | |
741 | nodes = [repo.lookup('.')] |
|
741 | nodes = [repo.lookup('.')] | |
742 |
|
742 | |||
743 | if good or bad or skip: |
|
743 | if good or bad or skip: | |
744 | if good: |
|
744 | if good: | |
745 | state['good'] += nodes |
|
745 | state['good'] += nodes | |
746 | elif bad: |
|
746 | elif bad: | |
747 | state['bad'] += nodes |
|
747 | state['bad'] += nodes | |
748 | elif skip: |
|
748 | elif skip: | |
749 | state['skip'] += nodes |
|
749 | state['skip'] += nodes | |
750 | hbisect.save_state(repo, state) |
|
750 | hbisect.save_state(repo, state) | |
751 |
|
751 | |||
752 | if not check_state(state): |
|
752 | if not check_state(state): | |
753 | return |
|
753 | return | |
754 |
|
754 | |||
755 | # actually bisect |
|
755 | # actually bisect | |
756 | nodes, changesets, good = hbisect.bisect(repo.changelog, state) |
|
756 | nodes, changesets, good = hbisect.bisect(repo.changelog, state) | |
757 | if extend: |
|
757 | if extend: | |
758 | if not changesets: |
|
758 | if not changesets: | |
759 | extendnode = extendbisectrange(nodes, good) |
|
759 | extendnode = extendbisectrange(nodes, good) | |
760 | if extendnode is not None: |
|
760 | if extendnode is not None: | |
761 | ui.write(_("Extending search to changeset %d:%s\n") |
|
761 | ui.write(_("Extending search to changeset %d:%s\n") | |
762 | % (extendnode.rev(), extendnode)) |
|
762 | % (extendnode.rev(), extendnode)) | |
763 | state['current'] = [extendnode.node()] |
|
763 | state['current'] = [extendnode.node()] | |
764 | hbisect.save_state(repo, state) |
|
764 | hbisect.save_state(repo, state) | |
765 | if noupdate: |
|
765 | if noupdate: | |
766 | return |
|
766 | return | |
767 | cmdutil.bailifchanged(repo) |
|
767 | cmdutil.bailifchanged(repo) | |
768 | return hg.clean(repo, extendnode.node()) |
|
768 | return hg.clean(repo, extendnode.node()) | |
769 | raise util.Abort(_("nothing to extend")) |
|
769 | raise util.Abort(_("nothing to extend")) | |
770 |
|
770 | |||
771 | if changesets == 0: |
|
771 | if changesets == 0: | |
772 | print_result(nodes, good) |
|
772 | print_result(nodes, good) | |
773 | else: |
|
773 | else: | |
774 | assert len(nodes) == 1 # only a single node can be tested next |
|
774 | assert len(nodes) == 1 # only a single node can be tested next | |
775 | node = nodes[0] |
|
775 | node = nodes[0] | |
776 | # compute the approximate number of remaining tests |
|
776 | # compute the approximate number of remaining tests | |
777 | tests, size = 0, 2 |
|
777 | tests, size = 0, 2 | |
778 | while size <= changesets: |
|
778 | while size <= changesets: | |
779 | tests, size = tests + 1, size * 2 |
|
779 | tests, size = tests + 1, size * 2 | |
780 | rev = repo.changelog.rev(node) |
|
780 | rev = repo.changelog.rev(node) | |
781 | ui.write(_("Testing changeset %d:%s " |
|
781 | ui.write(_("Testing changeset %d:%s " | |
782 | "(%d changesets remaining, ~%d tests)\n") |
|
782 | "(%d changesets remaining, ~%d tests)\n") | |
783 | % (rev, short(node), changesets, tests)) |
|
783 | % (rev, short(node), changesets, tests)) | |
784 | state['current'] = [node] |
|
784 | state['current'] = [node] | |
785 | hbisect.save_state(repo, state) |
|
785 | hbisect.save_state(repo, state) | |
786 | if not noupdate: |
|
786 | if not noupdate: | |
787 | cmdutil.bailifchanged(repo) |
|
787 | cmdutil.bailifchanged(repo) | |
788 | return hg.clean(repo, node) |
|
788 | return hg.clean(repo, node) | |
789 |
|
789 | |||
790 | @command('bookmarks|bookmark', |
|
790 | @command('bookmarks|bookmark', | |
791 | [('f', 'force', False, _('force')), |
|
791 | [('f', 'force', False, _('force')), | |
792 | ('r', 'rev', '', _('revision'), _('REV')), |
|
792 | ('r', 'rev', '', _('revision'), _('REV')), | |
793 | ('d', 'delete', False, _('delete a given bookmark')), |
|
793 | ('d', 'delete', False, _('delete a given bookmark')), | |
794 | ('m', 'rename', '', _('rename a given bookmark'), _('NAME')), |
|
794 | ('m', 'rename', '', _('rename a given bookmark'), _('NAME')), | |
795 | ('i', 'inactive', False, _('mark a bookmark inactive'))], |
|
795 | ('i', 'inactive', False, _('mark a bookmark inactive'))], | |
796 | _('hg bookmarks [OPTIONS]... [NAME]...')) |
|
796 | _('hg bookmarks [OPTIONS]... [NAME]...')) | |
797 | def bookmark(ui, repo, *names, **opts): |
|
797 | def bookmark(ui, repo, *names, **opts): | |
798 | '''track a line of development with movable markers |
|
798 | '''track a line of development with movable markers | |
799 |
|
799 | |||
800 | Bookmarks are pointers to certain commits that move when committing. |
|
800 | Bookmarks are pointers to certain commits that move when committing. | |
801 | Bookmarks are local. They can be renamed, copied and deleted. It is |
|
801 | Bookmarks are local. They can be renamed, copied and deleted. It is | |
802 | possible to use :hg:`merge NAME` to merge from a given bookmark, and |
|
802 | possible to use :hg:`merge NAME` to merge from a given bookmark, and | |
803 | :hg:`update NAME` to update to a given bookmark. |
|
803 | :hg:`update NAME` to update to a given bookmark. | |
804 |
|
804 | |||
805 | You can use :hg:`bookmark NAME` to set a bookmark on the working |
|
805 | You can use :hg:`bookmark NAME` to set a bookmark on the working | |
806 | directory's parent revision with the given name. If you specify |
|
806 | directory's parent revision with the given name. If you specify | |
807 | a revision using -r REV (where REV may be an existing bookmark), |
|
807 | a revision using -r REV (where REV may be an existing bookmark), | |
808 | the bookmark is assigned to that revision. |
|
808 | the bookmark is assigned to that revision. | |
809 |
|
809 | |||
810 | Bookmarks can be pushed and pulled between repositories (see :hg:`help |
|
810 | Bookmarks can be pushed and pulled between repositories (see :hg:`help | |
811 | push` and :hg:`help pull`). This requires both the local and remote |
|
811 | push` and :hg:`help pull`). This requires both the local and remote | |
812 | repositories to support bookmarks. For versions prior to 1.8, this means |
|
812 | repositories to support bookmarks. For versions prior to 1.8, this means | |
813 | the bookmarks extension must be enabled. |
|
813 | the bookmarks extension must be enabled. | |
814 |
|
814 | |||
815 | If you set a bookmark called '@', new clones of the repository will |
|
815 | If you set a bookmark called '@', new clones of the repository will | |
816 | have that revision checked out (and the bookmark made active) by |
|
816 | have that revision checked out (and the bookmark made active) by | |
817 | default. |
|
817 | default. | |
818 |
|
818 | |||
819 | With -i/--inactive, the new bookmark will not be made the active |
|
819 | With -i/--inactive, the new bookmark will not be made the active | |
820 | bookmark. If -r/--rev is given, the new bookmark will not be made |
|
820 | bookmark. If -r/--rev is given, the new bookmark will not be made | |
821 | active even if -i/--inactive is not given. If no NAME is given, the |
|
821 | active even if -i/--inactive is not given. If no NAME is given, the | |
822 | current active bookmark will be marked inactive. |
|
822 | current active bookmark will be marked inactive. | |
823 | ''' |
|
823 | ''' | |
824 | force = opts.get('force') |
|
824 | force = opts.get('force') | |
825 | rev = opts.get('rev') |
|
825 | rev = opts.get('rev') | |
826 | delete = opts.get('delete') |
|
826 | delete = opts.get('delete') | |
827 | rename = opts.get('rename') |
|
827 | rename = opts.get('rename') | |
828 | inactive = opts.get('inactive') |
|
828 | inactive = opts.get('inactive') | |
829 |
|
829 | |||
830 | def checkformat(mark): |
|
830 | def checkformat(mark): | |
831 | mark = mark.strip() |
|
831 | mark = mark.strip() | |
832 | if not mark: |
|
832 | if not mark: | |
833 | raise util.Abort(_("bookmark names cannot consist entirely of " |
|
833 | raise util.Abort(_("bookmark names cannot consist entirely of " | |
834 | "whitespace")) |
|
834 | "whitespace")) | |
835 | scmutil.checknewlabel(repo, mark, 'bookmark') |
|
835 | scmutil.checknewlabel(repo, mark, 'bookmark') | |
836 | return mark |
|
836 | return mark | |
837 |
|
837 | |||
838 | def checkconflict(repo, mark, cur, force=False, target=None): |
|
838 | def checkconflict(repo, mark, cur, force=False, target=None): | |
839 | if mark in marks and not force: |
|
839 | if mark in marks and not force: | |
840 | if target: |
|
840 | if target: | |
841 | if marks[mark] == target and target == cur: |
|
841 | if marks[mark] == target and target == cur: | |
842 | # re-activating a bookmark |
|
842 | # re-activating a bookmark | |
843 | return |
|
843 | return | |
844 | anc = repo.changelog.ancestors([repo[target].rev()]) |
|
844 | anc = repo.changelog.ancestors([repo[target].rev()]) | |
845 | bmctx = repo[marks[mark]] |
|
845 | bmctx = repo[marks[mark]] | |
846 | divs = [repo[b].node() for b in marks |
|
846 | divs = [repo[b].node() for b in marks | |
847 | if b.split('@', 1)[0] == mark.split('@', 1)[0]] |
|
847 | if b.split('@', 1)[0] == mark.split('@', 1)[0]] | |
848 |
|
848 | |||
849 | # allow resolving a single divergent bookmark even if moving |
|
849 | # allow resolving a single divergent bookmark even if moving | |
850 | # the bookmark across branches when a revision is specified |
|
850 | # the bookmark across branches when a revision is specified | |
851 | # that contains a divergent bookmark |
|
851 | # that contains a divergent bookmark | |
852 | if bmctx.rev() not in anc and target in divs: |
|
852 | if bmctx.rev() not in anc and target in divs: | |
853 | bookmarks.deletedivergent(repo, [target], mark) |
|
853 | bookmarks.deletedivergent(repo, [target], mark) | |
854 | return |
|
854 | return | |
855 |
|
855 | |||
856 | deletefrom = [b for b in divs |
|
856 | deletefrom = [b for b in divs | |
857 | if repo[b].rev() in anc or b == target] |
|
857 | if repo[b].rev() in anc or b == target] | |
858 | bookmarks.deletedivergent(repo, deletefrom, mark) |
|
858 | bookmarks.deletedivergent(repo, deletefrom, mark) | |
859 | if bookmarks.validdest(repo, bmctx, repo[target]): |
|
859 | if bookmarks.validdest(repo, bmctx, repo[target]): | |
860 | ui.status(_("moving bookmark '%s' forward from %s\n") % |
|
860 | ui.status(_("moving bookmark '%s' forward from %s\n") % | |
861 | (mark, short(bmctx.node()))) |
|
861 | (mark, short(bmctx.node()))) | |
862 | return |
|
862 | return | |
863 | raise util.Abort(_("bookmark '%s' already exists " |
|
863 | raise util.Abort(_("bookmark '%s' already exists " | |
864 | "(use -f to force)") % mark) |
|
864 | "(use -f to force)") % mark) | |
865 | if ((mark in repo.branchmap() or mark == repo.dirstate.branch()) |
|
865 | if ((mark in repo.branchmap() or mark == repo.dirstate.branch()) | |
866 | and not force): |
|
866 | and not force): | |
867 | raise util.Abort( |
|
867 | raise util.Abort( | |
868 | _("a bookmark cannot have the name of an existing branch")) |
|
868 | _("a bookmark cannot have the name of an existing branch")) | |
869 |
|
869 | |||
870 | if delete and rename: |
|
870 | if delete and rename: | |
871 | raise util.Abort(_("--delete and --rename are incompatible")) |
|
871 | raise util.Abort(_("--delete and --rename are incompatible")) | |
872 | if delete and rev: |
|
872 | if delete and rev: | |
873 | raise util.Abort(_("--rev is incompatible with --delete")) |
|
873 | raise util.Abort(_("--rev is incompatible with --delete")) | |
874 | if rename and rev: |
|
874 | if rename and rev: | |
875 | raise util.Abort(_("--rev is incompatible with --rename")) |
|
875 | raise util.Abort(_("--rev is incompatible with --rename")) | |
876 | if not names and (delete or rev): |
|
876 | if not names and (delete or rev): | |
877 | raise util.Abort(_("bookmark name required")) |
|
877 | raise util.Abort(_("bookmark name required")) | |
878 |
|
878 | |||
879 | if delete or rename or names or inactive: |
|
879 | if delete or rename or names or inactive: | |
880 | wlock = repo.wlock() |
|
880 | wlock = repo.wlock() | |
881 | try: |
|
881 | try: | |
882 | cur = repo.changectx('.').node() |
|
882 | cur = repo.changectx('.').node() | |
883 | marks = repo._bookmarks |
|
883 | marks = repo._bookmarks | |
884 | if delete: |
|
884 | if delete: | |
885 | for mark in names: |
|
885 | for mark in names: | |
886 | if mark not in marks: |
|
886 | if mark not in marks: | |
887 | raise util.Abort(_("bookmark '%s' does not exist") % |
|
887 | raise util.Abort(_("bookmark '%s' does not exist") % | |
888 | mark) |
|
888 | mark) | |
889 | if mark == repo._bookmarkcurrent: |
|
889 | if mark == repo._bookmarkcurrent: | |
890 | bookmarks.unsetcurrent(repo) |
|
890 | bookmarks.unsetcurrent(repo) | |
891 | del marks[mark] |
|
891 | del marks[mark] | |
892 | marks.write() |
|
892 | marks.write() | |
893 |
|
893 | |||
894 | elif rename: |
|
894 | elif rename: | |
895 | if not names: |
|
895 | if not names: | |
896 | raise util.Abort(_("new bookmark name required")) |
|
896 | raise util.Abort(_("new bookmark name required")) | |
897 | elif len(names) > 1: |
|
897 | elif len(names) > 1: | |
898 | raise util.Abort(_("only one new bookmark name allowed")) |
|
898 | raise util.Abort(_("only one new bookmark name allowed")) | |
899 | mark = checkformat(names[0]) |
|
899 | mark = checkformat(names[0]) | |
900 | if rename not in marks: |
|
900 | if rename not in marks: | |
901 | raise util.Abort(_("bookmark '%s' does not exist") % rename) |
|
901 | raise util.Abort(_("bookmark '%s' does not exist") % rename) | |
902 | checkconflict(repo, mark, cur, force) |
|
902 | checkconflict(repo, mark, cur, force) | |
903 | marks[mark] = marks[rename] |
|
903 | marks[mark] = marks[rename] | |
904 | if repo._bookmarkcurrent == rename and not inactive: |
|
904 | if repo._bookmarkcurrent == rename and not inactive: | |
905 | bookmarks.setcurrent(repo, mark) |
|
905 | bookmarks.setcurrent(repo, mark) | |
906 | del marks[rename] |
|
906 | del marks[rename] | |
907 | marks.write() |
|
907 | marks.write() | |
908 |
|
908 | |||
909 | elif names: |
|
909 | elif names: | |
910 | newact = None |
|
910 | newact = None | |
911 | for mark in names: |
|
911 | for mark in names: | |
912 | mark = checkformat(mark) |
|
912 | mark = checkformat(mark) | |
913 | if newact is None: |
|
913 | if newact is None: | |
914 | newact = mark |
|
914 | newact = mark | |
915 | if inactive and mark == repo._bookmarkcurrent: |
|
915 | if inactive and mark == repo._bookmarkcurrent: | |
916 | bookmarks.unsetcurrent(repo) |
|
916 | bookmarks.unsetcurrent(repo) | |
917 | return |
|
917 | return | |
918 | tgt = cur |
|
918 | tgt = cur | |
919 | if rev: |
|
919 | if rev: | |
920 | tgt = scmutil.revsingle(repo, rev).node() |
|
920 | tgt = scmutil.revsingle(repo, rev).node() | |
921 | checkconflict(repo, mark, cur, force, tgt) |
|
921 | checkconflict(repo, mark, cur, force, tgt) | |
922 | marks[mark] = tgt |
|
922 | marks[mark] = tgt | |
923 | if not inactive and cur == marks[newact] and not rev: |
|
923 | if not inactive and cur == marks[newact] and not rev: | |
924 | bookmarks.setcurrent(repo, newact) |
|
924 | bookmarks.setcurrent(repo, newact) | |
925 | elif cur != tgt and newact == repo._bookmarkcurrent: |
|
925 | elif cur != tgt and newact == repo._bookmarkcurrent: | |
926 | bookmarks.unsetcurrent(repo) |
|
926 | bookmarks.unsetcurrent(repo) | |
927 | marks.write() |
|
927 | marks.write() | |
928 |
|
928 | |||
929 | elif inactive: |
|
929 | elif inactive: | |
930 | if len(marks) == 0: |
|
930 | if len(marks) == 0: | |
931 | ui.status(_("no bookmarks set\n")) |
|
931 | ui.status(_("no bookmarks set\n")) | |
932 | elif not repo._bookmarkcurrent: |
|
932 | elif not repo._bookmarkcurrent: | |
933 | ui.status(_("no active bookmark\n")) |
|
933 | ui.status(_("no active bookmark\n")) | |
934 | else: |
|
934 | else: | |
935 | bookmarks.unsetcurrent(repo) |
|
935 | bookmarks.unsetcurrent(repo) | |
936 | finally: |
|
936 | finally: | |
937 | wlock.release() |
|
937 | wlock.release() | |
938 | else: # show bookmarks |
|
938 | else: # show bookmarks | |
939 | hexfn = ui.debugflag and hex or short |
|
939 | hexfn = ui.debugflag and hex or short | |
940 | marks = repo._bookmarks |
|
940 | marks = repo._bookmarks | |
941 | if len(marks) == 0: |
|
941 | if len(marks) == 0: | |
942 | ui.status(_("no bookmarks set\n")) |
|
942 | ui.status(_("no bookmarks set\n")) | |
943 | else: |
|
943 | else: | |
944 | for bmark, n in sorted(marks.iteritems()): |
|
944 | for bmark, n in sorted(marks.iteritems()): | |
945 | current = repo._bookmarkcurrent |
|
945 | current = repo._bookmarkcurrent | |
946 | if bmark == current: |
|
946 | if bmark == current: | |
947 | prefix, label = '*', 'bookmarks.current' |
|
947 | prefix, label = '*', 'bookmarks.current' | |
948 | else: |
|
948 | else: | |
949 | prefix, label = ' ', '' |
|
949 | prefix, label = ' ', '' | |
950 |
|
950 | |||
951 | if ui.quiet: |
|
951 | if ui.quiet: | |
952 | ui.write("%s\n" % bmark, label=label) |
|
952 | ui.write("%s\n" % bmark, label=label) | |
953 | else: |
|
953 | else: | |
954 | ui.write(" %s %-25s %d:%s\n" % ( |
|
954 | ui.write(" %s %-25s %d:%s\n" % ( | |
955 | prefix, bmark, repo.changelog.rev(n), hexfn(n)), |
|
955 | prefix, bmark, repo.changelog.rev(n), hexfn(n)), | |
956 | label=label) |
|
956 | label=label) | |
957 |
|
957 | |||
958 | @command('branch', |
|
958 | @command('branch', | |
959 | [('f', 'force', None, |
|
959 | [('f', 'force', None, | |
960 | _('set branch name even if it shadows an existing branch')), |
|
960 | _('set branch name even if it shadows an existing branch')), | |
961 | ('C', 'clean', None, _('reset branch name to parent branch name'))], |
|
961 | ('C', 'clean', None, _('reset branch name to parent branch name'))], | |
962 | _('[-fC] [NAME]')) |
|
962 | _('[-fC] [NAME]')) | |
963 | def branch(ui, repo, label=None, **opts): |
|
963 | def branch(ui, repo, label=None, **opts): | |
964 | """set or show the current branch name |
|
964 | """set or show the current branch name | |
965 |
|
965 | |||
966 | .. note:: |
|
966 | .. note:: | |
967 |
|
967 | |||
968 | Branch names are permanent and global. Use :hg:`bookmark` to create a |
|
968 | Branch names are permanent and global. Use :hg:`bookmark` to create a | |
969 | light-weight bookmark instead. See :hg:`help glossary` for more |
|
969 | light-weight bookmark instead. See :hg:`help glossary` for more | |
970 | information about named branches and bookmarks. |
|
970 | information about named branches and bookmarks. | |
971 |
|
971 | |||
972 | With no argument, show the current branch name. With one argument, |
|
972 | With no argument, show the current branch name. With one argument, | |
973 | set the working directory branch name (the branch will not exist |
|
973 | set the working directory branch name (the branch will not exist | |
974 | in the repository until the next commit). Standard practice |
|
974 | in the repository until the next commit). Standard practice | |
975 | recommends that primary development take place on the 'default' |
|
975 | recommends that primary development take place on the 'default' | |
976 | branch. |
|
976 | branch. | |
977 |
|
977 | |||
978 | Unless -f/--force is specified, branch will not let you set a |
|
978 | Unless -f/--force is specified, branch will not let you set a | |
979 | branch name that already exists, even if it's inactive. |
|
979 | branch name that already exists, even if it's inactive. | |
980 |
|
980 | |||
981 | Use -C/--clean to reset the working directory branch to that of |
|
981 | Use -C/--clean to reset the working directory branch to that of | |
982 | the parent of the working directory, negating a previous branch |
|
982 | the parent of the working directory, negating a previous branch | |
983 | change. |
|
983 | change. | |
984 |
|
984 | |||
985 | Use the command :hg:`update` to switch to an existing branch. Use |
|
985 | Use the command :hg:`update` to switch to an existing branch. Use | |
986 | :hg:`commit --close-branch` to mark this branch as closed. |
|
986 | :hg:`commit --close-branch` to mark this branch as closed. | |
987 |
|
987 | |||
988 | Returns 0 on success. |
|
988 | Returns 0 on success. | |
989 | """ |
|
989 | """ | |
990 | if label: |
|
990 | if label: | |
991 | label = label.strip() |
|
991 | label = label.strip() | |
992 |
|
992 | |||
993 | if not opts.get('clean') and not label: |
|
993 | if not opts.get('clean') and not label: | |
994 | ui.write("%s\n" % repo.dirstate.branch()) |
|
994 | ui.write("%s\n" % repo.dirstate.branch()) | |
995 | return |
|
995 | return | |
996 |
|
996 | |||
997 | wlock = repo.wlock() |
|
997 | wlock = repo.wlock() | |
998 | try: |
|
998 | try: | |
999 | if opts.get('clean'): |
|
999 | if opts.get('clean'): | |
1000 | label = repo[None].p1().branch() |
|
1000 | label = repo[None].p1().branch() | |
1001 | repo.dirstate.setbranch(label) |
|
1001 | repo.dirstate.setbranch(label) | |
1002 | ui.status(_('reset working directory to branch %s\n') % label) |
|
1002 | ui.status(_('reset working directory to branch %s\n') % label) | |
1003 | elif label: |
|
1003 | elif label: | |
1004 | if not opts.get('force') and label in repo.branchmap(): |
|
1004 | if not opts.get('force') and label in repo.branchmap(): | |
1005 | if label not in [p.branch() for p in repo.parents()]: |
|
1005 | if label not in [p.branch() for p in repo.parents()]: | |
1006 | raise util.Abort(_('a branch of the same name already' |
|
1006 | raise util.Abort(_('a branch of the same name already' | |
1007 | ' exists'), |
|
1007 | ' exists'), | |
1008 | # i18n: "it" refers to an existing branch |
|
1008 | # i18n: "it" refers to an existing branch | |
1009 | hint=_("use 'hg update' to switch to it")) |
|
1009 | hint=_("use 'hg update' to switch to it")) | |
1010 | scmutil.checknewlabel(repo, label, 'branch') |
|
1010 | scmutil.checknewlabel(repo, label, 'branch') | |
1011 | repo.dirstate.setbranch(label) |
|
1011 | repo.dirstate.setbranch(label) | |
1012 | ui.status(_('marked working directory as branch %s\n') % label) |
|
1012 | ui.status(_('marked working directory as branch %s\n') % label) | |
1013 | ui.status(_('(branches are permanent and global, ' |
|
1013 | ui.status(_('(branches are permanent and global, ' | |
1014 | 'did you want a bookmark?)\n')) |
|
1014 | 'did you want a bookmark?)\n')) | |
1015 | finally: |
|
1015 | finally: | |
1016 | wlock.release() |
|
1016 | wlock.release() | |
1017 |
|
1017 | |||
1018 | @command('branches', |
|
1018 | @command('branches', | |
1019 | [('a', 'active', False, _('show only branches that have unmerged heads')), |
|
1019 | [('a', 'active', False, _('show only branches that have unmerged heads')), | |
1020 | ('c', 'closed', False, _('show normal and closed branches'))], |
|
1020 | ('c', 'closed', False, _('show normal and closed branches'))], | |
1021 | _('[-ac]')) |
|
1021 | _('[-ac]')) | |
1022 | def branches(ui, repo, active=False, closed=False): |
|
1022 | def branches(ui, repo, active=False, closed=False): | |
1023 | """list repository named branches |
|
1023 | """list repository named branches | |
1024 |
|
1024 | |||
1025 | List the repository's named branches, indicating which ones are |
|
1025 | List the repository's named branches, indicating which ones are | |
1026 | inactive. If -c/--closed is specified, also list branches which have |
|
1026 | inactive. If -c/--closed is specified, also list branches which have | |
1027 | been marked closed (see :hg:`commit --close-branch`). |
|
1027 | been marked closed (see :hg:`commit --close-branch`). | |
1028 |
|
1028 | |||
1029 | If -a/--active is specified, only show active branches. A branch |
|
1029 | If -a/--active is specified, only show active branches. A branch | |
1030 | is considered active if it contains repository heads. |
|
1030 | is considered active if it contains repository heads. | |
1031 |
|
1031 | |||
1032 | Use the command :hg:`update` to switch to an existing branch. |
|
1032 | Use the command :hg:`update` to switch to an existing branch. | |
1033 |
|
1033 | |||
1034 | Returns 0. |
|
1034 | Returns 0. | |
1035 | """ |
|
1035 | """ | |
1036 |
|
1036 | |||
1037 | hexfunc = ui.debugflag and hex or short |
|
1037 | hexfunc = ui.debugflag and hex or short | |
1038 |
|
1038 | |||
1039 | allheads = set(repo.heads()) |
|
1039 | allheads = set(repo.heads()) | |
1040 | branches = [] |
|
1040 | branches = [] | |
1041 | for tag, heads, tip, isclosed in repo.branchmap().iterbranches(): |
|
1041 | for tag, heads, tip, isclosed in repo.branchmap().iterbranches(): | |
1042 | isactive = not isclosed and bool(set(heads) & allheads) |
|
1042 | isactive = not isclosed and bool(set(heads) & allheads) | |
1043 | branches.append((tag, repo[tip], isactive, not isclosed)) |
|
1043 | branches.append((tag, repo[tip], isactive, not isclosed)) | |
1044 | branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), |
|
1044 | branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), | |
1045 | reverse=True) |
|
1045 | reverse=True) | |
1046 |
|
1046 | |||
1047 | for tag, ctx, isactive, isopen in branches: |
|
1047 | for tag, ctx, isactive, isopen in branches: | |
1048 | if (not active) or isactive: |
|
1048 | if (not active) or isactive: | |
1049 | if isactive: |
|
1049 | if isactive: | |
1050 | label = 'branches.active' |
|
1050 | label = 'branches.active' | |
1051 | notice = '' |
|
1051 | notice = '' | |
1052 | elif not isopen: |
|
1052 | elif not isopen: | |
1053 | if not closed: |
|
1053 | if not closed: | |
1054 | continue |
|
1054 | continue | |
1055 | label = 'branches.closed' |
|
1055 | label = 'branches.closed' | |
1056 | notice = _(' (closed)') |
|
1056 | notice = _(' (closed)') | |
1057 | else: |
|
1057 | else: | |
1058 | label = 'branches.inactive' |
|
1058 | label = 'branches.inactive' | |
1059 | notice = _(' (inactive)') |
|
1059 | notice = _(' (inactive)') | |
1060 | if tag == repo.dirstate.branch(): |
|
1060 | if tag == repo.dirstate.branch(): | |
1061 | label = 'branches.current' |
|
1061 | label = 'branches.current' | |
1062 | rev = str(ctx.rev()).rjust(31 - encoding.colwidth(tag)) |
|
1062 | rev = str(ctx.rev()).rjust(31 - encoding.colwidth(tag)) | |
1063 | rev = ui.label('%s:%s' % (rev, hexfunc(ctx.node())), |
|
1063 | rev = ui.label('%s:%s' % (rev, hexfunc(ctx.node())), | |
1064 | 'log.changeset changeset.%s' % ctx.phasestr()) |
|
1064 | 'log.changeset changeset.%s' % ctx.phasestr()) | |
1065 | labeledtag = ui.label(tag, label) |
|
1065 | labeledtag = ui.label(tag, label) | |
1066 | if ui.quiet: |
|
1066 | if ui.quiet: | |
1067 | ui.write("%s\n" % labeledtag) |
|
1067 | ui.write("%s\n" % labeledtag) | |
1068 | else: |
|
1068 | else: | |
1069 | ui.write("%s %s%s\n" % (labeledtag, rev, notice)) |
|
1069 | ui.write("%s %s%s\n" % (labeledtag, rev, notice)) | |
1070 |
|
1070 | |||
1071 | @command('bundle', |
|
1071 | @command('bundle', | |
1072 | [('f', 'force', None, _('run even when the destination is unrelated')), |
|
1072 | [('f', 'force', None, _('run even when the destination is unrelated')), | |
1073 | ('r', 'rev', [], _('a changeset intended to be added to the destination'), |
|
1073 | ('r', 'rev', [], _('a changeset intended to be added to the destination'), | |
1074 | _('REV')), |
|
1074 | _('REV')), | |
1075 | ('b', 'branch', [], _('a specific branch you would like to bundle'), |
|
1075 | ('b', 'branch', [], _('a specific branch you would like to bundle'), | |
1076 | _('BRANCH')), |
|
1076 | _('BRANCH')), | |
1077 | ('', 'base', [], |
|
1077 | ('', 'base', [], | |
1078 | _('a base changeset assumed to be available at the destination'), |
|
1078 | _('a base changeset assumed to be available at the destination'), | |
1079 | _('REV')), |
|
1079 | _('REV')), | |
1080 | ('a', 'all', None, _('bundle all changesets in the repository')), |
|
1080 | ('a', 'all', None, _('bundle all changesets in the repository')), | |
1081 | ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')), |
|
1081 | ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')), | |
1082 | ] + remoteopts, |
|
1082 | ] + remoteopts, | |
1083 | _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]')) |
|
1083 | _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]')) | |
1084 | def bundle(ui, repo, fname, dest=None, **opts): |
|
1084 | def bundle(ui, repo, fname, dest=None, **opts): | |
1085 | """create a changegroup file |
|
1085 | """create a changegroup file | |
1086 |
|
1086 | |||
1087 | Generate a compressed changegroup file collecting changesets not |
|
1087 | Generate a compressed changegroup file collecting changesets not | |
1088 | known to be in another repository. |
|
1088 | known to be in another repository. | |
1089 |
|
1089 | |||
1090 | If you omit the destination repository, then hg assumes the |
|
1090 | If you omit the destination repository, then hg assumes the | |
1091 | destination will have all the nodes you specify with --base |
|
1091 | destination will have all the nodes you specify with --base | |
1092 | parameters. To create a bundle containing all changesets, use |
|
1092 | parameters. To create a bundle containing all changesets, use | |
1093 | -a/--all (or --base null). |
|
1093 | -a/--all (or --base null). | |
1094 |
|
1094 | |||
1095 | You can change compression method with the -t/--type option. |
|
1095 | You can change compression method with the -t/--type option. | |
1096 | The available compression methods are: none, bzip2, and |
|
1096 | The available compression methods are: none, bzip2, and | |
1097 | gzip (by default, bundles are compressed using bzip2). |
|
1097 | gzip (by default, bundles are compressed using bzip2). | |
1098 |
|
1098 | |||
1099 | The bundle file can then be transferred using conventional means |
|
1099 | The bundle file can then be transferred using conventional means | |
1100 | and applied to another repository with the unbundle or pull |
|
1100 | and applied to another repository with the unbundle or pull | |
1101 | command. This is useful when direct push and pull are not |
|
1101 | command. This is useful when direct push and pull are not | |
1102 | available or when exporting an entire repository is undesirable. |
|
1102 | available or when exporting an entire repository is undesirable. | |
1103 |
|
1103 | |||
1104 | Applying bundles preserves all changeset contents including |
|
1104 | Applying bundles preserves all changeset contents including | |
1105 | permissions, copy/rename information, and revision history. |
|
1105 | permissions, copy/rename information, and revision history. | |
1106 |
|
1106 | |||
1107 | Returns 0 on success, 1 if no changes found. |
|
1107 | Returns 0 on success, 1 if no changes found. | |
1108 | """ |
|
1108 | """ | |
1109 | revs = None |
|
1109 | revs = None | |
1110 | if 'rev' in opts: |
|
1110 | if 'rev' in opts: | |
1111 | revs = scmutil.revrange(repo, opts['rev']) |
|
1111 | revs = scmutil.revrange(repo, opts['rev']) | |
1112 |
|
1112 | |||
1113 | bundletype = opts.get('type', 'bzip2').lower() |
|
1113 | bundletype = opts.get('type', 'bzip2').lower() | |
1114 | btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'} |
|
1114 | btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'} | |
1115 | bundletype = btypes.get(bundletype) |
|
1115 | bundletype = btypes.get(bundletype) | |
1116 | if bundletype not in changegroup.bundletypes: |
|
1116 | if bundletype not in changegroup.bundletypes: | |
1117 | raise util.Abort(_('unknown bundle type specified with --type')) |
|
1117 | raise util.Abort(_('unknown bundle type specified with --type')) | |
1118 |
|
1118 | |||
1119 | if opts.get('all'): |
|
1119 | if opts.get('all'): | |
1120 | base = ['null'] |
|
1120 | base = ['null'] | |
1121 | else: |
|
1121 | else: | |
1122 | base = scmutil.revrange(repo, opts.get('base')) |
|
1122 | base = scmutil.revrange(repo, opts.get('base')) | |
1123 | # TODO: get desired bundlecaps from command line. |
|
1123 | # TODO: get desired bundlecaps from command line. | |
1124 | bundlecaps = None |
|
1124 | bundlecaps = None | |
1125 | if base: |
|
1125 | if base: | |
1126 | if dest: |
|
1126 | if dest: | |
1127 | raise util.Abort(_("--base is incompatible with specifying " |
|
1127 | raise util.Abort(_("--base is incompatible with specifying " | |
1128 | "a destination")) |
|
1128 | "a destination")) | |
1129 | common = [repo.lookup(rev) for rev in base] |
|
1129 | common = [repo.lookup(rev) for rev in base] | |
1130 | heads = revs and map(repo.lookup, revs) or revs |
|
1130 | heads = revs and map(repo.lookup, revs) or revs | |
1131 | cg = changegroup.getbundle(repo, 'bundle', heads=heads, common=common, |
|
1131 | cg = changegroup.getbundle(repo, 'bundle', heads=heads, common=common, | |
1132 | bundlecaps=bundlecaps) |
|
1132 | bundlecaps=bundlecaps) | |
1133 | outgoing = None |
|
1133 | outgoing = None | |
1134 | else: |
|
1134 | else: | |
1135 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
1135 | dest = ui.expandpath(dest or 'default-push', dest or 'default') | |
1136 | dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
1136 | dest, branches = hg.parseurl(dest, opts.get('branch')) | |
1137 | other = hg.peer(repo, opts, dest) |
|
1137 | other = hg.peer(repo, opts, dest) | |
1138 | revs, checkout = hg.addbranchrevs(repo, repo, branches, revs) |
|
1138 | revs, checkout = hg.addbranchrevs(repo, repo, branches, revs) | |
1139 | heads = revs and map(repo.lookup, revs) or revs |
|
1139 | heads = revs and map(repo.lookup, revs) or revs | |
1140 | outgoing = discovery.findcommonoutgoing(repo, other, |
|
1140 | outgoing = discovery.findcommonoutgoing(repo, other, | |
1141 | onlyheads=heads, |
|
1141 | onlyheads=heads, | |
1142 | force=opts.get('force'), |
|
1142 | force=opts.get('force'), | |
1143 | portable=True) |
|
1143 | portable=True) | |
1144 | cg = changegroup.getlocalbundle(repo, 'bundle', outgoing, bundlecaps) |
|
1144 | cg = changegroup.getlocalbundle(repo, 'bundle', outgoing, bundlecaps) | |
1145 | if not cg: |
|
1145 | if not cg: | |
1146 | scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded) |
|
1146 | scmutil.nochangesfound(ui, repo, outgoing and outgoing.excluded) | |
1147 | return 1 |
|
1147 | return 1 | |
1148 |
|
1148 | |||
1149 | changegroup.writebundle(cg, fname, bundletype) |
|
1149 | changegroup.writebundle(cg, fname, bundletype) | |
1150 |
|
1150 | |||
1151 | @command('cat', |
|
1151 | @command('cat', | |
1152 | [('o', 'output', '', |
|
1152 | [('o', 'output', '', | |
1153 | _('print output to file with formatted name'), _('FORMAT')), |
|
1153 | _('print output to file with formatted name'), _('FORMAT')), | |
1154 | ('r', 'rev', '', _('print the given revision'), _('REV')), |
|
1154 | ('r', 'rev', '', _('print the given revision'), _('REV')), | |
1155 | ('', 'decode', None, _('apply any matching decode filter')), |
|
1155 | ('', 'decode', None, _('apply any matching decode filter')), | |
1156 | ] + walkopts, |
|
1156 | ] + walkopts, | |
1157 | _('[OPTION]... FILE...')) |
|
1157 | _('[OPTION]... FILE...')) | |
1158 | def cat(ui, repo, file1, *pats, **opts): |
|
1158 | def cat(ui, repo, file1, *pats, **opts): | |
1159 | """output the current or given revision of files |
|
1159 | """output the current or given revision of files | |
1160 |
|
1160 | |||
1161 | Print the specified files as they were at the given revision. If |
|
1161 | Print the specified files as they were at the given revision. If | |
1162 | no revision is given, the parent of the working directory is used. |
|
1162 | no revision is given, the parent of the working directory is used. | |
1163 |
|
1163 | |||
1164 | Output may be to a file, in which case the name of the file is |
|
1164 | Output may be to a file, in which case the name of the file is | |
1165 | given using a format string. The formatting rules are the same as |
|
1165 | given using a format string. The formatting rules are the same as | |
1166 | for the export command, with the following additions: |
|
1166 | for the export command, with the following additions: | |
1167 |
|
1167 | |||
1168 | :``%s``: basename of file being printed |
|
1168 | :``%s``: basename of file being printed | |
1169 | :``%d``: dirname of file being printed, or '.' if in repository root |
|
1169 | :``%d``: dirname of file being printed, or '.' if in repository root | |
1170 | :``%p``: root-relative path name of file being printed |
|
1170 | :``%p``: root-relative path name of file being printed | |
1171 |
|
1171 | |||
1172 | Returns 0 on success. |
|
1172 | Returns 0 on success. | |
1173 | """ |
|
1173 | """ | |
1174 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
1174 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
1175 | m = scmutil.match(ctx, (file1,) + pats, opts) |
|
1175 | m = scmutil.match(ctx, (file1,) + pats, opts) | |
1176 |
|
1176 | |||
1177 | return cmdutil.cat(ui, repo, ctx, m, '', **opts) |
|
1177 | return cmdutil.cat(ui, repo, ctx, m, '', **opts) | |
1178 |
|
1178 | |||
1179 | @command('^clone', |
|
1179 | @command('^clone', | |
1180 | [('U', 'noupdate', None, |
|
1180 | [('U', 'noupdate', None, | |
1181 | _('the clone will include an empty working copy (only a repository)')), |
|
1181 | _('the clone will include an empty working copy (only a repository)')), | |
1182 | ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')), |
|
1182 | ('u', 'updaterev', '', _('revision, tag or branch to check out'), _('REV')), | |
1183 | ('r', 'rev', [], _('include the specified changeset'), _('REV')), |
|
1183 | ('r', 'rev', [], _('include the specified changeset'), _('REV')), | |
1184 | ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')), |
|
1184 | ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')), | |
1185 | ('', 'pull', None, _('use pull protocol to copy metadata')), |
|
1185 | ('', 'pull', None, _('use pull protocol to copy metadata')), | |
1186 | ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')), |
|
1186 | ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')), | |
1187 | ] + remoteopts, |
|
1187 | ] + remoteopts, | |
1188 | _('[OPTION]... SOURCE [DEST]')) |
|
1188 | _('[OPTION]... SOURCE [DEST]')) | |
1189 | def clone(ui, source, dest=None, **opts): |
|
1189 | def clone(ui, source, dest=None, **opts): | |
1190 | """make a copy of an existing repository |
|
1190 | """make a copy of an existing repository | |
1191 |
|
1191 | |||
1192 | Create a copy of an existing repository in a new directory. |
|
1192 | Create a copy of an existing repository in a new directory. | |
1193 |
|
1193 | |||
1194 | If no destination directory name is specified, it defaults to the |
|
1194 | If no destination directory name is specified, it defaults to the | |
1195 | basename of the source. |
|
1195 | basename of the source. | |
1196 |
|
1196 | |||
1197 | The location of the source is added to the new repository's |
|
1197 | The location of the source is added to the new repository's | |
1198 | ``.hg/hgrc`` file, as the default to be used for future pulls. |
|
1198 | ``.hg/hgrc`` file, as the default to be used for future pulls. | |
1199 |
|
1199 | |||
1200 | Only local paths and ``ssh://`` URLs are supported as |
|
1200 | Only local paths and ``ssh://`` URLs are supported as | |
1201 | destinations. For ``ssh://`` destinations, no working directory or |
|
1201 | destinations. For ``ssh://`` destinations, no working directory or | |
1202 | ``.hg/hgrc`` will be created on the remote side. |
|
1202 | ``.hg/hgrc`` will be created on the remote side. | |
1203 |
|
1203 | |||
1204 | To pull only a subset of changesets, specify one or more revisions |
|
1204 | To pull only a subset of changesets, specify one or more revisions | |
1205 | identifiers with -r/--rev or branches with -b/--branch. The |
|
1205 | identifiers with -r/--rev or branches with -b/--branch. The | |
1206 | resulting clone will contain only the specified changesets and |
|
1206 | resulting clone will contain only the specified changesets and | |
1207 | their ancestors. These options (or 'clone src#rev dest') imply |
|
1207 | their ancestors. These options (or 'clone src#rev dest') imply | |
1208 | --pull, even for local source repositories. Note that specifying a |
|
1208 | --pull, even for local source repositories. Note that specifying a | |
1209 | tag will include the tagged changeset but not the changeset |
|
1209 | tag will include the tagged changeset but not the changeset | |
1210 | containing the tag. |
|
1210 | containing the tag. | |
1211 |
|
1211 | |||
1212 | If the source repository has a bookmark called '@' set, that |
|
1212 | If the source repository has a bookmark called '@' set, that | |
1213 | revision will be checked out in the new repository by default. |
|
1213 | revision will be checked out in the new repository by default. | |
1214 |
|
1214 | |||
1215 | To check out a particular version, use -u/--update, or |
|
1215 | To check out a particular version, use -u/--update, or | |
1216 | -U/--noupdate to create a clone with no working directory. |
|
1216 | -U/--noupdate to create a clone with no working directory. | |
1217 |
|
1217 | |||
1218 | .. container:: verbose |
|
1218 | .. container:: verbose | |
1219 |
|
1219 | |||
1220 | For efficiency, hardlinks are used for cloning whenever the |
|
1220 | For efficiency, hardlinks are used for cloning whenever the | |
1221 | source and destination are on the same filesystem (note this |
|
1221 | source and destination are on the same filesystem (note this | |
1222 | applies only to the repository data, not to the working |
|
1222 | applies only to the repository data, not to the working | |
1223 | directory). Some filesystems, such as AFS, implement hardlinking |
|
1223 | directory). Some filesystems, such as AFS, implement hardlinking | |
1224 | incorrectly, but do not report errors. In these cases, use the |
|
1224 | incorrectly, but do not report errors. In these cases, use the | |
1225 | --pull option to avoid hardlinking. |
|
1225 | --pull option to avoid hardlinking. | |
1226 |
|
1226 | |||
1227 | In some cases, you can clone repositories and the working |
|
1227 | In some cases, you can clone repositories and the working | |
1228 | directory using full hardlinks with :: |
|
1228 | directory using full hardlinks with :: | |
1229 |
|
1229 | |||
1230 | $ cp -al REPO REPOCLONE |
|
1230 | $ cp -al REPO REPOCLONE | |
1231 |
|
1231 | |||
1232 | This is the fastest way to clone, but it is not always safe. The |
|
1232 | This is the fastest way to clone, but it is not always safe. The | |
1233 | operation is not atomic (making sure REPO is not modified during |
|
1233 | operation is not atomic (making sure REPO is not modified during | |
1234 | the operation is up to you) and you have to make sure your |
|
1234 | the operation is up to you) and you have to make sure your | |
1235 | editor breaks hardlinks (Emacs and most Linux Kernel tools do |
|
1235 | editor breaks hardlinks (Emacs and most Linux Kernel tools do | |
1236 | so). Also, this is not compatible with certain extensions that |
|
1236 | so). Also, this is not compatible with certain extensions that | |
1237 | place their metadata under the .hg directory, such as mq. |
|
1237 | place their metadata under the .hg directory, such as mq. | |
1238 |
|
1238 | |||
1239 | Mercurial will update the working directory to the first applicable |
|
1239 | Mercurial will update the working directory to the first applicable | |
1240 | revision from this list: |
|
1240 | revision from this list: | |
1241 |
|
1241 | |||
1242 | a) null if -U or the source repository has no changesets |
|
1242 | a) null if -U or the source repository has no changesets | |
1243 | b) if -u . and the source repository is local, the first parent of |
|
1243 | b) if -u . and the source repository is local, the first parent of | |
1244 | the source repository's working directory |
|
1244 | the source repository's working directory | |
1245 | c) the changeset specified with -u (if a branch name, this means the |
|
1245 | c) the changeset specified with -u (if a branch name, this means the | |
1246 | latest head of that branch) |
|
1246 | latest head of that branch) | |
1247 | d) the changeset specified with -r |
|
1247 | d) the changeset specified with -r | |
1248 | e) the tipmost head specified with -b |
|
1248 | e) the tipmost head specified with -b | |
1249 | f) the tipmost head specified with the url#branch source syntax |
|
1249 | f) the tipmost head specified with the url#branch source syntax | |
1250 | g) the revision marked with the '@' bookmark, if present |
|
1250 | g) the revision marked with the '@' bookmark, if present | |
1251 | h) the tipmost head of the default branch |
|
1251 | h) the tipmost head of the default branch | |
1252 | i) tip |
|
1252 | i) tip | |
1253 |
|
1253 | |||
1254 | Examples: |
|
1254 | Examples: | |
1255 |
|
1255 | |||
1256 | - clone a remote repository to a new directory named hg/:: |
|
1256 | - clone a remote repository to a new directory named hg/:: | |
1257 |
|
1257 | |||
1258 | hg clone http://selenic.com/hg |
|
1258 | hg clone http://selenic.com/hg | |
1259 |
|
1259 | |||
1260 | - create a lightweight local clone:: |
|
1260 | - create a lightweight local clone:: | |
1261 |
|
1261 | |||
1262 | hg clone project/ project-feature/ |
|
1262 | hg clone project/ project-feature/ | |
1263 |
|
1263 | |||
1264 | - clone from an absolute path on an ssh server (note double-slash):: |
|
1264 | - clone from an absolute path on an ssh server (note double-slash):: | |
1265 |
|
1265 | |||
1266 | hg clone ssh://user@server//home/projects/alpha/ |
|
1266 | hg clone ssh://user@server//home/projects/alpha/ | |
1267 |
|
1267 | |||
1268 | - do a high-speed clone over a LAN while checking out a |
|
1268 | - do a high-speed clone over a LAN while checking out a | |
1269 | specified version:: |
|
1269 | specified version:: | |
1270 |
|
1270 | |||
1271 | hg clone --uncompressed http://server/repo -u 1.5 |
|
1271 | hg clone --uncompressed http://server/repo -u 1.5 | |
1272 |
|
1272 | |||
1273 | - create a repository without changesets after a particular revision:: |
|
1273 | - create a repository without changesets after a particular revision:: | |
1274 |
|
1274 | |||
1275 | hg clone -r 04e544 experimental/ good/ |
|
1275 | hg clone -r 04e544 experimental/ good/ | |
1276 |
|
1276 | |||
1277 | - clone (and track) a particular named branch:: |
|
1277 | - clone (and track) a particular named branch:: | |
1278 |
|
1278 | |||
1279 | hg clone http://selenic.com/hg#stable |
|
1279 | hg clone http://selenic.com/hg#stable | |
1280 |
|
1280 | |||
1281 | See :hg:`help urls` for details on specifying URLs. |
|
1281 | See :hg:`help urls` for details on specifying URLs. | |
1282 |
|
1282 | |||
1283 | Returns 0 on success. |
|
1283 | Returns 0 on success. | |
1284 | """ |
|
1284 | """ | |
1285 | if opts.get('noupdate') and opts.get('updaterev'): |
|
1285 | if opts.get('noupdate') and opts.get('updaterev'): | |
1286 | raise util.Abort(_("cannot specify both --noupdate and --updaterev")) |
|
1286 | raise util.Abort(_("cannot specify both --noupdate and --updaterev")) | |
1287 |
|
1287 | |||
1288 | r = hg.clone(ui, opts, source, dest, |
|
1288 | r = hg.clone(ui, opts, source, dest, | |
1289 | pull=opts.get('pull'), |
|
1289 | pull=opts.get('pull'), | |
1290 | stream=opts.get('uncompressed'), |
|
1290 | stream=opts.get('uncompressed'), | |
1291 | rev=opts.get('rev'), |
|
1291 | rev=opts.get('rev'), | |
1292 | update=opts.get('updaterev') or not opts.get('noupdate'), |
|
1292 | update=opts.get('updaterev') or not opts.get('noupdate'), | |
1293 | branch=opts.get('branch')) |
|
1293 | branch=opts.get('branch')) | |
1294 |
|
1294 | |||
1295 | return r is None |
|
1295 | return r is None | |
1296 |
|
1296 | |||
1297 | @command('^commit|ci', |
|
1297 | @command('^commit|ci', | |
1298 | [('A', 'addremove', None, |
|
1298 | [('A', 'addremove', None, | |
1299 | _('mark new/missing files as added/removed before committing')), |
|
1299 | _('mark new/missing files as added/removed before committing')), | |
1300 | ('', 'close-branch', None, |
|
1300 | ('', 'close-branch', None, | |
1301 | _('mark a branch as closed, hiding it from the branch list')), |
|
1301 | _('mark a branch as closed, hiding it from the branch list')), | |
1302 | ('', 'amend', None, _('amend the parent of the working dir')), |
|
1302 | ('', 'amend', None, _('amend the parent of the working dir')), | |
1303 | ('s', 'secret', None, _('use the secret phase for committing')), |
|
1303 | ('s', 'secret', None, _('use the secret phase for committing')), | |
1304 | ('e', 'edit', None, |
|
1304 | ('e', 'edit', None, | |
1305 | _('further edit commit message already specified')), |
|
1305 | _('further edit commit message already specified')), | |
1306 | ] + walkopts + commitopts + commitopts2 + subrepoopts, |
|
1306 | ] + walkopts + commitopts + commitopts2 + subrepoopts, | |
1307 | _('[OPTION]... [FILE]...')) |
|
1307 | _('[OPTION]... [FILE]...')) | |
1308 | def commit(ui, repo, *pats, **opts): |
|
1308 | def commit(ui, repo, *pats, **opts): | |
1309 | """commit the specified files or all outstanding changes |
|
1309 | """commit the specified files or all outstanding changes | |
1310 |
|
1310 | |||
1311 | Commit changes to the given files into the repository. Unlike a |
|
1311 | Commit changes to the given files into the repository. Unlike a | |
1312 | centralized SCM, this operation is a local operation. See |
|
1312 | centralized SCM, this operation is a local operation. See | |
1313 | :hg:`push` for a way to actively distribute your changes. |
|
1313 | :hg:`push` for a way to actively distribute your changes. | |
1314 |
|
1314 | |||
1315 | If a list of files is omitted, all changes reported by :hg:`status` |
|
1315 | If a list of files is omitted, all changes reported by :hg:`status` | |
1316 | will be committed. |
|
1316 | will be committed. | |
1317 |
|
1317 | |||
1318 | If you are committing the result of a merge, do not provide any |
|
1318 | If you are committing the result of a merge, do not provide any | |
1319 | filenames or -I/-X filters. |
|
1319 | filenames or -I/-X filters. | |
1320 |
|
1320 | |||
1321 | If no commit message is specified, Mercurial starts your |
|
1321 | If no commit message is specified, Mercurial starts your | |
1322 | configured editor where you can enter a message. In case your |
|
1322 | configured editor where you can enter a message. In case your | |
1323 | commit fails, you will find a backup of your message in |
|
1323 | commit fails, you will find a backup of your message in | |
1324 | ``.hg/last-message.txt``. |
|
1324 | ``.hg/last-message.txt``. | |
1325 |
|
1325 | |||
1326 | The --amend flag can be used to amend the parent of the |
|
1326 | The --amend flag can be used to amend the parent of the | |
1327 | working directory with a new commit that contains the changes |
|
1327 | working directory with a new commit that contains the changes | |
1328 | in the parent in addition to those currently reported by :hg:`status`, |
|
1328 | in the parent in addition to those currently reported by :hg:`status`, | |
1329 | if there are any. The old commit is stored in a backup bundle in |
|
1329 | if there are any. The old commit is stored in a backup bundle in | |
1330 | ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle` |
|
1330 | ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle` | |
1331 | on how to restore it). |
|
1331 | on how to restore it). | |
1332 |
|
1332 | |||
1333 | Message, user and date are taken from the amended commit unless |
|
1333 | Message, user and date are taken from the amended commit unless | |
1334 | specified. When a message isn't specified on the command line, |
|
1334 | specified. When a message isn't specified on the command line, | |
1335 | the editor will open with the message of the amended commit. |
|
1335 | the editor will open with the message of the amended commit. | |
1336 |
|
1336 | |||
1337 | It is not possible to amend public changesets (see :hg:`help phases`) |
|
1337 | It is not possible to amend public changesets (see :hg:`help phases`) | |
1338 | or changesets that have children. |
|
1338 | or changesets that have children. | |
1339 |
|
1339 | |||
1340 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
1340 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
1341 |
|
1341 | |||
1342 | Returns 0 on success, 1 if nothing changed. |
|
1342 | Returns 0 on success, 1 if nothing changed. | |
1343 | """ |
|
1343 | """ | |
1344 | forceeditor = opts.get('edit') |
|
1344 | forceeditor = opts.get('edit') | |
1345 |
|
1345 | |||
1346 | if opts.get('subrepos'): |
|
1346 | if opts.get('subrepos'): | |
1347 | if opts.get('amend'): |
|
1347 | if opts.get('amend'): | |
1348 | raise util.Abort(_('cannot amend with --subrepos')) |
|
1348 | raise util.Abort(_('cannot amend with --subrepos')) | |
1349 | # Let --subrepos on the command line override config setting. |
|
1349 | # Let --subrepos on the command line override config setting. | |
1350 | ui.setconfig('ui', 'commitsubrepos', True, 'commit') |
|
1350 | ui.setconfig('ui', 'commitsubrepos', True, 'commit') | |
1351 |
|
1351 | |||
1352 | # Save this for restoring it later |
|
1352 | # Save this for restoring it later | |
1353 | oldcommitphase = ui.config('phases', 'new-commit') |
|
1353 | oldcommitphase = ui.config('phases', 'new-commit') | |
1354 |
|
1354 | |||
1355 | cmdutil.checkunfinished(repo, commit=True) |
|
1355 | cmdutil.checkunfinished(repo, commit=True) | |
1356 |
|
1356 | |||
1357 | branch = repo[None].branch() |
|
1357 | branch = repo[None].branch() | |
1358 | bheads = repo.branchheads(branch) |
|
1358 | bheads = repo.branchheads(branch) | |
1359 |
|
1359 | |||
1360 | extra = {} |
|
1360 | extra = {} | |
1361 | if opts.get('close_branch'): |
|
1361 | if opts.get('close_branch'): | |
1362 | extra['close'] = 1 |
|
1362 | extra['close'] = 1 | |
1363 |
|
1363 | |||
1364 | if not bheads: |
|
1364 | if not bheads: | |
1365 | raise util.Abort(_('can only close branch heads')) |
|
1365 | raise util.Abort(_('can only close branch heads')) | |
1366 | elif opts.get('amend'): |
|
1366 | elif opts.get('amend'): | |
1367 | if repo.parents()[0].p1().branch() != branch and \ |
|
1367 | if repo.parents()[0].p1().branch() != branch and \ | |
1368 | repo.parents()[0].p2().branch() != branch: |
|
1368 | repo.parents()[0].p2().branch() != branch: | |
1369 | raise util.Abort(_('can only close branch heads')) |
|
1369 | raise util.Abort(_('can only close branch heads')) | |
1370 |
|
1370 | |||
1371 | if opts.get('amend'): |
|
1371 | if opts.get('amend'): | |
1372 | if ui.configbool('ui', 'commitsubrepos'): |
|
1372 | if ui.configbool('ui', 'commitsubrepos'): | |
1373 | raise util.Abort(_('cannot amend with ui.commitsubrepos enabled')) |
|
1373 | raise util.Abort(_('cannot amend with ui.commitsubrepos enabled')) | |
1374 |
|
1374 | |||
1375 | old = repo['.'] |
|
1375 | old = repo['.'] | |
1376 | if old.phase() == phases.public: |
|
1376 | if old.phase() == phases.public: | |
1377 | raise util.Abort(_('cannot amend public changesets')) |
|
1377 | raise util.Abort(_('cannot amend public changesets')) | |
1378 | if len(repo[None].parents()) > 1: |
|
1378 | if len(repo[None].parents()) > 1: | |
1379 | raise util.Abort(_('cannot amend while merging')) |
|
1379 | raise util.Abort(_('cannot amend while merging')) | |
1380 | if (not obsolete._enabled) and old.children(): |
|
1380 | if (not obsolete._enabled) and old.children(): | |
1381 | raise util.Abort(_('cannot amend changeset with children')) |
|
1381 | raise util.Abort(_('cannot amend changeset with children')) | |
1382 |
|
1382 | |||
1383 | # commitfunc is used only for temporary amend commit by cmdutil.amend |
|
1383 | # commitfunc is used only for temporary amend commit by cmdutil.amend | |
1384 | def commitfunc(ui, repo, message, match, opts): |
|
1384 | def commitfunc(ui, repo, message, match, opts): | |
1385 | return repo.commit(message, |
|
1385 | return repo.commit(message, | |
1386 | opts.get('user') or old.user(), |
|
1386 | opts.get('user') or old.user(), | |
1387 | opts.get('date') or old.date(), |
|
1387 | opts.get('date') or old.date(), | |
1388 | match, |
|
1388 | match, | |
1389 | extra=extra) |
|
1389 | extra=extra) | |
1390 |
|
1390 | |||
1391 | current = repo._bookmarkcurrent |
|
1391 | current = repo._bookmarkcurrent | |
1392 | marks = old.bookmarks() |
|
1392 | marks = old.bookmarks() | |
1393 | node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts) |
|
1393 | node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts) | |
1394 | if node == old.node(): |
|
1394 | if node == old.node(): | |
1395 | ui.status(_("nothing changed\n")) |
|
1395 | ui.status(_("nothing changed\n")) | |
1396 | return 1 |
|
1396 | return 1 | |
1397 | elif marks: |
|
1397 | elif marks: | |
1398 | ui.debug('moving bookmarks %r from %s to %s\n' % |
|
1398 | ui.debug('moving bookmarks %r from %s to %s\n' % | |
1399 | (marks, old.hex(), hex(node))) |
|
1399 | (marks, old.hex(), hex(node))) | |
1400 | newmarks = repo._bookmarks |
|
1400 | newmarks = repo._bookmarks | |
1401 | for bm in marks: |
|
1401 | for bm in marks: | |
1402 | newmarks[bm] = node |
|
1402 | newmarks[bm] = node | |
1403 | if bm == current: |
|
1403 | if bm == current: | |
1404 | bookmarks.setcurrent(repo, bm) |
|
1404 | bookmarks.setcurrent(repo, bm) | |
1405 | newmarks.write() |
|
1405 | newmarks.write() | |
1406 | else: |
|
1406 | else: | |
1407 | e = cmdutil.commiteditor |
|
1407 | e = cmdutil.commiteditor | |
1408 | if forceeditor: |
|
1408 | if forceeditor: | |
1409 | e = cmdutil.commitforceeditor |
|
1409 | e = cmdutil.commitforceeditor | |
1410 |
|
1410 | |||
1411 | def commitfunc(ui, repo, message, match, opts): |
|
1411 | def commitfunc(ui, repo, message, match, opts): | |
1412 | try: |
|
1412 | try: | |
1413 | if opts.get('secret'): |
|
1413 | if opts.get('secret'): | |
1414 | ui.setconfig('phases', 'new-commit', 'secret', 'commit') |
|
1414 | ui.setconfig('phases', 'new-commit', 'secret', 'commit') | |
1415 | # Propagate to subrepos |
|
1415 | # Propagate to subrepos | |
1416 | repo.baseui.setconfig('phases', 'new-commit', 'secret', |
|
1416 | repo.baseui.setconfig('phases', 'new-commit', 'secret', | |
1417 | 'commit') |
|
1417 | 'commit') | |
1418 |
|
1418 | |||
1419 | return repo.commit(message, opts.get('user'), opts.get('date'), |
|
1419 | return repo.commit(message, opts.get('user'), opts.get('date'), | |
1420 | match, editor=e, extra=extra) |
|
1420 | match, editor=e, extra=extra) | |
1421 | finally: |
|
1421 | finally: | |
1422 | ui.setconfig('phases', 'new-commit', oldcommitphase, 'commit') |
|
1422 | ui.setconfig('phases', 'new-commit', oldcommitphase, 'commit') | |
1423 | repo.baseui.setconfig('phases', 'new-commit', oldcommitphase, |
|
1423 | repo.baseui.setconfig('phases', 'new-commit', oldcommitphase, | |
1424 | 'commit') |
|
1424 | 'commit') | |
1425 |
|
1425 | |||
1426 |
|
1426 | |||
1427 | node = cmdutil.commit(ui, repo, commitfunc, pats, opts) |
|
1427 | node = cmdutil.commit(ui, repo, commitfunc, pats, opts) | |
1428 |
|
1428 | |||
1429 | if not node: |
|
1429 | if not node: | |
1430 | stat = repo.status(match=scmutil.match(repo[None], pats, opts)) |
|
1430 | stat = repo.status(match=scmutil.match(repo[None], pats, opts)) | |
1431 | if stat[3]: |
|
1431 | if stat[3]: | |
1432 | ui.status(_("nothing changed (%d missing files, see " |
|
1432 | ui.status(_("nothing changed (%d missing files, see " | |
1433 | "'hg status')\n") % len(stat[3])) |
|
1433 | "'hg status')\n") % len(stat[3])) | |
1434 | else: |
|
1434 | else: | |
1435 | ui.status(_("nothing changed\n")) |
|
1435 | ui.status(_("nothing changed\n")) | |
1436 | return 1 |
|
1436 | return 1 | |
1437 |
|
1437 | |||
1438 | cmdutil.commitstatus(repo, node, branch, bheads, opts) |
|
1438 | cmdutil.commitstatus(repo, node, branch, bheads, opts) | |
1439 |
|
1439 | |||
1440 | @command('config|showconfig|debugconfig', |
|
1440 | @command('config|showconfig|debugconfig', | |
1441 | [('u', 'untrusted', None, _('show untrusted configuration options')), |
|
1441 | [('u', 'untrusted', None, _('show untrusted configuration options')), | |
1442 | ('e', 'edit', None, _('edit user config')), |
|
1442 | ('e', 'edit', None, _('edit user config')), | |
1443 | ('l', 'local', None, _('edit repository config')), |
|
1443 | ('l', 'local', None, _('edit repository config')), | |
1444 | ('g', 'global', None, _('edit global config'))], |
|
1444 | ('g', 'global', None, _('edit global config'))], | |
1445 | _('[-u] [NAME]...')) |
|
1445 | _('[-u] [NAME]...')) | |
1446 | def config(ui, repo, *values, **opts): |
|
1446 | def config(ui, repo, *values, **opts): | |
1447 | """show combined config settings from all hgrc files |
|
1447 | """show combined config settings from all hgrc files | |
1448 |
|
1448 | |||
1449 | With no arguments, print names and values of all config items. |
|
1449 | With no arguments, print names and values of all config items. | |
1450 |
|
1450 | |||
1451 | With one argument of the form section.name, print just the value |
|
1451 | With one argument of the form section.name, print just the value | |
1452 | of that config item. |
|
1452 | of that config item. | |
1453 |
|
1453 | |||
1454 | With multiple arguments, print names and values of all config |
|
1454 | With multiple arguments, print names and values of all config | |
1455 | items with matching section names. |
|
1455 | items with matching section names. | |
1456 |
|
1456 | |||
1457 | With --edit, start an editor on the user-level config file. With |
|
1457 | With --edit, start an editor on the user-level config file. With | |
1458 | --global, edit the system-wide config file. With --local, edit the |
|
1458 | --global, edit the system-wide config file. With --local, edit the | |
1459 | repository-level config file. |
|
1459 | repository-level config file. | |
1460 |
|
1460 | |||
1461 | With --debug, the source (filename and line number) is printed |
|
1461 | With --debug, the source (filename and line number) is printed | |
1462 | for each config item. |
|
1462 | for each config item. | |
1463 |
|
1463 | |||
1464 | See :hg:`help config` for more information about config files. |
|
1464 | See :hg:`help config` for more information about config files. | |
1465 |
|
1465 | |||
1466 | Returns 0 on success. |
|
1466 | Returns 0 on success. | |
1467 |
|
1467 | |||
1468 | """ |
|
1468 | """ | |
1469 |
|
1469 | |||
1470 | if opts.get('edit') or opts.get('local') or opts.get('global'): |
|
1470 | if opts.get('edit') or opts.get('local') or opts.get('global'): | |
1471 | if opts.get('local') and opts.get('global'): |
|
1471 | if opts.get('local') and opts.get('global'): | |
1472 | raise util.Abort(_("can't use --local and --global together")) |
|
1472 | raise util.Abort(_("can't use --local and --global together")) | |
1473 |
|
1473 | |||
1474 | if opts.get('local'): |
|
1474 | if opts.get('local'): | |
1475 | if not repo: |
|
1475 | if not repo: | |
1476 | raise util.Abort(_("can't use --local outside a repository")) |
|
1476 | raise util.Abort(_("can't use --local outside a repository")) | |
1477 | paths = [repo.join('hgrc')] |
|
1477 | paths = [repo.join('hgrc')] | |
1478 | elif opts.get('global'): |
|
1478 | elif opts.get('global'): | |
1479 | paths = scmutil.systemrcpath() |
|
1479 | paths = scmutil.systemrcpath() | |
1480 | else: |
|
1480 | else: | |
1481 | paths = scmutil.userrcpath() |
|
1481 | paths = scmutil.userrcpath() | |
1482 |
|
1482 | |||
1483 | for f in paths: |
|
1483 | for f in paths: | |
1484 | if os.path.exists(f): |
|
1484 | if os.path.exists(f): | |
1485 | break |
|
1485 | break | |
1486 | else: |
|
1486 | else: | |
1487 | f = paths[0] |
|
1487 | f = paths[0] | |
1488 | fp = open(f, "w") |
|
1488 | fp = open(f, "w") | |
1489 | fp.write( |
|
1489 | fp.write( | |
1490 | '# example config (see "hg help config" for more info)\n' |
|
1490 | '# example config (see "hg help config" for more info)\n' | |
1491 | '\n' |
|
1491 | '\n' | |
1492 | '[ui]\n' |
|
1492 | '[ui]\n' | |
1493 | '# name and email, e.g.\n' |
|
1493 | '# name and email, e.g.\n' | |
1494 | '# username = Jane Doe <jdoe@example.com>\n' |
|
1494 | '# username = Jane Doe <jdoe@example.com>\n' | |
1495 | 'username =\n' |
|
1495 | 'username =\n' | |
1496 | '\n' |
|
1496 | '\n' | |
1497 | '[extensions]\n' |
|
1497 | '[extensions]\n' | |
1498 | '# uncomment these lines to enable some popular extensions\n' |
|
1498 | '# uncomment these lines to enable some popular extensions\n' | |
1499 | '# (see "hg help extensions" for more info)\n' |
|
1499 | '# (see "hg help extensions" for more info)\n' | |
1500 | '# pager =\n' |
|
1500 | '# pager =\n' | |
1501 | '# progress =\n' |
|
1501 | '# progress =\n' | |
1502 | '# color =\n') |
|
1502 | '# color =\n') | |
1503 | fp.close() |
|
1503 | fp.close() | |
1504 |
|
1504 | |||
1505 | editor = ui.geteditor() |
|
1505 | editor = ui.geteditor() | |
1506 | util.system("%s \"%s\"" % (editor, f), |
|
1506 | util.system("%s \"%s\"" % (editor, f), | |
1507 | onerr=util.Abort, errprefix=_("edit failed"), |
|
1507 | onerr=util.Abort, errprefix=_("edit failed"), | |
1508 | out=ui.fout) |
|
1508 | out=ui.fout) | |
1509 | return |
|
1509 | return | |
1510 |
|
1510 | |||
1511 | for f in scmutil.rcpath(): |
|
1511 | for f in scmutil.rcpath(): | |
1512 | ui.debug('read config from: %s\n' % f) |
|
1512 | ui.debug('read config from: %s\n' % f) | |
1513 | untrusted = bool(opts.get('untrusted')) |
|
1513 | untrusted = bool(opts.get('untrusted')) | |
1514 | if values: |
|
1514 | if values: | |
1515 | sections = [v for v in values if '.' not in v] |
|
1515 | sections = [v for v in values if '.' not in v] | |
1516 | items = [v for v in values if '.' in v] |
|
1516 | items = [v for v in values if '.' in v] | |
1517 | if len(items) > 1 or items and sections: |
|
1517 | if len(items) > 1 or items and sections: | |
1518 | raise util.Abort(_('only one config item permitted')) |
|
1518 | raise util.Abort(_('only one config item permitted')) | |
1519 | for section, name, value in ui.walkconfig(untrusted=untrusted): |
|
1519 | for section, name, value in ui.walkconfig(untrusted=untrusted): | |
1520 | value = str(value).replace('\n', '\\n') |
|
1520 | value = str(value).replace('\n', '\\n') | |
1521 | sectname = section + '.' + name |
|
1521 | sectname = section + '.' + name | |
1522 | if values: |
|
1522 | if values: | |
1523 | for v in values: |
|
1523 | for v in values: | |
1524 | if v == section: |
|
1524 | if v == section: | |
1525 | ui.debug('%s: ' % |
|
1525 | ui.debug('%s: ' % | |
1526 | ui.configsource(section, name, untrusted)) |
|
1526 | ui.configsource(section, name, untrusted)) | |
1527 | ui.write('%s=%s\n' % (sectname, value)) |
|
1527 | ui.write('%s=%s\n' % (sectname, value)) | |
1528 | elif v == sectname: |
|
1528 | elif v == sectname: | |
1529 | ui.debug('%s: ' % |
|
1529 | ui.debug('%s: ' % | |
1530 | ui.configsource(section, name, untrusted)) |
|
1530 | ui.configsource(section, name, untrusted)) | |
1531 | ui.write(value, '\n') |
|
1531 | ui.write(value, '\n') | |
1532 | else: |
|
1532 | else: | |
1533 | ui.debug('%s: ' % |
|
1533 | ui.debug('%s: ' % | |
1534 | ui.configsource(section, name, untrusted)) |
|
1534 | ui.configsource(section, name, untrusted)) | |
1535 | ui.write('%s=%s\n' % (sectname, value)) |
|
1535 | ui.write('%s=%s\n' % (sectname, value)) | |
1536 |
|
1536 | |||
1537 | @command('copy|cp', |
|
1537 | @command('copy|cp', | |
1538 | [('A', 'after', None, _('record a copy that has already occurred')), |
|
1538 | [('A', 'after', None, _('record a copy that has already occurred')), | |
1539 | ('f', 'force', None, _('forcibly copy over an existing managed file')), |
|
1539 | ('f', 'force', None, _('forcibly copy over an existing managed file')), | |
1540 | ] + walkopts + dryrunopts, |
|
1540 | ] + walkopts + dryrunopts, | |
1541 | _('[OPTION]... [SOURCE]... DEST')) |
|
1541 | _('[OPTION]... [SOURCE]... DEST')) | |
1542 | def copy(ui, repo, *pats, **opts): |
|
1542 | def copy(ui, repo, *pats, **opts): | |
1543 | """mark files as copied for the next commit |
|
1543 | """mark files as copied for the next commit | |
1544 |
|
1544 | |||
1545 | Mark dest as having copies of source files. If dest is a |
|
1545 | Mark dest as having copies of source files. If dest is a | |
1546 | directory, copies are put in that directory. If dest is a file, |
|
1546 | directory, copies are put in that directory. If dest is a file, | |
1547 | the source must be a single file. |
|
1547 | the source must be a single file. | |
1548 |
|
1548 | |||
1549 | By default, this command copies the contents of files as they |
|
1549 | By default, this command copies the contents of files as they | |
1550 | exist in the working directory. If invoked with -A/--after, the |
|
1550 | exist in the working directory. If invoked with -A/--after, the | |
1551 | operation is recorded, but no copying is performed. |
|
1551 | operation is recorded, but no copying is performed. | |
1552 |
|
1552 | |||
1553 | This command takes effect with the next commit. To undo a copy |
|
1553 | This command takes effect with the next commit. To undo a copy | |
1554 | before that, see :hg:`revert`. |
|
1554 | before that, see :hg:`revert`. | |
1555 |
|
1555 | |||
1556 | Returns 0 on success, 1 if errors are encountered. |
|
1556 | Returns 0 on success, 1 if errors are encountered. | |
1557 | """ |
|
1557 | """ | |
1558 | wlock = repo.wlock(False) |
|
1558 | wlock = repo.wlock(False) | |
1559 | try: |
|
1559 | try: | |
1560 | return cmdutil.copy(ui, repo, pats, opts) |
|
1560 | return cmdutil.copy(ui, repo, pats, opts) | |
1561 | finally: |
|
1561 | finally: | |
1562 | wlock.release() |
|
1562 | wlock.release() | |
1563 |
|
1563 | |||
1564 | @command('debugancestor', [], _('[INDEX] REV1 REV2')) |
|
1564 | @command('debugancestor', [], _('[INDEX] REV1 REV2')) | |
1565 | def debugancestor(ui, repo, *args): |
|
1565 | def debugancestor(ui, repo, *args): | |
1566 | """find the ancestor revision of two revisions in a given index""" |
|
1566 | """find the ancestor revision of two revisions in a given index""" | |
1567 | if len(args) == 3: |
|
1567 | if len(args) == 3: | |
1568 | index, rev1, rev2 = args |
|
1568 | index, rev1, rev2 = args | |
1569 | r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index) |
|
1569 | r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), index) | |
1570 | lookup = r.lookup |
|
1570 | lookup = r.lookup | |
1571 | elif len(args) == 2: |
|
1571 | elif len(args) == 2: | |
1572 | if not repo: |
|
1572 | if not repo: | |
1573 | raise util.Abort(_("there is no Mercurial repository here " |
|
1573 | raise util.Abort(_("there is no Mercurial repository here " | |
1574 | "(.hg not found)")) |
|
1574 | "(.hg not found)")) | |
1575 | rev1, rev2 = args |
|
1575 | rev1, rev2 = args | |
1576 | r = repo.changelog |
|
1576 | r = repo.changelog | |
1577 | lookup = repo.lookup |
|
1577 | lookup = repo.lookup | |
1578 | else: |
|
1578 | else: | |
1579 | raise util.Abort(_('either two or three arguments required')) |
|
1579 | raise util.Abort(_('either two or three arguments required')) | |
1580 | a = r.ancestor(lookup(rev1), lookup(rev2)) |
|
1580 | a = r.ancestor(lookup(rev1), lookup(rev2)) | |
1581 | ui.write("%d:%s\n" % (r.rev(a), hex(a))) |
|
1581 | ui.write("%d:%s\n" % (r.rev(a), hex(a))) | |
1582 |
|
1582 | |||
1583 | @command('debugbuilddag', |
|
1583 | @command('debugbuilddag', | |
1584 | [('m', 'mergeable-file', None, _('add single file mergeable changes')), |
|
1584 | [('m', 'mergeable-file', None, _('add single file mergeable changes')), | |
1585 | ('o', 'overwritten-file', None, _('add single file all revs overwrite')), |
|
1585 | ('o', 'overwritten-file', None, _('add single file all revs overwrite')), | |
1586 | ('n', 'new-file', None, _('add new file at each rev'))], |
|
1586 | ('n', 'new-file', None, _('add new file at each rev'))], | |
1587 | _('[OPTION]... [TEXT]')) |
|
1587 | _('[OPTION]... [TEXT]')) | |
1588 | def debugbuilddag(ui, repo, text=None, |
|
1588 | def debugbuilddag(ui, repo, text=None, | |
1589 | mergeable_file=False, |
|
1589 | mergeable_file=False, | |
1590 | overwritten_file=False, |
|
1590 | overwritten_file=False, | |
1591 | new_file=False): |
|
1591 | new_file=False): | |
1592 | """builds a repo with a given DAG from scratch in the current empty repo |
|
1592 | """builds a repo with a given DAG from scratch in the current empty repo | |
1593 |
|
1593 | |||
1594 | The description of the DAG is read from stdin if not given on the |
|
1594 | The description of the DAG is read from stdin if not given on the | |
1595 | command line. |
|
1595 | command line. | |
1596 |
|
1596 | |||
1597 | Elements: |
|
1597 | Elements: | |
1598 |
|
1598 | |||
1599 | - "+n" is a linear run of n nodes based on the current default parent |
|
1599 | - "+n" is a linear run of n nodes based on the current default parent | |
1600 | - "." is a single node based on the current default parent |
|
1600 | - "." is a single node based on the current default parent | |
1601 | - "$" resets the default parent to null (implied at the start); |
|
1601 | - "$" resets the default parent to null (implied at the start); | |
1602 | otherwise the default parent is always the last node created |
|
1602 | otherwise the default parent is always the last node created | |
1603 | - "<p" sets the default parent to the backref p |
|
1603 | - "<p" sets the default parent to the backref p | |
1604 | - "*p" is a fork at parent p, which is a backref |
|
1604 | - "*p" is a fork at parent p, which is a backref | |
1605 | - "*p1/p2" is a merge of parents p1 and p2, which are backrefs |
|
1605 | - "*p1/p2" is a merge of parents p1 and p2, which are backrefs | |
1606 | - "/p2" is a merge of the preceding node and p2 |
|
1606 | - "/p2" is a merge of the preceding node and p2 | |
1607 | - ":tag" defines a local tag for the preceding node |
|
1607 | - ":tag" defines a local tag for the preceding node | |
1608 | - "@branch" sets the named branch for subsequent nodes |
|
1608 | - "@branch" sets the named branch for subsequent nodes | |
1609 | - "#...\\n" is a comment up to the end of the line |
|
1609 | - "#...\\n" is a comment up to the end of the line | |
1610 |
|
1610 | |||
1611 | Whitespace between the above elements is ignored. |
|
1611 | Whitespace between the above elements is ignored. | |
1612 |
|
1612 | |||
1613 | A backref is either |
|
1613 | A backref is either | |
1614 |
|
1614 | |||
1615 | - a number n, which references the node curr-n, where curr is the current |
|
1615 | - a number n, which references the node curr-n, where curr is the current | |
1616 | node, or |
|
1616 | node, or | |
1617 | - the name of a local tag you placed earlier using ":tag", or |
|
1617 | - the name of a local tag you placed earlier using ":tag", or | |
1618 | - empty to denote the default parent. |
|
1618 | - empty to denote the default parent. | |
1619 |
|
1619 | |||
1620 | All string valued-elements are either strictly alphanumeric, or must |
|
1620 | All string valued-elements are either strictly alphanumeric, or must | |
1621 | be enclosed in double quotes ("..."), with "\\" as escape character. |
|
1621 | be enclosed in double quotes ("..."), with "\\" as escape character. | |
1622 | """ |
|
1622 | """ | |
1623 |
|
1623 | |||
1624 | if text is None: |
|
1624 | if text is None: | |
1625 | ui.status(_("reading DAG from stdin\n")) |
|
1625 | ui.status(_("reading DAG from stdin\n")) | |
1626 | text = ui.fin.read() |
|
1626 | text = ui.fin.read() | |
1627 |
|
1627 | |||
1628 | cl = repo.changelog |
|
1628 | cl = repo.changelog | |
1629 | if len(cl) > 0: |
|
1629 | if len(cl) > 0: | |
1630 | raise util.Abort(_('repository is not empty')) |
|
1630 | raise util.Abort(_('repository is not empty')) | |
1631 |
|
1631 | |||
1632 | # determine number of revs in DAG |
|
1632 | # determine number of revs in DAG | |
1633 | total = 0 |
|
1633 | total = 0 | |
1634 | for type, data in dagparser.parsedag(text): |
|
1634 | for type, data in dagparser.parsedag(text): | |
1635 | if type == 'n': |
|
1635 | if type == 'n': | |
1636 | total += 1 |
|
1636 | total += 1 | |
1637 |
|
1637 | |||
1638 | if mergeable_file: |
|
1638 | if mergeable_file: | |
1639 | linesperrev = 2 |
|
1639 | linesperrev = 2 | |
1640 | # make a file with k lines per rev |
|
1640 | # make a file with k lines per rev | |
1641 | initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)] |
|
1641 | initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)] | |
1642 | initialmergedlines.append("") |
|
1642 | initialmergedlines.append("") | |
1643 |
|
1643 | |||
1644 | tags = [] |
|
1644 | tags = [] | |
1645 |
|
1645 | |||
1646 | lock = tr = None |
|
1646 | lock = tr = None | |
1647 | try: |
|
1647 | try: | |
1648 | lock = repo.lock() |
|
1648 | lock = repo.lock() | |
1649 | tr = repo.transaction("builddag") |
|
1649 | tr = repo.transaction("builddag") | |
1650 |
|
1650 | |||
1651 | at = -1 |
|
1651 | at = -1 | |
1652 | atbranch = 'default' |
|
1652 | atbranch = 'default' | |
1653 | nodeids = [] |
|
1653 | nodeids = [] | |
1654 | id = 0 |
|
1654 | id = 0 | |
1655 | ui.progress(_('building'), id, unit=_('revisions'), total=total) |
|
1655 | ui.progress(_('building'), id, unit=_('revisions'), total=total) | |
1656 | for type, data in dagparser.parsedag(text): |
|
1656 | for type, data in dagparser.parsedag(text): | |
1657 | if type == 'n': |
|
1657 | if type == 'n': | |
1658 | ui.note(('node %s\n' % str(data))) |
|
1658 | ui.note(('node %s\n' % str(data))) | |
1659 | id, ps = data |
|
1659 | id, ps = data | |
1660 |
|
1660 | |||
1661 | files = [] |
|
1661 | files = [] | |
1662 | fctxs = {} |
|
1662 | fctxs = {} | |
1663 |
|
1663 | |||
1664 | p2 = None |
|
1664 | p2 = None | |
1665 | if mergeable_file: |
|
1665 | if mergeable_file: | |
1666 | fn = "mf" |
|
1666 | fn = "mf" | |
1667 | p1 = repo[ps[0]] |
|
1667 | p1 = repo[ps[0]] | |
1668 | if len(ps) > 1: |
|
1668 | if len(ps) > 1: | |
1669 | p2 = repo[ps[1]] |
|
1669 | p2 = repo[ps[1]] | |
1670 | pa = p1.ancestor(p2) |
|
1670 | pa = p1.ancestor(p2) | |
1671 | base, local, other = [x[fn].data() for x in (pa, p1, |
|
1671 | base, local, other = [x[fn].data() for x in (pa, p1, | |
1672 | p2)] |
|
1672 | p2)] | |
1673 | m3 = simplemerge.Merge3Text(base, local, other) |
|
1673 | m3 = simplemerge.Merge3Text(base, local, other) | |
1674 | ml = [l.strip() for l in m3.merge_lines()] |
|
1674 | ml = [l.strip() for l in m3.merge_lines()] | |
1675 | ml.append("") |
|
1675 | ml.append("") | |
1676 | elif at > 0: |
|
1676 | elif at > 0: | |
1677 | ml = p1[fn].data().split("\n") |
|
1677 | ml = p1[fn].data().split("\n") | |
1678 | else: |
|
1678 | else: | |
1679 | ml = initialmergedlines |
|
1679 | ml = initialmergedlines | |
1680 | ml[id * linesperrev] += " r%i" % id |
|
1680 | ml[id * linesperrev] += " r%i" % id | |
1681 | mergedtext = "\n".join(ml) |
|
1681 | mergedtext = "\n".join(ml) | |
1682 | files.append(fn) |
|
1682 | files.append(fn) | |
1683 | fctxs[fn] = context.memfilectx(fn, mergedtext) |
|
1683 | fctxs[fn] = context.memfilectx(fn, mergedtext) | |
1684 |
|
1684 | |||
1685 | if overwritten_file: |
|
1685 | if overwritten_file: | |
1686 | fn = "of" |
|
1686 | fn = "of" | |
1687 | files.append(fn) |
|
1687 | files.append(fn) | |
1688 | fctxs[fn] = context.memfilectx(fn, "r%i\n" % id) |
|
1688 | fctxs[fn] = context.memfilectx(fn, "r%i\n" % id) | |
1689 |
|
1689 | |||
1690 | if new_file: |
|
1690 | if new_file: | |
1691 | fn = "nf%i" % id |
|
1691 | fn = "nf%i" % id | |
1692 | files.append(fn) |
|
1692 | files.append(fn) | |
1693 | fctxs[fn] = context.memfilectx(fn, "r%i\n" % id) |
|
1693 | fctxs[fn] = context.memfilectx(fn, "r%i\n" % id) | |
1694 | if len(ps) > 1: |
|
1694 | if len(ps) > 1: | |
1695 | if not p2: |
|
1695 | if not p2: | |
1696 | p2 = repo[ps[1]] |
|
1696 | p2 = repo[ps[1]] | |
1697 | for fn in p2: |
|
1697 | for fn in p2: | |
1698 | if fn.startswith("nf"): |
|
1698 | if fn.startswith("nf"): | |
1699 | files.append(fn) |
|
1699 | files.append(fn) | |
1700 | fctxs[fn] = p2[fn] |
|
1700 | fctxs[fn] = p2[fn] | |
1701 |
|
1701 | |||
1702 | def fctxfn(repo, cx, path): |
|
1702 | def fctxfn(repo, cx, path): | |
1703 | return fctxs.get(path) |
|
1703 | return fctxs.get(path) | |
1704 |
|
1704 | |||
1705 | if len(ps) == 0 or ps[0] < 0: |
|
1705 | if len(ps) == 0 or ps[0] < 0: | |
1706 | pars = [None, None] |
|
1706 | pars = [None, None] | |
1707 | elif len(ps) == 1: |
|
1707 | elif len(ps) == 1: | |
1708 | pars = [nodeids[ps[0]], None] |
|
1708 | pars = [nodeids[ps[0]], None] | |
1709 | else: |
|
1709 | else: | |
1710 | pars = [nodeids[p] for p in ps] |
|
1710 | pars = [nodeids[p] for p in ps] | |
1711 | cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn, |
|
1711 | cx = context.memctx(repo, pars, "r%i" % id, files, fctxfn, | |
1712 | date=(id, 0), |
|
1712 | date=(id, 0), | |
1713 | user="debugbuilddag", |
|
1713 | user="debugbuilddag", | |
1714 | extra={'branch': atbranch}) |
|
1714 | extra={'branch': atbranch}) | |
1715 | nodeid = repo.commitctx(cx) |
|
1715 | nodeid = repo.commitctx(cx) | |
1716 | nodeids.append(nodeid) |
|
1716 | nodeids.append(nodeid) | |
1717 | at = id |
|
1717 | at = id | |
1718 | elif type == 'l': |
|
1718 | elif type == 'l': | |
1719 | id, name = data |
|
1719 | id, name = data | |
1720 | ui.note(('tag %s\n' % name)) |
|
1720 | ui.note(('tag %s\n' % name)) | |
1721 | tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name)) |
|
1721 | tags.append("%s %s\n" % (hex(repo.changelog.node(id)), name)) | |
1722 | elif type == 'a': |
|
1722 | elif type == 'a': | |
1723 | ui.note(('branch %s\n' % data)) |
|
1723 | ui.note(('branch %s\n' % data)) | |
1724 | atbranch = data |
|
1724 | atbranch = data | |
1725 | ui.progress(_('building'), id, unit=_('revisions'), total=total) |
|
1725 | ui.progress(_('building'), id, unit=_('revisions'), total=total) | |
1726 | tr.close() |
|
1726 | tr.close() | |
1727 |
|
1727 | |||
1728 | if tags: |
|
1728 | if tags: | |
1729 | repo.opener.write("localtags", "".join(tags)) |
|
1729 | repo.opener.write("localtags", "".join(tags)) | |
1730 | finally: |
|
1730 | finally: | |
1731 | ui.progress(_('building'), None) |
|
1731 | ui.progress(_('building'), None) | |
1732 | release(tr, lock) |
|
1732 | release(tr, lock) | |
1733 |
|
1733 | |||
1734 | @command('debugbundle', [('a', 'all', None, _('show all details'))], _('FILE')) |
|
1734 | @command('debugbundle', [('a', 'all', None, _('show all details'))], _('FILE')) | |
1735 | def debugbundle(ui, bundlepath, all=None, **opts): |
|
1735 | def debugbundle(ui, bundlepath, all=None, **opts): | |
1736 | """lists the contents of a bundle""" |
|
1736 | """lists the contents of a bundle""" | |
1737 | f = hg.openpath(ui, bundlepath) |
|
1737 | f = hg.openpath(ui, bundlepath) | |
1738 | try: |
|
1738 | try: | |
1739 | gen = changegroup.readbundle(f, bundlepath) |
|
1739 | gen = changegroup.readbundle(f, bundlepath) | |
1740 | if all: |
|
1740 | if all: | |
1741 | ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n")) |
|
1741 | ui.write(("format: id, p1, p2, cset, delta base, len(delta)\n")) | |
1742 |
|
1742 | |||
1743 | def showchunks(named): |
|
1743 | def showchunks(named): | |
1744 | ui.write("\n%s\n" % named) |
|
1744 | ui.write("\n%s\n" % named) | |
1745 | chain = None |
|
1745 | chain = None | |
1746 | while True: |
|
1746 | while True: | |
1747 | chunkdata = gen.deltachunk(chain) |
|
1747 | chunkdata = gen.deltachunk(chain) | |
1748 | if not chunkdata: |
|
1748 | if not chunkdata: | |
1749 | break |
|
1749 | break | |
1750 | node = chunkdata['node'] |
|
1750 | node = chunkdata['node'] | |
1751 | p1 = chunkdata['p1'] |
|
1751 | p1 = chunkdata['p1'] | |
1752 | p2 = chunkdata['p2'] |
|
1752 | p2 = chunkdata['p2'] | |
1753 | cs = chunkdata['cs'] |
|
1753 | cs = chunkdata['cs'] | |
1754 | deltabase = chunkdata['deltabase'] |
|
1754 | deltabase = chunkdata['deltabase'] | |
1755 | delta = chunkdata['delta'] |
|
1755 | delta = chunkdata['delta'] | |
1756 | ui.write("%s %s %s %s %s %s\n" % |
|
1756 | ui.write("%s %s %s %s %s %s\n" % | |
1757 | (hex(node), hex(p1), hex(p2), |
|
1757 | (hex(node), hex(p1), hex(p2), | |
1758 | hex(cs), hex(deltabase), len(delta))) |
|
1758 | hex(cs), hex(deltabase), len(delta))) | |
1759 | chain = node |
|
1759 | chain = node | |
1760 |
|
1760 | |||
1761 | chunkdata = gen.changelogheader() |
|
1761 | chunkdata = gen.changelogheader() | |
1762 | showchunks("changelog") |
|
1762 | showchunks("changelog") | |
1763 | chunkdata = gen.manifestheader() |
|
1763 | chunkdata = gen.manifestheader() | |
1764 | showchunks("manifest") |
|
1764 | showchunks("manifest") | |
1765 | while True: |
|
1765 | while True: | |
1766 | chunkdata = gen.filelogheader() |
|
1766 | chunkdata = gen.filelogheader() | |
1767 | if not chunkdata: |
|
1767 | if not chunkdata: | |
1768 | break |
|
1768 | break | |
1769 | fname = chunkdata['filename'] |
|
1769 | fname = chunkdata['filename'] | |
1770 | showchunks(fname) |
|
1770 | showchunks(fname) | |
1771 | else: |
|
1771 | else: | |
1772 | chunkdata = gen.changelogheader() |
|
1772 | chunkdata = gen.changelogheader() | |
1773 | chain = None |
|
1773 | chain = None | |
1774 | while True: |
|
1774 | while True: | |
1775 | chunkdata = gen.deltachunk(chain) |
|
1775 | chunkdata = gen.deltachunk(chain) | |
1776 | if not chunkdata: |
|
1776 | if not chunkdata: | |
1777 | break |
|
1777 | break | |
1778 | node = chunkdata['node'] |
|
1778 | node = chunkdata['node'] | |
1779 | ui.write("%s\n" % hex(node)) |
|
1779 | ui.write("%s\n" % hex(node)) | |
1780 | chain = node |
|
1780 | chain = node | |
1781 | finally: |
|
1781 | finally: | |
1782 | f.close() |
|
1782 | f.close() | |
1783 |
|
1783 | |||
1784 | @command('debugcheckstate', [], '') |
|
1784 | @command('debugcheckstate', [], '') | |
1785 | def debugcheckstate(ui, repo): |
|
1785 | def debugcheckstate(ui, repo): | |
1786 | """validate the correctness of the current dirstate""" |
|
1786 | """validate the correctness of the current dirstate""" | |
1787 | parent1, parent2 = repo.dirstate.parents() |
|
1787 | parent1, parent2 = repo.dirstate.parents() | |
1788 | m1 = repo[parent1].manifest() |
|
1788 | m1 = repo[parent1].manifest() | |
1789 | m2 = repo[parent2].manifest() |
|
1789 | m2 = repo[parent2].manifest() | |
1790 | errors = 0 |
|
1790 | errors = 0 | |
1791 | for f in repo.dirstate: |
|
1791 | for f in repo.dirstate: | |
1792 | state = repo.dirstate[f] |
|
1792 | state = repo.dirstate[f] | |
1793 | if state in "nr" and f not in m1: |
|
1793 | if state in "nr" and f not in m1: | |
1794 | ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state)) |
|
1794 | ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state)) | |
1795 | errors += 1 |
|
1795 | errors += 1 | |
1796 | if state in "a" and f in m1: |
|
1796 | if state in "a" and f in m1: | |
1797 | ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state)) |
|
1797 | ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state)) | |
1798 | errors += 1 |
|
1798 | errors += 1 | |
1799 | if state in "m" and f not in m1 and f not in m2: |
|
1799 | if state in "m" and f not in m1 and f not in m2: | |
1800 | ui.warn(_("%s in state %s, but not in either manifest\n") % |
|
1800 | ui.warn(_("%s in state %s, but not in either manifest\n") % | |
1801 | (f, state)) |
|
1801 | (f, state)) | |
1802 | errors += 1 |
|
1802 | errors += 1 | |
1803 | for f in m1: |
|
1803 | for f in m1: | |
1804 | state = repo.dirstate[f] |
|
1804 | state = repo.dirstate[f] | |
1805 | if state not in "nrm": |
|
1805 | if state not in "nrm": | |
1806 | ui.warn(_("%s in manifest1, but listed as state %s") % (f, state)) |
|
1806 | ui.warn(_("%s in manifest1, but listed as state %s") % (f, state)) | |
1807 | errors += 1 |
|
1807 | errors += 1 | |
1808 | if errors: |
|
1808 | if errors: | |
1809 | error = _(".hg/dirstate inconsistent with current parent's manifest") |
|
1809 | error = _(".hg/dirstate inconsistent with current parent's manifest") | |
1810 | raise util.Abort(error) |
|
1810 | raise util.Abort(error) | |
1811 |
|
1811 | |||
1812 | @command('debugcommands', [], _('[COMMAND]')) |
|
1812 | @command('debugcommands', [], _('[COMMAND]')) | |
1813 | def debugcommands(ui, cmd='', *args): |
|
1813 | def debugcommands(ui, cmd='', *args): | |
1814 | """list all available commands and options""" |
|
1814 | """list all available commands and options""" | |
1815 | for cmd, vals in sorted(table.iteritems()): |
|
1815 | for cmd, vals in sorted(table.iteritems()): | |
1816 | cmd = cmd.split('|')[0].strip('^') |
|
1816 | cmd = cmd.split('|')[0].strip('^') | |
1817 | opts = ', '.join([i[1] for i in vals[1]]) |
|
1817 | opts = ', '.join([i[1] for i in vals[1]]) | |
1818 | ui.write('%s: %s\n' % (cmd, opts)) |
|
1818 | ui.write('%s: %s\n' % (cmd, opts)) | |
1819 |
|
1819 | |||
1820 | @command('debugcomplete', |
|
1820 | @command('debugcomplete', | |
1821 | [('o', 'options', None, _('show the command options'))], |
|
1821 | [('o', 'options', None, _('show the command options'))], | |
1822 | _('[-o] CMD')) |
|
1822 | _('[-o] CMD')) | |
1823 | def debugcomplete(ui, cmd='', **opts): |
|
1823 | def debugcomplete(ui, cmd='', **opts): | |
1824 | """returns the completion list associated with the given command""" |
|
1824 | """returns the completion list associated with the given command""" | |
1825 |
|
1825 | |||
1826 | if opts.get('options'): |
|
1826 | if opts.get('options'): | |
1827 | options = [] |
|
1827 | options = [] | |
1828 | otables = [globalopts] |
|
1828 | otables = [globalopts] | |
1829 | if cmd: |
|
1829 | if cmd: | |
1830 | aliases, entry = cmdutil.findcmd(cmd, table, False) |
|
1830 | aliases, entry = cmdutil.findcmd(cmd, table, False) | |
1831 | otables.append(entry[1]) |
|
1831 | otables.append(entry[1]) | |
1832 | for t in otables: |
|
1832 | for t in otables: | |
1833 | for o in t: |
|
1833 | for o in t: | |
1834 | if "(DEPRECATED)" in o[3]: |
|
1834 | if "(DEPRECATED)" in o[3]: | |
1835 | continue |
|
1835 | continue | |
1836 | if o[0]: |
|
1836 | if o[0]: | |
1837 | options.append('-%s' % o[0]) |
|
1837 | options.append('-%s' % o[0]) | |
1838 | options.append('--%s' % o[1]) |
|
1838 | options.append('--%s' % o[1]) | |
1839 | ui.write("%s\n" % "\n".join(options)) |
|
1839 | ui.write("%s\n" % "\n".join(options)) | |
1840 | return |
|
1840 | return | |
1841 |
|
1841 | |||
1842 | cmdlist = cmdutil.findpossible(cmd, table) |
|
1842 | cmdlist = cmdutil.findpossible(cmd, table) | |
1843 | if ui.verbose: |
|
1843 | if ui.verbose: | |
1844 | cmdlist = [' '.join(c[0]) for c in cmdlist.values()] |
|
1844 | cmdlist = [' '.join(c[0]) for c in cmdlist.values()] | |
1845 | ui.write("%s\n" % "\n".join(sorted(cmdlist))) |
|
1845 | ui.write("%s\n" % "\n".join(sorted(cmdlist))) | |
1846 |
|
1846 | |||
1847 | @command('debugdag', |
|
1847 | @command('debugdag', | |
1848 | [('t', 'tags', None, _('use tags as labels')), |
|
1848 | [('t', 'tags', None, _('use tags as labels')), | |
1849 | ('b', 'branches', None, _('annotate with branch names')), |
|
1849 | ('b', 'branches', None, _('annotate with branch names')), | |
1850 | ('', 'dots', None, _('use dots for runs')), |
|
1850 | ('', 'dots', None, _('use dots for runs')), | |
1851 | ('s', 'spaces', None, _('separate elements by spaces'))], |
|
1851 | ('s', 'spaces', None, _('separate elements by spaces'))], | |
1852 | _('[OPTION]... [FILE [REV]...]')) |
|
1852 | _('[OPTION]... [FILE [REV]...]')) | |
1853 | def debugdag(ui, repo, file_=None, *revs, **opts): |
|
1853 | def debugdag(ui, repo, file_=None, *revs, **opts): | |
1854 | """format the changelog or an index DAG as a concise textual description |
|
1854 | """format the changelog or an index DAG as a concise textual description | |
1855 |
|
1855 | |||
1856 | If you pass a revlog index, the revlog's DAG is emitted. If you list |
|
1856 | If you pass a revlog index, the revlog's DAG is emitted. If you list | |
1857 | revision numbers, they get labeled in the output as rN. |
|
1857 | revision numbers, they get labeled in the output as rN. | |
1858 |
|
1858 | |||
1859 | Otherwise, the changelog DAG of the current repo is emitted. |
|
1859 | Otherwise, the changelog DAG of the current repo is emitted. | |
1860 | """ |
|
1860 | """ | |
1861 | spaces = opts.get('spaces') |
|
1861 | spaces = opts.get('spaces') | |
1862 | dots = opts.get('dots') |
|
1862 | dots = opts.get('dots') | |
1863 | if file_: |
|
1863 | if file_: | |
1864 | rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_) |
|
1864 | rlog = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_) | |
1865 | revs = set((int(r) for r in revs)) |
|
1865 | revs = set((int(r) for r in revs)) | |
1866 | def events(): |
|
1866 | def events(): | |
1867 | for r in rlog: |
|
1867 | for r in rlog: | |
1868 | yield 'n', (r, list(set(p for p in rlog.parentrevs(r) |
|
1868 | yield 'n', (r, list(set(p for p in rlog.parentrevs(r) | |
1869 | if p != -1))) |
|
1869 | if p != -1))) | |
1870 | if r in revs: |
|
1870 | if r in revs: | |
1871 | yield 'l', (r, "r%i" % r) |
|
1871 | yield 'l', (r, "r%i" % r) | |
1872 | elif repo: |
|
1872 | elif repo: | |
1873 | cl = repo.changelog |
|
1873 | cl = repo.changelog | |
1874 | tags = opts.get('tags') |
|
1874 | tags = opts.get('tags') | |
1875 | branches = opts.get('branches') |
|
1875 | branches = opts.get('branches') | |
1876 | if tags: |
|
1876 | if tags: | |
1877 | labels = {} |
|
1877 | labels = {} | |
1878 | for l, n in repo.tags().items(): |
|
1878 | for l, n in repo.tags().items(): | |
1879 | labels.setdefault(cl.rev(n), []).append(l) |
|
1879 | labels.setdefault(cl.rev(n), []).append(l) | |
1880 | def events(): |
|
1880 | def events(): | |
1881 | b = "default" |
|
1881 | b = "default" | |
1882 | for r in cl: |
|
1882 | for r in cl: | |
1883 | if branches: |
|
1883 | if branches: | |
1884 | newb = cl.read(cl.node(r))[5]['branch'] |
|
1884 | newb = cl.read(cl.node(r))[5]['branch'] | |
1885 | if newb != b: |
|
1885 | if newb != b: | |
1886 | yield 'a', newb |
|
1886 | yield 'a', newb | |
1887 | b = newb |
|
1887 | b = newb | |
1888 | yield 'n', (r, list(set(p for p in cl.parentrevs(r) |
|
1888 | yield 'n', (r, list(set(p for p in cl.parentrevs(r) | |
1889 | if p != -1))) |
|
1889 | if p != -1))) | |
1890 | if tags: |
|
1890 | if tags: | |
1891 | ls = labels.get(r) |
|
1891 | ls = labels.get(r) | |
1892 | if ls: |
|
1892 | if ls: | |
1893 | for l in ls: |
|
1893 | for l in ls: | |
1894 | yield 'l', (r, l) |
|
1894 | yield 'l', (r, l) | |
1895 | else: |
|
1895 | else: | |
1896 | raise util.Abort(_('need repo for changelog dag')) |
|
1896 | raise util.Abort(_('need repo for changelog dag')) | |
1897 |
|
1897 | |||
1898 | for line in dagparser.dagtextlines(events(), |
|
1898 | for line in dagparser.dagtextlines(events(), | |
1899 | addspaces=spaces, |
|
1899 | addspaces=spaces, | |
1900 | wraplabels=True, |
|
1900 | wraplabels=True, | |
1901 | wrapannotations=True, |
|
1901 | wrapannotations=True, | |
1902 | wrapnonlinear=dots, |
|
1902 | wrapnonlinear=dots, | |
1903 | usedots=dots, |
|
1903 | usedots=dots, | |
1904 | maxlinewidth=70): |
|
1904 | maxlinewidth=70): | |
1905 | ui.write(line) |
|
1905 | ui.write(line) | |
1906 | ui.write("\n") |
|
1906 | ui.write("\n") | |
1907 |
|
1907 | |||
1908 | @command('debugdata', |
|
1908 | @command('debugdata', | |
1909 | [('c', 'changelog', False, _('open changelog')), |
|
1909 | [('c', 'changelog', False, _('open changelog')), | |
1910 | ('m', 'manifest', False, _('open manifest'))], |
|
1910 | ('m', 'manifest', False, _('open manifest'))], | |
1911 | _('-c|-m|FILE REV')) |
|
1911 | _('-c|-m|FILE REV')) | |
1912 | def debugdata(ui, repo, file_, rev=None, **opts): |
|
1912 | def debugdata(ui, repo, file_, rev=None, **opts): | |
1913 | """dump the contents of a data file revision""" |
|
1913 | """dump the contents of a data file revision""" | |
1914 | if opts.get('changelog') or opts.get('manifest'): |
|
1914 | if opts.get('changelog') or opts.get('manifest'): | |
1915 | file_, rev = None, file_ |
|
1915 | file_, rev = None, file_ | |
1916 | elif rev is None: |
|
1916 | elif rev is None: | |
1917 | raise error.CommandError('debugdata', _('invalid arguments')) |
|
1917 | raise error.CommandError('debugdata', _('invalid arguments')) | |
1918 | r = cmdutil.openrevlog(repo, 'debugdata', file_, opts) |
|
1918 | r = cmdutil.openrevlog(repo, 'debugdata', file_, opts) | |
1919 | try: |
|
1919 | try: | |
1920 | ui.write(r.revision(r.lookup(rev))) |
|
1920 | ui.write(r.revision(r.lookup(rev))) | |
1921 | except KeyError: |
|
1921 | except KeyError: | |
1922 | raise util.Abort(_('invalid revision identifier %s') % rev) |
|
1922 | raise util.Abort(_('invalid revision identifier %s') % rev) | |
1923 |
|
1923 | |||
1924 | @command('debugdate', |
|
1924 | @command('debugdate', | |
1925 | [('e', 'extended', None, _('try extended date formats'))], |
|
1925 | [('e', 'extended', None, _('try extended date formats'))], | |
1926 | _('[-e] DATE [RANGE]')) |
|
1926 | _('[-e] DATE [RANGE]')) | |
1927 | def debugdate(ui, date, range=None, **opts): |
|
1927 | def debugdate(ui, date, range=None, **opts): | |
1928 | """parse and display a date""" |
|
1928 | """parse and display a date""" | |
1929 | if opts["extended"]: |
|
1929 | if opts["extended"]: | |
1930 | d = util.parsedate(date, util.extendeddateformats) |
|
1930 | d = util.parsedate(date, util.extendeddateformats) | |
1931 | else: |
|
1931 | else: | |
1932 | d = util.parsedate(date) |
|
1932 | d = util.parsedate(date) | |
1933 | ui.write(("internal: %s %s\n") % d) |
|
1933 | ui.write(("internal: %s %s\n") % d) | |
1934 | ui.write(("standard: %s\n") % util.datestr(d)) |
|
1934 | ui.write(("standard: %s\n") % util.datestr(d)) | |
1935 | if range: |
|
1935 | if range: | |
1936 | m = util.matchdate(range) |
|
1936 | m = util.matchdate(range) | |
1937 | ui.write(("match: %s\n") % m(d[0])) |
|
1937 | ui.write(("match: %s\n") % m(d[0])) | |
1938 |
|
1938 | |||
1939 | @command('debugdiscovery', |
|
1939 | @command('debugdiscovery', | |
1940 | [('', 'old', None, _('use old-style discovery')), |
|
1940 | [('', 'old', None, _('use old-style discovery')), | |
1941 | ('', 'nonheads', None, |
|
1941 | ('', 'nonheads', None, | |
1942 | _('use old-style discovery with non-heads included')), |
|
1942 | _('use old-style discovery with non-heads included')), | |
1943 | ] + remoteopts, |
|
1943 | ] + remoteopts, | |
1944 | _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]')) |
|
1944 | _('[-l REV] [-r REV] [-b BRANCH]... [OTHER]')) | |
1945 | def debugdiscovery(ui, repo, remoteurl="default", **opts): |
|
1945 | def debugdiscovery(ui, repo, remoteurl="default", **opts): | |
1946 | """runs the changeset discovery protocol in isolation""" |
|
1946 | """runs the changeset discovery protocol in isolation""" | |
1947 | remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl), |
|
1947 | remoteurl, branches = hg.parseurl(ui.expandpath(remoteurl), | |
1948 | opts.get('branch')) |
|
1948 | opts.get('branch')) | |
1949 | remote = hg.peer(repo, opts, remoteurl) |
|
1949 | remote = hg.peer(repo, opts, remoteurl) | |
1950 | ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl)) |
|
1950 | ui.status(_('comparing with %s\n') % util.hidepassword(remoteurl)) | |
1951 |
|
1951 | |||
1952 | # make sure tests are repeatable |
|
1952 | # make sure tests are repeatable | |
1953 | random.seed(12323) |
|
1953 | random.seed(12323) | |
1954 |
|
1954 | |||
1955 | def doit(localheads, remoteheads, remote=remote): |
|
1955 | def doit(localheads, remoteheads, remote=remote): | |
1956 | if opts.get('old'): |
|
1956 | if opts.get('old'): | |
1957 | if localheads: |
|
1957 | if localheads: | |
1958 | raise util.Abort('cannot use localheads with old style ' |
|
1958 | raise util.Abort('cannot use localheads with old style ' | |
1959 | 'discovery') |
|
1959 | 'discovery') | |
1960 | if not util.safehasattr(remote, 'branches'): |
|
1960 | if not util.safehasattr(remote, 'branches'): | |
1961 | # enable in-client legacy support |
|
1961 | # enable in-client legacy support | |
1962 | remote = localrepo.locallegacypeer(remote.local()) |
|
1962 | remote = localrepo.locallegacypeer(remote.local()) | |
1963 | common, _in, hds = treediscovery.findcommonincoming(repo, remote, |
|
1963 | common, _in, hds = treediscovery.findcommonincoming(repo, remote, | |
1964 | force=True) |
|
1964 | force=True) | |
1965 | common = set(common) |
|
1965 | common = set(common) | |
1966 | if not opts.get('nonheads'): |
|
1966 | if not opts.get('nonheads'): | |
1967 | ui.write(("unpruned common: %s\n") % |
|
1967 | ui.write(("unpruned common: %s\n") % | |
1968 | " ".join(sorted(short(n) for n in common))) |
|
1968 | " ".join(sorted(short(n) for n in common))) | |
1969 | dag = dagutil.revlogdag(repo.changelog) |
|
1969 | dag = dagutil.revlogdag(repo.changelog) | |
1970 | all = dag.ancestorset(dag.internalizeall(common)) |
|
1970 | all = dag.ancestorset(dag.internalizeall(common)) | |
1971 | common = dag.externalizeall(dag.headsetofconnecteds(all)) |
|
1971 | common = dag.externalizeall(dag.headsetofconnecteds(all)) | |
1972 | else: |
|
1972 | else: | |
1973 | common, any, hds = setdiscovery.findcommonheads(ui, repo, remote) |
|
1973 | common, any, hds = setdiscovery.findcommonheads(ui, repo, remote) | |
1974 | common = set(common) |
|
1974 | common = set(common) | |
1975 | rheads = set(hds) |
|
1975 | rheads = set(hds) | |
1976 | lheads = set(repo.heads()) |
|
1976 | lheads = set(repo.heads()) | |
1977 | ui.write(("common heads: %s\n") % |
|
1977 | ui.write(("common heads: %s\n") % | |
1978 | " ".join(sorted(short(n) for n in common))) |
|
1978 | " ".join(sorted(short(n) for n in common))) | |
1979 | if lheads <= common: |
|
1979 | if lheads <= common: | |
1980 | ui.write(("local is subset\n")) |
|
1980 | ui.write(("local is subset\n")) | |
1981 | elif rheads <= common: |
|
1981 | elif rheads <= common: | |
1982 | ui.write(("remote is subset\n")) |
|
1982 | ui.write(("remote is subset\n")) | |
1983 |
|
1983 | |||
1984 | serverlogs = opts.get('serverlog') |
|
1984 | serverlogs = opts.get('serverlog') | |
1985 | if serverlogs: |
|
1985 | if serverlogs: | |
1986 | for filename in serverlogs: |
|
1986 | for filename in serverlogs: | |
1987 | logfile = open(filename, 'r') |
|
1987 | logfile = open(filename, 'r') | |
1988 | try: |
|
1988 | try: | |
1989 | line = logfile.readline() |
|
1989 | line = logfile.readline() | |
1990 | while line: |
|
1990 | while line: | |
1991 | parts = line.strip().split(';') |
|
1991 | parts = line.strip().split(';') | |
1992 | op = parts[1] |
|
1992 | op = parts[1] | |
1993 | if op == 'cg': |
|
1993 | if op == 'cg': | |
1994 | pass |
|
1994 | pass | |
1995 | elif op == 'cgss': |
|
1995 | elif op == 'cgss': | |
1996 | doit(parts[2].split(' '), parts[3].split(' ')) |
|
1996 | doit(parts[2].split(' '), parts[3].split(' ')) | |
1997 | elif op == 'unb': |
|
1997 | elif op == 'unb': | |
1998 | doit(parts[3].split(' '), parts[2].split(' ')) |
|
1998 | doit(parts[3].split(' '), parts[2].split(' ')) | |
1999 | line = logfile.readline() |
|
1999 | line = logfile.readline() | |
2000 | finally: |
|
2000 | finally: | |
2001 | logfile.close() |
|
2001 | logfile.close() | |
2002 |
|
2002 | |||
2003 | else: |
|
2003 | else: | |
2004 | remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches, |
|
2004 | remoterevs, _checkout = hg.addbranchrevs(repo, remote, branches, | |
2005 | opts.get('remote_head')) |
|
2005 | opts.get('remote_head')) | |
2006 | localrevs = opts.get('local_head') |
|
2006 | localrevs = opts.get('local_head') | |
2007 | doit(localrevs, remoterevs) |
|
2007 | doit(localrevs, remoterevs) | |
2008 |
|
2008 | |||
2009 | @command('debugfileset', |
|
2009 | @command('debugfileset', | |
2010 | [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))], |
|
2010 | [('r', 'rev', '', _('apply the filespec on this revision'), _('REV'))], | |
2011 | _('[-r REV] FILESPEC')) |
|
2011 | _('[-r REV] FILESPEC')) | |
2012 | def debugfileset(ui, repo, expr, **opts): |
|
2012 | def debugfileset(ui, repo, expr, **opts): | |
2013 | '''parse and apply a fileset specification''' |
|
2013 | '''parse and apply a fileset specification''' | |
2014 | ctx = scmutil.revsingle(repo, opts.get('rev'), None) |
|
2014 | ctx = scmutil.revsingle(repo, opts.get('rev'), None) | |
2015 | if ui.verbose: |
|
2015 | if ui.verbose: | |
2016 | tree = fileset.parse(expr)[0] |
|
2016 | tree = fileset.parse(expr)[0] | |
2017 | ui.note(tree, "\n") |
|
2017 | ui.note(tree, "\n") | |
2018 |
|
2018 | |||
2019 | for f in ctx.getfileset(expr): |
|
2019 | for f in ctx.getfileset(expr): | |
2020 | ui.write("%s\n" % f) |
|
2020 | ui.write("%s\n" % f) | |
2021 |
|
2021 | |||
2022 | @command('debugfsinfo', [], _('[PATH]')) |
|
2022 | @command('debugfsinfo', [], _('[PATH]')) | |
2023 | def debugfsinfo(ui, path="."): |
|
2023 | def debugfsinfo(ui, path="."): | |
2024 | """show information detected about current filesystem""" |
|
2024 | """show information detected about current filesystem""" | |
2025 | util.writefile('.debugfsinfo', '') |
|
2025 | util.writefile('.debugfsinfo', '') | |
2026 | ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no')) |
|
2026 | ui.write(('exec: %s\n') % (util.checkexec(path) and 'yes' or 'no')) | |
2027 | ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no')) |
|
2027 | ui.write(('symlink: %s\n') % (util.checklink(path) and 'yes' or 'no')) | |
2028 | ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no')) |
|
2028 | ui.write(('hardlink: %s\n') % (util.checknlink(path) and 'yes' or 'no')) | |
2029 | ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo') |
|
2029 | ui.write(('case-sensitive: %s\n') % (util.checkcase('.debugfsinfo') | |
2030 | and 'yes' or 'no')) |
|
2030 | and 'yes' or 'no')) | |
2031 | os.unlink('.debugfsinfo') |
|
2031 | os.unlink('.debugfsinfo') | |
2032 |
|
2032 | |||
2033 | @command('debuggetbundle', |
|
2033 | @command('debuggetbundle', | |
2034 | [('H', 'head', [], _('id of head node'), _('ID')), |
|
2034 | [('H', 'head', [], _('id of head node'), _('ID')), | |
2035 | ('C', 'common', [], _('id of common node'), _('ID')), |
|
2035 | ('C', 'common', [], _('id of common node'), _('ID')), | |
2036 | ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))], |
|
2036 | ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE'))], | |
2037 | _('REPO FILE [-H|-C ID]...')) |
|
2037 | _('REPO FILE [-H|-C ID]...')) | |
2038 | def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts): |
|
2038 | def debuggetbundle(ui, repopath, bundlepath, head=None, common=None, **opts): | |
2039 | """retrieves a bundle from a repo |
|
2039 | """retrieves a bundle from a repo | |
2040 |
|
2040 | |||
2041 | Every ID must be a full-length hex node id string. Saves the bundle to the |
|
2041 | Every ID must be a full-length hex node id string. Saves the bundle to the | |
2042 | given file. |
|
2042 | given file. | |
2043 | """ |
|
2043 | """ | |
2044 | repo = hg.peer(ui, opts, repopath) |
|
2044 | repo = hg.peer(ui, opts, repopath) | |
2045 | if not repo.capable('getbundle'): |
|
2045 | if not repo.capable('getbundle'): | |
2046 | raise util.Abort("getbundle() not supported by target repository") |
|
2046 | raise util.Abort("getbundle() not supported by target repository") | |
2047 | args = {} |
|
2047 | args = {} | |
2048 | if common: |
|
2048 | if common: | |
2049 | args['common'] = [bin(s) for s in common] |
|
2049 | args['common'] = [bin(s) for s in common] | |
2050 | if head: |
|
2050 | if head: | |
2051 | args['heads'] = [bin(s) for s in head] |
|
2051 | args['heads'] = [bin(s) for s in head] | |
2052 | # TODO: get desired bundlecaps from command line. |
|
2052 | # TODO: get desired bundlecaps from command line. | |
2053 | args['bundlecaps'] = None |
|
2053 | args['bundlecaps'] = None | |
2054 | bundle = repo.getbundle('debug', **args) |
|
2054 | bundle = repo.getbundle('debug', **args) | |
2055 |
|
2055 | |||
2056 | bundletype = opts.get('type', 'bzip2').lower() |
|
2056 | bundletype = opts.get('type', 'bzip2').lower() | |
2057 | btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'} |
|
2057 | btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'} | |
2058 | bundletype = btypes.get(bundletype) |
|
2058 | bundletype = btypes.get(bundletype) | |
2059 | if bundletype not in changegroup.bundletypes: |
|
2059 | if bundletype not in changegroup.bundletypes: | |
2060 | raise util.Abort(_('unknown bundle type specified with --type')) |
|
2060 | raise util.Abort(_('unknown bundle type specified with --type')) | |
2061 | changegroup.writebundle(bundle, bundlepath, bundletype) |
|
2061 | changegroup.writebundle(bundle, bundlepath, bundletype) | |
2062 |
|
2062 | |||
2063 | @command('debugignore', [], '') |
|
2063 | @command('debugignore', [], '') | |
2064 | def debugignore(ui, repo, *values, **opts): |
|
2064 | def debugignore(ui, repo, *values, **opts): | |
2065 | """display the combined ignore pattern""" |
|
2065 | """display the combined ignore pattern""" | |
2066 | ignore = repo.dirstate._ignore |
|
2066 | ignore = repo.dirstate._ignore | |
2067 | includepat = getattr(ignore, 'includepat', None) |
|
2067 | includepat = getattr(ignore, 'includepat', None) | |
2068 | if includepat is not None: |
|
2068 | if includepat is not None: | |
2069 | ui.write("%s\n" % includepat) |
|
2069 | ui.write("%s\n" % includepat) | |
2070 | else: |
|
2070 | else: | |
2071 | raise util.Abort(_("no ignore patterns found")) |
|
2071 | raise util.Abort(_("no ignore patterns found")) | |
2072 |
|
2072 | |||
2073 | @command('debugindex', |
|
2073 | @command('debugindex', | |
2074 | [('c', 'changelog', False, _('open changelog')), |
|
2074 | [('c', 'changelog', False, _('open changelog')), | |
2075 | ('m', 'manifest', False, _('open manifest')), |
|
2075 | ('m', 'manifest', False, _('open manifest')), | |
2076 | ('f', 'format', 0, _('revlog format'), _('FORMAT'))], |
|
2076 | ('f', 'format', 0, _('revlog format'), _('FORMAT'))], | |
2077 | _('[-f FORMAT] -c|-m|FILE')) |
|
2077 | _('[-f FORMAT] -c|-m|FILE')) | |
2078 | def debugindex(ui, repo, file_=None, **opts): |
|
2078 | def debugindex(ui, repo, file_=None, **opts): | |
2079 | """dump the contents of an index file""" |
|
2079 | """dump the contents of an index file""" | |
2080 | r = cmdutil.openrevlog(repo, 'debugindex', file_, opts) |
|
2080 | r = cmdutil.openrevlog(repo, 'debugindex', file_, opts) | |
2081 | format = opts.get('format', 0) |
|
2081 | format = opts.get('format', 0) | |
2082 | if format not in (0, 1): |
|
2082 | if format not in (0, 1): | |
2083 | raise util.Abort(_("unknown format %d") % format) |
|
2083 | raise util.Abort(_("unknown format %d") % format) | |
2084 |
|
2084 | |||
2085 | generaldelta = r.version & revlog.REVLOGGENERALDELTA |
|
2085 | generaldelta = r.version & revlog.REVLOGGENERALDELTA | |
2086 | if generaldelta: |
|
2086 | if generaldelta: | |
2087 | basehdr = ' delta' |
|
2087 | basehdr = ' delta' | |
2088 | else: |
|
2088 | else: | |
2089 | basehdr = ' base' |
|
2089 | basehdr = ' base' | |
2090 |
|
2090 | |||
2091 | if format == 0: |
|
2091 | if format == 0: | |
2092 | ui.write(" rev offset length " + basehdr + " linkrev" |
|
2092 | ui.write(" rev offset length " + basehdr + " linkrev" | |
2093 | " nodeid p1 p2\n") |
|
2093 | " nodeid p1 p2\n") | |
2094 | elif format == 1: |
|
2094 | elif format == 1: | |
2095 | ui.write(" rev flag offset length" |
|
2095 | ui.write(" rev flag offset length" | |
2096 | " size " + basehdr + " link p1 p2" |
|
2096 | " size " + basehdr + " link p1 p2" | |
2097 | " nodeid\n") |
|
2097 | " nodeid\n") | |
2098 |
|
2098 | |||
2099 | for i in r: |
|
2099 | for i in r: | |
2100 | node = r.node(i) |
|
2100 | node = r.node(i) | |
2101 | if generaldelta: |
|
2101 | if generaldelta: | |
2102 | base = r.deltaparent(i) |
|
2102 | base = r.deltaparent(i) | |
2103 | else: |
|
2103 | else: | |
2104 | base = r.chainbase(i) |
|
2104 | base = r.chainbase(i) | |
2105 | if format == 0: |
|
2105 | if format == 0: | |
2106 | try: |
|
2106 | try: | |
2107 | pp = r.parents(node) |
|
2107 | pp = r.parents(node) | |
2108 | except Exception: |
|
2108 | except Exception: | |
2109 | pp = [nullid, nullid] |
|
2109 | pp = [nullid, nullid] | |
2110 | ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % ( |
|
2110 | ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % ( | |
2111 | i, r.start(i), r.length(i), base, r.linkrev(i), |
|
2111 | i, r.start(i), r.length(i), base, r.linkrev(i), | |
2112 | short(node), short(pp[0]), short(pp[1]))) |
|
2112 | short(node), short(pp[0]), short(pp[1]))) | |
2113 | elif format == 1: |
|
2113 | elif format == 1: | |
2114 | pr = r.parentrevs(i) |
|
2114 | pr = r.parentrevs(i) | |
2115 | ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % ( |
|
2115 | ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % ( | |
2116 | i, r.flags(i), r.start(i), r.length(i), r.rawsize(i), |
|
2116 | i, r.flags(i), r.start(i), r.length(i), r.rawsize(i), | |
2117 | base, r.linkrev(i), pr[0], pr[1], short(node))) |
|
2117 | base, r.linkrev(i), pr[0], pr[1], short(node))) | |
2118 |
|
2118 | |||
2119 | @command('debugindexdot', [], _('FILE')) |
|
2119 | @command('debugindexdot', [], _('FILE')) | |
2120 | def debugindexdot(ui, repo, file_): |
|
2120 | def debugindexdot(ui, repo, file_): | |
2121 | """dump an index DAG as a graphviz dot file""" |
|
2121 | """dump an index DAG as a graphviz dot file""" | |
2122 | r = None |
|
2122 | r = None | |
2123 | if repo: |
|
2123 | if repo: | |
2124 | filelog = repo.file(file_) |
|
2124 | filelog = repo.file(file_) | |
2125 | if len(filelog): |
|
2125 | if len(filelog): | |
2126 | r = filelog |
|
2126 | r = filelog | |
2127 | if not r: |
|
2127 | if not r: | |
2128 | r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_) |
|
2128 | r = revlog.revlog(scmutil.opener(os.getcwd(), audit=False), file_) | |
2129 | ui.write(("digraph G {\n")) |
|
2129 | ui.write(("digraph G {\n")) | |
2130 | for i in r: |
|
2130 | for i in r: | |
2131 | node = r.node(i) |
|
2131 | node = r.node(i) | |
2132 | pp = r.parents(node) |
|
2132 | pp = r.parents(node) | |
2133 | ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i)) |
|
2133 | ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i)) | |
2134 | if pp[1] != nullid: |
|
2134 | if pp[1] != nullid: | |
2135 | ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i)) |
|
2135 | ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i)) | |
2136 | ui.write("}\n") |
|
2136 | ui.write("}\n") | |
2137 |
|
2137 | |||
2138 | @command('debuginstall', [], '') |
|
2138 | @command('debuginstall', [], '') | |
2139 | def debuginstall(ui): |
|
2139 | def debuginstall(ui): | |
2140 | '''test Mercurial installation |
|
2140 | '''test Mercurial installation | |
2141 |
|
2141 | |||
2142 | Returns 0 on success. |
|
2142 | Returns 0 on success. | |
2143 | ''' |
|
2143 | ''' | |
2144 |
|
2144 | |||
2145 | def writetemp(contents): |
|
2145 | def writetemp(contents): | |
2146 | (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-") |
|
2146 | (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-") | |
2147 | f = os.fdopen(fd, "wb") |
|
2147 | f = os.fdopen(fd, "wb") | |
2148 | f.write(contents) |
|
2148 | f.write(contents) | |
2149 | f.close() |
|
2149 | f.close() | |
2150 | return name |
|
2150 | return name | |
2151 |
|
2151 | |||
2152 | problems = 0 |
|
2152 | problems = 0 | |
2153 |
|
2153 | |||
2154 | # encoding |
|
2154 | # encoding | |
2155 | ui.status(_("checking encoding (%s)...\n") % encoding.encoding) |
|
2155 | ui.status(_("checking encoding (%s)...\n") % encoding.encoding) | |
2156 | try: |
|
2156 | try: | |
2157 | encoding.fromlocal("test") |
|
2157 | encoding.fromlocal("test") | |
2158 | except util.Abort, inst: |
|
2158 | except util.Abort, inst: | |
2159 | ui.write(" %s\n" % inst) |
|
2159 | ui.write(" %s\n" % inst) | |
2160 | ui.write(_(" (check that your locale is properly set)\n")) |
|
2160 | ui.write(_(" (check that your locale is properly set)\n")) | |
2161 | problems += 1 |
|
2161 | problems += 1 | |
2162 |
|
2162 | |||
2163 | # Python |
|
2163 | # Python | |
2164 | ui.status(_("checking Python executable (%s)\n") % sys.executable) |
|
2164 | ui.status(_("checking Python executable (%s)\n") % sys.executable) | |
2165 | ui.status(_("checking Python version (%s)\n") |
|
2165 | ui.status(_("checking Python version (%s)\n") | |
2166 | % ("%s.%s.%s" % sys.version_info[:3])) |
|
2166 | % ("%s.%s.%s" % sys.version_info[:3])) | |
2167 | ui.status(_("checking Python lib (%s)...\n") |
|
2167 | ui.status(_("checking Python lib (%s)...\n") | |
2168 | % os.path.dirname(os.__file__)) |
|
2168 | % os.path.dirname(os.__file__)) | |
2169 |
|
2169 | |||
2170 | # compiled modules |
|
2170 | # compiled modules | |
2171 | ui.status(_("checking installed modules (%s)...\n") |
|
2171 | ui.status(_("checking installed modules (%s)...\n") | |
2172 | % os.path.dirname(__file__)) |
|
2172 | % os.path.dirname(__file__)) | |
2173 | try: |
|
2173 | try: | |
2174 | import bdiff, mpatch, base85, osutil |
|
2174 | import bdiff, mpatch, base85, osutil | |
2175 | dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes |
|
2175 | dir(bdiff), dir(mpatch), dir(base85), dir(osutil) # quiet pyflakes | |
2176 | except Exception, inst: |
|
2176 | except Exception, inst: | |
2177 | ui.write(" %s\n" % inst) |
|
2177 | ui.write(" %s\n" % inst) | |
2178 | ui.write(_(" One or more extensions could not be found")) |
|
2178 | ui.write(_(" One or more extensions could not be found")) | |
2179 | ui.write(_(" (check that you compiled the extensions)\n")) |
|
2179 | ui.write(_(" (check that you compiled the extensions)\n")) | |
2180 | problems += 1 |
|
2180 | problems += 1 | |
2181 |
|
2181 | |||
2182 | # templates |
|
2182 | # templates | |
2183 | import templater |
|
2183 | import templater | |
2184 | p = templater.templatepath() |
|
2184 | p = templater.templatepath() | |
2185 | ui.status(_("checking templates (%s)...\n") % ' '.join(p)) |
|
2185 | ui.status(_("checking templates (%s)...\n") % ' '.join(p)) | |
2186 | if p: |
|
2186 | if p: | |
2187 | m = templater.templatepath("map-cmdline.default") |
|
2187 | m = templater.templatepath("map-cmdline.default") | |
2188 | if m: |
|
2188 | if m: | |
2189 | # template found, check if it is working |
|
2189 | # template found, check if it is working | |
2190 | try: |
|
2190 | try: | |
2191 | templater.templater(m) |
|
2191 | templater.templater(m) | |
2192 | except Exception, inst: |
|
2192 | except Exception, inst: | |
2193 | ui.write(" %s\n" % inst) |
|
2193 | ui.write(" %s\n" % inst) | |
2194 | p = None |
|
2194 | p = None | |
2195 | else: |
|
2195 | else: | |
2196 | ui.write(_(" template 'default' not found\n")) |
|
2196 | ui.write(_(" template 'default' not found\n")) | |
2197 | p = None |
|
2197 | p = None | |
2198 | else: |
|
2198 | else: | |
2199 | ui.write(_(" no template directories found\n")) |
|
2199 | ui.write(_(" no template directories found\n")) | |
2200 | if not p: |
|
2200 | if not p: | |
2201 | ui.write(_(" (templates seem to have been installed incorrectly)\n")) |
|
2201 | ui.write(_(" (templates seem to have been installed incorrectly)\n")) | |
2202 | problems += 1 |
|
2202 | problems += 1 | |
2203 |
|
2203 | |||
2204 | # editor |
|
2204 | # editor | |
2205 | ui.status(_("checking commit editor...\n")) |
|
2205 | ui.status(_("checking commit editor...\n")) | |
2206 | editor = ui.geteditor() |
|
2206 | editor = ui.geteditor() | |
2207 | cmdpath = util.findexe(editor) or util.findexe(editor.split()[0]) |
|
2207 | cmdpath = util.findexe(editor) or util.findexe(editor.split()[0]) | |
2208 | if not cmdpath: |
|
2208 | if not cmdpath: | |
2209 | if editor == 'vi': |
|
2209 | if editor == 'vi': | |
2210 | ui.write(_(" No commit editor set and can't find vi in PATH\n")) |
|
2210 | ui.write(_(" No commit editor set and can't find vi in PATH\n")) | |
2211 | ui.write(_(" (specify a commit editor in your configuration" |
|
2211 | ui.write(_(" (specify a commit editor in your configuration" | |
2212 | " file)\n")) |
|
2212 | " file)\n")) | |
2213 | else: |
|
2213 | else: | |
2214 | ui.write(_(" Can't find editor '%s' in PATH\n") % editor) |
|
2214 | ui.write(_(" Can't find editor '%s' in PATH\n") % editor) | |
2215 | ui.write(_(" (specify a commit editor in your configuration" |
|
2215 | ui.write(_(" (specify a commit editor in your configuration" | |
2216 | " file)\n")) |
|
2216 | " file)\n")) | |
2217 | problems += 1 |
|
2217 | problems += 1 | |
2218 |
|
2218 | |||
2219 | # check username |
|
2219 | # check username | |
2220 | ui.status(_("checking username...\n")) |
|
2220 | ui.status(_("checking username...\n")) | |
2221 | try: |
|
2221 | try: | |
2222 | ui.username() |
|
2222 | ui.username() | |
2223 | except util.Abort, e: |
|
2223 | except util.Abort, e: | |
2224 | ui.write(" %s\n" % e) |
|
2224 | ui.write(" %s\n" % e) | |
2225 | ui.write(_(" (specify a username in your configuration file)\n")) |
|
2225 | ui.write(_(" (specify a username in your configuration file)\n")) | |
2226 | problems += 1 |
|
2226 | problems += 1 | |
2227 |
|
2227 | |||
2228 | if not problems: |
|
2228 | if not problems: | |
2229 | ui.status(_("no problems detected\n")) |
|
2229 | ui.status(_("no problems detected\n")) | |
2230 | else: |
|
2230 | else: | |
2231 | ui.write(_("%s problems detected," |
|
2231 | ui.write(_("%s problems detected," | |
2232 | " please check your install!\n") % problems) |
|
2232 | " please check your install!\n") % problems) | |
2233 |
|
2233 | |||
2234 | return problems |
|
2234 | return problems | |
2235 |
|
2235 | |||
2236 | @command('debugknown', [], _('REPO ID...')) |
|
2236 | @command('debugknown', [], _('REPO ID...')) | |
2237 | def debugknown(ui, repopath, *ids, **opts): |
|
2237 | def debugknown(ui, repopath, *ids, **opts): | |
2238 | """test whether node ids are known to a repo |
|
2238 | """test whether node ids are known to a repo | |
2239 |
|
2239 | |||
2240 | Every ID must be a full-length hex node id string. Returns a list of 0s |
|
2240 | Every ID must be a full-length hex node id string. Returns a list of 0s | |
2241 | and 1s indicating unknown/known. |
|
2241 | and 1s indicating unknown/known. | |
2242 | """ |
|
2242 | """ | |
2243 | repo = hg.peer(ui, opts, repopath) |
|
2243 | repo = hg.peer(ui, opts, repopath) | |
2244 | if not repo.capable('known'): |
|
2244 | if not repo.capable('known'): | |
2245 | raise util.Abort("known() not supported by target repository") |
|
2245 | raise util.Abort("known() not supported by target repository") | |
2246 | flags = repo.known([bin(s) for s in ids]) |
|
2246 | flags = repo.known([bin(s) for s in ids]) | |
2247 | ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags]))) |
|
2247 | ui.write("%s\n" % ("".join([f and "1" or "0" for f in flags]))) | |
2248 |
|
2248 | |||
2249 | @command('debuglabelcomplete', [], _('LABEL...')) |
|
2249 | @command('debuglabelcomplete', [], _('LABEL...')) | |
2250 | def debuglabelcomplete(ui, repo, *args): |
|
2250 | def debuglabelcomplete(ui, repo, *args): | |
2251 | '''complete "labels" - tags, open branch names, bookmark names''' |
|
2251 | '''complete "labels" - tags, open branch names, bookmark names''' | |
2252 |
|
2252 | |||
2253 | labels = set() |
|
2253 | labels = set() | |
2254 | labels.update(t[0] for t in repo.tagslist()) |
|
2254 | labels.update(t[0] for t in repo.tagslist()) | |
2255 | labels.update(repo._bookmarks.keys()) |
|
2255 | labels.update(repo._bookmarks.keys()) | |
2256 | labels.update(tag for (tag, heads, tip, closed) |
|
2256 | labels.update(tag for (tag, heads, tip, closed) | |
2257 | in repo.branchmap().iterbranches() if not closed) |
|
2257 | in repo.branchmap().iterbranches() if not closed) | |
2258 | completions = set() |
|
2258 | completions = set() | |
2259 | if not args: |
|
2259 | if not args: | |
2260 | args = [''] |
|
2260 | args = [''] | |
2261 | for a in args: |
|
2261 | for a in args: | |
2262 | completions.update(l for l in labels if l.startswith(a)) |
|
2262 | completions.update(l for l in labels if l.startswith(a)) | |
2263 | ui.write('\n'.join(sorted(completions))) |
|
2263 | ui.write('\n'.join(sorted(completions))) | |
2264 | ui.write('\n') |
|
2264 | ui.write('\n') | |
2265 |
|
2265 | |||
2266 | @command('debugobsolete', |
|
2266 | @command('debugobsolete', | |
2267 | [('', 'flags', 0, _('markers flag')), |
|
2267 | [('', 'flags', 0, _('markers flag')), | |
2268 | ] + commitopts2, |
|
2268 | ] + commitopts2, | |
2269 | _('[OBSOLETED [REPLACEMENT] [REPL... ]')) |
|
2269 | _('[OBSOLETED [REPLACEMENT] [REPL... ]')) | |
2270 | def debugobsolete(ui, repo, precursor=None, *successors, **opts): |
|
2270 | def debugobsolete(ui, repo, precursor=None, *successors, **opts): | |
2271 | """create arbitrary obsolete marker |
|
2271 | """create arbitrary obsolete marker | |
2272 |
|
2272 | |||
2273 | With no arguments, displays the list of obsolescence markers.""" |
|
2273 | With no arguments, displays the list of obsolescence markers.""" | |
2274 | def parsenodeid(s): |
|
2274 | def parsenodeid(s): | |
2275 | try: |
|
2275 | try: | |
2276 | # We do not use revsingle/revrange functions here to accept |
|
2276 | # We do not use revsingle/revrange functions here to accept | |
2277 | # arbitrary node identifiers, possibly not present in the |
|
2277 | # arbitrary node identifiers, possibly not present in the | |
2278 | # local repository. |
|
2278 | # local repository. | |
2279 | n = bin(s) |
|
2279 | n = bin(s) | |
2280 | if len(n) != len(nullid): |
|
2280 | if len(n) != len(nullid): | |
2281 | raise TypeError() |
|
2281 | raise TypeError() | |
2282 | return n |
|
2282 | return n | |
2283 | except TypeError: |
|
2283 | except TypeError: | |
2284 | raise util.Abort('changeset references must be full hexadecimal ' |
|
2284 | raise util.Abort('changeset references must be full hexadecimal ' | |
2285 | 'node identifiers') |
|
2285 | 'node identifiers') | |
2286 |
|
2286 | |||
2287 | if precursor is not None: |
|
2287 | if precursor is not None: | |
2288 | metadata = {} |
|
2288 | metadata = {} | |
2289 | if 'date' in opts: |
|
2289 | if 'date' in opts: | |
2290 | metadata['date'] = opts['date'] |
|
2290 | metadata['date'] = opts['date'] | |
2291 | metadata['user'] = opts['user'] or ui.username() |
|
2291 | metadata['user'] = opts['user'] or ui.username() | |
2292 | succs = tuple(parsenodeid(succ) for succ in successors) |
|
2292 | succs = tuple(parsenodeid(succ) for succ in successors) | |
2293 | l = repo.lock() |
|
2293 | l = repo.lock() | |
2294 | try: |
|
2294 | try: | |
2295 | tr = repo.transaction('debugobsolete') |
|
2295 | tr = repo.transaction('debugobsolete') | |
2296 | try: |
|
2296 | try: | |
2297 | repo.obsstore.create(tr, parsenodeid(precursor), succs, |
|
2297 | repo.obsstore.create(tr, parsenodeid(precursor), succs, | |
2298 | opts['flags'], metadata) |
|
2298 | opts['flags'], metadata) | |
2299 | tr.close() |
|
2299 | tr.close() | |
2300 | finally: |
|
2300 | finally: | |
2301 | tr.release() |
|
2301 | tr.release() | |
2302 | finally: |
|
2302 | finally: | |
2303 | l.release() |
|
2303 | l.release() | |
2304 | else: |
|
2304 | else: | |
2305 | for m in obsolete.allmarkers(repo): |
|
2305 | for m in obsolete.allmarkers(repo): | |
2306 | cmdutil.showmarker(ui, m) |
|
2306 | cmdutil.showmarker(ui, m) | |
2307 |
|
2307 | |||
2308 | @command('debugpathcomplete', |
|
2308 | @command('debugpathcomplete', | |
2309 | [('f', 'full', None, _('complete an entire path')), |
|
2309 | [('f', 'full', None, _('complete an entire path')), | |
2310 | ('n', 'normal', None, _('show only normal files')), |
|
2310 | ('n', 'normal', None, _('show only normal files')), | |
2311 | ('a', 'added', None, _('show only added files')), |
|
2311 | ('a', 'added', None, _('show only added files')), | |
2312 | ('r', 'removed', None, _('show only removed files'))], |
|
2312 | ('r', 'removed', None, _('show only removed files'))], | |
2313 | _('FILESPEC...')) |
|
2313 | _('FILESPEC...')) | |
2314 | def debugpathcomplete(ui, repo, *specs, **opts): |
|
2314 | def debugpathcomplete(ui, repo, *specs, **opts): | |
2315 | '''complete part or all of a tracked path |
|
2315 | '''complete part or all of a tracked path | |
2316 |
|
2316 | |||
2317 | This command supports shells that offer path name completion. It |
|
2317 | This command supports shells that offer path name completion. It | |
2318 | currently completes only files already known to the dirstate. |
|
2318 | currently completes only files already known to the dirstate. | |
2319 |
|
2319 | |||
2320 | Completion extends only to the next path segment unless |
|
2320 | Completion extends only to the next path segment unless | |
2321 | --full is specified, in which case entire paths are used.''' |
|
2321 | --full is specified, in which case entire paths are used.''' | |
2322 |
|
2322 | |||
2323 | def complete(path, acceptable): |
|
2323 | def complete(path, acceptable): | |
2324 | dirstate = repo.dirstate |
|
2324 | dirstate = repo.dirstate | |
2325 | spec = os.path.normpath(os.path.join(os.getcwd(), path)) |
|
2325 | spec = os.path.normpath(os.path.join(os.getcwd(), path)) | |
2326 | rootdir = repo.root + os.sep |
|
2326 | rootdir = repo.root + os.sep | |
2327 | if spec != repo.root and not spec.startswith(rootdir): |
|
2327 | if spec != repo.root and not spec.startswith(rootdir): | |
2328 | return [], [] |
|
2328 | return [], [] | |
2329 | if os.path.isdir(spec): |
|
2329 | if os.path.isdir(spec): | |
2330 | spec += '/' |
|
2330 | spec += '/' | |
2331 | spec = spec[len(rootdir):] |
|
2331 | spec = spec[len(rootdir):] | |
2332 | fixpaths = os.sep != '/' |
|
2332 | fixpaths = os.sep != '/' | |
2333 | if fixpaths: |
|
2333 | if fixpaths: | |
2334 | spec = spec.replace(os.sep, '/') |
|
2334 | spec = spec.replace(os.sep, '/') | |
2335 | speclen = len(spec) |
|
2335 | speclen = len(spec) | |
2336 | fullpaths = opts['full'] |
|
2336 | fullpaths = opts['full'] | |
2337 | files, dirs = set(), set() |
|
2337 | files, dirs = set(), set() | |
2338 | adddir, addfile = dirs.add, files.add |
|
2338 | adddir, addfile = dirs.add, files.add | |
2339 | for f, st in dirstate.iteritems(): |
|
2339 | for f, st in dirstate.iteritems(): | |
2340 | if f.startswith(spec) and st[0] in acceptable: |
|
2340 | if f.startswith(spec) and st[0] in acceptable: | |
2341 | if fixpaths: |
|
2341 | if fixpaths: | |
2342 | f = f.replace('/', os.sep) |
|
2342 | f = f.replace('/', os.sep) | |
2343 | if fullpaths: |
|
2343 | if fullpaths: | |
2344 | addfile(f) |
|
2344 | addfile(f) | |
2345 | continue |
|
2345 | continue | |
2346 | s = f.find(os.sep, speclen) |
|
2346 | s = f.find(os.sep, speclen) | |
2347 | if s >= 0: |
|
2347 | if s >= 0: | |
2348 | adddir(f[:s]) |
|
2348 | adddir(f[:s]) | |
2349 | else: |
|
2349 | else: | |
2350 | addfile(f) |
|
2350 | addfile(f) | |
2351 | return files, dirs |
|
2351 | return files, dirs | |
2352 |
|
2352 | |||
2353 | acceptable = '' |
|
2353 | acceptable = '' | |
2354 | if opts['normal']: |
|
2354 | if opts['normal']: | |
2355 | acceptable += 'nm' |
|
2355 | acceptable += 'nm' | |
2356 | if opts['added']: |
|
2356 | if opts['added']: | |
2357 | acceptable += 'a' |
|
2357 | acceptable += 'a' | |
2358 | if opts['removed']: |
|
2358 | if opts['removed']: | |
2359 | acceptable += 'r' |
|
2359 | acceptable += 'r' | |
2360 | cwd = repo.getcwd() |
|
2360 | cwd = repo.getcwd() | |
2361 | if not specs: |
|
2361 | if not specs: | |
2362 | specs = ['.'] |
|
2362 | specs = ['.'] | |
2363 |
|
2363 | |||
2364 | files, dirs = set(), set() |
|
2364 | files, dirs = set(), set() | |
2365 | for spec in specs: |
|
2365 | for spec in specs: | |
2366 | f, d = complete(spec, acceptable or 'nmar') |
|
2366 | f, d = complete(spec, acceptable or 'nmar') | |
2367 | files.update(f) |
|
2367 | files.update(f) | |
2368 | dirs.update(d) |
|
2368 | dirs.update(d) | |
2369 | files.update(dirs) |
|
2369 | files.update(dirs) | |
2370 | ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files))) |
|
2370 | ui.write('\n'.join(repo.pathto(p, cwd) for p in sorted(files))) | |
2371 | ui.write('\n') |
|
2371 | ui.write('\n') | |
2372 |
|
2372 | |||
2373 | @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]')) |
|
2373 | @command('debugpushkey', [], _('REPO NAMESPACE [KEY OLD NEW]')) | |
2374 | def debugpushkey(ui, repopath, namespace, *keyinfo, **opts): |
|
2374 | def debugpushkey(ui, repopath, namespace, *keyinfo, **opts): | |
2375 | '''access the pushkey key/value protocol |
|
2375 | '''access the pushkey key/value protocol | |
2376 |
|
2376 | |||
2377 | With two args, list the keys in the given namespace. |
|
2377 | With two args, list the keys in the given namespace. | |
2378 |
|
2378 | |||
2379 | With five args, set a key to new if it currently is set to old. |
|
2379 | With five args, set a key to new if it currently is set to old. | |
2380 | Reports success or failure. |
|
2380 | Reports success or failure. | |
2381 | ''' |
|
2381 | ''' | |
2382 |
|
2382 | |||
2383 | target = hg.peer(ui, {}, repopath) |
|
2383 | target = hg.peer(ui, {}, repopath) | |
2384 | if keyinfo: |
|
2384 | if keyinfo: | |
2385 | key, old, new = keyinfo |
|
2385 | key, old, new = keyinfo | |
2386 | r = target.pushkey(namespace, key, old, new) |
|
2386 | r = target.pushkey(namespace, key, old, new) | |
2387 | ui.status(str(r) + '\n') |
|
2387 | ui.status(str(r) + '\n') | |
2388 | return not r |
|
2388 | return not r | |
2389 | else: |
|
2389 | else: | |
2390 | for k, v in sorted(target.listkeys(namespace).iteritems()): |
|
2390 | for k, v in sorted(target.listkeys(namespace).iteritems()): | |
2391 | ui.write("%s\t%s\n" % (k.encode('string-escape'), |
|
2391 | ui.write("%s\t%s\n" % (k.encode('string-escape'), | |
2392 | v.encode('string-escape'))) |
|
2392 | v.encode('string-escape'))) | |
2393 |
|
2393 | |||
2394 | @command('debugpvec', [], _('A B')) |
|
2394 | @command('debugpvec', [], _('A B')) | |
2395 | def debugpvec(ui, repo, a, b=None): |
|
2395 | def debugpvec(ui, repo, a, b=None): | |
2396 | ca = scmutil.revsingle(repo, a) |
|
2396 | ca = scmutil.revsingle(repo, a) | |
2397 | cb = scmutil.revsingle(repo, b) |
|
2397 | cb = scmutil.revsingle(repo, b) | |
2398 | pa = pvec.ctxpvec(ca) |
|
2398 | pa = pvec.ctxpvec(ca) | |
2399 | pb = pvec.ctxpvec(cb) |
|
2399 | pb = pvec.ctxpvec(cb) | |
2400 | if pa == pb: |
|
2400 | if pa == pb: | |
2401 | rel = "=" |
|
2401 | rel = "=" | |
2402 | elif pa > pb: |
|
2402 | elif pa > pb: | |
2403 | rel = ">" |
|
2403 | rel = ">" | |
2404 | elif pa < pb: |
|
2404 | elif pa < pb: | |
2405 | rel = "<" |
|
2405 | rel = "<" | |
2406 | elif pa | pb: |
|
2406 | elif pa | pb: | |
2407 | rel = "|" |
|
2407 | rel = "|" | |
2408 | ui.write(_("a: %s\n") % pa) |
|
2408 | ui.write(_("a: %s\n") % pa) | |
2409 | ui.write(_("b: %s\n") % pb) |
|
2409 | ui.write(_("b: %s\n") % pb) | |
2410 | ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth)) |
|
2410 | ui.write(_("depth(a): %d depth(b): %d\n") % (pa._depth, pb._depth)) | |
2411 | ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") % |
|
2411 | ui.write(_("delta: %d hdist: %d distance: %d relation: %s\n") % | |
2412 | (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec), |
|
2412 | (abs(pa._depth - pb._depth), pvec._hamming(pa._vec, pb._vec), | |
2413 | pa.distance(pb), rel)) |
|
2413 | pa.distance(pb), rel)) | |
2414 |
|
2414 | |||
2415 | @command('debugrebuilddirstate|debugrebuildstate', |
|
2415 | @command('debugrebuilddirstate|debugrebuildstate', | |
2416 | [('r', 'rev', '', _('revision to rebuild to'), _('REV'))], |
|
2416 | [('r', 'rev', '', _('revision to rebuild to'), _('REV'))], | |
2417 | _('[-r REV]')) |
|
2417 | _('[-r REV]')) | |
2418 | def debugrebuilddirstate(ui, repo, rev): |
|
2418 | def debugrebuilddirstate(ui, repo, rev): | |
2419 | """rebuild the dirstate as it would look like for the given revision |
|
2419 | """rebuild the dirstate as it would look like for the given revision | |
2420 |
|
2420 | |||
2421 | If no revision is specified the first current parent will be used. |
|
2421 | If no revision is specified the first current parent will be used. | |
2422 |
|
2422 | |||
2423 | The dirstate will be set to the files of the given revision. |
|
2423 | The dirstate will be set to the files of the given revision. | |
2424 | The actual working directory content or existing dirstate |
|
2424 | The actual working directory content or existing dirstate | |
2425 | information such as adds or removes is not considered. |
|
2425 | information such as adds or removes is not considered. | |
2426 |
|
2426 | |||
2427 | One use of this command is to make the next :hg:`status` invocation |
|
2427 | One use of this command is to make the next :hg:`status` invocation | |
2428 | check the actual file content. |
|
2428 | check the actual file content. | |
2429 | """ |
|
2429 | """ | |
2430 | ctx = scmutil.revsingle(repo, rev) |
|
2430 | ctx = scmutil.revsingle(repo, rev) | |
2431 | wlock = repo.wlock() |
|
2431 | wlock = repo.wlock() | |
2432 | try: |
|
2432 | try: | |
2433 | repo.dirstate.rebuild(ctx.node(), ctx.manifest()) |
|
2433 | repo.dirstate.rebuild(ctx.node(), ctx.manifest()) | |
2434 | finally: |
|
2434 | finally: | |
2435 | wlock.release() |
|
2435 | wlock.release() | |
2436 |
|
2436 | |||
2437 | @command('debugrename', |
|
2437 | @command('debugrename', | |
2438 | [('r', 'rev', '', _('revision to debug'), _('REV'))], |
|
2438 | [('r', 'rev', '', _('revision to debug'), _('REV'))], | |
2439 | _('[-r REV] FILE')) |
|
2439 | _('[-r REV] FILE')) | |
2440 | def debugrename(ui, repo, file1, *pats, **opts): |
|
2440 | def debugrename(ui, repo, file1, *pats, **opts): | |
2441 | """dump rename information""" |
|
2441 | """dump rename information""" | |
2442 |
|
2442 | |||
2443 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
2443 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
2444 | m = scmutil.match(ctx, (file1,) + pats, opts) |
|
2444 | m = scmutil.match(ctx, (file1,) + pats, opts) | |
2445 | for abs in ctx.walk(m): |
|
2445 | for abs in ctx.walk(m): | |
2446 | fctx = ctx[abs] |
|
2446 | fctx = ctx[abs] | |
2447 | o = fctx.filelog().renamed(fctx.filenode()) |
|
2447 | o = fctx.filelog().renamed(fctx.filenode()) | |
2448 | rel = m.rel(abs) |
|
2448 | rel = m.rel(abs) | |
2449 | if o: |
|
2449 | if o: | |
2450 | ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1]))) |
|
2450 | ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1]))) | |
2451 | else: |
|
2451 | else: | |
2452 | ui.write(_("%s not renamed\n") % rel) |
|
2452 | ui.write(_("%s not renamed\n") % rel) | |
2453 |
|
2453 | |||
2454 | @command('debugrevlog', |
|
2454 | @command('debugrevlog', | |
2455 | [('c', 'changelog', False, _('open changelog')), |
|
2455 | [('c', 'changelog', False, _('open changelog')), | |
2456 | ('m', 'manifest', False, _('open manifest')), |
|
2456 | ('m', 'manifest', False, _('open manifest')), | |
2457 | ('d', 'dump', False, _('dump index data'))], |
|
2457 | ('d', 'dump', False, _('dump index data'))], | |
2458 | _('-c|-m|FILE')) |
|
2458 | _('-c|-m|FILE')) | |
2459 | def debugrevlog(ui, repo, file_=None, **opts): |
|
2459 | def debugrevlog(ui, repo, file_=None, **opts): | |
2460 | """show data and statistics about a revlog""" |
|
2460 | """show data and statistics about a revlog""" | |
2461 | r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts) |
|
2461 | r = cmdutil.openrevlog(repo, 'debugrevlog', file_, opts) | |
2462 |
|
2462 | |||
2463 | if opts.get("dump"): |
|
2463 | if opts.get("dump"): | |
2464 | numrevs = len(r) |
|
2464 | numrevs = len(r) | |
2465 | ui.write("# rev p1rev p2rev start end deltastart base p1 p2" |
|
2465 | ui.write("# rev p1rev p2rev start end deltastart base p1 p2" | |
2466 | " rawsize totalsize compression heads\n") |
|
2466 | " rawsize totalsize compression heads\n") | |
2467 | ts = 0 |
|
2467 | ts = 0 | |
2468 | heads = set() |
|
2468 | heads = set() | |
2469 | for rev in xrange(numrevs): |
|
2469 | for rev in xrange(numrevs): | |
2470 | dbase = r.deltaparent(rev) |
|
2470 | dbase = r.deltaparent(rev) | |
2471 | if dbase == -1: |
|
2471 | if dbase == -1: | |
2472 | dbase = rev |
|
2472 | dbase = rev | |
2473 | cbase = r.chainbase(rev) |
|
2473 | cbase = r.chainbase(rev) | |
2474 | p1, p2 = r.parentrevs(rev) |
|
2474 | p1, p2 = r.parentrevs(rev) | |
2475 | rs = r.rawsize(rev) |
|
2475 | rs = r.rawsize(rev) | |
2476 | ts = ts + rs |
|
2476 | ts = ts + rs | |
2477 | heads -= set(r.parentrevs(rev)) |
|
2477 | heads -= set(r.parentrevs(rev)) | |
2478 | heads.add(rev) |
|
2478 | heads.add(rev) | |
2479 | ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d %11d %5d\n" % |
|
2479 | ui.write("%5d %5d %5d %5d %5d %10d %4d %4d %4d %7d %9d %11d %5d\n" % | |
2480 | (rev, p1, p2, r.start(rev), r.end(rev), |
|
2480 | (rev, p1, p2, r.start(rev), r.end(rev), | |
2481 | r.start(dbase), r.start(cbase), |
|
2481 | r.start(dbase), r.start(cbase), | |
2482 | r.start(p1), r.start(p2), |
|
2482 | r.start(p1), r.start(p2), | |
2483 | rs, ts, ts / r.end(rev), len(heads))) |
|
2483 | rs, ts, ts / r.end(rev), len(heads))) | |
2484 | return 0 |
|
2484 | return 0 | |
2485 |
|
2485 | |||
2486 | v = r.version |
|
2486 | v = r.version | |
2487 | format = v & 0xFFFF |
|
2487 | format = v & 0xFFFF | |
2488 | flags = [] |
|
2488 | flags = [] | |
2489 | gdelta = False |
|
2489 | gdelta = False | |
2490 | if v & revlog.REVLOGNGINLINEDATA: |
|
2490 | if v & revlog.REVLOGNGINLINEDATA: | |
2491 | flags.append('inline') |
|
2491 | flags.append('inline') | |
2492 | if v & revlog.REVLOGGENERALDELTA: |
|
2492 | if v & revlog.REVLOGGENERALDELTA: | |
2493 | gdelta = True |
|
2493 | gdelta = True | |
2494 | flags.append('generaldelta') |
|
2494 | flags.append('generaldelta') | |
2495 | if not flags: |
|
2495 | if not flags: | |
2496 | flags = ['(none)'] |
|
2496 | flags = ['(none)'] | |
2497 |
|
2497 | |||
2498 | nummerges = 0 |
|
2498 | nummerges = 0 | |
2499 | numfull = 0 |
|
2499 | numfull = 0 | |
2500 | numprev = 0 |
|
2500 | numprev = 0 | |
2501 | nump1 = 0 |
|
2501 | nump1 = 0 | |
2502 | nump2 = 0 |
|
2502 | nump2 = 0 | |
2503 | numother = 0 |
|
2503 | numother = 0 | |
2504 | nump1prev = 0 |
|
2504 | nump1prev = 0 | |
2505 | nump2prev = 0 |
|
2505 | nump2prev = 0 | |
2506 | chainlengths = [] |
|
2506 | chainlengths = [] | |
2507 |
|
2507 | |||
2508 | datasize = [None, 0, 0L] |
|
2508 | datasize = [None, 0, 0L] | |
2509 | fullsize = [None, 0, 0L] |
|
2509 | fullsize = [None, 0, 0L] | |
2510 | deltasize = [None, 0, 0L] |
|
2510 | deltasize = [None, 0, 0L] | |
2511 |
|
2511 | |||
2512 | def addsize(size, l): |
|
2512 | def addsize(size, l): | |
2513 | if l[0] is None or size < l[0]: |
|
2513 | if l[0] is None or size < l[0]: | |
2514 | l[0] = size |
|
2514 | l[0] = size | |
2515 | if size > l[1]: |
|
2515 | if size > l[1]: | |
2516 | l[1] = size |
|
2516 | l[1] = size | |
2517 | l[2] += size |
|
2517 | l[2] += size | |
2518 |
|
2518 | |||
2519 | numrevs = len(r) |
|
2519 | numrevs = len(r) | |
2520 | for rev in xrange(numrevs): |
|
2520 | for rev in xrange(numrevs): | |
2521 | p1, p2 = r.parentrevs(rev) |
|
2521 | p1, p2 = r.parentrevs(rev) | |
2522 | delta = r.deltaparent(rev) |
|
2522 | delta = r.deltaparent(rev) | |
2523 | if format > 0: |
|
2523 | if format > 0: | |
2524 | addsize(r.rawsize(rev), datasize) |
|
2524 | addsize(r.rawsize(rev), datasize) | |
2525 | if p2 != nullrev: |
|
2525 | if p2 != nullrev: | |
2526 | nummerges += 1 |
|
2526 | nummerges += 1 | |
2527 | size = r.length(rev) |
|
2527 | size = r.length(rev) | |
2528 | if delta == nullrev: |
|
2528 | if delta == nullrev: | |
2529 | chainlengths.append(0) |
|
2529 | chainlengths.append(0) | |
2530 | numfull += 1 |
|
2530 | numfull += 1 | |
2531 | addsize(size, fullsize) |
|
2531 | addsize(size, fullsize) | |
2532 | else: |
|
2532 | else: | |
2533 | chainlengths.append(chainlengths[delta] + 1) |
|
2533 | chainlengths.append(chainlengths[delta] + 1) | |
2534 | addsize(size, deltasize) |
|
2534 | addsize(size, deltasize) | |
2535 | if delta == rev - 1: |
|
2535 | if delta == rev - 1: | |
2536 | numprev += 1 |
|
2536 | numprev += 1 | |
2537 | if delta == p1: |
|
2537 | if delta == p1: | |
2538 | nump1prev += 1 |
|
2538 | nump1prev += 1 | |
2539 | elif delta == p2: |
|
2539 | elif delta == p2: | |
2540 | nump2prev += 1 |
|
2540 | nump2prev += 1 | |
2541 | elif delta == p1: |
|
2541 | elif delta == p1: | |
2542 | nump1 += 1 |
|
2542 | nump1 += 1 | |
2543 | elif delta == p2: |
|
2543 | elif delta == p2: | |
2544 | nump2 += 1 |
|
2544 | nump2 += 1 | |
2545 | elif delta != nullrev: |
|
2545 | elif delta != nullrev: | |
2546 | numother += 1 |
|
2546 | numother += 1 | |
2547 |
|
2547 | |||
2548 | # Adjust size min value for empty cases |
|
2548 | # Adjust size min value for empty cases | |
2549 | for size in (datasize, fullsize, deltasize): |
|
2549 | for size in (datasize, fullsize, deltasize): | |
2550 | if size[0] is None: |
|
2550 | if size[0] is None: | |
2551 | size[0] = 0 |
|
2551 | size[0] = 0 | |
2552 |
|
2552 | |||
2553 | numdeltas = numrevs - numfull |
|
2553 | numdeltas = numrevs - numfull | |
2554 | numoprev = numprev - nump1prev - nump2prev |
|
2554 | numoprev = numprev - nump1prev - nump2prev | |
2555 | totalrawsize = datasize[2] |
|
2555 | totalrawsize = datasize[2] | |
2556 | datasize[2] /= numrevs |
|
2556 | datasize[2] /= numrevs | |
2557 | fulltotal = fullsize[2] |
|
2557 | fulltotal = fullsize[2] | |
2558 | fullsize[2] /= numfull |
|
2558 | fullsize[2] /= numfull | |
2559 | deltatotal = deltasize[2] |
|
2559 | deltatotal = deltasize[2] | |
2560 | if numrevs - numfull > 0: |
|
2560 | if numrevs - numfull > 0: | |
2561 | deltasize[2] /= numrevs - numfull |
|
2561 | deltasize[2] /= numrevs - numfull | |
2562 | totalsize = fulltotal + deltatotal |
|
2562 | totalsize = fulltotal + deltatotal | |
2563 | avgchainlen = sum(chainlengths) / numrevs |
|
2563 | avgchainlen = sum(chainlengths) / numrevs | |
2564 | compratio = totalrawsize / totalsize |
|
2564 | compratio = totalrawsize / totalsize | |
2565 |
|
2565 | |||
2566 | basedfmtstr = '%%%dd\n' |
|
2566 | basedfmtstr = '%%%dd\n' | |
2567 | basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n' |
|
2567 | basepcfmtstr = '%%%dd %s(%%5.2f%%%%)\n' | |
2568 |
|
2568 | |||
2569 | def dfmtstr(max): |
|
2569 | def dfmtstr(max): | |
2570 | return basedfmtstr % len(str(max)) |
|
2570 | return basedfmtstr % len(str(max)) | |
2571 | def pcfmtstr(max, padding=0): |
|
2571 | def pcfmtstr(max, padding=0): | |
2572 | return basepcfmtstr % (len(str(max)), ' ' * padding) |
|
2572 | return basepcfmtstr % (len(str(max)), ' ' * padding) | |
2573 |
|
2573 | |||
2574 | def pcfmt(value, total): |
|
2574 | def pcfmt(value, total): | |
2575 | return (value, 100 * float(value) / total) |
|
2575 | return (value, 100 * float(value) / total) | |
2576 |
|
2576 | |||
2577 | ui.write(('format : %d\n') % format) |
|
2577 | ui.write(('format : %d\n') % format) | |
2578 | ui.write(('flags : %s\n') % ', '.join(flags)) |
|
2578 | ui.write(('flags : %s\n') % ', '.join(flags)) | |
2579 |
|
2579 | |||
2580 | ui.write('\n') |
|
2580 | ui.write('\n') | |
2581 | fmt = pcfmtstr(totalsize) |
|
2581 | fmt = pcfmtstr(totalsize) | |
2582 | fmt2 = dfmtstr(totalsize) |
|
2582 | fmt2 = dfmtstr(totalsize) | |
2583 | ui.write(('revisions : ') + fmt2 % numrevs) |
|
2583 | ui.write(('revisions : ') + fmt2 % numrevs) | |
2584 | ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs)) |
|
2584 | ui.write((' merges : ') + fmt % pcfmt(nummerges, numrevs)) | |
2585 | ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs)) |
|
2585 | ui.write((' normal : ') + fmt % pcfmt(numrevs - nummerges, numrevs)) | |
2586 | ui.write(('revisions : ') + fmt2 % numrevs) |
|
2586 | ui.write(('revisions : ') + fmt2 % numrevs) | |
2587 | ui.write((' full : ') + fmt % pcfmt(numfull, numrevs)) |
|
2587 | ui.write((' full : ') + fmt % pcfmt(numfull, numrevs)) | |
2588 | ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs)) |
|
2588 | ui.write((' deltas : ') + fmt % pcfmt(numdeltas, numrevs)) | |
2589 | ui.write(('revision size : ') + fmt2 % totalsize) |
|
2589 | ui.write(('revision size : ') + fmt2 % totalsize) | |
2590 | ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize)) |
|
2590 | ui.write((' full : ') + fmt % pcfmt(fulltotal, totalsize)) | |
2591 | ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize)) |
|
2591 | ui.write((' deltas : ') + fmt % pcfmt(deltatotal, totalsize)) | |
2592 |
|
2592 | |||
2593 | ui.write('\n') |
|
2593 | ui.write('\n') | |
2594 | fmt = dfmtstr(max(avgchainlen, compratio)) |
|
2594 | fmt = dfmtstr(max(avgchainlen, compratio)) | |
2595 | ui.write(('avg chain length : ') + fmt % avgchainlen) |
|
2595 | ui.write(('avg chain length : ') + fmt % avgchainlen) | |
2596 | ui.write(('compression ratio : ') + fmt % compratio) |
|
2596 | ui.write(('compression ratio : ') + fmt % compratio) | |
2597 |
|
2597 | |||
2598 | if format > 0: |
|
2598 | if format > 0: | |
2599 | ui.write('\n') |
|
2599 | ui.write('\n') | |
2600 | ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n') |
|
2600 | ui.write(('uncompressed data size (min/max/avg) : %d / %d / %d\n') | |
2601 | % tuple(datasize)) |
|
2601 | % tuple(datasize)) | |
2602 | ui.write(('full revision size (min/max/avg) : %d / %d / %d\n') |
|
2602 | ui.write(('full revision size (min/max/avg) : %d / %d / %d\n') | |
2603 | % tuple(fullsize)) |
|
2603 | % tuple(fullsize)) | |
2604 | ui.write(('delta size (min/max/avg) : %d / %d / %d\n') |
|
2604 | ui.write(('delta size (min/max/avg) : %d / %d / %d\n') | |
2605 | % tuple(deltasize)) |
|
2605 | % tuple(deltasize)) | |
2606 |
|
2606 | |||
2607 | if numdeltas > 0: |
|
2607 | if numdeltas > 0: | |
2608 | ui.write('\n') |
|
2608 | ui.write('\n') | |
2609 | fmt = pcfmtstr(numdeltas) |
|
2609 | fmt = pcfmtstr(numdeltas) | |
2610 | fmt2 = pcfmtstr(numdeltas, 4) |
|
2610 | fmt2 = pcfmtstr(numdeltas, 4) | |
2611 | ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas)) |
|
2611 | ui.write(('deltas against prev : ') + fmt % pcfmt(numprev, numdeltas)) | |
2612 | if numprev > 0: |
|
2612 | if numprev > 0: | |
2613 | ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev, |
|
2613 | ui.write((' where prev = p1 : ') + fmt2 % pcfmt(nump1prev, | |
2614 | numprev)) |
|
2614 | numprev)) | |
2615 | ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev, |
|
2615 | ui.write((' where prev = p2 : ') + fmt2 % pcfmt(nump2prev, | |
2616 | numprev)) |
|
2616 | numprev)) | |
2617 | ui.write((' other : ') + fmt2 % pcfmt(numoprev, |
|
2617 | ui.write((' other : ') + fmt2 % pcfmt(numoprev, | |
2618 | numprev)) |
|
2618 | numprev)) | |
2619 | if gdelta: |
|
2619 | if gdelta: | |
2620 | ui.write(('deltas against p1 : ') |
|
2620 | ui.write(('deltas against p1 : ') | |
2621 | + fmt % pcfmt(nump1, numdeltas)) |
|
2621 | + fmt % pcfmt(nump1, numdeltas)) | |
2622 | ui.write(('deltas against p2 : ') |
|
2622 | ui.write(('deltas against p2 : ') | |
2623 | + fmt % pcfmt(nump2, numdeltas)) |
|
2623 | + fmt % pcfmt(nump2, numdeltas)) | |
2624 | ui.write(('deltas against other : ') + fmt % pcfmt(numother, |
|
2624 | ui.write(('deltas against other : ') + fmt % pcfmt(numother, | |
2625 | numdeltas)) |
|
2625 | numdeltas)) | |
2626 |
|
2626 | |||
2627 | @command('debugrevspec', |
|
2627 | @command('debugrevspec', | |
2628 | [('', 'optimize', None, _('print parsed tree after optimizing'))], |
|
2628 | [('', 'optimize', None, _('print parsed tree after optimizing'))], | |
2629 | ('REVSPEC')) |
|
2629 | ('REVSPEC')) | |
2630 | def debugrevspec(ui, repo, expr, **opts): |
|
2630 | def debugrevspec(ui, repo, expr, **opts): | |
2631 | """parse and apply a revision specification |
|
2631 | """parse and apply a revision specification | |
2632 |
|
2632 | |||
2633 | Use --verbose to print the parsed tree before and after aliases |
|
2633 | Use --verbose to print the parsed tree before and after aliases | |
2634 | expansion. |
|
2634 | expansion. | |
2635 | """ |
|
2635 | """ | |
2636 | if ui.verbose: |
|
2636 | if ui.verbose: | |
2637 | tree = revset.parse(expr)[0] |
|
2637 | tree = revset.parse(expr)[0] | |
2638 | ui.note(revset.prettyformat(tree), "\n") |
|
2638 | ui.note(revset.prettyformat(tree), "\n") | |
2639 | newtree = revset.findaliases(ui, tree) |
|
2639 | newtree = revset.findaliases(ui, tree) | |
2640 | if newtree != tree: |
|
2640 | if newtree != tree: | |
2641 | ui.note(revset.prettyformat(newtree), "\n") |
|
2641 | ui.note(revset.prettyformat(newtree), "\n") | |
2642 | if opts["optimize"]: |
|
2642 | if opts["optimize"]: | |
2643 | weight, optimizedtree = revset.optimize(newtree, True) |
|
2643 | weight, optimizedtree = revset.optimize(newtree, True) | |
2644 | ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n") |
|
2644 | ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n") | |
2645 | func = revset.match(ui, expr) |
|
2645 | func = revset.match(ui, expr) | |
2646 | for c in func(repo, revset.spanset(repo)): |
|
2646 | for c in func(repo, revset.spanset(repo)): | |
2647 | ui.write("%s\n" % c) |
|
2647 | ui.write("%s\n" % c) | |
2648 |
|
2648 | |||
2649 | @command('debugsetparents', [], _('REV1 [REV2]')) |
|
2649 | @command('debugsetparents', [], _('REV1 [REV2]')) | |
2650 | def debugsetparents(ui, repo, rev1, rev2=None): |
|
2650 | def debugsetparents(ui, repo, rev1, rev2=None): | |
2651 | """manually set the parents of the current working directory |
|
2651 | """manually set the parents of the current working directory | |
2652 |
|
2652 | |||
2653 | This is useful for writing repository conversion tools, but should |
|
2653 | This is useful for writing repository conversion tools, but should | |
2654 | be used with care. |
|
2654 | be used with care. | |
2655 |
|
2655 | |||
2656 | Returns 0 on success. |
|
2656 | Returns 0 on success. | |
2657 | """ |
|
2657 | """ | |
2658 |
|
2658 | |||
2659 | r1 = scmutil.revsingle(repo, rev1).node() |
|
2659 | r1 = scmutil.revsingle(repo, rev1).node() | |
2660 | r2 = scmutil.revsingle(repo, rev2, 'null').node() |
|
2660 | r2 = scmutil.revsingle(repo, rev2, 'null').node() | |
2661 |
|
2661 | |||
2662 | wlock = repo.wlock() |
|
2662 | wlock = repo.wlock() | |
2663 | try: |
|
2663 | try: | |
2664 | repo.setparents(r1, r2) |
|
2664 | repo.setparents(r1, r2) | |
2665 | finally: |
|
2665 | finally: | |
2666 | wlock.release() |
|
2666 | wlock.release() | |
2667 |
|
2667 | |||
2668 | @command('debugdirstate|debugstate', |
|
2668 | @command('debugdirstate|debugstate', | |
2669 | [('', 'nodates', None, _('do not display the saved mtime')), |
|
2669 | [('', 'nodates', None, _('do not display the saved mtime')), | |
2670 | ('', 'datesort', None, _('sort by saved mtime'))], |
|
2670 | ('', 'datesort', None, _('sort by saved mtime'))], | |
2671 | _('[OPTION]...')) |
|
2671 | _('[OPTION]...')) | |
2672 | def debugstate(ui, repo, nodates=None, datesort=None): |
|
2672 | def debugstate(ui, repo, nodates=None, datesort=None): | |
2673 | """show the contents of the current dirstate""" |
|
2673 | """show the contents of the current dirstate""" | |
2674 | timestr = "" |
|
2674 | timestr = "" | |
2675 | showdate = not nodates |
|
2675 | showdate = not nodates | |
2676 | if datesort: |
|
2676 | if datesort: | |
2677 | keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename |
|
2677 | keyfunc = lambda x: (x[1][3], x[0]) # sort by mtime, then by filename | |
2678 | else: |
|
2678 | else: | |
2679 | keyfunc = None # sort by filename |
|
2679 | keyfunc = None # sort by filename | |
2680 | for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc): |
|
2680 | for file_, ent in sorted(repo.dirstate._map.iteritems(), key=keyfunc): | |
2681 | if showdate: |
|
2681 | if showdate: | |
2682 | if ent[3] == -1: |
|
2682 | if ent[3] == -1: | |
2683 | # Pad or slice to locale representation |
|
2683 | # Pad or slice to locale representation | |
2684 | locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ", |
|
2684 | locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ", | |
2685 | time.localtime(0))) |
|
2685 | time.localtime(0))) | |
2686 | timestr = 'unset' |
|
2686 | timestr = 'unset' | |
2687 | timestr = (timestr[:locale_len] + |
|
2687 | timestr = (timestr[:locale_len] + | |
2688 | ' ' * (locale_len - len(timestr))) |
|
2688 | ' ' * (locale_len - len(timestr))) | |
2689 | else: |
|
2689 | else: | |
2690 | timestr = time.strftime("%Y-%m-%d %H:%M:%S ", |
|
2690 | timestr = time.strftime("%Y-%m-%d %H:%M:%S ", | |
2691 | time.localtime(ent[3])) |
|
2691 | time.localtime(ent[3])) | |
2692 | if ent[1] & 020000: |
|
2692 | if ent[1] & 020000: | |
2693 | mode = 'lnk' |
|
2693 | mode = 'lnk' | |
2694 | else: |
|
2694 | else: | |
2695 | mode = '%3o' % (ent[1] & 0777 & ~util.umask) |
|
2695 | mode = '%3o' % (ent[1] & 0777 & ~util.umask) | |
2696 | ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_)) |
|
2696 | ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_)) | |
2697 | for f in repo.dirstate.copies(): |
|
2697 | for f in repo.dirstate.copies(): | |
2698 | ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f)) |
|
2698 | ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f)) | |
2699 |
|
2699 | |||
2700 | @command('debugsub', |
|
2700 | @command('debugsub', | |
2701 | [('r', 'rev', '', |
|
2701 | [('r', 'rev', '', | |
2702 | _('revision to check'), _('REV'))], |
|
2702 | _('revision to check'), _('REV'))], | |
2703 | _('[-r REV] [REV]')) |
|
2703 | _('[-r REV] [REV]')) | |
2704 | def debugsub(ui, repo, rev=None): |
|
2704 | def debugsub(ui, repo, rev=None): | |
2705 | ctx = scmutil.revsingle(repo, rev, None) |
|
2705 | ctx = scmutil.revsingle(repo, rev, None) | |
2706 | for k, v in sorted(ctx.substate.items()): |
|
2706 | for k, v in sorted(ctx.substate.items()): | |
2707 | ui.write(('path %s\n') % k) |
|
2707 | ui.write(('path %s\n') % k) | |
2708 | ui.write((' source %s\n') % v[0]) |
|
2708 | ui.write((' source %s\n') % v[0]) | |
2709 | ui.write((' revision %s\n') % v[1]) |
|
2709 | ui.write((' revision %s\n') % v[1]) | |
2710 |
|
2710 | |||
2711 | @command('debugsuccessorssets', |
|
2711 | @command('debugsuccessorssets', | |
2712 | [], |
|
2712 | [], | |
2713 | _('[REV]')) |
|
2713 | _('[REV]')) | |
2714 | def debugsuccessorssets(ui, repo, *revs): |
|
2714 | def debugsuccessorssets(ui, repo, *revs): | |
2715 | """show set of successors for revision |
|
2715 | """show set of successors for revision | |
2716 |
|
2716 | |||
2717 | A successors set of changeset A is a consistent group of revisions that |
|
2717 | A successors set of changeset A is a consistent group of revisions that | |
2718 | succeed A. It contains non-obsolete changesets only. |
|
2718 | succeed A. It contains non-obsolete changesets only. | |
2719 |
|
2719 | |||
2720 | In most cases a changeset A has a single successors set containing a single |
|
2720 | In most cases a changeset A has a single successors set containing a single | |
2721 | successor (changeset A replaced by A'). |
|
2721 | successor (changeset A replaced by A'). | |
2722 |
|
2722 | |||
2723 | A changeset that is made obsolete with no successors are called "pruned". |
|
2723 | A changeset that is made obsolete with no successors are called "pruned". | |
2724 | Such changesets have no successors sets at all. |
|
2724 | Such changesets have no successors sets at all. | |
2725 |
|
2725 | |||
2726 | A changeset that has been "split" will have a successors set containing |
|
2726 | A changeset that has been "split" will have a successors set containing | |
2727 | more than one successor. |
|
2727 | more than one successor. | |
2728 |
|
2728 | |||
2729 | A changeset that has been rewritten in multiple different ways is called |
|
2729 | A changeset that has been rewritten in multiple different ways is called | |
2730 | "divergent". Such changesets have multiple successor sets (each of which |
|
2730 | "divergent". Such changesets have multiple successor sets (each of which | |
2731 | may also be split, i.e. have multiple successors). |
|
2731 | may also be split, i.e. have multiple successors). | |
2732 |
|
2732 | |||
2733 | Results are displayed as follows:: |
|
2733 | Results are displayed as follows:: | |
2734 |
|
2734 | |||
2735 | <rev1> |
|
2735 | <rev1> | |
2736 | <successors-1A> |
|
2736 | <successors-1A> | |
2737 | <rev2> |
|
2737 | <rev2> | |
2738 | <successors-2A> |
|
2738 | <successors-2A> | |
2739 | <successors-2B1> <successors-2B2> <successors-2B3> |
|
2739 | <successors-2B1> <successors-2B2> <successors-2B3> | |
2740 |
|
2740 | |||
2741 | Here rev2 has two possible (i.e. divergent) successors sets. The first |
|
2741 | Here rev2 has two possible (i.e. divergent) successors sets. The first | |
2742 | holds one element, whereas the second holds three (i.e. the changeset has |
|
2742 | holds one element, whereas the second holds three (i.e. the changeset has | |
2743 | been split). |
|
2743 | been split). | |
2744 | """ |
|
2744 | """ | |
2745 | # passed to successorssets caching computation from one call to another |
|
2745 | # passed to successorssets caching computation from one call to another | |
2746 | cache = {} |
|
2746 | cache = {} | |
2747 | ctx2str = str |
|
2747 | ctx2str = str | |
2748 | node2str = short |
|
2748 | node2str = short | |
2749 | if ui.debug(): |
|
2749 | if ui.debug(): | |
2750 | def ctx2str(ctx): |
|
2750 | def ctx2str(ctx): | |
2751 | return ctx.hex() |
|
2751 | return ctx.hex() | |
2752 | node2str = hex |
|
2752 | node2str = hex | |
2753 | for rev in scmutil.revrange(repo, revs): |
|
2753 | for rev in scmutil.revrange(repo, revs): | |
2754 | ctx = repo[rev] |
|
2754 | ctx = repo[rev] | |
2755 | ui.write('%s\n'% ctx2str(ctx)) |
|
2755 | ui.write('%s\n'% ctx2str(ctx)) | |
2756 | for succsset in obsolete.successorssets(repo, ctx.node(), cache): |
|
2756 | for succsset in obsolete.successorssets(repo, ctx.node(), cache): | |
2757 | if succsset: |
|
2757 | if succsset: | |
2758 | ui.write(' ') |
|
2758 | ui.write(' ') | |
2759 | ui.write(node2str(succsset[0])) |
|
2759 | ui.write(node2str(succsset[0])) | |
2760 | for node in succsset[1:]: |
|
2760 | for node in succsset[1:]: | |
2761 | ui.write(' ') |
|
2761 | ui.write(' ') | |
2762 | ui.write(node2str(node)) |
|
2762 | ui.write(node2str(node)) | |
2763 | ui.write('\n') |
|
2763 | ui.write('\n') | |
2764 |
|
2764 | |||
2765 | @command('debugwalk', walkopts, _('[OPTION]... [FILE]...')) |
|
2765 | @command('debugwalk', walkopts, _('[OPTION]... [FILE]...')) | |
2766 | def debugwalk(ui, repo, *pats, **opts): |
|
2766 | def debugwalk(ui, repo, *pats, **opts): | |
2767 | """show how files match on given patterns""" |
|
2767 | """show how files match on given patterns""" | |
2768 | m = scmutil.match(repo[None], pats, opts) |
|
2768 | m = scmutil.match(repo[None], pats, opts) | |
2769 | items = list(repo.walk(m)) |
|
2769 | items = list(repo.walk(m)) | |
2770 | if not items: |
|
2770 | if not items: | |
2771 | return |
|
2771 | return | |
2772 | f = lambda fn: fn |
|
2772 | f = lambda fn: fn | |
2773 | if ui.configbool('ui', 'slash') and os.sep != '/': |
|
2773 | if ui.configbool('ui', 'slash') and os.sep != '/': | |
2774 | f = lambda fn: util.normpath(fn) |
|
2774 | f = lambda fn: util.normpath(fn) | |
2775 | fmt = 'f %%-%ds %%-%ds %%s' % ( |
|
2775 | fmt = 'f %%-%ds %%-%ds %%s' % ( | |
2776 | max([len(abs) for abs in items]), |
|
2776 | max([len(abs) for abs in items]), | |
2777 | max([len(m.rel(abs)) for abs in items])) |
|
2777 | max([len(m.rel(abs)) for abs in items])) | |
2778 | for abs in items: |
|
2778 | for abs in items: | |
2779 | line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '') |
|
2779 | line = fmt % (abs, f(m.rel(abs)), m.exact(abs) and 'exact' or '') | |
2780 | ui.write("%s\n" % line.rstrip()) |
|
2780 | ui.write("%s\n" % line.rstrip()) | |
2781 |
|
2781 | |||
2782 | @command('debugwireargs', |
|
2782 | @command('debugwireargs', | |
2783 | [('', 'three', '', 'three'), |
|
2783 | [('', 'three', '', 'three'), | |
2784 | ('', 'four', '', 'four'), |
|
2784 | ('', 'four', '', 'four'), | |
2785 | ('', 'five', '', 'five'), |
|
2785 | ('', 'five', '', 'five'), | |
2786 | ] + remoteopts, |
|
2786 | ] + remoteopts, | |
2787 | _('REPO [OPTIONS]... [ONE [TWO]]')) |
|
2787 | _('REPO [OPTIONS]... [ONE [TWO]]')) | |
2788 | def debugwireargs(ui, repopath, *vals, **opts): |
|
2788 | def debugwireargs(ui, repopath, *vals, **opts): | |
2789 | repo = hg.peer(ui, opts, repopath) |
|
2789 | repo = hg.peer(ui, opts, repopath) | |
2790 | for opt in remoteopts: |
|
2790 | for opt in remoteopts: | |
2791 | del opts[opt[1]] |
|
2791 | del opts[opt[1]] | |
2792 | args = {} |
|
2792 | args = {} | |
2793 | for k, v in opts.iteritems(): |
|
2793 | for k, v in opts.iteritems(): | |
2794 | if v: |
|
2794 | if v: | |
2795 | args[k] = v |
|
2795 | args[k] = v | |
2796 | # run twice to check that we don't mess up the stream for the next command |
|
2796 | # run twice to check that we don't mess up the stream for the next command | |
2797 | res1 = repo.debugwireargs(*vals, **args) |
|
2797 | res1 = repo.debugwireargs(*vals, **args) | |
2798 | res2 = repo.debugwireargs(*vals, **args) |
|
2798 | res2 = repo.debugwireargs(*vals, **args) | |
2799 | ui.write("%s\n" % res1) |
|
2799 | ui.write("%s\n" % res1) | |
2800 | if res1 != res2: |
|
2800 | if res1 != res2: | |
2801 | ui.warn("%s\n" % res2) |
|
2801 | ui.warn("%s\n" % res2) | |
2802 |
|
2802 | |||
2803 | @command('^diff', |
|
2803 | @command('^diff', | |
2804 | [('r', 'rev', [], _('revision'), _('REV')), |
|
2804 | [('r', 'rev', [], _('revision'), _('REV')), | |
2805 | ('c', 'change', '', _('change made by revision'), _('REV')) |
|
2805 | ('c', 'change', '', _('change made by revision'), _('REV')) | |
2806 | ] + diffopts + diffopts2 + walkopts + subrepoopts, |
|
2806 | ] + diffopts + diffopts2 + walkopts + subrepoopts, | |
2807 | _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...')) |
|
2807 | _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...')) | |
2808 | def diff(ui, repo, *pats, **opts): |
|
2808 | def diff(ui, repo, *pats, **opts): | |
2809 | """diff repository (or selected files) |
|
2809 | """diff repository (or selected files) | |
2810 |
|
2810 | |||
2811 | Show differences between revisions for the specified files. |
|
2811 | Show differences between revisions for the specified files. | |
2812 |
|
2812 | |||
2813 | Differences between files are shown using the unified diff format. |
|
2813 | Differences between files are shown using the unified diff format. | |
2814 |
|
2814 | |||
2815 | .. note:: |
|
2815 | .. note:: | |
2816 |
|
2816 | |||
2817 | diff may generate unexpected results for merges, as it will |
|
2817 | diff may generate unexpected results for merges, as it will | |
2818 | default to comparing against the working directory's first |
|
2818 | default to comparing against the working directory's first | |
2819 | parent changeset if no revisions are specified. |
|
2819 | parent changeset if no revisions are specified. | |
2820 |
|
2820 | |||
2821 | When two revision arguments are given, then changes are shown |
|
2821 | When two revision arguments are given, then changes are shown | |
2822 | between those revisions. If only one revision is specified then |
|
2822 | between those revisions. If only one revision is specified then | |
2823 | that revision is compared to the working directory, and, when no |
|
2823 | that revision is compared to the working directory, and, when no | |
2824 | revisions are specified, the working directory files are compared |
|
2824 | revisions are specified, the working directory files are compared | |
2825 | to its parent. |
|
2825 | to its parent. | |
2826 |
|
2826 | |||
2827 | Alternatively you can specify -c/--change with a revision to see |
|
2827 | Alternatively you can specify -c/--change with a revision to see | |
2828 | the changes in that changeset relative to its first parent. |
|
2828 | the changes in that changeset relative to its first parent. | |
2829 |
|
2829 | |||
2830 | Without the -a/--text option, diff will avoid generating diffs of |
|
2830 | Without the -a/--text option, diff will avoid generating diffs of | |
2831 | files it detects as binary. With -a, diff will generate a diff |
|
2831 | files it detects as binary. With -a, diff will generate a diff | |
2832 | anyway, probably with undesirable results. |
|
2832 | anyway, probably with undesirable results. | |
2833 |
|
2833 | |||
2834 | Use the -g/--git option to generate diffs in the git extended diff |
|
2834 | Use the -g/--git option to generate diffs in the git extended diff | |
2835 | format. For more information, read :hg:`help diffs`. |
|
2835 | format. For more information, read :hg:`help diffs`. | |
2836 |
|
2836 | |||
2837 | .. container:: verbose |
|
2837 | .. container:: verbose | |
2838 |
|
2838 | |||
2839 | Examples: |
|
2839 | Examples: | |
2840 |
|
2840 | |||
2841 | - compare a file in the current working directory to its parent:: |
|
2841 | - compare a file in the current working directory to its parent:: | |
2842 |
|
2842 | |||
2843 | hg diff foo.c |
|
2843 | hg diff foo.c | |
2844 |
|
2844 | |||
2845 | - compare two historical versions of a directory, with rename info:: |
|
2845 | - compare two historical versions of a directory, with rename info:: | |
2846 |
|
2846 | |||
2847 | hg diff --git -r 1.0:1.2 lib/ |
|
2847 | hg diff --git -r 1.0:1.2 lib/ | |
2848 |
|
2848 | |||
2849 | - get change stats relative to the last change on some date:: |
|
2849 | - get change stats relative to the last change on some date:: | |
2850 |
|
2850 | |||
2851 | hg diff --stat -r "date('may 2')" |
|
2851 | hg diff --stat -r "date('may 2')" | |
2852 |
|
2852 | |||
2853 | - diff all newly-added files that contain a keyword:: |
|
2853 | - diff all newly-added files that contain a keyword:: | |
2854 |
|
2854 | |||
2855 | hg diff "set:added() and grep(GNU)" |
|
2855 | hg diff "set:added() and grep(GNU)" | |
2856 |
|
2856 | |||
2857 | - compare a revision and its parents:: |
|
2857 | - compare a revision and its parents:: | |
2858 |
|
2858 | |||
2859 | hg diff -c 9353 # compare against first parent |
|
2859 | hg diff -c 9353 # compare against first parent | |
2860 | hg diff -r 9353^:9353 # same using revset syntax |
|
2860 | hg diff -r 9353^:9353 # same using revset syntax | |
2861 | hg diff -r 9353^2:9353 # compare against the second parent |
|
2861 | hg diff -r 9353^2:9353 # compare against the second parent | |
2862 |
|
2862 | |||
2863 | Returns 0 on success. |
|
2863 | Returns 0 on success. | |
2864 | """ |
|
2864 | """ | |
2865 |
|
2865 | |||
2866 | revs = opts.get('rev') |
|
2866 | revs = opts.get('rev') | |
2867 | change = opts.get('change') |
|
2867 | change = opts.get('change') | |
2868 | stat = opts.get('stat') |
|
2868 | stat = opts.get('stat') | |
2869 | reverse = opts.get('reverse') |
|
2869 | reverse = opts.get('reverse') | |
2870 |
|
2870 | |||
2871 | if revs and change: |
|
2871 | if revs and change: | |
2872 | msg = _('cannot specify --rev and --change at the same time') |
|
2872 | msg = _('cannot specify --rev and --change at the same time') | |
2873 | raise util.Abort(msg) |
|
2873 | raise util.Abort(msg) | |
2874 | elif change: |
|
2874 | elif change: | |
2875 | node2 = scmutil.revsingle(repo, change, None).node() |
|
2875 | node2 = scmutil.revsingle(repo, change, None).node() | |
2876 | node1 = repo[node2].p1().node() |
|
2876 | node1 = repo[node2].p1().node() | |
2877 | else: |
|
2877 | else: | |
2878 | node1, node2 = scmutil.revpair(repo, revs) |
|
2878 | node1, node2 = scmutil.revpair(repo, revs) | |
2879 |
|
2879 | |||
2880 | if reverse: |
|
2880 | if reverse: | |
2881 | node1, node2 = node2, node1 |
|
2881 | node1, node2 = node2, node1 | |
2882 |
|
2882 | |||
2883 | diffopts = patch.diffopts(ui, opts) |
|
2883 | diffopts = patch.diffopts(ui, opts) | |
2884 | m = scmutil.match(repo[node2], pats, opts) |
|
2884 | m = scmutil.match(repo[node2], pats, opts) | |
2885 | cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat, |
|
2885 | cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat, | |
2886 | listsubrepos=opts.get('subrepos')) |
|
2886 | listsubrepos=opts.get('subrepos')) | |
2887 |
|
2887 | |||
2888 | @command('^export', |
|
2888 | @command('^export', | |
2889 | [('o', 'output', '', |
|
2889 | [('o', 'output', '', | |
2890 | _('print output to file with formatted name'), _('FORMAT')), |
|
2890 | _('print output to file with formatted name'), _('FORMAT')), | |
2891 | ('', 'switch-parent', None, _('diff against the second parent')), |
|
2891 | ('', 'switch-parent', None, _('diff against the second parent')), | |
2892 | ('r', 'rev', [], _('revisions to export'), _('REV')), |
|
2892 | ('r', 'rev', [], _('revisions to export'), _('REV')), | |
2893 | ] + diffopts, |
|
2893 | ] + diffopts, | |
2894 | _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...')) |
|
2894 | _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...')) | |
2895 | def export(ui, repo, *changesets, **opts): |
|
2895 | def export(ui, repo, *changesets, **opts): | |
2896 | """dump the header and diffs for one or more changesets |
|
2896 | """dump the header and diffs for one or more changesets | |
2897 |
|
2897 | |||
2898 | Print the changeset header and diffs for one or more revisions. |
|
2898 | Print the changeset header and diffs for one or more revisions. | |
2899 | If no revision is given, the parent of the working directory is used. |
|
2899 | If no revision is given, the parent of the working directory is used. | |
2900 |
|
2900 | |||
2901 | The information shown in the changeset header is: author, date, |
|
2901 | The information shown in the changeset header is: author, date, | |
2902 | branch name (if non-default), changeset hash, parent(s) and commit |
|
2902 | branch name (if non-default), changeset hash, parent(s) and commit | |
2903 | comment. |
|
2903 | comment. | |
2904 |
|
2904 | |||
2905 | .. note:: |
|
2905 | .. note:: | |
2906 |
|
2906 | |||
2907 | export may generate unexpected diff output for merge |
|
2907 | export may generate unexpected diff output for merge | |
2908 | changesets, as it will compare the merge changeset against its |
|
2908 | changesets, as it will compare the merge changeset against its | |
2909 | first parent only. |
|
2909 | first parent only. | |
2910 |
|
2910 | |||
2911 | Output may be to a file, in which case the name of the file is |
|
2911 | Output may be to a file, in which case the name of the file is | |
2912 | given using a format string. The formatting rules are as follows: |
|
2912 | given using a format string. The formatting rules are as follows: | |
2913 |
|
2913 | |||
2914 | :``%%``: literal "%" character |
|
2914 | :``%%``: literal "%" character | |
2915 | :``%H``: changeset hash (40 hexadecimal digits) |
|
2915 | :``%H``: changeset hash (40 hexadecimal digits) | |
2916 | :``%N``: number of patches being generated |
|
2916 | :``%N``: number of patches being generated | |
2917 | :``%R``: changeset revision number |
|
2917 | :``%R``: changeset revision number | |
2918 | :``%b``: basename of the exporting repository |
|
2918 | :``%b``: basename of the exporting repository | |
2919 | :``%h``: short-form changeset hash (12 hexadecimal digits) |
|
2919 | :``%h``: short-form changeset hash (12 hexadecimal digits) | |
2920 | :``%m``: first line of the commit message (only alphanumeric characters) |
|
2920 | :``%m``: first line of the commit message (only alphanumeric characters) | |
2921 | :``%n``: zero-padded sequence number, starting at 1 |
|
2921 | :``%n``: zero-padded sequence number, starting at 1 | |
2922 | :``%r``: zero-padded changeset revision number |
|
2922 | :``%r``: zero-padded changeset revision number | |
2923 |
|
2923 | |||
2924 | Without the -a/--text option, export will avoid generating diffs |
|
2924 | Without the -a/--text option, export will avoid generating diffs | |
2925 | of files it detects as binary. With -a, export will generate a |
|
2925 | of files it detects as binary. With -a, export will generate a | |
2926 | diff anyway, probably with undesirable results. |
|
2926 | diff anyway, probably with undesirable results. | |
2927 |
|
2927 | |||
2928 | Use the -g/--git option to generate diffs in the git extended diff |
|
2928 | Use the -g/--git option to generate diffs in the git extended diff | |
2929 | format. See :hg:`help diffs` for more information. |
|
2929 | format. See :hg:`help diffs` for more information. | |
2930 |
|
2930 | |||
2931 | With the --switch-parent option, the diff will be against the |
|
2931 | With the --switch-parent option, the diff will be against the | |
2932 | second parent. It can be useful to review a merge. |
|
2932 | second parent. It can be useful to review a merge. | |
2933 |
|
2933 | |||
2934 | .. container:: verbose |
|
2934 | .. container:: verbose | |
2935 |
|
2935 | |||
2936 | Examples: |
|
2936 | Examples: | |
2937 |
|
2937 | |||
2938 | - use export and import to transplant a bugfix to the current |
|
2938 | - use export and import to transplant a bugfix to the current | |
2939 | branch:: |
|
2939 | branch:: | |
2940 |
|
2940 | |||
2941 | hg export -r 9353 | hg import - |
|
2941 | hg export -r 9353 | hg import - | |
2942 |
|
2942 | |||
2943 | - export all the changesets between two revisions to a file with |
|
2943 | - export all the changesets between two revisions to a file with | |
2944 | rename information:: |
|
2944 | rename information:: | |
2945 |
|
2945 | |||
2946 | hg export --git -r 123:150 > changes.txt |
|
2946 | hg export --git -r 123:150 > changes.txt | |
2947 |
|
2947 | |||
2948 | - split outgoing changes into a series of patches with |
|
2948 | - split outgoing changes into a series of patches with | |
2949 | descriptive names:: |
|
2949 | descriptive names:: | |
2950 |
|
2950 | |||
2951 | hg export -r "outgoing()" -o "%n-%m.patch" |
|
2951 | hg export -r "outgoing()" -o "%n-%m.patch" | |
2952 |
|
2952 | |||
2953 | Returns 0 on success. |
|
2953 | Returns 0 on success. | |
2954 | """ |
|
2954 | """ | |
2955 | changesets += tuple(opts.get('rev', [])) |
|
2955 | changesets += tuple(opts.get('rev', [])) | |
2956 | if not changesets: |
|
2956 | if not changesets: | |
2957 | changesets = ['.'] |
|
2957 | changesets = ['.'] | |
2958 | revs = scmutil.revrange(repo, changesets) |
|
2958 | revs = scmutil.revrange(repo, changesets) | |
2959 | if not revs: |
|
2959 | if not revs: | |
2960 | raise util.Abort(_("export requires at least one changeset")) |
|
2960 | raise util.Abort(_("export requires at least one changeset")) | |
2961 | if len(revs) > 1: |
|
2961 | if len(revs) > 1: | |
2962 | ui.note(_('exporting patches:\n')) |
|
2962 | ui.note(_('exporting patches:\n')) | |
2963 | else: |
|
2963 | else: | |
2964 | ui.note(_('exporting patch:\n')) |
|
2964 | ui.note(_('exporting patch:\n')) | |
2965 | cmdutil.export(repo, revs, template=opts.get('output'), |
|
2965 | cmdutil.export(repo, revs, template=opts.get('output'), | |
2966 | switch_parent=opts.get('switch_parent'), |
|
2966 | switch_parent=opts.get('switch_parent'), | |
2967 | opts=patch.diffopts(ui, opts)) |
|
2967 | opts=patch.diffopts(ui, opts)) | |
2968 |
|
2968 | |||
2969 | @command('^forget', walkopts, _('[OPTION]... FILE...')) |
|
2969 | @command('^forget', walkopts, _('[OPTION]... FILE...')) | |
2970 | def forget(ui, repo, *pats, **opts): |
|
2970 | def forget(ui, repo, *pats, **opts): | |
2971 | """forget the specified files on the next commit |
|
2971 | """forget the specified files on the next commit | |
2972 |
|
2972 | |||
2973 | Mark the specified files so they will no longer be tracked |
|
2973 | Mark the specified files so they will no longer be tracked | |
2974 | after the next commit. |
|
2974 | after the next commit. | |
2975 |
|
2975 | |||
2976 | This only removes files from the current branch, not from the |
|
2976 | This only removes files from the current branch, not from the | |
2977 | entire project history, and it does not delete them from the |
|
2977 | entire project history, and it does not delete them from the | |
2978 | working directory. |
|
2978 | working directory. | |
2979 |
|
2979 | |||
2980 | To undo a forget before the next commit, see :hg:`add`. |
|
2980 | To undo a forget before the next commit, see :hg:`add`. | |
2981 |
|
2981 | |||
2982 | .. container:: verbose |
|
2982 | .. container:: verbose | |
2983 |
|
2983 | |||
2984 | Examples: |
|
2984 | Examples: | |
2985 |
|
2985 | |||
2986 | - forget newly-added binary files:: |
|
2986 | - forget newly-added binary files:: | |
2987 |
|
2987 | |||
2988 | hg forget "set:added() and binary()" |
|
2988 | hg forget "set:added() and binary()" | |
2989 |
|
2989 | |||
2990 | - forget files that would be excluded by .hgignore:: |
|
2990 | - forget files that would be excluded by .hgignore:: | |
2991 |
|
2991 | |||
2992 | hg forget "set:hgignore()" |
|
2992 | hg forget "set:hgignore()" | |
2993 |
|
2993 | |||
2994 | Returns 0 on success. |
|
2994 | Returns 0 on success. | |
2995 | """ |
|
2995 | """ | |
2996 |
|
2996 | |||
2997 | if not pats: |
|
2997 | if not pats: | |
2998 | raise util.Abort(_('no files specified')) |
|
2998 | raise util.Abort(_('no files specified')) | |
2999 |
|
2999 | |||
3000 | m = scmutil.match(repo[None], pats, opts) |
|
3000 | m = scmutil.match(repo[None], pats, opts) | |
3001 | rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0] |
|
3001 | rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0] | |
3002 | return rejected and 1 or 0 |
|
3002 | return rejected and 1 or 0 | |
3003 |
|
3003 | |||
3004 | @command( |
|
3004 | @command( | |
3005 | 'graft', |
|
3005 | 'graft', | |
3006 | [('r', 'rev', [], _('revisions to graft'), _('REV')), |
|
3006 | [('r', 'rev', [], _('revisions to graft'), _('REV')), | |
3007 | ('c', 'continue', False, _('resume interrupted graft')), |
|
3007 | ('c', 'continue', False, _('resume interrupted graft')), | |
3008 | ('e', 'edit', False, _('invoke editor on commit messages')), |
|
3008 | ('e', 'edit', False, _('invoke editor on commit messages')), | |
3009 | ('', 'log', None, _('append graft info to log message')), |
|
3009 | ('', 'log', None, _('append graft info to log message')), | |
3010 | ('D', 'currentdate', False, |
|
3010 | ('D', 'currentdate', False, | |
3011 | _('record the current date as commit date')), |
|
3011 | _('record the current date as commit date')), | |
3012 | ('U', 'currentuser', False, |
|
3012 | ('U', 'currentuser', False, | |
3013 | _('record the current user as committer'), _('DATE'))] |
|
3013 | _('record the current user as committer'), _('DATE'))] | |
3014 | + commitopts2 + mergetoolopts + dryrunopts, |
|
3014 | + commitopts2 + mergetoolopts + dryrunopts, | |
3015 | _('[OPTION]... [-r] REV...')) |
|
3015 | _('[OPTION]... [-r] REV...')) | |
3016 | def graft(ui, repo, *revs, **opts): |
|
3016 | def graft(ui, repo, *revs, **opts): | |
3017 | '''copy changes from other branches onto the current branch |
|
3017 | '''copy changes from other branches onto the current branch | |
3018 |
|
3018 | |||
3019 | This command uses Mercurial's merge logic to copy individual |
|
3019 | This command uses Mercurial's merge logic to copy individual | |
3020 | changes from other branches without merging branches in the |
|
3020 | changes from other branches without merging branches in the | |
3021 | history graph. This is sometimes known as 'backporting' or |
|
3021 | history graph. This is sometimes known as 'backporting' or | |
3022 | 'cherry-picking'. By default, graft will copy user, date, and |
|
3022 | 'cherry-picking'. By default, graft will copy user, date, and | |
3023 | description from the source changesets. |
|
3023 | description from the source changesets. | |
3024 |
|
3024 | |||
3025 | Changesets that are ancestors of the current revision, that have |
|
3025 | Changesets that are ancestors of the current revision, that have | |
3026 | already been grafted, or that are merges will be skipped. |
|
3026 | already been grafted, or that are merges will be skipped. | |
3027 |
|
3027 | |||
3028 | If --log is specified, log messages will have a comment appended |
|
3028 | If --log is specified, log messages will have a comment appended | |
3029 | of the form:: |
|
3029 | of the form:: | |
3030 |
|
3030 | |||
3031 | (grafted from CHANGESETHASH) |
|
3031 | (grafted from CHANGESETHASH) | |
3032 |
|
3032 | |||
3033 | If a graft merge results in conflicts, the graft process is |
|
3033 | If a graft merge results in conflicts, the graft process is | |
3034 | interrupted so that the current merge can be manually resolved. |
|
3034 | interrupted so that the current merge can be manually resolved. | |
3035 | Once all conflicts are addressed, the graft process can be |
|
3035 | Once all conflicts are addressed, the graft process can be | |
3036 | continued with the -c/--continue option. |
|
3036 | continued with the -c/--continue option. | |
3037 |
|
3037 | |||
3038 | .. note:: |
|
3038 | .. note:: | |
3039 |
|
3039 | |||
3040 | The -c/--continue option does not reapply earlier options. |
|
3040 | The -c/--continue option does not reapply earlier options. | |
3041 |
|
3041 | |||
3042 | .. container:: verbose |
|
3042 | .. container:: verbose | |
3043 |
|
3043 | |||
3044 | Examples: |
|
3044 | Examples: | |
3045 |
|
3045 | |||
3046 | - copy a single change to the stable branch and edit its description:: |
|
3046 | - copy a single change to the stable branch and edit its description:: | |
3047 |
|
3047 | |||
3048 | hg update stable |
|
3048 | hg update stable | |
3049 | hg graft --edit 9393 |
|
3049 | hg graft --edit 9393 | |
3050 |
|
3050 | |||
3051 | - graft a range of changesets with one exception, updating dates:: |
|
3051 | - graft a range of changesets with one exception, updating dates:: | |
3052 |
|
3052 | |||
3053 | hg graft -D "2085::2093 and not 2091" |
|
3053 | hg graft -D "2085::2093 and not 2091" | |
3054 |
|
3054 | |||
3055 | - continue a graft after resolving conflicts:: |
|
3055 | - continue a graft after resolving conflicts:: | |
3056 |
|
3056 | |||
3057 | hg graft -c |
|
3057 | hg graft -c | |
3058 |
|
3058 | |||
3059 | - show the source of a grafted changeset:: |
|
3059 | - show the source of a grafted changeset:: | |
3060 |
|
3060 | |||
3061 | hg log --debug -r . |
|
3061 | hg log --debug -r . | |
3062 |
|
3062 | |||
3063 | Returns 0 on successful completion. |
|
3063 | Returns 0 on successful completion. | |
3064 | ''' |
|
3064 | ''' | |
3065 |
|
3065 | |||
3066 | revs = list(revs) |
|
3066 | revs = list(revs) | |
3067 | revs.extend(opts['rev']) |
|
3067 | revs.extend(opts['rev']) | |
3068 |
|
3068 | |||
3069 | if not opts.get('user') and opts.get('currentuser'): |
|
3069 | if not opts.get('user') and opts.get('currentuser'): | |
3070 | opts['user'] = ui.username() |
|
3070 | opts['user'] = ui.username() | |
3071 | if not opts.get('date') and opts.get('currentdate'): |
|
3071 | if not opts.get('date') and opts.get('currentdate'): | |
3072 | opts['date'] = "%d %d" % util.makedate() |
|
3072 | opts['date'] = "%d %d" % util.makedate() | |
3073 |
|
3073 | |||
3074 | editor = None |
|
3074 | editor = None | |
3075 | if opts.get('edit'): |
|
3075 | if opts.get('edit'): | |
3076 | editor = cmdutil.commitforceeditor |
|
3076 | editor = cmdutil.commitforceeditor | |
3077 |
|
3077 | |||
3078 | cont = False |
|
3078 | cont = False | |
3079 | if opts['continue']: |
|
3079 | if opts['continue']: | |
3080 | cont = True |
|
3080 | cont = True | |
3081 | if revs: |
|
3081 | if revs: | |
3082 | raise util.Abort(_("can't specify --continue and revisions")) |
|
3082 | raise util.Abort(_("can't specify --continue and revisions")) | |
3083 | # read in unfinished revisions |
|
3083 | # read in unfinished revisions | |
3084 | try: |
|
3084 | try: | |
3085 | nodes = repo.opener.read('graftstate').splitlines() |
|
3085 | nodes = repo.opener.read('graftstate').splitlines() | |
3086 | revs = [repo[node].rev() for node in nodes] |
|
3086 | revs = [repo[node].rev() for node in nodes] | |
3087 | except IOError, inst: |
|
3087 | except IOError, inst: | |
3088 | if inst.errno != errno.ENOENT: |
|
3088 | if inst.errno != errno.ENOENT: | |
3089 | raise |
|
3089 | raise | |
3090 | raise util.Abort(_("no graft state found, can't continue")) |
|
3090 | raise util.Abort(_("no graft state found, can't continue")) | |
3091 | else: |
|
3091 | else: | |
3092 | cmdutil.checkunfinished(repo) |
|
3092 | cmdutil.checkunfinished(repo) | |
3093 | cmdutil.bailifchanged(repo) |
|
3093 | cmdutil.bailifchanged(repo) | |
3094 | if not revs: |
|
3094 | if not revs: | |
3095 | raise util.Abort(_('no revisions specified')) |
|
3095 | raise util.Abort(_('no revisions specified')) | |
3096 | revs = scmutil.revrange(repo, revs) |
|
3096 | revs = scmutil.revrange(repo, revs) | |
3097 |
|
3097 | |||
3098 | # check for merges |
|
3098 | # check for merges | |
3099 | for rev in repo.revs('%ld and merge()', revs): |
|
3099 | for rev in repo.revs('%ld and merge()', revs): | |
3100 | ui.warn(_('skipping ungraftable merge revision %s\n') % rev) |
|
3100 | ui.warn(_('skipping ungraftable merge revision %s\n') % rev) | |
3101 | revs.remove(rev) |
|
3101 | revs.remove(rev) | |
3102 | if not revs: |
|
3102 | if not revs: | |
3103 | return -1 |
|
3103 | return -1 | |
3104 |
|
3104 | |||
3105 | # check for ancestors of dest branch |
|
3105 | # check for ancestors of dest branch | |
3106 | crev = repo['.'].rev() |
|
3106 | crev = repo['.'].rev() | |
3107 | ancestors = repo.changelog.ancestors([crev], inclusive=True) |
|
3107 | ancestors = repo.changelog.ancestors([crev], inclusive=True) | |
3108 | # don't mutate while iterating, create a copy |
|
3108 | # don't mutate while iterating, create a copy | |
3109 | for rev in list(revs): |
|
3109 | for rev in list(revs): | |
3110 | if rev in ancestors: |
|
3110 | if rev in ancestors: | |
3111 | ui.warn(_('skipping ancestor revision %s\n') % rev) |
|
3111 | ui.warn(_('skipping ancestor revision %s\n') % rev) | |
3112 | revs.remove(rev) |
|
3112 | revs.remove(rev) | |
3113 | if not revs: |
|
3113 | if not revs: | |
3114 | return -1 |
|
3114 | return -1 | |
3115 |
|
3115 | |||
3116 | # analyze revs for earlier grafts |
|
3116 | # analyze revs for earlier grafts | |
3117 | ids = {} |
|
3117 | ids = {} | |
3118 | for ctx in repo.set("%ld", revs): |
|
3118 | for ctx in repo.set("%ld", revs): | |
3119 | ids[ctx.hex()] = ctx.rev() |
|
3119 | ids[ctx.hex()] = ctx.rev() | |
3120 | n = ctx.extra().get('source') |
|
3120 | n = ctx.extra().get('source') | |
3121 | if n: |
|
3121 | if n: | |
3122 | ids[n] = ctx.rev() |
|
3122 | ids[n] = ctx.rev() | |
3123 |
|
3123 | |||
3124 | # check ancestors for earlier grafts |
|
3124 | # check ancestors for earlier grafts | |
3125 | ui.debug('scanning for duplicate grafts\n') |
|
3125 | ui.debug('scanning for duplicate grafts\n') | |
3126 |
|
3126 | |||
3127 | for rev in repo.changelog.findmissingrevs(revs, [crev]): |
|
3127 | for rev in repo.changelog.findmissingrevs(revs, [crev]): | |
3128 | ctx = repo[rev] |
|
3128 | ctx = repo[rev] | |
3129 | n = ctx.extra().get('source') |
|
3129 | n = ctx.extra().get('source') | |
3130 | if n in ids: |
|
3130 | if n in ids: | |
3131 | r = repo[n].rev() |
|
3131 | r = repo[n].rev() | |
3132 | if r in revs: |
|
3132 | if r in revs: | |
3133 | ui.warn(_('skipping revision %s (already grafted to %s)\n') |
|
3133 | ui.warn(_('skipping revision %s (already grafted to %s)\n') | |
3134 | % (r, rev)) |
|
3134 | % (r, rev)) | |
3135 | revs.remove(r) |
|
3135 | revs.remove(r) | |
3136 | elif ids[n] in revs: |
|
3136 | elif ids[n] in revs: | |
3137 | ui.warn(_('skipping already grafted revision %s ' |
|
3137 | ui.warn(_('skipping already grafted revision %s ' | |
3138 | '(%s also has origin %d)\n') % (ids[n], rev, r)) |
|
3138 | '(%s also has origin %d)\n') % (ids[n], rev, r)) | |
3139 | revs.remove(ids[n]) |
|
3139 | revs.remove(ids[n]) | |
3140 | elif ctx.hex() in ids: |
|
3140 | elif ctx.hex() in ids: | |
3141 | r = ids[ctx.hex()] |
|
3141 | r = ids[ctx.hex()] | |
3142 | ui.warn(_('skipping already grafted revision %s ' |
|
3142 | ui.warn(_('skipping already grafted revision %s ' | |
3143 | '(was grafted from %d)\n') % (r, rev)) |
|
3143 | '(was grafted from %d)\n') % (r, rev)) | |
3144 | revs.remove(r) |
|
3144 | revs.remove(r) | |
3145 | if not revs: |
|
3145 | if not revs: | |
3146 | return -1 |
|
3146 | return -1 | |
3147 |
|
3147 | |||
3148 | wlock = repo.wlock() |
|
3148 | wlock = repo.wlock() | |
3149 | try: |
|
3149 | try: | |
3150 | current = repo['.'] |
|
3150 | current = repo['.'] | |
3151 | for pos, ctx in enumerate(repo.set("%ld", revs)): |
|
3151 | for pos, ctx in enumerate(repo.set("%ld", revs)): | |
3152 |
|
3152 | |||
3153 | ui.status(_('grafting revision %s\n') % ctx.rev()) |
|
3153 | ui.status(_('grafting revision %s\n') % ctx.rev()) | |
3154 | if opts.get('dry_run'): |
|
3154 | if opts.get('dry_run'): | |
3155 | continue |
|
3155 | continue | |
3156 |
|
3156 | |||
3157 | source = ctx.extra().get('source') |
|
3157 | source = ctx.extra().get('source') | |
3158 | if not source: |
|
3158 | if not source: | |
3159 | source = ctx.hex() |
|
3159 | source = ctx.hex() | |
3160 | extra = {'source': source} |
|
3160 | extra = {'source': source} | |
3161 | user = ctx.user() |
|
3161 | user = ctx.user() | |
3162 | if opts.get('user'): |
|
3162 | if opts.get('user'): | |
3163 | user = opts['user'] |
|
3163 | user = opts['user'] | |
3164 | date = ctx.date() |
|
3164 | date = ctx.date() | |
3165 | if opts.get('date'): |
|
3165 | if opts.get('date'): | |
3166 | date = opts['date'] |
|
3166 | date = opts['date'] | |
3167 | message = ctx.description() |
|
3167 | message = ctx.description() | |
3168 | if opts.get('log'): |
|
3168 | if opts.get('log'): | |
3169 | message += '\n(grafted from %s)' % ctx.hex() |
|
3169 | message += '\n(grafted from %s)' % ctx.hex() | |
3170 |
|
3170 | |||
3171 | # we don't merge the first commit when continuing |
|
3171 | # we don't merge the first commit when continuing | |
3172 | if not cont: |
|
3172 | if not cont: | |
3173 | # perform the graft merge with p1(rev) as 'ancestor' |
|
3173 | # perform the graft merge with p1(rev) as 'ancestor' | |
3174 | try: |
|
3174 | try: | |
3175 | # ui.forcemerge is an internal variable, do not document |
|
3175 | # ui.forcemerge is an internal variable, do not document | |
3176 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
3176 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | |
3177 | 'graft') |
|
3177 | 'graft') | |
3178 | stats = mergemod.update(repo, ctx.node(), True, True, False, |
|
3178 | stats = mergemod.update(repo, ctx.node(), True, True, False, | |
3179 | ctx.p1().node()) |
|
3179 | ctx.p1().node()) | |
3180 | finally: |
|
3180 | finally: | |
3181 | repo.ui.setconfig('ui', 'forcemerge', '', 'graft') |
|
3181 | repo.ui.setconfig('ui', 'forcemerge', '', 'graft') | |
3182 | # report any conflicts |
|
3182 | # report any conflicts | |
3183 | if stats and stats[3] > 0: |
|
3183 | if stats and stats[3] > 0: | |
3184 | # write out state for --continue |
|
3184 | # write out state for --continue | |
3185 | nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] |
|
3185 | nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] | |
3186 | repo.opener.write('graftstate', ''.join(nodelines)) |
|
3186 | repo.opener.write('graftstate', ''.join(nodelines)) | |
3187 | raise util.Abort( |
|
3187 | raise util.Abort( | |
3188 | _("unresolved conflicts, can't continue"), |
|
3188 | _("unresolved conflicts, can't continue"), | |
3189 | hint=_('use hg resolve and hg graft --continue')) |
|
3189 | hint=_('use hg resolve and hg graft --continue')) | |
3190 | else: |
|
3190 | else: | |
3191 | cont = False |
|
3191 | cont = False | |
3192 |
|
3192 | |||
3193 | # drop the second merge parent |
|
3193 | # drop the second merge parent | |
3194 | repo.setparents(current.node(), nullid) |
|
3194 | repo.setparents(current.node(), nullid) | |
3195 | repo.dirstate.write() |
|
3195 | repo.dirstate.write() | |
3196 | # fix up dirstate for copies and renames |
|
3196 | # fix up dirstate for copies and renames | |
3197 | cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev()) |
|
3197 | cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev()) | |
3198 |
|
3198 | |||
3199 | # commit |
|
3199 | # commit | |
3200 | node = repo.commit(text=message, user=user, |
|
3200 | node = repo.commit(text=message, user=user, | |
3201 | date=date, extra=extra, editor=editor) |
|
3201 | date=date, extra=extra, editor=editor) | |
3202 | if node is None: |
|
3202 | if node is None: | |
3203 | ui.status(_('graft for revision %s is empty\n') % ctx.rev()) |
|
3203 | ui.status(_('graft for revision %s is empty\n') % ctx.rev()) | |
3204 | else: |
|
3204 | else: | |
3205 | current = repo[node] |
|
3205 | current = repo[node] | |
3206 | finally: |
|
3206 | finally: | |
3207 | wlock.release() |
|
3207 | wlock.release() | |
3208 |
|
3208 | |||
3209 | # remove state when we complete successfully |
|
3209 | # remove state when we complete successfully | |
3210 | if not opts.get('dry_run'): |
|
3210 | if not opts.get('dry_run'): | |
3211 | util.unlinkpath(repo.join('graftstate'), ignoremissing=True) |
|
3211 | util.unlinkpath(repo.join('graftstate'), ignoremissing=True) | |
3212 |
|
3212 | |||
3213 | return 0 |
|
3213 | return 0 | |
3214 |
|
3214 | |||
3215 | @command('grep', |
|
3215 | @command('grep', | |
3216 | [('0', 'print0', None, _('end fields with NUL')), |
|
3216 | [('0', 'print0', None, _('end fields with NUL')), | |
3217 | ('', 'all', None, _('print all revisions that match')), |
|
3217 | ('', 'all', None, _('print all revisions that match')), | |
3218 | ('a', 'text', None, _('treat all files as text')), |
|
3218 | ('a', 'text', None, _('treat all files as text')), | |
3219 | ('f', 'follow', None, |
|
3219 | ('f', 'follow', None, | |
3220 | _('follow changeset history,' |
|
3220 | _('follow changeset history,' | |
3221 | ' or file history across copies and renames')), |
|
3221 | ' or file history across copies and renames')), | |
3222 | ('i', 'ignore-case', None, _('ignore case when matching')), |
|
3222 | ('i', 'ignore-case', None, _('ignore case when matching')), | |
3223 | ('l', 'files-with-matches', None, |
|
3223 | ('l', 'files-with-matches', None, | |
3224 | _('print only filenames and revisions that match')), |
|
3224 | _('print only filenames and revisions that match')), | |
3225 | ('n', 'line-number', None, _('print matching line numbers')), |
|
3225 | ('n', 'line-number', None, _('print matching line numbers')), | |
3226 | ('r', 'rev', [], |
|
3226 | ('r', 'rev', [], | |
3227 | _('only search files changed within revision range'), _('REV')), |
|
3227 | _('only search files changed within revision range'), _('REV')), | |
3228 | ('u', 'user', None, _('list the author (long with -v)')), |
|
3228 | ('u', 'user', None, _('list the author (long with -v)')), | |
3229 | ('d', 'date', None, _('list the date (short with -q)')), |
|
3229 | ('d', 'date', None, _('list the date (short with -q)')), | |
3230 | ] + walkopts, |
|
3230 | ] + walkopts, | |
3231 | _('[OPTION]... PATTERN [FILE]...')) |
|
3231 | _('[OPTION]... PATTERN [FILE]...')) | |
3232 | def grep(ui, repo, pattern, *pats, **opts): |
|
3232 | def grep(ui, repo, pattern, *pats, **opts): | |
3233 | """search for a pattern in specified files and revisions |
|
3233 | """search for a pattern in specified files and revisions | |
3234 |
|
3234 | |||
3235 | Search revisions of files for a regular expression. |
|
3235 | Search revisions of files for a regular expression. | |
3236 |
|
3236 | |||
3237 | This command behaves differently than Unix grep. It only accepts |
|
3237 | This command behaves differently than Unix grep. It only accepts | |
3238 | Python/Perl regexps. It searches repository history, not the |
|
3238 | Python/Perl regexps. It searches repository history, not the | |
3239 | working directory. It always prints the revision number in which a |
|
3239 | working directory. It always prints the revision number in which a | |
3240 | match appears. |
|
3240 | match appears. | |
3241 |
|
3241 | |||
3242 | By default, grep only prints output for the first revision of a |
|
3242 | By default, grep only prints output for the first revision of a | |
3243 | file in which it finds a match. To get it to print every revision |
|
3243 | file in which it finds a match. To get it to print every revision | |
3244 | that contains a change in match status ("-" for a match that |
|
3244 | that contains a change in match status ("-" for a match that | |
3245 | becomes a non-match, or "+" for a non-match that becomes a match), |
|
3245 | becomes a non-match, or "+" for a non-match that becomes a match), | |
3246 | use the --all flag. |
|
3246 | use the --all flag. | |
3247 |
|
3247 | |||
3248 | Returns 0 if a match is found, 1 otherwise. |
|
3248 | Returns 0 if a match is found, 1 otherwise. | |
3249 | """ |
|
3249 | """ | |
3250 | reflags = re.M |
|
3250 | reflags = re.M | |
3251 | if opts.get('ignore_case'): |
|
3251 | if opts.get('ignore_case'): | |
3252 | reflags |= re.I |
|
3252 | reflags |= re.I | |
3253 | try: |
|
3253 | try: | |
3254 | regexp = util.compilere(pattern, reflags) |
|
3254 | regexp = util.compilere(pattern, reflags) | |
3255 | except re.error, inst: |
|
3255 | except re.error, inst: | |
3256 | ui.warn(_("grep: invalid match pattern: %s\n") % inst) |
|
3256 | ui.warn(_("grep: invalid match pattern: %s\n") % inst) | |
3257 | return 1 |
|
3257 | return 1 | |
3258 | sep, eol = ':', '\n' |
|
3258 | sep, eol = ':', '\n' | |
3259 | if opts.get('print0'): |
|
3259 | if opts.get('print0'): | |
3260 | sep = eol = '\0' |
|
3260 | sep = eol = '\0' | |
3261 |
|
3261 | |||
3262 | getfile = util.lrucachefunc(repo.file) |
|
3262 | getfile = util.lrucachefunc(repo.file) | |
3263 |
|
3263 | |||
3264 | def matchlines(body): |
|
3264 | def matchlines(body): | |
3265 | begin = 0 |
|
3265 | begin = 0 | |
3266 | linenum = 0 |
|
3266 | linenum = 0 | |
3267 | while begin < len(body): |
|
3267 | while begin < len(body): | |
3268 | match = regexp.search(body, begin) |
|
3268 | match = regexp.search(body, begin) | |
3269 | if not match: |
|
3269 | if not match: | |
3270 | break |
|
3270 | break | |
3271 | mstart, mend = match.span() |
|
3271 | mstart, mend = match.span() | |
3272 | linenum += body.count('\n', begin, mstart) + 1 |
|
3272 | linenum += body.count('\n', begin, mstart) + 1 | |
3273 | lstart = body.rfind('\n', begin, mstart) + 1 or begin |
|
3273 | lstart = body.rfind('\n', begin, mstart) + 1 or begin | |
3274 | begin = body.find('\n', mend) + 1 or len(body) + 1 |
|
3274 | begin = body.find('\n', mend) + 1 or len(body) + 1 | |
3275 | lend = begin - 1 |
|
3275 | lend = begin - 1 | |
3276 | yield linenum, mstart - lstart, mend - lstart, body[lstart:lend] |
|
3276 | yield linenum, mstart - lstart, mend - lstart, body[lstart:lend] | |
3277 |
|
3277 | |||
3278 | class linestate(object): |
|
3278 | class linestate(object): | |
3279 | def __init__(self, line, linenum, colstart, colend): |
|
3279 | def __init__(self, line, linenum, colstart, colend): | |
3280 | self.line = line |
|
3280 | self.line = line | |
3281 | self.linenum = linenum |
|
3281 | self.linenum = linenum | |
3282 | self.colstart = colstart |
|
3282 | self.colstart = colstart | |
3283 | self.colend = colend |
|
3283 | self.colend = colend | |
3284 |
|
3284 | |||
3285 | def __hash__(self): |
|
3285 | def __hash__(self): | |
3286 | return hash((self.linenum, self.line)) |
|
3286 | return hash((self.linenum, self.line)) | |
3287 |
|
3287 | |||
3288 | def __eq__(self, other): |
|
3288 | def __eq__(self, other): | |
3289 | return self.line == other.line |
|
3289 | return self.line == other.line | |
3290 |
|
3290 | |||
3291 | def __iter__(self): |
|
3291 | def __iter__(self): | |
3292 | yield (self.line[:self.colstart], '') |
|
3292 | yield (self.line[:self.colstart], '') | |
3293 | yield (self.line[self.colstart:self.colend], 'grep.match') |
|
3293 | yield (self.line[self.colstart:self.colend], 'grep.match') | |
3294 | rest = self.line[self.colend:] |
|
3294 | rest = self.line[self.colend:] | |
3295 | while rest != '': |
|
3295 | while rest != '': | |
3296 | match = regexp.search(rest) |
|
3296 | match = regexp.search(rest) | |
3297 | if not match: |
|
3297 | if not match: | |
3298 | yield (rest, '') |
|
3298 | yield (rest, '') | |
3299 | break |
|
3299 | break | |
3300 | mstart, mend = match.span() |
|
3300 | mstart, mend = match.span() | |
3301 | yield (rest[:mstart], '') |
|
3301 | yield (rest[:mstart], '') | |
3302 | yield (rest[mstart:mend], 'grep.match') |
|
3302 | yield (rest[mstart:mend], 'grep.match') | |
3303 | rest = rest[mend:] |
|
3303 | rest = rest[mend:] | |
3304 |
|
3304 | |||
3305 | matches = {} |
|
3305 | matches = {} | |
3306 | copies = {} |
|
3306 | copies = {} | |
3307 | def grepbody(fn, rev, body): |
|
3307 | def grepbody(fn, rev, body): | |
3308 | matches[rev].setdefault(fn, []) |
|
3308 | matches[rev].setdefault(fn, []) | |
3309 | m = matches[rev][fn] |
|
3309 | m = matches[rev][fn] | |
3310 | for lnum, cstart, cend, line in matchlines(body): |
|
3310 | for lnum, cstart, cend, line in matchlines(body): | |
3311 | s = linestate(line, lnum, cstart, cend) |
|
3311 | s = linestate(line, lnum, cstart, cend) | |
3312 | m.append(s) |
|
3312 | m.append(s) | |
3313 |
|
3313 | |||
3314 | def difflinestates(a, b): |
|
3314 | def difflinestates(a, b): | |
3315 | sm = difflib.SequenceMatcher(None, a, b) |
|
3315 | sm = difflib.SequenceMatcher(None, a, b) | |
3316 | for tag, alo, ahi, blo, bhi in sm.get_opcodes(): |
|
3316 | for tag, alo, ahi, blo, bhi in sm.get_opcodes(): | |
3317 | if tag == 'insert': |
|
3317 | if tag == 'insert': | |
3318 | for i in xrange(blo, bhi): |
|
3318 | for i in xrange(blo, bhi): | |
3319 | yield ('+', b[i]) |
|
3319 | yield ('+', b[i]) | |
3320 | elif tag == 'delete': |
|
3320 | elif tag == 'delete': | |
3321 | for i in xrange(alo, ahi): |
|
3321 | for i in xrange(alo, ahi): | |
3322 | yield ('-', a[i]) |
|
3322 | yield ('-', a[i]) | |
3323 | elif tag == 'replace': |
|
3323 | elif tag == 'replace': | |
3324 | for i in xrange(alo, ahi): |
|
3324 | for i in xrange(alo, ahi): | |
3325 | yield ('-', a[i]) |
|
3325 | yield ('-', a[i]) | |
3326 | for i in xrange(blo, bhi): |
|
3326 | for i in xrange(blo, bhi): | |
3327 | yield ('+', b[i]) |
|
3327 | yield ('+', b[i]) | |
3328 |
|
3328 | |||
3329 | def display(fn, ctx, pstates, states): |
|
3329 | def display(fn, ctx, pstates, states): | |
3330 | rev = ctx.rev() |
|
3330 | rev = ctx.rev() | |
3331 | datefunc = ui.quiet and util.shortdate or util.datestr |
|
3331 | datefunc = ui.quiet and util.shortdate or util.datestr | |
3332 | found = False |
|
3332 | found = False | |
3333 | @util.cachefunc |
|
3333 | @util.cachefunc | |
3334 | def binary(): |
|
3334 | def binary(): | |
3335 | flog = getfile(fn) |
|
3335 | flog = getfile(fn) | |
3336 | return util.binary(flog.read(ctx.filenode(fn))) |
|
3336 | return util.binary(flog.read(ctx.filenode(fn))) | |
3337 |
|
3337 | |||
3338 | if opts.get('all'): |
|
3338 | if opts.get('all'): | |
3339 | iter = difflinestates(pstates, states) |
|
3339 | iter = difflinestates(pstates, states) | |
3340 | else: |
|
3340 | else: | |
3341 | iter = [('', l) for l in states] |
|
3341 | iter = [('', l) for l in states] | |
3342 | for change, l in iter: |
|
3342 | for change, l in iter: | |
3343 | cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')] |
|
3343 | cols = [(fn, 'grep.filename'), (str(rev), 'grep.rev')] | |
3344 |
|
3344 | |||
3345 | if opts.get('line_number'): |
|
3345 | if opts.get('line_number'): | |
3346 | cols.append((str(l.linenum), 'grep.linenumber')) |
|
3346 | cols.append((str(l.linenum), 'grep.linenumber')) | |
3347 | if opts.get('all'): |
|
3347 | if opts.get('all'): | |
3348 | cols.append((change, 'grep.change')) |
|
3348 | cols.append((change, 'grep.change')) | |
3349 | if opts.get('user'): |
|
3349 | if opts.get('user'): | |
3350 | cols.append((ui.shortuser(ctx.user()), 'grep.user')) |
|
3350 | cols.append((ui.shortuser(ctx.user()), 'grep.user')) | |
3351 | if opts.get('date'): |
|
3351 | if opts.get('date'): | |
3352 | cols.append((datefunc(ctx.date()), 'grep.date')) |
|
3352 | cols.append((datefunc(ctx.date()), 'grep.date')) | |
3353 | for col, label in cols[:-1]: |
|
3353 | for col, label in cols[:-1]: | |
3354 | ui.write(col, label=label) |
|
3354 | ui.write(col, label=label) | |
3355 | ui.write(sep, label='grep.sep') |
|
3355 | ui.write(sep, label='grep.sep') | |
3356 | ui.write(cols[-1][0], label=cols[-1][1]) |
|
3356 | ui.write(cols[-1][0], label=cols[-1][1]) | |
3357 | if not opts.get('files_with_matches'): |
|
3357 | if not opts.get('files_with_matches'): | |
3358 | ui.write(sep, label='grep.sep') |
|
3358 | ui.write(sep, label='grep.sep') | |
3359 | if not opts.get('text') and binary(): |
|
3359 | if not opts.get('text') and binary(): | |
3360 | ui.write(" Binary file matches") |
|
3360 | ui.write(" Binary file matches") | |
3361 | else: |
|
3361 | else: | |
3362 | for s, label in l: |
|
3362 | for s, label in l: | |
3363 | ui.write(s, label=label) |
|
3363 | ui.write(s, label=label) | |
3364 | ui.write(eol) |
|
3364 | ui.write(eol) | |
3365 | found = True |
|
3365 | found = True | |
3366 | if opts.get('files_with_matches'): |
|
3366 | if opts.get('files_with_matches'): | |
3367 | break |
|
3367 | break | |
3368 | return found |
|
3368 | return found | |
3369 |
|
3369 | |||
3370 | skip = {} |
|
3370 | skip = {} | |
3371 | revfiles = {} |
|
3371 | revfiles = {} | |
3372 | matchfn = scmutil.match(repo[None], pats, opts) |
|
3372 | matchfn = scmutil.match(repo[None], pats, opts) | |
3373 | found = False |
|
3373 | found = False | |
3374 | follow = opts.get('follow') |
|
3374 | follow = opts.get('follow') | |
3375 |
|
3375 | |||
3376 | def prep(ctx, fns): |
|
3376 | def prep(ctx, fns): | |
3377 | rev = ctx.rev() |
|
3377 | rev = ctx.rev() | |
3378 | pctx = ctx.p1() |
|
3378 | pctx = ctx.p1() | |
3379 | parent = pctx.rev() |
|
3379 | parent = pctx.rev() | |
3380 | matches.setdefault(rev, {}) |
|
3380 | matches.setdefault(rev, {}) | |
3381 | matches.setdefault(parent, {}) |
|
3381 | matches.setdefault(parent, {}) | |
3382 | files = revfiles.setdefault(rev, []) |
|
3382 | files = revfiles.setdefault(rev, []) | |
3383 | for fn in fns: |
|
3383 | for fn in fns: | |
3384 | flog = getfile(fn) |
|
3384 | flog = getfile(fn) | |
3385 | try: |
|
3385 | try: | |
3386 | fnode = ctx.filenode(fn) |
|
3386 | fnode = ctx.filenode(fn) | |
3387 | except error.LookupError: |
|
3387 | except error.LookupError: | |
3388 | continue |
|
3388 | continue | |
3389 |
|
3389 | |||
3390 | copied = flog.renamed(fnode) |
|
3390 | copied = flog.renamed(fnode) | |
3391 | copy = follow and copied and copied[0] |
|
3391 | copy = follow and copied and copied[0] | |
3392 | if copy: |
|
3392 | if copy: | |
3393 | copies.setdefault(rev, {})[fn] = copy |
|
3393 | copies.setdefault(rev, {})[fn] = copy | |
3394 | if fn in skip: |
|
3394 | if fn in skip: | |
3395 | if copy: |
|
3395 | if copy: | |
3396 | skip[copy] = True |
|
3396 | skip[copy] = True | |
3397 | continue |
|
3397 | continue | |
3398 | files.append(fn) |
|
3398 | files.append(fn) | |
3399 |
|
3399 | |||
3400 | if fn not in matches[rev]: |
|
3400 | if fn not in matches[rev]: | |
3401 | grepbody(fn, rev, flog.read(fnode)) |
|
3401 | grepbody(fn, rev, flog.read(fnode)) | |
3402 |
|
3402 | |||
3403 | pfn = copy or fn |
|
3403 | pfn = copy or fn | |
3404 | if pfn not in matches[parent]: |
|
3404 | if pfn not in matches[parent]: | |
3405 | try: |
|
3405 | try: | |
3406 | fnode = pctx.filenode(pfn) |
|
3406 | fnode = pctx.filenode(pfn) | |
3407 | grepbody(pfn, parent, flog.read(fnode)) |
|
3407 | grepbody(pfn, parent, flog.read(fnode)) | |
3408 | except error.LookupError: |
|
3408 | except error.LookupError: | |
3409 | pass |
|
3409 | pass | |
3410 |
|
3410 | |||
3411 | for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep): |
|
3411 | for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep): | |
3412 | rev = ctx.rev() |
|
3412 | rev = ctx.rev() | |
3413 | parent = ctx.p1().rev() |
|
3413 | parent = ctx.p1().rev() | |
3414 | for fn in sorted(revfiles.get(rev, [])): |
|
3414 | for fn in sorted(revfiles.get(rev, [])): | |
3415 | states = matches[rev][fn] |
|
3415 | states = matches[rev][fn] | |
3416 | copy = copies.get(rev, {}).get(fn) |
|
3416 | copy = copies.get(rev, {}).get(fn) | |
3417 | if fn in skip: |
|
3417 | if fn in skip: | |
3418 | if copy: |
|
3418 | if copy: | |
3419 | skip[copy] = True |
|
3419 | skip[copy] = True | |
3420 | continue |
|
3420 | continue | |
3421 | pstates = matches.get(parent, {}).get(copy or fn, []) |
|
3421 | pstates = matches.get(parent, {}).get(copy or fn, []) | |
3422 | if pstates or states: |
|
3422 | if pstates or states: | |
3423 | r = display(fn, ctx, pstates, states) |
|
3423 | r = display(fn, ctx, pstates, states) | |
3424 | found = found or r |
|
3424 | found = found or r | |
3425 | if r and not opts.get('all'): |
|
3425 | if r and not opts.get('all'): | |
3426 | skip[fn] = True |
|
3426 | skip[fn] = True | |
3427 | if copy: |
|
3427 | if copy: | |
3428 | skip[copy] = True |
|
3428 | skip[copy] = True | |
3429 | del matches[rev] |
|
3429 | del matches[rev] | |
3430 | del revfiles[rev] |
|
3430 | del revfiles[rev] | |
3431 |
|
3431 | |||
3432 | return not found |
|
3432 | return not found | |
3433 |
|
3433 | |||
3434 | @command('heads', |
|
3434 | @command('heads', | |
3435 | [('r', 'rev', '', |
|
3435 | [('r', 'rev', '', | |
3436 | _('show only heads which are descendants of STARTREV'), _('STARTREV')), |
|
3436 | _('show only heads which are descendants of STARTREV'), _('STARTREV')), | |
3437 | ('t', 'topo', False, _('show topological heads only')), |
|
3437 | ('t', 'topo', False, _('show topological heads only')), | |
3438 | ('a', 'active', False, _('show active branchheads only (DEPRECATED)')), |
|
3438 | ('a', 'active', False, _('show active branchheads only (DEPRECATED)')), | |
3439 | ('c', 'closed', False, _('show normal and closed branch heads')), |
|
3439 | ('c', 'closed', False, _('show normal and closed branch heads')), | |
3440 | ] + templateopts, |
|
3440 | ] + templateopts, | |
3441 | _('[-ct] [-r STARTREV] [REV]...')) |
|
3441 | _('[-ct] [-r STARTREV] [REV]...')) | |
3442 | def heads(ui, repo, *branchrevs, **opts): |
|
3442 | def heads(ui, repo, *branchrevs, **opts): | |
3443 | """show branch heads |
|
3443 | """show branch heads | |
3444 |
|
3444 | |||
3445 | With no arguments, show all open branch heads in the repository. |
|
3445 | With no arguments, show all open branch heads in the repository. | |
3446 | Branch heads are changesets that have no descendants on the |
|
3446 | Branch heads are changesets that have no descendants on the | |
3447 | same branch. They are where development generally takes place and |
|
3447 | same branch. They are where development generally takes place and | |
3448 | are the usual targets for update and merge operations. |
|
3448 | are the usual targets for update and merge operations. | |
3449 |
|
3449 | |||
3450 | If one or more REVs are given, only open branch heads on the |
|
3450 | If one or more REVs are given, only open branch heads on the | |
3451 | branches associated with the specified changesets are shown. This |
|
3451 | branches associated with the specified changesets are shown. This | |
3452 | means that you can use :hg:`heads .` to see the heads on the |
|
3452 | means that you can use :hg:`heads .` to see the heads on the | |
3453 | currently checked-out branch. |
|
3453 | currently checked-out branch. | |
3454 |
|
3454 | |||
3455 | If -c/--closed is specified, also show branch heads marked closed |
|
3455 | If -c/--closed is specified, also show branch heads marked closed | |
3456 | (see :hg:`commit --close-branch`). |
|
3456 | (see :hg:`commit --close-branch`). | |
3457 |
|
3457 | |||
3458 | If STARTREV is specified, only those heads that are descendants of |
|
3458 | If STARTREV is specified, only those heads that are descendants of | |
3459 | STARTREV will be displayed. |
|
3459 | STARTREV will be displayed. | |
3460 |
|
3460 | |||
3461 | If -t/--topo is specified, named branch mechanics will be ignored and only |
|
3461 | If -t/--topo is specified, named branch mechanics will be ignored and only | |
3462 | topological heads (changesets with no children) will be shown. |
|
3462 | topological heads (changesets with no children) will be shown. | |
3463 |
|
3463 | |||
3464 | Returns 0 if matching heads are found, 1 if not. |
|
3464 | Returns 0 if matching heads are found, 1 if not. | |
3465 | """ |
|
3465 | """ | |
3466 |
|
3466 | |||
3467 | start = None |
|
3467 | start = None | |
3468 | if 'rev' in opts: |
|
3468 | if 'rev' in opts: | |
3469 | start = scmutil.revsingle(repo, opts['rev'], None).node() |
|
3469 | start = scmutil.revsingle(repo, opts['rev'], None).node() | |
3470 |
|
3470 | |||
3471 | if opts.get('topo'): |
|
3471 | if opts.get('topo'): | |
3472 | heads = [repo[h] for h in repo.heads(start)] |
|
3472 | heads = [repo[h] for h in repo.heads(start)] | |
3473 | else: |
|
3473 | else: | |
3474 | heads = [] |
|
3474 | heads = [] | |
3475 | for branch in repo.branchmap(): |
|
3475 | for branch in repo.branchmap(): | |
3476 | heads += repo.branchheads(branch, start, opts.get('closed')) |
|
3476 | heads += repo.branchheads(branch, start, opts.get('closed')) | |
3477 | heads = [repo[h] for h in heads] |
|
3477 | heads = [repo[h] for h in heads] | |
3478 |
|
3478 | |||
3479 | if branchrevs: |
|
3479 | if branchrevs: | |
3480 | branches = set(repo[br].branch() for br in branchrevs) |
|
3480 | branches = set(repo[br].branch() for br in branchrevs) | |
3481 | heads = [h for h in heads if h.branch() in branches] |
|
3481 | heads = [h for h in heads if h.branch() in branches] | |
3482 |
|
3482 | |||
3483 | if opts.get('active') and branchrevs: |
|
3483 | if opts.get('active') and branchrevs: | |
3484 | dagheads = repo.heads(start) |
|
3484 | dagheads = repo.heads(start) | |
3485 | heads = [h for h in heads if h.node() in dagheads] |
|
3485 | heads = [h for h in heads if h.node() in dagheads] | |
3486 |
|
3486 | |||
3487 | if branchrevs: |
|
3487 | if branchrevs: | |
3488 | haveheads = set(h.branch() for h in heads) |
|
3488 | haveheads = set(h.branch() for h in heads) | |
3489 | if branches - haveheads: |
|
3489 | if branches - haveheads: | |
3490 | headless = ', '.join(b for b in branches - haveheads) |
|
3490 | headless = ', '.join(b for b in branches - haveheads) | |
3491 | msg = _('no open branch heads found on branches %s') |
|
3491 | msg = _('no open branch heads found on branches %s') | |
3492 | if opts.get('rev'): |
|
3492 | if opts.get('rev'): | |
3493 | msg += _(' (started at %s)') % opts['rev'] |
|
3493 | msg += _(' (started at %s)') % opts['rev'] | |
3494 | ui.warn((msg + '\n') % headless) |
|
3494 | ui.warn((msg + '\n') % headless) | |
3495 |
|
3495 | |||
3496 | if not heads: |
|
3496 | if not heads: | |
3497 | return 1 |
|
3497 | return 1 | |
3498 |
|
3498 | |||
3499 | heads = sorted(heads, key=lambda x: -x.rev()) |
|
3499 | heads = sorted(heads, key=lambda x: -x.rev()) | |
3500 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
3500 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
3501 | for ctx in heads: |
|
3501 | for ctx in heads: | |
3502 | displayer.show(ctx) |
|
3502 | displayer.show(ctx) | |
3503 | displayer.close() |
|
3503 | displayer.close() | |
3504 |
|
3504 | |||
3505 | @command('help', |
|
3505 | @command('help', | |
3506 | [('e', 'extension', None, _('show only help for extensions')), |
|
3506 | [('e', 'extension', None, _('show only help for extensions')), | |
3507 | ('c', 'command', None, _('show only help for commands')), |
|
3507 | ('c', 'command', None, _('show only help for commands')), | |
3508 | ('k', 'keyword', '', _('show topics matching keyword')), |
|
3508 | ('k', 'keyword', '', _('show topics matching keyword')), | |
3509 | ], |
|
3509 | ], | |
3510 | _('[-ec] [TOPIC]')) |
|
3510 | _('[-ec] [TOPIC]')) | |
3511 | def help_(ui, name=None, **opts): |
|
3511 | def help_(ui, name=None, **opts): | |
3512 | """show help for a given topic or a help overview |
|
3512 | """show help for a given topic or a help overview | |
3513 |
|
3513 | |||
3514 | With no arguments, print a list of commands with short help messages. |
|
3514 | With no arguments, print a list of commands with short help messages. | |
3515 |
|
3515 | |||
3516 | Given a topic, extension, or command name, print help for that |
|
3516 | Given a topic, extension, or command name, print help for that | |
3517 | topic. |
|
3517 | topic. | |
3518 |
|
3518 | |||
3519 | Returns 0 if successful. |
|
3519 | Returns 0 if successful. | |
3520 | """ |
|
3520 | """ | |
3521 |
|
3521 | |||
3522 | textwidth = min(ui.termwidth(), 80) - 2 |
|
3522 | textwidth = min(ui.termwidth(), 80) - 2 | |
3523 |
|
3523 | |||
3524 | keep = ui.verbose and ['verbose'] or [] |
|
3524 | keep = ui.verbose and ['verbose'] or [] | |
3525 | text = help.help_(ui, name, **opts) |
|
3525 | text = help.help_(ui, name, **opts) | |
3526 |
|
3526 | |||
3527 | formatted, pruned = minirst.format(text, textwidth, keep=keep) |
|
3527 | formatted, pruned = minirst.format(text, textwidth, keep=keep) | |
3528 | if 'verbose' in pruned: |
|
3528 | if 'verbose' in pruned: | |
3529 | keep.append('omitted') |
|
3529 | keep.append('omitted') | |
3530 | else: |
|
3530 | else: | |
3531 | keep.append('notomitted') |
|
3531 | keep.append('notomitted') | |
3532 | formatted, pruned = minirst.format(text, textwidth, keep=keep) |
|
3532 | formatted, pruned = minirst.format(text, textwidth, keep=keep) | |
3533 | ui.write(formatted) |
|
3533 | ui.write(formatted) | |
3534 |
|
3534 | |||
3535 |
|
3535 | |||
3536 | @command('identify|id', |
|
3536 | @command('identify|id', | |
3537 | [('r', 'rev', '', |
|
3537 | [('r', 'rev', '', | |
3538 | _('identify the specified revision'), _('REV')), |
|
3538 | _('identify the specified revision'), _('REV')), | |
3539 | ('n', 'num', None, _('show local revision number')), |
|
3539 | ('n', 'num', None, _('show local revision number')), | |
3540 | ('i', 'id', None, _('show global revision id')), |
|
3540 | ('i', 'id', None, _('show global revision id')), | |
3541 | ('b', 'branch', None, _('show branch')), |
|
3541 | ('b', 'branch', None, _('show branch')), | |
3542 | ('t', 'tags', None, _('show tags')), |
|
3542 | ('t', 'tags', None, _('show tags')), | |
3543 | ('B', 'bookmarks', None, _('show bookmarks')), |
|
3543 | ('B', 'bookmarks', None, _('show bookmarks')), | |
3544 | ] + remoteopts, |
|
3544 | ] + remoteopts, | |
3545 | _('[-nibtB] [-r REV] [SOURCE]')) |
|
3545 | _('[-nibtB] [-r REV] [SOURCE]')) | |
3546 | def identify(ui, repo, source=None, rev=None, |
|
3546 | def identify(ui, repo, source=None, rev=None, | |
3547 | num=None, id=None, branch=None, tags=None, bookmarks=None, **opts): |
|
3547 | num=None, id=None, branch=None, tags=None, bookmarks=None, **opts): | |
3548 | """identify the working copy or specified revision |
|
3548 | """identify the working copy or specified revision | |
3549 |
|
3549 | |||
3550 | Print a summary identifying the repository state at REV using one or |
|
3550 | Print a summary identifying the repository state at REV using one or | |
3551 | two parent hash identifiers, followed by a "+" if the working |
|
3551 | two parent hash identifiers, followed by a "+" if the working | |
3552 | directory has uncommitted changes, the branch name (if not default), |
|
3552 | directory has uncommitted changes, the branch name (if not default), | |
3553 | a list of tags, and a list of bookmarks. |
|
3553 | a list of tags, and a list of bookmarks. | |
3554 |
|
3554 | |||
3555 | When REV is not given, print a summary of the current state of the |
|
3555 | When REV is not given, print a summary of the current state of the | |
3556 | repository. |
|
3556 | repository. | |
3557 |
|
3557 | |||
3558 | Specifying a path to a repository root or Mercurial bundle will |
|
3558 | Specifying a path to a repository root or Mercurial bundle will | |
3559 | cause lookup to operate on that repository/bundle. |
|
3559 | cause lookup to operate on that repository/bundle. | |
3560 |
|
3560 | |||
3561 | .. container:: verbose |
|
3561 | .. container:: verbose | |
3562 |
|
3562 | |||
3563 | Examples: |
|
3563 | Examples: | |
3564 |
|
3564 | |||
3565 | - generate a build identifier for the working directory:: |
|
3565 | - generate a build identifier for the working directory:: | |
3566 |
|
3566 | |||
3567 | hg id --id > build-id.dat |
|
3567 | hg id --id > build-id.dat | |
3568 |
|
3568 | |||
3569 | - find the revision corresponding to a tag:: |
|
3569 | - find the revision corresponding to a tag:: | |
3570 |
|
3570 | |||
3571 | hg id -n -r 1.3 |
|
3571 | hg id -n -r 1.3 | |
3572 |
|
3572 | |||
3573 | - check the most recent revision of a remote repository:: |
|
3573 | - check the most recent revision of a remote repository:: | |
3574 |
|
3574 | |||
3575 | hg id -r tip http://selenic.com/hg/ |
|
3575 | hg id -r tip http://selenic.com/hg/ | |
3576 |
|
3576 | |||
3577 | Returns 0 if successful. |
|
3577 | Returns 0 if successful. | |
3578 | """ |
|
3578 | """ | |
3579 |
|
3579 | |||
3580 | if not repo and not source: |
|
3580 | if not repo and not source: | |
3581 | raise util.Abort(_("there is no Mercurial repository here " |
|
3581 | raise util.Abort(_("there is no Mercurial repository here " | |
3582 | "(.hg not found)")) |
|
3582 | "(.hg not found)")) | |
3583 |
|
3583 | |||
3584 | hexfunc = ui.debugflag and hex or short |
|
3584 | hexfunc = ui.debugflag and hex or short | |
3585 | default = not (num or id or branch or tags or bookmarks) |
|
3585 | default = not (num or id or branch or tags or bookmarks) | |
3586 | output = [] |
|
3586 | output = [] | |
3587 | revs = [] |
|
3587 | revs = [] | |
3588 |
|
3588 | |||
3589 | if source: |
|
3589 | if source: | |
3590 | source, branches = hg.parseurl(ui.expandpath(source)) |
|
3590 | source, branches = hg.parseurl(ui.expandpath(source)) | |
3591 | peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo |
|
3591 | peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo | |
3592 | repo = peer.local() |
|
3592 | repo = peer.local() | |
3593 | revs, checkout = hg.addbranchrevs(repo, peer, branches, None) |
|
3593 | revs, checkout = hg.addbranchrevs(repo, peer, branches, None) | |
3594 |
|
3594 | |||
3595 | if not repo: |
|
3595 | if not repo: | |
3596 | if num or branch or tags: |
|
3596 | if num or branch or tags: | |
3597 | raise util.Abort( |
|
3597 | raise util.Abort( | |
3598 | _("can't query remote revision number, branch, or tags")) |
|
3598 | _("can't query remote revision number, branch, or tags")) | |
3599 | if not rev and revs: |
|
3599 | if not rev and revs: | |
3600 | rev = revs[0] |
|
3600 | rev = revs[0] | |
3601 | if not rev: |
|
3601 | if not rev: | |
3602 | rev = "tip" |
|
3602 | rev = "tip" | |
3603 |
|
3603 | |||
3604 | remoterev = peer.lookup(rev) |
|
3604 | remoterev = peer.lookup(rev) | |
3605 | if default or id: |
|
3605 | if default or id: | |
3606 | output = [hexfunc(remoterev)] |
|
3606 | output = [hexfunc(remoterev)] | |
3607 |
|
3607 | |||
3608 | def getbms(): |
|
3608 | def getbms(): | |
3609 | bms = [] |
|
3609 | bms = [] | |
3610 |
|
3610 | |||
3611 | if 'bookmarks' in peer.listkeys('namespaces'): |
|
3611 | if 'bookmarks' in peer.listkeys('namespaces'): | |
3612 | hexremoterev = hex(remoterev) |
|
3612 | hexremoterev = hex(remoterev) | |
3613 | bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems() |
|
3613 | bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems() | |
3614 | if bmr == hexremoterev] |
|
3614 | if bmr == hexremoterev] | |
3615 |
|
3615 | |||
3616 | return sorted(bms) |
|
3616 | return sorted(bms) | |
3617 |
|
3617 | |||
3618 | if bookmarks: |
|
3618 | if bookmarks: | |
3619 | output.extend(getbms()) |
|
3619 | output.extend(getbms()) | |
3620 | elif default and not ui.quiet: |
|
3620 | elif default and not ui.quiet: | |
3621 | # multiple bookmarks for a single parent separated by '/' |
|
3621 | # multiple bookmarks for a single parent separated by '/' | |
3622 | bm = '/'.join(getbms()) |
|
3622 | bm = '/'.join(getbms()) | |
3623 | if bm: |
|
3623 | if bm: | |
3624 | output.append(bm) |
|
3624 | output.append(bm) | |
3625 | else: |
|
3625 | else: | |
3626 | if not rev: |
|
3626 | if not rev: | |
3627 | ctx = repo[None] |
|
3627 | ctx = repo[None] | |
3628 | parents = ctx.parents() |
|
3628 | parents = ctx.parents() | |
3629 | changed = "" |
|
3629 | changed = "" | |
3630 | if default or id or num: |
|
3630 | if default or id or num: | |
3631 | if (util.any(repo.status()) |
|
3631 | if (util.any(repo.status()) | |
3632 | or util.any(ctx.sub(s).dirty() for s in ctx.substate)): |
|
3632 | or util.any(ctx.sub(s).dirty() for s in ctx.substate)): | |
3633 | changed = '+' |
|
3633 | changed = '+' | |
3634 | if default or id: |
|
3634 | if default or id: | |
3635 | output = ["%s%s" % |
|
3635 | output = ["%s%s" % | |
3636 | ('+'.join([hexfunc(p.node()) for p in parents]), changed)] |
|
3636 | ('+'.join([hexfunc(p.node()) for p in parents]), changed)] | |
3637 | if num: |
|
3637 | if num: | |
3638 | output.append("%s%s" % |
|
3638 | output.append("%s%s" % | |
3639 | ('+'.join([str(p.rev()) for p in parents]), changed)) |
|
3639 | ('+'.join([str(p.rev()) for p in parents]), changed)) | |
3640 | else: |
|
3640 | else: | |
3641 | ctx = scmutil.revsingle(repo, rev) |
|
3641 | ctx = scmutil.revsingle(repo, rev) | |
3642 | if default or id: |
|
3642 | if default or id: | |
3643 | output = [hexfunc(ctx.node())] |
|
3643 | output = [hexfunc(ctx.node())] | |
3644 | if num: |
|
3644 | if num: | |
3645 | output.append(str(ctx.rev())) |
|
3645 | output.append(str(ctx.rev())) | |
3646 |
|
3646 | |||
3647 | if default and not ui.quiet: |
|
3647 | if default and not ui.quiet: | |
3648 | b = ctx.branch() |
|
3648 | b = ctx.branch() | |
3649 | if b != 'default': |
|
3649 | if b != 'default': | |
3650 | output.append("(%s)" % b) |
|
3650 | output.append("(%s)" % b) | |
3651 |
|
3651 | |||
3652 | # multiple tags for a single parent separated by '/' |
|
3652 | # multiple tags for a single parent separated by '/' | |
3653 | t = '/'.join(ctx.tags()) |
|
3653 | t = '/'.join(ctx.tags()) | |
3654 | if t: |
|
3654 | if t: | |
3655 | output.append(t) |
|
3655 | output.append(t) | |
3656 |
|
3656 | |||
3657 | # multiple bookmarks for a single parent separated by '/' |
|
3657 | # multiple bookmarks for a single parent separated by '/' | |
3658 | bm = '/'.join(ctx.bookmarks()) |
|
3658 | bm = '/'.join(ctx.bookmarks()) | |
3659 | if bm: |
|
3659 | if bm: | |
3660 | output.append(bm) |
|
3660 | output.append(bm) | |
3661 | else: |
|
3661 | else: | |
3662 | if branch: |
|
3662 | if branch: | |
3663 | output.append(ctx.branch()) |
|
3663 | output.append(ctx.branch()) | |
3664 |
|
3664 | |||
3665 | if tags: |
|
3665 | if tags: | |
3666 | output.extend(ctx.tags()) |
|
3666 | output.extend(ctx.tags()) | |
3667 |
|
3667 | |||
3668 | if bookmarks: |
|
3668 | if bookmarks: | |
3669 | output.extend(ctx.bookmarks()) |
|
3669 | output.extend(ctx.bookmarks()) | |
3670 |
|
3670 | |||
3671 | ui.write("%s\n" % ' '.join(output)) |
|
3671 | ui.write("%s\n" % ' '.join(output)) | |
3672 |
|
3672 | |||
3673 | @command('import|patch', |
|
3673 | @command('import|patch', | |
3674 | [('p', 'strip', 1, |
|
3674 | [('p', 'strip', 1, | |
3675 | _('directory strip option for patch. This has the same ' |
|
3675 | _('directory strip option for patch. This has the same ' | |
3676 | 'meaning as the corresponding patch option'), _('NUM')), |
|
3676 | 'meaning as the corresponding patch option'), _('NUM')), | |
3677 | ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')), |
|
3677 | ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')), | |
3678 | ('e', 'edit', False, _('invoke editor on commit messages')), |
|
3678 | ('e', 'edit', False, _('invoke editor on commit messages')), | |
3679 | ('f', 'force', None, |
|
3679 | ('f', 'force', None, | |
3680 | _('skip check for outstanding uncommitted changes (DEPRECATED)')), |
|
3680 | _('skip check for outstanding uncommitted changes (DEPRECATED)')), | |
3681 | ('', 'no-commit', None, |
|
3681 | ('', 'no-commit', None, | |
3682 | _("don't commit, just update the working directory")), |
|
3682 | _("don't commit, just update the working directory")), | |
3683 | ('', 'bypass', None, |
|
3683 | ('', 'bypass', None, | |
3684 | _("apply patch without touching the working directory")), |
|
3684 | _("apply patch without touching the working directory")), | |
3685 | ('', 'exact', None, |
|
3685 | ('', 'exact', None, | |
3686 | _('apply patch to the nodes from which it was generated')), |
|
3686 | _('apply patch to the nodes from which it was generated')), | |
3687 | ('', 'import-branch', None, |
|
3687 | ('', 'import-branch', None, | |
3688 | _('use any branch information in patch (implied by --exact)'))] + |
|
3688 | _('use any branch information in patch (implied by --exact)'))] + | |
3689 | commitopts + commitopts2 + similarityopts, |
|
3689 | commitopts + commitopts2 + similarityopts, | |
3690 | _('[OPTION]... PATCH...')) |
|
3690 | _('[OPTION]... PATCH...')) | |
3691 | def import_(ui, repo, patch1=None, *patches, **opts): |
|
3691 | def import_(ui, repo, patch1=None, *patches, **opts): | |
3692 | """import an ordered set of patches |
|
3692 | """import an ordered set of patches | |
3693 |
|
3693 | |||
3694 | Import a list of patches and commit them individually (unless |
|
3694 | Import a list of patches and commit them individually (unless | |
3695 | --no-commit is specified). |
|
3695 | --no-commit is specified). | |
3696 |
|
3696 | |||
3697 | Because import first applies changes to the working directory, |
|
3697 | Because import first applies changes to the working directory, | |
3698 | import will abort if there are outstanding changes. |
|
3698 | import will abort if there are outstanding changes. | |
3699 |
|
3699 | |||
3700 | You can import a patch straight from a mail message. Even patches |
|
3700 | You can import a patch straight from a mail message. Even patches | |
3701 | as attachments work (to use the body part, it must have type |
|
3701 | as attachments work (to use the body part, it must have type | |
3702 | text/plain or text/x-patch). From and Subject headers of email |
|
3702 | text/plain or text/x-patch). From and Subject headers of email | |
3703 | message are used as default committer and commit message. All |
|
3703 | message are used as default committer and commit message. All | |
3704 | text/plain body parts before first diff are added to commit |
|
3704 | text/plain body parts before first diff are added to commit | |
3705 | message. |
|
3705 | message. | |
3706 |
|
3706 | |||
3707 | If the imported patch was generated by :hg:`export`, user and |
|
3707 | If the imported patch was generated by :hg:`export`, user and | |
3708 | description from patch override values from message headers and |
|
3708 | description from patch override values from message headers and | |
3709 | body. Values given on command line with -m/--message and -u/--user |
|
3709 | body. Values given on command line with -m/--message and -u/--user | |
3710 | override these. |
|
3710 | override these. | |
3711 |
|
3711 | |||
3712 | If --exact is specified, import will set the working directory to |
|
3712 | If --exact is specified, import will set the working directory to | |
3713 | the parent of each patch before applying it, and will abort if the |
|
3713 | the parent of each patch before applying it, and will abort if the | |
3714 | resulting changeset has a different ID than the one recorded in |
|
3714 | resulting changeset has a different ID than the one recorded in | |
3715 | the patch. This may happen due to character set problems or other |
|
3715 | the patch. This may happen due to character set problems or other | |
3716 | deficiencies in the text patch format. |
|
3716 | deficiencies in the text patch format. | |
3717 |
|
3717 | |||
3718 | Use --bypass to apply and commit patches directly to the |
|
3718 | Use --bypass to apply and commit patches directly to the | |
3719 | repository, not touching the working directory. Without --exact, |
|
3719 | repository, not touching the working directory. Without --exact, | |
3720 | patches will be applied on top of the working directory parent |
|
3720 | patches will be applied on top of the working directory parent | |
3721 | revision. |
|
3721 | revision. | |
3722 |
|
3722 | |||
3723 | With -s/--similarity, hg will attempt to discover renames and |
|
3723 | With -s/--similarity, hg will attempt to discover renames and | |
3724 | copies in the patch in the same way as :hg:`addremove`. |
|
3724 | copies in the patch in the same way as :hg:`addremove`. | |
3725 |
|
3725 | |||
3726 | To read a patch from standard input, use "-" as the patch name. If |
|
3726 | To read a patch from standard input, use "-" as the patch name. If | |
3727 | a URL is specified, the patch will be downloaded from it. |
|
3727 | a URL is specified, the patch will be downloaded from it. | |
3728 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
3728 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
3729 |
|
3729 | |||
3730 | .. container:: verbose |
|
3730 | .. container:: verbose | |
3731 |
|
3731 | |||
3732 | Examples: |
|
3732 | Examples: | |
3733 |
|
3733 | |||
3734 | - import a traditional patch from a website and detect renames:: |
|
3734 | - import a traditional patch from a website and detect renames:: | |
3735 |
|
3735 | |||
3736 | hg import -s 80 http://example.com/bugfix.patch |
|
3736 | hg import -s 80 http://example.com/bugfix.patch | |
3737 |
|
3737 | |||
3738 | - import a changeset from an hgweb server:: |
|
3738 | - import a changeset from an hgweb server:: | |
3739 |
|
3739 | |||
3740 | hg import http://www.selenic.com/hg/rev/5ca8c111e9aa |
|
3740 | hg import http://www.selenic.com/hg/rev/5ca8c111e9aa | |
3741 |
|
3741 | |||
3742 | - import all the patches in an Unix-style mbox:: |
|
3742 | - import all the patches in an Unix-style mbox:: | |
3743 |
|
3743 | |||
3744 | hg import incoming-patches.mbox |
|
3744 | hg import incoming-patches.mbox | |
3745 |
|
3745 | |||
3746 | - attempt to exactly restore an exported changeset (not always |
|
3746 | - attempt to exactly restore an exported changeset (not always | |
3747 | possible):: |
|
3747 | possible):: | |
3748 |
|
3748 | |||
3749 | hg import --exact proposed-fix.patch |
|
3749 | hg import --exact proposed-fix.patch | |
3750 |
|
3750 | |||
3751 | Returns 0 on success. |
|
3751 | Returns 0 on success. | |
3752 | """ |
|
3752 | """ | |
3753 |
|
3753 | |||
3754 | if not patch1: |
|
3754 | if not patch1: | |
3755 | raise util.Abort(_('need at least one patch to import')) |
|
3755 | raise util.Abort(_('need at least one patch to import')) | |
3756 |
|
3756 | |||
3757 | patches = (patch1,) + patches |
|
3757 | patches = (patch1,) + patches | |
3758 |
|
3758 | |||
3759 | date = opts.get('date') |
|
3759 | date = opts.get('date') | |
3760 | if date: |
|
3760 | if date: | |
3761 | opts['date'] = util.parsedate(date) |
|
3761 | opts['date'] = util.parsedate(date) | |
3762 |
|
3762 | |||
3763 | update = not opts.get('bypass') |
|
3763 | update = not opts.get('bypass') | |
3764 | if not update and opts.get('no_commit'): |
|
3764 | if not update and opts.get('no_commit'): | |
3765 | raise util.Abort(_('cannot use --no-commit with --bypass')) |
|
3765 | raise util.Abort(_('cannot use --no-commit with --bypass')) | |
3766 | try: |
|
3766 | try: | |
3767 | sim = float(opts.get('similarity') or 0) |
|
3767 | sim = float(opts.get('similarity') or 0) | |
3768 | except ValueError: |
|
3768 | except ValueError: | |
3769 | raise util.Abort(_('similarity must be a number')) |
|
3769 | raise util.Abort(_('similarity must be a number')) | |
3770 | if sim < 0 or sim > 100: |
|
3770 | if sim < 0 or sim > 100: | |
3771 | raise util.Abort(_('similarity must be between 0 and 100')) |
|
3771 | raise util.Abort(_('similarity must be between 0 and 100')) | |
3772 | if sim and not update: |
|
3772 | if sim and not update: | |
3773 | raise util.Abort(_('cannot use --similarity with --bypass')) |
|
3773 | raise util.Abort(_('cannot use --similarity with --bypass')) | |
3774 |
|
3774 | |||
3775 | if update: |
|
3775 | if update: | |
3776 | cmdutil.checkunfinished(repo) |
|
3776 | cmdutil.checkunfinished(repo) | |
3777 | if (opts.get('exact') or not opts.get('force')) and update: |
|
3777 | if (opts.get('exact') or not opts.get('force')) and update: | |
3778 | cmdutil.bailifchanged(repo) |
|
3778 | cmdutil.bailifchanged(repo) | |
3779 |
|
3779 | |||
3780 | base = opts["base"] |
|
3780 | base = opts["base"] | |
3781 | wlock = lock = tr = None |
|
3781 | wlock = lock = tr = None | |
3782 | msgs = [] |
|
3782 | msgs = [] | |
3783 |
|
3783 | |||
3784 |
|
3784 | |||
3785 | try: |
|
3785 | try: | |
3786 | try: |
|
3786 | try: | |
3787 | wlock = repo.wlock() |
|
3787 | wlock = repo.wlock() | |
3788 | if not opts.get('no_commit'): |
|
3788 | if not opts.get('no_commit'): | |
3789 | lock = repo.lock() |
|
3789 | lock = repo.lock() | |
3790 | tr = repo.transaction('import') |
|
3790 | tr = repo.transaction('import') | |
3791 | parents = repo.parents() |
|
3791 | parents = repo.parents() | |
3792 | for patchurl in patches: |
|
3792 | for patchurl in patches: | |
3793 | if patchurl == '-': |
|
3793 | if patchurl == '-': | |
3794 | ui.status(_('applying patch from stdin\n')) |
|
3794 | ui.status(_('applying patch from stdin\n')) | |
3795 | patchfile = ui.fin |
|
3795 | patchfile = ui.fin | |
3796 | patchurl = 'stdin' # for error message |
|
3796 | patchurl = 'stdin' # for error message | |
3797 | else: |
|
3797 | else: | |
3798 | patchurl = os.path.join(base, patchurl) |
|
3798 | patchurl = os.path.join(base, patchurl) | |
3799 | ui.status(_('applying %s\n') % patchurl) |
|
3799 | ui.status(_('applying %s\n') % patchurl) | |
3800 | patchfile = hg.openpath(ui, patchurl) |
|
3800 | patchfile = hg.openpath(ui, patchurl) | |
3801 |
|
3801 | |||
3802 | haspatch = False |
|
3802 | haspatch = False | |
3803 | for hunk in patch.split(patchfile): |
|
3803 | for hunk in patch.split(patchfile): | |
3804 | (msg, node) = cmdutil.tryimportone(ui, repo, hunk, parents, |
|
3804 | (msg, node) = cmdutil.tryimportone(ui, repo, hunk, parents, | |
3805 | opts, msgs, hg.clean) |
|
3805 | opts, msgs, hg.clean) | |
3806 | if msg: |
|
3806 | if msg: | |
3807 | haspatch = True |
|
3807 | haspatch = True | |
3808 | ui.note(msg + '\n') |
|
3808 | ui.note(msg + '\n') | |
3809 | if update or opts.get('exact'): |
|
3809 | if update or opts.get('exact'): | |
3810 | parents = repo.parents() |
|
3810 | parents = repo.parents() | |
3811 | else: |
|
3811 | else: | |
3812 | parents = [repo[node]] |
|
3812 | parents = [repo[node]] | |
3813 |
|
3813 | |||
3814 | if not haspatch: |
|
3814 | if not haspatch: | |
3815 | raise util.Abort(_('%s: no diffs found') % patchurl) |
|
3815 | raise util.Abort(_('%s: no diffs found') % patchurl) | |
3816 |
|
3816 | |||
3817 | if tr: |
|
3817 | if tr: | |
3818 | tr.close() |
|
3818 | tr.close() | |
3819 | if msgs: |
|
3819 | if msgs: | |
3820 | repo.savecommitmessage('\n* * *\n'.join(msgs)) |
|
3820 | repo.savecommitmessage('\n* * *\n'.join(msgs)) | |
3821 | except: # re-raises |
|
3821 | except: # re-raises | |
3822 | # wlock.release() indirectly calls dirstate.write(): since |
|
3822 | # wlock.release() indirectly calls dirstate.write(): since | |
3823 | # we're crashing, we do not want to change the working dir |
|
3823 | # we're crashing, we do not want to change the working dir | |
3824 | # parent after all, so make sure it writes nothing |
|
3824 | # parent after all, so make sure it writes nothing | |
3825 | repo.dirstate.invalidate() |
|
3825 | repo.dirstate.invalidate() | |
3826 | raise |
|
3826 | raise | |
3827 | finally: |
|
3827 | finally: | |
3828 | if tr: |
|
3828 | if tr: | |
3829 | tr.release() |
|
3829 | tr.release() | |
3830 | release(lock, wlock) |
|
3830 | release(lock, wlock) | |
3831 |
|
3831 | |||
3832 | @command('incoming|in', |
|
3832 | @command('incoming|in', | |
3833 | [('f', 'force', None, |
|
3833 | [('f', 'force', None, | |
3834 | _('run even if remote repository is unrelated')), |
|
3834 | _('run even if remote repository is unrelated')), | |
3835 | ('n', 'newest-first', None, _('show newest record first')), |
|
3835 | ('n', 'newest-first', None, _('show newest record first')), | |
3836 | ('', 'bundle', '', |
|
3836 | ('', 'bundle', '', | |
3837 | _('file to store the bundles into'), _('FILE')), |
|
3837 | _('file to store the bundles into'), _('FILE')), | |
3838 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), |
|
3838 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), | |
3839 | ('B', 'bookmarks', False, _("compare bookmarks")), |
|
3839 | ('B', 'bookmarks', False, _("compare bookmarks")), | |
3840 | ('b', 'branch', [], |
|
3840 | ('b', 'branch', [], | |
3841 | _('a specific branch you would like to pull'), _('BRANCH')), |
|
3841 | _('a specific branch you would like to pull'), _('BRANCH')), | |
3842 | ] + logopts + remoteopts + subrepoopts, |
|
3842 | ] + logopts + remoteopts + subrepoopts, | |
3843 | _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]')) |
|
3843 | _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]')) | |
3844 | def incoming(ui, repo, source="default", **opts): |
|
3844 | def incoming(ui, repo, source="default", **opts): | |
3845 | """show new changesets found in source |
|
3845 | """show new changesets found in source | |
3846 |
|
3846 | |||
3847 | Show new changesets found in the specified path/URL or the default |
|
3847 | Show new changesets found in the specified path/URL or the default | |
3848 | pull location. These are the changesets that would have been pulled |
|
3848 | pull location. These are the changesets that would have been pulled | |
3849 | if a pull at the time you issued this command. |
|
3849 | if a pull at the time you issued this command. | |
3850 |
|
3850 | |||
3851 | For remote repository, using --bundle avoids downloading the |
|
3851 | For remote repository, using --bundle avoids downloading the | |
3852 | changesets twice if the incoming is followed by a pull. |
|
3852 | changesets twice if the incoming is followed by a pull. | |
3853 |
|
3853 | |||
3854 | See pull for valid source format details. |
|
3854 | See pull for valid source format details. | |
3855 |
|
3855 | |||
3856 | .. container:: verbose |
|
3856 | .. container:: verbose | |
3857 |
|
3857 | |||
3858 | Examples: |
|
3858 | Examples: | |
3859 |
|
3859 | |||
3860 | - show incoming changes with patches and full description:: |
|
3860 | - show incoming changes with patches and full description:: | |
3861 |
|
3861 | |||
3862 | hg incoming -vp |
|
3862 | hg incoming -vp | |
3863 |
|
3863 | |||
3864 | - show incoming changes excluding merges, store a bundle:: |
|
3864 | - show incoming changes excluding merges, store a bundle:: | |
3865 |
|
3865 | |||
3866 | hg in -vpM --bundle incoming.hg |
|
3866 | hg in -vpM --bundle incoming.hg | |
3867 | hg pull incoming.hg |
|
3867 | hg pull incoming.hg | |
3868 |
|
3868 | |||
3869 | - briefly list changes inside a bundle:: |
|
3869 | - briefly list changes inside a bundle:: | |
3870 |
|
3870 | |||
3871 | hg in changes.hg -T "{desc|firstline}\\n" |
|
3871 | hg in changes.hg -T "{desc|firstline}\\n" | |
3872 |
|
3872 | |||
3873 | Returns 0 if there are incoming changes, 1 otherwise. |
|
3873 | Returns 0 if there are incoming changes, 1 otherwise. | |
3874 | """ |
|
3874 | """ | |
3875 | if opts.get('graph'): |
|
3875 | if opts.get('graph'): | |
3876 | cmdutil.checkunsupportedgraphflags([], opts) |
|
3876 | cmdutil.checkunsupportedgraphflags([], opts) | |
3877 | def display(other, chlist, displayer): |
|
3877 | def display(other, chlist, displayer): | |
3878 | revdag = cmdutil.graphrevs(other, chlist, opts) |
|
3878 | revdag = cmdutil.graphrevs(other, chlist, opts) | |
3879 | showparents = [ctx.node() for ctx in repo[None].parents()] |
|
3879 | showparents = [ctx.node() for ctx in repo[None].parents()] | |
3880 | cmdutil.displaygraph(ui, revdag, displayer, showparents, |
|
3880 | cmdutil.displaygraph(ui, revdag, displayer, showparents, | |
3881 | graphmod.asciiedges) |
|
3881 | graphmod.asciiedges) | |
3882 |
|
3882 | |||
3883 | hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True) |
|
3883 | hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True) | |
3884 | return 0 |
|
3884 | return 0 | |
3885 |
|
3885 | |||
3886 | if opts.get('bundle') and opts.get('subrepos'): |
|
3886 | if opts.get('bundle') and opts.get('subrepos'): | |
3887 | raise util.Abort(_('cannot combine --bundle and --subrepos')) |
|
3887 | raise util.Abort(_('cannot combine --bundle and --subrepos')) | |
3888 |
|
3888 | |||
3889 | if opts.get('bookmarks'): |
|
3889 | if opts.get('bookmarks'): | |
3890 | source, branches = hg.parseurl(ui.expandpath(source), |
|
3890 | source, branches = hg.parseurl(ui.expandpath(source), | |
3891 | opts.get('branch')) |
|
3891 | opts.get('branch')) | |
3892 | other = hg.peer(repo, opts, source) |
|
3892 | other = hg.peer(repo, opts, source) | |
3893 | if 'bookmarks' not in other.listkeys('namespaces'): |
|
3893 | if 'bookmarks' not in other.listkeys('namespaces'): | |
3894 | ui.warn(_("remote doesn't support bookmarks\n")) |
|
3894 | ui.warn(_("remote doesn't support bookmarks\n")) | |
3895 | return 0 |
|
3895 | return 0 | |
3896 | ui.status(_('comparing with %s\n') % util.hidepassword(source)) |
|
3896 | ui.status(_('comparing with %s\n') % util.hidepassword(source)) | |
3897 | return bookmarks.diff(ui, repo, other) |
|
3897 | return bookmarks.diff(ui, repo, other) | |
3898 |
|
3898 | |||
3899 | repo._subtoppath = ui.expandpath(source) |
|
3899 | repo._subtoppath = ui.expandpath(source) | |
3900 | try: |
|
3900 | try: | |
3901 | return hg.incoming(ui, repo, source, opts) |
|
3901 | return hg.incoming(ui, repo, source, opts) | |
3902 | finally: |
|
3902 | finally: | |
3903 | del repo._subtoppath |
|
3903 | del repo._subtoppath | |
3904 |
|
3904 | |||
3905 |
|
3905 | |||
3906 | @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]')) |
|
3906 | @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]')) | |
3907 | def init(ui, dest=".", **opts): |
|
3907 | def init(ui, dest=".", **opts): | |
3908 | """create a new repository in the given directory |
|
3908 | """create a new repository in the given directory | |
3909 |
|
3909 | |||
3910 | Initialize a new repository in the given directory. If the given |
|
3910 | Initialize a new repository in the given directory. If the given | |
3911 | directory does not exist, it will be created. |
|
3911 | directory does not exist, it will be created. | |
3912 |
|
3912 | |||
3913 | If no directory is given, the current directory is used. |
|
3913 | If no directory is given, the current directory is used. | |
3914 |
|
3914 | |||
3915 | It is possible to specify an ``ssh://`` URL as the destination. |
|
3915 | It is possible to specify an ``ssh://`` URL as the destination. | |
3916 | See :hg:`help urls` for more information. |
|
3916 | See :hg:`help urls` for more information. | |
3917 |
|
3917 | |||
3918 | Returns 0 on success. |
|
3918 | Returns 0 on success. | |
3919 | """ |
|
3919 | """ | |
3920 | hg.peer(ui, opts, ui.expandpath(dest), create=True) |
|
3920 | hg.peer(ui, opts, ui.expandpath(dest), create=True) | |
3921 |
|
3921 | |||
3922 | @command('locate', |
|
3922 | @command('locate', | |
3923 | [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')), |
|
3923 | [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')), | |
3924 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), |
|
3924 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), | |
3925 | ('f', 'fullpath', None, _('print complete paths from the filesystem root')), |
|
3925 | ('f', 'fullpath', None, _('print complete paths from the filesystem root')), | |
3926 | ] + walkopts, |
|
3926 | ] + walkopts, | |
3927 | _('[OPTION]... [PATTERN]...')) |
|
3927 | _('[OPTION]... [PATTERN]...')) | |
3928 | def locate(ui, repo, *pats, **opts): |
|
3928 | def locate(ui, repo, *pats, **opts): | |
3929 | """locate files matching specific patterns |
|
3929 | """locate files matching specific patterns | |
3930 |
|
3930 | |||
3931 | Print files under Mercurial control in the working directory whose |
|
3931 | Print files under Mercurial control in the working directory whose | |
3932 | names match the given patterns. |
|
3932 | names match the given patterns. | |
3933 |
|
3933 | |||
3934 | By default, this command searches all directories in the working |
|
3934 | By default, this command searches all directories in the working | |
3935 | directory. To search just the current directory and its |
|
3935 | directory. To search just the current directory and its | |
3936 | subdirectories, use "--include .". |
|
3936 | subdirectories, use "--include .". | |
3937 |
|
3937 | |||
3938 | If no patterns are given to match, this command prints the names |
|
3938 | If no patterns are given to match, this command prints the names | |
3939 | of all files under Mercurial control in the working directory. |
|
3939 | of all files under Mercurial control in the working directory. | |
3940 |
|
3940 | |||
3941 | If you want to feed the output of this command into the "xargs" |
|
3941 | If you want to feed the output of this command into the "xargs" | |
3942 | command, use the -0 option to both this command and "xargs". This |
|
3942 | command, use the -0 option to both this command and "xargs". This | |
3943 | will avoid the problem of "xargs" treating single filenames that |
|
3943 | will avoid the problem of "xargs" treating single filenames that | |
3944 | contain whitespace as multiple filenames. |
|
3944 | contain whitespace as multiple filenames. | |
3945 |
|
3945 | |||
3946 | Returns 0 if a match is found, 1 otherwise. |
|
3946 | Returns 0 if a match is found, 1 otherwise. | |
3947 | """ |
|
3947 | """ | |
3948 | end = opts.get('print0') and '\0' or '\n' |
|
3948 | end = opts.get('print0') and '\0' or '\n' | |
3949 | rev = scmutil.revsingle(repo, opts.get('rev'), None).node() |
|
3949 | rev = scmutil.revsingle(repo, opts.get('rev'), None).node() | |
3950 |
|
3950 | |||
3951 | ret = 1 |
|
3951 | ret = 1 | |
3952 | m = scmutil.match(repo[rev], pats, opts, default='relglob') |
|
3952 | m = scmutil.match(repo[rev], pats, opts, default='relglob') | |
3953 | m.bad = lambda x, y: False |
|
3953 | m.bad = lambda x, y: False | |
3954 | for abs in repo[rev].walk(m): |
|
3954 | for abs in repo[rev].walk(m): | |
3955 | if not rev and abs not in repo.dirstate: |
|
3955 | if not rev and abs not in repo.dirstate: | |
3956 | continue |
|
3956 | continue | |
3957 | if opts.get('fullpath'): |
|
3957 | if opts.get('fullpath'): | |
3958 | ui.write(repo.wjoin(abs), end) |
|
3958 | ui.write(repo.wjoin(abs), end) | |
3959 | else: |
|
3959 | else: | |
3960 | ui.write(((pats and m.rel(abs)) or abs), end) |
|
3960 | ui.write(((pats and m.rel(abs)) or abs), end) | |
3961 | ret = 0 |
|
3961 | ret = 0 | |
3962 |
|
3962 | |||
3963 | return ret |
|
3963 | return ret | |
3964 |
|
3964 | |||
3965 | @command('^log|history', |
|
3965 | @command('^log|history', | |
3966 | [('f', 'follow', None, |
|
3966 | [('f', 'follow', None, | |
3967 | _('follow changeset history, or file history across copies and renames')), |
|
3967 | _('follow changeset history, or file history across copies and renames')), | |
3968 | ('', 'follow-first', None, |
|
3968 | ('', 'follow-first', None, | |
3969 | _('only follow the first parent of merge changesets (DEPRECATED)')), |
|
3969 | _('only follow the first parent of merge changesets (DEPRECATED)')), | |
3970 | ('d', 'date', '', _('show revisions matching date spec'), _('DATE')), |
|
3970 | ('d', 'date', '', _('show revisions matching date spec'), _('DATE')), | |
3971 | ('C', 'copies', None, _('show copied files')), |
|
3971 | ('C', 'copies', None, _('show copied files')), | |
3972 | ('k', 'keyword', [], |
|
3972 | ('k', 'keyword', [], | |
3973 | _('do case-insensitive search for a given text'), _('TEXT')), |
|
3973 | _('do case-insensitive search for a given text'), _('TEXT')), | |
3974 | ('r', 'rev', [], _('show the specified revision or range'), _('REV')), |
|
3974 | ('r', 'rev', [], _('show the specified revision or range'), _('REV')), | |
3975 | ('', 'removed', None, _('include revisions where files were removed')), |
|
3975 | ('', 'removed', None, _('include revisions where files were removed')), | |
3976 | ('m', 'only-merges', None, _('show only merges (DEPRECATED)')), |
|
3976 | ('m', 'only-merges', None, _('show only merges (DEPRECATED)')), | |
3977 | ('u', 'user', [], _('revisions committed by user'), _('USER')), |
|
3977 | ('u', 'user', [], _('revisions committed by user'), _('USER')), | |
3978 | ('', 'only-branch', [], |
|
3978 | ('', 'only-branch', [], | |
3979 | _('show only changesets within the given named branch (DEPRECATED)'), |
|
3979 | _('show only changesets within the given named branch (DEPRECATED)'), | |
3980 | _('BRANCH')), |
|
3980 | _('BRANCH')), | |
3981 | ('b', 'branch', [], |
|
3981 | ('b', 'branch', [], | |
3982 | _('show changesets within the given named branch'), _('BRANCH')), |
|
3982 | _('show changesets within the given named branch'), _('BRANCH')), | |
3983 | ('P', 'prune', [], |
|
3983 | ('P', 'prune', [], | |
3984 | _('do not display revision or any of its ancestors'), _('REV')), |
|
3984 | _('do not display revision or any of its ancestors'), _('REV')), | |
3985 | ] + logopts + walkopts, |
|
3985 | ] + logopts + walkopts, | |
3986 | _('[OPTION]... [FILE]')) |
|
3986 | _('[OPTION]... [FILE]')) | |
3987 | def log(ui, repo, *pats, **opts): |
|
3987 | def log(ui, repo, *pats, **opts): | |
3988 | """show revision history of entire repository or files |
|
3988 | """show revision history of entire repository or files | |
3989 |
|
3989 | |||
3990 | Print the revision history of the specified files or the entire |
|
3990 | Print the revision history of the specified files or the entire | |
3991 | project. |
|
3991 | project. | |
3992 |
|
3992 | |||
3993 | If no revision range is specified, the default is ``tip:0`` unless |
|
3993 | If no revision range is specified, the default is ``tip:0`` unless | |
3994 | --follow is set, in which case the working directory parent is |
|
3994 | --follow is set, in which case the working directory parent is | |
3995 | used as the starting revision. |
|
3995 | used as the starting revision. | |
3996 |
|
3996 | |||
3997 | File history is shown without following rename or copy history of |
|
3997 | File history is shown without following rename or copy history of | |
3998 | files. Use -f/--follow with a filename to follow history across |
|
3998 | files. Use -f/--follow with a filename to follow history across | |
3999 | renames and copies. --follow without a filename will only show |
|
3999 | renames and copies. --follow without a filename will only show | |
4000 | ancestors or descendants of the starting revision. |
|
4000 | ancestors or descendants of the starting revision. | |
4001 |
|
4001 | |||
4002 | By default this command prints revision number and changeset id, |
|
4002 | By default this command prints revision number and changeset id, | |
4003 | tags, non-trivial parents, user, date and time, and a summary for |
|
4003 | tags, non-trivial parents, user, date and time, and a summary for | |
4004 | each commit. When the -v/--verbose switch is used, the list of |
|
4004 | each commit. When the -v/--verbose switch is used, the list of | |
4005 | changed files and full commit message are shown. |
|
4005 | changed files and full commit message are shown. | |
4006 |
|
4006 | |||
4007 | With --graph the revisions are shown as an ASCII art DAG with the most |
|
4007 | With --graph the revisions are shown as an ASCII art DAG with the most | |
4008 | recent changeset at the top. |
|
4008 | recent changeset at the top. | |
4009 | 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete, |
|
4009 | 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete, | |
4010 | and '+' represents a fork where the changeset from the lines below is a |
|
4010 | and '+' represents a fork where the changeset from the lines below is a | |
4011 | parent of the 'o' merge on the same same line. |
|
4011 | parent of the 'o' merge on the same same line. | |
4012 |
|
4012 | |||
4013 | .. note:: |
|
4013 | .. note:: | |
4014 |
|
4014 | |||
4015 | log -p/--patch may generate unexpected diff output for merge |
|
4015 | log -p/--patch may generate unexpected diff output for merge | |
4016 | changesets, as it will only compare the merge changeset against |
|
4016 | changesets, as it will only compare the merge changeset against | |
4017 | its first parent. Also, only files different from BOTH parents |
|
4017 | its first parent. Also, only files different from BOTH parents | |
4018 | will appear in files:. |
|
4018 | will appear in files:. | |
4019 |
|
4019 | |||
4020 | .. note:: |
|
4020 | .. note:: | |
4021 |
|
4021 | |||
4022 | for performance reasons, log FILE may omit duplicate changes |
|
4022 | for performance reasons, log FILE may omit duplicate changes | |
4023 | made on branches and will not show deletions. To see all |
|
4023 | made on branches and will not show deletions. To see all | |
4024 | changes including duplicates and deletions, use the --removed |
|
4024 | changes including duplicates and deletions, use the --removed | |
4025 | switch. |
|
4025 | switch. | |
4026 |
|
4026 | |||
4027 | .. container:: verbose |
|
4027 | .. container:: verbose | |
4028 |
|
4028 | |||
4029 | Some examples: |
|
4029 | Some examples: | |
4030 |
|
4030 | |||
4031 | - changesets with full descriptions and file lists:: |
|
4031 | - changesets with full descriptions and file lists:: | |
4032 |
|
4032 | |||
4033 | hg log -v |
|
4033 | hg log -v | |
4034 |
|
4034 | |||
4035 | - changesets ancestral to the working directory:: |
|
4035 | - changesets ancestral to the working directory:: | |
4036 |
|
4036 | |||
4037 | hg log -f |
|
4037 | hg log -f | |
4038 |
|
4038 | |||
4039 | - last 10 commits on the current branch:: |
|
4039 | - last 10 commits on the current branch:: | |
4040 |
|
4040 | |||
4041 | hg log -l 10 -b . |
|
4041 | hg log -l 10 -b . | |
4042 |
|
4042 | |||
4043 | - changesets showing all modifications of a file, including removals:: |
|
4043 | - changesets showing all modifications of a file, including removals:: | |
4044 |
|
4044 | |||
4045 | hg log --removed file.c |
|
4045 | hg log --removed file.c | |
4046 |
|
4046 | |||
4047 | - all changesets that touch a directory, with diffs, excluding merges:: |
|
4047 | - all changesets that touch a directory, with diffs, excluding merges:: | |
4048 |
|
4048 | |||
4049 | hg log -Mp lib/ |
|
4049 | hg log -Mp lib/ | |
4050 |
|
4050 | |||
4051 | - all revision numbers that match a keyword:: |
|
4051 | - all revision numbers that match a keyword:: | |
4052 |
|
4052 | |||
4053 | hg log -k bug --template "{rev}\\n" |
|
4053 | hg log -k bug --template "{rev}\\n" | |
4054 |
|
4054 | |||
4055 | - check if a given changeset is included is a tagged release:: |
|
4055 | - check if a given changeset is included is a tagged release:: | |
4056 |
|
4056 | |||
4057 | hg log -r "a21ccf and ancestor(1.9)" |
|
4057 | hg log -r "a21ccf and ancestor(1.9)" | |
4058 |
|
4058 | |||
4059 | - find all changesets by some user in a date range:: |
|
4059 | - find all changesets by some user in a date range:: | |
4060 |
|
4060 | |||
4061 | hg log -k alice -d "may 2008 to jul 2008" |
|
4061 | hg log -k alice -d "may 2008 to jul 2008" | |
4062 |
|
4062 | |||
4063 | - summary of all changesets after the last tag:: |
|
4063 | - summary of all changesets after the last tag:: | |
4064 |
|
4064 | |||
4065 | hg log -r "last(tagged())::" --template "{desc|firstline}\\n" |
|
4065 | hg log -r "last(tagged())::" --template "{desc|firstline}\\n" | |
4066 |
|
4066 | |||
4067 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
4067 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
4068 |
|
4068 | |||
4069 | See :hg:`help revisions` and :hg:`help revsets` for more about |
|
4069 | See :hg:`help revisions` and :hg:`help revsets` for more about | |
4070 | specifying revisions. |
|
4070 | specifying revisions. | |
4071 |
|
4071 | |||
4072 | See :hg:`help templates` for more about pre-packaged styles and |
|
4072 | See :hg:`help templates` for more about pre-packaged styles and | |
4073 | specifying custom templates. |
|
4073 | specifying custom templates. | |
4074 |
|
4074 | |||
4075 | Returns 0 on success. |
|
4075 | Returns 0 on success. | |
4076 | """ |
|
4076 | """ | |
4077 | if opts.get('graph'): |
|
4077 | if opts.get('graph'): | |
4078 | return cmdutil.graphlog(ui, repo, *pats, **opts) |
|
4078 | return cmdutil.graphlog(ui, repo, *pats, **opts) | |
4079 |
|
4079 | |||
4080 | matchfn = scmutil.match(repo[None], pats, opts) |
|
4080 | matchfn = scmutil.match(repo[None], pats, opts) | |
4081 | limit = cmdutil.loglimit(opts) |
|
4081 | limit = cmdutil.loglimit(opts) | |
4082 | count = 0 |
|
4082 | count = 0 | |
4083 |
|
4083 | |||
4084 | getrenamed, endrev = None, None |
|
4084 | getrenamed, endrev = None, None | |
4085 | if opts.get('copies'): |
|
4085 | if opts.get('copies'): | |
4086 | if opts.get('rev'): |
|
4086 | if opts.get('rev'): | |
4087 | endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1 |
|
4087 | endrev = max(scmutil.revrange(repo, opts.get('rev'))) + 1 | |
4088 | getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) |
|
4088 | getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) | |
4089 |
|
4089 | |||
4090 | df = False |
|
4090 | df = False | |
4091 | if opts.get("date"): |
|
4091 | if opts.get("date"): | |
4092 | df = util.matchdate(opts["date"]) |
|
4092 | df = util.matchdate(opts["date"]) | |
4093 |
|
4093 | |||
4094 | branches = opts.get('branch', []) + opts.get('only_branch', []) |
|
4094 | branches = opts.get('branch', []) + opts.get('only_branch', []) | |
4095 | opts['branch'] = [repo.lookupbranch(b) for b in branches] |
|
4095 | opts['branch'] = [repo.lookupbranch(b) for b in branches] | |
4096 |
|
4096 | |||
4097 | displayer = cmdutil.show_changeset(ui, repo, opts, True) |
|
4097 | displayer = cmdutil.show_changeset(ui, repo, opts, True) | |
4098 | def prep(ctx, fns): |
|
4098 | def prep(ctx, fns): | |
4099 | rev = ctx.rev() |
|
4099 | rev = ctx.rev() | |
4100 | parents = [p for p in repo.changelog.parentrevs(rev) |
|
4100 | parents = [p for p in repo.changelog.parentrevs(rev) | |
4101 | if p != nullrev] |
|
4101 | if p != nullrev] | |
4102 | if opts.get('no_merges') and len(parents) == 2: |
|
4102 | if opts.get('no_merges') and len(parents) == 2: | |
4103 | return |
|
4103 | return | |
4104 | if opts.get('only_merges') and len(parents) != 2: |
|
4104 | if opts.get('only_merges') and len(parents) != 2: | |
4105 | return |
|
4105 | return | |
4106 | if opts.get('branch') and ctx.branch() not in opts['branch']: |
|
4106 | if opts.get('branch') and ctx.branch() not in opts['branch']: | |
4107 | return |
|
4107 | return | |
4108 | if df and not df(ctx.date()[0]): |
|
4108 | if df and not df(ctx.date()[0]): | |
4109 | return |
|
4109 | return | |
4110 |
|
4110 | |||
4111 | lower = encoding.lower |
|
4111 | lower = encoding.lower | |
4112 | if opts.get('user'): |
|
4112 | if opts.get('user'): | |
4113 | luser = lower(ctx.user()) |
|
4113 | luser = lower(ctx.user()) | |
4114 | for k in [lower(x) for x in opts['user']]: |
|
4114 | for k in [lower(x) for x in opts['user']]: | |
4115 | if (k in luser): |
|
4115 | if (k in luser): | |
4116 | break |
|
4116 | break | |
4117 | else: |
|
4117 | else: | |
4118 | return |
|
4118 | return | |
4119 | if opts.get('keyword'): |
|
4119 | if opts.get('keyword'): | |
4120 | luser = lower(ctx.user()) |
|
4120 | luser = lower(ctx.user()) | |
4121 | ldesc = lower(ctx.description()) |
|
4121 | ldesc = lower(ctx.description()) | |
4122 | lfiles = lower(" ".join(ctx.files())) |
|
4122 | lfiles = lower(" ".join(ctx.files())) | |
4123 | for k in [lower(x) for x in opts['keyword']]: |
|
4123 | for k in [lower(x) for x in opts['keyword']]: | |
4124 | if (k in luser or k in ldesc or k in lfiles): |
|
4124 | if (k in luser or k in ldesc or k in lfiles): | |
4125 | break |
|
4125 | break | |
4126 | else: |
|
4126 | else: | |
4127 | return |
|
4127 | return | |
4128 |
|
4128 | |||
4129 | copies = None |
|
4129 | copies = None | |
4130 | if getrenamed is not None and rev: |
|
4130 | if getrenamed is not None and rev: | |
4131 | copies = [] |
|
4131 | copies = [] | |
4132 | for fn in ctx.files(): |
|
4132 | for fn in ctx.files(): | |
4133 | rename = getrenamed(fn, rev) |
|
4133 | rename = getrenamed(fn, rev) | |
4134 | if rename: |
|
4134 | if rename: | |
4135 | copies.append((fn, rename[0])) |
|
4135 | copies.append((fn, rename[0])) | |
4136 |
|
4136 | |||
4137 | revmatchfn = None |
|
4137 | revmatchfn = None | |
4138 | if opts.get('patch') or opts.get('stat'): |
|
4138 | if opts.get('patch') or opts.get('stat'): | |
4139 | if opts.get('follow') or opts.get('follow_first'): |
|
4139 | if opts.get('follow') or opts.get('follow_first'): | |
4140 | # note: this might be wrong when following through merges |
|
4140 | # note: this might be wrong when following through merges | |
4141 | revmatchfn = scmutil.match(repo[None], fns, default='path') |
|
4141 | revmatchfn = scmutil.match(repo[None], fns, default='path') | |
4142 | else: |
|
4142 | else: | |
4143 | revmatchfn = matchfn |
|
4143 | revmatchfn = matchfn | |
4144 |
|
4144 | |||
4145 | displayer.show(ctx, copies=copies, matchfn=revmatchfn) |
|
4145 | displayer.show(ctx, copies=copies, matchfn=revmatchfn) | |
4146 |
|
4146 | |||
4147 | for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep): |
|
4147 | for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep): | |
4148 | if displayer.flush(ctx.rev()): |
|
4148 | if displayer.flush(ctx.rev()): | |
4149 | count += 1 |
|
4149 | count += 1 | |
4150 | if count == limit: |
|
4150 | if count == limit: | |
4151 | break |
|
4151 | break | |
4152 | displayer.close() |
|
4152 | displayer.close() | |
4153 |
|
4153 | |||
4154 | @command('manifest', |
|
4154 | @command('manifest', | |
4155 | [('r', 'rev', '', _('revision to display'), _('REV')), |
|
4155 | [('r', 'rev', '', _('revision to display'), _('REV')), | |
4156 | ('', 'all', False, _("list files from all revisions"))], |
|
4156 | ('', 'all', False, _("list files from all revisions"))], | |
4157 | _('[-r REV]')) |
|
4157 | _('[-r REV]')) | |
4158 | def manifest(ui, repo, node=None, rev=None, **opts): |
|
4158 | def manifest(ui, repo, node=None, rev=None, **opts): | |
4159 | """output the current or given revision of the project manifest |
|
4159 | """output the current or given revision of the project manifest | |
4160 |
|
4160 | |||
4161 | Print a list of version controlled files for the given revision. |
|
4161 | Print a list of version controlled files for the given revision. | |
4162 | If no revision is given, the first parent of the working directory |
|
4162 | If no revision is given, the first parent of the working directory | |
4163 | is used, or the null revision if no revision is checked out. |
|
4163 | is used, or the null revision if no revision is checked out. | |
4164 |
|
4164 | |||
4165 | With -v, print file permissions, symlink and executable bits. |
|
4165 | With -v, print file permissions, symlink and executable bits. | |
4166 | With --debug, print file revision hashes. |
|
4166 | With --debug, print file revision hashes. | |
4167 |
|
4167 | |||
4168 | If option --all is specified, the list of all files from all revisions |
|
4168 | If option --all is specified, the list of all files from all revisions | |
4169 | is printed. This includes deleted and renamed files. |
|
4169 | is printed. This includes deleted and renamed files. | |
4170 |
|
4170 | |||
4171 | Returns 0 on success. |
|
4171 | Returns 0 on success. | |
4172 | """ |
|
4172 | """ | |
4173 |
|
4173 | |||
4174 | fm = ui.formatter('manifest', opts) |
|
4174 | fm = ui.formatter('manifest', opts) | |
4175 |
|
4175 | |||
4176 | if opts.get('all'): |
|
4176 | if opts.get('all'): | |
4177 | if rev or node: |
|
4177 | if rev or node: | |
4178 | raise util.Abort(_("can't specify a revision with --all")) |
|
4178 | raise util.Abort(_("can't specify a revision with --all")) | |
4179 |
|
4179 | |||
4180 | res = [] |
|
4180 | res = [] | |
4181 | prefix = "data/" |
|
4181 | prefix = "data/" | |
4182 | suffix = ".i" |
|
4182 | suffix = ".i" | |
4183 | plen = len(prefix) |
|
4183 | plen = len(prefix) | |
4184 | slen = len(suffix) |
|
4184 | slen = len(suffix) | |
4185 | lock = repo.lock() |
|
4185 | lock = repo.lock() | |
4186 | try: |
|
4186 | try: | |
4187 | for fn, b, size in repo.store.datafiles(): |
|
4187 | for fn, b, size in repo.store.datafiles(): | |
4188 | if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix: |
|
4188 | if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix: | |
4189 | res.append(fn[plen:-slen]) |
|
4189 | res.append(fn[plen:-slen]) | |
4190 | finally: |
|
4190 | finally: | |
4191 | lock.release() |
|
4191 | lock.release() | |
4192 | for f in res: |
|
4192 | for f in res: | |
4193 | fm.startitem() |
|
4193 | fm.startitem() | |
4194 | fm.write("path", '%s\n', f) |
|
4194 | fm.write("path", '%s\n', f) | |
4195 | fm.end() |
|
4195 | fm.end() | |
4196 | return |
|
4196 | return | |
4197 |
|
4197 | |||
4198 | if rev and node: |
|
4198 | if rev and node: | |
4199 | raise util.Abort(_("please specify just one revision")) |
|
4199 | raise util.Abort(_("please specify just one revision")) | |
4200 |
|
4200 | |||
4201 | if not node: |
|
4201 | if not node: | |
4202 | node = rev |
|
4202 | node = rev | |
4203 |
|
4203 | |||
4204 | char = {'l': '@', 'x': '*', '': ''} |
|
4204 | char = {'l': '@', 'x': '*', '': ''} | |
4205 | mode = {'l': '644', 'x': '755', '': '644'} |
|
4205 | mode = {'l': '644', 'x': '755', '': '644'} | |
4206 | ctx = scmutil.revsingle(repo, node) |
|
4206 | ctx = scmutil.revsingle(repo, node) | |
4207 | mf = ctx.manifest() |
|
4207 | mf = ctx.manifest() | |
4208 | for f in ctx: |
|
4208 | for f in ctx: | |
4209 | fm.startitem() |
|
4209 | fm.startitem() | |
4210 | fl = ctx[f].flags() |
|
4210 | fl = ctx[f].flags() | |
4211 | fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f])) |
|
4211 | fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f])) | |
4212 | fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl]) |
|
4212 | fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl]) | |
4213 | fm.write('path', '%s\n', f) |
|
4213 | fm.write('path', '%s\n', f) | |
4214 | fm.end() |
|
4214 | fm.end() | |
4215 |
|
4215 | |||
4216 | @command('^merge', |
|
4216 | @command('^merge', | |
4217 | [('f', 'force', None, |
|
4217 | [('f', 'force', None, | |
4218 | _('force a merge including outstanding changes (DEPRECATED)')), |
|
4218 | _('force a merge including outstanding changes (DEPRECATED)')), | |
4219 | ('r', 'rev', '', _('revision to merge'), _('REV')), |
|
4219 | ('r', 'rev', '', _('revision to merge'), _('REV')), | |
4220 | ('P', 'preview', None, |
|
4220 | ('P', 'preview', None, | |
4221 | _('review revisions to merge (no merge is performed)')) |
|
4221 | _('review revisions to merge (no merge is performed)')) | |
4222 | ] + mergetoolopts, |
|
4222 | ] + mergetoolopts, | |
4223 | _('[-P] [-f] [[-r] REV]')) |
|
4223 | _('[-P] [-f] [[-r] REV]')) | |
4224 | def merge(ui, repo, node=None, **opts): |
|
4224 | def merge(ui, repo, node=None, **opts): | |
4225 | """merge working directory with another revision |
|
4225 | """merge working directory with another revision | |
4226 |
|
4226 | |||
4227 | The current working directory is updated with all changes made in |
|
4227 | The current working directory is updated with all changes made in | |
4228 | the requested revision since the last common predecessor revision. |
|
4228 | the requested revision since the last common predecessor revision. | |
4229 |
|
4229 | |||
4230 | Files that changed between either parent are marked as changed for |
|
4230 | Files that changed between either parent are marked as changed for | |
4231 | the next commit and a commit must be performed before any further |
|
4231 | the next commit and a commit must be performed before any further | |
4232 | updates to the repository are allowed. The next commit will have |
|
4232 | updates to the repository are allowed. The next commit will have | |
4233 | two parents. |
|
4233 | two parents. | |
4234 |
|
4234 | |||
4235 | ``--tool`` can be used to specify the merge tool used for file |
|
4235 | ``--tool`` can be used to specify the merge tool used for file | |
4236 | merges. It overrides the HGMERGE environment variable and your |
|
4236 | merges. It overrides the HGMERGE environment variable and your | |
4237 | configuration files. See :hg:`help merge-tools` for options. |
|
4237 | configuration files. See :hg:`help merge-tools` for options. | |
4238 |
|
4238 | |||
4239 | If no revision is specified, the working directory's parent is a |
|
4239 | If no revision is specified, the working directory's parent is a | |
4240 | head revision, and the current branch contains exactly one other |
|
4240 | head revision, and the current branch contains exactly one other | |
4241 | head, the other head is merged with by default. Otherwise, an |
|
4241 | head, the other head is merged with by default. Otherwise, an | |
4242 | explicit revision with which to merge with must be provided. |
|
4242 | explicit revision with which to merge with must be provided. | |
4243 |
|
4243 | |||
4244 | :hg:`resolve` must be used to resolve unresolved files. |
|
4244 | :hg:`resolve` must be used to resolve unresolved files. | |
4245 |
|
4245 | |||
4246 | To undo an uncommitted merge, use :hg:`update --clean .` which |
|
4246 | To undo an uncommitted merge, use :hg:`update --clean .` which | |
4247 | will check out a clean copy of the original merge parent, losing |
|
4247 | will check out a clean copy of the original merge parent, losing | |
4248 | all changes. |
|
4248 | all changes. | |
4249 |
|
4249 | |||
4250 | Returns 0 on success, 1 if there are unresolved files. |
|
4250 | Returns 0 on success, 1 if there are unresolved files. | |
4251 | """ |
|
4251 | """ | |
4252 |
|
4252 | |||
4253 | if opts.get('rev') and node: |
|
4253 | if opts.get('rev') and node: | |
4254 | raise util.Abort(_("please specify just one revision")) |
|
4254 | raise util.Abort(_("please specify just one revision")) | |
4255 | if not node: |
|
4255 | if not node: | |
4256 | node = opts.get('rev') |
|
4256 | node = opts.get('rev') | |
4257 |
|
4257 | |||
4258 | if node: |
|
4258 | if node: | |
4259 | node = scmutil.revsingle(repo, node).node() |
|
4259 | node = scmutil.revsingle(repo, node).node() | |
4260 |
|
4260 | |||
4261 | if not node and repo._bookmarkcurrent: |
|
4261 | if not node and repo._bookmarkcurrent: | |
4262 | bmheads = repo.bookmarkheads(repo._bookmarkcurrent) |
|
4262 | bmheads = repo.bookmarkheads(repo._bookmarkcurrent) | |
4263 | curhead = repo[repo._bookmarkcurrent].node() |
|
4263 | curhead = repo[repo._bookmarkcurrent].node() | |
4264 | if len(bmheads) == 2: |
|
4264 | if len(bmheads) == 2: | |
4265 | if curhead == bmheads[0]: |
|
4265 | if curhead == bmheads[0]: | |
4266 | node = bmheads[1] |
|
4266 | node = bmheads[1] | |
4267 | else: |
|
4267 | else: | |
4268 | node = bmheads[0] |
|
4268 | node = bmheads[0] | |
4269 | elif len(bmheads) > 2: |
|
4269 | elif len(bmheads) > 2: | |
4270 | raise util.Abort(_("multiple matching bookmarks to merge - " |
|
4270 | raise util.Abort(_("multiple matching bookmarks to merge - " | |
4271 | "please merge with an explicit rev or bookmark"), |
|
4271 | "please merge with an explicit rev or bookmark"), | |
4272 | hint=_("run 'hg heads' to see all heads")) |
|
4272 | hint=_("run 'hg heads' to see all heads")) | |
4273 | elif len(bmheads) <= 1: |
|
4273 | elif len(bmheads) <= 1: | |
4274 | raise util.Abort(_("no matching bookmark to merge - " |
|
4274 | raise util.Abort(_("no matching bookmark to merge - " | |
4275 | "please merge with an explicit rev or bookmark"), |
|
4275 | "please merge with an explicit rev or bookmark"), | |
4276 | hint=_("run 'hg heads' to see all heads")) |
|
4276 | hint=_("run 'hg heads' to see all heads")) | |
4277 |
|
4277 | |||
4278 | if not node and not repo._bookmarkcurrent: |
|
4278 | if not node and not repo._bookmarkcurrent: | |
4279 | branch = repo[None].branch() |
|
4279 | branch = repo[None].branch() | |
4280 | bheads = repo.branchheads(branch) |
|
4280 | bheads = repo.branchheads(branch) | |
4281 | nbhs = [bh for bh in bheads if not repo[bh].bookmarks()] |
|
4281 | nbhs = [bh for bh in bheads if not repo[bh].bookmarks()] | |
4282 |
|
4282 | |||
4283 | if len(nbhs) > 2: |
|
4283 | if len(nbhs) > 2: | |
4284 | raise util.Abort(_("branch '%s' has %d heads - " |
|
4284 | raise util.Abort(_("branch '%s' has %d heads - " | |
4285 | "please merge with an explicit rev") |
|
4285 | "please merge with an explicit rev") | |
4286 | % (branch, len(bheads)), |
|
4286 | % (branch, len(bheads)), | |
4287 | hint=_("run 'hg heads .' to see heads")) |
|
4287 | hint=_("run 'hg heads .' to see heads")) | |
4288 |
|
4288 | |||
4289 | parent = repo.dirstate.p1() |
|
4289 | parent = repo.dirstate.p1() | |
4290 | if len(nbhs) <= 1: |
|
4290 | if len(nbhs) <= 1: | |
4291 | if len(bheads) > 1: |
|
4291 | if len(bheads) > 1: | |
4292 | raise util.Abort(_("heads are bookmarked - " |
|
4292 | raise util.Abort(_("heads are bookmarked - " | |
4293 | "please merge with an explicit rev"), |
|
4293 | "please merge with an explicit rev"), | |
4294 | hint=_("run 'hg heads' to see all heads")) |
|
4294 | hint=_("run 'hg heads' to see all heads")) | |
4295 | if len(repo.heads()) > 1: |
|
4295 | if len(repo.heads()) > 1: | |
4296 | raise util.Abort(_("branch '%s' has one head - " |
|
4296 | raise util.Abort(_("branch '%s' has one head - " | |
4297 | "please merge with an explicit rev") |
|
4297 | "please merge with an explicit rev") | |
4298 | % branch, |
|
4298 | % branch, | |
4299 | hint=_("run 'hg heads' to see all heads")) |
|
4299 | hint=_("run 'hg heads' to see all heads")) | |
4300 | msg, hint = _('nothing to merge'), None |
|
4300 | msg, hint = _('nothing to merge'), None | |
4301 | if parent != repo.lookup(branch): |
|
4301 | if parent != repo.lookup(branch): | |
4302 | hint = _("use 'hg update' instead") |
|
4302 | hint = _("use 'hg update' instead") | |
4303 | raise util.Abort(msg, hint=hint) |
|
4303 | raise util.Abort(msg, hint=hint) | |
4304 |
|
4304 | |||
4305 | if parent not in bheads: |
|
4305 | if parent not in bheads: | |
4306 | raise util.Abort(_('working directory not at a head revision'), |
|
4306 | raise util.Abort(_('working directory not at a head revision'), | |
4307 | hint=_("use 'hg update' or merge with an " |
|
4307 | hint=_("use 'hg update' or merge with an " | |
4308 | "explicit revision")) |
|
4308 | "explicit revision")) | |
4309 | if parent == nbhs[0]: |
|
4309 | if parent == nbhs[0]: | |
4310 | node = nbhs[-1] |
|
4310 | node = nbhs[-1] | |
4311 | else: |
|
4311 | else: | |
4312 | node = nbhs[0] |
|
4312 | node = nbhs[0] | |
4313 |
|
4313 | |||
4314 | if opts.get('preview'): |
|
4314 | if opts.get('preview'): | |
4315 | # find nodes that are ancestors of p2 but not of p1 |
|
4315 | # find nodes that are ancestors of p2 but not of p1 | |
4316 | p1 = repo.lookup('.') |
|
4316 | p1 = repo.lookup('.') | |
4317 | p2 = repo.lookup(node) |
|
4317 | p2 = repo.lookup(node) | |
4318 | nodes = repo.changelog.findmissing(common=[p1], heads=[p2]) |
|
4318 | nodes = repo.changelog.findmissing(common=[p1], heads=[p2]) | |
4319 |
|
4319 | |||
4320 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
4320 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
4321 | for node in nodes: |
|
4321 | for node in nodes: | |
4322 | displayer.show(repo[node]) |
|
4322 | displayer.show(repo[node]) | |
4323 | displayer.close() |
|
4323 | displayer.close() | |
4324 | return 0 |
|
4324 | return 0 | |
4325 |
|
4325 | |||
4326 | try: |
|
4326 | try: | |
4327 | # ui.forcemerge is an internal variable, do not document |
|
4327 | # ui.forcemerge is an internal variable, do not document | |
4328 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge') |
|
4328 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge') | |
4329 | return hg.merge(repo, node, force=opts.get('force')) |
|
4329 | return hg.merge(repo, node, force=opts.get('force')) | |
4330 | finally: |
|
4330 | finally: | |
4331 | ui.setconfig('ui', 'forcemerge', '', 'merge') |
|
4331 | ui.setconfig('ui', 'forcemerge', '', 'merge') | |
4332 |
|
4332 | |||
4333 | @command('outgoing|out', |
|
4333 | @command('outgoing|out', | |
4334 | [('f', 'force', None, _('run even when the destination is unrelated')), |
|
4334 | [('f', 'force', None, _('run even when the destination is unrelated')), | |
4335 | ('r', 'rev', [], |
|
4335 | ('r', 'rev', [], | |
4336 | _('a changeset intended to be included in the destination'), _('REV')), |
|
4336 | _('a changeset intended to be included in the destination'), _('REV')), | |
4337 | ('n', 'newest-first', None, _('show newest record first')), |
|
4337 | ('n', 'newest-first', None, _('show newest record first')), | |
4338 | ('B', 'bookmarks', False, _('compare bookmarks')), |
|
4338 | ('B', 'bookmarks', False, _('compare bookmarks')), | |
4339 | ('b', 'branch', [], _('a specific branch you would like to push'), |
|
4339 | ('b', 'branch', [], _('a specific branch you would like to push'), | |
4340 | _('BRANCH')), |
|
4340 | _('BRANCH')), | |
4341 | ] + logopts + remoteopts + subrepoopts, |
|
4341 | ] + logopts + remoteopts + subrepoopts, | |
4342 | _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')) |
|
4342 | _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')) | |
4343 | def outgoing(ui, repo, dest=None, **opts): |
|
4343 | def outgoing(ui, repo, dest=None, **opts): | |
4344 | """show changesets not found in the destination |
|
4344 | """show changesets not found in the destination | |
4345 |
|
4345 | |||
4346 | Show changesets not found in the specified destination repository |
|
4346 | Show changesets not found in the specified destination repository | |
4347 | or the default push location. These are the changesets that would |
|
4347 | or the default push location. These are the changesets that would | |
4348 | be pushed if a push was requested. |
|
4348 | be pushed if a push was requested. | |
4349 |
|
4349 | |||
4350 | See pull for details of valid destination formats. |
|
4350 | See pull for details of valid destination formats. | |
4351 |
|
4351 | |||
4352 | Returns 0 if there are outgoing changes, 1 otherwise. |
|
4352 | Returns 0 if there are outgoing changes, 1 otherwise. | |
4353 | """ |
|
4353 | """ | |
4354 | if opts.get('graph'): |
|
4354 | if opts.get('graph'): | |
4355 | cmdutil.checkunsupportedgraphflags([], opts) |
|
4355 | cmdutil.checkunsupportedgraphflags([], opts) | |
4356 | o, other = hg._outgoing(ui, repo, dest, opts) |
|
4356 | o, other = hg._outgoing(ui, repo, dest, opts) | |
4357 | if not o: |
|
4357 | if not o: | |
|
4358 | cmdutil.outgoinghooks(ui, repo, other, opts, o) | |||
4358 | return |
|
4359 | return | |
4359 |
|
4360 | |||
4360 | revdag = cmdutil.graphrevs(repo, o, opts) |
|
4361 | revdag = cmdutil.graphrevs(repo, o, opts) | |
4361 | displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True) |
|
4362 | displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True) | |
4362 | showparents = [ctx.node() for ctx in repo[None].parents()] |
|
4363 | showparents = [ctx.node() for ctx in repo[None].parents()] | |
4363 | cmdutil.displaygraph(ui, revdag, displayer, showparents, |
|
4364 | cmdutil.displaygraph(ui, revdag, displayer, showparents, | |
4364 | graphmod.asciiedges) |
|
4365 | graphmod.asciiedges) | |
|
4366 | cmdutil.outgoinghooks(ui, repo, other, opts, o) | |||
4365 | return 0 |
|
4367 | return 0 | |
4366 |
|
4368 | |||
4367 | if opts.get('bookmarks'): |
|
4369 | if opts.get('bookmarks'): | |
4368 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
4370 | dest = ui.expandpath(dest or 'default-push', dest or 'default') | |
4369 | dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
4371 | dest, branches = hg.parseurl(dest, opts.get('branch')) | |
4370 | other = hg.peer(repo, opts, dest) |
|
4372 | other = hg.peer(repo, opts, dest) | |
4371 | if 'bookmarks' not in other.listkeys('namespaces'): |
|
4373 | if 'bookmarks' not in other.listkeys('namespaces'): | |
4372 | ui.warn(_("remote doesn't support bookmarks\n")) |
|
4374 | ui.warn(_("remote doesn't support bookmarks\n")) | |
4373 | return 0 |
|
4375 | return 0 | |
4374 | ui.status(_('comparing with %s\n') % util.hidepassword(dest)) |
|
4376 | ui.status(_('comparing with %s\n') % util.hidepassword(dest)) | |
4375 | return bookmarks.diff(ui, other, repo) |
|
4377 | return bookmarks.diff(ui, other, repo) | |
4376 |
|
4378 | |||
4377 | repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default') |
|
4379 | repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default') | |
4378 | try: |
|
4380 | try: | |
4379 | return hg.outgoing(ui, repo, dest, opts) |
|
4381 | return hg.outgoing(ui, repo, dest, opts) | |
4380 | finally: |
|
4382 | finally: | |
4381 | del repo._subtoppath |
|
4383 | del repo._subtoppath | |
4382 |
|
4384 | |||
4383 | @command('parents', |
|
4385 | @command('parents', | |
4384 | [('r', 'rev', '', _('show parents of the specified revision'), _('REV')), |
|
4386 | [('r', 'rev', '', _('show parents of the specified revision'), _('REV')), | |
4385 | ] + templateopts, |
|
4387 | ] + templateopts, | |
4386 | _('[-r REV] [FILE]')) |
|
4388 | _('[-r REV] [FILE]')) | |
4387 | def parents(ui, repo, file_=None, **opts): |
|
4389 | def parents(ui, repo, file_=None, **opts): | |
4388 | """show the parents of the working directory or revision |
|
4390 | """show the parents of the working directory or revision | |
4389 |
|
4391 | |||
4390 | Print the working directory's parent revisions. If a revision is |
|
4392 | Print the working directory's parent revisions. If a revision is | |
4391 | given via -r/--rev, the parent of that revision will be printed. |
|
4393 | given via -r/--rev, the parent of that revision will be printed. | |
4392 | If a file argument is given, the revision in which the file was |
|
4394 | If a file argument is given, the revision in which the file was | |
4393 | last changed (before the working directory revision or the |
|
4395 | last changed (before the working directory revision or the | |
4394 | argument to --rev if given) is printed. |
|
4396 | argument to --rev if given) is printed. | |
4395 |
|
4397 | |||
4396 | Returns 0 on success. |
|
4398 | Returns 0 on success. | |
4397 | """ |
|
4399 | """ | |
4398 |
|
4400 | |||
4399 | ctx = scmutil.revsingle(repo, opts.get('rev'), None) |
|
4401 | ctx = scmutil.revsingle(repo, opts.get('rev'), None) | |
4400 |
|
4402 | |||
4401 | if file_: |
|
4403 | if file_: | |
4402 | m = scmutil.match(ctx, (file_,), opts) |
|
4404 | m = scmutil.match(ctx, (file_,), opts) | |
4403 | if m.anypats() or len(m.files()) != 1: |
|
4405 | if m.anypats() or len(m.files()) != 1: | |
4404 | raise util.Abort(_('can only specify an explicit filename')) |
|
4406 | raise util.Abort(_('can only specify an explicit filename')) | |
4405 | file_ = m.files()[0] |
|
4407 | file_ = m.files()[0] | |
4406 | filenodes = [] |
|
4408 | filenodes = [] | |
4407 | for cp in ctx.parents(): |
|
4409 | for cp in ctx.parents(): | |
4408 | if not cp: |
|
4410 | if not cp: | |
4409 | continue |
|
4411 | continue | |
4410 | try: |
|
4412 | try: | |
4411 | filenodes.append(cp.filenode(file_)) |
|
4413 | filenodes.append(cp.filenode(file_)) | |
4412 | except error.LookupError: |
|
4414 | except error.LookupError: | |
4413 | pass |
|
4415 | pass | |
4414 | if not filenodes: |
|
4416 | if not filenodes: | |
4415 | raise util.Abort(_("'%s' not found in manifest!") % file_) |
|
4417 | raise util.Abort(_("'%s' not found in manifest!") % file_) | |
4416 | p = [] |
|
4418 | p = [] | |
4417 | for fn in filenodes: |
|
4419 | for fn in filenodes: | |
4418 | fctx = repo.filectx(file_, fileid=fn) |
|
4420 | fctx = repo.filectx(file_, fileid=fn) | |
4419 | p.append(fctx.node()) |
|
4421 | p.append(fctx.node()) | |
4420 | else: |
|
4422 | else: | |
4421 | p = [cp.node() for cp in ctx.parents()] |
|
4423 | p = [cp.node() for cp in ctx.parents()] | |
4422 |
|
4424 | |||
4423 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
4425 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
4424 | for n in p: |
|
4426 | for n in p: | |
4425 | if n != nullid: |
|
4427 | if n != nullid: | |
4426 | displayer.show(repo[n]) |
|
4428 | displayer.show(repo[n]) | |
4427 | displayer.close() |
|
4429 | displayer.close() | |
4428 |
|
4430 | |||
4429 | @command('paths', [], _('[NAME]')) |
|
4431 | @command('paths', [], _('[NAME]')) | |
4430 | def paths(ui, repo, search=None): |
|
4432 | def paths(ui, repo, search=None): | |
4431 | """show aliases for remote repositories |
|
4433 | """show aliases for remote repositories | |
4432 |
|
4434 | |||
4433 | Show definition of symbolic path name NAME. If no name is given, |
|
4435 | Show definition of symbolic path name NAME. If no name is given, | |
4434 | show definition of all available names. |
|
4436 | show definition of all available names. | |
4435 |
|
4437 | |||
4436 | Option -q/--quiet suppresses all output when searching for NAME |
|
4438 | Option -q/--quiet suppresses all output when searching for NAME | |
4437 | and shows only the path names when listing all definitions. |
|
4439 | and shows only the path names when listing all definitions. | |
4438 |
|
4440 | |||
4439 | Path names are defined in the [paths] section of your |
|
4441 | Path names are defined in the [paths] section of your | |
4440 | configuration file and in ``/etc/mercurial/hgrc``. If run inside a |
|
4442 | configuration file and in ``/etc/mercurial/hgrc``. If run inside a | |
4441 | repository, ``.hg/hgrc`` is used, too. |
|
4443 | repository, ``.hg/hgrc`` is used, too. | |
4442 |
|
4444 | |||
4443 | The path names ``default`` and ``default-push`` have a special |
|
4445 | The path names ``default`` and ``default-push`` have a special | |
4444 | meaning. When performing a push or pull operation, they are used |
|
4446 | meaning. When performing a push or pull operation, they are used | |
4445 | as fallbacks if no location is specified on the command-line. |
|
4447 | as fallbacks if no location is specified on the command-line. | |
4446 | When ``default-push`` is set, it will be used for push and |
|
4448 | When ``default-push`` is set, it will be used for push and | |
4447 | ``default`` will be used for pull; otherwise ``default`` is used |
|
4449 | ``default`` will be used for pull; otherwise ``default`` is used | |
4448 | as the fallback for both. When cloning a repository, the clone |
|
4450 | as the fallback for both. When cloning a repository, the clone | |
4449 | source is written as ``default`` in ``.hg/hgrc``. Note that |
|
4451 | source is written as ``default`` in ``.hg/hgrc``. Note that | |
4450 | ``default`` and ``default-push`` apply to all inbound (e.g. |
|
4452 | ``default`` and ``default-push`` apply to all inbound (e.g. | |
4451 | :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and |
|
4453 | :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and | |
4452 | :hg:`bundle`) operations. |
|
4454 | :hg:`bundle`) operations. | |
4453 |
|
4455 | |||
4454 | See :hg:`help urls` for more information. |
|
4456 | See :hg:`help urls` for more information. | |
4455 |
|
4457 | |||
4456 | Returns 0 on success. |
|
4458 | Returns 0 on success. | |
4457 | """ |
|
4459 | """ | |
4458 | if search: |
|
4460 | if search: | |
4459 | for name, path in ui.configitems("paths"): |
|
4461 | for name, path in ui.configitems("paths"): | |
4460 | if name == search: |
|
4462 | if name == search: | |
4461 | ui.status("%s\n" % util.hidepassword(path)) |
|
4463 | ui.status("%s\n" % util.hidepassword(path)) | |
4462 | return |
|
4464 | return | |
4463 | if not ui.quiet: |
|
4465 | if not ui.quiet: | |
4464 | ui.warn(_("not found!\n")) |
|
4466 | ui.warn(_("not found!\n")) | |
4465 | return 1 |
|
4467 | return 1 | |
4466 | else: |
|
4468 | else: | |
4467 | for name, path in ui.configitems("paths"): |
|
4469 | for name, path in ui.configitems("paths"): | |
4468 | if ui.quiet: |
|
4470 | if ui.quiet: | |
4469 | ui.write("%s\n" % name) |
|
4471 | ui.write("%s\n" % name) | |
4470 | else: |
|
4472 | else: | |
4471 | ui.write("%s = %s\n" % (name, util.hidepassword(path))) |
|
4473 | ui.write("%s = %s\n" % (name, util.hidepassword(path))) | |
4472 |
|
4474 | |||
4473 | @command('phase', |
|
4475 | @command('phase', | |
4474 | [('p', 'public', False, _('set changeset phase to public')), |
|
4476 | [('p', 'public', False, _('set changeset phase to public')), | |
4475 | ('d', 'draft', False, _('set changeset phase to draft')), |
|
4477 | ('d', 'draft', False, _('set changeset phase to draft')), | |
4476 | ('s', 'secret', False, _('set changeset phase to secret')), |
|
4478 | ('s', 'secret', False, _('set changeset phase to secret')), | |
4477 | ('f', 'force', False, _('allow to move boundary backward')), |
|
4479 | ('f', 'force', False, _('allow to move boundary backward')), | |
4478 | ('r', 'rev', [], _('target revision'), _('REV')), |
|
4480 | ('r', 'rev', [], _('target revision'), _('REV')), | |
4479 | ], |
|
4481 | ], | |
4480 | _('[-p|-d|-s] [-f] [-r] REV...')) |
|
4482 | _('[-p|-d|-s] [-f] [-r] REV...')) | |
4481 | def phase(ui, repo, *revs, **opts): |
|
4483 | def phase(ui, repo, *revs, **opts): | |
4482 | """set or show the current phase name |
|
4484 | """set or show the current phase name | |
4483 |
|
4485 | |||
4484 | With no argument, show the phase name of specified revisions. |
|
4486 | With no argument, show the phase name of specified revisions. | |
4485 |
|
4487 | |||
4486 | With one of -p/--public, -d/--draft or -s/--secret, change the |
|
4488 | With one of -p/--public, -d/--draft or -s/--secret, change the | |
4487 | phase value of the specified revisions. |
|
4489 | phase value of the specified revisions. | |
4488 |
|
4490 | |||
4489 | Unless -f/--force is specified, :hg:`phase` won't move changeset from a |
|
4491 | Unless -f/--force is specified, :hg:`phase` won't move changeset from a | |
4490 | lower phase to an higher phase. Phases are ordered as follows:: |
|
4492 | lower phase to an higher phase. Phases are ordered as follows:: | |
4491 |
|
4493 | |||
4492 | public < draft < secret |
|
4494 | public < draft < secret | |
4493 |
|
4495 | |||
4494 | Returns 0 on success, 1 if no phases were changed or some could not |
|
4496 | Returns 0 on success, 1 if no phases were changed or some could not | |
4495 | be changed. |
|
4497 | be changed. | |
4496 | """ |
|
4498 | """ | |
4497 | # search for a unique phase argument |
|
4499 | # search for a unique phase argument | |
4498 | targetphase = None |
|
4500 | targetphase = None | |
4499 | for idx, name in enumerate(phases.phasenames): |
|
4501 | for idx, name in enumerate(phases.phasenames): | |
4500 | if opts[name]: |
|
4502 | if opts[name]: | |
4501 | if targetphase is not None: |
|
4503 | if targetphase is not None: | |
4502 | raise util.Abort(_('only one phase can be specified')) |
|
4504 | raise util.Abort(_('only one phase can be specified')) | |
4503 | targetphase = idx |
|
4505 | targetphase = idx | |
4504 |
|
4506 | |||
4505 | # look for specified revision |
|
4507 | # look for specified revision | |
4506 | revs = list(revs) |
|
4508 | revs = list(revs) | |
4507 | revs.extend(opts['rev']) |
|
4509 | revs.extend(opts['rev']) | |
4508 | if not revs: |
|
4510 | if not revs: | |
4509 | raise util.Abort(_('no revisions specified')) |
|
4511 | raise util.Abort(_('no revisions specified')) | |
4510 |
|
4512 | |||
4511 | revs = scmutil.revrange(repo, revs) |
|
4513 | revs = scmutil.revrange(repo, revs) | |
4512 |
|
4514 | |||
4513 | lock = None |
|
4515 | lock = None | |
4514 | ret = 0 |
|
4516 | ret = 0 | |
4515 | if targetphase is None: |
|
4517 | if targetphase is None: | |
4516 | # display |
|
4518 | # display | |
4517 | for r in revs: |
|
4519 | for r in revs: | |
4518 | ctx = repo[r] |
|
4520 | ctx = repo[r] | |
4519 | ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr())) |
|
4521 | ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr())) | |
4520 | else: |
|
4522 | else: | |
4521 | lock = repo.lock() |
|
4523 | lock = repo.lock() | |
4522 | try: |
|
4524 | try: | |
4523 | # set phase |
|
4525 | # set phase | |
4524 | if not revs: |
|
4526 | if not revs: | |
4525 | raise util.Abort(_('empty revision set')) |
|
4527 | raise util.Abort(_('empty revision set')) | |
4526 | nodes = [repo[r].node() for r in revs] |
|
4528 | nodes = [repo[r].node() for r in revs] | |
4527 | olddata = repo._phasecache.getphaserevs(repo)[:] |
|
4529 | olddata = repo._phasecache.getphaserevs(repo)[:] | |
4528 | phases.advanceboundary(repo, targetphase, nodes) |
|
4530 | phases.advanceboundary(repo, targetphase, nodes) | |
4529 | if opts['force']: |
|
4531 | if opts['force']: | |
4530 | phases.retractboundary(repo, targetphase, nodes) |
|
4532 | phases.retractboundary(repo, targetphase, nodes) | |
4531 | finally: |
|
4533 | finally: | |
4532 | lock.release() |
|
4534 | lock.release() | |
4533 | # moving revision from public to draft may hide them |
|
4535 | # moving revision from public to draft may hide them | |
4534 | # We have to check result on an unfiltered repository |
|
4536 | # We have to check result on an unfiltered repository | |
4535 | unfi = repo.unfiltered() |
|
4537 | unfi = repo.unfiltered() | |
4536 | newdata = repo._phasecache.getphaserevs(unfi) |
|
4538 | newdata = repo._phasecache.getphaserevs(unfi) | |
4537 | changes = sum(o != newdata[i] for i, o in enumerate(olddata)) |
|
4539 | changes = sum(o != newdata[i] for i, o in enumerate(olddata)) | |
4538 | cl = unfi.changelog |
|
4540 | cl = unfi.changelog | |
4539 | rejected = [n for n in nodes |
|
4541 | rejected = [n for n in nodes | |
4540 | if newdata[cl.rev(n)] < targetphase] |
|
4542 | if newdata[cl.rev(n)] < targetphase] | |
4541 | if rejected: |
|
4543 | if rejected: | |
4542 | ui.warn(_('cannot move %i changesets to a higher ' |
|
4544 | ui.warn(_('cannot move %i changesets to a higher ' | |
4543 | 'phase, use --force\n') % len(rejected)) |
|
4545 | 'phase, use --force\n') % len(rejected)) | |
4544 | ret = 1 |
|
4546 | ret = 1 | |
4545 | if changes: |
|
4547 | if changes: | |
4546 | msg = _('phase changed for %i changesets\n') % changes |
|
4548 | msg = _('phase changed for %i changesets\n') % changes | |
4547 | if ret: |
|
4549 | if ret: | |
4548 | ui.status(msg) |
|
4550 | ui.status(msg) | |
4549 | else: |
|
4551 | else: | |
4550 | ui.note(msg) |
|
4552 | ui.note(msg) | |
4551 | else: |
|
4553 | else: | |
4552 | ui.warn(_('no phases changed\n')) |
|
4554 | ui.warn(_('no phases changed\n')) | |
4553 | ret = 1 |
|
4555 | ret = 1 | |
4554 | return ret |
|
4556 | return ret | |
4555 |
|
4557 | |||
4556 | def postincoming(ui, repo, modheads, optupdate, checkout): |
|
4558 | def postincoming(ui, repo, modheads, optupdate, checkout): | |
4557 | if modheads == 0: |
|
4559 | if modheads == 0: | |
4558 | return |
|
4560 | return | |
4559 | if optupdate: |
|
4561 | if optupdate: | |
4560 | checkout, movemarkfrom = bookmarks.calculateupdate(ui, repo, checkout) |
|
4562 | checkout, movemarkfrom = bookmarks.calculateupdate(ui, repo, checkout) | |
4561 | try: |
|
4563 | try: | |
4562 | ret = hg.update(repo, checkout) |
|
4564 | ret = hg.update(repo, checkout) | |
4563 | except util.Abort, inst: |
|
4565 | except util.Abort, inst: | |
4564 | ui.warn(_("not updating: %s\n") % str(inst)) |
|
4566 | ui.warn(_("not updating: %s\n") % str(inst)) | |
4565 | if inst.hint: |
|
4567 | if inst.hint: | |
4566 | ui.warn(_("(%s)\n") % inst.hint) |
|
4568 | ui.warn(_("(%s)\n") % inst.hint) | |
4567 | return 0 |
|
4569 | return 0 | |
4568 | if not ret and not checkout: |
|
4570 | if not ret and not checkout: | |
4569 | if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): |
|
4571 | if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): | |
4570 | ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent) |
|
4572 | ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent) | |
4571 | return ret |
|
4573 | return ret | |
4572 | if modheads > 1: |
|
4574 | if modheads > 1: | |
4573 | currentbranchheads = len(repo.branchheads()) |
|
4575 | currentbranchheads = len(repo.branchheads()) | |
4574 | if currentbranchheads == modheads: |
|
4576 | if currentbranchheads == modheads: | |
4575 | ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) |
|
4577 | ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) | |
4576 | elif currentbranchheads > 1: |
|
4578 | elif currentbranchheads > 1: | |
4577 | ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to " |
|
4579 | ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to " | |
4578 | "merge)\n")) |
|
4580 | "merge)\n")) | |
4579 | else: |
|
4581 | else: | |
4580 | ui.status(_("(run 'hg heads' to see heads)\n")) |
|
4582 | ui.status(_("(run 'hg heads' to see heads)\n")) | |
4581 | else: |
|
4583 | else: | |
4582 | ui.status(_("(run 'hg update' to get a working copy)\n")) |
|
4584 | ui.status(_("(run 'hg update' to get a working copy)\n")) | |
4583 |
|
4585 | |||
4584 | @command('^pull', |
|
4586 | @command('^pull', | |
4585 | [('u', 'update', None, |
|
4587 | [('u', 'update', None, | |
4586 | _('update to new branch head if changesets were pulled')), |
|
4588 | _('update to new branch head if changesets were pulled')), | |
4587 | ('f', 'force', None, _('run even when remote repository is unrelated')), |
|
4589 | ('f', 'force', None, _('run even when remote repository is unrelated')), | |
4588 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), |
|
4590 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), | |
4589 | ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')), |
|
4591 | ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')), | |
4590 | ('b', 'branch', [], _('a specific branch you would like to pull'), |
|
4592 | ('b', 'branch', [], _('a specific branch you would like to pull'), | |
4591 | _('BRANCH')), |
|
4593 | _('BRANCH')), | |
4592 | ] + remoteopts, |
|
4594 | ] + remoteopts, | |
4593 | _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')) |
|
4595 | _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')) | |
4594 | def pull(ui, repo, source="default", **opts): |
|
4596 | def pull(ui, repo, source="default", **opts): | |
4595 | """pull changes from the specified source |
|
4597 | """pull changes from the specified source | |
4596 |
|
4598 | |||
4597 | Pull changes from a remote repository to a local one. |
|
4599 | Pull changes from a remote repository to a local one. | |
4598 |
|
4600 | |||
4599 | This finds all changes from the repository at the specified path |
|
4601 | This finds all changes from the repository at the specified path | |
4600 | or URL and adds them to a local repository (the current one unless |
|
4602 | or URL and adds them to a local repository (the current one unless | |
4601 | -R is specified). By default, this does not update the copy of the |
|
4603 | -R is specified). By default, this does not update the copy of the | |
4602 | project in the working directory. |
|
4604 | project in the working directory. | |
4603 |
|
4605 | |||
4604 | Use :hg:`incoming` if you want to see what would have been added |
|
4606 | Use :hg:`incoming` if you want to see what would have been added | |
4605 | by a pull at the time you issued this command. If you then decide |
|
4607 | by a pull at the time you issued this command. If you then decide | |
4606 | to add those changes to the repository, you should use :hg:`pull |
|
4608 | to add those changes to the repository, you should use :hg:`pull | |
4607 | -r X` where ``X`` is the last changeset listed by :hg:`incoming`. |
|
4609 | -r X` where ``X`` is the last changeset listed by :hg:`incoming`. | |
4608 |
|
4610 | |||
4609 | If SOURCE is omitted, the 'default' path will be used. |
|
4611 | If SOURCE is omitted, the 'default' path will be used. | |
4610 | See :hg:`help urls` for more information. |
|
4612 | See :hg:`help urls` for more information. | |
4611 |
|
4613 | |||
4612 | Returns 0 on success, 1 if an update had unresolved files. |
|
4614 | Returns 0 on success, 1 if an update had unresolved files. | |
4613 | """ |
|
4615 | """ | |
4614 | source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) |
|
4616 | source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) | |
4615 | other = hg.peer(repo, opts, source) |
|
4617 | other = hg.peer(repo, opts, source) | |
4616 | try: |
|
4618 | try: | |
4617 | ui.status(_('pulling from %s\n') % util.hidepassword(source)) |
|
4619 | ui.status(_('pulling from %s\n') % util.hidepassword(source)) | |
4618 | revs, checkout = hg.addbranchrevs(repo, other, branches, |
|
4620 | revs, checkout = hg.addbranchrevs(repo, other, branches, | |
4619 | opts.get('rev')) |
|
4621 | opts.get('rev')) | |
4620 |
|
4622 | |||
4621 | remotebookmarks = other.listkeys('bookmarks') |
|
4623 | remotebookmarks = other.listkeys('bookmarks') | |
4622 |
|
4624 | |||
4623 | if opts.get('bookmark'): |
|
4625 | if opts.get('bookmark'): | |
4624 | if not revs: |
|
4626 | if not revs: | |
4625 | revs = [] |
|
4627 | revs = [] | |
4626 | for b in opts['bookmark']: |
|
4628 | for b in opts['bookmark']: | |
4627 | if b not in remotebookmarks: |
|
4629 | if b not in remotebookmarks: | |
4628 | raise util.Abort(_('remote bookmark %s not found!') % b) |
|
4630 | raise util.Abort(_('remote bookmark %s not found!') % b) | |
4629 | revs.append(remotebookmarks[b]) |
|
4631 | revs.append(remotebookmarks[b]) | |
4630 |
|
4632 | |||
4631 | if revs: |
|
4633 | if revs: | |
4632 | try: |
|
4634 | try: | |
4633 | revs = [other.lookup(rev) for rev in revs] |
|
4635 | revs = [other.lookup(rev) for rev in revs] | |
4634 | except error.CapabilityError: |
|
4636 | except error.CapabilityError: | |
4635 | err = _("other repository doesn't support revision lookup, " |
|
4637 | err = _("other repository doesn't support revision lookup, " | |
4636 | "so a rev cannot be specified.") |
|
4638 | "so a rev cannot be specified.") | |
4637 | raise util.Abort(err) |
|
4639 | raise util.Abort(err) | |
4638 |
|
4640 | |||
4639 | modheads = repo.pull(other, heads=revs, force=opts.get('force')) |
|
4641 | modheads = repo.pull(other, heads=revs, force=opts.get('force')) | |
4640 | bookmarks.updatefromremote(ui, repo, remotebookmarks, source) |
|
4642 | bookmarks.updatefromremote(ui, repo, remotebookmarks, source) | |
4641 | if checkout: |
|
4643 | if checkout: | |
4642 | checkout = str(repo.changelog.rev(other.lookup(checkout))) |
|
4644 | checkout = str(repo.changelog.rev(other.lookup(checkout))) | |
4643 | repo._subtoppath = source |
|
4645 | repo._subtoppath = source | |
4644 | try: |
|
4646 | try: | |
4645 | ret = postincoming(ui, repo, modheads, opts.get('update'), checkout) |
|
4647 | ret = postincoming(ui, repo, modheads, opts.get('update'), checkout) | |
4646 |
|
4648 | |||
4647 | finally: |
|
4649 | finally: | |
4648 | del repo._subtoppath |
|
4650 | del repo._subtoppath | |
4649 |
|
4651 | |||
4650 | # update specified bookmarks |
|
4652 | # update specified bookmarks | |
4651 | if opts.get('bookmark'): |
|
4653 | if opts.get('bookmark'): | |
4652 | marks = repo._bookmarks |
|
4654 | marks = repo._bookmarks | |
4653 | for b in opts['bookmark']: |
|
4655 | for b in opts['bookmark']: | |
4654 | # explicit pull overrides local bookmark if any |
|
4656 | # explicit pull overrides local bookmark if any | |
4655 | ui.status(_("importing bookmark %s\n") % b) |
|
4657 | ui.status(_("importing bookmark %s\n") % b) | |
4656 | marks[b] = repo[remotebookmarks[b]].node() |
|
4658 | marks[b] = repo[remotebookmarks[b]].node() | |
4657 | marks.write() |
|
4659 | marks.write() | |
4658 | finally: |
|
4660 | finally: | |
4659 | other.close() |
|
4661 | other.close() | |
4660 | return ret |
|
4662 | return ret | |
4661 |
|
4663 | |||
4662 | @command('^push', |
|
4664 | @command('^push', | |
4663 | [('f', 'force', None, _('force push')), |
|
4665 | [('f', 'force', None, _('force push')), | |
4664 | ('r', 'rev', [], |
|
4666 | ('r', 'rev', [], | |
4665 | _('a changeset intended to be included in the destination'), |
|
4667 | _('a changeset intended to be included in the destination'), | |
4666 | _('REV')), |
|
4668 | _('REV')), | |
4667 | ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')), |
|
4669 | ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')), | |
4668 | ('b', 'branch', [], |
|
4670 | ('b', 'branch', [], | |
4669 | _('a specific branch you would like to push'), _('BRANCH')), |
|
4671 | _('a specific branch you would like to push'), _('BRANCH')), | |
4670 | ('', 'new-branch', False, _('allow pushing a new branch')), |
|
4672 | ('', 'new-branch', False, _('allow pushing a new branch')), | |
4671 | ] + remoteopts, |
|
4673 | ] + remoteopts, | |
4672 | _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')) |
|
4674 | _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')) | |
4673 | def push(ui, repo, dest=None, **opts): |
|
4675 | def push(ui, repo, dest=None, **opts): | |
4674 | """push changes to the specified destination |
|
4676 | """push changes to the specified destination | |
4675 |
|
4677 | |||
4676 | Push changesets from the local repository to the specified |
|
4678 | Push changesets from the local repository to the specified | |
4677 | destination. |
|
4679 | destination. | |
4678 |
|
4680 | |||
4679 | This operation is symmetrical to pull: it is identical to a pull |
|
4681 | This operation is symmetrical to pull: it is identical to a pull | |
4680 | in the destination repository from the current one. |
|
4682 | in the destination repository from the current one. | |
4681 |
|
4683 | |||
4682 | By default, push will not allow creation of new heads at the |
|
4684 | By default, push will not allow creation of new heads at the | |
4683 | destination, since multiple heads would make it unclear which head |
|
4685 | destination, since multiple heads would make it unclear which head | |
4684 | to use. In this situation, it is recommended to pull and merge |
|
4686 | to use. In this situation, it is recommended to pull and merge | |
4685 | before pushing. |
|
4687 | before pushing. | |
4686 |
|
4688 | |||
4687 | Use --new-branch if you want to allow push to create a new named |
|
4689 | Use --new-branch if you want to allow push to create a new named | |
4688 | branch that is not present at the destination. This allows you to |
|
4690 | branch that is not present at the destination. This allows you to | |
4689 | only create a new branch without forcing other changes. |
|
4691 | only create a new branch without forcing other changes. | |
4690 |
|
4692 | |||
4691 | .. note:: |
|
4693 | .. note:: | |
4692 |
|
4694 | |||
4693 | Extra care should be taken with the -f/--force option, |
|
4695 | Extra care should be taken with the -f/--force option, | |
4694 | which will push all new heads on all branches, an action which will |
|
4696 | which will push all new heads on all branches, an action which will | |
4695 | almost always cause confusion for collaborators. |
|
4697 | almost always cause confusion for collaborators. | |
4696 |
|
4698 | |||
4697 | If -r/--rev is used, the specified revision and all its ancestors |
|
4699 | If -r/--rev is used, the specified revision and all its ancestors | |
4698 | will be pushed to the remote repository. |
|
4700 | will be pushed to the remote repository. | |
4699 |
|
4701 | |||
4700 | If -B/--bookmark is used, the specified bookmarked revision, its |
|
4702 | If -B/--bookmark is used, the specified bookmarked revision, its | |
4701 | ancestors, and the bookmark will be pushed to the remote |
|
4703 | ancestors, and the bookmark will be pushed to the remote | |
4702 | repository. |
|
4704 | repository. | |
4703 |
|
4705 | |||
4704 | Please see :hg:`help urls` for important details about ``ssh://`` |
|
4706 | Please see :hg:`help urls` for important details about ``ssh://`` | |
4705 | URLs. If DESTINATION is omitted, a default path will be used. |
|
4707 | URLs. If DESTINATION is omitted, a default path will be used. | |
4706 |
|
4708 | |||
4707 | Returns 0 if push was successful, 1 if nothing to push. |
|
4709 | Returns 0 if push was successful, 1 if nothing to push. | |
4708 | """ |
|
4710 | """ | |
4709 |
|
4711 | |||
4710 | if opts.get('bookmark'): |
|
4712 | if opts.get('bookmark'): | |
4711 | ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push') |
|
4713 | ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push') | |
4712 | for b in opts['bookmark']: |
|
4714 | for b in opts['bookmark']: | |
4713 | # translate -B options to -r so changesets get pushed |
|
4715 | # translate -B options to -r so changesets get pushed | |
4714 | if b in repo._bookmarks: |
|
4716 | if b in repo._bookmarks: | |
4715 | opts.setdefault('rev', []).append(b) |
|
4717 | opts.setdefault('rev', []).append(b) | |
4716 | else: |
|
4718 | else: | |
4717 | # if we try to push a deleted bookmark, translate it to null |
|
4719 | # if we try to push a deleted bookmark, translate it to null | |
4718 | # this lets simultaneous -r, -b options continue working |
|
4720 | # this lets simultaneous -r, -b options continue working | |
4719 | opts.setdefault('rev', []).append("null") |
|
4721 | opts.setdefault('rev', []).append("null") | |
4720 |
|
4722 | |||
4721 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
4723 | dest = ui.expandpath(dest or 'default-push', dest or 'default') | |
4722 | dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
4724 | dest, branches = hg.parseurl(dest, opts.get('branch')) | |
4723 | ui.status(_('pushing to %s\n') % util.hidepassword(dest)) |
|
4725 | ui.status(_('pushing to %s\n') % util.hidepassword(dest)) | |
4724 | revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev')) |
|
4726 | revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev')) | |
4725 | try: |
|
4727 | try: | |
4726 | other = hg.peer(repo, opts, dest) |
|
4728 | other = hg.peer(repo, opts, dest) | |
4727 | except error.RepoError: |
|
4729 | except error.RepoError: | |
4728 | if dest == "default-push": |
|
4730 | if dest == "default-push": | |
4729 | raise util.Abort(_("default repository not configured!"), |
|
4731 | raise util.Abort(_("default repository not configured!"), | |
4730 | hint=_('see the "path" section in "hg help config"')) |
|
4732 | hint=_('see the "path" section in "hg help config"')) | |
4731 | else: |
|
4733 | else: | |
4732 | raise |
|
4734 | raise | |
4733 |
|
4735 | |||
4734 | if revs: |
|
4736 | if revs: | |
4735 | revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)] |
|
4737 | revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)] | |
4736 |
|
4738 | |||
4737 | repo._subtoppath = dest |
|
4739 | repo._subtoppath = dest | |
4738 | try: |
|
4740 | try: | |
4739 | # push subrepos depth-first for coherent ordering |
|
4741 | # push subrepos depth-first for coherent ordering | |
4740 | c = repo[''] |
|
4742 | c = repo[''] | |
4741 | subs = c.substate # only repos that are committed |
|
4743 | subs = c.substate # only repos that are committed | |
4742 | for s in sorted(subs): |
|
4744 | for s in sorted(subs): | |
4743 | result = c.sub(s).push(opts) |
|
4745 | result = c.sub(s).push(opts) | |
4744 | if result == 0: |
|
4746 | if result == 0: | |
4745 | return not result |
|
4747 | return not result | |
4746 | finally: |
|
4748 | finally: | |
4747 | del repo._subtoppath |
|
4749 | del repo._subtoppath | |
4748 | result = repo.push(other, opts.get('force'), revs=revs, |
|
4750 | result = repo.push(other, opts.get('force'), revs=revs, | |
4749 | newbranch=opts.get('new_branch')) |
|
4751 | newbranch=opts.get('new_branch')) | |
4750 |
|
4752 | |||
4751 | result = not result |
|
4753 | result = not result | |
4752 |
|
4754 | |||
4753 | if opts.get('bookmark'): |
|
4755 | if opts.get('bookmark'): | |
4754 | bresult = bookmarks.pushtoremote(ui, repo, other, opts['bookmark']) |
|
4756 | bresult = bookmarks.pushtoremote(ui, repo, other, opts['bookmark']) | |
4755 | if bresult == 2: |
|
4757 | if bresult == 2: | |
4756 | return 2 |
|
4758 | return 2 | |
4757 | if not result and bresult: |
|
4759 | if not result and bresult: | |
4758 | result = 2 |
|
4760 | result = 2 | |
4759 |
|
4761 | |||
4760 | return result |
|
4762 | return result | |
4761 |
|
4763 | |||
4762 | @command('recover', []) |
|
4764 | @command('recover', []) | |
4763 | def recover(ui, repo): |
|
4765 | def recover(ui, repo): | |
4764 | """roll back an interrupted transaction |
|
4766 | """roll back an interrupted transaction | |
4765 |
|
4767 | |||
4766 | Recover from an interrupted commit or pull. |
|
4768 | Recover from an interrupted commit or pull. | |
4767 |
|
4769 | |||
4768 | This command tries to fix the repository status after an |
|
4770 | This command tries to fix the repository status after an | |
4769 | interrupted operation. It should only be necessary when Mercurial |
|
4771 | interrupted operation. It should only be necessary when Mercurial | |
4770 | suggests it. |
|
4772 | suggests it. | |
4771 |
|
4773 | |||
4772 | Returns 0 if successful, 1 if nothing to recover or verify fails. |
|
4774 | Returns 0 if successful, 1 if nothing to recover or verify fails. | |
4773 | """ |
|
4775 | """ | |
4774 | if repo.recover(): |
|
4776 | if repo.recover(): | |
4775 | return hg.verify(repo) |
|
4777 | return hg.verify(repo) | |
4776 | return 1 |
|
4778 | return 1 | |
4777 |
|
4779 | |||
4778 | @command('^remove|rm', |
|
4780 | @command('^remove|rm', | |
4779 | [('A', 'after', None, _('record delete for missing files')), |
|
4781 | [('A', 'after', None, _('record delete for missing files')), | |
4780 | ('f', 'force', None, |
|
4782 | ('f', 'force', None, | |
4781 | _('remove (and delete) file even if added or modified')), |
|
4783 | _('remove (and delete) file even if added or modified')), | |
4782 | ] + walkopts, |
|
4784 | ] + walkopts, | |
4783 | _('[OPTION]... FILE...')) |
|
4785 | _('[OPTION]... FILE...')) | |
4784 | def remove(ui, repo, *pats, **opts): |
|
4786 | def remove(ui, repo, *pats, **opts): | |
4785 | """remove the specified files on the next commit |
|
4787 | """remove the specified files on the next commit | |
4786 |
|
4788 | |||
4787 | Schedule the indicated files for removal from the current branch. |
|
4789 | Schedule the indicated files for removal from the current branch. | |
4788 |
|
4790 | |||
4789 | This command schedules the files to be removed at the next commit. |
|
4791 | This command schedules the files to be removed at the next commit. | |
4790 | To undo a remove before that, see :hg:`revert`. To undo added |
|
4792 | To undo a remove before that, see :hg:`revert`. To undo added | |
4791 | files, see :hg:`forget`. |
|
4793 | files, see :hg:`forget`. | |
4792 |
|
4794 | |||
4793 | .. container:: verbose |
|
4795 | .. container:: verbose | |
4794 |
|
4796 | |||
4795 | -A/--after can be used to remove only files that have already |
|
4797 | -A/--after can be used to remove only files that have already | |
4796 | been deleted, -f/--force can be used to force deletion, and -Af |
|
4798 | been deleted, -f/--force can be used to force deletion, and -Af | |
4797 | can be used to remove files from the next revision without |
|
4799 | can be used to remove files from the next revision without | |
4798 | deleting them from the working directory. |
|
4800 | deleting them from the working directory. | |
4799 |
|
4801 | |||
4800 | The following table details the behavior of remove for different |
|
4802 | The following table details the behavior of remove for different | |
4801 | file states (columns) and option combinations (rows). The file |
|
4803 | file states (columns) and option combinations (rows). The file | |
4802 | states are Added [A], Clean [C], Modified [M] and Missing [!] |
|
4804 | states are Added [A], Clean [C], Modified [M] and Missing [!] | |
4803 | (as reported by :hg:`status`). The actions are Warn, Remove |
|
4805 | (as reported by :hg:`status`). The actions are Warn, Remove | |
4804 | (from branch) and Delete (from disk): |
|
4806 | (from branch) and Delete (from disk): | |
4805 |
|
4807 | |||
4806 | ========= == == == == |
|
4808 | ========= == == == == | |
4807 | opt/state A C M ! |
|
4809 | opt/state A C M ! | |
4808 | ========= == == == == |
|
4810 | ========= == == == == | |
4809 | none W RD W R |
|
4811 | none W RD W R | |
4810 | -f R RD RD R |
|
4812 | -f R RD RD R | |
4811 | -A W W W R |
|
4813 | -A W W W R | |
4812 | -Af R R R R |
|
4814 | -Af R R R R | |
4813 | ========= == == == == |
|
4815 | ========= == == == == | |
4814 |
|
4816 | |||
4815 | Note that remove never deletes files in Added [A] state from the |
|
4817 | Note that remove never deletes files in Added [A] state from the | |
4816 | working directory, not even if option --force is specified. |
|
4818 | working directory, not even if option --force is specified. | |
4817 |
|
4819 | |||
4818 | Returns 0 on success, 1 if any warnings encountered. |
|
4820 | Returns 0 on success, 1 if any warnings encountered. | |
4819 | """ |
|
4821 | """ | |
4820 |
|
4822 | |||
4821 | ret = 0 |
|
4823 | ret = 0 | |
4822 | after, force = opts.get('after'), opts.get('force') |
|
4824 | after, force = opts.get('after'), opts.get('force') | |
4823 | if not pats and not after: |
|
4825 | if not pats and not after: | |
4824 | raise util.Abort(_('no files specified')) |
|
4826 | raise util.Abort(_('no files specified')) | |
4825 |
|
4827 | |||
4826 | m = scmutil.match(repo[None], pats, opts) |
|
4828 | m = scmutil.match(repo[None], pats, opts) | |
4827 | s = repo.status(match=m, clean=True) |
|
4829 | s = repo.status(match=m, clean=True) | |
4828 | modified, added, deleted, clean = s[0], s[1], s[3], s[6] |
|
4830 | modified, added, deleted, clean = s[0], s[1], s[3], s[6] | |
4829 |
|
4831 | |||
4830 | # warn about failure to delete explicit files/dirs |
|
4832 | # warn about failure to delete explicit files/dirs | |
4831 | wctx = repo[None] |
|
4833 | wctx = repo[None] | |
4832 | for f in m.files(): |
|
4834 | for f in m.files(): | |
4833 | if f in repo.dirstate or f in wctx.dirs(): |
|
4835 | if f in repo.dirstate or f in wctx.dirs(): | |
4834 | continue |
|
4836 | continue | |
4835 | if os.path.exists(m.rel(f)): |
|
4837 | if os.path.exists(m.rel(f)): | |
4836 | if os.path.isdir(m.rel(f)): |
|
4838 | if os.path.isdir(m.rel(f)): | |
4837 | ui.warn(_('not removing %s: no tracked files\n') % m.rel(f)) |
|
4839 | ui.warn(_('not removing %s: no tracked files\n') % m.rel(f)) | |
4838 | else: |
|
4840 | else: | |
4839 | ui.warn(_('not removing %s: file is untracked\n') % m.rel(f)) |
|
4841 | ui.warn(_('not removing %s: file is untracked\n') % m.rel(f)) | |
4840 | # missing files will generate a warning elsewhere |
|
4842 | # missing files will generate a warning elsewhere | |
4841 | ret = 1 |
|
4843 | ret = 1 | |
4842 |
|
4844 | |||
4843 | if force: |
|
4845 | if force: | |
4844 | list = modified + deleted + clean + added |
|
4846 | list = modified + deleted + clean + added | |
4845 | elif after: |
|
4847 | elif after: | |
4846 | list = deleted |
|
4848 | list = deleted | |
4847 | for f in modified + added + clean: |
|
4849 | for f in modified + added + clean: | |
4848 | ui.warn(_('not removing %s: file still exists\n') % m.rel(f)) |
|
4850 | ui.warn(_('not removing %s: file still exists\n') % m.rel(f)) | |
4849 | ret = 1 |
|
4851 | ret = 1 | |
4850 | else: |
|
4852 | else: | |
4851 | list = deleted + clean |
|
4853 | list = deleted + clean | |
4852 | for f in modified: |
|
4854 | for f in modified: | |
4853 | ui.warn(_('not removing %s: file is modified (use -f' |
|
4855 | ui.warn(_('not removing %s: file is modified (use -f' | |
4854 | ' to force removal)\n') % m.rel(f)) |
|
4856 | ' to force removal)\n') % m.rel(f)) | |
4855 | ret = 1 |
|
4857 | ret = 1 | |
4856 | for f in added: |
|
4858 | for f in added: | |
4857 | ui.warn(_('not removing %s: file has been marked for add' |
|
4859 | ui.warn(_('not removing %s: file has been marked for add' | |
4858 | ' (use forget to undo)\n') % m.rel(f)) |
|
4860 | ' (use forget to undo)\n') % m.rel(f)) | |
4859 | ret = 1 |
|
4861 | ret = 1 | |
4860 |
|
4862 | |||
4861 | for f in sorted(list): |
|
4863 | for f in sorted(list): | |
4862 | if ui.verbose or not m.exact(f): |
|
4864 | if ui.verbose or not m.exact(f): | |
4863 | ui.status(_('removing %s\n') % m.rel(f)) |
|
4865 | ui.status(_('removing %s\n') % m.rel(f)) | |
4864 |
|
4866 | |||
4865 | wlock = repo.wlock() |
|
4867 | wlock = repo.wlock() | |
4866 | try: |
|
4868 | try: | |
4867 | if not after: |
|
4869 | if not after: | |
4868 | for f in list: |
|
4870 | for f in list: | |
4869 | if f in added: |
|
4871 | if f in added: | |
4870 | continue # we never unlink added files on remove |
|
4872 | continue # we never unlink added files on remove | |
4871 | util.unlinkpath(repo.wjoin(f), ignoremissing=True) |
|
4873 | util.unlinkpath(repo.wjoin(f), ignoremissing=True) | |
4872 | repo[None].forget(list) |
|
4874 | repo[None].forget(list) | |
4873 | finally: |
|
4875 | finally: | |
4874 | wlock.release() |
|
4876 | wlock.release() | |
4875 |
|
4877 | |||
4876 | return ret |
|
4878 | return ret | |
4877 |
|
4879 | |||
4878 | @command('rename|move|mv', |
|
4880 | @command('rename|move|mv', | |
4879 | [('A', 'after', None, _('record a rename that has already occurred')), |
|
4881 | [('A', 'after', None, _('record a rename that has already occurred')), | |
4880 | ('f', 'force', None, _('forcibly copy over an existing managed file')), |
|
4882 | ('f', 'force', None, _('forcibly copy over an existing managed file')), | |
4881 | ] + walkopts + dryrunopts, |
|
4883 | ] + walkopts + dryrunopts, | |
4882 | _('[OPTION]... SOURCE... DEST')) |
|
4884 | _('[OPTION]... SOURCE... DEST')) | |
4883 | def rename(ui, repo, *pats, **opts): |
|
4885 | def rename(ui, repo, *pats, **opts): | |
4884 | """rename files; equivalent of copy + remove |
|
4886 | """rename files; equivalent of copy + remove | |
4885 |
|
4887 | |||
4886 | Mark dest as copies of sources; mark sources for deletion. If dest |
|
4888 | Mark dest as copies of sources; mark sources for deletion. If dest | |
4887 | is a directory, copies are put in that directory. If dest is a |
|
4889 | is a directory, copies are put in that directory. If dest is a | |
4888 | file, there can only be one source. |
|
4890 | file, there can only be one source. | |
4889 |
|
4891 | |||
4890 | By default, this command copies the contents of files as they |
|
4892 | By default, this command copies the contents of files as they | |
4891 | exist in the working directory. If invoked with -A/--after, the |
|
4893 | exist in the working directory. If invoked with -A/--after, the | |
4892 | operation is recorded, but no copying is performed. |
|
4894 | operation is recorded, but no copying is performed. | |
4893 |
|
4895 | |||
4894 | This command takes effect at the next commit. To undo a rename |
|
4896 | This command takes effect at the next commit. To undo a rename | |
4895 | before that, see :hg:`revert`. |
|
4897 | before that, see :hg:`revert`. | |
4896 |
|
4898 | |||
4897 | Returns 0 on success, 1 if errors are encountered. |
|
4899 | Returns 0 on success, 1 if errors are encountered. | |
4898 | """ |
|
4900 | """ | |
4899 | wlock = repo.wlock(False) |
|
4901 | wlock = repo.wlock(False) | |
4900 | try: |
|
4902 | try: | |
4901 | return cmdutil.copy(ui, repo, pats, opts, rename=True) |
|
4903 | return cmdutil.copy(ui, repo, pats, opts, rename=True) | |
4902 | finally: |
|
4904 | finally: | |
4903 | wlock.release() |
|
4905 | wlock.release() | |
4904 |
|
4906 | |||
4905 | @command('resolve', |
|
4907 | @command('resolve', | |
4906 | [('a', 'all', None, _('select all unresolved files')), |
|
4908 | [('a', 'all', None, _('select all unresolved files')), | |
4907 | ('l', 'list', None, _('list state of files needing merge')), |
|
4909 | ('l', 'list', None, _('list state of files needing merge')), | |
4908 | ('m', 'mark', None, _('mark files as resolved')), |
|
4910 | ('m', 'mark', None, _('mark files as resolved')), | |
4909 | ('u', 'unmark', None, _('mark files as unresolved')), |
|
4911 | ('u', 'unmark', None, _('mark files as unresolved')), | |
4910 | ('n', 'no-status', None, _('hide status prefix'))] |
|
4912 | ('n', 'no-status', None, _('hide status prefix'))] | |
4911 | + mergetoolopts + walkopts, |
|
4913 | + mergetoolopts + walkopts, | |
4912 | _('[OPTION]... [FILE]...')) |
|
4914 | _('[OPTION]... [FILE]...')) | |
4913 | def resolve(ui, repo, *pats, **opts): |
|
4915 | def resolve(ui, repo, *pats, **opts): | |
4914 | """redo merges or set/view the merge status of files |
|
4916 | """redo merges or set/view the merge status of files | |
4915 |
|
4917 | |||
4916 | Merges with unresolved conflicts are often the result of |
|
4918 | Merges with unresolved conflicts are often the result of | |
4917 | non-interactive merging using the ``internal:merge`` configuration |
|
4919 | non-interactive merging using the ``internal:merge`` configuration | |
4918 | setting, or a command-line merge tool like ``diff3``. The resolve |
|
4920 | setting, or a command-line merge tool like ``diff3``. The resolve | |
4919 | command is used to manage the files involved in a merge, after |
|
4921 | command is used to manage the files involved in a merge, after | |
4920 | :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the |
|
4922 | :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the | |
4921 | working directory must have two parents). See :hg:`help |
|
4923 | working directory must have two parents). See :hg:`help | |
4922 | merge-tools` for information on configuring merge tools. |
|
4924 | merge-tools` for information on configuring merge tools. | |
4923 |
|
4925 | |||
4924 | The resolve command can be used in the following ways: |
|
4926 | The resolve command can be used in the following ways: | |
4925 |
|
4927 | |||
4926 | - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified |
|
4928 | - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified | |
4927 | files, discarding any previous merge attempts. Re-merging is not |
|
4929 | files, discarding any previous merge attempts. Re-merging is not | |
4928 | performed for files already marked as resolved. Use ``--all/-a`` |
|
4930 | performed for files already marked as resolved. Use ``--all/-a`` | |
4929 | to select all unresolved files. ``--tool`` can be used to specify |
|
4931 | to select all unresolved files. ``--tool`` can be used to specify | |
4930 | the merge tool used for the given files. It overrides the HGMERGE |
|
4932 | the merge tool used for the given files. It overrides the HGMERGE | |
4931 | environment variable and your configuration files. Previous file |
|
4933 | environment variable and your configuration files. Previous file | |
4932 | contents are saved with a ``.orig`` suffix. |
|
4934 | contents are saved with a ``.orig`` suffix. | |
4933 |
|
4935 | |||
4934 | - :hg:`resolve -m [FILE]`: mark a file as having been resolved |
|
4936 | - :hg:`resolve -m [FILE]`: mark a file as having been resolved | |
4935 | (e.g. after having manually fixed-up the files). The default is |
|
4937 | (e.g. after having manually fixed-up the files). The default is | |
4936 | to mark all unresolved files. |
|
4938 | to mark all unresolved files. | |
4937 |
|
4939 | |||
4938 | - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The |
|
4940 | - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The | |
4939 | default is to mark all resolved files. |
|
4941 | default is to mark all resolved files. | |
4940 |
|
4942 | |||
4941 | - :hg:`resolve -l`: list files which had or still have conflicts. |
|
4943 | - :hg:`resolve -l`: list files which had or still have conflicts. | |
4942 | In the printed list, ``U`` = unresolved and ``R`` = resolved. |
|
4944 | In the printed list, ``U`` = unresolved and ``R`` = resolved. | |
4943 |
|
4945 | |||
4944 | Note that Mercurial will not let you commit files with unresolved |
|
4946 | Note that Mercurial will not let you commit files with unresolved | |
4945 | merge conflicts. You must use :hg:`resolve -m ...` before you can |
|
4947 | merge conflicts. You must use :hg:`resolve -m ...` before you can | |
4946 | commit after a conflicting merge. |
|
4948 | commit after a conflicting merge. | |
4947 |
|
4949 | |||
4948 | Returns 0 on success, 1 if any files fail a resolve attempt. |
|
4950 | Returns 0 on success, 1 if any files fail a resolve attempt. | |
4949 | """ |
|
4951 | """ | |
4950 |
|
4952 | |||
4951 | all, mark, unmark, show, nostatus = \ |
|
4953 | all, mark, unmark, show, nostatus = \ | |
4952 | [opts.get(o) for o in 'all mark unmark list no_status'.split()] |
|
4954 | [opts.get(o) for o in 'all mark unmark list no_status'.split()] | |
4953 |
|
4955 | |||
4954 | if (show and (mark or unmark)) or (mark and unmark): |
|
4956 | if (show and (mark or unmark)) or (mark and unmark): | |
4955 | raise util.Abort(_("too many options specified")) |
|
4957 | raise util.Abort(_("too many options specified")) | |
4956 | if pats and all: |
|
4958 | if pats and all: | |
4957 | raise util.Abort(_("can't specify --all and patterns")) |
|
4959 | raise util.Abort(_("can't specify --all and patterns")) | |
4958 | if not (all or pats or show or mark or unmark): |
|
4960 | if not (all or pats or show or mark or unmark): | |
4959 | raise util.Abort(_('no files or directories specified; ' |
|
4961 | raise util.Abort(_('no files or directories specified; ' | |
4960 | 'use --all to remerge all files')) |
|
4962 | 'use --all to remerge all files')) | |
4961 |
|
4963 | |||
4962 | ms = mergemod.mergestate(repo) |
|
4964 | ms = mergemod.mergestate(repo) | |
4963 | m = scmutil.match(repo[None], pats, opts) |
|
4965 | m = scmutil.match(repo[None], pats, opts) | |
4964 | ret = 0 |
|
4966 | ret = 0 | |
4965 |
|
4967 | |||
4966 | for f in ms: |
|
4968 | for f in ms: | |
4967 | if m(f): |
|
4969 | if m(f): | |
4968 | if show: |
|
4970 | if show: | |
4969 | if nostatus: |
|
4971 | if nostatus: | |
4970 | ui.write("%s\n" % f) |
|
4972 | ui.write("%s\n" % f) | |
4971 | else: |
|
4973 | else: | |
4972 | ui.write("%s %s\n" % (ms[f].upper(), f), |
|
4974 | ui.write("%s %s\n" % (ms[f].upper(), f), | |
4973 | label='resolve.' + |
|
4975 | label='resolve.' + | |
4974 | {'u': 'unresolved', 'r': 'resolved'}[ms[f]]) |
|
4976 | {'u': 'unresolved', 'r': 'resolved'}[ms[f]]) | |
4975 | elif mark: |
|
4977 | elif mark: | |
4976 | ms.mark(f, "r") |
|
4978 | ms.mark(f, "r") | |
4977 | elif unmark: |
|
4979 | elif unmark: | |
4978 | ms.mark(f, "u") |
|
4980 | ms.mark(f, "u") | |
4979 | else: |
|
4981 | else: | |
4980 | wctx = repo[None] |
|
4982 | wctx = repo[None] | |
4981 |
|
4983 | |||
4982 | # backup pre-resolve (merge uses .orig for its own purposes) |
|
4984 | # backup pre-resolve (merge uses .orig for its own purposes) | |
4983 | a = repo.wjoin(f) |
|
4985 | a = repo.wjoin(f) | |
4984 | util.copyfile(a, a + ".resolve") |
|
4986 | util.copyfile(a, a + ".resolve") | |
4985 |
|
4987 | |||
4986 | try: |
|
4988 | try: | |
4987 | # resolve file |
|
4989 | # resolve file | |
4988 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
4990 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | |
4989 | 'resolve') |
|
4991 | 'resolve') | |
4990 | if ms.resolve(f, wctx): |
|
4992 | if ms.resolve(f, wctx): | |
4991 | ret = 1 |
|
4993 | ret = 1 | |
4992 | finally: |
|
4994 | finally: | |
4993 | ui.setconfig('ui', 'forcemerge', '', 'resolve') |
|
4995 | ui.setconfig('ui', 'forcemerge', '', 'resolve') | |
4994 | ms.commit() |
|
4996 | ms.commit() | |
4995 |
|
4997 | |||
4996 | # replace filemerge's .orig file with our resolve file |
|
4998 | # replace filemerge's .orig file with our resolve file | |
4997 | util.rename(a + ".resolve", a + ".orig") |
|
4999 | util.rename(a + ".resolve", a + ".orig") | |
4998 |
|
5000 | |||
4999 | ms.commit() |
|
5001 | ms.commit() | |
5000 | return ret |
|
5002 | return ret | |
5001 |
|
5003 | |||
5002 | @command('revert', |
|
5004 | @command('revert', | |
5003 | [('a', 'all', None, _('revert all changes when no arguments given')), |
|
5005 | [('a', 'all', None, _('revert all changes when no arguments given')), | |
5004 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), |
|
5006 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), | |
5005 | ('r', 'rev', '', _('revert to the specified revision'), _('REV')), |
|
5007 | ('r', 'rev', '', _('revert to the specified revision'), _('REV')), | |
5006 | ('C', 'no-backup', None, _('do not save backup copies of files')), |
|
5008 | ('C', 'no-backup', None, _('do not save backup copies of files')), | |
5007 | ] + walkopts + dryrunopts, |
|
5009 | ] + walkopts + dryrunopts, | |
5008 | _('[OPTION]... [-r REV] [NAME]...')) |
|
5010 | _('[OPTION]... [-r REV] [NAME]...')) | |
5009 | def revert(ui, repo, *pats, **opts): |
|
5011 | def revert(ui, repo, *pats, **opts): | |
5010 | """restore files to their checkout state |
|
5012 | """restore files to their checkout state | |
5011 |
|
5013 | |||
5012 | .. note:: |
|
5014 | .. note:: | |
5013 |
|
5015 | |||
5014 | To check out earlier revisions, you should use :hg:`update REV`. |
|
5016 | To check out earlier revisions, you should use :hg:`update REV`. | |
5015 | To cancel an uncommitted merge (and lose your changes), |
|
5017 | To cancel an uncommitted merge (and lose your changes), | |
5016 | use :hg:`update --clean .`. |
|
5018 | use :hg:`update --clean .`. | |
5017 |
|
5019 | |||
5018 | With no revision specified, revert the specified files or directories |
|
5020 | With no revision specified, revert the specified files or directories | |
5019 | to the contents they had in the parent of the working directory. |
|
5021 | to the contents they had in the parent of the working directory. | |
5020 | This restores the contents of files to an unmodified |
|
5022 | This restores the contents of files to an unmodified | |
5021 | state and unschedules adds, removes, copies, and renames. If the |
|
5023 | state and unschedules adds, removes, copies, and renames. If the | |
5022 | working directory has two parents, you must explicitly specify a |
|
5024 | working directory has two parents, you must explicitly specify a | |
5023 | revision. |
|
5025 | revision. | |
5024 |
|
5026 | |||
5025 | Using the -r/--rev or -d/--date options, revert the given files or |
|
5027 | Using the -r/--rev or -d/--date options, revert the given files or | |
5026 | directories to their states as of a specific revision. Because |
|
5028 | directories to their states as of a specific revision. Because | |
5027 | revert does not change the working directory parents, this will |
|
5029 | revert does not change the working directory parents, this will | |
5028 | cause these files to appear modified. This can be helpful to "back |
|
5030 | cause these files to appear modified. This can be helpful to "back | |
5029 | out" some or all of an earlier change. See :hg:`backout` for a |
|
5031 | out" some or all of an earlier change. See :hg:`backout` for a | |
5030 | related method. |
|
5032 | related method. | |
5031 |
|
5033 | |||
5032 | Modified files are saved with a .orig suffix before reverting. |
|
5034 | Modified files are saved with a .orig suffix before reverting. | |
5033 | To disable these backups, use --no-backup. |
|
5035 | To disable these backups, use --no-backup. | |
5034 |
|
5036 | |||
5035 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
5037 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
5036 |
|
5038 | |||
5037 | Returns 0 on success. |
|
5039 | Returns 0 on success. | |
5038 | """ |
|
5040 | """ | |
5039 |
|
5041 | |||
5040 | if opts.get("date"): |
|
5042 | if opts.get("date"): | |
5041 | if opts.get("rev"): |
|
5043 | if opts.get("rev"): | |
5042 | raise util.Abort(_("you can't specify a revision and a date")) |
|
5044 | raise util.Abort(_("you can't specify a revision and a date")) | |
5043 | opts["rev"] = cmdutil.finddate(ui, repo, opts["date"]) |
|
5045 | opts["rev"] = cmdutil.finddate(ui, repo, opts["date"]) | |
5044 |
|
5046 | |||
5045 | parent, p2 = repo.dirstate.parents() |
|
5047 | parent, p2 = repo.dirstate.parents() | |
5046 | if not opts.get('rev') and p2 != nullid: |
|
5048 | if not opts.get('rev') and p2 != nullid: | |
5047 | # revert after merge is a trap for new users (issue2915) |
|
5049 | # revert after merge is a trap for new users (issue2915) | |
5048 | raise util.Abort(_('uncommitted merge with no revision specified'), |
|
5050 | raise util.Abort(_('uncommitted merge with no revision specified'), | |
5049 | hint=_('use "hg update" or see "hg help revert"')) |
|
5051 | hint=_('use "hg update" or see "hg help revert"')) | |
5050 |
|
5052 | |||
5051 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
5053 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
5052 |
|
5054 | |||
5053 | if not pats and not opts.get('all'): |
|
5055 | if not pats and not opts.get('all'): | |
5054 | msg = _("no files or directories specified") |
|
5056 | msg = _("no files or directories specified") | |
5055 | if p2 != nullid: |
|
5057 | if p2 != nullid: | |
5056 | hint = _("uncommitted merge, use --all to discard all changes," |
|
5058 | hint = _("uncommitted merge, use --all to discard all changes," | |
5057 | " or 'hg update -C .' to abort the merge") |
|
5059 | " or 'hg update -C .' to abort the merge") | |
5058 | raise util.Abort(msg, hint=hint) |
|
5060 | raise util.Abort(msg, hint=hint) | |
5059 | dirty = util.any(repo.status()) |
|
5061 | dirty = util.any(repo.status()) | |
5060 | node = ctx.node() |
|
5062 | node = ctx.node() | |
5061 | if node != parent: |
|
5063 | if node != parent: | |
5062 | if dirty: |
|
5064 | if dirty: | |
5063 | hint = _("uncommitted changes, use --all to discard all" |
|
5065 | hint = _("uncommitted changes, use --all to discard all" | |
5064 | " changes, or 'hg update %s' to update") % ctx.rev() |
|
5066 | " changes, or 'hg update %s' to update") % ctx.rev() | |
5065 | else: |
|
5067 | else: | |
5066 | hint = _("use --all to revert all files," |
|
5068 | hint = _("use --all to revert all files," | |
5067 | " or 'hg update %s' to update") % ctx.rev() |
|
5069 | " or 'hg update %s' to update") % ctx.rev() | |
5068 | elif dirty: |
|
5070 | elif dirty: | |
5069 | hint = _("uncommitted changes, use --all to discard all changes") |
|
5071 | hint = _("uncommitted changes, use --all to discard all changes") | |
5070 | else: |
|
5072 | else: | |
5071 | hint = _("use --all to revert all files") |
|
5073 | hint = _("use --all to revert all files") | |
5072 | raise util.Abort(msg, hint=hint) |
|
5074 | raise util.Abort(msg, hint=hint) | |
5073 |
|
5075 | |||
5074 | return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts) |
|
5076 | return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts) | |
5075 |
|
5077 | |||
5076 | @command('rollback', dryrunopts + |
|
5078 | @command('rollback', dryrunopts + | |
5077 | [('f', 'force', False, _('ignore safety measures'))]) |
|
5079 | [('f', 'force', False, _('ignore safety measures'))]) | |
5078 | def rollback(ui, repo, **opts): |
|
5080 | def rollback(ui, repo, **opts): | |
5079 | """roll back the last transaction (DANGEROUS) (DEPRECATED) |
|
5081 | """roll back the last transaction (DANGEROUS) (DEPRECATED) | |
5080 |
|
5082 | |||
5081 | Please use :hg:`commit --amend` instead of rollback to correct |
|
5083 | Please use :hg:`commit --amend` instead of rollback to correct | |
5082 | mistakes in the last commit. |
|
5084 | mistakes in the last commit. | |
5083 |
|
5085 | |||
5084 | This command should be used with care. There is only one level of |
|
5086 | This command should be used with care. There is only one level of | |
5085 | rollback, and there is no way to undo a rollback. It will also |
|
5087 | rollback, and there is no way to undo a rollback. It will also | |
5086 | restore the dirstate at the time of the last transaction, losing |
|
5088 | restore the dirstate at the time of the last transaction, losing | |
5087 | any dirstate changes since that time. This command does not alter |
|
5089 | any dirstate changes since that time. This command does not alter | |
5088 | the working directory. |
|
5090 | the working directory. | |
5089 |
|
5091 | |||
5090 | Transactions are used to encapsulate the effects of all commands |
|
5092 | Transactions are used to encapsulate the effects of all commands | |
5091 | that create new changesets or propagate existing changesets into a |
|
5093 | that create new changesets or propagate existing changesets into a | |
5092 | repository. |
|
5094 | repository. | |
5093 |
|
5095 | |||
5094 | .. container:: verbose |
|
5096 | .. container:: verbose | |
5095 |
|
5097 | |||
5096 | For example, the following commands are transactional, and their |
|
5098 | For example, the following commands are transactional, and their | |
5097 | effects can be rolled back: |
|
5099 | effects can be rolled back: | |
5098 |
|
5100 | |||
5099 | - commit |
|
5101 | - commit | |
5100 | - import |
|
5102 | - import | |
5101 | - pull |
|
5103 | - pull | |
5102 | - push (with this repository as the destination) |
|
5104 | - push (with this repository as the destination) | |
5103 | - unbundle |
|
5105 | - unbundle | |
5104 |
|
5106 | |||
5105 | To avoid permanent data loss, rollback will refuse to rollback a |
|
5107 | To avoid permanent data loss, rollback will refuse to rollback a | |
5106 | commit transaction if it isn't checked out. Use --force to |
|
5108 | commit transaction if it isn't checked out. Use --force to | |
5107 | override this protection. |
|
5109 | override this protection. | |
5108 |
|
5110 | |||
5109 | This command is not intended for use on public repositories. Once |
|
5111 | This command is not intended for use on public repositories. Once | |
5110 | changes are visible for pull by other users, rolling a transaction |
|
5112 | changes are visible for pull by other users, rolling a transaction | |
5111 | back locally is ineffective (someone else may already have pulled |
|
5113 | back locally is ineffective (someone else may already have pulled | |
5112 | the changes). Furthermore, a race is possible with readers of the |
|
5114 | the changes). Furthermore, a race is possible with readers of the | |
5113 | repository; for example an in-progress pull from the repository |
|
5115 | repository; for example an in-progress pull from the repository | |
5114 | may fail if a rollback is performed. |
|
5116 | may fail if a rollback is performed. | |
5115 |
|
5117 | |||
5116 | Returns 0 on success, 1 if no rollback data is available. |
|
5118 | Returns 0 on success, 1 if no rollback data is available. | |
5117 | """ |
|
5119 | """ | |
5118 | return repo.rollback(dryrun=opts.get('dry_run'), |
|
5120 | return repo.rollback(dryrun=opts.get('dry_run'), | |
5119 | force=opts.get('force')) |
|
5121 | force=opts.get('force')) | |
5120 |
|
5122 | |||
5121 | @command('root', []) |
|
5123 | @command('root', []) | |
5122 | def root(ui, repo): |
|
5124 | def root(ui, repo): | |
5123 | """print the root (top) of the current working directory |
|
5125 | """print the root (top) of the current working directory | |
5124 |
|
5126 | |||
5125 | Print the root directory of the current repository. |
|
5127 | Print the root directory of the current repository. | |
5126 |
|
5128 | |||
5127 | Returns 0 on success. |
|
5129 | Returns 0 on success. | |
5128 | """ |
|
5130 | """ | |
5129 | ui.write(repo.root + "\n") |
|
5131 | ui.write(repo.root + "\n") | |
5130 |
|
5132 | |||
5131 | @command('^serve', |
|
5133 | @command('^serve', | |
5132 | [('A', 'accesslog', '', _('name of access log file to write to'), |
|
5134 | [('A', 'accesslog', '', _('name of access log file to write to'), | |
5133 | _('FILE')), |
|
5135 | _('FILE')), | |
5134 | ('d', 'daemon', None, _('run server in background')), |
|
5136 | ('d', 'daemon', None, _('run server in background')), | |
5135 | ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')), |
|
5137 | ('', 'daemon-pipefds', '', _('used internally by daemon mode'), _('NUM')), | |
5136 | ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')), |
|
5138 | ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')), | |
5137 | # use string type, then we can check if something was passed |
|
5139 | # use string type, then we can check if something was passed | |
5138 | ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')), |
|
5140 | ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')), | |
5139 | ('a', 'address', '', _('address to listen on (default: all interfaces)'), |
|
5141 | ('a', 'address', '', _('address to listen on (default: all interfaces)'), | |
5140 | _('ADDR')), |
|
5142 | _('ADDR')), | |
5141 | ('', 'prefix', '', _('prefix path to serve from (default: server root)'), |
|
5143 | ('', 'prefix', '', _('prefix path to serve from (default: server root)'), | |
5142 | _('PREFIX')), |
|
5144 | _('PREFIX')), | |
5143 | ('n', 'name', '', |
|
5145 | ('n', 'name', '', | |
5144 | _('name to show in web pages (default: working directory)'), _('NAME')), |
|
5146 | _('name to show in web pages (default: working directory)'), _('NAME')), | |
5145 | ('', 'web-conf', '', |
|
5147 | ('', 'web-conf', '', | |
5146 | _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')), |
|
5148 | _('name of the hgweb config file (see "hg help hgweb")'), _('FILE')), | |
5147 | ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'), |
|
5149 | ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'), | |
5148 | _('FILE')), |
|
5150 | _('FILE')), | |
5149 | ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')), |
|
5151 | ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')), | |
5150 | ('', 'stdio', None, _('for remote clients')), |
|
5152 | ('', 'stdio', None, _('for remote clients')), | |
5151 | ('', 'cmdserver', '', _('for remote clients'), _('MODE')), |
|
5153 | ('', 'cmdserver', '', _('for remote clients'), _('MODE')), | |
5152 | ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')), |
|
5154 | ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')), | |
5153 | ('', 'style', '', _('template style to use'), _('STYLE')), |
|
5155 | ('', 'style', '', _('template style to use'), _('STYLE')), | |
5154 | ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')), |
|
5156 | ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')), | |
5155 | ('', 'certificate', '', _('SSL certificate file'), _('FILE'))], |
|
5157 | ('', 'certificate', '', _('SSL certificate file'), _('FILE'))], | |
5156 | _('[OPTION]...')) |
|
5158 | _('[OPTION]...')) | |
5157 | def serve(ui, repo, **opts): |
|
5159 | def serve(ui, repo, **opts): | |
5158 | """start stand-alone webserver |
|
5160 | """start stand-alone webserver | |
5159 |
|
5161 | |||
5160 | Start a local HTTP repository browser and pull server. You can use |
|
5162 | Start a local HTTP repository browser and pull server. You can use | |
5161 | this for ad-hoc sharing and browsing of repositories. It is |
|
5163 | this for ad-hoc sharing and browsing of repositories. It is | |
5162 | recommended to use a real web server to serve a repository for |
|
5164 | recommended to use a real web server to serve a repository for | |
5163 | longer periods of time. |
|
5165 | longer periods of time. | |
5164 |
|
5166 | |||
5165 | Please note that the server does not implement access control. |
|
5167 | Please note that the server does not implement access control. | |
5166 | This means that, by default, anybody can read from the server and |
|
5168 | This means that, by default, anybody can read from the server and | |
5167 | nobody can write to it by default. Set the ``web.allow_push`` |
|
5169 | nobody can write to it by default. Set the ``web.allow_push`` | |
5168 | option to ``*`` to allow everybody to push to the server. You |
|
5170 | option to ``*`` to allow everybody to push to the server. You | |
5169 | should use a real web server if you need to authenticate users. |
|
5171 | should use a real web server if you need to authenticate users. | |
5170 |
|
5172 | |||
5171 | By default, the server logs accesses to stdout and errors to |
|
5173 | By default, the server logs accesses to stdout and errors to | |
5172 | stderr. Use the -A/--accesslog and -E/--errorlog options to log to |
|
5174 | stderr. Use the -A/--accesslog and -E/--errorlog options to log to | |
5173 | files. |
|
5175 | files. | |
5174 |
|
5176 | |||
5175 | To have the server choose a free port number to listen on, specify |
|
5177 | To have the server choose a free port number to listen on, specify | |
5176 | a port number of 0; in this case, the server will print the port |
|
5178 | a port number of 0; in this case, the server will print the port | |
5177 | number it uses. |
|
5179 | number it uses. | |
5178 |
|
5180 | |||
5179 | Returns 0 on success. |
|
5181 | Returns 0 on success. | |
5180 | """ |
|
5182 | """ | |
5181 |
|
5183 | |||
5182 | if opts["stdio"] and opts["cmdserver"]: |
|
5184 | if opts["stdio"] and opts["cmdserver"]: | |
5183 | raise util.Abort(_("cannot use --stdio with --cmdserver")) |
|
5185 | raise util.Abort(_("cannot use --stdio with --cmdserver")) | |
5184 |
|
5186 | |||
5185 | def checkrepo(): |
|
5187 | def checkrepo(): | |
5186 | if repo is None: |
|
5188 | if repo is None: | |
5187 | raise error.RepoError(_("there is no Mercurial repository here" |
|
5189 | raise error.RepoError(_("there is no Mercurial repository here" | |
5188 | " (.hg not found)")) |
|
5190 | " (.hg not found)")) | |
5189 |
|
5191 | |||
5190 | if opts["stdio"]: |
|
5192 | if opts["stdio"]: | |
5191 | checkrepo() |
|
5193 | checkrepo() | |
5192 | s = sshserver.sshserver(ui, repo) |
|
5194 | s = sshserver.sshserver(ui, repo) | |
5193 | s.serve_forever() |
|
5195 | s.serve_forever() | |
5194 |
|
5196 | |||
5195 | if opts["cmdserver"]: |
|
5197 | if opts["cmdserver"]: | |
5196 | s = commandserver.server(ui, repo, opts["cmdserver"]) |
|
5198 | s = commandserver.server(ui, repo, opts["cmdserver"]) | |
5197 | return s.serve() |
|
5199 | return s.serve() | |
5198 |
|
5200 | |||
5199 | # this way we can check if something was given in the command-line |
|
5201 | # this way we can check if something was given in the command-line | |
5200 | if opts.get('port'): |
|
5202 | if opts.get('port'): | |
5201 | opts['port'] = util.getport(opts.get('port')) |
|
5203 | opts['port'] = util.getport(opts.get('port')) | |
5202 |
|
5204 | |||
5203 | baseui = repo and repo.baseui or ui |
|
5205 | baseui = repo and repo.baseui or ui | |
5204 | optlist = ("name templates style address port prefix ipv6" |
|
5206 | optlist = ("name templates style address port prefix ipv6" | |
5205 | " accesslog errorlog certificate encoding") |
|
5207 | " accesslog errorlog certificate encoding") | |
5206 | for o in optlist.split(): |
|
5208 | for o in optlist.split(): | |
5207 | val = opts.get(o, '') |
|
5209 | val = opts.get(o, '') | |
5208 | if val in (None, ''): # should check against default options instead |
|
5210 | if val in (None, ''): # should check against default options instead | |
5209 | continue |
|
5211 | continue | |
5210 | baseui.setconfig("web", o, val, 'serve') |
|
5212 | baseui.setconfig("web", o, val, 'serve') | |
5211 | if repo and repo.ui != baseui: |
|
5213 | if repo and repo.ui != baseui: | |
5212 | repo.ui.setconfig("web", o, val, 'serve') |
|
5214 | repo.ui.setconfig("web", o, val, 'serve') | |
5213 |
|
5215 | |||
5214 | o = opts.get('web_conf') or opts.get('webdir_conf') |
|
5216 | o = opts.get('web_conf') or opts.get('webdir_conf') | |
5215 | if not o: |
|
5217 | if not o: | |
5216 | if not repo: |
|
5218 | if not repo: | |
5217 | raise error.RepoError(_("there is no Mercurial repository" |
|
5219 | raise error.RepoError(_("there is no Mercurial repository" | |
5218 | " here (.hg not found)")) |
|
5220 | " here (.hg not found)")) | |
5219 | o = repo |
|
5221 | o = repo | |
5220 |
|
5222 | |||
5221 | app = hgweb.hgweb(o, baseui=baseui) |
|
5223 | app = hgweb.hgweb(o, baseui=baseui) | |
5222 | service = httpservice(ui, app, opts) |
|
5224 | service = httpservice(ui, app, opts) | |
5223 | cmdutil.service(opts, initfn=service.init, runfn=service.run) |
|
5225 | cmdutil.service(opts, initfn=service.init, runfn=service.run) | |
5224 |
|
5226 | |||
5225 | class httpservice(object): |
|
5227 | class httpservice(object): | |
5226 | def __init__(self, ui, app, opts): |
|
5228 | def __init__(self, ui, app, opts): | |
5227 | self.ui = ui |
|
5229 | self.ui = ui | |
5228 | self.app = app |
|
5230 | self.app = app | |
5229 | self.opts = opts |
|
5231 | self.opts = opts | |
5230 |
|
5232 | |||
5231 | def init(self): |
|
5233 | def init(self): | |
5232 | util.setsignalhandler() |
|
5234 | util.setsignalhandler() | |
5233 | self.httpd = hgweb_server.create_server(self.ui, self.app) |
|
5235 | self.httpd = hgweb_server.create_server(self.ui, self.app) | |
5234 |
|
5236 | |||
5235 | if self.opts['port'] and not self.ui.verbose: |
|
5237 | if self.opts['port'] and not self.ui.verbose: | |
5236 | return |
|
5238 | return | |
5237 |
|
5239 | |||
5238 | if self.httpd.prefix: |
|
5240 | if self.httpd.prefix: | |
5239 | prefix = self.httpd.prefix.strip('/') + '/' |
|
5241 | prefix = self.httpd.prefix.strip('/') + '/' | |
5240 | else: |
|
5242 | else: | |
5241 | prefix = '' |
|
5243 | prefix = '' | |
5242 |
|
5244 | |||
5243 | port = ':%d' % self.httpd.port |
|
5245 | port = ':%d' % self.httpd.port | |
5244 | if port == ':80': |
|
5246 | if port == ':80': | |
5245 | port = '' |
|
5247 | port = '' | |
5246 |
|
5248 | |||
5247 | bindaddr = self.httpd.addr |
|
5249 | bindaddr = self.httpd.addr | |
5248 | if bindaddr == '0.0.0.0': |
|
5250 | if bindaddr == '0.0.0.0': | |
5249 | bindaddr = '*' |
|
5251 | bindaddr = '*' | |
5250 | elif ':' in bindaddr: # IPv6 |
|
5252 | elif ':' in bindaddr: # IPv6 | |
5251 | bindaddr = '[%s]' % bindaddr |
|
5253 | bindaddr = '[%s]' % bindaddr | |
5252 |
|
5254 | |||
5253 | fqaddr = self.httpd.fqaddr |
|
5255 | fqaddr = self.httpd.fqaddr | |
5254 | if ':' in fqaddr: |
|
5256 | if ':' in fqaddr: | |
5255 | fqaddr = '[%s]' % fqaddr |
|
5257 | fqaddr = '[%s]' % fqaddr | |
5256 | if self.opts['port']: |
|
5258 | if self.opts['port']: | |
5257 | write = self.ui.status |
|
5259 | write = self.ui.status | |
5258 | else: |
|
5260 | else: | |
5259 | write = self.ui.write |
|
5261 | write = self.ui.write | |
5260 | write(_('listening at http://%s%s/%s (bound to %s:%d)\n') % |
|
5262 | write(_('listening at http://%s%s/%s (bound to %s:%d)\n') % | |
5261 | (fqaddr, port, prefix, bindaddr, self.httpd.port)) |
|
5263 | (fqaddr, port, prefix, bindaddr, self.httpd.port)) | |
5262 |
|
5264 | |||
5263 | def run(self): |
|
5265 | def run(self): | |
5264 | self.httpd.serve_forever() |
|
5266 | self.httpd.serve_forever() | |
5265 |
|
5267 | |||
5266 |
|
5268 | |||
5267 | @command('^status|st', |
|
5269 | @command('^status|st', | |
5268 | [('A', 'all', None, _('show status of all files')), |
|
5270 | [('A', 'all', None, _('show status of all files')), | |
5269 | ('m', 'modified', None, _('show only modified files')), |
|
5271 | ('m', 'modified', None, _('show only modified files')), | |
5270 | ('a', 'added', None, _('show only added files')), |
|
5272 | ('a', 'added', None, _('show only added files')), | |
5271 | ('r', 'removed', None, _('show only removed files')), |
|
5273 | ('r', 'removed', None, _('show only removed files')), | |
5272 | ('d', 'deleted', None, _('show only deleted (but tracked) files')), |
|
5274 | ('d', 'deleted', None, _('show only deleted (but tracked) files')), | |
5273 | ('c', 'clean', None, _('show only files without changes')), |
|
5275 | ('c', 'clean', None, _('show only files without changes')), | |
5274 | ('u', 'unknown', None, _('show only unknown (not tracked) files')), |
|
5276 | ('u', 'unknown', None, _('show only unknown (not tracked) files')), | |
5275 | ('i', 'ignored', None, _('show only ignored files')), |
|
5277 | ('i', 'ignored', None, _('show only ignored files')), | |
5276 | ('n', 'no-status', None, _('hide status prefix')), |
|
5278 | ('n', 'no-status', None, _('hide status prefix')), | |
5277 | ('C', 'copies', None, _('show source of copied files')), |
|
5279 | ('C', 'copies', None, _('show source of copied files')), | |
5278 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), |
|
5280 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), | |
5279 | ('', 'rev', [], _('show difference from revision'), _('REV')), |
|
5281 | ('', 'rev', [], _('show difference from revision'), _('REV')), | |
5280 | ('', 'change', '', _('list the changed files of a revision'), _('REV')), |
|
5282 | ('', 'change', '', _('list the changed files of a revision'), _('REV')), | |
5281 | ] + walkopts + subrepoopts, |
|
5283 | ] + walkopts + subrepoopts, | |
5282 | _('[OPTION]... [FILE]...')) |
|
5284 | _('[OPTION]... [FILE]...')) | |
5283 | def status(ui, repo, *pats, **opts): |
|
5285 | def status(ui, repo, *pats, **opts): | |
5284 | """show changed files in the working directory |
|
5286 | """show changed files in the working directory | |
5285 |
|
5287 | |||
5286 | Show status of files in the repository. If names are given, only |
|
5288 | Show status of files in the repository. If names are given, only | |
5287 | files that match are shown. Files that are clean or ignored or |
|
5289 | files that match are shown. Files that are clean or ignored or | |
5288 | the source of a copy/move operation, are not listed unless |
|
5290 | the source of a copy/move operation, are not listed unless | |
5289 | -c/--clean, -i/--ignored, -C/--copies or -A/--all are given. |
|
5291 | -c/--clean, -i/--ignored, -C/--copies or -A/--all are given. | |
5290 | Unless options described with "show only ..." are given, the |
|
5292 | Unless options described with "show only ..." are given, the | |
5291 | options -mardu are used. |
|
5293 | options -mardu are used. | |
5292 |
|
5294 | |||
5293 | Option -q/--quiet hides untracked (unknown and ignored) files |
|
5295 | Option -q/--quiet hides untracked (unknown and ignored) files | |
5294 | unless explicitly requested with -u/--unknown or -i/--ignored. |
|
5296 | unless explicitly requested with -u/--unknown or -i/--ignored. | |
5295 |
|
5297 | |||
5296 | .. note:: |
|
5298 | .. note:: | |
5297 |
|
5299 | |||
5298 | status may appear to disagree with diff if permissions have |
|
5300 | status may appear to disagree with diff if permissions have | |
5299 | changed or a merge has occurred. The standard diff format does |
|
5301 | changed or a merge has occurred. The standard diff format does | |
5300 | not report permission changes and diff only reports changes |
|
5302 | not report permission changes and diff only reports changes | |
5301 | relative to one merge parent. |
|
5303 | relative to one merge parent. | |
5302 |
|
5304 | |||
5303 | If one revision is given, it is used as the base revision. |
|
5305 | If one revision is given, it is used as the base revision. | |
5304 | If two revisions are given, the differences between them are |
|
5306 | If two revisions are given, the differences between them are | |
5305 | shown. The --change option can also be used as a shortcut to list |
|
5307 | shown. The --change option can also be used as a shortcut to list | |
5306 | the changed files of a revision from its first parent. |
|
5308 | the changed files of a revision from its first parent. | |
5307 |
|
5309 | |||
5308 | The codes used to show the status of files are:: |
|
5310 | The codes used to show the status of files are:: | |
5309 |
|
5311 | |||
5310 | M = modified |
|
5312 | M = modified | |
5311 | A = added |
|
5313 | A = added | |
5312 | R = removed |
|
5314 | R = removed | |
5313 | C = clean |
|
5315 | C = clean | |
5314 | ! = missing (deleted by non-hg command, but still tracked) |
|
5316 | ! = missing (deleted by non-hg command, but still tracked) | |
5315 | ? = not tracked |
|
5317 | ? = not tracked | |
5316 | I = ignored |
|
5318 | I = ignored | |
5317 | = origin of the previous file (with --copies) |
|
5319 | = origin of the previous file (with --copies) | |
5318 |
|
5320 | |||
5319 | .. container:: verbose |
|
5321 | .. container:: verbose | |
5320 |
|
5322 | |||
5321 | Examples: |
|
5323 | Examples: | |
5322 |
|
5324 | |||
5323 | - show changes in the working directory relative to a |
|
5325 | - show changes in the working directory relative to a | |
5324 | changeset:: |
|
5326 | changeset:: | |
5325 |
|
5327 | |||
5326 | hg status --rev 9353 |
|
5328 | hg status --rev 9353 | |
5327 |
|
5329 | |||
5328 | - show all changes including copies in an existing changeset:: |
|
5330 | - show all changes including copies in an existing changeset:: | |
5329 |
|
5331 | |||
5330 | hg status --copies --change 9353 |
|
5332 | hg status --copies --change 9353 | |
5331 |
|
5333 | |||
5332 | - get a NUL separated list of added files, suitable for xargs:: |
|
5334 | - get a NUL separated list of added files, suitable for xargs:: | |
5333 |
|
5335 | |||
5334 | hg status -an0 |
|
5336 | hg status -an0 | |
5335 |
|
5337 | |||
5336 | Returns 0 on success. |
|
5338 | Returns 0 on success. | |
5337 | """ |
|
5339 | """ | |
5338 |
|
5340 | |||
5339 | revs = opts.get('rev') |
|
5341 | revs = opts.get('rev') | |
5340 | change = opts.get('change') |
|
5342 | change = opts.get('change') | |
5341 |
|
5343 | |||
5342 | if revs and change: |
|
5344 | if revs and change: | |
5343 | msg = _('cannot specify --rev and --change at the same time') |
|
5345 | msg = _('cannot specify --rev and --change at the same time') | |
5344 | raise util.Abort(msg) |
|
5346 | raise util.Abort(msg) | |
5345 | elif change: |
|
5347 | elif change: | |
5346 | node2 = scmutil.revsingle(repo, change, None).node() |
|
5348 | node2 = scmutil.revsingle(repo, change, None).node() | |
5347 | node1 = repo[node2].p1().node() |
|
5349 | node1 = repo[node2].p1().node() | |
5348 | else: |
|
5350 | else: | |
5349 | node1, node2 = scmutil.revpair(repo, revs) |
|
5351 | node1, node2 = scmutil.revpair(repo, revs) | |
5350 |
|
5352 | |||
5351 | cwd = (pats and repo.getcwd()) or '' |
|
5353 | cwd = (pats and repo.getcwd()) or '' | |
5352 | end = opts.get('print0') and '\0' or '\n' |
|
5354 | end = opts.get('print0') and '\0' or '\n' | |
5353 | copy = {} |
|
5355 | copy = {} | |
5354 | states = 'modified added removed deleted unknown ignored clean'.split() |
|
5356 | states = 'modified added removed deleted unknown ignored clean'.split() | |
5355 | show = [k for k in states if opts.get(k)] |
|
5357 | show = [k for k in states if opts.get(k)] | |
5356 | if opts.get('all'): |
|
5358 | if opts.get('all'): | |
5357 | show += ui.quiet and (states[:4] + ['clean']) or states |
|
5359 | show += ui.quiet and (states[:4] + ['clean']) or states | |
5358 | if not show: |
|
5360 | if not show: | |
5359 | show = ui.quiet and states[:4] or states[:5] |
|
5361 | show = ui.quiet and states[:4] or states[:5] | |
5360 |
|
5362 | |||
5361 | stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts), |
|
5363 | stat = repo.status(node1, node2, scmutil.match(repo[node2], pats, opts), | |
5362 | 'ignored' in show, 'clean' in show, 'unknown' in show, |
|
5364 | 'ignored' in show, 'clean' in show, 'unknown' in show, | |
5363 | opts.get('subrepos')) |
|
5365 | opts.get('subrepos')) | |
5364 | changestates = zip(states, 'MAR!?IC', stat) |
|
5366 | changestates = zip(states, 'MAR!?IC', stat) | |
5365 |
|
5367 | |||
5366 | if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'): |
|
5368 | if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'): | |
5367 | copy = copies.pathcopies(repo[node1], repo[node2]) |
|
5369 | copy = copies.pathcopies(repo[node1], repo[node2]) | |
5368 |
|
5370 | |||
5369 | fm = ui.formatter('status', opts) |
|
5371 | fm = ui.formatter('status', opts) | |
5370 | fmt = '%s' + end |
|
5372 | fmt = '%s' + end | |
5371 | showchar = not opts.get('no_status') |
|
5373 | showchar = not opts.get('no_status') | |
5372 |
|
5374 | |||
5373 | for state, char, files in changestates: |
|
5375 | for state, char, files in changestates: | |
5374 | if state in show: |
|
5376 | if state in show: | |
5375 | label = 'status.' + state |
|
5377 | label = 'status.' + state | |
5376 | for f in files: |
|
5378 | for f in files: | |
5377 | fm.startitem() |
|
5379 | fm.startitem() | |
5378 | fm.condwrite(showchar, 'status', '%s ', char, label=label) |
|
5380 | fm.condwrite(showchar, 'status', '%s ', char, label=label) | |
5379 | fm.write('path', fmt, repo.pathto(f, cwd), label=label) |
|
5381 | fm.write('path', fmt, repo.pathto(f, cwd), label=label) | |
5380 | if f in copy: |
|
5382 | if f in copy: | |
5381 | fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd), |
|
5383 | fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd), | |
5382 | label='status.copied') |
|
5384 | label='status.copied') | |
5383 | fm.end() |
|
5385 | fm.end() | |
5384 |
|
5386 | |||
5385 | @command('^summary|sum', |
|
5387 | @command('^summary|sum', | |
5386 | [('', 'remote', None, _('check for push and pull'))], '[--remote]') |
|
5388 | [('', 'remote', None, _('check for push and pull'))], '[--remote]') | |
5387 | def summary(ui, repo, **opts): |
|
5389 | def summary(ui, repo, **opts): | |
5388 | """summarize working directory state |
|
5390 | """summarize working directory state | |
5389 |
|
5391 | |||
5390 | This generates a brief summary of the working directory state, |
|
5392 | This generates a brief summary of the working directory state, | |
5391 | including parents, branch, commit status, and available updates. |
|
5393 | including parents, branch, commit status, and available updates. | |
5392 |
|
5394 | |||
5393 | With the --remote option, this will check the default paths for |
|
5395 | With the --remote option, this will check the default paths for | |
5394 | incoming and outgoing changes. This can be time-consuming. |
|
5396 | incoming and outgoing changes. This can be time-consuming. | |
5395 |
|
5397 | |||
5396 | Returns 0 on success. |
|
5398 | Returns 0 on success. | |
5397 | """ |
|
5399 | """ | |
5398 |
|
5400 | |||
5399 | ctx = repo[None] |
|
5401 | ctx = repo[None] | |
5400 | parents = ctx.parents() |
|
5402 | parents = ctx.parents() | |
5401 | pnode = parents[0].node() |
|
5403 | pnode = parents[0].node() | |
5402 | marks = [] |
|
5404 | marks = [] | |
5403 |
|
5405 | |||
5404 | for p in parents: |
|
5406 | for p in parents: | |
5405 | # label with log.changeset (instead of log.parent) since this |
|
5407 | # label with log.changeset (instead of log.parent) since this | |
5406 | # shows a working directory parent *changeset*: |
|
5408 | # shows a working directory parent *changeset*: | |
5407 | # i18n: column positioning for "hg summary" |
|
5409 | # i18n: column positioning for "hg summary" | |
5408 | ui.write(_('parent: %d:%s ') % (p.rev(), str(p)), |
|
5410 | ui.write(_('parent: %d:%s ') % (p.rev(), str(p)), | |
5409 | label='log.changeset changeset.%s' % p.phasestr()) |
|
5411 | label='log.changeset changeset.%s' % p.phasestr()) | |
5410 | ui.write(' '.join(p.tags()), label='log.tag') |
|
5412 | ui.write(' '.join(p.tags()), label='log.tag') | |
5411 | if p.bookmarks(): |
|
5413 | if p.bookmarks(): | |
5412 | marks.extend(p.bookmarks()) |
|
5414 | marks.extend(p.bookmarks()) | |
5413 | if p.rev() == -1: |
|
5415 | if p.rev() == -1: | |
5414 | if not len(repo): |
|
5416 | if not len(repo): | |
5415 | ui.write(_(' (empty repository)')) |
|
5417 | ui.write(_(' (empty repository)')) | |
5416 | else: |
|
5418 | else: | |
5417 | ui.write(_(' (no revision checked out)')) |
|
5419 | ui.write(_(' (no revision checked out)')) | |
5418 | ui.write('\n') |
|
5420 | ui.write('\n') | |
5419 | if p.description(): |
|
5421 | if p.description(): | |
5420 | ui.status(' ' + p.description().splitlines()[0].strip() + '\n', |
|
5422 | ui.status(' ' + p.description().splitlines()[0].strip() + '\n', | |
5421 | label='log.summary') |
|
5423 | label='log.summary') | |
5422 |
|
5424 | |||
5423 | branch = ctx.branch() |
|
5425 | branch = ctx.branch() | |
5424 | bheads = repo.branchheads(branch) |
|
5426 | bheads = repo.branchheads(branch) | |
5425 | # i18n: column positioning for "hg summary" |
|
5427 | # i18n: column positioning for "hg summary" | |
5426 | m = _('branch: %s\n') % branch |
|
5428 | m = _('branch: %s\n') % branch | |
5427 | if branch != 'default': |
|
5429 | if branch != 'default': | |
5428 | ui.write(m, label='log.branch') |
|
5430 | ui.write(m, label='log.branch') | |
5429 | else: |
|
5431 | else: | |
5430 | ui.status(m, label='log.branch') |
|
5432 | ui.status(m, label='log.branch') | |
5431 |
|
5433 | |||
5432 | if marks: |
|
5434 | if marks: | |
5433 | current = repo._bookmarkcurrent |
|
5435 | current = repo._bookmarkcurrent | |
5434 | # i18n: column positioning for "hg summary" |
|
5436 | # i18n: column positioning for "hg summary" | |
5435 | ui.write(_('bookmarks:'), label='log.bookmark') |
|
5437 | ui.write(_('bookmarks:'), label='log.bookmark') | |
5436 | if current is not None: |
|
5438 | if current is not None: | |
5437 | if current in marks: |
|
5439 | if current in marks: | |
5438 | ui.write(' *' + current, label='bookmarks.current') |
|
5440 | ui.write(' *' + current, label='bookmarks.current') | |
5439 | marks.remove(current) |
|
5441 | marks.remove(current) | |
5440 | else: |
|
5442 | else: | |
5441 | ui.write(' [%s]' % current, label='bookmarks.current') |
|
5443 | ui.write(' [%s]' % current, label='bookmarks.current') | |
5442 | for m in marks: |
|
5444 | for m in marks: | |
5443 | ui.write(' ' + m, label='log.bookmark') |
|
5445 | ui.write(' ' + m, label='log.bookmark') | |
5444 | ui.write('\n', label='log.bookmark') |
|
5446 | ui.write('\n', label='log.bookmark') | |
5445 |
|
5447 | |||
5446 | st = list(repo.status(unknown=True))[:6] |
|
5448 | st = list(repo.status(unknown=True))[:6] | |
5447 |
|
5449 | |||
5448 | c = repo.dirstate.copies() |
|
5450 | c = repo.dirstate.copies() | |
5449 | copied, renamed = [], [] |
|
5451 | copied, renamed = [], [] | |
5450 | for d, s in c.iteritems(): |
|
5452 | for d, s in c.iteritems(): | |
5451 | if s in st[2]: |
|
5453 | if s in st[2]: | |
5452 | st[2].remove(s) |
|
5454 | st[2].remove(s) | |
5453 | renamed.append(d) |
|
5455 | renamed.append(d) | |
5454 | else: |
|
5456 | else: | |
5455 | copied.append(d) |
|
5457 | copied.append(d) | |
5456 | if d in st[1]: |
|
5458 | if d in st[1]: | |
5457 | st[1].remove(d) |
|
5459 | st[1].remove(d) | |
5458 | st.insert(3, renamed) |
|
5460 | st.insert(3, renamed) | |
5459 | st.insert(4, copied) |
|
5461 | st.insert(4, copied) | |
5460 |
|
5462 | |||
5461 | ms = mergemod.mergestate(repo) |
|
5463 | ms = mergemod.mergestate(repo) | |
5462 | st.append([f for f in ms if ms[f] == 'u']) |
|
5464 | st.append([f for f in ms if ms[f] == 'u']) | |
5463 |
|
5465 | |||
5464 | subs = [s for s in ctx.substate if ctx.sub(s).dirty()] |
|
5466 | subs = [s for s in ctx.substate if ctx.sub(s).dirty()] | |
5465 | st.append(subs) |
|
5467 | st.append(subs) | |
5466 |
|
5468 | |||
5467 | labels = [ui.label(_('%d modified'), 'status.modified'), |
|
5469 | labels = [ui.label(_('%d modified'), 'status.modified'), | |
5468 | ui.label(_('%d added'), 'status.added'), |
|
5470 | ui.label(_('%d added'), 'status.added'), | |
5469 | ui.label(_('%d removed'), 'status.removed'), |
|
5471 | ui.label(_('%d removed'), 'status.removed'), | |
5470 | ui.label(_('%d renamed'), 'status.copied'), |
|
5472 | ui.label(_('%d renamed'), 'status.copied'), | |
5471 | ui.label(_('%d copied'), 'status.copied'), |
|
5473 | ui.label(_('%d copied'), 'status.copied'), | |
5472 | ui.label(_('%d deleted'), 'status.deleted'), |
|
5474 | ui.label(_('%d deleted'), 'status.deleted'), | |
5473 | ui.label(_('%d unknown'), 'status.unknown'), |
|
5475 | ui.label(_('%d unknown'), 'status.unknown'), | |
5474 | ui.label(_('%d ignored'), 'status.ignored'), |
|
5476 | ui.label(_('%d ignored'), 'status.ignored'), | |
5475 | ui.label(_('%d unresolved'), 'resolve.unresolved'), |
|
5477 | ui.label(_('%d unresolved'), 'resolve.unresolved'), | |
5476 | ui.label(_('%d subrepos'), 'status.modified')] |
|
5478 | ui.label(_('%d subrepos'), 'status.modified')] | |
5477 | t = [] |
|
5479 | t = [] | |
5478 | for s, l in zip(st, labels): |
|
5480 | for s, l in zip(st, labels): | |
5479 | if s: |
|
5481 | if s: | |
5480 | t.append(l % len(s)) |
|
5482 | t.append(l % len(s)) | |
5481 |
|
5483 | |||
5482 | t = ', '.join(t) |
|
5484 | t = ', '.join(t) | |
5483 | cleanworkdir = False |
|
5485 | cleanworkdir = False | |
5484 |
|
5486 | |||
5485 | if repo.vfs.exists('updatestate'): |
|
5487 | if repo.vfs.exists('updatestate'): | |
5486 | t += _(' (interrupted update)') |
|
5488 | t += _(' (interrupted update)') | |
5487 | elif len(parents) > 1: |
|
5489 | elif len(parents) > 1: | |
5488 | t += _(' (merge)') |
|
5490 | t += _(' (merge)') | |
5489 | elif branch != parents[0].branch(): |
|
5491 | elif branch != parents[0].branch(): | |
5490 | t += _(' (new branch)') |
|
5492 | t += _(' (new branch)') | |
5491 | elif (parents[0].closesbranch() and |
|
5493 | elif (parents[0].closesbranch() and | |
5492 | pnode in repo.branchheads(branch, closed=True)): |
|
5494 | pnode in repo.branchheads(branch, closed=True)): | |
5493 | t += _(' (head closed)') |
|
5495 | t += _(' (head closed)') | |
5494 | elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]): |
|
5496 | elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]): | |
5495 | t += _(' (clean)') |
|
5497 | t += _(' (clean)') | |
5496 | cleanworkdir = True |
|
5498 | cleanworkdir = True | |
5497 | elif pnode not in bheads: |
|
5499 | elif pnode not in bheads: | |
5498 | t += _(' (new branch head)') |
|
5500 | t += _(' (new branch head)') | |
5499 |
|
5501 | |||
5500 | if cleanworkdir: |
|
5502 | if cleanworkdir: | |
5501 | # i18n: column positioning for "hg summary" |
|
5503 | # i18n: column positioning for "hg summary" | |
5502 | ui.status(_('commit: %s\n') % t.strip()) |
|
5504 | ui.status(_('commit: %s\n') % t.strip()) | |
5503 | else: |
|
5505 | else: | |
5504 | # i18n: column positioning for "hg summary" |
|
5506 | # i18n: column positioning for "hg summary" | |
5505 | ui.write(_('commit: %s\n') % t.strip()) |
|
5507 | ui.write(_('commit: %s\n') % t.strip()) | |
5506 |
|
5508 | |||
5507 | # all ancestors of branch heads - all ancestors of parent = new csets |
|
5509 | # all ancestors of branch heads - all ancestors of parent = new csets | |
5508 | new = len(repo.changelog.findmissing([ctx.node() for ctx in parents], |
|
5510 | new = len(repo.changelog.findmissing([ctx.node() for ctx in parents], | |
5509 | bheads)) |
|
5511 | bheads)) | |
5510 |
|
5512 | |||
5511 | if new == 0: |
|
5513 | if new == 0: | |
5512 | # i18n: column positioning for "hg summary" |
|
5514 | # i18n: column positioning for "hg summary" | |
5513 | ui.status(_('update: (current)\n')) |
|
5515 | ui.status(_('update: (current)\n')) | |
5514 | elif pnode not in bheads: |
|
5516 | elif pnode not in bheads: | |
5515 | # i18n: column positioning for "hg summary" |
|
5517 | # i18n: column positioning for "hg summary" | |
5516 | ui.write(_('update: %d new changesets (update)\n') % new) |
|
5518 | ui.write(_('update: %d new changesets (update)\n') % new) | |
5517 | else: |
|
5519 | else: | |
5518 | # i18n: column positioning for "hg summary" |
|
5520 | # i18n: column positioning for "hg summary" | |
5519 | ui.write(_('update: %d new changesets, %d branch heads (merge)\n') % |
|
5521 | ui.write(_('update: %d new changesets, %d branch heads (merge)\n') % | |
5520 | (new, len(bheads))) |
|
5522 | (new, len(bheads))) | |
5521 |
|
5523 | |||
5522 | cmdutil.summaryhooks(ui, repo) |
|
5524 | cmdutil.summaryhooks(ui, repo) | |
5523 |
|
5525 | |||
5524 | if opts.get('remote'): |
|
5526 | if opts.get('remote'): | |
5525 | needsincoming, needsoutgoing = True, True |
|
5527 | needsincoming, needsoutgoing = True, True | |
5526 | else: |
|
5528 | else: | |
5527 | needsincoming, needsoutgoing = False, False |
|
5529 | needsincoming, needsoutgoing = False, False | |
5528 | for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None): |
|
5530 | for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None): | |
5529 | if i: |
|
5531 | if i: | |
5530 | needsincoming = True |
|
5532 | needsincoming = True | |
5531 | if o: |
|
5533 | if o: | |
5532 | needsoutgoing = True |
|
5534 | needsoutgoing = True | |
5533 | if not needsincoming and not needsoutgoing: |
|
5535 | if not needsincoming and not needsoutgoing: | |
5534 | return |
|
5536 | return | |
5535 |
|
5537 | |||
5536 | def getincoming(): |
|
5538 | def getincoming(): | |
5537 | source, branches = hg.parseurl(ui.expandpath('default')) |
|
5539 | source, branches = hg.parseurl(ui.expandpath('default')) | |
5538 | sbranch = branches[0] |
|
5540 | sbranch = branches[0] | |
5539 | try: |
|
5541 | try: | |
5540 | other = hg.peer(repo, {}, source) |
|
5542 | other = hg.peer(repo, {}, source) | |
5541 | except error.RepoError: |
|
5543 | except error.RepoError: | |
5542 | if opts.get('remote'): |
|
5544 | if opts.get('remote'): | |
5543 | raise |
|
5545 | raise | |
5544 | return source, sbranch, None, None, None |
|
5546 | return source, sbranch, None, None, None | |
5545 | revs, checkout = hg.addbranchrevs(repo, other, branches, None) |
|
5547 | revs, checkout = hg.addbranchrevs(repo, other, branches, None) | |
5546 | if revs: |
|
5548 | if revs: | |
5547 | revs = [other.lookup(rev) for rev in revs] |
|
5549 | revs = [other.lookup(rev) for rev in revs] | |
5548 | ui.debug('comparing with %s\n' % util.hidepassword(source)) |
|
5550 | ui.debug('comparing with %s\n' % util.hidepassword(source)) | |
5549 | repo.ui.pushbuffer() |
|
5551 | repo.ui.pushbuffer() | |
5550 | commoninc = discovery.findcommonincoming(repo, other, heads=revs) |
|
5552 | commoninc = discovery.findcommonincoming(repo, other, heads=revs) | |
5551 | repo.ui.popbuffer() |
|
5553 | repo.ui.popbuffer() | |
5552 | return source, sbranch, other, commoninc, commoninc[1] |
|
5554 | return source, sbranch, other, commoninc, commoninc[1] | |
5553 |
|
5555 | |||
5554 | if needsincoming: |
|
5556 | if needsincoming: | |
5555 | source, sbranch, sother, commoninc, incoming = getincoming() |
|
5557 | source, sbranch, sother, commoninc, incoming = getincoming() | |
5556 | else: |
|
5558 | else: | |
5557 | source = sbranch = sother = commoninc = incoming = None |
|
5559 | source = sbranch = sother = commoninc = incoming = None | |
5558 |
|
5560 | |||
5559 | def getoutgoing(): |
|
5561 | def getoutgoing(): | |
5560 | dest, branches = hg.parseurl(ui.expandpath('default-push', 'default')) |
|
5562 | dest, branches = hg.parseurl(ui.expandpath('default-push', 'default')) | |
5561 | dbranch = branches[0] |
|
5563 | dbranch = branches[0] | |
5562 | revs, checkout = hg.addbranchrevs(repo, repo, branches, None) |
|
5564 | revs, checkout = hg.addbranchrevs(repo, repo, branches, None) | |
5563 | if source != dest: |
|
5565 | if source != dest: | |
5564 | try: |
|
5566 | try: | |
5565 | dother = hg.peer(repo, {}, dest) |
|
5567 | dother = hg.peer(repo, {}, dest) | |
5566 | except error.RepoError: |
|
5568 | except error.RepoError: | |
5567 | if opts.get('remote'): |
|
5569 | if opts.get('remote'): | |
5568 | raise |
|
5570 | raise | |
5569 | return dest, dbranch, None, None |
|
5571 | return dest, dbranch, None, None | |
5570 | ui.debug('comparing with %s\n' % util.hidepassword(dest)) |
|
5572 | ui.debug('comparing with %s\n' % util.hidepassword(dest)) | |
5571 | elif sother is None: |
|
5573 | elif sother is None: | |
5572 | # there is no explicit destination peer, but source one is invalid |
|
5574 | # there is no explicit destination peer, but source one is invalid | |
5573 | return dest, dbranch, None, None |
|
5575 | return dest, dbranch, None, None | |
5574 | else: |
|
5576 | else: | |
5575 | dother = sother |
|
5577 | dother = sother | |
5576 | if (source != dest or (sbranch is not None and sbranch != dbranch)): |
|
5578 | if (source != dest or (sbranch is not None and sbranch != dbranch)): | |
5577 | common = None |
|
5579 | common = None | |
5578 | else: |
|
5580 | else: | |
5579 | common = commoninc |
|
5581 | common = commoninc | |
5580 | if revs: |
|
5582 | if revs: | |
5581 | revs = [repo.lookup(rev) for rev in revs] |
|
5583 | revs = [repo.lookup(rev) for rev in revs] | |
5582 | repo.ui.pushbuffer() |
|
5584 | repo.ui.pushbuffer() | |
5583 | outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs, |
|
5585 | outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs, | |
5584 | commoninc=common) |
|
5586 | commoninc=common) | |
5585 | repo.ui.popbuffer() |
|
5587 | repo.ui.popbuffer() | |
5586 | return dest, dbranch, dother, outgoing |
|
5588 | return dest, dbranch, dother, outgoing | |
5587 |
|
5589 | |||
5588 | if needsoutgoing: |
|
5590 | if needsoutgoing: | |
5589 | dest, dbranch, dother, outgoing = getoutgoing() |
|
5591 | dest, dbranch, dother, outgoing = getoutgoing() | |
5590 | else: |
|
5592 | else: | |
5591 | dest = dbranch = dother = outgoing = None |
|
5593 | dest = dbranch = dother = outgoing = None | |
5592 |
|
5594 | |||
5593 | if opts.get('remote'): |
|
5595 | if opts.get('remote'): | |
5594 | t = [] |
|
5596 | t = [] | |
5595 | if incoming: |
|
5597 | if incoming: | |
5596 | t.append(_('1 or more incoming')) |
|
5598 | t.append(_('1 or more incoming')) | |
5597 | o = outgoing.missing |
|
5599 | o = outgoing.missing | |
5598 | if o: |
|
5600 | if o: | |
5599 | t.append(_('%d outgoing') % len(o)) |
|
5601 | t.append(_('%d outgoing') % len(o)) | |
5600 | other = dother or sother |
|
5602 | other = dother or sother | |
5601 | if 'bookmarks' in other.listkeys('namespaces'): |
|
5603 | if 'bookmarks' in other.listkeys('namespaces'): | |
5602 | lmarks = repo.listkeys('bookmarks') |
|
5604 | lmarks = repo.listkeys('bookmarks') | |
5603 | rmarks = other.listkeys('bookmarks') |
|
5605 | rmarks = other.listkeys('bookmarks') | |
5604 | diff = set(rmarks) - set(lmarks) |
|
5606 | diff = set(rmarks) - set(lmarks) | |
5605 | if len(diff) > 0: |
|
5607 | if len(diff) > 0: | |
5606 | t.append(_('%d incoming bookmarks') % len(diff)) |
|
5608 | t.append(_('%d incoming bookmarks') % len(diff)) | |
5607 | diff = set(lmarks) - set(rmarks) |
|
5609 | diff = set(lmarks) - set(rmarks) | |
5608 | if len(diff) > 0: |
|
5610 | if len(diff) > 0: | |
5609 | t.append(_('%d outgoing bookmarks') % len(diff)) |
|
5611 | t.append(_('%d outgoing bookmarks') % len(diff)) | |
5610 |
|
5612 | |||
5611 | if t: |
|
5613 | if t: | |
5612 | # i18n: column positioning for "hg summary" |
|
5614 | # i18n: column positioning for "hg summary" | |
5613 | ui.write(_('remote: %s\n') % (', '.join(t))) |
|
5615 | ui.write(_('remote: %s\n') % (', '.join(t))) | |
5614 | else: |
|
5616 | else: | |
5615 | # i18n: column positioning for "hg summary" |
|
5617 | # i18n: column positioning for "hg summary" | |
5616 | ui.status(_('remote: (synced)\n')) |
|
5618 | ui.status(_('remote: (synced)\n')) | |
5617 |
|
5619 | |||
5618 | cmdutil.summaryremotehooks(ui, repo, opts, |
|
5620 | cmdutil.summaryremotehooks(ui, repo, opts, | |
5619 | ((source, sbranch, sother, commoninc), |
|
5621 | ((source, sbranch, sother, commoninc), | |
5620 | (dest, dbranch, dother, outgoing))) |
|
5622 | (dest, dbranch, dother, outgoing))) | |
5621 |
|
5623 | |||
5622 | @command('tag', |
|
5624 | @command('tag', | |
5623 | [('f', 'force', None, _('force tag')), |
|
5625 | [('f', 'force', None, _('force tag')), | |
5624 | ('l', 'local', None, _('make the tag local')), |
|
5626 | ('l', 'local', None, _('make the tag local')), | |
5625 | ('r', 'rev', '', _('revision to tag'), _('REV')), |
|
5627 | ('r', 'rev', '', _('revision to tag'), _('REV')), | |
5626 | ('', 'remove', None, _('remove a tag')), |
|
5628 | ('', 'remove', None, _('remove a tag')), | |
5627 | # -l/--local is already there, commitopts cannot be used |
|
5629 | # -l/--local is already there, commitopts cannot be used | |
5628 | ('e', 'edit', None, _('edit commit message')), |
|
5630 | ('e', 'edit', None, _('edit commit message')), | |
5629 | ('m', 'message', '', _('use <text> as commit message'), _('TEXT')), |
|
5631 | ('m', 'message', '', _('use <text> as commit message'), _('TEXT')), | |
5630 | ] + commitopts2, |
|
5632 | ] + commitopts2, | |
5631 | _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')) |
|
5633 | _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')) | |
5632 | def tag(ui, repo, name1, *names, **opts): |
|
5634 | def tag(ui, repo, name1, *names, **opts): | |
5633 | """add one or more tags for the current or given revision |
|
5635 | """add one or more tags for the current or given revision | |
5634 |
|
5636 | |||
5635 | Name a particular revision using <name>. |
|
5637 | Name a particular revision using <name>. | |
5636 |
|
5638 | |||
5637 | Tags are used to name particular revisions of the repository and are |
|
5639 | Tags are used to name particular revisions of the repository and are | |
5638 | very useful to compare different revisions, to go back to significant |
|
5640 | very useful to compare different revisions, to go back to significant | |
5639 | earlier versions or to mark branch points as releases, etc. Changing |
|
5641 | earlier versions or to mark branch points as releases, etc. Changing | |
5640 | an existing tag is normally disallowed; use -f/--force to override. |
|
5642 | an existing tag is normally disallowed; use -f/--force to override. | |
5641 |
|
5643 | |||
5642 | If no revision is given, the parent of the working directory is |
|
5644 | If no revision is given, the parent of the working directory is | |
5643 | used. |
|
5645 | used. | |
5644 |
|
5646 | |||
5645 | To facilitate version control, distribution, and merging of tags, |
|
5647 | To facilitate version control, distribution, and merging of tags, | |
5646 | they are stored as a file named ".hgtags" which is managed similarly |
|
5648 | they are stored as a file named ".hgtags" which is managed similarly | |
5647 | to other project files and can be hand-edited if necessary. This |
|
5649 | to other project files and can be hand-edited if necessary. This | |
5648 | also means that tagging creates a new commit. The file |
|
5650 | also means that tagging creates a new commit. The file | |
5649 | ".hg/localtags" is used for local tags (not shared among |
|
5651 | ".hg/localtags" is used for local tags (not shared among | |
5650 | repositories). |
|
5652 | repositories). | |
5651 |
|
5653 | |||
5652 | Tag commits are usually made at the head of a branch. If the parent |
|
5654 | Tag commits are usually made at the head of a branch. If the parent | |
5653 | of the working directory is not a branch head, :hg:`tag` aborts; use |
|
5655 | of the working directory is not a branch head, :hg:`tag` aborts; use | |
5654 | -f/--force to force the tag commit to be based on a non-head |
|
5656 | -f/--force to force the tag commit to be based on a non-head | |
5655 | changeset. |
|
5657 | changeset. | |
5656 |
|
5658 | |||
5657 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
5659 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
5658 |
|
5660 | |||
5659 | Since tag names have priority over branch names during revision |
|
5661 | Since tag names have priority over branch names during revision | |
5660 | lookup, using an existing branch name as a tag name is discouraged. |
|
5662 | lookup, using an existing branch name as a tag name is discouraged. | |
5661 |
|
5663 | |||
5662 | Returns 0 on success. |
|
5664 | Returns 0 on success. | |
5663 | """ |
|
5665 | """ | |
5664 | wlock = lock = None |
|
5666 | wlock = lock = None | |
5665 | try: |
|
5667 | try: | |
5666 | wlock = repo.wlock() |
|
5668 | wlock = repo.wlock() | |
5667 | lock = repo.lock() |
|
5669 | lock = repo.lock() | |
5668 | rev_ = "." |
|
5670 | rev_ = "." | |
5669 | names = [t.strip() for t in (name1,) + names] |
|
5671 | names = [t.strip() for t in (name1,) + names] | |
5670 | if len(names) != len(set(names)): |
|
5672 | if len(names) != len(set(names)): | |
5671 | raise util.Abort(_('tag names must be unique')) |
|
5673 | raise util.Abort(_('tag names must be unique')) | |
5672 | for n in names: |
|
5674 | for n in names: | |
5673 | scmutil.checknewlabel(repo, n, 'tag') |
|
5675 | scmutil.checknewlabel(repo, n, 'tag') | |
5674 | if not n: |
|
5676 | if not n: | |
5675 | raise util.Abort(_('tag names cannot consist entirely of ' |
|
5677 | raise util.Abort(_('tag names cannot consist entirely of ' | |
5676 | 'whitespace')) |
|
5678 | 'whitespace')) | |
5677 | if opts.get('rev') and opts.get('remove'): |
|
5679 | if opts.get('rev') and opts.get('remove'): | |
5678 | raise util.Abort(_("--rev and --remove are incompatible")) |
|
5680 | raise util.Abort(_("--rev and --remove are incompatible")) | |
5679 | if opts.get('rev'): |
|
5681 | if opts.get('rev'): | |
5680 | rev_ = opts['rev'] |
|
5682 | rev_ = opts['rev'] | |
5681 | message = opts.get('message') |
|
5683 | message = opts.get('message') | |
5682 | if opts.get('remove'): |
|
5684 | if opts.get('remove'): | |
5683 | expectedtype = opts.get('local') and 'local' or 'global' |
|
5685 | expectedtype = opts.get('local') and 'local' or 'global' | |
5684 | for n in names: |
|
5686 | for n in names: | |
5685 | if not repo.tagtype(n): |
|
5687 | if not repo.tagtype(n): | |
5686 | raise util.Abort(_("tag '%s' does not exist") % n) |
|
5688 | raise util.Abort(_("tag '%s' does not exist") % n) | |
5687 | if repo.tagtype(n) != expectedtype: |
|
5689 | if repo.tagtype(n) != expectedtype: | |
5688 | if expectedtype == 'global': |
|
5690 | if expectedtype == 'global': | |
5689 | raise util.Abort(_("tag '%s' is not a global tag") % n) |
|
5691 | raise util.Abort(_("tag '%s' is not a global tag") % n) | |
5690 | else: |
|
5692 | else: | |
5691 | raise util.Abort(_("tag '%s' is not a local tag") % n) |
|
5693 | raise util.Abort(_("tag '%s' is not a local tag") % n) | |
5692 | rev_ = nullid |
|
5694 | rev_ = nullid | |
5693 | if not message: |
|
5695 | if not message: | |
5694 | # we don't translate commit messages |
|
5696 | # we don't translate commit messages | |
5695 | message = 'Removed tag %s' % ', '.join(names) |
|
5697 | message = 'Removed tag %s' % ', '.join(names) | |
5696 | elif not opts.get('force'): |
|
5698 | elif not opts.get('force'): | |
5697 | for n in names: |
|
5699 | for n in names: | |
5698 | if n in repo.tags(): |
|
5700 | if n in repo.tags(): | |
5699 | raise util.Abort(_("tag '%s' already exists " |
|
5701 | raise util.Abort(_("tag '%s' already exists " | |
5700 | "(use -f to force)") % n) |
|
5702 | "(use -f to force)") % n) | |
5701 | if not opts.get('local'): |
|
5703 | if not opts.get('local'): | |
5702 | p1, p2 = repo.dirstate.parents() |
|
5704 | p1, p2 = repo.dirstate.parents() | |
5703 | if p2 != nullid: |
|
5705 | if p2 != nullid: | |
5704 | raise util.Abort(_('uncommitted merge')) |
|
5706 | raise util.Abort(_('uncommitted merge')) | |
5705 | bheads = repo.branchheads() |
|
5707 | bheads = repo.branchheads() | |
5706 | if not opts.get('force') and bheads and p1 not in bheads: |
|
5708 | if not opts.get('force') and bheads and p1 not in bheads: | |
5707 | raise util.Abort(_('not at a branch head (use -f to force)')) |
|
5709 | raise util.Abort(_('not at a branch head (use -f to force)')) | |
5708 | r = scmutil.revsingle(repo, rev_).node() |
|
5710 | r = scmutil.revsingle(repo, rev_).node() | |
5709 |
|
5711 | |||
5710 | if not message: |
|
5712 | if not message: | |
5711 | # we don't translate commit messages |
|
5713 | # we don't translate commit messages | |
5712 | message = ('Added tag %s for changeset %s' % |
|
5714 | message = ('Added tag %s for changeset %s' % | |
5713 | (', '.join(names), short(r))) |
|
5715 | (', '.join(names), short(r))) | |
5714 |
|
5716 | |||
5715 | date = opts.get('date') |
|
5717 | date = opts.get('date') | |
5716 | if date: |
|
5718 | if date: | |
5717 | date = util.parsedate(date) |
|
5719 | date = util.parsedate(date) | |
5718 |
|
5720 | |||
5719 | if opts.get('edit'): |
|
5721 | if opts.get('edit'): | |
5720 | message = ui.edit(message, ui.username()) |
|
5722 | message = ui.edit(message, ui.username()) | |
5721 | repo.savecommitmessage(message) |
|
5723 | repo.savecommitmessage(message) | |
5722 |
|
5724 | |||
5723 | # don't allow tagging the null rev |
|
5725 | # don't allow tagging the null rev | |
5724 | if (not opts.get('remove') and |
|
5726 | if (not opts.get('remove') and | |
5725 | scmutil.revsingle(repo, rev_).rev() == nullrev): |
|
5727 | scmutil.revsingle(repo, rev_).rev() == nullrev): | |
5726 | raise util.Abort(_("cannot tag null revision")) |
|
5728 | raise util.Abort(_("cannot tag null revision")) | |
5727 |
|
5729 | |||
5728 | repo.tag(names, r, message, opts.get('local'), opts.get('user'), date) |
|
5730 | repo.tag(names, r, message, opts.get('local'), opts.get('user'), date) | |
5729 | finally: |
|
5731 | finally: | |
5730 | release(lock, wlock) |
|
5732 | release(lock, wlock) | |
5731 |
|
5733 | |||
5732 | @command('tags', [], '') |
|
5734 | @command('tags', [], '') | |
5733 | def tags(ui, repo, **opts): |
|
5735 | def tags(ui, repo, **opts): | |
5734 | """list repository tags |
|
5736 | """list repository tags | |
5735 |
|
5737 | |||
5736 | This lists both regular and local tags. When the -v/--verbose |
|
5738 | This lists both regular and local tags. When the -v/--verbose | |
5737 | switch is used, a third column "local" is printed for local tags. |
|
5739 | switch is used, a third column "local" is printed for local tags. | |
5738 |
|
5740 | |||
5739 | Returns 0 on success. |
|
5741 | Returns 0 on success. | |
5740 | """ |
|
5742 | """ | |
5741 |
|
5743 | |||
5742 | fm = ui.formatter('tags', opts) |
|
5744 | fm = ui.formatter('tags', opts) | |
5743 | hexfunc = ui.debugflag and hex or short |
|
5745 | hexfunc = ui.debugflag and hex or short | |
5744 | tagtype = "" |
|
5746 | tagtype = "" | |
5745 |
|
5747 | |||
5746 | for t, n in reversed(repo.tagslist()): |
|
5748 | for t, n in reversed(repo.tagslist()): | |
5747 | hn = hexfunc(n) |
|
5749 | hn = hexfunc(n) | |
5748 | label = 'tags.normal' |
|
5750 | label = 'tags.normal' | |
5749 | tagtype = '' |
|
5751 | tagtype = '' | |
5750 | if repo.tagtype(t) == 'local': |
|
5752 | if repo.tagtype(t) == 'local': | |
5751 | label = 'tags.local' |
|
5753 | label = 'tags.local' | |
5752 | tagtype = 'local' |
|
5754 | tagtype = 'local' | |
5753 |
|
5755 | |||
5754 | fm.startitem() |
|
5756 | fm.startitem() | |
5755 | fm.write('tag', '%s', t, label=label) |
|
5757 | fm.write('tag', '%s', t, label=label) | |
5756 | fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s' |
|
5758 | fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s' | |
5757 | fm.condwrite(not ui.quiet, 'rev id', fmt, |
|
5759 | fm.condwrite(not ui.quiet, 'rev id', fmt, | |
5758 | repo.changelog.rev(n), hn, label=label) |
|
5760 | repo.changelog.rev(n), hn, label=label) | |
5759 | fm.condwrite(ui.verbose and tagtype, 'type', ' %s', |
|
5761 | fm.condwrite(ui.verbose and tagtype, 'type', ' %s', | |
5760 | tagtype, label=label) |
|
5762 | tagtype, label=label) | |
5761 | fm.plain('\n') |
|
5763 | fm.plain('\n') | |
5762 | fm.end() |
|
5764 | fm.end() | |
5763 |
|
5765 | |||
5764 | @command('tip', |
|
5766 | @command('tip', | |
5765 | [('p', 'patch', None, _('show patch')), |
|
5767 | [('p', 'patch', None, _('show patch')), | |
5766 | ('g', 'git', None, _('use git extended diff format')), |
|
5768 | ('g', 'git', None, _('use git extended diff format')), | |
5767 | ] + templateopts, |
|
5769 | ] + templateopts, | |
5768 | _('[-p] [-g]')) |
|
5770 | _('[-p] [-g]')) | |
5769 | def tip(ui, repo, **opts): |
|
5771 | def tip(ui, repo, **opts): | |
5770 | """show the tip revision (DEPRECATED) |
|
5772 | """show the tip revision (DEPRECATED) | |
5771 |
|
5773 | |||
5772 | The tip revision (usually just called the tip) is the changeset |
|
5774 | The tip revision (usually just called the tip) is the changeset | |
5773 | most recently added to the repository (and therefore the most |
|
5775 | most recently added to the repository (and therefore the most | |
5774 | recently changed head). |
|
5776 | recently changed head). | |
5775 |
|
5777 | |||
5776 | If you have just made a commit, that commit will be the tip. If |
|
5778 | If you have just made a commit, that commit will be the tip. If | |
5777 | you have just pulled changes from another repository, the tip of |
|
5779 | you have just pulled changes from another repository, the tip of | |
5778 | that repository becomes the current tip. The "tip" tag is special |
|
5780 | that repository becomes the current tip. The "tip" tag is special | |
5779 | and cannot be renamed or assigned to a different changeset. |
|
5781 | and cannot be renamed or assigned to a different changeset. | |
5780 |
|
5782 | |||
5781 | This command is deprecated, please use :hg:`heads` instead. |
|
5783 | This command is deprecated, please use :hg:`heads` instead. | |
5782 |
|
5784 | |||
5783 | Returns 0 on success. |
|
5785 | Returns 0 on success. | |
5784 | """ |
|
5786 | """ | |
5785 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
5787 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
5786 | displayer.show(repo['tip']) |
|
5788 | displayer.show(repo['tip']) | |
5787 | displayer.close() |
|
5789 | displayer.close() | |
5788 |
|
5790 | |||
5789 | @command('unbundle', |
|
5791 | @command('unbundle', | |
5790 | [('u', 'update', None, |
|
5792 | [('u', 'update', None, | |
5791 | _('update to new branch head if changesets were unbundled'))], |
|
5793 | _('update to new branch head if changesets were unbundled'))], | |
5792 | _('[-u] FILE...')) |
|
5794 | _('[-u] FILE...')) | |
5793 | def unbundle(ui, repo, fname1, *fnames, **opts): |
|
5795 | def unbundle(ui, repo, fname1, *fnames, **opts): | |
5794 | """apply one or more changegroup files |
|
5796 | """apply one or more changegroup files | |
5795 |
|
5797 | |||
5796 | Apply one or more compressed changegroup files generated by the |
|
5798 | Apply one or more compressed changegroup files generated by the | |
5797 | bundle command. |
|
5799 | bundle command. | |
5798 |
|
5800 | |||
5799 | Returns 0 on success, 1 if an update has unresolved files. |
|
5801 | Returns 0 on success, 1 if an update has unresolved files. | |
5800 | """ |
|
5802 | """ | |
5801 | fnames = (fname1,) + fnames |
|
5803 | fnames = (fname1,) + fnames | |
5802 |
|
5804 | |||
5803 | lock = repo.lock() |
|
5805 | lock = repo.lock() | |
5804 | wc = repo['.'] |
|
5806 | wc = repo['.'] | |
5805 | try: |
|
5807 | try: | |
5806 | for fname in fnames: |
|
5808 | for fname in fnames: | |
5807 | f = hg.openpath(ui, fname) |
|
5809 | f = hg.openpath(ui, fname) | |
5808 | gen = changegroup.readbundle(f, fname) |
|
5810 | gen = changegroup.readbundle(f, fname) | |
5809 | modheads = changegroup.addchangegroup(repo, gen, 'unbundle', |
|
5811 | modheads = changegroup.addchangegroup(repo, gen, 'unbundle', | |
5810 | 'bundle:' + fname) |
|
5812 | 'bundle:' + fname) | |
5811 | finally: |
|
5813 | finally: | |
5812 | lock.release() |
|
5814 | lock.release() | |
5813 | bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch()) |
|
5815 | bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch()) | |
5814 | return postincoming(ui, repo, modheads, opts.get('update'), None) |
|
5816 | return postincoming(ui, repo, modheads, opts.get('update'), None) | |
5815 |
|
5817 | |||
5816 | @command('^update|up|checkout|co', |
|
5818 | @command('^update|up|checkout|co', | |
5817 | [('C', 'clean', None, _('discard uncommitted changes (no backup)')), |
|
5819 | [('C', 'clean', None, _('discard uncommitted changes (no backup)')), | |
5818 | ('c', 'check', None, |
|
5820 | ('c', 'check', None, | |
5819 | _('update across branches if no uncommitted changes')), |
|
5821 | _('update across branches if no uncommitted changes')), | |
5820 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), |
|
5822 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), | |
5821 | ('r', 'rev', '', _('revision'), _('REV'))], |
|
5823 | ('r', 'rev', '', _('revision'), _('REV'))], | |
5822 | _('[-c] [-C] [-d DATE] [[-r] REV]')) |
|
5824 | _('[-c] [-C] [-d DATE] [[-r] REV]')) | |
5823 | def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False): |
|
5825 | def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False): | |
5824 | """update working directory (or switch revisions) |
|
5826 | """update working directory (or switch revisions) | |
5825 |
|
5827 | |||
5826 | Update the repository's working directory to the specified |
|
5828 | Update the repository's working directory to the specified | |
5827 | changeset. If no changeset is specified, update to the tip of the |
|
5829 | changeset. If no changeset is specified, update to the tip of the | |
5828 | current named branch and move the current bookmark (see :hg:`help |
|
5830 | current named branch and move the current bookmark (see :hg:`help | |
5829 | bookmarks`). |
|
5831 | bookmarks`). | |
5830 |
|
5832 | |||
5831 | Update sets the working directory's parent revision to the specified |
|
5833 | Update sets the working directory's parent revision to the specified | |
5832 | changeset (see :hg:`help parents`). |
|
5834 | changeset (see :hg:`help parents`). | |
5833 |
|
5835 | |||
5834 | If the changeset is not a descendant or ancestor of the working |
|
5836 | If the changeset is not a descendant or ancestor of the working | |
5835 | directory's parent, the update is aborted. With the -c/--check |
|
5837 | directory's parent, the update is aborted. With the -c/--check | |
5836 | option, the working directory is checked for uncommitted changes; if |
|
5838 | option, the working directory is checked for uncommitted changes; if | |
5837 | none are found, the working directory is updated to the specified |
|
5839 | none are found, the working directory is updated to the specified | |
5838 | changeset. |
|
5840 | changeset. | |
5839 |
|
5841 | |||
5840 | .. container:: verbose |
|
5842 | .. container:: verbose | |
5841 |
|
5843 | |||
5842 | The following rules apply when the working directory contains |
|
5844 | The following rules apply when the working directory contains | |
5843 | uncommitted changes: |
|
5845 | uncommitted changes: | |
5844 |
|
5846 | |||
5845 | 1. If neither -c/--check nor -C/--clean is specified, and if |
|
5847 | 1. If neither -c/--check nor -C/--clean is specified, and if | |
5846 | the requested changeset is an ancestor or descendant of |
|
5848 | the requested changeset is an ancestor or descendant of | |
5847 | the working directory's parent, the uncommitted changes |
|
5849 | the working directory's parent, the uncommitted changes | |
5848 | are merged into the requested changeset and the merged |
|
5850 | are merged into the requested changeset and the merged | |
5849 | result is left uncommitted. If the requested changeset is |
|
5851 | result is left uncommitted. If the requested changeset is | |
5850 | not an ancestor or descendant (that is, it is on another |
|
5852 | not an ancestor or descendant (that is, it is on another | |
5851 | branch), the update is aborted and the uncommitted changes |
|
5853 | branch), the update is aborted and the uncommitted changes | |
5852 | are preserved. |
|
5854 | are preserved. | |
5853 |
|
5855 | |||
5854 | 2. With the -c/--check option, the update is aborted and the |
|
5856 | 2. With the -c/--check option, the update is aborted and the | |
5855 | uncommitted changes are preserved. |
|
5857 | uncommitted changes are preserved. | |
5856 |
|
5858 | |||
5857 | 3. With the -C/--clean option, uncommitted changes are discarded and |
|
5859 | 3. With the -C/--clean option, uncommitted changes are discarded and | |
5858 | the working directory is updated to the requested changeset. |
|
5860 | the working directory is updated to the requested changeset. | |
5859 |
|
5861 | |||
5860 | To cancel an uncommitted merge (and lose your changes), use |
|
5862 | To cancel an uncommitted merge (and lose your changes), use | |
5861 | :hg:`update --clean .`. |
|
5863 | :hg:`update --clean .`. | |
5862 |
|
5864 | |||
5863 | Use null as the changeset to remove the working directory (like |
|
5865 | Use null as the changeset to remove the working directory (like | |
5864 | :hg:`clone -U`). |
|
5866 | :hg:`clone -U`). | |
5865 |
|
5867 | |||
5866 | If you want to revert just one file to an older revision, use |
|
5868 | If you want to revert just one file to an older revision, use | |
5867 | :hg:`revert [-r REV] NAME`. |
|
5869 | :hg:`revert [-r REV] NAME`. | |
5868 |
|
5870 | |||
5869 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
5871 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
5870 |
|
5872 | |||
5871 | Returns 0 on success, 1 if there are unresolved files. |
|
5873 | Returns 0 on success, 1 if there are unresolved files. | |
5872 | """ |
|
5874 | """ | |
5873 | if rev and node: |
|
5875 | if rev and node: | |
5874 | raise util.Abort(_("please specify just one revision")) |
|
5876 | raise util.Abort(_("please specify just one revision")) | |
5875 |
|
5877 | |||
5876 | if rev is None or rev == '': |
|
5878 | if rev is None or rev == '': | |
5877 | rev = node |
|
5879 | rev = node | |
5878 |
|
5880 | |||
5879 | cmdutil.clearunfinished(repo) |
|
5881 | cmdutil.clearunfinished(repo) | |
5880 |
|
5882 | |||
5881 | # with no argument, we also move the current bookmark, if any |
|
5883 | # with no argument, we also move the current bookmark, if any | |
5882 | rev, movemarkfrom = bookmarks.calculateupdate(ui, repo, rev) |
|
5884 | rev, movemarkfrom = bookmarks.calculateupdate(ui, repo, rev) | |
5883 |
|
5885 | |||
5884 | # if we defined a bookmark, we have to remember the original bookmark name |
|
5886 | # if we defined a bookmark, we have to remember the original bookmark name | |
5885 | brev = rev |
|
5887 | brev = rev | |
5886 | rev = scmutil.revsingle(repo, rev, rev).rev() |
|
5888 | rev = scmutil.revsingle(repo, rev, rev).rev() | |
5887 |
|
5889 | |||
5888 | if check and clean: |
|
5890 | if check and clean: | |
5889 | raise util.Abort(_("cannot specify both -c/--check and -C/--clean")) |
|
5891 | raise util.Abort(_("cannot specify both -c/--check and -C/--clean")) | |
5890 |
|
5892 | |||
5891 | if date: |
|
5893 | if date: | |
5892 | if rev is not None: |
|
5894 | if rev is not None: | |
5893 | raise util.Abort(_("you can't specify a revision and a date")) |
|
5895 | raise util.Abort(_("you can't specify a revision and a date")) | |
5894 | rev = cmdutil.finddate(ui, repo, date) |
|
5896 | rev = cmdutil.finddate(ui, repo, date) | |
5895 |
|
5897 | |||
5896 | if check: |
|
5898 | if check: | |
5897 | c = repo[None] |
|
5899 | c = repo[None] | |
5898 | if c.dirty(merge=False, branch=False, missing=True): |
|
5900 | if c.dirty(merge=False, branch=False, missing=True): | |
5899 | raise util.Abort(_("uncommitted changes")) |
|
5901 | raise util.Abort(_("uncommitted changes")) | |
5900 | if rev is None: |
|
5902 | if rev is None: | |
5901 | rev = repo[repo[None].branch()].rev() |
|
5903 | rev = repo[repo[None].branch()].rev() | |
5902 | mergemod._checkunknown(repo, repo[None], repo[rev]) |
|
5904 | mergemod._checkunknown(repo, repo[None], repo[rev]) | |
5903 |
|
5905 | |||
5904 | if clean: |
|
5906 | if clean: | |
5905 | ret = hg.clean(repo, rev) |
|
5907 | ret = hg.clean(repo, rev) | |
5906 | else: |
|
5908 | else: | |
5907 | ret = hg.update(repo, rev) |
|
5909 | ret = hg.update(repo, rev) | |
5908 |
|
5910 | |||
5909 | if not ret and movemarkfrom: |
|
5911 | if not ret and movemarkfrom: | |
5910 | if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): |
|
5912 | if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): | |
5911 | ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent) |
|
5913 | ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent) | |
5912 | elif brev in repo._bookmarks: |
|
5914 | elif brev in repo._bookmarks: | |
5913 | bookmarks.setcurrent(repo, brev) |
|
5915 | bookmarks.setcurrent(repo, brev) | |
5914 | elif brev: |
|
5916 | elif brev: | |
5915 | bookmarks.unsetcurrent(repo) |
|
5917 | bookmarks.unsetcurrent(repo) | |
5916 |
|
5918 | |||
5917 | return ret |
|
5919 | return ret | |
5918 |
|
5920 | |||
5919 | @command('verify', []) |
|
5921 | @command('verify', []) | |
5920 | def verify(ui, repo): |
|
5922 | def verify(ui, repo): | |
5921 | """verify the integrity of the repository |
|
5923 | """verify the integrity of the repository | |
5922 |
|
5924 | |||
5923 | Verify the integrity of the current repository. |
|
5925 | Verify the integrity of the current repository. | |
5924 |
|
5926 | |||
5925 | This will perform an extensive check of the repository's |
|
5927 | This will perform an extensive check of the repository's | |
5926 | integrity, validating the hashes and checksums of each entry in |
|
5928 | integrity, validating the hashes and checksums of each entry in | |
5927 | the changelog, manifest, and tracked files, as well as the |
|
5929 | the changelog, manifest, and tracked files, as well as the | |
5928 | integrity of their crosslinks and indices. |
|
5930 | integrity of their crosslinks and indices. | |
5929 |
|
5931 | |||
5930 | Please see http://mercurial.selenic.com/wiki/RepositoryCorruption |
|
5932 | Please see http://mercurial.selenic.com/wiki/RepositoryCorruption | |
5931 | for more information about recovery from corruption of the |
|
5933 | for more information about recovery from corruption of the | |
5932 | repository. |
|
5934 | repository. | |
5933 |
|
5935 | |||
5934 | Returns 0 on success, 1 if errors are encountered. |
|
5936 | Returns 0 on success, 1 if errors are encountered. | |
5935 | """ |
|
5937 | """ | |
5936 | return hg.verify(repo) |
|
5938 | return hg.verify(repo) | |
5937 |
|
5939 | |||
5938 | @command('version', []) |
|
5940 | @command('version', []) | |
5939 | def version_(ui): |
|
5941 | def version_(ui): | |
5940 | """output version and copyright information""" |
|
5942 | """output version and copyright information""" | |
5941 | ui.write(_("Mercurial Distributed SCM (version %s)\n") |
|
5943 | ui.write(_("Mercurial Distributed SCM (version %s)\n") | |
5942 | % util.version()) |
|
5944 | % util.version()) | |
5943 | ui.status(_( |
|
5945 | ui.status(_( | |
5944 | "(see http://mercurial.selenic.com for more information)\n" |
|
5946 | "(see http://mercurial.selenic.com for more information)\n" | |
5945 | "\nCopyright (C) 2005-2014 Matt Mackall and others\n" |
|
5947 | "\nCopyright (C) 2005-2014 Matt Mackall and others\n" | |
5946 | "This is free software; see the source for copying conditions. " |
|
5948 | "This is free software; see the source for copying conditions. " | |
5947 | "There is NO\nwarranty; " |
|
5949 | "There is NO\nwarranty; " | |
5948 | "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" |
|
5950 | "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" | |
5949 | )) |
|
5951 | )) | |
5950 |
|
5952 | |||
5951 | norepo = ("clone init version help debugcommands debugcomplete" |
|
5953 | norepo = ("clone init version help debugcommands debugcomplete" | |
5952 | " debugdate debuginstall debugfsinfo debugpushkey debugwireargs" |
|
5954 | " debugdate debuginstall debugfsinfo debugpushkey debugwireargs" | |
5953 | " debugknown debuggetbundle debugbundle") |
|
5955 | " debugknown debuggetbundle debugbundle") | |
5954 | optionalrepo = ("identify paths serve config showconfig debugancestor debugdag" |
|
5956 | optionalrepo = ("identify paths serve config showconfig debugancestor debugdag" | |
5955 | " debugdata debugindex debugindexdot debugrevlog") |
|
5957 | " debugdata debugindex debugindexdot debugrevlog") | |
5956 | inferrepo = ("add addremove annotate cat commit diff grep forget log parents" |
|
5958 | inferrepo = ("add addremove annotate cat commit diff grep forget log parents" | |
5957 | " remove resolve status debugwalk") |
|
5959 | " remove resolve status debugwalk") |
@@ -1,656 +1,658 b'' | |||||
1 | # hg.py - repository classes for mercurial |
|
1 | # hg.py - repository classes for mercurial | |
2 | # |
|
2 | # | |
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | |
4 | # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com> |
|
4 | # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com> | |
5 | # |
|
5 | # | |
6 | # This software may be used and distributed according to the terms of the |
|
6 | # This software may be used and distributed according to the terms of the | |
7 | # GNU General Public License version 2 or any later version. |
|
7 | # GNU General Public License version 2 or any later version. | |
8 |
|
8 | |||
9 | from i18n import _ |
|
9 | from i18n import _ | |
10 | from lock import release |
|
10 | from lock import release | |
11 | from node import hex, nullid |
|
11 | from node import hex, nullid | |
12 | import localrepo, bundlerepo, unionrepo, httppeer, sshpeer, statichttprepo |
|
12 | import localrepo, bundlerepo, unionrepo, httppeer, sshpeer, statichttprepo | |
13 | import bookmarks, lock, util, extensions, error, node, scmutil, phases, url |
|
13 | import bookmarks, lock, util, extensions, error, node, scmutil, phases, url | |
14 | import cmdutil, discovery |
|
14 | import cmdutil, discovery | |
15 | import merge as mergemod |
|
15 | import merge as mergemod | |
16 | import verify as verifymod |
|
16 | import verify as verifymod | |
17 | import errno, os, shutil |
|
17 | import errno, os, shutil | |
18 |
|
18 | |||
19 | def _local(path): |
|
19 | def _local(path): | |
20 | path = util.expandpath(util.urllocalpath(path)) |
|
20 | path = util.expandpath(util.urllocalpath(path)) | |
21 | return (os.path.isfile(path) and bundlerepo or localrepo) |
|
21 | return (os.path.isfile(path) and bundlerepo or localrepo) | |
22 |
|
22 | |||
23 | def addbranchrevs(lrepo, other, branches, revs): |
|
23 | def addbranchrevs(lrepo, other, branches, revs): | |
24 | peer = other.peer() # a courtesy to callers using a localrepo for other |
|
24 | peer = other.peer() # a courtesy to callers using a localrepo for other | |
25 | hashbranch, branches = branches |
|
25 | hashbranch, branches = branches | |
26 | if not hashbranch and not branches: |
|
26 | if not hashbranch and not branches: | |
27 | return revs or None, revs and revs[0] or None |
|
27 | return revs or None, revs and revs[0] or None | |
28 | revs = revs and list(revs) or [] |
|
28 | revs = revs and list(revs) or [] | |
29 | if not peer.capable('branchmap'): |
|
29 | if not peer.capable('branchmap'): | |
30 | if branches: |
|
30 | if branches: | |
31 | raise util.Abort(_("remote branch lookup not supported")) |
|
31 | raise util.Abort(_("remote branch lookup not supported")) | |
32 | revs.append(hashbranch) |
|
32 | revs.append(hashbranch) | |
33 | return revs, revs[0] |
|
33 | return revs, revs[0] | |
34 | branchmap = peer.branchmap() |
|
34 | branchmap = peer.branchmap() | |
35 |
|
35 | |||
36 | def primary(branch): |
|
36 | def primary(branch): | |
37 | if branch == '.': |
|
37 | if branch == '.': | |
38 | if not lrepo: |
|
38 | if not lrepo: | |
39 | raise util.Abort(_("dirstate branch not accessible")) |
|
39 | raise util.Abort(_("dirstate branch not accessible")) | |
40 | branch = lrepo.dirstate.branch() |
|
40 | branch = lrepo.dirstate.branch() | |
41 | if branch in branchmap: |
|
41 | if branch in branchmap: | |
42 | revs.extend(node.hex(r) for r in reversed(branchmap[branch])) |
|
42 | revs.extend(node.hex(r) for r in reversed(branchmap[branch])) | |
43 | return True |
|
43 | return True | |
44 | else: |
|
44 | else: | |
45 | return False |
|
45 | return False | |
46 |
|
46 | |||
47 | for branch in branches: |
|
47 | for branch in branches: | |
48 | if not primary(branch): |
|
48 | if not primary(branch): | |
49 | raise error.RepoLookupError(_("unknown branch '%s'") % branch) |
|
49 | raise error.RepoLookupError(_("unknown branch '%s'") % branch) | |
50 | if hashbranch: |
|
50 | if hashbranch: | |
51 | if not primary(hashbranch): |
|
51 | if not primary(hashbranch): | |
52 | revs.append(hashbranch) |
|
52 | revs.append(hashbranch) | |
53 | return revs, revs[0] |
|
53 | return revs, revs[0] | |
54 |
|
54 | |||
55 | def parseurl(path, branches=None): |
|
55 | def parseurl(path, branches=None): | |
56 | '''parse url#branch, returning (url, (branch, branches))''' |
|
56 | '''parse url#branch, returning (url, (branch, branches))''' | |
57 |
|
57 | |||
58 | u = util.url(path) |
|
58 | u = util.url(path) | |
59 | branch = None |
|
59 | branch = None | |
60 | if u.fragment: |
|
60 | if u.fragment: | |
61 | branch = u.fragment |
|
61 | branch = u.fragment | |
62 | u.fragment = None |
|
62 | u.fragment = None | |
63 | return str(u), (branch, branches or []) |
|
63 | return str(u), (branch, branches or []) | |
64 |
|
64 | |||
65 | schemes = { |
|
65 | schemes = { | |
66 | 'bundle': bundlerepo, |
|
66 | 'bundle': bundlerepo, | |
67 | 'union': unionrepo, |
|
67 | 'union': unionrepo, | |
68 | 'file': _local, |
|
68 | 'file': _local, | |
69 | 'http': httppeer, |
|
69 | 'http': httppeer, | |
70 | 'https': httppeer, |
|
70 | 'https': httppeer, | |
71 | 'ssh': sshpeer, |
|
71 | 'ssh': sshpeer, | |
72 | 'static-http': statichttprepo, |
|
72 | 'static-http': statichttprepo, | |
73 | } |
|
73 | } | |
74 |
|
74 | |||
75 | def _peerlookup(path): |
|
75 | def _peerlookup(path): | |
76 | u = util.url(path) |
|
76 | u = util.url(path) | |
77 | scheme = u.scheme or 'file' |
|
77 | scheme = u.scheme or 'file' | |
78 | thing = schemes.get(scheme) or schemes['file'] |
|
78 | thing = schemes.get(scheme) or schemes['file'] | |
79 | try: |
|
79 | try: | |
80 | return thing(path) |
|
80 | return thing(path) | |
81 | except TypeError: |
|
81 | except TypeError: | |
82 | return thing |
|
82 | return thing | |
83 |
|
83 | |||
84 | def islocal(repo): |
|
84 | def islocal(repo): | |
85 | '''return true if repo (or path pointing to repo) is local''' |
|
85 | '''return true if repo (or path pointing to repo) is local''' | |
86 | if isinstance(repo, str): |
|
86 | if isinstance(repo, str): | |
87 | try: |
|
87 | try: | |
88 | return _peerlookup(repo).islocal(repo) |
|
88 | return _peerlookup(repo).islocal(repo) | |
89 | except AttributeError: |
|
89 | except AttributeError: | |
90 | return False |
|
90 | return False | |
91 | return repo.local() |
|
91 | return repo.local() | |
92 |
|
92 | |||
93 | def openpath(ui, path): |
|
93 | def openpath(ui, path): | |
94 | '''open path with open if local, url.open if remote''' |
|
94 | '''open path with open if local, url.open if remote''' | |
95 | pathurl = util.url(path, parsequery=False, parsefragment=False) |
|
95 | pathurl = util.url(path, parsequery=False, parsefragment=False) | |
96 | if pathurl.islocal(): |
|
96 | if pathurl.islocal(): | |
97 | return util.posixfile(pathurl.localpath(), 'rb') |
|
97 | return util.posixfile(pathurl.localpath(), 'rb') | |
98 | else: |
|
98 | else: | |
99 | return url.open(ui, path) |
|
99 | return url.open(ui, path) | |
100 |
|
100 | |||
101 | # a list of (ui, repo) functions called for wire peer initialization |
|
101 | # a list of (ui, repo) functions called for wire peer initialization | |
102 | wirepeersetupfuncs = [] |
|
102 | wirepeersetupfuncs = [] | |
103 |
|
103 | |||
104 | def _peerorrepo(ui, path, create=False): |
|
104 | def _peerorrepo(ui, path, create=False): | |
105 | """return a repository object for the specified path""" |
|
105 | """return a repository object for the specified path""" | |
106 | obj = _peerlookup(path).instance(ui, path, create) |
|
106 | obj = _peerlookup(path).instance(ui, path, create) | |
107 | ui = getattr(obj, "ui", ui) |
|
107 | ui = getattr(obj, "ui", ui) | |
108 | for name, module in extensions.extensions(ui): |
|
108 | for name, module in extensions.extensions(ui): | |
109 | hook = getattr(module, 'reposetup', None) |
|
109 | hook = getattr(module, 'reposetup', None) | |
110 | if hook: |
|
110 | if hook: | |
111 | hook(ui, obj) |
|
111 | hook(ui, obj) | |
112 | if not obj.local(): |
|
112 | if not obj.local(): | |
113 | for f in wirepeersetupfuncs: |
|
113 | for f in wirepeersetupfuncs: | |
114 | f(ui, obj) |
|
114 | f(ui, obj) | |
115 | return obj |
|
115 | return obj | |
116 |
|
116 | |||
117 | def repository(ui, path='', create=False): |
|
117 | def repository(ui, path='', create=False): | |
118 | """return a repository object for the specified path""" |
|
118 | """return a repository object for the specified path""" | |
119 | peer = _peerorrepo(ui, path, create) |
|
119 | peer = _peerorrepo(ui, path, create) | |
120 | repo = peer.local() |
|
120 | repo = peer.local() | |
121 | if not repo: |
|
121 | if not repo: | |
122 | raise util.Abort(_("repository '%s' is not local") % |
|
122 | raise util.Abort(_("repository '%s' is not local") % | |
123 | (path or peer.url())) |
|
123 | (path or peer.url())) | |
124 | return repo.filtered('visible') |
|
124 | return repo.filtered('visible') | |
125 |
|
125 | |||
126 | def peer(uiorrepo, opts, path, create=False): |
|
126 | def peer(uiorrepo, opts, path, create=False): | |
127 | '''return a repository peer for the specified path''' |
|
127 | '''return a repository peer for the specified path''' | |
128 | rui = remoteui(uiorrepo, opts) |
|
128 | rui = remoteui(uiorrepo, opts) | |
129 | return _peerorrepo(rui, path, create).peer() |
|
129 | return _peerorrepo(rui, path, create).peer() | |
130 |
|
130 | |||
131 | def defaultdest(source): |
|
131 | def defaultdest(source): | |
132 | '''return default destination of clone if none is given |
|
132 | '''return default destination of clone if none is given | |
133 |
|
133 | |||
134 | >>> defaultdest('foo') |
|
134 | >>> defaultdest('foo') | |
135 | 'foo' |
|
135 | 'foo' | |
136 | >>> defaultdest('/foo/bar') |
|
136 | >>> defaultdest('/foo/bar') | |
137 | 'bar' |
|
137 | 'bar' | |
138 | >>> defaultdest('/') |
|
138 | >>> defaultdest('/') | |
139 | '' |
|
139 | '' | |
140 | >>> defaultdest('') |
|
140 | >>> defaultdest('') | |
141 | '' |
|
141 | '' | |
142 | >>> defaultdest('http://example.org/') |
|
142 | >>> defaultdest('http://example.org/') | |
143 | '' |
|
143 | '' | |
144 | >>> defaultdest('http://example.org/foo/') |
|
144 | >>> defaultdest('http://example.org/foo/') | |
145 | 'foo' |
|
145 | 'foo' | |
146 | ''' |
|
146 | ''' | |
147 | path = util.url(source).path |
|
147 | path = util.url(source).path | |
148 | if not path: |
|
148 | if not path: | |
149 | return '' |
|
149 | return '' | |
150 | return os.path.basename(os.path.normpath(path)) |
|
150 | return os.path.basename(os.path.normpath(path)) | |
151 |
|
151 | |||
152 | def share(ui, source, dest=None, update=True): |
|
152 | def share(ui, source, dest=None, update=True): | |
153 | '''create a shared repository''' |
|
153 | '''create a shared repository''' | |
154 |
|
154 | |||
155 | if not islocal(source): |
|
155 | if not islocal(source): | |
156 | raise util.Abort(_('can only share local repositories')) |
|
156 | raise util.Abort(_('can only share local repositories')) | |
157 |
|
157 | |||
158 | if not dest: |
|
158 | if not dest: | |
159 | dest = defaultdest(source) |
|
159 | dest = defaultdest(source) | |
160 | else: |
|
160 | else: | |
161 | dest = ui.expandpath(dest) |
|
161 | dest = ui.expandpath(dest) | |
162 |
|
162 | |||
163 | if isinstance(source, str): |
|
163 | if isinstance(source, str): | |
164 | origsource = ui.expandpath(source) |
|
164 | origsource = ui.expandpath(source) | |
165 | source, branches = parseurl(origsource) |
|
165 | source, branches = parseurl(origsource) | |
166 | srcrepo = repository(ui, source) |
|
166 | srcrepo = repository(ui, source) | |
167 | rev, checkout = addbranchrevs(srcrepo, srcrepo, branches, None) |
|
167 | rev, checkout = addbranchrevs(srcrepo, srcrepo, branches, None) | |
168 | else: |
|
168 | else: | |
169 | srcrepo = source.local() |
|
169 | srcrepo = source.local() | |
170 | origsource = source = srcrepo.url() |
|
170 | origsource = source = srcrepo.url() | |
171 | checkout = None |
|
171 | checkout = None | |
172 |
|
172 | |||
173 | sharedpath = srcrepo.sharedpath # if our source is already sharing |
|
173 | sharedpath = srcrepo.sharedpath # if our source is already sharing | |
174 |
|
174 | |||
175 | root = os.path.realpath(dest) |
|
175 | root = os.path.realpath(dest) | |
176 | roothg = os.path.join(root, '.hg') |
|
176 | roothg = os.path.join(root, '.hg') | |
177 |
|
177 | |||
178 | if os.path.exists(roothg): |
|
178 | if os.path.exists(roothg): | |
179 | raise util.Abort(_('destination already exists')) |
|
179 | raise util.Abort(_('destination already exists')) | |
180 |
|
180 | |||
181 | if not os.path.isdir(root): |
|
181 | if not os.path.isdir(root): | |
182 | os.mkdir(root) |
|
182 | os.mkdir(root) | |
183 | util.makedir(roothg, notindexed=True) |
|
183 | util.makedir(roothg, notindexed=True) | |
184 |
|
184 | |||
185 | requirements = '' |
|
185 | requirements = '' | |
186 | try: |
|
186 | try: | |
187 | requirements = srcrepo.opener.read('requires') |
|
187 | requirements = srcrepo.opener.read('requires') | |
188 | except IOError, inst: |
|
188 | except IOError, inst: | |
189 | if inst.errno != errno.ENOENT: |
|
189 | if inst.errno != errno.ENOENT: | |
190 | raise |
|
190 | raise | |
191 |
|
191 | |||
192 | requirements += 'shared\n' |
|
192 | requirements += 'shared\n' | |
193 | util.writefile(os.path.join(roothg, 'requires'), requirements) |
|
193 | util.writefile(os.path.join(roothg, 'requires'), requirements) | |
194 | util.writefile(os.path.join(roothg, 'sharedpath'), sharedpath) |
|
194 | util.writefile(os.path.join(roothg, 'sharedpath'), sharedpath) | |
195 |
|
195 | |||
196 | r = repository(ui, root) |
|
196 | r = repository(ui, root) | |
197 |
|
197 | |||
198 | default = srcrepo.ui.config('paths', 'default') |
|
198 | default = srcrepo.ui.config('paths', 'default') | |
199 | if default: |
|
199 | if default: | |
200 | fp = r.opener("hgrc", "w", text=True) |
|
200 | fp = r.opener("hgrc", "w", text=True) | |
201 | fp.write("[paths]\n") |
|
201 | fp.write("[paths]\n") | |
202 | fp.write("default = %s\n" % default) |
|
202 | fp.write("default = %s\n" % default) | |
203 | fp.close() |
|
203 | fp.close() | |
204 |
|
204 | |||
205 | if update: |
|
205 | if update: | |
206 | r.ui.status(_("updating working directory\n")) |
|
206 | r.ui.status(_("updating working directory\n")) | |
207 | if update is not True: |
|
207 | if update is not True: | |
208 | checkout = update |
|
208 | checkout = update | |
209 | for test in (checkout, 'default', 'tip'): |
|
209 | for test in (checkout, 'default', 'tip'): | |
210 | if test is None: |
|
210 | if test is None: | |
211 | continue |
|
211 | continue | |
212 | try: |
|
212 | try: | |
213 | uprev = r.lookup(test) |
|
213 | uprev = r.lookup(test) | |
214 | break |
|
214 | break | |
215 | except error.RepoLookupError: |
|
215 | except error.RepoLookupError: | |
216 | continue |
|
216 | continue | |
217 | _update(r, uprev) |
|
217 | _update(r, uprev) | |
218 |
|
218 | |||
219 | def copystore(ui, srcrepo, destpath): |
|
219 | def copystore(ui, srcrepo, destpath): | |
220 | '''copy files from store of srcrepo in destpath |
|
220 | '''copy files from store of srcrepo in destpath | |
221 |
|
221 | |||
222 | returns destlock |
|
222 | returns destlock | |
223 | ''' |
|
223 | ''' | |
224 | destlock = None |
|
224 | destlock = None | |
225 | try: |
|
225 | try: | |
226 | hardlink = None |
|
226 | hardlink = None | |
227 | num = 0 |
|
227 | num = 0 | |
228 | srcpublishing = srcrepo.ui.configbool('phases', 'publish', True) |
|
228 | srcpublishing = srcrepo.ui.configbool('phases', 'publish', True) | |
229 | srcvfs = scmutil.vfs(srcrepo.sharedpath) |
|
229 | srcvfs = scmutil.vfs(srcrepo.sharedpath) | |
230 | dstvfs = scmutil.vfs(destpath) |
|
230 | dstvfs = scmutil.vfs(destpath) | |
231 | for f in srcrepo.store.copylist(): |
|
231 | for f in srcrepo.store.copylist(): | |
232 | if srcpublishing and f.endswith('phaseroots'): |
|
232 | if srcpublishing and f.endswith('phaseroots'): | |
233 | continue |
|
233 | continue | |
234 | dstbase = os.path.dirname(f) |
|
234 | dstbase = os.path.dirname(f) | |
235 | if dstbase and not dstvfs.exists(dstbase): |
|
235 | if dstbase and not dstvfs.exists(dstbase): | |
236 | dstvfs.mkdir(dstbase) |
|
236 | dstvfs.mkdir(dstbase) | |
237 | if srcvfs.exists(f): |
|
237 | if srcvfs.exists(f): | |
238 | if f.endswith('data'): |
|
238 | if f.endswith('data'): | |
239 | # 'dstbase' may be empty (e.g. revlog format 0) |
|
239 | # 'dstbase' may be empty (e.g. revlog format 0) | |
240 | lockfile = os.path.join(dstbase, "lock") |
|
240 | lockfile = os.path.join(dstbase, "lock") | |
241 | # lock to avoid premature writing to the target |
|
241 | # lock to avoid premature writing to the target | |
242 | destlock = lock.lock(dstvfs, lockfile) |
|
242 | destlock = lock.lock(dstvfs, lockfile) | |
243 | hardlink, n = util.copyfiles(srcvfs.join(f), dstvfs.join(f), |
|
243 | hardlink, n = util.copyfiles(srcvfs.join(f), dstvfs.join(f), | |
244 | hardlink) |
|
244 | hardlink) | |
245 | num += n |
|
245 | num += n | |
246 | if hardlink: |
|
246 | if hardlink: | |
247 | ui.debug("linked %d files\n" % num) |
|
247 | ui.debug("linked %d files\n" % num) | |
248 | else: |
|
248 | else: | |
249 | ui.debug("copied %d files\n" % num) |
|
249 | ui.debug("copied %d files\n" % num) | |
250 | return destlock |
|
250 | return destlock | |
251 | except: # re-raises |
|
251 | except: # re-raises | |
252 | release(destlock) |
|
252 | release(destlock) | |
253 | raise |
|
253 | raise | |
254 |
|
254 | |||
255 | def clone(ui, peeropts, source, dest=None, pull=False, rev=None, |
|
255 | def clone(ui, peeropts, source, dest=None, pull=False, rev=None, | |
256 | update=True, stream=False, branch=None): |
|
256 | update=True, stream=False, branch=None): | |
257 | """Make a copy of an existing repository. |
|
257 | """Make a copy of an existing repository. | |
258 |
|
258 | |||
259 | Create a copy of an existing repository in a new directory. The |
|
259 | Create a copy of an existing repository in a new directory. The | |
260 | source and destination are URLs, as passed to the repository |
|
260 | source and destination are URLs, as passed to the repository | |
261 | function. Returns a pair of repository peers, the source and |
|
261 | function. Returns a pair of repository peers, the source and | |
262 | newly created destination. |
|
262 | newly created destination. | |
263 |
|
263 | |||
264 | The location of the source is added to the new repository's |
|
264 | The location of the source is added to the new repository's | |
265 | .hg/hgrc file, as the default to be used for future pulls and |
|
265 | .hg/hgrc file, as the default to be used for future pulls and | |
266 | pushes. |
|
266 | pushes. | |
267 |
|
267 | |||
268 | If an exception is raised, the partly cloned/updated destination |
|
268 | If an exception is raised, the partly cloned/updated destination | |
269 | repository will be deleted. |
|
269 | repository will be deleted. | |
270 |
|
270 | |||
271 | Arguments: |
|
271 | Arguments: | |
272 |
|
272 | |||
273 | source: repository object or URL |
|
273 | source: repository object or URL | |
274 |
|
274 | |||
275 | dest: URL of destination repository to create (defaults to base |
|
275 | dest: URL of destination repository to create (defaults to base | |
276 | name of source repository) |
|
276 | name of source repository) | |
277 |
|
277 | |||
278 | pull: always pull from source repository, even in local case |
|
278 | pull: always pull from source repository, even in local case | |
279 |
|
279 | |||
280 | stream: stream raw data uncompressed from repository (fast over |
|
280 | stream: stream raw data uncompressed from repository (fast over | |
281 | LAN, slow over WAN) |
|
281 | LAN, slow over WAN) | |
282 |
|
282 | |||
283 | rev: revision to clone up to (implies pull=True) |
|
283 | rev: revision to clone up to (implies pull=True) | |
284 |
|
284 | |||
285 | update: update working directory after clone completes, if |
|
285 | update: update working directory after clone completes, if | |
286 | destination is local repository (True means update to default rev, |
|
286 | destination is local repository (True means update to default rev, | |
287 | anything else is treated as a revision) |
|
287 | anything else is treated as a revision) | |
288 |
|
288 | |||
289 | branch: branches to clone |
|
289 | branch: branches to clone | |
290 | """ |
|
290 | """ | |
291 |
|
291 | |||
292 | if isinstance(source, str): |
|
292 | if isinstance(source, str): | |
293 | origsource = ui.expandpath(source) |
|
293 | origsource = ui.expandpath(source) | |
294 | source, branch = parseurl(origsource, branch) |
|
294 | source, branch = parseurl(origsource, branch) | |
295 | srcpeer = peer(ui, peeropts, source) |
|
295 | srcpeer = peer(ui, peeropts, source) | |
296 | else: |
|
296 | else: | |
297 | srcpeer = source.peer() # in case we were called with a localrepo |
|
297 | srcpeer = source.peer() # in case we were called with a localrepo | |
298 | branch = (None, branch or []) |
|
298 | branch = (None, branch or []) | |
299 | origsource = source = srcpeer.url() |
|
299 | origsource = source = srcpeer.url() | |
300 | rev, checkout = addbranchrevs(srcpeer, srcpeer, branch, rev) |
|
300 | rev, checkout = addbranchrevs(srcpeer, srcpeer, branch, rev) | |
301 |
|
301 | |||
302 | if dest is None: |
|
302 | if dest is None: | |
303 | dest = defaultdest(source) |
|
303 | dest = defaultdest(source) | |
304 | if dest: |
|
304 | if dest: | |
305 | ui.status(_("destination directory: %s\n") % dest) |
|
305 | ui.status(_("destination directory: %s\n") % dest) | |
306 | else: |
|
306 | else: | |
307 | dest = ui.expandpath(dest) |
|
307 | dest = ui.expandpath(dest) | |
308 |
|
308 | |||
309 | dest = util.urllocalpath(dest) |
|
309 | dest = util.urllocalpath(dest) | |
310 | source = util.urllocalpath(source) |
|
310 | source = util.urllocalpath(source) | |
311 |
|
311 | |||
312 | if not dest: |
|
312 | if not dest: | |
313 | raise util.Abort(_("empty destination path is not valid")) |
|
313 | raise util.Abort(_("empty destination path is not valid")) | |
314 | if os.path.exists(dest): |
|
314 | if os.path.exists(dest): | |
315 | if not os.path.isdir(dest): |
|
315 | if not os.path.isdir(dest): | |
316 | raise util.Abort(_("destination '%s' already exists") % dest) |
|
316 | raise util.Abort(_("destination '%s' already exists") % dest) | |
317 | elif os.listdir(dest): |
|
317 | elif os.listdir(dest): | |
318 | raise util.Abort(_("destination '%s' is not empty") % dest) |
|
318 | raise util.Abort(_("destination '%s' is not empty") % dest) | |
319 |
|
319 | |||
320 | srclock = destlock = cleandir = None |
|
320 | srclock = destlock = cleandir = None | |
321 | srcrepo = srcpeer.local() |
|
321 | srcrepo = srcpeer.local() | |
322 | try: |
|
322 | try: | |
323 | abspath = origsource |
|
323 | abspath = origsource | |
324 | if islocal(origsource): |
|
324 | if islocal(origsource): | |
325 | abspath = os.path.abspath(util.urllocalpath(origsource)) |
|
325 | abspath = os.path.abspath(util.urllocalpath(origsource)) | |
326 |
|
326 | |||
327 | if islocal(dest): |
|
327 | if islocal(dest): | |
328 | cleandir = dest |
|
328 | cleandir = dest | |
329 |
|
329 | |||
330 | copy = False |
|
330 | copy = False | |
331 | if (srcrepo and srcrepo.cancopy() and islocal(dest) |
|
331 | if (srcrepo and srcrepo.cancopy() and islocal(dest) | |
332 | and not phases.hassecret(srcrepo)): |
|
332 | and not phases.hassecret(srcrepo)): | |
333 | copy = not pull and not rev |
|
333 | copy = not pull and not rev | |
334 |
|
334 | |||
335 | if copy: |
|
335 | if copy: | |
336 | try: |
|
336 | try: | |
337 | # we use a lock here because if we race with commit, we |
|
337 | # we use a lock here because if we race with commit, we | |
338 | # can end up with extra data in the cloned revlogs that's |
|
338 | # can end up with extra data in the cloned revlogs that's | |
339 | # not pointed to by changesets, thus causing verify to |
|
339 | # not pointed to by changesets, thus causing verify to | |
340 | # fail |
|
340 | # fail | |
341 | srclock = srcrepo.lock(wait=False) |
|
341 | srclock = srcrepo.lock(wait=False) | |
342 | except error.LockError: |
|
342 | except error.LockError: | |
343 | copy = False |
|
343 | copy = False | |
344 |
|
344 | |||
345 | if copy: |
|
345 | if copy: | |
346 | srcrepo.hook('preoutgoing', throw=True, source='clone') |
|
346 | srcrepo.hook('preoutgoing', throw=True, source='clone') | |
347 | hgdir = os.path.realpath(os.path.join(dest, ".hg")) |
|
347 | hgdir = os.path.realpath(os.path.join(dest, ".hg")) | |
348 | if not os.path.exists(dest): |
|
348 | if not os.path.exists(dest): | |
349 | os.mkdir(dest) |
|
349 | os.mkdir(dest) | |
350 | else: |
|
350 | else: | |
351 | # only clean up directories we create ourselves |
|
351 | # only clean up directories we create ourselves | |
352 | cleandir = hgdir |
|
352 | cleandir = hgdir | |
353 | try: |
|
353 | try: | |
354 | destpath = hgdir |
|
354 | destpath = hgdir | |
355 | util.makedir(destpath, notindexed=True) |
|
355 | util.makedir(destpath, notindexed=True) | |
356 | except OSError, inst: |
|
356 | except OSError, inst: | |
357 | if inst.errno == errno.EEXIST: |
|
357 | if inst.errno == errno.EEXIST: | |
358 | cleandir = None |
|
358 | cleandir = None | |
359 | raise util.Abort(_("destination '%s' already exists") |
|
359 | raise util.Abort(_("destination '%s' already exists") | |
360 | % dest) |
|
360 | % dest) | |
361 | raise |
|
361 | raise | |
362 |
|
362 | |||
363 | destlock = copystore(ui, srcrepo, destpath) |
|
363 | destlock = copystore(ui, srcrepo, destpath) | |
364 |
|
364 | |||
365 | # Recomputing branch cache might be slow on big repos, |
|
365 | # Recomputing branch cache might be slow on big repos, | |
366 | # so just copy it |
|
366 | # so just copy it | |
367 | dstcachedir = os.path.join(destpath, 'cache') |
|
367 | dstcachedir = os.path.join(destpath, 'cache') | |
368 | srcbranchcache = srcrepo.sjoin('cache/branch2') |
|
368 | srcbranchcache = srcrepo.sjoin('cache/branch2') | |
369 | dstbranchcache = os.path.join(dstcachedir, 'branch2') |
|
369 | dstbranchcache = os.path.join(dstcachedir, 'branch2') | |
370 | if os.path.exists(srcbranchcache): |
|
370 | if os.path.exists(srcbranchcache): | |
371 | if not os.path.exists(dstcachedir): |
|
371 | if not os.path.exists(dstcachedir): | |
372 | os.mkdir(dstcachedir) |
|
372 | os.mkdir(dstcachedir) | |
373 | util.copyfile(srcbranchcache, dstbranchcache) |
|
373 | util.copyfile(srcbranchcache, dstbranchcache) | |
374 |
|
374 | |||
375 | # we need to re-init the repo after manually copying the data |
|
375 | # we need to re-init the repo after manually copying the data | |
376 | # into it |
|
376 | # into it | |
377 | destpeer = peer(srcrepo, peeropts, dest) |
|
377 | destpeer = peer(srcrepo, peeropts, dest) | |
378 | srcrepo.hook('outgoing', source='clone', |
|
378 | srcrepo.hook('outgoing', source='clone', | |
379 | node=node.hex(node.nullid)) |
|
379 | node=node.hex(node.nullid)) | |
380 | else: |
|
380 | else: | |
381 | try: |
|
381 | try: | |
382 | destpeer = peer(srcrepo or ui, peeropts, dest, create=True) |
|
382 | destpeer = peer(srcrepo or ui, peeropts, dest, create=True) | |
383 | # only pass ui when no srcrepo |
|
383 | # only pass ui when no srcrepo | |
384 | except OSError, inst: |
|
384 | except OSError, inst: | |
385 | if inst.errno == errno.EEXIST: |
|
385 | if inst.errno == errno.EEXIST: | |
386 | cleandir = None |
|
386 | cleandir = None | |
387 | raise util.Abort(_("destination '%s' already exists") |
|
387 | raise util.Abort(_("destination '%s' already exists") | |
388 | % dest) |
|
388 | % dest) | |
389 | raise |
|
389 | raise | |
390 |
|
390 | |||
391 | revs = None |
|
391 | revs = None | |
392 | if rev: |
|
392 | if rev: | |
393 | if not srcpeer.capable('lookup'): |
|
393 | if not srcpeer.capable('lookup'): | |
394 | raise util.Abort(_("src repository does not support " |
|
394 | raise util.Abort(_("src repository does not support " | |
395 | "revision lookup and so doesn't " |
|
395 | "revision lookup and so doesn't " | |
396 | "support clone by revision")) |
|
396 | "support clone by revision")) | |
397 | revs = [srcpeer.lookup(r) for r in rev] |
|
397 | revs = [srcpeer.lookup(r) for r in rev] | |
398 | checkout = revs[0] |
|
398 | checkout = revs[0] | |
399 | if destpeer.local(): |
|
399 | if destpeer.local(): | |
400 | destpeer.local().clone(srcpeer, heads=revs, stream=stream) |
|
400 | destpeer.local().clone(srcpeer, heads=revs, stream=stream) | |
401 | elif srcrepo: |
|
401 | elif srcrepo: | |
402 | srcrepo.push(destpeer, revs=revs) |
|
402 | srcrepo.push(destpeer, revs=revs) | |
403 | else: |
|
403 | else: | |
404 | raise util.Abort(_("clone from remote to remote not supported")) |
|
404 | raise util.Abort(_("clone from remote to remote not supported")) | |
405 |
|
405 | |||
406 | cleandir = None |
|
406 | cleandir = None | |
407 |
|
407 | |||
408 | # clone all bookmarks except divergent ones |
|
408 | # clone all bookmarks except divergent ones | |
409 | destrepo = destpeer.local() |
|
409 | destrepo = destpeer.local() | |
410 | if destrepo and srcpeer.capable("pushkey"): |
|
410 | if destrepo and srcpeer.capable("pushkey"): | |
411 | rb = srcpeer.listkeys('bookmarks') |
|
411 | rb = srcpeer.listkeys('bookmarks') | |
412 | marks = destrepo._bookmarks |
|
412 | marks = destrepo._bookmarks | |
413 | for k, n in rb.iteritems(): |
|
413 | for k, n in rb.iteritems(): | |
414 | try: |
|
414 | try: | |
415 | m = destrepo.lookup(n) |
|
415 | m = destrepo.lookup(n) | |
416 | marks[k] = m |
|
416 | marks[k] = m | |
417 | except error.RepoLookupError: |
|
417 | except error.RepoLookupError: | |
418 | pass |
|
418 | pass | |
419 | if rb: |
|
419 | if rb: | |
420 | marks.write() |
|
420 | marks.write() | |
421 | elif srcrepo and destpeer.capable("pushkey"): |
|
421 | elif srcrepo and destpeer.capable("pushkey"): | |
422 | for k, n in srcrepo._bookmarks.iteritems(): |
|
422 | for k, n in srcrepo._bookmarks.iteritems(): | |
423 | destpeer.pushkey('bookmarks', k, '', hex(n)) |
|
423 | destpeer.pushkey('bookmarks', k, '', hex(n)) | |
424 |
|
424 | |||
425 | if destrepo: |
|
425 | if destrepo: | |
426 | fp = destrepo.opener("hgrc", "w", text=True) |
|
426 | fp = destrepo.opener("hgrc", "w", text=True) | |
427 | fp.write("[paths]\n") |
|
427 | fp.write("[paths]\n") | |
428 | u = util.url(abspath) |
|
428 | u = util.url(abspath) | |
429 | u.passwd = None |
|
429 | u.passwd = None | |
430 | defaulturl = str(u) |
|
430 | defaulturl = str(u) | |
431 | fp.write("default = %s\n" % defaulturl) |
|
431 | fp.write("default = %s\n" % defaulturl) | |
432 | fp.close() |
|
432 | fp.close() | |
433 |
|
433 | |||
434 | destrepo.ui.setconfig('paths', 'default', defaulturl, 'clone') |
|
434 | destrepo.ui.setconfig('paths', 'default', defaulturl, 'clone') | |
435 |
|
435 | |||
436 | if update: |
|
436 | if update: | |
437 | if update is not True: |
|
437 | if update is not True: | |
438 | checkout = srcpeer.lookup(update) |
|
438 | checkout = srcpeer.lookup(update) | |
439 | uprev = None |
|
439 | uprev = None | |
440 | status = None |
|
440 | status = None | |
441 | if checkout is not None: |
|
441 | if checkout is not None: | |
442 | try: |
|
442 | try: | |
443 | uprev = destrepo.lookup(checkout) |
|
443 | uprev = destrepo.lookup(checkout) | |
444 | except error.RepoLookupError: |
|
444 | except error.RepoLookupError: | |
445 | pass |
|
445 | pass | |
446 | if uprev is None: |
|
446 | if uprev is None: | |
447 | try: |
|
447 | try: | |
448 | uprev = destrepo._bookmarks['@'] |
|
448 | uprev = destrepo._bookmarks['@'] | |
449 | update = '@' |
|
449 | update = '@' | |
450 | bn = destrepo[uprev].branch() |
|
450 | bn = destrepo[uprev].branch() | |
451 | if bn == 'default': |
|
451 | if bn == 'default': | |
452 | status = _("updating to bookmark @\n") |
|
452 | status = _("updating to bookmark @\n") | |
453 | else: |
|
453 | else: | |
454 | status = (_("updating to bookmark @ on branch %s\n") |
|
454 | status = (_("updating to bookmark @ on branch %s\n") | |
455 | % bn) |
|
455 | % bn) | |
456 | except KeyError: |
|
456 | except KeyError: | |
457 | try: |
|
457 | try: | |
458 | uprev = destrepo.branchtip('default') |
|
458 | uprev = destrepo.branchtip('default') | |
459 | except error.RepoLookupError: |
|
459 | except error.RepoLookupError: | |
460 | uprev = destrepo.lookup('tip') |
|
460 | uprev = destrepo.lookup('tip') | |
461 | if not status: |
|
461 | if not status: | |
462 | bn = destrepo[uprev].branch() |
|
462 | bn = destrepo[uprev].branch() | |
463 | status = _("updating to branch %s\n") % bn |
|
463 | status = _("updating to branch %s\n") % bn | |
464 | destrepo.ui.status(status) |
|
464 | destrepo.ui.status(status) | |
465 | _update(destrepo, uprev) |
|
465 | _update(destrepo, uprev) | |
466 | if update in destrepo._bookmarks: |
|
466 | if update in destrepo._bookmarks: | |
467 | bookmarks.setcurrent(destrepo, update) |
|
467 | bookmarks.setcurrent(destrepo, update) | |
468 | finally: |
|
468 | finally: | |
469 | release(srclock, destlock) |
|
469 | release(srclock, destlock) | |
470 | if cleandir is not None: |
|
470 | if cleandir is not None: | |
471 | shutil.rmtree(cleandir, True) |
|
471 | shutil.rmtree(cleandir, True) | |
472 | if srcpeer is not None: |
|
472 | if srcpeer is not None: | |
473 | srcpeer.close() |
|
473 | srcpeer.close() | |
474 | return srcpeer, destpeer |
|
474 | return srcpeer, destpeer | |
475 |
|
475 | |||
476 | def _showstats(repo, stats): |
|
476 | def _showstats(repo, stats): | |
477 | repo.ui.status(_("%d files updated, %d files merged, " |
|
477 | repo.ui.status(_("%d files updated, %d files merged, " | |
478 | "%d files removed, %d files unresolved\n") % stats) |
|
478 | "%d files removed, %d files unresolved\n") % stats) | |
479 |
|
479 | |||
480 | def updaterepo(repo, node, overwrite): |
|
480 | def updaterepo(repo, node, overwrite): | |
481 | """Update the working directory to node. |
|
481 | """Update the working directory to node. | |
482 |
|
482 | |||
483 | When overwrite is set, changes are clobbered, merged else |
|
483 | When overwrite is set, changes are clobbered, merged else | |
484 |
|
484 | |||
485 | returns stats (see pydoc mercurial.merge.applyupdates)""" |
|
485 | returns stats (see pydoc mercurial.merge.applyupdates)""" | |
486 | return mergemod.update(repo, node, False, overwrite, None) |
|
486 | return mergemod.update(repo, node, False, overwrite, None) | |
487 |
|
487 | |||
488 | def update(repo, node): |
|
488 | def update(repo, node): | |
489 | """update the working directory to node, merging linear changes""" |
|
489 | """update the working directory to node, merging linear changes""" | |
490 | stats = updaterepo(repo, node, False) |
|
490 | stats = updaterepo(repo, node, False) | |
491 | _showstats(repo, stats) |
|
491 | _showstats(repo, stats) | |
492 | if stats[3]: |
|
492 | if stats[3]: | |
493 | repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n")) |
|
493 | repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n")) | |
494 | return stats[3] > 0 |
|
494 | return stats[3] > 0 | |
495 |
|
495 | |||
496 | # naming conflict in clone() |
|
496 | # naming conflict in clone() | |
497 | _update = update |
|
497 | _update = update | |
498 |
|
498 | |||
499 | def clean(repo, node, show_stats=True): |
|
499 | def clean(repo, node, show_stats=True): | |
500 | """forcibly switch the working directory to node, clobbering changes""" |
|
500 | """forcibly switch the working directory to node, clobbering changes""" | |
501 | stats = updaterepo(repo, node, True) |
|
501 | stats = updaterepo(repo, node, True) | |
502 | util.unlinkpath(repo.join('graftstate'), ignoremissing=True) |
|
502 | util.unlinkpath(repo.join('graftstate'), ignoremissing=True) | |
503 | if show_stats: |
|
503 | if show_stats: | |
504 | _showstats(repo, stats) |
|
504 | _showstats(repo, stats) | |
505 | return stats[3] > 0 |
|
505 | return stats[3] > 0 | |
506 |
|
506 | |||
507 | def merge(repo, node, force=None, remind=True): |
|
507 | def merge(repo, node, force=None, remind=True): | |
508 | """Branch merge with node, resolving changes. Return true if any |
|
508 | """Branch merge with node, resolving changes. Return true if any | |
509 | unresolved conflicts.""" |
|
509 | unresolved conflicts.""" | |
510 | stats = mergemod.update(repo, node, True, force, False) |
|
510 | stats = mergemod.update(repo, node, True, force, False) | |
511 | _showstats(repo, stats) |
|
511 | _showstats(repo, stats) | |
512 | if stats[3]: |
|
512 | if stats[3]: | |
513 | repo.ui.status(_("use 'hg resolve' to retry unresolved file merges " |
|
513 | repo.ui.status(_("use 'hg resolve' to retry unresolved file merges " | |
514 | "or 'hg update -C .' to abandon\n")) |
|
514 | "or 'hg update -C .' to abandon\n")) | |
515 | elif remind: |
|
515 | elif remind: | |
516 | repo.ui.status(_("(branch merge, don't forget to commit)\n")) |
|
516 | repo.ui.status(_("(branch merge, don't forget to commit)\n")) | |
517 | return stats[3] > 0 |
|
517 | return stats[3] > 0 | |
518 |
|
518 | |||
519 | def _incoming(displaychlist, subreporecurse, ui, repo, source, |
|
519 | def _incoming(displaychlist, subreporecurse, ui, repo, source, | |
520 | opts, buffered=False): |
|
520 | opts, buffered=False): | |
521 | """ |
|
521 | """ | |
522 | Helper for incoming / gincoming. |
|
522 | Helper for incoming / gincoming. | |
523 | displaychlist gets called with |
|
523 | displaychlist gets called with | |
524 | (remoterepo, incomingchangesetlist, displayer) parameters, |
|
524 | (remoterepo, incomingchangesetlist, displayer) parameters, | |
525 | and is supposed to contain only code that can't be unified. |
|
525 | and is supposed to contain only code that can't be unified. | |
526 | """ |
|
526 | """ | |
527 | source, branches = parseurl(ui.expandpath(source), opts.get('branch')) |
|
527 | source, branches = parseurl(ui.expandpath(source), opts.get('branch')) | |
528 | other = peer(repo, opts, source) |
|
528 | other = peer(repo, opts, source) | |
529 | ui.status(_('comparing with %s\n') % util.hidepassword(source)) |
|
529 | ui.status(_('comparing with %s\n') % util.hidepassword(source)) | |
530 | revs, checkout = addbranchrevs(repo, other, branches, opts.get('rev')) |
|
530 | revs, checkout = addbranchrevs(repo, other, branches, opts.get('rev')) | |
531 |
|
531 | |||
532 | if revs: |
|
532 | if revs: | |
533 | revs = [other.lookup(rev) for rev in revs] |
|
533 | revs = [other.lookup(rev) for rev in revs] | |
534 | other, chlist, cleanupfn = bundlerepo.getremotechanges(ui, repo, other, |
|
534 | other, chlist, cleanupfn = bundlerepo.getremotechanges(ui, repo, other, | |
535 | revs, opts["bundle"], opts["force"]) |
|
535 | revs, opts["bundle"], opts["force"]) | |
536 | try: |
|
536 | try: | |
537 | if not chlist: |
|
537 | if not chlist: | |
538 | ui.status(_("no changes found\n")) |
|
538 | ui.status(_("no changes found\n")) | |
539 | return subreporecurse() |
|
539 | return subreporecurse() | |
540 |
|
540 | |||
541 | displayer = cmdutil.show_changeset(ui, other, opts, buffered) |
|
541 | displayer = cmdutil.show_changeset(ui, other, opts, buffered) | |
542 | displaychlist(other, chlist, displayer) |
|
542 | displaychlist(other, chlist, displayer) | |
543 | displayer.close() |
|
543 | displayer.close() | |
544 | finally: |
|
544 | finally: | |
545 | cleanupfn() |
|
545 | cleanupfn() | |
546 | subreporecurse() |
|
546 | subreporecurse() | |
547 | return 0 # exit code is zero since we found incoming changes |
|
547 | return 0 # exit code is zero since we found incoming changes | |
548 |
|
548 | |||
549 | def incoming(ui, repo, source, opts): |
|
549 | def incoming(ui, repo, source, opts): | |
550 | def subreporecurse(): |
|
550 | def subreporecurse(): | |
551 | ret = 1 |
|
551 | ret = 1 | |
552 | if opts.get('subrepos'): |
|
552 | if opts.get('subrepos'): | |
553 | ctx = repo[None] |
|
553 | ctx = repo[None] | |
554 | for subpath in sorted(ctx.substate): |
|
554 | for subpath in sorted(ctx.substate): | |
555 | sub = ctx.sub(subpath) |
|
555 | sub = ctx.sub(subpath) | |
556 | ret = min(ret, sub.incoming(ui, source, opts)) |
|
556 | ret = min(ret, sub.incoming(ui, source, opts)) | |
557 | return ret |
|
557 | return ret | |
558 |
|
558 | |||
559 | def display(other, chlist, displayer): |
|
559 | def display(other, chlist, displayer): | |
560 | limit = cmdutil.loglimit(opts) |
|
560 | limit = cmdutil.loglimit(opts) | |
561 | if opts.get('newest_first'): |
|
561 | if opts.get('newest_first'): | |
562 | chlist.reverse() |
|
562 | chlist.reverse() | |
563 | count = 0 |
|
563 | count = 0 | |
564 | for n in chlist: |
|
564 | for n in chlist: | |
565 | if limit is not None and count >= limit: |
|
565 | if limit is not None and count >= limit: | |
566 | break |
|
566 | break | |
567 | parents = [p for p in other.changelog.parents(n) if p != nullid] |
|
567 | parents = [p for p in other.changelog.parents(n) if p != nullid] | |
568 | if opts.get('no_merges') and len(parents) == 2: |
|
568 | if opts.get('no_merges') and len(parents) == 2: | |
569 | continue |
|
569 | continue | |
570 | count += 1 |
|
570 | count += 1 | |
571 | displayer.show(other[n]) |
|
571 | displayer.show(other[n]) | |
572 | return _incoming(display, subreporecurse, ui, repo, source, opts) |
|
572 | return _incoming(display, subreporecurse, ui, repo, source, opts) | |
573 |
|
573 | |||
574 | def _outgoing(ui, repo, dest, opts): |
|
574 | def _outgoing(ui, repo, dest, opts): | |
575 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
575 | dest = ui.expandpath(dest or 'default-push', dest or 'default') | |
576 | dest, branches = parseurl(dest, opts.get('branch')) |
|
576 | dest, branches = parseurl(dest, opts.get('branch')) | |
577 | ui.status(_('comparing with %s\n') % util.hidepassword(dest)) |
|
577 | ui.status(_('comparing with %s\n') % util.hidepassword(dest)) | |
578 | revs, checkout = addbranchrevs(repo, repo, branches, opts.get('rev')) |
|
578 | revs, checkout = addbranchrevs(repo, repo, branches, opts.get('rev')) | |
579 | if revs: |
|
579 | if revs: | |
580 | revs = [repo.lookup(rev) for rev in scmutil.revrange(repo, revs)] |
|
580 | revs = [repo.lookup(rev) for rev in scmutil.revrange(repo, revs)] | |
581 |
|
581 | |||
582 | other = peer(repo, opts, dest) |
|
582 | other = peer(repo, opts, dest) | |
583 | outgoing = discovery.findcommonoutgoing(repo.unfiltered(), other, revs, |
|
583 | outgoing = discovery.findcommonoutgoing(repo.unfiltered(), other, revs, | |
584 | force=opts.get('force')) |
|
584 | force=opts.get('force')) | |
585 | o = outgoing.missing |
|
585 | o = outgoing.missing | |
586 | if not o: |
|
586 | if not o: | |
587 | scmutil.nochangesfound(repo.ui, repo, outgoing.excluded) |
|
587 | scmutil.nochangesfound(repo.ui, repo, outgoing.excluded) | |
588 | return o, other |
|
588 | return o, other | |
589 |
|
589 | |||
590 | def outgoing(ui, repo, dest, opts): |
|
590 | def outgoing(ui, repo, dest, opts): | |
591 | def recurse(): |
|
591 | def recurse(): | |
592 | ret = 1 |
|
592 | ret = 1 | |
593 | if opts.get('subrepos'): |
|
593 | if opts.get('subrepos'): | |
594 | ctx = repo[None] |
|
594 | ctx = repo[None] | |
595 | for subpath in sorted(ctx.substate): |
|
595 | for subpath in sorted(ctx.substate): | |
596 | sub = ctx.sub(subpath) |
|
596 | sub = ctx.sub(subpath) | |
597 | ret = min(ret, sub.outgoing(ui, dest, opts)) |
|
597 | ret = min(ret, sub.outgoing(ui, dest, opts)) | |
598 | return ret |
|
598 | return ret | |
599 |
|
599 | |||
600 | limit = cmdutil.loglimit(opts) |
|
600 | limit = cmdutil.loglimit(opts) | |
601 | o, other = _outgoing(ui, repo, dest, opts) |
|
601 | o, other = _outgoing(ui, repo, dest, opts) | |
602 | if not o: |
|
602 | if not o: | |
|
603 | cmdutil.outgoinghooks(ui, repo, other, opts, o) | |||
603 | return recurse() |
|
604 | return recurse() | |
604 |
|
605 | |||
605 | if opts.get('newest_first'): |
|
606 | if opts.get('newest_first'): | |
606 | o.reverse() |
|
607 | o.reverse() | |
607 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
608 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
608 | count = 0 |
|
609 | count = 0 | |
609 | for n in o: |
|
610 | for n in o: | |
610 | if limit is not None and count >= limit: |
|
611 | if limit is not None and count >= limit: | |
611 | break |
|
612 | break | |
612 | parents = [p for p in repo.changelog.parents(n) if p != nullid] |
|
613 | parents = [p for p in repo.changelog.parents(n) if p != nullid] | |
613 | if opts.get('no_merges') and len(parents) == 2: |
|
614 | if opts.get('no_merges') and len(parents) == 2: | |
614 | continue |
|
615 | continue | |
615 | count += 1 |
|
616 | count += 1 | |
616 | displayer.show(repo[n]) |
|
617 | displayer.show(repo[n]) | |
617 | displayer.close() |
|
618 | displayer.close() | |
|
619 | cmdutil.outgoinghooks(ui, repo, other, opts, o) | |||
618 | recurse() |
|
620 | recurse() | |
619 | return 0 # exit code is zero since we found outgoing changes |
|
621 | return 0 # exit code is zero since we found outgoing changes | |
620 |
|
622 | |||
621 | def revert(repo, node, choose): |
|
623 | def revert(repo, node, choose): | |
622 | """revert changes to revision in node without updating dirstate""" |
|
624 | """revert changes to revision in node without updating dirstate""" | |
623 | return mergemod.update(repo, node, False, True, choose)[3] > 0 |
|
625 | return mergemod.update(repo, node, False, True, choose)[3] > 0 | |
624 |
|
626 | |||
625 | def verify(repo): |
|
627 | def verify(repo): | |
626 | """verify the consistency of a repository""" |
|
628 | """verify the consistency of a repository""" | |
627 | return verifymod.verify(repo) |
|
629 | return verifymod.verify(repo) | |
628 |
|
630 | |||
629 | def remoteui(src, opts): |
|
631 | def remoteui(src, opts): | |
630 | 'build a remote ui from ui or repo and opts' |
|
632 | 'build a remote ui from ui or repo and opts' | |
631 | if util.safehasattr(src, 'baseui'): # looks like a repository |
|
633 | if util.safehasattr(src, 'baseui'): # looks like a repository | |
632 | dst = src.baseui.copy() # drop repo-specific config |
|
634 | dst = src.baseui.copy() # drop repo-specific config | |
633 | src = src.ui # copy target options from repo |
|
635 | src = src.ui # copy target options from repo | |
634 | else: # assume it's a global ui object |
|
636 | else: # assume it's a global ui object | |
635 | dst = src.copy() # keep all global options |
|
637 | dst = src.copy() # keep all global options | |
636 |
|
638 | |||
637 | # copy ssh-specific options |
|
639 | # copy ssh-specific options | |
638 | for o in 'ssh', 'remotecmd': |
|
640 | for o in 'ssh', 'remotecmd': | |
639 | v = opts.get(o) or src.config('ui', o) |
|
641 | v = opts.get(o) or src.config('ui', o) | |
640 | if v: |
|
642 | if v: | |
641 | dst.setconfig("ui", o, v, 'copied') |
|
643 | dst.setconfig("ui", o, v, 'copied') | |
642 |
|
644 | |||
643 | # copy bundle-specific options |
|
645 | # copy bundle-specific options | |
644 | r = src.config('bundle', 'mainreporoot') |
|
646 | r = src.config('bundle', 'mainreporoot') | |
645 | if r: |
|
647 | if r: | |
646 | dst.setconfig('bundle', 'mainreporoot', r, 'copied') |
|
648 | dst.setconfig('bundle', 'mainreporoot', r, 'copied') | |
647 |
|
649 | |||
648 | # copy selected local settings to the remote ui |
|
650 | # copy selected local settings to the remote ui | |
649 | for sect in ('auth', 'hostfingerprints', 'http_proxy'): |
|
651 | for sect in ('auth', 'hostfingerprints', 'http_proxy'): | |
650 | for key, val in src.configitems(sect): |
|
652 | for key, val in src.configitems(sect): | |
651 | dst.setconfig(sect, key, val, 'copied') |
|
653 | dst.setconfig(sect, key, val, 'copied') | |
652 | v = src.config('web', 'cacerts') |
|
654 | v = src.config('web', 'cacerts') | |
653 | if v: |
|
655 | if v: | |
654 | dst.setconfig('web', 'cacerts', util.expandpath(v), 'copied') |
|
656 | dst.setconfig('web', 'cacerts', util.expandpath(v), 'copied') | |
655 |
|
657 | |||
656 | return dst |
|
658 | return dst |
General Comments 0
You need to be logged in to leave comments.
Login now