Show More
@@ -1,5637 +1,5637 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 | logcmdutil, |
|
44 | logcmdutil, | |
45 | merge as mergemod, |
|
45 | merge as mergemod, | |
46 | obsolete, |
|
46 | obsolete, | |
47 | obsutil, |
|
47 | obsutil, | |
48 | patch, |
|
48 | patch, | |
49 | phases, |
|
49 | phases, | |
50 | pycompat, |
|
50 | pycompat, | |
51 | rcutil, |
|
51 | rcutil, | |
52 | registrar, |
|
52 | registrar, | |
53 | revsetlang, |
|
53 | revsetlang, | |
54 | rewriteutil, |
|
54 | rewriteutil, | |
55 | scmutil, |
|
55 | scmutil, | |
56 | server, |
|
56 | server, | |
57 | streamclone, |
|
57 | streamclone, | |
58 | tags as tagsmod, |
|
58 | tags as tagsmod, | |
59 | templatekw, |
|
59 | templatekw, | |
60 | ui as uimod, |
|
60 | ui as uimod, | |
61 | util, |
|
61 | util, | |
62 | wireprotoserver, |
|
62 | wireprotoserver, | |
63 | ) |
|
63 | ) | |
64 | from .utils import ( |
|
64 | from .utils import ( | |
65 | dateutil, |
|
65 | dateutil, | |
66 | procutil, |
|
66 | procutil, | |
67 | stringutil, |
|
67 | stringutil, | |
68 | ) |
|
68 | ) | |
69 |
|
69 | |||
70 | release = lockmod.release |
|
70 | release = lockmod.release | |
71 |
|
71 | |||
72 | table = {} |
|
72 | table = {} | |
73 | table.update(debugcommandsmod.command._table) |
|
73 | table.update(debugcommandsmod.command._table) | |
74 |
|
74 | |||
75 | command = registrar.command(table) |
|
75 | command = registrar.command(table) | |
76 | readonly = registrar.command.readonly |
|
76 | readonly = registrar.command.readonly | |
77 |
|
77 | |||
78 | # common command options |
|
78 | # common command options | |
79 |
|
79 | |||
80 | globalopts = [ |
|
80 | globalopts = [ | |
81 | ('R', 'repository', '', |
|
81 | ('R', 'repository', '', | |
82 | _('repository root directory or name of overlay bundle file'), |
|
82 | _('repository root directory or name of overlay bundle file'), | |
83 | _('REPO')), |
|
83 | _('REPO')), | |
84 | ('', 'cwd', '', |
|
84 | ('', 'cwd', '', | |
85 | _('change working directory'), _('DIR')), |
|
85 | _('change working directory'), _('DIR')), | |
86 | ('y', 'noninteractive', None, |
|
86 | ('y', 'noninteractive', None, | |
87 | _('do not prompt, automatically pick the first choice for all prompts')), |
|
87 | _('do not prompt, automatically pick the first choice for all prompts')), | |
88 | ('q', 'quiet', None, _('suppress output')), |
|
88 | ('q', 'quiet', None, _('suppress output')), | |
89 | ('v', 'verbose', None, _('enable additional output')), |
|
89 | ('v', 'verbose', None, _('enable additional output')), | |
90 | ('', 'color', '', |
|
90 | ('', 'color', '', | |
91 | # i18n: 'always', 'auto', 'never', and 'debug' are keywords |
|
91 | # i18n: 'always', 'auto', 'never', and 'debug' are keywords | |
92 | # and should not be translated |
|
92 | # and should not be translated | |
93 | _("when to colorize (boolean, always, auto, never, or debug)"), |
|
93 | _("when to colorize (boolean, always, auto, never, or debug)"), | |
94 | _('TYPE')), |
|
94 | _('TYPE')), | |
95 | ('', 'config', [], |
|
95 | ('', 'config', [], | |
96 | _('set/override config option (use \'section.name=value\')'), |
|
96 | _('set/override config option (use \'section.name=value\')'), | |
97 | _('CONFIG')), |
|
97 | _('CONFIG')), | |
98 | ('', 'debug', None, _('enable debugging output')), |
|
98 | ('', 'debug', None, _('enable debugging output')), | |
99 | ('', 'debugger', None, _('start debugger')), |
|
99 | ('', 'debugger', None, _('start debugger')), | |
100 | ('', 'encoding', encoding.encoding, _('set the charset encoding'), |
|
100 | ('', 'encoding', encoding.encoding, _('set the charset encoding'), | |
101 | _('ENCODE')), |
|
101 | _('ENCODE')), | |
102 | ('', 'encodingmode', encoding.encodingmode, |
|
102 | ('', 'encodingmode', encoding.encodingmode, | |
103 | _('set the charset encoding mode'), _('MODE')), |
|
103 | _('set the charset encoding mode'), _('MODE')), | |
104 | ('', 'traceback', None, _('always print a traceback on exception')), |
|
104 | ('', 'traceback', None, _('always print a traceback on exception')), | |
105 | ('', 'time', None, _('time how long the command takes')), |
|
105 | ('', 'time', None, _('time how long the command takes')), | |
106 | ('', 'profile', None, _('print command execution profile')), |
|
106 | ('', 'profile', None, _('print command execution profile')), | |
107 | ('', 'version', None, _('output version information and exit')), |
|
107 | ('', 'version', None, _('output version information and exit')), | |
108 | ('h', 'help', None, _('display help and exit')), |
|
108 | ('h', 'help', None, _('display help and exit')), | |
109 | ('', 'hidden', False, _('consider hidden changesets')), |
|
109 | ('', 'hidden', False, _('consider hidden changesets')), | |
110 | ('', 'pager', 'auto', |
|
110 | ('', 'pager', 'auto', | |
111 | _("when to paginate (boolean, always, auto, or never)"), _('TYPE')), |
|
111 | _("when to paginate (boolean, always, auto, or never)"), _('TYPE')), | |
112 | ] |
|
112 | ] | |
113 |
|
113 | |||
114 | dryrunopts = cmdutil.dryrunopts |
|
114 | dryrunopts = cmdutil.dryrunopts | |
115 | remoteopts = cmdutil.remoteopts |
|
115 | remoteopts = cmdutil.remoteopts | |
116 | walkopts = cmdutil.walkopts |
|
116 | walkopts = cmdutil.walkopts | |
117 | commitopts = cmdutil.commitopts |
|
117 | commitopts = cmdutil.commitopts | |
118 | commitopts2 = cmdutil.commitopts2 |
|
118 | commitopts2 = cmdutil.commitopts2 | |
119 | formatteropts = cmdutil.formatteropts |
|
119 | formatteropts = cmdutil.formatteropts | |
120 | templateopts = cmdutil.templateopts |
|
120 | templateopts = cmdutil.templateopts | |
121 | logopts = cmdutil.logopts |
|
121 | logopts = cmdutil.logopts | |
122 | diffopts = cmdutil.diffopts |
|
122 | diffopts = cmdutil.diffopts | |
123 | diffwsopts = cmdutil.diffwsopts |
|
123 | diffwsopts = cmdutil.diffwsopts | |
124 | diffopts2 = cmdutil.diffopts2 |
|
124 | diffopts2 = cmdutil.diffopts2 | |
125 | mergetoolopts = cmdutil.mergetoolopts |
|
125 | mergetoolopts = cmdutil.mergetoolopts | |
126 | similarityopts = cmdutil.similarityopts |
|
126 | similarityopts = cmdutil.similarityopts | |
127 | subrepoopts = cmdutil.subrepoopts |
|
127 | subrepoopts = cmdutil.subrepoopts | |
128 | debugrevlogopts = cmdutil.debugrevlogopts |
|
128 | debugrevlogopts = cmdutil.debugrevlogopts | |
129 |
|
129 | |||
130 | # Commands start here, listed alphabetically |
|
130 | # Commands start here, listed alphabetically | |
131 |
|
131 | |||
132 | @command('^add', |
|
132 | @command('^add', | |
133 | walkopts + subrepoopts + dryrunopts, |
|
133 | walkopts + subrepoopts + dryrunopts, | |
134 | _('[OPTION]... [FILE]...'), |
|
134 | _('[OPTION]... [FILE]...'), | |
135 | inferrepo=True) |
|
135 | inferrepo=True) | |
136 | def add(ui, repo, *pats, **opts): |
|
136 | def add(ui, repo, *pats, **opts): | |
137 | """add the specified files on the next commit |
|
137 | """add the specified files on the next commit | |
138 |
|
138 | |||
139 | Schedule files to be version controlled and added to the |
|
139 | Schedule files to be version controlled and added to the | |
140 | repository. |
|
140 | repository. | |
141 |
|
141 | |||
142 | The files will be added to the repository at the next commit. To |
|
142 | The files will be added to the repository at the next commit. To | |
143 | undo an add before that, see :hg:`forget`. |
|
143 | undo an add before that, see :hg:`forget`. | |
144 |
|
144 | |||
145 | If no names are given, add all files to the repository (except |
|
145 | If no names are given, add all files to the repository (except | |
146 | files matching ``.hgignore``). |
|
146 | files matching ``.hgignore``). | |
147 |
|
147 | |||
148 | .. container:: verbose |
|
148 | .. container:: verbose | |
149 |
|
149 | |||
150 | Examples: |
|
150 | Examples: | |
151 |
|
151 | |||
152 | - New (unknown) files are added |
|
152 | - New (unknown) files are added | |
153 | automatically by :hg:`add`:: |
|
153 | automatically by :hg:`add`:: | |
154 |
|
154 | |||
155 | $ ls |
|
155 | $ ls | |
156 | foo.c |
|
156 | foo.c | |
157 | $ hg status |
|
157 | $ hg status | |
158 | ? foo.c |
|
158 | ? foo.c | |
159 | $ hg add |
|
159 | $ hg add | |
160 | adding foo.c |
|
160 | adding foo.c | |
161 | $ hg status |
|
161 | $ hg status | |
162 | A foo.c |
|
162 | A foo.c | |
163 |
|
163 | |||
164 | - Specific files to be added can be specified:: |
|
164 | - Specific files to be added can be specified:: | |
165 |
|
165 | |||
166 | $ ls |
|
166 | $ ls | |
167 | bar.c foo.c |
|
167 | bar.c foo.c | |
168 | $ hg status |
|
168 | $ hg status | |
169 | ? bar.c |
|
169 | ? bar.c | |
170 | ? foo.c |
|
170 | ? foo.c | |
171 | $ hg add bar.c |
|
171 | $ hg add bar.c | |
172 | $ hg status |
|
172 | $ hg status | |
173 | A bar.c |
|
173 | A bar.c | |
174 | ? foo.c |
|
174 | ? foo.c | |
175 |
|
175 | |||
176 | Returns 0 if all files are successfully added. |
|
176 | Returns 0 if all files are successfully added. | |
177 | """ |
|
177 | """ | |
178 |
|
178 | |||
179 | m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts)) |
|
179 | m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts)) | |
180 | rejected = cmdutil.add(ui, repo, m, "", False, **opts) |
|
180 | rejected = cmdutil.add(ui, repo, m, "", False, **opts) | |
181 | return rejected and 1 or 0 |
|
181 | return rejected and 1 or 0 | |
182 |
|
182 | |||
183 | @command('addremove', |
|
183 | @command('addremove', | |
184 | similarityopts + subrepoopts + walkopts + dryrunopts, |
|
184 | similarityopts + subrepoopts + walkopts + dryrunopts, | |
185 | _('[OPTION]... [FILE]...'), |
|
185 | _('[OPTION]... [FILE]...'), | |
186 | inferrepo=True) |
|
186 | inferrepo=True) | |
187 | def addremove(ui, repo, *pats, **opts): |
|
187 | def addremove(ui, repo, *pats, **opts): | |
188 | """add all new files, delete all missing files |
|
188 | """add all new files, delete all missing files | |
189 |
|
189 | |||
190 | Add all new files and remove all missing files from the |
|
190 | Add all new files and remove all missing files from the | |
191 | repository. |
|
191 | repository. | |
192 |
|
192 | |||
193 | Unless names are given, new files are ignored if they match any of |
|
193 | Unless names are given, new files are ignored if they match any of | |
194 | the patterns in ``.hgignore``. As with add, these changes take |
|
194 | the patterns in ``.hgignore``. As with add, these changes take | |
195 | effect at the next commit. |
|
195 | effect at the next commit. | |
196 |
|
196 | |||
197 | Use the -s/--similarity option to detect renamed files. This |
|
197 | Use the -s/--similarity option to detect renamed files. This | |
198 | option takes a percentage between 0 (disabled) and 100 (files must |
|
198 | option takes a percentage between 0 (disabled) and 100 (files must | |
199 | be identical) as its parameter. With a parameter greater than 0, |
|
199 | be identical) as its parameter. With a parameter greater than 0, | |
200 | this compares every removed file with every added file and records |
|
200 | this compares every removed file with every added file and records | |
201 | those similar enough as renames. Detecting renamed files this way |
|
201 | those similar enough as renames. Detecting renamed files this way | |
202 | can be expensive. After using this option, :hg:`status -C` can be |
|
202 | can be expensive. After using this option, :hg:`status -C` can be | |
203 | used to check which files were identified as moved or renamed. If |
|
203 | used to check which files were identified as moved or renamed. If | |
204 | not specified, -s/--similarity defaults to 100 and only renames of |
|
204 | not specified, -s/--similarity defaults to 100 and only renames of | |
205 | identical files are detected. |
|
205 | identical files are detected. | |
206 |
|
206 | |||
207 | .. container:: verbose |
|
207 | .. container:: verbose | |
208 |
|
208 | |||
209 | Examples: |
|
209 | Examples: | |
210 |
|
210 | |||
211 | - A number of files (bar.c and foo.c) are new, |
|
211 | - A number of files (bar.c and foo.c) are new, | |
212 | while foobar.c has been removed (without using :hg:`remove`) |
|
212 | while foobar.c has been removed (without using :hg:`remove`) | |
213 | from the repository:: |
|
213 | from the repository:: | |
214 |
|
214 | |||
215 | $ ls |
|
215 | $ ls | |
216 | bar.c foo.c |
|
216 | bar.c foo.c | |
217 | $ hg status |
|
217 | $ hg status | |
218 | ! foobar.c |
|
218 | ! foobar.c | |
219 | ? bar.c |
|
219 | ? bar.c | |
220 | ? foo.c |
|
220 | ? foo.c | |
221 | $ hg addremove |
|
221 | $ hg addremove | |
222 | adding bar.c |
|
222 | adding bar.c | |
223 | adding foo.c |
|
223 | adding foo.c | |
224 | removing foobar.c |
|
224 | removing foobar.c | |
225 | $ hg status |
|
225 | $ hg status | |
226 | A bar.c |
|
226 | A bar.c | |
227 | A foo.c |
|
227 | A foo.c | |
228 | R foobar.c |
|
228 | R foobar.c | |
229 |
|
229 | |||
230 | - A file foobar.c was moved to foo.c without using :hg:`rename`. |
|
230 | - A file foobar.c was moved to foo.c without using :hg:`rename`. | |
231 | Afterwards, it was edited slightly:: |
|
231 | Afterwards, it was edited slightly:: | |
232 |
|
232 | |||
233 | $ ls |
|
233 | $ ls | |
234 | foo.c |
|
234 | foo.c | |
235 | $ hg status |
|
235 | $ hg status | |
236 | ! foobar.c |
|
236 | ! foobar.c | |
237 | ? foo.c |
|
237 | ? foo.c | |
238 | $ hg addremove --similarity 90 |
|
238 | $ hg addremove --similarity 90 | |
239 | removing foobar.c |
|
239 | removing foobar.c | |
240 | adding foo.c |
|
240 | adding foo.c | |
241 | recording removal of foobar.c as rename to foo.c (94% similar) |
|
241 | recording removal of foobar.c as rename to foo.c (94% similar) | |
242 | $ hg status -C |
|
242 | $ hg status -C | |
243 | A foo.c |
|
243 | A foo.c | |
244 | foobar.c |
|
244 | foobar.c | |
245 | R foobar.c |
|
245 | R foobar.c | |
246 |
|
246 | |||
247 | Returns 0 if all files are successfully added. |
|
247 | Returns 0 if all files are successfully added. | |
248 | """ |
|
248 | """ | |
249 | opts = pycompat.byteskwargs(opts) |
|
249 | opts = pycompat.byteskwargs(opts) | |
250 | try: |
|
250 | try: | |
251 | sim = float(opts.get('similarity') or 100) |
|
251 | sim = float(opts.get('similarity') or 100) | |
252 | except ValueError: |
|
252 | except ValueError: | |
253 | raise error.Abort(_('similarity must be a number')) |
|
253 | raise error.Abort(_('similarity must be a number')) | |
254 | if sim < 0 or sim > 100: |
|
254 | if sim < 0 or sim > 100: | |
255 | raise error.Abort(_('similarity must be between 0 and 100')) |
|
255 | raise error.Abort(_('similarity must be between 0 and 100')) | |
256 | matcher = scmutil.match(repo[None], pats, opts) |
|
256 | matcher = scmutil.match(repo[None], pats, opts) | |
257 | return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0) |
|
257 | return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0) | |
258 |
|
258 | |||
259 | @command('^annotate|blame', |
|
259 | @command('^annotate|blame', | |
260 | [('r', 'rev', '', _('annotate the specified revision'), _('REV')), |
|
260 | [('r', 'rev', '', _('annotate the specified revision'), _('REV')), | |
261 | ('', 'follow', None, |
|
261 | ('', 'follow', None, | |
262 | _('follow copies/renames and list the filename (DEPRECATED)')), |
|
262 | _('follow copies/renames and list the filename (DEPRECATED)')), | |
263 | ('', 'no-follow', None, _("don't follow copies and renames")), |
|
263 | ('', 'no-follow', None, _("don't follow copies and renames")), | |
264 | ('a', 'text', None, _('treat all files as text')), |
|
264 | ('a', 'text', None, _('treat all files as text')), | |
265 | ('u', 'user', None, _('list the author (long with -v)')), |
|
265 | ('u', 'user', None, _('list the author (long with -v)')), | |
266 | ('f', 'file', None, _('list the filename')), |
|
266 | ('f', 'file', None, _('list the filename')), | |
267 | ('d', 'date', None, _('list the date (short with -q)')), |
|
267 | ('d', 'date', None, _('list the date (short with -q)')), | |
268 | ('n', 'number', None, _('list the revision number (default)')), |
|
268 | ('n', 'number', None, _('list the revision number (default)')), | |
269 | ('c', 'changeset', None, _('list the changeset')), |
|
269 | ('c', 'changeset', None, _('list the changeset')), | |
270 | ('l', 'line-number', None, _('show line number at the first appearance')), |
|
270 | ('l', 'line-number', None, _('show line number at the first appearance')), | |
271 | ('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')), |
|
271 | ('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')), | |
272 | ] + diffwsopts + walkopts + formatteropts, |
|
272 | ] + diffwsopts + walkopts + formatteropts, | |
273 | _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'), |
|
273 | _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'), | |
274 | inferrepo=True) |
|
274 | inferrepo=True) | |
275 | def annotate(ui, repo, *pats, **opts): |
|
275 | def annotate(ui, repo, *pats, **opts): | |
276 | """show changeset information by line for each file |
|
276 | """show changeset information by line for each file | |
277 |
|
277 | |||
278 | List changes in files, showing the revision id responsible for |
|
278 | List changes in files, showing the revision id responsible for | |
279 | each line. |
|
279 | each line. | |
280 |
|
280 | |||
281 | This command is useful for discovering when a change was made and |
|
281 | This command is useful for discovering when a change was made and | |
282 | by whom. |
|
282 | by whom. | |
283 |
|
283 | |||
284 | If you include --file, --user, or --date, the revision number is |
|
284 | If you include --file, --user, or --date, the revision number is | |
285 | suppressed unless you also include --number. |
|
285 | suppressed unless you also include --number. | |
286 |
|
286 | |||
287 | Without the -a/--text option, annotate will avoid processing files |
|
287 | Without the -a/--text option, annotate will avoid processing files | |
288 | it detects as binary. With -a, annotate will annotate the file |
|
288 | it detects as binary. With -a, annotate will annotate the file | |
289 | anyway, although the results will probably be neither useful |
|
289 | anyway, although the results will probably be neither useful | |
290 | nor desirable. |
|
290 | nor desirable. | |
291 |
|
291 | |||
292 | Returns 0 on success. |
|
292 | Returns 0 on success. | |
293 | """ |
|
293 | """ | |
294 | opts = pycompat.byteskwargs(opts) |
|
294 | opts = pycompat.byteskwargs(opts) | |
295 | if not pats: |
|
295 | if not pats: | |
296 | raise error.Abort(_('at least one filename or pattern is required')) |
|
296 | raise error.Abort(_('at least one filename or pattern is required')) | |
297 |
|
297 | |||
298 | if opts.get('follow'): |
|
298 | if opts.get('follow'): | |
299 | # --follow is deprecated and now just an alias for -f/--file |
|
299 | # --follow is deprecated and now just an alias for -f/--file | |
300 | # to mimic the behavior of Mercurial before version 1.5 |
|
300 | # to mimic the behavior of Mercurial before version 1.5 | |
301 | opts['file'] = True |
|
301 | opts['file'] = True | |
302 |
|
302 | |||
303 | rev = opts.get('rev') |
|
303 | rev = opts.get('rev') | |
304 | if rev: |
|
304 | if rev: | |
305 | repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
|
305 | repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') | |
306 | ctx = scmutil.revsingle(repo, rev) |
|
306 | ctx = scmutil.revsingle(repo, rev) | |
307 |
|
307 | |||
308 | rootfm = ui.formatter('annotate', opts) |
|
308 | rootfm = ui.formatter('annotate', opts) | |
309 | if ui.quiet: |
|
309 | if ui.quiet: | |
310 | datefunc = dateutil.shortdate |
|
310 | datefunc = dateutil.shortdate | |
311 | else: |
|
311 | else: | |
312 | datefunc = dateutil.datestr |
|
312 | datefunc = dateutil.datestr | |
313 | if ctx.rev() is None: |
|
313 | if ctx.rev() is None: | |
314 | def hexfn(node): |
|
314 | def hexfn(node): | |
315 | if node is None: |
|
315 | if node is None: | |
316 | return None |
|
316 | return None | |
317 | else: |
|
317 | else: | |
318 | return rootfm.hexfunc(node) |
|
318 | return rootfm.hexfunc(node) | |
319 | if opts.get('changeset'): |
|
319 | if opts.get('changeset'): | |
320 | # omit "+" suffix which is appended to node hex |
|
320 | # omit "+" suffix which is appended to node hex | |
321 | def formatrev(rev): |
|
321 | def formatrev(rev): | |
322 | if rev is None: |
|
322 | if rev is None: | |
323 | return '%d' % ctx.p1().rev() |
|
323 | return '%d' % ctx.p1().rev() | |
324 | else: |
|
324 | else: | |
325 | return '%d' % rev |
|
325 | return '%d' % rev | |
326 | else: |
|
326 | else: | |
327 | def formatrev(rev): |
|
327 | def formatrev(rev): | |
328 | if rev is None: |
|
328 | if rev is None: | |
329 | return '%d+' % ctx.p1().rev() |
|
329 | return '%d+' % ctx.p1().rev() | |
330 | else: |
|
330 | else: | |
331 | return '%d ' % rev |
|
331 | return '%d ' % rev | |
332 | def formathex(hex): |
|
332 | def formathex(hex): | |
333 | if hex is None: |
|
333 | if hex is None: | |
334 | return '%s+' % rootfm.hexfunc(ctx.p1().node()) |
|
334 | return '%s+' % rootfm.hexfunc(ctx.p1().node()) | |
335 | else: |
|
335 | else: | |
336 | return '%s ' % hex |
|
336 | return '%s ' % hex | |
337 | else: |
|
337 | else: | |
338 | hexfn = rootfm.hexfunc |
|
338 | hexfn = rootfm.hexfunc | |
339 | formatrev = formathex = pycompat.bytestr |
|
339 | formatrev = formathex = pycompat.bytestr | |
340 |
|
340 | |||
341 | opmap = [('user', ' ', lambda x: x.fctx.user(), ui.shortuser), |
|
341 | opmap = [('user', ' ', lambda x: x.fctx.user(), ui.shortuser), | |
342 | ('number', ' ', lambda x: x.fctx.rev(), formatrev), |
|
342 | ('number', ' ', lambda x: x.fctx.rev(), formatrev), | |
343 | ('changeset', ' ', lambda x: hexfn(x.fctx.node()), formathex), |
|
343 | ('changeset', ' ', lambda x: hexfn(x.fctx.node()), formathex), | |
344 | ('date', ' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)), |
|
344 | ('date', ' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)), | |
345 | ('file', ' ', lambda x: x.fctx.path(), pycompat.bytestr), |
|
345 | ('file', ' ', lambda x: x.fctx.path(), pycompat.bytestr), | |
346 | ('line_number', ':', lambda x: x.lineno, pycompat.bytestr), |
|
346 | ('line_number', ':', lambda x: x.lineno, pycompat.bytestr), | |
347 | ] |
|
347 | ] | |
348 | fieldnamemap = {'number': 'rev', 'changeset': 'node'} |
|
348 | fieldnamemap = {'number': 'rev', 'changeset': 'node'} | |
349 |
|
349 | |||
350 | if (not opts.get('user') and not opts.get('changeset') |
|
350 | if (not opts.get('user') and not opts.get('changeset') | |
351 | and not opts.get('date') and not opts.get('file')): |
|
351 | and not opts.get('date') and not opts.get('file')): | |
352 | opts['number'] = True |
|
352 | opts['number'] = True | |
353 |
|
353 | |||
354 | linenumber = opts.get('line_number') is not None |
|
354 | linenumber = opts.get('line_number') is not None | |
355 | if linenumber and (not opts.get('changeset')) and (not opts.get('number')): |
|
355 | if linenumber and (not opts.get('changeset')) and (not opts.get('number')): | |
356 | raise error.Abort(_('at least one of -n/-c is required for -l')) |
|
356 | raise error.Abort(_('at least one of -n/-c is required for -l')) | |
357 |
|
357 | |||
358 | ui.pager('annotate') |
|
358 | ui.pager('annotate') | |
359 |
|
359 | |||
360 | if rootfm.isplain(): |
|
360 | if rootfm.isplain(): | |
361 | def makefunc(get, fmt): |
|
361 | def makefunc(get, fmt): | |
362 | return lambda x: fmt(get(x)) |
|
362 | return lambda x: fmt(get(x)) | |
363 | else: |
|
363 | else: | |
364 | def makefunc(get, fmt): |
|
364 | def makefunc(get, fmt): | |
365 | return get |
|
365 | return get | |
366 | funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap |
|
366 | funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap | |
367 | if opts.get(op)] |
|
367 | if opts.get(op)] | |
368 | funcmap[0] = (funcmap[0][0], '') # no separator in front of first column |
|
368 | funcmap[0] = (funcmap[0][0], '') # no separator in front of first column | |
369 | fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap |
|
369 | fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap | |
370 | if opts.get(op)) |
|
370 | if opts.get(op)) | |
371 |
|
371 | |||
372 | def bad(x, y): |
|
372 | def bad(x, y): | |
373 | raise error.Abort("%s: %s" % (x, y)) |
|
373 | raise error.Abort("%s: %s" % (x, y)) | |
374 |
|
374 | |||
375 | m = scmutil.match(ctx, pats, opts, badfn=bad) |
|
375 | m = scmutil.match(ctx, pats, opts, badfn=bad) | |
376 |
|
376 | |||
377 | follow = not opts.get('no_follow') |
|
377 | follow = not opts.get('no_follow') | |
378 | diffopts = patch.difffeatureopts(ui, opts, section='annotate', |
|
378 | diffopts = patch.difffeatureopts(ui, opts, section='annotate', | |
379 | whitespace=True) |
|
379 | whitespace=True) | |
380 | skiprevs = opts.get('skip') |
|
380 | skiprevs = opts.get('skip') | |
381 | if skiprevs: |
|
381 | if skiprevs: | |
382 | skiprevs = scmutil.revrange(repo, skiprevs) |
|
382 | skiprevs = scmutil.revrange(repo, skiprevs) | |
383 |
|
383 | |||
384 | for abs in ctx.walk(m): |
|
384 | for abs in ctx.walk(m): | |
385 | fctx = ctx[abs] |
|
385 | fctx = ctx[abs] | |
386 | rootfm.startitem() |
|
386 | rootfm.startitem() | |
387 | rootfm.data(abspath=abs, path=m.rel(abs)) |
|
387 | rootfm.data(abspath=abs, path=m.rel(abs)) | |
388 | if not opts.get('text') and fctx.isbinary(): |
|
388 | if not opts.get('text') and fctx.isbinary(): | |
389 | rootfm.plain(_("%s: binary file\n") |
|
389 | rootfm.plain(_("%s: binary file\n") | |
390 | % ((pats and m.rel(abs)) or abs)) |
|
390 | % ((pats and m.rel(abs)) or abs)) | |
391 | continue |
|
391 | continue | |
392 |
|
392 | |||
393 | fm = rootfm.nested('lines') |
|
393 | fm = rootfm.nested('lines') | |
394 | lines = fctx.annotate(follow=follow, skiprevs=skiprevs, |
|
394 | lines = fctx.annotate(follow=follow, skiprevs=skiprevs, | |
395 | diffopts=diffopts) |
|
395 | diffopts=diffopts) | |
396 | if not lines: |
|
396 | if not lines: | |
397 | fm.end() |
|
397 | fm.end() | |
398 | continue |
|
398 | continue | |
399 | formats = [] |
|
399 | formats = [] | |
400 | pieces = [] |
|
400 | pieces = [] | |
401 |
|
401 | |||
402 | for f, sep in funcmap: |
|
402 | for f, sep in funcmap: | |
403 | l = [f(n) for n in lines] |
|
403 | l = [f(n) for n in lines] | |
404 | if fm.isplain(): |
|
404 | if fm.isplain(): | |
405 | sizes = [encoding.colwidth(x) for x in l] |
|
405 | sizes = [encoding.colwidth(x) for x in l] | |
406 | ml = max(sizes) |
|
406 | ml = max(sizes) | |
407 | formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes]) |
|
407 | formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes]) | |
408 | else: |
|
408 | else: | |
409 | formats.append(['%s' for x in l]) |
|
409 | formats.append(['%s' for x in l]) | |
410 | pieces.append(l) |
|
410 | pieces.append(l) | |
411 |
|
411 | |||
412 | for f, p, n in zip(zip(*formats), zip(*pieces), lines): |
|
412 | for f, p, n in zip(zip(*formats), zip(*pieces), lines): | |
413 | fm.startitem() |
|
413 | fm.startitem() | |
414 | fm.context(fctx=n.fctx) |
|
414 | fm.context(fctx=n.fctx) | |
415 | fm.write(fields, "".join(f), *p) |
|
415 | fm.write(fields, "".join(f), *p) | |
416 | if n.skip: |
|
416 | if n.skip: | |
417 | fmt = "* %s" |
|
417 | fmt = "* %s" | |
418 | else: |
|
418 | else: | |
419 | fmt = ": %s" |
|
419 | fmt = ": %s" | |
420 | fm.write('line', fmt, n.text) |
|
420 | fm.write('line', fmt, n.text) | |
421 |
|
421 | |||
422 | if not lines[-1].text.endswith('\n'): |
|
422 | if not lines[-1].text.endswith('\n'): | |
423 | fm.plain('\n') |
|
423 | fm.plain('\n') | |
424 | fm.end() |
|
424 | fm.end() | |
425 |
|
425 | |||
426 | rootfm.end() |
|
426 | rootfm.end() | |
427 |
|
427 | |||
428 | @command('archive', |
|
428 | @command('archive', | |
429 | [('', 'no-decode', None, _('do not pass files through decoders')), |
|
429 | [('', 'no-decode', None, _('do not pass files through decoders')), | |
430 | ('p', 'prefix', '', _('directory prefix for files in archive'), |
|
430 | ('p', 'prefix', '', _('directory prefix for files in archive'), | |
431 | _('PREFIX')), |
|
431 | _('PREFIX')), | |
432 | ('r', 'rev', '', _('revision to distribute'), _('REV')), |
|
432 | ('r', 'rev', '', _('revision to distribute'), _('REV')), | |
433 | ('t', 'type', '', _('type of distribution to create'), _('TYPE')), |
|
433 | ('t', 'type', '', _('type of distribution to create'), _('TYPE')), | |
434 | ] + subrepoopts + walkopts, |
|
434 | ] + subrepoopts + walkopts, | |
435 | _('[OPTION]... DEST')) |
|
435 | _('[OPTION]... DEST')) | |
436 | def archive(ui, repo, dest, **opts): |
|
436 | def archive(ui, repo, dest, **opts): | |
437 | '''create an unversioned archive of a repository revision |
|
437 | '''create an unversioned archive of a repository revision | |
438 |
|
438 | |||
439 | By default, the revision used is the parent of the working |
|
439 | By default, the revision used is the parent of the working | |
440 | directory; use -r/--rev to specify a different revision. |
|
440 | directory; use -r/--rev to specify a different revision. | |
441 |
|
441 | |||
442 | The archive type is automatically detected based on file |
|
442 | The archive type is automatically detected based on file | |
443 | extension (to override, use -t/--type). |
|
443 | extension (to override, use -t/--type). | |
444 |
|
444 | |||
445 | .. container:: verbose |
|
445 | .. container:: verbose | |
446 |
|
446 | |||
447 | Examples: |
|
447 | Examples: | |
448 |
|
448 | |||
449 | - create a zip file containing the 1.0 release:: |
|
449 | - create a zip file containing the 1.0 release:: | |
450 |
|
450 | |||
451 | hg archive -r 1.0 project-1.0.zip |
|
451 | hg archive -r 1.0 project-1.0.zip | |
452 |
|
452 | |||
453 | - create a tarball excluding .hg files:: |
|
453 | - create a tarball excluding .hg files:: | |
454 |
|
454 | |||
455 | hg archive project.tar.gz -X ".hg*" |
|
455 | hg archive project.tar.gz -X ".hg*" | |
456 |
|
456 | |||
457 | Valid types are: |
|
457 | Valid types are: | |
458 |
|
458 | |||
459 | :``files``: a directory full of files (default) |
|
459 | :``files``: a directory full of files (default) | |
460 | :``tar``: tar archive, uncompressed |
|
460 | :``tar``: tar archive, uncompressed | |
461 | :``tbz2``: tar archive, compressed using bzip2 |
|
461 | :``tbz2``: tar archive, compressed using bzip2 | |
462 | :``tgz``: tar archive, compressed using gzip |
|
462 | :``tgz``: tar archive, compressed using gzip | |
463 | :``uzip``: zip archive, uncompressed |
|
463 | :``uzip``: zip archive, uncompressed | |
464 | :``zip``: zip archive, compressed using deflate |
|
464 | :``zip``: zip archive, compressed using deflate | |
465 |
|
465 | |||
466 | The exact name of the destination archive or directory is given |
|
466 | The exact name of the destination archive or directory is given | |
467 | using a format string; see :hg:`help export` for details. |
|
467 | using a format string; see :hg:`help export` for details. | |
468 |
|
468 | |||
469 | Each member added to an archive file has a directory prefix |
|
469 | Each member added to an archive file has a directory prefix | |
470 | prepended. Use -p/--prefix to specify a format string for the |
|
470 | prepended. Use -p/--prefix to specify a format string for the | |
471 | prefix. The default is the basename of the archive, with suffixes |
|
471 | prefix. The default is the basename of the archive, with suffixes | |
472 | removed. |
|
472 | removed. | |
473 |
|
473 | |||
474 | Returns 0 on success. |
|
474 | Returns 0 on success. | |
475 | ''' |
|
475 | ''' | |
476 |
|
476 | |||
477 | opts = pycompat.byteskwargs(opts) |
|
477 | opts = pycompat.byteskwargs(opts) | |
478 | rev = opts.get('rev') |
|
478 | rev = opts.get('rev') | |
479 | if rev: |
|
479 | if rev: | |
480 | repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
|
480 | repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') | |
481 | ctx = scmutil.revsingle(repo, rev) |
|
481 | ctx = scmutil.revsingle(repo, rev) | |
482 | if not ctx: |
|
482 | if not ctx: | |
483 | raise error.Abort(_('no working directory: please specify a revision')) |
|
483 | raise error.Abort(_('no working directory: please specify a revision')) | |
484 | node = ctx.node() |
|
484 | node = ctx.node() | |
485 | dest = cmdutil.makefilename(ctx, dest) |
|
485 | dest = cmdutil.makefilename(ctx, dest) | |
486 | if os.path.realpath(dest) == repo.root: |
|
486 | if os.path.realpath(dest) == repo.root: | |
487 | raise error.Abort(_('repository root cannot be destination')) |
|
487 | raise error.Abort(_('repository root cannot be destination')) | |
488 |
|
488 | |||
489 | kind = opts.get('type') or archival.guesskind(dest) or 'files' |
|
489 | kind = opts.get('type') or archival.guesskind(dest) or 'files' | |
490 | prefix = opts.get('prefix') |
|
490 | prefix = opts.get('prefix') | |
491 |
|
491 | |||
492 | if dest == '-': |
|
492 | if dest == '-': | |
493 | if kind == 'files': |
|
493 | if kind == 'files': | |
494 | raise error.Abort(_('cannot archive plain files to stdout')) |
|
494 | raise error.Abort(_('cannot archive plain files to stdout')) | |
495 | dest = cmdutil.makefileobj(ctx, dest) |
|
495 | dest = cmdutil.makefileobj(ctx, dest) | |
496 | if not prefix: |
|
496 | if not prefix: | |
497 | prefix = os.path.basename(repo.root) + '-%h' |
|
497 | prefix = os.path.basename(repo.root) + '-%h' | |
498 |
|
498 | |||
499 | prefix = cmdutil.makefilename(ctx, prefix) |
|
499 | prefix = cmdutil.makefilename(ctx, prefix) | |
500 | match = scmutil.match(ctx, [], opts) |
|
500 | match = scmutil.match(ctx, [], opts) | |
501 | archival.archive(repo, dest, node, kind, not opts.get('no_decode'), |
|
501 | archival.archive(repo, dest, node, kind, not opts.get('no_decode'), | |
502 | match, prefix, subrepos=opts.get('subrepos')) |
|
502 | match, prefix, subrepos=opts.get('subrepos')) | |
503 |
|
503 | |||
504 | @command('backout', |
|
504 | @command('backout', | |
505 | [('', 'merge', None, _('merge with old dirstate parent after backout')), |
|
505 | [('', 'merge', None, _('merge with old dirstate parent after backout')), | |
506 | ('', 'commit', None, |
|
506 | ('', 'commit', None, | |
507 | _('commit if no conflicts were encountered (DEPRECATED)')), |
|
507 | _('commit if no conflicts were encountered (DEPRECATED)')), | |
508 | ('', 'no-commit', None, _('do not commit')), |
|
508 | ('', 'no-commit', None, _('do not commit')), | |
509 | ('', 'parent', '', |
|
509 | ('', 'parent', '', | |
510 | _('parent to choose when backing out merge (DEPRECATED)'), _('REV')), |
|
510 | _('parent to choose when backing out merge (DEPRECATED)'), _('REV')), | |
511 | ('r', 'rev', '', _('revision to backout'), _('REV')), |
|
511 | ('r', 'rev', '', _('revision to backout'), _('REV')), | |
512 | ('e', 'edit', False, _('invoke editor on commit messages')), |
|
512 | ('e', 'edit', False, _('invoke editor on commit messages')), | |
513 | ] + mergetoolopts + walkopts + commitopts + commitopts2, |
|
513 | ] + mergetoolopts + walkopts + commitopts + commitopts2, | |
514 | _('[OPTION]... [-r] REV')) |
|
514 | _('[OPTION]... [-r] REV')) | |
515 | def backout(ui, repo, node=None, rev=None, **opts): |
|
515 | def backout(ui, repo, node=None, rev=None, **opts): | |
516 | '''reverse effect of earlier changeset |
|
516 | '''reverse effect of earlier changeset | |
517 |
|
517 | |||
518 | Prepare a new changeset with the effect of REV undone in the |
|
518 | Prepare a new changeset with the effect of REV undone in the | |
519 | current working directory. If no conflicts were encountered, |
|
519 | current working directory. If no conflicts were encountered, | |
520 | it will be committed immediately. |
|
520 | it will be committed immediately. | |
521 |
|
521 | |||
522 | If REV is the parent of the working directory, then this new changeset |
|
522 | If REV is the parent of the working directory, then this new changeset | |
523 | is committed automatically (unless --no-commit is specified). |
|
523 | is committed automatically (unless --no-commit is specified). | |
524 |
|
524 | |||
525 | .. note:: |
|
525 | .. note:: | |
526 |
|
526 | |||
527 | :hg:`backout` cannot be used to fix either an unwanted or |
|
527 | :hg:`backout` cannot be used to fix either an unwanted or | |
528 | incorrect merge. |
|
528 | incorrect merge. | |
529 |
|
529 | |||
530 | .. container:: verbose |
|
530 | .. container:: verbose | |
531 |
|
531 | |||
532 | Examples: |
|
532 | Examples: | |
533 |
|
533 | |||
534 | - Reverse the effect of the parent of the working directory. |
|
534 | - Reverse the effect of the parent of the working directory. | |
535 | This backout will be committed immediately:: |
|
535 | This backout will be committed immediately:: | |
536 |
|
536 | |||
537 | hg backout -r . |
|
537 | hg backout -r . | |
538 |
|
538 | |||
539 | - Reverse the effect of previous bad revision 23:: |
|
539 | - Reverse the effect of previous bad revision 23:: | |
540 |
|
540 | |||
541 | hg backout -r 23 |
|
541 | hg backout -r 23 | |
542 |
|
542 | |||
543 | - Reverse the effect of previous bad revision 23 and |
|
543 | - Reverse the effect of previous bad revision 23 and | |
544 | leave changes uncommitted:: |
|
544 | leave changes uncommitted:: | |
545 |
|
545 | |||
546 | hg backout -r 23 --no-commit |
|
546 | hg backout -r 23 --no-commit | |
547 | hg commit -m "Backout revision 23" |
|
547 | hg commit -m "Backout revision 23" | |
548 |
|
548 | |||
549 | By default, the pending changeset will have one parent, |
|
549 | By default, the pending changeset will have one parent, | |
550 | maintaining a linear history. With --merge, the pending |
|
550 | maintaining a linear history. With --merge, the pending | |
551 | changeset will instead have two parents: the old parent of the |
|
551 | changeset will instead have two parents: the old parent of the | |
552 | working directory and a new child of REV that simply undoes REV. |
|
552 | working directory and a new child of REV that simply undoes REV. | |
553 |
|
553 | |||
554 | Before version 1.7, the behavior without --merge was equivalent |
|
554 | Before version 1.7, the behavior without --merge was equivalent | |
555 | to specifying --merge followed by :hg:`update --clean .` to |
|
555 | to specifying --merge followed by :hg:`update --clean .` to | |
556 | cancel the merge and leave the child of REV as a head to be |
|
556 | cancel the merge and leave the child of REV as a head to be | |
557 | merged separately. |
|
557 | merged separately. | |
558 |
|
558 | |||
559 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
559 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
560 |
|
560 | |||
561 | See :hg:`help revert` for a way to restore files to the state |
|
561 | See :hg:`help revert` for a way to restore files to the state | |
562 | of another revision. |
|
562 | of another revision. | |
563 |
|
563 | |||
564 | Returns 0 on success, 1 if nothing to backout or there are unresolved |
|
564 | Returns 0 on success, 1 if nothing to backout or there are unresolved | |
565 | files. |
|
565 | files. | |
566 | ''' |
|
566 | ''' | |
567 | wlock = lock = None |
|
567 | wlock = lock = None | |
568 | try: |
|
568 | try: | |
569 | wlock = repo.wlock() |
|
569 | wlock = repo.wlock() | |
570 | lock = repo.lock() |
|
570 | lock = repo.lock() | |
571 | return _dobackout(ui, repo, node, rev, **opts) |
|
571 | return _dobackout(ui, repo, node, rev, **opts) | |
572 | finally: |
|
572 | finally: | |
573 | release(lock, wlock) |
|
573 | release(lock, wlock) | |
574 |
|
574 | |||
575 | def _dobackout(ui, repo, node=None, rev=None, **opts): |
|
575 | def _dobackout(ui, repo, node=None, rev=None, **opts): | |
576 | opts = pycompat.byteskwargs(opts) |
|
576 | opts = pycompat.byteskwargs(opts) | |
577 | if opts.get('commit') and opts.get('no_commit'): |
|
577 | if opts.get('commit') and opts.get('no_commit'): | |
578 | raise error.Abort(_("cannot use --commit with --no-commit")) |
|
578 | raise error.Abort(_("cannot use --commit with --no-commit")) | |
579 | if opts.get('merge') and opts.get('no_commit'): |
|
579 | if opts.get('merge') and opts.get('no_commit'): | |
580 | raise error.Abort(_("cannot use --merge with --no-commit")) |
|
580 | raise error.Abort(_("cannot use --merge with --no-commit")) | |
581 |
|
581 | |||
582 | if rev and node: |
|
582 | if rev and node: | |
583 | raise error.Abort(_("please specify just one revision")) |
|
583 | raise error.Abort(_("please specify just one revision")) | |
584 |
|
584 | |||
585 | if not rev: |
|
585 | if not rev: | |
586 | rev = node |
|
586 | rev = node | |
587 |
|
587 | |||
588 | if not rev: |
|
588 | if not rev: | |
589 | raise error.Abort(_("please specify a revision to backout")) |
|
589 | raise error.Abort(_("please specify a revision to backout")) | |
590 |
|
590 | |||
591 | date = opts.get('date') |
|
591 | date = opts.get('date') | |
592 | if date: |
|
592 | if date: | |
593 | opts['date'] = dateutil.parsedate(date) |
|
593 | opts['date'] = dateutil.parsedate(date) | |
594 |
|
594 | |||
595 | cmdutil.checkunfinished(repo) |
|
595 | cmdutil.checkunfinished(repo) | |
596 | cmdutil.bailifchanged(repo) |
|
596 | cmdutil.bailifchanged(repo) | |
597 | node = scmutil.revsingle(repo, rev).node() |
|
597 | node = scmutil.revsingle(repo, rev).node() | |
598 |
|
598 | |||
599 | op1, op2 = repo.dirstate.parents() |
|
599 | op1, op2 = repo.dirstate.parents() | |
600 | if not repo.changelog.isancestor(node, op1): |
|
600 | if not repo.changelog.isancestor(node, op1): | |
601 | raise error.Abort(_('cannot backout change that is not an ancestor')) |
|
601 | raise error.Abort(_('cannot backout change that is not an ancestor')) | |
602 |
|
602 | |||
603 | p1, p2 = repo.changelog.parents(node) |
|
603 | p1, p2 = repo.changelog.parents(node) | |
604 | if p1 == nullid: |
|
604 | if p1 == nullid: | |
605 | raise error.Abort(_('cannot backout a change with no parents')) |
|
605 | raise error.Abort(_('cannot backout a change with no parents')) | |
606 | if p2 != nullid: |
|
606 | if p2 != nullid: | |
607 | if not opts.get('parent'): |
|
607 | if not opts.get('parent'): | |
608 | raise error.Abort(_('cannot backout a merge changeset')) |
|
608 | raise error.Abort(_('cannot backout a merge changeset')) | |
609 | p = repo.lookup(opts['parent']) |
|
609 | p = repo.lookup(opts['parent']) | |
610 | if p not in (p1, p2): |
|
610 | if p not in (p1, p2): | |
611 | raise error.Abort(_('%s is not a parent of %s') % |
|
611 | raise error.Abort(_('%s is not a parent of %s') % | |
612 | (short(p), short(node))) |
|
612 | (short(p), short(node))) | |
613 | parent = p |
|
613 | parent = p | |
614 | else: |
|
614 | else: | |
615 | if opts.get('parent'): |
|
615 | if opts.get('parent'): | |
616 | raise error.Abort(_('cannot use --parent on non-merge changeset')) |
|
616 | raise error.Abort(_('cannot use --parent on non-merge changeset')) | |
617 | parent = p1 |
|
617 | parent = p1 | |
618 |
|
618 | |||
619 | # the backout should appear on the same branch |
|
619 | # the backout should appear on the same branch | |
620 | branch = repo.dirstate.branch() |
|
620 | branch = repo.dirstate.branch() | |
621 | bheads = repo.branchheads(branch) |
|
621 | bheads = repo.branchheads(branch) | |
622 | rctx = scmutil.revsingle(repo, hex(parent)) |
|
622 | rctx = scmutil.revsingle(repo, hex(parent)) | |
623 | if not opts.get('merge') and op1 != node: |
|
623 | if not opts.get('merge') and op1 != node: | |
624 | dsguard = dirstateguard.dirstateguard(repo, 'backout') |
|
624 | dsguard = dirstateguard.dirstateguard(repo, 'backout') | |
625 | try: |
|
625 | try: | |
626 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
626 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | |
627 | 'backout') |
|
627 | 'backout') | |
628 | stats = mergemod.update(repo, parent, True, True, node, False) |
|
628 | stats = mergemod.update(repo, parent, True, True, node, False) | |
629 | repo.setparents(op1, op2) |
|
629 | repo.setparents(op1, op2) | |
630 | dsguard.close() |
|
630 | dsguard.close() | |
631 | hg._showstats(repo, stats) |
|
631 | hg._showstats(repo, stats) | |
632 | if stats.unresolvedcount: |
|
632 | if stats.unresolvedcount: | |
633 | repo.ui.status(_("use 'hg resolve' to retry unresolved " |
|
633 | repo.ui.status(_("use 'hg resolve' to retry unresolved " | |
634 | "file merges\n")) |
|
634 | "file merges\n")) | |
635 | return 1 |
|
635 | return 1 | |
636 | finally: |
|
636 | finally: | |
637 | ui.setconfig('ui', 'forcemerge', '', '') |
|
637 | ui.setconfig('ui', 'forcemerge', '', '') | |
638 | lockmod.release(dsguard) |
|
638 | lockmod.release(dsguard) | |
639 | else: |
|
639 | else: | |
640 | hg.clean(repo, node, show_stats=False) |
|
640 | hg.clean(repo, node, show_stats=False) | |
641 | repo.dirstate.setbranch(branch) |
|
641 | repo.dirstate.setbranch(branch) | |
642 | cmdutil.revert(ui, repo, rctx, repo.dirstate.parents()) |
|
642 | cmdutil.revert(ui, repo, rctx, repo.dirstate.parents()) | |
643 |
|
643 | |||
644 | if opts.get('no_commit'): |
|
644 | if opts.get('no_commit'): | |
645 | msg = _("changeset %s backed out, " |
|
645 | msg = _("changeset %s backed out, " | |
646 | "don't forget to commit.\n") |
|
646 | "don't forget to commit.\n") | |
647 | ui.status(msg % short(node)) |
|
647 | ui.status(msg % short(node)) | |
648 | return 0 |
|
648 | return 0 | |
649 |
|
649 | |||
650 | def commitfunc(ui, repo, message, match, opts): |
|
650 | def commitfunc(ui, repo, message, match, opts): | |
651 | editform = 'backout' |
|
651 | editform = 'backout' | |
652 | e = cmdutil.getcommiteditor(editform=editform, |
|
652 | e = cmdutil.getcommiteditor(editform=editform, | |
653 | **pycompat.strkwargs(opts)) |
|
653 | **pycompat.strkwargs(opts)) | |
654 | if not message: |
|
654 | if not message: | |
655 | # we don't translate commit messages |
|
655 | # we don't translate commit messages | |
656 | message = "Backed out changeset %s" % short(node) |
|
656 | message = "Backed out changeset %s" % short(node) | |
657 | e = cmdutil.getcommiteditor(edit=True, editform=editform) |
|
657 | e = cmdutil.getcommiteditor(edit=True, editform=editform) | |
658 | return repo.commit(message, opts.get('user'), opts.get('date'), |
|
658 | return repo.commit(message, opts.get('user'), opts.get('date'), | |
659 | match, editor=e) |
|
659 | match, editor=e) | |
660 | newnode = cmdutil.commit(ui, repo, commitfunc, [], opts) |
|
660 | newnode = cmdutil.commit(ui, repo, commitfunc, [], opts) | |
661 | if not newnode: |
|
661 | if not newnode: | |
662 | ui.status(_("nothing changed\n")) |
|
662 | ui.status(_("nothing changed\n")) | |
663 | return 1 |
|
663 | return 1 | |
664 | cmdutil.commitstatus(repo, newnode, branch, bheads) |
|
664 | cmdutil.commitstatus(repo, newnode, branch, bheads) | |
665 |
|
665 | |||
666 | def nice(node): |
|
666 | def nice(node): | |
667 | return '%d:%s' % (repo.changelog.rev(node), short(node)) |
|
667 | return '%d:%s' % (repo.changelog.rev(node), short(node)) | |
668 | ui.status(_('changeset %s backs out changeset %s\n') % |
|
668 | ui.status(_('changeset %s backs out changeset %s\n') % | |
669 | (nice(repo.changelog.tip()), nice(node))) |
|
669 | (nice(repo.changelog.tip()), nice(node))) | |
670 | if opts.get('merge') and op1 != node: |
|
670 | if opts.get('merge') and op1 != node: | |
671 | hg.clean(repo, op1, show_stats=False) |
|
671 | hg.clean(repo, op1, show_stats=False) | |
672 | ui.status(_('merging with changeset %s\n') |
|
672 | ui.status(_('merging with changeset %s\n') | |
673 | % nice(repo.changelog.tip())) |
|
673 | % nice(repo.changelog.tip())) | |
674 | try: |
|
674 | try: | |
675 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
675 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | |
676 | 'backout') |
|
676 | 'backout') | |
677 | return hg.merge(repo, hex(repo.changelog.tip())) |
|
677 | return hg.merge(repo, hex(repo.changelog.tip())) | |
678 | finally: |
|
678 | finally: | |
679 | ui.setconfig('ui', 'forcemerge', '', '') |
|
679 | ui.setconfig('ui', 'forcemerge', '', '') | |
680 | return 0 |
|
680 | return 0 | |
681 |
|
681 | |||
682 | @command('bisect', |
|
682 | @command('bisect', | |
683 | [('r', 'reset', False, _('reset bisect state')), |
|
683 | [('r', 'reset', False, _('reset bisect state')), | |
684 | ('g', 'good', False, _('mark changeset good')), |
|
684 | ('g', 'good', False, _('mark changeset good')), | |
685 | ('b', 'bad', False, _('mark changeset bad')), |
|
685 | ('b', 'bad', False, _('mark changeset bad')), | |
686 | ('s', 'skip', False, _('skip testing changeset')), |
|
686 | ('s', 'skip', False, _('skip testing changeset')), | |
687 | ('e', 'extend', False, _('extend the bisect range')), |
|
687 | ('e', 'extend', False, _('extend the bisect range')), | |
688 | ('c', 'command', '', _('use command to check changeset state'), _('CMD')), |
|
688 | ('c', 'command', '', _('use command to check changeset state'), _('CMD')), | |
689 | ('U', 'noupdate', False, _('do not update to target'))], |
|
689 | ('U', 'noupdate', False, _('do not update to target'))], | |
690 | _("[-gbsr] [-U] [-c CMD] [REV]")) |
|
690 | _("[-gbsr] [-U] [-c CMD] [REV]")) | |
691 | def bisect(ui, repo, rev=None, extra=None, command=None, |
|
691 | def bisect(ui, repo, rev=None, extra=None, command=None, | |
692 | reset=None, good=None, bad=None, skip=None, extend=None, |
|
692 | reset=None, good=None, bad=None, skip=None, extend=None, | |
693 | noupdate=None): |
|
693 | noupdate=None): | |
694 | """subdivision search of changesets |
|
694 | """subdivision search of changesets | |
695 |
|
695 | |||
696 | This command helps to find changesets which introduce problems. To |
|
696 | This command helps to find changesets which introduce problems. To | |
697 | use, mark the earliest changeset you know exhibits the problem as |
|
697 | use, mark the earliest changeset you know exhibits the problem as | |
698 | bad, then mark the latest changeset which is free from the problem |
|
698 | bad, then mark the latest changeset which is free from the problem | |
699 | as good. Bisect will update your working directory to a revision |
|
699 | as good. Bisect will update your working directory to a revision | |
700 | for testing (unless the -U/--noupdate option is specified). Once |
|
700 | for testing (unless the -U/--noupdate option is specified). Once | |
701 | you have performed tests, mark the working directory as good or |
|
701 | you have performed tests, mark the working directory as good or | |
702 | bad, and bisect will either update to another candidate changeset |
|
702 | bad, and bisect will either update to another candidate changeset | |
703 | or announce that it has found the bad revision. |
|
703 | or announce that it has found the bad revision. | |
704 |
|
704 | |||
705 | As a shortcut, you can also use the revision argument to mark a |
|
705 | As a shortcut, you can also use the revision argument to mark a | |
706 | revision as good or bad without checking it out first. |
|
706 | revision as good or bad without checking it out first. | |
707 |
|
707 | |||
708 | If you supply a command, it will be used for automatic bisection. |
|
708 | If you supply a command, it will be used for automatic bisection. | |
709 | The environment variable HG_NODE will contain the ID of the |
|
709 | The environment variable HG_NODE will contain the ID of the | |
710 | changeset being tested. The exit status of the command will be |
|
710 | changeset being tested. The exit status of the command will be | |
711 | used to mark revisions as good or bad: status 0 means good, 125 |
|
711 | used to mark revisions as good or bad: status 0 means good, 125 | |
712 | means to skip the revision, 127 (command not found) will abort the |
|
712 | means to skip the revision, 127 (command not found) will abort the | |
713 | bisection, and any other non-zero exit status means the revision |
|
713 | bisection, and any other non-zero exit status means the revision | |
714 | is bad. |
|
714 | is bad. | |
715 |
|
715 | |||
716 | .. container:: verbose |
|
716 | .. container:: verbose | |
717 |
|
717 | |||
718 | Some examples: |
|
718 | Some examples: | |
719 |
|
719 | |||
720 | - start a bisection with known bad revision 34, and good revision 12:: |
|
720 | - start a bisection with known bad revision 34, and good revision 12:: | |
721 |
|
721 | |||
722 | hg bisect --bad 34 |
|
722 | hg bisect --bad 34 | |
723 | hg bisect --good 12 |
|
723 | hg bisect --good 12 | |
724 |
|
724 | |||
725 | - advance the current bisection by marking current revision as good or |
|
725 | - advance the current bisection by marking current revision as good or | |
726 | bad:: |
|
726 | bad:: | |
727 |
|
727 | |||
728 | hg bisect --good |
|
728 | hg bisect --good | |
729 | hg bisect --bad |
|
729 | hg bisect --bad | |
730 |
|
730 | |||
731 | - mark the current revision, or a known revision, to be skipped (e.g. if |
|
731 | - mark the current revision, or a known revision, to be skipped (e.g. if | |
732 | that revision is not usable because of another issue):: |
|
732 | that revision is not usable because of another issue):: | |
733 |
|
733 | |||
734 | hg bisect --skip |
|
734 | hg bisect --skip | |
735 | hg bisect --skip 23 |
|
735 | hg bisect --skip 23 | |
736 |
|
736 | |||
737 | - skip all revisions that do not touch directories ``foo`` or ``bar``:: |
|
737 | - skip all revisions that do not touch directories ``foo`` or ``bar``:: | |
738 |
|
738 | |||
739 | hg bisect --skip "!( file('path:foo') & file('path:bar') )" |
|
739 | hg bisect --skip "!( file('path:foo') & file('path:bar') )" | |
740 |
|
740 | |||
741 | - forget the current bisection:: |
|
741 | - forget the current bisection:: | |
742 |
|
742 | |||
743 | hg bisect --reset |
|
743 | hg bisect --reset | |
744 |
|
744 | |||
745 | - use 'make && make tests' to automatically find the first broken |
|
745 | - use 'make && make tests' to automatically find the first broken | |
746 | revision:: |
|
746 | revision:: | |
747 |
|
747 | |||
748 | hg bisect --reset |
|
748 | hg bisect --reset | |
749 | hg bisect --bad 34 |
|
749 | hg bisect --bad 34 | |
750 | hg bisect --good 12 |
|
750 | hg bisect --good 12 | |
751 | hg bisect --command "make && make tests" |
|
751 | hg bisect --command "make && make tests" | |
752 |
|
752 | |||
753 | - see all changesets whose states are already known in the current |
|
753 | - see all changesets whose states are already known in the current | |
754 | bisection:: |
|
754 | bisection:: | |
755 |
|
755 | |||
756 | hg log -r "bisect(pruned)" |
|
756 | hg log -r "bisect(pruned)" | |
757 |
|
757 | |||
758 | - see the changeset currently being bisected (especially useful |
|
758 | - see the changeset currently being bisected (especially useful | |
759 | if running with -U/--noupdate):: |
|
759 | if running with -U/--noupdate):: | |
760 |
|
760 | |||
761 | hg log -r "bisect(current)" |
|
761 | hg log -r "bisect(current)" | |
762 |
|
762 | |||
763 | - see all changesets that took part in the current bisection:: |
|
763 | - see all changesets that took part in the current bisection:: | |
764 |
|
764 | |||
765 | hg log -r "bisect(range)" |
|
765 | hg log -r "bisect(range)" | |
766 |
|
766 | |||
767 | - you can even get a nice graph:: |
|
767 | - you can even get a nice graph:: | |
768 |
|
768 | |||
769 | hg log --graph -r "bisect(range)" |
|
769 | hg log --graph -r "bisect(range)" | |
770 |
|
770 | |||
771 | See :hg:`help revisions.bisect` for more about the `bisect()` predicate. |
|
771 | See :hg:`help revisions.bisect` for more about the `bisect()` predicate. | |
772 |
|
772 | |||
773 | Returns 0 on success. |
|
773 | Returns 0 on success. | |
774 | """ |
|
774 | """ | |
775 | # backward compatibility |
|
775 | # backward compatibility | |
776 | if rev in "good bad reset init".split(): |
|
776 | if rev in "good bad reset init".split(): | |
777 | ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n")) |
|
777 | ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n")) | |
778 | cmd, rev, extra = rev, extra, None |
|
778 | cmd, rev, extra = rev, extra, None | |
779 | if cmd == "good": |
|
779 | if cmd == "good": | |
780 | good = True |
|
780 | good = True | |
781 | elif cmd == "bad": |
|
781 | elif cmd == "bad": | |
782 | bad = True |
|
782 | bad = True | |
783 | else: |
|
783 | else: | |
784 | reset = True |
|
784 | reset = True | |
785 | elif extra: |
|
785 | elif extra: | |
786 | raise error.Abort(_('incompatible arguments')) |
|
786 | raise error.Abort(_('incompatible arguments')) | |
787 |
|
787 | |||
788 | incompatibles = { |
|
788 | incompatibles = { | |
789 | '--bad': bad, |
|
789 | '--bad': bad, | |
790 | '--command': bool(command), |
|
790 | '--command': bool(command), | |
791 | '--extend': extend, |
|
791 | '--extend': extend, | |
792 | '--good': good, |
|
792 | '--good': good, | |
793 | '--reset': reset, |
|
793 | '--reset': reset, | |
794 | '--skip': skip, |
|
794 | '--skip': skip, | |
795 | } |
|
795 | } | |
796 |
|
796 | |||
797 | enabled = [x for x in incompatibles if incompatibles[x]] |
|
797 | enabled = [x for x in incompatibles if incompatibles[x]] | |
798 |
|
798 | |||
799 | if len(enabled) > 1: |
|
799 | if len(enabled) > 1: | |
800 | raise error.Abort(_('%s and %s are incompatible') % |
|
800 | raise error.Abort(_('%s and %s are incompatible') % | |
801 | tuple(sorted(enabled)[0:2])) |
|
801 | tuple(sorted(enabled)[0:2])) | |
802 |
|
802 | |||
803 | if reset: |
|
803 | if reset: | |
804 | hbisect.resetstate(repo) |
|
804 | hbisect.resetstate(repo) | |
805 | return |
|
805 | return | |
806 |
|
806 | |||
807 | state = hbisect.load_state(repo) |
|
807 | state = hbisect.load_state(repo) | |
808 |
|
808 | |||
809 | # update state |
|
809 | # update state | |
810 | if good or bad or skip: |
|
810 | if good or bad or skip: | |
811 | if rev: |
|
811 | if rev: | |
812 | nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])] |
|
812 | nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])] | |
813 | else: |
|
813 | else: | |
814 | nodes = [repo.lookup('.')] |
|
814 | nodes = [repo.lookup('.')] | |
815 | if good: |
|
815 | if good: | |
816 | state['good'] += nodes |
|
816 | state['good'] += nodes | |
817 | elif bad: |
|
817 | elif bad: | |
818 | state['bad'] += nodes |
|
818 | state['bad'] += nodes | |
819 | elif skip: |
|
819 | elif skip: | |
820 | state['skip'] += nodes |
|
820 | state['skip'] += nodes | |
821 | hbisect.save_state(repo, state) |
|
821 | hbisect.save_state(repo, state) | |
822 | if not (state['good'] and state['bad']): |
|
822 | if not (state['good'] and state['bad']): | |
823 | return |
|
823 | return | |
824 |
|
824 | |||
825 | def mayupdate(repo, node, show_stats=True): |
|
825 | def mayupdate(repo, node, show_stats=True): | |
826 | """common used update sequence""" |
|
826 | """common used update sequence""" | |
827 | if noupdate: |
|
827 | if noupdate: | |
828 | return |
|
828 | return | |
829 | cmdutil.checkunfinished(repo) |
|
829 | cmdutil.checkunfinished(repo) | |
830 | cmdutil.bailifchanged(repo) |
|
830 | cmdutil.bailifchanged(repo) | |
831 | return hg.clean(repo, node, show_stats=show_stats) |
|
831 | return hg.clean(repo, node, show_stats=show_stats) | |
832 |
|
832 | |||
833 | displayer = logcmdutil.changesetdisplayer(ui, repo, {}) |
|
833 | displayer = logcmdutil.changesetdisplayer(ui, repo, {}) | |
834 |
|
834 | |||
835 | if command: |
|
835 | if command: | |
836 | changesets = 1 |
|
836 | changesets = 1 | |
837 | if noupdate: |
|
837 | if noupdate: | |
838 | try: |
|
838 | try: | |
839 | node = state['current'][0] |
|
839 | node = state['current'][0] | |
840 | except LookupError: |
|
840 | except LookupError: | |
841 | raise error.Abort(_('current bisect revision is unknown - ' |
|
841 | raise error.Abort(_('current bisect revision is unknown - ' | |
842 | 'start a new bisect to fix')) |
|
842 | 'start a new bisect to fix')) | |
843 | else: |
|
843 | else: | |
844 | node, p2 = repo.dirstate.parents() |
|
844 | node, p2 = repo.dirstate.parents() | |
845 | if p2 != nullid: |
|
845 | if p2 != nullid: | |
846 | raise error.Abort(_('current bisect revision is a merge')) |
|
846 | raise error.Abort(_('current bisect revision is a merge')) | |
847 | if rev: |
|
847 | if rev: | |
848 | node = repo[scmutil.revsingle(repo, rev, node)].node() |
|
848 | node = repo[scmutil.revsingle(repo, rev, node)].node() | |
849 | try: |
|
849 | try: | |
850 | while changesets: |
|
850 | while changesets: | |
851 | # update state |
|
851 | # update state | |
852 | state['current'] = [node] |
|
852 | state['current'] = [node] | |
853 | hbisect.save_state(repo, state) |
|
853 | hbisect.save_state(repo, state) | |
854 | status = ui.system(command, environ={'HG_NODE': hex(node)}, |
|
854 | status = ui.system(command, environ={'HG_NODE': hex(node)}, | |
855 | blockedtag='bisect_check') |
|
855 | blockedtag='bisect_check') | |
856 | if status == 125: |
|
856 | if status == 125: | |
857 | transition = "skip" |
|
857 | transition = "skip" | |
858 | elif status == 0: |
|
858 | elif status == 0: | |
859 | transition = "good" |
|
859 | transition = "good" | |
860 | # status < 0 means process was killed |
|
860 | # status < 0 means process was killed | |
861 | elif status == 127: |
|
861 | elif status == 127: | |
862 | raise error.Abort(_("failed to execute %s") % command) |
|
862 | raise error.Abort(_("failed to execute %s") % command) | |
863 | elif status < 0: |
|
863 | elif status < 0: | |
864 | raise error.Abort(_("%s killed") % command) |
|
864 | raise error.Abort(_("%s killed") % command) | |
865 | else: |
|
865 | else: | |
866 | transition = "bad" |
|
866 | transition = "bad" | |
867 | state[transition].append(node) |
|
867 | state[transition].append(node) | |
868 | ctx = repo[node] |
|
868 | ctx = repo[node] | |
869 | ui.status(_('changeset %d:%s: %s\n') % (ctx.rev(), ctx, |
|
869 | ui.status(_('changeset %d:%s: %s\n') % (ctx.rev(), ctx, | |
870 | transition)) |
|
870 | transition)) | |
871 | hbisect.checkstate(state) |
|
871 | hbisect.checkstate(state) | |
872 | # bisect |
|
872 | # bisect | |
873 | nodes, changesets, bgood = hbisect.bisect(repo, state) |
|
873 | nodes, changesets, bgood = hbisect.bisect(repo, state) | |
874 | # update to next check |
|
874 | # update to next check | |
875 | node = nodes[0] |
|
875 | node = nodes[0] | |
876 | mayupdate(repo, node, show_stats=False) |
|
876 | mayupdate(repo, node, show_stats=False) | |
877 | finally: |
|
877 | finally: | |
878 | state['current'] = [node] |
|
878 | state['current'] = [node] | |
879 | hbisect.save_state(repo, state) |
|
879 | hbisect.save_state(repo, state) | |
880 | hbisect.printresult(ui, repo, state, displayer, nodes, bgood) |
|
880 | hbisect.printresult(ui, repo, state, displayer, nodes, bgood) | |
881 | return |
|
881 | return | |
882 |
|
882 | |||
883 | hbisect.checkstate(state) |
|
883 | hbisect.checkstate(state) | |
884 |
|
884 | |||
885 | # actually bisect |
|
885 | # actually bisect | |
886 | nodes, changesets, good = hbisect.bisect(repo, state) |
|
886 | nodes, changesets, good = hbisect.bisect(repo, state) | |
887 | if extend: |
|
887 | if extend: | |
888 | if not changesets: |
|
888 | if not changesets: | |
889 | extendnode = hbisect.extendrange(repo, state, nodes, good) |
|
889 | extendnode = hbisect.extendrange(repo, state, nodes, good) | |
890 | if extendnode is not None: |
|
890 | if extendnode is not None: | |
891 | ui.write(_("Extending search to changeset %d:%s\n") |
|
891 | ui.write(_("Extending search to changeset %d:%s\n") | |
892 | % (extendnode.rev(), extendnode)) |
|
892 | % (extendnode.rev(), extendnode)) | |
893 | state['current'] = [extendnode.node()] |
|
893 | state['current'] = [extendnode.node()] | |
894 | hbisect.save_state(repo, state) |
|
894 | hbisect.save_state(repo, state) | |
895 | return mayupdate(repo, extendnode.node()) |
|
895 | return mayupdate(repo, extendnode.node()) | |
896 | raise error.Abort(_("nothing to extend")) |
|
896 | raise error.Abort(_("nothing to extend")) | |
897 |
|
897 | |||
898 | if changesets == 0: |
|
898 | if changesets == 0: | |
899 | hbisect.printresult(ui, repo, state, displayer, nodes, good) |
|
899 | hbisect.printresult(ui, repo, state, displayer, nodes, good) | |
900 | else: |
|
900 | else: | |
901 | assert len(nodes) == 1 # only a single node can be tested next |
|
901 | assert len(nodes) == 1 # only a single node can be tested next | |
902 | node = nodes[0] |
|
902 | node = nodes[0] | |
903 | # compute the approximate number of remaining tests |
|
903 | # compute the approximate number of remaining tests | |
904 | tests, size = 0, 2 |
|
904 | tests, size = 0, 2 | |
905 | while size <= changesets: |
|
905 | while size <= changesets: | |
906 | tests, size = tests + 1, size * 2 |
|
906 | tests, size = tests + 1, size * 2 | |
907 | rev = repo.changelog.rev(node) |
|
907 | rev = repo.changelog.rev(node) | |
908 | ui.write(_("Testing changeset %d:%s " |
|
908 | ui.write(_("Testing changeset %d:%s " | |
909 | "(%d changesets remaining, ~%d tests)\n") |
|
909 | "(%d changesets remaining, ~%d tests)\n") | |
910 | % (rev, short(node), changesets, tests)) |
|
910 | % (rev, short(node), changesets, tests)) | |
911 | state['current'] = [node] |
|
911 | state['current'] = [node] | |
912 | hbisect.save_state(repo, state) |
|
912 | hbisect.save_state(repo, state) | |
913 | return mayupdate(repo, node) |
|
913 | return mayupdate(repo, node) | |
914 |
|
914 | |||
915 | @command('bookmarks|bookmark', |
|
915 | @command('bookmarks|bookmark', | |
916 | [('f', 'force', False, _('force')), |
|
916 | [('f', 'force', False, _('force')), | |
917 | ('r', 'rev', '', _('revision for bookmark action'), _('REV')), |
|
917 | ('r', 'rev', '', _('revision for bookmark action'), _('REV')), | |
918 | ('d', 'delete', False, _('delete a given bookmark')), |
|
918 | ('d', 'delete', False, _('delete a given bookmark')), | |
919 | ('m', 'rename', '', _('rename a given bookmark'), _('OLD')), |
|
919 | ('m', 'rename', '', _('rename a given bookmark'), _('OLD')), | |
920 | ('i', 'inactive', False, _('mark a bookmark inactive')), |
|
920 | ('i', 'inactive', False, _('mark a bookmark inactive')), | |
921 | ] + formatteropts, |
|
921 | ] + formatteropts, | |
922 | _('hg bookmarks [OPTIONS]... [NAME]...')) |
|
922 | _('hg bookmarks [OPTIONS]... [NAME]...')) | |
923 | def bookmark(ui, repo, *names, **opts): |
|
923 | def bookmark(ui, repo, *names, **opts): | |
924 | '''create a new bookmark or list existing bookmarks |
|
924 | '''create a new bookmark or list existing bookmarks | |
925 |
|
925 | |||
926 | Bookmarks are labels on changesets to help track lines of development. |
|
926 | Bookmarks are labels on changesets to help track lines of development. | |
927 | Bookmarks are unversioned and can be moved, renamed and deleted. |
|
927 | Bookmarks are unversioned and can be moved, renamed and deleted. | |
928 | Deleting or moving a bookmark has no effect on the associated changesets. |
|
928 | Deleting or moving a bookmark has no effect on the associated changesets. | |
929 |
|
929 | |||
930 | Creating or updating to a bookmark causes it to be marked as 'active'. |
|
930 | Creating or updating to a bookmark causes it to be marked as 'active'. | |
931 | The active bookmark is indicated with a '*'. |
|
931 | The active bookmark is indicated with a '*'. | |
932 | When a commit is made, the active bookmark will advance to the new commit. |
|
932 | When a commit is made, the active bookmark will advance to the new commit. | |
933 | A plain :hg:`update` will also advance an active bookmark, if possible. |
|
933 | A plain :hg:`update` will also advance an active bookmark, if possible. | |
934 | Updating away from a bookmark will cause it to be deactivated. |
|
934 | Updating away from a bookmark will cause it to be deactivated. | |
935 |
|
935 | |||
936 | Bookmarks can be pushed and pulled between repositories (see |
|
936 | Bookmarks can be pushed and pulled between repositories (see | |
937 | :hg:`help push` and :hg:`help pull`). If a shared bookmark has |
|
937 | :hg:`help push` and :hg:`help pull`). If a shared bookmark has | |
938 | diverged, a new 'divergent bookmark' of the form 'name@path' will |
|
938 | diverged, a new 'divergent bookmark' of the form 'name@path' will | |
939 | be created. Using :hg:`merge` will resolve the divergence. |
|
939 | be created. Using :hg:`merge` will resolve the divergence. | |
940 |
|
940 | |||
941 | Specifying bookmark as '.' to -m or -d options is equivalent to specifying |
|
941 | Specifying bookmark as '.' to -m or -d options is equivalent to specifying | |
942 | the active bookmark's name. |
|
942 | the active bookmark's name. | |
943 |
|
943 | |||
944 | A bookmark named '@' has the special property that :hg:`clone` will |
|
944 | A bookmark named '@' has the special property that :hg:`clone` will | |
945 | check it out by default if it exists. |
|
945 | check it out by default if it exists. | |
946 |
|
946 | |||
947 | .. container:: verbose |
|
947 | .. container:: verbose | |
948 |
|
948 | |||
949 | Examples: |
|
949 | Examples: | |
950 |
|
950 | |||
951 | - create an active bookmark for a new line of development:: |
|
951 | - create an active bookmark for a new line of development:: | |
952 |
|
952 | |||
953 | hg book new-feature |
|
953 | hg book new-feature | |
954 |
|
954 | |||
955 | - create an inactive bookmark as a place marker:: |
|
955 | - create an inactive bookmark as a place marker:: | |
956 |
|
956 | |||
957 | hg book -i reviewed |
|
957 | hg book -i reviewed | |
958 |
|
958 | |||
959 | - create an inactive bookmark on another changeset:: |
|
959 | - create an inactive bookmark on another changeset:: | |
960 |
|
960 | |||
961 | hg book -r .^ tested |
|
961 | hg book -r .^ tested | |
962 |
|
962 | |||
963 | - rename bookmark turkey to dinner:: |
|
963 | - rename bookmark turkey to dinner:: | |
964 |
|
964 | |||
965 | hg book -m turkey dinner |
|
965 | hg book -m turkey dinner | |
966 |
|
966 | |||
967 | - move the '@' bookmark from another branch:: |
|
967 | - move the '@' bookmark from another branch:: | |
968 |
|
968 | |||
969 | hg book -f @ |
|
969 | hg book -f @ | |
970 | ''' |
|
970 | ''' | |
971 | force = opts.get(r'force') |
|
971 | force = opts.get(r'force') | |
972 | rev = opts.get(r'rev') |
|
972 | rev = opts.get(r'rev') | |
973 | delete = opts.get(r'delete') |
|
973 | delete = opts.get(r'delete') | |
974 | rename = opts.get(r'rename') |
|
974 | rename = opts.get(r'rename') | |
975 | inactive = opts.get(r'inactive') |
|
975 | inactive = opts.get(r'inactive') | |
976 |
|
976 | |||
977 | if delete and rename: |
|
977 | if delete and rename: | |
978 | raise error.Abort(_("--delete and --rename are incompatible")) |
|
978 | raise error.Abort(_("--delete and --rename are incompatible")) | |
979 | if delete and rev: |
|
979 | if delete and rev: | |
980 | raise error.Abort(_("--rev is incompatible with --delete")) |
|
980 | raise error.Abort(_("--rev is incompatible with --delete")) | |
981 | if rename and rev: |
|
981 | if rename and rev: | |
982 | raise error.Abort(_("--rev is incompatible with --rename")) |
|
982 | raise error.Abort(_("--rev is incompatible with --rename")) | |
983 | if not names and (delete or rev): |
|
983 | if not names and (delete or rev): | |
984 | raise error.Abort(_("bookmark name required")) |
|
984 | raise error.Abort(_("bookmark name required")) | |
985 |
|
985 | |||
986 | if delete or rename or names or inactive: |
|
986 | if delete or rename or names or inactive: | |
987 | with repo.wlock(), repo.lock(), repo.transaction('bookmark') as tr: |
|
987 | with repo.wlock(), repo.lock(), repo.transaction('bookmark') as tr: | |
988 | if delete: |
|
988 | if delete: | |
989 | names = pycompat.maplist(repo._bookmarks.expandname, names) |
|
989 | names = pycompat.maplist(repo._bookmarks.expandname, names) | |
990 | bookmarks.delete(repo, tr, names) |
|
990 | bookmarks.delete(repo, tr, names) | |
991 | elif rename: |
|
991 | elif rename: | |
992 | if not names: |
|
992 | if not names: | |
993 | raise error.Abort(_("new bookmark name required")) |
|
993 | raise error.Abort(_("new bookmark name required")) | |
994 | elif len(names) > 1: |
|
994 | elif len(names) > 1: | |
995 | raise error.Abort(_("only one new bookmark name allowed")) |
|
995 | raise error.Abort(_("only one new bookmark name allowed")) | |
996 | rename = repo._bookmarks.expandname(rename) |
|
996 | rename = repo._bookmarks.expandname(rename) | |
997 | bookmarks.rename(repo, tr, rename, names[0], force, inactive) |
|
997 | bookmarks.rename(repo, tr, rename, names[0], force, inactive) | |
998 | elif names: |
|
998 | elif names: | |
999 | bookmarks.addbookmarks(repo, tr, names, rev, force, inactive) |
|
999 | bookmarks.addbookmarks(repo, tr, names, rev, force, inactive) | |
1000 | elif inactive: |
|
1000 | elif inactive: | |
1001 | if len(repo._bookmarks) == 0: |
|
1001 | if len(repo._bookmarks) == 0: | |
1002 | ui.status(_("no bookmarks set\n")) |
|
1002 | ui.status(_("no bookmarks set\n")) | |
1003 | elif not repo._activebookmark: |
|
1003 | elif not repo._activebookmark: | |
1004 | ui.status(_("no active bookmark\n")) |
|
1004 | ui.status(_("no active bookmark\n")) | |
1005 | else: |
|
1005 | else: | |
1006 | bookmarks.deactivate(repo) |
|
1006 | bookmarks.deactivate(repo) | |
1007 | else: # show bookmarks |
|
1007 | else: # show bookmarks | |
1008 | bookmarks.printbookmarks(ui, repo, **opts) |
|
1008 | bookmarks.printbookmarks(ui, repo, **opts) | |
1009 |
|
1009 | |||
1010 | @command('branch', |
|
1010 | @command('branch', | |
1011 | [('f', 'force', None, |
|
1011 | [('f', 'force', None, | |
1012 | _('set branch name even if it shadows an existing branch')), |
|
1012 | _('set branch name even if it shadows an existing branch')), | |
1013 | ('C', 'clean', None, _('reset branch name to parent branch name')), |
|
1013 | ('C', 'clean', None, _('reset branch name to parent branch name')), | |
1014 | ('r', 'rev', [], _('change branches of the given revs (EXPERIMENTAL)')), |
|
1014 | ('r', 'rev', [], _('change branches of the given revs (EXPERIMENTAL)')), | |
1015 | ], |
|
1015 | ], | |
1016 | _('[-fC] [NAME]')) |
|
1016 | _('[-fC] [NAME]')) | |
1017 | def branch(ui, repo, label=None, **opts): |
|
1017 | def branch(ui, repo, label=None, **opts): | |
1018 | """set or show the current branch name |
|
1018 | """set or show the current branch name | |
1019 |
|
1019 | |||
1020 | .. note:: |
|
1020 | .. note:: | |
1021 |
|
1021 | |||
1022 | Branch names are permanent and global. Use :hg:`bookmark` to create a |
|
1022 | Branch names are permanent and global. Use :hg:`bookmark` to create a | |
1023 | light-weight bookmark instead. See :hg:`help glossary` for more |
|
1023 | light-weight bookmark instead. See :hg:`help glossary` for more | |
1024 | information about named branches and bookmarks. |
|
1024 | information about named branches and bookmarks. | |
1025 |
|
1025 | |||
1026 | With no argument, show the current branch name. With one argument, |
|
1026 | With no argument, show the current branch name. With one argument, | |
1027 | set the working directory branch name (the branch will not exist |
|
1027 | set the working directory branch name (the branch will not exist | |
1028 | in the repository until the next commit). Standard practice |
|
1028 | in the repository until the next commit). Standard practice | |
1029 | recommends that primary development take place on the 'default' |
|
1029 | recommends that primary development take place on the 'default' | |
1030 | branch. |
|
1030 | branch. | |
1031 |
|
1031 | |||
1032 | Unless -f/--force is specified, branch will not let you set a |
|
1032 | Unless -f/--force is specified, branch will not let you set a | |
1033 | branch name that already exists. |
|
1033 | branch name that already exists. | |
1034 |
|
1034 | |||
1035 | Use -C/--clean to reset the working directory branch to that of |
|
1035 | Use -C/--clean to reset the working directory branch to that of | |
1036 | the parent of the working directory, negating a previous branch |
|
1036 | the parent of the working directory, negating a previous branch | |
1037 | change. |
|
1037 | change. | |
1038 |
|
1038 | |||
1039 | Use the command :hg:`update` to switch to an existing branch. Use |
|
1039 | Use the command :hg:`update` to switch to an existing branch. Use | |
1040 | :hg:`commit --close-branch` to mark this branch head as closed. |
|
1040 | :hg:`commit --close-branch` to mark this branch head as closed. | |
1041 | When all heads of a branch are closed, the branch will be |
|
1041 | When all heads of a branch are closed, the branch will be | |
1042 | considered closed. |
|
1042 | considered closed. | |
1043 |
|
1043 | |||
1044 | Returns 0 on success. |
|
1044 | Returns 0 on success. | |
1045 | """ |
|
1045 | """ | |
1046 | opts = pycompat.byteskwargs(opts) |
|
1046 | opts = pycompat.byteskwargs(opts) | |
1047 | revs = opts.get('rev') |
|
1047 | revs = opts.get('rev') | |
1048 | if label: |
|
1048 | if label: | |
1049 | label = label.strip() |
|
1049 | label = label.strip() | |
1050 |
|
1050 | |||
1051 | if not opts.get('clean') and not label: |
|
1051 | if not opts.get('clean') and not label: | |
1052 | if revs: |
|
1052 | if revs: | |
1053 | raise error.Abort(_("no branch name specified for the revisions")) |
|
1053 | raise error.Abort(_("no branch name specified for the revisions")) | |
1054 | ui.write("%s\n" % repo.dirstate.branch()) |
|
1054 | ui.write("%s\n" % repo.dirstate.branch()) | |
1055 | return |
|
1055 | return | |
1056 |
|
1056 | |||
1057 | with repo.wlock(): |
|
1057 | with repo.wlock(): | |
1058 | if opts.get('clean'): |
|
1058 | if opts.get('clean'): | |
1059 | label = repo[None].p1().branch() |
|
1059 | label = repo[None].p1().branch() | |
1060 | repo.dirstate.setbranch(label) |
|
1060 | repo.dirstate.setbranch(label) | |
1061 | ui.status(_('reset working directory to branch %s\n') % label) |
|
1061 | ui.status(_('reset working directory to branch %s\n') % label) | |
1062 | elif label: |
|
1062 | elif label: | |
1063 |
|
1063 | |||
1064 | scmutil.checknewlabel(repo, label, 'branch') |
|
1064 | scmutil.checknewlabel(repo, label, 'branch') | |
1065 | if revs: |
|
1065 | if revs: | |
1066 | return cmdutil.changebranch(ui, repo, revs, label) |
|
1066 | return cmdutil.changebranch(ui, repo, revs, label) | |
1067 |
|
1067 | |||
1068 | if not opts.get('force') and label in repo.branchmap(): |
|
1068 | if not opts.get('force') and label in repo.branchmap(): | |
1069 | if label not in [p.branch() for p in repo[None].parents()]: |
|
1069 | if label not in [p.branch() for p in repo[None].parents()]: | |
1070 | raise error.Abort(_('a branch of the same name already' |
|
1070 | raise error.Abort(_('a branch of the same name already' | |
1071 | ' exists'), |
|
1071 | ' exists'), | |
1072 | # i18n: "it" refers to an existing branch |
|
1072 | # i18n: "it" refers to an existing branch | |
1073 | hint=_("use 'hg update' to switch to it")) |
|
1073 | hint=_("use 'hg update' to switch to it")) | |
1074 |
|
1074 | |||
1075 | repo.dirstate.setbranch(label) |
|
1075 | repo.dirstate.setbranch(label) | |
1076 | ui.status(_('marked working directory as branch %s\n') % label) |
|
1076 | ui.status(_('marked working directory as branch %s\n') % label) | |
1077 |
|
1077 | |||
1078 | # find any open named branches aside from default |
|
1078 | # find any open named branches aside from default | |
1079 | others = [n for n, h, t, c in repo.branchmap().iterbranches() |
|
1079 | others = [n for n, h, t, c in repo.branchmap().iterbranches() | |
1080 | if n != "default" and not c] |
|
1080 | if n != "default" and not c] | |
1081 | if not others: |
|
1081 | if not others: | |
1082 | ui.status(_('(branches are permanent and global, ' |
|
1082 | ui.status(_('(branches are permanent and global, ' | |
1083 | 'did you want a bookmark?)\n')) |
|
1083 | 'did you want a bookmark?)\n')) | |
1084 |
|
1084 | |||
1085 | @command('branches', |
|
1085 | @command('branches', | |
1086 | [('a', 'active', False, |
|
1086 | [('a', 'active', False, | |
1087 | _('show only branches that have unmerged heads (DEPRECATED)')), |
|
1087 | _('show only branches that have unmerged heads (DEPRECATED)')), | |
1088 | ('c', 'closed', False, _('show normal and closed branches')), |
|
1088 | ('c', 'closed', False, _('show normal and closed branches')), | |
1089 | ] + formatteropts, |
|
1089 | ] + formatteropts, | |
1090 | _('[-c]'), cmdtype=readonly) |
|
1090 | _('[-c]'), cmdtype=readonly) | |
1091 | def branches(ui, repo, active=False, closed=False, **opts): |
|
1091 | def branches(ui, repo, active=False, closed=False, **opts): | |
1092 | """list repository named branches |
|
1092 | """list repository named branches | |
1093 |
|
1093 | |||
1094 | List the repository's named branches, indicating which ones are |
|
1094 | List the repository's named branches, indicating which ones are | |
1095 | inactive. If -c/--closed is specified, also list branches which have |
|
1095 | inactive. If -c/--closed is specified, also list branches which have | |
1096 | been marked closed (see :hg:`commit --close-branch`). |
|
1096 | been marked closed (see :hg:`commit --close-branch`). | |
1097 |
|
1097 | |||
1098 | Use the command :hg:`update` to switch to an existing branch. |
|
1098 | Use the command :hg:`update` to switch to an existing branch. | |
1099 |
|
1099 | |||
1100 | Returns 0. |
|
1100 | Returns 0. | |
1101 | """ |
|
1101 | """ | |
1102 |
|
1102 | |||
1103 | opts = pycompat.byteskwargs(opts) |
|
1103 | opts = pycompat.byteskwargs(opts) | |
1104 | ui.pager('branches') |
|
1104 | ui.pager('branches') | |
1105 | fm = ui.formatter('branches', opts) |
|
1105 | fm = ui.formatter('branches', opts) | |
1106 | hexfunc = fm.hexfunc |
|
1106 | hexfunc = fm.hexfunc | |
1107 |
|
1107 | |||
1108 | allheads = set(repo.heads()) |
|
1108 | allheads = set(repo.heads()) | |
1109 | branches = [] |
|
1109 | branches = [] | |
1110 | for tag, heads, tip, isclosed in repo.branchmap().iterbranches(): |
|
1110 | for tag, heads, tip, isclosed in repo.branchmap().iterbranches(): | |
1111 | isactive = False |
|
1111 | isactive = False | |
1112 | if not isclosed: |
|
1112 | if not isclosed: | |
1113 | openheads = set(repo.branchmap().iteropen(heads)) |
|
1113 | openheads = set(repo.branchmap().iteropen(heads)) | |
1114 | isactive = bool(openheads & allheads) |
|
1114 | isactive = bool(openheads & allheads) | |
1115 | branches.append((tag, repo[tip], isactive, not isclosed)) |
|
1115 | branches.append((tag, repo[tip], isactive, not isclosed)) | |
1116 | branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), |
|
1116 | branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), | |
1117 | reverse=True) |
|
1117 | reverse=True) | |
1118 |
|
1118 | |||
1119 | for tag, ctx, isactive, isopen in branches: |
|
1119 | for tag, ctx, isactive, isopen in branches: | |
1120 | if active and not isactive: |
|
1120 | if active and not isactive: | |
1121 | continue |
|
1121 | continue | |
1122 | if isactive: |
|
1122 | if isactive: | |
1123 | label = 'branches.active' |
|
1123 | label = 'branches.active' | |
1124 | notice = '' |
|
1124 | notice = '' | |
1125 | elif not isopen: |
|
1125 | elif not isopen: | |
1126 | if not closed: |
|
1126 | if not closed: | |
1127 | continue |
|
1127 | continue | |
1128 | label = 'branches.closed' |
|
1128 | label = 'branches.closed' | |
1129 | notice = _(' (closed)') |
|
1129 | notice = _(' (closed)') | |
1130 | else: |
|
1130 | else: | |
1131 | label = 'branches.inactive' |
|
1131 | label = 'branches.inactive' | |
1132 | notice = _(' (inactive)') |
|
1132 | notice = _(' (inactive)') | |
1133 | current = (tag == repo.dirstate.branch()) |
|
1133 | current = (tag == repo.dirstate.branch()) | |
1134 | if current: |
|
1134 | if current: | |
1135 | label = 'branches.current' |
|
1135 | label = 'branches.current' | |
1136 |
|
1136 | |||
1137 | fm.startitem() |
|
1137 | fm.startitem() | |
1138 | fm.write('branch', '%s', tag, label=label) |
|
1138 | fm.write('branch', '%s', tag, label=label) | |
1139 | rev = ctx.rev() |
|
1139 | rev = ctx.rev() | |
1140 | padsize = max(31 - len("%d" % rev) - encoding.colwidth(tag), 0) |
|
1140 | padsize = max(31 - len("%d" % rev) - encoding.colwidth(tag), 0) | |
1141 | fmt = ' ' * padsize + ' %d:%s' |
|
1141 | fmt = ' ' * padsize + ' %d:%s' | |
1142 | fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()), |
|
1142 | fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()), | |
1143 | label='log.changeset changeset.%s' % ctx.phasestr()) |
|
1143 | label='log.changeset changeset.%s' % ctx.phasestr()) | |
1144 | fm.context(ctx=ctx) |
|
1144 | fm.context(ctx=ctx) | |
1145 | fm.data(active=isactive, closed=not isopen, current=current) |
|
1145 | fm.data(active=isactive, closed=not isopen, current=current) | |
1146 | if not ui.quiet: |
|
1146 | if not ui.quiet: | |
1147 | fm.plain(notice) |
|
1147 | fm.plain(notice) | |
1148 | fm.plain('\n') |
|
1148 | fm.plain('\n') | |
1149 | fm.end() |
|
1149 | fm.end() | |
1150 |
|
1150 | |||
1151 | @command('bundle', |
|
1151 | @command('bundle', | |
1152 | [('f', 'force', None, _('run even when the destination is unrelated')), |
|
1152 | [('f', 'force', None, _('run even when the destination is unrelated')), | |
1153 | ('r', 'rev', [], _('a changeset intended to be added to the destination'), |
|
1153 | ('r', 'rev', [], _('a changeset intended to be added to the destination'), | |
1154 | _('REV')), |
|
1154 | _('REV')), | |
1155 | ('b', 'branch', [], _('a specific branch you would like to bundle'), |
|
1155 | ('b', 'branch', [], _('a specific branch you would like to bundle'), | |
1156 | _('BRANCH')), |
|
1156 | _('BRANCH')), | |
1157 | ('', 'base', [], |
|
1157 | ('', 'base', [], | |
1158 | _('a base changeset assumed to be available at the destination'), |
|
1158 | _('a base changeset assumed to be available at the destination'), | |
1159 | _('REV')), |
|
1159 | _('REV')), | |
1160 | ('a', 'all', None, _('bundle all changesets in the repository')), |
|
1160 | ('a', 'all', None, _('bundle all changesets in the repository')), | |
1161 | ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')), |
|
1161 | ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')), | |
1162 | ] + remoteopts, |
|
1162 | ] + remoteopts, | |
1163 | _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]')) |
|
1163 | _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]')) | |
1164 | def bundle(ui, repo, fname, dest=None, **opts): |
|
1164 | def bundle(ui, repo, fname, dest=None, **opts): | |
1165 | """create a bundle file |
|
1165 | """create a bundle file | |
1166 |
|
1166 | |||
1167 | Generate a bundle file containing data to be transferred to another |
|
1167 | Generate a bundle file containing data to be transferred to another | |
1168 | repository. |
|
1168 | repository. | |
1169 |
|
1169 | |||
1170 | To create a bundle containing all changesets, use -a/--all |
|
1170 | To create a bundle containing all changesets, use -a/--all | |
1171 | (or --base null). Otherwise, hg assumes the destination will have |
|
1171 | (or --base null). Otherwise, hg assumes the destination will have | |
1172 | all the nodes you specify with --base parameters. Otherwise, hg |
|
1172 | all the nodes you specify with --base parameters. Otherwise, hg | |
1173 | will assume the repository has all the nodes in destination, or |
|
1173 | will assume the repository has all the nodes in destination, or | |
1174 | default-push/default if no destination is specified, where destination |
|
1174 | default-push/default if no destination is specified, where destination | |
1175 | is the repository you provide through DEST option. |
|
1175 | is the repository you provide through DEST option. | |
1176 |
|
1176 | |||
1177 | You can change bundle format with the -t/--type option. See |
|
1177 | You can change bundle format with the -t/--type option. See | |
1178 | :hg:`help bundlespec` for documentation on this format. By default, |
|
1178 | :hg:`help bundlespec` for documentation on this format. By default, | |
1179 | the most appropriate format is used and compression defaults to |
|
1179 | the most appropriate format is used and compression defaults to | |
1180 | bzip2. |
|
1180 | bzip2. | |
1181 |
|
1181 | |||
1182 | The bundle file can then be transferred using conventional means |
|
1182 | The bundle file can then be transferred using conventional means | |
1183 | and applied to another repository with the unbundle or pull |
|
1183 | and applied to another repository with the unbundle or pull | |
1184 | command. This is useful when direct push and pull are not |
|
1184 | command. This is useful when direct push and pull are not | |
1185 | available or when exporting an entire repository is undesirable. |
|
1185 | available or when exporting an entire repository is undesirable. | |
1186 |
|
1186 | |||
1187 | Applying bundles preserves all changeset contents including |
|
1187 | Applying bundles preserves all changeset contents including | |
1188 | permissions, copy/rename information, and revision history. |
|
1188 | permissions, copy/rename information, and revision history. | |
1189 |
|
1189 | |||
1190 | Returns 0 on success, 1 if no changes found. |
|
1190 | Returns 0 on success, 1 if no changes found. | |
1191 | """ |
|
1191 | """ | |
1192 | opts = pycompat.byteskwargs(opts) |
|
1192 | opts = pycompat.byteskwargs(opts) | |
1193 | revs = None |
|
1193 | revs = None | |
1194 | if 'rev' in opts: |
|
1194 | if 'rev' in opts: | |
1195 | revstrings = opts['rev'] |
|
1195 | revstrings = opts['rev'] | |
1196 | revs = scmutil.revrange(repo, revstrings) |
|
1196 | revs = scmutil.revrange(repo, revstrings) | |
1197 | if revstrings and not revs: |
|
1197 | if revstrings and not revs: | |
1198 | raise error.Abort(_('no commits to bundle')) |
|
1198 | raise error.Abort(_('no commits to bundle')) | |
1199 |
|
1199 | |||
1200 | bundletype = opts.get('type', 'bzip2').lower() |
|
1200 | bundletype = opts.get('type', 'bzip2').lower() | |
1201 | try: |
|
1201 | try: | |
1202 | bcompression, cgversion, params = exchange.parsebundlespec( |
|
1202 | bcompression, cgversion, params = exchange.parsebundlespec( | |
1203 | repo, bundletype, strict=False) |
|
1203 | repo, bundletype, strict=False) | |
1204 | except error.UnsupportedBundleSpecification as e: |
|
1204 | except error.UnsupportedBundleSpecification as e: | |
1205 | raise error.Abort(pycompat.bytestr(e), |
|
1205 | raise error.Abort(pycompat.bytestr(e), | |
1206 | hint=_("see 'hg help bundlespec' for supported " |
|
1206 | hint=_("see 'hg help bundlespec' for supported " | |
1207 | "values for --type")) |
|
1207 | "values for --type")) | |
1208 |
|
1208 | |||
1209 | # Packed bundles are a pseudo bundle format for now. |
|
1209 | # Packed bundles are a pseudo bundle format for now. | |
1210 | if cgversion == 's1': |
|
1210 | if cgversion == 's1': | |
1211 | raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'), |
|
1211 | raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'), | |
1212 | hint=_("use 'hg debugcreatestreamclonebundle'")) |
|
1212 | hint=_("use 'hg debugcreatestreamclonebundle'")) | |
1213 |
|
1213 | |||
1214 | if opts.get('all'): |
|
1214 | if opts.get('all'): | |
1215 | if dest: |
|
1215 | if dest: | |
1216 | raise error.Abort(_("--all is incompatible with specifying " |
|
1216 | raise error.Abort(_("--all is incompatible with specifying " | |
1217 | "a destination")) |
|
1217 | "a destination")) | |
1218 | if opts.get('base'): |
|
1218 | if opts.get('base'): | |
1219 | ui.warn(_("ignoring --base because --all was specified\n")) |
|
1219 | ui.warn(_("ignoring --base because --all was specified\n")) | |
1220 | base = ['null'] |
|
1220 | base = ['null'] | |
1221 | else: |
|
1221 | else: | |
1222 | base = scmutil.revrange(repo, opts.get('base')) |
|
1222 | base = scmutil.revrange(repo, opts.get('base')) | |
1223 | if cgversion not in changegroup.supportedoutgoingversions(repo): |
|
1223 | if cgversion not in changegroup.supportedoutgoingversions(repo): | |
1224 | raise error.Abort(_("repository does not support bundle version %s") % |
|
1224 | raise error.Abort(_("repository does not support bundle version %s") % | |
1225 | cgversion) |
|
1225 | cgversion) | |
1226 |
|
1226 | |||
1227 | if base: |
|
1227 | if base: | |
1228 | if dest: |
|
1228 | if dest: | |
1229 | raise error.Abort(_("--base is incompatible with specifying " |
|
1229 | raise error.Abort(_("--base is incompatible with specifying " | |
1230 | "a destination")) |
|
1230 | "a destination")) | |
1231 | common = [repo.lookup(rev) for rev in base] |
|
1231 | common = [repo.lookup(rev) for rev in base] | |
1232 | heads = [repo.lookup(r) for r in revs] if revs else None |
|
1232 | heads = [repo.lookup(r) for r in revs] if revs else None | |
1233 | outgoing = discovery.outgoing(repo, common, heads) |
|
1233 | outgoing = discovery.outgoing(repo, common, heads) | |
1234 | else: |
|
1234 | else: | |
1235 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
1235 | dest = ui.expandpath(dest or 'default-push', dest or 'default') | |
1236 | dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
1236 | dest, branches = hg.parseurl(dest, opts.get('branch')) | |
1237 | other = hg.peer(repo, opts, dest) |
|
1237 | other = hg.peer(repo, opts, dest) | |
1238 | revs, checkout = hg.addbranchrevs(repo, repo, branches, revs) |
|
1238 | revs, checkout = hg.addbranchrevs(repo, repo, branches, revs) | |
1239 | heads = revs and map(repo.lookup, revs) or revs |
|
1239 | heads = revs and map(repo.lookup, revs) or revs | |
1240 | outgoing = discovery.findcommonoutgoing(repo, other, |
|
1240 | outgoing = discovery.findcommonoutgoing(repo, other, | |
1241 | onlyheads=heads, |
|
1241 | onlyheads=heads, | |
1242 | force=opts.get('force'), |
|
1242 | force=opts.get('force'), | |
1243 | portable=True) |
|
1243 | portable=True) | |
1244 |
|
1244 | |||
1245 | if not outgoing.missing: |
|
1245 | if not outgoing.missing: | |
1246 | scmutil.nochangesfound(ui, repo, not base and outgoing.excluded) |
|
1246 | scmutil.nochangesfound(ui, repo, not base and outgoing.excluded) | |
1247 | return 1 |
|
1247 | return 1 | |
1248 |
|
1248 | |||
1249 | if cgversion == '01': #bundle1 |
|
1249 | if cgversion == '01': #bundle1 | |
1250 | if bcompression is None: |
|
1250 | if bcompression is None: | |
1251 | bcompression = 'UN' |
|
1251 | bcompression = 'UN' | |
1252 | bversion = 'HG10' + bcompression |
|
1252 | bversion = 'HG10' + bcompression | |
1253 | bcompression = None |
|
1253 | bcompression = None | |
1254 | elif cgversion in ('02', '03'): |
|
1254 | elif cgversion in ('02', '03'): | |
1255 | bversion = 'HG20' |
|
1255 | bversion = 'HG20' | |
1256 | else: |
|
1256 | else: | |
1257 | raise error.ProgrammingError( |
|
1257 | raise error.ProgrammingError( | |
1258 | 'bundle: unexpected changegroup version %s' % cgversion) |
|
1258 | 'bundle: unexpected changegroup version %s' % cgversion) | |
1259 |
|
1259 | |||
1260 | # TODO compression options should be derived from bundlespec parsing. |
|
1260 | # TODO compression options should be derived from bundlespec parsing. | |
1261 | # This is a temporary hack to allow adjusting bundle compression |
|
1261 | # This is a temporary hack to allow adjusting bundle compression | |
1262 | # level without a) formalizing the bundlespec changes to declare it |
|
1262 | # level without a) formalizing the bundlespec changes to declare it | |
1263 | # b) introducing a command flag. |
|
1263 | # b) introducing a command flag. | |
1264 | compopts = {} |
|
1264 | compopts = {} | |
1265 | complevel = ui.configint('experimental', 'bundlecomplevel') |
|
1265 | complevel = ui.configint('experimental', 'bundlecomplevel') | |
1266 | if complevel is not None: |
|
1266 | if complevel is not None: | |
1267 | compopts['level'] = complevel |
|
1267 | compopts['level'] = complevel | |
1268 |
|
1268 | |||
1269 |
|
1269 | |||
1270 | contentopts = {'cg.version': cgversion, 'changegroup': True} |
|
1270 | contentopts = {'cg.version': cgversion, 'changegroup': True} | |
1271 | if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'): |
|
1271 | if repo.ui.configbool('experimental', 'evolution.bundle-obsmarker'): | |
1272 | contentopts['obsolescence'] = True |
|
1272 | contentopts['obsolescence'] = True | |
1273 | if repo.ui.configbool('experimental', 'bundle-phases'): |
|
1273 | if repo.ui.configbool('experimental', 'bundle-phases'): | |
1274 | contentopts['phases'] = True |
|
1274 | contentopts['phases'] = True | |
1275 | bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing, |
|
1275 | bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing, | |
1276 | contentopts, compression=bcompression, |
|
1276 | contentopts, compression=bcompression, | |
1277 | compopts=compopts) |
|
1277 | compopts=compopts) | |
1278 |
|
1278 | |||
1279 | @command('cat', |
|
1279 | @command('cat', | |
1280 | [('o', 'output', '', |
|
1280 | [('o', 'output', '', | |
1281 | _('print output to file with formatted name'), _('FORMAT')), |
|
1281 | _('print output to file with formatted name'), _('FORMAT')), | |
1282 | ('r', 'rev', '', _('print the given revision'), _('REV')), |
|
1282 | ('r', 'rev', '', _('print the given revision'), _('REV')), | |
1283 | ('', 'decode', None, _('apply any matching decode filter')), |
|
1283 | ('', 'decode', None, _('apply any matching decode filter')), | |
1284 | ] + walkopts + formatteropts, |
|
1284 | ] + walkopts + formatteropts, | |
1285 | _('[OPTION]... FILE...'), |
|
1285 | _('[OPTION]... FILE...'), | |
1286 | inferrepo=True, cmdtype=readonly) |
|
1286 | inferrepo=True, cmdtype=readonly) | |
1287 | def cat(ui, repo, file1, *pats, **opts): |
|
1287 | def cat(ui, repo, file1, *pats, **opts): | |
1288 | """output the current or given revision of files |
|
1288 | """output the current or given revision of files | |
1289 |
|
1289 | |||
1290 | Print the specified files as they were at the given revision. If |
|
1290 | Print the specified files as they were at the given revision. If | |
1291 | no revision is given, the parent of the working directory is used. |
|
1291 | no revision is given, the parent of the working directory is used. | |
1292 |
|
1292 | |||
1293 | Output may be to a file, in which case the name of the file is |
|
1293 | Output may be to a file, in which case the name of the file is | |
1294 | given using a template string. See :hg:`help templates`. In addition |
|
1294 | given using a template string. See :hg:`help templates`. In addition | |
1295 | to the common template keywords, the following formatting rules are |
|
1295 | to the common template keywords, the following formatting rules are | |
1296 | supported: |
|
1296 | supported: | |
1297 |
|
1297 | |||
1298 | :``%%``: literal "%" character |
|
1298 | :``%%``: literal "%" character | |
1299 | :``%s``: basename of file being printed |
|
1299 | :``%s``: basename of file being printed | |
1300 | :``%d``: dirname of file being printed, or '.' if in repository root |
|
1300 | :``%d``: dirname of file being printed, or '.' if in repository root | |
1301 | :``%p``: root-relative path name of file being printed |
|
1301 | :``%p``: root-relative path name of file being printed | |
1302 | :``%H``: changeset hash (40 hexadecimal digits) |
|
1302 | :``%H``: changeset hash (40 hexadecimal digits) | |
1303 | :``%R``: changeset revision number |
|
1303 | :``%R``: changeset revision number | |
1304 | :``%h``: short-form changeset hash (12 hexadecimal digits) |
|
1304 | :``%h``: short-form changeset hash (12 hexadecimal digits) | |
1305 | :``%r``: zero-padded changeset revision number |
|
1305 | :``%r``: zero-padded changeset revision number | |
1306 | :``%b``: basename of the exporting repository |
|
1306 | :``%b``: basename of the exporting repository | |
1307 | :``\\``: literal "\\" character |
|
1307 | :``\\``: literal "\\" character | |
1308 |
|
1308 | |||
1309 | Returns 0 on success. |
|
1309 | Returns 0 on success. | |
1310 | """ |
|
1310 | """ | |
1311 | opts = pycompat.byteskwargs(opts) |
|
1311 | opts = pycompat.byteskwargs(opts) | |
1312 | rev = opts.get('rev') |
|
1312 | rev = opts.get('rev') | |
1313 | if rev: |
|
1313 | if rev: | |
1314 | repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
|
1314 | repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') | |
1315 | ctx = scmutil.revsingle(repo, rev) |
|
1315 | ctx = scmutil.revsingle(repo, rev) | |
1316 | m = scmutil.match(ctx, (file1,) + pats, opts) |
|
1316 | m = scmutil.match(ctx, (file1,) + pats, opts) | |
1317 | fntemplate = opts.pop('output', '') |
|
1317 | fntemplate = opts.pop('output', '') | |
1318 | if cmdutil.isstdiofilename(fntemplate): |
|
1318 | if cmdutil.isstdiofilename(fntemplate): | |
1319 | fntemplate = '' |
|
1319 | fntemplate = '' | |
1320 |
|
1320 | |||
1321 | if fntemplate: |
|
1321 | if fntemplate: | |
1322 | fm = formatter.nullformatter(ui, 'cat') |
|
1322 | fm = formatter.nullformatter(ui, 'cat') | |
1323 | else: |
|
1323 | else: | |
1324 | ui.pager('cat') |
|
1324 | ui.pager('cat') | |
1325 | fm = ui.formatter('cat', opts) |
|
1325 | fm = ui.formatter('cat', opts) | |
1326 | with fm: |
|
1326 | with fm: | |
1327 | return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '', |
|
1327 | return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '', | |
1328 | **pycompat.strkwargs(opts)) |
|
1328 | **pycompat.strkwargs(opts)) | |
1329 |
|
1329 | |||
1330 | @command('^clone', |
|
1330 | @command('^clone', | |
1331 | [('U', 'noupdate', None, _('the clone will include an empty working ' |
|
1331 | [('U', 'noupdate', None, _('the clone will include an empty working ' | |
1332 | 'directory (only a repository)')), |
|
1332 | 'directory (only a repository)')), | |
1333 | ('u', 'updaterev', '', _('revision, tag, or branch to check out'), |
|
1333 | ('u', 'updaterev', '', _('revision, tag, or branch to check out'), | |
1334 | _('REV')), |
|
1334 | _('REV')), | |
1335 | ('r', 'rev', [], _('do not clone everything, but include this changeset' |
|
1335 | ('r', 'rev', [], _('do not clone everything, but include this changeset' | |
1336 | ' and its ancestors'), _('REV')), |
|
1336 | ' and its ancestors'), _('REV')), | |
1337 | ('b', 'branch', [], _('do not clone everything, but include this branch\'s' |
|
1337 | ('b', 'branch', [], _('do not clone everything, but include this branch\'s' | |
1338 | ' changesets and their ancestors'), _('BRANCH')), |
|
1338 | ' changesets and their ancestors'), _('BRANCH')), | |
1339 | ('', 'pull', None, _('use pull protocol to copy metadata')), |
|
1339 | ('', 'pull', None, _('use pull protocol to copy metadata')), | |
1340 | ('', 'uncompressed', None, |
|
1340 | ('', 'uncompressed', None, | |
1341 | _('an alias to --stream (DEPRECATED)')), |
|
1341 | _('an alias to --stream (DEPRECATED)')), | |
1342 | ('', 'stream', None, |
|
1342 | ('', 'stream', None, | |
1343 | _('clone with minimal data processing')), |
|
1343 | _('clone with minimal data processing')), | |
1344 | ] + remoteopts, |
|
1344 | ] + remoteopts, | |
1345 | _('[OPTION]... SOURCE [DEST]'), |
|
1345 | _('[OPTION]... SOURCE [DEST]'), | |
1346 | norepo=True) |
|
1346 | norepo=True) | |
1347 | def clone(ui, source, dest=None, **opts): |
|
1347 | def clone(ui, source, dest=None, **opts): | |
1348 | """make a copy of an existing repository |
|
1348 | """make a copy of an existing repository | |
1349 |
|
1349 | |||
1350 | Create a copy of an existing repository in a new directory. |
|
1350 | Create a copy of an existing repository in a new directory. | |
1351 |
|
1351 | |||
1352 | If no destination directory name is specified, it defaults to the |
|
1352 | If no destination directory name is specified, it defaults to the | |
1353 | basename of the source. |
|
1353 | basename of the source. | |
1354 |
|
1354 | |||
1355 | The location of the source is added to the new repository's |
|
1355 | The location of the source is added to the new repository's | |
1356 | ``.hg/hgrc`` file, as the default to be used for future pulls. |
|
1356 | ``.hg/hgrc`` file, as the default to be used for future pulls. | |
1357 |
|
1357 | |||
1358 | Only local paths and ``ssh://`` URLs are supported as |
|
1358 | Only local paths and ``ssh://`` URLs are supported as | |
1359 | destinations. For ``ssh://`` destinations, no working directory or |
|
1359 | destinations. For ``ssh://`` destinations, no working directory or | |
1360 | ``.hg/hgrc`` will be created on the remote side. |
|
1360 | ``.hg/hgrc`` will be created on the remote side. | |
1361 |
|
1361 | |||
1362 | If the source repository has a bookmark called '@' set, that |
|
1362 | If the source repository has a bookmark called '@' set, that | |
1363 | revision will be checked out in the new repository by default. |
|
1363 | revision will be checked out in the new repository by default. | |
1364 |
|
1364 | |||
1365 | To check out a particular version, use -u/--update, or |
|
1365 | To check out a particular version, use -u/--update, or | |
1366 | -U/--noupdate to create a clone with no working directory. |
|
1366 | -U/--noupdate to create a clone with no working directory. | |
1367 |
|
1367 | |||
1368 | To pull only a subset of changesets, specify one or more revisions |
|
1368 | To pull only a subset of changesets, specify one or more revisions | |
1369 | identifiers with -r/--rev or branches with -b/--branch. The |
|
1369 | identifiers with -r/--rev or branches with -b/--branch. The | |
1370 | resulting clone will contain only the specified changesets and |
|
1370 | resulting clone will contain only the specified changesets and | |
1371 | their ancestors. These options (or 'clone src#rev dest') imply |
|
1371 | their ancestors. These options (or 'clone src#rev dest') imply | |
1372 | --pull, even for local source repositories. |
|
1372 | --pull, even for local source repositories. | |
1373 |
|
1373 | |||
1374 | In normal clone mode, the remote normalizes repository data into a common |
|
1374 | In normal clone mode, the remote normalizes repository data into a common | |
1375 | exchange format and the receiving end translates this data into its local |
|
1375 | exchange format and the receiving end translates this data into its local | |
1376 | storage format. --stream activates a different clone mode that essentially |
|
1376 | storage format. --stream activates a different clone mode that essentially | |
1377 | copies repository files from the remote with minimal data processing. This |
|
1377 | copies repository files from the remote with minimal data processing. This | |
1378 | significantly reduces the CPU cost of a clone both remotely and locally. |
|
1378 | significantly reduces the CPU cost of a clone both remotely and locally. | |
1379 | However, it often increases the transferred data size by 30-40%. This can |
|
1379 | However, it often increases the transferred data size by 30-40%. This can | |
1380 | result in substantially faster clones where I/O throughput is plentiful, |
|
1380 | result in substantially faster clones where I/O throughput is plentiful, | |
1381 | especially for larger repositories. A side-effect of --stream clones is |
|
1381 | especially for larger repositories. A side-effect of --stream clones is | |
1382 | that storage settings and requirements on the remote are applied locally: |
|
1382 | that storage settings and requirements on the remote are applied locally: | |
1383 | a modern client may inherit legacy or inefficient storage used by the |
|
1383 | a modern client may inherit legacy or inefficient storage used by the | |
1384 | remote or a legacy Mercurial client may not be able to clone from a |
|
1384 | remote or a legacy Mercurial client may not be able to clone from a | |
1385 | modern Mercurial remote. |
|
1385 | modern Mercurial remote. | |
1386 |
|
1386 | |||
1387 | .. note:: |
|
1387 | .. note:: | |
1388 |
|
1388 | |||
1389 | Specifying a tag will include the tagged changeset but not the |
|
1389 | Specifying a tag will include the tagged changeset but not the | |
1390 | changeset containing the tag. |
|
1390 | changeset containing the tag. | |
1391 |
|
1391 | |||
1392 | .. container:: verbose |
|
1392 | .. container:: verbose | |
1393 |
|
1393 | |||
1394 | For efficiency, hardlinks are used for cloning whenever the |
|
1394 | For efficiency, hardlinks are used for cloning whenever the | |
1395 | source and destination are on the same filesystem (note this |
|
1395 | source and destination are on the same filesystem (note this | |
1396 | applies only to the repository data, not to the working |
|
1396 | applies only to the repository data, not to the working | |
1397 | directory). Some filesystems, such as AFS, implement hardlinking |
|
1397 | directory). Some filesystems, such as AFS, implement hardlinking | |
1398 | incorrectly, but do not report errors. In these cases, use the |
|
1398 | incorrectly, but do not report errors. In these cases, use the | |
1399 | --pull option to avoid hardlinking. |
|
1399 | --pull option to avoid hardlinking. | |
1400 |
|
1400 | |||
1401 | Mercurial will update the working directory to the first applicable |
|
1401 | Mercurial will update the working directory to the first applicable | |
1402 | revision from this list: |
|
1402 | revision from this list: | |
1403 |
|
1403 | |||
1404 | a) null if -U or the source repository has no changesets |
|
1404 | a) null if -U or the source repository has no changesets | |
1405 | b) if -u . and the source repository is local, the first parent of |
|
1405 | b) if -u . and the source repository is local, the first parent of | |
1406 | the source repository's working directory |
|
1406 | the source repository's working directory | |
1407 | c) the changeset specified with -u (if a branch name, this means the |
|
1407 | c) the changeset specified with -u (if a branch name, this means the | |
1408 | latest head of that branch) |
|
1408 | latest head of that branch) | |
1409 | d) the changeset specified with -r |
|
1409 | d) the changeset specified with -r | |
1410 | e) the tipmost head specified with -b |
|
1410 | e) the tipmost head specified with -b | |
1411 | f) the tipmost head specified with the url#branch source syntax |
|
1411 | f) the tipmost head specified with the url#branch source syntax | |
1412 | g) the revision marked with the '@' bookmark, if present |
|
1412 | g) the revision marked with the '@' bookmark, if present | |
1413 | h) the tipmost head of the default branch |
|
1413 | h) the tipmost head of the default branch | |
1414 | i) tip |
|
1414 | i) tip | |
1415 |
|
1415 | |||
1416 | When cloning from servers that support it, Mercurial may fetch |
|
1416 | When cloning from servers that support it, Mercurial may fetch | |
1417 | pre-generated data from a server-advertised URL. When this is done, |
|
1417 | pre-generated data from a server-advertised URL. When this is done, | |
1418 | hooks operating on incoming changesets and changegroups may fire twice, |
|
1418 | hooks operating on incoming changesets and changegroups may fire twice, | |
1419 | once for the bundle fetched from the URL and another for any additional |
|
1419 | once for the bundle fetched from the URL and another for any additional | |
1420 | data not fetched from this URL. In addition, if an error occurs, the |
|
1420 | data not fetched from this URL. In addition, if an error occurs, the | |
1421 | repository may be rolled back to a partial clone. This behavior may |
|
1421 | repository may be rolled back to a partial clone. This behavior may | |
1422 | change in future releases. See :hg:`help -e clonebundles` for more. |
|
1422 | change in future releases. See :hg:`help -e clonebundles` for more. | |
1423 |
|
1423 | |||
1424 | Examples: |
|
1424 | Examples: | |
1425 |
|
1425 | |||
1426 | - clone a remote repository to a new directory named hg/:: |
|
1426 | - clone a remote repository to a new directory named hg/:: | |
1427 |
|
1427 | |||
1428 | hg clone https://www.mercurial-scm.org/repo/hg/ |
|
1428 | hg clone https://www.mercurial-scm.org/repo/hg/ | |
1429 |
|
1429 | |||
1430 | - create a lightweight local clone:: |
|
1430 | - create a lightweight local clone:: | |
1431 |
|
1431 | |||
1432 | hg clone project/ project-feature/ |
|
1432 | hg clone project/ project-feature/ | |
1433 |
|
1433 | |||
1434 | - clone from an absolute path on an ssh server (note double-slash):: |
|
1434 | - clone from an absolute path on an ssh server (note double-slash):: | |
1435 |
|
1435 | |||
1436 | hg clone ssh://user@server//home/projects/alpha/ |
|
1436 | hg clone ssh://user@server//home/projects/alpha/ | |
1437 |
|
1437 | |||
1438 | - do a streaming clone while checking out a specified version:: |
|
1438 | - do a streaming clone while checking out a specified version:: | |
1439 |
|
1439 | |||
1440 | hg clone --stream http://server/repo -u 1.5 |
|
1440 | hg clone --stream http://server/repo -u 1.5 | |
1441 |
|
1441 | |||
1442 | - create a repository without changesets after a particular revision:: |
|
1442 | - create a repository without changesets after a particular revision:: | |
1443 |
|
1443 | |||
1444 | hg clone -r 04e544 experimental/ good/ |
|
1444 | hg clone -r 04e544 experimental/ good/ | |
1445 |
|
1445 | |||
1446 | - clone (and track) a particular named branch:: |
|
1446 | - clone (and track) a particular named branch:: | |
1447 |
|
1447 | |||
1448 | hg clone https://www.mercurial-scm.org/repo/hg/#stable |
|
1448 | hg clone https://www.mercurial-scm.org/repo/hg/#stable | |
1449 |
|
1449 | |||
1450 | See :hg:`help urls` for details on specifying URLs. |
|
1450 | See :hg:`help urls` for details on specifying URLs. | |
1451 |
|
1451 | |||
1452 | Returns 0 on success. |
|
1452 | Returns 0 on success. | |
1453 | """ |
|
1453 | """ | |
1454 | opts = pycompat.byteskwargs(opts) |
|
1454 | opts = pycompat.byteskwargs(opts) | |
1455 | if opts.get('noupdate') and opts.get('updaterev'): |
|
1455 | if opts.get('noupdate') and opts.get('updaterev'): | |
1456 | raise error.Abort(_("cannot specify both --noupdate and --updaterev")) |
|
1456 | raise error.Abort(_("cannot specify both --noupdate and --updaterev")) | |
1457 |
|
1457 | |||
1458 | r = hg.clone(ui, opts, source, dest, |
|
1458 | r = hg.clone(ui, opts, source, dest, | |
1459 | pull=opts.get('pull'), |
|
1459 | pull=opts.get('pull'), | |
1460 | stream=opts.get('stream') or opts.get('uncompressed'), |
|
1460 | stream=opts.get('stream') or opts.get('uncompressed'), | |
1461 | rev=opts.get('rev'), |
|
1461 | rev=opts.get('rev'), | |
1462 | update=opts.get('updaterev') or not opts.get('noupdate'), |
|
1462 | update=opts.get('updaterev') or not opts.get('noupdate'), | |
1463 | branch=opts.get('branch'), |
|
1463 | branch=opts.get('branch'), | |
1464 | shareopts=opts.get('shareopts')) |
|
1464 | shareopts=opts.get('shareopts')) | |
1465 |
|
1465 | |||
1466 | return r is None |
|
1466 | return r is None | |
1467 |
|
1467 | |||
1468 | @command('^commit|ci', |
|
1468 | @command('^commit|ci', | |
1469 | [('A', 'addremove', None, |
|
1469 | [('A', 'addremove', None, | |
1470 | _('mark new/missing files as added/removed before committing')), |
|
1470 | _('mark new/missing files as added/removed before committing')), | |
1471 | ('', 'close-branch', None, |
|
1471 | ('', 'close-branch', None, | |
1472 | _('mark a branch head as closed')), |
|
1472 | _('mark a branch head as closed')), | |
1473 | ('', 'amend', None, _('amend the parent of the working directory')), |
|
1473 | ('', 'amend', None, _('amend the parent of the working directory')), | |
1474 | ('s', 'secret', None, _('use the secret phase for committing')), |
|
1474 | ('s', 'secret', None, _('use the secret phase for committing')), | |
1475 | ('e', 'edit', None, _('invoke editor on commit messages')), |
|
1475 | ('e', 'edit', None, _('invoke editor on commit messages')), | |
1476 | ('i', 'interactive', None, _('use interactive mode')), |
|
1476 | ('i', 'interactive', None, _('use interactive mode')), | |
1477 | ] + walkopts + commitopts + commitopts2 + subrepoopts, |
|
1477 | ] + walkopts + commitopts + commitopts2 + subrepoopts, | |
1478 | _('[OPTION]... [FILE]...'), |
|
1478 | _('[OPTION]... [FILE]...'), | |
1479 | inferrepo=True) |
|
1479 | inferrepo=True) | |
1480 | def commit(ui, repo, *pats, **opts): |
|
1480 | def commit(ui, repo, *pats, **opts): | |
1481 | """commit the specified files or all outstanding changes |
|
1481 | """commit the specified files or all outstanding changes | |
1482 |
|
1482 | |||
1483 | Commit changes to the given files into the repository. Unlike a |
|
1483 | Commit changes to the given files into the repository. Unlike a | |
1484 | centralized SCM, this operation is a local operation. See |
|
1484 | centralized SCM, this operation is a local operation. See | |
1485 | :hg:`push` for a way to actively distribute your changes. |
|
1485 | :hg:`push` for a way to actively distribute your changes. | |
1486 |
|
1486 | |||
1487 | If a list of files is omitted, all changes reported by :hg:`status` |
|
1487 | If a list of files is omitted, all changes reported by :hg:`status` | |
1488 | will be committed. |
|
1488 | will be committed. | |
1489 |
|
1489 | |||
1490 | If you are committing the result of a merge, do not provide any |
|
1490 | If you are committing the result of a merge, do not provide any | |
1491 | filenames or -I/-X filters. |
|
1491 | filenames or -I/-X filters. | |
1492 |
|
1492 | |||
1493 | If no commit message is specified, Mercurial starts your |
|
1493 | If no commit message is specified, Mercurial starts your | |
1494 | configured editor where you can enter a message. In case your |
|
1494 | configured editor where you can enter a message. In case your | |
1495 | commit fails, you will find a backup of your message in |
|
1495 | commit fails, you will find a backup of your message in | |
1496 | ``.hg/last-message.txt``. |
|
1496 | ``.hg/last-message.txt``. | |
1497 |
|
1497 | |||
1498 | The --close-branch flag can be used to mark the current branch |
|
1498 | The --close-branch flag can be used to mark the current branch | |
1499 | head closed. When all heads of a branch are closed, the branch |
|
1499 | head closed. When all heads of a branch are closed, the branch | |
1500 | will be considered closed and no longer listed. |
|
1500 | will be considered closed and no longer listed. | |
1501 |
|
1501 | |||
1502 | The --amend flag can be used to amend the parent of the |
|
1502 | The --amend flag can be used to amend the parent of the | |
1503 | working directory with a new commit that contains the changes |
|
1503 | working directory with a new commit that contains the changes | |
1504 | in the parent in addition to those currently reported by :hg:`status`, |
|
1504 | in the parent in addition to those currently reported by :hg:`status`, | |
1505 | if there are any. The old commit is stored in a backup bundle in |
|
1505 | if there are any. The old commit is stored in a backup bundle in | |
1506 | ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle` |
|
1506 | ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle` | |
1507 | on how to restore it). |
|
1507 | on how to restore it). | |
1508 |
|
1508 | |||
1509 | Message, user and date are taken from the amended commit unless |
|
1509 | Message, user and date are taken from the amended commit unless | |
1510 | specified. When a message isn't specified on the command line, |
|
1510 | specified. When a message isn't specified on the command line, | |
1511 | the editor will open with the message of the amended commit. |
|
1511 | the editor will open with the message of the amended commit. | |
1512 |
|
1512 | |||
1513 | It is not possible to amend public changesets (see :hg:`help phases`) |
|
1513 | It is not possible to amend public changesets (see :hg:`help phases`) | |
1514 | or changesets that have children. |
|
1514 | or changesets that have children. | |
1515 |
|
1515 | |||
1516 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
1516 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
1517 |
|
1517 | |||
1518 | Returns 0 on success, 1 if nothing changed. |
|
1518 | Returns 0 on success, 1 if nothing changed. | |
1519 |
|
1519 | |||
1520 | .. container:: verbose |
|
1520 | .. container:: verbose | |
1521 |
|
1521 | |||
1522 | Examples: |
|
1522 | Examples: | |
1523 |
|
1523 | |||
1524 | - commit all files ending in .py:: |
|
1524 | - commit all files ending in .py:: | |
1525 |
|
1525 | |||
1526 | hg commit --include "set:**.py" |
|
1526 | hg commit --include "set:**.py" | |
1527 |
|
1527 | |||
1528 | - commit all non-binary files:: |
|
1528 | - commit all non-binary files:: | |
1529 |
|
1529 | |||
1530 | hg commit --exclude "set:binary()" |
|
1530 | hg commit --exclude "set:binary()" | |
1531 |
|
1531 | |||
1532 | - amend the current commit and set the date to now:: |
|
1532 | - amend the current commit and set the date to now:: | |
1533 |
|
1533 | |||
1534 | hg commit --amend --date now |
|
1534 | hg commit --amend --date now | |
1535 | """ |
|
1535 | """ | |
1536 | wlock = lock = None |
|
1536 | wlock = lock = None | |
1537 | try: |
|
1537 | try: | |
1538 | wlock = repo.wlock() |
|
1538 | wlock = repo.wlock() | |
1539 | lock = repo.lock() |
|
1539 | lock = repo.lock() | |
1540 | return _docommit(ui, repo, *pats, **opts) |
|
1540 | return _docommit(ui, repo, *pats, **opts) | |
1541 | finally: |
|
1541 | finally: | |
1542 | release(lock, wlock) |
|
1542 | release(lock, wlock) | |
1543 |
|
1543 | |||
1544 | def _docommit(ui, repo, *pats, **opts): |
|
1544 | def _docommit(ui, repo, *pats, **opts): | |
1545 | if opts.get(r'interactive'): |
|
1545 | if opts.get(r'interactive'): | |
1546 | opts.pop(r'interactive') |
|
1546 | opts.pop(r'interactive') | |
1547 | ret = cmdutil.dorecord(ui, repo, commit, None, False, |
|
1547 | ret = cmdutil.dorecord(ui, repo, commit, None, False, | |
1548 | cmdutil.recordfilter, *pats, |
|
1548 | cmdutil.recordfilter, *pats, | |
1549 | **opts) |
|
1549 | **opts) | |
1550 | # ret can be 0 (no changes to record) or the value returned by |
|
1550 | # ret can be 0 (no changes to record) or the value returned by | |
1551 | # commit(), 1 if nothing changed or None on success. |
|
1551 | # commit(), 1 if nothing changed or None on success. | |
1552 | return 1 if ret == 0 else ret |
|
1552 | return 1 if ret == 0 else ret | |
1553 |
|
1553 | |||
1554 | opts = pycompat.byteskwargs(opts) |
|
1554 | opts = pycompat.byteskwargs(opts) | |
1555 | if opts.get('subrepos'): |
|
1555 | if opts.get('subrepos'): | |
1556 | if opts.get('amend'): |
|
1556 | if opts.get('amend'): | |
1557 | raise error.Abort(_('cannot amend with --subrepos')) |
|
1557 | raise error.Abort(_('cannot amend with --subrepos')) | |
1558 | # Let --subrepos on the command line override config setting. |
|
1558 | # Let --subrepos on the command line override config setting. | |
1559 | ui.setconfig('ui', 'commitsubrepos', True, 'commit') |
|
1559 | ui.setconfig('ui', 'commitsubrepos', True, 'commit') | |
1560 |
|
1560 | |||
1561 | cmdutil.checkunfinished(repo, commit=True) |
|
1561 | cmdutil.checkunfinished(repo, commit=True) | |
1562 |
|
1562 | |||
1563 | branch = repo[None].branch() |
|
1563 | branch = repo[None].branch() | |
1564 | bheads = repo.branchheads(branch) |
|
1564 | bheads = repo.branchheads(branch) | |
1565 |
|
1565 | |||
1566 | extra = {} |
|
1566 | extra = {} | |
1567 | if opts.get('close_branch'): |
|
1567 | if opts.get('close_branch'): | |
1568 | extra['close'] = '1' |
|
1568 | extra['close'] = '1' | |
1569 |
|
1569 | |||
1570 | if not bheads: |
|
1570 | if not bheads: | |
1571 | raise error.Abort(_('can only close branch heads')) |
|
1571 | raise error.Abort(_('can only close branch heads')) | |
1572 | elif opts.get('amend'): |
|
1572 | elif opts.get('amend'): | |
1573 | if repo[None].parents()[0].p1().branch() != branch and \ |
|
1573 | if repo[None].parents()[0].p1().branch() != branch and \ | |
1574 | repo[None].parents()[0].p2().branch() != branch: |
|
1574 | repo[None].parents()[0].p2().branch() != branch: | |
1575 | raise error.Abort(_('can only close branch heads')) |
|
1575 | raise error.Abort(_('can only close branch heads')) | |
1576 |
|
1576 | |||
1577 | if opts.get('amend'): |
|
1577 | if opts.get('amend'): | |
1578 | if ui.configbool('ui', 'commitsubrepos'): |
|
1578 | if ui.configbool('ui', 'commitsubrepos'): | |
1579 | raise error.Abort(_('cannot amend with ui.commitsubrepos enabled')) |
|
1579 | raise error.Abort(_('cannot amend with ui.commitsubrepos enabled')) | |
1580 |
|
1580 | |||
1581 | old = repo['.'] |
|
1581 | old = repo['.'] | |
1582 | rewriteutil.precheck(repo, [old.rev()], 'amend') |
|
1582 | rewriteutil.precheck(repo, [old.rev()], 'amend') | |
1583 |
|
1583 | |||
1584 | # Currently histedit gets confused if an amend happens while histedit |
|
1584 | # Currently histedit gets confused if an amend happens while histedit | |
1585 | # is in progress. Since we have a checkunfinished command, we are |
|
1585 | # is in progress. Since we have a checkunfinished command, we are | |
1586 | # temporarily honoring it. |
|
1586 | # temporarily honoring it. | |
1587 | # |
|
1587 | # | |
1588 | # Note: eventually this guard will be removed. Please do not expect |
|
1588 | # Note: eventually this guard will be removed. Please do not expect | |
1589 | # this behavior to remain. |
|
1589 | # this behavior to remain. | |
1590 | if not obsolete.isenabled(repo, obsolete.createmarkersopt): |
|
1590 | if not obsolete.isenabled(repo, obsolete.createmarkersopt): | |
1591 | cmdutil.checkunfinished(repo) |
|
1591 | cmdutil.checkunfinished(repo) | |
1592 |
|
1592 | |||
1593 | node = cmdutil.amend(ui, repo, old, extra, pats, opts) |
|
1593 | node = cmdutil.amend(ui, repo, old, extra, pats, opts) | |
1594 | if node == old.node(): |
|
1594 | if node == old.node(): | |
1595 | ui.status(_("nothing changed\n")) |
|
1595 | ui.status(_("nothing changed\n")) | |
1596 | return 1 |
|
1596 | return 1 | |
1597 | else: |
|
1597 | else: | |
1598 | def commitfunc(ui, repo, message, match, opts): |
|
1598 | def commitfunc(ui, repo, message, match, opts): | |
1599 | overrides = {} |
|
1599 | overrides = {} | |
1600 | if opts.get('secret'): |
|
1600 | if opts.get('secret'): | |
1601 | overrides[('phases', 'new-commit')] = 'secret' |
|
1601 | overrides[('phases', 'new-commit')] = 'secret' | |
1602 |
|
1602 | |||
1603 | baseui = repo.baseui |
|
1603 | baseui = repo.baseui | |
1604 | with baseui.configoverride(overrides, 'commit'): |
|
1604 | with baseui.configoverride(overrides, 'commit'): | |
1605 | with ui.configoverride(overrides, 'commit'): |
|
1605 | with ui.configoverride(overrides, 'commit'): | |
1606 | editform = cmdutil.mergeeditform(repo[None], |
|
1606 | editform = cmdutil.mergeeditform(repo[None], | |
1607 | 'commit.normal') |
|
1607 | 'commit.normal') | |
1608 | editor = cmdutil.getcommiteditor( |
|
1608 | editor = cmdutil.getcommiteditor( | |
1609 | editform=editform, **pycompat.strkwargs(opts)) |
|
1609 | editform=editform, **pycompat.strkwargs(opts)) | |
1610 | return repo.commit(message, |
|
1610 | return repo.commit(message, | |
1611 | opts.get('user'), |
|
1611 | opts.get('user'), | |
1612 | opts.get('date'), |
|
1612 | opts.get('date'), | |
1613 | match, |
|
1613 | match, | |
1614 | editor=editor, |
|
1614 | editor=editor, | |
1615 | extra=extra) |
|
1615 | extra=extra) | |
1616 |
|
1616 | |||
1617 | node = cmdutil.commit(ui, repo, commitfunc, pats, opts) |
|
1617 | node = cmdutil.commit(ui, repo, commitfunc, pats, opts) | |
1618 |
|
1618 | |||
1619 | if not node: |
|
1619 | if not node: | |
1620 | stat = cmdutil.postcommitstatus(repo, pats, opts) |
|
1620 | stat = cmdutil.postcommitstatus(repo, pats, opts) | |
1621 | if stat[3]: |
|
1621 | if stat[3]: | |
1622 | ui.status(_("nothing changed (%d missing files, see " |
|
1622 | ui.status(_("nothing changed (%d missing files, see " | |
1623 | "'hg status')\n") % len(stat[3])) |
|
1623 | "'hg status')\n") % len(stat[3])) | |
1624 | else: |
|
1624 | else: | |
1625 | ui.status(_("nothing changed\n")) |
|
1625 | ui.status(_("nothing changed\n")) | |
1626 | return 1 |
|
1626 | return 1 | |
1627 |
|
1627 | |||
1628 | cmdutil.commitstatus(repo, node, branch, bheads, opts) |
|
1628 | cmdutil.commitstatus(repo, node, branch, bheads, opts) | |
1629 |
|
1629 | |||
1630 | @command('config|showconfig|debugconfig', |
|
1630 | @command('config|showconfig|debugconfig', | |
1631 | [('u', 'untrusted', None, _('show untrusted configuration options')), |
|
1631 | [('u', 'untrusted', None, _('show untrusted configuration options')), | |
1632 | ('e', 'edit', None, _('edit user config')), |
|
1632 | ('e', 'edit', None, _('edit user config')), | |
1633 | ('l', 'local', None, _('edit repository config')), |
|
1633 | ('l', 'local', None, _('edit repository config')), | |
1634 | ('g', 'global', None, _('edit global config'))] + formatteropts, |
|
1634 | ('g', 'global', None, _('edit global config'))] + formatteropts, | |
1635 | _('[-u] [NAME]...'), |
|
1635 | _('[-u] [NAME]...'), | |
1636 | optionalrepo=True, cmdtype=readonly) |
|
1636 | optionalrepo=True, cmdtype=readonly) | |
1637 | def config(ui, repo, *values, **opts): |
|
1637 | def config(ui, repo, *values, **opts): | |
1638 | """show combined config settings from all hgrc files |
|
1638 | """show combined config settings from all hgrc files | |
1639 |
|
1639 | |||
1640 | With no arguments, print names and values of all config items. |
|
1640 | With no arguments, print names and values of all config items. | |
1641 |
|
1641 | |||
1642 | With one argument of the form section.name, print just the value |
|
1642 | With one argument of the form section.name, print just the value | |
1643 | of that config item. |
|
1643 | of that config item. | |
1644 |
|
1644 | |||
1645 | With multiple arguments, print names and values of all config |
|
1645 | With multiple arguments, print names and values of all config | |
1646 | items with matching section names or section.names. |
|
1646 | items with matching section names or section.names. | |
1647 |
|
1647 | |||
1648 | With --edit, start an editor on the user-level config file. With |
|
1648 | With --edit, start an editor on the user-level config file. With | |
1649 | --global, edit the system-wide config file. With --local, edit the |
|
1649 | --global, edit the system-wide config file. With --local, edit the | |
1650 | repository-level config file. |
|
1650 | repository-level config file. | |
1651 |
|
1651 | |||
1652 | With --debug, the source (filename and line number) is printed |
|
1652 | With --debug, the source (filename and line number) is printed | |
1653 | for each config item. |
|
1653 | for each config item. | |
1654 |
|
1654 | |||
1655 | See :hg:`help config` for more information about config files. |
|
1655 | See :hg:`help config` for more information about config files. | |
1656 |
|
1656 | |||
1657 | Returns 0 on success, 1 if NAME does not exist. |
|
1657 | Returns 0 on success, 1 if NAME does not exist. | |
1658 |
|
1658 | |||
1659 | """ |
|
1659 | """ | |
1660 |
|
1660 | |||
1661 | opts = pycompat.byteskwargs(opts) |
|
1661 | opts = pycompat.byteskwargs(opts) | |
1662 | if opts.get('edit') or opts.get('local') or opts.get('global'): |
|
1662 | if opts.get('edit') or opts.get('local') or opts.get('global'): | |
1663 | if opts.get('local') and opts.get('global'): |
|
1663 | if opts.get('local') and opts.get('global'): | |
1664 | raise error.Abort(_("can't use --local and --global together")) |
|
1664 | raise error.Abort(_("can't use --local and --global together")) | |
1665 |
|
1665 | |||
1666 | if opts.get('local'): |
|
1666 | if opts.get('local'): | |
1667 | if not repo: |
|
1667 | if not repo: | |
1668 | raise error.Abort(_("can't use --local outside a repository")) |
|
1668 | raise error.Abort(_("can't use --local outside a repository")) | |
1669 | paths = [repo.vfs.join('hgrc')] |
|
1669 | paths = [repo.vfs.join('hgrc')] | |
1670 | elif opts.get('global'): |
|
1670 | elif opts.get('global'): | |
1671 | paths = rcutil.systemrcpath() |
|
1671 | paths = rcutil.systemrcpath() | |
1672 | else: |
|
1672 | else: | |
1673 | paths = rcutil.userrcpath() |
|
1673 | paths = rcutil.userrcpath() | |
1674 |
|
1674 | |||
1675 | for f in paths: |
|
1675 | for f in paths: | |
1676 | if os.path.exists(f): |
|
1676 | if os.path.exists(f): | |
1677 | break |
|
1677 | break | |
1678 | else: |
|
1678 | else: | |
1679 | if opts.get('global'): |
|
1679 | if opts.get('global'): | |
1680 | samplehgrc = uimod.samplehgrcs['global'] |
|
1680 | samplehgrc = uimod.samplehgrcs['global'] | |
1681 | elif opts.get('local'): |
|
1681 | elif opts.get('local'): | |
1682 | samplehgrc = uimod.samplehgrcs['local'] |
|
1682 | samplehgrc = uimod.samplehgrcs['local'] | |
1683 | else: |
|
1683 | else: | |
1684 | samplehgrc = uimod.samplehgrcs['user'] |
|
1684 | samplehgrc = uimod.samplehgrcs['user'] | |
1685 |
|
1685 | |||
1686 | f = paths[0] |
|
1686 | f = paths[0] | |
1687 | fp = open(f, "wb") |
|
1687 | fp = open(f, "wb") | |
1688 | fp.write(util.tonativeeol(samplehgrc)) |
|
1688 | fp.write(util.tonativeeol(samplehgrc)) | |
1689 | fp.close() |
|
1689 | fp.close() | |
1690 |
|
1690 | |||
1691 | editor = ui.geteditor() |
|
1691 | editor = ui.geteditor() | |
1692 | ui.system("%s \"%s\"" % (editor, f), |
|
1692 | ui.system("%s \"%s\"" % (editor, f), | |
1693 | onerr=error.Abort, errprefix=_("edit failed"), |
|
1693 | onerr=error.Abort, errprefix=_("edit failed"), | |
1694 | blockedtag='config_edit') |
|
1694 | blockedtag='config_edit') | |
1695 | return |
|
1695 | return | |
1696 | ui.pager('config') |
|
1696 | ui.pager('config') | |
1697 | fm = ui.formatter('config', opts) |
|
1697 | fm = ui.formatter('config', opts) | |
1698 | for t, f in rcutil.rccomponents(): |
|
1698 | for t, f in rcutil.rccomponents(): | |
1699 | if t == 'path': |
|
1699 | if t == 'path': | |
1700 | ui.debug('read config from: %s\n' % f) |
|
1700 | ui.debug('read config from: %s\n' % f) | |
1701 | elif t == 'items': |
|
1701 | elif t == 'items': | |
1702 | for section, name, value, source in f: |
|
1702 | for section, name, value, source in f: | |
1703 | ui.debug('set config by: %s\n' % source) |
|
1703 | ui.debug('set config by: %s\n' % source) | |
1704 | else: |
|
1704 | else: | |
1705 | raise error.ProgrammingError('unknown rctype: %s' % t) |
|
1705 | raise error.ProgrammingError('unknown rctype: %s' % t) | |
1706 | untrusted = bool(opts.get('untrusted')) |
|
1706 | untrusted = bool(opts.get('untrusted')) | |
1707 |
|
1707 | |||
1708 | selsections = selentries = [] |
|
1708 | selsections = selentries = [] | |
1709 | if values: |
|
1709 | if values: | |
1710 | selsections = [v for v in values if '.' not in v] |
|
1710 | selsections = [v for v in values if '.' not in v] | |
1711 | selentries = [v for v in values if '.' in v] |
|
1711 | selentries = [v for v in values if '.' in v] | |
1712 | uniquesel = (len(selentries) == 1 and not selsections) |
|
1712 | uniquesel = (len(selentries) == 1 and not selsections) | |
1713 | selsections = set(selsections) |
|
1713 | selsections = set(selsections) | |
1714 | selentries = set(selentries) |
|
1714 | selentries = set(selentries) | |
1715 |
|
1715 | |||
1716 | matched = False |
|
1716 | matched = False | |
1717 | for section, name, value in ui.walkconfig(untrusted=untrusted): |
|
1717 | for section, name, value in ui.walkconfig(untrusted=untrusted): | |
1718 | source = ui.configsource(section, name, untrusted) |
|
1718 | source = ui.configsource(section, name, untrusted) | |
1719 | value = pycompat.bytestr(value) |
|
1719 | value = pycompat.bytestr(value) | |
1720 | if fm.isplain(): |
|
1720 | if fm.isplain(): | |
1721 | source = source or 'none' |
|
1721 | source = source or 'none' | |
1722 | value = value.replace('\n', '\\n') |
|
1722 | value = value.replace('\n', '\\n') | |
1723 | entryname = section + '.' + name |
|
1723 | entryname = section + '.' + name | |
1724 | if values and not (section in selsections or entryname in selentries): |
|
1724 | if values and not (section in selsections or entryname in selentries): | |
1725 | continue |
|
1725 | continue | |
1726 | fm.startitem() |
|
1726 | fm.startitem() | |
1727 | fm.condwrite(ui.debugflag, 'source', '%s: ', source) |
|
1727 | fm.condwrite(ui.debugflag, 'source', '%s: ', source) | |
1728 | if uniquesel: |
|
1728 | if uniquesel: | |
1729 | fm.data(name=entryname) |
|
1729 | fm.data(name=entryname) | |
1730 | fm.write('value', '%s\n', value) |
|
1730 | fm.write('value', '%s\n', value) | |
1731 | else: |
|
1731 | else: | |
1732 | fm.write('name value', '%s=%s\n', entryname, value) |
|
1732 | fm.write('name value', '%s=%s\n', entryname, value) | |
1733 | matched = True |
|
1733 | matched = True | |
1734 | fm.end() |
|
1734 | fm.end() | |
1735 | if matched: |
|
1735 | if matched: | |
1736 | return 0 |
|
1736 | return 0 | |
1737 | return 1 |
|
1737 | return 1 | |
1738 |
|
1738 | |||
1739 | @command('copy|cp', |
|
1739 | @command('copy|cp', | |
1740 | [('A', 'after', None, _('record a copy that has already occurred')), |
|
1740 | [('A', 'after', None, _('record a copy that has already occurred')), | |
1741 | ('f', 'force', None, _('forcibly copy over an existing managed file')), |
|
1741 | ('f', 'force', None, _('forcibly copy over an existing managed file')), | |
1742 | ] + walkopts + dryrunopts, |
|
1742 | ] + walkopts + dryrunopts, | |
1743 | _('[OPTION]... [SOURCE]... DEST')) |
|
1743 | _('[OPTION]... [SOURCE]... DEST')) | |
1744 | def copy(ui, repo, *pats, **opts): |
|
1744 | def copy(ui, repo, *pats, **opts): | |
1745 | """mark files as copied for the next commit |
|
1745 | """mark files as copied for the next commit | |
1746 |
|
1746 | |||
1747 | Mark dest as having copies of source files. If dest is a |
|
1747 | Mark dest as having copies of source files. If dest is a | |
1748 | directory, copies are put in that directory. If dest is a file, |
|
1748 | directory, copies are put in that directory. If dest is a file, | |
1749 | the source must be a single file. |
|
1749 | the source must be a single file. | |
1750 |
|
1750 | |||
1751 | By default, this command copies the contents of files as they |
|
1751 | By default, this command copies the contents of files as they | |
1752 | exist in the working directory. If invoked with -A/--after, the |
|
1752 | exist in the working directory. If invoked with -A/--after, the | |
1753 | operation is recorded, but no copying is performed. |
|
1753 | operation is recorded, but no copying is performed. | |
1754 |
|
1754 | |||
1755 | This command takes effect with the next commit. To undo a copy |
|
1755 | This command takes effect with the next commit. To undo a copy | |
1756 | before that, see :hg:`revert`. |
|
1756 | before that, see :hg:`revert`. | |
1757 |
|
1757 | |||
1758 | Returns 0 on success, 1 if errors are encountered. |
|
1758 | Returns 0 on success, 1 if errors are encountered. | |
1759 | """ |
|
1759 | """ | |
1760 | opts = pycompat.byteskwargs(opts) |
|
1760 | opts = pycompat.byteskwargs(opts) | |
1761 | with repo.wlock(False): |
|
1761 | with repo.wlock(False): | |
1762 | return cmdutil.copy(ui, repo, pats, opts) |
|
1762 | return cmdutil.copy(ui, repo, pats, opts) | |
1763 |
|
1763 | |||
1764 | @command('debugcommands', [], _('[COMMAND]'), norepo=True) |
|
1764 | @command('debugcommands', [], _('[COMMAND]'), norepo=True) | |
1765 | def debugcommands(ui, cmd='', *args): |
|
1765 | def debugcommands(ui, cmd='', *args): | |
1766 | """list all available commands and options""" |
|
1766 | """list all available commands and options""" | |
1767 | for cmd, vals in sorted(table.iteritems()): |
|
1767 | for cmd, vals in sorted(table.iteritems()): | |
1768 | cmd = cmd.split('|')[0].strip('^') |
|
1768 | cmd = cmd.split('|')[0].strip('^') | |
1769 | opts = ', '.join([i[1] for i in vals[1]]) |
|
1769 | opts = ', '.join([i[1] for i in vals[1]]) | |
1770 | ui.write('%s: %s\n' % (cmd, opts)) |
|
1770 | ui.write('%s: %s\n' % (cmd, opts)) | |
1771 |
|
1771 | |||
1772 | @command('debugcomplete', |
|
1772 | @command('debugcomplete', | |
1773 | [('o', 'options', None, _('show the command options'))], |
|
1773 | [('o', 'options', None, _('show the command options'))], | |
1774 | _('[-o] CMD'), |
|
1774 | _('[-o] CMD'), | |
1775 | norepo=True) |
|
1775 | norepo=True) | |
1776 | def debugcomplete(ui, cmd='', **opts): |
|
1776 | def debugcomplete(ui, cmd='', **opts): | |
1777 | """returns the completion list associated with the given command""" |
|
1777 | """returns the completion list associated with the given command""" | |
1778 |
|
1778 | |||
1779 | if opts.get(r'options'): |
|
1779 | if opts.get(r'options'): | |
1780 | options = [] |
|
1780 | options = [] | |
1781 | otables = [globalopts] |
|
1781 | otables = [globalopts] | |
1782 | if cmd: |
|
1782 | if cmd: | |
1783 | aliases, entry = cmdutil.findcmd(cmd, table, False) |
|
1783 | aliases, entry = cmdutil.findcmd(cmd, table, False) | |
1784 | otables.append(entry[1]) |
|
1784 | otables.append(entry[1]) | |
1785 | for t in otables: |
|
1785 | for t in otables: | |
1786 | for o in t: |
|
1786 | for o in t: | |
1787 | if "(DEPRECATED)" in o[3]: |
|
1787 | if "(DEPRECATED)" in o[3]: | |
1788 | continue |
|
1788 | continue | |
1789 | if o[0]: |
|
1789 | if o[0]: | |
1790 | options.append('-%s' % o[0]) |
|
1790 | options.append('-%s' % o[0]) | |
1791 | options.append('--%s' % o[1]) |
|
1791 | options.append('--%s' % o[1]) | |
1792 | ui.write("%s\n" % "\n".join(options)) |
|
1792 | ui.write("%s\n" % "\n".join(options)) | |
1793 | return |
|
1793 | return | |
1794 |
|
1794 | |||
1795 | cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table) |
|
1795 | cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table) | |
1796 | if ui.verbose: |
|
1796 | if ui.verbose: | |
1797 | cmdlist = [' '.join(c[0]) for c in cmdlist.values()] |
|
1797 | cmdlist = [' '.join(c[0]) for c in cmdlist.values()] | |
1798 | ui.write("%s\n" % "\n".join(sorted(cmdlist))) |
|
1798 | ui.write("%s\n" % "\n".join(sorted(cmdlist))) | |
1799 |
|
1799 | |||
1800 | @command('^diff', |
|
1800 | @command('^diff', | |
1801 | [('r', 'rev', [], _('revision'), _('REV')), |
|
1801 | [('r', 'rev', [], _('revision'), _('REV')), | |
1802 | ('c', 'change', '', _('change made by revision'), _('REV')) |
|
1802 | ('c', 'change', '', _('change made by revision'), _('REV')) | |
1803 | ] + diffopts + diffopts2 + walkopts + subrepoopts, |
|
1803 | ] + diffopts + diffopts2 + walkopts + subrepoopts, | |
1804 | _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'), |
|
1804 | _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'), | |
1805 | inferrepo=True, cmdtype=readonly) |
|
1805 | inferrepo=True, cmdtype=readonly) | |
1806 | def diff(ui, repo, *pats, **opts): |
|
1806 | def diff(ui, repo, *pats, **opts): | |
1807 | """diff repository (or selected files) |
|
1807 | """diff repository (or selected files) | |
1808 |
|
1808 | |||
1809 | Show differences between revisions for the specified files. |
|
1809 | Show differences between revisions for the specified files. | |
1810 |
|
1810 | |||
1811 | Differences between files are shown using the unified diff format. |
|
1811 | Differences between files are shown using the unified diff format. | |
1812 |
|
1812 | |||
1813 | .. note:: |
|
1813 | .. note:: | |
1814 |
|
1814 | |||
1815 | :hg:`diff` may generate unexpected results for merges, as it will |
|
1815 | :hg:`diff` may generate unexpected results for merges, as it will | |
1816 | default to comparing against the working directory's first |
|
1816 | default to comparing against the working directory's first | |
1817 | parent changeset if no revisions are specified. |
|
1817 | parent changeset if no revisions are specified. | |
1818 |
|
1818 | |||
1819 | When two revision arguments are given, then changes are shown |
|
1819 | When two revision arguments are given, then changes are shown | |
1820 | between those revisions. If only one revision is specified then |
|
1820 | between those revisions. If only one revision is specified then | |
1821 | that revision is compared to the working directory, and, when no |
|
1821 | that revision is compared to the working directory, and, when no | |
1822 | revisions are specified, the working directory files are compared |
|
1822 | revisions are specified, the working directory files are compared | |
1823 | to its first parent. |
|
1823 | to its first parent. | |
1824 |
|
1824 | |||
1825 | Alternatively you can specify -c/--change with a revision to see |
|
1825 | Alternatively you can specify -c/--change with a revision to see | |
1826 | the changes in that changeset relative to its first parent. |
|
1826 | the changes in that changeset relative to its first parent. | |
1827 |
|
1827 | |||
1828 | Without the -a/--text option, diff will avoid generating diffs of |
|
1828 | Without the -a/--text option, diff will avoid generating diffs of | |
1829 | files it detects as binary. With -a, diff will generate a diff |
|
1829 | files it detects as binary. With -a, diff will generate a diff | |
1830 | anyway, probably with undesirable results. |
|
1830 | anyway, probably with undesirable results. | |
1831 |
|
1831 | |||
1832 | Use the -g/--git option to generate diffs in the git extended diff |
|
1832 | Use the -g/--git option to generate diffs in the git extended diff | |
1833 | format. For more information, read :hg:`help diffs`. |
|
1833 | format. For more information, read :hg:`help diffs`. | |
1834 |
|
1834 | |||
1835 | .. container:: verbose |
|
1835 | .. container:: verbose | |
1836 |
|
1836 | |||
1837 | Examples: |
|
1837 | Examples: | |
1838 |
|
1838 | |||
1839 | - compare a file in the current working directory to its parent:: |
|
1839 | - compare a file in the current working directory to its parent:: | |
1840 |
|
1840 | |||
1841 | hg diff foo.c |
|
1841 | hg diff foo.c | |
1842 |
|
1842 | |||
1843 | - compare two historical versions of a directory, with rename info:: |
|
1843 | - compare two historical versions of a directory, with rename info:: | |
1844 |
|
1844 | |||
1845 | hg diff --git -r 1.0:1.2 lib/ |
|
1845 | hg diff --git -r 1.0:1.2 lib/ | |
1846 |
|
1846 | |||
1847 | - get change stats relative to the last change on some date:: |
|
1847 | - get change stats relative to the last change on some date:: | |
1848 |
|
1848 | |||
1849 | hg diff --stat -r "date('may 2')" |
|
1849 | hg diff --stat -r "date('may 2')" | |
1850 |
|
1850 | |||
1851 | - diff all newly-added files that contain a keyword:: |
|
1851 | - diff all newly-added files that contain a keyword:: | |
1852 |
|
1852 | |||
1853 | hg diff "set:added() and grep(GNU)" |
|
1853 | hg diff "set:added() and grep(GNU)" | |
1854 |
|
1854 | |||
1855 | - compare a revision and its parents:: |
|
1855 | - compare a revision and its parents:: | |
1856 |
|
1856 | |||
1857 | hg diff -c 9353 # compare against first parent |
|
1857 | hg diff -c 9353 # compare against first parent | |
1858 | hg diff -r 9353^:9353 # same using revset syntax |
|
1858 | hg diff -r 9353^:9353 # same using revset syntax | |
1859 | hg diff -r 9353^2:9353 # compare against the second parent |
|
1859 | hg diff -r 9353^2:9353 # compare against the second parent | |
1860 |
|
1860 | |||
1861 | Returns 0 on success. |
|
1861 | Returns 0 on success. | |
1862 | """ |
|
1862 | """ | |
1863 |
|
1863 | |||
1864 | opts = pycompat.byteskwargs(opts) |
|
1864 | opts = pycompat.byteskwargs(opts) | |
1865 | revs = opts.get('rev') |
|
1865 | revs = opts.get('rev') | |
1866 | change = opts.get('change') |
|
1866 | change = opts.get('change') | |
1867 | stat = opts.get('stat') |
|
1867 | stat = opts.get('stat') | |
1868 | reverse = opts.get('reverse') |
|
1868 | reverse = opts.get('reverse') | |
1869 |
|
1869 | |||
1870 | if revs and change: |
|
1870 | if revs and change: | |
1871 | msg = _('cannot specify --rev and --change at the same time') |
|
1871 | msg = _('cannot specify --rev and --change at the same time') | |
1872 | raise error.Abort(msg) |
|
1872 | raise error.Abort(msg) | |
1873 | elif change: |
|
1873 | elif change: | |
1874 | repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn') |
|
1874 | repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn') | |
1875 | node2 = scmutil.revsingle(repo, change, None).node() |
|
1875 | node2 = scmutil.revsingle(repo, change, None).node() | |
1876 | node1 = repo[node2].p1().node() |
|
1876 | node1 = repo[node2].p1().node() | |
1877 | else: |
|
1877 | else: | |
1878 | repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn') |
|
1878 | repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn') | |
1879 | node1, node2 = scmutil.revpair(repo, revs) |
|
1879 | node1, node2 = scmutil.revpair(repo, revs) | |
1880 |
|
1880 | |||
1881 | if reverse: |
|
1881 | if reverse: | |
1882 | node1, node2 = node2, node1 |
|
1882 | node1, node2 = node2, node1 | |
1883 |
|
1883 | |||
1884 | diffopts = patch.diffallopts(ui, opts) |
|
1884 | diffopts = patch.diffallopts(ui, opts) | |
1885 | m = scmutil.match(repo[node2], pats, opts) |
|
1885 | m = scmutil.match(repo[node2], pats, opts) | |
1886 | ui.pager('diff') |
|
1886 | ui.pager('diff') | |
1887 | logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat, |
|
1887 | logcmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat, | |
1888 | listsubrepos=opts.get('subrepos'), |
|
1888 | listsubrepos=opts.get('subrepos'), | |
1889 | root=opts.get('root')) |
|
1889 | root=opts.get('root')) | |
1890 |
|
1890 | |||
1891 | @command('^export', |
|
1891 | @command('^export', | |
1892 | [('o', 'output', '', |
|
1892 | [('o', 'output', '', | |
1893 | _('print output to file with formatted name'), _('FORMAT')), |
|
1893 | _('print output to file with formatted name'), _('FORMAT')), | |
1894 | ('', 'switch-parent', None, _('diff against the second parent')), |
|
1894 | ('', 'switch-parent', None, _('diff against the second parent')), | |
1895 | ('r', 'rev', [], _('revisions to export'), _('REV')), |
|
1895 | ('r', 'rev', [], _('revisions to export'), _('REV')), | |
1896 | ] + diffopts, |
|
1896 | ] + diffopts, | |
1897 | _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'), cmdtype=readonly) |
|
1897 | _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...'), cmdtype=readonly) | |
1898 | def export(ui, repo, *changesets, **opts): |
|
1898 | def export(ui, repo, *changesets, **opts): | |
1899 | """dump the header and diffs for one or more changesets |
|
1899 | """dump the header and diffs for one or more changesets | |
1900 |
|
1900 | |||
1901 | Print the changeset header and diffs for one or more revisions. |
|
1901 | Print the changeset header and diffs for one or more revisions. | |
1902 | If no revision is given, the parent of the working directory is used. |
|
1902 | If no revision is given, the parent of the working directory is used. | |
1903 |
|
1903 | |||
1904 | The information shown in the changeset header is: author, date, |
|
1904 | The information shown in the changeset header is: author, date, | |
1905 | branch name (if non-default), changeset hash, parent(s) and commit |
|
1905 | branch name (if non-default), changeset hash, parent(s) and commit | |
1906 | comment. |
|
1906 | comment. | |
1907 |
|
1907 | |||
1908 | .. note:: |
|
1908 | .. note:: | |
1909 |
|
1909 | |||
1910 | :hg:`export` may generate unexpected diff output for merge |
|
1910 | :hg:`export` may generate unexpected diff output for merge | |
1911 | changesets, as it will compare the merge changeset against its |
|
1911 | changesets, as it will compare the merge changeset against its | |
1912 | first parent only. |
|
1912 | first parent only. | |
1913 |
|
1913 | |||
1914 | Output may be to a file, in which case the name of the file is |
|
1914 | Output may be to a file, in which case the name of the file is | |
1915 | given using a template string. See :hg:`help templates`. In addition |
|
1915 | given using a template string. See :hg:`help templates`. In addition | |
1916 | to the common template keywords, the following formatting rules are |
|
1916 | to the common template keywords, the following formatting rules are | |
1917 | supported: |
|
1917 | supported: | |
1918 |
|
1918 | |||
1919 | :``%%``: literal "%" character |
|
1919 | :``%%``: literal "%" character | |
1920 | :``%H``: changeset hash (40 hexadecimal digits) |
|
1920 | :``%H``: changeset hash (40 hexadecimal digits) | |
1921 | :``%N``: number of patches being generated |
|
1921 | :``%N``: number of patches being generated | |
1922 | :``%R``: changeset revision number |
|
1922 | :``%R``: changeset revision number | |
1923 | :``%b``: basename of the exporting repository |
|
1923 | :``%b``: basename of the exporting repository | |
1924 | :``%h``: short-form changeset hash (12 hexadecimal digits) |
|
1924 | :``%h``: short-form changeset hash (12 hexadecimal digits) | |
1925 | :``%m``: first line of the commit message (only alphanumeric characters) |
|
1925 | :``%m``: first line of the commit message (only alphanumeric characters) | |
1926 | :``%n``: zero-padded sequence number, starting at 1 |
|
1926 | :``%n``: zero-padded sequence number, starting at 1 | |
1927 | :``%r``: zero-padded changeset revision number |
|
1927 | :``%r``: zero-padded changeset revision number | |
1928 | :``\\``: literal "\\" character |
|
1928 | :``\\``: literal "\\" character | |
1929 |
|
1929 | |||
1930 | Without the -a/--text option, export will avoid generating diffs |
|
1930 | Without the -a/--text option, export will avoid generating diffs | |
1931 | of files it detects as binary. With -a, export will generate a |
|
1931 | of files it detects as binary. With -a, export will generate a | |
1932 | diff anyway, probably with undesirable results. |
|
1932 | diff anyway, probably with undesirable results. | |
1933 |
|
1933 | |||
1934 | Use the -g/--git option to generate diffs in the git extended diff |
|
1934 | Use the -g/--git option to generate diffs in the git extended diff | |
1935 | format. See :hg:`help diffs` for more information. |
|
1935 | format. See :hg:`help diffs` for more information. | |
1936 |
|
1936 | |||
1937 | With the --switch-parent option, the diff will be against the |
|
1937 | With the --switch-parent option, the diff will be against the | |
1938 | second parent. It can be useful to review a merge. |
|
1938 | second parent. It can be useful to review a merge. | |
1939 |
|
1939 | |||
1940 | .. container:: verbose |
|
1940 | .. container:: verbose | |
1941 |
|
1941 | |||
1942 | Examples: |
|
1942 | Examples: | |
1943 |
|
1943 | |||
1944 | - use export and import to transplant a bugfix to the current |
|
1944 | - use export and import to transplant a bugfix to the current | |
1945 | branch:: |
|
1945 | branch:: | |
1946 |
|
1946 | |||
1947 | hg export -r 9353 | hg import - |
|
1947 | hg export -r 9353 | hg import - | |
1948 |
|
1948 | |||
1949 | - export all the changesets between two revisions to a file with |
|
1949 | - export all the changesets between two revisions to a file with | |
1950 | rename information:: |
|
1950 | rename information:: | |
1951 |
|
1951 | |||
1952 | hg export --git -r 123:150 > changes.txt |
|
1952 | hg export --git -r 123:150 > changes.txt | |
1953 |
|
1953 | |||
1954 | - split outgoing changes into a series of patches with |
|
1954 | - split outgoing changes into a series of patches with | |
1955 | descriptive names:: |
|
1955 | descriptive names:: | |
1956 |
|
1956 | |||
1957 | hg export -r "outgoing()" -o "%n-%m.patch" |
|
1957 | hg export -r "outgoing()" -o "%n-%m.patch" | |
1958 |
|
1958 | |||
1959 | Returns 0 on success. |
|
1959 | Returns 0 on success. | |
1960 | """ |
|
1960 | """ | |
1961 | opts = pycompat.byteskwargs(opts) |
|
1961 | opts = pycompat.byteskwargs(opts) | |
1962 | changesets += tuple(opts.get('rev', [])) |
|
1962 | changesets += tuple(opts.get('rev', [])) | |
1963 | if not changesets: |
|
1963 | if not changesets: | |
1964 | changesets = ['.'] |
|
1964 | changesets = ['.'] | |
1965 | repo = scmutil.unhidehashlikerevs(repo, changesets, 'nowarn') |
|
1965 | repo = scmutil.unhidehashlikerevs(repo, changesets, 'nowarn') | |
1966 | revs = scmutil.revrange(repo, changesets) |
|
1966 | revs = scmutil.revrange(repo, changesets) | |
1967 | if not revs: |
|
1967 | if not revs: | |
1968 | raise error.Abort(_("export requires at least one changeset")) |
|
1968 | raise error.Abort(_("export requires at least one changeset")) | |
1969 | if len(revs) > 1: |
|
1969 | if len(revs) > 1: | |
1970 | ui.note(_('exporting patches:\n')) |
|
1970 | ui.note(_('exporting patches:\n')) | |
1971 | else: |
|
1971 | else: | |
1972 | ui.note(_('exporting patch:\n')) |
|
1972 | ui.note(_('exporting patch:\n')) | |
1973 | ui.pager('export') |
|
1973 | ui.pager('export') | |
1974 | cmdutil.export(repo, revs, fntemplate=opts.get('output'), |
|
1974 | cmdutil.export(repo, revs, fntemplate=opts.get('output'), | |
1975 | switch_parent=opts.get('switch_parent'), |
|
1975 | switch_parent=opts.get('switch_parent'), | |
1976 | opts=patch.diffallopts(ui, opts)) |
|
1976 | opts=patch.diffallopts(ui, opts)) | |
1977 |
|
1977 | |||
1978 | @command('files', |
|
1978 | @command('files', | |
1979 | [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')), |
|
1979 | [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')), | |
1980 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), |
|
1980 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), | |
1981 | ] + walkopts + formatteropts + subrepoopts, |
|
1981 | ] + walkopts + formatteropts + subrepoopts, | |
1982 | _('[OPTION]... [FILE]...'), cmdtype=readonly) |
|
1982 | _('[OPTION]... [FILE]...'), cmdtype=readonly) | |
1983 | def files(ui, repo, *pats, **opts): |
|
1983 | def files(ui, repo, *pats, **opts): | |
1984 | """list tracked files |
|
1984 | """list tracked files | |
1985 |
|
1985 | |||
1986 | Print files under Mercurial control in the working directory or |
|
1986 | Print files under Mercurial control in the working directory or | |
1987 | specified revision for given files (excluding removed files). |
|
1987 | specified revision for given files (excluding removed files). | |
1988 | Files can be specified as filenames or filesets. |
|
1988 | Files can be specified as filenames or filesets. | |
1989 |
|
1989 | |||
1990 | If no files are given to match, this command prints the names |
|
1990 | If no files are given to match, this command prints the names | |
1991 | of all files under Mercurial control. |
|
1991 | of all files under Mercurial control. | |
1992 |
|
1992 | |||
1993 | .. container:: verbose |
|
1993 | .. container:: verbose | |
1994 |
|
1994 | |||
1995 | Examples: |
|
1995 | Examples: | |
1996 |
|
1996 | |||
1997 | - list all files under the current directory:: |
|
1997 | - list all files under the current directory:: | |
1998 |
|
1998 | |||
1999 | hg files . |
|
1999 | hg files . | |
2000 |
|
2000 | |||
2001 | - shows sizes and flags for current revision:: |
|
2001 | - shows sizes and flags for current revision:: | |
2002 |
|
2002 | |||
2003 | hg files -vr . |
|
2003 | hg files -vr . | |
2004 |
|
2004 | |||
2005 | - list all files named README:: |
|
2005 | - list all files named README:: | |
2006 |
|
2006 | |||
2007 | hg files -I "**/README" |
|
2007 | hg files -I "**/README" | |
2008 |
|
2008 | |||
2009 | - list all binary files:: |
|
2009 | - list all binary files:: | |
2010 |
|
2010 | |||
2011 | hg files "set:binary()" |
|
2011 | hg files "set:binary()" | |
2012 |
|
2012 | |||
2013 | - find files containing a regular expression:: |
|
2013 | - find files containing a regular expression:: | |
2014 |
|
2014 | |||
2015 | hg files "set:grep('bob')" |
|
2015 | hg files "set:grep('bob')" | |
2016 |
|
2016 | |||
2017 | - search tracked file contents with xargs and grep:: |
|
2017 | - search tracked file contents with xargs and grep:: | |
2018 |
|
2018 | |||
2019 | hg files -0 | xargs -0 grep foo |
|
2019 | hg files -0 | xargs -0 grep foo | |
2020 |
|
2020 | |||
2021 | See :hg:`help patterns` and :hg:`help filesets` for more information |
|
2021 | See :hg:`help patterns` and :hg:`help filesets` for more information | |
2022 | on specifying file patterns. |
|
2022 | on specifying file patterns. | |
2023 |
|
2023 | |||
2024 | Returns 0 if a match is found, 1 otherwise. |
|
2024 | Returns 0 if a match is found, 1 otherwise. | |
2025 |
|
2025 | |||
2026 | """ |
|
2026 | """ | |
2027 |
|
2027 | |||
2028 | opts = pycompat.byteskwargs(opts) |
|
2028 | opts = pycompat.byteskwargs(opts) | |
2029 | rev = opts.get('rev') |
|
2029 | rev = opts.get('rev') | |
2030 | if rev: |
|
2030 | if rev: | |
2031 | repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
|
2031 | repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') | |
2032 | ctx = scmutil.revsingle(repo, rev, None) |
|
2032 | ctx = scmutil.revsingle(repo, rev, None) | |
2033 |
|
2033 | |||
2034 | end = '\n' |
|
2034 | end = '\n' | |
2035 | if opts.get('print0'): |
|
2035 | if opts.get('print0'): | |
2036 | end = '\0' |
|
2036 | end = '\0' | |
2037 | fmt = '%s' + end |
|
2037 | fmt = '%s' + end | |
2038 |
|
2038 | |||
2039 | m = scmutil.match(ctx, pats, opts) |
|
2039 | m = scmutil.match(ctx, pats, opts) | |
2040 | ui.pager('files') |
|
2040 | ui.pager('files') | |
2041 | with ui.formatter('files', opts) as fm: |
|
2041 | with ui.formatter('files', opts) as fm: | |
2042 | return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos')) |
|
2042 | return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos')) | |
2043 |
|
2043 | |||
2044 | @command( |
|
2044 | @command( | |
2045 | '^forget', |
|
2045 | '^forget', | |
2046 | walkopts + dryrunopts, |
|
2046 | walkopts + dryrunopts, | |
2047 | _('[OPTION]... FILE...'), inferrepo=True) |
|
2047 | _('[OPTION]... FILE...'), inferrepo=True) | |
2048 | def forget(ui, repo, *pats, **opts): |
|
2048 | def forget(ui, repo, *pats, **opts): | |
2049 | """forget the specified files on the next commit |
|
2049 | """forget the specified files on the next commit | |
2050 |
|
2050 | |||
2051 | Mark the specified files so they will no longer be tracked |
|
2051 | Mark the specified files so they will no longer be tracked | |
2052 | after the next commit. |
|
2052 | after the next commit. | |
2053 |
|
2053 | |||
2054 | This only removes files from the current branch, not from the |
|
2054 | This only removes files from the current branch, not from the | |
2055 | entire project history, and it does not delete them from the |
|
2055 | entire project history, and it does not delete them from the | |
2056 | working directory. |
|
2056 | working directory. | |
2057 |
|
2057 | |||
2058 | To delete the file from the working directory, see :hg:`remove`. |
|
2058 | To delete the file from the working directory, see :hg:`remove`. | |
2059 |
|
2059 | |||
2060 | To undo a forget before the next commit, see :hg:`add`. |
|
2060 | To undo a forget before the next commit, see :hg:`add`. | |
2061 |
|
2061 | |||
2062 | .. container:: verbose |
|
2062 | .. container:: verbose | |
2063 |
|
2063 | |||
2064 | Examples: |
|
2064 | Examples: | |
2065 |
|
2065 | |||
2066 | - forget newly-added binary files:: |
|
2066 | - forget newly-added binary files:: | |
2067 |
|
2067 | |||
2068 | hg forget "set:added() and binary()" |
|
2068 | hg forget "set:added() and binary()" | |
2069 |
|
2069 | |||
2070 | - forget files that would be excluded by .hgignore:: |
|
2070 | - forget files that would be excluded by .hgignore:: | |
2071 |
|
2071 | |||
2072 | hg forget "set:hgignore()" |
|
2072 | hg forget "set:hgignore()" | |
2073 |
|
2073 | |||
2074 | Returns 0 on success. |
|
2074 | Returns 0 on success. | |
2075 | """ |
|
2075 | """ | |
2076 |
|
2076 | |||
2077 | opts = pycompat.byteskwargs(opts) |
|
2077 | opts = pycompat.byteskwargs(opts) | |
2078 | if not pats: |
|
2078 | if not pats: | |
2079 | raise error.Abort(_('no files specified')) |
|
2079 | raise error.Abort(_('no files specified')) | |
2080 |
|
2080 | |||
2081 | m = scmutil.match(repo[None], pats, opts) |
|
2081 | m = scmutil.match(repo[None], pats, opts) | |
2082 | dryrun = opts.get(r'dry_run') |
|
2082 | dryrun = opts.get(r'dry_run') | |
2083 | rejected = cmdutil.forget(ui, repo, m, prefix="", |
|
2083 | rejected = cmdutil.forget(ui, repo, m, prefix="", | |
2084 | explicitonly=False, dryrun=dryrun)[0] |
|
2084 | explicitonly=False, dryrun=dryrun)[0] | |
2085 | return rejected and 1 or 0 |
|
2085 | return rejected and 1 or 0 | |
2086 |
|
2086 | |||
2087 | @command( |
|
2087 | @command( | |
2088 | 'graft', |
|
2088 | 'graft', | |
2089 | [('r', 'rev', [], _('revisions to graft'), _('REV')), |
|
2089 | [('r', 'rev', [], _('revisions to graft'), _('REV')), | |
2090 | ('c', 'continue', False, _('resume interrupted graft')), |
|
2090 | ('c', 'continue', False, _('resume interrupted graft')), | |
2091 | ('e', 'edit', False, _('invoke editor on commit messages')), |
|
2091 | ('e', 'edit', False, _('invoke editor on commit messages')), | |
2092 | ('', 'log', None, _('append graft info to log message')), |
|
2092 | ('', 'log', None, _('append graft info to log message')), | |
2093 | ('f', 'force', False, _('force graft')), |
|
2093 | ('f', 'force', False, _('force graft')), | |
2094 | ('D', 'currentdate', False, |
|
2094 | ('D', 'currentdate', False, | |
2095 | _('record the current date as commit date')), |
|
2095 | _('record the current date as commit date')), | |
2096 | ('U', 'currentuser', False, |
|
2096 | ('U', 'currentuser', False, | |
2097 | _('record the current user as committer'), _('DATE'))] |
|
2097 | _('record the current user as committer'), _('DATE'))] | |
2098 | + commitopts2 + mergetoolopts + dryrunopts, |
|
2098 | + commitopts2 + mergetoolopts + dryrunopts, | |
2099 | _('[OPTION]... [-r REV]... REV...')) |
|
2099 | _('[OPTION]... [-r REV]... REV...')) | |
2100 | def graft(ui, repo, *revs, **opts): |
|
2100 | def graft(ui, repo, *revs, **opts): | |
2101 | '''copy changes from other branches onto the current branch |
|
2101 | '''copy changes from other branches onto the current branch | |
2102 |
|
2102 | |||
2103 | This command uses Mercurial's merge logic to copy individual |
|
2103 | This command uses Mercurial's merge logic to copy individual | |
2104 | changes from other branches without merging branches in the |
|
2104 | changes from other branches without merging branches in the | |
2105 | history graph. This is sometimes known as 'backporting' or |
|
2105 | history graph. This is sometimes known as 'backporting' or | |
2106 | 'cherry-picking'. By default, graft will copy user, date, and |
|
2106 | 'cherry-picking'. By default, graft will copy user, date, and | |
2107 | description from the source changesets. |
|
2107 | description from the source changesets. | |
2108 |
|
2108 | |||
2109 | Changesets that are ancestors of the current revision, that have |
|
2109 | Changesets that are ancestors of the current revision, that have | |
2110 | already been grafted, or that are merges will be skipped. |
|
2110 | already been grafted, or that are merges will be skipped. | |
2111 |
|
2111 | |||
2112 | If --log is specified, log messages will have a comment appended |
|
2112 | If --log is specified, log messages will have a comment appended | |
2113 | of the form:: |
|
2113 | of the form:: | |
2114 |
|
2114 | |||
2115 | (grafted from CHANGESETHASH) |
|
2115 | (grafted from CHANGESETHASH) | |
2116 |
|
2116 | |||
2117 | If --force is specified, revisions will be grafted even if they |
|
2117 | If --force is specified, revisions will be grafted even if they | |
2118 | are already ancestors of, or have been grafted to, the destination. |
|
2118 | are already ancestors of, or have been grafted to, the destination. | |
2119 | This is useful when the revisions have since been backed out. |
|
2119 | This is useful when the revisions have since been backed out. | |
2120 |
|
2120 | |||
2121 | If a graft merge results in conflicts, the graft process is |
|
2121 | If a graft merge results in conflicts, the graft process is | |
2122 | interrupted so that the current merge can be manually resolved. |
|
2122 | interrupted so that the current merge can be manually resolved. | |
2123 | Once all conflicts are addressed, the graft process can be |
|
2123 | Once all conflicts are addressed, the graft process can be | |
2124 | continued with the -c/--continue option. |
|
2124 | continued with the -c/--continue option. | |
2125 |
|
2125 | |||
2126 | .. note:: |
|
2126 | .. note:: | |
2127 |
|
2127 | |||
2128 | The -c/--continue option does not reapply earlier options, except |
|
2128 | The -c/--continue option does not reapply earlier options, except | |
2129 | for --force. |
|
2129 | for --force. | |
2130 |
|
2130 | |||
2131 | .. container:: verbose |
|
2131 | .. container:: verbose | |
2132 |
|
2132 | |||
2133 | Examples: |
|
2133 | Examples: | |
2134 |
|
2134 | |||
2135 | - copy a single change to the stable branch and edit its description:: |
|
2135 | - copy a single change to the stable branch and edit its description:: | |
2136 |
|
2136 | |||
2137 | hg update stable |
|
2137 | hg update stable | |
2138 | hg graft --edit 9393 |
|
2138 | hg graft --edit 9393 | |
2139 |
|
2139 | |||
2140 | - graft a range of changesets with one exception, updating dates:: |
|
2140 | - graft a range of changesets with one exception, updating dates:: | |
2141 |
|
2141 | |||
2142 | hg graft -D "2085::2093 and not 2091" |
|
2142 | hg graft -D "2085::2093 and not 2091" | |
2143 |
|
2143 | |||
2144 | - continue a graft after resolving conflicts:: |
|
2144 | - continue a graft after resolving conflicts:: | |
2145 |
|
2145 | |||
2146 | hg graft -c |
|
2146 | hg graft -c | |
2147 |
|
2147 | |||
2148 | - show the source of a grafted changeset:: |
|
2148 | - show the source of a grafted changeset:: | |
2149 |
|
2149 | |||
2150 | hg log --debug -r . |
|
2150 | hg log --debug -r . | |
2151 |
|
2151 | |||
2152 | - show revisions sorted by date:: |
|
2152 | - show revisions sorted by date:: | |
2153 |
|
2153 | |||
2154 | hg log -r "sort(all(), date)" |
|
2154 | hg log -r "sort(all(), date)" | |
2155 |
|
2155 | |||
2156 | See :hg:`help revisions` for more about specifying revisions. |
|
2156 | See :hg:`help revisions` for more about specifying revisions. | |
2157 |
|
2157 | |||
2158 | Returns 0 on successful completion. |
|
2158 | Returns 0 on successful completion. | |
2159 | ''' |
|
2159 | ''' | |
2160 | with repo.wlock(): |
|
2160 | with repo.wlock(): | |
2161 | return _dograft(ui, repo, *revs, **opts) |
|
2161 | return _dograft(ui, repo, *revs, **opts) | |
2162 |
|
2162 | |||
2163 | def _dograft(ui, repo, *revs, **opts): |
|
2163 | def _dograft(ui, repo, *revs, **opts): | |
2164 | opts = pycompat.byteskwargs(opts) |
|
2164 | opts = pycompat.byteskwargs(opts) | |
2165 | if revs and opts.get('rev'): |
|
2165 | if revs and opts.get('rev'): | |
2166 | ui.warn(_('warning: inconsistent use of --rev might give unexpected ' |
|
2166 | ui.warn(_('warning: inconsistent use of --rev might give unexpected ' | |
2167 | 'revision ordering!\n')) |
|
2167 | 'revision ordering!\n')) | |
2168 |
|
2168 | |||
2169 | revs = list(revs) |
|
2169 | revs = list(revs) | |
2170 | revs.extend(opts.get('rev')) |
|
2170 | revs.extend(opts.get('rev')) | |
2171 |
|
2171 | |||
2172 | if not opts.get('user') and opts.get('currentuser'): |
|
2172 | if not opts.get('user') and opts.get('currentuser'): | |
2173 | opts['user'] = ui.username() |
|
2173 | opts['user'] = ui.username() | |
2174 | if not opts.get('date') and opts.get('currentdate'): |
|
2174 | if not opts.get('date') and opts.get('currentdate'): | |
2175 | opts['date'] = "%d %d" % dateutil.makedate() |
|
2175 | opts['date'] = "%d %d" % dateutil.makedate() | |
2176 |
|
2176 | |||
2177 | editor = cmdutil.getcommiteditor(editform='graft', |
|
2177 | editor = cmdutil.getcommiteditor(editform='graft', | |
2178 | **pycompat.strkwargs(opts)) |
|
2178 | **pycompat.strkwargs(opts)) | |
2179 |
|
2179 | |||
2180 | cont = False |
|
2180 | cont = False | |
2181 | if opts.get('continue'): |
|
2181 | if opts.get('continue'): | |
2182 | cont = True |
|
2182 | cont = True | |
2183 | if revs: |
|
2183 | if revs: | |
2184 | raise error.Abort(_("can't specify --continue and revisions")) |
|
2184 | raise error.Abort(_("can't specify --continue and revisions")) | |
2185 | # read in unfinished revisions |
|
2185 | # read in unfinished revisions | |
2186 | try: |
|
2186 | try: | |
2187 | nodes = repo.vfs.read('graftstate').splitlines() |
|
2187 | nodes = repo.vfs.read('graftstate').splitlines() | |
2188 | revs = [repo[node].rev() for node in nodes] |
|
2188 | revs = [repo[node].rev() for node in nodes] | |
2189 | except IOError as inst: |
|
2189 | except IOError as inst: | |
2190 | if inst.errno != errno.ENOENT: |
|
2190 | if inst.errno != errno.ENOENT: | |
2191 | raise |
|
2191 | raise | |
2192 | cmdutil.wrongtooltocontinue(repo, _('graft')) |
|
2192 | cmdutil.wrongtooltocontinue(repo, _('graft')) | |
2193 | else: |
|
2193 | else: | |
2194 | if not revs: |
|
2194 | if not revs: | |
2195 | raise error.Abort(_('no revisions specified')) |
|
2195 | raise error.Abort(_('no revisions specified')) | |
2196 | cmdutil.checkunfinished(repo) |
|
2196 | cmdutil.checkunfinished(repo) | |
2197 | cmdutil.bailifchanged(repo) |
|
2197 | cmdutil.bailifchanged(repo) | |
2198 | revs = scmutil.revrange(repo, revs) |
|
2198 | revs = scmutil.revrange(repo, revs) | |
2199 |
|
2199 | |||
2200 | skipped = set() |
|
2200 | skipped = set() | |
2201 | # check for merges |
|
2201 | # check for merges | |
2202 | for rev in repo.revs('%ld and merge()', revs): |
|
2202 | for rev in repo.revs('%ld and merge()', revs): | |
2203 | ui.warn(_('skipping ungraftable merge revision %d\n') % rev) |
|
2203 | ui.warn(_('skipping ungraftable merge revision %d\n') % rev) | |
2204 | skipped.add(rev) |
|
2204 | skipped.add(rev) | |
2205 | revs = [r for r in revs if r not in skipped] |
|
2205 | revs = [r for r in revs if r not in skipped] | |
2206 | if not revs: |
|
2206 | if not revs: | |
2207 | return -1 |
|
2207 | return -1 | |
2208 |
|
2208 | |||
2209 | # Don't check in the --continue case, in effect retaining --force across |
|
2209 | # Don't check in the --continue case, in effect retaining --force across | |
2210 | # --continues. That's because without --force, any revisions we decided to |
|
2210 | # --continues. That's because without --force, any revisions we decided to | |
2211 | # skip would have been filtered out here, so they wouldn't have made their |
|
2211 | # skip would have been filtered out here, so they wouldn't have made their | |
2212 | # way to the graftstate. With --force, any revisions we would have otherwise |
|
2212 | # way to the graftstate. With --force, any revisions we would have otherwise | |
2213 | # skipped would not have been filtered out, and if they hadn't been applied |
|
2213 | # skipped would not have been filtered out, and if they hadn't been applied | |
2214 | # already, they'd have been in the graftstate. |
|
2214 | # already, they'd have been in the graftstate. | |
2215 | if not (cont or opts.get('force')): |
|
2215 | if not (cont or opts.get('force')): | |
2216 | # check for ancestors of dest branch |
|
2216 | # check for ancestors of dest branch | |
2217 | crev = repo['.'].rev() |
|
2217 | crev = repo['.'].rev() | |
2218 | ancestors = repo.changelog.ancestors([crev], inclusive=True) |
|
2218 | ancestors = repo.changelog.ancestors([crev], inclusive=True) | |
2219 | # XXX make this lazy in the future |
|
2219 | # XXX make this lazy in the future | |
2220 | # don't mutate while iterating, create a copy |
|
2220 | # don't mutate while iterating, create a copy | |
2221 | for rev in list(revs): |
|
2221 | for rev in list(revs): | |
2222 | if rev in ancestors: |
|
2222 | if rev in ancestors: | |
2223 | ui.warn(_('skipping ancestor revision %d:%s\n') % |
|
2223 | ui.warn(_('skipping ancestor revision %d:%s\n') % | |
2224 | (rev, repo[rev])) |
|
2224 | (rev, repo[rev])) | |
2225 | # XXX remove on list is slow |
|
2225 | # XXX remove on list is slow | |
2226 | revs.remove(rev) |
|
2226 | revs.remove(rev) | |
2227 | if not revs: |
|
2227 | if not revs: | |
2228 | return -1 |
|
2228 | return -1 | |
2229 |
|
2229 | |||
2230 | # analyze revs for earlier grafts |
|
2230 | # analyze revs for earlier grafts | |
2231 | ids = {} |
|
2231 | ids = {} | |
2232 | for ctx in repo.set("%ld", revs): |
|
2232 | for ctx in repo.set("%ld", revs): | |
2233 | ids[ctx.hex()] = ctx.rev() |
|
2233 | ids[ctx.hex()] = ctx.rev() | |
2234 | n = ctx.extra().get('source') |
|
2234 | n = ctx.extra().get('source') | |
2235 | if n: |
|
2235 | if n: | |
2236 | ids[n] = ctx.rev() |
|
2236 | ids[n] = ctx.rev() | |
2237 |
|
2237 | |||
2238 | # check ancestors for earlier grafts |
|
2238 | # check ancestors for earlier grafts | |
2239 | ui.debug('scanning for duplicate grafts\n') |
|
2239 | ui.debug('scanning for duplicate grafts\n') | |
2240 |
|
2240 | |||
2241 | # The only changesets we can be sure doesn't contain grafts of any |
|
2241 | # The only changesets we can be sure doesn't contain grafts of any | |
2242 | # revs, are the ones that are common ancestors of *all* revs: |
|
2242 | # revs, are the ones that are common ancestors of *all* revs: | |
2243 | for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs): |
|
2243 | for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs): | |
2244 | ctx = repo[rev] |
|
2244 | ctx = repo[rev] | |
2245 | n = ctx.extra().get('source') |
|
2245 | n = ctx.extra().get('source') | |
2246 | if n in ids: |
|
2246 | if n in ids: | |
2247 | try: |
|
2247 | try: | |
2248 | r = repo[n].rev() |
|
2248 | r = repo[n].rev() | |
2249 | except error.RepoLookupError: |
|
2249 | except error.RepoLookupError: | |
2250 | r = None |
|
2250 | r = None | |
2251 | if r in revs: |
|
2251 | if r in revs: | |
2252 | ui.warn(_('skipping revision %d:%s ' |
|
2252 | ui.warn(_('skipping revision %d:%s ' | |
2253 | '(already grafted to %d:%s)\n') |
|
2253 | '(already grafted to %d:%s)\n') | |
2254 | % (r, repo[r], rev, ctx)) |
|
2254 | % (r, repo[r], rev, ctx)) | |
2255 | revs.remove(r) |
|
2255 | revs.remove(r) | |
2256 | elif ids[n] in revs: |
|
2256 | elif ids[n] in revs: | |
2257 | if r is None: |
|
2257 | if r is None: | |
2258 | ui.warn(_('skipping already grafted revision %d:%s ' |
|
2258 | ui.warn(_('skipping already grafted revision %d:%s ' | |
2259 | '(%d:%s also has unknown origin %s)\n') |
|
2259 | '(%d:%s also has unknown origin %s)\n') | |
2260 | % (ids[n], repo[ids[n]], rev, ctx, n[:12])) |
|
2260 | % (ids[n], repo[ids[n]], rev, ctx, n[:12])) | |
2261 | else: |
|
2261 | else: | |
2262 | ui.warn(_('skipping already grafted revision %d:%s ' |
|
2262 | ui.warn(_('skipping already grafted revision %d:%s ' | |
2263 | '(%d:%s also has origin %d:%s)\n') |
|
2263 | '(%d:%s also has origin %d:%s)\n') | |
2264 | % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])) |
|
2264 | % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])) | |
2265 | revs.remove(ids[n]) |
|
2265 | revs.remove(ids[n]) | |
2266 | elif ctx.hex() in ids: |
|
2266 | elif ctx.hex() in ids: | |
2267 | r = ids[ctx.hex()] |
|
2267 | r = ids[ctx.hex()] | |
2268 | ui.warn(_('skipping already grafted revision %d:%s ' |
|
2268 | ui.warn(_('skipping already grafted revision %d:%s ' | |
2269 | '(was grafted from %d:%s)\n') % |
|
2269 | '(was grafted from %d:%s)\n') % | |
2270 | (r, repo[r], rev, ctx)) |
|
2270 | (r, repo[r], rev, ctx)) | |
2271 | revs.remove(r) |
|
2271 | revs.remove(r) | |
2272 | if not revs: |
|
2272 | if not revs: | |
2273 | return -1 |
|
2273 | return -1 | |
2274 |
|
2274 | |||
2275 | for pos, ctx in enumerate(repo.set("%ld", revs)): |
|
2275 | for pos, ctx in enumerate(repo.set("%ld", revs)): | |
2276 | desc = '%d:%s "%s"' % (ctx.rev(), ctx, |
|
2276 | desc = '%d:%s "%s"' % (ctx.rev(), ctx, | |
2277 | ctx.description().split('\n', 1)[0]) |
|
2277 | ctx.description().split('\n', 1)[0]) | |
2278 | names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node()) |
|
2278 | names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node()) | |
2279 | if names: |
|
2279 | if names: | |
2280 | desc += ' (%s)' % ' '.join(names) |
|
2280 | desc += ' (%s)' % ' '.join(names) | |
2281 | ui.status(_('grafting %s\n') % desc) |
|
2281 | ui.status(_('grafting %s\n') % desc) | |
2282 | if opts.get('dry_run'): |
|
2282 | if opts.get('dry_run'): | |
2283 | continue |
|
2283 | continue | |
2284 |
|
2284 | |||
2285 | source = ctx.extra().get('source') |
|
2285 | source = ctx.extra().get('source') | |
2286 | extra = {} |
|
2286 | extra = {} | |
2287 | if source: |
|
2287 | if source: | |
2288 | extra['source'] = source |
|
2288 | extra['source'] = source | |
2289 | extra['intermediate-source'] = ctx.hex() |
|
2289 | extra['intermediate-source'] = ctx.hex() | |
2290 | else: |
|
2290 | else: | |
2291 | extra['source'] = ctx.hex() |
|
2291 | extra['source'] = ctx.hex() | |
2292 | user = ctx.user() |
|
2292 | user = ctx.user() | |
2293 | if opts.get('user'): |
|
2293 | if opts.get('user'): | |
2294 | user = opts['user'] |
|
2294 | user = opts['user'] | |
2295 | date = ctx.date() |
|
2295 | date = ctx.date() | |
2296 | if opts.get('date'): |
|
2296 | if opts.get('date'): | |
2297 | date = opts['date'] |
|
2297 | date = opts['date'] | |
2298 | message = ctx.description() |
|
2298 | message = ctx.description() | |
2299 | if opts.get('log'): |
|
2299 | if opts.get('log'): | |
2300 | message += '\n(grafted from %s)' % ctx.hex() |
|
2300 | message += '\n(grafted from %s)' % ctx.hex() | |
2301 |
|
2301 | |||
2302 | # we don't merge the first commit when continuing |
|
2302 | # we don't merge the first commit when continuing | |
2303 | if not cont: |
|
2303 | if not cont: | |
2304 | # perform the graft merge with p1(rev) as 'ancestor' |
|
2304 | # perform the graft merge with p1(rev) as 'ancestor' | |
2305 | try: |
|
2305 | try: | |
2306 | # ui.forcemerge is an internal variable, do not document |
|
2306 | # ui.forcemerge is an internal variable, do not document | |
2307 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
2307 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | |
2308 | 'graft') |
|
2308 | 'graft') | |
2309 | stats = mergemod.graft(repo, ctx, ctx.p1(), |
|
2309 | stats = mergemod.graft(repo, ctx, ctx.p1(), | |
2310 | ['local', 'graft']) |
|
2310 | ['local', 'graft']) | |
2311 | finally: |
|
2311 | finally: | |
2312 | repo.ui.setconfig('ui', 'forcemerge', '', 'graft') |
|
2312 | repo.ui.setconfig('ui', 'forcemerge', '', 'graft') | |
2313 | # report any conflicts |
|
2313 | # report any conflicts | |
2314 | if stats.unresolvedcount > 0: |
|
2314 | if stats.unresolvedcount > 0: | |
2315 | # write out state for --continue |
|
2315 | # write out state for --continue | |
2316 | nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] |
|
2316 | nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] | |
2317 | repo.vfs.write('graftstate', ''.join(nodelines)) |
|
2317 | repo.vfs.write('graftstate', ''.join(nodelines)) | |
2318 | extra = '' |
|
2318 | extra = '' | |
2319 | if opts.get('user'): |
|
2319 | if opts.get('user'): | |
2320 | extra += ' --user %s' % procutil.shellquote(opts['user']) |
|
2320 | extra += ' --user %s' % procutil.shellquote(opts['user']) | |
2321 | if opts.get('date'): |
|
2321 | if opts.get('date'): | |
2322 | extra += ' --date %s' % procutil.shellquote(opts['date']) |
|
2322 | extra += ' --date %s' % procutil.shellquote(opts['date']) | |
2323 | if opts.get('log'): |
|
2323 | if opts.get('log'): | |
2324 | extra += ' --log' |
|
2324 | extra += ' --log' | |
2325 | hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra |
|
2325 | hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra | |
2326 | raise error.Abort( |
|
2326 | raise error.Abort( | |
2327 | _("unresolved conflicts, can't continue"), |
|
2327 | _("unresolved conflicts, can't continue"), | |
2328 | hint=hint) |
|
2328 | hint=hint) | |
2329 | else: |
|
2329 | else: | |
2330 | cont = False |
|
2330 | cont = False | |
2331 |
|
2331 | |||
2332 | # commit |
|
2332 | # commit | |
2333 | node = repo.commit(text=message, user=user, |
|
2333 | node = repo.commit(text=message, user=user, | |
2334 | date=date, extra=extra, editor=editor) |
|
2334 | date=date, extra=extra, editor=editor) | |
2335 | if node is None: |
|
2335 | if node is None: | |
2336 | ui.warn( |
|
2336 | ui.warn( | |
2337 | _('note: graft of %d:%s created no changes to commit\n') % |
|
2337 | _('note: graft of %d:%s created no changes to commit\n') % | |
2338 | (ctx.rev(), ctx)) |
|
2338 | (ctx.rev(), ctx)) | |
2339 |
|
2339 | |||
2340 | # remove state when we complete successfully |
|
2340 | # remove state when we complete successfully | |
2341 | if not opts.get('dry_run'): |
|
2341 | if not opts.get('dry_run'): | |
2342 | repo.vfs.unlinkpath('graftstate', ignoremissing=True) |
|
2342 | repo.vfs.unlinkpath('graftstate', ignoremissing=True) | |
2343 |
|
2343 | |||
2344 | return 0 |
|
2344 | return 0 | |
2345 |
|
2345 | |||
2346 | @command('grep', |
|
2346 | @command('grep', | |
2347 | [('0', 'print0', None, _('end fields with NUL')), |
|
2347 | [('0', 'print0', None, _('end fields with NUL')), | |
2348 | ('', 'all', None, _('print all revisions that match')), |
|
2348 | ('', 'all', None, _('print all revisions that match')), | |
2349 | ('a', 'text', None, _('treat all files as text')), |
|
2349 | ('a', 'text', None, _('treat all files as text')), | |
2350 | ('f', 'follow', None, |
|
2350 | ('f', 'follow', None, | |
2351 | _('follow changeset history,' |
|
2351 | _('follow changeset history,' | |
2352 | ' or file history across copies and renames')), |
|
2352 | ' or file history across copies and renames')), | |
2353 | ('i', 'ignore-case', None, _('ignore case when matching')), |
|
2353 | ('i', 'ignore-case', None, _('ignore case when matching')), | |
2354 | ('l', 'files-with-matches', None, |
|
2354 | ('l', 'files-with-matches', None, | |
2355 | _('print only filenames and revisions that match')), |
|
2355 | _('print only filenames and revisions that match')), | |
2356 | ('n', 'line-number', None, _('print matching line numbers')), |
|
2356 | ('n', 'line-number', None, _('print matching line numbers')), | |
2357 | ('r', 'rev', [], |
|
2357 | ('r', 'rev', [], | |
2358 | _('only search files changed within revision range'), _('REV')), |
|
2358 | _('only search files changed within revision range'), _('REV')), | |
2359 | ('u', 'user', None, _('list the author (long with -v)')), |
|
2359 | ('u', 'user', None, _('list the author (long with -v)')), | |
2360 | ('d', 'date', None, _('list the date (short with -q)')), |
|
2360 | ('d', 'date', None, _('list the date (short with -q)')), | |
2361 | ] + formatteropts + walkopts, |
|
2361 | ] + formatteropts + walkopts, | |
2362 | _('[OPTION]... PATTERN [FILE]...'), |
|
2362 | _('[OPTION]... PATTERN [FILE]...'), | |
2363 | inferrepo=True, cmdtype=readonly) |
|
2363 | inferrepo=True, cmdtype=readonly) | |
2364 | def grep(ui, repo, pattern, *pats, **opts): |
|
2364 | def grep(ui, repo, pattern, *pats, **opts): | |
2365 | """search revision history for a pattern in specified files |
|
2365 | """search revision history for a pattern in specified files | |
2366 |
|
2366 | |||
2367 | Search revision history for a regular expression in the specified |
|
2367 | Search revision history for a regular expression in the specified | |
2368 | files or the entire project. |
|
2368 | files or the entire project. | |
2369 |
|
2369 | |||
2370 | By default, grep prints the most recent revision number for each |
|
2370 | By default, grep prints the most recent revision number for each | |
2371 | file in which it finds a match. To get it to print every revision |
|
2371 | file in which it finds a match. To get it to print every revision | |
2372 | that contains a change in match status ("-" for a match that becomes |
|
2372 | that contains a change in match status ("-" for a match that becomes | |
2373 | a non-match, or "+" for a non-match that becomes a match), use the |
|
2373 | a non-match, or "+" for a non-match that becomes a match), use the | |
2374 | --all flag. |
|
2374 | --all flag. | |
2375 |
|
2375 | |||
2376 | PATTERN can be any Python (roughly Perl-compatible) regular |
|
2376 | PATTERN can be any Python (roughly Perl-compatible) regular | |
2377 | expression. |
|
2377 | expression. | |
2378 |
|
2378 | |||
2379 | If no FILEs are specified (and -f/--follow isn't set), all files in |
|
2379 | If no FILEs are specified (and -f/--follow isn't set), all files in | |
2380 | the repository are searched, including those that don't exist in the |
|
2380 | the repository are searched, including those that don't exist in the | |
2381 | current branch or have been deleted in a prior changeset. |
|
2381 | current branch or have been deleted in a prior changeset. | |
2382 |
|
2382 | |||
2383 | Returns 0 if a match is found, 1 otherwise. |
|
2383 | Returns 0 if a match is found, 1 otherwise. | |
2384 | """ |
|
2384 | """ | |
2385 | opts = pycompat.byteskwargs(opts) |
|
2385 | opts = pycompat.byteskwargs(opts) | |
2386 | reflags = re.M |
|
2386 | reflags = re.M | |
2387 | if opts.get('ignore_case'): |
|
2387 | if opts.get('ignore_case'): | |
2388 | reflags |= re.I |
|
2388 | reflags |= re.I | |
2389 | try: |
|
2389 | try: | |
2390 | regexp = util.re.compile(pattern, reflags) |
|
2390 | regexp = util.re.compile(pattern, reflags) | |
2391 | except re.error as inst: |
|
2391 | except re.error as inst: | |
2392 | ui.warn(_("grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)) |
|
2392 | ui.warn(_("grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)) | |
2393 | return 1 |
|
2393 | return 1 | |
2394 | sep, eol = ':', '\n' |
|
2394 | sep, eol = ':', '\n' | |
2395 | if opts.get('print0'): |
|
2395 | if opts.get('print0'): | |
2396 | sep = eol = '\0' |
|
2396 | sep = eol = '\0' | |
2397 |
|
2397 | |||
2398 | getfile = util.lrucachefunc(repo.file) |
|
2398 | getfile = util.lrucachefunc(repo.file) | |
2399 |
|
2399 | |||
2400 | def matchlines(body): |
|
2400 | def matchlines(body): | |
2401 | begin = 0 |
|
2401 | begin = 0 | |
2402 | linenum = 0 |
|
2402 | linenum = 0 | |
2403 | while begin < len(body): |
|
2403 | while begin < len(body): | |
2404 | match = regexp.search(body, begin) |
|
2404 | match = regexp.search(body, begin) | |
2405 | if not match: |
|
2405 | if not match: | |
2406 | break |
|
2406 | break | |
2407 | mstart, mend = match.span() |
|
2407 | mstart, mend = match.span() | |
2408 | linenum += body.count('\n', begin, mstart) + 1 |
|
2408 | linenum += body.count('\n', begin, mstart) + 1 | |
2409 | lstart = body.rfind('\n', begin, mstart) + 1 or begin |
|
2409 | lstart = body.rfind('\n', begin, mstart) + 1 or begin | |
2410 | begin = body.find('\n', mend) + 1 or len(body) + 1 |
|
2410 | begin = body.find('\n', mend) + 1 or len(body) + 1 | |
2411 | lend = begin - 1 |
|
2411 | lend = begin - 1 | |
2412 | yield linenum, mstart - lstart, mend - lstart, body[lstart:lend] |
|
2412 | yield linenum, mstart - lstart, mend - lstart, body[lstart:lend] | |
2413 |
|
2413 | |||
2414 | class linestate(object): |
|
2414 | class linestate(object): | |
2415 | def __init__(self, line, linenum, colstart, colend): |
|
2415 | def __init__(self, line, linenum, colstart, colend): | |
2416 | self.line = line |
|
2416 | self.line = line | |
2417 | self.linenum = linenum |
|
2417 | self.linenum = linenum | |
2418 | self.colstart = colstart |
|
2418 | self.colstart = colstart | |
2419 | self.colend = colend |
|
2419 | self.colend = colend | |
2420 |
|
2420 | |||
2421 | def __hash__(self): |
|
2421 | def __hash__(self): | |
2422 | return hash((self.linenum, self.line)) |
|
2422 | return hash((self.linenum, self.line)) | |
2423 |
|
2423 | |||
2424 | def __eq__(self, other): |
|
2424 | def __eq__(self, other): | |
2425 | return self.line == other.line |
|
2425 | return self.line == other.line | |
2426 |
|
2426 | |||
2427 | def findpos(self): |
|
2427 | def findpos(self): | |
2428 | """Iterate all (start, end) indices of matches""" |
|
2428 | """Iterate all (start, end) indices of matches""" | |
2429 | yield self.colstart, self.colend |
|
2429 | yield self.colstart, self.colend | |
2430 | p = self.colend |
|
2430 | p = self.colend | |
2431 | while p < len(self.line): |
|
2431 | while p < len(self.line): | |
2432 | m = regexp.search(self.line, p) |
|
2432 | m = regexp.search(self.line, p) | |
2433 | if not m: |
|
2433 | if not m: | |
2434 | break |
|
2434 | break | |
2435 | yield m.span() |
|
2435 | yield m.span() | |
2436 | p = m.end() |
|
2436 | p = m.end() | |
2437 |
|
2437 | |||
2438 | matches = {} |
|
2438 | matches = {} | |
2439 | copies = {} |
|
2439 | copies = {} | |
2440 | def grepbody(fn, rev, body): |
|
2440 | def grepbody(fn, rev, body): | |
2441 | matches[rev].setdefault(fn, []) |
|
2441 | matches[rev].setdefault(fn, []) | |
2442 | m = matches[rev][fn] |
|
2442 | m = matches[rev][fn] | |
2443 | for lnum, cstart, cend, line in matchlines(body): |
|
2443 | for lnum, cstart, cend, line in matchlines(body): | |
2444 | s = linestate(line, lnum, cstart, cend) |
|
2444 | s = linestate(line, lnum, cstart, cend) | |
2445 | m.append(s) |
|
2445 | m.append(s) | |
2446 |
|
2446 | |||
2447 | def difflinestates(a, b): |
|
2447 | def difflinestates(a, b): | |
2448 | sm = difflib.SequenceMatcher(None, a, b) |
|
2448 | sm = difflib.SequenceMatcher(None, a, b) | |
2449 | for tag, alo, ahi, blo, bhi in sm.get_opcodes(): |
|
2449 | for tag, alo, ahi, blo, bhi in sm.get_opcodes(): | |
2450 | if tag == 'insert': |
|
2450 | if tag == 'insert': | |
2451 | for i in xrange(blo, bhi): |
|
2451 | for i in xrange(blo, bhi): | |
2452 | yield ('+', b[i]) |
|
2452 | yield ('+', b[i]) | |
2453 | elif tag == 'delete': |
|
2453 | elif tag == 'delete': | |
2454 | for i in xrange(alo, ahi): |
|
2454 | for i in xrange(alo, ahi): | |
2455 | yield ('-', a[i]) |
|
2455 | yield ('-', a[i]) | |
2456 | elif tag == 'replace': |
|
2456 | elif tag == 'replace': | |
2457 | for i in xrange(alo, ahi): |
|
2457 | for i in xrange(alo, ahi): | |
2458 | yield ('-', a[i]) |
|
2458 | yield ('-', a[i]) | |
2459 | for i in xrange(blo, bhi): |
|
2459 | for i in xrange(blo, bhi): | |
2460 | yield ('+', b[i]) |
|
2460 | yield ('+', b[i]) | |
2461 |
|
2461 | |||
2462 | def display(fm, fn, ctx, pstates, states): |
|
2462 | def display(fm, fn, ctx, pstates, states): | |
2463 | rev = ctx.rev() |
|
2463 | rev = ctx.rev() | |
2464 | if fm.isplain(): |
|
2464 | if fm.isplain(): | |
2465 | formatuser = ui.shortuser |
|
2465 | formatuser = ui.shortuser | |
2466 | else: |
|
2466 | else: | |
2467 | formatuser = str |
|
2467 | formatuser = str | |
2468 | if ui.quiet: |
|
2468 | if ui.quiet: | |
2469 | datefmt = '%Y-%m-%d' |
|
2469 | datefmt = '%Y-%m-%d' | |
2470 | else: |
|
2470 | else: | |
2471 | datefmt = '%a %b %d %H:%M:%S %Y %1%2' |
|
2471 | datefmt = '%a %b %d %H:%M:%S %Y %1%2' | |
2472 | found = False |
|
2472 | found = False | |
2473 | @util.cachefunc |
|
2473 | @util.cachefunc | |
2474 | def binary(): |
|
2474 | def binary(): | |
2475 | flog = getfile(fn) |
|
2475 | flog = getfile(fn) | |
2476 | return stringutil.binary(flog.read(ctx.filenode(fn))) |
|
2476 | return stringutil.binary(flog.read(ctx.filenode(fn))) | |
2477 |
|
2477 | |||
2478 | fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'} |
|
2478 | fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'} | |
2479 | if opts.get('all'): |
|
2479 | if opts.get('all'): | |
2480 | iter = difflinestates(pstates, states) |
|
2480 | iter = difflinestates(pstates, states) | |
2481 | else: |
|
2481 | else: | |
2482 | iter = [('', l) for l in states] |
|
2482 | iter = [('', l) for l in states] | |
2483 | for change, l in iter: |
|
2483 | for change, l in iter: | |
2484 | fm.startitem() |
|
2484 | fm.startitem() | |
2485 | fm.data(node=fm.hexfunc(ctx.node())) |
|
2485 | fm.data(node=fm.hexfunc(ctx.node())) | |
2486 | cols = [ |
|
2486 | cols = [ | |
2487 | ('filename', fn, True), |
|
2487 | ('filename', fn, True), | |
2488 | ('rev', rev, True), |
|
2488 | ('rev', rev, True), | |
2489 | ('linenumber', l.linenum, opts.get('line_number')), |
|
2489 | ('linenumber', l.linenum, opts.get('line_number')), | |
2490 | ] |
|
2490 | ] | |
2491 | if opts.get('all'): |
|
2491 | if opts.get('all'): | |
2492 | cols.append(('change', change, True)) |
|
2492 | cols.append(('change', change, True)) | |
2493 | cols.extend([ |
|
2493 | cols.extend([ | |
2494 | ('user', formatuser(ctx.user()), opts.get('user')), |
|
2494 | ('user', formatuser(ctx.user()), opts.get('user')), | |
2495 | ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')), |
|
2495 | ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')), | |
2496 | ]) |
|
2496 | ]) | |
2497 | lastcol = next(name for name, data, cond in reversed(cols) if cond) |
|
2497 | lastcol = next(name for name, data, cond in reversed(cols) if cond) | |
2498 | for name, data, cond in cols: |
|
2498 | for name, data, cond in cols: | |
2499 | field = fieldnamemap.get(name, name) |
|
2499 | field = fieldnamemap.get(name, name) | |
2500 | fm.condwrite(cond, field, '%s', data, label='grep.%s' % name) |
|
2500 | fm.condwrite(cond, field, '%s', data, label='grep.%s' % name) | |
2501 | if cond and name != lastcol: |
|
2501 | if cond and name != lastcol: | |
2502 | fm.plain(sep, label='grep.sep') |
|
2502 | fm.plain(sep, label='grep.sep') | |
2503 | if not opts.get('files_with_matches'): |
|
2503 | if not opts.get('files_with_matches'): | |
2504 | fm.plain(sep, label='grep.sep') |
|
2504 | fm.plain(sep, label='grep.sep') | |
2505 | if not opts.get('text') and binary(): |
|
2505 | if not opts.get('text') and binary(): | |
2506 | fm.plain(_(" Binary file matches")) |
|
2506 | fm.plain(_(" Binary file matches")) | |
2507 | else: |
|
2507 | else: | |
2508 | displaymatches(fm.nested('texts'), l) |
|
2508 | displaymatches(fm.nested('texts'), l) | |
2509 | fm.plain(eol) |
|
2509 | fm.plain(eol) | |
2510 | found = True |
|
2510 | found = True | |
2511 | if opts.get('files_with_matches'): |
|
2511 | if opts.get('files_with_matches'): | |
2512 | break |
|
2512 | break | |
2513 | return found |
|
2513 | return found | |
2514 |
|
2514 | |||
2515 | def displaymatches(fm, l): |
|
2515 | def displaymatches(fm, l): | |
2516 | p = 0 |
|
2516 | p = 0 | |
2517 | for s, e in l.findpos(): |
|
2517 | for s, e in l.findpos(): | |
2518 | if p < s: |
|
2518 | if p < s: | |
2519 | fm.startitem() |
|
2519 | fm.startitem() | |
2520 | fm.write('text', '%s', l.line[p:s]) |
|
2520 | fm.write('text', '%s', l.line[p:s]) | |
2521 | fm.data(matched=False) |
|
2521 | fm.data(matched=False) | |
2522 | fm.startitem() |
|
2522 | fm.startitem() | |
2523 | fm.write('text', '%s', l.line[s:e], label='grep.match') |
|
2523 | fm.write('text', '%s', l.line[s:e], label='grep.match') | |
2524 | fm.data(matched=True) |
|
2524 | fm.data(matched=True) | |
2525 | p = e |
|
2525 | p = e | |
2526 | if p < len(l.line): |
|
2526 | if p < len(l.line): | |
2527 | fm.startitem() |
|
2527 | fm.startitem() | |
2528 | fm.write('text', '%s', l.line[p:]) |
|
2528 | fm.write('text', '%s', l.line[p:]) | |
2529 | fm.data(matched=False) |
|
2529 | fm.data(matched=False) | |
2530 | fm.end() |
|
2530 | fm.end() | |
2531 |
|
2531 | |||
2532 | skip = {} |
|
2532 | skip = {} | |
2533 | revfiles = {} |
|
2533 | revfiles = {} | |
2534 | match = scmutil.match(repo[None], pats, opts) |
|
2534 | match = scmutil.match(repo[None], pats, opts) | |
2535 | found = False |
|
2535 | found = False | |
2536 | follow = opts.get('follow') |
|
2536 | follow = opts.get('follow') | |
2537 |
|
2537 | |||
2538 | def prep(ctx, fns): |
|
2538 | def prep(ctx, fns): | |
2539 | rev = ctx.rev() |
|
2539 | rev = ctx.rev() | |
2540 | pctx = ctx.p1() |
|
2540 | pctx = ctx.p1() | |
2541 | parent = pctx.rev() |
|
2541 | parent = pctx.rev() | |
2542 | matches.setdefault(rev, {}) |
|
2542 | matches.setdefault(rev, {}) | |
2543 | matches.setdefault(parent, {}) |
|
2543 | matches.setdefault(parent, {}) | |
2544 | files = revfiles.setdefault(rev, []) |
|
2544 | files = revfiles.setdefault(rev, []) | |
2545 | for fn in fns: |
|
2545 | for fn in fns: | |
2546 | flog = getfile(fn) |
|
2546 | flog = getfile(fn) | |
2547 | try: |
|
2547 | try: | |
2548 | fnode = ctx.filenode(fn) |
|
2548 | fnode = ctx.filenode(fn) | |
2549 | except error.LookupError: |
|
2549 | except error.LookupError: | |
2550 | continue |
|
2550 | continue | |
2551 |
|
2551 | |||
2552 | copied = flog.renamed(fnode) |
|
2552 | copied = flog.renamed(fnode) | |
2553 | copy = follow and copied and copied[0] |
|
2553 | copy = follow and copied and copied[0] | |
2554 | if copy: |
|
2554 | if copy: | |
2555 | copies.setdefault(rev, {})[fn] = copy |
|
2555 | copies.setdefault(rev, {})[fn] = copy | |
2556 | if fn in skip: |
|
2556 | if fn in skip: | |
2557 | if copy: |
|
2557 | if copy: | |
2558 | skip[copy] = True |
|
2558 | skip[copy] = True | |
2559 | continue |
|
2559 | continue | |
2560 | files.append(fn) |
|
2560 | files.append(fn) | |
2561 |
|
2561 | |||
2562 | if fn not in matches[rev]: |
|
2562 | if fn not in matches[rev]: | |
2563 | grepbody(fn, rev, flog.read(fnode)) |
|
2563 | grepbody(fn, rev, flog.read(fnode)) | |
2564 |
|
2564 | |||
2565 | pfn = copy or fn |
|
2565 | pfn = copy or fn | |
2566 | if pfn not in matches[parent]: |
|
2566 | if pfn not in matches[parent]: | |
2567 | try: |
|
2567 | try: | |
2568 | fnode = pctx.filenode(pfn) |
|
2568 | fnode = pctx.filenode(pfn) | |
2569 | grepbody(pfn, parent, flog.read(fnode)) |
|
2569 | grepbody(pfn, parent, flog.read(fnode)) | |
2570 | except error.LookupError: |
|
2570 | except error.LookupError: | |
2571 | pass |
|
2571 | pass | |
2572 |
|
2572 | |||
2573 | ui.pager('grep') |
|
2573 | ui.pager('grep') | |
2574 | fm = ui.formatter('grep', opts) |
|
2574 | fm = ui.formatter('grep', opts) | |
2575 | for ctx in cmdutil.walkchangerevs(repo, match, opts, prep): |
|
2575 | for ctx in cmdutil.walkchangerevs(repo, match, opts, prep): | |
2576 | rev = ctx.rev() |
|
2576 | rev = ctx.rev() | |
2577 | parent = ctx.p1().rev() |
|
2577 | parent = ctx.p1().rev() | |
2578 | for fn in sorted(revfiles.get(rev, [])): |
|
2578 | for fn in sorted(revfiles.get(rev, [])): | |
2579 | states = matches[rev][fn] |
|
2579 | states = matches[rev][fn] | |
2580 | copy = copies.get(rev, {}).get(fn) |
|
2580 | copy = copies.get(rev, {}).get(fn) | |
2581 | if fn in skip: |
|
2581 | if fn in skip: | |
2582 | if copy: |
|
2582 | if copy: | |
2583 | skip[copy] = True |
|
2583 | skip[copy] = True | |
2584 | continue |
|
2584 | continue | |
2585 | pstates = matches.get(parent, {}).get(copy or fn, []) |
|
2585 | pstates = matches.get(parent, {}).get(copy or fn, []) | |
2586 | if pstates or states: |
|
2586 | if pstates or states: | |
2587 | r = display(fm, fn, ctx, pstates, states) |
|
2587 | r = display(fm, fn, ctx, pstates, states) | |
2588 | found = found or r |
|
2588 | found = found or r | |
2589 | if r and not opts.get('all'): |
|
2589 | if r and not opts.get('all'): | |
2590 | skip[fn] = True |
|
2590 | skip[fn] = True | |
2591 | if copy: |
|
2591 | if copy: | |
2592 | skip[copy] = True |
|
2592 | skip[copy] = True | |
2593 | del revfiles[rev] |
|
2593 | del revfiles[rev] | |
2594 | # We will keep the matches dict for the duration of the window |
|
2594 | # We will keep the matches dict for the duration of the window | |
2595 | # clear the matches dict once the window is over |
|
2595 | # clear the matches dict once the window is over | |
2596 | if not revfiles: |
|
2596 | if not revfiles: | |
2597 | matches.clear() |
|
2597 | matches.clear() | |
2598 | fm.end() |
|
2598 | fm.end() | |
2599 |
|
2599 | |||
2600 | return not found |
|
2600 | return not found | |
2601 |
|
2601 | |||
2602 | @command('heads', |
|
2602 | @command('heads', | |
2603 | [('r', 'rev', '', |
|
2603 | [('r', 'rev', '', | |
2604 | _('show only heads which are descendants of STARTREV'), _('STARTREV')), |
|
2604 | _('show only heads which are descendants of STARTREV'), _('STARTREV')), | |
2605 | ('t', 'topo', False, _('show topological heads only')), |
|
2605 | ('t', 'topo', False, _('show topological heads only')), | |
2606 | ('a', 'active', False, _('show active branchheads only (DEPRECATED)')), |
|
2606 | ('a', 'active', False, _('show active branchheads only (DEPRECATED)')), | |
2607 | ('c', 'closed', False, _('show normal and closed branch heads')), |
|
2607 | ('c', 'closed', False, _('show normal and closed branch heads')), | |
2608 | ] + templateopts, |
|
2608 | ] + templateopts, | |
2609 | _('[-ct] [-r STARTREV] [REV]...'), cmdtype=readonly) |
|
2609 | _('[-ct] [-r STARTREV] [REV]...'), cmdtype=readonly) | |
2610 | def heads(ui, repo, *branchrevs, **opts): |
|
2610 | def heads(ui, repo, *branchrevs, **opts): | |
2611 | """show branch heads |
|
2611 | """show branch heads | |
2612 |
|
2612 | |||
2613 | With no arguments, show all open branch heads in the repository. |
|
2613 | With no arguments, show all open branch heads in the repository. | |
2614 | Branch heads are changesets that have no descendants on the |
|
2614 | Branch heads are changesets that have no descendants on the | |
2615 | same branch. They are where development generally takes place and |
|
2615 | same branch. They are where development generally takes place and | |
2616 | are the usual targets for update and merge operations. |
|
2616 | are the usual targets for update and merge operations. | |
2617 |
|
2617 | |||
2618 | If one or more REVs are given, only open branch heads on the |
|
2618 | If one or more REVs are given, only open branch heads on the | |
2619 | branches associated with the specified changesets are shown. This |
|
2619 | branches associated with the specified changesets are shown. This | |
2620 | means that you can use :hg:`heads .` to see the heads on the |
|
2620 | means that you can use :hg:`heads .` to see the heads on the | |
2621 | currently checked-out branch. |
|
2621 | currently checked-out branch. | |
2622 |
|
2622 | |||
2623 | If -c/--closed is specified, also show branch heads marked closed |
|
2623 | If -c/--closed is specified, also show branch heads marked closed | |
2624 | (see :hg:`commit --close-branch`). |
|
2624 | (see :hg:`commit --close-branch`). | |
2625 |
|
2625 | |||
2626 | If STARTREV is specified, only those heads that are descendants of |
|
2626 | If STARTREV is specified, only those heads that are descendants of | |
2627 | STARTREV will be displayed. |
|
2627 | STARTREV will be displayed. | |
2628 |
|
2628 | |||
2629 | If -t/--topo is specified, named branch mechanics will be ignored and only |
|
2629 | If -t/--topo is specified, named branch mechanics will be ignored and only | |
2630 | topological heads (changesets with no children) will be shown. |
|
2630 | topological heads (changesets with no children) will be shown. | |
2631 |
|
2631 | |||
2632 | Returns 0 if matching heads are found, 1 if not. |
|
2632 | Returns 0 if matching heads are found, 1 if not. | |
2633 | """ |
|
2633 | """ | |
2634 |
|
2634 | |||
2635 | opts = pycompat.byteskwargs(opts) |
|
2635 | opts = pycompat.byteskwargs(opts) | |
2636 | start = None |
|
2636 | start = None | |
2637 | rev = opts.get('rev') |
|
2637 | rev = opts.get('rev') | |
2638 | if rev: |
|
2638 | if rev: | |
2639 | repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
|
2639 | repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') | |
2640 | start = scmutil.revsingle(repo, rev, None).node() |
|
2640 | start = scmutil.revsingle(repo, rev, None).node() | |
2641 |
|
2641 | |||
2642 | if opts.get('topo'): |
|
2642 | if opts.get('topo'): | |
2643 | heads = [repo[h] for h in repo.heads(start)] |
|
2643 | heads = [repo[h] for h in repo.heads(start)] | |
2644 | else: |
|
2644 | else: | |
2645 | heads = [] |
|
2645 | heads = [] | |
2646 | for branch in repo.branchmap(): |
|
2646 | for branch in repo.branchmap(): | |
2647 | heads += repo.branchheads(branch, start, opts.get('closed')) |
|
2647 | heads += repo.branchheads(branch, start, opts.get('closed')) | |
2648 | heads = [repo[h] for h in heads] |
|
2648 | heads = [repo[h] for h in heads] | |
2649 |
|
2649 | |||
2650 | if branchrevs: |
|
2650 | if branchrevs: | |
2651 | branches = set(repo[br].branch() for br in branchrevs) |
|
2651 | branches = set(repo[br].branch() for br in branchrevs) | |
2652 | heads = [h for h in heads if h.branch() in branches] |
|
2652 | heads = [h for h in heads if h.branch() in branches] | |
2653 |
|
2653 | |||
2654 | if opts.get('active') and branchrevs: |
|
2654 | if opts.get('active') and branchrevs: | |
2655 | dagheads = repo.heads(start) |
|
2655 | dagheads = repo.heads(start) | |
2656 | heads = [h for h in heads if h.node() in dagheads] |
|
2656 | heads = [h for h in heads if h.node() in dagheads] | |
2657 |
|
2657 | |||
2658 | if branchrevs: |
|
2658 | if branchrevs: | |
2659 | haveheads = set(h.branch() for h in heads) |
|
2659 | haveheads = set(h.branch() for h in heads) | |
2660 | if branches - haveheads: |
|
2660 | if branches - haveheads: | |
2661 | headless = ', '.join(b for b in branches - haveheads) |
|
2661 | headless = ', '.join(b for b in branches - haveheads) | |
2662 | msg = _('no open branch heads found on branches %s') |
|
2662 | msg = _('no open branch heads found on branches %s') | |
2663 | if opts.get('rev'): |
|
2663 | if opts.get('rev'): | |
2664 | msg += _(' (started at %s)') % opts['rev'] |
|
2664 | msg += _(' (started at %s)') % opts['rev'] | |
2665 | ui.warn((msg + '\n') % headless) |
|
2665 | ui.warn((msg + '\n') % headless) | |
2666 |
|
2666 | |||
2667 | if not heads: |
|
2667 | if not heads: | |
2668 | return 1 |
|
2668 | return 1 | |
2669 |
|
2669 | |||
2670 | ui.pager('heads') |
|
2670 | ui.pager('heads') | |
2671 | heads = sorted(heads, key=lambda x: -x.rev()) |
|
2671 | heads = sorted(heads, key=lambda x: -x.rev()) | |
2672 | displayer = logcmdutil.changesetdisplayer(ui, repo, opts) |
|
2672 | displayer = logcmdutil.changesetdisplayer(ui, repo, opts) | |
2673 | for ctx in heads: |
|
2673 | for ctx in heads: | |
2674 | displayer.show(ctx) |
|
2674 | displayer.show(ctx) | |
2675 | displayer.close() |
|
2675 | displayer.close() | |
2676 |
|
2676 | |||
2677 | @command('help', |
|
2677 | @command('help', | |
2678 | [('e', 'extension', None, _('show only help for extensions')), |
|
2678 | [('e', 'extension', None, _('show only help for extensions')), | |
2679 | ('c', 'command', None, _('show only help for commands')), |
|
2679 | ('c', 'command', None, _('show only help for commands')), | |
2680 | ('k', 'keyword', None, _('show topics matching keyword')), |
|
2680 | ('k', 'keyword', None, _('show topics matching keyword')), | |
2681 | ('s', 'system', [], _('show help for specific platform(s)')), |
|
2681 | ('s', 'system', [], _('show help for specific platform(s)')), | |
2682 | ], |
|
2682 | ], | |
2683 | _('[-ecks] [TOPIC]'), |
|
2683 | _('[-ecks] [TOPIC]'), | |
2684 | norepo=True, cmdtype=readonly) |
|
2684 | norepo=True, cmdtype=readonly) | |
2685 | def help_(ui, name=None, **opts): |
|
2685 | def help_(ui, name=None, **opts): | |
2686 | """show help for a given topic or a help overview |
|
2686 | """show help for a given topic or a help overview | |
2687 |
|
2687 | |||
2688 | With no arguments, print a list of commands with short help messages. |
|
2688 | With no arguments, print a list of commands with short help messages. | |
2689 |
|
2689 | |||
2690 | Given a topic, extension, or command name, print help for that |
|
2690 | Given a topic, extension, or command name, print help for that | |
2691 | topic. |
|
2691 | topic. | |
2692 |
|
2692 | |||
2693 | Returns 0 if successful. |
|
2693 | Returns 0 if successful. | |
2694 | """ |
|
2694 | """ | |
2695 |
|
2695 | |||
2696 | keep = opts.get(r'system') or [] |
|
2696 | keep = opts.get(r'system') or [] | |
2697 | if len(keep) == 0: |
|
2697 | if len(keep) == 0: | |
2698 | if pycompat.sysplatform.startswith('win'): |
|
2698 | if pycompat.sysplatform.startswith('win'): | |
2699 | keep.append('windows') |
|
2699 | keep.append('windows') | |
2700 | elif pycompat.sysplatform == 'OpenVMS': |
|
2700 | elif pycompat.sysplatform == 'OpenVMS': | |
2701 | keep.append('vms') |
|
2701 | keep.append('vms') | |
2702 | elif pycompat.sysplatform == 'plan9': |
|
2702 | elif pycompat.sysplatform == 'plan9': | |
2703 | keep.append('plan9') |
|
2703 | keep.append('plan9') | |
2704 | else: |
|
2704 | else: | |
2705 | keep.append('unix') |
|
2705 | keep.append('unix') | |
2706 | keep.append(pycompat.sysplatform.lower()) |
|
2706 | keep.append(pycompat.sysplatform.lower()) | |
2707 | if ui.verbose: |
|
2707 | if ui.verbose: | |
2708 | keep.append('verbose') |
|
2708 | keep.append('verbose') | |
2709 |
|
2709 | |||
2710 | commands = sys.modules[__name__] |
|
2710 | commands = sys.modules[__name__] | |
2711 | formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts) |
|
2711 | formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts) | |
2712 | ui.pager('help') |
|
2712 | ui.pager('help') | |
2713 | ui.write(formatted) |
|
2713 | ui.write(formatted) | |
2714 |
|
2714 | |||
2715 |
|
2715 | |||
2716 | @command('identify|id', |
|
2716 | @command('identify|id', | |
2717 | [('r', 'rev', '', |
|
2717 | [('r', 'rev', '', | |
2718 | _('identify the specified revision'), _('REV')), |
|
2718 | _('identify the specified revision'), _('REV')), | |
2719 | ('n', 'num', None, _('show local revision number')), |
|
2719 | ('n', 'num', None, _('show local revision number')), | |
2720 | ('i', 'id', None, _('show global revision id')), |
|
2720 | ('i', 'id', None, _('show global revision id')), | |
2721 | ('b', 'branch', None, _('show branch')), |
|
2721 | ('b', 'branch', None, _('show branch')), | |
2722 | ('t', 'tags', None, _('show tags')), |
|
2722 | ('t', 'tags', None, _('show tags')), | |
2723 | ('B', 'bookmarks', None, _('show bookmarks')), |
|
2723 | ('B', 'bookmarks', None, _('show bookmarks')), | |
2724 | ] + remoteopts + formatteropts, |
|
2724 | ] + remoteopts + formatteropts, | |
2725 | _('[-nibtB] [-r REV] [SOURCE]'), |
|
2725 | _('[-nibtB] [-r REV] [SOURCE]'), | |
2726 | optionalrepo=True, cmdtype=readonly) |
|
2726 | optionalrepo=True, cmdtype=readonly) | |
2727 | def identify(ui, repo, source=None, rev=None, |
|
2727 | def identify(ui, repo, source=None, rev=None, | |
2728 | num=None, id=None, branch=None, tags=None, bookmarks=None, **opts): |
|
2728 | num=None, id=None, branch=None, tags=None, bookmarks=None, **opts): | |
2729 | """identify the working directory or specified revision |
|
2729 | """identify the working directory or specified revision | |
2730 |
|
2730 | |||
2731 | Print a summary identifying the repository state at REV using one or |
|
2731 | Print a summary identifying the repository state at REV using one or | |
2732 | two parent hash identifiers, followed by a "+" if the working |
|
2732 | two parent hash identifiers, followed by a "+" if the working | |
2733 | directory has uncommitted changes, the branch name (if not default), |
|
2733 | directory has uncommitted changes, the branch name (if not default), | |
2734 | a list of tags, and a list of bookmarks. |
|
2734 | a list of tags, and a list of bookmarks. | |
2735 |
|
2735 | |||
2736 | When REV is not given, print a summary of the current state of the |
|
2736 | When REV is not given, print a summary of the current state of the | |
2737 | repository including the working directory. Specify -r. to get information |
|
2737 | repository including the working directory. Specify -r. to get information | |
2738 | of the working directory parent without scanning uncommitted changes. |
|
2738 | of the working directory parent without scanning uncommitted changes. | |
2739 |
|
2739 | |||
2740 | Specifying a path to a repository root or Mercurial bundle will |
|
2740 | Specifying a path to a repository root or Mercurial bundle will | |
2741 | cause lookup to operate on that repository/bundle. |
|
2741 | cause lookup to operate on that repository/bundle. | |
2742 |
|
2742 | |||
2743 | .. container:: verbose |
|
2743 | .. container:: verbose | |
2744 |
|
2744 | |||
2745 | Examples: |
|
2745 | Examples: | |
2746 |
|
2746 | |||
2747 | - generate a build identifier for the working directory:: |
|
2747 | - generate a build identifier for the working directory:: | |
2748 |
|
2748 | |||
2749 | hg id --id > build-id.dat |
|
2749 | hg id --id > build-id.dat | |
2750 |
|
2750 | |||
2751 | - find the revision corresponding to a tag:: |
|
2751 | - find the revision corresponding to a tag:: | |
2752 |
|
2752 | |||
2753 | hg id -n -r 1.3 |
|
2753 | hg id -n -r 1.3 | |
2754 |
|
2754 | |||
2755 | - check the most recent revision of a remote repository:: |
|
2755 | - check the most recent revision of a remote repository:: | |
2756 |
|
2756 | |||
2757 | hg id -r tip https://www.mercurial-scm.org/repo/hg/ |
|
2757 | hg id -r tip https://www.mercurial-scm.org/repo/hg/ | |
2758 |
|
2758 | |||
2759 | See :hg:`log` for generating more information about specific revisions, |
|
2759 | See :hg:`log` for generating more information about specific revisions, | |
2760 | including full hash identifiers. |
|
2760 | including full hash identifiers. | |
2761 |
|
2761 | |||
2762 | Returns 0 if successful. |
|
2762 | Returns 0 if successful. | |
2763 | """ |
|
2763 | """ | |
2764 |
|
2764 | |||
2765 | opts = pycompat.byteskwargs(opts) |
|
2765 | opts = pycompat.byteskwargs(opts) | |
2766 | if not repo and not source: |
|
2766 | if not repo and not source: | |
2767 | raise error.Abort(_("there is no Mercurial repository here " |
|
2767 | raise error.Abort(_("there is no Mercurial repository here " | |
2768 | "(.hg not found)")) |
|
2768 | "(.hg not found)")) | |
2769 |
|
2769 | |||
2770 | if ui.debugflag: |
|
2770 | if ui.debugflag: | |
2771 | hexfunc = hex |
|
2771 | hexfunc = hex | |
2772 | else: |
|
2772 | else: | |
2773 | hexfunc = short |
|
2773 | hexfunc = short | |
2774 | default = not (num or id or branch or tags or bookmarks) |
|
2774 | default = not (num or id or branch or tags or bookmarks) | |
2775 | output = [] |
|
2775 | output = [] | |
2776 | revs = [] |
|
2776 | revs = [] | |
2777 |
|
2777 | |||
2778 | if source: |
|
2778 | if source: | |
2779 | source, branches = hg.parseurl(ui.expandpath(source)) |
|
2779 | source, branches = hg.parseurl(ui.expandpath(source)) | |
2780 | peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo |
|
2780 | peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo | |
2781 | repo = peer.local() |
|
2781 | repo = peer.local() | |
2782 | revs, checkout = hg.addbranchrevs(repo, peer, branches, None) |
|
2782 | revs, checkout = hg.addbranchrevs(repo, peer, branches, None) | |
2783 |
|
2783 | |||
2784 | fm = ui.formatter('identify', opts) |
|
2784 | fm = ui.formatter('identify', opts) | |
2785 | fm.startitem() |
|
2785 | fm.startitem() | |
2786 |
|
2786 | |||
2787 | if not repo: |
|
2787 | if not repo: | |
2788 | if num or branch or tags: |
|
2788 | if num or branch or tags: | |
2789 | raise error.Abort( |
|
2789 | raise error.Abort( | |
2790 | _("can't query remote revision number, branch, or tags")) |
|
2790 | _("can't query remote revision number, branch, or tags")) | |
2791 | if not rev and revs: |
|
2791 | if not rev and revs: | |
2792 | rev = revs[0] |
|
2792 | rev = revs[0] | |
2793 | if not rev: |
|
2793 | if not rev: | |
2794 | rev = "tip" |
|
2794 | rev = "tip" | |
2795 |
|
2795 | |||
2796 | remoterev = peer.lookup(rev) |
|
2796 | remoterev = peer.lookup(rev) | |
2797 | hexrev = hexfunc(remoterev) |
|
2797 | hexrev = hexfunc(remoterev) | |
2798 | if default or id: |
|
2798 | if default or id: | |
2799 | output = [hexrev] |
|
2799 | output = [hexrev] | |
2800 | fm.data(id=hexrev) |
|
2800 | fm.data(id=hexrev) | |
2801 |
|
2801 | |||
2802 | def getbms(): |
|
2802 | def getbms(): | |
2803 | bms = [] |
|
2803 | bms = [] | |
2804 |
|
2804 | |||
2805 | if 'bookmarks' in peer.listkeys('namespaces'): |
|
2805 | if 'bookmarks' in peer.listkeys('namespaces'): | |
2806 | hexremoterev = hex(remoterev) |
|
2806 | hexremoterev = hex(remoterev) | |
2807 | bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems() |
|
2807 | bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems() | |
2808 | if bmr == hexremoterev] |
|
2808 | if bmr == hexremoterev] | |
2809 |
|
2809 | |||
2810 | return sorted(bms) |
|
2810 | return sorted(bms) | |
2811 |
|
2811 | |||
2812 | bms = getbms() |
|
2812 | bms = getbms() | |
2813 | if bookmarks: |
|
2813 | if bookmarks: | |
2814 | output.extend(bms) |
|
2814 | output.extend(bms) | |
2815 | elif default and not ui.quiet: |
|
2815 | elif default and not ui.quiet: | |
2816 | # multiple bookmarks for a single parent separated by '/' |
|
2816 | # multiple bookmarks for a single parent separated by '/' | |
2817 | bm = '/'.join(bms) |
|
2817 | bm = '/'.join(bms) | |
2818 | if bm: |
|
2818 | if bm: | |
2819 | output.append(bm) |
|
2819 | output.append(bm) | |
2820 |
|
2820 | |||
2821 | fm.data(node=hex(remoterev)) |
|
2821 | fm.data(node=hex(remoterev)) | |
2822 | fm.data(bookmarks=fm.formatlist(bms, name='bookmark')) |
|
2822 | fm.data(bookmarks=fm.formatlist(bms, name='bookmark')) | |
2823 | else: |
|
2823 | else: | |
2824 | if rev: |
|
2824 | if rev: | |
2825 | repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
|
2825 | repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') | |
2826 | ctx = scmutil.revsingle(repo, rev, None) |
|
2826 | ctx = scmutil.revsingle(repo, rev, None) | |
2827 |
|
2827 | |||
2828 | if ctx.rev() is None: |
|
2828 | if ctx.rev() is None: | |
2829 | ctx = repo[None] |
|
2829 | ctx = repo[None] | |
2830 | parents = ctx.parents() |
|
2830 | parents = ctx.parents() | |
2831 | taglist = [] |
|
2831 | taglist = [] | |
2832 | for p in parents: |
|
2832 | for p in parents: | |
2833 | taglist.extend(p.tags()) |
|
2833 | taglist.extend(p.tags()) | |
2834 |
|
2834 | |||
2835 | dirty = "" |
|
2835 | dirty = "" | |
2836 | if ctx.dirty(missing=True, merge=False, branch=False): |
|
2836 | if ctx.dirty(missing=True, merge=False, branch=False): | |
2837 | dirty = '+' |
|
2837 | dirty = '+' | |
2838 | fm.data(dirty=dirty) |
|
2838 | fm.data(dirty=dirty) | |
2839 |
|
2839 | |||
2840 | hexoutput = [hexfunc(p.node()) for p in parents] |
|
2840 | hexoutput = [hexfunc(p.node()) for p in parents] | |
2841 | if default or id: |
|
2841 | if default or id: | |
2842 | output = ["%s%s" % ('+'.join(hexoutput), dirty)] |
|
2842 | output = ["%s%s" % ('+'.join(hexoutput), dirty)] | |
2843 | fm.data(id="%s%s" % ('+'.join(hexoutput), dirty)) |
|
2843 | fm.data(id="%s%s" % ('+'.join(hexoutput), dirty)) | |
2844 |
|
2844 | |||
2845 | if num: |
|
2845 | if num: | |
2846 | numoutput = ["%d" % p.rev() for p in parents] |
|
2846 | numoutput = ["%d" % p.rev() for p in parents] | |
2847 | output.append("%s%s" % ('+'.join(numoutput), dirty)) |
|
2847 | output.append("%s%s" % ('+'.join(numoutput), dirty)) | |
2848 |
|
2848 | |||
2849 | fn = fm.nested('parents') |
|
2849 | fn = fm.nested('parents') | |
2850 | for p in parents: |
|
2850 | for p in parents: | |
2851 | fn.startitem() |
|
2851 | fn.startitem() | |
2852 | fn.data(rev=p.rev()) |
|
2852 | fn.data(rev=p.rev()) | |
2853 | fn.data(node=p.hex()) |
|
2853 | fn.data(node=p.hex()) | |
2854 | fn.context(ctx=p) |
|
2854 | fn.context(ctx=p) | |
2855 | fn.end() |
|
2855 | fn.end() | |
2856 | else: |
|
2856 | else: | |
2857 | hexoutput = hexfunc(ctx.node()) |
|
2857 | hexoutput = hexfunc(ctx.node()) | |
2858 | if default or id: |
|
2858 | if default or id: | |
2859 | output = [hexoutput] |
|
2859 | output = [hexoutput] | |
2860 | fm.data(id=hexoutput) |
|
2860 | fm.data(id=hexoutput) | |
2861 |
|
2861 | |||
2862 | if num: |
|
2862 | if num: | |
2863 | output.append(pycompat.bytestr(ctx.rev())) |
|
2863 | output.append(pycompat.bytestr(ctx.rev())) | |
2864 | taglist = ctx.tags() |
|
2864 | taglist = ctx.tags() | |
2865 |
|
2865 | |||
2866 | if default and not ui.quiet: |
|
2866 | if default and not ui.quiet: | |
2867 | b = ctx.branch() |
|
2867 | b = ctx.branch() | |
2868 | if b != 'default': |
|
2868 | if b != 'default': | |
2869 | output.append("(%s)" % b) |
|
2869 | output.append("(%s)" % b) | |
2870 |
|
2870 | |||
2871 | # multiple tags for a single parent separated by '/' |
|
2871 | # multiple tags for a single parent separated by '/' | |
2872 | t = '/'.join(taglist) |
|
2872 | t = '/'.join(taglist) | |
2873 | if t: |
|
2873 | if t: | |
2874 | output.append(t) |
|
2874 | output.append(t) | |
2875 |
|
2875 | |||
2876 | # multiple bookmarks for a single parent separated by '/' |
|
2876 | # multiple bookmarks for a single parent separated by '/' | |
2877 | bm = '/'.join(ctx.bookmarks()) |
|
2877 | bm = '/'.join(ctx.bookmarks()) | |
2878 | if bm: |
|
2878 | if bm: | |
2879 | output.append(bm) |
|
2879 | output.append(bm) | |
2880 | else: |
|
2880 | else: | |
2881 | if branch: |
|
2881 | if branch: | |
2882 | output.append(ctx.branch()) |
|
2882 | output.append(ctx.branch()) | |
2883 |
|
2883 | |||
2884 | if tags: |
|
2884 | if tags: | |
2885 | output.extend(taglist) |
|
2885 | output.extend(taglist) | |
2886 |
|
2886 | |||
2887 | if bookmarks: |
|
2887 | if bookmarks: | |
2888 | output.extend(ctx.bookmarks()) |
|
2888 | output.extend(ctx.bookmarks()) | |
2889 |
|
2889 | |||
2890 | fm.data(node=ctx.hex()) |
|
2890 | fm.data(node=ctx.hex()) | |
2891 | fm.data(branch=ctx.branch()) |
|
2891 | fm.data(branch=ctx.branch()) | |
2892 | fm.data(tags=fm.formatlist(taglist, name='tag', sep=':')) |
|
2892 | fm.data(tags=fm.formatlist(taglist, name='tag', sep=':')) | |
2893 | fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark')) |
|
2893 | fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark')) | |
2894 | fm.context(ctx=ctx) |
|
2894 | fm.context(ctx=ctx) | |
2895 |
|
2895 | |||
2896 | fm.plain("%s\n" % ' '.join(output)) |
|
2896 | fm.plain("%s\n" % ' '.join(output)) | |
2897 | fm.end() |
|
2897 | fm.end() | |
2898 |
|
2898 | |||
2899 | @command('import|patch', |
|
2899 | @command('import|patch', | |
2900 | [('p', 'strip', 1, |
|
2900 | [('p', 'strip', 1, | |
2901 | _('directory strip option for patch. This has the same ' |
|
2901 | _('directory strip option for patch. This has the same ' | |
2902 | 'meaning as the corresponding patch option'), _('NUM')), |
|
2902 | 'meaning as the corresponding patch option'), _('NUM')), | |
2903 | ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')), |
|
2903 | ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')), | |
2904 | ('e', 'edit', False, _('invoke editor on commit messages')), |
|
2904 | ('e', 'edit', False, _('invoke editor on commit messages')), | |
2905 | ('f', 'force', None, |
|
2905 | ('f', 'force', None, | |
2906 | _('skip check for outstanding uncommitted changes (DEPRECATED)')), |
|
2906 | _('skip check for outstanding uncommitted changes (DEPRECATED)')), | |
2907 | ('', 'no-commit', None, |
|
2907 | ('', 'no-commit', None, | |
2908 | _("don't commit, just update the working directory")), |
|
2908 | _("don't commit, just update the working directory")), | |
2909 | ('', 'bypass', None, |
|
2909 | ('', 'bypass', None, | |
2910 | _("apply patch without touching the working directory")), |
|
2910 | _("apply patch without touching the working directory")), | |
2911 | ('', 'partial', None, |
|
2911 | ('', 'partial', None, | |
2912 | _('commit even if some hunks fail')), |
|
2912 | _('commit even if some hunks fail')), | |
2913 | ('', 'exact', None, |
|
2913 | ('', 'exact', None, | |
2914 | _('abort if patch would apply lossily')), |
|
2914 | _('abort if patch would apply lossily')), | |
2915 | ('', 'prefix', '', |
|
2915 | ('', 'prefix', '', | |
2916 | _('apply patch to subdirectory'), _('DIR')), |
|
2916 | _('apply patch to subdirectory'), _('DIR')), | |
2917 | ('', 'import-branch', None, |
|
2917 | ('', 'import-branch', None, | |
2918 | _('use any branch information in patch (implied by --exact)'))] + |
|
2918 | _('use any branch information in patch (implied by --exact)'))] + | |
2919 | commitopts + commitopts2 + similarityopts, |
|
2919 | commitopts + commitopts2 + similarityopts, | |
2920 | _('[OPTION]... PATCH...')) |
|
2920 | _('[OPTION]... PATCH...')) | |
2921 | def import_(ui, repo, patch1=None, *patches, **opts): |
|
2921 | def import_(ui, repo, patch1=None, *patches, **opts): | |
2922 | """import an ordered set of patches |
|
2922 | """import an ordered set of patches | |
2923 |
|
2923 | |||
2924 | Import a list of patches and commit them individually (unless |
|
2924 | Import a list of patches and commit them individually (unless | |
2925 | --no-commit is specified). |
|
2925 | --no-commit is specified). | |
2926 |
|
2926 | |||
2927 | To read a patch from standard input (stdin), use "-" as the patch |
|
2927 | To read a patch from standard input (stdin), use "-" as the patch | |
2928 | name. If a URL is specified, the patch will be downloaded from |
|
2928 | name. If a URL is specified, the patch will be downloaded from | |
2929 | there. |
|
2929 | there. | |
2930 |
|
2930 | |||
2931 | Import first applies changes to the working directory (unless |
|
2931 | Import first applies changes to the working directory (unless | |
2932 | --bypass is specified), import will abort if there are outstanding |
|
2932 | --bypass is specified), import will abort if there are outstanding | |
2933 | changes. |
|
2933 | changes. | |
2934 |
|
2934 | |||
2935 | Use --bypass to apply and commit patches directly to the |
|
2935 | Use --bypass to apply and commit patches directly to the | |
2936 | repository, without affecting the working directory. Without |
|
2936 | repository, without affecting the working directory. Without | |
2937 | --exact, patches will be applied on top of the working directory |
|
2937 | --exact, patches will be applied on top of the working directory | |
2938 | parent revision. |
|
2938 | parent revision. | |
2939 |
|
2939 | |||
2940 | You can import a patch straight from a mail message. Even patches |
|
2940 | You can import a patch straight from a mail message. Even patches | |
2941 | as attachments work (to use the body part, it must have type |
|
2941 | as attachments work (to use the body part, it must have type | |
2942 | text/plain or text/x-patch). From and Subject headers of email |
|
2942 | text/plain or text/x-patch). From and Subject headers of email | |
2943 | message are used as default committer and commit message. All |
|
2943 | message are used as default committer and commit message. All | |
2944 | text/plain body parts before first diff are added to the commit |
|
2944 | text/plain body parts before first diff are added to the commit | |
2945 | message. |
|
2945 | message. | |
2946 |
|
2946 | |||
2947 | If the imported patch was generated by :hg:`export`, user and |
|
2947 | If the imported patch was generated by :hg:`export`, user and | |
2948 | description from patch override values from message headers and |
|
2948 | description from patch override values from message headers and | |
2949 | body. Values given on command line with -m/--message and -u/--user |
|
2949 | body. Values given on command line with -m/--message and -u/--user | |
2950 | override these. |
|
2950 | override these. | |
2951 |
|
2951 | |||
2952 | If --exact is specified, import will set the working directory to |
|
2952 | If --exact is specified, import will set the working directory to | |
2953 | the parent of each patch before applying it, and will abort if the |
|
2953 | the parent of each patch before applying it, and will abort if the | |
2954 | resulting changeset has a different ID than the one recorded in |
|
2954 | resulting changeset has a different ID than the one recorded in | |
2955 | the patch. This will guard against various ways that portable |
|
2955 | the patch. This will guard against various ways that portable | |
2956 | patch formats and mail systems might fail to transfer Mercurial |
|
2956 | patch formats and mail systems might fail to transfer Mercurial | |
2957 | data or metadata. See :hg:`bundle` for lossless transmission. |
|
2957 | data or metadata. See :hg:`bundle` for lossless transmission. | |
2958 |
|
2958 | |||
2959 | Use --partial to ensure a changeset will be created from the patch |
|
2959 | Use --partial to ensure a changeset will be created from the patch | |
2960 | even if some hunks fail to apply. Hunks that fail to apply will be |
|
2960 | even if some hunks fail to apply. Hunks that fail to apply will be | |
2961 | written to a <target-file>.rej file. Conflicts can then be resolved |
|
2961 | written to a <target-file>.rej file. Conflicts can then be resolved | |
2962 | by hand before :hg:`commit --amend` is run to update the created |
|
2962 | by hand before :hg:`commit --amend` is run to update the created | |
2963 | changeset. This flag exists to let people import patches that |
|
2963 | changeset. This flag exists to let people import patches that | |
2964 | partially apply without losing the associated metadata (author, |
|
2964 | partially apply without losing the associated metadata (author, | |
2965 | date, description, ...). |
|
2965 | date, description, ...). | |
2966 |
|
2966 | |||
2967 | .. note:: |
|
2967 | .. note:: | |
2968 |
|
2968 | |||
2969 | When no hunks apply cleanly, :hg:`import --partial` will create |
|
2969 | When no hunks apply cleanly, :hg:`import --partial` will create | |
2970 | an empty changeset, importing only the patch metadata. |
|
2970 | an empty changeset, importing only the patch metadata. | |
2971 |
|
2971 | |||
2972 | With -s/--similarity, hg will attempt to discover renames and |
|
2972 | With -s/--similarity, hg will attempt to discover renames and | |
2973 | copies in the patch in the same way as :hg:`addremove`. |
|
2973 | copies in the patch in the same way as :hg:`addremove`. | |
2974 |
|
2974 | |||
2975 | It is possible to use external patch programs to perform the patch |
|
2975 | It is possible to use external patch programs to perform the patch | |
2976 | by setting the ``ui.patch`` configuration option. For the default |
|
2976 | by setting the ``ui.patch`` configuration option. For the default | |
2977 | internal tool, the fuzz can also be configured via ``patch.fuzz``. |
|
2977 | internal tool, the fuzz can also be configured via ``patch.fuzz``. | |
2978 | See :hg:`help config` for more information about configuration |
|
2978 | See :hg:`help config` for more information about configuration | |
2979 | files and how to use these options. |
|
2979 | files and how to use these options. | |
2980 |
|
2980 | |||
2981 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
2981 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
2982 |
|
2982 | |||
2983 | .. container:: verbose |
|
2983 | .. container:: verbose | |
2984 |
|
2984 | |||
2985 | Examples: |
|
2985 | Examples: | |
2986 |
|
2986 | |||
2987 | - import a traditional patch from a website and detect renames:: |
|
2987 | - import a traditional patch from a website and detect renames:: | |
2988 |
|
2988 | |||
2989 | hg import -s 80 http://example.com/bugfix.patch |
|
2989 | hg import -s 80 http://example.com/bugfix.patch | |
2990 |
|
2990 | |||
2991 | - import a changeset from an hgweb server:: |
|
2991 | - import a changeset from an hgweb server:: | |
2992 |
|
2992 | |||
2993 | hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa |
|
2993 | hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa | |
2994 |
|
2994 | |||
2995 | - import all the patches in an Unix-style mbox:: |
|
2995 | - import all the patches in an Unix-style mbox:: | |
2996 |
|
2996 | |||
2997 | hg import incoming-patches.mbox |
|
2997 | hg import incoming-patches.mbox | |
2998 |
|
2998 | |||
2999 | - import patches from stdin:: |
|
2999 | - import patches from stdin:: | |
3000 |
|
3000 | |||
3001 | hg import - |
|
3001 | hg import - | |
3002 |
|
3002 | |||
3003 | - attempt to exactly restore an exported changeset (not always |
|
3003 | - attempt to exactly restore an exported changeset (not always | |
3004 | possible):: |
|
3004 | possible):: | |
3005 |
|
3005 | |||
3006 | hg import --exact proposed-fix.patch |
|
3006 | hg import --exact proposed-fix.patch | |
3007 |
|
3007 | |||
3008 | - use an external tool to apply a patch which is too fuzzy for |
|
3008 | - use an external tool to apply a patch which is too fuzzy for | |
3009 | the default internal tool. |
|
3009 | the default internal tool. | |
3010 |
|
3010 | |||
3011 | hg import --config ui.patch="patch --merge" fuzzy.patch |
|
3011 | hg import --config ui.patch="patch --merge" fuzzy.patch | |
3012 |
|
3012 | |||
3013 | - change the default fuzzing from 2 to a less strict 7 |
|
3013 | - change the default fuzzing from 2 to a less strict 7 | |
3014 |
|
3014 | |||
3015 | hg import --config ui.fuzz=7 fuzz.patch |
|
3015 | hg import --config ui.fuzz=7 fuzz.patch | |
3016 |
|
3016 | |||
3017 | Returns 0 on success, 1 on partial success (see --partial). |
|
3017 | Returns 0 on success, 1 on partial success (see --partial). | |
3018 | """ |
|
3018 | """ | |
3019 |
|
3019 | |||
3020 | opts = pycompat.byteskwargs(opts) |
|
3020 | opts = pycompat.byteskwargs(opts) | |
3021 | if not patch1: |
|
3021 | if not patch1: | |
3022 | raise error.Abort(_('need at least one patch to import')) |
|
3022 | raise error.Abort(_('need at least one patch to import')) | |
3023 |
|
3023 | |||
3024 | patches = (patch1,) + patches |
|
3024 | patches = (patch1,) + patches | |
3025 |
|
3025 | |||
3026 | date = opts.get('date') |
|
3026 | date = opts.get('date') | |
3027 | if date: |
|
3027 | if date: | |
3028 | opts['date'] = dateutil.parsedate(date) |
|
3028 | opts['date'] = dateutil.parsedate(date) | |
3029 |
|
3029 | |||
3030 | exact = opts.get('exact') |
|
3030 | exact = opts.get('exact') | |
3031 | update = not opts.get('bypass') |
|
3031 | update = not opts.get('bypass') | |
3032 | if not update and opts.get('no_commit'): |
|
3032 | if not update and opts.get('no_commit'): | |
3033 | raise error.Abort(_('cannot use --no-commit with --bypass')) |
|
3033 | raise error.Abort(_('cannot use --no-commit with --bypass')) | |
3034 | try: |
|
3034 | try: | |
3035 | sim = float(opts.get('similarity') or 0) |
|
3035 | sim = float(opts.get('similarity') or 0) | |
3036 | except ValueError: |
|
3036 | except ValueError: | |
3037 | raise error.Abort(_('similarity must be a number')) |
|
3037 | raise error.Abort(_('similarity must be a number')) | |
3038 | if sim < 0 or sim > 100: |
|
3038 | if sim < 0 or sim > 100: | |
3039 | raise error.Abort(_('similarity must be between 0 and 100')) |
|
3039 | raise error.Abort(_('similarity must be between 0 and 100')) | |
3040 | if sim and not update: |
|
3040 | if sim and not update: | |
3041 | raise error.Abort(_('cannot use --similarity with --bypass')) |
|
3041 | raise error.Abort(_('cannot use --similarity with --bypass')) | |
3042 | if exact: |
|
3042 | if exact: | |
3043 | if opts.get('edit'): |
|
3043 | if opts.get('edit'): | |
3044 | raise error.Abort(_('cannot use --exact with --edit')) |
|
3044 | raise error.Abort(_('cannot use --exact with --edit')) | |
3045 | if opts.get('prefix'): |
|
3045 | if opts.get('prefix'): | |
3046 | raise error.Abort(_('cannot use --exact with --prefix')) |
|
3046 | raise error.Abort(_('cannot use --exact with --prefix')) | |
3047 |
|
3047 | |||
3048 | base = opts["base"] |
|
3048 | base = opts["base"] | |
3049 | wlock = dsguard = lock = tr = None |
|
3049 | wlock = dsguard = lock = tr = None | |
3050 | msgs = [] |
|
3050 | msgs = [] | |
3051 | ret = 0 |
|
3051 | ret = 0 | |
3052 |
|
3052 | |||
3053 |
|
3053 | |||
3054 | try: |
|
3054 | try: | |
3055 | wlock = repo.wlock() |
|
3055 | wlock = repo.wlock() | |
3056 |
|
3056 | |||
3057 | if update: |
|
3057 | if update: | |
3058 | cmdutil.checkunfinished(repo) |
|
3058 | cmdutil.checkunfinished(repo) | |
3059 | if (exact or not opts.get('force')): |
|
3059 | if (exact or not opts.get('force')): | |
3060 | cmdutil.bailifchanged(repo) |
|
3060 | cmdutil.bailifchanged(repo) | |
3061 |
|
3061 | |||
3062 | if not opts.get('no_commit'): |
|
3062 | if not opts.get('no_commit'): | |
3063 | lock = repo.lock() |
|
3063 | lock = repo.lock() | |
3064 | tr = repo.transaction('import') |
|
3064 | tr = repo.transaction('import') | |
3065 | else: |
|
3065 | else: | |
3066 | dsguard = dirstateguard.dirstateguard(repo, 'import') |
|
3066 | dsguard = dirstateguard.dirstateguard(repo, 'import') | |
3067 | parents = repo[None].parents() |
|
3067 | parents = repo[None].parents() | |
3068 | for patchurl in patches: |
|
3068 | for patchurl in patches: | |
3069 | if patchurl == '-': |
|
3069 | if patchurl == '-': | |
3070 | ui.status(_('applying patch from stdin\n')) |
|
3070 | ui.status(_('applying patch from stdin\n')) | |
3071 | patchfile = ui.fin |
|
3071 | patchfile = ui.fin | |
3072 | patchurl = 'stdin' # for error message |
|
3072 | patchurl = 'stdin' # for error message | |
3073 | else: |
|
3073 | else: | |
3074 | patchurl = os.path.join(base, patchurl) |
|
3074 | patchurl = os.path.join(base, patchurl) | |
3075 | ui.status(_('applying %s\n') % patchurl) |
|
3075 | ui.status(_('applying %s\n') % patchurl) | |
3076 | patchfile = hg.openpath(ui, patchurl) |
|
3076 | patchfile = hg.openpath(ui, patchurl) | |
3077 |
|
3077 | |||
3078 | haspatch = False |
|
3078 | haspatch = False | |
3079 | for hunk in patch.split(patchfile): |
|
3079 | for hunk in patch.split(patchfile): | |
3080 | (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk, |
|
3080 | (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk, | |
3081 | parents, opts, |
|
3081 | parents, opts, | |
3082 | msgs, hg.clean) |
|
3082 | msgs, hg.clean) | |
3083 | if msg: |
|
3083 | if msg: | |
3084 | haspatch = True |
|
3084 | haspatch = True | |
3085 | ui.note(msg + '\n') |
|
3085 | ui.note(msg + '\n') | |
3086 | if update or exact: |
|
3086 | if update or exact: | |
3087 | parents = repo[None].parents() |
|
3087 | parents = repo[None].parents() | |
3088 | else: |
|
3088 | else: | |
3089 | parents = [repo[node]] |
|
3089 | parents = [repo[node]] | |
3090 | if rej: |
|
3090 | if rej: | |
3091 | ui.write_err(_("patch applied partially\n")) |
|
3091 | ui.write_err(_("patch applied partially\n")) | |
3092 | ui.write_err(_("(fix the .rej files and run " |
|
3092 | ui.write_err(_("(fix the .rej files and run " | |
3093 | "`hg commit --amend`)\n")) |
|
3093 | "`hg commit --amend`)\n")) | |
3094 | ret = 1 |
|
3094 | ret = 1 | |
3095 | break |
|
3095 | break | |
3096 |
|
3096 | |||
3097 | if not haspatch: |
|
3097 | if not haspatch: | |
3098 | raise error.Abort(_('%s: no diffs found') % patchurl) |
|
3098 | raise error.Abort(_('%s: no diffs found') % patchurl) | |
3099 |
|
3099 | |||
3100 | if tr: |
|
3100 | if tr: | |
3101 | tr.close() |
|
3101 | tr.close() | |
3102 | if msgs: |
|
3102 | if msgs: | |
3103 | repo.savecommitmessage('\n* * *\n'.join(msgs)) |
|
3103 | repo.savecommitmessage('\n* * *\n'.join(msgs)) | |
3104 | if dsguard: |
|
3104 | if dsguard: | |
3105 | dsguard.close() |
|
3105 | dsguard.close() | |
3106 | return ret |
|
3106 | return ret | |
3107 | finally: |
|
3107 | finally: | |
3108 | if tr: |
|
3108 | if tr: | |
3109 | tr.release() |
|
3109 | tr.release() | |
3110 | release(lock, dsguard, wlock) |
|
3110 | release(lock, dsguard, wlock) | |
3111 |
|
3111 | |||
3112 | @command('incoming|in', |
|
3112 | @command('incoming|in', | |
3113 | [('f', 'force', None, |
|
3113 | [('f', 'force', None, | |
3114 | _('run even if remote repository is unrelated')), |
|
3114 | _('run even if remote repository is unrelated')), | |
3115 | ('n', 'newest-first', None, _('show newest record first')), |
|
3115 | ('n', 'newest-first', None, _('show newest record first')), | |
3116 | ('', 'bundle', '', |
|
3116 | ('', 'bundle', '', | |
3117 | _('file to store the bundles into'), _('FILE')), |
|
3117 | _('file to store the bundles into'), _('FILE')), | |
3118 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), |
|
3118 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), | |
3119 | ('B', 'bookmarks', False, _("compare bookmarks")), |
|
3119 | ('B', 'bookmarks', False, _("compare bookmarks")), | |
3120 | ('b', 'branch', [], |
|
3120 | ('b', 'branch', [], | |
3121 | _('a specific branch you would like to pull'), _('BRANCH')), |
|
3121 | _('a specific branch you would like to pull'), _('BRANCH')), | |
3122 | ] + logopts + remoteopts + subrepoopts, |
|
3122 | ] + logopts + remoteopts + subrepoopts, | |
3123 | _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]')) |
|
3123 | _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]')) | |
3124 | def incoming(ui, repo, source="default", **opts): |
|
3124 | def incoming(ui, repo, source="default", **opts): | |
3125 | """show new changesets found in source |
|
3125 | """show new changesets found in source | |
3126 |
|
3126 | |||
3127 | Show new changesets found in the specified path/URL or the default |
|
3127 | Show new changesets found in the specified path/URL or the default | |
3128 | pull location. These are the changesets that would have been pulled |
|
3128 | pull location. These are the changesets that would have been pulled | |
3129 | by :hg:`pull` at the time you issued this command. |
|
3129 | by :hg:`pull` at the time you issued this command. | |
3130 |
|
3130 | |||
3131 | See pull for valid source format details. |
|
3131 | See pull for valid source format details. | |
3132 |
|
3132 | |||
3133 | .. container:: verbose |
|
3133 | .. container:: verbose | |
3134 |
|
3134 | |||
3135 | With -B/--bookmarks, the result of bookmark comparison between |
|
3135 | With -B/--bookmarks, the result of bookmark comparison between | |
3136 | local and remote repositories is displayed. With -v/--verbose, |
|
3136 | local and remote repositories is displayed. With -v/--verbose, | |
3137 | status is also displayed for each bookmark like below:: |
|
3137 | status is also displayed for each bookmark like below:: | |
3138 |
|
3138 | |||
3139 | BM1 01234567890a added |
|
3139 | BM1 01234567890a added | |
3140 | BM2 1234567890ab advanced |
|
3140 | BM2 1234567890ab advanced | |
3141 | BM3 234567890abc diverged |
|
3141 | BM3 234567890abc diverged | |
3142 | BM4 34567890abcd changed |
|
3142 | BM4 34567890abcd changed | |
3143 |
|
3143 | |||
3144 | The action taken locally when pulling depends on the |
|
3144 | The action taken locally when pulling depends on the | |
3145 | status of each bookmark: |
|
3145 | status of each bookmark: | |
3146 |
|
3146 | |||
3147 | :``added``: pull will create it |
|
3147 | :``added``: pull will create it | |
3148 | :``advanced``: pull will update it |
|
3148 | :``advanced``: pull will update it | |
3149 | :``diverged``: pull will create a divergent bookmark |
|
3149 | :``diverged``: pull will create a divergent bookmark | |
3150 | :``changed``: result depends on remote changesets |
|
3150 | :``changed``: result depends on remote changesets | |
3151 |
|
3151 | |||
3152 | From the point of view of pulling behavior, bookmark |
|
3152 | From the point of view of pulling behavior, bookmark | |
3153 | existing only in the remote repository are treated as ``added``, |
|
3153 | existing only in the remote repository are treated as ``added``, | |
3154 | even if it is in fact locally deleted. |
|
3154 | even if it is in fact locally deleted. | |
3155 |
|
3155 | |||
3156 | .. container:: verbose |
|
3156 | .. container:: verbose | |
3157 |
|
3157 | |||
3158 | For remote repository, using --bundle avoids downloading the |
|
3158 | For remote repository, using --bundle avoids downloading the | |
3159 | changesets twice if the incoming is followed by a pull. |
|
3159 | changesets twice if the incoming is followed by a pull. | |
3160 |
|
3160 | |||
3161 | Examples: |
|
3161 | Examples: | |
3162 |
|
3162 | |||
3163 | - show incoming changes with patches and full description:: |
|
3163 | - show incoming changes with patches and full description:: | |
3164 |
|
3164 | |||
3165 | hg incoming -vp |
|
3165 | hg incoming -vp | |
3166 |
|
3166 | |||
3167 | - show incoming changes excluding merges, store a bundle:: |
|
3167 | - show incoming changes excluding merges, store a bundle:: | |
3168 |
|
3168 | |||
3169 | hg in -vpM --bundle incoming.hg |
|
3169 | hg in -vpM --bundle incoming.hg | |
3170 | hg pull incoming.hg |
|
3170 | hg pull incoming.hg | |
3171 |
|
3171 | |||
3172 | - briefly list changes inside a bundle:: |
|
3172 | - briefly list changes inside a bundle:: | |
3173 |
|
3173 | |||
3174 | hg in changes.hg -T "{desc|firstline}\\n" |
|
3174 | hg in changes.hg -T "{desc|firstline}\\n" | |
3175 |
|
3175 | |||
3176 | Returns 0 if there are incoming changes, 1 otherwise. |
|
3176 | Returns 0 if there are incoming changes, 1 otherwise. | |
3177 | """ |
|
3177 | """ | |
3178 | opts = pycompat.byteskwargs(opts) |
|
3178 | opts = pycompat.byteskwargs(opts) | |
3179 | if opts.get('graph'): |
|
3179 | if opts.get('graph'): | |
3180 | logcmdutil.checkunsupportedgraphflags([], opts) |
|
3180 | logcmdutil.checkunsupportedgraphflags([], opts) | |
3181 | def display(other, chlist, displayer): |
|
3181 | def display(other, chlist, displayer): | |
3182 | revdag = logcmdutil.graphrevs(other, chlist, opts) |
|
3182 | revdag = logcmdutil.graphrevs(other, chlist, opts) | |
3183 | logcmdutil.displaygraph(ui, repo, revdag, displayer, |
|
3183 | logcmdutil.displaygraph(ui, repo, revdag, displayer, | |
3184 | graphmod.asciiedges) |
|
3184 | graphmod.asciiedges) | |
3185 |
|
3185 | |||
3186 | hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True) |
|
3186 | hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True) | |
3187 | return 0 |
|
3187 | return 0 | |
3188 |
|
3188 | |||
3189 | if opts.get('bundle') and opts.get('subrepos'): |
|
3189 | if opts.get('bundle') and opts.get('subrepos'): | |
3190 | raise error.Abort(_('cannot combine --bundle and --subrepos')) |
|
3190 | raise error.Abort(_('cannot combine --bundle and --subrepos')) | |
3191 |
|
3191 | |||
3192 | if opts.get('bookmarks'): |
|
3192 | if opts.get('bookmarks'): | |
3193 | source, branches = hg.parseurl(ui.expandpath(source), |
|
3193 | source, branches = hg.parseurl(ui.expandpath(source), | |
3194 | opts.get('branch')) |
|
3194 | opts.get('branch')) | |
3195 | other = hg.peer(repo, opts, source) |
|
3195 | other = hg.peer(repo, opts, source) | |
3196 | if 'bookmarks' not in other.listkeys('namespaces'): |
|
3196 | if 'bookmarks' not in other.listkeys('namespaces'): | |
3197 | ui.warn(_("remote doesn't support bookmarks\n")) |
|
3197 | ui.warn(_("remote doesn't support bookmarks\n")) | |
3198 | return 0 |
|
3198 | return 0 | |
3199 | ui.pager('incoming') |
|
3199 | ui.pager('incoming') | |
3200 | ui.status(_('comparing with %s\n') % util.hidepassword(source)) |
|
3200 | ui.status(_('comparing with %s\n') % util.hidepassword(source)) | |
3201 | return bookmarks.incoming(ui, repo, other) |
|
3201 | return bookmarks.incoming(ui, repo, other) | |
3202 |
|
3202 | |||
3203 | repo._subtoppath = ui.expandpath(source) |
|
3203 | repo._subtoppath = ui.expandpath(source) | |
3204 | try: |
|
3204 | try: | |
3205 | return hg.incoming(ui, repo, source, opts) |
|
3205 | return hg.incoming(ui, repo, source, opts) | |
3206 | finally: |
|
3206 | finally: | |
3207 | del repo._subtoppath |
|
3207 | del repo._subtoppath | |
3208 |
|
3208 | |||
3209 |
|
3209 | |||
3210 | @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'), |
|
3210 | @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'), | |
3211 | norepo=True) |
|
3211 | norepo=True) | |
3212 | def init(ui, dest=".", **opts): |
|
3212 | def init(ui, dest=".", **opts): | |
3213 | """create a new repository in the given directory |
|
3213 | """create a new repository in the given directory | |
3214 |
|
3214 | |||
3215 | Initialize a new repository in the given directory. If the given |
|
3215 | Initialize a new repository in the given directory. If the given | |
3216 | directory does not exist, it will be created. |
|
3216 | directory does not exist, it will be created. | |
3217 |
|
3217 | |||
3218 | If no directory is given, the current directory is used. |
|
3218 | If no directory is given, the current directory is used. | |
3219 |
|
3219 | |||
3220 | It is possible to specify an ``ssh://`` URL as the destination. |
|
3220 | It is possible to specify an ``ssh://`` URL as the destination. | |
3221 | See :hg:`help urls` for more information. |
|
3221 | See :hg:`help urls` for more information. | |
3222 |
|
3222 | |||
3223 | Returns 0 on success. |
|
3223 | Returns 0 on success. | |
3224 | """ |
|
3224 | """ | |
3225 | opts = pycompat.byteskwargs(opts) |
|
3225 | opts = pycompat.byteskwargs(opts) | |
3226 | hg.peer(ui, opts, ui.expandpath(dest), create=True) |
|
3226 | hg.peer(ui, opts, ui.expandpath(dest), create=True) | |
3227 |
|
3227 | |||
3228 | @command('locate', |
|
3228 | @command('locate', | |
3229 | [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')), |
|
3229 | [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')), | |
3230 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), |
|
3230 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), | |
3231 | ('f', 'fullpath', None, _('print complete paths from the filesystem root')), |
|
3231 | ('f', 'fullpath', None, _('print complete paths from the filesystem root')), | |
3232 | ] + walkopts, |
|
3232 | ] + walkopts, | |
3233 | _('[OPTION]... [PATTERN]...')) |
|
3233 | _('[OPTION]... [PATTERN]...')) | |
3234 | def locate(ui, repo, *pats, **opts): |
|
3234 | def locate(ui, repo, *pats, **opts): | |
3235 | """locate files matching specific patterns (DEPRECATED) |
|
3235 | """locate files matching specific patterns (DEPRECATED) | |
3236 |
|
3236 | |||
3237 | Print files under Mercurial control in the working directory whose |
|
3237 | Print files under Mercurial control in the working directory whose | |
3238 | names match the given patterns. |
|
3238 | names match the given patterns. | |
3239 |
|
3239 | |||
3240 | By default, this command searches all directories in the working |
|
3240 | By default, this command searches all directories in the working | |
3241 | directory. To search just the current directory and its |
|
3241 | directory. To search just the current directory and its | |
3242 | subdirectories, use "--include .". |
|
3242 | subdirectories, use "--include .". | |
3243 |
|
3243 | |||
3244 | If no patterns are given to match, this command prints the names |
|
3244 | If no patterns are given to match, this command prints the names | |
3245 | of all files under Mercurial control in the working directory. |
|
3245 | of all files under Mercurial control in the working directory. | |
3246 |
|
3246 | |||
3247 | If you want to feed the output of this command into the "xargs" |
|
3247 | If you want to feed the output of this command into the "xargs" | |
3248 | command, use the -0 option to both this command and "xargs". This |
|
3248 | command, use the -0 option to both this command and "xargs". This | |
3249 | will avoid the problem of "xargs" treating single filenames that |
|
3249 | will avoid the problem of "xargs" treating single filenames that | |
3250 | contain whitespace as multiple filenames. |
|
3250 | contain whitespace as multiple filenames. | |
3251 |
|
3251 | |||
3252 | See :hg:`help files` for a more versatile command. |
|
3252 | See :hg:`help files` for a more versatile command. | |
3253 |
|
3253 | |||
3254 | Returns 0 if a match is found, 1 otherwise. |
|
3254 | Returns 0 if a match is found, 1 otherwise. | |
3255 | """ |
|
3255 | """ | |
3256 | opts = pycompat.byteskwargs(opts) |
|
3256 | opts = pycompat.byteskwargs(opts) | |
3257 | if opts.get('print0'): |
|
3257 | if opts.get('print0'): | |
3258 | end = '\0' |
|
3258 | end = '\0' | |
3259 | else: |
|
3259 | else: | |
3260 | end = '\n' |
|
3260 | end = '\n' | |
3261 | ctx = scmutil.revsingle(repo, opts.get('rev'), None) |
|
3261 | ctx = scmutil.revsingle(repo, opts.get('rev'), None) | |
3262 |
|
3262 | |||
3263 | ret = 1 |
|
3263 | ret = 1 | |
3264 | m = scmutil.match(ctx, pats, opts, default='relglob', |
|
3264 | m = scmutil.match(ctx, pats, opts, default='relglob', | |
3265 | badfn=lambda x, y: False) |
|
3265 | badfn=lambda x, y: False) | |
3266 |
|
3266 | |||
3267 | ui.pager('locate') |
|
3267 | ui.pager('locate') | |
3268 | for abs in ctx.matches(m): |
|
3268 | for abs in ctx.matches(m): | |
3269 | if opts.get('fullpath'): |
|
3269 | if opts.get('fullpath'): | |
3270 | ui.write(repo.wjoin(abs), end) |
|
3270 | ui.write(repo.wjoin(abs), end) | |
3271 | else: |
|
3271 | else: | |
3272 | ui.write(((pats and m.rel(abs)) or abs), end) |
|
3272 | ui.write(((pats and m.rel(abs)) or abs), end) | |
3273 | ret = 0 |
|
3273 | ret = 0 | |
3274 |
|
3274 | |||
3275 | return ret |
|
3275 | return ret | |
3276 |
|
3276 | |||
3277 | @command('^log|history', |
|
3277 | @command('^log|history', | |
3278 | [('f', 'follow', None, |
|
3278 | [('f', 'follow', None, | |
3279 | _('follow changeset history, or file history across copies and renames')), |
|
3279 | _('follow changeset history, or file history across copies and renames')), | |
3280 | ('', 'follow-first', None, |
|
3280 | ('', 'follow-first', None, | |
3281 | _('only follow the first parent of merge changesets (DEPRECATED)')), |
|
3281 | _('only follow the first parent of merge changesets (DEPRECATED)')), | |
3282 | ('d', 'date', '', _('show revisions matching date spec'), _('DATE')), |
|
3282 | ('d', 'date', '', _('show revisions matching date spec'), _('DATE')), | |
3283 | ('C', 'copies', None, _('show copied files')), |
|
3283 | ('C', 'copies', None, _('show copied files')), | |
3284 | ('k', 'keyword', [], |
|
3284 | ('k', 'keyword', [], | |
3285 | _('do case-insensitive search for a given text'), _('TEXT')), |
|
3285 | _('do case-insensitive search for a given text'), _('TEXT')), | |
3286 | ('r', 'rev', [], _('show the specified revision or revset'), _('REV')), |
|
3286 | ('r', 'rev', [], _('show the specified revision or revset'), _('REV')), | |
3287 | ('L', 'line-range', [], |
|
3287 | ('L', 'line-range', [], | |
3288 | _('follow line range of specified file (EXPERIMENTAL)'), |
|
3288 | _('follow line range of specified file (EXPERIMENTAL)'), | |
3289 | _('FILE,RANGE')), |
|
3289 | _('FILE,RANGE')), | |
3290 | ('', 'removed', None, _('include revisions where files were removed')), |
|
3290 | ('', 'removed', None, _('include revisions where files were removed')), | |
3291 | ('m', 'only-merges', None, _('show only merges (DEPRECATED)')), |
|
3291 | ('m', 'only-merges', None, _('show only merges (DEPRECATED)')), | |
3292 | ('u', 'user', [], _('revisions committed by user'), _('USER')), |
|
3292 | ('u', 'user', [], _('revisions committed by user'), _('USER')), | |
3293 | ('', 'only-branch', [], |
|
3293 | ('', 'only-branch', [], | |
3294 | _('show only changesets within the given named branch (DEPRECATED)'), |
|
3294 | _('show only changesets within the given named branch (DEPRECATED)'), | |
3295 | _('BRANCH')), |
|
3295 | _('BRANCH')), | |
3296 | ('b', 'branch', [], |
|
3296 | ('b', 'branch', [], | |
3297 | _('show changesets within the given named branch'), _('BRANCH')), |
|
3297 | _('show changesets within the given named branch'), _('BRANCH')), | |
3298 | ('P', 'prune', [], |
|
3298 | ('P', 'prune', [], | |
3299 | _('do not display revision or any of its ancestors'), _('REV')), |
|
3299 | _('do not display revision or any of its ancestors'), _('REV')), | |
3300 | ] + logopts + walkopts, |
|
3300 | ] + logopts + walkopts, | |
3301 | _('[OPTION]... [FILE]'), |
|
3301 | _('[OPTION]... [FILE]'), | |
3302 | inferrepo=True, cmdtype=readonly) |
|
3302 | inferrepo=True, cmdtype=readonly) | |
3303 | def log(ui, repo, *pats, **opts): |
|
3303 | def log(ui, repo, *pats, **opts): | |
3304 | """show revision history of entire repository or files |
|
3304 | """show revision history of entire repository or files | |
3305 |
|
3305 | |||
3306 | Print the revision history of the specified files or the entire |
|
3306 | Print the revision history of the specified files or the entire | |
3307 | project. |
|
3307 | project. | |
3308 |
|
3308 | |||
3309 | If no revision range is specified, the default is ``tip:0`` unless |
|
3309 | If no revision range is specified, the default is ``tip:0`` unless | |
3310 | --follow is set, in which case the working directory parent is |
|
3310 | --follow is set, in which case the working directory parent is | |
3311 | used as the starting revision. |
|
3311 | used as the starting revision. | |
3312 |
|
3312 | |||
3313 | File history is shown without following rename or copy history of |
|
3313 | File history is shown without following rename or copy history of | |
3314 | files. Use -f/--follow with a filename to follow history across |
|
3314 | files. Use -f/--follow with a filename to follow history across | |
3315 | renames and copies. --follow without a filename will only show |
|
3315 | renames and copies. --follow without a filename will only show | |
3316 | ancestors of the starting revision. |
|
3316 | ancestors of the starting revision. | |
3317 |
|
3317 | |||
3318 | By default this command prints revision number and changeset id, |
|
3318 | By default this command prints revision number and changeset id, | |
3319 | tags, non-trivial parents, user, date and time, and a summary for |
|
3319 | tags, non-trivial parents, user, date and time, and a summary for | |
3320 | each commit. When the -v/--verbose switch is used, the list of |
|
3320 | each commit. When the -v/--verbose switch is used, the list of | |
3321 | changed files and full commit message are shown. |
|
3321 | changed files and full commit message are shown. | |
3322 |
|
3322 | |||
3323 | With --graph the revisions are shown as an ASCII art DAG with the most |
|
3323 | With --graph the revisions are shown as an ASCII art DAG with the most | |
3324 | recent changeset at the top. |
|
3324 | recent changeset at the top. | |
3325 | 'o' is a changeset, '@' is a working directory parent, '_' closes a branch, |
|
3325 | 'o' is a changeset, '@' is a working directory parent, '_' closes a branch, | |
3326 | 'x' is obsolete, '*' is unstable, and '+' represents a fork where the |
|
3326 | 'x' is obsolete, '*' is unstable, and '+' represents a fork where the | |
3327 | changeset from the lines below is a parent of the 'o' merge on the same |
|
3327 | changeset from the lines below is a parent of the 'o' merge on the same | |
3328 | line. |
|
3328 | line. | |
3329 | Paths in the DAG are represented with '|', '/' and so forth. ':' in place |
|
3329 | Paths in the DAG are represented with '|', '/' and so forth. ':' in place | |
3330 | of a '|' indicates one or more revisions in a path are omitted. |
|
3330 | of a '|' indicates one or more revisions in a path are omitted. | |
3331 |
|
3331 | |||
3332 | .. container:: verbose |
|
3332 | .. container:: verbose | |
3333 |
|
3333 | |||
3334 | Use -L/--line-range FILE,M:N options to follow the history of lines |
|
3334 | Use -L/--line-range FILE,M:N options to follow the history of lines | |
3335 | from M to N in FILE. With -p/--patch only diff hunks affecting |
|
3335 | from M to N in FILE. With -p/--patch only diff hunks affecting | |
3336 | specified line range will be shown. This option requires --follow; |
|
3336 | specified line range will be shown. This option requires --follow; | |
3337 | it can be specified multiple times. Currently, this option is not |
|
3337 | it can be specified multiple times. Currently, this option is not | |
3338 | compatible with --graph. This option is experimental. |
|
3338 | compatible with --graph. This option is experimental. | |
3339 |
|
3339 | |||
3340 | .. note:: |
|
3340 | .. note:: | |
3341 |
|
3341 | |||
3342 | :hg:`log --patch` may generate unexpected diff output for merge |
|
3342 | :hg:`log --patch` may generate unexpected diff output for merge | |
3343 | changesets, as it will only compare the merge changeset against |
|
3343 | changesets, as it will only compare the merge changeset against | |
3344 | its first parent. Also, only files different from BOTH parents |
|
3344 | its first parent. Also, only files different from BOTH parents | |
3345 | will appear in files:. |
|
3345 | will appear in files:. | |
3346 |
|
3346 | |||
3347 | .. note:: |
|
3347 | .. note:: | |
3348 |
|
3348 | |||
3349 | For performance reasons, :hg:`log FILE` may omit duplicate changes |
|
3349 | For performance reasons, :hg:`log FILE` may omit duplicate changes | |
3350 | made on branches and will not show removals or mode changes. To |
|
3350 | made on branches and will not show removals or mode changes. To | |
3351 | see all such changes, use the --removed switch. |
|
3351 | see all such changes, use the --removed switch. | |
3352 |
|
3352 | |||
3353 | .. container:: verbose |
|
3353 | .. container:: verbose | |
3354 |
|
3354 | |||
3355 | .. note:: |
|
3355 | .. note:: | |
3356 |
|
3356 | |||
3357 | The history resulting from -L/--line-range options depends on diff |
|
3357 | The history resulting from -L/--line-range options depends on diff | |
3358 | options; for instance if white-spaces are ignored, respective changes |
|
3358 | options; for instance if white-spaces are ignored, respective changes | |
3359 | with only white-spaces in specified line range will not be listed. |
|
3359 | with only white-spaces in specified line range will not be listed. | |
3360 |
|
3360 | |||
3361 | .. container:: verbose |
|
3361 | .. container:: verbose | |
3362 |
|
3362 | |||
3363 | Some examples: |
|
3363 | Some examples: | |
3364 |
|
3364 | |||
3365 | - changesets with full descriptions and file lists:: |
|
3365 | - changesets with full descriptions and file lists:: | |
3366 |
|
3366 | |||
3367 | hg log -v |
|
3367 | hg log -v | |
3368 |
|
3368 | |||
3369 | - changesets ancestral to the working directory:: |
|
3369 | - changesets ancestral to the working directory:: | |
3370 |
|
3370 | |||
3371 | hg log -f |
|
3371 | hg log -f | |
3372 |
|
3372 | |||
3373 | - last 10 commits on the current branch:: |
|
3373 | - last 10 commits on the current branch:: | |
3374 |
|
3374 | |||
3375 | hg log -l 10 -b . |
|
3375 | hg log -l 10 -b . | |
3376 |
|
3376 | |||
3377 | - changesets showing all modifications of a file, including removals:: |
|
3377 | - changesets showing all modifications of a file, including removals:: | |
3378 |
|
3378 | |||
3379 | hg log --removed file.c |
|
3379 | hg log --removed file.c | |
3380 |
|
3380 | |||
3381 | - all changesets that touch a directory, with diffs, excluding merges:: |
|
3381 | - all changesets that touch a directory, with diffs, excluding merges:: | |
3382 |
|
3382 | |||
3383 | hg log -Mp lib/ |
|
3383 | hg log -Mp lib/ | |
3384 |
|
3384 | |||
3385 | - all revision numbers that match a keyword:: |
|
3385 | - all revision numbers that match a keyword:: | |
3386 |
|
3386 | |||
3387 | hg log -k bug --template "{rev}\\n" |
|
3387 | hg log -k bug --template "{rev}\\n" | |
3388 |
|
3388 | |||
3389 | - the full hash identifier of the working directory parent:: |
|
3389 | - the full hash identifier of the working directory parent:: | |
3390 |
|
3390 | |||
3391 | hg log -r . --template "{node}\\n" |
|
3391 | hg log -r . --template "{node}\\n" | |
3392 |
|
3392 | |||
3393 | - list available log templates:: |
|
3393 | - list available log templates:: | |
3394 |
|
3394 | |||
3395 | hg log -T list |
|
3395 | hg log -T list | |
3396 |
|
3396 | |||
3397 | - check if a given changeset is included in a tagged release:: |
|
3397 | - check if a given changeset is included in a tagged release:: | |
3398 |
|
3398 | |||
3399 | hg log -r "a21ccf and ancestor(1.9)" |
|
3399 | hg log -r "a21ccf and ancestor(1.9)" | |
3400 |
|
3400 | |||
3401 | - find all changesets by some user in a date range:: |
|
3401 | - find all changesets by some user in a date range:: | |
3402 |
|
3402 | |||
3403 | hg log -k alice -d "may 2008 to jul 2008" |
|
3403 | hg log -k alice -d "may 2008 to jul 2008" | |
3404 |
|
3404 | |||
3405 | - summary of all changesets after the last tag:: |
|
3405 | - summary of all changesets after the last tag:: | |
3406 |
|
3406 | |||
3407 | hg log -r "last(tagged())::" --template "{desc|firstline}\\n" |
|
3407 | hg log -r "last(tagged())::" --template "{desc|firstline}\\n" | |
3408 |
|
3408 | |||
3409 | - changesets touching lines 13 to 23 for file.c:: |
|
3409 | - changesets touching lines 13 to 23 for file.c:: | |
3410 |
|
3410 | |||
3411 | hg log -L file.c,13:23 |
|
3411 | hg log -L file.c,13:23 | |
3412 |
|
3412 | |||
3413 | - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of |
|
3413 | - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of | |
3414 | main.c with patch:: |
|
3414 | main.c with patch:: | |
3415 |
|
3415 | |||
3416 | hg log -L file.c,13:23 -L main.c,2:6 -p |
|
3416 | hg log -L file.c,13:23 -L main.c,2:6 -p | |
3417 |
|
3417 | |||
3418 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
3418 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
3419 |
|
3419 | |||
3420 | See :hg:`help revisions` for more about specifying and ordering |
|
3420 | See :hg:`help revisions` for more about specifying and ordering | |
3421 | revisions. |
|
3421 | revisions. | |
3422 |
|
3422 | |||
3423 | See :hg:`help templates` for more about pre-packaged styles and |
|
3423 | See :hg:`help templates` for more about pre-packaged styles and | |
3424 | specifying custom templates. The default template used by the log |
|
3424 | specifying custom templates. The default template used by the log | |
3425 | command can be customized via the ``ui.logtemplate`` configuration |
|
3425 | command can be customized via the ``ui.logtemplate`` configuration | |
3426 | setting. |
|
3426 | setting. | |
3427 |
|
3427 | |||
3428 | Returns 0 on success. |
|
3428 | Returns 0 on success. | |
3429 |
|
3429 | |||
3430 | """ |
|
3430 | """ | |
3431 | opts = pycompat.byteskwargs(opts) |
|
3431 | opts = pycompat.byteskwargs(opts) | |
3432 | linerange = opts.get('line_range') |
|
3432 | linerange = opts.get('line_range') | |
3433 |
|
3433 | |||
3434 | if linerange and not opts.get('follow'): |
|
3434 | if linerange and not opts.get('follow'): | |
3435 | raise error.Abort(_('--line-range requires --follow')) |
|
3435 | raise error.Abort(_('--line-range requires --follow')) | |
3436 |
|
3436 | |||
3437 | if linerange and pats: |
|
3437 | if linerange and pats: | |
3438 | # TODO: take pats as patterns with no line-range filter |
|
3438 | # TODO: take pats as patterns with no line-range filter | |
3439 | raise error.Abort( |
|
3439 | raise error.Abort( | |
3440 | _('FILE arguments are not compatible with --line-range option') |
|
3440 | _('FILE arguments are not compatible with --line-range option') | |
3441 | ) |
|
3441 | ) | |
3442 |
|
3442 | |||
3443 | repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn') |
|
3443 | repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn') | |
3444 | revs, differ = logcmdutil.getrevs(repo, pats, opts) |
|
3444 | revs, differ = logcmdutil.getrevs(repo, pats, opts) | |
3445 | if linerange: |
|
3445 | if linerange: | |
3446 | # TODO: should follow file history from logcmdutil._initialrevs(), |
|
3446 | # TODO: should follow file history from logcmdutil._initialrevs(), | |
3447 | # then filter the result by logcmdutil._makerevset() and --limit |
|
3447 | # then filter the result by logcmdutil._makerevset() and --limit | |
3448 | revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts) |
|
3448 | revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts) | |
3449 |
|
3449 | |||
3450 | getrenamed = None |
|
3450 | getrenamed = None | |
3451 | if opts.get('copies'): |
|
3451 | if opts.get('copies'): | |
3452 | endrev = None |
|
3452 | endrev = None | |
3453 | if opts.get('rev'): |
|
3453 | if opts.get('rev'): | |
3454 | endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1 |
|
3454 | endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1 | |
3455 | getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) |
|
3455 | getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) | |
3456 |
|
3456 | |||
3457 | ui.pager('log') |
|
3457 | ui.pager('log') | |
3458 | displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ, |
|
3458 | displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ, | |
3459 | buffered=True) |
|
3459 | buffered=True) | |
3460 | if opts.get('graph'): |
|
3460 | if opts.get('graph'): | |
3461 | displayfn = logcmdutil.displaygraphrevs |
|
3461 | displayfn = logcmdutil.displaygraphrevs | |
3462 | else: |
|
3462 | else: | |
3463 | displayfn = logcmdutil.displayrevs |
|
3463 | displayfn = logcmdutil.displayrevs | |
3464 | displayfn(ui, repo, revs, displayer, getrenamed) |
|
3464 | displayfn(ui, repo, revs, displayer, getrenamed) | |
3465 |
|
3465 | |||
3466 | @command('manifest', |
|
3466 | @command('manifest', | |
3467 | [('r', 'rev', '', _('revision to display'), _('REV')), |
|
3467 | [('r', 'rev', '', _('revision to display'), _('REV')), | |
3468 | ('', 'all', False, _("list files from all revisions"))] |
|
3468 | ('', 'all', False, _("list files from all revisions"))] | |
3469 | + formatteropts, |
|
3469 | + formatteropts, | |
3470 | _('[-r REV]'), cmdtype=readonly) |
|
3470 | _('[-r REV]'), cmdtype=readonly) | |
3471 | def manifest(ui, repo, node=None, rev=None, **opts): |
|
3471 | def manifest(ui, repo, node=None, rev=None, **opts): | |
3472 | """output the current or given revision of the project manifest |
|
3472 | """output the current or given revision of the project manifest | |
3473 |
|
3473 | |||
3474 | Print a list of version controlled files for the given revision. |
|
3474 | Print a list of version controlled files for the given revision. | |
3475 | If no revision is given, the first parent of the working directory |
|
3475 | If no revision is given, the first parent of the working directory | |
3476 | is used, or the null revision if no revision is checked out. |
|
3476 | is used, or the null revision if no revision is checked out. | |
3477 |
|
3477 | |||
3478 | With -v, print file permissions, symlink and executable bits. |
|
3478 | With -v, print file permissions, symlink and executable bits. | |
3479 | With --debug, print file revision hashes. |
|
3479 | With --debug, print file revision hashes. | |
3480 |
|
3480 | |||
3481 | If option --all is specified, the list of all files from all revisions |
|
3481 | If option --all is specified, the list of all files from all revisions | |
3482 | is printed. This includes deleted and renamed files. |
|
3482 | is printed. This includes deleted and renamed files. | |
3483 |
|
3483 | |||
3484 | Returns 0 on success. |
|
3484 | Returns 0 on success. | |
3485 | """ |
|
3485 | """ | |
3486 | opts = pycompat.byteskwargs(opts) |
|
3486 | opts = pycompat.byteskwargs(opts) | |
3487 | fm = ui.formatter('manifest', opts) |
|
3487 | fm = ui.formatter('manifest', opts) | |
3488 |
|
3488 | |||
3489 | if opts.get('all'): |
|
3489 | if opts.get('all'): | |
3490 | if rev or node: |
|
3490 | if rev or node: | |
3491 | raise error.Abort(_("can't specify a revision with --all")) |
|
3491 | raise error.Abort(_("can't specify a revision with --all")) | |
3492 |
|
3492 | |||
3493 | res = [] |
|
3493 | res = [] | |
3494 | prefix = "data/" |
|
3494 | prefix = "data/" | |
3495 | suffix = ".i" |
|
3495 | suffix = ".i" | |
3496 | plen = len(prefix) |
|
3496 | plen = len(prefix) | |
3497 | slen = len(suffix) |
|
3497 | slen = len(suffix) | |
3498 | with repo.lock(): |
|
3498 | with repo.lock(): | |
3499 | for fn, b, size in repo.store.datafiles(): |
|
3499 | for fn, b, size in repo.store.datafiles(): | |
3500 | if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix: |
|
3500 | if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix: | |
3501 | res.append(fn[plen:-slen]) |
|
3501 | res.append(fn[plen:-slen]) | |
3502 | ui.pager('manifest') |
|
3502 | ui.pager('manifest') | |
3503 | for f in res: |
|
3503 | for f in res: | |
3504 | fm.startitem() |
|
3504 | fm.startitem() | |
3505 | fm.write("path", '%s\n', f) |
|
3505 | fm.write("path", '%s\n', f) | |
3506 | fm.end() |
|
3506 | fm.end() | |
3507 | return |
|
3507 | return | |
3508 |
|
3508 | |||
3509 | if rev and node: |
|
3509 | if rev and node: | |
3510 | raise error.Abort(_("please specify just one revision")) |
|
3510 | raise error.Abort(_("please specify just one revision")) | |
3511 |
|
3511 | |||
3512 | if not node: |
|
3512 | if not node: | |
3513 | node = rev |
|
3513 | node = rev | |
3514 |
|
3514 | |||
3515 | char = {'l': '@', 'x': '*', '': '', 't': 'd'} |
|
3515 | char = {'l': '@', 'x': '*', '': '', 't': 'd'} | |
3516 | mode = {'l': '644', 'x': '755', '': '644', 't': '755'} |
|
3516 | mode = {'l': '644', 'x': '755', '': '644', 't': '755'} | |
3517 | if node: |
|
3517 | if node: | |
3518 | repo = scmutil.unhidehashlikerevs(repo, [node], 'nowarn') |
|
3518 | repo = scmutil.unhidehashlikerevs(repo, [node], 'nowarn') | |
3519 | ctx = scmutil.revsingle(repo, node) |
|
3519 | ctx = scmutil.revsingle(repo, node) | |
3520 | mf = ctx.manifest() |
|
3520 | mf = ctx.manifest() | |
3521 | ui.pager('manifest') |
|
3521 | ui.pager('manifest') | |
3522 | for f in ctx: |
|
3522 | for f in ctx: | |
3523 | fm.startitem() |
|
3523 | fm.startitem() | |
3524 | fl = ctx[f].flags() |
|
3524 | fl = ctx[f].flags() | |
3525 | fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f])) |
|
3525 | fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f])) | |
3526 | fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl]) |
|
3526 | fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl]) | |
3527 | fm.write('path', '%s\n', f) |
|
3527 | fm.write('path', '%s\n', f) | |
3528 | fm.end() |
|
3528 | fm.end() | |
3529 |
|
3529 | |||
3530 | @command('^merge', |
|
3530 | @command('^merge', | |
3531 | [('f', 'force', None, |
|
3531 | [('f', 'force', None, | |
3532 | _('force a merge including outstanding changes (DEPRECATED)')), |
|
3532 | _('force a merge including outstanding changes (DEPRECATED)')), | |
3533 | ('r', 'rev', '', _('revision to merge'), _('REV')), |
|
3533 | ('r', 'rev', '', _('revision to merge'), _('REV')), | |
3534 | ('P', 'preview', None, |
|
3534 | ('P', 'preview', None, | |
3535 | _('review revisions to merge (no merge is performed)')), |
|
3535 | _('review revisions to merge (no merge is performed)')), | |
3536 | ('', 'abort', None, _('abort the ongoing merge')), |
|
3536 | ('', 'abort', None, _('abort the ongoing merge')), | |
3537 | ] + mergetoolopts, |
|
3537 | ] + mergetoolopts, | |
3538 | _('[-P] [[-r] REV]')) |
|
3538 | _('[-P] [[-r] REV]')) | |
3539 | def merge(ui, repo, node=None, **opts): |
|
3539 | def merge(ui, repo, node=None, **opts): | |
3540 | """merge another revision into working directory |
|
3540 | """merge another revision into working directory | |
3541 |
|
3541 | |||
3542 | The current working directory is updated with all changes made in |
|
3542 | The current working directory is updated with all changes made in | |
3543 | the requested revision since the last common predecessor revision. |
|
3543 | the requested revision since the last common predecessor revision. | |
3544 |
|
3544 | |||
3545 | Files that changed between either parent are marked as changed for |
|
3545 | Files that changed between either parent are marked as changed for | |
3546 | the next commit and a commit must be performed before any further |
|
3546 | the next commit and a commit must be performed before any further | |
3547 | updates to the repository are allowed. The next commit will have |
|
3547 | updates to the repository are allowed. The next commit will have | |
3548 | two parents. |
|
3548 | two parents. | |
3549 |
|
3549 | |||
3550 | ``--tool`` can be used to specify the merge tool used for file |
|
3550 | ``--tool`` can be used to specify the merge tool used for file | |
3551 | merges. It overrides the HGMERGE environment variable and your |
|
3551 | merges. It overrides the HGMERGE environment variable and your | |
3552 | configuration files. See :hg:`help merge-tools` for options. |
|
3552 | configuration files. See :hg:`help merge-tools` for options. | |
3553 |
|
3553 | |||
3554 | If no revision is specified, the working directory's parent is a |
|
3554 | If no revision is specified, the working directory's parent is a | |
3555 | head revision, and the current branch contains exactly one other |
|
3555 | head revision, and the current branch contains exactly one other | |
3556 | head, the other head is merged with by default. Otherwise, an |
|
3556 | head, the other head is merged with by default. Otherwise, an | |
3557 | explicit revision with which to merge with must be provided. |
|
3557 | explicit revision with which to merge with must be provided. | |
3558 |
|
3558 | |||
3559 | See :hg:`help resolve` for information on handling file conflicts. |
|
3559 | See :hg:`help resolve` for information on handling file conflicts. | |
3560 |
|
3560 | |||
3561 | To undo an uncommitted merge, use :hg:`merge --abort` which |
|
3561 | To undo an uncommitted merge, use :hg:`merge --abort` which | |
3562 | will check out a clean copy of the original merge parent, losing |
|
3562 | will check out a clean copy of the original merge parent, losing | |
3563 | all changes. |
|
3563 | all changes. | |
3564 |
|
3564 | |||
3565 | Returns 0 on success, 1 if there are unresolved files. |
|
3565 | Returns 0 on success, 1 if there are unresolved files. | |
3566 | """ |
|
3566 | """ | |
3567 |
|
3567 | |||
3568 | opts = pycompat.byteskwargs(opts) |
|
3568 | opts = pycompat.byteskwargs(opts) | |
3569 | abort = opts.get('abort') |
|
3569 | abort = opts.get('abort') | |
3570 | if abort and repo.dirstate.p2() == nullid: |
|
3570 | if abort and repo.dirstate.p2() == nullid: | |
3571 | cmdutil.wrongtooltocontinue(repo, _('merge')) |
|
3571 | cmdutil.wrongtooltocontinue(repo, _('merge')) | |
3572 | if abort: |
|
3572 | if abort: | |
3573 | if node: |
|
3573 | if node: | |
3574 | raise error.Abort(_("cannot specify a node with --abort")) |
|
3574 | raise error.Abort(_("cannot specify a node with --abort")) | |
3575 | if opts.get('rev'): |
|
3575 | if opts.get('rev'): | |
3576 | raise error.Abort(_("cannot specify both --rev and --abort")) |
|
3576 | raise error.Abort(_("cannot specify both --rev and --abort")) | |
3577 | if opts.get('preview'): |
|
3577 | if opts.get('preview'): | |
3578 | raise error.Abort(_("cannot specify --preview with --abort")) |
|
3578 | raise error.Abort(_("cannot specify --preview with --abort")) | |
3579 | if opts.get('rev') and node: |
|
3579 | if opts.get('rev') and node: | |
3580 | raise error.Abort(_("please specify just one revision")) |
|
3580 | raise error.Abort(_("please specify just one revision")) | |
3581 | if not node: |
|
3581 | if not node: | |
3582 | node = opts.get('rev') |
|
3582 | node = opts.get('rev') | |
3583 |
|
3583 | |||
3584 | if node: |
|
3584 | if node: | |
3585 | node = scmutil.revsingle(repo, node).node() |
|
3585 | node = scmutil.revsingle(repo, node).node() | |
3586 |
|
3586 | |||
3587 | if not node and not abort: |
|
3587 | if not node and not abort: | |
3588 | node = repo[destutil.destmerge(repo)].node() |
|
3588 | node = repo[destutil.destmerge(repo)].node() | |
3589 |
|
3589 | |||
3590 | if opts.get('preview'): |
|
3590 | if opts.get('preview'): | |
3591 | # find nodes that are ancestors of p2 but not of p1 |
|
3591 | # find nodes that are ancestors of p2 but not of p1 | |
3592 | p1 = repo.lookup('.') |
|
3592 | p1 = repo.lookup('.') | |
3593 | p2 = repo.lookup(node) |
|
3593 | p2 = repo.lookup(node) | |
3594 | nodes = repo.changelog.findmissing(common=[p1], heads=[p2]) |
|
3594 | nodes = repo.changelog.findmissing(common=[p1], heads=[p2]) | |
3595 |
|
3595 | |||
3596 | displayer = logcmdutil.changesetdisplayer(ui, repo, opts) |
|
3596 | displayer = logcmdutil.changesetdisplayer(ui, repo, opts) | |
3597 | for node in nodes: |
|
3597 | for node in nodes: | |
3598 | displayer.show(repo[node]) |
|
3598 | displayer.show(repo[node]) | |
3599 | displayer.close() |
|
3599 | displayer.close() | |
3600 | return 0 |
|
3600 | return 0 | |
3601 |
|
3601 | |||
3602 | try: |
|
3602 | try: | |
3603 | # ui.forcemerge is an internal variable, do not document |
|
3603 | # ui.forcemerge is an internal variable, do not document | |
3604 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge') |
|
3604 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge') | |
3605 | force = opts.get('force') |
|
3605 | force = opts.get('force') | |
3606 | labels = ['working copy', 'merge rev'] |
|
3606 | labels = ['working copy', 'merge rev'] | |
3607 | return hg.merge(repo, node, force=force, mergeforce=force, |
|
3607 | return hg.merge(repo, node, force=force, mergeforce=force, | |
3608 | labels=labels, abort=abort) |
|
3608 | labels=labels, abort=abort) | |
3609 | finally: |
|
3609 | finally: | |
3610 | ui.setconfig('ui', 'forcemerge', '', 'merge') |
|
3610 | ui.setconfig('ui', 'forcemerge', '', 'merge') | |
3611 |
|
3611 | |||
3612 | @command('outgoing|out', |
|
3612 | @command('outgoing|out', | |
3613 | [('f', 'force', None, _('run even when the destination is unrelated')), |
|
3613 | [('f', 'force', None, _('run even when the destination is unrelated')), | |
3614 | ('r', 'rev', [], |
|
3614 | ('r', 'rev', [], | |
3615 | _('a changeset intended to be included in the destination'), _('REV')), |
|
3615 | _('a changeset intended to be included in the destination'), _('REV')), | |
3616 | ('n', 'newest-first', None, _('show newest record first')), |
|
3616 | ('n', 'newest-first', None, _('show newest record first')), | |
3617 | ('B', 'bookmarks', False, _('compare bookmarks')), |
|
3617 | ('B', 'bookmarks', False, _('compare bookmarks')), | |
3618 | ('b', 'branch', [], _('a specific branch you would like to push'), |
|
3618 | ('b', 'branch', [], _('a specific branch you would like to push'), | |
3619 | _('BRANCH')), |
|
3619 | _('BRANCH')), | |
3620 | ] + logopts + remoteopts + subrepoopts, |
|
3620 | ] + logopts + remoteopts + subrepoopts, | |
3621 | _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')) |
|
3621 | _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')) | |
3622 | def outgoing(ui, repo, dest=None, **opts): |
|
3622 | def outgoing(ui, repo, dest=None, **opts): | |
3623 | """show changesets not found in the destination |
|
3623 | """show changesets not found in the destination | |
3624 |
|
3624 | |||
3625 | Show changesets not found in the specified destination repository |
|
3625 | Show changesets not found in the specified destination repository | |
3626 | or the default push location. These are the changesets that would |
|
3626 | or the default push location. These are the changesets that would | |
3627 | be pushed if a push was requested. |
|
3627 | be pushed if a push was requested. | |
3628 |
|
3628 | |||
3629 | See pull for details of valid destination formats. |
|
3629 | See pull for details of valid destination formats. | |
3630 |
|
3630 | |||
3631 | .. container:: verbose |
|
3631 | .. container:: verbose | |
3632 |
|
3632 | |||
3633 | With -B/--bookmarks, the result of bookmark comparison between |
|
3633 | With -B/--bookmarks, the result of bookmark comparison between | |
3634 | local and remote repositories is displayed. With -v/--verbose, |
|
3634 | local and remote repositories is displayed. With -v/--verbose, | |
3635 | status is also displayed for each bookmark like below:: |
|
3635 | status is also displayed for each bookmark like below:: | |
3636 |
|
3636 | |||
3637 | BM1 01234567890a added |
|
3637 | BM1 01234567890a added | |
3638 | BM2 deleted |
|
3638 | BM2 deleted | |
3639 | BM3 234567890abc advanced |
|
3639 | BM3 234567890abc advanced | |
3640 | BM4 34567890abcd diverged |
|
3640 | BM4 34567890abcd diverged | |
3641 | BM5 4567890abcde changed |
|
3641 | BM5 4567890abcde changed | |
3642 |
|
3642 | |||
3643 | The action taken when pushing depends on the |
|
3643 | The action taken when pushing depends on the | |
3644 | status of each bookmark: |
|
3644 | status of each bookmark: | |
3645 |
|
3645 | |||
3646 | :``added``: push with ``-B`` will create it |
|
3646 | :``added``: push with ``-B`` will create it | |
3647 | :``deleted``: push with ``-B`` will delete it |
|
3647 | :``deleted``: push with ``-B`` will delete it | |
3648 | :``advanced``: push will update it |
|
3648 | :``advanced``: push will update it | |
3649 | :``diverged``: push with ``-B`` will update it |
|
3649 | :``diverged``: push with ``-B`` will update it | |
3650 | :``changed``: push with ``-B`` will update it |
|
3650 | :``changed``: push with ``-B`` will update it | |
3651 |
|
3651 | |||
3652 | From the point of view of pushing behavior, bookmarks |
|
3652 | From the point of view of pushing behavior, bookmarks | |
3653 | existing only in the remote repository are treated as |
|
3653 | existing only in the remote repository are treated as | |
3654 | ``deleted``, even if it is in fact added remotely. |
|
3654 | ``deleted``, even if it is in fact added remotely. | |
3655 |
|
3655 | |||
3656 | Returns 0 if there are outgoing changes, 1 otherwise. |
|
3656 | Returns 0 if there are outgoing changes, 1 otherwise. | |
3657 | """ |
|
3657 | """ | |
3658 | opts = pycompat.byteskwargs(opts) |
|
3658 | opts = pycompat.byteskwargs(opts) | |
3659 | if opts.get('graph'): |
|
3659 | if opts.get('graph'): | |
3660 | logcmdutil.checkunsupportedgraphflags([], opts) |
|
3660 | logcmdutil.checkunsupportedgraphflags([], opts) | |
3661 | o, other = hg._outgoing(ui, repo, dest, opts) |
|
3661 | o, other = hg._outgoing(ui, repo, dest, opts) | |
3662 | if not o: |
|
3662 | if not o: | |
3663 | cmdutil.outgoinghooks(ui, repo, other, opts, o) |
|
3663 | cmdutil.outgoinghooks(ui, repo, other, opts, o) | |
3664 | return |
|
3664 | return | |
3665 |
|
3665 | |||
3666 | revdag = logcmdutil.graphrevs(repo, o, opts) |
|
3666 | revdag = logcmdutil.graphrevs(repo, o, opts) | |
3667 | ui.pager('outgoing') |
|
3667 | ui.pager('outgoing') | |
3668 | displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True) |
|
3668 | displayer = logcmdutil.changesetdisplayer(ui, repo, opts, buffered=True) | |
3669 | logcmdutil.displaygraph(ui, repo, revdag, displayer, |
|
3669 | logcmdutil.displaygraph(ui, repo, revdag, displayer, | |
3670 | graphmod.asciiedges) |
|
3670 | graphmod.asciiedges) | |
3671 | cmdutil.outgoinghooks(ui, repo, other, opts, o) |
|
3671 | cmdutil.outgoinghooks(ui, repo, other, opts, o) | |
3672 | return 0 |
|
3672 | return 0 | |
3673 |
|
3673 | |||
3674 | if opts.get('bookmarks'): |
|
3674 | if opts.get('bookmarks'): | |
3675 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
3675 | dest = ui.expandpath(dest or 'default-push', dest or 'default') | |
3676 | dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
3676 | dest, branches = hg.parseurl(dest, opts.get('branch')) | |
3677 | other = hg.peer(repo, opts, dest) |
|
3677 | other = hg.peer(repo, opts, dest) | |
3678 | if 'bookmarks' not in other.listkeys('namespaces'): |
|
3678 | if 'bookmarks' not in other.listkeys('namespaces'): | |
3679 | ui.warn(_("remote doesn't support bookmarks\n")) |
|
3679 | ui.warn(_("remote doesn't support bookmarks\n")) | |
3680 | return 0 |
|
3680 | return 0 | |
3681 | ui.status(_('comparing with %s\n') % util.hidepassword(dest)) |
|
3681 | ui.status(_('comparing with %s\n') % util.hidepassword(dest)) | |
3682 | ui.pager('outgoing') |
|
3682 | ui.pager('outgoing') | |
3683 | return bookmarks.outgoing(ui, repo, other) |
|
3683 | return bookmarks.outgoing(ui, repo, other) | |
3684 |
|
3684 | |||
3685 | repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default') |
|
3685 | repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default') | |
3686 | try: |
|
3686 | try: | |
3687 | return hg.outgoing(ui, repo, dest, opts) |
|
3687 | return hg.outgoing(ui, repo, dest, opts) | |
3688 | finally: |
|
3688 | finally: | |
3689 | del repo._subtoppath |
|
3689 | del repo._subtoppath | |
3690 |
|
3690 | |||
3691 | @command('parents', |
|
3691 | @command('parents', | |
3692 | [('r', 'rev', '', _('show parents of the specified revision'), _('REV')), |
|
3692 | [('r', 'rev', '', _('show parents of the specified revision'), _('REV')), | |
3693 | ] + templateopts, |
|
3693 | ] + templateopts, | |
3694 | _('[-r REV] [FILE]'), |
|
3694 | _('[-r REV] [FILE]'), | |
3695 | inferrepo=True) |
|
3695 | inferrepo=True) | |
3696 | def parents(ui, repo, file_=None, **opts): |
|
3696 | def parents(ui, repo, file_=None, **opts): | |
3697 | """show the parents of the working directory or revision (DEPRECATED) |
|
3697 | """show the parents of the working directory or revision (DEPRECATED) | |
3698 |
|
3698 | |||
3699 | Print the working directory's parent revisions. If a revision is |
|
3699 | Print the working directory's parent revisions. If a revision is | |
3700 | given via -r/--rev, the parent of that revision will be printed. |
|
3700 | given via -r/--rev, the parent of that revision will be printed. | |
3701 | If a file argument is given, the revision in which the file was |
|
3701 | If a file argument is given, the revision in which the file was | |
3702 | last changed (before the working directory revision or the |
|
3702 | last changed (before the working directory revision or the | |
3703 | argument to --rev if given) is printed. |
|
3703 | argument to --rev if given) is printed. | |
3704 |
|
3704 | |||
3705 | This command is equivalent to:: |
|
3705 | This command is equivalent to:: | |
3706 |
|
3706 | |||
3707 | hg log -r "p1()+p2()" or |
|
3707 | hg log -r "p1()+p2()" or | |
3708 | hg log -r "p1(REV)+p2(REV)" or |
|
3708 | hg log -r "p1(REV)+p2(REV)" or | |
3709 | hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or |
|
3709 | hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or | |
3710 | hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))" |
|
3710 | hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))" | |
3711 |
|
3711 | |||
3712 | See :hg:`summary` and :hg:`help revsets` for related information. |
|
3712 | See :hg:`summary` and :hg:`help revsets` for related information. | |
3713 |
|
3713 | |||
3714 | Returns 0 on success. |
|
3714 | Returns 0 on success. | |
3715 | """ |
|
3715 | """ | |
3716 |
|
3716 | |||
3717 | opts = pycompat.byteskwargs(opts) |
|
3717 | opts = pycompat.byteskwargs(opts) | |
3718 | rev = opts.get('rev') |
|
3718 | rev = opts.get('rev') | |
3719 | if rev: |
|
3719 | if rev: | |
3720 | repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
|
3720 | repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') | |
3721 | ctx = scmutil.revsingle(repo, rev, None) |
|
3721 | ctx = scmutil.revsingle(repo, rev, None) | |
3722 |
|
3722 | |||
3723 | if file_: |
|
3723 | if file_: | |
3724 | m = scmutil.match(ctx, (file_,), opts) |
|
3724 | m = scmutil.match(ctx, (file_,), opts) | |
3725 | if m.anypats() or len(m.files()) != 1: |
|
3725 | if m.anypats() or len(m.files()) != 1: | |
3726 | raise error.Abort(_('can only specify an explicit filename')) |
|
3726 | raise error.Abort(_('can only specify an explicit filename')) | |
3727 | file_ = m.files()[0] |
|
3727 | file_ = m.files()[0] | |
3728 | filenodes = [] |
|
3728 | filenodes = [] | |
3729 | for cp in ctx.parents(): |
|
3729 | for cp in ctx.parents(): | |
3730 | if not cp: |
|
3730 | if not cp: | |
3731 | continue |
|
3731 | continue | |
3732 | try: |
|
3732 | try: | |
3733 | filenodes.append(cp.filenode(file_)) |
|
3733 | filenodes.append(cp.filenode(file_)) | |
3734 | except error.LookupError: |
|
3734 | except error.LookupError: | |
3735 | pass |
|
3735 | pass | |
3736 | if not filenodes: |
|
3736 | if not filenodes: | |
3737 | raise error.Abort(_("'%s' not found in manifest!") % file_) |
|
3737 | raise error.Abort(_("'%s' not found in manifest!") % file_) | |
3738 | p = [] |
|
3738 | p = [] | |
3739 | for fn in filenodes: |
|
3739 | for fn in filenodes: | |
3740 | fctx = repo.filectx(file_, fileid=fn) |
|
3740 | fctx = repo.filectx(file_, fileid=fn) | |
3741 | p.append(fctx.node()) |
|
3741 | p.append(fctx.node()) | |
3742 | else: |
|
3742 | else: | |
3743 | p = [cp.node() for cp in ctx.parents()] |
|
3743 | p = [cp.node() for cp in ctx.parents()] | |
3744 |
|
3744 | |||
3745 | displayer = logcmdutil.changesetdisplayer(ui, repo, opts) |
|
3745 | displayer = logcmdutil.changesetdisplayer(ui, repo, opts) | |
3746 | for n in p: |
|
3746 | for n in p: | |
3747 | if n != nullid: |
|
3747 | if n != nullid: | |
3748 | displayer.show(repo[n]) |
|
3748 | displayer.show(repo[n]) | |
3749 | displayer.close() |
|
3749 | displayer.close() | |
3750 |
|
3750 | |||
3751 | @command('paths', formatteropts, _('[NAME]'), optionalrepo=True, |
|
3751 | @command('paths', formatteropts, _('[NAME]'), optionalrepo=True, | |
3752 | cmdtype=readonly) |
|
3752 | cmdtype=readonly) | |
3753 | def paths(ui, repo, search=None, **opts): |
|
3753 | def paths(ui, repo, search=None, **opts): | |
3754 | """show aliases for remote repositories |
|
3754 | """show aliases for remote repositories | |
3755 |
|
3755 | |||
3756 | Show definition of symbolic path name NAME. If no name is given, |
|
3756 | Show definition of symbolic path name NAME. If no name is given, | |
3757 | show definition of all available names. |
|
3757 | show definition of all available names. | |
3758 |
|
3758 | |||
3759 | Option -q/--quiet suppresses all output when searching for NAME |
|
3759 | Option -q/--quiet suppresses all output when searching for NAME | |
3760 | and shows only the path names when listing all definitions. |
|
3760 | and shows only the path names when listing all definitions. | |
3761 |
|
3761 | |||
3762 | Path names are defined in the [paths] section of your |
|
3762 | Path names are defined in the [paths] section of your | |
3763 | configuration file and in ``/etc/mercurial/hgrc``. If run inside a |
|
3763 | configuration file and in ``/etc/mercurial/hgrc``. If run inside a | |
3764 | repository, ``.hg/hgrc`` is used, too. |
|
3764 | repository, ``.hg/hgrc`` is used, too. | |
3765 |
|
3765 | |||
3766 | The path names ``default`` and ``default-push`` have a special |
|
3766 | The path names ``default`` and ``default-push`` have a special | |
3767 | meaning. When performing a push or pull operation, they are used |
|
3767 | meaning. When performing a push or pull operation, they are used | |
3768 | as fallbacks if no location is specified on the command-line. |
|
3768 | as fallbacks if no location is specified on the command-line. | |
3769 | When ``default-push`` is set, it will be used for push and |
|
3769 | When ``default-push`` is set, it will be used for push and | |
3770 | ``default`` will be used for pull; otherwise ``default`` is used |
|
3770 | ``default`` will be used for pull; otherwise ``default`` is used | |
3771 | as the fallback for both. When cloning a repository, the clone |
|
3771 | as the fallback for both. When cloning a repository, the clone | |
3772 | source is written as ``default`` in ``.hg/hgrc``. |
|
3772 | source is written as ``default`` in ``.hg/hgrc``. | |
3773 |
|
3773 | |||
3774 | .. note:: |
|
3774 | .. note:: | |
3775 |
|
3775 | |||
3776 | ``default`` and ``default-push`` apply to all inbound (e.g. |
|
3776 | ``default`` and ``default-push`` apply to all inbound (e.g. | |
3777 | :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` |
|
3777 | :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` | |
3778 | and :hg:`bundle`) operations. |
|
3778 | and :hg:`bundle`) operations. | |
3779 |
|
3779 | |||
3780 | See :hg:`help urls` for more information. |
|
3780 | See :hg:`help urls` for more information. | |
3781 |
|
3781 | |||
3782 | Returns 0 on success. |
|
3782 | Returns 0 on success. | |
3783 | """ |
|
3783 | """ | |
3784 |
|
3784 | |||
3785 | opts = pycompat.byteskwargs(opts) |
|
3785 | opts = pycompat.byteskwargs(opts) | |
3786 | ui.pager('paths') |
|
3786 | ui.pager('paths') | |
3787 | if search: |
|
3787 | if search: | |
3788 | pathitems = [(name, path) for name, path in ui.paths.iteritems() |
|
3788 | pathitems = [(name, path) for name, path in ui.paths.iteritems() | |
3789 | if name == search] |
|
3789 | if name == search] | |
3790 | else: |
|
3790 | else: | |
3791 | pathitems = sorted(ui.paths.iteritems()) |
|
3791 | pathitems = sorted(ui.paths.iteritems()) | |
3792 |
|
3792 | |||
3793 | fm = ui.formatter('paths', opts) |
|
3793 | fm = ui.formatter('paths', opts) | |
3794 | if fm.isplain(): |
|
3794 | if fm.isplain(): | |
3795 | hidepassword = util.hidepassword |
|
3795 | hidepassword = util.hidepassword | |
3796 | else: |
|
3796 | else: | |
3797 | hidepassword = bytes |
|
3797 | hidepassword = bytes | |
3798 | if ui.quiet: |
|
3798 | if ui.quiet: | |
3799 | namefmt = '%s\n' |
|
3799 | namefmt = '%s\n' | |
3800 | else: |
|
3800 | else: | |
3801 | namefmt = '%s = ' |
|
3801 | namefmt = '%s = ' | |
3802 | showsubopts = not search and not ui.quiet |
|
3802 | showsubopts = not search and not ui.quiet | |
3803 |
|
3803 | |||
3804 | for name, path in pathitems: |
|
3804 | for name, path in pathitems: | |
3805 | fm.startitem() |
|
3805 | fm.startitem() | |
3806 | fm.condwrite(not search, 'name', namefmt, name) |
|
3806 | fm.condwrite(not search, 'name', namefmt, name) | |
3807 | fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc)) |
|
3807 | fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc)) | |
3808 | for subopt, value in sorted(path.suboptions.items()): |
|
3808 | for subopt, value in sorted(path.suboptions.items()): | |
3809 | assert subopt not in ('name', 'url') |
|
3809 | assert subopt not in ('name', 'url') | |
3810 | if showsubopts: |
|
3810 | if showsubopts: | |
3811 | fm.plain('%s:%s = ' % (name, subopt)) |
|
3811 | fm.plain('%s:%s = ' % (name, subopt)) | |
3812 | fm.condwrite(showsubopts, subopt, '%s\n', value) |
|
3812 | fm.condwrite(showsubopts, subopt, '%s\n', value) | |
3813 |
|
3813 | |||
3814 | fm.end() |
|
3814 | fm.end() | |
3815 |
|
3815 | |||
3816 | if search and not pathitems: |
|
3816 | if search and not pathitems: | |
3817 | if not ui.quiet: |
|
3817 | if not ui.quiet: | |
3818 | ui.warn(_("not found!\n")) |
|
3818 | ui.warn(_("not found!\n")) | |
3819 | return 1 |
|
3819 | return 1 | |
3820 | else: |
|
3820 | else: | |
3821 | return 0 |
|
3821 | return 0 | |
3822 |
|
3822 | |||
3823 | @command('phase', |
|
3823 | @command('phase', | |
3824 | [('p', 'public', False, _('set changeset phase to public')), |
|
3824 | [('p', 'public', False, _('set changeset phase to public')), | |
3825 | ('d', 'draft', False, _('set changeset phase to draft')), |
|
3825 | ('d', 'draft', False, _('set changeset phase to draft')), | |
3826 | ('s', 'secret', False, _('set changeset phase to secret')), |
|
3826 | ('s', 'secret', False, _('set changeset phase to secret')), | |
3827 | ('f', 'force', False, _('allow to move boundary backward')), |
|
3827 | ('f', 'force', False, _('allow to move boundary backward')), | |
3828 | ('r', 'rev', [], _('target revision'), _('REV')), |
|
3828 | ('r', 'rev', [], _('target revision'), _('REV')), | |
3829 | ], |
|
3829 | ], | |
3830 | _('[-p|-d|-s] [-f] [-r] [REV...]')) |
|
3830 | _('[-p|-d|-s] [-f] [-r] [REV...]')) | |
3831 | def phase(ui, repo, *revs, **opts): |
|
3831 | def phase(ui, repo, *revs, **opts): | |
3832 | """set or show the current phase name |
|
3832 | """set or show the current phase name | |
3833 |
|
3833 | |||
3834 | With no argument, show the phase name of the current revision(s). |
|
3834 | With no argument, show the phase name of the current revision(s). | |
3835 |
|
3835 | |||
3836 | With one of -p/--public, -d/--draft or -s/--secret, change the |
|
3836 | With one of -p/--public, -d/--draft or -s/--secret, change the | |
3837 | phase value of the specified revisions. |
|
3837 | phase value of the specified revisions. | |
3838 |
|
3838 | |||
3839 | Unless -f/--force is specified, :hg:`phase` won't move changesets from a |
|
3839 | Unless -f/--force is specified, :hg:`phase` won't move changesets from a | |
3840 | lower phase to a higher phase. Phases are ordered as follows:: |
|
3840 | lower phase to a higher phase. Phases are ordered as follows:: | |
3841 |
|
3841 | |||
3842 | public < draft < secret |
|
3842 | public < draft < secret | |
3843 |
|
3843 | |||
3844 | Returns 0 on success, 1 if some phases could not be changed. |
|
3844 | Returns 0 on success, 1 if some phases could not be changed. | |
3845 |
|
3845 | |||
3846 | (For more information about the phases concept, see :hg:`help phases`.) |
|
3846 | (For more information about the phases concept, see :hg:`help phases`.) | |
3847 | """ |
|
3847 | """ | |
3848 | opts = pycompat.byteskwargs(opts) |
|
3848 | opts = pycompat.byteskwargs(opts) | |
3849 | # search for a unique phase argument |
|
3849 | # search for a unique phase argument | |
3850 | targetphase = None |
|
3850 | targetphase = None | |
3851 | for idx, name in enumerate(phases.phasenames): |
|
3851 | for idx, name in enumerate(phases.phasenames): | |
3852 | if opts[name]: |
|
3852 | if opts[name]: | |
3853 | if targetphase is not None: |
|
3853 | if targetphase is not None: | |
3854 | raise error.Abort(_('only one phase can be specified')) |
|
3854 | raise error.Abort(_('only one phase can be specified')) | |
3855 | targetphase = idx |
|
3855 | targetphase = idx | |
3856 |
|
3856 | |||
3857 | # look for specified revision |
|
3857 | # look for specified revision | |
3858 | revs = list(revs) |
|
3858 | revs = list(revs) | |
3859 | revs.extend(opts['rev']) |
|
3859 | revs.extend(opts['rev']) | |
3860 | if not revs: |
|
3860 | if not revs: | |
3861 | # display both parents as the second parent phase can influence |
|
3861 | # display both parents as the second parent phase can influence | |
3862 | # the phase of a merge commit |
|
3862 | # the phase of a merge commit | |
3863 | revs = [c.rev() for c in repo[None].parents()] |
|
3863 | revs = [c.rev() for c in repo[None].parents()] | |
3864 |
|
3864 | |||
3865 | revs = scmutil.revrange(repo, revs) |
|
3865 | revs = scmutil.revrange(repo, revs) | |
3866 |
|
3866 | |||
3867 | ret = 0 |
|
3867 | ret = 0 | |
3868 | if targetphase is None: |
|
3868 | if targetphase is None: | |
3869 | # display |
|
3869 | # display | |
3870 | for r in revs: |
|
3870 | for r in revs: | |
3871 | ctx = repo[r] |
|
3871 | ctx = repo[r] | |
3872 | ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr())) |
|
3872 | ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr())) | |
3873 | else: |
|
3873 | else: | |
3874 | with repo.lock(), repo.transaction("phase") as tr: |
|
3874 | with repo.lock(), repo.transaction("phase") as tr: | |
3875 | # set phase |
|
3875 | # set phase | |
3876 | if not revs: |
|
3876 | if not revs: | |
3877 | raise error.Abort(_('empty revision set')) |
|
3877 | raise error.Abort(_('empty revision set')) | |
3878 | nodes = [repo[r].node() for r in revs] |
|
3878 | nodes = [repo[r].node() for r in revs] | |
3879 | # moving revision from public to draft may hide them |
|
3879 | # moving revision from public to draft may hide them | |
3880 | # We have to check result on an unfiltered repository |
|
3880 | # We have to check result on an unfiltered repository | |
3881 | unfi = repo.unfiltered() |
|
3881 | unfi = repo.unfiltered() | |
3882 | getphase = unfi._phasecache.phase |
|
3882 | getphase = unfi._phasecache.phase | |
3883 | olddata = [getphase(unfi, r) for r in unfi] |
|
3883 | olddata = [getphase(unfi, r) for r in unfi] | |
3884 | phases.advanceboundary(repo, tr, targetphase, nodes) |
|
3884 | phases.advanceboundary(repo, tr, targetphase, nodes) | |
3885 | if opts['force']: |
|
3885 | if opts['force']: | |
3886 | phases.retractboundary(repo, tr, targetphase, nodes) |
|
3886 | phases.retractboundary(repo, tr, targetphase, nodes) | |
3887 | getphase = unfi._phasecache.phase |
|
3887 | getphase = unfi._phasecache.phase | |
3888 | newdata = [getphase(unfi, r) for r in unfi] |
|
3888 | newdata = [getphase(unfi, r) for r in unfi] | |
3889 | changes = sum(newdata[r] != olddata[r] for r in unfi) |
|
3889 | changes = sum(newdata[r] != olddata[r] for r in unfi) | |
3890 | cl = unfi.changelog |
|
3890 | cl = unfi.changelog | |
3891 | rejected = [n for n in nodes |
|
3891 | rejected = [n for n in nodes | |
3892 | if newdata[cl.rev(n)] < targetphase] |
|
3892 | if newdata[cl.rev(n)] < targetphase] | |
3893 | if rejected: |
|
3893 | if rejected: | |
3894 | ui.warn(_('cannot move %i changesets to a higher ' |
|
3894 | ui.warn(_('cannot move %i changesets to a higher ' | |
3895 | 'phase, use --force\n') % len(rejected)) |
|
3895 | 'phase, use --force\n') % len(rejected)) | |
3896 | ret = 1 |
|
3896 | ret = 1 | |
3897 | if changes: |
|
3897 | if changes: | |
3898 | msg = _('phase changed for %i changesets\n') % changes |
|
3898 | msg = _('phase changed for %i changesets\n') % changes | |
3899 | if ret: |
|
3899 | if ret: | |
3900 | ui.status(msg) |
|
3900 | ui.status(msg) | |
3901 | else: |
|
3901 | else: | |
3902 | ui.note(msg) |
|
3902 | ui.note(msg) | |
3903 | else: |
|
3903 | else: | |
3904 | ui.warn(_('no phases changed\n')) |
|
3904 | ui.warn(_('no phases changed\n')) | |
3905 | return ret |
|
3905 | return ret | |
3906 |
|
3906 | |||
3907 | def postincoming(ui, repo, modheads, optupdate, checkout, brev): |
|
3907 | def postincoming(ui, repo, modheads, optupdate, checkout, brev): | |
3908 | """Run after a changegroup has been added via pull/unbundle |
|
3908 | """Run after a changegroup has been added via pull/unbundle | |
3909 |
|
3909 | |||
3910 | This takes arguments below: |
|
3910 | This takes arguments below: | |
3911 |
|
3911 | |||
3912 | :modheads: change of heads by pull/unbundle |
|
3912 | :modheads: change of heads by pull/unbundle | |
3913 | :optupdate: updating working directory is needed or not |
|
3913 | :optupdate: updating working directory is needed or not | |
3914 | :checkout: update destination revision (or None to default destination) |
|
3914 | :checkout: update destination revision (or None to default destination) | |
3915 | :brev: a name, which might be a bookmark to be activated after updating |
|
3915 | :brev: a name, which might be a bookmark to be activated after updating | |
3916 | """ |
|
3916 | """ | |
3917 | if modheads == 0: |
|
3917 | if modheads == 0: | |
3918 | return |
|
3918 | return | |
3919 | if optupdate: |
|
3919 | if optupdate: | |
3920 | try: |
|
3920 | try: | |
3921 | return hg.updatetotally(ui, repo, checkout, brev) |
|
3921 | return hg.updatetotally(ui, repo, checkout, brev) | |
3922 | except error.UpdateAbort as inst: |
|
3922 | except error.UpdateAbort as inst: | |
3923 | msg = _("not updating: %s") % stringutil.forcebytestr(inst) |
|
3923 | msg = _("not updating: %s") % stringutil.forcebytestr(inst) | |
3924 | hint = inst.hint |
|
3924 | hint = inst.hint | |
3925 | raise error.UpdateAbort(msg, hint=hint) |
|
3925 | raise error.UpdateAbort(msg, hint=hint) | |
3926 | if modheads > 1: |
|
3926 | if modheads > 1: | |
3927 | currentbranchheads = len(repo.branchheads()) |
|
3927 | currentbranchheads = len(repo.branchheads()) | |
3928 | if currentbranchheads == modheads: |
|
3928 | if currentbranchheads == modheads: | |
3929 | ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) |
|
3929 | ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) | |
3930 | elif currentbranchheads > 1: |
|
3930 | elif currentbranchheads > 1: | |
3931 | ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to " |
|
3931 | ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to " | |
3932 | "merge)\n")) |
|
3932 | "merge)\n")) | |
3933 | else: |
|
3933 | else: | |
3934 | ui.status(_("(run 'hg heads' to see heads)\n")) |
|
3934 | ui.status(_("(run 'hg heads' to see heads)\n")) | |
3935 | elif not ui.configbool('commands', 'update.requiredest'): |
|
3935 | elif not ui.configbool('commands', 'update.requiredest'): | |
3936 | ui.status(_("(run 'hg update' to get a working copy)\n")) |
|
3936 | ui.status(_("(run 'hg update' to get a working copy)\n")) | |
3937 |
|
3937 | |||
3938 | @command('^pull', |
|
3938 | @command('^pull', | |
3939 | [('u', 'update', None, |
|
3939 | [('u', 'update', None, | |
3940 | _('update to new branch head if new descendants were pulled')), |
|
3940 | _('update to new branch head if new descendants were pulled')), | |
3941 | ('f', 'force', None, _('run even when remote repository is unrelated')), |
|
3941 | ('f', 'force', None, _('run even when remote repository is unrelated')), | |
3942 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), |
|
3942 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), | |
3943 | ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')), |
|
3943 | ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')), | |
3944 | ('b', 'branch', [], _('a specific branch you would like to pull'), |
|
3944 | ('b', 'branch', [], _('a specific branch you would like to pull'), | |
3945 | _('BRANCH')), |
|
3945 | _('BRANCH')), | |
3946 | ] + remoteopts, |
|
3946 | ] + remoteopts, | |
3947 | _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')) |
|
3947 | _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')) | |
3948 | def pull(ui, repo, source="default", **opts): |
|
3948 | def pull(ui, repo, source="default", **opts): | |
3949 | """pull changes from the specified source |
|
3949 | """pull changes from the specified source | |
3950 |
|
3950 | |||
3951 | Pull changes from a remote repository to a local one. |
|
3951 | Pull changes from a remote repository to a local one. | |
3952 |
|
3952 | |||
3953 | This finds all changes from the repository at the specified path |
|
3953 | This finds all changes from the repository at the specified path | |
3954 | or URL and adds them to a local repository (the current one unless |
|
3954 | or URL and adds them to a local repository (the current one unless | |
3955 | -R is specified). By default, this does not update the copy of the |
|
3955 | -R is specified). By default, this does not update the copy of the | |
3956 | project in the working directory. |
|
3956 | project in the working directory. | |
3957 |
|
3957 | |||
3958 | Use :hg:`incoming` if you want to see what would have been added |
|
3958 | Use :hg:`incoming` if you want to see what would have been added | |
3959 | by a pull at the time you issued this command. If you then decide |
|
3959 | by a pull at the time you issued this command. If you then decide | |
3960 | to add those changes to the repository, you should use :hg:`pull |
|
3960 | to add those changes to the repository, you should use :hg:`pull | |
3961 | -r X` where ``X`` is the last changeset listed by :hg:`incoming`. |
|
3961 | -r X` where ``X`` is the last changeset listed by :hg:`incoming`. | |
3962 |
|
3962 | |||
3963 | If SOURCE is omitted, the 'default' path will be used. |
|
3963 | If SOURCE is omitted, the 'default' path will be used. | |
3964 | See :hg:`help urls` for more information. |
|
3964 | See :hg:`help urls` for more information. | |
3965 |
|
3965 | |||
3966 | Specifying bookmark as ``.`` is equivalent to specifying the active |
|
3966 | Specifying bookmark as ``.`` is equivalent to specifying the active | |
3967 | bookmark's name. |
|
3967 | bookmark's name. | |
3968 |
|
3968 | |||
3969 | Returns 0 on success, 1 if an update had unresolved files. |
|
3969 | Returns 0 on success, 1 if an update had unresolved files. | |
3970 | """ |
|
3970 | """ | |
3971 |
|
3971 | |||
3972 | opts = pycompat.byteskwargs(opts) |
|
3972 | opts = pycompat.byteskwargs(opts) | |
3973 | if ui.configbool('commands', 'update.requiredest') and opts.get('update'): |
|
3973 | if ui.configbool('commands', 'update.requiredest') and opts.get('update'): | |
3974 | msg = _('update destination required by configuration') |
|
3974 | msg = _('update destination required by configuration') | |
3975 | hint = _('use hg pull followed by hg update DEST') |
|
3975 | hint = _('use hg pull followed by hg update DEST') | |
3976 | raise error.Abort(msg, hint=hint) |
|
3976 | raise error.Abort(msg, hint=hint) | |
3977 |
|
3977 | |||
3978 | source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) |
|
3978 | source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) | |
3979 | ui.status(_('pulling from %s\n') % util.hidepassword(source)) |
|
3979 | ui.status(_('pulling from %s\n') % util.hidepassword(source)) | |
3980 | other = hg.peer(repo, opts, source) |
|
3980 | other = hg.peer(repo, opts, source) | |
3981 | try: |
|
3981 | try: | |
3982 | revs, checkout = hg.addbranchrevs(repo, other, branches, |
|
3982 | revs, checkout = hg.addbranchrevs(repo, other, branches, | |
3983 | opts.get('rev')) |
|
3983 | opts.get('rev')) | |
3984 |
|
3984 | |||
3985 |
|
3985 | |||
3986 | pullopargs = {} |
|
3986 | pullopargs = {} | |
3987 | if opts.get('bookmark'): |
|
3987 | if opts.get('bookmark'): | |
3988 | if not revs: |
|
3988 | if not revs: | |
3989 | revs = [] |
|
3989 | revs = [] | |
3990 | # The list of bookmark used here is not the one used to actually |
|
3990 | # The list of bookmark used here is not the one used to actually | |
3991 | # update the bookmark name. This can result in the revision pulled |
|
3991 | # update the bookmark name. This can result in the revision pulled | |
3992 | # not ending up with the name of the bookmark because of a race |
|
3992 | # not ending up with the name of the bookmark because of a race | |
3993 | # condition on the server. (See issue 4689 for details) |
|
3993 | # condition on the server. (See issue 4689 for details) | |
3994 | remotebookmarks = other.listkeys('bookmarks') |
|
3994 | remotebookmarks = other.listkeys('bookmarks') | |
3995 | remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks) |
|
3995 | remotebookmarks = bookmarks.unhexlifybookmarks(remotebookmarks) | |
3996 | pullopargs['remotebookmarks'] = remotebookmarks |
|
3996 | pullopargs['remotebookmarks'] = remotebookmarks | |
3997 | for b in opts['bookmark']: |
|
3997 | for b in opts['bookmark']: | |
3998 | b = repo._bookmarks.expandname(b) |
|
3998 | b = repo._bookmarks.expandname(b) | |
3999 | if b not in remotebookmarks: |
|
3999 | if b not in remotebookmarks: | |
4000 | raise error.Abort(_('remote bookmark %s not found!') % b) |
|
4000 | raise error.Abort(_('remote bookmark %s not found!') % b) | |
4001 | revs.append(hex(remotebookmarks[b])) |
|
4001 | revs.append(hex(remotebookmarks[b])) | |
4002 |
|
4002 | |||
4003 | if revs: |
|
4003 | if revs: | |
4004 | try: |
|
4004 | try: | |
4005 | # When 'rev' is a bookmark name, we cannot guarantee that it |
|
4005 | # When 'rev' is a bookmark name, we cannot guarantee that it | |
4006 | # will be updated with that name because of a race condition |
|
4006 | # will be updated with that name because of a race condition | |
4007 | # server side. (See issue 4689 for details) |
|
4007 | # server side. (See issue 4689 for details) | |
4008 | oldrevs = revs |
|
4008 | oldrevs = revs | |
4009 | revs = [] # actually, nodes |
|
4009 | revs = [] # actually, nodes | |
4010 | for r in oldrevs: |
|
4010 | for r in oldrevs: | |
4011 | node = other.lookup(r) |
|
4011 | node = other.lookup(r) | |
4012 | revs.append(node) |
|
4012 | revs.append(node) | |
4013 | if r == checkout: |
|
4013 | if r == checkout: | |
4014 | checkout = node |
|
4014 | checkout = node | |
4015 | except error.CapabilityError: |
|
4015 | except error.CapabilityError: | |
4016 | err = _("other repository doesn't support revision lookup, " |
|
4016 | err = _("other repository doesn't support revision lookup, " | |
4017 | "so a rev cannot be specified.") |
|
4017 | "so a rev cannot be specified.") | |
4018 | raise error.Abort(err) |
|
4018 | raise error.Abort(err) | |
4019 |
|
4019 | |||
4020 | wlock = util.nullcontextmanager() |
|
4020 | wlock = util.nullcontextmanager() | |
4021 | if opts.get('update'): |
|
4021 | if opts.get('update'): | |
4022 | wlock = repo.wlock() |
|
4022 | wlock = repo.wlock() | |
4023 | with wlock: |
|
4023 | with wlock: | |
4024 | pullopargs.update(opts.get('opargs', {})) |
|
4024 | pullopargs.update(opts.get('opargs', {})) | |
4025 | modheads = exchange.pull(repo, other, heads=revs, |
|
4025 | modheads = exchange.pull(repo, other, heads=revs, | |
4026 | force=opts.get('force'), |
|
4026 | force=opts.get('force'), | |
4027 | bookmarks=opts.get('bookmark', ()), |
|
4027 | bookmarks=opts.get('bookmark', ()), | |
4028 | opargs=pullopargs).cgresult |
|
4028 | opargs=pullopargs).cgresult | |
4029 |
|
4029 | |||
4030 | # brev is a name, which might be a bookmark to be activated at |
|
4030 | # brev is a name, which might be a bookmark to be activated at | |
4031 | # the end of the update. In other words, it is an explicit |
|
4031 | # the end of the update. In other words, it is an explicit | |
4032 | # destination of the update |
|
4032 | # destination of the update | |
4033 | brev = None |
|
4033 | brev = None | |
4034 |
|
4034 | |||
4035 | if checkout: |
|
4035 | if checkout: | |
4036 | checkout = "%d" % repo.changelog.rev(checkout) |
|
4036 | checkout = "%d" % repo.changelog.rev(checkout) | |
4037 |
|
4037 | |||
4038 | # order below depends on implementation of |
|
4038 | # order below depends on implementation of | |
4039 | # hg.addbranchrevs(). opts['bookmark'] is ignored, |
|
4039 | # hg.addbranchrevs(). opts['bookmark'] is ignored, | |
4040 | # because 'checkout' is determined without it. |
|
4040 | # because 'checkout' is determined without it. | |
4041 | if opts.get('rev'): |
|
4041 | if opts.get('rev'): | |
4042 | brev = opts['rev'][0] |
|
4042 | brev = opts['rev'][0] | |
4043 | elif opts.get('branch'): |
|
4043 | elif opts.get('branch'): | |
4044 | brev = opts['branch'][0] |
|
4044 | brev = opts['branch'][0] | |
4045 | else: |
|
4045 | else: | |
4046 | brev = branches[0] |
|
4046 | brev = branches[0] | |
4047 | repo._subtoppath = source |
|
4047 | repo._subtoppath = source | |
4048 | try: |
|
4048 | try: | |
4049 | ret = postincoming(ui, repo, modheads, opts.get('update'), |
|
4049 | ret = postincoming(ui, repo, modheads, opts.get('update'), | |
4050 | checkout, brev) |
|
4050 | checkout, brev) | |
4051 |
|
4051 | |||
4052 | finally: |
|
4052 | finally: | |
4053 | del repo._subtoppath |
|
4053 | del repo._subtoppath | |
4054 |
|
4054 | |||
4055 | finally: |
|
4055 | finally: | |
4056 | other.close() |
|
4056 | other.close() | |
4057 | return ret |
|
4057 | return ret | |
4058 |
|
4058 | |||
4059 | @command('^push', |
|
4059 | @command('^push', | |
4060 | [('f', 'force', None, _('force push')), |
|
4060 | [('f', 'force', None, _('force push')), | |
4061 | ('r', 'rev', [], |
|
4061 | ('r', 'rev', [], | |
4062 | _('a changeset intended to be included in the destination'), |
|
4062 | _('a changeset intended to be included in the destination'), | |
4063 | _('REV')), |
|
4063 | _('REV')), | |
4064 | ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')), |
|
4064 | ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')), | |
4065 | ('b', 'branch', [], |
|
4065 | ('b', 'branch', [], | |
4066 | _('a specific branch you would like to push'), _('BRANCH')), |
|
4066 | _('a specific branch you would like to push'), _('BRANCH')), | |
4067 | ('', 'new-branch', False, _('allow pushing a new branch')), |
|
4067 | ('', 'new-branch', False, _('allow pushing a new branch')), | |
4068 | ('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')), |
|
4068 | ('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')), | |
4069 | ] + remoteopts, |
|
4069 | ] + remoteopts, | |
4070 | _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')) |
|
4070 | _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')) | |
4071 | def push(ui, repo, dest=None, **opts): |
|
4071 | def push(ui, repo, dest=None, **opts): | |
4072 | """push changes to the specified destination |
|
4072 | """push changes to the specified destination | |
4073 |
|
4073 | |||
4074 | Push changesets from the local repository to the specified |
|
4074 | Push changesets from the local repository to the specified | |
4075 | destination. |
|
4075 | destination. | |
4076 |
|
4076 | |||
4077 | This operation is symmetrical to pull: it is identical to a pull |
|
4077 | This operation is symmetrical to pull: it is identical to a pull | |
4078 | in the destination repository from the current one. |
|
4078 | in the destination repository from the current one. | |
4079 |
|
4079 | |||
4080 | By default, push will not allow creation of new heads at the |
|
4080 | By default, push will not allow creation of new heads at the | |
4081 | destination, since multiple heads would make it unclear which head |
|
4081 | destination, since multiple heads would make it unclear which head | |
4082 | to use. In this situation, it is recommended to pull and merge |
|
4082 | to use. In this situation, it is recommended to pull and merge | |
4083 | before pushing. |
|
4083 | before pushing. | |
4084 |
|
4084 | |||
4085 | Use --new-branch if you want to allow push to create a new named |
|
4085 | Use --new-branch if you want to allow push to create a new named | |
4086 | branch that is not present at the destination. This allows you to |
|
4086 | branch that is not present at the destination. This allows you to | |
4087 | only create a new branch without forcing other changes. |
|
4087 | only create a new branch without forcing other changes. | |
4088 |
|
4088 | |||
4089 | .. note:: |
|
4089 | .. note:: | |
4090 |
|
4090 | |||
4091 | Extra care should be taken with the -f/--force option, |
|
4091 | Extra care should be taken with the -f/--force option, | |
4092 | which will push all new heads on all branches, an action which will |
|
4092 | which will push all new heads on all branches, an action which will | |
4093 | almost always cause confusion for collaborators. |
|
4093 | almost always cause confusion for collaborators. | |
4094 |
|
4094 | |||
4095 | If -r/--rev is used, the specified revision and all its ancestors |
|
4095 | If -r/--rev is used, the specified revision and all its ancestors | |
4096 | will be pushed to the remote repository. |
|
4096 | will be pushed to the remote repository. | |
4097 |
|
4097 | |||
4098 | If -B/--bookmark is used, the specified bookmarked revision, its |
|
4098 | If -B/--bookmark is used, the specified bookmarked revision, its | |
4099 | ancestors, and the bookmark will be pushed to the remote |
|
4099 | ancestors, and the bookmark will be pushed to the remote | |
4100 | repository. Specifying ``.`` is equivalent to specifying the active |
|
4100 | repository. Specifying ``.`` is equivalent to specifying the active | |
4101 | bookmark's name. |
|
4101 | bookmark's name. | |
4102 |
|
4102 | |||
4103 | Please see :hg:`help urls` for important details about ``ssh://`` |
|
4103 | Please see :hg:`help urls` for important details about ``ssh://`` | |
4104 | URLs. If DESTINATION is omitted, a default path will be used. |
|
4104 | URLs. If DESTINATION is omitted, a default path will be used. | |
4105 |
|
4105 | |||
4106 | .. container:: verbose |
|
4106 | .. container:: verbose | |
4107 |
|
4107 | |||
4108 | The --pushvars option sends strings to the server that become |
|
4108 | The --pushvars option sends strings to the server that become | |
4109 | environment variables prepended with ``HG_USERVAR_``. For example, |
|
4109 | environment variables prepended with ``HG_USERVAR_``. For example, | |
4110 | ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with |
|
4110 | ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with | |
4111 | ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment. |
|
4111 | ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment. | |
4112 |
|
4112 | |||
4113 | pushvars can provide for user-overridable hooks as well as set debug |
|
4113 | pushvars can provide for user-overridable hooks as well as set debug | |
4114 | levels. One example is having a hook that blocks commits containing |
|
4114 | levels. One example is having a hook that blocks commits containing | |
4115 | conflict markers, but enables the user to override the hook if the file |
|
4115 | conflict markers, but enables the user to override the hook if the file | |
4116 | is using conflict markers for testing purposes or the file format has |
|
4116 | is using conflict markers for testing purposes or the file format has | |
4117 | strings that look like conflict markers. |
|
4117 | strings that look like conflict markers. | |
4118 |
|
4118 | |||
4119 | By default, servers will ignore `--pushvars`. To enable it add the |
|
4119 | By default, servers will ignore `--pushvars`. To enable it add the | |
4120 | following to your configuration file:: |
|
4120 | following to your configuration file:: | |
4121 |
|
4121 | |||
4122 | [push] |
|
4122 | [push] | |
4123 | pushvars.server = true |
|
4123 | pushvars.server = true | |
4124 |
|
4124 | |||
4125 | Returns 0 if push was successful, 1 if nothing to push. |
|
4125 | Returns 0 if push was successful, 1 if nothing to push. | |
4126 | """ |
|
4126 | """ | |
4127 |
|
4127 | |||
4128 | opts = pycompat.byteskwargs(opts) |
|
4128 | opts = pycompat.byteskwargs(opts) | |
4129 | if opts.get('bookmark'): |
|
4129 | if opts.get('bookmark'): | |
4130 | ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push') |
|
4130 | ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push') | |
4131 | for b in opts['bookmark']: |
|
4131 | for b in opts['bookmark']: | |
4132 | # translate -B options to -r so changesets get pushed |
|
4132 | # translate -B options to -r so changesets get pushed | |
4133 | b = repo._bookmarks.expandname(b) |
|
4133 | b = repo._bookmarks.expandname(b) | |
4134 | if b in repo._bookmarks: |
|
4134 | if b in repo._bookmarks: | |
4135 | opts.setdefault('rev', []).append(b) |
|
4135 | opts.setdefault('rev', []).append(b) | |
4136 | else: |
|
4136 | else: | |
4137 | # if we try to push a deleted bookmark, translate it to null |
|
4137 | # if we try to push a deleted bookmark, translate it to null | |
4138 | # this lets simultaneous -r, -b options continue working |
|
4138 | # this lets simultaneous -r, -b options continue working | |
4139 | opts.setdefault('rev', []).append("null") |
|
4139 | opts.setdefault('rev', []).append("null") | |
4140 |
|
4140 | |||
4141 | path = ui.paths.getpath(dest, default=('default-push', 'default')) |
|
4141 | path = ui.paths.getpath(dest, default=('default-push', 'default')) | |
4142 | if not path: |
|
4142 | if not path: | |
4143 | raise error.Abort(_('default repository not configured!'), |
|
4143 | raise error.Abort(_('default repository not configured!'), | |
4144 | hint=_("see 'hg help config.paths'")) |
|
4144 | hint=_("see 'hg help config.paths'")) | |
4145 | dest = path.pushloc or path.loc |
|
4145 | dest = path.pushloc or path.loc | |
4146 | branches = (path.branch, opts.get('branch') or []) |
|
4146 | branches = (path.branch, opts.get('branch') or []) | |
4147 | ui.status(_('pushing to %s\n') % util.hidepassword(dest)) |
|
4147 | ui.status(_('pushing to %s\n') % util.hidepassword(dest)) | |
4148 | revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev')) |
|
4148 | revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev')) | |
4149 | other = hg.peer(repo, opts, dest) |
|
4149 | other = hg.peer(repo, opts, dest) | |
4150 |
|
4150 | |||
4151 | if revs: |
|
4151 | if revs: | |
4152 | revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)] |
|
4152 | revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)] | |
4153 | if not revs: |
|
4153 | if not revs: | |
4154 | raise error.Abort(_("specified revisions evaluate to an empty set"), |
|
4154 | raise error.Abort(_("specified revisions evaluate to an empty set"), | |
4155 | hint=_("use different revision arguments")) |
|
4155 | hint=_("use different revision arguments")) | |
4156 | elif path.pushrev: |
|
4156 | elif path.pushrev: | |
4157 | # It doesn't make any sense to specify ancestor revisions. So limit |
|
4157 | # It doesn't make any sense to specify ancestor revisions. So limit | |
4158 | # to DAG heads to make discovery simpler. |
|
4158 | # to DAG heads to make discovery simpler. | |
4159 | expr = revsetlang.formatspec('heads(%r)', path.pushrev) |
|
4159 | expr = revsetlang.formatspec('heads(%r)', path.pushrev) | |
4160 | revs = scmutil.revrange(repo, [expr]) |
|
4160 | revs = scmutil.revrange(repo, [expr]) | |
4161 | revs = [repo[rev].node() for rev in revs] |
|
4161 | revs = [repo[rev].node() for rev in revs] | |
4162 | if not revs: |
|
4162 | if not revs: | |
4163 | raise error.Abort(_('default push revset for path evaluates to an ' |
|
4163 | raise error.Abort(_('default push revset for path evaluates to an ' | |
4164 | 'empty set')) |
|
4164 | 'empty set')) | |
4165 |
|
4165 | |||
4166 | repo._subtoppath = dest |
|
4166 | repo._subtoppath = dest | |
4167 | try: |
|
4167 | try: | |
4168 | # push subrepos depth-first for coherent ordering |
|
4168 | # push subrepos depth-first for coherent ordering | |
4169 | c = repo[''] |
|
4169 | c = repo['.'] | |
4170 | subs = c.substate # only repos that are committed |
|
4170 | subs = c.substate # only repos that are committed | |
4171 | for s in sorted(subs): |
|
4171 | for s in sorted(subs): | |
4172 | result = c.sub(s).push(opts) |
|
4172 | result = c.sub(s).push(opts) | |
4173 | if result == 0: |
|
4173 | if result == 0: | |
4174 | return not result |
|
4174 | return not result | |
4175 | finally: |
|
4175 | finally: | |
4176 | del repo._subtoppath |
|
4176 | del repo._subtoppath | |
4177 |
|
4177 | |||
4178 | opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it |
|
4178 | opargs = dict(opts.get('opargs', {})) # copy opargs since we may mutate it | |
4179 | opargs.setdefault('pushvars', []).extend(opts.get('pushvars', [])) |
|
4179 | opargs.setdefault('pushvars', []).extend(opts.get('pushvars', [])) | |
4180 |
|
4180 | |||
4181 | pushop = exchange.push(repo, other, opts.get('force'), revs=revs, |
|
4181 | pushop = exchange.push(repo, other, opts.get('force'), revs=revs, | |
4182 | newbranch=opts.get('new_branch'), |
|
4182 | newbranch=opts.get('new_branch'), | |
4183 | bookmarks=opts.get('bookmark', ()), |
|
4183 | bookmarks=opts.get('bookmark', ()), | |
4184 | opargs=opargs) |
|
4184 | opargs=opargs) | |
4185 |
|
4185 | |||
4186 | result = not pushop.cgresult |
|
4186 | result = not pushop.cgresult | |
4187 |
|
4187 | |||
4188 | if pushop.bkresult is not None: |
|
4188 | if pushop.bkresult is not None: | |
4189 | if pushop.bkresult == 2: |
|
4189 | if pushop.bkresult == 2: | |
4190 | result = 2 |
|
4190 | result = 2 | |
4191 | elif not result and pushop.bkresult: |
|
4191 | elif not result and pushop.bkresult: | |
4192 | result = 2 |
|
4192 | result = 2 | |
4193 |
|
4193 | |||
4194 | return result |
|
4194 | return result | |
4195 |
|
4195 | |||
4196 | @command('recover', []) |
|
4196 | @command('recover', []) | |
4197 | def recover(ui, repo): |
|
4197 | def recover(ui, repo): | |
4198 | """roll back an interrupted transaction |
|
4198 | """roll back an interrupted transaction | |
4199 |
|
4199 | |||
4200 | Recover from an interrupted commit or pull. |
|
4200 | Recover from an interrupted commit or pull. | |
4201 |
|
4201 | |||
4202 | This command tries to fix the repository status after an |
|
4202 | This command tries to fix the repository status after an | |
4203 | interrupted operation. It should only be necessary when Mercurial |
|
4203 | interrupted operation. It should only be necessary when Mercurial | |
4204 | suggests it. |
|
4204 | suggests it. | |
4205 |
|
4205 | |||
4206 | Returns 0 if successful, 1 if nothing to recover or verify fails. |
|
4206 | Returns 0 if successful, 1 if nothing to recover or verify fails. | |
4207 | """ |
|
4207 | """ | |
4208 | if repo.recover(): |
|
4208 | if repo.recover(): | |
4209 | return hg.verify(repo) |
|
4209 | return hg.verify(repo) | |
4210 | return 1 |
|
4210 | return 1 | |
4211 |
|
4211 | |||
4212 | @command('^remove|rm', |
|
4212 | @command('^remove|rm', | |
4213 | [('A', 'after', None, _('record delete for missing files')), |
|
4213 | [('A', 'after', None, _('record delete for missing files')), | |
4214 | ('f', 'force', None, |
|
4214 | ('f', 'force', None, | |
4215 | _('forget added files, delete modified files')), |
|
4215 | _('forget added files, delete modified files')), | |
4216 | ] + subrepoopts + walkopts + dryrunopts, |
|
4216 | ] + subrepoopts + walkopts + dryrunopts, | |
4217 | _('[OPTION]... FILE...'), |
|
4217 | _('[OPTION]... FILE...'), | |
4218 | inferrepo=True) |
|
4218 | inferrepo=True) | |
4219 | def remove(ui, repo, *pats, **opts): |
|
4219 | def remove(ui, repo, *pats, **opts): | |
4220 | """remove the specified files on the next commit |
|
4220 | """remove the specified files on the next commit | |
4221 |
|
4221 | |||
4222 | Schedule the indicated files for removal from the current branch. |
|
4222 | Schedule the indicated files for removal from the current branch. | |
4223 |
|
4223 | |||
4224 | This command schedules the files to be removed at the next commit. |
|
4224 | This command schedules the files to be removed at the next commit. | |
4225 | To undo a remove before that, see :hg:`revert`. To undo added |
|
4225 | To undo a remove before that, see :hg:`revert`. To undo added | |
4226 | files, see :hg:`forget`. |
|
4226 | files, see :hg:`forget`. | |
4227 |
|
4227 | |||
4228 | .. container:: verbose |
|
4228 | .. container:: verbose | |
4229 |
|
4229 | |||
4230 | -A/--after can be used to remove only files that have already |
|
4230 | -A/--after can be used to remove only files that have already | |
4231 | been deleted, -f/--force can be used to force deletion, and -Af |
|
4231 | been deleted, -f/--force can be used to force deletion, and -Af | |
4232 | can be used to remove files from the next revision without |
|
4232 | can be used to remove files from the next revision without | |
4233 | deleting them from the working directory. |
|
4233 | deleting them from the working directory. | |
4234 |
|
4234 | |||
4235 | The following table details the behavior of remove for different |
|
4235 | The following table details the behavior of remove for different | |
4236 | file states (columns) and option combinations (rows). The file |
|
4236 | file states (columns) and option combinations (rows). The file | |
4237 | states are Added [A], Clean [C], Modified [M] and Missing [!] |
|
4237 | states are Added [A], Clean [C], Modified [M] and Missing [!] | |
4238 | (as reported by :hg:`status`). The actions are Warn, Remove |
|
4238 | (as reported by :hg:`status`). The actions are Warn, Remove | |
4239 | (from branch) and Delete (from disk): |
|
4239 | (from branch) and Delete (from disk): | |
4240 |
|
4240 | |||
4241 | ========= == == == == |
|
4241 | ========= == == == == | |
4242 | opt/state A C M ! |
|
4242 | opt/state A C M ! | |
4243 | ========= == == == == |
|
4243 | ========= == == == == | |
4244 | none W RD W R |
|
4244 | none W RD W R | |
4245 | -f R RD RD R |
|
4245 | -f R RD RD R | |
4246 | -A W W W R |
|
4246 | -A W W W R | |
4247 | -Af R R R R |
|
4247 | -Af R R R R | |
4248 | ========= == == == == |
|
4248 | ========= == == == == | |
4249 |
|
4249 | |||
4250 | .. note:: |
|
4250 | .. note:: | |
4251 |
|
4251 | |||
4252 | :hg:`remove` never deletes files in Added [A] state from the |
|
4252 | :hg:`remove` never deletes files in Added [A] state from the | |
4253 | working directory, not even if ``--force`` is specified. |
|
4253 | working directory, not even if ``--force`` is specified. | |
4254 |
|
4254 | |||
4255 | Returns 0 on success, 1 if any warnings encountered. |
|
4255 | Returns 0 on success, 1 if any warnings encountered. | |
4256 | """ |
|
4256 | """ | |
4257 |
|
4257 | |||
4258 | opts = pycompat.byteskwargs(opts) |
|
4258 | opts = pycompat.byteskwargs(opts) | |
4259 | after, force = opts.get('after'), opts.get('force') |
|
4259 | after, force = opts.get('after'), opts.get('force') | |
4260 | dryrun = opts.get('dry_run') |
|
4260 | dryrun = opts.get('dry_run') | |
4261 | if not pats and not after: |
|
4261 | if not pats and not after: | |
4262 | raise error.Abort(_('no files specified')) |
|
4262 | raise error.Abort(_('no files specified')) | |
4263 |
|
4263 | |||
4264 | m = scmutil.match(repo[None], pats, opts) |
|
4264 | m = scmutil.match(repo[None], pats, opts) | |
4265 | subrepos = opts.get('subrepos') |
|
4265 | subrepos = opts.get('subrepos') | |
4266 | return cmdutil.remove(ui, repo, m, "", after, force, subrepos, |
|
4266 | return cmdutil.remove(ui, repo, m, "", after, force, subrepos, | |
4267 | dryrun=dryrun) |
|
4267 | dryrun=dryrun) | |
4268 |
|
4268 | |||
4269 | @command('rename|move|mv', |
|
4269 | @command('rename|move|mv', | |
4270 | [('A', 'after', None, _('record a rename that has already occurred')), |
|
4270 | [('A', 'after', None, _('record a rename that has already occurred')), | |
4271 | ('f', 'force', None, _('forcibly copy over an existing managed file')), |
|
4271 | ('f', 'force', None, _('forcibly copy over an existing managed file')), | |
4272 | ] + walkopts + dryrunopts, |
|
4272 | ] + walkopts + dryrunopts, | |
4273 | _('[OPTION]... SOURCE... DEST')) |
|
4273 | _('[OPTION]... SOURCE... DEST')) | |
4274 | def rename(ui, repo, *pats, **opts): |
|
4274 | def rename(ui, repo, *pats, **opts): | |
4275 | """rename files; equivalent of copy + remove |
|
4275 | """rename files; equivalent of copy + remove | |
4276 |
|
4276 | |||
4277 | Mark dest as copies of sources; mark sources for deletion. If dest |
|
4277 | Mark dest as copies of sources; mark sources for deletion. If dest | |
4278 | is a directory, copies are put in that directory. If dest is a |
|
4278 | is a directory, copies are put in that directory. If dest is a | |
4279 | file, there can only be one source. |
|
4279 | file, there can only be one source. | |
4280 |
|
4280 | |||
4281 | By default, this command copies the contents of files as they |
|
4281 | By default, this command copies the contents of files as they | |
4282 | exist in the working directory. If invoked with -A/--after, the |
|
4282 | exist in the working directory. If invoked with -A/--after, the | |
4283 | operation is recorded, but no copying is performed. |
|
4283 | operation is recorded, but no copying is performed. | |
4284 |
|
4284 | |||
4285 | This command takes effect at the next commit. To undo a rename |
|
4285 | This command takes effect at the next commit. To undo a rename | |
4286 | before that, see :hg:`revert`. |
|
4286 | before that, see :hg:`revert`. | |
4287 |
|
4287 | |||
4288 | Returns 0 on success, 1 if errors are encountered. |
|
4288 | Returns 0 on success, 1 if errors are encountered. | |
4289 | """ |
|
4289 | """ | |
4290 | opts = pycompat.byteskwargs(opts) |
|
4290 | opts = pycompat.byteskwargs(opts) | |
4291 | with repo.wlock(False): |
|
4291 | with repo.wlock(False): | |
4292 | return cmdutil.copy(ui, repo, pats, opts, rename=True) |
|
4292 | return cmdutil.copy(ui, repo, pats, opts, rename=True) | |
4293 |
|
4293 | |||
4294 | @command('resolve', |
|
4294 | @command('resolve', | |
4295 | [('a', 'all', None, _('select all unresolved files')), |
|
4295 | [('a', 'all', None, _('select all unresolved files')), | |
4296 | ('l', 'list', None, _('list state of files needing merge')), |
|
4296 | ('l', 'list', None, _('list state of files needing merge')), | |
4297 | ('m', 'mark', None, _('mark files as resolved')), |
|
4297 | ('m', 'mark', None, _('mark files as resolved')), | |
4298 | ('u', 'unmark', None, _('mark files as unresolved')), |
|
4298 | ('u', 'unmark', None, _('mark files as unresolved')), | |
4299 | ('n', 'no-status', None, _('hide status prefix'))] |
|
4299 | ('n', 'no-status', None, _('hide status prefix'))] | |
4300 | + mergetoolopts + walkopts + formatteropts, |
|
4300 | + mergetoolopts + walkopts + formatteropts, | |
4301 | _('[OPTION]... [FILE]...'), |
|
4301 | _('[OPTION]... [FILE]...'), | |
4302 | inferrepo=True) |
|
4302 | inferrepo=True) | |
4303 | def resolve(ui, repo, *pats, **opts): |
|
4303 | def resolve(ui, repo, *pats, **opts): | |
4304 | """redo merges or set/view the merge status of files |
|
4304 | """redo merges or set/view the merge status of files | |
4305 |
|
4305 | |||
4306 | Merges with unresolved conflicts are often the result of |
|
4306 | Merges with unresolved conflicts are often the result of | |
4307 | non-interactive merging using the ``internal:merge`` configuration |
|
4307 | non-interactive merging using the ``internal:merge`` configuration | |
4308 | setting, or a command-line merge tool like ``diff3``. The resolve |
|
4308 | setting, or a command-line merge tool like ``diff3``. The resolve | |
4309 | command is used to manage the files involved in a merge, after |
|
4309 | command is used to manage the files involved in a merge, after | |
4310 | :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the |
|
4310 | :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the | |
4311 | working directory must have two parents). See :hg:`help |
|
4311 | working directory must have two parents). See :hg:`help | |
4312 | merge-tools` for information on configuring merge tools. |
|
4312 | merge-tools` for information on configuring merge tools. | |
4313 |
|
4313 | |||
4314 | The resolve command can be used in the following ways: |
|
4314 | The resolve command can be used in the following ways: | |
4315 |
|
4315 | |||
4316 | - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified |
|
4316 | - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified | |
4317 | files, discarding any previous merge attempts. Re-merging is not |
|
4317 | files, discarding any previous merge attempts. Re-merging is not | |
4318 | performed for files already marked as resolved. Use ``--all/-a`` |
|
4318 | performed for files already marked as resolved. Use ``--all/-a`` | |
4319 | to select all unresolved files. ``--tool`` can be used to specify |
|
4319 | to select all unresolved files. ``--tool`` can be used to specify | |
4320 | the merge tool used for the given files. It overrides the HGMERGE |
|
4320 | the merge tool used for the given files. It overrides the HGMERGE | |
4321 | environment variable and your configuration files. Previous file |
|
4321 | environment variable and your configuration files. Previous file | |
4322 | contents are saved with a ``.orig`` suffix. |
|
4322 | contents are saved with a ``.orig`` suffix. | |
4323 |
|
4323 | |||
4324 | - :hg:`resolve -m [FILE]`: mark a file as having been resolved |
|
4324 | - :hg:`resolve -m [FILE]`: mark a file as having been resolved | |
4325 | (e.g. after having manually fixed-up the files). The default is |
|
4325 | (e.g. after having manually fixed-up the files). The default is | |
4326 | to mark all unresolved files. |
|
4326 | to mark all unresolved files. | |
4327 |
|
4327 | |||
4328 | - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The |
|
4328 | - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The | |
4329 | default is to mark all resolved files. |
|
4329 | default is to mark all resolved files. | |
4330 |
|
4330 | |||
4331 | - :hg:`resolve -l`: list files which had or still have conflicts. |
|
4331 | - :hg:`resolve -l`: list files which had or still have conflicts. | |
4332 | In the printed list, ``U`` = unresolved and ``R`` = resolved. |
|
4332 | In the printed list, ``U`` = unresolved and ``R`` = resolved. | |
4333 | You can use ``set:unresolved()`` or ``set:resolved()`` to filter |
|
4333 | You can use ``set:unresolved()`` or ``set:resolved()`` to filter | |
4334 | the list. See :hg:`help filesets` for details. |
|
4334 | the list. See :hg:`help filesets` for details. | |
4335 |
|
4335 | |||
4336 | .. note:: |
|
4336 | .. note:: | |
4337 |
|
4337 | |||
4338 | Mercurial will not let you commit files with unresolved merge |
|
4338 | Mercurial will not let you commit files with unresolved merge | |
4339 | conflicts. You must use :hg:`resolve -m ...` before you can |
|
4339 | conflicts. You must use :hg:`resolve -m ...` before you can | |
4340 | commit after a conflicting merge. |
|
4340 | commit after a conflicting merge. | |
4341 |
|
4341 | |||
4342 | Returns 0 on success, 1 if any files fail a resolve attempt. |
|
4342 | Returns 0 on success, 1 if any files fail a resolve attempt. | |
4343 | """ |
|
4343 | """ | |
4344 |
|
4344 | |||
4345 | opts = pycompat.byteskwargs(opts) |
|
4345 | opts = pycompat.byteskwargs(opts) | |
4346 | flaglist = 'all mark unmark list no_status'.split() |
|
4346 | flaglist = 'all mark unmark list no_status'.split() | |
4347 | all, mark, unmark, show, nostatus = \ |
|
4347 | all, mark, unmark, show, nostatus = \ | |
4348 | [opts.get(o) for o in flaglist] |
|
4348 | [opts.get(o) for o in flaglist] | |
4349 |
|
4349 | |||
4350 | if (show and (mark or unmark)) or (mark and unmark): |
|
4350 | if (show and (mark or unmark)) or (mark and unmark): | |
4351 | raise error.Abort(_("too many options specified")) |
|
4351 | raise error.Abort(_("too many options specified")) | |
4352 | if pats and all: |
|
4352 | if pats and all: | |
4353 | raise error.Abort(_("can't specify --all and patterns")) |
|
4353 | raise error.Abort(_("can't specify --all and patterns")) | |
4354 | if not (all or pats or show or mark or unmark): |
|
4354 | if not (all or pats or show or mark or unmark): | |
4355 | raise error.Abort(_('no files or directories specified'), |
|
4355 | raise error.Abort(_('no files or directories specified'), | |
4356 | hint=('use --all to re-merge all unresolved files')) |
|
4356 | hint=('use --all to re-merge all unresolved files')) | |
4357 |
|
4357 | |||
4358 | if show: |
|
4358 | if show: | |
4359 | ui.pager('resolve') |
|
4359 | ui.pager('resolve') | |
4360 | fm = ui.formatter('resolve', opts) |
|
4360 | fm = ui.formatter('resolve', opts) | |
4361 | ms = mergemod.mergestate.read(repo) |
|
4361 | ms = mergemod.mergestate.read(repo) | |
4362 | m = scmutil.match(repo[None], pats, opts) |
|
4362 | m = scmutil.match(repo[None], pats, opts) | |
4363 |
|
4363 | |||
4364 | # Labels and keys based on merge state. Unresolved path conflicts show |
|
4364 | # Labels and keys based on merge state. Unresolved path conflicts show | |
4365 | # as 'P'. Resolved path conflicts show as 'R', the same as normal |
|
4365 | # as 'P'. Resolved path conflicts show as 'R', the same as normal | |
4366 | # resolved conflicts. |
|
4366 | # resolved conflicts. | |
4367 | mergestateinfo = { |
|
4367 | mergestateinfo = { | |
4368 | mergemod.MERGE_RECORD_UNRESOLVED: ('resolve.unresolved', 'U'), |
|
4368 | mergemod.MERGE_RECORD_UNRESOLVED: ('resolve.unresolved', 'U'), | |
4369 | mergemod.MERGE_RECORD_RESOLVED: ('resolve.resolved', 'R'), |
|
4369 | mergemod.MERGE_RECORD_RESOLVED: ('resolve.resolved', 'R'), | |
4370 | mergemod.MERGE_RECORD_UNRESOLVED_PATH: ('resolve.unresolved', 'P'), |
|
4370 | mergemod.MERGE_RECORD_UNRESOLVED_PATH: ('resolve.unresolved', 'P'), | |
4371 | mergemod.MERGE_RECORD_RESOLVED_PATH: ('resolve.resolved', 'R'), |
|
4371 | mergemod.MERGE_RECORD_RESOLVED_PATH: ('resolve.resolved', 'R'), | |
4372 | mergemod.MERGE_RECORD_DRIVER_RESOLVED: ('resolve.driverresolved', |
|
4372 | mergemod.MERGE_RECORD_DRIVER_RESOLVED: ('resolve.driverresolved', | |
4373 | 'D'), |
|
4373 | 'D'), | |
4374 | } |
|
4374 | } | |
4375 |
|
4375 | |||
4376 | for f in ms: |
|
4376 | for f in ms: | |
4377 | if not m(f): |
|
4377 | if not m(f): | |
4378 | continue |
|
4378 | continue | |
4379 |
|
4379 | |||
4380 | label, key = mergestateinfo[ms[f]] |
|
4380 | label, key = mergestateinfo[ms[f]] | |
4381 | fm.startitem() |
|
4381 | fm.startitem() | |
4382 | fm.condwrite(not nostatus, 'status', '%s ', key, label=label) |
|
4382 | fm.condwrite(not nostatus, 'status', '%s ', key, label=label) | |
4383 | fm.write('path', '%s\n', f, label=label) |
|
4383 | fm.write('path', '%s\n', f, label=label) | |
4384 | fm.end() |
|
4384 | fm.end() | |
4385 | return 0 |
|
4385 | return 0 | |
4386 |
|
4386 | |||
4387 | with repo.wlock(): |
|
4387 | with repo.wlock(): | |
4388 | ms = mergemod.mergestate.read(repo) |
|
4388 | ms = mergemod.mergestate.read(repo) | |
4389 |
|
4389 | |||
4390 | if not (ms.active() or repo.dirstate.p2() != nullid): |
|
4390 | if not (ms.active() or repo.dirstate.p2() != nullid): | |
4391 | raise error.Abort( |
|
4391 | raise error.Abort( | |
4392 | _('resolve command not applicable when not merging')) |
|
4392 | _('resolve command not applicable when not merging')) | |
4393 |
|
4393 | |||
4394 | wctx = repo[None] |
|
4394 | wctx = repo[None] | |
4395 |
|
4395 | |||
4396 | if (ms.mergedriver |
|
4396 | if (ms.mergedriver | |
4397 | and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED): |
|
4397 | and ms.mdstate() == mergemod.MERGE_DRIVER_STATE_UNMARKED): | |
4398 | proceed = mergemod.driverpreprocess(repo, ms, wctx) |
|
4398 | proceed = mergemod.driverpreprocess(repo, ms, wctx) | |
4399 | ms.commit() |
|
4399 | ms.commit() | |
4400 | # allow mark and unmark to go through |
|
4400 | # allow mark and unmark to go through | |
4401 | if not mark and not unmark and not proceed: |
|
4401 | if not mark and not unmark and not proceed: | |
4402 | return 1 |
|
4402 | return 1 | |
4403 |
|
4403 | |||
4404 | m = scmutil.match(wctx, pats, opts) |
|
4404 | m = scmutil.match(wctx, pats, opts) | |
4405 | ret = 0 |
|
4405 | ret = 0 | |
4406 | didwork = False |
|
4406 | didwork = False | |
4407 | runconclude = False |
|
4407 | runconclude = False | |
4408 |
|
4408 | |||
4409 | tocomplete = [] |
|
4409 | tocomplete = [] | |
4410 | for f in ms: |
|
4410 | for f in ms: | |
4411 | if not m(f): |
|
4411 | if not m(f): | |
4412 | continue |
|
4412 | continue | |
4413 |
|
4413 | |||
4414 | didwork = True |
|
4414 | didwork = True | |
4415 |
|
4415 | |||
4416 | # don't let driver-resolved files be marked, and run the conclude |
|
4416 | # don't let driver-resolved files be marked, and run the conclude | |
4417 | # step if asked to resolve |
|
4417 | # step if asked to resolve | |
4418 | if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED: |
|
4418 | if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED: | |
4419 | exact = m.exact(f) |
|
4419 | exact = m.exact(f) | |
4420 | if mark: |
|
4420 | if mark: | |
4421 | if exact: |
|
4421 | if exact: | |
4422 | ui.warn(_('not marking %s as it is driver-resolved\n') |
|
4422 | ui.warn(_('not marking %s as it is driver-resolved\n') | |
4423 | % f) |
|
4423 | % f) | |
4424 | elif unmark: |
|
4424 | elif unmark: | |
4425 | if exact: |
|
4425 | if exact: | |
4426 | ui.warn(_('not unmarking %s as it is driver-resolved\n') |
|
4426 | ui.warn(_('not unmarking %s as it is driver-resolved\n') | |
4427 | % f) |
|
4427 | % f) | |
4428 | else: |
|
4428 | else: | |
4429 | runconclude = True |
|
4429 | runconclude = True | |
4430 | continue |
|
4430 | continue | |
4431 |
|
4431 | |||
4432 | # path conflicts must be resolved manually |
|
4432 | # path conflicts must be resolved manually | |
4433 | if ms[f] in (mergemod.MERGE_RECORD_UNRESOLVED_PATH, |
|
4433 | if ms[f] in (mergemod.MERGE_RECORD_UNRESOLVED_PATH, | |
4434 | mergemod.MERGE_RECORD_RESOLVED_PATH): |
|
4434 | mergemod.MERGE_RECORD_RESOLVED_PATH): | |
4435 | if mark: |
|
4435 | if mark: | |
4436 | ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH) |
|
4436 | ms.mark(f, mergemod.MERGE_RECORD_RESOLVED_PATH) | |
4437 | elif unmark: |
|
4437 | elif unmark: | |
4438 | ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH) |
|
4438 | ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED_PATH) | |
4439 | elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH: |
|
4439 | elif ms[f] == mergemod.MERGE_RECORD_UNRESOLVED_PATH: | |
4440 | ui.warn(_('%s: path conflict must be resolved manually\n') |
|
4440 | ui.warn(_('%s: path conflict must be resolved manually\n') | |
4441 | % f) |
|
4441 | % f) | |
4442 | continue |
|
4442 | continue | |
4443 |
|
4443 | |||
4444 | if mark: |
|
4444 | if mark: | |
4445 | ms.mark(f, mergemod.MERGE_RECORD_RESOLVED) |
|
4445 | ms.mark(f, mergemod.MERGE_RECORD_RESOLVED) | |
4446 | elif unmark: |
|
4446 | elif unmark: | |
4447 | ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED) |
|
4447 | ms.mark(f, mergemod.MERGE_RECORD_UNRESOLVED) | |
4448 | else: |
|
4448 | else: | |
4449 | # backup pre-resolve (merge uses .orig for its own purposes) |
|
4449 | # backup pre-resolve (merge uses .orig for its own purposes) | |
4450 | a = repo.wjoin(f) |
|
4450 | a = repo.wjoin(f) | |
4451 | try: |
|
4451 | try: | |
4452 | util.copyfile(a, a + ".resolve") |
|
4452 | util.copyfile(a, a + ".resolve") | |
4453 | except (IOError, OSError) as inst: |
|
4453 | except (IOError, OSError) as inst: | |
4454 | if inst.errno != errno.ENOENT: |
|
4454 | if inst.errno != errno.ENOENT: | |
4455 | raise |
|
4455 | raise | |
4456 |
|
4456 | |||
4457 | try: |
|
4457 | try: | |
4458 | # preresolve file |
|
4458 | # preresolve file | |
4459 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
4459 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | |
4460 | 'resolve') |
|
4460 | 'resolve') | |
4461 | complete, r = ms.preresolve(f, wctx) |
|
4461 | complete, r = ms.preresolve(f, wctx) | |
4462 | if not complete: |
|
4462 | if not complete: | |
4463 | tocomplete.append(f) |
|
4463 | tocomplete.append(f) | |
4464 | elif r: |
|
4464 | elif r: | |
4465 | ret = 1 |
|
4465 | ret = 1 | |
4466 | finally: |
|
4466 | finally: | |
4467 | ui.setconfig('ui', 'forcemerge', '', 'resolve') |
|
4467 | ui.setconfig('ui', 'forcemerge', '', 'resolve') | |
4468 | ms.commit() |
|
4468 | ms.commit() | |
4469 |
|
4469 | |||
4470 | # replace filemerge's .orig file with our resolve file, but only |
|
4470 | # replace filemerge's .orig file with our resolve file, but only | |
4471 | # for merges that are complete |
|
4471 | # for merges that are complete | |
4472 | if complete: |
|
4472 | if complete: | |
4473 | try: |
|
4473 | try: | |
4474 | util.rename(a + ".resolve", |
|
4474 | util.rename(a + ".resolve", | |
4475 | scmutil.origpath(ui, repo, a)) |
|
4475 | scmutil.origpath(ui, repo, a)) | |
4476 | except OSError as inst: |
|
4476 | except OSError as inst: | |
4477 | if inst.errno != errno.ENOENT: |
|
4477 | if inst.errno != errno.ENOENT: | |
4478 | raise |
|
4478 | raise | |
4479 |
|
4479 | |||
4480 | for f in tocomplete: |
|
4480 | for f in tocomplete: | |
4481 | try: |
|
4481 | try: | |
4482 | # resolve file |
|
4482 | # resolve file | |
4483 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
4483 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | |
4484 | 'resolve') |
|
4484 | 'resolve') | |
4485 | r = ms.resolve(f, wctx) |
|
4485 | r = ms.resolve(f, wctx) | |
4486 | if r: |
|
4486 | if r: | |
4487 | ret = 1 |
|
4487 | ret = 1 | |
4488 | finally: |
|
4488 | finally: | |
4489 | ui.setconfig('ui', 'forcemerge', '', 'resolve') |
|
4489 | ui.setconfig('ui', 'forcemerge', '', 'resolve') | |
4490 | ms.commit() |
|
4490 | ms.commit() | |
4491 |
|
4491 | |||
4492 | # replace filemerge's .orig file with our resolve file |
|
4492 | # replace filemerge's .orig file with our resolve file | |
4493 | a = repo.wjoin(f) |
|
4493 | a = repo.wjoin(f) | |
4494 | try: |
|
4494 | try: | |
4495 | util.rename(a + ".resolve", scmutil.origpath(ui, repo, a)) |
|
4495 | util.rename(a + ".resolve", scmutil.origpath(ui, repo, a)) | |
4496 | except OSError as inst: |
|
4496 | except OSError as inst: | |
4497 | if inst.errno != errno.ENOENT: |
|
4497 | if inst.errno != errno.ENOENT: | |
4498 | raise |
|
4498 | raise | |
4499 |
|
4499 | |||
4500 | ms.commit() |
|
4500 | ms.commit() | |
4501 | ms.recordactions() |
|
4501 | ms.recordactions() | |
4502 |
|
4502 | |||
4503 | if not didwork and pats: |
|
4503 | if not didwork and pats: | |
4504 | hint = None |
|
4504 | hint = None | |
4505 | if not any([p for p in pats if p.find(':') >= 0]): |
|
4505 | if not any([p for p in pats if p.find(':') >= 0]): | |
4506 | pats = ['path:%s' % p for p in pats] |
|
4506 | pats = ['path:%s' % p for p in pats] | |
4507 | m = scmutil.match(wctx, pats, opts) |
|
4507 | m = scmutil.match(wctx, pats, opts) | |
4508 | for f in ms: |
|
4508 | for f in ms: | |
4509 | if not m(f): |
|
4509 | if not m(f): | |
4510 | continue |
|
4510 | continue | |
4511 | flags = ''.join(['-%s ' % o[0:1] for o in flaglist |
|
4511 | flags = ''.join(['-%s ' % o[0:1] for o in flaglist | |
4512 | if opts.get(o)]) |
|
4512 | if opts.get(o)]) | |
4513 | hint = _("(try: hg resolve %s%s)\n") % ( |
|
4513 | hint = _("(try: hg resolve %s%s)\n") % ( | |
4514 | flags, |
|
4514 | flags, | |
4515 | ' '.join(pats)) |
|
4515 | ' '.join(pats)) | |
4516 | break |
|
4516 | break | |
4517 | ui.warn(_("arguments do not match paths that need resolving\n")) |
|
4517 | ui.warn(_("arguments do not match paths that need resolving\n")) | |
4518 | if hint: |
|
4518 | if hint: | |
4519 | ui.warn(hint) |
|
4519 | ui.warn(hint) | |
4520 | elif ms.mergedriver and ms.mdstate() != 's': |
|
4520 | elif ms.mergedriver and ms.mdstate() != 's': | |
4521 | # run conclude step when either a driver-resolved file is requested |
|
4521 | # run conclude step when either a driver-resolved file is requested | |
4522 | # or there are no driver-resolved files |
|
4522 | # or there are no driver-resolved files | |
4523 | # we can't use 'ret' to determine whether any files are unresolved |
|
4523 | # we can't use 'ret' to determine whether any files are unresolved | |
4524 | # because we might not have tried to resolve some |
|
4524 | # because we might not have tried to resolve some | |
4525 | if ((runconclude or not list(ms.driverresolved())) |
|
4525 | if ((runconclude or not list(ms.driverresolved())) | |
4526 | and not list(ms.unresolved())): |
|
4526 | and not list(ms.unresolved())): | |
4527 | proceed = mergemod.driverconclude(repo, ms, wctx) |
|
4527 | proceed = mergemod.driverconclude(repo, ms, wctx) | |
4528 | ms.commit() |
|
4528 | ms.commit() | |
4529 | if not proceed: |
|
4529 | if not proceed: | |
4530 | return 1 |
|
4530 | return 1 | |
4531 |
|
4531 | |||
4532 | # Nudge users into finishing an unfinished operation |
|
4532 | # Nudge users into finishing an unfinished operation | |
4533 | unresolvedf = list(ms.unresolved()) |
|
4533 | unresolvedf = list(ms.unresolved()) | |
4534 | driverresolvedf = list(ms.driverresolved()) |
|
4534 | driverresolvedf = list(ms.driverresolved()) | |
4535 | if not unresolvedf and not driverresolvedf: |
|
4535 | if not unresolvedf and not driverresolvedf: | |
4536 | ui.status(_('(no more unresolved files)\n')) |
|
4536 | ui.status(_('(no more unresolved files)\n')) | |
4537 | cmdutil.checkafterresolved(repo) |
|
4537 | cmdutil.checkafterresolved(repo) | |
4538 | elif not unresolvedf: |
|
4538 | elif not unresolvedf: | |
4539 | ui.status(_('(no more unresolved files -- ' |
|
4539 | ui.status(_('(no more unresolved files -- ' | |
4540 | 'run "hg resolve --all" to conclude)\n')) |
|
4540 | 'run "hg resolve --all" to conclude)\n')) | |
4541 |
|
4541 | |||
4542 | return ret |
|
4542 | return ret | |
4543 |
|
4543 | |||
4544 | @command('revert', |
|
4544 | @command('revert', | |
4545 | [('a', 'all', None, _('revert all changes when no arguments given')), |
|
4545 | [('a', 'all', None, _('revert all changes when no arguments given')), | |
4546 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), |
|
4546 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), | |
4547 | ('r', 'rev', '', _('revert to the specified revision'), _('REV')), |
|
4547 | ('r', 'rev', '', _('revert to the specified revision'), _('REV')), | |
4548 | ('C', 'no-backup', None, _('do not save backup copies of files')), |
|
4548 | ('C', 'no-backup', None, _('do not save backup copies of files')), | |
4549 | ('i', 'interactive', None, _('interactively select the changes')), |
|
4549 | ('i', 'interactive', None, _('interactively select the changes')), | |
4550 | ] + walkopts + dryrunopts, |
|
4550 | ] + walkopts + dryrunopts, | |
4551 | _('[OPTION]... [-r REV] [NAME]...')) |
|
4551 | _('[OPTION]... [-r REV] [NAME]...')) | |
4552 | def revert(ui, repo, *pats, **opts): |
|
4552 | def revert(ui, repo, *pats, **opts): | |
4553 | """restore files to their checkout state |
|
4553 | """restore files to their checkout state | |
4554 |
|
4554 | |||
4555 | .. note:: |
|
4555 | .. note:: | |
4556 |
|
4556 | |||
4557 | To check out earlier revisions, you should use :hg:`update REV`. |
|
4557 | To check out earlier revisions, you should use :hg:`update REV`. | |
4558 | To cancel an uncommitted merge (and lose your changes), |
|
4558 | To cancel an uncommitted merge (and lose your changes), | |
4559 | use :hg:`merge --abort`. |
|
4559 | use :hg:`merge --abort`. | |
4560 |
|
4560 | |||
4561 | With no revision specified, revert the specified files or directories |
|
4561 | With no revision specified, revert the specified files or directories | |
4562 | to the contents they had in the parent of the working directory. |
|
4562 | to the contents they had in the parent of the working directory. | |
4563 | This restores the contents of files to an unmodified |
|
4563 | This restores the contents of files to an unmodified | |
4564 | state and unschedules adds, removes, copies, and renames. If the |
|
4564 | state and unschedules adds, removes, copies, and renames. If the | |
4565 | working directory has two parents, you must explicitly specify a |
|
4565 | working directory has two parents, you must explicitly specify a | |
4566 | revision. |
|
4566 | revision. | |
4567 |
|
4567 | |||
4568 | Using the -r/--rev or -d/--date options, revert the given files or |
|
4568 | Using the -r/--rev or -d/--date options, revert the given files or | |
4569 | directories to their states as of a specific revision. Because |
|
4569 | directories to their states as of a specific revision. Because | |
4570 | revert does not change the working directory parents, this will |
|
4570 | revert does not change the working directory parents, this will | |
4571 | cause these files to appear modified. This can be helpful to "back |
|
4571 | cause these files to appear modified. This can be helpful to "back | |
4572 | out" some or all of an earlier change. See :hg:`backout` for a |
|
4572 | out" some or all of an earlier change. See :hg:`backout` for a | |
4573 | related method. |
|
4573 | related method. | |
4574 |
|
4574 | |||
4575 | Modified files are saved with a .orig suffix before reverting. |
|
4575 | Modified files are saved with a .orig suffix before reverting. | |
4576 | To disable these backups, use --no-backup. It is possible to store |
|
4576 | To disable these backups, use --no-backup. It is possible to store | |
4577 | the backup files in a custom directory relative to the root of the |
|
4577 | the backup files in a custom directory relative to the root of the | |
4578 | repository by setting the ``ui.origbackuppath`` configuration |
|
4578 | repository by setting the ``ui.origbackuppath`` configuration | |
4579 | option. |
|
4579 | option. | |
4580 |
|
4580 | |||
4581 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
4581 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
4582 |
|
4582 | |||
4583 | See :hg:`help backout` for a way to reverse the effect of an |
|
4583 | See :hg:`help backout` for a way to reverse the effect of an | |
4584 | earlier changeset. |
|
4584 | earlier changeset. | |
4585 |
|
4585 | |||
4586 | Returns 0 on success. |
|
4586 | Returns 0 on success. | |
4587 | """ |
|
4587 | """ | |
4588 |
|
4588 | |||
4589 | opts = pycompat.byteskwargs(opts) |
|
4589 | opts = pycompat.byteskwargs(opts) | |
4590 | if opts.get("date"): |
|
4590 | if opts.get("date"): | |
4591 | if opts.get("rev"): |
|
4591 | if opts.get("rev"): | |
4592 | raise error.Abort(_("you can't specify a revision and a date")) |
|
4592 | raise error.Abort(_("you can't specify a revision and a date")) | |
4593 | opts["rev"] = cmdutil.finddate(ui, repo, opts["date"]) |
|
4593 | opts["rev"] = cmdutil.finddate(ui, repo, opts["date"]) | |
4594 |
|
4594 | |||
4595 | parent, p2 = repo.dirstate.parents() |
|
4595 | parent, p2 = repo.dirstate.parents() | |
4596 | if not opts.get('rev') and p2 != nullid: |
|
4596 | if not opts.get('rev') and p2 != nullid: | |
4597 | # revert after merge is a trap for new users (issue2915) |
|
4597 | # revert after merge is a trap for new users (issue2915) | |
4598 | raise error.Abort(_('uncommitted merge with no revision specified'), |
|
4598 | raise error.Abort(_('uncommitted merge with no revision specified'), | |
4599 | hint=_("use 'hg update' or see 'hg help revert'")) |
|
4599 | hint=_("use 'hg update' or see 'hg help revert'")) | |
4600 |
|
4600 | |||
4601 | rev = opts.get('rev') |
|
4601 | rev = opts.get('rev') | |
4602 | if rev: |
|
4602 | if rev: | |
4603 | repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
|
4603 | repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') | |
4604 | ctx = scmutil.revsingle(repo, rev) |
|
4604 | ctx = scmutil.revsingle(repo, rev) | |
4605 |
|
4605 | |||
4606 | if (not (pats or opts.get('include') or opts.get('exclude') or |
|
4606 | if (not (pats or opts.get('include') or opts.get('exclude') or | |
4607 | opts.get('all') or opts.get('interactive'))): |
|
4607 | opts.get('all') or opts.get('interactive'))): | |
4608 | msg = _("no files or directories specified") |
|
4608 | msg = _("no files or directories specified") | |
4609 | if p2 != nullid: |
|
4609 | if p2 != nullid: | |
4610 | hint = _("uncommitted merge, use --all to discard all changes," |
|
4610 | hint = _("uncommitted merge, use --all to discard all changes," | |
4611 | " or 'hg update -C .' to abort the merge") |
|
4611 | " or 'hg update -C .' to abort the merge") | |
4612 | raise error.Abort(msg, hint=hint) |
|
4612 | raise error.Abort(msg, hint=hint) | |
4613 | dirty = any(repo.status()) |
|
4613 | dirty = any(repo.status()) | |
4614 | node = ctx.node() |
|
4614 | node = ctx.node() | |
4615 | if node != parent: |
|
4615 | if node != parent: | |
4616 | if dirty: |
|
4616 | if dirty: | |
4617 | hint = _("uncommitted changes, use --all to discard all" |
|
4617 | hint = _("uncommitted changes, use --all to discard all" | |
4618 | " changes, or 'hg update %s' to update") % ctx.rev() |
|
4618 | " changes, or 'hg update %s' to update") % ctx.rev() | |
4619 | else: |
|
4619 | else: | |
4620 | hint = _("use --all to revert all files," |
|
4620 | hint = _("use --all to revert all files," | |
4621 | " or 'hg update %s' to update") % ctx.rev() |
|
4621 | " or 'hg update %s' to update") % ctx.rev() | |
4622 | elif dirty: |
|
4622 | elif dirty: | |
4623 | hint = _("uncommitted changes, use --all to discard all changes") |
|
4623 | hint = _("uncommitted changes, use --all to discard all changes") | |
4624 | else: |
|
4624 | else: | |
4625 | hint = _("use --all to revert all files") |
|
4625 | hint = _("use --all to revert all files") | |
4626 | raise error.Abort(msg, hint=hint) |
|
4626 | raise error.Abort(msg, hint=hint) | |
4627 |
|
4627 | |||
4628 | return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, |
|
4628 | return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, | |
4629 | **pycompat.strkwargs(opts)) |
|
4629 | **pycompat.strkwargs(opts)) | |
4630 |
|
4630 | |||
4631 | @command('rollback', dryrunopts + |
|
4631 | @command('rollback', dryrunopts + | |
4632 | [('f', 'force', False, _('ignore safety measures'))]) |
|
4632 | [('f', 'force', False, _('ignore safety measures'))]) | |
4633 | def rollback(ui, repo, **opts): |
|
4633 | def rollback(ui, repo, **opts): | |
4634 | """roll back the last transaction (DANGEROUS) (DEPRECATED) |
|
4634 | """roll back the last transaction (DANGEROUS) (DEPRECATED) | |
4635 |
|
4635 | |||
4636 | Please use :hg:`commit --amend` instead of rollback to correct |
|
4636 | Please use :hg:`commit --amend` instead of rollback to correct | |
4637 | mistakes in the last commit. |
|
4637 | mistakes in the last commit. | |
4638 |
|
4638 | |||
4639 | This command should be used with care. There is only one level of |
|
4639 | This command should be used with care. There is only one level of | |
4640 | rollback, and there is no way to undo a rollback. It will also |
|
4640 | rollback, and there is no way to undo a rollback. It will also | |
4641 | restore the dirstate at the time of the last transaction, losing |
|
4641 | restore the dirstate at the time of the last transaction, losing | |
4642 | any dirstate changes since that time. This command does not alter |
|
4642 | any dirstate changes since that time. This command does not alter | |
4643 | the working directory. |
|
4643 | the working directory. | |
4644 |
|
4644 | |||
4645 | Transactions are used to encapsulate the effects of all commands |
|
4645 | Transactions are used to encapsulate the effects of all commands | |
4646 | that create new changesets or propagate existing changesets into a |
|
4646 | that create new changesets or propagate existing changesets into a | |
4647 | repository. |
|
4647 | repository. | |
4648 |
|
4648 | |||
4649 | .. container:: verbose |
|
4649 | .. container:: verbose | |
4650 |
|
4650 | |||
4651 | For example, the following commands are transactional, and their |
|
4651 | For example, the following commands are transactional, and their | |
4652 | effects can be rolled back: |
|
4652 | effects can be rolled back: | |
4653 |
|
4653 | |||
4654 | - commit |
|
4654 | - commit | |
4655 | - import |
|
4655 | - import | |
4656 | - pull |
|
4656 | - pull | |
4657 | - push (with this repository as the destination) |
|
4657 | - push (with this repository as the destination) | |
4658 | - unbundle |
|
4658 | - unbundle | |
4659 |
|
4659 | |||
4660 | To avoid permanent data loss, rollback will refuse to rollback a |
|
4660 | To avoid permanent data loss, rollback will refuse to rollback a | |
4661 | commit transaction if it isn't checked out. Use --force to |
|
4661 | commit transaction if it isn't checked out. Use --force to | |
4662 | override this protection. |
|
4662 | override this protection. | |
4663 |
|
4663 | |||
4664 | The rollback command can be entirely disabled by setting the |
|
4664 | The rollback command can be entirely disabled by setting the | |
4665 | ``ui.rollback`` configuration setting to false. If you're here |
|
4665 | ``ui.rollback`` configuration setting to false. If you're here | |
4666 | because you want to use rollback and it's disabled, you can |
|
4666 | because you want to use rollback and it's disabled, you can | |
4667 | re-enable the command by setting ``ui.rollback`` to true. |
|
4667 | re-enable the command by setting ``ui.rollback`` to true. | |
4668 |
|
4668 | |||
4669 | This command is not intended for use on public repositories. Once |
|
4669 | This command is not intended for use on public repositories. Once | |
4670 | changes are visible for pull by other users, rolling a transaction |
|
4670 | changes are visible for pull by other users, rolling a transaction | |
4671 | back locally is ineffective (someone else may already have pulled |
|
4671 | back locally is ineffective (someone else may already have pulled | |
4672 | the changes). Furthermore, a race is possible with readers of the |
|
4672 | the changes). Furthermore, a race is possible with readers of the | |
4673 | repository; for example an in-progress pull from the repository |
|
4673 | repository; for example an in-progress pull from the repository | |
4674 | may fail if a rollback is performed. |
|
4674 | may fail if a rollback is performed. | |
4675 |
|
4675 | |||
4676 | Returns 0 on success, 1 if no rollback data is available. |
|
4676 | Returns 0 on success, 1 if no rollback data is available. | |
4677 | """ |
|
4677 | """ | |
4678 | if not ui.configbool('ui', 'rollback'): |
|
4678 | if not ui.configbool('ui', 'rollback'): | |
4679 | raise error.Abort(_('rollback is disabled because it is unsafe'), |
|
4679 | raise error.Abort(_('rollback is disabled because it is unsafe'), | |
4680 | hint=('see `hg help -v rollback` for information')) |
|
4680 | hint=('see `hg help -v rollback` for information')) | |
4681 | return repo.rollback(dryrun=opts.get(r'dry_run'), |
|
4681 | return repo.rollback(dryrun=opts.get(r'dry_run'), | |
4682 | force=opts.get(r'force')) |
|
4682 | force=opts.get(r'force')) | |
4683 |
|
4683 | |||
4684 | @command('root', [], cmdtype=readonly) |
|
4684 | @command('root', [], cmdtype=readonly) | |
4685 | def root(ui, repo): |
|
4685 | def root(ui, repo): | |
4686 | """print the root (top) of the current working directory |
|
4686 | """print the root (top) of the current working directory | |
4687 |
|
4687 | |||
4688 | Print the root directory of the current repository. |
|
4688 | Print the root directory of the current repository. | |
4689 |
|
4689 | |||
4690 | Returns 0 on success. |
|
4690 | Returns 0 on success. | |
4691 | """ |
|
4691 | """ | |
4692 | ui.write(repo.root + "\n") |
|
4692 | ui.write(repo.root + "\n") | |
4693 |
|
4693 | |||
4694 | @command('^serve', |
|
4694 | @command('^serve', | |
4695 | [('A', 'accesslog', '', _('name of access log file to write to'), |
|
4695 | [('A', 'accesslog', '', _('name of access log file to write to'), | |
4696 | _('FILE')), |
|
4696 | _('FILE')), | |
4697 | ('d', 'daemon', None, _('run server in background')), |
|
4697 | ('d', 'daemon', None, _('run server in background')), | |
4698 | ('', 'daemon-postexec', [], _('used internally by daemon mode')), |
|
4698 | ('', 'daemon-postexec', [], _('used internally by daemon mode')), | |
4699 | ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')), |
|
4699 | ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')), | |
4700 | # use string type, then we can check if something was passed |
|
4700 | # use string type, then we can check if something was passed | |
4701 | ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')), |
|
4701 | ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')), | |
4702 | ('a', 'address', '', _('address to listen on (default: all interfaces)'), |
|
4702 | ('a', 'address', '', _('address to listen on (default: all interfaces)'), | |
4703 | _('ADDR')), |
|
4703 | _('ADDR')), | |
4704 | ('', 'prefix', '', _('prefix path to serve from (default: server root)'), |
|
4704 | ('', 'prefix', '', _('prefix path to serve from (default: server root)'), | |
4705 | _('PREFIX')), |
|
4705 | _('PREFIX')), | |
4706 | ('n', 'name', '', |
|
4706 | ('n', 'name', '', | |
4707 | _('name to show in web pages (default: working directory)'), _('NAME')), |
|
4707 | _('name to show in web pages (default: working directory)'), _('NAME')), | |
4708 | ('', 'web-conf', '', |
|
4708 | ('', 'web-conf', '', | |
4709 | _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')), |
|
4709 | _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')), | |
4710 | ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'), |
|
4710 | ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'), | |
4711 | _('FILE')), |
|
4711 | _('FILE')), | |
4712 | ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')), |
|
4712 | ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')), | |
4713 | ('', 'stdio', None, _('for remote clients (ADVANCED)')), |
|
4713 | ('', 'stdio', None, _('for remote clients (ADVANCED)')), | |
4714 | ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')), |
|
4714 | ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')), | |
4715 | ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')), |
|
4715 | ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')), | |
4716 | ('', 'style', '', _('template style to use'), _('STYLE')), |
|
4716 | ('', 'style', '', _('template style to use'), _('STYLE')), | |
4717 | ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')), |
|
4717 | ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')), | |
4718 | ('', 'certificate', '', _('SSL certificate file'), _('FILE'))] |
|
4718 | ('', 'certificate', '', _('SSL certificate file'), _('FILE'))] | |
4719 | + subrepoopts, |
|
4719 | + subrepoopts, | |
4720 | _('[OPTION]...'), |
|
4720 | _('[OPTION]...'), | |
4721 | optionalrepo=True) |
|
4721 | optionalrepo=True) | |
4722 | def serve(ui, repo, **opts): |
|
4722 | def serve(ui, repo, **opts): | |
4723 | """start stand-alone webserver |
|
4723 | """start stand-alone webserver | |
4724 |
|
4724 | |||
4725 | Start a local HTTP repository browser and pull server. You can use |
|
4725 | Start a local HTTP repository browser and pull server. You can use | |
4726 | this for ad-hoc sharing and browsing of repositories. It is |
|
4726 | this for ad-hoc sharing and browsing of repositories. It is | |
4727 | recommended to use a real web server to serve a repository for |
|
4727 | recommended to use a real web server to serve a repository for | |
4728 | longer periods of time. |
|
4728 | longer periods of time. | |
4729 |
|
4729 | |||
4730 | Please note that the server does not implement access control. |
|
4730 | Please note that the server does not implement access control. | |
4731 | This means that, by default, anybody can read from the server and |
|
4731 | This means that, by default, anybody can read from the server and | |
4732 | nobody can write to it by default. Set the ``web.allow-push`` |
|
4732 | nobody can write to it by default. Set the ``web.allow-push`` | |
4733 | option to ``*`` to allow everybody to push to the server. You |
|
4733 | option to ``*`` to allow everybody to push to the server. You | |
4734 | should use a real web server if you need to authenticate users. |
|
4734 | should use a real web server if you need to authenticate users. | |
4735 |
|
4735 | |||
4736 | By default, the server logs accesses to stdout and errors to |
|
4736 | By default, the server logs accesses to stdout and errors to | |
4737 | stderr. Use the -A/--accesslog and -E/--errorlog options to log to |
|
4737 | stderr. Use the -A/--accesslog and -E/--errorlog options to log to | |
4738 | files. |
|
4738 | files. | |
4739 |
|
4739 | |||
4740 | To have the server choose a free port number to listen on, specify |
|
4740 | To have the server choose a free port number to listen on, specify | |
4741 | a port number of 0; in this case, the server will print the port |
|
4741 | a port number of 0; in this case, the server will print the port | |
4742 | number it uses. |
|
4742 | number it uses. | |
4743 |
|
4743 | |||
4744 | Returns 0 on success. |
|
4744 | Returns 0 on success. | |
4745 | """ |
|
4745 | """ | |
4746 |
|
4746 | |||
4747 | opts = pycompat.byteskwargs(opts) |
|
4747 | opts = pycompat.byteskwargs(opts) | |
4748 | if opts["stdio"] and opts["cmdserver"]: |
|
4748 | if opts["stdio"] and opts["cmdserver"]: | |
4749 | raise error.Abort(_("cannot use --stdio with --cmdserver")) |
|
4749 | raise error.Abort(_("cannot use --stdio with --cmdserver")) | |
4750 |
|
4750 | |||
4751 | if opts["stdio"]: |
|
4751 | if opts["stdio"]: | |
4752 | if repo is None: |
|
4752 | if repo is None: | |
4753 | raise error.RepoError(_("there is no Mercurial repository here" |
|
4753 | raise error.RepoError(_("there is no Mercurial repository here" | |
4754 | " (.hg not found)")) |
|
4754 | " (.hg not found)")) | |
4755 | s = wireprotoserver.sshserver(ui, repo) |
|
4755 | s = wireprotoserver.sshserver(ui, repo) | |
4756 | s.serve_forever() |
|
4756 | s.serve_forever() | |
4757 |
|
4757 | |||
4758 | service = server.createservice(ui, repo, opts) |
|
4758 | service = server.createservice(ui, repo, opts) | |
4759 | return server.runservice(opts, initfn=service.init, runfn=service.run) |
|
4759 | return server.runservice(opts, initfn=service.init, runfn=service.run) | |
4760 |
|
4760 | |||
4761 | @command('^status|st', |
|
4761 | @command('^status|st', | |
4762 | [('A', 'all', None, _('show status of all files')), |
|
4762 | [('A', 'all', None, _('show status of all files')), | |
4763 | ('m', 'modified', None, _('show only modified files')), |
|
4763 | ('m', 'modified', None, _('show only modified files')), | |
4764 | ('a', 'added', None, _('show only added files')), |
|
4764 | ('a', 'added', None, _('show only added files')), | |
4765 | ('r', 'removed', None, _('show only removed files')), |
|
4765 | ('r', 'removed', None, _('show only removed files')), | |
4766 | ('d', 'deleted', None, _('show only deleted (but tracked) files')), |
|
4766 | ('d', 'deleted', None, _('show only deleted (but tracked) files')), | |
4767 | ('c', 'clean', None, _('show only files without changes')), |
|
4767 | ('c', 'clean', None, _('show only files without changes')), | |
4768 | ('u', 'unknown', None, _('show only unknown (not tracked) files')), |
|
4768 | ('u', 'unknown', None, _('show only unknown (not tracked) files')), | |
4769 | ('i', 'ignored', None, _('show only ignored files')), |
|
4769 | ('i', 'ignored', None, _('show only ignored files')), | |
4770 | ('n', 'no-status', None, _('hide status prefix')), |
|
4770 | ('n', 'no-status', None, _('hide status prefix')), | |
4771 | ('t', 'terse', '', _('show the terse output (EXPERIMENTAL)')), |
|
4771 | ('t', 'terse', '', _('show the terse output (EXPERIMENTAL)')), | |
4772 | ('C', 'copies', None, _('show source of copied files')), |
|
4772 | ('C', 'copies', None, _('show source of copied files')), | |
4773 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), |
|
4773 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), | |
4774 | ('', 'rev', [], _('show difference from revision'), _('REV')), |
|
4774 | ('', 'rev', [], _('show difference from revision'), _('REV')), | |
4775 | ('', 'change', '', _('list the changed files of a revision'), _('REV')), |
|
4775 | ('', 'change', '', _('list the changed files of a revision'), _('REV')), | |
4776 | ] + walkopts + subrepoopts + formatteropts, |
|
4776 | ] + walkopts + subrepoopts + formatteropts, | |
4777 | _('[OPTION]... [FILE]...'), |
|
4777 | _('[OPTION]... [FILE]...'), | |
4778 | inferrepo=True, cmdtype=readonly) |
|
4778 | inferrepo=True, cmdtype=readonly) | |
4779 | def status(ui, repo, *pats, **opts): |
|
4779 | def status(ui, repo, *pats, **opts): | |
4780 | """show changed files in the working directory |
|
4780 | """show changed files in the working directory | |
4781 |
|
4781 | |||
4782 | Show status of files in the repository. If names are given, only |
|
4782 | Show status of files in the repository. If names are given, only | |
4783 | files that match are shown. Files that are clean or ignored or |
|
4783 | files that match are shown. Files that are clean or ignored or | |
4784 | the source of a copy/move operation, are not listed unless |
|
4784 | the source of a copy/move operation, are not listed unless | |
4785 | -c/--clean, -i/--ignored, -C/--copies or -A/--all are given. |
|
4785 | -c/--clean, -i/--ignored, -C/--copies or -A/--all are given. | |
4786 | Unless options described with "show only ..." are given, the |
|
4786 | Unless options described with "show only ..." are given, the | |
4787 | options -mardu are used. |
|
4787 | options -mardu are used. | |
4788 |
|
4788 | |||
4789 | Option -q/--quiet hides untracked (unknown and ignored) files |
|
4789 | Option -q/--quiet hides untracked (unknown and ignored) files | |
4790 | unless explicitly requested with -u/--unknown or -i/--ignored. |
|
4790 | unless explicitly requested with -u/--unknown or -i/--ignored. | |
4791 |
|
4791 | |||
4792 | .. note:: |
|
4792 | .. note:: | |
4793 |
|
4793 | |||
4794 | :hg:`status` may appear to disagree with diff if permissions have |
|
4794 | :hg:`status` may appear to disagree with diff if permissions have | |
4795 | changed or a merge has occurred. The standard diff format does |
|
4795 | changed or a merge has occurred. The standard diff format does | |
4796 | not report permission changes and diff only reports changes |
|
4796 | not report permission changes and diff only reports changes | |
4797 | relative to one merge parent. |
|
4797 | relative to one merge parent. | |
4798 |
|
4798 | |||
4799 | If one revision is given, it is used as the base revision. |
|
4799 | If one revision is given, it is used as the base revision. | |
4800 | If two revisions are given, the differences between them are |
|
4800 | If two revisions are given, the differences between them are | |
4801 | shown. The --change option can also be used as a shortcut to list |
|
4801 | shown. The --change option can also be used as a shortcut to list | |
4802 | the changed files of a revision from its first parent. |
|
4802 | the changed files of a revision from its first parent. | |
4803 |
|
4803 | |||
4804 | The codes used to show the status of files are:: |
|
4804 | The codes used to show the status of files are:: | |
4805 |
|
4805 | |||
4806 | M = modified |
|
4806 | M = modified | |
4807 | A = added |
|
4807 | A = added | |
4808 | R = removed |
|
4808 | R = removed | |
4809 | C = clean |
|
4809 | C = clean | |
4810 | ! = missing (deleted by non-hg command, but still tracked) |
|
4810 | ! = missing (deleted by non-hg command, but still tracked) | |
4811 | ? = not tracked |
|
4811 | ? = not tracked | |
4812 | I = ignored |
|
4812 | I = ignored | |
4813 | = origin of the previous file (with --copies) |
|
4813 | = origin of the previous file (with --copies) | |
4814 |
|
4814 | |||
4815 | .. container:: verbose |
|
4815 | .. container:: verbose | |
4816 |
|
4816 | |||
4817 | The -t/--terse option abbreviates the output by showing only the directory |
|
4817 | The -t/--terse option abbreviates the output by showing only the directory | |
4818 | name if all the files in it share the same status. The option takes an |
|
4818 | name if all the files in it share the same status. The option takes an | |
4819 | argument indicating the statuses to abbreviate: 'm' for 'modified', 'a' |
|
4819 | argument indicating the statuses to abbreviate: 'm' for 'modified', 'a' | |
4820 | for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i' |
|
4820 | for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i' | |
4821 | for 'ignored' and 'c' for clean. |
|
4821 | for 'ignored' and 'c' for clean. | |
4822 |
|
4822 | |||
4823 | It abbreviates only those statuses which are passed. Note that clean and |
|
4823 | It abbreviates only those statuses which are passed. Note that clean and | |
4824 | ignored files are not displayed with '--terse ic' unless the -c/--clean |
|
4824 | ignored files are not displayed with '--terse ic' unless the -c/--clean | |
4825 | and -i/--ignored options are also used. |
|
4825 | and -i/--ignored options are also used. | |
4826 |
|
4826 | |||
4827 | The -v/--verbose option shows information when the repository is in an |
|
4827 | The -v/--verbose option shows information when the repository is in an | |
4828 | unfinished merge, shelve, rebase state etc. You can have this behavior |
|
4828 | unfinished merge, shelve, rebase state etc. You can have this behavior | |
4829 | turned on by default by enabling the ``commands.status.verbose`` option. |
|
4829 | turned on by default by enabling the ``commands.status.verbose`` option. | |
4830 |
|
4830 | |||
4831 | You can skip displaying some of these states by setting |
|
4831 | You can skip displaying some of these states by setting | |
4832 | ``commands.status.skipstates`` to one or more of: 'bisect', 'graft', |
|
4832 | ``commands.status.skipstates`` to one or more of: 'bisect', 'graft', | |
4833 | 'histedit', 'merge', 'rebase', or 'unshelve'. |
|
4833 | 'histedit', 'merge', 'rebase', or 'unshelve'. | |
4834 |
|
4834 | |||
4835 | Examples: |
|
4835 | Examples: | |
4836 |
|
4836 | |||
4837 | - show changes in the working directory relative to a |
|
4837 | - show changes in the working directory relative to a | |
4838 | changeset:: |
|
4838 | changeset:: | |
4839 |
|
4839 | |||
4840 | hg status --rev 9353 |
|
4840 | hg status --rev 9353 | |
4841 |
|
4841 | |||
4842 | - show changes in the working directory relative to the |
|
4842 | - show changes in the working directory relative to the | |
4843 | current directory (see :hg:`help patterns` for more information):: |
|
4843 | current directory (see :hg:`help patterns` for more information):: | |
4844 |
|
4844 | |||
4845 | hg status re: |
|
4845 | hg status re: | |
4846 |
|
4846 | |||
4847 | - show all changes including copies in an existing changeset:: |
|
4847 | - show all changes including copies in an existing changeset:: | |
4848 |
|
4848 | |||
4849 | hg status --copies --change 9353 |
|
4849 | hg status --copies --change 9353 | |
4850 |
|
4850 | |||
4851 | - get a NUL separated list of added files, suitable for xargs:: |
|
4851 | - get a NUL separated list of added files, suitable for xargs:: | |
4852 |
|
4852 | |||
4853 | hg status -an0 |
|
4853 | hg status -an0 | |
4854 |
|
4854 | |||
4855 | - show more information about the repository status, abbreviating |
|
4855 | - show more information about the repository status, abbreviating | |
4856 | added, removed, modified, deleted, and untracked paths:: |
|
4856 | added, removed, modified, deleted, and untracked paths:: | |
4857 |
|
4857 | |||
4858 | hg status -v -t mardu |
|
4858 | hg status -v -t mardu | |
4859 |
|
4859 | |||
4860 | Returns 0 on success. |
|
4860 | Returns 0 on success. | |
4861 |
|
4861 | |||
4862 | """ |
|
4862 | """ | |
4863 |
|
4863 | |||
4864 | opts = pycompat.byteskwargs(opts) |
|
4864 | opts = pycompat.byteskwargs(opts) | |
4865 | revs = opts.get('rev') |
|
4865 | revs = opts.get('rev') | |
4866 | change = opts.get('change') |
|
4866 | change = opts.get('change') | |
4867 | terse = opts.get('terse') |
|
4867 | terse = opts.get('terse') | |
4868 |
|
4868 | |||
4869 | if revs and change: |
|
4869 | if revs and change: | |
4870 | msg = _('cannot specify --rev and --change at the same time') |
|
4870 | msg = _('cannot specify --rev and --change at the same time') | |
4871 | raise error.Abort(msg) |
|
4871 | raise error.Abort(msg) | |
4872 | elif revs and terse: |
|
4872 | elif revs and terse: | |
4873 | msg = _('cannot use --terse with --rev') |
|
4873 | msg = _('cannot use --terse with --rev') | |
4874 | raise error.Abort(msg) |
|
4874 | raise error.Abort(msg) | |
4875 | elif change: |
|
4875 | elif change: | |
4876 | repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn') |
|
4876 | repo = scmutil.unhidehashlikerevs(repo, [change], 'nowarn') | |
4877 | node2 = scmutil.revsingle(repo, change, None).node() |
|
4877 | node2 = scmutil.revsingle(repo, change, None).node() | |
4878 | node1 = repo[node2].p1().node() |
|
4878 | node1 = repo[node2].p1().node() | |
4879 | else: |
|
4879 | else: | |
4880 | repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn') |
|
4880 | repo = scmutil.unhidehashlikerevs(repo, revs, 'nowarn') | |
4881 | node1, node2 = scmutil.revpair(repo, revs) |
|
4881 | node1, node2 = scmutil.revpair(repo, revs) | |
4882 |
|
4882 | |||
4883 | if pats or ui.configbool('commands', 'status.relative'): |
|
4883 | if pats or ui.configbool('commands', 'status.relative'): | |
4884 | cwd = repo.getcwd() |
|
4884 | cwd = repo.getcwd() | |
4885 | else: |
|
4885 | else: | |
4886 | cwd = '' |
|
4886 | cwd = '' | |
4887 |
|
4887 | |||
4888 | if opts.get('print0'): |
|
4888 | if opts.get('print0'): | |
4889 | end = '\0' |
|
4889 | end = '\0' | |
4890 | else: |
|
4890 | else: | |
4891 | end = '\n' |
|
4891 | end = '\n' | |
4892 | copy = {} |
|
4892 | copy = {} | |
4893 | states = 'modified added removed deleted unknown ignored clean'.split() |
|
4893 | states = 'modified added removed deleted unknown ignored clean'.split() | |
4894 | show = [k for k in states if opts.get(k)] |
|
4894 | show = [k for k in states if opts.get(k)] | |
4895 | if opts.get('all'): |
|
4895 | if opts.get('all'): | |
4896 | show += ui.quiet and (states[:4] + ['clean']) or states |
|
4896 | show += ui.quiet and (states[:4] + ['clean']) or states | |
4897 |
|
4897 | |||
4898 | if not show: |
|
4898 | if not show: | |
4899 | if ui.quiet: |
|
4899 | if ui.quiet: | |
4900 | show = states[:4] |
|
4900 | show = states[:4] | |
4901 | else: |
|
4901 | else: | |
4902 | show = states[:5] |
|
4902 | show = states[:5] | |
4903 |
|
4903 | |||
4904 | m = scmutil.match(repo[node2], pats, opts) |
|
4904 | m = scmutil.match(repo[node2], pats, opts) | |
4905 | if terse: |
|
4905 | if terse: | |
4906 | # we need to compute clean and unknown to terse |
|
4906 | # we need to compute clean and unknown to terse | |
4907 | stat = repo.status(node1, node2, m, |
|
4907 | stat = repo.status(node1, node2, m, | |
4908 | 'ignored' in show or 'i' in terse, |
|
4908 | 'ignored' in show or 'i' in terse, | |
4909 | True, True, opts.get('subrepos')) |
|
4909 | True, True, opts.get('subrepos')) | |
4910 |
|
4910 | |||
4911 | stat = cmdutil.tersedir(stat, terse) |
|
4911 | stat = cmdutil.tersedir(stat, terse) | |
4912 | else: |
|
4912 | else: | |
4913 | stat = repo.status(node1, node2, m, |
|
4913 | stat = repo.status(node1, node2, m, | |
4914 | 'ignored' in show, 'clean' in show, |
|
4914 | 'ignored' in show, 'clean' in show, | |
4915 | 'unknown' in show, opts.get('subrepos')) |
|
4915 | 'unknown' in show, opts.get('subrepos')) | |
4916 |
|
4916 | |||
4917 | changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat) |
|
4917 | changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat) | |
4918 |
|
4918 | |||
4919 | if (opts.get('all') or opts.get('copies') |
|
4919 | if (opts.get('all') or opts.get('copies') | |
4920 | or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'): |
|
4920 | or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'): | |
4921 | copy = copies.pathcopies(repo[node1], repo[node2], m) |
|
4921 | copy = copies.pathcopies(repo[node1], repo[node2], m) | |
4922 |
|
4922 | |||
4923 | ui.pager('status') |
|
4923 | ui.pager('status') | |
4924 | fm = ui.formatter('status', opts) |
|
4924 | fm = ui.formatter('status', opts) | |
4925 | fmt = '%s' + end |
|
4925 | fmt = '%s' + end | |
4926 | showchar = not opts.get('no_status') |
|
4926 | showchar = not opts.get('no_status') | |
4927 |
|
4927 | |||
4928 | for state, char, files in changestates: |
|
4928 | for state, char, files in changestates: | |
4929 | if state in show: |
|
4929 | if state in show: | |
4930 | label = 'status.' + state |
|
4930 | label = 'status.' + state | |
4931 | for f in files: |
|
4931 | for f in files: | |
4932 | fm.startitem() |
|
4932 | fm.startitem() | |
4933 | fm.condwrite(showchar, 'status', '%s ', char, label=label) |
|
4933 | fm.condwrite(showchar, 'status', '%s ', char, label=label) | |
4934 | fm.write('path', fmt, repo.pathto(f, cwd), label=label) |
|
4934 | fm.write('path', fmt, repo.pathto(f, cwd), label=label) | |
4935 | if f in copy: |
|
4935 | if f in copy: | |
4936 | fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd), |
|
4936 | fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd), | |
4937 | label='status.copied') |
|
4937 | label='status.copied') | |
4938 |
|
4938 | |||
4939 | if ((ui.verbose or ui.configbool('commands', 'status.verbose')) |
|
4939 | if ((ui.verbose or ui.configbool('commands', 'status.verbose')) | |
4940 | and not ui.plain()): |
|
4940 | and not ui.plain()): | |
4941 | cmdutil.morestatus(repo, fm) |
|
4941 | cmdutil.morestatus(repo, fm) | |
4942 | fm.end() |
|
4942 | fm.end() | |
4943 |
|
4943 | |||
4944 | @command('^summary|sum', |
|
4944 | @command('^summary|sum', | |
4945 | [('', 'remote', None, _('check for push and pull'))], |
|
4945 | [('', 'remote', None, _('check for push and pull'))], | |
4946 | '[--remote]', cmdtype=readonly) |
|
4946 | '[--remote]', cmdtype=readonly) | |
4947 | def summary(ui, repo, **opts): |
|
4947 | def summary(ui, repo, **opts): | |
4948 | """summarize working directory state |
|
4948 | """summarize working directory state | |
4949 |
|
4949 | |||
4950 | This generates a brief summary of the working directory state, |
|
4950 | This generates a brief summary of the working directory state, | |
4951 | including parents, branch, commit status, phase and available updates. |
|
4951 | including parents, branch, commit status, phase and available updates. | |
4952 |
|
4952 | |||
4953 | With the --remote option, this will check the default paths for |
|
4953 | With the --remote option, this will check the default paths for | |
4954 | incoming and outgoing changes. This can be time-consuming. |
|
4954 | incoming and outgoing changes. This can be time-consuming. | |
4955 |
|
4955 | |||
4956 | Returns 0 on success. |
|
4956 | Returns 0 on success. | |
4957 | """ |
|
4957 | """ | |
4958 |
|
4958 | |||
4959 | opts = pycompat.byteskwargs(opts) |
|
4959 | opts = pycompat.byteskwargs(opts) | |
4960 | ui.pager('summary') |
|
4960 | ui.pager('summary') | |
4961 | ctx = repo[None] |
|
4961 | ctx = repo[None] | |
4962 | parents = ctx.parents() |
|
4962 | parents = ctx.parents() | |
4963 | pnode = parents[0].node() |
|
4963 | pnode = parents[0].node() | |
4964 | marks = [] |
|
4964 | marks = [] | |
4965 |
|
4965 | |||
4966 | ms = None |
|
4966 | ms = None | |
4967 | try: |
|
4967 | try: | |
4968 | ms = mergemod.mergestate.read(repo) |
|
4968 | ms = mergemod.mergestate.read(repo) | |
4969 | except error.UnsupportedMergeRecords as e: |
|
4969 | except error.UnsupportedMergeRecords as e: | |
4970 | s = ' '.join(e.recordtypes) |
|
4970 | s = ' '.join(e.recordtypes) | |
4971 | ui.warn( |
|
4971 | ui.warn( | |
4972 | _('warning: merge state has unsupported record types: %s\n') % s) |
|
4972 | _('warning: merge state has unsupported record types: %s\n') % s) | |
4973 | unresolved = [] |
|
4973 | unresolved = [] | |
4974 | else: |
|
4974 | else: | |
4975 | unresolved = list(ms.unresolved()) |
|
4975 | unresolved = list(ms.unresolved()) | |
4976 |
|
4976 | |||
4977 | for p in parents: |
|
4977 | for p in parents: | |
4978 | # label with log.changeset (instead of log.parent) since this |
|
4978 | # label with log.changeset (instead of log.parent) since this | |
4979 | # shows a working directory parent *changeset*: |
|
4979 | # shows a working directory parent *changeset*: | |
4980 | # i18n: column positioning for "hg summary" |
|
4980 | # i18n: column positioning for "hg summary" | |
4981 | ui.write(_('parent: %d:%s ') % (p.rev(), p), |
|
4981 | ui.write(_('parent: %d:%s ') % (p.rev(), p), | |
4982 | label=logcmdutil.changesetlabels(p)) |
|
4982 | label=logcmdutil.changesetlabels(p)) | |
4983 | ui.write(' '.join(p.tags()), label='log.tag') |
|
4983 | ui.write(' '.join(p.tags()), label='log.tag') | |
4984 | if p.bookmarks(): |
|
4984 | if p.bookmarks(): | |
4985 | marks.extend(p.bookmarks()) |
|
4985 | marks.extend(p.bookmarks()) | |
4986 | if p.rev() == -1: |
|
4986 | if p.rev() == -1: | |
4987 | if not len(repo): |
|
4987 | if not len(repo): | |
4988 | ui.write(_(' (empty repository)')) |
|
4988 | ui.write(_(' (empty repository)')) | |
4989 | else: |
|
4989 | else: | |
4990 | ui.write(_(' (no revision checked out)')) |
|
4990 | ui.write(_(' (no revision checked out)')) | |
4991 | if p.obsolete(): |
|
4991 | if p.obsolete(): | |
4992 | ui.write(_(' (obsolete)')) |
|
4992 | ui.write(_(' (obsolete)')) | |
4993 | if p.isunstable(): |
|
4993 | if p.isunstable(): | |
4994 | instabilities = (ui.label(instability, 'trouble.%s' % instability) |
|
4994 | instabilities = (ui.label(instability, 'trouble.%s' % instability) | |
4995 | for instability in p.instabilities()) |
|
4995 | for instability in p.instabilities()) | |
4996 | ui.write(' (' |
|
4996 | ui.write(' (' | |
4997 | + ', '.join(instabilities) |
|
4997 | + ', '.join(instabilities) | |
4998 | + ')') |
|
4998 | + ')') | |
4999 | ui.write('\n') |
|
4999 | ui.write('\n') | |
5000 | if p.description(): |
|
5000 | if p.description(): | |
5001 | ui.status(' ' + p.description().splitlines()[0].strip() + '\n', |
|
5001 | ui.status(' ' + p.description().splitlines()[0].strip() + '\n', | |
5002 | label='log.summary') |
|
5002 | label='log.summary') | |
5003 |
|
5003 | |||
5004 | branch = ctx.branch() |
|
5004 | branch = ctx.branch() | |
5005 | bheads = repo.branchheads(branch) |
|
5005 | bheads = repo.branchheads(branch) | |
5006 | # i18n: column positioning for "hg summary" |
|
5006 | # i18n: column positioning for "hg summary" | |
5007 | m = _('branch: %s\n') % branch |
|
5007 | m = _('branch: %s\n') % branch | |
5008 | if branch != 'default': |
|
5008 | if branch != 'default': | |
5009 | ui.write(m, label='log.branch') |
|
5009 | ui.write(m, label='log.branch') | |
5010 | else: |
|
5010 | else: | |
5011 | ui.status(m, label='log.branch') |
|
5011 | ui.status(m, label='log.branch') | |
5012 |
|
5012 | |||
5013 | if marks: |
|
5013 | if marks: | |
5014 | active = repo._activebookmark |
|
5014 | active = repo._activebookmark | |
5015 | # i18n: column positioning for "hg summary" |
|
5015 | # i18n: column positioning for "hg summary" | |
5016 | ui.write(_('bookmarks:'), label='log.bookmark') |
|
5016 | ui.write(_('bookmarks:'), label='log.bookmark') | |
5017 | if active is not None: |
|
5017 | if active is not None: | |
5018 | if active in marks: |
|
5018 | if active in marks: | |
5019 | ui.write(' *' + active, label=bookmarks.activebookmarklabel) |
|
5019 | ui.write(' *' + active, label=bookmarks.activebookmarklabel) | |
5020 | marks.remove(active) |
|
5020 | marks.remove(active) | |
5021 | else: |
|
5021 | else: | |
5022 | ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel) |
|
5022 | ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel) | |
5023 | for m in marks: |
|
5023 | for m in marks: | |
5024 | ui.write(' ' + m, label='log.bookmark') |
|
5024 | ui.write(' ' + m, label='log.bookmark') | |
5025 | ui.write('\n', label='log.bookmark') |
|
5025 | ui.write('\n', label='log.bookmark') | |
5026 |
|
5026 | |||
5027 | status = repo.status(unknown=True) |
|
5027 | status = repo.status(unknown=True) | |
5028 |
|
5028 | |||
5029 | c = repo.dirstate.copies() |
|
5029 | c = repo.dirstate.copies() | |
5030 | copied, renamed = [], [] |
|
5030 | copied, renamed = [], [] | |
5031 | for d, s in c.iteritems(): |
|
5031 | for d, s in c.iteritems(): | |
5032 | if s in status.removed: |
|
5032 | if s in status.removed: | |
5033 | status.removed.remove(s) |
|
5033 | status.removed.remove(s) | |
5034 | renamed.append(d) |
|
5034 | renamed.append(d) | |
5035 | else: |
|
5035 | else: | |
5036 | copied.append(d) |
|
5036 | copied.append(d) | |
5037 | if d in status.added: |
|
5037 | if d in status.added: | |
5038 | status.added.remove(d) |
|
5038 | status.added.remove(d) | |
5039 |
|
5039 | |||
5040 | subs = [s for s in ctx.substate if ctx.sub(s).dirty()] |
|
5040 | subs = [s for s in ctx.substate if ctx.sub(s).dirty()] | |
5041 |
|
5041 | |||
5042 | labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified), |
|
5042 | labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified), | |
5043 | (ui.label(_('%d added'), 'status.added'), status.added), |
|
5043 | (ui.label(_('%d added'), 'status.added'), status.added), | |
5044 | (ui.label(_('%d removed'), 'status.removed'), status.removed), |
|
5044 | (ui.label(_('%d removed'), 'status.removed'), status.removed), | |
5045 | (ui.label(_('%d renamed'), 'status.copied'), renamed), |
|
5045 | (ui.label(_('%d renamed'), 'status.copied'), renamed), | |
5046 | (ui.label(_('%d copied'), 'status.copied'), copied), |
|
5046 | (ui.label(_('%d copied'), 'status.copied'), copied), | |
5047 | (ui.label(_('%d deleted'), 'status.deleted'), status.deleted), |
|
5047 | (ui.label(_('%d deleted'), 'status.deleted'), status.deleted), | |
5048 | (ui.label(_('%d unknown'), 'status.unknown'), status.unknown), |
|
5048 | (ui.label(_('%d unknown'), 'status.unknown'), status.unknown), | |
5049 | (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved), |
|
5049 | (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved), | |
5050 | (ui.label(_('%d subrepos'), 'status.modified'), subs)] |
|
5050 | (ui.label(_('%d subrepos'), 'status.modified'), subs)] | |
5051 | t = [] |
|
5051 | t = [] | |
5052 | for l, s in labels: |
|
5052 | for l, s in labels: | |
5053 | if s: |
|
5053 | if s: | |
5054 | t.append(l % len(s)) |
|
5054 | t.append(l % len(s)) | |
5055 |
|
5055 | |||
5056 | t = ', '.join(t) |
|
5056 | t = ', '.join(t) | |
5057 | cleanworkdir = False |
|
5057 | cleanworkdir = False | |
5058 |
|
5058 | |||
5059 | if repo.vfs.exists('graftstate'): |
|
5059 | if repo.vfs.exists('graftstate'): | |
5060 | t += _(' (graft in progress)') |
|
5060 | t += _(' (graft in progress)') | |
5061 | if repo.vfs.exists('updatestate'): |
|
5061 | if repo.vfs.exists('updatestate'): | |
5062 | t += _(' (interrupted update)') |
|
5062 | t += _(' (interrupted update)') | |
5063 | elif len(parents) > 1: |
|
5063 | elif len(parents) > 1: | |
5064 | t += _(' (merge)') |
|
5064 | t += _(' (merge)') | |
5065 | elif branch != parents[0].branch(): |
|
5065 | elif branch != parents[0].branch(): | |
5066 | t += _(' (new branch)') |
|
5066 | t += _(' (new branch)') | |
5067 | elif (parents[0].closesbranch() and |
|
5067 | elif (parents[0].closesbranch() and | |
5068 | pnode in repo.branchheads(branch, closed=True)): |
|
5068 | pnode in repo.branchheads(branch, closed=True)): | |
5069 | t += _(' (head closed)') |
|
5069 | t += _(' (head closed)') | |
5070 | elif not (status.modified or status.added or status.removed or renamed or |
|
5070 | elif not (status.modified or status.added or status.removed or renamed or | |
5071 | copied or subs): |
|
5071 | copied or subs): | |
5072 | t += _(' (clean)') |
|
5072 | t += _(' (clean)') | |
5073 | cleanworkdir = True |
|
5073 | cleanworkdir = True | |
5074 | elif pnode not in bheads: |
|
5074 | elif pnode not in bheads: | |
5075 | t += _(' (new branch head)') |
|
5075 | t += _(' (new branch head)') | |
5076 |
|
5076 | |||
5077 | if parents: |
|
5077 | if parents: | |
5078 | pendingphase = max(p.phase() for p in parents) |
|
5078 | pendingphase = max(p.phase() for p in parents) | |
5079 | else: |
|
5079 | else: | |
5080 | pendingphase = phases.public |
|
5080 | pendingphase = phases.public | |
5081 |
|
5081 | |||
5082 | if pendingphase > phases.newcommitphase(ui): |
|
5082 | if pendingphase > phases.newcommitphase(ui): | |
5083 | t += ' (%s)' % phases.phasenames[pendingphase] |
|
5083 | t += ' (%s)' % phases.phasenames[pendingphase] | |
5084 |
|
5084 | |||
5085 | if cleanworkdir: |
|
5085 | if cleanworkdir: | |
5086 | # i18n: column positioning for "hg summary" |
|
5086 | # i18n: column positioning for "hg summary" | |
5087 | ui.status(_('commit: %s\n') % t.strip()) |
|
5087 | ui.status(_('commit: %s\n') % t.strip()) | |
5088 | else: |
|
5088 | else: | |
5089 | # i18n: column positioning for "hg summary" |
|
5089 | # i18n: column positioning for "hg summary" | |
5090 | ui.write(_('commit: %s\n') % t.strip()) |
|
5090 | ui.write(_('commit: %s\n') % t.strip()) | |
5091 |
|
5091 | |||
5092 | # all ancestors of branch heads - all ancestors of parent = new csets |
|
5092 | # all ancestors of branch heads - all ancestors of parent = new csets | |
5093 | new = len(repo.changelog.findmissing([pctx.node() for pctx in parents], |
|
5093 | new = len(repo.changelog.findmissing([pctx.node() for pctx in parents], | |
5094 | bheads)) |
|
5094 | bheads)) | |
5095 |
|
5095 | |||
5096 | if new == 0: |
|
5096 | if new == 0: | |
5097 | # i18n: column positioning for "hg summary" |
|
5097 | # i18n: column positioning for "hg summary" | |
5098 | ui.status(_('update: (current)\n')) |
|
5098 | ui.status(_('update: (current)\n')) | |
5099 | elif pnode not in bheads: |
|
5099 | elif pnode not in bheads: | |
5100 | # i18n: column positioning for "hg summary" |
|
5100 | # i18n: column positioning for "hg summary" | |
5101 | ui.write(_('update: %d new changesets (update)\n') % new) |
|
5101 | ui.write(_('update: %d new changesets (update)\n') % new) | |
5102 | else: |
|
5102 | else: | |
5103 | # i18n: column positioning for "hg summary" |
|
5103 | # i18n: column positioning for "hg summary" | |
5104 | ui.write(_('update: %d new changesets, %d branch heads (merge)\n') % |
|
5104 | ui.write(_('update: %d new changesets, %d branch heads (merge)\n') % | |
5105 | (new, len(bheads))) |
|
5105 | (new, len(bheads))) | |
5106 |
|
5106 | |||
5107 | t = [] |
|
5107 | t = [] | |
5108 | draft = len(repo.revs('draft()')) |
|
5108 | draft = len(repo.revs('draft()')) | |
5109 | if draft: |
|
5109 | if draft: | |
5110 | t.append(_('%d draft') % draft) |
|
5110 | t.append(_('%d draft') % draft) | |
5111 | secret = len(repo.revs('secret()')) |
|
5111 | secret = len(repo.revs('secret()')) | |
5112 | if secret: |
|
5112 | if secret: | |
5113 | t.append(_('%d secret') % secret) |
|
5113 | t.append(_('%d secret') % secret) | |
5114 |
|
5114 | |||
5115 | if draft or secret: |
|
5115 | if draft or secret: | |
5116 | ui.status(_('phases: %s\n') % ', '.join(t)) |
|
5116 | ui.status(_('phases: %s\n') % ', '.join(t)) | |
5117 |
|
5117 | |||
5118 | if obsolete.isenabled(repo, obsolete.createmarkersopt): |
|
5118 | if obsolete.isenabled(repo, obsolete.createmarkersopt): | |
5119 | for trouble in ("orphan", "contentdivergent", "phasedivergent"): |
|
5119 | for trouble in ("orphan", "contentdivergent", "phasedivergent"): | |
5120 | numtrouble = len(repo.revs(trouble + "()")) |
|
5120 | numtrouble = len(repo.revs(trouble + "()")) | |
5121 | # We write all the possibilities to ease translation |
|
5121 | # We write all the possibilities to ease translation | |
5122 | troublemsg = { |
|
5122 | troublemsg = { | |
5123 | "orphan": _("orphan: %d changesets"), |
|
5123 | "orphan": _("orphan: %d changesets"), | |
5124 | "contentdivergent": _("content-divergent: %d changesets"), |
|
5124 | "contentdivergent": _("content-divergent: %d changesets"), | |
5125 | "phasedivergent": _("phase-divergent: %d changesets"), |
|
5125 | "phasedivergent": _("phase-divergent: %d changesets"), | |
5126 | } |
|
5126 | } | |
5127 | if numtrouble > 0: |
|
5127 | if numtrouble > 0: | |
5128 | ui.status(troublemsg[trouble] % numtrouble + "\n") |
|
5128 | ui.status(troublemsg[trouble] % numtrouble + "\n") | |
5129 |
|
5129 | |||
5130 | cmdutil.summaryhooks(ui, repo) |
|
5130 | cmdutil.summaryhooks(ui, repo) | |
5131 |
|
5131 | |||
5132 | if opts.get('remote'): |
|
5132 | if opts.get('remote'): | |
5133 | needsincoming, needsoutgoing = True, True |
|
5133 | needsincoming, needsoutgoing = True, True | |
5134 | else: |
|
5134 | else: | |
5135 | needsincoming, needsoutgoing = False, False |
|
5135 | needsincoming, needsoutgoing = False, False | |
5136 | for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None): |
|
5136 | for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None): | |
5137 | if i: |
|
5137 | if i: | |
5138 | needsincoming = True |
|
5138 | needsincoming = True | |
5139 | if o: |
|
5139 | if o: | |
5140 | needsoutgoing = True |
|
5140 | needsoutgoing = True | |
5141 | if not needsincoming and not needsoutgoing: |
|
5141 | if not needsincoming and not needsoutgoing: | |
5142 | return |
|
5142 | return | |
5143 |
|
5143 | |||
5144 | def getincoming(): |
|
5144 | def getincoming(): | |
5145 | source, branches = hg.parseurl(ui.expandpath('default')) |
|
5145 | source, branches = hg.parseurl(ui.expandpath('default')) | |
5146 | sbranch = branches[0] |
|
5146 | sbranch = branches[0] | |
5147 | try: |
|
5147 | try: | |
5148 | other = hg.peer(repo, {}, source) |
|
5148 | other = hg.peer(repo, {}, source) | |
5149 | except error.RepoError: |
|
5149 | except error.RepoError: | |
5150 | if opts.get('remote'): |
|
5150 | if opts.get('remote'): | |
5151 | raise |
|
5151 | raise | |
5152 | return source, sbranch, None, None, None |
|
5152 | return source, sbranch, None, None, None | |
5153 | revs, checkout = hg.addbranchrevs(repo, other, branches, None) |
|
5153 | revs, checkout = hg.addbranchrevs(repo, other, branches, None) | |
5154 | if revs: |
|
5154 | if revs: | |
5155 | revs = [other.lookup(rev) for rev in revs] |
|
5155 | revs = [other.lookup(rev) for rev in revs] | |
5156 | ui.debug('comparing with %s\n' % util.hidepassword(source)) |
|
5156 | ui.debug('comparing with %s\n' % util.hidepassword(source)) | |
5157 | repo.ui.pushbuffer() |
|
5157 | repo.ui.pushbuffer() | |
5158 | commoninc = discovery.findcommonincoming(repo, other, heads=revs) |
|
5158 | commoninc = discovery.findcommonincoming(repo, other, heads=revs) | |
5159 | repo.ui.popbuffer() |
|
5159 | repo.ui.popbuffer() | |
5160 | return source, sbranch, other, commoninc, commoninc[1] |
|
5160 | return source, sbranch, other, commoninc, commoninc[1] | |
5161 |
|
5161 | |||
5162 | if needsincoming: |
|
5162 | if needsincoming: | |
5163 | source, sbranch, sother, commoninc, incoming = getincoming() |
|
5163 | source, sbranch, sother, commoninc, incoming = getincoming() | |
5164 | else: |
|
5164 | else: | |
5165 | source = sbranch = sother = commoninc = incoming = None |
|
5165 | source = sbranch = sother = commoninc = incoming = None | |
5166 |
|
5166 | |||
5167 | def getoutgoing(): |
|
5167 | def getoutgoing(): | |
5168 | dest, branches = hg.parseurl(ui.expandpath('default-push', 'default')) |
|
5168 | dest, branches = hg.parseurl(ui.expandpath('default-push', 'default')) | |
5169 | dbranch = branches[0] |
|
5169 | dbranch = branches[0] | |
5170 | revs, checkout = hg.addbranchrevs(repo, repo, branches, None) |
|
5170 | revs, checkout = hg.addbranchrevs(repo, repo, branches, None) | |
5171 | if source != dest: |
|
5171 | if source != dest: | |
5172 | try: |
|
5172 | try: | |
5173 | dother = hg.peer(repo, {}, dest) |
|
5173 | dother = hg.peer(repo, {}, dest) | |
5174 | except error.RepoError: |
|
5174 | except error.RepoError: | |
5175 | if opts.get('remote'): |
|
5175 | if opts.get('remote'): | |
5176 | raise |
|
5176 | raise | |
5177 | return dest, dbranch, None, None |
|
5177 | return dest, dbranch, None, None | |
5178 | ui.debug('comparing with %s\n' % util.hidepassword(dest)) |
|
5178 | ui.debug('comparing with %s\n' % util.hidepassword(dest)) | |
5179 | elif sother is None: |
|
5179 | elif sother is None: | |
5180 | # there is no explicit destination peer, but source one is invalid |
|
5180 | # there is no explicit destination peer, but source one is invalid | |
5181 | return dest, dbranch, None, None |
|
5181 | return dest, dbranch, None, None | |
5182 | else: |
|
5182 | else: | |
5183 | dother = sother |
|
5183 | dother = sother | |
5184 | if (source != dest or (sbranch is not None and sbranch != dbranch)): |
|
5184 | if (source != dest or (sbranch is not None and sbranch != dbranch)): | |
5185 | common = None |
|
5185 | common = None | |
5186 | else: |
|
5186 | else: | |
5187 | common = commoninc |
|
5187 | common = commoninc | |
5188 | if revs: |
|
5188 | if revs: | |
5189 | revs = [repo.lookup(rev) for rev in revs] |
|
5189 | revs = [repo.lookup(rev) for rev in revs] | |
5190 | repo.ui.pushbuffer() |
|
5190 | repo.ui.pushbuffer() | |
5191 | outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs, |
|
5191 | outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs, | |
5192 | commoninc=common) |
|
5192 | commoninc=common) | |
5193 | repo.ui.popbuffer() |
|
5193 | repo.ui.popbuffer() | |
5194 | return dest, dbranch, dother, outgoing |
|
5194 | return dest, dbranch, dother, outgoing | |
5195 |
|
5195 | |||
5196 | if needsoutgoing: |
|
5196 | if needsoutgoing: | |
5197 | dest, dbranch, dother, outgoing = getoutgoing() |
|
5197 | dest, dbranch, dother, outgoing = getoutgoing() | |
5198 | else: |
|
5198 | else: | |
5199 | dest = dbranch = dother = outgoing = None |
|
5199 | dest = dbranch = dother = outgoing = None | |
5200 |
|
5200 | |||
5201 | if opts.get('remote'): |
|
5201 | if opts.get('remote'): | |
5202 | t = [] |
|
5202 | t = [] | |
5203 | if incoming: |
|
5203 | if incoming: | |
5204 | t.append(_('1 or more incoming')) |
|
5204 | t.append(_('1 or more incoming')) | |
5205 | o = outgoing.missing |
|
5205 | o = outgoing.missing | |
5206 | if o: |
|
5206 | if o: | |
5207 | t.append(_('%d outgoing') % len(o)) |
|
5207 | t.append(_('%d outgoing') % len(o)) | |
5208 | other = dother or sother |
|
5208 | other = dother or sother | |
5209 | if 'bookmarks' in other.listkeys('namespaces'): |
|
5209 | if 'bookmarks' in other.listkeys('namespaces'): | |
5210 | counts = bookmarks.summary(repo, other) |
|
5210 | counts = bookmarks.summary(repo, other) | |
5211 | if counts[0] > 0: |
|
5211 | if counts[0] > 0: | |
5212 | t.append(_('%d incoming bookmarks') % counts[0]) |
|
5212 | t.append(_('%d incoming bookmarks') % counts[0]) | |
5213 | if counts[1] > 0: |
|
5213 | if counts[1] > 0: | |
5214 | t.append(_('%d outgoing bookmarks') % counts[1]) |
|
5214 | t.append(_('%d outgoing bookmarks') % counts[1]) | |
5215 |
|
5215 | |||
5216 | if t: |
|
5216 | if t: | |
5217 | # i18n: column positioning for "hg summary" |
|
5217 | # i18n: column positioning for "hg summary" | |
5218 | ui.write(_('remote: %s\n') % (', '.join(t))) |
|
5218 | ui.write(_('remote: %s\n') % (', '.join(t))) | |
5219 | else: |
|
5219 | else: | |
5220 | # i18n: column positioning for "hg summary" |
|
5220 | # i18n: column positioning for "hg summary" | |
5221 | ui.status(_('remote: (synced)\n')) |
|
5221 | ui.status(_('remote: (synced)\n')) | |
5222 |
|
5222 | |||
5223 | cmdutil.summaryremotehooks(ui, repo, opts, |
|
5223 | cmdutil.summaryremotehooks(ui, repo, opts, | |
5224 | ((source, sbranch, sother, commoninc), |
|
5224 | ((source, sbranch, sother, commoninc), | |
5225 | (dest, dbranch, dother, outgoing))) |
|
5225 | (dest, dbranch, dother, outgoing))) | |
5226 |
|
5226 | |||
5227 | @command('tag', |
|
5227 | @command('tag', | |
5228 | [('f', 'force', None, _('force tag')), |
|
5228 | [('f', 'force', None, _('force tag')), | |
5229 | ('l', 'local', None, _('make the tag local')), |
|
5229 | ('l', 'local', None, _('make the tag local')), | |
5230 | ('r', 'rev', '', _('revision to tag'), _('REV')), |
|
5230 | ('r', 'rev', '', _('revision to tag'), _('REV')), | |
5231 | ('', 'remove', None, _('remove a tag')), |
|
5231 | ('', 'remove', None, _('remove a tag')), | |
5232 | # -l/--local is already there, commitopts cannot be used |
|
5232 | # -l/--local is already there, commitopts cannot be used | |
5233 | ('e', 'edit', None, _('invoke editor on commit messages')), |
|
5233 | ('e', 'edit', None, _('invoke editor on commit messages')), | |
5234 | ('m', 'message', '', _('use text as commit message'), _('TEXT')), |
|
5234 | ('m', 'message', '', _('use text as commit message'), _('TEXT')), | |
5235 | ] + commitopts2, |
|
5235 | ] + commitopts2, | |
5236 | _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')) |
|
5236 | _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')) | |
5237 | def tag(ui, repo, name1, *names, **opts): |
|
5237 | def tag(ui, repo, name1, *names, **opts): | |
5238 | """add one or more tags for the current or given revision |
|
5238 | """add one or more tags for the current or given revision | |
5239 |
|
5239 | |||
5240 | Name a particular revision using <name>. |
|
5240 | Name a particular revision using <name>. | |
5241 |
|
5241 | |||
5242 | Tags are used to name particular revisions of the repository and are |
|
5242 | Tags are used to name particular revisions of the repository and are | |
5243 | very useful to compare different revisions, to go back to significant |
|
5243 | very useful to compare different revisions, to go back to significant | |
5244 | earlier versions or to mark branch points as releases, etc. Changing |
|
5244 | earlier versions or to mark branch points as releases, etc. Changing | |
5245 | an existing tag is normally disallowed; use -f/--force to override. |
|
5245 | an existing tag is normally disallowed; use -f/--force to override. | |
5246 |
|
5246 | |||
5247 | If no revision is given, the parent of the working directory is |
|
5247 | If no revision is given, the parent of the working directory is | |
5248 | used. |
|
5248 | used. | |
5249 |
|
5249 | |||
5250 | To facilitate version control, distribution, and merging of tags, |
|
5250 | To facilitate version control, distribution, and merging of tags, | |
5251 | they are stored as a file named ".hgtags" which is managed similarly |
|
5251 | they are stored as a file named ".hgtags" which is managed similarly | |
5252 | to other project files and can be hand-edited if necessary. This |
|
5252 | to other project files and can be hand-edited if necessary. This | |
5253 | also means that tagging creates a new commit. The file |
|
5253 | also means that tagging creates a new commit. The file | |
5254 | ".hg/localtags" is used for local tags (not shared among |
|
5254 | ".hg/localtags" is used for local tags (not shared among | |
5255 | repositories). |
|
5255 | repositories). | |
5256 |
|
5256 | |||
5257 | Tag commits are usually made at the head of a branch. If the parent |
|
5257 | Tag commits are usually made at the head of a branch. If the parent | |
5258 | of the working directory is not a branch head, :hg:`tag` aborts; use |
|
5258 | of the working directory is not a branch head, :hg:`tag` aborts; use | |
5259 | -f/--force to force the tag commit to be based on a non-head |
|
5259 | -f/--force to force the tag commit to be based on a non-head | |
5260 | changeset. |
|
5260 | changeset. | |
5261 |
|
5261 | |||
5262 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
5262 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
5263 |
|
5263 | |||
5264 | Since tag names have priority over branch names during revision |
|
5264 | Since tag names have priority over branch names during revision | |
5265 | lookup, using an existing branch name as a tag name is discouraged. |
|
5265 | lookup, using an existing branch name as a tag name is discouraged. | |
5266 |
|
5266 | |||
5267 | Returns 0 on success. |
|
5267 | Returns 0 on success. | |
5268 | """ |
|
5268 | """ | |
5269 | opts = pycompat.byteskwargs(opts) |
|
5269 | opts = pycompat.byteskwargs(opts) | |
5270 | wlock = lock = None |
|
5270 | wlock = lock = None | |
5271 | try: |
|
5271 | try: | |
5272 | wlock = repo.wlock() |
|
5272 | wlock = repo.wlock() | |
5273 | lock = repo.lock() |
|
5273 | lock = repo.lock() | |
5274 | rev_ = "." |
|
5274 | rev_ = "." | |
5275 | names = [t.strip() for t in (name1,) + names] |
|
5275 | names = [t.strip() for t in (name1,) + names] | |
5276 | if len(names) != len(set(names)): |
|
5276 | if len(names) != len(set(names)): | |
5277 | raise error.Abort(_('tag names must be unique')) |
|
5277 | raise error.Abort(_('tag names must be unique')) | |
5278 | for n in names: |
|
5278 | for n in names: | |
5279 | scmutil.checknewlabel(repo, n, 'tag') |
|
5279 | scmutil.checknewlabel(repo, n, 'tag') | |
5280 | if not n: |
|
5280 | if not n: | |
5281 | raise error.Abort(_('tag names cannot consist entirely of ' |
|
5281 | raise error.Abort(_('tag names cannot consist entirely of ' | |
5282 | 'whitespace')) |
|
5282 | 'whitespace')) | |
5283 | if opts.get('rev') and opts.get('remove'): |
|
5283 | if opts.get('rev') and opts.get('remove'): | |
5284 | raise error.Abort(_("--rev and --remove are incompatible")) |
|
5284 | raise error.Abort(_("--rev and --remove are incompatible")) | |
5285 | if opts.get('rev'): |
|
5285 | if opts.get('rev'): | |
5286 | rev_ = opts['rev'] |
|
5286 | rev_ = opts['rev'] | |
5287 | message = opts.get('message') |
|
5287 | message = opts.get('message') | |
5288 | if opts.get('remove'): |
|
5288 | if opts.get('remove'): | |
5289 | if opts.get('local'): |
|
5289 | if opts.get('local'): | |
5290 | expectedtype = 'local' |
|
5290 | expectedtype = 'local' | |
5291 | else: |
|
5291 | else: | |
5292 | expectedtype = 'global' |
|
5292 | expectedtype = 'global' | |
5293 |
|
5293 | |||
5294 | for n in names: |
|
5294 | for n in names: | |
5295 | if not repo.tagtype(n): |
|
5295 | if not repo.tagtype(n): | |
5296 | raise error.Abort(_("tag '%s' does not exist") % n) |
|
5296 | raise error.Abort(_("tag '%s' does not exist") % n) | |
5297 | if repo.tagtype(n) != expectedtype: |
|
5297 | if repo.tagtype(n) != expectedtype: | |
5298 | if expectedtype == 'global': |
|
5298 | if expectedtype == 'global': | |
5299 | raise error.Abort(_("tag '%s' is not a global tag") % n) |
|
5299 | raise error.Abort(_("tag '%s' is not a global tag") % n) | |
5300 | else: |
|
5300 | else: | |
5301 | raise error.Abort(_("tag '%s' is not a local tag") % n) |
|
5301 | raise error.Abort(_("tag '%s' is not a local tag") % n) | |
5302 | rev_ = 'null' |
|
5302 | rev_ = 'null' | |
5303 | if not message: |
|
5303 | if not message: | |
5304 | # we don't translate commit messages |
|
5304 | # we don't translate commit messages | |
5305 | message = 'Removed tag %s' % ', '.join(names) |
|
5305 | message = 'Removed tag %s' % ', '.join(names) | |
5306 | elif not opts.get('force'): |
|
5306 | elif not opts.get('force'): | |
5307 | for n in names: |
|
5307 | for n in names: | |
5308 | if n in repo.tags(): |
|
5308 | if n in repo.tags(): | |
5309 | raise error.Abort(_("tag '%s' already exists " |
|
5309 | raise error.Abort(_("tag '%s' already exists " | |
5310 | "(use -f to force)") % n) |
|
5310 | "(use -f to force)") % n) | |
5311 | if not opts.get('local'): |
|
5311 | if not opts.get('local'): | |
5312 | p1, p2 = repo.dirstate.parents() |
|
5312 | p1, p2 = repo.dirstate.parents() | |
5313 | if p2 != nullid: |
|
5313 | if p2 != nullid: | |
5314 | raise error.Abort(_('uncommitted merge')) |
|
5314 | raise error.Abort(_('uncommitted merge')) | |
5315 | bheads = repo.branchheads() |
|
5315 | bheads = repo.branchheads() | |
5316 | if not opts.get('force') and bheads and p1 not in bheads: |
|
5316 | if not opts.get('force') and bheads and p1 not in bheads: | |
5317 | raise error.Abort(_('working directory is not at a branch head ' |
|
5317 | raise error.Abort(_('working directory is not at a branch head ' | |
5318 | '(use -f to force)')) |
|
5318 | '(use -f to force)')) | |
5319 | node = scmutil.revsingle(repo, rev_).node() |
|
5319 | node = scmutil.revsingle(repo, rev_).node() | |
5320 |
|
5320 | |||
5321 | if not message: |
|
5321 | if not message: | |
5322 | # we don't translate commit messages |
|
5322 | # we don't translate commit messages | |
5323 | message = ('Added tag %s for changeset %s' % |
|
5323 | message = ('Added tag %s for changeset %s' % | |
5324 | (', '.join(names), short(node))) |
|
5324 | (', '.join(names), short(node))) | |
5325 |
|
5325 | |||
5326 | date = opts.get('date') |
|
5326 | date = opts.get('date') | |
5327 | if date: |
|
5327 | if date: | |
5328 | date = dateutil.parsedate(date) |
|
5328 | date = dateutil.parsedate(date) | |
5329 |
|
5329 | |||
5330 | if opts.get('remove'): |
|
5330 | if opts.get('remove'): | |
5331 | editform = 'tag.remove' |
|
5331 | editform = 'tag.remove' | |
5332 | else: |
|
5332 | else: | |
5333 | editform = 'tag.add' |
|
5333 | editform = 'tag.add' | |
5334 | editor = cmdutil.getcommiteditor(editform=editform, |
|
5334 | editor = cmdutil.getcommiteditor(editform=editform, | |
5335 | **pycompat.strkwargs(opts)) |
|
5335 | **pycompat.strkwargs(opts)) | |
5336 |
|
5336 | |||
5337 | # don't allow tagging the null rev |
|
5337 | # don't allow tagging the null rev | |
5338 | if (not opts.get('remove') and |
|
5338 | if (not opts.get('remove') and | |
5339 | scmutil.revsingle(repo, rev_).rev() == nullrev): |
|
5339 | scmutil.revsingle(repo, rev_).rev() == nullrev): | |
5340 | raise error.Abort(_("cannot tag null revision")) |
|
5340 | raise error.Abort(_("cannot tag null revision")) | |
5341 |
|
5341 | |||
5342 | tagsmod.tag(repo, names, node, message, opts.get('local'), |
|
5342 | tagsmod.tag(repo, names, node, message, opts.get('local'), | |
5343 | opts.get('user'), date, editor=editor) |
|
5343 | opts.get('user'), date, editor=editor) | |
5344 | finally: |
|
5344 | finally: | |
5345 | release(lock, wlock) |
|
5345 | release(lock, wlock) | |
5346 |
|
5346 | |||
5347 | @command('tags', formatteropts, '', cmdtype=readonly) |
|
5347 | @command('tags', formatteropts, '', cmdtype=readonly) | |
5348 | def tags(ui, repo, **opts): |
|
5348 | def tags(ui, repo, **opts): | |
5349 | """list repository tags |
|
5349 | """list repository tags | |
5350 |
|
5350 | |||
5351 | This lists both regular and local tags. When the -v/--verbose |
|
5351 | This lists both regular and local tags. When the -v/--verbose | |
5352 | switch is used, a third column "local" is printed for local tags. |
|
5352 | switch is used, a third column "local" is printed for local tags. | |
5353 | When the -q/--quiet switch is used, only the tag name is printed. |
|
5353 | When the -q/--quiet switch is used, only the tag name is printed. | |
5354 |
|
5354 | |||
5355 | Returns 0 on success. |
|
5355 | Returns 0 on success. | |
5356 | """ |
|
5356 | """ | |
5357 |
|
5357 | |||
5358 | opts = pycompat.byteskwargs(opts) |
|
5358 | opts = pycompat.byteskwargs(opts) | |
5359 | ui.pager('tags') |
|
5359 | ui.pager('tags') | |
5360 | fm = ui.formatter('tags', opts) |
|
5360 | fm = ui.formatter('tags', opts) | |
5361 | hexfunc = fm.hexfunc |
|
5361 | hexfunc = fm.hexfunc | |
5362 | tagtype = "" |
|
5362 | tagtype = "" | |
5363 |
|
5363 | |||
5364 | for t, n in reversed(repo.tagslist()): |
|
5364 | for t, n in reversed(repo.tagslist()): | |
5365 | hn = hexfunc(n) |
|
5365 | hn = hexfunc(n) | |
5366 | label = 'tags.normal' |
|
5366 | label = 'tags.normal' | |
5367 | tagtype = '' |
|
5367 | tagtype = '' | |
5368 | if repo.tagtype(t) == 'local': |
|
5368 | if repo.tagtype(t) == 'local': | |
5369 | label = 'tags.local' |
|
5369 | label = 'tags.local' | |
5370 | tagtype = 'local' |
|
5370 | tagtype = 'local' | |
5371 |
|
5371 | |||
5372 | fm.startitem() |
|
5372 | fm.startitem() | |
5373 | fm.write('tag', '%s', t, label=label) |
|
5373 | fm.write('tag', '%s', t, label=label) | |
5374 | fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s' |
|
5374 | fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s' | |
5375 | fm.condwrite(not ui.quiet, 'rev node', fmt, |
|
5375 | fm.condwrite(not ui.quiet, 'rev node', fmt, | |
5376 | repo.changelog.rev(n), hn, label=label) |
|
5376 | repo.changelog.rev(n), hn, label=label) | |
5377 | fm.condwrite(ui.verbose and tagtype, 'type', ' %s', |
|
5377 | fm.condwrite(ui.verbose and tagtype, 'type', ' %s', | |
5378 | tagtype, label=label) |
|
5378 | tagtype, label=label) | |
5379 | fm.plain('\n') |
|
5379 | fm.plain('\n') | |
5380 | fm.end() |
|
5380 | fm.end() | |
5381 |
|
5381 | |||
5382 | @command('tip', |
|
5382 | @command('tip', | |
5383 | [('p', 'patch', None, _('show patch')), |
|
5383 | [('p', 'patch', None, _('show patch')), | |
5384 | ('g', 'git', None, _('use git extended diff format')), |
|
5384 | ('g', 'git', None, _('use git extended diff format')), | |
5385 | ] + templateopts, |
|
5385 | ] + templateopts, | |
5386 | _('[-p] [-g]')) |
|
5386 | _('[-p] [-g]')) | |
5387 | def tip(ui, repo, **opts): |
|
5387 | def tip(ui, repo, **opts): | |
5388 | """show the tip revision (DEPRECATED) |
|
5388 | """show the tip revision (DEPRECATED) | |
5389 |
|
5389 | |||
5390 | The tip revision (usually just called the tip) is the changeset |
|
5390 | The tip revision (usually just called the tip) is the changeset | |
5391 | most recently added to the repository (and therefore the most |
|
5391 | most recently added to the repository (and therefore the most | |
5392 | recently changed head). |
|
5392 | recently changed head). | |
5393 |
|
5393 | |||
5394 | If you have just made a commit, that commit will be the tip. If |
|
5394 | If you have just made a commit, that commit will be the tip. If | |
5395 | you have just pulled changes from another repository, the tip of |
|
5395 | you have just pulled changes from another repository, the tip of | |
5396 | that repository becomes the current tip. The "tip" tag is special |
|
5396 | that repository becomes the current tip. The "tip" tag is special | |
5397 | and cannot be renamed or assigned to a different changeset. |
|
5397 | and cannot be renamed or assigned to a different changeset. | |
5398 |
|
5398 | |||
5399 | This command is deprecated, please use :hg:`heads` instead. |
|
5399 | This command is deprecated, please use :hg:`heads` instead. | |
5400 |
|
5400 | |||
5401 | Returns 0 on success. |
|
5401 | Returns 0 on success. | |
5402 | """ |
|
5402 | """ | |
5403 | opts = pycompat.byteskwargs(opts) |
|
5403 | opts = pycompat.byteskwargs(opts) | |
5404 | displayer = logcmdutil.changesetdisplayer(ui, repo, opts) |
|
5404 | displayer = logcmdutil.changesetdisplayer(ui, repo, opts) | |
5405 | displayer.show(repo['tip']) |
|
5405 | displayer.show(repo['tip']) | |
5406 | displayer.close() |
|
5406 | displayer.close() | |
5407 |
|
5407 | |||
5408 | @command('unbundle', |
|
5408 | @command('unbundle', | |
5409 | [('u', 'update', None, |
|
5409 | [('u', 'update', None, | |
5410 | _('update to new branch head if changesets were unbundled'))], |
|
5410 | _('update to new branch head if changesets were unbundled'))], | |
5411 | _('[-u] FILE...')) |
|
5411 | _('[-u] FILE...')) | |
5412 | def unbundle(ui, repo, fname1, *fnames, **opts): |
|
5412 | def unbundle(ui, repo, fname1, *fnames, **opts): | |
5413 | """apply one or more bundle files |
|
5413 | """apply one or more bundle files | |
5414 |
|
5414 | |||
5415 | Apply one or more bundle files generated by :hg:`bundle`. |
|
5415 | Apply one or more bundle files generated by :hg:`bundle`. | |
5416 |
|
5416 | |||
5417 | Returns 0 on success, 1 if an update has unresolved files. |
|
5417 | Returns 0 on success, 1 if an update has unresolved files. | |
5418 | """ |
|
5418 | """ | |
5419 | fnames = (fname1,) + fnames |
|
5419 | fnames = (fname1,) + fnames | |
5420 |
|
5420 | |||
5421 | with repo.lock(): |
|
5421 | with repo.lock(): | |
5422 | for fname in fnames: |
|
5422 | for fname in fnames: | |
5423 | f = hg.openpath(ui, fname) |
|
5423 | f = hg.openpath(ui, fname) | |
5424 | gen = exchange.readbundle(ui, f, fname) |
|
5424 | gen = exchange.readbundle(ui, f, fname) | |
5425 | if isinstance(gen, streamclone.streamcloneapplier): |
|
5425 | if isinstance(gen, streamclone.streamcloneapplier): | |
5426 | raise error.Abort( |
|
5426 | raise error.Abort( | |
5427 | _('packed bundles cannot be applied with ' |
|
5427 | _('packed bundles cannot be applied with ' | |
5428 | '"hg unbundle"'), |
|
5428 | '"hg unbundle"'), | |
5429 | hint=_('use "hg debugapplystreamclonebundle"')) |
|
5429 | hint=_('use "hg debugapplystreamclonebundle"')) | |
5430 | url = 'bundle:' + fname |
|
5430 | url = 'bundle:' + fname | |
5431 | try: |
|
5431 | try: | |
5432 | txnname = 'unbundle' |
|
5432 | txnname = 'unbundle' | |
5433 | if not isinstance(gen, bundle2.unbundle20): |
|
5433 | if not isinstance(gen, bundle2.unbundle20): | |
5434 | txnname = 'unbundle\n%s' % util.hidepassword(url) |
|
5434 | txnname = 'unbundle\n%s' % util.hidepassword(url) | |
5435 | with repo.transaction(txnname) as tr: |
|
5435 | with repo.transaction(txnname) as tr: | |
5436 | op = bundle2.applybundle(repo, gen, tr, source='unbundle', |
|
5436 | op = bundle2.applybundle(repo, gen, tr, source='unbundle', | |
5437 | url=url) |
|
5437 | url=url) | |
5438 | except error.BundleUnknownFeatureError as exc: |
|
5438 | except error.BundleUnknownFeatureError as exc: | |
5439 | raise error.Abort( |
|
5439 | raise error.Abort( | |
5440 | _('%s: unknown bundle feature, %s') % (fname, exc), |
|
5440 | _('%s: unknown bundle feature, %s') % (fname, exc), | |
5441 | hint=_("see https://mercurial-scm.org/" |
|
5441 | hint=_("see https://mercurial-scm.org/" | |
5442 | "wiki/BundleFeature for more " |
|
5442 | "wiki/BundleFeature for more " | |
5443 | "information")) |
|
5443 | "information")) | |
5444 | modheads = bundle2.combinechangegroupresults(op) |
|
5444 | modheads = bundle2.combinechangegroupresults(op) | |
5445 |
|
5445 | |||
5446 | return postincoming(ui, repo, modheads, opts.get(r'update'), None, None) |
|
5446 | return postincoming(ui, repo, modheads, opts.get(r'update'), None, None) | |
5447 |
|
5447 | |||
5448 | @command('^update|up|checkout|co', |
|
5448 | @command('^update|up|checkout|co', | |
5449 | [('C', 'clean', None, _('discard uncommitted changes (no backup)')), |
|
5449 | [('C', 'clean', None, _('discard uncommitted changes (no backup)')), | |
5450 | ('c', 'check', None, _('require clean working directory')), |
|
5450 | ('c', 'check', None, _('require clean working directory')), | |
5451 | ('m', 'merge', None, _('merge uncommitted changes')), |
|
5451 | ('m', 'merge', None, _('merge uncommitted changes')), | |
5452 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), |
|
5452 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), | |
5453 | ('r', 'rev', '', _('revision'), _('REV')) |
|
5453 | ('r', 'rev', '', _('revision'), _('REV')) | |
5454 | ] + mergetoolopts, |
|
5454 | ] + mergetoolopts, | |
5455 | _('[-C|-c|-m] [-d DATE] [[-r] REV]')) |
|
5455 | _('[-C|-c|-m] [-d DATE] [[-r] REV]')) | |
5456 | def update(ui, repo, node=None, **opts): |
|
5456 | def update(ui, repo, node=None, **opts): | |
5457 | """update working directory (or switch revisions) |
|
5457 | """update working directory (or switch revisions) | |
5458 |
|
5458 | |||
5459 | Update the repository's working directory to the specified |
|
5459 | Update the repository's working directory to the specified | |
5460 | changeset. If no changeset is specified, update to the tip of the |
|
5460 | changeset. If no changeset is specified, update to the tip of the | |
5461 | current named branch and move the active bookmark (see :hg:`help |
|
5461 | current named branch and move the active bookmark (see :hg:`help | |
5462 | bookmarks`). |
|
5462 | bookmarks`). | |
5463 |
|
5463 | |||
5464 | Update sets the working directory's parent revision to the specified |
|
5464 | Update sets the working directory's parent revision to the specified | |
5465 | changeset (see :hg:`help parents`). |
|
5465 | changeset (see :hg:`help parents`). | |
5466 |
|
5466 | |||
5467 | If the changeset is not a descendant or ancestor of the working |
|
5467 | If the changeset is not a descendant or ancestor of the working | |
5468 | directory's parent and there are uncommitted changes, the update is |
|
5468 | directory's parent and there are uncommitted changes, the update is | |
5469 | aborted. With the -c/--check option, the working directory is checked |
|
5469 | aborted. With the -c/--check option, the working directory is checked | |
5470 | for uncommitted changes; if none are found, the working directory is |
|
5470 | for uncommitted changes; if none are found, the working directory is | |
5471 | updated to the specified changeset. |
|
5471 | updated to the specified changeset. | |
5472 |
|
5472 | |||
5473 | .. container:: verbose |
|
5473 | .. container:: verbose | |
5474 |
|
5474 | |||
5475 | The -C/--clean, -c/--check, and -m/--merge options control what |
|
5475 | The -C/--clean, -c/--check, and -m/--merge options control what | |
5476 | happens if the working directory contains uncommitted changes. |
|
5476 | happens if the working directory contains uncommitted changes. | |
5477 | At most of one of them can be specified. |
|
5477 | At most of one of them can be specified. | |
5478 |
|
5478 | |||
5479 | 1. If no option is specified, and if |
|
5479 | 1. If no option is specified, and if | |
5480 | the requested changeset is an ancestor or descendant of |
|
5480 | the requested changeset is an ancestor or descendant of | |
5481 | the working directory's parent, the uncommitted changes |
|
5481 | the working directory's parent, the uncommitted changes | |
5482 | are merged into the requested changeset and the merged |
|
5482 | are merged into the requested changeset and the merged | |
5483 | result is left uncommitted. If the requested changeset is |
|
5483 | result is left uncommitted. If the requested changeset is | |
5484 | not an ancestor or descendant (that is, it is on another |
|
5484 | not an ancestor or descendant (that is, it is on another | |
5485 | branch), the update is aborted and the uncommitted changes |
|
5485 | branch), the update is aborted and the uncommitted changes | |
5486 | are preserved. |
|
5486 | are preserved. | |
5487 |
|
5487 | |||
5488 | 2. With the -m/--merge option, the update is allowed even if the |
|
5488 | 2. With the -m/--merge option, the update is allowed even if the | |
5489 | requested changeset is not an ancestor or descendant of |
|
5489 | requested changeset is not an ancestor or descendant of | |
5490 | the working directory's parent. |
|
5490 | the working directory's parent. | |
5491 |
|
5491 | |||
5492 | 3. With the -c/--check option, the update is aborted and the |
|
5492 | 3. With the -c/--check option, the update is aborted and the | |
5493 | uncommitted changes are preserved. |
|
5493 | uncommitted changes are preserved. | |
5494 |
|
5494 | |||
5495 | 4. With the -C/--clean option, uncommitted changes are discarded and |
|
5495 | 4. With the -C/--clean option, uncommitted changes are discarded and | |
5496 | the working directory is updated to the requested changeset. |
|
5496 | the working directory is updated to the requested changeset. | |
5497 |
|
5497 | |||
5498 | To cancel an uncommitted merge (and lose your changes), use |
|
5498 | To cancel an uncommitted merge (and lose your changes), use | |
5499 | :hg:`merge --abort`. |
|
5499 | :hg:`merge --abort`. | |
5500 |
|
5500 | |||
5501 | Use null as the changeset to remove the working directory (like |
|
5501 | Use null as the changeset to remove the working directory (like | |
5502 | :hg:`clone -U`). |
|
5502 | :hg:`clone -U`). | |
5503 |
|
5503 | |||
5504 | If you want to revert just one file to an older revision, use |
|
5504 | If you want to revert just one file to an older revision, use | |
5505 | :hg:`revert [-r REV] NAME`. |
|
5505 | :hg:`revert [-r REV] NAME`. | |
5506 |
|
5506 | |||
5507 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
5507 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
5508 |
|
5508 | |||
5509 | Returns 0 on success, 1 if there are unresolved files. |
|
5509 | Returns 0 on success, 1 if there are unresolved files. | |
5510 | """ |
|
5510 | """ | |
5511 | rev = opts.get(r'rev') |
|
5511 | rev = opts.get(r'rev') | |
5512 | date = opts.get(r'date') |
|
5512 | date = opts.get(r'date') | |
5513 | clean = opts.get(r'clean') |
|
5513 | clean = opts.get(r'clean') | |
5514 | check = opts.get(r'check') |
|
5514 | check = opts.get(r'check') | |
5515 | merge = opts.get(r'merge') |
|
5515 | merge = opts.get(r'merge') | |
5516 | if rev and node: |
|
5516 | if rev and node: | |
5517 | raise error.Abort(_("please specify just one revision")) |
|
5517 | raise error.Abort(_("please specify just one revision")) | |
5518 |
|
5518 | |||
5519 | if ui.configbool('commands', 'update.requiredest'): |
|
5519 | if ui.configbool('commands', 'update.requiredest'): | |
5520 | if not node and not rev and not date: |
|
5520 | if not node and not rev and not date: | |
5521 | raise error.Abort(_('you must specify a destination'), |
|
5521 | raise error.Abort(_('you must specify a destination'), | |
5522 | hint=_('for example: hg update ".::"')) |
|
5522 | hint=_('for example: hg update ".::"')) | |
5523 |
|
5523 | |||
5524 | if rev is None or rev == '': |
|
5524 | if rev is None or rev == '': | |
5525 | rev = node |
|
5525 | rev = node | |
5526 |
|
5526 | |||
5527 | if date and rev is not None: |
|
5527 | if date and rev is not None: | |
5528 | raise error.Abort(_("you can't specify a revision and a date")) |
|
5528 | raise error.Abort(_("you can't specify a revision and a date")) | |
5529 |
|
5529 | |||
5530 | if len([x for x in (clean, check, merge) if x]) > 1: |
|
5530 | if len([x for x in (clean, check, merge) if x]) > 1: | |
5531 | raise error.Abort(_("can only specify one of -C/--clean, -c/--check, " |
|
5531 | raise error.Abort(_("can only specify one of -C/--clean, -c/--check, " | |
5532 | "or -m/--merge")) |
|
5532 | "or -m/--merge")) | |
5533 |
|
5533 | |||
5534 | updatecheck = None |
|
5534 | updatecheck = None | |
5535 | if check: |
|
5535 | if check: | |
5536 | updatecheck = 'abort' |
|
5536 | updatecheck = 'abort' | |
5537 | elif merge: |
|
5537 | elif merge: | |
5538 | updatecheck = 'none' |
|
5538 | updatecheck = 'none' | |
5539 |
|
5539 | |||
5540 | with repo.wlock(): |
|
5540 | with repo.wlock(): | |
5541 | cmdutil.clearunfinished(repo) |
|
5541 | cmdutil.clearunfinished(repo) | |
5542 |
|
5542 | |||
5543 | if date: |
|
5543 | if date: | |
5544 | rev = cmdutil.finddate(ui, repo, date) |
|
5544 | rev = cmdutil.finddate(ui, repo, date) | |
5545 |
|
5545 | |||
5546 | # if we defined a bookmark, we have to remember the original name |
|
5546 | # if we defined a bookmark, we have to remember the original name | |
5547 | brev = rev |
|
5547 | brev = rev | |
5548 | if rev: |
|
5548 | if rev: | |
5549 | repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') |
|
5549 | repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') | |
5550 | ctx = scmutil.revsingle(repo, rev, rev) |
|
5550 | ctx = scmutil.revsingle(repo, rev, rev) | |
5551 | rev = ctx.rev() |
|
5551 | rev = ctx.rev() | |
5552 | if ctx.hidden(): |
|
5552 | if ctx.hidden(): | |
5553 | ctxstr = ctx.hex()[:12] |
|
5553 | ctxstr = ctx.hex()[:12] | |
5554 | ui.warn(_("updating to a hidden changeset %s\n") % ctxstr) |
|
5554 | ui.warn(_("updating to a hidden changeset %s\n") % ctxstr) | |
5555 |
|
5555 | |||
5556 | if ctx.obsolete(): |
|
5556 | if ctx.obsolete(): | |
5557 | obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx) |
|
5557 | obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx) | |
5558 | ui.warn("(%s)\n" % obsfatemsg) |
|
5558 | ui.warn("(%s)\n" % obsfatemsg) | |
5559 |
|
5559 | |||
5560 | repo.ui.setconfig('ui', 'forcemerge', opts.get(r'tool'), 'update') |
|
5560 | repo.ui.setconfig('ui', 'forcemerge', opts.get(r'tool'), 'update') | |
5561 |
|
5561 | |||
5562 | return hg.updatetotally(ui, repo, rev, brev, clean=clean, |
|
5562 | return hg.updatetotally(ui, repo, rev, brev, clean=clean, | |
5563 | updatecheck=updatecheck) |
|
5563 | updatecheck=updatecheck) | |
5564 |
|
5564 | |||
5565 | @command('verify', []) |
|
5565 | @command('verify', []) | |
5566 | def verify(ui, repo): |
|
5566 | def verify(ui, repo): | |
5567 | """verify the integrity of the repository |
|
5567 | """verify the integrity of the repository | |
5568 |
|
5568 | |||
5569 | Verify the integrity of the current repository. |
|
5569 | Verify the integrity of the current repository. | |
5570 |
|
5570 | |||
5571 | This will perform an extensive check of the repository's |
|
5571 | This will perform an extensive check of the repository's | |
5572 | integrity, validating the hashes and checksums of each entry in |
|
5572 | integrity, validating the hashes and checksums of each entry in | |
5573 | the changelog, manifest, and tracked files, as well as the |
|
5573 | the changelog, manifest, and tracked files, as well as the | |
5574 | integrity of their crosslinks and indices. |
|
5574 | integrity of their crosslinks and indices. | |
5575 |
|
5575 | |||
5576 | Please see https://mercurial-scm.org/wiki/RepositoryCorruption |
|
5576 | Please see https://mercurial-scm.org/wiki/RepositoryCorruption | |
5577 | for more information about recovery from corruption of the |
|
5577 | for more information about recovery from corruption of the | |
5578 | repository. |
|
5578 | repository. | |
5579 |
|
5579 | |||
5580 | Returns 0 on success, 1 if errors are encountered. |
|
5580 | Returns 0 on success, 1 if errors are encountered. | |
5581 | """ |
|
5581 | """ | |
5582 | return hg.verify(repo) |
|
5582 | return hg.verify(repo) | |
5583 |
|
5583 | |||
5584 | @command('version', [] + formatteropts, norepo=True, cmdtype=readonly) |
|
5584 | @command('version', [] + formatteropts, norepo=True, cmdtype=readonly) | |
5585 | def version_(ui, **opts): |
|
5585 | def version_(ui, **opts): | |
5586 | """output version and copyright information""" |
|
5586 | """output version and copyright information""" | |
5587 | opts = pycompat.byteskwargs(opts) |
|
5587 | opts = pycompat.byteskwargs(opts) | |
5588 | if ui.verbose: |
|
5588 | if ui.verbose: | |
5589 | ui.pager('version') |
|
5589 | ui.pager('version') | |
5590 | fm = ui.formatter("version", opts) |
|
5590 | fm = ui.formatter("version", opts) | |
5591 | fm.startitem() |
|
5591 | fm.startitem() | |
5592 | fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"), |
|
5592 | fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"), | |
5593 | util.version()) |
|
5593 | util.version()) | |
5594 | license = _( |
|
5594 | license = _( | |
5595 | "(see https://mercurial-scm.org for more information)\n" |
|
5595 | "(see https://mercurial-scm.org for more information)\n" | |
5596 | "\nCopyright (C) 2005-2018 Matt Mackall and others\n" |
|
5596 | "\nCopyright (C) 2005-2018 Matt Mackall and others\n" | |
5597 | "This is free software; see the source for copying conditions. " |
|
5597 | "This is free software; see the source for copying conditions. " | |
5598 | "There is NO\nwarranty; " |
|
5598 | "There is NO\nwarranty; " | |
5599 | "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" |
|
5599 | "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" | |
5600 | ) |
|
5600 | ) | |
5601 | if not ui.quiet: |
|
5601 | if not ui.quiet: | |
5602 | fm.plain(license) |
|
5602 | fm.plain(license) | |
5603 |
|
5603 | |||
5604 | if ui.verbose: |
|
5604 | if ui.verbose: | |
5605 | fm.plain(_("\nEnabled extensions:\n\n")) |
|
5605 | fm.plain(_("\nEnabled extensions:\n\n")) | |
5606 | # format names and versions into columns |
|
5606 | # format names and versions into columns | |
5607 | names = [] |
|
5607 | names = [] | |
5608 | vers = [] |
|
5608 | vers = [] | |
5609 | isinternals = [] |
|
5609 | isinternals = [] | |
5610 | for name, module in extensions.extensions(): |
|
5610 | for name, module in extensions.extensions(): | |
5611 | names.append(name) |
|
5611 | names.append(name) | |
5612 | vers.append(extensions.moduleversion(module) or None) |
|
5612 | vers.append(extensions.moduleversion(module) or None) | |
5613 | isinternals.append(extensions.ismoduleinternal(module)) |
|
5613 | isinternals.append(extensions.ismoduleinternal(module)) | |
5614 | fn = fm.nested("extensions") |
|
5614 | fn = fm.nested("extensions") | |
5615 | if names: |
|
5615 | if names: | |
5616 | namefmt = " %%-%ds " % max(len(n) for n in names) |
|
5616 | namefmt = " %%-%ds " % max(len(n) for n in names) | |
5617 | places = [_("external"), _("internal")] |
|
5617 | places = [_("external"), _("internal")] | |
5618 | for n, v, p in zip(names, vers, isinternals): |
|
5618 | for n, v, p in zip(names, vers, isinternals): | |
5619 | fn.startitem() |
|
5619 | fn.startitem() | |
5620 | fn.condwrite(ui.verbose, "name", namefmt, n) |
|
5620 | fn.condwrite(ui.verbose, "name", namefmt, n) | |
5621 | if ui.verbose: |
|
5621 | if ui.verbose: | |
5622 | fn.plain("%s " % places[p]) |
|
5622 | fn.plain("%s " % places[p]) | |
5623 | fn.data(bundled=p) |
|
5623 | fn.data(bundled=p) | |
5624 | fn.condwrite(ui.verbose and v, "ver", "%s", v) |
|
5624 | fn.condwrite(ui.verbose and v, "ver", "%s", v) | |
5625 | if ui.verbose: |
|
5625 | if ui.verbose: | |
5626 | fn.plain("\n") |
|
5626 | fn.plain("\n") | |
5627 | fn.end() |
|
5627 | fn.end() | |
5628 | fm.end() |
|
5628 | fm.end() | |
5629 |
|
5629 | |||
5630 | def loadcmdtable(ui, name, cmdtable): |
|
5630 | def loadcmdtable(ui, name, cmdtable): | |
5631 | """Load command functions from specified cmdtable |
|
5631 | """Load command functions from specified cmdtable | |
5632 | """ |
|
5632 | """ | |
5633 | overrides = [cmd for cmd in cmdtable if cmd in table] |
|
5633 | overrides = [cmd for cmd in cmdtable if cmd in table] | |
5634 | if overrides: |
|
5634 | if overrides: | |
5635 | ui.warn(_("extension '%s' overrides commands: %s\n") |
|
5635 | ui.warn(_("extension '%s' overrides commands: %s\n") | |
5636 | % (name, " ".join(overrides))) |
|
5636 | % (name, " ".join(overrides))) | |
5637 | table.update(cmdtable) |
|
5637 | table.update(cmdtable) |
@@ -1,1815 +1,1815 b'' | |||||
1 | # subrepo.py - sub-repository classes and factory |
|
1 | # subrepo.py - sub-repository classes and factory | |
2 | # |
|
2 | # | |
3 | # Copyright 2009-2010 Matt Mackall <mpm@selenic.com> |
|
3 | # Copyright 2009-2010 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 copy |
|
10 | import copy | |
11 | import errno |
|
11 | import errno | |
12 | import hashlib |
|
12 | import hashlib | |
13 | import os |
|
13 | import os | |
14 | import posixpath |
|
14 | import posixpath | |
15 | import re |
|
15 | import re | |
16 | import stat |
|
16 | import stat | |
17 | import subprocess |
|
17 | import subprocess | |
18 | import sys |
|
18 | import sys | |
19 | import tarfile |
|
19 | import tarfile | |
20 | import xml.dom.minidom |
|
20 | import xml.dom.minidom | |
21 |
|
21 | |||
22 | from .i18n import _ |
|
22 | from .i18n import _ | |
23 | from . import ( |
|
23 | from . import ( | |
24 | cmdutil, |
|
24 | cmdutil, | |
25 | encoding, |
|
25 | encoding, | |
26 | error, |
|
26 | error, | |
27 | exchange, |
|
27 | exchange, | |
28 | logcmdutil, |
|
28 | logcmdutil, | |
29 | match as matchmod, |
|
29 | match as matchmod, | |
30 | node, |
|
30 | node, | |
31 | pathutil, |
|
31 | pathutil, | |
32 | phases, |
|
32 | phases, | |
33 | pycompat, |
|
33 | pycompat, | |
34 | scmutil, |
|
34 | scmutil, | |
35 | subrepoutil, |
|
35 | subrepoutil, | |
36 | util, |
|
36 | util, | |
37 | vfs as vfsmod, |
|
37 | vfs as vfsmod, | |
38 | ) |
|
38 | ) | |
39 | from .utils import ( |
|
39 | from .utils import ( | |
40 | dateutil, |
|
40 | dateutil, | |
41 | procutil, |
|
41 | procutil, | |
42 | stringutil, |
|
42 | stringutil, | |
43 | ) |
|
43 | ) | |
44 |
|
44 | |||
45 | hg = None |
|
45 | hg = None | |
46 | reporelpath = subrepoutil.reporelpath |
|
46 | reporelpath = subrepoutil.reporelpath | |
47 | subrelpath = subrepoutil.subrelpath |
|
47 | subrelpath = subrepoutil.subrelpath | |
48 | _abssource = subrepoutil._abssource |
|
48 | _abssource = subrepoutil._abssource | |
49 | propertycache = util.propertycache |
|
49 | propertycache = util.propertycache | |
50 |
|
50 | |||
51 | def _expandedabspath(path): |
|
51 | def _expandedabspath(path): | |
52 | ''' |
|
52 | ''' | |
53 | get a path or url and if it is a path expand it and return an absolute path |
|
53 | get a path or url and if it is a path expand it and return an absolute path | |
54 | ''' |
|
54 | ''' | |
55 | expandedpath = util.urllocalpath(util.expandpath(path)) |
|
55 | expandedpath = util.urllocalpath(util.expandpath(path)) | |
56 | u = util.url(expandedpath) |
|
56 | u = util.url(expandedpath) | |
57 | if not u.scheme: |
|
57 | if not u.scheme: | |
58 | path = util.normpath(os.path.abspath(u.path)) |
|
58 | path = util.normpath(os.path.abspath(u.path)) | |
59 | return path |
|
59 | return path | |
60 |
|
60 | |||
61 | def _getstorehashcachename(remotepath): |
|
61 | def _getstorehashcachename(remotepath): | |
62 | '''get a unique filename for the store hash cache of a remote repository''' |
|
62 | '''get a unique filename for the store hash cache of a remote repository''' | |
63 | return node.hex(hashlib.sha1(_expandedabspath(remotepath)).digest())[0:12] |
|
63 | return node.hex(hashlib.sha1(_expandedabspath(remotepath)).digest())[0:12] | |
64 |
|
64 | |||
65 | class SubrepoAbort(error.Abort): |
|
65 | class SubrepoAbort(error.Abort): | |
66 | """Exception class used to avoid handling a subrepo error more than once""" |
|
66 | """Exception class used to avoid handling a subrepo error more than once""" | |
67 | def __init__(self, *args, **kw): |
|
67 | def __init__(self, *args, **kw): | |
68 | self.subrepo = kw.pop(r'subrepo', None) |
|
68 | self.subrepo = kw.pop(r'subrepo', None) | |
69 | self.cause = kw.pop(r'cause', None) |
|
69 | self.cause = kw.pop(r'cause', None) | |
70 | error.Abort.__init__(self, *args, **kw) |
|
70 | error.Abort.__init__(self, *args, **kw) | |
71 |
|
71 | |||
72 | def annotatesubrepoerror(func): |
|
72 | def annotatesubrepoerror(func): | |
73 | def decoratedmethod(self, *args, **kargs): |
|
73 | def decoratedmethod(self, *args, **kargs): | |
74 | try: |
|
74 | try: | |
75 | res = func(self, *args, **kargs) |
|
75 | res = func(self, *args, **kargs) | |
76 | except SubrepoAbort as ex: |
|
76 | except SubrepoAbort as ex: | |
77 | # This exception has already been handled |
|
77 | # This exception has already been handled | |
78 | raise ex |
|
78 | raise ex | |
79 | except error.Abort as ex: |
|
79 | except error.Abort as ex: | |
80 | subrepo = subrelpath(self) |
|
80 | subrepo = subrelpath(self) | |
81 | errormsg = (stringutil.forcebytestr(ex) + ' ' |
|
81 | errormsg = (stringutil.forcebytestr(ex) + ' ' | |
82 | + _('(in subrepository "%s")') % subrepo) |
|
82 | + _('(in subrepository "%s")') % subrepo) | |
83 | # avoid handling this exception by raising a SubrepoAbort exception |
|
83 | # avoid handling this exception by raising a SubrepoAbort exception | |
84 | raise SubrepoAbort(errormsg, hint=ex.hint, subrepo=subrepo, |
|
84 | raise SubrepoAbort(errormsg, hint=ex.hint, subrepo=subrepo, | |
85 | cause=sys.exc_info()) |
|
85 | cause=sys.exc_info()) | |
86 | return res |
|
86 | return res | |
87 | return decoratedmethod |
|
87 | return decoratedmethod | |
88 |
|
88 | |||
89 | def _updateprompt(ui, sub, dirty, local, remote): |
|
89 | def _updateprompt(ui, sub, dirty, local, remote): | |
90 | if dirty: |
|
90 | if dirty: | |
91 | msg = (_(' subrepository sources for %s differ\n' |
|
91 | msg = (_(' subrepository sources for %s differ\n' | |
92 | 'use (l)ocal source (%s) or (r)emote source (%s)?' |
|
92 | 'use (l)ocal source (%s) or (r)emote source (%s)?' | |
93 | '$$ &Local $$ &Remote') |
|
93 | '$$ &Local $$ &Remote') | |
94 | % (subrelpath(sub), local, remote)) |
|
94 | % (subrelpath(sub), local, remote)) | |
95 | else: |
|
95 | else: | |
96 | msg = (_(' subrepository sources for %s differ (in checked out ' |
|
96 | msg = (_(' subrepository sources for %s differ (in checked out ' | |
97 | 'version)\n' |
|
97 | 'version)\n' | |
98 | 'use (l)ocal source (%s) or (r)emote source (%s)?' |
|
98 | 'use (l)ocal source (%s) or (r)emote source (%s)?' | |
99 | '$$ &Local $$ &Remote') |
|
99 | '$$ &Local $$ &Remote') | |
100 | % (subrelpath(sub), local, remote)) |
|
100 | % (subrelpath(sub), local, remote)) | |
101 | return ui.promptchoice(msg, 0) |
|
101 | return ui.promptchoice(msg, 0) | |
102 |
|
102 | |||
103 | def _sanitize(ui, vfs, ignore): |
|
103 | def _sanitize(ui, vfs, ignore): | |
104 | for dirname, dirs, names in vfs.walk(): |
|
104 | for dirname, dirs, names in vfs.walk(): | |
105 | for i, d in enumerate(dirs): |
|
105 | for i, d in enumerate(dirs): | |
106 | if d.lower() == ignore: |
|
106 | if d.lower() == ignore: | |
107 | del dirs[i] |
|
107 | del dirs[i] | |
108 | break |
|
108 | break | |
109 | if vfs.basename(dirname).lower() != '.hg': |
|
109 | if vfs.basename(dirname).lower() != '.hg': | |
110 | continue |
|
110 | continue | |
111 | for f in names: |
|
111 | for f in names: | |
112 | if f.lower() == 'hgrc': |
|
112 | if f.lower() == 'hgrc': | |
113 | ui.warn(_("warning: removing potentially hostile 'hgrc' " |
|
113 | ui.warn(_("warning: removing potentially hostile 'hgrc' " | |
114 | "in '%s'\n") % vfs.join(dirname)) |
|
114 | "in '%s'\n") % vfs.join(dirname)) | |
115 | vfs.unlink(vfs.reljoin(dirname, f)) |
|
115 | vfs.unlink(vfs.reljoin(dirname, f)) | |
116 |
|
116 | |||
117 | def _auditsubrepopath(repo, path): |
|
117 | def _auditsubrepopath(repo, path): | |
118 | # auditor doesn't check if the path itself is a symlink |
|
118 | # auditor doesn't check if the path itself is a symlink | |
119 | pathutil.pathauditor(repo.root)(path) |
|
119 | pathutil.pathauditor(repo.root)(path) | |
120 | if repo.wvfs.islink(path): |
|
120 | if repo.wvfs.islink(path): | |
121 | raise error.Abort(_("subrepo '%s' traverses symbolic link") % path) |
|
121 | raise error.Abort(_("subrepo '%s' traverses symbolic link") % path) | |
122 |
|
122 | |||
123 | SUBREPO_ALLOWED_DEFAULTS = { |
|
123 | SUBREPO_ALLOWED_DEFAULTS = { | |
124 | 'hg': True, |
|
124 | 'hg': True, | |
125 | 'git': False, |
|
125 | 'git': False, | |
126 | 'svn': False, |
|
126 | 'svn': False, | |
127 | } |
|
127 | } | |
128 |
|
128 | |||
129 | def _checktype(ui, kind): |
|
129 | def _checktype(ui, kind): | |
130 | # subrepos.allowed is a master kill switch. If disabled, subrepos are |
|
130 | # subrepos.allowed is a master kill switch. If disabled, subrepos are | |
131 | # disabled period. |
|
131 | # disabled period. | |
132 | if not ui.configbool('subrepos', 'allowed', True): |
|
132 | if not ui.configbool('subrepos', 'allowed', True): | |
133 | raise error.Abort(_('subrepos not enabled'), |
|
133 | raise error.Abort(_('subrepos not enabled'), | |
134 | hint=_("see 'hg help config.subrepos' for details")) |
|
134 | hint=_("see 'hg help config.subrepos' for details")) | |
135 |
|
135 | |||
136 | default = SUBREPO_ALLOWED_DEFAULTS.get(kind, False) |
|
136 | default = SUBREPO_ALLOWED_DEFAULTS.get(kind, False) | |
137 | if not ui.configbool('subrepos', '%s:allowed' % kind, default): |
|
137 | if not ui.configbool('subrepos', '%s:allowed' % kind, default): | |
138 | raise error.Abort(_('%s subrepos not allowed') % kind, |
|
138 | raise error.Abort(_('%s subrepos not allowed') % kind, | |
139 | hint=_("see 'hg help config.subrepos' for details")) |
|
139 | hint=_("see 'hg help config.subrepos' for details")) | |
140 |
|
140 | |||
141 | if kind not in types: |
|
141 | if kind not in types: | |
142 | raise error.Abort(_('unknown subrepo type %s') % kind) |
|
142 | raise error.Abort(_('unknown subrepo type %s') % kind) | |
143 |
|
143 | |||
144 | def subrepo(ctx, path, allowwdir=False, allowcreate=True): |
|
144 | def subrepo(ctx, path, allowwdir=False, allowcreate=True): | |
145 | """return instance of the right subrepo class for subrepo in path""" |
|
145 | """return instance of the right subrepo class for subrepo in path""" | |
146 | # subrepo inherently violates our import layering rules |
|
146 | # subrepo inherently violates our import layering rules | |
147 | # because it wants to make repo objects from deep inside the stack |
|
147 | # because it wants to make repo objects from deep inside the stack | |
148 | # so we manually delay the circular imports to not break |
|
148 | # so we manually delay the circular imports to not break | |
149 | # scripts that don't use our demand-loading |
|
149 | # scripts that don't use our demand-loading | |
150 | global hg |
|
150 | global hg | |
151 | from . import hg as h |
|
151 | from . import hg as h | |
152 | hg = h |
|
152 | hg = h | |
153 |
|
153 | |||
154 | repo = ctx.repo() |
|
154 | repo = ctx.repo() | |
155 | _auditsubrepopath(repo, path) |
|
155 | _auditsubrepopath(repo, path) | |
156 | state = ctx.substate[path] |
|
156 | state = ctx.substate[path] | |
157 | _checktype(repo.ui, state[2]) |
|
157 | _checktype(repo.ui, state[2]) | |
158 | if allowwdir: |
|
158 | if allowwdir: | |
159 | state = (state[0], ctx.subrev(path), state[2]) |
|
159 | state = (state[0], ctx.subrev(path), state[2]) | |
160 | return types[state[2]](ctx, path, state[:2], allowcreate) |
|
160 | return types[state[2]](ctx, path, state[:2], allowcreate) | |
161 |
|
161 | |||
162 | def nullsubrepo(ctx, path, pctx): |
|
162 | def nullsubrepo(ctx, path, pctx): | |
163 | """return an empty subrepo in pctx for the extant subrepo in ctx""" |
|
163 | """return an empty subrepo in pctx for the extant subrepo in ctx""" | |
164 | # subrepo inherently violates our import layering rules |
|
164 | # subrepo inherently violates our import layering rules | |
165 | # because it wants to make repo objects from deep inside the stack |
|
165 | # because it wants to make repo objects from deep inside the stack | |
166 | # so we manually delay the circular imports to not break |
|
166 | # so we manually delay the circular imports to not break | |
167 | # scripts that don't use our demand-loading |
|
167 | # scripts that don't use our demand-loading | |
168 | global hg |
|
168 | global hg | |
169 | from . import hg as h |
|
169 | from . import hg as h | |
170 | hg = h |
|
170 | hg = h | |
171 |
|
171 | |||
172 | repo = ctx.repo() |
|
172 | repo = ctx.repo() | |
173 | _auditsubrepopath(repo, path) |
|
173 | _auditsubrepopath(repo, path) | |
174 | state = ctx.substate[path] |
|
174 | state = ctx.substate[path] | |
175 | _checktype(repo.ui, state[2]) |
|
175 | _checktype(repo.ui, state[2]) | |
176 | subrev = '' |
|
176 | subrev = '' | |
177 | if state[2] == 'hg': |
|
177 | if state[2] == 'hg': | |
178 | subrev = "0" * 40 |
|
178 | subrev = "0" * 40 | |
179 | return types[state[2]](pctx, path, (state[0], subrev), True) |
|
179 | return types[state[2]](pctx, path, (state[0], subrev), True) | |
180 |
|
180 | |||
181 | # subrepo classes need to implement the following abstract class: |
|
181 | # subrepo classes need to implement the following abstract class: | |
182 |
|
182 | |||
183 | class abstractsubrepo(object): |
|
183 | class abstractsubrepo(object): | |
184 |
|
184 | |||
185 | def __init__(self, ctx, path): |
|
185 | def __init__(self, ctx, path): | |
186 | """Initialize abstractsubrepo part |
|
186 | """Initialize abstractsubrepo part | |
187 |
|
187 | |||
188 | ``ctx`` is the context referring this subrepository in the |
|
188 | ``ctx`` is the context referring this subrepository in the | |
189 | parent repository. |
|
189 | parent repository. | |
190 |
|
190 | |||
191 | ``path`` is the path to this subrepository as seen from |
|
191 | ``path`` is the path to this subrepository as seen from | |
192 | innermost repository. |
|
192 | innermost repository. | |
193 | """ |
|
193 | """ | |
194 | self.ui = ctx.repo().ui |
|
194 | self.ui = ctx.repo().ui | |
195 | self._ctx = ctx |
|
195 | self._ctx = ctx | |
196 | self._path = path |
|
196 | self._path = path | |
197 |
|
197 | |||
198 | def addwebdirpath(self, serverpath, webconf): |
|
198 | def addwebdirpath(self, serverpath, webconf): | |
199 | """Add the hgwebdir entries for this subrepo, and any of its subrepos. |
|
199 | """Add the hgwebdir entries for this subrepo, and any of its subrepos. | |
200 |
|
200 | |||
201 | ``serverpath`` is the path component of the URL for this repo. |
|
201 | ``serverpath`` is the path component of the URL for this repo. | |
202 |
|
202 | |||
203 | ``webconf`` is the dictionary of hgwebdir entries. |
|
203 | ``webconf`` is the dictionary of hgwebdir entries. | |
204 | """ |
|
204 | """ | |
205 | pass |
|
205 | pass | |
206 |
|
206 | |||
207 | def storeclean(self, path): |
|
207 | def storeclean(self, path): | |
208 | """ |
|
208 | """ | |
209 | returns true if the repository has not changed since it was last |
|
209 | returns true if the repository has not changed since it was last | |
210 | cloned from or pushed to a given repository. |
|
210 | cloned from or pushed to a given repository. | |
211 | """ |
|
211 | """ | |
212 | return False |
|
212 | return False | |
213 |
|
213 | |||
214 | def dirty(self, ignoreupdate=False, missing=False): |
|
214 | def dirty(self, ignoreupdate=False, missing=False): | |
215 | """returns true if the dirstate of the subrepo is dirty or does not |
|
215 | """returns true if the dirstate of the subrepo is dirty or does not | |
216 | match current stored state. If ignoreupdate is true, only check |
|
216 | match current stored state. If ignoreupdate is true, only check | |
217 | whether the subrepo has uncommitted changes in its dirstate. If missing |
|
217 | whether the subrepo has uncommitted changes in its dirstate. If missing | |
218 | is true, check for deleted files. |
|
218 | is true, check for deleted files. | |
219 | """ |
|
219 | """ | |
220 | raise NotImplementedError |
|
220 | raise NotImplementedError | |
221 |
|
221 | |||
222 | def dirtyreason(self, ignoreupdate=False, missing=False): |
|
222 | def dirtyreason(self, ignoreupdate=False, missing=False): | |
223 | """return reason string if it is ``dirty()`` |
|
223 | """return reason string if it is ``dirty()`` | |
224 |
|
224 | |||
225 | Returned string should have enough information for the message |
|
225 | Returned string should have enough information for the message | |
226 | of exception. |
|
226 | of exception. | |
227 |
|
227 | |||
228 | This returns None, otherwise. |
|
228 | This returns None, otherwise. | |
229 | """ |
|
229 | """ | |
230 | if self.dirty(ignoreupdate=ignoreupdate, missing=missing): |
|
230 | if self.dirty(ignoreupdate=ignoreupdate, missing=missing): | |
231 | return _('uncommitted changes in subrepository "%s"' |
|
231 | return _('uncommitted changes in subrepository "%s"' | |
232 | ) % subrelpath(self) |
|
232 | ) % subrelpath(self) | |
233 |
|
233 | |||
234 | def bailifchanged(self, ignoreupdate=False, hint=None): |
|
234 | def bailifchanged(self, ignoreupdate=False, hint=None): | |
235 | """raise Abort if subrepository is ``dirty()`` |
|
235 | """raise Abort if subrepository is ``dirty()`` | |
236 | """ |
|
236 | """ | |
237 | dirtyreason = self.dirtyreason(ignoreupdate=ignoreupdate, |
|
237 | dirtyreason = self.dirtyreason(ignoreupdate=ignoreupdate, | |
238 | missing=True) |
|
238 | missing=True) | |
239 | if dirtyreason: |
|
239 | if dirtyreason: | |
240 | raise error.Abort(dirtyreason, hint=hint) |
|
240 | raise error.Abort(dirtyreason, hint=hint) | |
241 |
|
241 | |||
242 | def basestate(self): |
|
242 | def basestate(self): | |
243 | """current working directory base state, disregarding .hgsubstate |
|
243 | """current working directory base state, disregarding .hgsubstate | |
244 | state and working directory modifications""" |
|
244 | state and working directory modifications""" | |
245 | raise NotImplementedError |
|
245 | raise NotImplementedError | |
246 |
|
246 | |||
247 | def checknested(self, path): |
|
247 | def checknested(self, path): | |
248 | """check if path is a subrepository within this repository""" |
|
248 | """check if path is a subrepository within this repository""" | |
249 | return False |
|
249 | return False | |
250 |
|
250 | |||
251 | def commit(self, text, user, date): |
|
251 | def commit(self, text, user, date): | |
252 | """commit the current changes to the subrepo with the given |
|
252 | """commit the current changes to the subrepo with the given | |
253 | log message. Use given user and date if possible. Return the |
|
253 | log message. Use given user and date if possible. Return the | |
254 | new state of the subrepo. |
|
254 | new state of the subrepo. | |
255 | """ |
|
255 | """ | |
256 | raise NotImplementedError |
|
256 | raise NotImplementedError | |
257 |
|
257 | |||
258 | def phase(self, state): |
|
258 | def phase(self, state): | |
259 | """returns phase of specified state in the subrepository. |
|
259 | """returns phase of specified state in the subrepository. | |
260 | """ |
|
260 | """ | |
261 | return phases.public |
|
261 | return phases.public | |
262 |
|
262 | |||
263 | def remove(self): |
|
263 | def remove(self): | |
264 | """remove the subrepo |
|
264 | """remove the subrepo | |
265 |
|
265 | |||
266 | (should verify the dirstate is not dirty first) |
|
266 | (should verify the dirstate is not dirty first) | |
267 | """ |
|
267 | """ | |
268 | raise NotImplementedError |
|
268 | raise NotImplementedError | |
269 |
|
269 | |||
270 | def get(self, state, overwrite=False): |
|
270 | def get(self, state, overwrite=False): | |
271 | """run whatever commands are needed to put the subrepo into |
|
271 | """run whatever commands are needed to put the subrepo into | |
272 | this state |
|
272 | this state | |
273 | """ |
|
273 | """ | |
274 | raise NotImplementedError |
|
274 | raise NotImplementedError | |
275 |
|
275 | |||
276 | def merge(self, state): |
|
276 | def merge(self, state): | |
277 | """merge currently-saved state with the new state.""" |
|
277 | """merge currently-saved state with the new state.""" | |
278 | raise NotImplementedError |
|
278 | raise NotImplementedError | |
279 |
|
279 | |||
280 | def push(self, opts): |
|
280 | def push(self, opts): | |
281 | """perform whatever action is analogous to 'hg push' |
|
281 | """perform whatever action is analogous to 'hg push' | |
282 |
|
282 | |||
283 | This may be a no-op on some systems. |
|
283 | This may be a no-op on some systems. | |
284 | """ |
|
284 | """ | |
285 | raise NotImplementedError |
|
285 | raise NotImplementedError | |
286 |
|
286 | |||
287 | def add(self, ui, match, prefix, explicitonly, **opts): |
|
287 | def add(self, ui, match, prefix, explicitonly, **opts): | |
288 | return [] |
|
288 | return [] | |
289 |
|
289 | |||
290 | def addremove(self, matcher, prefix, opts, dry_run, similarity): |
|
290 | def addremove(self, matcher, prefix, opts, dry_run, similarity): | |
291 | self.ui.warn("%s: %s" % (prefix, _("addremove is not supported"))) |
|
291 | self.ui.warn("%s: %s" % (prefix, _("addremove is not supported"))) | |
292 | return 1 |
|
292 | return 1 | |
293 |
|
293 | |||
294 | def cat(self, match, fm, fntemplate, prefix, **opts): |
|
294 | def cat(self, match, fm, fntemplate, prefix, **opts): | |
295 | return 1 |
|
295 | return 1 | |
296 |
|
296 | |||
297 | def status(self, rev2, **opts): |
|
297 | def status(self, rev2, **opts): | |
298 | return scmutil.status([], [], [], [], [], [], []) |
|
298 | return scmutil.status([], [], [], [], [], [], []) | |
299 |
|
299 | |||
300 | def diff(self, ui, diffopts, node2, match, prefix, **opts): |
|
300 | def diff(self, ui, diffopts, node2, match, prefix, **opts): | |
301 | pass |
|
301 | pass | |
302 |
|
302 | |||
303 | def outgoing(self, ui, dest, opts): |
|
303 | def outgoing(self, ui, dest, opts): | |
304 | return 1 |
|
304 | return 1 | |
305 |
|
305 | |||
306 | def incoming(self, ui, source, opts): |
|
306 | def incoming(self, ui, source, opts): | |
307 | return 1 |
|
307 | return 1 | |
308 |
|
308 | |||
309 | def files(self): |
|
309 | def files(self): | |
310 | """return filename iterator""" |
|
310 | """return filename iterator""" | |
311 | raise NotImplementedError |
|
311 | raise NotImplementedError | |
312 |
|
312 | |||
313 | def filedata(self, name, decode): |
|
313 | def filedata(self, name, decode): | |
314 | """return file data, optionally passed through repo decoders""" |
|
314 | """return file data, optionally passed through repo decoders""" | |
315 | raise NotImplementedError |
|
315 | raise NotImplementedError | |
316 |
|
316 | |||
317 | def fileflags(self, name): |
|
317 | def fileflags(self, name): | |
318 | """return file flags""" |
|
318 | """return file flags""" | |
319 | return '' |
|
319 | return '' | |
320 |
|
320 | |||
321 | def getfileset(self, expr): |
|
321 | def getfileset(self, expr): | |
322 | """Resolve the fileset expression for this repo""" |
|
322 | """Resolve the fileset expression for this repo""" | |
323 | return set() |
|
323 | return set() | |
324 |
|
324 | |||
325 | def printfiles(self, ui, m, fm, fmt, subrepos): |
|
325 | def printfiles(self, ui, m, fm, fmt, subrepos): | |
326 | """handle the files command for this subrepo""" |
|
326 | """handle the files command for this subrepo""" | |
327 | return 1 |
|
327 | return 1 | |
328 |
|
328 | |||
329 | def archive(self, archiver, prefix, match=None, decode=True): |
|
329 | def archive(self, archiver, prefix, match=None, decode=True): | |
330 | if match is not None: |
|
330 | if match is not None: | |
331 | files = [f for f in self.files() if match(f)] |
|
331 | files = [f for f in self.files() if match(f)] | |
332 | else: |
|
332 | else: | |
333 | files = self.files() |
|
333 | files = self.files() | |
334 | total = len(files) |
|
334 | total = len(files) | |
335 | relpath = subrelpath(self) |
|
335 | relpath = subrelpath(self) | |
336 | self.ui.progress(_('archiving (%s)') % relpath, 0, |
|
336 | self.ui.progress(_('archiving (%s)') % relpath, 0, | |
337 | unit=_('files'), total=total) |
|
337 | unit=_('files'), total=total) | |
338 | for i, name in enumerate(files): |
|
338 | for i, name in enumerate(files): | |
339 | flags = self.fileflags(name) |
|
339 | flags = self.fileflags(name) | |
340 | mode = 'x' in flags and 0o755 or 0o644 |
|
340 | mode = 'x' in flags and 0o755 or 0o644 | |
341 | symlink = 'l' in flags |
|
341 | symlink = 'l' in flags | |
342 | archiver.addfile(prefix + self._path + '/' + name, |
|
342 | archiver.addfile(prefix + self._path + '/' + name, | |
343 | mode, symlink, self.filedata(name, decode)) |
|
343 | mode, symlink, self.filedata(name, decode)) | |
344 | self.ui.progress(_('archiving (%s)') % relpath, i + 1, |
|
344 | self.ui.progress(_('archiving (%s)') % relpath, i + 1, | |
345 | unit=_('files'), total=total) |
|
345 | unit=_('files'), total=total) | |
346 | self.ui.progress(_('archiving (%s)') % relpath, None) |
|
346 | self.ui.progress(_('archiving (%s)') % relpath, None) | |
347 | return total |
|
347 | return total | |
348 |
|
348 | |||
349 | def walk(self, match): |
|
349 | def walk(self, match): | |
350 | ''' |
|
350 | ''' | |
351 | walk recursively through the directory tree, finding all files |
|
351 | walk recursively through the directory tree, finding all files | |
352 | matched by the match function |
|
352 | matched by the match function | |
353 | ''' |
|
353 | ''' | |
354 |
|
354 | |||
355 | def forget(self, match, prefix, dryrun): |
|
355 | def forget(self, match, prefix, dryrun): | |
356 | return ([], []) |
|
356 | return ([], []) | |
357 |
|
357 | |||
358 | def removefiles(self, matcher, prefix, after, force, subrepos, |
|
358 | def removefiles(self, matcher, prefix, after, force, subrepos, | |
359 | dryrun, warnings): |
|
359 | dryrun, warnings): | |
360 | """remove the matched files from the subrepository and the filesystem, |
|
360 | """remove the matched files from the subrepository and the filesystem, | |
361 | possibly by force and/or after the file has been removed from the |
|
361 | possibly by force and/or after the file has been removed from the | |
362 | filesystem. Return 0 on success, 1 on any warning. |
|
362 | filesystem. Return 0 on success, 1 on any warning. | |
363 | """ |
|
363 | """ | |
364 | warnings.append(_("warning: removefiles not implemented (%s)") |
|
364 | warnings.append(_("warning: removefiles not implemented (%s)") | |
365 | % self._path) |
|
365 | % self._path) | |
366 | return 1 |
|
366 | return 1 | |
367 |
|
367 | |||
368 | def revert(self, substate, *pats, **opts): |
|
368 | def revert(self, substate, *pats, **opts): | |
369 | self.ui.warn(_('%s: reverting %s subrepos is unsupported\n') \ |
|
369 | self.ui.warn(_('%s: reverting %s subrepos is unsupported\n') \ | |
370 | % (substate[0], substate[2])) |
|
370 | % (substate[0], substate[2])) | |
371 | return [] |
|
371 | return [] | |
372 |
|
372 | |||
373 | def shortid(self, revid): |
|
373 | def shortid(self, revid): | |
374 | return revid |
|
374 | return revid | |
375 |
|
375 | |||
376 | def unshare(self): |
|
376 | def unshare(self): | |
377 | ''' |
|
377 | ''' | |
378 | convert this repository from shared to normal storage. |
|
378 | convert this repository from shared to normal storage. | |
379 | ''' |
|
379 | ''' | |
380 |
|
380 | |||
381 | def verify(self): |
|
381 | def verify(self): | |
382 | '''verify the integrity of the repository. Return 0 on success or |
|
382 | '''verify the integrity of the repository. Return 0 on success or | |
383 | warning, 1 on any error. |
|
383 | warning, 1 on any error. | |
384 | ''' |
|
384 | ''' | |
385 | return 0 |
|
385 | return 0 | |
386 |
|
386 | |||
387 | @propertycache |
|
387 | @propertycache | |
388 | def wvfs(self): |
|
388 | def wvfs(self): | |
389 | """return vfs to access the working directory of this subrepository |
|
389 | """return vfs to access the working directory of this subrepository | |
390 | """ |
|
390 | """ | |
391 | return vfsmod.vfs(self._ctx.repo().wvfs.join(self._path)) |
|
391 | return vfsmod.vfs(self._ctx.repo().wvfs.join(self._path)) | |
392 |
|
392 | |||
393 | @propertycache |
|
393 | @propertycache | |
394 | def _relpath(self): |
|
394 | def _relpath(self): | |
395 | """return path to this subrepository as seen from outermost repository |
|
395 | """return path to this subrepository as seen from outermost repository | |
396 | """ |
|
396 | """ | |
397 | return self.wvfs.reljoin(reporelpath(self._ctx.repo()), self._path) |
|
397 | return self.wvfs.reljoin(reporelpath(self._ctx.repo()), self._path) | |
398 |
|
398 | |||
399 | class hgsubrepo(abstractsubrepo): |
|
399 | class hgsubrepo(abstractsubrepo): | |
400 | def __init__(self, ctx, path, state, allowcreate): |
|
400 | def __init__(self, ctx, path, state, allowcreate): | |
401 | super(hgsubrepo, self).__init__(ctx, path) |
|
401 | super(hgsubrepo, self).__init__(ctx, path) | |
402 | self._state = state |
|
402 | self._state = state | |
403 | r = ctx.repo() |
|
403 | r = ctx.repo() | |
404 | root = r.wjoin(path) |
|
404 | root = r.wjoin(path) | |
405 | create = allowcreate and not r.wvfs.exists('%s/.hg' % path) |
|
405 | create = allowcreate and not r.wvfs.exists('%s/.hg' % path) | |
406 | self._repo = hg.repository(r.baseui, root, create=create) |
|
406 | self._repo = hg.repository(r.baseui, root, create=create) | |
407 |
|
407 | |||
408 | # Propagate the parent's --hidden option |
|
408 | # Propagate the parent's --hidden option | |
409 | if r is r.unfiltered(): |
|
409 | if r is r.unfiltered(): | |
410 | self._repo = self._repo.unfiltered() |
|
410 | self._repo = self._repo.unfiltered() | |
411 |
|
411 | |||
412 | self.ui = self._repo.ui |
|
412 | self.ui = self._repo.ui | |
413 | for s, k in [('ui', 'commitsubrepos')]: |
|
413 | for s, k in [('ui', 'commitsubrepos')]: | |
414 | v = r.ui.config(s, k) |
|
414 | v = r.ui.config(s, k) | |
415 | if v: |
|
415 | if v: | |
416 | self.ui.setconfig(s, k, v, 'subrepo') |
|
416 | self.ui.setconfig(s, k, v, 'subrepo') | |
417 | # internal config: ui._usedassubrepo |
|
417 | # internal config: ui._usedassubrepo | |
418 | self.ui.setconfig('ui', '_usedassubrepo', 'True', 'subrepo') |
|
418 | self.ui.setconfig('ui', '_usedassubrepo', 'True', 'subrepo') | |
419 | self._initrepo(r, state[0], create) |
|
419 | self._initrepo(r, state[0], create) | |
420 |
|
420 | |||
421 | @annotatesubrepoerror |
|
421 | @annotatesubrepoerror | |
422 | def addwebdirpath(self, serverpath, webconf): |
|
422 | def addwebdirpath(self, serverpath, webconf): | |
423 | cmdutil.addwebdirpath(self._repo, subrelpath(self), webconf) |
|
423 | cmdutil.addwebdirpath(self._repo, subrelpath(self), webconf) | |
424 |
|
424 | |||
425 | def storeclean(self, path): |
|
425 | def storeclean(self, path): | |
426 | with self._repo.lock(): |
|
426 | with self._repo.lock(): | |
427 | return self._storeclean(path) |
|
427 | return self._storeclean(path) | |
428 |
|
428 | |||
429 | def _storeclean(self, path): |
|
429 | def _storeclean(self, path): | |
430 | clean = True |
|
430 | clean = True | |
431 | itercache = self._calcstorehash(path) |
|
431 | itercache = self._calcstorehash(path) | |
432 | for filehash in self._readstorehashcache(path): |
|
432 | for filehash in self._readstorehashcache(path): | |
433 | if filehash != next(itercache, None): |
|
433 | if filehash != next(itercache, None): | |
434 | clean = False |
|
434 | clean = False | |
435 | break |
|
435 | break | |
436 | if clean: |
|
436 | if clean: | |
437 | # if not empty: |
|
437 | # if not empty: | |
438 | # the cached and current pull states have a different size |
|
438 | # the cached and current pull states have a different size | |
439 | clean = next(itercache, None) is None |
|
439 | clean = next(itercache, None) is None | |
440 | return clean |
|
440 | return clean | |
441 |
|
441 | |||
442 | def _calcstorehash(self, remotepath): |
|
442 | def _calcstorehash(self, remotepath): | |
443 | '''calculate a unique "store hash" |
|
443 | '''calculate a unique "store hash" | |
444 |
|
444 | |||
445 | This method is used to to detect when there are changes that may |
|
445 | This method is used to to detect when there are changes that may | |
446 | require a push to a given remote path.''' |
|
446 | require a push to a given remote path.''' | |
447 | # sort the files that will be hashed in increasing (likely) file size |
|
447 | # sort the files that will be hashed in increasing (likely) file size | |
448 | filelist = ('bookmarks', 'store/phaseroots', 'store/00changelog.i') |
|
448 | filelist = ('bookmarks', 'store/phaseroots', 'store/00changelog.i') | |
449 | yield '# %s\n' % _expandedabspath(remotepath) |
|
449 | yield '# %s\n' % _expandedabspath(remotepath) | |
450 | vfs = self._repo.vfs |
|
450 | vfs = self._repo.vfs | |
451 | for relname in filelist: |
|
451 | for relname in filelist: | |
452 | filehash = node.hex(hashlib.sha1(vfs.tryread(relname)).digest()) |
|
452 | filehash = node.hex(hashlib.sha1(vfs.tryread(relname)).digest()) | |
453 | yield '%s = %s\n' % (relname, filehash) |
|
453 | yield '%s = %s\n' % (relname, filehash) | |
454 |
|
454 | |||
455 | @propertycache |
|
455 | @propertycache | |
456 | def _cachestorehashvfs(self): |
|
456 | def _cachestorehashvfs(self): | |
457 | return vfsmod.vfs(self._repo.vfs.join('cache/storehash')) |
|
457 | return vfsmod.vfs(self._repo.vfs.join('cache/storehash')) | |
458 |
|
458 | |||
459 | def _readstorehashcache(self, remotepath): |
|
459 | def _readstorehashcache(self, remotepath): | |
460 | '''read the store hash cache for a given remote repository''' |
|
460 | '''read the store hash cache for a given remote repository''' | |
461 | cachefile = _getstorehashcachename(remotepath) |
|
461 | cachefile = _getstorehashcachename(remotepath) | |
462 | return self._cachestorehashvfs.tryreadlines(cachefile, 'r') |
|
462 | return self._cachestorehashvfs.tryreadlines(cachefile, 'r') | |
463 |
|
463 | |||
464 | def _cachestorehash(self, remotepath): |
|
464 | def _cachestorehash(self, remotepath): | |
465 | '''cache the current store hash |
|
465 | '''cache the current store hash | |
466 |
|
466 | |||
467 | Each remote repo requires its own store hash cache, because a subrepo |
|
467 | Each remote repo requires its own store hash cache, because a subrepo | |
468 | store may be "clean" versus a given remote repo, but not versus another |
|
468 | store may be "clean" versus a given remote repo, but not versus another | |
469 | ''' |
|
469 | ''' | |
470 | cachefile = _getstorehashcachename(remotepath) |
|
470 | cachefile = _getstorehashcachename(remotepath) | |
471 | with self._repo.lock(): |
|
471 | with self._repo.lock(): | |
472 | storehash = list(self._calcstorehash(remotepath)) |
|
472 | storehash = list(self._calcstorehash(remotepath)) | |
473 | vfs = self._cachestorehashvfs |
|
473 | vfs = self._cachestorehashvfs | |
474 | vfs.writelines(cachefile, storehash, mode='wb', notindexed=True) |
|
474 | vfs.writelines(cachefile, storehash, mode='wb', notindexed=True) | |
475 |
|
475 | |||
476 | def _getctx(self): |
|
476 | def _getctx(self): | |
477 | '''fetch the context for this subrepo revision, possibly a workingctx |
|
477 | '''fetch the context for this subrepo revision, possibly a workingctx | |
478 | ''' |
|
478 | ''' | |
479 | if self._ctx.rev() is None: |
|
479 | if self._ctx.rev() is None: | |
480 | return self._repo[None] # workingctx if parent is workingctx |
|
480 | return self._repo[None] # workingctx if parent is workingctx | |
481 | else: |
|
481 | else: | |
482 | rev = self._state[1] |
|
482 | rev = self._state[1] | |
483 | return self._repo[rev] |
|
483 | return self._repo[rev] | |
484 |
|
484 | |||
485 | @annotatesubrepoerror |
|
485 | @annotatesubrepoerror | |
486 | def _initrepo(self, parentrepo, source, create): |
|
486 | def _initrepo(self, parentrepo, source, create): | |
487 | self._repo._subparent = parentrepo |
|
487 | self._repo._subparent = parentrepo | |
488 | self._repo._subsource = source |
|
488 | self._repo._subsource = source | |
489 |
|
489 | |||
490 | if create: |
|
490 | if create: | |
491 | lines = ['[paths]\n'] |
|
491 | lines = ['[paths]\n'] | |
492 |
|
492 | |||
493 | def addpathconfig(key, value): |
|
493 | def addpathconfig(key, value): | |
494 | if value: |
|
494 | if value: | |
495 | lines.append('%s = %s\n' % (key, value)) |
|
495 | lines.append('%s = %s\n' % (key, value)) | |
496 | self.ui.setconfig('paths', key, value, 'subrepo') |
|
496 | self.ui.setconfig('paths', key, value, 'subrepo') | |
497 |
|
497 | |||
498 | defpath = _abssource(self._repo, abort=False) |
|
498 | defpath = _abssource(self._repo, abort=False) | |
499 | defpushpath = _abssource(self._repo, True, abort=False) |
|
499 | defpushpath = _abssource(self._repo, True, abort=False) | |
500 | addpathconfig('default', defpath) |
|
500 | addpathconfig('default', defpath) | |
501 | if defpath != defpushpath: |
|
501 | if defpath != defpushpath: | |
502 | addpathconfig('default-push', defpushpath) |
|
502 | addpathconfig('default-push', defpushpath) | |
503 |
|
503 | |||
504 | self._repo.vfs.write('hgrc', util.tonativeeol(''.join(lines))) |
|
504 | self._repo.vfs.write('hgrc', util.tonativeeol(''.join(lines))) | |
505 |
|
505 | |||
506 | @annotatesubrepoerror |
|
506 | @annotatesubrepoerror | |
507 | def add(self, ui, match, prefix, explicitonly, **opts): |
|
507 | def add(self, ui, match, prefix, explicitonly, **opts): | |
508 | return cmdutil.add(ui, self._repo, match, |
|
508 | return cmdutil.add(ui, self._repo, match, | |
509 | self.wvfs.reljoin(prefix, self._path), |
|
509 | self.wvfs.reljoin(prefix, self._path), | |
510 | explicitonly, **opts) |
|
510 | explicitonly, **opts) | |
511 |
|
511 | |||
512 | @annotatesubrepoerror |
|
512 | @annotatesubrepoerror | |
513 | def addremove(self, m, prefix, opts, dry_run, similarity): |
|
513 | def addremove(self, m, prefix, opts, dry_run, similarity): | |
514 | # In the same way as sub directories are processed, once in a subrepo, |
|
514 | # In the same way as sub directories are processed, once in a subrepo, | |
515 | # always entry any of its subrepos. Don't corrupt the options that will |
|
515 | # always entry any of its subrepos. Don't corrupt the options that will | |
516 | # be used to process sibling subrepos however. |
|
516 | # be used to process sibling subrepos however. | |
517 | opts = copy.copy(opts) |
|
517 | opts = copy.copy(opts) | |
518 | opts['subrepos'] = True |
|
518 | opts['subrepos'] = True | |
519 | return scmutil.addremove(self._repo, m, |
|
519 | return scmutil.addremove(self._repo, m, | |
520 | self.wvfs.reljoin(prefix, self._path), opts, |
|
520 | self.wvfs.reljoin(prefix, self._path), opts, | |
521 | dry_run, similarity) |
|
521 | dry_run, similarity) | |
522 |
|
522 | |||
523 | @annotatesubrepoerror |
|
523 | @annotatesubrepoerror | |
524 | def cat(self, match, fm, fntemplate, prefix, **opts): |
|
524 | def cat(self, match, fm, fntemplate, prefix, **opts): | |
525 | rev = self._state[1] |
|
525 | rev = self._state[1] | |
526 | ctx = self._repo[rev] |
|
526 | ctx = self._repo[rev] | |
527 | return cmdutil.cat(self.ui, self._repo, ctx, match, fm, fntemplate, |
|
527 | return cmdutil.cat(self.ui, self._repo, ctx, match, fm, fntemplate, | |
528 | prefix, **opts) |
|
528 | prefix, **opts) | |
529 |
|
529 | |||
530 | @annotatesubrepoerror |
|
530 | @annotatesubrepoerror | |
531 | def status(self, rev2, **opts): |
|
531 | def status(self, rev2, **opts): | |
532 | try: |
|
532 | try: | |
533 | rev1 = self._state[1] |
|
533 | rev1 = self._state[1] | |
534 | ctx1 = self._repo[rev1] |
|
534 | ctx1 = self._repo[rev1] | |
535 | ctx2 = self._repo[rev2] |
|
535 | ctx2 = self._repo[rev2] | |
536 | return self._repo.status(ctx1, ctx2, **opts) |
|
536 | return self._repo.status(ctx1, ctx2, **opts) | |
537 | except error.RepoLookupError as inst: |
|
537 | except error.RepoLookupError as inst: | |
538 | self.ui.warn(_('warning: error "%s" in subrepository "%s"\n') |
|
538 | self.ui.warn(_('warning: error "%s" in subrepository "%s"\n') | |
539 | % (inst, subrelpath(self))) |
|
539 | % (inst, subrelpath(self))) | |
540 | return scmutil.status([], [], [], [], [], [], []) |
|
540 | return scmutil.status([], [], [], [], [], [], []) | |
541 |
|
541 | |||
542 | @annotatesubrepoerror |
|
542 | @annotatesubrepoerror | |
543 | def diff(self, ui, diffopts, node2, match, prefix, **opts): |
|
543 | def diff(self, ui, diffopts, node2, match, prefix, **opts): | |
544 | try: |
|
544 | try: | |
545 | node1 = node.bin(self._state[1]) |
|
545 | node1 = node.bin(self._state[1]) | |
546 | # We currently expect node2 to come from substate and be |
|
546 | # We currently expect node2 to come from substate and be | |
547 | # in hex format |
|
547 | # in hex format | |
548 | if node2 is not None: |
|
548 | if node2 is not None: | |
549 | node2 = node.bin(node2) |
|
549 | node2 = node.bin(node2) | |
550 | logcmdutil.diffordiffstat(ui, self._repo, diffopts, |
|
550 | logcmdutil.diffordiffstat(ui, self._repo, diffopts, | |
551 | node1, node2, match, |
|
551 | node1, node2, match, | |
552 | prefix=posixpath.join(prefix, self._path), |
|
552 | prefix=posixpath.join(prefix, self._path), | |
553 | listsubrepos=True, **opts) |
|
553 | listsubrepos=True, **opts) | |
554 | except error.RepoLookupError as inst: |
|
554 | except error.RepoLookupError as inst: | |
555 | self.ui.warn(_('warning: error "%s" in subrepository "%s"\n') |
|
555 | self.ui.warn(_('warning: error "%s" in subrepository "%s"\n') | |
556 | % (inst, subrelpath(self))) |
|
556 | % (inst, subrelpath(self))) | |
557 |
|
557 | |||
558 | @annotatesubrepoerror |
|
558 | @annotatesubrepoerror | |
559 | def archive(self, archiver, prefix, match=None, decode=True): |
|
559 | def archive(self, archiver, prefix, match=None, decode=True): | |
560 | self._get(self._state + ('hg',)) |
|
560 | self._get(self._state + ('hg',)) | |
561 | files = self.files() |
|
561 | files = self.files() | |
562 | if match: |
|
562 | if match: | |
563 | files = [f for f in files if match(f)] |
|
563 | files = [f for f in files if match(f)] | |
564 | rev = self._state[1] |
|
564 | rev = self._state[1] | |
565 | ctx = self._repo[rev] |
|
565 | ctx = self._repo[rev] | |
566 | scmutil.fileprefetchhooks(self._repo, ctx, files) |
|
566 | scmutil.fileprefetchhooks(self._repo, ctx, files) | |
567 | total = abstractsubrepo.archive(self, archiver, prefix, match) |
|
567 | total = abstractsubrepo.archive(self, archiver, prefix, match) | |
568 | for subpath in ctx.substate: |
|
568 | for subpath in ctx.substate: | |
569 | s = subrepo(ctx, subpath, True) |
|
569 | s = subrepo(ctx, subpath, True) | |
570 | submatch = matchmod.subdirmatcher(subpath, match) |
|
570 | submatch = matchmod.subdirmatcher(subpath, match) | |
571 | total += s.archive(archiver, prefix + self._path + '/', submatch, |
|
571 | total += s.archive(archiver, prefix + self._path + '/', submatch, | |
572 | decode) |
|
572 | decode) | |
573 | return total |
|
573 | return total | |
574 |
|
574 | |||
575 | @annotatesubrepoerror |
|
575 | @annotatesubrepoerror | |
576 | def dirty(self, ignoreupdate=False, missing=False): |
|
576 | def dirty(self, ignoreupdate=False, missing=False): | |
577 | r = self._state[1] |
|
577 | r = self._state[1] | |
578 | if r == '' and not ignoreupdate: # no state recorded |
|
578 | if r == '' and not ignoreupdate: # no state recorded | |
579 | return True |
|
579 | return True | |
580 | w = self._repo[None] |
|
580 | w = self._repo[None] | |
581 | if r != w.p1().hex() and not ignoreupdate: |
|
581 | if r != w.p1().hex() and not ignoreupdate: | |
582 | # different version checked out |
|
582 | # different version checked out | |
583 | return True |
|
583 | return True | |
584 | return w.dirty(missing=missing) # working directory changed |
|
584 | return w.dirty(missing=missing) # working directory changed | |
585 |
|
585 | |||
586 | def basestate(self): |
|
586 | def basestate(self): | |
587 | return self._repo['.'].hex() |
|
587 | return self._repo['.'].hex() | |
588 |
|
588 | |||
589 | def checknested(self, path): |
|
589 | def checknested(self, path): | |
590 | return self._repo._checknested(self._repo.wjoin(path)) |
|
590 | return self._repo._checknested(self._repo.wjoin(path)) | |
591 |
|
591 | |||
592 | @annotatesubrepoerror |
|
592 | @annotatesubrepoerror | |
593 | def commit(self, text, user, date): |
|
593 | def commit(self, text, user, date): | |
594 | # don't bother committing in the subrepo if it's only been |
|
594 | # don't bother committing in the subrepo if it's only been | |
595 | # updated |
|
595 | # updated | |
596 | if not self.dirty(True): |
|
596 | if not self.dirty(True): | |
597 | return self._repo['.'].hex() |
|
597 | return self._repo['.'].hex() | |
598 | self.ui.debug("committing subrepo %s\n" % subrelpath(self)) |
|
598 | self.ui.debug("committing subrepo %s\n" % subrelpath(self)) | |
599 | n = self._repo.commit(text, user, date) |
|
599 | n = self._repo.commit(text, user, date) | |
600 | if not n: |
|
600 | if not n: | |
601 | return self._repo['.'].hex() # different version checked out |
|
601 | return self._repo['.'].hex() # different version checked out | |
602 | return node.hex(n) |
|
602 | return node.hex(n) | |
603 |
|
603 | |||
604 | @annotatesubrepoerror |
|
604 | @annotatesubrepoerror | |
605 | def phase(self, state): |
|
605 | def phase(self, state): | |
606 | return self._repo[state].phase() |
|
606 | return self._repo[state].phase() | |
607 |
|
607 | |||
608 | @annotatesubrepoerror |
|
608 | @annotatesubrepoerror | |
609 | def remove(self): |
|
609 | def remove(self): | |
610 | # we can't fully delete the repository as it may contain |
|
610 | # we can't fully delete the repository as it may contain | |
611 | # local-only history |
|
611 | # local-only history | |
612 | self.ui.note(_('removing subrepo %s\n') % subrelpath(self)) |
|
612 | self.ui.note(_('removing subrepo %s\n') % subrelpath(self)) | |
613 | hg.clean(self._repo, node.nullid, False) |
|
613 | hg.clean(self._repo, node.nullid, False) | |
614 |
|
614 | |||
615 | def _get(self, state): |
|
615 | def _get(self, state): | |
616 | source, revision, kind = state |
|
616 | source, revision, kind = state | |
617 | parentrepo = self._repo._subparent |
|
617 | parentrepo = self._repo._subparent | |
618 |
|
618 | |||
619 | if revision in self._repo.unfiltered(): |
|
619 | if revision in self._repo.unfiltered(): | |
620 | # Allow shared subrepos tracked at null to setup the sharedpath |
|
620 | # Allow shared subrepos tracked at null to setup the sharedpath | |
621 | if len(self._repo) != 0 or not parentrepo.shared(): |
|
621 | if len(self._repo) != 0 or not parentrepo.shared(): | |
622 | return True |
|
622 | return True | |
623 | self._repo._subsource = source |
|
623 | self._repo._subsource = source | |
624 | srcurl = _abssource(self._repo) |
|
624 | srcurl = _abssource(self._repo) | |
625 | other = hg.peer(self._repo, {}, srcurl) |
|
625 | other = hg.peer(self._repo, {}, srcurl) | |
626 | if len(self._repo) == 0: |
|
626 | if len(self._repo) == 0: | |
627 | # use self._repo.vfs instead of self.wvfs to remove .hg only |
|
627 | # use self._repo.vfs instead of self.wvfs to remove .hg only | |
628 | self._repo.vfs.rmtree() |
|
628 | self._repo.vfs.rmtree() | |
629 |
|
629 | |||
630 | # A remote subrepo could be shared if there is a local copy |
|
630 | # A remote subrepo could be shared if there is a local copy | |
631 | # relative to the parent's share source. But clone pooling doesn't |
|
631 | # relative to the parent's share source. But clone pooling doesn't | |
632 | # assemble the repos in a tree, so that can't be consistently done. |
|
632 | # assemble the repos in a tree, so that can't be consistently done. | |
633 | # A simpler option is for the user to configure clone pooling, and |
|
633 | # A simpler option is for the user to configure clone pooling, and | |
634 | # work with that. |
|
634 | # work with that. | |
635 | if parentrepo.shared() and hg.islocal(srcurl): |
|
635 | if parentrepo.shared() and hg.islocal(srcurl): | |
636 | self.ui.status(_('sharing subrepo %s from %s\n') |
|
636 | self.ui.status(_('sharing subrepo %s from %s\n') | |
637 | % (subrelpath(self), srcurl)) |
|
637 | % (subrelpath(self), srcurl)) | |
638 | shared = hg.share(self._repo._subparent.baseui, |
|
638 | shared = hg.share(self._repo._subparent.baseui, | |
639 | other, self._repo.root, |
|
639 | other, self._repo.root, | |
640 | update=False, bookmarks=False) |
|
640 | update=False, bookmarks=False) | |
641 | self._repo = shared.local() |
|
641 | self._repo = shared.local() | |
642 | else: |
|
642 | else: | |
643 | # TODO: find a common place for this and this code in the |
|
643 | # TODO: find a common place for this and this code in the | |
644 | # share.py wrap of the clone command. |
|
644 | # share.py wrap of the clone command. | |
645 | if parentrepo.shared(): |
|
645 | if parentrepo.shared(): | |
646 | pool = self.ui.config('share', 'pool') |
|
646 | pool = self.ui.config('share', 'pool') | |
647 | if pool: |
|
647 | if pool: | |
648 | pool = util.expandpath(pool) |
|
648 | pool = util.expandpath(pool) | |
649 |
|
649 | |||
650 | shareopts = { |
|
650 | shareopts = { | |
651 | 'pool': pool, |
|
651 | 'pool': pool, | |
652 | 'mode': self.ui.config('share', 'poolnaming'), |
|
652 | 'mode': self.ui.config('share', 'poolnaming'), | |
653 | } |
|
653 | } | |
654 | else: |
|
654 | else: | |
655 | shareopts = {} |
|
655 | shareopts = {} | |
656 |
|
656 | |||
657 | self.ui.status(_('cloning subrepo %s from %s\n') |
|
657 | self.ui.status(_('cloning subrepo %s from %s\n') | |
658 | % (subrelpath(self), srcurl)) |
|
658 | % (subrelpath(self), srcurl)) | |
659 | other, cloned = hg.clone(self._repo._subparent.baseui, {}, |
|
659 | other, cloned = hg.clone(self._repo._subparent.baseui, {}, | |
660 | other, self._repo.root, |
|
660 | other, self._repo.root, | |
661 | update=False, shareopts=shareopts) |
|
661 | update=False, shareopts=shareopts) | |
662 | self._repo = cloned.local() |
|
662 | self._repo = cloned.local() | |
663 | self._initrepo(parentrepo, source, create=True) |
|
663 | self._initrepo(parentrepo, source, create=True) | |
664 | self._cachestorehash(srcurl) |
|
664 | self._cachestorehash(srcurl) | |
665 | else: |
|
665 | else: | |
666 | self.ui.status(_('pulling subrepo %s from %s\n') |
|
666 | self.ui.status(_('pulling subrepo %s from %s\n') | |
667 | % (subrelpath(self), srcurl)) |
|
667 | % (subrelpath(self), srcurl)) | |
668 | cleansub = self.storeclean(srcurl) |
|
668 | cleansub = self.storeclean(srcurl) | |
669 | exchange.pull(self._repo, other) |
|
669 | exchange.pull(self._repo, other) | |
670 | if cleansub: |
|
670 | if cleansub: | |
671 | # keep the repo clean after pull |
|
671 | # keep the repo clean after pull | |
672 | self._cachestorehash(srcurl) |
|
672 | self._cachestorehash(srcurl) | |
673 | return False |
|
673 | return False | |
674 |
|
674 | |||
675 | @annotatesubrepoerror |
|
675 | @annotatesubrepoerror | |
676 | def get(self, state, overwrite=False): |
|
676 | def get(self, state, overwrite=False): | |
677 | inrepo = self._get(state) |
|
677 | inrepo = self._get(state) | |
678 | source, revision, kind = state |
|
678 | source, revision, kind = state | |
679 | repo = self._repo |
|
679 | repo = self._repo | |
680 | repo.ui.debug("getting subrepo %s\n" % self._path) |
|
680 | repo.ui.debug("getting subrepo %s\n" % self._path) | |
681 | if inrepo: |
|
681 | if inrepo: | |
682 | urepo = repo.unfiltered() |
|
682 | urepo = repo.unfiltered() | |
683 | ctx = urepo[revision] |
|
683 | ctx = urepo[revision] | |
684 | if ctx.hidden(): |
|
684 | if ctx.hidden(): | |
685 | urepo.ui.warn( |
|
685 | urepo.ui.warn( | |
686 | _('revision %s in subrepository "%s" is hidden\n') \ |
|
686 | _('revision %s in subrepository "%s" is hidden\n') \ | |
687 | % (revision[0:12], self._path)) |
|
687 | % (revision[0:12], self._path)) | |
688 | repo = urepo |
|
688 | repo = urepo | |
689 | hg.updaterepo(repo, revision, overwrite) |
|
689 | hg.updaterepo(repo, revision, overwrite) | |
690 |
|
690 | |||
691 | @annotatesubrepoerror |
|
691 | @annotatesubrepoerror | |
692 | def merge(self, state): |
|
692 | def merge(self, state): | |
693 | self._get(state) |
|
693 | self._get(state) | |
694 | cur = self._repo['.'] |
|
694 | cur = self._repo['.'] | |
695 | dst = self._repo[state[1]] |
|
695 | dst = self._repo[state[1]] | |
696 | anc = dst.ancestor(cur) |
|
696 | anc = dst.ancestor(cur) | |
697 |
|
697 | |||
698 | def mergefunc(): |
|
698 | def mergefunc(): | |
699 | if anc == cur and dst.branch() == cur.branch(): |
|
699 | if anc == cur and dst.branch() == cur.branch(): | |
700 | self.ui.debug('updating subrepository "%s"\n' |
|
700 | self.ui.debug('updating subrepository "%s"\n' | |
701 | % subrelpath(self)) |
|
701 | % subrelpath(self)) | |
702 | hg.update(self._repo, state[1]) |
|
702 | hg.update(self._repo, state[1]) | |
703 | elif anc == dst: |
|
703 | elif anc == dst: | |
704 | self.ui.debug('skipping subrepository "%s"\n' |
|
704 | self.ui.debug('skipping subrepository "%s"\n' | |
705 | % subrelpath(self)) |
|
705 | % subrelpath(self)) | |
706 | else: |
|
706 | else: | |
707 | self.ui.debug('merging subrepository "%s"\n' % subrelpath(self)) |
|
707 | self.ui.debug('merging subrepository "%s"\n' % subrelpath(self)) | |
708 | hg.merge(self._repo, state[1], remind=False) |
|
708 | hg.merge(self._repo, state[1], remind=False) | |
709 |
|
709 | |||
710 | wctx = self._repo[None] |
|
710 | wctx = self._repo[None] | |
711 | if self.dirty(): |
|
711 | if self.dirty(): | |
712 | if anc != dst: |
|
712 | if anc != dst: | |
713 | if _updateprompt(self.ui, self, wctx.dirty(), cur, dst): |
|
713 | if _updateprompt(self.ui, self, wctx.dirty(), cur, dst): | |
714 | mergefunc() |
|
714 | mergefunc() | |
715 | else: |
|
715 | else: | |
716 | mergefunc() |
|
716 | mergefunc() | |
717 | else: |
|
717 | else: | |
718 | mergefunc() |
|
718 | mergefunc() | |
719 |
|
719 | |||
720 | @annotatesubrepoerror |
|
720 | @annotatesubrepoerror | |
721 | def push(self, opts): |
|
721 | def push(self, opts): | |
722 | force = opts.get('force') |
|
722 | force = opts.get('force') | |
723 | newbranch = opts.get('new_branch') |
|
723 | newbranch = opts.get('new_branch') | |
724 | ssh = opts.get('ssh') |
|
724 | ssh = opts.get('ssh') | |
725 |
|
725 | |||
726 | # push subrepos depth-first for coherent ordering |
|
726 | # push subrepos depth-first for coherent ordering | |
727 | c = self._repo[''] |
|
727 | c = self._repo['.'] | |
728 | subs = c.substate # only repos that are committed |
|
728 | subs = c.substate # only repos that are committed | |
729 | for s in sorted(subs): |
|
729 | for s in sorted(subs): | |
730 | if c.sub(s).push(opts) == 0: |
|
730 | if c.sub(s).push(opts) == 0: | |
731 | return False |
|
731 | return False | |
732 |
|
732 | |||
733 | dsturl = _abssource(self._repo, True) |
|
733 | dsturl = _abssource(self._repo, True) | |
734 | if not force: |
|
734 | if not force: | |
735 | if self.storeclean(dsturl): |
|
735 | if self.storeclean(dsturl): | |
736 | self.ui.status( |
|
736 | self.ui.status( | |
737 | _('no changes made to subrepo %s since last push to %s\n') |
|
737 | _('no changes made to subrepo %s since last push to %s\n') | |
738 | % (subrelpath(self), dsturl)) |
|
738 | % (subrelpath(self), dsturl)) | |
739 | return None |
|
739 | return None | |
740 | self.ui.status(_('pushing subrepo %s to %s\n') % |
|
740 | self.ui.status(_('pushing subrepo %s to %s\n') % | |
741 | (subrelpath(self), dsturl)) |
|
741 | (subrelpath(self), dsturl)) | |
742 | other = hg.peer(self._repo, {'ssh': ssh}, dsturl) |
|
742 | other = hg.peer(self._repo, {'ssh': ssh}, dsturl) | |
743 | res = exchange.push(self._repo, other, force, newbranch=newbranch) |
|
743 | res = exchange.push(self._repo, other, force, newbranch=newbranch) | |
744 |
|
744 | |||
745 | # the repo is now clean |
|
745 | # the repo is now clean | |
746 | self._cachestorehash(dsturl) |
|
746 | self._cachestorehash(dsturl) | |
747 | return res.cgresult |
|
747 | return res.cgresult | |
748 |
|
748 | |||
749 | @annotatesubrepoerror |
|
749 | @annotatesubrepoerror | |
750 | def outgoing(self, ui, dest, opts): |
|
750 | def outgoing(self, ui, dest, opts): | |
751 | if 'rev' in opts or 'branch' in opts: |
|
751 | if 'rev' in opts or 'branch' in opts: | |
752 | opts = copy.copy(opts) |
|
752 | opts = copy.copy(opts) | |
753 | opts.pop('rev', None) |
|
753 | opts.pop('rev', None) | |
754 | opts.pop('branch', None) |
|
754 | opts.pop('branch', None) | |
755 | return hg.outgoing(ui, self._repo, _abssource(self._repo, True), opts) |
|
755 | return hg.outgoing(ui, self._repo, _abssource(self._repo, True), opts) | |
756 |
|
756 | |||
757 | @annotatesubrepoerror |
|
757 | @annotatesubrepoerror | |
758 | def incoming(self, ui, source, opts): |
|
758 | def incoming(self, ui, source, opts): | |
759 | if 'rev' in opts or 'branch' in opts: |
|
759 | if 'rev' in opts or 'branch' in opts: | |
760 | opts = copy.copy(opts) |
|
760 | opts = copy.copy(opts) | |
761 | opts.pop('rev', None) |
|
761 | opts.pop('rev', None) | |
762 | opts.pop('branch', None) |
|
762 | opts.pop('branch', None) | |
763 | return hg.incoming(ui, self._repo, _abssource(self._repo, False), opts) |
|
763 | return hg.incoming(ui, self._repo, _abssource(self._repo, False), opts) | |
764 |
|
764 | |||
765 | @annotatesubrepoerror |
|
765 | @annotatesubrepoerror | |
766 | def files(self): |
|
766 | def files(self): | |
767 | rev = self._state[1] |
|
767 | rev = self._state[1] | |
768 | ctx = self._repo[rev] |
|
768 | ctx = self._repo[rev] | |
769 | return ctx.manifest().keys() |
|
769 | return ctx.manifest().keys() | |
770 |
|
770 | |||
771 | def filedata(self, name, decode): |
|
771 | def filedata(self, name, decode): | |
772 | rev = self._state[1] |
|
772 | rev = self._state[1] | |
773 | data = self._repo[rev][name].data() |
|
773 | data = self._repo[rev][name].data() | |
774 | if decode: |
|
774 | if decode: | |
775 | data = self._repo.wwritedata(name, data) |
|
775 | data = self._repo.wwritedata(name, data) | |
776 | return data |
|
776 | return data | |
777 |
|
777 | |||
778 | def fileflags(self, name): |
|
778 | def fileflags(self, name): | |
779 | rev = self._state[1] |
|
779 | rev = self._state[1] | |
780 | ctx = self._repo[rev] |
|
780 | ctx = self._repo[rev] | |
781 | return ctx.flags(name) |
|
781 | return ctx.flags(name) | |
782 |
|
782 | |||
783 | @annotatesubrepoerror |
|
783 | @annotatesubrepoerror | |
784 | def printfiles(self, ui, m, fm, fmt, subrepos): |
|
784 | def printfiles(self, ui, m, fm, fmt, subrepos): | |
785 | # If the parent context is a workingctx, use the workingctx here for |
|
785 | # If the parent context is a workingctx, use the workingctx here for | |
786 | # consistency. |
|
786 | # consistency. | |
787 | if self._ctx.rev() is None: |
|
787 | if self._ctx.rev() is None: | |
788 | ctx = self._repo[None] |
|
788 | ctx = self._repo[None] | |
789 | else: |
|
789 | else: | |
790 | rev = self._state[1] |
|
790 | rev = self._state[1] | |
791 | ctx = self._repo[rev] |
|
791 | ctx = self._repo[rev] | |
792 | return cmdutil.files(ui, ctx, m, fm, fmt, subrepos) |
|
792 | return cmdutil.files(ui, ctx, m, fm, fmt, subrepos) | |
793 |
|
793 | |||
794 | @annotatesubrepoerror |
|
794 | @annotatesubrepoerror | |
795 | def getfileset(self, expr): |
|
795 | def getfileset(self, expr): | |
796 | if self._ctx.rev() is None: |
|
796 | if self._ctx.rev() is None: | |
797 | ctx = self._repo[None] |
|
797 | ctx = self._repo[None] | |
798 | else: |
|
798 | else: | |
799 | rev = self._state[1] |
|
799 | rev = self._state[1] | |
800 | ctx = self._repo[rev] |
|
800 | ctx = self._repo[rev] | |
801 |
|
801 | |||
802 | files = ctx.getfileset(expr) |
|
802 | files = ctx.getfileset(expr) | |
803 |
|
803 | |||
804 | for subpath in ctx.substate: |
|
804 | for subpath in ctx.substate: | |
805 | sub = ctx.sub(subpath) |
|
805 | sub = ctx.sub(subpath) | |
806 |
|
806 | |||
807 | try: |
|
807 | try: | |
808 | files.extend(subpath + '/' + f for f in sub.getfileset(expr)) |
|
808 | files.extend(subpath + '/' + f for f in sub.getfileset(expr)) | |
809 | except error.LookupError: |
|
809 | except error.LookupError: | |
810 | self.ui.status(_("skipping missing subrepository: %s\n") |
|
810 | self.ui.status(_("skipping missing subrepository: %s\n") | |
811 | % self.wvfs.reljoin(reporelpath(self), subpath)) |
|
811 | % self.wvfs.reljoin(reporelpath(self), subpath)) | |
812 | return files |
|
812 | return files | |
813 |
|
813 | |||
814 | def walk(self, match): |
|
814 | def walk(self, match): | |
815 | ctx = self._repo[None] |
|
815 | ctx = self._repo[None] | |
816 | return ctx.walk(match) |
|
816 | return ctx.walk(match) | |
817 |
|
817 | |||
818 | @annotatesubrepoerror |
|
818 | @annotatesubrepoerror | |
819 | def forget(self, match, prefix, dryrun): |
|
819 | def forget(self, match, prefix, dryrun): | |
820 | return cmdutil.forget(self.ui, self._repo, match, |
|
820 | return cmdutil.forget(self.ui, self._repo, match, | |
821 | self.wvfs.reljoin(prefix, self._path), |
|
821 | self.wvfs.reljoin(prefix, self._path), | |
822 | True, dryrun=dryrun) |
|
822 | True, dryrun=dryrun) | |
823 |
|
823 | |||
824 | @annotatesubrepoerror |
|
824 | @annotatesubrepoerror | |
825 | def removefiles(self, matcher, prefix, after, force, subrepos, |
|
825 | def removefiles(self, matcher, prefix, after, force, subrepos, | |
826 | dryrun, warnings): |
|
826 | dryrun, warnings): | |
827 | return cmdutil.remove(self.ui, self._repo, matcher, |
|
827 | return cmdutil.remove(self.ui, self._repo, matcher, | |
828 | self.wvfs.reljoin(prefix, self._path), |
|
828 | self.wvfs.reljoin(prefix, self._path), | |
829 | after, force, subrepos, dryrun) |
|
829 | after, force, subrepos, dryrun) | |
830 |
|
830 | |||
831 | @annotatesubrepoerror |
|
831 | @annotatesubrepoerror | |
832 | def revert(self, substate, *pats, **opts): |
|
832 | def revert(self, substate, *pats, **opts): | |
833 | # reverting a subrepo is a 2 step process: |
|
833 | # reverting a subrepo is a 2 step process: | |
834 | # 1. if the no_backup is not set, revert all modified |
|
834 | # 1. if the no_backup is not set, revert all modified | |
835 | # files inside the subrepo |
|
835 | # files inside the subrepo | |
836 | # 2. update the subrepo to the revision specified in |
|
836 | # 2. update the subrepo to the revision specified in | |
837 | # the corresponding substate dictionary |
|
837 | # the corresponding substate dictionary | |
838 | self.ui.status(_('reverting subrepo %s\n') % substate[0]) |
|
838 | self.ui.status(_('reverting subrepo %s\n') % substate[0]) | |
839 | if not opts.get(r'no_backup'): |
|
839 | if not opts.get(r'no_backup'): | |
840 | # Revert all files on the subrepo, creating backups |
|
840 | # Revert all files on the subrepo, creating backups | |
841 | # Note that this will not recursively revert subrepos |
|
841 | # Note that this will not recursively revert subrepos | |
842 | # We could do it if there was a set:subrepos() predicate |
|
842 | # We could do it if there was a set:subrepos() predicate | |
843 | opts = opts.copy() |
|
843 | opts = opts.copy() | |
844 | opts[r'date'] = None |
|
844 | opts[r'date'] = None | |
845 | opts[r'rev'] = substate[1] |
|
845 | opts[r'rev'] = substate[1] | |
846 |
|
846 | |||
847 | self.filerevert(*pats, **opts) |
|
847 | self.filerevert(*pats, **opts) | |
848 |
|
848 | |||
849 | # Update the repo to the revision specified in the given substate |
|
849 | # Update the repo to the revision specified in the given substate | |
850 | if not opts.get(r'dry_run'): |
|
850 | if not opts.get(r'dry_run'): | |
851 | self.get(substate, overwrite=True) |
|
851 | self.get(substate, overwrite=True) | |
852 |
|
852 | |||
853 | def filerevert(self, *pats, **opts): |
|
853 | def filerevert(self, *pats, **opts): | |
854 | ctx = self._repo[opts[r'rev']] |
|
854 | ctx = self._repo[opts[r'rev']] | |
855 | parents = self._repo.dirstate.parents() |
|
855 | parents = self._repo.dirstate.parents() | |
856 | if opts.get(r'all'): |
|
856 | if opts.get(r'all'): | |
857 | pats = ['set:modified()'] |
|
857 | pats = ['set:modified()'] | |
858 | else: |
|
858 | else: | |
859 | pats = [] |
|
859 | pats = [] | |
860 | cmdutil.revert(self.ui, self._repo, ctx, parents, *pats, **opts) |
|
860 | cmdutil.revert(self.ui, self._repo, ctx, parents, *pats, **opts) | |
861 |
|
861 | |||
862 | def shortid(self, revid): |
|
862 | def shortid(self, revid): | |
863 | return revid[:12] |
|
863 | return revid[:12] | |
864 |
|
864 | |||
865 | @annotatesubrepoerror |
|
865 | @annotatesubrepoerror | |
866 | def unshare(self): |
|
866 | def unshare(self): | |
867 | # subrepo inherently violates our import layering rules |
|
867 | # subrepo inherently violates our import layering rules | |
868 | # because it wants to make repo objects from deep inside the stack |
|
868 | # because it wants to make repo objects from deep inside the stack | |
869 | # so we manually delay the circular imports to not break |
|
869 | # so we manually delay the circular imports to not break | |
870 | # scripts that don't use our demand-loading |
|
870 | # scripts that don't use our demand-loading | |
871 | global hg |
|
871 | global hg | |
872 | from . import hg as h |
|
872 | from . import hg as h | |
873 | hg = h |
|
873 | hg = h | |
874 |
|
874 | |||
875 | # Nothing prevents a user from sharing in a repo, and then making that a |
|
875 | # Nothing prevents a user from sharing in a repo, and then making that a | |
876 | # subrepo. Alternately, the previous unshare attempt may have failed |
|
876 | # subrepo. Alternately, the previous unshare attempt may have failed | |
877 | # part way through. So recurse whether or not this layer is shared. |
|
877 | # part way through. So recurse whether or not this layer is shared. | |
878 | if self._repo.shared(): |
|
878 | if self._repo.shared(): | |
879 | self.ui.status(_("unsharing subrepo '%s'\n") % self._relpath) |
|
879 | self.ui.status(_("unsharing subrepo '%s'\n") % self._relpath) | |
880 |
|
880 | |||
881 | hg.unshare(self.ui, self._repo) |
|
881 | hg.unshare(self.ui, self._repo) | |
882 |
|
882 | |||
883 | def verify(self): |
|
883 | def verify(self): | |
884 | try: |
|
884 | try: | |
885 | rev = self._state[1] |
|
885 | rev = self._state[1] | |
886 | ctx = self._repo.unfiltered()[rev] |
|
886 | ctx = self._repo.unfiltered()[rev] | |
887 | if ctx.hidden(): |
|
887 | if ctx.hidden(): | |
888 | # Since hidden revisions aren't pushed/pulled, it seems worth an |
|
888 | # Since hidden revisions aren't pushed/pulled, it seems worth an | |
889 | # explicit warning. |
|
889 | # explicit warning. | |
890 | ui = self._repo.ui |
|
890 | ui = self._repo.ui | |
891 | ui.warn(_("subrepo '%s' is hidden in revision %s\n") % |
|
891 | ui.warn(_("subrepo '%s' is hidden in revision %s\n") % | |
892 | (self._relpath, node.short(self._ctx.node()))) |
|
892 | (self._relpath, node.short(self._ctx.node()))) | |
893 | return 0 |
|
893 | return 0 | |
894 | except error.RepoLookupError: |
|
894 | except error.RepoLookupError: | |
895 | # A missing subrepo revision may be a case of needing to pull it, so |
|
895 | # A missing subrepo revision may be a case of needing to pull it, so | |
896 | # don't treat this as an error. |
|
896 | # don't treat this as an error. | |
897 | self._repo.ui.warn(_("subrepo '%s' not found in revision %s\n") % |
|
897 | self._repo.ui.warn(_("subrepo '%s' not found in revision %s\n") % | |
898 | (self._relpath, node.short(self._ctx.node()))) |
|
898 | (self._relpath, node.short(self._ctx.node()))) | |
899 | return 0 |
|
899 | return 0 | |
900 |
|
900 | |||
901 | @propertycache |
|
901 | @propertycache | |
902 | def wvfs(self): |
|
902 | def wvfs(self): | |
903 | """return own wvfs for efficiency and consistency |
|
903 | """return own wvfs for efficiency and consistency | |
904 | """ |
|
904 | """ | |
905 | return self._repo.wvfs |
|
905 | return self._repo.wvfs | |
906 |
|
906 | |||
907 | @propertycache |
|
907 | @propertycache | |
908 | def _relpath(self): |
|
908 | def _relpath(self): | |
909 | """return path to this subrepository as seen from outermost repository |
|
909 | """return path to this subrepository as seen from outermost repository | |
910 | """ |
|
910 | """ | |
911 | # Keep consistent dir separators by avoiding vfs.join(self._path) |
|
911 | # Keep consistent dir separators by avoiding vfs.join(self._path) | |
912 | return reporelpath(self._repo) |
|
912 | return reporelpath(self._repo) | |
913 |
|
913 | |||
914 | class svnsubrepo(abstractsubrepo): |
|
914 | class svnsubrepo(abstractsubrepo): | |
915 | def __init__(self, ctx, path, state, allowcreate): |
|
915 | def __init__(self, ctx, path, state, allowcreate): | |
916 | super(svnsubrepo, self).__init__(ctx, path) |
|
916 | super(svnsubrepo, self).__init__(ctx, path) | |
917 | self._state = state |
|
917 | self._state = state | |
918 | self._exe = procutil.findexe('svn') |
|
918 | self._exe = procutil.findexe('svn') | |
919 | if not self._exe: |
|
919 | if not self._exe: | |
920 | raise error.Abort(_("'svn' executable not found for subrepo '%s'") |
|
920 | raise error.Abort(_("'svn' executable not found for subrepo '%s'") | |
921 | % self._path) |
|
921 | % self._path) | |
922 |
|
922 | |||
923 | def _svncommand(self, commands, filename='', failok=False): |
|
923 | def _svncommand(self, commands, filename='', failok=False): | |
924 | cmd = [self._exe] |
|
924 | cmd = [self._exe] | |
925 | extrakw = {} |
|
925 | extrakw = {} | |
926 | if not self.ui.interactive(): |
|
926 | if not self.ui.interactive(): | |
927 | # Making stdin be a pipe should prevent svn from behaving |
|
927 | # Making stdin be a pipe should prevent svn from behaving | |
928 | # interactively even if we can't pass --non-interactive. |
|
928 | # interactively even if we can't pass --non-interactive. | |
929 | extrakw[r'stdin'] = subprocess.PIPE |
|
929 | extrakw[r'stdin'] = subprocess.PIPE | |
930 | # Starting in svn 1.5 --non-interactive is a global flag |
|
930 | # Starting in svn 1.5 --non-interactive is a global flag | |
931 | # instead of being per-command, but we need to support 1.4 so |
|
931 | # instead of being per-command, but we need to support 1.4 so | |
932 | # we have to be intelligent about what commands take |
|
932 | # we have to be intelligent about what commands take | |
933 | # --non-interactive. |
|
933 | # --non-interactive. | |
934 | if commands[0] in ('update', 'checkout', 'commit'): |
|
934 | if commands[0] in ('update', 'checkout', 'commit'): | |
935 | cmd.append('--non-interactive') |
|
935 | cmd.append('--non-interactive') | |
936 | cmd.extend(commands) |
|
936 | cmd.extend(commands) | |
937 | if filename is not None: |
|
937 | if filename is not None: | |
938 | path = self.wvfs.reljoin(self._ctx.repo().origroot, |
|
938 | path = self.wvfs.reljoin(self._ctx.repo().origroot, | |
939 | self._path, filename) |
|
939 | self._path, filename) | |
940 | cmd.append(path) |
|
940 | cmd.append(path) | |
941 | env = dict(encoding.environ) |
|
941 | env = dict(encoding.environ) | |
942 | # Avoid localized output, preserve current locale for everything else. |
|
942 | # Avoid localized output, preserve current locale for everything else. | |
943 | lc_all = env.get('LC_ALL') |
|
943 | lc_all = env.get('LC_ALL') | |
944 | if lc_all: |
|
944 | if lc_all: | |
945 | env['LANG'] = lc_all |
|
945 | env['LANG'] = lc_all | |
946 | del env['LC_ALL'] |
|
946 | del env['LC_ALL'] | |
947 | env['LC_MESSAGES'] = 'C' |
|
947 | env['LC_MESSAGES'] = 'C' | |
948 | p = subprocess.Popen(cmd, bufsize=-1, close_fds=procutil.closefds, |
|
948 | p = subprocess.Popen(cmd, bufsize=-1, close_fds=procutil.closefds, | |
949 | stdout=subprocess.PIPE, stderr=subprocess.PIPE, |
|
949 | stdout=subprocess.PIPE, stderr=subprocess.PIPE, | |
950 | universal_newlines=True, env=env, **extrakw) |
|
950 | universal_newlines=True, env=env, **extrakw) | |
951 | stdout, stderr = p.communicate() |
|
951 | stdout, stderr = p.communicate() | |
952 | stderr = stderr.strip() |
|
952 | stderr = stderr.strip() | |
953 | if not failok: |
|
953 | if not failok: | |
954 | if p.returncode: |
|
954 | if p.returncode: | |
955 | raise error.Abort(stderr or 'exited with code %d' |
|
955 | raise error.Abort(stderr or 'exited with code %d' | |
956 | % p.returncode) |
|
956 | % p.returncode) | |
957 | if stderr: |
|
957 | if stderr: | |
958 | self.ui.warn(stderr + '\n') |
|
958 | self.ui.warn(stderr + '\n') | |
959 | return stdout, stderr |
|
959 | return stdout, stderr | |
960 |
|
960 | |||
961 | @propertycache |
|
961 | @propertycache | |
962 | def _svnversion(self): |
|
962 | def _svnversion(self): | |
963 | output, err = self._svncommand(['--version', '--quiet'], filename=None) |
|
963 | output, err = self._svncommand(['--version', '--quiet'], filename=None) | |
964 | m = re.search(br'^(\d+)\.(\d+)', output) |
|
964 | m = re.search(br'^(\d+)\.(\d+)', output) | |
965 | if not m: |
|
965 | if not m: | |
966 | raise error.Abort(_('cannot retrieve svn tool version')) |
|
966 | raise error.Abort(_('cannot retrieve svn tool version')) | |
967 | return (int(m.group(1)), int(m.group(2))) |
|
967 | return (int(m.group(1)), int(m.group(2))) | |
968 |
|
968 | |||
969 | def _svnmissing(self): |
|
969 | def _svnmissing(self): | |
970 | return not self.wvfs.exists('.svn') |
|
970 | return not self.wvfs.exists('.svn') | |
971 |
|
971 | |||
972 | def _wcrevs(self): |
|
972 | def _wcrevs(self): | |
973 | # Get the working directory revision as well as the last |
|
973 | # Get the working directory revision as well as the last | |
974 | # commit revision so we can compare the subrepo state with |
|
974 | # commit revision so we can compare the subrepo state with | |
975 | # both. We used to store the working directory one. |
|
975 | # both. We used to store the working directory one. | |
976 | output, err = self._svncommand(['info', '--xml']) |
|
976 | output, err = self._svncommand(['info', '--xml']) | |
977 | doc = xml.dom.minidom.parseString(output) |
|
977 | doc = xml.dom.minidom.parseString(output) | |
978 | entries = doc.getElementsByTagName('entry') |
|
978 | entries = doc.getElementsByTagName('entry') | |
979 | lastrev, rev = '0', '0' |
|
979 | lastrev, rev = '0', '0' | |
980 | if entries: |
|
980 | if entries: | |
981 | rev = str(entries[0].getAttribute('revision')) or '0' |
|
981 | rev = str(entries[0].getAttribute('revision')) or '0' | |
982 | commits = entries[0].getElementsByTagName('commit') |
|
982 | commits = entries[0].getElementsByTagName('commit') | |
983 | if commits: |
|
983 | if commits: | |
984 | lastrev = str(commits[0].getAttribute('revision')) or '0' |
|
984 | lastrev = str(commits[0].getAttribute('revision')) or '0' | |
985 | return (lastrev, rev) |
|
985 | return (lastrev, rev) | |
986 |
|
986 | |||
987 | def _wcrev(self): |
|
987 | def _wcrev(self): | |
988 | return self._wcrevs()[0] |
|
988 | return self._wcrevs()[0] | |
989 |
|
989 | |||
990 | def _wcchanged(self): |
|
990 | def _wcchanged(self): | |
991 | """Return (changes, extchanges, missing) where changes is True |
|
991 | """Return (changes, extchanges, missing) where changes is True | |
992 | if the working directory was changed, extchanges is |
|
992 | if the working directory was changed, extchanges is | |
993 | True if any of these changes concern an external entry and missing |
|
993 | True if any of these changes concern an external entry and missing | |
994 | is True if any change is a missing entry. |
|
994 | is True if any change is a missing entry. | |
995 | """ |
|
995 | """ | |
996 | output, err = self._svncommand(['status', '--xml']) |
|
996 | output, err = self._svncommand(['status', '--xml']) | |
997 | externals, changes, missing = [], [], [] |
|
997 | externals, changes, missing = [], [], [] | |
998 | doc = xml.dom.minidom.parseString(output) |
|
998 | doc = xml.dom.minidom.parseString(output) | |
999 | for e in doc.getElementsByTagName('entry'): |
|
999 | for e in doc.getElementsByTagName('entry'): | |
1000 | s = e.getElementsByTagName('wc-status') |
|
1000 | s = e.getElementsByTagName('wc-status') | |
1001 | if not s: |
|
1001 | if not s: | |
1002 | continue |
|
1002 | continue | |
1003 | item = s[0].getAttribute('item') |
|
1003 | item = s[0].getAttribute('item') | |
1004 | props = s[0].getAttribute('props') |
|
1004 | props = s[0].getAttribute('props') | |
1005 | path = e.getAttribute('path') |
|
1005 | path = e.getAttribute('path') | |
1006 | if item == 'external': |
|
1006 | if item == 'external': | |
1007 | externals.append(path) |
|
1007 | externals.append(path) | |
1008 | elif item == 'missing': |
|
1008 | elif item == 'missing': | |
1009 | missing.append(path) |
|
1009 | missing.append(path) | |
1010 | if (item not in ('', 'normal', 'unversioned', 'external') |
|
1010 | if (item not in ('', 'normal', 'unversioned', 'external') | |
1011 | or props not in ('', 'none', 'normal')): |
|
1011 | or props not in ('', 'none', 'normal')): | |
1012 | changes.append(path) |
|
1012 | changes.append(path) | |
1013 | for path in changes: |
|
1013 | for path in changes: | |
1014 | for ext in externals: |
|
1014 | for ext in externals: | |
1015 | if path == ext or path.startswith(ext + pycompat.ossep): |
|
1015 | if path == ext or path.startswith(ext + pycompat.ossep): | |
1016 | return True, True, bool(missing) |
|
1016 | return True, True, bool(missing) | |
1017 | return bool(changes), False, bool(missing) |
|
1017 | return bool(changes), False, bool(missing) | |
1018 |
|
1018 | |||
1019 | @annotatesubrepoerror |
|
1019 | @annotatesubrepoerror | |
1020 | def dirty(self, ignoreupdate=False, missing=False): |
|
1020 | def dirty(self, ignoreupdate=False, missing=False): | |
1021 | if self._svnmissing(): |
|
1021 | if self._svnmissing(): | |
1022 | return self._state[1] != '' |
|
1022 | return self._state[1] != '' | |
1023 | wcchanged = self._wcchanged() |
|
1023 | wcchanged = self._wcchanged() | |
1024 | changed = wcchanged[0] or (missing and wcchanged[2]) |
|
1024 | changed = wcchanged[0] or (missing and wcchanged[2]) | |
1025 | if not changed: |
|
1025 | if not changed: | |
1026 | if self._state[1] in self._wcrevs() or ignoreupdate: |
|
1026 | if self._state[1] in self._wcrevs() or ignoreupdate: | |
1027 | return False |
|
1027 | return False | |
1028 | return True |
|
1028 | return True | |
1029 |
|
1029 | |||
1030 | def basestate(self): |
|
1030 | def basestate(self): | |
1031 | lastrev, rev = self._wcrevs() |
|
1031 | lastrev, rev = self._wcrevs() | |
1032 | if lastrev != rev: |
|
1032 | if lastrev != rev: | |
1033 | # Last committed rev is not the same than rev. We would |
|
1033 | # Last committed rev is not the same than rev. We would | |
1034 | # like to take lastrev but we do not know if the subrepo |
|
1034 | # like to take lastrev but we do not know if the subrepo | |
1035 | # URL exists at lastrev. Test it and fallback to rev it |
|
1035 | # URL exists at lastrev. Test it and fallback to rev it | |
1036 | # is not there. |
|
1036 | # is not there. | |
1037 | try: |
|
1037 | try: | |
1038 | self._svncommand(['list', '%s@%s' % (self._state[0], lastrev)]) |
|
1038 | self._svncommand(['list', '%s@%s' % (self._state[0], lastrev)]) | |
1039 | return lastrev |
|
1039 | return lastrev | |
1040 | except error.Abort: |
|
1040 | except error.Abort: | |
1041 | pass |
|
1041 | pass | |
1042 | return rev |
|
1042 | return rev | |
1043 |
|
1043 | |||
1044 | @annotatesubrepoerror |
|
1044 | @annotatesubrepoerror | |
1045 | def commit(self, text, user, date): |
|
1045 | def commit(self, text, user, date): | |
1046 | # user and date are out of our hands since svn is centralized |
|
1046 | # user and date are out of our hands since svn is centralized | |
1047 | changed, extchanged, missing = self._wcchanged() |
|
1047 | changed, extchanged, missing = self._wcchanged() | |
1048 | if not changed: |
|
1048 | if not changed: | |
1049 | return self.basestate() |
|
1049 | return self.basestate() | |
1050 | if extchanged: |
|
1050 | if extchanged: | |
1051 | # Do not try to commit externals |
|
1051 | # Do not try to commit externals | |
1052 | raise error.Abort(_('cannot commit svn externals')) |
|
1052 | raise error.Abort(_('cannot commit svn externals')) | |
1053 | if missing: |
|
1053 | if missing: | |
1054 | # svn can commit with missing entries but aborting like hg |
|
1054 | # svn can commit with missing entries but aborting like hg | |
1055 | # seems a better approach. |
|
1055 | # seems a better approach. | |
1056 | raise error.Abort(_('cannot commit missing svn entries')) |
|
1056 | raise error.Abort(_('cannot commit missing svn entries')) | |
1057 | commitinfo, err = self._svncommand(['commit', '-m', text]) |
|
1057 | commitinfo, err = self._svncommand(['commit', '-m', text]) | |
1058 | self.ui.status(commitinfo) |
|
1058 | self.ui.status(commitinfo) | |
1059 | newrev = re.search('Committed revision ([0-9]+).', commitinfo) |
|
1059 | newrev = re.search('Committed revision ([0-9]+).', commitinfo) | |
1060 | if not newrev: |
|
1060 | if not newrev: | |
1061 | if not commitinfo.strip(): |
|
1061 | if not commitinfo.strip(): | |
1062 | # Sometimes, our definition of "changed" differs from |
|
1062 | # Sometimes, our definition of "changed" differs from | |
1063 | # svn one. For instance, svn ignores missing files |
|
1063 | # svn one. For instance, svn ignores missing files | |
1064 | # when committing. If there are only missing files, no |
|
1064 | # when committing. If there are only missing files, no | |
1065 | # commit is made, no output and no error code. |
|
1065 | # commit is made, no output and no error code. | |
1066 | raise error.Abort(_('failed to commit svn changes')) |
|
1066 | raise error.Abort(_('failed to commit svn changes')) | |
1067 | raise error.Abort(commitinfo.splitlines()[-1]) |
|
1067 | raise error.Abort(commitinfo.splitlines()[-1]) | |
1068 | newrev = newrev.groups()[0] |
|
1068 | newrev = newrev.groups()[0] | |
1069 | self.ui.status(self._svncommand(['update', '-r', newrev])[0]) |
|
1069 | self.ui.status(self._svncommand(['update', '-r', newrev])[0]) | |
1070 | return newrev |
|
1070 | return newrev | |
1071 |
|
1071 | |||
1072 | @annotatesubrepoerror |
|
1072 | @annotatesubrepoerror | |
1073 | def remove(self): |
|
1073 | def remove(self): | |
1074 | if self.dirty(): |
|
1074 | if self.dirty(): | |
1075 | self.ui.warn(_('not removing repo %s because ' |
|
1075 | self.ui.warn(_('not removing repo %s because ' | |
1076 | 'it has changes.\n') % self._path) |
|
1076 | 'it has changes.\n') % self._path) | |
1077 | return |
|
1077 | return | |
1078 | self.ui.note(_('removing subrepo %s\n') % self._path) |
|
1078 | self.ui.note(_('removing subrepo %s\n') % self._path) | |
1079 |
|
1079 | |||
1080 | self.wvfs.rmtree(forcibly=True) |
|
1080 | self.wvfs.rmtree(forcibly=True) | |
1081 | try: |
|
1081 | try: | |
1082 | pwvfs = self._ctx.repo().wvfs |
|
1082 | pwvfs = self._ctx.repo().wvfs | |
1083 | pwvfs.removedirs(pwvfs.dirname(self._path)) |
|
1083 | pwvfs.removedirs(pwvfs.dirname(self._path)) | |
1084 | except OSError: |
|
1084 | except OSError: | |
1085 | pass |
|
1085 | pass | |
1086 |
|
1086 | |||
1087 | @annotatesubrepoerror |
|
1087 | @annotatesubrepoerror | |
1088 | def get(self, state, overwrite=False): |
|
1088 | def get(self, state, overwrite=False): | |
1089 | if overwrite: |
|
1089 | if overwrite: | |
1090 | self._svncommand(['revert', '--recursive']) |
|
1090 | self._svncommand(['revert', '--recursive']) | |
1091 | args = ['checkout'] |
|
1091 | args = ['checkout'] | |
1092 | if self._svnversion >= (1, 5): |
|
1092 | if self._svnversion >= (1, 5): | |
1093 | args.append('--force') |
|
1093 | args.append('--force') | |
1094 | # The revision must be specified at the end of the URL to properly |
|
1094 | # The revision must be specified at the end of the URL to properly | |
1095 | # update to a directory which has since been deleted and recreated. |
|
1095 | # update to a directory which has since been deleted and recreated. | |
1096 | args.append('%s@%s' % (state[0], state[1])) |
|
1096 | args.append('%s@%s' % (state[0], state[1])) | |
1097 |
|
1097 | |||
1098 | # SEC: check that the ssh url is safe |
|
1098 | # SEC: check that the ssh url is safe | |
1099 | util.checksafessh(state[0]) |
|
1099 | util.checksafessh(state[0]) | |
1100 |
|
1100 | |||
1101 | status, err = self._svncommand(args, failok=True) |
|
1101 | status, err = self._svncommand(args, failok=True) | |
1102 | _sanitize(self.ui, self.wvfs, '.svn') |
|
1102 | _sanitize(self.ui, self.wvfs, '.svn') | |
1103 | if not re.search('Checked out revision [0-9]+.', status): |
|
1103 | if not re.search('Checked out revision [0-9]+.', status): | |
1104 | if ('is already a working copy for a different URL' in err |
|
1104 | if ('is already a working copy for a different URL' in err | |
1105 | and (self._wcchanged()[:2] == (False, False))): |
|
1105 | and (self._wcchanged()[:2] == (False, False))): | |
1106 | # obstructed but clean working copy, so just blow it away. |
|
1106 | # obstructed but clean working copy, so just blow it away. | |
1107 | self.remove() |
|
1107 | self.remove() | |
1108 | self.get(state, overwrite=False) |
|
1108 | self.get(state, overwrite=False) | |
1109 | return |
|
1109 | return | |
1110 | raise error.Abort((status or err).splitlines()[-1]) |
|
1110 | raise error.Abort((status or err).splitlines()[-1]) | |
1111 | self.ui.status(status) |
|
1111 | self.ui.status(status) | |
1112 |
|
1112 | |||
1113 | @annotatesubrepoerror |
|
1113 | @annotatesubrepoerror | |
1114 | def merge(self, state): |
|
1114 | def merge(self, state): | |
1115 | old = self._state[1] |
|
1115 | old = self._state[1] | |
1116 | new = state[1] |
|
1116 | new = state[1] | |
1117 | wcrev = self._wcrev() |
|
1117 | wcrev = self._wcrev() | |
1118 | if new != wcrev: |
|
1118 | if new != wcrev: | |
1119 | dirty = old == wcrev or self._wcchanged()[0] |
|
1119 | dirty = old == wcrev or self._wcchanged()[0] | |
1120 | if _updateprompt(self.ui, self, dirty, wcrev, new): |
|
1120 | if _updateprompt(self.ui, self, dirty, wcrev, new): | |
1121 | self.get(state, False) |
|
1121 | self.get(state, False) | |
1122 |
|
1122 | |||
1123 | def push(self, opts): |
|
1123 | def push(self, opts): | |
1124 | # push is a no-op for SVN |
|
1124 | # push is a no-op for SVN | |
1125 | return True |
|
1125 | return True | |
1126 |
|
1126 | |||
1127 | @annotatesubrepoerror |
|
1127 | @annotatesubrepoerror | |
1128 | def files(self): |
|
1128 | def files(self): | |
1129 | output = self._svncommand(['list', '--recursive', '--xml'])[0] |
|
1129 | output = self._svncommand(['list', '--recursive', '--xml'])[0] | |
1130 | doc = xml.dom.minidom.parseString(output) |
|
1130 | doc = xml.dom.minidom.parseString(output) | |
1131 | paths = [] |
|
1131 | paths = [] | |
1132 | for e in doc.getElementsByTagName('entry'): |
|
1132 | for e in doc.getElementsByTagName('entry'): | |
1133 | kind = pycompat.bytestr(e.getAttribute('kind')) |
|
1133 | kind = pycompat.bytestr(e.getAttribute('kind')) | |
1134 | if kind != 'file': |
|
1134 | if kind != 'file': | |
1135 | continue |
|
1135 | continue | |
1136 | name = ''.join(c.data for c |
|
1136 | name = ''.join(c.data for c | |
1137 | in e.getElementsByTagName('name')[0].childNodes |
|
1137 | in e.getElementsByTagName('name')[0].childNodes | |
1138 | if c.nodeType == c.TEXT_NODE) |
|
1138 | if c.nodeType == c.TEXT_NODE) | |
1139 | paths.append(name.encode('utf-8')) |
|
1139 | paths.append(name.encode('utf-8')) | |
1140 | return paths |
|
1140 | return paths | |
1141 |
|
1141 | |||
1142 | def filedata(self, name, decode): |
|
1142 | def filedata(self, name, decode): | |
1143 | return self._svncommand(['cat'], name)[0] |
|
1143 | return self._svncommand(['cat'], name)[0] | |
1144 |
|
1144 | |||
1145 |
|
1145 | |||
1146 | class gitsubrepo(abstractsubrepo): |
|
1146 | class gitsubrepo(abstractsubrepo): | |
1147 | def __init__(self, ctx, path, state, allowcreate): |
|
1147 | def __init__(self, ctx, path, state, allowcreate): | |
1148 | super(gitsubrepo, self).__init__(ctx, path) |
|
1148 | super(gitsubrepo, self).__init__(ctx, path) | |
1149 | self._state = state |
|
1149 | self._state = state | |
1150 | self._abspath = ctx.repo().wjoin(path) |
|
1150 | self._abspath = ctx.repo().wjoin(path) | |
1151 | self._subparent = ctx.repo() |
|
1151 | self._subparent = ctx.repo() | |
1152 | self._ensuregit() |
|
1152 | self._ensuregit() | |
1153 |
|
1153 | |||
1154 | def _ensuregit(self): |
|
1154 | def _ensuregit(self): | |
1155 | try: |
|
1155 | try: | |
1156 | self._gitexecutable = 'git' |
|
1156 | self._gitexecutable = 'git' | |
1157 | out, err = self._gitnodir(['--version']) |
|
1157 | out, err = self._gitnodir(['--version']) | |
1158 | except OSError as e: |
|
1158 | except OSError as e: | |
1159 | genericerror = _("error executing git for subrepo '%s': %s") |
|
1159 | genericerror = _("error executing git for subrepo '%s': %s") | |
1160 | notfoundhint = _("check git is installed and in your PATH") |
|
1160 | notfoundhint = _("check git is installed and in your PATH") | |
1161 | if e.errno != errno.ENOENT: |
|
1161 | if e.errno != errno.ENOENT: | |
1162 | raise error.Abort(genericerror % ( |
|
1162 | raise error.Abort(genericerror % ( | |
1163 | self._path, encoding.strtolocal(e.strerror))) |
|
1163 | self._path, encoding.strtolocal(e.strerror))) | |
1164 | elif pycompat.iswindows: |
|
1164 | elif pycompat.iswindows: | |
1165 | try: |
|
1165 | try: | |
1166 | self._gitexecutable = 'git.cmd' |
|
1166 | self._gitexecutable = 'git.cmd' | |
1167 | out, err = self._gitnodir(['--version']) |
|
1167 | out, err = self._gitnodir(['--version']) | |
1168 | except OSError as e2: |
|
1168 | except OSError as e2: | |
1169 | if e2.errno == errno.ENOENT: |
|
1169 | if e2.errno == errno.ENOENT: | |
1170 | raise error.Abort(_("couldn't find 'git' or 'git.cmd'" |
|
1170 | raise error.Abort(_("couldn't find 'git' or 'git.cmd'" | |
1171 | " for subrepo '%s'") % self._path, |
|
1171 | " for subrepo '%s'") % self._path, | |
1172 | hint=notfoundhint) |
|
1172 | hint=notfoundhint) | |
1173 | else: |
|
1173 | else: | |
1174 | raise error.Abort(genericerror % (self._path, |
|
1174 | raise error.Abort(genericerror % (self._path, | |
1175 | encoding.strtolocal(e2.strerror))) |
|
1175 | encoding.strtolocal(e2.strerror))) | |
1176 | else: |
|
1176 | else: | |
1177 | raise error.Abort(_("couldn't find git for subrepo '%s'") |
|
1177 | raise error.Abort(_("couldn't find git for subrepo '%s'") | |
1178 | % self._path, hint=notfoundhint) |
|
1178 | % self._path, hint=notfoundhint) | |
1179 | versionstatus = self._checkversion(out) |
|
1179 | versionstatus = self._checkversion(out) | |
1180 | if versionstatus == 'unknown': |
|
1180 | if versionstatus == 'unknown': | |
1181 | self.ui.warn(_('cannot retrieve git version\n')) |
|
1181 | self.ui.warn(_('cannot retrieve git version\n')) | |
1182 | elif versionstatus == 'abort': |
|
1182 | elif versionstatus == 'abort': | |
1183 | raise error.Abort(_('git subrepo requires at least 1.6.0 or later')) |
|
1183 | raise error.Abort(_('git subrepo requires at least 1.6.0 or later')) | |
1184 | elif versionstatus == 'warning': |
|
1184 | elif versionstatus == 'warning': | |
1185 | self.ui.warn(_('git subrepo requires at least 1.6.0 or later\n')) |
|
1185 | self.ui.warn(_('git subrepo requires at least 1.6.0 or later\n')) | |
1186 |
|
1186 | |||
1187 | @staticmethod |
|
1187 | @staticmethod | |
1188 | def _gitversion(out): |
|
1188 | def _gitversion(out): | |
1189 | m = re.search(br'^git version (\d+)\.(\d+)\.(\d+)', out) |
|
1189 | m = re.search(br'^git version (\d+)\.(\d+)\.(\d+)', out) | |
1190 | if m: |
|
1190 | if m: | |
1191 | return (int(m.group(1)), int(m.group(2)), int(m.group(3))) |
|
1191 | return (int(m.group(1)), int(m.group(2)), int(m.group(3))) | |
1192 |
|
1192 | |||
1193 | m = re.search(br'^git version (\d+)\.(\d+)', out) |
|
1193 | m = re.search(br'^git version (\d+)\.(\d+)', out) | |
1194 | if m: |
|
1194 | if m: | |
1195 | return (int(m.group(1)), int(m.group(2)), 0) |
|
1195 | return (int(m.group(1)), int(m.group(2)), 0) | |
1196 |
|
1196 | |||
1197 | return -1 |
|
1197 | return -1 | |
1198 |
|
1198 | |||
1199 | @staticmethod |
|
1199 | @staticmethod | |
1200 | def _checkversion(out): |
|
1200 | def _checkversion(out): | |
1201 | '''ensure git version is new enough |
|
1201 | '''ensure git version is new enough | |
1202 |
|
1202 | |||
1203 | >>> _checkversion = gitsubrepo._checkversion |
|
1203 | >>> _checkversion = gitsubrepo._checkversion | |
1204 | >>> _checkversion(b'git version 1.6.0') |
|
1204 | >>> _checkversion(b'git version 1.6.0') | |
1205 | 'ok' |
|
1205 | 'ok' | |
1206 | >>> _checkversion(b'git version 1.8.5') |
|
1206 | >>> _checkversion(b'git version 1.8.5') | |
1207 | 'ok' |
|
1207 | 'ok' | |
1208 | >>> _checkversion(b'git version 1.4.0') |
|
1208 | >>> _checkversion(b'git version 1.4.0') | |
1209 | 'abort' |
|
1209 | 'abort' | |
1210 | >>> _checkversion(b'git version 1.5.0') |
|
1210 | >>> _checkversion(b'git version 1.5.0') | |
1211 | 'warning' |
|
1211 | 'warning' | |
1212 | >>> _checkversion(b'git version 1.9-rc0') |
|
1212 | >>> _checkversion(b'git version 1.9-rc0') | |
1213 | 'ok' |
|
1213 | 'ok' | |
1214 | >>> _checkversion(b'git version 1.9.0.265.g81cdec2') |
|
1214 | >>> _checkversion(b'git version 1.9.0.265.g81cdec2') | |
1215 | 'ok' |
|
1215 | 'ok' | |
1216 | >>> _checkversion(b'git version 1.9.0.GIT') |
|
1216 | >>> _checkversion(b'git version 1.9.0.GIT') | |
1217 | 'ok' |
|
1217 | 'ok' | |
1218 | >>> _checkversion(b'git version 12345') |
|
1218 | >>> _checkversion(b'git version 12345') | |
1219 | 'unknown' |
|
1219 | 'unknown' | |
1220 | >>> _checkversion(b'no') |
|
1220 | >>> _checkversion(b'no') | |
1221 | 'unknown' |
|
1221 | 'unknown' | |
1222 | ''' |
|
1222 | ''' | |
1223 | version = gitsubrepo._gitversion(out) |
|
1223 | version = gitsubrepo._gitversion(out) | |
1224 | # git 1.4.0 can't work at all, but 1.5.X can in at least some cases, |
|
1224 | # git 1.4.0 can't work at all, but 1.5.X can in at least some cases, | |
1225 | # despite the docstring comment. For now, error on 1.4.0, warn on |
|
1225 | # despite the docstring comment. For now, error on 1.4.0, warn on | |
1226 | # 1.5.0 but attempt to continue. |
|
1226 | # 1.5.0 but attempt to continue. | |
1227 | if version == -1: |
|
1227 | if version == -1: | |
1228 | return 'unknown' |
|
1228 | return 'unknown' | |
1229 | if version < (1, 5, 0): |
|
1229 | if version < (1, 5, 0): | |
1230 | return 'abort' |
|
1230 | return 'abort' | |
1231 | elif version < (1, 6, 0): |
|
1231 | elif version < (1, 6, 0): | |
1232 | return 'warning' |
|
1232 | return 'warning' | |
1233 | return 'ok' |
|
1233 | return 'ok' | |
1234 |
|
1234 | |||
1235 | def _gitcommand(self, commands, env=None, stream=False): |
|
1235 | def _gitcommand(self, commands, env=None, stream=False): | |
1236 | return self._gitdir(commands, env=env, stream=stream)[0] |
|
1236 | return self._gitdir(commands, env=env, stream=stream)[0] | |
1237 |
|
1237 | |||
1238 | def _gitdir(self, commands, env=None, stream=False): |
|
1238 | def _gitdir(self, commands, env=None, stream=False): | |
1239 | return self._gitnodir(commands, env=env, stream=stream, |
|
1239 | return self._gitnodir(commands, env=env, stream=stream, | |
1240 | cwd=self._abspath) |
|
1240 | cwd=self._abspath) | |
1241 |
|
1241 | |||
1242 | def _gitnodir(self, commands, env=None, stream=False, cwd=None): |
|
1242 | def _gitnodir(self, commands, env=None, stream=False, cwd=None): | |
1243 | """Calls the git command |
|
1243 | """Calls the git command | |
1244 |
|
1244 | |||
1245 | The methods tries to call the git command. versions prior to 1.6.0 |
|
1245 | The methods tries to call the git command. versions prior to 1.6.0 | |
1246 | are not supported and very probably fail. |
|
1246 | are not supported and very probably fail. | |
1247 | """ |
|
1247 | """ | |
1248 | self.ui.debug('%s: git %s\n' % (self._relpath, ' '.join(commands))) |
|
1248 | self.ui.debug('%s: git %s\n' % (self._relpath, ' '.join(commands))) | |
1249 | if env is None: |
|
1249 | if env is None: | |
1250 | env = encoding.environ.copy() |
|
1250 | env = encoding.environ.copy() | |
1251 | # disable localization for Git output (issue5176) |
|
1251 | # disable localization for Git output (issue5176) | |
1252 | env['LC_ALL'] = 'C' |
|
1252 | env['LC_ALL'] = 'C' | |
1253 | # fix for Git CVE-2015-7545 |
|
1253 | # fix for Git CVE-2015-7545 | |
1254 | if 'GIT_ALLOW_PROTOCOL' not in env: |
|
1254 | if 'GIT_ALLOW_PROTOCOL' not in env: | |
1255 | env['GIT_ALLOW_PROTOCOL'] = 'file:git:http:https:ssh' |
|
1255 | env['GIT_ALLOW_PROTOCOL'] = 'file:git:http:https:ssh' | |
1256 | # unless ui.quiet is set, print git's stderr, |
|
1256 | # unless ui.quiet is set, print git's stderr, | |
1257 | # which is mostly progress and useful info |
|
1257 | # which is mostly progress and useful info | |
1258 | errpipe = None |
|
1258 | errpipe = None | |
1259 | if self.ui.quiet: |
|
1259 | if self.ui.quiet: | |
1260 | errpipe = open(os.devnull, 'w') |
|
1260 | errpipe = open(os.devnull, 'w') | |
1261 | if self.ui._colormode and len(commands) and commands[0] == "diff": |
|
1261 | if self.ui._colormode and len(commands) and commands[0] == "diff": | |
1262 | # insert the argument in the front, |
|
1262 | # insert the argument in the front, | |
1263 | # the end of git diff arguments is used for paths |
|
1263 | # the end of git diff arguments is used for paths | |
1264 | commands.insert(1, '--color') |
|
1264 | commands.insert(1, '--color') | |
1265 | p = subprocess.Popen([self._gitexecutable] + commands, bufsize=-1, |
|
1265 | p = subprocess.Popen([self._gitexecutable] + commands, bufsize=-1, | |
1266 | cwd=cwd, env=env, close_fds=procutil.closefds, |
|
1266 | cwd=cwd, env=env, close_fds=procutil.closefds, | |
1267 | stdout=subprocess.PIPE, stderr=errpipe) |
|
1267 | stdout=subprocess.PIPE, stderr=errpipe) | |
1268 | if stream: |
|
1268 | if stream: | |
1269 | return p.stdout, None |
|
1269 | return p.stdout, None | |
1270 |
|
1270 | |||
1271 | retdata = p.stdout.read().strip() |
|
1271 | retdata = p.stdout.read().strip() | |
1272 | # wait for the child to exit to avoid race condition. |
|
1272 | # wait for the child to exit to avoid race condition. | |
1273 | p.wait() |
|
1273 | p.wait() | |
1274 |
|
1274 | |||
1275 | if p.returncode != 0 and p.returncode != 1: |
|
1275 | if p.returncode != 0 and p.returncode != 1: | |
1276 | # there are certain error codes that are ok |
|
1276 | # there are certain error codes that are ok | |
1277 | command = commands[0] |
|
1277 | command = commands[0] | |
1278 | if command in ('cat-file', 'symbolic-ref'): |
|
1278 | if command in ('cat-file', 'symbolic-ref'): | |
1279 | return retdata, p.returncode |
|
1279 | return retdata, p.returncode | |
1280 | # for all others, abort |
|
1280 | # for all others, abort | |
1281 | raise error.Abort(_('git %s error %d in %s') % |
|
1281 | raise error.Abort(_('git %s error %d in %s') % | |
1282 | (command, p.returncode, self._relpath)) |
|
1282 | (command, p.returncode, self._relpath)) | |
1283 |
|
1283 | |||
1284 | return retdata, p.returncode |
|
1284 | return retdata, p.returncode | |
1285 |
|
1285 | |||
1286 | def _gitmissing(self): |
|
1286 | def _gitmissing(self): | |
1287 | return not self.wvfs.exists('.git') |
|
1287 | return not self.wvfs.exists('.git') | |
1288 |
|
1288 | |||
1289 | def _gitstate(self): |
|
1289 | def _gitstate(self): | |
1290 | return self._gitcommand(['rev-parse', 'HEAD']) |
|
1290 | return self._gitcommand(['rev-parse', 'HEAD']) | |
1291 |
|
1291 | |||
1292 | def _gitcurrentbranch(self): |
|
1292 | def _gitcurrentbranch(self): | |
1293 | current, err = self._gitdir(['symbolic-ref', 'HEAD', '--quiet']) |
|
1293 | current, err = self._gitdir(['symbolic-ref', 'HEAD', '--quiet']) | |
1294 | if err: |
|
1294 | if err: | |
1295 | current = None |
|
1295 | current = None | |
1296 | return current |
|
1296 | return current | |
1297 |
|
1297 | |||
1298 | def _gitremote(self, remote): |
|
1298 | def _gitremote(self, remote): | |
1299 | out = self._gitcommand(['remote', 'show', '-n', remote]) |
|
1299 | out = self._gitcommand(['remote', 'show', '-n', remote]) | |
1300 | line = out.split('\n')[1] |
|
1300 | line = out.split('\n')[1] | |
1301 | i = line.index('URL: ') + len('URL: ') |
|
1301 | i = line.index('URL: ') + len('URL: ') | |
1302 | return line[i:] |
|
1302 | return line[i:] | |
1303 |
|
1303 | |||
1304 | def _githavelocally(self, revision): |
|
1304 | def _githavelocally(self, revision): | |
1305 | out, code = self._gitdir(['cat-file', '-e', revision]) |
|
1305 | out, code = self._gitdir(['cat-file', '-e', revision]) | |
1306 | return code == 0 |
|
1306 | return code == 0 | |
1307 |
|
1307 | |||
1308 | def _gitisancestor(self, r1, r2): |
|
1308 | def _gitisancestor(self, r1, r2): | |
1309 | base = self._gitcommand(['merge-base', r1, r2]) |
|
1309 | base = self._gitcommand(['merge-base', r1, r2]) | |
1310 | return base == r1 |
|
1310 | return base == r1 | |
1311 |
|
1311 | |||
1312 | def _gitisbare(self): |
|
1312 | def _gitisbare(self): | |
1313 | return self._gitcommand(['config', '--bool', 'core.bare']) == 'true' |
|
1313 | return self._gitcommand(['config', '--bool', 'core.bare']) == 'true' | |
1314 |
|
1314 | |||
1315 | def _gitupdatestat(self): |
|
1315 | def _gitupdatestat(self): | |
1316 | """This must be run before git diff-index. |
|
1316 | """This must be run before git diff-index. | |
1317 | diff-index only looks at changes to file stat; |
|
1317 | diff-index only looks at changes to file stat; | |
1318 | this command looks at file contents and updates the stat.""" |
|
1318 | this command looks at file contents and updates the stat.""" | |
1319 | self._gitcommand(['update-index', '-q', '--refresh']) |
|
1319 | self._gitcommand(['update-index', '-q', '--refresh']) | |
1320 |
|
1320 | |||
1321 | def _gitbranchmap(self): |
|
1321 | def _gitbranchmap(self): | |
1322 | '''returns 2 things: |
|
1322 | '''returns 2 things: | |
1323 | a map from git branch to revision |
|
1323 | a map from git branch to revision | |
1324 | a map from revision to branches''' |
|
1324 | a map from revision to branches''' | |
1325 | branch2rev = {} |
|
1325 | branch2rev = {} | |
1326 | rev2branch = {} |
|
1326 | rev2branch = {} | |
1327 |
|
1327 | |||
1328 | out = self._gitcommand(['for-each-ref', '--format', |
|
1328 | out = self._gitcommand(['for-each-ref', '--format', | |
1329 | '%(objectname) %(refname)']) |
|
1329 | '%(objectname) %(refname)']) | |
1330 | for line in out.split('\n'): |
|
1330 | for line in out.split('\n'): | |
1331 | revision, ref = line.split(' ') |
|
1331 | revision, ref = line.split(' ') | |
1332 | if (not ref.startswith('refs/heads/') and |
|
1332 | if (not ref.startswith('refs/heads/') and | |
1333 | not ref.startswith('refs/remotes/')): |
|
1333 | not ref.startswith('refs/remotes/')): | |
1334 | continue |
|
1334 | continue | |
1335 | if ref.startswith('refs/remotes/') and ref.endswith('/HEAD'): |
|
1335 | if ref.startswith('refs/remotes/') and ref.endswith('/HEAD'): | |
1336 | continue # ignore remote/HEAD redirects |
|
1336 | continue # ignore remote/HEAD redirects | |
1337 | branch2rev[ref] = revision |
|
1337 | branch2rev[ref] = revision | |
1338 | rev2branch.setdefault(revision, []).append(ref) |
|
1338 | rev2branch.setdefault(revision, []).append(ref) | |
1339 | return branch2rev, rev2branch |
|
1339 | return branch2rev, rev2branch | |
1340 |
|
1340 | |||
1341 | def _gittracking(self, branches): |
|
1341 | def _gittracking(self, branches): | |
1342 | 'return map of remote branch to local tracking branch' |
|
1342 | 'return map of remote branch to local tracking branch' | |
1343 | # assumes no more than one local tracking branch for each remote |
|
1343 | # assumes no more than one local tracking branch for each remote | |
1344 | tracking = {} |
|
1344 | tracking = {} | |
1345 | for b in branches: |
|
1345 | for b in branches: | |
1346 | if b.startswith('refs/remotes/'): |
|
1346 | if b.startswith('refs/remotes/'): | |
1347 | continue |
|
1347 | continue | |
1348 | bname = b.split('/', 2)[2] |
|
1348 | bname = b.split('/', 2)[2] | |
1349 | remote = self._gitcommand(['config', 'branch.%s.remote' % bname]) |
|
1349 | remote = self._gitcommand(['config', 'branch.%s.remote' % bname]) | |
1350 | if remote: |
|
1350 | if remote: | |
1351 | ref = self._gitcommand(['config', 'branch.%s.merge' % bname]) |
|
1351 | ref = self._gitcommand(['config', 'branch.%s.merge' % bname]) | |
1352 | tracking['refs/remotes/%s/%s' % |
|
1352 | tracking['refs/remotes/%s/%s' % | |
1353 | (remote, ref.split('/', 2)[2])] = b |
|
1353 | (remote, ref.split('/', 2)[2])] = b | |
1354 | return tracking |
|
1354 | return tracking | |
1355 |
|
1355 | |||
1356 | def _abssource(self, source): |
|
1356 | def _abssource(self, source): | |
1357 | if '://' not in source: |
|
1357 | if '://' not in source: | |
1358 | # recognize the scp syntax as an absolute source |
|
1358 | # recognize the scp syntax as an absolute source | |
1359 | colon = source.find(':') |
|
1359 | colon = source.find(':') | |
1360 | if colon != -1 and '/' not in source[:colon]: |
|
1360 | if colon != -1 and '/' not in source[:colon]: | |
1361 | return source |
|
1361 | return source | |
1362 | self._subsource = source |
|
1362 | self._subsource = source | |
1363 | return _abssource(self) |
|
1363 | return _abssource(self) | |
1364 |
|
1364 | |||
1365 | def _fetch(self, source, revision): |
|
1365 | def _fetch(self, source, revision): | |
1366 | if self._gitmissing(): |
|
1366 | if self._gitmissing(): | |
1367 | # SEC: check for safe ssh url |
|
1367 | # SEC: check for safe ssh url | |
1368 | util.checksafessh(source) |
|
1368 | util.checksafessh(source) | |
1369 |
|
1369 | |||
1370 | source = self._abssource(source) |
|
1370 | source = self._abssource(source) | |
1371 | self.ui.status(_('cloning subrepo %s from %s\n') % |
|
1371 | self.ui.status(_('cloning subrepo %s from %s\n') % | |
1372 | (self._relpath, source)) |
|
1372 | (self._relpath, source)) | |
1373 | self._gitnodir(['clone', source, self._abspath]) |
|
1373 | self._gitnodir(['clone', source, self._abspath]) | |
1374 | if self._githavelocally(revision): |
|
1374 | if self._githavelocally(revision): | |
1375 | return |
|
1375 | return | |
1376 | self.ui.status(_('pulling subrepo %s from %s\n') % |
|
1376 | self.ui.status(_('pulling subrepo %s from %s\n') % | |
1377 | (self._relpath, self._gitremote('origin'))) |
|
1377 | (self._relpath, self._gitremote('origin'))) | |
1378 | # try only origin: the originally cloned repo |
|
1378 | # try only origin: the originally cloned repo | |
1379 | self._gitcommand(['fetch']) |
|
1379 | self._gitcommand(['fetch']) | |
1380 | if not self._githavelocally(revision): |
|
1380 | if not self._githavelocally(revision): | |
1381 | raise error.Abort(_('revision %s does not exist in subrepository ' |
|
1381 | raise error.Abort(_('revision %s does not exist in subrepository ' | |
1382 | '"%s"\n') % (revision, self._relpath)) |
|
1382 | '"%s"\n') % (revision, self._relpath)) | |
1383 |
|
1383 | |||
1384 | @annotatesubrepoerror |
|
1384 | @annotatesubrepoerror | |
1385 | def dirty(self, ignoreupdate=False, missing=False): |
|
1385 | def dirty(self, ignoreupdate=False, missing=False): | |
1386 | if self._gitmissing(): |
|
1386 | if self._gitmissing(): | |
1387 | return self._state[1] != '' |
|
1387 | return self._state[1] != '' | |
1388 | if self._gitisbare(): |
|
1388 | if self._gitisbare(): | |
1389 | return True |
|
1389 | return True | |
1390 | if not ignoreupdate and self._state[1] != self._gitstate(): |
|
1390 | if not ignoreupdate and self._state[1] != self._gitstate(): | |
1391 | # different version checked out |
|
1391 | # different version checked out | |
1392 | return True |
|
1392 | return True | |
1393 | # check for staged changes or modified files; ignore untracked files |
|
1393 | # check for staged changes or modified files; ignore untracked files | |
1394 | self._gitupdatestat() |
|
1394 | self._gitupdatestat() | |
1395 | out, code = self._gitdir(['diff-index', '--quiet', 'HEAD']) |
|
1395 | out, code = self._gitdir(['diff-index', '--quiet', 'HEAD']) | |
1396 | return code == 1 |
|
1396 | return code == 1 | |
1397 |
|
1397 | |||
1398 | def basestate(self): |
|
1398 | def basestate(self): | |
1399 | return self._gitstate() |
|
1399 | return self._gitstate() | |
1400 |
|
1400 | |||
1401 | @annotatesubrepoerror |
|
1401 | @annotatesubrepoerror | |
1402 | def get(self, state, overwrite=False): |
|
1402 | def get(self, state, overwrite=False): | |
1403 | source, revision, kind = state |
|
1403 | source, revision, kind = state | |
1404 | if not revision: |
|
1404 | if not revision: | |
1405 | self.remove() |
|
1405 | self.remove() | |
1406 | return |
|
1406 | return | |
1407 | self._fetch(source, revision) |
|
1407 | self._fetch(source, revision) | |
1408 | # if the repo was set to be bare, unbare it |
|
1408 | # if the repo was set to be bare, unbare it | |
1409 | if self._gitisbare(): |
|
1409 | if self._gitisbare(): | |
1410 | self._gitcommand(['config', 'core.bare', 'false']) |
|
1410 | self._gitcommand(['config', 'core.bare', 'false']) | |
1411 | if self._gitstate() == revision: |
|
1411 | if self._gitstate() == revision: | |
1412 | self._gitcommand(['reset', '--hard', 'HEAD']) |
|
1412 | self._gitcommand(['reset', '--hard', 'HEAD']) | |
1413 | return |
|
1413 | return | |
1414 | elif self._gitstate() == revision: |
|
1414 | elif self._gitstate() == revision: | |
1415 | if overwrite: |
|
1415 | if overwrite: | |
1416 | # first reset the index to unmark new files for commit, because |
|
1416 | # first reset the index to unmark new files for commit, because | |
1417 | # reset --hard will otherwise throw away files added for commit, |
|
1417 | # reset --hard will otherwise throw away files added for commit, | |
1418 | # not just unmark them. |
|
1418 | # not just unmark them. | |
1419 | self._gitcommand(['reset', 'HEAD']) |
|
1419 | self._gitcommand(['reset', 'HEAD']) | |
1420 | self._gitcommand(['reset', '--hard', 'HEAD']) |
|
1420 | self._gitcommand(['reset', '--hard', 'HEAD']) | |
1421 | return |
|
1421 | return | |
1422 | branch2rev, rev2branch = self._gitbranchmap() |
|
1422 | branch2rev, rev2branch = self._gitbranchmap() | |
1423 |
|
1423 | |||
1424 | def checkout(args): |
|
1424 | def checkout(args): | |
1425 | cmd = ['checkout'] |
|
1425 | cmd = ['checkout'] | |
1426 | if overwrite: |
|
1426 | if overwrite: | |
1427 | # first reset the index to unmark new files for commit, because |
|
1427 | # first reset the index to unmark new files for commit, because | |
1428 | # the -f option will otherwise throw away files added for |
|
1428 | # the -f option will otherwise throw away files added for | |
1429 | # commit, not just unmark them. |
|
1429 | # commit, not just unmark them. | |
1430 | self._gitcommand(['reset', 'HEAD']) |
|
1430 | self._gitcommand(['reset', 'HEAD']) | |
1431 | cmd.append('-f') |
|
1431 | cmd.append('-f') | |
1432 | self._gitcommand(cmd + args) |
|
1432 | self._gitcommand(cmd + args) | |
1433 | _sanitize(self.ui, self.wvfs, '.git') |
|
1433 | _sanitize(self.ui, self.wvfs, '.git') | |
1434 |
|
1434 | |||
1435 | def rawcheckout(): |
|
1435 | def rawcheckout(): | |
1436 | # no branch to checkout, check it out with no branch |
|
1436 | # no branch to checkout, check it out with no branch | |
1437 | self.ui.warn(_('checking out detached HEAD in ' |
|
1437 | self.ui.warn(_('checking out detached HEAD in ' | |
1438 | 'subrepository "%s"\n') % self._relpath) |
|
1438 | 'subrepository "%s"\n') % self._relpath) | |
1439 | self.ui.warn(_('check out a git branch if you intend ' |
|
1439 | self.ui.warn(_('check out a git branch if you intend ' | |
1440 | 'to make changes\n')) |
|
1440 | 'to make changes\n')) | |
1441 | checkout(['-q', revision]) |
|
1441 | checkout(['-q', revision]) | |
1442 |
|
1442 | |||
1443 | if revision not in rev2branch: |
|
1443 | if revision not in rev2branch: | |
1444 | rawcheckout() |
|
1444 | rawcheckout() | |
1445 | return |
|
1445 | return | |
1446 | branches = rev2branch[revision] |
|
1446 | branches = rev2branch[revision] | |
1447 | firstlocalbranch = None |
|
1447 | firstlocalbranch = None | |
1448 | for b in branches: |
|
1448 | for b in branches: | |
1449 | if b == 'refs/heads/master': |
|
1449 | if b == 'refs/heads/master': | |
1450 | # master trumps all other branches |
|
1450 | # master trumps all other branches | |
1451 | checkout(['refs/heads/master']) |
|
1451 | checkout(['refs/heads/master']) | |
1452 | return |
|
1452 | return | |
1453 | if not firstlocalbranch and not b.startswith('refs/remotes/'): |
|
1453 | if not firstlocalbranch and not b.startswith('refs/remotes/'): | |
1454 | firstlocalbranch = b |
|
1454 | firstlocalbranch = b | |
1455 | if firstlocalbranch: |
|
1455 | if firstlocalbranch: | |
1456 | checkout([firstlocalbranch]) |
|
1456 | checkout([firstlocalbranch]) | |
1457 | return |
|
1457 | return | |
1458 |
|
1458 | |||
1459 | tracking = self._gittracking(branch2rev.keys()) |
|
1459 | tracking = self._gittracking(branch2rev.keys()) | |
1460 | # choose a remote branch already tracked if possible |
|
1460 | # choose a remote branch already tracked if possible | |
1461 | remote = branches[0] |
|
1461 | remote = branches[0] | |
1462 | if remote not in tracking: |
|
1462 | if remote not in tracking: | |
1463 | for b in branches: |
|
1463 | for b in branches: | |
1464 | if b in tracking: |
|
1464 | if b in tracking: | |
1465 | remote = b |
|
1465 | remote = b | |
1466 | break |
|
1466 | break | |
1467 |
|
1467 | |||
1468 | if remote not in tracking: |
|
1468 | if remote not in tracking: | |
1469 | # create a new local tracking branch |
|
1469 | # create a new local tracking branch | |
1470 | local = remote.split('/', 3)[3] |
|
1470 | local = remote.split('/', 3)[3] | |
1471 | checkout(['-b', local, remote]) |
|
1471 | checkout(['-b', local, remote]) | |
1472 | elif self._gitisancestor(branch2rev[tracking[remote]], remote): |
|
1472 | elif self._gitisancestor(branch2rev[tracking[remote]], remote): | |
1473 | # When updating to a tracked remote branch, |
|
1473 | # When updating to a tracked remote branch, | |
1474 | # if the local tracking branch is downstream of it, |
|
1474 | # if the local tracking branch is downstream of it, | |
1475 | # a normal `git pull` would have performed a "fast-forward merge" |
|
1475 | # a normal `git pull` would have performed a "fast-forward merge" | |
1476 | # which is equivalent to updating the local branch to the remote. |
|
1476 | # which is equivalent to updating the local branch to the remote. | |
1477 | # Since we are only looking at branching at update, we need to |
|
1477 | # Since we are only looking at branching at update, we need to | |
1478 | # detect this situation and perform this action lazily. |
|
1478 | # detect this situation and perform this action lazily. | |
1479 | if tracking[remote] != self._gitcurrentbranch(): |
|
1479 | if tracking[remote] != self._gitcurrentbranch(): | |
1480 | checkout([tracking[remote]]) |
|
1480 | checkout([tracking[remote]]) | |
1481 | self._gitcommand(['merge', '--ff', remote]) |
|
1481 | self._gitcommand(['merge', '--ff', remote]) | |
1482 | _sanitize(self.ui, self.wvfs, '.git') |
|
1482 | _sanitize(self.ui, self.wvfs, '.git') | |
1483 | else: |
|
1483 | else: | |
1484 | # a real merge would be required, just checkout the revision |
|
1484 | # a real merge would be required, just checkout the revision | |
1485 | rawcheckout() |
|
1485 | rawcheckout() | |
1486 |
|
1486 | |||
1487 | @annotatesubrepoerror |
|
1487 | @annotatesubrepoerror | |
1488 | def commit(self, text, user, date): |
|
1488 | def commit(self, text, user, date): | |
1489 | if self._gitmissing(): |
|
1489 | if self._gitmissing(): | |
1490 | raise error.Abort(_("subrepo %s is missing") % self._relpath) |
|
1490 | raise error.Abort(_("subrepo %s is missing") % self._relpath) | |
1491 | cmd = ['commit', '-a', '-m', text] |
|
1491 | cmd = ['commit', '-a', '-m', text] | |
1492 | env = encoding.environ.copy() |
|
1492 | env = encoding.environ.copy() | |
1493 | if user: |
|
1493 | if user: | |
1494 | cmd += ['--author', user] |
|
1494 | cmd += ['--author', user] | |
1495 | if date: |
|
1495 | if date: | |
1496 | # git's date parser silently ignores when seconds < 1e9 |
|
1496 | # git's date parser silently ignores when seconds < 1e9 | |
1497 | # convert to ISO8601 |
|
1497 | # convert to ISO8601 | |
1498 | env['GIT_AUTHOR_DATE'] = dateutil.datestr(date, |
|
1498 | env['GIT_AUTHOR_DATE'] = dateutil.datestr(date, | |
1499 | '%Y-%m-%dT%H:%M:%S %1%2') |
|
1499 | '%Y-%m-%dT%H:%M:%S %1%2') | |
1500 | self._gitcommand(cmd, env=env) |
|
1500 | self._gitcommand(cmd, env=env) | |
1501 | # make sure commit works otherwise HEAD might not exist under certain |
|
1501 | # make sure commit works otherwise HEAD might not exist under certain | |
1502 | # circumstances |
|
1502 | # circumstances | |
1503 | return self._gitstate() |
|
1503 | return self._gitstate() | |
1504 |
|
1504 | |||
1505 | @annotatesubrepoerror |
|
1505 | @annotatesubrepoerror | |
1506 | def merge(self, state): |
|
1506 | def merge(self, state): | |
1507 | source, revision, kind = state |
|
1507 | source, revision, kind = state | |
1508 | self._fetch(source, revision) |
|
1508 | self._fetch(source, revision) | |
1509 | base = self._gitcommand(['merge-base', revision, self._state[1]]) |
|
1509 | base = self._gitcommand(['merge-base', revision, self._state[1]]) | |
1510 | self._gitupdatestat() |
|
1510 | self._gitupdatestat() | |
1511 | out, code = self._gitdir(['diff-index', '--quiet', 'HEAD']) |
|
1511 | out, code = self._gitdir(['diff-index', '--quiet', 'HEAD']) | |
1512 |
|
1512 | |||
1513 | def mergefunc(): |
|
1513 | def mergefunc(): | |
1514 | if base == revision: |
|
1514 | if base == revision: | |
1515 | self.get(state) # fast forward merge |
|
1515 | self.get(state) # fast forward merge | |
1516 | elif base != self._state[1]: |
|
1516 | elif base != self._state[1]: | |
1517 | self._gitcommand(['merge', '--no-commit', revision]) |
|
1517 | self._gitcommand(['merge', '--no-commit', revision]) | |
1518 | _sanitize(self.ui, self.wvfs, '.git') |
|
1518 | _sanitize(self.ui, self.wvfs, '.git') | |
1519 |
|
1519 | |||
1520 | if self.dirty(): |
|
1520 | if self.dirty(): | |
1521 | if self._gitstate() != revision: |
|
1521 | if self._gitstate() != revision: | |
1522 | dirty = self._gitstate() == self._state[1] or code != 0 |
|
1522 | dirty = self._gitstate() == self._state[1] or code != 0 | |
1523 | if _updateprompt(self.ui, self, dirty, |
|
1523 | if _updateprompt(self.ui, self, dirty, | |
1524 | self._state[1][:7], revision[:7]): |
|
1524 | self._state[1][:7], revision[:7]): | |
1525 | mergefunc() |
|
1525 | mergefunc() | |
1526 | else: |
|
1526 | else: | |
1527 | mergefunc() |
|
1527 | mergefunc() | |
1528 |
|
1528 | |||
1529 | @annotatesubrepoerror |
|
1529 | @annotatesubrepoerror | |
1530 | def push(self, opts): |
|
1530 | def push(self, opts): | |
1531 | force = opts.get('force') |
|
1531 | force = opts.get('force') | |
1532 |
|
1532 | |||
1533 | if not self._state[1]: |
|
1533 | if not self._state[1]: | |
1534 | return True |
|
1534 | return True | |
1535 | if self._gitmissing(): |
|
1535 | if self._gitmissing(): | |
1536 | raise error.Abort(_("subrepo %s is missing") % self._relpath) |
|
1536 | raise error.Abort(_("subrepo %s is missing") % self._relpath) | |
1537 | # if a branch in origin contains the revision, nothing to do |
|
1537 | # if a branch in origin contains the revision, nothing to do | |
1538 | branch2rev, rev2branch = self._gitbranchmap() |
|
1538 | branch2rev, rev2branch = self._gitbranchmap() | |
1539 | if self._state[1] in rev2branch: |
|
1539 | if self._state[1] in rev2branch: | |
1540 | for b in rev2branch[self._state[1]]: |
|
1540 | for b in rev2branch[self._state[1]]: | |
1541 | if b.startswith('refs/remotes/origin/'): |
|
1541 | if b.startswith('refs/remotes/origin/'): | |
1542 | return True |
|
1542 | return True | |
1543 | for b, revision in branch2rev.iteritems(): |
|
1543 | for b, revision in branch2rev.iteritems(): | |
1544 | if b.startswith('refs/remotes/origin/'): |
|
1544 | if b.startswith('refs/remotes/origin/'): | |
1545 | if self._gitisancestor(self._state[1], revision): |
|
1545 | if self._gitisancestor(self._state[1], revision): | |
1546 | return True |
|
1546 | return True | |
1547 | # otherwise, try to push the currently checked out branch |
|
1547 | # otherwise, try to push the currently checked out branch | |
1548 | cmd = ['push'] |
|
1548 | cmd = ['push'] | |
1549 | if force: |
|
1549 | if force: | |
1550 | cmd.append('--force') |
|
1550 | cmd.append('--force') | |
1551 |
|
1551 | |||
1552 | current = self._gitcurrentbranch() |
|
1552 | current = self._gitcurrentbranch() | |
1553 | if current: |
|
1553 | if current: | |
1554 | # determine if the current branch is even useful |
|
1554 | # determine if the current branch is even useful | |
1555 | if not self._gitisancestor(self._state[1], current): |
|
1555 | if not self._gitisancestor(self._state[1], current): | |
1556 | self.ui.warn(_('unrelated git branch checked out ' |
|
1556 | self.ui.warn(_('unrelated git branch checked out ' | |
1557 | 'in subrepository "%s"\n') % self._relpath) |
|
1557 | 'in subrepository "%s"\n') % self._relpath) | |
1558 | return False |
|
1558 | return False | |
1559 | self.ui.status(_('pushing branch %s of subrepository "%s"\n') % |
|
1559 | self.ui.status(_('pushing branch %s of subrepository "%s"\n') % | |
1560 | (current.split('/', 2)[2], self._relpath)) |
|
1560 | (current.split('/', 2)[2], self._relpath)) | |
1561 | ret = self._gitdir(cmd + ['origin', current]) |
|
1561 | ret = self._gitdir(cmd + ['origin', current]) | |
1562 | return ret[1] == 0 |
|
1562 | return ret[1] == 0 | |
1563 | else: |
|
1563 | else: | |
1564 | self.ui.warn(_('no branch checked out in subrepository "%s"\n' |
|
1564 | self.ui.warn(_('no branch checked out in subrepository "%s"\n' | |
1565 | 'cannot push revision %s\n') % |
|
1565 | 'cannot push revision %s\n') % | |
1566 | (self._relpath, self._state[1])) |
|
1566 | (self._relpath, self._state[1])) | |
1567 | return False |
|
1567 | return False | |
1568 |
|
1568 | |||
1569 | @annotatesubrepoerror |
|
1569 | @annotatesubrepoerror | |
1570 | def add(self, ui, match, prefix, explicitonly, **opts): |
|
1570 | def add(self, ui, match, prefix, explicitonly, **opts): | |
1571 | if self._gitmissing(): |
|
1571 | if self._gitmissing(): | |
1572 | return [] |
|
1572 | return [] | |
1573 |
|
1573 | |||
1574 | (modified, added, removed, |
|
1574 | (modified, added, removed, | |
1575 | deleted, unknown, ignored, clean) = self.status(None, unknown=True, |
|
1575 | deleted, unknown, ignored, clean) = self.status(None, unknown=True, | |
1576 | clean=True) |
|
1576 | clean=True) | |
1577 |
|
1577 | |||
1578 | tracked = set() |
|
1578 | tracked = set() | |
1579 | # dirstates 'amn' warn, 'r' is added again |
|
1579 | # dirstates 'amn' warn, 'r' is added again | |
1580 | for l in (modified, added, deleted, clean): |
|
1580 | for l in (modified, added, deleted, clean): | |
1581 | tracked.update(l) |
|
1581 | tracked.update(l) | |
1582 |
|
1582 | |||
1583 | # Unknown files not of interest will be rejected by the matcher |
|
1583 | # Unknown files not of interest will be rejected by the matcher | |
1584 | files = unknown |
|
1584 | files = unknown | |
1585 | files.extend(match.files()) |
|
1585 | files.extend(match.files()) | |
1586 |
|
1586 | |||
1587 | rejected = [] |
|
1587 | rejected = [] | |
1588 |
|
1588 | |||
1589 | files = [f for f in sorted(set(files)) if match(f)] |
|
1589 | files = [f for f in sorted(set(files)) if match(f)] | |
1590 | for f in files: |
|
1590 | for f in files: | |
1591 | exact = match.exact(f) |
|
1591 | exact = match.exact(f) | |
1592 | command = ["add"] |
|
1592 | command = ["add"] | |
1593 | if exact: |
|
1593 | if exact: | |
1594 | command.append("-f") #should be added, even if ignored |
|
1594 | command.append("-f") #should be added, even if ignored | |
1595 | if ui.verbose or not exact: |
|
1595 | if ui.verbose or not exact: | |
1596 | ui.status(_('adding %s\n') % match.rel(f)) |
|
1596 | ui.status(_('adding %s\n') % match.rel(f)) | |
1597 |
|
1597 | |||
1598 | if f in tracked: # hg prints 'adding' even if already tracked |
|
1598 | if f in tracked: # hg prints 'adding' even if already tracked | |
1599 | if exact: |
|
1599 | if exact: | |
1600 | rejected.append(f) |
|
1600 | rejected.append(f) | |
1601 | continue |
|
1601 | continue | |
1602 | if not opts.get(r'dry_run'): |
|
1602 | if not opts.get(r'dry_run'): | |
1603 | self._gitcommand(command + [f]) |
|
1603 | self._gitcommand(command + [f]) | |
1604 |
|
1604 | |||
1605 | for f in rejected: |
|
1605 | for f in rejected: | |
1606 | ui.warn(_("%s already tracked!\n") % match.abs(f)) |
|
1606 | ui.warn(_("%s already tracked!\n") % match.abs(f)) | |
1607 |
|
1607 | |||
1608 | return rejected |
|
1608 | return rejected | |
1609 |
|
1609 | |||
1610 | @annotatesubrepoerror |
|
1610 | @annotatesubrepoerror | |
1611 | def remove(self): |
|
1611 | def remove(self): | |
1612 | if self._gitmissing(): |
|
1612 | if self._gitmissing(): | |
1613 | return |
|
1613 | return | |
1614 | if self.dirty(): |
|
1614 | if self.dirty(): | |
1615 | self.ui.warn(_('not removing repo %s because ' |
|
1615 | self.ui.warn(_('not removing repo %s because ' | |
1616 | 'it has changes.\n') % self._relpath) |
|
1616 | 'it has changes.\n') % self._relpath) | |
1617 | return |
|
1617 | return | |
1618 | # we can't fully delete the repository as it may contain |
|
1618 | # we can't fully delete the repository as it may contain | |
1619 | # local-only history |
|
1619 | # local-only history | |
1620 | self.ui.note(_('removing subrepo %s\n') % self._relpath) |
|
1620 | self.ui.note(_('removing subrepo %s\n') % self._relpath) | |
1621 | self._gitcommand(['config', 'core.bare', 'true']) |
|
1621 | self._gitcommand(['config', 'core.bare', 'true']) | |
1622 | for f, kind in self.wvfs.readdir(): |
|
1622 | for f, kind in self.wvfs.readdir(): | |
1623 | if f == '.git': |
|
1623 | if f == '.git': | |
1624 | continue |
|
1624 | continue | |
1625 | if kind == stat.S_IFDIR: |
|
1625 | if kind == stat.S_IFDIR: | |
1626 | self.wvfs.rmtree(f) |
|
1626 | self.wvfs.rmtree(f) | |
1627 | else: |
|
1627 | else: | |
1628 | self.wvfs.unlink(f) |
|
1628 | self.wvfs.unlink(f) | |
1629 |
|
1629 | |||
1630 | def archive(self, archiver, prefix, match=None, decode=True): |
|
1630 | def archive(self, archiver, prefix, match=None, decode=True): | |
1631 | total = 0 |
|
1631 | total = 0 | |
1632 | source, revision = self._state |
|
1632 | source, revision = self._state | |
1633 | if not revision: |
|
1633 | if not revision: | |
1634 | return total |
|
1634 | return total | |
1635 | self._fetch(source, revision) |
|
1635 | self._fetch(source, revision) | |
1636 |
|
1636 | |||
1637 | # Parse git's native archive command. |
|
1637 | # Parse git's native archive command. | |
1638 | # This should be much faster than manually traversing the trees |
|
1638 | # This should be much faster than manually traversing the trees | |
1639 | # and objects with many subprocess calls. |
|
1639 | # and objects with many subprocess calls. | |
1640 | tarstream = self._gitcommand(['archive', revision], stream=True) |
|
1640 | tarstream = self._gitcommand(['archive', revision], stream=True) | |
1641 | tar = tarfile.open(fileobj=tarstream, mode='r|') |
|
1641 | tar = tarfile.open(fileobj=tarstream, mode='r|') | |
1642 | relpath = subrelpath(self) |
|
1642 | relpath = subrelpath(self) | |
1643 | self.ui.progress(_('archiving (%s)') % relpath, 0, unit=_('files')) |
|
1643 | self.ui.progress(_('archiving (%s)') % relpath, 0, unit=_('files')) | |
1644 | for i, info in enumerate(tar): |
|
1644 | for i, info in enumerate(tar): | |
1645 | if info.isdir(): |
|
1645 | if info.isdir(): | |
1646 | continue |
|
1646 | continue | |
1647 | if match and not match(info.name): |
|
1647 | if match and not match(info.name): | |
1648 | continue |
|
1648 | continue | |
1649 | if info.issym(): |
|
1649 | if info.issym(): | |
1650 | data = info.linkname |
|
1650 | data = info.linkname | |
1651 | else: |
|
1651 | else: | |
1652 | data = tar.extractfile(info).read() |
|
1652 | data = tar.extractfile(info).read() | |
1653 | archiver.addfile(prefix + self._path + '/' + info.name, |
|
1653 | archiver.addfile(prefix + self._path + '/' + info.name, | |
1654 | info.mode, info.issym(), data) |
|
1654 | info.mode, info.issym(), data) | |
1655 | total += 1 |
|
1655 | total += 1 | |
1656 | self.ui.progress(_('archiving (%s)') % relpath, i + 1, |
|
1656 | self.ui.progress(_('archiving (%s)') % relpath, i + 1, | |
1657 | unit=_('files')) |
|
1657 | unit=_('files')) | |
1658 | self.ui.progress(_('archiving (%s)') % relpath, None) |
|
1658 | self.ui.progress(_('archiving (%s)') % relpath, None) | |
1659 | return total |
|
1659 | return total | |
1660 |
|
1660 | |||
1661 |
|
1661 | |||
1662 | @annotatesubrepoerror |
|
1662 | @annotatesubrepoerror | |
1663 | def cat(self, match, fm, fntemplate, prefix, **opts): |
|
1663 | def cat(self, match, fm, fntemplate, prefix, **opts): | |
1664 | rev = self._state[1] |
|
1664 | rev = self._state[1] | |
1665 | if match.anypats(): |
|
1665 | if match.anypats(): | |
1666 | return 1 #No support for include/exclude yet |
|
1666 | return 1 #No support for include/exclude yet | |
1667 |
|
1667 | |||
1668 | if not match.files(): |
|
1668 | if not match.files(): | |
1669 | return 1 |
|
1669 | return 1 | |
1670 |
|
1670 | |||
1671 | # TODO: add support for non-plain formatter (see cmdutil.cat()) |
|
1671 | # TODO: add support for non-plain formatter (see cmdutil.cat()) | |
1672 | for f in match.files(): |
|
1672 | for f in match.files(): | |
1673 | output = self._gitcommand(["show", "%s:%s" % (rev, f)]) |
|
1673 | output = self._gitcommand(["show", "%s:%s" % (rev, f)]) | |
1674 | fp = cmdutil.makefileobj(self._ctx, fntemplate, |
|
1674 | fp = cmdutil.makefileobj(self._ctx, fntemplate, | |
1675 | pathname=self.wvfs.reljoin(prefix, f)) |
|
1675 | pathname=self.wvfs.reljoin(prefix, f)) | |
1676 | fp.write(output) |
|
1676 | fp.write(output) | |
1677 | fp.close() |
|
1677 | fp.close() | |
1678 | return 0 |
|
1678 | return 0 | |
1679 |
|
1679 | |||
1680 |
|
1680 | |||
1681 | @annotatesubrepoerror |
|
1681 | @annotatesubrepoerror | |
1682 | def status(self, rev2, **opts): |
|
1682 | def status(self, rev2, **opts): | |
1683 | rev1 = self._state[1] |
|
1683 | rev1 = self._state[1] | |
1684 | if self._gitmissing() or not rev1: |
|
1684 | if self._gitmissing() or not rev1: | |
1685 | # if the repo is missing, return no results |
|
1685 | # if the repo is missing, return no results | |
1686 | return scmutil.status([], [], [], [], [], [], []) |
|
1686 | return scmutil.status([], [], [], [], [], [], []) | |
1687 | modified, added, removed = [], [], [] |
|
1687 | modified, added, removed = [], [], [] | |
1688 | self._gitupdatestat() |
|
1688 | self._gitupdatestat() | |
1689 | if rev2: |
|
1689 | if rev2: | |
1690 | command = ['diff-tree', '--no-renames', '-r', rev1, rev2] |
|
1690 | command = ['diff-tree', '--no-renames', '-r', rev1, rev2] | |
1691 | else: |
|
1691 | else: | |
1692 | command = ['diff-index', '--no-renames', rev1] |
|
1692 | command = ['diff-index', '--no-renames', rev1] | |
1693 | out = self._gitcommand(command) |
|
1693 | out = self._gitcommand(command) | |
1694 | for line in out.split('\n'): |
|
1694 | for line in out.split('\n'): | |
1695 | tab = line.find('\t') |
|
1695 | tab = line.find('\t') | |
1696 | if tab == -1: |
|
1696 | if tab == -1: | |
1697 | continue |
|
1697 | continue | |
1698 | status, f = line[tab - 1], line[tab + 1:] |
|
1698 | status, f = line[tab - 1], line[tab + 1:] | |
1699 | if status == 'M': |
|
1699 | if status == 'M': | |
1700 | modified.append(f) |
|
1700 | modified.append(f) | |
1701 | elif status == 'A': |
|
1701 | elif status == 'A': | |
1702 | added.append(f) |
|
1702 | added.append(f) | |
1703 | elif status == 'D': |
|
1703 | elif status == 'D': | |
1704 | removed.append(f) |
|
1704 | removed.append(f) | |
1705 |
|
1705 | |||
1706 | deleted, unknown, ignored, clean = [], [], [], [] |
|
1706 | deleted, unknown, ignored, clean = [], [], [], [] | |
1707 |
|
1707 | |||
1708 | command = ['status', '--porcelain', '-z'] |
|
1708 | command = ['status', '--porcelain', '-z'] | |
1709 | if opts.get(r'unknown'): |
|
1709 | if opts.get(r'unknown'): | |
1710 | command += ['--untracked-files=all'] |
|
1710 | command += ['--untracked-files=all'] | |
1711 | if opts.get(r'ignored'): |
|
1711 | if opts.get(r'ignored'): | |
1712 | command += ['--ignored'] |
|
1712 | command += ['--ignored'] | |
1713 | out = self._gitcommand(command) |
|
1713 | out = self._gitcommand(command) | |
1714 |
|
1714 | |||
1715 | changedfiles = set() |
|
1715 | changedfiles = set() | |
1716 | changedfiles.update(modified) |
|
1716 | changedfiles.update(modified) | |
1717 | changedfiles.update(added) |
|
1717 | changedfiles.update(added) | |
1718 | changedfiles.update(removed) |
|
1718 | changedfiles.update(removed) | |
1719 | for line in out.split('\0'): |
|
1719 | for line in out.split('\0'): | |
1720 | if not line: |
|
1720 | if not line: | |
1721 | continue |
|
1721 | continue | |
1722 | st = line[0:2] |
|
1722 | st = line[0:2] | |
1723 | #moves and copies show 2 files on one line |
|
1723 | #moves and copies show 2 files on one line | |
1724 | if line.find('\0') >= 0: |
|
1724 | if line.find('\0') >= 0: | |
1725 | filename1, filename2 = line[3:].split('\0') |
|
1725 | filename1, filename2 = line[3:].split('\0') | |
1726 | else: |
|
1726 | else: | |
1727 | filename1 = line[3:] |
|
1727 | filename1 = line[3:] | |
1728 | filename2 = None |
|
1728 | filename2 = None | |
1729 |
|
1729 | |||
1730 | changedfiles.add(filename1) |
|
1730 | changedfiles.add(filename1) | |
1731 | if filename2: |
|
1731 | if filename2: | |
1732 | changedfiles.add(filename2) |
|
1732 | changedfiles.add(filename2) | |
1733 |
|
1733 | |||
1734 | if st == '??': |
|
1734 | if st == '??': | |
1735 | unknown.append(filename1) |
|
1735 | unknown.append(filename1) | |
1736 | elif st == '!!': |
|
1736 | elif st == '!!': | |
1737 | ignored.append(filename1) |
|
1737 | ignored.append(filename1) | |
1738 |
|
1738 | |||
1739 | if opts.get(r'clean'): |
|
1739 | if opts.get(r'clean'): | |
1740 | out = self._gitcommand(['ls-files']) |
|
1740 | out = self._gitcommand(['ls-files']) | |
1741 | for f in out.split('\n'): |
|
1741 | for f in out.split('\n'): | |
1742 | if not f in changedfiles: |
|
1742 | if not f in changedfiles: | |
1743 | clean.append(f) |
|
1743 | clean.append(f) | |
1744 |
|
1744 | |||
1745 | return scmutil.status(modified, added, removed, deleted, |
|
1745 | return scmutil.status(modified, added, removed, deleted, | |
1746 | unknown, ignored, clean) |
|
1746 | unknown, ignored, clean) | |
1747 |
|
1747 | |||
1748 | @annotatesubrepoerror |
|
1748 | @annotatesubrepoerror | |
1749 | def diff(self, ui, diffopts, node2, match, prefix, **opts): |
|
1749 | def diff(self, ui, diffopts, node2, match, prefix, **opts): | |
1750 | node1 = self._state[1] |
|
1750 | node1 = self._state[1] | |
1751 | cmd = ['diff', '--no-renames'] |
|
1751 | cmd = ['diff', '--no-renames'] | |
1752 | if opts[r'stat']: |
|
1752 | if opts[r'stat']: | |
1753 | cmd.append('--stat') |
|
1753 | cmd.append('--stat') | |
1754 | else: |
|
1754 | else: | |
1755 | # for Git, this also implies '-p' |
|
1755 | # for Git, this also implies '-p' | |
1756 | cmd.append('-U%d' % diffopts.context) |
|
1756 | cmd.append('-U%d' % diffopts.context) | |
1757 |
|
1757 | |||
1758 | gitprefix = self.wvfs.reljoin(prefix, self._path) |
|
1758 | gitprefix = self.wvfs.reljoin(prefix, self._path) | |
1759 |
|
1759 | |||
1760 | if diffopts.noprefix: |
|
1760 | if diffopts.noprefix: | |
1761 | cmd.extend(['--src-prefix=%s/' % gitprefix, |
|
1761 | cmd.extend(['--src-prefix=%s/' % gitprefix, | |
1762 | '--dst-prefix=%s/' % gitprefix]) |
|
1762 | '--dst-prefix=%s/' % gitprefix]) | |
1763 | else: |
|
1763 | else: | |
1764 | cmd.extend(['--src-prefix=a/%s/' % gitprefix, |
|
1764 | cmd.extend(['--src-prefix=a/%s/' % gitprefix, | |
1765 | '--dst-prefix=b/%s/' % gitprefix]) |
|
1765 | '--dst-prefix=b/%s/' % gitprefix]) | |
1766 |
|
1766 | |||
1767 | if diffopts.ignorews: |
|
1767 | if diffopts.ignorews: | |
1768 | cmd.append('--ignore-all-space') |
|
1768 | cmd.append('--ignore-all-space') | |
1769 | if diffopts.ignorewsamount: |
|
1769 | if diffopts.ignorewsamount: | |
1770 | cmd.append('--ignore-space-change') |
|
1770 | cmd.append('--ignore-space-change') | |
1771 | if self._gitversion(self._gitcommand(['--version'])) >= (1, 8, 4) \ |
|
1771 | if self._gitversion(self._gitcommand(['--version'])) >= (1, 8, 4) \ | |
1772 | and diffopts.ignoreblanklines: |
|
1772 | and diffopts.ignoreblanklines: | |
1773 | cmd.append('--ignore-blank-lines') |
|
1773 | cmd.append('--ignore-blank-lines') | |
1774 |
|
1774 | |||
1775 | cmd.append(node1) |
|
1775 | cmd.append(node1) | |
1776 | if node2: |
|
1776 | if node2: | |
1777 | cmd.append(node2) |
|
1777 | cmd.append(node2) | |
1778 |
|
1778 | |||
1779 | output = "" |
|
1779 | output = "" | |
1780 | if match.always(): |
|
1780 | if match.always(): | |
1781 | output += self._gitcommand(cmd) + '\n' |
|
1781 | output += self._gitcommand(cmd) + '\n' | |
1782 | else: |
|
1782 | else: | |
1783 | st = self.status(node2)[:3] |
|
1783 | st = self.status(node2)[:3] | |
1784 | files = [f for sublist in st for f in sublist] |
|
1784 | files = [f for sublist in st for f in sublist] | |
1785 | for f in files: |
|
1785 | for f in files: | |
1786 | if match(f): |
|
1786 | if match(f): | |
1787 | output += self._gitcommand(cmd + ['--', f]) + '\n' |
|
1787 | output += self._gitcommand(cmd + ['--', f]) + '\n' | |
1788 |
|
1788 | |||
1789 | if output.strip(): |
|
1789 | if output.strip(): | |
1790 | ui.write(output) |
|
1790 | ui.write(output) | |
1791 |
|
1791 | |||
1792 | @annotatesubrepoerror |
|
1792 | @annotatesubrepoerror | |
1793 | def revert(self, substate, *pats, **opts): |
|
1793 | def revert(self, substate, *pats, **opts): | |
1794 | self.ui.status(_('reverting subrepo %s\n') % substate[0]) |
|
1794 | self.ui.status(_('reverting subrepo %s\n') % substate[0]) | |
1795 | if not opts.get(r'no_backup'): |
|
1795 | if not opts.get(r'no_backup'): | |
1796 | status = self.status(None) |
|
1796 | status = self.status(None) | |
1797 | names = status.modified |
|
1797 | names = status.modified | |
1798 | for name in names: |
|
1798 | for name in names: | |
1799 | bakname = scmutil.origpath(self.ui, self._subparent, name) |
|
1799 | bakname = scmutil.origpath(self.ui, self._subparent, name) | |
1800 | self.ui.note(_('saving current version of %s as %s\n') % |
|
1800 | self.ui.note(_('saving current version of %s as %s\n') % | |
1801 | (name, bakname)) |
|
1801 | (name, bakname)) | |
1802 | self.wvfs.rename(name, bakname) |
|
1802 | self.wvfs.rename(name, bakname) | |
1803 |
|
1803 | |||
1804 | if not opts.get(r'dry_run'): |
|
1804 | if not opts.get(r'dry_run'): | |
1805 | self.get(substate, overwrite=True) |
|
1805 | self.get(substate, overwrite=True) | |
1806 | return [] |
|
1806 | return [] | |
1807 |
|
1807 | |||
1808 | def shortid(self, revid): |
|
1808 | def shortid(self, revid): | |
1809 | return revid[:7] |
|
1809 | return revid[:7] | |
1810 |
|
1810 | |||
1811 | types = { |
|
1811 | types = { | |
1812 | 'hg': hgsubrepo, |
|
1812 | 'hg': hgsubrepo, | |
1813 | 'svn': svnsubrepo, |
|
1813 | 'svn': svnsubrepo, | |
1814 | 'git': gitsubrepo, |
|
1814 | 'git': gitsubrepo, | |
1815 | } |
|
1815 | } |
General Comments 0
You need to be logged in to leave comments.
Login now