Show More
@@ -1,189 +1,187 b'' | |||
|
1 | 1 | # churn.py - create a graph of revisions count grouped by template |
|
2 | 2 | # |
|
3 | 3 | # Copyright 2006 Josef "Jeff" Sipek <jeffpc@josefsipek.net> |
|
4 | 4 | # Copyright 2008 Alexander Solovyov <piranha@piranha.org.ua> |
|
5 | 5 | # |
|
6 | 6 | # This software may be used and distributed according to the terms of the |
|
7 | 7 | # GNU General Public License version 2 or any later version. |
|
8 | 8 | |
|
9 | 9 | '''command to display statistics about repository history''' |
|
10 | 10 | |
|
11 | 11 | from mercurial.i18n import _ |
|
12 | 12 | from mercurial import patch, cmdutil, util, templater, commands |
|
13 | 13 | import os |
|
14 | 14 | import time, datetime |
|
15 | 15 | |
|
16 | 16 | def maketemplater(ui, repo, tmpl): |
|
17 | 17 | tmpl = templater.parsestring(tmpl, quoted=False) |
|
18 | 18 | try: |
|
19 | 19 | t = cmdutil.changeset_templater(ui, repo, False, None, None, False) |
|
20 | 20 | except SyntaxError, inst: |
|
21 | 21 | raise util.Abort(inst.args[0]) |
|
22 | 22 | t.use_template(tmpl) |
|
23 | 23 | return t |
|
24 | 24 | |
|
25 | 25 | def changedlines(ui, repo, ctx1, ctx2, fns): |
|
26 | 26 | added, removed = 0, 0 |
|
27 | 27 | fmatch = cmdutil.matchfiles(repo, fns) |
|
28 | 28 | diff = ''.join(patch.diff(repo, ctx1.node(), ctx2.node(), fmatch)) |
|
29 | 29 | for l in diff.split('\n'): |
|
30 | 30 | if l.startswith("+") and not l.startswith("+++ "): |
|
31 | 31 | added += 1 |
|
32 | 32 | elif l.startswith("-") and not l.startswith("--- "): |
|
33 | 33 | removed += 1 |
|
34 | 34 | return (added, removed) |
|
35 | 35 | |
|
36 | 36 | def countrate(ui, repo, amap, *pats, **opts): |
|
37 | 37 | """Calculate stats""" |
|
38 | 38 | if opts.get('dateformat'): |
|
39 | 39 | def getkey(ctx): |
|
40 | 40 | t, tz = ctx.date() |
|
41 | 41 | date = datetime.datetime(*time.gmtime(float(t) - tz)[:6]) |
|
42 | 42 | return date.strftime(opts['dateformat']) |
|
43 | 43 | else: |
|
44 | 44 | tmpl = opts.get('template', '{author|email}') |
|
45 | 45 | tmpl = maketemplater(ui, repo, tmpl) |
|
46 | 46 | def getkey(ctx): |
|
47 | 47 | ui.pushbuffer() |
|
48 | 48 | tmpl.show(ctx) |
|
49 | 49 | return ui.popbuffer() |
|
50 | 50 | |
|
51 | 51 | state = {'count': 0} |
|
52 | 52 | rate = {} |
|
53 | 53 | df = False |
|
54 | 54 | if opts.get('date'): |
|
55 | 55 | df = util.matchdate(opts['date']) |
|
56 | 56 | |
|
57 | 57 | m = cmdutil.match(repo, pats, opts) |
|
58 | 58 | def prep(ctx, fns): |
|
59 | 59 | rev = ctx.rev() |
|
60 | 60 | if df and not df(ctx.date()[0]): # doesn't match date format |
|
61 | 61 | return |
|
62 | 62 | |
|
63 | 63 | key = getkey(ctx) |
|
64 | 64 | key = amap.get(key, key) # alias remap |
|
65 | 65 | if opts.get('changesets'): |
|
66 | 66 | rate[key] = (rate.get(key, (0,))[0] + 1, 0) |
|
67 | 67 | else: |
|
68 | 68 | parents = ctx.parents() |
|
69 | 69 | if len(parents) > 1: |
|
70 | 70 | ui.note(_('Revision %d is a merge, ignoring...\n') % (rev,)) |
|
71 | 71 | return |
|
72 | 72 | |
|
73 | 73 | ctx1 = parents[0] |
|
74 | 74 | lines = changedlines(ui, repo, ctx1, ctx, fns) |
|
75 | 75 | rate[key] = [r + l for r, l in zip(rate.get(key, (0, 0)), lines)] |
|
76 | 76 | |
|
77 | 77 | state['count'] += 1 |
|
78 | 78 | ui.progress(_('analyzing'), state['count'], total=len(repo)) |
|
79 | 79 | |
|
80 | 80 | for ctx in cmdutil.walkchangerevs(repo, m, opts, prep): |
|
81 | 81 | continue |
|
82 | 82 | |
|
83 | 83 | ui.progress(_('analyzing'), None) |
|
84 | 84 | |
|
85 | 85 | return rate |
|
86 | 86 | |
|
87 | 87 | |
|
88 | 88 | def churn(ui, repo, *pats, **opts): |
|
89 | 89 | '''histogram of changes to the repository |
|
90 | 90 | |
|
91 | 91 | This command will display a histogram representing the number |
|
92 | 92 | of changed lines or revisions, grouped according to the given |
|
93 | 93 | template. The default template will group changes by author. |
|
94 | 94 | The --dateformat option may be used to group the results by |
|
95 | 95 | date instead. |
|
96 | 96 | |
|
97 | 97 | Statistics are based on the number of changed lines, or |
|
98 | 98 | alternatively the number of matching revisions if the |
|
99 | 99 | --changesets option is specified. |
|
100 | 100 | |
|
101 | 101 | Examples:: |
|
102 | 102 | |
|
103 | 103 | # display count of changed lines for every committer |
|
104 | 104 | hg churn -t '{author|email}' |
|
105 | 105 | |
|
106 | 106 | # display daily activity graph |
|
107 | 107 | hg churn -f '%H' -s -c |
|
108 | 108 | |
|
109 | 109 | # display activity of developers by month |
|
110 | 110 | hg churn -f '%Y-%m' -s -c |
|
111 | 111 | |
|
112 | 112 | # display count of lines changed in every year |
|
113 | 113 | hg churn -f '%Y' -s |
|
114 | 114 | |
|
115 | 115 | It is possible to map alternate email addresses to a main address |
|
116 | 116 | by providing a file using the following format:: |
|
117 | 117 | |
|
118 | 118 | <alias email> = <actual email> |
|
119 | 119 | |
|
120 | 120 | Such a file may be specified with the --aliases option, otherwise |
|
121 | 121 | a .hgchurn file will be looked for in the working directory root. |
|
122 | 122 | ''' |
|
123 | 123 | def pad(s, l): |
|
124 | 124 | return (s + " " * l)[:l] |
|
125 | 125 | |
|
126 | 126 | amap = {} |
|
127 | 127 | aliases = opts.get('aliases') |
|
128 | 128 | if not aliases and os.path.exists(repo.wjoin('.hgchurn')): |
|
129 | 129 | aliases = repo.wjoin('.hgchurn') |
|
130 | 130 | if aliases: |
|
131 | 131 | for l in open(aliases, "r"): |
|
132 | 132 | alias, actual = l.split('=' in l and '=' or None, 1) |
|
133 | 133 | amap[alias.strip()] = actual.strip() |
|
134 | 134 | |
|
135 | 135 | rate = countrate(ui, repo, amap, *pats, **opts).items() |
|
136 | 136 | if not rate: |
|
137 | 137 | return |
|
138 | 138 | |
|
139 | 139 | sortkey = ((not opts.get('sort')) and (lambda x: -sum(x[1])) or None) |
|
140 | 140 | rate.sort(key=sortkey) |
|
141 | 141 | |
|
142 | 142 | # Be careful not to have a zero maxcount (issue833) |
|
143 | 143 | maxcount = float(max(sum(v) for k, v in rate)) or 1.0 |
|
144 | 144 | maxname = max(len(k) for k, v in rate) |
|
145 | 145 | |
|
146 | 146 | ttywidth = util.termwidth() |
|
147 | 147 | ui.debug("assuming %i character terminal\n" % ttywidth) |
|
148 | 148 | width = ttywidth - maxname - 2 - 2 - 2 |
|
149 | 149 | |
|
150 | 150 | if opts.get('diffstat'): |
|
151 | 151 | width -= 15 |
|
152 | 152 | def format(name, (added, removed)): |
|
153 |
return "%s %15s %s%s\n" % ( |
|
|
154 |
|
|
|
155 | ui.label('+%d/-%d' % (added, removed), | |
|
156 | 'ui.plain'), | |
|
153 | return "%s %15s %s%s\n" % (pad(name, maxname), | |
|
154 | '+%d/-%d' % (added, removed), | |
|
157 | 155 | ui.label('+' * charnum(added), |
|
158 | 156 | 'diffstat.inserted'), |
|
159 | 157 | ui.label('-' * charnum(removed), |
|
160 | 158 | 'diffstat.deleted')) |
|
161 | 159 | else: |
|
162 | 160 | width -= 6 |
|
163 | 161 | def format(name, count): |
|
164 |
return |
|
|
165 |
'*' * charnum(sum(count))) |
|
|
162 | return "%s %6d %s\n" % (pad(name, maxname), sum(count), | |
|
163 | '*' * charnum(sum(count))) | |
|
166 | 164 | |
|
167 | 165 | def charnum(count): |
|
168 | 166 | return int(round(count * width / maxcount)) |
|
169 | 167 | |
|
170 | 168 | for name, count in rate: |
|
171 |
ui.write(format(name, count) |
|
|
169 | ui.write(format(name, count)) | |
|
172 | 170 | |
|
173 | 171 | |
|
174 | 172 | cmdtable = { |
|
175 | 173 | "churn": |
|
176 | 174 | (churn, |
|
177 | 175 | [('r', 'rev', [], _('count rate for the specified revision or range')), |
|
178 | 176 | ('d', 'date', '', _('count rate for revisions matching date spec')), |
|
179 | 177 | ('t', 'template', '{author|email}', |
|
180 | 178 | _('template to group changesets')), |
|
181 | 179 | ('f', 'dateformat', '', |
|
182 | 180 | _('strftime-compatible format for grouping by date')), |
|
183 | 181 | ('c', 'changesets', False, _('count rate by number of changesets')), |
|
184 | 182 | ('s', 'sort', False, _('sort by key (default: sort by count)')), |
|
185 | 183 | ('', 'diffstat', False, _('display added/removed lines separately')), |
|
186 | 184 | ('', 'aliases', '', _('file with email aliases')), |
|
187 | 185 | ] + commands.walkopts, |
|
188 | 186 | _("hg churn [-d DATE] [-r REV] [--aliases FILE] [FILE]")), |
|
189 | 187 | } |
@@ -1,295 +1,291 b'' | |||
|
1 | 1 | # color.py color output for the status and qseries commands |
|
2 | 2 | # |
|
3 | 3 | # Copyright (C) 2007 Kevin Christen <kevin.christen@gmail.com> |
|
4 | 4 | # |
|
5 | 5 | # This program is free software; you can redistribute it and/or modify it |
|
6 | 6 | # under the terms of the GNU General Public License as published by the |
|
7 | 7 | # Free Software Foundation; either version 2 of the License, or (at your |
|
8 | 8 | # option) any later version. |
|
9 | 9 | # |
|
10 | 10 | # This program is distributed in the hope that it will be useful, but |
|
11 | 11 | # WITHOUT ANY WARRANTY; without even the implied warranty of |
|
12 | 12 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General |
|
13 | 13 | # Public License for more details. |
|
14 | 14 | # |
|
15 | 15 | # You should have received a copy of the GNU General Public License along |
|
16 | 16 | # with this program; if not, write to the Free Software Foundation, Inc., |
|
17 | 17 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
|
18 | 18 | |
|
19 | 19 | '''colorize output from some commands |
|
20 | 20 | |
|
21 | 21 | This extension modifies the status and resolve commands to add color to their |
|
22 | 22 | output to reflect file status, the qseries command to add color to reflect |
|
23 | 23 | patch status (applied, unapplied, missing), and to diff-related |
|
24 | 24 | commands to highlight additions, removals, diff headers, and trailing |
|
25 | 25 | whitespace. |
|
26 | 26 | |
|
27 | 27 | Other effects in addition to color, like bold and underlined text, are |
|
28 | 28 | also available. Effects are rendered with the ECMA-48 SGR control |
|
29 | 29 | function (aka ANSI escape codes). This module also provides the |
|
30 | 30 | render_text function, which can be used to add effects to any text. |
|
31 | 31 | |
|
32 | 32 | Default effects may be overridden from the .hgrc file:: |
|
33 | 33 | |
|
34 | 34 | [color] |
|
35 | 35 | status.modified = blue bold underline red_background |
|
36 | 36 | status.added = green bold |
|
37 | 37 | status.removed = red bold blue_background |
|
38 | 38 | status.deleted = cyan bold underline |
|
39 | 39 | status.unknown = magenta bold underline |
|
40 | 40 | status.ignored = black bold |
|
41 | 41 | |
|
42 | 42 | # 'none' turns off all effects |
|
43 | 43 | status.clean = none |
|
44 | 44 | status.copied = none |
|
45 | 45 | |
|
46 | 46 | qseries.applied = blue bold underline |
|
47 | 47 | qseries.unapplied = black bold |
|
48 | 48 | qseries.missing = red bold |
|
49 | 49 | |
|
50 | 50 | diff.diffline = bold |
|
51 | 51 | diff.extended = cyan bold |
|
52 | 52 | diff.file_a = red bold |
|
53 | 53 | diff.file_b = green bold |
|
54 | 54 | diff.hunk = magenta |
|
55 | 55 | diff.deleted = red |
|
56 | 56 | diff.inserted = green |
|
57 | 57 | diff.changed = white |
|
58 | 58 | diff.trailingwhitespace = bold red_background |
|
59 | 59 | |
|
60 | 60 | resolve.unresolved = red bold |
|
61 | 61 | resolve.resolved = green bold |
|
62 | 62 | |
|
63 | 63 | bookmarks.current = green |
|
64 | 64 | |
|
65 | 65 | The color extension will try to detect whether to use ANSI codes or |
|
66 | 66 | Win32 console APIs, unless it is made explicit:: |
|
67 | 67 | |
|
68 | 68 | [color] |
|
69 | 69 | mode = ansi |
|
70 | 70 | |
|
71 | 71 | Any value other than 'ansi', 'win32', or 'auto' will disable color. |
|
72 | 72 | |
|
73 | 73 | ''' |
|
74 | 74 | |
|
75 | 75 | import os, sys |
|
76 | 76 | |
|
77 | 77 | from mercurial import commands, dispatch, extensions |
|
78 | 78 | from mercurial.i18n import _ |
|
79 | 79 | |
|
80 | 80 | # start and stop parameters for effects |
|
81 | 81 | _effects = {'none': 0, 'black': 30, 'red': 31, 'green': 32, 'yellow': 33, |
|
82 | 82 | 'blue': 34, 'magenta': 35, 'cyan': 36, 'white': 37, 'bold': 1, |
|
83 | 83 | 'italic': 3, 'underline': 4, 'inverse': 7, |
|
84 | 84 | 'black_background': 40, 'red_background': 41, |
|
85 | 85 | 'green_background': 42, 'yellow_background': 43, |
|
86 | 86 | 'blue_background': 44, 'purple_background': 45, |
|
87 | 87 | 'cyan_background': 46, 'white_background': 47} |
|
88 | 88 | |
|
89 | 89 | _styles = {'grep.match': 'red bold', |
|
90 | 90 | 'diff.changed': 'white', |
|
91 | 91 | 'diff.deleted': 'red', |
|
92 | 92 | 'diff.diffline': 'bold', |
|
93 | 93 | 'diff.extended': 'cyan bold', |
|
94 | 94 | 'diff.file_a': 'red bold', |
|
95 | 95 | 'diff.file_b': 'green bold', |
|
96 | 96 | 'diff.hunk': 'magenta', |
|
97 | 97 | 'diff.inserted': 'green', |
|
98 | 98 | 'diff.trailingwhitespace': 'bold red_background', |
|
99 | 99 | 'diffstat.deleted': 'red', |
|
100 | 100 | 'diffstat.inserted': 'green', |
|
101 | 101 | 'log.changeset': 'yellow', |
|
102 | 102 | 'resolve.resolved': 'green bold', |
|
103 | 103 | 'resolve.unresolved': 'red bold', |
|
104 | 104 | 'status.added': 'green bold', |
|
105 | 105 | 'status.clean': 'none', |
|
106 | 106 | 'status.copied': 'none', |
|
107 | 107 | 'status.deleted': 'cyan bold underline', |
|
108 | 108 | 'status.ignored': 'black bold', |
|
109 | 109 | 'status.modified': 'blue bold', |
|
110 | 110 | 'status.removed': 'red bold', |
|
111 |
'status.unknown': 'magenta bold underline' |
|
|
112 | 'ui.labeled': 'none', | |
|
113 | 'ui.plain': 'none'} | |
|
111 | 'status.unknown': 'magenta bold underline'} | |
|
114 | 112 | |
|
115 | 113 | |
|
116 | 114 | def render_effects(text, effects): |
|
117 | 115 | 'Wrap text in commands to turn on each effect.' |
|
118 | 116 | if not text: |
|
119 | 117 | return text |
|
120 | 118 | start = [str(_effects[e]) for e in ['none'] + effects.split()] |
|
121 | 119 | start = '\033[' + ';'.join(start) + 'm' |
|
122 | 120 | stop = '\033[' + str(_effects['none']) + 'm' |
|
123 | 121 | return ''.join([start, text, stop]) |
|
124 | 122 | |
|
125 | 123 | def extstyles(): |
|
126 | 124 | for name, ext in extensions.extensions(): |
|
127 | 125 | _styles.update(getattr(ext, 'colortable', {})) |
|
128 | 126 | |
|
129 | 127 | def configstyles(ui): |
|
130 | 128 | for status, cfgeffects in ui.configitems('color'): |
|
131 | 129 | if '.' not in status: |
|
132 | 130 | continue |
|
133 | 131 | cfgeffects = ui.configlist('color', status) |
|
134 | 132 | if cfgeffects: |
|
135 | 133 | good = [] |
|
136 | 134 | for e in cfgeffects: |
|
137 | 135 | if e in _effects: |
|
138 | 136 | good.append(e) |
|
139 | 137 | else: |
|
140 | 138 | ui.warn(_("ignoring unknown color/effect %r " |
|
141 | 139 | "(configured in color.%s)\n") |
|
142 | 140 | % (e, status)) |
|
143 | 141 | _styles[status] = ' '.join(good) |
|
144 | 142 | |
|
145 | 143 | _buffers = None |
|
146 | 144 | def style(msg, label): |
|
147 | if label in ('ui.plain', 'ui.labeled'): | |
|
148 | return msg | |
|
149 | 145 | effects = [] |
|
150 | 146 | for l in label.split(): |
|
151 | 147 | s = _styles.get(l, '') |
|
152 | 148 | if s: |
|
153 | 149 | effects.append(s) |
|
154 | 150 | effects = ''.join(effects) |
|
155 | 151 | if effects: |
|
156 | 152 | return '\n'.join([render_effects(s, effects) |
|
157 | 153 | for s in msg.split('\n')]) |
|
158 | 154 | return msg |
|
159 | 155 | |
|
160 | 156 | def popbuffer(orig, labeled=False): |
|
161 | 157 | global _buffers |
|
162 | 158 | if labeled: |
|
163 | 159 | return ''.join(style(a, label) for a, label in _buffers.pop()) |
|
164 | 160 | return ''.join(a for a, label in _buffers.pop()) |
|
165 | 161 | |
|
166 | 162 | mode = 'ansi' |
|
167 | 163 | def write(orig, *args, **opts): |
|
168 | 164 | label = opts.get('label', '') |
|
169 | 165 | global _buffers |
|
170 | 166 | if _buffers: |
|
171 | 167 | _buffers[-1].extend([(str(a), label) for a in args]) |
|
172 | 168 | elif mode == 'win32': |
|
173 | 169 | for a in args: |
|
174 | 170 | win32print(a, orig, **opts) |
|
175 | 171 | else: |
|
176 | 172 | return orig(*[style(str(a), label) for a in args], **opts) |
|
177 | 173 | |
|
178 | 174 | def write_err(orig, *args, **opts): |
|
179 | 175 | label = opts.get('label', '') |
|
180 | 176 | if mode == 'win32': |
|
181 | 177 | for a in args: |
|
182 | 178 | win32print(a, orig, **opts) |
|
183 | 179 | else: |
|
184 | 180 | return orig(*[style(str(a), label) for a in args], **opts) |
|
185 | 181 | |
|
186 | 182 | def uisetup(ui): |
|
187 | 183 | if ui.plain(): |
|
188 | 184 | return |
|
189 | 185 | global mode |
|
190 | 186 | mode = ui.config('color', 'mode', 'auto') |
|
191 | 187 | if mode == 'auto': |
|
192 | 188 | if os.name == 'nt' and 'TERM' not in os.environ: |
|
193 | 189 | # looks line a cmd.exe console, use win32 API or nothing |
|
194 | 190 | mode = w32effects and 'win32' or 'none' |
|
195 | 191 | else: |
|
196 | 192 | mode = 'ansi' |
|
197 | 193 | if mode == 'win32': |
|
198 | 194 | if w32effects is None: |
|
199 | 195 | # only warn if color.mode is explicitly set to win32 |
|
200 | 196 | ui.warn(_('win32console not found, please install pywin32\n')) |
|
201 | 197 | return |
|
202 | 198 | _effects.update(w32effects) |
|
203 | 199 | elif mode != 'ansi': |
|
204 | 200 | return |
|
205 | 201 | |
|
206 | 202 | # check isatty() before anything else changes it (like pager) |
|
207 | 203 | isatty = sys.__stdout__.isatty() |
|
208 | 204 | |
|
209 | 205 | def colorcmd(orig, ui_, opts, cmd, cmdfunc): |
|
210 | 206 | if (opts['color'] == 'always' or |
|
211 | 207 | (opts['color'] == 'auto' and (os.environ.get('TERM') != 'dumb' |
|
212 | 208 | and isatty))): |
|
213 | 209 | global _buffers |
|
214 | 210 | _buffers = ui_._buffers |
|
215 | 211 | extensions.wrapfunction(ui_, 'popbuffer', popbuffer) |
|
216 | 212 | extensions.wrapfunction(ui_, 'write', write) |
|
217 | 213 | extensions.wrapfunction(ui_, 'write_err', write_err) |
|
218 | 214 | ui_.label = style |
|
219 | 215 | extstyles() |
|
220 | 216 | configstyles(ui) |
|
221 | 217 | return orig(ui_, opts, cmd, cmdfunc) |
|
222 | 218 | extensions.wrapfunction(dispatch, '_runcommand', colorcmd) |
|
223 | 219 | |
|
224 | 220 | commands.globalopts.append(('', 'color', 'auto', |
|
225 | 221 | _("when to colorize (always, auto, or never)"))) |
|
226 | 222 | |
|
227 | 223 | try: |
|
228 | 224 | import re, pywintypes |
|
229 | 225 | from win32console import * |
|
230 | 226 | |
|
231 | 227 | # http://msdn.microsoft.com/en-us/library/ms682088%28VS.85%29.aspx |
|
232 | 228 | w32effects = { |
|
233 | 229 | 'none': 0, |
|
234 | 230 | 'black': 0, |
|
235 | 231 | 'red': FOREGROUND_RED, |
|
236 | 232 | 'green': FOREGROUND_GREEN, |
|
237 | 233 | 'yellow': FOREGROUND_RED | FOREGROUND_GREEN, |
|
238 | 234 | 'blue': FOREGROUND_BLUE, |
|
239 | 235 | 'magenta': FOREGROUND_BLUE | FOREGROUND_RED, |
|
240 | 236 | 'cyan': FOREGROUND_BLUE | FOREGROUND_GREEN, |
|
241 | 237 | 'white': FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE, |
|
242 | 238 | 'bold': FOREGROUND_INTENSITY, |
|
243 | 239 | 'black_background': 0, |
|
244 | 240 | 'red_background': BACKGROUND_RED, |
|
245 | 241 | 'green_background': BACKGROUND_GREEN, |
|
246 | 242 | 'yellow_background': BACKGROUND_RED | BACKGROUND_GREEN, |
|
247 | 243 | 'blue_background': BACKGROUND_BLUE, |
|
248 | 244 | 'purple_background': BACKGROUND_BLUE | BACKGROUND_RED, |
|
249 | 245 | 'cyan_background': BACKGROUND_BLUE | BACKGROUND_GREEN, |
|
250 | 246 | 'white_background': BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE, |
|
251 | 247 | 'bold_background': BACKGROUND_INTENSITY, |
|
252 | 248 | 'underline': COMMON_LVB_UNDERSCORE, # double-byte charsets only |
|
253 | 249 | 'inverse': COMMON_LVB_REVERSE_VIDEO, # double-byte charsets only |
|
254 | 250 | } |
|
255 | 251 | |
|
256 | 252 | stdout = GetStdHandle(STD_OUTPUT_HANDLE) |
|
257 | 253 | try: |
|
258 | 254 | origattr = stdout.GetConsoleScreenBufferInfo()['Attributes'] |
|
259 | 255 | except pywintypes.error: |
|
260 | 256 | # stdout may be defined but not support |
|
261 | 257 | # GetConsoleScreenBufferInfo(), when called from subprocess or |
|
262 | 258 | # redirected. |
|
263 | 259 | raise ImportError() |
|
264 | 260 | ansire = re.compile('\033\[([^m]*)m([^\033]*)(.*)', re.MULTILINE | re.DOTALL) |
|
265 | 261 | |
|
266 | 262 | def win32print(text, orig, **opts): |
|
267 | 263 | label = opts.get('label', '') |
|
268 | 264 | attr = 0 |
|
269 | 265 | |
|
270 | 266 | # determine console attributes based on labels |
|
271 | 267 | for l in label.split(): |
|
272 | 268 | style = _styles.get(l, '') |
|
273 | 269 | for effect in style.split(): |
|
274 | 270 | attr |= w32effects[effect] |
|
275 | 271 | |
|
276 | 272 | # hack to ensure regexp finds data |
|
277 | 273 | if not text.startswith('\033['): |
|
278 | 274 | text = '\033[m' + text |
|
279 | 275 | |
|
280 | 276 | # Look for ANSI-like codes embedded in text |
|
281 | 277 | m = re.match(ansire, text) |
|
282 | 278 | while m: |
|
283 | 279 | for sattr in m.group(1).split(';'): |
|
284 | 280 | if sattr: |
|
285 | 281 | val = int(sattr) |
|
286 | 282 | attr = val and attr|val or 0 |
|
287 | 283 | stdout.SetConsoleTextAttribute(attr or origattr) |
|
288 | 284 | orig(m.group(2), **opts) |
|
289 | 285 | m = re.match(ansire, m.group(3)) |
|
290 | 286 | |
|
291 | 287 | # Explicity reset original attributes |
|
292 | 288 | stdout.SetConsoleTextAttribute(origattr) |
|
293 | 289 | |
|
294 | 290 | except ImportError: |
|
295 | 291 | w32effects = None |
@@ -1,2987 +1,2986 b'' | |||
|
1 | 1 | # mq.py - patch queues for mercurial |
|
2 | 2 | # |
|
3 | 3 | # Copyright 2005, 2006 Chris Mason <mason@suse.com> |
|
4 | 4 | # |
|
5 | 5 | # This software may be used and distributed according to the terms of the |
|
6 | 6 | # GNU General Public License version 2 or any later version. |
|
7 | 7 | |
|
8 | 8 | '''manage a stack of patches |
|
9 | 9 | |
|
10 | 10 | This extension lets you work with a stack of patches in a Mercurial |
|
11 | 11 | repository. It manages two stacks of patches - all known patches, and |
|
12 | 12 | applied patches (subset of known patches). |
|
13 | 13 | |
|
14 | 14 | Known patches are represented as patch files in the .hg/patches |
|
15 | 15 | directory. Applied patches are both patch files and changesets. |
|
16 | 16 | |
|
17 | 17 | Common tasks (use :hg:`help command` for more details):: |
|
18 | 18 | |
|
19 | 19 | create new patch qnew |
|
20 | 20 | import existing patch qimport |
|
21 | 21 | |
|
22 | 22 | print patch series qseries |
|
23 | 23 | print applied patches qapplied |
|
24 | 24 | |
|
25 | 25 | add known patch to applied stack qpush |
|
26 | 26 | remove patch from applied stack qpop |
|
27 | 27 | refresh contents of top applied patch qrefresh |
|
28 | 28 | |
|
29 | 29 | By default, mq will automatically use git patches when required to |
|
30 | 30 | avoid losing file mode changes, copy records, binary files or empty |
|
31 | 31 | files creations or deletions. This behaviour can be configured with:: |
|
32 | 32 | |
|
33 | 33 | [mq] |
|
34 | 34 | git = auto/keep/yes/no |
|
35 | 35 | |
|
36 | 36 | If set to 'keep', mq will obey the [diff] section configuration while |
|
37 | 37 | preserving existing git patches upon qrefresh. If set to 'yes' or |
|
38 | 38 | 'no', mq will override the [diff] section and always generate git or |
|
39 | 39 | regular patches, possibly losing data in the second case. |
|
40 | 40 | |
|
41 | 41 | You will by default be managing a patch queue named "patches". You can |
|
42 | 42 | create other, independent patch queues with the :hg:`qqueue` command. |
|
43 | 43 | ''' |
|
44 | 44 | |
|
45 | 45 | from mercurial.i18n import _ |
|
46 | 46 | from mercurial.node import bin, hex, short, nullid, nullrev |
|
47 | 47 | from mercurial.lock import release |
|
48 | 48 | from mercurial import commands, cmdutil, hg, patch, util |
|
49 | 49 | from mercurial import repair, extensions, url, error |
|
50 | 50 | import os, sys, re, errno |
|
51 | 51 | |
|
52 | 52 | commands.norepo += " qclone" |
|
53 | 53 | |
|
54 | 54 | # Patch names looks like unix-file names. |
|
55 | 55 | # They must be joinable with queue directory and result in the patch path. |
|
56 | 56 | normname = util.normpath |
|
57 | 57 | |
|
58 | 58 | class statusentry(object): |
|
59 | 59 | def __init__(self, node, name): |
|
60 | 60 | self.node, self.name = node, name |
|
61 | 61 | |
|
62 | 62 | def __str__(self): |
|
63 | 63 | return hex(self.node) + ':' + self.name |
|
64 | 64 | |
|
65 | 65 | class patchheader(object): |
|
66 | 66 | def __init__(self, pf, plainmode=False): |
|
67 | 67 | def eatdiff(lines): |
|
68 | 68 | while lines: |
|
69 | 69 | l = lines[-1] |
|
70 | 70 | if (l.startswith("diff -") or |
|
71 | 71 | l.startswith("Index:") or |
|
72 | 72 | l.startswith("===========")): |
|
73 | 73 | del lines[-1] |
|
74 | 74 | else: |
|
75 | 75 | break |
|
76 | 76 | def eatempty(lines): |
|
77 | 77 | while lines: |
|
78 | 78 | if not lines[-1].strip(): |
|
79 | 79 | del lines[-1] |
|
80 | 80 | else: |
|
81 | 81 | break |
|
82 | 82 | |
|
83 | 83 | message = [] |
|
84 | 84 | comments = [] |
|
85 | 85 | user = None |
|
86 | 86 | date = None |
|
87 | 87 | parent = None |
|
88 | 88 | format = None |
|
89 | 89 | subject = None |
|
90 | 90 | diffstart = 0 |
|
91 | 91 | |
|
92 | 92 | for line in file(pf): |
|
93 | 93 | line = line.rstrip() |
|
94 | 94 | if (line.startswith('diff --git') |
|
95 | 95 | or (diffstart and line.startswith('+++ '))): |
|
96 | 96 | diffstart = 2 |
|
97 | 97 | break |
|
98 | 98 | diffstart = 0 # reset |
|
99 | 99 | if line.startswith("--- "): |
|
100 | 100 | diffstart = 1 |
|
101 | 101 | continue |
|
102 | 102 | elif format == "hgpatch": |
|
103 | 103 | # parse values when importing the result of an hg export |
|
104 | 104 | if line.startswith("# User "): |
|
105 | 105 | user = line[7:] |
|
106 | 106 | elif line.startswith("# Date "): |
|
107 | 107 | date = line[7:] |
|
108 | 108 | elif line.startswith("# Parent "): |
|
109 | 109 | parent = line[9:] |
|
110 | 110 | elif not line.startswith("# ") and line: |
|
111 | 111 | message.append(line) |
|
112 | 112 | format = None |
|
113 | 113 | elif line == '# HG changeset patch': |
|
114 | 114 | message = [] |
|
115 | 115 | format = "hgpatch" |
|
116 | 116 | elif (format != "tagdone" and (line.startswith("Subject: ") or |
|
117 | 117 | line.startswith("subject: "))): |
|
118 | 118 | subject = line[9:] |
|
119 | 119 | format = "tag" |
|
120 | 120 | elif (format != "tagdone" and (line.startswith("From: ") or |
|
121 | 121 | line.startswith("from: "))): |
|
122 | 122 | user = line[6:] |
|
123 | 123 | format = "tag" |
|
124 | 124 | elif (format != "tagdone" and (line.startswith("Date: ") or |
|
125 | 125 | line.startswith("date: "))): |
|
126 | 126 | date = line[6:] |
|
127 | 127 | format = "tag" |
|
128 | 128 | elif format == "tag" and line == "": |
|
129 | 129 | # when looking for tags (subject: from: etc) they |
|
130 | 130 | # end once you find a blank line in the source |
|
131 | 131 | format = "tagdone" |
|
132 | 132 | elif message or line: |
|
133 | 133 | message.append(line) |
|
134 | 134 | comments.append(line) |
|
135 | 135 | |
|
136 | 136 | eatdiff(message) |
|
137 | 137 | eatdiff(comments) |
|
138 | 138 | eatempty(message) |
|
139 | 139 | eatempty(comments) |
|
140 | 140 | |
|
141 | 141 | # make sure message isn't empty |
|
142 | 142 | if format and format.startswith("tag") and subject: |
|
143 | 143 | message.insert(0, "") |
|
144 | 144 | message.insert(0, subject) |
|
145 | 145 | |
|
146 | 146 | self.message = message |
|
147 | 147 | self.comments = comments |
|
148 | 148 | self.user = user |
|
149 | 149 | self.date = date |
|
150 | 150 | self.parent = parent |
|
151 | 151 | self.haspatch = diffstart > 1 |
|
152 | 152 | self.plainmode = plainmode |
|
153 | 153 | |
|
154 | 154 | def setuser(self, user): |
|
155 | 155 | if not self.updateheader(['From: ', '# User '], user): |
|
156 | 156 | try: |
|
157 | 157 | patchheaderat = self.comments.index('# HG changeset patch') |
|
158 | 158 | self.comments.insert(patchheaderat + 1, '# User ' + user) |
|
159 | 159 | except ValueError: |
|
160 | 160 | if self.plainmode or self._hasheader(['Date: ']): |
|
161 | 161 | self.comments = ['From: ' + user] + self.comments |
|
162 | 162 | else: |
|
163 | 163 | tmp = ['# HG changeset patch', '# User ' + user, ''] |
|
164 | 164 | self.comments = tmp + self.comments |
|
165 | 165 | self.user = user |
|
166 | 166 | |
|
167 | 167 | def setdate(self, date): |
|
168 | 168 | if not self.updateheader(['Date: ', '# Date '], date): |
|
169 | 169 | try: |
|
170 | 170 | patchheaderat = self.comments.index('# HG changeset patch') |
|
171 | 171 | self.comments.insert(patchheaderat + 1, '# Date ' + date) |
|
172 | 172 | except ValueError: |
|
173 | 173 | if self.plainmode or self._hasheader(['From: ']): |
|
174 | 174 | self.comments = ['Date: ' + date] + self.comments |
|
175 | 175 | else: |
|
176 | 176 | tmp = ['# HG changeset patch', '# Date ' + date, ''] |
|
177 | 177 | self.comments = tmp + self.comments |
|
178 | 178 | self.date = date |
|
179 | 179 | |
|
180 | 180 | def setparent(self, parent): |
|
181 | 181 | if not self.updateheader(['# Parent '], parent): |
|
182 | 182 | try: |
|
183 | 183 | patchheaderat = self.comments.index('# HG changeset patch') |
|
184 | 184 | self.comments.insert(patchheaderat + 1, '# Parent ' + parent) |
|
185 | 185 | except ValueError: |
|
186 | 186 | pass |
|
187 | 187 | self.parent = parent |
|
188 | 188 | |
|
189 | 189 | def setmessage(self, message): |
|
190 | 190 | if self.comments: |
|
191 | 191 | self._delmsg() |
|
192 | 192 | self.message = [message] |
|
193 | 193 | self.comments += self.message |
|
194 | 194 | |
|
195 | 195 | def updateheader(self, prefixes, new): |
|
196 | 196 | '''Update all references to a field in the patch header. |
|
197 | 197 | Return whether the field is present.''' |
|
198 | 198 | res = False |
|
199 | 199 | for prefix in prefixes: |
|
200 | 200 | for i in xrange(len(self.comments)): |
|
201 | 201 | if self.comments[i].startswith(prefix): |
|
202 | 202 | self.comments[i] = prefix + new |
|
203 | 203 | res = True |
|
204 | 204 | break |
|
205 | 205 | return res |
|
206 | 206 | |
|
207 | 207 | def _hasheader(self, prefixes): |
|
208 | 208 | '''Check if a header starts with any of the given prefixes.''' |
|
209 | 209 | for prefix in prefixes: |
|
210 | 210 | for comment in self.comments: |
|
211 | 211 | if comment.startswith(prefix): |
|
212 | 212 | return True |
|
213 | 213 | return False |
|
214 | 214 | |
|
215 | 215 | def __str__(self): |
|
216 | 216 | if not self.comments: |
|
217 | 217 | return '' |
|
218 | 218 | return '\n'.join(self.comments) + '\n\n' |
|
219 | 219 | |
|
220 | 220 | def _delmsg(self): |
|
221 | 221 | '''Remove existing message, keeping the rest of the comments fields. |
|
222 | 222 | If comments contains 'subject: ', message will prepend |
|
223 | 223 | the field and a blank line.''' |
|
224 | 224 | if self.message: |
|
225 | 225 | subj = 'subject: ' + self.message[0].lower() |
|
226 | 226 | for i in xrange(len(self.comments)): |
|
227 | 227 | if subj == self.comments[i].lower(): |
|
228 | 228 | del self.comments[i] |
|
229 | 229 | self.message = self.message[2:] |
|
230 | 230 | break |
|
231 | 231 | ci = 0 |
|
232 | 232 | for mi in self.message: |
|
233 | 233 | while mi != self.comments[ci]: |
|
234 | 234 | ci += 1 |
|
235 | 235 | del self.comments[ci] |
|
236 | 236 | |
|
237 | 237 | class queue(object): |
|
238 | 238 | def __init__(self, ui, path, patchdir=None): |
|
239 | 239 | self.basepath = path |
|
240 | 240 | try: |
|
241 | 241 | fh = open(os.path.join(path, 'patches.queue')) |
|
242 | 242 | cur = fh.read().rstrip() |
|
243 | 243 | if not cur: |
|
244 | 244 | curpath = os.path.join(path, 'patches') |
|
245 | 245 | else: |
|
246 | 246 | curpath = os.path.join(path, 'patches-' + cur) |
|
247 | 247 | except IOError: |
|
248 | 248 | curpath = os.path.join(path, 'patches') |
|
249 | 249 | self.path = patchdir or curpath |
|
250 | 250 | self.opener = util.opener(self.path) |
|
251 | 251 | self.ui = ui |
|
252 | 252 | self.applied_dirty = 0 |
|
253 | 253 | self.series_dirty = 0 |
|
254 | 254 | self.series_path = "series" |
|
255 | 255 | self.status_path = "status" |
|
256 | 256 | self.guards_path = "guards" |
|
257 | 257 | self.active_guards = None |
|
258 | 258 | self.guards_dirty = False |
|
259 | 259 | # Handle mq.git as a bool with extended values |
|
260 | 260 | try: |
|
261 | 261 | gitmode = ui.configbool('mq', 'git', None) |
|
262 | 262 | if gitmode is None: |
|
263 | 263 | raise error.ConfigError() |
|
264 | 264 | self.gitmode = gitmode and 'yes' or 'no' |
|
265 | 265 | except error.ConfigError: |
|
266 | 266 | self.gitmode = ui.config('mq', 'git', 'auto').lower() |
|
267 | 267 | self.plainmode = ui.configbool('mq', 'plain', False) |
|
268 | 268 | |
|
269 | 269 | @util.propertycache |
|
270 | 270 | def applied(self): |
|
271 | 271 | if os.path.exists(self.join(self.status_path)): |
|
272 | 272 | def parse(l): |
|
273 | 273 | n, name = l.split(':', 1) |
|
274 | 274 | return statusentry(bin(n), name) |
|
275 | 275 | lines = self.opener(self.status_path).read().splitlines() |
|
276 | 276 | return [parse(l) for l in lines] |
|
277 | 277 | return [] |
|
278 | 278 | |
|
279 | 279 | @util.propertycache |
|
280 | 280 | def full_series(self): |
|
281 | 281 | if os.path.exists(self.join(self.series_path)): |
|
282 | 282 | return self.opener(self.series_path).read().splitlines() |
|
283 | 283 | return [] |
|
284 | 284 | |
|
285 | 285 | @util.propertycache |
|
286 | 286 | def series(self): |
|
287 | 287 | self.parse_series() |
|
288 | 288 | return self.series |
|
289 | 289 | |
|
290 | 290 | @util.propertycache |
|
291 | 291 | def series_guards(self): |
|
292 | 292 | self.parse_series() |
|
293 | 293 | return self.series_guards |
|
294 | 294 | |
|
295 | 295 | def invalidate(self): |
|
296 | 296 | for a in 'applied full_series series series_guards'.split(): |
|
297 | 297 | if a in self.__dict__: |
|
298 | 298 | delattr(self, a) |
|
299 | 299 | self.applied_dirty = 0 |
|
300 | 300 | self.series_dirty = 0 |
|
301 | 301 | self.guards_dirty = False |
|
302 | 302 | self.active_guards = None |
|
303 | 303 | |
|
304 | 304 | def diffopts(self, opts={}, patchfn=None): |
|
305 | 305 | diffopts = patch.diffopts(self.ui, opts) |
|
306 | 306 | if self.gitmode == 'auto': |
|
307 | 307 | diffopts.upgrade = True |
|
308 | 308 | elif self.gitmode == 'keep': |
|
309 | 309 | pass |
|
310 | 310 | elif self.gitmode in ('yes', 'no'): |
|
311 | 311 | diffopts.git = self.gitmode == 'yes' |
|
312 | 312 | else: |
|
313 | 313 | raise util.Abort(_('mq.git option can be auto/keep/yes/no' |
|
314 | 314 | ' got %s') % self.gitmode) |
|
315 | 315 | if patchfn: |
|
316 | 316 | diffopts = self.patchopts(diffopts, patchfn) |
|
317 | 317 | return diffopts |
|
318 | 318 | |
|
319 | 319 | def patchopts(self, diffopts, *patches): |
|
320 | 320 | """Return a copy of input diff options with git set to true if |
|
321 | 321 | referenced patch is a git patch and should be preserved as such. |
|
322 | 322 | """ |
|
323 | 323 | diffopts = diffopts.copy() |
|
324 | 324 | if not diffopts.git and self.gitmode == 'keep': |
|
325 | 325 | for patchfn in patches: |
|
326 | 326 | patchf = self.opener(patchfn, 'r') |
|
327 | 327 | # if the patch was a git patch, refresh it as a git patch |
|
328 | 328 | for line in patchf: |
|
329 | 329 | if line.startswith('diff --git'): |
|
330 | 330 | diffopts.git = True |
|
331 | 331 | break |
|
332 | 332 | patchf.close() |
|
333 | 333 | return diffopts |
|
334 | 334 | |
|
335 | 335 | def join(self, *p): |
|
336 | 336 | return os.path.join(self.path, *p) |
|
337 | 337 | |
|
338 | 338 | def find_series(self, patch): |
|
339 | 339 | def matchpatch(l): |
|
340 | 340 | l = l.split('#', 1)[0] |
|
341 | 341 | return l.strip() == patch |
|
342 | 342 | for index, l in enumerate(self.full_series): |
|
343 | 343 | if matchpatch(l): |
|
344 | 344 | return index |
|
345 | 345 | return None |
|
346 | 346 | |
|
347 | 347 | guard_re = re.compile(r'\s?#([-+][^-+# \t\r\n\f][^# \t\r\n\f]*)') |
|
348 | 348 | |
|
349 | 349 | def parse_series(self): |
|
350 | 350 | self.series = [] |
|
351 | 351 | self.series_guards = [] |
|
352 | 352 | for l in self.full_series: |
|
353 | 353 | h = l.find('#') |
|
354 | 354 | if h == -1: |
|
355 | 355 | patch = l |
|
356 | 356 | comment = '' |
|
357 | 357 | elif h == 0: |
|
358 | 358 | continue |
|
359 | 359 | else: |
|
360 | 360 | patch = l[:h] |
|
361 | 361 | comment = l[h:] |
|
362 | 362 | patch = patch.strip() |
|
363 | 363 | if patch: |
|
364 | 364 | if patch in self.series: |
|
365 | 365 | raise util.Abort(_('%s appears more than once in %s') % |
|
366 | 366 | (patch, self.join(self.series_path))) |
|
367 | 367 | self.series.append(patch) |
|
368 | 368 | self.series_guards.append(self.guard_re.findall(comment)) |
|
369 | 369 | |
|
370 | 370 | def check_guard(self, guard): |
|
371 | 371 | if not guard: |
|
372 | 372 | return _('guard cannot be an empty string') |
|
373 | 373 | bad_chars = '# \t\r\n\f' |
|
374 | 374 | first = guard[0] |
|
375 | 375 | if first in '-+': |
|
376 | 376 | return (_('guard %r starts with invalid character: %r') % |
|
377 | 377 | (guard, first)) |
|
378 | 378 | for c in bad_chars: |
|
379 | 379 | if c in guard: |
|
380 | 380 | return _('invalid character in guard %r: %r') % (guard, c) |
|
381 | 381 | |
|
382 | 382 | def set_active(self, guards): |
|
383 | 383 | for guard in guards: |
|
384 | 384 | bad = self.check_guard(guard) |
|
385 | 385 | if bad: |
|
386 | 386 | raise util.Abort(bad) |
|
387 | 387 | guards = sorted(set(guards)) |
|
388 | 388 | self.ui.debug('active guards: %s\n' % ' '.join(guards)) |
|
389 | 389 | self.active_guards = guards |
|
390 | 390 | self.guards_dirty = True |
|
391 | 391 | |
|
392 | 392 | def active(self): |
|
393 | 393 | if self.active_guards is None: |
|
394 | 394 | self.active_guards = [] |
|
395 | 395 | try: |
|
396 | 396 | guards = self.opener(self.guards_path).read().split() |
|
397 | 397 | except IOError, err: |
|
398 | 398 | if err.errno != errno.ENOENT: |
|
399 | 399 | raise |
|
400 | 400 | guards = [] |
|
401 | 401 | for i, guard in enumerate(guards): |
|
402 | 402 | bad = self.check_guard(guard) |
|
403 | 403 | if bad: |
|
404 | 404 | self.ui.warn('%s:%d: %s\n' % |
|
405 | 405 | (self.join(self.guards_path), i + 1, bad)) |
|
406 | 406 | else: |
|
407 | 407 | self.active_guards.append(guard) |
|
408 | 408 | return self.active_guards |
|
409 | 409 | |
|
410 | 410 | def set_guards(self, idx, guards): |
|
411 | 411 | for g in guards: |
|
412 | 412 | if len(g) < 2: |
|
413 | 413 | raise util.Abort(_('guard %r too short') % g) |
|
414 | 414 | if g[0] not in '-+': |
|
415 | 415 | raise util.Abort(_('guard %r starts with invalid char') % g) |
|
416 | 416 | bad = self.check_guard(g[1:]) |
|
417 | 417 | if bad: |
|
418 | 418 | raise util.Abort(bad) |
|
419 | 419 | drop = self.guard_re.sub('', self.full_series[idx]) |
|
420 | 420 | self.full_series[idx] = drop + ''.join([' #' + g for g in guards]) |
|
421 | 421 | self.parse_series() |
|
422 | 422 | self.series_dirty = True |
|
423 | 423 | |
|
424 | 424 | def pushable(self, idx): |
|
425 | 425 | if isinstance(idx, str): |
|
426 | 426 | idx = self.series.index(idx) |
|
427 | 427 | patchguards = self.series_guards[idx] |
|
428 | 428 | if not patchguards: |
|
429 | 429 | return True, None |
|
430 | 430 | guards = self.active() |
|
431 | 431 | exactneg = [g for g in patchguards if g[0] == '-' and g[1:] in guards] |
|
432 | 432 | if exactneg: |
|
433 | 433 | return False, exactneg[0] |
|
434 | 434 | pos = [g for g in patchguards if g[0] == '+'] |
|
435 | 435 | exactpos = [g for g in pos if g[1:] in guards] |
|
436 | 436 | if pos: |
|
437 | 437 | if exactpos: |
|
438 | 438 | return True, exactpos[0] |
|
439 | 439 | return False, pos |
|
440 | 440 | return True, '' |
|
441 | 441 | |
|
442 | 442 | def explain_pushable(self, idx, all_patches=False): |
|
443 | 443 | write = all_patches and self.ui.write or self.ui.warn |
|
444 | 444 | if all_patches or self.ui.verbose: |
|
445 | 445 | if isinstance(idx, str): |
|
446 | 446 | idx = self.series.index(idx) |
|
447 | 447 | pushable, why = self.pushable(idx) |
|
448 | 448 | if all_patches and pushable: |
|
449 | 449 | if why is None: |
|
450 | 450 | write(_('allowing %s - no guards in effect\n') % |
|
451 | 451 | self.series[idx]) |
|
452 | 452 | else: |
|
453 | 453 | if not why: |
|
454 | 454 | write(_('allowing %s - no matching negative guards\n') % |
|
455 | 455 | self.series[idx]) |
|
456 | 456 | else: |
|
457 | 457 | write(_('allowing %s - guarded by %r\n') % |
|
458 | 458 | (self.series[idx], why)) |
|
459 | 459 | if not pushable: |
|
460 | 460 | if why: |
|
461 | 461 | write(_('skipping %s - guarded by %r\n') % |
|
462 | 462 | (self.series[idx], why)) |
|
463 | 463 | else: |
|
464 | 464 | write(_('skipping %s - no matching guards\n') % |
|
465 | 465 | self.series[idx]) |
|
466 | 466 | |
|
467 | 467 | def save_dirty(self): |
|
468 | 468 | def write_list(items, path): |
|
469 | 469 | fp = self.opener(path, 'w') |
|
470 | 470 | for i in items: |
|
471 | 471 | fp.write("%s\n" % i) |
|
472 | 472 | fp.close() |
|
473 | 473 | if self.applied_dirty: |
|
474 | 474 | write_list(map(str, self.applied), self.status_path) |
|
475 | 475 | if self.series_dirty: |
|
476 | 476 | write_list(self.full_series, self.series_path) |
|
477 | 477 | if self.guards_dirty: |
|
478 | 478 | write_list(self.active_guards, self.guards_path) |
|
479 | 479 | |
|
480 | 480 | def removeundo(self, repo): |
|
481 | 481 | undo = repo.sjoin('undo') |
|
482 | 482 | if not os.path.exists(undo): |
|
483 | 483 | return |
|
484 | 484 | try: |
|
485 | 485 | os.unlink(undo) |
|
486 | 486 | except OSError, inst: |
|
487 | 487 | self.ui.warn(_('error removing undo: %s\n') % str(inst)) |
|
488 | 488 | |
|
489 | 489 | def printdiff(self, repo, diffopts, node1, node2=None, files=None, |
|
490 | 490 | fp=None, changes=None, opts={}): |
|
491 | 491 | stat = opts.get('stat') |
|
492 | 492 | m = cmdutil.match(repo, files, opts) |
|
493 | 493 | cmdutil.diffordiffstat(self.ui, repo, diffopts, node1, node2, m, |
|
494 | 494 | changes, stat, fp) |
|
495 | 495 | |
|
496 | 496 | def mergeone(self, repo, mergeq, head, patch, rev, diffopts): |
|
497 | 497 | # first try just applying the patch |
|
498 | 498 | (err, n) = self.apply(repo, [patch], update_status=False, |
|
499 | 499 | strict=True, merge=rev) |
|
500 | 500 | |
|
501 | 501 | if err == 0: |
|
502 | 502 | return (err, n) |
|
503 | 503 | |
|
504 | 504 | if n is None: |
|
505 | 505 | raise util.Abort(_("apply failed for patch %s") % patch) |
|
506 | 506 | |
|
507 | 507 | self.ui.warn(_("patch didn't work out, merging %s\n") % patch) |
|
508 | 508 | |
|
509 | 509 | # apply failed, strip away that rev and merge. |
|
510 | 510 | hg.clean(repo, head) |
|
511 | 511 | self.strip(repo, n, update=False, backup='strip') |
|
512 | 512 | |
|
513 | 513 | ctx = repo[rev] |
|
514 | 514 | ret = hg.merge(repo, rev) |
|
515 | 515 | if ret: |
|
516 | 516 | raise util.Abort(_("update returned %d") % ret) |
|
517 | 517 | n = repo.commit(ctx.description(), ctx.user(), force=True) |
|
518 | 518 | if n is None: |
|
519 | 519 | raise util.Abort(_("repo commit failed")) |
|
520 | 520 | try: |
|
521 | 521 | ph = patchheader(mergeq.join(patch), self.plainmode) |
|
522 | 522 | except: |
|
523 | 523 | raise util.Abort(_("unable to read %s") % patch) |
|
524 | 524 | |
|
525 | 525 | diffopts = self.patchopts(diffopts, patch) |
|
526 | 526 | patchf = self.opener(patch, "w") |
|
527 | 527 | comments = str(ph) |
|
528 | 528 | if comments: |
|
529 | 529 | patchf.write(comments) |
|
530 | 530 | self.printdiff(repo, diffopts, head, n, fp=patchf) |
|
531 | 531 | patchf.close() |
|
532 | 532 | self.removeundo(repo) |
|
533 | 533 | return (0, n) |
|
534 | 534 | |
|
535 | 535 | def qparents(self, repo, rev=None): |
|
536 | 536 | if rev is None: |
|
537 | 537 | (p1, p2) = repo.dirstate.parents() |
|
538 | 538 | if p2 == nullid: |
|
539 | 539 | return p1 |
|
540 | 540 | if not self.applied: |
|
541 | 541 | return None |
|
542 | 542 | return self.applied[-1].node |
|
543 | 543 | p1, p2 = repo.changelog.parents(rev) |
|
544 | 544 | if p2 != nullid and p2 in [x.node for x in self.applied]: |
|
545 | 545 | return p2 |
|
546 | 546 | return p1 |
|
547 | 547 | |
|
548 | 548 | def mergepatch(self, repo, mergeq, series, diffopts): |
|
549 | 549 | if not self.applied: |
|
550 | 550 | # each of the patches merged in will have two parents. This |
|
551 | 551 | # can confuse the qrefresh, qdiff, and strip code because it |
|
552 | 552 | # needs to know which parent is actually in the patch queue. |
|
553 | 553 | # so, we insert a merge marker with only one parent. This way |
|
554 | 554 | # the first patch in the queue is never a merge patch |
|
555 | 555 | # |
|
556 | 556 | pname = ".hg.patches.merge.marker" |
|
557 | 557 | n = repo.commit('[mq]: merge marker', force=True) |
|
558 | 558 | self.removeundo(repo) |
|
559 | 559 | self.applied.append(statusentry(n, pname)) |
|
560 | 560 | self.applied_dirty = 1 |
|
561 | 561 | |
|
562 | 562 | head = self.qparents(repo) |
|
563 | 563 | |
|
564 | 564 | for patch in series: |
|
565 | 565 | patch = mergeq.lookup(patch, strict=True) |
|
566 | 566 | if not patch: |
|
567 | 567 | self.ui.warn(_("patch %s does not exist\n") % patch) |
|
568 | 568 | return (1, None) |
|
569 | 569 | pushable, reason = self.pushable(patch) |
|
570 | 570 | if not pushable: |
|
571 | 571 | self.explain_pushable(patch, all_patches=True) |
|
572 | 572 | continue |
|
573 | 573 | info = mergeq.isapplied(patch) |
|
574 | 574 | if not info: |
|
575 | 575 | self.ui.warn(_("patch %s is not applied\n") % patch) |
|
576 | 576 | return (1, None) |
|
577 | 577 | rev = info[1] |
|
578 | 578 | err, head = self.mergeone(repo, mergeq, head, patch, rev, diffopts) |
|
579 | 579 | if head: |
|
580 | 580 | self.applied.append(statusentry(head, patch)) |
|
581 | 581 | self.applied_dirty = 1 |
|
582 | 582 | if err: |
|
583 | 583 | return (err, head) |
|
584 | 584 | self.save_dirty() |
|
585 | 585 | return (0, head) |
|
586 | 586 | |
|
587 | 587 | def patch(self, repo, patchfile): |
|
588 | 588 | '''Apply patchfile to the working directory. |
|
589 | 589 | patchfile: name of patch file''' |
|
590 | 590 | files = {} |
|
591 | 591 | try: |
|
592 | 592 | fuzz = patch.patch(patchfile, self.ui, strip=1, cwd=repo.root, |
|
593 | 593 | files=files, eolmode=None) |
|
594 | 594 | except Exception, inst: |
|
595 | 595 | self.ui.note(str(inst) + '\n') |
|
596 | 596 | if not self.ui.verbose: |
|
597 | 597 | self.ui.warn(_("patch failed, unable to continue (try -v)\n")) |
|
598 | 598 | return (False, files, False) |
|
599 | 599 | |
|
600 | 600 | return (True, files, fuzz) |
|
601 | 601 | |
|
602 | 602 | def apply(self, repo, series, list=False, update_status=True, |
|
603 | 603 | strict=False, patchdir=None, merge=None, all_files=None): |
|
604 | 604 | wlock = lock = tr = None |
|
605 | 605 | try: |
|
606 | 606 | wlock = repo.wlock() |
|
607 | 607 | lock = repo.lock() |
|
608 | 608 | tr = repo.transaction("qpush") |
|
609 | 609 | try: |
|
610 | 610 | ret = self._apply(repo, series, list, update_status, |
|
611 | 611 | strict, patchdir, merge, all_files=all_files) |
|
612 | 612 | tr.close() |
|
613 | 613 | self.save_dirty() |
|
614 | 614 | return ret |
|
615 | 615 | except: |
|
616 | 616 | try: |
|
617 | 617 | tr.abort() |
|
618 | 618 | finally: |
|
619 | 619 | repo.invalidate() |
|
620 | 620 | repo.dirstate.invalidate() |
|
621 | 621 | raise |
|
622 | 622 | finally: |
|
623 | 623 | release(tr, lock, wlock) |
|
624 | 624 | self.removeundo(repo) |
|
625 | 625 | |
|
626 | 626 | def _apply(self, repo, series, list=False, update_status=True, |
|
627 | 627 | strict=False, patchdir=None, merge=None, all_files=None): |
|
628 | 628 | '''returns (error, hash) |
|
629 | 629 | error = 1 for unable to read, 2 for patch failed, 3 for patch fuzz''' |
|
630 | 630 | # TODO unify with commands.py |
|
631 | 631 | if not patchdir: |
|
632 | 632 | patchdir = self.path |
|
633 | 633 | err = 0 |
|
634 | 634 | n = None |
|
635 | 635 | for patchname in series: |
|
636 | 636 | pushable, reason = self.pushable(patchname) |
|
637 | 637 | if not pushable: |
|
638 | 638 | self.explain_pushable(patchname, all_patches=True) |
|
639 | 639 | continue |
|
640 | 640 | self.ui.status(_("applying %s\n") % patchname) |
|
641 | 641 | pf = os.path.join(patchdir, patchname) |
|
642 | 642 | |
|
643 | 643 | try: |
|
644 | 644 | ph = patchheader(self.join(patchname), self.plainmode) |
|
645 | 645 | except: |
|
646 | 646 | self.ui.warn(_("unable to read %s\n") % patchname) |
|
647 | 647 | err = 1 |
|
648 | 648 | break |
|
649 | 649 | |
|
650 | 650 | message = ph.message |
|
651 | 651 | if not message: |
|
652 | 652 | message = "imported patch %s\n" % patchname |
|
653 | 653 | else: |
|
654 | 654 | if list: |
|
655 | 655 | message.append("\nimported patch %s" % patchname) |
|
656 | 656 | message = '\n'.join(message) |
|
657 | 657 | |
|
658 | 658 | if ph.haspatch: |
|
659 | 659 | (patcherr, files, fuzz) = self.patch(repo, pf) |
|
660 | 660 | if all_files is not None: |
|
661 | 661 | all_files.update(files) |
|
662 | 662 | patcherr = not patcherr |
|
663 | 663 | else: |
|
664 | 664 | self.ui.warn(_("patch %s is empty\n") % patchname) |
|
665 | 665 | patcherr, files, fuzz = 0, [], 0 |
|
666 | 666 | |
|
667 | 667 | if merge and files: |
|
668 | 668 | # Mark as removed/merged and update dirstate parent info |
|
669 | 669 | removed = [] |
|
670 | 670 | merged = [] |
|
671 | 671 | for f in files: |
|
672 | 672 | if os.path.exists(repo.wjoin(f)): |
|
673 | 673 | merged.append(f) |
|
674 | 674 | else: |
|
675 | 675 | removed.append(f) |
|
676 | 676 | for f in removed: |
|
677 | 677 | repo.dirstate.remove(f) |
|
678 | 678 | for f in merged: |
|
679 | 679 | repo.dirstate.merge(f) |
|
680 | 680 | p1, p2 = repo.dirstate.parents() |
|
681 | 681 | repo.dirstate.setparents(p1, merge) |
|
682 | 682 | |
|
683 | 683 | files = patch.updatedir(self.ui, repo, files) |
|
684 | 684 | match = cmdutil.matchfiles(repo, files or []) |
|
685 | 685 | n = repo.commit(message, ph.user, ph.date, match=match, force=True) |
|
686 | 686 | |
|
687 | 687 | if n is None: |
|
688 | 688 | raise util.Abort(_("repo commit failed")) |
|
689 | 689 | |
|
690 | 690 | if update_status: |
|
691 | 691 | self.applied.append(statusentry(n, patchname)) |
|
692 | 692 | |
|
693 | 693 | if patcherr: |
|
694 | 694 | self.ui.warn(_("patch failed, rejects left in working dir\n")) |
|
695 | 695 | err = 2 |
|
696 | 696 | break |
|
697 | 697 | |
|
698 | 698 | if fuzz and strict: |
|
699 | 699 | self.ui.warn(_("fuzz found when applying patch, stopping\n")) |
|
700 | 700 | err = 3 |
|
701 | 701 | break |
|
702 | 702 | return (err, n) |
|
703 | 703 | |
|
704 | 704 | def _cleanup(self, patches, numrevs, keep=False): |
|
705 | 705 | if not keep: |
|
706 | 706 | r = self.qrepo() |
|
707 | 707 | if r: |
|
708 | 708 | r.remove(patches, True) |
|
709 | 709 | else: |
|
710 | 710 | for p in patches: |
|
711 | 711 | os.unlink(self.join(p)) |
|
712 | 712 | |
|
713 | 713 | if numrevs: |
|
714 | 714 | del self.applied[:numrevs] |
|
715 | 715 | self.applied_dirty = 1 |
|
716 | 716 | |
|
717 | 717 | for i in sorted([self.find_series(p) for p in patches], reverse=True): |
|
718 | 718 | del self.full_series[i] |
|
719 | 719 | self.parse_series() |
|
720 | 720 | self.series_dirty = 1 |
|
721 | 721 | |
|
722 | 722 | def _revpatches(self, repo, revs): |
|
723 | 723 | firstrev = repo[self.applied[0].node].rev() |
|
724 | 724 | patches = [] |
|
725 | 725 | for i, rev in enumerate(revs): |
|
726 | 726 | |
|
727 | 727 | if rev < firstrev: |
|
728 | 728 | raise util.Abort(_('revision %d is not managed') % rev) |
|
729 | 729 | |
|
730 | 730 | ctx = repo[rev] |
|
731 | 731 | base = self.applied[i].node |
|
732 | 732 | if ctx.node() != base: |
|
733 | 733 | msg = _('cannot delete revision %d above applied patches') |
|
734 | 734 | raise util.Abort(msg % rev) |
|
735 | 735 | |
|
736 | 736 | patch = self.applied[i].name |
|
737 | 737 | for fmt in ('[mq]: %s', 'imported patch %s'): |
|
738 | 738 | if ctx.description() == fmt % patch: |
|
739 | 739 | msg = _('patch %s finalized without changeset message\n') |
|
740 | 740 | repo.ui.status(msg % patch) |
|
741 | 741 | break |
|
742 | 742 | |
|
743 | 743 | patches.append(patch) |
|
744 | 744 | return patches |
|
745 | 745 | |
|
746 | 746 | def finish(self, repo, revs): |
|
747 | 747 | patches = self._revpatches(repo, sorted(revs)) |
|
748 | 748 | self._cleanup(patches, len(patches)) |
|
749 | 749 | |
|
750 | 750 | def delete(self, repo, patches, opts): |
|
751 | 751 | if not patches and not opts.get('rev'): |
|
752 | 752 | raise util.Abort(_('qdelete requires at least one revision or ' |
|
753 | 753 | 'patch name')) |
|
754 | 754 | |
|
755 | 755 | for patch in patches: |
|
756 | 756 | patch = self.lookup(patch, strict=True) |
|
757 | 757 | info = self.isapplied(patch) |
|
758 | 758 | if info: |
|
759 | 759 | raise util.Abort(_("cannot delete applied patch %s") % patch) |
|
760 | 760 | if patch not in self.series: |
|
761 | 761 | raise util.Abort(_("patch %s not in series file") % patch) |
|
762 | 762 | |
|
763 | 763 | patches = list(patches) |
|
764 | 764 | numrevs = 0 |
|
765 | 765 | if opts.get('rev'): |
|
766 | 766 | if not self.applied: |
|
767 | 767 | raise util.Abort(_('no patches applied')) |
|
768 | 768 | revs = cmdutil.revrange(repo, opts['rev']) |
|
769 | 769 | if len(revs) > 1 and revs[0] > revs[1]: |
|
770 | 770 | revs.reverse() |
|
771 | 771 | revpatches = self._revpatches(repo, revs) |
|
772 | 772 | patches += revpatches |
|
773 | 773 | numrevs = len(revpatches) |
|
774 | 774 | |
|
775 | 775 | self._cleanup(patches, numrevs, opts.get('keep')) |
|
776 | 776 | |
|
777 | 777 | def check_toppatch(self, repo): |
|
778 | 778 | if self.applied: |
|
779 | 779 | top = self.applied[-1].node |
|
780 | 780 | patch = self.applied[-1].name |
|
781 | 781 | pp = repo.dirstate.parents() |
|
782 | 782 | if top not in pp: |
|
783 | 783 | raise util.Abort(_("working directory revision is not qtip")) |
|
784 | 784 | return top, patch |
|
785 | 785 | return None, None |
|
786 | 786 | |
|
787 | 787 | def check_localchanges(self, repo, force=False, refresh=True): |
|
788 | 788 | m, a, r, d = repo.status()[:4] |
|
789 | 789 | if (m or a or r or d) and not force: |
|
790 | 790 | if refresh: |
|
791 | 791 | raise util.Abort(_("local changes found, refresh first")) |
|
792 | 792 | else: |
|
793 | 793 | raise util.Abort(_("local changes found")) |
|
794 | 794 | return m, a, r, d |
|
795 | 795 | |
|
796 | 796 | _reserved = ('series', 'status', 'guards') |
|
797 | 797 | def check_reserved_name(self, name): |
|
798 | 798 | if (name in self._reserved or name.startswith('.hg') |
|
799 | 799 | or name.startswith('.mq') or '#' in name or ':' in name): |
|
800 | 800 | raise util.Abort(_('"%s" cannot be used as the name of a patch') |
|
801 | 801 | % name) |
|
802 | 802 | |
|
803 | 803 | def new(self, repo, patchfn, *pats, **opts): |
|
804 | 804 | """options: |
|
805 | 805 | msg: a string or a no-argument function returning a string |
|
806 | 806 | """ |
|
807 | 807 | msg = opts.get('msg') |
|
808 | 808 | user = opts.get('user') |
|
809 | 809 | date = opts.get('date') |
|
810 | 810 | if date: |
|
811 | 811 | date = util.parsedate(date) |
|
812 | 812 | diffopts = self.diffopts({'git': opts.get('git')}) |
|
813 | 813 | self.check_reserved_name(patchfn) |
|
814 | 814 | if os.path.exists(self.join(patchfn)): |
|
815 | 815 | raise util.Abort(_('patch "%s" already exists') % patchfn) |
|
816 | 816 | if opts.get('include') or opts.get('exclude') or pats: |
|
817 | 817 | match = cmdutil.match(repo, pats, opts) |
|
818 | 818 | # detect missing files in pats |
|
819 | 819 | def badfn(f, msg): |
|
820 | 820 | raise util.Abort('%s: %s' % (f, msg)) |
|
821 | 821 | match.bad = badfn |
|
822 | 822 | m, a, r, d = repo.status(match=match)[:4] |
|
823 | 823 | else: |
|
824 | 824 | m, a, r, d = self.check_localchanges(repo, force=True) |
|
825 | 825 | match = cmdutil.matchfiles(repo, m + a + r) |
|
826 | 826 | if len(repo[None].parents()) > 1: |
|
827 | 827 | raise util.Abort(_('cannot manage merge changesets')) |
|
828 | 828 | commitfiles = m + a + r |
|
829 | 829 | self.check_toppatch(repo) |
|
830 | 830 | insert = self.full_series_end() |
|
831 | 831 | wlock = repo.wlock() |
|
832 | 832 | try: |
|
833 | 833 | # if patch file write fails, abort early |
|
834 | 834 | p = self.opener(patchfn, "w") |
|
835 | 835 | try: |
|
836 | 836 | if self.plainmode: |
|
837 | 837 | if user: |
|
838 | 838 | p.write("From: " + user + "\n") |
|
839 | 839 | if not date: |
|
840 | 840 | p.write("\n") |
|
841 | 841 | if date: |
|
842 | 842 | p.write("Date: %d %d\n\n" % date) |
|
843 | 843 | else: |
|
844 | 844 | p.write("# HG changeset patch\n") |
|
845 | 845 | p.write("# Parent " |
|
846 | 846 | + hex(repo[None].parents()[0].node()) + "\n") |
|
847 | 847 | if user: |
|
848 | 848 | p.write("# User " + user + "\n") |
|
849 | 849 | if date: |
|
850 | 850 | p.write("# Date %s %s\n\n" % date) |
|
851 | 851 | if hasattr(msg, '__call__'): |
|
852 | 852 | msg = msg() |
|
853 | 853 | commitmsg = msg and msg or ("[mq]: %s" % patchfn) |
|
854 | 854 | n = repo.commit(commitmsg, user, date, match=match, force=True) |
|
855 | 855 | if n is None: |
|
856 | 856 | raise util.Abort(_("repo commit failed")) |
|
857 | 857 | try: |
|
858 | 858 | self.full_series[insert:insert] = [patchfn] |
|
859 | 859 | self.applied.append(statusentry(n, patchfn)) |
|
860 | 860 | self.parse_series() |
|
861 | 861 | self.series_dirty = 1 |
|
862 | 862 | self.applied_dirty = 1 |
|
863 | 863 | if msg: |
|
864 | 864 | msg = msg + "\n\n" |
|
865 | 865 | p.write(msg) |
|
866 | 866 | if commitfiles: |
|
867 | 867 | parent = self.qparents(repo, n) |
|
868 | 868 | chunks = patch.diff(repo, node1=parent, node2=n, |
|
869 | 869 | match=match, opts=diffopts) |
|
870 | 870 | for chunk in chunks: |
|
871 | 871 | p.write(chunk) |
|
872 | 872 | p.close() |
|
873 | 873 | wlock.release() |
|
874 | 874 | wlock = None |
|
875 | 875 | r = self.qrepo() |
|
876 | 876 | if r: |
|
877 | 877 | r.add([patchfn]) |
|
878 | 878 | except: |
|
879 | 879 | repo.rollback() |
|
880 | 880 | raise |
|
881 | 881 | except Exception: |
|
882 | 882 | patchpath = self.join(patchfn) |
|
883 | 883 | try: |
|
884 | 884 | os.unlink(patchpath) |
|
885 | 885 | except: |
|
886 | 886 | self.ui.warn(_('error unlinking %s\n') % patchpath) |
|
887 | 887 | raise |
|
888 | 888 | self.removeundo(repo) |
|
889 | 889 | finally: |
|
890 | 890 | release(wlock) |
|
891 | 891 | |
|
892 | 892 | def strip(self, repo, rev, update=True, backup="all", force=None): |
|
893 | 893 | wlock = lock = None |
|
894 | 894 | try: |
|
895 | 895 | wlock = repo.wlock() |
|
896 | 896 | lock = repo.lock() |
|
897 | 897 | |
|
898 | 898 | if update: |
|
899 | 899 | self.check_localchanges(repo, force=force, refresh=False) |
|
900 | 900 | urev = self.qparents(repo, rev) |
|
901 | 901 | hg.clean(repo, urev) |
|
902 | 902 | repo.dirstate.write() |
|
903 | 903 | |
|
904 | 904 | self.removeundo(repo) |
|
905 | 905 | repair.strip(self.ui, repo, rev, backup) |
|
906 | 906 | # strip may have unbundled a set of backed up revisions after |
|
907 | 907 | # the actual strip |
|
908 | 908 | self.removeundo(repo) |
|
909 | 909 | finally: |
|
910 | 910 | release(lock, wlock) |
|
911 | 911 | |
|
912 | 912 | def isapplied(self, patch): |
|
913 | 913 | """returns (index, rev, patch)""" |
|
914 | 914 | for i, a in enumerate(self.applied): |
|
915 | 915 | if a.name == patch: |
|
916 | 916 | return (i, a.node, a.name) |
|
917 | 917 | return None |
|
918 | 918 | |
|
919 | 919 | # if the exact patch name does not exist, we try a few |
|
920 | 920 | # variations. If strict is passed, we try only #1 |
|
921 | 921 | # |
|
922 | 922 | # 1) a number to indicate an offset in the series file |
|
923 | 923 | # 2) a unique substring of the patch name was given |
|
924 | 924 | # 3) patchname[-+]num to indicate an offset in the series file |
|
925 | 925 | def lookup(self, patch, strict=False): |
|
926 | 926 | patch = patch and str(patch) |
|
927 | 927 | |
|
928 | 928 | def partial_name(s): |
|
929 | 929 | if s in self.series: |
|
930 | 930 | return s |
|
931 | 931 | matches = [x for x in self.series if s in x] |
|
932 | 932 | if len(matches) > 1: |
|
933 | 933 | self.ui.warn(_('patch name "%s" is ambiguous:\n') % s) |
|
934 | 934 | for m in matches: |
|
935 | 935 | self.ui.warn(' %s\n' % m) |
|
936 | 936 | return None |
|
937 | 937 | if matches: |
|
938 | 938 | return matches[0] |
|
939 | 939 | if self.series and self.applied: |
|
940 | 940 | if s == 'qtip': |
|
941 | 941 | return self.series[self.series_end(True)-1] |
|
942 | 942 | if s == 'qbase': |
|
943 | 943 | return self.series[0] |
|
944 | 944 | return None |
|
945 | 945 | |
|
946 | 946 | if patch is None: |
|
947 | 947 | return None |
|
948 | 948 | if patch in self.series: |
|
949 | 949 | return patch |
|
950 | 950 | |
|
951 | 951 | if not os.path.isfile(self.join(patch)): |
|
952 | 952 | try: |
|
953 | 953 | sno = int(patch) |
|
954 | 954 | except (ValueError, OverflowError): |
|
955 | 955 | pass |
|
956 | 956 | else: |
|
957 | 957 | if -len(self.series) <= sno < len(self.series): |
|
958 | 958 | return self.series[sno] |
|
959 | 959 | |
|
960 | 960 | if not strict: |
|
961 | 961 | res = partial_name(patch) |
|
962 | 962 | if res: |
|
963 | 963 | return res |
|
964 | 964 | minus = patch.rfind('-') |
|
965 | 965 | if minus >= 0: |
|
966 | 966 | res = partial_name(patch[:minus]) |
|
967 | 967 | if res: |
|
968 | 968 | i = self.series.index(res) |
|
969 | 969 | try: |
|
970 | 970 | off = int(patch[minus + 1:] or 1) |
|
971 | 971 | except (ValueError, OverflowError): |
|
972 | 972 | pass |
|
973 | 973 | else: |
|
974 | 974 | if i - off >= 0: |
|
975 | 975 | return self.series[i - off] |
|
976 | 976 | plus = patch.rfind('+') |
|
977 | 977 | if plus >= 0: |
|
978 | 978 | res = partial_name(patch[:plus]) |
|
979 | 979 | if res: |
|
980 | 980 | i = self.series.index(res) |
|
981 | 981 | try: |
|
982 | 982 | off = int(patch[plus + 1:] or 1) |
|
983 | 983 | except (ValueError, OverflowError): |
|
984 | 984 | pass |
|
985 | 985 | else: |
|
986 | 986 | if i + off < len(self.series): |
|
987 | 987 | return self.series[i + off] |
|
988 | 988 | raise util.Abort(_("patch %s not in series") % patch) |
|
989 | 989 | |
|
990 | 990 | def push(self, repo, patch=None, force=False, list=False, |
|
991 | 991 | mergeq=None, all=False, move=False): |
|
992 | 992 | diffopts = self.diffopts() |
|
993 | 993 | wlock = repo.wlock() |
|
994 | 994 | try: |
|
995 | 995 | heads = [] |
|
996 | 996 | for b, ls in repo.branchmap().iteritems(): |
|
997 | 997 | heads += ls |
|
998 | 998 | if not heads: |
|
999 | 999 | heads = [nullid] |
|
1000 | 1000 | if repo.dirstate.parents()[0] not in heads: |
|
1001 | 1001 | self.ui.status(_("(working directory not at a head)\n")) |
|
1002 | 1002 | |
|
1003 | 1003 | if not self.series: |
|
1004 | 1004 | self.ui.warn(_('no patches in series\n')) |
|
1005 | 1005 | return 0 |
|
1006 | 1006 | |
|
1007 | 1007 | patch = self.lookup(patch) |
|
1008 | 1008 | # Suppose our series file is: A B C and the current 'top' |
|
1009 | 1009 | # patch is B. qpush C should be performed (moving forward) |
|
1010 | 1010 | # qpush B is a NOP (no change) qpush A is an error (can't |
|
1011 | 1011 | # go backwards with qpush) |
|
1012 | 1012 | if patch: |
|
1013 | 1013 | info = self.isapplied(patch) |
|
1014 | 1014 | if info: |
|
1015 | 1015 | if info[0] < len(self.applied) - 1: |
|
1016 | 1016 | raise util.Abort( |
|
1017 | 1017 | _("cannot push to a previous patch: %s") % patch) |
|
1018 | 1018 | self.ui.warn( |
|
1019 | 1019 | _('qpush: %s is already at the top\n') % patch) |
|
1020 | 1020 | return |
|
1021 | 1021 | pushable, reason = self.pushable(patch) |
|
1022 | 1022 | if not pushable: |
|
1023 | 1023 | if reason: |
|
1024 | 1024 | reason = _('guarded by %r') % reason |
|
1025 | 1025 | else: |
|
1026 | 1026 | reason = _('no matching guards') |
|
1027 | 1027 | self.ui.warn(_("cannot push '%s' - %s\n") % (patch, reason)) |
|
1028 | 1028 | return 1 |
|
1029 | 1029 | elif all: |
|
1030 | 1030 | patch = self.series[-1] |
|
1031 | 1031 | if self.isapplied(patch): |
|
1032 | 1032 | self.ui.warn(_('all patches are currently applied\n')) |
|
1033 | 1033 | return 0 |
|
1034 | 1034 | |
|
1035 | 1035 | # Following the above example, starting at 'top' of B: |
|
1036 | 1036 | # qpush should be performed (pushes C), but a subsequent |
|
1037 | 1037 | # qpush without an argument is an error (nothing to |
|
1038 | 1038 | # apply). This allows a loop of "...while hg qpush..." to |
|
1039 | 1039 | # work as it detects an error when done |
|
1040 | 1040 | start = self.series_end() |
|
1041 | 1041 | if start == len(self.series): |
|
1042 | 1042 | self.ui.warn(_('patch series already fully applied\n')) |
|
1043 | 1043 | return 1 |
|
1044 | 1044 | if not force: |
|
1045 | 1045 | self.check_localchanges(repo) |
|
1046 | 1046 | |
|
1047 | 1047 | if move: |
|
1048 | 1048 | try: |
|
1049 | 1049 | del self.full_series[self.full_series.index(patch, start)] |
|
1050 | 1050 | except ValueError: |
|
1051 | 1051 | raise util.Abort(_("patch '%s' not found") % patch) |
|
1052 | 1052 | self.full_series.insert(start, patch) |
|
1053 | 1053 | self.parse_series() |
|
1054 | 1054 | self.series_dirty = 1 |
|
1055 | 1055 | |
|
1056 | 1056 | self.applied_dirty = 1 |
|
1057 | 1057 | if start > 0: |
|
1058 | 1058 | self.check_toppatch(repo) |
|
1059 | 1059 | if not patch: |
|
1060 | 1060 | patch = self.series[start] |
|
1061 | 1061 | end = start + 1 |
|
1062 | 1062 | else: |
|
1063 | 1063 | end = self.series.index(patch, start) + 1 |
|
1064 | 1064 | |
|
1065 | 1065 | s = self.series[start:end] |
|
1066 | 1066 | all_files = set() |
|
1067 | 1067 | try: |
|
1068 | 1068 | if mergeq: |
|
1069 | 1069 | ret = self.mergepatch(repo, mergeq, s, diffopts) |
|
1070 | 1070 | else: |
|
1071 | 1071 | ret = self.apply(repo, s, list, all_files=all_files) |
|
1072 | 1072 | except: |
|
1073 | 1073 | self.ui.warn(_('cleaning up working directory...')) |
|
1074 | 1074 | node = repo.dirstate.parents()[0] |
|
1075 | 1075 | hg.revert(repo, node, None) |
|
1076 | 1076 | # only remove unknown files that we know we touched or |
|
1077 | 1077 | # created while patching |
|
1078 | 1078 | for f in all_files: |
|
1079 | 1079 | if f not in repo.dirstate: |
|
1080 | 1080 | try: |
|
1081 | 1081 | util.unlink(repo.wjoin(f)) |
|
1082 | 1082 | except OSError, inst: |
|
1083 | 1083 | if inst.errno != errno.ENOENT: |
|
1084 | 1084 | raise |
|
1085 | 1085 | self.ui.warn(_('done\n')) |
|
1086 | 1086 | raise |
|
1087 | 1087 | |
|
1088 | 1088 | if not self.applied: |
|
1089 | 1089 | return ret[0] |
|
1090 | 1090 | top = self.applied[-1].name |
|
1091 | 1091 | if ret[0] and ret[0] > 1: |
|
1092 | 1092 | msg = _("errors during apply, please fix and refresh %s\n") |
|
1093 | 1093 | self.ui.write(msg % top) |
|
1094 | 1094 | else: |
|
1095 | 1095 | self.ui.write(_("now at: %s\n") % top) |
|
1096 | 1096 | return ret[0] |
|
1097 | 1097 | |
|
1098 | 1098 | finally: |
|
1099 | 1099 | wlock.release() |
|
1100 | 1100 | |
|
1101 | 1101 | def pop(self, repo, patch=None, force=False, update=True, all=False): |
|
1102 | 1102 | wlock = repo.wlock() |
|
1103 | 1103 | try: |
|
1104 | 1104 | if patch: |
|
1105 | 1105 | # index, rev, patch |
|
1106 | 1106 | info = self.isapplied(patch) |
|
1107 | 1107 | if not info: |
|
1108 | 1108 | patch = self.lookup(patch) |
|
1109 | 1109 | info = self.isapplied(patch) |
|
1110 | 1110 | if not info: |
|
1111 | 1111 | raise util.Abort(_("patch %s is not applied") % patch) |
|
1112 | 1112 | |
|
1113 | 1113 | if not self.applied: |
|
1114 | 1114 | # Allow qpop -a to work repeatedly, |
|
1115 | 1115 | # but not qpop without an argument |
|
1116 | 1116 | self.ui.warn(_("no patches applied\n")) |
|
1117 | 1117 | return not all |
|
1118 | 1118 | |
|
1119 | 1119 | if all: |
|
1120 | 1120 | start = 0 |
|
1121 | 1121 | elif patch: |
|
1122 | 1122 | start = info[0] + 1 |
|
1123 | 1123 | else: |
|
1124 | 1124 | start = len(self.applied) - 1 |
|
1125 | 1125 | |
|
1126 | 1126 | if start >= len(self.applied): |
|
1127 | 1127 | self.ui.warn(_("qpop: %s is already at the top\n") % patch) |
|
1128 | 1128 | return |
|
1129 | 1129 | |
|
1130 | 1130 | if not update: |
|
1131 | 1131 | parents = repo.dirstate.parents() |
|
1132 | 1132 | rr = [x.node for x in self.applied] |
|
1133 | 1133 | for p in parents: |
|
1134 | 1134 | if p in rr: |
|
1135 | 1135 | self.ui.warn(_("qpop: forcing dirstate update\n")) |
|
1136 | 1136 | update = True |
|
1137 | 1137 | else: |
|
1138 | 1138 | parents = [p.node() for p in repo[None].parents()] |
|
1139 | 1139 | needupdate = False |
|
1140 | 1140 | for entry in self.applied[start:]: |
|
1141 | 1141 | if entry.node in parents: |
|
1142 | 1142 | needupdate = True |
|
1143 | 1143 | break |
|
1144 | 1144 | update = needupdate |
|
1145 | 1145 | |
|
1146 | 1146 | if not force and update: |
|
1147 | 1147 | self.check_localchanges(repo) |
|
1148 | 1148 | |
|
1149 | 1149 | self.applied_dirty = 1 |
|
1150 | 1150 | end = len(self.applied) |
|
1151 | 1151 | rev = self.applied[start].node |
|
1152 | 1152 | if update: |
|
1153 | 1153 | top = self.check_toppatch(repo)[0] |
|
1154 | 1154 | |
|
1155 | 1155 | try: |
|
1156 | 1156 | heads = repo.changelog.heads(rev) |
|
1157 | 1157 | except error.LookupError: |
|
1158 | 1158 | node = short(rev) |
|
1159 | 1159 | raise util.Abort(_('trying to pop unknown node %s') % node) |
|
1160 | 1160 | |
|
1161 | 1161 | if heads != [self.applied[-1].node]: |
|
1162 | 1162 | raise util.Abort(_("popping would remove a revision not " |
|
1163 | 1163 | "managed by this patch queue")) |
|
1164 | 1164 | |
|
1165 | 1165 | # we know there are no local changes, so we can make a simplified |
|
1166 | 1166 | # form of hg.update. |
|
1167 | 1167 | if update: |
|
1168 | 1168 | qp = self.qparents(repo, rev) |
|
1169 | 1169 | ctx = repo[qp] |
|
1170 | 1170 | m, a, r, d = repo.status(qp, top)[:4] |
|
1171 | 1171 | if d: |
|
1172 | 1172 | raise util.Abort(_("deletions found between repo revs")) |
|
1173 | 1173 | for f in a: |
|
1174 | 1174 | try: |
|
1175 | 1175 | util.unlink(repo.wjoin(f)) |
|
1176 | 1176 | except OSError, e: |
|
1177 | 1177 | if e.errno != errno.ENOENT: |
|
1178 | 1178 | raise |
|
1179 | 1179 | repo.dirstate.forget(f) |
|
1180 | 1180 | for f in m + r: |
|
1181 | 1181 | fctx = ctx[f] |
|
1182 | 1182 | repo.wwrite(f, fctx.data(), fctx.flags()) |
|
1183 | 1183 | repo.dirstate.normal(f) |
|
1184 | 1184 | repo.dirstate.setparents(qp, nullid) |
|
1185 | 1185 | for patch in reversed(self.applied[start:end]): |
|
1186 | 1186 | self.ui.status(_("popping %s\n") % patch.name) |
|
1187 | 1187 | del self.applied[start:end] |
|
1188 | 1188 | self.strip(repo, rev, update=False, backup='strip') |
|
1189 | 1189 | if self.applied: |
|
1190 | 1190 | self.ui.write(_("now at: %s\n") % self.applied[-1].name) |
|
1191 | 1191 | else: |
|
1192 | 1192 | self.ui.write(_("patch queue now empty\n")) |
|
1193 | 1193 | finally: |
|
1194 | 1194 | wlock.release() |
|
1195 | 1195 | |
|
1196 | 1196 | def diff(self, repo, pats, opts): |
|
1197 | 1197 | top, patch = self.check_toppatch(repo) |
|
1198 | 1198 | if not top: |
|
1199 | 1199 | self.ui.write(_("no patches applied\n")) |
|
1200 | 1200 | return |
|
1201 | 1201 | qp = self.qparents(repo, top) |
|
1202 | 1202 | if opts.get('reverse'): |
|
1203 | 1203 | node1, node2 = None, qp |
|
1204 | 1204 | else: |
|
1205 | 1205 | node1, node2 = qp, None |
|
1206 | 1206 | diffopts = self.diffopts(opts, patch) |
|
1207 | 1207 | self.printdiff(repo, diffopts, node1, node2, files=pats, opts=opts) |
|
1208 | 1208 | |
|
1209 | 1209 | def refresh(self, repo, pats=None, **opts): |
|
1210 | 1210 | if not self.applied: |
|
1211 | 1211 | self.ui.write(_("no patches applied\n")) |
|
1212 | 1212 | return 1 |
|
1213 | 1213 | msg = opts.get('msg', '').rstrip() |
|
1214 | 1214 | newuser = opts.get('user') |
|
1215 | 1215 | newdate = opts.get('date') |
|
1216 | 1216 | if newdate: |
|
1217 | 1217 | newdate = '%d %d' % util.parsedate(newdate) |
|
1218 | 1218 | wlock = repo.wlock() |
|
1219 | 1219 | |
|
1220 | 1220 | try: |
|
1221 | 1221 | self.check_toppatch(repo) |
|
1222 | 1222 | (top, patchfn) = (self.applied[-1].node, self.applied[-1].name) |
|
1223 | 1223 | if repo.changelog.heads(top) != [top]: |
|
1224 | 1224 | raise util.Abort(_("cannot refresh a revision with children")) |
|
1225 | 1225 | |
|
1226 | 1226 | cparents = repo.changelog.parents(top) |
|
1227 | 1227 | patchparent = self.qparents(repo, top) |
|
1228 | 1228 | ph = patchheader(self.join(patchfn), self.plainmode) |
|
1229 | 1229 | diffopts = self.diffopts({'git': opts.get('git')}, patchfn) |
|
1230 | 1230 | if msg: |
|
1231 | 1231 | ph.setmessage(msg) |
|
1232 | 1232 | if newuser: |
|
1233 | 1233 | ph.setuser(newuser) |
|
1234 | 1234 | if newdate: |
|
1235 | 1235 | ph.setdate(newdate) |
|
1236 | 1236 | ph.setparent(hex(patchparent)) |
|
1237 | 1237 | |
|
1238 | 1238 | # only commit new patch when write is complete |
|
1239 | 1239 | patchf = self.opener(patchfn, 'w', atomictemp=True) |
|
1240 | 1240 | |
|
1241 | 1241 | comments = str(ph) |
|
1242 | 1242 | if comments: |
|
1243 | 1243 | patchf.write(comments) |
|
1244 | 1244 | |
|
1245 | 1245 | # update the dirstate in place, strip off the qtip commit |
|
1246 | 1246 | # and then commit. |
|
1247 | 1247 | # |
|
1248 | 1248 | # this should really read: |
|
1249 | 1249 | # mm, dd, aa, aa2 = repo.status(tip, patchparent)[:4] |
|
1250 | 1250 | # but we do it backwards to take advantage of manifest/chlog |
|
1251 | 1251 | # caching against the next repo.status call |
|
1252 | 1252 | mm, aa, dd, aa2 = repo.status(patchparent, top)[:4] |
|
1253 | 1253 | changes = repo.changelog.read(top) |
|
1254 | 1254 | man = repo.manifest.read(changes[0]) |
|
1255 | 1255 | aaa = aa[:] |
|
1256 | 1256 | matchfn = cmdutil.match(repo, pats, opts) |
|
1257 | 1257 | # in short mode, we only diff the files included in the |
|
1258 | 1258 | # patch already plus specified files |
|
1259 | 1259 | if opts.get('short'): |
|
1260 | 1260 | # if amending a patch, we start with existing |
|
1261 | 1261 | # files plus specified files - unfiltered |
|
1262 | 1262 | match = cmdutil.matchfiles(repo, mm + aa + dd + matchfn.files()) |
|
1263 | 1263 | # filter with inc/exl options |
|
1264 | 1264 | matchfn = cmdutil.match(repo, opts=opts) |
|
1265 | 1265 | else: |
|
1266 | 1266 | match = cmdutil.matchall(repo) |
|
1267 | 1267 | m, a, r, d = repo.status(match=match)[:4] |
|
1268 | 1268 | |
|
1269 | 1269 | # we might end up with files that were added between |
|
1270 | 1270 | # qtip and the dirstate parent, but then changed in the |
|
1271 | 1271 | # local dirstate. in this case, we want them to only |
|
1272 | 1272 | # show up in the added section |
|
1273 | 1273 | for x in m: |
|
1274 | 1274 | if x not in aa: |
|
1275 | 1275 | mm.append(x) |
|
1276 | 1276 | # we might end up with files added by the local dirstate that |
|
1277 | 1277 | # were deleted by the patch. In this case, they should only |
|
1278 | 1278 | # show up in the changed section. |
|
1279 | 1279 | for x in a: |
|
1280 | 1280 | if x in dd: |
|
1281 | 1281 | del dd[dd.index(x)] |
|
1282 | 1282 | mm.append(x) |
|
1283 | 1283 | else: |
|
1284 | 1284 | aa.append(x) |
|
1285 | 1285 | # make sure any files deleted in the local dirstate |
|
1286 | 1286 | # are not in the add or change column of the patch |
|
1287 | 1287 | forget = [] |
|
1288 | 1288 | for x in d + r: |
|
1289 | 1289 | if x in aa: |
|
1290 | 1290 | del aa[aa.index(x)] |
|
1291 | 1291 | forget.append(x) |
|
1292 | 1292 | continue |
|
1293 | 1293 | elif x in mm: |
|
1294 | 1294 | del mm[mm.index(x)] |
|
1295 | 1295 | dd.append(x) |
|
1296 | 1296 | |
|
1297 | 1297 | m = list(set(mm)) |
|
1298 | 1298 | r = list(set(dd)) |
|
1299 | 1299 | a = list(set(aa)) |
|
1300 | 1300 | c = [filter(matchfn, l) for l in (m, a, r)] |
|
1301 | 1301 | match = cmdutil.matchfiles(repo, set(c[0] + c[1] + c[2])) |
|
1302 | 1302 | chunks = patch.diff(repo, patchparent, match=match, |
|
1303 | 1303 | changes=c, opts=diffopts) |
|
1304 | 1304 | for chunk in chunks: |
|
1305 | 1305 | patchf.write(chunk) |
|
1306 | 1306 | |
|
1307 | 1307 | try: |
|
1308 | 1308 | if diffopts.git or diffopts.upgrade: |
|
1309 | 1309 | copies = {} |
|
1310 | 1310 | for dst in a: |
|
1311 | 1311 | src = repo.dirstate.copied(dst) |
|
1312 | 1312 | # during qfold, the source file for copies may |
|
1313 | 1313 | # be removed. Treat this as a simple add. |
|
1314 | 1314 | if src is not None and src in repo.dirstate: |
|
1315 | 1315 | copies.setdefault(src, []).append(dst) |
|
1316 | 1316 | repo.dirstate.add(dst) |
|
1317 | 1317 | # remember the copies between patchparent and qtip |
|
1318 | 1318 | for dst in aaa: |
|
1319 | 1319 | f = repo.file(dst) |
|
1320 | 1320 | src = f.renamed(man[dst]) |
|
1321 | 1321 | if src: |
|
1322 | 1322 | copies.setdefault(src[0], []).extend( |
|
1323 | 1323 | copies.get(dst, [])) |
|
1324 | 1324 | if dst in a: |
|
1325 | 1325 | copies[src[0]].append(dst) |
|
1326 | 1326 | # we can't copy a file created by the patch itself |
|
1327 | 1327 | if dst in copies: |
|
1328 | 1328 | del copies[dst] |
|
1329 | 1329 | for src, dsts in copies.iteritems(): |
|
1330 | 1330 | for dst in dsts: |
|
1331 | 1331 | repo.dirstate.copy(src, dst) |
|
1332 | 1332 | else: |
|
1333 | 1333 | for dst in a: |
|
1334 | 1334 | repo.dirstate.add(dst) |
|
1335 | 1335 | # Drop useless copy information |
|
1336 | 1336 | for f in list(repo.dirstate.copies()): |
|
1337 | 1337 | repo.dirstate.copy(None, f) |
|
1338 | 1338 | for f in r: |
|
1339 | 1339 | repo.dirstate.remove(f) |
|
1340 | 1340 | # if the patch excludes a modified file, mark that |
|
1341 | 1341 | # file with mtime=0 so status can see it. |
|
1342 | 1342 | mm = [] |
|
1343 | 1343 | for i in xrange(len(m)-1, -1, -1): |
|
1344 | 1344 | if not matchfn(m[i]): |
|
1345 | 1345 | mm.append(m[i]) |
|
1346 | 1346 | del m[i] |
|
1347 | 1347 | for f in m: |
|
1348 | 1348 | repo.dirstate.normal(f) |
|
1349 | 1349 | for f in mm: |
|
1350 | 1350 | repo.dirstate.normallookup(f) |
|
1351 | 1351 | for f in forget: |
|
1352 | 1352 | repo.dirstate.forget(f) |
|
1353 | 1353 | |
|
1354 | 1354 | if not msg: |
|
1355 | 1355 | if not ph.message: |
|
1356 | 1356 | message = "[mq]: %s\n" % patchfn |
|
1357 | 1357 | else: |
|
1358 | 1358 | message = "\n".join(ph.message) |
|
1359 | 1359 | else: |
|
1360 | 1360 | message = msg |
|
1361 | 1361 | |
|
1362 | 1362 | user = ph.user or changes[1] |
|
1363 | 1363 | |
|
1364 | 1364 | # assumes strip can roll itself back if interrupted |
|
1365 | 1365 | repo.dirstate.setparents(*cparents) |
|
1366 | 1366 | self.applied.pop() |
|
1367 | 1367 | self.applied_dirty = 1 |
|
1368 | 1368 | self.strip(repo, top, update=False, |
|
1369 | 1369 | backup='strip') |
|
1370 | 1370 | except: |
|
1371 | 1371 | repo.dirstate.invalidate() |
|
1372 | 1372 | raise |
|
1373 | 1373 | |
|
1374 | 1374 | try: |
|
1375 | 1375 | # might be nice to attempt to roll back strip after this |
|
1376 | 1376 | patchf.rename() |
|
1377 | 1377 | n = repo.commit(message, user, ph.date, match=match, |
|
1378 | 1378 | force=True) |
|
1379 | 1379 | self.applied.append(statusentry(n, patchfn)) |
|
1380 | 1380 | except: |
|
1381 | 1381 | ctx = repo[cparents[0]] |
|
1382 | 1382 | repo.dirstate.rebuild(ctx.node(), ctx.manifest()) |
|
1383 | 1383 | self.save_dirty() |
|
1384 | 1384 | self.ui.warn(_('refresh interrupted while patch was popped! ' |
|
1385 | 1385 | '(revert --all, qpush to recover)\n')) |
|
1386 | 1386 | raise |
|
1387 | 1387 | finally: |
|
1388 | 1388 | wlock.release() |
|
1389 | 1389 | self.removeundo(repo) |
|
1390 | 1390 | |
|
1391 | 1391 | def init(self, repo, create=False): |
|
1392 | 1392 | if not create and os.path.isdir(self.path): |
|
1393 | 1393 | raise util.Abort(_("patch queue directory already exists")) |
|
1394 | 1394 | try: |
|
1395 | 1395 | os.mkdir(self.path) |
|
1396 | 1396 | except OSError, inst: |
|
1397 | 1397 | if inst.errno != errno.EEXIST or not create: |
|
1398 | 1398 | raise |
|
1399 | 1399 | if create: |
|
1400 | 1400 | return self.qrepo(create=True) |
|
1401 | 1401 | |
|
1402 | 1402 | def unapplied(self, repo, patch=None): |
|
1403 | 1403 | if patch and patch not in self.series: |
|
1404 | 1404 | raise util.Abort(_("patch %s is not in series file") % patch) |
|
1405 | 1405 | if not patch: |
|
1406 | 1406 | start = self.series_end() |
|
1407 | 1407 | else: |
|
1408 | 1408 | start = self.series.index(patch) + 1 |
|
1409 | 1409 | unapplied = [] |
|
1410 | 1410 | for i in xrange(start, len(self.series)): |
|
1411 | 1411 | pushable, reason = self.pushable(i) |
|
1412 | 1412 | if pushable: |
|
1413 | 1413 | unapplied.append((i, self.series[i])) |
|
1414 | 1414 | self.explain_pushable(i) |
|
1415 | 1415 | return unapplied |
|
1416 | 1416 | |
|
1417 | 1417 | def qseries(self, repo, missing=None, start=0, length=None, status=None, |
|
1418 | 1418 | summary=False): |
|
1419 | 1419 | def displayname(pfx, patchname, state): |
|
1420 | 1420 | if pfx: |
|
1421 | 1421 | self.ui.write(pfx) |
|
1422 | 1422 | if summary: |
|
1423 | 1423 | ph = patchheader(self.join(patchname), self.plainmode) |
|
1424 | 1424 | msg = ph.message and ph.message[0] or '' |
|
1425 | 1425 | if not self.ui.plain(): |
|
1426 | 1426 | width = util.termwidth() - len(pfx) - len(patchname) - 2 |
|
1427 | 1427 | if width > 0: |
|
1428 | 1428 | msg = util.ellipsis(msg, width) |
|
1429 | 1429 | else: |
|
1430 | 1430 | msg = '' |
|
1431 | 1431 | self.ui.write(patchname, label='qseries.' + state) |
|
1432 | 1432 | self.ui.write(': ') |
|
1433 | 1433 | self.ui.write(msg, label='qseries.message.' + state) |
|
1434 | 1434 | else: |
|
1435 | 1435 | self.ui.write(patchname, label='qseries.' + state) |
|
1436 | 1436 | self.ui.write('\n') |
|
1437 | 1437 | |
|
1438 | 1438 | applied = set([p.name for p in self.applied]) |
|
1439 | 1439 | if length is None: |
|
1440 | 1440 | length = len(self.series) - start |
|
1441 | 1441 | if not missing: |
|
1442 | 1442 | if self.ui.verbose: |
|
1443 | 1443 | idxwidth = len(str(start + length - 1)) |
|
1444 | 1444 | for i in xrange(start, start + length): |
|
1445 | 1445 | patch = self.series[i] |
|
1446 | 1446 | if patch in applied: |
|
1447 | 1447 | char, state = 'A', 'applied' |
|
1448 | 1448 | elif self.pushable(i)[0]: |
|
1449 | 1449 | char, state = 'U', 'unapplied' |
|
1450 | 1450 | else: |
|
1451 | 1451 | char, state = 'G', 'guarded' |
|
1452 | 1452 | pfx = '' |
|
1453 | 1453 | if self.ui.verbose: |
|
1454 | 1454 | pfx = '%*d %s ' % (idxwidth, i, char) |
|
1455 | 1455 | elif status and status != char: |
|
1456 | 1456 | continue |
|
1457 | 1457 | displayname(pfx, patch, state) |
|
1458 | 1458 | else: |
|
1459 | 1459 | msng_list = [] |
|
1460 | 1460 | for root, dirs, files in os.walk(self.path): |
|
1461 | 1461 | d = root[len(self.path) + 1:] |
|
1462 | 1462 | for f in files: |
|
1463 | 1463 | fl = os.path.join(d, f) |
|
1464 | 1464 | if (fl not in self.series and |
|
1465 | 1465 | fl not in (self.status_path, self.series_path, |
|
1466 | 1466 | self.guards_path) |
|
1467 | 1467 | and not fl.startswith('.')): |
|
1468 | 1468 | msng_list.append(fl) |
|
1469 | 1469 | for x in sorted(msng_list): |
|
1470 | 1470 | pfx = self.ui.verbose and ('D ') or '' |
|
1471 | 1471 | displayname(pfx, x, 'missing') |
|
1472 | 1472 | |
|
1473 | 1473 | def issaveline(self, l): |
|
1474 | 1474 | if l.name == '.hg.patches.save.line': |
|
1475 | 1475 | return True |
|
1476 | 1476 | |
|
1477 | 1477 | def qrepo(self, create=False): |
|
1478 | 1478 | if create or os.path.isdir(self.join(".hg")): |
|
1479 | 1479 | return hg.repository(self.ui, path=self.path, create=create) |
|
1480 | 1480 | |
|
1481 | 1481 | def restore(self, repo, rev, delete=None, qupdate=None): |
|
1482 | 1482 | desc = repo[rev].description().strip() |
|
1483 | 1483 | lines = desc.splitlines() |
|
1484 | 1484 | i = 0 |
|
1485 | 1485 | datastart = None |
|
1486 | 1486 | series = [] |
|
1487 | 1487 | applied = [] |
|
1488 | 1488 | qpp = None |
|
1489 | 1489 | for i, line in enumerate(lines): |
|
1490 | 1490 | if line == 'Patch Data:': |
|
1491 | 1491 | datastart = i + 1 |
|
1492 | 1492 | elif line.startswith('Dirstate:'): |
|
1493 | 1493 | l = line.rstrip() |
|
1494 | 1494 | l = l[10:].split(' ') |
|
1495 | 1495 | qpp = [bin(x) for x in l] |
|
1496 | 1496 | elif datastart != None: |
|
1497 | 1497 | l = line.rstrip() |
|
1498 | 1498 | n, name = l.split(':', 1) |
|
1499 | 1499 | if n: |
|
1500 | 1500 | applied.append(statusentry(bin(n), name)) |
|
1501 | 1501 | else: |
|
1502 | 1502 | series.append(l) |
|
1503 | 1503 | if datastart is None: |
|
1504 | 1504 | self.ui.warn(_("No saved patch data found\n")) |
|
1505 | 1505 | return 1 |
|
1506 | 1506 | self.ui.warn(_("restoring status: %s\n") % lines[0]) |
|
1507 | 1507 | self.full_series = series |
|
1508 | 1508 | self.applied = applied |
|
1509 | 1509 | self.parse_series() |
|
1510 | 1510 | self.series_dirty = 1 |
|
1511 | 1511 | self.applied_dirty = 1 |
|
1512 | 1512 | heads = repo.changelog.heads() |
|
1513 | 1513 | if delete: |
|
1514 | 1514 | if rev not in heads: |
|
1515 | 1515 | self.ui.warn(_("save entry has children, leaving it alone\n")) |
|
1516 | 1516 | else: |
|
1517 | 1517 | self.ui.warn(_("removing save entry %s\n") % short(rev)) |
|
1518 | 1518 | pp = repo.dirstate.parents() |
|
1519 | 1519 | if rev in pp: |
|
1520 | 1520 | update = True |
|
1521 | 1521 | else: |
|
1522 | 1522 | update = False |
|
1523 | 1523 | self.strip(repo, rev, update=update, backup='strip') |
|
1524 | 1524 | if qpp: |
|
1525 | 1525 | self.ui.warn(_("saved queue repository parents: %s %s\n") % |
|
1526 | 1526 | (short(qpp[0]), short(qpp[1]))) |
|
1527 | 1527 | if qupdate: |
|
1528 | 1528 | self.ui.status(_("queue directory updating\n")) |
|
1529 | 1529 | r = self.qrepo() |
|
1530 | 1530 | if not r: |
|
1531 | 1531 | self.ui.warn(_("Unable to load queue repository\n")) |
|
1532 | 1532 | return 1 |
|
1533 | 1533 | hg.clean(r, qpp[0]) |
|
1534 | 1534 | |
|
1535 | 1535 | def save(self, repo, msg=None): |
|
1536 | 1536 | if not self.applied: |
|
1537 | 1537 | self.ui.warn(_("save: no patches applied, exiting\n")) |
|
1538 | 1538 | return 1 |
|
1539 | 1539 | if self.issaveline(self.applied[-1]): |
|
1540 | 1540 | self.ui.warn(_("status is already saved\n")) |
|
1541 | 1541 | return 1 |
|
1542 | 1542 | |
|
1543 | 1543 | if not msg: |
|
1544 | 1544 | msg = _("hg patches saved state") |
|
1545 | 1545 | else: |
|
1546 | 1546 | msg = "hg patches: " + msg.rstrip('\r\n') |
|
1547 | 1547 | r = self.qrepo() |
|
1548 | 1548 | if r: |
|
1549 | 1549 | pp = r.dirstate.parents() |
|
1550 | 1550 | msg += "\nDirstate: %s %s" % (hex(pp[0]), hex(pp[1])) |
|
1551 | 1551 | msg += "\n\nPatch Data:\n" |
|
1552 | 1552 | msg += ''.join('%s\n' % x for x in self.applied) |
|
1553 | 1553 | msg += ''.join(':%s\n' % x for x in self.full_series) |
|
1554 | 1554 | n = repo.commit(msg, force=True) |
|
1555 | 1555 | if not n: |
|
1556 | 1556 | self.ui.warn(_("repo commit failed\n")) |
|
1557 | 1557 | return 1 |
|
1558 | 1558 | self.applied.append(statusentry(n, '.hg.patches.save.line')) |
|
1559 | 1559 | self.applied_dirty = 1 |
|
1560 | 1560 | self.removeundo(repo) |
|
1561 | 1561 | |
|
1562 | 1562 | def full_series_end(self): |
|
1563 | 1563 | if self.applied: |
|
1564 | 1564 | p = self.applied[-1].name |
|
1565 | 1565 | end = self.find_series(p) |
|
1566 | 1566 | if end is None: |
|
1567 | 1567 | return len(self.full_series) |
|
1568 | 1568 | return end + 1 |
|
1569 | 1569 | return 0 |
|
1570 | 1570 | |
|
1571 | 1571 | def series_end(self, all_patches=False): |
|
1572 | 1572 | """If all_patches is False, return the index of the next pushable patch |
|
1573 | 1573 | in the series, or the series length. If all_patches is True, return the |
|
1574 | 1574 | index of the first patch past the last applied one. |
|
1575 | 1575 | """ |
|
1576 | 1576 | end = 0 |
|
1577 | 1577 | def next(start): |
|
1578 | 1578 | if all_patches or start >= len(self.series): |
|
1579 | 1579 | return start |
|
1580 | 1580 | for i in xrange(start, len(self.series)): |
|
1581 | 1581 | p, reason = self.pushable(i) |
|
1582 | 1582 | if p: |
|
1583 | 1583 | break |
|
1584 | 1584 | self.explain_pushable(i) |
|
1585 | 1585 | return i |
|
1586 | 1586 | if self.applied: |
|
1587 | 1587 | p = self.applied[-1].name |
|
1588 | 1588 | try: |
|
1589 | 1589 | end = self.series.index(p) |
|
1590 | 1590 | except ValueError: |
|
1591 | 1591 | return 0 |
|
1592 | 1592 | return next(end + 1) |
|
1593 | 1593 | return next(end) |
|
1594 | 1594 | |
|
1595 | 1595 | def appliedname(self, index): |
|
1596 | 1596 | pname = self.applied[index].name |
|
1597 | 1597 | if not self.ui.verbose: |
|
1598 | 1598 | p = pname |
|
1599 | 1599 | else: |
|
1600 | 1600 | p = str(self.series.index(pname)) + " " + pname |
|
1601 | 1601 | return p |
|
1602 | 1602 | |
|
1603 | 1603 | def qimport(self, repo, files, patchname=None, rev=None, existing=None, |
|
1604 | 1604 | force=None, git=False): |
|
1605 | 1605 | def checkseries(patchname): |
|
1606 | 1606 | if patchname in self.series: |
|
1607 | 1607 | raise util.Abort(_('patch %s is already in the series file') |
|
1608 | 1608 | % patchname) |
|
1609 | 1609 | def checkfile(patchname): |
|
1610 | 1610 | if not force and os.path.exists(self.join(patchname)): |
|
1611 | 1611 | raise util.Abort(_('patch "%s" already exists') |
|
1612 | 1612 | % patchname) |
|
1613 | 1613 | |
|
1614 | 1614 | if rev: |
|
1615 | 1615 | if files: |
|
1616 | 1616 | raise util.Abort(_('option "-r" not valid when importing ' |
|
1617 | 1617 | 'files')) |
|
1618 | 1618 | rev = cmdutil.revrange(repo, rev) |
|
1619 | 1619 | rev.sort(reverse=True) |
|
1620 | 1620 | if (len(files) > 1 or len(rev) > 1) and patchname: |
|
1621 | 1621 | raise util.Abort(_('option "-n" not valid when importing multiple ' |
|
1622 | 1622 | 'patches')) |
|
1623 | 1623 | added = [] |
|
1624 | 1624 | if rev: |
|
1625 | 1625 | # If mq patches are applied, we can only import revisions |
|
1626 | 1626 | # that form a linear path to qbase. |
|
1627 | 1627 | # Otherwise, they should form a linear path to a head. |
|
1628 | 1628 | heads = repo.changelog.heads(repo.changelog.node(rev[-1])) |
|
1629 | 1629 | if len(heads) > 1: |
|
1630 | 1630 | raise util.Abort(_('revision %d is the root of more than one ' |
|
1631 | 1631 | 'branch') % rev[-1]) |
|
1632 | 1632 | if self.applied: |
|
1633 | 1633 | base = repo.changelog.node(rev[0]) |
|
1634 | 1634 | if base in [n.node for n in self.applied]: |
|
1635 | 1635 | raise util.Abort(_('revision %d is already managed') |
|
1636 | 1636 | % rev[0]) |
|
1637 | 1637 | if heads != [self.applied[-1].node]: |
|
1638 | 1638 | raise util.Abort(_('revision %d is not the parent of ' |
|
1639 | 1639 | 'the queue') % rev[0]) |
|
1640 | 1640 | base = repo.changelog.rev(self.applied[0].node) |
|
1641 | 1641 | lastparent = repo.changelog.parentrevs(base)[0] |
|
1642 | 1642 | else: |
|
1643 | 1643 | if heads != [repo.changelog.node(rev[0])]: |
|
1644 | 1644 | raise util.Abort(_('revision %d has unmanaged children') |
|
1645 | 1645 | % rev[0]) |
|
1646 | 1646 | lastparent = None |
|
1647 | 1647 | |
|
1648 | 1648 | diffopts = self.diffopts({'git': git}) |
|
1649 | 1649 | for r in rev: |
|
1650 | 1650 | p1, p2 = repo.changelog.parentrevs(r) |
|
1651 | 1651 | n = repo.changelog.node(r) |
|
1652 | 1652 | if p2 != nullrev: |
|
1653 | 1653 | raise util.Abort(_('cannot import merge revision %d') % r) |
|
1654 | 1654 | if lastparent and lastparent != r: |
|
1655 | 1655 | raise util.Abort(_('revision %d is not the parent of %d') |
|
1656 | 1656 | % (r, lastparent)) |
|
1657 | 1657 | lastparent = p1 |
|
1658 | 1658 | |
|
1659 | 1659 | if not patchname: |
|
1660 | 1660 | patchname = normname('%d.diff' % r) |
|
1661 | 1661 | self.check_reserved_name(patchname) |
|
1662 | 1662 | checkseries(patchname) |
|
1663 | 1663 | checkfile(patchname) |
|
1664 | 1664 | self.full_series.insert(0, patchname) |
|
1665 | 1665 | |
|
1666 | 1666 | patchf = self.opener(patchname, "w") |
|
1667 | 1667 | cmdutil.export(repo, [n], fp=patchf, opts=diffopts) |
|
1668 | 1668 | patchf.close() |
|
1669 | 1669 | |
|
1670 | 1670 | se = statusentry(n, patchname) |
|
1671 | 1671 | self.applied.insert(0, se) |
|
1672 | 1672 | |
|
1673 | 1673 | added.append(patchname) |
|
1674 | 1674 | patchname = None |
|
1675 | 1675 | self.parse_series() |
|
1676 | 1676 | self.applied_dirty = 1 |
|
1677 | 1677 | |
|
1678 | 1678 | for i, filename in enumerate(files): |
|
1679 | 1679 | if existing: |
|
1680 | 1680 | if filename == '-': |
|
1681 | 1681 | raise util.Abort(_('-e is incompatible with import from -')) |
|
1682 | 1682 | if not patchname: |
|
1683 | 1683 | patchname = normname(filename) |
|
1684 | 1684 | self.check_reserved_name(patchname) |
|
1685 | 1685 | if not os.path.isfile(self.join(patchname)): |
|
1686 | 1686 | raise util.Abort(_("patch %s does not exist") % patchname) |
|
1687 | 1687 | else: |
|
1688 | 1688 | try: |
|
1689 | 1689 | if filename == '-': |
|
1690 | 1690 | if not patchname: |
|
1691 | 1691 | raise util.Abort( |
|
1692 | 1692 | _('need --name to import a patch from -')) |
|
1693 | 1693 | text = sys.stdin.read() |
|
1694 | 1694 | else: |
|
1695 | 1695 | text = url.open(self.ui, filename).read() |
|
1696 | 1696 | except (OSError, IOError): |
|
1697 | 1697 | raise util.Abort(_("unable to read %s") % filename) |
|
1698 | 1698 | if not patchname: |
|
1699 | 1699 | patchname = normname(os.path.basename(filename)) |
|
1700 | 1700 | self.check_reserved_name(patchname) |
|
1701 | 1701 | checkfile(patchname) |
|
1702 | 1702 | patchf = self.opener(patchname, "w") |
|
1703 | 1703 | patchf.write(text) |
|
1704 | 1704 | if not force: |
|
1705 | 1705 | checkseries(patchname) |
|
1706 | 1706 | if patchname not in self.series: |
|
1707 | 1707 | index = self.full_series_end() + i |
|
1708 | 1708 | self.full_series[index:index] = [patchname] |
|
1709 | 1709 | self.parse_series() |
|
1710 | 1710 | self.ui.warn(_("adding %s to series file\n") % patchname) |
|
1711 | 1711 | added.append(patchname) |
|
1712 | 1712 | patchname = None |
|
1713 | 1713 | self.series_dirty = 1 |
|
1714 | 1714 | qrepo = self.qrepo() |
|
1715 | 1715 | if qrepo: |
|
1716 | 1716 | qrepo.add(added) |
|
1717 | 1717 | |
|
1718 | 1718 | def delete(ui, repo, *patches, **opts): |
|
1719 | 1719 | """remove patches from queue |
|
1720 | 1720 | |
|
1721 | 1721 | The patches must not be applied, and at least one patch is required. With |
|
1722 | 1722 | -k/--keep, the patch files are preserved in the patch directory. |
|
1723 | 1723 | |
|
1724 | 1724 | To stop managing a patch and move it into permanent history, |
|
1725 | 1725 | use the qfinish command.""" |
|
1726 | 1726 | q = repo.mq |
|
1727 | 1727 | q.delete(repo, patches, opts) |
|
1728 | 1728 | q.save_dirty() |
|
1729 | 1729 | return 0 |
|
1730 | 1730 | |
|
1731 | 1731 | def applied(ui, repo, patch=None, **opts): |
|
1732 | 1732 | """print the patches already applied""" |
|
1733 | 1733 | |
|
1734 | 1734 | q = repo.mq |
|
1735 | 1735 | l = len(q.applied) |
|
1736 | 1736 | |
|
1737 | 1737 | if patch: |
|
1738 | 1738 | if patch not in q.series: |
|
1739 | 1739 | raise util.Abort(_("patch %s is not in series file") % patch) |
|
1740 | 1740 | end = q.series.index(patch) + 1 |
|
1741 | 1741 | else: |
|
1742 | 1742 | end = q.series_end(True) |
|
1743 | 1743 | |
|
1744 | 1744 | if opts.get('last') and not end: |
|
1745 | 1745 | ui.write(_("no patches applied\n")) |
|
1746 | 1746 | return 1 |
|
1747 | 1747 | elif opts.get('last') and end == 1: |
|
1748 | 1748 | ui.write(_("only one patch applied\n")) |
|
1749 | 1749 | return 1 |
|
1750 | 1750 | elif opts.get('last'): |
|
1751 | 1751 | start = end - 2 |
|
1752 | 1752 | end = 1 |
|
1753 | 1753 | else: |
|
1754 | 1754 | start = 0 |
|
1755 | 1755 | |
|
1756 | 1756 | return q.qseries(repo, length=end, start=start, status='A', |
|
1757 | 1757 | summary=opts.get('summary')) |
|
1758 | 1758 | |
|
1759 | 1759 | def unapplied(ui, repo, patch=None, **opts): |
|
1760 | 1760 | """print the patches not yet applied""" |
|
1761 | 1761 | |
|
1762 | 1762 | q = repo.mq |
|
1763 | 1763 | if patch: |
|
1764 | 1764 | if patch not in q.series: |
|
1765 | 1765 | raise util.Abort(_("patch %s is not in series file") % patch) |
|
1766 | 1766 | start = q.series.index(patch) + 1 |
|
1767 | 1767 | else: |
|
1768 | 1768 | start = q.series_end(True) |
|
1769 | 1769 | |
|
1770 | 1770 | if start == len(q.series) and opts.get('first'): |
|
1771 | 1771 | ui.write(_("all patches applied\n")) |
|
1772 | 1772 | return 1 |
|
1773 | 1773 | |
|
1774 | 1774 | length = opts.get('first') and 1 or None |
|
1775 | 1775 | return q.qseries(repo, start=start, length=length, status='U', |
|
1776 | 1776 | summary=opts.get('summary')) |
|
1777 | 1777 | |
|
1778 | 1778 | def qimport(ui, repo, *filename, **opts): |
|
1779 | 1779 | """import a patch |
|
1780 | 1780 | |
|
1781 | 1781 | The patch is inserted into the series after the last applied |
|
1782 | 1782 | patch. If no patches have been applied, qimport prepends the patch |
|
1783 | 1783 | to the series. |
|
1784 | 1784 | |
|
1785 | 1785 | The patch will have the same name as its source file unless you |
|
1786 | 1786 | give it a new one with -n/--name. |
|
1787 | 1787 | |
|
1788 | 1788 | You can register an existing patch inside the patch directory with |
|
1789 | 1789 | the -e/--existing flag. |
|
1790 | 1790 | |
|
1791 | 1791 | With -f/--force, an existing patch of the same name will be |
|
1792 | 1792 | overwritten. |
|
1793 | 1793 | |
|
1794 | 1794 | An existing changeset may be placed under mq control with -r/--rev |
|
1795 | 1795 | (e.g. qimport --rev tip -n patch will place tip under mq control). |
|
1796 | 1796 | With -g/--git, patches imported with --rev will use the git diff |
|
1797 | 1797 | format. See the diffs help topic for information on why this is |
|
1798 | 1798 | important for preserving rename/copy information and permission |
|
1799 | 1799 | changes. |
|
1800 | 1800 | |
|
1801 | 1801 | To import a patch from standard input, pass - as the patch file. |
|
1802 | 1802 | When importing from standard input, a patch name must be specified |
|
1803 | 1803 | using the --name flag. |
|
1804 | 1804 | """ |
|
1805 | 1805 | q = repo.mq |
|
1806 | 1806 | q.qimport(repo, filename, patchname=opts['name'], |
|
1807 | 1807 | existing=opts['existing'], force=opts['force'], rev=opts['rev'], |
|
1808 | 1808 | git=opts['git']) |
|
1809 | 1809 | q.save_dirty() |
|
1810 | 1810 | |
|
1811 | 1811 | if opts.get('push') and not opts.get('rev'): |
|
1812 | 1812 | return q.push(repo, None) |
|
1813 | 1813 | return 0 |
|
1814 | 1814 | |
|
1815 | 1815 | def qinit(ui, repo, create): |
|
1816 | 1816 | """initialize a new queue repository |
|
1817 | 1817 | |
|
1818 | 1818 | This command also creates a series file for ordering patches, and |
|
1819 | 1819 | an mq-specific .hgignore file in the queue repository, to exclude |
|
1820 | 1820 | the status and guards files (these contain mostly transient state).""" |
|
1821 | 1821 | q = repo.mq |
|
1822 | 1822 | r = q.init(repo, create) |
|
1823 | 1823 | q.save_dirty() |
|
1824 | 1824 | if r: |
|
1825 | 1825 | if not os.path.exists(r.wjoin('.hgignore')): |
|
1826 | 1826 | fp = r.wopener('.hgignore', 'w') |
|
1827 | 1827 | fp.write('^\\.hg\n') |
|
1828 | 1828 | fp.write('^\\.mq\n') |
|
1829 | 1829 | fp.write('syntax: glob\n') |
|
1830 | 1830 | fp.write('status\n') |
|
1831 | 1831 | fp.write('guards\n') |
|
1832 | 1832 | fp.close() |
|
1833 | 1833 | if not os.path.exists(r.wjoin('series')): |
|
1834 | 1834 | r.wopener('series', 'w').close() |
|
1835 | 1835 | r.add(['.hgignore', 'series']) |
|
1836 | 1836 | commands.add(ui, r) |
|
1837 | 1837 | return 0 |
|
1838 | 1838 | |
|
1839 | 1839 | def init(ui, repo, **opts): |
|
1840 | 1840 | """init a new queue repository (DEPRECATED) |
|
1841 | 1841 | |
|
1842 | 1842 | The queue repository is unversioned by default. If |
|
1843 | 1843 | -c/--create-repo is specified, qinit will create a separate nested |
|
1844 | 1844 | repository for patches (qinit -c may also be run later to convert |
|
1845 | 1845 | an unversioned patch repository into a versioned one). You can use |
|
1846 | 1846 | qcommit to commit changes to this queue repository. |
|
1847 | 1847 | |
|
1848 | 1848 | This command is deprecated. Without -c, it's implied by other relevant |
|
1849 | 1849 | commands. With -c, use :hg:`init --mq` instead.""" |
|
1850 | 1850 | return qinit(ui, repo, create=opts['create_repo']) |
|
1851 | 1851 | |
|
1852 | 1852 | def clone(ui, source, dest=None, **opts): |
|
1853 | 1853 | '''clone main and patch repository at same time |
|
1854 | 1854 | |
|
1855 | 1855 | If source is local, destination will have no patches applied. If |
|
1856 | 1856 | source is remote, this command can not check if patches are |
|
1857 | 1857 | applied in source, so cannot guarantee that patches are not |
|
1858 | 1858 | applied in destination. If you clone remote repository, be sure |
|
1859 | 1859 | before that it has no patches applied. |
|
1860 | 1860 | |
|
1861 | 1861 | Source patch repository is looked for in <src>/.hg/patches by |
|
1862 | 1862 | default. Use -p <url> to change. |
|
1863 | 1863 | |
|
1864 | 1864 | The patch directory must be a nested Mercurial repository, as |
|
1865 | 1865 | would be created by :hg:`init --mq`. |
|
1866 | 1866 | ''' |
|
1867 | 1867 | def patchdir(repo): |
|
1868 | 1868 | url = repo.url() |
|
1869 | 1869 | if url.endswith('/'): |
|
1870 | 1870 | url = url[:-1] |
|
1871 | 1871 | return url + '/.hg/patches' |
|
1872 | 1872 | if dest is None: |
|
1873 | 1873 | dest = hg.defaultdest(source) |
|
1874 | 1874 | sr = hg.repository(hg.remoteui(ui, opts), ui.expandpath(source)) |
|
1875 | 1875 | if opts['patches']: |
|
1876 | 1876 | patchespath = ui.expandpath(opts['patches']) |
|
1877 | 1877 | else: |
|
1878 | 1878 | patchespath = patchdir(sr) |
|
1879 | 1879 | try: |
|
1880 | 1880 | hg.repository(ui, patchespath) |
|
1881 | 1881 | except error.RepoError: |
|
1882 | 1882 | raise util.Abort(_('versioned patch repository not found' |
|
1883 | 1883 | ' (see init --mq)')) |
|
1884 | 1884 | qbase, destrev = None, None |
|
1885 | 1885 | if sr.local(): |
|
1886 | 1886 | if sr.mq.applied: |
|
1887 | 1887 | qbase = sr.mq.applied[0].node |
|
1888 | 1888 | if not hg.islocal(dest): |
|
1889 | 1889 | heads = set(sr.heads()) |
|
1890 | 1890 | destrev = list(heads.difference(sr.heads(qbase))) |
|
1891 | 1891 | destrev.append(sr.changelog.parents(qbase)[0]) |
|
1892 | 1892 | elif sr.capable('lookup'): |
|
1893 | 1893 | try: |
|
1894 | 1894 | qbase = sr.lookup('qbase') |
|
1895 | 1895 | except error.RepoError: |
|
1896 | 1896 | pass |
|
1897 | 1897 | ui.note(_('cloning main repository\n')) |
|
1898 | 1898 | sr, dr = hg.clone(ui, sr.url(), dest, |
|
1899 | 1899 | pull=opts['pull'], |
|
1900 | 1900 | rev=destrev, |
|
1901 | 1901 | update=False, |
|
1902 | 1902 | stream=opts['uncompressed']) |
|
1903 | 1903 | ui.note(_('cloning patch repository\n')) |
|
1904 | 1904 | hg.clone(ui, opts['patches'] or patchdir(sr), patchdir(dr), |
|
1905 | 1905 | pull=opts['pull'], update=not opts['noupdate'], |
|
1906 | 1906 | stream=opts['uncompressed']) |
|
1907 | 1907 | if dr.local(): |
|
1908 | 1908 | if qbase: |
|
1909 | 1909 | ui.note(_('stripping applied patches from destination ' |
|
1910 | 1910 | 'repository\n')) |
|
1911 | 1911 | dr.mq.strip(dr, qbase, update=False, backup=None) |
|
1912 | 1912 | if not opts['noupdate']: |
|
1913 | 1913 | ui.note(_('updating destination repository\n')) |
|
1914 | 1914 | hg.update(dr, dr.changelog.tip()) |
|
1915 | 1915 | |
|
1916 | 1916 | def commit(ui, repo, *pats, **opts): |
|
1917 | 1917 | """commit changes in the queue repository (DEPRECATED) |
|
1918 | 1918 | |
|
1919 | 1919 | This command is deprecated; use :hg:`commit --mq` instead.""" |
|
1920 | 1920 | q = repo.mq |
|
1921 | 1921 | r = q.qrepo() |
|
1922 | 1922 | if not r: |
|
1923 | 1923 | raise util.Abort('no queue repository') |
|
1924 | 1924 | commands.commit(r.ui, r, *pats, **opts) |
|
1925 | 1925 | |
|
1926 | 1926 | def series(ui, repo, **opts): |
|
1927 | 1927 | """print the entire series file""" |
|
1928 | 1928 | repo.mq.qseries(repo, missing=opts['missing'], summary=opts['summary']) |
|
1929 | 1929 | return 0 |
|
1930 | 1930 | |
|
1931 | 1931 | def top(ui, repo, **opts): |
|
1932 | 1932 | """print the name of the current patch""" |
|
1933 | 1933 | q = repo.mq |
|
1934 | 1934 | t = q.applied and q.series_end(True) or 0 |
|
1935 | 1935 | if t: |
|
1936 | 1936 | return q.qseries(repo, start=t - 1, length=1, status='A', |
|
1937 | 1937 | summary=opts.get('summary')) |
|
1938 | 1938 | else: |
|
1939 | 1939 | ui.write(_("no patches applied\n")) |
|
1940 | 1940 | return 1 |
|
1941 | 1941 | |
|
1942 | 1942 | def next(ui, repo, **opts): |
|
1943 | 1943 | """print the name of the next patch""" |
|
1944 | 1944 | q = repo.mq |
|
1945 | 1945 | end = q.series_end() |
|
1946 | 1946 | if end == len(q.series): |
|
1947 | 1947 | ui.write(_("all patches applied\n")) |
|
1948 | 1948 | return 1 |
|
1949 | 1949 | return q.qseries(repo, start=end, length=1, summary=opts.get('summary')) |
|
1950 | 1950 | |
|
1951 | 1951 | def prev(ui, repo, **opts): |
|
1952 | 1952 | """print the name of the previous patch""" |
|
1953 | 1953 | q = repo.mq |
|
1954 | 1954 | l = len(q.applied) |
|
1955 | 1955 | if l == 1: |
|
1956 | 1956 | ui.write(_("only one patch applied\n")) |
|
1957 | 1957 | return 1 |
|
1958 | 1958 | if not l: |
|
1959 | 1959 | ui.write(_("no patches applied\n")) |
|
1960 | 1960 | return 1 |
|
1961 | 1961 | return q.qseries(repo, start=l - 2, length=1, status='A', |
|
1962 | 1962 | summary=opts.get('summary')) |
|
1963 | 1963 | |
|
1964 | 1964 | def setupheaderopts(ui, opts): |
|
1965 | 1965 | if not opts.get('user') and opts.get('currentuser'): |
|
1966 | 1966 | opts['user'] = ui.username() |
|
1967 | 1967 | if not opts.get('date') and opts.get('currentdate'): |
|
1968 | 1968 | opts['date'] = "%d %d" % util.makedate() |
|
1969 | 1969 | |
|
1970 | 1970 | def new(ui, repo, patch, *args, **opts): |
|
1971 | 1971 | """create a new patch |
|
1972 | 1972 | |
|
1973 | 1973 | qnew creates a new patch on top of the currently-applied patch (if |
|
1974 | 1974 | any). The patch will be initialized with any outstanding changes |
|
1975 | 1975 | in the working directory. You may also use -I/--include, |
|
1976 | 1976 | -X/--exclude, and/or a list of files after the patch name to add |
|
1977 | 1977 | only changes to matching files to the new patch, leaving the rest |
|
1978 | 1978 | as uncommitted modifications. |
|
1979 | 1979 | |
|
1980 | 1980 | -u/--user and -d/--date can be used to set the (given) user and |
|
1981 | 1981 | date, respectively. -U/--currentuser and -D/--currentdate set user |
|
1982 | 1982 | to current user and date to current date. |
|
1983 | 1983 | |
|
1984 | 1984 | -e/--edit, -m/--message or -l/--logfile set the patch header as |
|
1985 | 1985 | well as the commit message. If none is specified, the header is |
|
1986 | 1986 | empty and the commit message is '[mq]: PATCH'. |
|
1987 | 1987 | |
|
1988 | 1988 | Use the -g/--git option to keep the patch in the git extended diff |
|
1989 | 1989 | format. Read the diffs help topic for more information on why this |
|
1990 | 1990 | is important for preserving permission changes and copy/rename |
|
1991 | 1991 | information. |
|
1992 | 1992 | """ |
|
1993 | 1993 | msg = cmdutil.logmessage(opts) |
|
1994 | 1994 | def getmsg(): |
|
1995 | 1995 | return ui.edit(msg, ui.username()) |
|
1996 | 1996 | q = repo.mq |
|
1997 | 1997 | opts['msg'] = msg |
|
1998 | 1998 | if opts.get('edit'): |
|
1999 | 1999 | opts['msg'] = getmsg |
|
2000 | 2000 | else: |
|
2001 | 2001 | opts['msg'] = msg |
|
2002 | 2002 | setupheaderopts(ui, opts) |
|
2003 | 2003 | q.new(repo, patch, *args, **opts) |
|
2004 | 2004 | q.save_dirty() |
|
2005 | 2005 | return 0 |
|
2006 | 2006 | |
|
2007 | 2007 | def refresh(ui, repo, *pats, **opts): |
|
2008 | 2008 | """update the current patch |
|
2009 | 2009 | |
|
2010 | 2010 | If any file patterns are provided, the refreshed patch will |
|
2011 | 2011 | contain only the modifications that match those patterns; the |
|
2012 | 2012 | remaining modifications will remain in the working directory. |
|
2013 | 2013 | |
|
2014 | 2014 | If -s/--short is specified, files currently included in the patch |
|
2015 | 2015 | will be refreshed just like matched files and remain in the patch. |
|
2016 | 2016 | |
|
2017 | 2017 | hg add/remove/copy/rename work as usual, though you might want to |
|
2018 | 2018 | use git-style patches (-g/--git or [diff] git=1) to track copies |
|
2019 | 2019 | and renames. See the diffs help topic for more information on the |
|
2020 | 2020 | git diff format. |
|
2021 | 2021 | """ |
|
2022 | 2022 | q = repo.mq |
|
2023 | 2023 | message = cmdutil.logmessage(opts) |
|
2024 | 2024 | if opts['edit']: |
|
2025 | 2025 | if not q.applied: |
|
2026 | 2026 | ui.write(_("no patches applied\n")) |
|
2027 | 2027 | return 1 |
|
2028 | 2028 | if message: |
|
2029 | 2029 | raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) |
|
2030 | 2030 | patch = q.applied[-1].name |
|
2031 | 2031 | ph = patchheader(q.join(patch), q.plainmode) |
|
2032 | 2032 | message = ui.edit('\n'.join(ph.message), ph.user or ui.username()) |
|
2033 | 2033 | setupheaderopts(ui, opts) |
|
2034 | 2034 | ret = q.refresh(repo, pats, msg=message, **opts) |
|
2035 | 2035 | q.save_dirty() |
|
2036 | 2036 | return ret |
|
2037 | 2037 | |
|
2038 | 2038 | def diff(ui, repo, *pats, **opts): |
|
2039 | 2039 | """diff of the current patch and subsequent modifications |
|
2040 | 2040 | |
|
2041 | 2041 | Shows a diff which includes the current patch as well as any |
|
2042 | 2042 | changes which have been made in the working directory since the |
|
2043 | 2043 | last refresh (thus showing what the current patch would become |
|
2044 | 2044 | after a qrefresh). |
|
2045 | 2045 | |
|
2046 | 2046 | Use :hg:`diff` if you only want to see the changes made since the |
|
2047 | 2047 | last qrefresh, or :hg:`export qtip` if you want to see changes |
|
2048 | 2048 | made by the current patch without including changes made since the |
|
2049 | 2049 | qrefresh. |
|
2050 | 2050 | """ |
|
2051 | 2051 | repo.mq.diff(repo, pats, opts) |
|
2052 | 2052 | return 0 |
|
2053 | 2053 | |
|
2054 | 2054 | def fold(ui, repo, *files, **opts): |
|
2055 | 2055 | """fold the named patches into the current patch |
|
2056 | 2056 | |
|
2057 | 2057 | Patches must not yet be applied. Each patch will be successively |
|
2058 | 2058 | applied to the current patch in the order given. If all the |
|
2059 | 2059 | patches apply successfully, the current patch will be refreshed |
|
2060 | 2060 | with the new cumulative patch, and the folded patches will be |
|
2061 | 2061 | deleted. With -k/--keep, the folded patch files will not be |
|
2062 | 2062 | removed afterwards. |
|
2063 | 2063 | |
|
2064 | 2064 | The header for each folded patch will be concatenated with the |
|
2065 | 2065 | current patch header, separated by a line of '* * *'.""" |
|
2066 | 2066 | |
|
2067 | 2067 | q = repo.mq |
|
2068 | 2068 | |
|
2069 | 2069 | if not files: |
|
2070 | 2070 | raise util.Abort(_('qfold requires at least one patch name')) |
|
2071 | 2071 | if not q.check_toppatch(repo)[0]: |
|
2072 | 2072 | raise util.Abort(_('No patches applied')) |
|
2073 | 2073 | q.check_localchanges(repo) |
|
2074 | 2074 | |
|
2075 | 2075 | message = cmdutil.logmessage(opts) |
|
2076 | 2076 | if opts['edit']: |
|
2077 | 2077 | if message: |
|
2078 | 2078 | raise util.Abort(_('option "-e" incompatible with "-m" or "-l"')) |
|
2079 | 2079 | |
|
2080 | 2080 | parent = q.lookup('qtip') |
|
2081 | 2081 | patches = [] |
|
2082 | 2082 | messages = [] |
|
2083 | 2083 | for f in files: |
|
2084 | 2084 | p = q.lookup(f) |
|
2085 | 2085 | if p in patches or p == parent: |
|
2086 | 2086 | ui.warn(_('Skipping already folded patch %s') % p) |
|
2087 | 2087 | if q.isapplied(p): |
|
2088 | 2088 | raise util.Abort(_('qfold cannot fold already applied patch %s') % p) |
|
2089 | 2089 | patches.append(p) |
|
2090 | 2090 | |
|
2091 | 2091 | for p in patches: |
|
2092 | 2092 | if not message: |
|
2093 | 2093 | ph = patchheader(q.join(p), q.plainmode) |
|
2094 | 2094 | if ph.message: |
|
2095 | 2095 | messages.append(ph.message) |
|
2096 | 2096 | pf = q.join(p) |
|
2097 | 2097 | (patchsuccess, files, fuzz) = q.patch(repo, pf) |
|
2098 | 2098 | if not patchsuccess: |
|
2099 | 2099 | raise util.Abort(_('Error folding patch %s') % p) |
|
2100 | 2100 | patch.updatedir(ui, repo, files) |
|
2101 | 2101 | |
|
2102 | 2102 | if not message: |
|
2103 | 2103 | ph = patchheader(q.join(parent), q.plainmode) |
|
2104 | 2104 | message, user = ph.message, ph.user |
|
2105 | 2105 | for msg in messages: |
|
2106 | 2106 | message.append('* * *') |
|
2107 | 2107 | message.extend(msg) |
|
2108 | 2108 | message = '\n'.join(message) |
|
2109 | 2109 | |
|
2110 | 2110 | if opts['edit']: |
|
2111 | 2111 | message = ui.edit(message, user or ui.username()) |
|
2112 | 2112 | |
|
2113 | 2113 | diffopts = q.patchopts(q.diffopts(), *patches) |
|
2114 | 2114 | q.refresh(repo, msg=message, git=diffopts.git) |
|
2115 | 2115 | q.delete(repo, patches, opts) |
|
2116 | 2116 | q.save_dirty() |
|
2117 | 2117 | |
|
2118 | 2118 | def goto(ui, repo, patch, **opts): |
|
2119 | 2119 | '''push or pop patches until named patch is at top of stack''' |
|
2120 | 2120 | q = repo.mq |
|
2121 | 2121 | patch = q.lookup(patch) |
|
2122 | 2122 | if q.isapplied(patch): |
|
2123 | 2123 | ret = q.pop(repo, patch, force=opts['force']) |
|
2124 | 2124 | else: |
|
2125 | 2125 | ret = q.push(repo, patch, force=opts['force']) |
|
2126 | 2126 | q.save_dirty() |
|
2127 | 2127 | return ret |
|
2128 | 2128 | |
|
2129 | 2129 | def guard(ui, repo, *args, **opts): |
|
2130 | 2130 | '''set or print guards for a patch |
|
2131 | 2131 | |
|
2132 | 2132 | Guards control whether a patch can be pushed. A patch with no |
|
2133 | 2133 | guards is always pushed. A patch with a positive guard ("+foo") is |
|
2134 | 2134 | pushed only if the qselect command has activated it. A patch with |
|
2135 | 2135 | a negative guard ("-foo") is never pushed if the qselect command |
|
2136 | 2136 | has activated it. |
|
2137 | 2137 | |
|
2138 | 2138 | With no arguments, print the currently active guards. |
|
2139 | 2139 | With arguments, set guards for the named patch. |
|
2140 | 2140 | NOTE: Specifying negative guards now requires '--'. |
|
2141 | 2141 | |
|
2142 | 2142 | To set guards on another patch:: |
|
2143 | 2143 | |
|
2144 | 2144 | hg qguard other.patch -- +2.6.17 -stable |
|
2145 | 2145 | ''' |
|
2146 | 2146 | def status(idx): |
|
2147 | 2147 | guards = q.series_guards[idx] or ['unguarded'] |
|
2148 |
|
|
|
2148 | ui.write('%s: ' % ui.label(q.series[idx], 'qguard.patch')) | |
|
2149 | 2149 | for i, guard in enumerate(guards): |
|
2150 | 2150 | if guard.startswith('+'): |
|
2151 |
|
|
|
2151 | ui.write(guard, label='qguard.positive') | |
|
2152 | 2152 | elif guard.startswith('-'): |
|
2153 |
|
|
|
2153 | ui.write(guard, label='qguard.negative') | |
|
2154 | 2154 | else: |
|
2155 |
|
|
|
2155 | ui.write(guard, label='qguard.unguarded') | |
|
2156 | 2156 | if i != len(guards) - 1: |
|
2157 |
|
|
|
2158 | ui.write(''.join(out) + '\n', label='ui.labeled') | |
|
2157 | ui.write(' ') | |
|
2158 | ui.write('\n') | |
|
2159 | 2159 | q = repo.mq |
|
2160 | 2160 | patch = None |
|
2161 | 2161 | args = list(args) |
|
2162 | 2162 | if opts['list']: |
|
2163 | 2163 | if args or opts['none']: |
|
2164 | 2164 | raise util.Abort(_('cannot mix -l/--list with options or arguments')) |
|
2165 | 2165 | for i in xrange(len(q.series)): |
|
2166 | 2166 | status(i) |
|
2167 | 2167 | return |
|
2168 | 2168 | if not args or args[0][0:1] in '-+': |
|
2169 | 2169 | if not q.applied: |
|
2170 | 2170 | raise util.Abort(_('no patches applied')) |
|
2171 | 2171 | patch = q.applied[-1].name |
|
2172 | 2172 | if patch is None and args[0][0:1] not in '-+': |
|
2173 | 2173 | patch = args.pop(0) |
|
2174 | 2174 | if patch is None: |
|
2175 | 2175 | raise util.Abort(_('no patch to work with')) |
|
2176 | 2176 | if args or opts['none']: |
|
2177 | 2177 | idx = q.find_series(patch) |
|
2178 | 2178 | if idx is None: |
|
2179 | 2179 | raise util.Abort(_('no patch named %s') % patch) |
|
2180 | 2180 | q.set_guards(idx, args) |
|
2181 | 2181 | q.save_dirty() |
|
2182 | 2182 | else: |
|
2183 | 2183 | status(q.series.index(q.lookup(patch))) |
|
2184 | 2184 | |
|
2185 | 2185 | def header(ui, repo, patch=None): |
|
2186 | 2186 | """print the header of the topmost or specified patch""" |
|
2187 | 2187 | q = repo.mq |
|
2188 | 2188 | |
|
2189 | 2189 | if patch: |
|
2190 | 2190 | patch = q.lookup(patch) |
|
2191 | 2191 | else: |
|
2192 | 2192 | if not q.applied: |
|
2193 | 2193 | ui.write(_('no patches applied\n')) |
|
2194 | 2194 | return 1 |
|
2195 | 2195 | patch = q.lookup('qtip') |
|
2196 | 2196 | ph = patchheader(q.join(patch), q.plainmode) |
|
2197 | 2197 | |
|
2198 | 2198 | ui.write('\n'.join(ph.message) + '\n') |
|
2199 | 2199 | |
|
2200 | 2200 | def lastsavename(path): |
|
2201 | 2201 | (directory, base) = os.path.split(path) |
|
2202 | 2202 | names = os.listdir(directory) |
|
2203 | 2203 | namere = re.compile("%s.([0-9]+)" % base) |
|
2204 | 2204 | maxindex = None |
|
2205 | 2205 | maxname = None |
|
2206 | 2206 | for f in names: |
|
2207 | 2207 | m = namere.match(f) |
|
2208 | 2208 | if m: |
|
2209 | 2209 | index = int(m.group(1)) |
|
2210 | 2210 | if maxindex is None or index > maxindex: |
|
2211 | 2211 | maxindex = index |
|
2212 | 2212 | maxname = f |
|
2213 | 2213 | if maxname: |
|
2214 | 2214 | return (os.path.join(directory, maxname), maxindex) |
|
2215 | 2215 | return (None, None) |
|
2216 | 2216 | |
|
2217 | 2217 | def savename(path): |
|
2218 | 2218 | (last, index) = lastsavename(path) |
|
2219 | 2219 | if last is None: |
|
2220 | 2220 | index = 0 |
|
2221 | 2221 | newpath = path + ".%d" % (index + 1) |
|
2222 | 2222 | return newpath |
|
2223 | 2223 | |
|
2224 | 2224 | def push(ui, repo, patch=None, **opts): |
|
2225 | 2225 | """push the next patch onto the stack |
|
2226 | 2226 | |
|
2227 | 2227 | When -f/--force is applied, all local changes in patched files |
|
2228 | 2228 | will be lost. |
|
2229 | 2229 | """ |
|
2230 | 2230 | q = repo.mq |
|
2231 | 2231 | mergeq = None |
|
2232 | 2232 | |
|
2233 | 2233 | if opts['merge']: |
|
2234 | 2234 | if opts['name']: |
|
2235 | 2235 | newpath = repo.join(opts['name']) |
|
2236 | 2236 | else: |
|
2237 | 2237 | newpath, i = lastsavename(q.path) |
|
2238 | 2238 | if not newpath: |
|
2239 | 2239 | ui.warn(_("no saved queues found, please use -n\n")) |
|
2240 | 2240 | return 1 |
|
2241 | 2241 | mergeq = queue(ui, repo.join(""), newpath) |
|
2242 | 2242 | ui.warn(_("merging with queue at: %s\n") % mergeq.path) |
|
2243 | 2243 | ret = q.push(repo, patch, force=opts['force'], list=opts['list'], |
|
2244 | 2244 | mergeq=mergeq, all=opts.get('all'), move=opts.get('move')) |
|
2245 | 2245 | return ret |
|
2246 | 2246 | |
|
2247 | 2247 | def pop(ui, repo, patch=None, **opts): |
|
2248 | 2248 | """pop the current patch off the stack |
|
2249 | 2249 | |
|
2250 | 2250 | By default, pops off the top of the patch stack. If given a patch |
|
2251 | 2251 | name, keeps popping off patches until the named patch is at the |
|
2252 | 2252 | top of the stack. |
|
2253 | 2253 | """ |
|
2254 | 2254 | localupdate = True |
|
2255 | 2255 | if opts['name']: |
|
2256 | 2256 | q = queue(ui, repo.join(""), repo.join(opts['name'])) |
|
2257 | 2257 | ui.warn(_('using patch queue: %s\n') % q.path) |
|
2258 | 2258 | localupdate = False |
|
2259 | 2259 | else: |
|
2260 | 2260 | q = repo.mq |
|
2261 | 2261 | ret = q.pop(repo, patch, force=opts['force'], update=localupdate, |
|
2262 | 2262 | all=opts['all']) |
|
2263 | 2263 | q.save_dirty() |
|
2264 | 2264 | return ret |
|
2265 | 2265 | |
|
2266 | 2266 | def rename(ui, repo, patch, name=None, **opts): |
|
2267 | 2267 | """rename a patch |
|
2268 | 2268 | |
|
2269 | 2269 | With one argument, renames the current patch to PATCH1. |
|
2270 | 2270 | With two arguments, renames PATCH1 to PATCH2.""" |
|
2271 | 2271 | |
|
2272 | 2272 | q = repo.mq |
|
2273 | 2273 | |
|
2274 | 2274 | if not name: |
|
2275 | 2275 | name = patch |
|
2276 | 2276 | patch = None |
|
2277 | 2277 | |
|
2278 | 2278 | if patch: |
|
2279 | 2279 | patch = q.lookup(patch) |
|
2280 | 2280 | else: |
|
2281 | 2281 | if not q.applied: |
|
2282 | 2282 | ui.write(_('no patches applied\n')) |
|
2283 | 2283 | return |
|
2284 | 2284 | patch = q.lookup('qtip') |
|
2285 | 2285 | absdest = q.join(name) |
|
2286 | 2286 | if os.path.isdir(absdest): |
|
2287 | 2287 | name = normname(os.path.join(name, os.path.basename(patch))) |
|
2288 | 2288 | absdest = q.join(name) |
|
2289 | 2289 | if os.path.exists(absdest): |
|
2290 | 2290 | raise util.Abort(_('%s already exists') % absdest) |
|
2291 | 2291 | |
|
2292 | 2292 | if name in q.series: |
|
2293 | 2293 | raise util.Abort( |
|
2294 | 2294 | _('A patch named %s already exists in the series file') % name) |
|
2295 | 2295 | |
|
2296 | 2296 | ui.note(_('renaming %s to %s\n') % (patch, name)) |
|
2297 | 2297 | i = q.find_series(patch) |
|
2298 | 2298 | guards = q.guard_re.findall(q.full_series[i]) |
|
2299 | 2299 | q.full_series[i] = name + ''.join([' #' + g for g in guards]) |
|
2300 | 2300 | q.parse_series() |
|
2301 | 2301 | q.series_dirty = 1 |
|
2302 | 2302 | |
|
2303 | 2303 | info = q.isapplied(patch) |
|
2304 | 2304 | if info: |
|
2305 | 2305 | q.applied[info[0]] = statusentry(info[1], name) |
|
2306 | 2306 | q.applied_dirty = 1 |
|
2307 | 2307 | |
|
2308 | 2308 | util.rename(q.join(patch), absdest) |
|
2309 | 2309 | r = q.qrepo() |
|
2310 | 2310 | if r: |
|
2311 | 2311 | wlock = r.wlock() |
|
2312 | 2312 | try: |
|
2313 | 2313 | if r.dirstate[patch] == 'a': |
|
2314 | 2314 | r.dirstate.forget(patch) |
|
2315 | 2315 | r.dirstate.add(name) |
|
2316 | 2316 | else: |
|
2317 | 2317 | if r.dirstate[name] == 'r': |
|
2318 | 2318 | r.undelete([name]) |
|
2319 | 2319 | r.copy(patch, name) |
|
2320 | 2320 | r.remove([patch], False) |
|
2321 | 2321 | finally: |
|
2322 | 2322 | wlock.release() |
|
2323 | 2323 | |
|
2324 | 2324 | q.save_dirty() |
|
2325 | 2325 | |
|
2326 | 2326 | def restore(ui, repo, rev, **opts): |
|
2327 | 2327 | """restore the queue state saved by a revision (DEPRECATED) |
|
2328 | 2328 | |
|
2329 | 2329 | This command is deprecated, use rebase --mq instead.""" |
|
2330 | 2330 | rev = repo.lookup(rev) |
|
2331 | 2331 | q = repo.mq |
|
2332 | 2332 | q.restore(repo, rev, delete=opts['delete'], |
|
2333 | 2333 | qupdate=opts['update']) |
|
2334 | 2334 | q.save_dirty() |
|
2335 | 2335 | return 0 |
|
2336 | 2336 | |
|
2337 | 2337 | def save(ui, repo, **opts): |
|
2338 | 2338 | """save current queue state (DEPRECATED) |
|
2339 | 2339 | |
|
2340 | 2340 | This command is deprecated, use rebase --mq instead.""" |
|
2341 | 2341 | q = repo.mq |
|
2342 | 2342 | message = cmdutil.logmessage(opts) |
|
2343 | 2343 | ret = q.save(repo, msg=message) |
|
2344 | 2344 | if ret: |
|
2345 | 2345 | return ret |
|
2346 | 2346 | q.save_dirty() |
|
2347 | 2347 | if opts['copy']: |
|
2348 | 2348 | path = q.path |
|
2349 | 2349 | if opts['name']: |
|
2350 | 2350 | newpath = os.path.join(q.basepath, opts['name']) |
|
2351 | 2351 | if os.path.exists(newpath): |
|
2352 | 2352 | if not os.path.isdir(newpath): |
|
2353 | 2353 | raise util.Abort(_('destination %s exists and is not ' |
|
2354 | 2354 | 'a directory') % newpath) |
|
2355 | 2355 | if not opts['force']: |
|
2356 | 2356 | raise util.Abort(_('destination %s exists, ' |
|
2357 | 2357 | 'use -f to force') % newpath) |
|
2358 | 2358 | else: |
|
2359 | 2359 | newpath = savename(path) |
|
2360 | 2360 | ui.warn(_("copy %s to %s\n") % (path, newpath)) |
|
2361 | 2361 | util.copyfiles(path, newpath) |
|
2362 | 2362 | if opts['empty']: |
|
2363 | 2363 | try: |
|
2364 | 2364 | os.unlink(q.join(q.status_path)) |
|
2365 | 2365 | except: |
|
2366 | 2366 | pass |
|
2367 | 2367 | return 0 |
|
2368 | 2368 | |
|
2369 | 2369 | def strip(ui, repo, rev, **opts): |
|
2370 | 2370 | """strip a changeset and all its descendants from the repository |
|
2371 | 2371 | |
|
2372 | 2372 | The strip command removes all changesets whose local revision |
|
2373 | 2373 | number is greater than or equal to REV, and then restores any |
|
2374 | 2374 | changesets that are not descendants of REV. If the working |
|
2375 | 2375 | directory has uncommitted changes, the operation is aborted unless |
|
2376 | 2376 | the --force flag is supplied. |
|
2377 | 2377 | |
|
2378 | 2378 | If a parent of the working directory is stripped, then the working |
|
2379 | 2379 | directory will automatically be updated to the most recent |
|
2380 | 2380 | available ancestor of the stripped parent after the operation |
|
2381 | 2381 | completes. |
|
2382 | 2382 | |
|
2383 | 2383 | Any stripped changesets are stored in ``.hg/strip-backup`` as a |
|
2384 | 2384 | bundle (see :hg:`help bundle` and :hg:`help unbundle`). They can |
|
2385 | 2385 | be restored by running :hg:`unbundle .hg/strip-backup/BUNDLE`, |
|
2386 | 2386 | where BUNDLE is the bundle file created by the strip. Note that |
|
2387 | 2387 | the local revision numbers will in general be different after the |
|
2388 | 2388 | restore. |
|
2389 | 2389 | |
|
2390 | 2390 | Use the --nobackup option to discard the backup bundle once the |
|
2391 | 2391 | operation completes. |
|
2392 | 2392 | """ |
|
2393 | 2393 | backup = 'all' |
|
2394 | 2394 | if opts['backup']: |
|
2395 | 2395 | backup = 'strip' |
|
2396 | 2396 | elif opts['nobackup']: |
|
2397 | 2397 | backup = 'none' |
|
2398 | 2398 | |
|
2399 | 2399 | rev = repo.lookup(rev) |
|
2400 | 2400 | p = repo.dirstate.parents() |
|
2401 | 2401 | cl = repo.changelog |
|
2402 | 2402 | update = True |
|
2403 | 2403 | if p[0] == nullid: |
|
2404 | 2404 | update = False |
|
2405 | 2405 | elif p[1] == nullid and rev != cl.ancestor(p[0], rev): |
|
2406 | 2406 | update = False |
|
2407 | 2407 | elif rev not in (cl.ancestor(p[0], rev), cl.ancestor(p[1], rev)): |
|
2408 | 2408 | update = False |
|
2409 | 2409 | |
|
2410 | 2410 | repo.mq.strip(repo, rev, backup=backup, update=update, force=opts['force']) |
|
2411 | 2411 | return 0 |
|
2412 | 2412 | |
|
2413 | 2413 | def select(ui, repo, *args, **opts): |
|
2414 | 2414 | '''set or print guarded patches to push |
|
2415 | 2415 | |
|
2416 | 2416 | Use the qguard command to set or print guards on patch, then use |
|
2417 | 2417 | qselect to tell mq which guards to use. A patch will be pushed if |
|
2418 | 2418 | it has no guards or any positive guards match the currently |
|
2419 | 2419 | selected guard, but will not be pushed if any negative guards |
|
2420 | 2420 | match the current guard. For example:: |
|
2421 | 2421 | |
|
2422 | 2422 | qguard foo.patch -stable (negative guard) |
|
2423 | 2423 | qguard bar.patch +stable (positive guard) |
|
2424 | 2424 | qselect stable |
|
2425 | 2425 | |
|
2426 | 2426 | This activates the "stable" guard. mq will skip foo.patch (because |
|
2427 | 2427 | it has a negative match) but push bar.patch (because it has a |
|
2428 | 2428 | positive match). |
|
2429 | 2429 | |
|
2430 | 2430 | With no arguments, prints the currently active guards. |
|
2431 | 2431 | With one argument, sets the active guard. |
|
2432 | 2432 | |
|
2433 | 2433 | Use -n/--none to deactivate guards (no other arguments needed). |
|
2434 | 2434 | When no guards are active, patches with positive guards are |
|
2435 | 2435 | skipped and patches with negative guards are pushed. |
|
2436 | 2436 | |
|
2437 | 2437 | qselect can change the guards on applied patches. It does not pop |
|
2438 | 2438 | guarded patches by default. Use --pop to pop back to the last |
|
2439 | 2439 | applied patch that is not guarded. Use --reapply (which implies |
|
2440 | 2440 | --pop) to push back to the current patch afterwards, but skip |
|
2441 | 2441 | guarded patches. |
|
2442 | 2442 | |
|
2443 | 2443 | Use -s/--series to print a list of all guards in the series file |
|
2444 | 2444 | (no other arguments needed). Use -v for more information.''' |
|
2445 | 2445 | |
|
2446 | 2446 | q = repo.mq |
|
2447 | 2447 | guards = q.active() |
|
2448 | 2448 | if args or opts['none']: |
|
2449 | 2449 | old_unapplied = q.unapplied(repo) |
|
2450 | 2450 | old_guarded = [i for i in xrange(len(q.applied)) if |
|
2451 | 2451 | not q.pushable(i)[0]] |
|
2452 | 2452 | q.set_active(args) |
|
2453 | 2453 | q.save_dirty() |
|
2454 | 2454 | if not args: |
|
2455 | 2455 | ui.status(_('guards deactivated\n')) |
|
2456 | 2456 | if not opts['pop'] and not opts['reapply']: |
|
2457 | 2457 | unapplied = q.unapplied(repo) |
|
2458 | 2458 | guarded = [i for i in xrange(len(q.applied)) |
|
2459 | 2459 | if not q.pushable(i)[0]] |
|
2460 | 2460 | if len(unapplied) != len(old_unapplied): |
|
2461 | 2461 | ui.status(_('number of unguarded, unapplied patches has ' |
|
2462 | 2462 | 'changed from %d to %d\n') % |
|
2463 | 2463 | (len(old_unapplied), len(unapplied))) |
|
2464 | 2464 | if len(guarded) != len(old_guarded): |
|
2465 | 2465 | ui.status(_('number of guarded, applied patches has changed ' |
|
2466 | 2466 | 'from %d to %d\n') % |
|
2467 | 2467 | (len(old_guarded), len(guarded))) |
|
2468 | 2468 | elif opts['series']: |
|
2469 | 2469 | guards = {} |
|
2470 | 2470 | noguards = 0 |
|
2471 | 2471 | for gs in q.series_guards: |
|
2472 | 2472 | if not gs: |
|
2473 | 2473 | noguards += 1 |
|
2474 | 2474 | for g in gs: |
|
2475 | 2475 | guards.setdefault(g, 0) |
|
2476 | 2476 | guards[g] += 1 |
|
2477 | 2477 | if ui.verbose: |
|
2478 | 2478 | guards['NONE'] = noguards |
|
2479 | 2479 | guards = guards.items() |
|
2480 | 2480 | guards.sort(key=lambda x: x[0][1:]) |
|
2481 | 2481 | if guards: |
|
2482 | 2482 | ui.note(_('guards in series file:\n')) |
|
2483 | 2483 | for guard, count in guards: |
|
2484 | 2484 | ui.note('%2d ' % count) |
|
2485 | 2485 | ui.write(guard, '\n') |
|
2486 | 2486 | else: |
|
2487 | 2487 | ui.note(_('no guards in series file\n')) |
|
2488 | 2488 | else: |
|
2489 | 2489 | if guards: |
|
2490 | 2490 | ui.note(_('active guards:\n')) |
|
2491 | 2491 | for g in guards: |
|
2492 | 2492 | ui.write(g, '\n') |
|
2493 | 2493 | else: |
|
2494 | 2494 | ui.write(_('no active guards\n')) |
|
2495 | 2495 | reapply = opts['reapply'] and q.applied and q.appliedname(-1) |
|
2496 | 2496 | popped = False |
|
2497 | 2497 | if opts['pop'] or opts['reapply']: |
|
2498 | 2498 | for i in xrange(len(q.applied)): |
|
2499 | 2499 | pushable, reason = q.pushable(i) |
|
2500 | 2500 | if not pushable: |
|
2501 | 2501 | ui.status(_('popping guarded patches\n')) |
|
2502 | 2502 | popped = True |
|
2503 | 2503 | if i == 0: |
|
2504 | 2504 | q.pop(repo, all=True) |
|
2505 | 2505 | else: |
|
2506 | 2506 | q.pop(repo, i - 1) |
|
2507 | 2507 | break |
|
2508 | 2508 | if popped: |
|
2509 | 2509 | try: |
|
2510 | 2510 | if reapply: |
|
2511 | 2511 | ui.status(_('reapplying unguarded patches\n')) |
|
2512 | 2512 | q.push(repo, reapply) |
|
2513 | 2513 | finally: |
|
2514 | 2514 | q.save_dirty() |
|
2515 | 2515 | |
|
2516 | 2516 | def finish(ui, repo, *revrange, **opts): |
|
2517 | 2517 | """move applied patches into repository history |
|
2518 | 2518 | |
|
2519 | 2519 | Finishes the specified revisions (corresponding to applied |
|
2520 | 2520 | patches) by moving them out of mq control into regular repository |
|
2521 | 2521 | history. |
|
2522 | 2522 | |
|
2523 | 2523 | Accepts a revision range or the -a/--applied option. If --applied |
|
2524 | 2524 | is specified, all applied mq revisions are removed from mq |
|
2525 | 2525 | control. Otherwise, the given revisions must be at the base of the |
|
2526 | 2526 | stack of applied patches. |
|
2527 | 2527 | |
|
2528 | 2528 | This can be especially useful if your changes have been applied to |
|
2529 | 2529 | an upstream repository, or if you are about to push your changes |
|
2530 | 2530 | to upstream. |
|
2531 | 2531 | """ |
|
2532 | 2532 | if not opts['applied'] and not revrange: |
|
2533 | 2533 | raise util.Abort(_('no revisions specified')) |
|
2534 | 2534 | elif opts['applied']: |
|
2535 | 2535 | revrange = ('qbase:qtip',) + revrange |
|
2536 | 2536 | |
|
2537 | 2537 | q = repo.mq |
|
2538 | 2538 | if not q.applied: |
|
2539 | 2539 | ui.status(_('no patches applied\n')) |
|
2540 | 2540 | return 0 |
|
2541 | 2541 | |
|
2542 | 2542 | revs = cmdutil.revrange(repo, revrange) |
|
2543 | 2543 | q.finish(repo, revs) |
|
2544 | 2544 | q.save_dirty() |
|
2545 | 2545 | return 0 |
|
2546 | 2546 | |
|
2547 | 2547 | def qqueue(ui, repo, name=None, **opts): |
|
2548 | 2548 | '''manage multiple patch queues |
|
2549 | 2549 | |
|
2550 | 2550 | Supports switching between different patch queues, as well as creating |
|
2551 | 2551 | new patch queues and deleting existing ones. |
|
2552 | 2552 | |
|
2553 | 2553 | Omitting a queue name or specifying -l/--list will show you the registered |
|
2554 | 2554 | queues - by default the "normal" patches queue is registered. The currently |
|
2555 | 2555 | active queue will be marked with "(active)". |
|
2556 | 2556 | |
|
2557 | 2557 | To create a new queue, use -c/--create. The queue is automatically made |
|
2558 | 2558 | active, except in the case where there are applied patches from the |
|
2559 | 2559 | currently active queue in the repository. Then the queue will only be |
|
2560 | 2560 | created and switching will fail. |
|
2561 | 2561 | |
|
2562 | 2562 | To delete an existing queue, use --delete. You cannot delete the currently |
|
2563 | 2563 | active queue. |
|
2564 | 2564 | ''' |
|
2565 | 2565 | |
|
2566 | 2566 | q = repo.mq |
|
2567 | 2567 | |
|
2568 | 2568 | _defaultqueue = 'patches' |
|
2569 | 2569 | _allqueues = 'patches.queues' |
|
2570 | 2570 | _activequeue = 'patches.queue' |
|
2571 | 2571 | |
|
2572 | 2572 | def _getcurrent(): |
|
2573 | 2573 | cur = os.path.basename(q.path) |
|
2574 | 2574 | if cur.startswith('patches-'): |
|
2575 | 2575 | cur = cur[8:] |
|
2576 | 2576 | return cur |
|
2577 | 2577 | |
|
2578 | 2578 | def _noqueues(): |
|
2579 | 2579 | try: |
|
2580 | 2580 | fh = repo.opener(_allqueues, 'r') |
|
2581 | 2581 | fh.close() |
|
2582 | 2582 | except IOError: |
|
2583 | 2583 | return True |
|
2584 | 2584 | |
|
2585 | 2585 | return False |
|
2586 | 2586 | |
|
2587 | 2587 | def _getqueues(): |
|
2588 | 2588 | current = _getcurrent() |
|
2589 | 2589 | |
|
2590 | 2590 | try: |
|
2591 | 2591 | fh = repo.opener(_allqueues, 'r') |
|
2592 | 2592 | queues = [queue.strip() for queue in fh if queue.strip()] |
|
2593 | 2593 | if current not in queues: |
|
2594 | 2594 | queues.append(current) |
|
2595 | 2595 | except IOError: |
|
2596 | 2596 | queues = [_defaultqueue] |
|
2597 | 2597 | |
|
2598 | 2598 | return sorted(queues) |
|
2599 | 2599 | |
|
2600 | 2600 | def _setactive(name): |
|
2601 | 2601 | if q.applied: |
|
2602 | 2602 | raise util.Abort(_('patches applied - cannot set new queue active')) |
|
2603 | 2603 | |
|
2604 | 2604 | fh = repo.opener(_activequeue, 'w') |
|
2605 | 2605 | if name != 'patches': |
|
2606 | 2606 | fh.write(name) |
|
2607 | 2607 | fh.close() |
|
2608 | 2608 | |
|
2609 | 2609 | def _addqueue(name): |
|
2610 | 2610 | fh = repo.opener(_allqueues, 'a') |
|
2611 | 2611 | fh.write('%s\n' % (name,)) |
|
2612 | 2612 | fh.close() |
|
2613 | 2613 | |
|
2614 | 2614 | def _validname(name): |
|
2615 | 2615 | for n in name: |
|
2616 | 2616 | if n in ':\\/.': |
|
2617 | 2617 | return False |
|
2618 | 2618 | return True |
|
2619 | 2619 | |
|
2620 | 2620 | if not name or opts.get('list'): |
|
2621 | 2621 | current = _getcurrent() |
|
2622 | 2622 | for queue in _getqueues(): |
|
2623 | 2623 | ui.write('%s' % (queue,)) |
|
2624 | 2624 | if queue == current: |
|
2625 | 2625 | ui.write(_(' (active)\n')) |
|
2626 | 2626 | else: |
|
2627 | 2627 | ui.write('\n') |
|
2628 | 2628 | return |
|
2629 | 2629 | |
|
2630 | 2630 | if not _validname(name): |
|
2631 | 2631 | raise util.Abort( |
|
2632 | 2632 | _('invalid queue name, may not contain the characters ":\\/."')) |
|
2633 | 2633 | |
|
2634 | 2634 | existing = _getqueues() |
|
2635 | 2635 | |
|
2636 | 2636 | if opts.get('create'): |
|
2637 | 2637 | if name in existing: |
|
2638 | 2638 | raise util.Abort(_('queue "%s" already exists') % name) |
|
2639 | 2639 | if _noqueues(): |
|
2640 | 2640 | _addqueue(_defaultqueue) |
|
2641 | 2641 | _addqueue(name) |
|
2642 | 2642 | _setactive(name) |
|
2643 | 2643 | elif opts.get('delete'): |
|
2644 | 2644 | if name not in existing: |
|
2645 | 2645 | raise util.Abort(_('cannot delete queue that does not exist')) |
|
2646 | 2646 | |
|
2647 | 2647 | current = _getcurrent() |
|
2648 | 2648 | |
|
2649 | 2649 | if name == current: |
|
2650 | 2650 | raise util.Abort(_('cannot delete currently active queue')) |
|
2651 | 2651 | |
|
2652 | 2652 | fh = repo.opener('patches.queues.new', 'w') |
|
2653 | 2653 | for queue in existing: |
|
2654 | 2654 | if queue == name: |
|
2655 | 2655 | continue |
|
2656 | 2656 | fh.write('%s\n' % (queue,)) |
|
2657 | 2657 | fh.close() |
|
2658 | 2658 | util.rename(repo.join('patches.queues.new'), repo.join(_allqueues)) |
|
2659 | 2659 | else: |
|
2660 | 2660 | if name not in existing: |
|
2661 | 2661 | raise util.Abort(_('use --create to create a new queue')) |
|
2662 | 2662 | _setactive(name) |
|
2663 | 2663 | |
|
2664 | 2664 | def reposetup(ui, repo): |
|
2665 | 2665 | class mqrepo(repo.__class__): |
|
2666 | 2666 | @util.propertycache |
|
2667 | 2667 | def mq(self): |
|
2668 | 2668 | return queue(self.ui, self.join("")) |
|
2669 | 2669 | |
|
2670 | 2670 | def abort_if_wdir_patched(self, errmsg, force=False): |
|
2671 | 2671 | if self.mq.applied and not force: |
|
2672 | 2672 | parent = self.dirstate.parents()[0] |
|
2673 | 2673 | if parent in [s.node for s in self.mq.applied]: |
|
2674 | 2674 | raise util.Abort(errmsg) |
|
2675 | 2675 | |
|
2676 | 2676 | def commit(self, text="", user=None, date=None, match=None, |
|
2677 | 2677 | force=False, editor=False, extra={}): |
|
2678 | 2678 | self.abort_if_wdir_patched( |
|
2679 | 2679 | _('cannot commit over an applied mq patch'), |
|
2680 | 2680 | force) |
|
2681 | 2681 | |
|
2682 | 2682 | return super(mqrepo, self).commit(text, user, date, match, force, |
|
2683 | 2683 | editor, extra) |
|
2684 | 2684 | |
|
2685 | 2685 | def push(self, remote, force=False, revs=None, newbranch=False): |
|
2686 | 2686 | if self.mq.applied and not force and not revs: |
|
2687 | 2687 | raise util.Abort(_('source has mq patches applied')) |
|
2688 | 2688 | return super(mqrepo, self).push(remote, force, revs, newbranch) |
|
2689 | 2689 | |
|
2690 | 2690 | def _findtags(self): |
|
2691 | 2691 | '''augment tags from base class with patch tags''' |
|
2692 | 2692 | result = super(mqrepo, self)._findtags() |
|
2693 | 2693 | |
|
2694 | 2694 | q = self.mq |
|
2695 | 2695 | if not q.applied: |
|
2696 | 2696 | return result |
|
2697 | 2697 | |
|
2698 | 2698 | mqtags = [(patch.node, patch.name) for patch in q.applied] |
|
2699 | 2699 | |
|
2700 | 2700 | if mqtags[-1][0] not in self.changelog.nodemap: |
|
2701 | 2701 | self.ui.warn(_('mq status file refers to unknown node %s\n') |
|
2702 | 2702 | % short(mqtags[-1][0])) |
|
2703 | 2703 | return result |
|
2704 | 2704 | |
|
2705 | 2705 | mqtags.append((mqtags[-1][0], 'qtip')) |
|
2706 | 2706 | mqtags.append((mqtags[0][0], 'qbase')) |
|
2707 | 2707 | mqtags.append((self.changelog.parents(mqtags[0][0])[0], 'qparent')) |
|
2708 | 2708 | tags = result[0] |
|
2709 | 2709 | for patch in mqtags: |
|
2710 | 2710 | if patch[1] in tags: |
|
2711 | 2711 | self.ui.warn(_('Tag %s overrides mq patch of the same name\n') |
|
2712 | 2712 | % patch[1]) |
|
2713 | 2713 | else: |
|
2714 | 2714 | tags[patch[1]] = patch[0] |
|
2715 | 2715 | |
|
2716 | 2716 | return result |
|
2717 | 2717 | |
|
2718 | 2718 | def _branchtags(self, partial, lrev): |
|
2719 | 2719 | q = self.mq |
|
2720 | 2720 | if not q.applied: |
|
2721 | 2721 | return super(mqrepo, self)._branchtags(partial, lrev) |
|
2722 | 2722 | |
|
2723 | 2723 | cl = self.changelog |
|
2724 | 2724 | qbasenode = q.applied[0].node |
|
2725 | 2725 | if qbasenode not in cl.nodemap: |
|
2726 | 2726 | self.ui.warn(_('mq status file refers to unknown node %s\n') |
|
2727 | 2727 | % short(qbasenode)) |
|
2728 | 2728 | return super(mqrepo, self)._branchtags(partial, lrev) |
|
2729 | 2729 | |
|
2730 | 2730 | qbase = cl.rev(qbasenode) |
|
2731 | 2731 | start = lrev + 1 |
|
2732 | 2732 | if start < qbase: |
|
2733 | 2733 | # update the cache (excluding the patches) and save it |
|
2734 | 2734 | ctxgen = (self[r] for r in xrange(lrev + 1, qbase)) |
|
2735 | 2735 | self._updatebranchcache(partial, ctxgen) |
|
2736 | 2736 | self._writebranchcache(partial, cl.node(qbase - 1), qbase - 1) |
|
2737 | 2737 | start = qbase |
|
2738 | 2738 | # if start = qbase, the cache is as updated as it should be. |
|
2739 | 2739 | # if start > qbase, the cache includes (part of) the patches. |
|
2740 | 2740 | # we might as well use it, but we won't save it. |
|
2741 | 2741 | |
|
2742 | 2742 | # update the cache up to the tip |
|
2743 | 2743 | ctxgen = (self[r] for r in xrange(start, len(cl))) |
|
2744 | 2744 | self._updatebranchcache(partial, ctxgen) |
|
2745 | 2745 | |
|
2746 | 2746 | return partial |
|
2747 | 2747 | |
|
2748 | 2748 | if repo.local(): |
|
2749 | 2749 | repo.__class__ = mqrepo |
|
2750 | 2750 | |
|
2751 | 2751 | def mqimport(orig, ui, repo, *args, **kwargs): |
|
2752 | 2752 | if (hasattr(repo, 'abort_if_wdir_patched') |
|
2753 | 2753 | and not kwargs.get('no_commit', False)): |
|
2754 | 2754 | repo.abort_if_wdir_patched(_('cannot import over an applied patch'), |
|
2755 | 2755 | kwargs.get('force')) |
|
2756 | 2756 | return orig(ui, repo, *args, **kwargs) |
|
2757 | 2757 | |
|
2758 | 2758 | def mqinit(orig, ui, *args, **kwargs): |
|
2759 | 2759 | mq = kwargs.pop('mq', None) |
|
2760 | 2760 | |
|
2761 | 2761 | if not mq: |
|
2762 | 2762 | return orig(ui, *args, **kwargs) |
|
2763 | 2763 | |
|
2764 | 2764 | if args: |
|
2765 | 2765 | repopath = args[0] |
|
2766 | 2766 | if not hg.islocal(repopath): |
|
2767 | 2767 | raise util.Abort(_('only a local queue repository ' |
|
2768 | 2768 | 'may be initialized')) |
|
2769 | 2769 | else: |
|
2770 | 2770 | repopath = cmdutil.findrepo(os.getcwd()) |
|
2771 | 2771 | if not repopath: |
|
2772 | 2772 | raise util.Abort(_('There is no Mercurial repository here ' |
|
2773 | 2773 | '(.hg not found)')) |
|
2774 | 2774 | repo = hg.repository(ui, repopath) |
|
2775 | 2775 | return qinit(ui, repo, True) |
|
2776 | 2776 | |
|
2777 | 2777 | def mqcommand(orig, ui, repo, *args, **kwargs): |
|
2778 | 2778 | """Add --mq option to operate on patch repository instead of main""" |
|
2779 | 2779 | |
|
2780 | 2780 | # some commands do not like getting unknown options |
|
2781 | 2781 | mq = kwargs.pop('mq', None) |
|
2782 | 2782 | |
|
2783 | 2783 | if not mq: |
|
2784 | 2784 | return orig(ui, repo, *args, **kwargs) |
|
2785 | 2785 | |
|
2786 | 2786 | q = repo.mq |
|
2787 | 2787 | r = q.qrepo() |
|
2788 | 2788 | if not r: |
|
2789 | 2789 | raise util.Abort(_('no queue repository')) |
|
2790 | 2790 | return orig(r.ui, r, *args, **kwargs) |
|
2791 | 2791 | |
|
2792 | 2792 | def summary(orig, ui, repo, *args, **kwargs): |
|
2793 | 2793 | r = orig(ui, repo, *args, **kwargs) |
|
2794 | 2794 | q = repo.mq |
|
2795 | 2795 | m = [] |
|
2796 | 2796 | a, u = len(q.applied), len(q.unapplied(repo)) |
|
2797 | 2797 | if a: |
|
2798 | 2798 | m.append(ui.label(_("%d applied"), 'qseries.applied') % a) |
|
2799 | 2799 | if u: |
|
2800 | 2800 | m.append(ui.label(_("%d unapplied"), 'qseries.unapplied') % u) |
|
2801 | 2801 | if m: |
|
2802 | ui.write("mq: ") | |
|
2803 | ui.write(', '.join(m) + '\n', label='ui.labeled') | |
|
2802 | ui.write("mq: %s\n" % ', '.join(m)) | |
|
2804 | 2803 | else: |
|
2805 | 2804 | ui.note(_("mq: (empty queue)\n")) |
|
2806 | 2805 | return r |
|
2807 | 2806 | |
|
2808 | 2807 | def uisetup(ui): |
|
2809 | 2808 | mqopt = [('', 'mq', None, _("operate on patch repository"))] |
|
2810 | 2809 | |
|
2811 | 2810 | extensions.wrapcommand(commands.table, 'import', mqimport) |
|
2812 | 2811 | extensions.wrapcommand(commands.table, 'summary', summary) |
|
2813 | 2812 | |
|
2814 | 2813 | entry = extensions.wrapcommand(commands.table, 'init', mqinit) |
|
2815 | 2814 | entry[1].extend(mqopt) |
|
2816 | 2815 | |
|
2817 | 2816 | norepo = commands.norepo.split(" ") |
|
2818 | 2817 | for cmd in commands.table.keys(): |
|
2819 | 2818 | cmd = cmdutil.parsealiases(cmd)[0] |
|
2820 | 2819 | if cmd in norepo: |
|
2821 | 2820 | continue |
|
2822 | 2821 | entry = extensions.wrapcommand(commands.table, cmd, mqcommand) |
|
2823 | 2822 | entry[1].extend(mqopt) |
|
2824 | 2823 | |
|
2825 | 2824 | seriesopts = [('s', 'summary', None, _('print first line of patch header'))] |
|
2826 | 2825 | |
|
2827 | 2826 | cmdtable = { |
|
2828 | 2827 | "qapplied": |
|
2829 | 2828 | (applied, |
|
2830 | 2829 | [('1', 'last', None, _('show only the last patch'))] + seriesopts, |
|
2831 | 2830 | _('hg qapplied [-1] [-s] [PATCH]')), |
|
2832 | 2831 | "qclone": |
|
2833 | 2832 | (clone, |
|
2834 | 2833 | [('', 'pull', None, _('use pull protocol to copy metadata')), |
|
2835 | 2834 | ('U', 'noupdate', None, _('do not update the new working directories')), |
|
2836 | 2835 | ('', 'uncompressed', None, |
|
2837 | 2836 | _('use uncompressed transfer (fast over LAN)')), |
|
2838 | 2837 | ('p', 'patches', '', _('location of source patch repository')), |
|
2839 | 2838 | ] + commands.remoteopts, |
|
2840 | 2839 | _('hg qclone [OPTION]... SOURCE [DEST]')), |
|
2841 | 2840 | "qcommit|qci": |
|
2842 | 2841 | (commit, |
|
2843 | 2842 | commands.table["^commit|ci"][1], |
|
2844 | 2843 | _('hg qcommit [OPTION]... [FILE]...')), |
|
2845 | 2844 | "^qdiff": |
|
2846 | 2845 | (diff, |
|
2847 | 2846 | commands.diffopts + commands.diffopts2 + commands.walkopts, |
|
2848 | 2847 | _('hg qdiff [OPTION]... [FILE]...')), |
|
2849 | 2848 | "qdelete|qremove|qrm": |
|
2850 | 2849 | (delete, |
|
2851 | 2850 | [('k', 'keep', None, _('keep patch file')), |
|
2852 | 2851 | ('r', 'rev', [], _('stop managing a revision (DEPRECATED)'))], |
|
2853 | 2852 | _('hg qdelete [-k] [-r REV]... [PATCH]...')), |
|
2854 | 2853 | 'qfold': |
|
2855 | 2854 | (fold, |
|
2856 | 2855 | [('e', 'edit', None, _('edit patch header')), |
|
2857 | 2856 | ('k', 'keep', None, _('keep folded patch files')), |
|
2858 | 2857 | ] + commands.commitopts, |
|
2859 | 2858 | _('hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH...')), |
|
2860 | 2859 | 'qgoto': |
|
2861 | 2860 | (goto, |
|
2862 | 2861 | [('f', 'force', None, _('overwrite any local changes'))], |
|
2863 | 2862 | _('hg qgoto [OPTION]... PATCH')), |
|
2864 | 2863 | 'qguard': |
|
2865 | 2864 | (guard, |
|
2866 | 2865 | [('l', 'list', None, _('list all patches and guards')), |
|
2867 | 2866 | ('n', 'none', None, _('drop all guards'))], |
|
2868 | 2867 | _('hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]')), |
|
2869 | 2868 | 'qheader': (header, [], _('hg qheader [PATCH]')), |
|
2870 | 2869 | "qimport": |
|
2871 | 2870 | (qimport, |
|
2872 | 2871 | [('e', 'existing', None, _('import file in patch directory')), |
|
2873 | 2872 | ('n', 'name', '', _('name of patch file')), |
|
2874 | 2873 | ('f', 'force', None, _('overwrite existing files')), |
|
2875 | 2874 | ('r', 'rev', [], _('place existing revisions under mq control')), |
|
2876 | 2875 | ('g', 'git', None, _('use git extended diff format')), |
|
2877 | 2876 | ('P', 'push', None, _('qpush after importing'))], |
|
2878 | 2877 | _('hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE...')), |
|
2879 | 2878 | "^qinit": |
|
2880 | 2879 | (init, |
|
2881 | 2880 | [('c', 'create-repo', None, _('create queue repository'))], |
|
2882 | 2881 | _('hg qinit [-c]')), |
|
2883 | 2882 | "^qnew": |
|
2884 | 2883 | (new, |
|
2885 | 2884 | [('e', 'edit', None, _('edit commit message')), |
|
2886 | 2885 | ('f', 'force', None, _('import uncommitted changes (DEPRECATED)')), |
|
2887 | 2886 | ('g', 'git', None, _('use git extended diff format')), |
|
2888 | 2887 | ('U', 'currentuser', None, _('add "From: <current user>" to patch')), |
|
2889 | 2888 | ('u', 'user', '', _('add "From: <given user>" to patch')), |
|
2890 | 2889 | ('D', 'currentdate', None, _('add "Date: <current date>" to patch')), |
|
2891 | 2890 | ('d', 'date', '', _('add "Date: <given date>" to patch')) |
|
2892 | 2891 | ] + commands.walkopts + commands.commitopts, |
|
2893 | 2892 | _('hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]...')), |
|
2894 | 2893 | "qnext": (next, [] + seriesopts, _('hg qnext [-s]')), |
|
2895 | 2894 | "qprev": (prev, [] + seriesopts, _('hg qprev [-s]')), |
|
2896 | 2895 | "^qpop": |
|
2897 | 2896 | (pop, |
|
2898 | 2897 | [('a', 'all', None, _('pop all patches')), |
|
2899 | 2898 | ('n', 'name', '', _('queue name to pop (DEPRECATED)')), |
|
2900 | 2899 | ('f', 'force', None, _('forget any local changes to patched files'))], |
|
2901 | 2900 | _('hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]')), |
|
2902 | 2901 | "^qpush": |
|
2903 | 2902 | (push, |
|
2904 | 2903 | [('f', 'force', None, _('apply if the patch has rejects')), |
|
2905 | 2904 | ('l', 'list', None, _('list patch name in commit text')), |
|
2906 | 2905 | ('a', 'all', None, _('apply all patches')), |
|
2907 | 2906 | ('m', 'merge', None, _('merge from another queue (DEPRECATED)')), |
|
2908 | 2907 | ('n', 'name', '', _('merge queue name (DEPRECATED)')), |
|
2909 | 2908 | ('', 'move', None, _('reorder patch series and apply only the patch'))], |
|
2910 | 2909 | _('hg qpush [-f] [-l] [-a] [-m] [-n NAME] [--move] [PATCH | INDEX]')), |
|
2911 | 2910 | "^qrefresh": |
|
2912 | 2911 | (refresh, |
|
2913 | 2912 | [('e', 'edit', None, _('edit commit message')), |
|
2914 | 2913 | ('g', 'git', None, _('use git extended diff format')), |
|
2915 | 2914 | ('s', 'short', None, |
|
2916 | 2915 | _('refresh only files already in the patch and specified files')), |
|
2917 | 2916 | ('U', 'currentuser', None, |
|
2918 | 2917 | _('add/update author field in patch with current user')), |
|
2919 | 2918 | ('u', 'user', '', |
|
2920 | 2919 | _('add/update author field in patch with given user')), |
|
2921 | 2920 | ('D', 'currentdate', None, |
|
2922 | 2921 | _('add/update date field in patch with current date')), |
|
2923 | 2922 | ('d', 'date', '', |
|
2924 | 2923 | _('add/update date field in patch with given date')) |
|
2925 | 2924 | ] + commands.walkopts + commands.commitopts, |
|
2926 | 2925 | _('hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...')), |
|
2927 | 2926 | 'qrename|qmv': |
|
2928 | 2927 | (rename, [], _('hg qrename PATCH1 [PATCH2]')), |
|
2929 | 2928 | "qrestore": |
|
2930 | 2929 | (restore, |
|
2931 | 2930 | [('d', 'delete', None, _('delete save entry')), |
|
2932 | 2931 | ('u', 'update', None, _('update queue working directory'))], |
|
2933 | 2932 | _('hg qrestore [-d] [-u] REV')), |
|
2934 | 2933 | "qsave": |
|
2935 | 2934 | (save, |
|
2936 | 2935 | [('c', 'copy', None, _('copy patch directory')), |
|
2937 | 2936 | ('n', 'name', '', _('copy directory name')), |
|
2938 | 2937 | ('e', 'empty', None, _('clear queue status file')), |
|
2939 | 2938 | ('f', 'force', None, _('force copy'))] + commands.commitopts, |
|
2940 | 2939 | _('hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]')), |
|
2941 | 2940 | "qselect": |
|
2942 | 2941 | (select, |
|
2943 | 2942 | [('n', 'none', None, _('disable all guards')), |
|
2944 | 2943 | ('s', 'series', None, _('list all guards in series file')), |
|
2945 | 2944 | ('', 'pop', None, _('pop to before first guarded applied patch')), |
|
2946 | 2945 | ('', 'reapply', None, _('pop, then reapply patches'))], |
|
2947 | 2946 | _('hg qselect [OPTION]... [GUARD]...')), |
|
2948 | 2947 | "qseries": |
|
2949 | 2948 | (series, |
|
2950 | 2949 | [('m', 'missing', None, _('print patches not in series')), |
|
2951 | 2950 | ] + seriesopts, |
|
2952 | 2951 | _('hg qseries [-ms]')), |
|
2953 | 2952 | "strip": |
|
2954 | 2953 | (strip, |
|
2955 | 2954 | [('f', 'force', None, _('force removal of changesets even if the ' |
|
2956 | 2955 | 'working directory has uncommitted changes')), |
|
2957 | 2956 | ('b', 'backup', None, _('bundle only changesets with local revision' |
|
2958 | 2957 | ' number greater than REV which are not' |
|
2959 | 2958 | ' descendants of REV (DEPRECATED)')), |
|
2960 | 2959 | ('n', 'nobackup', None, _('no backups'))], |
|
2961 | 2960 | _('hg strip [-f] [-n] REV')), |
|
2962 | 2961 | "qtop": (top, [] + seriesopts, _('hg qtop [-s]')), |
|
2963 | 2962 | "qunapplied": |
|
2964 | 2963 | (unapplied, |
|
2965 | 2964 | [('1', 'first', None, _('show only the first patch'))] + seriesopts, |
|
2966 | 2965 | _('hg qunapplied [-1] [-s] [PATCH]')), |
|
2967 | 2966 | "qfinish": |
|
2968 | 2967 | (finish, |
|
2969 | 2968 | [('a', 'applied', None, _('finish all applied changesets'))], |
|
2970 | 2969 | _('hg qfinish [-a] [REV]...')), |
|
2971 | 2970 | 'qqueue': |
|
2972 | 2971 | (qqueue, |
|
2973 | 2972 | [ |
|
2974 | 2973 | ('l', 'list', False, _('list all available queues')), |
|
2975 | 2974 | ('c', 'create', False, _('create new queue')), |
|
2976 | 2975 | ('', 'delete', False, _('delete reference to queue')), |
|
2977 | 2976 | ], |
|
2978 | 2977 | _('[OPTION] [QUEUE]')), |
|
2979 | 2978 | } |
|
2980 | 2979 | |
|
2981 | 2980 | colortable = {'qguard.negative': 'red', |
|
2982 | 2981 | 'qguard.positive': 'yellow', |
|
2983 | 2982 | 'qguard.unguarded': 'green', |
|
2984 | 2983 | 'qseries.applied': 'blue bold underline', |
|
2985 | 2984 | 'qseries.guarded': 'black bold', |
|
2986 | 2985 | 'qseries.missing': 'red bold', |
|
2987 | 2986 | 'qseries.unapplied': 'black bold'} |
@@ -1,4100 +1,4100 b'' | |||
|
1 | 1 | # commands.py - command processing for mercurial |
|
2 | 2 | # |
|
3 | 3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
4 | 4 | # |
|
5 | 5 | # This software may be used and distributed according to the terms of the |
|
6 | 6 | # GNU General Public License version 2 or any later version. |
|
7 | 7 | |
|
8 | 8 | from node import hex, nullid, nullrev, short |
|
9 | 9 | from lock import release |
|
10 | 10 | from i18n import _, gettext |
|
11 | 11 | import os, re, sys, difflib, time, tempfile |
|
12 | 12 | import hg, util, revlog, bundlerepo, extensions, copies, error |
|
13 | 13 | import patch, help, mdiff, url, encoding, templatekw, discovery |
|
14 | 14 | import archival, changegroup, cmdutil, sshserver, hbisect, hgweb, hgweb.server |
|
15 | 15 | import merge as mergemod |
|
16 | 16 | import minirst, revset |
|
17 | 17 | |
|
18 | 18 | # Commands start here, listed alphabetically |
|
19 | 19 | |
|
20 | 20 | def add(ui, repo, *pats, **opts): |
|
21 | 21 | """add the specified files on the next commit |
|
22 | 22 | |
|
23 | 23 | Schedule files to be version controlled and added to the |
|
24 | 24 | repository. |
|
25 | 25 | |
|
26 | 26 | The files will be added to the repository at the next commit. To |
|
27 | 27 | undo an add before that, see :hg:`forget`. |
|
28 | 28 | |
|
29 | 29 | If no names are given, add all files to the repository. |
|
30 | 30 | |
|
31 | 31 | .. container:: verbose |
|
32 | 32 | |
|
33 | 33 | An example showing how new (unknown) files are added |
|
34 | 34 | automatically by :hg:`add`:: |
|
35 | 35 | |
|
36 | 36 | $ ls |
|
37 | 37 | foo.c |
|
38 | 38 | $ hg status |
|
39 | 39 | ? foo.c |
|
40 | 40 | $ hg add |
|
41 | 41 | adding foo.c |
|
42 | 42 | $ hg status |
|
43 | 43 | A foo.c |
|
44 | 44 | """ |
|
45 | 45 | |
|
46 | 46 | bad = [] |
|
47 | 47 | names = [] |
|
48 | 48 | m = cmdutil.match(repo, pats, opts) |
|
49 | 49 | oldbad = m.bad |
|
50 | 50 | m.bad = lambda x, y: bad.append(x) or oldbad(x, y) |
|
51 | 51 | |
|
52 | 52 | for f in repo.walk(m): |
|
53 | 53 | exact = m.exact(f) |
|
54 | 54 | if exact or f not in repo.dirstate: |
|
55 | 55 | names.append(f) |
|
56 | 56 | if ui.verbose or not exact: |
|
57 | 57 | ui.status(_('adding %s\n') % m.rel(f)) |
|
58 | 58 | if not opts.get('dry_run'): |
|
59 | 59 | bad += [f for f in repo.add(names) if f in m.files()] |
|
60 | 60 | return bad and 1 or 0 |
|
61 | 61 | |
|
62 | 62 | def addremove(ui, repo, *pats, **opts): |
|
63 | 63 | """add all new files, delete all missing files |
|
64 | 64 | |
|
65 | 65 | Add all new files and remove all missing files from the |
|
66 | 66 | repository. |
|
67 | 67 | |
|
68 | 68 | New files are ignored if they match any of the patterns in |
|
69 | 69 | .hgignore. As with add, these changes take effect at the next |
|
70 | 70 | commit. |
|
71 | 71 | |
|
72 | 72 | Use the -s/--similarity option to detect renamed files. With a |
|
73 | 73 | parameter greater than 0, this compares every removed file with |
|
74 | 74 | every added file and records those similar enough as renames. This |
|
75 | 75 | option takes a percentage between 0 (disabled) and 100 (files must |
|
76 | 76 | be identical) as its parameter. Detecting renamed files this way |
|
77 | 77 | can be expensive. |
|
78 | 78 | |
|
79 | 79 | Returns 0 if all files are successfully added. |
|
80 | 80 | """ |
|
81 | 81 | try: |
|
82 | 82 | sim = float(opts.get('similarity') or 0) |
|
83 | 83 | except ValueError: |
|
84 | 84 | raise util.Abort(_('similarity must be a number')) |
|
85 | 85 | if sim < 0 or sim > 100: |
|
86 | 86 | raise util.Abort(_('similarity must be between 0 and 100')) |
|
87 | 87 | return cmdutil.addremove(repo, pats, opts, similarity=sim / 100.0) |
|
88 | 88 | |
|
89 | 89 | def annotate(ui, repo, *pats, **opts): |
|
90 | 90 | """show changeset information by line for each file |
|
91 | 91 | |
|
92 | 92 | List changes in files, showing the revision id responsible for |
|
93 | 93 | each line |
|
94 | 94 | |
|
95 | 95 | This command is useful for discovering when a change was made and |
|
96 | 96 | by whom. |
|
97 | 97 | |
|
98 | 98 | Without the -a/--text option, annotate will avoid processing files |
|
99 | 99 | it detects as binary. With -a, annotate will annotate the file |
|
100 | 100 | anyway, although the results will probably be neither useful |
|
101 | 101 | nor desirable. |
|
102 | 102 | |
|
103 | 103 | Returns 0 on success. |
|
104 | 104 | """ |
|
105 | 105 | if opts.get('follow'): |
|
106 | 106 | # --follow is deprecated and now just an alias for -f/--file |
|
107 | 107 | # to mimic the behavior of Mercurial before version 1.5 |
|
108 | 108 | opts['file'] = 1 |
|
109 | 109 | |
|
110 | 110 | datefunc = ui.quiet and util.shortdate or util.datestr |
|
111 | 111 | getdate = util.cachefunc(lambda x: datefunc(x[0].date())) |
|
112 | 112 | |
|
113 | 113 | if not pats: |
|
114 | 114 | raise util.Abort(_('at least one filename or pattern is required')) |
|
115 | 115 | |
|
116 | 116 | opmap = [('user', lambda x: ui.shortuser(x[0].user())), |
|
117 | 117 | ('number', lambda x: str(x[0].rev())), |
|
118 | 118 | ('changeset', lambda x: short(x[0].node())), |
|
119 | 119 | ('date', getdate), |
|
120 | 120 | ('file', lambda x: x[0].path()), |
|
121 | 121 | ] |
|
122 | 122 | |
|
123 | 123 | if (not opts.get('user') and not opts.get('changeset') |
|
124 | 124 | and not opts.get('date') and not opts.get('file')): |
|
125 | 125 | opts['number'] = 1 |
|
126 | 126 | |
|
127 | 127 | linenumber = opts.get('line_number') is not None |
|
128 | 128 | if linenumber and (not opts.get('changeset')) and (not opts.get('number')): |
|
129 | 129 | raise util.Abort(_('at least one of -n/-c is required for -l')) |
|
130 | 130 | |
|
131 | 131 | funcmap = [func for op, func in opmap if opts.get(op)] |
|
132 | 132 | if linenumber: |
|
133 | 133 | lastfunc = funcmap[-1] |
|
134 | 134 | funcmap[-1] = lambda x: "%s:%s" % (lastfunc(x), x[1]) |
|
135 | 135 | |
|
136 | 136 | ctx = repo[opts.get('rev')] |
|
137 | 137 | m = cmdutil.match(repo, pats, opts) |
|
138 | 138 | follow = not opts.get('no_follow') |
|
139 | 139 | for abs in ctx.walk(m): |
|
140 | 140 | fctx = ctx[abs] |
|
141 | 141 | if not opts.get('text') and util.binary(fctx.data()): |
|
142 | 142 | ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs)) |
|
143 | 143 | continue |
|
144 | 144 | |
|
145 | 145 | lines = fctx.annotate(follow=follow, linenumber=linenumber) |
|
146 | 146 | pieces = [] |
|
147 | 147 | |
|
148 | 148 | for f in funcmap: |
|
149 | 149 | l = [f(n) for n, dummy in lines] |
|
150 | 150 | if l: |
|
151 | 151 | ml = max(map(len, l)) |
|
152 | 152 | pieces.append(["%*s" % (ml, x) for x in l]) |
|
153 | 153 | |
|
154 | 154 | if pieces: |
|
155 | 155 | for p, l in zip(zip(*pieces), lines): |
|
156 | 156 | ui.write("%s: %s" % (" ".join(p), l[1])) |
|
157 | 157 | |
|
158 | 158 | def archive(ui, repo, dest, **opts): |
|
159 | 159 | '''create an unversioned archive of a repository revision |
|
160 | 160 | |
|
161 | 161 | By default, the revision used is the parent of the working |
|
162 | 162 | directory; use -r/--rev to specify a different revision. |
|
163 | 163 | |
|
164 | 164 | The archive type is automatically detected based on file |
|
165 | 165 | extension (or override using -t/--type). |
|
166 | 166 | |
|
167 | 167 | Valid types are: |
|
168 | 168 | |
|
169 | 169 | :``files``: a directory full of files (default) |
|
170 | 170 | :``tar``: tar archive, uncompressed |
|
171 | 171 | :``tbz2``: tar archive, compressed using bzip2 |
|
172 | 172 | :``tgz``: tar archive, compressed using gzip |
|
173 | 173 | :``uzip``: zip archive, uncompressed |
|
174 | 174 | :``zip``: zip archive, compressed using deflate |
|
175 | 175 | |
|
176 | 176 | The exact name of the destination archive or directory is given |
|
177 | 177 | using a format string; see :hg:`help export` for details. |
|
178 | 178 | |
|
179 | 179 | Each member added to an archive file has a directory prefix |
|
180 | 180 | prepended. Use -p/--prefix to specify a format string for the |
|
181 | 181 | prefix. The default is the basename of the archive, with suffixes |
|
182 | 182 | removed. |
|
183 | 183 | |
|
184 | 184 | Returns 0 on success. |
|
185 | 185 | ''' |
|
186 | 186 | |
|
187 | 187 | ctx = repo[opts.get('rev')] |
|
188 | 188 | if not ctx: |
|
189 | 189 | raise util.Abort(_('no working directory: please specify a revision')) |
|
190 | 190 | node = ctx.node() |
|
191 | 191 | dest = cmdutil.make_filename(repo, dest, node) |
|
192 | 192 | if os.path.realpath(dest) == repo.root: |
|
193 | 193 | raise util.Abort(_('repository root cannot be destination')) |
|
194 | 194 | |
|
195 | 195 | def guess_type(): |
|
196 | 196 | exttypes = { |
|
197 | 197 | 'tar': ['.tar'], |
|
198 | 198 | 'tbz2': ['.tbz2', '.tar.bz2'], |
|
199 | 199 | 'tgz': ['.tgz', '.tar.gz'], |
|
200 | 200 | 'zip': ['.zip'], |
|
201 | 201 | } |
|
202 | 202 | |
|
203 | 203 | for type, extensions in exttypes.items(): |
|
204 | 204 | if util.any(dest.endswith(ext) for ext in extensions): |
|
205 | 205 | return type |
|
206 | 206 | return None |
|
207 | 207 | |
|
208 | 208 | kind = opts.get('type') or guess_type() or 'files' |
|
209 | 209 | prefix = opts.get('prefix') |
|
210 | 210 | |
|
211 | 211 | if dest == '-': |
|
212 | 212 | if kind == 'files': |
|
213 | 213 | raise util.Abort(_('cannot archive plain files to stdout')) |
|
214 | 214 | dest = sys.stdout |
|
215 | 215 | if not prefix: |
|
216 | 216 | prefix = os.path.basename(repo.root) + '-%h' |
|
217 | 217 | |
|
218 | 218 | prefix = cmdutil.make_filename(repo, prefix, node) |
|
219 | 219 | matchfn = cmdutil.match(repo, [], opts) |
|
220 | 220 | archival.archive(repo, dest, node, kind, not opts.get('no_decode'), |
|
221 | 221 | matchfn, prefix) |
|
222 | 222 | |
|
223 | 223 | def backout(ui, repo, node=None, rev=None, **opts): |
|
224 | 224 | '''reverse effect of earlier changeset |
|
225 | 225 | |
|
226 | 226 | Commit the backed out changes as a new changeset. The new |
|
227 | 227 | changeset is a child of the backed out changeset. |
|
228 | 228 | |
|
229 | 229 | If you backout a changeset other than the tip, a new head is |
|
230 | 230 | created. This head will be the new tip and you should merge this |
|
231 | 231 | backout changeset with another head. |
|
232 | 232 | |
|
233 | 233 | The --merge option remembers the parent of the working directory |
|
234 | 234 | before starting the backout, then merges the new head with that |
|
235 | 235 | changeset afterwards. This saves you from doing the merge by hand. |
|
236 | 236 | The result of this merge is not committed, as with a normal merge. |
|
237 | 237 | |
|
238 | 238 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
239 | 239 | |
|
240 | 240 | Returns 0 on success. |
|
241 | 241 | ''' |
|
242 | 242 | if rev and node: |
|
243 | 243 | raise util.Abort(_("please specify just one revision")) |
|
244 | 244 | |
|
245 | 245 | if not rev: |
|
246 | 246 | rev = node |
|
247 | 247 | |
|
248 | 248 | if not rev: |
|
249 | 249 | raise util.Abort(_("please specify a revision to backout")) |
|
250 | 250 | |
|
251 | 251 | date = opts.get('date') |
|
252 | 252 | if date: |
|
253 | 253 | opts['date'] = util.parsedate(date) |
|
254 | 254 | |
|
255 | 255 | cmdutil.bail_if_changed(repo) |
|
256 | 256 | node = repo.lookup(rev) |
|
257 | 257 | |
|
258 | 258 | op1, op2 = repo.dirstate.parents() |
|
259 | 259 | a = repo.changelog.ancestor(op1, node) |
|
260 | 260 | if a != node: |
|
261 | 261 | raise util.Abort(_('cannot backout change on a different branch')) |
|
262 | 262 | |
|
263 | 263 | p1, p2 = repo.changelog.parents(node) |
|
264 | 264 | if p1 == nullid: |
|
265 | 265 | raise util.Abort(_('cannot backout a change with no parents')) |
|
266 | 266 | if p2 != nullid: |
|
267 | 267 | if not opts.get('parent'): |
|
268 | 268 | raise util.Abort(_('cannot backout a merge changeset without ' |
|
269 | 269 | '--parent')) |
|
270 | 270 | p = repo.lookup(opts['parent']) |
|
271 | 271 | if p not in (p1, p2): |
|
272 | 272 | raise util.Abort(_('%s is not a parent of %s') % |
|
273 | 273 | (short(p), short(node))) |
|
274 | 274 | parent = p |
|
275 | 275 | else: |
|
276 | 276 | if opts.get('parent'): |
|
277 | 277 | raise util.Abort(_('cannot use --parent on non-merge changeset')) |
|
278 | 278 | parent = p1 |
|
279 | 279 | |
|
280 | 280 | # the backout should appear on the same branch |
|
281 | 281 | branch = repo.dirstate.branch() |
|
282 | 282 | hg.clean(repo, node, show_stats=False) |
|
283 | 283 | repo.dirstate.setbranch(branch) |
|
284 | 284 | revert_opts = opts.copy() |
|
285 | 285 | revert_opts['date'] = None |
|
286 | 286 | revert_opts['all'] = True |
|
287 | 287 | revert_opts['rev'] = hex(parent) |
|
288 | 288 | revert_opts['no_backup'] = None |
|
289 | 289 | revert(ui, repo, **revert_opts) |
|
290 | 290 | commit_opts = opts.copy() |
|
291 | 291 | commit_opts['addremove'] = False |
|
292 | 292 | if not commit_opts['message'] and not commit_opts['logfile']: |
|
293 | 293 | # we don't translate commit messages |
|
294 | 294 | commit_opts['message'] = "Backed out changeset %s" % short(node) |
|
295 | 295 | commit_opts['force_editor'] = True |
|
296 | 296 | commit(ui, repo, **commit_opts) |
|
297 | 297 | def nice(node): |
|
298 | 298 | return '%d:%s' % (repo.changelog.rev(node), short(node)) |
|
299 | 299 | ui.status(_('changeset %s backs out changeset %s\n') % |
|
300 | 300 | (nice(repo.changelog.tip()), nice(node))) |
|
301 | 301 | if op1 != node: |
|
302 | 302 | hg.clean(repo, op1, show_stats=False) |
|
303 | 303 | if opts.get('merge'): |
|
304 | 304 | ui.status(_('merging with changeset %s\n') |
|
305 | 305 | % nice(repo.changelog.tip())) |
|
306 | 306 | hg.merge(repo, hex(repo.changelog.tip())) |
|
307 | 307 | else: |
|
308 | 308 | ui.status(_('the backout changeset is a new head - ' |
|
309 | 309 | 'do not forget to merge\n')) |
|
310 | 310 | ui.status(_('(use "backout --merge" ' |
|
311 | 311 | 'if you want to auto-merge)\n')) |
|
312 | 312 | |
|
313 | 313 | def bisect(ui, repo, rev=None, extra=None, command=None, |
|
314 | 314 | reset=None, good=None, bad=None, skip=None, noupdate=None): |
|
315 | 315 | """subdivision search of changesets |
|
316 | 316 | |
|
317 | 317 | This command helps to find changesets which introduce problems. To |
|
318 | 318 | use, mark the earliest changeset you know exhibits the problem as |
|
319 | 319 | bad, then mark the latest changeset which is free from the problem |
|
320 | 320 | as good. Bisect will update your working directory to a revision |
|
321 | 321 | for testing (unless the -U/--noupdate option is specified). Once |
|
322 | 322 | you have performed tests, mark the working directory as good or |
|
323 | 323 | bad, and bisect will either update to another candidate changeset |
|
324 | 324 | or announce that it has found the bad revision. |
|
325 | 325 | |
|
326 | 326 | As a shortcut, you can also use the revision argument to mark a |
|
327 | 327 | revision as good or bad without checking it out first. |
|
328 | 328 | |
|
329 | 329 | If you supply a command, it will be used for automatic bisection. |
|
330 | 330 | Its exit status will be used to mark revisions as good or bad: |
|
331 | 331 | status 0 means good, 125 means to skip the revision, 127 |
|
332 | 332 | (command not found) will abort the bisection, and any other |
|
333 | 333 | non-zero exit status means the revision is bad. |
|
334 | 334 | |
|
335 | 335 | Returns 0 on success. |
|
336 | 336 | """ |
|
337 | 337 | def print_result(nodes, good): |
|
338 | 338 | displayer = cmdutil.show_changeset(ui, repo, {}) |
|
339 | 339 | if len(nodes) == 1: |
|
340 | 340 | # narrowed it down to a single revision |
|
341 | 341 | if good: |
|
342 | 342 | ui.write(_("The first good revision is:\n")) |
|
343 | 343 | else: |
|
344 | 344 | ui.write(_("The first bad revision is:\n")) |
|
345 | 345 | displayer.show(repo[nodes[0]]) |
|
346 | 346 | else: |
|
347 | 347 | # multiple possible revisions |
|
348 | 348 | if good: |
|
349 | 349 | ui.write(_("Due to skipped revisions, the first " |
|
350 | 350 | "good revision could be any of:\n")) |
|
351 | 351 | else: |
|
352 | 352 | ui.write(_("Due to skipped revisions, the first " |
|
353 | 353 | "bad revision could be any of:\n")) |
|
354 | 354 | for n in nodes: |
|
355 | 355 | displayer.show(repo[n]) |
|
356 | 356 | displayer.close() |
|
357 | 357 | |
|
358 | 358 | def check_state(state, interactive=True): |
|
359 | 359 | if not state['good'] or not state['bad']: |
|
360 | 360 | if (good or bad or skip or reset) and interactive: |
|
361 | 361 | return |
|
362 | 362 | if not state['good']: |
|
363 | 363 | raise util.Abort(_('cannot bisect (no known good revisions)')) |
|
364 | 364 | else: |
|
365 | 365 | raise util.Abort(_('cannot bisect (no known bad revisions)')) |
|
366 | 366 | return True |
|
367 | 367 | |
|
368 | 368 | # backward compatibility |
|
369 | 369 | if rev in "good bad reset init".split(): |
|
370 | 370 | ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n")) |
|
371 | 371 | cmd, rev, extra = rev, extra, None |
|
372 | 372 | if cmd == "good": |
|
373 | 373 | good = True |
|
374 | 374 | elif cmd == "bad": |
|
375 | 375 | bad = True |
|
376 | 376 | else: |
|
377 | 377 | reset = True |
|
378 | 378 | elif extra or good + bad + skip + reset + bool(command) > 1: |
|
379 | 379 | raise util.Abort(_('incompatible arguments')) |
|
380 | 380 | |
|
381 | 381 | if reset: |
|
382 | 382 | p = repo.join("bisect.state") |
|
383 | 383 | if os.path.exists(p): |
|
384 | 384 | os.unlink(p) |
|
385 | 385 | return |
|
386 | 386 | |
|
387 | 387 | state = hbisect.load_state(repo) |
|
388 | 388 | |
|
389 | 389 | if command: |
|
390 | 390 | changesets = 1 |
|
391 | 391 | try: |
|
392 | 392 | while changesets: |
|
393 | 393 | # update state |
|
394 | 394 | status = util.system(command) |
|
395 | 395 | if status == 125: |
|
396 | 396 | transition = "skip" |
|
397 | 397 | elif status == 0: |
|
398 | 398 | transition = "good" |
|
399 | 399 | # status < 0 means process was killed |
|
400 | 400 | elif status == 127: |
|
401 | 401 | raise util.Abort(_("failed to execute %s") % command) |
|
402 | 402 | elif status < 0: |
|
403 | 403 | raise util.Abort(_("%s killed") % command) |
|
404 | 404 | else: |
|
405 | 405 | transition = "bad" |
|
406 | 406 | ctx = repo[rev or '.'] |
|
407 | 407 | state[transition].append(ctx.node()) |
|
408 | 408 | ui.status(_('Changeset %d:%s: %s\n') % (ctx, ctx, transition)) |
|
409 | 409 | check_state(state, interactive=False) |
|
410 | 410 | # bisect |
|
411 | 411 | nodes, changesets, good = hbisect.bisect(repo.changelog, state) |
|
412 | 412 | # update to next check |
|
413 | 413 | cmdutil.bail_if_changed(repo) |
|
414 | 414 | hg.clean(repo, nodes[0], show_stats=False) |
|
415 | 415 | finally: |
|
416 | 416 | hbisect.save_state(repo, state) |
|
417 | 417 | print_result(nodes, good) |
|
418 | 418 | return |
|
419 | 419 | |
|
420 | 420 | # update state |
|
421 | 421 | node = repo.lookup(rev or '.') |
|
422 | 422 | if good or bad or skip: |
|
423 | 423 | if good: |
|
424 | 424 | state['good'].append(node) |
|
425 | 425 | elif bad: |
|
426 | 426 | state['bad'].append(node) |
|
427 | 427 | elif skip: |
|
428 | 428 | state['skip'].append(node) |
|
429 | 429 | hbisect.save_state(repo, state) |
|
430 | 430 | |
|
431 | 431 | if not check_state(state): |
|
432 | 432 | return |
|
433 | 433 | |
|
434 | 434 | # actually bisect |
|
435 | 435 | nodes, changesets, good = hbisect.bisect(repo.changelog, state) |
|
436 | 436 | if changesets == 0: |
|
437 | 437 | print_result(nodes, good) |
|
438 | 438 | else: |
|
439 | 439 | assert len(nodes) == 1 # only a single node can be tested next |
|
440 | 440 | node = nodes[0] |
|
441 | 441 | # compute the approximate number of remaining tests |
|
442 | 442 | tests, size = 0, 2 |
|
443 | 443 | while size <= changesets: |
|
444 | 444 | tests, size = tests + 1, size * 2 |
|
445 | 445 | rev = repo.changelog.rev(node) |
|
446 | 446 | ui.write(_("Testing changeset %d:%s " |
|
447 | 447 | "(%d changesets remaining, ~%d tests)\n") |
|
448 | 448 | % (rev, short(node), changesets, tests)) |
|
449 | 449 | if not noupdate: |
|
450 | 450 | cmdutil.bail_if_changed(repo) |
|
451 | 451 | return hg.clean(repo, node) |
|
452 | 452 | |
|
453 | 453 | def branch(ui, repo, label=None, **opts): |
|
454 | 454 | """set or show the current branch name |
|
455 | 455 | |
|
456 | 456 | With no argument, show the current branch name. With one argument, |
|
457 | 457 | set the working directory branch name (the branch will not exist |
|
458 | 458 | in the repository until the next commit). Standard practice |
|
459 | 459 | recommends that primary development take place on the 'default' |
|
460 | 460 | branch. |
|
461 | 461 | |
|
462 | 462 | Unless -f/--force is specified, branch will not let you set a |
|
463 | 463 | branch name that already exists, even if it's inactive. |
|
464 | 464 | |
|
465 | 465 | Use -C/--clean to reset the working directory branch to that of |
|
466 | 466 | the parent of the working directory, negating a previous branch |
|
467 | 467 | change. |
|
468 | 468 | |
|
469 | 469 | Use the command :hg:`update` to switch to an existing branch. Use |
|
470 | 470 | :hg:`commit --close-branch` to mark this branch as closed. |
|
471 | 471 | |
|
472 | 472 | Returns 0 on success. |
|
473 | 473 | """ |
|
474 | 474 | |
|
475 | 475 | if opts.get('clean'): |
|
476 | 476 | label = repo[None].parents()[0].branch() |
|
477 | 477 | repo.dirstate.setbranch(label) |
|
478 | 478 | ui.status(_('reset working directory to branch %s\n') % label) |
|
479 | 479 | elif label: |
|
480 | 480 | utflabel = encoding.fromlocal(label) |
|
481 | 481 | if not opts.get('force') and utflabel in repo.branchtags(): |
|
482 | 482 | if label not in [p.branch() for p in repo.parents()]: |
|
483 | 483 | raise util.Abort(_('a branch of the same name already exists' |
|
484 | 484 | " (use 'hg update' to switch to it)")) |
|
485 | 485 | repo.dirstate.setbranch(utflabel) |
|
486 | 486 | ui.status(_('marked working directory as branch %s\n') % label) |
|
487 | 487 | else: |
|
488 | 488 | ui.write("%s\n" % encoding.tolocal(repo.dirstate.branch())) |
|
489 | 489 | |
|
490 | 490 | def branches(ui, repo, active=False, closed=False): |
|
491 | 491 | """list repository named branches |
|
492 | 492 | |
|
493 | 493 | List the repository's named branches, indicating which ones are |
|
494 | 494 | inactive. If -c/--closed is specified, also list branches which have |
|
495 | 495 | been marked closed (see :hg:`commit --close-branch`). |
|
496 | 496 | |
|
497 | 497 | If -a/--active is specified, only show active branches. A branch |
|
498 | 498 | is considered active if it contains repository heads. |
|
499 | 499 | |
|
500 | 500 | Use the command :hg:`update` to switch to an existing branch. |
|
501 | 501 | |
|
502 | 502 | Returns 0. |
|
503 | 503 | """ |
|
504 | 504 | |
|
505 | 505 | hexfunc = ui.debugflag and hex or short |
|
506 | 506 | activebranches = [repo[n].branch() for n in repo.heads()] |
|
507 | 507 | def testactive(tag, node): |
|
508 | 508 | realhead = tag in activebranches |
|
509 | 509 | open = node in repo.branchheads(tag, closed=False) |
|
510 | 510 | return realhead and open |
|
511 | 511 | branches = sorted([(testactive(tag, node), repo.changelog.rev(node), tag) |
|
512 | 512 | for tag, node in repo.branchtags().items()], |
|
513 | 513 | reverse=True) |
|
514 | 514 | |
|
515 | 515 | for isactive, node, tag in branches: |
|
516 | 516 | if (not active) or isactive: |
|
517 | 517 | encodedtag = encoding.tolocal(tag) |
|
518 | 518 | if ui.quiet: |
|
519 | 519 | ui.write("%s\n" % encodedtag) |
|
520 | 520 | else: |
|
521 | 521 | hn = repo.lookup(node) |
|
522 | 522 | if isactive: |
|
523 | 523 | notice = '' |
|
524 | 524 | elif hn not in repo.branchheads(tag, closed=False): |
|
525 | 525 | if not closed: |
|
526 | 526 | continue |
|
527 | 527 | notice = _(' (closed)') |
|
528 | 528 | else: |
|
529 | 529 | notice = _(' (inactive)') |
|
530 | 530 | rev = str(node).rjust(31 - encoding.colwidth(encodedtag)) |
|
531 | 531 | data = encodedtag, rev, hexfunc(hn), notice |
|
532 | 532 | ui.write("%s %s:%s%s\n" % data) |
|
533 | 533 | |
|
534 | 534 | def bundle(ui, repo, fname, dest=None, **opts): |
|
535 | 535 | """create a changegroup file |
|
536 | 536 | |
|
537 | 537 | Generate a compressed changegroup file collecting changesets not |
|
538 | 538 | known to be in another repository. |
|
539 | 539 | |
|
540 | 540 | If you omit the destination repository, then hg assumes the |
|
541 | 541 | destination will have all the nodes you specify with --base |
|
542 | 542 | parameters. To create a bundle containing all changesets, use |
|
543 | 543 | -a/--all (or --base null). |
|
544 | 544 | |
|
545 | 545 | You can change compression method with the -t/--type option. |
|
546 | 546 | The available compression methods are: none, bzip2, and |
|
547 | 547 | gzip (by default, bundles are compressed using bzip2). |
|
548 | 548 | |
|
549 | 549 | The bundle file can then be transferred using conventional means |
|
550 | 550 | and applied to another repository with the unbundle or pull |
|
551 | 551 | command. This is useful when direct push and pull are not |
|
552 | 552 | available or when exporting an entire repository is undesirable. |
|
553 | 553 | |
|
554 | 554 | Applying bundles preserves all changeset contents including |
|
555 | 555 | permissions, copy/rename information, and revision history. |
|
556 | 556 | |
|
557 | 557 | Returns 0 on success, 1 if no changes found. |
|
558 | 558 | """ |
|
559 | 559 | revs = opts.get('rev') or None |
|
560 | 560 | if revs: |
|
561 | 561 | revs = [repo.lookup(rev) for rev in revs] |
|
562 | 562 | if opts.get('all'): |
|
563 | 563 | base = ['null'] |
|
564 | 564 | else: |
|
565 | 565 | base = opts.get('base') |
|
566 | 566 | if base: |
|
567 | 567 | if dest: |
|
568 | 568 | raise util.Abort(_("--base is incompatible with specifying " |
|
569 | 569 | "a destination")) |
|
570 | 570 | base = [repo.lookup(rev) for rev in base] |
|
571 | 571 | # create the right base |
|
572 | 572 | # XXX: nodesbetween / changegroup* should be "fixed" instead |
|
573 | 573 | o = [] |
|
574 | 574 | has = set((nullid,)) |
|
575 | 575 | for n in base: |
|
576 | 576 | has.update(repo.changelog.reachable(n)) |
|
577 | 577 | if revs: |
|
578 | 578 | visit = list(revs) |
|
579 | 579 | has.difference_update(revs) |
|
580 | 580 | else: |
|
581 | 581 | visit = repo.changelog.heads() |
|
582 | 582 | seen = {} |
|
583 | 583 | while visit: |
|
584 | 584 | n = visit.pop(0) |
|
585 | 585 | parents = [p for p in repo.changelog.parents(n) if p not in has] |
|
586 | 586 | if len(parents) == 0: |
|
587 | 587 | if n not in has: |
|
588 | 588 | o.append(n) |
|
589 | 589 | else: |
|
590 | 590 | for p in parents: |
|
591 | 591 | if p not in seen: |
|
592 | 592 | seen[p] = 1 |
|
593 | 593 | visit.append(p) |
|
594 | 594 | else: |
|
595 | 595 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
596 | 596 | dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
597 | 597 | other = hg.repository(hg.remoteui(repo, opts), dest) |
|
598 | 598 | revs, checkout = hg.addbranchrevs(repo, other, branches, revs) |
|
599 | 599 | o = discovery.findoutgoing(repo, other, force=opts.get('force')) |
|
600 | 600 | |
|
601 | 601 | if not o: |
|
602 | 602 | ui.status(_("no changes found\n")) |
|
603 | 603 | return 1 |
|
604 | 604 | |
|
605 | 605 | if revs: |
|
606 | 606 | cg = repo.changegroupsubset(o, revs, 'bundle') |
|
607 | 607 | else: |
|
608 | 608 | cg = repo.changegroup(o, 'bundle') |
|
609 | 609 | |
|
610 | 610 | bundletype = opts.get('type', 'bzip2').lower() |
|
611 | 611 | btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'} |
|
612 | 612 | bundletype = btypes.get(bundletype) |
|
613 | 613 | if bundletype not in changegroup.bundletypes: |
|
614 | 614 | raise util.Abort(_('unknown bundle type specified with --type')) |
|
615 | 615 | |
|
616 | 616 | changegroup.writebundle(cg, fname, bundletype) |
|
617 | 617 | |
|
618 | 618 | def cat(ui, repo, file1, *pats, **opts): |
|
619 | 619 | """output the current or given revision of files |
|
620 | 620 | |
|
621 | 621 | Print the specified files as they were at the given revision. If |
|
622 | 622 | no revision is given, the parent of the working directory is used, |
|
623 | 623 | or tip if no revision is checked out. |
|
624 | 624 | |
|
625 | 625 | Output may be to a file, in which case the name of the file is |
|
626 | 626 | given using a format string. The formatting rules are the same as |
|
627 | 627 | for the export command, with the following additions: |
|
628 | 628 | |
|
629 | 629 | :``%s``: basename of file being printed |
|
630 | 630 | :``%d``: dirname of file being printed, or '.' if in repository root |
|
631 | 631 | :``%p``: root-relative path name of file being printed |
|
632 | 632 | |
|
633 | 633 | Returns 0 on success. |
|
634 | 634 | """ |
|
635 | 635 | ctx = repo[opts.get('rev')] |
|
636 | 636 | err = 1 |
|
637 | 637 | m = cmdutil.match(repo, (file1,) + pats, opts) |
|
638 | 638 | for abs in ctx.walk(m): |
|
639 | 639 | fp = cmdutil.make_file(repo, opts.get('output'), ctx.node(), pathname=abs) |
|
640 | 640 | data = ctx[abs].data() |
|
641 | 641 | if opts.get('decode'): |
|
642 | 642 | data = repo.wwritedata(abs, data) |
|
643 | 643 | fp.write(data) |
|
644 | 644 | err = 0 |
|
645 | 645 | return err |
|
646 | 646 | |
|
647 | 647 | def clone(ui, source, dest=None, **opts): |
|
648 | 648 | """make a copy of an existing repository |
|
649 | 649 | |
|
650 | 650 | Create a copy of an existing repository in a new directory. |
|
651 | 651 | |
|
652 | 652 | If no destination directory name is specified, it defaults to the |
|
653 | 653 | basename of the source. |
|
654 | 654 | |
|
655 | 655 | The location of the source is added to the new repository's |
|
656 | 656 | .hg/hgrc file, as the default to be used for future pulls. |
|
657 | 657 | |
|
658 | 658 | See :hg:`help urls` for valid source format details. |
|
659 | 659 | |
|
660 | 660 | It is possible to specify an ``ssh://`` URL as the destination, but no |
|
661 | 661 | .hg/hgrc and working directory will be created on the remote side. |
|
662 | 662 | Please see :hg:`help urls` for important details about ``ssh://`` URLs. |
|
663 | 663 | |
|
664 | 664 | A set of changesets (tags, or branch names) to pull may be specified |
|
665 | 665 | by listing each changeset (tag, or branch name) with -r/--rev. |
|
666 | 666 | If -r/--rev is used, the cloned repository will contain only a subset |
|
667 | 667 | of the changesets of the source repository. Only the set of changesets |
|
668 | 668 | defined by all -r/--rev options (including all their ancestors) |
|
669 | 669 | will be pulled into the destination repository. |
|
670 | 670 | No subsequent changesets (including subsequent tags) will be present |
|
671 | 671 | in the destination. |
|
672 | 672 | |
|
673 | 673 | Using -r/--rev (or 'clone src#rev dest') implies --pull, even for |
|
674 | 674 | local source repositories. |
|
675 | 675 | |
|
676 | 676 | For efficiency, hardlinks are used for cloning whenever the source |
|
677 | 677 | and destination are on the same filesystem (note this applies only |
|
678 | 678 | to the repository data, not to the working directory). Some |
|
679 | 679 | filesystems, such as AFS, implement hardlinking incorrectly, but |
|
680 | 680 | do not report errors. In these cases, use the --pull option to |
|
681 | 681 | avoid hardlinking. |
|
682 | 682 | |
|
683 | 683 | In some cases, you can clone repositories and the working directory |
|
684 | 684 | using full hardlinks with :: |
|
685 | 685 | |
|
686 | 686 | $ cp -al REPO REPOCLONE |
|
687 | 687 | |
|
688 | 688 | This is the fastest way to clone, but it is not always safe. The |
|
689 | 689 | operation is not atomic (making sure REPO is not modified during |
|
690 | 690 | the operation is up to you) and you have to make sure your editor |
|
691 | 691 | breaks hardlinks (Emacs and most Linux Kernel tools do so). Also, |
|
692 | 692 | this is not compatible with certain extensions that place their |
|
693 | 693 | metadata under the .hg directory, such as mq. |
|
694 | 694 | |
|
695 | 695 | Mercurial will update the working directory to the first applicable |
|
696 | 696 | revision from this list: |
|
697 | 697 | |
|
698 | 698 | a) null if -U or the source repository has no changesets |
|
699 | 699 | b) if -u . and the source repository is local, the first parent of |
|
700 | 700 | the source repository's working directory |
|
701 | 701 | c) the changeset specified with -u (if a branch name, this means the |
|
702 | 702 | latest head of that branch) |
|
703 | 703 | d) the changeset specified with -r |
|
704 | 704 | e) the tipmost head specified with -b |
|
705 | 705 | f) the tipmost head specified with the url#branch source syntax |
|
706 | 706 | g) the tipmost head of the default branch |
|
707 | 707 | h) tip |
|
708 | 708 | |
|
709 | 709 | Returns 0 on success. |
|
710 | 710 | """ |
|
711 | 711 | if opts.get('noupdate') and opts.get('updaterev'): |
|
712 | 712 | raise util.Abort(_("cannot specify both --noupdate and --updaterev")) |
|
713 | 713 | |
|
714 | 714 | r = hg.clone(hg.remoteui(ui, opts), source, dest, |
|
715 | 715 | pull=opts.get('pull'), |
|
716 | 716 | stream=opts.get('uncompressed'), |
|
717 | 717 | rev=opts.get('rev'), |
|
718 | 718 | update=opts.get('updaterev') or not opts.get('noupdate'), |
|
719 | 719 | branch=opts.get('branch')) |
|
720 | 720 | |
|
721 | 721 | return r is None |
|
722 | 722 | |
|
723 | 723 | def commit(ui, repo, *pats, **opts): |
|
724 | 724 | """commit the specified files or all outstanding changes |
|
725 | 725 | |
|
726 | 726 | Commit changes to the given files into the repository. Unlike a |
|
727 | 727 | centralized RCS, this operation is a local operation. See |
|
728 | 728 | :hg:`push` for a way to actively distribute your changes. |
|
729 | 729 | |
|
730 | 730 | If a list of files is omitted, all changes reported by :hg:`status` |
|
731 | 731 | will be committed. |
|
732 | 732 | |
|
733 | 733 | If you are committing the result of a merge, do not provide any |
|
734 | 734 | filenames or -I/-X filters. |
|
735 | 735 | |
|
736 | 736 | If no commit message is specified, the configured editor is |
|
737 | 737 | started to prompt you for a message. |
|
738 | 738 | |
|
739 | 739 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
740 | 740 | |
|
741 | 741 | Returns 0 on success, 1 if nothing changed. |
|
742 | 742 | """ |
|
743 | 743 | extra = {} |
|
744 | 744 | if opts.get('close_branch'): |
|
745 | 745 | if repo['.'].node() not in repo.branchheads(): |
|
746 | 746 | # The topo heads set is included in the branch heads set of the |
|
747 | 747 | # current branch, so it's sufficient to test branchheads |
|
748 | 748 | raise util.Abort(_('can only close branch heads')) |
|
749 | 749 | extra['close'] = 1 |
|
750 | 750 | e = cmdutil.commiteditor |
|
751 | 751 | if opts.get('force_editor'): |
|
752 | 752 | e = cmdutil.commitforceeditor |
|
753 | 753 | |
|
754 | 754 | def commitfunc(ui, repo, message, match, opts): |
|
755 | 755 | return repo.commit(message, opts.get('user'), opts.get('date'), match, |
|
756 | 756 | editor=e, extra=extra) |
|
757 | 757 | |
|
758 | 758 | branch = repo[None].branch() |
|
759 | 759 | bheads = repo.branchheads(branch) |
|
760 | 760 | |
|
761 | 761 | node = cmdutil.commit(ui, repo, commitfunc, pats, opts) |
|
762 | 762 | if not node: |
|
763 | 763 | ui.status(_("nothing changed\n")) |
|
764 | 764 | return 1 |
|
765 | 765 | |
|
766 | 766 | ctx = repo[node] |
|
767 | 767 | parents = ctx.parents() |
|
768 | 768 | |
|
769 | 769 | if bheads and [x for x in parents |
|
770 | 770 | if x.node() not in bheads and x.branch() == branch]: |
|
771 | 771 | ui.status(_('created new head\n')) |
|
772 | 772 | |
|
773 | 773 | if not opts.get('close_branch'): |
|
774 | 774 | for r in parents: |
|
775 | 775 | if r.extra().get('close'): |
|
776 | 776 | ui.status(_('reopening closed branch head %d\n') % r) |
|
777 | 777 | |
|
778 | 778 | if ui.debugflag: |
|
779 | 779 | ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex())) |
|
780 | 780 | elif ui.verbose: |
|
781 | 781 | ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx)) |
|
782 | 782 | |
|
783 | 783 | def copy(ui, repo, *pats, **opts): |
|
784 | 784 | """mark files as copied for the next commit |
|
785 | 785 | |
|
786 | 786 | Mark dest as having copies of source files. If dest is a |
|
787 | 787 | directory, copies are put in that directory. If dest is a file, |
|
788 | 788 | the source must be a single file. |
|
789 | 789 | |
|
790 | 790 | By default, this command copies the contents of files as they |
|
791 | 791 | exist in the working directory. If invoked with -A/--after, the |
|
792 | 792 | operation is recorded, but no copying is performed. |
|
793 | 793 | |
|
794 | 794 | This command takes effect with the next commit. To undo a copy |
|
795 | 795 | before that, see :hg:`revert`. |
|
796 | 796 | |
|
797 | 797 | Returns 0 on success, 1 if errors are encountered. |
|
798 | 798 | """ |
|
799 | 799 | wlock = repo.wlock(False) |
|
800 | 800 | try: |
|
801 | 801 | return cmdutil.copy(ui, repo, pats, opts) |
|
802 | 802 | finally: |
|
803 | 803 | wlock.release() |
|
804 | 804 | |
|
805 | 805 | def debugancestor(ui, repo, *args): |
|
806 | 806 | """find the ancestor revision of two revisions in a given index""" |
|
807 | 807 | if len(args) == 3: |
|
808 | 808 | index, rev1, rev2 = args |
|
809 | 809 | r = revlog.revlog(util.opener(os.getcwd(), audit=False), index) |
|
810 | 810 | lookup = r.lookup |
|
811 | 811 | elif len(args) == 2: |
|
812 | 812 | if not repo: |
|
813 | 813 | raise util.Abort(_("There is no Mercurial repository here " |
|
814 | 814 | "(.hg not found)")) |
|
815 | 815 | rev1, rev2 = args |
|
816 | 816 | r = repo.changelog |
|
817 | 817 | lookup = repo.lookup |
|
818 | 818 | else: |
|
819 | 819 | raise util.Abort(_('either two or three arguments required')) |
|
820 | 820 | a = r.ancestor(lookup(rev1), lookup(rev2)) |
|
821 | 821 | ui.write("%d:%s\n" % (r.rev(a), hex(a))) |
|
822 | 822 | |
|
823 | 823 | def debugcommands(ui, cmd='', *args): |
|
824 | 824 | """list all available commands and options""" |
|
825 | 825 | for cmd, vals in sorted(table.iteritems()): |
|
826 | 826 | cmd = cmd.split('|')[0].strip('^') |
|
827 | 827 | opts = ', '.join([i[1] for i in vals[1]]) |
|
828 | 828 | ui.write('%s: %s\n' % (cmd, opts)) |
|
829 | 829 | |
|
830 | 830 | def debugcomplete(ui, cmd='', **opts): |
|
831 | 831 | """returns the completion list associated with the given command""" |
|
832 | 832 | |
|
833 | 833 | if opts.get('options'): |
|
834 | 834 | options = [] |
|
835 | 835 | otables = [globalopts] |
|
836 | 836 | if cmd: |
|
837 | 837 | aliases, entry = cmdutil.findcmd(cmd, table, False) |
|
838 | 838 | otables.append(entry[1]) |
|
839 | 839 | for t in otables: |
|
840 | 840 | for o in t: |
|
841 | 841 | if "(DEPRECATED)" in o[3]: |
|
842 | 842 | continue |
|
843 | 843 | if o[0]: |
|
844 | 844 | options.append('-%s' % o[0]) |
|
845 | 845 | options.append('--%s' % o[1]) |
|
846 | 846 | ui.write("%s\n" % "\n".join(options)) |
|
847 | 847 | return |
|
848 | 848 | |
|
849 | 849 | cmdlist = cmdutil.findpossible(cmd, table) |
|
850 | 850 | if ui.verbose: |
|
851 | 851 | cmdlist = [' '.join(c[0]) for c in cmdlist.values()] |
|
852 | 852 | ui.write("%s\n" % "\n".join(sorted(cmdlist))) |
|
853 | 853 | |
|
854 | 854 | def debugfsinfo(ui, path = "."): |
|
855 | 855 | """show information detected about current filesystem""" |
|
856 | 856 | open('.debugfsinfo', 'w').write('') |
|
857 | 857 | ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no')) |
|
858 | 858 | ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no')) |
|
859 | 859 | ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo') |
|
860 | 860 | and 'yes' or 'no')) |
|
861 | 861 | os.unlink('.debugfsinfo') |
|
862 | 862 | |
|
863 | 863 | def debugrebuildstate(ui, repo, rev="tip"): |
|
864 | 864 | """rebuild the dirstate as it would look like for the given revision""" |
|
865 | 865 | ctx = repo[rev] |
|
866 | 866 | wlock = repo.wlock() |
|
867 | 867 | try: |
|
868 | 868 | repo.dirstate.rebuild(ctx.node(), ctx.manifest()) |
|
869 | 869 | finally: |
|
870 | 870 | wlock.release() |
|
871 | 871 | |
|
872 | 872 | def debugcheckstate(ui, repo): |
|
873 | 873 | """validate the correctness of the current dirstate""" |
|
874 | 874 | parent1, parent2 = repo.dirstate.parents() |
|
875 | 875 | m1 = repo[parent1].manifest() |
|
876 | 876 | m2 = repo[parent2].manifest() |
|
877 | 877 | errors = 0 |
|
878 | 878 | for f in repo.dirstate: |
|
879 | 879 | state = repo.dirstate[f] |
|
880 | 880 | if state in "nr" and f not in m1: |
|
881 | 881 | ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state)) |
|
882 | 882 | errors += 1 |
|
883 | 883 | if state in "a" and f in m1: |
|
884 | 884 | ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state)) |
|
885 | 885 | errors += 1 |
|
886 | 886 | if state in "m" and f not in m1 and f not in m2: |
|
887 | 887 | ui.warn(_("%s in state %s, but not in either manifest\n") % |
|
888 | 888 | (f, state)) |
|
889 | 889 | errors += 1 |
|
890 | 890 | for f in m1: |
|
891 | 891 | state = repo.dirstate[f] |
|
892 | 892 | if state not in "nrm": |
|
893 | 893 | ui.warn(_("%s in manifest1, but listed as state %s") % (f, state)) |
|
894 | 894 | errors += 1 |
|
895 | 895 | if errors: |
|
896 | 896 | error = _(".hg/dirstate inconsistent with current parent's manifest") |
|
897 | 897 | raise util.Abort(error) |
|
898 | 898 | |
|
899 | 899 | def showconfig(ui, repo, *values, **opts): |
|
900 | 900 | """show combined config settings from all hgrc files |
|
901 | 901 | |
|
902 | 902 | With no arguments, print names and values of all config items. |
|
903 | 903 | |
|
904 | 904 | With one argument of the form section.name, print just the value |
|
905 | 905 | of that config item. |
|
906 | 906 | |
|
907 | 907 | With multiple arguments, print names and values of all config |
|
908 | 908 | items with matching section names. |
|
909 | 909 | |
|
910 | 910 | With --debug, the source (filename and line number) is printed |
|
911 | 911 | for each config item. |
|
912 | 912 | |
|
913 | 913 | Returns 0 on success. |
|
914 | 914 | """ |
|
915 | 915 | |
|
916 | 916 | for f in util.rcpath(): |
|
917 | 917 | ui.debug(_('read config from: %s\n') % f) |
|
918 | 918 | untrusted = bool(opts.get('untrusted')) |
|
919 | 919 | if values: |
|
920 | 920 | if len([v for v in values if '.' in v]) > 1: |
|
921 | 921 | raise util.Abort(_('only one config item permitted')) |
|
922 | 922 | for section, name, value in ui.walkconfig(untrusted=untrusted): |
|
923 | 923 | sectname = section + '.' + name |
|
924 | 924 | if values: |
|
925 | 925 | for v in values: |
|
926 | 926 | if v == section: |
|
927 | 927 | ui.debug('%s: ' % |
|
928 | 928 | ui.configsource(section, name, untrusted)) |
|
929 | 929 | ui.write('%s=%s\n' % (sectname, value)) |
|
930 | 930 | elif v == sectname: |
|
931 | 931 | ui.debug('%s: ' % |
|
932 | 932 | ui.configsource(section, name, untrusted)) |
|
933 | 933 | ui.write(value, '\n') |
|
934 | 934 | else: |
|
935 | 935 | ui.debug('%s: ' % |
|
936 | 936 | ui.configsource(section, name, untrusted)) |
|
937 | 937 | ui.write('%s=%s\n' % (sectname, value)) |
|
938 | 938 | |
|
939 | 939 | def debugrevspec(ui, repo, expr): |
|
940 | 940 | '''parse and apply a revision specification''' |
|
941 | 941 | if ui.verbose: |
|
942 | 942 | tree = revset.parse(expr) |
|
943 | 943 | ui.note(tree, "\n") |
|
944 | 944 | func = revset.match(expr) |
|
945 | 945 | for c in func(repo, range(len(repo))): |
|
946 | 946 | ui.write("%s\n" % c) |
|
947 | 947 | |
|
948 | 948 | def debugsetparents(ui, repo, rev1, rev2=None): |
|
949 | 949 | """manually set the parents of the current working directory |
|
950 | 950 | |
|
951 | 951 | This is useful for writing repository conversion tools, but should |
|
952 | 952 | be used with care. |
|
953 | 953 | |
|
954 | 954 | Returns 0 on success. |
|
955 | 955 | """ |
|
956 | 956 | |
|
957 | 957 | if not rev2: |
|
958 | 958 | rev2 = hex(nullid) |
|
959 | 959 | |
|
960 | 960 | wlock = repo.wlock() |
|
961 | 961 | try: |
|
962 | 962 | repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2)) |
|
963 | 963 | finally: |
|
964 | 964 | wlock.release() |
|
965 | 965 | |
|
966 | 966 | def debugstate(ui, repo, nodates=None): |
|
967 | 967 | """show the contents of the current dirstate""" |
|
968 | 968 | timestr = "" |
|
969 | 969 | showdate = not nodates |
|
970 | 970 | for file_, ent in sorted(repo.dirstate._map.iteritems()): |
|
971 | 971 | if showdate: |
|
972 | 972 | if ent[3] == -1: |
|
973 | 973 | # Pad or slice to locale representation |
|
974 | 974 | locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ", |
|
975 | 975 | time.localtime(0))) |
|
976 | 976 | timestr = 'unset' |
|
977 | 977 | timestr = (timestr[:locale_len] + |
|
978 | 978 | ' ' * (locale_len - len(timestr))) |
|
979 | 979 | else: |
|
980 | 980 | timestr = time.strftime("%Y-%m-%d %H:%M:%S ", |
|
981 | 981 | time.localtime(ent[3])) |
|
982 | 982 | if ent[1] & 020000: |
|
983 | 983 | mode = 'lnk' |
|
984 | 984 | else: |
|
985 | 985 | mode = '%3o' % (ent[1] & 0777) |
|
986 | 986 | ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_)) |
|
987 | 987 | for f in repo.dirstate.copies(): |
|
988 | 988 | ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f)) |
|
989 | 989 | |
|
990 | 990 | def debugsub(ui, repo, rev=None): |
|
991 | 991 | if rev == '': |
|
992 | 992 | rev = None |
|
993 | 993 | for k, v in sorted(repo[rev].substate.items()): |
|
994 | 994 | ui.write('path %s\n' % k) |
|
995 | 995 | ui.write(' source %s\n' % v[0]) |
|
996 | 996 | ui.write(' revision %s\n' % v[1]) |
|
997 | 997 | |
|
998 | 998 | def debugdata(ui, file_, rev): |
|
999 | 999 | """dump the contents of a data file revision""" |
|
1000 | 1000 | r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_[:-2] + ".i") |
|
1001 | 1001 | try: |
|
1002 | 1002 | ui.write(r.revision(r.lookup(rev))) |
|
1003 | 1003 | except KeyError: |
|
1004 | 1004 | raise util.Abort(_('invalid revision identifier %s') % rev) |
|
1005 | 1005 | |
|
1006 | 1006 | def debugdate(ui, date, range=None, **opts): |
|
1007 | 1007 | """parse and display a date""" |
|
1008 | 1008 | if opts["extended"]: |
|
1009 | 1009 | d = util.parsedate(date, util.extendeddateformats) |
|
1010 | 1010 | else: |
|
1011 | 1011 | d = util.parsedate(date) |
|
1012 | 1012 | ui.write("internal: %s %s\n" % d) |
|
1013 | 1013 | ui.write("standard: %s\n" % util.datestr(d)) |
|
1014 | 1014 | if range: |
|
1015 | 1015 | m = util.matchdate(range) |
|
1016 | 1016 | ui.write("match: %s\n" % m(d[0])) |
|
1017 | 1017 | |
|
1018 | 1018 | def debugindex(ui, file_): |
|
1019 | 1019 | """dump the contents of an index file""" |
|
1020 | 1020 | r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_) |
|
1021 | 1021 | ui.write(" rev offset length base linkrev" |
|
1022 | 1022 | " nodeid p1 p2\n") |
|
1023 | 1023 | for i in r: |
|
1024 | 1024 | node = r.node(i) |
|
1025 | 1025 | try: |
|
1026 | 1026 | pp = r.parents(node) |
|
1027 | 1027 | except: |
|
1028 | 1028 | pp = [nullid, nullid] |
|
1029 | 1029 | ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % ( |
|
1030 | 1030 | i, r.start(i), r.length(i), r.base(i), r.linkrev(i), |
|
1031 | 1031 | short(node), short(pp[0]), short(pp[1]))) |
|
1032 | 1032 | |
|
1033 | 1033 | def debugindexdot(ui, file_): |
|
1034 | 1034 | """dump an index DAG as a graphviz dot file""" |
|
1035 | 1035 | r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_) |
|
1036 | 1036 | ui.write("digraph G {\n") |
|
1037 | 1037 | for i in r: |
|
1038 | 1038 | node = r.node(i) |
|
1039 | 1039 | pp = r.parents(node) |
|
1040 | 1040 | ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i)) |
|
1041 | 1041 | if pp[1] != nullid: |
|
1042 | 1042 | ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i)) |
|
1043 | 1043 | ui.write("}\n") |
|
1044 | 1044 | |
|
1045 | 1045 | def debuginstall(ui): |
|
1046 | 1046 | '''test Mercurial installation |
|
1047 | 1047 | |
|
1048 | 1048 | Returns 0 on success. |
|
1049 | 1049 | ''' |
|
1050 | 1050 | |
|
1051 | 1051 | def writetemp(contents): |
|
1052 | 1052 | (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-") |
|
1053 | 1053 | f = os.fdopen(fd, "wb") |
|
1054 | 1054 | f.write(contents) |
|
1055 | 1055 | f.close() |
|
1056 | 1056 | return name |
|
1057 | 1057 | |
|
1058 | 1058 | problems = 0 |
|
1059 | 1059 | |
|
1060 | 1060 | # encoding |
|
1061 | 1061 | ui.status(_("Checking encoding (%s)...\n") % encoding.encoding) |
|
1062 | 1062 | try: |
|
1063 | 1063 | encoding.fromlocal("test") |
|
1064 | 1064 | except util.Abort, inst: |
|
1065 | 1065 | ui.write(" %s\n" % inst) |
|
1066 | 1066 | ui.write(_(" (check that your locale is properly set)\n")) |
|
1067 | 1067 | problems += 1 |
|
1068 | 1068 | |
|
1069 | 1069 | # compiled modules |
|
1070 | 1070 | ui.status(_("Checking extensions...\n")) |
|
1071 | 1071 | try: |
|
1072 | 1072 | import bdiff, mpatch, base85 |
|
1073 | 1073 | except Exception, inst: |
|
1074 | 1074 | ui.write(" %s\n" % inst) |
|
1075 | 1075 | ui.write(_(" One or more extensions could not be found")) |
|
1076 | 1076 | ui.write(_(" (check that you compiled the extensions)\n")) |
|
1077 | 1077 | problems += 1 |
|
1078 | 1078 | |
|
1079 | 1079 | # templates |
|
1080 | 1080 | ui.status(_("Checking templates...\n")) |
|
1081 | 1081 | try: |
|
1082 | 1082 | import templater |
|
1083 | 1083 | templater.templater(templater.templatepath("map-cmdline.default")) |
|
1084 | 1084 | except Exception, inst: |
|
1085 | 1085 | ui.write(" %s\n" % inst) |
|
1086 | 1086 | ui.write(_(" (templates seem to have been installed incorrectly)\n")) |
|
1087 | 1087 | problems += 1 |
|
1088 | 1088 | |
|
1089 | 1089 | # patch |
|
1090 | 1090 | ui.status(_("Checking patch...\n")) |
|
1091 | 1091 | patchproblems = 0 |
|
1092 | 1092 | a = "1\n2\n3\n4\n" |
|
1093 | 1093 | b = "1\n2\n3\ninsert\n4\n" |
|
1094 | 1094 | fa = writetemp(a) |
|
1095 | 1095 | d = mdiff.unidiff(a, None, b, None, os.path.basename(fa), |
|
1096 | 1096 | os.path.basename(fa)) |
|
1097 | 1097 | fd = writetemp(d) |
|
1098 | 1098 | |
|
1099 | 1099 | files = {} |
|
1100 | 1100 | try: |
|
1101 | 1101 | patch.patch(fd, ui, cwd=os.path.dirname(fa), files=files) |
|
1102 | 1102 | except util.Abort, e: |
|
1103 | 1103 | ui.write(_(" patch call failed:\n")) |
|
1104 | 1104 | ui.write(" " + str(e) + "\n") |
|
1105 | 1105 | patchproblems += 1 |
|
1106 | 1106 | else: |
|
1107 | 1107 | if list(files) != [os.path.basename(fa)]: |
|
1108 | 1108 | ui.write(_(" unexpected patch output!\n")) |
|
1109 | 1109 | patchproblems += 1 |
|
1110 | 1110 | a = open(fa).read() |
|
1111 | 1111 | if a != b: |
|
1112 | 1112 | ui.write(_(" patch test failed!\n")) |
|
1113 | 1113 | patchproblems += 1 |
|
1114 | 1114 | |
|
1115 | 1115 | if patchproblems: |
|
1116 | 1116 | if ui.config('ui', 'patch'): |
|
1117 | 1117 | ui.write(_(" (Current patch tool may be incompatible with patch," |
|
1118 | 1118 | " or misconfigured. Please check your .hgrc file)\n")) |
|
1119 | 1119 | else: |
|
1120 | 1120 | ui.write(_(" Internal patcher failure, please report this error" |
|
1121 | 1121 | " to http://mercurial.selenic.com/bts/\n")) |
|
1122 | 1122 | problems += patchproblems |
|
1123 | 1123 | |
|
1124 | 1124 | os.unlink(fa) |
|
1125 | 1125 | os.unlink(fd) |
|
1126 | 1126 | |
|
1127 | 1127 | # editor |
|
1128 | 1128 | ui.status(_("Checking commit editor...\n")) |
|
1129 | 1129 | editor = ui.geteditor() |
|
1130 | 1130 | cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0]) |
|
1131 | 1131 | if not cmdpath: |
|
1132 | 1132 | if editor == 'vi': |
|
1133 | 1133 | ui.write(_(" No commit editor set and can't find vi in PATH\n")) |
|
1134 | 1134 | ui.write(_(" (specify a commit editor in your .hgrc file)\n")) |
|
1135 | 1135 | else: |
|
1136 | 1136 | ui.write(_(" Can't find editor '%s' in PATH\n") % editor) |
|
1137 | 1137 | ui.write(_(" (specify a commit editor in your .hgrc file)\n")) |
|
1138 | 1138 | problems += 1 |
|
1139 | 1139 | |
|
1140 | 1140 | # check username |
|
1141 | 1141 | ui.status(_("Checking username...\n")) |
|
1142 | 1142 | try: |
|
1143 | 1143 | user = ui.username() |
|
1144 | 1144 | except util.Abort, e: |
|
1145 | 1145 | ui.write(" %s\n" % e) |
|
1146 | 1146 | ui.write(_(" (specify a username in your .hgrc file)\n")) |
|
1147 | 1147 | problems += 1 |
|
1148 | 1148 | |
|
1149 | 1149 | if not problems: |
|
1150 | 1150 | ui.status(_("No problems detected\n")) |
|
1151 | 1151 | else: |
|
1152 | 1152 | ui.write(_("%s problems detected," |
|
1153 | 1153 | " please check your install!\n") % problems) |
|
1154 | 1154 | |
|
1155 | 1155 | return problems |
|
1156 | 1156 | |
|
1157 | 1157 | def debugrename(ui, repo, file1, *pats, **opts): |
|
1158 | 1158 | """dump rename information""" |
|
1159 | 1159 | |
|
1160 | 1160 | ctx = repo[opts.get('rev')] |
|
1161 | 1161 | m = cmdutil.match(repo, (file1,) + pats, opts) |
|
1162 | 1162 | for abs in ctx.walk(m): |
|
1163 | 1163 | fctx = ctx[abs] |
|
1164 | 1164 | o = fctx.filelog().renamed(fctx.filenode()) |
|
1165 | 1165 | rel = m.rel(abs) |
|
1166 | 1166 | if o: |
|
1167 | 1167 | ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1]))) |
|
1168 | 1168 | else: |
|
1169 | 1169 | ui.write(_("%s not renamed\n") % rel) |
|
1170 | 1170 | |
|
1171 | 1171 | def debugwalk(ui, repo, *pats, **opts): |
|
1172 | 1172 | """show how files match on given patterns""" |
|
1173 | 1173 | m = cmdutil.match(repo, pats, opts) |
|
1174 | 1174 | items = list(repo.walk(m)) |
|
1175 | 1175 | if not items: |
|
1176 | 1176 | return |
|
1177 | 1177 | fmt = 'f %%-%ds %%-%ds %%s' % ( |
|
1178 | 1178 | max([len(abs) for abs in items]), |
|
1179 | 1179 | max([len(m.rel(abs)) for abs in items])) |
|
1180 | 1180 | for abs in items: |
|
1181 | 1181 | line = fmt % (abs, m.rel(abs), m.exact(abs) and 'exact' or '') |
|
1182 | 1182 | ui.write("%s\n" % line.rstrip()) |
|
1183 | 1183 | |
|
1184 | 1184 | def diff(ui, repo, *pats, **opts): |
|
1185 | 1185 | """diff repository (or selected files) |
|
1186 | 1186 | |
|
1187 | 1187 | Show differences between revisions for the specified files. |
|
1188 | 1188 | |
|
1189 | 1189 | Differences between files are shown using the unified diff format. |
|
1190 | 1190 | |
|
1191 | 1191 | NOTE: diff may generate unexpected results for merges, as it will |
|
1192 | 1192 | default to comparing against the working directory's first parent |
|
1193 | 1193 | changeset if no revisions are specified. |
|
1194 | 1194 | |
|
1195 | 1195 | When two revision arguments are given, then changes are shown |
|
1196 | 1196 | between those revisions. If only one revision is specified then |
|
1197 | 1197 | that revision is compared to the working directory, and, when no |
|
1198 | 1198 | revisions are specified, the working directory files are compared |
|
1199 | 1199 | to its parent. |
|
1200 | 1200 | |
|
1201 | 1201 | Alternatively you can specify -c/--change with a revision to see |
|
1202 | 1202 | the changes in that changeset relative to its first parent. |
|
1203 | 1203 | |
|
1204 | 1204 | Without the -a/--text option, diff will avoid generating diffs of |
|
1205 | 1205 | files it detects as binary. With -a, diff will generate a diff |
|
1206 | 1206 | anyway, probably with undesirable results. |
|
1207 | 1207 | |
|
1208 | 1208 | Use the -g/--git option to generate diffs in the git extended diff |
|
1209 | 1209 | format. For more information, read :hg:`help diffs`. |
|
1210 | 1210 | |
|
1211 | 1211 | Returns 0 on success. |
|
1212 | 1212 | """ |
|
1213 | 1213 | |
|
1214 | 1214 | revs = opts.get('rev') |
|
1215 | 1215 | change = opts.get('change') |
|
1216 | 1216 | stat = opts.get('stat') |
|
1217 | 1217 | reverse = opts.get('reverse') |
|
1218 | 1218 | |
|
1219 | 1219 | if revs and change: |
|
1220 | 1220 | msg = _('cannot specify --rev and --change at the same time') |
|
1221 | 1221 | raise util.Abort(msg) |
|
1222 | 1222 | elif change: |
|
1223 | 1223 | node2 = repo.lookup(change) |
|
1224 | 1224 | node1 = repo[node2].parents()[0].node() |
|
1225 | 1225 | else: |
|
1226 | 1226 | node1, node2 = cmdutil.revpair(repo, revs) |
|
1227 | 1227 | |
|
1228 | 1228 | if reverse: |
|
1229 | 1229 | node1, node2 = node2, node1 |
|
1230 | 1230 | |
|
1231 | 1231 | diffopts = patch.diffopts(ui, opts) |
|
1232 | 1232 | m = cmdutil.match(repo, pats, opts) |
|
1233 | 1233 | cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat) |
|
1234 | 1234 | |
|
1235 | 1235 | def export(ui, repo, *changesets, **opts): |
|
1236 | 1236 | """dump the header and diffs for one or more changesets |
|
1237 | 1237 | |
|
1238 | 1238 | Print the changeset header and diffs for one or more revisions. |
|
1239 | 1239 | |
|
1240 | 1240 | The information shown in the changeset header is: author, date, |
|
1241 | 1241 | branch name (if non-default), changeset hash, parent(s) and commit |
|
1242 | 1242 | comment. |
|
1243 | 1243 | |
|
1244 | 1244 | NOTE: export may generate unexpected diff output for merge |
|
1245 | 1245 | changesets, as it will compare the merge changeset against its |
|
1246 | 1246 | first parent only. |
|
1247 | 1247 | |
|
1248 | 1248 | Output may be to a file, in which case the name of the file is |
|
1249 | 1249 | given using a format string. The formatting rules are as follows: |
|
1250 | 1250 | |
|
1251 | 1251 | :``%%``: literal "%" character |
|
1252 | 1252 | :``%H``: changeset hash (40 bytes of hexadecimal) |
|
1253 | 1253 | :``%N``: number of patches being generated |
|
1254 | 1254 | :``%R``: changeset revision number |
|
1255 | 1255 | :``%b``: basename of the exporting repository |
|
1256 | 1256 | :``%h``: short-form changeset hash (12 bytes of hexadecimal) |
|
1257 | 1257 | :``%n``: zero-padded sequence number, starting at 1 |
|
1258 | 1258 | :``%r``: zero-padded changeset revision number |
|
1259 | 1259 | |
|
1260 | 1260 | Without the -a/--text option, export will avoid generating diffs |
|
1261 | 1261 | of files it detects as binary. With -a, export will generate a |
|
1262 | 1262 | diff anyway, probably with undesirable results. |
|
1263 | 1263 | |
|
1264 | 1264 | Use the -g/--git option to generate diffs in the git extended diff |
|
1265 | 1265 | format. See :hg:`help diffs` for more information. |
|
1266 | 1266 | |
|
1267 | 1267 | With the --switch-parent option, the diff will be against the |
|
1268 | 1268 | second parent. It can be useful to review a merge. |
|
1269 | 1269 | |
|
1270 | 1270 | Returns 0 on success. |
|
1271 | 1271 | """ |
|
1272 | 1272 | changesets += tuple(opts.get('rev', [])) |
|
1273 | 1273 | if not changesets: |
|
1274 | 1274 | raise util.Abort(_("export requires at least one changeset")) |
|
1275 | 1275 | revs = cmdutil.revrange(repo, changesets) |
|
1276 | 1276 | if len(revs) > 1: |
|
1277 | 1277 | ui.note(_('exporting patches:\n')) |
|
1278 | 1278 | else: |
|
1279 | 1279 | ui.note(_('exporting patch:\n')) |
|
1280 | 1280 | cmdutil.export(repo, revs, template=opts.get('output'), |
|
1281 | 1281 | switch_parent=opts.get('switch_parent'), |
|
1282 | 1282 | opts=patch.diffopts(ui, opts)) |
|
1283 | 1283 | |
|
1284 | 1284 | def forget(ui, repo, *pats, **opts): |
|
1285 | 1285 | """forget the specified files on the next commit |
|
1286 | 1286 | |
|
1287 | 1287 | Mark the specified files so they will no longer be tracked |
|
1288 | 1288 | after the next commit. |
|
1289 | 1289 | |
|
1290 | 1290 | This only removes files from the current branch, not from the |
|
1291 | 1291 | entire project history, and it does not delete them from the |
|
1292 | 1292 | working directory. |
|
1293 | 1293 | |
|
1294 | 1294 | To undo a forget before the next commit, see :hg:`add`. |
|
1295 | 1295 | |
|
1296 | 1296 | Returns 0 on success. |
|
1297 | 1297 | """ |
|
1298 | 1298 | |
|
1299 | 1299 | if not pats: |
|
1300 | 1300 | raise util.Abort(_('no files specified')) |
|
1301 | 1301 | |
|
1302 | 1302 | m = cmdutil.match(repo, pats, opts) |
|
1303 | 1303 | s = repo.status(match=m, clean=True) |
|
1304 | 1304 | forget = sorted(s[0] + s[1] + s[3] + s[6]) |
|
1305 | 1305 | errs = 0 |
|
1306 | 1306 | |
|
1307 | 1307 | for f in m.files(): |
|
1308 | 1308 | if f not in repo.dirstate and not os.path.isdir(m.rel(f)): |
|
1309 | 1309 | ui.warn(_('not removing %s: file is already untracked\n') |
|
1310 | 1310 | % m.rel(f)) |
|
1311 | 1311 | errs = 1 |
|
1312 | 1312 | |
|
1313 | 1313 | for f in forget: |
|
1314 | 1314 | if ui.verbose or not m.exact(f): |
|
1315 | 1315 | ui.status(_('removing %s\n') % m.rel(f)) |
|
1316 | 1316 | |
|
1317 | 1317 | repo.remove(forget, unlink=False) |
|
1318 | 1318 | return errs |
|
1319 | 1319 | |
|
1320 | 1320 | def grep(ui, repo, pattern, *pats, **opts): |
|
1321 | 1321 | """search for a pattern in specified files and revisions |
|
1322 | 1322 | |
|
1323 | 1323 | Search revisions of files for a regular expression. |
|
1324 | 1324 | |
|
1325 | 1325 | This command behaves differently than Unix grep. It only accepts |
|
1326 | 1326 | Python/Perl regexps. It searches repository history, not the |
|
1327 | 1327 | working directory. It always prints the revision number in which a |
|
1328 | 1328 | match appears. |
|
1329 | 1329 | |
|
1330 | 1330 | By default, grep only prints output for the first revision of a |
|
1331 | 1331 | file in which it finds a match. To get it to print every revision |
|
1332 | 1332 | that contains a change in match status ("-" for a match that |
|
1333 | 1333 | becomes a non-match, or "+" for a non-match that becomes a match), |
|
1334 | 1334 | use the --all flag. |
|
1335 | 1335 | |
|
1336 | 1336 | Returns 0 if a match is found, 1 otherwise. |
|
1337 | 1337 | """ |
|
1338 | 1338 | reflags = 0 |
|
1339 | 1339 | if opts.get('ignore_case'): |
|
1340 | 1340 | reflags |= re.I |
|
1341 | 1341 | try: |
|
1342 | 1342 | regexp = re.compile(pattern, reflags) |
|
1343 | 1343 | except Exception, inst: |
|
1344 | 1344 | ui.warn(_("grep: invalid match pattern: %s\n") % inst) |
|
1345 | 1345 | return 1 |
|
1346 | 1346 | sep, eol = ':', '\n' |
|
1347 | 1347 | if opts.get('print0'): |
|
1348 | 1348 | sep = eol = '\0' |
|
1349 | 1349 | |
|
1350 | 1350 | getfile = util.lrucachefunc(repo.file) |
|
1351 | 1351 | |
|
1352 | 1352 | def matchlines(body): |
|
1353 | 1353 | begin = 0 |
|
1354 | 1354 | linenum = 0 |
|
1355 | 1355 | while True: |
|
1356 | 1356 | match = regexp.search(body, begin) |
|
1357 | 1357 | if not match: |
|
1358 | 1358 | break |
|
1359 | 1359 | mstart, mend = match.span() |
|
1360 | 1360 | linenum += body.count('\n', begin, mstart) + 1 |
|
1361 | 1361 | lstart = body.rfind('\n', begin, mstart) + 1 or begin |
|
1362 | 1362 | begin = body.find('\n', mend) + 1 or len(body) |
|
1363 | 1363 | lend = begin - 1 |
|
1364 | 1364 | yield linenum, mstart - lstart, mend - lstart, body[lstart:lend] |
|
1365 | 1365 | |
|
1366 | 1366 | class linestate(object): |
|
1367 | 1367 | def __init__(self, line, linenum, colstart, colend): |
|
1368 | 1368 | self.line = line |
|
1369 | 1369 | self.linenum = linenum |
|
1370 | 1370 | self.colstart = colstart |
|
1371 | 1371 | self.colend = colend |
|
1372 | 1372 | |
|
1373 | 1373 | def __hash__(self): |
|
1374 | 1374 | return hash((self.linenum, self.line)) |
|
1375 | 1375 | |
|
1376 | 1376 | def __eq__(self, other): |
|
1377 | 1377 | return self.line == other.line |
|
1378 | 1378 | |
|
1379 | 1379 | matches = {} |
|
1380 | 1380 | copies = {} |
|
1381 | 1381 | def grepbody(fn, rev, body): |
|
1382 | 1382 | matches[rev].setdefault(fn, []) |
|
1383 | 1383 | m = matches[rev][fn] |
|
1384 | 1384 | for lnum, cstart, cend, line in matchlines(body): |
|
1385 | 1385 | s = linestate(line, lnum, cstart, cend) |
|
1386 | 1386 | m.append(s) |
|
1387 | 1387 | |
|
1388 | 1388 | def difflinestates(a, b): |
|
1389 | 1389 | sm = difflib.SequenceMatcher(None, a, b) |
|
1390 | 1390 | for tag, alo, ahi, blo, bhi in sm.get_opcodes(): |
|
1391 | 1391 | if tag == 'insert': |
|
1392 | 1392 | for i in xrange(blo, bhi): |
|
1393 | 1393 | yield ('+', b[i]) |
|
1394 | 1394 | elif tag == 'delete': |
|
1395 | 1395 | for i in xrange(alo, ahi): |
|
1396 | 1396 | yield ('-', a[i]) |
|
1397 | 1397 | elif tag == 'replace': |
|
1398 | 1398 | for i in xrange(alo, ahi): |
|
1399 | 1399 | yield ('-', a[i]) |
|
1400 | 1400 | for i in xrange(blo, bhi): |
|
1401 | 1401 | yield ('+', b[i]) |
|
1402 | 1402 | |
|
1403 | 1403 | def display(fn, ctx, pstates, states): |
|
1404 | 1404 | rev = ctx.rev() |
|
1405 | 1405 | datefunc = ui.quiet and util.shortdate or util.datestr |
|
1406 | 1406 | found = False |
|
1407 | 1407 | filerevmatches = {} |
|
1408 | 1408 | if opts.get('all'): |
|
1409 | 1409 | iter = difflinestates(pstates, states) |
|
1410 | 1410 | else: |
|
1411 | 1411 | iter = [('', l) for l in states] |
|
1412 | 1412 | for change, l in iter: |
|
1413 | 1413 | cols = [fn, str(rev)] |
|
1414 | 1414 | before, match, after = None, None, None |
|
1415 | 1415 | if opts.get('line_number'): |
|
1416 | 1416 | cols.append(str(l.linenum)) |
|
1417 | 1417 | if opts.get('all'): |
|
1418 | 1418 | cols.append(change) |
|
1419 | 1419 | if opts.get('user'): |
|
1420 | 1420 | cols.append(ui.shortuser(ctx.user())) |
|
1421 | 1421 | if opts.get('date'): |
|
1422 | 1422 | cols.append(datefunc(ctx.date())) |
|
1423 | 1423 | if opts.get('files_with_matches'): |
|
1424 | 1424 | c = (fn, rev) |
|
1425 | 1425 | if c in filerevmatches: |
|
1426 | 1426 | continue |
|
1427 | 1427 | filerevmatches[c] = 1 |
|
1428 | 1428 | else: |
|
1429 | 1429 | before = l.line[:l.colstart] |
|
1430 | 1430 | match = l.line[l.colstart:l.colend] |
|
1431 | 1431 | after = l.line[l.colend:] |
|
1432 | 1432 | ui.write(sep.join(cols)) |
|
1433 | 1433 | if before is not None: |
|
1434 | 1434 | ui.write(sep + before) |
|
1435 | 1435 | ui.write(match, label='grep.match') |
|
1436 | 1436 | ui.write(after) |
|
1437 | 1437 | ui.write(eol) |
|
1438 | 1438 | found = True |
|
1439 | 1439 | return found |
|
1440 | 1440 | |
|
1441 | 1441 | skip = {} |
|
1442 | 1442 | revfiles = {} |
|
1443 | 1443 | matchfn = cmdutil.match(repo, pats, opts) |
|
1444 | 1444 | found = False |
|
1445 | 1445 | follow = opts.get('follow') |
|
1446 | 1446 | |
|
1447 | 1447 | def prep(ctx, fns): |
|
1448 | 1448 | rev = ctx.rev() |
|
1449 | 1449 | pctx = ctx.parents()[0] |
|
1450 | 1450 | parent = pctx.rev() |
|
1451 | 1451 | matches.setdefault(rev, {}) |
|
1452 | 1452 | matches.setdefault(parent, {}) |
|
1453 | 1453 | files = revfiles.setdefault(rev, []) |
|
1454 | 1454 | for fn in fns: |
|
1455 | 1455 | flog = getfile(fn) |
|
1456 | 1456 | try: |
|
1457 | 1457 | fnode = ctx.filenode(fn) |
|
1458 | 1458 | except error.LookupError: |
|
1459 | 1459 | continue |
|
1460 | 1460 | |
|
1461 | 1461 | copied = flog.renamed(fnode) |
|
1462 | 1462 | copy = follow and copied and copied[0] |
|
1463 | 1463 | if copy: |
|
1464 | 1464 | copies.setdefault(rev, {})[fn] = copy |
|
1465 | 1465 | if fn in skip: |
|
1466 | 1466 | if copy: |
|
1467 | 1467 | skip[copy] = True |
|
1468 | 1468 | continue |
|
1469 | 1469 | files.append(fn) |
|
1470 | 1470 | |
|
1471 | 1471 | if fn not in matches[rev]: |
|
1472 | 1472 | grepbody(fn, rev, flog.read(fnode)) |
|
1473 | 1473 | |
|
1474 | 1474 | pfn = copy or fn |
|
1475 | 1475 | if pfn not in matches[parent]: |
|
1476 | 1476 | try: |
|
1477 | 1477 | fnode = pctx.filenode(pfn) |
|
1478 | 1478 | grepbody(pfn, parent, flog.read(fnode)) |
|
1479 | 1479 | except error.LookupError: |
|
1480 | 1480 | pass |
|
1481 | 1481 | |
|
1482 | 1482 | for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep): |
|
1483 | 1483 | rev = ctx.rev() |
|
1484 | 1484 | parent = ctx.parents()[0].rev() |
|
1485 | 1485 | for fn in sorted(revfiles.get(rev, [])): |
|
1486 | 1486 | states = matches[rev][fn] |
|
1487 | 1487 | copy = copies.get(rev, {}).get(fn) |
|
1488 | 1488 | if fn in skip: |
|
1489 | 1489 | if copy: |
|
1490 | 1490 | skip[copy] = True |
|
1491 | 1491 | continue |
|
1492 | 1492 | pstates = matches.get(parent, {}).get(copy or fn, []) |
|
1493 | 1493 | if pstates or states: |
|
1494 | 1494 | r = display(fn, ctx, pstates, states) |
|
1495 | 1495 | found = found or r |
|
1496 | 1496 | if r and not opts.get('all'): |
|
1497 | 1497 | skip[fn] = True |
|
1498 | 1498 | if copy: |
|
1499 | 1499 | skip[copy] = True |
|
1500 | 1500 | del matches[rev] |
|
1501 | 1501 | del revfiles[rev] |
|
1502 | 1502 | |
|
1503 | 1503 | return not found |
|
1504 | 1504 | |
|
1505 | 1505 | def heads(ui, repo, *branchrevs, **opts): |
|
1506 | 1506 | """show current repository heads or show branch heads |
|
1507 | 1507 | |
|
1508 | 1508 | With no arguments, show all repository branch heads. |
|
1509 | 1509 | |
|
1510 | 1510 | Repository "heads" are changesets with no child changesets. They are |
|
1511 | 1511 | where development generally takes place and are the usual targets |
|
1512 | 1512 | for update and merge operations. Branch heads are changesets that have |
|
1513 | 1513 | no child changeset on the same branch. |
|
1514 | 1514 | |
|
1515 | 1515 | If one or more REVs are given, only branch heads on the branches |
|
1516 | 1516 | associated with the specified changesets are shown. |
|
1517 | 1517 | |
|
1518 | 1518 | If -c/--closed is specified, also show branch heads marked closed |
|
1519 | 1519 | (see :hg:`commit --close-branch`). |
|
1520 | 1520 | |
|
1521 | 1521 | If STARTREV is specified, only those heads that are descendants of |
|
1522 | 1522 | STARTREV will be displayed. |
|
1523 | 1523 | |
|
1524 | 1524 | If -t/--topo is specified, named branch mechanics will be ignored and only |
|
1525 | 1525 | changesets without children will be shown. |
|
1526 | 1526 | |
|
1527 | 1527 | Returns 0 if matching heads are found, 1 if not. |
|
1528 | 1528 | """ |
|
1529 | 1529 | |
|
1530 | 1530 | if opts.get('rev'): |
|
1531 | 1531 | start = repo.lookup(opts['rev']) |
|
1532 | 1532 | else: |
|
1533 | 1533 | start = None |
|
1534 | 1534 | |
|
1535 | 1535 | if opts.get('topo'): |
|
1536 | 1536 | heads = [repo[h] for h in repo.heads(start)] |
|
1537 | 1537 | else: |
|
1538 | 1538 | heads = [] |
|
1539 | 1539 | for b, ls in repo.branchmap().iteritems(): |
|
1540 | 1540 | if start is None: |
|
1541 | 1541 | heads += [repo[h] for h in ls] |
|
1542 | 1542 | continue |
|
1543 | 1543 | startrev = repo.changelog.rev(start) |
|
1544 | 1544 | descendants = set(repo.changelog.descendants(startrev)) |
|
1545 | 1545 | descendants.add(startrev) |
|
1546 | 1546 | rev = repo.changelog.rev |
|
1547 | 1547 | heads += [repo[h] for h in ls if rev(h) in descendants] |
|
1548 | 1548 | |
|
1549 | 1549 | if branchrevs: |
|
1550 | 1550 | decode, encode = encoding.fromlocal, encoding.tolocal |
|
1551 | 1551 | branches = set(repo[decode(br)].branch() for br in branchrevs) |
|
1552 | 1552 | heads = [h for h in heads if h.branch() in branches] |
|
1553 | 1553 | |
|
1554 | 1554 | if not opts.get('closed'): |
|
1555 | 1555 | heads = [h for h in heads if not h.extra().get('close')] |
|
1556 | 1556 | |
|
1557 | 1557 | if opts.get('active') and branchrevs: |
|
1558 | 1558 | dagheads = repo.heads(start) |
|
1559 | 1559 | heads = [h for h in heads if h.node() in dagheads] |
|
1560 | 1560 | |
|
1561 | 1561 | if branchrevs: |
|
1562 | 1562 | haveheads = set(h.branch() for h in heads) |
|
1563 | 1563 | if branches - haveheads: |
|
1564 | 1564 | headless = ', '.join(encode(b) for b in branches - haveheads) |
|
1565 | 1565 | msg = _('no open branch heads found on branches %s') |
|
1566 | 1566 | if opts.get('rev'): |
|
1567 | 1567 | msg += _(' (started at %s)' % opts['rev']) |
|
1568 | 1568 | ui.warn((msg + '\n') % headless) |
|
1569 | 1569 | |
|
1570 | 1570 | if not heads: |
|
1571 | 1571 | return 1 |
|
1572 | 1572 | |
|
1573 | 1573 | heads = sorted(heads, key=lambda x: -x.rev()) |
|
1574 | 1574 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
1575 | 1575 | for ctx in heads: |
|
1576 | 1576 | displayer.show(ctx) |
|
1577 | 1577 | displayer.close() |
|
1578 | 1578 | |
|
1579 | 1579 | def help_(ui, name=None, with_version=False, unknowncmd=False): |
|
1580 | 1580 | """show help for a given topic or a help overview |
|
1581 | 1581 | |
|
1582 | 1582 | With no arguments, print a list of commands with short help messages. |
|
1583 | 1583 | |
|
1584 | 1584 | Given a topic, extension, or command name, print help for that |
|
1585 | 1585 | topic. |
|
1586 | 1586 | |
|
1587 | 1587 | Returns 0 if successful. |
|
1588 | 1588 | """ |
|
1589 | 1589 | option_lists = [] |
|
1590 | 1590 | textwidth = util.termwidth() - 2 |
|
1591 | 1591 | |
|
1592 | 1592 | def addglobalopts(aliases): |
|
1593 | 1593 | if ui.verbose: |
|
1594 | 1594 | option_lists.append((_("global options:"), globalopts)) |
|
1595 | 1595 | if name == 'shortlist': |
|
1596 | 1596 | option_lists.append((_('use "hg help" for the full list ' |
|
1597 | 1597 | 'of commands'), ())) |
|
1598 | 1598 | else: |
|
1599 | 1599 | if name == 'shortlist': |
|
1600 | 1600 | msg = _('use "hg help" for the full list of commands ' |
|
1601 | 1601 | 'or "hg -v" for details') |
|
1602 | 1602 | elif aliases: |
|
1603 | 1603 | msg = _('use "hg -v help%s" to show aliases and ' |
|
1604 | 1604 | 'global options') % (name and " " + name or "") |
|
1605 | 1605 | else: |
|
1606 | 1606 | msg = _('use "hg -v help %s" to show global options') % name |
|
1607 | 1607 | option_lists.append((msg, ())) |
|
1608 | 1608 | |
|
1609 | 1609 | def helpcmd(name): |
|
1610 | 1610 | if with_version: |
|
1611 | 1611 | version_(ui) |
|
1612 | 1612 | ui.write('\n') |
|
1613 | 1613 | |
|
1614 | 1614 | try: |
|
1615 | 1615 | aliases, entry = cmdutil.findcmd(name, table, strict=unknowncmd) |
|
1616 | 1616 | except error.AmbiguousCommand, inst: |
|
1617 | 1617 | # py3k fix: except vars can't be used outside the scope of the |
|
1618 | 1618 | # except block, nor can be used inside a lambda. python issue4617 |
|
1619 | 1619 | prefix = inst.args[0] |
|
1620 | 1620 | select = lambda c: c.lstrip('^').startswith(prefix) |
|
1621 | 1621 | helplist(_('list of commands:\n\n'), select) |
|
1622 | 1622 | return |
|
1623 | 1623 | |
|
1624 | 1624 | # check if it's an invalid alias and display its error if it is |
|
1625 | 1625 | if getattr(entry[0], 'badalias', False): |
|
1626 | 1626 | if not unknowncmd: |
|
1627 | 1627 | entry[0](ui) |
|
1628 | 1628 | return |
|
1629 | 1629 | |
|
1630 | 1630 | # synopsis |
|
1631 | 1631 | if len(entry) > 2: |
|
1632 | 1632 | if entry[2].startswith('hg'): |
|
1633 | 1633 | ui.write("%s\n" % entry[2]) |
|
1634 | 1634 | else: |
|
1635 | 1635 | ui.write('hg %s %s\n' % (aliases[0], entry[2])) |
|
1636 | 1636 | else: |
|
1637 | 1637 | ui.write('hg %s\n' % aliases[0]) |
|
1638 | 1638 | |
|
1639 | 1639 | # aliases |
|
1640 | 1640 | if not ui.quiet and len(aliases) > 1: |
|
1641 | 1641 | ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:])) |
|
1642 | 1642 | |
|
1643 | 1643 | # description |
|
1644 | 1644 | doc = gettext(entry[0].__doc__) |
|
1645 | 1645 | if not doc: |
|
1646 | 1646 | doc = _("(no help text available)") |
|
1647 | 1647 | if hasattr(entry[0], 'definition'): # aliased command |
|
1648 | 1648 | doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc) |
|
1649 | 1649 | if ui.quiet: |
|
1650 | 1650 | doc = doc.splitlines()[0] |
|
1651 | 1651 | keep = ui.verbose and ['verbose'] or [] |
|
1652 | 1652 | formatted, pruned = minirst.format(doc, textwidth, keep=keep) |
|
1653 | 1653 | ui.write("\n%s\n" % formatted) |
|
1654 | 1654 | if pruned: |
|
1655 | 1655 | ui.write(_('\nuse "hg -v help %s" to show verbose help\n') % name) |
|
1656 | 1656 | |
|
1657 | 1657 | if not ui.quiet: |
|
1658 | 1658 | # options |
|
1659 | 1659 | if entry[1]: |
|
1660 | 1660 | option_lists.append((_("options:\n"), entry[1])) |
|
1661 | 1661 | |
|
1662 | 1662 | addglobalopts(False) |
|
1663 | 1663 | |
|
1664 | 1664 | def helplist(header, select=None): |
|
1665 | 1665 | h = {} |
|
1666 | 1666 | cmds = {} |
|
1667 | 1667 | for c, e in table.iteritems(): |
|
1668 | 1668 | f = c.split("|", 1)[0] |
|
1669 | 1669 | if select and not select(f): |
|
1670 | 1670 | continue |
|
1671 | 1671 | if (not select and name != 'shortlist' and |
|
1672 | 1672 | e[0].__module__ != __name__): |
|
1673 | 1673 | continue |
|
1674 | 1674 | if name == "shortlist" and not f.startswith("^"): |
|
1675 | 1675 | continue |
|
1676 | 1676 | f = f.lstrip("^") |
|
1677 | 1677 | if not ui.debugflag and f.startswith("debug"): |
|
1678 | 1678 | continue |
|
1679 | 1679 | doc = e[0].__doc__ |
|
1680 | 1680 | if doc and 'DEPRECATED' in doc and not ui.verbose: |
|
1681 | 1681 | continue |
|
1682 | 1682 | doc = gettext(doc) |
|
1683 | 1683 | if not doc: |
|
1684 | 1684 | doc = _("(no help text available)") |
|
1685 | 1685 | h[f] = doc.splitlines()[0].rstrip() |
|
1686 | 1686 | cmds[f] = c.lstrip("^") |
|
1687 | 1687 | |
|
1688 | 1688 | if not h: |
|
1689 | 1689 | ui.status(_('no commands defined\n')) |
|
1690 | 1690 | return |
|
1691 | 1691 | |
|
1692 | 1692 | ui.status(header) |
|
1693 | 1693 | fns = sorted(h) |
|
1694 | 1694 | m = max(map(len, fns)) |
|
1695 | 1695 | for f in fns: |
|
1696 | 1696 | if ui.verbose: |
|
1697 | 1697 | commands = cmds[f].replace("|",", ") |
|
1698 | 1698 | ui.write(" %s:\n %s\n"%(commands, h[f])) |
|
1699 | 1699 | else: |
|
1700 | 1700 | ui.write('%s\n' % (util.wrap(h[f], |
|
1701 | 1701 | initindent=' %-*s ' % (m, f), |
|
1702 | 1702 | hangindent=' ' * (m + 4)))) |
|
1703 | 1703 | |
|
1704 | 1704 | if not ui.quiet: |
|
1705 | 1705 | addglobalopts(True) |
|
1706 | 1706 | |
|
1707 | 1707 | def helptopic(name): |
|
1708 | 1708 | for names, header, doc in help.helptable: |
|
1709 | 1709 | if name in names: |
|
1710 | 1710 | break |
|
1711 | 1711 | else: |
|
1712 | 1712 | raise error.UnknownCommand(name) |
|
1713 | 1713 | |
|
1714 | 1714 | # description |
|
1715 | 1715 | if not doc: |
|
1716 | 1716 | doc = _("(no help text available)") |
|
1717 | 1717 | if hasattr(doc, '__call__'): |
|
1718 | 1718 | doc = doc() |
|
1719 | 1719 | |
|
1720 | 1720 | ui.write("%s\n\n" % header) |
|
1721 | 1721 | ui.write("%s\n" % minirst.format(doc, textwidth, indent=4)) |
|
1722 | 1722 | |
|
1723 | 1723 | def helpext(name): |
|
1724 | 1724 | try: |
|
1725 | 1725 | mod = extensions.find(name) |
|
1726 | 1726 | doc = gettext(mod.__doc__) or _('no help text available') |
|
1727 | 1727 | except KeyError: |
|
1728 | 1728 | mod = None |
|
1729 | 1729 | doc = extensions.disabledext(name) |
|
1730 | 1730 | if not doc: |
|
1731 | 1731 | raise error.UnknownCommand(name) |
|
1732 | 1732 | |
|
1733 | 1733 | if '\n' not in doc: |
|
1734 | 1734 | head, tail = doc, "" |
|
1735 | 1735 | else: |
|
1736 | 1736 | head, tail = doc.split('\n', 1) |
|
1737 | 1737 | ui.write(_('%s extension - %s\n\n') % (name.split('.')[-1], head)) |
|
1738 | 1738 | if tail: |
|
1739 | 1739 | ui.write(minirst.format(tail, textwidth)) |
|
1740 | 1740 | ui.status('\n\n') |
|
1741 | 1741 | |
|
1742 | 1742 | if mod: |
|
1743 | 1743 | try: |
|
1744 | 1744 | ct = mod.cmdtable |
|
1745 | 1745 | except AttributeError: |
|
1746 | 1746 | ct = {} |
|
1747 | 1747 | modcmds = set([c.split('|', 1)[0] for c in ct]) |
|
1748 | 1748 | helplist(_('list of commands:\n\n'), modcmds.__contains__) |
|
1749 | 1749 | else: |
|
1750 | 1750 | ui.write(_('use "hg help extensions" for information on enabling ' |
|
1751 | 1751 | 'extensions\n')) |
|
1752 | 1752 | |
|
1753 | 1753 | def helpextcmd(name): |
|
1754 | 1754 | cmd, ext, mod = extensions.disabledcmd(name, ui.config('ui', 'strict')) |
|
1755 | 1755 | doc = gettext(mod.__doc__).splitlines()[0] |
|
1756 | 1756 | |
|
1757 | 1757 | msg = help.listexts(_("'%s' is provided by the following " |
|
1758 | 1758 | "extension:") % cmd, {ext: doc}, len(ext), |
|
1759 | 1759 | indent=4) |
|
1760 | 1760 | ui.write(minirst.format(msg, textwidth)) |
|
1761 | 1761 | ui.write('\n\n') |
|
1762 | 1762 | ui.write(_('use "hg help extensions" for information on enabling ' |
|
1763 | 1763 | 'extensions\n')) |
|
1764 | 1764 | |
|
1765 | 1765 | if name and name != 'shortlist': |
|
1766 | 1766 | i = None |
|
1767 | 1767 | if unknowncmd: |
|
1768 | 1768 | queries = (helpextcmd,) |
|
1769 | 1769 | else: |
|
1770 | 1770 | queries = (helptopic, helpcmd, helpext, helpextcmd) |
|
1771 | 1771 | for f in queries: |
|
1772 | 1772 | try: |
|
1773 | 1773 | f(name) |
|
1774 | 1774 | i = None |
|
1775 | 1775 | break |
|
1776 | 1776 | except error.UnknownCommand, inst: |
|
1777 | 1777 | i = inst |
|
1778 | 1778 | if i: |
|
1779 | 1779 | raise i |
|
1780 | 1780 | |
|
1781 | 1781 | else: |
|
1782 | 1782 | # program name |
|
1783 | 1783 | if ui.verbose or with_version: |
|
1784 | 1784 | version_(ui) |
|
1785 | 1785 | else: |
|
1786 | 1786 | ui.status(_("Mercurial Distributed SCM\n")) |
|
1787 | 1787 | ui.status('\n') |
|
1788 | 1788 | |
|
1789 | 1789 | # list of commands |
|
1790 | 1790 | if name == "shortlist": |
|
1791 | 1791 | header = _('basic commands:\n\n') |
|
1792 | 1792 | else: |
|
1793 | 1793 | header = _('list of commands:\n\n') |
|
1794 | 1794 | |
|
1795 | 1795 | helplist(header) |
|
1796 | 1796 | if name != 'shortlist': |
|
1797 | 1797 | exts, maxlength = extensions.enabled() |
|
1798 | 1798 | text = help.listexts(_('enabled extensions:'), exts, maxlength) |
|
1799 | 1799 | if text: |
|
1800 | 1800 | ui.write("\n%s\n" % minirst.format(text, textwidth)) |
|
1801 | 1801 | |
|
1802 | 1802 | # list all option lists |
|
1803 | 1803 | opt_output = [] |
|
1804 | 1804 | for title, options in option_lists: |
|
1805 | 1805 | opt_output.append(("\n%s" % title, None)) |
|
1806 | 1806 | for shortopt, longopt, default, desc in options: |
|
1807 | 1807 | if _("DEPRECATED") in desc and not ui.verbose: |
|
1808 | 1808 | continue |
|
1809 | 1809 | opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt, |
|
1810 | 1810 | longopt and " --%s" % longopt), |
|
1811 | 1811 | "%s%s" % (desc, |
|
1812 | 1812 | default |
|
1813 | 1813 | and _(" (default: %s)") % default |
|
1814 | 1814 | or ""))) |
|
1815 | 1815 | |
|
1816 | 1816 | if not name: |
|
1817 | 1817 | ui.write(_("\nadditional help topics:\n\n")) |
|
1818 | 1818 | topics = [] |
|
1819 | 1819 | for names, header, doc in help.helptable: |
|
1820 | 1820 | topics.append((sorted(names, key=len, reverse=True)[0], header)) |
|
1821 | 1821 | topics_len = max([len(s[0]) for s in topics]) |
|
1822 | 1822 | for t, desc in topics: |
|
1823 | 1823 | ui.write(" %-*s %s\n" % (topics_len, t, desc)) |
|
1824 | 1824 | |
|
1825 | 1825 | if opt_output: |
|
1826 | 1826 | opts_len = max([len(line[0]) for line in opt_output if line[1]] or [0]) |
|
1827 | 1827 | for first, second in opt_output: |
|
1828 | 1828 | if second: |
|
1829 | 1829 | initindent = ' %-*s ' % (opts_len, first) |
|
1830 | 1830 | hangindent = ' ' * (opts_len + 3) |
|
1831 | 1831 | ui.write('%s\n' % (util.wrap(second, |
|
1832 | 1832 | initindent=initindent, |
|
1833 | 1833 | hangindent=hangindent))) |
|
1834 | 1834 | else: |
|
1835 | 1835 | ui.write("%s\n" % first) |
|
1836 | 1836 | |
|
1837 | 1837 | def identify(ui, repo, source=None, |
|
1838 | 1838 | rev=None, num=None, id=None, branch=None, tags=None): |
|
1839 | 1839 | """identify the working copy or specified revision |
|
1840 | 1840 | |
|
1841 | 1841 | With no revision, print a summary of the current state of the |
|
1842 | 1842 | repository. |
|
1843 | 1843 | |
|
1844 | 1844 | Specifying a path to a repository root or Mercurial bundle will |
|
1845 | 1845 | cause lookup to operate on that repository/bundle. |
|
1846 | 1846 | |
|
1847 | 1847 | This summary identifies the repository state using one or two |
|
1848 | 1848 | parent hash identifiers, followed by a "+" if there are |
|
1849 | 1849 | uncommitted changes in the working directory, a list of tags for |
|
1850 | 1850 | this revision and a branch name for non-default branches. |
|
1851 | 1851 | |
|
1852 | 1852 | Returns 0 if successful. |
|
1853 | 1853 | """ |
|
1854 | 1854 | |
|
1855 | 1855 | if not repo and not source: |
|
1856 | 1856 | raise util.Abort(_("There is no Mercurial repository here " |
|
1857 | 1857 | "(.hg not found)")) |
|
1858 | 1858 | |
|
1859 | 1859 | hexfunc = ui.debugflag and hex or short |
|
1860 | 1860 | default = not (num or id or branch or tags) |
|
1861 | 1861 | output = [] |
|
1862 | 1862 | |
|
1863 | 1863 | revs = [] |
|
1864 | 1864 | if source: |
|
1865 | 1865 | source, branches = hg.parseurl(ui.expandpath(source)) |
|
1866 | 1866 | repo = hg.repository(ui, source) |
|
1867 | 1867 | revs, checkout = hg.addbranchrevs(repo, repo, branches, None) |
|
1868 | 1868 | |
|
1869 | 1869 | if not repo.local(): |
|
1870 | 1870 | if not rev and revs: |
|
1871 | 1871 | rev = revs[0] |
|
1872 | 1872 | if not rev: |
|
1873 | 1873 | rev = "tip" |
|
1874 | 1874 | if num or branch or tags: |
|
1875 | 1875 | raise util.Abort( |
|
1876 | 1876 | "can't query remote revision number, branch, or tags") |
|
1877 | 1877 | output = [hexfunc(repo.lookup(rev))] |
|
1878 | 1878 | elif not rev: |
|
1879 | 1879 | ctx = repo[None] |
|
1880 | 1880 | parents = ctx.parents() |
|
1881 | 1881 | changed = False |
|
1882 | 1882 | if default or id or num: |
|
1883 | 1883 | changed = util.any(repo.status()) |
|
1884 | 1884 | if default or id: |
|
1885 | 1885 | output = ["%s%s" % ('+'.join([hexfunc(p.node()) for p in parents]), |
|
1886 | 1886 | (changed) and "+" or "")] |
|
1887 | 1887 | if num: |
|
1888 | 1888 | output.append("%s%s" % ('+'.join([str(p.rev()) for p in parents]), |
|
1889 | 1889 | (changed) and "+" or "")) |
|
1890 | 1890 | else: |
|
1891 | 1891 | ctx = repo[rev] |
|
1892 | 1892 | if default or id: |
|
1893 | 1893 | output = [hexfunc(ctx.node())] |
|
1894 | 1894 | if num: |
|
1895 | 1895 | output.append(str(ctx.rev())) |
|
1896 | 1896 | |
|
1897 | 1897 | if repo.local() and default and not ui.quiet: |
|
1898 | 1898 | b = encoding.tolocal(ctx.branch()) |
|
1899 | 1899 | if b != 'default': |
|
1900 | 1900 | output.append("(%s)" % b) |
|
1901 | 1901 | |
|
1902 | 1902 | # multiple tags for a single parent separated by '/' |
|
1903 | 1903 | t = "/".join(ctx.tags()) |
|
1904 | 1904 | if t: |
|
1905 | 1905 | output.append(t) |
|
1906 | 1906 | |
|
1907 | 1907 | if branch: |
|
1908 | 1908 | output.append(encoding.tolocal(ctx.branch())) |
|
1909 | 1909 | |
|
1910 | 1910 | if tags: |
|
1911 | 1911 | output.extend(ctx.tags()) |
|
1912 | 1912 | |
|
1913 | 1913 | ui.write("%s\n" % ' '.join(output)) |
|
1914 | 1914 | |
|
1915 | 1915 | def import_(ui, repo, patch1, *patches, **opts): |
|
1916 | 1916 | """import an ordered set of patches |
|
1917 | 1917 | |
|
1918 | 1918 | Import a list of patches and commit them individually (unless |
|
1919 | 1919 | --no-commit is specified). |
|
1920 | 1920 | |
|
1921 | 1921 | If there are outstanding changes in the working directory, import |
|
1922 | 1922 | will abort unless given the -f/--force flag. |
|
1923 | 1923 | |
|
1924 | 1924 | You can import a patch straight from a mail message. Even patches |
|
1925 | 1925 | as attachments work (to use the body part, it must have type |
|
1926 | 1926 | text/plain or text/x-patch). From and Subject headers of email |
|
1927 | 1927 | message are used as default committer and commit message. All |
|
1928 | 1928 | text/plain body parts before first diff are added to commit |
|
1929 | 1929 | message. |
|
1930 | 1930 | |
|
1931 | 1931 | If the imported patch was generated by :hg:`export`, user and |
|
1932 | 1932 | description from patch override values from message headers and |
|
1933 | 1933 | body. Values given on command line with -m/--message and -u/--user |
|
1934 | 1934 | override these. |
|
1935 | 1935 | |
|
1936 | 1936 | If --exact is specified, import will set the working directory to |
|
1937 | 1937 | the parent of each patch before applying it, and will abort if the |
|
1938 | 1938 | resulting changeset has a different ID than the one recorded in |
|
1939 | 1939 | the patch. This may happen due to character set problems or other |
|
1940 | 1940 | deficiencies in the text patch format. |
|
1941 | 1941 | |
|
1942 | 1942 | With -s/--similarity, hg will attempt to discover renames and |
|
1943 | 1943 | copies in the patch in the same way as 'addremove'. |
|
1944 | 1944 | |
|
1945 | 1945 | To read a patch from standard input, use "-" as the patch name. If |
|
1946 | 1946 | a URL is specified, the patch will be downloaded from it. |
|
1947 | 1947 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
1948 | 1948 | |
|
1949 | 1949 | Returns 0 on success. |
|
1950 | 1950 | """ |
|
1951 | 1951 | patches = (patch1,) + patches |
|
1952 | 1952 | |
|
1953 | 1953 | date = opts.get('date') |
|
1954 | 1954 | if date: |
|
1955 | 1955 | opts['date'] = util.parsedate(date) |
|
1956 | 1956 | |
|
1957 | 1957 | try: |
|
1958 | 1958 | sim = float(opts.get('similarity') or 0) |
|
1959 | 1959 | except ValueError: |
|
1960 | 1960 | raise util.Abort(_('similarity must be a number')) |
|
1961 | 1961 | if sim < 0 or sim > 100: |
|
1962 | 1962 | raise util.Abort(_('similarity must be between 0 and 100')) |
|
1963 | 1963 | |
|
1964 | 1964 | if opts.get('exact') or not opts.get('force'): |
|
1965 | 1965 | cmdutil.bail_if_changed(repo) |
|
1966 | 1966 | |
|
1967 | 1967 | d = opts["base"] |
|
1968 | 1968 | strip = opts["strip"] |
|
1969 | 1969 | wlock = lock = None |
|
1970 | 1970 | |
|
1971 | 1971 | def tryone(ui, hunk): |
|
1972 | 1972 | tmpname, message, user, date, branch, nodeid, p1, p2 = \ |
|
1973 | 1973 | patch.extract(ui, hunk) |
|
1974 | 1974 | |
|
1975 | 1975 | if not tmpname: |
|
1976 | 1976 | return None |
|
1977 | 1977 | commitid = _('to working directory') |
|
1978 | 1978 | |
|
1979 | 1979 | try: |
|
1980 | 1980 | cmdline_message = cmdutil.logmessage(opts) |
|
1981 | 1981 | if cmdline_message: |
|
1982 | 1982 | # pickup the cmdline msg |
|
1983 | 1983 | message = cmdline_message |
|
1984 | 1984 | elif message: |
|
1985 | 1985 | # pickup the patch msg |
|
1986 | 1986 | message = message.strip() |
|
1987 | 1987 | else: |
|
1988 | 1988 | # launch the editor |
|
1989 | 1989 | message = None |
|
1990 | 1990 | ui.debug('message:\n%s\n' % message) |
|
1991 | 1991 | |
|
1992 | 1992 | wp = repo.parents() |
|
1993 | 1993 | if opts.get('exact'): |
|
1994 | 1994 | if not nodeid or not p1: |
|
1995 | 1995 | raise util.Abort(_('not a Mercurial patch')) |
|
1996 | 1996 | p1 = repo.lookup(p1) |
|
1997 | 1997 | p2 = repo.lookup(p2 or hex(nullid)) |
|
1998 | 1998 | |
|
1999 | 1999 | if p1 != wp[0].node(): |
|
2000 | 2000 | hg.clean(repo, p1) |
|
2001 | 2001 | repo.dirstate.setparents(p1, p2) |
|
2002 | 2002 | elif p2: |
|
2003 | 2003 | try: |
|
2004 | 2004 | p1 = repo.lookup(p1) |
|
2005 | 2005 | p2 = repo.lookup(p2) |
|
2006 | 2006 | if p1 == wp[0].node(): |
|
2007 | 2007 | repo.dirstate.setparents(p1, p2) |
|
2008 | 2008 | except error.RepoError: |
|
2009 | 2009 | pass |
|
2010 | 2010 | if opts.get('exact') or opts.get('import_branch'): |
|
2011 | 2011 | repo.dirstate.setbranch(branch or 'default') |
|
2012 | 2012 | |
|
2013 | 2013 | files = {} |
|
2014 | 2014 | try: |
|
2015 | 2015 | patch.patch(tmpname, ui, strip=strip, cwd=repo.root, |
|
2016 | 2016 | files=files, eolmode=None) |
|
2017 | 2017 | finally: |
|
2018 | 2018 | files = patch.updatedir(ui, repo, files, |
|
2019 | 2019 | similarity=sim / 100.0) |
|
2020 | 2020 | if not opts.get('no_commit'): |
|
2021 | 2021 | if opts.get('exact'): |
|
2022 | 2022 | m = None |
|
2023 | 2023 | else: |
|
2024 | 2024 | m = cmdutil.matchfiles(repo, files or []) |
|
2025 | 2025 | n = repo.commit(message, opts.get('user') or user, |
|
2026 | 2026 | opts.get('date') or date, match=m, |
|
2027 | 2027 | editor=cmdutil.commiteditor) |
|
2028 | 2028 | if opts.get('exact'): |
|
2029 | 2029 | if hex(n) != nodeid: |
|
2030 | 2030 | repo.rollback() |
|
2031 | 2031 | raise util.Abort(_('patch is damaged' |
|
2032 | 2032 | ' or loses information')) |
|
2033 | 2033 | # Force a dirstate write so that the next transaction |
|
2034 | 2034 | # backups an up-do-date file. |
|
2035 | 2035 | repo.dirstate.write() |
|
2036 | 2036 | if n: |
|
2037 | 2037 | commitid = short(n) |
|
2038 | 2038 | |
|
2039 | 2039 | return commitid |
|
2040 | 2040 | finally: |
|
2041 | 2041 | os.unlink(tmpname) |
|
2042 | 2042 | |
|
2043 | 2043 | try: |
|
2044 | 2044 | wlock = repo.wlock() |
|
2045 | 2045 | lock = repo.lock() |
|
2046 | 2046 | lastcommit = None |
|
2047 | 2047 | for p in patches: |
|
2048 | 2048 | pf = os.path.join(d, p) |
|
2049 | 2049 | |
|
2050 | 2050 | if pf == '-': |
|
2051 | 2051 | ui.status(_("applying patch from stdin\n")) |
|
2052 | 2052 | pf = sys.stdin |
|
2053 | 2053 | else: |
|
2054 | 2054 | ui.status(_("applying %s\n") % p) |
|
2055 | 2055 | pf = url.open(ui, pf) |
|
2056 | 2056 | |
|
2057 | 2057 | haspatch = False |
|
2058 | 2058 | for hunk in patch.split(pf): |
|
2059 | 2059 | commitid = tryone(ui, hunk) |
|
2060 | 2060 | if commitid: |
|
2061 | 2061 | haspatch = True |
|
2062 | 2062 | if lastcommit: |
|
2063 | 2063 | ui.status(_('applied %s\n') % lastcommit) |
|
2064 | 2064 | lastcommit = commitid |
|
2065 | 2065 | |
|
2066 | 2066 | if not haspatch: |
|
2067 | 2067 | raise util.Abort(_('no diffs found')) |
|
2068 | 2068 | |
|
2069 | 2069 | finally: |
|
2070 | 2070 | release(lock, wlock) |
|
2071 | 2071 | |
|
2072 | 2072 | def incoming(ui, repo, source="default", **opts): |
|
2073 | 2073 | """show new changesets found in source |
|
2074 | 2074 | |
|
2075 | 2075 | Show new changesets found in the specified path/URL or the default |
|
2076 | 2076 | pull location. These are the changesets that would have been pulled |
|
2077 | 2077 | if a pull at the time you issued this command. |
|
2078 | 2078 | |
|
2079 | 2079 | For remote repository, using --bundle avoids downloading the |
|
2080 | 2080 | changesets twice if the incoming is followed by a pull. |
|
2081 | 2081 | |
|
2082 | 2082 | See pull for valid source format details. |
|
2083 | 2083 | |
|
2084 | 2084 | Returns 0 if there are incoming changes, 1 otherwise. |
|
2085 | 2085 | """ |
|
2086 | 2086 | limit = cmdutil.loglimit(opts) |
|
2087 | 2087 | source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) |
|
2088 | 2088 | other = hg.repository(hg.remoteui(repo, opts), source) |
|
2089 | 2089 | ui.status(_('comparing with %s\n') % url.hidepassword(source)) |
|
2090 | 2090 | revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev')) |
|
2091 | 2091 | if revs: |
|
2092 | 2092 | revs = [other.lookup(rev) for rev in revs] |
|
2093 | 2093 | |
|
2094 | 2094 | tmp = discovery.findcommonincoming(repo, other, heads=revs, |
|
2095 | 2095 | force=opts.get('force')) |
|
2096 | 2096 | common, incoming, rheads = tmp |
|
2097 | 2097 | if not incoming: |
|
2098 | 2098 | try: |
|
2099 | 2099 | os.unlink(opts["bundle"]) |
|
2100 | 2100 | except: |
|
2101 | 2101 | pass |
|
2102 | 2102 | ui.status(_("no changes found\n")) |
|
2103 | 2103 | return 1 |
|
2104 | 2104 | |
|
2105 | 2105 | cleanup = None |
|
2106 | 2106 | try: |
|
2107 | 2107 | fname = opts["bundle"] |
|
2108 | 2108 | if fname or not other.local(): |
|
2109 | 2109 | # create a bundle (uncompressed if other repo is not local) |
|
2110 | 2110 | |
|
2111 | 2111 | if revs is None and other.capable('changegroupsubset'): |
|
2112 | 2112 | revs = rheads |
|
2113 | 2113 | |
|
2114 | 2114 | if revs is None: |
|
2115 | 2115 | cg = other.changegroup(incoming, "incoming") |
|
2116 | 2116 | else: |
|
2117 | 2117 | cg = other.changegroupsubset(incoming, revs, 'incoming') |
|
2118 | 2118 | bundletype = other.local() and "HG10BZ" or "HG10UN" |
|
2119 | 2119 | fname = cleanup = changegroup.writebundle(cg, fname, bundletype) |
|
2120 | 2120 | # keep written bundle? |
|
2121 | 2121 | if opts["bundle"]: |
|
2122 | 2122 | cleanup = None |
|
2123 | 2123 | if not other.local(): |
|
2124 | 2124 | # use the created uncompressed bundlerepo |
|
2125 | 2125 | other = bundlerepo.bundlerepository(ui, repo.root, fname) |
|
2126 | 2126 | |
|
2127 | 2127 | o = other.changelog.nodesbetween(incoming, revs)[0] |
|
2128 | 2128 | if opts.get('newest_first'): |
|
2129 | 2129 | o.reverse() |
|
2130 | 2130 | displayer = cmdutil.show_changeset(ui, other, opts) |
|
2131 | 2131 | count = 0 |
|
2132 | 2132 | for n in o: |
|
2133 | 2133 | if limit is not None and count >= limit: |
|
2134 | 2134 | break |
|
2135 | 2135 | parents = [p for p in other.changelog.parents(n) if p != nullid] |
|
2136 | 2136 | if opts.get('no_merges') and len(parents) == 2: |
|
2137 | 2137 | continue |
|
2138 | 2138 | count += 1 |
|
2139 | 2139 | displayer.show(other[n]) |
|
2140 | 2140 | displayer.close() |
|
2141 | 2141 | finally: |
|
2142 | 2142 | if hasattr(other, 'close'): |
|
2143 | 2143 | other.close() |
|
2144 | 2144 | if cleanup: |
|
2145 | 2145 | os.unlink(cleanup) |
|
2146 | 2146 | |
|
2147 | 2147 | def init(ui, dest=".", **opts): |
|
2148 | 2148 | """create a new repository in the given directory |
|
2149 | 2149 | |
|
2150 | 2150 | Initialize a new repository in the given directory. If the given |
|
2151 | 2151 | directory does not exist, it will be created. |
|
2152 | 2152 | |
|
2153 | 2153 | If no directory is given, the current directory is used. |
|
2154 | 2154 | |
|
2155 | 2155 | It is possible to specify an ``ssh://`` URL as the destination. |
|
2156 | 2156 | See :hg:`help urls` for more information. |
|
2157 | 2157 | |
|
2158 | 2158 | Returns 0 on success. |
|
2159 | 2159 | """ |
|
2160 | 2160 | hg.repository(hg.remoteui(ui, opts), dest, create=1) |
|
2161 | 2161 | |
|
2162 | 2162 | def locate(ui, repo, *pats, **opts): |
|
2163 | 2163 | """locate files matching specific patterns |
|
2164 | 2164 | |
|
2165 | 2165 | Print files under Mercurial control in the working directory whose |
|
2166 | 2166 | names match the given patterns. |
|
2167 | 2167 | |
|
2168 | 2168 | By default, this command searches all directories in the working |
|
2169 | 2169 | directory. To search just the current directory and its |
|
2170 | 2170 | subdirectories, use "--include .". |
|
2171 | 2171 | |
|
2172 | 2172 | If no patterns are given to match, this command prints the names |
|
2173 | 2173 | of all files under Mercurial control in the working directory. |
|
2174 | 2174 | |
|
2175 | 2175 | If you want to feed the output of this command into the "xargs" |
|
2176 | 2176 | command, use the -0 option to both this command and "xargs". This |
|
2177 | 2177 | will avoid the problem of "xargs" treating single filenames that |
|
2178 | 2178 | contain whitespace as multiple filenames. |
|
2179 | 2179 | |
|
2180 | 2180 | Returns 0 if a match is found, 1 otherwise. |
|
2181 | 2181 | """ |
|
2182 | 2182 | end = opts.get('print0') and '\0' or '\n' |
|
2183 | 2183 | rev = opts.get('rev') or None |
|
2184 | 2184 | |
|
2185 | 2185 | ret = 1 |
|
2186 | 2186 | m = cmdutil.match(repo, pats, opts, default='relglob') |
|
2187 | 2187 | m.bad = lambda x, y: False |
|
2188 | 2188 | for abs in repo[rev].walk(m): |
|
2189 | 2189 | if not rev and abs not in repo.dirstate: |
|
2190 | 2190 | continue |
|
2191 | 2191 | if opts.get('fullpath'): |
|
2192 | 2192 | ui.write(repo.wjoin(abs), end) |
|
2193 | 2193 | else: |
|
2194 | 2194 | ui.write(((pats and m.rel(abs)) or abs), end) |
|
2195 | 2195 | ret = 0 |
|
2196 | 2196 | |
|
2197 | 2197 | return ret |
|
2198 | 2198 | |
|
2199 | 2199 | def log(ui, repo, *pats, **opts): |
|
2200 | 2200 | """show revision history of entire repository or files |
|
2201 | 2201 | |
|
2202 | 2202 | Print the revision history of the specified files or the entire |
|
2203 | 2203 | project. |
|
2204 | 2204 | |
|
2205 | 2205 | File history is shown without following rename or copy history of |
|
2206 | 2206 | files. Use -f/--follow with a filename to follow history across |
|
2207 | 2207 | renames and copies. --follow without a filename will only show |
|
2208 | 2208 | ancestors or descendants of the starting revision. --follow-first |
|
2209 | 2209 | only follows the first parent of merge revisions. |
|
2210 | 2210 | |
|
2211 | 2211 | If no revision range is specified, the default is tip:0 unless |
|
2212 | 2212 | --follow is set, in which case the working directory parent is |
|
2213 | 2213 | used as the starting revision. |
|
2214 | 2214 | |
|
2215 | 2215 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
2216 | 2216 | |
|
2217 | 2217 | By default this command prints revision number and changeset id, |
|
2218 | 2218 | tags, non-trivial parents, user, date and time, and a summary for |
|
2219 | 2219 | each commit. When the -v/--verbose switch is used, the list of |
|
2220 | 2220 | changed files and full commit message are shown. |
|
2221 | 2221 | |
|
2222 | 2222 | NOTE: log -p/--patch may generate unexpected diff output for merge |
|
2223 | 2223 | changesets, as it will only compare the merge changeset against |
|
2224 | 2224 | its first parent. Also, only files different from BOTH parents |
|
2225 | 2225 | will appear in files:. |
|
2226 | 2226 | |
|
2227 | 2227 | Returns 0 on success. |
|
2228 | 2228 | """ |
|
2229 | 2229 | |
|
2230 | 2230 | matchfn = cmdutil.match(repo, pats, opts) |
|
2231 | 2231 | limit = cmdutil.loglimit(opts) |
|
2232 | 2232 | count = 0 |
|
2233 | 2233 | |
|
2234 | 2234 | endrev = None |
|
2235 | 2235 | if opts.get('copies') and opts.get('rev'): |
|
2236 | 2236 | endrev = max(cmdutil.revrange(repo, opts.get('rev'))) + 1 |
|
2237 | 2237 | |
|
2238 | 2238 | df = False |
|
2239 | 2239 | if opts["date"]: |
|
2240 | 2240 | df = util.matchdate(opts["date"]) |
|
2241 | 2241 | |
|
2242 | 2242 | branches = opts.get('branch', []) + opts.get('only_branch', []) |
|
2243 | 2243 | opts['branch'] = [repo.lookupbranch(b) for b in branches] |
|
2244 | 2244 | |
|
2245 | 2245 | displayer = cmdutil.show_changeset(ui, repo, opts, True, matchfn) |
|
2246 | 2246 | def prep(ctx, fns): |
|
2247 | 2247 | rev = ctx.rev() |
|
2248 | 2248 | parents = [p for p in repo.changelog.parentrevs(rev) |
|
2249 | 2249 | if p != nullrev] |
|
2250 | 2250 | if opts.get('no_merges') and len(parents) == 2: |
|
2251 | 2251 | return |
|
2252 | 2252 | if opts.get('only_merges') and len(parents) != 2: |
|
2253 | 2253 | return |
|
2254 | 2254 | if opts.get('branch') and ctx.branch() not in opts['branch']: |
|
2255 | 2255 | return |
|
2256 | 2256 | if df and not df(ctx.date()[0]): |
|
2257 | 2257 | return |
|
2258 | 2258 | if opts['user'] and not [k for k in opts['user'] if k in ctx.user()]: |
|
2259 | 2259 | return |
|
2260 | 2260 | if opts.get('keyword'): |
|
2261 | 2261 | for k in [kw.lower() for kw in opts['keyword']]: |
|
2262 | 2262 | if (k in ctx.user().lower() or |
|
2263 | 2263 | k in ctx.description().lower() or |
|
2264 | 2264 | k in " ".join(ctx.files()).lower()): |
|
2265 | 2265 | break |
|
2266 | 2266 | else: |
|
2267 | 2267 | return |
|
2268 | 2268 | |
|
2269 | 2269 | copies = None |
|
2270 | 2270 | if opts.get('copies') and rev: |
|
2271 | 2271 | copies = [] |
|
2272 | 2272 | getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) |
|
2273 | 2273 | for fn in ctx.files(): |
|
2274 | 2274 | rename = getrenamed(fn, rev) |
|
2275 | 2275 | if rename: |
|
2276 | 2276 | copies.append((fn, rename[0])) |
|
2277 | 2277 | |
|
2278 | 2278 | displayer.show(ctx, copies=copies) |
|
2279 | 2279 | |
|
2280 | 2280 | for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep): |
|
2281 | 2281 | if count == limit: |
|
2282 | 2282 | break |
|
2283 | 2283 | if displayer.flush(ctx.rev()): |
|
2284 | 2284 | count += 1 |
|
2285 | 2285 | displayer.close() |
|
2286 | 2286 | |
|
2287 | 2287 | def manifest(ui, repo, node=None, rev=None): |
|
2288 | 2288 | """output the current or given revision of the project manifest |
|
2289 | 2289 | |
|
2290 | 2290 | Print a list of version controlled files for the given revision. |
|
2291 | 2291 | If no revision is given, the first parent of the working directory |
|
2292 | 2292 | is used, or the null revision if no revision is checked out. |
|
2293 | 2293 | |
|
2294 | 2294 | With -v, print file permissions, symlink and executable bits. |
|
2295 | 2295 | With --debug, print file revision hashes. |
|
2296 | 2296 | |
|
2297 | 2297 | Returns 0 on success. |
|
2298 | 2298 | """ |
|
2299 | 2299 | |
|
2300 | 2300 | if rev and node: |
|
2301 | 2301 | raise util.Abort(_("please specify just one revision")) |
|
2302 | 2302 | |
|
2303 | 2303 | if not node: |
|
2304 | 2304 | node = rev |
|
2305 | 2305 | |
|
2306 | 2306 | decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '} |
|
2307 | 2307 | ctx = repo[node] |
|
2308 | 2308 | for f in ctx: |
|
2309 | 2309 | if ui.debugflag: |
|
2310 | 2310 | ui.write("%40s " % hex(ctx.manifest()[f])) |
|
2311 | 2311 | if ui.verbose: |
|
2312 | 2312 | ui.write(decor[ctx.flags(f)]) |
|
2313 | 2313 | ui.write("%s\n" % f) |
|
2314 | 2314 | |
|
2315 | 2315 | def merge(ui, repo, node=None, **opts): |
|
2316 | 2316 | """merge working directory with another revision |
|
2317 | 2317 | |
|
2318 | 2318 | The current working directory is updated with all changes made in |
|
2319 | 2319 | the requested revision since the last common predecessor revision. |
|
2320 | 2320 | |
|
2321 | 2321 | Files that changed between either parent are marked as changed for |
|
2322 | 2322 | the next commit and a commit must be performed before any further |
|
2323 | 2323 | updates to the repository are allowed. The next commit will have |
|
2324 | 2324 | two parents. |
|
2325 | 2325 | |
|
2326 | 2326 | If no revision is specified, the working directory's parent is a |
|
2327 | 2327 | head revision, and the current branch contains exactly one other |
|
2328 | 2328 | head, the other head is merged with by default. Otherwise, an |
|
2329 | 2329 | explicit revision with which to merge with must be provided. |
|
2330 | 2330 | |
|
2331 | 2331 | Returns 0 on success, 1 if there are unresolved files. |
|
2332 | 2332 | """ |
|
2333 | 2333 | |
|
2334 | 2334 | if opts.get('rev') and node: |
|
2335 | 2335 | raise util.Abort(_("please specify just one revision")) |
|
2336 | 2336 | if not node: |
|
2337 | 2337 | node = opts.get('rev') |
|
2338 | 2338 | |
|
2339 | 2339 | if not node: |
|
2340 | 2340 | branch = repo.changectx(None).branch() |
|
2341 | 2341 | bheads = repo.branchheads(branch) |
|
2342 | 2342 | if len(bheads) > 2: |
|
2343 | 2343 | ui.warn(_("abort: branch '%s' has %d heads - " |
|
2344 | 2344 | "please merge with an explicit rev\n") |
|
2345 | 2345 | % (branch, len(bheads))) |
|
2346 | 2346 | ui.status(_("(run 'hg heads .' to see heads)\n")) |
|
2347 | 2347 | return False |
|
2348 | 2348 | |
|
2349 | 2349 | parent = repo.dirstate.parents()[0] |
|
2350 | 2350 | if len(bheads) == 1: |
|
2351 | 2351 | if len(repo.heads()) > 1: |
|
2352 | 2352 | ui.warn(_("abort: branch '%s' has one head - " |
|
2353 | 2353 | "please merge with an explicit rev\n" % branch)) |
|
2354 | 2354 | ui.status(_("(run 'hg heads' to see all heads)\n")) |
|
2355 | 2355 | return False |
|
2356 | 2356 | msg = _('there is nothing to merge') |
|
2357 | 2357 | if parent != repo.lookup(repo[None].branch()): |
|
2358 | 2358 | msg = _('%s - use "hg update" instead') % msg |
|
2359 | 2359 | raise util.Abort(msg) |
|
2360 | 2360 | |
|
2361 | 2361 | if parent not in bheads: |
|
2362 | 2362 | raise util.Abort(_('working dir not at a head rev - ' |
|
2363 | 2363 | 'use "hg update" or merge with an explicit rev')) |
|
2364 | 2364 | node = parent == bheads[0] and bheads[-1] or bheads[0] |
|
2365 | 2365 | |
|
2366 | 2366 | if opts.get('preview'): |
|
2367 | 2367 | # find nodes that are ancestors of p2 but not of p1 |
|
2368 | 2368 | p1 = repo.lookup('.') |
|
2369 | 2369 | p2 = repo.lookup(node) |
|
2370 | 2370 | nodes = repo.changelog.findmissing(common=[p1], heads=[p2]) |
|
2371 | 2371 | |
|
2372 | 2372 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
2373 | 2373 | for node in nodes: |
|
2374 | 2374 | displayer.show(repo[node]) |
|
2375 | 2375 | displayer.close() |
|
2376 | 2376 | return 0 |
|
2377 | 2377 | |
|
2378 | 2378 | return hg.merge(repo, node, force=opts.get('force')) |
|
2379 | 2379 | |
|
2380 | 2380 | def outgoing(ui, repo, dest=None, **opts): |
|
2381 | 2381 | """show changesets not found in the destination |
|
2382 | 2382 | |
|
2383 | 2383 | Show changesets not found in the specified destination repository |
|
2384 | 2384 | or the default push location. These are the changesets that would |
|
2385 | 2385 | be pushed if a push was requested. |
|
2386 | 2386 | |
|
2387 | 2387 | See pull for details of valid destination formats. |
|
2388 | 2388 | |
|
2389 | 2389 | Returns 0 if there are outgoing changes, 1 otherwise. |
|
2390 | 2390 | """ |
|
2391 | 2391 | limit = cmdutil.loglimit(opts) |
|
2392 | 2392 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
2393 | 2393 | dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
2394 | 2394 | revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev')) |
|
2395 | 2395 | if revs: |
|
2396 | 2396 | revs = [repo.lookup(rev) for rev in revs] |
|
2397 | 2397 | |
|
2398 | 2398 | other = hg.repository(hg.remoteui(repo, opts), dest) |
|
2399 | 2399 | ui.status(_('comparing with %s\n') % url.hidepassword(dest)) |
|
2400 | 2400 | o = discovery.findoutgoing(repo, other, force=opts.get('force')) |
|
2401 | 2401 | if not o: |
|
2402 | 2402 | ui.status(_("no changes found\n")) |
|
2403 | 2403 | return 1 |
|
2404 | 2404 | o = repo.changelog.nodesbetween(o, revs)[0] |
|
2405 | 2405 | if opts.get('newest_first'): |
|
2406 | 2406 | o.reverse() |
|
2407 | 2407 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
2408 | 2408 | count = 0 |
|
2409 | 2409 | for n in o: |
|
2410 | 2410 | if limit is not None and count >= limit: |
|
2411 | 2411 | break |
|
2412 | 2412 | parents = [p for p in repo.changelog.parents(n) if p != nullid] |
|
2413 | 2413 | if opts.get('no_merges') and len(parents) == 2: |
|
2414 | 2414 | continue |
|
2415 | 2415 | count += 1 |
|
2416 | 2416 | displayer.show(repo[n]) |
|
2417 | 2417 | displayer.close() |
|
2418 | 2418 | |
|
2419 | 2419 | def parents(ui, repo, file_=None, **opts): |
|
2420 | 2420 | """show the parents of the working directory or revision |
|
2421 | 2421 | |
|
2422 | 2422 | Print the working directory's parent revisions. If a revision is |
|
2423 | 2423 | given via -r/--rev, the parent of that revision will be printed. |
|
2424 | 2424 | If a file argument is given, the revision in which the file was |
|
2425 | 2425 | last changed (before the working directory revision or the |
|
2426 | 2426 | argument to --rev if given) is printed. |
|
2427 | 2427 | |
|
2428 | 2428 | Returns 0 on success. |
|
2429 | 2429 | """ |
|
2430 | 2430 | rev = opts.get('rev') |
|
2431 | 2431 | if rev: |
|
2432 | 2432 | ctx = repo[rev] |
|
2433 | 2433 | else: |
|
2434 | 2434 | ctx = repo[None] |
|
2435 | 2435 | |
|
2436 | 2436 | if file_: |
|
2437 | 2437 | m = cmdutil.match(repo, (file_,), opts) |
|
2438 | 2438 | if m.anypats() or len(m.files()) != 1: |
|
2439 | 2439 | raise util.Abort(_('can only specify an explicit filename')) |
|
2440 | 2440 | file_ = m.files()[0] |
|
2441 | 2441 | filenodes = [] |
|
2442 | 2442 | for cp in ctx.parents(): |
|
2443 | 2443 | if not cp: |
|
2444 | 2444 | continue |
|
2445 | 2445 | try: |
|
2446 | 2446 | filenodes.append(cp.filenode(file_)) |
|
2447 | 2447 | except error.LookupError: |
|
2448 | 2448 | pass |
|
2449 | 2449 | if not filenodes: |
|
2450 | 2450 | raise util.Abort(_("'%s' not found in manifest!") % file_) |
|
2451 | 2451 | fl = repo.file(file_) |
|
2452 | 2452 | p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes] |
|
2453 | 2453 | else: |
|
2454 | 2454 | p = [cp.node() for cp in ctx.parents()] |
|
2455 | 2455 | |
|
2456 | 2456 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
2457 | 2457 | for n in p: |
|
2458 | 2458 | if n != nullid: |
|
2459 | 2459 | displayer.show(repo[n]) |
|
2460 | 2460 | displayer.close() |
|
2461 | 2461 | |
|
2462 | 2462 | def paths(ui, repo, search=None): |
|
2463 | 2463 | """show aliases for remote repositories |
|
2464 | 2464 | |
|
2465 | 2465 | Show definition of symbolic path name NAME. If no name is given, |
|
2466 | 2466 | show definition of all available names. |
|
2467 | 2467 | |
|
2468 | 2468 | Path names are defined in the [paths] section of |
|
2469 | 2469 | ``/etc/mercurial/hgrc`` and ``$HOME/.hgrc``. If run inside a |
|
2470 | 2470 | repository, ``.hg/hgrc`` is used, too. |
|
2471 | 2471 | |
|
2472 | 2472 | The path names ``default`` and ``default-push`` have a special |
|
2473 | 2473 | meaning. When performing a push or pull operation, they are used |
|
2474 | 2474 | as fallbacks if no location is specified on the command-line. |
|
2475 | 2475 | When ``default-push`` is set, it will be used for push and |
|
2476 | 2476 | ``default`` will be used for pull; otherwise ``default`` is used |
|
2477 | 2477 | as the fallback for both. When cloning a repository, the clone |
|
2478 | 2478 | source is written as ``default`` in ``.hg/hgrc``. Note that |
|
2479 | 2479 | ``default`` and ``default-push`` apply to all inbound (e.g. |
|
2480 | 2480 | :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and |
|
2481 | 2481 | :hg:`bundle`) operations. |
|
2482 | 2482 | |
|
2483 | 2483 | See :hg:`help urls` for more information. |
|
2484 | 2484 | """ |
|
2485 | 2485 | if search: |
|
2486 | 2486 | for name, path in ui.configitems("paths"): |
|
2487 | 2487 | if name == search: |
|
2488 | 2488 | ui.write("%s\n" % url.hidepassword(path)) |
|
2489 | 2489 | return |
|
2490 | 2490 | ui.warn(_("not found!\n")) |
|
2491 | 2491 | return 1 |
|
2492 | 2492 | else: |
|
2493 | 2493 | for name, path in ui.configitems("paths"): |
|
2494 | 2494 | ui.write("%s = %s\n" % (name, url.hidepassword(path))) |
|
2495 | 2495 | |
|
2496 | 2496 | def postincoming(ui, repo, modheads, optupdate, checkout): |
|
2497 | 2497 | if modheads == 0: |
|
2498 | 2498 | return |
|
2499 | 2499 | if optupdate: |
|
2500 | 2500 | if (modheads <= 1 or len(repo.branchheads()) == 1) or checkout: |
|
2501 | 2501 | return hg.update(repo, checkout) |
|
2502 | 2502 | else: |
|
2503 | 2503 | ui.status(_("not updating, since new heads added\n")) |
|
2504 | 2504 | if modheads > 1: |
|
2505 | 2505 | ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) |
|
2506 | 2506 | else: |
|
2507 | 2507 | ui.status(_("(run 'hg update' to get a working copy)\n")) |
|
2508 | 2508 | |
|
2509 | 2509 | def pull(ui, repo, source="default", **opts): |
|
2510 | 2510 | """pull changes from the specified source |
|
2511 | 2511 | |
|
2512 | 2512 | Pull changes from a remote repository to a local one. |
|
2513 | 2513 | |
|
2514 | 2514 | This finds all changes from the repository at the specified path |
|
2515 | 2515 | or URL and adds them to a local repository (the current one unless |
|
2516 | 2516 | -R is specified). By default, this does not update the copy of the |
|
2517 | 2517 | project in the working directory. |
|
2518 | 2518 | |
|
2519 | 2519 | Use :hg:`incoming` if you want to see what would have been added |
|
2520 | 2520 | by a pull at the time you issued this command. If you then decide |
|
2521 | 2521 | to add those changes to the repository, you should use :hg:`pull |
|
2522 | 2522 | -r X` where ``X`` is the last changeset listed by :hg:`incoming`. |
|
2523 | 2523 | |
|
2524 | 2524 | If SOURCE is omitted, the 'default' path will be used. |
|
2525 | 2525 | See :hg:`help urls` for more information. |
|
2526 | 2526 | |
|
2527 | 2527 | Returns 0 on success, 1 if an update had unresolved files. |
|
2528 | 2528 | """ |
|
2529 | 2529 | source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) |
|
2530 | 2530 | other = hg.repository(hg.remoteui(repo, opts), source) |
|
2531 | 2531 | ui.status(_('pulling from %s\n') % url.hidepassword(source)) |
|
2532 | 2532 | revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev')) |
|
2533 | 2533 | if revs: |
|
2534 | 2534 | try: |
|
2535 | 2535 | revs = [other.lookup(rev) for rev in revs] |
|
2536 | 2536 | except error.CapabilityError: |
|
2537 | 2537 | err = _("Other repository doesn't support revision lookup, " |
|
2538 | 2538 | "so a rev cannot be specified.") |
|
2539 | 2539 | raise util.Abort(err) |
|
2540 | 2540 | |
|
2541 | 2541 | modheads = repo.pull(other, heads=revs, force=opts.get('force')) |
|
2542 | 2542 | if checkout: |
|
2543 | 2543 | checkout = str(repo.changelog.rev(other.lookup(checkout))) |
|
2544 | 2544 | return postincoming(ui, repo, modheads, opts.get('update'), checkout) |
|
2545 | 2545 | |
|
2546 | 2546 | def push(ui, repo, dest=None, **opts): |
|
2547 | 2547 | """push changes to the specified destination |
|
2548 | 2548 | |
|
2549 | 2549 | Push changesets from the local repository to the specified |
|
2550 | 2550 | destination. |
|
2551 | 2551 | |
|
2552 | 2552 | This operation is symmetrical to pull: it is identical to a pull |
|
2553 | 2553 | in the destination repository from the current one. |
|
2554 | 2554 | |
|
2555 | 2555 | By default, push will not allow creation of new heads at the |
|
2556 | 2556 | destination, since multiple heads would make it unclear which head |
|
2557 | 2557 | to use. In this situation, it is recommended to pull and merge |
|
2558 | 2558 | before pushing. |
|
2559 | 2559 | |
|
2560 | 2560 | Use --new-branch if you want to allow push to create a new named |
|
2561 | 2561 | branch that is not present at the destination. This allows you to |
|
2562 | 2562 | only create a new branch without forcing other changes. |
|
2563 | 2563 | |
|
2564 | 2564 | Use -f/--force to override the default behavior and push all |
|
2565 | 2565 | changesets on all branches. |
|
2566 | 2566 | |
|
2567 | 2567 | If -r/--rev is used, the specified revision and all its ancestors |
|
2568 | 2568 | will be pushed to the remote repository. |
|
2569 | 2569 | |
|
2570 | 2570 | Please see :hg:`help urls` for important details about ``ssh://`` |
|
2571 | 2571 | URLs. If DESTINATION is omitted, a default path will be used. |
|
2572 | 2572 | |
|
2573 | 2573 | Returns 0 if push was successful, 1 if nothing to push. |
|
2574 | 2574 | """ |
|
2575 | 2575 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
2576 | 2576 | dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
2577 | 2577 | revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev')) |
|
2578 | 2578 | other = hg.repository(hg.remoteui(repo, opts), dest) |
|
2579 | 2579 | ui.status(_('pushing to %s\n') % url.hidepassword(dest)) |
|
2580 | 2580 | if revs: |
|
2581 | 2581 | revs = [repo.lookup(rev) for rev in revs] |
|
2582 | 2582 | |
|
2583 | 2583 | # push subrepos depth-first for coherent ordering |
|
2584 | 2584 | c = repo[''] |
|
2585 | 2585 | subs = c.substate # only repos that are committed |
|
2586 | 2586 | for s in sorted(subs): |
|
2587 | 2587 | if not c.sub(s).push(opts.get('force')): |
|
2588 | 2588 | return False |
|
2589 | 2589 | |
|
2590 | 2590 | r = repo.push(other, opts.get('force'), revs=revs, |
|
2591 | 2591 | newbranch=opts.get('new_branch')) |
|
2592 | 2592 | return r == 0 |
|
2593 | 2593 | |
|
2594 | 2594 | def recover(ui, repo): |
|
2595 | 2595 | """roll back an interrupted transaction |
|
2596 | 2596 | |
|
2597 | 2597 | Recover from an interrupted commit or pull. |
|
2598 | 2598 | |
|
2599 | 2599 | This command tries to fix the repository status after an |
|
2600 | 2600 | interrupted operation. It should only be necessary when Mercurial |
|
2601 | 2601 | suggests it. |
|
2602 | 2602 | |
|
2603 | 2603 | Returns 0 if successful, 1 if nothing to recover or verify fails. |
|
2604 | 2604 | """ |
|
2605 | 2605 | if repo.recover(): |
|
2606 | 2606 | return hg.verify(repo) |
|
2607 | 2607 | return 1 |
|
2608 | 2608 | |
|
2609 | 2609 | def remove(ui, repo, *pats, **opts): |
|
2610 | 2610 | """remove the specified files on the next commit |
|
2611 | 2611 | |
|
2612 | 2612 | Schedule the indicated files for removal from the repository. |
|
2613 | 2613 | |
|
2614 | 2614 | This only removes files from the current branch, not from the |
|
2615 | 2615 | entire project history. -A/--after can be used to remove only |
|
2616 | 2616 | files that have already been deleted, -f/--force can be used to |
|
2617 | 2617 | force deletion, and -Af can be used to remove files from the next |
|
2618 | 2618 | revision without deleting them from the working directory. |
|
2619 | 2619 | |
|
2620 | 2620 | The following table details the behavior of remove for different |
|
2621 | 2621 | file states (columns) and option combinations (rows). The file |
|
2622 | 2622 | states are Added [A], Clean [C], Modified [M] and Missing [!] (as |
|
2623 | 2623 | reported by :hg:`status`). The actions are Warn, Remove (from |
|
2624 | 2624 | branch) and Delete (from disk):: |
|
2625 | 2625 | |
|
2626 | 2626 | A C M ! |
|
2627 | 2627 | none W RD W R |
|
2628 | 2628 | -f R RD RD R |
|
2629 | 2629 | -A W W W R |
|
2630 | 2630 | -Af R R R R |
|
2631 | 2631 | |
|
2632 | 2632 | This command schedules the files to be removed at the next commit. |
|
2633 | 2633 | To undo a remove before that, see :hg:`revert`. |
|
2634 | 2634 | |
|
2635 | 2635 | Returns 0 on success, 1 if any warnings encountered. |
|
2636 | 2636 | """ |
|
2637 | 2637 | |
|
2638 | 2638 | ret = 0 |
|
2639 | 2639 | after, force = opts.get('after'), opts.get('force') |
|
2640 | 2640 | if not pats and not after: |
|
2641 | 2641 | raise util.Abort(_('no files specified')) |
|
2642 | 2642 | |
|
2643 | 2643 | m = cmdutil.match(repo, pats, opts) |
|
2644 | 2644 | s = repo.status(match=m, clean=True) |
|
2645 | 2645 | modified, added, deleted, clean = s[0], s[1], s[3], s[6] |
|
2646 | 2646 | |
|
2647 | 2647 | for f in m.files(): |
|
2648 | 2648 | if f not in repo.dirstate and not os.path.isdir(m.rel(f)): |
|
2649 | 2649 | ui.warn(_('not removing %s: file is untracked\n') % m.rel(f)) |
|
2650 | 2650 | ret = 1 |
|
2651 | 2651 | |
|
2652 | 2652 | def warn(files, reason): |
|
2653 | 2653 | for f in files: |
|
2654 | 2654 | ui.warn(_('not removing %s: file %s (use -f to force removal)\n') |
|
2655 | 2655 | % (m.rel(f), reason)) |
|
2656 | 2656 | ret = 1 |
|
2657 | 2657 | |
|
2658 | 2658 | if force: |
|
2659 | 2659 | remove, forget = modified + deleted + clean, added |
|
2660 | 2660 | elif after: |
|
2661 | 2661 | remove, forget = deleted, [] |
|
2662 | 2662 | warn(modified + added + clean, _('still exists')) |
|
2663 | 2663 | else: |
|
2664 | 2664 | remove, forget = deleted + clean, [] |
|
2665 | 2665 | warn(modified, _('is modified')) |
|
2666 | 2666 | warn(added, _('has been marked for add')) |
|
2667 | 2667 | |
|
2668 | 2668 | for f in sorted(remove + forget): |
|
2669 | 2669 | if ui.verbose or not m.exact(f): |
|
2670 | 2670 | ui.status(_('removing %s\n') % m.rel(f)) |
|
2671 | 2671 | |
|
2672 | 2672 | repo.forget(forget) |
|
2673 | 2673 | repo.remove(remove, unlink=not after) |
|
2674 | 2674 | return ret |
|
2675 | 2675 | |
|
2676 | 2676 | def rename(ui, repo, *pats, **opts): |
|
2677 | 2677 | """rename files; equivalent of copy + remove |
|
2678 | 2678 | |
|
2679 | 2679 | Mark dest as copies of sources; mark sources for deletion. If dest |
|
2680 | 2680 | is a directory, copies are put in that directory. If dest is a |
|
2681 | 2681 | file, there can only be one source. |
|
2682 | 2682 | |
|
2683 | 2683 | By default, this command copies the contents of files as they |
|
2684 | 2684 | exist in the working directory. If invoked with -A/--after, the |
|
2685 | 2685 | operation is recorded, but no copying is performed. |
|
2686 | 2686 | |
|
2687 | 2687 | This command takes effect at the next commit. To undo a rename |
|
2688 | 2688 | before that, see :hg:`revert`. |
|
2689 | 2689 | |
|
2690 | 2690 | Returns 0 on success, 1 if errors are encountered. |
|
2691 | 2691 | """ |
|
2692 | 2692 | wlock = repo.wlock(False) |
|
2693 | 2693 | try: |
|
2694 | 2694 | return cmdutil.copy(ui, repo, pats, opts, rename=True) |
|
2695 | 2695 | finally: |
|
2696 | 2696 | wlock.release() |
|
2697 | 2697 | |
|
2698 | 2698 | def resolve(ui, repo, *pats, **opts): |
|
2699 | 2699 | """various operations to help finish a merge |
|
2700 | 2700 | |
|
2701 | 2701 | This command includes several actions that are often useful while |
|
2702 | 2702 | performing a merge, after running ``merge`` but before running |
|
2703 | 2703 | ``commit``. (It is only meaningful if your working directory has |
|
2704 | 2704 | two parents.) It is most relevant for merges with unresolved |
|
2705 | 2705 | conflicts, which are typically a result of non-interactive merging with |
|
2706 | 2706 | ``internal:merge`` or a command-line merge tool like ``diff3``. |
|
2707 | 2707 | |
|
2708 | 2708 | The available actions are: |
|
2709 | 2709 | |
|
2710 | 2710 | 1) list files that were merged with conflicts (U, for unresolved) |
|
2711 | 2711 | and without conflicts (R, for resolved): ``hg resolve -l`` |
|
2712 | 2712 | (this is like ``status`` for merges) |
|
2713 | 2713 | 2) record that you have resolved conflicts in certain files: |
|
2714 | 2714 | ``hg resolve -m [file ...]`` (default: mark all unresolved files) |
|
2715 | 2715 | 3) forget that you have resolved conflicts in certain files: |
|
2716 | 2716 | ``hg resolve -u [file ...]`` (default: unmark all resolved files) |
|
2717 | 2717 | 4) discard your current attempt(s) at resolving conflicts and |
|
2718 | 2718 | restart the merge from scratch: ``hg resolve file...`` |
|
2719 | 2719 | (or ``-a`` for all unresolved files) |
|
2720 | 2720 | |
|
2721 | 2721 | Note that Mercurial will not let you commit files with unresolved merge |
|
2722 | 2722 | conflicts. You must use ``hg resolve -m ...`` before you can commit |
|
2723 | 2723 | after a conflicting merge. |
|
2724 | 2724 | |
|
2725 | 2725 | Returns 0 on success, 1 if any files fail a resolve attempt. |
|
2726 | 2726 | """ |
|
2727 | 2727 | |
|
2728 | 2728 | all, mark, unmark, show, nostatus = \ |
|
2729 | 2729 | [opts.get(o) for o in 'all mark unmark list no_status'.split()] |
|
2730 | 2730 | |
|
2731 | 2731 | if (show and (mark or unmark)) or (mark and unmark): |
|
2732 | 2732 | raise util.Abort(_("too many options specified")) |
|
2733 | 2733 | if pats and all: |
|
2734 | 2734 | raise util.Abort(_("can't specify --all and patterns")) |
|
2735 | 2735 | if not (all or pats or show or mark or unmark): |
|
2736 | 2736 | raise util.Abort(_('no files or directories specified; ' |
|
2737 | 2737 | 'use --all to remerge all files')) |
|
2738 | 2738 | |
|
2739 | 2739 | ms = mergemod.mergestate(repo) |
|
2740 | 2740 | m = cmdutil.match(repo, pats, opts) |
|
2741 | 2741 | ret = 0 |
|
2742 | 2742 | |
|
2743 | 2743 | for f in ms: |
|
2744 | 2744 | if m(f): |
|
2745 | 2745 | if show: |
|
2746 | 2746 | if nostatus: |
|
2747 | 2747 | ui.write("%s\n" % f) |
|
2748 | 2748 | else: |
|
2749 | 2749 | ui.write("%s %s\n" % (ms[f].upper(), f), |
|
2750 | 2750 | label='resolve.' + |
|
2751 | 2751 | {'u': 'unresolved', 'r': 'resolved'}[ms[f]]) |
|
2752 | 2752 | elif mark: |
|
2753 | 2753 | ms.mark(f, "r") |
|
2754 | 2754 | elif unmark: |
|
2755 | 2755 | ms.mark(f, "u") |
|
2756 | 2756 | else: |
|
2757 | 2757 | wctx = repo[None] |
|
2758 | 2758 | mctx = wctx.parents()[-1] |
|
2759 | 2759 | |
|
2760 | 2760 | # backup pre-resolve (merge uses .orig for its own purposes) |
|
2761 | 2761 | a = repo.wjoin(f) |
|
2762 | 2762 | util.copyfile(a, a + ".resolve") |
|
2763 | 2763 | |
|
2764 | 2764 | # resolve file |
|
2765 | 2765 | if ms.resolve(f, wctx, mctx): |
|
2766 | 2766 | ret = 1 |
|
2767 | 2767 | |
|
2768 | 2768 | # replace filemerge's .orig file with our resolve file |
|
2769 | 2769 | util.rename(a + ".resolve", a + ".orig") |
|
2770 | 2770 | return ret |
|
2771 | 2771 | |
|
2772 | 2772 | def revert(ui, repo, *pats, **opts): |
|
2773 | 2773 | """restore individual files or directories to an earlier state |
|
2774 | 2774 | |
|
2775 | 2775 | (Use update -r to check out earlier revisions, revert does not |
|
2776 | 2776 | change the working directory parents.) |
|
2777 | 2777 | |
|
2778 | 2778 | With no revision specified, revert the named files or directories |
|
2779 | 2779 | to the contents they had in the parent of the working directory. |
|
2780 | 2780 | This restores the contents of the affected files to an unmodified |
|
2781 | 2781 | state and unschedules adds, removes, copies, and renames. If the |
|
2782 | 2782 | working directory has two parents, you must explicitly specify a |
|
2783 | 2783 | revision. |
|
2784 | 2784 | |
|
2785 | 2785 | Using the -r/--rev option, revert the given files or directories |
|
2786 | 2786 | to their contents as of a specific revision. This can be helpful |
|
2787 | 2787 | to "roll back" some or all of an earlier change. See :hg:`help |
|
2788 | 2788 | dates` for a list of formats valid for -d/--date. |
|
2789 | 2789 | |
|
2790 | 2790 | Revert modifies the working directory. It does not commit any |
|
2791 | 2791 | changes, or change the parent of the working directory. If you |
|
2792 | 2792 | revert to a revision other than the parent of the working |
|
2793 | 2793 | directory, the reverted files will thus appear modified |
|
2794 | 2794 | afterwards. |
|
2795 | 2795 | |
|
2796 | 2796 | If a file has been deleted, it is restored. If the executable mode |
|
2797 | 2797 | of a file was changed, it is reset. |
|
2798 | 2798 | |
|
2799 | 2799 | If names are given, all files matching the names are reverted. |
|
2800 | 2800 | If no arguments are given, no files are reverted. |
|
2801 | 2801 | |
|
2802 | 2802 | Modified files are saved with a .orig suffix before reverting. |
|
2803 | 2803 | To disable these backups, use --no-backup. |
|
2804 | 2804 | |
|
2805 | 2805 | Returns 0 on success. |
|
2806 | 2806 | """ |
|
2807 | 2807 | |
|
2808 | 2808 | if opts["date"]: |
|
2809 | 2809 | if opts["rev"]: |
|
2810 | 2810 | raise util.Abort(_("you can't specify a revision and a date")) |
|
2811 | 2811 | opts["rev"] = cmdutil.finddate(ui, repo, opts["date"]) |
|
2812 | 2812 | |
|
2813 | 2813 | if not pats and not opts.get('all'): |
|
2814 | 2814 | raise util.Abort(_('no files or directories specified; ' |
|
2815 | 2815 | 'use --all to revert the whole repo')) |
|
2816 | 2816 | |
|
2817 | 2817 | parent, p2 = repo.dirstate.parents() |
|
2818 | 2818 | if not opts.get('rev') and p2 != nullid: |
|
2819 | 2819 | raise util.Abort(_('uncommitted merge - please provide a ' |
|
2820 | 2820 | 'specific revision')) |
|
2821 | 2821 | ctx = repo[opts.get('rev')] |
|
2822 | 2822 | node = ctx.node() |
|
2823 | 2823 | mf = ctx.manifest() |
|
2824 | 2824 | if node == parent: |
|
2825 | 2825 | pmf = mf |
|
2826 | 2826 | else: |
|
2827 | 2827 | pmf = None |
|
2828 | 2828 | |
|
2829 | 2829 | # need all matching names in dirstate and manifest of target rev, |
|
2830 | 2830 | # so have to walk both. do not print errors if files exist in one |
|
2831 | 2831 | # but not other. |
|
2832 | 2832 | |
|
2833 | 2833 | names = {} |
|
2834 | 2834 | |
|
2835 | 2835 | wlock = repo.wlock() |
|
2836 | 2836 | try: |
|
2837 | 2837 | # walk dirstate. |
|
2838 | 2838 | |
|
2839 | 2839 | m = cmdutil.match(repo, pats, opts) |
|
2840 | 2840 | m.bad = lambda x, y: False |
|
2841 | 2841 | for abs in repo.walk(m): |
|
2842 | 2842 | names[abs] = m.rel(abs), m.exact(abs) |
|
2843 | 2843 | |
|
2844 | 2844 | # walk target manifest. |
|
2845 | 2845 | |
|
2846 | 2846 | def badfn(path, msg): |
|
2847 | 2847 | if path in names: |
|
2848 | 2848 | return |
|
2849 | 2849 | path_ = path + '/' |
|
2850 | 2850 | for f in names: |
|
2851 | 2851 | if f.startswith(path_): |
|
2852 | 2852 | return |
|
2853 | 2853 | ui.warn("%s: %s\n" % (m.rel(path), msg)) |
|
2854 | 2854 | |
|
2855 | 2855 | m = cmdutil.match(repo, pats, opts) |
|
2856 | 2856 | m.bad = badfn |
|
2857 | 2857 | for abs in repo[node].walk(m): |
|
2858 | 2858 | if abs not in names: |
|
2859 | 2859 | names[abs] = m.rel(abs), m.exact(abs) |
|
2860 | 2860 | |
|
2861 | 2861 | m = cmdutil.matchfiles(repo, names) |
|
2862 | 2862 | changes = repo.status(match=m)[:4] |
|
2863 | 2863 | modified, added, removed, deleted = map(set, changes) |
|
2864 | 2864 | |
|
2865 | 2865 | # if f is a rename, also revert the source |
|
2866 | 2866 | cwd = repo.getcwd() |
|
2867 | 2867 | for f in added: |
|
2868 | 2868 | src = repo.dirstate.copied(f) |
|
2869 | 2869 | if src and src not in names and repo.dirstate[src] == 'r': |
|
2870 | 2870 | removed.add(src) |
|
2871 | 2871 | names[src] = (repo.pathto(src, cwd), True) |
|
2872 | 2872 | |
|
2873 | 2873 | def removeforget(abs): |
|
2874 | 2874 | if repo.dirstate[abs] == 'a': |
|
2875 | 2875 | return _('forgetting %s\n') |
|
2876 | 2876 | return _('removing %s\n') |
|
2877 | 2877 | |
|
2878 | 2878 | revert = ([], _('reverting %s\n')) |
|
2879 | 2879 | add = ([], _('adding %s\n')) |
|
2880 | 2880 | remove = ([], removeforget) |
|
2881 | 2881 | undelete = ([], _('undeleting %s\n')) |
|
2882 | 2882 | |
|
2883 | 2883 | disptable = ( |
|
2884 | 2884 | # dispatch table: |
|
2885 | 2885 | # file state |
|
2886 | 2886 | # action if in target manifest |
|
2887 | 2887 | # action if not in target manifest |
|
2888 | 2888 | # make backup if in target manifest |
|
2889 | 2889 | # make backup if not in target manifest |
|
2890 | 2890 | (modified, revert, remove, True, True), |
|
2891 | 2891 | (added, revert, remove, True, False), |
|
2892 | 2892 | (removed, undelete, None, False, False), |
|
2893 | 2893 | (deleted, revert, remove, False, False), |
|
2894 | 2894 | ) |
|
2895 | 2895 | |
|
2896 | 2896 | for abs, (rel, exact) in sorted(names.items()): |
|
2897 | 2897 | mfentry = mf.get(abs) |
|
2898 | 2898 | target = repo.wjoin(abs) |
|
2899 | 2899 | def handle(xlist, dobackup): |
|
2900 | 2900 | xlist[0].append(abs) |
|
2901 | 2901 | if dobackup and not opts.get('no_backup') and util.lexists(target): |
|
2902 | 2902 | bakname = "%s.orig" % rel |
|
2903 | 2903 | ui.note(_('saving current version of %s as %s\n') % |
|
2904 | 2904 | (rel, bakname)) |
|
2905 | 2905 | if not opts.get('dry_run'): |
|
2906 | 2906 | util.copyfile(target, bakname) |
|
2907 | 2907 | if ui.verbose or not exact: |
|
2908 | 2908 | msg = xlist[1] |
|
2909 | 2909 | if not isinstance(msg, basestring): |
|
2910 | 2910 | msg = msg(abs) |
|
2911 | 2911 | ui.status(msg % rel) |
|
2912 | 2912 | for table, hitlist, misslist, backuphit, backupmiss in disptable: |
|
2913 | 2913 | if abs not in table: |
|
2914 | 2914 | continue |
|
2915 | 2915 | # file has changed in dirstate |
|
2916 | 2916 | if mfentry: |
|
2917 | 2917 | handle(hitlist, backuphit) |
|
2918 | 2918 | elif misslist is not None: |
|
2919 | 2919 | handle(misslist, backupmiss) |
|
2920 | 2920 | break |
|
2921 | 2921 | else: |
|
2922 | 2922 | if abs not in repo.dirstate: |
|
2923 | 2923 | if mfentry: |
|
2924 | 2924 | handle(add, True) |
|
2925 | 2925 | elif exact: |
|
2926 | 2926 | ui.warn(_('file not managed: %s\n') % rel) |
|
2927 | 2927 | continue |
|
2928 | 2928 | # file has not changed in dirstate |
|
2929 | 2929 | if node == parent: |
|
2930 | 2930 | if exact: |
|
2931 | 2931 | ui.warn(_('no changes needed to %s\n') % rel) |
|
2932 | 2932 | continue |
|
2933 | 2933 | if pmf is None: |
|
2934 | 2934 | # only need parent manifest in this unlikely case, |
|
2935 | 2935 | # so do not read by default |
|
2936 | 2936 | pmf = repo[parent].manifest() |
|
2937 | 2937 | if abs in pmf: |
|
2938 | 2938 | if mfentry: |
|
2939 | 2939 | # if version of file is same in parent and target |
|
2940 | 2940 | # manifests, do nothing |
|
2941 | 2941 | if (pmf[abs] != mfentry or |
|
2942 | 2942 | pmf.flags(abs) != mf.flags(abs)): |
|
2943 | 2943 | handle(revert, False) |
|
2944 | 2944 | else: |
|
2945 | 2945 | handle(remove, False) |
|
2946 | 2946 | |
|
2947 | 2947 | if not opts.get('dry_run'): |
|
2948 | 2948 | def checkout(f): |
|
2949 | 2949 | fc = ctx[f] |
|
2950 | 2950 | repo.wwrite(f, fc.data(), fc.flags()) |
|
2951 | 2951 | |
|
2952 | 2952 | audit_path = util.path_auditor(repo.root) |
|
2953 | 2953 | for f in remove[0]: |
|
2954 | 2954 | if repo.dirstate[f] == 'a': |
|
2955 | 2955 | repo.dirstate.forget(f) |
|
2956 | 2956 | continue |
|
2957 | 2957 | audit_path(f) |
|
2958 | 2958 | try: |
|
2959 | 2959 | util.unlink(repo.wjoin(f)) |
|
2960 | 2960 | except OSError: |
|
2961 | 2961 | pass |
|
2962 | 2962 | repo.dirstate.remove(f) |
|
2963 | 2963 | |
|
2964 | 2964 | normal = None |
|
2965 | 2965 | if node == parent: |
|
2966 | 2966 | # We're reverting to our parent. If possible, we'd like status |
|
2967 | 2967 | # to report the file as clean. We have to use normallookup for |
|
2968 | 2968 | # merges to avoid losing information about merged/dirty files. |
|
2969 | 2969 | if p2 != nullid: |
|
2970 | 2970 | normal = repo.dirstate.normallookup |
|
2971 | 2971 | else: |
|
2972 | 2972 | normal = repo.dirstate.normal |
|
2973 | 2973 | for f in revert[0]: |
|
2974 | 2974 | checkout(f) |
|
2975 | 2975 | if normal: |
|
2976 | 2976 | normal(f) |
|
2977 | 2977 | |
|
2978 | 2978 | for f in add[0]: |
|
2979 | 2979 | checkout(f) |
|
2980 | 2980 | repo.dirstate.add(f) |
|
2981 | 2981 | |
|
2982 | 2982 | normal = repo.dirstate.normallookup |
|
2983 | 2983 | if node == parent and p2 == nullid: |
|
2984 | 2984 | normal = repo.dirstate.normal |
|
2985 | 2985 | for f in undelete[0]: |
|
2986 | 2986 | checkout(f) |
|
2987 | 2987 | normal(f) |
|
2988 | 2988 | |
|
2989 | 2989 | finally: |
|
2990 | 2990 | wlock.release() |
|
2991 | 2991 | |
|
2992 | 2992 | def rollback(ui, repo, **opts): |
|
2993 | 2993 | """roll back the last transaction (dangerous) |
|
2994 | 2994 | |
|
2995 | 2995 | This command should be used with care. There is only one level of |
|
2996 | 2996 | rollback, and there is no way to undo a rollback. It will also |
|
2997 | 2997 | restore the dirstate at the time of the last transaction, losing |
|
2998 | 2998 | any dirstate changes since that time. This command does not alter |
|
2999 | 2999 | the working directory. |
|
3000 | 3000 | |
|
3001 | 3001 | Transactions are used to encapsulate the effects of all commands |
|
3002 | 3002 | that create new changesets or propagate existing changesets into a |
|
3003 | 3003 | repository. For example, the following commands are transactional, |
|
3004 | 3004 | and their effects can be rolled back: |
|
3005 | 3005 | |
|
3006 | 3006 | - commit |
|
3007 | 3007 | - import |
|
3008 | 3008 | - pull |
|
3009 | 3009 | - push (with this repository as the destination) |
|
3010 | 3010 | - unbundle |
|
3011 | 3011 | |
|
3012 | 3012 | This command is not intended for use on public repositories. Once |
|
3013 | 3013 | changes are visible for pull by other users, rolling a transaction |
|
3014 | 3014 | back locally is ineffective (someone else may already have pulled |
|
3015 | 3015 | the changes). Furthermore, a race is possible with readers of the |
|
3016 | 3016 | repository; for example an in-progress pull from the repository |
|
3017 | 3017 | may fail if a rollback is performed. |
|
3018 | 3018 | |
|
3019 | 3019 | Returns 0 on success, 1 if no rollback data is available. |
|
3020 | 3020 | """ |
|
3021 | 3021 | return repo.rollback(opts.get('dry_run')) |
|
3022 | 3022 | |
|
3023 | 3023 | def root(ui, repo): |
|
3024 | 3024 | """print the root (top) of the current working directory |
|
3025 | 3025 | |
|
3026 | 3026 | Print the root directory of the current repository. |
|
3027 | 3027 | |
|
3028 | 3028 | Returns 0 on success. |
|
3029 | 3029 | """ |
|
3030 | 3030 | ui.write(repo.root + "\n") |
|
3031 | 3031 | |
|
3032 | 3032 | def serve(ui, repo, **opts): |
|
3033 | 3033 | """start stand-alone webserver |
|
3034 | 3034 | |
|
3035 | 3035 | Start a local HTTP repository browser and pull server. You can use |
|
3036 | 3036 | this for ad-hoc sharing and browing of repositories. It is |
|
3037 | 3037 | recommended to use a real web server to serve a repository for |
|
3038 | 3038 | longer periods of time. |
|
3039 | 3039 | |
|
3040 | 3040 | Please note that the server does not implement access control. |
|
3041 | 3041 | This means that, by default, anybody can read from the server and |
|
3042 | 3042 | nobody can write to it by default. Set the ``web.allow_push`` |
|
3043 | 3043 | option to ``*`` to allow everybody to push to the server. You |
|
3044 | 3044 | should use a real web server if you need to authenticate users. |
|
3045 | 3045 | |
|
3046 | 3046 | By default, the server logs accesses to stdout and errors to |
|
3047 | 3047 | stderr. Use the -A/--accesslog and -E/--errorlog options to log to |
|
3048 | 3048 | files. |
|
3049 | 3049 | |
|
3050 | 3050 | To have the server choose a free port number to listen on, specify |
|
3051 | 3051 | a port number of 0; in this case, the server will print the port |
|
3052 | 3052 | number it uses. |
|
3053 | 3053 | |
|
3054 | 3054 | Returns 0 on success. |
|
3055 | 3055 | """ |
|
3056 | 3056 | |
|
3057 | 3057 | if opts["stdio"]: |
|
3058 | 3058 | if repo is None: |
|
3059 | 3059 | raise error.RepoError(_("There is no Mercurial repository here" |
|
3060 | 3060 | " (.hg not found)")) |
|
3061 | 3061 | s = sshserver.sshserver(ui, repo) |
|
3062 | 3062 | s.serve_forever() |
|
3063 | 3063 | |
|
3064 | 3064 | # this way we can check if something was given in the command-line |
|
3065 | 3065 | if opts.get('port'): |
|
3066 | 3066 | opts['port'] = int(opts.get('port')) |
|
3067 | 3067 | |
|
3068 | 3068 | baseui = repo and repo.baseui or ui |
|
3069 | 3069 | optlist = ("name templates style address port prefix ipv6" |
|
3070 | 3070 | " accesslog errorlog certificate encoding") |
|
3071 | 3071 | for o in optlist.split(): |
|
3072 | 3072 | val = opts.get(o, '') |
|
3073 | 3073 | if val in (None, ''): # should check against default options instead |
|
3074 | 3074 | continue |
|
3075 | 3075 | baseui.setconfig("web", o, val) |
|
3076 | 3076 | if repo and repo.ui != baseui: |
|
3077 | 3077 | repo.ui.setconfig("web", o, val) |
|
3078 | 3078 | |
|
3079 | 3079 | o = opts.get('web_conf') or opts.get('webdir_conf') |
|
3080 | 3080 | if not o: |
|
3081 | 3081 | if not repo: |
|
3082 | 3082 | raise error.RepoError(_("There is no Mercurial repository" |
|
3083 | 3083 | " here (.hg not found)")) |
|
3084 | 3084 | o = repo.root |
|
3085 | 3085 | |
|
3086 | 3086 | app = hgweb.hgweb(o, baseui=ui) |
|
3087 | 3087 | |
|
3088 | 3088 | class service(object): |
|
3089 | 3089 | def init(self): |
|
3090 | 3090 | util.set_signal_handler() |
|
3091 | 3091 | self.httpd = hgweb.server.create_server(ui, app) |
|
3092 | 3092 | |
|
3093 | 3093 | if opts['port'] and not ui.verbose: |
|
3094 | 3094 | return |
|
3095 | 3095 | |
|
3096 | 3096 | if self.httpd.prefix: |
|
3097 | 3097 | prefix = self.httpd.prefix.strip('/') + '/' |
|
3098 | 3098 | else: |
|
3099 | 3099 | prefix = '' |
|
3100 | 3100 | |
|
3101 | 3101 | port = ':%d' % self.httpd.port |
|
3102 | 3102 | if port == ':80': |
|
3103 | 3103 | port = '' |
|
3104 | 3104 | |
|
3105 | 3105 | bindaddr = self.httpd.addr |
|
3106 | 3106 | if bindaddr == '0.0.0.0': |
|
3107 | 3107 | bindaddr = '*' |
|
3108 | 3108 | elif ':' in bindaddr: # IPv6 |
|
3109 | 3109 | bindaddr = '[%s]' % bindaddr |
|
3110 | 3110 | |
|
3111 | 3111 | fqaddr = self.httpd.fqaddr |
|
3112 | 3112 | if ':' in fqaddr: |
|
3113 | 3113 | fqaddr = '[%s]' % fqaddr |
|
3114 | 3114 | if opts['port']: |
|
3115 | 3115 | write = ui.status |
|
3116 | 3116 | else: |
|
3117 | 3117 | write = ui.write |
|
3118 | 3118 | write(_('listening at http://%s%s/%s (bound to %s:%d)\n') % |
|
3119 | 3119 | (fqaddr, port, prefix, bindaddr, self.httpd.port)) |
|
3120 | 3120 | |
|
3121 | 3121 | def run(self): |
|
3122 | 3122 | self.httpd.serve_forever() |
|
3123 | 3123 | |
|
3124 | 3124 | service = service() |
|
3125 | 3125 | |
|
3126 | 3126 | cmdutil.service(opts, initfn=service.init, runfn=service.run) |
|
3127 | 3127 | |
|
3128 | 3128 | def status(ui, repo, *pats, **opts): |
|
3129 | 3129 | """show changed files in the working directory |
|
3130 | 3130 | |
|
3131 | 3131 | Show status of files in the repository. If names are given, only |
|
3132 | 3132 | files that match are shown. Files that are clean or ignored or |
|
3133 | 3133 | the source of a copy/move operation, are not listed unless |
|
3134 | 3134 | -c/--clean, -i/--ignored, -C/--copies or -A/--all are given. |
|
3135 | 3135 | Unless options described with "show only ..." are given, the |
|
3136 | 3136 | options -mardu are used. |
|
3137 | 3137 | |
|
3138 | 3138 | Option -q/--quiet hides untracked (unknown and ignored) files |
|
3139 | 3139 | unless explicitly requested with -u/--unknown or -i/--ignored. |
|
3140 | 3140 | |
|
3141 | 3141 | NOTE: status may appear to disagree with diff if permissions have |
|
3142 | 3142 | changed or a merge has occurred. The standard diff format does not |
|
3143 | 3143 | report permission changes and diff only reports changes relative |
|
3144 | 3144 | to one merge parent. |
|
3145 | 3145 | |
|
3146 | 3146 | If one revision is given, it is used as the base revision. |
|
3147 | 3147 | If two revisions are given, the differences between them are |
|
3148 | 3148 | shown. The --change option can also be used as a shortcut to list |
|
3149 | 3149 | the changed files of a revision from its first parent. |
|
3150 | 3150 | |
|
3151 | 3151 | The codes used to show the status of files are:: |
|
3152 | 3152 | |
|
3153 | 3153 | M = modified |
|
3154 | 3154 | A = added |
|
3155 | 3155 | R = removed |
|
3156 | 3156 | C = clean |
|
3157 | 3157 | ! = missing (deleted by non-hg command, but still tracked) |
|
3158 | 3158 | ? = not tracked |
|
3159 | 3159 | I = ignored |
|
3160 | 3160 | = origin of the previous file listed as A (added) |
|
3161 | 3161 | |
|
3162 | 3162 | Returns 0 on success. |
|
3163 | 3163 | """ |
|
3164 | 3164 | |
|
3165 | 3165 | revs = opts.get('rev') |
|
3166 | 3166 | change = opts.get('change') |
|
3167 | 3167 | |
|
3168 | 3168 | if revs and change: |
|
3169 | 3169 | msg = _('cannot specify --rev and --change at the same time') |
|
3170 | 3170 | raise util.Abort(msg) |
|
3171 | 3171 | elif change: |
|
3172 | 3172 | node2 = repo.lookup(change) |
|
3173 | 3173 | node1 = repo[node2].parents()[0].node() |
|
3174 | 3174 | else: |
|
3175 | 3175 | node1, node2 = cmdutil.revpair(repo, revs) |
|
3176 | 3176 | |
|
3177 | 3177 | cwd = (pats and repo.getcwd()) or '' |
|
3178 | 3178 | end = opts.get('print0') and '\0' or '\n' |
|
3179 | 3179 | copy = {} |
|
3180 | 3180 | states = 'modified added removed deleted unknown ignored clean'.split() |
|
3181 | 3181 | show = [k for k in states if opts.get(k)] |
|
3182 | 3182 | if opts.get('all'): |
|
3183 | 3183 | show += ui.quiet and (states[:4] + ['clean']) or states |
|
3184 | 3184 | if not show: |
|
3185 | 3185 | show = ui.quiet and states[:4] or states[:5] |
|
3186 | 3186 | |
|
3187 | 3187 | stat = repo.status(node1, node2, cmdutil.match(repo, pats, opts), |
|
3188 | 3188 | 'ignored' in show, 'clean' in show, 'unknown' in show) |
|
3189 | 3189 | changestates = zip(states, 'MAR!?IC', stat) |
|
3190 | 3190 | |
|
3191 | 3191 | if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'): |
|
3192 | 3192 | ctxn = repo[nullid] |
|
3193 | 3193 | ctx1 = repo[node1] |
|
3194 | 3194 | ctx2 = repo[node2] |
|
3195 | 3195 | added = stat[1] |
|
3196 | 3196 | if node2 is None: |
|
3197 | 3197 | added = stat[0] + stat[1] # merged? |
|
3198 | 3198 | |
|
3199 | 3199 | for k, v in copies.copies(repo, ctx1, ctx2, ctxn)[0].iteritems(): |
|
3200 | 3200 | if k in added: |
|
3201 | 3201 | copy[k] = v |
|
3202 | 3202 | elif v in added: |
|
3203 | 3203 | copy[v] = k |
|
3204 | 3204 | |
|
3205 | 3205 | for state, char, files in changestates: |
|
3206 | 3206 | if state in show: |
|
3207 | 3207 | format = "%s %%s%s" % (char, end) |
|
3208 | 3208 | if opts.get('no_status'): |
|
3209 | 3209 | format = "%%s%s" % end |
|
3210 | 3210 | |
|
3211 | 3211 | for f in files: |
|
3212 | 3212 | ui.write(format % repo.pathto(f, cwd), |
|
3213 | 3213 | label='status.' + state) |
|
3214 | 3214 | if f in copy: |
|
3215 | 3215 | ui.write(' %s%s' % (repo.pathto(copy[f], cwd), end), |
|
3216 | 3216 | label='status.copied') |
|
3217 | 3217 | |
|
3218 | 3218 | def summary(ui, repo, **opts): |
|
3219 | 3219 | """summarize working directory state |
|
3220 | 3220 | |
|
3221 | 3221 | This generates a brief summary of the working directory state, |
|
3222 | 3222 | including parents, branch, commit status, and available updates. |
|
3223 | 3223 | |
|
3224 | 3224 | With the --remote option, this will check the default paths for |
|
3225 | 3225 | incoming and outgoing changes. This can be time-consuming. |
|
3226 | 3226 | |
|
3227 | 3227 | Returns 0 on success. |
|
3228 | 3228 | """ |
|
3229 | 3229 | |
|
3230 | 3230 | ctx = repo[None] |
|
3231 | 3231 | parents = ctx.parents() |
|
3232 | 3232 | pnode = parents[0].node() |
|
3233 | 3233 | |
|
3234 | 3234 | for p in parents: |
|
3235 | 3235 | # label with log.changeset (instead of log.parent) since this |
|
3236 | 3236 | # shows a working directory parent *changeset*: |
|
3237 | 3237 | ui.write(_('parent: %d:%s ') % (p.rev(), str(p)), |
|
3238 | 3238 | label='log.changeset') |
|
3239 | 3239 | ui.write(' '.join(p.tags()), label='log.tag') |
|
3240 | 3240 | if p.rev() == -1: |
|
3241 | 3241 | if not len(repo): |
|
3242 | 3242 | ui.write(_(' (empty repository)')) |
|
3243 | 3243 | else: |
|
3244 | 3244 | ui.write(_(' (no revision checked out)')) |
|
3245 | 3245 | ui.write('\n') |
|
3246 | 3246 | if p.description(): |
|
3247 | 3247 | ui.status(' ' + p.description().splitlines()[0].strip() + '\n', |
|
3248 | 3248 | label='log.summary') |
|
3249 | 3249 | |
|
3250 | 3250 | branch = ctx.branch() |
|
3251 | 3251 | bheads = repo.branchheads(branch) |
|
3252 | 3252 | m = _('branch: %s\n') % branch |
|
3253 | 3253 | if branch != 'default': |
|
3254 | 3254 | ui.write(m, label='log.branch') |
|
3255 | 3255 | else: |
|
3256 | 3256 | ui.status(m, label='log.branch') |
|
3257 | 3257 | |
|
3258 | 3258 | st = list(repo.status(unknown=True))[:6] |
|
3259 | 3259 | |
|
3260 | 3260 | ms = mergemod.mergestate(repo) |
|
3261 | 3261 | st.append([f for f in ms if ms[f] == 'u']) |
|
3262 | 3262 | |
|
3263 | 3263 | subs = [s for s in ctx.substate if ctx.sub(s).dirty()] |
|
3264 | 3264 | st.append(subs) |
|
3265 | 3265 | |
|
3266 | 3266 | labels = [ui.label(_('%d modified'), 'status.modified'), |
|
3267 | 3267 | ui.label(_('%d added'), 'status.added'), |
|
3268 | 3268 | ui.label(_('%d removed'), 'status.removed'), |
|
3269 | 3269 | ui.label(_('%d deleted'), 'status.deleted'), |
|
3270 | 3270 | ui.label(_('%d unknown'), 'status.unknown'), |
|
3271 | 3271 | ui.label(_('%d ignored'), 'status.ignored'), |
|
3272 | 3272 | ui.label(_('%d unresolved'), 'resolve.unresolved'), |
|
3273 | 3273 | ui.label(_('%d subrepos'), 'status.modified')] |
|
3274 | 3274 | t = [] |
|
3275 | 3275 | for s, l in zip(st, labels): |
|
3276 | 3276 | if s: |
|
3277 | 3277 | t.append(l % len(s)) |
|
3278 | 3278 | |
|
3279 | 3279 | t = ', '.join(t) |
|
3280 | 3280 | cleanworkdir = False |
|
3281 | 3281 | |
|
3282 | 3282 | if len(parents) > 1: |
|
3283 |
t += |
|
|
3283 | t += _(' (merge)') | |
|
3284 | 3284 | elif branch != parents[0].branch(): |
|
3285 |
t += |
|
|
3285 | t += _(' (new branch)') | |
|
3286 | 3286 | elif (parents[0].extra().get('close') and |
|
3287 | 3287 | pnode in repo.branchheads(branch, closed=True)): |
|
3288 |
t += |
|
|
3288 | t += _(' (head closed)') | |
|
3289 | 3289 | elif (not st[0] and not st[1] and not st[2] and not st[7]): |
|
3290 |
t += |
|
|
3290 | t += _(' (clean)') | |
|
3291 | 3291 | cleanworkdir = True |
|
3292 | 3292 | elif pnode not in bheads: |
|
3293 |
t += |
|
|
3293 | t += _(' (new branch head)') | |
|
3294 | 3294 | |
|
3295 | 3295 | if cleanworkdir: |
|
3296 |
ui.status(_('commit: %s\n') % t.strip() |
|
|
3296 | ui.status(_('commit: %s\n') % t.strip()) | |
|
3297 | 3297 | else: |
|
3298 |
ui.write(_('commit: %s\n') % t.strip() |
|
|
3298 | ui.write(_('commit: %s\n') % t.strip()) | |
|
3299 | 3299 | |
|
3300 | 3300 | # all ancestors of branch heads - all ancestors of parent = new csets |
|
3301 | 3301 | new = [0] * len(repo) |
|
3302 | 3302 | cl = repo.changelog |
|
3303 | 3303 | for a in [cl.rev(n) for n in bheads]: |
|
3304 | 3304 | new[a] = 1 |
|
3305 | 3305 | for a in cl.ancestors(*[cl.rev(n) for n in bheads]): |
|
3306 | 3306 | new[a] = 1 |
|
3307 | 3307 | for a in [p.rev() for p in parents]: |
|
3308 | 3308 | if a >= 0: |
|
3309 | 3309 | new[a] = 0 |
|
3310 | 3310 | for a in cl.ancestors(*[p.rev() for p in parents]): |
|
3311 | 3311 | new[a] = 0 |
|
3312 | 3312 | new = sum(new) |
|
3313 | 3313 | |
|
3314 | 3314 | if new == 0: |
|
3315 | 3315 | ui.status(_('update: (current)\n')) |
|
3316 | 3316 | elif pnode not in bheads: |
|
3317 | 3317 | ui.write(_('update: %d new changesets (update)\n') % new) |
|
3318 | 3318 | else: |
|
3319 | 3319 | ui.write(_('update: %d new changesets, %d branch heads (merge)\n') % |
|
3320 | 3320 | (new, len(bheads))) |
|
3321 | 3321 | |
|
3322 | 3322 | if opts.get('remote'): |
|
3323 | 3323 | t = [] |
|
3324 | 3324 | source, branches = hg.parseurl(ui.expandpath('default')) |
|
3325 | 3325 | other = hg.repository(hg.remoteui(repo, {}), source) |
|
3326 | 3326 | revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev')) |
|
3327 | 3327 | ui.debug('comparing with %s\n' % url.hidepassword(source)) |
|
3328 | 3328 | repo.ui.pushbuffer() |
|
3329 | 3329 | common, incoming, rheads = discovery.findcommonincoming(repo, other) |
|
3330 | 3330 | repo.ui.popbuffer() |
|
3331 | 3331 | if incoming: |
|
3332 | 3332 | t.append(_('1 or more incoming')) |
|
3333 | 3333 | |
|
3334 | 3334 | dest, branches = hg.parseurl(ui.expandpath('default-push', 'default')) |
|
3335 | 3335 | revs, checkout = hg.addbranchrevs(repo, repo, branches, None) |
|
3336 | 3336 | other = hg.repository(hg.remoteui(repo, {}), dest) |
|
3337 | 3337 | ui.debug('comparing with %s\n' % url.hidepassword(dest)) |
|
3338 | 3338 | repo.ui.pushbuffer() |
|
3339 | 3339 | o = discovery.findoutgoing(repo, other) |
|
3340 | 3340 | repo.ui.popbuffer() |
|
3341 | 3341 | o = repo.changelog.nodesbetween(o, None)[0] |
|
3342 | 3342 | if o: |
|
3343 | 3343 | t.append(_('%d outgoing') % len(o)) |
|
3344 | 3344 | |
|
3345 | 3345 | if t: |
|
3346 | 3346 | ui.write(_('remote: %s\n') % (', '.join(t))) |
|
3347 | 3347 | else: |
|
3348 | 3348 | ui.status(_('remote: (synced)\n')) |
|
3349 | 3349 | |
|
3350 | 3350 | def tag(ui, repo, name1, *names, **opts): |
|
3351 | 3351 | """add one or more tags for the current or given revision |
|
3352 | 3352 | |
|
3353 | 3353 | Name a particular revision using <name>. |
|
3354 | 3354 | |
|
3355 | 3355 | Tags are used to name particular revisions of the repository and are |
|
3356 | 3356 | very useful to compare different revisions, to go back to significant |
|
3357 | 3357 | earlier versions or to mark branch points as releases, etc. |
|
3358 | 3358 | |
|
3359 | 3359 | If no revision is given, the parent of the working directory is |
|
3360 | 3360 | used, or tip if no revision is checked out. |
|
3361 | 3361 | |
|
3362 | 3362 | To facilitate version control, distribution, and merging of tags, |
|
3363 | 3363 | they are stored as a file named ".hgtags" which is managed |
|
3364 | 3364 | similarly to other project files and can be hand-edited if |
|
3365 | 3365 | necessary. The file '.hg/localtags' is used for local tags (not |
|
3366 | 3366 | shared among repositories). |
|
3367 | 3367 | |
|
3368 | 3368 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
3369 | 3369 | |
|
3370 | 3370 | Since tag names have priority over branch names during revision |
|
3371 | 3371 | lookup, using an existing branch name as a tag name is discouraged. |
|
3372 | 3372 | |
|
3373 | 3373 | Returns 0 on success. |
|
3374 | 3374 | """ |
|
3375 | 3375 | |
|
3376 | 3376 | rev_ = "." |
|
3377 | 3377 | names = [t.strip() for t in (name1,) + names] |
|
3378 | 3378 | if len(names) != len(set(names)): |
|
3379 | 3379 | raise util.Abort(_('tag names must be unique')) |
|
3380 | 3380 | for n in names: |
|
3381 | 3381 | if n in ['tip', '.', 'null']: |
|
3382 | 3382 | raise util.Abort(_('the name \'%s\' is reserved') % n) |
|
3383 | 3383 | if opts.get('rev') and opts.get('remove'): |
|
3384 | 3384 | raise util.Abort(_("--rev and --remove are incompatible")) |
|
3385 | 3385 | if opts.get('rev'): |
|
3386 | 3386 | rev_ = opts['rev'] |
|
3387 | 3387 | message = opts.get('message') |
|
3388 | 3388 | if opts.get('remove'): |
|
3389 | 3389 | expectedtype = opts.get('local') and 'local' or 'global' |
|
3390 | 3390 | for n in names: |
|
3391 | 3391 | if not repo.tagtype(n): |
|
3392 | 3392 | raise util.Abort(_('tag \'%s\' does not exist') % n) |
|
3393 | 3393 | if repo.tagtype(n) != expectedtype: |
|
3394 | 3394 | if expectedtype == 'global': |
|
3395 | 3395 | raise util.Abort(_('tag \'%s\' is not a global tag') % n) |
|
3396 | 3396 | else: |
|
3397 | 3397 | raise util.Abort(_('tag \'%s\' is not a local tag') % n) |
|
3398 | 3398 | rev_ = nullid |
|
3399 | 3399 | if not message: |
|
3400 | 3400 | # we don't translate commit messages |
|
3401 | 3401 | message = 'Removed tag %s' % ', '.join(names) |
|
3402 | 3402 | elif not opts.get('force'): |
|
3403 | 3403 | for n in names: |
|
3404 | 3404 | if n in repo.tags(): |
|
3405 | 3405 | raise util.Abort(_('tag \'%s\' already exists ' |
|
3406 | 3406 | '(use -f to force)') % n) |
|
3407 | 3407 | if not rev_ and repo.dirstate.parents()[1] != nullid: |
|
3408 | 3408 | raise util.Abort(_('uncommitted merge - please provide a ' |
|
3409 | 3409 | 'specific revision')) |
|
3410 | 3410 | r = repo[rev_].node() |
|
3411 | 3411 | |
|
3412 | 3412 | if not message: |
|
3413 | 3413 | # we don't translate commit messages |
|
3414 | 3414 | message = ('Added tag %s for changeset %s' % |
|
3415 | 3415 | (', '.join(names), short(r))) |
|
3416 | 3416 | |
|
3417 | 3417 | date = opts.get('date') |
|
3418 | 3418 | if date: |
|
3419 | 3419 | date = util.parsedate(date) |
|
3420 | 3420 | |
|
3421 | 3421 | if opts.get('edit'): |
|
3422 | 3422 | message = ui.edit(message, ui.username()) |
|
3423 | 3423 | |
|
3424 | 3424 | repo.tag(names, r, message, opts.get('local'), opts.get('user'), date) |
|
3425 | 3425 | |
|
3426 | 3426 | def tags(ui, repo): |
|
3427 | 3427 | """list repository tags |
|
3428 | 3428 | |
|
3429 | 3429 | This lists both regular and local tags. When the -v/--verbose |
|
3430 | 3430 | switch is used, a third column "local" is printed for local tags. |
|
3431 | 3431 | |
|
3432 | 3432 | Returns 0 on success. |
|
3433 | 3433 | """ |
|
3434 | 3434 | |
|
3435 | 3435 | hexfunc = ui.debugflag and hex or short |
|
3436 | 3436 | tagtype = "" |
|
3437 | 3437 | |
|
3438 | 3438 | for t, n in reversed(repo.tagslist()): |
|
3439 | 3439 | if ui.quiet: |
|
3440 | 3440 | ui.write("%s\n" % t) |
|
3441 | 3441 | continue |
|
3442 | 3442 | |
|
3443 | 3443 | try: |
|
3444 | 3444 | hn = hexfunc(n) |
|
3445 | 3445 | r = "%5d:%s" % (repo.changelog.rev(n), hn) |
|
3446 | 3446 | except error.LookupError: |
|
3447 | 3447 | r = " ?:%s" % hn |
|
3448 | 3448 | else: |
|
3449 | 3449 | spaces = " " * (30 - encoding.colwidth(t)) |
|
3450 | 3450 | if ui.verbose: |
|
3451 | 3451 | if repo.tagtype(t) == 'local': |
|
3452 | 3452 | tagtype = " local" |
|
3453 | 3453 | else: |
|
3454 | 3454 | tagtype = "" |
|
3455 | 3455 | ui.write("%s%s %s%s\n" % (t, spaces, r, tagtype)) |
|
3456 | 3456 | |
|
3457 | 3457 | def tip(ui, repo, **opts): |
|
3458 | 3458 | """show the tip revision |
|
3459 | 3459 | |
|
3460 | 3460 | The tip revision (usually just called the tip) is the changeset |
|
3461 | 3461 | most recently added to the repository (and therefore the most |
|
3462 | 3462 | recently changed head). |
|
3463 | 3463 | |
|
3464 | 3464 | If you have just made a commit, that commit will be the tip. If |
|
3465 | 3465 | you have just pulled changes from another repository, the tip of |
|
3466 | 3466 | that repository becomes the current tip. The "tip" tag is special |
|
3467 | 3467 | and cannot be renamed or assigned to a different changeset. |
|
3468 | 3468 | |
|
3469 | 3469 | Returns 0 on success. |
|
3470 | 3470 | """ |
|
3471 | 3471 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
3472 | 3472 | displayer.show(repo[len(repo) - 1]) |
|
3473 | 3473 | displayer.close() |
|
3474 | 3474 | |
|
3475 | 3475 | def unbundle(ui, repo, fname1, *fnames, **opts): |
|
3476 | 3476 | """apply one or more changegroup files |
|
3477 | 3477 | |
|
3478 | 3478 | Apply one or more compressed changegroup files generated by the |
|
3479 | 3479 | bundle command. |
|
3480 | 3480 | |
|
3481 | 3481 | Returns 0 on success, 1 if an update has unresolved files. |
|
3482 | 3482 | """ |
|
3483 | 3483 | fnames = (fname1,) + fnames |
|
3484 | 3484 | |
|
3485 | 3485 | lock = repo.lock() |
|
3486 | 3486 | try: |
|
3487 | 3487 | for fname in fnames: |
|
3488 | 3488 | f = url.open(ui, fname) |
|
3489 | 3489 | gen = changegroup.readbundle(f, fname) |
|
3490 | 3490 | modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname) |
|
3491 | 3491 | finally: |
|
3492 | 3492 | lock.release() |
|
3493 | 3493 | |
|
3494 | 3494 | return postincoming(ui, repo, modheads, opts.get('update'), None) |
|
3495 | 3495 | |
|
3496 | 3496 | def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False): |
|
3497 | 3497 | """update working directory (or switch revisions) |
|
3498 | 3498 | |
|
3499 | 3499 | Update the repository's working directory to the specified |
|
3500 | 3500 | changeset. |
|
3501 | 3501 | |
|
3502 | 3502 | If no changeset is specified, attempt to update to the head of the |
|
3503 | 3503 | current branch. If this head is a descendant of the working |
|
3504 | 3504 | directory's parent, update to it, otherwise abort. |
|
3505 | 3505 | |
|
3506 | 3506 | The following rules apply when the working directory contains |
|
3507 | 3507 | uncommitted changes: |
|
3508 | 3508 | |
|
3509 | 3509 | 1. If neither -c/--check nor -C/--clean is specified, and if |
|
3510 | 3510 | the requested changeset is an ancestor or descendant of |
|
3511 | 3511 | the working directory's parent, the uncommitted changes |
|
3512 | 3512 | are merged into the requested changeset and the merged |
|
3513 | 3513 | result is left uncommitted. If the requested changeset is |
|
3514 | 3514 | not an ancestor or descendant (that is, it is on another |
|
3515 | 3515 | branch), the update is aborted and the uncommitted changes |
|
3516 | 3516 | are preserved. |
|
3517 | 3517 | |
|
3518 | 3518 | 2. With the -c/--check option, the update is aborted and the |
|
3519 | 3519 | uncommitted changes are preserved. |
|
3520 | 3520 | |
|
3521 | 3521 | 3. With the -C/--clean option, uncommitted changes are discarded and |
|
3522 | 3522 | the working directory is updated to the requested changeset. |
|
3523 | 3523 | |
|
3524 | 3524 | Use null as the changeset to remove the working directory (like |
|
3525 | 3525 | :hg:`clone -U`). |
|
3526 | 3526 | |
|
3527 | 3527 | If you want to update just one file to an older changeset, use :hg:`revert`. |
|
3528 | 3528 | |
|
3529 | 3529 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
3530 | 3530 | |
|
3531 | 3531 | Returns 0 on success, 1 if there are unresolved files. |
|
3532 | 3532 | """ |
|
3533 | 3533 | if rev and node: |
|
3534 | 3534 | raise util.Abort(_("please specify just one revision")) |
|
3535 | 3535 | |
|
3536 | 3536 | if not rev: |
|
3537 | 3537 | rev = node |
|
3538 | 3538 | |
|
3539 | 3539 | if check and clean: |
|
3540 | 3540 | raise util.Abort(_("cannot specify both -c/--check and -C/--clean")) |
|
3541 | 3541 | |
|
3542 | 3542 | if check: |
|
3543 | 3543 | # we could use dirty() but we can ignore merge and branch trivia |
|
3544 | 3544 | c = repo[None] |
|
3545 | 3545 | if c.modified() or c.added() or c.removed(): |
|
3546 | 3546 | raise util.Abort(_("uncommitted local changes")) |
|
3547 | 3547 | |
|
3548 | 3548 | if date: |
|
3549 | 3549 | if rev: |
|
3550 | 3550 | raise util.Abort(_("you can't specify a revision and a date")) |
|
3551 | 3551 | rev = cmdutil.finddate(ui, repo, date) |
|
3552 | 3552 | |
|
3553 | 3553 | if clean or check: |
|
3554 | 3554 | return hg.clean(repo, rev) |
|
3555 | 3555 | else: |
|
3556 | 3556 | return hg.update(repo, rev) |
|
3557 | 3557 | |
|
3558 | 3558 | def verify(ui, repo): |
|
3559 | 3559 | """verify the integrity of the repository |
|
3560 | 3560 | |
|
3561 | 3561 | Verify the integrity of the current repository. |
|
3562 | 3562 | |
|
3563 | 3563 | This will perform an extensive check of the repository's |
|
3564 | 3564 | integrity, validating the hashes and checksums of each entry in |
|
3565 | 3565 | the changelog, manifest, and tracked files, as well as the |
|
3566 | 3566 | integrity of their crosslinks and indices. |
|
3567 | 3567 | |
|
3568 | 3568 | Returns 0 on success, 1 if errors are encountered. |
|
3569 | 3569 | """ |
|
3570 | 3570 | return hg.verify(repo) |
|
3571 | 3571 | |
|
3572 | 3572 | def version_(ui): |
|
3573 | 3573 | """output version and copyright information""" |
|
3574 | 3574 | ui.write(_("Mercurial Distributed SCM (version %s)\n") |
|
3575 | 3575 | % util.version()) |
|
3576 | 3576 | ui.status(_( |
|
3577 | 3577 | "\nCopyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n" |
|
3578 | 3578 | "This is free software; see the source for copying conditions. " |
|
3579 | 3579 | "There is NO\nwarranty; " |
|
3580 | 3580 | "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" |
|
3581 | 3581 | )) |
|
3582 | 3582 | |
|
3583 | 3583 | # Command options and aliases are listed here, alphabetically |
|
3584 | 3584 | |
|
3585 | 3585 | globalopts = [ |
|
3586 | 3586 | ('R', 'repository', '', |
|
3587 | 3587 | _('repository root directory or name of overlay bundle file')), |
|
3588 | 3588 | ('', 'cwd', '', _('change working directory')), |
|
3589 | 3589 | ('y', 'noninteractive', None, |
|
3590 | 3590 | _('do not prompt, assume \'yes\' for any required answers')), |
|
3591 | 3591 | ('q', 'quiet', None, _('suppress output')), |
|
3592 | 3592 | ('v', 'verbose', None, _('enable additional output')), |
|
3593 | 3593 | ('', 'config', [], |
|
3594 | 3594 | _('set/override config option (use \'section.name=value\')')), |
|
3595 | 3595 | ('', 'debug', None, _('enable debugging output')), |
|
3596 | 3596 | ('', 'debugger', None, _('start debugger')), |
|
3597 | 3597 | ('', 'encoding', encoding.encoding, _('set the charset encoding')), |
|
3598 | 3598 | ('', 'encodingmode', encoding.encodingmode, |
|
3599 | 3599 | _('set the charset encoding mode')), |
|
3600 | 3600 | ('', 'traceback', None, _('always print a traceback on exception')), |
|
3601 | 3601 | ('', 'time', None, _('time how long the command takes')), |
|
3602 | 3602 | ('', 'profile', None, _('print command execution profile')), |
|
3603 | 3603 | ('', 'version', None, _('output version information and exit')), |
|
3604 | 3604 | ('h', 'help', None, _('display help and exit')), |
|
3605 | 3605 | ] |
|
3606 | 3606 | |
|
3607 | 3607 | dryrunopts = [('n', 'dry-run', None, |
|
3608 | 3608 | _('do not perform actions, just print output'))] |
|
3609 | 3609 | |
|
3610 | 3610 | remoteopts = [ |
|
3611 | 3611 | ('e', 'ssh', '', _('specify ssh command to use')), |
|
3612 | 3612 | ('', 'remotecmd', '', _('specify hg command to run on the remote side')), |
|
3613 | 3613 | ] |
|
3614 | 3614 | |
|
3615 | 3615 | walkopts = [ |
|
3616 | 3616 | ('I', 'include', [], _('include names matching the given patterns')), |
|
3617 | 3617 | ('X', 'exclude', [], _('exclude names matching the given patterns')), |
|
3618 | 3618 | ] |
|
3619 | 3619 | |
|
3620 | 3620 | commitopts = [ |
|
3621 | 3621 | ('m', 'message', '', _('use <text> as commit message')), |
|
3622 | 3622 | ('l', 'logfile', '', _('read commit message from <file>')), |
|
3623 | 3623 | ] |
|
3624 | 3624 | |
|
3625 | 3625 | commitopts2 = [ |
|
3626 | 3626 | ('d', 'date', '', _('record datecode as commit date')), |
|
3627 | 3627 | ('u', 'user', '', _('record the specified user as committer')), |
|
3628 | 3628 | ] |
|
3629 | 3629 | |
|
3630 | 3630 | templateopts = [ |
|
3631 | 3631 | ('', 'style', '', _('display using template map file')), |
|
3632 | 3632 | ('', 'template', '', _('display with template')), |
|
3633 | 3633 | ] |
|
3634 | 3634 | |
|
3635 | 3635 | logopts = [ |
|
3636 | 3636 | ('p', 'patch', None, _('show patch')), |
|
3637 | 3637 | ('g', 'git', None, _('use git extended diff format')), |
|
3638 | 3638 | ('l', 'limit', '', _('limit number of changes displayed')), |
|
3639 | 3639 | ('M', 'no-merges', None, _('do not show merges')), |
|
3640 | 3640 | ('', 'stat', None, _('output diffstat-style summary of changes')), |
|
3641 | 3641 | ] + templateopts |
|
3642 | 3642 | |
|
3643 | 3643 | diffopts = [ |
|
3644 | 3644 | ('a', 'text', None, _('treat all files as text')), |
|
3645 | 3645 | ('g', 'git', None, _('use git extended diff format')), |
|
3646 | 3646 | ('', 'nodates', None, _('omit dates from diff headers')) |
|
3647 | 3647 | ] |
|
3648 | 3648 | |
|
3649 | 3649 | diffopts2 = [ |
|
3650 | 3650 | ('p', 'show-function', None, _('show which function each change is in')), |
|
3651 | 3651 | ('', 'reverse', None, _('produce a diff that undoes the changes')), |
|
3652 | 3652 | ('w', 'ignore-all-space', None, |
|
3653 | 3653 | _('ignore white space when comparing lines')), |
|
3654 | 3654 | ('b', 'ignore-space-change', None, |
|
3655 | 3655 | _('ignore changes in the amount of white space')), |
|
3656 | 3656 | ('B', 'ignore-blank-lines', None, |
|
3657 | 3657 | _('ignore changes whose lines are all blank')), |
|
3658 | 3658 | ('U', 'unified', '', _('number of lines of context to show')), |
|
3659 | 3659 | ('', 'stat', None, _('output diffstat-style summary of changes')), |
|
3660 | 3660 | ] |
|
3661 | 3661 | |
|
3662 | 3662 | similarityopts = [ |
|
3663 | 3663 | ('s', 'similarity', '', |
|
3664 | 3664 | _('guess renamed files by similarity (0<=s<=100)')) |
|
3665 | 3665 | ] |
|
3666 | 3666 | |
|
3667 | 3667 | table = { |
|
3668 | 3668 | "^add": (add, walkopts + dryrunopts, _('[OPTION]... [FILE]...')), |
|
3669 | 3669 | "addremove": |
|
3670 | 3670 | (addremove, similarityopts + walkopts + dryrunopts, |
|
3671 | 3671 | _('[OPTION]... [FILE]...')), |
|
3672 | 3672 | "^annotate|blame": |
|
3673 | 3673 | (annotate, |
|
3674 | 3674 | [('r', 'rev', '', _('annotate the specified revision')), |
|
3675 | 3675 | ('', 'follow', None, |
|
3676 | 3676 | _('follow copies/renames and list the filename (DEPRECATED)')), |
|
3677 | 3677 | ('', 'no-follow', None, _("don't follow copies and renames")), |
|
3678 | 3678 | ('a', 'text', None, _('treat all files as text')), |
|
3679 | 3679 | ('u', 'user', None, _('list the author (long with -v)')), |
|
3680 | 3680 | ('f', 'file', None, _('list the filename')), |
|
3681 | 3681 | ('d', 'date', None, _('list the date (short with -q)')), |
|
3682 | 3682 | ('n', 'number', None, _('list the revision number (default)')), |
|
3683 | 3683 | ('c', 'changeset', None, _('list the changeset')), |
|
3684 | 3684 | ('l', 'line-number', None, |
|
3685 | 3685 | _('show line number at the first appearance')) |
|
3686 | 3686 | ] + walkopts, |
|
3687 | 3687 | _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...')), |
|
3688 | 3688 | "archive": |
|
3689 | 3689 | (archive, |
|
3690 | 3690 | [('', 'no-decode', None, _('do not pass files through decoders')), |
|
3691 | 3691 | ('p', 'prefix', '', _('directory prefix for files in archive')), |
|
3692 | 3692 | ('r', 'rev', '', _('revision to distribute')), |
|
3693 | 3693 | ('t', 'type', '', _('type of distribution to create')), |
|
3694 | 3694 | ] + walkopts, |
|
3695 | 3695 | _('[OPTION]... DEST')), |
|
3696 | 3696 | "backout": |
|
3697 | 3697 | (backout, |
|
3698 | 3698 | [('', 'merge', None, |
|
3699 | 3699 | _('merge with old dirstate parent after backout')), |
|
3700 | 3700 | ('', 'parent', '', _('parent to choose when backing out merge')), |
|
3701 | 3701 | ('r', 'rev', '', _('revision to backout')), |
|
3702 | 3702 | ] + walkopts + commitopts + commitopts2, |
|
3703 | 3703 | _('[OPTION]... [-r] REV')), |
|
3704 | 3704 | "bisect": |
|
3705 | 3705 | (bisect, |
|
3706 | 3706 | [('r', 'reset', False, _('reset bisect state')), |
|
3707 | 3707 | ('g', 'good', False, _('mark changeset good')), |
|
3708 | 3708 | ('b', 'bad', False, _('mark changeset bad')), |
|
3709 | 3709 | ('s', 'skip', False, _('skip testing changeset')), |
|
3710 | 3710 | ('c', 'command', '', _('use command to check changeset state')), |
|
3711 | 3711 | ('U', 'noupdate', False, _('do not update to target'))], |
|
3712 | 3712 | _("[-gbsr] [-U] [-c CMD] [REV]")), |
|
3713 | 3713 | "branch": |
|
3714 | 3714 | (branch, |
|
3715 | 3715 | [('f', 'force', None, |
|
3716 | 3716 | _('set branch name even if it shadows an existing branch')), |
|
3717 | 3717 | ('C', 'clean', None, _('reset branch name to parent branch name'))], |
|
3718 | 3718 | _('[-fC] [NAME]')), |
|
3719 | 3719 | "branches": |
|
3720 | 3720 | (branches, |
|
3721 | 3721 | [('a', 'active', False, |
|
3722 | 3722 | _('show only branches that have unmerged heads')), |
|
3723 | 3723 | ('c', 'closed', False, |
|
3724 | 3724 | _('show normal and closed branches'))], |
|
3725 | 3725 | _('[-ac]')), |
|
3726 | 3726 | "bundle": |
|
3727 | 3727 | (bundle, |
|
3728 | 3728 | [('f', 'force', None, |
|
3729 | 3729 | _('run even when the destination is unrelated')), |
|
3730 | 3730 | ('r', 'rev', [], |
|
3731 | 3731 | _('a changeset intended to be added to the destination')), |
|
3732 | 3732 | ('b', 'branch', [], |
|
3733 | 3733 | _('a specific branch you would like to bundle')), |
|
3734 | 3734 | ('', 'base', [], |
|
3735 | 3735 | _('a base changeset assumed to be available at the destination')), |
|
3736 | 3736 | ('a', 'all', None, _('bundle all changesets in the repository')), |
|
3737 | 3737 | ('t', 'type', 'bzip2', _('bundle compression type to use')), |
|
3738 | 3738 | ] + remoteopts, |
|
3739 | 3739 | _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]')), |
|
3740 | 3740 | "cat": |
|
3741 | 3741 | (cat, |
|
3742 | 3742 | [('o', 'output', '', _('print output to file with formatted name')), |
|
3743 | 3743 | ('r', 'rev', '', _('print the given revision')), |
|
3744 | 3744 | ('', 'decode', None, _('apply any matching decode filter')), |
|
3745 | 3745 | ] + walkopts, |
|
3746 | 3746 | _('[OPTION]... FILE...')), |
|
3747 | 3747 | "^clone": |
|
3748 | 3748 | (clone, |
|
3749 | 3749 | [('U', 'noupdate', None, |
|
3750 | 3750 | _('the clone will include an empty working copy (only a repository)')), |
|
3751 | 3751 | ('u', 'updaterev', '', |
|
3752 | 3752 | _('revision, tag or branch to check out')), |
|
3753 | 3753 | ('r', 'rev', [], |
|
3754 | 3754 | _('include the specified changeset')), |
|
3755 | 3755 | ('b', 'branch', [], |
|
3756 | 3756 | _('clone only the specified branch')), |
|
3757 | 3757 | ('', 'pull', None, _('use pull protocol to copy metadata')), |
|
3758 | 3758 | ('', 'uncompressed', None, |
|
3759 | 3759 | _('use uncompressed transfer (fast over LAN)')), |
|
3760 | 3760 | ] + remoteopts, |
|
3761 | 3761 | _('[OPTION]... SOURCE [DEST]')), |
|
3762 | 3762 | "^commit|ci": |
|
3763 | 3763 | (commit, |
|
3764 | 3764 | [('A', 'addremove', None, |
|
3765 | 3765 | _('mark new/missing files as added/removed before committing')), |
|
3766 | 3766 | ('', 'close-branch', None, |
|
3767 | 3767 | _('mark a branch as closed, hiding it from the branch list')), |
|
3768 | 3768 | ] + walkopts + commitopts + commitopts2, |
|
3769 | 3769 | _('[OPTION]... [FILE]...')), |
|
3770 | 3770 | "copy|cp": |
|
3771 | 3771 | (copy, |
|
3772 | 3772 | [('A', 'after', None, _('record a copy that has already occurred')), |
|
3773 | 3773 | ('f', 'force', None, |
|
3774 | 3774 | _('forcibly copy over an existing managed file')), |
|
3775 | 3775 | ] + walkopts + dryrunopts, |
|
3776 | 3776 | _('[OPTION]... [SOURCE]... DEST')), |
|
3777 | 3777 | "debugancestor": (debugancestor, [], _('[INDEX] REV1 REV2')), |
|
3778 | 3778 | "debugcheckstate": (debugcheckstate, [], ''), |
|
3779 | 3779 | "debugcommands": (debugcommands, [], _('[COMMAND]')), |
|
3780 | 3780 | "debugcomplete": |
|
3781 | 3781 | (debugcomplete, |
|
3782 | 3782 | [('o', 'options', None, _('show the command options'))], |
|
3783 | 3783 | _('[-o] CMD')), |
|
3784 | 3784 | "debugdate": |
|
3785 | 3785 | (debugdate, |
|
3786 | 3786 | [('e', 'extended', None, _('try extended date formats'))], |
|
3787 | 3787 | _('[-e] DATE [RANGE]')), |
|
3788 | 3788 | "debugdata": (debugdata, [], _('FILE REV')), |
|
3789 | 3789 | "debugfsinfo": (debugfsinfo, [], _('[PATH]')), |
|
3790 | 3790 | "debugindex": (debugindex, [], _('FILE')), |
|
3791 | 3791 | "debugindexdot": (debugindexdot, [], _('FILE')), |
|
3792 | 3792 | "debuginstall": (debuginstall, [], ''), |
|
3793 | 3793 | "debugrebuildstate": |
|
3794 | 3794 | (debugrebuildstate, |
|
3795 | 3795 | [('r', 'rev', '', _('revision to rebuild to'))], |
|
3796 | 3796 | _('[-r REV] [REV]')), |
|
3797 | 3797 | "debugrename": |
|
3798 | 3798 | (debugrename, |
|
3799 | 3799 | [('r', 'rev', '', _('revision to debug'))], |
|
3800 | 3800 | _('[-r REV] FILE')), |
|
3801 | 3801 | "debugrevspec": |
|
3802 | 3802 | (debugrevspec, [], ('REVSPEC')), |
|
3803 | 3803 | "debugsetparents": |
|
3804 | 3804 | (debugsetparents, [], _('REV1 [REV2]')), |
|
3805 | 3805 | "debugstate": |
|
3806 | 3806 | (debugstate, |
|
3807 | 3807 | [('', 'nodates', None, _('do not display the saved mtime'))], |
|
3808 | 3808 | _('[OPTION]...')), |
|
3809 | 3809 | "debugsub": |
|
3810 | 3810 | (debugsub, |
|
3811 | 3811 | [('r', 'rev', '', _('revision to check'))], |
|
3812 | 3812 | _('[-r REV] [REV]')), |
|
3813 | 3813 | "debugwalk": (debugwalk, walkopts, _('[OPTION]... [FILE]...')), |
|
3814 | 3814 | "^diff": |
|
3815 | 3815 | (diff, |
|
3816 | 3816 | [('r', 'rev', [], _('revision')), |
|
3817 | 3817 | ('c', 'change', '', _('change made by revision')) |
|
3818 | 3818 | ] + diffopts + diffopts2 + walkopts, |
|
3819 | 3819 | _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...')), |
|
3820 | 3820 | "^export": |
|
3821 | 3821 | (export, |
|
3822 | 3822 | [('o', 'output', '', _('print output to file with formatted name')), |
|
3823 | 3823 | ('', 'switch-parent', None, _('diff against the second parent')), |
|
3824 | 3824 | ('r', 'rev', [], _('revisions to export')), |
|
3825 | 3825 | ] + diffopts, |
|
3826 | 3826 | _('[OPTION]... [-o OUTFILESPEC] REV...')), |
|
3827 | 3827 | "^forget": |
|
3828 | 3828 | (forget, |
|
3829 | 3829 | [] + walkopts, |
|
3830 | 3830 | _('[OPTION]... FILE...')), |
|
3831 | 3831 | "grep": |
|
3832 | 3832 | (grep, |
|
3833 | 3833 | [('0', 'print0', None, _('end fields with NUL')), |
|
3834 | 3834 | ('', 'all', None, _('print all revisions that match')), |
|
3835 | 3835 | ('f', 'follow', None, |
|
3836 | 3836 | _('follow changeset history,' |
|
3837 | 3837 | ' or file history across copies and renames')), |
|
3838 | 3838 | ('i', 'ignore-case', None, _('ignore case when matching')), |
|
3839 | 3839 | ('l', 'files-with-matches', None, |
|
3840 | 3840 | _('print only filenames and revisions that match')), |
|
3841 | 3841 | ('n', 'line-number', None, _('print matching line numbers')), |
|
3842 | 3842 | ('r', 'rev', [], _('only search files changed within revision range')), |
|
3843 | 3843 | ('u', 'user', None, _('list the author (long with -v)')), |
|
3844 | 3844 | ('d', 'date', None, _('list the date (short with -q)')), |
|
3845 | 3845 | ] + walkopts, |
|
3846 | 3846 | _('[OPTION]... PATTERN [FILE]...')), |
|
3847 | 3847 | "heads": |
|
3848 | 3848 | (heads, |
|
3849 | 3849 | [('r', 'rev', '', _('show only heads which are descendants of REV')), |
|
3850 | 3850 | ('t', 'topo', False, _('show topological heads only')), |
|
3851 | 3851 | ('a', 'active', False, |
|
3852 | 3852 | _('show active branchheads only [DEPRECATED]')), |
|
3853 | 3853 | ('c', 'closed', False, |
|
3854 | 3854 | _('show normal and closed branch heads')), |
|
3855 | 3855 | ] + templateopts, |
|
3856 | 3856 | _('[-ac] [-r REV] [REV]...')), |
|
3857 | 3857 | "help": (help_, [], _('[TOPIC]')), |
|
3858 | 3858 | "identify|id": |
|
3859 | 3859 | (identify, |
|
3860 | 3860 | [('r', 'rev', '', _('identify the specified revision')), |
|
3861 | 3861 | ('n', 'num', None, _('show local revision number')), |
|
3862 | 3862 | ('i', 'id', None, _('show global revision id')), |
|
3863 | 3863 | ('b', 'branch', None, _('show branch')), |
|
3864 | 3864 | ('t', 'tags', None, _('show tags'))], |
|
3865 | 3865 | _('[-nibt] [-r REV] [SOURCE]')), |
|
3866 | 3866 | "import|patch": |
|
3867 | 3867 | (import_, |
|
3868 | 3868 | [('p', 'strip', 1, |
|
3869 | 3869 | _('directory strip option for patch. This has the same ' |
|
3870 | 3870 | 'meaning as the corresponding patch option')), |
|
3871 | 3871 | ('b', 'base', '', _('base path')), |
|
3872 | 3872 | ('f', 'force', None, |
|
3873 | 3873 | _('skip check for outstanding uncommitted changes')), |
|
3874 | 3874 | ('', 'no-commit', None, |
|
3875 | 3875 | _("don't commit, just update the working directory")), |
|
3876 | 3876 | ('', 'exact', None, |
|
3877 | 3877 | _('apply patch to the nodes from which it was generated')), |
|
3878 | 3878 | ('', 'import-branch', None, |
|
3879 | 3879 | _('use any branch information in patch (implied by --exact)'))] + |
|
3880 | 3880 | commitopts + commitopts2 + similarityopts, |
|
3881 | 3881 | _('[OPTION]... PATCH...')), |
|
3882 | 3882 | "incoming|in": |
|
3883 | 3883 | (incoming, |
|
3884 | 3884 | [('f', 'force', None, |
|
3885 | 3885 | _('run even if remote repository is unrelated')), |
|
3886 | 3886 | ('n', 'newest-first', None, _('show newest record first')), |
|
3887 | 3887 | ('', 'bundle', '', _('file to store the bundles into')), |
|
3888 | 3888 | ('r', 'rev', [], |
|
3889 | 3889 | _('a remote changeset intended to be added')), |
|
3890 | 3890 | ('b', 'branch', [], |
|
3891 | 3891 | _('a specific branch you would like to pull')), |
|
3892 | 3892 | ] + logopts + remoteopts, |
|
3893 | 3893 | _('[-p] [-n] [-M] [-f] [-r REV]...' |
|
3894 | 3894 | ' [--bundle FILENAME] [SOURCE]')), |
|
3895 | 3895 | "^init": |
|
3896 | 3896 | (init, |
|
3897 | 3897 | remoteopts, |
|
3898 | 3898 | _('[-e CMD] [--remotecmd CMD] [DEST]')), |
|
3899 | 3899 | "locate": |
|
3900 | 3900 | (locate, |
|
3901 | 3901 | [('r', 'rev', '', _('search the repository as it is in REV')), |
|
3902 | 3902 | ('0', 'print0', None, |
|
3903 | 3903 | _('end filenames with NUL, for use with xargs')), |
|
3904 | 3904 | ('f', 'fullpath', None, |
|
3905 | 3905 | _('print complete paths from the filesystem root')), |
|
3906 | 3906 | ] + walkopts, |
|
3907 | 3907 | _('[OPTION]... [PATTERN]...')), |
|
3908 | 3908 | "^log|history": |
|
3909 | 3909 | (log, |
|
3910 | 3910 | [('f', 'follow', None, |
|
3911 | 3911 | _('follow changeset history,' |
|
3912 | 3912 | ' or file history across copies and renames')), |
|
3913 | 3913 | ('', 'follow-first', None, |
|
3914 | 3914 | _('only follow the first parent of merge changesets')), |
|
3915 | 3915 | ('d', 'date', '', _('show revisions matching date spec')), |
|
3916 | 3916 | ('C', 'copies', None, _('show copied files')), |
|
3917 | 3917 | ('k', 'keyword', [], _('do case-insensitive search for a keyword')), |
|
3918 | 3918 | ('r', 'rev', [], _('show the specified revision or range')), |
|
3919 | 3919 | ('', 'removed', None, _('include revisions where files were removed')), |
|
3920 | 3920 | ('m', 'only-merges', None, _('show only merges')), |
|
3921 | 3921 | ('u', 'user', [], _('revisions committed by user')), |
|
3922 | 3922 | ('', 'only-branch', [], |
|
3923 | 3923 | _('show only changesets within the given named branch (DEPRECATED)')), |
|
3924 | 3924 | ('b', 'branch', [], |
|
3925 | 3925 | _('show changesets within the given named branch')), |
|
3926 | 3926 | ('P', 'prune', [], |
|
3927 | 3927 | _('do not display revision or any of its ancestors')), |
|
3928 | 3928 | ] + logopts + walkopts, |
|
3929 | 3929 | _('[OPTION]... [FILE]')), |
|
3930 | 3930 | "manifest": |
|
3931 | 3931 | (manifest, |
|
3932 | 3932 | [('r', 'rev', '', _('revision to display'))], |
|
3933 | 3933 | _('[-r REV]')), |
|
3934 | 3934 | "^merge": |
|
3935 | 3935 | (merge, |
|
3936 | 3936 | [('f', 'force', None, _('force a merge with outstanding changes')), |
|
3937 | 3937 | ('r', 'rev', '', _('revision to merge')), |
|
3938 | 3938 | ('P', 'preview', None, |
|
3939 | 3939 | _('review revisions to merge (no merge is performed)'))], |
|
3940 | 3940 | _('[-P] [-f] [[-r] REV]')), |
|
3941 | 3941 | "outgoing|out": |
|
3942 | 3942 | (outgoing, |
|
3943 | 3943 | [('f', 'force', None, |
|
3944 | 3944 | _('run even when the destination is unrelated')), |
|
3945 | 3945 | ('r', 'rev', [], |
|
3946 | 3946 | _('a changeset intended to be included in the destination')), |
|
3947 | 3947 | ('n', 'newest-first', None, _('show newest record first')), |
|
3948 | 3948 | ('b', 'branch', [], |
|
3949 | 3949 | _('a specific branch you would like to push')), |
|
3950 | 3950 | ] + logopts + remoteopts, |
|
3951 | 3951 | _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')), |
|
3952 | 3952 | "parents": |
|
3953 | 3953 | (parents, |
|
3954 | 3954 | [('r', 'rev', '', _('show parents of the specified revision')), |
|
3955 | 3955 | ] + templateopts, |
|
3956 | 3956 | _('[-r REV] [FILE]')), |
|
3957 | 3957 | "paths": (paths, [], _('[NAME]')), |
|
3958 | 3958 | "^pull": |
|
3959 | 3959 | (pull, |
|
3960 | 3960 | [('u', 'update', None, |
|
3961 | 3961 | _('update to new branch head if changesets were pulled')), |
|
3962 | 3962 | ('f', 'force', None, |
|
3963 | 3963 | _('run even when remote repository is unrelated')), |
|
3964 | 3964 | ('r', 'rev', [], |
|
3965 | 3965 | _('a remote changeset intended to be added')), |
|
3966 | 3966 | ('b', 'branch', [], |
|
3967 | 3967 | _('a specific branch you would like to pull')), |
|
3968 | 3968 | ] + remoteopts, |
|
3969 | 3969 | _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')), |
|
3970 | 3970 | "^push": |
|
3971 | 3971 | (push, |
|
3972 | 3972 | [('f', 'force', None, _('force push')), |
|
3973 | 3973 | ('r', 'rev', [], |
|
3974 | 3974 | _('a changeset intended to be included in the destination')), |
|
3975 | 3975 | ('b', 'branch', [], |
|
3976 | 3976 | _('a specific branch you would like to push')), |
|
3977 | 3977 | ('', 'new-branch', False, _('allow pushing a new branch')), |
|
3978 | 3978 | ] + remoteopts, |
|
3979 | 3979 | _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')), |
|
3980 | 3980 | "recover": (recover, []), |
|
3981 | 3981 | "^remove|rm": |
|
3982 | 3982 | (remove, |
|
3983 | 3983 | [('A', 'after', None, _('record delete for missing files')), |
|
3984 | 3984 | ('f', 'force', None, |
|
3985 | 3985 | _('remove (and delete) file even if added or modified')), |
|
3986 | 3986 | ] + walkopts, |
|
3987 | 3987 | _('[OPTION]... FILE...')), |
|
3988 | 3988 | "rename|mv": |
|
3989 | 3989 | (rename, |
|
3990 | 3990 | [('A', 'after', None, _('record a rename that has already occurred')), |
|
3991 | 3991 | ('f', 'force', None, |
|
3992 | 3992 | _('forcibly copy over an existing managed file')), |
|
3993 | 3993 | ] + walkopts + dryrunopts, |
|
3994 | 3994 | _('[OPTION]... SOURCE... DEST')), |
|
3995 | 3995 | "resolve": |
|
3996 | 3996 | (resolve, |
|
3997 | 3997 | [('a', 'all', None, _('select all unresolved files')), |
|
3998 | 3998 | ('l', 'list', None, _('list state of files needing merge')), |
|
3999 | 3999 | ('m', 'mark', None, _('mark files as resolved')), |
|
4000 | 4000 | ('u', 'unmark', None, _('unmark files as resolved')), |
|
4001 | 4001 | ('n', 'no-status', None, _('hide status prefix'))] |
|
4002 | 4002 | + walkopts, |
|
4003 | 4003 | _('[OPTION]... [FILE]...')), |
|
4004 | 4004 | "revert": |
|
4005 | 4005 | (revert, |
|
4006 | 4006 | [('a', 'all', None, _('revert all changes when no arguments given')), |
|
4007 | 4007 | ('d', 'date', '', _('tipmost revision matching date')), |
|
4008 | 4008 | ('r', 'rev', '', _('revert to the specified revision')), |
|
4009 | 4009 | ('', 'no-backup', None, _('do not save backup copies of files')), |
|
4010 | 4010 | ] + walkopts + dryrunopts, |
|
4011 | 4011 | _('[OPTION]... [-r REV] [NAME]...')), |
|
4012 | 4012 | "rollback": (rollback, dryrunopts), |
|
4013 | 4013 | "root": (root, []), |
|
4014 | 4014 | "^serve": |
|
4015 | 4015 | (serve, |
|
4016 | 4016 | [('A', 'accesslog', '', _('name of access log file to write to')), |
|
4017 | 4017 | ('d', 'daemon', None, _('run server in background')), |
|
4018 | 4018 | ('', 'daemon-pipefds', '', _('used internally by daemon mode')), |
|
4019 | 4019 | ('E', 'errorlog', '', _('name of error log file to write to')), |
|
4020 | 4020 | # use string type, then we can check if something was passed |
|
4021 | 4021 | ('p', 'port', '', _('port to listen on (default: 8000)')), |
|
4022 | 4022 | ('a', 'address', '', |
|
4023 | 4023 | _('address to listen on (default: all interfaces)')), |
|
4024 | 4024 | ('', 'prefix', '', |
|
4025 | 4025 | _('prefix path to serve from (default: server root)')), |
|
4026 | 4026 | ('n', 'name', '', |
|
4027 | 4027 | _('name to show in web pages (default: working directory)')), |
|
4028 | 4028 | ('', 'web-conf', '', _('name of the hgweb config file' |
|
4029 | 4029 | ' (serve more than one repository)')), |
|
4030 | 4030 | ('', 'webdir-conf', '', _('name of the hgweb config file' |
|
4031 | 4031 | ' (DEPRECATED)')), |
|
4032 | 4032 | ('', 'pid-file', '', _('name of file to write process ID to')), |
|
4033 | 4033 | ('', 'stdio', None, _('for remote clients')), |
|
4034 | 4034 | ('t', 'templates', '', _('web templates to use')), |
|
4035 | 4035 | ('', 'style', '', _('template style to use')), |
|
4036 | 4036 | ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')), |
|
4037 | 4037 | ('', 'certificate', '', _('SSL certificate file'))], |
|
4038 | 4038 | _('[OPTION]...')), |
|
4039 | 4039 | "showconfig|debugconfig": |
|
4040 | 4040 | (showconfig, |
|
4041 | 4041 | [('u', 'untrusted', None, _('show untrusted configuration options'))], |
|
4042 | 4042 | _('[-u] [NAME]...')), |
|
4043 | 4043 | "^summary|sum": |
|
4044 | 4044 | (summary, |
|
4045 | 4045 | [('', 'remote', None, _('check for push and pull'))], '[--remote]'), |
|
4046 | 4046 | "^status|st": |
|
4047 | 4047 | (status, |
|
4048 | 4048 | [('A', 'all', None, _('show status of all files')), |
|
4049 | 4049 | ('m', 'modified', None, _('show only modified files')), |
|
4050 | 4050 | ('a', 'added', None, _('show only added files')), |
|
4051 | 4051 | ('r', 'removed', None, _('show only removed files')), |
|
4052 | 4052 | ('d', 'deleted', None, _('show only deleted (but tracked) files')), |
|
4053 | 4053 | ('c', 'clean', None, _('show only files without changes')), |
|
4054 | 4054 | ('u', 'unknown', None, _('show only unknown (not tracked) files')), |
|
4055 | 4055 | ('i', 'ignored', None, _('show only ignored files')), |
|
4056 | 4056 | ('n', 'no-status', None, _('hide status prefix')), |
|
4057 | 4057 | ('C', 'copies', None, _('show source of copied files')), |
|
4058 | 4058 | ('0', 'print0', None, |
|
4059 | 4059 | _('end filenames with NUL, for use with xargs')), |
|
4060 | 4060 | ('', 'rev', [], _('show difference from revision')), |
|
4061 | 4061 | ('', 'change', '', _('list the changed files of a revision')), |
|
4062 | 4062 | ] + walkopts, |
|
4063 | 4063 | _('[OPTION]... [FILE]...')), |
|
4064 | 4064 | "tag": |
|
4065 | 4065 | (tag, |
|
4066 | 4066 | [('f', 'force', None, _('replace existing tag')), |
|
4067 | 4067 | ('l', 'local', None, _('make the tag local')), |
|
4068 | 4068 | ('r', 'rev', '', _('revision to tag')), |
|
4069 | 4069 | ('', 'remove', None, _('remove a tag')), |
|
4070 | 4070 | # -l/--local is already there, commitopts cannot be used |
|
4071 | 4071 | ('e', 'edit', None, _('edit commit message')), |
|
4072 | 4072 | ('m', 'message', '', _('use <text> as commit message')), |
|
4073 | 4073 | ] + commitopts2, |
|
4074 | 4074 | _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')), |
|
4075 | 4075 | "tags": (tags, [], ''), |
|
4076 | 4076 | "tip": |
|
4077 | 4077 | (tip, |
|
4078 | 4078 | [('p', 'patch', None, _('show patch')), |
|
4079 | 4079 | ('g', 'git', None, _('use git extended diff format')), |
|
4080 | 4080 | ] + templateopts, |
|
4081 | 4081 | _('[-p] [-g]')), |
|
4082 | 4082 | "unbundle": |
|
4083 | 4083 | (unbundle, |
|
4084 | 4084 | [('u', 'update', None, |
|
4085 | 4085 | _('update to new branch head if changesets were unbundled'))], |
|
4086 | 4086 | _('[-u] FILE...')), |
|
4087 | 4087 | "^update|up|checkout|co": |
|
4088 | 4088 | (update, |
|
4089 | 4089 | [('C', 'clean', None, _('discard uncommitted changes (no backup)')), |
|
4090 | 4090 | ('c', 'check', None, _('check for uncommitted changes')), |
|
4091 | 4091 | ('d', 'date', '', _('tipmost revision matching date')), |
|
4092 | 4092 | ('r', 'rev', '', _('revision'))], |
|
4093 | 4093 | _('[-c] [-C] [-d DATE] [[-r] REV]')), |
|
4094 | 4094 | "verify": (verify, []), |
|
4095 | 4095 | "version": (version_, []), |
|
4096 | 4096 | } |
|
4097 | 4097 | |
|
4098 | 4098 | norepo = ("clone init version help debugcommands debugcomplete debugdata" |
|
4099 | 4099 | " debugindex debugindexdot debugdate debuginstall debugfsinfo") |
|
4100 | 4100 | optionalrepo = ("identify paths serve showconfig debugancestor") |
@@ -1,554 +1,550 b'' | |||
|
1 | 1 | # ui.py - user interface bits for mercurial |
|
2 | 2 | # |
|
3 | 3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
4 | 4 | # |
|
5 | 5 | # This software may be used and distributed according to the terms of the |
|
6 | 6 | # GNU General Public License version 2 or any later version. |
|
7 | 7 | |
|
8 | 8 | from i18n import _ |
|
9 | 9 | import errno, getpass, os, socket, sys, tempfile, traceback |
|
10 | 10 | import config, util, error |
|
11 | 11 | |
|
12 | 12 | _booleans = {'1': True, 'yes': True, 'true': True, 'on': True, |
|
13 | 13 | '0': False, 'no': False, 'false': False, 'off': False} |
|
14 | 14 | |
|
15 | 15 | class ui(object): |
|
16 | 16 | def __init__(self, src=None): |
|
17 | 17 | self._buffers = [] |
|
18 | 18 | self.quiet = self.verbose = self.debugflag = self.tracebackflag = False |
|
19 | 19 | self._reportuntrusted = True |
|
20 | 20 | self._ocfg = config.config() # overlay |
|
21 | 21 | self._tcfg = config.config() # trusted |
|
22 | 22 | self._ucfg = config.config() # untrusted |
|
23 | 23 | self._trustusers = set() |
|
24 | 24 | self._trustgroups = set() |
|
25 | 25 | |
|
26 | 26 | if src: |
|
27 | 27 | self._tcfg = src._tcfg.copy() |
|
28 | 28 | self._ucfg = src._ucfg.copy() |
|
29 | 29 | self._ocfg = src._ocfg.copy() |
|
30 | 30 | self._trustusers = src._trustusers.copy() |
|
31 | 31 | self._trustgroups = src._trustgroups.copy() |
|
32 | 32 | self.environ = src.environ |
|
33 | 33 | self.fixconfig() |
|
34 | 34 | else: |
|
35 | 35 | # shared read-only environment |
|
36 | 36 | self.environ = os.environ |
|
37 | 37 | # we always trust global config files |
|
38 | 38 | for f in util.rcpath(): |
|
39 | 39 | self.readconfig(f, trust=True) |
|
40 | 40 | |
|
41 | 41 | def copy(self): |
|
42 | 42 | return self.__class__(self) |
|
43 | 43 | |
|
44 | 44 | def _is_trusted(self, fp, f): |
|
45 | 45 | st = util.fstat(fp) |
|
46 | 46 | if util.isowner(st): |
|
47 | 47 | return True |
|
48 | 48 | |
|
49 | 49 | tusers, tgroups = self._trustusers, self._trustgroups |
|
50 | 50 | if '*' in tusers or '*' in tgroups: |
|
51 | 51 | return True |
|
52 | 52 | |
|
53 | 53 | user = util.username(st.st_uid) |
|
54 | 54 | group = util.groupname(st.st_gid) |
|
55 | 55 | if user in tusers or group in tgroups or user == util.username(): |
|
56 | 56 | return True |
|
57 | 57 | |
|
58 | 58 | if self._reportuntrusted: |
|
59 | 59 | self.warn(_('Not trusting file %s from untrusted ' |
|
60 | 60 | 'user %s, group %s\n') % (f, user, group)) |
|
61 | 61 | return False |
|
62 | 62 | |
|
63 | 63 | def readconfig(self, filename, root=None, trust=False, |
|
64 | 64 | sections=None, remap=None): |
|
65 | 65 | try: |
|
66 | 66 | fp = open(filename) |
|
67 | 67 | except IOError: |
|
68 | 68 | if not sections: # ignore unless we were looking for something |
|
69 | 69 | return |
|
70 | 70 | raise |
|
71 | 71 | |
|
72 | 72 | cfg = config.config() |
|
73 | 73 | trusted = sections or trust or self._is_trusted(fp, filename) |
|
74 | 74 | |
|
75 | 75 | try: |
|
76 | 76 | cfg.read(filename, fp, sections=sections, remap=remap) |
|
77 | 77 | except error.ConfigError, inst: |
|
78 | 78 | if trusted: |
|
79 | 79 | raise |
|
80 | 80 | self.warn(_("Ignored: %s\n") % str(inst)) |
|
81 | 81 | |
|
82 | 82 | if self.plain(): |
|
83 | 83 | for k in ('debug', 'fallbackencoding', 'quiet', 'slash', |
|
84 | 84 | 'logtemplate', 'style', |
|
85 | 85 | 'traceback', 'verbose'): |
|
86 | 86 | if k in cfg['ui']: |
|
87 | 87 | del cfg['ui'][k] |
|
88 | 88 | for k, v in cfg.items('alias'): |
|
89 | 89 | del cfg['alias'][k] |
|
90 | 90 | for k, v in cfg.items('defaults'): |
|
91 | 91 | del cfg['defaults'][k] |
|
92 | 92 | |
|
93 | 93 | if trusted: |
|
94 | 94 | self._tcfg.update(cfg) |
|
95 | 95 | self._tcfg.update(self._ocfg) |
|
96 | 96 | self._ucfg.update(cfg) |
|
97 | 97 | self._ucfg.update(self._ocfg) |
|
98 | 98 | |
|
99 | 99 | if root is None: |
|
100 | 100 | root = os.path.expanduser('~') |
|
101 | 101 | self.fixconfig(root=root) |
|
102 | 102 | |
|
103 | 103 | def fixconfig(self, root=None): |
|
104 | 104 | # translate paths relative to root (or home) into absolute paths |
|
105 | 105 | root = root or os.getcwd() |
|
106 | 106 | for c in self._tcfg, self._ucfg, self._ocfg: |
|
107 | 107 | for n, p in c.items('paths'): |
|
108 | 108 | if p and "://" not in p and not os.path.isabs(p): |
|
109 | 109 | c.set("paths", n, os.path.normpath(os.path.join(root, p))) |
|
110 | 110 | |
|
111 | 111 | # update ui options |
|
112 | 112 | self.debugflag = self.configbool('ui', 'debug') |
|
113 | 113 | self.verbose = self.debugflag or self.configbool('ui', 'verbose') |
|
114 | 114 | self.quiet = not self.debugflag and self.configbool('ui', 'quiet') |
|
115 | 115 | if self.verbose and self.quiet: |
|
116 | 116 | self.quiet = self.verbose = False |
|
117 | 117 | self._reportuntrusted = self.configbool("ui", "report_untrusted", True) |
|
118 | 118 | self.tracebackflag = self.configbool('ui', 'traceback', False) |
|
119 | 119 | |
|
120 | 120 | # update trust information |
|
121 | 121 | self._trustusers.update(self.configlist('trusted', 'users')) |
|
122 | 122 | self._trustgroups.update(self.configlist('trusted', 'groups')) |
|
123 | 123 | |
|
124 | 124 | def setconfig(self, section, name, value): |
|
125 | 125 | for cfg in (self._ocfg, self._tcfg, self._ucfg): |
|
126 | 126 | cfg.set(section, name, value) |
|
127 | 127 | self.fixconfig() |
|
128 | 128 | |
|
129 | 129 | def _data(self, untrusted): |
|
130 | 130 | return untrusted and self._ucfg or self._tcfg |
|
131 | 131 | |
|
132 | 132 | def configsource(self, section, name, untrusted=False): |
|
133 | 133 | return self._data(untrusted).source(section, name) or 'none' |
|
134 | 134 | |
|
135 | 135 | def config(self, section, name, default=None, untrusted=False): |
|
136 | 136 | value = self._data(untrusted).get(section, name, default) |
|
137 | 137 | if self.debugflag and not untrusted and self._reportuntrusted: |
|
138 | 138 | uvalue = self._ucfg.get(section, name) |
|
139 | 139 | if uvalue is not None and uvalue != value: |
|
140 | 140 | self.debug(_("ignoring untrusted configuration option " |
|
141 | 141 | "%s.%s = %s\n") % (section, name, uvalue)) |
|
142 | 142 | return value |
|
143 | 143 | |
|
144 | 144 | def configbool(self, section, name, default=False, untrusted=False): |
|
145 | 145 | v = self.config(section, name, None, untrusted) |
|
146 | 146 | if v is None: |
|
147 | 147 | return default |
|
148 | 148 | if isinstance(v, bool): |
|
149 | 149 | return v |
|
150 | 150 | if v.lower() not in _booleans: |
|
151 | 151 | raise error.ConfigError(_("%s.%s not a boolean ('%s')") |
|
152 | 152 | % (section, name, v)) |
|
153 | 153 | return _booleans[v.lower()] |
|
154 | 154 | |
|
155 | 155 | def configlist(self, section, name, default=None, untrusted=False): |
|
156 | 156 | """Return a list of comma/space separated strings""" |
|
157 | 157 | |
|
158 | 158 | def _parse_plain(parts, s, offset): |
|
159 | 159 | whitespace = False |
|
160 | 160 | while offset < len(s) and (s[offset].isspace() or s[offset] == ','): |
|
161 | 161 | whitespace = True |
|
162 | 162 | offset += 1 |
|
163 | 163 | if offset >= len(s): |
|
164 | 164 | return None, parts, offset |
|
165 | 165 | if whitespace: |
|
166 | 166 | parts.append('') |
|
167 | 167 | if s[offset] == '"' and not parts[-1]: |
|
168 | 168 | return _parse_quote, parts, offset + 1 |
|
169 | 169 | elif s[offset] == '"' and parts[-1][-1] == '\\': |
|
170 | 170 | parts[-1] = parts[-1][:-1] + s[offset] |
|
171 | 171 | return _parse_plain, parts, offset + 1 |
|
172 | 172 | parts[-1] += s[offset] |
|
173 | 173 | return _parse_plain, parts, offset + 1 |
|
174 | 174 | |
|
175 | 175 | def _parse_quote(parts, s, offset): |
|
176 | 176 | if offset < len(s) and s[offset] == '"': # "" |
|
177 | 177 | parts.append('') |
|
178 | 178 | offset += 1 |
|
179 | 179 | while offset < len(s) and (s[offset].isspace() or |
|
180 | 180 | s[offset] == ','): |
|
181 | 181 | offset += 1 |
|
182 | 182 | return _parse_plain, parts, offset |
|
183 | 183 | |
|
184 | 184 | while offset < len(s) and s[offset] != '"': |
|
185 | 185 | if (s[offset] == '\\' and offset + 1 < len(s) |
|
186 | 186 | and s[offset + 1] == '"'): |
|
187 | 187 | offset += 1 |
|
188 | 188 | parts[-1] += '"' |
|
189 | 189 | else: |
|
190 | 190 | parts[-1] += s[offset] |
|
191 | 191 | offset += 1 |
|
192 | 192 | |
|
193 | 193 | if offset >= len(s): |
|
194 | 194 | real_parts = _configlist(parts[-1]) |
|
195 | 195 | if not real_parts: |
|
196 | 196 | parts[-1] = '"' |
|
197 | 197 | else: |
|
198 | 198 | real_parts[0] = '"' + real_parts[0] |
|
199 | 199 | parts = parts[:-1] |
|
200 | 200 | parts.extend(real_parts) |
|
201 | 201 | return None, parts, offset |
|
202 | 202 | |
|
203 | 203 | offset += 1 |
|
204 | 204 | while offset < len(s) and s[offset] in [' ', ',']: |
|
205 | 205 | offset += 1 |
|
206 | 206 | |
|
207 | 207 | if offset < len(s): |
|
208 | 208 | if offset + 1 == len(s) and s[offset] == '"': |
|
209 | 209 | parts[-1] += '"' |
|
210 | 210 | offset += 1 |
|
211 | 211 | else: |
|
212 | 212 | parts.append('') |
|
213 | 213 | else: |
|
214 | 214 | return None, parts, offset |
|
215 | 215 | |
|
216 | 216 | return _parse_plain, parts, offset |
|
217 | 217 | |
|
218 | 218 | def _configlist(s): |
|
219 | 219 | s = s.rstrip(' ,') |
|
220 | 220 | if not s: |
|
221 | 221 | return None |
|
222 | 222 | parser, parts, offset = _parse_plain, [''], 0 |
|
223 | 223 | while parser: |
|
224 | 224 | parser, parts, offset = parser(parts, s, offset) |
|
225 | 225 | return parts |
|
226 | 226 | |
|
227 | 227 | result = self.config(section, name, untrusted=untrusted) |
|
228 | 228 | if result is None: |
|
229 | 229 | result = default or [] |
|
230 | 230 | if isinstance(result, basestring): |
|
231 | 231 | result = _configlist(result) |
|
232 | 232 | if result is None: |
|
233 | 233 | result = default or [] |
|
234 | 234 | return result |
|
235 | 235 | |
|
236 | 236 | def has_section(self, section, untrusted=False): |
|
237 | 237 | '''tell whether section exists in config.''' |
|
238 | 238 | return section in self._data(untrusted) |
|
239 | 239 | |
|
240 | 240 | def configitems(self, section, untrusted=False): |
|
241 | 241 | items = self._data(untrusted).items(section) |
|
242 | 242 | if self.debugflag and not untrusted and self._reportuntrusted: |
|
243 | 243 | for k, v in self._ucfg.items(section): |
|
244 | 244 | if self._tcfg.get(section, k) != v: |
|
245 | 245 | self.debug(_("ignoring untrusted configuration option " |
|
246 | 246 | "%s.%s = %s\n") % (section, k, v)) |
|
247 | 247 | return items |
|
248 | 248 | |
|
249 | 249 | def walkconfig(self, untrusted=False): |
|
250 | 250 | cfg = self._data(untrusted) |
|
251 | 251 | for section in cfg.sections(): |
|
252 | 252 | for name, value in self.configitems(section, untrusted): |
|
253 | 253 | yield section, name, str(value).replace('\n', '\\n') |
|
254 | 254 | |
|
255 | 255 | def plain(self): |
|
256 | 256 | return 'HGPLAIN' in os.environ |
|
257 | 257 | |
|
258 | 258 | def username(self): |
|
259 | 259 | """Return default username to be used in commits. |
|
260 | 260 | |
|
261 | 261 | Searched in this order: $HGUSER, [ui] section of hgrcs, $EMAIL |
|
262 | 262 | and stop searching if one of these is set. |
|
263 | 263 | If not found and ui.askusername is True, ask the user, else use |
|
264 | 264 | ($LOGNAME or $USER or $LNAME or $USERNAME) + "@full.hostname". |
|
265 | 265 | """ |
|
266 | 266 | user = os.environ.get("HGUSER") |
|
267 | 267 | if user is None: |
|
268 | 268 | user = self.config("ui", "username") |
|
269 | 269 | if user is not None: |
|
270 | 270 | user = os.path.expandvars(user) |
|
271 | 271 | if user is None: |
|
272 | 272 | user = os.environ.get("EMAIL") |
|
273 | 273 | if user is None and self.configbool("ui", "askusername"): |
|
274 | 274 | user = self.prompt(_("enter a commit username:"), default=None) |
|
275 | 275 | if user is None and not self.interactive(): |
|
276 | 276 | try: |
|
277 | 277 | user = '%s@%s' % (util.getuser(), socket.getfqdn()) |
|
278 | 278 | self.warn(_("No username found, using '%s' instead\n") % user) |
|
279 | 279 | except KeyError: |
|
280 | 280 | pass |
|
281 | 281 | if not user: |
|
282 | 282 | raise util.Abort(_('no username supplied (see "hg help config")')) |
|
283 | 283 | if "\n" in user: |
|
284 | 284 | raise util.Abort(_("username %s contains a newline\n") % repr(user)) |
|
285 | 285 | return user |
|
286 | 286 | |
|
287 | 287 | def shortuser(self, user): |
|
288 | 288 | """Return a short representation of a user name or email address.""" |
|
289 | 289 | if not self.verbose: |
|
290 | 290 | user = util.shortuser(user) |
|
291 | 291 | return user |
|
292 | 292 | |
|
293 | 293 | def _path(self, loc): |
|
294 | 294 | p = self.config('paths', loc) |
|
295 | 295 | if p: |
|
296 | 296 | if '%%' in p: |
|
297 | 297 | self.warn("(deprecated '%%' in path %s=%s from %s)\n" % |
|
298 | 298 | (loc, p, self.configsource('paths', loc))) |
|
299 | 299 | p = p.replace('%%', '%') |
|
300 | 300 | p = util.expandpath(p) |
|
301 | 301 | return p |
|
302 | 302 | |
|
303 | 303 | def expandpath(self, loc, default=None): |
|
304 | 304 | """Return repository location relative to cwd or from [paths]""" |
|
305 | 305 | if "://" in loc or os.path.isdir(os.path.join(loc, '.hg')): |
|
306 | 306 | return loc |
|
307 | 307 | |
|
308 | 308 | path = self._path(loc) |
|
309 | 309 | if not path and default is not None: |
|
310 | 310 | path = self._path(default) |
|
311 | 311 | return path or loc |
|
312 | 312 | |
|
313 | 313 | def pushbuffer(self): |
|
314 | 314 | self._buffers.append([]) |
|
315 | 315 | |
|
316 | 316 | def popbuffer(self, labeled=False): |
|
317 | 317 | '''pop the last buffer and return the buffered output |
|
318 | 318 | |
|
319 | 319 | If labeled is True, any labels associated with buffered |
|
320 | 320 | output will be handled. By default, this has no effect |
|
321 | 321 | on the output returned, but extensions and GUI tools may |
|
322 | 322 | handle this argument and returned styled output. If output |
|
323 | 323 | is being buffered so it can be captured and parsed or |
|
324 | 324 | processed, labeled should not be set to True. |
|
325 | 325 | ''' |
|
326 | 326 | return "".join(self._buffers.pop()) |
|
327 | 327 | |
|
328 | 328 | def write(self, *args, **opts): |
|
329 | 329 | '''write args to output |
|
330 | 330 | |
|
331 | 331 | By default, this method simply writes to the buffer or stdout, |
|
332 | 332 | but extensions or GUI tools may override this method, |
|
333 | 333 | write_err(), popbuffer(), and label() to style output from |
|
334 | 334 | various parts of hg. |
|
335 | 335 | |
|
336 | 336 | An optional keyword argument, "label", can be passed in. |
|
337 | 337 | This should be a string containing label names separated by |
|
338 | 338 | space. Label names take the form of "topic.type". For example, |
|
339 | 339 | ui.debug() issues a label of "ui.debug". |
|
340 | 340 | |
|
341 | 341 | When labeling output for a specific command, a label of |
|
342 | 342 | "cmdname.type" is recommended. For example, status issues |
|
343 | 343 | a label of "status.modified" for modified files. |
|
344 | 344 | ''' |
|
345 | 345 | if self._buffers: |
|
346 | 346 | self._buffers[-1].extend([str(a) for a in args]) |
|
347 | 347 | else: |
|
348 | 348 | for a in args: |
|
349 | 349 | sys.stdout.write(str(a)) |
|
350 | 350 | |
|
351 | 351 | def write_err(self, *args, **opts): |
|
352 | 352 | try: |
|
353 | 353 | if not getattr(sys.stdout, 'closed', False): |
|
354 | 354 | sys.stdout.flush() |
|
355 | 355 | for a in args: |
|
356 | 356 | sys.stderr.write(str(a)) |
|
357 | 357 | # stderr may be buffered under win32 when redirected to files, |
|
358 | 358 | # including stdout. |
|
359 | 359 | if not getattr(sys.stderr, 'closed', False): |
|
360 | 360 | sys.stderr.flush() |
|
361 | 361 | except IOError, inst: |
|
362 | 362 | if inst.errno != errno.EPIPE: |
|
363 | 363 | raise |
|
364 | 364 | |
|
365 | 365 | def flush(self): |
|
366 | 366 | try: sys.stdout.flush() |
|
367 | 367 | except: pass |
|
368 | 368 | try: sys.stderr.flush() |
|
369 | 369 | except: pass |
|
370 | 370 | |
|
371 | 371 | def interactive(self): |
|
372 | 372 | i = self.configbool("ui", "interactive", None) |
|
373 | 373 | if i is None: |
|
374 | 374 | try: |
|
375 | 375 | return sys.stdin.isatty() |
|
376 | 376 | except AttributeError: |
|
377 | 377 | # some environments replace stdin without implementing isatty |
|
378 | 378 | # usually those are non-interactive |
|
379 | 379 | return False |
|
380 | 380 | |
|
381 | 381 | return i |
|
382 | 382 | |
|
383 | 383 | def _readline(self, prompt=''): |
|
384 | 384 | if sys.stdin.isatty(): |
|
385 | 385 | try: |
|
386 | 386 | # magically add command line editing support, where |
|
387 | 387 | # available |
|
388 | 388 | import readline |
|
389 | 389 | # force demandimport to really load the module |
|
390 | 390 | readline.read_history_file |
|
391 | 391 | # windows sometimes raises something other than ImportError |
|
392 | 392 | except Exception: |
|
393 | 393 | pass |
|
394 | 394 | line = raw_input(prompt) |
|
395 | 395 | # When stdin is in binary mode on Windows, it can cause |
|
396 | 396 | # raw_input() to emit an extra trailing carriage return |
|
397 | 397 | if os.linesep == '\r\n' and line and line[-1] == '\r': |
|
398 | 398 | line = line[:-1] |
|
399 | 399 | return line |
|
400 | 400 | |
|
401 | 401 | def prompt(self, msg, default="y"): |
|
402 | 402 | """Prompt user with msg, read response. |
|
403 | 403 | If ui is not interactive, the default is returned. |
|
404 | 404 | """ |
|
405 | 405 | if not self.interactive(): |
|
406 | 406 | self.write(msg, ' ', default, "\n") |
|
407 | 407 | return default |
|
408 | 408 | try: |
|
409 | 409 | r = self._readline(msg + ' ') |
|
410 | 410 | if not r: |
|
411 | 411 | return default |
|
412 | 412 | return r |
|
413 | 413 | except EOFError: |
|
414 | 414 | raise util.Abort(_('response expected')) |
|
415 | 415 | |
|
416 | 416 | def promptchoice(self, msg, choices, default=0): |
|
417 | 417 | """Prompt user with msg, read response, and ensure it matches |
|
418 | 418 | one of the provided choices. The index of the choice is returned. |
|
419 | 419 | choices is a sequence of acceptable responses with the format: |
|
420 | 420 | ('&None', 'E&xec', 'Sym&link') Responses are case insensitive. |
|
421 | 421 | If ui is not interactive, the default is returned. |
|
422 | 422 | """ |
|
423 | 423 | resps = [s[s.index('&')+1].lower() for s in choices] |
|
424 | 424 | while True: |
|
425 | 425 | r = self.prompt(msg, resps[default]) |
|
426 | 426 | if r.lower() in resps: |
|
427 | 427 | return resps.index(r.lower()) |
|
428 | 428 | self.write(_("unrecognized response\n")) |
|
429 | 429 | |
|
430 | 430 | def getpass(self, prompt=None, default=None): |
|
431 | 431 | if not self.interactive(): |
|
432 | 432 | return default |
|
433 | 433 | try: |
|
434 | 434 | return getpass.getpass(prompt or _('password: ')) |
|
435 | 435 | except EOFError: |
|
436 | 436 | raise util.Abort(_('response expected')) |
|
437 | 437 | def status(self, *msg, **opts): |
|
438 | 438 | '''write status message to output (if ui.quiet is False) |
|
439 | 439 | |
|
440 | 440 | This adds an output label of "ui.status". |
|
441 | 441 | ''' |
|
442 | 442 | if not self.quiet: |
|
443 | 443 | opts['label'] = opts.get('label', '') + ' ui.status' |
|
444 | 444 | self.write(*msg, **opts) |
|
445 | 445 | def warn(self, *msg, **opts): |
|
446 | 446 | '''write warning message to output (stderr) |
|
447 | 447 | |
|
448 | 448 | This adds an output label of "ui.warning". |
|
449 | 449 | ''' |
|
450 | 450 | opts['label'] = opts.get('label', '') + ' ui.warning' |
|
451 | 451 | self.write_err(*msg, **opts) |
|
452 | 452 | def note(self, *msg, **opts): |
|
453 | 453 | '''write note to output (if ui.verbose is True) |
|
454 | 454 | |
|
455 | 455 | This adds an output label of "ui.note". |
|
456 | 456 | ''' |
|
457 | 457 | if self.verbose: |
|
458 | 458 | opts['label'] = opts.get('label', '') + ' ui.note' |
|
459 | 459 | self.write(*msg, **opts) |
|
460 | 460 | def debug(self, *msg, **opts): |
|
461 | 461 | '''write debug message to output (if ui.debugflag is True) |
|
462 | 462 | |
|
463 | 463 | This adds an output label of "ui.debug". |
|
464 | 464 | ''' |
|
465 | 465 | if self.debugflag: |
|
466 | 466 | opts['label'] = opts.get('label', '') + ' ui.debug' |
|
467 | 467 | self.write(*msg, **opts) |
|
468 | 468 | def edit(self, text, user): |
|
469 | 469 | (fd, name) = tempfile.mkstemp(prefix="hg-editor-", suffix=".txt", |
|
470 | 470 | text=True) |
|
471 | 471 | try: |
|
472 | 472 | f = os.fdopen(fd, "w") |
|
473 | 473 | f.write(text) |
|
474 | 474 | f.close() |
|
475 | 475 | |
|
476 | 476 | editor = self.geteditor() |
|
477 | 477 | |
|
478 | 478 | util.system("%s \"%s\"" % (editor, name), |
|
479 | 479 | environ={'HGUSER': user}, |
|
480 | 480 | onerr=util.Abort, errprefix=_("edit failed")) |
|
481 | 481 | |
|
482 | 482 | f = open(name) |
|
483 | 483 | t = f.read() |
|
484 | 484 | f.close() |
|
485 | 485 | finally: |
|
486 | 486 | os.unlink(name) |
|
487 | 487 | |
|
488 | 488 | return t |
|
489 | 489 | |
|
490 | 490 | def traceback(self, exc=None): |
|
491 | 491 | '''print exception traceback if traceback printing enabled. |
|
492 | 492 | only to call in exception handler. returns true if traceback |
|
493 | 493 | printed.''' |
|
494 | 494 | if self.tracebackflag: |
|
495 | 495 | if exc: |
|
496 | 496 | traceback.print_exception(exc[0], exc[1], exc[2]) |
|
497 | 497 | else: |
|
498 | 498 | traceback.print_exc() |
|
499 | 499 | return self.tracebackflag |
|
500 | 500 | |
|
501 | 501 | def geteditor(self): |
|
502 | 502 | '''return editor to use''' |
|
503 | 503 | return (os.environ.get("HGEDITOR") or |
|
504 | 504 | self.config("ui", "editor") or |
|
505 | 505 | os.environ.get("VISUAL") or |
|
506 | 506 | os.environ.get("EDITOR", "vi")) |
|
507 | 507 | |
|
508 | 508 | def progress(self, topic, pos, item="", unit="", total=None): |
|
509 | 509 | '''show a progress message |
|
510 | 510 | |
|
511 | 511 | With stock hg, this is simply a debug message that is hidden |
|
512 | 512 | by default, but with extensions or GUI tools it may be |
|
513 | 513 | visible. 'topic' is the current operation, 'item' is a |
|
514 | 514 | non-numeric marker of the current position (ie the currently |
|
515 | 515 | in-process file), 'pos' is the current numeric position (ie |
|
516 | 516 | revision, bytes, etc.), unit is a corresponding unit label, |
|
517 | 517 | and total is the highest expected pos. |
|
518 | 518 | |
|
519 | 519 | Multiple nested topics may be active at a time. |
|
520 | 520 | |
|
521 | 521 | All topics should be marked closed by setting pos to None at |
|
522 | 522 | termination. |
|
523 | 523 | ''' |
|
524 | 524 | |
|
525 | 525 | if pos == None or not self.debugflag: |
|
526 | 526 | return |
|
527 | 527 | |
|
528 | 528 | if unit: |
|
529 | 529 | unit = ' ' + unit |
|
530 | 530 | if item: |
|
531 | 531 | item = ' ' + item |
|
532 | 532 | |
|
533 | 533 | if total: |
|
534 | 534 | pct = 100.0 * pos / total |
|
535 | 535 | self.debug('%s:%s %s/%s%s (%4.2f%%)\n' |
|
536 | 536 | % (topic, item, pos, total, unit, pct)) |
|
537 | 537 | else: |
|
538 | 538 | self.debug('%s:%s %s%s\n' % (topic, item, pos, unit)) |
|
539 | 539 | |
|
540 | 540 | def label(self, msg, label): |
|
541 | 541 | '''style msg based on supplied label |
|
542 | 542 | |
|
543 | 543 | Like ui.write(), this just returns msg unchanged, but extensions |
|
544 | 544 | and GUI tools can override it to allow styling output without |
|
545 | 545 | writing it. |
|
546 | 546 | |
|
547 | 547 | ui.write(s, 'label') is equivalent to |
|
548 | 548 | ui.write(ui.label(s, 'label')). |
|
549 | ||
|
550 | Callers of ui.label() should pass labeled text back to | |
|
551 | ui.write() with a label of 'ui.labeled' so implementations know | |
|
552 | that the text has already been escaped and marked up. | |
|
553 | 549 | ''' |
|
554 | 550 | return msg |
General Comments 0
You need to be logged in to leave comments.
Login now