Show More
@@ -1,5586 +1,5587 b'' | |||||
1 | # commands.py - command processing for mercurial |
|
1 | # commands.py - command processing for mercurial | |
2 | # |
|
2 | # | |
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 |
|
7 | |||
8 | from __future__ import absolute_import |
|
8 | from __future__ import absolute_import | |
9 |
|
9 | |||
10 | import difflib |
|
10 | import difflib | |
11 | import errno |
|
11 | import errno | |
12 | import os |
|
12 | import os | |
13 | import re |
|
13 | import re | |
14 | import sys |
|
14 | import sys | |
15 |
|
15 | |||
16 | from .i18n import _ |
|
16 | from .i18n import _ | |
17 | from .node import ( |
|
17 | from .node import ( | |
18 | hex, |
|
18 | hex, | |
19 | nullid, |
|
19 | nullid, | |
20 | nullrev, |
|
20 | nullrev, | |
21 | short, |
|
21 | short, | |
22 | ) |
|
22 | ) | |
23 | from . import ( |
|
23 | from . import ( | |
24 | archival, |
|
24 | archival, | |
25 | bookmarks, |
|
25 | bookmarks, | |
26 | bundle2, |
|
26 | bundle2, | |
27 | changegroup, |
|
27 | changegroup, | |
28 | cmdutil, |
|
28 | cmdutil, | |
29 | copies, |
|
29 | copies, | |
30 | debugcommands as debugcommandsmod, |
|
30 | debugcommands as debugcommandsmod, | |
31 | destutil, |
|
31 | destutil, | |
32 | dirstateguard, |
|
32 | dirstateguard, | |
33 | discovery, |
|
33 | discovery, | |
34 | encoding, |
|
34 | encoding, | |
35 | error, |
|
35 | error, | |
36 | exchange, |
|
36 | exchange, | |
37 | extensions, |
|
37 | extensions, | |
38 | formatter, |
|
38 | formatter, | |
39 | graphmod, |
|
39 | graphmod, | |
40 | hbisect, |
|
40 | hbisect, | |
41 | help, |
|
41 | help, | |
42 | hg, |
|
42 | hg, | |
43 | lock as lockmod, |
|
43 | lock as lockmod, | |
44 | merge as mergemod, |
|
44 | merge as mergemod, | |
45 | obsolete, |
|
45 | obsolete, | |
46 | patch, |
|
46 | patch, | |
47 | phases, |
|
47 | phases, | |
48 | pycompat, |
|
48 | pycompat, | |
49 | rcutil, |
|
49 | rcutil, | |
50 | registrar, |
|
50 | registrar, | |
51 | revsetlang, |
|
51 | revsetlang, | |
52 | scmutil, |
|
52 | scmutil, | |
53 | server, |
|
53 | server, | |
54 | sshserver, |
|
54 | sshserver, | |
55 | streamclone, |
|
55 | streamclone, | |
56 | tags as tagsmod, |
|
56 | tags as tagsmod, | |
57 | templatekw, |
|
57 | templatekw, | |
58 | ui as uimod, |
|
58 | ui as uimod, | |
59 | util, |
|
59 | util, | |
60 | ) |
|
60 | ) | |
61 |
|
61 | |||
62 | release = lockmod.release |
|
62 | release = lockmod.release | |
63 |
|
63 | |||
64 | table = {} |
|
64 | table = {} | |
65 | table.update(debugcommandsmod.command._table) |
|
65 | table.update(debugcommandsmod.command._table) | |
66 |
|
66 | |||
67 | command = registrar.command(table) |
|
67 | command = registrar.command(table) | |
68 |
|
68 | |||
69 | # common command options |
|
69 | # common command options | |
70 |
|
70 | |||
71 | globalopts = [ |
|
71 | globalopts = [ | |
72 | ('R', 'repository', '', |
|
72 | ('R', 'repository', '', | |
73 | _('repository root directory or name of overlay bundle file'), |
|
73 | _('repository root directory or name of overlay bundle file'), | |
74 | _('REPO')), |
|
74 | _('REPO')), | |
75 | ('', 'cwd', '', |
|
75 | ('', 'cwd', '', | |
76 | _('change working directory'), _('DIR')), |
|
76 | _('change working directory'), _('DIR')), | |
77 | ('y', 'noninteractive', None, |
|
77 | ('y', 'noninteractive', None, | |
78 | _('do not prompt, automatically pick the first choice for all prompts')), |
|
78 | _('do not prompt, automatically pick the first choice for all prompts')), | |
79 | ('q', 'quiet', None, _('suppress output')), |
|
79 | ('q', 'quiet', None, _('suppress output')), | |
80 | ('v', 'verbose', None, _('enable additional output')), |
|
80 | ('v', 'verbose', None, _('enable additional output')), | |
81 | ('', 'color', '', |
|
81 | ('', 'color', '', | |
82 | # i18n: 'always', 'auto', 'never', and 'debug' are keywords |
|
82 | # i18n: 'always', 'auto', 'never', and 'debug' are keywords | |
83 | # and should not be translated |
|
83 | # and should not be translated | |
84 | _("when to colorize (boolean, always, auto, never, or debug)"), |
|
84 | _("when to colorize (boolean, always, auto, never, or debug)"), | |
85 | _('TYPE')), |
|
85 | _('TYPE')), | |
86 | ('', 'config', [], |
|
86 | ('', 'config', [], | |
87 | _('set/override config option (use \'section.name=value\')'), |
|
87 | _('set/override config option (use \'section.name=value\')'), | |
88 | _('CONFIG')), |
|
88 | _('CONFIG')), | |
89 | ('', 'debug', None, _('enable debugging output')), |
|
89 | ('', 'debug', None, _('enable debugging output')), | |
90 | ('', 'debugger', None, _('start debugger')), |
|
90 | ('', 'debugger', None, _('start debugger')), | |
91 | ('', 'encoding', encoding.encoding, _('set the charset encoding'), |
|
91 | ('', 'encoding', encoding.encoding, _('set the charset encoding'), | |
92 | _('ENCODE')), |
|
92 | _('ENCODE')), | |
93 | ('', 'encodingmode', encoding.encodingmode, |
|
93 | ('', 'encodingmode', encoding.encodingmode, | |
94 | _('set the charset encoding mode'), _('MODE')), |
|
94 | _('set the charset encoding mode'), _('MODE')), | |
95 | ('', 'traceback', None, _('always print a traceback on exception')), |
|
95 | ('', 'traceback', None, _('always print a traceback on exception')), | |
96 | ('', 'time', None, _('time how long the command takes')), |
|
96 | ('', 'time', None, _('time how long the command takes')), | |
97 | ('', 'profile', None, _('print command execution profile')), |
|
97 | ('', 'profile', None, _('print command execution profile')), | |
98 | ('', 'version', None, _('output version information and exit')), |
|
98 | ('', 'version', None, _('output version information and exit')), | |
99 | ('h', 'help', None, _('display help and exit')), |
|
99 | ('h', 'help', None, _('display help and exit')), | |
100 | ('', 'hidden', False, _('consider hidden changesets')), |
|
100 | ('', 'hidden', False, _('consider hidden changesets')), | |
101 | ('', 'pager', 'auto', |
|
101 | ('', 'pager', 'auto', | |
102 | _("when to paginate (boolean, always, auto, or never)"), _('TYPE')), |
|
102 | _("when to paginate (boolean, always, auto, or never)"), _('TYPE')), | |
103 | ] |
|
103 | ] | |
104 |
|
104 | |||
105 | dryrunopts = cmdutil.dryrunopts |
|
105 | dryrunopts = cmdutil.dryrunopts | |
106 | remoteopts = cmdutil.remoteopts |
|
106 | remoteopts = cmdutil.remoteopts | |
107 | walkopts = cmdutil.walkopts |
|
107 | walkopts = cmdutil.walkopts | |
108 | commitopts = cmdutil.commitopts |
|
108 | commitopts = cmdutil.commitopts | |
109 | commitopts2 = cmdutil.commitopts2 |
|
109 | commitopts2 = cmdutil.commitopts2 | |
110 | formatteropts = cmdutil.formatteropts |
|
110 | formatteropts = cmdutil.formatteropts | |
111 | templateopts = cmdutil.templateopts |
|
111 | templateopts = cmdutil.templateopts | |
112 | logopts = cmdutil.logopts |
|
112 | logopts = cmdutil.logopts | |
113 | diffopts = cmdutil.diffopts |
|
113 | diffopts = cmdutil.diffopts | |
114 | diffwsopts = cmdutil.diffwsopts |
|
114 | diffwsopts = cmdutil.diffwsopts | |
115 | diffopts2 = cmdutil.diffopts2 |
|
115 | diffopts2 = cmdutil.diffopts2 | |
116 | mergetoolopts = cmdutil.mergetoolopts |
|
116 | mergetoolopts = cmdutil.mergetoolopts | |
117 | similarityopts = cmdutil.similarityopts |
|
117 | similarityopts = cmdutil.similarityopts | |
118 | subrepoopts = cmdutil.subrepoopts |
|
118 | subrepoopts = cmdutil.subrepoopts | |
119 | debugrevlogopts = cmdutil.debugrevlogopts |
|
119 | debugrevlogopts = cmdutil.debugrevlogopts | |
120 |
|
120 | |||
121 | # Commands start here, listed alphabetically |
|
121 | # Commands start here, listed alphabetically | |
122 |
|
122 | |||
123 | @command('^add', |
|
123 | @command('^add', | |
124 | walkopts + subrepoopts + dryrunopts, |
|
124 | walkopts + subrepoopts + dryrunopts, | |
125 | _('[OPTION]... [FILE]...'), |
|
125 | _('[OPTION]... [FILE]...'), | |
126 | inferrepo=True) |
|
126 | inferrepo=True) | |
127 | def add(ui, repo, *pats, **opts): |
|
127 | def add(ui, repo, *pats, **opts): | |
128 | """add the specified files on the next commit |
|
128 | """add the specified files on the next commit | |
129 |
|
129 | |||
130 | Schedule files to be version controlled and added to the |
|
130 | Schedule files to be version controlled and added to the | |
131 | repository. |
|
131 | repository. | |
132 |
|
132 | |||
133 | The files will be added to the repository at the next commit. To |
|
133 | The files will be added to the repository at the next commit. To | |
134 | undo an add before that, see :hg:`forget`. |
|
134 | undo an add before that, see :hg:`forget`. | |
135 |
|
135 | |||
136 | If no names are given, add all files to the repository (except |
|
136 | If no names are given, add all files to the repository (except | |
137 | files matching ``.hgignore``). |
|
137 | files matching ``.hgignore``). | |
138 |
|
138 | |||
139 | .. container:: verbose |
|
139 | .. container:: verbose | |
140 |
|
140 | |||
141 | Examples: |
|
141 | Examples: | |
142 |
|
142 | |||
143 | - New (unknown) files are added |
|
143 | - New (unknown) files are added | |
144 | automatically by :hg:`add`:: |
|
144 | automatically by :hg:`add`:: | |
145 |
|
145 | |||
146 | $ ls |
|
146 | $ ls | |
147 | foo.c |
|
147 | foo.c | |
148 | $ hg status |
|
148 | $ hg status | |
149 | ? foo.c |
|
149 | ? foo.c | |
150 | $ hg add |
|
150 | $ hg add | |
151 | adding foo.c |
|
151 | adding foo.c | |
152 | $ hg status |
|
152 | $ hg status | |
153 | A foo.c |
|
153 | A foo.c | |
154 |
|
154 | |||
155 | - Specific files to be added can be specified:: |
|
155 | - Specific files to be added can be specified:: | |
156 |
|
156 | |||
157 | $ ls |
|
157 | $ ls | |
158 | bar.c foo.c |
|
158 | bar.c foo.c | |
159 | $ hg status |
|
159 | $ hg status | |
160 | ? bar.c |
|
160 | ? bar.c | |
161 | ? foo.c |
|
161 | ? foo.c | |
162 | $ hg add bar.c |
|
162 | $ hg add bar.c | |
163 | $ hg status |
|
163 | $ hg status | |
164 | A bar.c |
|
164 | A bar.c | |
165 | ? foo.c |
|
165 | ? foo.c | |
166 |
|
166 | |||
167 | Returns 0 if all files are successfully added. |
|
167 | Returns 0 if all files are successfully added. | |
168 | """ |
|
168 | """ | |
169 |
|
169 | |||
170 | m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts)) |
|
170 | m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts)) | |
171 | rejected = cmdutil.add(ui, repo, m, "", False, **opts) |
|
171 | rejected = cmdutil.add(ui, repo, m, "", False, **opts) | |
172 | return rejected and 1 or 0 |
|
172 | return rejected and 1 or 0 | |
173 |
|
173 | |||
174 | @command('addremove', |
|
174 | @command('addremove', | |
175 | similarityopts + subrepoopts + walkopts + dryrunopts, |
|
175 | similarityopts + subrepoopts + walkopts + dryrunopts, | |
176 | _('[OPTION]... [FILE]...'), |
|
176 | _('[OPTION]... [FILE]...'), | |
177 | inferrepo=True) |
|
177 | inferrepo=True) | |
178 | def addremove(ui, repo, *pats, **opts): |
|
178 | def addremove(ui, repo, *pats, **opts): | |
179 | """add all new files, delete all missing files |
|
179 | """add all new files, delete all missing files | |
180 |
|
180 | |||
181 | Add all new files and remove all missing files from the |
|
181 | Add all new files and remove all missing files from the | |
182 | repository. |
|
182 | repository. | |
183 |
|
183 | |||
184 | Unless names are given, new files are ignored if they match any of |
|
184 | Unless names are given, new files are ignored if they match any of | |
185 | the patterns in ``.hgignore``. As with add, these changes take |
|
185 | the patterns in ``.hgignore``. As with add, these changes take | |
186 | effect at the next commit. |
|
186 | effect at the next commit. | |
187 |
|
187 | |||
188 | Use the -s/--similarity option to detect renamed files. This |
|
188 | Use the -s/--similarity option to detect renamed files. This | |
189 | option takes a percentage between 0 (disabled) and 100 (files must |
|
189 | option takes a percentage between 0 (disabled) and 100 (files must | |
190 | be identical) as its parameter. With a parameter greater than 0, |
|
190 | be identical) as its parameter. With a parameter greater than 0, | |
191 | this compares every removed file with every added file and records |
|
191 | this compares every removed file with every added file and records | |
192 | those similar enough as renames. Detecting renamed files this way |
|
192 | those similar enough as renames. Detecting renamed files this way | |
193 | can be expensive. After using this option, :hg:`status -C` can be |
|
193 | can be expensive. After using this option, :hg:`status -C` can be | |
194 | used to check which files were identified as moved or renamed. If |
|
194 | used to check which files were identified as moved or renamed. If | |
195 | not specified, -s/--similarity defaults to 100 and only renames of |
|
195 | not specified, -s/--similarity defaults to 100 and only renames of | |
196 | identical files are detected. |
|
196 | identical files are detected. | |
197 |
|
197 | |||
198 | .. container:: verbose |
|
198 | .. container:: verbose | |
199 |
|
199 | |||
200 | Examples: |
|
200 | Examples: | |
201 |
|
201 | |||
202 | - A number of files (bar.c and foo.c) are new, |
|
202 | - A number of files (bar.c and foo.c) are new, | |
203 | while foobar.c has been removed (without using :hg:`remove`) |
|
203 | while foobar.c has been removed (without using :hg:`remove`) | |
204 | from the repository:: |
|
204 | from the repository:: | |
205 |
|
205 | |||
206 | $ ls |
|
206 | $ ls | |
207 | bar.c foo.c |
|
207 | bar.c foo.c | |
208 | $ hg status |
|
208 | $ hg status | |
209 | ! foobar.c |
|
209 | ! foobar.c | |
210 | ? bar.c |
|
210 | ? bar.c | |
211 | ? foo.c |
|
211 | ? foo.c | |
212 | $ hg addremove |
|
212 | $ hg addremove | |
213 | adding bar.c |
|
213 | adding bar.c | |
214 | adding foo.c |
|
214 | adding foo.c | |
215 | removing foobar.c |
|
215 | removing foobar.c | |
216 | $ hg status |
|
216 | $ hg status | |
217 | A bar.c |
|
217 | A bar.c | |
218 | A foo.c |
|
218 | A foo.c | |
219 | R foobar.c |
|
219 | R foobar.c | |
220 |
|
220 | |||
221 | - A file foobar.c was moved to foo.c without using :hg:`rename`. |
|
221 | - A file foobar.c was moved to foo.c without using :hg:`rename`. | |
222 | Afterwards, it was edited slightly:: |
|
222 | Afterwards, it was edited slightly:: | |
223 |
|
223 | |||
224 | $ ls |
|
224 | $ ls | |
225 | foo.c |
|
225 | foo.c | |
226 | $ hg status |
|
226 | $ hg status | |
227 | ! foobar.c |
|
227 | ! foobar.c | |
228 | ? foo.c |
|
228 | ? foo.c | |
229 | $ hg addremove --similarity 90 |
|
229 | $ hg addremove --similarity 90 | |
230 | removing foobar.c |
|
230 | removing foobar.c | |
231 | adding foo.c |
|
231 | adding foo.c | |
232 | recording removal of foobar.c as rename to foo.c (94% similar) |
|
232 | recording removal of foobar.c as rename to foo.c (94% similar) | |
233 | $ hg status -C |
|
233 | $ hg status -C | |
234 | A foo.c |
|
234 | A foo.c | |
235 | foobar.c |
|
235 | foobar.c | |
236 | R foobar.c |
|
236 | R foobar.c | |
237 |
|
237 | |||
238 | Returns 0 if all files are successfully added. |
|
238 | Returns 0 if all files are successfully added. | |
239 | """ |
|
239 | """ | |
240 | opts = pycompat.byteskwargs(opts) |
|
240 | opts = pycompat.byteskwargs(opts) | |
241 | try: |
|
241 | try: | |
242 | sim = float(opts.get('similarity') or 100) |
|
242 | sim = float(opts.get('similarity') or 100) | |
243 | except ValueError: |
|
243 | except ValueError: | |
244 | raise error.Abort(_('similarity must be a number')) |
|
244 | raise error.Abort(_('similarity must be a number')) | |
245 | if sim < 0 or sim > 100: |
|
245 | if sim < 0 or sim > 100: | |
246 | raise error.Abort(_('similarity must be between 0 and 100')) |
|
246 | raise error.Abort(_('similarity must be between 0 and 100')) | |
247 | matcher = scmutil.match(repo[None], pats, opts) |
|
247 | matcher = scmutil.match(repo[None], pats, opts) | |
248 | return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0) |
|
248 | return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0) | |
249 |
|
249 | |||
250 | @command('^annotate|blame', |
|
250 | @command('^annotate|blame', | |
251 | [('r', 'rev', '', _('annotate the specified revision'), _('REV')), |
|
251 | [('r', 'rev', '', _('annotate the specified revision'), _('REV')), | |
252 | ('', 'follow', None, |
|
252 | ('', 'follow', None, | |
253 | _('follow copies/renames and list the filename (DEPRECATED)')), |
|
253 | _('follow copies/renames and list the filename (DEPRECATED)')), | |
254 | ('', 'no-follow', None, _("don't follow copies and renames")), |
|
254 | ('', 'no-follow', None, _("don't follow copies and renames")), | |
255 | ('a', 'text', None, _('treat all files as text')), |
|
255 | ('a', 'text', None, _('treat all files as text')), | |
256 | ('u', 'user', None, _('list the author (long with -v)')), |
|
256 | ('u', 'user', None, _('list the author (long with -v)')), | |
257 | ('f', 'file', None, _('list the filename')), |
|
257 | ('f', 'file', None, _('list the filename')), | |
258 | ('d', 'date', None, _('list the date (short with -q)')), |
|
258 | ('d', 'date', None, _('list the date (short with -q)')), | |
259 | ('n', 'number', None, _('list the revision number (default)')), |
|
259 | ('n', 'number', None, _('list the revision number (default)')), | |
260 | ('c', 'changeset', None, _('list the changeset')), |
|
260 | ('c', 'changeset', None, _('list the changeset')), | |
261 | ('l', 'line-number', None, _('show line number at the first appearance')), |
|
261 | ('l', 'line-number', None, _('show line number at the first appearance')), | |
262 | ('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')), |
|
262 | ('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')), | |
263 | ] + diffwsopts + walkopts + formatteropts, |
|
263 | ] + diffwsopts + walkopts + formatteropts, | |
264 | _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'), |
|
264 | _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'), | |
265 | inferrepo=True) |
|
265 | inferrepo=True) | |
266 | def annotate(ui, repo, *pats, **opts): |
|
266 | def annotate(ui, repo, *pats, **opts): | |
267 | """show changeset information by line for each file |
|
267 | """show changeset information by line for each file | |
268 |
|
268 | |||
269 | List changes in files, showing the revision id responsible for |
|
269 | List changes in files, showing the revision id responsible for | |
270 | each line. |
|
270 | each line. | |
271 |
|
271 | |||
272 | This command is useful for discovering when a change was made and |
|
272 | This command is useful for discovering when a change was made and | |
273 | by whom. |
|
273 | by whom. | |
274 |
|
274 | |||
275 | If you include --file, --user, or --date, the revision number is |
|
275 | If you include --file, --user, or --date, the revision number is | |
276 | suppressed unless you also include --number. |
|
276 | suppressed unless you also include --number. | |
277 |
|
277 | |||
278 | Without the -a/--text option, annotate will avoid processing files |
|
278 | Without the -a/--text option, annotate will avoid processing files | |
279 | it detects as binary. With -a, annotate will annotate the file |
|
279 | it detects as binary. With -a, annotate will annotate the file | |
280 | anyway, although the results will probably be neither useful |
|
280 | anyway, although the results will probably be neither useful | |
281 | nor desirable. |
|
281 | nor desirable. | |
282 |
|
282 | |||
283 | Returns 0 on success. |
|
283 | Returns 0 on success. | |
284 | """ |
|
284 | """ | |
285 | opts = pycompat.byteskwargs(opts) |
|
285 | opts = pycompat.byteskwargs(opts) | |
286 | if not pats: |
|
286 | if not pats: | |
287 | raise error.Abort(_('at least one filename or pattern is required')) |
|
287 | raise error.Abort(_('at least one filename or pattern is required')) | |
288 |
|
288 | |||
289 | if opts.get('follow'): |
|
289 | if opts.get('follow'): | |
290 | # --follow is deprecated and now just an alias for -f/--file |
|
290 | # --follow is deprecated and now just an alias for -f/--file | |
291 | # to mimic the behavior of Mercurial before version 1.5 |
|
291 | # to mimic the behavior of Mercurial before version 1.5 | |
292 | opts['file'] = True |
|
292 | opts['file'] = True | |
293 |
|
293 | |||
294 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
294 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
295 |
|
295 | |||
296 | rootfm = ui.formatter('annotate', opts) |
|
296 | rootfm = ui.formatter('annotate', opts) | |
297 | if ui.quiet: |
|
297 | if ui.quiet: | |
298 | datefunc = util.shortdate |
|
298 | datefunc = util.shortdate | |
299 | else: |
|
299 | else: | |
300 | datefunc = util.datestr |
|
300 | datefunc = util.datestr | |
301 | if ctx.rev() is None: |
|
301 | if ctx.rev() is None: | |
302 | def hexfn(node): |
|
302 | def hexfn(node): | |
303 | if node is None: |
|
303 | if node is None: | |
304 | return None |
|
304 | return None | |
305 | else: |
|
305 | else: | |
306 | return rootfm.hexfunc(node) |
|
306 | return rootfm.hexfunc(node) | |
307 | if opts.get('changeset'): |
|
307 | if opts.get('changeset'): | |
308 | # omit "+" suffix which is appended to node hex |
|
308 | # omit "+" suffix which is appended to node hex | |
309 | def formatrev(rev): |
|
309 | def formatrev(rev): | |
310 | if rev is None: |
|
310 | if rev is None: | |
311 | return '%d' % ctx.p1().rev() |
|
311 | return '%d' % ctx.p1().rev() | |
312 | else: |
|
312 | else: | |
313 | return '%d' % rev |
|
313 | return '%d' % rev | |
314 | else: |
|
314 | else: | |
315 | def formatrev(rev): |
|
315 | def formatrev(rev): | |
316 | if rev is None: |
|
316 | if rev is None: | |
317 | return '%d+' % ctx.p1().rev() |
|
317 | return '%d+' % ctx.p1().rev() | |
318 | else: |
|
318 | else: | |
319 | return '%d ' % rev |
|
319 | return '%d ' % rev | |
320 | def formathex(hex): |
|
320 | def formathex(hex): | |
321 | if hex is None: |
|
321 | if hex is None: | |
322 | return '%s+' % rootfm.hexfunc(ctx.p1().node()) |
|
322 | return '%s+' % rootfm.hexfunc(ctx.p1().node()) | |
323 | else: |
|
323 | else: | |
324 | return '%s ' % hex |
|
324 | return '%s ' % hex | |
325 | else: |
|
325 | else: | |
326 | hexfn = rootfm.hexfunc |
|
326 | hexfn = rootfm.hexfunc | |
327 | formatrev = formathex = pycompat.bytestr |
|
327 | formatrev = formathex = pycompat.bytestr | |
328 |
|
328 | |||
329 | opmap = [('user', ' ', lambda x: x.fctx.user(), ui.shortuser), |
|
329 | opmap = [('user', ' ', lambda x: x.fctx.user(), ui.shortuser), | |
330 | ('number', ' ', lambda x: x.fctx.rev(), formatrev), |
|
330 | ('number', ' ', lambda x: x.fctx.rev(), formatrev), | |
331 | ('changeset', ' ', lambda x: hexfn(x.fctx.node()), formathex), |
|
331 | ('changeset', ' ', lambda x: hexfn(x.fctx.node()), formathex), | |
332 | ('date', ' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)), |
|
332 | ('date', ' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)), | |
333 | ('file', ' ', lambda x: x.fctx.path(), str), |
|
333 | ('file', ' ', lambda x: x.fctx.path(), str), | |
334 | ('line_number', ':', lambda x: x.lineno, str), |
|
334 | ('line_number', ':', lambda x: x.lineno, str), | |
335 | ] |
|
335 | ] | |
336 | fieldnamemap = {'number': 'rev', 'changeset': 'node'} |
|
336 | fieldnamemap = {'number': 'rev', 'changeset': 'node'} | |
337 |
|
337 | |||
338 | if (not opts.get('user') and not opts.get('changeset') |
|
338 | if (not opts.get('user') and not opts.get('changeset') | |
339 | and not opts.get('date') and not opts.get('file')): |
|
339 | and not opts.get('date') and not opts.get('file')): | |
340 | opts['number'] = True |
|
340 | opts['number'] = True | |
341 |
|
341 | |||
342 | linenumber = opts.get('line_number') is not None |
|
342 | linenumber = opts.get('line_number') is not None | |
343 | if linenumber and (not opts.get('changeset')) and (not opts.get('number')): |
|
343 | if linenumber and (not opts.get('changeset')) and (not opts.get('number')): | |
344 | raise error.Abort(_('at least one of -n/-c is required for -l')) |
|
344 | raise error.Abort(_('at least one of -n/-c is required for -l')) | |
345 |
|
345 | |||
346 | ui.pager('annotate') |
|
346 | ui.pager('annotate') | |
347 |
|
347 | |||
348 | if rootfm.isplain(): |
|
348 | if rootfm.isplain(): | |
349 | def makefunc(get, fmt): |
|
349 | def makefunc(get, fmt): | |
350 | return lambda x: fmt(get(x)) |
|
350 | return lambda x: fmt(get(x)) | |
351 | else: |
|
351 | else: | |
352 | def makefunc(get, fmt): |
|
352 | def makefunc(get, fmt): | |
353 | return get |
|
353 | return get | |
354 | funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap |
|
354 | funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap | |
355 | if opts.get(op)] |
|
355 | if opts.get(op)] | |
356 | funcmap[0] = (funcmap[0][0], '') # no separator in front of first column |
|
356 | funcmap[0] = (funcmap[0][0], '') # no separator in front of first column | |
357 | fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap |
|
357 | fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap | |
358 | if opts.get(op)) |
|
358 | if opts.get(op)) | |
359 |
|
359 | |||
360 | def bad(x, y): |
|
360 | def bad(x, y): | |
361 | raise error.Abort("%s: %s" % (x, y)) |
|
361 | raise error.Abort("%s: %s" % (x, y)) | |
362 |
|
362 | |||
363 | m = scmutil.match(ctx, pats, opts, badfn=bad) |
|
363 | m = scmutil.match(ctx, pats, opts, badfn=bad) | |
364 |
|
364 | |||
365 | follow = not opts.get('no_follow') |
|
365 | follow = not opts.get('no_follow') | |
366 | diffopts = patch.difffeatureopts(ui, opts, section='annotate', |
|
366 | diffopts = patch.difffeatureopts(ui, opts, section='annotate', | |
367 | whitespace=True) |
|
367 | whitespace=True) | |
368 | skiprevs = opts.get('skip') |
|
368 | skiprevs = opts.get('skip') | |
369 | if skiprevs: |
|
369 | if skiprevs: | |
370 | skiprevs = scmutil.revrange(repo, skiprevs) |
|
370 | skiprevs = scmutil.revrange(repo, skiprevs) | |
371 |
|
371 | |||
372 | for abs in ctx.walk(m): |
|
372 | for abs in ctx.walk(m): | |
373 | fctx = ctx[abs] |
|
373 | fctx = ctx[abs] | |
374 | rootfm.startitem() |
|
374 | rootfm.startitem() | |
375 | rootfm.data(abspath=abs, path=m.rel(abs)) |
|
375 | rootfm.data(abspath=abs, path=m.rel(abs)) | |
376 | if not opts.get('text') and fctx.isbinary(): |
|
376 | if not opts.get('text') and fctx.isbinary(): | |
377 | rootfm.plain(_("%s: binary file\n") |
|
377 | rootfm.plain(_("%s: binary file\n") | |
378 | % ((pats and m.rel(abs)) or abs)) |
|
378 | % ((pats and m.rel(abs)) or abs)) | |
379 | continue |
|
379 | continue | |
380 |
|
380 | |||
381 | fm = rootfm.nested('lines') |
|
381 | fm = rootfm.nested('lines') | |
382 | lines = fctx.annotate(follow=follow, linenumber=linenumber, |
|
382 | lines = fctx.annotate(follow=follow, linenumber=linenumber, | |
383 | skiprevs=skiprevs, diffopts=diffopts) |
|
383 | skiprevs=skiprevs, diffopts=diffopts) | |
384 | if not lines: |
|
384 | if not lines: | |
385 | fm.end() |
|
385 | fm.end() | |
386 | continue |
|
386 | continue | |
387 | formats = [] |
|
387 | formats = [] | |
388 | pieces = [] |
|
388 | pieces = [] | |
389 |
|
389 | |||
390 | for f, sep in funcmap: |
|
390 | for f, sep in funcmap: | |
391 | l = [f(n) for n, dummy in lines] |
|
391 | l = [f(n) for n, dummy in lines] | |
392 | if fm.isplain(): |
|
392 | if fm.isplain(): | |
393 | sizes = [encoding.colwidth(x) for x in l] |
|
393 | sizes = [encoding.colwidth(x) for x in l] | |
394 | ml = max(sizes) |
|
394 | ml = max(sizes) | |
395 | formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes]) |
|
395 | formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes]) | |
396 | else: |
|
396 | else: | |
397 | formats.append(['%s' for x in l]) |
|
397 | formats.append(['%s' for x in l]) | |
398 | pieces.append(l) |
|
398 | pieces.append(l) | |
399 |
|
399 | |||
400 | for f, p, l in zip(zip(*formats), zip(*pieces), lines): |
|
400 | for f, p, l in zip(zip(*formats), zip(*pieces), lines): | |
401 | fm.startitem() |
|
401 | fm.startitem() | |
402 | fm.write(fields, "".join(f), *p) |
|
402 | fm.write(fields, "".join(f), *p) | |
403 | if l[0].skip: |
|
403 | if l[0].skip: | |
404 | fmt = "* %s" |
|
404 | fmt = "* %s" | |
405 | else: |
|
405 | else: | |
406 | fmt = ": %s" |
|
406 | fmt = ": %s" | |
407 | fm.write('line', fmt, l[1]) |
|
407 | fm.write('line', fmt, l[1]) | |
408 |
|
408 | |||
409 | if not lines[-1][1].endswith('\n'): |
|
409 | if not lines[-1][1].endswith('\n'): | |
410 | fm.plain('\n') |
|
410 | fm.plain('\n') | |
411 | fm.end() |
|
411 | fm.end() | |
412 |
|
412 | |||
413 | rootfm.end() |
|
413 | rootfm.end() | |
414 |
|
414 | |||
415 | @command('archive', |
|
415 | @command('archive', | |
416 | [('', 'no-decode', None, _('do not pass files through decoders')), |
|
416 | [('', 'no-decode', None, _('do not pass files through decoders')), | |
417 | ('p', 'prefix', '', _('directory prefix for files in archive'), |
|
417 | ('p', 'prefix', '', _('directory prefix for files in archive'), | |
418 | _('PREFIX')), |
|
418 | _('PREFIX')), | |
419 | ('r', 'rev', '', _('revision to distribute'), _('REV')), |
|
419 | ('r', 'rev', '', _('revision to distribute'), _('REV')), | |
420 | ('t', 'type', '', _('type of distribution to create'), _('TYPE')), |
|
420 | ('t', 'type', '', _('type of distribution to create'), _('TYPE')), | |
421 | ] + subrepoopts + walkopts, |
|
421 | ] + subrepoopts + walkopts, | |
422 | _('[OPTION]... DEST')) |
|
422 | _('[OPTION]... DEST')) | |
423 | def archive(ui, repo, dest, **opts): |
|
423 | def archive(ui, repo, dest, **opts): | |
424 | '''create an unversioned archive of a repository revision |
|
424 | '''create an unversioned archive of a repository revision | |
425 |
|
425 | |||
426 | By default, the revision used is the parent of the working |
|
426 | By default, the revision used is the parent of the working | |
427 | directory; use -r/--rev to specify a different revision. |
|
427 | directory; use -r/--rev to specify a different revision. | |
428 |
|
428 | |||
429 | The archive type is automatically detected based on file |
|
429 | The archive type is automatically detected based on file | |
430 | extension (to override, use -t/--type). |
|
430 | extension (to override, use -t/--type). | |
431 |
|
431 | |||
432 | .. container:: verbose |
|
432 | .. container:: verbose | |
433 |
|
433 | |||
434 | Examples: |
|
434 | Examples: | |
435 |
|
435 | |||
436 | - create a zip file containing the 1.0 release:: |
|
436 | - create a zip file containing the 1.0 release:: | |
437 |
|
437 | |||
438 | hg archive -r 1.0 project-1.0.zip |
|
438 | hg archive -r 1.0 project-1.0.zip | |
439 |
|
439 | |||
440 | - create a tarball excluding .hg files:: |
|
440 | - create a tarball excluding .hg files:: | |
441 |
|
441 | |||
442 | hg archive project.tar.gz -X ".hg*" |
|
442 | hg archive project.tar.gz -X ".hg*" | |
443 |
|
443 | |||
444 | Valid types are: |
|
444 | Valid types are: | |
445 |
|
445 | |||
446 | :``files``: a directory full of files (default) |
|
446 | :``files``: a directory full of files (default) | |
447 | :``tar``: tar archive, uncompressed |
|
447 | :``tar``: tar archive, uncompressed | |
448 | :``tbz2``: tar archive, compressed using bzip2 |
|
448 | :``tbz2``: tar archive, compressed using bzip2 | |
449 | :``tgz``: tar archive, compressed using gzip |
|
449 | :``tgz``: tar archive, compressed using gzip | |
450 | :``uzip``: zip archive, uncompressed |
|
450 | :``uzip``: zip archive, uncompressed | |
451 | :``zip``: zip archive, compressed using deflate |
|
451 | :``zip``: zip archive, compressed using deflate | |
452 |
|
452 | |||
453 | The exact name of the destination archive or directory is given |
|
453 | The exact name of the destination archive or directory is given | |
454 | using a format string; see :hg:`help export` for details. |
|
454 | using a format string; see :hg:`help export` for details. | |
455 |
|
455 | |||
456 | Each member added to an archive file has a directory prefix |
|
456 | Each member added to an archive file has a directory prefix | |
457 | prepended. Use -p/--prefix to specify a format string for the |
|
457 | prepended. Use -p/--prefix to specify a format string for the | |
458 | prefix. The default is the basename of the archive, with suffixes |
|
458 | prefix. The default is the basename of the archive, with suffixes | |
459 | removed. |
|
459 | removed. | |
460 |
|
460 | |||
461 | Returns 0 on success. |
|
461 | Returns 0 on success. | |
462 | ''' |
|
462 | ''' | |
463 |
|
463 | |||
464 | opts = pycompat.byteskwargs(opts) |
|
464 | opts = pycompat.byteskwargs(opts) | |
465 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
465 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
466 | if not ctx: |
|
466 | if not ctx: | |
467 | raise error.Abort(_('no working directory: please specify a revision')) |
|
467 | raise error.Abort(_('no working directory: please specify a revision')) | |
468 | node = ctx.node() |
|
468 | node = ctx.node() | |
469 | dest = cmdutil.makefilename(repo, dest, node) |
|
469 | dest = cmdutil.makefilename(repo, dest, node) | |
470 | if os.path.realpath(dest) == repo.root: |
|
470 | if os.path.realpath(dest) == repo.root: | |
471 | raise error.Abort(_('repository root cannot be destination')) |
|
471 | raise error.Abort(_('repository root cannot be destination')) | |
472 |
|
472 | |||
473 | kind = opts.get('type') or archival.guesskind(dest) or 'files' |
|
473 | kind = opts.get('type') or archival.guesskind(dest) or 'files' | |
474 | prefix = opts.get('prefix') |
|
474 | prefix = opts.get('prefix') | |
475 |
|
475 | |||
476 | if dest == '-': |
|
476 | if dest == '-': | |
477 | if kind == 'files': |
|
477 | if kind == 'files': | |
478 | raise error.Abort(_('cannot archive plain files to stdout')) |
|
478 | raise error.Abort(_('cannot archive plain files to stdout')) | |
479 | dest = cmdutil.makefileobj(repo, dest) |
|
479 | dest = cmdutil.makefileobj(repo, dest) | |
480 | if not prefix: |
|
480 | if not prefix: | |
481 | prefix = os.path.basename(repo.root) + '-%h' |
|
481 | prefix = os.path.basename(repo.root) + '-%h' | |
482 |
|
482 | |||
483 | prefix = cmdutil.makefilename(repo, prefix, node) |
|
483 | prefix = cmdutil.makefilename(repo, prefix, node) | |
484 | match = scmutil.match(ctx, [], opts) |
|
484 | match = scmutil.match(ctx, [], opts) | |
485 | archival.archive(repo, dest, node, kind, not opts.get('no_decode'), |
|
485 | archival.archive(repo, dest, node, kind, not opts.get('no_decode'), | |
486 | match, prefix, subrepos=opts.get('subrepos')) |
|
486 | match, prefix, subrepos=opts.get('subrepos')) | |
487 |
|
487 | |||
488 | @command('backout', |
|
488 | @command('backout', | |
489 | [('', 'merge', None, _('merge with old dirstate parent after backout')), |
|
489 | [('', 'merge', None, _('merge with old dirstate parent after backout')), | |
490 | ('', 'commit', None, |
|
490 | ('', 'commit', None, | |
491 | _('commit if no conflicts were encountered (DEPRECATED)')), |
|
491 | _('commit if no conflicts were encountered (DEPRECATED)')), | |
492 | ('', 'no-commit', None, _('do not commit')), |
|
492 | ('', 'no-commit', None, _('do not commit')), | |
493 | ('', 'parent', '', |
|
493 | ('', 'parent', '', | |
494 | _('parent to choose when backing out merge (DEPRECATED)'), _('REV')), |
|
494 | _('parent to choose when backing out merge (DEPRECATED)'), _('REV')), | |
495 | ('r', 'rev', '', _('revision to backout'), _('REV')), |
|
495 | ('r', 'rev', '', _('revision to backout'), _('REV')), | |
496 | ('e', 'edit', False, _('invoke editor on commit messages')), |
|
496 | ('e', 'edit', False, _('invoke editor on commit messages')), | |
497 | ] + mergetoolopts + walkopts + commitopts + commitopts2, |
|
497 | ] + mergetoolopts + walkopts + commitopts + commitopts2, | |
498 | _('[OPTION]... [-r] REV')) |
|
498 | _('[OPTION]... [-r] REV')) | |
499 | def backout(ui, repo, node=None, rev=None, **opts): |
|
499 | def backout(ui, repo, node=None, rev=None, **opts): | |
500 | '''reverse effect of earlier changeset |
|
500 | '''reverse effect of earlier changeset | |
501 |
|
501 | |||
502 | Prepare a new changeset with the effect of REV undone in the |
|
502 | Prepare a new changeset with the effect of REV undone in the | |
503 | current working directory. If no conflicts were encountered, |
|
503 | current working directory. If no conflicts were encountered, | |
504 | it will be committed immediately. |
|
504 | it will be committed immediately. | |
505 |
|
505 | |||
506 | If REV is the parent of the working directory, then this new changeset |
|
506 | If REV is the parent of the working directory, then this new changeset | |
507 | is committed automatically (unless --no-commit is specified). |
|
507 | is committed automatically (unless --no-commit is specified). | |
508 |
|
508 | |||
509 | .. note:: |
|
509 | .. note:: | |
510 |
|
510 | |||
511 | :hg:`backout` cannot be used to fix either an unwanted or |
|
511 | :hg:`backout` cannot be used to fix either an unwanted or | |
512 | incorrect merge. |
|
512 | incorrect merge. | |
513 |
|
513 | |||
514 | .. container:: verbose |
|
514 | .. container:: verbose | |
515 |
|
515 | |||
516 | Examples: |
|
516 | Examples: | |
517 |
|
517 | |||
518 | - Reverse the effect of the parent of the working directory. |
|
518 | - Reverse the effect of the parent of the working directory. | |
519 | This backout will be committed immediately:: |
|
519 | This backout will be committed immediately:: | |
520 |
|
520 | |||
521 | hg backout -r . |
|
521 | hg backout -r . | |
522 |
|
522 | |||
523 | - Reverse the effect of previous bad revision 23:: |
|
523 | - Reverse the effect of previous bad revision 23:: | |
524 |
|
524 | |||
525 | hg backout -r 23 |
|
525 | hg backout -r 23 | |
526 |
|
526 | |||
527 | - Reverse the effect of previous bad revision 23 and |
|
527 | - Reverse the effect of previous bad revision 23 and | |
528 | leave changes uncommitted:: |
|
528 | leave changes uncommitted:: | |
529 |
|
529 | |||
530 | hg backout -r 23 --no-commit |
|
530 | hg backout -r 23 --no-commit | |
531 | hg commit -m "Backout revision 23" |
|
531 | hg commit -m "Backout revision 23" | |
532 |
|
532 | |||
533 | By default, the pending changeset will have one parent, |
|
533 | By default, the pending changeset will have one parent, | |
534 | maintaining a linear history. With --merge, the pending |
|
534 | maintaining a linear history. With --merge, the pending | |
535 | changeset will instead have two parents: the old parent of the |
|
535 | changeset will instead have two parents: the old parent of the | |
536 | working directory and a new child of REV that simply undoes REV. |
|
536 | working directory and a new child of REV that simply undoes REV. | |
537 |
|
537 | |||
538 | Before version 1.7, the behavior without --merge was equivalent |
|
538 | Before version 1.7, the behavior without --merge was equivalent | |
539 | to specifying --merge followed by :hg:`update --clean .` to |
|
539 | to specifying --merge followed by :hg:`update --clean .` to | |
540 | cancel the merge and leave the child of REV as a head to be |
|
540 | cancel the merge and leave the child of REV as a head to be | |
541 | merged separately. |
|
541 | merged separately. | |
542 |
|
542 | |||
543 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
543 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
544 |
|
544 | |||
545 | See :hg:`help revert` for a way to restore files to the state |
|
545 | See :hg:`help revert` for a way to restore files to the state | |
546 | of another revision. |
|
546 | of another revision. | |
547 |
|
547 | |||
548 | Returns 0 on success, 1 if nothing to backout or there are unresolved |
|
548 | Returns 0 on success, 1 if nothing to backout or there are unresolved | |
549 | files. |
|
549 | files. | |
550 | ''' |
|
550 | ''' | |
551 | wlock = lock = None |
|
551 | wlock = lock = None | |
552 | try: |
|
552 | try: | |
553 | wlock = repo.wlock() |
|
553 | wlock = repo.wlock() | |
554 | lock = repo.lock() |
|
554 | lock = repo.lock() | |
555 | return _dobackout(ui, repo, node, rev, **opts) |
|
555 | return _dobackout(ui, repo, node, rev, **opts) | |
556 | finally: |
|
556 | finally: | |
557 | release(lock, wlock) |
|
557 | release(lock, wlock) | |
558 |
|
558 | |||
559 | def _dobackout(ui, repo, node=None, rev=None, **opts): |
|
559 | def _dobackout(ui, repo, node=None, rev=None, **opts): | |
560 | opts = pycompat.byteskwargs(opts) |
|
560 | opts = pycompat.byteskwargs(opts) | |
561 | if opts.get('commit') and opts.get('no_commit'): |
|
561 | if opts.get('commit') and opts.get('no_commit'): | |
562 | raise error.Abort(_("cannot use --commit with --no-commit")) |
|
562 | raise error.Abort(_("cannot use --commit with --no-commit")) | |
563 | if opts.get('merge') and opts.get('no_commit'): |
|
563 | if opts.get('merge') and opts.get('no_commit'): | |
564 | raise error.Abort(_("cannot use --merge with --no-commit")) |
|
564 | raise error.Abort(_("cannot use --merge with --no-commit")) | |
565 |
|
565 | |||
566 | if rev and node: |
|
566 | if rev and node: | |
567 | raise error.Abort(_("please specify just one revision")) |
|
567 | raise error.Abort(_("please specify just one revision")) | |
568 |
|
568 | |||
569 | if not rev: |
|
569 | if not rev: | |
570 | rev = node |
|
570 | rev = node | |
571 |
|
571 | |||
572 | if not rev: |
|
572 | if not rev: | |
573 | raise error.Abort(_("please specify a revision to backout")) |
|
573 | raise error.Abort(_("please specify a revision to backout")) | |
574 |
|
574 | |||
575 | date = opts.get('date') |
|
575 | date = opts.get('date') | |
576 | if date: |
|
576 | if date: | |
577 | opts['date'] = util.parsedate(date) |
|
577 | opts['date'] = util.parsedate(date) | |
578 |
|
578 | |||
579 | cmdutil.checkunfinished(repo) |
|
579 | cmdutil.checkunfinished(repo) | |
580 | cmdutil.bailifchanged(repo) |
|
580 | cmdutil.bailifchanged(repo) | |
581 | node = scmutil.revsingle(repo, rev).node() |
|
581 | node = scmutil.revsingle(repo, rev).node() | |
582 |
|
582 | |||
583 | op1, op2 = repo.dirstate.parents() |
|
583 | op1, op2 = repo.dirstate.parents() | |
584 | if not repo.changelog.isancestor(node, op1): |
|
584 | if not repo.changelog.isancestor(node, op1): | |
585 | raise error.Abort(_('cannot backout change that is not an ancestor')) |
|
585 | raise error.Abort(_('cannot backout change that is not an ancestor')) | |
586 |
|
586 | |||
587 | p1, p2 = repo.changelog.parents(node) |
|
587 | p1, p2 = repo.changelog.parents(node) | |
588 | if p1 == nullid: |
|
588 | if p1 == nullid: | |
589 | raise error.Abort(_('cannot backout a change with no parents')) |
|
589 | raise error.Abort(_('cannot backout a change with no parents')) | |
590 | if p2 != nullid: |
|
590 | if p2 != nullid: | |
591 | if not opts.get('parent'): |
|
591 | if not opts.get('parent'): | |
592 | raise error.Abort(_('cannot backout a merge changeset')) |
|
592 | raise error.Abort(_('cannot backout a merge changeset')) | |
593 | p = repo.lookup(opts['parent']) |
|
593 | p = repo.lookup(opts['parent']) | |
594 | if p not in (p1, p2): |
|
594 | if p not in (p1, p2): | |
595 | raise error.Abort(_('%s is not a parent of %s') % |
|
595 | raise error.Abort(_('%s is not a parent of %s') % | |
596 | (short(p), short(node))) |
|
596 | (short(p), short(node))) | |
597 | parent = p |
|
597 | parent = p | |
598 | else: |
|
598 | else: | |
599 | if opts.get('parent'): |
|
599 | if opts.get('parent'): | |
600 | raise error.Abort(_('cannot use --parent on non-merge changeset')) |
|
600 | raise error.Abort(_('cannot use --parent on non-merge changeset')) | |
601 | parent = p1 |
|
601 | parent = p1 | |
602 |
|
602 | |||
603 | # the backout should appear on the same branch |
|
603 | # the backout should appear on the same branch | |
604 | branch = repo.dirstate.branch() |
|
604 | branch = repo.dirstate.branch() | |
605 | bheads = repo.branchheads(branch) |
|
605 | bheads = repo.branchheads(branch) | |
606 | rctx = scmutil.revsingle(repo, hex(parent)) |
|
606 | rctx = scmutil.revsingle(repo, hex(parent)) | |
607 | if not opts.get('merge') and op1 != node: |
|
607 | if not opts.get('merge') and op1 != node: | |
608 | dsguard = dirstateguard.dirstateguard(repo, 'backout') |
|
608 | dsguard = dirstateguard.dirstateguard(repo, 'backout') | |
609 | try: |
|
609 | try: | |
610 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
610 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | |
611 | 'backout') |
|
611 | 'backout') | |
612 | stats = mergemod.update(repo, parent, True, True, node, False) |
|
612 | stats = mergemod.update(repo, parent, True, True, node, False) | |
613 | repo.setparents(op1, op2) |
|
613 | repo.setparents(op1, op2) | |
614 | dsguard.close() |
|
614 | dsguard.close() | |
615 | hg._showstats(repo, stats) |
|
615 | hg._showstats(repo, stats) | |
616 | if stats[3]: |
|
616 | if stats[3]: | |
617 | repo.ui.status(_("use 'hg resolve' to retry unresolved " |
|
617 | repo.ui.status(_("use 'hg resolve' to retry unresolved " | |
618 | "file merges\n")) |
|
618 | "file merges\n")) | |
619 | return 1 |
|
619 | return 1 | |
620 | finally: |
|
620 | finally: | |
621 | ui.setconfig('ui', 'forcemerge', '', '') |
|
621 | ui.setconfig('ui', 'forcemerge', '', '') | |
622 | lockmod.release(dsguard) |
|
622 | lockmod.release(dsguard) | |
623 | else: |
|
623 | else: | |
624 | hg.clean(repo, node, show_stats=False) |
|
624 | hg.clean(repo, node, show_stats=False) | |
625 | repo.dirstate.setbranch(branch) |
|
625 | repo.dirstate.setbranch(branch) | |
626 | cmdutil.revert(ui, repo, rctx, repo.dirstate.parents()) |
|
626 | cmdutil.revert(ui, repo, rctx, repo.dirstate.parents()) | |
627 |
|
627 | |||
628 | if opts.get('no_commit'): |
|
628 | if opts.get('no_commit'): | |
629 | msg = _("changeset %s backed out, " |
|
629 | msg = _("changeset %s backed out, " | |
630 | "don't forget to commit.\n") |
|
630 | "don't forget to commit.\n") | |
631 | ui.status(msg % short(node)) |
|
631 | ui.status(msg % short(node)) | |
632 | return 0 |
|
632 | return 0 | |
633 |
|
633 | |||
634 | def commitfunc(ui, repo, message, match, opts): |
|
634 | def commitfunc(ui, repo, message, match, opts): | |
635 | editform = 'backout' |
|
635 | editform = 'backout' | |
636 | e = cmdutil.getcommiteditor(editform=editform, |
|
636 | e = cmdutil.getcommiteditor(editform=editform, | |
637 | **pycompat.strkwargs(opts)) |
|
637 | **pycompat.strkwargs(opts)) | |
638 | if not message: |
|
638 | if not message: | |
639 | # we don't translate commit messages |
|
639 | # we don't translate commit messages | |
640 | message = "Backed out changeset %s" % short(node) |
|
640 | message = "Backed out changeset %s" % short(node) | |
641 | e = cmdutil.getcommiteditor(edit=True, editform=editform) |
|
641 | e = cmdutil.getcommiteditor(edit=True, editform=editform) | |
642 | return repo.commit(message, opts.get('user'), opts.get('date'), |
|
642 | return repo.commit(message, opts.get('user'), opts.get('date'), | |
643 | match, editor=e) |
|
643 | match, editor=e) | |
644 | newnode = cmdutil.commit(ui, repo, commitfunc, [], opts) |
|
644 | newnode = cmdutil.commit(ui, repo, commitfunc, [], opts) | |
645 | if not newnode: |
|
645 | if not newnode: | |
646 | ui.status(_("nothing changed\n")) |
|
646 | ui.status(_("nothing changed\n")) | |
647 | return 1 |
|
647 | return 1 | |
648 | cmdutil.commitstatus(repo, newnode, branch, bheads) |
|
648 | cmdutil.commitstatus(repo, newnode, branch, bheads) | |
649 |
|
649 | |||
650 | def nice(node): |
|
650 | def nice(node): | |
651 | return '%d:%s' % (repo.changelog.rev(node), short(node)) |
|
651 | return '%d:%s' % (repo.changelog.rev(node), short(node)) | |
652 | ui.status(_('changeset %s backs out changeset %s\n') % |
|
652 | ui.status(_('changeset %s backs out changeset %s\n') % | |
653 | (nice(repo.changelog.tip()), nice(node))) |
|
653 | (nice(repo.changelog.tip()), nice(node))) | |
654 | if opts.get('merge') and op1 != node: |
|
654 | if opts.get('merge') and op1 != node: | |
655 | hg.clean(repo, op1, show_stats=False) |
|
655 | hg.clean(repo, op1, show_stats=False) | |
656 | ui.status(_('merging with changeset %s\n') |
|
656 | ui.status(_('merging with changeset %s\n') | |
657 | % nice(repo.changelog.tip())) |
|
657 | % nice(repo.changelog.tip())) | |
658 | try: |
|
658 | try: | |
659 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
659 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | |
660 | 'backout') |
|
660 | 'backout') | |
661 | return hg.merge(repo, hex(repo.changelog.tip())) |
|
661 | return hg.merge(repo, hex(repo.changelog.tip())) | |
662 | finally: |
|
662 | finally: | |
663 | ui.setconfig('ui', 'forcemerge', '', '') |
|
663 | ui.setconfig('ui', 'forcemerge', '', '') | |
664 | return 0 |
|
664 | return 0 | |
665 |
|
665 | |||
666 | @command('bisect', |
|
666 | @command('bisect', | |
667 | [('r', 'reset', False, _('reset bisect state')), |
|
667 | [('r', 'reset', False, _('reset bisect state')), | |
668 | ('g', 'good', False, _('mark changeset good')), |
|
668 | ('g', 'good', False, _('mark changeset good')), | |
669 | ('b', 'bad', False, _('mark changeset bad')), |
|
669 | ('b', 'bad', False, _('mark changeset bad')), | |
670 | ('s', 'skip', False, _('skip testing changeset')), |
|
670 | ('s', 'skip', False, _('skip testing changeset')), | |
671 | ('e', 'extend', False, _('extend the bisect range')), |
|
671 | ('e', 'extend', False, _('extend the bisect range')), | |
672 | ('c', 'command', '', _('use command to check changeset state'), _('CMD')), |
|
672 | ('c', 'command', '', _('use command to check changeset state'), _('CMD')), | |
673 | ('U', 'noupdate', False, _('do not update to target'))], |
|
673 | ('U', 'noupdate', False, _('do not update to target'))], | |
674 | _("[-gbsr] [-U] [-c CMD] [REV]")) |
|
674 | _("[-gbsr] [-U] [-c CMD] [REV]")) | |
675 | def bisect(ui, repo, rev=None, extra=None, command=None, |
|
675 | def bisect(ui, repo, rev=None, extra=None, command=None, | |
676 | reset=None, good=None, bad=None, skip=None, extend=None, |
|
676 | reset=None, good=None, bad=None, skip=None, extend=None, | |
677 | noupdate=None): |
|
677 | noupdate=None): | |
678 | """subdivision search of changesets |
|
678 | """subdivision search of changesets | |
679 |
|
679 | |||
680 | This command helps to find changesets which introduce problems. To |
|
680 | This command helps to find changesets which introduce problems. To | |
681 | use, mark the earliest changeset you know exhibits the problem as |
|
681 | use, mark the earliest changeset you know exhibits the problem as | |
682 | bad, then mark the latest changeset which is free from the problem |
|
682 | bad, then mark the latest changeset which is free from the problem | |
683 | as good. Bisect will update your working directory to a revision |
|
683 | as good. Bisect will update your working directory to a revision | |
684 | for testing (unless the -U/--noupdate option is specified). Once |
|
684 | for testing (unless the -U/--noupdate option is specified). Once | |
685 | you have performed tests, mark the working directory as good or |
|
685 | you have performed tests, mark the working directory as good or | |
686 | bad, and bisect will either update to another candidate changeset |
|
686 | bad, and bisect will either update to another candidate changeset | |
687 | or announce that it has found the bad revision. |
|
687 | or announce that it has found the bad revision. | |
688 |
|
688 | |||
689 | As a shortcut, you can also use the revision argument to mark a |
|
689 | As a shortcut, you can also use the revision argument to mark a | |
690 | revision as good or bad without checking it out first. |
|
690 | revision as good or bad without checking it out first. | |
691 |
|
691 | |||
692 | If you supply a command, it will be used for automatic bisection. |
|
692 | If you supply a command, it will be used for automatic bisection. | |
693 | The environment variable HG_NODE will contain the ID of the |
|
693 | The environment variable HG_NODE will contain the ID of the | |
694 | changeset being tested. The exit status of the command will be |
|
694 | changeset being tested. The exit status of the command will be | |
695 | used to mark revisions as good or bad: status 0 means good, 125 |
|
695 | used to mark revisions as good or bad: status 0 means good, 125 | |
696 | means to skip the revision, 127 (command not found) will abort the |
|
696 | means to skip the revision, 127 (command not found) will abort the | |
697 | bisection, and any other non-zero exit status means the revision |
|
697 | bisection, and any other non-zero exit status means the revision | |
698 | is bad. |
|
698 | is bad. | |
699 |
|
699 | |||
700 | .. container:: verbose |
|
700 | .. container:: verbose | |
701 |
|
701 | |||
702 | Some examples: |
|
702 | Some examples: | |
703 |
|
703 | |||
704 | - start a bisection with known bad revision 34, and good revision 12:: |
|
704 | - start a bisection with known bad revision 34, and good revision 12:: | |
705 |
|
705 | |||
706 | hg bisect --bad 34 |
|
706 | hg bisect --bad 34 | |
707 | hg bisect --good 12 |
|
707 | hg bisect --good 12 | |
708 |
|
708 | |||
709 | - advance the current bisection by marking current revision as good or |
|
709 | - advance the current bisection by marking current revision as good or | |
710 | bad:: |
|
710 | bad:: | |
711 |
|
711 | |||
712 | hg bisect --good |
|
712 | hg bisect --good | |
713 | hg bisect --bad |
|
713 | hg bisect --bad | |
714 |
|
714 | |||
715 | - mark the current revision, or a known revision, to be skipped (e.g. if |
|
715 | - mark the current revision, or a known revision, to be skipped (e.g. if | |
716 | that revision is not usable because of another issue):: |
|
716 | that revision is not usable because of another issue):: | |
717 |
|
717 | |||
718 | hg bisect --skip |
|
718 | hg bisect --skip | |
719 | hg bisect --skip 23 |
|
719 | hg bisect --skip 23 | |
720 |
|
720 | |||
721 | - skip all revisions that do not touch directories ``foo`` or ``bar``:: |
|
721 | - skip all revisions that do not touch directories ``foo`` or ``bar``:: | |
722 |
|
722 | |||
723 | hg bisect --skip "!( file('path:foo') & file('path:bar') )" |
|
723 | hg bisect --skip "!( file('path:foo') & file('path:bar') )" | |
724 |
|
724 | |||
725 | - forget the current bisection:: |
|
725 | - forget the current bisection:: | |
726 |
|
726 | |||
727 | hg bisect --reset |
|
727 | hg bisect --reset | |
728 |
|
728 | |||
729 | - use 'make && make tests' to automatically find the first broken |
|
729 | - use 'make && make tests' to automatically find the first broken | |
730 | revision:: |
|
730 | revision:: | |
731 |
|
731 | |||
732 | hg bisect --reset |
|
732 | hg bisect --reset | |
733 | hg bisect --bad 34 |
|
733 | hg bisect --bad 34 | |
734 | hg bisect --good 12 |
|
734 | hg bisect --good 12 | |
735 | hg bisect --command "make && make tests" |
|
735 | hg bisect --command "make && make tests" | |
736 |
|
736 | |||
737 | - see all changesets whose states are already known in the current |
|
737 | - see all changesets whose states are already known in the current | |
738 | bisection:: |
|
738 | bisection:: | |
739 |
|
739 | |||
740 | hg log -r "bisect(pruned)" |
|
740 | hg log -r "bisect(pruned)" | |
741 |
|
741 | |||
742 | - see the changeset currently being bisected (especially useful |
|
742 | - see the changeset currently being bisected (especially useful | |
743 | if running with -U/--noupdate):: |
|
743 | if running with -U/--noupdate):: | |
744 |
|
744 | |||
745 | hg log -r "bisect(current)" |
|
745 | hg log -r "bisect(current)" | |
746 |
|
746 | |||
747 | - see all changesets that took part in the current bisection:: |
|
747 | - see all changesets that took part in the current bisection:: | |
748 |
|
748 | |||
749 | hg log -r "bisect(range)" |
|
749 | hg log -r "bisect(range)" | |
750 |
|
750 | |||
751 | - you can even get a nice graph:: |
|
751 | - you can even get a nice graph:: | |
752 |
|
752 | |||
753 | hg log --graph -r "bisect(range)" |
|
753 | hg log --graph -r "bisect(range)" | |
754 |
|
754 | |||
755 | See :hg:`help revisions.bisect` for more about the `bisect()` predicate. |
|
755 | See :hg:`help revisions.bisect` for more about the `bisect()` predicate. | |
756 |
|
756 | |||
757 | Returns 0 on success. |
|
757 | Returns 0 on success. | |
758 | """ |
|
758 | """ | |
759 | # backward compatibility |
|
759 | # backward compatibility | |
760 | if rev in "good bad reset init".split(): |
|
760 | if rev in "good bad reset init".split(): | |
761 | ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n")) |
|
761 | ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n")) | |
762 | cmd, rev, extra = rev, extra, None |
|
762 | cmd, rev, extra = rev, extra, None | |
763 | if cmd == "good": |
|
763 | if cmd == "good": | |
764 | good = True |
|
764 | good = True | |
765 | elif cmd == "bad": |
|
765 | elif cmd == "bad": | |
766 | bad = True |
|
766 | bad = True | |
767 | else: |
|
767 | else: | |
768 | reset = True |
|
768 | reset = True | |
769 | elif extra: |
|
769 | elif extra: | |
770 | raise error.Abort(_('incompatible arguments')) |
|
770 | raise error.Abort(_('incompatible arguments')) | |
771 |
|
771 | |||
772 | incompatibles = { |
|
772 | incompatibles = { | |
773 | '--bad': bad, |
|
773 | '--bad': bad, | |
774 | '--command': bool(command), |
|
774 | '--command': bool(command), | |
775 | '--extend': extend, |
|
775 | '--extend': extend, | |
776 | '--good': good, |
|
776 | '--good': good, | |
777 | '--reset': reset, |
|
777 | '--reset': reset, | |
778 | '--skip': skip, |
|
778 | '--skip': skip, | |
779 | } |
|
779 | } | |
780 |
|
780 | |||
781 | enabled = [x for x in incompatibles if incompatibles[x]] |
|
781 | enabled = [x for x in incompatibles if incompatibles[x]] | |
782 |
|
782 | |||
783 | if len(enabled) > 1: |
|
783 | if len(enabled) > 1: | |
784 | raise error.Abort(_('%s and %s are incompatible') % |
|
784 | raise error.Abort(_('%s and %s are incompatible') % | |
785 | tuple(sorted(enabled)[0:2])) |
|
785 | tuple(sorted(enabled)[0:2])) | |
786 |
|
786 | |||
787 | if reset: |
|
787 | if reset: | |
788 | hbisect.resetstate(repo) |
|
788 | hbisect.resetstate(repo) | |
789 | return |
|
789 | return | |
790 |
|
790 | |||
791 | state = hbisect.load_state(repo) |
|
791 | state = hbisect.load_state(repo) | |
792 |
|
792 | |||
793 | # update state |
|
793 | # update state | |
794 | if good or bad or skip: |
|
794 | if good or bad or skip: | |
795 | if rev: |
|
795 | if rev: | |
796 | nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])] |
|
796 | nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])] | |
797 | else: |
|
797 | else: | |
798 | nodes = [repo.lookup('.')] |
|
798 | nodes = [repo.lookup('.')] | |
799 | if good: |
|
799 | if good: | |
800 | state['good'] += nodes |
|
800 | state['good'] += nodes | |
801 | elif bad: |
|
801 | elif bad: | |
802 | state['bad'] += nodes |
|
802 | state['bad'] += nodes | |
803 | elif skip: |
|
803 | elif skip: | |
804 | state['skip'] += nodes |
|
804 | state['skip'] += nodes | |
805 | hbisect.save_state(repo, state) |
|
805 | hbisect.save_state(repo, state) | |
806 | if not (state['good'] and state['bad']): |
|
806 | if not (state['good'] and state['bad']): | |
807 | return |
|
807 | return | |
808 |
|
808 | |||
809 | def mayupdate(repo, node, show_stats=True): |
|
809 | def mayupdate(repo, node, show_stats=True): | |
810 | """common used update sequence""" |
|
810 | """common used update sequence""" | |
811 | if noupdate: |
|
811 | if noupdate: | |
812 | return |
|
812 | return | |
813 | cmdutil.checkunfinished(repo) |
|
813 | cmdutil.checkunfinished(repo) | |
814 | cmdutil.bailifchanged(repo) |
|
814 | cmdutil.bailifchanged(repo) | |
815 | return hg.clean(repo, node, show_stats=show_stats) |
|
815 | return hg.clean(repo, node, show_stats=show_stats) | |
816 |
|
816 | |||
817 | displayer = cmdutil.show_changeset(ui, repo, {}) |
|
817 | displayer = cmdutil.show_changeset(ui, repo, {}) | |
818 |
|
818 | |||
819 | if command: |
|
819 | if command: | |
820 | changesets = 1 |
|
820 | changesets = 1 | |
821 | if noupdate: |
|
821 | if noupdate: | |
822 | try: |
|
822 | try: | |
823 | node = state['current'][0] |
|
823 | node = state['current'][0] | |
824 | except LookupError: |
|
824 | except LookupError: | |
825 | raise error.Abort(_('current bisect revision is unknown - ' |
|
825 | raise error.Abort(_('current bisect revision is unknown - ' | |
826 | 'start a new bisect to fix')) |
|
826 | 'start a new bisect to fix')) | |
827 | else: |
|
827 | else: | |
828 | node, p2 = repo.dirstate.parents() |
|
828 | node, p2 = repo.dirstate.parents() | |
829 | if p2 != nullid: |
|
829 | if p2 != nullid: | |
830 | raise error.Abort(_('current bisect revision is a merge')) |
|
830 | raise error.Abort(_('current bisect revision is a merge')) | |
831 | if rev: |
|
831 | if rev: | |
832 | node = repo[scmutil.revsingle(repo, rev, node)].node() |
|
832 | node = repo[scmutil.revsingle(repo, rev, node)].node() | |
833 | try: |
|
833 | try: | |
834 | while changesets: |
|
834 | while changesets: | |
835 | # update state |
|
835 | # update state | |
836 | state['current'] = [node] |
|
836 | state['current'] = [node] | |
837 | hbisect.save_state(repo, state) |
|
837 | hbisect.save_state(repo, state) | |
838 | status = ui.system(command, environ={'HG_NODE': hex(node)}, |
|
838 | status = ui.system(command, environ={'HG_NODE': hex(node)}, | |
839 | blockedtag='bisect_check') |
|
839 | blockedtag='bisect_check') | |
840 | if status == 125: |
|
840 | if status == 125: | |
841 | transition = "skip" |
|
841 | transition = "skip" | |
842 | elif status == 0: |
|
842 | elif status == 0: | |
843 | transition = "good" |
|
843 | transition = "good" | |
844 | # status < 0 means process was killed |
|
844 | # status < 0 means process was killed | |
845 | elif status == 127: |
|
845 | elif status == 127: | |
846 | raise error.Abort(_("failed to execute %s") % command) |
|
846 | raise error.Abort(_("failed to execute %s") % command) | |
847 | elif status < 0: |
|
847 | elif status < 0: | |
848 | raise error.Abort(_("%s killed") % command) |
|
848 | raise error.Abort(_("%s killed") % command) | |
849 | else: |
|
849 | else: | |
850 | transition = "bad" |
|
850 | transition = "bad" | |
851 | state[transition].append(node) |
|
851 | state[transition].append(node) | |
852 | ctx = repo[node] |
|
852 | ctx = repo[node] | |
853 | ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition)) |
|
853 | ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition)) | |
854 | hbisect.checkstate(state) |
|
854 | hbisect.checkstate(state) | |
855 | # bisect |
|
855 | # bisect | |
856 | nodes, changesets, bgood = hbisect.bisect(repo.changelog, state) |
|
856 | nodes, changesets, bgood = hbisect.bisect(repo.changelog, state) | |
857 | # update to next check |
|
857 | # update to next check | |
858 | node = nodes[0] |
|
858 | node = nodes[0] | |
859 | mayupdate(repo, node, show_stats=False) |
|
859 | mayupdate(repo, node, show_stats=False) | |
860 | finally: |
|
860 | finally: | |
861 | state['current'] = [node] |
|
861 | state['current'] = [node] | |
862 | hbisect.save_state(repo, state) |
|
862 | hbisect.save_state(repo, state) | |
863 | hbisect.printresult(ui, repo, state, displayer, nodes, bgood) |
|
863 | hbisect.printresult(ui, repo, state, displayer, nodes, bgood) | |
864 | return |
|
864 | return | |
865 |
|
865 | |||
866 | hbisect.checkstate(state) |
|
866 | hbisect.checkstate(state) | |
867 |
|
867 | |||
868 | # actually bisect |
|
868 | # actually bisect | |
869 | nodes, changesets, good = hbisect.bisect(repo.changelog, state) |
|
869 | nodes, changesets, good = hbisect.bisect(repo.changelog, state) | |
870 | if extend: |
|
870 | if extend: | |
871 | if not changesets: |
|
871 | if not changesets: | |
872 | extendnode = hbisect.extendrange(repo, state, nodes, good) |
|
872 | extendnode = hbisect.extendrange(repo, state, nodes, good) | |
873 | if extendnode is not None: |
|
873 | if extendnode is not None: | |
874 | ui.write(_("Extending search to changeset %d:%s\n") |
|
874 | ui.write(_("Extending search to changeset %d:%s\n") | |
875 | % (extendnode.rev(), extendnode)) |
|
875 | % (extendnode.rev(), extendnode)) | |
876 | state['current'] = [extendnode.node()] |
|
876 | state['current'] = [extendnode.node()] | |
877 | hbisect.save_state(repo, state) |
|
877 | hbisect.save_state(repo, state) | |
878 | return mayupdate(repo, extendnode.node()) |
|
878 | return mayupdate(repo, extendnode.node()) | |
879 | raise error.Abort(_("nothing to extend")) |
|
879 | raise error.Abort(_("nothing to extend")) | |
880 |
|
880 | |||
881 | if changesets == 0: |
|
881 | if changesets == 0: | |
882 | hbisect.printresult(ui, repo, state, displayer, nodes, good) |
|
882 | hbisect.printresult(ui, repo, state, displayer, nodes, good) | |
883 | else: |
|
883 | else: | |
884 | assert len(nodes) == 1 # only a single node can be tested next |
|
884 | assert len(nodes) == 1 # only a single node can be tested next | |
885 | node = nodes[0] |
|
885 | node = nodes[0] | |
886 | # compute the approximate number of remaining tests |
|
886 | # compute the approximate number of remaining tests | |
887 | tests, size = 0, 2 |
|
887 | tests, size = 0, 2 | |
888 | while size <= changesets: |
|
888 | while size <= changesets: | |
889 | tests, size = tests + 1, size * 2 |
|
889 | tests, size = tests + 1, size * 2 | |
890 | rev = repo.changelog.rev(node) |
|
890 | rev = repo.changelog.rev(node) | |
891 | ui.write(_("Testing changeset %d:%s " |
|
891 | ui.write(_("Testing changeset %d:%s " | |
892 | "(%d changesets remaining, ~%d tests)\n") |
|
892 | "(%d changesets remaining, ~%d tests)\n") | |
893 | % (rev, short(node), changesets, tests)) |
|
893 | % (rev, short(node), changesets, tests)) | |
894 | state['current'] = [node] |
|
894 | state['current'] = [node] | |
895 | hbisect.save_state(repo, state) |
|
895 | hbisect.save_state(repo, state) | |
896 | return mayupdate(repo, node) |
|
896 | return mayupdate(repo, node) | |
897 |
|
897 | |||
898 | @command('bookmarks|bookmark', |
|
898 | @command('bookmarks|bookmark', | |
899 | [('f', 'force', False, _('force')), |
|
899 | [('f', 'force', False, _('force')), | |
900 | ('r', 'rev', '', _('revision for bookmark action'), _('REV')), |
|
900 | ('r', 'rev', '', _('revision for bookmark action'), _('REV')), | |
901 | ('d', 'delete', False, _('delete a given bookmark')), |
|
901 | ('d', 'delete', False, _('delete a given bookmark')), | |
902 | ('m', 'rename', '', _('rename a given bookmark'), _('OLD')), |
|
902 | ('m', 'rename', '', _('rename a given bookmark'), _('OLD')), | |
903 | ('i', 'inactive', False, _('mark a bookmark inactive')), |
|
903 | ('i', 'inactive', False, _('mark a bookmark inactive')), | |
904 | ] + formatteropts, |
|
904 | ] + formatteropts, | |
905 | _('hg bookmarks [OPTIONS]... [NAME]...')) |
|
905 | _('hg bookmarks [OPTIONS]... [NAME]...')) | |
906 | def bookmark(ui, repo, *names, **opts): |
|
906 | def bookmark(ui, repo, *names, **opts): | |
907 | '''create a new bookmark or list existing bookmarks |
|
907 | '''create a new bookmark or list existing bookmarks | |
908 |
|
908 | |||
909 | Bookmarks are labels on changesets to help track lines of development. |
|
909 | Bookmarks are labels on changesets to help track lines of development. | |
910 | Bookmarks are unversioned and can be moved, renamed and deleted. |
|
910 | Bookmarks are unversioned and can be moved, renamed and deleted. | |
911 | Deleting or moving a bookmark has no effect on the associated changesets. |
|
911 | Deleting or moving a bookmark has no effect on the associated changesets. | |
912 |
|
912 | |||
913 | Creating or updating to a bookmark causes it to be marked as 'active'. |
|
913 | Creating or updating to a bookmark causes it to be marked as 'active'. | |
914 | The active bookmark is indicated with a '*'. |
|
914 | The active bookmark is indicated with a '*'. | |
915 | When a commit is made, the active bookmark will advance to the new commit. |
|
915 | When a commit is made, the active bookmark will advance to the new commit. | |
916 | A plain :hg:`update` will also advance an active bookmark, if possible. |
|
916 | A plain :hg:`update` will also advance an active bookmark, if possible. | |
917 | Updating away from a bookmark will cause it to be deactivated. |
|
917 | Updating away from a bookmark will cause it to be deactivated. | |
918 |
|
918 | |||
919 | Bookmarks can be pushed and pulled between repositories (see |
|
919 | Bookmarks can be pushed and pulled between repositories (see | |
920 | :hg:`help push` and :hg:`help pull`). If a shared bookmark has |
|
920 | :hg:`help push` and :hg:`help pull`). If a shared bookmark has | |
921 | diverged, a new 'divergent bookmark' of the form 'name@path' will |
|
921 | diverged, a new 'divergent bookmark' of the form 'name@path' will | |
922 | be created. Using :hg:`merge` will resolve the divergence. |
|
922 | be created. Using :hg:`merge` will resolve the divergence. | |
923 |
|
923 | |||
924 | Specifying bookmark as '.' to -m or -d options is equivalent to specifying |
|
924 | Specifying bookmark as '.' to -m or -d options is equivalent to specifying | |
925 | the active bookmark's name. |
|
925 | the active bookmark's name. | |
926 |
|
926 | |||
927 | A bookmark named '@' has the special property that :hg:`clone` will |
|
927 | A bookmark named '@' has the special property that :hg:`clone` will | |
928 | check it out by default if it exists. |
|
928 | check it out by default if it exists. | |
929 |
|
929 | |||
930 | .. container:: verbose |
|
930 | .. container:: verbose | |
931 |
|
931 | |||
932 | Examples: |
|
932 | Examples: | |
933 |
|
933 | |||
934 | - create an active bookmark for a new line of development:: |
|
934 | - create an active bookmark for a new line of development:: | |
935 |
|
935 | |||
936 | hg book new-feature |
|
936 | hg book new-feature | |
937 |
|
937 | |||
938 | - create an inactive bookmark as a place marker:: |
|
938 | - create an inactive bookmark as a place marker:: | |
939 |
|
939 | |||
940 | hg book -i reviewed |
|
940 | hg book -i reviewed | |
941 |
|
941 | |||
942 | - create an inactive bookmark on another changeset:: |
|
942 | - create an inactive bookmark on another changeset:: | |
943 |
|
943 | |||
944 | hg book -r .^ tested |
|
944 | hg book -r .^ tested | |
945 |
|
945 | |||
946 | - rename bookmark turkey to dinner:: |
|
946 | - rename bookmark turkey to dinner:: | |
947 |
|
947 | |||
948 | hg book -m turkey dinner |
|
948 | hg book -m turkey dinner | |
949 |
|
949 | |||
950 | - move the '@' bookmark from another branch:: |
|
950 | - move the '@' bookmark from another branch:: | |
951 |
|
951 | |||
952 | hg book -f @ |
|
952 | hg book -f @ | |
953 | ''' |
|
953 | ''' | |
954 | force = opts.get(r'force') |
|
954 | force = opts.get(r'force') | |
955 | rev = opts.get(r'rev') |
|
955 | rev = opts.get(r'rev') | |
956 | delete = opts.get(r'delete') |
|
956 | delete = opts.get(r'delete') | |
957 | rename = opts.get(r'rename') |
|
957 | rename = opts.get(r'rename') | |
958 | inactive = opts.get(r'inactive') |
|
958 | inactive = opts.get(r'inactive') | |
959 |
|
959 | |||
960 | if delete and rename: |
|
960 | if delete and rename: | |
961 | raise error.Abort(_("--delete and --rename are incompatible")) |
|
961 | raise error.Abort(_("--delete and --rename are incompatible")) | |
962 | if delete and rev: |
|
962 | if delete and rev: | |
963 | raise error.Abort(_("--rev is incompatible with --delete")) |
|
963 | raise error.Abort(_("--rev is incompatible with --delete")) | |
964 | if rename and rev: |
|
964 | if rename and rev: | |
965 | raise error.Abort(_("--rev is incompatible with --rename")) |
|
965 | raise error.Abort(_("--rev is incompatible with --rename")) | |
966 | if not names and (delete or rev): |
|
966 | if not names and (delete or rev): | |
967 | raise error.Abort(_("bookmark name required")) |
|
967 | raise error.Abort(_("bookmark name required")) | |
968 |
|
968 | |||
969 | if delete or rename or names or inactive: |
|
969 | if delete or rename or names or inactive: | |
970 | with repo.wlock(), repo.lock(), repo.transaction('bookmark') as tr: |
|
970 | with repo.wlock(), repo.lock(), repo.transaction('bookmark') as tr: | |
971 | if delete: |
|
971 | if delete: | |
972 | names = pycompat.maplist(repo._bookmarks.expandname, names) |
|
972 | names = pycompat.maplist(repo._bookmarks.expandname, names) | |
973 | bookmarks.delete(repo, tr, names) |
|
973 | bookmarks.delete(repo, tr, names) | |
974 | elif rename: |
|
974 | elif rename: | |
975 | if not names: |
|
975 | if not names: | |
976 | raise error.Abort(_("new bookmark name required")) |
|
976 | raise error.Abort(_("new bookmark name required")) | |
977 | elif len(names) > 1: |
|
977 | elif len(names) > 1: | |
978 | raise error.Abort(_("only one new bookmark name allowed")) |
|
978 | raise error.Abort(_("only one new bookmark name allowed")) | |
979 | rename = repo._bookmarks.expandname(rename) |
|
979 | rename = repo._bookmarks.expandname(rename) | |
980 | bookmarks.rename(repo, tr, rename, names[0], force, inactive) |
|
980 | bookmarks.rename(repo, tr, rename, names[0], force, inactive) | |
981 | elif names: |
|
981 | elif names: | |
982 | bookmarks.addbookmarks(repo, tr, names, rev, force, inactive) |
|
982 | bookmarks.addbookmarks(repo, tr, names, rev, force, inactive) | |
983 | elif inactive: |
|
983 | elif inactive: | |
984 | if len(repo._bookmarks) == 0: |
|
984 | if len(repo._bookmarks) == 0: | |
985 | ui.status(_("no bookmarks set\n")) |
|
985 | ui.status(_("no bookmarks set\n")) | |
986 | elif not repo._activebookmark: |
|
986 | elif not repo._activebookmark: | |
987 | ui.status(_("no active bookmark\n")) |
|
987 | ui.status(_("no active bookmark\n")) | |
988 | else: |
|
988 | else: | |
989 | bookmarks.deactivate(repo) |
|
989 | bookmarks.deactivate(repo) | |
990 | else: # show bookmarks |
|
990 | else: # show bookmarks | |
991 | bookmarks.printbookmarks(ui, repo, **opts) |
|
991 | bookmarks.printbookmarks(ui, repo, **opts) | |
992 |
|
992 | |||
993 | @command('branch', |
|
993 | @command('branch', | |
994 | [('f', 'force', None, |
|
994 | [('f', 'force', None, | |
995 | _('set branch name even if it shadows an existing branch')), |
|
995 | _('set branch name even if it shadows an existing branch')), | |
996 | ('C', 'clean', None, _('reset branch name to parent branch name'))], |
|
996 | ('C', 'clean', None, _('reset branch name to parent branch name'))], | |
997 | _('[-fC] [NAME]')) |
|
997 | _('[-fC] [NAME]')) | |
998 | def branch(ui, repo, label=None, **opts): |
|
998 | def branch(ui, repo, label=None, **opts): | |
999 | """set or show the current branch name |
|
999 | """set or show the current branch name | |
1000 |
|
1000 | |||
1001 | .. note:: |
|
1001 | .. note:: | |
1002 |
|
1002 | |||
1003 | Branch names are permanent and global. Use :hg:`bookmark` to create a |
|
1003 | Branch names are permanent and global. Use :hg:`bookmark` to create a | |
1004 | light-weight bookmark instead. See :hg:`help glossary` for more |
|
1004 | light-weight bookmark instead. See :hg:`help glossary` for more | |
1005 | information about named branches and bookmarks. |
|
1005 | information about named branches and bookmarks. | |
1006 |
|
1006 | |||
1007 | With no argument, show the current branch name. With one argument, |
|
1007 | With no argument, show the current branch name. With one argument, | |
1008 | set the working directory branch name (the branch will not exist |
|
1008 | set the working directory branch name (the branch will not exist | |
1009 | in the repository until the next commit). Standard practice |
|
1009 | in the repository until the next commit). Standard practice | |
1010 | recommends that primary development take place on the 'default' |
|
1010 | recommends that primary development take place on the 'default' | |
1011 | branch. |
|
1011 | branch. | |
1012 |
|
1012 | |||
1013 | Unless -f/--force is specified, branch will not let you set a |
|
1013 | Unless -f/--force is specified, branch will not let you set a | |
1014 | branch name that already exists. |
|
1014 | branch name that already exists. | |
1015 |
|
1015 | |||
1016 | Use -C/--clean to reset the working directory branch to that of |
|
1016 | Use -C/--clean to reset the working directory branch to that of | |
1017 | the parent of the working directory, negating a previous branch |
|
1017 | the parent of the working directory, negating a previous branch | |
1018 | change. |
|
1018 | change. | |
1019 |
|
1019 | |||
1020 | Use the command :hg:`update` to switch to an existing branch. Use |
|
1020 | Use the command :hg:`update` to switch to an existing branch. Use | |
1021 | :hg:`commit --close-branch` to mark this branch head as closed. |
|
1021 | :hg:`commit --close-branch` to mark this branch head as closed. | |
1022 | When all heads of a branch are closed, the branch will be |
|
1022 | When all heads of a branch are closed, the branch will be | |
1023 | considered closed. |
|
1023 | considered closed. | |
1024 |
|
1024 | |||
1025 | Returns 0 on success. |
|
1025 | Returns 0 on success. | |
1026 | """ |
|
1026 | """ | |
1027 | opts = pycompat.byteskwargs(opts) |
|
1027 | opts = pycompat.byteskwargs(opts) | |
1028 | if label: |
|
1028 | if label: | |
1029 | label = label.strip() |
|
1029 | label = label.strip() | |
1030 |
|
1030 | |||
1031 | if not opts.get('clean') and not label: |
|
1031 | if not opts.get('clean') and not label: | |
1032 | ui.write("%s\n" % repo.dirstate.branch()) |
|
1032 | ui.write("%s\n" % repo.dirstate.branch()) | |
1033 | return |
|
1033 | return | |
1034 |
|
1034 | |||
1035 | with repo.wlock(): |
|
1035 | with repo.wlock(): | |
1036 | if opts.get('clean'): |
|
1036 | if opts.get('clean'): | |
1037 | label = repo[None].p1().branch() |
|
1037 | label = repo[None].p1().branch() | |
1038 | repo.dirstate.setbranch(label) |
|
1038 | repo.dirstate.setbranch(label) | |
1039 | ui.status(_('reset working directory to branch %s\n') % label) |
|
1039 | ui.status(_('reset working directory to branch %s\n') % label) | |
1040 | elif label: |
|
1040 | elif label: | |
1041 | if not opts.get('force') and label in repo.branchmap(): |
|
1041 | if not opts.get('force') and label in repo.branchmap(): | |
1042 | if label not in [p.branch() for p in repo[None].parents()]: |
|
1042 | if label not in [p.branch() for p in repo[None].parents()]: | |
1043 | raise error.Abort(_('a branch of the same name already' |
|
1043 | raise error.Abort(_('a branch of the same name already' | |
1044 | ' exists'), |
|
1044 | ' exists'), | |
1045 | # i18n: "it" refers to an existing branch |
|
1045 | # i18n: "it" refers to an existing branch | |
1046 | hint=_("use 'hg update' to switch to it")) |
|
1046 | hint=_("use 'hg update' to switch to it")) | |
1047 | scmutil.checknewlabel(repo, label, 'branch') |
|
1047 | scmutil.checknewlabel(repo, label, 'branch') | |
1048 | repo.dirstate.setbranch(label) |
|
1048 | repo.dirstate.setbranch(label) | |
1049 | ui.status(_('marked working directory as branch %s\n') % label) |
|
1049 | ui.status(_('marked working directory as branch %s\n') % label) | |
1050 |
|
1050 | |||
1051 | # find any open named branches aside from default |
|
1051 | # find any open named branches aside from default | |
1052 | others = [n for n, h, t, c in repo.branchmap().iterbranches() |
|
1052 | others = [n for n, h, t, c in repo.branchmap().iterbranches() | |
1053 | if n != "default" and not c] |
|
1053 | if n != "default" and not c] | |
1054 | if not others: |
|
1054 | if not others: | |
1055 | ui.status(_('(branches are permanent and global, ' |
|
1055 | ui.status(_('(branches are permanent and global, ' | |
1056 | 'did you want a bookmark?)\n')) |
|
1056 | 'did you want a bookmark?)\n')) | |
1057 |
|
1057 | |||
1058 | @command('branches', |
|
1058 | @command('branches', | |
1059 | [('a', 'active', False, |
|
1059 | [('a', 'active', False, | |
1060 | _('show only branches that have unmerged heads (DEPRECATED)')), |
|
1060 | _('show only branches that have unmerged heads (DEPRECATED)')), | |
1061 | ('c', 'closed', False, _('show normal and closed branches')), |
|
1061 | ('c', 'closed', False, _('show normal and closed branches')), | |
1062 | ] + formatteropts, |
|
1062 | ] + formatteropts, | |
1063 | _('[-c]')) |
|
1063 | _('[-c]')) | |
1064 | def branches(ui, repo, active=False, closed=False, **opts): |
|
1064 | def branches(ui, repo, active=False, closed=False, **opts): | |
1065 | """list repository named branches |
|
1065 | """list repository named branches | |
1066 |
|
1066 | |||
1067 | List the repository's named branches, indicating which ones are |
|
1067 | List the repository's named branches, indicating which ones are | |
1068 | inactive. If -c/--closed is specified, also list branches which have |
|
1068 | inactive. If -c/--closed is specified, also list branches which have | |
1069 | been marked closed (see :hg:`commit --close-branch`). |
|
1069 | been marked closed (see :hg:`commit --close-branch`). | |
1070 |
|
1070 | |||
1071 | Use the command :hg:`update` to switch to an existing branch. |
|
1071 | Use the command :hg:`update` to switch to an existing branch. | |
1072 |
|
1072 | |||
1073 | Returns 0. |
|
1073 | Returns 0. | |
1074 | """ |
|
1074 | """ | |
1075 |
|
1075 | |||
1076 | opts = pycompat.byteskwargs(opts) |
|
1076 | opts = pycompat.byteskwargs(opts) | |
1077 | ui.pager('branches') |
|
1077 | ui.pager('branches') | |
1078 | fm = ui.formatter('branches', opts) |
|
1078 | fm = ui.formatter('branches', opts) | |
1079 | hexfunc = fm.hexfunc |
|
1079 | hexfunc = fm.hexfunc | |
1080 |
|
1080 | |||
1081 | allheads = set(repo.heads()) |
|
1081 | allheads = set(repo.heads()) | |
1082 | branches = [] |
|
1082 | branches = [] | |
1083 | for tag, heads, tip, isclosed in repo.branchmap().iterbranches(): |
|
1083 | for tag, heads, tip, isclosed in repo.branchmap().iterbranches(): | |
1084 | isactive = False |
|
1084 | isactive = False | |
1085 | if not isclosed: |
|
1085 | if not isclosed: | |
1086 | openheads = set(repo.branchmap().iteropen(heads)) |
|
1086 | openheads = set(repo.branchmap().iteropen(heads)) | |
1087 | isactive = bool(openheads & allheads) |
|
1087 | isactive = bool(openheads & allheads) | |
1088 | branches.append((tag, repo[tip], isactive, not isclosed)) |
|
1088 | branches.append((tag, repo[tip], isactive, not isclosed)) | |
1089 | branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), |
|
1089 | branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), | |
1090 | reverse=True) |
|
1090 | reverse=True) | |
1091 |
|
1091 | |||
1092 | for tag, ctx, isactive, isopen in branches: |
|
1092 | for tag, ctx, isactive, isopen in branches: | |
1093 | if active and not isactive: |
|
1093 | if active and not isactive: | |
1094 | continue |
|
1094 | continue | |
1095 | if isactive: |
|
1095 | if isactive: | |
1096 | label = 'branches.active' |
|
1096 | label = 'branches.active' | |
1097 | notice = '' |
|
1097 | notice = '' | |
1098 | elif not isopen: |
|
1098 | elif not isopen: | |
1099 | if not closed: |
|
1099 | if not closed: | |
1100 | continue |
|
1100 | continue | |
1101 | label = 'branches.closed' |
|
1101 | label = 'branches.closed' | |
1102 | notice = _(' (closed)') |
|
1102 | notice = _(' (closed)') | |
1103 | else: |
|
1103 | else: | |
1104 | label = 'branches.inactive' |
|
1104 | label = 'branches.inactive' | |
1105 | notice = _(' (inactive)') |
|
1105 | notice = _(' (inactive)') | |
1106 | current = (tag == repo.dirstate.branch()) |
|
1106 | current = (tag == repo.dirstate.branch()) | |
1107 | if current: |
|
1107 | if current: | |
1108 | label = 'branches.current' |
|
1108 | label = 'branches.current' | |
1109 |
|
1109 | |||
1110 | fm.startitem() |
|
1110 | fm.startitem() | |
1111 | fm.write('branch', '%s', tag, label=label) |
|
1111 | fm.write('branch', '%s', tag, label=label) | |
1112 | rev = ctx.rev() |
|
1112 | rev = ctx.rev() | |
1113 | padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0) |
|
1113 | padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0) | |
1114 | fmt = ' ' * padsize + ' %d:%s' |
|
1114 | fmt = ' ' * padsize + ' %d:%s' | |
1115 | fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()), |
|
1115 | fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()), | |
1116 | label='log.changeset changeset.%s' % ctx.phasestr()) |
|
1116 | label='log.changeset changeset.%s' % ctx.phasestr()) | |
1117 | fm.context(ctx=ctx) |
|
1117 | fm.context(ctx=ctx) | |
1118 | fm.data(active=isactive, closed=not isopen, current=current) |
|
1118 | fm.data(active=isactive, closed=not isopen, current=current) | |
1119 | if not ui.quiet: |
|
1119 | if not ui.quiet: | |
1120 | fm.plain(notice) |
|
1120 | fm.plain(notice) | |
1121 | fm.plain('\n') |
|
1121 | fm.plain('\n') | |
1122 | fm.end() |
|
1122 | fm.end() | |
1123 |
|
1123 | |||
1124 | @command('bundle', |
|
1124 | @command('bundle', | |
1125 | [('f', 'force', None, _('run even when the destination is unrelated')), |
|
1125 | [('f', 'force', None, _('run even when the destination is unrelated')), | |
1126 | ('r', 'rev', [], _('a changeset intended to be added to the destination'), |
|
1126 | ('r', 'rev', [], _('a changeset intended to be added to the destination'), | |
1127 | _('REV')), |
|
1127 | _('REV')), | |
1128 | ('b', 'branch', [], _('a specific branch you would like to bundle'), |
|
1128 | ('b', 'branch', [], _('a specific branch you would like to bundle'), | |
1129 | _('BRANCH')), |
|
1129 | _('BRANCH')), | |
1130 | ('', 'base', [], |
|
1130 | ('', 'base', [], | |
1131 | _('a base changeset assumed to be available at the destination'), |
|
1131 | _('a base changeset assumed to be available at the destination'), | |
1132 | _('REV')), |
|
1132 | _('REV')), | |
1133 | ('a', 'all', None, _('bundle all changesets in the repository')), |
|
1133 | ('a', 'all', None, _('bundle all changesets in the repository')), | |
1134 | ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')), |
|
1134 | ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')), | |
1135 | ] + remoteopts, |
|
1135 | ] + remoteopts, | |
1136 | _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]')) |
|
1136 | _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]')) | |
1137 | def bundle(ui, repo, fname, dest=None, **opts): |
|
1137 | def bundle(ui, repo, fname, dest=None, **opts): | |
1138 | """create a bundle file |
|
1138 | """create a bundle file | |
1139 |
|
1139 | |||
1140 | Generate a bundle file containing data to be added to a repository. |
|
1140 | Generate a bundle file containing data to be added to a repository. | |
1141 |
|
1141 | |||
1142 | To create a bundle containing all changesets, use -a/--all |
|
1142 | To create a bundle containing all changesets, use -a/--all | |
1143 | (or --base null). Otherwise, hg assumes the destination will have |
|
1143 | (or --base null). Otherwise, hg assumes the destination will have | |
1144 | all the nodes you specify with --base parameters. Otherwise, hg |
|
1144 | all the nodes you specify with --base parameters. Otherwise, hg | |
1145 | will assume the repository has all the nodes in destination, or |
|
1145 | will assume the repository has all the nodes in destination, or | |
1146 | default-push/default if no destination is specified. |
|
1146 | default-push/default if no destination is specified. | |
1147 |
|
1147 | |||
1148 | You can change bundle format with the -t/--type option. See |
|
1148 | You can change bundle format with the -t/--type option. See | |
1149 | :hg:`help bundlespec` for documentation on this format. By default, |
|
1149 | :hg:`help bundlespec` for documentation on this format. By default, | |
1150 | the most appropriate format is used and compression defaults to |
|
1150 | the most appropriate format is used and compression defaults to | |
1151 | bzip2. |
|
1151 | bzip2. | |
1152 |
|
1152 | |||
1153 | The bundle file can then be transferred using conventional means |
|
1153 | The bundle file can then be transferred using conventional means | |
1154 | and applied to another repository with the unbundle or pull |
|
1154 | and applied to another repository with the unbundle or pull | |
1155 | command. This is useful when direct push and pull are not |
|
1155 | command. This is useful when direct push and pull are not | |
1156 | available or when exporting an entire repository is undesirable. |
|
1156 | available or when exporting an entire repository is undesirable. | |
1157 |
|
1157 | |||
1158 | Applying bundles preserves all changeset contents including |
|
1158 | Applying bundles preserves all changeset contents including | |
1159 | permissions, copy/rename information, and revision history. |
|
1159 | permissions, copy/rename information, and revision history. | |
1160 |
|
1160 | |||
1161 | Returns 0 on success, 1 if no changes found. |
|
1161 | Returns 0 on success, 1 if no changes found. | |
1162 | """ |
|
1162 | """ | |
1163 | opts = pycompat.byteskwargs(opts) |
|
1163 | opts = pycompat.byteskwargs(opts) | |
1164 | revs = None |
|
1164 | revs = None | |
1165 | if 'rev' in opts: |
|
1165 | if 'rev' in opts: | |
1166 | revstrings = opts['rev'] |
|
1166 | revstrings = opts['rev'] | |
1167 | revs = scmutil.revrange(repo, revstrings) |
|
1167 | revs = scmutil.revrange(repo, revstrings) | |
1168 | if revstrings and not revs: |
|
1168 | if revstrings and not revs: | |
1169 | raise error.Abort(_('no commits to bundle')) |
|
1169 | raise error.Abort(_('no commits to bundle')) | |
1170 |
|
1170 | |||
1171 | bundletype = opts.get('type', 'bzip2').lower() |
|
1171 | bundletype = opts.get('type', 'bzip2').lower() | |
1172 | try: |
|
1172 | try: | |
1173 | bcompression, cgversion, params = exchange.parsebundlespec( |
|
1173 | bcompression, cgversion, params = exchange.parsebundlespec( | |
1174 | repo, bundletype, strict=False) |
|
1174 | repo, bundletype, strict=False) | |
1175 | except error.UnsupportedBundleSpecification as e: |
|
1175 | except error.UnsupportedBundleSpecification as e: | |
1176 | raise error.Abort(str(e), |
|
1176 | raise error.Abort(str(e), | |
1177 | hint=_("see 'hg help bundlespec' for supported " |
|
1177 | hint=_("see 'hg help bundlespec' for supported " | |
1178 | "values for --type")) |
|
1178 | "values for --type")) | |
1179 |
|
1179 | |||
1180 | # Packed bundles are a pseudo bundle format for now. |
|
1180 | # Packed bundles are a pseudo bundle format for now. | |
1181 | if cgversion == 's1': |
|
1181 | if cgversion == 's1': | |
1182 | raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'), |
|
1182 | raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'), | |
1183 | hint=_("use 'hg debugcreatestreamclonebundle'")) |
|
1183 | hint=_("use 'hg debugcreatestreamclonebundle'")) | |
1184 |
|
1184 | |||
1185 | if opts.get('all'): |
|
1185 | if opts.get('all'): | |
1186 | if dest: |
|
1186 | if dest: | |
1187 | raise error.Abort(_("--all is incompatible with specifying " |
|
1187 | raise error.Abort(_("--all is incompatible with specifying " | |
1188 | "a destination")) |
|
1188 | "a destination")) | |
1189 | if opts.get('base'): |
|
1189 | if opts.get('base'): | |
1190 | ui.warn(_("ignoring --base because --all was specified\n")) |
|
1190 | ui.warn(_("ignoring --base because --all was specified\n")) | |
1191 | base = ['null'] |
|
1191 | base = ['null'] | |
1192 | else: |
|
1192 | else: | |
1193 | base = scmutil.revrange(repo, opts.get('base')) |
|
1193 | base = scmutil.revrange(repo, opts.get('base')) | |
1194 | if cgversion not in changegroup.supportedoutgoingversions(repo): |
|
1194 | if cgversion not in changegroup.supportedoutgoingversions(repo): | |
1195 | raise error.Abort(_("repository does not support bundle version %s") % |
|
1195 | raise error.Abort(_("repository does not support bundle version %s") % | |
1196 | cgversion) |
|
1196 | cgversion) | |
1197 |
|
1197 | |||
1198 | if base: |
|
1198 | if base: | |
1199 | if dest: |
|
1199 | if dest: | |
1200 | raise error.Abort(_("--base is incompatible with specifying " |
|
1200 | raise error.Abort(_("--base is incompatible with specifying " | |
1201 | "a destination")) |
|
1201 | "a destination")) | |
1202 | common = [repo.lookup(rev) for rev in base] |
|
1202 | common = [repo.lookup(rev) for rev in base] | |
1203 | heads = revs and map(repo.lookup, revs) or None |
|
1203 | heads = revs and map(repo.lookup, revs) or None | |
1204 | outgoing = discovery.outgoing(repo, common, heads) |
|
1204 | outgoing = discovery.outgoing(repo, common, heads) | |
1205 | else: |
|
1205 | else: | |
1206 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
1206 | dest = ui.expandpath(dest or 'default-push', dest or 'default') | |
1207 | dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
1207 | dest, branches = hg.parseurl(dest, opts.get('branch')) | |
1208 | other = hg.peer(repo, opts, dest) |
|
1208 | other = hg.peer(repo, opts, dest) | |
1209 | revs, checkout = hg.addbranchrevs(repo, repo, branches, revs) |
|
1209 | revs, checkout = hg.addbranchrevs(repo, repo, branches, revs) | |
1210 | heads = revs and map(repo.lookup, revs) or revs |
|
1210 | heads = revs and map(repo.lookup, revs) or revs | |
1211 | outgoing = discovery.findcommonoutgoing(repo, other, |
|
1211 | outgoing = discovery.findcommonoutgoing(repo, other, | |
1212 | onlyheads=heads, |
|
1212 | onlyheads=heads, | |
1213 | force=opts.get('force'), |
|
1213 | force=opts.get('force'), | |
1214 | portable=True) |
|
1214 | portable=True) | |
1215 |
|
1215 | |||
1216 | if not outgoing.missing: |
|
1216 | if not outgoing.missing: | |
1217 | scmutil.nochangesfound(ui, repo, not base and outgoing.excluded) |
|
1217 | scmutil.nochangesfound(ui, repo, not base and outgoing.excluded) | |
1218 | return 1 |
|
1218 | return 1 | |
1219 |
|
1219 | |||
1220 | if cgversion == '01': #bundle1 |
|
1220 | if cgversion == '01': #bundle1 | |
1221 | if bcompression is None: |
|
1221 | if bcompression is None: | |
1222 | bcompression = 'UN' |
|
1222 | bcompression = 'UN' | |
1223 | bversion = 'HG10' + bcompression |
|
1223 | bversion = 'HG10' + bcompression | |
1224 | bcompression = None |
|
1224 | bcompression = None | |
1225 | elif cgversion in ('02', '03'): |
|
1225 | elif cgversion in ('02', '03'): | |
1226 | bversion = 'HG20' |
|
1226 | bversion = 'HG20' | |
1227 | else: |
|
1227 | else: | |
1228 | raise error.ProgrammingError( |
|
1228 | raise error.ProgrammingError( | |
1229 | 'bundle: unexpected changegroup version %s' % cgversion) |
|
1229 | 'bundle: unexpected changegroup version %s' % cgversion) | |
1230 |
|
1230 | |||
1231 | # TODO compression options should be derived from bundlespec parsing. |
|
1231 | # TODO compression options should be derived from bundlespec parsing. | |
1232 | # This is a temporary hack to allow adjusting bundle compression |
|
1232 | # This is a temporary hack to allow adjusting bundle compression | |
1233 | # level without a) formalizing the bundlespec changes to declare it |
|
1233 | # level without a) formalizing the bundlespec changes to declare it | |
1234 | # b) introducing a command flag. |
|
1234 | # b) introducing a command flag. | |
1235 | compopts = {} |
|
1235 | compopts = {} | |
1236 | complevel = ui.configint('experimental', 'bundlecomplevel') |
|
1236 | complevel = ui.configint('experimental', 'bundlecomplevel') | |
1237 | if complevel is not None: |
|
1237 | if complevel is not None: | |
1238 | compopts['level'] = complevel |
|
1238 | compopts['level'] = complevel | |
1239 |
|
1239 | |||
1240 |
|
1240 | |||
1241 | contentopts = {'cg.version': cgversion} |
|
1241 | contentopts = {'cg.version': cgversion} | |
1242 | if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'): |
|
1242 | if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'): | |
1243 | contentopts['obsolescence'] = True |
|
1243 | contentopts['obsolescence'] = True | |
1244 | if repo.ui.configbool('experimental', 'bundle-phases'): |
|
1244 | if repo.ui.configbool('experimental', 'bundle-phases'): | |
1245 | contentopts['phases'] = True |
|
1245 | contentopts['phases'] = True | |
1246 | bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing, |
|
1246 | bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing, | |
1247 | contentopts, compression=bcompression, |
|
1247 | contentopts, compression=bcompression, | |
1248 | compopts=compopts) |
|
1248 | compopts=compopts) | |
1249 |
|
1249 | |||
1250 | @command('cat', |
|
1250 | @command('cat', | |
1251 | [('o', 'output', '', |
|
1251 | [('o', 'output', '', | |
1252 | _('print output to file with formatted name'), _('FORMAT')), |
|
1252 | _('print output to file with formatted name'), _('FORMAT')), | |
1253 | ('r', 'rev', '', _('print the given revision'), _('REV')), |
|
1253 | ('r', 'rev', '', _('print the given revision'), _('REV')), | |
1254 | ('', 'decode', None, _('apply any matching decode filter')), |
|
1254 | ('', 'decode', None, _('apply any matching decode filter')), | |
1255 | ] + walkopts + formatteropts, |
|
1255 | ] + walkopts + formatteropts, | |
1256 | _('[OPTION]... FILE...'), |
|
1256 | _('[OPTION]... FILE...'), | |
1257 | inferrepo=True) |
|
1257 | inferrepo=True) | |
1258 | def cat(ui, repo, file1, *pats, **opts): |
|
1258 | def cat(ui, repo, file1, *pats, **opts): | |
1259 | """output the current or given revision of files |
|
1259 | """output the current or given revision of files | |
1260 |
|
1260 | |||
1261 | Print the specified files as they were at the given revision. If |
|
1261 | Print the specified files as they were at the given revision. If | |
1262 | no revision is given, the parent of the working directory is used. |
|
1262 | no revision is given, the parent of the working directory is used. | |
1263 |
|
1263 | |||
1264 | Output may be to a file, in which case the name of the file is |
|
1264 | Output may be to a file, in which case the name of the file is | |
1265 | given using a format string. The formatting rules as follows: |
|
1265 | given using a format string. The formatting rules as follows: | |
1266 |
|
1266 | |||
1267 | :``%%``: literal "%" character |
|
1267 | :``%%``: literal "%" character | |
1268 | :``%s``: basename of file being printed |
|
1268 | :``%s``: basename of file being printed | |
1269 | :``%d``: dirname of file being printed, or '.' if in repository root |
|
1269 | :``%d``: dirname of file being printed, or '.' if in repository root | |
1270 | :``%p``: root-relative path name of file being printed |
|
1270 | :``%p``: root-relative path name of file being printed | |
1271 | :``%H``: changeset hash (40 hexadecimal digits) |
|
1271 | :``%H``: changeset hash (40 hexadecimal digits) | |
1272 | :``%R``: changeset revision number |
|
1272 | :``%R``: changeset revision number | |
1273 | :``%h``: short-form changeset hash (12 hexadecimal digits) |
|
1273 | :``%h``: short-form changeset hash (12 hexadecimal digits) | |
1274 | :``%r``: zero-padded changeset revision number |
|
1274 | :``%r``: zero-padded changeset revision number | |
1275 | :``%b``: basename of the exporting repository |
|
1275 | :``%b``: basename of the exporting repository | |
1276 |
|
1276 | |||
1277 | Returns 0 on success. |
|
1277 | Returns 0 on success. | |
1278 | """ |
|
1278 | """ | |
1279 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
1279 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
1280 | m = scmutil.match(ctx, (file1,) + pats, opts) |
|
1280 | m = scmutil.match(ctx, (file1,) + pats, opts) | |
1281 | fntemplate = opts.pop('output', '') |
|
1281 | fntemplate = opts.pop('output', '') | |
1282 | if cmdutil.isstdiofilename(fntemplate): |
|
1282 | if cmdutil.isstdiofilename(fntemplate): | |
1283 | fntemplate = '' |
|
1283 | fntemplate = '' | |
1284 |
|
1284 | |||
1285 | if fntemplate: |
|
1285 | if fntemplate: | |
1286 | fm = formatter.nullformatter(ui, 'cat') |
|
1286 | fm = formatter.nullformatter(ui, 'cat') | |
1287 | else: |
|
1287 | else: | |
1288 | ui.pager('cat') |
|
1288 | ui.pager('cat') | |
1289 | fm = ui.formatter('cat', opts) |
|
1289 | fm = ui.formatter('cat', opts) | |
1290 | with fm: |
|
1290 | with fm: | |
1291 | return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '', **opts) |
|
1291 | return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '', **opts) | |
1292 |
|
1292 | |||
1293 | @command('^clone', |
|
1293 | @command('^clone', | |
1294 | [('U', 'noupdate', None, _('the clone will include an empty working ' |
|
1294 | [('U', 'noupdate', None, _('the clone will include an empty working ' | |
1295 | 'directory (only a repository)')), |
|
1295 | 'directory (only a repository)')), | |
1296 | ('u', 'updaterev', '', _('revision, tag, or branch to check out'), |
|
1296 | ('u', 'updaterev', '', _('revision, tag, or branch to check out'), | |
1297 | _('REV')), |
|
1297 | _('REV')), | |
1298 | ('r', 'rev', [], _('include the specified changeset'), _('REV')), |
|
1298 | ('r', 'rev', [], _('include the specified changeset'), _('REV')), | |
1299 | ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')), |
|
1299 | ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')), | |
1300 | ('', 'pull', None, _('use pull protocol to copy metadata')), |
|
1300 | ('', 'pull', None, _('use pull protocol to copy metadata')), | |
1301 | ('', 'uncompressed', None, |
|
1301 | ('', 'uncompressed', None, | |
1302 | _('an alias to --stream (DEPRECATED)')), |
|
1302 | _('an alias to --stream (DEPRECATED)')), | |
1303 | ('', 'stream', None, |
|
1303 | ('', 'stream', None, | |
1304 | _('clone with minimal data processing')), |
|
1304 | _('clone with minimal data processing')), | |
1305 | ] + remoteopts, |
|
1305 | ] + remoteopts, | |
1306 | _('[OPTION]... SOURCE [DEST]'), |
|
1306 | _('[OPTION]... SOURCE [DEST]'), | |
1307 | norepo=True) |
|
1307 | norepo=True) | |
1308 | def clone(ui, source, dest=None, **opts): |
|
1308 | def clone(ui, source, dest=None, **opts): | |
1309 | """make a copy of an existing repository |
|
1309 | """make a copy of an existing repository | |
1310 |
|
1310 | |||
1311 | Create a copy of an existing repository in a new directory. |
|
1311 | Create a copy of an existing repository in a new directory. | |
1312 |
|
1312 | |||
1313 | If no destination directory name is specified, it defaults to the |
|
1313 | If no destination directory name is specified, it defaults to the | |
1314 | basename of the source. |
|
1314 | basename of the source. | |
1315 |
|
1315 | |||
1316 | The location of the source is added to the new repository's |
|
1316 | The location of the source is added to the new repository's | |
1317 | ``.hg/hgrc`` file, as the default to be used for future pulls. |
|
1317 | ``.hg/hgrc`` file, as the default to be used for future pulls. | |
1318 |
|
1318 | |||
1319 | Only local paths and ``ssh://`` URLs are supported as |
|
1319 | Only local paths and ``ssh://`` URLs are supported as | |
1320 | destinations. For ``ssh://`` destinations, no working directory or |
|
1320 | destinations. For ``ssh://`` destinations, no working directory or | |
1321 | ``.hg/hgrc`` will be created on the remote side. |
|
1321 | ``.hg/hgrc`` will be created on the remote side. | |
1322 |
|
1322 | |||
1323 | If the source repository has a bookmark called '@' set, that |
|
1323 | If the source repository has a bookmark called '@' set, that | |
1324 | revision will be checked out in the new repository by default. |
|
1324 | revision will be checked out in the new repository by default. | |
1325 |
|
1325 | |||
1326 | To check out a particular version, use -u/--update, or |
|
1326 | To check out a particular version, use -u/--update, or | |
1327 | -U/--noupdate to create a clone with no working directory. |
|
1327 | -U/--noupdate to create a clone with no working directory. | |
1328 |
|
1328 | |||
1329 | To pull only a subset of changesets, specify one or more revisions |
|
1329 | To pull only a subset of changesets, specify one or more revisions | |
1330 | identifiers with -r/--rev or branches with -b/--branch. The |
|
1330 | identifiers with -r/--rev or branches with -b/--branch. The | |
1331 | resulting clone will contain only the specified changesets and |
|
1331 | resulting clone will contain only the specified changesets and | |
1332 | their ancestors. These options (or 'clone src#rev dest') imply |
|
1332 | their ancestors. These options (or 'clone src#rev dest') imply | |
1333 | --pull, even for local source repositories. |
|
1333 | --pull, even for local source repositories. | |
1334 |
|
1334 | |||
1335 | In normal clone mode, the remote normalizes repository data into a common |
|
1335 | In normal clone mode, the remote normalizes repository data into a common | |
1336 | exchange format and the receiving end translates this data into its local |
|
1336 | exchange format and the receiving end translates this data into its local | |
1337 | storage format. --stream activates a different clone mode that essentially |
|
1337 | storage format. --stream activates a different clone mode that essentially | |
1338 | copies repository files from the remote with minimal data processing. This |
|
1338 | copies repository files from the remote with minimal data processing. This | |
1339 | significantly reduces the CPU cost of a clone both remotely and locally. |
|
1339 | significantly reduces the CPU cost of a clone both remotely and locally. | |
1340 | However, it often increases the transferred data size by 30-40%. This can |
|
1340 | However, it often increases the transferred data size by 30-40%. This can | |
1341 | result in substantially faster clones where I/O throughput is plentiful, |
|
1341 | result in substantially faster clones where I/O throughput is plentiful, | |
1342 | especially for larger repositories. A side-effect of --stream clones is |
|
1342 | especially for larger repositories. A side-effect of --stream clones is | |
1343 | that storage settings and requirements on the remote are applied locally: |
|
1343 | that storage settings and requirements on the remote are applied locally: | |
1344 | a modern client may inherit legacy or inefficient storage used by the |
|
1344 | a modern client may inherit legacy or inefficient storage used by the | |
1345 | remote or a legacy Mercurial client may not be able to clone from a |
|
1345 | remote or a legacy Mercurial client may not be able to clone from a | |
1346 | modern Mercurial remote. |
|
1346 | modern Mercurial remote. | |
1347 |
|
1347 | |||
1348 | .. note:: |
|
1348 | .. note:: | |
1349 |
|
1349 | |||
1350 | Specifying a tag will include the tagged changeset but not the |
|
1350 | Specifying a tag will include the tagged changeset but not the | |
1351 | changeset containing the tag. |
|
1351 | changeset containing the tag. | |
1352 |
|
1352 | |||
1353 | .. container:: verbose |
|
1353 | .. container:: verbose | |
1354 |
|
1354 | |||
1355 | For efficiency, hardlinks are used for cloning whenever the |
|
1355 | For efficiency, hardlinks are used for cloning whenever the | |
1356 | source and destination are on the same filesystem (note this |
|
1356 | source and destination are on the same filesystem (note this | |
1357 | applies only to the repository data, not to the working |
|
1357 | applies only to the repository data, not to the working | |
1358 | directory). Some filesystems, such as AFS, implement hardlinking |
|
1358 | directory). Some filesystems, such as AFS, implement hardlinking | |
1359 | incorrectly, but do not report errors. In these cases, use the |
|
1359 | incorrectly, but do not report errors. In these cases, use the | |
1360 | --pull option to avoid hardlinking. |
|
1360 | --pull option to avoid hardlinking. | |
1361 |
|
1361 | |||
1362 | Mercurial will update the working directory to the first applicable |
|
1362 | Mercurial will update the working directory to the first applicable | |
1363 | revision from this list: |
|
1363 | revision from this list: | |
1364 |
|
1364 | |||
1365 | a) null if -U or the source repository has no changesets |
|
1365 | a) null if -U or the source repository has no changesets | |
1366 | b) if -u . and the source repository is local, the first parent of |
|
1366 | b) if -u . and the source repository is local, the first parent of | |
1367 | the source repository's working directory |
|
1367 | the source repository's working directory | |
1368 | c) the changeset specified with -u (if a branch name, this means the |
|
1368 | c) the changeset specified with -u (if a branch name, this means the | |
1369 | latest head of that branch) |
|
1369 | latest head of that branch) | |
1370 | d) the changeset specified with -r |
|
1370 | d) the changeset specified with -r | |
1371 | e) the tipmost head specified with -b |
|
1371 | e) the tipmost head specified with -b | |
1372 | f) the tipmost head specified with the url#branch source syntax |
|
1372 | f) the tipmost head specified with the url#branch source syntax | |
1373 | g) the revision marked with the '@' bookmark, if present |
|
1373 | g) the revision marked with the '@' bookmark, if present | |
1374 | h) the tipmost head of the default branch |
|
1374 | h) the tipmost head of the default branch | |
1375 | i) tip |
|
1375 | i) tip | |
1376 |
|
1376 | |||
1377 | When cloning from servers that support it, Mercurial may fetch |
|
1377 | When cloning from servers that support it, Mercurial may fetch | |
1378 | pre-generated data from a server-advertised URL. When this is done, |
|
1378 | pre-generated data from a server-advertised URL. When this is done, | |
1379 | hooks operating on incoming changesets and changegroups may fire twice, |
|
1379 | hooks operating on incoming changesets and changegroups may fire twice, | |
1380 | once for the bundle fetched from the URL and another for any additional |
|
1380 | once for the bundle fetched from the URL and another for any additional | |
1381 | data not fetched from this URL. In addition, if an error occurs, the |
|
1381 | data not fetched from this URL. In addition, if an error occurs, the | |
1382 | repository may be rolled back to a partial clone. This behavior may |
|
1382 | repository may be rolled back to a partial clone. This behavior may | |
1383 | change in future releases. See :hg:`help -e clonebundles` for more. |
|
1383 | change in future releases. See :hg:`help -e clonebundles` for more. | |
1384 |
|
1384 | |||
1385 | Examples: |
|
1385 | Examples: | |
1386 |
|
1386 | |||
1387 | - clone a remote repository to a new directory named hg/:: |
|
1387 | - clone a remote repository to a new directory named hg/:: | |
1388 |
|
1388 | |||
1389 | hg clone https://www.mercurial-scm.org/repo/hg/ |
|
1389 | hg clone https://www.mercurial-scm.org/repo/hg/ | |
1390 |
|
1390 | |||
1391 | - create a lightweight local clone:: |
|
1391 | - create a lightweight local clone:: | |
1392 |
|
1392 | |||
1393 | hg clone project/ project-feature/ |
|
1393 | hg clone project/ project-feature/ | |
1394 |
|
1394 | |||
1395 | - clone from an absolute path on an ssh server (note double-slash):: |
|
1395 | - clone from an absolute path on an ssh server (note double-slash):: | |
1396 |
|
1396 | |||
1397 | hg clone ssh://user@server//home/projects/alpha/ |
|
1397 | hg clone ssh://user@server//home/projects/alpha/ | |
1398 |
|
1398 | |||
1399 | - do a streaming clone while checking out a specified version:: |
|
1399 | - do a streaming clone while checking out a specified version:: | |
1400 |
|
1400 | |||
1401 | hg clone --stream http://server/repo -u 1.5 |
|
1401 | hg clone --stream http://server/repo -u 1.5 | |
1402 |
|
1402 | |||
1403 | - create a repository without changesets after a particular revision:: |
|
1403 | - create a repository without changesets after a particular revision:: | |
1404 |
|
1404 | |||
1405 | hg clone -r 04e544 experimental/ good/ |
|
1405 | hg clone -r 04e544 experimental/ good/ | |
1406 |
|
1406 | |||
1407 | - clone (and track) a particular named branch:: |
|
1407 | - clone (and track) a particular named branch:: | |
1408 |
|
1408 | |||
1409 | hg clone https://www.mercurial-scm.org/repo/hg/#stable |
|
1409 | hg clone https://www.mercurial-scm.org/repo/hg/#stable | |
1410 |
|
1410 | |||
1411 | See :hg:`help urls` for details on specifying URLs. |
|
1411 | See :hg:`help urls` for details on specifying URLs. | |
1412 |
|
1412 | |||
1413 | Returns 0 on success. |
|
1413 | Returns 0 on success. | |
1414 | """ |
|
1414 | """ | |
1415 | opts = pycompat.byteskwargs(opts) |
|
1415 | opts = pycompat.byteskwargs(opts) | |
1416 | if opts.get('noupdate') and opts.get('updaterev'): |
|
1416 | if opts.get('noupdate') and opts.get('updaterev'): | |
1417 | raise error.Abort(_("cannot specify both --noupdate and --updaterev")) |
|
1417 | raise error.Abort(_("cannot specify both --noupdate and --updaterev")) | |
1418 |
|
1418 | |||
1419 | r = hg.clone(ui, opts, source, dest, |
|
1419 | r = hg.clone(ui, opts, source, dest, | |
1420 | pull=opts.get('pull'), |
|
1420 | pull=opts.get('pull'), | |
1421 | stream=opts.get('stream') or opts.get('uncompressed'), |
|
1421 | stream=opts.get('stream') or opts.get('uncompressed'), | |
1422 | rev=opts.get('rev'), |
|
1422 | rev=opts.get('rev'), | |
1423 | update=opts.get('updaterev') or not opts.get('noupdate'), |
|
1423 | update=opts.get('updaterev') or not opts.get('noupdate'), | |
1424 | branch=opts.get('branch'), |
|
1424 | branch=opts.get('branch'), | |
1425 | shareopts=opts.get('shareopts')) |
|
1425 | shareopts=opts.get('shareopts')) | |
1426 |
|
1426 | |||
1427 | return r is None |
|
1427 | return r is None | |
1428 |
|
1428 | |||
1429 | @command('^commit|ci', |
|
1429 | @command('^commit|ci', | |
1430 | [('A', 'addremove', None, |
|
1430 | [('A', 'addremove', None, | |
1431 | _('mark new/missing files as added/removed before committing')), |
|
1431 | _('mark new/missing files as added/removed before committing')), | |
1432 | ('', 'close-branch', None, |
|
1432 | ('', 'close-branch', None, | |
1433 | _('mark a branch head as closed')), |
|
1433 | _('mark a branch head as closed')), | |
1434 | ('', 'amend', None, _('amend the parent of the working directory')), |
|
1434 | ('', 'amend', None, _('amend the parent of the working directory')), | |
1435 | ('s', 'secret', None, _('use the secret phase for committing')), |
|
1435 | ('s', 'secret', None, _('use the secret phase for committing')), | |
1436 | ('e', 'edit', None, _('invoke editor on commit messages')), |
|
1436 | ('e', 'edit', None, _('invoke editor on commit messages')), | |
1437 | ('i', 'interactive', None, _('use interactive mode')), |
|
1437 | ('i', 'interactive', None, _('use interactive mode')), | |
1438 | ] + walkopts + commitopts + commitopts2 + subrepoopts, |
|
1438 | ] + walkopts + commitopts + commitopts2 + subrepoopts, | |
1439 | _('[OPTION]... [FILE]...'), |
|
1439 | _('[OPTION]... [FILE]...'), | |
1440 | inferrepo=True) |
|
1440 | inferrepo=True) | |
1441 | def commit(ui, repo, *pats, **opts): |
|
1441 | def commit(ui, repo, *pats, **opts): | |
1442 | """commit the specified files or all outstanding changes |
|
1442 | """commit the specified files or all outstanding changes | |
1443 |
|
1443 | |||
1444 | Commit changes to the given files into the repository. Unlike a |
|
1444 | Commit changes to the given files into the repository. Unlike a | |
1445 | centralized SCM, this operation is a local operation. See |
|
1445 | centralized SCM, this operation is a local operation. See | |
1446 | :hg:`push` for a way to actively distribute your changes. |
|
1446 | :hg:`push` for a way to actively distribute your changes. | |
1447 |
|
1447 | |||
1448 | If a list of files is omitted, all changes reported by :hg:`status` |
|
1448 | If a list of files is omitted, all changes reported by :hg:`status` | |
1449 | will be committed. |
|
1449 | will be committed. | |
1450 |
|
1450 | |||
1451 | If you are committing the result of a merge, do not provide any |
|
1451 | If you are committing the result of a merge, do not provide any | |
1452 | filenames or -I/-X filters. |
|
1452 | filenames or -I/-X filters. | |
1453 |
|
1453 | |||
1454 | If no commit message is specified, Mercurial starts your |
|
1454 | If no commit message is specified, Mercurial starts your | |
1455 | configured editor where you can enter a message. In case your |
|
1455 | configured editor where you can enter a message. In case your | |
1456 | commit fails, you will find a backup of your message in |
|
1456 | commit fails, you will find a backup of your message in | |
1457 | ``.hg/last-message.txt``. |
|
1457 | ``.hg/last-message.txt``. | |
1458 |
|
1458 | |||
1459 | The --close-branch flag can be used to mark the current branch |
|
1459 | The --close-branch flag can be used to mark the current branch | |
1460 | head closed. When all heads of a branch are closed, the branch |
|
1460 | head closed. When all heads of a branch are closed, the branch | |
1461 | will be considered closed and no longer listed. |
|
1461 | will be considered closed and no longer listed. | |
1462 |
|
1462 | |||
1463 | The --amend flag can be used to amend the parent of the |
|
1463 | The --amend flag can be used to amend the parent of the | |
1464 | working directory with a new commit that contains the changes |
|
1464 | working directory with a new commit that contains the changes | |
1465 | in the parent in addition to those currently reported by :hg:`status`, |
|
1465 | in the parent in addition to those currently reported by :hg:`status`, | |
1466 | if there are any. The old commit is stored in a backup bundle in |
|
1466 | if there are any. The old commit is stored in a backup bundle in | |
1467 | ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle` |
|
1467 | ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle` | |
1468 | on how to restore it). |
|
1468 | on how to restore it). | |
1469 |
|
1469 | |||
1470 | Message, user and date are taken from the amended commit unless |
|
1470 | Message, user and date are taken from the amended commit unless | |
1471 | specified. When a message isn't specified on the command line, |
|
1471 | specified. When a message isn't specified on the command line, | |
1472 | the editor will open with the message of the amended commit. |
|
1472 | the editor will open with the message of the amended commit. | |
1473 |
|
1473 | |||
1474 | It is not possible to amend public changesets (see :hg:`help phases`) |
|
1474 | It is not possible to amend public changesets (see :hg:`help phases`) | |
1475 | or changesets that have children. |
|
1475 | or changesets that have children. | |
1476 |
|
1476 | |||
1477 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
1477 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
1478 |
|
1478 | |||
1479 | Returns 0 on success, 1 if nothing changed. |
|
1479 | Returns 0 on success, 1 if nothing changed. | |
1480 |
|
1480 | |||
1481 | .. container:: verbose |
|
1481 | .. container:: verbose | |
1482 |
|
1482 | |||
1483 | Examples: |
|
1483 | Examples: | |
1484 |
|
1484 | |||
1485 | - commit all files ending in .py:: |
|
1485 | - commit all files ending in .py:: | |
1486 |
|
1486 | |||
1487 | hg commit --include "set:**.py" |
|
1487 | hg commit --include "set:**.py" | |
1488 |
|
1488 | |||
1489 | - commit all non-binary files:: |
|
1489 | - commit all non-binary files:: | |
1490 |
|
1490 | |||
1491 | hg commit --exclude "set:binary()" |
|
1491 | hg commit --exclude "set:binary()" | |
1492 |
|
1492 | |||
1493 | - amend the current commit and set the date to now:: |
|
1493 | - amend the current commit and set the date to now:: | |
1494 |
|
1494 | |||
1495 | hg commit --amend --date now |
|
1495 | hg commit --amend --date now | |
1496 | """ |
|
1496 | """ | |
1497 | wlock = lock = None |
|
1497 | wlock = lock = None | |
1498 | try: |
|
1498 | try: | |
1499 | wlock = repo.wlock() |
|
1499 | wlock = repo.wlock() | |
1500 | lock = repo.lock() |
|
1500 | lock = repo.lock() | |
1501 | return _docommit(ui, repo, *pats, **opts) |
|
1501 | return _docommit(ui, repo, *pats, **opts) | |
1502 | finally: |
|
1502 | finally: | |
1503 | release(lock, wlock) |
|
1503 | release(lock, wlock) | |
1504 |
|
1504 | |||
1505 | def _docommit(ui, repo, *pats, **opts): |
|
1505 | def _docommit(ui, repo, *pats, **opts): | |
1506 | if opts.get(r'interactive'): |
|
1506 | if opts.get(r'interactive'): | |
1507 | opts.pop(r'interactive') |
|
1507 | opts.pop(r'interactive') | |
1508 | ret = cmdutil.dorecord(ui, repo, commit, None, False, |
|
1508 | ret = cmdutil.dorecord(ui, repo, commit, None, False, | |
1509 | cmdutil.recordfilter, *pats, |
|
1509 | cmdutil.recordfilter, *pats, | |
1510 | **opts) |
|
1510 | **opts) | |
1511 | # ret can be 0 (no changes to record) or the value returned by |
|
1511 | # ret can be 0 (no changes to record) or the value returned by | |
1512 | # commit(), 1 if nothing changed or None on success. |
|
1512 | # commit(), 1 if nothing changed or None on success. | |
1513 | return 1 if ret == 0 else ret |
|
1513 | return 1 if ret == 0 else ret | |
1514 |
|
1514 | |||
1515 | opts = pycompat.byteskwargs(opts) |
|
1515 | opts = pycompat.byteskwargs(opts) | |
1516 | if opts.get('subrepos'): |
|
1516 | if opts.get('subrepos'): | |
1517 | if opts.get('amend'): |
|
1517 | if opts.get('amend'): | |
1518 | raise error.Abort(_('cannot amend with --subrepos')) |
|
1518 | raise error.Abort(_('cannot amend with --subrepos')) | |
1519 | # Let --subrepos on the command line override config setting. |
|
1519 | # Let --subrepos on the command line override config setting. | |
1520 | ui.setconfig('ui', 'commitsubrepos', True, 'commit') |
|
1520 | ui.setconfig('ui', 'commitsubrepos', True, 'commit') | |
1521 |
|
1521 | |||
1522 | cmdutil.checkunfinished(repo, commit=True) |
|
1522 | cmdutil.checkunfinished(repo, commit=True) | |
1523 |
|
1523 | |||
1524 | branch = repo[None].branch() |
|
1524 | branch = repo[None].branch() | |
1525 | bheads = repo.branchheads(branch) |
|
1525 | bheads = repo.branchheads(branch) | |
1526 |
|
1526 | |||
1527 | extra = {} |
|
1527 | extra = {} | |
1528 | if opts.get('close_branch'): |
|
1528 | if opts.get('close_branch'): | |
1529 | extra['close'] = 1 |
|
1529 | extra['close'] = 1 | |
1530 |
|
1530 | |||
1531 | if not bheads: |
|
1531 | if not bheads: | |
1532 | raise error.Abort(_('can only close branch heads')) |
|
1532 | raise error.Abort(_('can only close branch heads')) | |
1533 | elif opts.get('amend'): |
|
1533 | elif opts.get('amend'): | |
1534 | if repo[None].parents()[0].p1().branch() != branch and \ |
|
1534 | if repo[None].parents()[0].p1().branch() != branch and \ | |
1535 | repo[None].parents()[0].p2().branch() != branch: |
|
1535 | repo[None].parents()[0].p2().branch() != branch: | |
1536 | raise error.Abort(_('can only close branch heads')) |
|
1536 | raise error.Abort(_('can only close branch heads')) | |
1537 |
|
1537 | |||
1538 | if opts.get('amend'): |
|
1538 | if opts.get('amend'): | |
1539 | if ui.configbool('ui', 'commitsubrepos'): |
|
1539 | if ui.configbool('ui', 'commitsubrepos'): | |
1540 | raise error.Abort(_('cannot amend with ui.commitsubrepos enabled')) |
|
1540 | raise error.Abort(_('cannot amend with ui.commitsubrepos enabled')) | |
1541 |
|
1541 | |||
1542 | old = repo['.'] |
|
1542 | old = repo['.'] | |
1543 | if not old.mutable(): |
|
1543 | if not old.mutable(): | |
1544 | raise error.Abort(_('cannot amend public changesets')) |
|
1544 | raise error.Abort(_('cannot amend public changesets')) | |
1545 | if len(repo[None].parents()) > 1: |
|
1545 | if len(repo[None].parents()) > 1: | |
1546 | raise error.Abort(_('cannot amend while merging')) |
|
1546 | raise error.Abort(_('cannot amend while merging')) | |
1547 | allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt) |
|
1547 | allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt) | |
1548 | if not allowunstable and old.children(): |
|
1548 | if not allowunstable and old.children(): | |
1549 | raise error.Abort(_('cannot amend changeset with children')) |
|
1549 | raise error.Abort(_('cannot amend changeset with children')) | |
1550 |
|
1550 | |||
1551 | # Currently histedit gets confused if an amend happens while histedit |
|
1551 | # Currently histedit gets confused if an amend happens while histedit | |
1552 | # is in progress. Since we have a checkunfinished command, we are |
|
1552 | # is in progress. Since we have a checkunfinished command, we are | |
1553 | # temporarily honoring it. |
|
1553 | # temporarily honoring it. | |
1554 | # |
|
1554 | # | |
1555 | # Note: eventually this guard will be removed. Please do not expect |
|
1555 | # Note: eventually this guard will be removed. Please do not expect | |
1556 | # this behavior to remain. |
|
1556 | # this behavior to remain. | |
1557 | if not obsolete.isenabled(repo, obsolete.createmarkersopt): |
|
1557 | if not obsolete.isenabled(repo, obsolete.createmarkersopt): | |
1558 | cmdutil.checkunfinished(repo) |
|
1558 | cmdutil.checkunfinished(repo) | |
1559 |
|
1559 | |||
1560 | node = cmdutil.amend(ui, repo, old, extra, pats, opts) |
|
1560 | node = cmdutil.amend(ui, repo, old, extra, pats, opts) | |
1561 | if node == old.node(): |
|
1561 | if node == old.node(): | |
1562 | ui.status(_("nothing changed\n")) |
|
1562 | ui.status(_("nothing changed\n")) | |
1563 | return 1 |
|
1563 | return 1 | |
1564 | else: |
|
1564 | else: | |
1565 | def commitfunc(ui, repo, message, match, opts): |
|
1565 | def commitfunc(ui, repo, message, match, opts): | |
1566 | overrides = {} |
|
1566 | overrides = {} | |
1567 | if opts.get('secret'): |
|
1567 | if opts.get('secret'): | |
1568 | overrides[('phases', 'new-commit')] = 'secret' |
|
1568 | overrides[('phases', 'new-commit')] = 'secret' | |
1569 |
|
1569 | |||
1570 | baseui = repo.baseui |
|
1570 | baseui = repo.baseui | |
1571 | with baseui.configoverride(overrides, 'commit'): |
|
1571 | with baseui.configoverride(overrides, 'commit'): | |
1572 | with ui.configoverride(overrides, 'commit'): |
|
1572 | with ui.configoverride(overrides, 'commit'): | |
1573 | editform = cmdutil.mergeeditform(repo[None], |
|
1573 | editform = cmdutil.mergeeditform(repo[None], | |
1574 | 'commit.normal') |
|
1574 | 'commit.normal') | |
1575 | editor = cmdutil.getcommiteditor( |
|
1575 | editor = cmdutil.getcommiteditor( | |
1576 | editform=editform, **pycompat.strkwargs(opts)) |
|
1576 | editform=editform, **pycompat.strkwargs(opts)) | |
1577 | return repo.commit(message, |
|
1577 | return repo.commit(message, | |
1578 | opts.get('user'), |
|
1578 | opts.get('user'), | |
1579 | opts.get('date'), |
|
1579 | opts.get('date'), | |
1580 | match, |
|
1580 | match, | |
1581 | editor=editor, |
|
1581 | editor=editor, | |
1582 | extra=extra) |
|
1582 | extra=extra) | |
1583 |
|
1583 | |||
1584 | node = cmdutil.commit(ui, repo, commitfunc, pats, opts) |
|
1584 | node = cmdutil.commit(ui, repo, commitfunc, pats, opts) | |
1585 |
|
1585 | |||
1586 | if not node: |
|
1586 | if not node: | |
1587 | stat = cmdutil.postcommitstatus(repo, pats, opts) |
|
1587 | stat = cmdutil.postcommitstatus(repo, pats, opts) | |
1588 | if stat[3]: |
|
1588 | if stat[3]: | |
1589 | ui.status(_("nothing changed (%d missing files, see " |
|
1589 | ui.status(_("nothing changed (%d missing files, see " | |
1590 | "'hg status')\n") % len(stat[3])) |
|
1590 | "'hg status')\n") % len(stat[3])) | |
1591 | else: |
|
1591 | else: | |
1592 | ui.status(_("nothing changed\n")) |
|
1592 | ui.status(_("nothing changed\n")) | |
1593 | return 1 |
|
1593 | return 1 | |
1594 |
|
1594 | |||
1595 | cmdutil.commitstatus(repo, node, branch, bheads, opts) |
|
1595 | cmdutil.commitstatus(repo, node, branch, bheads, opts) | |
1596 |
|
1596 | |||
1597 | @command('config|showconfig|debugconfig', |
|
1597 | @command('config|showconfig|debugconfig', | |
1598 | [('u', 'untrusted', None, _('show untrusted configuration options')), |
|
1598 | [('u', 'untrusted', None, _('show untrusted configuration options')), | |
1599 | ('e', 'edit', None, _('edit user config')), |
|
1599 | ('e', 'edit', None, _('edit user config')), | |
1600 | ('l', 'local', None, _('edit repository config')), |
|
1600 | ('l', 'local', None, _('edit repository config')), | |
1601 | ('g', 'global', None, _('edit global config'))] + formatteropts, |
|
1601 | ('g', 'global', None, _('edit global config'))] + formatteropts, | |
1602 | _('[-u] [NAME]...'), |
|
1602 | _('[-u] [NAME]...'), | |
1603 | optionalrepo=True) |
|
1603 | optionalrepo=True) | |
1604 | def config(ui, repo, *values, **opts): |
|
1604 | def config(ui, repo, *values, **opts): | |
1605 | """show combined config settings from all hgrc files |
|
1605 | """show combined config settings from all hgrc files | |
1606 |
|
1606 | |||
1607 | With no arguments, print names and values of all config items. |
|
1607 | With no arguments, print names and values of all config items. | |
1608 |
|
1608 | |||
1609 | With one argument of the form section.name, print just the value |
|
1609 | With one argument of the form section.name, print just the value | |
1610 | of that config item. |
|
1610 | of that config item. | |
1611 |
|
1611 | |||
1612 | With multiple arguments, print names and values of all config |
|
1612 | With multiple arguments, print names and values of all config | |
1613 | items with matching section names. |
|
1613 | items with matching section names. | |
1614 |
|
1614 | |||
1615 | With --edit, start an editor on the user-level config file. With |
|
1615 | With --edit, start an editor on the user-level config file. With | |
1616 | --global, edit the system-wide config file. With --local, edit the |
|
1616 | --global, edit the system-wide config file. With --local, edit the | |
1617 | repository-level config file. |
|
1617 | repository-level config file. | |
1618 |
|
1618 | |||
1619 | With --debug, the source (filename and line number) is printed |
|
1619 | With --debug, the source (filename and line number) is printed | |
1620 | for each config item. |
|
1620 | for each config item. | |
1621 |
|
1621 | |||
1622 | See :hg:`help config` for more information about config files. |
|
1622 | See :hg:`help config` for more information about config files. | |
1623 |
|
1623 | |||
1624 | Returns 0 on success, 1 if NAME does not exist. |
|
1624 | Returns 0 on success, 1 if NAME does not exist. | |
1625 |
|
1625 | |||
1626 | """ |
|
1626 | """ | |
1627 |
|
1627 | |||
1628 | opts = pycompat.byteskwargs(opts) |
|
1628 | opts = pycompat.byteskwargs(opts) | |
1629 | if opts.get('edit') or opts.get('local') or opts.get('global'): |
|
1629 | if opts.get('edit') or opts.get('local') or opts.get('global'): | |
1630 | if opts.get('local') and opts.get('global'): |
|
1630 | if opts.get('local') and opts.get('global'): | |
1631 | raise error.Abort(_("can't use --local and --global together")) |
|
1631 | raise error.Abort(_("can't use --local and --global together")) | |
1632 |
|
1632 | |||
1633 | if opts.get('local'): |
|
1633 | if opts.get('local'): | |
1634 | if not repo: |
|
1634 | if not repo: | |
1635 | raise error.Abort(_("can't use --local outside a repository")) |
|
1635 | raise error.Abort(_("can't use --local outside a repository")) | |
1636 | paths = [repo.vfs.join('hgrc')] |
|
1636 | paths = [repo.vfs.join('hgrc')] | |
1637 | elif opts.get('global'): |
|
1637 | elif opts.get('global'): | |
1638 | paths = rcutil.systemrcpath() |
|
1638 | paths = rcutil.systemrcpath() | |
1639 | else: |
|
1639 | else: | |
1640 | paths = rcutil.userrcpath() |
|
1640 | paths = rcutil.userrcpath() | |
1641 |
|
1641 | |||
1642 | for f in paths: |
|
1642 | for f in paths: | |
1643 | if os.path.exists(f): |
|
1643 | if os.path.exists(f): | |
1644 | break |
|
1644 | break | |
1645 | else: |
|
1645 | else: | |
1646 | if opts.get('global'): |
|
1646 | if opts.get('global'): | |
1647 | samplehgrc = uimod.samplehgrcs['global'] |
|
1647 | samplehgrc = uimod.samplehgrcs['global'] | |
1648 | elif opts.get('local'): |
|
1648 | elif opts.get('local'): | |
1649 | samplehgrc = uimod.samplehgrcs['local'] |
|
1649 | samplehgrc = uimod.samplehgrcs['local'] | |
1650 | else: |
|
1650 | else: | |
1651 | samplehgrc = uimod.samplehgrcs['user'] |
|
1651 | samplehgrc = uimod.samplehgrcs['user'] | |
1652 |
|
1652 | |||
1653 | f = paths[0] |
|
1653 | f = paths[0] | |
1654 | fp = open(f, "wb") |
|
1654 | fp = open(f, "wb") | |
1655 | fp.write(util.tonativeeol(samplehgrc)) |
|
1655 | fp.write(util.tonativeeol(samplehgrc)) | |
1656 | fp.close() |
|
1656 | fp.close() | |
1657 |
|
1657 | |||
1658 | editor = ui.geteditor() |
|
1658 | editor = ui.geteditor() | |
1659 | ui.system("%s \"%s\"" % (editor, f), |
|
1659 | ui.system("%s \"%s\"" % (editor, f), | |
1660 | onerr=error.Abort, errprefix=_("edit failed"), |
|
1660 | onerr=error.Abort, errprefix=_("edit failed"), | |
1661 | blockedtag='config_edit') |
|
1661 | blockedtag='config_edit') | |
1662 | return |
|
1662 | return | |
1663 | ui.pager('config') |
|
1663 | ui.pager('config') | |
1664 | fm = ui.formatter('config', opts) |
|
1664 | fm = ui.formatter('config', opts) | |
1665 | for t, f in rcutil.rccomponents(): |
|
1665 | for t, f in rcutil.rccomponents(): | |
1666 | if t == 'path': |
|
1666 | if t == 'path': | |
1667 | ui.debug('read config from: %s\n' % f) |
|
1667 | ui.debug('read config from: %s\n' % f) | |
1668 | elif t == 'items': |
|
1668 | elif t == 'items': | |
1669 | for section, name, value, source in f: |
|
1669 | for section, name, value, source in f: | |
1670 | ui.debug('set config by: %s\n' % source) |
|
1670 | ui.debug('set config by: %s\n' % source) | |
1671 | else: |
|
1671 | else: | |
1672 | raise error.ProgrammingError('unknown rctype: %s' % t) |
|
1672 | raise error.ProgrammingError('unknown rctype: %s' % t) | |
1673 | untrusted = bool(opts.get('untrusted')) |
|
1673 | untrusted = bool(opts.get('untrusted')) | |
1674 | if values: |
|
1674 | if values: | |
1675 | sections = [v for v in values if '.' not in v] |
|
1675 | sections = [v for v in values if '.' not in v] | |
1676 | items = [v for v in values if '.' in v] |
|
1676 | items = [v for v in values if '.' in v] | |
1677 | if len(items) > 1 or items and sections: |
|
1677 | if len(items) > 1 or items and sections: | |
1678 | raise error.Abort(_('only one config item permitted')) |
|
1678 | raise error.Abort(_('only one config item permitted')) | |
1679 | matched = False |
|
1679 | matched = False | |
1680 | for section, name, value in ui.walkconfig(untrusted=untrusted): |
|
1680 | for section, name, value in ui.walkconfig(untrusted=untrusted): | |
1681 | source = ui.configsource(section, name, untrusted) |
|
1681 | source = ui.configsource(section, name, untrusted) | |
1682 | value = pycompat.bytestr(value) |
|
1682 | value = pycompat.bytestr(value) | |
1683 | if fm.isplain(): |
|
1683 | if fm.isplain(): | |
1684 | source = source or 'none' |
|
1684 | source = source or 'none' | |
1685 | value = value.replace('\n', '\\n') |
|
1685 | value = value.replace('\n', '\\n') | |
1686 | entryname = section + '.' + name |
|
1686 | entryname = section + '.' + name | |
1687 | if values: |
|
1687 | if values: | |
1688 | for v in values: |
|
1688 | for v in values: | |
1689 | if v == section: |
|
1689 | if v == section: | |
1690 | fm.startitem() |
|
1690 | fm.startitem() | |
1691 | fm.condwrite(ui.debugflag, 'source', '%s: ', source) |
|
1691 | fm.condwrite(ui.debugflag, 'source', '%s: ', source) | |
1692 | fm.write('name value', '%s=%s\n', entryname, value) |
|
1692 | fm.write('name value', '%s=%s\n', entryname, value) | |
1693 | matched = True |
|
1693 | matched = True | |
1694 | elif v == entryname: |
|
1694 | elif v == entryname: | |
1695 | fm.startitem() |
|
1695 | fm.startitem() | |
1696 | fm.condwrite(ui.debugflag, 'source', '%s: ', source) |
|
1696 | fm.condwrite(ui.debugflag, 'source', '%s: ', source) | |
1697 | fm.write('value', '%s\n', value) |
|
1697 | fm.write('value', '%s\n', value) | |
1698 | fm.data(name=entryname) |
|
1698 | fm.data(name=entryname) | |
1699 | matched = True |
|
1699 | matched = True | |
1700 | else: |
|
1700 | else: | |
1701 | fm.startitem() |
|
1701 | fm.startitem() | |
1702 | fm.condwrite(ui.debugflag, 'source', '%s: ', source) |
|
1702 | fm.condwrite(ui.debugflag, 'source', '%s: ', source) | |
1703 | fm.write('name value', '%s=%s\n', entryname, value) |
|
1703 | fm.write('name value', '%s=%s\n', entryname, value) | |
1704 | matched = True |
|
1704 | matched = True | |
1705 | fm.end() |
|
1705 | fm.end() | |
1706 | if matched: |
|
1706 | if matched: | |
1707 | return 0 |
|
1707 | return 0 | |
1708 | return 1 |
|
1708 | return 1 | |
1709 |
|
1709 | |||
1710 | @command('copy|cp', |
|
1710 | @command('copy|cp', | |
1711 | [('A', 'after', None, _('record a copy that has already occurred')), |
|
1711 | [('A', 'after', None, _('record a copy that has already occurred')), | |
1712 | ('f', 'force', None, _('forcibly copy over an existing managed file')), |
|
1712 | ('f', 'force', None, _('forcibly copy over an existing managed file')), | |
1713 | ] + walkopts + dryrunopts, |
|
1713 | ] + walkopts + dryrunopts, | |
1714 | _('[OPTION]... [SOURCE]... DEST')) |
|
1714 | _('[OPTION]... [SOURCE]... DEST')) | |
1715 | def copy(ui, repo, *pats, **opts): |
|
1715 | def copy(ui, repo, *pats, **opts): | |
1716 | """mark files as copied for the next commit |
|
1716 | """mark files as copied for the next commit | |
1717 |
|
1717 | |||
1718 | Mark dest as having copies of source files. If dest is a |
|
1718 | Mark dest as having copies of source files. If dest is a | |
1719 | directory, copies are put in that directory. If dest is a file, |
|
1719 | directory, copies are put in that directory. If dest is a file, | |
1720 | the source must be a single file. |
|
1720 | the source must be a single file. | |
1721 |
|
1721 | |||
1722 | By default, this command copies the contents of files as they |
|
1722 | By default, this command copies the contents of files as they | |
1723 | exist in the working directory. If invoked with -A/--after, the |
|
1723 | exist in the working directory. If invoked with -A/--after, the | |
1724 | operation is recorded, but no copying is performed. |
|
1724 | operation is recorded, but no copying is performed. | |
1725 |
|
1725 | |||
1726 | This command takes effect with the next commit. To undo a copy |
|
1726 | This command takes effect with the next commit. To undo a copy | |
1727 | before that, see :hg:`revert`. |
|
1727 | before that, see :hg:`revert`. | |
1728 |
|
1728 | |||
1729 | Returns 0 on success, 1 if errors are encountered. |
|
1729 | Returns 0 on success, 1 if errors are encountered. | |
1730 | """ |
|
1730 | """ | |
1731 | opts = pycompat.byteskwargs(opts) |
|
1731 | opts = pycompat.byteskwargs(opts) | |
1732 | with repo.wlock(False): |
|
1732 | with repo.wlock(False): | |
1733 | return cmdutil.copy(ui, repo, pats, opts) |
|
1733 | return cmdutil.copy(ui, repo, pats, opts) | |
1734 |
|
1734 | |||
1735 | @command('debugcommands', [], _('[COMMAND]'), norepo=True) |
|
1735 | @command('debugcommands', [], _('[COMMAND]'), norepo=True) | |
1736 | def debugcommands(ui, cmd='', *args): |
|
1736 | def debugcommands(ui, cmd='', *args): | |
1737 | """list all available commands and options""" |
|
1737 | """list all available commands and options""" | |
1738 | for cmd, vals in sorted(table.iteritems()): |
|
1738 | for cmd, vals in sorted(table.iteritems()): | |
1739 | cmd = cmd.split('|')[0].strip('^') |
|
1739 | cmd = cmd.split('|')[0].strip('^') | |
1740 | opts = ', '.join([i[1] for i in vals[1]]) |
|
1740 | opts = ', '.join([i[1] for i in vals[1]]) | |
1741 | ui.write('%s: %s\n' % (cmd, opts)) |
|
1741 | ui.write('%s: %s\n' % (cmd, opts)) | |
1742 |
|
1742 | |||
1743 | @command('debugcomplete', |
|
1743 | @command('debugcomplete', | |
1744 | [('o', 'options', None, _('show the command options'))], |
|
1744 | [('o', 'options', None, _('show the command options'))], | |
1745 | _('[-o] CMD'), |
|
1745 | _('[-o] CMD'), | |
1746 | norepo=True) |
|
1746 | norepo=True) | |
1747 | def debugcomplete(ui, cmd='', **opts): |
|
1747 | def debugcomplete(ui, cmd='', **opts): | |
1748 | """returns the completion list associated with the given command""" |
|
1748 | """returns the completion list associated with the given command""" | |
1749 |
|
1749 | |||
1750 | if opts.get('options'): |
|
1750 | if opts.get('options'): | |
1751 | options = [] |
|
1751 | options = [] | |
1752 | otables = [globalopts] |
|
1752 | otables = [globalopts] | |
1753 | if cmd: |
|
1753 | if cmd: | |
1754 | aliases, entry = cmdutil.findcmd(cmd, table, False) |
|
1754 | aliases, entry = cmdutil.findcmd(cmd, table, False) | |
1755 | otables.append(entry[1]) |
|
1755 | otables.append(entry[1]) | |
1756 | for t in otables: |
|
1756 | for t in otables: | |
1757 | for o in t: |
|
1757 | for o in t: | |
1758 | if "(DEPRECATED)" in o[3]: |
|
1758 | if "(DEPRECATED)" in o[3]: | |
1759 | continue |
|
1759 | continue | |
1760 | if o[0]: |
|
1760 | if o[0]: | |
1761 | options.append('-%s' % o[0]) |
|
1761 | options.append('-%s' % o[0]) | |
1762 | options.append('--%s' % o[1]) |
|
1762 | options.append('--%s' % o[1]) | |
1763 | ui.write("%s\n" % "\n".join(options)) |
|
1763 | ui.write("%s\n" % "\n".join(options)) | |
1764 | return |
|
1764 | return | |
1765 |
|
1765 | |||
1766 | cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table) |
|
1766 | cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table) | |
1767 | if ui.verbose: |
|
1767 | if ui.verbose: | |
1768 | cmdlist = [' '.join(c[0]) for c in cmdlist.values()] |
|
1768 | cmdlist = [' '.join(c[0]) for c in cmdlist.values()] | |
1769 | ui.write("%s\n" % "\n".join(sorted(cmdlist))) |
|
1769 | ui.write("%s\n" % "\n".join(sorted(cmdlist))) | |
1770 |
|
1770 | |||
1771 | @command('^diff', |
|
1771 | @command('^diff', | |
1772 | [('r', 'rev', [], _('revision'), _('REV')), |
|
1772 | [('r', 'rev', [], _('revision'), _('REV')), | |
1773 | ('c', 'change', '', _('change made by revision'), _('REV')) |
|
1773 | ('c', 'change', '', _('change made by revision'), _('REV')) | |
1774 | ] + diffopts + diffopts2 + walkopts + subrepoopts, |
|
1774 | ] + diffopts + diffopts2 + walkopts + subrepoopts, | |
1775 | _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'), |
|
1775 | _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'), | |
1776 | inferrepo=True) |
|
1776 | inferrepo=True) | |
1777 | def diff(ui, repo, *pats, **opts): |
|
1777 | def diff(ui, repo, *pats, **opts): | |
1778 | """diff repository (or selected files) |
|
1778 | """diff repository (or selected files) | |
1779 |
|
1779 | |||
1780 | Show differences between revisions for the specified files. |
|
1780 | Show differences between revisions for the specified files. | |
1781 |
|
1781 | |||
1782 | Differences between files are shown using the unified diff format. |
|
1782 | Differences between files are shown using the unified diff format. | |
1783 |
|
1783 | |||
1784 | .. note:: |
|
1784 | .. note:: | |
1785 |
|
1785 | |||
1786 | :hg:`diff` may generate unexpected results for merges, as it will |
|
1786 | :hg:`diff` may generate unexpected results for merges, as it will | |
1787 | default to comparing against the working directory's first |
|
1787 | default to comparing against the working directory's first | |
1788 | parent changeset if no revisions are specified. |
|
1788 | parent changeset if no revisions are specified. | |
1789 |
|
1789 | |||
1790 | When two revision arguments are given, then changes are shown |
|
1790 | When two revision arguments are given, then changes are shown | |
1791 | between those revisions. If only one revision is specified then |
|
1791 | between those revisions. If only one revision is specified then | |
1792 | that revision is compared to the working directory, and, when no |
|
1792 | that revision is compared to the working directory, and, when no | |
1793 | revisions are specified, the working directory files are compared |
|
1793 | revisions are specified, the working directory files are compared | |
1794 | to its first parent. |
|
1794 | to its first parent. | |
1795 |
|
1795 | |||
1796 | Alternatively you can specify -c/--change with a revision to see |
|
1796 | Alternatively you can specify -c/--change with a revision to see | |
1797 | the changes in that changeset relative to its first parent. |
|
1797 | the changes in that changeset relative to its first parent. | |
1798 |
|
1798 | |||
1799 | Without the -a/--text option, diff will avoid generating diffs of |
|
1799 | Without the -a/--text option, diff will avoid generating diffs of | |
1800 | files it detects as binary. With -a, diff will generate a diff |
|
1800 | files it detects as binary. With -a, diff will generate a diff | |
1801 | anyway, probably with undesirable results. |
|
1801 | anyway, probably with undesirable results. | |
1802 |
|
1802 | |||
1803 | Use the -g/--git option to generate diffs in the git extended diff |
|
1803 | Use the -g/--git option to generate diffs in the git extended diff | |
1804 | format. For more information, read :hg:`help diffs`. |
|
1804 | format. For more information, read :hg:`help diffs`. | |
1805 |
|
1805 | |||
1806 | .. container:: verbose |
|
1806 | .. container:: verbose | |
1807 |
|
1807 | |||
1808 | Examples: |
|
1808 | Examples: | |
1809 |
|
1809 | |||
1810 | - compare a file in the current working directory to its parent:: |
|
1810 | - compare a file in the current working directory to its parent:: | |
1811 |
|
1811 | |||
1812 | hg diff foo.c |
|
1812 | hg diff foo.c | |
1813 |
|
1813 | |||
1814 | - compare two historical versions of a directory, with rename info:: |
|
1814 | - compare two historical versions of a directory, with rename info:: | |
1815 |
|
1815 | |||
1816 | hg diff --git -r 1.0:1.2 lib/ |
|
1816 | hg diff --git -r 1.0:1.2 lib/ | |
1817 |
|
1817 | |||
1818 | - get change stats relative to the last change on some date:: |
|
1818 | - get change stats relative to the last change on some date:: | |
1819 |
|
1819 | |||
1820 | hg diff --stat -r "date('may 2')" |
|
1820 | hg diff --stat -r "date('may 2')" | |
1821 |
|
1821 | |||
1822 | - diff all newly-added files that contain a keyword:: |
|
1822 | - diff all newly-added files that contain a keyword:: | |
1823 |
|
1823 | |||
1824 | hg diff "set:added() and grep(GNU)" |
|
1824 | hg diff "set:added() and grep(GNU)" | |
1825 |
|
1825 | |||
1826 | - compare a revision and its parents:: |
|
1826 | - compare a revision and its parents:: | |
1827 |
|
1827 | |||
1828 | hg diff -c 9353 # compare against first parent |
|
1828 | hg diff -c 9353 # compare against first parent | |
1829 | hg diff -r 9353^:9353 # same using revset syntax |
|
1829 | hg diff -r 9353^:9353 # same using revset syntax | |
1830 | hg diff -r 9353^2:9353 # compare against the second parent |
|
1830 | hg diff -r 9353^2:9353 # compare against the second parent | |
1831 |
|
1831 | |||
1832 | Returns 0 on success. |
|
1832 | Returns 0 on success. | |
1833 | """ |
|
1833 | """ | |
1834 |
|
1834 | |||
1835 | opts = pycompat.byteskwargs(opts) |
|
1835 | opts = pycompat.byteskwargs(opts) | |
1836 | revs = opts.get('rev') |
|
1836 | revs = opts.get('rev') | |
1837 | change = opts.get('change') |
|
1837 | change = opts.get('change') | |
1838 | stat = opts.get('stat') |
|
1838 | stat = opts.get('stat') | |
1839 | reverse = opts.get('reverse') |
|
1839 | reverse = opts.get('reverse') | |
1840 |
|
1840 | |||
1841 | if revs and change: |
|
1841 | if revs and change: | |
1842 | msg = _('cannot specify --rev and --change at the same time') |
|
1842 | msg = _('cannot specify --rev and --change at the same time') | |
1843 | raise error.Abort(msg) |
|
1843 | raise error.Abort(msg) | |
1844 | elif change: |
|
1844 | elif change: | |
1845 | node2 = scmutil.revsingle(repo, change, None).node() |
|
1845 | node2 = scmutil.revsingle(repo, change, None).node() | |
1846 | node1 = repo[node2].p1().node() |
|
1846 | node1 = repo[node2].p1().node() | |
1847 | else: |
|
1847 | else: | |
1848 | node1, node2 = scmutil.revpair(repo, revs) |
|
1848 | node1, node2 = scmutil.revpair(repo, revs) | |
1849 |
|
1849 | |||
1850 | if reverse: |
|
1850 | if reverse: | |
1851 | node1, node2 = node2, node1 |
|
1851 | node1, node2 = node2, node1 | |
1852 |
|
1852 | |||
1853 | diffopts = patch.diffallopts(ui, opts) |
|
1853 | diffopts = patch.diffallopts(ui, opts) | |
1854 | m = scmutil.match(repo[node2], pats, opts) |
|
1854 | m = scmutil.match(repo[node2], pats, opts) | |
1855 | ui.pager('diff') |
|
1855 | ui.pager('diff') | |
1856 | cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat, |
|
1856 | cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat, | |
1857 | listsubrepos=opts.get('subrepos'), |
|
1857 | listsubrepos=opts.get('subrepos'), | |
1858 | root=opts.get('root')) |
|
1858 | root=opts.get('root')) | |
1859 |
|
1859 | |||
1860 | @command('^export', |
|
1860 | @command('^export', | |
1861 | [('o', 'output', '', |
|
1861 | [('o', 'output', '', | |
1862 | _('print output to file with formatted name'), _('FORMAT')), |
|
1862 | _('print output to file with formatted name'), _('FORMAT')), | |
1863 | ('', 'switch-parent', None, _('diff against the second parent')), |
|
1863 | ('', 'switch-parent', None, _('diff against the second parent')), | |
1864 | ('r', 'rev', [], _('revisions to export'), _('REV')), |
|
1864 | ('r', 'rev', [], _('revisions to export'), _('REV')), | |
1865 | ] + diffopts, |
|
1865 | ] + diffopts, | |
1866 | _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...')) |
|
1866 | _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...')) | |
1867 | def export(ui, repo, *changesets, **opts): |
|
1867 | def export(ui, repo, *changesets, **opts): | |
1868 | """dump the header and diffs for one or more changesets |
|
1868 | """dump the header and diffs for one or more changesets | |
1869 |
|
1869 | |||
1870 | Print the changeset header and diffs for one or more revisions. |
|
1870 | Print the changeset header and diffs for one or more revisions. | |
1871 | If no revision is given, the parent of the working directory is used. |
|
1871 | If no revision is given, the parent of the working directory is used. | |
1872 |
|
1872 | |||
1873 | The information shown in the changeset header is: author, date, |
|
1873 | The information shown in the changeset header is: author, date, | |
1874 | branch name (if non-default), changeset hash, parent(s) and commit |
|
1874 | branch name (if non-default), changeset hash, parent(s) and commit | |
1875 | comment. |
|
1875 | comment. | |
1876 |
|
1876 | |||
1877 | .. note:: |
|
1877 | .. note:: | |
1878 |
|
1878 | |||
1879 | :hg:`export` may generate unexpected diff output for merge |
|
1879 | :hg:`export` may generate unexpected diff output for merge | |
1880 | changesets, as it will compare the merge changeset against its |
|
1880 | changesets, as it will compare the merge changeset against its | |
1881 | first parent only. |
|
1881 | first parent only. | |
1882 |
|
1882 | |||
1883 | Output may be to a file, in which case the name of the file is |
|
1883 | Output may be to a file, in which case the name of the file is | |
1884 | given using a format string. The formatting rules are as follows: |
|
1884 | given using a format string. The formatting rules are as follows: | |
1885 |
|
1885 | |||
1886 | :``%%``: literal "%" character |
|
1886 | :``%%``: literal "%" character | |
1887 | :``%H``: changeset hash (40 hexadecimal digits) |
|
1887 | :``%H``: changeset hash (40 hexadecimal digits) | |
1888 | :``%N``: number of patches being generated |
|
1888 | :``%N``: number of patches being generated | |
1889 | :``%R``: changeset revision number |
|
1889 | :``%R``: changeset revision number | |
1890 | :``%b``: basename of the exporting repository |
|
1890 | :``%b``: basename of the exporting repository | |
1891 | :``%h``: short-form changeset hash (12 hexadecimal digits) |
|
1891 | :``%h``: short-form changeset hash (12 hexadecimal digits) | |
1892 | :``%m``: first line of the commit message (only alphanumeric characters) |
|
1892 | :``%m``: first line of the commit message (only alphanumeric characters) | |
1893 | :``%n``: zero-padded sequence number, starting at 1 |
|
1893 | :``%n``: zero-padded sequence number, starting at 1 | |
1894 | :``%r``: zero-padded changeset revision number |
|
1894 | :``%r``: zero-padded changeset revision number | |
1895 |
|
1895 | |||
1896 | Without the -a/--text option, export will avoid generating diffs |
|
1896 | Without the -a/--text option, export will avoid generating diffs | |
1897 | of files it detects as binary. With -a, export will generate a |
|
1897 | of files it detects as binary. With -a, export will generate a | |
1898 | diff anyway, probably with undesirable results. |
|
1898 | diff anyway, probably with undesirable results. | |
1899 |
|
1899 | |||
1900 | Use the -g/--git option to generate diffs in the git extended diff |
|
1900 | Use the -g/--git option to generate diffs in the git extended diff | |
1901 | format. See :hg:`help diffs` for more information. |
|
1901 | format. See :hg:`help diffs` for more information. | |
1902 |
|
1902 | |||
1903 | With the --switch-parent option, the diff will be against the |
|
1903 | With the --switch-parent option, the diff will be against the | |
1904 | second parent. It can be useful to review a merge. |
|
1904 | second parent. It can be useful to review a merge. | |
1905 |
|
1905 | |||
1906 | .. container:: verbose |
|
1906 | .. container:: verbose | |
1907 |
|
1907 | |||
1908 | Examples: |
|
1908 | Examples: | |
1909 |
|
1909 | |||
1910 | - use export and import to transplant a bugfix to the current |
|
1910 | - use export and import to transplant a bugfix to the current | |
1911 | branch:: |
|
1911 | branch:: | |
1912 |
|
1912 | |||
1913 | hg export -r 9353 | hg import - |
|
1913 | hg export -r 9353 | hg import - | |
1914 |
|
1914 | |||
1915 | - export all the changesets between two revisions to a file with |
|
1915 | - export all the changesets between two revisions to a file with | |
1916 | rename information:: |
|
1916 | rename information:: | |
1917 |
|
1917 | |||
1918 | hg export --git -r 123:150 > changes.txt |
|
1918 | hg export --git -r 123:150 > changes.txt | |
1919 |
|
1919 | |||
1920 | - split outgoing changes into a series of patches with |
|
1920 | - split outgoing changes into a series of patches with | |
1921 | descriptive names:: |
|
1921 | descriptive names:: | |
1922 |
|
1922 | |||
1923 | hg export -r "outgoing()" -o "%n-%m.patch" |
|
1923 | hg export -r "outgoing()" -o "%n-%m.patch" | |
1924 |
|
1924 | |||
1925 | Returns 0 on success. |
|
1925 | Returns 0 on success. | |
1926 | """ |
|
1926 | """ | |
1927 | opts = pycompat.byteskwargs(opts) |
|
1927 | opts = pycompat.byteskwargs(opts) | |
1928 | changesets += tuple(opts.get('rev', [])) |
|
1928 | changesets += tuple(opts.get('rev', [])) | |
1929 | if not changesets: |
|
1929 | if not changesets: | |
1930 | changesets = ['.'] |
|
1930 | changesets = ['.'] | |
1931 | revs = scmutil.revrange(repo, changesets) |
|
1931 | revs = scmutil.revrange(repo, changesets) | |
1932 | if not revs: |
|
1932 | if not revs: | |
1933 | raise error.Abort(_("export requires at least one changeset")) |
|
1933 | raise error.Abort(_("export requires at least one changeset")) | |
1934 | if len(revs) > 1: |
|
1934 | if len(revs) > 1: | |
1935 | ui.note(_('exporting patches:\n')) |
|
1935 | ui.note(_('exporting patches:\n')) | |
1936 | else: |
|
1936 | else: | |
1937 | ui.note(_('exporting patch:\n')) |
|
1937 | ui.note(_('exporting patch:\n')) | |
1938 | ui.pager('export') |
|
1938 | ui.pager('export') | |
1939 | cmdutil.export(repo, revs, fntemplate=opts.get('output'), |
|
1939 | cmdutil.export(repo, revs, fntemplate=opts.get('output'), | |
1940 | switch_parent=opts.get('switch_parent'), |
|
1940 | switch_parent=opts.get('switch_parent'), | |
1941 | opts=patch.diffallopts(ui, opts)) |
|
1941 | opts=patch.diffallopts(ui, opts)) | |
1942 |
|
1942 | |||
1943 | @command('files', |
|
1943 | @command('files', | |
1944 | [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')), |
|
1944 | [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')), | |
1945 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), |
|
1945 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), | |
1946 | ] + walkopts + formatteropts + subrepoopts, |
|
1946 | ] + walkopts + formatteropts + subrepoopts, | |
1947 | _('[OPTION]... [FILE]...')) |
|
1947 | _('[OPTION]... [FILE]...')) | |
1948 | def files(ui, repo, *pats, **opts): |
|
1948 | def files(ui, repo, *pats, **opts): | |
1949 | """list tracked files |
|
1949 | """list tracked files | |
1950 |
|
1950 | |||
1951 | Print files under Mercurial control in the working directory or |
|
1951 | Print files under Mercurial control in the working directory or | |
1952 | specified revision for given files (excluding removed files). |
|
1952 | specified revision for given files (excluding removed files). | |
1953 | Files can be specified as filenames or filesets. |
|
1953 | Files can be specified as filenames or filesets. | |
1954 |
|
1954 | |||
1955 | If no files are given to match, this command prints the names |
|
1955 | If no files are given to match, this command prints the names | |
1956 | of all files under Mercurial control. |
|
1956 | of all files under Mercurial control. | |
1957 |
|
1957 | |||
1958 | .. container:: verbose |
|
1958 | .. container:: verbose | |
1959 |
|
1959 | |||
1960 | Examples: |
|
1960 | Examples: | |
1961 |
|
1961 | |||
1962 | - list all files under the current directory:: |
|
1962 | - list all files under the current directory:: | |
1963 |
|
1963 | |||
1964 | hg files . |
|
1964 | hg files . | |
1965 |
|
1965 | |||
1966 | - shows sizes and flags for current revision:: |
|
1966 | - shows sizes and flags for current revision:: | |
1967 |
|
1967 | |||
1968 | hg files -vr . |
|
1968 | hg files -vr . | |
1969 |
|
1969 | |||
1970 | - list all files named README:: |
|
1970 | - list all files named README:: | |
1971 |
|
1971 | |||
1972 | hg files -I "**/README" |
|
1972 | hg files -I "**/README" | |
1973 |
|
1973 | |||
1974 | - list all binary files:: |
|
1974 | - list all binary files:: | |
1975 |
|
1975 | |||
1976 | hg files "set:binary()" |
|
1976 | hg files "set:binary()" | |
1977 |
|
1977 | |||
1978 | - find files containing a regular expression:: |
|
1978 | - find files containing a regular expression:: | |
1979 |
|
1979 | |||
1980 | hg files "set:grep('bob')" |
|
1980 | hg files "set:grep('bob')" | |
1981 |
|
1981 | |||
1982 | - search tracked file contents with xargs and grep:: |
|
1982 | - search tracked file contents with xargs and grep:: | |
1983 |
|
1983 | |||
1984 | hg files -0 | xargs -0 grep foo |
|
1984 | hg files -0 | xargs -0 grep foo | |
1985 |
|
1985 | |||
1986 | See :hg:`help patterns` and :hg:`help filesets` for more information |
|
1986 | See :hg:`help patterns` and :hg:`help filesets` for more information | |
1987 | on specifying file patterns. |
|
1987 | on specifying file patterns. | |
1988 |
|
1988 | |||
1989 | Returns 0 if a match is found, 1 otherwise. |
|
1989 | Returns 0 if a match is found, 1 otherwise. | |
1990 |
|
1990 | |||
1991 | """ |
|
1991 | """ | |
1992 |
|
1992 | |||
1993 | opts = pycompat.byteskwargs(opts) |
|
1993 | opts = pycompat.byteskwargs(opts) | |
1994 | ctx = scmutil.revsingle(repo, opts.get('rev'), None) |
|
1994 | ctx = scmutil.revsingle(repo, opts.get('rev'), None) | |
1995 |
|
1995 | |||
1996 | end = '\n' |
|
1996 | end = '\n' | |
1997 | if opts.get('print0'): |
|
1997 | if opts.get('print0'): | |
1998 | end = '\0' |
|
1998 | end = '\0' | |
1999 | fmt = '%s' + end |
|
1999 | fmt = '%s' + end | |
2000 |
|
2000 | |||
2001 | m = scmutil.match(ctx, pats, opts) |
|
2001 | m = scmutil.match(ctx, pats, opts) | |
2002 | ui.pager('files') |
|
2002 | ui.pager('files') | |
2003 | with ui.formatter('files', opts) as fm: |
|
2003 | with ui.formatter('files', opts) as fm: | |
2004 | return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos')) |
|
2004 | return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos')) | |
2005 |
|
2005 | |||
2006 | @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True) |
|
2006 | @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True) | |
2007 | def forget(ui, repo, *pats, **opts): |
|
2007 | def forget(ui, repo, *pats, **opts): | |
2008 | """forget the specified files on the next commit |
|
2008 | """forget the specified files on the next commit | |
2009 |
|
2009 | |||
2010 | Mark the specified files so they will no longer be tracked |
|
2010 | Mark the specified files so they will no longer be tracked | |
2011 | after the next commit. |
|
2011 | after the next commit. | |
2012 |
|
2012 | |||
2013 | This only removes files from the current branch, not from the |
|
2013 | This only removes files from the current branch, not from the | |
2014 | entire project history, and it does not delete them from the |
|
2014 | entire project history, and it does not delete them from the | |
2015 | working directory. |
|
2015 | working directory. | |
2016 |
|
2016 | |||
2017 | To delete the file from the working directory, see :hg:`remove`. |
|
2017 | To delete the file from the working directory, see :hg:`remove`. | |
2018 |
|
2018 | |||
2019 | To undo a forget before the next commit, see :hg:`add`. |
|
2019 | To undo a forget before the next commit, see :hg:`add`. | |
2020 |
|
2020 | |||
2021 | .. container:: verbose |
|
2021 | .. container:: verbose | |
2022 |
|
2022 | |||
2023 | Examples: |
|
2023 | Examples: | |
2024 |
|
2024 | |||
2025 | - forget newly-added binary files:: |
|
2025 | - forget newly-added binary files:: | |
2026 |
|
2026 | |||
2027 | hg forget "set:added() and binary()" |
|
2027 | hg forget "set:added() and binary()" | |
2028 |
|
2028 | |||
2029 | - forget files that would be excluded by .hgignore:: |
|
2029 | - forget files that would be excluded by .hgignore:: | |
2030 |
|
2030 | |||
2031 | hg forget "set:hgignore()" |
|
2031 | hg forget "set:hgignore()" | |
2032 |
|
2032 | |||
2033 | Returns 0 on success. |
|
2033 | Returns 0 on success. | |
2034 | """ |
|
2034 | """ | |
2035 |
|
2035 | |||
2036 | opts = pycompat.byteskwargs(opts) |
|
2036 | opts = pycompat.byteskwargs(opts) | |
2037 | if not pats: |
|
2037 | if not pats: | |
2038 | raise error.Abort(_('no files specified')) |
|
2038 | raise error.Abort(_('no files specified')) | |
2039 |
|
2039 | |||
2040 | m = scmutil.match(repo[None], pats, opts) |
|
2040 | m = scmutil.match(repo[None], pats, opts) | |
2041 | rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0] |
|
2041 | rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0] | |
2042 | return rejected and 1 or 0 |
|
2042 | return rejected and 1 or 0 | |
2043 |
|
2043 | |||
2044 | @command( |
|
2044 | @command( | |
2045 | 'graft', |
|
2045 | 'graft', | |
2046 | [('r', 'rev', [], _('revisions to graft'), _('REV')), |
|
2046 | [('r', 'rev', [], _('revisions to graft'), _('REV')), | |
2047 | ('c', 'continue', False, _('resume interrupted graft')), |
|
2047 | ('c', 'continue', False, _('resume interrupted graft')), | |
2048 | ('e', 'edit', False, _('invoke editor on commit messages')), |
|
2048 | ('e', 'edit', False, _('invoke editor on commit messages')), | |
2049 | ('', 'log', None, _('append graft info to log message')), |
|
2049 | ('', 'log', None, _('append graft info to log message')), | |
2050 | ('f', 'force', False, _('force graft')), |
|
2050 | ('f', 'force', False, _('force graft')), | |
2051 | ('D', 'currentdate', False, |
|
2051 | ('D', 'currentdate', False, | |
2052 | _('record the current date as commit date')), |
|
2052 | _('record the current date as commit date')), | |
2053 | ('U', 'currentuser', False, |
|
2053 | ('U', 'currentuser', False, | |
2054 | _('record the current user as committer'), _('DATE'))] |
|
2054 | _('record the current user as committer'), _('DATE'))] | |
2055 | + commitopts2 + mergetoolopts + dryrunopts, |
|
2055 | + commitopts2 + mergetoolopts + dryrunopts, | |
2056 | _('[OPTION]... [-r REV]... REV...')) |
|
2056 | _('[OPTION]... [-r REV]... REV...')) | |
2057 | def graft(ui, repo, *revs, **opts): |
|
2057 | def graft(ui, repo, *revs, **opts): | |
2058 | '''copy changes from other branches onto the current branch |
|
2058 | '''copy changes from other branches onto the current branch | |
2059 |
|
2059 | |||
2060 | This command uses Mercurial's merge logic to copy individual |
|
2060 | This command uses Mercurial's merge logic to copy individual | |
2061 | changes from other branches without merging branches in the |
|
2061 | changes from other branches without merging branches in the | |
2062 | history graph. This is sometimes known as 'backporting' or |
|
2062 | history graph. This is sometimes known as 'backporting' or | |
2063 | 'cherry-picking'. By default, graft will copy user, date, and |
|
2063 | 'cherry-picking'. By default, graft will copy user, date, and | |
2064 | description from the source changesets. |
|
2064 | description from the source changesets. | |
2065 |
|
2065 | |||
2066 | Changesets that are ancestors of the current revision, that have |
|
2066 | Changesets that are ancestors of the current revision, that have | |
2067 | already been grafted, or that are merges will be skipped. |
|
2067 | already been grafted, or that are merges will be skipped. | |
2068 |
|
2068 | |||
2069 | If --log is specified, log messages will have a comment appended |
|
2069 | If --log is specified, log messages will have a comment appended | |
2070 | of the form:: |
|
2070 | of the form:: | |
2071 |
|
2071 | |||
2072 | (grafted from CHANGESETHASH) |
|
2072 | (grafted from CHANGESETHASH) | |
2073 |
|
2073 | |||
2074 | If --force is specified, revisions will be grafted even if they |
|
2074 | If --force is specified, revisions will be grafted even if they | |
2075 | are already ancestors of, or have been grafted to, the destination. |
|
2075 | are already ancestors of, or have been grafted to, the destination. | |
2076 | This is useful when the revisions have since been backed out. |
|
2076 | This is useful when the revisions have since been backed out. | |
2077 |
|
2077 | |||
2078 | If a graft merge results in conflicts, the graft process is |
|
2078 | If a graft merge results in conflicts, the graft process is | |
2079 | interrupted so that the current merge can be manually resolved. |
|
2079 | interrupted so that the current merge can be manually resolved. | |
2080 | Once all conflicts are addressed, the graft process can be |
|
2080 | Once all conflicts are addressed, the graft process can be | |
2081 | continued with the -c/--continue option. |
|
2081 | continued with the -c/--continue option. | |
2082 |
|
2082 | |||
2083 | .. note:: |
|
2083 | .. note:: | |
2084 |
|
2084 | |||
2085 | The -c/--continue option does not reapply earlier options, except |
|
2085 | The -c/--continue option does not reapply earlier options, except | |
2086 | for --force. |
|
2086 | for --force. | |
2087 |
|
2087 | |||
2088 | .. container:: verbose |
|
2088 | .. container:: verbose | |
2089 |
|
2089 | |||
2090 | Examples: |
|
2090 | Examples: | |
2091 |
|
2091 | |||
2092 | - copy a single change to the stable branch and edit its description:: |
|
2092 | - copy a single change to the stable branch and edit its description:: | |
2093 |
|
2093 | |||
2094 | hg update stable |
|
2094 | hg update stable | |
2095 | hg graft --edit 9393 |
|
2095 | hg graft --edit 9393 | |
2096 |
|
2096 | |||
2097 | - graft a range of changesets with one exception, updating dates:: |
|
2097 | - graft a range of changesets with one exception, updating dates:: | |
2098 |
|
2098 | |||
2099 | hg graft -D "2085::2093 and not 2091" |
|
2099 | hg graft -D "2085::2093 and not 2091" | |
2100 |
|
2100 | |||
2101 | - continue a graft after resolving conflicts:: |
|
2101 | - continue a graft after resolving conflicts:: | |
2102 |
|
2102 | |||
2103 | hg graft -c |
|
2103 | hg graft -c | |
2104 |
|
2104 | |||
2105 | - show the source of a grafted changeset:: |
|
2105 | - show the source of a grafted changeset:: | |
2106 |
|
2106 | |||
2107 | hg log --debug -r . |
|
2107 | hg log --debug -r . | |
2108 |
|
2108 | |||
2109 | - show revisions sorted by date:: |
|
2109 | - show revisions sorted by date:: | |
2110 |
|
2110 | |||
2111 | hg log -r "sort(all(), date)" |
|
2111 | hg log -r "sort(all(), date)" | |
2112 |
|
2112 | |||
2113 | See :hg:`help revisions` for more about specifying revisions. |
|
2113 | See :hg:`help revisions` for more about specifying revisions. | |
2114 |
|
2114 | |||
2115 | Returns 0 on successful completion. |
|
2115 | Returns 0 on successful completion. | |
2116 | ''' |
|
2116 | ''' | |
2117 | with repo.wlock(): |
|
2117 | with repo.wlock(): | |
2118 | return _dograft(ui, repo, *revs, **opts) |
|
2118 | return _dograft(ui, repo, *revs, **opts) | |
2119 |
|
2119 | |||
2120 | def _dograft(ui, repo, *revs, **opts): |
|
2120 | def _dograft(ui, repo, *revs, **opts): | |
2121 | opts = pycompat.byteskwargs(opts) |
|
2121 | opts = pycompat.byteskwargs(opts) | |
2122 | if revs and opts.get('rev'): |
|
2122 | if revs and opts.get('rev'): | |
2123 | ui.warn(_('warning: inconsistent use of --rev might give unexpected ' |
|
2123 | ui.warn(_('warning: inconsistent use of --rev might give unexpected ' | |
2124 | 'revision ordering!\n')) |
|
2124 | 'revision ordering!\n')) | |
2125 |
|
2125 | |||
2126 | revs = list(revs) |
|
2126 | revs = list(revs) | |
2127 | revs.extend(opts.get('rev')) |
|
2127 | revs.extend(opts.get('rev')) | |
2128 |
|
2128 | |||
2129 | if not opts.get('user') and opts.get('currentuser'): |
|
2129 | if not opts.get('user') and opts.get('currentuser'): | |
2130 | opts['user'] = ui.username() |
|
2130 | opts['user'] = ui.username() | |
2131 | if not opts.get('date') and opts.get('currentdate'): |
|
2131 | if not opts.get('date') and opts.get('currentdate'): | |
2132 | opts['date'] = "%d %d" % util.makedate() |
|
2132 | opts['date'] = "%d %d" % util.makedate() | |
2133 |
|
2133 | |||
2134 | editor = cmdutil.getcommiteditor(editform='graft', |
|
2134 | editor = cmdutil.getcommiteditor(editform='graft', | |
2135 | **pycompat.strkwargs(opts)) |
|
2135 | **pycompat.strkwargs(opts)) | |
2136 |
|
2136 | |||
2137 | cont = False |
|
2137 | cont = False | |
2138 | if opts.get('continue'): |
|
2138 | if opts.get('continue'): | |
2139 | cont = True |
|
2139 | cont = True | |
2140 | if revs: |
|
2140 | if revs: | |
2141 | raise error.Abort(_("can't specify --continue and revisions")) |
|
2141 | raise error.Abort(_("can't specify --continue and revisions")) | |
2142 | # read in unfinished revisions |
|
2142 | # read in unfinished revisions | |
2143 | try: |
|
2143 | try: | |
2144 | nodes = repo.vfs.read('graftstate').splitlines() |
|
2144 | nodes = repo.vfs.read('graftstate').splitlines() | |
2145 | revs = [repo[node].rev() for node in nodes] |
|
2145 | revs = [repo[node].rev() for node in nodes] | |
2146 | except IOError as inst: |
|
2146 | except IOError as inst: | |
2147 | if inst.errno != errno.ENOENT: |
|
2147 | if inst.errno != errno.ENOENT: | |
2148 | raise |
|
2148 | raise | |
2149 | cmdutil.wrongtooltocontinue(repo, _('graft')) |
|
2149 | cmdutil.wrongtooltocontinue(repo, _('graft')) | |
2150 | else: |
|
2150 | else: | |
2151 | cmdutil.checkunfinished(repo) |
|
2151 | cmdutil.checkunfinished(repo) | |
2152 | cmdutil.bailifchanged(repo) |
|
2152 | cmdutil.bailifchanged(repo) | |
2153 | if not revs: |
|
2153 | if not revs: | |
2154 | raise error.Abort(_('no revisions specified')) |
|
2154 | raise error.Abort(_('no revisions specified')) | |
2155 | revs = scmutil.revrange(repo, revs) |
|
2155 | revs = scmutil.revrange(repo, revs) | |
2156 |
|
2156 | |||
2157 | skipped = set() |
|
2157 | skipped = set() | |
2158 | # check for merges |
|
2158 | # check for merges | |
2159 | for rev in repo.revs('%ld and merge()', revs): |
|
2159 | for rev in repo.revs('%ld and merge()', revs): | |
2160 | ui.warn(_('skipping ungraftable merge revision %d\n') % rev) |
|
2160 | ui.warn(_('skipping ungraftable merge revision %d\n') % rev) | |
2161 | skipped.add(rev) |
|
2161 | skipped.add(rev) | |
2162 | revs = [r for r in revs if r not in skipped] |
|
2162 | revs = [r for r in revs if r not in skipped] | |
2163 | if not revs: |
|
2163 | if not revs: | |
2164 | return -1 |
|
2164 | return -1 | |
2165 |
|
2165 | |||
2166 | # Don't check in the --continue case, in effect retaining --force across |
|
2166 | # Don't check in the --continue case, in effect retaining --force across | |
2167 | # --continues. That's because without --force, any revisions we decided to |
|
2167 | # --continues. That's because without --force, any revisions we decided to | |
2168 | # skip would have been filtered out here, so they wouldn't have made their |
|
2168 | # skip would have been filtered out here, so they wouldn't have made their | |
2169 | # way to the graftstate. With --force, any revisions we would have otherwise |
|
2169 | # way to the graftstate. With --force, any revisions we would have otherwise | |
2170 | # skipped would not have been filtered out, and if they hadn't been applied |
|
2170 | # skipped would not have been filtered out, and if they hadn't been applied | |
2171 | # already, they'd have been in the graftstate. |
|
2171 | # already, they'd have been in the graftstate. | |
2172 | if not (cont or opts.get('force')): |
|
2172 | if not (cont or opts.get('force')): | |
2173 | # check for ancestors of dest branch |
|
2173 | # check for ancestors of dest branch | |
2174 | crev = repo['.'].rev() |
|
2174 | crev = repo['.'].rev() | |
2175 | ancestors = repo.changelog.ancestors([crev], inclusive=True) |
|
2175 | ancestors = repo.changelog.ancestors([crev], inclusive=True) | |
2176 | # XXX make this lazy in the future |
|
2176 | # XXX make this lazy in the future | |
2177 | # don't mutate while iterating, create a copy |
|
2177 | # don't mutate while iterating, create a copy | |
2178 | for rev in list(revs): |
|
2178 | for rev in list(revs): | |
2179 | if rev in ancestors: |
|
2179 | if rev in ancestors: | |
2180 | ui.warn(_('skipping ancestor revision %d:%s\n') % |
|
2180 | ui.warn(_('skipping ancestor revision %d:%s\n') % | |
2181 | (rev, repo[rev])) |
|
2181 | (rev, repo[rev])) | |
2182 | # XXX remove on list is slow |
|
2182 | # XXX remove on list is slow | |
2183 | revs.remove(rev) |
|
2183 | revs.remove(rev) | |
2184 | if not revs: |
|
2184 | if not revs: | |
2185 | return -1 |
|
2185 | return -1 | |
2186 |
|
2186 | |||
2187 | # analyze revs for earlier grafts |
|
2187 | # analyze revs for earlier grafts | |
2188 | ids = {} |
|
2188 | ids = {} | |
2189 | for ctx in repo.set("%ld", revs): |
|
2189 | for ctx in repo.set("%ld", revs): | |
2190 | ids[ctx.hex()] = ctx.rev() |
|
2190 | ids[ctx.hex()] = ctx.rev() | |
2191 | n = ctx.extra().get('source') |
|
2191 | n = ctx.extra().get('source') | |
2192 | if n: |
|
2192 | if n: | |
2193 | ids[n] = ctx.rev() |
|
2193 | ids[n] = ctx.rev() | |
2194 |
|
2194 | |||
2195 | # check ancestors for earlier grafts |
|
2195 | # check ancestors for earlier grafts | |
2196 | ui.debug('scanning for duplicate grafts\n') |
|
2196 | ui.debug('scanning for duplicate grafts\n') | |
2197 |
|
2197 | |||
2198 | # The only changesets we can be sure doesn't contain grafts of any |
|
2198 | # The only changesets we can be sure doesn't contain grafts of any | |
2199 | # revs, are the ones that are common ancestors of *all* revs: |
|
2199 | # revs, are the ones that are common ancestors of *all* revs: | |
2200 | for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs): |
|
2200 | for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs): | |
2201 | ctx = repo[rev] |
|
2201 | ctx = repo[rev] | |
2202 | n = ctx.extra().get('source') |
|
2202 | n = ctx.extra().get('source') | |
2203 | if n in ids: |
|
2203 | if n in ids: | |
2204 | try: |
|
2204 | try: | |
2205 | r = repo[n].rev() |
|
2205 | r = repo[n].rev() | |
2206 | except error.RepoLookupError: |
|
2206 | except error.RepoLookupError: | |
2207 | r = None |
|
2207 | r = None | |
2208 | if r in revs: |
|
2208 | if r in revs: | |
2209 | ui.warn(_('skipping revision %d:%s ' |
|
2209 | ui.warn(_('skipping revision %d:%s ' | |
2210 | '(already grafted to %d:%s)\n') |
|
2210 | '(already grafted to %d:%s)\n') | |
2211 | % (r, repo[r], rev, ctx)) |
|
2211 | % (r, repo[r], rev, ctx)) | |
2212 | revs.remove(r) |
|
2212 | revs.remove(r) | |
2213 | elif ids[n] in revs: |
|
2213 | elif ids[n] in revs: | |
2214 | if r is None: |
|
2214 | if r is None: | |
2215 | ui.warn(_('skipping already grafted revision %d:%s ' |
|
2215 | ui.warn(_('skipping already grafted revision %d:%s ' | |
2216 | '(%d:%s also has unknown origin %s)\n') |
|
2216 | '(%d:%s also has unknown origin %s)\n') | |
2217 | % (ids[n], repo[ids[n]], rev, ctx, n[:12])) |
|
2217 | % (ids[n], repo[ids[n]], rev, ctx, n[:12])) | |
2218 | else: |
|
2218 | else: | |
2219 | ui.warn(_('skipping already grafted revision %d:%s ' |
|
2219 | ui.warn(_('skipping already grafted revision %d:%s ' | |
2220 | '(%d:%s also has origin %d:%s)\n') |
|
2220 | '(%d:%s also has origin %d:%s)\n') | |
2221 | % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])) |
|
2221 | % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])) | |
2222 | revs.remove(ids[n]) |
|
2222 | revs.remove(ids[n]) | |
2223 | elif ctx.hex() in ids: |
|
2223 | elif ctx.hex() in ids: | |
2224 | r = ids[ctx.hex()] |
|
2224 | r = ids[ctx.hex()] | |
2225 | ui.warn(_('skipping already grafted revision %d:%s ' |
|
2225 | ui.warn(_('skipping already grafted revision %d:%s ' | |
2226 | '(was grafted from %d:%s)\n') % |
|
2226 | '(was grafted from %d:%s)\n') % | |
2227 | (r, repo[r], rev, ctx)) |
|
2227 | (r, repo[r], rev, ctx)) | |
2228 | revs.remove(r) |
|
2228 | revs.remove(r) | |
2229 | if not revs: |
|
2229 | if not revs: | |
2230 | return -1 |
|
2230 | return -1 | |
2231 |
|
2231 | |||
2232 | for pos, ctx in enumerate(repo.set("%ld", revs)): |
|
2232 | for pos, ctx in enumerate(repo.set("%ld", revs)): | |
2233 | desc = '%d:%s "%s"' % (ctx.rev(), ctx, |
|
2233 | desc = '%d:%s "%s"' % (ctx.rev(), ctx, | |
2234 | ctx.description().split('\n', 1)[0]) |
|
2234 | ctx.description().split('\n', 1)[0]) | |
2235 | names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node()) |
|
2235 | names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node()) | |
2236 | if names: |
|
2236 | if names: | |
2237 | desc += ' (%s)' % ' '.join(names) |
|
2237 | desc += ' (%s)' % ' '.join(names) | |
2238 | ui.status(_('grafting %s\n') % desc) |
|
2238 | ui.status(_('grafting %s\n') % desc) | |
2239 | if opts.get('dry_run'): |
|
2239 | if opts.get('dry_run'): | |
2240 | continue |
|
2240 | continue | |
2241 |
|
2241 | |||
2242 | source = ctx.extra().get('source') |
|
2242 | source = ctx.extra().get('source') | |
2243 | extra = {} |
|
2243 | extra = {} | |
2244 | if source: |
|
2244 | if source: | |
2245 | extra['source'] = source |
|
2245 | extra['source'] = source | |
2246 | extra['intermediate-source'] = ctx.hex() |
|
2246 | extra['intermediate-source'] = ctx.hex() | |
2247 | else: |
|
2247 | else: | |
2248 | extra['source'] = ctx.hex() |
|
2248 | extra['source'] = ctx.hex() | |
2249 | user = ctx.user() |
|
2249 | user = ctx.user() | |
2250 | if opts.get('user'): |
|
2250 | if opts.get('user'): | |
2251 | user = opts['user'] |
|
2251 | user = opts['user'] | |
2252 | date = ctx.date() |
|
2252 | date = ctx.date() | |
2253 | if opts.get('date'): |
|
2253 | if opts.get('date'): | |
2254 | date = opts['date'] |
|
2254 | date = opts['date'] | |
2255 | message = ctx.description() |
|
2255 | message = ctx.description() | |
2256 | if opts.get('log'): |
|
2256 | if opts.get('log'): | |
2257 | message += '\n(grafted from %s)' % ctx.hex() |
|
2257 | message += '\n(grafted from %s)' % ctx.hex() | |
2258 |
|
2258 | |||
2259 | # we don't merge the first commit when continuing |
|
2259 | # we don't merge the first commit when continuing | |
2260 | if not cont: |
|
2260 | if not cont: | |
2261 | # perform the graft merge with p1(rev) as 'ancestor' |
|
2261 | # perform the graft merge with p1(rev) as 'ancestor' | |
2262 | try: |
|
2262 | try: | |
2263 | # ui.forcemerge is an internal variable, do not document |
|
2263 | # ui.forcemerge is an internal variable, do not document | |
2264 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
2264 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | |
2265 | 'graft') |
|
2265 | 'graft') | |
2266 | stats = mergemod.graft(repo, ctx, ctx.p1(), |
|
2266 | stats = mergemod.graft(repo, ctx, ctx.p1(), | |
2267 | ['local', 'graft']) |
|
2267 | ['local', 'graft']) | |
2268 | finally: |
|
2268 | finally: | |
2269 | repo.ui.setconfig('ui', 'forcemerge', '', 'graft') |
|
2269 | repo.ui.setconfig('ui', 'forcemerge', '', 'graft') | |
2270 | # report any conflicts |
|
2270 | # report any conflicts | |
2271 | if stats and stats[3] > 0: |
|
2271 | if stats and stats[3] > 0: | |
2272 | # write out state for --continue |
|
2272 | # write out state for --continue | |
2273 | nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] |
|
2273 | nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] | |
2274 | repo.vfs.write('graftstate', ''.join(nodelines)) |
|
2274 | repo.vfs.write('graftstate', ''.join(nodelines)) | |
2275 | extra = '' |
|
2275 | extra = '' | |
2276 | if opts.get('user'): |
|
2276 | if opts.get('user'): | |
2277 | extra += ' --user %s' % util.shellquote(opts['user']) |
|
2277 | extra += ' --user %s' % util.shellquote(opts['user']) | |
2278 | if opts.get('date'): |
|
2278 | if opts.get('date'): | |
2279 | extra += ' --date %s' % util.shellquote(opts['date']) |
|
2279 | extra += ' --date %s' % util.shellquote(opts['date']) | |
2280 | if opts.get('log'): |
|
2280 | if opts.get('log'): | |
2281 | extra += ' --log' |
|
2281 | extra += ' --log' | |
2282 | hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra |
|
2282 | hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra | |
2283 | raise error.Abort( |
|
2283 | raise error.Abort( | |
2284 | _("unresolved conflicts, can't continue"), |
|
2284 | _("unresolved conflicts, can't continue"), | |
2285 | hint=hint) |
|
2285 | hint=hint) | |
2286 | else: |
|
2286 | else: | |
2287 | cont = False |
|
2287 | cont = False | |
2288 |
|
2288 | |||
2289 | # commit |
|
2289 | # commit | |
2290 | node = repo.commit(text=message, user=user, |
|
2290 | node = repo.commit(text=message, user=user, | |
2291 | date=date, extra=extra, editor=editor) |
|
2291 | date=date, extra=extra, editor=editor) | |
2292 | if node is None: |
|
2292 | if node is None: | |
2293 | ui.warn( |
|
2293 | ui.warn( | |
2294 | _('note: graft of %d:%s created no changes to commit\n') % |
|
2294 | _('note: graft of %d:%s created no changes to commit\n') % | |
2295 | (ctx.rev(), ctx)) |
|
2295 | (ctx.rev(), ctx)) | |
2296 |
|
2296 | |||
2297 | # remove state when we complete successfully |
|
2297 | # remove state when we complete successfully | |
2298 | if not opts.get('dry_run'): |
|
2298 | if not opts.get('dry_run'): | |
2299 | repo.vfs.unlinkpath('graftstate', ignoremissing=True) |
|
2299 | repo.vfs.unlinkpath('graftstate', ignoremissing=True) | |
2300 |
|
2300 | |||
2301 | return 0 |
|
2301 | return 0 | |
2302 |
|
2302 | |||
2303 | @command('grep', |
|
2303 | @command('grep', | |
2304 | [('0', 'print0', None, _('end fields with NUL')), |
|
2304 | [('0', 'print0', None, _('end fields with NUL')), | |
2305 | ('', 'all', None, _('print all revisions that match')), |
|
2305 | ('', 'all', None, _('print all revisions that match')), | |
2306 | ('a', 'text', None, _('treat all files as text')), |
|
2306 | ('a', 'text', None, _('treat all files as text')), | |
2307 | ('f', 'follow', None, |
|
2307 | ('f', 'follow', None, | |
2308 | _('follow changeset history,' |
|
2308 | _('follow changeset history,' | |
2309 | ' or file history across copies and renames')), |
|
2309 | ' or file history across copies and renames')), | |
2310 | ('i', 'ignore-case', None, _('ignore case when matching')), |
|
2310 | ('i', 'ignore-case', None, _('ignore case when matching')), | |
2311 | ('l', 'files-with-matches', None, |
|
2311 | ('l', 'files-with-matches', None, | |
2312 | _('print only filenames and revisions that match')), |
|
2312 | _('print only filenames and revisions that match')), | |
2313 | ('n', 'line-number', None, _('print matching line numbers')), |
|
2313 | ('n', 'line-number', None, _('print matching line numbers')), | |
2314 | ('r', 'rev', [], |
|
2314 | ('r', 'rev', [], | |
2315 | _('only search files changed within revision range'), _('REV')), |
|
2315 | _('only search files changed within revision range'), _('REV')), | |
2316 | ('u', 'user', None, _('list the author (long with -v)')), |
|
2316 | ('u', 'user', None, _('list the author (long with -v)')), | |
2317 | ('d', 'date', None, _('list the date (short with -q)')), |
|
2317 | ('d', 'date', None, _('list the date (short with -q)')), | |
2318 | ] + formatteropts + walkopts, |
|
2318 | ] + formatteropts + walkopts, | |
2319 | _('[OPTION]... PATTERN [FILE]...'), |
|
2319 | _('[OPTION]... PATTERN [FILE]...'), | |
2320 | inferrepo=True) |
|
2320 | inferrepo=True) | |
2321 | def grep(ui, repo, pattern, *pats, **opts): |
|
2321 | def grep(ui, repo, pattern, *pats, **opts): | |
2322 | """search revision history for a pattern in specified files |
|
2322 | """search revision history for a pattern in specified files | |
2323 |
|
2323 | |||
2324 | Search revision history for a regular expression in the specified |
|
2324 | Search revision history for a regular expression in the specified | |
2325 | files or the entire project. |
|
2325 | files or the entire project. | |
2326 |
|
2326 | |||
2327 | By default, grep prints the most recent revision number for each |
|
2327 | By default, grep prints the most recent revision number for each | |
2328 | file in which it finds a match. To get it to print every revision |
|
2328 | file in which it finds a match. To get it to print every revision | |
2329 | that contains a change in match status ("-" for a match that becomes |
|
2329 | that contains a change in match status ("-" for a match that becomes | |
2330 | a non-match, or "+" for a non-match that becomes a match), use the |
|
2330 | a non-match, or "+" for a non-match that becomes a match), use the | |
2331 | --all flag. |
|
2331 | --all flag. | |
2332 |
|
2332 | |||
2333 | PATTERN can be any Python (roughly Perl-compatible) regular |
|
2333 | PATTERN can be any Python (roughly Perl-compatible) regular | |
2334 | expression. |
|
2334 | expression. | |
2335 |
|
2335 | |||
2336 | If no FILEs are specified (and -f/--follow isn't set), all files in |
|
2336 | If no FILEs are specified (and -f/--follow isn't set), all files in | |
2337 | the repository are searched, including those that don't exist in the |
|
2337 | the repository are searched, including those that don't exist in the | |
2338 | current branch or have been deleted in a prior changeset. |
|
2338 | current branch or have been deleted in a prior changeset. | |
2339 |
|
2339 | |||
2340 | Returns 0 if a match is found, 1 otherwise. |
|
2340 | Returns 0 if a match is found, 1 otherwise. | |
2341 | """ |
|
2341 | """ | |
2342 | opts = pycompat.byteskwargs(opts) |
|
2342 | opts = pycompat.byteskwargs(opts) | |
2343 | reflags = re.M |
|
2343 | reflags = re.M | |
2344 | if opts.get('ignore_case'): |
|
2344 | if opts.get('ignore_case'): | |
2345 | reflags |= re.I |
|
2345 | reflags |= re.I | |
2346 | try: |
|
2346 | try: | |
2347 | regexp = util.re.compile(pattern, reflags) |
|
2347 | regexp = util.re.compile(pattern, reflags) | |
2348 | except re.error as inst: |
|
2348 | except re.error as inst: | |
2349 | ui.warn(_("grep: invalid match pattern: %s\n") % inst) |
|
2349 | ui.warn(_("grep: invalid match pattern: %s\n") % inst) | |
2350 | return 1 |
|
2350 | return 1 | |
2351 | sep, eol = ':', '\n' |
|
2351 | sep, eol = ':', '\n' | |
2352 | if opts.get('print0'): |
|
2352 | if opts.get('print0'): | |
2353 | sep = eol = '\0' |
|
2353 | sep = eol = '\0' | |
2354 |
|
2354 | |||
2355 | getfile = util.lrucachefunc(repo.file) |
|
2355 | getfile = util.lrucachefunc(repo.file) | |
2356 |
|
2356 | |||
2357 | def matchlines(body): |
|
2357 | def matchlines(body): | |
2358 | begin = 0 |
|
2358 | begin = 0 | |
2359 | linenum = 0 |
|
2359 | linenum = 0 | |
2360 | while begin < len(body): |
|
2360 | while begin < len(body): | |
2361 | match = regexp.search(body, begin) |
|
2361 | match = regexp.search(body, begin) | |
2362 | if not match: |
|
2362 | if not match: | |
2363 | break |
|
2363 | break | |
2364 | mstart, mend = match.span() |
|
2364 | mstart, mend = match.span() | |
2365 | linenum += body.count('\n', begin, mstart) + 1 |
|
2365 | linenum += body.count('\n', begin, mstart) + 1 | |
2366 | lstart = body.rfind('\n', begin, mstart) + 1 or begin |
|
2366 | lstart = body.rfind('\n', begin, mstart) + 1 or begin | |
2367 | begin = body.find('\n', mend) + 1 or len(body) + 1 |
|
2367 | begin = body.find('\n', mend) + 1 or len(body) + 1 | |
2368 | lend = begin - 1 |
|
2368 | lend = begin - 1 | |
2369 | yield linenum, mstart - lstart, mend - lstart, body[lstart:lend] |
|
2369 | yield linenum, mstart - lstart, mend - lstart, body[lstart:lend] | |
2370 |
|
2370 | |||
2371 | class linestate(object): |
|
2371 | class linestate(object): | |
2372 | def __init__(self, line, linenum, colstart, colend): |
|
2372 | def __init__(self, line, linenum, colstart, colend): | |
2373 | self.line = line |
|
2373 | self.line = line | |
2374 | self.linenum = linenum |
|
2374 | self.linenum = linenum | |
2375 | self.colstart = colstart |
|
2375 | self.colstart = colstart | |
2376 | self.colend = colend |
|
2376 | self.colend = colend | |
2377 |
|
2377 | |||
2378 | def __hash__(self): |
|
2378 | def __hash__(self): | |
2379 | return hash((self.linenum, self.line)) |
|
2379 | return hash((self.linenum, self.line)) | |
2380 |
|
2380 | |||
2381 | def __eq__(self, other): |
|
2381 | def __eq__(self, other): | |
2382 | return self.line == other.line |
|
2382 | return self.line == other.line | |
2383 |
|
2383 | |||
2384 | def findpos(self): |
|
2384 | def findpos(self): | |
2385 | """Iterate all (start, end) indices of matches""" |
|
2385 | """Iterate all (start, end) indices of matches""" | |
2386 | yield self.colstart, self.colend |
|
2386 | yield self.colstart, self.colend | |
2387 | p = self.colend |
|
2387 | p = self.colend | |
2388 | while p < len(self.line): |
|
2388 | while p < len(self.line): | |
2389 | m = regexp.search(self.line, p) |
|
2389 | m = regexp.search(self.line, p) | |
2390 | if not m: |
|
2390 | if not m: | |
2391 | break |
|
2391 | break | |
2392 | yield m.span() |
|
2392 | yield m.span() | |
2393 | p = m.end() |
|
2393 | p = m.end() | |
2394 |
|
2394 | |||
2395 | matches = {} |
|
2395 | matches = {} | |
2396 | copies = {} |
|
2396 | copies = {} | |
2397 | def grepbody(fn, rev, body): |
|
2397 | def grepbody(fn, rev, body): | |
2398 | matches[rev].setdefault(fn, []) |
|
2398 | matches[rev].setdefault(fn, []) | |
2399 | m = matches[rev][fn] |
|
2399 | m = matches[rev][fn] | |
2400 | for lnum, cstart, cend, line in matchlines(body): |
|
2400 | for lnum, cstart, cend, line in matchlines(body): | |
2401 | s = linestate(line, lnum, cstart, cend) |
|
2401 | s = linestate(line, lnum, cstart, cend) | |
2402 | m.append(s) |
|
2402 | m.append(s) | |
2403 |
|
2403 | |||
2404 | def difflinestates(a, b): |
|
2404 | def difflinestates(a, b): | |
2405 | sm = difflib.SequenceMatcher(None, a, b) |
|
2405 | sm = difflib.SequenceMatcher(None, a, b) | |
2406 | for tag, alo, ahi, blo, bhi in sm.get_opcodes(): |
|
2406 | for tag, alo, ahi, blo, bhi in sm.get_opcodes(): | |
2407 | if tag == 'insert': |
|
2407 | if tag == 'insert': | |
2408 | for i in xrange(blo, bhi): |
|
2408 | for i in xrange(blo, bhi): | |
2409 | yield ('+', b[i]) |
|
2409 | yield ('+', b[i]) | |
2410 | elif tag == 'delete': |
|
2410 | elif tag == 'delete': | |
2411 | for i in xrange(alo, ahi): |
|
2411 | for i in xrange(alo, ahi): | |
2412 | yield ('-', a[i]) |
|
2412 | yield ('-', a[i]) | |
2413 | elif tag == 'replace': |
|
2413 | elif tag == 'replace': | |
2414 | for i in xrange(alo, ahi): |
|
2414 | for i in xrange(alo, ahi): | |
2415 | yield ('-', a[i]) |
|
2415 | yield ('-', a[i]) | |
2416 | for i in xrange(blo, bhi): |
|
2416 | for i in xrange(blo, bhi): | |
2417 | yield ('+', b[i]) |
|
2417 | yield ('+', b[i]) | |
2418 |
|
2418 | |||
2419 | def display(fm, fn, ctx, pstates, states): |
|
2419 | def display(fm, fn, ctx, pstates, states): | |
2420 | rev = ctx.rev() |
|
2420 | rev = ctx.rev() | |
2421 | if fm.isplain(): |
|
2421 | if fm.isplain(): | |
2422 | formatuser = ui.shortuser |
|
2422 | formatuser = ui.shortuser | |
2423 | else: |
|
2423 | else: | |
2424 | formatuser = str |
|
2424 | formatuser = str | |
2425 | if ui.quiet: |
|
2425 | if ui.quiet: | |
2426 | datefmt = '%Y-%m-%d' |
|
2426 | datefmt = '%Y-%m-%d' | |
2427 | else: |
|
2427 | else: | |
2428 | datefmt = '%a %b %d %H:%M:%S %Y %1%2' |
|
2428 | datefmt = '%a %b %d %H:%M:%S %Y %1%2' | |
2429 | found = False |
|
2429 | found = False | |
2430 | @util.cachefunc |
|
2430 | @util.cachefunc | |
2431 | def binary(): |
|
2431 | def binary(): | |
2432 | flog = getfile(fn) |
|
2432 | flog = getfile(fn) | |
2433 | return util.binary(flog.read(ctx.filenode(fn))) |
|
2433 | return util.binary(flog.read(ctx.filenode(fn))) | |
2434 |
|
2434 | |||
2435 | fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'} |
|
2435 | fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'} | |
2436 | if opts.get('all'): |
|
2436 | if opts.get('all'): | |
2437 | iter = difflinestates(pstates, states) |
|
2437 | iter = difflinestates(pstates, states) | |
2438 | else: |
|
2438 | else: | |
2439 | iter = [('', l) for l in states] |
|
2439 | iter = [('', l) for l in states] | |
2440 | for change, l in iter: |
|
2440 | for change, l in iter: | |
2441 | fm.startitem() |
|
2441 | fm.startitem() | |
2442 | fm.data(node=fm.hexfunc(ctx.node())) |
|
2442 | fm.data(node=fm.hexfunc(ctx.node())) | |
2443 | cols = [ |
|
2443 | cols = [ | |
2444 | ('filename', fn, True), |
|
2444 | ('filename', fn, True), | |
2445 | ('rev', rev, True), |
|
2445 | ('rev', rev, True), | |
2446 | ('linenumber', l.linenum, opts.get('line_number')), |
|
2446 | ('linenumber', l.linenum, opts.get('line_number')), | |
2447 | ] |
|
2447 | ] | |
2448 | if opts.get('all'): |
|
2448 | if opts.get('all'): | |
2449 | cols.append(('change', change, True)) |
|
2449 | cols.append(('change', change, True)) | |
2450 | cols.extend([ |
|
2450 | cols.extend([ | |
2451 | ('user', formatuser(ctx.user()), opts.get('user')), |
|
2451 | ('user', formatuser(ctx.user()), opts.get('user')), | |
2452 | ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')), |
|
2452 | ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')), | |
2453 | ]) |
|
2453 | ]) | |
2454 | lastcol = next(name for name, data, cond in reversed(cols) if cond) |
|
2454 | lastcol = next(name for name, data, cond in reversed(cols) if cond) | |
2455 | for name, data, cond in cols: |
|
2455 | for name, data, cond in cols: | |
2456 | field = fieldnamemap.get(name, name) |
|
2456 | field = fieldnamemap.get(name, name) | |
2457 | fm.condwrite(cond, field, '%s', data, label='grep.%s' % name) |
|
2457 | fm.condwrite(cond, field, '%s', data, label='grep.%s' % name) | |
2458 | if cond and name != lastcol: |
|
2458 | if cond and name != lastcol: | |
2459 | fm.plain(sep, label='grep.sep') |
|
2459 | fm.plain(sep, label='grep.sep') | |
2460 | if not opts.get('files_with_matches'): |
|
2460 | if not opts.get('files_with_matches'): | |
2461 | fm.plain(sep, label='grep.sep') |
|
2461 | fm.plain(sep, label='grep.sep') | |
2462 | if not opts.get('text') and binary(): |
|
2462 | if not opts.get('text') and binary(): | |
2463 | fm.plain(_(" Binary file matches")) |
|
2463 | fm.plain(_(" Binary file matches")) | |
2464 | else: |
|
2464 | else: | |
2465 | displaymatches(fm.nested('texts'), l) |
|
2465 | displaymatches(fm.nested('texts'), l) | |
2466 | fm.plain(eol) |
|
2466 | fm.plain(eol) | |
2467 | found = True |
|
2467 | found = True | |
2468 | if opts.get('files_with_matches'): |
|
2468 | if opts.get('files_with_matches'): | |
2469 | break |
|
2469 | break | |
2470 | return found |
|
2470 | return found | |
2471 |
|
2471 | |||
2472 | def displaymatches(fm, l): |
|
2472 | def displaymatches(fm, l): | |
2473 | p = 0 |
|
2473 | p = 0 | |
2474 | for s, e in l.findpos(): |
|
2474 | for s, e in l.findpos(): | |
2475 | if p < s: |
|
2475 | if p < s: | |
2476 | fm.startitem() |
|
2476 | fm.startitem() | |
2477 | fm.write('text', '%s', l.line[p:s]) |
|
2477 | fm.write('text', '%s', l.line[p:s]) | |
2478 | fm.data(matched=False) |
|
2478 | fm.data(matched=False) | |
2479 | fm.startitem() |
|
2479 | fm.startitem() | |
2480 | fm.write('text', '%s', l.line[s:e], label='grep.match') |
|
2480 | fm.write('text', '%s', l.line[s:e], label='grep.match') | |
2481 | fm.data(matched=True) |
|
2481 | fm.data(matched=True) | |
2482 | p = e |
|
2482 | p = e | |
2483 | if p < len(l.line): |
|
2483 | if p < len(l.line): | |
2484 | fm.startitem() |
|
2484 | fm.startitem() | |
2485 | fm.write('text', '%s', l.line[p:]) |
|
2485 | fm.write('text', '%s', l.line[p:]) | |
2486 | fm.data(matched=False) |
|
2486 | fm.data(matched=False) | |
2487 | fm.end() |
|
2487 | fm.end() | |
2488 |
|
2488 | |||
2489 | skip = {} |
|
2489 | skip = {} | |
2490 | revfiles = {} |
|
2490 | revfiles = {} | |
2491 | match = scmutil.match(repo[None], pats, opts) |
|
2491 | match = scmutil.match(repo[None], pats, opts) | |
2492 | found = False |
|
2492 | found = False | |
2493 | follow = opts.get('follow') |
|
2493 | follow = opts.get('follow') | |
2494 |
|
2494 | |||
2495 | def prep(ctx, fns): |
|
2495 | def prep(ctx, fns): | |
2496 | rev = ctx.rev() |
|
2496 | rev = ctx.rev() | |
2497 | pctx = ctx.p1() |
|
2497 | pctx = ctx.p1() | |
2498 | parent = pctx.rev() |
|
2498 | parent = pctx.rev() | |
2499 | matches.setdefault(rev, {}) |
|
2499 | matches.setdefault(rev, {}) | |
2500 | matches.setdefault(parent, {}) |
|
2500 | matches.setdefault(parent, {}) | |
2501 | files = revfiles.setdefault(rev, []) |
|
2501 | files = revfiles.setdefault(rev, []) | |
2502 | for fn in fns: |
|
2502 | for fn in fns: | |
2503 | flog = getfile(fn) |
|
2503 | flog = getfile(fn) | |
2504 | try: |
|
2504 | try: | |
2505 | fnode = ctx.filenode(fn) |
|
2505 | fnode = ctx.filenode(fn) | |
2506 | except error.LookupError: |
|
2506 | except error.LookupError: | |
2507 | continue |
|
2507 | continue | |
2508 |
|
2508 | |||
2509 | copied = flog.renamed(fnode) |
|
2509 | copied = flog.renamed(fnode) | |
2510 | copy = follow and copied and copied[0] |
|
2510 | copy = follow and copied and copied[0] | |
2511 | if copy: |
|
2511 | if copy: | |
2512 | copies.setdefault(rev, {})[fn] = copy |
|
2512 | copies.setdefault(rev, {})[fn] = copy | |
2513 | if fn in skip: |
|
2513 | if fn in skip: | |
2514 | if copy: |
|
2514 | if copy: | |
2515 | skip[copy] = True |
|
2515 | skip[copy] = True | |
2516 | continue |
|
2516 | continue | |
2517 | files.append(fn) |
|
2517 | files.append(fn) | |
2518 |
|
2518 | |||
2519 | if fn not in matches[rev]: |
|
2519 | if fn not in matches[rev]: | |
2520 | grepbody(fn, rev, flog.read(fnode)) |
|
2520 | grepbody(fn, rev, flog.read(fnode)) | |
2521 |
|
2521 | |||
2522 | pfn = copy or fn |
|
2522 | pfn = copy or fn | |
2523 | if pfn not in matches[parent]: |
|
2523 | if pfn not in matches[parent]: | |
2524 | try: |
|
2524 | try: | |
2525 | fnode = pctx.filenode(pfn) |
|
2525 | fnode = pctx.filenode(pfn) | |
2526 | grepbody(pfn, parent, flog.read(fnode)) |
|
2526 | grepbody(pfn, parent, flog.read(fnode)) | |
2527 | except error.LookupError: |
|
2527 | except error.LookupError: | |
2528 | pass |
|
2528 | pass | |
2529 |
|
2529 | |||
2530 | ui.pager('grep') |
|
2530 | ui.pager('grep') | |
2531 | fm = ui.formatter('grep', opts) |
|
2531 | fm = ui.formatter('grep', opts) | |
2532 | for ctx in cmdutil.walkchangerevs(repo, match, opts, prep): |
|
2532 | for ctx in cmdutil.walkchangerevs(repo, match, opts, prep): | |
2533 | rev = ctx.rev() |
|
2533 | rev = ctx.rev() | |
2534 | parent = ctx.p1().rev() |
|
2534 | parent = ctx.p1().rev() | |
2535 | for fn in sorted(revfiles.get(rev, [])): |
|
2535 | for fn in sorted(revfiles.get(rev, [])): | |
2536 | states = matches[rev][fn] |
|
2536 | states = matches[rev][fn] | |
2537 | copy = copies.get(rev, {}).get(fn) |
|
2537 | copy = copies.get(rev, {}).get(fn) | |
2538 | if fn in skip: |
|
2538 | if fn in skip: | |
2539 | if copy: |
|
2539 | if copy: | |
2540 | skip[copy] = True |
|
2540 | skip[copy] = True | |
2541 | continue |
|
2541 | continue | |
2542 | pstates = matches.get(parent, {}).get(copy or fn, []) |
|
2542 | pstates = matches.get(parent, {}).get(copy or fn, []) | |
2543 | if pstates or states: |
|
2543 | if pstates or states: | |
2544 | r = display(fm, fn, ctx, pstates, states) |
|
2544 | r = display(fm, fn, ctx, pstates, states) | |
2545 | found = found or r |
|
2545 | found = found or r | |
2546 | if r and not opts.get('all'): |
|
2546 | if r and not opts.get('all'): | |
2547 | skip[fn] = True |
|
2547 | skip[fn] = True | |
2548 | if copy: |
|
2548 | if copy: | |
2549 | skip[copy] = True |
|
2549 | skip[copy] = True | |
2550 | del matches[rev] |
|
2550 | del matches[rev] | |
2551 | del revfiles[rev] |
|
2551 | del revfiles[rev] | |
2552 | fm.end() |
|
2552 | fm.end() | |
2553 |
|
2553 | |||
2554 | return not found |
|
2554 | return not found | |
2555 |
|
2555 | |||
2556 | @command('heads', |
|
2556 | @command('heads', | |
2557 | [('r', 'rev', '', |
|
2557 | [('r', 'rev', '', | |
2558 | _('show only heads which are descendants of STARTREV'), _('STARTREV')), |
|
2558 | _('show only heads which are descendants of STARTREV'), _('STARTREV')), | |
2559 | ('t', 'topo', False, _('show topological heads only')), |
|
2559 | ('t', 'topo', False, _('show topological heads only')), | |
2560 | ('a', 'active', False, _('show active branchheads only (DEPRECATED)')), |
|
2560 | ('a', 'active', False, _('show active branchheads only (DEPRECATED)')), | |
2561 | ('c', 'closed', False, _('show normal and closed branch heads')), |
|
2561 | ('c', 'closed', False, _('show normal and closed branch heads')), | |
2562 | ] + templateopts, |
|
2562 | ] + templateopts, | |
2563 | _('[-ct] [-r STARTREV] [REV]...')) |
|
2563 | _('[-ct] [-r STARTREV] [REV]...')) | |
2564 | def heads(ui, repo, *branchrevs, **opts): |
|
2564 | def heads(ui, repo, *branchrevs, **opts): | |
2565 | """show branch heads |
|
2565 | """show branch heads | |
2566 |
|
2566 | |||
2567 | With no arguments, show all open branch heads in the repository. |
|
2567 | With no arguments, show all open branch heads in the repository. | |
2568 | Branch heads are changesets that have no descendants on the |
|
2568 | Branch heads are changesets that have no descendants on the | |
2569 | same branch. They are where development generally takes place and |
|
2569 | same branch. They are where development generally takes place and | |
2570 | are the usual targets for update and merge operations. |
|
2570 | are the usual targets for update and merge operations. | |
2571 |
|
2571 | |||
2572 | If one or more REVs are given, only open branch heads on the |
|
2572 | If one or more REVs are given, only open branch heads on the | |
2573 | branches associated with the specified changesets are shown. This |
|
2573 | branches associated with the specified changesets are shown. This | |
2574 | means that you can use :hg:`heads .` to see the heads on the |
|
2574 | means that you can use :hg:`heads .` to see the heads on the | |
2575 | currently checked-out branch. |
|
2575 | currently checked-out branch. | |
2576 |
|
2576 | |||
2577 | If -c/--closed is specified, also show branch heads marked closed |
|
2577 | If -c/--closed is specified, also show branch heads marked closed | |
2578 | (see :hg:`commit --close-branch`). |
|
2578 | (see :hg:`commit --close-branch`). | |
2579 |
|
2579 | |||
2580 | If STARTREV is specified, only those heads that are descendants of |
|
2580 | If STARTREV is specified, only those heads that are descendants of | |
2581 | STARTREV will be displayed. |
|
2581 | STARTREV will be displayed. | |
2582 |
|
2582 | |||
2583 | If -t/--topo is specified, named branch mechanics will be ignored and only |
|
2583 | If -t/--topo is specified, named branch mechanics will be ignored and only | |
2584 | topological heads (changesets with no children) will be shown. |
|
2584 | topological heads (changesets with no children) will be shown. | |
2585 |
|
2585 | |||
2586 | Returns 0 if matching heads are found, 1 if not. |
|
2586 | Returns 0 if matching heads are found, 1 if not. | |
2587 | """ |
|
2587 | """ | |
2588 |
|
2588 | |||
2589 | opts = pycompat.byteskwargs(opts) |
|
2589 | opts = pycompat.byteskwargs(opts) | |
2590 | start = None |
|
2590 | start = None | |
2591 | if 'rev' in opts: |
|
2591 | if 'rev' in opts: | |
2592 | start = scmutil.revsingle(repo, opts['rev'], None).node() |
|
2592 | start = scmutil.revsingle(repo, opts['rev'], None).node() | |
2593 |
|
2593 | |||
2594 | if opts.get('topo'): |
|
2594 | if opts.get('topo'): | |
2595 | heads = [repo[h] for h in repo.heads(start)] |
|
2595 | heads = [repo[h] for h in repo.heads(start)] | |
2596 | else: |
|
2596 | else: | |
2597 | heads = [] |
|
2597 | heads = [] | |
2598 | for branch in repo.branchmap(): |
|
2598 | for branch in repo.branchmap(): | |
2599 | heads += repo.branchheads(branch, start, opts.get('closed')) |
|
2599 | heads += repo.branchheads(branch, start, opts.get('closed')) | |
2600 | heads = [repo[h] for h in heads] |
|
2600 | heads = [repo[h] for h in heads] | |
2601 |
|
2601 | |||
2602 | if branchrevs: |
|
2602 | if branchrevs: | |
2603 | branches = set(repo[br].branch() for br in branchrevs) |
|
2603 | branches = set(repo[br].branch() for br in branchrevs) | |
2604 | heads = [h for h in heads if h.branch() in branches] |
|
2604 | heads = [h for h in heads if h.branch() in branches] | |
2605 |
|
2605 | |||
2606 | if opts.get('active') and branchrevs: |
|
2606 | if opts.get('active') and branchrevs: | |
2607 | dagheads = repo.heads(start) |
|
2607 | dagheads = repo.heads(start) | |
2608 | heads = [h for h in heads if h.node() in dagheads] |
|
2608 | heads = [h for h in heads if h.node() in dagheads] | |
2609 |
|
2609 | |||
2610 | if branchrevs: |
|
2610 | if branchrevs: | |
2611 | haveheads = set(h.branch() for h in heads) |
|
2611 | haveheads = set(h.branch() for h in heads) | |
2612 | if branches - haveheads: |
|
2612 | if branches - haveheads: | |
2613 | headless = ', '.join(b for b in branches - haveheads) |
|
2613 | headless = ', '.join(b for b in branches - haveheads) | |
2614 | msg = _('no open branch heads found on branches %s') |
|
2614 | msg = _('no open branch heads found on branches %s') | |
2615 | if opts.get('rev'): |
|
2615 | if opts.get('rev'): | |
2616 | msg += _(' (started at %s)') % opts['rev'] |
|
2616 | msg += _(' (started at %s)') % opts['rev'] | |
2617 | ui.warn((msg + '\n') % headless) |
|
2617 | ui.warn((msg + '\n') % headless) | |
2618 |
|
2618 | |||
2619 | if not heads: |
|
2619 | if not heads: | |
2620 | return 1 |
|
2620 | return 1 | |
2621 |
|
2621 | |||
2622 | ui.pager('heads') |
|
2622 | ui.pager('heads') | |
2623 | heads = sorted(heads, key=lambda x: -x.rev()) |
|
2623 | heads = sorted(heads, key=lambda x: -x.rev()) | |
2624 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
2624 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
2625 | for ctx in heads: |
|
2625 | for ctx in heads: | |
2626 | displayer.show(ctx) |
|
2626 | displayer.show(ctx) | |
2627 | displayer.close() |
|
2627 | displayer.close() | |
2628 |
|
2628 | |||
2629 | @command('help', |
|
2629 | @command('help', | |
2630 | [('e', 'extension', None, _('show only help for extensions')), |
|
2630 | [('e', 'extension', None, _('show only help for extensions')), | |
2631 | ('c', 'command', None, _('show only help for commands')), |
|
2631 | ('c', 'command', None, _('show only help for commands')), | |
2632 | ('k', 'keyword', None, _('show topics matching keyword')), |
|
2632 | ('k', 'keyword', None, _('show topics matching keyword')), | |
2633 | ('s', 'system', [], _('show help for specific platform(s)')), |
|
2633 | ('s', 'system', [], _('show help for specific platform(s)')), | |
2634 | ], |
|
2634 | ], | |
2635 | _('[-ecks] [TOPIC]'), |
|
2635 | _('[-ecks] [TOPIC]'), | |
2636 | norepo=True) |
|
2636 | norepo=True) | |
2637 | def help_(ui, name=None, **opts): |
|
2637 | def help_(ui, name=None, **opts): | |
2638 | """show help for a given topic or a help overview |
|
2638 | """show help for a given topic or a help overview | |
2639 |
|
2639 | |||
2640 | With no arguments, print a list of commands with short help messages. |
|
2640 | With no arguments, print a list of commands with short help messages. | |
2641 |
|
2641 | |||
2642 | Given a topic, extension, or command name, print help for that |
|
2642 | Given a topic, extension, or command name, print help for that | |
2643 | topic. |
|
2643 | topic. | |
2644 |
|
2644 | |||
2645 | Returns 0 if successful. |
|
2645 | Returns 0 if successful. | |
2646 | """ |
|
2646 | """ | |
2647 |
|
2647 | |||
2648 | keep = opts.get(r'system') or [] |
|
2648 | keep = opts.get(r'system') or [] | |
2649 | if len(keep) == 0: |
|
2649 | if len(keep) == 0: | |
2650 | if pycompat.sysplatform.startswith('win'): |
|
2650 | if pycompat.sysplatform.startswith('win'): | |
2651 | keep.append('windows') |
|
2651 | keep.append('windows') | |
2652 | elif pycompat.sysplatform == 'OpenVMS': |
|
2652 | elif pycompat.sysplatform == 'OpenVMS': | |
2653 | keep.append('vms') |
|
2653 | keep.append('vms') | |
2654 | elif pycompat.sysplatform == 'plan9': |
|
2654 | elif pycompat.sysplatform == 'plan9': | |
2655 | keep.append('plan9') |
|
2655 | keep.append('plan9') | |
2656 | else: |
|
2656 | else: | |
2657 | keep.append('unix') |
|
2657 | keep.append('unix') | |
2658 | keep.append(pycompat.sysplatform.lower()) |
|
2658 | keep.append(pycompat.sysplatform.lower()) | |
2659 | if ui.verbose: |
|
2659 | if ui.verbose: | |
2660 | keep.append('verbose') |
|
2660 | keep.append('verbose') | |
2661 |
|
2661 | |||
2662 | commands = sys.modules[__name__] |
|
2662 | commands = sys.modules[__name__] | |
2663 | formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts) |
|
2663 | formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts) | |
2664 | ui.pager('help') |
|
2664 | ui.pager('help') | |
2665 | ui.write(formatted) |
|
2665 | ui.write(formatted) | |
2666 |
|
2666 | |||
2667 |
|
2667 | |||
2668 | @command('identify|id', |
|
2668 | @command('identify|id', | |
2669 | [('r', 'rev', '', |
|
2669 | [('r', 'rev', '', | |
2670 | _('identify the specified revision'), _('REV')), |
|
2670 | _('identify the specified revision'), _('REV')), | |
2671 | ('n', 'num', None, _('show local revision number')), |
|
2671 | ('n', 'num', None, _('show local revision number')), | |
2672 | ('i', 'id', None, _('show global revision id')), |
|
2672 | ('i', 'id', None, _('show global revision id')), | |
2673 | ('b', 'branch', None, _('show branch')), |
|
2673 | ('b', 'branch', None, _('show branch')), | |
2674 | ('t', 'tags', None, _('show tags')), |
|
2674 | ('t', 'tags', None, _('show tags')), | |
2675 | ('B', 'bookmarks', None, _('show bookmarks')), |
|
2675 | ('B', 'bookmarks', None, _('show bookmarks')), | |
2676 | ] + remoteopts + formatteropts, |
|
2676 | ] + remoteopts + formatteropts, | |
2677 | _('[-nibtB] [-r REV] [SOURCE]'), |
|
2677 | _('[-nibtB] [-r REV] [SOURCE]'), | |
2678 | optionalrepo=True) |
|
2678 | optionalrepo=True) | |
2679 | def identify(ui, repo, source=None, rev=None, |
|
2679 | def identify(ui, repo, source=None, rev=None, | |
2680 | num=None, id=None, branch=None, tags=None, bookmarks=None, **opts): |
|
2680 | num=None, id=None, branch=None, tags=None, bookmarks=None, **opts): | |
2681 | """identify the working directory or specified revision |
|
2681 | """identify the working directory or specified revision | |
2682 |
|
2682 | |||
2683 | Print a summary identifying the repository state at REV using one or |
|
2683 | Print a summary identifying the repository state at REV using one or | |
2684 | two parent hash identifiers, followed by a "+" if the working |
|
2684 | two parent hash identifiers, followed by a "+" if the working | |
2685 | directory has uncommitted changes, the branch name (if not default), |
|
2685 | directory has uncommitted changes, the branch name (if not default), | |
2686 | a list of tags, and a list of bookmarks. |
|
2686 | a list of tags, and a list of bookmarks. | |
2687 |
|
2687 | |||
2688 | When REV is not given, print a summary of the current state of the |
|
2688 | When REV is not given, print a summary of the current state of the | |
2689 | repository. |
|
2689 | repository. | |
2690 |
|
2690 | |||
2691 | Specifying a path to a repository root or Mercurial bundle will |
|
2691 | Specifying a path to a repository root or Mercurial bundle will | |
2692 | cause lookup to operate on that repository/bundle. |
|
2692 | cause lookup to operate on that repository/bundle. | |
2693 |
|
2693 | |||
2694 | .. container:: verbose |
|
2694 | .. container:: verbose | |
2695 |
|
2695 | |||
2696 | Examples: |
|
2696 | Examples: | |
2697 |
|
2697 | |||
2698 | - generate a build identifier for the working directory:: |
|
2698 | - generate a build identifier for the working directory:: | |
2699 |
|
2699 | |||
2700 | hg id --id > build-id.dat |
|
2700 | hg id --id > build-id.dat | |
2701 |
|
2701 | |||
2702 | - find the revision corresponding to a tag:: |
|
2702 | - find the revision corresponding to a tag:: | |
2703 |
|
2703 | |||
2704 | hg id -n -r 1.3 |
|
2704 | hg id -n -r 1.3 | |
2705 |
|
2705 | |||
2706 | - check the most recent revision of a remote repository:: |
|
2706 | - check the most recent revision of a remote repository:: | |
2707 |
|
2707 | |||
2708 | hg id -r tip https://www.mercurial-scm.org/repo/hg/ |
|
2708 | hg id -r tip https://www.mercurial-scm.org/repo/hg/ | |
2709 |
|
2709 | |||
2710 | See :hg:`log` for generating more information about specific revisions, |
|
2710 | See :hg:`log` for generating more information about specific revisions, | |
2711 | including full hash identifiers. |
|
2711 | including full hash identifiers. | |
2712 |
|
2712 | |||
2713 | Returns 0 if successful. |
|
2713 | Returns 0 if successful. | |
2714 | """ |
|
2714 | """ | |
2715 |
|
2715 | |||
2716 | opts = pycompat.byteskwargs(opts) |
|
2716 | opts = pycompat.byteskwargs(opts) | |
2717 | if not repo and not source: |
|
2717 | if not repo and not source: | |
2718 | raise error.Abort(_("there is no Mercurial repository here " |
|
2718 | raise error.Abort(_("there is no Mercurial repository here " | |
2719 | "(.hg not found)")) |
|
2719 | "(.hg not found)")) | |
2720 |
|
2720 | |||
2721 | if ui.debugflag: |
|
2721 | if ui.debugflag: | |
2722 | hexfunc = hex |
|
2722 | hexfunc = hex | |
2723 | else: |
|
2723 | else: | |
2724 | hexfunc = short |
|
2724 | hexfunc = short | |
2725 | default = not (num or id or branch or tags or bookmarks) |
|
2725 | default = not (num or id or branch or tags or bookmarks) | |
2726 | output = [] |
|
2726 | output = [] | |
2727 | revs = [] |
|
2727 | revs = [] | |
2728 |
|
2728 | |||
2729 | if source: |
|
2729 | if source: | |
2730 | source, branches = hg.parseurl(ui.expandpath(source)) |
|
2730 | source, branches = hg.parseurl(ui.expandpath(source)) | |
2731 | peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo |
|
2731 | peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo | |
2732 | repo = peer.local() |
|
2732 | repo = peer.local() | |
2733 | revs, checkout = hg.addbranchrevs(repo, peer, branches, None) |
|
2733 | revs, checkout = hg.addbranchrevs(repo, peer, branches, None) | |
2734 |
|
2734 | |||
2735 | fm = ui.formatter('identify', opts) |
|
2735 | fm = ui.formatter('identify', opts) | |
2736 | fm.startitem() |
|
2736 | fm.startitem() | |
2737 |
|
2737 | |||
2738 | if not repo: |
|
2738 | if not repo: | |
2739 | if num or branch or tags: |
|
2739 | if num or branch or tags: | |
2740 | raise error.Abort( |
|
2740 | raise error.Abort( | |
2741 | _("can't query remote revision number, branch, or tags")) |
|
2741 | _("can't query remote revision number, branch, or tags")) | |
2742 | if not rev and revs: |
|
2742 | if not rev and revs: | |
2743 | rev = revs[0] |
|
2743 | rev = revs[0] | |
2744 | if not rev: |
|
2744 | if not rev: | |
2745 | rev = "tip" |
|
2745 | rev = "tip" | |
2746 |
|
2746 | |||
2747 | remoterev = peer.lookup(rev) |
|
2747 | remoterev = peer.lookup(rev) | |
2748 | hexrev = hexfunc(remoterev) |
|
2748 | hexrev = hexfunc(remoterev) | |
2749 | if default or id: |
|
2749 | if default or id: | |
2750 | output = [hexrev] |
|
2750 | output = [hexrev] | |
2751 | fm.data(id=hexrev) |
|
2751 | fm.data(id=hexrev) | |
2752 |
|
2752 | |||
2753 | def getbms(): |
|
2753 | def getbms(): | |
2754 | bms = [] |
|
2754 | bms = [] | |
2755 |
|
2755 | |||
2756 | if 'bookmarks' in peer.listkeys('namespaces'): |
|
2756 | if 'bookmarks' in peer.listkeys('namespaces'): | |
2757 | hexremoterev = hex(remoterev) |
|
2757 | hexremoterev = hex(remoterev) | |
2758 | bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems() |
|
2758 | bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems() | |
2759 | if bmr == hexremoterev] |
|
2759 | if bmr == hexremoterev] | |
2760 |
|
2760 | |||
2761 | return sorted(bms) |
|
2761 | return sorted(bms) | |
2762 |
|
2762 | |||
2763 | bms = getbms() |
|
2763 | bms = getbms() | |
2764 | if bookmarks: |
|
2764 | if bookmarks: | |
2765 | output.extend(bms) |
|
2765 | output.extend(bms) | |
2766 | elif default and not ui.quiet: |
|
2766 | elif default and not ui.quiet: | |
2767 | # multiple bookmarks for a single parent separated by '/' |
|
2767 | # multiple bookmarks for a single parent separated by '/' | |
2768 | bm = '/'.join(bms) |
|
2768 | bm = '/'.join(bms) | |
2769 | if bm: |
|
2769 | if bm: | |
2770 | output.append(bm) |
|
2770 | output.append(bm) | |
2771 |
|
2771 | |||
2772 | fm.data(node=hex(remoterev)) |
|
2772 | fm.data(node=hex(remoterev)) | |
2773 | fm.data(bookmarks=fm.formatlist(bms, name='bookmark')) |
|
2773 | fm.data(bookmarks=fm.formatlist(bms, name='bookmark')) | |
2774 | else: |
|
2774 | else: | |
2775 | ctx = scmutil.revsingle(repo, rev, None) |
|
2775 | ctx = scmutil.revsingle(repo, rev, None) | |
2776 |
|
2776 | |||
2777 | if ctx.rev() is None: |
|
2777 | if ctx.rev() is None: | |
2778 | ctx = repo[None] |
|
2778 | ctx = repo[None] | |
2779 | parents = ctx.parents() |
|
2779 | parents = ctx.parents() | |
2780 | taglist = [] |
|
2780 | taglist = [] | |
2781 | for p in parents: |
|
2781 | for p in parents: | |
2782 | taglist.extend(p.tags()) |
|
2782 | taglist.extend(p.tags()) | |
2783 |
|
2783 | |||
2784 | dirty = "" |
|
2784 | dirty = "" | |
2785 | if ctx.dirty(missing=True, merge=False, branch=False): |
|
2785 | if ctx.dirty(missing=True, merge=False, branch=False): | |
2786 | dirty = '+' |
|
2786 | dirty = '+' | |
2787 | fm.data(dirty=dirty) |
|
2787 | fm.data(dirty=dirty) | |
2788 |
|
2788 | |||
2789 | hexoutput = [hexfunc(p.node()) for p in parents] |
|
2789 | hexoutput = [hexfunc(p.node()) for p in parents] | |
2790 | if default or id: |
|
2790 | if default or id: | |
2791 | output = ["%s%s" % ('+'.join(hexoutput), dirty)] |
|
2791 | output = ["%s%s" % ('+'.join(hexoutput), dirty)] | |
2792 | fm.data(id="%s%s" % ('+'.join(hexoutput), dirty)) |
|
2792 | fm.data(id="%s%s" % ('+'.join(hexoutput), dirty)) | |
2793 |
|
2793 | |||
2794 | if num: |
|
2794 | if num: | |
2795 | numoutput = ["%d" % p.rev() for p in parents] |
|
2795 | numoutput = ["%d" % p.rev() for p in parents] | |
2796 | output.append("%s%s" % ('+'.join(numoutput), dirty)) |
|
2796 | output.append("%s%s" % ('+'.join(numoutput), dirty)) | |
2797 |
|
2797 | |||
2798 | fn = fm.nested('parents') |
|
2798 | fn = fm.nested('parents') | |
2799 | for p in parents: |
|
2799 | for p in parents: | |
2800 | fn.startitem() |
|
2800 | fn.startitem() | |
2801 | fn.data(rev=p.rev()) |
|
2801 | fn.data(rev=p.rev()) | |
2802 | fn.data(node=p.hex()) |
|
2802 | fn.data(node=p.hex()) | |
2803 | fn.context(ctx=p) |
|
2803 | fn.context(ctx=p) | |
2804 | fn.end() |
|
2804 | fn.end() | |
2805 | else: |
|
2805 | else: | |
2806 | hexoutput = hexfunc(ctx.node()) |
|
2806 | hexoutput = hexfunc(ctx.node()) | |
2807 | if default or id: |
|
2807 | if default or id: | |
2808 | output = [hexoutput] |
|
2808 | output = [hexoutput] | |
2809 | fm.data(id=hexoutput) |
|
2809 | fm.data(id=hexoutput) | |
2810 |
|
2810 | |||
2811 | if num: |
|
2811 | if num: | |
2812 | output.append(pycompat.bytestr(ctx.rev())) |
|
2812 | output.append(pycompat.bytestr(ctx.rev())) | |
2813 | taglist = ctx.tags() |
|
2813 | taglist = ctx.tags() | |
2814 |
|
2814 | |||
2815 | if default and not ui.quiet: |
|
2815 | if default and not ui.quiet: | |
2816 | b = ctx.branch() |
|
2816 | b = ctx.branch() | |
2817 | if b != 'default': |
|
2817 | if b != 'default': | |
2818 | output.append("(%s)" % b) |
|
2818 | output.append("(%s)" % b) | |
2819 |
|
2819 | |||
2820 | # multiple tags for a single parent separated by '/' |
|
2820 | # multiple tags for a single parent separated by '/' | |
2821 | t = '/'.join(taglist) |
|
2821 | t = '/'.join(taglist) | |
2822 | if t: |
|
2822 | if t: | |
2823 | output.append(t) |
|
2823 | output.append(t) | |
2824 |
|
2824 | |||
2825 | # multiple bookmarks for a single parent separated by '/' |
|
2825 | # multiple bookmarks for a single parent separated by '/' | |
2826 | bm = '/'.join(ctx.bookmarks()) |
|
2826 | bm = '/'.join(ctx.bookmarks()) | |
2827 | if bm: |
|
2827 | if bm: | |
2828 | output.append(bm) |
|
2828 | output.append(bm) | |
2829 | else: |
|
2829 | else: | |
2830 | if branch: |
|
2830 | if branch: | |
2831 | output.append(ctx.branch()) |
|
2831 | output.append(ctx.branch()) | |
2832 |
|
2832 | |||
2833 | if tags: |
|
2833 | if tags: | |
2834 | output.extend(taglist) |
|
2834 | output.extend(taglist) | |
2835 |
|
2835 | |||
2836 | if bookmarks: |
|
2836 | if bookmarks: | |
2837 | output.extend(ctx.bookmarks()) |
|
2837 | output.extend(ctx.bookmarks()) | |
2838 |
|
2838 | |||
2839 | fm.data(node=ctx.hex()) |
|
2839 | fm.data(node=ctx.hex()) | |
2840 | fm.data(branch=ctx.branch()) |
|
2840 | fm.data(branch=ctx.branch()) | |
2841 | fm.data(tags=fm.formatlist(taglist, name='tag', sep=':')) |
|
2841 | fm.data(tags=fm.formatlist(taglist, name='tag', sep=':')) | |
2842 | fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark')) |
|
2842 | fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark')) | |
2843 | fm.context(ctx=ctx) |
|
2843 | fm.context(ctx=ctx) | |
2844 |
|
2844 | |||
2845 | fm.plain("%s\n" % ' '.join(output)) |
|
2845 | fm.plain("%s\n" % ' '.join(output)) | |
2846 | fm.end() |
|
2846 | fm.end() | |
2847 |
|
2847 | |||
2848 | @command('import|patch', |
|
2848 | @command('import|patch', | |
2849 | [('p', 'strip', 1, |
|
2849 | [('p', 'strip', 1, | |
2850 | _('directory strip option for patch. This has the same ' |
|
2850 | _('directory strip option for patch. This has the same ' | |
2851 | 'meaning as the corresponding patch option'), _('NUM')), |
|
2851 | 'meaning as the corresponding patch option'), _('NUM')), | |
2852 | ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')), |
|
2852 | ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')), | |
2853 | ('e', 'edit', False, _('invoke editor on commit messages')), |
|
2853 | ('e', 'edit', False, _('invoke editor on commit messages')), | |
2854 | ('f', 'force', None, |
|
2854 | ('f', 'force', None, | |
2855 | _('skip check for outstanding uncommitted changes (DEPRECATED)')), |
|
2855 | _('skip check for outstanding uncommitted changes (DEPRECATED)')), | |
2856 | ('', 'no-commit', None, |
|
2856 | ('', 'no-commit', None, | |
2857 | _("don't commit, just update the working directory")), |
|
2857 | _("don't commit, just update the working directory")), | |
2858 | ('', 'bypass', None, |
|
2858 | ('', 'bypass', None, | |
2859 | _("apply patch without touching the working directory")), |
|
2859 | _("apply patch without touching the working directory")), | |
2860 | ('', 'partial', None, |
|
2860 | ('', 'partial', None, | |
2861 | _('commit even if some hunks fail')), |
|
2861 | _('commit even if some hunks fail')), | |
2862 | ('', 'exact', None, |
|
2862 | ('', 'exact', None, | |
2863 | _('abort if patch would apply lossily')), |
|
2863 | _('abort if patch would apply lossily')), | |
2864 | ('', 'prefix', '', |
|
2864 | ('', 'prefix', '', | |
2865 | _('apply patch to subdirectory'), _('DIR')), |
|
2865 | _('apply patch to subdirectory'), _('DIR')), | |
2866 | ('', 'import-branch', None, |
|
2866 | ('', 'import-branch', None, | |
2867 | _('use any branch information in patch (implied by --exact)'))] + |
|
2867 | _('use any branch information in patch (implied by --exact)'))] + | |
2868 | commitopts + commitopts2 + similarityopts, |
|
2868 | commitopts + commitopts2 + similarityopts, | |
2869 | _('[OPTION]... PATCH...')) |
|
2869 | _('[OPTION]... PATCH...')) | |
2870 | def import_(ui, repo, patch1=None, *patches, **opts): |
|
2870 | def import_(ui, repo, patch1=None, *patches, **opts): | |
2871 | """import an ordered set of patches |
|
2871 | """import an ordered set of patches | |
2872 |
|
2872 | |||
2873 | Import a list of patches and commit them individually (unless |
|
2873 | Import a list of patches and commit them individually (unless | |
2874 | --no-commit is specified). |
|
2874 | --no-commit is specified). | |
2875 |
|
2875 | |||
2876 | To read a patch from standard input (stdin), use "-" as the patch |
|
2876 | To read a patch from standard input (stdin), use "-" as the patch | |
2877 | name. If a URL is specified, the patch will be downloaded from |
|
2877 | name. If a URL is specified, the patch will be downloaded from | |
2878 | there. |
|
2878 | there. | |
2879 |
|
2879 | |||
2880 | Import first applies changes to the working directory (unless |
|
2880 | Import first applies changes to the working directory (unless | |
2881 | --bypass is specified), import will abort if there are outstanding |
|
2881 | --bypass is specified), import will abort if there are outstanding | |
2882 | changes. |
|
2882 | changes. | |
2883 |
|
2883 | |||
2884 | Use --bypass to apply and commit patches directly to the |
|
2884 | Use --bypass to apply and commit patches directly to the | |
2885 | repository, without affecting the working directory. Without |
|
2885 | repository, without affecting the working directory. Without | |
2886 | --exact, patches will be applied on top of the working directory |
|
2886 | --exact, patches will be applied on top of the working directory | |
2887 | parent revision. |
|
2887 | parent revision. | |
2888 |
|
2888 | |||
2889 | You can import a patch straight from a mail message. Even patches |
|
2889 | You can import a patch straight from a mail message. Even patches | |
2890 | as attachments work (to use the body part, it must have type |
|
2890 | as attachments work (to use the body part, it must have type | |
2891 | text/plain or text/x-patch). From and Subject headers of email |
|
2891 | text/plain or text/x-patch). From and Subject headers of email | |
2892 | message are used as default committer and commit message. All |
|
2892 | message are used as default committer and commit message. All | |
2893 | text/plain body parts before first diff are added to the commit |
|
2893 | text/plain body parts before first diff are added to the commit | |
2894 | message. |
|
2894 | message. | |
2895 |
|
2895 | |||
2896 | If the imported patch was generated by :hg:`export`, user and |
|
2896 | If the imported patch was generated by :hg:`export`, user and | |
2897 | description from patch override values from message headers and |
|
2897 | description from patch override values from message headers and | |
2898 | body. Values given on command line with -m/--message and -u/--user |
|
2898 | body. Values given on command line with -m/--message and -u/--user | |
2899 | override these. |
|
2899 | override these. | |
2900 |
|
2900 | |||
2901 | If --exact is specified, import will set the working directory to |
|
2901 | If --exact is specified, import will set the working directory to | |
2902 | the parent of each patch before applying it, and will abort if the |
|
2902 | the parent of each patch before applying it, and will abort if the | |
2903 | resulting changeset has a different ID than the one recorded in |
|
2903 | resulting changeset has a different ID than the one recorded in | |
2904 | the patch. This will guard against various ways that portable |
|
2904 | the patch. This will guard against various ways that portable | |
2905 | patch formats and mail systems might fail to transfer Mercurial |
|
2905 | patch formats and mail systems might fail to transfer Mercurial | |
2906 | data or metadata. See :hg:`bundle` for lossless transmission. |
|
2906 | data or metadata. See :hg:`bundle` for lossless transmission. | |
2907 |
|
2907 | |||
2908 | Use --partial to ensure a changeset will be created from the patch |
|
2908 | Use --partial to ensure a changeset will be created from the patch | |
2909 | even if some hunks fail to apply. Hunks that fail to apply will be |
|
2909 | even if some hunks fail to apply. Hunks that fail to apply will be | |
2910 | written to a <target-file>.rej file. Conflicts can then be resolved |
|
2910 | written to a <target-file>.rej file. Conflicts can then be resolved | |
2911 | by hand before :hg:`commit --amend` is run to update the created |
|
2911 | by hand before :hg:`commit --amend` is run to update the created | |
2912 | changeset. This flag exists to let people import patches that |
|
2912 | changeset. This flag exists to let people import patches that | |
2913 | partially apply without losing the associated metadata (author, |
|
2913 | partially apply without losing the associated metadata (author, | |
2914 | date, description, ...). |
|
2914 | date, description, ...). | |
2915 |
|
2915 | |||
2916 | .. note:: |
|
2916 | .. note:: | |
2917 |
|
2917 | |||
2918 | When no hunks apply cleanly, :hg:`import --partial` will create |
|
2918 | When no hunks apply cleanly, :hg:`import --partial` will create | |
2919 | an empty changeset, importing only the patch metadata. |
|
2919 | an empty changeset, importing only the patch metadata. | |
2920 |
|
2920 | |||
2921 | With -s/--similarity, hg will attempt to discover renames and |
|
2921 | With -s/--similarity, hg will attempt to discover renames and | |
2922 | copies in the patch in the same way as :hg:`addremove`. |
|
2922 | copies in the patch in the same way as :hg:`addremove`. | |
2923 |
|
2923 | |||
2924 | It is possible to use external patch programs to perform the patch |
|
2924 | It is possible to use external patch programs to perform the patch | |
2925 | by setting the ``ui.patch`` configuration option. For the default |
|
2925 | by setting the ``ui.patch`` configuration option. For the default | |
2926 | internal tool, the fuzz can also be configured via ``patch.fuzz``. |
|
2926 | internal tool, the fuzz can also be configured via ``patch.fuzz``. | |
2927 | See :hg:`help config` for more information about configuration |
|
2927 | See :hg:`help config` for more information about configuration | |
2928 | files and how to use these options. |
|
2928 | files and how to use these options. | |
2929 |
|
2929 | |||
2930 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
2930 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
2931 |
|
2931 | |||
2932 | .. container:: verbose |
|
2932 | .. container:: verbose | |
2933 |
|
2933 | |||
2934 | Examples: |
|
2934 | Examples: | |
2935 |
|
2935 | |||
2936 | - import a traditional patch from a website and detect renames:: |
|
2936 | - import a traditional patch from a website and detect renames:: | |
2937 |
|
2937 | |||
2938 | hg import -s 80 http://example.com/bugfix.patch |
|
2938 | hg import -s 80 http://example.com/bugfix.patch | |
2939 |
|
2939 | |||
2940 | - import a changeset from an hgweb server:: |
|
2940 | - import a changeset from an hgweb server:: | |
2941 |
|
2941 | |||
2942 | hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa |
|
2942 | hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa | |
2943 |
|
2943 | |||
2944 | - import all the patches in an Unix-style mbox:: |
|
2944 | - import all the patches in an Unix-style mbox:: | |
2945 |
|
2945 | |||
2946 | hg import incoming-patches.mbox |
|
2946 | hg import incoming-patches.mbox | |
2947 |
|
2947 | |||
2948 | - import patches from stdin:: |
|
2948 | - import patches from stdin:: | |
2949 |
|
2949 | |||
2950 | hg import - |
|
2950 | hg import - | |
2951 |
|
2951 | |||
2952 | - attempt to exactly restore an exported changeset (not always |
|
2952 | - attempt to exactly restore an exported changeset (not always | |
2953 | possible):: |
|
2953 | possible):: | |
2954 |
|
2954 | |||
2955 | hg import --exact proposed-fix.patch |
|
2955 | hg import --exact proposed-fix.patch | |
2956 |
|
2956 | |||
2957 | - use an external tool to apply a patch which is too fuzzy for |
|
2957 | - use an external tool to apply a patch which is too fuzzy for | |
2958 | the default internal tool. |
|
2958 | the default internal tool. | |
2959 |
|
2959 | |||
2960 | hg import --config ui.patch="patch --merge" fuzzy.patch |
|
2960 | hg import --config ui.patch="patch --merge" fuzzy.patch | |
2961 |
|
2961 | |||
2962 | - change the default fuzzing from 2 to a less strict 7 |
|
2962 | - change the default fuzzing from 2 to a less strict 7 | |
2963 |
|
2963 | |||
2964 | hg import --config ui.fuzz=7 fuzz.patch |
|
2964 | hg import --config ui.fuzz=7 fuzz.patch | |
2965 |
|
2965 | |||
2966 | Returns 0 on success, 1 on partial success (see --partial). |
|
2966 | Returns 0 on success, 1 on partial success (see --partial). | |
2967 | """ |
|
2967 | """ | |
2968 |
|
2968 | |||
2969 | opts = pycompat.byteskwargs(opts) |
|
2969 | opts = pycompat.byteskwargs(opts) | |
2970 | if not patch1: |
|
2970 | if not patch1: | |
2971 | raise error.Abort(_('need at least one patch to import')) |
|
2971 | raise error.Abort(_('need at least one patch to import')) | |
2972 |
|
2972 | |||
2973 | patches = (patch1,) + patches |
|
2973 | patches = (patch1,) + patches | |
2974 |
|
2974 | |||
2975 | date = opts.get('date') |
|
2975 | date = opts.get('date') | |
2976 | if date: |
|
2976 | if date: | |
2977 | opts['date'] = util.parsedate(date) |
|
2977 | opts['date'] = util.parsedate(date) | |
2978 |
|
2978 | |||
2979 | exact = opts.get('exact') |
|
2979 | exact = opts.get('exact') | |
2980 | update = not opts.get('bypass') |
|
2980 | update = not opts.get('bypass') | |
2981 | if not update and opts.get('no_commit'): |
|
2981 | if not update and opts.get('no_commit'): | |
2982 | raise error.Abort(_('cannot use --no-commit with --bypass')) |
|
2982 | raise error.Abort(_('cannot use --no-commit with --bypass')) | |
2983 | try: |
|
2983 | try: | |
2984 | sim = float(opts.get('similarity') or 0) |
|
2984 | sim = float(opts.get('similarity') or 0) | |
2985 | except ValueError: |
|
2985 | except ValueError: | |
2986 | raise error.Abort(_('similarity must be a number')) |
|
2986 | raise error.Abort(_('similarity must be a number')) | |
2987 | if sim < 0 or sim > 100: |
|
2987 | if sim < 0 or sim > 100: | |
2988 | raise error.Abort(_('similarity must be between 0 and 100')) |
|
2988 | raise error.Abort(_('similarity must be between 0 and 100')) | |
2989 | if sim and not update: |
|
2989 | if sim and not update: | |
2990 | raise error.Abort(_('cannot use --similarity with --bypass')) |
|
2990 | raise error.Abort(_('cannot use --similarity with --bypass')) | |
2991 | if exact: |
|
2991 | if exact: | |
2992 | if opts.get('edit'): |
|
2992 | if opts.get('edit'): | |
2993 | raise error.Abort(_('cannot use --exact with --edit')) |
|
2993 | raise error.Abort(_('cannot use --exact with --edit')) | |
2994 | if opts.get('prefix'): |
|
2994 | if opts.get('prefix'): | |
2995 | raise error.Abort(_('cannot use --exact with --prefix')) |
|
2995 | raise error.Abort(_('cannot use --exact with --prefix')) | |
2996 |
|
2996 | |||
2997 | base = opts["base"] |
|
2997 | base = opts["base"] | |
2998 | wlock = dsguard = lock = tr = None |
|
2998 | wlock = dsguard = lock = tr = None | |
2999 | msgs = [] |
|
2999 | msgs = [] | |
3000 | ret = 0 |
|
3000 | ret = 0 | |
3001 |
|
3001 | |||
3002 |
|
3002 | |||
3003 | try: |
|
3003 | try: | |
3004 | wlock = repo.wlock() |
|
3004 | wlock = repo.wlock() | |
3005 |
|
3005 | |||
3006 | if update: |
|
3006 | if update: | |
3007 | cmdutil.checkunfinished(repo) |
|
3007 | cmdutil.checkunfinished(repo) | |
3008 | if (exact or not opts.get('force')): |
|
3008 | if (exact or not opts.get('force')): | |
3009 | cmdutil.bailifchanged(repo) |
|
3009 | cmdutil.bailifchanged(repo) | |
3010 |
|
3010 | |||
3011 | if not opts.get('no_commit'): |
|
3011 | if not opts.get('no_commit'): | |
3012 | lock = repo.lock() |
|
3012 | lock = repo.lock() | |
3013 | tr = repo.transaction('import') |
|
3013 | tr = repo.transaction('import') | |
3014 | else: |
|
3014 | else: | |
3015 | dsguard = dirstateguard.dirstateguard(repo, 'import') |
|
3015 | dsguard = dirstateguard.dirstateguard(repo, 'import') | |
3016 | parents = repo[None].parents() |
|
3016 | parents = repo[None].parents() | |
3017 | for patchurl in patches: |
|
3017 | for patchurl in patches: | |
3018 | if patchurl == '-': |
|
3018 | if patchurl == '-': | |
3019 | ui.status(_('applying patch from stdin\n')) |
|
3019 | ui.status(_('applying patch from stdin\n')) | |
3020 | patchfile = ui.fin |
|
3020 | patchfile = ui.fin | |
3021 | patchurl = 'stdin' # for error message |
|
3021 | patchurl = 'stdin' # for error message | |
3022 | else: |
|
3022 | else: | |
3023 | patchurl = os.path.join(base, patchurl) |
|
3023 | patchurl = os.path.join(base, patchurl) | |
3024 | ui.status(_('applying %s\n') % patchurl) |
|
3024 | ui.status(_('applying %s\n') % patchurl) | |
3025 | patchfile = hg.openpath(ui, patchurl) |
|
3025 | patchfile = hg.openpath(ui, patchurl) | |
3026 |
|
3026 | |||
3027 | haspatch = False |
|
3027 | haspatch = False | |
3028 | for hunk in patch.split(patchfile): |
|
3028 | for hunk in patch.split(patchfile): | |
3029 | (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk, |
|
3029 | (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk, | |
3030 | parents, opts, |
|
3030 | parents, opts, | |
3031 | msgs, hg.clean) |
|
3031 | msgs, hg.clean) | |
3032 | if msg: |
|
3032 | if msg: | |
3033 | haspatch = True |
|
3033 | haspatch = True | |
3034 | ui.note(msg + '\n') |
|
3034 | ui.note(msg + '\n') | |
3035 | if update or exact: |
|
3035 | if update or exact: | |
3036 | parents = repo[None].parents() |
|
3036 | parents = repo[None].parents() | |
3037 | else: |
|
3037 | else: | |
3038 | parents = [repo[node]] |
|
3038 | parents = [repo[node]] | |
3039 | if rej: |
|
3039 | if rej: | |
3040 | ui.write_err(_("patch applied partially\n")) |
|
3040 | ui.write_err(_("patch applied partially\n")) | |
3041 | ui.write_err(_("(fix the .rej files and run " |
|
3041 | ui.write_err(_("(fix the .rej files and run " | |
3042 | "`hg commit --amend`)\n")) |
|
3042 | "`hg commit --amend`)\n")) | |
3043 | ret = 1 |
|
3043 | ret = 1 | |
3044 | break |
|
3044 | break | |
3045 |
|
3045 | |||
3046 | if not haspatch: |
|
3046 | if not haspatch: | |
3047 | raise error.Abort(_('%s: no diffs found') % patchurl) |
|
3047 | raise error.Abort(_('%s: no diffs found') % patchurl) | |
3048 |
|
3048 | |||
3049 | if tr: |
|
3049 | if tr: | |
3050 | tr.close() |
|
3050 | tr.close() | |
3051 | if msgs: |
|
3051 | if msgs: | |
3052 | repo.savecommitmessage('\n* * *\n'.join(msgs)) |
|
3052 | repo.savecommitmessage('\n* * *\n'.join(msgs)) | |
3053 | if dsguard: |
|
3053 | if dsguard: | |
3054 | dsguard.close() |
|
3054 | dsguard.close() | |
3055 | return ret |
|
3055 | return ret | |
3056 | finally: |
|
3056 | finally: | |
3057 | if tr: |
|
3057 | if tr: | |
3058 | tr.release() |
|
3058 | tr.release() | |
3059 | release(lock, dsguard, wlock) |
|
3059 | release(lock, dsguard, wlock) | |
3060 |
|
3060 | |||
3061 | @command('incoming|in', |
|
3061 | @command('incoming|in', | |
3062 | [('f', 'force', None, |
|
3062 | [('f', 'force', None, | |
3063 | _('run even if remote repository is unrelated')), |
|
3063 | _('run even if remote repository is unrelated')), | |
3064 | ('n', 'newest-first', None, _('show newest record first')), |
|
3064 | ('n', 'newest-first', None, _('show newest record first')), | |
3065 | ('', 'bundle', '', |
|
3065 | ('', 'bundle', '', | |
3066 | _('file to store the bundles into'), _('FILE')), |
|
3066 | _('file to store the bundles into'), _('FILE')), | |
3067 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), |
|
3067 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), | |
3068 | ('B', 'bookmarks', False, _("compare bookmarks")), |
|
3068 | ('B', 'bookmarks', False, _("compare bookmarks")), | |
3069 | ('b', 'branch', [], |
|
3069 | ('b', 'branch', [], | |
3070 | _('a specific branch you would like to pull'), _('BRANCH')), |
|
3070 | _('a specific branch you would like to pull'), _('BRANCH')), | |
3071 | ] + logopts + remoteopts + subrepoopts, |
|
3071 | ] + logopts + remoteopts + subrepoopts, | |
3072 | _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]')) |
|
3072 | _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]')) | |
3073 | def incoming(ui, repo, source="default", **opts): |
|
3073 | def incoming(ui, repo, source="default", **opts): | |
3074 | """show new changesets found in source |
|
3074 | """show new changesets found in source | |
3075 |
|
3075 | |||
3076 | Show new changesets found in the specified path/URL or the default |
|
3076 | Show new changesets found in the specified path/URL or the default | |
3077 | pull location. These are the changesets that would have been pulled |
|
3077 | pull location. These are the changesets that would have been pulled | |
3078 | by :hg:`pull` at the time you issued this command. |
|
3078 | by :hg:`pull` at the time you issued this command. | |
3079 |
|
3079 | |||
3080 | See pull for valid source format details. |
|
3080 | See pull for valid source format details. | |
3081 |
|
3081 | |||
3082 | .. container:: verbose |
|
3082 | .. container:: verbose | |
3083 |
|
3083 | |||
3084 | With -B/--bookmarks, the result of bookmark comparison between |
|
3084 | With -B/--bookmarks, the result of bookmark comparison between | |
3085 | local and remote repositories is displayed. With -v/--verbose, |
|
3085 | local and remote repositories is displayed. With -v/--verbose, | |
3086 | status is also displayed for each bookmark like below:: |
|
3086 | status is also displayed for each bookmark like below:: | |
3087 |
|
3087 | |||
3088 | BM1 01234567890a added |
|
3088 | BM1 01234567890a added | |
3089 | BM2 1234567890ab advanced |
|
3089 | BM2 1234567890ab advanced | |
3090 | BM3 234567890abc diverged |
|
3090 | BM3 234567890abc diverged | |
3091 | BM4 34567890abcd changed |
|
3091 | BM4 34567890abcd changed | |
3092 |
|
3092 | |||
3093 | The action taken locally when pulling depends on the |
|
3093 | The action taken locally when pulling depends on the | |
3094 | status of each bookmark: |
|
3094 | status of each bookmark: | |
3095 |
|
3095 | |||
3096 | :``added``: pull will create it |
|
3096 | :``added``: pull will create it | |
3097 | :``advanced``: pull will update it |
|
3097 | :``advanced``: pull will update it | |
3098 | :``diverged``: pull will create a divergent bookmark |
|
3098 | :``diverged``: pull will create a divergent bookmark | |
3099 | :``changed``: result depends on remote changesets |
|
3099 | :``changed``: result depends on remote changesets | |
3100 |
|
3100 | |||
3101 | From the point of view of pulling behavior, bookmark |
|
3101 | From the point of view of pulling behavior, bookmark | |
3102 | existing only in the remote repository are treated as ``added``, |
|
3102 | existing only in the remote repository are treated as ``added``, | |
3103 | even if it is in fact locally deleted. |
|
3103 | even if it is in fact locally deleted. | |
3104 |
|
3104 | |||
3105 | .. container:: verbose |
|
3105 | .. container:: verbose | |
3106 |
|
3106 | |||
3107 | For remote repository, using --bundle avoids downloading the |
|
3107 | For remote repository, using --bundle avoids downloading the | |
3108 | changesets twice if the incoming is followed by a pull. |
|
3108 | changesets twice if the incoming is followed by a pull. | |
3109 |
|
3109 | |||
3110 | Examples: |
|
3110 | Examples: | |
3111 |
|
3111 | |||
3112 | - show incoming changes with patches and full description:: |
|
3112 | - show incoming changes with patches and full description:: | |
3113 |
|
3113 | |||
3114 | hg incoming -vp |
|
3114 | hg incoming -vp | |
3115 |
|
3115 | |||
3116 | - show incoming changes excluding merges, store a bundle:: |
|
3116 | - show incoming changes excluding merges, store a bundle:: | |
3117 |
|
3117 | |||
3118 | hg in -vpM --bundle incoming.hg |
|
3118 | hg in -vpM --bundle incoming.hg | |
3119 | hg pull incoming.hg |
|
3119 | hg pull incoming.hg | |
3120 |
|
3120 | |||
3121 | - briefly list changes inside a bundle:: |
|
3121 | - briefly list changes inside a bundle:: | |
3122 |
|
3122 | |||
3123 | hg in changes.hg -T "{desc|firstline}\\n" |
|
3123 | hg in changes.hg -T "{desc|firstline}\\n" | |
3124 |
|
3124 | |||
3125 | Returns 0 if there are incoming changes, 1 otherwise. |
|
3125 | Returns 0 if there are incoming changes, 1 otherwise. | |
3126 | """ |
|
3126 | """ | |
3127 | opts = pycompat.byteskwargs(opts) |
|
3127 | opts = pycompat.byteskwargs(opts) | |
3128 | if opts.get('graph'): |
|
3128 | if opts.get('graph'): | |
3129 | cmdutil.checkunsupportedgraphflags([], opts) |
|
3129 | cmdutil.checkunsupportedgraphflags([], opts) | |
3130 | def display(other, chlist, displayer): |
|
3130 | def display(other, chlist, displayer): | |
3131 | revdag = cmdutil.graphrevs(other, chlist, opts) |
|
3131 | revdag = cmdutil.graphrevs(other, chlist, opts) | |
3132 | cmdutil.displaygraph(ui, repo, revdag, displayer, |
|
3132 | cmdutil.displaygraph(ui, repo, revdag, displayer, | |
3133 | graphmod.asciiedges) |
|
3133 | graphmod.asciiedges) | |
3134 |
|
3134 | |||
3135 | hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True) |
|
3135 | hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True) | |
3136 | return 0 |
|
3136 | return 0 | |
3137 |
|
3137 | |||
3138 | if opts.get('bundle') and opts.get('subrepos'): |
|
3138 | if opts.get('bundle') and opts.get('subrepos'): | |
3139 | raise error.Abort(_('cannot combine --bundle and --subrepos')) |
|
3139 | raise error.Abort(_('cannot combine --bundle and --subrepos')) | |
3140 |
|
3140 | |||
3141 | if opts.get('bookmarks'): |
|
3141 | if opts.get('bookmarks'): | |
3142 | source, branches = hg.parseurl(ui.expandpath(source), |
|
3142 | source, branches = hg.parseurl(ui.expandpath(source), | |
3143 | opts.get('branch')) |
|
3143 | opts.get('branch')) | |
3144 | other = hg.peer(repo, opts, source) |
|
3144 | other = hg.peer(repo, opts, source) | |
3145 | if 'bookmarks' not in other.listkeys('namespaces'): |
|
3145 | if 'bookmarks' not in other.listkeys('namespaces'): | |
3146 | ui.warn(_("remote doesn't support bookmarks\n")) |
|
3146 | ui.warn(_("remote doesn't support bookmarks\n")) | |
3147 | return 0 |
|
3147 | return 0 | |
3148 | ui.pager('incoming') |
|
3148 | ui.pager('incoming') | |
3149 | ui.status(_('comparing with %s\n') % util.hidepassword(source)) |
|
3149 | ui.status(_('comparing with %s\n') % util.hidepassword(source)) | |
3150 | return bookmarks.incoming(ui, repo, other) |
|
3150 | return bookmarks.incoming(ui, repo, other) | |
3151 |
|
3151 | |||
3152 | repo._subtoppath = ui.expandpath(source) |
|
3152 | repo._subtoppath = ui.expandpath(source) | |
3153 | try: |
|
3153 | try: | |
3154 | return hg.incoming(ui, repo, source, opts) |
|
3154 | return hg.incoming(ui, repo, source, opts) | |
3155 | finally: |
|
3155 | finally: | |
3156 | del repo._subtoppath |
|
3156 | del repo._subtoppath | |
3157 |
|
3157 | |||
3158 |
|
3158 | |||
3159 | @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'), |
|
3159 | @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'), | |
3160 | norepo=True) |
|
3160 | norepo=True) | |
3161 | def init(ui, dest=".", **opts): |
|
3161 | def init(ui, dest=".", **opts): | |
3162 | """create a new repository in the given directory |
|
3162 | """create a new repository in the given directory | |
3163 |
|
3163 | |||
3164 | Initialize a new repository in the given directory. If the given |
|
3164 | Initialize a new repository in the given directory. If the given | |
3165 | directory does not exist, it will be created. |
|
3165 | directory does not exist, it will be created. | |
3166 |
|
3166 | |||
3167 | If no directory is given, the current directory is used. |
|
3167 | If no directory is given, the current directory is used. | |
3168 |
|
3168 | |||
3169 | It is possible to specify an ``ssh://`` URL as the destination. |
|
3169 | It is possible to specify an ``ssh://`` URL as the destination. | |
3170 | See :hg:`help urls` for more information. |
|
3170 | See :hg:`help urls` for more information. | |
3171 |
|
3171 | |||
3172 | Returns 0 on success. |
|
3172 | Returns 0 on success. | |
3173 | """ |
|
3173 | """ | |
3174 | opts = pycompat.byteskwargs(opts) |
|
3174 | opts = pycompat.byteskwargs(opts) | |
3175 | hg.peer(ui, opts, ui.expandpath(dest), create=True) |
|
3175 | hg.peer(ui, opts, ui.expandpath(dest), create=True) | |
3176 |
|
3176 | |||
3177 | @command('locate', |
|
3177 | @command('locate', | |
3178 | [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')), |
|
3178 | [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')), | |
3179 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), |
|
3179 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), | |
3180 | ('f', 'fullpath', None, _('print complete paths from the filesystem root')), |
|
3180 | ('f', 'fullpath', None, _('print complete paths from the filesystem root')), | |
3181 | ] + walkopts, |
|
3181 | ] + walkopts, | |
3182 | _('[OPTION]... [PATTERN]...')) |
|
3182 | _('[OPTION]... [PATTERN]...')) | |
3183 | def locate(ui, repo, *pats, **opts): |
|
3183 | def locate(ui, repo, *pats, **opts): | |
3184 | """locate files matching specific patterns (DEPRECATED) |
|
3184 | """locate files matching specific patterns (DEPRECATED) | |
3185 |
|
3185 | |||
3186 | Print files under Mercurial control in the working directory whose |
|
3186 | Print files under Mercurial control in the working directory whose | |
3187 | names match the given patterns. |
|
3187 | names match the given patterns. | |
3188 |
|
3188 | |||
3189 | By default, this command searches all directories in the working |
|
3189 | By default, this command searches all directories in the working | |
3190 | directory. To search just the current directory and its |
|
3190 | directory. To search just the current directory and its | |
3191 | subdirectories, use "--include .". |
|
3191 | subdirectories, use "--include .". | |
3192 |
|
3192 | |||
3193 | If no patterns are given to match, this command prints the names |
|
3193 | If no patterns are given to match, this command prints the names | |
3194 | of all files under Mercurial control in the working directory. |
|
3194 | of all files under Mercurial control in the working directory. | |
3195 |
|
3195 | |||
3196 | If you want to feed the output of this command into the "xargs" |
|
3196 | If you want to feed the output of this command into the "xargs" | |
3197 | command, use the -0 option to both this command and "xargs". This |
|
3197 | command, use the -0 option to both this command and "xargs". This | |
3198 | will avoid the problem of "xargs" treating single filenames that |
|
3198 | will avoid the problem of "xargs" treating single filenames that | |
3199 | contain whitespace as multiple filenames. |
|
3199 | contain whitespace as multiple filenames. | |
3200 |
|
3200 | |||
3201 | See :hg:`help files` for a more versatile command. |
|
3201 | See :hg:`help files` for a more versatile command. | |
3202 |
|
3202 | |||
3203 | Returns 0 if a match is found, 1 otherwise. |
|
3203 | Returns 0 if a match is found, 1 otherwise. | |
3204 | """ |
|
3204 | """ | |
3205 | opts = pycompat.byteskwargs(opts) |
|
3205 | opts = pycompat.byteskwargs(opts) | |
3206 | if opts.get('print0'): |
|
3206 | if opts.get('print0'): | |
3207 | end = '\0' |
|
3207 | end = '\0' | |
3208 | else: |
|
3208 | else: | |
3209 | end = '\n' |
|
3209 | end = '\n' | |
3210 | rev = scmutil.revsingle(repo, opts.get('rev'), None).node() |
|
3210 | rev = scmutil.revsingle(repo, opts.get('rev'), None).node() | |
3211 |
|
3211 | |||
3212 | ret = 1 |
|
3212 | ret = 1 | |
3213 | ctx = repo[rev] |
|
3213 | ctx = repo[rev] | |
3214 | m = scmutil.match(ctx, pats, opts, default='relglob', |
|
3214 | m = scmutil.match(ctx, pats, opts, default='relglob', | |
3215 | badfn=lambda x, y: False) |
|
3215 | badfn=lambda x, y: False) | |
3216 |
|
3216 | |||
3217 | ui.pager('locate') |
|
3217 | ui.pager('locate') | |
3218 | for abs in ctx.matches(m): |
|
3218 | for abs in ctx.matches(m): | |
3219 | if opts.get('fullpath'): |
|
3219 | if opts.get('fullpath'): | |
3220 | ui.write(repo.wjoin(abs), end) |
|
3220 | ui.write(repo.wjoin(abs), end) | |
3221 | else: |
|
3221 | else: | |
3222 | ui.write(((pats and m.rel(abs)) or abs), end) |
|
3222 | ui.write(((pats and m.rel(abs)) or abs), end) | |
3223 | ret = 0 |
|
3223 | ret = 0 | |
3224 |
|
3224 | |||
3225 | return ret |
|
3225 | return ret | |
3226 |
|
3226 | |||
3227 | @command('^log|history', |
|
3227 | @command('^log|history', | |
3228 | [('f', 'follow', None, |
|
3228 | [('f', 'follow', None, | |
3229 | _('follow changeset history, or file history across copies and renames')), |
|
3229 | _('follow changeset history, or file history across copies and renames')), | |
3230 | ('', 'follow-first', None, |
|
3230 | ('', 'follow-first', None, | |
3231 | _('only follow the first parent of merge changesets (DEPRECATED)')), |
|
3231 | _('only follow the first parent of merge changesets (DEPRECATED)')), | |
3232 | ('d', 'date', '', _('show revisions matching date spec'), _('DATE')), |
|
3232 | ('d', 'date', '', _('show revisions matching date spec'), _('DATE')), | |
3233 | ('C', 'copies', None, _('show copied files')), |
|
3233 | ('C', 'copies', None, _('show copied files')), | |
3234 | ('k', 'keyword', [], |
|
3234 | ('k', 'keyword', [], | |
3235 | _('do case-insensitive search for a given text'), _('TEXT')), |
|
3235 | _('do case-insensitive search for a given text'), _('TEXT')), | |
3236 | ('r', 'rev', [], _('show the specified revision or revset'), _('REV')), |
|
3236 | ('r', 'rev', [], _('show the specified revision or revset'), _('REV')), | |
3237 | ('L', 'line-range', [], |
|
3237 | ('L', 'line-range', [], | |
3238 | _('follow line range of specified file (EXPERIMENTAL)'), |
|
3238 | _('follow line range of specified file (EXPERIMENTAL)'), | |
3239 | _('FILE,RANGE')), |
|
3239 | _('FILE,RANGE')), | |
3240 | ('', 'removed', None, _('include revisions where files were removed')), |
|
3240 | ('', 'removed', None, _('include revisions where files were removed')), | |
3241 | ('m', 'only-merges', None, _('show only merges (DEPRECATED)')), |
|
3241 | ('m', 'only-merges', None, _('show only merges (DEPRECATED)')), | |
3242 | ('u', 'user', [], _('revisions committed by user'), _('USER')), |
|
3242 | ('u', 'user', [], _('revisions committed by user'), _('USER')), | |
3243 | ('', 'only-branch', [], |
|
3243 | ('', 'only-branch', [], | |
3244 | _('show only changesets within the given named branch (DEPRECATED)'), |
|
3244 | _('show only changesets within the given named branch (DEPRECATED)'), | |
3245 | _('BRANCH')), |
|
3245 | _('BRANCH')), | |
3246 | ('b', 'branch', [], |
|
3246 | ('b', 'branch', [], | |
3247 | _('show changesets within the given named branch'), _('BRANCH')), |
|
3247 | _('show changesets within the given named branch'), _('BRANCH')), | |
3248 | ('P', 'prune', [], |
|
3248 | ('P', 'prune', [], | |
3249 | _('do not display revision or any of its ancestors'), _('REV')), |
|
3249 | _('do not display revision or any of its ancestors'), _('REV')), | |
3250 | ] + logopts + walkopts, |
|
3250 | ] + logopts + walkopts, | |
3251 | _('[OPTION]... [FILE]'), |
|
3251 | _('[OPTION]... [FILE]'), | |
3252 | inferrepo=True) |
|
3252 | inferrepo=True) | |
3253 | def log(ui, repo, *pats, **opts): |
|
3253 | def log(ui, repo, *pats, **opts): | |
3254 | """show revision history of entire repository or files |
|
3254 | """show revision history of entire repository or files | |
3255 |
|
3255 | |||
3256 | Print the revision history of the specified files or the entire |
|
3256 | Print the revision history of the specified files or the entire | |
3257 | project. |
|
3257 | project. | |
3258 |
|
3258 | |||
3259 | If no revision range is specified, the default is ``tip:0`` unless |
|
3259 | If no revision range is specified, the default is ``tip:0`` unless | |
3260 | --follow is set, in which case the working directory parent is |
|
3260 | --follow is set, in which case the working directory parent is | |
3261 | used as the starting revision. |
|
3261 | used as the starting revision. | |
3262 |
|
3262 | |||
3263 | File history is shown without following rename or copy history of |
|
3263 | File history is shown without following rename or copy history of | |
3264 | files. Use -f/--follow with a filename to follow history across |
|
3264 | files. Use -f/--follow with a filename to follow history across | |
3265 | renames and copies. --follow without a filename will only show |
|
3265 | renames and copies. --follow without a filename will only show | |
3266 | ancestors or descendants of the starting revision. |
|
3266 | ancestors or descendants of the starting revision. | |
3267 |
|
3267 | |||
3268 | By default this command prints revision number and changeset id, |
|
3268 | By default this command prints revision number and changeset id, | |
3269 | tags, non-trivial parents, user, date and time, and a summary for |
|
3269 | tags, non-trivial parents, user, date and time, and a summary for | |
3270 | each commit. When the -v/--verbose switch is used, the list of |
|
3270 | each commit. When the -v/--verbose switch is used, the list of | |
3271 | changed files and full commit message are shown. |
|
3271 | changed files and full commit message are shown. | |
3272 |
|
3272 | |||
3273 | With --graph the revisions are shown as an ASCII art DAG with the most |
|
3273 | With --graph the revisions are shown as an ASCII art DAG with the most | |
3274 | recent changeset at the top. |
|
3274 | recent changeset at the top. | |
3275 | 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete, |
|
3275 | 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete, | |
3276 | and '+' represents a fork where the changeset from the lines below is a |
|
3276 | and '+' represents a fork where the changeset from the lines below is a | |
3277 | parent of the 'o' merge on the same line. |
|
3277 | parent of the 'o' merge on the same line. | |
3278 | Paths in the DAG are represented with '|', '/' and so forth. ':' in place |
|
3278 | Paths in the DAG are represented with '|', '/' and so forth. ':' in place | |
3279 | of a '|' indicates one or more revisions in a path are omitted. |
|
3279 | of a '|' indicates one or more revisions in a path are omitted. | |
3280 |
|
3280 | |||
3281 | .. container:: verbose |
|
3281 | .. container:: verbose | |
3282 |
|
3282 | |||
3283 | Use -L/--line-range FILE,M:N options to follow the history of lines |
|
3283 | Use -L/--line-range FILE,M:N options to follow the history of lines | |
3284 | from M to N in FILE. With -p/--patch only diff hunks affecting |
|
3284 | from M to N in FILE. With -p/--patch only diff hunks affecting | |
3285 | specified line range will be shown. This option requires --follow; |
|
3285 | specified line range will be shown. This option requires --follow; | |
3286 | it can be specified multiple times. Currently, this option is not |
|
3286 | it can be specified multiple times. Currently, this option is not | |
3287 | compatible with --graph. This option is experimental. |
|
3287 | compatible with --graph. This option is experimental. | |
3288 |
|
3288 | |||
3289 | .. note:: |
|
3289 | .. note:: | |
3290 |
|
3290 | |||
3291 | :hg:`log --patch` may generate unexpected diff output for merge |
|
3291 | :hg:`log --patch` may generate unexpected diff output for merge | |
3292 | changesets, as it will only compare the merge changeset against |
|
3292 | changesets, as it will only compare the merge changeset against | |
3293 | its first parent. Also, only files different from BOTH parents |
|
3293 | its first parent. Also, only files different from BOTH parents | |
3294 | will appear in files:. |
|
3294 | will appear in files:. | |
3295 |
|
3295 | |||
3296 | .. note:: |
|
3296 | .. note:: | |
3297 |
|
3297 | |||
3298 | For performance reasons, :hg:`log FILE` may omit duplicate changes |
|
3298 | For performance reasons, :hg:`log FILE` may omit duplicate changes | |
3299 | made on branches and will not show removals or mode changes. To |
|
3299 | made on branches and will not show removals or mode changes. To | |
3300 | see all such changes, use the --removed switch. |
|
3300 | see all such changes, use the --removed switch. | |
3301 |
|
3301 | |||
3302 | .. container:: verbose |
|
3302 | .. container:: verbose | |
3303 |
|
3303 | |||
3304 | .. note:: |
|
3304 | .. note:: | |
3305 |
|
3305 | |||
3306 | The history resulting from -L/--line-range options depends on diff |
|
3306 | The history resulting from -L/--line-range options depends on diff | |
3307 | options; for instance if white-spaces are ignored, respective changes |
|
3307 | options; for instance if white-spaces are ignored, respective changes | |
3308 | with only white-spaces in specified line range will not be listed. |
|
3308 | with only white-spaces in specified line range will not be listed. | |
3309 |
|
3309 | |||
3310 | .. container:: verbose |
|
3310 | .. container:: verbose | |
3311 |
|
3311 | |||
3312 | Some examples: |
|
3312 | Some examples: | |
3313 |
|
3313 | |||
3314 | - changesets with full descriptions and file lists:: |
|
3314 | - changesets with full descriptions and file lists:: | |
3315 |
|
3315 | |||
3316 | hg log -v |
|
3316 | hg log -v | |
3317 |
|
3317 | |||
3318 | - changesets ancestral to the working directory:: |
|
3318 | - changesets ancestral to the working directory:: | |
3319 |
|
3319 | |||
3320 | hg log -f |
|
3320 | hg log -f | |
3321 |
|
3321 | |||
3322 | - last 10 commits on the current branch:: |
|
3322 | - last 10 commits on the current branch:: | |
3323 |
|
3323 | |||
3324 | hg log -l 10 -b . |
|
3324 | hg log -l 10 -b . | |
3325 |
|
3325 | |||
3326 | - changesets showing all modifications of a file, including removals:: |
|
3326 | - changesets showing all modifications of a file, including removals:: | |
3327 |
|
3327 | |||
3328 | hg log --removed file.c |
|
3328 | hg log --removed file.c | |
3329 |
|
3329 | |||
3330 | - all changesets that touch a directory, with diffs, excluding merges:: |
|
3330 | - all changesets that touch a directory, with diffs, excluding merges:: | |
3331 |
|
3331 | |||
3332 | hg log -Mp lib/ |
|
3332 | hg log -Mp lib/ | |
3333 |
|
3333 | |||
3334 | - all revision numbers that match a keyword:: |
|
3334 | - all revision numbers that match a keyword:: | |
3335 |
|
3335 | |||
3336 | hg log -k bug --template "{rev}\\n" |
|
3336 | hg log -k bug --template "{rev}\\n" | |
3337 |
|
3337 | |||
3338 | - the full hash identifier of the working directory parent:: |
|
3338 | - the full hash identifier of the working directory parent:: | |
3339 |
|
3339 | |||
3340 | hg log -r . --template "{node}\\n" |
|
3340 | hg log -r . --template "{node}\\n" | |
3341 |
|
3341 | |||
3342 | - list available log templates:: |
|
3342 | - list available log templates:: | |
3343 |
|
3343 | |||
3344 | hg log -T list |
|
3344 | hg log -T list | |
3345 |
|
3345 | |||
3346 | - check if a given changeset is included in a tagged release:: |
|
3346 | - check if a given changeset is included in a tagged release:: | |
3347 |
|
3347 | |||
3348 | hg log -r "a21ccf and ancestor(1.9)" |
|
3348 | hg log -r "a21ccf and ancestor(1.9)" | |
3349 |
|
3349 | |||
3350 | - find all changesets by some user in a date range:: |
|
3350 | - find all changesets by some user in a date range:: | |
3351 |
|
3351 | |||
3352 | hg log -k alice -d "may 2008 to jul 2008" |
|
3352 | hg log -k alice -d "may 2008 to jul 2008" | |
3353 |
|
3353 | |||
3354 | - summary of all changesets after the last tag:: |
|
3354 | - summary of all changesets after the last tag:: | |
3355 |
|
3355 | |||
3356 | hg log -r "last(tagged())::" --template "{desc|firstline}\\n" |
|
3356 | hg log -r "last(tagged())::" --template "{desc|firstline}\\n" | |
3357 |
|
3357 | |||
3358 | - changesets touching lines 13 to 23 for file.c:: |
|
3358 | - changesets touching lines 13 to 23 for file.c:: | |
3359 |
|
3359 | |||
3360 | hg log -L file.c,13:23 |
|
3360 | hg log -L file.c,13:23 | |
3361 |
|
3361 | |||
3362 | - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of |
|
3362 | - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of | |
3363 | main.c with patch:: |
|
3363 | main.c with patch:: | |
3364 |
|
3364 | |||
3365 | hg log -L file.c,13:23 -L main.c,2:6 -p |
|
3365 | hg log -L file.c,13:23 -L main.c,2:6 -p | |
3366 |
|
3366 | |||
3367 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
3367 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
3368 |
|
3368 | |||
3369 | See :hg:`help revisions` for more about specifying and ordering |
|
3369 | See :hg:`help revisions` for more about specifying and ordering | |
3370 | revisions. |
|
3370 | revisions. | |
3371 |
|
3371 | |||
3372 | See :hg:`help templates` for more about pre-packaged styles and |
|
3372 | See :hg:`help templates` for more about pre-packaged styles and | |
3373 | specifying custom templates. The default template used by the log |
|
3373 | specifying custom templates. The default template used by the log | |
3374 | command can be customized via the ``ui.logtemplate`` configuration |
|
3374 | command can be customized via the ``ui.logtemplate`` configuration | |
3375 | setting. |
|
3375 | setting. | |
3376 |
|
3376 | |||
3377 | Returns 0 on success. |
|
3377 | Returns 0 on success. | |
3378 |
|
3378 | |||
3379 | """ |
|
3379 | """ | |
3380 | opts = pycompat.byteskwargs(opts) |
|
3380 | opts = pycompat.byteskwargs(opts) | |
3381 | linerange = opts.get('line_range') |
|
3381 | linerange = opts.get('line_range') | |
3382 |
|
3382 | |||
3383 | if linerange and not opts.get('follow'): |
|
3383 | if linerange and not opts.get('follow'): | |
3384 | raise error.Abort(_('--line-range requires --follow')) |
|
3384 | raise error.Abort(_('--line-range requires --follow')) | |
3385 |
|
3385 | |||
3386 | if linerange and pats: |
|
3386 | if linerange and pats: | |
3387 | raise error.Abort( |
|
3387 | raise error.Abort( | |
3388 | _('FILE arguments are not compatible with --line-range option') |
|
3388 | _('FILE arguments are not compatible with --line-range option') | |
3389 | ) |
|
3389 | ) | |
3390 |
|
3390 | |||
3391 | if opts.get('follow') and opts.get('rev'): |
|
3391 | if opts.get('follow') and opts.get('rev'): | |
3392 | opts['rev'] = [revsetlang.formatspec('reverse(::%lr)', opts.get('rev'))] |
|
3392 | opts['rev'] = [revsetlang.formatspec('reverse(::%lr)', opts.get('rev'))] | |
3393 | del opts['follow'] |
|
3393 | del opts['follow'] | |
3394 |
|
3394 | |||
3395 | if opts.get('graph'): |
|
3395 | if opts.get('graph'): | |
3396 | if linerange: |
|
3396 | if linerange: | |
3397 | raise error.Abort(_('graph not supported with line range patterns')) |
|
3397 | raise error.Abort(_('graph not supported with line range patterns')) | |
3398 | return cmdutil.graphlog(ui, repo, pats, opts) |
|
3398 | return cmdutil.graphlog(ui, repo, pats, opts) | |
3399 |
|
3399 | |||
3400 | revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts) |
|
3400 | revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts) | |
3401 | hunksfilter = None |
|
3401 | hunksfilter = None | |
3402 |
|
3402 | |||
3403 | if linerange: |
|
3403 | if linerange: | |
3404 | revs, lrfilematcher, hunksfilter = cmdutil.getloglinerangerevs( |
|
3404 | revs, lrfilematcher, hunksfilter = cmdutil.getloglinerangerevs( | |
3405 | repo, revs, opts) |
|
3405 | repo, revs, opts) | |
3406 |
|
3406 | |||
3407 | if filematcher is not None and lrfilematcher is not None: |
|
3407 | if filematcher is not None and lrfilematcher is not None: | |
3408 | basefilematcher = filematcher |
|
3408 | basefilematcher = filematcher | |
3409 |
|
3409 | |||
3410 | def filematcher(rev): |
|
3410 | def filematcher(rev): | |
3411 | files = (basefilematcher(rev).files() |
|
3411 | files = (basefilematcher(rev).files() | |
3412 | + lrfilematcher(rev).files()) |
|
3412 | + lrfilematcher(rev).files()) | |
3413 | return scmutil.matchfiles(repo, files) |
|
3413 | return scmutil.matchfiles(repo, files) | |
3414 |
|
3414 | |||
3415 | elif filematcher is None: |
|
3415 | elif filematcher is None: | |
3416 | filematcher = lrfilematcher |
|
3416 | filematcher = lrfilematcher | |
3417 |
|
3417 | |||
3418 | limit = cmdutil.loglimit(opts) |
|
3418 | limit = cmdutil.loglimit(opts) | |
3419 | count = 0 |
|
3419 | count = 0 | |
3420 |
|
3420 | |||
3421 | getrenamed = None |
|
3421 | getrenamed = None | |
3422 | if opts.get('copies'): |
|
3422 | if opts.get('copies'): | |
3423 | endrev = None |
|
3423 | endrev = None | |
3424 | if opts.get('rev'): |
|
3424 | if opts.get('rev'): | |
3425 | endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1 |
|
3425 | endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1 | |
3426 | getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) |
|
3426 | getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) | |
3427 |
|
3427 | |||
3428 | ui.pager('log') |
|
3428 | ui.pager('log') | |
3429 | displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True) |
|
3429 | displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True) | |
3430 | for rev in revs: |
|
3430 | for rev in revs: | |
3431 | if count == limit: |
|
3431 | if count == limit: | |
3432 | break |
|
3432 | break | |
3433 | ctx = repo[rev] |
|
3433 | ctx = repo[rev] | |
3434 | copies = None |
|
3434 | copies = None | |
3435 | if getrenamed is not None and rev: |
|
3435 | if getrenamed is not None and rev: | |
3436 | copies = [] |
|
3436 | copies = [] | |
3437 | for fn in ctx.files(): |
|
3437 | for fn in ctx.files(): | |
3438 | rename = getrenamed(fn, rev) |
|
3438 | rename = getrenamed(fn, rev) | |
3439 | if rename: |
|
3439 | if rename: | |
3440 | copies.append((fn, rename[0])) |
|
3440 | copies.append((fn, rename[0])) | |
3441 | if filematcher: |
|
3441 | if filematcher: | |
3442 | revmatchfn = filematcher(ctx.rev()) |
|
3442 | revmatchfn = filematcher(ctx.rev()) | |
3443 | else: |
|
3443 | else: | |
3444 | revmatchfn = None |
|
3444 | revmatchfn = None | |
3445 | if hunksfilter: |
|
3445 | if hunksfilter: | |
3446 | revhunksfilter = hunksfilter(rev) |
|
3446 | revhunksfilter = hunksfilter(rev) | |
3447 | else: |
|
3447 | else: | |
3448 | revhunksfilter = None |
|
3448 | revhunksfilter = None | |
3449 | displayer.show(ctx, copies=copies, matchfn=revmatchfn, |
|
3449 | displayer.show(ctx, copies=copies, matchfn=revmatchfn, | |
3450 | hunksfilterfn=revhunksfilter) |
|
3450 | hunksfilterfn=revhunksfilter) | |
3451 | if displayer.flush(ctx): |
|
3451 | if displayer.flush(ctx): | |
3452 | count += 1 |
|
3452 | count += 1 | |
3453 |
|
3453 | |||
3454 | displayer.close() |
|
3454 | displayer.close() | |
3455 |
|
3455 | |||
3456 | @command('manifest', |
|
3456 | @command('manifest', | |
3457 | [('r', 'rev', '', _('revision to display'), _('REV')), |
|
3457 | [('r', 'rev', '', _('revision to display'), _('REV')), | |
3458 | ('', 'all', False, _("list files from all revisions"))] |
|
3458 | ('', 'all', False, _("list files from all revisions"))] | |
3459 | + formatteropts, |
|
3459 | + formatteropts, | |
3460 | _('[-r REV]')) |
|
3460 | _('[-r REV]')) | |
3461 | def manifest(ui, repo, node=None, rev=None, **opts): |
|
3461 | def manifest(ui, repo, node=None, rev=None, **opts): | |
3462 | """output the current or given revision of the project manifest |
|
3462 | """output the current or given revision of the project manifest | |
3463 |
|
3463 | |||
3464 | Print a list of version controlled files for the given revision. |
|
3464 | Print a list of version controlled files for the given revision. | |
3465 | If no revision is given, the first parent of the working directory |
|
3465 | If no revision is given, the first parent of the working directory | |
3466 | is used, or the null revision if no revision is checked out. |
|
3466 | is used, or the null revision if no revision is checked out. | |
3467 |
|
3467 | |||
3468 | With -v, print file permissions, symlink and executable bits. |
|
3468 | With -v, print file permissions, symlink and executable bits. | |
3469 | With --debug, print file revision hashes. |
|
3469 | With --debug, print file revision hashes. | |
3470 |
|
3470 | |||
3471 | If option --all is specified, the list of all files from all revisions |
|
3471 | If option --all is specified, the list of all files from all revisions | |
3472 | is printed. This includes deleted and renamed files. |
|
3472 | is printed. This includes deleted and renamed files. | |
3473 |
|
3473 | |||
3474 | Returns 0 on success. |
|
3474 | Returns 0 on success. | |
3475 | """ |
|
3475 | """ | |
3476 | opts = pycompat.byteskwargs(opts) |
|
3476 | opts = pycompat.byteskwargs(opts) | |
3477 | fm = ui.formatter('manifest', opts) |
|
3477 | fm = ui.formatter('manifest', opts) | |
3478 |
|
3478 | |||
3479 | if opts.get('all'): |
|
3479 | if opts.get('all'): | |
3480 | if rev or node: |
|
3480 | if rev or node: | |
3481 | raise error.Abort(_("can't specify a revision with --all")) |
|
3481 | raise error.Abort(_("can't specify a revision with --all")) | |
3482 |
|
3482 | |||
3483 | res = [] |
|
3483 | res = [] | |
3484 | prefix = "data/" |
|
3484 | prefix = "data/" | |
3485 | suffix = ".i" |
|
3485 | suffix = ".i" | |
3486 | plen = len(prefix) |
|
3486 | plen = len(prefix) | |
3487 | slen = len(suffix) |
|
3487 | slen = len(suffix) | |
3488 | with repo.lock(): |
|
3488 | with repo.lock(): | |
3489 | for fn, b, size in repo.store.datafiles(): |
|
3489 | for fn, b, size in repo.store.datafiles(): | |
3490 | if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix: |
|
3490 | if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix: | |
3491 | res.append(fn[plen:-slen]) |
|
3491 | res.append(fn[plen:-slen]) | |
3492 | ui.pager('manifest') |
|
3492 | ui.pager('manifest') | |
3493 | for f in res: |
|
3493 | for f in res: | |
3494 | fm.startitem() |
|
3494 | fm.startitem() | |
3495 | fm.write("path", '%s\n', f) |
|
3495 | fm.write("path", '%s\n', f) | |
3496 | fm.end() |
|
3496 | fm.end() | |
3497 | return |
|
3497 | return | |
3498 |
|
3498 | |||
3499 | if rev and node: |
|
3499 | if rev and node: | |
3500 | raise error.Abort(_("please specify just one revision")) |
|
3500 | raise error.Abort(_("please specify just one revision")) | |
3501 |
|
3501 | |||
3502 | if not node: |
|
3502 | if not node: | |
3503 | node = rev |
|
3503 | node = rev | |
3504 |
|
3504 | |||
3505 | char = {'l': '@', 'x': '*', '': ''} |
|
3505 | char = {'l': '@', 'x': '*', '': ''} | |
3506 | mode = {'l': '644', 'x': '755', '': '644'} |
|
3506 | mode = {'l': '644', 'x': '755', '': '644'} | |
3507 | ctx = scmutil.revsingle(repo, node) |
|
3507 | ctx = scmutil.revsingle(repo, node) | |
3508 | mf = ctx.manifest() |
|
3508 | mf = ctx.manifest() | |
3509 | ui.pager('manifest') |
|
3509 | ui.pager('manifest') | |
3510 | for f in ctx: |
|
3510 | for f in ctx: | |
3511 | fm.startitem() |
|
3511 | fm.startitem() | |
3512 | fl = ctx[f].flags() |
|
3512 | fl = ctx[f].flags() | |
3513 | fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f])) |
|
3513 | fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f])) | |
3514 | fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl]) |
|
3514 | fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl]) | |
3515 | fm.write('path', '%s\n', f) |
|
3515 | fm.write('path', '%s\n', f) | |
3516 | fm.end() |
|
3516 | fm.end() | |
3517 |
|
3517 | |||
3518 | @command('^merge', |
|
3518 | @command('^merge', | |
3519 | [('f', 'force', None, |
|
3519 | [('f', 'force', None, | |
3520 | _('force a merge including outstanding changes (DEPRECATED)')), |
|
3520 | _('force a merge including outstanding changes (DEPRECATED)')), | |
3521 | ('r', 'rev', '', _('revision to merge'), _('REV')), |
|
3521 | ('r', 'rev', '', _('revision to merge'), _('REV')), | |
3522 | ('P', 'preview', None, |
|
3522 | ('P', 'preview', None, | |
3523 | _('review revisions to merge (no merge is performed)')) |
|
3523 | _('review revisions to merge (no merge is performed)')) | |
3524 | ] + mergetoolopts, |
|
3524 | ] + mergetoolopts, | |
3525 | _('[-P] [[-r] REV]')) |
|
3525 | _('[-P] [[-r] REV]')) | |
3526 | def merge(ui, repo, node=None, **opts): |
|
3526 | def merge(ui, repo, node=None, **opts): | |
3527 | """merge another revision into working directory |
|
3527 | """merge another revision into working directory | |
3528 |
|
3528 | |||
3529 | The current working directory is updated with all changes made in |
|
3529 | The current working directory is updated with all changes made in | |
3530 | the requested revision since the last common predecessor revision. |
|
3530 | the requested revision since the last common predecessor revision. | |
3531 |
|
3531 | |||
3532 | Files that changed between either parent are marked as changed for |
|
3532 | Files that changed between either parent are marked as changed for | |
3533 | the next commit and a commit must be performed before any further |
|
3533 | the next commit and a commit must be performed before any further | |
3534 | updates to the repository are allowed. The next commit will have |
|
3534 | updates to the repository are allowed. The next commit will have | |
3535 | two parents. |
|
3535 | two parents. | |
3536 |
|
3536 | |||
3537 | ``--tool`` can be used to specify the merge tool used for file |
|
3537 | ``--tool`` can be used to specify the merge tool used for file | |
3538 | merges. It overrides the HGMERGE environment variable and your |
|
3538 | merges. It overrides the HGMERGE environment variable and your | |
3539 | configuration files. See :hg:`help merge-tools` for options. |
|
3539 | configuration files. See :hg:`help merge-tools` for options. | |
3540 |
|
3540 | |||
3541 | If no revision is specified, the working directory's parent is a |
|
3541 | If no revision is specified, the working directory's parent is a | |
3542 | head revision, and the current branch contains exactly one other |
|
3542 | head revision, and the current branch contains exactly one other | |
3543 | head, the other head is merged with by default. Otherwise, an |
|
3543 | head, the other head is merged with by default. Otherwise, an | |
3544 | explicit revision with which to merge with must be provided. |
|
3544 | explicit revision with which to merge with must be provided. | |
3545 |
|
3545 | |||
3546 | See :hg:`help resolve` for information on handling file conflicts. |
|
3546 | See :hg:`help resolve` for information on handling file conflicts. | |
3547 |
|
3547 | |||
3548 | To undo an uncommitted merge, use :hg:`update --clean .` which |
|
3548 | To undo an uncommitted merge, use :hg:`update --clean .` which | |
3549 | will check out a clean copy of the original merge parent, losing |
|
3549 | will check out a clean copy of the original merge parent, losing | |
3550 | all changes. |
|
3550 | all changes. | |
3551 |
|
3551 | |||
3552 | Returns 0 on success, 1 if there are unresolved files. |
|
3552 | Returns 0 on success, 1 if there are unresolved files. | |
3553 | """ |
|
3553 | """ | |
3554 |
|
3554 | |||
3555 | opts = pycompat.byteskwargs(opts) |
|
3555 | opts = pycompat.byteskwargs(opts) | |
3556 | if opts.get('rev') and node: |
|
3556 | if opts.get('rev') and node: | |
3557 | raise error.Abort(_("please specify just one revision")) |
|
3557 | raise error.Abort(_("please specify just one revision")) | |
3558 | if not node: |
|
3558 | if not node: | |
3559 | node = opts.get('rev') |
|
3559 | node = opts.get('rev') | |
3560 |
|
3560 | |||
3561 | if node: |
|
3561 | if node: | |
3562 | node = scmutil.revsingle(repo, node).node() |
|
3562 | node = scmutil.revsingle(repo, node).node() | |
3563 |
|
3563 | |||
3564 | if not node: |
|
3564 | if not node: | |
3565 | node = repo[destutil.destmerge(repo)].node() |
|
3565 | node = repo[destutil.destmerge(repo)].node() | |
3566 |
|
3566 | |||
3567 | if opts.get('preview'): |
|
3567 | if opts.get('preview'): | |
3568 | # find nodes that are ancestors of p2 but not of p1 |
|
3568 | # find nodes that are ancestors of p2 but not of p1 | |
3569 | p1 = repo.lookup('.') |
|
3569 | p1 = repo.lookup('.') | |
3570 | p2 = repo.lookup(node) |
|
3570 | p2 = repo.lookup(node) | |
3571 | nodes = repo.changelog.findmissing(common=[p1], heads=[p2]) |
|
3571 | nodes = repo.changelog.findmissing(common=[p1], heads=[p2]) | |
3572 |
|
3572 | |||
3573 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
3573 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
3574 | for node in nodes: |
|
3574 | for node in nodes: | |
3575 | displayer.show(repo[node]) |
|
3575 | displayer.show(repo[node]) | |
3576 | displayer.close() |
|
3576 | displayer.close() | |
3577 | return 0 |
|
3577 | return 0 | |
3578 |
|
3578 | |||
3579 | try: |
|
3579 | try: | |
3580 | # ui.forcemerge is an internal variable, do not document |
|
3580 | # ui.forcemerge is an internal variable, do not document | |
3581 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge') |
|
3581 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge') | |
3582 | force = opts.get('force') |
|
3582 | force = opts.get('force') | |
3583 | labels = ['working copy', 'merge rev'] |
|
3583 | labels = ['working copy', 'merge rev'] | |
3584 | return hg.merge(repo, node, force=force, mergeforce=force, |
|
3584 | return hg.merge(repo, node, force=force, mergeforce=force, | |
3585 | labels=labels) |
|
3585 | labels=labels) | |
3586 | finally: |
|
3586 | finally: | |
3587 | ui.setconfig('ui', 'forcemerge', '', 'merge') |
|
3587 | ui.setconfig('ui', 'forcemerge', '', 'merge') | |
3588 |
|
3588 | |||
3589 | @command('outgoing|out', |
|
3589 | @command('outgoing|out', | |
3590 | [('f', 'force', None, _('run even when the destination is unrelated')), |
|
3590 | [('f', 'force', None, _('run even when the destination is unrelated')), | |
3591 | ('r', 'rev', [], |
|
3591 | ('r', 'rev', [], | |
3592 | _('a changeset intended to be included in the destination'), _('REV')), |
|
3592 | _('a changeset intended to be included in the destination'), _('REV')), | |
3593 | ('n', 'newest-first', None, _('show newest record first')), |
|
3593 | ('n', 'newest-first', None, _('show newest record first')), | |
3594 | ('B', 'bookmarks', False, _('compare bookmarks')), |
|
3594 | ('B', 'bookmarks', False, _('compare bookmarks')), | |
3595 | ('b', 'branch', [], _('a specific branch you would like to push'), |
|
3595 | ('b', 'branch', [], _('a specific branch you would like to push'), | |
3596 | _('BRANCH')), |
|
3596 | _('BRANCH')), | |
3597 | ] + logopts + remoteopts + subrepoopts, |
|
3597 | ] + logopts + remoteopts + subrepoopts, | |
3598 | _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')) |
|
3598 | _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')) | |
3599 | def outgoing(ui, repo, dest=None, **opts): |
|
3599 | def outgoing(ui, repo, dest=None, **opts): | |
3600 | """show changesets not found in the destination |
|
3600 | """show changesets not found in the destination | |
3601 |
|
3601 | |||
3602 | Show changesets not found in the specified destination repository |
|
3602 | Show changesets not found in the specified destination repository | |
3603 | or the default push location. These are the changesets that would |
|
3603 | or the default push location. These are the changesets that would | |
3604 | be pushed if a push was requested. |
|
3604 | be pushed if a push was requested. | |
3605 |
|
3605 | |||
3606 | See pull for details of valid destination formats. |
|
3606 | See pull for details of valid destination formats. | |
3607 |
|
3607 | |||
3608 | .. container:: verbose |
|
3608 | .. container:: verbose | |
3609 |
|
3609 | |||
3610 | With -B/--bookmarks, the result of bookmark comparison between |
|
3610 | With -B/--bookmarks, the result of bookmark comparison between | |
3611 | local and remote repositories is displayed. With -v/--verbose, |
|
3611 | local and remote repositories is displayed. With -v/--verbose, | |
3612 | status is also displayed for each bookmark like below:: |
|
3612 | status is also displayed for each bookmark like below:: | |
3613 |
|
3613 | |||
3614 | BM1 01234567890a added |
|
3614 | BM1 01234567890a added | |
3615 | BM2 deleted |
|
3615 | BM2 deleted | |
3616 | BM3 234567890abc advanced |
|
3616 | BM3 234567890abc advanced | |
3617 | BM4 34567890abcd diverged |
|
3617 | BM4 34567890abcd diverged | |
3618 | BM5 4567890abcde changed |
|
3618 | BM5 4567890abcde changed | |
3619 |
|
3619 | |||
3620 | The action taken when pushing depends on the |
|
3620 | The action taken when pushing depends on the | |
3621 | status of each bookmark: |
|
3621 | status of each bookmark: | |
3622 |
|
3622 | |||
3623 | :``added``: push with ``-B`` will create it |
|
3623 | :``added``: push with ``-B`` will create it | |
3624 | :``deleted``: push with ``-B`` will delete it |
|
3624 | :``deleted``: push with ``-B`` will delete it | |
3625 | :``advanced``: push will update it |
|
3625 | :``advanced``: push will update it | |
3626 | :``diverged``: push with ``-B`` will update it |
|
3626 | :``diverged``: push with ``-B`` will update it | |
3627 | :``changed``: push with ``-B`` will update it |
|
3627 | :``changed``: push with ``-B`` will update it | |
3628 |
|
3628 | |||
3629 | From the point of view of pushing behavior, bookmarks |
|
3629 | From the point of view of pushing behavior, bookmarks | |
3630 | existing only in the remote repository are treated as |
|
3630 | existing only in the remote repository are treated as | |
3631 | ``deleted``, even if it is in fact added remotely. |
|
3631 | ``deleted``, even if it is in fact added remotely. | |
3632 |
|
3632 | |||
3633 | Returns 0 if there are outgoing changes, 1 otherwise. |
|
3633 | Returns 0 if there are outgoing changes, 1 otherwise. | |
3634 | """ |
|
3634 | """ | |
3635 | opts = pycompat.byteskwargs(opts) |
|
3635 | opts = pycompat.byteskwargs(opts) | |
3636 | if opts.get('graph'): |
|
3636 | if opts.get('graph'): | |
3637 | cmdutil.checkunsupportedgraphflags([], opts) |
|
3637 | cmdutil.checkunsupportedgraphflags([], opts) | |
3638 | o, other = hg._outgoing(ui, repo, dest, opts) |
|
3638 | o, other = hg._outgoing(ui, repo, dest, opts) | |
3639 | if not o: |
|
3639 | if not o: | |
3640 | cmdutil.outgoinghooks(ui, repo, other, opts, o) |
|
3640 | cmdutil.outgoinghooks(ui, repo, other, opts, o) | |
3641 | return |
|
3641 | return | |
3642 |
|
3642 | |||
3643 | revdag = cmdutil.graphrevs(repo, o, opts) |
|
3643 | revdag = cmdutil.graphrevs(repo, o, opts) | |
3644 | ui.pager('outgoing') |
|
3644 | ui.pager('outgoing') | |
3645 | displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True) |
|
3645 | displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True) | |
3646 | cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges) |
|
3646 | cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges) | |
3647 | cmdutil.outgoinghooks(ui, repo, other, opts, o) |
|
3647 | cmdutil.outgoinghooks(ui, repo, other, opts, o) | |
3648 | return 0 |
|
3648 | return 0 | |
3649 |
|
3649 | |||
3650 | if opts.get('bookmarks'): |
|
3650 | if opts.get('bookmarks'): | |
3651 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
3651 | dest = ui.expandpath(dest or 'default-push', dest or 'default') | |
3652 | dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
3652 | dest, branches = hg.parseurl(dest, opts.get('branch')) | |
3653 | other = hg.peer(repo, opts, dest) |
|
3653 | other = hg.peer(repo, opts, dest) | |
3654 | if 'bookmarks' not in other.listkeys('namespaces'): |
|
3654 | if 'bookmarks' not in other.listkeys('namespaces'): | |
3655 | ui.warn(_("remote doesn't support bookmarks\n")) |
|
3655 | ui.warn(_("remote doesn't support bookmarks\n")) | |
3656 | return 0 |
|
3656 | return 0 | |
3657 | ui.status(_('comparing with %s\n') % util.hidepassword(dest)) |
|
3657 | ui.status(_('comparing with %s\n') % util.hidepassword(dest)) | |
3658 | ui.pager('outgoing') |
|
3658 | ui.pager('outgoing') | |
3659 | return bookmarks.outgoing(ui, repo, other) |
|
3659 | return bookmarks.outgoing(ui, repo, other) | |
3660 |
|
3660 | |||
3661 | repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default') |
|
3661 | repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default') | |
3662 | try: |
|
3662 | try: | |
3663 | return hg.outgoing(ui, repo, dest, opts) |
|
3663 | return hg.outgoing(ui, repo, dest, opts) | |
3664 | finally: |
|
3664 | finally: | |
3665 | del repo._subtoppath |
|
3665 | del repo._subtoppath | |
3666 |
|
3666 | |||
3667 | @command('parents', |
|
3667 | @command('parents', | |
3668 | [('r', 'rev', '', _('show parents of the specified revision'), _('REV')), |
|
3668 | [('r', 'rev', '', _('show parents of the specified revision'), _('REV')), | |
3669 | ] + templateopts, |
|
3669 | ] + templateopts, | |
3670 | _('[-r REV] [FILE]'), |
|
3670 | _('[-r REV] [FILE]'), | |
3671 | inferrepo=True) |
|
3671 | inferrepo=True) | |
3672 | def parents(ui, repo, file_=None, **opts): |
|
3672 | def parents(ui, repo, file_=None, **opts): | |
3673 | """show the parents of the working directory or revision (DEPRECATED) |
|
3673 | """show the parents of the working directory or revision (DEPRECATED) | |
3674 |
|
3674 | |||
3675 | Print the working directory's parent revisions. If a revision is |
|
3675 | Print the working directory's parent revisions. If a revision is | |
3676 | given via -r/--rev, the parent of that revision will be printed. |
|
3676 | given via -r/--rev, the parent of that revision will be printed. | |
3677 | If a file argument is given, the revision in which the file was |
|
3677 | If a file argument is given, the revision in which the file was | |
3678 | last changed (before the working directory revision or the |
|
3678 | last changed (before the working directory revision or the | |
3679 | argument to --rev if given) is printed. |
|
3679 | argument to --rev if given) is printed. | |
3680 |
|
3680 | |||
3681 | This command is equivalent to:: |
|
3681 | This command is equivalent to:: | |
3682 |
|
3682 | |||
3683 | hg log -r "p1()+p2()" or |
|
3683 | hg log -r "p1()+p2()" or | |
3684 | hg log -r "p1(REV)+p2(REV)" or |
|
3684 | hg log -r "p1(REV)+p2(REV)" or | |
3685 | hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or |
|
3685 | hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or | |
3686 | hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))" |
|
3686 | hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))" | |
3687 |
|
3687 | |||
3688 | See :hg:`summary` and :hg:`help revsets` for related information. |
|
3688 | See :hg:`summary` and :hg:`help revsets` for related information. | |
3689 |
|
3689 | |||
3690 | Returns 0 on success. |
|
3690 | Returns 0 on success. | |
3691 | """ |
|
3691 | """ | |
3692 |
|
3692 | |||
3693 | opts = pycompat.byteskwargs(opts) |
|
3693 | opts = pycompat.byteskwargs(opts) | |
3694 | ctx = scmutil.revsingle(repo, opts.get('rev'), None) |
|
3694 | ctx = scmutil.revsingle(repo, opts.get('rev'), None) | |
3695 |
|
3695 | |||
3696 | if file_: |
|
3696 | if file_: | |
3697 | m = scmutil.match(ctx, (file_,), opts) |
|
3697 | m = scmutil.match(ctx, (file_,), opts) | |
3698 | if m.anypats() or len(m.files()) != 1: |
|
3698 | if m.anypats() or len(m.files()) != 1: | |
3699 | raise error.Abort(_('can only specify an explicit filename')) |
|
3699 | raise error.Abort(_('can only specify an explicit filename')) | |
3700 | file_ = m.files()[0] |
|
3700 | file_ = m.files()[0] | |
3701 | filenodes = [] |
|
3701 | filenodes = [] | |
3702 | for cp in ctx.parents(): |
|
3702 | for cp in ctx.parents(): | |
3703 | if not cp: |
|
3703 | if not cp: | |
3704 | continue |
|
3704 | continue | |
3705 | try: |
|
3705 | try: | |
3706 | filenodes.append(cp.filenode(file_)) |
|
3706 | filenodes.append(cp.filenode(file_)) | |
3707 | except error.LookupError: |
|
3707 | except error.LookupError: | |
3708 | pass |
|
3708 | pass | |
3709 | if not filenodes: |
|
3709 | if not filenodes: | |
3710 | raise error.Abort(_("'%s' not found in manifest!") % file_) |
|
3710 | raise error.Abort(_("'%s' not found in manifest!") % file_) | |
3711 | p = [] |
|
3711 | p = [] | |
3712 | for fn in filenodes: |
|
3712 | for fn in filenodes: | |
3713 | fctx = repo.filectx(file_, fileid=fn) |
|
3713 | fctx = repo.filectx(file_, fileid=fn) | |
3714 | p.append(fctx.node()) |
|
3714 | p.append(fctx.node()) | |
3715 | else: |
|
3715 | else: | |
3716 | p = [cp.node() for cp in ctx.parents()] |
|
3716 | p = [cp.node() for cp in ctx.parents()] | |
3717 |
|
3717 | |||
3718 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
3718 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
3719 | for n in p: |
|
3719 | for n in p: | |
3720 | if n != nullid: |
|
3720 | if n != nullid: | |
3721 | displayer.show(repo[n]) |
|
3721 | displayer.show(repo[n]) | |
3722 | displayer.close() |
|
3722 | displayer.close() | |
3723 |
|
3723 | |||
3724 | @command('paths', formatteropts, _('[NAME]'), optionalrepo=True) |
|
3724 | @command('paths', formatteropts, _('[NAME]'), optionalrepo=True) | |
3725 | def paths(ui, repo, search=None, **opts): |
|
3725 | def paths(ui, repo, search=None, **opts): | |
3726 | """show aliases for remote repositories |
|
3726 | """show aliases for remote repositories | |
3727 |
|
3727 | |||
3728 | Show definition of symbolic path name NAME. If no name is given, |
|
3728 | Show definition of symbolic path name NAME. If no name is given, | |
3729 | show definition of all available names. |
|
3729 | show definition of all available names. | |
3730 |
|
3730 | |||
3731 | Option -q/--quiet suppresses all output when searching for NAME |
|
3731 | Option -q/--quiet suppresses all output when searching for NAME | |
3732 | and shows only the path names when listing all definitions. |
|
3732 | and shows only the path names when listing all definitions. | |
3733 |
|
3733 | |||
3734 | Path names are defined in the [paths] section of your |
|
3734 | Path names are defined in the [paths] section of your | |
3735 | configuration file and in ``/etc/mercurial/hgrc``. If run inside a |
|
3735 | configuration file and in ``/etc/mercurial/hgrc``. If run inside a | |
3736 | repository, ``.hg/hgrc`` is used, too. |
|
3736 | repository, ``.hg/hgrc`` is used, too. | |
3737 |
|
3737 | |||
3738 | The path names ``default`` and ``default-push`` have a special |
|
3738 | The path names ``default`` and ``default-push`` have a special | |
3739 | meaning. When performing a push or pull operation, they are used |
|
3739 | meaning. When performing a push or pull operation, they are used | |
3740 | as fallbacks if no location is specified on the command-line. |
|
3740 | as fallbacks if no location is specified on the command-line. | |
3741 | When ``default-push`` is set, it will be used for push and |
|
3741 | When ``default-push`` is set, it will be used for push and | |
3742 | ``default`` will be used for pull; otherwise ``default`` is used |
|
3742 | ``default`` will be used for pull; otherwise ``default`` is used | |
3743 | as the fallback for both. When cloning a repository, the clone |
|
3743 | as the fallback for both. When cloning a repository, the clone | |
3744 | source is written as ``default`` in ``.hg/hgrc``. |
|
3744 | source is written as ``default`` in ``.hg/hgrc``. | |
3745 |
|
3745 | |||
3746 | .. note:: |
|
3746 | .. note:: | |
3747 |
|
3747 | |||
3748 | ``default`` and ``default-push`` apply to all inbound (e.g. |
|
3748 | ``default`` and ``default-push`` apply to all inbound (e.g. | |
3749 | :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` |
|
3749 | :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` | |
3750 | and :hg:`bundle`) operations. |
|
3750 | and :hg:`bundle`) operations. | |
3751 |
|
3751 | |||
3752 | See :hg:`help urls` for more information. |
|
3752 | See :hg:`help urls` for more information. | |
3753 |
|
3753 | |||
3754 | Returns 0 on success. |
|
3754 | Returns 0 on success. | |
3755 | """ |
|
3755 | """ | |
3756 |
|
3756 | |||
3757 | opts = pycompat.byteskwargs(opts) |
|
3757 | opts = pycompat.byteskwargs(opts) | |
3758 | ui.pager('paths') |
|
3758 | ui.pager('paths') | |
3759 | if search: |
|
3759 | if search: | |
3760 | pathitems = [(name, path) for name, path in ui.paths.iteritems() |
|
3760 | pathitems = [(name, path) for name, path in ui.paths.iteritems() | |
3761 | if name == search] |
|
3761 | if name == search] | |
3762 | else: |
|
3762 | else: | |
3763 | pathitems = sorted(ui.paths.iteritems()) |
|
3763 | pathitems = sorted(ui.paths.iteritems()) | |
3764 |
|
3764 | |||
3765 | fm = ui.formatter('paths', opts) |
|
3765 | fm = ui.formatter('paths', opts) | |
3766 | if fm.isplain(): |
|
3766 | if fm.isplain(): | |
3767 | hidepassword = util.hidepassword |
|
3767 | hidepassword = util.hidepassword | |
3768 | else: |
|
3768 | else: | |
3769 | hidepassword = str |
|
3769 | hidepassword = str | |
3770 | if ui.quiet: |
|
3770 | if ui.quiet: | |
3771 | namefmt = '%s\n' |
|
3771 | namefmt = '%s\n' | |
3772 | else: |
|
3772 | else: | |
3773 | namefmt = '%s = ' |
|
3773 | namefmt = '%s = ' | |
3774 | showsubopts = not search and not ui.quiet |
|
3774 | showsubopts = not search and not ui.quiet | |
3775 |
|
3775 | |||
3776 | for name, path in pathitems: |
|
3776 | for name, path in pathitems: | |
3777 | fm.startitem() |
|
3777 | fm.startitem() | |
3778 | fm.condwrite(not search, 'name', namefmt, name) |
|
3778 | fm.condwrite(not search, 'name', namefmt, name) | |
3779 | fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc)) |
|
3779 | fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc)) | |
3780 | for subopt, value in sorted(path.suboptions.items()): |
|
3780 | for subopt, value in sorted(path.suboptions.items()): | |
3781 | assert subopt not in ('name', 'url') |
|
3781 | assert subopt not in ('name', 'url') | |
3782 | if showsubopts: |
|
3782 | if showsubopts: | |
3783 | fm.plain('%s:%s = ' % (name, subopt)) |
|
3783 | fm.plain('%s:%s = ' % (name, subopt)) | |
3784 | fm.condwrite(showsubopts, subopt, '%s\n', value) |
|
3784 | fm.condwrite(showsubopts, subopt, '%s\n', value) | |
3785 |
|
3785 | |||
3786 | fm.end() |
|
3786 | fm.end() | |
3787 |
|
3787 | |||
3788 | if search and not pathitems: |
|
3788 | if search and not pathitems: | |
3789 | if not ui.quiet: |
|
3789 | if not ui.quiet: | |
3790 | ui.warn(_("not found!\n")) |
|
3790 | ui.warn(_("not found!\n")) | |
3791 | return 1 |
|
3791 | return 1 | |
3792 | else: |
|
3792 | else: | |
3793 | return 0 |
|
3793 | return 0 | |
3794 |
|
3794 | |||
3795 | @command('phase', |
|
3795 | @command('phase', | |
3796 | [('p', 'public', False, _('set changeset phase to public')), |
|
3796 | [('p', 'public', False, _('set changeset phase to public')), | |
3797 | ('d', 'draft', False, _('set changeset phase to draft')), |
|
3797 | ('d', 'draft', False, _('set changeset phase to draft')), | |
3798 | ('s', 'secret', False, _('set changeset phase to secret')), |
|
3798 | ('s', 'secret', False, _('set changeset phase to secret')), | |
3799 | ('f', 'force', False, _('allow to move boundary backward')), |
|
3799 | ('f', 'force', False, _('allow to move boundary backward')), | |
3800 | ('r', 'rev', [], _('target revision'), _('REV')), |
|
3800 | ('r', 'rev', [], _('target revision'), _('REV')), | |
3801 | ], |
|
3801 | ], | |
3802 | _('[-p|-d|-s] [-f] [-r] [REV...]')) |
|
3802 | _('[-p|-d|-s] [-f] [-r] [REV...]')) | |
3803 | def phase(ui, repo, *revs, **opts): |
|
3803 | def phase(ui, repo, *revs, **opts): | |
3804 | """set or show the current phase name |
|
3804 | """set or show the current phase name | |
3805 |
|
3805 | |||
3806 | With no argument, show the phase name of the current revision(s). |
|
3806 | With no argument, show the phase name of the current revision(s). | |
3807 |
|
3807 | |||
3808 | With one of -p/--public, -d/--draft or -s/--secret, change the |
|
3808 | With one of -p/--public, -d/--draft or -s/--secret, change the | |
3809 | phase value of the specified revisions. |
|
3809 | phase value of the specified revisions. | |
3810 |
|
3810 | |||
3811 | Unless -f/--force is specified, :hg:`phase` won't move changesets from a |
|
3811 | Unless -f/--force is specified, :hg:`phase` won't move changesets from a | |
3812 | lower phase to a higher phase. Phases are ordered as follows:: |
|
3812 | lower phase to a higher phase. Phases are ordered as follows:: | |
3813 |
|
3813 | |||
3814 | public < draft < secret |
|
3814 | public < draft < secret | |
3815 |
|
3815 | |||
3816 | Returns 0 on success, 1 if some phases could not be changed. |
|
3816 | Returns 0 on success, 1 if some phases could not be changed. | |
3817 |
|
3817 | |||
3818 | (For more information about the phases concept, see :hg:`help phases`.) |
|
3818 | (For more information about the phases concept, see :hg:`help phases`.) | |
3819 | """ |
|
3819 | """ | |
3820 | opts = pycompat.byteskwargs(opts) |
|
3820 | opts = pycompat.byteskwargs(opts) | |
3821 | # search for a unique phase argument |
|
3821 | # search for a unique phase argument | |
3822 | targetphase = None |
|
3822 | targetphase = None | |
3823 | for idx, name in enumerate(phases.phasenames): |
|
3823 | for idx, name in enumerate(phases.phasenames): | |
3824 | if opts[name]: |
|
3824 | if opts[name]: | |
3825 | if targetphase is not None: |
|
3825 | if targetphase is not None: | |
3826 | raise error.Abort(_('only one phase can be specified')) |
|
3826 | raise error.Abort(_('only one phase can be specified')) | |
3827 | targetphase = idx |
|
3827 | targetphase = idx | |
3828 |
|
3828 | |||
3829 | # look for specified revision |
|
3829 | # look for specified revision | |
3830 | revs = list(revs) |
|
3830 | revs = list(revs) | |
3831 | revs.extend(opts['rev']) |
|
3831 | revs.extend(opts['rev']) | |
3832 | if not revs: |
|
3832 | if not revs: | |
3833 | # display both parents as the second parent phase can influence |
|
3833 | # display both parents as the second parent phase can influence | |
3834 | # the phase of a merge commit |
|
3834 | # the phase of a merge commit | |
3835 | revs = [c.rev() for c in repo[None].parents()] |
|
3835 | revs = [c.rev() for c in repo[None].parents()] | |
3836 |
|
3836 | |||
3837 | revs = scmutil.revrange(repo, revs) |
|
3837 | revs = scmutil.revrange(repo, revs) | |
3838 |
|
3838 | |||
3839 | lock = None |
|
3839 | lock = None | |
3840 | ret = 0 |
|
3840 | ret = 0 | |
3841 | if targetphase is None: |
|
3841 | if targetphase is None: | |
3842 | # display |
|
3842 | # display | |
3843 | for r in revs: |
|
3843 | for r in revs: | |
3844 | ctx = repo[r] |
|
3844 | ctx = repo[r] | |
3845 | ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr())) |
|
3845 | ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr())) | |
3846 | else: |
|
3846 | else: | |
3847 | tr = None |
|
3847 | tr = None | |
3848 | lock = repo.lock() |
|
3848 | lock = repo.lock() | |
3849 | try: |
|
3849 | try: | |
3850 | tr = repo.transaction("phase") |
|
3850 | tr = repo.transaction("phase") | |
3851 | # set phase |
|
3851 | # set phase | |
3852 | if not revs: |
|
3852 | if not revs: | |
3853 | raise error.Abort(_('empty revision set')) |
|
3853 | raise error.Abort(_('empty revision set')) | |
3854 | nodes = [repo[r].node() for r in revs] |
|
3854 | nodes = [repo[r].node() for r in revs] | |
3855 | # moving revision from public to draft may hide them |
|
3855 | # moving revision from public to draft may hide them | |
3856 | # We have to check result on an unfiltered repository |
|
3856 | # We have to check result on an unfiltered repository | |
3857 | unfi = repo.unfiltered() |
|
3857 | unfi = repo.unfiltered() | |
3858 | getphase = unfi._phasecache.phase |
|
3858 | getphase = unfi._phasecache.phase | |
3859 | olddata = [getphase(unfi, r) for r in unfi] |
|
3859 | olddata = [getphase(unfi, r) for r in unfi] | |
3860 | phases.advanceboundary(repo, tr, targetphase, nodes) |
|
3860 | phases.advanceboundary(repo, tr, targetphase, nodes) | |
3861 | if opts['force']: |
|
3861 | if opts['force']: | |
3862 | phases.retractboundary(repo, tr, targetphase, nodes) |
|
3862 | phases.retractboundary(repo, tr, targetphase, nodes) | |
3863 | tr.close() |
|
3863 | tr.close() | |
3864 | finally: |
|
3864 | finally: | |
3865 | if tr is not None: |
|
3865 | if tr is not None: | |
3866 | tr.release() |
|
3866 | tr.release() | |
3867 | lock.release() |
|
3867 | lock.release() | |
3868 | getphase = unfi._phasecache.phase |
|
3868 | getphase = unfi._phasecache.phase | |
3869 | newdata = [getphase(unfi, r) for r in unfi] |
|
3869 | newdata = [getphase(unfi, r) for r in unfi] | |
3870 | changes = sum(newdata[r] != olddata[r] for r in unfi) |
|
3870 | changes = sum(newdata[r] != olddata[r] for r in unfi) | |
3871 | cl = unfi.changelog |
|
3871 | cl = unfi.changelog | |
3872 | rejected = [n for n in nodes |
|
3872 | rejected = [n for n in nodes | |
3873 | if newdata[cl.rev(n)] < targetphase] |
|
3873 | if newdata[cl.rev(n)] < targetphase] | |
3874 | if rejected: |
|
3874 | if rejected: | |
3875 | ui.warn(_('cannot move %i changesets to a higher ' |
|
3875 | ui.warn(_('cannot move %i changesets to a higher ' | |
3876 | 'phase, use --force\n') % len(rejected)) |
|
3876 | 'phase, use --force\n') % len(rejected)) | |
3877 | ret = 1 |
|
3877 | ret = 1 | |
3878 | if changes: |
|
3878 | if changes: | |
3879 | msg = _('phase changed for %i changesets\n') % changes |
|
3879 | msg = _('phase changed for %i changesets\n') % changes | |
3880 | if ret: |
|
3880 | if ret: | |
3881 | ui.status(msg) |
|
3881 | ui.status(msg) | |
3882 | else: |
|
3882 | else: | |
3883 | ui.note(msg) |
|
3883 | ui.note(msg) | |
3884 | else: |
|
3884 | else: | |
3885 | ui.warn(_('no phases changed\n')) |
|
3885 | ui.warn(_('no phases changed\n')) | |
3886 | return ret |
|
3886 | return ret | |
3887 |
|
3887 | |||
3888 | def postincoming(ui, repo, modheads, optupdate, checkout, brev): |
|
3888 | def postincoming(ui, repo, modheads, optupdate, checkout, brev): | |
3889 | """Run after a changegroup has been added via pull/unbundle |
|
3889 | """Run after a changegroup has been added via pull/unbundle | |
3890 |
|
3890 | |||
3891 | This takes arguments below: |
|
3891 | This takes arguments below: | |
3892 |
|
3892 | |||
3893 | :modheads: change of heads by pull/unbundle |
|
3893 | :modheads: change of heads by pull/unbundle | |
3894 | :optupdate: updating working directory is needed or not |
|
3894 | :optupdate: updating working directory is needed or not | |
3895 | :checkout: update destination revision (or None to default destination) |
|
3895 | :checkout: update destination revision (or None to default destination) | |
3896 | :brev: a name, which might be a bookmark to be activated after updating |
|
3896 | :brev: a name, which might be a bookmark to be activated after updating | |
3897 | """ |
|
3897 | """ | |
3898 | if modheads == 0: |
|
3898 | if modheads == 0: | |
3899 | return |
|
3899 | return | |
3900 | if optupdate: |
|
3900 | if optupdate: | |
3901 | try: |
|
3901 | try: | |
3902 | return hg.updatetotally(ui, repo, checkout, brev) |
|
3902 | return hg.updatetotally(ui, repo, checkout, brev) | |
3903 | except error.UpdateAbort as inst: |
|
3903 | except error.UpdateAbort as inst: | |
3904 | msg = _("not updating: %s") % str(inst) |
|
3904 | msg = _("not updating: %s") % str(inst) | |
3905 | hint = inst.hint |
|
3905 | hint = inst.hint | |
3906 | raise error.UpdateAbort(msg, hint=hint) |
|
3906 | raise error.UpdateAbort(msg, hint=hint) | |
3907 | if modheads > 1: |
|
3907 | if modheads > 1: | |
3908 | currentbranchheads = len(repo.branchheads()) |
|
3908 | currentbranchheads = len(repo.branchheads()) | |
3909 | if currentbranchheads == modheads: |
|
3909 | if currentbranchheads == modheads: | |
3910 | ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) |
|
3910 | ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) | |
3911 | elif currentbranchheads > 1: |
|
3911 | elif currentbranchheads > 1: | |
3912 | ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to " |
|
3912 | ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to " | |
3913 | "merge)\n")) |
|
3913 | "merge)\n")) | |
3914 | else: |
|
3914 | else: | |
3915 | ui.status(_("(run 'hg heads' to see heads)\n")) |
|
3915 | ui.status(_("(run 'hg heads' to see heads)\n")) | |
3916 | elif not ui.configbool('commands', 'update.requiredest'): |
|
3916 | elif not ui.configbool('commands', 'update.requiredest'): | |
3917 | ui.status(_("(run 'hg update' to get a working copy)\n")) |
|
3917 | ui.status(_("(run 'hg update' to get a working copy)\n")) | |
3918 |
|
3918 | |||
3919 | @command('^pull', |
|
3919 | @command('^pull', | |
3920 | [('u', 'update', None, |
|
3920 | [('u', 'update', None, | |
3921 | _('update to new branch head if new descendants were pulled')), |
|
3921 | _('update to new branch head if new descendants were pulled')), | |
3922 | ('f', 'force', None, _('run even when remote repository is unrelated')), |
|
3922 | ('f', 'force', None, _('run even when remote repository is unrelated')), | |
3923 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), |
|
3923 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), | |
3924 | ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')), |
|
3924 | ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')), | |
3925 | ('b', 'branch', [], _('a specific branch you would like to pull'), |
|
3925 | ('b', 'branch', [], _('a specific branch you would like to pull'), | |
3926 | _('BRANCH')), |
|
3926 | _('BRANCH')), | |
3927 | ] + remoteopts, |
|
3927 | ] + remoteopts, | |
3928 | _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')) |
|
3928 | _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')) | |
3929 | def pull(ui, repo, source="default", **opts): |
|
3929 | def pull(ui, repo, source="default", **opts): | |
3930 | """pull changes from the specified source |
|
3930 | """pull changes from the specified source | |
3931 |
|
3931 | |||
3932 | Pull changes from a remote repository to a local one. |
|
3932 | Pull changes from a remote repository to a local one. | |
3933 |
|
3933 | |||
3934 | This finds all changes from the repository at the specified path |
|
3934 | This finds all changes from the repository at the specified path | |
3935 | or URL and adds them to a local repository (the current one unless |
|
3935 | or URL and adds them to a local repository (the current one unless | |
3936 | -R is specified). By default, this does not update the copy of the |
|
3936 | -R is specified). By default, this does not update the copy of the | |
3937 | project in the working directory. |
|
3937 | project in the working directory. | |
3938 |
|
3938 | |||
3939 | Use :hg:`incoming` if you want to see what would have been added |
|
3939 | Use :hg:`incoming` if you want to see what would have been added | |
3940 | by a pull at the time you issued this command. If you then decide |
|
3940 | by a pull at the time you issued this command. If you then decide | |
3941 | to add those changes to the repository, you should use :hg:`pull |
|
3941 | to add those changes to the repository, you should use :hg:`pull | |
3942 | -r X` where ``X`` is the last changeset listed by :hg:`incoming`. |
|
3942 | -r X` where ``X`` is the last changeset listed by :hg:`incoming`. | |
3943 |
|
3943 | |||
3944 | If SOURCE is omitted, the 'default' path will be used. |
|
3944 | If SOURCE is omitted, the 'default' path will be used. | |
3945 | See :hg:`help urls` for more information. |
|
3945 | See :hg:`help urls` for more information. | |
3946 |
|
3946 | |||
3947 | Specifying bookmark as ``.`` is equivalent to specifying the active |
|
3947 | Specifying bookmark as ``.`` is equivalent to specifying the active | |
3948 | bookmark's name. |
|
3948 | bookmark's name. | |
3949 |
|
3949 | |||
3950 | Returns 0 on success, 1 if an update had unresolved files. |
|
3950 | Returns 0 on success, 1 if an update had unresolved files. | |
3951 | """ |
|
3951 | """ | |
3952 |
|
3952 | |||
3953 | opts = pycompat.byteskwargs(opts) |
|
3953 | opts = pycompat.byteskwargs(opts) | |
3954 | if ui.configbool('commands', 'update.requiredest') and opts.get('update'): |
|
3954 | if ui.configbool('commands', 'update.requiredest') and opts.get('update'): | |
3955 | msg = _('update destination required by configuration') |
|
3955 | msg = _('update destination required by configuration') | |
3956 | hint = _('use hg pull followed by hg update DEST') |
|
3956 | hint = _('use hg pull followed by hg update DEST') | |
3957 | raise error.Abort(msg, hint=hint) |
|
3957 | raise error.Abort(msg, hint=hint) | |
3958 |
|
3958 | |||
3959 | source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) |
|
3959 | source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) | |
3960 | ui.status(_('pulling from %s\n') % util.hidepassword(source)) |
|
3960 | ui.status(_('pulling from %s\n') % util.hidepassword(source)) | |
3961 | other = hg.peer(repo, opts, source) |
|
3961 | other = hg.peer(repo, opts, source) | |
3962 | try: |
|
3962 | try: | |
3963 | revs, checkout = hg.addbranchrevs(repo, other, branches, |
|
3963 | revs, checkout = hg.addbranchrevs(repo, other, branches, | |
3964 | opts.get('rev')) |
|
3964 | opts.get('rev')) | |
3965 |
|
3965 | |||
3966 |
|
3966 | |||
3967 | pullopargs = {} |
|
3967 | pullopargs = {} | |
3968 | if opts.get('bookmark'): |
|
3968 | if opts.get('bookmark'): | |
3969 | if not revs: |
|
3969 | if not revs: | |
3970 | revs = [] |
|
3970 | revs = [] | |
3971 | # The list of bookmark used here is not the one used to actually |
|
3971 | # The list of bookmark used here is not the one used to actually | |
3972 | # update the bookmark name. This can result in the revision pulled |
|
3972 | # update the bookmark name. This can result in the revision pulled | |
3973 | # not ending up with the name of the bookmark because of a race |
|
3973 | # not ending up with the name of the bookmark because of a race | |
3974 | # condition on the server. (See issue 4689 for details) |
|
3974 | # condition on the server. (See issue 4689 for details) | |
3975 | remotebookmarks = other.listkeys('bookmarks') |
|
3975 | remotebookmarks = other.listkeys('bookmarks') | |
|
3976 | remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks) | |||
3976 | pullopargs['remotebookmarks'] = remotebookmarks |
|
3977 | pullopargs['remotebookmarks'] = remotebookmarks | |
3977 | for b in opts['bookmark']: |
|
3978 | for b in opts['bookmark']: | |
3978 | b = repo._bookmarks.expandname(b) |
|
3979 | b = repo._bookmarks.expandname(b) | |
3979 | if b not in remotebookmarks: |
|
3980 | if b not in remotebookmarks: | |
3980 | raise error.Abort(_('remote bookmark %s not found!') % b) |
|
3981 | raise error.Abort(_('remote bookmark %s not found!') % b) | |
3981 | revs.append(remotebookmarks[b]) |
|
3982 | revs.append(hex(remotebookmarks[b])) | |
3982 |
|
3983 | |||
3983 | if revs: |
|
3984 | if revs: | |
3984 | try: |
|
3985 | try: | |
3985 | # When 'rev' is a bookmark name, we cannot guarantee that it |
|
3986 | # When 'rev' is a bookmark name, we cannot guarantee that it | |
3986 | # will be updated with that name because of a race condition |
|
3987 | # will be updated with that name because of a race condition | |
3987 | # server side. (See issue 4689 for details) |
|
3988 | # server side. (See issue 4689 for details) | |
3988 | oldrevs = revs |
|
3989 | oldrevs = revs | |
3989 | revs = [] # actually, nodes |
|
3990 | revs = [] # actually, nodes | |
3990 | for r in oldrevs: |
|
3991 | for r in oldrevs: | |
3991 | node = other.lookup(r) |
|
3992 | node = other.lookup(r) | |
3992 | revs.append(node) |
|
3993 | revs.append(node) | |
3993 | if r == checkout: |
|
3994 | if r == checkout: | |
3994 | checkout = node |
|
3995 | checkout = node | |
3995 | except error.CapabilityError: |
|
3996 | except error.CapabilityError: | |
3996 | err = _("other repository doesn't support revision lookup, " |
|
3997 | err = _("other repository doesn't support revision lookup, " | |
3997 | "so a rev cannot be specified.") |
|
3998 | "so a rev cannot be specified.") | |
3998 | raise error.Abort(err) |
|
3999 | raise error.Abort(err) | |
3999 |
|
4000 | |||
4000 | pullopargs.update(opts.get('opargs', {})) |
|
4001 | pullopargs.update(opts.get('opargs', {})) | |
4001 | modheads = exchange.pull(repo, other, heads=revs, |
|
4002 | modheads = exchange.pull(repo, other, heads=revs, | |
4002 | force=opts.get('force'), |
|
4003 | force=opts.get('force'), | |
4003 | bookmarks=opts.get('bookmark', ()), |
|
4004 | bookmarks=opts.get('bookmark', ()), | |
4004 | opargs=pullopargs).cgresult |
|
4005 | opargs=pullopargs).cgresult | |
4005 |
|
4006 | |||
4006 | # brev is a name, which might be a bookmark to be activated at |
|
4007 | # brev is a name, which might be a bookmark to be activated at | |
4007 | # the end of the update. In other words, it is an explicit |
|
4008 | # the end of the update. In other words, it is an explicit | |
4008 | # destination of the update |
|
4009 | # destination of the update | |
4009 | brev = None |
|
4010 | brev = None | |
4010 |
|
4011 | |||
4011 | if checkout: |
|
4012 | if checkout: | |
4012 | checkout = str(repo.changelog.rev(checkout)) |
|
4013 | checkout = str(repo.changelog.rev(checkout)) | |
4013 |
|
4014 | |||
4014 | # order below depends on implementation of |
|
4015 | # order below depends on implementation of | |
4015 | # hg.addbranchrevs(). opts['bookmark'] is ignored, |
|
4016 | # hg.addbranchrevs(). opts['bookmark'] is ignored, | |
4016 | # because 'checkout' is determined without it. |
|
4017 | # because 'checkout' is determined without it. | |
4017 | if opts.get('rev'): |
|
4018 | if opts.get('rev'): | |
4018 | brev = opts['rev'][0] |
|
4019 | brev = opts['rev'][0] | |
4019 | elif opts.get('branch'): |
|
4020 | elif opts.get('branch'): | |
4020 | brev = opts['branch'][0] |
|
4021 | brev = opts['branch'][0] | |
4021 | else: |
|
4022 | else: | |
4022 | brev = branches[0] |
|
4023 | brev = branches[0] | |
4023 | repo._subtoppath = source |
|
4024 | repo._subtoppath = source | |
4024 | try: |
|
4025 | try: | |
4025 | ret = postincoming(ui, repo, modheads, opts.get('update'), |
|
4026 | ret = postincoming(ui, repo, modheads, opts.get('update'), | |
4026 | checkout, brev) |
|
4027 | checkout, brev) | |
4027 |
|
4028 | |||
4028 | finally: |
|
4029 | finally: | |
4029 | del repo._subtoppath |
|
4030 | del repo._subtoppath | |
4030 |
|
4031 | |||
4031 | finally: |
|
4032 | finally: | |
4032 | other.close() |
|
4033 | other.close() | |
4033 | return ret |
|
4034 | return ret | |
4034 |
|
4035 | |||
4035 | @command('^push', |
|
4036 | @command('^push', | |
4036 | [('f', 'force', None, _('force push')), |
|
4037 | [('f', 'force', None, _('force push')), | |
4037 | ('r', 'rev', [], |
|
4038 | ('r', 'rev', [], | |
4038 | _('a changeset intended to be included in the destination'), |
|
4039 | _('a changeset intended to be included in the destination'), | |
4039 | _('REV')), |
|
4040 | _('REV')), | |
4040 | ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')), |
|
4041 | ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')), | |
4041 | ('b', 'branch', [], |
|
4042 | ('b', 'branch', [], | |
4042 | _('a specific branch you would like to push'), _('BRANCH')), |
|
4043 | _('a specific branch you would like to push'), _('BRANCH')), | |
4043 | ('', 'new-branch', False, _('allow pushing a new branch')), |
|
4044 | ('', 'new-branch', False, _('allow pushing a new branch')), | |
4044 | ('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')), |
|
4045 | ('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')), | |
4045 | ] + remoteopts, |
|
4046 | ] + remoteopts, | |
4046 | _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')) |
|
4047 | _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')) | |
4047 | def push(ui, repo, dest=None, **opts): |
|
4048 | def push(ui, repo, dest=None, **opts): | |
4048 | """push changes to the specified destination |
|
4049 | """push changes to the specified destination | |
4049 |
|
4050 | |||
4050 | Push changesets from the local repository to the specified |
|
4051 | Push changesets from the local repository to the specified | |
4051 | destination. |
|
4052 | destination. | |
4052 |
|
4053 | |||
4053 | This operation is symmetrical to pull: it is identical to a pull |
|
4054 | This operation is symmetrical to pull: it is identical to a pull | |
4054 | in the destination repository from the current one. |
|
4055 | in the destination repository from the current one. | |
4055 |
|
4056 | |||
4056 | By default, push will not allow creation of new heads at the |
|
4057 | By default, push will not allow creation of new heads at the | |
4057 | destination, since multiple heads would make it unclear which head |
|
4058 | destination, since multiple heads would make it unclear which head | |
4058 | to use. In this situation, it is recommended to pull and merge |
|
4059 | to use. In this situation, it is recommended to pull and merge | |
4059 | before pushing. |
|
4060 | before pushing. | |
4060 |
|
4061 | |||
4061 | Use --new-branch if you want to allow push to create a new named |
|
4062 | Use --new-branch if you want to allow push to create a new named | |
4062 | branch that is not present at the destination. This allows you to |
|
4063 | branch that is not present at the destination. This allows you to | |
4063 | only create a new branch without forcing other changes. |
|
4064 | only create a new branch without forcing other changes. | |
4064 |
|
4065 | |||
4065 | .. note:: |
|
4066 | .. note:: | |
4066 |
|
4067 | |||
4067 | Extra care should be taken with the -f/--force option, |
|
4068 | Extra care should be taken with the -f/--force option, | |
4068 | which will push all new heads on all branches, an action which will |
|
4069 | which will push all new heads on all branches, an action which will | |
4069 | almost always cause confusion for collaborators. |
|
4070 | almost always cause confusion for collaborators. | |
4070 |
|
4071 | |||
4071 | If -r/--rev is used, the specified revision and all its ancestors |
|
4072 | If -r/--rev is used, the specified revision and all its ancestors | |
4072 | will be pushed to the remote repository. |
|
4073 | will be pushed to the remote repository. | |
4073 |
|
4074 | |||
4074 | If -B/--bookmark is used, the specified bookmarked revision, its |
|
4075 | If -B/--bookmark is used, the specified bookmarked revision, its | |
4075 | ancestors, and the bookmark will be pushed to the remote |
|
4076 | ancestors, and the bookmark will be pushed to the remote | |
4076 | repository. Specifying ``.`` is equivalent to specifying the active |
|
4077 | repository. Specifying ``.`` is equivalent to specifying the active | |
4077 | bookmark's name. |
|
4078 | bookmark's name. | |
4078 |
|
4079 | |||
4079 | Please see :hg:`help urls` for important details about ``ssh://`` |
|
4080 | Please see :hg:`help urls` for important details about ``ssh://`` | |
4080 | URLs. If DESTINATION is omitted, a default path will be used. |
|
4081 | URLs. If DESTINATION is omitted, a default path will be used. | |
4081 |
|
4082 | |||
4082 | .. container:: verbose |
|
4083 | .. container:: verbose | |
4083 |
|
4084 | |||
4084 | The --pushvars option sends strings to the server that become |
|
4085 | The --pushvars option sends strings to the server that become | |
4085 | environment variables prepended with ``HG_USERVAR_``. For example, |
|
4086 | environment variables prepended with ``HG_USERVAR_``. For example, | |
4086 | ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with |
|
4087 | ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with | |
4087 | ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment. |
|
4088 | ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment. | |
4088 |
|
4089 | |||
4089 | pushvars can provide for user-overridable hooks as well as set debug |
|
4090 | pushvars can provide for user-overridable hooks as well as set debug | |
4090 | levels. One example is having a hook that blocks commits containing |
|
4091 | levels. One example is having a hook that blocks commits containing | |
4091 | conflict markers, but enables the user to override the hook if the file |
|
4092 | conflict markers, but enables the user to override the hook if the file | |
4092 | is using conflict markers for testing purposes or the file format has |
|
4093 | is using conflict markers for testing purposes or the file format has | |
4093 | strings that look like conflict markers. |
|
4094 | strings that look like conflict markers. | |
4094 |
|
4095 | |||
4095 | By default, servers will ignore `--pushvars`. To enable it add the |
|
4096 | By default, servers will ignore `--pushvars`. To enable it add the | |
4096 | following to your configuration file:: |
|
4097 | following to your configuration file:: | |
4097 |
|
4098 | |||
4098 | [push] |
|
4099 | [push] | |
4099 | pushvars.server = true |
|
4100 | pushvars.server = true | |
4100 |
|
4101 | |||
4101 | Returns 0 if push was successful, 1 if nothing to push. |
|
4102 | Returns 0 if push was successful, 1 if nothing to push. | |
4102 | """ |
|
4103 | """ | |
4103 |
|
4104 | |||
4104 | opts = pycompat.byteskwargs(opts) |
|
4105 | opts = pycompat.byteskwargs(opts) | |
4105 | if opts.get('bookmark'): |
|
4106 | if opts.get('bookmark'): | |
4106 | ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push') |
|
4107 | ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push') | |
4107 | for b in opts['bookmark']: |
|
4108 | for b in opts['bookmark']: | |
4108 | # translate -B options to -r so changesets get pushed |
|
4109 | # translate -B options to -r so changesets get pushed | |
4109 | b = repo._bookmarks.expandname(b) |
|
4110 | b = repo._bookmarks.expandname(b) | |
4110 | if b in repo._bookmarks: |
|
4111 | if b in repo._bookmarks: | |
4111 | opts.setdefault('rev', []).append(b) |
|
4112 | opts.setdefault('rev', []).append(b) | |
4112 | else: |
|
4113 | else: | |
4113 | # if we try to push a deleted bookmark, translate it to null |
|
4114 | # if we try to push a deleted bookmark, translate it to null | |
4114 | # this lets simultaneous -r, -b options continue working |
|
4115 | # this lets simultaneous -r, -b options continue working | |
4115 | opts.setdefault('rev', []).append("null") |
|
4116 | opts.setdefault('rev', []).append("null") | |
4116 |
|
4117 | |||
4117 | path = ui.paths.getpath(dest, default=('default-push', 'default')) |
|
4118 | path = ui.paths.getpath(dest, default=('default-push', 'default')) | |
4118 | if not path: |
|
4119 | if not path: | |
4119 | raise error.Abort(_('default repository not configured!'), |
|
4120 | raise error.Abort(_('default repository not configured!'), | |
4120 | hint=_("see 'hg help config.paths'")) |
|
4121 | hint=_("see 'hg help config.paths'")) | |
4121 | dest = path.pushloc or path.loc |
|
4122 | dest = path.pushloc or path.loc | |
4122 | branches = (path.branch, opts.get('branch') or []) |
|
4123 | branches = (path.branch, opts.get('branch') or []) | |
4123 | ui.status(_('pushing to %s\n') % util.hidepassword(dest)) |
|
4124 | ui.status(_('pushing to %s\n') % util.hidepassword(dest)) | |
4124 | revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev')) |
|
4125 | revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev')) | |
4125 | other = hg.peer(repo, opts, dest) |
|
4126 | other = hg.peer(repo, opts, dest) | |
4126 |
|
4127 | |||
4127 | if revs: |
|
4128 | if revs: | |
4128 | revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)] |
|
4129 | revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)] | |
4129 | if not revs: |
|
4130 | if not revs: | |
4130 | raise error.Abort(_("specified revisions evaluate to an empty set"), |
|
4131 | raise error.Abort(_("specified revisions evaluate to an empty set"), | |
4131 | hint=_("use different revision arguments")) |
|
4132 | hint=_("use different revision arguments")) | |
4132 | elif path.pushrev: |
|
4133 | elif path.pushrev: | |
4133 | # It doesn't make any sense to specify ancestor revisions. So limit |
|
4134 | # It doesn't make any sense to specify ancestor revisions. So limit | |
4134 | # to DAG heads to make discovery simpler. |
|
4135 | # to DAG heads to make discovery simpler. | |
4135 | expr = revsetlang.formatspec('heads(%r)', path.pushrev) |
|
4136 | expr = revsetlang.formatspec('heads(%r)', path.pushrev) | |
4136 | revs = scmutil.revrange(repo, [expr]) |
|
4137 | revs = scmutil.revrange(repo, [expr]) | |
4137 | revs = [repo[rev].node() for rev in revs] |
|
4138 | revs = [repo[rev].node() for rev in revs] | |
4138 | if not revs: |
|
4139 | if not revs: | |
4139 | raise error.Abort(_('default push revset for path evaluates to an ' |
|
4140 | raise error.Abort(_('default push revset for path evaluates to an ' | |
4140 | 'empty set')) |
|
4141 | 'empty set')) | |
4141 |
|
4142 | |||
4142 | repo._subtoppath = dest |
|
4143 | repo._subtoppath = dest | |
4143 | try: |
|
4144 | try: | |
4144 | # push subrepos depth-first for coherent ordering |
|
4145 | # push subrepos depth-first for coherent ordering | |
4145 | c = repo[''] |
|
4146 | c = repo[''] | |
4146 | subs = c.substate # only repos that are committed |
|
4147 | subs = c.substate # only repos that are committed | |
4147 | for s in sorted(subs): |
|
4148 | for s in sorted(subs): | |
4148 | result = c.sub(s).push(opts) |
|
4149 | result = c.sub(s).push(opts) | |
4149 | if result == 0: |
|
4150 | if result == 0: | |
4150 | return not result |
|
4151 | return not result | |
4151 | finally: |
|
4152 | finally: | |
4152 | del repo._subtoppath |
|
4153 | del repo._subtoppath | |
4153 |
|
4154 | |||
4154 | opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it |
|
4155 | opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it | |
4155 | opargs.setdefault('pushvars', []).extend(opts.get('pushvars', [])) |
|
4156 | opargs.setdefault('pushvars', []).extend(opts.get('pushvars', [])) | |
4156 |
|
4157 | |||
4157 | pushop = exchange.push(repo, other, opts.get('force'), revs=revs, |
|
4158 | pushop = exchange.push(repo, other, opts.get('force'), revs=revs, | |
4158 | newbranch=opts.get('new_branch'), |
|
4159 | newbranch=opts.get('new_branch'), | |
4159 | bookmarks=opts.get('bookmark', ()), |
|
4160 | bookmarks=opts.get('bookmark', ()), | |
4160 | opargs=opargs) |
|
4161 | opargs=opargs) | |
4161 |
|
4162 | |||
4162 | result = not pushop.cgresult |
|
4163 | result = not pushop.cgresult | |
4163 |
|
4164 | |||
4164 | if pushop.bkresult is not None: |
|
4165 | if pushop.bkresult is not None: | |
4165 | if pushop.bkresult == 2: |
|
4166 | if pushop.bkresult == 2: | |
4166 | result = 2 |
|
4167 | result = 2 | |
4167 | elif not result and pushop.bkresult: |
|
4168 | elif not result and pushop.bkresult: | |
4168 | result = 2 |
|
4169 | result = 2 | |
4169 |
|
4170 | |||
4170 | return result |
|
4171 | return result | |
4171 |
|
4172 | |||
4172 | @command('recover', []) |
|
4173 | @command('recover', []) | |
4173 | def recover(ui, repo): |
|
4174 | def recover(ui, repo): | |
4174 | """roll back an interrupted transaction |
|
4175 | """roll back an interrupted transaction | |
4175 |
|
4176 | |||
4176 | Recover from an interrupted commit or pull. |
|
4177 | Recover from an interrupted commit or pull. | |
4177 |
|
4178 | |||
4178 | This command tries to fix the repository status after an |
|
4179 | This command tries to fix the repository status after an | |
4179 | interrupted operation. It should only be necessary when Mercurial |
|
4180 | interrupted operation. It should only be necessary when Mercurial | |
4180 | suggests it. |
|
4181 | suggests it. | |
4181 |
|
4182 | |||
4182 | Returns 0 if successful, 1 if nothing to recover or verify fails. |
|
4183 | Returns 0 if successful, 1 if nothing to recover or verify fails. | |
4183 | """ |
|
4184 | """ | |
4184 | if repo.recover(): |
|
4185 | if repo.recover(): | |
4185 | return hg.verify(repo) |
|
4186 | return hg.verify(repo) | |
4186 | return 1 |
|
4187 | return 1 | |
4187 |
|
4188 | |||
4188 | @command('^remove|rm', |
|
4189 | @command('^remove|rm', | |
4189 | [('A', 'after', None, _('record delete for missing files')), |
|
4190 | [('A', 'after', None, _('record delete for missing files')), | |
4190 | ('f', 'force', None, |
|
4191 | ('f', 'force', None, | |
4191 | _('forget added files, delete modified files')), |
|
4192 | _('forget added files, delete modified files')), | |
4192 | ] + subrepoopts + walkopts, |
|
4193 | ] + subrepoopts + walkopts, | |
4193 | _('[OPTION]... FILE...'), |
|
4194 | _('[OPTION]... FILE...'), | |
4194 | inferrepo=True) |
|
4195 | inferrepo=True) | |
4195 | def remove(ui, repo, *pats, **opts): |
|
4196 | def remove(ui, repo, *pats, **opts): | |
4196 | """remove the specified files on the next commit |
|
4197 | """remove the specified files on the next commit | |
4197 |
|
4198 | |||
4198 | Schedule the indicated files for removal from the current branch. |
|
4199 | Schedule the indicated files for removal from the current branch. | |
4199 |
|
4200 | |||
4200 | This command schedules the files to be removed at the next commit. |
|
4201 | This command schedules the files to be removed at the next commit. | |
4201 | To undo a remove before that, see :hg:`revert`. To undo added |
|
4202 | To undo a remove before that, see :hg:`revert`. To undo added | |
4202 | files, see :hg:`forget`. |
|
4203 | files, see :hg:`forget`. | |
4203 |
|
4204 | |||
4204 | .. container:: verbose |
|
4205 | .. container:: verbose | |
4205 |
|
4206 | |||
4206 | -A/--after can be used to remove only files that have already |
|
4207 | -A/--after can be used to remove only files that have already | |
4207 | been deleted, -f/--force can be used to force deletion, and -Af |
|
4208 | been deleted, -f/--force can be used to force deletion, and -Af | |
4208 | can be used to remove files from the next revision without |
|
4209 | can be used to remove files from the next revision without | |
4209 | deleting them from the working directory. |
|
4210 | deleting them from the working directory. | |
4210 |
|
4211 | |||
4211 | The following table details the behavior of remove for different |
|
4212 | The following table details the behavior of remove for different | |
4212 | file states (columns) and option combinations (rows). The file |
|
4213 | file states (columns) and option combinations (rows). The file | |
4213 | states are Added [A], Clean [C], Modified [M] and Missing [!] |
|
4214 | states are Added [A], Clean [C], Modified [M] and Missing [!] | |
4214 | (as reported by :hg:`status`). The actions are Warn, Remove |
|
4215 | (as reported by :hg:`status`). The actions are Warn, Remove | |
4215 | (from branch) and Delete (from disk): |
|
4216 | (from branch) and Delete (from disk): | |
4216 |
|
4217 | |||
4217 | ========= == == == == |
|
4218 | ========= == == == == | |
4218 | opt/state A C M ! |
|
4219 | opt/state A C M ! | |
4219 | ========= == == == == |
|
4220 | ========= == == == == | |
4220 | none W RD W R |
|
4221 | none W RD W R | |
4221 | -f R RD RD R |
|
4222 | -f R RD RD R | |
4222 | -A W W W R |
|
4223 | -A W W W R | |
4223 | -Af R R R R |
|
4224 | -Af R R R R | |
4224 | ========= == == == == |
|
4225 | ========= == == == == | |
4225 |
|
4226 | |||
4226 | .. note:: |
|
4227 | .. note:: | |
4227 |
|
4228 | |||
4228 | :hg:`remove` never deletes files in Added [A] state from the |
|
4229 | :hg:`remove` never deletes files in Added [A] state from the | |
4229 | working directory, not even if ``--force`` is specified. |
|
4230 | working directory, not even if ``--force`` is specified. | |
4230 |
|
4231 | |||
4231 | Returns 0 on success, 1 if any warnings encountered. |
|
4232 | Returns 0 on success, 1 if any warnings encountered. | |
4232 | """ |
|
4233 | """ | |
4233 |
|
4234 | |||
4234 | opts = pycompat.byteskwargs(opts) |
|
4235 | opts = pycompat.byteskwargs(opts) | |
4235 | after, force = opts.get('after'), opts.get('force') |
|
4236 | after, force = opts.get('after'), opts.get('force') | |
4236 | if not pats and not after: |
|
4237 | if not pats and not after: | |
4237 | raise error.Abort(_('no files specified')) |
|
4238 | raise error.Abort(_('no files specified')) | |
4238 |
|
4239 | |||
4239 | m = scmutil.match(repo[None], pats, opts) |
|
4240 | m = scmutil.match(repo[None], pats, opts) | |
4240 | subrepos = opts.get('subrepos') |
|
4241 | subrepos = opts.get('subrepos') | |
4241 | return cmdutil.remove(ui, repo, m, "", after, force, subrepos) |
|
4242 | return cmdutil.remove(ui, repo, m, "", after, force, subrepos) | |
4242 |
|
4243 | |||
4243 | @command('rename|move|mv', |
|
4244 | @command('rename|move|mv', | |
4244 | [('A', 'after', None, _('record a rename that has already occurred')), |
|
4245 | [('A', 'after', None, _('record a rename that has already occurred')), | |
4245 | ('f', 'force', None, _('forcibly copy over an existing managed file')), |
|
4246 | ('f', 'force', None, _('forcibly copy over an existing managed file')), | |
4246 | ] + walkopts + dryrunopts, |
|
4247 | ] + walkopts + dryrunopts, | |
4247 | _('[OPTION]... SOURCE... DEST')) |
|
4248 | _('[OPTION]... SOURCE... DEST')) | |
4248 | def rename(ui, repo, *pats, **opts): |
|
4249 | def rename(ui, repo, *pats, **opts): | |
4249 | """rename files; equivalent of copy + remove |
|
4250 | """rename files; equivalent of copy + remove | |
4250 |
|
4251 | |||
4251 | Mark dest as copies of sources; mark sources for deletion. If dest |
|
4252 | Mark dest as copies of sources; mark sources for deletion. If dest | |
4252 | is a directory, copies are put in that directory. If dest is a |
|
4253 | is a directory, copies are put in that directory. If dest is a | |
4253 | file, there can only be one source. |
|
4254 | file, there can only be one source. | |
4254 |
|
4255 | |||
4255 | By default, this command copies the contents of files as they |
|
4256 | By default, this command copies the contents of files as they | |
4256 | exist in the working directory. If invoked with -A/--after, the |
|
4257 | exist in the working directory. If invoked with -A/--after, the | |
4257 | operation is recorded, but no copying is performed. |
|
4258 | operation is recorded, but no copying is performed. | |
4258 |
|
4259 | |||
4259 | This command takes effect at the next commit. To undo a rename |
|
4260 | This command takes effect at the next commit. To undo a rename | |
4260 | before that, see :hg:`revert`. |
|
4261 | before that, see :hg:`revert`. | |
4261 |
|
4262 | |||
4262 | Returns 0 on success, 1 if errors are encountered. |
|
4263 | Returns 0 on success, 1 if errors are encountered. | |
4263 | """ |
|
4264 | """ | |
4264 | opts = pycompat.byteskwargs(opts) |
|
4265 | opts = pycompat.byteskwargs(opts) | |
4265 | with repo.wlock(False): |
|
4266 | with repo.wlock(False): | |
4266 | return cmdutil.copy(ui, repo, pats, opts, rename=True) |
|
4267 | return cmdutil.copy(ui, repo, pats, opts, rename=True) | |
4267 |
|
4268 | |||
4268 | @command('resolve', |
|
4269 | @command('resolve', | |
4269 | [('a', 'all', None, _('select all unresolved files')), |
|
4270 | [('a', 'all', None, _('select all unresolved files')), | |
4270 | ('l', 'list', None, _('list state of files needing merge')), |
|
4271 | ('l', 'list', None, _('list state of files needing merge')), | |
4271 | ('m', 'mark', None, _('mark files as resolved')), |
|
4272 | ('m', 'mark', None, _('mark files as resolved')), | |
4272 | ('u', 'unmark', None, _('mark files as unresolved')), |
|
4273 | ('u', 'unmark', None, _('mark files as unresolved')), | |
4273 | ('n', 'no-status', None, _('hide status prefix'))] |
|
4274 | ('n', 'no-status', None, _('hide status prefix'))] | |
4274 | + mergetoolopts + walkopts + formatteropts, |
|
4275 | + mergetoolopts + walkopts + formatteropts, | |
4275 | _('[OPTION]... [FILE]...'), |
|
4276 | _('[OPTION]... [FILE]...'), | |
4276 | inferrepo=True) |
|
4277 | inferrepo=True) | |
4277 | def resolve(ui, repo, *pats, **opts): |
|
4278 | def resolve(ui, repo, *pats, **opts): | |
4278 | """redo merges or set/view the merge status of files |
|
4279 | """redo merges or set/view the merge status of files | |
4279 |
|
4280 | |||
4280 | Merges with unresolved conflicts are often the result of |
|
4281 | Merges with unresolved conflicts are often the result of | |
4281 | non-interactive merging using the ``internal:merge`` configuration |
|
4282 | non-interactive merging using the ``internal:merge`` configuration | |
4282 | setting, or a command-line merge tool like ``diff3``. The resolve |
|
4283 | setting, or a command-line merge tool like ``diff3``. The resolve | |
4283 | command is used to manage the files involved in a merge, after |
|
4284 | command is used to manage the files involved in a merge, after | |
4284 | :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the |
|
4285 | :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the | |
4285 | working directory must have two parents). See :hg:`help |
|
4286 | working directory must have two parents). See :hg:`help | |
4286 | merge-tools` for information on configuring merge tools. |
|
4287 | merge-tools` for information on configuring merge tools. | |
4287 |
|
4288 | |||
4288 | The resolve command can be used in the following ways: |
|
4289 | The resolve command can be used in the following ways: | |
4289 |
|
4290 | |||
4290 | - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified |
|
4291 | - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified | |
4291 | files, discarding any previous merge attempts. Re-merging is not |
|
4292 | files, discarding any previous merge attempts. Re-merging is not | |
4292 | performed for files already marked as resolved. Use ``--all/-a`` |
|
4293 | performed for files already marked as resolved. Use ``--all/-a`` | |
4293 | to select all unresolved files. ``--tool`` can be used to specify |
|
4294 | to select all unresolved files. ``--tool`` can be used to specify | |
4294 | the merge tool used for the given files. It overrides the HGMERGE |
|
4295 | the merge tool used for the given files. It overrides the HGMERGE | |
4295 | environment variable and your configuration files. Previous file |
|
4296 | environment variable and your configuration files. Previous file | |
4296 | contents are saved with a ``.orig`` suffix. |
|
4297 | contents are saved with a ``.orig`` suffix. | |
4297 |
|
4298 | |||
4298 | - :hg:`resolve -m [FILE]`: mark a file as having been resolved |
|
4299 | - :hg:`resolve -m [FILE]`: mark a file as having been resolved | |
4299 | (e.g. after having manually fixed-up the files). The default is |
|
4300 | (e.g. after having manually fixed-up the files). The default is | |
4300 | to mark all unresolved files. |
|
4301 | to mark all unresolved files. | |
4301 |
|
4302 | |||
4302 | - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The |
|
4303 | - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The | |
4303 | default is to mark all resolved files. |
|
4304 | default is to mark all resolved files. | |
4304 |
|
4305 | |||
4305 | - :hg:`resolve -l`: list files which had or still have conflicts. |
|
4306 | - :hg:`resolve -l`: list files which had or still have conflicts. | |
4306 | In the printed list, ``U`` = unresolved and ``R`` = resolved. |
|
4307 | In the printed list, ``U`` = unresolved and ``R`` = resolved. | |
4307 | You can use ``set:unresolved()`` or ``set:resolved()`` to filter |
|
4308 | You can use ``set:unresolved()`` or ``set:resolved()`` to filter | |
4308 | the list. See :hg:`help filesets` for details. |
|
4309 | the list. See :hg:`help filesets` for details. | |
4309 |
|
4310 | |||
4310 | .. note:: |
|
4311 | .. note:: | |
4311 |
|
4312 | |||
4312 | Mercurial will not let you commit files with unresolved merge |
|
4313 | Mercurial will not let you commit files with unresolved merge | |
4313 | conflicts. You must use :hg:`resolve -m ...` before you can |
|
4314 | conflicts. You must use :hg:`resolve -m ...` before you can | |
4314 | commit after a conflicting merge. |
|
4315 | commit after a conflicting merge. | |
4315 |
|
4316 | |||
4316 | Returns 0 on success, 1 if any files fail a resolve attempt. |
|
4317 | Returns 0 on success, 1 if any files fail a resolve attempt. | |
4317 | """ |
|
4318 | """ | |
4318 |
|
4319 | |||
4319 | opts = pycompat.byteskwargs(opts) |
|
4320 | opts = pycompat.byteskwargs(opts) | |
4320 | flaglist = 'all mark unmark list no_status'.split() |
|
4321 | flaglist = 'all mark unmark list no_status'.split() | |
4321 | all, mark, unmark, show, nostatus = \ |
|
4322 | all, mark, unmark, show, nostatus = \ | |
4322 | [opts.get(o) for o in flaglist] |
|
4323 | [opts.get(o) for o in flaglist] | |
4323 |
|
4324 | |||
4324 | if (show and (mark or unmark)) or (mark and unmark): |
|
4325 | if (show and (mark or unmark)) or (mark and unmark): | |
4325 | raise error.Abort(_("too many options specified")) |
|
4326 | raise error.Abort(_("too many options specified")) | |
4326 | if pats and all: |
|
4327 | if pats and all: | |
4327 | raise error.Abort(_("can't specify --all and patterns")) |
|
4328 | raise error.Abort(_("can't specify --all and patterns")) | |
4328 | if not (all or pats or show or mark or unmark): |
|
4329 | if not (all or pats or show or mark or unmark): | |
4329 | raise error.Abort(_('no files or directories specified'), |
|
4330 | raise error.Abort(_('no files or directories specified'), | |
4330 | hint=('use --all to re-merge all unresolved files')) |
|
4331 | hint=('use --all to re-merge all unresolved files')) | |
4331 |
|
4332 | |||
4332 | if show: |
|
4333 | if show: | |
4333 | ui.pager('resolve') |
|
4334 | ui.pager('resolve') | |
4334 | fm = ui.formatter('resolve', opts) |
|
4335 | fm = ui.formatter('resolve', opts) | |
4335 | ms = mergemod.mergestate.read(repo) |
|
4336 | ms = mergemod.mergestate.read(repo) | |
4336 | m = scmutil.match(repo[None], pats, opts) |
|
4337 | m = scmutil.match(repo[None], pats, opts) | |
4337 |
|
4338 | |||
4338 | # Labels and keys based on merge state. Unresolved path conflicts show |
|
4339 | # Labels and keys based on merge state. Unresolved path conflicts show | |
4339 | # as 'P'. Resolved path conflicts show as 'R', the same as normal |
|
4340 | # as 'P'. Resolved path conflicts show as 'R', the same as normal | |
4340 | # resolved conflicts. |
|
4341 | # resolved conflicts. | |
4341 | mergestateinfo = { |
|
4342 | mergestateinfo = { | |
4342 | 'u': ('resolve.unresolved', 'U'), |
|
4343 | 'u': ('resolve.unresolved', 'U'), | |
4343 | 'r': ('resolve.resolved', 'R'), |
|
4344 | 'r': ('resolve.resolved', 'R'), | |
4344 | 'pu': ('resolve.unresolved', 'P'), |
|
4345 | 'pu': ('resolve.unresolved', 'P'), | |
4345 | 'pr': ('resolve.resolved', 'R'), |
|
4346 | 'pr': ('resolve.resolved', 'R'), | |
4346 | 'd': ('resolve.driverresolved', 'D'), |
|
4347 | 'd': ('resolve.driverresolved', 'D'), | |
4347 | } |
|
4348 | } | |
4348 |
|
4349 | |||
4349 | for f in ms: |
|
4350 | for f in ms: | |
4350 | if not m(f): |
|
4351 | if not m(f): | |
4351 | continue |
|
4352 | continue | |
4352 |
|
4353 | |||
4353 | label, key = mergestateinfo[ms[f]] |
|
4354 | label, key = mergestateinfo[ms[f]] | |
4354 | fm.startitem() |
|
4355 | fm.startitem() | |
4355 | fm.condwrite(not nostatus, 'status', '%s ', key, label=label) |
|
4356 | fm.condwrite(not nostatus, 'status', '%s ', key, label=label) | |
4356 | fm.write('path', '%s\n', f, label=label) |
|
4357 | fm.write('path', '%s\n', f, label=label) | |
4357 | fm.end() |
|
4358 | fm.end() | |
4358 | return 0 |
|
4359 | return 0 | |
4359 |
|
4360 | |||
4360 | with repo.wlock(): |
|
4361 | with repo.wlock(): | |
4361 | ms = mergemod.mergestate.read(repo) |
|
4362 | ms = mergemod.mergestate.read(repo) | |
4362 |
|
4363 | |||
4363 | if not (ms.active() or repo.dirstate.p2() != nullid): |
|
4364 | if not (ms.active() or repo.dirstate.p2() != nullid): | |
4364 | raise error.Abort( |
|
4365 | raise error.Abort( | |
4365 | _('resolve command not applicable when not merging')) |
|
4366 | _('resolve command not applicable when not merging')) | |
4366 |
|
4367 | |||
4367 | wctx = repo[None] |
|
4368 | wctx = repo[None] | |
4368 |
|
4369 | |||
4369 | if ms.mergedriver and ms.mdstate() == 'u': |
|
4370 | if ms.mergedriver and ms.mdstate() == 'u': | |
4370 | proceed = mergemod.driverpreprocess(repo, ms, wctx) |
|
4371 | proceed = mergemod.driverpreprocess(repo, ms, wctx) | |
4371 | ms.commit() |
|
4372 | ms.commit() | |
4372 | # allow mark and unmark to go through |
|
4373 | # allow mark and unmark to go through | |
4373 | if not mark and not unmark and not proceed: |
|
4374 | if not mark and not unmark and not proceed: | |
4374 | return 1 |
|
4375 | return 1 | |
4375 |
|
4376 | |||
4376 | m = scmutil.match(wctx, pats, opts) |
|
4377 | m = scmutil.match(wctx, pats, opts) | |
4377 | ret = 0 |
|
4378 | ret = 0 | |
4378 | didwork = False |
|
4379 | didwork = False | |
4379 | runconclude = False |
|
4380 | runconclude = False | |
4380 |
|
4381 | |||
4381 | tocomplete = [] |
|
4382 | tocomplete = [] | |
4382 | for f in ms: |
|
4383 | for f in ms: | |
4383 | if not m(f): |
|
4384 | if not m(f): | |
4384 | continue |
|
4385 | continue | |
4385 |
|
4386 | |||
4386 | didwork = True |
|
4387 | didwork = True | |
4387 |
|
4388 | |||
4388 | # don't let driver-resolved files be marked, and run the conclude |
|
4389 | # don't let driver-resolved files be marked, and run the conclude | |
4389 | # step if asked to resolve |
|
4390 | # step if asked to resolve | |
4390 | if ms[f] == "d": |
|
4391 | if ms[f] == "d": | |
4391 | exact = m.exact(f) |
|
4392 | exact = m.exact(f) | |
4392 | if mark: |
|
4393 | if mark: | |
4393 | if exact: |
|
4394 | if exact: | |
4394 | ui.warn(_('not marking %s as it is driver-resolved\n') |
|
4395 | ui.warn(_('not marking %s as it is driver-resolved\n') | |
4395 | % f) |
|
4396 | % f) | |
4396 | elif unmark: |
|
4397 | elif unmark: | |
4397 | if exact: |
|
4398 | if exact: | |
4398 | ui.warn(_('not unmarking %s as it is driver-resolved\n') |
|
4399 | ui.warn(_('not unmarking %s as it is driver-resolved\n') | |
4399 | % f) |
|
4400 | % f) | |
4400 | else: |
|
4401 | else: | |
4401 | runconclude = True |
|
4402 | runconclude = True | |
4402 | continue |
|
4403 | continue | |
4403 |
|
4404 | |||
4404 | # path conflicts must be resolved manually |
|
4405 | # path conflicts must be resolved manually | |
4405 | if ms[f] in ("pu", "pr"): |
|
4406 | if ms[f] in ("pu", "pr"): | |
4406 | if mark: |
|
4407 | if mark: | |
4407 | ms.mark(f, "pr") |
|
4408 | ms.mark(f, "pr") | |
4408 | elif unmark: |
|
4409 | elif unmark: | |
4409 | ms.mark(f, "pu") |
|
4410 | ms.mark(f, "pu") | |
4410 | elif ms[f] == "pu": |
|
4411 | elif ms[f] == "pu": | |
4411 | ui.warn(_('%s: path conflict must be resolved manually\n') |
|
4412 | ui.warn(_('%s: path conflict must be resolved manually\n') | |
4412 | % f) |
|
4413 | % f) | |
4413 | continue |
|
4414 | continue | |
4414 |
|
4415 | |||
4415 | if mark: |
|
4416 | if mark: | |
4416 | ms.mark(f, "r") |
|
4417 | ms.mark(f, "r") | |
4417 | elif unmark: |
|
4418 | elif unmark: | |
4418 | ms.mark(f, "u") |
|
4419 | ms.mark(f, "u") | |
4419 | else: |
|
4420 | else: | |
4420 | # backup pre-resolve (merge uses .orig for its own purposes) |
|
4421 | # backup pre-resolve (merge uses .orig for its own purposes) | |
4421 | a = repo.wjoin(f) |
|
4422 | a = repo.wjoin(f) | |
4422 | try: |
|
4423 | try: | |
4423 | util.copyfile(a, a + ".resolve") |
|
4424 | util.copyfile(a, a + ".resolve") | |
4424 | except (IOError, OSError) as inst: |
|
4425 | except (IOError, OSError) as inst: | |
4425 | if inst.errno != errno.ENOENT: |
|
4426 | if inst.errno != errno.ENOENT: | |
4426 | raise |
|
4427 | raise | |
4427 |
|
4428 | |||
4428 | try: |
|
4429 | try: | |
4429 | # preresolve file |
|
4430 | # preresolve file | |
4430 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
4431 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | |
4431 | 'resolve') |
|
4432 | 'resolve') | |
4432 | complete, r = ms.preresolve(f, wctx) |
|
4433 | complete, r = ms.preresolve(f, wctx) | |
4433 | if not complete: |
|
4434 | if not complete: | |
4434 | tocomplete.append(f) |
|
4435 | tocomplete.append(f) | |
4435 | elif r: |
|
4436 | elif r: | |
4436 | ret = 1 |
|
4437 | ret = 1 | |
4437 | finally: |
|
4438 | finally: | |
4438 | ui.setconfig('ui', 'forcemerge', '', 'resolve') |
|
4439 | ui.setconfig('ui', 'forcemerge', '', 'resolve') | |
4439 | ms.commit() |
|
4440 | ms.commit() | |
4440 |
|
4441 | |||
4441 | # replace filemerge's .orig file with our resolve file, but only |
|
4442 | # replace filemerge's .orig file with our resolve file, but only | |
4442 | # for merges that are complete |
|
4443 | # for merges that are complete | |
4443 | if complete: |
|
4444 | if complete: | |
4444 | try: |
|
4445 | try: | |
4445 | util.rename(a + ".resolve", |
|
4446 | util.rename(a + ".resolve", | |
4446 | scmutil.origpath(ui, repo, a)) |
|
4447 | scmutil.origpath(ui, repo, a)) | |
4447 | except OSError as inst: |
|
4448 | except OSError as inst: | |
4448 | if inst.errno != errno.ENOENT: |
|
4449 | if inst.errno != errno.ENOENT: | |
4449 | raise |
|
4450 | raise | |
4450 |
|
4451 | |||
4451 | for f in tocomplete: |
|
4452 | for f in tocomplete: | |
4452 | try: |
|
4453 | try: | |
4453 | # resolve file |
|
4454 | # resolve file | |
4454 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
4455 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | |
4455 | 'resolve') |
|
4456 | 'resolve') | |
4456 | r = ms.resolve(f, wctx) |
|
4457 | r = ms.resolve(f, wctx) | |
4457 | if r: |
|
4458 | if r: | |
4458 | ret = 1 |
|
4459 | ret = 1 | |
4459 | finally: |
|
4460 | finally: | |
4460 | ui.setconfig('ui', 'forcemerge', '', 'resolve') |
|
4461 | ui.setconfig('ui', 'forcemerge', '', 'resolve') | |
4461 | ms.commit() |
|
4462 | ms.commit() | |
4462 |
|
4463 | |||
4463 | # replace filemerge's .orig file with our resolve file |
|
4464 | # replace filemerge's .orig file with our resolve file | |
4464 | a = repo.wjoin(f) |
|
4465 | a = repo.wjoin(f) | |
4465 | try: |
|
4466 | try: | |
4466 | util.rename(a + ".resolve", scmutil.origpath(ui, repo, a)) |
|
4467 | util.rename(a + ".resolve", scmutil.origpath(ui, repo, a)) | |
4467 | except OSError as inst: |
|
4468 | except OSError as inst: | |
4468 | if inst.errno != errno.ENOENT: |
|
4469 | if inst.errno != errno.ENOENT: | |
4469 | raise |
|
4470 | raise | |
4470 |
|
4471 | |||
4471 | ms.commit() |
|
4472 | ms.commit() | |
4472 | ms.recordactions() |
|
4473 | ms.recordactions() | |
4473 |
|
4474 | |||
4474 | if not didwork and pats: |
|
4475 | if not didwork and pats: | |
4475 | hint = None |
|
4476 | hint = None | |
4476 | if not any([p for p in pats if p.find(':') >= 0]): |
|
4477 | if not any([p for p in pats if p.find(':') >= 0]): | |
4477 | pats = ['path:%s' % p for p in pats] |
|
4478 | pats = ['path:%s' % p for p in pats] | |
4478 | m = scmutil.match(wctx, pats, opts) |
|
4479 | m = scmutil.match(wctx, pats, opts) | |
4479 | for f in ms: |
|
4480 | for f in ms: | |
4480 | if not m(f): |
|
4481 | if not m(f): | |
4481 | continue |
|
4482 | continue | |
4482 | flags = ''.join(['-%s ' % o[0] for o in flaglist |
|
4483 | flags = ''.join(['-%s ' % o[0] for o in flaglist | |
4483 | if opts.get(o)]) |
|
4484 | if opts.get(o)]) | |
4484 | hint = _("(try: hg resolve %s%s)\n") % ( |
|
4485 | hint = _("(try: hg resolve %s%s)\n") % ( | |
4485 | flags, |
|
4486 | flags, | |
4486 | ' '.join(pats)) |
|
4487 | ' '.join(pats)) | |
4487 | break |
|
4488 | break | |
4488 | ui.warn(_("arguments do not match paths that need resolving\n")) |
|
4489 | ui.warn(_("arguments do not match paths that need resolving\n")) | |
4489 | if hint: |
|
4490 | if hint: | |
4490 | ui.warn(hint) |
|
4491 | ui.warn(hint) | |
4491 | elif ms.mergedriver and ms.mdstate() != 's': |
|
4492 | elif ms.mergedriver and ms.mdstate() != 's': | |
4492 | # run conclude step when either a driver-resolved file is requested |
|
4493 | # run conclude step when either a driver-resolved file is requested | |
4493 | # or there are no driver-resolved files |
|
4494 | # or there are no driver-resolved files | |
4494 | # we can't use 'ret' to determine whether any files are unresolved |
|
4495 | # we can't use 'ret' to determine whether any files are unresolved | |
4495 | # because we might not have tried to resolve some |
|
4496 | # because we might not have tried to resolve some | |
4496 | if ((runconclude or not list(ms.driverresolved())) |
|
4497 | if ((runconclude or not list(ms.driverresolved())) | |
4497 | and not list(ms.unresolved())): |
|
4498 | and not list(ms.unresolved())): | |
4498 | proceed = mergemod.driverconclude(repo, ms, wctx) |
|
4499 | proceed = mergemod.driverconclude(repo, ms, wctx) | |
4499 | ms.commit() |
|
4500 | ms.commit() | |
4500 | if not proceed: |
|
4501 | if not proceed: | |
4501 | return 1 |
|
4502 | return 1 | |
4502 |
|
4503 | |||
4503 | # Nudge users into finishing an unfinished operation |
|
4504 | # Nudge users into finishing an unfinished operation | |
4504 | unresolvedf = list(ms.unresolved()) |
|
4505 | unresolvedf = list(ms.unresolved()) | |
4505 | driverresolvedf = list(ms.driverresolved()) |
|
4506 | driverresolvedf = list(ms.driverresolved()) | |
4506 | if not unresolvedf and not driverresolvedf: |
|
4507 | if not unresolvedf and not driverresolvedf: | |
4507 | ui.status(_('(no more unresolved files)\n')) |
|
4508 | ui.status(_('(no more unresolved files)\n')) | |
4508 | cmdutil.checkafterresolved(repo) |
|
4509 | cmdutil.checkafterresolved(repo) | |
4509 | elif not unresolvedf: |
|
4510 | elif not unresolvedf: | |
4510 | ui.status(_('(no more unresolved files -- ' |
|
4511 | ui.status(_('(no more unresolved files -- ' | |
4511 | 'run "hg resolve --all" to conclude)\n')) |
|
4512 | 'run "hg resolve --all" to conclude)\n')) | |
4512 |
|
4513 | |||
4513 | return ret |
|
4514 | return ret | |
4514 |
|
4515 | |||
4515 | @command('revert', |
|
4516 | @command('revert', | |
4516 | [('a', 'all', None, _('revert all changes when no arguments given')), |
|
4517 | [('a', 'all', None, _('revert all changes when no arguments given')), | |
4517 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), |
|
4518 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), | |
4518 | ('r', 'rev', '', _('revert to the specified revision'), _('REV')), |
|
4519 | ('r', 'rev', '', _('revert to the specified revision'), _('REV')), | |
4519 | ('C', 'no-backup', None, _('do not save backup copies of files')), |
|
4520 | ('C', 'no-backup', None, _('do not save backup copies of files')), | |
4520 | ('i', 'interactive', None, _('interactively select the changes')), |
|
4521 | ('i', 'interactive', None, _('interactively select the changes')), | |
4521 | ] + walkopts + dryrunopts, |
|
4522 | ] + walkopts + dryrunopts, | |
4522 | _('[OPTION]... [-r REV] [NAME]...')) |
|
4523 | _('[OPTION]... [-r REV] [NAME]...')) | |
4523 | def revert(ui, repo, *pats, **opts): |
|
4524 | def revert(ui, repo, *pats, **opts): | |
4524 | """restore files to their checkout state |
|
4525 | """restore files to their checkout state | |
4525 |
|
4526 | |||
4526 | .. note:: |
|
4527 | .. note:: | |
4527 |
|
4528 | |||
4528 | To check out earlier revisions, you should use :hg:`update REV`. |
|
4529 | To check out earlier revisions, you should use :hg:`update REV`. | |
4529 | To cancel an uncommitted merge (and lose your changes), |
|
4530 | To cancel an uncommitted merge (and lose your changes), | |
4530 | use :hg:`update --clean .`. |
|
4531 | use :hg:`update --clean .`. | |
4531 |
|
4532 | |||
4532 | With no revision specified, revert the specified files or directories |
|
4533 | With no revision specified, revert the specified files or directories | |
4533 | to the contents they had in the parent of the working directory. |
|
4534 | to the contents they had in the parent of the working directory. | |
4534 | This restores the contents of files to an unmodified |
|
4535 | This restores the contents of files to an unmodified | |
4535 | state and unschedules adds, removes, copies, and renames. If the |
|
4536 | state and unschedules adds, removes, copies, and renames. If the | |
4536 | working directory has two parents, you must explicitly specify a |
|
4537 | working directory has two parents, you must explicitly specify a | |
4537 | revision. |
|
4538 | revision. | |
4538 |
|
4539 | |||
4539 | Using the -r/--rev or -d/--date options, revert the given files or |
|
4540 | Using the -r/--rev or -d/--date options, revert the given files or | |
4540 | directories to their states as of a specific revision. Because |
|
4541 | directories to their states as of a specific revision. Because | |
4541 | revert does not change the working directory parents, this will |
|
4542 | revert does not change the working directory parents, this will | |
4542 | cause these files to appear modified. This can be helpful to "back |
|
4543 | cause these files to appear modified. This can be helpful to "back | |
4543 | out" some or all of an earlier change. See :hg:`backout` for a |
|
4544 | out" some or all of an earlier change. See :hg:`backout` for a | |
4544 | related method. |
|
4545 | related method. | |
4545 |
|
4546 | |||
4546 | Modified files are saved with a .orig suffix before reverting. |
|
4547 | Modified files are saved with a .orig suffix before reverting. | |
4547 | To disable these backups, use --no-backup. It is possible to store |
|
4548 | To disable these backups, use --no-backup. It is possible to store | |
4548 | the backup files in a custom directory relative to the root of the |
|
4549 | the backup files in a custom directory relative to the root of the | |
4549 | repository by setting the ``ui.origbackuppath`` configuration |
|
4550 | repository by setting the ``ui.origbackuppath`` configuration | |
4550 | option. |
|
4551 | option. | |
4551 |
|
4552 | |||
4552 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
4553 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
4553 |
|
4554 | |||
4554 | See :hg:`help backout` for a way to reverse the effect of an |
|
4555 | See :hg:`help backout` for a way to reverse the effect of an | |
4555 | earlier changeset. |
|
4556 | earlier changeset. | |
4556 |
|
4557 | |||
4557 | Returns 0 on success. |
|
4558 | Returns 0 on success. | |
4558 | """ |
|
4559 | """ | |
4559 |
|
4560 | |||
4560 | if opts.get("date"): |
|
4561 | if opts.get("date"): | |
4561 | if opts.get("rev"): |
|
4562 | if opts.get("rev"): | |
4562 | raise error.Abort(_("you can't specify a revision and a date")) |
|
4563 | raise error.Abort(_("you can't specify a revision and a date")) | |
4563 | opts["rev"] = cmdutil.finddate(ui, repo, opts["date"]) |
|
4564 | opts["rev"] = cmdutil.finddate(ui, repo, opts["date"]) | |
4564 |
|
4565 | |||
4565 | parent, p2 = repo.dirstate.parents() |
|
4566 | parent, p2 = repo.dirstate.parents() | |
4566 | if not opts.get('rev') and p2 != nullid: |
|
4567 | if not opts.get('rev') and p2 != nullid: | |
4567 | # revert after merge is a trap for new users (issue2915) |
|
4568 | # revert after merge is a trap for new users (issue2915) | |
4568 | raise error.Abort(_('uncommitted merge with no revision specified'), |
|
4569 | raise error.Abort(_('uncommitted merge with no revision specified'), | |
4569 | hint=_("use 'hg update' or see 'hg help revert'")) |
|
4570 | hint=_("use 'hg update' or see 'hg help revert'")) | |
4570 |
|
4571 | |||
4571 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
4572 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
4572 |
|
4573 | |||
4573 | if (not (pats or opts.get('include') or opts.get('exclude') or |
|
4574 | if (not (pats or opts.get('include') or opts.get('exclude') or | |
4574 | opts.get('all') or opts.get('interactive'))): |
|
4575 | opts.get('all') or opts.get('interactive'))): | |
4575 | msg = _("no files or directories specified") |
|
4576 | msg = _("no files or directories specified") | |
4576 | if p2 != nullid: |
|
4577 | if p2 != nullid: | |
4577 | hint = _("uncommitted merge, use --all to discard all changes," |
|
4578 | hint = _("uncommitted merge, use --all to discard all changes," | |
4578 | " or 'hg update -C .' to abort the merge") |
|
4579 | " or 'hg update -C .' to abort the merge") | |
4579 | raise error.Abort(msg, hint=hint) |
|
4580 | raise error.Abort(msg, hint=hint) | |
4580 | dirty = any(repo.status()) |
|
4581 | dirty = any(repo.status()) | |
4581 | node = ctx.node() |
|
4582 | node = ctx.node() | |
4582 | if node != parent: |
|
4583 | if node != parent: | |
4583 | if dirty: |
|
4584 | if dirty: | |
4584 | hint = _("uncommitted changes, use --all to discard all" |
|
4585 | hint = _("uncommitted changes, use --all to discard all" | |
4585 | " changes, or 'hg update %s' to update") % ctx.rev() |
|
4586 | " changes, or 'hg update %s' to update") % ctx.rev() | |
4586 | else: |
|
4587 | else: | |
4587 | hint = _("use --all to revert all files," |
|
4588 | hint = _("use --all to revert all files," | |
4588 | " or 'hg update %s' to update") % ctx.rev() |
|
4589 | " or 'hg update %s' to update") % ctx.rev() | |
4589 | elif dirty: |
|
4590 | elif dirty: | |
4590 | hint = _("uncommitted changes, use --all to discard all changes") |
|
4591 | hint = _("uncommitted changes, use --all to discard all changes") | |
4591 | else: |
|
4592 | else: | |
4592 | hint = _("use --all to revert all files") |
|
4593 | hint = _("use --all to revert all files") | |
4593 | raise error.Abort(msg, hint=hint) |
|
4594 | raise error.Abort(msg, hint=hint) | |
4594 |
|
4595 | |||
4595 | return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts) |
|
4596 | return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts) | |
4596 |
|
4597 | |||
4597 | @command('rollback', dryrunopts + |
|
4598 | @command('rollback', dryrunopts + | |
4598 | [('f', 'force', False, _('ignore safety measures'))]) |
|
4599 | [('f', 'force', False, _('ignore safety measures'))]) | |
4599 | def rollback(ui, repo, **opts): |
|
4600 | def rollback(ui, repo, **opts): | |
4600 | """roll back the last transaction (DANGEROUS) (DEPRECATED) |
|
4601 | """roll back the last transaction (DANGEROUS) (DEPRECATED) | |
4601 |
|
4602 | |||
4602 | Please use :hg:`commit --amend` instead of rollback to correct |
|
4603 | Please use :hg:`commit --amend` instead of rollback to correct | |
4603 | mistakes in the last commit. |
|
4604 | mistakes in the last commit. | |
4604 |
|
4605 | |||
4605 | This command should be used with care. There is only one level of |
|
4606 | This command should be used with care. There is only one level of | |
4606 | rollback, and there is no way to undo a rollback. It will also |
|
4607 | rollback, and there is no way to undo a rollback. It will also | |
4607 | restore the dirstate at the time of the last transaction, losing |
|
4608 | restore the dirstate at the time of the last transaction, losing | |
4608 | any dirstate changes since that time. This command does not alter |
|
4609 | any dirstate changes since that time. This command does not alter | |
4609 | the working directory. |
|
4610 | the working directory. | |
4610 |
|
4611 | |||
4611 | Transactions are used to encapsulate the effects of all commands |
|
4612 | Transactions are used to encapsulate the effects of all commands | |
4612 | that create new changesets or propagate existing changesets into a |
|
4613 | that create new changesets or propagate existing changesets into a | |
4613 | repository. |
|
4614 | repository. | |
4614 |
|
4615 | |||
4615 | .. container:: verbose |
|
4616 | .. container:: verbose | |
4616 |
|
4617 | |||
4617 | For example, the following commands are transactional, and their |
|
4618 | For example, the following commands are transactional, and their | |
4618 | effects can be rolled back: |
|
4619 | effects can be rolled back: | |
4619 |
|
4620 | |||
4620 | - commit |
|
4621 | - commit | |
4621 | - import |
|
4622 | - import | |
4622 | - pull |
|
4623 | - pull | |
4623 | - push (with this repository as the destination) |
|
4624 | - push (with this repository as the destination) | |
4624 | - unbundle |
|
4625 | - unbundle | |
4625 |
|
4626 | |||
4626 | To avoid permanent data loss, rollback will refuse to rollback a |
|
4627 | To avoid permanent data loss, rollback will refuse to rollback a | |
4627 | commit transaction if it isn't checked out. Use --force to |
|
4628 | commit transaction if it isn't checked out. Use --force to | |
4628 | override this protection. |
|
4629 | override this protection. | |
4629 |
|
4630 | |||
4630 | The rollback command can be entirely disabled by setting the |
|
4631 | The rollback command can be entirely disabled by setting the | |
4631 | ``ui.rollback`` configuration setting to false. If you're here |
|
4632 | ``ui.rollback`` configuration setting to false. If you're here | |
4632 | because you want to use rollback and it's disabled, you can |
|
4633 | because you want to use rollback and it's disabled, you can | |
4633 | re-enable the command by setting ``ui.rollback`` to true. |
|
4634 | re-enable the command by setting ``ui.rollback`` to true. | |
4634 |
|
4635 | |||
4635 | This command is not intended for use on public repositories. Once |
|
4636 | This command is not intended for use on public repositories. Once | |
4636 | changes are visible for pull by other users, rolling a transaction |
|
4637 | changes are visible for pull by other users, rolling a transaction | |
4637 | back locally is ineffective (someone else may already have pulled |
|
4638 | back locally is ineffective (someone else may already have pulled | |
4638 | the changes). Furthermore, a race is possible with readers of the |
|
4639 | the changes). Furthermore, a race is possible with readers of the | |
4639 | repository; for example an in-progress pull from the repository |
|
4640 | repository; for example an in-progress pull from the repository | |
4640 | may fail if a rollback is performed. |
|
4641 | may fail if a rollback is performed. | |
4641 |
|
4642 | |||
4642 | Returns 0 on success, 1 if no rollback data is available. |
|
4643 | Returns 0 on success, 1 if no rollback data is available. | |
4643 | """ |
|
4644 | """ | |
4644 | if not ui.configbool('ui', 'rollback'): |
|
4645 | if not ui.configbool('ui', 'rollback'): | |
4645 | raise error.Abort(_('rollback is disabled because it is unsafe'), |
|
4646 | raise error.Abort(_('rollback is disabled because it is unsafe'), | |
4646 | hint=('see `hg help -v rollback` for information')) |
|
4647 | hint=('see `hg help -v rollback` for information')) | |
4647 | return repo.rollback(dryrun=opts.get(r'dry_run'), |
|
4648 | return repo.rollback(dryrun=opts.get(r'dry_run'), | |
4648 | force=opts.get(r'force')) |
|
4649 | force=opts.get(r'force')) | |
4649 |
|
4650 | |||
4650 | @command('root', []) |
|
4651 | @command('root', []) | |
4651 | def root(ui, repo): |
|
4652 | def root(ui, repo): | |
4652 | """print the root (top) of the current working directory |
|
4653 | """print the root (top) of the current working directory | |
4653 |
|
4654 | |||
4654 | Print the root directory of the current repository. |
|
4655 | Print the root directory of the current repository. | |
4655 |
|
4656 | |||
4656 | Returns 0 on success. |
|
4657 | Returns 0 on success. | |
4657 | """ |
|
4658 | """ | |
4658 | ui.write(repo.root + "\n") |
|
4659 | ui.write(repo.root + "\n") | |
4659 |
|
4660 | |||
4660 | @command('^serve', |
|
4661 | @command('^serve', | |
4661 | [('A', 'accesslog', '', _('name of access log file to write to'), |
|
4662 | [('A', 'accesslog', '', _('name of access log file to write to'), | |
4662 | _('FILE')), |
|
4663 | _('FILE')), | |
4663 | ('d', 'daemon', None, _('run server in background')), |
|
4664 | ('d', 'daemon', None, _('run server in background')), | |
4664 | ('', 'daemon-postexec', [], _('used internally by daemon mode')), |
|
4665 | ('', 'daemon-postexec', [], _('used internally by daemon mode')), | |
4665 | ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')), |
|
4666 | ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')), | |
4666 | # use string type, then we can check if something was passed |
|
4667 | # use string type, then we can check if something was passed | |
4667 | ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')), |
|
4668 | ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')), | |
4668 | ('a', 'address', '', _('address to listen on (default: all interfaces)'), |
|
4669 | ('a', 'address', '', _('address to listen on (default: all interfaces)'), | |
4669 | _('ADDR')), |
|
4670 | _('ADDR')), | |
4670 | ('', 'prefix', '', _('prefix path to serve from (default: server root)'), |
|
4671 | ('', 'prefix', '', _('prefix path to serve from (default: server root)'), | |
4671 | _('PREFIX')), |
|
4672 | _('PREFIX')), | |
4672 | ('n', 'name', '', |
|
4673 | ('n', 'name', '', | |
4673 | _('name to show in web pages (default: working directory)'), _('NAME')), |
|
4674 | _('name to show in web pages (default: working directory)'), _('NAME')), | |
4674 | ('', 'web-conf', '', |
|
4675 | ('', 'web-conf', '', | |
4675 | _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')), |
|
4676 | _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')), | |
4676 | ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'), |
|
4677 | ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'), | |
4677 | _('FILE')), |
|
4678 | _('FILE')), | |
4678 | ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')), |
|
4679 | ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')), | |
4679 | ('', 'stdio', None, _('for remote clients (ADVANCED)')), |
|
4680 | ('', 'stdio', None, _('for remote clients (ADVANCED)')), | |
4680 | ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')), |
|
4681 | ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')), | |
4681 | ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')), |
|
4682 | ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')), | |
4682 | ('', 'style', '', _('template style to use'), _('STYLE')), |
|
4683 | ('', 'style', '', _('template style to use'), _('STYLE')), | |
4683 | ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')), |
|
4684 | ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')), | |
4684 | ('', 'certificate', '', _('SSL certificate file'), _('FILE'))] |
|
4685 | ('', 'certificate', '', _('SSL certificate file'), _('FILE'))] | |
4685 | + subrepoopts, |
|
4686 | + subrepoopts, | |
4686 | _('[OPTION]...'), |
|
4687 | _('[OPTION]...'), | |
4687 | optionalrepo=True) |
|
4688 | optionalrepo=True) | |
4688 | def serve(ui, repo, **opts): |
|
4689 | def serve(ui, repo, **opts): | |
4689 | """start stand-alone webserver |
|
4690 | """start stand-alone webserver | |
4690 |
|
4691 | |||
4691 | Start a local HTTP repository browser and pull server. You can use |
|
4692 | Start a local HTTP repository browser and pull server. You can use | |
4692 | this for ad-hoc sharing and browsing of repositories. It is |
|
4693 | this for ad-hoc sharing and browsing of repositories. It is | |
4693 | recommended to use a real web server to serve a repository for |
|
4694 | recommended to use a real web server to serve a repository for | |
4694 | longer periods of time. |
|
4695 | longer periods of time. | |
4695 |
|
4696 | |||
4696 | Please note that the server does not implement access control. |
|
4697 | Please note that the server does not implement access control. | |
4697 | This means that, by default, anybody can read from the server and |
|
4698 | This means that, by default, anybody can read from the server and | |
4698 | nobody can write to it by default. Set the ``web.allow-push`` |
|
4699 | nobody can write to it by default. Set the ``web.allow-push`` | |
4699 | option to ``*`` to allow everybody to push to the server. You |
|
4700 | option to ``*`` to allow everybody to push to the server. You | |
4700 | should use a real web server if you need to authenticate users. |
|
4701 | should use a real web server if you need to authenticate users. | |
4701 |
|
4702 | |||
4702 | By default, the server logs accesses to stdout and errors to |
|
4703 | By default, the server logs accesses to stdout and errors to | |
4703 | stderr. Use the -A/--accesslog and -E/--errorlog options to log to |
|
4704 | stderr. Use the -A/--accesslog and -E/--errorlog options to log to | |
4704 | files. |
|
4705 | files. | |
4705 |
|
4706 | |||
4706 | To have the server choose a free port number to listen on, specify |
|
4707 | To have the server choose a free port number to listen on, specify | |
4707 | a port number of 0; in this case, the server will print the port |
|
4708 | a port number of 0; in this case, the server will print the port | |
4708 | number it uses. |
|
4709 | number it uses. | |
4709 |
|
4710 | |||
4710 | Returns 0 on success. |
|
4711 | Returns 0 on success. | |
4711 | """ |
|
4712 | """ | |
4712 |
|
4713 | |||
4713 | opts = pycompat.byteskwargs(opts) |
|
4714 | opts = pycompat.byteskwargs(opts) | |
4714 | if opts["stdio"] and opts["cmdserver"]: |
|
4715 | if opts["stdio"] and opts["cmdserver"]: | |
4715 | raise error.Abort(_("cannot use --stdio with --cmdserver")) |
|
4716 | raise error.Abort(_("cannot use --stdio with --cmdserver")) | |
4716 |
|
4717 | |||
4717 | if opts["stdio"]: |
|
4718 | if opts["stdio"]: | |
4718 | if repo is None: |
|
4719 | if repo is None: | |
4719 | raise error.RepoError(_("there is no Mercurial repository here" |
|
4720 | raise error.RepoError(_("there is no Mercurial repository here" | |
4720 | " (.hg not found)")) |
|
4721 | " (.hg not found)")) | |
4721 | s = sshserver.sshserver(ui, repo) |
|
4722 | s = sshserver.sshserver(ui, repo) | |
4722 | s.serve_forever() |
|
4723 | s.serve_forever() | |
4723 |
|
4724 | |||
4724 | service = server.createservice(ui, repo, opts) |
|
4725 | service = server.createservice(ui, repo, opts) | |
4725 | return server.runservice(opts, initfn=service.init, runfn=service.run) |
|
4726 | return server.runservice(opts, initfn=service.init, runfn=service.run) | |
4726 |
|
4727 | |||
4727 | @command('^status|st', |
|
4728 | @command('^status|st', | |
4728 | [('A', 'all', None, _('show status of all files')), |
|
4729 | [('A', 'all', None, _('show status of all files')), | |
4729 | ('m', 'modified', None, _('show only modified files')), |
|
4730 | ('m', 'modified', None, _('show only modified files')), | |
4730 | ('a', 'added', None, _('show only added files')), |
|
4731 | ('a', 'added', None, _('show only added files')), | |
4731 | ('r', 'removed', None, _('show only removed files')), |
|
4732 | ('r', 'removed', None, _('show only removed files')), | |
4732 | ('d', 'deleted', None, _('show only deleted (but tracked) files')), |
|
4733 | ('d', 'deleted', None, _('show only deleted (but tracked) files')), | |
4733 | ('c', 'clean', None, _('show only files without changes')), |
|
4734 | ('c', 'clean', None, _('show only files without changes')), | |
4734 | ('u', 'unknown', None, _('show only unknown (not tracked) files')), |
|
4735 | ('u', 'unknown', None, _('show only unknown (not tracked) files')), | |
4735 | ('i', 'ignored', None, _('show only ignored files')), |
|
4736 | ('i', 'ignored', None, _('show only ignored files')), | |
4736 | ('n', 'no-status', None, _('hide status prefix')), |
|
4737 | ('n', 'no-status', None, _('hide status prefix')), | |
4737 | ('t', 'terse', '', _('show the terse output (EXPERIMENTAL)')), |
|
4738 | ('t', 'terse', '', _('show the terse output (EXPERIMENTAL)')), | |
4738 | ('C', 'copies', None, _('show source of copied files')), |
|
4739 | ('C', 'copies', None, _('show source of copied files')), | |
4739 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), |
|
4740 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), | |
4740 | ('', 'rev', [], _('show difference from revision'), _('REV')), |
|
4741 | ('', 'rev', [], _('show difference from revision'), _('REV')), | |
4741 | ('', 'change', '', _('list the changed files of a revision'), _('REV')), |
|
4742 | ('', 'change', '', _('list the changed files of a revision'), _('REV')), | |
4742 | ] + walkopts + subrepoopts + formatteropts, |
|
4743 | ] + walkopts + subrepoopts + formatteropts, | |
4743 | _('[OPTION]... [FILE]...'), |
|
4744 | _('[OPTION]... [FILE]...'), | |
4744 | inferrepo=True) |
|
4745 | inferrepo=True) | |
4745 | def status(ui, repo, *pats, **opts): |
|
4746 | def status(ui, repo, *pats, **opts): | |
4746 | """show changed files in the working directory |
|
4747 | """show changed files in the working directory | |
4747 |
|
4748 | |||
4748 | Show status of files in the repository. If names are given, only |
|
4749 | Show status of files in the repository. If names are given, only | |
4749 | files that match are shown. Files that are clean or ignored or |
|
4750 | files that match are shown. Files that are clean or ignored or | |
4750 | the source of a copy/move operation, are not listed unless |
|
4751 | the source of a copy/move operation, are not listed unless | |
4751 | -c/--clean, -i/--ignored, -C/--copies or -A/--all are given. |
|
4752 | -c/--clean, -i/--ignored, -C/--copies or -A/--all are given. | |
4752 | Unless options described with "show only ..." are given, the |
|
4753 | Unless options described with "show only ..." are given, the | |
4753 | options -mardu are used. |
|
4754 | options -mardu are used. | |
4754 |
|
4755 | |||
4755 | Option -q/--quiet hides untracked (unknown and ignored) files |
|
4756 | Option -q/--quiet hides untracked (unknown and ignored) files | |
4756 | unless explicitly requested with -u/--unknown or -i/--ignored. |
|
4757 | unless explicitly requested with -u/--unknown or -i/--ignored. | |
4757 |
|
4758 | |||
4758 | .. note:: |
|
4759 | .. note:: | |
4759 |
|
4760 | |||
4760 | :hg:`status` may appear to disagree with diff if permissions have |
|
4761 | :hg:`status` may appear to disagree with diff if permissions have | |
4761 | changed or a merge has occurred. The standard diff format does |
|
4762 | changed or a merge has occurred. The standard diff format does | |
4762 | not report permission changes and diff only reports changes |
|
4763 | not report permission changes and diff only reports changes | |
4763 | relative to one merge parent. |
|
4764 | relative to one merge parent. | |
4764 |
|
4765 | |||
4765 | If one revision is given, it is used as the base revision. |
|
4766 | If one revision is given, it is used as the base revision. | |
4766 | If two revisions are given, the differences between them are |
|
4767 | If two revisions are given, the differences between them are | |
4767 | shown. The --change option can also be used as a shortcut to list |
|
4768 | shown. The --change option can also be used as a shortcut to list | |
4768 | the changed files of a revision from its first parent. |
|
4769 | the changed files of a revision from its first parent. | |
4769 |
|
4770 | |||
4770 | The codes used to show the status of files are:: |
|
4771 | The codes used to show the status of files are:: | |
4771 |
|
4772 | |||
4772 | M = modified |
|
4773 | M = modified | |
4773 | A = added |
|
4774 | A = added | |
4774 | R = removed |
|
4775 | R = removed | |
4775 | C = clean |
|
4776 | C = clean | |
4776 | ! = missing (deleted by non-hg command, but still tracked) |
|
4777 | ! = missing (deleted by non-hg command, but still tracked) | |
4777 | ? = not tracked |
|
4778 | ? = not tracked | |
4778 | I = ignored |
|
4779 | I = ignored | |
4779 | = origin of the previous file (with --copies) |
|
4780 | = origin of the previous file (with --copies) | |
4780 |
|
4781 | |||
4781 | .. container:: verbose |
|
4782 | .. container:: verbose | |
4782 |
|
4783 | |||
4783 | The -t/--terse option abbreviates the output by showing only the directory |
|
4784 | The -t/--terse option abbreviates the output by showing only the directory | |
4784 | name if all the files in it share the same status. The option takes an |
|
4785 | name if all the files in it share the same status. The option takes an | |
4785 | argument indicating the statuses to abbreviate: 'm' for 'modified', 'a' |
|
4786 | argument indicating the statuses to abbreviate: 'm' for 'modified', 'a' | |
4786 | for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i' |
|
4787 | for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i' | |
4787 | for 'ignored' and 'c' for clean. |
|
4788 | for 'ignored' and 'c' for clean. | |
4788 |
|
4789 | |||
4789 | It abbreviates only those statuses which are passed. Note that clean and |
|
4790 | It abbreviates only those statuses which are passed. Note that clean and | |
4790 | ignored files are not displayed with '--terse ic' unless the -c/--clean |
|
4791 | ignored files are not displayed with '--terse ic' unless the -c/--clean | |
4791 | and -i/--ignored options are also used. |
|
4792 | and -i/--ignored options are also used. | |
4792 |
|
4793 | |||
4793 | The -v/--verbose option shows information when the repository is in an |
|
4794 | The -v/--verbose option shows information when the repository is in an | |
4794 | unfinished merge, shelve, rebase state etc. You can have this behavior |
|
4795 | unfinished merge, shelve, rebase state etc. You can have this behavior | |
4795 | turned on by default by enabling the ``commands.status.verbose`` option. |
|
4796 | turned on by default by enabling the ``commands.status.verbose`` option. | |
4796 |
|
4797 | |||
4797 | You can skip displaying some of these states by setting |
|
4798 | You can skip displaying some of these states by setting | |
4798 | ``commands.status.skipstates`` to one or more of: 'bisect', 'graft', |
|
4799 | ``commands.status.skipstates`` to one or more of: 'bisect', 'graft', | |
4799 | 'histedit', 'merge', 'rebase', or 'unshelve'. |
|
4800 | 'histedit', 'merge', 'rebase', or 'unshelve'. | |
4800 |
|
4801 | |||
4801 | Examples: |
|
4802 | Examples: | |
4802 |
|
4803 | |||
4803 | - show changes in the working directory relative to a |
|
4804 | - show changes in the working directory relative to a | |
4804 | changeset:: |
|
4805 | changeset:: | |
4805 |
|
4806 | |||
4806 | hg status --rev 9353 |
|
4807 | hg status --rev 9353 | |
4807 |
|
4808 | |||
4808 | - show changes in the working directory relative to the |
|
4809 | - show changes in the working directory relative to the | |
4809 | current directory (see :hg:`help patterns` for more information):: |
|
4810 | current directory (see :hg:`help patterns` for more information):: | |
4810 |
|
4811 | |||
4811 | hg status re: |
|
4812 | hg status re: | |
4812 |
|
4813 | |||
4813 | - show all changes including copies in an existing changeset:: |
|
4814 | - show all changes including copies in an existing changeset:: | |
4814 |
|
4815 | |||
4815 | hg status --copies --change 9353 |
|
4816 | hg status --copies --change 9353 | |
4816 |
|
4817 | |||
4817 | - get a NUL separated list of added files, suitable for xargs:: |
|
4818 | - get a NUL separated list of added files, suitable for xargs:: | |
4818 |
|
4819 | |||
4819 | hg status -an0 |
|
4820 | hg status -an0 | |
4820 |
|
4821 | |||
4821 | - show more information about the repository status, abbreviating |
|
4822 | - show more information about the repository status, abbreviating | |
4822 | added, removed, modified, deleted, and untracked paths:: |
|
4823 | added, removed, modified, deleted, and untracked paths:: | |
4823 |
|
4824 | |||
4824 | hg status -v -t mardu |
|
4825 | hg status -v -t mardu | |
4825 |
|
4826 | |||
4826 | Returns 0 on success. |
|
4827 | Returns 0 on success. | |
4827 |
|
4828 | |||
4828 | """ |
|
4829 | """ | |
4829 |
|
4830 | |||
4830 | opts = pycompat.byteskwargs(opts) |
|
4831 | opts = pycompat.byteskwargs(opts) | |
4831 | revs = opts.get('rev') |
|
4832 | revs = opts.get('rev') | |
4832 | change = opts.get('change') |
|
4833 | change = opts.get('change') | |
4833 | terse = opts.get('terse') |
|
4834 | terse = opts.get('terse') | |
4834 |
|
4835 | |||
4835 | if revs and change: |
|
4836 | if revs and change: | |
4836 | msg = _('cannot specify --rev and --change at the same time') |
|
4837 | msg = _('cannot specify --rev and --change at the same time') | |
4837 | raise error.Abort(msg) |
|
4838 | raise error.Abort(msg) | |
4838 | elif revs and terse: |
|
4839 | elif revs and terse: | |
4839 | msg = _('cannot use --terse with --rev') |
|
4840 | msg = _('cannot use --terse with --rev') | |
4840 | raise error.Abort(msg) |
|
4841 | raise error.Abort(msg) | |
4841 | elif change: |
|
4842 | elif change: | |
4842 | node2 = scmutil.revsingle(repo, change, None).node() |
|
4843 | node2 = scmutil.revsingle(repo, change, None).node() | |
4843 | node1 = repo[node2].p1().node() |
|
4844 | node1 = repo[node2].p1().node() | |
4844 | else: |
|
4845 | else: | |
4845 | node1, node2 = scmutil.revpair(repo, revs) |
|
4846 | node1, node2 = scmutil.revpair(repo, revs) | |
4846 |
|
4847 | |||
4847 | if pats or ui.configbool('commands', 'status.relative'): |
|
4848 | if pats or ui.configbool('commands', 'status.relative'): | |
4848 | cwd = repo.getcwd() |
|
4849 | cwd = repo.getcwd() | |
4849 | else: |
|
4850 | else: | |
4850 | cwd = '' |
|
4851 | cwd = '' | |
4851 |
|
4852 | |||
4852 | if opts.get('print0'): |
|
4853 | if opts.get('print0'): | |
4853 | end = '\0' |
|
4854 | end = '\0' | |
4854 | else: |
|
4855 | else: | |
4855 | end = '\n' |
|
4856 | end = '\n' | |
4856 | copy = {} |
|
4857 | copy = {} | |
4857 | states = 'modified added removed deleted unknown ignored clean'.split() |
|
4858 | states = 'modified added removed deleted unknown ignored clean'.split() | |
4858 | show = [k for k in states if opts.get(k)] |
|
4859 | show = [k for k in states if opts.get(k)] | |
4859 | if opts.get('all'): |
|
4860 | if opts.get('all'): | |
4860 | show += ui.quiet and (states[:4] + ['clean']) or states |
|
4861 | show += ui.quiet and (states[:4] + ['clean']) or states | |
4861 |
|
4862 | |||
4862 | if not show: |
|
4863 | if not show: | |
4863 | if ui.quiet: |
|
4864 | if ui.quiet: | |
4864 | show = states[:4] |
|
4865 | show = states[:4] | |
4865 | else: |
|
4866 | else: | |
4866 | show = states[:5] |
|
4867 | show = states[:5] | |
4867 |
|
4868 | |||
4868 | m = scmutil.match(repo[node2], pats, opts) |
|
4869 | m = scmutil.match(repo[node2], pats, opts) | |
4869 | if terse: |
|
4870 | if terse: | |
4870 | # we need to compute clean and unknown to terse |
|
4871 | # we need to compute clean and unknown to terse | |
4871 | stat = repo.status(node1, node2, m, |
|
4872 | stat = repo.status(node1, node2, m, | |
4872 | 'ignored' in show or 'i' in terse, |
|
4873 | 'ignored' in show or 'i' in terse, | |
4873 | True, True, opts.get('subrepos')) |
|
4874 | True, True, opts.get('subrepos')) | |
4874 |
|
4875 | |||
4875 | stat = cmdutil.tersedir(stat, terse) |
|
4876 | stat = cmdutil.tersedir(stat, terse) | |
4876 | else: |
|
4877 | else: | |
4877 | stat = repo.status(node1, node2, m, |
|
4878 | stat = repo.status(node1, node2, m, | |
4878 | 'ignored' in show, 'clean' in show, |
|
4879 | 'ignored' in show, 'clean' in show, | |
4879 | 'unknown' in show, opts.get('subrepos')) |
|
4880 | 'unknown' in show, opts.get('subrepos')) | |
4880 |
|
4881 | |||
4881 | changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat) |
|
4882 | changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat) | |
4882 |
|
4883 | |||
4883 | if (opts.get('all') or opts.get('copies') |
|
4884 | if (opts.get('all') or opts.get('copies') | |
4884 | or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'): |
|
4885 | or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'): | |
4885 | copy = copies.pathcopies(repo[node1], repo[node2], m) |
|
4886 | copy = copies.pathcopies(repo[node1], repo[node2], m) | |
4886 |
|
4887 | |||
4887 | ui.pager('status') |
|
4888 | ui.pager('status') | |
4888 | fm = ui.formatter('status', opts) |
|
4889 | fm = ui.formatter('status', opts) | |
4889 | fmt = '%s' + end |
|
4890 | fmt = '%s' + end | |
4890 | showchar = not opts.get('no_status') |
|
4891 | showchar = not opts.get('no_status') | |
4891 |
|
4892 | |||
4892 | for state, char, files in changestates: |
|
4893 | for state, char, files in changestates: | |
4893 | if state in show: |
|
4894 | if state in show: | |
4894 | label = 'status.' + state |
|
4895 | label = 'status.' + state | |
4895 | for f in files: |
|
4896 | for f in files: | |
4896 | fm.startitem() |
|
4897 | fm.startitem() | |
4897 | fm.condwrite(showchar, 'status', '%s ', char, label=label) |
|
4898 | fm.condwrite(showchar, 'status', '%s ', char, label=label) | |
4898 | fm.write('path', fmt, repo.pathto(f, cwd), label=label) |
|
4899 | fm.write('path', fmt, repo.pathto(f, cwd), label=label) | |
4899 | if f in copy: |
|
4900 | if f in copy: | |
4900 | fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd), |
|
4901 | fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd), | |
4901 | label='status.copied') |
|
4902 | label='status.copied') | |
4902 |
|
4903 | |||
4903 | if ((ui.verbose or ui.configbool('commands', 'status.verbose')) |
|
4904 | if ((ui.verbose or ui.configbool('commands', 'status.verbose')) | |
4904 | and not ui.plain()): |
|
4905 | and not ui.plain()): | |
4905 | cmdutil.morestatus(repo, fm) |
|
4906 | cmdutil.morestatus(repo, fm) | |
4906 | fm.end() |
|
4907 | fm.end() | |
4907 |
|
4908 | |||
4908 | @command('^summary|sum', |
|
4909 | @command('^summary|sum', | |
4909 | [('', 'remote', None, _('check for push and pull'))], '[--remote]') |
|
4910 | [('', 'remote', None, _('check for push and pull'))], '[--remote]') | |
4910 | def summary(ui, repo, **opts): |
|
4911 | def summary(ui, repo, **opts): | |
4911 | """summarize working directory state |
|
4912 | """summarize working directory state | |
4912 |
|
4913 | |||
4913 | This generates a brief summary of the working directory state, |
|
4914 | This generates a brief summary of the working directory state, | |
4914 | including parents, branch, commit status, phase and available updates. |
|
4915 | including parents, branch, commit status, phase and available updates. | |
4915 |
|
4916 | |||
4916 | With the --remote option, this will check the default paths for |
|
4917 | With the --remote option, this will check the default paths for | |
4917 | incoming and outgoing changes. This can be time-consuming. |
|
4918 | incoming and outgoing changes. This can be time-consuming. | |
4918 |
|
4919 | |||
4919 | Returns 0 on success. |
|
4920 | Returns 0 on success. | |
4920 | """ |
|
4921 | """ | |
4921 |
|
4922 | |||
4922 | opts = pycompat.byteskwargs(opts) |
|
4923 | opts = pycompat.byteskwargs(opts) | |
4923 | ui.pager('summary') |
|
4924 | ui.pager('summary') | |
4924 | ctx = repo[None] |
|
4925 | ctx = repo[None] | |
4925 | parents = ctx.parents() |
|
4926 | parents = ctx.parents() | |
4926 | pnode = parents[0].node() |
|
4927 | pnode = parents[0].node() | |
4927 | marks = [] |
|
4928 | marks = [] | |
4928 |
|
4929 | |||
4929 | ms = None |
|
4930 | ms = None | |
4930 | try: |
|
4931 | try: | |
4931 | ms = mergemod.mergestate.read(repo) |
|
4932 | ms = mergemod.mergestate.read(repo) | |
4932 | except error.UnsupportedMergeRecords as e: |
|
4933 | except error.UnsupportedMergeRecords as e: | |
4933 | s = ' '.join(e.recordtypes) |
|
4934 | s = ' '.join(e.recordtypes) | |
4934 | ui.warn( |
|
4935 | ui.warn( | |
4935 | _('warning: merge state has unsupported record types: %s\n') % s) |
|
4936 | _('warning: merge state has unsupported record types: %s\n') % s) | |
4936 | unresolved = [] |
|
4937 | unresolved = [] | |
4937 | else: |
|
4938 | else: | |
4938 | unresolved = list(ms.unresolved()) |
|
4939 | unresolved = list(ms.unresolved()) | |
4939 |
|
4940 | |||
4940 | for p in parents: |
|
4941 | for p in parents: | |
4941 | # label with log.changeset (instead of log.parent) since this |
|
4942 | # label with log.changeset (instead of log.parent) since this | |
4942 | # shows a working directory parent *changeset*: |
|
4943 | # shows a working directory parent *changeset*: | |
4943 | # i18n: column positioning for "hg summary" |
|
4944 | # i18n: column positioning for "hg summary" | |
4944 | ui.write(_('parent: %d:%s ') % (p.rev(), p), |
|
4945 | ui.write(_('parent: %d:%s ') % (p.rev(), p), | |
4945 | label=cmdutil._changesetlabels(p)) |
|
4946 | label=cmdutil._changesetlabels(p)) | |
4946 | ui.write(' '.join(p.tags()), label='log.tag') |
|
4947 | ui.write(' '.join(p.tags()), label='log.tag') | |
4947 | if p.bookmarks(): |
|
4948 | if p.bookmarks(): | |
4948 | marks.extend(p.bookmarks()) |
|
4949 | marks.extend(p.bookmarks()) | |
4949 | if p.rev() == -1: |
|
4950 | if p.rev() == -1: | |
4950 | if not len(repo): |
|
4951 | if not len(repo): | |
4951 | ui.write(_(' (empty repository)')) |
|
4952 | ui.write(_(' (empty repository)')) | |
4952 | else: |
|
4953 | else: | |
4953 | ui.write(_(' (no revision checked out)')) |
|
4954 | ui.write(_(' (no revision checked out)')) | |
4954 | if p.obsolete(): |
|
4955 | if p.obsolete(): | |
4955 | ui.write(_(' (obsolete)')) |
|
4956 | ui.write(_(' (obsolete)')) | |
4956 | if p.isunstable(): |
|
4957 | if p.isunstable(): | |
4957 | instabilities = (ui.label(instability, 'trouble.%s' % instability) |
|
4958 | instabilities = (ui.label(instability, 'trouble.%s' % instability) | |
4958 | for instability in p.instabilities()) |
|
4959 | for instability in p.instabilities()) | |
4959 | ui.write(' (' |
|
4960 | ui.write(' (' | |
4960 | + ', '.join(instabilities) |
|
4961 | + ', '.join(instabilities) | |
4961 | + ')') |
|
4962 | + ')') | |
4962 | ui.write('\n') |
|
4963 | ui.write('\n') | |
4963 | if p.description(): |
|
4964 | if p.description(): | |
4964 | ui.status(' ' + p.description().splitlines()[0].strip() + '\n', |
|
4965 | ui.status(' ' + p.description().splitlines()[0].strip() + '\n', | |
4965 | label='log.summary') |
|
4966 | label='log.summary') | |
4966 |
|
4967 | |||
4967 | branch = ctx.branch() |
|
4968 | branch = ctx.branch() | |
4968 | bheads = repo.branchheads(branch) |
|
4969 | bheads = repo.branchheads(branch) | |
4969 | # i18n: column positioning for "hg summary" |
|
4970 | # i18n: column positioning for "hg summary" | |
4970 | m = _('branch: %s\n') % branch |
|
4971 | m = _('branch: %s\n') % branch | |
4971 | if branch != 'default': |
|
4972 | if branch != 'default': | |
4972 | ui.write(m, label='log.branch') |
|
4973 | ui.write(m, label='log.branch') | |
4973 | else: |
|
4974 | else: | |
4974 | ui.status(m, label='log.branch') |
|
4975 | ui.status(m, label='log.branch') | |
4975 |
|
4976 | |||
4976 | if marks: |
|
4977 | if marks: | |
4977 | active = repo._activebookmark |
|
4978 | active = repo._activebookmark | |
4978 | # i18n: column positioning for "hg summary" |
|
4979 | # i18n: column positioning for "hg summary" | |
4979 | ui.write(_('bookmarks:'), label='log.bookmark') |
|
4980 | ui.write(_('bookmarks:'), label='log.bookmark') | |
4980 | if active is not None: |
|
4981 | if active is not None: | |
4981 | if active in marks: |
|
4982 | if active in marks: | |
4982 | ui.write(' *' + active, label=bookmarks.activebookmarklabel) |
|
4983 | ui.write(' *' + active, label=bookmarks.activebookmarklabel) | |
4983 | marks.remove(active) |
|
4984 | marks.remove(active) | |
4984 | else: |
|
4985 | else: | |
4985 | ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel) |
|
4986 | ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel) | |
4986 | for m in marks: |
|
4987 | for m in marks: | |
4987 | ui.write(' ' + m, label='log.bookmark') |
|
4988 | ui.write(' ' + m, label='log.bookmark') | |
4988 | ui.write('\n', label='log.bookmark') |
|
4989 | ui.write('\n', label='log.bookmark') | |
4989 |
|
4990 | |||
4990 | status = repo.status(unknown=True) |
|
4991 | status = repo.status(unknown=True) | |
4991 |
|
4992 | |||
4992 | c = repo.dirstate.copies() |
|
4993 | c = repo.dirstate.copies() | |
4993 | copied, renamed = [], [] |
|
4994 | copied, renamed = [], [] | |
4994 | for d, s in c.iteritems(): |
|
4995 | for d, s in c.iteritems(): | |
4995 | if s in status.removed: |
|
4996 | if s in status.removed: | |
4996 | status.removed.remove(s) |
|
4997 | status.removed.remove(s) | |
4997 | renamed.append(d) |
|
4998 | renamed.append(d) | |
4998 | else: |
|
4999 | else: | |
4999 | copied.append(d) |
|
5000 | copied.append(d) | |
5000 | if d in status.added: |
|
5001 | if d in status.added: | |
5001 | status.added.remove(d) |
|
5002 | status.added.remove(d) | |
5002 |
|
5003 | |||
5003 | subs = [s for s in ctx.substate if ctx.sub(s).dirty()] |
|
5004 | subs = [s for s in ctx.substate if ctx.sub(s).dirty()] | |
5004 |
|
5005 | |||
5005 | labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified), |
|
5006 | labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified), | |
5006 | (ui.label(_('%d added'), 'status.added'), status.added), |
|
5007 | (ui.label(_('%d added'), 'status.added'), status.added), | |
5007 | (ui.label(_('%d removed'), 'status.removed'), status.removed), |
|
5008 | (ui.label(_('%d removed'), 'status.removed'), status.removed), | |
5008 | (ui.label(_('%d renamed'), 'status.copied'), renamed), |
|
5009 | (ui.label(_('%d renamed'), 'status.copied'), renamed), | |
5009 | (ui.label(_('%d copied'), 'status.copied'), copied), |
|
5010 | (ui.label(_('%d copied'), 'status.copied'), copied), | |
5010 | (ui.label(_('%d deleted'), 'status.deleted'), status.deleted), |
|
5011 | (ui.label(_('%d deleted'), 'status.deleted'), status.deleted), | |
5011 | (ui.label(_('%d unknown'), 'status.unknown'), status.unknown), |
|
5012 | (ui.label(_('%d unknown'), 'status.unknown'), status.unknown), | |
5012 | (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved), |
|
5013 | (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved), | |
5013 | (ui.label(_('%d subrepos'), 'status.modified'), subs)] |
|
5014 | (ui.label(_('%d subrepos'), 'status.modified'), subs)] | |
5014 | t = [] |
|
5015 | t = [] | |
5015 | for l, s in labels: |
|
5016 | for l, s in labels: | |
5016 | if s: |
|
5017 | if s: | |
5017 | t.append(l % len(s)) |
|
5018 | t.append(l % len(s)) | |
5018 |
|
5019 | |||
5019 | t = ', '.join(t) |
|
5020 | t = ', '.join(t) | |
5020 | cleanworkdir = False |
|
5021 | cleanworkdir = False | |
5021 |
|
5022 | |||
5022 | if repo.vfs.exists('graftstate'): |
|
5023 | if repo.vfs.exists('graftstate'): | |
5023 | t += _(' (graft in progress)') |
|
5024 | t += _(' (graft in progress)') | |
5024 | if repo.vfs.exists('updatestate'): |
|
5025 | if repo.vfs.exists('updatestate'): | |
5025 | t += _(' (interrupted update)') |
|
5026 | t += _(' (interrupted update)') | |
5026 | elif len(parents) > 1: |
|
5027 | elif len(parents) > 1: | |
5027 | t += _(' (merge)') |
|
5028 | t += _(' (merge)') | |
5028 | elif branch != parents[0].branch(): |
|
5029 | elif branch != parents[0].branch(): | |
5029 | t += _(' (new branch)') |
|
5030 | t += _(' (new branch)') | |
5030 | elif (parents[0].closesbranch() and |
|
5031 | elif (parents[0].closesbranch() and | |
5031 | pnode in repo.branchheads(branch, closed=True)): |
|
5032 | pnode in repo.branchheads(branch, closed=True)): | |
5032 | t += _(' (head closed)') |
|
5033 | t += _(' (head closed)') | |
5033 | elif not (status.modified or status.added or status.removed or renamed or |
|
5034 | elif not (status.modified or status.added or status.removed or renamed or | |
5034 | copied or subs): |
|
5035 | copied or subs): | |
5035 | t += _(' (clean)') |
|
5036 | t += _(' (clean)') | |
5036 | cleanworkdir = True |
|
5037 | cleanworkdir = True | |
5037 | elif pnode not in bheads: |
|
5038 | elif pnode not in bheads: | |
5038 | t += _(' (new branch head)') |
|
5039 | t += _(' (new branch head)') | |
5039 |
|
5040 | |||
5040 | if parents: |
|
5041 | if parents: | |
5041 | pendingphase = max(p.phase() for p in parents) |
|
5042 | pendingphase = max(p.phase() for p in parents) | |
5042 | else: |
|
5043 | else: | |
5043 | pendingphase = phases.public |
|
5044 | pendingphase = phases.public | |
5044 |
|
5045 | |||
5045 | if pendingphase > phases.newcommitphase(ui): |
|
5046 | if pendingphase > phases.newcommitphase(ui): | |
5046 | t += ' (%s)' % phases.phasenames[pendingphase] |
|
5047 | t += ' (%s)' % phases.phasenames[pendingphase] | |
5047 |
|
5048 | |||
5048 | if cleanworkdir: |
|
5049 | if cleanworkdir: | |
5049 | # i18n: column positioning for "hg summary" |
|
5050 | # i18n: column positioning for "hg summary" | |
5050 | ui.status(_('commit: %s\n') % t.strip()) |
|
5051 | ui.status(_('commit: %s\n') % t.strip()) | |
5051 | else: |
|
5052 | else: | |
5052 | # i18n: column positioning for "hg summary" |
|
5053 | # i18n: column positioning for "hg summary" | |
5053 | ui.write(_('commit: %s\n') % t.strip()) |
|
5054 | ui.write(_('commit: %s\n') % t.strip()) | |
5054 |
|
5055 | |||
5055 | # all ancestors of branch heads - all ancestors of parent = new csets |
|
5056 | # all ancestors of branch heads - all ancestors of parent = new csets | |
5056 | new = len(repo.changelog.findmissing([pctx.node() for pctx in parents], |
|
5057 | new = len(repo.changelog.findmissing([pctx.node() for pctx in parents], | |
5057 | bheads)) |
|
5058 | bheads)) | |
5058 |
|
5059 | |||
5059 | if new == 0: |
|
5060 | if new == 0: | |
5060 | # i18n: column positioning for "hg summary" |
|
5061 | # i18n: column positioning for "hg summary" | |
5061 | ui.status(_('update: (current)\n')) |
|
5062 | ui.status(_('update: (current)\n')) | |
5062 | elif pnode not in bheads: |
|
5063 | elif pnode not in bheads: | |
5063 | # i18n: column positioning for "hg summary" |
|
5064 | # i18n: column positioning for "hg summary" | |
5064 | ui.write(_('update: %d new changesets (update)\n') % new) |
|
5065 | ui.write(_('update: %d new changesets (update)\n') % new) | |
5065 | else: |
|
5066 | else: | |
5066 | # i18n: column positioning for "hg summary" |
|
5067 | # i18n: column positioning for "hg summary" | |
5067 | ui.write(_('update: %d new changesets, %d branch heads (merge)\n') % |
|
5068 | ui.write(_('update: %d new changesets, %d branch heads (merge)\n') % | |
5068 | (new, len(bheads))) |
|
5069 | (new, len(bheads))) | |
5069 |
|
5070 | |||
5070 | t = [] |
|
5071 | t = [] | |
5071 | draft = len(repo.revs('draft()')) |
|
5072 | draft = len(repo.revs('draft()')) | |
5072 | if draft: |
|
5073 | if draft: | |
5073 | t.append(_('%d draft') % draft) |
|
5074 | t.append(_('%d draft') % draft) | |
5074 | secret = len(repo.revs('secret()')) |
|
5075 | secret = len(repo.revs('secret()')) | |
5075 | if secret: |
|
5076 | if secret: | |
5076 | t.append(_('%d secret') % secret) |
|
5077 | t.append(_('%d secret') % secret) | |
5077 |
|
5078 | |||
5078 | if draft or secret: |
|
5079 | if draft or secret: | |
5079 | ui.status(_('phases: %s\n') % ', '.join(t)) |
|
5080 | ui.status(_('phases: %s\n') % ', '.join(t)) | |
5080 |
|
5081 | |||
5081 | if obsolete.isenabled(repo, obsolete.createmarkersopt): |
|
5082 | if obsolete.isenabled(repo, obsolete.createmarkersopt): | |
5082 | for trouble in ("orphan", "contentdivergent", "phasedivergent"): |
|
5083 | for trouble in ("orphan", "contentdivergent", "phasedivergent"): | |
5083 | numtrouble = len(repo.revs(trouble + "()")) |
|
5084 | numtrouble = len(repo.revs(trouble + "()")) | |
5084 | # We write all the possibilities to ease translation |
|
5085 | # We write all the possibilities to ease translation | |
5085 | troublemsg = { |
|
5086 | troublemsg = { | |
5086 | "orphan": _("orphan: %d changesets"), |
|
5087 | "orphan": _("orphan: %d changesets"), | |
5087 | "contentdivergent": _("content-divergent: %d changesets"), |
|
5088 | "contentdivergent": _("content-divergent: %d changesets"), | |
5088 | "phasedivergent": _("phase-divergent: %d changesets"), |
|
5089 | "phasedivergent": _("phase-divergent: %d changesets"), | |
5089 | } |
|
5090 | } | |
5090 | if numtrouble > 0: |
|
5091 | if numtrouble > 0: | |
5091 | ui.status(troublemsg[trouble] % numtrouble + "\n") |
|
5092 | ui.status(troublemsg[trouble] % numtrouble + "\n") | |
5092 |
|
5093 | |||
5093 | cmdutil.summaryhooks(ui, repo) |
|
5094 | cmdutil.summaryhooks(ui, repo) | |
5094 |
|
5095 | |||
5095 | if opts.get('remote'): |
|
5096 | if opts.get('remote'): | |
5096 | needsincoming, needsoutgoing = True, True |
|
5097 | needsincoming, needsoutgoing = True, True | |
5097 | else: |
|
5098 | else: | |
5098 | needsincoming, needsoutgoing = False, False |
|
5099 | needsincoming, needsoutgoing = False, False | |
5099 | for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None): |
|
5100 | for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None): | |
5100 | if i: |
|
5101 | if i: | |
5101 | needsincoming = True |
|
5102 | needsincoming = True | |
5102 | if o: |
|
5103 | if o: | |
5103 | needsoutgoing = True |
|
5104 | needsoutgoing = True | |
5104 | if not needsincoming and not needsoutgoing: |
|
5105 | if not needsincoming and not needsoutgoing: | |
5105 | return |
|
5106 | return | |
5106 |
|
5107 | |||
5107 | def getincoming(): |
|
5108 | def getincoming(): | |
5108 | source, branches = hg.parseurl(ui.expandpath('default')) |
|
5109 | source, branches = hg.parseurl(ui.expandpath('default')) | |
5109 | sbranch = branches[0] |
|
5110 | sbranch = branches[0] | |
5110 | try: |
|
5111 | try: | |
5111 | other = hg.peer(repo, {}, source) |
|
5112 | other = hg.peer(repo, {}, source) | |
5112 | except error.RepoError: |
|
5113 | except error.RepoError: | |
5113 | if opts.get('remote'): |
|
5114 | if opts.get('remote'): | |
5114 | raise |
|
5115 | raise | |
5115 | return source, sbranch, None, None, None |
|
5116 | return source, sbranch, None, None, None | |
5116 | revs, checkout = hg.addbranchrevs(repo, other, branches, None) |
|
5117 | revs, checkout = hg.addbranchrevs(repo, other, branches, None) | |
5117 | if revs: |
|
5118 | if revs: | |
5118 | revs = [other.lookup(rev) for rev in revs] |
|
5119 | revs = [other.lookup(rev) for rev in revs] | |
5119 | ui.debug('comparing with %s\n' % util.hidepassword(source)) |
|
5120 | ui.debug('comparing with %s\n' % util.hidepassword(source)) | |
5120 | repo.ui.pushbuffer() |
|
5121 | repo.ui.pushbuffer() | |
5121 | commoninc = discovery.findcommonincoming(repo, other, heads=revs) |
|
5122 | commoninc = discovery.findcommonincoming(repo, other, heads=revs) | |
5122 | repo.ui.popbuffer() |
|
5123 | repo.ui.popbuffer() | |
5123 | return source, sbranch, other, commoninc, commoninc[1] |
|
5124 | return source, sbranch, other, commoninc, commoninc[1] | |
5124 |
|
5125 | |||
5125 | if needsincoming: |
|
5126 | if needsincoming: | |
5126 | source, sbranch, sother, commoninc, incoming = getincoming() |
|
5127 | source, sbranch, sother, commoninc, incoming = getincoming() | |
5127 | else: |
|
5128 | else: | |
5128 | source = sbranch = sother = commoninc = incoming = None |
|
5129 | source = sbranch = sother = commoninc = incoming = None | |
5129 |
|
5130 | |||
5130 | def getoutgoing(): |
|
5131 | def getoutgoing(): | |
5131 | dest, branches = hg.parseurl(ui.expandpath('default-push', 'default')) |
|
5132 | dest, branches = hg.parseurl(ui.expandpath('default-push', 'default')) | |
5132 | dbranch = branches[0] |
|
5133 | dbranch = branches[0] | |
5133 | revs, checkout = hg.addbranchrevs(repo, repo, branches, None) |
|
5134 | revs, checkout = hg.addbranchrevs(repo, repo, branches, None) | |
5134 | if source != dest: |
|
5135 | if source != dest: | |
5135 | try: |
|
5136 | try: | |
5136 | dother = hg.peer(repo, {}, dest) |
|
5137 | dother = hg.peer(repo, {}, dest) | |
5137 | except error.RepoError: |
|
5138 | except error.RepoError: | |
5138 | if opts.get('remote'): |
|
5139 | if opts.get('remote'): | |
5139 | raise |
|
5140 | raise | |
5140 | return dest, dbranch, None, None |
|
5141 | return dest, dbranch, None, None | |
5141 | ui.debug('comparing with %s\n' % util.hidepassword(dest)) |
|
5142 | ui.debug('comparing with %s\n' % util.hidepassword(dest)) | |
5142 | elif sother is None: |
|
5143 | elif sother is None: | |
5143 | # there is no explicit destination peer, but source one is invalid |
|
5144 | # there is no explicit destination peer, but source one is invalid | |
5144 | return dest, dbranch, None, None |
|
5145 | return dest, dbranch, None, None | |
5145 | else: |
|
5146 | else: | |
5146 | dother = sother |
|
5147 | dother = sother | |
5147 | if (source != dest or (sbranch is not None and sbranch != dbranch)): |
|
5148 | if (source != dest or (sbranch is not None and sbranch != dbranch)): | |
5148 | common = None |
|
5149 | common = None | |
5149 | else: |
|
5150 | else: | |
5150 | common = commoninc |
|
5151 | common = commoninc | |
5151 | if revs: |
|
5152 | if revs: | |
5152 | revs = [repo.lookup(rev) for rev in revs] |
|
5153 | revs = [repo.lookup(rev) for rev in revs] | |
5153 | repo.ui.pushbuffer() |
|
5154 | repo.ui.pushbuffer() | |
5154 | outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs, |
|
5155 | outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs, | |
5155 | commoninc=common) |
|
5156 | commoninc=common) | |
5156 | repo.ui.popbuffer() |
|
5157 | repo.ui.popbuffer() | |
5157 | return dest, dbranch, dother, outgoing |
|
5158 | return dest, dbranch, dother, outgoing | |
5158 |
|
5159 | |||
5159 | if needsoutgoing: |
|
5160 | if needsoutgoing: | |
5160 | dest, dbranch, dother, outgoing = getoutgoing() |
|
5161 | dest, dbranch, dother, outgoing = getoutgoing() | |
5161 | else: |
|
5162 | else: | |
5162 | dest = dbranch = dother = outgoing = None |
|
5163 | dest = dbranch = dother = outgoing = None | |
5163 |
|
5164 | |||
5164 | if opts.get('remote'): |
|
5165 | if opts.get('remote'): | |
5165 | t = [] |
|
5166 | t = [] | |
5166 | if incoming: |
|
5167 | if incoming: | |
5167 | t.append(_('1 or more incoming')) |
|
5168 | t.append(_('1 or more incoming')) | |
5168 | o = outgoing.missing |
|
5169 | o = outgoing.missing | |
5169 | if o: |
|
5170 | if o: | |
5170 | t.append(_('%d outgoing') % len(o)) |
|
5171 | t.append(_('%d outgoing') % len(o)) | |
5171 | other = dother or sother |
|
5172 | other = dother or sother | |
5172 | if 'bookmarks' in other.listkeys('namespaces'): |
|
5173 | if 'bookmarks' in other.listkeys('namespaces'): | |
5173 | counts = bookmarks.summary(repo, other) |
|
5174 | counts = bookmarks.summary(repo, other) | |
5174 | if counts[0] > 0: |
|
5175 | if counts[0] > 0: | |
5175 | t.append(_('%d incoming bookmarks') % counts[0]) |
|
5176 | t.append(_('%d incoming bookmarks') % counts[0]) | |
5176 | if counts[1] > 0: |
|
5177 | if counts[1] > 0: | |
5177 | t.append(_('%d outgoing bookmarks') % counts[1]) |
|
5178 | t.append(_('%d outgoing bookmarks') % counts[1]) | |
5178 |
|
5179 | |||
5179 | if t: |
|
5180 | if t: | |
5180 | # i18n: column positioning for "hg summary" |
|
5181 | # i18n: column positioning for "hg summary" | |
5181 | ui.write(_('remote: %s\n') % (', '.join(t))) |
|
5182 | ui.write(_('remote: %s\n') % (', '.join(t))) | |
5182 | else: |
|
5183 | else: | |
5183 | # i18n: column positioning for "hg summary" |
|
5184 | # i18n: column positioning for "hg summary" | |
5184 | ui.status(_('remote: (synced)\n')) |
|
5185 | ui.status(_('remote: (synced)\n')) | |
5185 |
|
5186 | |||
5186 | cmdutil.summaryremotehooks(ui, repo, opts, |
|
5187 | cmdutil.summaryremotehooks(ui, repo, opts, | |
5187 | ((source, sbranch, sother, commoninc), |
|
5188 | ((source, sbranch, sother, commoninc), | |
5188 | (dest, dbranch, dother, outgoing))) |
|
5189 | (dest, dbranch, dother, outgoing))) | |
5189 |
|
5190 | |||
5190 | @command('tag', |
|
5191 | @command('tag', | |
5191 | [('f', 'force', None, _('force tag')), |
|
5192 | [('f', 'force', None, _('force tag')), | |
5192 | ('l', 'local', None, _('make the tag local')), |
|
5193 | ('l', 'local', None, _('make the tag local')), | |
5193 | ('r', 'rev', '', _('revision to tag'), _('REV')), |
|
5194 | ('r', 'rev', '', _('revision to tag'), _('REV')), | |
5194 | ('', 'remove', None, _('remove a tag')), |
|
5195 | ('', 'remove', None, _('remove a tag')), | |
5195 | # -l/--local is already there, commitopts cannot be used |
|
5196 | # -l/--local is already there, commitopts cannot be used | |
5196 | ('e', 'edit', None, _('invoke editor on commit messages')), |
|
5197 | ('e', 'edit', None, _('invoke editor on commit messages')), | |
5197 | ('m', 'message', '', _('use text as commit message'), _('TEXT')), |
|
5198 | ('m', 'message', '', _('use text as commit message'), _('TEXT')), | |
5198 | ] + commitopts2, |
|
5199 | ] + commitopts2, | |
5199 | _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')) |
|
5200 | _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')) | |
5200 | def tag(ui, repo, name1, *names, **opts): |
|
5201 | def tag(ui, repo, name1, *names, **opts): | |
5201 | """add one or more tags for the current or given revision |
|
5202 | """add one or more tags for the current or given revision | |
5202 |
|
5203 | |||
5203 | Name a particular revision using <name>. |
|
5204 | Name a particular revision using <name>. | |
5204 |
|
5205 | |||
5205 | Tags are used to name particular revisions of the repository and are |
|
5206 | Tags are used to name particular revisions of the repository and are | |
5206 | very useful to compare different revisions, to go back to significant |
|
5207 | very useful to compare different revisions, to go back to significant | |
5207 | earlier versions or to mark branch points as releases, etc. Changing |
|
5208 | earlier versions or to mark branch points as releases, etc. Changing | |
5208 | an existing tag is normally disallowed; use -f/--force to override. |
|
5209 | an existing tag is normally disallowed; use -f/--force to override. | |
5209 |
|
5210 | |||
5210 | If no revision is given, the parent of the working directory is |
|
5211 | If no revision is given, the parent of the working directory is | |
5211 | used. |
|
5212 | used. | |
5212 |
|
5213 | |||
5213 | To facilitate version control, distribution, and merging of tags, |
|
5214 | To facilitate version control, distribution, and merging of tags, | |
5214 | they are stored as a file named ".hgtags" which is managed similarly |
|
5215 | they are stored as a file named ".hgtags" which is managed similarly | |
5215 | to other project files and can be hand-edited if necessary. This |
|
5216 | to other project files and can be hand-edited if necessary. This | |
5216 | also means that tagging creates a new commit. The file |
|
5217 | also means that tagging creates a new commit. The file | |
5217 | ".hg/localtags" is used for local tags (not shared among |
|
5218 | ".hg/localtags" is used for local tags (not shared among | |
5218 | repositories). |
|
5219 | repositories). | |
5219 |
|
5220 | |||
5220 | Tag commits are usually made at the head of a branch. If the parent |
|
5221 | Tag commits are usually made at the head of a branch. If the parent | |
5221 | of the working directory is not a branch head, :hg:`tag` aborts; use |
|
5222 | of the working directory is not a branch head, :hg:`tag` aborts; use | |
5222 | -f/--force to force the tag commit to be based on a non-head |
|
5223 | -f/--force to force the tag commit to be based on a non-head | |
5223 | changeset. |
|
5224 | changeset. | |
5224 |
|
5225 | |||
5225 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
5226 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
5226 |
|
5227 | |||
5227 | Since tag names have priority over branch names during revision |
|
5228 | Since tag names have priority over branch names during revision | |
5228 | lookup, using an existing branch name as a tag name is discouraged. |
|
5229 | lookup, using an existing branch name as a tag name is discouraged. | |
5229 |
|
5230 | |||
5230 | Returns 0 on success. |
|
5231 | Returns 0 on success. | |
5231 | """ |
|
5232 | """ | |
5232 | opts = pycompat.byteskwargs(opts) |
|
5233 | opts = pycompat.byteskwargs(opts) | |
5233 | wlock = lock = None |
|
5234 | wlock = lock = None | |
5234 | try: |
|
5235 | try: | |
5235 | wlock = repo.wlock() |
|
5236 | wlock = repo.wlock() | |
5236 | lock = repo.lock() |
|
5237 | lock = repo.lock() | |
5237 | rev_ = "." |
|
5238 | rev_ = "." | |
5238 | names = [t.strip() for t in (name1,) + names] |
|
5239 | names = [t.strip() for t in (name1,) + names] | |
5239 | if len(names) != len(set(names)): |
|
5240 | if len(names) != len(set(names)): | |
5240 | raise error.Abort(_('tag names must be unique')) |
|
5241 | raise error.Abort(_('tag names must be unique')) | |
5241 | for n in names: |
|
5242 | for n in names: | |
5242 | scmutil.checknewlabel(repo, n, 'tag') |
|
5243 | scmutil.checknewlabel(repo, n, 'tag') | |
5243 | if not n: |
|
5244 | if not n: | |
5244 | raise error.Abort(_('tag names cannot consist entirely of ' |
|
5245 | raise error.Abort(_('tag names cannot consist entirely of ' | |
5245 | 'whitespace')) |
|
5246 | 'whitespace')) | |
5246 | if opts.get('rev') and opts.get('remove'): |
|
5247 | if opts.get('rev') and opts.get('remove'): | |
5247 | raise error.Abort(_("--rev and --remove are incompatible")) |
|
5248 | raise error.Abort(_("--rev and --remove are incompatible")) | |
5248 | if opts.get('rev'): |
|
5249 | if opts.get('rev'): | |
5249 | rev_ = opts['rev'] |
|
5250 | rev_ = opts['rev'] | |
5250 | message = opts.get('message') |
|
5251 | message = opts.get('message') | |
5251 | if opts.get('remove'): |
|
5252 | if opts.get('remove'): | |
5252 | if opts.get('local'): |
|
5253 | if opts.get('local'): | |
5253 | expectedtype = 'local' |
|
5254 | expectedtype = 'local' | |
5254 | else: |
|
5255 | else: | |
5255 | expectedtype = 'global' |
|
5256 | expectedtype = 'global' | |
5256 |
|
5257 | |||
5257 | for n in names: |
|
5258 | for n in names: | |
5258 | if not repo.tagtype(n): |
|
5259 | if not repo.tagtype(n): | |
5259 | raise error.Abort(_("tag '%s' does not exist") % n) |
|
5260 | raise error.Abort(_("tag '%s' does not exist") % n) | |
5260 | if repo.tagtype(n) != expectedtype: |
|
5261 | if repo.tagtype(n) != expectedtype: | |
5261 | if expectedtype == 'global': |
|
5262 | if expectedtype == 'global': | |
5262 | raise error.Abort(_("tag '%s' is not a global tag") % n) |
|
5263 | raise error.Abort(_("tag '%s' is not a global tag") % n) | |
5263 | else: |
|
5264 | else: | |
5264 | raise error.Abort(_("tag '%s' is not a local tag") % n) |
|
5265 | raise error.Abort(_("tag '%s' is not a local tag") % n) | |
5265 | rev_ = 'null' |
|
5266 | rev_ = 'null' | |
5266 | if not message: |
|
5267 | if not message: | |
5267 | # we don't translate commit messages |
|
5268 | # we don't translate commit messages | |
5268 | message = 'Removed tag %s' % ', '.join(names) |
|
5269 | message = 'Removed tag %s' % ', '.join(names) | |
5269 | elif not opts.get('force'): |
|
5270 | elif not opts.get('force'): | |
5270 | for n in names: |
|
5271 | for n in names: | |
5271 | if n in repo.tags(): |
|
5272 | if n in repo.tags(): | |
5272 | raise error.Abort(_("tag '%s' already exists " |
|
5273 | raise error.Abort(_("tag '%s' already exists " | |
5273 | "(use -f to force)") % n) |
|
5274 | "(use -f to force)") % n) | |
5274 | if not opts.get('local'): |
|
5275 | if not opts.get('local'): | |
5275 | p1, p2 = repo.dirstate.parents() |
|
5276 | p1, p2 = repo.dirstate.parents() | |
5276 | if p2 != nullid: |
|
5277 | if p2 != nullid: | |
5277 | raise error.Abort(_('uncommitted merge')) |
|
5278 | raise error.Abort(_('uncommitted merge')) | |
5278 | bheads = repo.branchheads() |
|
5279 | bheads = repo.branchheads() | |
5279 | if not opts.get('force') and bheads and p1 not in bheads: |
|
5280 | if not opts.get('force') and bheads and p1 not in bheads: | |
5280 | raise error.Abort(_('working directory is not at a branch head ' |
|
5281 | raise error.Abort(_('working directory is not at a branch head ' | |
5281 | '(use -f to force)')) |
|
5282 | '(use -f to force)')) | |
5282 | r = scmutil.revsingle(repo, rev_).node() |
|
5283 | r = scmutil.revsingle(repo, rev_).node() | |
5283 |
|
5284 | |||
5284 | if not message: |
|
5285 | if not message: | |
5285 | # we don't translate commit messages |
|
5286 | # we don't translate commit messages | |
5286 | message = ('Added tag %s for changeset %s' % |
|
5287 | message = ('Added tag %s for changeset %s' % | |
5287 | (', '.join(names), short(r))) |
|
5288 | (', '.join(names), short(r))) | |
5288 |
|
5289 | |||
5289 | date = opts.get('date') |
|
5290 | date = opts.get('date') | |
5290 | if date: |
|
5291 | if date: | |
5291 | date = util.parsedate(date) |
|
5292 | date = util.parsedate(date) | |
5292 |
|
5293 | |||
5293 | if opts.get('remove'): |
|
5294 | if opts.get('remove'): | |
5294 | editform = 'tag.remove' |
|
5295 | editform = 'tag.remove' | |
5295 | else: |
|
5296 | else: | |
5296 | editform = 'tag.add' |
|
5297 | editform = 'tag.add' | |
5297 | editor = cmdutil.getcommiteditor(editform=editform, |
|
5298 | editor = cmdutil.getcommiteditor(editform=editform, | |
5298 | **pycompat.strkwargs(opts)) |
|
5299 | **pycompat.strkwargs(opts)) | |
5299 |
|
5300 | |||
5300 | # don't allow tagging the null rev |
|
5301 | # don't allow tagging the null rev | |
5301 | if (not opts.get('remove') and |
|
5302 | if (not opts.get('remove') and | |
5302 | scmutil.revsingle(repo, rev_).rev() == nullrev): |
|
5303 | scmutil.revsingle(repo, rev_).rev() == nullrev): | |
5303 | raise error.Abort(_("cannot tag null revision")) |
|
5304 | raise error.Abort(_("cannot tag null revision")) | |
5304 |
|
5305 | |||
5305 | tagsmod.tag(repo, names, r, message, opts.get('local'), |
|
5306 | tagsmod.tag(repo, names, r, message, opts.get('local'), | |
5306 | opts.get('user'), date, editor=editor) |
|
5307 | opts.get('user'), date, editor=editor) | |
5307 | finally: |
|
5308 | finally: | |
5308 | release(lock, wlock) |
|
5309 | release(lock, wlock) | |
5309 |
|
5310 | |||
5310 | @command('tags', formatteropts, '') |
|
5311 | @command('tags', formatteropts, '') | |
5311 | def tags(ui, repo, **opts): |
|
5312 | def tags(ui, repo, **opts): | |
5312 | """list repository tags |
|
5313 | """list repository tags | |
5313 |
|
5314 | |||
5314 | This lists both regular and local tags. When the -v/--verbose |
|
5315 | This lists both regular and local tags. When the -v/--verbose | |
5315 | switch is used, a third column "local" is printed for local tags. |
|
5316 | switch is used, a third column "local" is printed for local tags. | |
5316 | When the -q/--quiet switch is used, only the tag name is printed. |
|
5317 | When the -q/--quiet switch is used, only the tag name is printed. | |
5317 |
|
5318 | |||
5318 | Returns 0 on success. |
|
5319 | Returns 0 on success. | |
5319 | """ |
|
5320 | """ | |
5320 |
|
5321 | |||
5321 | opts = pycompat.byteskwargs(opts) |
|
5322 | opts = pycompat.byteskwargs(opts) | |
5322 | ui.pager('tags') |
|
5323 | ui.pager('tags') | |
5323 | fm = ui.formatter('tags', opts) |
|
5324 | fm = ui.formatter('tags', opts) | |
5324 | hexfunc = fm.hexfunc |
|
5325 | hexfunc = fm.hexfunc | |
5325 | tagtype = "" |
|
5326 | tagtype = "" | |
5326 |
|
5327 | |||
5327 | for t, n in reversed(repo.tagslist()): |
|
5328 | for t, n in reversed(repo.tagslist()): | |
5328 | hn = hexfunc(n) |
|
5329 | hn = hexfunc(n) | |
5329 | label = 'tags.normal' |
|
5330 | label = 'tags.normal' | |
5330 | tagtype = '' |
|
5331 | tagtype = '' | |
5331 | if repo.tagtype(t) == 'local': |
|
5332 | if repo.tagtype(t) == 'local': | |
5332 | label = 'tags.local' |
|
5333 | label = 'tags.local' | |
5333 | tagtype = 'local' |
|
5334 | tagtype = 'local' | |
5334 |
|
5335 | |||
5335 | fm.startitem() |
|
5336 | fm.startitem() | |
5336 | fm.write('tag', '%s', t, label=label) |
|
5337 | fm.write('tag', '%s', t, label=label) | |
5337 | fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s' |
|
5338 | fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s' | |
5338 | fm.condwrite(not ui.quiet, 'rev node', fmt, |
|
5339 | fm.condwrite(not ui.quiet, 'rev node', fmt, | |
5339 | repo.changelog.rev(n), hn, label=label) |
|
5340 | repo.changelog.rev(n), hn, label=label) | |
5340 | fm.condwrite(ui.verbose and tagtype, 'type', ' %s', |
|
5341 | fm.condwrite(ui.verbose and tagtype, 'type', ' %s', | |
5341 | tagtype, label=label) |
|
5342 | tagtype, label=label) | |
5342 | fm.plain('\n') |
|
5343 | fm.plain('\n') | |
5343 | fm.end() |
|
5344 | fm.end() | |
5344 |
|
5345 | |||
5345 | @command('tip', |
|
5346 | @command('tip', | |
5346 | [('p', 'patch', None, _('show patch')), |
|
5347 | [('p', 'patch', None, _('show patch')), | |
5347 | ('g', 'git', None, _('use git extended diff format')), |
|
5348 | ('g', 'git', None, _('use git extended diff format')), | |
5348 | ] + templateopts, |
|
5349 | ] + templateopts, | |
5349 | _('[-p] [-g]')) |
|
5350 | _('[-p] [-g]')) | |
5350 | def tip(ui, repo, **opts): |
|
5351 | def tip(ui, repo, **opts): | |
5351 | """show the tip revision (DEPRECATED) |
|
5352 | """show the tip revision (DEPRECATED) | |
5352 |
|
5353 | |||
5353 | The tip revision (usually just called the tip) is the changeset |
|
5354 | The tip revision (usually just called the tip) is the changeset | |
5354 | most recently added to the repository (and therefore the most |
|
5355 | most recently added to the repository (and therefore the most | |
5355 | recently changed head). |
|
5356 | recently changed head). | |
5356 |
|
5357 | |||
5357 | If you have just made a commit, that commit will be the tip. If |
|
5358 | If you have just made a commit, that commit will be the tip. If | |
5358 | you have just pulled changes from another repository, the tip of |
|
5359 | you have just pulled changes from another repository, the tip of | |
5359 | that repository becomes the current tip. The "tip" tag is special |
|
5360 | that repository becomes the current tip. The "tip" tag is special | |
5360 | and cannot be renamed or assigned to a different changeset. |
|
5361 | and cannot be renamed or assigned to a different changeset. | |
5361 |
|
5362 | |||
5362 | This command is deprecated, please use :hg:`heads` instead. |
|
5363 | This command is deprecated, please use :hg:`heads` instead. | |
5363 |
|
5364 | |||
5364 | Returns 0 on success. |
|
5365 | Returns 0 on success. | |
5365 | """ |
|
5366 | """ | |
5366 | opts = pycompat.byteskwargs(opts) |
|
5367 | opts = pycompat.byteskwargs(opts) | |
5367 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
5368 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
5368 | displayer.show(repo['tip']) |
|
5369 | displayer.show(repo['tip']) | |
5369 | displayer.close() |
|
5370 | displayer.close() | |
5370 |
|
5371 | |||
5371 | @command('unbundle', |
|
5372 | @command('unbundle', | |
5372 | [('u', 'update', None, |
|
5373 | [('u', 'update', None, | |
5373 | _('update to new branch head if changesets were unbundled'))], |
|
5374 | _('update to new branch head if changesets were unbundled'))], | |
5374 | _('[-u] FILE...')) |
|
5375 | _('[-u] FILE...')) | |
5375 | def unbundle(ui, repo, fname1, *fnames, **opts): |
|
5376 | def unbundle(ui, repo, fname1, *fnames, **opts): | |
5376 | """apply one or more bundle files |
|
5377 | """apply one or more bundle files | |
5377 |
|
5378 | |||
5378 | Apply one or more bundle files generated by :hg:`bundle`. |
|
5379 | Apply one or more bundle files generated by :hg:`bundle`. | |
5379 |
|
5380 | |||
5380 | Returns 0 on success, 1 if an update has unresolved files. |
|
5381 | Returns 0 on success, 1 if an update has unresolved files. | |
5381 | """ |
|
5382 | """ | |
5382 | fnames = (fname1,) + fnames |
|
5383 | fnames = (fname1,) + fnames | |
5383 |
|
5384 | |||
5384 | with repo.lock(): |
|
5385 | with repo.lock(): | |
5385 | for fname in fnames: |
|
5386 | for fname in fnames: | |
5386 | f = hg.openpath(ui, fname) |
|
5387 | f = hg.openpath(ui, fname) | |
5387 | gen = exchange.readbundle(ui, f, fname) |
|
5388 | gen = exchange.readbundle(ui, f, fname) | |
5388 | if isinstance(gen, streamclone.streamcloneapplier): |
|
5389 | if isinstance(gen, streamclone.streamcloneapplier): | |
5389 | raise error.Abort( |
|
5390 | raise error.Abort( | |
5390 | _('packed bundles cannot be applied with ' |
|
5391 | _('packed bundles cannot be applied with ' | |
5391 | '"hg unbundle"'), |
|
5392 | '"hg unbundle"'), | |
5392 | hint=_('use "hg debugapplystreamclonebundle"')) |
|
5393 | hint=_('use "hg debugapplystreamclonebundle"')) | |
5393 | url = 'bundle:' + fname |
|
5394 | url = 'bundle:' + fname | |
5394 | try: |
|
5395 | try: | |
5395 | txnname = 'unbundle' |
|
5396 | txnname = 'unbundle' | |
5396 | if not isinstance(gen, bundle2.unbundle20): |
|
5397 | if not isinstance(gen, bundle2.unbundle20): | |
5397 | txnname = 'unbundle\n%s' % util.hidepassword(url) |
|
5398 | txnname = 'unbundle\n%s' % util.hidepassword(url) | |
5398 | with repo.transaction(txnname) as tr: |
|
5399 | with repo.transaction(txnname) as tr: | |
5399 | op = bundle2.applybundle(repo, gen, tr, source='unbundle', |
|
5400 | op = bundle2.applybundle(repo, gen, tr, source='unbundle', | |
5400 | url=url) |
|
5401 | url=url) | |
5401 | except error.BundleUnknownFeatureError as exc: |
|
5402 | except error.BundleUnknownFeatureError as exc: | |
5402 | raise error.Abort( |
|
5403 | raise error.Abort( | |
5403 | _('%s: unknown bundle feature, %s') % (fname, exc), |
|
5404 | _('%s: unknown bundle feature, %s') % (fname, exc), | |
5404 | hint=_("see https://mercurial-scm.org/" |
|
5405 | hint=_("see https://mercurial-scm.org/" | |
5405 | "wiki/BundleFeature for more " |
|
5406 | "wiki/BundleFeature for more " | |
5406 | "information")) |
|
5407 | "information")) | |
5407 | modheads = bundle2.combinechangegroupresults(op) |
|
5408 | modheads = bundle2.combinechangegroupresults(op) | |
5408 |
|
5409 | |||
5409 | return postincoming(ui, repo, modheads, opts.get(r'update'), None, None) |
|
5410 | return postincoming(ui, repo, modheads, opts.get(r'update'), None, None) | |
5410 |
|
5411 | |||
5411 | @command('^update|up|checkout|co', |
|
5412 | @command('^update|up|checkout|co', | |
5412 | [('C', 'clean', None, _('discard uncommitted changes (no backup)')), |
|
5413 | [('C', 'clean', None, _('discard uncommitted changes (no backup)')), | |
5413 | ('c', 'check', None, _('require clean working directory')), |
|
5414 | ('c', 'check', None, _('require clean working directory')), | |
5414 | ('m', 'merge', None, _('merge uncommitted changes')), |
|
5415 | ('m', 'merge', None, _('merge uncommitted changes')), | |
5415 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), |
|
5416 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), | |
5416 | ('r', 'rev', '', _('revision'), _('REV')) |
|
5417 | ('r', 'rev', '', _('revision'), _('REV')) | |
5417 | ] + mergetoolopts, |
|
5418 | ] + mergetoolopts, | |
5418 | _('[-C|-c|-m] [-d DATE] [[-r] REV]')) |
|
5419 | _('[-C|-c|-m] [-d DATE] [[-r] REV]')) | |
5419 | def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False, |
|
5420 | def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False, | |
5420 | merge=None, tool=None): |
|
5421 | merge=None, tool=None): | |
5421 | """update working directory (or switch revisions) |
|
5422 | """update working directory (or switch revisions) | |
5422 |
|
5423 | |||
5423 | Update the repository's working directory to the specified |
|
5424 | Update the repository's working directory to the specified | |
5424 | changeset. If no changeset is specified, update to the tip of the |
|
5425 | changeset. If no changeset is specified, update to the tip of the | |
5425 | current named branch and move the active bookmark (see :hg:`help |
|
5426 | current named branch and move the active bookmark (see :hg:`help | |
5426 | bookmarks`). |
|
5427 | bookmarks`). | |
5427 |
|
5428 | |||
5428 | Update sets the working directory's parent revision to the specified |
|
5429 | Update sets the working directory's parent revision to the specified | |
5429 | changeset (see :hg:`help parents`). |
|
5430 | changeset (see :hg:`help parents`). | |
5430 |
|
5431 | |||
5431 | If the changeset is not a descendant or ancestor of the working |
|
5432 | If the changeset is not a descendant or ancestor of the working | |
5432 | directory's parent and there are uncommitted changes, the update is |
|
5433 | directory's parent and there are uncommitted changes, the update is | |
5433 | aborted. With the -c/--check option, the working directory is checked |
|
5434 | aborted. With the -c/--check option, the working directory is checked | |
5434 | for uncommitted changes; if none are found, the working directory is |
|
5435 | for uncommitted changes; if none are found, the working directory is | |
5435 | updated to the specified changeset. |
|
5436 | updated to the specified changeset. | |
5436 |
|
5437 | |||
5437 | .. container:: verbose |
|
5438 | .. container:: verbose | |
5438 |
|
5439 | |||
5439 | The -C/--clean, -c/--check, and -m/--merge options control what |
|
5440 | The -C/--clean, -c/--check, and -m/--merge options control what | |
5440 | happens if the working directory contains uncommitted changes. |
|
5441 | happens if the working directory contains uncommitted changes. | |
5441 | At most of one of them can be specified. |
|
5442 | At most of one of them can be specified. | |
5442 |
|
5443 | |||
5443 | 1. If no option is specified, and if |
|
5444 | 1. If no option is specified, and if | |
5444 | the requested changeset is an ancestor or descendant of |
|
5445 | the requested changeset is an ancestor or descendant of | |
5445 | the working directory's parent, the uncommitted changes |
|
5446 | the working directory's parent, the uncommitted changes | |
5446 | are merged into the requested changeset and the merged |
|
5447 | are merged into the requested changeset and the merged | |
5447 | result is left uncommitted. If the requested changeset is |
|
5448 | result is left uncommitted. If the requested changeset is | |
5448 | not an ancestor or descendant (that is, it is on another |
|
5449 | not an ancestor or descendant (that is, it is on another | |
5449 | branch), the update is aborted and the uncommitted changes |
|
5450 | branch), the update is aborted and the uncommitted changes | |
5450 | are preserved. |
|
5451 | are preserved. | |
5451 |
|
5452 | |||
5452 | 2. With the -m/--merge option, the update is allowed even if the |
|
5453 | 2. With the -m/--merge option, the update is allowed even if the | |
5453 | requested changeset is not an ancestor or descendant of |
|
5454 | requested changeset is not an ancestor or descendant of | |
5454 | the working directory's parent. |
|
5455 | the working directory's parent. | |
5455 |
|
5456 | |||
5456 | 3. With the -c/--check option, the update is aborted and the |
|
5457 | 3. With the -c/--check option, the update is aborted and the | |
5457 | uncommitted changes are preserved. |
|
5458 | uncommitted changes are preserved. | |
5458 |
|
5459 | |||
5459 | 4. With the -C/--clean option, uncommitted changes are discarded and |
|
5460 | 4. With the -C/--clean option, uncommitted changes are discarded and | |
5460 | the working directory is updated to the requested changeset. |
|
5461 | the working directory is updated to the requested changeset. | |
5461 |
|
5462 | |||
5462 | To cancel an uncommitted merge (and lose your changes), use |
|
5463 | To cancel an uncommitted merge (and lose your changes), use | |
5463 | :hg:`update --clean .`. |
|
5464 | :hg:`update --clean .`. | |
5464 |
|
5465 | |||
5465 | Use null as the changeset to remove the working directory (like |
|
5466 | Use null as the changeset to remove the working directory (like | |
5466 | :hg:`clone -U`). |
|
5467 | :hg:`clone -U`). | |
5467 |
|
5468 | |||
5468 | If you want to revert just one file to an older revision, use |
|
5469 | If you want to revert just one file to an older revision, use | |
5469 | :hg:`revert [-r REV] NAME`. |
|
5470 | :hg:`revert [-r REV] NAME`. | |
5470 |
|
5471 | |||
5471 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
5472 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
5472 |
|
5473 | |||
5473 | Returns 0 on success, 1 if there are unresolved files. |
|
5474 | Returns 0 on success, 1 if there are unresolved files. | |
5474 | """ |
|
5475 | """ | |
5475 | if rev and node: |
|
5476 | if rev and node: | |
5476 | raise error.Abort(_("please specify just one revision")) |
|
5477 | raise error.Abort(_("please specify just one revision")) | |
5477 |
|
5478 | |||
5478 | if ui.configbool('commands', 'update.requiredest'): |
|
5479 | if ui.configbool('commands', 'update.requiredest'): | |
5479 | if not node and not rev and not date: |
|
5480 | if not node and not rev and not date: | |
5480 | raise error.Abort(_('you must specify a destination'), |
|
5481 | raise error.Abort(_('you must specify a destination'), | |
5481 | hint=_('for example: hg update ".::"')) |
|
5482 | hint=_('for example: hg update ".::"')) | |
5482 |
|
5483 | |||
5483 | if rev is None or rev == '': |
|
5484 | if rev is None or rev == '': | |
5484 | rev = node |
|
5485 | rev = node | |
5485 |
|
5486 | |||
5486 | if date and rev is not None: |
|
5487 | if date and rev is not None: | |
5487 | raise error.Abort(_("you can't specify a revision and a date")) |
|
5488 | raise error.Abort(_("you can't specify a revision and a date")) | |
5488 |
|
5489 | |||
5489 | if len([x for x in (clean, check, merge) if x]) > 1: |
|
5490 | if len([x for x in (clean, check, merge) if x]) > 1: | |
5490 | raise error.Abort(_("can only specify one of -C/--clean, -c/--check, " |
|
5491 | raise error.Abort(_("can only specify one of -C/--clean, -c/--check, " | |
5491 | "or -m/--merge")) |
|
5492 | "or -m/--merge")) | |
5492 |
|
5493 | |||
5493 | updatecheck = None |
|
5494 | updatecheck = None | |
5494 | if check: |
|
5495 | if check: | |
5495 | updatecheck = 'abort' |
|
5496 | updatecheck = 'abort' | |
5496 | elif merge: |
|
5497 | elif merge: | |
5497 | updatecheck = 'none' |
|
5498 | updatecheck = 'none' | |
5498 |
|
5499 | |||
5499 | with repo.wlock(): |
|
5500 | with repo.wlock(): | |
5500 | cmdutil.clearunfinished(repo) |
|
5501 | cmdutil.clearunfinished(repo) | |
5501 |
|
5502 | |||
5502 | if date: |
|
5503 | if date: | |
5503 | rev = cmdutil.finddate(ui, repo, date) |
|
5504 | rev = cmdutil.finddate(ui, repo, date) | |
5504 |
|
5505 | |||
5505 | # if we defined a bookmark, we have to remember the original name |
|
5506 | # if we defined a bookmark, we have to remember the original name | |
5506 | brev = rev |
|
5507 | brev = rev | |
5507 | rev = scmutil.revsingle(repo, rev, rev).rev() |
|
5508 | rev = scmutil.revsingle(repo, rev, rev).rev() | |
5508 |
|
5509 | |||
5509 | repo.ui.setconfig('ui', 'forcemerge', tool, 'update') |
|
5510 | repo.ui.setconfig('ui', 'forcemerge', tool, 'update') | |
5510 |
|
5511 | |||
5511 | return hg.updatetotally(ui, repo, rev, brev, clean=clean, |
|
5512 | return hg.updatetotally(ui, repo, rev, brev, clean=clean, | |
5512 | updatecheck=updatecheck) |
|
5513 | updatecheck=updatecheck) | |
5513 |
|
5514 | |||
5514 | @command('verify', []) |
|
5515 | @command('verify', []) | |
5515 | def verify(ui, repo): |
|
5516 | def verify(ui, repo): | |
5516 | """verify the integrity of the repository |
|
5517 | """verify the integrity of the repository | |
5517 |
|
5518 | |||
5518 | Verify the integrity of the current repository. |
|
5519 | Verify the integrity of the current repository. | |
5519 |
|
5520 | |||
5520 | This will perform an extensive check of the repository's |
|
5521 | This will perform an extensive check of the repository's | |
5521 | integrity, validating the hashes and checksums of each entry in |
|
5522 | integrity, validating the hashes and checksums of each entry in | |
5522 | the changelog, manifest, and tracked files, as well as the |
|
5523 | the changelog, manifest, and tracked files, as well as the | |
5523 | integrity of their crosslinks and indices. |
|
5524 | integrity of their crosslinks and indices. | |
5524 |
|
5525 | |||
5525 | Please see https://mercurial-scm.org/wiki/RepositoryCorruption |
|
5526 | Please see https://mercurial-scm.org/wiki/RepositoryCorruption | |
5526 | for more information about recovery from corruption of the |
|
5527 | for more information about recovery from corruption of the | |
5527 | repository. |
|
5528 | repository. | |
5528 |
|
5529 | |||
5529 | Returns 0 on success, 1 if errors are encountered. |
|
5530 | Returns 0 on success, 1 if errors are encountered. | |
5530 | """ |
|
5531 | """ | |
5531 | return hg.verify(repo) |
|
5532 | return hg.verify(repo) | |
5532 |
|
5533 | |||
5533 | @command('version', [] + formatteropts, norepo=True) |
|
5534 | @command('version', [] + formatteropts, norepo=True) | |
5534 | def version_(ui, **opts): |
|
5535 | def version_(ui, **opts): | |
5535 | """output version and copyright information""" |
|
5536 | """output version and copyright information""" | |
5536 | opts = pycompat.byteskwargs(opts) |
|
5537 | opts = pycompat.byteskwargs(opts) | |
5537 | if ui.verbose: |
|
5538 | if ui.verbose: | |
5538 | ui.pager('version') |
|
5539 | ui.pager('version') | |
5539 | fm = ui.formatter("version", opts) |
|
5540 | fm = ui.formatter("version", opts) | |
5540 | fm.startitem() |
|
5541 | fm.startitem() | |
5541 | fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"), |
|
5542 | fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"), | |
5542 | util.version()) |
|
5543 | util.version()) | |
5543 | license = _( |
|
5544 | license = _( | |
5544 | "(see https://mercurial-scm.org for more information)\n" |
|
5545 | "(see https://mercurial-scm.org for more information)\n" | |
5545 | "\nCopyright (C) 2005-2017 Matt Mackall and others\n" |
|
5546 | "\nCopyright (C) 2005-2017 Matt Mackall and others\n" | |
5546 | "This is free software; see the source for copying conditions. " |
|
5547 | "This is free software; see the source for copying conditions. " | |
5547 | "There is NO\nwarranty; " |
|
5548 | "There is NO\nwarranty; " | |
5548 | "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" |
|
5549 | "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" | |
5549 | ) |
|
5550 | ) | |
5550 | if not ui.quiet: |
|
5551 | if not ui.quiet: | |
5551 | fm.plain(license) |
|
5552 | fm.plain(license) | |
5552 |
|
5553 | |||
5553 | if ui.verbose: |
|
5554 | if ui.verbose: | |
5554 | fm.plain(_("\nEnabled extensions:\n\n")) |
|
5555 | fm.plain(_("\nEnabled extensions:\n\n")) | |
5555 | # format names and versions into columns |
|
5556 | # format names and versions into columns | |
5556 | names = [] |
|
5557 | names = [] | |
5557 | vers = [] |
|
5558 | vers = [] | |
5558 | isinternals = [] |
|
5559 | isinternals = [] | |
5559 | for name, module in extensions.extensions(): |
|
5560 | for name, module in extensions.extensions(): | |
5560 | names.append(name) |
|
5561 | names.append(name) | |
5561 | vers.append(extensions.moduleversion(module) or None) |
|
5562 | vers.append(extensions.moduleversion(module) or None) | |
5562 | isinternals.append(extensions.ismoduleinternal(module)) |
|
5563 | isinternals.append(extensions.ismoduleinternal(module)) | |
5563 | fn = fm.nested("extensions") |
|
5564 | fn = fm.nested("extensions") | |
5564 | if names: |
|
5565 | if names: | |
5565 | namefmt = " %%-%ds " % max(len(n) for n in names) |
|
5566 | namefmt = " %%-%ds " % max(len(n) for n in names) | |
5566 | places = [_("external"), _("internal")] |
|
5567 | places = [_("external"), _("internal")] | |
5567 | for n, v, p in zip(names, vers, isinternals): |
|
5568 | for n, v, p in zip(names, vers, isinternals): | |
5568 | fn.startitem() |
|
5569 | fn.startitem() | |
5569 | fn.condwrite(ui.verbose, "name", namefmt, n) |
|
5570 | fn.condwrite(ui.verbose, "name", namefmt, n) | |
5570 | if ui.verbose: |
|
5571 | if ui.verbose: | |
5571 | fn.plain("%s " % places[p]) |
|
5572 | fn.plain("%s " % places[p]) | |
5572 | fn.data(bundled=p) |
|
5573 | fn.data(bundled=p) | |
5573 | fn.condwrite(ui.verbose and v, "ver", "%s", v) |
|
5574 | fn.condwrite(ui.verbose and v, "ver", "%s", v) | |
5574 | if ui.verbose: |
|
5575 | if ui.verbose: | |
5575 | fn.plain("\n") |
|
5576 | fn.plain("\n") | |
5576 | fn.end() |
|
5577 | fn.end() | |
5577 | fm.end() |
|
5578 | fm.end() | |
5578 |
|
5579 | |||
5579 | def loadcmdtable(ui, name, cmdtable): |
|
5580 | def loadcmdtable(ui, name, cmdtable): | |
5580 | """Load command functions from specified cmdtable |
|
5581 | """Load command functions from specified cmdtable | |
5581 | """ |
|
5582 | """ | |
5582 | overrides = [cmd for cmd in cmdtable if cmd in table] |
|
5583 | overrides = [cmd for cmd in cmdtable if cmd in table] | |
5583 | if overrides: |
|
5584 | if overrides: | |
5584 | ui.warn(_("extension '%s' overrides commands: %s\n") |
|
5585 | ui.warn(_("extension '%s' overrides commands: %s\n") | |
5585 | % (name, " ".join(overrides))) |
|
5586 | % (name, " ".join(overrides))) | |
5586 | table.update(cmdtable) |
|
5587 | table.update(cmdtable) |
@@ -1,2126 +1,2126 b'' | |||||
1 | # exchange.py - utility to exchange data between repos. |
|
1 | # exchange.py - utility to exchange data between repos. | |
2 | # |
|
2 | # | |
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 |
|
7 | |||
8 | from __future__ import absolute_import |
|
8 | from __future__ import absolute_import | |
9 |
|
9 | |||
10 | import collections |
|
10 | import collections | |
11 | import errno |
|
11 | import errno | |
12 | import hashlib |
|
12 | import hashlib | |
13 |
|
13 | |||
14 | from .i18n import _ |
|
14 | from .i18n import _ | |
15 | from .node import ( |
|
15 | from .node import ( | |
16 | hex, |
|
16 | hex, | |
17 | nullid, |
|
17 | nullid, | |
18 | ) |
|
18 | ) | |
19 | from . import ( |
|
19 | from . import ( | |
20 | bookmarks as bookmod, |
|
20 | bookmarks as bookmod, | |
21 | bundle2, |
|
21 | bundle2, | |
22 | changegroup, |
|
22 | changegroup, | |
23 | discovery, |
|
23 | discovery, | |
24 | error, |
|
24 | error, | |
25 | lock as lockmod, |
|
25 | lock as lockmod, | |
26 | obsolete, |
|
26 | obsolete, | |
27 | phases, |
|
27 | phases, | |
28 | pushkey, |
|
28 | pushkey, | |
29 | pycompat, |
|
29 | pycompat, | |
30 | scmutil, |
|
30 | scmutil, | |
31 | sslutil, |
|
31 | sslutil, | |
32 | streamclone, |
|
32 | streamclone, | |
33 | url as urlmod, |
|
33 | url as urlmod, | |
34 | util, |
|
34 | util, | |
35 | ) |
|
35 | ) | |
36 |
|
36 | |||
37 | urlerr = util.urlerr |
|
37 | urlerr = util.urlerr | |
38 | urlreq = util.urlreq |
|
38 | urlreq = util.urlreq | |
39 |
|
39 | |||
40 | # Maps bundle version human names to changegroup versions. |
|
40 | # Maps bundle version human names to changegroup versions. | |
41 | _bundlespeccgversions = {'v1': '01', |
|
41 | _bundlespeccgversions = {'v1': '01', | |
42 | 'v2': '02', |
|
42 | 'v2': '02', | |
43 | 'packed1': 's1', |
|
43 | 'packed1': 's1', | |
44 | 'bundle2': '02', #legacy |
|
44 | 'bundle2': '02', #legacy | |
45 | } |
|
45 | } | |
46 |
|
46 | |||
47 | # Compression engines allowed in version 1. THIS SHOULD NEVER CHANGE. |
|
47 | # Compression engines allowed in version 1. THIS SHOULD NEVER CHANGE. | |
48 | _bundlespecv1compengines = {'gzip', 'bzip2', 'none'} |
|
48 | _bundlespecv1compengines = {'gzip', 'bzip2', 'none'} | |
49 |
|
49 | |||
50 | def parsebundlespec(repo, spec, strict=True, externalnames=False): |
|
50 | def parsebundlespec(repo, spec, strict=True, externalnames=False): | |
51 | """Parse a bundle string specification into parts. |
|
51 | """Parse a bundle string specification into parts. | |
52 |
|
52 | |||
53 | Bundle specifications denote a well-defined bundle/exchange format. |
|
53 | Bundle specifications denote a well-defined bundle/exchange format. | |
54 | The content of a given specification should not change over time in |
|
54 | The content of a given specification should not change over time in | |
55 | order to ensure that bundles produced by a newer version of Mercurial are |
|
55 | order to ensure that bundles produced by a newer version of Mercurial are | |
56 | readable from an older version. |
|
56 | readable from an older version. | |
57 |
|
57 | |||
58 | The string currently has the form: |
|
58 | The string currently has the form: | |
59 |
|
59 | |||
60 | <compression>-<type>[;<parameter0>[;<parameter1>]] |
|
60 | <compression>-<type>[;<parameter0>[;<parameter1>]] | |
61 |
|
61 | |||
62 | Where <compression> is one of the supported compression formats |
|
62 | Where <compression> is one of the supported compression formats | |
63 | and <type> is (currently) a version string. A ";" can follow the type and |
|
63 | and <type> is (currently) a version string. A ";" can follow the type and | |
64 | all text afterwards is interpreted as URI encoded, ";" delimited key=value |
|
64 | all text afterwards is interpreted as URI encoded, ";" delimited key=value | |
65 | pairs. |
|
65 | pairs. | |
66 |
|
66 | |||
67 | If ``strict`` is True (the default) <compression> is required. Otherwise, |
|
67 | If ``strict`` is True (the default) <compression> is required. Otherwise, | |
68 | it is optional. |
|
68 | it is optional. | |
69 |
|
69 | |||
70 | If ``externalnames`` is False (the default), the human-centric names will |
|
70 | If ``externalnames`` is False (the default), the human-centric names will | |
71 | be converted to their internal representation. |
|
71 | be converted to their internal representation. | |
72 |
|
72 | |||
73 | Returns a 3-tuple of (compression, version, parameters). Compression will |
|
73 | Returns a 3-tuple of (compression, version, parameters). Compression will | |
74 | be ``None`` if not in strict mode and a compression isn't defined. |
|
74 | be ``None`` if not in strict mode and a compression isn't defined. | |
75 |
|
75 | |||
76 | An ``InvalidBundleSpecification`` is raised when the specification is |
|
76 | An ``InvalidBundleSpecification`` is raised when the specification is | |
77 | not syntactically well formed. |
|
77 | not syntactically well formed. | |
78 |
|
78 | |||
79 | An ``UnsupportedBundleSpecification`` is raised when the compression or |
|
79 | An ``UnsupportedBundleSpecification`` is raised when the compression or | |
80 | bundle type/version is not recognized. |
|
80 | bundle type/version is not recognized. | |
81 |
|
81 | |||
82 | Note: this function will likely eventually return a more complex data |
|
82 | Note: this function will likely eventually return a more complex data | |
83 | structure, including bundle2 part information. |
|
83 | structure, including bundle2 part information. | |
84 | """ |
|
84 | """ | |
85 | def parseparams(s): |
|
85 | def parseparams(s): | |
86 | if ';' not in s: |
|
86 | if ';' not in s: | |
87 | return s, {} |
|
87 | return s, {} | |
88 |
|
88 | |||
89 | params = {} |
|
89 | params = {} | |
90 | version, paramstr = s.split(';', 1) |
|
90 | version, paramstr = s.split(';', 1) | |
91 |
|
91 | |||
92 | for p in paramstr.split(';'): |
|
92 | for p in paramstr.split(';'): | |
93 | if '=' not in p: |
|
93 | if '=' not in p: | |
94 | raise error.InvalidBundleSpecification( |
|
94 | raise error.InvalidBundleSpecification( | |
95 | _('invalid bundle specification: ' |
|
95 | _('invalid bundle specification: ' | |
96 | 'missing "=" in parameter: %s') % p) |
|
96 | 'missing "=" in parameter: %s') % p) | |
97 |
|
97 | |||
98 | key, value = p.split('=', 1) |
|
98 | key, value = p.split('=', 1) | |
99 | key = urlreq.unquote(key) |
|
99 | key = urlreq.unquote(key) | |
100 | value = urlreq.unquote(value) |
|
100 | value = urlreq.unquote(value) | |
101 | params[key] = value |
|
101 | params[key] = value | |
102 |
|
102 | |||
103 | return version, params |
|
103 | return version, params | |
104 |
|
104 | |||
105 |
|
105 | |||
106 | if strict and '-' not in spec: |
|
106 | if strict and '-' not in spec: | |
107 | raise error.InvalidBundleSpecification( |
|
107 | raise error.InvalidBundleSpecification( | |
108 | _('invalid bundle specification; ' |
|
108 | _('invalid bundle specification; ' | |
109 | 'must be prefixed with compression: %s') % spec) |
|
109 | 'must be prefixed with compression: %s') % spec) | |
110 |
|
110 | |||
111 | if '-' in spec: |
|
111 | if '-' in spec: | |
112 | compression, version = spec.split('-', 1) |
|
112 | compression, version = spec.split('-', 1) | |
113 |
|
113 | |||
114 | if compression not in util.compengines.supportedbundlenames: |
|
114 | if compression not in util.compengines.supportedbundlenames: | |
115 | raise error.UnsupportedBundleSpecification( |
|
115 | raise error.UnsupportedBundleSpecification( | |
116 | _('%s compression is not supported') % compression) |
|
116 | _('%s compression is not supported') % compression) | |
117 |
|
117 | |||
118 | version, params = parseparams(version) |
|
118 | version, params = parseparams(version) | |
119 |
|
119 | |||
120 | if version not in _bundlespeccgversions: |
|
120 | if version not in _bundlespeccgversions: | |
121 | raise error.UnsupportedBundleSpecification( |
|
121 | raise error.UnsupportedBundleSpecification( | |
122 | _('%s is not a recognized bundle version') % version) |
|
122 | _('%s is not a recognized bundle version') % version) | |
123 | else: |
|
123 | else: | |
124 | # Value could be just the compression or just the version, in which |
|
124 | # Value could be just the compression or just the version, in which | |
125 | # case some defaults are assumed (but only when not in strict mode). |
|
125 | # case some defaults are assumed (but only when not in strict mode). | |
126 | assert not strict |
|
126 | assert not strict | |
127 |
|
127 | |||
128 | spec, params = parseparams(spec) |
|
128 | spec, params = parseparams(spec) | |
129 |
|
129 | |||
130 | if spec in util.compengines.supportedbundlenames: |
|
130 | if spec in util.compengines.supportedbundlenames: | |
131 | compression = spec |
|
131 | compression = spec | |
132 | version = 'v1' |
|
132 | version = 'v1' | |
133 | # Generaldelta repos require v2. |
|
133 | # Generaldelta repos require v2. | |
134 | if 'generaldelta' in repo.requirements: |
|
134 | if 'generaldelta' in repo.requirements: | |
135 | version = 'v2' |
|
135 | version = 'v2' | |
136 | # Modern compression engines require v2. |
|
136 | # Modern compression engines require v2. | |
137 | if compression not in _bundlespecv1compengines: |
|
137 | if compression not in _bundlespecv1compengines: | |
138 | version = 'v2' |
|
138 | version = 'v2' | |
139 | elif spec in _bundlespeccgversions: |
|
139 | elif spec in _bundlespeccgversions: | |
140 | if spec == 'packed1': |
|
140 | if spec == 'packed1': | |
141 | compression = 'none' |
|
141 | compression = 'none' | |
142 | else: |
|
142 | else: | |
143 | compression = 'bzip2' |
|
143 | compression = 'bzip2' | |
144 | version = spec |
|
144 | version = spec | |
145 | else: |
|
145 | else: | |
146 | raise error.UnsupportedBundleSpecification( |
|
146 | raise error.UnsupportedBundleSpecification( | |
147 | _('%s is not a recognized bundle specification') % spec) |
|
147 | _('%s is not a recognized bundle specification') % spec) | |
148 |
|
148 | |||
149 | # Bundle version 1 only supports a known set of compression engines. |
|
149 | # Bundle version 1 only supports a known set of compression engines. | |
150 | if version == 'v1' and compression not in _bundlespecv1compengines: |
|
150 | if version == 'v1' and compression not in _bundlespecv1compengines: | |
151 | raise error.UnsupportedBundleSpecification( |
|
151 | raise error.UnsupportedBundleSpecification( | |
152 | _('compression engine %s is not supported on v1 bundles') % |
|
152 | _('compression engine %s is not supported on v1 bundles') % | |
153 | compression) |
|
153 | compression) | |
154 |
|
154 | |||
155 | # The specification for packed1 can optionally declare the data formats |
|
155 | # The specification for packed1 can optionally declare the data formats | |
156 | # required to apply it. If we see this metadata, compare against what the |
|
156 | # required to apply it. If we see this metadata, compare against what the | |
157 | # repo supports and error if the bundle isn't compatible. |
|
157 | # repo supports and error if the bundle isn't compatible. | |
158 | if version == 'packed1' and 'requirements' in params: |
|
158 | if version == 'packed1' and 'requirements' in params: | |
159 | requirements = set(params['requirements'].split(',')) |
|
159 | requirements = set(params['requirements'].split(',')) | |
160 | missingreqs = requirements - repo.supportedformats |
|
160 | missingreqs = requirements - repo.supportedformats | |
161 | if missingreqs: |
|
161 | if missingreqs: | |
162 | raise error.UnsupportedBundleSpecification( |
|
162 | raise error.UnsupportedBundleSpecification( | |
163 | _('missing support for repository features: %s') % |
|
163 | _('missing support for repository features: %s') % | |
164 | ', '.join(sorted(missingreqs))) |
|
164 | ', '.join(sorted(missingreqs))) | |
165 |
|
165 | |||
166 | if not externalnames: |
|
166 | if not externalnames: | |
167 | engine = util.compengines.forbundlename(compression) |
|
167 | engine = util.compengines.forbundlename(compression) | |
168 | compression = engine.bundletype()[1] |
|
168 | compression = engine.bundletype()[1] | |
169 | version = _bundlespeccgversions[version] |
|
169 | version = _bundlespeccgversions[version] | |
170 | return compression, version, params |
|
170 | return compression, version, params | |
171 |
|
171 | |||
172 | def readbundle(ui, fh, fname, vfs=None): |
|
172 | def readbundle(ui, fh, fname, vfs=None): | |
173 | header = changegroup.readexactly(fh, 4) |
|
173 | header = changegroup.readexactly(fh, 4) | |
174 |
|
174 | |||
175 | alg = None |
|
175 | alg = None | |
176 | if not fname: |
|
176 | if not fname: | |
177 | fname = "stream" |
|
177 | fname = "stream" | |
178 | if not header.startswith('HG') and header.startswith('\0'): |
|
178 | if not header.startswith('HG') and header.startswith('\0'): | |
179 | fh = changegroup.headerlessfixup(fh, header) |
|
179 | fh = changegroup.headerlessfixup(fh, header) | |
180 | header = "HG10" |
|
180 | header = "HG10" | |
181 | alg = 'UN' |
|
181 | alg = 'UN' | |
182 | elif vfs: |
|
182 | elif vfs: | |
183 | fname = vfs.join(fname) |
|
183 | fname = vfs.join(fname) | |
184 |
|
184 | |||
185 | magic, version = header[0:2], header[2:4] |
|
185 | magic, version = header[0:2], header[2:4] | |
186 |
|
186 | |||
187 | if magic != 'HG': |
|
187 | if magic != 'HG': | |
188 | raise error.Abort(_('%s: not a Mercurial bundle') % fname) |
|
188 | raise error.Abort(_('%s: not a Mercurial bundle') % fname) | |
189 | if version == '10': |
|
189 | if version == '10': | |
190 | if alg is None: |
|
190 | if alg is None: | |
191 | alg = changegroup.readexactly(fh, 2) |
|
191 | alg = changegroup.readexactly(fh, 2) | |
192 | return changegroup.cg1unpacker(fh, alg) |
|
192 | return changegroup.cg1unpacker(fh, alg) | |
193 | elif version.startswith('2'): |
|
193 | elif version.startswith('2'): | |
194 | return bundle2.getunbundler(ui, fh, magicstring=magic + version) |
|
194 | return bundle2.getunbundler(ui, fh, magicstring=magic + version) | |
195 | elif version == 'S1': |
|
195 | elif version == 'S1': | |
196 | return streamclone.streamcloneapplier(fh) |
|
196 | return streamclone.streamcloneapplier(fh) | |
197 | else: |
|
197 | else: | |
198 | raise error.Abort(_('%s: unknown bundle version %s') % (fname, version)) |
|
198 | raise error.Abort(_('%s: unknown bundle version %s') % (fname, version)) | |
199 |
|
199 | |||
200 | def getbundlespec(ui, fh): |
|
200 | def getbundlespec(ui, fh): | |
201 | """Infer the bundlespec from a bundle file handle. |
|
201 | """Infer the bundlespec from a bundle file handle. | |
202 |
|
202 | |||
203 | The input file handle is seeked and the original seek position is not |
|
203 | The input file handle is seeked and the original seek position is not | |
204 | restored. |
|
204 | restored. | |
205 | """ |
|
205 | """ | |
206 | def speccompression(alg): |
|
206 | def speccompression(alg): | |
207 | try: |
|
207 | try: | |
208 | return util.compengines.forbundletype(alg).bundletype()[0] |
|
208 | return util.compengines.forbundletype(alg).bundletype()[0] | |
209 | except KeyError: |
|
209 | except KeyError: | |
210 | return None |
|
210 | return None | |
211 |
|
211 | |||
212 | b = readbundle(ui, fh, None) |
|
212 | b = readbundle(ui, fh, None) | |
213 | if isinstance(b, changegroup.cg1unpacker): |
|
213 | if isinstance(b, changegroup.cg1unpacker): | |
214 | alg = b._type |
|
214 | alg = b._type | |
215 | if alg == '_truncatedBZ': |
|
215 | if alg == '_truncatedBZ': | |
216 | alg = 'BZ' |
|
216 | alg = 'BZ' | |
217 | comp = speccompression(alg) |
|
217 | comp = speccompression(alg) | |
218 | if not comp: |
|
218 | if not comp: | |
219 | raise error.Abort(_('unknown compression algorithm: %s') % alg) |
|
219 | raise error.Abort(_('unknown compression algorithm: %s') % alg) | |
220 | return '%s-v1' % comp |
|
220 | return '%s-v1' % comp | |
221 | elif isinstance(b, bundle2.unbundle20): |
|
221 | elif isinstance(b, bundle2.unbundle20): | |
222 | if 'Compression' in b.params: |
|
222 | if 'Compression' in b.params: | |
223 | comp = speccompression(b.params['Compression']) |
|
223 | comp = speccompression(b.params['Compression']) | |
224 | if not comp: |
|
224 | if not comp: | |
225 | raise error.Abort(_('unknown compression algorithm: %s') % comp) |
|
225 | raise error.Abort(_('unknown compression algorithm: %s') % comp) | |
226 | else: |
|
226 | else: | |
227 | comp = 'none' |
|
227 | comp = 'none' | |
228 |
|
228 | |||
229 | version = None |
|
229 | version = None | |
230 | for part in b.iterparts(): |
|
230 | for part in b.iterparts(): | |
231 | if part.type == 'changegroup': |
|
231 | if part.type == 'changegroup': | |
232 | version = part.params['version'] |
|
232 | version = part.params['version'] | |
233 | if version in ('01', '02'): |
|
233 | if version in ('01', '02'): | |
234 | version = 'v2' |
|
234 | version = 'v2' | |
235 | else: |
|
235 | else: | |
236 | raise error.Abort(_('changegroup version %s does not have ' |
|
236 | raise error.Abort(_('changegroup version %s does not have ' | |
237 | 'a known bundlespec') % version, |
|
237 | 'a known bundlespec') % version, | |
238 | hint=_('try upgrading your Mercurial ' |
|
238 | hint=_('try upgrading your Mercurial ' | |
239 | 'client')) |
|
239 | 'client')) | |
240 |
|
240 | |||
241 | if not version: |
|
241 | if not version: | |
242 | raise error.Abort(_('could not identify changegroup version in ' |
|
242 | raise error.Abort(_('could not identify changegroup version in ' | |
243 | 'bundle')) |
|
243 | 'bundle')) | |
244 |
|
244 | |||
245 | return '%s-%s' % (comp, version) |
|
245 | return '%s-%s' % (comp, version) | |
246 | elif isinstance(b, streamclone.streamcloneapplier): |
|
246 | elif isinstance(b, streamclone.streamcloneapplier): | |
247 | requirements = streamclone.readbundle1header(fh)[2] |
|
247 | requirements = streamclone.readbundle1header(fh)[2] | |
248 | params = 'requirements=%s' % ','.join(sorted(requirements)) |
|
248 | params = 'requirements=%s' % ','.join(sorted(requirements)) | |
249 | return 'none-packed1;%s' % urlreq.quote(params) |
|
249 | return 'none-packed1;%s' % urlreq.quote(params) | |
250 | else: |
|
250 | else: | |
251 | raise error.Abort(_('unknown bundle type: %s') % b) |
|
251 | raise error.Abort(_('unknown bundle type: %s') % b) | |
252 |
|
252 | |||
253 | def _computeoutgoing(repo, heads, common): |
|
253 | def _computeoutgoing(repo, heads, common): | |
254 | """Computes which revs are outgoing given a set of common |
|
254 | """Computes which revs are outgoing given a set of common | |
255 | and a set of heads. |
|
255 | and a set of heads. | |
256 |
|
256 | |||
257 | This is a separate function so extensions can have access to |
|
257 | This is a separate function so extensions can have access to | |
258 | the logic. |
|
258 | the logic. | |
259 |
|
259 | |||
260 | Returns a discovery.outgoing object. |
|
260 | Returns a discovery.outgoing object. | |
261 | """ |
|
261 | """ | |
262 | cl = repo.changelog |
|
262 | cl = repo.changelog | |
263 | if common: |
|
263 | if common: | |
264 | hasnode = cl.hasnode |
|
264 | hasnode = cl.hasnode | |
265 | common = [n for n in common if hasnode(n)] |
|
265 | common = [n for n in common if hasnode(n)] | |
266 | else: |
|
266 | else: | |
267 | common = [nullid] |
|
267 | common = [nullid] | |
268 | if not heads: |
|
268 | if not heads: | |
269 | heads = cl.heads() |
|
269 | heads = cl.heads() | |
270 | return discovery.outgoing(repo, common, heads) |
|
270 | return discovery.outgoing(repo, common, heads) | |
271 |
|
271 | |||
272 | def _forcebundle1(op): |
|
272 | def _forcebundle1(op): | |
273 | """return true if a pull/push must use bundle1 |
|
273 | """return true if a pull/push must use bundle1 | |
274 |
|
274 | |||
275 | This function is used to allow testing of the older bundle version""" |
|
275 | This function is used to allow testing of the older bundle version""" | |
276 | ui = op.repo.ui |
|
276 | ui = op.repo.ui | |
277 | forcebundle1 = False |
|
277 | forcebundle1 = False | |
278 | # The goal is this config is to allow developer to choose the bundle |
|
278 | # The goal is this config is to allow developer to choose the bundle | |
279 | # version used during exchanged. This is especially handy during test. |
|
279 | # version used during exchanged. This is especially handy during test. | |
280 | # Value is a list of bundle version to be picked from, highest version |
|
280 | # Value is a list of bundle version to be picked from, highest version | |
281 | # should be used. |
|
281 | # should be used. | |
282 | # |
|
282 | # | |
283 | # developer config: devel.legacy.exchange |
|
283 | # developer config: devel.legacy.exchange | |
284 | exchange = ui.configlist('devel', 'legacy.exchange') |
|
284 | exchange = ui.configlist('devel', 'legacy.exchange') | |
285 | forcebundle1 = 'bundle2' not in exchange and 'bundle1' in exchange |
|
285 | forcebundle1 = 'bundle2' not in exchange and 'bundle1' in exchange | |
286 | return forcebundle1 or not op.remote.capable('bundle2') |
|
286 | return forcebundle1 or not op.remote.capable('bundle2') | |
287 |
|
287 | |||
288 | class pushoperation(object): |
|
288 | class pushoperation(object): | |
289 | """A object that represent a single push operation |
|
289 | """A object that represent a single push operation | |
290 |
|
290 | |||
291 | Its purpose is to carry push related state and very common operations. |
|
291 | Its purpose is to carry push related state and very common operations. | |
292 |
|
292 | |||
293 | A new pushoperation should be created at the beginning of each push and |
|
293 | A new pushoperation should be created at the beginning of each push and | |
294 | discarded afterward. |
|
294 | discarded afterward. | |
295 | """ |
|
295 | """ | |
296 |
|
296 | |||
297 | def __init__(self, repo, remote, force=False, revs=None, newbranch=False, |
|
297 | def __init__(self, repo, remote, force=False, revs=None, newbranch=False, | |
298 | bookmarks=(), pushvars=None): |
|
298 | bookmarks=(), pushvars=None): | |
299 | # repo we push from |
|
299 | # repo we push from | |
300 | self.repo = repo |
|
300 | self.repo = repo | |
301 | self.ui = repo.ui |
|
301 | self.ui = repo.ui | |
302 | # repo we push to |
|
302 | # repo we push to | |
303 | self.remote = remote |
|
303 | self.remote = remote | |
304 | # force option provided |
|
304 | # force option provided | |
305 | self.force = force |
|
305 | self.force = force | |
306 | # revs to be pushed (None is "all") |
|
306 | # revs to be pushed (None is "all") | |
307 | self.revs = revs |
|
307 | self.revs = revs | |
308 | # bookmark explicitly pushed |
|
308 | # bookmark explicitly pushed | |
309 | self.bookmarks = bookmarks |
|
309 | self.bookmarks = bookmarks | |
310 | # allow push of new branch |
|
310 | # allow push of new branch | |
311 | self.newbranch = newbranch |
|
311 | self.newbranch = newbranch | |
312 | # step already performed |
|
312 | # step already performed | |
313 | # (used to check what steps have been already performed through bundle2) |
|
313 | # (used to check what steps have been already performed through bundle2) | |
314 | self.stepsdone = set() |
|
314 | self.stepsdone = set() | |
315 | # Integer version of the changegroup push result |
|
315 | # Integer version of the changegroup push result | |
316 | # - None means nothing to push |
|
316 | # - None means nothing to push | |
317 | # - 0 means HTTP error |
|
317 | # - 0 means HTTP error | |
318 | # - 1 means we pushed and remote head count is unchanged *or* |
|
318 | # - 1 means we pushed and remote head count is unchanged *or* | |
319 | # we have outgoing changesets but refused to push |
|
319 | # we have outgoing changesets but refused to push | |
320 | # - other values as described by addchangegroup() |
|
320 | # - other values as described by addchangegroup() | |
321 | self.cgresult = None |
|
321 | self.cgresult = None | |
322 | # Boolean value for the bookmark push |
|
322 | # Boolean value for the bookmark push | |
323 | self.bkresult = None |
|
323 | self.bkresult = None | |
324 | # discover.outgoing object (contains common and outgoing data) |
|
324 | # discover.outgoing object (contains common and outgoing data) | |
325 | self.outgoing = None |
|
325 | self.outgoing = None | |
326 | # all remote topological heads before the push |
|
326 | # all remote topological heads before the push | |
327 | self.remoteheads = None |
|
327 | self.remoteheads = None | |
328 | # Details of the remote branch pre and post push |
|
328 | # Details of the remote branch pre and post push | |
329 | # |
|
329 | # | |
330 | # mapping: {'branch': ([remoteheads], |
|
330 | # mapping: {'branch': ([remoteheads], | |
331 | # [newheads], |
|
331 | # [newheads], | |
332 | # [unsyncedheads], |
|
332 | # [unsyncedheads], | |
333 | # [discardedheads])} |
|
333 | # [discardedheads])} | |
334 | # - branch: the branch name |
|
334 | # - branch: the branch name | |
335 | # - remoteheads: the list of remote heads known locally |
|
335 | # - remoteheads: the list of remote heads known locally | |
336 | # None if the branch is new |
|
336 | # None if the branch is new | |
337 | # - newheads: the new remote heads (known locally) with outgoing pushed |
|
337 | # - newheads: the new remote heads (known locally) with outgoing pushed | |
338 | # - unsyncedheads: the list of remote heads unknown locally. |
|
338 | # - unsyncedheads: the list of remote heads unknown locally. | |
339 | # - discardedheads: the list of remote heads made obsolete by the push |
|
339 | # - discardedheads: the list of remote heads made obsolete by the push | |
340 | self.pushbranchmap = None |
|
340 | self.pushbranchmap = None | |
341 | # testable as a boolean indicating if any nodes are missing locally. |
|
341 | # testable as a boolean indicating if any nodes are missing locally. | |
342 | self.incoming = None |
|
342 | self.incoming = None | |
343 | # summary of the remote phase situation |
|
343 | # summary of the remote phase situation | |
344 | self.remotephases = None |
|
344 | self.remotephases = None | |
345 | # phases changes that must be pushed along side the changesets |
|
345 | # phases changes that must be pushed along side the changesets | |
346 | self.outdatedphases = None |
|
346 | self.outdatedphases = None | |
347 | # phases changes that must be pushed if changeset push fails |
|
347 | # phases changes that must be pushed if changeset push fails | |
348 | self.fallbackoutdatedphases = None |
|
348 | self.fallbackoutdatedphases = None | |
349 | # outgoing obsmarkers |
|
349 | # outgoing obsmarkers | |
350 | self.outobsmarkers = set() |
|
350 | self.outobsmarkers = set() | |
351 | # outgoing bookmarks |
|
351 | # outgoing bookmarks | |
352 | self.outbookmarks = [] |
|
352 | self.outbookmarks = [] | |
353 | # transaction manager |
|
353 | # transaction manager | |
354 | self.trmanager = None |
|
354 | self.trmanager = None | |
355 | # map { pushkey partid -> callback handling failure} |
|
355 | # map { pushkey partid -> callback handling failure} | |
356 | # used to handle exception from mandatory pushkey part failure |
|
356 | # used to handle exception from mandatory pushkey part failure | |
357 | self.pkfailcb = {} |
|
357 | self.pkfailcb = {} | |
358 | # an iterable of pushvars or None |
|
358 | # an iterable of pushvars or None | |
359 | self.pushvars = pushvars |
|
359 | self.pushvars = pushvars | |
360 |
|
360 | |||
361 | @util.propertycache |
|
361 | @util.propertycache | |
362 | def futureheads(self): |
|
362 | def futureheads(self): | |
363 | """future remote heads if the changeset push succeeds""" |
|
363 | """future remote heads if the changeset push succeeds""" | |
364 | return self.outgoing.missingheads |
|
364 | return self.outgoing.missingheads | |
365 |
|
365 | |||
366 | @util.propertycache |
|
366 | @util.propertycache | |
367 | def fallbackheads(self): |
|
367 | def fallbackheads(self): | |
368 | """future remote heads if the changeset push fails""" |
|
368 | """future remote heads if the changeset push fails""" | |
369 | if self.revs is None: |
|
369 | if self.revs is None: | |
370 | # not target to push, all common are relevant |
|
370 | # not target to push, all common are relevant | |
371 | return self.outgoing.commonheads |
|
371 | return self.outgoing.commonheads | |
372 | unfi = self.repo.unfiltered() |
|
372 | unfi = self.repo.unfiltered() | |
373 | # I want cheads = heads(::missingheads and ::commonheads) |
|
373 | # I want cheads = heads(::missingheads and ::commonheads) | |
374 | # (missingheads is revs with secret changeset filtered out) |
|
374 | # (missingheads is revs with secret changeset filtered out) | |
375 | # |
|
375 | # | |
376 | # This can be expressed as: |
|
376 | # This can be expressed as: | |
377 | # cheads = ( (missingheads and ::commonheads) |
|
377 | # cheads = ( (missingheads and ::commonheads) | |
378 | # + (commonheads and ::missingheads))" |
|
378 | # + (commonheads and ::missingheads))" | |
379 | # ) |
|
379 | # ) | |
380 | # |
|
380 | # | |
381 | # while trying to push we already computed the following: |
|
381 | # while trying to push we already computed the following: | |
382 | # common = (::commonheads) |
|
382 | # common = (::commonheads) | |
383 | # missing = ((commonheads::missingheads) - commonheads) |
|
383 | # missing = ((commonheads::missingheads) - commonheads) | |
384 | # |
|
384 | # | |
385 | # We can pick: |
|
385 | # We can pick: | |
386 | # * missingheads part of common (::commonheads) |
|
386 | # * missingheads part of common (::commonheads) | |
387 | common = self.outgoing.common |
|
387 | common = self.outgoing.common | |
388 | nm = self.repo.changelog.nodemap |
|
388 | nm = self.repo.changelog.nodemap | |
389 | cheads = [node for node in self.revs if nm[node] in common] |
|
389 | cheads = [node for node in self.revs if nm[node] in common] | |
390 | # and |
|
390 | # and | |
391 | # * commonheads parents on missing |
|
391 | # * commonheads parents on missing | |
392 | revset = unfi.set('%ln and parents(roots(%ln))', |
|
392 | revset = unfi.set('%ln and parents(roots(%ln))', | |
393 | self.outgoing.commonheads, |
|
393 | self.outgoing.commonheads, | |
394 | self.outgoing.missing) |
|
394 | self.outgoing.missing) | |
395 | cheads.extend(c.node() for c in revset) |
|
395 | cheads.extend(c.node() for c in revset) | |
396 | return cheads |
|
396 | return cheads | |
397 |
|
397 | |||
398 | @property |
|
398 | @property | |
399 | def commonheads(self): |
|
399 | def commonheads(self): | |
400 | """set of all common heads after changeset bundle push""" |
|
400 | """set of all common heads after changeset bundle push""" | |
401 | if self.cgresult: |
|
401 | if self.cgresult: | |
402 | return self.futureheads |
|
402 | return self.futureheads | |
403 | else: |
|
403 | else: | |
404 | return self.fallbackheads |
|
404 | return self.fallbackheads | |
405 |
|
405 | |||
406 | # mapping of message used when pushing bookmark |
|
406 | # mapping of message used when pushing bookmark | |
407 | bookmsgmap = {'update': (_("updating bookmark %s\n"), |
|
407 | bookmsgmap = {'update': (_("updating bookmark %s\n"), | |
408 | _('updating bookmark %s failed!\n')), |
|
408 | _('updating bookmark %s failed!\n')), | |
409 | 'export': (_("exporting bookmark %s\n"), |
|
409 | 'export': (_("exporting bookmark %s\n"), | |
410 | _('exporting bookmark %s failed!\n')), |
|
410 | _('exporting bookmark %s failed!\n')), | |
411 | 'delete': (_("deleting remote bookmark %s\n"), |
|
411 | 'delete': (_("deleting remote bookmark %s\n"), | |
412 | _('deleting remote bookmark %s failed!\n')), |
|
412 | _('deleting remote bookmark %s failed!\n')), | |
413 | } |
|
413 | } | |
414 |
|
414 | |||
415 |
|
415 | |||
416 | def push(repo, remote, force=False, revs=None, newbranch=False, bookmarks=(), |
|
416 | def push(repo, remote, force=False, revs=None, newbranch=False, bookmarks=(), | |
417 | opargs=None): |
|
417 | opargs=None): | |
418 | '''Push outgoing changesets (limited by revs) from a local |
|
418 | '''Push outgoing changesets (limited by revs) from a local | |
419 | repository to remote. Return an integer: |
|
419 | repository to remote. Return an integer: | |
420 | - None means nothing to push |
|
420 | - None means nothing to push | |
421 | - 0 means HTTP error |
|
421 | - 0 means HTTP error | |
422 | - 1 means we pushed and remote head count is unchanged *or* |
|
422 | - 1 means we pushed and remote head count is unchanged *or* | |
423 | we have outgoing changesets but refused to push |
|
423 | we have outgoing changesets but refused to push | |
424 | - other values as described by addchangegroup() |
|
424 | - other values as described by addchangegroup() | |
425 | ''' |
|
425 | ''' | |
426 | if opargs is None: |
|
426 | if opargs is None: | |
427 | opargs = {} |
|
427 | opargs = {} | |
428 | pushop = pushoperation(repo, remote, force, revs, newbranch, bookmarks, |
|
428 | pushop = pushoperation(repo, remote, force, revs, newbranch, bookmarks, | |
429 | **pycompat.strkwargs(opargs)) |
|
429 | **pycompat.strkwargs(opargs)) | |
430 | if pushop.remote.local(): |
|
430 | if pushop.remote.local(): | |
431 | missing = (set(pushop.repo.requirements) |
|
431 | missing = (set(pushop.repo.requirements) | |
432 | - pushop.remote.local().supported) |
|
432 | - pushop.remote.local().supported) | |
433 | if missing: |
|
433 | if missing: | |
434 | msg = _("required features are not" |
|
434 | msg = _("required features are not" | |
435 | " supported in the destination:" |
|
435 | " supported in the destination:" | |
436 | " %s") % (', '.join(sorted(missing))) |
|
436 | " %s") % (', '.join(sorted(missing))) | |
437 | raise error.Abort(msg) |
|
437 | raise error.Abort(msg) | |
438 |
|
438 | |||
439 | if not pushop.remote.canpush(): |
|
439 | if not pushop.remote.canpush(): | |
440 | raise error.Abort(_("destination does not support push")) |
|
440 | raise error.Abort(_("destination does not support push")) | |
441 |
|
441 | |||
442 | if not pushop.remote.capable('unbundle'): |
|
442 | if not pushop.remote.capable('unbundle'): | |
443 | raise error.Abort(_('cannot push: destination does not support the ' |
|
443 | raise error.Abort(_('cannot push: destination does not support the ' | |
444 | 'unbundle wire protocol command')) |
|
444 | 'unbundle wire protocol command')) | |
445 |
|
445 | |||
446 | # get lock as we might write phase data |
|
446 | # get lock as we might write phase data | |
447 | wlock = lock = None |
|
447 | wlock = lock = None | |
448 | try: |
|
448 | try: | |
449 | # bundle2 push may receive a reply bundle touching bookmarks or other |
|
449 | # bundle2 push may receive a reply bundle touching bookmarks or other | |
450 | # things requiring the wlock. Take it now to ensure proper ordering. |
|
450 | # things requiring the wlock. Take it now to ensure proper ordering. | |
451 | maypushback = pushop.ui.configbool('experimental', 'bundle2.pushback') |
|
451 | maypushback = pushop.ui.configbool('experimental', 'bundle2.pushback') | |
452 | if (not _forcebundle1(pushop)) and maypushback: |
|
452 | if (not _forcebundle1(pushop)) and maypushback: | |
453 | wlock = pushop.repo.wlock() |
|
453 | wlock = pushop.repo.wlock() | |
454 | lock = pushop.repo.lock() |
|
454 | lock = pushop.repo.lock() | |
455 | pushop.trmanager = transactionmanager(pushop.repo, |
|
455 | pushop.trmanager = transactionmanager(pushop.repo, | |
456 | 'push-response', |
|
456 | 'push-response', | |
457 | pushop.remote.url()) |
|
457 | pushop.remote.url()) | |
458 | except IOError as err: |
|
458 | except IOError as err: | |
459 | if err.errno != errno.EACCES: |
|
459 | if err.errno != errno.EACCES: | |
460 | raise |
|
460 | raise | |
461 | # source repo cannot be locked. |
|
461 | # source repo cannot be locked. | |
462 | # We do not abort the push, but just disable the local phase |
|
462 | # We do not abort the push, but just disable the local phase | |
463 | # synchronisation. |
|
463 | # synchronisation. | |
464 | msg = 'cannot lock source repository: %s\n' % err |
|
464 | msg = 'cannot lock source repository: %s\n' % err | |
465 | pushop.ui.debug(msg) |
|
465 | pushop.ui.debug(msg) | |
466 |
|
466 | |||
467 | with wlock or util.nullcontextmanager(), \ |
|
467 | with wlock or util.nullcontextmanager(), \ | |
468 | lock or util.nullcontextmanager(), \ |
|
468 | lock or util.nullcontextmanager(), \ | |
469 | pushop.trmanager or util.nullcontextmanager(): |
|
469 | pushop.trmanager or util.nullcontextmanager(): | |
470 | pushop.repo.checkpush(pushop) |
|
470 | pushop.repo.checkpush(pushop) | |
471 | _pushdiscovery(pushop) |
|
471 | _pushdiscovery(pushop) | |
472 | if not _forcebundle1(pushop): |
|
472 | if not _forcebundle1(pushop): | |
473 | _pushbundle2(pushop) |
|
473 | _pushbundle2(pushop) | |
474 | _pushchangeset(pushop) |
|
474 | _pushchangeset(pushop) | |
475 | _pushsyncphase(pushop) |
|
475 | _pushsyncphase(pushop) | |
476 | _pushobsolete(pushop) |
|
476 | _pushobsolete(pushop) | |
477 | _pushbookmark(pushop) |
|
477 | _pushbookmark(pushop) | |
478 |
|
478 | |||
479 | return pushop |
|
479 | return pushop | |
480 |
|
480 | |||
481 | # list of steps to perform discovery before push |
|
481 | # list of steps to perform discovery before push | |
482 | pushdiscoveryorder = [] |
|
482 | pushdiscoveryorder = [] | |
483 |
|
483 | |||
484 | # Mapping between step name and function |
|
484 | # Mapping between step name and function | |
485 | # |
|
485 | # | |
486 | # This exists to help extensions wrap steps if necessary |
|
486 | # This exists to help extensions wrap steps if necessary | |
487 | pushdiscoverymapping = {} |
|
487 | pushdiscoverymapping = {} | |
488 |
|
488 | |||
489 | def pushdiscovery(stepname): |
|
489 | def pushdiscovery(stepname): | |
490 | """decorator for function performing discovery before push |
|
490 | """decorator for function performing discovery before push | |
491 |
|
491 | |||
492 | The function is added to the step -> function mapping and appended to the |
|
492 | The function is added to the step -> function mapping and appended to the | |
493 | list of steps. Beware that decorated function will be added in order (this |
|
493 | list of steps. Beware that decorated function will be added in order (this | |
494 | may matter). |
|
494 | may matter). | |
495 |
|
495 | |||
496 | You can only use this decorator for a new step, if you want to wrap a step |
|
496 | You can only use this decorator for a new step, if you want to wrap a step | |
497 | from an extension, change the pushdiscovery dictionary directly.""" |
|
497 | from an extension, change the pushdiscovery dictionary directly.""" | |
498 | def dec(func): |
|
498 | def dec(func): | |
499 | assert stepname not in pushdiscoverymapping |
|
499 | assert stepname not in pushdiscoverymapping | |
500 | pushdiscoverymapping[stepname] = func |
|
500 | pushdiscoverymapping[stepname] = func | |
501 | pushdiscoveryorder.append(stepname) |
|
501 | pushdiscoveryorder.append(stepname) | |
502 | return func |
|
502 | return func | |
503 | return dec |
|
503 | return dec | |
504 |
|
504 | |||
505 | def _pushdiscovery(pushop): |
|
505 | def _pushdiscovery(pushop): | |
506 | """Run all discovery steps""" |
|
506 | """Run all discovery steps""" | |
507 | for stepname in pushdiscoveryorder: |
|
507 | for stepname in pushdiscoveryorder: | |
508 | step = pushdiscoverymapping[stepname] |
|
508 | step = pushdiscoverymapping[stepname] | |
509 | step(pushop) |
|
509 | step(pushop) | |
510 |
|
510 | |||
511 | @pushdiscovery('changeset') |
|
511 | @pushdiscovery('changeset') | |
512 | def _pushdiscoverychangeset(pushop): |
|
512 | def _pushdiscoverychangeset(pushop): | |
513 | """discover the changeset that need to be pushed""" |
|
513 | """discover the changeset that need to be pushed""" | |
514 | fci = discovery.findcommonincoming |
|
514 | fci = discovery.findcommonincoming | |
515 | commoninc = fci(pushop.repo, pushop.remote, force=pushop.force) |
|
515 | commoninc = fci(pushop.repo, pushop.remote, force=pushop.force) | |
516 | common, inc, remoteheads = commoninc |
|
516 | common, inc, remoteheads = commoninc | |
517 | fco = discovery.findcommonoutgoing |
|
517 | fco = discovery.findcommonoutgoing | |
518 | outgoing = fco(pushop.repo, pushop.remote, onlyheads=pushop.revs, |
|
518 | outgoing = fco(pushop.repo, pushop.remote, onlyheads=pushop.revs, | |
519 | commoninc=commoninc, force=pushop.force) |
|
519 | commoninc=commoninc, force=pushop.force) | |
520 | pushop.outgoing = outgoing |
|
520 | pushop.outgoing = outgoing | |
521 | pushop.remoteheads = remoteheads |
|
521 | pushop.remoteheads = remoteheads | |
522 | pushop.incoming = inc |
|
522 | pushop.incoming = inc | |
523 |
|
523 | |||
524 | @pushdiscovery('phase') |
|
524 | @pushdiscovery('phase') | |
525 | def _pushdiscoveryphase(pushop): |
|
525 | def _pushdiscoveryphase(pushop): | |
526 | """discover the phase that needs to be pushed |
|
526 | """discover the phase that needs to be pushed | |
527 |
|
527 | |||
528 | (computed for both success and failure case for changesets push)""" |
|
528 | (computed for both success and failure case for changesets push)""" | |
529 | outgoing = pushop.outgoing |
|
529 | outgoing = pushop.outgoing | |
530 | unfi = pushop.repo.unfiltered() |
|
530 | unfi = pushop.repo.unfiltered() | |
531 | remotephases = pushop.remote.listkeys('phases') |
|
531 | remotephases = pushop.remote.listkeys('phases') | |
532 | if (pushop.ui.configbool('ui', '_usedassubrepo') |
|
532 | if (pushop.ui.configbool('ui', '_usedassubrepo') | |
533 | and remotephases # server supports phases |
|
533 | and remotephases # server supports phases | |
534 | and not pushop.outgoing.missing # no changesets to be pushed |
|
534 | and not pushop.outgoing.missing # no changesets to be pushed | |
535 | and remotephases.get('publishing', False)): |
|
535 | and remotephases.get('publishing', False)): | |
536 | # When: |
|
536 | # When: | |
537 | # - this is a subrepo push |
|
537 | # - this is a subrepo push | |
538 | # - and remote support phase |
|
538 | # - and remote support phase | |
539 | # - and no changeset are to be pushed |
|
539 | # - and no changeset are to be pushed | |
540 | # - and remote is publishing |
|
540 | # - and remote is publishing | |
541 | # We may be in issue 3781 case! |
|
541 | # We may be in issue 3781 case! | |
542 | # We drop the possible phase synchronisation done by |
|
542 | # We drop the possible phase synchronisation done by | |
543 | # courtesy to publish changesets possibly locally draft |
|
543 | # courtesy to publish changesets possibly locally draft | |
544 | # on the remote. |
|
544 | # on the remote. | |
545 | pushop.outdatedphases = [] |
|
545 | pushop.outdatedphases = [] | |
546 | pushop.fallbackoutdatedphases = [] |
|
546 | pushop.fallbackoutdatedphases = [] | |
547 | return |
|
547 | return | |
548 |
|
548 | |||
549 | pushop.remotephases = phases.remotephasessummary(pushop.repo, |
|
549 | pushop.remotephases = phases.remotephasessummary(pushop.repo, | |
550 | pushop.fallbackheads, |
|
550 | pushop.fallbackheads, | |
551 | remotephases) |
|
551 | remotephases) | |
552 | droots = pushop.remotephases.draftroots |
|
552 | droots = pushop.remotephases.draftroots | |
553 |
|
553 | |||
554 | extracond = '' |
|
554 | extracond = '' | |
555 | if not pushop.remotephases.publishing: |
|
555 | if not pushop.remotephases.publishing: | |
556 | extracond = ' and public()' |
|
556 | extracond = ' and public()' | |
557 | revset = 'heads((%%ln::%%ln) %s)' % extracond |
|
557 | revset = 'heads((%%ln::%%ln) %s)' % extracond | |
558 | # Get the list of all revs draft on remote by public here. |
|
558 | # Get the list of all revs draft on remote by public here. | |
559 | # XXX Beware that revset break if droots is not strictly |
|
559 | # XXX Beware that revset break if droots is not strictly | |
560 | # XXX root we may want to ensure it is but it is costly |
|
560 | # XXX root we may want to ensure it is but it is costly | |
561 | fallback = list(unfi.set(revset, droots, pushop.fallbackheads)) |
|
561 | fallback = list(unfi.set(revset, droots, pushop.fallbackheads)) | |
562 | if not outgoing.missing: |
|
562 | if not outgoing.missing: | |
563 | future = fallback |
|
563 | future = fallback | |
564 | else: |
|
564 | else: | |
565 | # adds changeset we are going to push as draft |
|
565 | # adds changeset we are going to push as draft | |
566 | # |
|
566 | # | |
567 | # should not be necessary for publishing server, but because of an |
|
567 | # should not be necessary for publishing server, but because of an | |
568 | # issue fixed in xxxxx we have to do it anyway. |
|
568 | # issue fixed in xxxxx we have to do it anyway. | |
569 | fdroots = list(unfi.set('roots(%ln + %ln::)', |
|
569 | fdroots = list(unfi.set('roots(%ln + %ln::)', | |
570 | outgoing.missing, droots)) |
|
570 | outgoing.missing, droots)) | |
571 | fdroots = [f.node() for f in fdroots] |
|
571 | fdroots = [f.node() for f in fdroots] | |
572 | future = list(unfi.set(revset, fdroots, pushop.futureheads)) |
|
572 | future = list(unfi.set(revset, fdroots, pushop.futureheads)) | |
573 | pushop.outdatedphases = future |
|
573 | pushop.outdatedphases = future | |
574 | pushop.fallbackoutdatedphases = fallback |
|
574 | pushop.fallbackoutdatedphases = fallback | |
575 |
|
575 | |||
576 | @pushdiscovery('obsmarker') |
|
576 | @pushdiscovery('obsmarker') | |
577 | def _pushdiscoveryobsmarkers(pushop): |
|
577 | def _pushdiscoveryobsmarkers(pushop): | |
578 | if (obsolete.isenabled(pushop.repo, obsolete.exchangeopt) |
|
578 | if (obsolete.isenabled(pushop.repo, obsolete.exchangeopt) | |
579 | and pushop.repo.obsstore |
|
579 | and pushop.repo.obsstore | |
580 | and 'obsolete' in pushop.remote.listkeys('namespaces')): |
|
580 | and 'obsolete' in pushop.remote.listkeys('namespaces')): | |
581 | repo = pushop.repo |
|
581 | repo = pushop.repo | |
582 | # very naive computation, that can be quite expensive on big repo. |
|
582 | # very naive computation, that can be quite expensive on big repo. | |
583 | # However: evolution is currently slow on them anyway. |
|
583 | # However: evolution is currently slow on them anyway. | |
584 | nodes = (c.node() for c in repo.set('::%ln', pushop.futureheads)) |
|
584 | nodes = (c.node() for c in repo.set('::%ln', pushop.futureheads)) | |
585 | pushop.outobsmarkers = pushop.repo.obsstore.relevantmarkers(nodes) |
|
585 | pushop.outobsmarkers = pushop.repo.obsstore.relevantmarkers(nodes) | |
586 |
|
586 | |||
587 | @pushdiscovery('bookmarks') |
|
587 | @pushdiscovery('bookmarks') | |
588 | def _pushdiscoverybookmarks(pushop): |
|
588 | def _pushdiscoverybookmarks(pushop): | |
589 | ui = pushop.ui |
|
589 | ui = pushop.ui | |
590 | repo = pushop.repo.unfiltered() |
|
590 | repo = pushop.repo.unfiltered() | |
591 | remote = pushop.remote |
|
591 | remote = pushop.remote | |
592 | ui.debug("checking for updated bookmarks\n") |
|
592 | ui.debug("checking for updated bookmarks\n") | |
593 | ancestors = () |
|
593 | ancestors = () | |
594 | if pushop.revs: |
|
594 | if pushop.revs: | |
595 | revnums = map(repo.changelog.rev, pushop.revs) |
|
595 | revnums = map(repo.changelog.rev, pushop.revs) | |
596 | ancestors = repo.changelog.ancestors(revnums, inclusive=True) |
|
596 | ancestors = repo.changelog.ancestors(revnums, inclusive=True) | |
597 | remotebookmark = remote.listkeys('bookmarks') |
|
597 | remotebookmark = remote.listkeys('bookmarks') | |
598 |
|
598 | |||
599 | explicit = set([repo._bookmarks.expandname(bookmark) |
|
599 | explicit = set([repo._bookmarks.expandname(bookmark) | |
600 | for bookmark in pushop.bookmarks]) |
|
600 | for bookmark in pushop.bookmarks]) | |
601 |
|
601 | |||
602 | remotebookmark = bookmod.unhexlifybookmarks(remotebookmark) |
|
602 | remotebookmark = bookmod.unhexlifybookmarks(remotebookmark) | |
603 | comp = bookmod.comparebookmarks(repo, repo._bookmarks, remotebookmark) |
|
603 | comp = bookmod.comparebookmarks(repo, repo._bookmarks, remotebookmark) | |
604 |
|
604 | |||
605 | def safehex(x): |
|
605 | def safehex(x): | |
606 | if x is None: |
|
606 | if x is None: | |
607 | return x |
|
607 | return x | |
608 | return hex(x) |
|
608 | return hex(x) | |
609 |
|
609 | |||
610 | def hexifycompbookmarks(bookmarks): |
|
610 | def hexifycompbookmarks(bookmarks): | |
611 | for b, scid, dcid in bookmarks: |
|
611 | for b, scid, dcid in bookmarks: | |
612 | yield b, safehex(scid), safehex(dcid) |
|
612 | yield b, safehex(scid), safehex(dcid) | |
613 |
|
613 | |||
614 | comp = [hexifycompbookmarks(marks) for marks in comp] |
|
614 | comp = [hexifycompbookmarks(marks) for marks in comp] | |
615 | addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = comp |
|
615 | addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same = comp | |
616 |
|
616 | |||
617 | for b, scid, dcid in advsrc: |
|
617 | for b, scid, dcid in advsrc: | |
618 | if b in explicit: |
|
618 | if b in explicit: | |
619 | explicit.remove(b) |
|
619 | explicit.remove(b) | |
620 | if not ancestors or repo[scid].rev() in ancestors: |
|
620 | if not ancestors or repo[scid].rev() in ancestors: | |
621 | pushop.outbookmarks.append((b, dcid, scid)) |
|
621 | pushop.outbookmarks.append((b, dcid, scid)) | |
622 | # search added bookmark |
|
622 | # search added bookmark | |
623 | for b, scid, dcid in addsrc: |
|
623 | for b, scid, dcid in addsrc: | |
624 | if b in explicit: |
|
624 | if b in explicit: | |
625 | explicit.remove(b) |
|
625 | explicit.remove(b) | |
626 | pushop.outbookmarks.append((b, '', scid)) |
|
626 | pushop.outbookmarks.append((b, '', scid)) | |
627 | # search for overwritten bookmark |
|
627 | # search for overwritten bookmark | |
628 | for b, scid, dcid in list(advdst) + list(diverge) + list(differ): |
|
628 | for b, scid, dcid in list(advdst) + list(diverge) + list(differ): | |
629 | if b in explicit: |
|
629 | if b in explicit: | |
630 | explicit.remove(b) |
|
630 | explicit.remove(b) | |
631 | pushop.outbookmarks.append((b, dcid, scid)) |
|
631 | pushop.outbookmarks.append((b, dcid, scid)) | |
632 | # search for bookmark to delete |
|
632 | # search for bookmark to delete | |
633 | for b, scid, dcid in adddst: |
|
633 | for b, scid, dcid in adddst: | |
634 | if b in explicit: |
|
634 | if b in explicit: | |
635 | explicit.remove(b) |
|
635 | explicit.remove(b) | |
636 | # treat as "deleted locally" |
|
636 | # treat as "deleted locally" | |
637 | pushop.outbookmarks.append((b, dcid, '')) |
|
637 | pushop.outbookmarks.append((b, dcid, '')) | |
638 | # identical bookmarks shouldn't get reported |
|
638 | # identical bookmarks shouldn't get reported | |
639 | for b, scid, dcid in same: |
|
639 | for b, scid, dcid in same: | |
640 | if b in explicit: |
|
640 | if b in explicit: | |
641 | explicit.remove(b) |
|
641 | explicit.remove(b) | |
642 |
|
642 | |||
643 | if explicit: |
|
643 | if explicit: | |
644 | explicit = sorted(explicit) |
|
644 | explicit = sorted(explicit) | |
645 | # we should probably list all of them |
|
645 | # we should probably list all of them | |
646 | ui.warn(_('bookmark %s does not exist on the local ' |
|
646 | ui.warn(_('bookmark %s does not exist on the local ' | |
647 | 'or remote repository!\n') % explicit[0]) |
|
647 | 'or remote repository!\n') % explicit[0]) | |
648 | pushop.bkresult = 2 |
|
648 | pushop.bkresult = 2 | |
649 |
|
649 | |||
650 | pushop.outbookmarks.sort() |
|
650 | pushop.outbookmarks.sort() | |
651 |
|
651 | |||
652 | def _pushcheckoutgoing(pushop): |
|
652 | def _pushcheckoutgoing(pushop): | |
653 | outgoing = pushop.outgoing |
|
653 | outgoing = pushop.outgoing | |
654 | unfi = pushop.repo.unfiltered() |
|
654 | unfi = pushop.repo.unfiltered() | |
655 | if not outgoing.missing: |
|
655 | if not outgoing.missing: | |
656 | # nothing to push |
|
656 | # nothing to push | |
657 | scmutil.nochangesfound(unfi.ui, unfi, outgoing.excluded) |
|
657 | scmutil.nochangesfound(unfi.ui, unfi, outgoing.excluded) | |
658 | return False |
|
658 | return False | |
659 | # something to push |
|
659 | # something to push | |
660 | if not pushop.force: |
|
660 | if not pushop.force: | |
661 | # if repo.obsstore == False --> no obsolete |
|
661 | # if repo.obsstore == False --> no obsolete | |
662 | # then, save the iteration |
|
662 | # then, save the iteration | |
663 | if unfi.obsstore: |
|
663 | if unfi.obsstore: | |
664 | # this message are here for 80 char limit reason |
|
664 | # this message are here for 80 char limit reason | |
665 | mso = _("push includes obsolete changeset: %s!") |
|
665 | mso = _("push includes obsolete changeset: %s!") | |
666 | mspd = _("push includes phase-divergent changeset: %s!") |
|
666 | mspd = _("push includes phase-divergent changeset: %s!") | |
667 | mscd = _("push includes content-divergent changeset: %s!") |
|
667 | mscd = _("push includes content-divergent changeset: %s!") | |
668 | mst = {"orphan": _("push includes orphan changeset: %s!"), |
|
668 | mst = {"orphan": _("push includes orphan changeset: %s!"), | |
669 | "phase-divergent": mspd, |
|
669 | "phase-divergent": mspd, | |
670 | "content-divergent": mscd} |
|
670 | "content-divergent": mscd} | |
671 | # If we are to push if there is at least one |
|
671 | # If we are to push if there is at least one | |
672 | # obsolete or unstable changeset in missing, at |
|
672 | # obsolete or unstable changeset in missing, at | |
673 | # least one of the missinghead will be obsolete or |
|
673 | # least one of the missinghead will be obsolete or | |
674 | # unstable. So checking heads only is ok |
|
674 | # unstable. So checking heads only is ok | |
675 | for node in outgoing.missingheads: |
|
675 | for node in outgoing.missingheads: | |
676 | ctx = unfi[node] |
|
676 | ctx = unfi[node] | |
677 | if ctx.obsolete(): |
|
677 | if ctx.obsolete(): | |
678 | raise error.Abort(mso % ctx) |
|
678 | raise error.Abort(mso % ctx) | |
679 | elif ctx.isunstable(): |
|
679 | elif ctx.isunstable(): | |
680 | # TODO print more than one instability in the abort |
|
680 | # TODO print more than one instability in the abort | |
681 | # message |
|
681 | # message | |
682 | raise error.Abort(mst[ctx.instabilities()[0]] % ctx) |
|
682 | raise error.Abort(mst[ctx.instabilities()[0]] % ctx) | |
683 |
|
683 | |||
684 | discovery.checkheads(pushop) |
|
684 | discovery.checkheads(pushop) | |
685 | return True |
|
685 | return True | |
686 |
|
686 | |||
687 | # List of names of steps to perform for an outgoing bundle2, order matters. |
|
687 | # List of names of steps to perform for an outgoing bundle2, order matters. | |
688 | b2partsgenorder = [] |
|
688 | b2partsgenorder = [] | |
689 |
|
689 | |||
690 | # Mapping between step name and function |
|
690 | # Mapping between step name and function | |
691 | # |
|
691 | # | |
692 | # This exists to help extensions wrap steps if necessary |
|
692 | # This exists to help extensions wrap steps if necessary | |
693 | b2partsgenmapping = {} |
|
693 | b2partsgenmapping = {} | |
694 |
|
694 | |||
695 | def b2partsgenerator(stepname, idx=None): |
|
695 | def b2partsgenerator(stepname, idx=None): | |
696 | """decorator for function generating bundle2 part |
|
696 | """decorator for function generating bundle2 part | |
697 |
|
697 | |||
698 | The function is added to the step -> function mapping and appended to the |
|
698 | The function is added to the step -> function mapping and appended to the | |
699 | list of steps. Beware that decorated functions will be added in order |
|
699 | list of steps. Beware that decorated functions will be added in order | |
700 | (this may matter). |
|
700 | (this may matter). | |
701 |
|
701 | |||
702 | You can only use this decorator for new steps, if you want to wrap a step |
|
702 | You can only use this decorator for new steps, if you want to wrap a step | |
703 | from an extension, attack the b2partsgenmapping dictionary directly.""" |
|
703 | from an extension, attack the b2partsgenmapping dictionary directly.""" | |
704 | def dec(func): |
|
704 | def dec(func): | |
705 | assert stepname not in b2partsgenmapping |
|
705 | assert stepname not in b2partsgenmapping | |
706 | b2partsgenmapping[stepname] = func |
|
706 | b2partsgenmapping[stepname] = func | |
707 | if idx is None: |
|
707 | if idx is None: | |
708 | b2partsgenorder.append(stepname) |
|
708 | b2partsgenorder.append(stepname) | |
709 | else: |
|
709 | else: | |
710 | b2partsgenorder.insert(idx, stepname) |
|
710 | b2partsgenorder.insert(idx, stepname) | |
711 | return func |
|
711 | return func | |
712 | return dec |
|
712 | return dec | |
713 |
|
713 | |||
714 | def _pushb2ctxcheckheads(pushop, bundler): |
|
714 | def _pushb2ctxcheckheads(pushop, bundler): | |
715 | """Generate race condition checking parts |
|
715 | """Generate race condition checking parts | |
716 |
|
716 | |||
717 | Exists as an independent function to aid extensions |
|
717 | Exists as an independent function to aid extensions | |
718 | """ |
|
718 | """ | |
719 | # * 'force' do not check for push race, |
|
719 | # * 'force' do not check for push race, | |
720 | # * if we don't push anything, there are nothing to check. |
|
720 | # * if we don't push anything, there are nothing to check. | |
721 | if not pushop.force and pushop.outgoing.missingheads: |
|
721 | if not pushop.force and pushop.outgoing.missingheads: | |
722 | allowunrelated = 'related' in bundler.capabilities.get('checkheads', ()) |
|
722 | allowunrelated = 'related' in bundler.capabilities.get('checkheads', ()) | |
723 | emptyremote = pushop.pushbranchmap is None |
|
723 | emptyremote = pushop.pushbranchmap is None | |
724 | if not allowunrelated or emptyremote: |
|
724 | if not allowunrelated or emptyremote: | |
725 | bundler.newpart('check:heads', data=iter(pushop.remoteheads)) |
|
725 | bundler.newpart('check:heads', data=iter(pushop.remoteheads)) | |
726 | else: |
|
726 | else: | |
727 | affected = set() |
|
727 | affected = set() | |
728 | for branch, heads in pushop.pushbranchmap.iteritems(): |
|
728 | for branch, heads in pushop.pushbranchmap.iteritems(): | |
729 | remoteheads, newheads, unsyncedheads, discardedheads = heads |
|
729 | remoteheads, newheads, unsyncedheads, discardedheads = heads | |
730 | if remoteheads is not None: |
|
730 | if remoteheads is not None: | |
731 | remote = set(remoteheads) |
|
731 | remote = set(remoteheads) | |
732 | affected |= set(discardedheads) & remote |
|
732 | affected |= set(discardedheads) & remote | |
733 | affected |= remote - set(newheads) |
|
733 | affected |= remote - set(newheads) | |
734 | if affected: |
|
734 | if affected: | |
735 | data = iter(sorted(affected)) |
|
735 | data = iter(sorted(affected)) | |
736 | bundler.newpart('check:updated-heads', data=data) |
|
736 | bundler.newpart('check:updated-heads', data=data) | |
737 |
|
737 | |||
738 | def _pushing(pushop): |
|
738 | def _pushing(pushop): | |
739 | """return True if we are pushing anything""" |
|
739 | """return True if we are pushing anything""" | |
740 | return bool(pushop.outgoing.missing |
|
740 | return bool(pushop.outgoing.missing | |
741 | or pushop.outdatedphases |
|
741 | or pushop.outdatedphases | |
742 | or pushop.outobsmarkers |
|
742 | or pushop.outobsmarkers | |
743 | or pushop.outbookmarks) |
|
743 | or pushop.outbookmarks) | |
744 |
|
744 | |||
745 | @b2partsgenerator('check-phases') |
|
745 | @b2partsgenerator('check-phases') | |
746 | def _pushb2checkphases(pushop, bundler): |
|
746 | def _pushb2checkphases(pushop, bundler): | |
747 | """insert phase move checking""" |
|
747 | """insert phase move checking""" | |
748 | if not _pushing(pushop) or pushop.force: |
|
748 | if not _pushing(pushop) or pushop.force: | |
749 | return |
|
749 | return | |
750 | b2caps = bundle2.bundle2caps(pushop.remote) |
|
750 | b2caps = bundle2.bundle2caps(pushop.remote) | |
751 | hasphaseheads = 'heads' in b2caps.get('phases', ()) |
|
751 | hasphaseheads = 'heads' in b2caps.get('phases', ()) | |
752 | if pushop.remotephases is not None and hasphaseheads: |
|
752 | if pushop.remotephases is not None and hasphaseheads: | |
753 | # check that the remote phase has not changed |
|
753 | # check that the remote phase has not changed | |
754 | checks = [[] for p in phases.allphases] |
|
754 | checks = [[] for p in phases.allphases] | |
755 | checks[phases.public].extend(pushop.remotephases.publicheads) |
|
755 | checks[phases.public].extend(pushop.remotephases.publicheads) | |
756 | checks[phases.draft].extend(pushop.remotephases.draftroots) |
|
756 | checks[phases.draft].extend(pushop.remotephases.draftroots) | |
757 | if any(checks): |
|
757 | if any(checks): | |
758 | for nodes in checks: |
|
758 | for nodes in checks: | |
759 | nodes.sort() |
|
759 | nodes.sort() | |
760 | checkdata = phases.binaryencode(checks) |
|
760 | checkdata = phases.binaryencode(checks) | |
761 | bundler.newpart('check:phases', data=checkdata) |
|
761 | bundler.newpart('check:phases', data=checkdata) | |
762 |
|
762 | |||
763 | @b2partsgenerator('changeset') |
|
763 | @b2partsgenerator('changeset') | |
764 | def _pushb2ctx(pushop, bundler): |
|
764 | def _pushb2ctx(pushop, bundler): | |
765 | """handle changegroup push through bundle2 |
|
765 | """handle changegroup push through bundle2 | |
766 |
|
766 | |||
767 | addchangegroup result is stored in the ``pushop.cgresult`` attribute. |
|
767 | addchangegroup result is stored in the ``pushop.cgresult`` attribute. | |
768 | """ |
|
768 | """ | |
769 | if 'changesets' in pushop.stepsdone: |
|
769 | if 'changesets' in pushop.stepsdone: | |
770 | return |
|
770 | return | |
771 | pushop.stepsdone.add('changesets') |
|
771 | pushop.stepsdone.add('changesets') | |
772 | # Send known heads to the server for race detection. |
|
772 | # Send known heads to the server for race detection. | |
773 | if not _pushcheckoutgoing(pushop): |
|
773 | if not _pushcheckoutgoing(pushop): | |
774 | return |
|
774 | return | |
775 | pushop.repo.prepushoutgoinghooks(pushop) |
|
775 | pushop.repo.prepushoutgoinghooks(pushop) | |
776 |
|
776 | |||
777 | _pushb2ctxcheckheads(pushop, bundler) |
|
777 | _pushb2ctxcheckheads(pushop, bundler) | |
778 |
|
778 | |||
779 | b2caps = bundle2.bundle2caps(pushop.remote) |
|
779 | b2caps = bundle2.bundle2caps(pushop.remote) | |
780 | version = '01' |
|
780 | version = '01' | |
781 | cgversions = b2caps.get('changegroup') |
|
781 | cgversions = b2caps.get('changegroup') | |
782 | if cgversions: # 3.1 and 3.2 ship with an empty value |
|
782 | if cgversions: # 3.1 and 3.2 ship with an empty value | |
783 | cgversions = [v for v in cgversions |
|
783 | cgversions = [v for v in cgversions | |
784 | if v in changegroup.supportedoutgoingversions( |
|
784 | if v in changegroup.supportedoutgoingversions( | |
785 | pushop.repo)] |
|
785 | pushop.repo)] | |
786 | if not cgversions: |
|
786 | if not cgversions: | |
787 | raise ValueError(_('no common changegroup version')) |
|
787 | raise ValueError(_('no common changegroup version')) | |
788 | version = max(cgversions) |
|
788 | version = max(cgversions) | |
789 | cgstream = changegroup.makestream(pushop.repo, pushop.outgoing, version, |
|
789 | cgstream = changegroup.makestream(pushop.repo, pushop.outgoing, version, | |
790 | 'push') |
|
790 | 'push') | |
791 | cgpart = bundler.newpart('changegroup', data=cgstream) |
|
791 | cgpart = bundler.newpart('changegroup', data=cgstream) | |
792 | if cgversions: |
|
792 | if cgversions: | |
793 | cgpart.addparam('version', version) |
|
793 | cgpart.addparam('version', version) | |
794 | if 'treemanifest' in pushop.repo.requirements: |
|
794 | if 'treemanifest' in pushop.repo.requirements: | |
795 | cgpart.addparam('treemanifest', '1') |
|
795 | cgpart.addparam('treemanifest', '1') | |
796 | def handlereply(op): |
|
796 | def handlereply(op): | |
797 | """extract addchangegroup returns from server reply""" |
|
797 | """extract addchangegroup returns from server reply""" | |
798 | cgreplies = op.records.getreplies(cgpart.id) |
|
798 | cgreplies = op.records.getreplies(cgpart.id) | |
799 | assert len(cgreplies['changegroup']) == 1 |
|
799 | assert len(cgreplies['changegroup']) == 1 | |
800 | pushop.cgresult = cgreplies['changegroup'][0]['return'] |
|
800 | pushop.cgresult = cgreplies['changegroup'][0]['return'] | |
801 | return handlereply |
|
801 | return handlereply | |
802 |
|
802 | |||
803 | @b2partsgenerator('phase') |
|
803 | @b2partsgenerator('phase') | |
804 | def _pushb2phases(pushop, bundler): |
|
804 | def _pushb2phases(pushop, bundler): | |
805 | """handle phase push through bundle2""" |
|
805 | """handle phase push through bundle2""" | |
806 | if 'phases' in pushop.stepsdone: |
|
806 | if 'phases' in pushop.stepsdone: | |
807 | return |
|
807 | return | |
808 | b2caps = bundle2.bundle2caps(pushop.remote) |
|
808 | b2caps = bundle2.bundle2caps(pushop.remote) | |
809 | ui = pushop.repo.ui |
|
809 | ui = pushop.repo.ui | |
810 |
|
810 | |||
811 | legacyphase = 'phases' in ui.configlist('devel', 'legacy.exchange') |
|
811 | legacyphase = 'phases' in ui.configlist('devel', 'legacy.exchange') | |
812 | haspushkey = 'pushkey' in b2caps |
|
812 | haspushkey = 'pushkey' in b2caps | |
813 | hasphaseheads = 'heads' in b2caps.get('phases', ()) |
|
813 | hasphaseheads = 'heads' in b2caps.get('phases', ()) | |
814 |
|
814 | |||
815 | if hasphaseheads and not legacyphase: |
|
815 | if hasphaseheads and not legacyphase: | |
816 | return _pushb2phaseheads(pushop, bundler) |
|
816 | return _pushb2phaseheads(pushop, bundler) | |
817 | elif haspushkey: |
|
817 | elif haspushkey: | |
818 | return _pushb2phasespushkey(pushop, bundler) |
|
818 | return _pushb2phasespushkey(pushop, bundler) | |
819 |
|
819 | |||
820 | def _pushb2phaseheads(pushop, bundler): |
|
820 | def _pushb2phaseheads(pushop, bundler): | |
821 | """push phase information through a bundle2 - binary part""" |
|
821 | """push phase information through a bundle2 - binary part""" | |
822 | pushop.stepsdone.add('phases') |
|
822 | pushop.stepsdone.add('phases') | |
823 | if pushop.outdatedphases: |
|
823 | if pushop.outdatedphases: | |
824 | updates = [[] for p in phases.allphases] |
|
824 | updates = [[] for p in phases.allphases] | |
825 | updates[0].extend(h.node() for h in pushop.outdatedphases) |
|
825 | updates[0].extend(h.node() for h in pushop.outdatedphases) | |
826 | phasedata = phases.binaryencode(updates) |
|
826 | phasedata = phases.binaryencode(updates) | |
827 | bundler.newpart('phase-heads', data=phasedata) |
|
827 | bundler.newpart('phase-heads', data=phasedata) | |
828 |
|
828 | |||
829 | def _pushb2phasespushkey(pushop, bundler): |
|
829 | def _pushb2phasespushkey(pushop, bundler): | |
830 | """push phase information through a bundle2 - pushkey part""" |
|
830 | """push phase information through a bundle2 - pushkey part""" | |
831 | pushop.stepsdone.add('phases') |
|
831 | pushop.stepsdone.add('phases') | |
832 | part2node = [] |
|
832 | part2node = [] | |
833 |
|
833 | |||
834 | def handlefailure(pushop, exc): |
|
834 | def handlefailure(pushop, exc): | |
835 | targetid = int(exc.partid) |
|
835 | targetid = int(exc.partid) | |
836 | for partid, node in part2node: |
|
836 | for partid, node in part2node: | |
837 | if partid == targetid: |
|
837 | if partid == targetid: | |
838 | raise error.Abort(_('updating %s to public failed') % node) |
|
838 | raise error.Abort(_('updating %s to public failed') % node) | |
839 |
|
839 | |||
840 | enc = pushkey.encode |
|
840 | enc = pushkey.encode | |
841 | for newremotehead in pushop.outdatedphases: |
|
841 | for newremotehead in pushop.outdatedphases: | |
842 | part = bundler.newpart('pushkey') |
|
842 | part = bundler.newpart('pushkey') | |
843 | part.addparam('namespace', enc('phases')) |
|
843 | part.addparam('namespace', enc('phases')) | |
844 | part.addparam('key', enc(newremotehead.hex())) |
|
844 | part.addparam('key', enc(newremotehead.hex())) | |
845 | part.addparam('old', enc('%d' % phases.draft)) |
|
845 | part.addparam('old', enc('%d' % phases.draft)) | |
846 | part.addparam('new', enc('%d' % phases.public)) |
|
846 | part.addparam('new', enc('%d' % phases.public)) | |
847 | part2node.append((part.id, newremotehead)) |
|
847 | part2node.append((part.id, newremotehead)) | |
848 | pushop.pkfailcb[part.id] = handlefailure |
|
848 | pushop.pkfailcb[part.id] = handlefailure | |
849 |
|
849 | |||
850 | def handlereply(op): |
|
850 | def handlereply(op): | |
851 | for partid, node in part2node: |
|
851 | for partid, node in part2node: | |
852 | partrep = op.records.getreplies(partid) |
|
852 | partrep = op.records.getreplies(partid) | |
853 | results = partrep['pushkey'] |
|
853 | results = partrep['pushkey'] | |
854 | assert len(results) <= 1 |
|
854 | assert len(results) <= 1 | |
855 | msg = None |
|
855 | msg = None | |
856 | if not results: |
|
856 | if not results: | |
857 | msg = _('server ignored update of %s to public!\n') % node |
|
857 | msg = _('server ignored update of %s to public!\n') % node | |
858 | elif not int(results[0]['return']): |
|
858 | elif not int(results[0]['return']): | |
859 | msg = _('updating %s to public failed!\n') % node |
|
859 | msg = _('updating %s to public failed!\n') % node | |
860 | if msg is not None: |
|
860 | if msg is not None: | |
861 | pushop.ui.warn(msg) |
|
861 | pushop.ui.warn(msg) | |
862 | return handlereply |
|
862 | return handlereply | |
863 |
|
863 | |||
864 | @b2partsgenerator('obsmarkers') |
|
864 | @b2partsgenerator('obsmarkers') | |
865 | def _pushb2obsmarkers(pushop, bundler): |
|
865 | def _pushb2obsmarkers(pushop, bundler): | |
866 | if 'obsmarkers' in pushop.stepsdone: |
|
866 | if 'obsmarkers' in pushop.stepsdone: | |
867 | return |
|
867 | return | |
868 | remoteversions = bundle2.obsmarkersversion(bundler.capabilities) |
|
868 | remoteversions = bundle2.obsmarkersversion(bundler.capabilities) | |
869 | if obsolete.commonversion(remoteversions) is None: |
|
869 | if obsolete.commonversion(remoteversions) is None: | |
870 | return |
|
870 | return | |
871 | pushop.stepsdone.add('obsmarkers') |
|
871 | pushop.stepsdone.add('obsmarkers') | |
872 | if pushop.outobsmarkers: |
|
872 | if pushop.outobsmarkers: | |
873 | markers = sorted(pushop.outobsmarkers) |
|
873 | markers = sorted(pushop.outobsmarkers) | |
874 | bundle2.buildobsmarkerspart(bundler, markers) |
|
874 | bundle2.buildobsmarkerspart(bundler, markers) | |
875 |
|
875 | |||
876 | @b2partsgenerator('bookmarks') |
|
876 | @b2partsgenerator('bookmarks') | |
877 | def _pushb2bookmarks(pushop, bundler): |
|
877 | def _pushb2bookmarks(pushop, bundler): | |
878 | """handle bookmark push through bundle2""" |
|
878 | """handle bookmark push through bundle2""" | |
879 | if 'bookmarks' in pushop.stepsdone: |
|
879 | if 'bookmarks' in pushop.stepsdone: | |
880 | return |
|
880 | return | |
881 | b2caps = bundle2.bundle2caps(pushop.remote) |
|
881 | b2caps = bundle2.bundle2caps(pushop.remote) | |
882 | if 'pushkey' not in b2caps: |
|
882 | if 'pushkey' not in b2caps: | |
883 | return |
|
883 | return | |
884 | pushop.stepsdone.add('bookmarks') |
|
884 | pushop.stepsdone.add('bookmarks') | |
885 | part2book = [] |
|
885 | part2book = [] | |
886 | enc = pushkey.encode |
|
886 | enc = pushkey.encode | |
887 |
|
887 | |||
888 | def handlefailure(pushop, exc): |
|
888 | def handlefailure(pushop, exc): | |
889 | targetid = int(exc.partid) |
|
889 | targetid = int(exc.partid) | |
890 | for partid, book, action in part2book: |
|
890 | for partid, book, action in part2book: | |
891 | if partid == targetid: |
|
891 | if partid == targetid: | |
892 | raise error.Abort(bookmsgmap[action][1].rstrip() % book) |
|
892 | raise error.Abort(bookmsgmap[action][1].rstrip() % book) | |
893 | # we should not be called for part we did not generated |
|
893 | # we should not be called for part we did not generated | |
894 | assert False |
|
894 | assert False | |
895 |
|
895 | |||
896 | for book, old, new in pushop.outbookmarks: |
|
896 | for book, old, new in pushop.outbookmarks: | |
897 | part = bundler.newpart('pushkey') |
|
897 | part = bundler.newpart('pushkey') | |
898 | part.addparam('namespace', enc('bookmarks')) |
|
898 | part.addparam('namespace', enc('bookmarks')) | |
899 | part.addparam('key', enc(book)) |
|
899 | part.addparam('key', enc(book)) | |
900 | part.addparam('old', enc(old)) |
|
900 | part.addparam('old', enc(old)) | |
901 | part.addparam('new', enc(new)) |
|
901 | part.addparam('new', enc(new)) | |
902 | action = 'update' |
|
902 | action = 'update' | |
903 | if not old: |
|
903 | if not old: | |
904 | action = 'export' |
|
904 | action = 'export' | |
905 | elif not new: |
|
905 | elif not new: | |
906 | action = 'delete' |
|
906 | action = 'delete' | |
907 | part2book.append((part.id, book, action)) |
|
907 | part2book.append((part.id, book, action)) | |
908 | pushop.pkfailcb[part.id] = handlefailure |
|
908 | pushop.pkfailcb[part.id] = handlefailure | |
909 |
|
909 | |||
910 | def handlereply(op): |
|
910 | def handlereply(op): | |
911 | ui = pushop.ui |
|
911 | ui = pushop.ui | |
912 | for partid, book, action in part2book: |
|
912 | for partid, book, action in part2book: | |
913 | partrep = op.records.getreplies(partid) |
|
913 | partrep = op.records.getreplies(partid) | |
914 | results = partrep['pushkey'] |
|
914 | results = partrep['pushkey'] | |
915 | assert len(results) <= 1 |
|
915 | assert len(results) <= 1 | |
916 | if not results: |
|
916 | if not results: | |
917 | pushop.ui.warn(_('server ignored bookmark %s update\n') % book) |
|
917 | pushop.ui.warn(_('server ignored bookmark %s update\n') % book) | |
918 | else: |
|
918 | else: | |
919 | ret = int(results[0]['return']) |
|
919 | ret = int(results[0]['return']) | |
920 | if ret: |
|
920 | if ret: | |
921 | ui.status(bookmsgmap[action][0] % book) |
|
921 | ui.status(bookmsgmap[action][0] % book) | |
922 | else: |
|
922 | else: | |
923 | ui.warn(bookmsgmap[action][1] % book) |
|
923 | ui.warn(bookmsgmap[action][1] % book) | |
924 | if pushop.bkresult is not None: |
|
924 | if pushop.bkresult is not None: | |
925 | pushop.bkresult = 1 |
|
925 | pushop.bkresult = 1 | |
926 | return handlereply |
|
926 | return handlereply | |
927 |
|
927 | |||
928 | @b2partsgenerator('pushvars', idx=0) |
|
928 | @b2partsgenerator('pushvars', idx=0) | |
929 | def _getbundlesendvars(pushop, bundler): |
|
929 | def _getbundlesendvars(pushop, bundler): | |
930 | '''send shellvars via bundle2''' |
|
930 | '''send shellvars via bundle2''' | |
931 | pushvars = pushop.pushvars |
|
931 | pushvars = pushop.pushvars | |
932 | if pushvars: |
|
932 | if pushvars: | |
933 | shellvars = {} |
|
933 | shellvars = {} | |
934 | for raw in pushvars: |
|
934 | for raw in pushvars: | |
935 | if '=' not in raw: |
|
935 | if '=' not in raw: | |
936 | msg = ("unable to parse variable '%s', should follow " |
|
936 | msg = ("unable to parse variable '%s', should follow " | |
937 | "'KEY=VALUE' or 'KEY=' format") |
|
937 | "'KEY=VALUE' or 'KEY=' format") | |
938 | raise error.Abort(msg % raw) |
|
938 | raise error.Abort(msg % raw) | |
939 | k, v = raw.split('=', 1) |
|
939 | k, v = raw.split('=', 1) | |
940 | shellvars[k] = v |
|
940 | shellvars[k] = v | |
941 |
|
941 | |||
942 | part = bundler.newpart('pushvars') |
|
942 | part = bundler.newpart('pushvars') | |
943 |
|
943 | |||
944 | for key, value in shellvars.iteritems(): |
|
944 | for key, value in shellvars.iteritems(): | |
945 | part.addparam(key, value, mandatory=False) |
|
945 | part.addparam(key, value, mandatory=False) | |
946 |
|
946 | |||
947 | def _pushbundle2(pushop): |
|
947 | def _pushbundle2(pushop): | |
948 | """push data to the remote using bundle2 |
|
948 | """push data to the remote using bundle2 | |
949 |
|
949 | |||
950 | The only currently supported type of data is changegroup but this will |
|
950 | The only currently supported type of data is changegroup but this will | |
951 | evolve in the future.""" |
|
951 | evolve in the future.""" | |
952 | bundler = bundle2.bundle20(pushop.ui, bundle2.bundle2caps(pushop.remote)) |
|
952 | bundler = bundle2.bundle20(pushop.ui, bundle2.bundle2caps(pushop.remote)) | |
953 | pushback = (pushop.trmanager |
|
953 | pushback = (pushop.trmanager | |
954 | and pushop.ui.configbool('experimental', 'bundle2.pushback')) |
|
954 | and pushop.ui.configbool('experimental', 'bundle2.pushback')) | |
955 |
|
955 | |||
956 | # create reply capability |
|
956 | # create reply capability | |
957 | capsblob = bundle2.encodecaps(bundle2.getrepocaps(pushop.repo, |
|
957 | capsblob = bundle2.encodecaps(bundle2.getrepocaps(pushop.repo, | |
958 | allowpushback=pushback)) |
|
958 | allowpushback=pushback)) | |
959 | bundler.newpart('replycaps', data=capsblob) |
|
959 | bundler.newpart('replycaps', data=capsblob) | |
960 | replyhandlers = [] |
|
960 | replyhandlers = [] | |
961 | for partgenname in b2partsgenorder: |
|
961 | for partgenname in b2partsgenorder: | |
962 | partgen = b2partsgenmapping[partgenname] |
|
962 | partgen = b2partsgenmapping[partgenname] | |
963 | ret = partgen(pushop, bundler) |
|
963 | ret = partgen(pushop, bundler) | |
964 | if callable(ret): |
|
964 | if callable(ret): | |
965 | replyhandlers.append(ret) |
|
965 | replyhandlers.append(ret) | |
966 | # do not push if nothing to push |
|
966 | # do not push if nothing to push | |
967 | if bundler.nbparts <= 1: |
|
967 | if bundler.nbparts <= 1: | |
968 | return |
|
968 | return | |
969 | stream = util.chunkbuffer(bundler.getchunks()) |
|
969 | stream = util.chunkbuffer(bundler.getchunks()) | |
970 | try: |
|
970 | try: | |
971 | try: |
|
971 | try: | |
972 | reply = pushop.remote.unbundle( |
|
972 | reply = pushop.remote.unbundle( | |
973 | stream, ['force'], pushop.remote.url()) |
|
973 | stream, ['force'], pushop.remote.url()) | |
974 | except error.BundleValueError as exc: |
|
974 | except error.BundleValueError as exc: | |
975 | raise error.Abort(_('missing support for %s') % exc) |
|
975 | raise error.Abort(_('missing support for %s') % exc) | |
976 | try: |
|
976 | try: | |
977 | trgetter = None |
|
977 | trgetter = None | |
978 | if pushback: |
|
978 | if pushback: | |
979 | trgetter = pushop.trmanager.transaction |
|
979 | trgetter = pushop.trmanager.transaction | |
980 | op = bundle2.processbundle(pushop.repo, reply, trgetter) |
|
980 | op = bundle2.processbundle(pushop.repo, reply, trgetter) | |
981 | except error.BundleValueError as exc: |
|
981 | except error.BundleValueError as exc: | |
982 | raise error.Abort(_('missing support for %s') % exc) |
|
982 | raise error.Abort(_('missing support for %s') % exc) | |
983 | except bundle2.AbortFromPart as exc: |
|
983 | except bundle2.AbortFromPart as exc: | |
984 | pushop.ui.status(_('remote: %s\n') % exc) |
|
984 | pushop.ui.status(_('remote: %s\n') % exc) | |
985 | if exc.hint is not None: |
|
985 | if exc.hint is not None: | |
986 | pushop.ui.status(_('remote: %s\n') % ('(%s)' % exc.hint)) |
|
986 | pushop.ui.status(_('remote: %s\n') % ('(%s)' % exc.hint)) | |
987 | raise error.Abort(_('push failed on remote')) |
|
987 | raise error.Abort(_('push failed on remote')) | |
988 | except error.PushkeyFailed as exc: |
|
988 | except error.PushkeyFailed as exc: | |
989 | partid = int(exc.partid) |
|
989 | partid = int(exc.partid) | |
990 | if partid not in pushop.pkfailcb: |
|
990 | if partid not in pushop.pkfailcb: | |
991 | raise |
|
991 | raise | |
992 | pushop.pkfailcb[partid](pushop, exc) |
|
992 | pushop.pkfailcb[partid](pushop, exc) | |
993 | for rephand in replyhandlers: |
|
993 | for rephand in replyhandlers: | |
994 | rephand(op) |
|
994 | rephand(op) | |
995 |
|
995 | |||
996 | def _pushchangeset(pushop): |
|
996 | def _pushchangeset(pushop): | |
997 | """Make the actual push of changeset bundle to remote repo""" |
|
997 | """Make the actual push of changeset bundle to remote repo""" | |
998 | if 'changesets' in pushop.stepsdone: |
|
998 | if 'changesets' in pushop.stepsdone: | |
999 | return |
|
999 | return | |
1000 | pushop.stepsdone.add('changesets') |
|
1000 | pushop.stepsdone.add('changesets') | |
1001 | if not _pushcheckoutgoing(pushop): |
|
1001 | if not _pushcheckoutgoing(pushop): | |
1002 | return |
|
1002 | return | |
1003 |
|
1003 | |||
1004 | # Should have verified this in push(). |
|
1004 | # Should have verified this in push(). | |
1005 | assert pushop.remote.capable('unbundle') |
|
1005 | assert pushop.remote.capable('unbundle') | |
1006 |
|
1006 | |||
1007 | pushop.repo.prepushoutgoinghooks(pushop) |
|
1007 | pushop.repo.prepushoutgoinghooks(pushop) | |
1008 | outgoing = pushop.outgoing |
|
1008 | outgoing = pushop.outgoing | |
1009 | # TODO: get bundlecaps from remote |
|
1009 | # TODO: get bundlecaps from remote | |
1010 | bundlecaps = None |
|
1010 | bundlecaps = None | |
1011 | # create a changegroup from local |
|
1011 | # create a changegroup from local | |
1012 | if pushop.revs is None and not (outgoing.excluded |
|
1012 | if pushop.revs is None and not (outgoing.excluded | |
1013 | or pushop.repo.changelog.filteredrevs): |
|
1013 | or pushop.repo.changelog.filteredrevs): | |
1014 | # push everything, |
|
1014 | # push everything, | |
1015 | # use the fast path, no race possible on push |
|
1015 | # use the fast path, no race possible on push | |
1016 | cg = changegroup.makechangegroup(pushop.repo, outgoing, '01', 'push', |
|
1016 | cg = changegroup.makechangegroup(pushop.repo, outgoing, '01', 'push', | |
1017 | fastpath=True, bundlecaps=bundlecaps) |
|
1017 | fastpath=True, bundlecaps=bundlecaps) | |
1018 | else: |
|
1018 | else: | |
1019 | cg = changegroup.makechangegroup(pushop.repo, outgoing, '01', |
|
1019 | cg = changegroup.makechangegroup(pushop.repo, outgoing, '01', | |
1020 | 'push', bundlecaps=bundlecaps) |
|
1020 | 'push', bundlecaps=bundlecaps) | |
1021 |
|
1021 | |||
1022 | # apply changegroup to remote |
|
1022 | # apply changegroup to remote | |
1023 | # local repo finds heads on server, finds out what |
|
1023 | # local repo finds heads on server, finds out what | |
1024 | # revs it must push. once revs transferred, if server |
|
1024 | # revs it must push. once revs transferred, if server | |
1025 | # finds it has different heads (someone else won |
|
1025 | # finds it has different heads (someone else won | |
1026 | # commit/push race), server aborts. |
|
1026 | # commit/push race), server aborts. | |
1027 | if pushop.force: |
|
1027 | if pushop.force: | |
1028 | remoteheads = ['force'] |
|
1028 | remoteheads = ['force'] | |
1029 | else: |
|
1029 | else: | |
1030 | remoteheads = pushop.remoteheads |
|
1030 | remoteheads = pushop.remoteheads | |
1031 | # ssh: return remote's addchangegroup() |
|
1031 | # ssh: return remote's addchangegroup() | |
1032 | # http: return remote's addchangegroup() or 0 for error |
|
1032 | # http: return remote's addchangegroup() or 0 for error | |
1033 | pushop.cgresult = pushop.remote.unbundle(cg, remoteheads, |
|
1033 | pushop.cgresult = pushop.remote.unbundle(cg, remoteheads, | |
1034 | pushop.repo.url()) |
|
1034 | pushop.repo.url()) | |
1035 |
|
1035 | |||
1036 | def _pushsyncphase(pushop): |
|
1036 | def _pushsyncphase(pushop): | |
1037 | """synchronise phase information locally and remotely""" |
|
1037 | """synchronise phase information locally and remotely""" | |
1038 | cheads = pushop.commonheads |
|
1038 | cheads = pushop.commonheads | |
1039 | # even when we don't push, exchanging phase data is useful |
|
1039 | # even when we don't push, exchanging phase data is useful | |
1040 | remotephases = pushop.remote.listkeys('phases') |
|
1040 | remotephases = pushop.remote.listkeys('phases') | |
1041 | if (pushop.ui.configbool('ui', '_usedassubrepo') |
|
1041 | if (pushop.ui.configbool('ui', '_usedassubrepo') | |
1042 | and remotephases # server supports phases |
|
1042 | and remotephases # server supports phases | |
1043 | and pushop.cgresult is None # nothing was pushed |
|
1043 | and pushop.cgresult is None # nothing was pushed | |
1044 | and remotephases.get('publishing', False)): |
|
1044 | and remotephases.get('publishing', False)): | |
1045 | # When: |
|
1045 | # When: | |
1046 | # - this is a subrepo push |
|
1046 | # - this is a subrepo push | |
1047 | # - and remote support phase |
|
1047 | # - and remote support phase | |
1048 | # - and no changeset was pushed |
|
1048 | # - and no changeset was pushed | |
1049 | # - and remote is publishing |
|
1049 | # - and remote is publishing | |
1050 | # We may be in issue 3871 case! |
|
1050 | # We may be in issue 3871 case! | |
1051 | # We drop the possible phase synchronisation done by |
|
1051 | # We drop the possible phase synchronisation done by | |
1052 | # courtesy to publish changesets possibly locally draft |
|
1052 | # courtesy to publish changesets possibly locally draft | |
1053 | # on the remote. |
|
1053 | # on the remote. | |
1054 | remotephases = {'publishing': 'True'} |
|
1054 | remotephases = {'publishing': 'True'} | |
1055 | if not remotephases: # old server or public only reply from non-publishing |
|
1055 | if not remotephases: # old server or public only reply from non-publishing | |
1056 | _localphasemove(pushop, cheads) |
|
1056 | _localphasemove(pushop, cheads) | |
1057 | # don't push any phase data as there is nothing to push |
|
1057 | # don't push any phase data as there is nothing to push | |
1058 | else: |
|
1058 | else: | |
1059 | ana = phases.analyzeremotephases(pushop.repo, cheads, |
|
1059 | ana = phases.analyzeremotephases(pushop.repo, cheads, | |
1060 | remotephases) |
|
1060 | remotephases) | |
1061 | pheads, droots = ana |
|
1061 | pheads, droots = ana | |
1062 | ### Apply remote phase on local |
|
1062 | ### Apply remote phase on local | |
1063 | if remotephases.get('publishing', False): |
|
1063 | if remotephases.get('publishing', False): | |
1064 | _localphasemove(pushop, cheads) |
|
1064 | _localphasemove(pushop, cheads) | |
1065 | else: # publish = False |
|
1065 | else: # publish = False | |
1066 | _localphasemove(pushop, pheads) |
|
1066 | _localphasemove(pushop, pheads) | |
1067 | _localphasemove(pushop, cheads, phases.draft) |
|
1067 | _localphasemove(pushop, cheads, phases.draft) | |
1068 | ### Apply local phase on remote |
|
1068 | ### Apply local phase on remote | |
1069 |
|
1069 | |||
1070 | if pushop.cgresult: |
|
1070 | if pushop.cgresult: | |
1071 | if 'phases' in pushop.stepsdone: |
|
1071 | if 'phases' in pushop.stepsdone: | |
1072 | # phases already pushed though bundle2 |
|
1072 | # phases already pushed though bundle2 | |
1073 | return |
|
1073 | return | |
1074 | outdated = pushop.outdatedphases |
|
1074 | outdated = pushop.outdatedphases | |
1075 | else: |
|
1075 | else: | |
1076 | outdated = pushop.fallbackoutdatedphases |
|
1076 | outdated = pushop.fallbackoutdatedphases | |
1077 |
|
1077 | |||
1078 | pushop.stepsdone.add('phases') |
|
1078 | pushop.stepsdone.add('phases') | |
1079 |
|
1079 | |||
1080 | # filter heads already turned public by the push |
|
1080 | # filter heads already turned public by the push | |
1081 | outdated = [c for c in outdated if c.node() not in pheads] |
|
1081 | outdated = [c for c in outdated if c.node() not in pheads] | |
1082 | # fallback to independent pushkey command |
|
1082 | # fallback to independent pushkey command | |
1083 | for newremotehead in outdated: |
|
1083 | for newremotehead in outdated: | |
1084 | r = pushop.remote.pushkey('phases', |
|
1084 | r = pushop.remote.pushkey('phases', | |
1085 | newremotehead.hex(), |
|
1085 | newremotehead.hex(), | |
1086 | str(phases.draft), |
|
1086 | str(phases.draft), | |
1087 | str(phases.public)) |
|
1087 | str(phases.public)) | |
1088 | if not r: |
|
1088 | if not r: | |
1089 | pushop.ui.warn(_('updating %s to public failed!\n') |
|
1089 | pushop.ui.warn(_('updating %s to public failed!\n') | |
1090 | % newremotehead) |
|
1090 | % newremotehead) | |
1091 |
|
1091 | |||
1092 | def _localphasemove(pushop, nodes, phase=phases.public): |
|
1092 | def _localphasemove(pushop, nodes, phase=phases.public): | |
1093 | """move <nodes> to <phase> in the local source repo""" |
|
1093 | """move <nodes> to <phase> in the local source repo""" | |
1094 | if pushop.trmanager: |
|
1094 | if pushop.trmanager: | |
1095 | phases.advanceboundary(pushop.repo, |
|
1095 | phases.advanceboundary(pushop.repo, | |
1096 | pushop.trmanager.transaction(), |
|
1096 | pushop.trmanager.transaction(), | |
1097 | phase, |
|
1097 | phase, | |
1098 | nodes) |
|
1098 | nodes) | |
1099 | else: |
|
1099 | else: | |
1100 | # repo is not locked, do not change any phases! |
|
1100 | # repo is not locked, do not change any phases! | |
1101 | # Informs the user that phases should have been moved when |
|
1101 | # Informs the user that phases should have been moved when | |
1102 | # applicable. |
|
1102 | # applicable. | |
1103 | actualmoves = [n for n in nodes if phase < pushop.repo[n].phase()] |
|
1103 | actualmoves = [n for n in nodes if phase < pushop.repo[n].phase()] | |
1104 | phasestr = phases.phasenames[phase] |
|
1104 | phasestr = phases.phasenames[phase] | |
1105 | if actualmoves: |
|
1105 | if actualmoves: | |
1106 | pushop.ui.status(_('cannot lock source repo, skipping ' |
|
1106 | pushop.ui.status(_('cannot lock source repo, skipping ' | |
1107 | 'local %s phase update\n') % phasestr) |
|
1107 | 'local %s phase update\n') % phasestr) | |
1108 |
|
1108 | |||
1109 | def _pushobsolete(pushop): |
|
1109 | def _pushobsolete(pushop): | |
1110 | """utility function to push obsolete markers to a remote""" |
|
1110 | """utility function to push obsolete markers to a remote""" | |
1111 | if 'obsmarkers' in pushop.stepsdone: |
|
1111 | if 'obsmarkers' in pushop.stepsdone: | |
1112 | return |
|
1112 | return | |
1113 | repo = pushop.repo |
|
1113 | repo = pushop.repo | |
1114 | remote = pushop.remote |
|
1114 | remote = pushop.remote | |
1115 | pushop.stepsdone.add('obsmarkers') |
|
1115 | pushop.stepsdone.add('obsmarkers') | |
1116 | if pushop.outobsmarkers: |
|
1116 | if pushop.outobsmarkers: | |
1117 | pushop.ui.debug('try to push obsolete markers to remote\n') |
|
1117 | pushop.ui.debug('try to push obsolete markers to remote\n') | |
1118 | rslts = [] |
|
1118 | rslts = [] | |
1119 | remotedata = obsolete._pushkeyescape(sorted(pushop.outobsmarkers)) |
|
1119 | remotedata = obsolete._pushkeyescape(sorted(pushop.outobsmarkers)) | |
1120 | for key in sorted(remotedata, reverse=True): |
|
1120 | for key in sorted(remotedata, reverse=True): | |
1121 | # reverse sort to ensure we end with dump0 |
|
1121 | # reverse sort to ensure we end with dump0 | |
1122 | data = remotedata[key] |
|
1122 | data = remotedata[key] | |
1123 | rslts.append(remote.pushkey('obsolete', key, '', data)) |
|
1123 | rslts.append(remote.pushkey('obsolete', key, '', data)) | |
1124 | if [r for r in rslts if not r]: |
|
1124 | if [r for r in rslts if not r]: | |
1125 | msg = _('failed to push some obsolete markers!\n') |
|
1125 | msg = _('failed to push some obsolete markers!\n') | |
1126 | repo.ui.warn(msg) |
|
1126 | repo.ui.warn(msg) | |
1127 |
|
1127 | |||
1128 | def _pushbookmark(pushop): |
|
1128 | def _pushbookmark(pushop): | |
1129 | """Update bookmark position on remote""" |
|
1129 | """Update bookmark position on remote""" | |
1130 | if pushop.cgresult == 0 or 'bookmarks' in pushop.stepsdone: |
|
1130 | if pushop.cgresult == 0 or 'bookmarks' in pushop.stepsdone: | |
1131 | return |
|
1131 | return | |
1132 | pushop.stepsdone.add('bookmarks') |
|
1132 | pushop.stepsdone.add('bookmarks') | |
1133 | ui = pushop.ui |
|
1133 | ui = pushop.ui | |
1134 | remote = pushop.remote |
|
1134 | remote = pushop.remote | |
1135 |
|
1135 | |||
1136 | for b, old, new in pushop.outbookmarks: |
|
1136 | for b, old, new in pushop.outbookmarks: | |
1137 | action = 'update' |
|
1137 | action = 'update' | |
1138 | if not old: |
|
1138 | if not old: | |
1139 | action = 'export' |
|
1139 | action = 'export' | |
1140 | elif not new: |
|
1140 | elif not new: | |
1141 | action = 'delete' |
|
1141 | action = 'delete' | |
1142 | if remote.pushkey('bookmarks', b, old, new): |
|
1142 | if remote.pushkey('bookmarks', b, old, new): | |
1143 | ui.status(bookmsgmap[action][0] % b) |
|
1143 | ui.status(bookmsgmap[action][0] % b) | |
1144 | else: |
|
1144 | else: | |
1145 | ui.warn(bookmsgmap[action][1] % b) |
|
1145 | ui.warn(bookmsgmap[action][1] % b) | |
1146 | # discovery can have set the value form invalid entry |
|
1146 | # discovery can have set the value form invalid entry | |
1147 | if pushop.bkresult is not None: |
|
1147 | if pushop.bkresult is not None: | |
1148 | pushop.bkresult = 1 |
|
1148 | pushop.bkresult = 1 | |
1149 |
|
1149 | |||
1150 | class pulloperation(object): |
|
1150 | class pulloperation(object): | |
1151 | """A object that represent a single pull operation |
|
1151 | """A object that represent a single pull operation | |
1152 |
|
1152 | |||
1153 | It purpose is to carry pull related state and very common operation. |
|
1153 | It purpose is to carry pull related state and very common operation. | |
1154 |
|
1154 | |||
1155 | A new should be created at the beginning of each pull and discarded |
|
1155 | A new should be created at the beginning of each pull and discarded | |
1156 | afterward. |
|
1156 | afterward. | |
1157 | """ |
|
1157 | """ | |
1158 |
|
1158 | |||
1159 | def __init__(self, repo, remote, heads=None, force=False, bookmarks=(), |
|
1159 | def __init__(self, repo, remote, heads=None, force=False, bookmarks=(), | |
1160 | remotebookmarks=None, streamclonerequested=None): |
|
1160 | remotebookmarks=None, streamclonerequested=None): | |
1161 | # repo we pull into |
|
1161 | # repo we pull into | |
1162 | self.repo = repo |
|
1162 | self.repo = repo | |
1163 | # repo we pull from |
|
1163 | # repo we pull from | |
1164 | self.remote = remote |
|
1164 | self.remote = remote | |
1165 | # revision we try to pull (None is "all") |
|
1165 | # revision we try to pull (None is "all") | |
1166 | self.heads = heads |
|
1166 | self.heads = heads | |
1167 | # bookmark pulled explicitly |
|
1167 | # bookmark pulled explicitly | |
1168 | self.explicitbookmarks = [repo._bookmarks.expandname(bookmark) |
|
1168 | self.explicitbookmarks = [repo._bookmarks.expandname(bookmark) | |
1169 | for bookmark in bookmarks] |
|
1169 | for bookmark in bookmarks] | |
1170 | # do we force pull? |
|
1170 | # do we force pull? | |
1171 | self.force = force |
|
1171 | self.force = force | |
1172 | # whether a streaming clone was requested |
|
1172 | # whether a streaming clone was requested | |
1173 | self.streamclonerequested = streamclonerequested |
|
1173 | self.streamclonerequested = streamclonerequested | |
1174 | # transaction manager |
|
1174 | # transaction manager | |
1175 | self.trmanager = None |
|
1175 | self.trmanager = None | |
1176 | # set of common changeset between local and remote before pull |
|
1176 | # set of common changeset between local and remote before pull | |
1177 | self.common = None |
|
1177 | self.common = None | |
1178 | # set of pulled head |
|
1178 | # set of pulled head | |
1179 | self.rheads = None |
|
1179 | self.rheads = None | |
1180 | # list of missing changeset to fetch remotely |
|
1180 | # list of missing changeset to fetch remotely | |
1181 | self.fetch = None |
|
1181 | self.fetch = None | |
1182 | # remote bookmarks data |
|
1182 | # remote bookmarks data | |
1183 | self.remotebookmarks = remotebookmarks |
|
1183 | self.remotebookmarks = remotebookmarks | |
1184 | # result of changegroup pulling (used as return code by pull) |
|
1184 | # result of changegroup pulling (used as return code by pull) | |
1185 | self.cgresult = None |
|
1185 | self.cgresult = None | |
1186 | # list of step already done |
|
1186 | # list of step already done | |
1187 | self.stepsdone = set() |
|
1187 | self.stepsdone = set() | |
1188 | # Whether we attempted a clone from pre-generated bundles. |
|
1188 | # Whether we attempted a clone from pre-generated bundles. | |
1189 | self.clonebundleattempted = False |
|
1189 | self.clonebundleattempted = False | |
1190 |
|
1190 | |||
1191 | @util.propertycache |
|
1191 | @util.propertycache | |
1192 | def pulledsubset(self): |
|
1192 | def pulledsubset(self): | |
1193 | """heads of the set of changeset target by the pull""" |
|
1193 | """heads of the set of changeset target by the pull""" | |
1194 | # compute target subset |
|
1194 | # compute target subset | |
1195 | if self.heads is None: |
|
1195 | if self.heads is None: | |
1196 | # We pulled every thing possible |
|
1196 | # We pulled every thing possible | |
1197 | # sync on everything common |
|
1197 | # sync on everything common | |
1198 | c = set(self.common) |
|
1198 | c = set(self.common) | |
1199 | ret = list(self.common) |
|
1199 | ret = list(self.common) | |
1200 | for n in self.rheads: |
|
1200 | for n in self.rheads: | |
1201 | if n not in c: |
|
1201 | if n not in c: | |
1202 | ret.append(n) |
|
1202 | ret.append(n) | |
1203 | return ret |
|
1203 | return ret | |
1204 | else: |
|
1204 | else: | |
1205 | # We pulled a specific subset |
|
1205 | # We pulled a specific subset | |
1206 | # sync on this subset |
|
1206 | # sync on this subset | |
1207 | return self.heads |
|
1207 | return self.heads | |
1208 |
|
1208 | |||
1209 | @util.propertycache |
|
1209 | @util.propertycache | |
1210 | def canusebundle2(self): |
|
1210 | def canusebundle2(self): | |
1211 | return not _forcebundle1(self) |
|
1211 | return not _forcebundle1(self) | |
1212 |
|
1212 | |||
1213 | @util.propertycache |
|
1213 | @util.propertycache | |
1214 | def remotebundle2caps(self): |
|
1214 | def remotebundle2caps(self): | |
1215 | return bundle2.bundle2caps(self.remote) |
|
1215 | return bundle2.bundle2caps(self.remote) | |
1216 |
|
1216 | |||
1217 | def gettransaction(self): |
|
1217 | def gettransaction(self): | |
1218 | # deprecated; talk to trmanager directly |
|
1218 | # deprecated; talk to trmanager directly | |
1219 | return self.trmanager.transaction() |
|
1219 | return self.trmanager.transaction() | |
1220 |
|
1220 | |||
1221 | class transactionmanager(util.transactional): |
|
1221 | class transactionmanager(util.transactional): | |
1222 | """An object to manage the life cycle of a transaction |
|
1222 | """An object to manage the life cycle of a transaction | |
1223 |
|
1223 | |||
1224 | It creates the transaction on demand and calls the appropriate hooks when |
|
1224 | It creates the transaction on demand and calls the appropriate hooks when | |
1225 | closing the transaction.""" |
|
1225 | closing the transaction.""" | |
1226 | def __init__(self, repo, source, url): |
|
1226 | def __init__(self, repo, source, url): | |
1227 | self.repo = repo |
|
1227 | self.repo = repo | |
1228 | self.source = source |
|
1228 | self.source = source | |
1229 | self.url = url |
|
1229 | self.url = url | |
1230 | self._tr = None |
|
1230 | self._tr = None | |
1231 |
|
1231 | |||
1232 | def transaction(self): |
|
1232 | def transaction(self): | |
1233 | """Return an open transaction object, constructing if necessary""" |
|
1233 | """Return an open transaction object, constructing if necessary""" | |
1234 | if not self._tr: |
|
1234 | if not self._tr: | |
1235 | trname = '%s\n%s' % (self.source, util.hidepassword(self.url)) |
|
1235 | trname = '%s\n%s' % (self.source, util.hidepassword(self.url)) | |
1236 | self._tr = self.repo.transaction(trname) |
|
1236 | self._tr = self.repo.transaction(trname) | |
1237 | self._tr.hookargs['source'] = self.source |
|
1237 | self._tr.hookargs['source'] = self.source | |
1238 | self._tr.hookargs['url'] = self.url |
|
1238 | self._tr.hookargs['url'] = self.url | |
1239 | return self._tr |
|
1239 | return self._tr | |
1240 |
|
1240 | |||
1241 | def close(self): |
|
1241 | def close(self): | |
1242 | """close transaction if created""" |
|
1242 | """close transaction if created""" | |
1243 | if self._tr is not None: |
|
1243 | if self._tr is not None: | |
1244 | self._tr.close() |
|
1244 | self._tr.close() | |
1245 |
|
1245 | |||
1246 | def release(self): |
|
1246 | def release(self): | |
1247 | """release transaction if created""" |
|
1247 | """release transaction if created""" | |
1248 | if self._tr is not None: |
|
1248 | if self._tr is not None: | |
1249 | self._tr.release() |
|
1249 | self._tr.release() | |
1250 |
|
1250 | |||
1251 | def pull(repo, remote, heads=None, force=False, bookmarks=(), opargs=None, |
|
1251 | def pull(repo, remote, heads=None, force=False, bookmarks=(), opargs=None, | |
1252 | streamclonerequested=None): |
|
1252 | streamclonerequested=None): | |
1253 | """Fetch repository data from a remote. |
|
1253 | """Fetch repository data from a remote. | |
1254 |
|
1254 | |||
1255 | This is the main function used to retrieve data from a remote repository. |
|
1255 | This is the main function used to retrieve data from a remote repository. | |
1256 |
|
1256 | |||
1257 | ``repo`` is the local repository to clone into. |
|
1257 | ``repo`` is the local repository to clone into. | |
1258 | ``remote`` is a peer instance. |
|
1258 | ``remote`` is a peer instance. | |
1259 | ``heads`` is an iterable of revisions we want to pull. ``None`` (the |
|
1259 | ``heads`` is an iterable of revisions we want to pull. ``None`` (the | |
1260 | default) means to pull everything from the remote. |
|
1260 | default) means to pull everything from the remote. | |
1261 | ``bookmarks`` is an iterable of bookmarks requesting to be pulled. By |
|
1261 | ``bookmarks`` is an iterable of bookmarks requesting to be pulled. By | |
1262 | default, all remote bookmarks are pulled. |
|
1262 | default, all remote bookmarks are pulled. | |
1263 | ``opargs`` are additional keyword arguments to pass to ``pulloperation`` |
|
1263 | ``opargs`` are additional keyword arguments to pass to ``pulloperation`` | |
1264 | initialization. |
|
1264 | initialization. | |
1265 | ``streamclonerequested`` is a boolean indicating whether a "streaming |
|
1265 | ``streamclonerequested`` is a boolean indicating whether a "streaming | |
1266 | clone" is requested. A "streaming clone" is essentially a raw file copy |
|
1266 | clone" is requested. A "streaming clone" is essentially a raw file copy | |
1267 | of revlogs from the server. This only works when the local repository is |
|
1267 | of revlogs from the server. This only works when the local repository is | |
1268 | empty. The default value of ``None`` means to respect the server |
|
1268 | empty. The default value of ``None`` means to respect the server | |
1269 | configuration for preferring stream clones. |
|
1269 | configuration for preferring stream clones. | |
1270 |
|
1270 | |||
1271 | Returns the ``pulloperation`` created for this pull. |
|
1271 | Returns the ``pulloperation`` created for this pull. | |
1272 | """ |
|
1272 | """ | |
1273 | if opargs is None: |
|
1273 | if opargs is None: | |
1274 | opargs = {} |
|
1274 | opargs = {} | |
1275 | pullop = pulloperation(repo, remote, heads, force, bookmarks=bookmarks, |
|
1275 | pullop = pulloperation(repo, remote, heads, force, bookmarks=bookmarks, | |
1276 | streamclonerequested=streamclonerequested, **opargs) |
|
1276 | streamclonerequested=streamclonerequested, **opargs) | |
1277 |
|
1277 | |||
1278 | peerlocal = pullop.remote.local() |
|
1278 | peerlocal = pullop.remote.local() | |
1279 | if peerlocal: |
|
1279 | if peerlocal: | |
1280 | missing = set(peerlocal.requirements) - pullop.repo.supported |
|
1280 | missing = set(peerlocal.requirements) - pullop.repo.supported | |
1281 | if missing: |
|
1281 | if missing: | |
1282 | msg = _("required features are not" |
|
1282 | msg = _("required features are not" | |
1283 | " supported in the destination:" |
|
1283 | " supported in the destination:" | |
1284 | " %s") % (', '.join(sorted(missing))) |
|
1284 | " %s") % (', '.join(sorted(missing))) | |
1285 | raise error.Abort(msg) |
|
1285 | raise error.Abort(msg) | |
1286 |
|
1286 | |||
1287 | wlock = lock = None |
|
1287 | wlock = lock = None | |
1288 | try: |
|
1288 | try: | |
1289 | wlock = pullop.repo.wlock() |
|
1289 | wlock = pullop.repo.wlock() | |
1290 | lock = pullop.repo.lock() |
|
1290 | lock = pullop.repo.lock() | |
1291 | pullop.trmanager = transactionmanager(repo, 'pull', remote.url()) |
|
1291 | pullop.trmanager = transactionmanager(repo, 'pull', remote.url()) | |
1292 | # This should ideally be in _pullbundle2(). However, it needs to run |
|
1292 | # This should ideally be in _pullbundle2(). However, it needs to run | |
1293 | # before discovery to avoid extra work. |
|
1293 | # before discovery to avoid extra work. | |
1294 | _maybeapplyclonebundle(pullop) |
|
1294 | _maybeapplyclonebundle(pullop) | |
1295 | streamclone.maybeperformlegacystreamclone(pullop) |
|
1295 | streamclone.maybeperformlegacystreamclone(pullop) | |
1296 | _pulldiscovery(pullop) |
|
1296 | _pulldiscovery(pullop) | |
1297 | if pullop.canusebundle2: |
|
1297 | if pullop.canusebundle2: | |
1298 | _pullbundle2(pullop) |
|
1298 | _pullbundle2(pullop) | |
1299 | _pullchangeset(pullop) |
|
1299 | _pullchangeset(pullop) | |
1300 | _pullphase(pullop) |
|
1300 | _pullphase(pullop) | |
1301 | _pullbookmarks(pullop) |
|
1301 | _pullbookmarks(pullop) | |
1302 | _pullobsolete(pullop) |
|
1302 | _pullobsolete(pullop) | |
1303 | pullop.trmanager.close() |
|
1303 | pullop.trmanager.close() | |
1304 | finally: |
|
1304 | finally: | |
1305 | lockmod.release(pullop.trmanager, lock, wlock) |
|
1305 | lockmod.release(pullop.trmanager, lock, wlock) | |
1306 |
|
1306 | |||
1307 | return pullop |
|
1307 | return pullop | |
1308 |
|
1308 | |||
1309 | # list of steps to perform discovery before pull |
|
1309 | # list of steps to perform discovery before pull | |
1310 | pulldiscoveryorder = [] |
|
1310 | pulldiscoveryorder = [] | |
1311 |
|
1311 | |||
1312 | # Mapping between step name and function |
|
1312 | # Mapping between step name and function | |
1313 | # |
|
1313 | # | |
1314 | # This exists to help extensions wrap steps if necessary |
|
1314 | # This exists to help extensions wrap steps if necessary | |
1315 | pulldiscoverymapping = {} |
|
1315 | pulldiscoverymapping = {} | |
1316 |
|
1316 | |||
1317 | def pulldiscovery(stepname): |
|
1317 | def pulldiscovery(stepname): | |
1318 | """decorator for function performing discovery before pull |
|
1318 | """decorator for function performing discovery before pull | |
1319 |
|
1319 | |||
1320 | The function is added to the step -> function mapping and appended to the |
|
1320 | The function is added to the step -> function mapping and appended to the | |
1321 | list of steps. Beware that decorated function will be added in order (this |
|
1321 | list of steps. Beware that decorated function will be added in order (this | |
1322 | may matter). |
|
1322 | may matter). | |
1323 |
|
1323 | |||
1324 | You can only use this decorator for a new step, if you want to wrap a step |
|
1324 | You can only use this decorator for a new step, if you want to wrap a step | |
1325 | from an extension, change the pulldiscovery dictionary directly.""" |
|
1325 | from an extension, change the pulldiscovery dictionary directly.""" | |
1326 | def dec(func): |
|
1326 | def dec(func): | |
1327 | assert stepname not in pulldiscoverymapping |
|
1327 | assert stepname not in pulldiscoverymapping | |
1328 | pulldiscoverymapping[stepname] = func |
|
1328 | pulldiscoverymapping[stepname] = func | |
1329 | pulldiscoveryorder.append(stepname) |
|
1329 | pulldiscoveryorder.append(stepname) | |
1330 | return func |
|
1330 | return func | |
1331 | return dec |
|
1331 | return dec | |
1332 |
|
1332 | |||
1333 | def _pulldiscovery(pullop): |
|
1333 | def _pulldiscovery(pullop): | |
1334 | """Run all discovery steps""" |
|
1334 | """Run all discovery steps""" | |
1335 | for stepname in pulldiscoveryorder: |
|
1335 | for stepname in pulldiscoveryorder: | |
1336 | step = pulldiscoverymapping[stepname] |
|
1336 | step = pulldiscoverymapping[stepname] | |
1337 | step(pullop) |
|
1337 | step(pullop) | |
1338 |
|
1338 | |||
1339 | @pulldiscovery('b1:bookmarks') |
|
1339 | @pulldiscovery('b1:bookmarks') | |
1340 | def _pullbookmarkbundle1(pullop): |
|
1340 | def _pullbookmarkbundle1(pullop): | |
1341 | """fetch bookmark data in bundle1 case |
|
1341 | """fetch bookmark data in bundle1 case | |
1342 |
|
1342 | |||
1343 | If not using bundle2, we have to fetch bookmarks before changeset |
|
1343 | If not using bundle2, we have to fetch bookmarks before changeset | |
1344 | discovery to reduce the chance and impact of race conditions.""" |
|
1344 | discovery to reduce the chance and impact of race conditions.""" | |
1345 | if pullop.remotebookmarks is not None: |
|
1345 | if pullop.remotebookmarks is not None: | |
1346 | return |
|
1346 | return | |
1347 | if pullop.canusebundle2 and 'listkeys' in pullop.remotebundle2caps: |
|
1347 | if pullop.canusebundle2 and 'listkeys' in pullop.remotebundle2caps: | |
1348 | # all known bundle2 servers now support listkeys, but lets be nice with |
|
1348 | # all known bundle2 servers now support listkeys, but lets be nice with | |
1349 | # new implementation. |
|
1349 | # new implementation. | |
1350 | return |
|
1350 | return | |
1351 |
|
|
1351 | books = pullop.remote.listkeys('bookmarks') | |
|
1352 | pullop.remotebookmarks = bookmod.unhexlifybookmarks(books) | |||
1352 |
|
1353 | |||
1353 |
|
1354 | |||
1354 | @pulldiscovery('changegroup') |
|
1355 | @pulldiscovery('changegroup') | |
1355 | def _pulldiscoverychangegroup(pullop): |
|
1356 | def _pulldiscoverychangegroup(pullop): | |
1356 | """discovery phase for the pull |
|
1357 | """discovery phase for the pull | |
1357 |
|
1358 | |||
1358 | Current handle changeset discovery only, will change handle all discovery |
|
1359 | Current handle changeset discovery only, will change handle all discovery | |
1359 | at some point.""" |
|
1360 | at some point.""" | |
1360 | tmp = discovery.findcommonincoming(pullop.repo, |
|
1361 | tmp = discovery.findcommonincoming(pullop.repo, | |
1361 | pullop.remote, |
|
1362 | pullop.remote, | |
1362 | heads=pullop.heads, |
|
1363 | heads=pullop.heads, | |
1363 | force=pullop.force) |
|
1364 | force=pullop.force) | |
1364 | common, fetch, rheads = tmp |
|
1365 | common, fetch, rheads = tmp | |
1365 | nm = pullop.repo.unfiltered().changelog.nodemap |
|
1366 | nm = pullop.repo.unfiltered().changelog.nodemap | |
1366 | if fetch and rheads: |
|
1367 | if fetch and rheads: | |
1367 | # If a remote heads is filtered locally, put in back in common. |
|
1368 | # If a remote heads is filtered locally, put in back in common. | |
1368 | # |
|
1369 | # | |
1369 | # This is a hackish solution to catch most of "common but locally |
|
1370 | # This is a hackish solution to catch most of "common but locally | |
1370 | # hidden situation". We do not performs discovery on unfiltered |
|
1371 | # hidden situation". We do not performs discovery on unfiltered | |
1371 | # repository because it end up doing a pathological amount of round |
|
1372 | # repository because it end up doing a pathological amount of round | |
1372 | # trip for w huge amount of changeset we do not care about. |
|
1373 | # trip for w huge amount of changeset we do not care about. | |
1373 | # |
|
1374 | # | |
1374 | # If a set of such "common but filtered" changeset exist on the server |
|
1375 | # If a set of such "common but filtered" changeset exist on the server | |
1375 | # but are not including a remote heads, we'll not be able to detect it, |
|
1376 | # but are not including a remote heads, we'll not be able to detect it, | |
1376 | scommon = set(common) |
|
1377 | scommon = set(common) | |
1377 | for n in rheads: |
|
1378 | for n in rheads: | |
1378 | if n in nm: |
|
1379 | if n in nm: | |
1379 | if n not in scommon: |
|
1380 | if n not in scommon: | |
1380 | common.append(n) |
|
1381 | common.append(n) | |
1381 | if set(rheads).issubset(set(common)): |
|
1382 | if set(rheads).issubset(set(common)): | |
1382 | fetch = [] |
|
1383 | fetch = [] | |
1383 | pullop.common = common |
|
1384 | pullop.common = common | |
1384 | pullop.fetch = fetch |
|
1385 | pullop.fetch = fetch | |
1385 | pullop.rheads = rheads |
|
1386 | pullop.rheads = rheads | |
1386 |
|
1387 | |||
1387 | def _pullbundle2(pullop): |
|
1388 | def _pullbundle2(pullop): | |
1388 | """pull data using bundle2 |
|
1389 | """pull data using bundle2 | |
1389 |
|
1390 | |||
1390 | For now, the only supported data are changegroup.""" |
|
1391 | For now, the only supported data are changegroup.""" | |
1391 | kwargs = {'bundlecaps': caps20to10(pullop.repo)} |
|
1392 | kwargs = {'bundlecaps': caps20to10(pullop.repo)} | |
1392 |
|
1393 | |||
1393 | # At the moment we don't do stream clones over bundle2. If that is |
|
1394 | # At the moment we don't do stream clones over bundle2. If that is | |
1394 | # implemented then here's where the check for that will go. |
|
1395 | # implemented then here's where the check for that will go. | |
1395 | streaming = False |
|
1396 | streaming = False | |
1396 |
|
1397 | |||
1397 | # pulling changegroup |
|
1398 | # pulling changegroup | |
1398 | pullop.stepsdone.add('changegroup') |
|
1399 | pullop.stepsdone.add('changegroup') | |
1399 |
|
1400 | |||
1400 | kwargs['common'] = pullop.common |
|
1401 | kwargs['common'] = pullop.common | |
1401 | kwargs['heads'] = pullop.heads or pullop.rheads |
|
1402 | kwargs['heads'] = pullop.heads or pullop.rheads | |
1402 | kwargs['cg'] = pullop.fetch |
|
1403 | kwargs['cg'] = pullop.fetch | |
1403 |
|
1404 | |||
1404 | ui = pullop.repo.ui |
|
1405 | ui = pullop.repo.ui | |
1405 | legacyphase = 'phases' in ui.configlist('devel', 'legacy.exchange') |
|
1406 | legacyphase = 'phases' in ui.configlist('devel', 'legacy.exchange') | |
1406 | hasbinaryphase = 'heads' in pullop.remotebundle2caps.get('phases', ()) |
|
1407 | hasbinaryphase = 'heads' in pullop.remotebundle2caps.get('phases', ()) | |
1407 | if (not legacyphase and hasbinaryphase): |
|
1408 | if (not legacyphase and hasbinaryphase): | |
1408 | kwargs['phases'] = True |
|
1409 | kwargs['phases'] = True | |
1409 | pullop.stepsdone.add('phases') |
|
1410 | pullop.stepsdone.add('phases') | |
1410 |
|
1411 | |||
1411 | if 'listkeys' in pullop.remotebundle2caps: |
|
1412 | if 'listkeys' in pullop.remotebundle2caps: | |
1412 | if 'phases' not in pullop.stepsdone: |
|
1413 | if 'phases' not in pullop.stepsdone: | |
1413 | kwargs['listkeys'] = ['phases'] |
|
1414 | kwargs['listkeys'] = ['phases'] | |
1414 | if pullop.remotebookmarks is None: |
|
1415 | if pullop.remotebookmarks is None: | |
1415 | # make sure to always includes bookmark data when migrating |
|
1416 | # make sure to always includes bookmark data when migrating | |
1416 | # `hg incoming --bundle` to using this function. |
|
1417 | # `hg incoming --bundle` to using this function. | |
1417 | kwargs.setdefault('listkeys', []).append('bookmarks') |
|
1418 | kwargs.setdefault('listkeys', []).append('bookmarks') | |
1418 |
|
1419 | |||
1419 | # If this is a full pull / clone and the server supports the clone bundles |
|
1420 | # If this is a full pull / clone and the server supports the clone bundles | |
1420 | # feature, tell the server whether we attempted a clone bundle. The |
|
1421 | # feature, tell the server whether we attempted a clone bundle. The | |
1421 | # presence of this flag indicates the client supports clone bundles. This |
|
1422 | # presence of this flag indicates the client supports clone bundles. This | |
1422 | # will enable the server to treat clients that support clone bundles |
|
1423 | # will enable the server to treat clients that support clone bundles | |
1423 | # differently from those that don't. |
|
1424 | # differently from those that don't. | |
1424 | if (pullop.remote.capable('clonebundles') |
|
1425 | if (pullop.remote.capable('clonebundles') | |
1425 | and pullop.heads is None and list(pullop.common) == [nullid]): |
|
1426 | and pullop.heads is None and list(pullop.common) == [nullid]): | |
1426 | kwargs['cbattempted'] = pullop.clonebundleattempted |
|
1427 | kwargs['cbattempted'] = pullop.clonebundleattempted | |
1427 |
|
1428 | |||
1428 | if streaming: |
|
1429 | if streaming: | |
1429 | pullop.repo.ui.status(_('streaming all changes\n')) |
|
1430 | pullop.repo.ui.status(_('streaming all changes\n')) | |
1430 | elif not pullop.fetch: |
|
1431 | elif not pullop.fetch: | |
1431 | pullop.repo.ui.status(_("no changes found\n")) |
|
1432 | pullop.repo.ui.status(_("no changes found\n")) | |
1432 | pullop.cgresult = 0 |
|
1433 | pullop.cgresult = 0 | |
1433 | else: |
|
1434 | else: | |
1434 | if pullop.heads is None and list(pullop.common) == [nullid]: |
|
1435 | if pullop.heads is None and list(pullop.common) == [nullid]: | |
1435 | pullop.repo.ui.status(_("requesting all changes\n")) |
|
1436 | pullop.repo.ui.status(_("requesting all changes\n")) | |
1436 | if obsolete.isenabled(pullop.repo, obsolete.exchangeopt): |
|
1437 | if obsolete.isenabled(pullop.repo, obsolete.exchangeopt): | |
1437 | remoteversions = bundle2.obsmarkersversion(pullop.remotebundle2caps) |
|
1438 | remoteversions = bundle2.obsmarkersversion(pullop.remotebundle2caps) | |
1438 | if obsolete.commonversion(remoteversions) is not None: |
|
1439 | if obsolete.commonversion(remoteversions) is not None: | |
1439 | kwargs['obsmarkers'] = True |
|
1440 | kwargs['obsmarkers'] = True | |
1440 | pullop.stepsdone.add('obsmarkers') |
|
1441 | pullop.stepsdone.add('obsmarkers') | |
1441 | _pullbundle2extraprepare(pullop, kwargs) |
|
1442 | _pullbundle2extraprepare(pullop, kwargs) | |
1442 | bundle = pullop.remote.getbundle('pull', **pycompat.strkwargs(kwargs)) |
|
1443 | bundle = pullop.remote.getbundle('pull', **pycompat.strkwargs(kwargs)) | |
1443 | try: |
|
1444 | try: | |
1444 | op = bundle2.processbundle(pullop.repo, bundle, pullop.gettransaction) |
|
1445 | op = bundle2.processbundle(pullop.repo, bundle, pullop.gettransaction) | |
1445 | except bundle2.AbortFromPart as exc: |
|
1446 | except bundle2.AbortFromPart as exc: | |
1446 | pullop.repo.ui.status(_('remote: abort: %s\n') % exc) |
|
1447 | pullop.repo.ui.status(_('remote: abort: %s\n') % exc) | |
1447 | raise error.Abort(_('pull failed on remote'), hint=exc.hint) |
|
1448 | raise error.Abort(_('pull failed on remote'), hint=exc.hint) | |
1448 | except error.BundleValueError as exc: |
|
1449 | except error.BundleValueError as exc: | |
1449 | raise error.Abort(_('missing support for %s') % exc) |
|
1450 | raise error.Abort(_('missing support for %s') % exc) | |
1450 |
|
1451 | |||
1451 | if pullop.fetch: |
|
1452 | if pullop.fetch: | |
1452 | pullop.cgresult = bundle2.combinechangegroupresults(op) |
|
1453 | pullop.cgresult = bundle2.combinechangegroupresults(op) | |
1453 |
|
1454 | |||
1454 | # processing phases change |
|
1455 | # processing phases change | |
1455 | for namespace, value in op.records['listkeys']: |
|
1456 | for namespace, value in op.records['listkeys']: | |
1456 | if namespace == 'phases': |
|
1457 | if namespace == 'phases': | |
1457 | _pullapplyphases(pullop, value) |
|
1458 | _pullapplyphases(pullop, value) | |
1458 |
|
1459 | |||
1459 | # processing bookmark update |
|
1460 | # processing bookmark update | |
1460 | for namespace, value in op.records['listkeys']: |
|
1461 | for namespace, value in op.records['listkeys']: | |
1461 | if namespace == 'bookmarks': |
|
1462 | if namespace == 'bookmarks': | |
1462 | pullop.remotebookmarks = value |
|
1463 | pullop.remotebookmarks = bookmod.unhexlifybookmarks(value) | |
1463 |
|
1464 | |||
1464 | # bookmark data were either already there or pulled in the bundle |
|
1465 | # bookmark data were either already there or pulled in the bundle | |
1465 | if pullop.remotebookmarks is not None: |
|
1466 | if pullop.remotebookmarks is not None: | |
1466 | _pullbookmarks(pullop) |
|
1467 | _pullbookmarks(pullop) | |
1467 |
|
1468 | |||
1468 | def _pullbundle2extraprepare(pullop, kwargs): |
|
1469 | def _pullbundle2extraprepare(pullop, kwargs): | |
1469 | """hook function so that extensions can extend the getbundle call""" |
|
1470 | """hook function so that extensions can extend the getbundle call""" | |
1470 |
|
1471 | |||
1471 | def _pullchangeset(pullop): |
|
1472 | def _pullchangeset(pullop): | |
1472 | """pull changeset from unbundle into the local repo""" |
|
1473 | """pull changeset from unbundle into the local repo""" | |
1473 | # We delay the open of the transaction as late as possible so we |
|
1474 | # We delay the open of the transaction as late as possible so we | |
1474 | # don't open transaction for nothing or you break future useful |
|
1475 | # don't open transaction for nothing or you break future useful | |
1475 | # rollback call |
|
1476 | # rollback call | |
1476 | if 'changegroup' in pullop.stepsdone: |
|
1477 | if 'changegroup' in pullop.stepsdone: | |
1477 | return |
|
1478 | return | |
1478 | pullop.stepsdone.add('changegroup') |
|
1479 | pullop.stepsdone.add('changegroup') | |
1479 | if not pullop.fetch: |
|
1480 | if not pullop.fetch: | |
1480 | pullop.repo.ui.status(_("no changes found\n")) |
|
1481 | pullop.repo.ui.status(_("no changes found\n")) | |
1481 | pullop.cgresult = 0 |
|
1482 | pullop.cgresult = 0 | |
1482 | return |
|
1483 | return | |
1483 | tr = pullop.gettransaction() |
|
1484 | tr = pullop.gettransaction() | |
1484 | if pullop.heads is None and list(pullop.common) == [nullid]: |
|
1485 | if pullop.heads is None and list(pullop.common) == [nullid]: | |
1485 | pullop.repo.ui.status(_("requesting all changes\n")) |
|
1486 | pullop.repo.ui.status(_("requesting all changes\n")) | |
1486 | elif pullop.heads is None and pullop.remote.capable('changegroupsubset'): |
|
1487 | elif pullop.heads is None and pullop.remote.capable('changegroupsubset'): | |
1487 | # issue1320, avoid a race if remote changed after discovery |
|
1488 | # issue1320, avoid a race if remote changed after discovery | |
1488 | pullop.heads = pullop.rheads |
|
1489 | pullop.heads = pullop.rheads | |
1489 |
|
1490 | |||
1490 | if pullop.remote.capable('getbundle'): |
|
1491 | if pullop.remote.capable('getbundle'): | |
1491 | # TODO: get bundlecaps from remote |
|
1492 | # TODO: get bundlecaps from remote | |
1492 | cg = pullop.remote.getbundle('pull', common=pullop.common, |
|
1493 | cg = pullop.remote.getbundle('pull', common=pullop.common, | |
1493 | heads=pullop.heads or pullop.rheads) |
|
1494 | heads=pullop.heads or pullop.rheads) | |
1494 | elif pullop.heads is None: |
|
1495 | elif pullop.heads is None: | |
1495 | cg = pullop.remote.changegroup(pullop.fetch, 'pull') |
|
1496 | cg = pullop.remote.changegroup(pullop.fetch, 'pull') | |
1496 | elif not pullop.remote.capable('changegroupsubset'): |
|
1497 | elif not pullop.remote.capable('changegroupsubset'): | |
1497 | raise error.Abort(_("partial pull cannot be done because " |
|
1498 | raise error.Abort(_("partial pull cannot be done because " | |
1498 | "other repository doesn't support " |
|
1499 | "other repository doesn't support " | |
1499 | "changegroupsubset.")) |
|
1500 | "changegroupsubset.")) | |
1500 | else: |
|
1501 | else: | |
1501 | cg = pullop.remote.changegroupsubset(pullop.fetch, pullop.heads, 'pull') |
|
1502 | cg = pullop.remote.changegroupsubset(pullop.fetch, pullop.heads, 'pull') | |
1502 | bundleop = bundle2.applybundle(pullop.repo, cg, tr, 'pull', |
|
1503 | bundleop = bundle2.applybundle(pullop.repo, cg, tr, 'pull', | |
1503 | pullop.remote.url()) |
|
1504 | pullop.remote.url()) | |
1504 | pullop.cgresult = bundle2.combinechangegroupresults(bundleop) |
|
1505 | pullop.cgresult = bundle2.combinechangegroupresults(bundleop) | |
1505 |
|
1506 | |||
1506 | def _pullphase(pullop): |
|
1507 | def _pullphase(pullop): | |
1507 | # Get remote phases data from remote |
|
1508 | # Get remote phases data from remote | |
1508 | if 'phases' in pullop.stepsdone: |
|
1509 | if 'phases' in pullop.stepsdone: | |
1509 | return |
|
1510 | return | |
1510 | remotephases = pullop.remote.listkeys('phases') |
|
1511 | remotephases = pullop.remote.listkeys('phases') | |
1511 | _pullapplyphases(pullop, remotephases) |
|
1512 | _pullapplyphases(pullop, remotephases) | |
1512 |
|
1513 | |||
1513 | def _pullapplyphases(pullop, remotephases): |
|
1514 | def _pullapplyphases(pullop, remotephases): | |
1514 | """apply phase movement from observed remote state""" |
|
1515 | """apply phase movement from observed remote state""" | |
1515 | if 'phases' in pullop.stepsdone: |
|
1516 | if 'phases' in pullop.stepsdone: | |
1516 | return |
|
1517 | return | |
1517 | pullop.stepsdone.add('phases') |
|
1518 | pullop.stepsdone.add('phases') | |
1518 | publishing = bool(remotephases.get('publishing', False)) |
|
1519 | publishing = bool(remotephases.get('publishing', False)) | |
1519 | if remotephases and not publishing: |
|
1520 | if remotephases and not publishing: | |
1520 | # remote is new and non-publishing |
|
1521 | # remote is new and non-publishing | |
1521 | pheads, _dr = phases.analyzeremotephases(pullop.repo, |
|
1522 | pheads, _dr = phases.analyzeremotephases(pullop.repo, | |
1522 | pullop.pulledsubset, |
|
1523 | pullop.pulledsubset, | |
1523 | remotephases) |
|
1524 | remotephases) | |
1524 | dheads = pullop.pulledsubset |
|
1525 | dheads = pullop.pulledsubset | |
1525 | else: |
|
1526 | else: | |
1526 | # Remote is old or publishing all common changesets |
|
1527 | # Remote is old or publishing all common changesets | |
1527 | # should be seen as public |
|
1528 | # should be seen as public | |
1528 | pheads = pullop.pulledsubset |
|
1529 | pheads = pullop.pulledsubset | |
1529 | dheads = [] |
|
1530 | dheads = [] | |
1530 | unfi = pullop.repo.unfiltered() |
|
1531 | unfi = pullop.repo.unfiltered() | |
1531 | phase = unfi._phasecache.phase |
|
1532 | phase = unfi._phasecache.phase | |
1532 | rev = unfi.changelog.nodemap.get |
|
1533 | rev = unfi.changelog.nodemap.get | |
1533 | public = phases.public |
|
1534 | public = phases.public | |
1534 | draft = phases.draft |
|
1535 | draft = phases.draft | |
1535 |
|
1536 | |||
1536 | # exclude changesets already public locally and update the others |
|
1537 | # exclude changesets already public locally and update the others | |
1537 | pheads = [pn for pn in pheads if phase(unfi, rev(pn)) > public] |
|
1538 | pheads = [pn for pn in pheads if phase(unfi, rev(pn)) > public] | |
1538 | if pheads: |
|
1539 | if pheads: | |
1539 | tr = pullop.gettransaction() |
|
1540 | tr = pullop.gettransaction() | |
1540 | phases.advanceboundary(pullop.repo, tr, public, pheads) |
|
1541 | phases.advanceboundary(pullop.repo, tr, public, pheads) | |
1541 |
|
1542 | |||
1542 | # exclude changesets already draft locally and update the others |
|
1543 | # exclude changesets already draft locally and update the others | |
1543 | dheads = [pn for pn in dheads if phase(unfi, rev(pn)) > draft] |
|
1544 | dheads = [pn for pn in dheads if phase(unfi, rev(pn)) > draft] | |
1544 | if dheads: |
|
1545 | if dheads: | |
1545 | tr = pullop.gettransaction() |
|
1546 | tr = pullop.gettransaction() | |
1546 | phases.advanceboundary(pullop.repo, tr, draft, dheads) |
|
1547 | phases.advanceboundary(pullop.repo, tr, draft, dheads) | |
1547 |
|
1548 | |||
1548 | def _pullbookmarks(pullop): |
|
1549 | def _pullbookmarks(pullop): | |
1549 | """process the remote bookmark information to update the local one""" |
|
1550 | """process the remote bookmark information to update the local one""" | |
1550 | if 'bookmarks' in pullop.stepsdone: |
|
1551 | if 'bookmarks' in pullop.stepsdone: | |
1551 | return |
|
1552 | return | |
1552 | pullop.stepsdone.add('bookmarks') |
|
1553 | pullop.stepsdone.add('bookmarks') | |
1553 | repo = pullop.repo |
|
1554 | repo = pullop.repo | |
1554 | remotebookmarks = pullop.remotebookmarks |
|
1555 | remotebookmarks = pullop.remotebookmarks | |
1555 | remotebookmarks = bookmod.unhexlifybookmarks(remotebookmarks) |
|
|||
1556 | bookmod.updatefromremote(repo.ui, repo, remotebookmarks, |
|
1556 | bookmod.updatefromremote(repo.ui, repo, remotebookmarks, | |
1557 | pullop.remote.url(), |
|
1557 | pullop.remote.url(), | |
1558 | pullop.gettransaction, |
|
1558 | pullop.gettransaction, | |
1559 | explicit=pullop.explicitbookmarks) |
|
1559 | explicit=pullop.explicitbookmarks) | |
1560 |
|
1560 | |||
1561 | def _pullobsolete(pullop): |
|
1561 | def _pullobsolete(pullop): | |
1562 | """utility function to pull obsolete markers from a remote |
|
1562 | """utility function to pull obsolete markers from a remote | |
1563 |
|
1563 | |||
1564 | The `gettransaction` is function that return the pull transaction, creating |
|
1564 | The `gettransaction` is function that return the pull transaction, creating | |
1565 | one if necessary. We return the transaction to inform the calling code that |
|
1565 | one if necessary. We return the transaction to inform the calling code that | |
1566 | a new transaction have been created (when applicable). |
|
1566 | a new transaction have been created (when applicable). | |
1567 |
|
1567 | |||
1568 | Exists mostly to allow overriding for experimentation purpose""" |
|
1568 | Exists mostly to allow overriding for experimentation purpose""" | |
1569 | if 'obsmarkers' in pullop.stepsdone: |
|
1569 | if 'obsmarkers' in pullop.stepsdone: | |
1570 | return |
|
1570 | return | |
1571 | pullop.stepsdone.add('obsmarkers') |
|
1571 | pullop.stepsdone.add('obsmarkers') | |
1572 | tr = None |
|
1572 | tr = None | |
1573 | if obsolete.isenabled(pullop.repo, obsolete.exchangeopt): |
|
1573 | if obsolete.isenabled(pullop.repo, obsolete.exchangeopt): | |
1574 | pullop.repo.ui.debug('fetching remote obsolete markers\n') |
|
1574 | pullop.repo.ui.debug('fetching remote obsolete markers\n') | |
1575 | remoteobs = pullop.remote.listkeys('obsolete') |
|
1575 | remoteobs = pullop.remote.listkeys('obsolete') | |
1576 | if 'dump0' in remoteobs: |
|
1576 | if 'dump0' in remoteobs: | |
1577 | tr = pullop.gettransaction() |
|
1577 | tr = pullop.gettransaction() | |
1578 | markers = [] |
|
1578 | markers = [] | |
1579 | for key in sorted(remoteobs, reverse=True): |
|
1579 | for key in sorted(remoteobs, reverse=True): | |
1580 | if key.startswith('dump'): |
|
1580 | if key.startswith('dump'): | |
1581 | data = util.b85decode(remoteobs[key]) |
|
1581 | data = util.b85decode(remoteobs[key]) | |
1582 | version, newmarks = obsolete._readmarkers(data) |
|
1582 | version, newmarks = obsolete._readmarkers(data) | |
1583 | markers += newmarks |
|
1583 | markers += newmarks | |
1584 | if markers: |
|
1584 | if markers: | |
1585 | pullop.repo.obsstore.add(tr, markers) |
|
1585 | pullop.repo.obsstore.add(tr, markers) | |
1586 | pullop.repo.invalidatevolatilesets() |
|
1586 | pullop.repo.invalidatevolatilesets() | |
1587 | return tr |
|
1587 | return tr | |
1588 |
|
1588 | |||
1589 | def caps20to10(repo): |
|
1589 | def caps20to10(repo): | |
1590 | """return a set with appropriate options to use bundle20 during getbundle""" |
|
1590 | """return a set with appropriate options to use bundle20 during getbundle""" | |
1591 | caps = {'HG20'} |
|
1591 | caps = {'HG20'} | |
1592 | capsblob = bundle2.encodecaps(bundle2.getrepocaps(repo)) |
|
1592 | capsblob = bundle2.encodecaps(bundle2.getrepocaps(repo)) | |
1593 | caps.add('bundle2=' + urlreq.quote(capsblob)) |
|
1593 | caps.add('bundle2=' + urlreq.quote(capsblob)) | |
1594 | return caps |
|
1594 | return caps | |
1595 |
|
1595 | |||
1596 | # List of names of steps to perform for a bundle2 for getbundle, order matters. |
|
1596 | # List of names of steps to perform for a bundle2 for getbundle, order matters. | |
1597 | getbundle2partsorder = [] |
|
1597 | getbundle2partsorder = [] | |
1598 |
|
1598 | |||
1599 | # Mapping between step name and function |
|
1599 | # Mapping between step name and function | |
1600 | # |
|
1600 | # | |
1601 | # This exists to help extensions wrap steps if necessary |
|
1601 | # This exists to help extensions wrap steps if necessary | |
1602 | getbundle2partsmapping = {} |
|
1602 | getbundle2partsmapping = {} | |
1603 |
|
1603 | |||
1604 | def getbundle2partsgenerator(stepname, idx=None): |
|
1604 | def getbundle2partsgenerator(stepname, idx=None): | |
1605 | """decorator for function generating bundle2 part for getbundle |
|
1605 | """decorator for function generating bundle2 part for getbundle | |
1606 |
|
1606 | |||
1607 | The function is added to the step -> function mapping and appended to the |
|
1607 | The function is added to the step -> function mapping and appended to the | |
1608 | list of steps. Beware that decorated functions will be added in order |
|
1608 | list of steps. Beware that decorated functions will be added in order | |
1609 | (this may matter). |
|
1609 | (this may matter). | |
1610 |
|
1610 | |||
1611 | You can only use this decorator for new steps, if you want to wrap a step |
|
1611 | You can only use this decorator for new steps, if you want to wrap a step | |
1612 | from an extension, attack the getbundle2partsmapping dictionary directly.""" |
|
1612 | from an extension, attack the getbundle2partsmapping dictionary directly.""" | |
1613 | def dec(func): |
|
1613 | def dec(func): | |
1614 | assert stepname not in getbundle2partsmapping |
|
1614 | assert stepname not in getbundle2partsmapping | |
1615 | getbundle2partsmapping[stepname] = func |
|
1615 | getbundle2partsmapping[stepname] = func | |
1616 | if idx is None: |
|
1616 | if idx is None: | |
1617 | getbundle2partsorder.append(stepname) |
|
1617 | getbundle2partsorder.append(stepname) | |
1618 | else: |
|
1618 | else: | |
1619 | getbundle2partsorder.insert(idx, stepname) |
|
1619 | getbundle2partsorder.insert(idx, stepname) | |
1620 | return func |
|
1620 | return func | |
1621 | return dec |
|
1621 | return dec | |
1622 |
|
1622 | |||
1623 | def bundle2requested(bundlecaps): |
|
1623 | def bundle2requested(bundlecaps): | |
1624 | if bundlecaps is not None: |
|
1624 | if bundlecaps is not None: | |
1625 | return any(cap.startswith('HG2') for cap in bundlecaps) |
|
1625 | return any(cap.startswith('HG2') for cap in bundlecaps) | |
1626 | return False |
|
1626 | return False | |
1627 |
|
1627 | |||
1628 | def getbundlechunks(repo, source, heads=None, common=None, bundlecaps=None, |
|
1628 | def getbundlechunks(repo, source, heads=None, common=None, bundlecaps=None, | |
1629 | **kwargs): |
|
1629 | **kwargs): | |
1630 | """Return chunks constituting a bundle's raw data. |
|
1630 | """Return chunks constituting a bundle's raw data. | |
1631 |
|
1631 | |||
1632 | Could be a bundle HG10 or a bundle HG20 depending on bundlecaps |
|
1632 | Could be a bundle HG10 or a bundle HG20 depending on bundlecaps | |
1633 | passed. |
|
1633 | passed. | |
1634 |
|
1634 | |||
1635 | Returns an iterator over raw chunks (of varying sizes). |
|
1635 | Returns an iterator over raw chunks (of varying sizes). | |
1636 | """ |
|
1636 | """ | |
1637 | kwargs = pycompat.byteskwargs(kwargs) |
|
1637 | kwargs = pycompat.byteskwargs(kwargs) | |
1638 | usebundle2 = bundle2requested(bundlecaps) |
|
1638 | usebundle2 = bundle2requested(bundlecaps) | |
1639 | # bundle10 case |
|
1639 | # bundle10 case | |
1640 | if not usebundle2: |
|
1640 | if not usebundle2: | |
1641 | if bundlecaps and not kwargs.get('cg', True): |
|
1641 | if bundlecaps and not kwargs.get('cg', True): | |
1642 | raise ValueError(_('request for bundle10 must include changegroup')) |
|
1642 | raise ValueError(_('request for bundle10 must include changegroup')) | |
1643 |
|
1643 | |||
1644 | if kwargs: |
|
1644 | if kwargs: | |
1645 | raise ValueError(_('unsupported getbundle arguments: %s') |
|
1645 | raise ValueError(_('unsupported getbundle arguments: %s') | |
1646 | % ', '.join(sorted(kwargs.keys()))) |
|
1646 | % ', '.join(sorted(kwargs.keys()))) | |
1647 | outgoing = _computeoutgoing(repo, heads, common) |
|
1647 | outgoing = _computeoutgoing(repo, heads, common) | |
1648 | return changegroup.makestream(repo, outgoing, '01', source, |
|
1648 | return changegroup.makestream(repo, outgoing, '01', source, | |
1649 | bundlecaps=bundlecaps) |
|
1649 | bundlecaps=bundlecaps) | |
1650 |
|
1650 | |||
1651 | # bundle20 case |
|
1651 | # bundle20 case | |
1652 | b2caps = {} |
|
1652 | b2caps = {} | |
1653 | for bcaps in bundlecaps: |
|
1653 | for bcaps in bundlecaps: | |
1654 | if bcaps.startswith('bundle2='): |
|
1654 | if bcaps.startswith('bundle2='): | |
1655 | blob = urlreq.unquote(bcaps[len('bundle2='):]) |
|
1655 | blob = urlreq.unquote(bcaps[len('bundle2='):]) | |
1656 | b2caps.update(bundle2.decodecaps(blob)) |
|
1656 | b2caps.update(bundle2.decodecaps(blob)) | |
1657 | bundler = bundle2.bundle20(repo.ui, b2caps) |
|
1657 | bundler = bundle2.bundle20(repo.ui, b2caps) | |
1658 |
|
1658 | |||
1659 | kwargs['heads'] = heads |
|
1659 | kwargs['heads'] = heads | |
1660 | kwargs['common'] = common |
|
1660 | kwargs['common'] = common | |
1661 |
|
1661 | |||
1662 | for name in getbundle2partsorder: |
|
1662 | for name in getbundle2partsorder: | |
1663 | func = getbundle2partsmapping[name] |
|
1663 | func = getbundle2partsmapping[name] | |
1664 | func(bundler, repo, source, bundlecaps=bundlecaps, b2caps=b2caps, |
|
1664 | func(bundler, repo, source, bundlecaps=bundlecaps, b2caps=b2caps, | |
1665 | **pycompat.strkwargs(kwargs)) |
|
1665 | **pycompat.strkwargs(kwargs)) | |
1666 |
|
1666 | |||
1667 | return bundler.getchunks() |
|
1667 | return bundler.getchunks() | |
1668 |
|
1668 | |||
1669 | @getbundle2partsgenerator('changegroup') |
|
1669 | @getbundle2partsgenerator('changegroup') | |
1670 | def _getbundlechangegrouppart(bundler, repo, source, bundlecaps=None, |
|
1670 | def _getbundlechangegrouppart(bundler, repo, source, bundlecaps=None, | |
1671 | b2caps=None, heads=None, common=None, **kwargs): |
|
1671 | b2caps=None, heads=None, common=None, **kwargs): | |
1672 | """add a changegroup part to the requested bundle""" |
|
1672 | """add a changegroup part to the requested bundle""" | |
1673 | cgstream = None |
|
1673 | cgstream = None | |
1674 | if kwargs.get('cg', True): |
|
1674 | if kwargs.get('cg', True): | |
1675 | # build changegroup bundle here. |
|
1675 | # build changegroup bundle here. | |
1676 | version = '01' |
|
1676 | version = '01' | |
1677 | cgversions = b2caps.get('changegroup') |
|
1677 | cgversions = b2caps.get('changegroup') | |
1678 | if cgversions: # 3.1 and 3.2 ship with an empty value |
|
1678 | if cgversions: # 3.1 and 3.2 ship with an empty value | |
1679 | cgversions = [v for v in cgversions |
|
1679 | cgversions = [v for v in cgversions | |
1680 | if v in changegroup.supportedoutgoingversions(repo)] |
|
1680 | if v in changegroup.supportedoutgoingversions(repo)] | |
1681 | if not cgversions: |
|
1681 | if not cgversions: | |
1682 | raise ValueError(_('no common changegroup version')) |
|
1682 | raise ValueError(_('no common changegroup version')) | |
1683 | version = max(cgversions) |
|
1683 | version = max(cgversions) | |
1684 | outgoing = _computeoutgoing(repo, heads, common) |
|
1684 | outgoing = _computeoutgoing(repo, heads, common) | |
1685 | if outgoing.missing: |
|
1685 | if outgoing.missing: | |
1686 | cgstream = changegroup.makestream(repo, outgoing, version, source, |
|
1686 | cgstream = changegroup.makestream(repo, outgoing, version, source, | |
1687 | bundlecaps=bundlecaps) |
|
1687 | bundlecaps=bundlecaps) | |
1688 |
|
1688 | |||
1689 | if cgstream: |
|
1689 | if cgstream: | |
1690 | part = bundler.newpart('changegroup', data=cgstream) |
|
1690 | part = bundler.newpart('changegroup', data=cgstream) | |
1691 | if cgversions: |
|
1691 | if cgversions: | |
1692 | part.addparam('version', version) |
|
1692 | part.addparam('version', version) | |
1693 | part.addparam('nbchanges', '%d' % len(outgoing.missing), |
|
1693 | part.addparam('nbchanges', '%d' % len(outgoing.missing), | |
1694 | mandatory=False) |
|
1694 | mandatory=False) | |
1695 | if 'treemanifest' in repo.requirements: |
|
1695 | if 'treemanifest' in repo.requirements: | |
1696 | part.addparam('treemanifest', '1') |
|
1696 | part.addparam('treemanifest', '1') | |
1697 |
|
1697 | |||
1698 | @getbundle2partsgenerator('listkeys') |
|
1698 | @getbundle2partsgenerator('listkeys') | |
1699 | def _getbundlelistkeysparts(bundler, repo, source, bundlecaps=None, |
|
1699 | def _getbundlelistkeysparts(bundler, repo, source, bundlecaps=None, | |
1700 | b2caps=None, **kwargs): |
|
1700 | b2caps=None, **kwargs): | |
1701 | """add parts containing listkeys namespaces to the requested bundle""" |
|
1701 | """add parts containing listkeys namespaces to the requested bundle""" | |
1702 | listkeys = kwargs.get('listkeys', ()) |
|
1702 | listkeys = kwargs.get('listkeys', ()) | |
1703 | for namespace in listkeys: |
|
1703 | for namespace in listkeys: | |
1704 | part = bundler.newpart('listkeys') |
|
1704 | part = bundler.newpart('listkeys') | |
1705 | part.addparam('namespace', namespace) |
|
1705 | part.addparam('namespace', namespace) | |
1706 | keys = repo.listkeys(namespace).items() |
|
1706 | keys = repo.listkeys(namespace).items() | |
1707 | part.data = pushkey.encodekeys(keys) |
|
1707 | part.data = pushkey.encodekeys(keys) | |
1708 |
|
1708 | |||
1709 | @getbundle2partsgenerator('obsmarkers') |
|
1709 | @getbundle2partsgenerator('obsmarkers') | |
1710 | def _getbundleobsmarkerpart(bundler, repo, source, bundlecaps=None, |
|
1710 | def _getbundleobsmarkerpart(bundler, repo, source, bundlecaps=None, | |
1711 | b2caps=None, heads=None, **kwargs): |
|
1711 | b2caps=None, heads=None, **kwargs): | |
1712 | """add an obsolescence markers part to the requested bundle""" |
|
1712 | """add an obsolescence markers part to the requested bundle""" | |
1713 | if kwargs.get('obsmarkers', False): |
|
1713 | if kwargs.get('obsmarkers', False): | |
1714 | if heads is None: |
|
1714 | if heads is None: | |
1715 | heads = repo.heads() |
|
1715 | heads = repo.heads() | |
1716 | subset = [c.node() for c in repo.set('::%ln', heads)] |
|
1716 | subset = [c.node() for c in repo.set('::%ln', heads)] | |
1717 | markers = repo.obsstore.relevantmarkers(subset) |
|
1717 | markers = repo.obsstore.relevantmarkers(subset) | |
1718 | markers = sorted(markers) |
|
1718 | markers = sorted(markers) | |
1719 | bundle2.buildobsmarkerspart(bundler, markers) |
|
1719 | bundle2.buildobsmarkerspart(bundler, markers) | |
1720 |
|
1720 | |||
1721 | @getbundle2partsgenerator('phases') |
|
1721 | @getbundle2partsgenerator('phases') | |
1722 | def _getbundlephasespart(bundler, repo, source, bundlecaps=None, |
|
1722 | def _getbundlephasespart(bundler, repo, source, bundlecaps=None, | |
1723 | b2caps=None, heads=None, **kwargs): |
|
1723 | b2caps=None, heads=None, **kwargs): | |
1724 | """add phase heads part to the requested bundle""" |
|
1724 | """add phase heads part to the requested bundle""" | |
1725 | if kwargs.get('phases', False): |
|
1725 | if kwargs.get('phases', False): | |
1726 | if not 'heads' in b2caps.get('phases'): |
|
1726 | if not 'heads' in b2caps.get('phases'): | |
1727 | raise ValueError(_('no common phases exchange method')) |
|
1727 | raise ValueError(_('no common phases exchange method')) | |
1728 | if heads is None: |
|
1728 | if heads is None: | |
1729 | heads = repo.heads() |
|
1729 | heads = repo.heads() | |
1730 |
|
1730 | |||
1731 | headsbyphase = collections.defaultdict(set) |
|
1731 | headsbyphase = collections.defaultdict(set) | |
1732 | if repo.publishing(): |
|
1732 | if repo.publishing(): | |
1733 | headsbyphase[phases.public] = heads |
|
1733 | headsbyphase[phases.public] = heads | |
1734 | else: |
|
1734 | else: | |
1735 | # find the appropriate heads to move |
|
1735 | # find the appropriate heads to move | |
1736 |
|
1736 | |||
1737 | phase = repo._phasecache.phase |
|
1737 | phase = repo._phasecache.phase | |
1738 | node = repo.changelog.node |
|
1738 | node = repo.changelog.node | |
1739 | rev = repo.changelog.rev |
|
1739 | rev = repo.changelog.rev | |
1740 | for h in heads: |
|
1740 | for h in heads: | |
1741 | headsbyphase[phase(repo, rev(h))].add(h) |
|
1741 | headsbyphase[phase(repo, rev(h))].add(h) | |
1742 | seenphases = list(headsbyphase.keys()) |
|
1742 | seenphases = list(headsbyphase.keys()) | |
1743 |
|
1743 | |||
1744 | # We do not handle anything but public and draft phase for now) |
|
1744 | # We do not handle anything but public and draft phase for now) | |
1745 | if seenphases: |
|
1745 | if seenphases: | |
1746 | assert max(seenphases) <= phases.draft |
|
1746 | assert max(seenphases) <= phases.draft | |
1747 |
|
1747 | |||
1748 | # if client is pulling non-public changesets, we need to find |
|
1748 | # if client is pulling non-public changesets, we need to find | |
1749 | # intermediate public heads. |
|
1749 | # intermediate public heads. | |
1750 | draftheads = headsbyphase.get(phases.draft, set()) |
|
1750 | draftheads = headsbyphase.get(phases.draft, set()) | |
1751 | if draftheads: |
|
1751 | if draftheads: | |
1752 | publicheads = headsbyphase.get(phases.public, set()) |
|
1752 | publicheads = headsbyphase.get(phases.public, set()) | |
1753 |
|
1753 | |||
1754 | revset = 'heads(only(%ln, %ln) and public())' |
|
1754 | revset = 'heads(only(%ln, %ln) and public())' | |
1755 | extraheads = repo.revs(revset, draftheads, publicheads) |
|
1755 | extraheads = repo.revs(revset, draftheads, publicheads) | |
1756 | for r in extraheads: |
|
1756 | for r in extraheads: | |
1757 | headsbyphase[phases.public].add(node(r)) |
|
1757 | headsbyphase[phases.public].add(node(r)) | |
1758 |
|
1758 | |||
1759 | # transform data in a format used by the encoding function |
|
1759 | # transform data in a format used by the encoding function | |
1760 | phasemapping = [] |
|
1760 | phasemapping = [] | |
1761 | for phase in phases.allphases: |
|
1761 | for phase in phases.allphases: | |
1762 | phasemapping.append(sorted(headsbyphase[phase])) |
|
1762 | phasemapping.append(sorted(headsbyphase[phase])) | |
1763 |
|
1763 | |||
1764 | # generate the actual part |
|
1764 | # generate the actual part | |
1765 | phasedata = phases.binaryencode(phasemapping) |
|
1765 | phasedata = phases.binaryencode(phasemapping) | |
1766 | bundler.newpart('phase-heads', data=phasedata) |
|
1766 | bundler.newpart('phase-heads', data=phasedata) | |
1767 |
|
1767 | |||
1768 | @getbundle2partsgenerator('hgtagsfnodes') |
|
1768 | @getbundle2partsgenerator('hgtagsfnodes') | |
1769 | def _getbundletagsfnodes(bundler, repo, source, bundlecaps=None, |
|
1769 | def _getbundletagsfnodes(bundler, repo, source, bundlecaps=None, | |
1770 | b2caps=None, heads=None, common=None, |
|
1770 | b2caps=None, heads=None, common=None, | |
1771 | **kwargs): |
|
1771 | **kwargs): | |
1772 | """Transfer the .hgtags filenodes mapping. |
|
1772 | """Transfer the .hgtags filenodes mapping. | |
1773 |
|
1773 | |||
1774 | Only values for heads in this bundle will be transferred. |
|
1774 | Only values for heads in this bundle will be transferred. | |
1775 |
|
1775 | |||
1776 | The part data consists of pairs of 20 byte changeset node and .hgtags |
|
1776 | The part data consists of pairs of 20 byte changeset node and .hgtags | |
1777 | filenodes raw values. |
|
1777 | filenodes raw values. | |
1778 | """ |
|
1778 | """ | |
1779 | # Don't send unless: |
|
1779 | # Don't send unless: | |
1780 | # - changeset are being exchanged, |
|
1780 | # - changeset are being exchanged, | |
1781 | # - the client supports it. |
|
1781 | # - the client supports it. | |
1782 | if not (kwargs.get('cg', True) and 'hgtagsfnodes' in b2caps): |
|
1782 | if not (kwargs.get('cg', True) and 'hgtagsfnodes' in b2caps): | |
1783 | return |
|
1783 | return | |
1784 |
|
1784 | |||
1785 | outgoing = _computeoutgoing(repo, heads, common) |
|
1785 | outgoing = _computeoutgoing(repo, heads, common) | |
1786 | bundle2.addparttagsfnodescache(repo, bundler, outgoing) |
|
1786 | bundle2.addparttagsfnodescache(repo, bundler, outgoing) | |
1787 |
|
1787 | |||
1788 | def _getbookmarks(repo, **kwargs): |
|
1788 | def _getbookmarks(repo, **kwargs): | |
1789 | """Returns bookmark to node mapping. |
|
1789 | """Returns bookmark to node mapping. | |
1790 |
|
1790 | |||
1791 | This function is primarily used to generate `bookmarks` bundle2 part. |
|
1791 | This function is primarily used to generate `bookmarks` bundle2 part. | |
1792 | It is a separate function in order to make it easy to wrap it |
|
1792 | It is a separate function in order to make it easy to wrap it | |
1793 | in extensions. Passing `kwargs` to the function makes it easy to |
|
1793 | in extensions. Passing `kwargs` to the function makes it easy to | |
1794 | add new parameters in extensions. |
|
1794 | add new parameters in extensions. | |
1795 | """ |
|
1795 | """ | |
1796 |
|
1796 | |||
1797 | return dict(bookmod.listbinbookmarks(repo)) |
|
1797 | return dict(bookmod.listbinbookmarks(repo)) | |
1798 |
|
1798 | |||
1799 | def check_heads(repo, their_heads, context): |
|
1799 | def check_heads(repo, their_heads, context): | |
1800 | """check if the heads of a repo have been modified |
|
1800 | """check if the heads of a repo have been modified | |
1801 |
|
1801 | |||
1802 | Used by peer for unbundling. |
|
1802 | Used by peer for unbundling. | |
1803 | """ |
|
1803 | """ | |
1804 | heads = repo.heads() |
|
1804 | heads = repo.heads() | |
1805 | heads_hash = hashlib.sha1(''.join(sorted(heads))).digest() |
|
1805 | heads_hash = hashlib.sha1(''.join(sorted(heads))).digest() | |
1806 | if not (their_heads == ['force'] or their_heads == heads or |
|
1806 | if not (their_heads == ['force'] or their_heads == heads or | |
1807 | their_heads == ['hashed', heads_hash]): |
|
1807 | their_heads == ['hashed', heads_hash]): | |
1808 | # someone else committed/pushed/unbundled while we |
|
1808 | # someone else committed/pushed/unbundled while we | |
1809 | # were transferring data |
|
1809 | # were transferring data | |
1810 | raise error.PushRaced('repository changed while %s - ' |
|
1810 | raise error.PushRaced('repository changed while %s - ' | |
1811 | 'please try again' % context) |
|
1811 | 'please try again' % context) | |
1812 |
|
1812 | |||
1813 | def unbundle(repo, cg, heads, source, url): |
|
1813 | def unbundle(repo, cg, heads, source, url): | |
1814 | """Apply a bundle to a repo. |
|
1814 | """Apply a bundle to a repo. | |
1815 |
|
1815 | |||
1816 | this function makes sure the repo is locked during the application and have |
|
1816 | this function makes sure the repo is locked during the application and have | |
1817 | mechanism to check that no push race occurred between the creation of the |
|
1817 | mechanism to check that no push race occurred between the creation of the | |
1818 | bundle and its application. |
|
1818 | bundle and its application. | |
1819 |
|
1819 | |||
1820 | If the push was raced as PushRaced exception is raised.""" |
|
1820 | If the push was raced as PushRaced exception is raised.""" | |
1821 | r = 0 |
|
1821 | r = 0 | |
1822 | # need a transaction when processing a bundle2 stream |
|
1822 | # need a transaction when processing a bundle2 stream | |
1823 | # [wlock, lock, tr] - needs to be an array so nested functions can modify it |
|
1823 | # [wlock, lock, tr] - needs to be an array so nested functions can modify it | |
1824 | lockandtr = [None, None, None] |
|
1824 | lockandtr = [None, None, None] | |
1825 | recordout = None |
|
1825 | recordout = None | |
1826 | # quick fix for output mismatch with bundle2 in 3.4 |
|
1826 | # quick fix for output mismatch with bundle2 in 3.4 | |
1827 | captureoutput = repo.ui.configbool('experimental', 'bundle2-output-capture') |
|
1827 | captureoutput = repo.ui.configbool('experimental', 'bundle2-output-capture') | |
1828 | if url.startswith('remote:http:') or url.startswith('remote:https:'): |
|
1828 | if url.startswith('remote:http:') or url.startswith('remote:https:'): | |
1829 | captureoutput = True |
|
1829 | captureoutput = True | |
1830 | try: |
|
1830 | try: | |
1831 | # note: outside bundle1, 'heads' is expected to be empty and this |
|
1831 | # note: outside bundle1, 'heads' is expected to be empty and this | |
1832 | # 'check_heads' call wil be a no-op |
|
1832 | # 'check_heads' call wil be a no-op | |
1833 | check_heads(repo, heads, 'uploading changes') |
|
1833 | check_heads(repo, heads, 'uploading changes') | |
1834 | # push can proceed |
|
1834 | # push can proceed | |
1835 | if not isinstance(cg, bundle2.unbundle20): |
|
1835 | if not isinstance(cg, bundle2.unbundle20): | |
1836 | # legacy case: bundle1 (changegroup 01) |
|
1836 | # legacy case: bundle1 (changegroup 01) | |
1837 | txnname = "\n".join([source, util.hidepassword(url)]) |
|
1837 | txnname = "\n".join([source, util.hidepassword(url)]) | |
1838 | with repo.lock(), repo.transaction(txnname) as tr: |
|
1838 | with repo.lock(), repo.transaction(txnname) as tr: | |
1839 | op = bundle2.applybundle(repo, cg, tr, source, url) |
|
1839 | op = bundle2.applybundle(repo, cg, tr, source, url) | |
1840 | r = bundle2.combinechangegroupresults(op) |
|
1840 | r = bundle2.combinechangegroupresults(op) | |
1841 | else: |
|
1841 | else: | |
1842 | r = None |
|
1842 | r = None | |
1843 | try: |
|
1843 | try: | |
1844 | def gettransaction(): |
|
1844 | def gettransaction(): | |
1845 | if not lockandtr[2]: |
|
1845 | if not lockandtr[2]: | |
1846 | lockandtr[0] = repo.wlock() |
|
1846 | lockandtr[0] = repo.wlock() | |
1847 | lockandtr[1] = repo.lock() |
|
1847 | lockandtr[1] = repo.lock() | |
1848 | lockandtr[2] = repo.transaction(source) |
|
1848 | lockandtr[2] = repo.transaction(source) | |
1849 | lockandtr[2].hookargs['source'] = source |
|
1849 | lockandtr[2].hookargs['source'] = source | |
1850 | lockandtr[2].hookargs['url'] = url |
|
1850 | lockandtr[2].hookargs['url'] = url | |
1851 | lockandtr[2].hookargs['bundle2'] = '1' |
|
1851 | lockandtr[2].hookargs['bundle2'] = '1' | |
1852 | return lockandtr[2] |
|
1852 | return lockandtr[2] | |
1853 |
|
1853 | |||
1854 | # Do greedy locking by default until we're satisfied with lazy |
|
1854 | # Do greedy locking by default until we're satisfied with lazy | |
1855 | # locking. |
|
1855 | # locking. | |
1856 | if not repo.ui.configbool('experimental', 'bundle2lazylocking'): |
|
1856 | if not repo.ui.configbool('experimental', 'bundle2lazylocking'): | |
1857 | gettransaction() |
|
1857 | gettransaction() | |
1858 |
|
1858 | |||
1859 | op = bundle2.bundleoperation(repo, gettransaction, |
|
1859 | op = bundle2.bundleoperation(repo, gettransaction, | |
1860 | captureoutput=captureoutput) |
|
1860 | captureoutput=captureoutput) | |
1861 | try: |
|
1861 | try: | |
1862 | op = bundle2.processbundle(repo, cg, op=op) |
|
1862 | op = bundle2.processbundle(repo, cg, op=op) | |
1863 | finally: |
|
1863 | finally: | |
1864 | r = op.reply |
|
1864 | r = op.reply | |
1865 | if captureoutput and r is not None: |
|
1865 | if captureoutput and r is not None: | |
1866 | repo.ui.pushbuffer(error=True, subproc=True) |
|
1866 | repo.ui.pushbuffer(error=True, subproc=True) | |
1867 | def recordout(output): |
|
1867 | def recordout(output): | |
1868 | r.newpart('output', data=output, mandatory=False) |
|
1868 | r.newpart('output', data=output, mandatory=False) | |
1869 | if lockandtr[2] is not None: |
|
1869 | if lockandtr[2] is not None: | |
1870 | lockandtr[2].close() |
|
1870 | lockandtr[2].close() | |
1871 | except BaseException as exc: |
|
1871 | except BaseException as exc: | |
1872 | exc.duringunbundle2 = True |
|
1872 | exc.duringunbundle2 = True | |
1873 | if captureoutput and r is not None: |
|
1873 | if captureoutput and r is not None: | |
1874 | parts = exc._bundle2salvagedoutput = r.salvageoutput() |
|
1874 | parts = exc._bundle2salvagedoutput = r.salvageoutput() | |
1875 | def recordout(output): |
|
1875 | def recordout(output): | |
1876 | part = bundle2.bundlepart('output', data=output, |
|
1876 | part = bundle2.bundlepart('output', data=output, | |
1877 | mandatory=False) |
|
1877 | mandatory=False) | |
1878 | parts.append(part) |
|
1878 | parts.append(part) | |
1879 | raise |
|
1879 | raise | |
1880 | finally: |
|
1880 | finally: | |
1881 | lockmod.release(lockandtr[2], lockandtr[1], lockandtr[0]) |
|
1881 | lockmod.release(lockandtr[2], lockandtr[1], lockandtr[0]) | |
1882 | if recordout is not None: |
|
1882 | if recordout is not None: | |
1883 | recordout(repo.ui.popbuffer()) |
|
1883 | recordout(repo.ui.popbuffer()) | |
1884 | return r |
|
1884 | return r | |
1885 |
|
1885 | |||
1886 | def _maybeapplyclonebundle(pullop): |
|
1886 | def _maybeapplyclonebundle(pullop): | |
1887 | """Apply a clone bundle from a remote, if possible.""" |
|
1887 | """Apply a clone bundle from a remote, if possible.""" | |
1888 |
|
1888 | |||
1889 | repo = pullop.repo |
|
1889 | repo = pullop.repo | |
1890 | remote = pullop.remote |
|
1890 | remote = pullop.remote | |
1891 |
|
1891 | |||
1892 | if not repo.ui.configbool('ui', 'clonebundles'): |
|
1892 | if not repo.ui.configbool('ui', 'clonebundles'): | |
1893 | return |
|
1893 | return | |
1894 |
|
1894 | |||
1895 | # Only run if local repo is empty. |
|
1895 | # Only run if local repo is empty. | |
1896 | if len(repo): |
|
1896 | if len(repo): | |
1897 | return |
|
1897 | return | |
1898 |
|
1898 | |||
1899 | if pullop.heads: |
|
1899 | if pullop.heads: | |
1900 | return |
|
1900 | return | |
1901 |
|
1901 | |||
1902 | if not remote.capable('clonebundles'): |
|
1902 | if not remote.capable('clonebundles'): | |
1903 | return |
|
1903 | return | |
1904 |
|
1904 | |||
1905 | res = remote._call('clonebundles') |
|
1905 | res = remote._call('clonebundles') | |
1906 |
|
1906 | |||
1907 | # If we call the wire protocol command, that's good enough to record the |
|
1907 | # If we call the wire protocol command, that's good enough to record the | |
1908 | # attempt. |
|
1908 | # attempt. | |
1909 | pullop.clonebundleattempted = True |
|
1909 | pullop.clonebundleattempted = True | |
1910 |
|
1910 | |||
1911 | entries = parseclonebundlesmanifest(repo, res) |
|
1911 | entries = parseclonebundlesmanifest(repo, res) | |
1912 | if not entries: |
|
1912 | if not entries: | |
1913 | repo.ui.note(_('no clone bundles available on remote; ' |
|
1913 | repo.ui.note(_('no clone bundles available on remote; ' | |
1914 | 'falling back to regular clone\n')) |
|
1914 | 'falling back to regular clone\n')) | |
1915 | return |
|
1915 | return | |
1916 |
|
1916 | |||
1917 | entries = filterclonebundleentries( |
|
1917 | entries = filterclonebundleentries( | |
1918 | repo, entries, streamclonerequested=pullop.streamclonerequested) |
|
1918 | repo, entries, streamclonerequested=pullop.streamclonerequested) | |
1919 |
|
1919 | |||
1920 | if not entries: |
|
1920 | if not entries: | |
1921 | # There is a thundering herd concern here. However, if a server |
|
1921 | # There is a thundering herd concern here. However, if a server | |
1922 | # operator doesn't advertise bundles appropriate for its clients, |
|
1922 | # operator doesn't advertise bundles appropriate for its clients, | |
1923 | # they deserve what's coming. Furthermore, from a client's |
|
1923 | # they deserve what's coming. Furthermore, from a client's | |
1924 | # perspective, no automatic fallback would mean not being able to |
|
1924 | # perspective, no automatic fallback would mean not being able to | |
1925 | # clone! |
|
1925 | # clone! | |
1926 | repo.ui.warn(_('no compatible clone bundles available on server; ' |
|
1926 | repo.ui.warn(_('no compatible clone bundles available on server; ' | |
1927 | 'falling back to regular clone\n')) |
|
1927 | 'falling back to regular clone\n')) | |
1928 | repo.ui.warn(_('(you may want to report this to the server ' |
|
1928 | repo.ui.warn(_('(you may want to report this to the server ' | |
1929 | 'operator)\n')) |
|
1929 | 'operator)\n')) | |
1930 | return |
|
1930 | return | |
1931 |
|
1931 | |||
1932 | entries = sortclonebundleentries(repo.ui, entries) |
|
1932 | entries = sortclonebundleentries(repo.ui, entries) | |
1933 |
|
1933 | |||
1934 | url = entries[0]['URL'] |
|
1934 | url = entries[0]['URL'] | |
1935 | repo.ui.status(_('applying clone bundle from %s\n') % url) |
|
1935 | repo.ui.status(_('applying clone bundle from %s\n') % url) | |
1936 | if trypullbundlefromurl(repo.ui, repo, url): |
|
1936 | if trypullbundlefromurl(repo.ui, repo, url): | |
1937 | repo.ui.status(_('finished applying clone bundle\n')) |
|
1937 | repo.ui.status(_('finished applying clone bundle\n')) | |
1938 | # Bundle failed. |
|
1938 | # Bundle failed. | |
1939 | # |
|
1939 | # | |
1940 | # We abort by default to avoid the thundering herd of |
|
1940 | # We abort by default to avoid the thundering herd of | |
1941 | # clients flooding a server that was expecting expensive |
|
1941 | # clients flooding a server that was expecting expensive | |
1942 | # clone load to be offloaded. |
|
1942 | # clone load to be offloaded. | |
1943 | elif repo.ui.configbool('ui', 'clonebundlefallback'): |
|
1943 | elif repo.ui.configbool('ui', 'clonebundlefallback'): | |
1944 | repo.ui.warn(_('falling back to normal clone\n')) |
|
1944 | repo.ui.warn(_('falling back to normal clone\n')) | |
1945 | else: |
|
1945 | else: | |
1946 | raise error.Abort(_('error applying bundle'), |
|
1946 | raise error.Abort(_('error applying bundle'), | |
1947 | hint=_('if this error persists, consider contacting ' |
|
1947 | hint=_('if this error persists, consider contacting ' | |
1948 | 'the server operator or disable clone ' |
|
1948 | 'the server operator or disable clone ' | |
1949 | 'bundles via ' |
|
1949 | 'bundles via ' | |
1950 | '"--config ui.clonebundles=false"')) |
|
1950 | '"--config ui.clonebundles=false"')) | |
1951 |
|
1951 | |||
1952 | def parseclonebundlesmanifest(repo, s): |
|
1952 | def parseclonebundlesmanifest(repo, s): | |
1953 | """Parses the raw text of a clone bundles manifest. |
|
1953 | """Parses the raw text of a clone bundles manifest. | |
1954 |
|
1954 | |||
1955 | Returns a list of dicts. The dicts have a ``URL`` key corresponding |
|
1955 | Returns a list of dicts. The dicts have a ``URL`` key corresponding | |
1956 | to the URL and other keys are the attributes for the entry. |
|
1956 | to the URL and other keys are the attributes for the entry. | |
1957 | """ |
|
1957 | """ | |
1958 | m = [] |
|
1958 | m = [] | |
1959 | for line in s.splitlines(): |
|
1959 | for line in s.splitlines(): | |
1960 | fields = line.split() |
|
1960 | fields = line.split() | |
1961 | if not fields: |
|
1961 | if not fields: | |
1962 | continue |
|
1962 | continue | |
1963 | attrs = {'URL': fields[0]} |
|
1963 | attrs = {'URL': fields[0]} | |
1964 | for rawattr in fields[1:]: |
|
1964 | for rawattr in fields[1:]: | |
1965 | key, value = rawattr.split('=', 1) |
|
1965 | key, value = rawattr.split('=', 1) | |
1966 | key = urlreq.unquote(key) |
|
1966 | key = urlreq.unquote(key) | |
1967 | value = urlreq.unquote(value) |
|
1967 | value = urlreq.unquote(value) | |
1968 | attrs[key] = value |
|
1968 | attrs[key] = value | |
1969 |
|
1969 | |||
1970 | # Parse BUNDLESPEC into components. This makes client-side |
|
1970 | # Parse BUNDLESPEC into components. This makes client-side | |
1971 | # preferences easier to specify since you can prefer a single |
|
1971 | # preferences easier to specify since you can prefer a single | |
1972 | # component of the BUNDLESPEC. |
|
1972 | # component of the BUNDLESPEC. | |
1973 | if key == 'BUNDLESPEC': |
|
1973 | if key == 'BUNDLESPEC': | |
1974 | try: |
|
1974 | try: | |
1975 | comp, version, params = parsebundlespec(repo, value, |
|
1975 | comp, version, params = parsebundlespec(repo, value, | |
1976 | externalnames=True) |
|
1976 | externalnames=True) | |
1977 | attrs['COMPRESSION'] = comp |
|
1977 | attrs['COMPRESSION'] = comp | |
1978 | attrs['VERSION'] = version |
|
1978 | attrs['VERSION'] = version | |
1979 | except error.InvalidBundleSpecification: |
|
1979 | except error.InvalidBundleSpecification: | |
1980 | pass |
|
1980 | pass | |
1981 | except error.UnsupportedBundleSpecification: |
|
1981 | except error.UnsupportedBundleSpecification: | |
1982 | pass |
|
1982 | pass | |
1983 |
|
1983 | |||
1984 | m.append(attrs) |
|
1984 | m.append(attrs) | |
1985 |
|
1985 | |||
1986 | return m |
|
1986 | return m | |
1987 |
|
1987 | |||
1988 | def filterclonebundleentries(repo, entries, streamclonerequested=False): |
|
1988 | def filterclonebundleentries(repo, entries, streamclonerequested=False): | |
1989 | """Remove incompatible clone bundle manifest entries. |
|
1989 | """Remove incompatible clone bundle manifest entries. | |
1990 |
|
1990 | |||
1991 | Accepts a list of entries parsed with ``parseclonebundlesmanifest`` |
|
1991 | Accepts a list of entries parsed with ``parseclonebundlesmanifest`` | |
1992 | and returns a new list consisting of only the entries that this client |
|
1992 | and returns a new list consisting of only the entries that this client | |
1993 | should be able to apply. |
|
1993 | should be able to apply. | |
1994 |
|
1994 | |||
1995 | There is no guarantee we'll be able to apply all returned entries because |
|
1995 | There is no guarantee we'll be able to apply all returned entries because | |
1996 | the metadata we use to filter on may be missing or wrong. |
|
1996 | the metadata we use to filter on may be missing or wrong. | |
1997 | """ |
|
1997 | """ | |
1998 | newentries = [] |
|
1998 | newentries = [] | |
1999 | for entry in entries: |
|
1999 | for entry in entries: | |
2000 | spec = entry.get('BUNDLESPEC') |
|
2000 | spec = entry.get('BUNDLESPEC') | |
2001 | if spec: |
|
2001 | if spec: | |
2002 | try: |
|
2002 | try: | |
2003 | comp, version, params = parsebundlespec(repo, spec, strict=True) |
|
2003 | comp, version, params = parsebundlespec(repo, spec, strict=True) | |
2004 |
|
2004 | |||
2005 | # If a stream clone was requested, filter out non-streamclone |
|
2005 | # If a stream clone was requested, filter out non-streamclone | |
2006 | # entries. |
|
2006 | # entries. | |
2007 | if streamclonerequested and (comp != 'UN' or version != 's1'): |
|
2007 | if streamclonerequested and (comp != 'UN' or version != 's1'): | |
2008 | repo.ui.debug('filtering %s because not a stream clone\n' % |
|
2008 | repo.ui.debug('filtering %s because not a stream clone\n' % | |
2009 | entry['URL']) |
|
2009 | entry['URL']) | |
2010 | continue |
|
2010 | continue | |
2011 |
|
2011 | |||
2012 | except error.InvalidBundleSpecification as e: |
|
2012 | except error.InvalidBundleSpecification as e: | |
2013 | repo.ui.debug(str(e) + '\n') |
|
2013 | repo.ui.debug(str(e) + '\n') | |
2014 | continue |
|
2014 | continue | |
2015 | except error.UnsupportedBundleSpecification as e: |
|
2015 | except error.UnsupportedBundleSpecification as e: | |
2016 | repo.ui.debug('filtering %s because unsupported bundle ' |
|
2016 | repo.ui.debug('filtering %s because unsupported bundle ' | |
2017 | 'spec: %s\n' % (entry['URL'], str(e))) |
|
2017 | 'spec: %s\n' % (entry['URL'], str(e))) | |
2018 | continue |
|
2018 | continue | |
2019 | # If we don't have a spec and requested a stream clone, we don't know |
|
2019 | # If we don't have a spec and requested a stream clone, we don't know | |
2020 | # what the entry is so don't attempt to apply it. |
|
2020 | # what the entry is so don't attempt to apply it. | |
2021 | elif streamclonerequested: |
|
2021 | elif streamclonerequested: | |
2022 | repo.ui.debug('filtering %s because cannot determine if a stream ' |
|
2022 | repo.ui.debug('filtering %s because cannot determine if a stream ' | |
2023 | 'clone bundle\n' % entry['URL']) |
|
2023 | 'clone bundle\n' % entry['URL']) | |
2024 | continue |
|
2024 | continue | |
2025 |
|
2025 | |||
2026 | if 'REQUIRESNI' in entry and not sslutil.hassni: |
|
2026 | if 'REQUIRESNI' in entry and not sslutil.hassni: | |
2027 | repo.ui.debug('filtering %s because SNI not supported\n' % |
|
2027 | repo.ui.debug('filtering %s because SNI not supported\n' % | |
2028 | entry['URL']) |
|
2028 | entry['URL']) | |
2029 | continue |
|
2029 | continue | |
2030 |
|
2030 | |||
2031 | newentries.append(entry) |
|
2031 | newentries.append(entry) | |
2032 |
|
2032 | |||
2033 | return newentries |
|
2033 | return newentries | |
2034 |
|
2034 | |||
2035 | class clonebundleentry(object): |
|
2035 | class clonebundleentry(object): | |
2036 | """Represents an item in a clone bundles manifest. |
|
2036 | """Represents an item in a clone bundles manifest. | |
2037 |
|
2037 | |||
2038 | This rich class is needed to support sorting since sorted() in Python 3 |
|
2038 | This rich class is needed to support sorting since sorted() in Python 3 | |
2039 | doesn't support ``cmp`` and our comparison is complex enough that ``key=`` |
|
2039 | doesn't support ``cmp`` and our comparison is complex enough that ``key=`` | |
2040 | won't work. |
|
2040 | won't work. | |
2041 | """ |
|
2041 | """ | |
2042 |
|
2042 | |||
2043 | def __init__(self, value, prefers): |
|
2043 | def __init__(self, value, prefers): | |
2044 | self.value = value |
|
2044 | self.value = value | |
2045 | self.prefers = prefers |
|
2045 | self.prefers = prefers | |
2046 |
|
2046 | |||
2047 | def _cmp(self, other): |
|
2047 | def _cmp(self, other): | |
2048 | for prefkey, prefvalue in self.prefers: |
|
2048 | for prefkey, prefvalue in self.prefers: | |
2049 | avalue = self.value.get(prefkey) |
|
2049 | avalue = self.value.get(prefkey) | |
2050 | bvalue = other.value.get(prefkey) |
|
2050 | bvalue = other.value.get(prefkey) | |
2051 |
|
2051 | |||
2052 | # Special case for b missing attribute and a matches exactly. |
|
2052 | # Special case for b missing attribute and a matches exactly. | |
2053 | if avalue is not None and bvalue is None and avalue == prefvalue: |
|
2053 | if avalue is not None and bvalue is None and avalue == prefvalue: | |
2054 | return -1 |
|
2054 | return -1 | |
2055 |
|
2055 | |||
2056 | # Special case for a missing attribute and b matches exactly. |
|
2056 | # Special case for a missing attribute and b matches exactly. | |
2057 | if bvalue is not None and avalue is None and bvalue == prefvalue: |
|
2057 | if bvalue is not None and avalue is None and bvalue == prefvalue: | |
2058 | return 1 |
|
2058 | return 1 | |
2059 |
|
2059 | |||
2060 | # We can't compare unless attribute present on both. |
|
2060 | # We can't compare unless attribute present on both. | |
2061 | if avalue is None or bvalue is None: |
|
2061 | if avalue is None or bvalue is None: | |
2062 | continue |
|
2062 | continue | |
2063 |
|
2063 | |||
2064 | # Same values should fall back to next attribute. |
|
2064 | # Same values should fall back to next attribute. | |
2065 | if avalue == bvalue: |
|
2065 | if avalue == bvalue: | |
2066 | continue |
|
2066 | continue | |
2067 |
|
2067 | |||
2068 | # Exact matches come first. |
|
2068 | # Exact matches come first. | |
2069 | if avalue == prefvalue: |
|
2069 | if avalue == prefvalue: | |
2070 | return -1 |
|
2070 | return -1 | |
2071 | if bvalue == prefvalue: |
|
2071 | if bvalue == prefvalue: | |
2072 | return 1 |
|
2072 | return 1 | |
2073 |
|
2073 | |||
2074 | # Fall back to next attribute. |
|
2074 | # Fall back to next attribute. | |
2075 | continue |
|
2075 | continue | |
2076 |
|
2076 | |||
2077 | # If we got here we couldn't sort by attributes and prefers. Fall |
|
2077 | # If we got here we couldn't sort by attributes and prefers. Fall | |
2078 | # back to index order. |
|
2078 | # back to index order. | |
2079 | return 0 |
|
2079 | return 0 | |
2080 |
|
2080 | |||
2081 | def __lt__(self, other): |
|
2081 | def __lt__(self, other): | |
2082 | return self._cmp(other) < 0 |
|
2082 | return self._cmp(other) < 0 | |
2083 |
|
2083 | |||
2084 | def __gt__(self, other): |
|
2084 | def __gt__(self, other): | |
2085 | return self._cmp(other) > 0 |
|
2085 | return self._cmp(other) > 0 | |
2086 |
|
2086 | |||
2087 | def __eq__(self, other): |
|
2087 | def __eq__(self, other): | |
2088 | return self._cmp(other) == 0 |
|
2088 | return self._cmp(other) == 0 | |
2089 |
|
2089 | |||
2090 | def __le__(self, other): |
|
2090 | def __le__(self, other): | |
2091 | return self._cmp(other) <= 0 |
|
2091 | return self._cmp(other) <= 0 | |
2092 |
|
2092 | |||
2093 | def __ge__(self, other): |
|
2093 | def __ge__(self, other): | |
2094 | return self._cmp(other) >= 0 |
|
2094 | return self._cmp(other) >= 0 | |
2095 |
|
2095 | |||
2096 | def __ne__(self, other): |
|
2096 | def __ne__(self, other): | |
2097 | return self._cmp(other) != 0 |
|
2097 | return self._cmp(other) != 0 | |
2098 |
|
2098 | |||
2099 | def sortclonebundleentries(ui, entries): |
|
2099 | def sortclonebundleentries(ui, entries): | |
2100 | prefers = ui.configlist('ui', 'clonebundleprefers') |
|
2100 | prefers = ui.configlist('ui', 'clonebundleprefers') | |
2101 | if not prefers: |
|
2101 | if not prefers: | |
2102 | return list(entries) |
|
2102 | return list(entries) | |
2103 |
|
2103 | |||
2104 | prefers = [p.split('=', 1) for p in prefers] |
|
2104 | prefers = [p.split('=', 1) for p in prefers] | |
2105 |
|
2105 | |||
2106 | items = sorted(clonebundleentry(v, prefers) for v in entries) |
|
2106 | items = sorted(clonebundleentry(v, prefers) for v in entries) | |
2107 | return [i.value for i in items] |
|
2107 | return [i.value for i in items] | |
2108 |
|
2108 | |||
2109 | def trypullbundlefromurl(ui, repo, url): |
|
2109 | def trypullbundlefromurl(ui, repo, url): | |
2110 | """Attempt to apply a bundle from a URL.""" |
|
2110 | """Attempt to apply a bundle from a URL.""" | |
2111 | with repo.lock(), repo.transaction('bundleurl') as tr: |
|
2111 | with repo.lock(), repo.transaction('bundleurl') as tr: | |
2112 | try: |
|
2112 | try: | |
2113 | fh = urlmod.open(ui, url) |
|
2113 | fh = urlmod.open(ui, url) | |
2114 | cg = readbundle(ui, fh, 'stream') |
|
2114 | cg = readbundle(ui, fh, 'stream') | |
2115 |
|
2115 | |||
2116 | if isinstance(cg, streamclone.streamcloneapplier): |
|
2116 | if isinstance(cg, streamclone.streamcloneapplier): | |
2117 | cg.apply(repo) |
|
2117 | cg.apply(repo) | |
2118 | else: |
|
2118 | else: | |
2119 | bundle2.applybundle(repo, cg, tr, 'clonebundles', url) |
|
2119 | bundle2.applybundle(repo, cg, tr, 'clonebundles', url) | |
2120 | return True |
|
2120 | return True | |
2121 | except urlerr.httperror as e: |
|
2121 | except urlerr.httperror as e: | |
2122 | ui.warn(_('HTTP error fetching bundle: %s\n') % str(e)) |
|
2122 | ui.warn(_('HTTP error fetching bundle: %s\n') % str(e)) | |
2123 | except urlerr.urlerror as e: |
|
2123 | except urlerr.urlerror as e: | |
2124 | ui.warn(_('error fetching bundle: %s\n') % e.reason) |
|
2124 | ui.warn(_('error fetching bundle: %s\n') % e.reason) | |
2125 |
|
2125 | |||
2126 | return False |
|
2126 | return False |
General Comments 0
You need to be logged in to leave comments.
Login now