Show More
@@ -1,5499 +1,5499 b'' | |||||
1 | # commands.py - command processing for mercurial |
|
1 | # commands.py - command processing for mercurial | |
2 | # |
|
2 | # | |
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 |
|
7 | |||
8 | from __future__ import absolute_import |
|
8 | from __future__ import absolute_import | |
9 |
|
9 | |||
10 | import difflib |
|
10 | import difflib | |
11 | import errno |
|
11 | import errno | |
12 | import os |
|
12 | import os | |
13 | import re |
|
13 | import re | |
14 | import sys |
|
14 | import sys | |
15 |
|
15 | |||
16 | from .i18n import _ |
|
16 | from .i18n import _ | |
17 | from .node import ( |
|
17 | from .node import ( | |
18 | hex, |
|
18 | hex, | |
19 | nullid, |
|
19 | nullid, | |
20 | nullrev, |
|
20 | nullrev, | |
21 | short, |
|
21 | short, | |
22 | ) |
|
22 | ) | |
23 | from . import ( |
|
23 | from . import ( | |
24 | archival, |
|
24 | archival, | |
25 | bookmarks, |
|
25 | bookmarks, | |
26 | bundle2, |
|
26 | bundle2, | |
27 | changegroup, |
|
27 | changegroup, | |
28 | cmdutil, |
|
28 | cmdutil, | |
29 | copies, |
|
29 | copies, | |
30 | debugcommands as debugcommandsmod, |
|
30 | debugcommands as debugcommandsmod, | |
31 | destutil, |
|
31 | destutil, | |
32 | dirstateguard, |
|
32 | dirstateguard, | |
33 | discovery, |
|
33 | discovery, | |
34 | encoding, |
|
34 | encoding, | |
35 | error, |
|
35 | error, | |
36 | exchange, |
|
36 | exchange, | |
37 | extensions, |
|
37 | extensions, | |
38 | formatter, |
|
38 | formatter, | |
39 | graphmod, |
|
39 | graphmod, | |
40 | hbisect, |
|
40 | hbisect, | |
41 | help, |
|
41 | help, | |
42 | hg, |
|
42 | hg, | |
43 | lock as lockmod, |
|
43 | lock as lockmod, | |
44 | merge as mergemod, |
|
44 | merge as mergemod, | |
45 | obsolete, |
|
45 | obsolete, | |
46 | patch, |
|
46 | patch, | |
47 | phases, |
|
47 | phases, | |
48 | pycompat, |
|
48 | pycompat, | |
49 | rcutil, |
|
49 | rcutil, | |
50 | registrar, |
|
50 | registrar, | |
51 | revsetlang, |
|
51 | revsetlang, | |
52 | scmutil, |
|
52 | scmutil, | |
53 | server, |
|
53 | server, | |
54 | sshserver, |
|
54 | sshserver, | |
55 | streamclone, |
|
55 | streamclone, | |
56 | tags as tagsmod, |
|
56 | tags as tagsmod, | |
57 | templatekw, |
|
57 | templatekw, | |
58 | ui as uimod, |
|
58 | ui as uimod, | |
59 | util, |
|
59 | util, | |
60 | ) |
|
60 | ) | |
61 |
|
61 | |||
62 | release = lockmod.release |
|
62 | release = lockmod.release | |
63 |
|
63 | |||
64 | table = {} |
|
64 | table = {} | |
65 | table.update(debugcommandsmod.command._table) |
|
65 | table.update(debugcommandsmod.command._table) | |
66 |
|
66 | |||
67 | command = registrar.command(table) |
|
67 | command = registrar.command(table) | |
68 |
|
68 | |||
69 | # common command options |
|
69 | # common command options | |
70 |
|
70 | |||
71 | globalopts = [ |
|
71 | globalopts = [ | |
72 | ('R', 'repository', '', |
|
72 | ('R', 'repository', '', | |
73 | _('repository root directory or name of overlay bundle file'), |
|
73 | _('repository root directory or name of overlay bundle file'), | |
74 | _('REPO')), |
|
74 | _('REPO')), | |
75 | ('', 'cwd', '', |
|
75 | ('', 'cwd', '', | |
76 | _('change working directory'), _('DIR')), |
|
76 | _('change working directory'), _('DIR')), | |
77 | ('y', 'noninteractive', None, |
|
77 | ('y', 'noninteractive', None, | |
78 | _('do not prompt, automatically pick the first choice for all prompts')), |
|
78 | _('do not prompt, automatically pick the first choice for all prompts')), | |
79 | ('q', 'quiet', None, _('suppress output')), |
|
79 | ('q', 'quiet', None, _('suppress output')), | |
80 | ('v', 'verbose', None, _('enable additional output')), |
|
80 | ('v', 'verbose', None, _('enable additional output')), | |
81 | ('', 'color', '', |
|
81 | ('', 'color', '', | |
82 | # i18n: 'always', 'auto', 'never', and 'debug' are keywords |
|
82 | # i18n: 'always', 'auto', 'never', and 'debug' are keywords | |
83 | # and should not be translated |
|
83 | # and should not be translated | |
84 | _("when to colorize (boolean, always, auto, never, or debug)"), |
|
84 | _("when to colorize (boolean, always, auto, never, or debug)"), | |
85 | _('TYPE')), |
|
85 | _('TYPE')), | |
86 | ('', 'config', [], |
|
86 | ('', 'config', [], | |
87 | _('set/override config option (use \'section.name=value\')'), |
|
87 | _('set/override config option (use \'section.name=value\')'), | |
88 | _('CONFIG')), |
|
88 | _('CONFIG')), | |
89 | ('', 'debug', None, _('enable debugging output')), |
|
89 | ('', 'debug', None, _('enable debugging output')), | |
90 | ('', 'debugger', None, _('start debugger')), |
|
90 | ('', 'debugger', None, _('start debugger')), | |
91 | ('', 'encoding', encoding.encoding, _('set the charset encoding'), |
|
91 | ('', 'encoding', encoding.encoding, _('set the charset encoding'), | |
92 | _('ENCODE')), |
|
92 | _('ENCODE')), | |
93 | ('', 'encodingmode', encoding.encodingmode, |
|
93 | ('', 'encodingmode', encoding.encodingmode, | |
94 | _('set the charset encoding mode'), _('MODE')), |
|
94 | _('set the charset encoding mode'), _('MODE')), | |
95 | ('', 'traceback', None, _('always print a traceback on exception')), |
|
95 | ('', 'traceback', None, _('always print a traceback on exception')), | |
96 | ('', 'time', None, _('time how long the command takes')), |
|
96 | ('', 'time', None, _('time how long the command takes')), | |
97 | ('', 'profile', None, _('print command execution profile')), |
|
97 | ('', 'profile', None, _('print command execution profile')), | |
98 | ('', 'version', None, _('output version information and exit')), |
|
98 | ('', 'version', None, _('output version information and exit')), | |
99 | ('h', 'help', None, _('display help and exit')), |
|
99 | ('h', 'help', None, _('display help and exit')), | |
100 | ('', 'hidden', False, _('consider hidden changesets')), |
|
100 | ('', 'hidden', False, _('consider hidden changesets')), | |
101 | ('', 'pager', 'auto', |
|
101 | ('', 'pager', 'auto', | |
102 | _("when to paginate (boolean, always, auto, or never)"), _('TYPE')), |
|
102 | _("when to paginate (boolean, always, auto, or never)"), _('TYPE')), | |
103 | ] |
|
103 | ] | |
104 |
|
104 | |||
105 | dryrunopts = cmdutil.dryrunopts |
|
105 | dryrunopts = cmdutil.dryrunopts | |
106 | remoteopts = cmdutil.remoteopts |
|
106 | remoteopts = cmdutil.remoteopts | |
107 | walkopts = cmdutil.walkopts |
|
107 | walkopts = cmdutil.walkopts | |
108 | commitopts = cmdutil.commitopts |
|
108 | commitopts = cmdutil.commitopts | |
109 | commitopts2 = cmdutil.commitopts2 |
|
109 | commitopts2 = cmdutil.commitopts2 | |
110 | formatteropts = cmdutil.formatteropts |
|
110 | formatteropts = cmdutil.formatteropts | |
111 | templateopts = cmdutil.templateopts |
|
111 | templateopts = cmdutil.templateopts | |
112 | logopts = cmdutil.logopts |
|
112 | logopts = cmdutil.logopts | |
113 | diffopts = cmdutil.diffopts |
|
113 | diffopts = cmdutil.diffopts | |
114 | diffwsopts = cmdutil.diffwsopts |
|
114 | diffwsopts = cmdutil.diffwsopts | |
115 | diffopts2 = cmdutil.diffopts2 |
|
115 | diffopts2 = cmdutil.diffopts2 | |
116 | mergetoolopts = cmdutil.mergetoolopts |
|
116 | mergetoolopts = cmdutil.mergetoolopts | |
117 | similarityopts = cmdutil.similarityopts |
|
117 | similarityopts = cmdutil.similarityopts | |
118 | subrepoopts = cmdutil.subrepoopts |
|
118 | subrepoopts = cmdutil.subrepoopts | |
119 | debugrevlogopts = cmdutil.debugrevlogopts |
|
119 | debugrevlogopts = cmdutil.debugrevlogopts | |
120 |
|
120 | |||
121 | # Commands start here, listed alphabetically |
|
121 | # Commands start here, listed alphabetically | |
122 |
|
122 | |||
123 | @command('^add', |
|
123 | @command('^add', | |
124 | walkopts + subrepoopts + dryrunopts, |
|
124 | walkopts + subrepoopts + dryrunopts, | |
125 | _('[OPTION]... [FILE]...'), |
|
125 | _('[OPTION]... [FILE]...'), | |
126 | inferrepo=True) |
|
126 | inferrepo=True) | |
127 | def add(ui, repo, *pats, **opts): |
|
127 | def add(ui, repo, *pats, **opts): | |
128 | """add the specified files on the next commit |
|
128 | """add the specified files on the next commit | |
129 |
|
129 | |||
130 | Schedule files to be version controlled and added to the |
|
130 | Schedule files to be version controlled and added to the | |
131 | repository. |
|
131 | repository. | |
132 |
|
132 | |||
133 | The files will be added to the repository at the next commit. To |
|
133 | The files will be added to the repository at the next commit. To | |
134 | undo an add before that, see :hg:`forget`. |
|
134 | undo an add before that, see :hg:`forget`. | |
135 |
|
135 | |||
136 | If no names are given, add all files to the repository (except |
|
136 | If no names are given, add all files to the repository (except | |
137 | files matching ``.hgignore``). |
|
137 | files matching ``.hgignore``). | |
138 |
|
138 | |||
139 | .. container:: verbose |
|
139 | .. container:: verbose | |
140 |
|
140 | |||
141 | Examples: |
|
141 | Examples: | |
142 |
|
142 | |||
143 | - New (unknown) files are added |
|
143 | - New (unknown) files are added | |
144 | automatically by :hg:`add`:: |
|
144 | automatically by :hg:`add`:: | |
145 |
|
145 | |||
146 | $ ls |
|
146 | $ ls | |
147 | foo.c |
|
147 | foo.c | |
148 | $ hg status |
|
148 | $ hg status | |
149 | ? foo.c |
|
149 | ? foo.c | |
150 | $ hg add |
|
150 | $ hg add | |
151 | adding foo.c |
|
151 | adding foo.c | |
152 | $ hg status |
|
152 | $ hg status | |
153 | A foo.c |
|
153 | A foo.c | |
154 |
|
154 | |||
155 | - Specific files to be added can be specified:: |
|
155 | - Specific files to be added can be specified:: | |
156 |
|
156 | |||
157 | $ ls |
|
157 | $ ls | |
158 | bar.c foo.c |
|
158 | bar.c foo.c | |
159 | $ hg status |
|
159 | $ hg status | |
160 | ? bar.c |
|
160 | ? bar.c | |
161 | ? foo.c |
|
161 | ? foo.c | |
162 | $ hg add bar.c |
|
162 | $ hg add bar.c | |
163 | $ hg status |
|
163 | $ hg status | |
164 | A bar.c |
|
164 | A bar.c | |
165 | ? foo.c |
|
165 | ? foo.c | |
166 |
|
166 | |||
167 | Returns 0 if all files are successfully added. |
|
167 | Returns 0 if all files are successfully added. | |
168 | """ |
|
168 | """ | |
169 |
|
169 | |||
170 | m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts)) |
|
170 | m = scmutil.match(repo[None], pats, pycompat.byteskwargs(opts)) | |
171 | rejected = cmdutil.add(ui, repo, m, "", False, **opts) |
|
171 | rejected = cmdutil.add(ui, repo, m, "", False, **opts) | |
172 | return rejected and 1 or 0 |
|
172 | return rejected and 1 or 0 | |
173 |
|
173 | |||
174 | @command('addremove', |
|
174 | @command('addremove', | |
175 | similarityopts + subrepoopts + walkopts + dryrunopts, |
|
175 | similarityopts + subrepoopts + walkopts + dryrunopts, | |
176 | _('[OPTION]... [FILE]...'), |
|
176 | _('[OPTION]... [FILE]...'), | |
177 | inferrepo=True) |
|
177 | inferrepo=True) | |
178 | def addremove(ui, repo, *pats, **opts): |
|
178 | def addremove(ui, repo, *pats, **opts): | |
179 | """add all new files, delete all missing files |
|
179 | """add all new files, delete all missing files | |
180 |
|
180 | |||
181 | Add all new files and remove all missing files from the |
|
181 | Add all new files and remove all missing files from the | |
182 | repository. |
|
182 | repository. | |
183 |
|
183 | |||
184 | Unless names are given, new files are ignored if they match any of |
|
184 | Unless names are given, new files are ignored if they match any of | |
185 | the patterns in ``.hgignore``. As with add, these changes take |
|
185 | the patterns in ``.hgignore``. As with add, these changes take | |
186 | effect at the next commit. |
|
186 | effect at the next commit. | |
187 |
|
187 | |||
188 | Use the -s/--similarity option to detect renamed files. This |
|
188 | Use the -s/--similarity option to detect renamed files. This | |
189 | option takes a percentage between 0 (disabled) and 100 (files must |
|
189 | option takes a percentage between 0 (disabled) and 100 (files must | |
190 | be identical) as its parameter. With a parameter greater than 0, |
|
190 | be identical) as its parameter. With a parameter greater than 0, | |
191 | this compares every removed file with every added file and records |
|
191 | this compares every removed file with every added file and records | |
192 | those similar enough as renames. Detecting renamed files this way |
|
192 | those similar enough as renames. Detecting renamed files this way | |
193 | can be expensive. After using this option, :hg:`status -C` can be |
|
193 | can be expensive. After using this option, :hg:`status -C` can be | |
194 | used to check which files were identified as moved or renamed. If |
|
194 | used to check which files were identified as moved or renamed. If | |
195 | not specified, -s/--similarity defaults to 100 and only renames of |
|
195 | not specified, -s/--similarity defaults to 100 and only renames of | |
196 | identical files are detected. |
|
196 | identical files are detected. | |
197 |
|
197 | |||
198 | .. container:: verbose |
|
198 | .. container:: verbose | |
199 |
|
199 | |||
200 | Examples: |
|
200 | Examples: | |
201 |
|
201 | |||
202 | - A number of files (bar.c and foo.c) are new, |
|
202 | - A number of files (bar.c and foo.c) are new, | |
203 | while foobar.c has been removed (without using :hg:`remove`) |
|
203 | while foobar.c has been removed (without using :hg:`remove`) | |
204 | from the repository:: |
|
204 | from the repository:: | |
205 |
|
205 | |||
206 | $ ls |
|
206 | $ ls | |
207 | bar.c foo.c |
|
207 | bar.c foo.c | |
208 | $ hg status |
|
208 | $ hg status | |
209 | ! foobar.c |
|
209 | ! foobar.c | |
210 | ? bar.c |
|
210 | ? bar.c | |
211 | ? foo.c |
|
211 | ? foo.c | |
212 | $ hg addremove |
|
212 | $ hg addremove | |
213 | adding bar.c |
|
213 | adding bar.c | |
214 | adding foo.c |
|
214 | adding foo.c | |
215 | removing foobar.c |
|
215 | removing foobar.c | |
216 | $ hg status |
|
216 | $ hg status | |
217 | A bar.c |
|
217 | A bar.c | |
218 | A foo.c |
|
218 | A foo.c | |
219 | R foobar.c |
|
219 | R foobar.c | |
220 |
|
220 | |||
221 | - A file foobar.c was moved to foo.c without using :hg:`rename`. |
|
221 | - A file foobar.c was moved to foo.c without using :hg:`rename`. | |
222 | Afterwards, it was edited slightly:: |
|
222 | Afterwards, it was edited slightly:: | |
223 |
|
223 | |||
224 | $ ls |
|
224 | $ ls | |
225 | foo.c |
|
225 | foo.c | |
226 | $ hg status |
|
226 | $ hg status | |
227 | ! foobar.c |
|
227 | ! foobar.c | |
228 | ? foo.c |
|
228 | ? foo.c | |
229 | $ hg addremove --similarity 90 |
|
229 | $ hg addremove --similarity 90 | |
230 | removing foobar.c |
|
230 | removing foobar.c | |
231 | adding foo.c |
|
231 | adding foo.c | |
232 | recording removal of foobar.c as rename to foo.c (94% similar) |
|
232 | recording removal of foobar.c as rename to foo.c (94% similar) | |
233 | $ hg status -C |
|
233 | $ hg status -C | |
234 | A foo.c |
|
234 | A foo.c | |
235 | foobar.c |
|
235 | foobar.c | |
236 | R foobar.c |
|
236 | R foobar.c | |
237 |
|
237 | |||
238 | Returns 0 if all files are successfully added. |
|
238 | Returns 0 if all files are successfully added. | |
239 | """ |
|
239 | """ | |
240 | opts = pycompat.byteskwargs(opts) |
|
240 | opts = pycompat.byteskwargs(opts) | |
241 | try: |
|
241 | try: | |
242 | sim = float(opts.get('similarity') or 100) |
|
242 | sim = float(opts.get('similarity') or 100) | |
243 | except ValueError: |
|
243 | except ValueError: | |
244 | raise error.Abort(_('similarity must be a number')) |
|
244 | raise error.Abort(_('similarity must be a number')) | |
245 | if sim < 0 or sim > 100: |
|
245 | if sim < 0 or sim > 100: | |
246 | raise error.Abort(_('similarity must be between 0 and 100')) |
|
246 | raise error.Abort(_('similarity must be between 0 and 100')) | |
247 | matcher = scmutil.match(repo[None], pats, opts) |
|
247 | matcher = scmutil.match(repo[None], pats, opts) | |
248 | return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0) |
|
248 | return scmutil.addremove(repo, matcher, "", opts, similarity=sim / 100.0) | |
249 |
|
249 | |||
250 | @command('^annotate|blame', |
|
250 | @command('^annotate|blame', | |
251 | [('r', 'rev', '', _('annotate the specified revision'), _('REV')), |
|
251 | [('r', 'rev', '', _('annotate the specified revision'), _('REV')), | |
252 | ('', 'follow', None, |
|
252 | ('', 'follow', None, | |
253 | _('follow copies/renames and list the filename (DEPRECATED)')), |
|
253 | _('follow copies/renames and list the filename (DEPRECATED)')), | |
254 | ('', 'no-follow', None, _("don't follow copies and renames")), |
|
254 | ('', 'no-follow', None, _("don't follow copies and renames")), | |
255 | ('a', 'text', None, _('treat all files as text')), |
|
255 | ('a', 'text', None, _('treat all files as text')), | |
256 | ('u', 'user', None, _('list the author (long with -v)')), |
|
256 | ('u', 'user', None, _('list the author (long with -v)')), | |
257 | ('f', 'file', None, _('list the filename')), |
|
257 | ('f', 'file', None, _('list the filename')), | |
258 | ('d', 'date', None, _('list the date (short with -q)')), |
|
258 | ('d', 'date', None, _('list the date (short with -q)')), | |
259 | ('n', 'number', None, _('list the revision number (default)')), |
|
259 | ('n', 'number', None, _('list the revision number (default)')), | |
260 | ('c', 'changeset', None, _('list the changeset')), |
|
260 | ('c', 'changeset', None, _('list the changeset')), | |
261 | ('l', 'line-number', None, _('show line number at the first appearance')), |
|
261 | ('l', 'line-number', None, _('show line number at the first appearance')), | |
262 | ('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')), |
|
262 | ('', 'skip', [], _('revision to not display (EXPERIMENTAL)'), _('REV')), | |
263 | ] + diffwsopts + walkopts + formatteropts, |
|
263 | ] + diffwsopts + walkopts + formatteropts, | |
264 | _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'), |
|
264 | _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...'), | |
265 | inferrepo=True) |
|
265 | inferrepo=True) | |
266 | def annotate(ui, repo, *pats, **opts): |
|
266 | def annotate(ui, repo, *pats, **opts): | |
267 | """show changeset information by line for each file |
|
267 | """show changeset information by line for each file | |
268 |
|
268 | |||
269 | List changes in files, showing the revision id responsible for |
|
269 | List changes in files, showing the revision id responsible for | |
270 | each line. |
|
270 | each line. | |
271 |
|
271 | |||
272 | This command is useful for discovering when a change was made and |
|
272 | This command is useful for discovering when a change was made and | |
273 | by whom. |
|
273 | by whom. | |
274 |
|
274 | |||
275 | If you include --file, --user, or --date, the revision number is |
|
275 | If you include --file, --user, or --date, the revision number is | |
276 | suppressed unless you also include --number. |
|
276 | suppressed unless you also include --number. | |
277 |
|
277 | |||
278 | Without the -a/--text option, annotate will avoid processing files |
|
278 | Without the -a/--text option, annotate will avoid processing files | |
279 | it detects as binary. With -a, annotate will annotate the file |
|
279 | it detects as binary. With -a, annotate will annotate the file | |
280 | anyway, although the results will probably be neither useful |
|
280 | anyway, although the results will probably be neither useful | |
281 | nor desirable. |
|
281 | nor desirable. | |
282 |
|
282 | |||
283 | Returns 0 on success. |
|
283 | Returns 0 on success. | |
284 | """ |
|
284 | """ | |
285 | opts = pycompat.byteskwargs(opts) |
|
285 | opts = pycompat.byteskwargs(opts) | |
286 | if not pats: |
|
286 | if not pats: | |
287 | raise error.Abort(_('at least one filename or pattern is required')) |
|
287 | raise error.Abort(_('at least one filename or pattern is required')) | |
288 |
|
288 | |||
289 | if opts.get('follow'): |
|
289 | if opts.get('follow'): | |
290 | # --follow is deprecated and now just an alias for -f/--file |
|
290 | # --follow is deprecated and now just an alias for -f/--file | |
291 | # to mimic the behavior of Mercurial before version 1.5 |
|
291 | # to mimic the behavior of Mercurial before version 1.5 | |
292 | opts['file'] = True |
|
292 | opts['file'] = True | |
293 |
|
293 | |||
294 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
294 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
295 |
|
295 | |||
296 | rootfm = ui.formatter('annotate', opts) |
|
296 | rootfm = ui.formatter('annotate', opts) | |
297 | if ui.quiet: |
|
297 | if ui.quiet: | |
298 | datefunc = util.shortdate |
|
298 | datefunc = util.shortdate | |
299 | else: |
|
299 | else: | |
300 | datefunc = util.datestr |
|
300 | datefunc = util.datestr | |
301 | if ctx.rev() is None: |
|
301 | if ctx.rev() is None: | |
302 | def hexfn(node): |
|
302 | def hexfn(node): | |
303 | if node is None: |
|
303 | if node is None: | |
304 | return None |
|
304 | return None | |
305 | else: |
|
305 | else: | |
306 | return rootfm.hexfunc(node) |
|
306 | return rootfm.hexfunc(node) | |
307 | if opts.get('changeset'): |
|
307 | if opts.get('changeset'): | |
308 | # omit "+" suffix which is appended to node hex |
|
308 | # omit "+" suffix which is appended to node hex | |
309 | def formatrev(rev): |
|
309 | def formatrev(rev): | |
310 | if rev is None: |
|
310 | if rev is None: | |
311 | return '%d' % ctx.p1().rev() |
|
311 | return '%d' % ctx.p1().rev() | |
312 | else: |
|
312 | else: | |
313 | return '%d' % rev |
|
313 | return '%d' % rev | |
314 | else: |
|
314 | else: | |
315 | def formatrev(rev): |
|
315 | def formatrev(rev): | |
316 | if rev is None: |
|
316 | if rev is None: | |
317 | return '%d+' % ctx.p1().rev() |
|
317 | return '%d+' % ctx.p1().rev() | |
318 | else: |
|
318 | else: | |
319 | return '%d ' % rev |
|
319 | return '%d ' % rev | |
320 | def formathex(hex): |
|
320 | def formathex(hex): | |
321 | if hex is None: |
|
321 | if hex is None: | |
322 | return '%s+' % rootfm.hexfunc(ctx.p1().node()) |
|
322 | return '%s+' % rootfm.hexfunc(ctx.p1().node()) | |
323 | else: |
|
323 | else: | |
324 | return '%s ' % hex |
|
324 | return '%s ' % hex | |
325 | else: |
|
325 | else: | |
326 | hexfn = rootfm.hexfunc |
|
326 | hexfn = rootfm.hexfunc | |
327 | formatrev = formathex = pycompat.bytestr |
|
327 | formatrev = formathex = pycompat.bytestr | |
328 |
|
328 | |||
329 | opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser), |
|
329 | opmap = [('user', ' ', lambda x: x[0].user(), ui.shortuser), | |
330 | ('number', ' ', lambda x: x[0].rev(), formatrev), |
|
330 | ('number', ' ', lambda x: x[0].rev(), formatrev), | |
331 | ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex), |
|
331 | ('changeset', ' ', lambda x: hexfn(x[0].node()), formathex), | |
332 | ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)), |
|
332 | ('date', ' ', lambda x: x[0].date(), util.cachefunc(datefunc)), | |
333 | ('file', ' ', lambda x: x[0].path(), str), |
|
333 | ('file', ' ', lambda x: x[0].path(), str), | |
334 | ('line_number', ':', lambda x: x[1], str), |
|
334 | ('line_number', ':', lambda x: x[1], str), | |
335 | ] |
|
335 | ] | |
336 | fieldnamemap = {'number': 'rev', 'changeset': 'node'} |
|
336 | fieldnamemap = {'number': 'rev', 'changeset': 'node'} | |
337 |
|
337 | |||
338 | if (not opts.get('user') and not opts.get('changeset') |
|
338 | if (not opts.get('user') and not opts.get('changeset') | |
339 | and not opts.get('date') and not opts.get('file')): |
|
339 | and not opts.get('date') and not opts.get('file')): | |
340 | opts['number'] = True |
|
340 | opts['number'] = True | |
341 |
|
341 | |||
342 | linenumber = opts.get('line_number') is not None |
|
342 | linenumber = opts.get('line_number') is not None | |
343 | if linenumber and (not opts.get('changeset')) and (not opts.get('number')): |
|
343 | if linenumber and (not opts.get('changeset')) and (not opts.get('number')): | |
344 | raise error.Abort(_('at least one of -n/-c is required for -l')) |
|
344 | raise error.Abort(_('at least one of -n/-c is required for -l')) | |
345 |
|
345 | |||
346 | ui.pager('annotate') |
|
346 | ui.pager('annotate') | |
347 |
|
347 | |||
348 | if rootfm.isplain(): |
|
348 | if rootfm.isplain(): | |
349 | def makefunc(get, fmt): |
|
349 | def makefunc(get, fmt): | |
350 | return lambda x: fmt(get(x)) |
|
350 | return lambda x: fmt(get(x)) | |
351 | else: |
|
351 | else: | |
352 | def makefunc(get, fmt): |
|
352 | def makefunc(get, fmt): | |
353 | return get |
|
353 | return get | |
354 | funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap |
|
354 | funcmap = [(makefunc(get, fmt), sep) for op, sep, get, fmt in opmap | |
355 | if opts.get(op)] |
|
355 | if opts.get(op)] | |
356 | funcmap[0] = (funcmap[0][0], '') # no separator in front of first column |
|
356 | funcmap[0] = (funcmap[0][0], '') # no separator in front of first column | |
357 | fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap |
|
357 | fields = ' '.join(fieldnamemap.get(op, op) for op, sep, get, fmt in opmap | |
358 | if opts.get(op)) |
|
358 | if opts.get(op)) | |
359 |
|
359 | |||
360 | def bad(x, y): |
|
360 | def bad(x, y): | |
361 | raise error.Abort("%s: %s" % (x, y)) |
|
361 | raise error.Abort("%s: %s" % (x, y)) | |
362 |
|
362 | |||
363 | m = scmutil.match(ctx, pats, opts, badfn=bad) |
|
363 | m = scmutil.match(ctx, pats, opts, badfn=bad) | |
364 |
|
364 | |||
365 | follow = not opts.get('no_follow') |
|
365 | follow = not opts.get('no_follow') | |
366 | diffopts = patch.difffeatureopts(ui, opts, section='annotate', |
|
366 | diffopts = patch.difffeatureopts(ui, opts, section='annotate', | |
367 | whitespace=True) |
|
367 | whitespace=True) | |
368 | skiprevs = opts.get('skip') |
|
368 | skiprevs = opts.get('skip') | |
369 | if skiprevs: |
|
369 | if skiprevs: | |
370 | skiprevs = scmutil.revrange(repo, skiprevs) |
|
370 | skiprevs = scmutil.revrange(repo, skiprevs) | |
371 |
|
371 | |||
372 | for abs in ctx.walk(m): |
|
372 | for abs in ctx.walk(m): | |
373 | fctx = ctx[abs] |
|
373 | fctx = ctx[abs] | |
374 | rootfm.startitem() |
|
374 | rootfm.startitem() | |
375 | rootfm.data(abspath=abs, path=m.rel(abs)) |
|
375 | rootfm.data(abspath=abs, path=m.rel(abs)) | |
376 | if not opts.get('text') and fctx.isbinary(): |
|
376 | if not opts.get('text') and fctx.isbinary(): | |
377 | rootfm.plain(_("%s: binary file\n") |
|
377 | rootfm.plain(_("%s: binary file\n") | |
378 | % ((pats and m.rel(abs)) or abs)) |
|
378 | % ((pats and m.rel(abs)) or abs)) | |
379 | continue |
|
379 | continue | |
380 |
|
380 | |||
381 | fm = rootfm.nested('lines') |
|
381 | fm = rootfm.nested('lines') | |
382 | lines = fctx.annotate(follow=follow, linenumber=linenumber, |
|
382 | lines = fctx.annotate(follow=follow, linenumber=linenumber, | |
383 | skiprevs=skiprevs, diffopts=diffopts) |
|
383 | skiprevs=skiprevs, diffopts=diffopts) | |
384 | if not lines: |
|
384 | if not lines: | |
385 | fm.end() |
|
385 | fm.end() | |
386 | continue |
|
386 | continue | |
387 | formats = [] |
|
387 | formats = [] | |
388 | pieces = [] |
|
388 | pieces = [] | |
389 |
|
389 | |||
390 | for f, sep in funcmap: |
|
390 | for f, sep in funcmap: | |
391 | l = [f(n) for n, dummy in lines] |
|
391 | l = [f(n) for n, dummy in lines] | |
392 | if fm.isplain(): |
|
392 | if fm.isplain(): | |
393 | sizes = [encoding.colwidth(x) for x in l] |
|
393 | sizes = [encoding.colwidth(x) for x in l] | |
394 | ml = max(sizes) |
|
394 | ml = max(sizes) | |
395 | formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes]) |
|
395 | formats.append([sep + ' ' * (ml - w) + '%s' for w in sizes]) | |
396 | else: |
|
396 | else: | |
397 | formats.append(['%s' for x in l]) |
|
397 | formats.append(['%s' for x in l]) | |
398 | pieces.append(l) |
|
398 | pieces.append(l) | |
399 |
|
399 | |||
400 | for f, p, l in zip(zip(*formats), zip(*pieces), lines): |
|
400 | for f, p, l in zip(zip(*formats), zip(*pieces), lines): | |
401 | fm.startitem() |
|
401 | fm.startitem() | |
402 | fm.write(fields, "".join(f), *p) |
|
402 | fm.write(fields, "".join(f), *p) | |
403 | fm.write('line', ": %s", l[1]) |
|
403 | fm.write('line', ": %s", l[1]) | |
404 |
|
404 | |||
405 | if not lines[-1][1].endswith('\n'): |
|
405 | if not lines[-1][1].endswith('\n'): | |
406 | fm.plain('\n') |
|
406 | fm.plain('\n') | |
407 | fm.end() |
|
407 | fm.end() | |
408 |
|
408 | |||
409 | rootfm.end() |
|
409 | rootfm.end() | |
410 |
|
410 | |||
411 | @command('archive', |
|
411 | @command('archive', | |
412 | [('', 'no-decode', None, _('do not pass files through decoders')), |
|
412 | [('', 'no-decode', None, _('do not pass files through decoders')), | |
413 | ('p', 'prefix', '', _('directory prefix for files in archive'), |
|
413 | ('p', 'prefix', '', _('directory prefix for files in archive'), | |
414 | _('PREFIX')), |
|
414 | _('PREFIX')), | |
415 | ('r', 'rev', '', _('revision to distribute'), _('REV')), |
|
415 | ('r', 'rev', '', _('revision to distribute'), _('REV')), | |
416 | ('t', 'type', '', _('type of distribution to create'), _('TYPE')), |
|
416 | ('t', 'type', '', _('type of distribution to create'), _('TYPE')), | |
417 | ] + subrepoopts + walkopts, |
|
417 | ] + subrepoopts + walkopts, | |
418 | _('[OPTION]... DEST')) |
|
418 | _('[OPTION]... DEST')) | |
419 | def archive(ui, repo, dest, **opts): |
|
419 | def archive(ui, repo, dest, **opts): | |
420 | '''create an unversioned archive of a repository revision |
|
420 | '''create an unversioned archive of a repository revision | |
421 |
|
421 | |||
422 | By default, the revision used is the parent of the working |
|
422 | By default, the revision used is the parent of the working | |
423 | directory; use -r/--rev to specify a different revision. |
|
423 | directory; use -r/--rev to specify a different revision. | |
424 |
|
424 | |||
425 | The archive type is automatically detected based on file |
|
425 | The archive type is automatically detected based on file | |
426 | extension (to override, use -t/--type). |
|
426 | extension (to override, use -t/--type). | |
427 |
|
427 | |||
428 | .. container:: verbose |
|
428 | .. container:: verbose | |
429 |
|
429 | |||
430 | Examples: |
|
430 | Examples: | |
431 |
|
431 | |||
432 | - create a zip file containing the 1.0 release:: |
|
432 | - create a zip file containing the 1.0 release:: | |
433 |
|
433 | |||
434 | hg archive -r 1.0 project-1.0.zip |
|
434 | hg archive -r 1.0 project-1.0.zip | |
435 |
|
435 | |||
436 | - create a tarball excluding .hg files:: |
|
436 | - create a tarball excluding .hg files:: | |
437 |
|
437 | |||
438 | hg archive project.tar.gz -X ".hg*" |
|
438 | hg archive project.tar.gz -X ".hg*" | |
439 |
|
439 | |||
440 | Valid types are: |
|
440 | Valid types are: | |
441 |
|
441 | |||
442 | :``files``: a directory full of files (default) |
|
442 | :``files``: a directory full of files (default) | |
443 | :``tar``: tar archive, uncompressed |
|
443 | :``tar``: tar archive, uncompressed | |
444 | :``tbz2``: tar archive, compressed using bzip2 |
|
444 | :``tbz2``: tar archive, compressed using bzip2 | |
445 | :``tgz``: tar archive, compressed using gzip |
|
445 | :``tgz``: tar archive, compressed using gzip | |
446 | :``uzip``: zip archive, uncompressed |
|
446 | :``uzip``: zip archive, uncompressed | |
447 | :``zip``: zip archive, compressed using deflate |
|
447 | :``zip``: zip archive, compressed using deflate | |
448 |
|
448 | |||
449 | The exact name of the destination archive or directory is given |
|
449 | The exact name of the destination archive or directory is given | |
450 | using a format string; see :hg:`help export` for details. |
|
450 | using a format string; see :hg:`help export` for details. | |
451 |
|
451 | |||
452 | Each member added to an archive file has a directory prefix |
|
452 | Each member added to an archive file has a directory prefix | |
453 | prepended. Use -p/--prefix to specify a format string for the |
|
453 | prepended. Use -p/--prefix to specify a format string for the | |
454 | prefix. The default is the basename of the archive, with suffixes |
|
454 | prefix. The default is the basename of the archive, with suffixes | |
455 | removed. |
|
455 | removed. | |
456 |
|
456 | |||
457 | Returns 0 on success. |
|
457 | Returns 0 on success. | |
458 | ''' |
|
458 | ''' | |
459 |
|
459 | |||
460 | opts = pycompat.byteskwargs(opts) |
|
460 | opts = pycompat.byteskwargs(opts) | |
461 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
461 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
462 | if not ctx: |
|
462 | if not ctx: | |
463 | raise error.Abort(_('no working directory: please specify a revision')) |
|
463 | raise error.Abort(_('no working directory: please specify a revision')) | |
464 | node = ctx.node() |
|
464 | node = ctx.node() | |
465 | dest = cmdutil.makefilename(repo, dest, node) |
|
465 | dest = cmdutil.makefilename(repo, dest, node) | |
466 | if os.path.realpath(dest) == repo.root: |
|
466 | if os.path.realpath(dest) == repo.root: | |
467 | raise error.Abort(_('repository root cannot be destination')) |
|
467 | raise error.Abort(_('repository root cannot be destination')) | |
468 |
|
468 | |||
469 | kind = opts.get('type') or archival.guesskind(dest) or 'files' |
|
469 | kind = opts.get('type') or archival.guesskind(dest) or 'files' | |
470 | prefix = opts.get('prefix') |
|
470 | prefix = opts.get('prefix') | |
471 |
|
471 | |||
472 | if dest == '-': |
|
472 | if dest == '-': | |
473 | if kind == 'files': |
|
473 | if kind == 'files': | |
474 | raise error.Abort(_('cannot archive plain files to stdout')) |
|
474 | raise error.Abort(_('cannot archive plain files to stdout')) | |
475 | dest = cmdutil.makefileobj(repo, dest) |
|
475 | dest = cmdutil.makefileobj(repo, dest) | |
476 | if not prefix: |
|
476 | if not prefix: | |
477 | prefix = os.path.basename(repo.root) + '-%h' |
|
477 | prefix = os.path.basename(repo.root) + '-%h' | |
478 |
|
478 | |||
479 | prefix = cmdutil.makefilename(repo, prefix, node) |
|
479 | prefix = cmdutil.makefilename(repo, prefix, node) | |
480 | matchfn = scmutil.match(ctx, [], opts) |
|
480 | matchfn = scmutil.match(ctx, [], opts) | |
481 | archival.archive(repo, dest, node, kind, not opts.get('no_decode'), |
|
481 | archival.archive(repo, dest, node, kind, not opts.get('no_decode'), | |
482 | matchfn, prefix, subrepos=opts.get('subrepos')) |
|
482 | matchfn, prefix, subrepos=opts.get('subrepos')) | |
483 |
|
483 | |||
484 | @command('backout', |
|
484 | @command('backout', | |
485 | [('', 'merge', None, _('merge with old dirstate parent after backout')), |
|
485 | [('', 'merge', None, _('merge with old dirstate parent after backout')), | |
486 | ('', 'commit', None, |
|
486 | ('', 'commit', None, | |
487 | _('commit if no conflicts were encountered (DEPRECATED)')), |
|
487 | _('commit if no conflicts were encountered (DEPRECATED)')), | |
488 | ('', 'no-commit', None, _('do not commit')), |
|
488 | ('', 'no-commit', None, _('do not commit')), | |
489 | ('', 'parent', '', |
|
489 | ('', 'parent', '', | |
490 | _('parent to choose when backing out merge (DEPRECATED)'), _('REV')), |
|
490 | _('parent to choose when backing out merge (DEPRECATED)'), _('REV')), | |
491 | ('r', 'rev', '', _('revision to backout'), _('REV')), |
|
491 | ('r', 'rev', '', _('revision to backout'), _('REV')), | |
492 | ('e', 'edit', False, _('invoke editor on commit messages')), |
|
492 | ('e', 'edit', False, _('invoke editor on commit messages')), | |
493 | ] + mergetoolopts + walkopts + commitopts + commitopts2, |
|
493 | ] + mergetoolopts + walkopts + commitopts + commitopts2, | |
494 | _('[OPTION]... [-r] REV')) |
|
494 | _('[OPTION]... [-r] REV')) | |
495 | def backout(ui, repo, node=None, rev=None, **opts): |
|
495 | def backout(ui, repo, node=None, rev=None, **opts): | |
496 | '''reverse effect of earlier changeset |
|
496 | '''reverse effect of earlier changeset | |
497 |
|
497 | |||
498 | Prepare a new changeset with the effect of REV undone in the |
|
498 | Prepare a new changeset with the effect of REV undone in the | |
499 | current working directory. If no conflicts were encountered, |
|
499 | current working directory. If no conflicts were encountered, | |
500 | it will be committed immediately. |
|
500 | it will be committed immediately. | |
501 |
|
501 | |||
502 | If REV is the parent of the working directory, then this new changeset |
|
502 | If REV is the parent of the working directory, then this new changeset | |
503 | is committed automatically (unless --no-commit is specified). |
|
503 | is committed automatically (unless --no-commit is specified). | |
504 |
|
504 | |||
505 | .. note:: |
|
505 | .. note:: | |
506 |
|
506 | |||
507 | :hg:`backout` cannot be used to fix either an unwanted or |
|
507 | :hg:`backout` cannot be used to fix either an unwanted or | |
508 | incorrect merge. |
|
508 | incorrect merge. | |
509 |
|
509 | |||
510 | .. container:: verbose |
|
510 | .. container:: verbose | |
511 |
|
511 | |||
512 | Examples: |
|
512 | Examples: | |
513 |
|
513 | |||
514 | - Reverse the effect of the parent of the working directory. |
|
514 | - Reverse the effect of the parent of the working directory. | |
515 | This backout will be committed immediately:: |
|
515 | This backout will be committed immediately:: | |
516 |
|
516 | |||
517 | hg backout -r . |
|
517 | hg backout -r . | |
518 |
|
518 | |||
519 | - Reverse the effect of previous bad revision 23:: |
|
519 | - Reverse the effect of previous bad revision 23:: | |
520 |
|
520 | |||
521 | hg backout -r 23 |
|
521 | hg backout -r 23 | |
522 |
|
522 | |||
523 | - Reverse the effect of previous bad revision 23 and |
|
523 | - Reverse the effect of previous bad revision 23 and | |
524 | leave changes uncommitted:: |
|
524 | leave changes uncommitted:: | |
525 |
|
525 | |||
526 | hg backout -r 23 --no-commit |
|
526 | hg backout -r 23 --no-commit | |
527 | hg commit -m "Backout revision 23" |
|
527 | hg commit -m "Backout revision 23" | |
528 |
|
528 | |||
529 | By default, the pending changeset will have one parent, |
|
529 | By default, the pending changeset will have one parent, | |
530 | maintaining a linear history. With --merge, the pending |
|
530 | maintaining a linear history. With --merge, the pending | |
531 | changeset will instead have two parents: the old parent of the |
|
531 | changeset will instead have two parents: the old parent of the | |
532 | working directory and a new child of REV that simply undoes REV. |
|
532 | working directory and a new child of REV that simply undoes REV. | |
533 |
|
533 | |||
534 | Before version 1.7, the behavior without --merge was equivalent |
|
534 | Before version 1.7, the behavior without --merge was equivalent | |
535 | to specifying --merge followed by :hg:`update --clean .` to |
|
535 | to specifying --merge followed by :hg:`update --clean .` to | |
536 | cancel the merge and leave the child of REV as a head to be |
|
536 | cancel the merge and leave the child of REV as a head to be | |
537 | merged separately. |
|
537 | merged separately. | |
538 |
|
538 | |||
539 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
539 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
540 |
|
540 | |||
541 | See :hg:`help revert` for a way to restore files to the state |
|
541 | See :hg:`help revert` for a way to restore files to the state | |
542 | of another revision. |
|
542 | of another revision. | |
543 |
|
543 | |||
544 | Returns 0 on success, 1 if nothing to backout or there are unresolved |
|
544 | Returns 0 on success, 1 if nothing to backout or there are unresolved | |
545 | files. |
|
545 | files. | |
546 | ''' |
|
546 | ''' | |
547 | wlock = lock = None |
|
547 | wlock = lock = None | |
548 | try: |
|
548 | try: | |
549 | wlock = repo.wlock() |
|
549 | wlock = repo.wlock() | |
550 | lock = repo.lock() |
|
550 | lock = repo.lock() | |
551 | return _dobackout(ui, repo, node, rev, **opts) |
|
551 | return _dobackout(ui, repo, node, rev, **opts) | |
552 | finally: |
|
552 | finally: | |
553 | release(lock, wlock) |
|
553 | release(lock, wlock) | |
554 |
|
554 | |||
555 | def _dobackout(ui, repo, node=None, rev=None, **opts): |
|
555 | def _dobackout(ui, repo, node=None, rev=None, **opts): | |
556 | opts = pycompat.byteskwargs(opts) |
|
556 | opts = pycompat.byteskwargs(opts) | |
557 | if opts.get('commit') and opts.get('no_commit'): |
|
557 | if opts.get('commit') and opts.get('no_commit'): | |
558 | raise error.Abort(_("cannot use --commit with --no-commit")) |
|
558 | raise error.Abort(_("cannot use --commit with --no-commit")) | |
559 | if opts.get('merge') and opts.get('no_commit'): |
|
559 | if opts.get('merge') and opts.get('no_commit'): | |
560 | raise error.Abort(_("cannot use --merge with --no-commit")) |
|
560 | raise error.Abort(_("cannot use --merge with --no-commit")) | |
561 |
|
561 | |||
562 | if rev and node: |
|
562 | if rev and node: | |
563 | raise error.Abort(_("please specify just one revision")) |
|
563 | raise error.Abort(_("please specify just one revision")) | |
564 |
|
564 | |||
565 | if not rev: |
|
565 | if not rev: | |
566 | rev = node |
|
566 | rev = node | |
567 |
|
567 | |||
568 | if not rev: |
|
568 | if not rev: | |
569 | raise error.Abort(_("please specify a revision to backout")) |
|
569 | raise error.Abort(_("please specify a revision to backout")) | |
570 |
|
570 | |||
571 | date = opts.get('date') |
|
571 | date = opts.get('date') | |
572 | if date: |
|
572 | if date: | |
573 | opts['date'] = util.parsedate(date) |
|
573 | opts['date'] = util.parsedate(date) | |
574 |
|
574 | |||
575 | cmdutil.checkunfinished(repo) |
|
575 | cmdutil.checkunfinished(repo) | |
576 | cmdutil.bailifchanged(repo) |
|
576 | cmdutil.bailifchanged(repo) | |
577 | node = scmutil.revsingle(repo, rev).node() |
|
577 | node = scmutil.revsingle(repo, rev).node() | |
578 |
|
578 | |||
579 | op1, op2 = repo.dirstate.parents() |
|
579 | op1, op2 = repo.dirstate.parents() | |
580 | if not repo.changelog.isancestor(node, op1): |
|
580 | if not repo.changelog.isancestor(node, op1): | |
581 | raise error.Abort(_('cannot backout change that is not an ancestor')) |
|
581 | raise error.Abort(_('cannot backout change that is not an ancestor')) | |
582 |
|
582 | |||
583 | p1, p2 = repo.changelog.parents(node) |
|
583 | p1, p2 = repo.changelog.parents(node) | |
584 | if p1 == nullid: |
|
584 | if p1 == nullid: | |
585 | raise error.Abort(_('cannot backout a change with no parents')) |
|
585 | raise error.Abort(_('cannot backout a change with no parents')) | |
586 | if p2 != nullid: |
|
586 | if p2 != nullid: | |
587 | if not opts.get('parent'): |
|
587 | if not opts.get('parent'): | |
588 | raise error.Abort(_('cannot backout a merge changeset')) |
|
588 | raise error.Abort(_('cannot backout a merge changeset')) | |
589 | p = repo.lookup(opts['parent']) |
|
589 | p = repo.lookup(opts['parent']) | |
590 | if p not in (p1, p2): |
|
590 | if p not in (p1, p2): | |
591 | raise error.Abort(_('%s is not a parent of %s') % |
|
591 | raise error.Abort(_('%s is not a parent of %s') % | |
592 | (short(p), short(node))) |
|
592 | (short(p), short(node))) | |
593 | parent = p |
|
593 | parent = p | |
594 | else: |
|
594 | else: | |
595 | if opts.get('parent'): |
|
595 | if opts.get('parent'): | |
596 | raise error.Abort(_('cannot use --parent on non-merge changeset')) |
|
596 | raise error.Abort(_('cannot use --parent on non-merge changeset')) | |
597 | parent = p1 |
|
597 | parent = p1 | |
598 |
|
598 | |||
599 | # the backout should appear on the same branch |
|
599 | # the backout should appear on the same branch | |
600 | branch = repo.dirstate.branch() |
|
600 | branch = repo.dirstate.branch() | |
601 | bheads = repo.branchheads(branch) |
|
601 | bheads = repo.branchheads(branch) | |
602 | rctx = scmutil.revsingle(repo, hex(parent)) |
|
602 | rctx = scmutil.revsingle(repo, hex(parent)) | |
603 | if not opts.get('merge') and op1 != node: |
|
603 | if not opts.get('merge') and op1 != node: | |
604 | dsguard = dirstateguard.dirstateguard(repo, 'backout') |
|
604 | dsguard = dirstateguard.dirstateguard(repo, 'backout') | |
605 | try: |
|
605 | try: | |
606 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
606 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | |
607 | 'backout') |
|
607 | 'backout') | |
608 | stats = mergemod.update(repo, parent, True, True, node, False) |
|
608 | stats = mergemod.update(repo, parent, True, True, node, False) | |
609 | repo.setparents(op1, op2) |
|
609 | repo.setparents(op1, op2) | |
610 | dsguard.close() |
|
610 | dsguard.close() | |
611 | hg._showstats(repo, stats) |
|
611 | hg._showstats(repo, stats) | |
612 | if stats[3]: |
|
612 | if stats[3]: | |
613 | repo.ui.status(_("use 'hg resolve' to retry unresolved " |
|
613 | repo.ui.status(_("use 'hg resolve' to retry unresolved " | |
614 | "file merges\n")) |
|
614 | "file merges\n")) | |
615 | return 1 |
|
615 | return 1 | |
616 | finally: |
|
616 | finally: | |
617 | ui.setconfig('ui', 'forcemerge', '', '') |
|
617 | ui.setconfig('ui', 'forcemerge', '', '') | |
618 | lockmod.release(dsguard) |
|
618 | lockmod.release(dsguard) | |
619 | else: |
|
619 | else: | |
620 | hg.clean(repo, node, show_stats=False) |
|
620 | hg.clean(repo, node, show_stats=False) | |
621 | repo.dirstate.setbranch(branch) |
|
621 | repo.dirstate.setbranch(branch) | |
622 | cmdutil.revert(ui, repo, rctx, repo.dirstate.parents()) |
|
622 | cmdutil.revert(ui, repo, rctx, repo.dirstate.parents()) | |
623 |
|
623 | |||
624 | if opts.get('no_commit'): |
|
624 | if opts.get('no_commit'): | |
625 | msg = _("changeset %s backed out, " |
|
625 | msg = _("changeset %s backed out, " | |
626 | "don't forget to commit.\n") |
|
626 | "don't forget to commit.\n") | |
627 | ui.status(msg % short(node)) |
|
627 | ui.status(msg % short(node)) | |
628 | return 0 |
|
628 | return 0 | |
629 |
|
629 | |||
630 | def commitfunc(ui, repo, message, match, opts): |
|
630 | def commitfunc(ui, repo, message, match, opts): | |
631 | editform = 'backout' |
|
631 | editform = 'backout' | |
632 | e = cmdutil.getcommiteditor(editform=editform, |
|
632 | e = cmdutil.getcommiteditor(editform=editform, | |
633 | **pycompat.strkwargs(opts)) |
|
633 | **pycompat.strkwargs(opts)) | |
634 | if not message: |
|
634 | if not message: | |
635 | # we don't translate commit messages |
|
635 | # we don't translate commit messages | |
636 | message = "Backed out changeset %s" % short(node) |
|
636 | message = "Backed out changeset %s" % short(node) | |
637 | e = cmdutil.getcommiteditor(edit=True, editform=editform) |
|
637 | e = cmdutil.getcommiteditor(edit=True, editform=editform) | |
638 | return repo.commit(message, opts.get('user'), opts.get('date'), |
|
638 | return repo.commit(message, opts.get('user'), opts.get('date'), | |
639 | match, editor=e) |
|
639 | match, editor=e) | |
640 | newnode = cmdutil.commit(ui, repo, commitfunc, [], opts) |
|
640 | newnode = cmdutil.commit(ui, repo, commitfunc, [], opts) | |
641 | if not newnode: |
|
641 | if not newnode: | |
642 | ui.status(_("nothing changed\n")) |
|
642 | ui.status(_("nothing changed\n")) | |
643 | return 1 |
|
643 | return 1 | |
644 | cmdutil.commitstatus(repo, newnode, branch, bheads) |
|
644 | cmdutil.commitstatus(repo, newnode, branch, bheads) | |
645 |
|
645 | |||
646 | def nice(node): |
|
646 | def nice(node): | |
647 | return '%d:%s' % (repo.changelog.rev(node), short(node)) |
|
647 | return '%d:%s' % (repo.changelog.rev(node), short(node)) | |
648 | ui.status(_('changeset %s backs out changeset %s\n') % |
|
648 | ui.status(_('changeset %s backs out changeset %s\n') % | |
649 | (nice(repo.changelog.tip()), nice(node))) |
|
649 | (nice(repo.changelog.tip()), nice(node))) | |
650 | if opts.get('merge') and op1 != node: |
|
650 | if opts.get('merge') and op1 != node: | |
651 | hg.clean(repo, op1, show_stats=False) |
|
651 | hg.clean(repo, op1, show_stats=False) | |
652 | ui.status(_('merging with changeset %s\n') |
|
652 | ui.status(_('merging with changeset %s\n') | |
653 | % nice(repo.changelog.tip())) |
|
653 | % nice(repo.changelog.tip())) | |
654 | try: |
|
654 | try: | |
655 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
655 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | |
656 | 'backout') |
|
656 | 'backout') | |
657 | return hg.merge(repo, hex(repo.changelog.tip())) |
|
657 | return hg.merge(repo, hex(repo.changelog.tip())) | |
658 | finally: |
|
658 | finally: | |
659 | ui.setconfig('ui', 'forcemerge', '', '') |
|
659 | ui.setconfig('ui', 'forcemerge', '', '') | |
660 | return 0 |
|
660 | return 0 | |
661 |
|
661 | |||
662 | @command('bisect', |
|
662 | @command('bisect', | |
663 | [('r', 'reset', False, _('reset bisect state')), |
|
663 | [('r', 'reset', False, _('reset bisect state')), | |
664 | ('g', 'good', False, _('mark changeset good')), |
|
664 | ('g', 'good', False, _('mark changeset good')), | |
665 | ('b', 'bad', False, _('mark changeset bad')), |
|
665 | ('b', 'bad', False, _('mark changeset bad')), | |
666 | ('s', 'skip', False, _('skip testing changeset')), |
|
666 | ('s', 'skip', False, _('skip testing changeset')), | |
667 | ('e', 'extend', False, _('extend the bisect range')), |
|
667 | ('e', 'extend', False, _('extend the bisect range')), | |
668 | ('c', 'command', '', _('use command to check changeset state'), _('CMD')), |
|
668 | ('c', 'command', '', _('use command to check changeset state'), _('CMD')), | |
669 | ('U', 'noupdate', False, _('do not update to target'))], |
|
669 | ('U', 'noupdate', False, _('do not update to target'))], | |
670 | _("[-gbsr] [-U] [-c CMD] [REV]")) |
|
670 | _("[-gbsr] [-U] [-c CMD] [REV]")) | |
671 | def bisect(ui, repo, rev=None, extra=None, command=None, |
|
671 | def bisect(ui, repo, rev=None, extra=None, command=None, | |
672 | reset=None, good=None, bad=None, skip=None, extend=None, |
|
672 | reset=None, good=None, bad=None, skip=None, extend=None, | |
673 | noupdate=None): |
|
673 | noupdate=None): | |
674 | """subdivision search of changesets |
|
674 | """subdivision search of changesets | |
675 |
|
675 | |||
676 | This command helps to find changesets which introduce problems. To |
|
676 | This command helps to find changesets which introduce problems. To | |
677 | use, mark the earliest changeset you know exhibits the problem as |
|
677 | use, mark the earliest changeset you know exhibits the problem as | |
678 | bad, then mark the latest changeset which is free from the problem |
|
678 | bad, then mark the latest changeset which is free from the problem | |
679 | as good. Bisect will update your working directory to a revision |
|
679 | as good. Bisect will update your working directory to a revision | |
680 | for testing (unless the -U/--noupdate option is specified). Once |
|
680 | for testing (unless the -U/--noupdate option is specified). Once | |
681 | you have performed tests, mark the working directory as good or |
|
681 | you have performed tests, mark the working directory as good or | |
682 | bad, and bisect will either update to another candidate changeset |
|
682 | bad, and bisect will either update to another candidate changeset | |
683 | or announce that it has found the bad revision. |
|
683 | or announce that it has found the bad revision. | |
684 |
|
684 | |||
685 | As a shortcut, you can also use the revision argument to mark a |
|
685 | As a shortcut, you can also use the revision argument to mark a | |
686 | revision as good or bad without checking it out first. |
|
686 | revision as good or bad without checking it out first. | |
687 |
|
687 | |||
688 | If you supply a command, it will be used for automatic bisection. |
|
688 | If you supply a command, it will be used for automatic bisection. | |
689 | The environment variable HG_NODE will contain the ID of the |
|
689 | The environment variable HG_NODE will contain the ID of the | |
690 | changeset being tested. The exit status of the command will be |
|
690 | changeset being tested. The exit status of the command will be | |
691 | used to mark revisions as good or bad: status 0 means good, 125 |
|
691 | used to mark revisions as good or bad: status 0 means good, 125 | |
692 | means to skip the revision, 127 (command not found) will abort the |
|
692 | means to skip the revision, 127 (command not found) will abort the | |
693 | bisection, and any other non-zero exit status means the revision |
|
693 | bisection, and any other non-zero exit status means the revision | |
694 | is bad. |
|
694 | is bad. | |
695 |
|
695 | |||
696 | .. container:: verbose |
|
696 | .. container:: verbose | |
697 |
|
697 | |||
698 | Some examples: |
|
698 | Some examples: | |
699 |
|
699 | |||
700 | - start a bisection with known bad revision 34, and good revision 12:: |
|
700 | - start a bisection with known bad revision 34, and good revision 12:: | |
701 |
|
701 | |||
702 | hg bisect --bad 34 |
|
702 | hg bisect --bad 34 | |
703 | hg bisect --good 12 |
|
703 | hg bisect --good 12 | |
704 |
|
704 | |||
705 | - advance the current bisection by marking current revision as good or |
|
705 | - advance the current bisection by marking current revision as good or | |
706 | bad:: |
|
706 | bad:: | |
707 |
|
707 | |||
708 | hg bisect --good |
|
708 | hg bisect --good | |
709 | hg bisect --bad |
|
709 | hg bisect --bad | |
710 |
|
710 | |||
711 | - mark the current revision, or a known revision, to be skipped (e.g. if |
|
711 | - mark the current revision, or a known revision, to be skipped (e.g. if | |
712 | that revision is not usable because of another issue):: |
|
712 | that revision is not usable because of another issue):: | |
713 |
|
713 | |||
714 | hg bisect --skip |
|
714 | hg bisect --skip | |
715 | hg bisect --skip 23 |
|
715 | hg bisect --skip 23 | |
716 |
|
716 | |||
717 | - skip all revisions that do not touch directories ``foo`` or ``bar``:: |
|
717 | - skip all revisions that do not touch directories ``foo`` or ``bar``:: | |
718 |
|
718 | |||
719 | hg bisect --skip "!( file('path:foo') & file('path:bar') )" |
|
719 | hg bisect --skip "!( file('path:foo') & file('path:bar') )" | |
720 |
|
720 | |||
721 | - forget the current bisection:: |
|
721 | - forget the current bisection:: | |
722 |
|
722 | |||
723 | hg bisect --reset |
|
723 | hg bisect --reset | |
724 |
|
724 | |||
725 | - use 'make && make tests' to automatically find the first broken |
|
725 | - use 'make && make tests' to automatically find the first broken | |
726 | revision:: |
|
726 | revision:: | |
727 |
|
727 | |||
728 | hg bisect --reset |
|
728 | hg bisect --reset | |
729 | hg bisect --bad 34 |
|
729 | hg bisect --bad 34 | |
730 | hg bisect --good 12 |
|
730 | hg bisect --good 12 | |
731 | hg bisect --command "make && make tests" |
|
731 | hg bisect --command "make && make tests" | |
732 |
|
732 | |||
733 | - see all changesets whose states are already known in the current |
|
733 | - see all changesets whose states are already known in the current | |
734 | bisection:: |
|
734 | bisection:: | |
735 |
|
735 | |||
736 | hg log -r "bisect(pruned)" |
|
736 | hg log -r "bisect(pruned)" | |
737 |
|
737 | |||
738 | - see the changeset currently being bisected (especially useful |
|
738 | - see the changeset currently being bisected (especially useful | |
739 | if running with -U/--noupdate):: |
|
739 | if running with -U/--noupdate):: | |
740 |
|
740 | |||
741 | hg log -r "bisect(current)" |
|
741 | hg log -r "bisect(current)" | |
742 |
|
742 | |||
743 | - see all changesets that took part in the current bisection:: |
|
743 | - see all changesets that took part in the current bisection:: | |
744 |
|
744 | |||
745 | hg log -r "bisect(range)" |
|
745 | hg log -r "bisect(range)" | |
746 |
|
746 | |||
747 | - you can even get a nice graph:: |
|
747 | - you can even get a nice graph:: | |
748 |
|
748 | |||
749 | hg log --graph -r "bisect(range)" |
|
749 | hg log --graph -r "bisect(range)" | |
750 |
|
750 | |||
751 | See :hg:`help revisions.bisect` for more about the `bisect()` predicate. |
|
751 | See :hg:`help revisions.bisect` for more about the `bisect()` predicate. | |
752 |
|
752 | |||
753 | Returns 0 on success. |
|
753 | Returns 0 on success. | |
754 | """ |
|
754 | """ | |
755 | # backward compatibility |
|
755 | # backward compatibility | |
756 | if rev in "good bad reset init".split(): |
|
756 | if rev in "good bad reset init".split(): | |
757 | ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n")) |
|
757 | ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n")) | |
758 | cmd, rev, extra = rev, extra, None |
|
758 | cmd, rev, extra = rev, extra, None | |
759 | if cmd == "good": |
|
759 | if cmd == "good": | |
760 | good = True |
|
760 | good = True | |
761 | elif cmd == "bad": |
|
761 | elif cmd == "bad": | |
762 | bad = True |
|
762 | bad = True | |
763 | else: |
|
763 | else: | |
764 | reset = True |
|
764 | reset = True | |
765 | elif extra: |
|
765 | elif extra: | |
766 | raise error.Abort(_('incompatible arguments')) |
|
766 | raise error.Abort(_('incompatible arguments')) | |
767 |
|
767 | |||
768 | incompatibles = { |
|
768 | incompatibles = { | |
769 | '--bad': bad, |
|
769 | '--bad': bad, | |
770 | '--command': bool(command), |
|
770 | '--command': bool(command), | |
771 | '--extend': extend, |
|
771 | '--extend': extend, | |
772 | '--good': good, |
|
772 | '--good': good, | |
773 | '--reset': reset, |
|
773 | '--reset': reset, | |
774 | '--skip': skip, |
|
774 | '--skip': skip, | |
775 | } |
|
775 | } | |
776 |
|
776 | |||
777 | enabled = [x for x in incompatibles if incompatibles[x]] |
|
777 | enabled = [x for x in incompatibles if incompatibles[x]] | |
778 |
|
778 | |||
779 | if len(enabled) > 1: |
|
779 | if len(enabled) > 1: | |
780 | raise error.Abort(_('%s and %s are incompatible') % |
|
780 | raise error.Abort(_('%s and %s are incompatible') % | |
781 | tuple(sorted(enabled)[0:2])) |
|
781 | tuple(sorted(enabled)[0:2])) | |
782 |
|
782 | |||
783 | if reset: |
|
783 | if reset: | |
784 | hbisect.resetstate(repo) |
|
784 | hbisect.resetstate(repo) | |
785 | return |
|
785 | return | |
786 |
|
786 | |||
787 | state = hbisect.load_state(repo) |
|
787 | state = hbisect.load_state(repo) | |
788 |
|
788 | |||
789 | # update state |
|
789 | # update state | |
790 | if good or bad or skip: |
|
790 | if good or bad or skip: | |
791 | if rev: |
|
791 | if rev: | |
792 | nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])] |
|
792 | nodes = [repo.lookup(i) for i in scmutil.revrange(repo, [rev])] | |
793 | else: |
|
793 | else: | |
794 | nodes = [repo.lookup('.')] |
|
794 | nodes = [repo.lookup('.')] | |
795 | if good: |
|
795 | if good: | |
796 | state['good'] += nodes |
|
796 | state['good'] += nodes | |
797 | elif bad: |
|
797 | elif bad: | |
798 | state['bad'] += nodes |
|
798 | state['bad'] += nodes | |
799 | elif skip: |
|
799 | elif skip: | |
800 | state['skip'] += nodes |
|
800 | state['skip'] += nodes | |
801 | hbisect.save_state(repo, state) |
|
801 | hbisect.save_state(repo, state) | |
802 | if not (state['good'] and state['bad']): |
|
802 | if not (state['good'] and state['bad']): | |
803 | return |
|
803 | return | |
804 |
|
804 | |||
805 | def mayupdate(repo, node, show_stats=True): |
|
805 | def mayupdate(repo, node, show_stats=True): | |
806 | """common used update sequence""" |
|
806 | """common used update sequence""" | |
807 | if noupdate: |
|
807 | if noupdate: | |
808 | return |
|
808 | return | |
809 | cmdutil.checkunfinished(repo) |
|
809 | cmdutil.checkunfinished(repo) | |
810 | cmdutil.bailifchanged(repo) |
|
810 | cmdutil.bailifchanged(repo) | |
811 | return hg.clean(repo, node, show_stats=show_stats) |
|
811 | return hg.clean(repo, node, show_stats=show_stats) | |
812 |
|
812 | |||
813 | displayer = cmdutil.show_changeset(ui, repo, {}) |
|
813 | displayer = cmdutil.show_changeset(ui, repo, {}) | |
814 |
|
814 | |||
815 | if command: |
|
815 | if command: | |
816 | changesets = 1 |
|
816 | changesets = 1 | |
817 | if noupdate: |
|
817 | if noupdate: | |
818 | try: |
|
818 | try: | |
819 | node = state['current'][0] |
|
819 | node = state['current'][0] | |
820 | except LookupError: |
|
820 | except LookupError: | |
821 | raise error.Abort(_('current bisect revision is unknown - ' |
|
821 | raise error.Abort(_('current bisect revision is unknown - ' | |
822 | 'start a new bisect to fix')) |
|
822 | 'start a new bisect to fix')) | |
823 | else: |
|
823 | else: | |
824 | node, p2 = repo.dirstate.parents() |
|
824 | node, p2 = repo.dirstate.parents() | |
825 | if p2 != nullid: |
|
825 | if p2 != nullid: | |
826 | raise error.Abort(_('current bisect revision is a merge')) |
|
826 | raise error.Abort(_('current bisect revision is a merge')) | |
827 | if rev: |
|
827 | if rev: | |
828 | node = repo[scmutil.revsingle(repo, rev, node)].node() |
|
828 | node = repo[scmutil.revsingle(repo, rev, node)].node() | |
829 | try: |
|
829 | try: | |
830 | while changesets: |
|
830 | while changesets: | |
831 | # update state |
|
831 | # update state | |
832 | state['current'] = [node] |
|
832 | state['current'] = [node] | |
833 | hbisect.save_state(repo, state) |
|
833 | hbisect.save_state(repo, state) | |
834 | status = ui.system(command, environ={'HG_NODE': hex(node)}, |
|
834 | status = ui.system(command, environ={'HG_NODE': hex(node)}, | |
835 | blockedtag='bisect_check') |
|
835 | blockedtag='bisect_check') | |
836 | if status == 125: |
|
836 | if status == 125: | |
837 | transition = "skip" |
|
837 | transition = "skip" | |
838 | elif status == 0: |
|
838 | elif status == 0: | |
839 | transition = "good" |
|
839 | transition = "good" | |
840 | # status < 0 means process was killed |
|
840 | # status < 0 means process was killed | |
841 | elif status == 127: |
|
841 | elif status == 127: | |
842 | raise error.Abort(_("failed to execute %s") % command) |
|
842 | raise error.Abort(_("failed to execute %s") % command) | |
843 | elif status < 0: |
|
843 | elif status < 0: | |
844 | raise error.Abort(_("%s killed") % command) |
|
844 | raise error.Abort(_("%s killed") % command) | |
845 | else: |
|
845 | else: | |
846 | transition = "bad" |
|
846 | transition = "bad" | |
847 | state[transition].append(node) |
|
847 | state[transition].append(node) | |
848 | ctx = repo[node] |
|
848 | ctx = repo[node] | |
849 | ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition)) |
|
849 | ui.status(_('changeset %d:%s: %s\n') % (ctx, ctx, transition)) | |
850 | hbisect.checkstate(state) |
|
850 | hbisect.checkstate(state) | |
851 | # bisect |
|
851 | # bisect | |
852 | nodes, changesets, bgood = hbisect.bisect(repo.changelog, state) |
|
852 | nodes, changesets, bgood = hbisect.bisect(repo.changelog, state) | |
853 | # update to next check |
|
853 | # update to next check | |
854 | node = nodes[0] |
|
854 | node = nodes[0] | |
855 | mayupdate(repo, node, show_stats=False) |
|
855 | mayupdate(repo, node, show_stats=False) | |
856 | finally: |
|
856 | finally: | |
857 | state['current'] = [node] |
|
857 | state['current'] = [node] | |
858 | hbisect.save_state(repo, state) |
|
858 | hbisect.save_state(repo, state) | |
859 | hbisect.printresult(ui, repo, state, displayer, nodes, bgood) |
|
859 | hbisect.printresult(ui, repo, state, displayer, nodes, bgood) | |
860 | return |
|
860 | return | |
861 |
|
861 | |||
862 | hbisect.checkstate(state) |
|
862 | hbisect.checkstate(state) | |
863 |
|
863 | |||
864 | # actually bisect |
|
864 | # actually bisect | |
865 | nodes, changesets, good = hbisect.bisect(repo.changelog, state) |
|
865 | nodes, changesets, good = hbisect.bisect(repo.changelog, state) | |
866 | if extend: |
|
866 | if extend: | |
867 | if not changesets: |
|
867 | if not changesets: | |
868 | extendnode = hbisect.extendrange(repo, state, nodes, good) |
|
868 | extendnode = hbisect.extendrange(repo, state, nodes, good) | |
869 | if extendnode is not None: |
|
869 | if extendnode is not None: | |
870 | ui.write(_("Extending search to changeset %d:%s\n") |
|
870 | ui.write(_("Extending search to changeset %d:%s\n") | |
871 | % (extendnode.rev(), extendnode)) |
|
871 | % (extendnode.rev(), extendnode)) | |
872 | state['current'] = [extendnode.node()] |
|
872 | state['current'] = [extendnode.node()] | |
873 | hbisect.save_state(repo, state) |
|
873 | hbisect.save_state(repo, state) | |
874 | return mayupdate(repo, extendnode.node()) |
|
874 | return mayupdate(repo, extendnode.node()) | |
875 | raise error.Abort(_("nothing to extend")) |
|
875 | raise error.Abort(_("nothing to extend")) | |
876 |
|
876 | |||
877 | if changesets == 0: |
|
877 | if changesets == 0: | |
878 | hbisect.printresult(ui, repo, state, displayer, nodes, good) |
|
878 | hbisect.printresult(ui, repo, state, displayer, nodes, good) | |
879 | else: |
|
879 | else: | |
880 | assert len(nodes) == 1 # only a single node can be tested next |
|
880 | assert len(nodes) == 1 # only a single node can be tested next | |
881 | node = nodes[0] |
|
881 | node = nodes[0] | |
882 | # compute the approximate number of remaining tests |
|
882 | # compute the approximate number of remaining tests | |
883 | tests, size = 0, 2 |
|
883 | tests, size = 0, 2 | |
884 | while size <= changesets: |
|
884 | while size <= changesets: | |
885 | tests, size = tests + 1, size * 2 |
|
885 | tests, size = tests + 1, size * 2 | |
886 | rev = repo.changelog.rev(node) |
|
886 | rev = repo.changelog.rev(node) | |
887 | ui.write(_("Testing changeset %d:%s " |
|
887 | ui.write(_("Testing changeset %d:%s " | |
888 | "(%d changesets remaining, ~%d tests)\n") |
|
888 | "(%d changesets remaining, ~%d tests)\n") | |
889 | % (rev, short(node), changesets, tests)) |
|
889 | % (rev, short(node), changesets, tests)) | |
890 | state['current'] = [node] |
|
890 | state['current'] = [node] | |
891 | hbisect.save_state(repo, state) |
|
891 | hbisect.save_state(repo, state) | |
892 | return mayupdate(repo, node) |
|
892 | return mayupdate(repo, node) | |
893 |
|
893 | |||
894 | @command('bookmarks|bookmark', |
|
894 | @command('bookmarks|bookmark', | |
895 | [('f', 'force', False, _('force')), |
|
895 | [('f', 'force', False, _('force')), | |
896 | ('r', 'rev', '', _('revision for bookmark action'), _('REV')), |
|
896 | ('r', 'rev', '', _('revision for bookmark action'), _('REV')), | |
897 | ('d', 'delete', False, _('delete a given bookmark')), |
|
897 | ('d', 'delete', False, _('delete a given bookmark')), | |
898 | ('m', 'rename', '', _('rename a given bookmark'), _('OLD')), |
|
898 | ('m', 'rename', '', _('rename a given bookmark'), _('OLD')), | |
899 | ('i', 'inactive', False, _('mark a bookmark inactive')), |
|
899 | ('i', 'inactive', False, _('mark a bookmark inactive')), | |
900 | ] + formatteropts, |
|
900 | ] + formatteropts, | |
901 | _('hg bookmarks [OPTIONS]... [NAME]...')) |
|
901 | _('hg bookmarks [OPTIONS]... [NAME]...')) | |
902 | def bookmark(ui, repo, *names, **opts): |
|
902 | def bookmark(ui, repo, *names, **opts): | |
903 | '''create a new bookmark or list existing bookmarks |
|
903 | '''create a new bookmark or list existing bookmarks | |
904 |
|
904 | |||
905 | Bookmarks are labels on changesets to help track lines of development. |
|
905 | Bookmarks are labels on changesets to help track lines of development. | |
906 | Bookmarks are unversioned and can be moved, renamed and deleted. |
|
906 | Bookmarks are unversioned and can be moved, renamed and deleted. | |
907 | Deleting or moving a bookmark has no effect on the associated changesets. |
|
907 | Deleting or moving a bookmark has no effect on the associated changesets. | |
908 |
|
908 | |||
909 | Creating or updating to a bookmark causes it to be marked as 'active'. |
|
909 | Creating or updating to a bookmark causes it to be marked as 'active'. | |
910 | The active bookmark is indicated with a '*'. |
|
910 | The active bookmark is indicated with a '*'. | |
911 | When a commit is made, the active bookmark will advance to the new commit. |
|
911 | When a commit is made, the active bookmark will advance to the new commit. | |
912 | A plain :hg:`update` will also advance an active bookmark, if possible. |
|
912 | A plain :hg:`update` will also advance an active bookmark, if possible. | |
913 | Updating away from a bookmark will cause it to be deactivated. |
|
913 | Updating away from a bookmark will cause it to be deactivated. | |
914 |
|
914 | |||
915 | Bookmarks can be pushed and pulled between repositories (see |
|
915 | Bookmarks can be pushed and pulled between repositories (see | |
916 | :hg:`help push` and :hg:`help pull`). If a shared bookmark has |
|
916 | :hg:`help push` and :hg:`help pull`). If a shared bookmark has | |
917 | diverged, a new 'divergent bookmark' of the form 'name@path' will |
|
917 | diverged, a new 'divergent bookmark' of the form 'name@path' will | |
918 | be created. Using :hg:`merge` will resolve the divergence. |
|
918 | be created. Using :hg:`merge` will resolve the divergence. | |
919 |
|
919 | |||
920 | A bookmark named '@' has the special property that :hg:`clone` will |
|
920 | A bookmark named '@' has the special property that :hg:`clone` will | |
921 | check it out by default if it exists. |
|
921 | check it out by default if it exists. | |
922 |
|
922 | |||
923 | .. container:: verbose |
|
923 | .. container:: verbose | |
924 |
|
924 | |||
925 | Examples: |
|
925 | Examples: | |
926 |
|
926 | |||
927 | - create an active bookmark for a new line of development:: |
|
927 | - create an active bookmark for a new line of development:: | |
928 |
|
928 | |||
929 | hg book new-feature |
|
929 | hg book new-feature | |
930 |
|
930 | |||
931 | - create an inactive bookmark as a place marker:: |
|
931 | - create an inactive bookmark as a place marker:: | |
932 |
|
932 | |||
933 | hg book -i reviewed |
|
933 | hg book -i reviewed | |
934 |
|
934 | |||
935 | - create an inactive bookmark on another changeset:: |
|
935 | - create an inactive bookmark on another changeset:: | |
936 |
|
936 | |||
937 | hg book -r .^ tested |
|
937 | hg book -r .^ tested | |
938 |
|
938 | |||
939 | - rename bookmark turkey to dinner:: |
|
939 | - rename bookmark turkey to dinner:: | |
940 |
|
940 | |||
941 | hg book -m turkey dinner |
|
941 | hg book -m turkey dinner | |
942 |
|
942 | |||
943 | - move the '@' bookmark from another branch:: |
|
943 | - move the '@' bookmark from another branch:: | |
944 |
|
944 | |||
945 | hg book -f @ |
|
945 | hg book -f @ | |
946 | ''' |
|
946 | ''' | |
947 | force = opts.get(r'force') |
|
947 | force = opts.get(r'force') | |
948 | rev = opts.get(r'rev') |
|
948 | rev = opts.get(r'rev') | |
949 | delete = opts.get(r'delete') |
|
949 | delete = opts.get(r'delete') | |
950 | rename = opts.get(r'rename') |
|
950 | rename = opts.get(r'rename') | |
951 | inactive = opts.get(r'inactive') |
|
951 | inactive = opts.get(r'inactive') | |
952 |
|
952 | |||
953 | if delete and rename: |
|
953 | if delete and rename: | |
954 | raise error.Abort(_("--delete and --rename are incompatible")) |
|
954 | raise error.Abort(_("--delete and --rename are incompatible")) | |
955 | if delete and rev: |
|
955 | if delete and rev: | |
956 | raise error.Abort(_("--rev is incompatible with --delete")) |
|
956 | raise error.Abort(_("--rev is incompatible with --delete")) | |
957 | if rename and rev: |
|
957 | if rename and rev: | |
958 | raise error.Abort(_("--rev is incompatible with --rename")) |
|
958 | raise error.Abort(_("--rev is incompatible with --rename")) | |
959 | if not names and (delete or rev): |
|
959 | if not names and (delete or rev): | |
960 | raise error.Abort(_("bookmark name required")) |
|
960 | raise error.Abort(_("bookmark name required")) | |
961 |
|
961 | |||
962 | if delete or rename or names or inactive: |
|
962 | if delete or rename or names or inactive: | |
963 | with repo.wlock(), repo.lock(), repo.transaction('bookmark') as tr: |
|
963 | with repo.wlock(), repo.lock(), repo.transaction('bookmark') as tr: | |
964 | if delete: |
|
964 | if delete: | |
965 | bookmarks.delete(repo, tr, names) |
|
965 | bookmarks.delete(repo, tr, names) | |
966 | elif rename: |
|
966 | elif rename: | |
967 | if not names: |
|
967 | if not names: | |
968 | raise error.Abort(_("new bookmark name required")) |
|
968 | raise error.Abort(_("new bookmark name required")) | |
969 | elif len(names) > 1: |
|
969 | elif len(names) > 1: | |
970 | raise error.Abort(_("only one new bookmark name allowed")) |
|
970 | raise error.Abort(_("only one new bookmark name allowed")) | |
971 | bookmarks.rename(repo, tr, rename, names[0], force, inactive) |
|
971 | bookmarks.rename(repo, tr, rename, names[0], force, inactive) | |
972 | elif names: |
|
972 | elif names: | |
973 | bookmarks.addbookmarks(repo, tr, names, rev, force, inactive) |
|
973 | bookmarks.addbookmarks(repo, tr, names, rev, force, inactive) | |
974 | elif inactive: |
|
974 | elif inactive: | |
975 | if len(repo._bookmarks) == 0: |
|
975 | if len(repo._bookmarks) == 0: | |
976 | ui.status(_("no bookmarks set\n")) |
|
976 | ui.status(_("no bookmarks set\n")) | |
977 | elif not repo._activebookmark: |
|
977 | elif not repo._activebookmark: | |
978 | ui.status(_("no active bookmark\n")) |
|
978 | ui.status(_("no active bookmark\n")) | |
979 | else: |
|
979 | else: | |
980 | bookmarks.deactivate(repo) |
|
980 | bookmarks.deactivate(repo) | |
981 | else: # show bookmarks |
|
981 | else: # show bookmarks | |
982 | bookmarks.printbookmarks(ui, repo, **opts) |
|
982 | bookmarks.printbookmarks(ui, repo, **opts) | |
983 |
|
983 | |||
984 | @command('branch', |
|
984 | @command('branch', | |
985 | [('f', 'force', None, |
|
985 | [('f', 'force', None, | |
986 | _('set branch name even if it shadows an existing branch')), |
|
986 | _('set branch name even if it shadows an existing branch')), | |
987 | ('C', 'clean', None, _('reset branch name to parent branch name'))], |
|
987 | ('C', 'clean', None, _('reset branch name to parent branch name'))], | |
988 | _('[-fC] [NAME]')) |
|
988 | _('[-fC] [NAME]')) | |
989 | def branch(ui, repo, label=None, **opts): |
|
989 | def branch(ui, repo, label=None, **opts): | |
990 | """set or show the current branch name |
|
990 | """set or show the current branch name | |
991 |
|
991 | |||
992 | .. note:: |
|
992 | .. note:: | |
993 |
|
993 | |||
994 | Branch names are permanent and global. Use :hg:`bookmark` to create a |
|
994 | Branch names are permanent and global. Use :hg:`bookmark` to create a | |
995 | light-weight bookmark instead. See :hg:`help glossary` for more |
|
995 | light-weight bookmark instead. See :hg:`help glossary` for more | |
996 | information about named branches and bookmarks. |
|
996 | information about named branches and bookmarks. | |
997 |
|
997 | |||
998 | With no argument, show the current branch name. With one argument, |
|
998 | With no argument, show the current branch name. With one argument, | |
999 | set the working directory branch name (the branch will not exist |
|
999 | set the working directory branch name (the branch will not exist | |
1000 | in the repository until the next commit). Standard practice |
|
1000 | in the repository until the next commit). Standard practice | |
1001 | recommends that primary development take place on the 'default' |
|
1001 | recommends that primary development take place on the 'default' | |
1002 | branch. |
|
1002 | branch. | |
1003 |
|
1003 | |||
1004 | Unless -f/--force is specified, branch will not let you set a |
|
1004 | Unless -f/--force is specified, branch will not let you set a | |
1005 | branch name that already exists. |
|
1005 | branch name that already exists. | |
1006 |
|
1006 | |||
1007 | Use -C/--clean to reset the working directory branch to that of |
|
1007 | Use -C/--clean to reset the working directory branch to that of | |
1008 | the parent of the working directory, negating a previous branch |
|
1008 | the parent of the working directory, negating a previous branch | |
1009 | change. |
|
1009 | change. | |
1010 |
|
1010 | |||
1011 | Use the command :hg:`update` to switch to an existing branch. Use |
|
1011 | Use the command :hg:`update` to switch to an existing branch. Use | |
1012 | :hg:`commit --close-branch` to mark this branch head as closed. |
|
1012 | :hg:`commit --close-branch` to mark this branch head as closed. | |
1013 | When all heads of a branch are closed, the branch will be |
|
1013 | When all heads of a branch are closed, the branch will be | |
1014 | considered closed. |
|
1014 | considered closed. | |
1015 |
|
1015 | |||
1016 | Returns 0 on success. |
|
1016 | Returns 0 on success. | |
1017 | """ |
|
1017 | """ | |
1018 | opts = pycompat.byteskwargs(opts) |
|
1018 | opts = pycompat.byteskwargs(opts) | |
1019 | if label: |
|
1019 | if label: | |
1020 | label = label.strip() |
|
1020 | label = label.strip() | |
1021 |
|
1021 | |||
1022 | if not opts.get('clean') and not label: |
|
1022 | if not opts.get('clean') and not label: | |
1023 | ui.write("%s\n" % repo.dirstate.branch()) |
|
1023 | ui.write("%s\n" % repo.dirstate.branch()) | |
1024 | return |
|
1024 | return | |
1025 |
|
1025 | |||
1026 | with repo.wlock(): |
|
1026 | with repo.wlock(): | |
1027 | if opts.get('clean'): |
|
1027 | if opts.get('clean'): | |
1028 | label = repo[None].p1().branch() |
|
1028 | label = repo[None].p1().branch() | |
1029 | repo.dirstate.setbranch(label) |
|
1029 | repo.dirstate.setbranch(label) | |
1030 | ui.status(_('reset working directory to branch %s\n') % label) |
|
1030 | ui.status(_('reset working directory to branch %s\n') % label) | |
1031 | elif label: |
|
1031 | elif label: | |
1032 | if not opts.get('force') and label in repo.branchmap(): |
|
1032 | if not opts.get('force') and label in repo.branchmap(): | |
1033 | if label not in [p.branch() for p in repo[None].parents()]: |
|
1033 | if label not in [p.branch() for p in repo[None].parents()]: | |
1034 | raise error.Abort(_('a branch of the same name already' |
|
1034 | raise error.Abort(_('a branch of the same name already' | |
1035 | ' exists'), |
|
1035 | ' exists'), | |
1036 | # i18n: "it" refers to an existing branch |
|
1036 | # i18n: "it" refers to an existing branch | |
1037 | hint=_("use 'hg update' to switch to it")) |
|
1037 | hint=_("use 'hg update' to switch to it")) | |
1038 | scmutil.checknewlabel(repo, label, 'branch') |
|
1038 | scmutil.checknewlabel(repo, label, 'branch') | |
1039 | repo.dirstate.setbranch(label) |
|
1039 | repo.dirstate.setbranch(label) | |
1040 | ui.status(_('marked working directory as branch %s\n') % label) |
|
1040 | ui.status(_('marked working directory as branch %s\n') % label) | |
1041 |
|
1041 | |||
1042 | # find any open named branches aside from default |
|
1042 | # find any open named branches aside from default | |
1043 | others = [n for n, h, t, c in repo.branchmap().iterbranches() |
|
1043 | others = [n for n, h, t, c in repo.branchmap().iterbranches() | |
1044 | if n != "default" and not c] |
|
1044 | if n != "default" and not c] | |
1045 | if not others: |
|
1045 | if not others: | |
1046 | ui.status(_('(branches are permanent and global, ' |
|
1046 | ui.status(_('(branches are permanent and global, ' | |
1047 | 'did you want a bookmark?)\n')) |
|
1047 | 'did you want a bookmark?)\n')) | |
1048 |
|
1048 | |||
1049 | @command('branches', |
|
1049 | @command('branches', | |
1050 | [('a', 'active', False, |
|
1050 | [('a', 'active', False, | |
1051 | _('show only branches that have unmerged heads (DEPRECATED)')), |
|
1051 | _('show only branches that have unmerged heads (DEPRECATED)')), | |
1052 | ('c', 'closed', False, _('show normal and closed branches')), |
|
1052 | ('c', 'closed', False, _('show normal and closed branches')), | |
1053 | ] + formatteropts, |
|
1053 | ] + formatteropts, | |
1054 | _('[-c]')) |
|
1054 | _('[-c]')) | |
1055 | def branches(ui, repo, active=False, closed=False, **opts): |
|
1055 | def branches(ui, repo, active=False, closed=False, **opts): | |
1056 | """list repository named branches |
|
1056 | """list repository named branches | |
1057 |
|
1057 | |||
1058 | List the repository's named branches, indicating which ones are |
|
1058 | List the repository's named branches, indicating which ones are | |
1059 | inactive. If -c/--closed is specified, also list branches which have |
|
1059 | inactive. If -c/--closed is specified, also list branches which have | |
1060 | been marked closed (see :hg:`commit --close-branch`). |
|
1060 | been marked closed (see :hg:`commit --close-branch`). | |
1061 |
|
1061 | |||
1062 | Use the command :hg:`update` to switch to an existing branch. |
|
1062 | Use the command :hg:`update` to switch to an existing branch. | |
1063 |
|
1063 | |||
1064 | Returns 0. |
|
1064 | Returns 0. | |
1065 | """ |
|
1065 | """ | |
1066 |
|
1066 | |||
1067 | opts = pycompat.byteskwargs(opts) |
|
1067 | opts = pycompat.byteskwargs(opts) | |
1068 | ui.pager('branches') |
|
1068 | ui.pager('branches') | |
1069 | fm = ui.formatter('branches', opts) |
|
1069 | fm = ui.formatter('branches', opts) | |
1070 | hexfunc = fm.hexfunc |
|
1070 | hexfunc = fm.hexfunc | |
1071 |
|
1071 | |||
1072 | allheads = set(repo.heads()) |
|
1072 | allheads = set(repo.heads()) | |
1073 | branches = [] |
|
1073 | branches = [] | |
1074 | for tag, heads, tip, isclosed in repo.branchmap().iterbranches(): |
|
1074 | for tag, heads, tip, isclosed in repo.branchmap().iterbranches(): | |
1075 | isactive = not isclosed and bool(set(heads) & allheads) |
|
1075 | isactive = not isclosed and bool(set(heads) & allheads) | |
1076 | branches.append((tag, repo[tip], isactive, not isclosed)) |
|
1076 | branches.append((tag, repo[tip], isactive, not isclosed)) | |
1077 | branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), |
|
1077 | branches.sort(key=lambda i: (i[2], i[1].rev(), i[0], i[3]), | |
1078 | reverse=True) |
|
1078 | reverse=True) | |
1079 |
|
1079 | |||
1080 | for tag, ctx, isactive, isopen in branches: |
|
1080 | for tag, ctx, isactive, isopen in branches: | |
1081 | if active and not isactive: |
|
1081 | if active and not isactive: | |
1082 | continue |
|
1082 | continue | |
1083 | if isactive: |
|
1083 | if isactive: | |
1084 | label = 'branches.active' |
|
1084 | label = 'branches.active' | |
1085 | notice = '' |
|
1085 | notice = '' | |
1086 | elif not isopen: |
|
1086 | elif not isopen: | |
1087 | if not closed: |
|
1087 | if not closed: | |
1088 | continue |
|
1088 | continue | |
1089 | label = 'branches.closed' |
|
1089 | label = 'branches.closed' | |
1090 | notice = _(' (closed)') |
|
1090 | notice = _(' (closed)') | |
1091 | else: |
|
1091 | else: | |
1092 | label = 'branches.inactive' |
|
1092 | label = 'branches.inactive' | |
1093 | notice = _(' (inactive)') |
|
1093 | notice = _(' (inactive)') | |
1094 | current = (tag == repo.dirstate.branch()) |
|
1094 | current = (tag == repo.dirstate.branch()) | |
1095 | if current: |
|
1095 | if current: | |
1096 | label = 'branches.current' |
|
1096 | label = 'branches.current' | |
1097 |
|
1097 | |||
1098 | fm.startitem() |
|
1098 | fm.startitem() | |
1099 | fm.write('branch', '%s', tag, label=label) |
|
1099 | fm.write('branch', '%s', tag, label=label) | |
1100 | rev = ctx.rev() |
|
1100 | rev = ctx.rev() | |
1101 | padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0) |
|
1101 | padsize = max(31 - len(str(rev)) - encoding.colwidth(tag), 0) | |
1102 | fmt = ' ' * padsize + ' %d:%s' |
|
1102 | fmt = ' ' * padsize + ' %d:%s' | |
1103 | fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()), |
|
1103 | fm.condwrite(not ui.quiet, 'rev node', fmt, rev, hexfunc(ctx.node()), | |
1104 | label='log.changeset changeset.%s' % ctx.phasestr()) |
|
1104 | label='log.changeset changeset.%s' % ctx.phasestr()) | |
1105 | fm.context(ctx=ctx) |
|
1105 | fm.context(ctx=ctx) | |
1106 | fm.data(active=isactive, closed=not isopen, current=current) |
|
1106 | fm.data(active=isactive, closed=not isopen, current=current) | |
1107 | if not ui.quiet: |
|
1107 | if not ui.quiet: | |
1108 | fm.plain(notice) |
|
1108 | fm.plain(notice) | |
1109 | fm.plain('\n') |
|
1109 | fm.plain('\n') | |
1110 | fm.end() |
|
1110 | fm.end() | |
1111 |
|
1111 | |||
1112 | @command('bundle', |
|
1112 | @command('bundle', | |
1113 | [('f', 'force', None, _('run even when the destination is unrelated')), |
|
1113 | [('f', 'force', None, _('run even when the destination is unrelated')), | |
1114 | ('r', 'rev', [], _('a changeset intended to be added to the destination'), |
|
1114 | ('r', 'rev', [], _('a changeset intended to be added to the destination'), | |
1115 | _('REV')), |
|
1115 | _('REV')), | |
1116 | ('b', 'branch', [], _('a specific branch you would like to bundle'), |
|
1116 | ('b', 'branch', [], _('a specific branch you would like to bundle'), | |
1117 | _('BRANCH')), |
|
1117 | _('BRANCH')), | |
1118 | ('', 'base', [], |
|
1118 | ('', 'base', [], | |
1119 | _('a base changeset assumed to be available at the destination'), |
|
1119 | _('a base changeset assumed to be available at the destination'), | |
1120 | _('REV')), |
|
1120 | _('REV')), | |
1121 | ('a', 'all', None, _('bundle all changesets in the repository')), |
|
1121 | ('a', 'all', None, _('bundle all changesets in the repository')), | |
1122 | ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')), |
|
1122 | ('t', 'type', 'bzip2', _('bundle compression type to use'), _('TYPE')), | |
1123 | ] + remoteopts, |
|
1123 | ] + remoteopts, | |
1124 | _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]')) |
|
1124 | _('[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]')) | |
1125 | def bundle(ui, repo, fname, dest=None, **opts): |
|
1125 | def bundle(ui, repo, fname, dest=None, **opts): | |
1126 | """create a bundle file |
|
1126 | """create a bundle file | |
1127 |
|
1127 | |||
1128 | Generate a bundle file containing data to be added to a repository. |
|
1128 | Generate a bundle file containing data to be added to a repository. | |
1129 |
|
1129 | |||
1130 | To create a bundle containing all changesets, use -a/--all |
|
1130 | To create a bundle containing all changesets, use -a/--all | |
1131 | (or --base null). Otherwise, hg assumes the destination will have |
|
1131 | (or --base null). Otherwise, hg assumes the destination will have | |
1132 | all the nodes you specify with --base parameters. Otherwise, hg |
|
1132 | all the nodes you specify with --base parameters. Otherwise, hg | |
1133 | will assume the repository has all the nodes in destination, or |
|
1133 | will assume the repository has all the nodes in destination, or | |
1134 | default-push/default if no destination is specified. |
|
1134 | default-push/default if no destination is specified. | |
1135 |
|
1135 | |||
1136 | You can change bundle format with the -t/--type option. See |
|
1136 | You can change bundle format with the -t/--type option. See | |
1137 | :hg:`help bundlespec` for documentation on this format. By default, |
|
1137 | :hg:`help bundlespec` for documentation on this format. By default, | |
1138 | the most appropriate format is used and compression defaults to |
|
1138 | the most appropriate format is used and compression defaults to | |
1139 | bzip2. |
|
1139 | bzip2. | |
1140 |
|
1140 | |||
1141 | The bundle file can then be transferred using conventional means |
|
1141 | The bundle file can then be transferred using conventional means | |
1142 | and applied to another repository with the unbundle or pull |
|
1142 | and applied to another repository with the unbundle or pull | |
1143 | command. This is useful when direct push and pull are not |
|
1143 | command. This is useful when direct push and pull are not | |
1144 | available or when exporting an entire repository is undesirable. |
|
1144 | available or when exporting an entire repository is undesirable. | |
1145 |
|
1145 | |||
1146 | Applying bundles preserves all changeset contents including |
|
1146 | Applying bundles preserves all changeset contents including | |
1147 | permissions, copy/rename information, and revision history. |
|
1147 | permissions, copy/rename information, and revision history. | |
1148 |
|
1148 | |||
1149 | Returns 0 on success, 1 if no changes found. |
|
1149 | Returns 0 on success, 1 if no changes found. | |
1150 | """ |
|
1150 | """ | |
1151 | opts = pycompat.byteskwargs(opts) |
|
1151 | opts = pycompat.byteskwargs(opts) | |
1152 | revs = None |
|
1152 | revs = None | |
1153 | if 'rev' in opts: |
|
1153 | if 'rev' in opts: | |
1154 | revstrings = opts['rev'] |
|
1154 | revstrings = opts['rev'] | |
1155 | revs = scmutil.revrange(repo, revstrings) |
|
1155 | revs = scmutil.revrange(repo, revstrings) | |
1156 | if revstrings and not revs: |
|
1156 | if revstrings and not revs: | |
1157 | raise error.Abort(_('no commits to bundle')) |
|
1157 | raise error.Abort(_('no commits to bundle')) | |
1158 |
|
1158 | |||
1159 | bundletype = opts.get('type', 'bzip2').lower() |
|
1159 | bundletype = opts.get('type', 'bzip2').lower() | |
1160 | try: |
|
1160 | try: | |
1161 | bcompression, cgversion, params = exchange.parsebundlespec( |
|
1161 | bcompression, cgversion, params = exchange.parsebundlespec( | |
1162 | repo, bundletype, strict=False) |
|
1162 | repo, bundletype, strict=False) | |
1163 | except error.UnsupportedBundleSpecification as e: |
|
1163 | except error.UnsupportedBundleSpecification as e: | |
1164 | raise error.Abort(str(e), |
|
1164 | raise error.Abort(str(e), | |
1165 | hint=_("see 'hg help bundlespec' for supported " |
|
1165 | hint=_("see 'hg help bundlespec' for supported " | |
1166 | "values for --type")) |
|
1166 | "values for --type")) | |
1167 |
|
1167 | |||
1168 | # Packed bundles are a pseudo bundle format for now. |
|
1168 | # Packed bundles are a pseudo bundle format for now. | |
1169 | if cgversion == 's1': |
|
1169 | if cgversion == 's1': | |
1170 | raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'), |
|
1170 | raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'), | |
1171 | hint=_("use 'hg debugcreatestreamclonebundle'")) |
|
1171 | hint=_("use 'hg debugcreatestreamclonebundle'")) | |
1172 |
|
1172 | |||
1173 | if opts.get('all'): |
|
1173 | if opts.get('all'): | |
1174 | if dest: |
|
1174 | if dest: | |
1175 | raise error.Abort(_("--all is incompatible with specifying " |
|
1175 | raise error.Abort(_("--all is incompatible with specifying " | |
1176 | "a destination")) |
|
1176 | "a destination")) | |
1177 | if opts.get('base'): |
|
1177 | if opts.get('base'): | |
1178 | ui.warn(_("ignoring --base because --all was specified\n")) |
|
1178 | ui.warn(_("ignoring --base because --all was specified\n")) | |
1179 | base = ['null'] |
|
1179 | base = ['null'] | |
1180 | else: |
|
1180 | else: | |
1181 | base = scmutil.revrange(repo, opts.get('base')) |
|
1181 | base = scmutil.revrange(repo, opts.get('base')) | |
1182 | if cgversion not in changegroup.supportedoutgoingversions(repo): |
|
1182 | if cgversion not in changegroup.supportedoutgoingversions(repo): | |
1183 | raise error.Abort(_("repository does not support bundle version %s") % |
|
1183 | raise error.Abort(_("repository does not support bundle version %s") % | |
1184 | cgversion) |
|
1184 | cgversion) | |
1185 |
|
1185 | |||
1186 | if base: |
|
1186 | if base: | |
1187 | if dest: |
|
1187 | if dest: | |
1188 | raise error.Abort(_("--base is incompatible with specifying " |
|
1188 | raise error.Abort(_("--base is incompatible with specifying " | |
1189 | "a destination")) |
|
1189 | "a destination")) | |
1190 | common = [repo.lookup(rev) for rev in base] |
|
1190 | common = [repo.lookup(rev) for rev in base] | |
1191 | heads = revs and map(repo.lookup, revs) or None |
|
1191 | heads = revs and map(repo.lookup, revs) or None | |
1192 | outgoing = discovery.outgoing(repo, common, heads) |
|
1192 | outgoing = discovery.outgoing(repo, common, heads) | |
1193 | else: |
|
1193 | else: | |
1194 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
1194 | dest = ui.expandpath(dest or 'default-push', dest or 'default') | |
1195 | dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
1195 | dest, branches = hg.parseurl(dest, opts.get('branch')) | |
1196 | other = hg.peer(repo, opts, dest) |
|
1196 | other = hg.peer(repo, opts, dest) | |
1197 | revs, checkout = hg.addbranchrevs(repo, repo, branches, revs) |
|
1197 | revs, checkout = hg.addbranchrevs(repo, repo, branches, revs) | |
1198 | heads = revs and map(repo.lookup, revs) or revs |
|
1198 | heads = revs and map(repo.lookup, revs) or revs | |
1199 | outgoing = discovery.findcommonoutgoing(repo, other, |
|
1199 | outgoing = discovery.findcommonoutgoing(repo, other, | |
1200 | onlyheads=heads, |
|
1200 | onlyheads=heads, | |
1201 | force=opts.get('force'), |
|
1201 | force=opts.get('force'), | |
1202 | portable=True) |
|
1202 | portable=True) | |
1203 |
|
1203 | |||
1204 | if not outgoing.missing: |
|
1204 | if not outgoing.missing: | |
1205 | scmutil.nochangesfound(ui, repo, not base and outgoing.excluded) |
|
1205 | scmutil.nochangesfound(ui, repo, not base and outgoing.excluded) | |
1206 | return 1 |
|
1206 | return 1 | |
1207 |
|
1207 | |||
1208 | if cgversion == '01': #bundle1 |
|
1208 | if cgversion == '01': #bundle1 | |
1209 | if bcompression is None: |
|
1209 | if bcompression is None: | |
1210 | bcompression = 'UN' |
|
1210 | bcompression = 'UN' | |
1211 | bversion = 'HG10' + bcompression |
|
1211 | bversion = 'HG10' + bcompression | |
1212 | bcompression = None |
|
1212 | bcompression = None | |
1213 | elif cgversion in ('02', '03'): |
|
1213 | elif cgversion in ('02', '03'): | |
1214 | bversion = 'HG20' |
|
1214 | bversion = 'HG20' | |
1215 | else: |
|
1215 | else: | |
1216 | raise error.ProgrammingError( |
|
1216 | raise error.ProgrammingError( | |
1217 | 'bundle: unexpected changegroup version %s' % cgversion) |
|
1217 | 'bundle: unexpected changegroup version %s' % cgversion) | |
1218 |
|
1218 | |||
1219 | # TODO compression options should be derived from bundlespec parsing. |
|
1219 | # TODO compression options should be derived from bundlespec parsing. | |
1220 | # This is a temporary hack to allow adjusting bundle compression |
|
1220 | # This is a temporary hack to allow adjusting bundle compression | |
1221 | # level without a) formalizing the bundlespec changes to declare it |
|
1221 | # level without a) formalizing the bundlespec changes to declare it | |
1222 | # b) introducing a command flag. |
|
1222 | # b) introducing a command flag. | |
1223 | compopts = {} |
|
1223 | compopts = {} | |
1224 | complevel = ui.configint('experimental', 'bundlecomplevel') |
|
1224 | complevel = ui.configint('experimental', 'bundlecomplevel') | |
1225 | if complevel is not None: |
|
1225 | if complevel is not None: | |
1226 | compopts['level'] = complevel |
|
1226 | compopts['level'] = complevel | |
1227 |
|
1227 | |||
1228 |
|
1228 | |||
1229 | contentopts = {'cg.version': cgversion} |
|
1229 | contentopts = {'cg.version': cgversion} | |
1230 | if repo.ui.configbool('experimental', 'stabilization.bundle-obsmarker'): |
|
1230 | if repo.ui.configbool('experimental', 'stabilization.bundle-obsmarker'): | |
1231 | contentopts['obsolescence'] = True |
|
1231 | contentopts['obsolescence'] = True | |
1232 | if repo.ui.configbool('experimental', 'bundle-phases'): |
|
1232 | if repo.ui.configbool('experimental', 'bundle-phases'): | |
1233 | contentopts['phases'] = True |
|
1233 | contentopts['phases'] = True | |
1234 | bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing, |
|
1234 | bundle2.writenewbundle(ui, repo, 'bundle', fname, bversion, outgoing, | |
1235 | contentopts, compression=bcompression, |
|
1235 | contentopts, compression=bcompression, | |
1236 | compopts=compopts) |
|
1236 | compopts=compopts) | |
1237 |
|
1237 | |||
1238 | @command('cat', |
|
1238 | @command('cat', | |
1239 | [('o', 'output', '', |
|
1239 | [('o', 'output', '', | |
1240 | _('print output to file with formatted name'), _('FORMAT')), |
|
1240 | _('print output to file with formatted name'), _('FORMAT')), | |
1241 | ('r', 'rev', '', _('print the given revision'), _('REV')), |
|
1241 | ('r', 'rev', '', _('print the given revision'), _('REV')), | |
1242 | ('', 'decode', None, _('apply any matching decode filter')), |
|
1242 | ('', 'decode', None, _('apply any matching decode filter')), | |
1243 | ] + walkopts + formatteropts, |
|
1243 | ] + walkopts + formatteropts, | |
1244 | _('[OPTION]... FILE...'), |
|
1244 | _('[OPTION]... FILE...'), | |
1245 | inferrepo=True) |
|
1245 | inferrepo=True) | |
1246 | def cat(ui, repo, file1, *pats, **opts): |
|
1246 | def cat(ui, repo, file1, *pats, **opts): | |
1247 | """output the current or given revision of files |
|
1247 | """output the current or given revision of files | |
1248 |
|
1248 | |||
1249 | Print the specified files as they were at the given revision. If |
|
1249 | Print the specified files as they were at the given revision. If | |
1250 | no revision is given, the parent of the working directory is used. |
|
1250 | no revision is given, the parent of the working directory is used. | |
1251 |
|
1251 | |||
1252 | Output may be to a file, in which case the name of the file is |
|
1252 | Output may be to a file, in which case the name of the file is | |
1253 | given using a format string. The formatting rules as follows: |
|
1253 | given using a format string. The formatting rules as follows: | |
1254 |
|
1254 | |||
1255 | :``%%``: literal "%" character |
|
1255 | :``%%``: literal "%" character | |
1256 | :``%s``: basename of file being printed |
|
1256 | :``%s``: basename of file being printed | |
1257 | :``%d``: dirname of file being printed, or '.' if in repository root |
|
1257 | :``%d``: dirname of file being printed, or '.' if in repository root | |
1258 | :``%p``: root-relative path name of file being printed |
|
1258 | :``%p``: root-relative path name of file being printed | |
1259 | :``%H``: changeset hash (40 hexadecimal digits) |
|
1259 | :``%H``: changeset hash (40 hexadecimal digits) | |
1260 | :``%R``: changeset revision number |
|
1260 | :``%R``: changeset revision number | |
1261 | :``%h``: short-form changeset hash (12 hexadecimal digits) |
|
1261 | :``%h``: short-form changeset hash (12 hexadecimal digits) | |
1262 | :``%r``: zero-padded changeset revision number |
|
1262 | :``%r``: zero-padded changeset revision number | |
1263 | :``%b``: basename of the exporting repository |
|
1263 | :``%b``: basename of the exporting repository | |
1264 |
|
1264 | |||
1265 | Returns 0 on success. |
|
1265 | Returns 0 on success. | |
1266 | """ |
|
1266 | """ | |
1267 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
1267 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
1268 | m = scmutil.match(ctx, (file1,) + pats, opts) |
|
1268 | m = scmutil.match(ctx, (file1,) + pats, opts) | |
1269 | fntemplate = opts.pop('output', '') |
|
1269 | fntemplate = opts.pop('output', '') | |
1270 | if cmdutil.isstdiofilename(fntemplate): |
|
1270 | if cmdutil.isstdiofilename(fntemplate): | |
1271 | fntemplate = '' |
|
1271 | fntemplate = '' | |
1272 |
|
1272 | |||
1273 | if fntemplate: |
|
1273 | if fntemplate: | |
1274 | fm = formatter.nullformatter(ui, 'cat') |
|
1274 | fm = formatter.nullformatter(ui, 'cat') | |
1275 | else: |
|
1275 | else: | |
1276 | ui.pager('cat') |
|
1276 | ui.pager('cat') | |
1277 | fm = ui.formatter('cat', opts) |
|
1277 | fm = ui.formatter('cat', opts) | |
1278 | with fm: |
|
1278 | with fm: | |
1279 | return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '', **opts) |
|
1279 | return cmdutil.cat(ui, repo, ctx, m, fm, fntemplate, '', **opts) | |
1280 |
|
1280 | |||
1281 | @command('^clone', |
|
1281 | @command('^clone', | |
1282 | [('U', 'noupdate', None, _('the clone will include an empty working ' |
|
1282 | [('U', 'noupdate', None, _('the clone will include an empty working ' | |
1283 | 'directory (only a repository)')), |
|
1283 | 'directory (only a repository)')), | |
1284 | ('u', 'updaterev', '', _('revision, tag, or branch to check out'), |
|
1284 | ('u', 'updaterev', '', _('revision, tag, or branch to check out'), | |
1285 | _('REV')), |
|
1285 | _('REV')), | |
1286 | ('r', 'rev', [], _('include the specified changeset'), _('REV')), |
|
1286 | ('r', 'rev', [], _('include the specified changeset'), _('REV')), | |
1287 | ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')), |
|
1287 | ('b', 'branch', [], _('clone only the specified branch'), _('BRANCH')), | |
1288 | ('', 'pull', None, _('use pull protocol to copy metadata')), |
|
1288 | ('', 'pull', None, _('use pull protocol to copy metadata')), | |
1289 | ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')), |
|
1289 | ('', 'uncompressed', None, _('use uncompressed transfer (fast over LAN)')), | |
1290 | ] + remoteopts, |
|
1290 | ] + remoteopts, | |
1291 | _('[OPTION]... SOURCE [DEST]'), |
|
1291 | _('[OPTION]... SOURCE [DEST]'), | |
1292 | norepo=True) |
|
1292 | norepo=True) | |
1293 | def clone(ui, source, dest=None, **opts): |
|
1293 | def clone(ui, source, dest=None, **opts): | |
1294 | """make a copy of an existing repository |
|
1294 | """make a copy of an existing repository | |
1295 |
|
1295 | |||
1296 | Create a copy of an existing repository in a new directory. |
|
1296 | Create a copy of an existing repository in a new directory. | |
1297 |
|
1297 | |||
1298 | If no destination directory name is specified, it defaults to the |
|
1298 | If no destination directory name is specified, it defaults to the | |
1299 | basename of the source. |
|
1299 | basename of the source. | |
1300 |
|
1300 | |||
1301 | The location of the source is added to the new repository's |
|
1301 | The location of the source is added to the new repository's | |
1302 | ``.hg/hgrc`` file, as the default to be used for future pulls. |
|
1302 | ``.hg/hgrc`` file, as the default to be used for future pulls. | |
1303 |
|
1303 | |||
1304 | Only local paths and ``ssh://`` URLs are supported as |
|
1304 | Only local paths and ``ssh://`` URLs are supported as | |
1305 | destinations. For ``ssh://`` destinations, no working directory or |
|
1305 | destinations. For ``ssh://`` destinations, no working directory or | |
1306 | ``.hg/hgrc`` will be created on the remote side. |
|
1306 | ``.hg/hgrc`` will be created on the remote side. | |
1307 |
|
1307 | |||
1308 | If the source repository has a bookmark called '@' set, that |
|
1308 | If the source repository has a bookmark called '@' set, that | |
1309 | revision will be checked out in the new repository by default. |
|
1309 | revision will be checked out in the new repository by default. | |
1310 |
|
1310 | |||
1311 | To check out a particular version, use -u/--update, or |
|
1311 | To check out a particular version, use -u/--update, or | |
1312 | -U/--noupdate to create a clone with no working directory. |
|
1312 | -U/--noupdate to create a clone with no working directory. | |
1313 |
|
1313 | |||
1314 | To pull only a subset of changesets, specify one or more revisions |
|
1314 | To pull only a subset of changesets, specify one or more revisions | |
1315 | identifiers with -r/--rev or branches with -b/--branch. The |
|
1315 | identifiers with -r/--rev or branches with -b/--branch. The | |
1316 | resulting clone will contain only the specified changesets and |
|
1316 | resulting clone will contain only the specified changesets and | |
1317 | their ancestors. These options (or 'clone src#rev dest') imply |
|
1317 | their ancestors. These options (or 'clone src#rev dest') imply | |
1318 | --pull, even for local source repositories. |
|
1318 | --pull, even for local source repositories. | |
1319 |
|
1319 | |||
1320 | .. note:: |
|
1320 | .. note:: | |
1321 |
|
1321 | |||
1322 | Specifying a tag will include the tagged changeset but not the |
|
1322 | Specifying a tag will include the tagged changeset but not the | |
1323 | changeset containing the tag. |
|
1323 | changeset containing the tag. | |
1324 |
|
1324 | |||
1325 | .. container:: verbose |
|
1325 | .. container:: verbose | |
1326 |
|
1326 | |||
1327 | For efficiency, hardlinks are used for cloning whenever the |
|
1327 | For efficiency, hardlinks are used for cloning whenever the | |
1328 | source and destination are on the same filesystem (note this |
|
1328 | source and destination are on the same filesystem (note this | |
1329 | applies only to the repository data, not to the working |
|
1329 | applies only to the repository data, not to the working | |
1330 | directory). Some filesystems, such as AFS, implement hardlinking |
|
1330 | directory). Some filesystems, such as AFS, implement hardlinking | |
1331 | incorrectly, but do not report errors. In these cases, use the |
|
1331 | incorrectly, but do not report errors. In these cases, use the | |
1332 | --pull option to avoid hardlinking. |
|
1332 | --pull option to avoid hardlinking. | |
1333 |
|
1333 | |||
1334 | In some cases, you can clone repositories and the working |
|
1334 | In some cases, you can clone repositories and the working | |
1335 | directory using full hardlinks with :: |
|
1335 | directory using full hardlinks with :: | |
1336 |
|
1336 | |||
1337 | $ cp -al REPO REPOCLONE |
|
1337 | $ cp -al REPO REPOCLONE | |
1338 |
|
1338 | |||
1339 | This is the fastest way to clone, but it is not always safe. The |
|
1339 | This is the fastest way to clone, but it is not always safe. The | |
1340 | operation is not atomic (making sure REPO is not modified during |
|
1340 | operation is not atomic (making sure REPO is not modified during | |
1341 | the operation is up to you) and you have to make sure your |
|
1341 | the operation is up to you) and you have to make sure your | |
1342 | editor breaks hardlinks (Emacs and most Linux Kernel tools do |
|
1342 | editor breaks hardlinks (Emacs and most Linux Kernel tools do | |
1343 | so). Also, this is not compatible with certain extensions that |
|
1343 | so). Also, this is not compatible with certain extensions that | |
1344 | place their metadata under the .hg directory, such as mq. |
|
1344 | place their metadata under the .hg directory, such as mq. | |
1345 |
|
1345 | |||
1346 | Mercurial will update the working directory to the first applicable |
|
1346 | Mercurial will update the working directory to the first applicable | |
1347 | revision from this list: |
|
1347 | revision from this list: | |
1348 |
|
1348 | |||
1349 | a) null if -U or the source repository has no changesets |
|
1349 | a) null if -U or the source repository has no changesets | |
1350 | b) if -u . and the source repository is local, the first parent of |
|
1350 | b) if -u . and the source repository is local, the first parent of | |
1351 | the source repository's working directory |
|
1351 | the source repository's working directory | |
1352 | c) the changeset specified with -u (if a branch name, this means the |
|
1352 | c) the changeset specified with -u (if a branch name, this means the | |
1353 | latest head of that branch) |
|
1353 | latest head of that branch) | |
1354 | d) the changeset specified with -r |
|
1354 | d) the changeset specified with -r | |
1355 | e) the tipmost head specified with -b |
|
1355 | e) the tipmost head specified with -b | |
1356 | f) the tipmost head specified with the url#branch source syntax |
|
1356 | f) the tipmost head specified with the url#branch source syntax | |
1357 | g) the revision marked with the '@' bookmark, if present |
|
1357 | g) the revision marked with the '@' bookmark, if present | |
1358 | h) the tipmost head of the default branch |
|
1358 | h) the tipmost head of the default branch | |
1359 | i) tip |
|
1359 | i) tip | |
1360 |
|
1360 | |||
1361 | When cloning from servers that support it, Mercurial may fetch |
|
1361 | When cloning from servers that support it, Mercurial may fetch | |
1362 | pre-generated data from a server-advertised URL. When this is done, |
|
1362 | pre-generated data from a server-advertised URL. When this is done, | |
1363 | hooks operating on incoming changesets and changegroups may fire twice, |
|
1363 | hooks operating on incoming changesets and changegroups may fire twice, | |
1364 | once for the bundle fetched from the URL and another for any additional |
|
1364 | once for the bundle fetched from the URL and another for any additional | |
1365 | data not fetched from this URL. In addition, if an error occurs, the |
|
1365 | data not fetched from this URL. In addition, if an error occurs, the | |
1366 | repository may be rolled back to a partial clone. This behavior may |
|
1366 | repository may be rolled back to a partial clone. This behavior may | |
1367 | change in future releases. See :hg:`help -e clonebundles` for more. |
|
1367 | change in future releases. See :hg:`help -e clonebundles` for more. | |
1368 |
|
1368 | |||
1369 | Examples: |
|
1369 | Examples: | |
1370 |
|
1370 | |||
1371 | - clone a remote repository to a new directory named hg/:: |
|
1371 | - clone a remote repository to a new directory named hg/:: | |
1372 |
|
1372 | |||
1373 | hg clone https://www.mercurial-scm.org/repo/hg/ |
|
1373 | hg clone https://www.mercurial-scm.org/repo/hg/ | |
1374 |
|
1374 | |||
1375 | - create a lightweight local clone:: |
|
1375 | - create a lightweight local clone:: | |
1376 |
|
1376 | |||
1377 | hg clone project/ project-feature/ |
|
1377 | hg clone project/ project-feature/ | |
1378 |
|
1378 | |||
1379 | - clone from an absolute path on an ssh server (note double-slash):: |
|
1379 | - clone from an absolute path on an ssh server (note double-slash):: | |
1380 |
|
1380 | |||
1381 | hg clone ssh://user@server//home/projects/alpha/ |
|
1381 | hg clone ssh://user@server//home/projects/alpha/ | |
1382 |
|
1382 | |||
1383 | - do a high-speed clone over a LAN while checking out a |
|
1383 | - do a high-speed clone over a LAN while checking out a | |
1384 | specified version:: |
|
1384 | specified version:: | |
1385 |
|
1385 | |||
1386 | hg clone --uncompressed http://server/repo -u 1.5 |
|
1386 | hg clone --uncompressed http://server/repo -u 1.5 | |
1387 |
|
1387 | |||
1388 | - create a repository without changesets after a particular revision:: |
|
1388 | - create a repository without changesets after a particular revision:: | |
1389 |
|
1389 | |||
1390 | hg clone -r 04e544 experimental/ good/ |
|
1390 | hg clone -r 04e544 experimental/ good/ | |
1391 |
|
1391 | |||
1392 | - clone (and track) a particular named branch:: |
|
1392 | - clone (and track) a particular named branch:: | |
1393 |
|
1393 | |||
1394 | hg clone https://www.mercurial-scm.org/repo/hg/#stable |
|
1394 | hg clone https://www.mercurial-scm.org/repo/hg/#stable | |
1395 |
|
1395 | |||
1396 | See :hg:`help urls` for details on specifying URLs. |
|
1396 | See :hg:`help urls` for details on specifying URLs. | |
1397 |
|
1397 | |||
1398 | Returns 0 on success. |
|
1398 | Returns 0 on success. | |
1399 | """ |
|
1399 | """ | |
1400 | opts = pycompat.byteskwargs(opts) |
|
1400 | opts = pycompat.byteskwargs(opts) | |
1401 | if opts.get('noupdate') and opts.get('updaterev'): |
|
1401 | if opts.get('noupdate') and opts.get('updaterev'): | |
1402 | raise error.Abort(_("cannot specify both --noupdate and --updaterev")) |
|
1402 | raise error.Abort(_("cannot specify both --noupdate and --updaterev")) | |
1403 |
|
1403 | |||
1404 | r = hg.clone(ui, opts, source, dest, |
|
1404 | r = hg.clone(ui, opts, source, dest, | |
1405 | pull=opts.get('pull'), |
|
1405 | pull=opts.get('pull'), | |
1406 | stream=opts.get('uncompressed'), |
|
1406 | stream=opts.get('uncompressed'), | |
1407 | rev=opts.get('rev'), |
|
1407 | rev=opts.get('rev'), | |
1408 | update=opts.get('updaterev') or not opts.get('noupdate'), |
|
1408 | update=opts.get('updaterev') or not opts.get('noupdate'), | |
1409 | branch=opts.get('branch'), |
|
1409 | branch=opts.get('branch'), | |
1410 | shareopts=opts.get('shareopts')) |
|
1410 | shareopts=opts.get('shareopts')) | |
1411 |
|
1411 | |||
1412 | return r is None |
|
1412 | return r is None | |
1413 |
|
1413 | |||
1414 | @command('^commit|ci', |
|
1414 | @command('^commit|ci', | |
1415 | [('A', 'addremove', None, |
|
1415 | [('A', 'addremove', None, | |
1416 | _('mark new/missing files as added/removed before committing')), |
|
1416 | _('mark new/missing files as added/removed before committing')), | |
1417 | ('', 'close-branch', None, |
|
1417 | ('', 'close-branch', None, | |
1418 | _('mark a branch head as closed')), |
|
1418 | _('mark a branch head as closed')), | |
1419 | ('', 'amend', None, _('amend the parent of the working directory')), |
|
1419 | ('', 'amend', None, _('amend the parent of the working directory')), | |
1420 | ('s', 'secret', None, _('use the secret phase for committing')), |
|
1420 | ('s', 'secret', None, _('use the secret phase for committing')), | |
1421 | ('e', 'edit', None, _('invoke editor on commit messages')), |
|
1421 | ('e', 'edit', None, _('invoke editor on commit messages')), | |
1422 | ('i', 'interactive', None, _('use interactive mode')), |
|
1422 | ('i', 'interactive', None, _('use interactive mode')), | |
1423 | ] + walkopts + commitopts + commitopts2 + subrepoopts, |
|
1423 | ] + walkopts + commitopts + commitopts2 + subrepoopts, | |
1424 | _('[OPTION]... [FILE]...'), |
|
1424 | _('[OPTION]... [FILE]...'), | |
1425 | inferrepo=True) |
|
1425 | inferrepo=True) | |
1426 | def commit(ui, repo, *pats, **opts): |
|
1426 | def commit(ui, repo, *pats, **opts): | |
1427 | """commit the specified files or all outstanding changes |
|
1427 | """commit the specified files or all outstanding changes | |
1428 |
|
1428 | |||
1429 | Commit changes to the given files into the repository. Unlike a |
|
1429 | Commit changes to the given files into the repository. Unlike a | |
1430 | centralized SCM, this operation is a local operation. See |
|
1430 | centralized SCM, this operation is a local operation. See | |
1431 | :hg:`push` for a way to actively distribute your changes. |
|
1431 | :hg:`push` for a way to actively distribute your changes. | |
1432 |
|
1432 | |||
1433 | If a list of files is omitted, all changes reported by :hg:`status` |
|
1433 | If a list of files is omitted, all changes reported by :hg:`status` | |
1434 | will be committed. |
|
1434 | will be committed. | |
1435 |
|
1435 | |||
1436 | If you are committing the result of a merge, do not provide any |
|
1436 | If you are committing the result of a merge, do not provide any | |
1437 | filenames or -I/-X filters. |
|
1437 | filenames or -I/-X filters. | |
1438 |
|
1438 | |||
1439 | If no commit message is specified, Mercurial starts your |
|
1439 | If no commit message is specified, Mercurial starts your | |
1440 | configured editor where you can enter a message. In case your |
|
1440 | configured editor where you can enter a message. In case your | |
1441 | commit fails, you will find a backup of your message in |
|
1441 | commit fails, you will find a backup of your message in | |
1442 | ``.hg/last-message.txt``. |
|
1442 | ``.hg/last-message.txt``. | |
1443 |
|
1443 | |||
1444 | The --close-branch flag can be used to mark the current branch |
|
1444 | The --close-branch flag can be used to mark the current branch | |
1445 | head closed. When all heads of a branch are closed, the branch |
|
1445 | head closed. When all heads of a branch are closed, the branch | |
1446 | will be considered closed and no longer listed. |
|
1446 | will be considered closed and no longer listed. | |
1447 |
|
1447 | |||
1448 | The --amend flag can be used to amend the parent of the |
|
1448 | The --amend flag can be used to amend the parent of the | |
1449 | working directory with a new commit that contains the changes |
|
1449 | working directory with a new commit that contains the changes | |
1450 | in the parent in addition to those currently reported by :hg:`status`, |
|
1450 | in the parent in addition to those currently reported by :hg:`status`, | |
1451 | if there are any. The old commit is stored in a backup bundle in |
|
1451 | if there are any. The old commit is stored in a backup bundle in | |
1452 | ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle` |
|
1452 | ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle` | |
1453 | on how to restore it). |
|
1453 | on how to restore it). | |
1454 |
|
1454 | |||
1455 | Message, user and date are taken from the amended commit unless |
|
1455 | Message, user and date are taken from the amended commit unless | |
1456 | specified. When a message isn't specified on the command line, |
|
1456 | specified. When a message isn't specified on the command line, | |
1457 | the editor will open with the message of the amended commit. |
|
1457 | the editor will open with the message of the amended commit. | |
1458 |
|
1458 | |||
1459 | It is not possible to amend public changesets (see :hg:`help phases`) |
|
1459 | It is not possible to amend public changesets (see :hg:`help phases`) | |
1460 | or changesets that have children. |
|
1460 | or changesets that have children. | |
1461 |
|
1461 | |||
1462 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
1462 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
1463 |
|
1463 | |||
1464 | Returns 0 on success, 1 if nothing changed. |
|
1464 | Returns 0 on success, 1 if nothing changed. | |
1465 |
|
1465 | |||
1466 | .. container:: verbose |
|
1466 | .. container:: verbose | |
1467 |
|
1467 | |||
1468 | Examples: |
|
1468 | Examples: | |
1469 |
|
1469 | |||
1470 | - commit all files ending in .py:: |
|
1470 | - commit all files ending in .py:: | |
1471 |
|
1471 | |||
1472 | hg commit --include "set:**.py" |
|
1472 | hg commit --include "set:**.py" | |
1473 |
|
1473 | |||
1474 | - commit all non-binary files:: |
|
1474 | - commit all non-binary files:: | |
1475 |
|
1475 | |||
1476 | hg commit --exclude "set:binary()" |
|
1476 | hg commit --exclude "set:binary()" | |
1477 |
|
1477 | |||
1478 | - amend the current commit and set the date to now:: |
|
1478 | - amend the current commit and set the date to now:: | |
1479 |
|
1479 | |||
1480 | hg commit --amend --date now |
|
1480 | hg commit --amend --date now | |
1481 | """ |
|
1481 | """ | |
1482 | wlock = lock = None |
|
1482 | wlock = lock = None | |
1483 | try: |
|
1483 | try: | |
1484 | wlock = repo.wlock() |
|
1484 | wlock = repo.wlock() | |
1485 | lock = repo.lock() |
|
1485 | lock = repo.lock() | |
1486 | return _docommit(ui, repo, *pats, **opts) |
|
1486 | return _docommit(ui, repo, *pats, **opts) | |
1487 | finally: |
|
1487 | finally: | |
1488 | release(lock, wlock) |
|
1488 | release(lock, wlock) | |
1489 |
|
1489 | |||
1490 | def _docommit(ui, repo, *pats, **opts): |
|
1490 | def _docommit(ui, repo, *pats, **opts): | |
1491 | if opts.get(r'interactive'): |
|
1491 | if opts.get(r'interactive'): | |
1492 | opts.pop(r'interactive') |
|
1492 | opts.pop(r'interactive') | |
1493 | ret = cmdutil.dorecord(ui, repo, commit, None, False, |
|
1493 | ret = cmdutil.dorecord(ui, repo, commit, None, False, | |
1494 | cmdutil.recordfilter, *pats, |
|
1494 | cmdutil.recordfilter, *pats, | |
1495 | **opts) |
|
1495 | **opts) | |
1496 | # ret can be 0 (no changes to record) or the value returned by |
|
1496 | # ret can be 0 (no changes to record) or the value returned by | |
1497 | # commit(), 1 if nothing changed or None on success. |
|
1497 | # commit(), 1 if nothing changed or None on success. | |
1498 | return 1 if ret == 0 else ret |
|
1498 | return 1 if ret == 0 else ret | |
1499 |
|
1499 | |||
1500 | opts = pycompat.byteskwargs(opts) |
|
1500 | opts = pycompat.byteskwargs(opts) | |
1501 | if opts.get('subrepos'): |
|
1501 | if opts.get('subrepos'): | |
1502 | if opts.get('amend'): |
|
1502 | if opts.get('amend'): | |
1503 | raise error.Abort(_('cannot amend with --subrepos')) |
|
1503 | raise error.Abort(_('cannot amend with --subrepos')) | |
1504 | # Let --subrepos on the command line override config setting. |
|
1504 | # Let --subrepos on the command line override config setting. | |
1505 | ui.setconfig('ui', 'commitsubrepos', True, 'commit') |
|
1505 | ui.setconfig('ui', 'commitsubrepos', True, 'commit') | |
1506 |
|
1506 | |||
1507 | cmdutil.checkunfinished(repo, commit=True) |
|
1507 | cmdutil.checkunfinished(repo, commit=True) | |
1508 |
|
1508 | |||
1509 | branch = repo[None].branch() |
|
1509 | branch = repo[None].branch() | |
1510 | bheads = repo.branchheads(branch) |
|
1510 | bheads = repo.branchheads(branch) | |
1511 |
|
1511 | |||
1512 | extra = {} |
|
1512 | extra = {} | |
1513 | if opts.get('close_branch'): |
|
1513 | if opts.get('close_branch'): | |
1514 | extra['close'] = 1 |
|
1514 | extra['close'] = 1 | |
1515 |
|
1515 | |||
1516 | if not bheads: |
|
1516 | if not bheads: | |
1517 | raise error.Abort(_('can only close branch heads')) |
|
1517 | raise error.Abort(_('can only close branch heads')) | |
1518 | elif opts.get('amend'): |
|
1518 | elif opts.get('amend'): | |
1519 | if repo[None].parents()[0].p1().branch() != branch and \ |
|
1519 | if repo[None].parents()[0].p1().branch() != branch and \ | |
1520 | repo[None].parents()[0].p2().branch() != branch: |
|
1520 | repo[None].parents()[0].p2().branch() != branch: | |
1521 | raise error.Abort(_('can only close branch heads')) |
|
1521 | raise error.Abort(_('can only close branch heads')) | |
1522 |
|
1522 | |||
1523 | if opts.get('amend'): |
|
1523 | if opts.get('amend'): | |
1524 | if ui.configbool('ui', 'commitsubrepos'): |
|
1524 | if ui.configbool('ui', 'commitsubrepos'): | |
1525 | raise error.Abort(_('cannot amend with ui.commitsubrepos enabled')) |
|
1525 | raise error.Abort(_('cannot amend with ui.commitsubrepos enabled')) | |
1526 |
|
1526 | |||
1527 | old = repo['.'] |
|
1527 | old = repo['.'] | |
1528 | if not old.mutable(): |
|
1528 | if not old.mutable(): | |
1529 | raise error.Abort(_('cannot amend public changesets')) |
|
1529 | raise error.Abort(_('cannot amend public changesets')) | |
1530 | if len(repo[None].parents()) > 1: |
|
1530 | if len(repo[None].parents()) > 1: | |
1531 | raise error.Abort(_('cannot amend while merging')) |
|
1531 | raise error.Abort(_('cannot amend while merging')) | |
1532 | allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt) |
|
1532 | allowunstable = obsolete.isenabled(repo, obsolete.allowunstableopt) | |
1533 | if not allowunstable and old.children(): |
|
1533 | if not allowunstable and old.children(): | |
1534 | raise error.Abort(_('cannot amend changeset with children')) |
|
1534 | raise error.Abort(_('cannot amend changeset with children')) | |
1535 |
|
1535 | |||
1536 | # Currently histedit gets confused if an amend happens while histedit |
|
1536 | # Currently histedit gets confused if an amend happens while histedit | |
1537 | # is in progress. Since we have a checkunfinished command, we are |
|
1537 | # is in progress. Since we have a checkunfinished command, we are | |
1538 | # temporarily honoring it. |
|
1538 | # temporarily honoring it. | |
1539 | # |
|
1539 | # | |
1540 | # Note: eventually this guard will be removed. Please do not expect |
|
1540 | # Note: eventually this guard will be removed. Please do not expect | |
1541 | # this behavior to remain. |
|
1541 | # this behavior to remain. | |
1542 | if not obsolete.isenabled(repo, obsolete.createmarkersopt): |
|
1542 | if not obsolete.isenabled(repo, obsolete.createmarkersopt): | |
1543 | cmdutil.checkunfinished(repo) |
|
1543 | cmdutil.checkunfinished(repo) | |
1544 |
|
1544 | |||
1545 | # commitfunc is used only for temporary amend commit by cmdutil.amend |
|
1545 | # commitfunc is used only for temporary amend commit by cmdutil.amend | |
1546 | def commitfunc(ui, repo, message, match, opts): |
|
1546 | def commitfunc(ui, repo, message, match, opts): | |
1547 | return repo.commit(message, |
|
1547 | return repo.commit(message, | |
1548 | opts.get('user') or old.user(), |
|
1548 | opts.get('user') or old.user(), | |
1549 | opts.get('date') or old.date(), |
|
1549 | opts.get('date') or old.date(), | |
1550 | match, |
|
1550 | match, | |
1551 | extra=extra) |
|
1551 | extra=extra) | |
1552 |
|
1552 | |||
1553 | node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts) |
|
1553 | node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts) | |
1554 | if node == old.node(): |
|
1554 | if node == old.node(): | |
1555 | ui.status(_("nothing changed\n")) |
|
1555 | ui.status(_("nothing changed\n")) | |
1556 | return 1 |
|
1556 | return 1 | |
1557 | else: |
|
1557 | else: | |
1558 | def commitfunc(ui, repo, message, match, opts): |
|
1558 | def commitfunc(ui, repo, message, match, opts): | |
1559 | overrides = {} |
|
1559 | overrides = {} | |
1560 | if opts.get('secret'): |
|
1560 | if opts.get('secret'): | |
1561 | overrides[('phases', 'new-commit')] = 'secret' |
|
1561 | overrides[('phases', 'new-commit')] = 'secret' | |
1562 |
|
1562 | |||
1563 | baseui = repo.baseui |
|
1563 | baseui = repo.baseui | |
1564 | with baseui.configoverride(overrides, 'commit'): |
|
1564 | with baseui.configoverride(overrides, 'commit'): | |
1565 | with ui.configoverride(overrides, 'commit'): |
|
1565 | with ui.configoverride(overrides, 'commit'): | |
1566 | editform = cmdutil.mergeeditform(repo[None], |
|
1566 | editform = cmdutil.mergeeditform(repo[None], | |
1567 | 'commit.normal') |
|
1567 | 'commit.normal') | |
1568 | editor = cmdutil.getcommiteditor( |
|
1568 | editor = cmdutil.getcommiteditor( | |
1569 | editform=editform, **pycompat.strkwargs(opts)) |
|
1569 | editform=editform, **pycompat.strkwargs(opts)) | |
1570 | return repo.commit(message, |
|
1570 | return repo.commit(message, | |
1571 | opts.get('user'), |
|
1571 | opts.get('user'), | |
1572 | opts.get('date'), |
|
1572 | opts.get('date'), | |
1573 | match, |
|
1573 | match, | |
1574 | editor=editor, |
|
1574 | editor=editor, | |
1575 | extra=extra) |
|
1575 | extra=extra) | |
1576 |
|
1576 | |||
1577 | node = cmdutil.commit(ui, repo, commitfunc, pats, opts) |
|
1577 | node = cmdutil.commit(ui, repo, commitfunc, pats, opts) | |
1578 |
|
1578 | |||
1579 | if not node: |
|
1579 | if not node: | |
1580 | stat = cmdutil.postcommitstatus(repo, pats, opts) |
|
1580 | stat = cmdutil.postcommitstatus(repo, pats, opts) | |
1581 | if stat[3]: |
|
1581 | if stat[3]: | |
1582 | ui.status(_("nothing changed (%d missing files, see " |
|
1582 | ui.status(_("nothing changed (%d missing files, see " | |
1583 | "'hg status')\n") % len(stat[3])) |
|
1583 | "'hg status')\n") % len(stat[3])) | |
1584 | else: |
|
1584 | else: | |
1585 | ui.status(_("nothing changed\n")) |
|
1585 | ui.status(_("nothing changed\n")) | |
1586 | return 1 |
|
1586 | return 1 | |
1587 |
|
1587 | |||
1588 | cmdutil.commitstatus(repo, node, branch, bheads, opts) |
|
1588 | cmdutil.commitstatus(repo, node, branch, bheads, opts) | |
1589 |
|
1589 | |||
1590 | @command('config|showconfig|debugconfig', |
|
1590 | @command('config|showconfig|debugconfig', | |
1591 | [('u', 'untrusted', None, _('show untrusted configuration options')), |
|
1591 | [('u', 'untrusted', None, _('show untrusted configuration options')), | |
1592 | ('e', 'edit', None, _('edit user config')), |
|
1592 | ('e', 'edit', None, _('edit user config')), | |
1593 | ('l', 'local', None, _('edit repository config')), |
|
1593 | ('l', 'local', None, _('edit repository config')), | |
1594 | ('g', 'global', None, _('edit global config'))] + formatteropts, |
|
1594 | ('g', 'global', None, _('edit global config'))] + formatteropts, | |
1595 | _('[-u] [NAME]...'), |
|
1595 | _('[-u] [NAME]...'), | |
1596 | optionalrepo=True) |
|
1596 | optionalrepo=True) | |
1597 | def config(ui, repo, *values, **opts): |
|
1597 | def config(ui, repo, *values, **opts): | |
1598 | """show combined config settings from all hgrc files |
|
1598 | """show combined config settings from all hgrc files | |
1599 |
|
1599 | |||
1600 | With no arguments, print names and values of all config items. |
|
1600 | With no arguments, print names and values of all config items. | |
1601 |
|
1601 | |||
1602 | With one argument of the form section.name, print just the value |
|
1602 | With one argument of the form section.name, print just the value | |
1603 | of that config item. |
|
1603 | of that config item. | |
1604 |
|
1604 | |||
1605 | With multiple arguments, print names and values of all config |
|
1605 | With multiple arguments, print names and values of all config | |
1606 | items with matching section names. |
|
1606 | items with matching section names. | |
1607 |
|
1607 | |||
1608 | With --edit, start an editor on the user-level config file. With |
|
1608 | With --edit, start an editor on the user-level config file. With | |
1609 | --global, edit the system-wide config file. With --local, edit the |
|
1609 | --global, edit the system-wide config file. With --local, edit the | |
1610 | repository-level config file. |
|
1610 | repository-level config file. | |
1611 |
|
1611 | |||
1612 | With --debug, the source (filename and line number) is printed |
|
1612 | With --debug, the source (filename and line number) is printed | |
1613 | for each config item. |
|
1613 | for each config item. | |
1614 |
|
1614 | |||
1615 | See :hg:`help config` for more information about config files. |
|
1615 | See :hg:`help config` for more information about config files. | |
1616 |
|
1616 | |||
1617 | Returns 0 on success, 1 if NAME does not exist. |
|
1617 | Returns 0 on success, 1 if NAME does not exist. | |
1618 |
|
1618 | |||
1619 | """ |
|
1619 | """ | |
1620 |
|
1620 | |||
1621 | opts = pycompat.byteskwargs(opts) |
|
1621 | opts = pycompat.byteskwargs(opts) | |
1622 | if opts.get('edit') or opts.get('local') or opts.get('global'): |
|
1622 | if opts.get('edit') or opts.get('local') or opts.get('global'): | |
1623 | if opts.get('local') and opts.get('global'): |
|
1623 | if opts.get('local') and opts.get('global'): | |
1624 | raise error.Abort(_("can't use --local and --global together")) |
|
1624 | raise error.Abort(_("can't use --local and --global together")) | |
1625 |
|
1625 | |||
1626 | if opts.get('local'): |
|
1626 | if opts.get('local'): | |
1627 | if not repo: |
|
1627 | if not repo: | |
1628 | raise error.Abort(_("can't use --local outside a repository")) |
|
1628 | raise error.Abort(_("can't use --local outside a repository")) | |
1629 | paths = [repo.vfs.join('hgrc')] |
|
1629 | paths = [repo.vfs.join('hgrc')] | |
1630 | elif opts.get('global'): |
|
1630 | elif opts.get('global'): | |
1631 | paths = rcutil.systemrcpath() |
|
1631 | paths = rcutil.systemrcpath() | |
1632 | else: |
|
1632 | else: | |
1633 | paths = rcutil.userrcpath() |
|
1633 | paths = rcutil.userrcpath() | |
1634 |
|
1634 | |||
1635 | for f in paths: |
|
1635 | for f in paths: | |
1636 | if os.path.exists(f): |
|
1636 | if os.path.exists(f): | |
1637 | break |
|
1637 | break | |
1638 | else: |
|
1638 | else: | |
1639 | if opts.get('global'): |
|
1639 | if opts.get('global'): | |
1640 | samplehgrc = uimod.samplehgrcs['global'] |
|
1640 | samplehgrc = uimod.samplehgrcs['global'] | |
1641 | elif opts.get('local'): |
|
1641 | elif opts.get('local'): | |
1642 | samplehgrc = uimod.samplehgrcs['local'] |
|
1642 | samplehgrc = uimod.samplehgrcs['local'] | |
1643 | else: |
|
1643 | else: | |
1644 | samplehgrc = uimod.samplehgrcs['user'] |
|
1644 | samplehgrc = uimod.samplehgrcs['user'] | |
1645 |
|
1645 | |||
1646 | f = paths[0] |
|
1646 | f = paths[0] | |
1647 | fp = open(f, "wb") |
|
1647 | fp = open(f, "wb") | |
1648 | fp.write(util.tonativeeol(samplehgrc)) |
|
1648 | fp.write(util.tonativeeol(samplehgrc)) | |
1649 | fp.close() |
|
1649 | fp.close() | |
1650 |
|
1650 | |||
1651 | editor = ui.geteditor() |
|
1651 | editor = ui.geteditor() | |
1652 | ui.system("%s \"%s\"" % (editor, f), |
|
1652 | ui.system("%s \"%s\"" % (editor, f), | |
1653 | onerr=error.Abort, errprefix=_("edit failed"), |
|
1653 | onerr=error.Abort, errprefix=_("edit failed"), | |
1654 | blockedtag='config_edit') |
|
1654 | blockedtag='config_edit') | |
1655 | return |
|
1655 | return | |
1656 | ui.pager('config') |
|
1656 | ui.pager('config') | |
1657 | fm = ui.formatter('config', opts) |
|
1657 | fm = ui.formatter('config', opts) | |
1658 | for t, f in rcutil.rccomponents(): |
|
1658 | for t, f in rcutil.rccomponents(): | |
1659 | if t == 'path': |
|
1659 | if t == 'path': | |
1660 | ui.debug('read config from: %s\n' % f) |
|
1660 | ui.debug('read config from: %s\n' % f) | |
1661 | elif t == 'items': |
|
1661 | elif t == 'items': | |
1662 | for section, name, value, source in f: |
|
1662 | for section, name, value, source in f: | |
1663 | ui.debug('set config by: %s\n' % source) |
|
1663 | ui.debug('set config by: %s\n' % source) | |
1664 | else: |
|
1664 | else: | |
1665 | raise error.ProgrammingError('unknown rctype: %s' % t) |
|
1665 | raise error.ProgrammingError('unknown rctype: %s' % t) | |
1666 | untrusted = bool(opts.get('untrusted')) |
|
1666 | untrusted = bool(opts.get('untrusted')) | |
1667 | if values: |
|
1667 | if values: | |
1668 | sections = [v for v in values if '.' not in v] |
|
1668 | sections = [v for v in values if '.' not in v] | |
1669 | items = [v for v in values if '.' in v] |
|
1669 | items = [v for v in values if '.' in v] | |
1670 | if len(items) > 1 or items and sections: |
|
1670 | if len(items) > 1 or items and sections: | |
1671 | raise error.Abort(_('only one config item permitted')) |
|
1671 | raise error.Abort(_('only one config item permitted')) | |
1672 | matched = False |
|
1672 | matched = False | |
1673 | for section, name, value in ui.walkconfig(untrusted=untrusted): |
|
1673 | for section, name, value in ui.walkconfig(untrusted=untrusted): | |
1674 | source = ui.configsource(section, name, untrusted) |
|
1674 | source = ui.configsource(section, name, untrusted) | |
1675 | value = pycompat.bytestr(value) |
|
1675 | value = pycompat.bytestr(value) | |
1676 | if fm.isplain(): |
|
1676 | if fm.isplain(): | |
1677 | source = source or 'none' |
|
1677 | source = source or 'none' | |
1678 | value = value.replace('\n', '\\n') |
|
1678 | value = value.replace('\n', '\\n') | |
1679 | entryname = section + '.' + name |
|
1679 | entryname = section + '.' + name | |
1680 | if values: |
|
1680 | if values: | |
1681 | for v in values: |
|
1681 | for v in values: | |
1682 | if v == section: |
|
1682 | if v == section: | |
1683 | fm.startitem() |
|
1683 | fm.startitem() | |
1684 | fm.condwrite(ui.debugflag, 'source', '%s: ', source) |
|
1684 | fm.condwrite(ui.debugflag, 'source', '%s: ', source) | |
1685 | fm.write('name value', '%s=%s\n', entryname, value) |
|
1685 | fm.write('name value', '%s=%s\n', entryname, value) | |
1686 | matched = True |
|
1686 | matched = True | |
1687 | elif v == entryname: |
|
1687 | elif v == entryname: | |
1688 | fm.startitem() |
|
1688 | fm.startitem() | |
1689 | fm.condwrite(ui.debugflag, 'source', '%s: ', source) |
|
1689 | fm.condwrite(ui.debugflag, 'source', '%s: ', source) | |
1690 | fm.write('value', '%s\n', value) |
|
1690 | fm.write('value', '%s\n', value) | |
1691 | fm.data(name=entryname) |
|
1691 | fm.data(name=entryname) | |
1692 | matched = True |
|
1692 | matched = True | |
1693 | else: |
|
1693 | else: | |
1694 | fm.startitem() |
|
1694 | fm.startitem() | |
1695 | fm.condwrite(ui.debugflag, 'source', '%s: ', source) |
|
1695 | fm.condwrite(ui.debugflag, 'source', '%s: ', source) | |
1696 | fm.write('name value', '%s=%s\n', entryname, value) |
|
1696 | fm.write('name value', '%s=%s\n', entryname, value) | |
1697 | matched = True |
|
1697 | matched = True | |
1698 | fm.end() |
|
1698 | fm.end() | |
1699 | if matched: |
|
1699 | if matched: | |
1700 | return 0 |
|
1700 | return 0 | |
1701 | return 1 |
|
1701 | return 1 | |
1702 |
|
1702 | |||
1703 | @command('copy|cp', |
|
1703 | @command('copy|cp', | |
1704 | [('A', 'after', None, _('record a copy that has already occurred')), |
|
1704 | [('A', 'after', None, _('record a copy that has already occurred')), | |
1705 | ('f', 'force', None, _('forcibly copy over an existing managed file')), |
|
1705 | ('f', 'force', None, _('forcibly copy over an existing managed file')), | |
1706 | ] + walkopts + dryrunopts, |
|
1706 | ] + walkopts + dryrunopts, | |
1707 | _('[OPTION]... [SOURCE]... DEST')) |
|
1707 | _('[OPTION]... [SOURCE]... DEST')) | |
1708 | def copy(ui, repo, *pats, **opts): |
|
1708 | def copy(ui, repo, *pats, **opts): | |
1709 | """mark files as copied for the next commit |
|
1709 | """mark files as copied for the next commit | |
1710 |
|
1710 | |||
1711 | Mark dest as having copies of source files. If dest is a |
|
1711 | Mark dest as having copies of source files. If dest is a | |
1712 | directory, copies are put in that directory. If dest is a file, |
|
1712 | directory, copies are put in that directory. If dest is a file, | |
1713 | the source must be a single file. |
|
1713 | the source must be a single file. | |
1714 |
|
1714 | |||
1715 | By default, this command copies the contents of files as they |
|
1715 | By default, this command copies the contents of files as they | |
1716 | exist in the working directory. If invoked with -A/--after, the |
|
1716 | exist in the working directory. If invoked with -A/--after, the | |
1717 | operation is recorded, but no copying is performed. |
|
1717 | operation is recorded, but no copying is performed. | |
1718 |
|
1718 | |||
1719 | This command takes effect with the next commit. To undo a copy |
|
1719 | This command takes effect with the next commit. To undo a copy | |
1720 | before that, see :hg:`revert`. |
|
1720 | before that, see :hg:`revert`. | |
1721 |
|
1721 | |||
1722 | Returns 0 on success, 1 if errors are encountered. |
|
1722 | Returns 0 on success, 1 if errors are encountered. | |
1723 | """ |
|
1723 | """ | |
1724 | opts = pycompat.byteskwargs(opts) |
|
1724 | opts = pycompat.byteskwargs(opts) | |
1725 | with repo.wlock(False): |
|
1725 | with repo.wlock(False): | |
1726 | return cmdutil.copy(ui, repo, pats, opts) |
|
1726 | return cmdutil.copy(ui, repo, pats, opts) | |
1727 |
|
1727 | |||
1728 | @command('debugcommands', [], _('[COMMAND]'), norepo=True) |
|
1728 | @command('debugcommands', [], _('[COMMAND]'), norepo=True) | |
1729 | def debugcommands(ui, cmd='', *args): |
|
1729 | def debugcommands(ui, cmd='', *args): | |
1730 | """list all available commands and options""" |
|
1730 | """list all available commands and options""" | |
1731 | for cmd, vals in sorted(table.iteritems()): |
|
1731 | for cmd, vals in sorted(table.iteritems()): | |
1732 | cmd = cmd.split('|')[0].strip('^') |
|
1732 | cmd = cmd.split('|')[0].strip('^') | |
1733 | opts = ', '.join([i[1] for i in vals[1]]) |
|
1733 | opts = ', '.join([i[1] for i in vals[1]]) | |
1734 | ui.write('%s: %s\n' % (cmd, opts)) |
|
1734 | ui.write('%s: %s\n' % (cmd, opts)) | |
1735 |
|
1735 | |||
1736 | @command('debugcomplete', |
|
1736 | @command('debugcomplete', | |
1737 | [('o', 'options', None, _('show the command options'))], |
|
1737 | [('o', 'options', None, _('show the command options'))], | |
1738 | _('[-o] CMD'), |
|
1738 | _('[-o] CMD'), | |
1739 | norepo=True) |
|
1739 | norepo=True) | |
1740 | def debugcomplete(ui, cmd='', **opts): |
|
1740 | def debugcomplete(ui, cmd='', **opts): | |
1741 | """returns the completion list associated with the given command""" |
|
1741 | """returns the completion list associated with the given command""" | |
1742 |
|
1742 | |||
1743 | if opts.get('options'): |
|
1743 | if opts.get('options'): | |
1744 | options = [] |
|
1744 | options = [] | |
1745 | otables = [globalopts] |
|
1745 | otables = [globalopts] | |
1746 | if cmd: |
|
1746 | if cmd: | |
1747 | aliases, entry = cmdutil.findcmd(cmd, table, False) |
|
1747 | aliases, entry = cmdutil.findcmd(cmd, table, False) | |
1748 | otables.append(entry[1]) |
|
1748 | otables.append(entry[1]) | |
1749 | for t in otables: |
|
1749 | for t in otables: | |
1750 | for o in t: |
|
1750 | for o in t: | |
1751 | if "(DEPRECATED)" in o[3]: |
|
1751 | if "(DEPRECATED)" in o[3]: | |
1752 | continue |
|
1752 | continue | |
1753 | if o[0]: |
|
1753 | if o[0]: | |
1754 | options.append('-%s' % o[0]) |
|
1754 | options.append('-%s' % o[0]) | |
1755 | options.append('--%s' % o[1]) |
|
1755 | options.append('--%s' % o[1]) | |
1756 | ui.write("%s\n" % "\n".join(options)) |
|
1756 | ui.write("%s\n" % "\n".join(options)) | |
1757 | return |
|
1757 | return | |
1758 |
|
1758 | |||
1759 | cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table) |
|
1759 | cmdlist, unused_allcmds = cmdutil.findpossible(cmd, table) | |
1760 | if ui.verbose: |
|
1760 | if ui.verbose: | |
1761 | cmdlist = [' '.join(c[0]) for c in cmdlist.values()] |
|
1761 | cmdlist = [' '.join(c[0]) for c in cmdlist.values()] | |
1762 | ui.write("%s\n" % "\n".join(sorted(cmdlist))) |
|
1762 | ui.write("%s\n" % "\n".join(sorted(cmdlist))) | |
1763 |
|
1763 | |||
1764 | @command('^diff', |
|
1764 | @command('^diff', | |
1765 | [('r', 'rev', [], _('revision'), _('REV')), |
|
1765 | [('r', 'rev', [], _('revision'), _('REV')), | |
1766 | ('c', 'change', '', _('change made by revision'), _('REV')) |
|
1766 | ('c', 'change', '', _('change made by revision'), _('REV')) | |
1767 | ] + diffopts + diffopts2 + walkopts + subrepoopts, |
|
1767 | ] + diffopts + diffopts2 + walkopts + subrepoopts, | |
1768 | _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'), |
|
1768 | _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'), | |
1769 | inferrepo=True) |
|
1769 | inferrepo=True) | |
1770 | def diff(ui, repo, *pats, **opts): |
|
1770 | def diff(ui, repo, *pats, **opts): | |
1771 | """diff repository (or selected files) |
|
1771 | """diff repository (or selected files) | |
1772 |
|
1772 | |||
1773 | Show differences between revisions for the specified files. |
|
1773 | Show differences between revisions for the specified files. | |
1774 |
|
1774 | |||
1775 | Differences between files are shown using the unified diff format. |
|
1775 | Differences between files are shown using the unified diff format. | |
1776 |
|
1776 | |||
1777 | .. note:: |
|
1777 | .. note:: | |
1778 |
|
1778 | |||
1779 | :hg:`diff` may generate unexpected results for merges, as it will |
|
1779 | :hg:`diff` may generate unexpected results for merges, as it will | |
1780 | default to comparing against the working directory's first |
|
1780 | default to comparing against the working directory's first | |
1781 | parent changeset if no revisions are specified. |
|
1781 | parent changeset if no revisions are specified. | |
1782 |
|
1782 | |||
1783 | When two revision arguments are given, then changes are shown |
|
1783 | When two revision arguments are given, then changes are shown | |
1784 | between those revisions. If only one revision is specified then |
|
1784 | between those revisions. If only one revision is specified then | |
1785 | that revision is compared to the working directory, and, when no |
|
1785 | that revision is compared to the working directory, and, when no | |
1786 | revisions are specified, the working directory files are compared |
|
1786 | revisions are specified, the working directory files are compared | |
1787 | to its first parent. |
|
1787 | to its first parent. | |
1788 |
|
1788 | |||
1789 | Alternatively you can specify -c/--change with a revision to see |
|
1789 | Alternatively you can specify -c/--change with a revision to see | |
1790 | the changes in that changeset relative to its first parent. |
|
1790 | the changes in that changeset relative to its first parent. | |
1791 |
|
1791 | |||
1792 | Without the -a/--text option, diff will avoid generating diffs of |
|
1792 | Without the -a/--text option, diff will avoid generating diffs of | |
1793 | files it detects as binary. With -a, diff will generate a diff |
|
1793 | files it detects as binary. With -a, diff will generate a diff | |
1794 | anyway, probably with undesirable results. |
|
1794 | anyway, probably with undesirable results. | |
1795 |
|
1795 | |||
1796 | Use the -g/--git option to generate diffs in the git extended diff |
|
1796 | Use the -g/--git option to generate diffs in the git extended diff | |
1797 | format. For more information, read :hg:`help diffs`. |
|
1797 | format. For more information, read :hg:`help diffs`. | |
1798 |
|
1798 | |||
1799 | .. container:: verbose |
|
1799 | .. container:: verbose | |
1800 |
|
1800 | |||
1801 | Examples: |
|
1801 | Examples: | |
1802 |
|
1802 | |||
1803 | - compare a file in the current working directory to its parent:: |
|
1803 | - compare a file in the current working directory to its parent:: | |
1804 |
|
1804 | |||
1805 | hg diff foo.c |
|
1805 | hg diff foo.c | |
1806 |
|
1806 | |||
1807 | - compare two historical versions of a directory, with rename info:: |
|
1807 | - compare two historical versions of a directory, with rename info:: | |
1808 |
|
1808 | |||
1809 | hg diff --git -r 1.0:1.2 lib/ |
|
1809 | hg diff --git -r 1.0:1.2 lib/ | |
1810 |
|
1810 | |||
1811 | - get change stats relative to the last change on some date:: |
|
1811 | - get change stats relative to the last change on some date:: | |
1812 |
|
1812 | |||
1813 | hg diff --stat -r "date('may 2')" |
|
1813 | hg diff --stat -r "date('may 2')" | |
1814 |
|
1814 | |||
1815 | - diff all newly-added files that contain a keyword:: |
|
1815 | - diff all newly-added files that contain a keyword:: | |
1816 |
|
1816 | |||
1817 | hg diff "set:added() and grep(GNU)" |
|
1817 | hg diff "set:added() and grep(GNU)" | |
1818 |
|
1818 | |||
1819 | - compare a revision and its parents:: |
|
1819 | - compare a revision and its parents:: | |
1820 |
|
1820 | |||
1821 | hg diff -c 9353 # compare against first parent |
|
1821 | hg diff -c 9353 # compare against first parent | |
1822 | hg diff -r 9353^:9353 # same using revset syntax |
|
1822 | hg diff -r 9353^:9353 # same using revset syntax | |
1823 | hg diff -r 9353^2:9353 # compare against the second parent |
|
1823 | hg diff -r 9353^2:9353 # compare against the second parent | |
1824 |
|
1824 | |||
1825 | Returns 0 on success. |
|
1825 | Returns 0 on success. | |
1826 | """ |
|
1826 | """ | |
1827 |
|
1827 | |||
1828 | opts = pycompat.byteskwargs(opts) |
|
1828 | opts = pycompat.byteskwargs(opts) | |
1829 | revs = opts.get('rev') |
|
1829 | revs = opts.get('rev') | |
1830 | change = opts.get('change') |
|
1830 | change = opts.get('change') | |
1831 | stat = opts.get('stat') |
|
1831 | stat = opts.get('stat') | |
1832 | reverse = opts.get('reverse') |
|
1832 | reverse = opts.get('reverse') | |
1833 |
|
1833 | |||
1834 | if revs and change: |
|
1834 | if revs and change: | |
1835 | msg = _('cannot specify --rev and --change at the same time') |
|
1835 | msg = _('cannot specify --rev and --change at the same time') | |
1836 | raise error.Abort(msg) |
|
1836 | raise error.Abort(msg) | |
1837 | elif change: |
|
1837 | elif change: | |
1838 | node2 = scmutil.revsingle(repo, change, None).node() |
|
1838 | node2 = scmutil.revsingle(repo, change, None).node() | |
1839 | node1 = repo[node2].p1().node() |
|
1839 | node1 = repo[node2].p1().node() | |
1840 | else: |
|
1840 | else: | |
1841 | node1, node2 = scmutil.revpair(repo, revs) |
|
1841 | node1, node2 = scmutil.revpair(repo, revs) | |
1842 |
|
1842 | |||
1843 | if reverse: |
|
1843 | if reverse: | |
1844 | node1, node2 = node2, node1 |
|
1844 | node1, node2 = node2, node1 | |
1845 |
|
1845 | |||
1846 | diffopts = patch.diffallopts(ui, opts) |
|
1846 | diffopts = patch.diffallopts(ui, opts) | |
1847 | m = scmutil.match(repo[node2], pats, opts) |
|
1847 | m = scmutil.match(repo[node2], pats, opts) | |
1848 | ui.pager('diff') |
|
1848 | ui.pager('diff') | |
1849 | cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat, |
|
1849 | cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat, | |
1850 | listsubrepos=opts.get('subrepos'), |
|
1850 | listsubrepos=opts.get('subrepos'), | |
1851 | root=opts.get('root')) |
|
1851 | root=opts.get('root')) | |
1852 |
|
1852 | |||
1853 | @command('^export', |
|
1853 | @command('^export', | |
1854 | [('o', 'output', '', |
|
1854 | [('o', 'output', '', | |
1855 | _('print output to file with formatted name'), _('FORMAT')), |
|
1855 | _('print output to file with formatted name'), _('FORMAT')), | |
1856 | ('', 'switch-parent', None, _('diff against the second parent')), |
|
1856 | ('', 'switch-parent', None, _('diff against the second parent')), | |
1857 | ('r', 'rev', [], _('revisions to export'), _('REV')), |
|
1857 | ('r', 'rev', [], _('revisions to export'), _('REV')), | |
1858 | ] + diffopts, |
|
1858 | ] + diffopts, | |
1859 | _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...')) |
|
1859 | _('[OPTION]... [-o OUTFILESPEC] [-r] [REV]...')) | |
1860 | def export(ui, repo, *changesets, **opts): |
|
1860 | def export(ui, repo, *changesets, **opts): | |
1861 | """dump the header and diffs for one or more changesets |
|
1861 | """dump the header and diffs for one or more changesets | |
1862 |
|
1862 | |||
1863 | Print the changeset header and diffs for one or more revisions. |
|
1863 | Print the changeset header and diffs for one or more revisions. | |
1864 | If no revision is given, the parent of the working directory is used. |
|
1864 | If no revision is given, the parent of the working directory is used. | |
1865 |
|
1865 | |||
1866 | The information shown in the changeset header is: author, date, |
|
1866 | The information shown in the changeset header is: author, date, | |
1867 | branch name (if non-default), changeset hash, parent(s) and commit |
|
1867 | branch name (if non-default), changeset hash, parent(s) and commit | |
1868 | comment. |
|
1868 | comment. | |
1869 |
|
1869 | |||
1870 | .. note:: |
|
1870 | .. note:: | |
1871 |
|
1871 | |||
1872 | :hg:`export` may generate unexpected diff output for merge |
|
1872 | :hg:`export` may generate unexpected diff output for merge | |
1873 | changesets, as it will compare the merge changeset against its |
|
1873 | changesets, as it will compare the merge changeset against its | |
1874 | first parent only. |
|
1874 | first parent only. | |
1875 |
|
1875 | |||
1876 | Output may be to a file, in which case the name of the file is |
|
1876 | Output may be to a file, in which case the name of the file is | |
1877 | given using a format string. The formatting rules are as follows: |
|
1877 | given using a format string. The formatting rules are as follows: | |
1878 |
|
1878 | |||
1879 | :``%%``: literal "%" character |
|
1879 | :``%%``: literal "%" character | |
1880 | :``%H``: changeset hash (40 hexadecimal digits) |
|
1880 | :``%H``: changeset hash (40 hexadecimal digits) | |
1881 | :``%N``: number of patches being generated |
|
1881 | :``%N``: number of patches being generated | |
1882 | :``%R``: changeset revision number |
|
1882 | :``%R``: changeset revision number | |
1883 | :``%b``: basename of the exporting repository |
|
1883 | :``%b``: basename of the exporting repository | |
1884 | :``%h``: short-form changeset hash (12 hexadecimal digits) |
|
1884 | :``%h``: short-form changeset hash (12 hexadecimal digits) | |
1885 | :``%m``: first line of the commit message (only alphanumeric characters) |
|
1885 | :``%m``: first line of the commit message (only alphanumeric characters) | |
1886 | :``%n``: zero-padded sequence number, starting at 1 |
|
1886 | :``%n``: zero-padded sequence number, starting at 1 | |
1887 | :``%r``: zero-padded changeset revision number |
|
1887 | :``%r``: zero-padded changeset revision number | |
1888 |
|
1888 | |||
1889 | Without the -a/--text option, export will avoid generating diffs |
|
1889 | Without the -a/--text option, export will avoid generating diffs | |
1890 | of files it detects as binary. With -a, export will generate a |
|
1890 | of files it detects as binary. With -a, export will generate a | |
1891 | diff anyway, probably with undesirable results. |
|
1891 | diff anyway, probably with undesirable results. | |
1892 |
|
1892 | |||
1893 | Use the -g/--git option to generate diffs in the git extended diff |
|
1893 | Use the -g/--git option to generate diffs in the git extended diff | |
1894 | format. See :hg:`help diffs` for more information. |
|
1894 | format. See :hg:`help diffs` for more information. | |
1895 |
|
1895 | |||
1896 | With the --switch-parent option, the diff will be against the |
|
1896 | With the --switch-parent option, the diff will be against the | |
1897 | second parent. It can be useful to review a merge. |
|
1897 | second parent. It can be useful to review a merge. | |
1898 |
|
1898 | |||
1899 | .. container:: verbose |
|
1899 | .. container:: verbose | |
1900 |
|
1900 | |||
1901 | Examples: |
|
1901 | Examples: | |
1902 |
|
1902 | |||
1903 | - use export and import to transplant a bugfix to the current |
|
1903 | - use export and import to transplant a bugfix to the current | |
1904 | branch:: |
|
1904 | branch:: | |
1905 |
|
1905 | |||
1906 | hg export -r 9353 | hg import - |
|
1906 | hg export -r 9353 | hg import - | |
1907 |
|
1907 | |||
1908 | - export all the changesets between two revisions to a file with |
|
1908 | - export all the changesets between two revisions to a file with | |
1909 | rename information:: |
|
1909 | rename information:: | |
1910 |
|
1910 | |||
1911 | hg export --git -r 123:150 > changes.txt |
|
1911 | hg export --git -r 123:150 > changes.txt | |
1912 |
|
1912 | |||
1913 | - split outgoing changes into a series of patches with |
|
1913 | - split outgoing changes into a series of patches with | |
1914 | descriptive names:: |
|
1914 | descriptive names:: | |
1915 |
|
1915 | |||
1916 | hg export -r "outgoing()" -o "%n-%m.patch" |
|
1916 | hg export -r "outgoing()" -o "%n-%m.patch" | |
1917 |
|
1917 | |||
1918 | Returns 0 on success. |
|
1918 | Returns 0 on success. | |
1919 | """ |
|
1919 | """ | |
1920 | opts = pycompat.byteskwargs(opts) |
|
1920 | opts = pycompat.byteskwargs(opts) | |
1921 | changesets += tuple(opts.get('rev', [])) |
|
1921 | changesets += tuple(opts.get('rev', [])) | |
1922 | if not changesets: |
|
1922 | if not changesets: | |
1923 | changesets = ['.'] |
|
1923 | changesets = ['.'] | |
1924 | revs = scmutil.revrange(repo, changesets) |
|
1924 | revs = scmutil.revrange(repo, changesets) | |
1925 | if not revs: |
|
1925 | if not revs: | |
1926 | raise error.Abort(_("export requires at least one changeset")) |
|
1926 | raise error.Abort(_("export requires at least one changeset")) | |
1927 | if len(revs) > 1: |
|
1927 | if len(revs) > 1: | |
1928 | ui.note(_('exporting patches:\n')) |
|
1928 | ui.note(_('exporting patches:\n')) | |
1929 | else: |
|
1929 | else: | |
1930 | ui.note(_('exporting patch:\n')) |
|
1930 | ui.note(_('exporting patch:\n')) | |
1931 | ui.pager('export') |
|
1931 | ui.pager('export') | |
1932 | cmdutil.export(repo, revs, fntemplate=opts.get('output'), |
|
1932 | cmdutil.export(repo, revs, fntemplate=opts.get('output'), | |
1933 | switch_parent=opts.get('switch_parent'), |
|
1933 | switch_parent=opts.get('switch_parent'), | |
1934 | opts=patch.diffallopts(ui, opts)) |
|
1934 | opts=patch.diffallopts(ui, opts)) | |
1935 |
|
1935 | |||
1936 | @command('files', |
|
1936 | @command('files', | |
1937 | [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')), |
|
1937 | [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')), | |
1938 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), |
|
1938 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), | |
1939 | ] + walkopts + formatteropts + subrepoopts, |
|
1939 | ] + walkopts + formatteropts + subrepoopts, | |
1940 | _('[OPTION]... [FILE]...')) |
|
1940 | _('[OPTION]... [FILE]...')) | |
1941 | def files(ui, repo, *pats, **opts): |
|
1941 | def files(ui, repo, *pats, **opts): | |
1942 | """list tracked files |
|
1942 | """list tracked files | |
1943 |
|
1943 | |||
1944 | Print files under Mercurial control in the working directory or |
|
1944 | Print files under Mercurial control in the working directory or | |
1945 | specified revision for given files (excluding removed files). |
|
1945 | specified revision for given files (excluding removed files). | |
1946 | Files can be specified as filenames or filesets. |
|
1946 | Files can be specified as filenames or filesets. | |
1947 |
|
1947 | |||
1948 | If no files are given to match, this command prints the names |
|
1948 | If no files are given to match, this command prints the names | |
1949 | of all files under Mercurial control. |
|
1949 | of all files under Mercurial control. | |
1950 |
|
1950 | |||
1951 | .. container:: verbose |
|
1951 | .. container:: verbose | |
1952 |
|
1952 | |||
1953 | Examples: |
|
1953 | Examples: | |
1954 |
|
1954 | |||
1955 | - list all files under the current directory:: |
|
1955 | - list all files under the current directory:: | |
1956 |
|
1956 | |||
1957 | hg files . |
|
1957 | hg files . | |
1958 |
|
1958 | |||
1959 | - shows sizes and flags for current revision:: |
|
1959 | - shows sizes and flags for current revision:: | |
1960 |
|
1960 | |||
1961 | hg files -vr . |
|
1961 | hg files -vr . | |
1962 |
|
1962 | |||
1963 | - list all files named README:: |
|
1963 | - list all files named README:: | |
1964 |
|
1964 | |||
1965 | hg files -I "**/README" |
|
1965 | hg files -I "**/README" | |
1966 |
|
1966 | |||
1967 | - list all binary files:: |
|
1967 | - list all binary files:: | |
1968 |
|
1968 | |||
1969 | hg files "set:binary()" |
|
1969 | hg files "set:binary()" | |
1970 |
|
1970 | |||
1971 | - find files containing a regular expression:: |
|
1971 | - find files containing a regular expression:: | |
1972 |
|
1972 | |||
1973 | hg files "set:grep('bob')" |
|
1973 | hg files "set:grep('bob')" | |
1974 |
|
1974 | |||
1975 | - search tracked file contents with xargs and grep:: |
|
1975 | - search tracked file contents with xargs and grep:: | |
1976 |
|
1976 | |||
1977 | hg files -0 | xargs -0 grep foo |
|
1977 | hg files -0 | xargs -0 grep foo | |
1978 |
|
1978 | |||
1979 | See :hg:`help patterns` and :hg:`help filesets` for more information |
|
1979 | See :hg:`help patterns` and :hg:`help filesets` for more information | |
1980 | on specifying file patterns. |
|
1980 | on specifying file patterns. | |
1981 |
|
1981 | |||
1982 | Returns 0 if a match is found, 1 otherwise. |
|
1982 | Returns 0 if a match is found, 1 otherwise. | |
1983 |
|
1983 | |||
1984 | """ |
|
1984 | """ | |
1985 |
|
1985 | |||
1986 | opts = pycompat.byteskwargs(opts) |
|
1986 | opts = pycompat.byteskwargs(opts) | |
1987 | ctx = scmutil.revsingle(repo, opts.get('rev'), None) |
|
1987 | ctx = scmutil.revsingle(repo, opts.get('rev'), None) | |
1988 |
|
1988 | |||
1989 | end = '\n' |
|
1989 | end = '\n' | |
1990 | if opts.get('print0'): |
|
1990 | if opts.get('print0'): | |
1991 | end = '\0' |
|
1991 | end = '\0' | |
1992 | fmt = '%s' + end |
|
1992 | fmt = '%s' + end | |
1993 |
|
1993 | |||
1994 | m = scmutil.match(ctx, pats, opts) |
|
1994 | m = scmutil.match(ctx, pats, opts) | |
1995 | ui.pager('files') |
|
1995 | ui.pager('files') | |
1996 | with ui.formatter('files', opts) as fm: |
|
1996 | with ui.formatter('files', opts) as fm: | |
1997 | return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos')) |
|
1997 | return cmdutil.files(ui, ctx, m, fm, fmt, opts.get('subrepos')) | |
1998 |
|
1998 | |||
1999 | @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True) |
|
1999 | @command('^forget', walkopts, _('[OPTION]... FILE...'), inferrepo=True) | |
2000 | def forget(ui, repo, *pats, **opts): |
|
2000 | def forget(ui, repo, *pats, **opts): | |
2001 | """forget the specified files on the next commit |
|
2001 | """forget the specified files on the next commit | |
2002 |
|
2002 | |||
2003 | Mark the specified files so they will no longer be tracked |
|
2003 | Mark the specified files so they will no longer be tracked | |
2004 | after the next commit. |
|
2004 | after the next commit. | |
2005 |
|
2005 | |||
2006 | This only removes files from the current branch, not from the |
|
2006 | This only removes files from the current branch, not from the | |
2007 | entire project history, and it does not delete them from the |
|
2007 | entire project history, and it does not delete them from the | |
2008 | working directory. |
|
2008 | working directory. | |
2009 |
|
2009 | |||
2010 | To delete the file from the working directory, see :hg:`remove`. |
|
2010 | To delete the file from the working directory, see :hg:`remove`. | |
2011 |
|
2011 | |||
2012 | To undo a forget before the next commit, see :hg:`add`. |
|
2012 | To undo a forget before the next commit, see :hg:`add`. | |
2013 |
|
2013 | |||
2014 | .. container:: verbose |
|
2014 | .. container:: verbose | |
2015 |
|
2015 | |||
2016 | Examples: |
|
2016 | Examples: | |
2017 |
|
2017 | |||
2018 | - forget newly-added binary files:: |
|
2018 | - forget newly-added binary files:: | |
2019 |
|
2019 | |||
2020 | hg forget "set:added() and binary()" |
|
2020 | hg forget "set:added() and binary()" | |
2021 |
|
2021 | |||
2022 | - forget files that would be excluded by .hgignore:: |
|
2022 | - forget files that would be excluded by .hgignore:: | |
2023 |
|
2023 | |||
2024 | hg forget "set:hgignore()" |
|
2024 | hg forget "set:hgignore()" | |
2025 |
|
2025 | |||
2026 | Returns 0 on success. |
|
2026 | Returns 0 on success. | |
2027 | """ |
|
2027 | """ | |
2028 |
|
2028 | |||
2029 | opts = pycompat.byteskwargs(opts) |
|
2029 | opts = pycompat.byteskwargs(opts) | |
2030 | if not pats: |
|
2030 | if not pats: | |
2031 | raise error.Abort(_('no files specified')) |
|
2031 | raise error.Abort(_('no files specified')) | |
2032 |
|
2032 | |||
2033 | m = scmutil.match(repo[None], pats, opts) |
|
2033 | m = scmutil.match(repo[None], pats, opts) | |
2034 | rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0] |
|
2034 | rejected = cmdutil.forget(ui, repo, m, prefix="", explicitonly=False)[0] | |
2035 | return rejected and 1 or 0 |
|
2035 | return rejected and 1 or 0 | |
2036 |
|
2036 | |||
2037 | @command( |
|
2037 | @command( | |
2038 | 'graft', |
|
2038 | 'graft', | |
2039 | [('r', 'rev', [], _('revisions to graft'), _('REV')), |
|
2039 | [('r', 'rev', [], _('revisions to graft'), _('REV')), | |
2040 | ('c', 'continue', False, _('resume interrupted graft')), |
|
2040 | ('c', 'continue', False, _('resume interrupted graft')), | |
2041 | ('e', 'edit', False, _('invoke editor on commit messages')), |
|
2041 | ('e', 'edit', False, _('invoke editor on commit messages')), | |
2042 | ('', 'log', None, _('append graft info to log message')), |
|
2042 | ('', 'log', None, _('append graft info to log message')), | |
2043 | ('f', 'force', False, _('force graft')), |
|
2043 | ('f', 'force', False, _('force graft')), | |
2044 | ('D', 'currentdate', False, |
|
2044 | ('D', 'currentdate', False, | |
2045 | _('record the current date as commit date')), |
|
2045 | _('record the current date as commit date')), | |
2046 | ('U', 'currentuser', False, |
|
2046 | ('U', 'currentuser', False, | |
2047 | _('record the current user as committer'), _('DATE'))] |
|
2047 | _('record the current user as committer'), _('DATE'))] | |
2048 | + commitopts2 + mergetoolopts + dryrunopts, |
|
2048 | + commitopts2 + mergetoolopts + dryrunopts, | |
2049 | _('[OPTION]... [-r REV]... REV...')) |
|
2049 | _('[OPTION]... [-r REV]... REV...')) | |
2050 | def graft(ui, repo, *revs, **opts): |
|
2050 | def graft(ui, repo, *revs, **opts): | |
2051 | '''copy changes from other branches onto the current branch |
|
2051 | '''copy changes from other branches onto the current branch | |
2052 |
|
2052 | |||
2053 | This command uses Mercurial's merge logic to copy individual |
|
2053 | This command uses Mercurial's merge logic to copy individual | |
2054 | changes from other branches without merging branches in the |
|
2054 | changes from other branches without merging branches in the | |
2055 | history graph. This is sometimes known as 'backporting' or |
|
2055 | history graph. This is sometimes known as 'backporting' or | |
2056 | 'cherry-picking'. By default, graft will copy user, date, and |
|
2056 | 'cherry-picking'. By default, graft will copy user, date, and | |
2057 | description from the source changesets. |
|
2057 | description from the source changesets. | |
2058 |
|
2058 | |||
2059 | Changesets that are ancestors of the current revision, that have |
|
2059 | Changesets that are ancestors of the current revision, that have | |
2060 | already been grafted, or that are merges will be skipped. |
|
2060 | already been grafted, or that are merges will be skipped. | |
2061 |
|
2061 | |||
2062 | If --log is specified, log messages will have a comment appended |
|
2062 | If --log is specified, log messages will have a comment appended | |
2063 | of the form:: |
|
2063 | of the form:: | |
2064 |
|
2064 | |||
2065 | (grafted from CHANGESETHASH) |
|
2065 | (grafted from CHANGESETHASH) | |
2066 |
|
2066 | |||
2067 | If --force is specified, revisions will be grafted even if they |
|
2067 | If --force is specified, revisions will be grafted even if they | |
2068 | are already ancestors of or have been grafted to the destination. |
|
2068 | are already ancestors of or have been grafted to the destination. | |
2069 | This is useful when the revisions have since been backed out. |
|
2069 | This is useful when the revisions have since been backed out. | |
2070 |
|
2070 | |||
2071 | If a graft merge results in conflicts, the graft process is |
|
2071 | If a graft merge results in conflicts, the graft process is | |
2072 | interrupted so that the current merge can be manually resolved. |
|
2072 | interrupted so that the current merge can be manually resolved. | |
2073 | Once all conflicts are addressed, the graft process can be |
|
2073 | Once all conflicts are addressed, the graft process can be | |
2074 | continued with the -c/--continue option. |
|
2074 | continued with the -c/--continue option. | |
2075 |
|
2075 | |||
2076 | .. note:: |
|
2076 | .. note:: | |
2077 |
|
2077 | |||
2078 | The -c/--continue option does not reapply earlier options, except |
|
2078 | The -c/--continue option does not reapply earlier options, except | |
2079 | for --force. |
|
2079 | for --force. | |
2080 |
|
2080 | |||
2081 | .. container:: verbose |
|
2081 | .. container:: verbose | |
2082 |
|
2082 | |||
2083 | Examples: |
|
2083 | Examples: | |
2084 |
|
2084 | |||
2085 | - copy a single change to the stable branch and edit its description:: |
|
2085 | - copy a single change to the stable branch and edit its description:: | |
2086 |
|
2086 | |||
2087 | hg update stable |
|
2087 | hg update stable | |
2088 | hg graft --edit 9393 |
|
2088 | hg graft --edit 9393 | |
2089 |
|
2089 | |||
2090 | - graft a range of changesets with one exception, updating dates:: |
|
2090 | - graft a range of changesets with one exception, updating dates:: | |
2091 |
|
2091 | |||
2092 | hg graft -D "2085::2093 and not 2091" |
|
2092 | hg graft -D "2085::2093 and not 2091" | |
2093 |
|
2093 | |||
2094 | - continue a graft after resolving conflicts:: |
|
2094 | - continue a graft after resolving conflicts:: | |
2095 |
|
2095 | |||
2096 | hg graft -c |
|
2096 | hg graft -c | |
2097 |
|
2097 | |||
2098 | - show the source of a grafted changeset:: |
|
2098 | - show the source of a grafted changeset:: | |
2099 |
|
2099 | |||
2100 | hg log --debug -r . |
|
2100 | hg log --debug -r . | |
2101 |
|
2101 | |||
2102 | - show revisions sorted by date:: |
|
2102 | - show revisions sorted by date:: | |
2103 |
|
2103 | |||
2104 | hg log -r "sort(all(), date)" |
|
2104 | hg log -r "sort(all(), date)" | |
2105 |
|
2105 | |||
2106 | See :hg:`help revisions` for more about specifying revisions. |
|
2106 | See :hg:`help revisions` for more about specifying revisions. | |
2107 |
|
2107 | |||
2108 | Returns 0 on successful completion. |
|
2108 | Returns 0 on successful completion. | |
2109 | ''' |
|
2109 | ''' | |
2110 | with repo.wlock(): |
|
2110 | with repo.wlock(): | |
2111 | return _dograft(ui, repo, *revs, **opts) |
|
2111 | return _dograft(ui, repo, *revs, **opts) | |
2112 |
|
2112 | |||
2113 | def _dograft(ui, repo, *revs, **opts): |
|
2113 | def _dograft(ui, repo, *revs, **opts): | |
2114 | opts = pycompat.byteskwargs(opts) |
|
2114 | opts = pycompat.byteskwargs(opts) | |
2115 | if revs and opts.get('rev'): |
|
2115 | if revs and opts.get('rev'): | |
2116 | ui.warn(_('warning: inconsistent use of --rev might give unexpected ' |
|
2116 | ui.warn(_('warning: inconsistent use of --rev might give unexpected ' | |
2117 | 'revision ordering!\n')) |
|
2117 | 'revision ordering!\n')) | |
2118 |
|
2118 | |||
2119 | revs = list(revs) |
|
2119 | revs = list(revs) | |
2120 | revs.extend(opts.get('rev')) |
|
2120 | revs.extend(opts.get('rev')) | |
2121 |
|
2121 | |||
2122 | if not opts.get('user') and opts.get('currentuser'): |
|
2122 | if not opts.get('user') and opts.get('currentuser'): | |
2123 | opts['user'] = ui.username() |
|
2123 | opts['user'] = ui.username() | |
2124 | if not opts.get('date') and opts.get('currentdate'): |
|
2124 | if not opts.get('date') and opts.get('currentdate'): | |
2125 | opts['date'] = "%d %d" % util.makedate() |
|
2125 | opts['date'] = "%d %d" % util.makedate() | |
2126 |
|
2126 | |||
2127 | editor = cmdutil.getcommiteditor(editform='graft', |
|
2127 | editor = cmdutil.getcommiteditor(editform='graft', | |
2128 | **pycompat.strkwargs(opts)) |
|
2128 | **pycompat.strkwargs(opts)) | |
2129 |
|
2129 | |||
2130 | cont = False |
|
2130 | cont = False | |
2131 | if opts.get('continue'): |
|
2131 | if opts.get('continue'): | |
2132 | cont = True |
|
2132 | cont = True | |
2133 | if revs: |
|
2133 | if revs: | |
2134 | raise error.Abort(_("can't specify --continue and revisions")) |
|
2134 | raise error.Abort(_("can't specify --continue and revisions")) | |
2135 | # read in unfinished revisions |
|
2135 | # read in unfinished revisions | |
2136 | try: |
|
2136 | try: | |
2137 | nodes = repo.vfs.read('graftstate').splitlines() |
|
2137 | nodes = repo.vfs.read('graftstate').splitlines() | |
2138 | revs = [repo[node].rev() for node in nodes] |
|
2138 | revs = [repo[node].rev() for node in nodes] | |
2139 | except IOError as inst: |
|
2139 | except IOError as inst: | |
2140 | if inst.errno != errno.ENOENT: |
|
2140 | if inst.errno != errno.ENOENT: | |
2141 | raise |
|
2141 | raise | |
2142 | cmdutil.wrongtooltocontinue(repo, _('graft')) |
|
2142 | cmdutil.wrongtooltocontinue(repo, _('graft')) | |
2143 | else: |
|
2143 | else: | |
2144 | cmdutil.checkunfinished(repo) |
|
2144 | cmdutil.checkunfinished(repo) | |
2145 | cmdutil.bailifchanged(repo) |
|
2145 | cmdutil.bailifchanged(repo) | |
2146 | if not revs: |
|
2146 | if not revs: | |
2147 | raise error.Abort(_('no revisions specified')) |
|
2147 | raise error.Abort(_('no revisions specified')) | |
2148 | revs = scmutil.revrange(repo, revs) |
|
2148 | revs = scmutil.revrange(repo, revs) | |
2149 |
|
2149 | |||
2150 | skipped = set() |
|
2150 | skipped = set() | |
2151 | # check for merges |
|
2151 | # check for merges | |
2152 | for rev in repo.revs('%ld and merge()', revs): |
|
2152 | for rev in repo.revs('%ld and merge()', revs): | |
2153 | ui.warn(_('skipping ungraftable merge revision %s\n') % rev) |
|
2153 | ui.warn(_('skipping ungraftable merge revision %s\n') % rev) | |
2154 | skipped.add(rev) |
|
2154 | skipped.add(rev) | |
2155 | revs = [r for r in revs if r not in skipped] |
|
2155 | revs = [r for r in revs if r not in skipped] | |
2156 | if not revs: |
|
2156 | if not revs: | |
2157 | return -1 |
|
2157 | return -1 | |
2158 |
|
2158 | |||
2159 | # Don't check in the --continue case, in effect retaining --force across |
|
2159 | # Don't check in the --continue case, in effect retaining --force across | |
2160 | # --continues. That's because without --force, any revisions we decided to |
|
2160 | # --continues. That's because without --force, any revisions we decided to | |
2161 | # skip would have been filtered out here, so they wouldn't have made their |
|
2161 | # skip would have been filtered out here, so they wouldn't have made their | |
2162 | # way to the graftstate. With --force, any revisions we would have otherwise |
|
2162 | # way to the graftstate. With --force, any revisions we would have otherwise | |
2163 | # skipped would not have been filtered out, and if they hadn't been applied |
|
2163 | # skipped would not have been filtered out, and if they hadn't been applied | |
2164 | # already, they'd have been in the graftstate. |
|
2164 | # already, they'd have been in the graftstate. | |
2165 | if not (cont or opts.get('force')): |
|
2165 | if not (cont or opts.get('force')): | |
2166 | # check for ancestors of dest branch |
|
2166 | # check for ancestors of dest branch | |
2167 | crev = repo['.'].rev() |
|
2167 | crev = repo['.'].rev() | |
2168 | ancestors = repo.changelog.ancestors([crev], inclusive=True) |
|
2168 | ancestors = repo.changelog.ancestors([crev], inclusive=True) | |
2169 | # XXX make this lazy in the future |
|
2169 | # XXX make this lazy in the future | |
2170 | # don't mutate while iterating, create a copy |
|
2170 | # don't mutate while iterating, create a copy | |
2171 | for rev in list(revs): |
|
2171 | for rev in list(revs): | |
2172 | if rev in ancestors: |
|
2172 | if rev in ancestors: | |
2173 | ui.warn(_('skipping ancestor revision %d:%s\n') % |
|
2173 | ui.warn(_('skipping ancestor revision %d:%s\n') % | |
2174 | (rev, repo[rev])) |
|
2174 | (rev, repo[rev])) | |
2175 | # XXX remove on list is slow |
|
2175 | # XXX remove on list is slow | |
2176 | revs.remove(rev) |
|
2176 | revs.remove(rev) | |
2177 | if not revs: |
|
2177 | if not revs: | |
2178 | return -1 |
|
2178 | return -1 | |
2179 |
|
2179 | |||
2180 | # analyze revs for earlier grafts |
|
2180 | # analyze revs for earlier grafts | |
2181 | ids = {} |
|
2181 | ids = {} | |
2182 | for ctx in repo.set("%ld", revs): |
|
2182 | for ctx in repo.set("%ld", revs): | |
2183 | ids[ctx.hex()] = ctx.rev() |
|
2183 | ids[ctx.hex()] = ctx.rev() | |
2184 | n = ctx.extra().get('source') |
|
2184 | n = ctx.extra().get('source') | |
2185 | if n: |
|
2185 | if n: | |
2186 | ids[n] = ctx.rev() |
|
2186 | ids[n] = ctx.rev() | |
2187 |
|
2187 | |||
2188 | # check ancestors for earlier grafts |
|
2188 | # check ancestors for earlier grafts | |
2189 | ui.debug('scanning for duplicate grafts\n') |
|
2189 | ui.debug('scanning for duplicate grafts\n') | |
2190 |
|
2190 | |||
2191 | # The only changesets we can be sure doesn't contain grafts of any |
|
2191 | # The only changesets we can be sure doesn't contain grafts of any | |
2192 | # revs, are the ones that are common ancestors of *all* revs: |
|
2192 | # revs, are the ones that are common ancestors of *all* revs: | |
2193 | for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs): |
|
2193 | for rev in repo.revs('only(%d,ancestor(%ld))', crev, revs): | |
2194 | ctx = repo[rev] |
|
2194 | ctx = repo[rev] | |
2195 | n = ctx.extra().get('source') |
|
2195 | n = ctx.extra().get('source') | |
2196 | if n in ids: |
|
2196 | if n in ids: | |
2197 | try: |
|
2197 | try: | |
2198 | r = repo[n].rev() |
|
2198 | r = repo[n].rev() | |
2199 | except error.RepoLookupError: |
|
2199 | except error.RepoLookupError: | |
2200 | r = None |
|
2200 | r = None | |
2201 | if r in revs: |
|
2201 | if r in revs: | |
2202 | ui.warn(_('skipping revision %d:%s ' |
|
2202 | ui.warn(_('skipping revision %d:%s ' | |
2203 | '(already grafted to %d:%s)\n') |
|
2203 | '(already grafted to %d:%s)\n') | |
2204 | % (r, repo[r], rev, ctx)) |
|
2204 | % (r, repo[r], rev, ctx)) | |
2205 | revs.remove(r) |
|
2205 | revs.remove(r) | |
2206 | elif ids[n] in revs: |
|
2206 | elif ids[n] in revs: | |
2207 | if r is None: |
|
2207 | if r is None: | |
2208 | ui.warn(_('skipping already grafted revision %d:%s ' |
|
2208 | ui.warn(_('skipping already grafted revision %d:%s ' | |
2209 | '(%d:%s also has unknown origin %s)\n') |
|
2209 | '(%d:%s also has unknown origin %s)\n') | |
2210 | % (ids[n], repo[ids[n]], rev, ctx, n[:12])) |
|
2210 | % (ids[n], repo[ids[n]], rev, ctx, n[:12])) | |
2211 | else: |
|
2211 | else: | |
2212 | ui.warn(_('skipping already grafted revision %d:%s ' |
|
2212 | ui.warn(_('skipping already grafted revision %d:%s ' | |
2213 | '(%d:%s also has origin %d:%s)\n') |
|
2213 | '(%d:%s also has origin %d:%s)\n') | |
2214 | % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])) |
|
2214 | % (ids[n], repo[ids[n]], rev, ctx, r, n[:12])) | |
2215 | revs.remove(ids[n]) |
|
2215 | revs.remove(ids[n]) | |
2216 | elif ctx.hex() in ids: |
|
2216 | elif ctx.hex() in ids: | |
2217 | r = ids[ctx.hex()] |
|
2217 | r = ids[ctx.hex()] | |
2218 | ui.warn(_('skipping already grafted revision %d:%s ' |
|
2218 | ui.warn(_('skipping already grafted revision %d:%s ' | |
2219 | '(was grafted from %d:%s)\n') % |
|
2219 | '(was grafted from %d:%s)\n') % | |
2220 | (r, repo[r], rev, ctx)) |
|
2220 | (r, repo[r], rev, ctx)) | |
2221 | revs.remove(r) |
|
2221 | revs.remove(r) | |
2222 | if not revs: |
|
2222 | if not revs: | |
2223 | return -1 |
|
2223 | return -1 | |
2224 |
|
2224 | |||
2225 | for pos, ctx in enumerate(repo.set("%ld", revs)): |
|
2225 | for pos, ctx in enumerate(repo.set("%ld", revs)): | |
2226 | desc = '%d:%s "%s"' % (ctx.rev(), ctx, |
|
2226 | desc = '%d:%s "%s"' % (ctx.rev(), ctx, | |
2227 | ctx.description().split('\n', 1)[0]) |
|
2227 | ctx.description().split('\n', 1)[0]) | |
2228 | names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node()) |
|
2228 | names = repo.nodetags(ctx.node()) + repo.nodebookmarks(ctx.node()) | |
2229 | if names: |
|
2229 | if names: | |
2230 | desc += ' (%s)' % ' '.join(names) |
|
2230 | desc += ' (%s)' % ' '.join(names) | |
2231 | ui.status(_('grafting %s\n') % desc) |
|
2231 | ui.status(_('grafting %s\n') % desc) | |
2232 | if opts.get('dry_run'): |
|
2232 | if opts.get('dry_run'): | |
2233 | continue |
|
2233 | continue | |
2234 |
|
2234 | |||
2235 | source = ctx.extra().get('source') |
|
2235 | source = ctx.extra().get('source') | |
2236 | extra = {} |
|
2236 | extra = {} | |
2237 | if source: |
|
2237 | if source: | |
2238 | extra['source'] = source |
|
2238 | extra['source'] = source | |
2239 | extra['intermediate-source'] = ctx.hex() |
|
2239 | extra['intermediate-source'] = ctx.hex() | |
2240 | else: |
|
2240 | else: | |
2241 | extra['source'] = ctx.hex() |
|
2241 | extra['source'] = ctx.hex() | |
2242 | user = ctx.user() |
|
2242 | user = ctx.user() | |
2243 | if opts.get('user'): |
|
2243 | if opts.get('user'): | |
2244 | user = opts['user'] |
|
2244 | user = opts['user'] | |
2245 | date = ctx.date() |
|
2245 | date = ctx.date() | |
2246 | if opts.get('date'): |
|
2246 | if opts.get('date'): | |
2247 | date = opts['date'] |
|
2247 | date = opts['date'] | |
2248 | message = ctx.description() |
|
2248 | message = ctx.description() | |
2249 | if opts.get('log'): |
|
2249 | if opts.get('log'): | |
2250 | message += '\n(grafted from %s)' % ctx.hex() |
|
2250 | message += '\n(grafted from %s)' % ctx.hex() | |
2251 |
|
2251 | |||
2252 | # we don't merge the first commit when continuing |
|
2252 | # we don't merge the first commit when continuing | |
2253 | if not cont: |
|
2253 | if not cont: | |
2254 | # perform the graft merge with p1(rev) as 'ancestor' |
|
2254 | # perform the graft merge with p1(rev) as 'ancestor' | |
2255 | try: |
|
2255 | try: | |
2256 | # ui.forcemerge is an internal variable, do not document |
|
2256 | # ui.forcemerge is an internal variable, do not document | |
2257 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
2257 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | |
2258 | 'graft') |
|
2258 | 'graft') | |
2259 | stats = mergemod.graft(repo, ctx, ctx.p1(), |
|
2259 | stats = mergemod.graft(repo, ctx, ctx.p1(), | |
2260 | ['local', 'graft']) |
|
2260 | ['local', 'graft']) | |
2261 | finally: |
|
2261 | finally: | |
2262 | repo.ui.setconfig('ui', 'forcemerge', '', 'graft') |
|
2262 | repo.ui.setconfig('ui', 'forcemerge', '', 'graft') | |
2263 | # report any conflicts |
|
2263 | # report any conflicts | |
2264 | if stats and stats[3] > 0: |
|
2264 | if stats and stats[3] > 0: | |
2265 | # write out state for --continue |
|
2265 | # write out state for --continue | |
2266 | nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] |
|
2266 | nodelines = [repo[rev].hex() + "\n" for rev in revs[pos:]] | |
2267 | repo.vfs.write('graftstate', ''.join(nodelines)) |
|
2267 | repo.vfs.write('graftstate', ''.join(nodelines)) | |
2268 | extra = '' |
|
2268 | extra = '' | |
2269 | if opts.get('user'): |
|
2269 | if opts.get('user'): | |
2270 | extra += ' --user %s' % util.shellquote(opts['user']) |
|
2270 | extra += ' --user %s' % util.shellquote(opts['user']) | |
2271 | if opts.get('date'): |
|
2271 | if opts.get('date'): | |
2272 | extra += ' --date %s' % util.shellquote(opts['date']) |
|
2272 | extra += ' --date %s' % util.shellquote(opts['date']) | |
2273 | if opts.get('log'): |
|
2273 | if opts.get('log'): | |
2274 | extra += ' --log' |
|
2274 | extra += ' --log' | |
2275 | hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra |
|
2275 | hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra | |
2276 | raise error.Abort( |
|
2276 | raise error.Abort( | |
2277 | _("unresolved conflicts, can't continue"), |
|
2277 | _("unresolved conflicts, can't continue"), | |
2278 | hint=hint) |
|
2278 | hint=hint) | |
2279 | else: |
|
2279 | else: | |
2280 | cont = False |
|
2280 | cont = False | |
2281 |
|
2281 | |||
2282 | # commit |
|
2282 | # commit | |
2283 | node = repo.commit(text=message, user=user, |
|
2283 | node = repo.commit(text=message, user=user, | |
2284 | date=date, extra=extra, editor=editor) |
|
2284 | date=date, extra=extra, editor=editor) | |
2285 | if node is None: |
|
2285 | if node is None: | |
2286 | ui.warn( |
|
2286 | ui.warn( | |
2287 | _('note: graft of %d:%s created no changes to commit\n') % |
|
2287 | _('note: graft of %d:%s created no changes to commit\n') % | |
2288 | (ctx.rev(), ctx)) |
|
2288 | (ctx.rev(), ctx)) | |
2289 |
|
2289 | |||
2290 | # remove state when we complete successfully |
|
2290 | # remove state when we complete successfully | |
2291 | if not opts.get('dry_run'): |
|
2291 | if not opts.get('dry_run'): | |
2292 | repo.vfs.unlinkpath('graftstate', ignoremissing=True) |
|
2292 | repo.vfs.unlinkpath('graftstate', ignoremissing=True) | |
2293 |
|
2293 | |||
2294 | return 0 |
|
2294 | return 0 | |
2295 |
|
2295 | |||
2296 | @command('grep', |
|
2296 | @command('grep', | |
2297 | [('0', 'print0', None, _('end fields with NUL')), |
|
2297 | [('0', 'print0', None, _('end fields with NUL')), | |
2298 | ('', 'all', None, _('print all revisions that match')), |
|
2298 | ('', 'all', None, _('print all revisions that match')), | |
2299 | ('a', 'text', None, _('treat all files as text')), |
|
2299 | ('a', 'text', None, _('treat all files as text')), | |
2300 | ('f', 'follow', None, |
|
2300 | ('f', 'follow', None, | |
2301 | _('follow changeset history,' |
|
2301 | _('follow changeset history,' | |
2302 | ' or file history across copies and renames')), |
|
2302 | ' or file history across copies and renames')), | |
2303 | ('i', 'ignore-case', None, _('ignore case when matching')), |
|
2303 | ('i', 'ignore-case', None, _('ignore case when matching')), | |
2304 | ('l', 'files-with-matches', None, |
|
2304 | ('l', 'files-with-matches', None, | |
2305 | _('print only filenames and revisions that match')), |
|
2305 | _('print only filenames and revisions that match')), | |
2306 | ('n', 'line-number', None, _('print matching line numbers')), |
|
2306 | ('n', 'line-number', None, _('print matching line numbers')), | |
2307 | ('r', 'rev', [], |
|
2307 | ('r', 'rev', [], | |
2308 | _('only search files changed within revision range'), _('REV')), |
|
2308 | _('only search files changed within revision range'), _('REV')), | |
2309 | ('u', 'user', None, _('list the author (long with -v)')), |
|
2309 | ('u', 'user', None, _('list the author (long with -v)')), | |
2310 | ('d', 'date', None, _('list the date (short with -q)')), |
|
2310 | ('d', 'date', None, _('list the date (short with -q)')), | |
2311 | ] + formatteropts + walkopts, |
|
2311 | ] + formatteropts + walkopts, | |
2312 | _('[OPTION]... PATTERN [FILE]...'), |
|
2312 | _('[OPTION]... PATTERN [FILE]...'), | |
2313 | inferrepo=True) |
|
2313 | inferrepo=True) | |
2314 | def grep(ui, repo, pattern, *pats, **opts): |
|
2314 | def grep(ui, repo, pattern, *pats, **opts): | |
2315 | """search revision history for a pattern in specified files |
|
2315 | """search revision history for a pattern in specified files | |
2316 |
|
2316 | |||
2317 | Search revision history for a regular expression in the specified |
|
2317 | Search revision history for a regular expression in the specified | |
2318 | files or the entire project. |
|
2318 | files or the entire project. | |
2319 |
|
2319 | |||
2320 | By default, grep prints the most recent revision number for each |
|
2320 | By default, grep prints the most recent revision number for each | |
2321 | file in which it finds a match. To get it to print every revision |
|
2321 | file in which it finds a match. To get it to print every revision | |
2322 | that contains a change in match status ("-" for a match that becomes |
|
2322 | that contains a change in match status ("-" for a match that becomes | |
2323 | a non-match, or "+" for a non-match that becomes a match), use the |
|
2323 | a non-match, or "+" for a non-match that becomes a match), use the | |
2324 | --all flag. |
|
2324 | --all flag. | |
2325 |
|
2325 | |||
2326 | PATTERN can be any Python (roughly Perl-compatible) regular |
|
2326 | PATTERN can be any Python (roughly Perl-compatible) regular | |
2327 | expression. |
|
2327 | expression. | |
2328 |
|
2328 | |||
2329 | If no FILEs are specified (and -f/--follow isn't set), all files in |
|
2329 | If no FILEs are specified (and -f/--follow isn't set), all files in | |
2330 | the repository are searched, including those that don't exist in the |
|
2330 | the repository are searched, including those that don't exist in the | |
2331 | current branch or have been deleted in a prior changeset. |
|
2331 | current branch or have been deleted in a prior changeset. | |
2332 |
|
2332 | |||
2333 | Returns 0 if a match is found, 1 otherwise. |
|
2333 | Returns 0 if a match is found, 1 otherwise. | |
2334 | """ |
|
2334 | """ | |
2335 | opts = pycompat.byteskwargs(opts) |
|
2335 | opts = pycompat.byteskwargs(opts) | |
2336 | reflags = re.M |
|
2336 | reflags = re.M | |
2337 | if opts.get('ignore_case'): |
|
2337 | if opts.get('ignore_case'): | |
2338 | reflags |= re.I |
|
2338 | reflags |= re.I | |
2339 | try: |
|
2339 | try: | |
2340 | regexp = util.re.compile(pattern, reflags) |
|
2340 | regexp = util.re.compile(pattern, reflags) | |
2341 | except re.error as inst: |
|
2341 | except re.error as inst: | |
2342 | ui.warn(_("grep: invalid match pattern: %s\n") % inst) |
|
2342 | ui.warn(_("grep: invalid match pattern: %s\n") % inst) | |
2343 | return 1 |
|
2343 | return 1 | |
2344 | sep, eol = ':', '\n' |
|
2344 | sep, eol = ':', '\n' | |
2345 | if opts.get('print0'): |
|
2345 | if opts.get('print0'): | |
2346 | sep = eol = '\0' |
|
2346 | sep = eol = '\0' | |
2347 |
|
2347 | |||
2348 | getfile = util.lrucachefunc(repo.file) |
|
2348 | getfile = util.lrucachefunc(repo.file) | |
2349 |
|
2349 | |||
2350 | def matchlines(body): |
|
2350 | def matchlines(body): | |
2351 | begin = 0 |
|
2351 | begin = 0 | |
2352 | linenum = 0 |
|
2352 | linenum = 0 | |
2353 | while begin < len(body): |
|
2353 | while begin < len(body): | |
2354 | match = regexp.search(body, begin) |
|
2354 | match = regexp.search(body, begin) | |
2355 | if not match: |
|
2355 | if not match: | |
2356 | break |
|
2356 | break | |
2357 | mstart, mend = match.span() |
|
2357 | mstart, mend = match.span() | |
2358 | linenum += body.count('\n', begin, mstart) + 1 |
|
2358 | linenum += body.count('\n', begin, mstart) + 1 | |
2359 | lstart = body.rfind('\n', begin, mstart) + 1 or begin |
|
2359 | lstart = body.rfind('\n', begin, mstart) + 1 or begin | |
2360 | begin = body.find('\n', mend) + 1 or len(body) + 1 |
|
2360 | begin = body.find('\n', mend) + 1 or len(body) + 1 | |
2361 | lend = begin - 1 |
|
2361 | lend = begin - 1 | |
2362 | yield linenum, mstart - lstart, mend - lstart, body[lstart:lend] |
|
2362 | yield linenum, mstart - lstart, mend - lstart, body[lstart:lend] | |
2363 |
|
2363 | |||
2364 | class linestate(object): |
|
2364 | class linestate(object): | |
2365 | def __init__(self, line, linenum, colstart, colend): |
|
2365 | def __init__(self, line, linenum, colstart, colend): | |
2366 | self.line = line |
|
2366 | self.line = line | |
2367 | self.linenum = linenum |
|
2367 | self.linenum = linenum | |
2368 | self.colstart = colstart |
|
2368 | self.colstart = colstart | |
2369 | self.colend = colend |
|
2369 | self.colend = colend | |
2370 |
|
2370 | |||
2371 | def __hash__(self): |
|
2371 | def __hash__(self): | |
2372 | return hash((self.linenum, self.line)) |
|
2372 | return hash((self.linenum, self.line)) | |
2373 |
|
2373 | |||
2374 | def __eq__(self, other): |
|
2374 | def __eq__(self, other): | |
2375 | return self.line == other.line |
|
2375 | return self.line == other.line | |
2376 |
|
2376 | |||
2377 | def findpos(self): |
|
2377 | def findpos(self): | |
2378 | """Iterate all (start, end) indices of matches""" |
|
2378 | """Iterate all (start, end) indices of matches""" | |
2379 | yield self.colstart, self.colend |
|
2379 | yield self.colstart, self.colend | |
2380 | p = self.colend |
|
2380 | p = self.colend | |
2381 | while p < len(self.line): |
|
2381 | while p < len(self.line): | |
2382 | m = regexp.search(self.line, p) |
|
2382 | m = regexp.search(self.line, p) | |
2383 | if not m: |
|
2383 | if not m: | |
2384 | break |
|
2384 | break | |
2385 | yield m.span() |
|
2385 | yield m.span() | |
2386 | p = m.end() |
|
2386 | p = m.end() | |
2387 |
|
2387 | |||
2388 | matches = {} |
|
2388 | matches = {} | |
2389 | copies = {} |
|
2389 | copies = {} | |
2390 | def grepbody(fn, rev, body): |
|
2390 | def grepbody(fn, rev, body): | |
2391 | matches[rev].setdefault(fn, []) |
|
2391 | matches[rev].setdefault(fn, []) | |
2392 | m = matches[rev][fn] |
|
2392 | m = matches[rev][fn] | |
2393 | for lnum, cstart, cend, line in matchlines(body): |
|
2393 | for lnum, cstart, cend, line in matchlines(body): | |
2394 | s = linestate(line, lnum, cstart, cend) |
|
2394 | s = linestate(line, lnum, cstart, cend) | |
2395 | m.append(s) |
|
2395 | m.append(s) | |
2396 |
|
2396 | |||
2397 | def difflinestates(a, b): |
|
2397 | def difflinestates(a, b): | |
2398 | sm = difflib.SequenceMatcher(None, a, b) |
|
2398 | sm = difflib.SequenceMatcher(None, a, b) | |
2399 | for tag, alo, ahi, blo, bhi in sm.get_opcodes(): |
|
2399 | for tag, alo, ahi, blo, bhi in sm.get_opcodes(): | |
2400 | if tag == 'insert': |
|
2400 | if tag == 'insert': | |
2401 | for i in xrange(blo, bhi): |
|
2401 | for i in xrange(blo, bhi): | |
2402 | yield ('+', b[i]) |
|
2402 | yield ('+', b[i]) | |
2403 | elif tag == 'delete': |
|
2403 | elif tag == 'delete': | |
2404 | for i in xrange(alo, ahi): |
|
2404 | for i in xrange(alo, ahi): | |
2405 | yield ('-', a[i]) |
|
2405 | yield ('-', a[i]) | |
2406 | elif tag == 'replace': |
|
2406 | elif tag == 'replace': | |
2407 | for i in xrange(alo, ahi): |
|
2407 | for i in xrange(alo, ahi): | |
2408 | yield ('-', a[i]) |
|
2408 | yield ('-', a[i]) | |
2409 | for i in xrange(blo, bhi): |
|
2409 | for i in xrange(blo, bhi): | |
2410 | yield ('+', b[i]) |
|
2410 | yield ('+', b[i]) | |
2411 |
|
2411 | |||
2412 | def display(fm, fn, ctx, pstates, states): |
|
2412 | def display(fm, fn, ctx, pstates, states): | |
2413 | rev = ctx.rev() |
|
2413 | rev = ctx.rev() | |
2414 | if fm.isplain(): |
|
2414 | if fm.isplain(): | |
2415 | formatuser = ui.shortuser |
|
2415 | formatuser = ui.shortuser | |
2416 | else: |
|
2416 | else: | |
2417 | formatuser = str |
|
2417 | formatuser = str | |
2418 | if ui.quiet: |
|
2418 | if ui.quiet: | |
2419 | datefmt = '%Y-%m-%d' |
|
2419 | datefmt = '%Y-%m-%d' | |
2420 | else: |
|
2420 | else: | |
2421 | datefmt = '%a %b %d %H:%M:%S %Y %1%2' |
|
2421 | datefmt = '%a %b %d %H:%M:%S %Y %1%2' | |
2422 | found = False |
|
2422 | found = False | |
2423 | @util.cachefunc |
|
2423 | @util.cachefunc | |
2424 | def binary(): |
|
2424 | def binary(): | |
2425 | flog = getfile(fn) |
|
2425 | flog = getfile(fn) | |
2426 | return util.binary(flog.read(ctx.filenode(fn))) |
|
2426 | return util.binary(flog.read(ctx.filenode(fn))) | |
2427 |
|
2427 | |||
2428 | fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'} |
|
2428 | fieldnamemap = {'filename': 'file', 'linenumber': 'line_number'} | |
2429 | if opts.get('all'): |
|
2429 | if opts.get('all'): | |
2430 | iter = difflinestates(pstates, states) |
|
2430 | iter = difflinestates(pstates, states) | |
2431 | else: |
|
2431 | else: | |
2432 | iter = [('', l) for l in states] |
|
2432 | iter = [('', l) for l in states] | |
2433 | for change, l in iter: |
|
2433 | for change, l in iter: | |
2434 | fm.startitem() |
|
2434 | fm.startitem() | |
2435 | fm.data(node=fm.hexfunc(ctx.node())) |
|
2435 | fm.data(node=fm.hexfunc(ctx.node())) | |
2436 | cols = [ |
|
2436 | cols = [ | |
2437 | ('filename', fn, True), |
|
2437 | ('filename', fn, True), | |
2438 | ('rev', rev, True), |
|
2438 | ('rev', rev, True), | |
2439 | ('linenumber', l.linenum, opts.get('line_number')), |
|
2439 | ('linenumber', l.linenum, opts.get('line_number')), | |
2440 | ] |
|
2440 | ] | |
2441 | if opts.get('all'): |
|
2441 | if opts.get('all'): | |
2442 | cols.append(('change', change, True)) |
|
2442 | cols.append(('change', change, True)) | |
2443 | cols.extend([ |
|
2443 | cols.extend([ | |
2444 | ('user', formatuser(ctx.user()), opts.get('user')), |
|
2444 | ('user', formatuser(ctx.user()), opts.get('user')), | |
2445 | ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')), |
|
2445 | ('date', fm.formatdate(ctx.date(), datefmt), opts.get('date')), | |
2446 | ]) |
|
2446 | ]) | |
2447 | lastcol = next(name for name, data, cond in reversed(cols) if cond) |
|
2447 | lastcol = next(name for name, data, cond in reversed(cols) if cond) | |
2448 | for name, data, cond in cols: |
|
2448 | for name, data, cond in cols: | |
2449 | field = fieldnamemap.get(name, name) |
|
2449 | field = fieldnamemap.get(name, name) | |
2450 | fm.condwrite(cond, field, '%s', data, label='grep.%s' % name) |
|
2450 | fm.condwrite(cond, field, '%s', data, label='grep.%s' % name) | |
2451 | if cond and name != lastcol: |
|
2451 | if cond and name != lastcol: | |
2452 | fm.plain(sep, label='grep.sep') |
|
2452 | fm.plain(sep, label='grep.sep') | |
2453 | if not opts.get('files_with_matches'): |
|
2453 | if not opts.get('files_with_matches'): | |
2454 | fm.plain(sep, label='grep.sep') |
|
2454 | fm.plain(sep, label='grep.sep') | |
2455 | if not opts.get('text') and binary(): |
|
2455 | if not opts.get('text') and binary(): | |
2456 | fm.plain(_(" Binary file matches")) |
|
2456 | fm.plain(_(" Binary file matches")) | |
2457 | else: |
|
2457 | else: | |
2458 | displaymatches(fm.nested('texts'), l) |
|
2458 | displaymatches(fm.nested('texts'), l) | |
2459 | fm.plain(eol) |
|
2459 | fm.plain(eol) | |
2460 | found = True |
|
2460 | found = True | |
2461 | if opts.get('files_with_matches'): |
|
2461 | if opts.get('files_with_matches'): | |
2462 | break |
|
2462 | break | |
2463 | return found |
|
2463 | return found | |
2464 |
|
2464 | |||
2465 | def displaymatches(fm, l): |
|
2465 | def displaymatches(fm, l): | |
2466 | p = 0 |
|
2466 | p = 0 | |
2467 | for s, e in l.findpos(): |
|
2467 | for s, e in l.findpos(): | |
2468 | if p < s: |
|
2468 | if p < s: | |
2469 | fm.startitem() |
|
2469 | fm.startitem() | |
2470 | fm.write('text', '%s', l.line[p:s]) |
|
2470 | fm.write('text', '%s', l.line[p:s]) | |
2471 | fm.data(matched=False) |
|
2471 | fm.data(matched=False) | |
2472 | fm.startitem() |
|
2472 | fm.startitem() | |
2473 | fm.write('text', '%s', l.line[s:e], label='grep.match') |
|
2473 | fm.write('text', '%s', l.line[s:e], label='grep.match') | |
2474 | fm.data(matched=True) |
|
2474 | fm.data(matched=True) | |
2475 | p = e |
|
2475 | p = e | |
2476 | if p < len(l.line): |
|
2476 | if p < len(l.line): | |
2477 | fm.startitem() |
|
2477 | fm.startitem() | |
2478 | fm.write('text', '%s', l.line[p:]) |
|
2478 | fm.write('text', '%s', l.line[p:]) | |
2479 | fm.data(matched=False) |
|
2479 | fm.data(matched=False) | |
2480 | fm.end() |
|
2480 | fm.end() | |
2481 |
|
2481 | |||
2482 | skip = {} |
|
2482 | skip = {} | |
2483 | revfiles = {} |
|
2483 | revfiles = {} | |
2484 | matchfn = scmutil.match(repo[None], pats, opts) |
|
2484 | matchfn = scmutil.match(repo[None], pats, opts) | |
2485 | found = False |
|
2485 | found = False | |
2486 | follow = opts.get('follow') |
|
2486 | follow = opts.get('follow') | |
2487 |
|
2487 | |||
2488 | def prep(ctx, fns): |
|
2488 | def prep(ctx, fns): | |
2489 | rev = ctx.rev() |
|
2489 | rev = ctx.rev() | |
2490 | pctx = ctx.p1() |
|
2490 | pctx = ctx.p1() | |
2491 | parent = pctx.rev() |
|
2491 | parent = pctx.rev() | |
2492 | matches.setdefault(rev, {}) |
|
2492 | matches.setdefault(rev, {}) | |
2493 | matches.setdefault(parent, {}) |
|
2493 | matches.setdefault(parent, {}) | |
2494 | files = revfiles.setdefault(rev, []) |
|
2494 | files = revfiles.setdefault(rev, []) | |
2495 | for fn in fns: |
|
2495 | for fn in fns: | |
2496 | flog = getfile(fn) |
|
2496 | flog = getfile(fn) | |
2497 | try: |
|
2497 | try: | |
2498 | fnode = ctx.filenode(fn) |
|
2498 | fnode = ctx.filenode(fn) | |
2499 | except error.LookupError: |
|
2499 | except error.LookupError: | |
2500 | continue |
|
2500 | continue | |
2501 |
|
2501 | |||
2502 | copied = flog.renamed(fnode) |
|
2502 | copied = flog.renamed(fnode) | |
2503 | copy = follow and copied and copied[0] |
|
2503 | copy = follow and copied and copied[0] | |
2504 | if copy: |
|
2504 | if copy: | |
2505 | copies.setdefault(rev, {})[fn] = copy |
|
2505 | copies.setdefault(rev, {})[fn] = copy | |
2506 | if fn in skip: |
|
2506 | if fn in skip: | |
2507 | if copy: |
|
2507 | if copy: | |
2508 | skip[copy] = True |
|
2508 | skip[copy] = True | |
2509 | continue |
|
2509 | continue | |
2510 | files.append(fn) |
|
2510 | files.append(fn) | |
2511 |
|
2511 | |||
2512 | if fn not in matches[rev]: |
|
2512 | if fn not in matches[rev]: | |
2513 | grepbody(fn, rev, flog.read(fnode)) |
|
2513 | grepbody(fn, rev, flog.read(fnode)) | |
2514 |
|
2514 | |||
2515 | pfn = copy or fn |
|
2515 | pfn = copy or fn | |
2516 | if pfn not in matches[parent]: |
|
2516 | if pfn not in matches[parent]: | |
2517 | try: |
|
2517 | try: | |
2518 | fnode = pctx.filenode(pfn) |
|
2518 | fnode = pctx.filenode(pfn) | |
2519 | grepbody(pfn, parent, flog.read(fnode)) |
|
2519 | grepbody(pfn, parent, flog.read(fnode)) | |
2520 | except error.LookupError: |
|
2520 | except error.LookupError: | |
2521 | pass |
|
2521 | pass | |
2522 |
|
2522 | |||
2523 | ui.pager('grep') |
|
2523 | ui.pager('grep') | |
2524 | fm = ui.formatter('grep', opts) |
|
2524 | fm = ui.formatter('grep', opts) | |
2525 | for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep): |
|
2525 | for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep): | |
2526 | rev = ctx.rev() |
|
2526 | rev = ctx.rev() | |
2527 | parent = ctx.p1().rev() |
|
2527 | parent = ctx.p1().rev() | |
2528 | for fn in sorted(revfiles.get(rev, [])): |
|
2528 | for fn in sorted(revfiles.get(rev, [])): | |
2529 | states = matches[rev][fn] |
|
2529 | states = matches[rev][fn] | |
2530 | copy = copies.get(rev, {}).get(fn) |
|
2530 | copy = copies.get(rev, {}).get(fn) | |
2531 | if fn in skip: |
|
2531 | if fn in skip: | |
2532 | if copy: |
|
2532 | if copy: | |
2533 | skip[copy] = True |
|
2533 | skip[copy] = True | |
2534 | continue |
|
2534 | continue | |
2535 | pstates = matches.get(parent, {}).get(copy or fn, []) |
|
2535 | pstates = matches.get(parent, {}).get(copy or fn, []) | |
2536 | if pstates or states: |
|
2536 | if pstates or states: | |
2537 | r = display(fm, fn, ctx, pstates, states) |
|
2537 | r = display(fm, fn, ctx, pstates, states) | |
2538 | found = found or r |
|
2538 | found = found or r | |
2539 | if r and not opts.get('all'): |
|
2539 | if r and not opts.get('all'): | |
2540 | skip[fn] = True |
|
2540 | skip[fn] = True | |
2541 | if copy: |
|
2541 | if copy: | |
2542 | skip[copy] = True |
|
2542 | skip[copy] = True | |
2543 | del matches[rev] |
|
2543 | del matches[rev] | |
2544 | del revfiles[rev] |
|
2544 | del revfiles[rev] | |
2545 | fm.end() |
|
2545 | fm.end() | |
2546 |
|
2546 | |||
2547 | return not found |
|
2547 | return not found | |
2548 |
|
2548 | |||
2549 | @command('heads', |
|
2549 | @command('heads', | |
2550 | [('r', 'rev', '', |
|
2550 | [('r', 'rev', '', | |
2551 | _('show only heads which are descendants of STARTREV'), _('STARTREV')), |
|
2551 | _('show only heads which are descendants of STARTREV'), _('STARTREV')), | |
2552 | ('t', 'topo', False, _('show topological heads only')), |
|
2552 | ('t', 'topo', False, _('show topological heads only')), | |
2553 | ('a', 'active', False, _('show active branchheads only (DEPRECATED)')), |
|
2553 | ('a', 'active', False, _('show active branchheads only (DEPRECATED)')), | |
2554 | ('c', 'closed', False, _('show normal and closed branch heads')), |
|
2554 | ('c', 'closed', False, _('show normal and closed branch heads')), | |
2555 | ] + templateopts, |
|
2555 | ] + templateopts, | |
2556 | _('[-ct] [-r STARTREV] [REV]...')) |
|
2556 | _('[-ct] [-r STARTREV] [REV]...')) | |
2557 | def heads(ui, repo, *branchrevs, **opts): |
|
2557 | def heads(ui, repo, *branchrevs, **opts): | |
2558 | """show branch heads |
|
2558 | """show branch heads | |
2559 |
|
2559 | |||
2560 | With no arguments, show all open branch heads in the repository. |
|
2560 | With no arguments, show all open branch heads in the repository. | |
2561 | Branch heads are changesets that have no descendants on the |
|
2561 | Branch heads are changesets that have no descendants on the | |
2562 | same branch. They are where development generally takes place and |
|
2562 | same branch. They are where development generally takes place and | |
2563 | are the usual targets for update and merge operations. |
|
2563 | are the usual targets for update and merge operations. | |
2564 |
|
2564 | |||
2565 | If one or more REVs are given, only open branch heads on the |
|
2565 | If one or more REVs are given, only open branch heads on the | |
2566 | branches associated with the specified changesets are shown. This |
|
2566 | branches associated with the specified changesets are shown. This | |
2567 | means that you can use :hg:`heads .` to see the heads on the |
|
2567 | means that you can use :hg:`heads .` to see the heads on the | |
2568 | currently checked-out branch. |
|
2568 | currently checked-out branch. | |
2569 |
|
2569 | |||
2570 | If -c/--closed is specified, also show branch heads marked closed |
|
2570 | If -c/--closed is specified, also show branch heads marked closed | |
2571 | (see :hg:`commit --close-branch`). |
|
2571 | (see :hg:`commit --close-branch`). | |
2572 |
|
2572 | |||
2573 | If STARTREV is specified, only those heads that are descendants of |
|
2573 | If STARTREV is specified, only those heads that are descendants of | |
2574 | STARTREV will be displayed. |
|
2574 | STARTREV will be displayed. | |
2575 |
|
2575 | |||
2576 | If -t/--topo is specified, named branch mechanics will be ignored and only |
|
2576 | If -t/--topo is specified, named branch mechanics will be ignored and only | |
2577 | topological heads (changesets with no children) will be shown. |
|
2577 | topological heads (changesets with no children) will be shown. | |
2578 |
|
2578 | |||
2579 | Returns 0 if matching heads are found, 1 if not. |
|
2579 | Returns 0 if matching heads are found, 1 if not. | |
2580 | """ |
|
2580 | """ | |
2581 |
|
2581 | |||
2582 | opts = pycompat.byteskwargs(opts) |
|
2582 | opts = pycompat.byteskwargs(opts) | |
2583 | start = None |
|
2583 | start = None | |
2584 | if 'rev' in opts: |
|
2584 | if 'rev' in opts: | |
2585 | start = scmutil.revsingle(repo, opts['rev'], None).node() |
|
2585 | start = scmutil.revsingle(repo, opts['rev'], None).node() | |
2586 |
|
2586 | |||
2587 | if opts.get('topo'): |
|
2587 | if opts.get('topo'): | |
2588 | heads = [repo[h] for h in repo.heads(start)] |
|
2588 | heads = [repo[h] for h in repo.heads(start)] | |
2589 | else: |
|
2589 | else: | |
2590 | heads = [] |
|
2590 | heads = [] | |
2591 | for branch in repo.branchmap(): |
|
2591 | for branch in repo.branchmap(): | |
2592 | heads += repo.branchheads(branch, start, opts.get('closed')) |
|
2592 | heads += repo.branchheads(branch, start, opts.get('closed')) | |
2593 | heads = [repo[h] for h in heads] |
|
2593 | heads = [repo[h] for h in heads] | |
2594 |
|
2594 | |||
2595 | if branchrevs: |
|
2595 | if branchrevs: | |
2596 | branches = set(repo[br].branch() for br in branchrevs) |
|
2596 | branches = set(repo[br].branch() for br in branchrevs) | |
2597 | heads = [h for h in heads if h.branch() in branches] |
|
2597 | heads = [h for h in heads if h.branch() in branches] | |
2598 |
|
2598 | |||
2599 | if opts.get('active') and branchrevs: |
|
2599 | if opts.get('active') and branchrevs: | |
2600 | dagheads = repo.heads(start) |
|
2600 | dagheads = repo.heads(start) | |
2601 | heads = [h for h in heads if h.node() in dagheads] |
|
2601 | heads = [h for h in heads if h.node() in dagheads] | |
2602 |
|
2602 | |||
2603 | if branchrevs: |
|
2603 | if branchrevs: | |
2604 | haveheads = set(h.branch() for h in heads) |
|
2604 | haveheads = set(h.branch() for h in heads) | |
2605 | if branches - haveheads: |
|
2605 | if branches - haveheads: | |
2606 | headless = ', '.join(b for b in branches - haveheads) |
|
2606 | headless = ', '.join(b for b in branches - haveheads) | |
2607 | msg = _('no open branch heads found on branches %s') |
|
2607 | msg = _('no open branch heads found on branches %s') | |
2608 | if opts.get('rev'): |
|
2608 | if opts.get('rev'): | |
2609 | msg += _(' (started at %s)') % opts['rev'] |
|
2609 | msg += _(' (started at %s)') % opts['rev'] | |
2610 | ui.warn((msg + '\n') % headless) |
|
2610 | ui.warn((msg + '\n') % headless) | |
2611 |
|
2611 | |||
2612 | if not heads: |
|
2612 | if not heads: | |
2613 | return 1 |
|
2613 | return 1 | |
2614 |
|
2614 | |||
2615 | ui.pager('heads') |
|
2615 | ui.pager('heads') | |
2616 | heads = sorted(heads, key=lambda x: -x.rev()) |
|
2616 | heads = sorted(heads, key=lambda x: -x.rev()) | |
2617 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
2617 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
2618 | for ctx in heads: |
|
2618 | for ctx in heads: | |
2619 | displayer.show(ctx) |
|
2619 | displayer.show(ctx) | |
2620 | displayer.close() |
|
2620 | displayer.close() | |
2621 |
|
2621 | |||
2622 | @command('help', |
|
2622 | @command('help', | |
2623 | [('e', 'extension', None, _('show only help for extensions')), |
|
2623 | [('e', 'extension', None, _('show only help for extensions')), | |
2624 | ('c', 'command', None, _('show only help for commands')), |
|
2624 | ('c', 'command', None, _('show only help for commands')), | |
2625 | ('k', 'keyword', None, _('show topics matching keyword')), |
|
2625 | ('k', 'keyword', None, _('show topics matching keyword')), | |
2626 | ('s', 'system', [], _('show help for specific platform(s)')), |
|
2626 | ('s', 'system', [], _('show help for specific platform(s)')), | |
2627 | ], |
|
2627 | ], | |
2628 | _('[-ecks] [TOPIC]'), |
|
2628 | _('[-ecks] [TOPIC]'), | |
2629 | norepo=True) |
|
2629 | norepo=True) | |
2630 | def help_(ui, name=None, **opts): |
|
2630 | def help_(ui, name=None, **opts): | |
2631 | """show help for a given topic or a help overview |
|
2631 | """show help for a given topic or a help overview | |
2632 |
|
2632 | |||
2633 | With no arguments, print a list of commands with short help messages. |
|
2633 | With no arguments, print a list of commands with short help messages. | |
2634 |
|
2634 | |||
2635 | Given a topic, extension, or command name, print help for that |
|
2635 | Given a topic, extension, or command name, print help for that | |
2636 | topic. |
|
2636 | topic. | |
2637 |
|
2637 | |||
2638 | Returns 0 if successful. |
|
2638 | Returns 0 if successful. | |
2639 | """ |
|
2639 | """ | |
2640 |
|
2640 | |||
2641 | keep = opts.get(r'system') or [] |
|
2641 | keep = opts.get(r'system') or [] | |
2642 | if len(keep) == 0: |
|
2642 | if len(keep) == 0: | |
2643 | if pycompat.sysplatform.startswith('win'): |
|
2643 | if pycompat.sysplatform.startswith('win'): | |
2644 | keep.append('windows') |
|
2644 | keep.append('windows') | |
2645 | elif pycompat.sysplatform == 'OpenVMS': |
|
2645 | elif pycompat.sysplatform == 'OpenVMS': | |
2646 | keep.append('vms') |
|
2646 | keep.append('vms') | |
2647 | elif pycompat.sysplatform == 'plan9': |
|
2647 | elif pycompat.sysplatform == 'plan9': | |
2648 | keep.append('plan9') |
|
2648 | keep.append('plan9') | |
2649 | else: |
|
2649 | else: | |
2650 | keep.append('unix') |
|
2650 | keep.append('unix') | |
2651 | keep.append(pycompat.sysplatform.lower()) |
|
2651 | keep.append(pycompat.sysplatform.lower()) | |
2652 | if ui.verbose: |
|
2652 | if ui.verbose: | |
2653 | keep.append('verbose') |
|
2653 | keep.append('verbose') | |
2654 |
|
2654 | |||
2655 | commands = sys.modules[__name__] |
|
2655 | commands = sys.modules[__name__] | |
2656 | formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts) |
|
2656 | formatted = help.formattedhelp(ui, commands, name, keep=keep, **opts) | |
2657 | ui.pager('help') |
|
2657 | ui.pager('help') | |
2658 | ui.write(formatted) |
|
2658 | ui.write(formatted) | |
2659 |
|
2659 | |||
2660 |
|
2660 | |||
2661 | @command('identify|id', |
|
2661 | @command('identify|id', | |
2662 | [('r', 'rev', '', |
|
2662 | [('r', 'rev', '', | |
2663 | _('identify the specified revision'), _('REV')), |
|
2663 | _('identify the specified revision'), _('REV')), | |
2664 | ('n', 'num', None, _('show local revision number')), |
|
2664 | ('n', 'num', None, _('show local revision number')), | |
2665 | ('i', 'id', None, _('show global revision id')), |
|
2665 | ('i', 'id', None, _('show global revision id')), | |
2666 | ('b', 'branch', None, _('show branch')), |
|
2666 | ('b', 'branch', None, _('show branch')), | |
2667 | ('t', 'tags', None, _('show tags')), |
|
2667 | ('t', 'tags', None, _('show tags')), | |
2668 | ('B', 'bookmarks', None, _('show bookmarks')), |
|
2668 | ('B', 'bookmarks', None, _('show bookmarks')), | |
2669 | ] + remoteopts + formatteropts, |
|
2669 | ] + remoteopts + formatteropts, | |
2670 | _('[-nibtB] [-r REV] [SOURCE]'), |
|
2670 | _('[-nibtB] [-r REV] [SOURCE]'), | |
2671 | optionalrepo=True) |
|
2671 | optionalrepo=True) | |
2672 | def identify(ui, repo, source=None, rev=None, |
|
2672 | def identify(ui, repo, source=None, rev=None, | |
2673 | num=None, id=None, branch=None, tags=None, bookmarks=None, **opts): |
|
2673 | num=None, id=None, branch=None, tags=None, bookmarks=None, **opts): | |
2674 | """identify the working directory or specified revision |
|
2674 | """identify the working directory or specified revision | |
2675 |
|
2675 | |||
2676 | Print a summary identifying the repository state at REV using one or |
|
2676 | Print a summary identifying the repository state at REV using one or | |
2677 | two parent hash identifiers, followed by a "+" if the working |
|
2677 | two parent hash identifiers, followed by a "+" if the working | |
2678 | directory has uncommitted changes, the branch name (if not default), |
|
2678 | directory has uncommitted changes, the branch name (if not default), | |
2679 | a list of tags, and a list of bookmarks. |
|
2679 | a list of tags, and a list of bookmarks. | |
2680 |
|
2680 | |||
2681 | When REV is not given, print a summary of the current state of the |
|
2681 | When REV is not given, print a summary of the current state of the | |
2682 | repository. |
|
2682 | repository. | |
2683 |
|
2683 | |||
2684 | Specifying a path to a repository root or Mercurial bundle will |
|
2684 | Specifying a path to a repository root or Mercurial bundle will | |
2685 | cause lookup to operate on that repository/bundle. |
|
2685 | cause lookup to operate on that repository/bundle. | |
2686 |
|
2686 | |||
2687 | .. container:: verbose |
|
2687 | .. container:: verbose | |
2688 |
|
2688 | |||
2689 | Examples: |
|
2689 | Examples: | |
2690 |
|
2690 | |||
2691 | - generate a build identifier for the working directory:: |
|
2691 | - generate a build identifier for the working directory:: | |
2692 |
|
2692 | |||
2693 | hg id --id > build-id.dat |
|
2693 | hg id --id > build-id.dat | |
2694 |
|
2694 | |||
2695 | - find the revision corresponding to a tag:: |
|
2695 | - find the revision corresponding to a tag:: | |
2696 |
|
2696 | |||
2697 | hg id -n -r 1.3 |
|
2697 | hg id -n -r 1.3 | |
2698 |
|
2698 | |||
2699 | - check the most recent revision of a remote repository:: |
|
2699 | - check the most recent revision of a remote repository:: | |
2700 |
|
2700 | |||
2701 | hg id -r tip https://www.mercurial-scm.org/repo/hg/ |
|
2701 | hg id -r tip https://www.mercurial-scm.org/repo/hg/ | |
2702 |
|
2702 | |||
2703 | See :hg:`log` for generating more information about specific revisions, |
|
2703 | See :hg:`log` for generating more information about specific revisions, | |
2704 | including full hash identifiers. |
|
2704 | including full hash identifiers. | |
2705 |
|
2705 | |||
2706 | Returns 0 if successful. |
|
2706 | Returns 0 if successful. | |
2707 | """ |
|
2707 | """ | |
2708 |
|
2708 | |||
2709 | opts = pycompat.byteskwargs(opts) |
|
2709 | opts = pycompat.byteskwargs(opts) | |
2710 | if not repo and not source: |
|
2710 | if not repo and not source: | |
2711 | raise error.Abort(_("there is no Mercurial repository here " |
|
2711 | raise error.Abort(_("there is no Mercurial repository here " | |
2712 | "(.hg not found)")) |
|
2712 | "(.hg not found)")) | |
2713 |
|
2713 | |||
2714 | if ui.debugflag: |
|
2714 | if ui.debugflag: | |
2715 | hexfunc = hex |
|
2715 | hexfunc = hex | |
2716 | else: |
|
2716 | else: | |
2717 | hexfunc = short |
|
2717 | hexfunc = short | |
2718 | default = not (num or id or branch or tags or bookmarks) |
|
2718 | default = not (num or id or branch or tags or bookmarks) | |
2719 | output = [] |
|
2719 | output = [] | |
2720 | revs = [] |
|
2720 | revs = [] | |
2721 |
|
2721 | |||
2722 | if source: |
|
2722 | if source: | |
2723 | source, branches = hg.parseurl(ui.expandpath(source)) |
|
2723 | source, branches = hg.parseurl(ui.expandpath(source)) | |
2724 | peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo |
|
2724 | peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo | |
2725 | repo = peer.local() |
|
2725 | repo = peer.local() | |
2726 | revs, checkout = hg.addbranchrevs(repo, peer, branches, None) |
|
2726 | revs, checkout = hg.addbranchrevs(repo, peer, branches, None) | |
2727 |
|
2727 | |||
2728 | fm = ui.formatter('identify', opts) |
|
2728 | fm = ui.formatter('identify', opts) | |
2729 | fm.startitem() |
|
2729 | fm.startitem() | |
2730 |
|
2730 | |||
2731 | if not repo: |
|
2731 | if not repo: | |
2732 | if num or branch or tags: |
|
2732 | if num or branch or tags: | |
2733 | raise error.Abort( |
|
2733 | raise error.Abort( | |
2734 | _("can't query remote revision number, branch, or tags")) |
|
2734 | _("can't query remote revision number, branch, or tags")) | |
2735 | if not rev and revs: |
|
2735 | if not rev and revs: | |
2736 | rev = revs[0] |
|
2736 | rev = revs[0] | |
2737 | if not rev: |
|
2737 | if not rev: | |
2738 | rev = "tip" |
|
2738 | rev = "tip" | |
2739 |
|
2739 | |||
2740 | remoterev = peer.lookup(rev) |
|
2740 | remoterev = peer.lookup(rev) | |
2741 | hexrev = hexfunc(remoterev) |
|
2741 | hexrev = hexfunc(remoterev) | |
2742 | if default or id: |
|
2742 | if default or id: | |
2743 | output = [hexrev] |
|
2743 | output = [hexrev] | |
2744 | fm.data(id=hexrev) |
|
2744 | fm.data(id=hexrev) | |
2745 |
|
2745 | |||
2746 | def getbms(): |
|
2746 | def getbms(): | |
2747 | bms = [] |
|
2747 | bms = [] | |
2748 |
|
2748 | |||
2749 | if 'bookmarks' in peer.listkeys('namespaces'): |
|
2749 | if 'bookmarks' in peer.listkeys('namespaces'): | |
2750 | hexremoterev = hex(remoterev) |
|
2750 | hexremoterev = hex(remoterev) | |
2751 | bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems() |
|
2751 | bms = [bm for bm, bmr in peer.listkeys('bookmarks').iteritems() | |
2752 | if bmr == hexremoterev] |
|
2752 | if bmr == hexremoterev] | |
2753 |
|
2753 | |||
2754 | return sorted(bms) |
|
2754 | return sorted(bms) | |
2755 |
|
2755 | |||
2756 | bms = getbms() |
|
2756 | bms = getbms() | |
2757 | if bookmarks: |
|
2757 | if bookmarks: | |
2758 | output.extend(bms) |
|
2758 | output.extend(bms) | |
2759 | elif default and not ui.quiet: |
|
2759 | elif default and not ui.quiet: | |
2760 | # multiple bookmarks for a single parent separated by '/' |
|
2760 | # multiple bookmarks for a single parent separated by '/' | |
2761 | bm = '/'.join(bms) |
|
2761 | bm = '/'.join(bms) | |
2762 | if bm: |
|
2762 | if bm: | |
2763 | output.append(bm) |
|
2763 | output.append(bm) | |
2764 |
|
2764 | |||
2765 | fm.data(node=hex(remoterev)) |
|
2765 | fm.data(node=hex(remoterev)) | |
2766 | fm.data(bookmarks=fm.formatlist(bms, name='bookmark')) |
|
2766 | fm.data(bookmarks=fm.formatlist(bms, name='bookmark')) | |
2767 | else: |
|
2767 | else: | |
2768 | ctx = scmutil.revsingle(repo, rev, None) |
|
2768 | ctx = scmutil.revsingle(repo, rev, None) | |
2769 |
|
2769 | |||
2770 | if ctx.rev() is None: |
|
2770 | if ctx.rev() is None: | |
2771 | ctx = repo[None] |
|
2771 | ctx = repo[None] | |
2772 | parents = ctx.parents() |
|
2772 | parents = ctx.parents() | |
2773 | taglist = [] |
|
2773 | taglist = [] | |
2774 | for p in parents: |
|
2774 | for p in parents: | |
2775 | taglist.extend(p.tags()) |
|
2775 | taglist.extend(p.tags()) | |
2776 |
|
2776 | |||
2777 | dirty = "" |
|
2777 | dirty = "" | |
2778 | if ctx.dirty(missing=True, merge=False, branch=False): |
|
2778 | if ctx.dirty(missing=True, merge=False, branch=False): | |
2779 | dirty = '+' |
|
2779 | dirty = '+' | |
2780 | fm.data(dirty=dirty) |
|
2780 | fm.data(dirty=dirty) | |
2781 |
|
2781 | |||
2782 | hexoutput = [hexfunc(p.node()) for p in parents] |
|
2782 | hexoutput = [hexfunc(p.node()) for p in parents] | |
2783 | if default or id: |
|
2783 | if default or id: | |
2784 | output = ["%s%s" % ('+'.join(hexoutput), dirty)] |
|
2784 | output = ["%s%s" % ('+'.join(hexoutput), dirty)] | |
2785 | fm.data(id="%s%s" % ('+'.join(hexoutput), dirty)) |
|
2785 | fm.data(id="%s%s" % ('+'.join(hexoutput), dirty)) | |
2786 |
|
2786 | |||
2787 | if num: |
|
2787 | if num: | |
2788 | numoutput = ["%d" % p.rev() for p in parents] |
|
2788 | numoutput = ["%d" % p.rev() for p in parents] | |
2789 | output.append("%s%s" % ('+'.join(numoutput), dirty)) |
|
2789 | output.append("%s%s" % ('+'.join(numoutput), dirty)) | |
2790 |
|
2790 | |||
2791 | fn = fm.nested('parents') |
|
2791 | fn = fm.nested('parents') | |
2792 | for p in parents: |
|
2792 | for p in parents: | |
2793 | fn.startitem() |
|
2793 | fn.startitem() | |
2794 | fn.data(rev=p.rev()) |
|
2794 | fn.data(rev=p.rev()) | |
2795 | fn.data(node=p.hex()) |
|
2795 | fn.data(node=p.hex()) | |
2796 | fn.context(ctx=p) |
|
2796 | fn.context(ctx=p) | |
2797 | fn.end() |
|
2797 | fn.end() | |
2798 | else: |
|
2798 | else: | |
2799 | hexoutput = hexfunc(ctx.node()) |
|
2799 | hexoutput = hexfunc(ctx.node()) | |
2800 | if default or id: |
|
2800 | if default or id: | |
2801 | output = [hexoutput] |
|
2801 | output = [hexoutput] | |
2802 | fm.data(id=hexoutput) |
|
2802 | fm.data(id=hexoutput) | |
2803 |
|
2803 | |||
2804 | if num: |
|
2804 | if num: | |
2805 | output.append(pycompat.bytestr(ctx.rev())) |
|
2805 | output.append(pycompat.bytestr(ctx.rev())) | |
2806 | taglist = ctx.tags() |
|
2806 | taglist = ctx.tags() | |
2807 |
|
2807 | |||
2808 | if default and not ui.quiet: |
|
2808 | if default and not ui.quiet: | |
2809 | b = ctx.branch() |
|
2809 | b = ctx.branch() | |
2810 | if b != 'default': |
|
2810 | if b != 'default': | |
2811 | output.append("(%s)" % b) |
|
2811 | output.append("(%s)" % b) | |
2812 |
|
2812 | |||
2813 | # multiple tags for a single parent separated by '/' |
|
2813 | # multiple tags for a single parent separated by '/' | |
2814 | t = '/'.join(taglist) |
|
2814 | t = '/'.join(taglist) | |
2815 | if t: |
|
2815 | if t: | |
2816 | output.append(t) |
|
2816 | output.append(t) | |
2817 |
|
2817 | |||
2818 | # multiple bookmarks for a single parent separated by '/' |
|
2818 | # multiple bookmarks for a single parent separated by '/' | |
2819 | bm = '/'.join(ctx.bookmarks()) |
|
2819 | bm = '/'.join(ctx.bookmarks()) | |
2820 | if bm: |
|
2820 | if bm: | |
2821 | output.append(bm) |
|
2821 | output.append(bm) | |
2822 | else: |
|
2822 | else: | |
2823 | if branch: |
|
2823 | if branch: | |
2824 | output.append(ctx.branch()) |
|
2824 | output.append(ctx.branch()) | |
2825 |
|
2825 | |||
2826 | if tags: |
|
2826 | if tags: | |
2827 | output.extend(taglist) |
|
2827 | output.extend(taglist) | |
2828 |
|
2828 | |||
2829 | if bookmarks: |
|
2829 | if bookmarks: | |
2830 | output.extend(ctx.bookmarks()) |
|
2830 | output.extend(ctx.bookmarks()) | |
2831 |
|
2831 | |||
2832 | fm.data(node=ctx.hex()) |
|
2832 | fm.data(node=ctx.hex()) | |
2833 | fm.data(branch=ctx.branch()) |
|
2833 | fm.data(branch=ctx.branch()) | |
2834 | fm.data(tags=fm.formatlist(taglist, name='tag', sep=':')) |
|
2834 | fm.data(tags=fm.formatlist(taglist, name='tag', sep=':')) | |
2835 | fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark')) |
|
2835 | fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name='bookmark')) | |
2836 | fm.context(ctx=ctx) |
|
2836 | fm.context(ctx=ctx) | |
2837 |
|
2837 | |||
2838 | fm.plain("%s\n" % ' '.join(output)) |
|
2838 | fm.plain("%s\n" % ' '.join(output)) | |
2839 | fm.end() |
|
2839 | fm.end() | |
2840 |
|
2840 | |||
2841 | @command('import|patch', |
|
2841 | @command('import|patch', | |
2842 | [('p', 'strip', 1, |
|
2842 | [('p', 'strip', 1, | |
2843 | _('directory strip option for patch. This has the same ' |
|
2843 | _('directory strip option for patch. This has the same ' | |
2844 | 'meaning as the corresponding patch option'), _('NUM')), |
|
2844 | 'meaning as the corresponding patch option'), _('NUM')), | |
2845 | ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')), |
|
2845 | ('b', 'base', '', _('base path (DEPRECATED)'), _('PATH')), | |
2846 | ('e', 'edit', False, _('invoke editor on commit messages')), |
|
2846 | ('e', 'edit', False, _('invoke editor on commit messages')), | |
2847 | ('f', 'force', None, |
|
2847 | ('f', 'force', None, | |
2848 | _('skip check for outstanding uncommitted changes (DEPRECATED)')), |
|
2848 | _('skip check for outstanding uncommitted changes (DEPRECATED)')), | |
2849 | ('', 'no-commit', None, |
|
2849 | ('', 'no-commit', None, | |
2850 | _("don't commit, just update the working directory")), |
|
2850 | _("don't commit, just update the working directory")), | |
2851 | ('', 'bypass', None, |
|
2851 | ('', 'bypass', None, | |
2852 | _("apply patch without touching the working directory")), |
|
2852 | _("apply patch without touching the working directory")), | |
2853 | ('', 'partial', None, |
|
2853 | ('', 'partial', None, | |
2854 | _('commit even if some hunks fail')), |
|
2854 | _('commit even if some hunks fail')), | |
2855 | ('', 'exact', None, |
|
2855 | ('', 'exact', None, | |
2856 | _('abort if patch would apply lossily')), |
|
2856 | _('abort if patch would apply lossily')), | |
2857 | ('', 'prefix', '', |
|
2857 | ('', 'prefix', '', | |
2858 | _('apply patch to subdirectory'), _('DIR')), |
|
2858 | _('apply patch to subdirectory'), _('DIR')), | |
2859 | ('', 'import-branch', None, |
|
2859 | ('', 'import-branch', None, | |
2860 | _('use any branch information in patch (implied by --exact)'))] + |
|
2860 | _('use any branch information in patch (implied by --exact)'))] + | |
2861 | commitopts + commitopts2 + similarityopts, |
|
2861 | commitopts + commitopts2 + similarityopts, | |
2862 | _('[OPTION]... PATCH...')) |
|
2862 | _('[OPTION]... PATCH...')) | |
2863 | def import_(ui, repo, patch1=None, *patches, **opts): |
|
2863 | def import_(ui, repo, patch1=None, *patches, **opts): | |
2864 | """import an ordered set of patches |
|
2864 | """import an ordered set of patches | |
2865 |
|
2865 | |||
2866 | Import a list of patches and commit them individually (unless |
|
2866 | Import a list of patches and commit them individually (unless | |
2867 | --no-commit is specified). |
|
2867 | --no-commit is specified). | |
2868 |
|
2868 | |||
2869 | To read a patch from standard input (stdin), use "-" as the patch |
|
2869 | To read a patch from standard input (stdin), use "-" as the patch | |
2870 | name. If a URL is specified, the patch will be downloaded from |
|
2870 | name. If a URL is specified, the patch will be downloaded from | |
2871 | there. |
|
2871 | there. | |
2872 |
|
2872 | |||
2873 | Import first applies changes to the working directory (unless |
|
2873 | Import first applies changes to the working directory (unless | |
2874 | --bypass is specified), import will abort if there are outstanding |
|
2874 | --bypass is specified), import will abort if there are outstanding | |
2875 | changes. |
|
2875 | changes. | |
2876 |
|
2876 | |||
2877 | Use --bypass to apply and commit patches directly to the |
|
2877 | Use --bypass to apply and commit patches directly to the | |
2878 | repository, without affecting the working directory. Without |
|
2878 | repository, without affecting the working directory. Without | |
2879 | --exact, patches will be applied on top of the working directory |
|
2879 | --exact, patches will be applied on top of the working directory | |
2880 | parent revision. |
|
2880 | parent revision. | |
2881 |
|
2881 | |||
2882 | You can import a patch straight from a mail message. Even patches |
|
2882 | You can import a patch straight from a mail message. Even patches | |
2883 | as attachments work (to use the body part, it must have type |
|
2883 | as attachments work (to use the body part, it must have type | |
2884 | text/plain or text/x-patch). From and Subject headers of email |
|
2884 | text/plain or text/x-patch). From and Subject headers of email | |
2885 | message are used as default committer and commit message. All |
|
2885 | message are used as default committer and commit message. All | |
2886 | text/plain body parts before first diff are added to the commit |
|
2886 | text/plain body parts before first diff are added to the commit | |
2887 | message. |
|
2887 | message. | |
2888 |
|
2888 | |||
2889 | If the imported patch was generated by :hg:`export`, user and |
|
2889 | If the imported patch was generated by :hg:`export`, user and | |
2890 | description from patch override values from message headers and |
|
2890 | description from patch override values from message headers and | |
2891 | body. Values given on command line with -m/--message and -u/--user |
|
2891 | body. Values given on command line with -m/--message and -u/--user | |
2892 | override these. |
|
2892 | override these. | |
2893 |
|
2893 | |||
2894 | If --exact is specified, import will set the working directory to |
|
2894 | If --exact is specified, import will set the working directory to | |
2895 | the parent of each patch before applying it, and will abort if the |
|
2895 | the parent of each patch before applying it, and will abort if the | |
2896 | resulting changeset has a different ID than the one recorded in |
|
2896 | resulting changeset has a different ID than the one recorded in | |
2897 | the patch. This will guard against various ways that portable |
|
2897 | the patch. This will guard against various ways that portable | |
2898 | patch formats and mail systems might fail to transfer Mercurial |
|
2898 | patch formats and mail systems might fail to transfer Mercurial | |
2899 | data or metadata. See :hg:`bundle` for lossless transmission. |
|
2899 | data or metadata. See :hg:`bundle` for lossless transmission. | |
2900 |
|
2900 | |||
2901 | Use --partial to ensure a changeset will be created from the patch |
|
2901 | Use --partial to ensure a changeset will be created from the patch | |
2902 | even if some hunks fail to apply. Hunks that fail to apply will be |
|
2902 | even if some hunks fail to apply. Hunks that fail to apply will be | |
2903 | written to a <target-file>.rej file. Conflicts can then be resolved |
|
2903 | written to a <target-file>.rej file. Conflicts can then be resolved | |
2904 | by hand before :hg:`commit --amend` is run to update the created |
|
2904 | by hand before :hg:`commit --amend` is run to update the created | |
2905 | changeset. This flag exists to let people import patches that |
|
2905 | changeset. This flag exists to let people import patches that | |
2906 | partially apply without losing the associated metadata (author, |
|
2906 | partially apply without losing the associated metadata (author, | |
2907 | date, description, ...). |
|
2907 | date, description, ...). | |
2908 |
|
2908 | |||
2909 | .. note:: |
|
2909 | .. note:: | |
2910 |
|
2910 | |||
2911 | When no hunks apply cleanly, :hg:`import --partial` will create |
|
2911 | When no hunks apply cleanly, :hg:`import --partial` will create | |
2912 | an empty changeset, importing only the patch metadata. |
|
2912 | an empty changeset, importing only the patch metadata. | |
2913 |
|
2913 | |||
2914 | With -s/--similarity, hg will attempt to discover renames and |
|
2914 | With -s/--similarity, hg will attempt to discover renames and | |
2915 | copies in the patch in the same way as :hg:`addremove`. |
|
2915 | copies in the patch in the same way as :hg:`addremove`. | |
2916 |
|
2916 | |||
2917 | It is possible to use external patch programs to perform the patch |
|
2917 | It is possible to use external patch programs to perform the patch | |
2918 | by setting the ``ui.patch`` configuration option. For the default |
|
2918 | by setting the ``ui.patch`` configuration option. For the default | |
2919 | internal tool, the fuzz can also be configured via ``patch.fuzz``. |
|
2919 | internal tool, the fuzz can also be configured via ``patch.fuzz``. | |
2920 | See :hg:`help config` for more information about configuration |
|
2920 | See :hg:`help config` for more information about configuration | |
2921 | files and how to use these options. |
|
2921 | files and how to use these options. | |
2922 |
|
2922 | |||
2923 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
2923 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
2924 |
|
2924 | |||
2925 | .. container:: verbose |
|
2925 | .. container:: verbose | |
2926 |
|
2926 | |||
2927 | Examples: |
|
2927 | Examples: | |
2928 |
|
2928 | |||
2929 | - import a traditional patch from a website and detect renames:: |
|
2929 | - import a traditional patch from a website and detect renames:: | |
2930 |
|
2930 | |||
2931 | hg import -s 80 http://example.com/bugfix.patch |
|
2931 | hg import -s 80 http://example.com/bugfix.patch | |
2932 |
|
2932 | |||
2933 | - import a changeset from an hgweb server:: |
|
2933 | - import a changeset from an hgweb server:: | |
2934 |
|
2934 | |||
2935 | hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa |
|
2935 | hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa | |
2936 |
|
2936 | |||
2937 | - import all the patches in an Unix-style mbox:: |
|
2937 | - import all the patches in an Unix-style mbox:: | |
2938 |
|
2938 | |||
2939 | hg import incoming-patches.mbox |
|
2939 | hg import incoming-patches.mbox | |
2940 |
|
2940 | |||
2941 | - import patches from stdin:: |
|
2941 | - import patches from stdin:: | |
2942 |
|
2942 | |||
2943 | hg import - |
|
2943 | hg import - | |
2944 |
|
2944 | |||
2945 | - attempt to exactly restore an exported changeset (not always |
|
2945 | - attempt to exactly restore an exported changeset (not always | |
2946 | possible):: |
|
2946 | possible):: | |
2947 |
|
2947 | |||
2948 | hg import --exact proposed-fix.patch |
|
2948 | hg import --exact proposed-fix.patch | |
2949 |
|
2949 | |||
2950 | - use an external tool to apply a patch which is too fuzzy for |
|
2950 | - use an external tool to apply a patch which is too fuzzy for | |
2951 | the default internal tool. |
|
2951 | the default internal tool. | |
2952 |
|
2952 | |||
2953 | hg import --config ui.patch="patch --merge" fuzzy.patch |
|
2953 | hg import --config ui.patch="patch --merge" fuzzy.patch | |
2954 |
|
2954 | |||
2955 | - change the default fuzzing from 2 to a less strict 7 |
|
2955 | - change the default fuzzing from 2 to a less strict 7 | |
2956 |
|
2956 | |||
2957 | hg import --config ui.fuzz=7 fuzz.patch |
|
2957 | hg import --config ui.fuzz=7 fuzz.patch | |
2958 |
|
2958 | |||
2959 | Returns 0 on success, 1 on partial success (see --partial). |
|
2959 | Returns 0 on success, 1 on partial success (see --partial). | |
2960 | """ |
|
2960 | """ | |
2961 |
|
2961 | |||
2962 | opts = pycompat.byteskwargs(opts) |
|
2962 | opts = pycompat.byteskwargs(opts) | |
2963 | if not patch1: |
|
2963 | if not patch1: | |
2964 | raise error.Abort(_('need at least one patch to import')) |
|
2964 | raise error.Abort(_('need at least one patch to import')) | |
2965 |
|
2965 | |||
2966 | patches = (patch1,) + patches |
|
2966 | patches = (patch1,) + patches | |
2967 |
|
2967 | |||
2968 | date = opts.get('date') |
|
2968 | date = opts.get('date') | |
2969 | if date: |
|
2969 | if date: | |
2970 | opts['date'] = util.parsedate(date) |
|
2970 | opts['date'] = util.parsedate(date) | |
2971 |
|
2971 | |||
2972 | exact = opts.get('exact') |
|
2972 | exact = opts.get('exact') | |
2973 | update = not opts.get('bypass') |
|
2973 | update = not opts.get('bypass') | |
2974 | if not update and opts.get('no_commit'): |
|
2974 | if not update and opts.get('no_commit'): | |
2975 | raise error.Abort(_('cannot use --no-commit with --bypass')) |
|
2975 | raise error.Abort(_('cannot use --no-commit with --bypass')) | |
2976 | try: |
|
2976 | try: | |
2977 | sim = float(opts.get('similarity') or 0) |
|
2977 | sim = float(opts.get('similarity') or 0) | |
2978 | except ValueError: |
|
2978 | except ValueError: | |
2979 | raise error.Abort(_('similarity must be a number')) |
|
2979 | raise error.Abort(_('similarity must be a number')) | |
2980 | if sim < 0 or sim > 100: |
|
2980 | if sim < 0 or sim > 100: | |
2981 | raise error.Abort(_('similarity must be between 0 and 100')) |
|
2981 | raise error.Abort(_('similarity must be between 0 and 100')) | |
2982 | if sim and not update: |
|
2982 | if sim and not update: | |
2983 | raise error.Abort(_('cannot use --similarity with --bypass')) |
|
2983 | raise error.Abort(_('cannot use --similarity with --bypass')) | |
2984 | if exact: |
|
2984 | if exact: | |
2985 | if opts.get('edit'): |
|
2985 | if opts.get('edit'): | |
2986 | raise error.Abort(_('cannot use --exact with --edit')) |
|
2986 | raise error.Abort(_('cannot use --exact with --edit')) | |
2987 | if opts.get('prefix'): |
|
2987 | if opts.get('prefix'): | |
2988 | raise error.Abort(_('cannot use --exact with --prefix')) |
|
2988 | raise error.Abort(_('cannot use --exact with --prefix')) | |
2989 |
|
2989 | |||
2990 | base = opts["base"] |
|
2990 | base = opts["base"] | |
2991 | wlock = dsguard = lock = tr = None |
|
2991 | wlock = dsguard = lock = tr = None | |
2992 | msgs = [] |
|
2992 | msgs = [] | |
2993 | ret = 0 |
|
2993 | ret = 0 | |
2994 |
|
2994 | |||
2995 |
|
2995 | |||
2996 | try: |
|
2996 | try: | |
2997 | wlock = repo.wlock() |
|
2997 | wlock = repo.wlock() | |
2998 |
|
2998 | |||
2999 | if update: |
|
2999 | if update: | |
3000 | cmdutil.checkunfinished(repo) |
|
3000 | cmdutil.checkunfinished(repo) | |
3001 | if (exact or not opts.get('force')): |
|
3001 | if (exact or not opts.get('force')): | |
3002 | cmdutil.bailifchanged(repo) |
|
3002 | cmdutil.bailifchanged(repo) | |
3003 |
|
3003 | |||
3004 | if not opts.get('no_commit'): |
|
3004 | if not opts.get('no_commit'): | |
3005 | lock = repo.lock() |
|
3005 | lock = repo.lock() | |
3006 | tr = repo.transaction('import') |
|
3006 | tr = repo.transaction('import') | |
3007 | else: |
|
3007 | else: | |
3008 | dsguard = dirstateguard.dirstateguard(repo, 'import') |
|
3008 | dsguard = dirstateguard.dirstateguard(repo, 'import') | |
3009 | parents = repo[None].parents() |
|
3009 | parents = repo[None].parents() | |
3010 | for patchurl in patches: |
|
3010 | for patchurl in patches: | |
3011 | if patchurl == '-': |
|
3011 | if patchurl == '-': | |
3012 | ui.status(_('applying patch from stdin\n')) |
|
3012 | ui.status(_('applying patch from stdin\n')) | |
3013 | patchfile = ui.fin |
|
3013 | patchfile = ui.fin | |
3014 | patchurl = 'stdin' # for error message |
|
3014 | patchurl = 'stdin' # for error message | |
3015 | else: |
|
3015 | else: | |
3016 | patchurl = os.path.join(base, patchurl) |
|
3016 | patchurl = os.path.join(base, patchurl) | |
3017 | ui.status(_('applying %s\n') % patchurl) |
|
3017 | ui.status(_('applying %s\n') % patchurl) | |
3018 | patchfile = hg.openpath(ui, patchurl) |
|
3018 | patchfile = hg.openpath(ui, patchurl) | |
3019 |
|
3019 | |||
3020 | haspatch = False |
|
3020 | haspatch = False | |
3021 | for hunk in patch.split(patchfile): |
|
3021 | for hunk in patch.split(patchfile): | |
3022 | (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk, |
|
3022 | (msg, node, rej) = cmdutil.tryimportone(ui, repo, hunk, | |
3023 | parents, opts, |
|
3023 | parents, opts, | |
3024 | msgs, hg.clean) |
|
3024 | msgs, hg.clean) | |
3025 | if msg: |
|
3025 | if msg: | |
3026 | haspatch = True |
|
3026 | haspatch = True | |
3027 | ui.note(msg + '\n') |
|
3027 | ui.note(msg + '\n') | |
3028 | if update or exact: |
|
3028 | if update or exact: | |
3029 | parents = repo[None].parents() |
|
3029 | parents = repo[None].parents() | |
3030 | else: |
|
3030 | else: | |
3031 | parents = [repo[node]] |
|
3031 | parents = [repo[node]] | |
3032 | if rej: |
|
3032 | if rej: | |
3033 | ui.write_err(_("patch applied partially\n")) |
|
3033 | ui.write_err(_("patch applied partially\n")) | |
3034 | ui.write_err(_("(fix the .rej files and run " |
|
3034 | ui.write_err(_("(fix the .rej files and run " | |
3035 | "`hg commit --amend`)\n")) |
|
3035 | "`hg commit --amend`)\n")) | |
3036 | ret = 1 |
|
3036 | ret = 1 | |
3037 | break |
|
3037 | break | |
3038 |
|
3038 | |||
3039 | if not haspatch: |
|
3039 | if not haspatch: | |
3040 | raise error.Abort(_('%s: no diffs found') % patchurl) |
|
3040 | raise error.Abort(_('%s: no diffs found') % patchurl) | |
3041 |
|
3041 | |||
3042 | if tr: |
|
3042 | if tr: | |
3043 | tr.close() |
|
3043 | tr.close() | |
3044 | if msgs: |
|
3044 | if msgs: | |
3045 | repo.savecommitmessage('\n* * *\n'.join(msgs)) |
|
3045 | repo.savecommitmessage('\n* * *\n'.join(msgs)) | |
3046 | if dsguard: |
|
3046 | if dsguard: | |
3047 | dsguard.close() |
|
3047 | dsguard.close() | |
3048 | return ret |
|
3048 | return ret | |
3049 | finally: |
|
3049 | finally: | |
3050 | if tr: |
|
3050 | if tr: | |
3051 | tr.release() |
|
3051 | tr.release() | |
3052 | release(lock, dsguard, wlock) |
|
3052 | release(lock, dsguard, wlock) | |
3053 |
|
3053 | |||
3054 | @command('incoming|in', |
|
3054 | @command('incoming|in', | |
3055 | [('f', 'force', None, |
|
3055 | [('f', 'force', None, | |
3056 | _('run even if remote repository is unrelated')), |
|
3056 | _('run even if remote repository is unrelated')), | |
3057 | ('n', 'newest-first', None, _('show newest record first')), |
|
3057 | ('n', 'newest-first', None, _('show newest record first')), | |
3058 | ('', 'bundle', '', |
|
3058 | ('', 'bundle', '', | |
3059 | _('file to store the bundles into'), _('FILE')), |
|
3059 | _('file to store the bundles into'), _('FILE')), | |
3060 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), |
|
3060 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), | |
3061 | ('B', 'bookmarks', False, _("compare bookmarks")), |
|
3061 | ('B', 'bookmarks', False, _("compare bookmarks")), | |
3062 | ('b', 'branch', [], |
|
3062 | ('b', 'branch', [], | |
3063 | _('a specific branch you would like to pull'), _('BRANCH')), |
|
3063 | _('a specific branch you would like to pull'), _('BRANCH')), | |
3064 | ] + logopts + remoteopts + subrepoopts, |
|
3064 | ] + logopts + remoteopts + subrepoopts, | |
3065 | _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]')) |
|
3065 | _('[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]')) | |
3066 | def incoming(ui, repo, source="default", **opts): |
|
3066 | def incoming(ui, repo, source="default", **opts): | |
3067 | """show new changesets found in source |
|
3067 | """show new changesets found in source | |
3068 |
|
3068 | |||
3069 | Show new changesets found in the specified path/URL or the default |
|
3069 | Show new changesets found in the specified path/URL or the default | |
3070 | pull location. These are the changesets that would have been pulled |
|
3070 | pull location. These are the changesets that would have been pulled | |
3071 | if a pull at the time you issued this command. |
|
3071 | if a pull at the time you issued this command. | |
3072 |
|
3072 | |||
3073 | See pull for valid source format details. |
|
3073 | See pull for valid source format details. | |
3074 |
|
3074 | |||
3075 | .. container:: verbose |
|
3075 | .. container:: verbose | |
3076 |
|
3076 | |||
3077 | With -B/--bookmarks, the result of bookmark comparison between |
|
3077 | With -B/--bookmarks, the result of bookmark comparison between | |
3078 | local and remote repositories is displayed. With -v/--verbose, |
|
3078 | local and remote repositories is displayed. With -v/--verbose, | |
3079 | status is also displayed for each bookmark like below:: |
|
3079 | status is also displayed for each bookmark like below:: | |
3080 |
|
3080 | |||
3081 | BM1 01234567890a added |
|
3081 | BM1 01234567890a added | |
3082 | BM2 1234567890ab advanced |
|
3082 | BM2 1234567890ab advanced | |
3083 | BM3 234567890abc diverged |
|
3083 | BM3 234567890abc diverged | |
3084 | BM4 34567890abcd changed |
|
3084 | BM4 34567890abcd changed | |
3085 |
|
3085 | |||
3086 | The action taken locally when pulling depends on the |
|
3086 | The action taken locally when pulling depends on the | |
3087 | status of each bookmark: |
|
3087 | status of each bookmark: | |
3088 |
|
3088 | |||
3089 | :``added``: pull will create it |
|
3089 | :``added``: pull will create it | |
3090 | :``advanced``: pull will update it |
|
3090 | :``advanced``: pull will update it | |
3091 | :``diverged``: pull will create a divergent bookmark |
|
3091 | :``diverged``: pull will create a divergent bookmark | |
3092 | :``changed``: result depends on remote changesets |
|
3092 | :``changed``: result depends on remote changesets | |
3093 |
|
3093 | |||
3094 | From the point of view of pulling behavior, bookmark |
|
3094 | From the point of view of pulling behavior, bookmark | |
3095 | existing only in the remote repository are treated as ``added``, |
|
3095 | existing only in the remote repository are treated as ``added``, | |
3096 | even if it is in fact locally deleted. |
|
3096 | even if it is in fact locally deleted. | |
3097 |
|
3097 | |||
3098 | .. container:: verbose |
|
3098 | .. container:: verbose | |
3099 |
|
3099 | |||
3100 | For remote repository, using --bundle avoids downloading the |
|
3100 | For remote repository, using --bundle avoids downloading the | |
3101 | changesets twice if the incoming is followed by a pull. |
|
3101 | changesets twice if the incoming is followed by a pull. | |
3102 |
|
3102 | |||
3103 | Examples: |
|
3103 | Examples: | |
3104 |
|
3104 | |||
3105 | - show incoming changes with patches and full description:: |
|
3105 | - show incoming changes with patches and full description:: | |
3106 |
|
3106 | |||
3107 | hg incoming -vp |
|
3107 | hg incoming -vp | |
3108 |
|
3108 | |||
3109 | - show incoming changes excluding merges, store a bundle:: |
|
3109 | - show incoming changes excluding merges, store a bundle:: | |
3110 |
|
3110 | |||
3111 | hg in -vpM --bundle incoming.hg |
|
3111 | hg in -vpM --bundle incoming.hg | |
3112 | hg pull incoming.hg |
|
3112 | hg pull incoming.hg | |
3113 |
|
3113 | |||
3114 | - briefly list changes inside a bundle:: |
|
3114 | - briefly list changes inside a bundle:: | |
3115 |
|
3115 | |||
3116 | hg in changes.hg -T "{desc|firstline}\\n" |
|
3116 | hg in changes.hg -T "{desc|firstline}\\n" | |
3117 |
|
3117 | |||
3118 | Returns 0 if there are incoming changes, 1 otherwise. |
|
3118 | Returns 0 if there are incoming changes, 1 otherwise. | |
3119 | """ |
|
3119 | """ | |
3120 | opts = pycompat.byteskwargs(opts) |
|
3120 | opts = pycompat.byteskwargs(opts) | |
3121 | if opts.get('graph'): |
|
3121 | if opts.get('graph'): | |
3122 | cmdutil.checkunsupportedgraphflags([], opts) |
|
3122 | cmdutil.checkunsupportedgraphflags([], opts) | |
3123 | def display(other, chlist, displayer): |
|
3123 | def display(other, chlist, displayer): | |
3124 | revdag = cmdutil.graphrevs(other, chlist, opts) |
|
3124 | revdag = cmdutil.graphrevs(other, chlist, opts) | |
3125 | cmdutil.displaygraph(ui, repo, revdag, displayer, |
|
3125 | cmdutil.displaygraph(ui, repo, revdag, displayer, | |
3126 | graphmod.asciiedges) |
|
3126 | graphmod.asciiedges) | |
3127 |
|
3127 | |||
3128 | hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True) |
|
3128 | hg._incoming(display, lambda: 1, ui, repo, source, opts, buffered=True) | |
3129 | return 0 |
|
3129 | return 0 | |
3130 |
|
3130 | |||
3131 | if opts.get('bundle') and opts.get('subrepos'): |
|
3131 | if opts.get('bundle') and opts.get('subrepos'): | |
3132 | raise error.Abort(_('cannot combine --bundle and --subrepos')) |
|
3132 | raise error.Abort(_('cannot combine --bundle and --subrepos')) | |
3133 |
|
3133 | |||
3134 | if opts.get('bookmarks'): |
|
3134 | if opts.get('bookmarks'): | |
3135 | source, branches = hg.parseurl(ui.expandpath(source), |
|
3135 | source, branches = hg.parseurl(ui.expandpath(source), | |
3136 | opts.get('branch')) |
|
3136 | opts.get('branch')) | |
3137 | other = hg.peer(repo, opts, source) |
|
3137 | other = hg.peer(repo, opts, source) | |
3138 | if 'bookmarks' not in other.listkeys('namespaces'): |
|
3138 | if 'bookmarks' not in other.listkeys('namespaces'): | |
3139 | ui.warn(_("remote doesn't support bookmarks\n")) |
|
3139 | ui.warn(_("remote doesn't support bookmarks\n")) | |
3140 | return 0 |
|
3140 | return 0 | |
3141 | ui.pager('incoming') |
|
3141 | ui.pager('incoming') | |
3142 | ui.status(_('comparing with %s\n') % util.hidepassword(source)) |
|
3142 | ui.status(_('comparing with %s\n') % util.hidepassword(source)) | |
3143 | return bookmarks.incoming(ui, repo, other) |
|
3143 | return bookmarks.incoming(ui, repo, other) | |
3144 |
|
3144 | |||
3145 | repo._subtoppath = ui.expandpath(source) |
|
3145 | repo._subtoppath = ui.expandpath(source) | |
3146 | try: |
|
3146 | try: | |
3147 | return hg.incoming(ui, repo, source, opts) |
|
3147 | return hg.incoming(ui, repo, source, opts) | |
3148 | finally: |
|
3148 | finally: | |
3149 | del repo._subtoppath |
|
3149 | del repo._subtoppath | |
3150 |
|
3150 | |||
3151 |
|
3151 | |||
3152 | @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'), |
|
3152 | @command('^init', remoteopts, _('[-e CMD] [--remotecmd CMD] [DEST]'), | |
3153 | norepo=True) |
|
3153 | norepo=True) | |
3154 | def init(ui, dest=".", **opts): |
|
3154 | def init(ui, dest=".", **opts): | |
3155 | """create a new repository in the given directory |
|
3155 | """create a new repository in the given directory | |
3156 |
|
3156 | |||
3157 | Initialize a new repository in the given directory. If the given |
|
3157 | Initialize a new repository in the given directory. If the given | |
3158 | directory does not exist, it will be created. |
|
3158 | directory does not exist, it will be created. | |
3159 |
|
3159 | |||
3160 | If no directory is given, the current directory is used. |
|
3160 | If no directory is given, the current directory is used. | |
3161 |
|
3161 | |||
3162 | It is possible to specify an ``ssh://`` URL as the destination. |
|
3162 | It is possible to specify an ``ssh://`` URL as the destination. | |
3163 | See :hg:`help urls` for more information. |
|
3163 | See :hg:`help urls` for more information. | |
3164 |
|
3164 | |||
3165 | Returns 0 on success. |
|
3165 | Returns 0 on success. | |
3166 | """ |
|
3166 | """ | |
3167 | opts = pycompat.byteskwargs(opts) |
|
3167 | opts = pycompat.byteskwargs(opts) | |
3168 | hg.peer(ui, opts, ui.expandpath(dest), create=True) |
|
3168 | hg.peer(ui, opts, ui.expandpath(dest), create=True) | |
3169 |
|
3169 | |||
3170 | @command('locate', |
|
3170 | @command('locate', | |
3171 | [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')), |
|
3171 | [('r', 'rev', '', _('search the repository as it is in REV'), _('REV')), | |
3172 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), |
|
3172 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), | |
3173 | ('f', 'fullpath', None, _('print complete paths from the filesystem root')), |
|
3173 | ('f', 'fullpath', None, _('print complete paths from the filesystem root')), | |
3174 | ] + walkopts, |
|
3174 | ] + walkopts, | |
3175 | _('[OPTION]... [PATTERN]...')) |
|
3175 | _('[OPTION]... [PATTERN]...')) | |
3176 | def locate(ui, repo, *pats, **opts): |
|
3176 | def locate(ui, repo, *pats, **opts): | |
3177 | """locate files matching specific patterns (DEPRECATED) |
|
3177 | """locate files matching specific patterns (DEPRECATED) | |
3178 |
|
3178 | |||
3179 | Print files under Mercurial control in the working directory whose |
|
3179 | Print files under Mercurial control in the working directory whose | |
3180 | names match the given patterns. |
|
3180 | names match the given patterns. | |
3181 |
|
3181 | |||
3182 | By default, this command searches all directories in the working |
|
3182 | By default, this command searches all directories in the working | |
3183 | directory. To search just the current directory and its |
|
3183 | directory. To search just the current directory and its | |
3184 | subdirectories, use "--include .". |
|
3184 | subdirectories, use "--include .". | |
3185 |
|
3185 | |||
3186 | If no patterns are given to match, this command prints the names |
|
3186 | If no patterns are given to match, this command prints the names | |
3187 | of all files under Mercurial control in the working directory. |
|
3187 | of all files under Mercurial control in the working directory. | |
3188 |
|
3188 | |||
3189 | If you want to feed the output of this command into the "xargs" |
|
3189 | If you want to feed the output of this command into the "xargs" | |
3190 | command, use the -0 option to both this command and "xargs". This |
|
3190 | command, use the -0 option to both this command and "xargs". This | |
3191 | will avoid the problem of "xargs" treating single filenames that |
|
3191 | will avoid the problem of "xargs" treating single filenames that | |
3192 | contain whitespace as multiple filenames. |
|
3192 | contain whitespace as multiple filenames. | |
3193 |
|
3193 | |||
3194 | See :hg:`help files` for a more versatile command. |
|
3194 | See :hg:`help files` for a more versatile command. | |
3195 |
|
3195 | |||
3196 | Returns 0 if a match is found, 1 otherwise. |
|
3196 | Returns 0 if a match is found, 1 otherwise. | |
3197 | """ |
|
3197 | """ | |
3198 | opts = pycompat.byteskwargs(opts) |
|
3198 | opts = pycompat.byteskwargs(opts) | |
3199 | if opts.get('print0'): |
|
3199 | if opts.get('print0'): | |
3200 | end = '\0' |
|
3200 | end = '\0' | |
3201 | else: |
|
3201 | else: | |
3202 | end = '\n' |
|
3202 | end = '\n' | |
3203 | rev = scmutil.revsingle(repo, opts.get('rev'), None).node() |
|
3203 | rev = scmutil.revsingle(repo, opts.get('rev'), None).node() | |
3204 |
|
3204 | |||
3205 | ret = 1 |
|
3205 | ret = 1 | |
3206 | ctx = repo[rev] |
|
3206 | ctx = repo[rev] | |
3207 | m = scmutil.match(ctx, pats, opts, default='relglob', |
|
3207 | m = scmutil.match(ctx, pats, opts, default='relglob', | |
3208 | badfn=lambda x, y: False) |
|
3208 | badfn=lambda x, y: False) | |
3209 |
|
3209 | |||
3210 | ui.pager('locate') |
|
3210 | ui.pager('locate') | |
3211 | for abs in ctx.matches(m): |
|
3211 | for abs in ctx.matches(m): | |
3212 | if opts.get('fullpath'): |
|
3212 | if opts.get('fullpath'): | |
3213 | ui.write(repo.wjoin(abs), end) |
|
3213 | ui.write(repo.wjoin(abs), end) | |
3214 | else: |
|
3214 | else: | |
3215 | ui.write(((pats and m.rel(abs)) or abs), end) |
|
3215 | ui.write(((pats and m.rel(abs)) or abs), end) | |
3216 | ret = 0 |
|
3216 | ret = 0 | |
3217 |
|
3217 | |||
3218 | return ret |
|
3218 | return ret | |
3219 |
|
3219 | |||
3220 | @command('^log|history', |
|
3220 | @command('^log|history', | |
3221 | [('f', 'follow', None, |
|
3221 | [('f', 'follow', None, | |
3222 | _('follow changeset history, or file history across copies and renames')), |
|
3222 | _('follow changeset history, or file history across copies and renames')), | |
3223 | ('', 'follow-first', None, |
|
3223 | ('', 'follow-first', None, | |
3224 | _('only follow the first parent of merge changesets (DEPRECATED)')), |
|
3224 | _('only follow the first parent of merge changesets (DEPRECATED)')), | |
3225 | ('d', 'date', '', _('show revisions matching date spec'), _('DATE')), |
|
3225 | ('d', 'date', '', _('show revisions matching date spec'), _('DATE')), | |
3226 | ('C', 'copies', None, _('show copied files')), |
|
3226 | ('C', 'copies', None, _('show copied files')), | |
3227 | ('k', 'keyword', [], |
|
3227 | ('k', 'keyword', [], | |
3228 | _('do case-insensitive search for a given text'), _('TEXT')), |
|
3228 | _('do case-insensitive search for a given text'), _('TEXT')), | |
3229 | ('r', 'rev', [], _('show the specified revision or revset'), _('REV')), |
|
3229 | ('r', 'rev', [], _('show the specified revision or revset'), _('REV')), | |
3230 | ('', 'removed', None, _('include revisions where files were removed')), |
|
3230 | ('', 'removed', None, _('include revisions where files were removed')), | |
3231 | ('m', 'only-merges', None, _('show only merges (DEPRECATED)')), |
|
3231 | ('m', 'only-merges', None, _('show only merges (DEPRECATED)')), | |
3232 | ('u', 'user', [], _('revisions committed by user'), _('USER')), |
|
3232 | ('u', 'user', [], _('revisions committed by user'), _('USER')), | |
3233 | ('', 'only-branch', [], |
|
3233 | ('', 'only-branch', [], | |
3234 | _('show only changesets within the given named branch (DEPRECATED)'), |
|
3234 | _('show only changesets within the given named branch (DEPRECATED)'), | |
3235 | _('BRANCH')), |
|
3235 | _('BRANCH')), | |
3236 | ('b', 'branch', [], |
|
3236 | ('b', 'branch', [], | |
3237 | _('show changesets within the given named branch'), _('BRANCH')), |
|
3237 | _('show changesets within the given named branch'), _('BRANCH')), | |
3238 | ('P', 'prune', [], |
|
3238 | ('P', 'prune', [], | |
3239 | _('do not display revision or any of its ancestors'), _('REV')), |
|
3239 | _('do not display revision or any of its ancestors'), _('REV')), | |
3240 | ] + logopts + walkopts, |
|
3240 | ] + logopts + walkopts, | |
3241 | _('[OPTION]... [FILE]'), |
|
3241 | _('[OPTION]... [FILE]'), | |
3242 | inferrepo=True) |
|
3242 | inferrepo=True) | |
3243 | def log(ui, repo, *pats, **opts): |
|
3243 | def log(ui, repo, *pats, **opts): | |
3244 | """show revision history of entire repository or files |
|
3244 | """show revision history of entire repository or files | |
3245 |
|
3245 | |||
3246 | Print the revision history of the specified files or the entire |
|
3246 | Print the revision history of the specified files or the entire | |
3247 | project. |
|
3247 | project. | |
3248 |
|
3248 | |||
3249 | If no revision range is specified, the default is ``tip:0`` unless |
|
3249 | If no revision range is specified, the default is ``tip:0`` unless | |
3250 | --follow is set, in which case the working directory parent is |
|
3250 | --follow is set, in which case the working directory parent is | |
3251 | used as the starting revision. |
|
3251 | used as the starting revision. | |
3252 |
|
3252 | |||
3253 | File history is shown without following rename or copy history of |
|
3253 | File history is shown without following rename or copy history of | |
3254 | files. Use -f/--follow with a filename to follow history across |
|
3254 | files. Use -f/--follow with a filename to follow history across | |
3255 | renames and copies. --follow without a filename will only show |
|
3255 | renames and copies. --follow without a filename will only show | |
3256 | ancestors or descendants of the starting revision. |
|
3256 | ancestors or descendants of the starting revision. | |
3257 |
|
3257 | |||
3258 | By default this command prints revision number and changeset id, |
|
3258 | By default this command prints revision number and changeset id, | |
3259 | tags, non-trivial parents, user, date and time, and a summary for |
|
3259 | tags, non-trivial parents, user, date and time, and a summary for | |
3260 | each commit. When the -v/--verbose switch is used, the list of |
|
3260 | each commit. When the -v/--verbose switch is used, the list of | |
3261 | changed files and full commit message are shown. |
|
3261 | changed files and full commit message are shown. | |
3262 |
|
3262 | |||
3263 | With --graph the revisions are shown as an ASCII art DAG with the most |
|
3263 | With --graph the revisions are shown as an ASCII art DAG with the most | |
3264 | recent changeset at the top. |
|
3264 | recent changeset at the top. | |
3265 | 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete, |
|
3265 | 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete, | |
3266 | and '+' represents a fork where the changeset from the lines below is a |
|
3266 | and '+' represents a fork where the changeset from the lines below is a | |
3267 | parent of the 'o' merge on the same line. |
|
3267 | parent of the 'o' merge on the same line. | |
3268 | Paths in the DAG are represented with '|', '/' and so forth. ':' in place |
|
3268 | Paths in the DAG are represented with '|', '/' and so forth. ':' in place | |
3269 | of a '|' indicates one or more revisions in a path are omitted. |
|
3269 | of a '|' indicates one or more revisions in a path are omitted. | |
3270 |
|
3270 | |||
3271 | .. note:: |
|
3271 | .. note:: | |
3272 |
|
3272 | |||
3273 | :hg:`log --patch` may generate unexpected diff output for merge |
|
3273 | :hg:`log --patch` may generate unexpected diff output for merge | |
3274 | changesets, as it will only compare the merge changeset against |
|
3274 | changesets, as it will only compare the merge changeset against | |
3275 | its first parent. Also, only files different from BOTH parents |
|
3275 | its first parent. Also, only files different from BOTH parents | |
3276 | will appear in files:. |
|
3276 | will appear in files:. | |
3277 |
|
3277 | |||
3278 | .. note:: |
|
3278 | .. note:: | |
3279 |
|
3279 | |||
3280 | For performance reasons, :hg:`log FILE` may omit duplicate changes |
|
3280 | For performance reasons, :hg:`log FILE` may omit duplicate changes | |
3281 | made on branches and will not show removals or mode changes. To |
|
3281 | made on branches and will not show removals or mode changes. To | |
3282 | see all such changes, use the --removed switch. |
|
3282 | see all such changes, use the --removed switch. | |
3283 |
|
3283 | |||
3284 | .. container:: verbose |
|
3284 | .. container:: verbose | |
3285 |
|
3285 | |||
3286 | Some examples: |
|
3286 | Some examples: | |
3287 |
|
3287 | |||
3288 | - changesets with full descriptions and file lists:: |
|
3288 | - changesets with full descriptions and file lists:: | |
3289 |
|
3289 | |||
3290 | hg log -v |
|
3290 | hg log -v | |
3291 |
|
3291 | |||
3292 | - changesets ancestral to the working directory:: |
|
3292 | - changesets ancestral to the working directory:: | |
3293 |
|
3293 | |||
3294 | hg log -f |
|
3294 | hg log -f | |
3295 |
|
3295 | |||
3296 | - last 10 commits on the current branch:: |
|
3296 | - last 10 commits on the current branch:: | |
3297 |
|
3297 | |||
3298 | hg log -l 10 -b . |
|
3298 | hg log -l 10 -b . | |
3299 |
|
3299 | |||
3300 | - changesets showing all modifications of a file, including removals:: |
|
3300 | - changesets showing all modifications of a file, including removals:: | |
3301 |
|
3301 | |||
3302 | hg log --removed file.c |
|
3302 | hg log --removed file.c | |
3303 |
|
3303 | |||
3304 | - all changesets that touch a directory, with diffs, excluding merges:: |
|
3304 | - all changesets that touch a directory, with diffs, excluding merges:: | |
3305 |
|
3305 | |||
3306 | hg log -Mp lib/ |
|
3306 | hg log -Mp lib/ | |
3307 |
|
3307 | |||
3308 | - all revision numbers that match a keyword:: |
|
3308 | - all revision numbers that match a keyword:: | |
3309 |
|
3309 | |||
3310 | hg log -k bug --template "{rev}\\n" |
|
3310 | hg log -k bug --template "{rev}\\n" | |
3311 |
|
3311 | |||
3312 | - the full hash identifier of the working directory parent:: |
|
3312 | - the full hash identifier of the working directory parent:: | |
3313 |
|
3313 | |||
3314 | hg log -r . --template "{node}\\n" |
|
3314 | hg log -r . --template "{node}\\n" | |
3315 |
|
3315 | |||
3316 | - list available log templates:: |
|
3316 | - list available log templates:: | |
3317 |
|
3317 | |||
3318 | hg log -T list |
|
3318 | hg log -T list | |
3319 |
|
3319 | |||
3320 | - check if a given changeset is included in a tagged release:: |
|
3320 | - check if a given changeset is included in a tagged release:: | |
3321 |
|
3321 | |||
3322 | hg log -r "a21ccf and ancestor(1.9)" |
|
3322 | hg log -r "a21ccf and ancestor(1.9)" | |
3323 |
|
3323 | |||
3324 | - find all changesets by some user in a date range:: |
|
3324 | - find all changesets by some user in a date range:: | |
3325 |
|
3325 | |||
3326 | hg log -k alice -d "may 2008 to jul 2008" |
|
3326 | hg log -k alice -d "may 2008 to jul 2008" | |
3327 |
|
3327 | |||
3328 | - summary of all changesets after the last tag:: |
|
3328 | - summary of all changesets after the last tag:: | |
3329 |
|
3329 | |||
3330 | hg log -r "last(tagged())::" --template "{desc|firstline}\\n" |
|
3330 | hg log -r "last(tagged())::" --template "{desc|firstline}\\n" | |
3331 |
|
3331 | |||
3332 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
3332 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
3333 |
|
3333 | |||
3334 | See :hg:`help revisions` for more about specifying and ordering |
|
3334 | See :hg:`help revisions` for more about specifying and ordering | |
3335 | revisions. |
|
3335 | revisions. | |
3336 |
|
3336 | |||
3337 | See :hg:`help templates` for more about pre-packaged styles and |
|
3337 | See :hg:`help templates` for more about pre-packaged styles and | |
3338 | specifying custom templates. |
|
3338 | specifying custom templates. | |
3339 |
|
3339 | |||
3340 | Returns 0 on success. |
|
3340 | Returns 0 on success. | |
3341 |
|
3341 | |||
3342 | """ |
|
3342 | """ | |
3343 | opts = pycompat.byteskwargs(opts) |
|
3343 | opts = pycompat.byteskwargs(opts) | |
3344 | if opts.get('follow') and opts.get('rev'): |
|
3344 | if opts.get('follow') and opts.get('rev'): | |
3345 | opts['rev'] = [revsetlang.formatspec('reverse(::%lr)', opts.get('rev'))] |
|
3345 | opts['rev'] = [revsetlang.formatspec('reverse(::%lr)', opts.get('rev'))] | |
3346 | del opts['follow'] |
|
3346 | del opts['follow'] | |
3347 |
|
3347 | |||
3348 | if opts.get('graph'): |
|
3348 | if opts.get('graph'): | |
3349 | return cmdutil.graphlog(ui, repo, pats, opts) |
|
3349 | return cmdutil.graphlog(ui, repo, pats, opts) | |
3350 |
|
3350 | |||
3351 | revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts) |
|
3351 | revs, expr, filematcher = cmdutil.getlogrevs(repo, pats, opts) | |
3352 | limit = cmdutil.loglimit(opts) |
|
3352 | limit = cmdutil.loglimit(opts) | |
3353 | count = 0 |
|
3353 | count = 0 | |
3354 |
|
3354 | |||
3355 | getrenamed = None |
|
3355 | getrenamed = None | |
3356 | if opts.get('copies'): |
|
3356 | if opts.get('copies'): | |
3357 | endrev = None |
|
3357 | endrev = None | |
3358 | if opts.get('rev'): |
|
3358 | if opts.get('rev'): | |
3359 | endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1 |
|
3359 | endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1 | |
3360 | getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) |
|
3360 | getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) | |
3361 |
|
3361 | |||
3362 | ui.pager('log') |
|
3362 | ui.pager('log') | |
3363 | displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True) |
|
3363 | displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True) | |
3364 | for rev in revs: |
|
3364 | for rev in revs: | |
3365 | if count == limit: |
|
3365 | if count == limit: | |
3366 | break |
|
3366 | break | |
3367 | ctx = repo[rev] |
|
3367 | ctx = repo[rev] | |
3368 | copies = None |
|
3368 | copies = None | |
3369 | if getrenamed is not None and rev: |
|
3369 | if getrenamed is not None and rev: | |
3370 | copies = [] |
|
3370 | copies = [] | |
3371 | for fn in ctx.files(): |
|
3371 | for fn in ctx.files(): | |
3372 | rename = getrenamed(fn, rev) |
|
3372 | rename = getrenamed(fn, rev) | |
3373 | if rename: |
|
3373 | if rename: | |
3374 | copies.append((fn, rename[0])) |
|
3374 | copies.append((fn, rename[0])) | |
3375 | if filematcher: |
|
3375 | if filematcher: | |
3376 | revmatchfn = filematcher(ctx.rev()) |
|
3376 | revmatchfn = filematcher(ctx.rev()) | |
3377 | else: |
|
3377 | else: | |
3378 | revmatchfn = None |
|
3378 | revmatchfn = None | |
3379 | displayer.show(ctx, copies=copies, matchfn=revmatchfn) |
|
3379 | displayer.show(ctx, copies=copies, matchfn=revmatchfn) | |
3380 | if displayer.flush(ctx): |
|
3380 | if displayer.flush(ctx): | |
3381 | count += 1 |
|
3381 | count += 1 | |
3382 |
|
3382 | |||
3383 | displayer.close() |
|
3383 | displayer.close() | |
3384 |
|
3384 | |||
3385 | @command('manifest', |
|
3385 | @command('manifest', | |
3386 | [('r', 'rev', '', _('revision to display'), _('REV')), |
|
3386 | [('r', 'rev', '', _('revision to display'), _('REV')), | |
3387 | ('', 'all', False, _("list files from all revisions"))] |
|
3387 | ('', 'all', False, _("list files from all revisions"))] | |
3388 | + formatteropts, |
|
3388 | + formatteropts, | |
3389 | _('[-r REV]')) |
|
3389 | _('[-r REV]')) | |
3390 | def manifest(ui, repo, node=None, rev=None, **opts): |
|
3390 | def manifest(ui, repo, node=None, rev=None, **opts): | |
3391 | """output the current or given revision of the project manifest |
|
3391 | """output the current or given revision of the project manifest | |
3392 |
|
3392 | |||
3393 | Print a list of version controlled files for the given revision. |
|
3393 | Print a list of version controlled files for the given revision. | |
3394 | If no revision is given, the first parent of the working directory |
|
3394 | If no revision is given, the first parent of the working directory | |
3395 | is used, or the null revision if no revision is checked out. |
|
3395 | is used, or the null revision if no revision is checked out. | |
3396 |
|
3396 | |||
3397 | With -v, print file permissions, symlink and executable bits. |
|
3397 | With -v, print file permissions, symlink and executable bits. | |
3398 | With --debug, print file revision hashes. |
|
3398 | With --debug, print file revision hashes. | |
3399 |
|
3399 | |||
3400 | If option --all is specified, the list of all files from all revisions |
|
3400 | If option --all is specified, the list of all files from all revisions | |
3401 | is printed. This includes deleted and renamed files. |
|
3401 | is printed. This includes deleted and renamed files. | |
3402 |
|
3402 | |||
3403 | Returns 0 on success. |
|
3403 | Returns 0 on success. | |
3404 | """ |
|
3404 | """ | |
3405 | opts = pycompat.byteskwargs(opts) |
|
3405 | opts = pycompat.byteskwargs(opts) | |
3406 | fm = ui.formatter('manifest', opts) |
|
3406 | fm = ui.formatter('manifest', opts) | |
3407 |
|
3407 | |||
3408 | if opts.get('all'): |
|
3408 | if opts.get('all'): | |
3409 | if rev or node: |
|
3409 | if rev or node: | |
3410 | raise error.Abort(_("can't specify a revision with --all")) |
|
3410 | raise error.Abort(_("can't specify a revision with --all")) | |
3411 |
|
3411 | |||
3412 | res = [] |
|
3412 | res = [] | |
3413 | prefix = "data/" |
|
3413 | prefix = "data/" | |
3414 | suffix = ".i" |
|
3414 | suffix = ".i" | |
3415 | plen = len(prefix) |
|
3415 | plen = len(prefix) | |
3416 | slen = len(suffix) |
|
3416 | slen = len(suffix) | |
3417 | with repo.lock(): |
|
3417 | with repo.lock(): | |
3418 | for fn, b, size in repo.store.datafiles(): |
|
3418 | for fn, b, size in repo.store.datafiles(): | |
3419 | if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix: |
|
3419 | if size != 0 and fn[-slen:] == suffix and fn[:plen] == prefix: | |
3420 | res.append(fn[plen:-slen]) |
|
3420 | res.append(fn[plen:-slen]) | |
3421 | ui.pager('manifest') |
|
3421 | ui.pager('manifest') | |
3422 | for f in res: |
|
3422 | for f in res: | |
3423 | fm.startitem() |
|
3423 | fm.startitem() | |
3424 | fm.write("path", '%s\n', f) |
|
3424 | fm.write("path", '%s\n', f) | |
3425 | fm.end() |
|
3425 | fm.end() | |
3426 | return |
|
3426 | return | |
3427 |
|
3427 | |||
3428 | if rev and node: |
|
3428 | if rev and node: | |
3429 | raise error.Abort(_("please specify just one revision")) |
|
3429 | raise error.Abort(_("please specify just one revision")) | |
3430 |
|
3430 | |||
3431 | if not node: |
|
3431 | if not node: | |
3432 | node = rev |
|
3432 | node = rev | |
3433 |
|
3433 | |||
3434 | char = {'l': '@', 'x': '*', '': ''} |
|
3434 | char = {'l': '@', 'x': '*', '': ''} | |
3435 | mode = {'l': '644', 'x': '755', '': '644'} |
|
3435 | mode = {'l': '644', 'x': '755', '': '644'} | |
3436 | ctx = scmutil.revsingle(repo, node) |
|
3436 | ctx = scmutil.revsingle(repo, node) | |
3437 | mf = ctx.manifest() |
|
3437 | mf = ctx.manifest() | |
3438 | ui.pager('manifest') |
|
3438 | ui.pager('manifest') | |
3439 | for f in ctx: |
|
3439 | for f in ctx: | |
3440 | fm.startitem() |
|
3440 | fm.startitem() | |
3441 | fl = ctx[f].flags() |
|
3441 | fl = ctx[f].flags() | |
3442 | fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f])) |
|
3442 | fm.condwrite(ui.debugflag, 'hash', '%s ', hex(mf[f])) | |
3443 | fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl]) |
|
3443 | fm.condwrite(ui.verbose, 'mode type', '%s %1s ', mode[fl], char[fl]) | |
3444 | fm.write('path', '%s\n', f) |
|
3444 | fm.write('path', '%s\n', f) | |
3445 | fm.end() |
|
3445 | fm.end() | |
3446 |
|
3446 | |||
3447 | @command('^merge', |
|
3447 | @command('^merge', | |
3448 | [('f', 'force', None, |
|
3448 | [('f', 'force', None, | |
3449 | _('force a merge including outstanding changes (DEPRECATED)')), |
|
3449 | _('force a merge including outstanding changes (DEPRECATED)')), | |
3450 | ('r', 'rev', '', _('revision to merge'), _('REV')), |
|
3450 | ('r', 'rev', '', _('revision to merge'), _('REV')), | |
3451 | ('P', 'preview', None, |
|
3451 | ('P', 'preview', None, | |
3452 | _('review revisions to merge (no merge is performed)')) |
|
3452 | _('review revisions to merge (no merge is performed)')) | |
3453 | ] + mergetoolopts, |
|
3453 | ] + mergetoolopts, | |
3454 | _('[-P] [[-r] REV]')) |
|
3454 | _('[-P] [[-r] REV]')) | |
3455 | def merge(ui, repo, node=None, **opts): |
|
3455 | def merge(ui, repo, node=None, **opts): | |
3456 | """merge another revision into working directory |
|
3456 | """merge another revision into working directory | |
3457 |
|
3457 | |||
3458 | The current working directory is updated with all changes made in |
|
3458 | The current working directory is updated with all changes made in | |
3459 | the requested revision since the last common predecessor revision. |
|
3459 | the requested revision since the last common predecessor revision. | |
3460 |
|
3460 | |||
3461 | Files that changed between either parent are marked as changed for |
|
3461 | Files that changed between either parent are marked as changed for | |
3462 | the next commit and a commit must be performed before any further |
|
3462 | the next commit and a commit must be performed before any further | |
3463 | updates to the repository are allowed. The next commit will have |
|
3463 | updates to the repository are allowed. The next commit will have | |
3464 | two parents. |
|
3464 | two parents. | |
3465 |
|
3465 | |||
3466 | ``--tool`` can be used to specify the merge tool used for file |
|
3466 | ``--tool`` can be used to specify the merge tool used for file | |
3467 | merges. It overrides the HGMERGE environment variable and your |
|
3467 | merges. It overrides the HGMERGE environment variable and your | |
3468 | configuration files. See :hg:`help merge-tools` for options. |
|
3468 | configuration files. See :hg:`help merge-tools` for options. | |
3469 |
|
3469 | |||
3470 | If no revision is specified, the working directory's parent is a |
|
3470 | If no revision is specified, the working directory's parent is a | |
3471 | head revision, and the current branch contains exactly one other |
|
3471 | head revision, and the current branch contains exactly one other | |
3472 | head, the other head is merged with by default. Otherwise, an |
|
3472 | head, the other head is merged with by default. Otherwise, an | |
3473 | explicit revision with which to merge with must be provided. |
|
3473 | explicit revision with which to merge with must be provided. | |
3474 |
|
3474 | |||
3475 | See :hg:`help resolve` for information on handling file conflicts. |
|
3475 | See :hg:`help resolve` for information on handling file conflicts. | |
3476 |
|
3476 | |||
3477 | To undo an uncommitted merge, use :hg:`update --clean .` which |
|
3477 | To undo an uncommitted merge, use :hg:`update --clean .` which | |
3478 | will check out a clean copy of the original merge parent, losing |
|
3478 | will check out a clean copy of the original merge parent, losing | |
3479 | all changes. |
|
3479 | all changes. | |
3480 |
|
3480 | |||
3481 | Returns 0 on success, 1 if there are unresolved files. |
|
3481 | Returns 0 on success, 1 if there are unresolved files. | |
3482 | """ |
|
3482 | """ | |
3483 |
|
3483 | |||
3484 | opts = pycompat.byteskwargs(opts) |
|
3484 | opts = pycompat.byteskwargs(opts) | |
3485 | if opts.get('rev') and node: |
|
3485 | if opts.get('rev') and node: | |
3486 | raise error.Abort(_("please specify just one revision")) |
|
3486 | raise error.Abort(_("please specify just one revision")) | |
3487 | if not node: |
|
3487 | if not node: | |
3488 | node = opts.get('rev') |
|
3488 | node = opts.get('rev') | |
3489 |
|
3489 | |||
3490 | if node: |
|
3490 | if node: | |
3491 | node = scmutil.revsingle(repo, node).node() |
|
3491 | node = scmutil.revsingle(repo, node).node() | |
3492 |
|
3492 | |||
3493 | if not node: |
|
3493 | if not node: | |
3494 | node = repo[destutil.destmerge(repo)].node() |
|
3494 | node = repo[destutil.destmerge(repo)].node() | |
3495 |
|
3495 | |||
3496 | if opts.get('preview'): |
|
3496 | if opts.get('preview'): | |
3497 | # find nodes that are ancestors of p2 but not of p1 |
|
3497 | # find nodes that are ancestors of p2 but not of p1 | |
3498 | p1 = repo.lookup('.') |
|
3498 | p1 = repo.lookup('.') | |
3499 | p2 = repo.lookup(node) |
|
3499 | p2 = repo.lookup(node) | |
3500 | nodes = repo.changelog.findmissing(common=[p1], heads=[p2]) |
|
3500 | nodes = repo.changelog.findmissing(common=[p1], heads=[p2]) | |
3501 |
|
3501 | |||
3502 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
3502 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
3503 | for node in nodes: |
|
3503 | for node in nodes: | |
3504 | displayer.show(repo[node]) |
|
3504 | displayer.show(repo[node]) | |
3505 | displayer.close() |
|
3505 | displayer.close() | |
3506 | return 0 |
|
3506 | return 0 | |
3507 |
|
3507 | |||
3508 | try: |
|
3508 | try: | |
3509 | # ui.forcemerge is an internal variable, do not document |
|
3509 | # ui.forcemerge is an internal variable, do not document | |
3510 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge') |
|
3510 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge') | |
3511 | force = opts.get('force') |
|
3511 | force = opts.get('force') | |
3512 | labels = ['working copy', 'merge rev'] |
|
3512 | labels = ['working copy', 'merge rev'] | |
3513 | return hg.merge(repo, node, force=force, mergeforce=force, |
|
3513 | return hg.merge(repo, node, force=force, mergeforce=force, | |
3514 | labels=labels) |
|
3514 | labels=labels) | |
3515 | finally: |
|
3515 | finally: | |
3516 | ui.setconfig('ui', 'forcemerge', '', 'merge') |
|
3516 | ui.setconfig('ui', 'forcemerge', '', 'merge') | |
3517 |
|
3517 | |||
3518 | @command('outgoing|out', |
|
3518 | @command('outgoing|out', | |
3519 | [('f', 'force', None, _('run even when the destination is unrelated')), |
|
3519 | [('f', 'force', None, _('run even when the destination is unrelated')), | |
3520 | ('r', 'rev', [], |
|
3520 | ('r', 'rev', [], | |
3521 | _('a changeset intended to be included in the destination'), _('REV')), |
|
3521 | _('a changeset intended to be included in the destination'), _('REV')), | |
3522 | ('n', 'newest-first', None, _('show newest record first')), |
|
3522 | ('n', 'newest-first', None, _('show newest record first')), | |
3523 | ('B', 'bookmarks', False, _('compare bookmarks')), |
|
3523 | ('B', 'bookmarks', False, _('compare bookmarks')), | |
3524 | ('b', 'branch', [], _('a specific branch you would like to push'), |
|
3524 | ('b', 'branch', [], _('a specific branch you would like to push'), | |
3525 | _('BRANCH')), |
|
3525 | _('BRANCH')), | |
3526 | ] + logopts + remoteopts + subrepoopts, |
|
3526 | ] + logopts + remoteopts + subrepoopts, | |
3527 | _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')) |
|
3527 | _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')) | |
3528 | def outgoing(ui, repo, dest=None, **opts): |
|
3528 | def outgoing(ui, repo, dest=None, **opts): | |
3529 | """show changesets not found in the destination |
|
3529 | """show changesets not found in the destination | |
3530 |
|
3530 | |||
3531 | Show changesets not found in the specified destination repository |
|
3531 | Show changesets not found in the specified destination repository | |
3532 | or the default push location. These are the changesets that would |
|
3532 | or the default push location. These are the changesets that would | |
3533 | be pushed if a push was requested. |
|
3533 | be pushed if a push was requested. | |
3534 |
|
3534 | |||
3535 | See pull for details of valid destination formats. |
|
3535 | See pull for details of valid destination formats. | |
3536 |
|
3536 | |||
3537 | .. container:: verbose |
|
3537 | .. container:: verbose | |
3538 |
|
3538 | |||
3539 | With -B/--bookmarks, the result of bookmark comparison between |
|
3539 | With -B/--bookmarks, the result of bookmark comparison between | |
3540 | local and remote repositories is displayed. With -v/--verbose, |
|
3540 | local and remote repositories is displayed. With -v/--verbose, | |
3541 | status is also displayed for each bookmark like below:: |
|
3541 | status is also displayed for each bookmark like below:: | |
3542 |
|
3542 | |||
3543 | BM1 01234567890a added |
|
3543 | BM1 01234567890a added | |
3544 | BM2 deleted |
|
3544 | BM2 deleted | |
3545 | BM3 234567890abc advanced |
|
3545 | BM3 234567890abc advanced | |
3546 | BM4 34567890abcd diverged |
|
3546 | BM4 34567890abcd diverged | |
3547 | BM5 4567890abcde changed |
|
3547 | BM5 4567890abcde changed | |
3548 |
|
3548 | |||
3549 | The action taken when pushing depends on the |
|
3549 | The action taken when pushing depends on the | |
3550 | status of each bookmark: |
|
3550 | status of each bookmark: | |
3551 |
|
3551 | |||
3552 | :``added``: push with ``-B`` will create it |
|
3552 | :``added``: push with ``-B`` will create it | |
3553 | :``deleted``: push with ``-B`` will delete it |
|
3553 | :``deleted``: push with ``-B`` will delete it | |
3554 | :``advanced``: push will update it |
|
3554 | :``advanced``: push will update it | |
3555 | :``diverged``: push with ``-B`` will update it |
|
3555 | :``diverged``: push with ``-B`` will update it | |
3556 | :``changed``: push with ``-B`` will update it |
|
3556 | :``changed``: push with ``-B`` will update it | |
3557 |
|
3557 | |||
3558 | From the point of view of pushing behavior, bookmarks |
|
3558 | From the point of view of pushing behavior, bookmarks | |
3559 | existing only in the remote repository are treated as |
|
3559 | existing only in the remote repository are treated as | |
3560 | ``deleted``, even if it is in fact added remotely. |
|
3560 | ``deleted``, even if it is in fact added remotely. | |
3561 |
|
3561 | |||
3562 | Returns 0 if there are outgoing changes, 1 otherwise. |
|
3562 | Returns 0 if there are outgoing changes, 1 otherwise. | |
3563 | """ |
|
3563 | """ | |
3564 | opts = pycompat.byteskwargs(opts) |
|
3564 | opts = pycompat.byteskwargs(opts) | |
3565 | if opts.get('graph'): |
|
3565 | if opts.get('graph'): | |
3566 | cmdutil.checkunsupportedgraphflags([], opts) |
|
3566 | cmdutil.checkunsupportedgraphflags([], opts) | |
3567 | o, other = hg._outgoing(ui, repo, dest, opts) |
|
3567 | o, other = hg._outgoing(ui, repo, dest, opts) | |
3568 | if not o: |
|
3568 | if not o: | |
3569 | cmdutil.outgoinghooks(ui, repo, other, opts, o) |
|
3569 | cmdutil.outgoinghooks(ui, repo, other, opts, o) | |
3570 | return |
|
3570 | return | |
3571 |
|
3571 | |||
3572 | revdag = cmdutil.graphrevs(repo, o, opts) |
|
3572 | revdag = cmdutil.graphrevs(repo, o, opts) | |
3573 | ui.pager('outgoing') |
|
3573 | ui.pager('outgoing') | |
3574 | displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True) |
|
3574 | displayer = cmdutil.show_changeset(ui, repo, opts, buffered=True) | |
3575 | cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges) |
|
3575 | cmdutil.displaygraph(ui, repo, revdag, displayer, graphmod.asciiedges) | |
3576 | cmdutil.outgoinghooks(ui, repo, other, opts, o) |
|
3576 | cmdutil.outgoinghooks(ui, repo, other, opts, o) | |
3577 | return 0 |
|
3577 | return 0 | |
3578 |
|
3578 | |||
3579 | if opts.get('bookmarks'): |
|
3579 | if opts.get('bookmarks'): | |
3580 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
3580 | dest = ui.expandpath(dest or 'default-push', dest or 'default') | |
3581 | dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
3581 | dest, branches = hg.parseurl(dest, opts.get('branch')) | |
3582 | other = hg.peer(repo, opts, dest) |
|
3582 | other = hg.peer(repo, opts, dest) | |
3583 | if 'bookmarks' not in other.listkeys('namespaces'): |
|
3583 | if 'bookmarks' not in other.listkeys('namespaces'): | |
3584 | ui.warn(_("remote doesn't support bookmarks\n")) |
|
3584 | ui.warn(_("remote doesn't support bookmarks\n")) | |
3585 | return 0 |
|
3585 | return 0 | |
3586 | ui.status(_('comparing with %s\n') % util.hidepassword(dest)) |
|
3586 | ui.status(_('comparing with %s\n') % util.hidepassword(dest)) | |
3587 | ui.pager('outgoing') |
|
3587 | ui.pager('outgoing') | |
3588 | return bookmarks.outgoing(ui, repo, other) |
|
3588 | return bookmarks.outgoing(ui, repo, other) | |
3589 |
|
3589 | |||
3590 | repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default') |
|
3590 | repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default') | |
3591 | try: |
|
3591 | try: | |
3592 | return hg.outgoing(ui, repo, dest, opts) |
|
3592 | return hg.outgoing(ui, repo, dest, opts) | |
3593 | finally: |
|
3593 | finally: | |
3594 | del repo._subtoppath |
|
3594 | del repo._subtoppath | |
3595 |
|
3595 | |||
3596 | @command('parents', |
|
3596 | @command('parents', | |
3597 | [('r', 'rev', '', _('show parents of the specified revision'), _('REV')), |
|
3597 | [('r', 'rev', '', _('show parents of the specified revision'), _('REV')), | |
3598 | ] + templateopts, |
|
3598 | ] + templateopts, | |
3599 | _('[-r REV] [FILE]'), |
|
3599 | _('[-r REV] [FILE]'), | |
3600 | inferrepo=True) |
|
3600 | inferrepo=True) | |
3601 | def parents(ui, repo, file_=None, **opts): |
|
3601 | def parents(ui, repo, file_=None, **opts): | |
3602 | """show the parents of the working directory or revision (DEPRECATED) |
|
3602 | """show the parents of the working directory or revision (DEPRECATED) | |
3603 |
|
3603 | |||
3604 | Print the working directory's parent revisions. If a revision is |
|
3604 | Print the working directory's parent revisions. If a revision is | |
3605 | given via -r/--rev, the parent of that revision will be printed. |
|
3605 | given via -r/--rev, the parent of that revision will be printed. | |
3606 | If a file argument is given, the revision in which the file was |
|
3606 | If a file argument is given, the revision in which the file was | |
3607 | last changed (before the working directory revision or the |
|
3607 | last changed (before the working directory revision or the | |
3608 | argument to --rev if given) is printed. |
|
3608 | argument to --rev if given) is printed. | |
3609 |
|
3609 | |||
3610 | This command is equivalent to:: |
|
3610 | This command is equivalent to:: | |
3611 |
|
3611 | |||
3612 | hg log -r "p1()+p2()" or |
|
3612 | hg log -r "p1()+p2()" or | |
3613 | hg log -r "p1(REV)+p2(REV)" or |
|
3613 | hg log -r "p1(REV)+p2(REV)" or | |
3614 | hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or |
|
3614 | hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or | |
3615 | hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))" |
|
3615 | hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))" | |
3616 |
|
3616 | |||
3617 | See :hg:`summary` and :hg:`help revsets` for related information. |
|
3617 | See :hg:`summary` and :hg:`help revsets` for related information. | |
3618 |
|
3618 | |||
3619 | Returns 0 on success. |
|
3619 | Returns 0 on success. | |
3620 | """ |
|
3620 | """ | |
3621 |
|
3621 | |||
3622 | opts = pycompat.byteskwargs(opts) |
|
3622 | opts = pycompat.byteskwargs(opts) | |
3623 | ctx = scmutil.revsingle(repo, opts.get('rev'), None) |
|
3623 | ctx = scmutil.revsingle(repo, opts.get('rev'), None) | |
3624 |
|
3624 | |||
3625 | if file_: |
|
3625 | if file_: | |
3626 | m = scmutil.match(ctx, (file_,), opts) |
|
3626 | m = scmutil.match(ctx, (file_,), opts) | |
3627 | if m.anypats() or len(m.files()) != 1: |
|
3627 | if m.anypats() or len(m.files()) != 1: | |
3628 | raise error.Abort(_('can only specify an explicit filename')) |
|
3628 | raise error.Abort(_('can only specify an explicit filename')) | |
3629 | file_ = m.files()[0] |
|
3629 | file_ = m.files()[0] | |
3630 | filenodes = [] |
|
3630 | filenodes = [] | |
3631 | for cp in ctx.parents(): |
|
3631 | for cp in ctx.parents(): | |
3632 | if not cp: |
|
3632 | if not cp: | |
3633 | continue |
|
3633 | continue | |
3634 | try: |
|
3634 | try: | |
3635 | filenodes.append(cp.filenode(file_)) |
|
3635 | filenodes.append(cp.filenode(file_)) | |
3636 | except error.LookupError: |
|
3636 | except error.LookupError: | |
3637 | pass |
|
3637 | pass | |
3638 | if not filenodes: |
|
3638 | if not filenodes: | |
3639 | raise error.Abort(_("'%s' not found in manifest!") % file_) |
|
3639 | raise error.Abort(_("'%s' not found in manifest!") % file_) | |
3640 | p = [] |
|
3640 | p = [] | |
3641 | for fn in filenodes: |
|
3641 | for fn in filenodes: | |
3642 | fctx = repo.filectx(file_, fileid=fn) |
|
3642 | fctx = repo.filectx(file_, fileid=fn) | |
3643 | p.append(fctx.node()) |
|
3643 | p.append(fctx.node()) | |
3644 | else: |
|
3644 | else: | |
3645 | p = [cp.node() for cp in ctx.parents()] |
|
3645 | p = [cp.node() for cp in ctx.parents()] | |
3646 |
|
3646 | |||
3647 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
3647 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
3648 | for n in p: |
|
3648 | for n in p: | |
3649 | if n != nullid: |
|
3649 | if n != nullid: | |
3650 | displayer.show(repo[n]) |
|
3650 | displayer.show(repo[n]) | |
3651 | displayer.close() |
|
3651 | displayer.close() | |
3652 |
|
3652 | |||
3653 | @command('paths', formatteropts, _('[NAME]'), optionalrepo=True) |
|
3653 | @command('paths', formatteropts, _('[NAME]'), optionalrepo=True) | |
3654 | def paths(ui, repo, search=None, **opts): |
|
3654 | def paths(ui, repo, search=None, **opts): | |
3655 | """show aliases for remote repositories |
|
3655 | """show aliases for remote repositories | |
3656 |
|
3656 | |||
3657 | Show definition of symbolic path name NAME. If no name is given, |
|
3657 | Show definition of symbolic path name NAME. If no name is given, | |
3658 | show definition of all available names. |
|
3658 | show definition of all available names. | |
3659 |
|
3659 | |||
3660 | Option -q/--quiet suppresses all output when searching for NAME |
|
3660 | Option -q/--quiet suppresses all output when searching for NAME | |
3661 | and shows only the path names when listing all definitions. |
|
3661 | and shows only the path names when listing all definitions. | |
3662 |
|
3662 | |||
3663 | Path names are defined in the [paths] section of your |
|
3663 | Path names are defined in the [paths] section of your | |
3664 | configuration file and in ``/etc/mercurial/hgrc``. If run inside a |
|
3664 | configuration file and in ``/etc/mercurial/hgrc``. If run inside a | |
3665 | repository, ``.hg/hgrc`` is used, too. |
|
3665 | repository, ``.hg/hgrc`` is used, too. | |
3666 |
|
3666 | |||
3667 | The path names ``default`` and ``default-push`` have a special |
|
3667 | The path names ``default`` and ``default-push`` have a special | |
3668 | meaning. When performing a push or pull operation, they are used |
|
3668 | meaning. When performing a push or pull operation, they are used | |
3669 | as fallbacks if no location is specified on the command-line. |
|
3669 | as fallbacks if no location is specified on the command-line. | |
3670 | When ``default-push`` is set, it will be used for push and |
|
3670 | When ``default-push`` is set, it will be used for push and | |
3671 | ``default`` will be used for pull; otherwise ``default`` is used |
|
3671 | ``default`` will be used for pull; otherwise ``default`` is used | |
3672 | as the fallback for both. When cloning a repository, the clone |
|
3672 | as the fallback for both. When cloning a repository, the clone | |
3673 | source is written as ``default`` in ``.hg/hgrc``. |
|
3673 | source is written as ``default`` in ``.hg/hgrc``. | |
3674 |
|
3674 | |||
3675 | .. note:: |
|
3675 | .. note:: | |
3676 |
|
3676 | |||
3677 | ``default`` and ``default-push`` apply to all inbound (e.g. |
|
3677 | ``default`` and ``default-push`` apply to all inbound (e.g. | |
3678 | :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` |
|
3678 | :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` | |
3679 | and :hg:`bundle`) operations. |
|
3679 | and :hg:`bundle`) operations. | |
3680 |
|
3680 | |||
3681 | See :hg:`help urls` for more information. |
|
3681 | See :hg:`help urls` for more information. | |
3682 |
|
3682 | |||
3683 | Returns 0 on success. |
|
3683 | Returns 0 on success. | |
3684 | """ |
|
3684 | """ | |
3685 |
|
3685 | |||
3686 | opts = pycompat.byteskwargs(opts) |
|
3686 | opts = pycompat.byteskwargs(opts) | |
3687 | ui.pager('paths') |
|
3687 | ui.pager('paths') | |
3688 | if search: |
|
3688 | if search: | |
3689 | pathitems = [(name, path) for name, path in ui.paths.iteritems() |
|
3689 | pathitems = [(name, path) for name, path in ui.paths.iteritems() | |
3690 | if name == search] |
|
3690 | if name == search] | |
3691 | else: |
|
3691 | else: | |
3692 | pathitems = sorted(ui.paths.iteritems()) |
|
3692 | pathitems = sorted(ui.paths.iteritems()) | |
3693 |
|
3693 | |||
3694 | fm = ui.formatter('paths', opts) |
|
3694 | fm = ui.formatter('paths', opts) | |
3695 | if fm.isplain(): |
|
3695 | if fm.isplain(): | |
3696 | hidepassword = util.hidepassword |
|
3696 | hidepassword = util.hidepassword | |
3697 | else: |
|
3697 | else: | |
3698 | hidepassword = str |
|
3698 | hidepassword = str | |
3699 | if ui.quiet: |
|
3699 | if ui.quiet: | |
3700 | namefmt = '%s\n' |
|
3700 | namefmt = '%s\n' | |
3701 | else: |
|
3701 | else: | |
3702 | namefmt = '%s = ' |
|
3702 | namefmt = '%s = ' | |
3703 | showsubopts = not search and not ui.quiet |
|
3703 | showsubopts = not search and not ui.quiet | |
3704 |
|
3704 | |||
3705 | for name, path in pathitems: |
|
3705 | for name, path in pathitems: | |
3706 | fm.startitem() |
|
3706 | fm.startitem() | |
3707 | fm.condwrite(not search, 'name', namefmt, name) |
|
3707 | fm.condwrite(not search, 'name', namefmt, name) | |
3708 | fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc)) |
|
3708 | fm.condwrite(not ui.quiet, 'url', '%s\n', hidepassword(path.rawloc)) | |
3709 | for subopt, value in sorted(path.suboptions.items()): |
|
3709 | for subopt, value in sorted(path.suboptions.items()): | |
3710 | assert subopt not in ('name', 'url') |
|
3710 | assert subopt not in ('name', 'url') | |
3711 | if showsubopts: |
|
3711 | if showsubopts: | |
3712 | fm.plain('%s:%s = ' % (name, subopt)) |
|
3712 | fm.plain('%s:%s = ' % (name, subopt)) | |
3713 | fm.condwrite(showsubopts, subopt, '%s\n', value) |
|
3713 | fm.condwrite(showsubopts, subopt, '%s\n', value) | |
3714 |
|
3714 | |||
3715 | fm.end() |
|
3715 | fm.end() | |
3716 |
|
3716 | |||
3717 | if search and not pathitems: |
|
3717 | if search and not pathitems: | |
3718 | if not ui.quiet: |
|
3718 | if not ui.quiet: | |
3719 | ui.warn(_("not found!\n")) |
|
3719 | ui.warn(_("not found!\n")) | |
3720 | return 1 |
|
3720 | return 1 | |
3721 | else: |
|
3721 | else: | |
3722 | return 0 |
|
3722 | return 0 | |
3723 |
|
3723 | |||
3724 | @command('phase', |
|
3724 | @command('phase', | |
3725 | [('p', 'public', False, _('set changeset phase to public')), |
|
3725 | [('p', 'public', False, _('set changeset phase to public')), | |
3726 | ('d', 'draft', False, _('set changeset phase to draft')), |
|
3726 | ('d', 'draft', False, _('set changeset phase to draft')), | |
3727 | ('s', 'secret', False, _('set changeset phase to secret')), |
|
3727 | ('s', 'secret', False, _('set changeset phase to secret')), | |
3728 | ('f', 'force', False, _('allow to move boundary backward')), |
|
3728 | ('f', 'force', False, _('allow to move boundary backward')), | |
3729 | ('r', 'rev', [], _('target revision'), _('REV')), |
|
3729 | ('r', 'rev', [], _('target revision'), _('REV')), | |
3730 | ], |
|
3730 | ], | |
3731 | _('[-p|-d|-s] [-f] [-r] [REV...]')) |
|
3731 | _('[-p|-d|-s] [-f] [-r] [REV...]')) | |
3732 | def phase(ui, repo, *revs, **opts): |
|
3732 | def phase(ui, repo, *revs, **opts): | |
3733 | """set or show the current phase name |
|
3733 | """set or show the current phase name | |
3734 |
|
3734 | |||
3735 | With no argument, show the phase name of the current revision(s). |
|
3735 | With no argument, show the phase name of the current revision(s). | |
3736 |
|
3736 | |||
3737 | With one of -p/--public, -d/--draft or -s/--secret, change the |
|
3737 | With one of -p/--public, -d/--draft or -s/--secret, change the | |
3738 | phase value of the specified revisions. |
|
3738 | phase value of the specified revisions. | |
3739 |
|
3739 | |||
3740 | Unless -f/--force is specified, :hg:`phase` won't move changeset from a |
|
3740 | Unless -f/--force is specified, :hg:`phase` won't move changeset from a | |
3741 | lower phase to an higher phase. Phases are ordered as follows:: |
|
3741 | lower phase to an higher phase. Phases are ordered as follows:: | |
3742 |
|
3742 | |||
3743 | public < draft < secret |
|
3743 | public < draft < secret | |
3744 |
|
3744 | |||
3745 | Returns 0 on success, 1 if some phases could not be changed. |
|
3745 | Returns 0 on success, 1 if some phases could not be changed. | |
3746 |
|
3746 | |||
3747 | (For more information about the phases concept, see :hg:`help phases`.) |
|
3747 | (For more information about the phases concept, see :hg:`help phases`.) | |
3748 | """ |
|
3748 | """ | |
3749 | opts = pycompat.byteskwargs(opts) |
|
3749 | opts = pycompat.byteskwargs(opts) | |
3750 | # search for a unique phase argument |
|
3750 | # search for a unique phase argument | |
3751 | targetphase = None |
|
3751 | targetphase = None | |
3752 | for idx, name in enumerate(phases.phasenames): |
|
3752 | for idx, name in enumerate(phases.phasenames): | |
3753 | if opts[name]: |
|
3753 | if opts[name]: | |
3754 | if targetphase is not None: |
|
3754 | if targetphase is not None: | |
3755 | raise error.Abort(_('only one phase can be specified')) |
|
3755 | raise error.Abort(_('only one phase can be specified')) | |
3756 | targetphase = idx |
|
3756 | targetphase = idx | |
3757 |
|
3757 | |||
3758 | # look for specified revision |
|
3758 | # look for specified revision | |
3759 | revs = list(revs) |
|
3759 | revs = list(revs) | |
3760 | revs.extend(opts['rev']) |
|
3760 | revs.extend(opts['rev']) | |
3761 | if not revs: |
|
3761 | if not revs: | |
3762 | # display both parents as the second parent phase can influence |
|
3762 | # display both parents as the second parent phase can influence | |
3763 | # the phase of a merge commit |
|
3763 | # the phase of a merge commit | |
3764 | revs = [c.rev() for c in repo[None].parents()] |
|
3764 | revs = [c.rev() for c in repo[None].parents()] | |
3765 |
|
3765 | |||
3766 | revs = scmutil.revrange(repo, revs) |
|
3766 | revs = scmutil.revrange(repo, revs) | |
3767 |
|
3767 | |||
3768 | lock = None |
|
3768 | lock = None | |
3769 | ret = 0 |
|
3769 | ret = 0 | |
3770 | if targetphase is None: |
|
3770 | if targetphase is None: | |
3771 | # display |
|
3771 | # display | |
3772 | for r in revs: |
|
3772 | for r in revs: | |
3773 | ctx = repo[r] |
|
3773 | ctx = repo[r] | |
3774 | ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr())) |
|
3774 | ui.write('%i: %s\n' % (ctx.rev(), ctx.phasestr())) | |
3775 | else: |
|
3775 | else: | |
3776 | tr = None |
|
3776 | tr = None | |
3777 | lock = repo.lock() |
|
3777 | lock = repo.lock() | |
3778 | try: |
|
3778 | try: | |
3779 | tr = repo.transaction("phase") |
|
3779 | tr = repo.transaction("phase") | |
3780 | # set phase |
|
3780 | # set phase | |
3781 | if not revs: |
|
3781 | if not revs: | |
3782 | raise error.Abort(_('empty revision set')) |
|
3782 | raise error.Abort(_('empty revision set')) | |
3783 | nodes = [repo[r].node() for r in revs] |
|
3783 | nodes = [repo[r].node() for r in revs] | |
3784 | # moving revision from public to draft may hide them |
|
3784 | # moving revision from public to draft may hide them | |
3785 | # We have to check result on an unfiltered repository |
|
3785 | # We have to check result on an unfiltered repository | |
3786 | unfi = repo.unfiltered() |
|
3786 | unfi = repo.unfiltered() | |
3787 | getphase = unfi._phasecache.phase |
|
3787 | getphase = unfi._phasecache.phase | |
3788 | olddata = [getphase(unfi, r) for r in unfi] |
|
3788 | olddata = [getphase(unfi, r) for r in unfi] | |
3789 | phases.advanceboundary(repo, tr, targetphase, nodes) |
|
3789 | phases.advanceboundary(repo, tr, targetphase, nodes) | |
3790 | if opts['force']: |
|
3790 | if opts['force']: | |
3791 | phases.retractboundary(repo, tr, targetphase, nodes) |
|
3791 | phases.retractboundary(repo, tr, targetphase, nodes) | |
3792 | tr.close() |
|
3792 | tr.close() | |
3793 | finally: |
|
3793 | finally: | |
3794 | if tr is not None: |
|
3794 | if tr is not None: | |
3795 | tr.release() |
|
3795 | tr.release() | |
3796 | lock.release() |
|
3796 | lock.release() | |
3797 | getphase = unfi._phasecache.phase |
|
3797 | getphase = unfi._phasecache.phase | |
3798 | newdata = [getphase(unfi, r) for r in unfi] |
|
3798 | newdata = [getphase(unfi, r) for r in unfi] | |
3799 | changes = sum(newdata[r] != olddata[r] for r in unfi) |
|
3799 | changes = sum(newdata[r] != olddata[r] for r in unfi) | |
3800 | cl = unfi.changelog |
|
3800 | cl = unfi.changelog | |
3801 | rejected = [n for n in nodes |
|
3801 | rejected = [n for n in nodes | |
3802 | if newdata[cl.rev(n)] < targetphase] |
|
3802 | if newdata[cl.rev(n)] < targetphase] | |
3803 | if rejected: |
|
3803 | if rejected: | |
3804 | ui.warn(_('cannot move %i changesets to a higher ' |
|
3804 | ui.warn(_('cannot move %i changesets to a higher ' | |
3805 | 'phase, use --force\n') % len(rejected)) |
|
3805 | 'phase, use --force\n') % len(rejected)) | |
3806 | ret = 1 |
|
3806 | ret = 1 | |
3807 | if changes: |
|
3807 | if changes: | |
3808 | msg = _('phase changed for %i changesets\n') % changes |
|
3808 | msg = _('phase changed for %i changesets\n') % changes | |
3809 | if ret: |
|
3809 | if ret: | |
3810 | ui.status(msg) |
|
3810 | ui.status(msg) | |
3811 | else: |
|
3811 | else: | |
3812 | ui.note(msg) |
|
3812 | ui.note(msg) | |
3813 | else: |
|
3813 | else: | |
3814 | ui.warn(_('no phases changed\n')) |
|
3814 | ui.warn(_('no phases changed\n')) | |
3815 | return ret |
|
3815 | return ret | |
3816 |
|
3816 | |||
3817 | def postincoming(ui, repo, modheads, optupdate, checkout, brev): |
|
3817 | def postincoming(ui, repo, modheads, optupdate, checkout, brev): | |
3818 | """Run after a changegroup has been added via pull/unbundle |
|
3818 | """Run after a changegroup has been added via pull/unbundle | |
3819 |
|
3819 | |||
3820 | This takes arguments below: |
|
3820 | This takes arguments below: | |
3821 |
|
3821 | |||
3822 | :modheads: change of heads by pull/unbundle |
|
3822 | :modheads: change of heads by pull/unbundle | |
3823 | :optupdate: updating working directory is needed or not |
|
3823 | :optupdate: updating working directory is needed or not | |
3824 | :checkout: update destination revision (or None to default destination) |
|
3824 | :checkout: update destination revision (or None to default destination) | |
3825 | :brev: a name, which might be a bookmark to be activated after updating |
|
3825 | :brev: a name, which might be a bookmark to be activated after updating | |
3826 | """ |
|
3826 | """ | |
3827 | if modheads == 0: |
|
3827 | if modheads == 0: | |
3828 | return |
|
3828 | return | |
3829 | if optupdate: |
|
3829 | if optupdate: | |
3830 | try: |
|
3830 | try: | |
3831 | return hg.updatetotally(ui, repo, checkout, brev) |
|
3831 | return hg.updatetotally(ui, repo, checkout, brev) | |
3832 | except error.UpdateAbort as inst: |
|
3832 | except error.UpdateAbort as inst: | |
3833 | msg = _("not updating: %s") % str(inst) |
|
3833 | msg = _("not updating: %s") % str(inst) | |
3834 | hint = inst.hint |
|
3834 | hint = inst.hint | |
3835 | raise error.UpdateAbort(msg, hint=hint) |
|
3835 | raise error.UpdateAbort(msg, hint=hint) | |
3836 | if modheads > 1: |
|
3836 | if modheads > 1: | |
3837 | currentbranchheads = len(repo.branchheads()) |
|
3837 | currentbranchheads = len(repo.branchheads()) | |
3838 | if currentbranchheads == modheads: |
|
3838 | if currentbranchheads == modheads: | |
3839 | ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) |
|
3839 | ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) | |
3840 | elif currentbranchheads > 1: |
|
3840 | elif currentbranchheads > 1: | |
3841 | ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to " |
|
3841 | ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to " | |
3842 | "merge)\n")) |
|
3842 | "merge)\n")) | |
3843 | else: |
|
3843 | else: | |
3844 | ui.status(_("(run 'hg heads' to see heads)\n")) |
|
3844 | ui.status(_("(run 'hg heads' to see heads)\n")) | |
3845 | else: |
|
3845 | else: | |
3846 | ui.status(_("(run 'hg update' to get a working copy)\n")) |
|
3846 | ui.status(_("(run 'hg update' to get a working copy)\n")) | |
3847 |
|
3847 | |||
3848 | @command('^pull', |
|
3848 | @command('^pull', | |
3849 | [('u', 'update', None, |
|
3849 | [('u', 'update', None, | |
3850 | _('update to new branch head if changesets were pulled')), |
|
3850 | _('update to new branch head if changesets were pulled')), | |
3851 | ('f', 'force', None, _('run even when remote repository is unrelated')), |
|
3851 | ('f', 'force', None, _('run even when remote repository is unrelated')), | |
3852 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), |
|
3852 | ('r', 'rev', [], _('a remote changeset intended to be added'), _('REV')), | |
3853 | ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')), |
|
3853 | ('B', 'bookmark', [], _("bookmark to pull"), _('BOOKMARK')), | |
3854 | ('b', 'branch', [], _('a specific branch you would like to pull'), |
|
3854 | ('b', 'branch', [], _('a specific branch you would like to pull'), | |
3855 | _('BRANCH')), |
|
3855 | _('BRANCH')), | |
3856 | ] + remoteopts, |
|
3856 | ] + remoteopts, | |
3857 | _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')) |
|
3857 | _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')) | |
3858 | def pull(ui, repo, source="default", **opts): |
|
3858 | def pull(ui, repo, source="default", **opts): | |
3859 | """pull changes from the specified source |
|
3859 | """pull changes from the specified source | |
3860 |
|
3860 | |||
3861 | Pull changes from a remote repository to a local one. |
|
3861 | Pull changes from a remote repository to a local one. | |
3862 |
|
3862 | |||
3863 | This finds all changes from the repository at the specified path |
|
3863 | This finds all changes from the repository at the specified path | |
3864 | or URL and adds them to a local repository (the current one unless |
|
3864 | or URL and adds them to a local repository (the current one unless | |
3865 | -R is specified). By default, this does not update the copy of the |
|
3865 | -R is specified). By default, this does not update the copy of the | |
3866 | project in the working directory. |
|
3866 | project in the working directory. | |
3867 |
|
3867 | |||
3868 | Use :hg:`incoming` if you want to see what would have been added |
|
3868 | Use :hg:`incoming` if you want to see what would have been added | |
3869 | by a pull at the time you issued this command. If you then decide |
|
3869 | by a pull at the time you issued this command. If you then decide | |
3870 | to add those changes to the repository, you should use :hg:`pull |
|
3870 | to add those changes to the repository, you should use :hg:`pull | |
3871 | -r X` where ``X`` is the last changeset listed by :hg:`incoming`. |
|
3871 | -r X` where ``X`` is the last changeset listed by :hg:`incoming`. | |
3872 |
|
3872 | |||
3873 | If SOURCE is omitted, the 'default' path will be used. |
|
3873 | If SOURCE is omitted, the 'default' path will be used. | |
3874 | See :hg:`help urls` for more information. |
|
3874 | See :hg:`help urls` for more information. | |
3875 |
|
3875 | |||
3876 | Specifying bookmark as ``.`` is equivalent to specifying the active |
|
3876 | Specifying bookmark as ``.`` is equivalent to specifying the active | |
3877 | bookmark's name. |
|
3877 | bookmark's name. | |
3878 |
|
3878 | |||
3879 | Returns 0 on success, 1 if an update had unresolved files. |
|
3879 | Returns 0 on success, 1 if an update had unresolved files. | |
3880 | """ |
|
3880 | """ | |
3881 |
|
3881 | |||
3882 | opts = pycompat.byteskwargs(opts) |
|
3882 | opts = pycompat.byteskwargs(opts) | |
3883 | if ui.configbool('commands', 'update.requiredest') and opts.get('update'): |
|
3883 | if ui.configbool('commands', 'update.requiredest') and opts.get('update'): | |
3884 | msg = _('update destination required by configuration') |
|
3884 | msg = _('update destination required by configuration') | |
3885 | hint = _('use hg pull followed by hg update DEST') |
|
3885 | hint = _('use hg pull followed by hg update DEST') | |
3886 | raise error.Abort(msg, hint=hint) |
|
3886 | raise error.Abort(msg, hint=hint) | |
3887 |
|
3887 | |||
3888 | source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) |
|
3888 | source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch')) | |
3889 | ui.status(_('pulling from %s\n') % util.hidepassword(source)) |
|
3889 | ui.status(_('pulling from %s\n') % util.hidepassword(source)) | |
3890 | other = hg.peer(repo, opts, source) |
|
3890 | other = hg.peer(repo, opts, source) | |
3891 | try: |
|
3891 | try: | |
3892 | revs, checkout = hg.addbranchrevs(repo, other, branches, |
|
3892 | revs, checkout = hg.addbranchrevs(repo, other, branches, | |
3893 | opts.get('rev')) |
|
3893 | opts.get('rev')) | |
3894 |
|
3894 | |||
3895 |
|
3895 | |||
3896 | pullopargs = {} |
|
3896 | pullopargs = {} | |
3897 | if opts.get('bookmark'): |
|
3897 | if opts.get('bookmark'): | |
3898 | if not revs: |
|
3898 | if not revs: | |
3899 | revs = [] |
|
3899 | revs = [] | |
3900 | # The list of bookmark used here is not the one used to actually |
|
3900 | # The list of bookmark used here is not the one used to actually | |
3901 | # update the bookmark name. This can result in the revision pulled |
|
3901 | # update the bookmark name. This can result in the revision pulled | |
3902 | # not ending up with the name of the bookmark because of a race |
|
3902 | # not ending up with the name of the bookmark because of a race | |
3903 | # condition on the server. (See issue 4689 for details) |
|
3903 | # condition on the server. (See issue 4689 for details) | |
3904 | remotebookmarks = other.listkeys('bookmarks') |
|
3904 | remotebookmarks = other.listkeys('bookmarks') | |
3905 | pullopargs['remotebookmarks'] = remotebookmarks |
|
3905 | pullopargs['remotebookmarks'] = remotebookmarks | |
3906 | for b in opts['bookmark']: |
|
3906 | for b in opts['bookmark']: | |
3907 | b = repo._bookmarks.expandname(b) |
|
3907 | b = repo._bookmarks.expandname(b) | |
3908 | if b not in remotebookmarks: |
|
3908 | if b not in remotebookmarks: | |
3909 | raise error.Abort(_('remote bookmark %s not found!') % b) |
|
3909 | raise error.Abort(_('remote bookmark %s not found!') % b) | |
3910 | revs.append(remotebookmarks[b]) |
|
3910 | revs.append(remotebookmarks[b]) | |
3911 |
|
3911 | |||
3912 | if revs: |
|
3912 | if revs: | |
3913 | try: |
|
3913 | try: | |
3914 | # When 'rev' is a bookmark name, we cannot guarantee that it |
|
3914 | # When 'rev' is a bookmark name, we cannot guarantee that it | |
3915 | # will be updated with that name because of a race condition |
|
3915 | # will be updated with that name because of a race condition | |
3916 | # server side. (See issue 4689 for details) |
|
3916 | # server side. (See issue 4689 for details) | |
3917 | oldrevs = revs |
|
3917 | oldrevs = revs | |
3918 | revs = [] # actually, nodes |
|
3918 | revs = [] # actually, nodes | |
3919 | for r in oldrevs: |
|
3919 | for r in oldrevs: | |
3920 | node = other.lookup(r) |
|
3920 | node = other.lookup(r) | |
3921 | revs.append(node) |
|
3921 | revs.append(node) | |
3922 | if r == checkout: |
|
3922 | if r == checkout: | |
3923 | checkout = node |
|
3923 | checkout = node | |
3924 | except error.CapabilityError: |
|
3924 | except error.CapabilityError: | |
3925 | err = _("other repository doesn't support revision lookup, " |
|
3925 | err = _("other repository doesn't support revision lookup, " | |
3926 | "so a rev cannot be specified.") |
|
3926 | "so a rev cannot be specified.") | |
3927 | raise error.Abort(err) |
|
3927 | raise error.Abort(err) | |
3928 |
|
3928 | |||
3929 | pullopargs.update(opts.get('opargs', {})) |
|
3929 | pullopargs.update(opts.get('opargs', {})) | |
3930 | modheads = exchange.pull(repo, other, heads=revs, |
|
3930 | modheads = exchange.pull(repo, other, heads=revs, | |
3931 | force=opts.get('force'), |
|
3931 | force=opts.get('force'), | |
3932 | bookmarks=opts.get('bookmark', ()), |
|
3932 | bookmarks=opts.get('bookmark', ()), | |
3933 | opargs=pullopargs).cgresult |
|
3933 | opargs=pullopargs).cgresult | |
3934 |
|
3934 | |||
3935 | # brev is a name, which might be a bookmark to be activated at |
|
3935 | # brev is a name, which might be a bookmark to be activated at | |
3936 | # the end of the update. In other words, it is an explicit |
|
3936 | # the end of the update. In other words, it is an explicit | |
3937 | # destination of the update |
|
3937 | # destination of the update | |
3938 | brev = None |
|
3938 | brev = None | |
3939 |
|
3939 | |||
3940 | if checkout: |
|
3940 | if checkout: | |
3941 | checkout = str(repo.changelog.rev(checkout)) |
|
3941 | checkout = str(repo.changelog.rev(checkout)) | |
3942 |
|
3942 | |||
3943 | # order below depends on implementation of |
|
3943 | # order below depends on implementation of | |
3944 | # hg.addbranchrevs(). opts['bookmark'] is ignored, |
|
3944 | # hg.addbranchrevs(). opts['bookmark'] is ignored, | |
3945 | # because 'checkout' is determined without it. |
|
3945 | # because 'checkout' is determined without it. | |
3946 | if opts.get('rev'): |
|
3946 | if opts.get('rev'): | |
3947 | brev = opts['rev'][0] |
|
3947 | brev = opts['rev'][0] | |
3948 | elif opts.get('branch'): |
|
3948 | elif opts.get('branch'): | |
3949 | brev = opts['branch'][0] |
|
3949 | brev = opts['branch'][0] | |
3950 | else: |
|
3950 | else: | |
3951 | brev = branches[0] |
|
3951 | brev = branches[0] | |
3952 | repo._subtoppath = source |
|
3952 | repo._subtoppath = source | |
3953 | try: |
|
3953 | try: | |
3954 | ret = postincoming(ui, repo, modheads, opts.get('update'), |
|
3954 | ret = postincoming(ui, repo, modheads, opts.get('update'), | |
3955 | checkout, brev) |
|
3955 | checkout, brev) | |
3956 |
|
3956 | |||
3957 | finally: |
|
3957 | finally: | |
3958 | del repo._subtoppath |
|
3958 | del repo._subtoppath | |
3959 |
|
3959 | |||
3960 | finally: |
|
3960 | finally: | |
3961 | other.close() |
|
3961 | other.close() | |
3962 | return ret |
|
3962 | return ret | |
3963 |
|
3963 | |||
3964 | @command('^push', |
|
3964 | @command('^push', | |
3965 | [('f', 'force', None, _('force push')), |
|
3965 | [('f', 'force', None, _('force push')), | |
3966 | ('r', 'rev', [], |
|
3966 | ('r', 'rev', [], | |
3967 | _('a changeset intended to be included in the destination'), |
|
3967 | _('a changeset intended to be included in the destination'), | |
3968 | _('REV')), |
|
3968 | _('REV')), | |
3969 | ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')), |
|
3969 | ('B', 'bookmark', [], _("bookmark to push"), _('BOOKMARK')), | |
3970 | ('b', 'branch', [], |
|
3970 | ('b', 'branch', [], | |
3971 | _('a specific branch you would like to push'), _('BRANCH')), |
|
3971 | _('a specific branch you would like to push'), _('BRANCH')), | |
3972 | ('', 'new-branch', False, _('allow pushing a new branch')), |
|
3972 | ('', 'new-branch', False, _('allow pushing a new branch')), | |
3973 | ('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')), |
|
3973 | ('', 'pushvars', [], _('variables that can be sent to server (ADVANCED)')), | |
3974 | ] + remoteopts, |
|
3974 | ] + remoteopts, | |
3975 | _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')) |
|
3975 | _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')) | |
3976 | def push(ui, repo, dest=None, **opts): |
|
3976 | def push(ui, repo, dest=None, **opts): | |
3977 | """push changes to the specified destination |
|
3977 | """push changes to the specified destination | |
3978 |
|
3978 | |||
3979 | Push changesets from the local repository to the specified |
|
3979 | Push changesets from the local repository to the specified | |
3980 | destination. |
|
3980 | destination. | |
3981 |
|
3981 | |||
3982 | This operation is symmetrical to pull: it is identical to a pull |
|
3982 | This operation is symmetrical to pull: it is identical to a pull | |
3983 | in the destination repository from the current one. |
|
3983 | in the destination repository from the current one. | |
3984 |
|
3984 | |||
3985 | By default, push will not allow creation of new heads at the |
|
3985 | By default, push will not allow creation of new heads at the | |
3986 | destination, since multiple heads would make it unclear which head |
|
3986 | destination, since multiple heads would make it unclear which head | |
3987 | to use. In this situation, it is recommended to pull and merge |
|
3987 | to use. In this situation, it is recommended to pull and merge | |
3988 | before pushing. |
|
3988 | before pushing. | |
3989 |
|
3989 | |||
3990 | Use --new-branch if you want to allow push to create a new named |
|
3990 | Use --new-branch if you want to allow push to create a new named | |
3991 | branch that is not present at the destination. This allows you to |
|
3991 | branch that is not present at the destination. This allows you to | |
3992 | only create a new branch without forcing other changes. |
|
3992 | only create a new branch without forcing other changes. | |
3993 |
|
3993 | |||
3994 | .. note:: |
|
3994 | .. note:: | |
3995 |
|
3995 | |||
3996 | Extra care should be taken with the -f/--force option, |
|
3996 | Extra care should be taken with the -f/--force option, | |
3997 | which will push all new heads on all branches, an action which will |
|
3997 | which will push all new heads on all branches, an action which will | |
3998 | almost always cause confusion for collaborators. |
|
3998 | almost always cause confusion for collaborators. | |
3999 |
|
3999 | |||
4000 | If -r/--rev is used, the specified revision and all its ancestors |
|
4000 | If -r/--rev is used, the specified revision and all its ancestors | |
4001 | will be pushed to the remote repository. |
|
4001 | will be pushed to the remote repository. | |
4002 |
|
4002 | |||
4003 | If -B/--bookmark is used, the specified bookmarked revision, its |
|
4003 | If -B/--bookmark is used, the specified bookmarked revision, its | |
4004 | ancestors, and the bookmark will be pushed to the remote |
|
4004 | ancestors, and the bookmark will be pushed to the remote | |
4005 | repository. Specifying ``.`` is equivalent to specifying the active |
|
4005 | repository. Specifying ``.`` is equivalent to specifying the active | |
4006 | bookmark's name. |
|
4006 | bookmark's name. | |
4007 |
|
4007 | |||
4008 | Please see :hg:`help urls` for important details about ``ssh://`` |
|
4008 | Please see :hg:`help urls` for important details about ``ssh://`` | |
4009 | URLs. If DESTINATION is omitted, a default path will be used. |
|
4009 | URLs. If DESTINATION is omitted, a default path will be used. | |
4010 |
|
4010 | |||
4011 | .. container:: verbose |
|
4011 | .. container:: verbose | |
4012 |
|
4012 | |||
4013 | The --pushvars option sends strings to the server that become |
|
4013 | The --pushvars option sends strings to the server that become | |
4014 | environment variables prepended with ``HG_USERVAR_``. For example, |
|
4014 | environment variables prepended with ``HG_USERVAR_``. For example, | |
4015 | ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with |
|
4015 | ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with | |
4016 | ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment. |
|
4016 | ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment. | |
4017 |
|
4017 | |||
4018 | pushvars can provide for user-overridable hooks as well as set debug |
|
4018 | pushvars can provide for user-overridable hooks as well as set debug | |
4019 | levels. One example is having a hook that blocks commits containing |
|
4019 | levels. One example is having a hook that blocks commits containing | |
4020 | conflict markers, but enables the user to override the hook if the file |
|
4020 | conflict markers, but enables the user to override the hook if the file | |
4021 | is using conflict markers for testing purposes or the file format has |
|
4021 | is using conflict markers for testing purposes or the file format has | |
4022 | strings that look like conflict markers. |
|
4022 | strings that look like conflict markers. | |
4023 |
|
4023 | |||
4024 | By default, servers will ignore `--pushvars`. To enable it add the |
|
4024 | By default, servers will ignore `--pushvars`. To enable it add the | |
4025 | following to your configuration file |
|
4025 | following to your configuration file | |
4026 |
|
4026 | |||
4027 | [push] |
|
4027 | [push] | |
4028 | pushvars.server = true |
|
4028 | pushvars.server = true | |
4029 |
|
4029 | |||
4030 | Returns 0 if push was successful, 1 if nothing to push. |
|
4030 | Returns 0 if push was successful, 1 if nothing to push. | |
4031 | """ |
|
4031 | """ | |
4032 |
|
4032 | |||
4033 | opts = pycompat.byteskwargs(opts) |
|
4033 | opts = pycompat.byteskwargs(opts) | |
4034 | if opts.get('bookmark'): |
|
4034 | if opts.get('bookmark'): | |
4035 | ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push') |
|
4035 | ui.setconfig('bookmarks', 'pushing', opts['bookmark'], 'push') | |
4036 | for b in opts['bookmark']: |
|
4036 | for b in opts['bookmark']: | |
4037 | # translate -B options to -r so changesets get pushed |
|
4037 | # translate -B options to -r so changesets get pushed | |
4038 | b = repo._bookmarks.expandname(b) |
|
4038 | b = repo._bookmarks.expandname(b) | |
4039 | if b in repo._bookmarks: |
|
4039 | if b in repo._bookmarks: | |
4040 | opts.setdefault('rev', []).append(b) |
|
4040 | opts.setdefault('rev', []).append(b) | |
4041 | else: |
|
4041 | else: | |
4042 | # if we try to push a deleted bookmark, translate it to null |
|
4042 | # if we try to push a deleted bookmark, translate it to null | |
4043 | # this lets simultaneous -r, -b options continue working |
|
4043 | # this lets simultaneous -r, -b options continue working | |
4044 | opts.setdefault('rev', []).append("null") |
|
4044 | opts.setdefault('rev', []).append("null") | |
4045 |
|
4045 | |||
4046 | path = ui.paths.getpath(dest, default=('default-push', 'default')) |
|
4046 | path = ui.paths.getpath(dest, default=('default-push', 'default')) | |
4047 | if not path: |
|
4047 | if not path: | |
4048 | raise error.Abort(_('default repository not configured!'), |
|
4048 | raise error.Abort(_('default repository not configured!'), | |
4049 | hint=_("see 'hg help config.paths'")) |
|
4049 | hint=_("see 'hg help config.paths'")) | |
4050 | dest = path.pushloc or path.loc |
|
4050 | dest = path.pushloc or path.loc | |
4051 | branches = (path.branch, opts.get('branch') or []) |
|
4051 | branches = (path.branch, opts.get('branch') or []) | |
4052 | ui.status(_('pushing to %s\n') % util.hidepassword(dest)) |
|
4052 | ui.status(_('pushing to %s\n') % util.hidepassword(dest)) | |
4053 | revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev')) |
|
4053 | revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev')) | |
4054 | other = hg.peer(repo, opts, dest) |
|
4054 | other = hg.peer(repo, opts, dest) | |
4055 |
|
4055 | |||
4056 | if revs: |
|
4056 | if revs: | |
4057 | revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)] |
|
4057 | revs = [repo.lookup(r) for r in scmutil.revrange(repo, revs)] | |
4058 | if not revs: |
|
4058 | if not revs: | |
4059 | raise error.Abort(_("specified revisions evaluate to an empty set"), |
|
4059 | raise error.Abort(_("specified revisions evaluate to an empty set"), | |
4060 | hint=_("use different revision arguments")) |
|
4060 | hint=_("use different revision arguments")) | |
4061 | elif path.pushrev: |
|
4061 | elif path.pushrev: | |
4062 | # It doesn't make any sense to specify ancestor revisions. So limit |
|
4062 | # It doesn't make any sense to specify ancestor revisions. So limit | |
4063 | # to DAG heads to make discovery simpler. |
|
4063 | # to DAG heads to make discovery simpler. | |
4064 | expr = revsetlang.formatspec('heads(%r)', path.pushrev) |
|
4064 | expr = revsetlang.formatspec('heads(%r)', path.pushrev) | |
4065 | revs = scmutil.revrange(repo, [expr]) |
|
4065 | revs = scmutil.revrange(repo, [expr]) | |
4066 | revs = [repo[rev].node() for rev in revs] |
|
4066 | revs = [repo[rev].node() for rev in revs] | |
4067 | if not revs: |
|
4067 | if not revs: | |
4068 | raise error.Abort(_('default push revset for path evaluates to an ' |
|
4068 | raise error.Abort(_('default push revset for path evaluates to an ' | |
4069 | 'empty set')) |
|
4069 | 'empty set')) | |
4070 |
|
4070 | |||
4071 | repo._subtoppath = dest |
|
4071 | repo._subtoppath = dest | |
4072 | try: |
|
4072 | try: | |
4073 | # push subrepos depth-first for coherent ordering |
|
4073 | # push subrepos depth-first for coherent ordering | |
4074 | c = repo[''] |
|
4074 | c = repo[''] | |
4075 | subs = c.substate # only repos that are committed |
|
4075 | subs = c.substate # only repos that are committed | |
4076 | for s in sorted(subs): |
|
4076 | for s in sorted(subs): | |
4077 | result = c.sub(s).push(opts) |
|
4077 | result = c.sub(s).push(opts) | |
4078 | if result == 0: |
|
4078 | if result == 0: | |
4079 | return not result |
|
4079 | return not result | |
4080 | finally: |
|
4080 | finally: | |
4081 | del repo._subtoppath |
|
4081 | del repo._subtoppath | |
4082 |
|
4082 | |||
4083 | pushvars = opts.get('pushvars') |
|
4083 | pushvars = opts.get('pushvars') | |
4084 | if pushvars: |
|
4084 | if pushvars: | |
4085 | shellvars = {} |
|
4085 | shellvars = {} | |
4086 | for raw in pushvars: |
|
4086 | for raw in pushvars: | |
4087 | if '=' not in raw: |
|
4087 | if '=' not in raw: | |
4088 | msg = ("unable to parse variable '%s', should follow " |
|
4088 | msg = ("unable to parse variable '%s', should follow " | |
4089 | "'KEY=VALUE' or 'KEY=' format") |
|
4089 | "'KEY=VALUE' or 'KEY=' format") | |
4090 | raise error.Abort(msg % raw) |
|
4090 | raise error.Abort(msg % raw) | |
4091 | k, v = raw.split('=', 1) |
|
4091 | k, v = raw.split('=', 1) | |
4092 | shellvars[k] = v |
|
4092 | shellvars[k] = v | |
4093 |
|
4093 | |||
4094 | repo._shellvars = shellvars |
|
4094 | repo._shellvars = shellvars | |
4095 |
|
4095 | |||
4096 | pushop = exchange.push(repo, other, opts.get('force'), revs=revs, |
|
4096 | pushop = exchange.push(repo, other, opts.get('force'), revs=revs, | |
4097 | newbranch=opts.get('new_branch'), |
|
4097 | newbranch=opts.get('new_branch'), | |
4098 | bookmarks=opts.get('bookmark', ()), |
|
4098 | bookmarks=opts.get('bookmark', ()), | |
4099 | opargs=opts.get('opargs')) |
|
4099 | opargs=opts.get('opargs')) | |
4100 |
|
4100 | |||
4101 | if pushvars: |
|
4101 | if pushvars: | |
4102 | del repo._shellvars |
|
4102 | del repo._shellvars | |
4103 |
|
4103 | |||
4104 | result = not pushop.cgresult |
|
4104 | result = not pushop.cgresult | |
4105 |
|
4105 | |||
4106 | if pushop.bkresult is not None: |
|
4106 | if pushop.bkresult is not None: | |
4107 | if pushop.bkresult == 2: |
|
4107 | if pushop.bkresult == 2: | |
4108 | result = 2 |
|
4108 | result = 2 | |
4109 | elif not result and pushop.bkresult: |
|
4109 | elif not result and pushop.bkresult: | |
4110 | result = 2 |
|
4110 | result = 2 | |
4111 |
|
4111 | |||
4112 | return result |
|
4112 | return result | |
4113 |
|
4113 | |||
4114 | @command('recover', []) |
|
4114 | @command('recover', []) | |
4115 | def recover(ui, repo): |
|
4115 | def recover(ui, repo): | |
4116 | """roll back an interrupted transaction |
|
4116 | """roll back an interrupted transaction | |
4117 |
|
4117 | |||
4118 | Recover from an interrupted commit or pull. |
|
4118 | Recover from an interrupted commit or pull. | |
4119 |
|
4119 | |||
4120 | This command tries to fix the repository status after an |
|
4120 | This command tries to fix the repository status after an | |
4121 | interrupted operation. It should only be necessary when Mercurial |
|
4121 | interrupted operation. It should only be necessary when Mercurial | |
4122 | suggests it. |
|
4122 | suggests it. | |
4123 |
|
4123 | |||
4124 | Returns 0 if successful, 1 if nothing to recover or verify fails. |
|
4124 | Returns 0 if successful, 1 if nothing to recover or verify fails. | |
4125 | """ |
|
4125 | """ | |
4126 | if repo.recover(): |
|
4126 | if repo.recover(): | |
4127 | return hg.verify(repo) |
|
4127 | return hg.verify(repo) | |
4128 | return 1 |
|
4128 | return 1 | |
4129 |
|
4129 | |||
4130 | @command('^remove|rm', |
|
4130 | @command('^remove|rm', | |
4131 | [('A', 'after', None, _('record delete for missing files')), |
|
4131 | [('A', 'after', None, _('record delete for missing files')), | |
4132 | ('f', 'force', None, |
|
4132 | ('f', 'force', None, | |
4133 | _('forget added files, delete modified files')), |
|
4133 | _('forget added files, delete modified files')), | |
4134 | ] + subrepoopts + walkopts, |
|
4134 | ] + subrepoopts + walkopts, | |
4135 | _('[OPTION]... FILE...'), |
|
4135 | _('[OPTION]... FILE...'), | |
4136 | inferrepo=True) |
|
4136 | inferrepo=True) | |
4137 | def remove(ui, repo, *pats, **opts): |
|
4137 | def remove(ui, repo, *pats, **opts): | |
4138 | """remove the specified files on the next commit |
|
4138 | """remove the specified files on the next commit | |
4139 |
|
4139 | |||
4140 | Schedule the indicated files for removal from the current branch. |
|
4140 | Schedule the indicated files for removal from the current branch. | |
4141 |
|
4141 | |||
4142 | This command schedules the files to be removed at the next commit. |
|
4142 | This command schedules the files to be removed at the next commit. | |
4143 | To undo a remove before that, see :hg:`revert`. To undo added |
|
4143 | To undo a remove before that, see :hg:`revert`. To undo added | |
4144 | files, see :hg:`forget`. |
|
4144 | files, see :hg:`forget`. | |
4145 |
|
4145 | |||
4146 | .. container:: verbose |
|
4146 | .. container:: verbose | |
4147 |
|
4147 | |||
4148 | -A/--after can be used to remove only files that have already |
|
4148 | -A/--after can be used to remove only files that have already | |
4149 | been deleted, -f/--force can be used to force deletion, and -Af |
|
4149 | been deleted, -f/--force can be used to force deletion, and -Af | |
4150 | can be used to remove files from the next revision without |
|
4150 | can be used to remove files from the next revision without | |
4151 | deleting them from the working directory. |
|
4151 | deleting them from the working directory. | |
4152 |
|
4152 | |||
4153 | The following table details the behavior of remove for different |
|
4153 | The following table details the behavior of remove for different | |
4154 | file states (columns) and option combinations (rows). The file |
|
4154 | file states (columns) and option combinations (rows). The file | |
4155 | states are Added [A], Clean [C], Modified [M] and Missing [!] |
|
4155 | states are Added [A], Clean [C], Modified [M] and Missing [!] | |
4156 | (as reported by :hg:`status`). The actions are Warn, Remove |
|
4156 | (as reported by :hg:`status`). The actions are Warn, Remove | |
4157 | (from branch) and Delete (from disk): |
|
4157 | (from branch) and Delete (from disk): | |
4158 |
|
4158 | |||
4159 | ========= == == == == |
|
4159 | ========= == == == == | |
4160 | opt/state A C M ! |
|
4160 | opt/state A C M ! | |
4161 | ========= == == == == |
|
4161 | ========= == == == == | |
4162 | none W RD W R |
|
4162 | none W RD W R | |
4163 | -f R RD RD R |
|
4163 | -f R RD RD R | |
4164 | -A W W W R |
|
4164 | -A W W W R | |
4165 | -Af R R R R |
|
4165 | -Af R R R R | |
4166 | ========= == == == == |
|
4166 | ========= == == == == | |
4167 |
|
4167 | |||
4168 | .. note:: |
|
4168 | .. note:: | |
4169 |
|
4169 | |||
4170 | :hg:`remove` never deletes files in Added [A] state from the |
|
4170 | :hg:`remove` never deletes files in Added [A] state from the | |
4171 | working directory, not even if ``--force`` is specified. |
|
4171 | working directory, not even if ``--force`` is specified. | |
4172 |
|
4172 | |||
4173 | Returns 0 on success, 1 if any warnings encountered. |
|
4173 | Returns 0 on success, 1 if any warnings encountered. | |
4174 | """ |
|
4174 | """ | |
4175 |
|
4175 | |||
4176 | opts = pycompat.byteskwargs(opts) |
|
4176 | opts = pycompat.byteskwargs(opts) | |
4177 | after, force = opts.get('after'), opts.get('force') |
|
4177 | after, force = opts.get('after'), opts.get('force') | |
4178 | if not pats and not after: |
|
4178 | if not pats and not after: | |
4179 | raise error.Abort(_('no files specified')) |
|
4179 | raise error.Abort(_('no files specified')) | |
4180 |
|
4180 | |||
4181 | m = scmutil.match(repo[None], pats, opts) |
|
4181 | m = scmutil.match(repo[None], pats, opts) | |
4182 | subrepos = opts.get('subrepos') |
|
4182 | subrepos = opts.get('subrepos') | |
4183 | return cmdutil.remove(ui, repo, m, "", after, force, subrepos) |
|
4183 | return cmdutil.remove(ui, repo, m, "", after, force, subrepos) | |
4184 |
|
4184 | |||
4185 | @command('rename|move|mv', |
|
4185 | @command('rename|move|mv', | |
4186 | [('A', 'after', None, _('record a rename that has already occurred')), |
|
4186 | [('A', 'after', None, _('record a rename that has already occurred')), | |
4187 | ('f', 'force', None, _('forcibly copy over an existing managed file')), |
|
4187 | ('f', 'force', None, _('forcibly copy over an existing managed file')), | |
4188 | ] + walkopts + dryrunopts, |
|
4188 | ] + walkopts + dryrunopts, | |
4189 | _('[OPTION]... SOURCE... DEST')) |
|
4189 | _('[OPTION]... SOURCE... DEST')) | |
4190 | def rename(ui, repo, *pats, **opts): |
|
4190 | def rename(ui, repo, *pats, **opts): | |
4191 | """rename files; equivalent of copy + remove |
|
4191 | """rename files; equivalent of copy + remove | |
4192 |
|
4192 | |||
4193 | Mark dest as copies of sources; mark sources for deletion. If dest |
|
4193 | Mark dest as copies of sources; mark sources for deletion. If dest | |
4194 | is a directory, copies are put in that directory. If dest is a |
|
4194 | is a directory, copies are put in that directory. If dest is a | |
4195 | file, there can only be one source. |
|
4195 | file, there can only be one source. | |
4196 |
|
4196 | |||
4197 | By default, this command copies the contents of files as they |
|
4197 | By default, this command copies the contents of files as they | |
4198 | exist in the working directory. If invoked with -A/--after, the |
|
4198 | exist in the working directory. If invoked with -A/--after, the | |
4199 | operation is recorded, but no copying is performed. |
|
4199 | operation is recorded, but no copying is performed. | |
4200 |
|
4200 | |||
4201 | This command takes effect at the next commit. To undo a rename |
|
4201 | This command takes effect at the next commit. To undo a rename | |
4202 | before that, see :hg:`revert`. |
|
4202 | before that, see :hg:`revert`. | |
4203 |
|
4203 | |||
4204 | Returns 0 on success, 1 if errors are encountered. |
|
4204 | Returns 0 on success, 1 if errors are encountered. | |
4205 | """ |
|
4205 | """ | |
4206 | opts = pycompat.byteskwargs(opts) |
|
4206 | opts = pycompat.byteskwargs(opts) | |
4207 | with repo.wlock(False): |
|
4207 | with repo.wlock(False): | |
4208 | return cmdutil.copy(ui, repo, pats, opts, rename=True) |
|
4208 | return cmdutil.copy(ui, repo, pats, opts, rename=True) | |
4209 |
|
4209 | |||
4210 | @command('resolve', |
|
4210 | @command('resolve', | |
4211 | [('a', 'all', None, _('select all unresolved files')), |
|
4211 | [('a', 'all', None, _('select all unresolved files')), | |
4212 | ('l', 'list', None, _('list state of files needing merge')), |
|
4212 | ('l', 'list', None, _('list state of files needing merge')), | |
4213 | ('m', 'mark', None, _('mark files as resolved')), |
|
4213 | ('m', 'mark', None, _('mark files as resolved')), | |
4214 | ('u', 'unmark', None, _('mark files as unresolved')), |
|
4214 | ('u', 'unmark', None, _('mark files as unresolved')), | |
4215 | ('n', 'no-status', None, _('hide status prefix'))] |
|
4215 | ('n', 'no-status', None, _('hide status prefix'))] | |
4216 | + mergetoolopts + walkopts + formatteropts, |
|
4216 | + mergetoolopts + walkopts + formatteropts, | |
4217 | _('[OPTION]... [FILE]...'), |
|
4217 | _('[OPTION]... [FILE]...'), | |
4218 | inferrepo=True) |
|
4218 | inferrepo=True) | |
4219 | def resolve(ui, repo, *pats, **opts): |
|
4219 | def resolve(ui, repo, *pats, **opts): | |
4220 | """redo merges or set/view the merge status of files |
|
4220 | """redo merges or set/view the merge status of files | |
4221 |
|
4221 | |||
4222 | Merges with unresolved conflicts are often the result of |
|
4222 | Merges with unresolved conflicts are often the result of | |
4223 | non-interactive merging using the ``internal:merge`` configuration |
|
4223 | non-interactive merging using the ``internal:merge`` configuration | |
4224 | setting, or a command-line merge tool like ``diff3``. The resolve |
|
4224 | setting, or a command-line merge tool like ``diff3``. The resolve | |
4225 | command is used to manage the files involved in a merge, after |
|
4225 | command is used to manage the files involved in a merge, after | |
4226 | :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the |
|
4226 | :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the | |
4227 | working directory must have two parents). See :hg:`help |
|
4227 | working directory must have two parents). See :hg:`help | |
4228 | merge-tools` for information on configuring merge tools. |
|
4228 | merge-tools` for information on configuring merge tools. | |
4229 |
|
4229 | |||
4230 | The resolve command can be used in the following ways: |
|
4230 | The resolve command can be used in the following ways: | |
4231 |
|
4231 | |||
4232 | - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified |
|
4232 | - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified | |
4233 | files, discarding any previous merge attempts. Re-merging is not |
|
4233 | files, discarding any previous merge attempts. Re-merging is not | |
4234 | performed for files already marked as resolved. Use ``--all/-a`` |
|
4234 | performed for files already marked as resolved. Use ``--all/-a`` | |
4235 | to select all unresolved files. ``--tool`` can be used to specify |
|
4235 | to select all unresolved files. ``--tool`` can be used to specify | |
4236 | the merge tool used for the given files. It overrides the HGMERGE |
|
4236 | the merge tool used for the given files. It overrides the HGMERGE | |
4237 | environment variable and your configuration files. Previous file |
|
4237 | environment variable and your configuration files. Previous file | |
4238 | contents are saved with a ``.orig`` suffix. |
|
4238 | contents are saved with a ``.orig`` suffix. | |
4239 |
|
4239 | |||
4240 | - :hg:`resolve -m [FILE]`: mark a file as having been resolved |
|
4240 | - :hg:`resolve -m [FILE]`: mark a file as having been resolved | |
4241 | (e.g. after having manually fixed-up the files). The default is |
|
4241 | (e.g. after having manually fixed-up the files). The default is | |
4242 | to mark all unresolved files. |
|
4242 | to mark all unresolved files. | |
4243 |
|
4243 | |||
4244 | - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The |
|
4244 | - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The | |
4245 | default is to mark all resolved files. |
|
4245 | default is to mark all resolved files. | |
4246 |
|
4246 | |||
4247 | - :hg:`resolve -l`: list files which had or still have conflicts. |
|
4247 | - :hg:`resolve -l`: list files which had or still have conflicts. | |
4248 | In the printed list, ``U`` = unresolved and ``R`` = resolved. |
|
4248 | In the printed list, ``U`` = unresolved and ``R`` = resolved. | |
4249 | You can use ``set:unresolved()`` or ``set:resolved()`` to filter |
|
4249 | You can use ``set:unresolved()`` or ``set:resolved()`` to filter | |
4250 | the list. See :hg:`help filesets` for details. |
|
4250 | the list. See :hg:`help filesets` for details. | |
4251 |
|
4251 | |||
4252 | .. note:: |
|
4252 | .. note:: | |
4253 |
|
4253 | |||
4254 | Mercurial will not let you commit files with unresolved merge |
|
4254 | Mercurial will not let you commit files with unresolved merge | |
4255 | conflicts. You must use :hg:`resolve -m ...` before you can |
|
4255 | conflicts. You must use :hg:`resolve -m ...` before you can | |
4256 | commit after a conflicting merge. |
|
4256 | commit after a conflicting merge. | |
4257 |
|
4257 | |||
4258 | Returns 0 on success, 1 if any files fail a resolve attempt. |
|
4258 | Returns 0 on success, 1 if any files fail a resolve attempt. | |
4259 | """ |
|
4259 | """ | |
4260 |
|
4260 | |||
4261 | opts = pycompat.byteskwargs(opts) |
|
4261 | opts = pycompat.byteskwargs(opts) | |
4262 | flaglist = 'all mark unmark list no_status'.split() |
|
4262 | flaglist = 'all mark unmark list no_status'.split() | |
4263 | all, mark, unmark, show, nostatus = \ |
|
4263 | all, mark, unmark, show, nostatus = \ | |
4264 | [opts.get(o) for o in flaglist] |
|
4264 | [opts.get(o) for o in flaglist] | |
4265 |
|
4265 | |||
4266 | if (show and (mark or unmark)) or (mark and unmark): |
|
4266 | if (show and (mark or unmark)) or (mark and unmark): | |
4267 | raise error.Abort(_("too many options specified")) |
|
4267 | raise error.Abort(_("too many options specified")) | |
4268 | if pats and all: |
|
4268 | if pats and all: | |
4269 | raise error.Abort(_("can't specify --all and patterns")) |
|
4269 | raise error.Abort(_("can't specify --all and patterns")) | |
4270 | if not (all or pats or show or mark or unmark): |
|
4270 | if not (all or pats or show or mark or unmark): | |
4271 | raise error.Abort(_('no files or directories specified'), |
|
4271 | raise error.Abort(_('no files or directories specified'), | |
4272 | hint=('use --all to re-merge all unresolved files')) |
|
4272 | hint=('use --all to re-merge all unresolved files')) | |
4273 |
|
4273 | |||
4274 | if show: |
|
4274 | if show: | |
4275 | ui.pager('resolve') |
|
4275 | ui.pager('resolve') | |
4276 | fm = ui.formatter('resolve', opts) |
|
4276 | fm = ui.formatter('resolve', opts) | |
4277 | ms = mergemod.mergestate.read(repo) |
|
4277 | ms = mergemod.mergestate.read(repo) | |
4278 | m = scmutil.match(repo[None], pats, opts) |
|
4278 | m = scmutil.match(repo[None], pats, opts) | |
4279 | for f in ms: |
|
4279 | for f in ms: | |
4280 | if not m(f): |
|
4280 | if not m(f): | |
4281 | continue |
|
4281 | continue | |
4282 | l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved', |
|
4282 | l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved', | |
4283 | 'd': 'driverresolved'}[ms[f]] |
|
4283 | 'd': 'driverresolved'}[ms[f]] | |
4284 | fm.startitem() |
|
4284 | fm.startitem() | |
4285 | fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l) |
|
4285 | fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l) | |
4286 | fm.write('path', '%s\n', f, label=l) |
|
4286 | fm.write('path', '%s\n', f, label=l) | |
4287 | fm.end() |
|
4287 | fm.end() | |
4288 | return 0 |
|
4288 | return 0 | |
4289 |
|
4289 | |||
4290 | with repo.wlock(): |
|
4290 | with repo.wlock(): | |
4291 | ms = mergemod.mergestate.read(repo) |
|
4291 | ms = mergemod.mergestate.read(repo) | |
4292 |
|
4292 | |||
4293 | if not (ms.active() or repo.dirstate.p2() != nullid): |
|
4293 | if not (ms.active() or repo.dirstate.p2() != nullid): | |
4294 | raise error.Abort( |
|
4294 | raise error.Abort( | |
4295 | _('resolve command not applicable when not merging')) |
|
4295 | _('resolve command not applicable when not merging')) | |
4296 |
|
4296 | |||
4297 | wctx = repo[None] |
|
4297 | wctx = repo[None] | |
4298 |
|
4298 | |||
4299 | if ms.mergedriver and ms.mdstate() == 'u': |
|
4299 | if ms.mergedriver and ms.mdstate() == 'u': | |
4300 | proceed = mergemod.driverpreprocess(repo, ms, wctx) |
|
4300 | proceed = mergemod.driverpreprocess(repo, ms, wctx) | |
4301 | ms.commit() |
|
4301 | ms.commit() | |
4302 | # allow mark and unmark to go through |
|
4302 | # allow mark and unmark to go through | |
4303 | if not mark and not unmark and not proceed: |
|
4303 | if not mark and not unmark and not proceed: | |
4304 | return 1 |
|
4304 | return 1 | |
4305 |
|
4305 | |||
4306 | m = scmutil.match(wctx, pats, opts) |
|
4306 | m = scmutil.match(wctx, pats, opts) | |
4307 | ret = 0 |
|
4307 | ret = 0 | |
4308 | didwork = False |
|
4308 | didwork = False | |
4309 | runconclude = False |
|
4309 | runconclude = False | |
4310 |
|
4310 | |||
4311 | tocomplete = [] |
|
4311 | tocomplete = [] | |
4312 | for f in ms: |
|
4312 | for f in ms: | |
4313 | if not m(f): |
|
4313 | if not m(f): | |
4314 | continue |
|
4314 | continue | |
4315 |
|
4315 | |||
4316 | didwork = True |
|
4316 | didwork = True | |
4317 |
|
4317 | |||
4318 | # don't let driver-resolved files be marked, and run the conclude |
|
4318 | # don't let driver-resolved files be marked, and run the conclude | |
4319 | # step if asked to resolve |
|
4319 | # step if asked to resolve | |
4320 | if ms[f] == "d": |
|
4320 | if ms[f] == "d": | |
4321 | exact = m.exact(f) |
|
4321 | exact = m.exact(f) | |
4322 | if mark: |
|
4322 | if mark: | |
4323 | if exact: |
|
4323 | if exact: | |
4324 | ui.warn(_('not marking %s as it is driver-resolved\n') |
|
4324 | ui.warn(_('not marking %s as it is driver-resolved\n') | |
4325 | % f) |
|
4325 | % f) | |
4326 | elif unmark: |
|
4326 | elif unmark: | |
4327 | if exact: |
|
4327 | if exact: | |
4328 | ui.warn(_('not unmarking %s as it is driver-resolved\n') |
|
4328 | ui.warn(_('not unmarking %s as it is driver-resolved\n') | |
4329 | % f) |
|
4329 | % f) | |
4330 | else: |
|
4330 | else: | |
4331 | runconclude = True |
|
4331 | runconclude = True | |
4332 | continue |
|
4332 | continue | |
4333 |
|
4333 | |||
4334 | if mark: |
|
4334 | if mark: | |
4335 | ms.mark(f, "r") |
|
4335 | ms.mark(f, "r") | |
4336 | elif unmark: |
|
4336 | elif unmark: | |
4337 | ms.mark(f, "u") |
|
4337 | ms.mark(f, "u") | |
4338 | else: |
|
4338 | else: | |
4339 | # backup pre-resolve (merge uses .orig for its own purposes) |
|
4339 | # backup pre-resolve (merge uses .orig for its own purposes) | |
4340 | a = repo.wjoin(f) |
|
4340 | a = repo.wjoin(f) | |
4341 | try: |
|
4341 | try: | |
4342 | util.copyfile(a, a + ".resolve") |
|
4342 | util.copyfile(a, a + ".resolve") | |
4343 | except (IOError, OSError) as inst: |
|
4343 | except (IOError, OSError) as inst: | |
4344 | if inst.errno != errno.ENOENT: |
|
4344 | if inst.errno != errno.ENOENT: | |
4345 | raise |
|
4345 | raise | |
4346 |
|
4346 | |||
4347 | try: |
|
4347 | try: | |
4348 | # preresolve file |
|
4348 | # preresolve file | |
4349 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
4349 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | |
4350 | 'resolve') |
|
4350 | 'resolve') | |
4351 | complete, r = ms.preresolve(f, wctx) |
|
4351 | complete, r = ms.preresolve(f, wctx) | |
4352 | if not complete: |
|
4352 | if not complete: | |
4353 | tocomplete.append(f) |
|
4353 | tocomplete.append(f) | |
4354 | elif r: |
|
4354 | elif r: | |
4355 | ret = 1 |
|
4355 | ret = 1 | |
4356 | finally: |
|
4356 | finally: | |
4357 | ui.setconfig('ui', 'forcemerge', '', 'resolve') |
|
4357 | ui.setconfig('ui', 'forcemerge', '', 'resolve') | |
4358 | ms.commit() |
|
4358 | ms.commit() | |
4359 |
|
4359 | |||
4360 | # replace filemerge's .orig file with our resolve file, but only |
|
4360 | # replace filemerge's .orig file with our resolve file, but only | |
4361 | # for merges that are complete |
|
4361 | # for merges that are complete | |
4362 | if complete: |
|
4362 | if complete: | |
4363 | try: |
|
4363 | try: | |
4364 | util.rename(a + ".resolve", |
|
4364 | util.rename(a + ".resolve", | |
4365 | scmutil.origpath(ui, repo, a)) |
|
4365 | scmutil.origpath(ui, repo, a)) | |
4366 | except OSError as inst: |
|
4366 | except OSError as inst: | |
4367 | if inst.errno != errno.ENOENT: |
|
4367 | if inst.errno != errno.ENOENT: | |
4368 | raise |
|
4368 | raise | |
4369 |
|
4369 | |||
4370 | for f in tocomplete: |
|
4370 | for f in tocomplete: | |
4371 | try: |
|
4371 | try: | |
4372 | # resolve file |
|
4372 | # resolve file | |
4373 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
4373 | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | |
4374 | 'resolve') |
|
4374 | 'resolve') | |
4375 | r = ms.resolve(f, wctx) |
|
4375 | r = ms.resolve(f, wctx) | |
4376 | if r: |
|
4376 | if r: | |
4377 | ret = 1 |
|
4377 | ret = 1 | |
4378 | finally: |
|
4378 | finally: | |
4379 | ui.setconfig('ui', 'forcemerge', '', 'resolve') |
|
4379 | ui.setconfig('ui', 'forcemerge', '', 'resolve') | |
4380 | ms.commit() |
|
4380 | ms.commit() | |
4381 |
|
4381 | |||
4382 | # replace filemerge's .orig file with our resolve file |
|
4382 | # replace filemerge's .orig file with our resolve file | |
4383 | a = repo.wjoin(f) |
|
4383 | a = repo.wjoin(f) | |
4384 | try: |
|
4384 | try: | |
4385 | util.rename(a + ".resolve", scmutil.origpath(ui, repo, a)) |
|
4385 | util.rename(a + ".resolve", scmutil.origpath(ui, repo, a)) | |
4386 | except OSError as inst: |
|
4386 | except OSError as inst: | |
4387 | if inst.errno != errno.ENOENT: |
|
4387 | if inst.errno != errno.ENOENT: | |
4388 | raise |
|
4388 | raise | |
4389 |
|
4389 | |||
4390 | ms.commit() |
|
4390 | ms.commit() | |
4391 | ms.recordactions() |
|
4391 | ms.recordactions() | |
4392 |
|
4392 | |||
4393 | if not didwork and pats: |
|
4393 | if not didwork and pats: | |
4394 | hint = None |
|
4394 | hint = None | |
4395 | if not any([p for p in pats if p.find(':') >= 0]): |
|
4395 | if not any([p for p in pats if p.find(':') >= 0]): | |
4396 | pats = ['path:%s' % p for p in pats] |
|
4396 | pats = ['path:%s' % p for p in pats] | |
4397 | m = scmutil.match(wctx, pats, opts) |
|
4397 | m = scmutil.match(wctx, pats, opts) | |
4398 | for f in ms: |
|
4398 | for f in ms: | |
4399 | if not m(f): |
|
4399 | if not m(f): | |
4400 | continue |
|
4400 | continue | |
4401 | flags = ''.join(['-%s ' % o[0] for o in flaglist |
|
4401 | flags = ''.join(['-%s ' % o[0] for o in flaglist | |
4402 | if opts.get(o)]) |
|
4402 | if opts.get(o)]) | |
4403 | hint = _("(try: hg resolve %s%s)\n") % ( |
|
4403 | hint = _("(try: hg resolve %s%s)\n") % ( | |
4404 | flags, |
|
4404 | flags, | |
4405 | ' '.join(pats)) |
|
4405 | ' '.join(pats)) | |
4406 | break |
|
4406 | break | |
4407 | ui.warn(_("arguments do not match paths that need resolving\n")) |
|
4407 | ui.warn(_("arguments do not match paths that need resolving\n")) | |
4408 | if hint: |
|
4408 | if hint: | |
4409 | ui.warn(hint) |
|
4409 | ui.warn(hint) | |
4410 | elif ms.mergedriver and ms.mdstate() != 's': |
|
4410 | elif ms.mergedriver and ms.mdstate() != 's': | |
4411 | # run conclude step when either a driver-resolved file is requested |
|
4411 | # run conclude step when either a driver-resolved file is requested | |
4412 | # or there are no driver-resolved files |
|
4412 | # or there are no driver-resolved files | |
4413 | # we can't use 'ret' to determine whether any files are unresolved |
|
4413 | # we can't use 'ret' to determine whether any files are unresolved | |
4414 | # because we might not have tried to resolve some |
|
4414 | # because we might not have tried to resolve some | |
4415 | if ((runconclude or not list(ms.driverresolved())) |
|
4415 | if ((runconclude or not list(ms.driverresolved())) | |
4416 | and not list(ms.unresolved())): |
|
4416 | and not list(ms.unresolved())): | |
4417 | proceed = mergemod.driverconclude(repo, ms, wctx) |
|
4417 | proceed = mergemod.driverconclude(repo, ms, wctx) | |
4418 | ms.commit() |
|
4418 | ms.commit() | |
4419 | if not proceed: |
|
4419 | if not proceed: | |
4420 | return 1 |
|
4420 | return 1 | |
4421 |
|
4421 | |||
4422 | # Nudge users into finishing an unfinished operation |
|
4422 | # Nudge users into finishing an unfinished operation | |
4423 | unresolvedf = list(ms.unresolved()) |
|
4423 | unresolvedf = list(ms.unresolved()) | |
4424 | driverresolvedf = list(ms.driverresolved()) |
|
4424 | driverresolvedf = list(ms.driverresolved()) | |
4425 | if not unresolvedf and not driverresolvedf: |
|
4425 | if not unresolvedf and not driverresolvedf: | |
4426 | ui.status(_('(no more unresolved files)\n')) |
|
4426 | ui.status(_('(no more unresolved files)\n')) | |
4427 | cmdutil.checkafterresolved(repo) |
|
4427 | cmdutil.checkafterresolved(repo) | |
4428 | elif not unresolvedf: |
|
4428 | elif not unresolvedf: | |
4429 | ui.status(_('(no more unresolved files -- ' |
|
4429 | ui.status(_('(no more unresolved files -- ' | |
4430 | 'run "hg resolve --all" to conclude)\n')) |
|
4430 | 'run "hg resolve --all" to conclude)\n')) | |
4431 |
|
4431 | |||
4432 | return ret |
|
4432 | return ret | |
4433 |
|
4433 | |||
4434 | @command('revert', |
|
4434 | @command('revert', | |
4435 | [('a', 'all', None, _('revert all changes when no arguments given')), |
|
4435 | [('a', 'all', None, _('revert all changes when no arguments given')), | |
4436 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), |
|
4436 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), | |
4437 | ('r', 'rev', '', _('revert to the specified revision'), _('REV')), |
|
4437 | ('r', 'rev', '', _('revert to the specified revision'), _('REV')), | |
4438 | ('C', 'no-backup', None, _('do not save backup copies of files')), |
|
4438 | ('C', 'no-backup', None, _('do not save backup copies of files')), | |
4439 | ('i', 'interactive', None, |
|
4439 | ('i', 'interactive', None, | |
4440 | _('interactively select the changes (EXPERIMENTAL)')), |
|
4440 | _('interactively select the changes (EXPERIMENTAL)')), | |
4441 | ] + walkopts + dryrunopts, |
|
4441 | ] + walkopts + dryrunopts, | |
4442 | _('[OPTION]... [-r REV] [NAME]...')) |
|
4442 | _('[OPTION]... [-r REV] [NAME]...')) | |
4443 | def revert(ui, repo, *pats, **opts): |
|
4443 | def revert(ui, repo, *pats, **opts): | |
4444 | """restore files to their checkout state |
|
4444 | """restore files to their checkout state | |
4445 |
|
4445 | |||
4446 | .. note:: |
|
4446 | .. note:: | |
4447 |
|
4447 | |||
4448 | To check out earlier revisions, you should use :hg:`update REV`. |
|
4448 | To check out earlier revisions, you should use :hg:`update REV`. | |
4449 | To cancel an uncommitted merge (and lose your changes), |
|
4449 | To cancel an uncommitted merge (and lose your changes), | |
4450 | use :hg:`update --clean .`. |
|
4450 | use :hg:`update --clean .`. | |
4451 |
|
4451 | |||
4452 | With no revision specified, revert the specified files or directories |
|
4452 | With no revision specified, revert the specified files or directories | |
4453 | to the contents they had in the parent of the working directory. |
|
4453 | to the contents they had in the parent of the working directory. | |
4454 | This restores the contents of files to an unmodified |
|
4454 | This restores the contents of files to an unmodified | |
4455 | state and unschedules adds, removes, copies, and renames. If the |
|
4455 | state and unschedules adds, removes, copies, and renames. If the | |
4456 | working directory has two parents, you must explicitly specify a |
|
4456 | working directory has two parents, you must explicitly specify a | |
4457 | revision. |
|
4457 | revision. | |
4458 |
|
4458 | |||
4459 | Using the -r/--rev or -d/--date options, revert the given files or |
|
4459 | Using the -r/--rev or -d/--date options, revert the given files or | |
4460 | directories to their states as of a specific revision. Because |
|
4460 | directories to their states as of a specific revision. Because | |
4461 | revert does not change the working directory parents, this will |
|
4461 | revert does not change the working directory parents, this will | |
4462 | cause these files to appear modified. This can be helpful to "back |
|
4462 | cause these files to appear modified. This can be helpful to "back | |
4463 | out" some or all of an earlier change. See :hg:`backout` for a |
|
4463 | out" some or all of an earlier change. See :hg:`backout` for a | |
4464 | related method. |
|
4464 | related method. | |
4465 |
|
4465 | |||
4466 | Modified files are saved with a .orig suffix before reverting. |
|
4466 | Modified files are saved with a .orig suffix before reverting. | |
4467 | To disable these backups, use --no-backup. It is possible to store |
|
4467 | To disable these backups, use --no-backup. It is possible to store | |
4468 | the backup files in a custom directory relative to the root of the |
|
4468 | the backup files in a custom directory relative to the root of the | |
4469 | repository by setting the ``ui.origbackuppath`` configuration |
|
4469 | repository by setting the ``ui.origbackuppath`` configuration | |
4470 | option. |
|
4470 | option. | |
4471 |
|
4471 | |||
4472 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
4472 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
4473 |
|
4473 | |||
4474 | See :hg:`help backout` for a way to reverse the effect of an |
|
4474 | See :hg:`help backout` for a way to reverse the effect of an | |
4475 | earlier changeset. |
|
4475 | earlier changeset. | |
4476 |
|
4476 | |||
4477 | Returns 0 on success. |
|
4477 | Returns 0 on success. | |
4478 | """ |
|
4478 | """ | |
4479 |
|
4479 | |||
4480 | if opts.get("date"): |
|
4480 | if opts.get("date"): | |
4481 | if opts.get("rev"): |
|
4481 | if opts.get("rev"): | |
4482 | raise error.Abort(_("you can't specify a revision and a date")) |
|
4482 | raise error.Abort(_("you can't specify a revision and a date")) | |
4483 | opts["rev"] = cmdutil.finddate(ui, repo, opts["date"]) |
|
4483 | opts["rev"] = cmdutil.finddate(ui, repo, opts["date"]) | |
4484 |
|
4484 | |||
4485 | parent, p2 = repo.dirstate.parents() |
|
4485 | parent, p2 = repo.dirstate.parents() | |
4486 | if not opts.get('rev') and p2 != nullid: |
|
4486 | if not opts.get('rev') and p2 != nullid: | |
4487 | # revert after merge is a trap for new users (issue2915) |
|
4487 | # revert after merge is a trap for new users (issue2915) | |
4488 | raise error.Abort(_('uncommitted merge with no revision specified'), |
|
4488 | raise error.Abort(_('uncommitted merge with no revision specified'), | |
4489 | hint=_("use 'hg update' or see 'hg help revert'")) |
|
4489 | hint=_("use 'hg update' or see 'hg help revert'")) | |
4490 |
|
4490 | |||
4491 | ctx = scmutil.revsingle(repo, opts.get('rev')) |
|
4491 | ctx = scmutil.revsingle(repo, opts.get('rev')) | |
4492 |
|
4492 | |||
4493 | if (not (pats or opts.get('include') or opts.get('exclude') or |
|
4493 | if (not (pats or opts.get('include') or opts.get('exclude') or | |
4494 | opts.get('all') or opts.get('interactive'))): |
|
4494 | opts.get('all') or opts.get('interactive'))): | |
4495 | msg = _("no files or directories specified") |
|
4495 | msg = _("no files or directories specified") | |
4496 | if p2 != nullid: |
|
4496 | if p2 != nullid: | |
4497 | hint = _("uncommitted merge, use --all to discard all changes," |
|
4497 | hint = _("uncommitted merge, use --all to discard all changes," | |
4498 | " or 'hg update -C .' to abort the merge") |
|
4498 | " or 'hg update -C .' to abort the merge") | |
4499 | raise error.Abort(msg, hint=hint) |
|
4499 | raise error.Abort(msg, hint=hint) | |
4500 | dirty = any(repo.status()) |
|
4500 | dirty = any(repo.status()) | |
4501 | node = ctx.node() |
|
4501 | node = ctx.node() | |
4502 | if node != parent: |
|
4502 | if node != parent: | |
4503 | if dirty: |
|
4503 | if dirty: | |
4504 | hint = _("uncommitted changes, use --all to discard all" |
|
4504 | hint = _("uncommitted changes, use --all to discard all" | |
4505 | " changes, or 'hg update %s' to update") % ctx.rev() |
|
4505 | " changes, or 'hg update %s' to update") % ctx.rev() | |
4506 | else: |
|
4506 | else: | |
4507 | hint = _("use --all to revert all files," |
|
4507 | hint = _("use --all to revert all files," | |
4508 | " or 'hg update %s' to update") % ctx.rev() |
|
4508 | " or 'hg update %s' to update") % ctx.rev() | |
4509 | elif dirty: |
|
4509 | elif dirty: | |
4510 | hint = _("uncommitted changes, use --all to discard all changes") |
|
4510 | hint = _("uncommitted changes, use --all to discard all changes") | |
4511 | else: |
|
4511 | else: | |
4512 | hint = _("use --all to revert all files") |
|
4512 | hint = _("use --all to revert all files") | |
4513 | raise error.Abort(msg, hint=hint) |
|
4513 | raise error.Abort(msg, hint=hint) | |
4514 |
|
4514 | |||
4515 | return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts) |
|
4515 | return cmdutil.revert(ui, repo, ctx, (parent, p2), *pats, **opts) | |
4516 |
|
4516 | |||
4517 | @command('rollback', dryrunopts + |
|
4517 | @command('rollback', dryrunopts + | |
4518 | [('f', 'force', False, _('ignore safety measures'))]) |
|
4518 | [('f', 'force', False, _('ignore safety measures'))]) | |
4519 | def rollback(ui, repo, **opts): |
|
4519 | def rollback(ui, repo, **opts): | |
4520 | """roll back the last transaction (DANGEROUS) (DEPRECATED) |
|
4520 | """roll back the last transaction (DANGEROUS) (DEPRECATED) | |
4521 |
|
4521 | |||
4522 | Please use :hg:`commit --amend` instead of rollback to correct |
|
4522 | Please use :hg:`commit --amend` instead of rollback to correct | |
4523 | mistakes in the last commit. |
|
4523 | mistakes in the last commit. | |
4524 |
|
4524 | |||
4525 | This command should be used with care. There is only one level of |
|
4525 | This command should be used with care. There is only one level of | |
4526 | rollback, and there is no way to undo a rollback. It will also |
|
4526 | rollback, and there is no way to undo a rollback. It will also | |
4527 | restore the dirstate at the time of the last transaction, losing |
|
4527 | restore the dirstate at the time of the last transaction, losing | |
4528 | any dirstate changes since that time. This command does not alter |
|
4528 | any dirstate changes since that time. This command does not alter | |
4529 | the working directory. |
|
4529 | the working directory. | |
4530 |
|
4530 | |||
4531 | Transactions are used to encapsulate the effects of all commands |
|
4531 | Transactions are used to encapsulate the effects of all commands | |
4532 | that create new changesets or propagate existing changesets into a |
|
4532 | that create new changesets or propagate existing changesets into a | |
4533 | repository. |
|
4533 | repository. | |
4534 |
|
4534 | |||
4535 | .. container:: verbose |
|
4535 | .. container:: verbose | |
4536 |
|
4536 | |||
4537 | For example, the following commands are transactional, and their |
|
4537 | For example, the following commands are transactional, and their | |
4538 | effects can be rolled back: |
|
4538 | effects can be rolled back: | |
4539 |
|
4539 | |||
4540 | - commit |
|
4540 | - commit | |
4541 | - import |
|
4541 | - import | |
4542 | - pull |
|
4542 | - pull | |
4543 | - push (with this repository as the destination) |
|
4543 | - push (with this repository as the destination) | |
4544 | - unbundle |
|
4544 | - unbundle | |
4545 |
|
4545 | |||
4546 | To avoid permanent data loss, rollback will refuse to rollback a |
|
4546 | To avoid permanent data loss, rollback will refuse to rollback a | |
4547 | commit transaction if it isn't checked out. Use --force to |
|
4547 | commit transaction if it isn't checked out. Use --force to | |
4548 | override this protection. |
|
4548 | override this protection. | |
4549 |
|
4549 | |||
4550 | The rollback command can be entirely disabled by setting the |
|
4550 | The rollback command can be entirely disabled by setting the | |
4551 | ``ui.rollback`` configuration setting to false. If you're here |
|
4551 | ``ui.rollback`` configuration setting to false. If you're here | |
4552 | because you want to use rollback and it's disabled, you can |
|
4552 | because you want to use rollback and it's disabled, you can | |
4553 | re-enable the command by setting ``ui.rollback`` to true. |
|
4553 | re-enable the command by setting ``ui.rollback`` to true. | |
4554 |
|
4554 | |||
4555 | This command is not intended for use on public repositories. Once |
|
4555 | This command is not intended for use on public repositories. Once | |
4556 | changes are visible for pull by other users, rolling a transaction |
|
4556 | changes are visible for pull by other users, rolling a transaction | |
4557 | back locally is ineffective (someone else may already have pulled |
|
4557 | back locally is ineffective (someone else may already have pulled | |
4558 | the changes). Furthermore, a race is possible with readers of the |
|
4558 | the changes). Furthermore, a race is possible with readers of the | |
4559 | repository; for example an in-progress pull from the repository |
|
4559 | repository; for example an in-progress pull from the repository | |
4560 | may fail if a rollback is performed. |
|
4560 | may fail if a rollback is performed. | |
4561 |
|
4561 | |||
4562 | Returns 0 on success, 1 if no rollback data is available. |
|
4562 | Returns 0 on success, 1 if no rollback data is available. | |
4563 | """ |
|
4563 | """ | |
4564 | if not ui.configbool('ui', 'rollback'): |
|
4564 | if not ui.configbool('ui', 'rollback'): | |
4565 | raise error.Abort(_('rollback is disabled because it is unsafe'), |
|
4565 | raise error.Abort(_('rollback is disabled because it is unsafe'), | |
4566 | hint=('see `hg help -v rollback` for information')) |
|
4566 | hint=('see `hg help -v rollback` for information')) | |
4567 | return repo.rollback(dryrun=opts.get(r'dry_run'), |
|
4567 | return repo.rollback(dryrun=opts.get(r'dry_run'), | |
4568 | force=opts.get(r'force')) |
|
4568 | force=opts.get(r'force')) | |
4569 |
|
4569 | |||
4570 | @command('root', []) |
|
4570 | @command('root', []) | |
4571 | def root(ui, repo): |
|
4571 | def root(ui, repo): | |
4572 | """print the root (top) of the current working directory |
|
4572 | """print the root (top) of the current working directory | |
4573 |
|
4573 | |||
4574 | Print the root directory of the current repository. |
|
4574 | Print the root directory of the current repository. | |
4575 |
|
4575 | |||
4576 | Returns 0 on success. |
|
4576 | Returns 0 on success. | |
4577 | """ |
|
4577 | """ | |
4578 | ui.write(repo.root + "\n") |
|
4578 | ui.write(repo.root + "\n") | |
4579 |
|
4579 | |||
4580 | @command('^serve', |
|
4580 | @command('^serve', | |
4581 | [('A', 'accesslog', '', _('name of access log file to write to'), |
|
4581 | [('A', 'accesslog', '', _('name of access log file to write to'), | |
4582 | _('FILE')), |
|
4582 | _('FILE')), | |
4583 | ('d', 'daemon', None, _('run server in background')), |
|
4583 | ('d', 'daemon', None, _('run server in background')), | |
4584 | ('', 'daemon-postexec', [], _('used internally by daemon mode')), |
|
4584 | ('', 'daemon-postexec', [], _('used internally by daemon mode')), | |
4585 | ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')), |
|
4585 | ('E', 'errorlog', '', _('name of error log file to write to'), _('FILE')), | |
4586 | # use string type, then we can check if something was passed |
|
4586 | # use string type, then we can check if something was passed | |
4587 | ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')), |
|
4587 | ('p', 'port', '', _('port to listen on (default: 8000)'), _('PORT')), | |
4588 | ('a', 'address', '', _('address to listen on (default: all interfaces)'), |
|
4588 | ('a', 'address', '', _('address to listen on (default: all interfaces)'), | |
4589 | _('ADDR')), |
|
4589 | _('ADDR')), | |
4590 | ('', 'prefix', '', _('prefix path to serve from (default: server root)'), |
|
4590 | ('', 'prefix', '', _('prefix path to serve from (default: server root)'), | |
4591 | _('PREFIX')), |
|
4591 | _('PREFIX')), | |
4592 | ('n', 'name', '', |
|
4592 | ('n', 'name', '', | |
4593 | _('name to show in web pages (default: working directory)'), _('NAME')), |
|
4593 | _('name to show in web pages (default: working directory)'), _('NAME')), | |
4594 | ('', 'web-conf', '', |
|
4594 | ('', 'web-conf', '', | |
4595 | _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')), |
|
4595 | _("name of the hgweb config file (see 'hg help hgweb')"), _('FILE')), | |
4596 | ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'), |
|
4596 | ('', 'webdir-conf', '', _('name of the hgweb config file (DEPRECATED)'), | |
4597 | _('FILE')), |
|
4597 | _('FILE')), | |
4598 | ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')), |
|
4598 | ('', 'pid-file', '', _('name of file to write process ID to'), _('FILE')), | |
4599 | ('', 'stdio', None, _('for remote clients (ADVANCED)')), |
|
4599 | ('', 'stdio', None, _('for remote clients (ADVANCED)')), | |
4600 | ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')), |
|
4600 | ('', 'cmdserver', '', _('for remote clients (ADVANCED)'), _('MODE')), | |
4601 | ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')), |
|
4601 | ('t', 'templates', '', _('web templates to use'), _('TEMPLATE')), | |
4602 | ('', 'style', '', _('template style to use'), _('STYLE')), |
|
4602 | ('', 'style', '', _('template style to use'), _('STYLE')), | |
4603 | ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')), |
|
4603 | ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')), | |
4604 | ('', 'certificate', '', _('SSL certificate file'), _('FILE'))] |
|
4604 | ('', 'certificate', '', _('SSL certificate file'), _('FILE'))] | |
4605 | + subrepoopts, |
|
4605 | + subrepoopts, | |
4606 | _('[OPTION]...'), |
|
4606 | _('[OPTION]...'), | |
4607 | optionalrepo=True) |
|
4607 | optionalrepo=True) | |
4608 | def serve(ui, repo, **opts): |
|
4608 | def serve(ui, repo, **opts): | |
4609 | """start stand-alone webserver |
|
4609 | """start stand-alone webserver | |
4610 |
|
4610 | |||
4611 | Start a local HTTP repository browser and pull server. You can use |
|
4611 | Start a local HTTP repository browser and pull server. You can use | |
4612 | this for ad-hoc sharing and browsing of repositories. It is |
|
4612 | this for ad-hoc sharing and browsing of repositories. It is | |
4613 | recommended to use a real web server to serve a repository for |
|
4613 | recommended to use a real web server to serve a repository for | |
4614 | longer periods of time. |
|
4614 | longer periods of time. | |
4615 |
|
4615 | |||
4616 | Please note that the server does not implement access control. |
|
4616 | Please note that the server does not implement access control. | |
4617 | This means that, by default, anybody can read from the server and |
|
4617 | This means that, by default, anybody can read from the server and | |
4618 | nobody can write to it by default. Set the ``web.allow_push`` |
|
4618 | nobody can write to it by default. Set the ``web.allow_push`` | |
4619 | option to ``*`` to allow everybody to push to the server. You |
|
4619 | option to ``*`` to allow everybody to push to the server. You | |
4620 | should use a real web server if you need to authenticate users. |
|
4620 | should use a real web server if you need to authenticate users. | |
4621 |
|
4621 | |||
4622 | By default, the server logs accesses to stdout and errors to |
|
4622 | By default, the server logs accesses to stdout and errors to | |
4623 | stderr. Use the -A/--accesslog and -E/--errorlog options to log to |
|
4623 | stderr. Use the -A/--accesslog and -E/--errorlog options to log to | |
4624 | files. |
|
4624 | files. | |
4625 |
|
4625 | |||
4626 | To have the server choose a free port number to listen on, specify |
|
4626 | To have the server choose a free port number to listen on, specify | |
4627 | a port number of 0; in this case, the server will print the port |
|
4627 | a port number of 0; in this case, the server will print the port | |
4628 | number it uses. |
|
4628 | number it uses. | |
4629 |
|
4629 | |||
4630 | Returns 0 on success. |
|
4630 | Returns 0 on success. | |
4631 | """ |
|
4631 | """ | |
4632 |
|
4632 | |||
4633 | opts = pycompat.byteskwargs(opts) |
|
4633 | opts = pycompat.byteskwargs(opts) | |
4634 | if opts["stdio"] and opts["cmdserver"]: |
|
4634 | if opts["stdio"] and opts["cmdserver"]: | |
4635 | raise error.Abort(_("cannot use --stdio with --cmdserver")) |
|
4635 | raise error.Abort(_("cannot use --stdio with --cmdserver")) | |
4636 |
|
4636 | |||
4637 | if opts["stdio"]: |
|
4637 | if opts["stdio"]: | |
4638 | if repo is None: |
|
4638 | if repo is None: | |
4639 | raise error.RepoError(_("there is no Mercurial repository here" |
|
4639 | raise error.RepoError(_("there is no Mercurial repository here" | |
4640 | " (.hg not found)")) |
|
4640 | " (.hg not found)")) | |
4641 | s = sshserver.sshserver(ui, repo) |
|
4641 | s = sshserver.sshserver(ui, repo) | |
4642 | s.serve_forever() |
|
4642 | s.serve_forever() | |
4643 |
|
4643 | |||
4644 | service = server.createservice(ui, repo, opts) |
|
4644 | service = server.createservice(ui, repo, opts) | |
4645 | return server.runservice(opts, initfn=service.init, runfn=service.run) |
|
4645 | return server.runservice(opts, initfn=service.init, runfn=service.run) | |
4646 |
|
4646 | |||
4647 | @command('^status|st', |
|
4647 | @command('^status|st', | |
4648 | [('A', 'all', None, _('show status of all files')), |
|
4648 | [('A', 'all', None, _('show status of all files')), | |
4649 | ('m', 'modified', None, _('show only modified files')), |
|
4649 | ('m', 'modified', None, _('show only modified files')), | |
4650 | ('a', 'added', None, _('show only added files')), |
|
4650 | ('a', 'added', None, _('show only added files')), | |
4651 | ('r', 'removed', None, _('show only removed files')), |
|
4651 | ('r', 'removed', None, _('show only removed files')), | |
4652 | ('d', 'deleted', None, _('show only deleted (but tracked) files')), |
|
4652 | ('d', 'deleted', None, _('show only deleted (but tracked) files')), | |
4653 | ('c', 'clean', None, _('show only files without changes')), |
|
4653 | ('c', 'clean', None, _('show only files without changes')), | |
4654 | ('u', 'unknown', None, _('show only unknown (not tracked) files')), |
|
4654 | ('u', 'unknown', None, _('show only unknown (not tracked) files')), | |
4655 | ('i', 'ignored', None, _('show only ignored files')), |
|
4655 | ('i', 'ignored', None, _('show only ignored files')), | |
4656 | ('n', 'no-status', None, _('hide status prefix')), |
|
4656 | ('n', 'no-status', None, _('hide status prefix')), | |
4657 | ('t', 'terse', '', _('show the terse output (EXPERIMENTAL)')), |
|
4657 | ('t', 'terse', '', _('show the terse output (EXPERIMENTAL)')), | |
4658 | ('C', 'copies', None, _('show source of copied files')), |
|
4658 | ('C', 'copies', None, _('show source of copied files')), | |
4659 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), |
|
4659 | ('0', 'print0', None, _('end filenames with NUL, for use with xargs')), | |
4660 | ('', 'rev', [], _('show difference from revision'), _('REV')), |
|
4660 | ('', 'rev', [], _('show difference from revision'), _('REV')), | |
4661 | ('', 'change', '', _('list the changed files of a revision'), _('REV')), |
|
4661 | ('', 'change', '', _('list the changed files of a revision'), _('REV')), | |
4662 | ] + walkopts + subrepoopts + formatteropts, |
|
4662 | ] + walkopts + subrepoopts + formatteropts, | |
4663 | _('[OPTION]... [FILE]...'), |
|
4663 | _('[OPTION]... [FILE]...'), | |
4664 | inferrepo=True) |
|
4664 | inferrepo=True) | |
4665 | def status(ui, repo, *pats, **opts): |
|
4665 | def status(ui, repo, *pats, **opts): | |
4666 | """show changed files in the working directory |
|
4666 | """show changed files in the working directory | |
4667 |
|
4667 | |||
4668 | Show status of files in the repository. If names are given, only |
|
4668 | Show status of files in the repository. If names are given, only | |
4669 | files that match are shown. Files that are clean or ignored or |
|
4669 | files that match are shown. Files that are clean or ignored or | |
4670 | the source of a copy/move operation, are not listed unless |
|
4670 | the source of a copy/move operation, are not listed unless | |
4671 | -c/--clean, -i/--ignored, -C/--copies or -A/--all are given. |
|
4671 | -c/--clean, -i/--ignored, -C/--copies or -A/--all are given. | |
4672 | Unless options described with "show only ..." are given, the |
|
4672 | Unless options described with "show only ..." are given, the | |
4673 | options -mardu are used. |
|
4673 | options -mardu are used. | |
4674 |
|
4674 | |||
4675 | Option -q/--quiet hides untracked (unknown and ignored) files |
|
4675 | Option -q/--quiet hides untracked (unknown and ignored) files | |
4676 | unless explicitly requested with -u/--unknown or -i/--ignored. |
|
4676 | unless explicitly requested with -u/--unknown or -i/--ignored. | |
4677 |
|
4677 | |||
4678 | .. note:: |
|
4678 | .. note:: | |
4679 |
|
4679 | |||
4680 | :hg:`status` may appear to disagree with diff if permissions have |
|
4680 | :hg:`status` may appear to disagree with diff if permissions have | |
4681 | changed or a merge has occurred. The standard diff format does |
|
4681 | changed or a merge has occurred. The standard diff format does | |
4682 | not report permission changes and diff only reports changes |
|
4682 | not report permission changes and diff only reports changes | |
4683 | relative to one merge parent. |
|
4683 | relative to one merge parent. | |
4684 |
|
4684 | |||
4685 | If one revision is given, it is used as the base revision. |
|
4685 | If one revision is given, it is used as the base revision. | |
4686 | If two revisions are given, the differences between them are |
|
4686 | If two revisions are given, the differences between them are | |
4687 | shown. The --change option can also be used as a shortcut to list |
|
4687 | shown. The --change option can also be used as a shortcut to list | |
4688 | the changed files of a revision from its first parent. |
|
4688 | the changed files of a revision from its first parent. | |
4689 |
|
4689 | |||
4690 | The codes used to show the status of files are:: |
|
4690 | The codes used to show the status of files are:: | |
4691 |
|
4691 | |||
4692 | M = modified |
|
4692 | M = modified | |
4693 | A = added |
|
4693 | A = added | |
4694 | R = removed |
|
4694 | R = removed | |
4695 | C = clean |
|
4695 | C = clean | |
4696 | ! = missing (deleted by non-hg command, but still tracked) |
|
4696 | ! = missing (deleted by non-hg command, but still tracked) | |
4697 | ? = not tracked |
|
4697 | ? = not tracked | |
4698 | I = ignored |
|
4698 | I = ignored | |
4699 | = origin of the previous file (with --copies) |
|
4699 | = origin of the previous file (with --copies) | |
4700 |
|
4700 | |||
4701 | .. container:: verbose |
|
4701 | .. container:: verbose | |
4702 |
|
4702 | |||
4703 | The -t/--terse option abbreviates the output by showing directory name |
|
4703 | The -t/--terse option abbreviates the output by showing directory name | |
4704 | if all the files in it share the same status. The option expects a value |
|
4704 | if all the files in it share the same status. The option expects a value | |
4705 | which can be a string formed by using 'm', 'a', 'r', 'd', 'u', 'i', 'c' |
|
4705 | which can be a string formed by using 'm', 'a', 'r', 'd', 'u', 'i', 'c' | |
4706 | where, 'm' stands for 'modified', 'a' for 'added', 'r' for 'removed', |
|
4706 | where, 'm' stands for 'modified', 'a' for 'added', 'r' for 'removed', | |
4707 | 'd' for 'deleted', 'u' for 'unknown', 'i' for 'ignored' and 'c' for clean. |
|
4707 | 'd' for 'deleted', 'u' for 'unknown', 'i' for 'ignored' and 'c' for clean. | |
4708 |
|
4708 | |||
4709 | It terses the output of only those status which are passed. The ignored |
|
4709 | It terses the output of only those status which are passed. The ignored | |
4710 | files are not considered while tersing until 'i' is there in --terse value |
|
4710 | files are not considered while tersing until 'i' is there in --terse value | |
4711 | or the --ignored option is used. |
|
4711 | or the --ignored option is used. | |
4712 |
|
4712 | |||
4713 | --verbose option shows more context about the state of the repo |
|
4713 | --verbose option shows more context about the state of the repo | |
4714 | like the repository is in unfinised merge, shelve, rebase state etc. |
|
4714 | like the repository is in unfinised merge, shelve, rebase state etc. | |
4715 | You can have this behaviour turned on by default by following config: |
|
4715 | You can have this behaviour turned on by default by following config: | |
4716 |
|
4716 | |||
4717 | [commands] |
|
4717 | [commands] | |
4718 | status.verbose = true |
|
4718 | status.verbose = true | |
4719 |
|
4719 | |||
4720 | You can also skip some states like bisect by adding following in |
|
4720 | You can also skip some states like bisect by adding following in | |
4721 | configuration file. |
|
4721 | configuration file. | |
4722 |
|
4722 | |||
4723 | [commands] |
|
4723 | [commands] | |
4724 | status.skipstates = bisect |
|
4724 | status.skipstates = bisect | |
4725 |
|
4725 | |||
4726 | Examples: |
|
4726 | Examples: | |
4727 |
|
4727 | |||
4728 | - show changes in the working directory relative to a |
|
4728 | - show changes in the working directory relative to a | |
4729 | changeset:: |
|
4729 | changeset:: | |
4730 |
|
4730 | |||
4731 | hg status --rev 9353 |
|
4731 | hg status --rev 9353 | |
4732 |
|
4732 | |||
4733 | - show changes in the working directory relative to the |
|
4733 | - show changes in the working directory relative to the | |
4734 | current directory (see :hg:`help patterns` for more information):: |
|
4734 | current directory (see :hg:`help patterns` for more information):: | |
4735 |
|
4735 | |||
4736 | hg status re: |
|
4736 | hg status re: | |
4737 |
|
4737 | |||
4738 | - show all changes including copies in an existing changeset:: |
|
4738 | - show all changes including copies in an existing changeset:: | |
4739 |
|
4739 | |||
4740 | hg status --copies --change 9353 |
|
4740 | hg status --copies --change 9353 | |
4741 |
|
4741 | |||
4742 | - get a NUL separated list of added files, suitable for xargs:: |
|
4742 | - get a NUL separated list of added files, suitable for xargs:: | |
4743 |
|
4743 | |||
4744 | hg status -an0 |
|
4744 | hg status -an0 | |
4745 |
|
4745 | |||
4746 | Returns 0 on success. |
|
4746 | Returns 0 on success. | |
4747 | """ |
|
4747 | """ | |
4748 |
|
4748 | |||
4749 | opts = pycompat.byteskwargs(opts) |
|
4749 | opts = pycompat.byteskwargs(opts) | |
4750 | revs = opts.get('rev') |
|
4750 | revs = opts.get('rev') | |
4751 | change = opts.get('change') |
|
4751 | change = opts.get('change') | |
4752 | terse = opts.get('terse') |
|
4752 | terse = opts.get('terse') | |
4753 |
|
4753 | |||
4754 | if revs and change: |
|
4754 | if revs and change: | |
4755 | msg = _('cannot specify --rev and --change at the same time') |
|
4755 | msg = _('cannot specify --rev and --change at the same time') | |
4756 | raise error.Abort(msg) |
|
4756 | raise error.Abort(msg) | |
4757 | elif revs and terse: |
|
4757 | elif revs and terse: | |
4758 | msg = _('cannot use --terse with --rev') |
|
4758 | msg = _('cannot use --terse with --rev') | |
4759 | raise error.Abort(msg) |
|
4759 | raise error.Abort(msg) | |
4760 | elif change: |
|
4760 | elif change: | |
4761 | node2 = scmutil.revsingle(repo, change, None).node() |
|
4761 | node2 = scmutil.revsingle(repo, change, None).node() | |
4762 | node1 = repo[node2].p1().node() |
|
4762 | node1 = repo[node2].p1().node() | |
4763 | else: |
|
4763 | else: | |
4764 | node1, node2 = scmutil.revpair(repo, revs) |
|
4764 | node1, node2 = scmutil.revpair(repo, revs) | |
4765 |
|
4765 | |||
4766 | if pats or ui.configbool('commands', 'status.relative'): |
|
4766 | if pats or ui.configbool('commands', 'status.relative'): | |
4767 | cwd = repo.getcwd() |
|
4767 | cwd = repo.getcwd() | |
4768 | else: |
|
4768 | else: | |
4769 | cwd = '' |
|
4769 | cwd = '' | |
4770 |
|
4770 | |||
4771 | if opts.get('print0'): |
|
4771 | if opts.get('print0'): | |
4772 | end = '\0' |
|
4772 | end = '\0' | |
4773 | else: |
|
4773 | else: | |
4774 | end = '\n' |
|
4774 | end = '\n' | |
4775 | copy = {} |
|
4775 | copy = {} | |
4776 | states = 'modified added removed deleted unknown ignored clean'.split() |
|
4776 | states = 'modified added removed deleted unknown ignored clean'.split() | |
4777 | show = [k for k in states if opts.get(k)] |
|
4777 | show = [k for k in states if opts.get(k)] | |
4778 | if opts.get('all'): |
|
4778 | if opts.get('all'): | |
4779 | show += ui.quiet and (states[:4] + ['clean']) or states |
|
4779 | show += ui.quiet and (states[:4] + ['clean']) or states | |
4780 |
|
4780 | |||
4781 | if not show: |
|
4781 | if not show: | |
4782 | if ui.quiet: |
|
4782 | if ui.quiet: | |
4783 | show = states[:4] |
|
4783 | show = states[:4] | |
4784 | else: |
|
4784 | else: | |
4785 | show = states[:5] |
|
4785 | show = states[:5] | |
4786 |
|
4786 | |||
4787 | m = scmutil.match(repo[node2], pats, opts) |
|
4787 | m = scmutil.match(repo[node2], pats, opts) | |
4788 | stat = repo.status(node1, node2, m, |
|
4788 | stat = repo.status(node1, node2, m, | |
4789 | 'ignored' in show, 'clean' in show, 'unknown' in show, |
|
4789 | 'ignored' in show, 'clean' in show, 'unknown' in show, | |
4790 | opts.get('subrepos')) |
|
4790 | opts.get('subrepos')) | |
4791 | if terse: |
|
4791 | if terse: | |
4792 | stat = cmdutil.tersestatus(repo.root, stat, terse, |
|
4792 | stat = cmdutil.tersestatus(repo.root, stat, terse, | |
4793 | repo.dirstate._ignore, opts.get('ignored')) |
|
4793 | repo.dirstate._ignore, opts.get('ignored')) | |
4794 | changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat) |
|
4794 | changestates = zip(states, pycompat.iterbytestr('MAR!?IC'), stat) | |
4795 |
|
4795 | |||
4796 | if (opts.get('all') or opts.get('copies') |
|
4796 | if (opts.get('all') or opts.get('copies') | |
4797 | or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'): |
|
4797 | or ui.configbool('ui', 'statuscopies')) and not opts.get('no_status'): | |
4798 | copy = copies.pathcopies(repo[node1], repo[node2], m) |
|
4798 | copy = copies.pathcopies(repo[node1], repo[node2], m) | |
4799 |
|
4799 | |||
4800 | ui.pager('status') |
|
4800 | ui.pager('status') | |
4801 | fm = ui.formatter('status', opts) |
|
4801 | fm = ui.formatter('status', opts) | |
4802 | fmt = '%s' + end |
|
4802 | fmt = '%s' + end | |
4803 | showchar = not opts.get('no_status') |
|
4803 | showchar = not opts.get('no_status') | |
4804 |
|
4804 | |||
4805 | for state, char, files in changestates: |
|
4805 | for state, char, files in changestates: | |
4806 | if state in show: |
|
4806 | if state in show: | |
4807 | label = 'status.' + state |
|
4807 | label = 'status.' + state | |
4808 | for f in files: |
|
4808 | for f in files: | |
4809 | fm.startitem() |
|
4809 | fm.startitem() | |
4810 | fm.condwrite(showchar, 'status', '%s ', char, label=label) |
|
4810 | fm.condwrite(showchar, 'status', '%s ', char, label=label) | |
4811 | fm.write('path', fmt, repo.pathto(f, cwd), label=label) |
|
4811 | fm.write('path', fmt, repo.pathto(f, cwd), label=label) | |
4812 | if f in copy: |
|
4812 | if f in copy: | |
4813 | fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd), |
|
4813 | fm.write("copy", ' %s' + end, repo.pathto(copy[f], cwd), | |
4814 | label='status.copied') |
|
4814 | label='status.copied') | |
4815 |
|
4815 | |||
4816 | if ((ui.verbose or ui.configbool('commands', 'status.verbose')) |
|
4816 | if ((ui.verbose or ui.configbool('commands', 'status.verbose')) | |
4817 | and not ui.plain()): |
|
4817 | and not ui.plain()): | |
4818 | cmdutil.morestatus(repo, fm) |
|
4818 | cmdutil.morestatus(repo, fm) | |
4819 | fm.end() |
|
4819 | fm.end() | |
4820 |
|
4820 | |||
4821 | @command('^summary|sum', |
|
4821 | @command('^summary|sum', | |
4822 | [('', 'remote', None, _('check for push and pull'))], '[--remote]') |
|
4822 | [('', 'remote', None, _('check for push and pull'))], '[--remote]') | |
4823 | def summary(ui, repo, **opts): |
|
4823 | def summary(ui, repo, **opts): | |
4824 | """summarize working directory state |
|
4824 | """summarize working directory state | |
4825 |
|
4825 | |||
4826 | This generates a brief summary of the working directory state, |
|
4826 | This generates a brief summary of the working directory state, | |
4827 | including parents, branch, commit status, phase and available updates. |
|
4827 | including parents, branch, commit status, phase and available updates. | |
4828 |
|
4828 | |||
4829 | With the --remote option, this will check the default paths for |
|
4829 | With the --remote option, this will check the default paths for | |
4830 | incoming and outgoing changes. This can be time-consuming. |
|
4830 | incoming and outgoing changes. This can be time-consuming. | |
4831 |
|
4831 | |||
4832 | Returns 0 on success. |
|
4832 | Returns 0 on success. | |
4833 | """ |
|
4833 | """ | |
4834 |
|
4834 | |||
4835 | opts = pycompat.byteskwargs(opts) |
|
4835 | opts = pycompat.byteskwargs(opts) | |
4836 | ui.pager('summary') |
|
4836 | ui.pager('summary') | |
4837 | ctx = repo[None] |
|
4837 | ctx = repo[None] | |
4838 | parents = ctx.parents() |
|
4838 | parents = ctx.parents() | |
4839 | pnode = parents[0].node() |
|
4839 | pnode = parents[0].node() | |
4840 | marks = [] |
|
4840 | marks = [] | |
4841 |
|
4841 | |||
4842 | ms = None |
|
4842 | ms = None | |
4843 | try: |
|
4843 | try: | |
4844 | ms = mergemod.mergestate.read(repo) |
|
4844 | ms = mergemod.mergestate.read(repo) | |
4845 | except error.UnsupportedMergeRecords as e: |
|
4845 | except error.UnsupportedMergeRecords as e: | |
4846 | s = ' '.join(e.recordtypes) |
|
4846 | s = ' '.join(e.recordtypes) | |
4847 | ui.warn( |
|
4847 | ui.warn( | |
4848 | _('warning: merge state has unsupported record types: %s\n') % s) |
|
4848 | _('warning: merge state has unsupported record types: %s\n') % s) | |
4849 | unresolved = [] |
|
4849 | unresolved = [] | |
4850 | else: |
|
4850 | else: | |
4851 | unresolved = list(ms.unresolved()) |
|
4851 | unresolved = list(ms.unresolved()) | |
4852 |
|
4852 | |||
4853 | for p in parents: |
|
4853 | for p in parents: | |
4854 | # label with log.changeset (instead of log.parent) since this |
|
4854 | # label with log.changeset (instead of log.parent) since this | |
4855 | # shows a working directory parent *changeset*: |
|
4855 | # shows a working directory parent *changeset*: | |
4856 | # i18n: column positioning for "hg summary" |
|
4856 | # i18n: column positioning for "hg summary" | |
4857 | ui.write(_('parent: %d:%s ') % (p.rev(), p), |
|
4857 | ui.write(_('parent: %d:%s ') % (p.rev(), p), | |
4858 | label=cmdutil._changesetlabels(p)) |
|
4858 | label=cmdutil._changesetlabels(p)) | |
4859 | ui.write(' '.join(p.tags()), label='log.tag') |
|
4859 | ui.write(' '.join(p.tags()), label='log.tag') | |
4860 | if p.bookmarks(): |
|
4860 | if p.bookmarks(): | |
4861 | marks.extend(p.bookmarks()) |
|
4861 | marks.extend(p.bookmarks()) | |
4862 | if p.rev() == -1: |
|
4862 | if p.rev() == -1: | |
4863 | if not len(repo): |
|
4863 | if not len(repo): | |
4864 | ui.write(_(' (empty repository)')) |
|
4864 | ui.write(_(' (empty repository)')) | |
4865 | else: |
|
4865 | else: | |
4866 | ui.write(_(' (no revision checked out)')) |
|
4866 | ui.write(_(' (no revision checked out)')) | |
4867 | if p.obsolete(): |
|
4867 | if p.obsolete(): | |
4868 | ui.write(_(' (obsolete)')) |
|
4868 | ui.write(_(' (obsolete)')) | |
4869 | if p.isunstable(): |
|
4869 | if p.isunstable(): | |
4870 | instabilities = (ui.label(instability, 'trouble.%s' % instability) |
|
4870 | instabilities = (ui.label(instability, 'trouble.%s' % instability) | |
4871 | for instability in p.instabilities()) |
|
4871 | for instability in p.instabilities()) | |
4872 | ui.write(' (' |
|
4872 | ui.write(' (' | |
4873 | + ', '.join(instabilities) |
|
4873 | + ', '.join(instabilities) | |
4874 | + ')') |
|
4874 | + ')') | |
4875 | ui.write('\n') |
|
4875 | ui.write('\n') | |
4876 | if p.description(): |
|
4876 | if p.description(): | |
4877 | ui.status(' ' + p.description().splitlines()[0].strip() + '\n', |
|
4877 | ui.status(' ' + p.description().splitlines()[0].strip() + '\n', | |
4878 | label='log.summary') |
|
4878 | label='log.summary') | |
4879 |
|
4879 | |||
4880 | branch = ctx.branch() |
|
4880 | branch = ctx.branch() | |
4881 | bheads = repo.branchheads(branch) |
|
4881 | bheads = repo.branchheads(branch) | |
4882 | # i18n: column positioning for "hg summary" |
|
4882 | # i18n: column positioning for "hg summary" | |
4883 | m = _('branch: %s\n') % branch |
|
4883 | m = _('branch: %s\n') % branch | |
4884 | if branch != 'default': |
|
4884 | if branch != 'default': | |
4885 | ui.write(m, label='log.branch') |
|
4885 | ui.write(m, label='log.branch') | |
4886 | else: |
|
4886 | else: | |
4887 | ui.status(m, label='log.branch') |
|
4887 | ui.status(m, label='log.branch') | |
4888 |
|
4888 | |||
4889 | if marks: |
|
4889 | if marks: | |
4890 | active = repo._activebookmark |
|
4890 | active = repo._activebookmark | |
4891 | # i18n: column positioning for "hg summary" |
|
4891 | # i18n: column positioning for "hg summary" | |
4892 | ui.write(_('bookmarks:'), label='log.bookmark') |
|
4892 | ui.write(_('bookmarks:'), label='log.bookmark') | |
4893 | if active is not None: |
|
4893 | if active is not None: | |
4894 | if active in marks: |
|
4894 | if active in marks: | |
4895 | ui.write(' *' + active, label=bookmarks.activebookmarklabel) |
|
4895 | ui.write(' *' + active, label=bookmarks.activebookmarklabel) | |
4896 | marks.remove(active) |
|
4896 | marks.remove(active) | |
4897 | else: |
|
4897 | else: | |
4898 | ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel) |
|
4898 | ui.write(' [%s]' % active, label=bookmarks.activebookmarklabel) | |
4899 | for m in marks: |
|
4899 | for m in marks: | |
4900 | ui.write(' ' + m, label='log.bookmark') |
|
4900 | ui.write(' ' + m, label='log.bookmark') | |
4901 | ui.write('\n', label='log.bookmark') |
|
4901 | ui.write('\n', label='log.bookmark') | |
4902 |
|
4902 | |||
4903 | status = repo.status(unknown=True) |
|
4903 | status = repo.status(unknown=True) | |
4904 |
|
4904 | |||
4905 | c = repo.dirstate.copies() |
|
4905 | c = repo.dirstate.copies() | |
4906 | copied, renamed = [], [] |
|
4906 | copied, renamed = [], [] | |
4907 | for d, s in c.iteritems(): |
|
4907 | for d, s in c.iteritems(): | |
4908 | if s in status.removed: |
|
4908 | if s in status.removed: | |
4909 | status.removed.remove(s) |
|
4909 | status.removed.remove(s) | |
4910 | renamed.append(d) |
|
4910 | renamed.append(d) | |
4911 | else: |
|
4911 | else: | |
4912 | copied.append(d) |
|
4912 | copied.append(d) | |
4913 | if d in status.added: |
|
4913 | if d in status.added: | |
4914 | status.added.remove(d) |
|
4914 | status.added.remove(d) | |
4915 |
|
4915 | |||
4916 | subs = [s for s in ctx.substate if ctx.sub(s).dirty()] |
|
4916 | subs = [s for s in ctx.substate if ctx.sub(s).dirty()] | |
4917 |
|
4917 | |||
4918 | labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified), |
|
4918 | labels = [(ui.label(_('%d modified'), 'status.modified'), status.modified), | |
4919 | (ui.label(_('%d added'), 'status.added'), status.added), |
|
4919 | (ui.label(_('%d added'), 'status.added'), status.added), | |
4920 | (ui.label(_('%d removed'), 'status.removed'), status.removed), |
|
4920 | (ui.label(_('%d removed'), 'status.removed'), status.removed), | |
4921 | (ui.label(_('%d renamed'), 'status.copied'), renamed), |
|
4921 | (ui.label(_('%d renamed'), 'status.copied'), renamed), | |
4922 | (ui.label(_('%d copied'), 'status.copied'), copied), |
|
4922 | (ui.label(_('%d copied'), 'status.copied'), copied), | |
4923 | (ui.label(_('%d deleted'), 'status.deleted'), status.deleted), |
|
4923 | (ui.label(_('%d deleted'), 'status.deleted'), status.deleted), | |
4924 | (ui.label(_('%d unknown'), 'status.unknown'), status.unknown), |
|
4924 | (ui.label(_('%d unknown'), 'status.unknown'), status.unknown), | |
4925 | (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved), |
|
4925 | (ui.label(_('%d unresolved'), 'resolve.unresolved'), unresolved), | |
4926 | (ui.label(_('%d subrepos'), 'status.modified'), subs)] |
|
4926 | (ui.label(_('%d subrepos'), 'status.modified'), subs)] | |
4927 | t = [] |
|
4927 | t = [] | |
4928 | for l, s in labels: |
|
4928 | for l, s in labels: | |
4929 | if s: |
|
4929 | if s: | |
4930 | t.append(l % len(s)) |
|
4930 | t.append(l % len(s)) | |
4931 |
|
4931 | |||
4932 | t = ', '.join(t) |
|
4932 | t = ', '.join(t) | |
4933 | cleanworkdir = False |
|
4933 | cleanworkdir = False | |
4934 |
|
4934 | |||
4935 | if repo.vfs.exists('graftstate'): |
|
4935 | if repo.vfs.exists('graftstate'): | |
4936 | t += _(' (graft in progress)') |
|
4936 | t += _(' (graft in progress)') | |
4937 | if repo.vfs.exists('updatestate'): |
|
4937 | if repo.vfs.exists('updatestate'): | |
4938 | t += _(' (interrupted update)') |
|
4938 | t += _(' (interrupted update)') | |
4939 | elif len(parents) > 1: |
|
4939 | elif len(parents) > 1: | |
4940 | t += _(' (merge)') |
|
4940 | t += _(' (merge)') | |
4941 | elif branch != parents[0].branch(): |
|
4941 | elif branch != parents[0].branch(): | |
4942 | t += _(' (new branch)') |
|
4942 | t += _(' (new branch)') | |
4943 | elif (parents[0].closesbranch() and |
|
4943 | elif (parents[0].closesbranch() and | |
4944 | pnode in repo.branchheads(branch, closed=True)): |
|
4944 | pnode in repo.branchheads(branch, closed=True)): | |
4945 | t += _(' (head closed)') |
|
4945 | t += _(' (head closed)') | |
4946 | elif not (status.modified or status.added or status.removed or renamed or |
|
4946 | elif not (status.modified or status.added or status.removed or renamed or | |
4947 | copied or subs): |
|
4947 | copied or subs): | |
4948 | t += _(' (clean)') |
|
4948 | t += _(' (clean)') | |
4949 | cleanworkdir = True |
|
4949 | cleanworkdir = True | |
4950 | elif pnode not in bheads: |
|
4950 | elif pnode not in bheads: | |
4951 | t += _(' (new branch head)') |
|
4951 | t += _(' (new branch head)') | |
4952 |
|
4952 | |||
4953 | if parents: |
|
4953 | if parents: | |
4954 | pendingphase = max(p.phase() for p in parents) |
|
4954 | pendingphase = max(p.phase() for p in parents) | |
4955 | else: |
|
4955 | else: | |
4956 | pendingphase = phases.public |
|
4956 | pendingphase = phases.public | |
4957 |
|
4957 | |||
4958 | if pendingphase > phases.newcommitphase(ui): |
|
4958 | if pendingphase > phases.newcommitphase(ui): | |
4959 | t += ' (%s)' % phases.phasenames[pendingphase] |
|
4959 | t += ' (%s)' % phases.phasenames[pendingphase] | |
4960 |
|
4960 | |||
4961 | if cleanworkdir: |
|
4961 | if cleanworkdir: | |
4962 | # i18n: column positioning for "hg summary" |
|
4962 | # i18n: column positioning for "hg summary" | |
4963 | ui.status(_('commit: %s\n') % t.strip()) |
|
4963 | ui.status(_('commit: %s\n') % t.strip()) | |
4964 | else: |
|
4964 | else: | |
4965 | # i18n: column positioning for "hg summary" |
|
4965 | # i18n: column positioning for "hg summary" | |
4966 | ui.write(_('commit: %s\n') % t.strip()) |
|
4966 | ui.write(_('commit: %s\n') % t.strip()) | |
4967 |
|
4967 | |||
4968 | # all ancestors of branch heads - all ancestors of parent = new csets |
|
4968 | # all ancestors of branch heads - all ancestors of parent = new csets | |
4969 | new = len(repo.changelog.findmissing([pctx.node() for pctx in parents], |
|
4969 | new = len(repo.changelog.findmissing([pctx.node() for pctx in parents], | |
4970 | bheads)) |
|
4970 | bheads)) | |
4971 |
|
4971 | |||
4972 | if new == 0: |
|
4972 | if new == 0: | |
4973 | # i18n: column positioning for "hg summary" |
|
4973 | # i18n: column positioning for "hg summary" | |
4974 | ui.status(_('update: (current)\n')) |
|
4974 | ui.status(_('update: (current)\n')) | |
4975 | elif pnode not in bheads: |
|
4975 | elif pnode not in bheads: | |
4976 | # i18n: column positioning for "hg summary" |
|
4976 | # i18n: column positioning for "hg summary" | |
4977 | ui.write(_('update: %d new changesets (update)\n') % new) |
|
4977 | ui.write(_('update: %d new changesets (update)\n') % new) | |
4978 | else: |
|
4978 | else: | |
4979 | # i18n: column positioning for "hg summary" |
|
4979 | # i18n: column positioning for "hg summary" | |
4980 | ui.write(_('update: %d new changesets, %d branch heads (merge)\n') % |
|
4980 | ui.write(_('update: %d new changesets, %d branch heads (merge)\n') % | |
4981 | (new, len(bheads))) |
|
4981 | (new, len(bheads))) | |
4982 |
|
4982 | |||
4983 | t = [] |
|
4983 | t = [] | |
4984 | draft = len(repo.revs('draft()')) |
|
4984 | draft = len(repo.revs('draft()')) | |
4985 | if draft: |
|
4985 | if draft: | |
4986 | t.append(_('%d draft') % draft) |
|
4986 | t.append(_('%d draft') % draft) | |
4987 | secret = len(repo.revs('secret()')) |
|
4987 | secret = len(repo.revs('secret()')) | |
4988 | if secret: |
|
4988 | if secret: | |
4989 | t.append(_('%d secret') % secret) |
|
4989 | t.append(_('%d secret') % secret) | |
4990 |
|
4990 | |||
4991 | if draft or secret: |
|
4991 | if draft or secret: | |
4992 | ui.status(_('phases: %s\n') % ', '.join(t)) |
|
4992 | ui.status(_('phases: %s\n') % ', '.join(t)) | |
4993 |
|
4993 | |||
4994 | if obsolete.isenabled(repo, obsolete.createmarkersopt): |
|
4994 | if obsolete.isenabled(repo, obsolete.createmarkersopt): | |
4995 |
for trouble in ("orphan", "contentdivergent", " |
|
4995 | for trouble in ("orphan", "contentdivergent", "phasedivergent"): | |
4996 | numtrouble = len(repo.revs(trouble + "()")) |
|
4996 | numtrouble = len(repo.revs(trouble + "()")) | |
4997 | # We write all the possibilities to ease translation |
|
4997 | # We write all the possibilities to ease translation | |
4998 | troublemsg = { |
|
4998 | troublemsg = { | |
4999 | "orphan": _("orphan: %d changesets"), |
|
4999 | "orphan": _("orphan: %d changesets"), | |
5000 | "contentdivergent": _("content-divergent: %d changesets"), |
|
5000 | "contentdivergent": _("content-divergent: %d changesets"), | |
5001 |
" |
|
5001 | "phasedivergent": _("phase-divergent: %d changesets"), | |
5002 | } |
|
5002 | } | |
5003 | if numtrouble > 0: |
|
5003 | if numtrouble > 0: | |
5004 | ui.status(troublemsg[trouble] % numtrouble + "\n") |
|
5004 | ui.status(troublemsg[trouble] % numtrouble + "\n") | |
5005 |
|
5005 | |||
5006 | cmdutil.summaryhooks(ui, repo) |
|
5006 | cmdutil.summaryhooks(ui, repo) | |
5007 |
|
5007 | |||
5008 | if opts.get('remote'): |
|
5008 | if opts.get('remote'): | |
5009 | needsincoming, needsoutgoing = True, True |
|
5009 | needsincoming, needsoutgoing = True, True | |
5010 | else: |
|
5010 | else: | |
5011 | needsincoming, needsoutgoing = False, False |
|
5011 | needsincoming, needsoutgoing = False, False | |
5012 | for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None): |
|
5012 | for i, o in cmdutil.summaryremotehooks(ui, repo, opts, None): | |
5013 | if i: |
|
5013 | if i: | |
5014 | needsincoming = True |
|
5014 | needsincoming = True | |
5015 | if o: |
|
5015 | if o: | |
5016 | needsoutgoing = True |
|
5016 | needsoutgoing = True | |
5017 | if not needsincoming and not needsoutgoing: |
|
5017 | if not needsincoming and not needsoutgoing: | |
5018 | return |
|
5018 | return | |
5019 |
|
5019 | |||
5020 | def getincoming(): |
|
5020 | def getincoming(): | |
5021 | source, branches = hg.parseurl(ui.expandpath('default')) |
|
5021 | source, branches = hg.parseurl(ui.expandpath('default')) | |
5022 | sbranch = branches[0] |
|
5022 | sbranch = branches[0] | |
5023 | try: |
|
5023 | try: | |
5024 | other = hg.peer(repo, {}, source) |
|
5024 | other = hg.peer(repo, {}, source) | |
5025 | except error.RepoError: |
|
5025 | except error.RepoError: | |
5026 | if opts.get('remote'): |
|
5026 | if opts.get('remote'): | |
5027 | raise |
|
5027 | raise | |
5028 | return source, sbranch, None, None, None |
|
5028 | return source, sbranch, None, None, None | |
5029 | revs, checkout = hg.addbranchrevs(repo, other, branches, None) |
|
5029 | revs, checkout = hg.addbranchrevs(repo, other, branches, None) | |
5030 | if revs: |
|
5030 | if revs: | |
5031 | revs = [other.lookup(rev) for rev in revs] |
|
5031 | revs = [other.lookup(rev) for rev in revs] | |
5032 | ui.debug('comparing with %s\n' % util.hidepassword(source)) |
|
5032 | ui.debug('comparing with %s\n' % util.hidepassword(source)) | |
5033 | repo.ui.pushbuffer() |
|
5033 | repo.ui.pushbuffer() | |
5034 | commoninc = discovery.findcommonincoming(repo, other, heads=revs) |
|
5034 | commoninc = discovery.findcommonincoming(repo, other, heads=revs) | |
5035 | repo.ui.popbuffer() |
|
5035 | repo.ui.popbuffer() | |
5036 | return source, sbranch, other, commoninc, commoninc[1] |
|
5036 | return source, sbranch, other, commoninc, commoninc[1] | |
5037 |
|
5037 | |||
5038 | if needsincoming: |
|
5038 | if needsincoming: | |
5039 | source, sbranch, sother, commoninc, incoming = getincoming() |
|
5039 | source, sbranch, sother, commoninc, incoming = getincoming() | |
5040 | else: |
|
5040 | else: | |
5041 | source = sbranch = sother = commoninc = incoming = None |
|
5041 | source = sbranch = sother = commoninc = incoming = None | |
5042 |
|
5042 | |||
5043 | def getoutgoing(): |
|
5043 | def getoutgoing(): | |
5044 | dest, branches = hg.parseurl(ui.expandpath('default-push', 'default')) |
|
5044 | dest, branches = hg.parseurl(ui.expandpath('default-push', 'default')) | |
5045 | dbranch = branches[0] |
|
5045 | dbranch = branches[0] | |
5046 | revs, checkout = hg.addbranchrevs(repo, repo, branches, None) |
|
5046 | revs, checkout = hg.addbranchrevs(repo, repo, branches, None) | |
5047 | if source != dest: |
|
5047 | if source != dest: | |
5048 | try: |
|
5048 | try: | |
5049 | dother = hg.peer(repo, {}, dest) |
|
5049 | dother = hg.peer(repo, {}, dest) | |
5050 | except error.RepoError: |
|
5050 | except error.RepoError: | |
5051 | if opts.get('remote'): |
|
5051 | if opts.get('remote'): | |
5052 | raise |
|
5052 | raise | |
5053 | return dest, dbranch, None, None |
|
5053 | return dest, dbranch, None, None | |
5054 | ui.debug('comparing with %s\n' % util.hidepassword(dest)) |
|
5054 | ui.debug('comparing with %s\n' % util.hidepassword(dest)) | |
5055 | elif sother is None: |
|
5055 | elif sother is None: | |
5056 | # there is no explicit destination peer, but source one is invalid |
|
5056 | # there is no explicit destination peer, but source one is invalid | |
5057 | return dest, dbranch, None, None |
|
5057 | return dest, dbranch, None, None | |
5058 | else: |
|
5058 | else: | |
5059 | dother = sother |
|
5059 | dother = sother | |
5060 | if (source != dest or (sbranch is not None and sbranch != dbranch)): |
|
5060 | if (source != dest or (sbranch is not None and sbranch != dbranch)): | |
5061 | common = None |
|
5061 | common = None | |
5062 | else: |
|
5062 | else: | |
5063 | common = commoninc |
|
5063 | common = commoninc | |
5064 | if revs: |
|
5064 | if revs: | |
5065 | revs = [repo.lookup(rev) for rev in revs] |
|
5065 | revs = [repo.lookup(rev) for rev in revs] | |
5066 | repo.ui.pushbuffer() |
|
5066 | repo.ui.pushbuffer() | |
5067 | outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs, |
|
5067 | outgoing = discovery.findcommonoutgoing(repo, dother, onlyheads=revs, | |
5068 | commoninc=common) |
|
5068 | commoninc=common) | |
5069 | repo.ui.popbuffer() |
|
5069 | repo.ui.popbuffer() | |
5070 | return dest, dbranch, dother, outgoing |
|
5070 | return dest, dbranch, dother, outgoing | |
5071 |
|
5071 | |||
5072 | if needsoutgoing: |
|
5072 | if needsoutgoing: | |
5073 | dest, dbranch, dother, outgoing = getoutgoing() |
|
5073 | dest, dbranch, dother, outgoing = getoutgoing() | |
5074 | else: |
|
5074 | else: | |
5075 | dest = dbranch = dother = outgoing = None |
|
5075 | dest = dbranch = dother = outgoing = None | |
5076 |
|
5076 | |||
5077 | if opts.get('remote'): |
|
5077 | if opts.get('remote'): | |
5078 | t = [] |
|
5078 | t = [] | |
5079 | if incoming: |
|
5079 | if incoming: | |
5080 | t.append(_('1 or more incoming')) |
|
5080 | t.append(_('1 or more incoming')) | |
5081 | o = outgoing.missing |
|
5081 | o = outgoing.missing | |
5082 | if o: |
|
5082 | if o: | |
5083 | t.append(_('%d outgoing') % len(o)) |
|
5083 | t.append(_('%d outgoing') % len(o)) | |
5084 | other = dother or sother |
|
5084 | other = dother or sother | |
5085 | if 'bookmarks' in other.listkeys('namespaces'): |
|
5085 | if 'bookmarks' in other.listkeys('namespaces'): | |
5086 | counts = bookmarks.summary(repo, other) |
|
5086 | counts = bookmarks.summary(repo, other) | |
5087 | if counts[0] > 0: |
|
5087 | if counts[0] > 0: | |
5088 | t.append(_('%d incoming bookmarks') % counts[0]) |
|
5088 | t.append(_('%d incoming bookmarks') % counts[0]) | |
5089 | if counts[1] > 0: |
|
5089 | if counts[1] > 0: | |
5090 | t.append(_('%d outgoing bookmarks') % counts[1]) |
|
5090 | t.append(_('%d outgoing bookmarks') % counts[1]) | |
5091 |
|
5091 | |||
5092 | if t: |
|
5092 | if t: | |
5093 | # i18n: column positioning for "hg summary" |
|
5093 | # i18n: column positioning for "hg summary" | |
5094 | ui.write(_('remote: %s\n') % (', '.join(t))) |
|
5094 | ui.write(_('remote: %s\n') % (', '.join(t))) | |
5095 | else: |
|
5095 | else: | |
5096 | # i18n: column positioning for "hg summary" |
|
5096 | # i18n: column positioning for "hg summary" | |
5097 | ui.status(_('remote: (synced)\n')) |
|
5097 | ui.status(_('remote: (synced)\n')) | |
5098 |
|
5098 | |||
5099 | cmdutil.summaryremotehooks(ui, repo, opts, |
|
5099 | cmdutil.summaryremotehooks(ui, repo, opts, | |
5100 | ((source, sbranch, sother, commoninc), |
|
5100 | ((source, sbranch, sother, commoninc), | |
5101 | (dest, dbranch, dother, outgoing))) |
|
5101 | (dest, dbranch, dother, outgoing))) | |
5102 |
|
5102 | |||
5103 | @command('tag', |
|
5103 | @command('tag', | |
5104 | [('f', 'force', None, _('force tag')), |
|
5104 | [('f', 'force', None, _('force tag')), | |
5105 | ('l', 'local', None, _('make the tag local')), |
|
5105 | ('l', 'local', None, _('make the tag local')), | |
5106 | ('r', 'rev', '', _('revision to tag'), _('REV')), |
|
5106 | ('r', 'rev', '', _('revision to tag'), _('REV')), | |
5107 | ('', 'remove', None, _('remove a tag')), |
|
5107 | ('', 'remove', None, _('remove a tag')), | |
5108 | # -l/--local is already there, commitopts cannot be used |
|
5108 | # -l/--local is already there, commitopts cannot be used | |
5109 | ('e', 'edit', None, _('invoke editor on commit messages')), |
|
5109 | ('e', 'edit', None, _('invoke editor on commit messages')), | |
5110 | ('m', 'message', '', _('use text as commit message'), _('TEXT')), |
|
5110 | ('m', 'message', '', _('use text as commit message'), _('TEXT')), | |
5111 | ] + commitopts2, |
|
5111 | ] + commitopts2, | |
5112 | _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')) |
|
5112 | _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')) | |
5113 | def tag(ui, repo, name1, *names, **opts): |
|
5113 | def tag(ui, repo, name1, *names, **opts): | |
5114 | """add one or more tags for the current or given revision |
|
5114 | """add one or more tags for the current or given revision | |
5115 |
|
5115 | |||
5116 | Name a particular revision using <name>. |
|
5116 | Name a particular revision using <name>. | |
5117 |
|
5117 | |||
5118 | Tags are used to name particular revisions of the repository and are |
|
5118 | Tags are used to name particular revisions of the repository and are | |
5119 | very useful to compare different revisions, to go back to significant |
|
5119 | very useful to compare different revisions, to go back to significant | |
5120 | earlier versions or to mark branch points as releases, etc. Changing |
|
5120 | earlier versions or to mark branch points as releases, etc. Changing | |
5121 | an existing tag is normally disallowed; use -f/--force to override. |
|
5121 | an existing tag is normally disallowed; use -f/--force to override. | |
5122 |
|
5122 | |||
5123 | If no revision is given, the parent of the working directory is |
|
5123 | If no revision is given, the parent of the working directory is | |
5124 | used. |
|
5124 | used. | |
5125 |
|
5125 | |||
5126 | To facilitate version control, distribution, and merging of tags, |
|
5126 | To facilitate version control, distribution, and merging of tags, | |
5127 | they are stored as a file named ".hgtags" which is managed similarly |
|
5127 | they are stored as a file named ".hgtags" which is managed similarly | |
5128 | to other project files and can be hand-edited if necessary. This |
|
5128 | to other project files and can be hand-edited if necessary. This | |
5129 | also means that tagging creates a new commit. The file |
|
5129 | also means that tagging creates a new commit. The file | |
5130 | ".hg/localtags" is used for local tags (not shared among |
|
5130 | ".hg/localtags" is used for local tags (not shared among | |
5131 | repositories). |
|
5131 | repositories). | |
5132 |
|
5132 | |||
5133 | Tag commits are usually made at the head of a branch. If the parent |
|
5133 | Tag commits are usually made at the head of a branch. If the parent | |
5134 | of the working directory is not a branch head, :hg:`tag` aborts; use |
|
5134 | of the working directory is not a branch head, :hg:`tag` aborts; use | |
5135 | -f/--force to force the tag commit to be based on a non-head |
|
5135 | -f/--force to force the tag commit to be based on a non-head | |
5136 | changeset. |
|
5136 | changeset. | |
5137 |
|
5137 | |||
5138 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
5138 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
5139 |
|
5139 | |||
5140 | Since tag names have priority over branch names during revision |
|
5140 | Since tag names have priority over branch names during revision | |
5141 | lookup, using an existing branch name as a tag name is discouraged. |
|
5141 | lookup, using an existing branch name as a tag name is discouraged. | |
5142 |
|
5142 | |||
5143 | Returns 0 on success. |
|
5143 | Returns 0 on success. | |
5144 | """ |
|
5144 | """ | |
5145 | opts = pycompat.byteskwargs(opts) |
|
5145 | opts = pycompat.byteskwargs(opts) | |
5146 | wlock = lock = None |
|
5146 | wlock = lock = None | |
5147 | try: |
|
5147 | try: | |
5148 | wlock = repo.wlock() |
|
5148 | wlock = repo.wlock() | |
5149 | lock = repo.lock() |
|
5149 | lock = repo.lock() | |
5150 | rev_ = "." |
|
5150 | rev_ = "." | |
5151 | names = [t.strip() for t in (name1,) + names] |
|
5151 | names = [t.strip() for t in (name1,) + names] | |
5152 | if len(names) != len(set(names)): |
|
5152 | if len(names) != len(set(names)): | |
5153 | raise error.Abort(_('tag names must be unique')) |
|
5153 | raise error.Abort(_('tag names must be unique')) | |
5154 | for n in names: |
|
5154 | for n in names: | |
5155 | scmutil.checknewlabel(repo, n, 'tag') |
|
5155 | scmutil.checknewlabel(repo, n, 'tag') | |
5156 | if not n: |
|
5156 | if not n: | |
5157 | raise error.Abort(_('tag names cannot consist entirely of ' |
|
5157 | raise error.Abort(_('tag names cannot consist entirely of ' | |
5158 | 'whitespace')) |
|
5158 | 'whitespace')) | |
5159 | if opts.get('rev') and opts.get('remove'): |
|
5159 | if opts.get('rev') and opts.get('remove'): | |
5160 | raise error.Abort(_("--rev and --remove are incompatible")) |
|
5160 | raise error.Abort(_("--rev and --remove are incompatible")) | |
5161 | if opts.get('rev'): |
|
5161 | if opts.get('rev'): | |
5162 | rev_ = opts['rev'] |
|
5162 | rev_ = opts['rev'] | |
5163 | message = opts.get('message') |
|
5163 | message = opts.get('message') | |
5164 | if opts.get('remove'): |
|
5164 | if opts.get('remove'): | |
5165 | if opts.get('local'): |
|
5165 | if opts.get('local'): | |
5166 | expectedtype = 'local' |
|
5166 | expectedtype = 'local' | |
5167 | else: |
|
5167 | else: | |
5168 | expectedtype = 'global' |
|
5168 | expectedtype = 'global' | |
5169 |
|
5169 | |||
5170 | for n in names: |
|
5170 | for n in names: | |
5171 | if not repo.tagtype(n): |
|
5171 | if not repo.tagtype(n): | |
5172 | raise error.Abort(_("tag '%s' does not exist") % n) |
|
5172 | raise error.Abort(_("tag '%s' does not exist") % n) | |
5173 | if repo.tagtype(n) != expectedtype: |
|
5173 | if repo.tagtype(n) != expectedtype: | |
5174 | if expectedtype == 'global': |
|
5174 | if expectedtype == 'global': | |
5175 | raise error.Abort(_("tag '%s' is not a global tag") % n) |
|
5175 | raise error.Abort(_("tag '%s' is not a global tag") % n) | |
5176 | else: |
|
5176 | else: | |
5177 | raise error.Abort(_("tag '%s' is not a local tag") % n) |
|
5177 | raise error.Abort(_("tag '%s' is not a local tag") % n) | |
5178 | rev_ = 'null' |
|
5178 | rev_ = 'null' | |
5179 | if not message: |
|
5179 | if not message: | |
5180 | # we don't translate commit messages |
|
5180 | # we don't translate commit messages | |
5181 | message = 'Removed tag %s' % ', '.join(names) |
|
5181 | message = 'Removed tag %s' % ', '.join(names) | |
5182 | elif not opts.get('force'): |
|
5182 | elif not opts.get('force'): | |
5183 | for n in names: |
|
5183 | for n in names: | |
5184 | if n in repo.tags(): |
|
5184 | if n in repo.tags(): | |
5185 | raise error.Abort(_("tag '%s' already exists " |
|
5185 | raise error.Abort(_("tag '%s' already exists " | |
5186 | "(use -f to force)") % n) |
|
5186 | "(use -f to force)") % n) | |
5187 | if not opts.get('local'): |
|
5187 | if not opts.get('local'): | |
5188 | p1, p2 = repo.dirstate.parents() |
|
5188 | p1, p2 = repo.dirstate.parents() | |
5189 | if p2 != nullid: |
|
5189 | if p2 != nullid: | |
5190 | raise error.Abort(_('uncommitted merge')) |
|
5190 | raise error.Abort(_('uncommitted merge')) | |
5191 | bheads = repo.branchheads() |
|
5191 | bheads = repo.branchheads() | |
5192 | if not opts.get('force') and bheads and p1 not in bheads: |
|
5192 | if not opts.get('force') and bheads and p1 not in bheads: | |
5193 | raise error.Abort(_('working directory is not at a branch head ' |
|
5193 | raise error.Abort(_('working directory is not at a branch head ' | |
5194 | '(use -f to force)')) |
|
5194 | '(use -f to force)')) | |
5195 | r = scmutil.revsingle(repo, rev_).node() |
|
5195 | r = scmutil.revsingle(repo, rev_).node() | |
5196 |
|
5196 | |||
5197 | if not message: |
|
5197 | if not message: | |
5198 | # we don't translate commit messages |
|
5198 | # we don't translate commit messages | |
5199 | message = ('Added tag %s for changeset %s' % |
|
5199 | message = ('Added tag %s for changeset %s' % | |
5200 | (', '.join(names), short(r))) |
|
5200 | (', '.join(names), short(r))) | |
5201 |
|
5201 | |||
5202 | date = opts.get('date') |
|
5202 | date = opts.get('date') | |
5203 | if date: |
|
5203 | if date: | |
5204 | date = util.parsedate(date) |
|
5204 | date = util.parsedate(date) | |
5205 |
|
5205 | |||
5206 | if opts.get('remove'): |
|
5206 | if opts.get('remove'): | |
5207 | editform = 'tag.remove' |
|
5207 | editform = 'tag.remove' | |
5208 | else: |
|
5208 | else: | |
5209 | editform = 'tag.add' |
|
5209 | editform = 'tag.add' | |
5210 | editor = cmdutil.getcommiteditor(editform=editform, |
|
5210 | editor = cmdutil.getcommiteditor(editform=editform, | |
5211 | **pycompat.strkwargs(opts)) |
|
5211 | **pycompat.strkwargs(opts)) | |
5212 |
|
5212 | |||
5213 | # don't allow tagging the null rev |
|
5213 | # don't allow tagging the null rev | |
5214 | if (not opts.get('remove') and |
|
5214 | if (not opts.get('remove') and | |
5215 | scmutil.revsingle(repo, rev_).rev() == nullrev): |
|
5215 | scmutil.revsingle(repo, rev_).rev() == nullrev): | |
5216 | raise error.Abort(_("cannot tag null revision")) |
|
5216 | raise error.Abort(_("cannot tag null revision")) | |
5217 |
|
5217 | |||
5218 | tagsmod.tag(repo, names, r, message, opts.get('local'), |
|
5218 | tagsmod.tag(repo, names, r, message, opts.get('local'), | |
5219 | opts.get('user'), date, editor=editor) |
|
5219 | opts.get('user'), date, editor=editor) | |
5220 | finally: |
|
5220 | finally: | |
5221 | release(lock, wlock) |
|
5221 | release(lock, wlock) | |
5222 |
|
5222 | |||
5223 | @command('tags', formatteropts, '') |
|
5223 | @command('tags', formatteropts, '') | |
5224 | def tags(ui, repo, **opts): |
|
5224 | def tags(ui, repo, **opts): | |
5225 | """list repository tags |
|
5225 | """list repository tags | |
5226 |
|
5226 | |||
5227 | This lists both regular and local tags. When the -v/--verbose |
|
5227 | This lists both regular and local tags. When the -v/--verbose | |
5228 | switch is used, a third column "local" is printed for local tags. |
|
5228 | switch is used, a third column "local" is printed for local tags. | |
5229 | When the -q/--quiet switch is used, only the tag name is printed. |
|
5229 | When the -q/--quiet switch is used, only the tag name is printed. | |
5230 |
|
5230 | |||
5231 | Returns 0 on success. |
|
5231 | Returns 0 on success. | |
5232 | """ |
|
5232 | """ | |
5233 |
|
5233 | |||
5234 | opts = pycompat.byteskwargs(opts) |
|
5234 | opts = pycompat.byteskwargs(opts) | |
5235 | ui.pager('tags') |
|
5235 | ui.pager('tags') | |
5236 | fm = ui.formatter('tags', opts) |
|
5236 | fm = ui.formatter('tags', opts) | |
5237 | hexfunc = fm.hexfunc |
|
5237 | hexfunc = fm.hexfunc | |
5238 | tagtype = "" |
|
5238 | tagtype = "" | |
5239 |
|
5239 | |||
5240 | for t, n in reversed(repo.tagslist()): |
|
5240 | for t, n in reversed(repo.tagslist()): | |
5241 | hn = hexfunc(n) |
|
5241 | hn = hexfunc(n) | |
5242 | label = 'tags.normal' |
|
5242 | label = 'tags.normal' | |
5243 | tagtype = '' |
|
5243 | tagtype = '' | |
5244 | if repo.tagtype(t) == 'local': |
|
5244 | if repo.tagtype(t) == 'local': | |
5245 | label = 'tags.local' |
|
5245 | label = 'tags.local' | |
5246 | tagtype = 'local' |
|
5246 | tagtype = 'local' | |
5247 |
|
5247 | |||
5248 | fm.startitem() |
|
5248 | fm.startitem() | |
5249 | fm.write('tag', '%s', t, label=label) |
|
5249 | fm.write('tag', '%s', t, label=label) | |
5250 | fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s' |
|
5250 | fmt = " " * (30 - encoding.colwidth(t)) + ' %5d:%s' | |
5251 | fm.condwrite(not ui.quiet, 'rev node', fmt, |
|
5251 | fm.condwrite(not ui.quiet, 'rev node', fmt, | |
5252 | repo.changelog.rev(n), hn, label=label) |
|
5252 | repo.changelog.rev(n), hn, label=label) | |
5253 | fm.condwrite(ui.verbose and tagtype, 'type', ' %s', |
|
5253 | fm.condwrite(ui.verbose and tagtype, 'type', ' %s', | |
5254 | tagtype, label=label) |
|
5254 | tagtype, label=label) | |
5255 | fm.plain('\n') |
|
5255 | fm.plain('\n') | |
5256 | fm.end() |
|
5256 | fm.end() | |
5257 |
|
5257 | |||
5258 | @command('tip', |
|
5258 | @command('tip', | |
5259 | [('p', 'patch', None, _('show patch')), |
|
5259 | [('p', 'patch', None, _('show patch')), | |
5260 | ('g', 'git', None, _('use git extended diff format')), |
|
5260 | ('g', 'git', None, _('use git extended diff format')), | |
5261 | ] + templateopts, |
|
5261 | ] + templateopts, | |
5262 | _('[-p] [-g]')) |
|
5262 | _('[-p] [-g]')) | |
5263 | def tip(ui, repo, **opts): |
|
5263 | def tip(ui, repo, **opts): | |
5264 | """show the tip revision (DEPRECATED) |
|
5264 | """show the tip revision (DEPRECATED) | |
5265 |
|
5265 | |||
5266 | The tip revision (usually just called the tip) is the changeset |
|
5266 | The tip revision (usually just called the tip) is the changeset | |
5267 | most recently added to the repository (and therefore the most |
|
5267 | most recently added to the repository (and therefore the most | |
5268 | recently changed head). |
|
5268 | recently changed head). | |
5269 |
|
5269 | |||
5270 | If you have just made a commit, that commit will be the tip. If |
|
5270 | If you have just made a commit, that commit will be the tip. If | |
5271 | you have just pulled changes from another repository, the tip of |
|
5271 | you have just pulled changes from another repository, the tip of | |
5272 | that repository becomes the current tip. The "tip" tag is special |
|
5272 | that repository becomes the current tip. The "tip" tag is special | |
5273 | and cannot be renamed or assigned to a different changeset. |
|
5273 | and cannot be renamed or assigned to a different changeset. | |
5274 |
|
5274 | |||
5275 | This command is deprecated, please use :hg:`heads` instead. |
|
5275 | This command is deprecated, please use :hg:`heads` instead. | |
5276 |
|
5276 | |||
5277 | Returns 0 on success. |
|
5277 | Returns 0 on success. | |
5278 | """ |
|
5278 | """ | |
5279 | opts = pycompat.byteskwargs(opts) |
|
5279 | opts = pycompat.byteskwargs(opts) | |
5280 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
5280 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
5281 | displayer.show(repo['tip']) |
|
5281 | displayer.show(repo['tip']) | |
5282 | displayer.close() |
|
5282 | displayer.close() | |
5283 |
|
5283 | |||
5284 | @command('unbundle', |
|
5284 | @command('unbundle', | |
5285 | [('u', 'update', None, |
|
5285 | [('u', 'update', None, | |
5286 | _('update to new branch head if changesets were unbundled'))], |
|
5286 | _('update to new branch head if changesets were unbundled'))], | |
5287 | _('[-u] FILE...')) |
|
5287 | _('[-u] FILE...')) | |
5288 | def unbundle(ui, repo, fname1, *fnames, **opts): |
|
5288 | def unbundle(ui, repo, fname1, *fnames, **opts): | |
5289 | """apply one or more bundle files |
|
5289 | """apply one or more bundle files | |
5290 |
|
5290 | |||
5291 | Apply one or more bundle files generated by :hg:`bundle`. |
|
5291 | Apply one or more bundle files generated by :hg:`bundle`. | |
5292 |
|
5292 | |||
5293 | Returns 0 on success, 1 if an update has unresolved files. |
|
5293 | Returns 0 on success, 1 if an update has unresolved files. | |
5294 | """ |
|
5294 | """ | |
5295 | fnames = (fname1,) + fnames |
|
5295 | fnames = (fname1,) + fnames | |
5296 |
|
5296 | |||
5297 | with repo.lock(): |
|
5297 | with repo.lock(): | |
5298 | for fname in fnames: |
|
5298 | for fname in fnames: | |
5299 | f = hg.openpath(ui, fname) |
|
5299 | f = hg.openpath(ui, fname) | |
5300 | gen = exchange.readbundle(ui, f, fname) |
|
5300 | gen = exchange.readbundle(ui, f, fname) | |
5301 | if isinstance(gen, streamclone.streamcloneapplier): |
|
5301 | if isinstance(gen, streamclone.streamcloneapplier): | |
5302 | raise error.Abort( |
|
5302 | raise error.Abort( | |
5303 | _('packed bundles cannot be applied with ' |
|
5303 | _('packed bundles cannot be applied with ' | |
5304 | '"hg unbundle"'), |
|
5304 | '"hg unbundle"'), | |
5305 | hint=_('use "hg debugapplystreamclonebundle"')) |
|
5305 | hint=_('use "hg debugapplystreamclonebundle"')) | |
5306 | url = 'bundle:' + fname |
|
5306 | url = 'bundle:' + fname | |
5307 | try: |
|
5307 | try: | |
5308 | txnname = 'unbundle' |
|
5308 | txnname = 'unbundle' | |
5309 | if not isinstance(gen, bundle2.unbundle20): |
|
5309 | if not isinstance(gen, bundle2.unbundle20): | |
5310 | txnname = 'unbundle\n%s' % util.hidepassword(url) |
|
5310 | txnname = 'unbundle\n%s' % util.hidepassword(url) | |
5311 | with repo.transaction(txnname) as tr: |
|
5311 | with repo.transaction(txnname) as tr: | |
5312 | op = bundle2.applybundle(repo, gen, tr, source='unbundle', |
|
5312 | op = bundle2.applybundle(repo, gen, tr, source='unbundle', | |
5313 | url=url) |
|
5313 | url=url) | |
5314 | except error.BundleUnknownFeatureError as exc: |
|
5314 | except error.BundleUnknownFeatureError as exc: | |
5315 | raise error.Abort( |
|
5315 | raise error.Abort( | |
5316 | _('%s: unknown bundle feature, %s') % (fname, exc), |
|
5316 | _('%s: unknown bundle feature, %s') % (fname, exc), | |
5317 | hint=_("see https://mercurial-scm.org/" |
|
5317 | hint=_("see https://mercurial-scm.org/" | |
5318 | "wiki/BundleFeature for more " |
|
5318 | "wiki/BundleFeature for more " | |
5319 | "information")) |
|
5319 | "information")) | |
5320 | modheads = bundle2.combinechangegroupresults(op) |
|
5320 | modheads = bundle2.combinechangegroupresults(op) | |
5321 |
|
5321 | |||
5322 | return postincoming(ui, repo, modheads, opts.get(r'update'), None, None) |
|
5322 | return postincoming(ui, repo, modheads, opts.get(r'update'), None, None) | |
5323 |
|
5323 | |||
5324 | @command('^update|up|checkout|co', |
|
5324 | @command('^update|up|checkout|co', | |
5325 | [('C', 'clean', None, _('discard uncommitted changes (no backup)')), |
|
5325 | [('C', 'clean', None, _('discard uncommitted changes (no backup)')), | |
5326 | ('c', 'check', None, _('require clean working directory')), |
|
5326 | ('c', 'check', None, _('require clean working directory')), | |
5327 | ('m', 'merge', None, _('merge uncommitted changes')), |
|
5327 | ('m', 'merge', None, _('merge uncommitted changes')), | |
5328 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), |
|
5328 | ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), | |
5329 | ('r', 'rev', '', _('revision'), _('REV')) |
|
5329 | ('r', 'rev', '', _('revision'), _('REV')) | |
5330 | ] + mergetoolopts, |
|
5330 | ] + mergetoolopts, | |
5331 | _('[-C|-c|-m] [-d DATE] [[-r] REV]')) |
|
5331 | _('[-C|-c|-m] [-d DATE] [[-r] REV]')) | |
5332 | def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False, |
|
5332 | def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False, | |
5333 | merge=None, tool=None): |
|
5333 | merge=None, tool=None): | |
5334 | """update working directory (or switch revisions) |
|
5334 | """update working directory (or switch revisions) | |
5335 |
|
5335 | |||
5336 | Update the repository's working directory to the specified |
|
5336 | Update the repository's working directory to the specified | |
5337 | changeset. If no changeset is specified, update to the tip of the |
|
5337 | changeset. If no changeset is specified, update to the tip of the | |
5338 | current named branch and move the active bookmark (see :hg:`help |
|
5338 | current named branch and move the active bookmark (see :hg:`help | |
5339 | bookmarks`). |
|
5339 | bookmarks`). | |
5340 |
|
5340 | |||
5341 | Update sets the working directory's parent revision to the specified |
|
5341 | Update sets the working directory's parent revision to the specified | |
5342 | changeset (see :hg:`help parents`). |
|
5342 | changeset (see :hg:`help parents`). | |
5343 |
|
5343 | |||
5344 | If the changeset is not a descendant or ancestor of the working |
|
5344 | If the changeset is not a descendant or ancestor of the working | |
5345 | directory's parent and there are uncommitted changes, the update is |
|
5345 | directory's parent and there are uncommitted changes, the update is | |
5346 | aborted. With the -c/--check option, the working directory is checked |
|
5346 | aborted. With the -c/--check option, the working directory is checked | |
5347 | for uncommitted changes; if none are found, the working directory is |
|
5347 | for uncommitted changes; if none are found, the working directory is | |
5348 | updated to the specified changeset. |
|
5348 | updated to the specified changeset. | |
5349 |
|
5349 | |||
5350 | .. container:: verbose |
|
5350 | .. container:: verbose | |
5351 |
|
5351 | |||
5352 | The -C/--clean, -c/--check, and -m/--merge options control what |
|
5352 | The -C/--clean, -c/--check, and -m/--merge options control what | |
5353 | happens if the working directory contains uncommitted changes. |
|
5353 | happens if the working directory contains uncommitted changes. | |
5354 | At most of one of them can be specified. |
|
5354 | At most of one of them can be specified. | |
5355 |
|
5355 | |||
5356 | 1. If no option is specified, and if |
|
5356 | 1. If no option is specified, and if | |
5357 | the requested changeset is an ancestor or descendant of |
|
5357 | the requested changeset is an ancestor or descendant of | |
5358 | the working directory's parent, the uncommitted changes |
|
5358 | the working directory's parent, the uncommitted changes | |
5359 | are merged into the requested changeset and the merged |
|
5359 | are merged into the requested changeset and the merged | |
5360 | result is left uncommitted. If the requested changeset is |
|
5360 | result is left uncommitted. If the requested changeset is | |
5361 | not an ancestor or descendant (that is, it is on another |
|
5361 | not an ancestor or descendant (that is, it is on another | |
5362 | branch), the update is aborted and the uncommitted changes |
|
5362 | branch), the update is aborted and the uncommitted changes | |
5363 | are preserved. |
|
5363 | are preserved. | |
5364 |
|
5364 | |||
5365 | 2. With the -m/--merge option, the update is allowed even if the |
|
5365 | 2. With the -m/--merge option, the update is allowed even if the | |
5366 | requested changeset is not an ancestor or descendant of |
|
5366 | requested changeset is not an ancestor or descendant of | |
5367 | the working directory's parent. |
|
5367 | the working directory's parent. | |
5368 |
|
5368 | |||
5369 | 3. With the -c/--check option, the update is aborted and the |
|
5369 | 3. With the -c/--check option, the update is aborted and the | |
5370 | uncommitted changes are preserved. |
|
5370 | uncommitted changes are preserved. | |
5371 |
|
5371 | |||
5372 | 4. With the -C/--clean option, uncommitted changes are discarded and |
|
5372 | 4. With the -C/--clean option, uncommitted changes are discarded and | |
5373 | the working directory is updated to the requested changeset. |
|
5373 | the working directory is updated to the requested changeset. | |
5374 |
|
5374 | |||
5375 | To cancel an uncommitted merge (and lose your changes), use |
|
5375 | To cancel an uncommitted merge (and lose your changes), use | |
5376 | :hg:`update --clean .`. |
|
5376 | :hg:`update --clean .`. | |
5377 |
|
5377 | |||
5378 | Use null as the changeset to remove the working directory (like |
|
5378 | Use null as the changeset to remove the working directory (like | |
5379 | :hg:`clone -U`). |
|
5379 | :hg:`clone -U`). | |
5380 |
|
5380 | |||
5381 | If you want to revert just one file to an older revision, use |
|
5381 | If you want to revert just one file to an older revision, use | |
5382 | :hg:`revert [-r REV] NAME`. |
|
5382 | :hg:`revert [-r REV] NAME`. | |
5383 |
|
5383 | |||
5384 | See :hg:`help dates` for a list of formats valid for -d/--date. |
|
5384 | See :hg:`help dates` for a list of formats valid for -d/--date. | |
5385 |
|
5385 | |||
5386 | Returns 0 on success, 1 if there are unresolved files. |
|
5386 | Returns 0 on success, 1 if there are unresolved files. | |
5387 | """ |
|
5387 | """ | |
5388 | if rev and node: |
|
5388 | if rev and node: | |
5389 | raise error.Abort(_("please specify just one revision")) |
|
5389 | raise error.Abort(_("please specify just one revision")) | |
5390 |
|
5390 | |||
5391 | if ui.configbool('commands', 'update.requiredest'): |
|
5391 | if ui.configbool('commands', 'update.requiredest'): | |
5392 | if not node and not rev and not date: |
|
5392 | if not node and not rev and not date: | |
5393 | raise error.Abort(_('you must specify a destination'), |
|
5393 | raise error.Abort(_('you must specify a destination'), | |
5394 | hint=_('for example: hg update ".::"')) |
|
5394 | hint=_('for example: hg update ".::"')) | |
5395 |
|
5395 | |||
5396 | if rev is None or rev == '': |
|
5396 | if rev is None or rev == '': | |
5397 | rev = node |
|
5397 | rev = node | |
5398 |
|
5398 | |||
5399 | if date and rev is not None: |
|
5399 | if date and rev is not None: | |
5400 | raise error.Abort(_("you can't specify a revision and a date")) |
|
5400 | raise error.Abort(_("you can't specify a revision and a date")) | |
5401 |
|
5401 | |||
5402 | if len([x for x in (clean, check, merge) if x]) > 1: |
|
5402 | if len([x for x in (clean, check, merge) if x]) > 1: | |
5403 | raise error.Abort(_("can only specify one of -C/--clean, -c/--check, " |
|
5403 | raise error.Abort(_("can only specify one of -C/--clean, -c/--check, " | |
5404 | "or -m/merge")) |
|
5404 | "or -m/merge")) | |
5405 |
|
5405 | |||
5406 | updatecheck = None |
|
5406 | updatecheck = None | |
5407 | if check: |
|
5407 | if check: | |
5408 | updatecheck = 'abort' |
|
5408 | updatecheck = 'abort' | |
5409 | elif merge: |
|
5409 | elif merge: | |
5410 | updatecheck = 'none' |
|
5410 | updatecheck = 'none' | |
5411 |
|
5411 | |||
5412 | with repo.wlock(): |
|
5412 | with repo.wlock(): | |
5413 | cmdutil.clearunfinished(repo) |
|
5413 | cmdutil.clearunfinished(repo) | |
5414 |
|
5414 | |||
5415 | if date: |
|
5415 | if date: | |
5416 | rev = cmdutil.finddate(ui, repo, date) |
|
5416 | rev = cmdutil.finddate(ui, repo, date) | |
5417 |
|
5417 | |||
5418 | # if we defined a bookmark, we have to remember the original name |
|
5418 | # if we defined a bookmark, we have to remember the original name | |
5419 | brev = rev |
|
5419 | brev = rev | |
5420 | rev = scmutil.revsingle(repo, rev, rev).rev() |
|
5420 | rev = scmutil.revsingle(repo, rev, rev).rev() | |
5421 |
|
5421 | |||
5422 | repo.ui.setconfig('ui', 'forcemerge', tool, 'update') |
|
5422 | repo.ui.setconfig('ui', 'forcemerge', tool, 'update') | |
5423 |
|
5423 | |||
5424 | return hg.updatetotally(ui, repo, rev, brev, clean=clean, |
|
5424 | return hg.updatetotally(ui, repo, rev, brev, clean=clean, | |
5425 | updatecheck=updatecheck) |
|
5425 | updatecheck=updatecheck) | |
5426 |
|
5426 | |||
5427 | @command('verify', []) |
|
5427 | @command('verify', []) | |
5428 | def verify(ui, repo): |
|
5428 | def verify(ui, repo): | |
5429 | """verify the integrity of the repository |
|
5429 | """verify the integrity of the repository | |
5430 |
|
5430 | |||
5431 | Verify the integrity of the current repository. |
|
5431 | Verify the integrity of the current repository. | |
5432 |
|
5432 | |||
5433 | This will perform an extensive check of the repository's |
|
5433 | This will perform an extensive check of the repository's | |
5434 | integrity, validating the hashes and checksums of each entry in |
|
5434 | integrity, validating the hashes and checksums of each entry in | |
5435 | the changelog, manifest, and tracked files, as well as the |
|
5435 | the changelog, manifest, and tracked files, as well as the | |
5436 | integrity of their crosslinks and indices. |
|
5436 | integrity of their crosslinks and indices. | |
5437 |
|
5437 | |||
5438 | Please see https://mercurial-scm.org/wiki/RepositoryCorruption |
|
5438 | Please see https://mercurial-scm.org/wiki/RepositoryCorruption | |
5439 | for more information about recovery from corruption of the |
|
5439 | for more information about recovery from corruption of the | |
5440 | repository. |
|
5440 | repository. | |
5441 |
|
5441 | |||
5442 | Returns 0 on success, 1 if errors are encountered. |
|
5442 | Returns 0 on success, 1 if errors are encountered. | |
5443 | """ |
|
5443 | """ | |
5444 | return hg.verify(repo) |
|
5444 | return hg.verify(repo) | |
5445 |
|
5445 | |||
5446 | @command('version', [] + formatteropts, norepo=True) |
|
5446 | @command('version', [] + formatteropts, norepo=True) | |
5447 | def version_(ui, **opts): |
|
5447 | def version_(ui, **opts): | |
5448 | """output version and copyright information""" |
|
5448 | """output version and copyright information""" | |
5449 | opts = pycompat.byteskwargs(opts) |
|
5449 | opts = pycompat.byteskwargs(opts) | |
5450 | if ui.verbose: |
|
5450 | if ui.verbose: | |
5451 | ui.pager('version') |
|
5451 | ui.pager('version') | |
5452 | fm = ui.formatter("version", opts) |
|
5452 | fm = ui.formatter("version", opts) | |
5453 | fm.startitem() |
|
5453 | fm.startitem() | |
5454 | fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"), |
|
5454 | fm.write("ver", _("Mercurial Distributed SCM (version %s)\n"), | |
5455 | util.version()) |
|
5455 | util.version()) | |
5456 | license = _( |
|
5456 | license = _( | |
5457 | "(see https://mercurial-scm.org for more information)\n" |
|
5457 | "(see https://mercurial-scm.org for more information)\n" | |
5458 | "\nCopyright (C) 2005-2017 Matt Mackall and others\n" |
|
5458 | "\nCopyright (C) 2005-2017 Matt Mackall and others\n" | |
5459 | "This is free software; see the source for copying conditions. " |
|
5459 | "This is free software; see the source for copying conditions. " | |
5460 | "There is NO\nwarranty; " |
|
5460 | "There is NO\nwarranty; " | |
5461 | "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" |
|
5461 | "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" | |
5462 | ) |
|
5462 | ) | |
5463 | if not ui.quiet: |
|
5463 | if not ui.quiet: | |
5464 | fm.plain(license) |
|
5464 | fm.plain(license) | |
5465 |
|
5465 | |||
5466 | if ui.verbose: |
|
5466 | if ui.verbose: | |
5467 | fm.plain(_("\nEnabled extensions:\n\n")) |
|
5467 | fm.plain(_("\nEnabled extensions:\n\n")) | |
5468 | # format names and versions into columns |
|
5468 | # format names and versions into columns | |
5469 | names = [] |
|
5469 | names = [] | |
5470 | vers = [] |
|
5470 | vers = [] | |
5471 | isinternals = [] |
|
5471 | isinternals = [] | |
5472 | for name, module in extensions.extensions(): |
|
5472 | for name, module in extensions.extensions(): | |
5473 | names.append(name) |
|
5473 | names.append(name) | |
5474 | vers.append(extensions.moduleversion(module) or None) |
|
5474 | vers.append(extensions.moduleversion(module) or None) | |
5475 | isinternals.append(extensions.ismoduleinternal(module)) |
|
5475 | isinternals.append(extensions.ismoduleinternal(module)) | |
5476 | fn = fm.nested("extensions") |
|
5476 | fn = fm.nested("extensions") | |
5477 | if names: |
|
5477 | if names: | |
5478 | namefmt = " %%-%ds " % max(len(n) for n in names) |
|
5478 | namefmt = " %%-%ds " % max(len(n) for n in names) | |
5479 | places = [_("external"), _("internal")] |
|
5479 | places = [_("external"), _("internal")] | |
5480 | for n, v, p in zip(names, vers, isinternals): |
|
5480 | for n, v, p in zip(names, vers, isinternals): | |
5481 | fn.startitem() |
|
5481 | fn.startitem() | |
5482 | fn.condwrite(ui.verbose, "name", namefmt, n) |
|
5482 | fn.condwrite(ui.verbose, "name", namefmt, n) | |
5483 | if ui.verbose: |
|
5483 | if ui.verbose: | |
5484 | fn.plain("%s " % places[p]) |
|
5484 | fn.plain("%s " % places[p]) | |
5485 | fn.data(bundled=p) |
|
5485 | fn.data(bundled=p) | |
5486 | fn.condwrite(ui.verbose and v, "ver", "%s", v) |
|
5486 | fn.condwrite(ui.verbose and v, "ver", "%s", v) | |
5487 | if ui.verbose: |
|
5487 | if ui.verbose: | |
5488 | fn.plain("\n") |
|
5488 | fn.plain("\n") | |
5489 | fn.end() |
|
5489 | fn.end() | |
5490 | fm.end() |
|
5490 | fm.end() | |
5491 |
|
5491 | |||
5492 | def loadcmdtable(ui, name, cmdtable): |
|
5492 | def loadcmdtable(ui, name, cmdtable): | |
5493 | """Load command functions from specified cmdtable |
|
5493 | """Load command functions from specified cmdtable | |
5494 | """ |
|
5494 | """ | |
5495 | overrides = [cmd for cmd in cmdtable if cmd in table] |
|
5495 | overrides = [cmd for cmd in cmdtable if cmd in table] | |
5496 | if overrides: |
|
5496 | if overrides: | |
5497 | ui.warn(_("extension '%s' overrides commands: %s\n") |
|
5497 | ui.warn(_("extension '%s' overrides commands: %s\n") | |
5498 | % (name, " ".join(overrides))) |
|
5498 | % (name, " ".join(overrides))) | |
5499 | table.update(cmdtable) |
|
5499 | table.update(cmdtable) |
@@ -1,2131 +1,2139 b'' | |||||
1 | # revset.py - revision set queries for mercurial |
|
1 | # revset.py - revision set queries for mercurial | |
2 | # |
|
2 | # | |
3 | # Copyright 2010 Matt Mackall <mpm@selenic.com> |
|
3 | # Copyright 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 re |
|
10 | import re | |
11 |
|
11 | |||
12 | from .i18n import _ |
|
12 | from .i18n import _ | |
13 | from . import ( |
|
13 | from . import ( | |
14 | dagop, |
|
14 | dagop, | |
15 | destutil, |
|
15 | destutil, | |
16 | encoding, |
|
16 | encoding, | |
17 | error, |
|
17 | error, | |
18 | hbisect, |
|
18 | hbisect, | |
19 | match as matchmod, |
|
19 | match as matchmod, | |
20 | node, |
|
20 | node, | |
21 | obsolete as obsmod, |
|
21 | obsolete as obsmod, | |
22 | obsutil, |
|
22 | obsutil, | |
23 | pathutil, |
|
23 | pathutil, | |
24 | phases, |
|
24 | phases, | |
25 | registrar, |
|
25 | registrar, | |
26 | repoview, |
|
26 | repoview, | |
27 | revsetlang, |
|
27 | revsetlang, | |
28 | scmutil, |
|
28 | scmutil, | |
29 | smartset, |
|
29 | smartset, | |
30 | util, |
|
30 | util, | |
31 | ) |
|
31 | ) | |
32 |
|
32 | |||
33 | # helpers for processing parsed tree |
|
33 | # helpers for processing parsed tree | |
34 | getsymbol = revsetlang.getsymbol |
|
34 | getsymbol = revsetlang.getsymbol | |
35 | getstring = revsetlang.getstring |
|
35 | getstring = revsetlang.getstring | |
36 | getinteger = revsetlang.getinteger |
|
36 | getinteger = revsetlang.getinteger | |
37 | getboolean = revsetlang.getboolean |
|
37 | getboolean = revsetlang.getboolean | |
38 | getlist = revsetlang.getlist |
|
38 | getlist = revsetlang.getlist | |
39 | getrange = revsetlang.getrange |
|
39 | getrange = revsetlang.getrange | |
40 | getargs = revsetlang.getargs |
|
40 | getargs = revsetlang.getargs | |
41 | getargsdict = revsetlang.getargsdict |
|
41 | getargsdict = revsetlang.getargsdict | |
42 |
|
42 | |||
43 | # constants used as an argument of match() and matchany() |
|
43 | # constants used as an argument of match() and matchany() | |
44 | anyorder = revsetlang.anyorder |
|
44 | anyorder = revsetlang.anyorder | |
45 | defineorder = revsetlang.defineorder |
|
45 | defineorder = revsetlang.defineorder | |
46 | followorder = revsetlang.followorder |
|
46 | followorder = revsetlang.followorder | |
47 |
|
47 | |||
48 | baseset = smartset.baseset |
|
48 | baseset = smartset.baseset | |
49 | generatorset = smartset.generatorset |
|
49 | generatorset = smartset.generatorset | |
50 | spanset = smartset.spanset |
|
50 | spanset = smartset.spanset | |
51 | fullreposet = smartset.fullreposet |
|
51 | fullreposet = smartset.fullreposet | |
52 |
|
52 | |||
53 | # helpers |
|
53 | # helpers | |
54 |
|
54 | |||
55 | def getset(repo, subset, x): |
|
55 | def getset(repo, subset, x): | |
56 | if not x: |
|
56 | if not x: | |
57 | raise error.ParseError(_("missing argument")) |
|
57 | raise error.ParseError(_("missing argument")) | |
58 | return methods[x[0]](repo, subset, *x[1:]) |
|
58 | return methods[x[0]](repo, subset, *x[1:]) | |
59 |
|
59 | |||
60 | def _getrevsource(repo, r): |
|
60 | def _getrevsource(repo, r): | |
61 | extra = repo[r].extra() |
|
61 | extra = repo[r].extra() | |
62 | for label in ('source', 'transplant_source', 'rebase_source'): |
|
62 | for label in ('source', 'transplant_source', 'rebase_source'): | |
63 | if label in extra: |
|
63 | if label in extra: | |
64 | try: |
|
64 | try: | |
65 | return repo[extra[label]].rev() |
|
65 | return repo[extra[label]].rev() | |
66 | except error.RepoLookupError: |
|
66 | except error.RepoLookupError: | |
67 | pass |
|
67 | pass | |
68 | return None |
|
68 | return None | |
69 |
|
69 | |||
70 | # operator methods |
|
70 | # operator methods | |
71 |
|
71 | |||
72 | def stringset(repo, subset, x): |
|
72 | def stringset(repo, subset, x): | |
73 | x = scmutil.intrev(repo[x]) |
|
73 | x = scmutil.intrev(repo[x]) | |
74 | if (x in subset |
|
74 | if (x in subset | |
75 | or x == node.nullrev and isinstance(subset, fullreposet)): |
|
75 | or x == node.nullrev and isinstance(subset, fullreposet)): | |
76 | return baseset([x]) |
|
76 | return baseset([x]) | |
77 | return baseset() |
|
77 | return baseset() | |
78 |
|
78 | |||
79 | def rangeset(repo, subset, x, y, order): |
|
79 | def rangeset(repo, subset, x, y, order): | |
80 | m = getset(repo, fullreposet(repo), x) |
|
80 | m = getset(repo, fullreposet(repo), x) | |
81 | n = getset(repo, fullreposet(repo), y) |
|
81 | n = getset(repo, fullreposet(repo), y) | |
82 |
|
82 | |||
83 | if not m or not n: |
|
83 | if not m or not n: | |
84 | return baseset() |
|
84 | return baseset() | |
85 | return _makerangeset(repo, subset, m.first(), n.last(), order) |
|
85 | return _makerangeset(repo, subset, m.first(), n.last(), order) | |
86 |
|
86 | |||
87 | def rangeall(repo, subset, x, order): |
|
87 | def rangeall(repo, subset, x, order): | |
88 | assert x is None |
|
88 | assert x is None | |
89 | return _makerangeset(repo, subset, 0, len(repo) - 1, order) |
|
89 | return _makerangeset(repo, subset, 0, len(repo) - 1, order) | |
90 |
|
90 | |||
91 | def rangepre(repo, subset, y, order): |
|
91 | def rangepre(repo, subset, y, order): | |
92 | # ':y' can't be rewritten to '0:y' since '0' may be hidden |
|
92 | # ':y' can't be rewritten to '0:y' since '0' may be hidden | |
93 | n = getset(repo, fullreposet(repo), y) |
|
93 | n = getset(repo, fullreposet(repo), y) | |
94 | if not n: |
|
94 | if not n: | |
95 | return baseset() |
|
95 | return baseset() | |
96 | return _makerangeset(repo, subset, 0, n.last(), order) |
|
96 | return _makerangeset(repo, subset, 0, n.last(), order) | |
97 |
|
97 | |||
98 | def rangepost(repo, subset, x, order): |
|
98 | def rangepost(repo, subset, x, order): | |
99 | m = getset(repo, fullreposet(repo), x) |
|
99 | m = getset(repo, fullreposet(repo), x) | |
100 | if not m: |
|
100 | if not m: | |
101 | return baseset() |
|
101 | return baseset() | |
102 | return _makerangeset(repo, subset, m.first(), len(repo) - 1, order) |
|
102 | return _makerangeset(repo, subset, m.first(), len(repo) - 1, order) | |
103 |
|
103 | |||
104 | def _makerangeset(repo, subset, m, n, order): |
|
104 | def _makerangeset(repo, subset, m, n, order): | |
105 | if m == n: |
|
105 | if m == n: | |
106 | r = baseset([m]) |
|
106 | r = baseset([m]) | |
107 | elif n == node.wdirrev: |
|
107 | elif n == node.wdirrev: | |
108 | r = spanset(repo, m, len(repo)) + baseset([n]) |
|
108 | r = spanset(repo, m, len(repo)) + baseset([n]) | |
109 | elif m == node.wdirrev: |
|
109 | elif m == node.wdirrev: | |
110 | r = baseset([m]) + spanset(repo, len(repo) - 1, n - 1) |
|
110 | r = baseset([m]) + spanset(repo, len(repo) - 1, n - 1) | |
111 | elif m < n: |
|
111 | elif m < n: | |
112 | r = spanset(repo, m, n + 1) |
|
112 | r = spanset(repo, m, n + 1) | |
113 | else: |
|
113 | else: | |
114 | r = spanset(repo, m, n - 1) |
|
114 | r = spanset(repo, m, n - 1) | |
115 |
|
115 | |||
116 | if order == defineorder: |
|
116 | if order == defineorder: | |
117 | return r & subset |
|
117 | return r & subset | |
118 | else: |
|
118 | else: | |
119 | # carrying the sorting over when possible would be more efficient |
|
119 | # carrying the sorting over when possible would be more efficient | |
120 | return subset & r |
|
120 | return subset & r | |
121 |
|
121 | |||
122 | def dagrange(repo, subset, x, y, order): |
|
122 | def dagrange(repo, subset, x, y, order): | |
123 | r = fullreposet(repo) |
|
123 | r = fullreposet(repo) | |
124 | xs = dagop.reachableroots(repo, getset(repo, r, x), getset(repo, r, y), |
|
124 | xs = dagop.reachableroots(repo, getset(repo, r, x), getset(repo, r, y), | |
125 | includepath=True) |
|
125 | includepath=True) | |
126 | return subset & xs |
|
126 | return subset & xs | |
127 |
|
127 | |||
128 | def andset(repo, subset, x, y, order): |
|
128 | def andset(repo, subset, x, y, order): | |
129 | return getset(repo, getset(repo, subset, x), y) |
|
129 | return getset(repo, getset(repo, subset, x), y) | |
130 |
|
130 | |||
131 | def differenceset(repo, subset, x, y, order): |
|
131 | def differenceset(repo, subset, x, y, order): | |
132 | return getset(repo, subset, x) - getset(repo, subset, y) |
|
132 | return getset(repo, subset, x) - getset(repo, subset, y) | |
133 |
|
133 | |||
134 | def _orsetlist(repo, subset, xs): |
|
134 | def _orsetlist(repo, subset, xs): | |
135 | assert xs |
|
135 | assert xs | |
136 | if len(xs) == 1: |
|
136 | if len(xs) == 1: | |
137 | return getset(repo, subset, xs[0]) |
|
137 | return getset(repo, subset, xs[0]) | |
138 | p = len(xs) // 2 |
|
138 | p = len(xs) // 2 | |
139 | a = _orsetlist(repo, subset, xs[:p]) |
|
139 | a = _orsetlist(repo, subset, xs[:p]) | |
140 | b = _orsetlist(repo, subset, xs[p:]) |
|
140 | b = _orsetlist(repo, subset, xs[p:]) | |
141 | return a + b |
|
141 | return a + b | |
142 |
|
142 | |||
143 | def orset(repo, subset, x, order): |
|
143 | def orset(repo, subset, x, order): | |
144 | xs = getlist(x) |
|
144 | xs = getlist(x) | |
145 | if order == followorder: |
|
145 | if order == followorder: | |
146 | # slow path to take the subset order |
|
146 | # slow path to take the subset order | |
147 | return subset & _orsetlist(repo, fullreposet(repo), xs) |
|
147 | return subset & _orsetlist(repo, fullreposet(repo), xs) | |
148 | else: |
|
148 | else: | |
149 | return _orsetlist(repo, subset, xs) |
|
149 | return _orsetlist(repo, subset, xs) | |
150 |
|
150 | |||
151 | def notset(repo, subset, x, order): |
|
151 | def notset(repo, subset, x, order): | |
152 | return subset - getset(repo, subset, x) |
|
152 | return subset - getset(repo, subset, x) | |
153 |
|
153 | |||
154 | def relationset(repo, subset, x, y, order): |
|
154 | def relationset(repo, subset, x, y, order): | |
155 | raise error.ParseError(_("can't use a relation in this context")) |
|
155 | raise error.ParseError(_("can't use a relation in this context")) | |
156 |
|
156 | |||
157 | def relsubscriptset(repo, subset, x, y, z, order): |
|
157 | def relsubscriptset(repo, subset, x, y, z, order): | |
158 | # this is pretty basic implementation of 'x#y[z]' operator, still |
|
158 | # this is pretty basic implementation of 'x#y[z]' operator, still | |
159 | # experimental so undocumented. see the wiki for further ideas. |
|
159 | # experimental so undocumented. see the wiki for further ideas. | |
160 | # https://www.mercurial-scm.org/wiki/RevsetOperatorPlan |
|
160 | # https://www.mercurial-scm.org/wiki/RevsetOperatorPlan | |
161 | rel = getsymbol(y) |
|
161 | rel = getsymbol(y) | |
162 | n = getinteger(z, _("relation subscript must be an integer")) |
|
162 | n = getinteger(z, _("relation subscript must be an integer")) | |
163 |
|
163 | |||
164 | # TODO: perhaps this should be a table of relation functions |
|
164 | # TODO: perhaps this should be a table of relation functions | |
165 | if rel in ('g', 'generations'): |
|
165 | if rel in ('g', 'generations'): | |
166 | # TODO: support range, rewrite tests, and drop startdepth argument |
|
166 | # TODO: support range, rewrite tests, and drop startdepth argument | |
167 | # from ancestors() and descendants() predicates |
|
167 | # from ancestors() and descendants() predicates | |
168 | if n <= 0: |
|
168 | if n <= 0: | |
169 | n = -n |
|
169 | n = -n | |
170 | return _ancestors(repo, subset, x, startdepth=n, stopdepth=n + 1) |
|
170 | return _ancestors(repo, subset, x, startdepth=n, stopdepth=n + 1) | |
171 | else: |
|
171 | else: | |
172 | return _descendants(repo, subset, x, startdepth=n, stopdepth=n + 1) |
|
172 | return _descendants(repo, subset, x, startdepth=n, stopdepth=n + 1) | |
173 |
|
173 | |||
174 | raise error.UnknownIdentifier(rel, ['generations']) |
|
174 | raise error.UnknownIdentifier(rel, ['generations']) | |
175 |
|
175 | |||
176 | def subscriptset(repo, subset, x, y, order): |
|
176 | def subscriptset(repo, subset, x, y, order): | |
177 | raise error.ParseError(_("can't use a subscript in this context")) |
|
177 | raise error.ParseError(_("can't use a subscript in this context")) | |
178 |
|
178 | |||
179 | def listset(repo, subset, *xs): |
|
179 | def listset(repo, subset, *xs): | |
180 | raise error.ParseError(_("can't use a list in this context"), |
|
180 | raise error.ParseError(_("can't use a list in this context"), | |
181 | hint=_('see hg help "revsets.x or y"')) |
|
181 | hint=_('see hg help "revsets.x or y"')) | |
182 |
|
182 | |||
183 | def keyvaluepair(repo, subset, k, v): |
|
183 | def keyvaluepair(repo, subset, k, v): | |
184 | raise error.ParseError(_("can't use a key-value pair in this context")) |
|
184 | raise error.ParseError(_("can't use a key-value pair in this context")) | |
185 |
|
185 | |||
186 | def func(repo, subset, a, b, order): |
|
186 | def func(repo, subset, a, b, order): | |
187 | f = getsymbol(a) |
|
187 | f = getsymbol(a) | |
188 | if f in symbols: |
|
188 | if f in symbols: | |
189 | func = symbols[f] |
|
189 | func = symbols[f] | |
190 | if getattr(func, '_takeorder', False): |
|
190 | if getattr(func, '_takeorder', False): | |
191 | return func(repo, subset, b, order) |
|
191 | return func(repo, subset, b, order) | |
192 | return func(repo, subset, b) |
|
192 | return func(repo, subset, b) | |
193 |
|
193 | |||
194 | keep = lambda fn: getattr(fn, '__doc__', None) is not None |
|
194 | keep = lambda fn: getattr(fn, '__doc__', None) is not None | |
195 |
|
195 | |||
196 | syms = [s for (s, fn) in symbols.items() if keep(fn)] |
|
196 | syms = [s for (s, fn) in symbols.items() if keep(fn)] | |
197 | raise error.UnknownIdentifier(f, syms) |
|
197 | raise error.UnknownIdentifier(f, syms) | |
198 |
|
198 | |||
199 | # functions |
|
199 | # functions | |
200 |
|
200 | |||
201 | # symbols are callables like: |
|
201 | # symbols are callables like: | |
202 | # fn(repo, subset, x) |
|
202 | # fn(repo, subset, x) | |
203 | # with: |
|
203 | # with: | |
204 | # repo - current repository instance |
|
204 | # repo - current repository instance | |
205 | # subset - of revisions to be examined |
|
205 | # subset - of revisions to be examined | |
206 | # x - argument in tree form |
|
206 | # x - argument in tree form | |
207 | symbols = {} |
|
207 | symbols = {} | |
208 |
|
208 | |||
209 | # symbols which can't be used for a DoS attack for any given input |
|
209 | # symbols which can't be used for a DoS attack for any given input | |
210 | # (e.g. those which accept regexes as plain strings shouldn't be included) |
|
210 | # (e.g. those which accept regexes as plain strings shouldn't be included) | |
211 | # functions that just return a lot of changesets (like all) don't count here |
|
211 | # functions that just return a lot of changesets (like all) don't count here | |
212 | safesymbols = set() |
|
212 | safesymbols = set() | |
213 |
|
213 | |||
214 | predicate = registrar.revsetpredicate() |
|
214 | predicate = registrar.revsetpredicate() | |
215 |
|
215 | |||
216 | @predicate('_destupdate') |
|
216 | @predicate('_destupdate') | |
217 | def _destupdate(repo, subset, x): |
|
217 | def _destupdate(repo, subset, x): | |
218 | # experimental revset for update destination |
|
218 | # experimental revset for update destination | |
219 | args = getargsdict(x, 'limit', 'clean') |
|
219 | args = getargsdict(x, 'limit', 'clean') | |
220 | return subset & baseset([destutil.destupdate(repo, **args)[0]]) |
|
220 | return subset & baseset([destutil.destupdate(repo, **args)[0]]) | |
221 |
|
221 | |||
222 | @predicate('_destmerge') |
|
222 | @predicate('_destmerge') | |
223 | def _destmerge(repo, subset, x): |
|
223 | def _destmerge(repo, subset, x): | |
224 | # experimental revset for merge destination |
|
224 | # experimental revset for merge destination | |
225 | sourceset = None |
|
225 | sourceset = None | |
226 | if x is not None: |
|
226 | if x is not None: | |
227 | sourceset = getset(repo, fullreposet(repo), x) |
|
227 | sourceset = getset(repo, fullreposet(repo), x) | |
228 | return subset & baseset([destutil.destmerge(repo, sourceset=sourceset)]) |
|
228 | return subset & baseset([destutil.destmerge(repo, sourceset=sourceset)]) | |
229 |
|
229 | |||
230 | @predicate('adds(pattern)', safe=True) |
|
230 | @predicate('adds(pattern)', safe=True) | |
231 | def adds(repo, subset, x): |
|
231 | def adds(repo, subset, x): | |
232 | """Changesets that add a file matching pattern. |
|
232 | """Changesets that add a file matching pattern. | |
233 |
|
233 | |||
234 | The pattern without explicit kind like ``glob:`` is expected to be |
|
234 | The pattern without explicit kind like ``glob:`` is expected to be | |
235 | relative to the current directory and match against a file or a |
|
235 | relative to the current directory and match against a file or a | |
236 | directory. |
|
236 | directory. | |
237 | """ |
|
237 | """ | |
238 | # i18n: "adds" is a keyword |
|
238 | # i18n: "adds" is a keyword | |
239 | pat = getstring(x, _("adds requires a pattern")) |
|
239 | pat = getstring(x, _("adds requires a pattern")) | |
240 | return checkstatus(repo, subset, pat, 1) |
|
240 | return checkstatus(repo, subset, pat, 1) | |
241 |
|
241 | |||
242 | @predicate('ancestor(*changeset)', safe=True) |
|
242 | @predicate('ancestor(*changeset)', safe=True) | |
243 | def ancestor(repo, subset, x): |
|
243 | def ancestor(repo, subset, x): | |
244 | """A greatest common ancestor of the changesets. |
|
244 | """A greatest common ancestor of the changesets. | |
245 |
|
245 | |||
246 | Accepts 0 or more changesets. |
|
246 | Accepts 0 or more changesets. | |
247 | Will return empty list when passed no args. |
|
247 | Will return empty list when passed no args. | |
248 | Greatest common ancestor of a single changeset is that changeset. |
|
248 | Greatest common ancestor of a single changeset is that changeset. | |
249 | """ |
|
249 | """ | |
250 | # i18n: "ancestor" is a keyword |
|
250 | # i18n: "ancestor" is a keyword | |
251 | l = getlist(x) |
|
251 | l = getlist(x) | |
252 | rl = fullreposet(repo) |
|
252 | rl = fullreposet(repo) | |
253 | anc = None |
|
253 | anc = None | |
254 |
|
254 | |||
255 | # (getset(repo, rl, i) for i in l) generates a list of lists |
|
255 | # (getset(repo, rl, i) for i in l) generates a list of lists | |
256 | for revs in (getset(repo, rl, i) for i in l): |
|
256 | for revs in (getset(repo, rl, i) for i in l): | |
257 | for r in revs: |
|
257 | for r in revs: | |
258 | if anc is None: |
|
258 | if anc is None: | |
259 | anc = repo[r] |
|
259 | anc = repo[r] | |
260 | else: |
|
260 | else: | |
261 | anc = anc.ancestor(repo[r]) |
|
261 | anc = anc.ancestor(repo[r]) | |
262 |
|
262 | |||
263 | if anc is not None and anc.rev() in subset: |
|
263 | if anc is not None and anc.rev() in subset: | |
264 | return baseset([anc.rev()]) |
|
264 | return baseset([anc.rev()]) | |
265 | return baseset() |
|
265 | return baseset() | |
266 |
|
266 | |||
267 | def _ancestors(repo, subset, x, followfirst=False, startdepth=None, |
|
267 | def _ancestors(repo, subset, x, followfirst=False, startdepth=None, | |
268 | stopdepth=None): |
|
268 | stopdepth=None): | |
269 | heads = getset(repo, fullreposet(repo), x) |
|
269 | heads = getset(repo, fullreposet(repo), x) | |
270 | if not heads: |
|
270 | if not heads: | |
271 | return baseset() |
|
271 | return baseset() | |
272 | s = dagop.revancestors(repo, heads, followfirst, startdepth, stopdepth) |
|
272 | s = dagop.revancestors(repo, heads, followfirst, startdepth, stopdepth) | |
273 | return subset & s |
|
273 | return subset & s | |
274 |
|
274 | |||
275 | @predicate('ancestors(set[, depth])', safe=True) |
|
275 | @predicate('ancestors(set[, depth])', safe=True) | |
276 | def ancestors(repo, subset, x): |
|
276 | def ancestors(repo, subset, x): | |
277 | """Changesets that are ancestors of changesets in set, including the |
|
277 | """Changesets that are ancestors of changesets in set, including the | |
278 | given changesets themselves. |
|
278 | given changesets themselves. | |
279 |
|
279 | |||
280 | If depth is specified, the result only includes changesets up to |
|
280 | If depth is specified, the result only includes changesets up to | |
281 | the specified generation. |
|
281 | the specified generation. | |
282 | """ |
|
282 | """ | |
283 | # startdepth is for internal use only until we can decide the UI |
|
283 | # startdepth is for internal use only until we can decide the UI | |
284 | args = getargsdict(x, 'ancestors', 'set depth startdepth') |
|
284 | args = getargsdict(x, 'ancestors', 'set depth startdepth') | |
285 | if 'set' not in args: |
|
285 | if 'set' not in args: | |
286 | # i18n: "ancestors" is a keyword |
|
286 | # i18n: "ancestors" is a keyword | |
287 | raise error.ParseError(_('ancestors takes at least 1 argument')) |
|
287 | raise error.ParseError(_('ancestors takes at least 1 argument')) | |
288 | startdepth = stopdepth = None |
|
288 | startdepth = stopdepth = None | |
289 | if 'startdepth' in args: |
|
289 | if 'startdepth' in args: | |
290 | n = getinteger(args['startdepth'], |
|
290 | n = getinteger(args['startdepth'], | |
291 | "ancestors expects an integer startdepth") |
|
291 | "ancestors expects an integer startdepth") | |
292 | if n < 0: |
|
292 | if n < 0: | |
293 | raise error.ParseError("negative startdepth") |
|
293 | raise error.ParseError("negative startdepth") | |
294 | startdepth = n |
|
294 | startdepth = n | |
295 | if 'depth' in args: |
|
295 | if 'depth' in args: | |
296 | # i18n: "ancestors" is a keyword |
|
296 | # i18n: "ancestors" is a keyword | |
297 | n = getinteger(args['depth'], _("ancestors expects an integer depth")) |
|
297 | n = getinteger(args['depth'], _("ancestors expects an integer depth")) | |
298 | if n < 0: |
|
298 | if n < 0: | |
299 | raise error.ParseError(_("negative depth")) |
|
299 | raise error.ParseError(_("negative depth")) | |
300 | stopdepth = n + 1 |
|
300 | stopdepth = n + 1 | |
301 | return _ancestors(repo, subset, args['set'], |
|
301 | return _ancestors(repo, subset, args['set'], | |
302 | startdepth=startdepth, stopdepth=stopdepth) |
|
302 | startdepth=startdepth, stopdepth=stopdepth) | |
303 |
|
303 | |||
304 | @predicate('_firstancestors', safe=True) |
|
304 | @predicate('_firstancestors', safe=True) | |
305 | def _firstancestors(repo, subset, x): |
|
305 | def _firstancestors(repo, subset, x): | |
306 | # ``_firstancestors(set)`` |
|
306 | # ``_firstancestors(set)`` | |
307 | # Like ``ancestors(set)`` but follows only the first parents. |
|
307 | # Like ``ancestors(set)`` but follows only the first parents. | |
308 | return _ancestors(repo, subset, x, followfirst=True) |
|
308 | return _ancestors(repo, subset, x, followfirst=True) | |
309 |
|
309 | |||
310 | def _childrenspec(repo, subset, x, n, order): |
|
310 | def _childrenspec(repo, subset, x, n, order): | |
311 | """Changesets that are the Nth child of a changeset |
|
311 | """Changesets that are the Nth child of a changeset | |
312 | in set. |
|
312 | in set. | |
313 | """ |
|
313 | """ | |
314 | cs = set() |
|
314 | cs = set() | |
315 | for r in getset(repo, fullreposet(repo), x): |
|
315 | for r in getset(repo, fullreposet(repo), x): | |
316 | for i in range(n): |
|
316 | for i in range(n): | |
317 | c = repo[r].children() |
|
317 | c = repo[r].children() | |
318 | if len(c) == 0: |
|
318 | if len(c) == 0: | |
319 | break |
|
319 | break | |
320 | if len(c) > 1: |
|
320 | if len(c) > 1: | |
321 | raise error.RepoLookupError( |
|
321 | raise error.RepoLookupError( | |
322 | _("revision in set has more than one child")) |
|
322 | _("revision in set has more than one child")) | |
323 | r = c[0].rev() |
|
323 | r = c[0].rev() | |
324 | else: |
|
324 | else: | |
325 | cs.add(r) |
|
325 | cs.add(r) | |
326 | return subset & cs |
|
326 | return subset & cs | |
327 |
|
327 | |||
328 | def ancestorspec(repo, subset, x, n, order): |
|
328 | def ancestorspec(repo, subset, x, n, order): | |
329 | """``set~n`` |
|
329 | """``set~n`` | |
330 | Changesets that are the Nth ancestor (first parents only) of a changeset |
|
330 | Changesets that are the Nth ancestor (first parents only) of a changeset | |
331 | in set. |
|
331 | in set. | |
332 | """ |
|
332 | """ | |
333 | n = getinteger(n, _("~ expects a number")) |
|
333 | n = getinteger(n, _("~ expects a number")) | |
334 | if n < 0: |
|
334 | if n < 0: | |
335 | # children lookup |
|
335 | # children lookup | |
336 | return _childrenspec(repo, subset, x, -n, order) |
|
336 | return _childrenspec(repo, subset, x, -n, order) | |
337 | ps = set() |
|
337 | ps = set() | |
338 | cl = repo.changelog |
|
338 | cl = repo.changelog | |
339 | for r in getset(repo, fullreposet(repo), x): |
|
339 | for r in getset(repo, fullreposet(repo), x): | |
340 | for i in range(n): |
|
340 | for i in range(n): | |
341 | try: |
|
341 | try: | |
342 | r = cl.parentrevs(r)[0] |
|
342 | r = cl.parentrevs(r)[0] | |
343 | except error.WdirUnsupported: |
|
343 | except error.WdirUnsupported: | |
344 | r = repo[r].parents()[0].rev() |
|
344 | r = repo[r].parents()[0].rev() | |
345 | ps.add(r) |
|
345 | ps.add(r) | |
346 | return subset & ps |
|
346 | return subset & ps | |
347 |
|
347 | |||
348 | @predicate('author(string)', safe=True) |
|
348 | @predicate('author(string)', safe=True) | |
349 | def author(repo, subset, x): |
|
349 | def author(repo, subset, x): | |
350 | """Alias for ``user(string)``. |
|
350 | """Alias for ``user(string)``. | |
351 | """ |
|
351 | """ | |
352 | # i18n: "author" is a keyword |
|
352 | # i18n: "author" is a keyword | |
353 | n = getstring(x, _("author requires a string")) |
|
353 | n = getstring(x, _("author requires a string")) | |
354 | kind, pattern, matcher = _substringmatcher(n, casesensitive=False) |
|
354 | kind, pattern, matcher = _substringmatcher(n, casesensitive=False) | |
355 | return subset.filter(lambda x: matcher(repo[x].user()), |
|
355 | return subset.filter(lambda x: matcher(repo[x].user()), | |
356 | condrepr=('<user %r>', n)) |
|
356 | condrepr=('<user %r>', n)) | |
357 |
|
357 | |||
358 | @predicate('bisect(string)', safe=True) |
|
358 | @predicate('bisect(string)', safe=True) | |
359 | def bisect(repo, subset, x): |
|
359 | def bisect(repo, subset, x): | |
360 | """Changesets marked in the specified bisect status: |
|
360 | """Changesets marked in the specified bisect status: | |
361 |
|
361 | |||
362 | - ``good``, ``bad``, ``skip``: csets explicitly marked as good/bad/skip |
|
362 | - ``good``, ``bad``, ``skip``: csets explicitly marked as good/bad/skip | |
363 | - ``goods``, ``bads`` : csets topologically good/bad |
|
363 | - ``goods``, ``bads`` : csets topologically good/bad | |
364 | - ``range`` : csets taking part in the bisection |
|
364 | - ``range`` : csets taking part in the bisection | |
365 | - ``pruned`` : csets that are goods, bads or skipped |
|
365 | - ``pruned`` : csets that are goods, bads or skipped | |
366 | - ``untested`` : csets whose fate is yet unknown |
|
366 | - ``untested`` : csets whose fate is yet unknown | |
367 | - ``ignored`` : csets ignored due to DAG topology |
|
367 | - ``ignored`` : csets ignored due to DAG topology | |
368 | - ``current`` : the cset currently being bisected |
|
368 | - ``current`` : the cset currently being bisected | |
369 | """ |
|
369 | """ | |
370 | # i18n: "bisect" is a keyword |
|
370 | # i18n: "bisect" is a keyword | |
371 | status = getstring(x, _("bisect requires a string")).lower() |
|
371 | status = getstring(x, _("bisect requires a string")).lower() | |
372 | state = set(hbisect.get(repo, status)) |
|
372 | state = set(hbisect.get(repo, status)) | |
373 | return subset & state |
|
373 | return subset & state | |
374 |
|
374 | |||
375 | # Backward-compatibility |
|
375 | # Backward-compatibility | |
376 | # - no help entry so that we do not advertise it any more |
|
376 | # - no help entry so that we do not advertise it any more | |
377 | @predicate('bisected', safe=True) |
|
377 | @predicate('bisected', safe=True) | |
378 | def bisected(repo, subset, x): |
|
378 | def bisected(repo, subset, x): | |
379 | return bisect(repo, subset, x) |
|
379 | return bisect(repo, subset, x) | |
380 |
|
380 | |||
381 | @predicate('bookmark([name])', safe=True) |
|
381 | @predicate('bookmark([name])', safe=True) | |
382 | def bookmark(repo, subset, x): |
|
382 | def bookmark(repo, subset, x): | |
383 | """The named bookmark or all bookmarks. |
|
383 | """The named bookmark or all bookmarks. | |
384 |
|
384 | |||
385 | Pattern matching is supported for `name`. See :hg:`help revisions.patterns`. |
|
385 | Pattern matching is supported for `name`. See :hg:`help revisions.patterns`. | |
386 | """ |
|
386 | """ | |
387 | # i18n: "bookmark" is a keyword |
|
387 | # i18n: "bookmark" is a keyword | |
388 | args = getargs(x, 0, 1, _('bookmark takes one or no arguments')) |
|
388 | args = getargs(x, 0, 1, _('bookmark takes one or no arguments')) | |
389 | if args: |
|
389 | if args: | |
390 | bm = getstring(args[0], |
|
390 | bm = getstring(args[0], | |
391 | # i18n: "bookmark" is a keyword |
|
391 | # i18n: "bookmark" is a keyword | |
392 | _('the argument to bookmark must be a string')) |
|
392 | _('the argument to bookmark must be a string')) | |
393 | kind, pattern, matcher = util.stringmatcher(bm) |
|
393 | kind, pattern, matcher = util.stringmatcher(bm) | |
394 | bms = set() |
|
394 | bms = set() | |
395 | if kind == 'literal': |
|
395 | if kind == 'literal': | |
396 | bmrev = repo._bookmarks.get(pattern, None) |
|
396 | bmrev = repo._bookmarks.get(pattern, None) | |
397 | if not bmrev: |
|
397 | if not bmrev: | |
398 | raise error.RepoLookupError(_("bookmark '%s' does not exist") |
|
398 | raise error.RepoLookupError(_("bookmark '%s' does not exist") | |
399 | % pattern) |
|
399 | % pattern) | |
400 | bms.add(repo[bmrev].rev()) |
|
400 | bms.add(repo[bmrev].rev()) | |
401 | else: |
|
401 | else: | |
402 | matchrevs = set() |
|
402 | matchrevs = set() | |
403 | for name, bmrev in repo._bookmarks.iteritems(): |
|
403 | for name, bmrev in repo._bookmarks.iteritems(): | |
404 | if matcher(name): |
|
404 | if matcher(name): | |
405 | matchrevs.add(bmrev) |
|
405 | matchrevs.add(bmrev) | |
406 | if not matchrevs: |
|
406 | if not matchrevs: | |
407 | raise error.RepoLookupError(_("no bookmarks exist" |
|
407 | raise error.RepoLookupError(_("no bookmarks exist" | |
408 | " that match '%s'") % pattern) |
|
408 | " that match '%s'") % pattern) | |
409 | for bmrev in matchrevs: |
|
409 | for bmrev in matchrevs: | |
410 | bms.add(repo[bmrev].rev()) |
|
410 | bms.add(repo[bmrev].rev()) | |
411 | else: |
|
411 | else: | |
412 | bms = {repo[r].rev() for r in repo._bookmarks.values()} |
|
412 | bms = {repo[r].rev() for r in repo._bookmarks.values()} | |
413 | bms -= {node.nullrev} |
|
413 | bms -= {node.nullrev} | |
414 | return subset & bms |
|
414 | return subset & bms | |
415 |
|
415 | |||
416 | @predicate('branch(string or set)', safe=True) |
|
416 | @predicate('branch(string or set)', safe=True) | |
417 | def branch(repo, subset, x): |
|
417 | def branch(repo, subset, x): | |
418 | """ |
|
418 | """ | |
419 | All changesets belonging to the given branch or the branches of the given |
|
419 | All changesets belonging to the given branch or the branches of the given | |
420 | changesets. |
|
420 | changesets. | |
421 |
|
421 | |||
422 | Pattern matching is supported for `string`. See |
|
422 | Pattern matching is supported for `string`. See | |
423 | :hg:`help revisions.patterns`. |
|
423 | :hg:`help revisions.patterns`. | |
424 | """ |
|
424 | """ | |
425 | getbi = repo.revbranchcache().branchinfo |
|
425 | getbi = repo.revbranchcache().branchinfo | |
426 | def getbranch(r): |
|
426 | def getbranch(r): | |
427 | try: |
|
427 | try: | |
428 | return getbi(r)[0] |
|
428 | return getbi(r)[0] | |
429 | except error.WdirUnsupported: |
|
429 | except error.WdirUnsupported: | |
430 | return repo[r].branch() |
|
430 | return repo[r].branch() | |
431 |
|
431 | |||
432 | try: |
|
432 | try: | |
433 | b = getstring(x, '') |
|
433 | b = getstring(x, '') | |
434 | except error.ParseError: |
|
434 | except error.ParseError: | |
435 | # not a string, but another revspec, e.g. tip() |
|
435 | # not a string, but another revspec, e.g. tip() | |
436 | pass |
|
436 | pass | |
437 | else: |
|
437 | else: | |
438 | kind, pattern, matcher = util.stringmatcher(b) |
|
438 | kind, pattern, matcher = util.stringmatcher(b) | |
439 | if kind == 'literal': |
|
439 | if kind == 'literal': | |
440 | # note: falls through to the revspec case if no branch with |
|
440 | # note: falls through to the revspec case if no branch with | |
441 | # this name exists and pattern kind is not specified explicitly |
|
441 | # this name exists and pattern kind is not specified explicitly | |
442 | if pattern in repo.branchmap(): |
|
442 | if pattern in repo.branchmap(): | |
443 | return subset.filter(lambda r: matcher(getbranch(r)), |
|
443 | return subset.filter(lambda r: matcher(getbranch(r)), | |
444 | condrepr=('<branch %r>', b)) |
|
444 | condrepr=('<branch %r>', b)) | |
445 | if b.startswith('literal:'): |
|
445 | if b.startswith('literal:'): | |
446 | raise error.RepoLookupError(_("branch '%s' does not exist") |
|
446 | raise error.RepoLookupError(_("branch '%s' does not exist") | |
447 | % pattern) |
|
447 | % pattern) | |
448 | else: |
|
448 | else: | |
449 | return subset.filter(lambda r: matcher(getbranch(r)), |
|
449 | return subset.filter(lambda r: matcher(getbranch(r)), | |
450 | condrepr=('<branch %r>', b)) |
|
450 | condrepr=('<branch %r>', b)) | |
451 |
|
451 | |||
452 | s = getset(repo, fullreposet(repo), x) |
|
452 | s = getset(repo, fullreposet(repo), x) | |
453 | b = set() |
|
453 | b = set() | |
454 | for r in s: |
|
454 | for r in s: | |
455 | b.add(getbranch(r)) |
|
455 | b.add(getbranch(r)) | |
456 | c = s.__contains__ |
|
456 | c = s.__contains__ | |
457 | return subset.filter(lambda r: c(r) or getbranch(r) in b, |
|
457 | return subset.filter(lambda r: c(r) or getbranch(r) in b, | |
458 | condrepr=lambda: '<branch %r>' % sorted(b)) |
|
458 | condrepr=lambda: '<branch %r>' % sorted(b)) | |
459 |
|
459 | |||
460 | @predicate('bumped()', safe=True) |
|
460 | @predicate('bumped()', safe=True) | |
461 | def bumped(repo, subset, x): |
|
461 | def bumped(repo, subset, x): | |
|
462 | msg = ("'bumped()' is deprecated, " | |||
|
463 | "use 'phasedivergent()'") | |||
|
464 | repo.ui.deprecwarn(msg, '4.4') | |||
|
465 | ||||
|
466 | return phasedivergent(repo, subset, x) | |||
|
467 | ||||
|
468 | @predicate('phasedivergent()', safe=True) | |||
|
469 | def phasedivergent(repo, subset, x): | |||
462 | """Mutable changesets marked as successors of public changesets. |
|
470 | """Mutable changesets marked as successors of public changesets. | |
463 |
|
471 | |||
464 |
Only non-public and non-obsolete changesets can be ` |
|
472 | Only non-public and non-obsolete changesets can be `phasedivergent`. | |
465 | """ |
|
473 | """ | |
466 |
# i18n: " |
|
474 | # i18n: "phasedivergent" is a keyword | |
467 |
getargs(x, 0, 0, _(" |
|
475 | getargs(x, 0, 0, _("phasedivergent takes no arguments")) | |
468 | bumped = obsmod.getrevs(repo, 'bumped') |
|
476 | bumped = obsmod.getrevs(repo, 'bumped') | |
469 | return subset & bumped |
|
477 | return subset & bumped | |
470 |
|
478 | |||
471 | @predicate('bundle()', safe=True) |
|
479 | @predicate('bundle()', safe=True) | |
472 | def bundle(repo, subset, x): |
|
480 | def bundle(repo, subset, x): | |
473 | """Changesets in the bundle. |
|
481 | """Changesets in the bundle. | |
474 |
|
482 | |||
475 | Bundle must be specified by the -R option.""" |
|
483 | Bundle must be specified by the -R option.""" | |
476 |
|
484 | |||
477 | try: |
|
485 | try: | |
478 | bundlerevs = repo.changelog.bundlerevs |
|
486 | bundlerevs = repo.changelog.bundlerevs | |
479 | except AttributeError: |
|
487 | except AttributeError: | |
480 | raise error.Abort(_("no bundle provided - specify with -R")) |
|
488 | raise error.Abort(_("no bundle provided - specify with -R")) | |
481 | return subset & bundlerevs |
|
489 | return subset & bundlerevs | |
482 |
|
490 | |||
483 | def checkstatus(repo, subset, pat, field): |
|
491 | def checkstatus(repo, subset, pat, field): | |
484 | hasset = matchmod.patkind(pat) == 'set' |
|
492 | hasset = matchmod.patkind(pat) == 'set' | |
485 |
|
493 | |||
486 | mcache = [None] |
|
494 | mcache = [None] | |
487 | def matches(x): |
|
495 | def matches(x): | |
488 | c = repo[x] |
|
496 | c = repo[x] | |
489 | if not mcache[0] or hasset: |
|
497 | if not mcache[0] or hasset: | |
490 | mcache[0] = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=c) |
|
498 | mcache[0] = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=c) | |
491 | m = mcache[0] |
|
499 | m = mcache[0] | |
492 | fname = None |
|
500 | fname = None | |
493 | if not m.anypats() and len(m.files()) == 1: |
|
501 | if not m.anypats() and len(m.files()) == 1: | |
494 | fname = m.files()[0] |
|
502 | fname = m.files()[0] | |
495 | if fname is not None: |
|
503 | if fname is not None: | |
496 | if fname not in c.files(): |
|
504 | if fname not in c.files(): | |
497 | return False |
|
505 | return False | |
498 | else: |
|
506 | else: | |
499 | for f in c.files(): |
|
507 | for f in c.files(): | |
500 | if m(f): |
|
508 | if m(f): | |
501 | break |
|
509 | break | |
502 | else: |
|
510 | else: | |
503 | return False |
|
511 | return False | |
504 | files = repo.status(c.p1().node(), c.node())[field] |
|
512 | files = repo.status(c.p1().node(), c.node())[field] | |
505 | if fname is not None: |
|
513 | if fname is not None: | |
506 | if fname in files: |
|
514 | if fname in files: | |
507 | return True |
|
515 | return True | |
508 | else: |
|
516 | else: | |
509 | for f in files: |
|
517 | for f in files: | |
510 | if m(f): |
|
518 | if m(f): | |
511 | return True |
|
519 | return True | |
512 |
|
520 | |||
513 | return subset.filter(matches, condrepr=('<status[%r] %r>', field, pat)) |
|
521 | return subset.filter(matches, condrepr=('<status[%r] %r>', field, pat)) | |
514 |
|
522 | |||
515 | def _children(repo, subset, parentset): |
|
523 | def _children(repo, subset, parentset): | |
516 | if not parentset: |
|
524 | if not parentset: | |
517 | return baseset() |
|
525 | return baseset() | |
518 | cs = set() |
|
526 | cs = set() | |
519 | pr = repo.changelog.parentrevs |
|
527 | pr = repo.changelog.parentrevs | |
520 | minrev = parentset.min() |
|
528 | minrev = parentset.min() | |
521 | nullrev = node.nullrev |
|
529 | nullrev = node.nullrev | |
522 | for r in subset: |
|
530 | for r in subset: | |
523 | if r <= minrev: |
|
531 | if r <= minrev: | |
524 | continue |
|
532 | continue | |
525 | p1, p2 = pr(r) |
|
533 | p1, p2 = pr(r) | |
526 | if p1 in parentset: |
|
534 | if p1 in parentset: | |
527 | cs.add(r) |
|
535 | cs.add(r) | |
528 | if p2 != nullrev and p2 in parentset: |
|
536 | if p2 != nullrev and p2 in parentset: | |
529 | cs.add(r) |
|
537 | cs.add(r) | |
530 | return baseset(cs) |
|
538 | return baseset(cs) | |
531 |
|
539 | |||
532 | @predicate('children(set)', safe=True) |
|
540 | @predicate('children(set)', safe=True) | |
533 | def children(repo, subset, x): |
|
541 | def children(repo, subset, x): | |
534 | """Child changesets of changesets in set. |
|
542 | """Child changesets of changesets in set. | |
535 | """ |
|
543 | """ | |
536 | s = getset(repo, fullreposet(repo), x) |
|
544 | s = getset(repo, fullreposet(repo), x) | |
537 | cs = _children(repo, subset, s) |
|
545 | cs = _children(repo, subset, s) | |
538 | return subset & cs |
|
546 | return subset & cs | |
539 |
|
547 | |||
540 | @predicate('closed()', safe=True) |
|
548 | @predicate('closed()', safe=True) | |
541 | def closed(repo, subset, x): |
|
549 | def closed(repo, subset, x): | |
542 | """Changeset is closed. |
|
550 | """Changeset is closed. | |
543 | """ |
|
551 | """ | |
544 | # i18n: "closed" is a keyword |
|
552 | # i18n: "closed" is a keyword | |
545 | getargs(x, 0, 0, _("closed takes no arguments")) |
|
553 | getargs(x, 0, 0, _("closed takes no arguments")) | |
546 | return subset.filter(lambda r: repo[r].closesbranch(), |
|
554 | return subset.filter(lambda r: repo[r].closesbranch(), | |
547 | condrepr='<branch closed>') |
|
555 | condrepr='<branch closed>') | |
548 |
|
556 | |||
549 | @predicate('contains(pattern)') |
|
557 | @predicate('contains(pattern)') | |
550 | def contains(repo, subset, x): |
|
558 | def contains(repo, subset, x): | |
551 | """The revision's manifest contains a file matching pattern (but might not |
|
559 | """The revision's manifest contains a file matching pattern (but might not | |
552 | modify it). See :hg:`help patterns` for information about file patterns. |
|
560 | modify it). See :hg:`help patterns` for information about file patterns. | |
553 |
|
561 | |||
554 | The pattern without explicit kind like ``glob:`` is expected to be |
|
562 | The pattern without explicit kind like ``glob:`` is expected to be | |
555 | relative to the current directory and match against a file exactly |
|
563 | relative to the current directory and match against a file exactly | |
556 | for efficiency. |
|
564 | for efficiency. | |
557 | """ |
|
565 | """ | |
558 | # i18n: "contains" is a keyword |
|
566 | # i18n: "contains" is a keyword | |
559 | pat = getstring(x, _("contains requires a pattern")) |
|
567 | pat = getstring(x, _("contains requires a pattern")) | |
560 |
|
568 | |||
561 | def matches(x): |
|
569 | def matches(x): | |
562 | if not matchmod.patkind(pat): |
|
570 | if not matchmod.patkind(pat): | |
563 | pats = pathutil.canonpath(repo.root, repo.getcwd(), pat) |
|
571 | pats = pathutil.canonpath(repo.root, repo.getcwd(), pat) | |
564 | if pats in repo[x]: |
|
572 | if pats in repo[x]: | |
565 | return True |
|
573 | return True | |
566 | else: |
|
574 | else: | |
567 | c = repo[x] |
|
575 | c = repo[x] | |
568 | m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=c) |
|
576 | m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=c) | |
569 | for f in c.manifest(): |
|
577 | for f in c.manifest(): | |
570 | if m(f): |
|
578 | if m(f): | |
571 | return True |
|
579 | return True | |
572 | return False |
|
580 | return False | |
573 |
|
581 | |||
574 | return subset.filter(matches, condrepr=('<contains %r>', pat)) |
|
582 | return subset.filter(matches, condrepr=('<contains %r>', pat)) | |
575 |
|
583 | |||
576 | @predicate('converted([id])', safe=True) |
|
584 | @predicate('converted([id])', safe=True) | |
577 | def converted(repo, subset, x): |
|
585 | def converted(repo, subset, x): | |
578 | """Changesets converted from the given identifier in the old repository if |
|
586 | """Changesets converted from the given identifier in the old repository if | |
579 | present, or all converted changesets if no identifier is specified. |
|
587 | present, or all converted changesets if no identifier is specified. | |
580 | """ |
|
588 | """ | |
581 |
|
589 | |||
582 | # There is exactly no chance of resolving the revision, so do a simple |
|
590 | # There is exactly no chance of resolving the revision, so do a simple | |
583 | # string compare and hope for the best |
|
591 | # string compare and hope for the best | |
584 |
|
592 | |||
585 | rev = None |
|
593 | rev = None | |
586 | # i18n: "converted" is a keyword |
|
594 | # i18n: "converted" is a keyword | |
587 | l = getargs(x, 0, 1, _('converted takes one or no arguments')) |
|
595 | l = getargs(x, 0, 1, _('converted takes one or no arguments')) | |
588 | if l: |
|
596 | if l: | |
589 | # i18n: "converted" is a keyword |
|
597 | # i18n: "converted" is a keyword | |
590 | rev = getstring(l[0], _('converted requires a revision')) |
|
598 | rev = getstring(l[0], _('converted requires a revision')) | |
591 |
|
599 | |||
592 | def _matchvalue(r): |
|
600 | def _matchvalue(r): | |
593 | source = repo[r].extra().get('convert_revision', None) |
|
601 | source = repo[r].extra().get('convert_revision', None) | |
594 | return source is not None and (rev is None or source.startswith(rev)) |
|
602 | return source is not None and (rev is None or source.startswith(rev)) | |
595 |
|
603 | |||
596 | return subset.filter(lambda r: _matchvalue(r), |
|
604 | return subset.filter(lambda r: _matchvalue(r), | |
597 | condrepr=('<converted %r>', rev)) |
|
605 | condrepr=('<converted %r>', rev)) | |
598 |
|
606 | |||
599 | @predicate('date(interval)', safe=True) |
|
607 | @predicate('date(interval)', safe=True) | |
600 | def date(repo, subset, x): |
|
608 | def date(repo, subset, x): | |
601 | """Changesets within the interval, see :hg:`help dates`. |
|
609 | """Changesets within the interval, see :hg:`help dates`. | |
602 | """ |
|
610 | """ | |
603 | # i18n: "date" is a keyword |
|
611 | # i18n: "date" is a keyword | |
604 | ds = getstring(x, _("date requires a string")) |
|
612 | ds = getstring(x, _("date requires a string")) | |
605 | dm = util.matchdate(ds) |
|
613 | dm = util.matchdate(ds) | |
606 | return subset.filter(lambda x: dm(repo[x].date()[0]), |
|
614 | return subset.filter(lambda x: dm(repo[x].date()[0]), | |
607 | condrepr=('<date %r>', ds)) |
|
615 | condrepr=('<date %r>', ds)) | |
608 |
|
616 | |||
609 | @predicate('desc(string)', safe=True) |
|
617 | @predicate('desc(string)', safe=True) | |
610 | def desc(repo, subset, x): |
|
618 | def desc(repo, subset, x): | |
611 | """Search commit message for string. The match is case-insensitive. |
|
619 | """Search commit message for string. The match is case-insensitive. | |
612 |
|
620 | |||
613 | Pattern matching is supported for `string`. See |
|
621 | Pattern matching is supported for `string`. See | |
614 | :hg:`help revisions.patterns`. |
|
622 | :hg:`help revisions.patterns`. | |
615 | """ |
|
623 | """ | |
616 | # i18n: "desc" is a keyword |
|
624 | # i18n: "desc" is a keyword | |
617 | ds = getstring(x, _("desc requires a string")) |
|
625 | ds = getstring(x, _("desc requires a string")) | |
618 |
|
626 | |||
619 | kind, pattern, matcher = _substringmatcher(ds, casesensitive=False) |
|
627 | kind, pattern, matcher = _substringmatcher(ds, casesensitive=False) | |
620 |
|
628 | |||
621 | return subset.filter(lambda r: matcher(repo[r].description()), |
|
629 | return subset.filter(lambda r: matcher(repo[r].description()), | |
622 | condrepr=('<desc %r>', ds)) |
|
630 | condrepr=('<desc %r>', ds)) | |
623 |
|
631 | |||
624 | def _descendants(repo, subset, x, followfirst=False, startdepth=None, |
|
632 | def _descendants(repo, subset, x, followfirst=False, startdepth=None, | |
625 | stopdepth=None): |
|
633 | stopdepth=None): | |
626 | roots = getset(repo, fullreposet(repo), x) |
|
634 | roots = getset(repo, fullreposet(repo), x) | |
627 | if not roots: |
|
635 | if not roots: | |
628 | return baseset() |
|
636 | return baseset() | |
629 | s = dagop.revdescendants(repo, roots, followfirst, startdepth, stopdepth) |
|
637 | s = dagop.revdescendants(repo, roots, followfirst, startdepth, stopdepth) | |
630 | return subset & s |
|
638 | return subset & s | |
631 |
|
639 | |||
632 | @predicate('descendants(set[, depth])', safe=True) |
|
640 | @predicate('descendants(set[, depth])', safe=True) | |
633 | def descendants(repo, subset, x): |
|
641 | def descendants(repo, subset, x): | |
634 | """Changesets which are descendants of changesets in set, including the |
|
642 | """Changesets which are descendants of changesets in set, including the | |
635 | given changesets themselves. |
|
643 | given changesets themselves. | |
636 |
|
644 | |||
637 | If depth is specified, the result only includes changesets up to |
|
645 | If depth is specified, the result only includes changesets up to | |
638 | the specified generation. |
|
646 | the specified generation. | |
639 | """ |
|
647 | """ | |
640 | # startdepth is for internal use only until we can decide the UI |
|
648 | # startdepth is for internal use only until we can decide the UI | |
641 | args = getargsdict(x, 'descendants', 'set depth startdepth') |
|
649 | args = getargsdict(x, 'descendants', 'set depth startdepth') | |
642 | if 'set' not in args: |
|
650 | if 'set' not in args: | |
643 | # i18n: "descendants" is a keyword |
|
651 | # i18n: "descendants" is a keyword | |
644 | raise error.ParseError(_('descendants takes at least 1 argument')) |
|
652 | raise error.ParseError(_('descendants takes at least 1 argument')) | |
645 | startdepth = stopdepth = None |
|
653 | startdepth = stopdepth = None | |
646 | if 'startdepth' in args: |
|
654 | if 'startdepth' in args: | |
647 | n = getinteger(args['startdepth'], |
|
655 | n = getinteger(args['startdepth'], | |
648 | "descendants expects an integer startdepth") |
|
656 | "descendants expects an integer startdepth") | |
649 | if n < 0: |
|
657 | if n < 0: | |
650 | raise error.ParseError("negative startdepth") |
|
658 | raise error.ParseError("negative startdepth") | |
651 | startdepth = n |
|
659 | startdepth = n | |
652 | if 'depth' in args: |
|
660 | if 'depth' in args: | |
653 | # i18n: "descendants" is a keyword |
|
661 | # i18n: "descendants" is a keyword | |
654 | n = getinteger(args['depth'], _("descendants expects an integer depth")) |
|
662 | n = getinteger(args['depth'], _("descendants expects an integer depth")) | |
655 | if n < 0: |
|
663 | if n < 0: | |
656 | raise error.ParseError(_("negative depth")) |
|
664 | raise error.ParseError(_("negative depth")) | |
657 | stopdepth = n + 1 |
|
665 | stopdepth = n + 1 | |
658 | return _descendants(repo, subset, args['set'], |
|
666 | return _descendants(repo, subset, args['set'], | |
659 | startdepth=startdepth, stopdepth=stopdepth) |
|
667 | startdepth=startdepth, stopdepth=stopdepth) | |
660 |
|
668 | |||
661 | @predicate('_firstdescendants', safe=True) |
|
669 | @predicate('_firstdescendants', safe=True) | |
662 | def _firstdescendants(repo, subset, x): |
|
670 | def _firstdescendants(repo, subset, x): | |
663 | # ``_firstdescendants(set)`` |
|
671 | # ``_firstdescendants(set)`` | |
664 | # Like ``descendants(set)`` but follows only the first parents. |
|
672 | # Like ``descendants(set)`` but follows only the first parents. | |
665 | return _descendants(repo, subset, x, followfirst=True) |
|
673 | return _descendants(repo, subset, x, followfirst=True) | |
666 |
|
674 | |||
667 | @predicate('destination([set])', safe=True) |
|
675 | @predicate('destination([set])', safe=True) | |
668 | def destination(repo, subset, x): |
|
676 | def destination(repo, subset, x): | |
669 | """Changesets that were created by a graft, transplant or rebase operation, |
|
677 | """Changesets that were created by a graft, transplant or rebase operation, | |
670 | with the given revisions specified as the source. Omitting the optional set |
|
678 | with the given revisions specified as the source. Omitting the optional set | |
671 | is the same as passing all(). |
|
679 | is the same as passing all(). | |
672 | """ |
|
680 | """ | |
673 | if x is not None: |
|
681 | if x is not None: | |
674 | sources = getset(repo, fullreposet(repo), x) |
|
682 | sources = getset(repo, fullreposet(repo), x) | |
675 | else: |
|
683 | else: | |
676 | sources = fullreposet(repo) |
|
684 | sources = fullreposet(repo) | |
677 |
|
685 | |||
678 | dests = set() |
|
686 | dests = set() | |
679 |
|
687 | |||
680 | # subset contains all of the possible destinations that can be returned, so |
|
688 | # subset contains all of the possible destinations that can be returned, so | |
681 | # iterate over them and see if their source(s) were provided in the arg set. |
|
689 | # iterate over them and see if their source(s) were provided in the arg set. | |
682 | # Even if the immediate src of r is not in the arg set, src's source (or |
|
690 | # Even if the immediate src of r is not in the arg set, src's source (or | |
683 | # further back) may be. Scanning back further than the immediate src allows |
|
691 | # further back) may be. Scanning back further than the immediate src allows | |
684 | # transitive transplants and rebases to yield the same results as transitive |
|
692 | # transitive transplants and rebases to yield the same results as transitive | |
685 | # grafts. |
|
693 | # grafts. | |
686 | for r in subset: |
|
694 | for r in subset: | |
687 | src = _getrevsource(repo, r) |
|
695 | src = _getrevsource(repo, r) | |
688 | lineage = None |
|
696 | lineage = None | |
689 |
|
697 | |||
690 | while src is not None: |
|
698 | while src is not None: | |
691 | if lineage is None: |
|
699 | if lineage is None: | |
692 | lineage = list() |
|
700 | lineage = list() | |
693 |
|
701 | |||
694 | lineage.append(r) |
|
702 | lineage.append(r) | |
695 |
|
703 | |||
696 | # The visited lineage is a match if the current source is in the arg |
|
704 | # The visited lineage is a match if the current source is in the arg | |
697 | # set. Since every candidate dest is visited by way of iterating |
|
705 | # set. Since every candidate dest is visited by way of iterating | |
698 | # subset, any dests further back in the lineage will be tested by a |
|
706 | # subset, any dests further back in the lineage will be tested by a | |
699 | # different iteration over subset. Likewise, if the src was already |
|
707 | # different iteration over subset. Likewise, if the src was already | |
700 | # selected, the current lineage can be selected without going back |
|
708 | # selected, the current lineage can be selected without going back | |
701 | # further. |
|
709 | # further. | |
702 | if src in sources or src in dests: |
|
710 | if src in sources or src in dests: | |
703 | dests.update(lineage) |
|
711 | dests.update(lineage) | |
704 | break |
|
712 | break | |
705 |
|
713 | |||
706 | r = src |
|
714 | r = src | |
707 | src = _getrevsource(repo, r) |
|
715 | src = _getrevsource(repo, r) | |
708 |
|
716 | |||
709 | return subset.filter(dests.__contains__, |
|
717 | return subset.filter(dests.__contains__, | |
710 | condrepr=lambda: '<destination %r>' % sorted(dests)) |
|
718 | condrepr=lambda: '<destination %r>' % sorted(dests)) | |
711 |
|
719 | |||
712 | @predicate('divergent()', safe=True) |
|
720 | @predicate('divergent()', safe=True) | |
713 | def divergent(repo, subset, x): |
|
721 | def divergent(repo, subset, x): | |
714 | msg = ("'divergent()' is deprecated, " |
|
722 | msg = ("'divergent()' is deprecated, " | |
715 | "use 'contentdivergent()'") |
|
723 | "use 'contentdivergent()'") | |
716 | repo.ui.deprecwarn(msg, '4.4') |
|
724 | repo.ui.deprecwarn(msg, '4.4') | |
717 |
|
725 | |||
718 | return contentdivergent(repo, subset, x) |
|
726 | return contentdivergent(repo, subset, x) | |
719 |
|
727 | |||
720 | @predicate('contentdivergent()', safe=True) |
|
728 | @predicate('contentdivergent()', safe=True) | |
721 | def contentdivergent(repo, subset, x): |
|
729 | def contentdivergent(repo, subset, x): | |
722 | """ |
|
730 | """ | |
723 | Final successors of changesets with an alternative set of final successors. |
|
731 | Final successors of changesets with an alternative set of final successors. | |
724 | """ |
|
732 | """ | |
725 | # i18n: "contentdivergent" is a keyword |
|
733 | # i18n: "contentdivergent" is a keyword | |
726 | getargs(x, 0, 0, _("contentdivergent takes no arguments")) |
|
734 | getargs(x, 0, 0, _("contentdivergent takes no arguments")) | |
727 | divergent = obsmod.getrevs(repo, 'divergent') |
|
735 | divergent = obsmod.getrevs(repo, 'divergent') | |
728 | return subset & divergent |
|
736 | return subset & divergent | |
729 |
|
737 | |||
730 | @predicate('extinct()', safe=True) |
|
738 | @predicate('extinct()', safe=True) | |
731 | def extinct(repo, subset, x): |
|
739 | def extinct(repo, subset, x): | |
732 | """Obsolete changesets with obsolete descendants only. |
|
740 | """Obsolete changesets with obsolete descendants only. | |
733 | """ |
|
741 | """ | |
734 | # i18n: "extinct" is a keyword |
|
742 | # i18n: "extinct" is a keyword | |
735 | getargs(x, 0, 0, _("extinct takes no arguments")) |
|
743 | getargs(x, 0, 0, _("extinct takes no arguments")) | |
736 | extincts = obsmod.getrevs(repo, 'extinct') |
|
744 | extincts = obsmod.getrevs(repo, 'extinct') | |
737 | return subset & extincts |
|
745 | return subset & extincts | |
738 |
|
746 | |||
739 | @predicate('extra(label, [value])', safe=True) |
|
747 | @predicate('extra(label, [value])', safe=True) | |
740 | def extra(repo, subset, x): |
|
748 | def extra(repo, subset, x): | |
741 | """Changesets with the given label in the extra metadata, with the given |
|
749 | """Changesets with the given label in the extra metadata, with the given | |
742 | optional value. |
|
750 | optional value. | |
743 |
|
751 | |||
744 | Pattern matching is supported for `value`. See |
|
752 | Pattern matching is supported for `value`. See | |
745 | :hg:`help revisions.patterns`. |
|
753 | :hg:`help revisions.patterns`. | |
746 | """ |
|
754 | """ | |
747 | args = getargsdict(x, 'extra', 'label value') |
|
755 | args = getargsdict(x, 'extra', 'label value') | |
748 | if 'label' not in args: |
|
756 | if 'label' not in args: | |
749 | # i18n: "extra" is a keyword |
|
757 | # i18n: "extra" is a keyword | |
750 | raise error.ParseError(_('extra takes at least 1 argument')) |
|
758 | raise error.ParseError(_('extra takes at least 1 argument')) | |
751 | # i18n: "extra" is a keyword |
|
759 | # i18n: "extra" is a keyword | |
752 | label = getstring(args['label'], _('first argument to extra must be ' |
|
760 | label = getstring(args['label'], _('first argument to extra must be ' | |
753 | 'a string')) |
|
761 | 'a string')) | |
754 | value = None |
|
762 | value = None | |
755 |
|
763 | |||
756 | if 'value' in args: |
|
764 | if 'value' in args: | |
757 | # i18n: "extra" is a keyword |
|
765 | # i18n: "extra" is a keyword | |
758 | value = getstring(args['value'], _('second argument to extra must be ' |
|
766 | value = getstring(args['value'], _('second argument to extra must be ' | |
759 | 'a string')) |
|
767 | 'a string')) | |
760 | kind, value, matcher = util.stringmatcher(value) |
|
768 | kind, value, matcher = util.stringmatcher(value) | |
761 |
|
769 | |||
762 | def _matchvalue(r): |
|
770 | def _matchvalue(r): | |
763 | extra = repo[r].extra() |
|
771 | extra = repo[r].extra() | |
764 | return label in extra and (value is None or matcher(extra[label])) |
|
772 | return label in extra and (value is None or matcher(extra[label])) | |
765 |
|
773 | |||
766 | return subset.filter(lambda r: _matchvalue(r), |
|
774 | return subset.filter(lambda r: _matchvalue(r), | |
767 | condrepr=('<extra[%r] %r>', label, value)) |
|
775 | condrepr=('<extra[%r] %r>', label, value)) | |
768 |
|
776 | |||
769 | @predicate('filelog(pattern)', safe=True) |
|
777 | @predicate('filelog(pattern)', safe=True) | |
770 | def filelog(repo, subset, x): |
|
778 | def filelog(repo, subset, x): | |
771 | """Changesets connected to the specified filelog. |
|
779 | """Changesets connected to the specified filelog. | |
772 |
|
780 | |||
773 | For performance reasons, visits only revisions mentioned in the file-level |
|
781 | For performance reasons, visits only revisions mentioned in the file-level | |
774 | filelog, rather than filtering through all changesets (much faster, but |
|
782 | filelog, rather than filtering through all changesets (much faster, but | |
775 | doesn't include deletes or duplicate changes). For a slower, more accurate |
|
783 | doesn't include deletes or duplicate changes). For a slower, more accurate | |
776 | result, use ``file()``. |
|
784 | result, use ``file()``. | |
777 |
|
785 | |||
778 | The pattern without explicit kind like ``glob:`` is expected to be |
|
786 | The pattern without explicit kind like ``glob:`` is expected to be | |
779 | relative to the current directory and match against a file exactly |
|
787 | relative to the current directory and match against a file exactly | |
780 | for efficiency. |
|
788 | for efficiency. | |
781 |
|
789 | |||
782 | If some linkrev points to revisions filtered by the current repoview, we'll |
|
790 | If some linkrev points to revisions filtered by the current repoview, we'll | |
783 | work around it to return a non-filtered value. |
|
791 | work around it to return a non-filtered value. | |
784 | """ |
|
792 | """ | |
785 |
|
793 | |||
786 | # i18n: "filelog" is a keyword |
|
794 | # i18n: "filelog" is a keyword | |
787 | pat = getstring(x, _("filelog requires a pattern")) |
|
795 | pat = getstring(x, _("filelog requires a pattern")) | |
788 | s = set() |
|
796 | s = set() | |
789 | cl = repo.changelog |
|
797 | cl = repo.changelog | |
790 |
|
798 | |||
791 | if not matchmod.patkind(pat): |
|
799 | if not matchmod.patkind(pat): | |
792 | f = pathutil.canonpath(repo.root, repo.getcwd(), pat) |
|
800 | f = pathutil.canonpath(repo.root, repo.getcwd(), pat) | |
793 | files = [f] |
|
801 | files = [f] | |
794 | else: |
|
802 | else: | |
795 | m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=repo[None]) |
|
803 | m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=repo[None]) | |
796 | files = (f for f in repo[None] if m(f)) |
|
804 | files = (f for f in repo[None] if m(f)) | |
797 |
|
805 | |||
798 | for f in files: |
|
806 | for f in files: | |
799 | fl = repo.file(f) |
|
807 | fl = repo.file(f) | |
800 | known = {} |
|
808 | known = {} | |
801 | scanpos = 0 |
|
809 | scanpos = 0 | |
802 | for fr in list(fl): |
|
810 | for fr in list(fl): | |
803 | fn = fl.node(fr) |
|
811 | fn = fl.node(fr) | |
804 | if fn in known: |
|
812 | if fn in known: | |
805 | s.add(known[fn]) |
|
813 | s.add(known[fn]) | |
806 | continue |
|
814 | continue | |
807 |
|
815 | |||
808 | lr = fl.linkrev(fr) |
|
816 | lr = fl.linkrev(fr) | |
809 | if lr in cl: |
|
817 | if lr in cl: | |
810 | s.add(lr) |
|
818 | s.add(lr) | |
811 | elif scanpos is not None: |
|
819 | elif scanpos is not None: | |
812 | # lowest matching changeset is filtered, scan further |
|
820 | # lowest matching changeset is filtered, scan further | |
813 | # ahead in changelog |
|
821 | # ahead in changelog | |
814 | start = max(lr, scanpos) + 1 |
|
822 | start = max(lr, scanpos) + 1 | |
815 | scanpos = None |
|
823 | scanpos = None | |
816 | for r in cl.revs(start): |
|
824 | for r in cl.revs(start): | |
817 | # minimize parsing of non-matching entries |
|
825 | # minimize parsing of non-matching entries | |
818 | if f in cl.revision(r) and f in cl.readfiles(r): |
|
826 | if f in cl.revision(r) and f in cl.readfiles(r): | |
819 | try: |
|
827 | try: | |
820 | # try to use manifest delta fastpath |
|
828 | # try to use manifest delta fastpath | |
821 | n = repo[r].filenode(f) |
|
829 | n = repo[r].filenode(f) | |
822 | if n not in known: |
|
830 | if n not in known: | |
823 | if n == fn: |
|
831 | if n == fn: | |
824 | s.add(r) |
|
832 | s.add(r) | |
825 | scanpos = r |
|
833 | scanpos = r | |
826 | break |
|
834 | break | |
827 | else: |
|
835 | else: | |
828 | known[n] = r |
|
836 | known[n] = r | |
829 | except error.ManifestLookupError: |
|
837 | except error.ManifestLookupError: | |
830 | # deletion in changelog |
|
838 | # deletion in changelog | |
831 | continue |
|
839 | continue | |
832 |
|
840 | |||
833 | return subset & s |
|
841 | return subset & s | |
834 |
|
842 | |||
835 | @predicate('first(set, [n])', safe=True, takeorder=True) |
|
843 | @predicate('first(set, [n])', safe=True, takeorder=True) | |
836 | def first(repo, subset, x, order): |
|
844 | def first(repo, subset, x, order): | |
837 | """An alias for limit(). |
|
845 | """An alias for limit(). | |
838 | """ |
|
846 | """ | |
839 | return limit(repo, subset, x, order) |
|
847 | return limit(repo, subset, x, order) | |
840 |
|
848 | |||
841 | def _follow(repo, subset, x, name, followfirst=False): |
|
849 | def _follow(repo, subset, x, name, followfirst=False): | |
842 | l = getargs(x, 0, 2, _("%s takes no arguments or a pattern " |
|
850 | l = getargs(x, 0, 2, _("%s takes no arguments or a pattern " | |
843 | "and an optional revset") % name) |
|
851 | "and an optional revset") % name) | |
844 | c = repo['.'] |
|
852 | c = repo['.'] | |
845 | if l: |
|
853 | if l: | |
846 | x = getstring(l[0], _("%s expected a pattern") % name) |
|
854 | x = getstring(l[0], _("%s expected a pattern") % name) | |
847 | rev = None |
|
855 | rev = None | |
848 | if len(l) >= 2: |
|
856 | if len(l) >= 2: | |
849 | revs = getset(repo, fullreposet(repo), l[1]) |
|
857 | revs = getset(repo, fullreposet(repo), l[1]) | |
850 | if len(revs) != 1: |
|
858 | if len(revs) != 1: | |
851 | raise error.RepoLookupError( |
|
859 | raise error.RepoLookupError( | |
852 | _("%s expected one starting revision") % name) |
|
860 | _("%s expected one starting revision") % name) | |
853 | rev = revs.last() |
|
861 | rev = revs.last() | |
854 | c = repo[rev] |
|
862 | c = repo[rev] | |
855 | matcher = matchmod.match(repo.root, repo.getcwd(), [x], |
|
863 | matcher = matchmod.match(repo.root, repo.getcwd(), [x], | |
856 | ctx=repo[rev], default='path') |
|
864 | ctx=repo[rev], default='path') | |
857 |
|
865 | |||
858 | files = c.manifest().walk(matcher) |
|
866 | files = c.manifest().walk(matcher) | |
859 |
|
867 | |||
860 | s = set() |
|
868 | s = set() | |
861 | for fname in files: |
|
869 | for fname in files: | |
862 | fctx = c[fname] |
|
870 | fctx = c[fname] | |
863 | s = s.union(set(c.rev() for c in fctx.ancestors(followfirst))) |
|
871 | s = s.union(set(c.rev() for c in fctx.ancestors(followfirst))) | |
864 | # include the revision responsible for the most recent version |
|
872 | # include the revision responsible for the most recent version | |
865 | s.add(fctx.introrev()) |
|
873 | s.add(fctx.introrev()) | |
866 | else: |
|
874 | else: | |
867 | s = dagop.revancestors(repo, baseset([c.rev()]), followfirst) |
|
875 | s = dagop.revancestors(repo, baseset([c.rev()]), followfirst) | |
868 |
|
876 | |||
869 | return subset & s |
|
877 | return subset & s | |
870 |
|
878 | |||
871 | @predicate('follow([pattern[, startrev]])', safe=True) |
|
879 | @predicate('follow([pattern[, startrev]])', safe=True) | |
872 | def follow(repo, subset, x): |
|
880 | def follow(repo, subset, x): | |
873 | """ |
|
881 | """ | |
874 | An alias for ``::.`` (ancestors of the working directory's first parent). |
|
882 | An alias for ``::.`` (ancestors of the working directory's first parent). | |
875 | If pattern is specified, the histories of files matching given |
|
883 | If pattern is specified, the histories of files matching given | |
876 | pattern in the revision given by startrev are followed, including copies. |
|
884 | pattern in the revision given by startrev are followed, including copies. | |
877 | """ |
|
885 | """ | |
878 | return _follow(repo, subset, x, 'follow') |
|
886 | return _follow(repo, subset, x, 'follow') | |
879 |
|
887 | |||
880 | @predicate('_followfirst', safe=True) |
|
888 | @predicate('_followfirst', safe=True) | |
881 | def _followfirst(repo, subset, x): |
|
889 | def _followfirst(repo, subset, x): | |
882 | # ``followfirst([pattern[, startrev]])`` |
|
890 | # ``followfirst([pattern[, startrev]])`` | |
883 | # Like ``follow([pattern[, startrev]])`` but follows only the first parent |
|
891 | # Like ``follow([pattern[, startrev]])`` but follows only the first parent | |
884 | # of every revisions or files revisions. |
|
892 | # of every revisions or files revisions. | |
885 | return _follow(repo, subset, x, '_followfirst', followfirst=True) |
|
893 | return _follow(repo, subset, x, '_followfirst', followfirst=True) | |
886 |
|
894 | |||
887 | @predicate('followlines(file, fromline:toline[, startrev=., descend=False])', |
|
895 | @predicate('followlines(file, fromline:toline[, startrev=., descend=False])', | |
888 | safe=True) |
|
896 | safe=True) | |
889 | def followlines(repo, subset, x): |
|
897 | def followlines(repo, subset, x): | |
890 | """Changesets modifying `file` in line range ('fromline', 'toline'). |
|
898 | """Changesets modifying `file` in line range ('fromline', 'toline'). | |
891 |
|
899 | |||
892 | Line range corresponds to 'file' content at 'startrev' and should hence be |
|
900 | Line range corresponds to 'file' content at 'startrev' and should hence be | |
893 | consistent with file size. If startrev is not specified, working directory's |
|
901 | consistent with file size. If startrev is not specified, working directory's | |
894 | parent is used. |
|
902 | parent is used. | |
895 |
|
903 | |||
896 | By default, ancestors of 'startrev' are returned. If 'descend' is True, |
|
904 | By default, ancestors of 'startrev' are returned. If 'descend' is True, | |
897 | descendants of 'startrev' are returned though renames are (currently) not |
|
905 | descendants of 'startrev' are returned though renames are (currently) not | |
898 | followed in this direction. |
|
906 | followed in this direction. | |
899 | """ |
|
907 | """ | |
900 | args = getargsdict(x, 'followlines', 'file *lines startrev descend') |
|
908 | args = getargsdict(x, 'followlines', 'file *lines startrev descend') | |
901 | if len(args['lines']) != 1: |
|
909 | if len(args['lines']) != 1: | |
902 | raise error.ParseError(_("followlines requires a line range")) |
|
910 | raise error.ParseError(_("followlines requires a line range")) | |
903 |
|
911 | |||
904 | rev = '.' |
|
912 | rev = '.' | |
905 | if 'startrev' in args: |
|
913 | if 'startrev' in args: | |
906 | revs = getset(repo, fullreposet(repo), args['startrev']) |
|
914 | revs = getset(repo, fullreposet(repo), args['startrev']) | |
907 | if len(revs) != 1: |
|
915 | if len(revs) != 1: | |
908 | raise error.ParseError( |
|
916 | raise error.ParseError( | |
909 | # i18n: "followlines" is a keyword |
|
917 | # i18n: "followlines" is a keyword | |
910 | _("followlines expects exactly one revision")) |
|
918 | _("followlines expects exactly one revision")) | |
911 | rev = revs.last() |
|
919 | rev = revs.last() | |
912 |
|
920 | |||
913 | pat = getstring(args['file'], _("followlines requires a pattern")) |
|
921 | pat = getstring(args['file'], _("followlines requires a pattern")) | |
914 | if not matchmod.patkind(pat): |
|
922 | if not matchmod.patkind(pat): | |
915 | fname = pathutil.canonpath(repo.root, repo.getcwd(), pat) |
|
923 | fname = pathutil.canonpath(repo.root, repo.getcwd(), pat) | |
916 | else: |
|
924 | else: | |
917 | m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=repo[rev]) |
|
925 | m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=repo[rev]) | |
918 | files = [f for f in repo[rev] if m(f)] |
|
926 | files = [f for f in repo[rev] if m(f)] | |
919 | if len(files) != 1: |
|
927 | if len(files) != 1: | |
920 | # i18n: "followlines" is a keyword |
|
928 | # i18n: "followlines" is a keyword | |
921 | raise error.ParseError(_("followlines expects exactly one file")) |
|
929 | raise error.ParseError(_("followlines expects exactly one file")) | |
922 | fname = files[0] |
|
930 | fname = files[0] | |
923 |
|
931 | |||
924 | # i18n: "followlines" is a keyword |
|
932 | # i18n: "followlines" is a keyword | |
925 | lr = getrange(args['lines'][0], _("followlines expects a line range")) |
|
933 | lr = getrange(args['lines'][0], _("followlines expects a line range")) | |
926 | fromline, toline = [getinteger(a, _("line range bounds must be integers")) |
|
934 | fromline, toline = [getinteger(a, _("line range bounds must be integers")) | |
927 | for a in lr] |
|
935 | for a in lr] | |
928 | fromline, toline = util.processlinerange(fromline, toline) |
|
936 | fromline, toline = util.processlinerange(fromline, toline) | |
929 |
|
937 | |||
930 | fctx = repo[rev].filectx(fname) |
|
938 | fctx = repo[rev].filectx(fname) | |
931 | descend = False |
|
939 | descend = False | |
932 | if 'descend' in args: |
|
940 | if 'descend' in args: | |
933 | descend = getboolean(args['descend'], |
|
941 | descend = getboolean(args['descend'], | |
934 | # i18n: "descend" is a keyword |
|
942 | # i18n: "descend" is a keyword | |
935 | _("descend argument must be a boolean")) |
|
943 | _("descend argument must be a boolean")) | |
936 | if descend: |
|
944 | if descend: | |
937 | rs = generatorset( |
|
945 | rs = generatorset( | |
938 | (c.rev() for c, _linerange |
|
946 | (c.rev() for c, _linerange | |
939 | in dagop.blockdescendants(fctx, fromline, toline)), |
|
947 | in dagop.blockdescendants(fctx, fromline, toline)), | |
940 | iterasc=True) |
|
948 | iterasc=True) | |
941 | else: |
|
949 | else: | |
942 | rs = generatorset( |
|
950 | rs = generatorset( | |
943 | (c.rev() for c, _linerange |
|
951 | (c.rev() for c, _linerange | |
944 | in dagop.blockancestors(fctx, fromline, toline)), |
|
952 | in dagop.blockancestors(fctx, fromline, toline)), | |
945 | iterasc=False) |
|
953 | iterasc=False) | |
946 | return subset & rs |
|
954 | return subset & rs | |
947 |
|
955 | |||
948 | @predicate('all()', safe=True) |
|
956 | @predicate('all()', safe=True) | |
949 | def getall(repo, subset, x): |
|
957 | def getall(repo, subset, x): | |
950 | """All changesets, the same as ``0:tip``. |
|
958 | """All changesets, the same as ``0:tip``. | |
951 | """ |
|
959 | """ | |
952 | # i18n: "all" is a keyword |
|
960 | # i18n: "all" is a keyword | |
953 | getargs(x, 0, 0, _("all takes no arguments")) |
|
961 | getargs(x, 0, 0, _("all takes no arguments")) | |
954 | return subset & spanset(repo) # drop "null" if any |
|
962 | return subset & spanset(repo) # drop "null" if any | |
955 |
|
963 | |||
956 | @predicate('grep(regex)') |
|
964 | @predicate('grep(regex)') | |
957 | def grep(repo, subset, x): |
|
965 | def grep(repo, subset, x): | |
958 | """Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')`` |
|
966 | """Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')`` | |
959 | to ensure special escape characters are handled correctly. Unlike |
|
967 | to ensure special escape characters are handled correctly. Unlike | |
960 | ``keyword(string)``, the match is case-sensitive. |
|
968 | ``keyword(string)``, the match is case-sensitive. | |
961 | """ |
|
969 | """ | |
962 | try: |
|
970 | try: | |
963 | # i18n: "grep" is a keyword |
|
971 | # i18n: "grep" is a keyword | |
964 | gr = re.compile(getstring(x, _("grep requires a string"))) |
|
972 | gr = re.compile(getstring(x, _("grep requires a string"))) | |
965 | except re.error as e: |
|
973 | except re.error as e: | |
966 | raise error.ParseError(_('invalid match pattern: %s') % e) |
|
974 | raise error.ParseError(_('invalid match pattern: %s') % e) | |
967 |
|
975 | |||
968 | def matches(x): |
|
976 | def matches(x): | |
969 | c = repo[x] |
|
977 | c = repo[x] | |
970 | for e in c.files() + [c.user(), c.description()]: |
|
978 | for e in c.files() + [c.user(), c.description()]: | |
971 | if gr.search(e): |
|
979 | if gr.search(e): | |
972 | return True |
|
980 | return True | |
973 | return False |
|
981 | return False | |
974 |
|
982 | |||
975 | return subset.filter(matches, condrepr=('<grep %r>', gr.pattern)) |
|
983 | return subset.filter(matches, condrepr=('<grep %r>', gr.pattern)) | |
976 |
|
984 | |||
977 | @predicate('_matchfiles', safe=True) |
|
985 | @predicate('_matchfiles', safe=True) | |
978 | def _matchfiles(repo, subset, x): |
|
986 | def _matchfiles(repo, subset, x): | |
979 | # _matchfiles takes a revset list of prefixed arguments: |
|
987 | # _matchfiles takes a revset list of prefixed arguments: | |
980 | # |
|
988 | # | |
981 | # [p:foo, i:bar, x:baz] |
|
989 | # [p:foo, i:bar, x:baz] | |
982 | # |
|
990 | # | |
983 | # builds a match object from them and filters subset. Allowed |
|
991 | # builds a match object from them and filters subset. Allowed | |
984 | # prefixes are 'p:' for regular patterns, 'i:' for include |
|
992 | # prefixes are 'p:' for regular patterns, 'i:' for include | |
985 | # patterns and 'x:' for exclude patterns. Use 'r:' prefix to pass |
|
993 | # patterns and 'x:' for exclude patterns. Use 'r:' prefix to pass | |
986 | # a revision identifier, or the empty string to reference the |
|
994 | # a revision identifier, or the empty string to reference the | |
987 | # working directory, from which the match object is |
|
995 | # working directory, from which the match object is | |
988 | # initialized. Use 'd:' to set the default matching mode, default |
|
996 | # initialized. Use 'd:' to set the default matching mode, default | |
989 | # to 'glob'. At most one 'r:' and 'd:' argument can be passed. |
|
997 | # to 'glob'. At most one 'r:' and 'd:' argument can be passed. | |
990 |
|
998 | |||
991 | l = getargs(x, 1, -1, "_matchfiles requires at least one argument") |
|
999 | l = getargs(x, 1, -1, "_matchfiles requires at least one argument") | |
992 | pats, inc, exc = [], [], [] |
|
1000 | pats, inc, exc = [], [], [] | |
993 | rev, default = None, None |
|
1001 | rev, default = None, None | |
994 | for arg in l: |
|
1002 | for arg in l: | |
995 | s = getstring(arg, "_matchfiles requires string arguments") |
|
1003 | s = getstring(arg, "_matchfiles requires string arguments") | |
996 | prefix, value = s[:2], s[2:] |
|
1004 | prefix, value = s[:2], s[2:] | |
997 | if prefix == 'p:': |
|
1005 | if prefix == 'p:': | |
998 | pats.append(value) |
|
1006 | pats.append(value) | |
999 | elif prefix == 'i:': |
|
1007 | elif prefix == 'i:': | |
1000 | inc.append(value) |
|
1008 | inc.append(value) | |
1001 | elif prefix == 'x:': |
|
1009 | elif prefix == 'x:': | |
1002 | exc.append(value) |
|
1010 | exc.append(value) | |
1003 | elif prefix == 'r:': |
|
1011 | elif prefix == 'r:': | |
1004 | if rev is not None: |
|
1012 | if rev is not None: | |
1005 | raise error.ParseError('_matchfiles expected at most one ' |
|
1013 | raise error.ParseError('_matchfiles expected at most one ' | |
1006 | 'revision') |
|
1014 | 'revision') | |
1007 | if value != '': # empty means working directory; leave rev as None |
|
1015 | if value != '': # empty means working directory; leave rev as None | |
1008 | rev = value |
|
1016 | rev = value | |
1009 | elif prefix == 'd:': |
|
1017 | elif prefix == 'd:': | |
1010 | if default is not None: |
|
1018 | if default is not None: | |
1011 | raise error.ParseError('_matchfiles expected at most one ' |
|
1019 | raise error.ParseError('_matchfiles expected at most one ' | |
1012 | 'default mode') |
|
1020 | 'default mode') | |
1013 | default = value |
|
1021 | default = value | |
1014 | else: |
|
1022 | else: | |
1015 | raise error.ParseError('invalid _matchfiles prefix: %s' % prefix) |
|
1023 | raise error.ParseError('invalid _matchfiles prefix: %s' % prefix) | |
1016 | if not default: |
|
1024 | if not default: | |
1017 | default = 'glob' |
|
1025 | default = 'glob' | |
1018 |
|
1026 | |||
1019 | m = matchmod.match(repo.root, repo.getcwd(), pats, include=inc, |
|
1027 | m = matchmod.match(repo.root, repo.getcwd(), pats, include=inc, | |
1020 | exclude=exc, ctx=repo[rev], default=default) |
|
1028 | exclude=exc, ctx=repo[rev], default=default) | |
1021 |
|
1029 | |||
1022 | # This directly read the changelog data as creating changectx for all |
|
1030 | # This directly read the changelog data as creating changectx for all | |
1023 | # revisions is quite expensive. |
|
1031 | # revisions is quite expensive. | |
1024 | getfiles = repo.changelog.readfiles |
|
1032 | getfiles = repo.changelog.readfiles | |
1025 | wdirrev = node.wdirrev |
|
1033 | wdirrev = node.wdirrev | |
1026 | def matches(x): |
|
1034 | def matches(x): | |
1027 | if x == wdirrev: |
|
1035 | if x == wdirrev: | |
1028 | files = repo[x].files() |
|
1036 | files = repo[x].files() | |
1029 | else: |
|
1037 | else: | |
1030 | files = getfiles(x) |
|
1038 | files = getfiles(x) | |
1031 | for f in files: |
|
1039 | for f in files: | |
1032 | if m(f): |
|
1040 | if m(f): | |
1033 | return True |
|
1041 | return True | |
1034 | return False |
|
1042 | return False | |
1035 |
|
1043 | |||
1036 | return subset.filter(matches, |
|
1044 | return subset.filter(matches, | |
1037 | condrepr=('<matchfiles patterns=%r, include=%r ' |
|
1045 | condrepr=('<matchfiles patterns=%r, include=%r ' | |
1038 | 'exclude=%r, default=%r, rev=%r>', |
|
1046 | 'exclude=%r, default=%r, rev=%r>', | |
1039 | pats, inc, exc, default, rev)) |
|
1047 | pats, inc, exc, default, rev)) | |
1040 |
|
1048 | |||
1041 | @predicate('file(pattern)', safe=True) |
|
1049 | @predicate('file(pattern)', safe=True) | |
1042 | def hasfile(repo, subset, x): |
|
1050 | def hasfile(repo, subset, x): | |
1043 | """Changesets affecting files matched by pattern. |
|
1051 | """Changesets affecting files matched by pattern. | |
1044 |
|
1052 | |||
1045 | For a faster but less accurate result, consider using ``filelog()`` |
|
1053 | For a faster but less accurate result, consider using ``filelog()`` | |
1046 | instead. |
|
1054 | instead. | |
1047 |
|
1055 | |||
1048 | This predicate uses ``glob:`` as the default kind of pattern. |
|
1056 | This predicate uses ``glob:`` as the default kind of pattern. | |
1049 | """ |
|
1057 | """ | |
1050 | # i18n: "file" is a keyword |
|
1058 | # i18n: "file" is a keyword | |
1051 | pat = getstring(x, _("file requires a pattern")) |
|
1059 | pat = getstring(x, _("file requires a pattern")) | |
1052 | return _matchfiles(repo, subset, ('string', 'p:' + pat)) |
|
1060 | return _matchfiles(repo, subset, ('string', 'p:' + pat)) | |
1053 |
|
1061 | |||
1054 | @predicate('head()', safe=True) |
|
1062 | @predicate('head()', safe=True) | |
1055 | def head(repo, subset, x): |
|
1063 | def head(repo, subset, x): | |
1056 | """Changeset is a named branch head. |
|
1064 | """Changeset is a named branch head. | |
1057 | """ |
|
1065 | """ | |
1058 | # i18n: "head" is a keyword |
|
1066 | # i18n: "head" is a keyword | |
1059 | getargs(x, 0, 0, _("head takes no arguments")) |
|
1067 | getargs(x, 0, 0, _("head takes no arguments")) | |
1060 | hs = set() |
|
1068 | hs = set() | |
1061 | cl = repo.changelog |
|
1069 | cl = repo.changelog | |
1062 | for ls in repo.branchmap().itervalues(): |
|
1070 | for ls in repo.branchmap().itervalues(): | |
1063 | hs.update(cl.rev(h) for h in ls) |
|
1071 | hs.update(cl.rev(h) for h in ls) | |
1064 | return subset & baseset(hs) |
|
1072 | return subset & baseset(hs) | |
1065 |
|
1073 | |||
1066 | @predicate('heads(set)', safe=True) |
|
1074 | @predicate('heads(set)', safe=True) | |
1067 | def heads(repo, subset, x): |
|
1075 | def heads(repo, subset, x): | |
1068 | """Members of set with no children in set. |
|
1076 | """Members of set with no children in set. | |
1069 | """ |
|
1077 | """ | |
1070 | s = getset(repo, subset, x) |
|
1078 | s = getset(repo, subset, x) | |
1071 | ps = parents(repo, subset, x) |
|
1079 | ps = parents(repo, subset, x) | |
1072 | return s - ps |
|
1080 | return s - ps | |
1073 |
|
1081 | |||
1074 | @predicate('hidden()', safe=True) |
|
1082 | @predicate('hidden()', safe=True) | |
1075 | def hidden(repo, subset, x): |
|
1083 | def hidden(repo, subset, x): | |
1076 | """Hidden changesets. |
|
1084 | """Hidden changesets. | |
1077 | """ |
|
1085 | """ | |
1078 | # i18n: "hidden" is a keyword |
|
1086 | # i18n: "hidden" is a keyword | |
1079 | getargs(x, 0, 0, _("hidden takes no arguments")) |
|
1087 | getargs(x, 0, 0, _("hidden takes no arguments")) | |
1080 | hiddenrevs = repoview.filterrevs(repo, 'visible') |
|
1088 | hiddenrevs = repoview.filterrevs(repo, 'visible') | |
1081 | return subset & hiddenrevs |
|
1089 | return subset & hiddenrevs | |
1082 |
|
1090 | |||
1083 | @predicate('keyword(string)', safe=True) |
|
1091 | @predicate('keyword(string)', safe=True) | |
1084 | def keyword(repo, subset, x): |
|
1092 | def keyword(repo, subset, x): | |
1085 | """Search commit message, user name, and names of changed files for |
|
1093 | """Search commit message, user name, and names of changed files for | |
1086 | string. The match is case-insensitive. |
|
1094 | string. The match is case-insensitive. | |
1087 |
|
1095 | |||
1088 | For a regular expression or case sensitive search of these fields, use |
|
1096 | For a regular expression or case sensitive search of these fields, use | |
1089 | ``grep(regex)``. |
|
1097 | ``grep(regex)``. | |
1090 | """ |
|
1098 | """ | |
1091 | # i18n: "keyword" is a keyword |
|
1099 | # i18n: "keyword" is a keyword | |
1092 | kw = encoding.lower(getstring(x, _("keyword requires a string"))) |
|
1100 | kw = encoding.lower(getstring(x, _("keyword requires a string"))) | |
1093 |
|
1101 | |||
1094 | def matches(r): |
|
1102 | def matches(r): | |
1095 | c = repo[r] |
|
1103 | c = repo[r] | |
1096 | return any(kw in encoding.lower(t) |
|
1104 | return any(kw in encoding.lower(t) | |
1097 | for t in c.files() + [c.user(), c.description()]) |
|
1105 | for t in c.files() + [c.user(), c.description()]) | |
1098 |
|
1106 | |||
1099 | return subset.filter(matches, condrepr=('<keyword %r>', kw)) |
|
1107 | return subset.filter(matches, condrepr=('<keyword %r>', kw)) | |
1100 |
|
1108 | |||
1101 | @predicate('limit(set[, n[, offset]])', safe=True, takeorder=True) |
|
1109 | @predicate('limit(set[, n[, offset]])', safe=True, takeorder=True) | |
1102 | def limit(repo, subset, x, order): |
|
1110 | def limit(repo, subset, x, order): | |
1103 | """First n members of set, defaulting to 1, starting from offset. |
|
1111 | """First n members of set, defaulting to 1, starting from offset. | |
1104 | """ |
|
1112 | """ | |
1105 | args = getargsdict(x, 'limit', 'set n offset') |
|
1113 | args = getargsdict(x, 'limit', 'set n offset') | |
1106 | if 'set' not in args: |
|
1114 | if 'set' not in args: | |
1107 | # i18n: "limit" is a keyword |
|
1115 | # i18n: "limit" is a keyword | |
1108 | raise error.ParseError(_("limit requires one to three arguments")) |
|
1116 | raise error.ParseError(_("limit requires one to three arguments")) | |
1109 | # i18n: "limit" is a keyword |
|
1117 | # i18n: "limit" is a keyword | |
1110 | lim = getinteger(args.get('n'), _("limit expects a number"), default=1) |
|
1118 | lim = getinteger(args.get('n'), _("limit expects a number"), default=1) | |
1111 | if lim < 0: |
|
1119 | if lim < 0: | |
1112 | raise error.ParseError(_("negative number to select")) |
|
1120 | raise error.ParseError(_("negative number to select")) | |
1113 | # i18n: "limit" is a keyword |
|
1121 | # i18n: "limit" is a keyword | |
1114 | ofs = getinteger(args.get('offset'), _("limit expects a number"), default=0) |
|
1122 | ofs = getinteger(args.get('offset'), _("limit expects a number"), default=0) | |
1115 | if ofs < 0: |
|
1123 | if ofs < 0: | |
1116 | raise error.ParseError(_("negative offset")) |
|
1124 | raise error.ParseError(_("negative offset")) | |
1117 | os = getset(repo, fullreposet(repo), args['set']) |
|
1125 | os = getset(repo, fullreposet(repo), args['set']) | |
1118 | ls = os.slice(ofs, ofs + lim) |
|
1126 | ls = os.slice(ofs, ofs + lim) | |
1119 | if order == followorder and lim > 1: |
|
1127 | if order == followorder and lim > 1: | |
1120 | return subset & ls |
|
1128 | return subset & ls | |
1121 | return ls & subset |
|
1129 | return ls & subset | |
1122 |
|
1130 | |||
1123 | @predicate('last(set, [n])', safe=True, takeorder=True) |
|
1131 | @predicate('last(set, [n])', safe=True, takeorder=True) | |
1124 | def last(repo, subset, x, order): |
|
1132 | def last(repo, subset, x, order): | |
1125 | """Last n members of set, defaulting to 1. |
|
1133 | """Last n members of set, defaulting to 1. | |
1126 | """ |
|
1134 | """ | |
1127 | # i18n: "last" is a keyword |
|
1135 | # i18n: "last" is a keyword | |
1128 | l = getargs(x, 1, 2, _("last requires one or two arguments")) |
|
1136 | l = getargs(x, 1, 2, _("last requires one or two arguments")) | |
1129 | lim = 1 |
|
1137 | lim = 1 | |
1130 | if len(l) == 2: |
|
1138 | if len(l) == 2: | |
1131 | # i18n: "last" is a keyword |
|
1139 | # i18n: "last" is a keyword | |
1132 | lim = getinteger(l[1], _("last expects a number")) |
|
1140 | lim = getinteger(l[1], _("last expects a number")) | |
1133 | if lim < 0: |
|
1141 | if lim < 0: | |
1134 | raise error.ParseError(_("negative number to select")) |
|
1142 | raise error.ParseError(_("negative number to select")) | |
1135 | os = getset(repo, fullreposet(repo), l[0]) |
|
1143 | os = getset(repo, fullreposet(repo), l[0]) | |
1136 | os.reverse() |
|
1144 | os.reverse() | |
1137 | ls = os.slice(0, lim) |
|
1145 | ls = os.slice(0, lim) | |
1138 | if order == followorder and lim > 1: |
|
1146 | if order == followorder and lim > 1: | |
1139 | return subset & ls |
|
1147 | return subset & ls | |
1140 | ls.reverse() |
|
1148 | ls.reverse() | |
1141 | return ls & subset |
|
1149 | return ls & subset | |
1142 |
|
1150 | |||
1143 | @predicate('max(set)', safe=True) |
|
1151 | @predicate('max(set)', safe=True) | |
1144 | def maxrev(repo, subset, x): |
|
1152 | def maxrev(repo, subset, x): | |
1145 | """Changeset with highest revision number in set. |
|
1153 | """Changeset with highest revision number in set. | |
1146 | """ |
|
1154 | """ | |
1147 | os = getset(repo, fullreposet(repo), x) |
|
1155 | os = getset(repo, fullreposet(repo), x) | |
1148 | try: |
|
1156 | try: | |
1149 | m = os.max() |
|
1157 | m = os.max() | |
1150 | if m in subset: |
|
1158 | if m in subset: | |
1151 | return baseset([m], datarepr=('<max %r, %r>', subset, os)) |
|
1159 | return baseset([m], datarepr=('<max %r, %r>', subset, os)) | |
1152 | except ValueError: |
|
1160 | except ValueError: | |
1153 | # os.max() throws a ValueError when the collection is empty. |
|
1161 | # os.max() throws a ValueError when the collection is empty. | |
1154 | # Same as python's max(). |
|
1162 | # Same as python's max(). | |
1155 | pass |
|
1163 | pass | |
1156 | return baseset(datarepr=('<max %r, %r>', subset, os)) |
|
1164 | return baseset(datarepr=('<max %r, %r>', subset, os)) | |
1157 |
|
1165 | |||
1158 | @predicate('merge()', safe=True) |
|
1166 | @predicate('merge()', safe=True) | |
1159 | def merge(repo, subset, x): |
|
1167 | def merge(repo, subset, x): | |
1160 | """Changeset is a merge changeset. |
|
1168 | """Changeset is a merge changeset. | |
1161 | """ |
|
1169 | """ | |
1162 | # i18n: "merge" is a keyword |
|
1170 | # i18n: "merge" is a keyword | |
1163 | getargs(x, 0, 0, _("merge takes no arguments")) |
|
1171 | getargs(x, 0, 0, _("merge takes no arguments")) | |
1164 | cl = repo.changelog |
|
1172 | cl = repo.changelog | |
1165 | return subset.filter(lambda r: cl.parentrevs(r)[1] != -1, |
|
1173 | return subset.filter(lambda r: cl.parentrevs(r)[1] != -1, | |
1166 | condrepr='<merge>') |
|
1174 | condrepr='<merge>') | |
1167 |
|
1175 | |||
1168 | @predicate('branchpoint()', safe=True) |
|
1176 | @predicate('branchpoint()', safe=True) | |
1169 | def branchpoint(repo, subset, x): |
|
1177 | def branchpoint(repo, subset, x): | |
1170 | """Changesets with more than one child. |
|
1178 | """Changesets with more than one child. | |
1171 | """ |
|
1179 | """ | |
1172 | # i18n: "branchpoint" is a keyword |
|
1180 | # i18n: "branchpoint" is a keyword | |
1173 | getargs(x, 0, 0, _("branchpoint takes no arguments")) |
|
1181 | getargs(x, 0, 0, _("branchpoint takes no arguments")) | |
1174 | cl = repo.changelog |
|
1182 | cl = repo.changelog | |
1175 | if not subset: |
|
1183 | if not subset: | |
1176 | return baseset() |
|
1184 | return baseset() | |
1177 | # XXX this should be 'parentset.min()' assuming 'parentset' is a smartset |
|
1185 | # XXX this should be 'parentset.min()' assuming 'parentset' is a smartset | |
1178 | # (and if it is not, it should.) |
|
1186 | # (and if it is not, it should.) | |
1179 | baserev = min(subset) |
|
1187 | baserev = min(subset) | |
1180 | parentscount = [0]*(len(repo) - baserev) |
|
1188 | parentscount = [0]*(len(repo) - baserev) | |
1181 | for r in cl.revs(start=baserev + 1): |
|
1189 | for r in cl.revs(start=baserev + 1): | |
1182 | for p in cl.parentrevs(r): |
|
1190 | for p in cl.parentrevs(r): | |
1183 | if p >= baserev: |
|
1191 | if p >= baserev: | |
1184 | parentscount[p - baserev] += 1 |
|
1192 | parentscount[p - baserev] += 1 | |
1185 | return subset.filter(lambda r: parentscount[r - baserev] > 1, |
|
1193 | return subset.filter(lambda r: parentscount[r - baserev] > 1, | |
1186 | condrepr='<branchpoint>') |
|
1194 | condrepr='<branchpoint>') | |
1187 |
|
1195 | |||
1188 | @predicate('min(set)', safe=True) |
|
1196 | @predicate('min(set)', safe=True) | |
1189 | def minrev(repo, subset, x): |
|
1197 | def minrev(repo, subset, x): | |
1190 | """Changeset with lowest revision number in set. |
|
1198 | """Changeset with lowest revision number in set. | |
1191 | """ |
|
1199 | """ | |
1192 | os = getset(repo, fullreposet(repo), x) |
|
1200 | os = getset(repo, fullreposet(repo), x) | |
1193 | try: |
|
1201 | try: | |
1194 | m = os.min() |
|
1202 | m = os.min() | |
1195 | if m in subset: |
|
1203 | if m in subset: | |
1196 | return baseset([m], datarepr=('<min %r, %r>', subset, os)) |
|
1204 | return baseset([m], datarepr=('<min %r, %r>', subset, os)) | |
1197 | except ValueError: |
|
1205 | except ValueError: | |
1198 | # os.min() throws a ValueError when the collection is empty. |
|
1206 | # os.min() throws a ValueError when the collection is empty. | |
1199 | # Same as python's min(). |
|
1207 | # Same as python's min(). | |
1200 | pass |
|
1208 | pass | |
1201 | return baseset(datarepr=('<min %r, %r>', subset, os)) |
|
1209 | return baseset(datarepr=('<min %r, %r>', subset, os)) | |
1202 |
|
1210 | |||
1203 | @predicate('modifies(pattern)', safe=True) |
|
1211 | @predicate('modifies(pattern)', safe=True) | |
1204 | def modifies(repo, subset, x): |
|
1212 | def modifies(repo, subset, x): | |
1205 | """Changesets modifying files matched by pattern. |
|
1213 | """Changesets modifying files matched by pattern. | |
1206 |
|
1214 | |||
1207 | The pattern without explicit kind like ``glob:`` is expected to be |
|
1215 | The pattern without explicit kind like ``glob:`` is expected to be | |
1208 | relative to the current directory and match against a file or a |
|
1216 | relative to the current directory and match against a file or a | |
1209 | directory. |
|
1217 | directory. | |
1210 | """ |
|
1218 | """ | |
1211 | # i18n: "modifies" is a keyword |
|
1219 | # i18n: "modifies" is a keyword | |
1212 | pat = getstring(x, _("modifies requires a pattern")) |
|
1220 | pat = getstring(x, _("modifies requires a pattern")) | |
1213 | return checkstatus(repo, subset, pat, 0) |
|
1221 | return checkstatus(repo, subset, pat, 0) | |
1214 |
|
1222 | |||
1215 | @predicate('named(namespace)') |
|
1223 | @predicate('named(namespace)') | |
1216 | def named(repo, subset, x): |
|
1224 | def named(repo, subset, x): | |
1217 | """The changesets in a given namespace. |
|
1225 | """The changesets in a given namespace. | |
1218 |
|
1226 | |||
1219 | Pattern matching is supported for `namespace`. See |
|
1227 | Pattern matching is supported for `namespace`. See | |
1220 | :hg:`help revisions.patterns`. |
|
1228 | :hg:`help revisions.patterns`. | |
1221 | """ |
|
1229 | """ | |
1222 | # i18n: "named" is a keyword |
|
1230 | # i18n: "named" is a keyword | |
1223 | args = getargs(x, 1, 1, _('named requires a namespace argument')) |
|
1231 | args = getargs(x, 1, 1, _('named requires a namespace argument')) | |
1224 |
|
1232 | |||
1225 | ns = getstring(args[0], |
|
1233 | ns = getstring(args[0], | |
1226 | # i18n: "named" is a keyword |
|
1234 | # i18n: "named" is a keyword | |
1227 | _('the argument to named must be a string')) |
|
1235 | _('the argument to named must be a string')) | |
1228 | kind, pattern, matcher = util.stringmatcher(ns) |
|
1236 | kind, pattern, matcher = util.stringmatcher(ns) | |
1229 | namespaces = set() |
|
1237 | namespaces = set() | |
1230 | if kind == 'literal': |
|
1238 | if kind == 'literal': | |
1231 | if pattern not in repo.names: |
|
1239 | if pattern not in repo.names: | |
1232 | raise error.RepoLookupError(_("namespace '%s' does not exist") |
|
1240 | raise error.RepoLookupError(_("namespace '%s' does not exist") | |
1233 | % ns) |
|
1241 | % ns) | |
1234 | namespaces.add(repo.names[pattern]) |
|
1242 | namespaces.add(repo.names[pattern]) | |
1235 | else: |
|
1243 | else: | |
1236 | for name, ns in repo.names.iteritems(): |
|
1244 | for name, ns in repo.names.iteritems(): | |
1237 | if matcher(name): |
|
1245 | if matcher(name): | |
1238 | namespaces.add(ns) |
|
1246 | namespaces.add(ns) | |
1239 | if not namespaces: |
|
1247 | if not namespaces: | |
1240 | raise error.RepoLookupError(_("no namespace exists" |
|
1248 | raise error.RepoLookupError(_("no namespace exists" | |
1241 | " that match '%s'") % pattern) |
|
1249 | " that match '%s'") % pattern) | |
1242 |
|
1250 | |||
1243 | names = set() |
|
1251 | names = set() | |
1244 | for ns in namespaces: |
|
1252 | for ns in namespaces: | |
1245 | for name in ns.listnames(repo): |
|
1253 | for name in ns.listnames(repo): | |
1246 | if name not in ns.deprecated: |
|
1254 | if name not in ns.deprecated: | |
1247 | names.update(repo[n].rev() for n in ns.nodes(repo, name)) |
|
1255 | names.update(repo[n].rev() for n in ns.nodes(repo, name)) | |
1248 |
|
1256 | |||
1249 | names -= {node.nullrev} |
|
1257 | names -= {node.nullrev} | |
1250 | return subset & names |
|
1258 | return subset & names | |
1251 |
|
1259 | |||
1252 | @predicate('id(string)', safe=True) |
|
1260 | @predicate('id(string)', safe=True) | |
1253 | def node_(repo, subset, x): |
|
1261 | def node_(repo, subset, x): | |
1254 | """Revision non-ambiguously specified by the given hex string prefix. |
|
1262 | """Revision non-ambiguously specified by the given hex string prefix. | |
1255 | """ |
|
1263 | """ | |
1256 | # i18n: "id" is a keyword |
|
1264 | # i18n: "id" is a keyword | |
1257 | l = getargs(x, 1, 1, _("id requires one argument")) |
|
1265 | l = getargs(x, 1, 1, _("id requires one argument")) | |
1258 | # i18n: "id" is a keyword |
|
1266 | # i18n: "id" is a keyword | |
1259 | n = getstring(l[0], _("id requires a string")) |
|
1267 | n = getstring(l[0], _("id requires a string")) | |
1260 | if len(n) == 40: |
|
1268 | if len(n) == 40: | |
1261 | try: |
|
1269 | try: | |
1262 | rn = repo.changelog.rev(node.bin(n)) |
|
1270 | rn = repo.changelog.rev(node.bin(n)) | |
1263 | except error.WdirUnsupported: |
|
1271 | except error.WdirUnsupported: | |
1264 | rn = node.wdirrev |
|
1272 | rn = node.wdirrev | |
1265 | except (LookupError, TypeError): |
|
1273 | except (LookupError, TypeError): | |
1266 | rn = None |
|
1274 | rn = None | |
1267 | else: |
|
1275 | else: | |
1268 | rn = None |
|
1276 | rn = None | |
1269 | try: |
|
1277 | try: | |
1270 | pm = repo.changelog._partialmatch(n) |
|
1278 | pm = repo.changelog._partialmatch(n) | |
1271 | if pm is not None: |
|
1279 | if pm is not None: | |
1272 | rn = repo.changelog.rev(pm) |
|
1280 | rn = repo.changelog.rev(pm) | |
1273 | except error.WdirUnsupported: |
|
1281 | except error.WdirUnsupported: | |
1274 | rn = node.wdirrev |
|
1282 | rn = node.wdirrev | |
1275 |
|
1283 | |||
1276 | if rn is None: |
|
1284 | if rn is None: | |
1277 | return baseset() |
|
1285 | return baseset() | |
1278 | result = baseset([rn]) |
|
1286 | result = baseset([rn]) | |
1279 | return result & subset |
|
1287 | return result & subset | |
1280 |
|
1288 | |||
1281 | @predicate('obsolete()', safe=True) |
|
1289 | @predicate('obsolete()', safe=True) | |
1282 | def obsolete(repo, subset, x): |
|
1290 | def obsolete(repo, subset, x): | |
1283 | """Mutable changeset with a newer version.""" |
|
1291 | """Mutable changeset with a newer version.""" | |
1284 | # i18n: "obsolete" is a keyword |
|
1292 | # i18n: "obsolete" is a keyword | |
1285 | getargs(x, 0, 0, _("obsolete takes no arguments")) |
|
1293 | getargs(x, 0, 0, _("obsolete takes no arguments")) | |
1286 | obsoletes = obsmod.getrevs(repo, 'obsolete') |
|
1294 | obsoletes = obsmod.getrevs(repo, 'obsolete') | |
1287 | return subset & obsoletes |
|
1295 | return subset & obsoletes | |
1288 |
|
1296 | |||
1289 | @predicate('only(set, [set])', safe=True) |
|
1297 | @predicate('only(set, [set])', safe=True) | |
1290 | def only(repo, subset, x): |
|
1298 | def only(repo, subset, x): | |
1291 | """Changesets that are ancestors of the first set that are not ancestors |
|
1299 | """Changesets that are ancestors of the first set that are not ancestors | |
1292 | of any other head in the repo. If a second set is specified, the result |
|
1300 | of any other head in the repo. If a second set is specified, the result | |
1293 | is ancestors of the first set that are not ancestors of the second set |
|
1301 | is ancestors of the first set that are not ancestors of the second set | |
1294 | (i.e. ::<set1> - ::<set2>). |
|
1302 | (i.e. ::<set1> - ::<set2>). | |
1295 | """ |
|
1303 | """ | |
1296 | cl = repo.changelog |
|
1304 | cl = repo.changelog | |
1297 | # i18n: "only" is a keyword |
|
1305 | # i18n: "only" is a keyword | |
1298 | args = getargs(x, 1, 2, _('only takes one or two arguments')) |
|
1306 | args = getargs(x, 1, 2, _('only takes one or two arguments')) | |
1299 | include = getset(repo, fullreposet(repo), args[0]) |
|
1307 | include = getset(repo, fullreposet(repo), args[0]) | |
1300 | if len(args) == 1: |
|
1308 | if len(args) == 1: | |
1301 | if not include: |
|
1309 | if not include: | |
1302 | return baseset() |
|
1310 | return baseset() | |
1303 |
|
1311 | |||
1304 | descendants = set(dagop.revdescendants(repo, include, False)) |
|
1312 | descendants = set(dagop.revdescendants(repo, include, False)) | |
1305 | exclude = [rev for rev in cl.headrevs() |
|
1313 | exclude = [rev for rev in cl.headrevs() | |
1306 | if not rev in descendants and not rev in include] |
|
1314 | if not rev in descendants and not rev in include] | |
1307 | else: |
|
1315 | else: | |
1308 | exclude = getset(repo, fullreposet(repo), args[1]) |
|
1316 | exclude = getset(repo, fullreposet(repo), args[1]) | |
1309 |
|
1317 | |||
1310 | results = set(cl.findmissingrevs(common=exclude, heads=include)) |
|
1318 | results = set(cl.findmissingrevs(common=exclude, heads=include)) | |
1311 | # XXX we should turn this into a baseset instead of a set, smartset may do |
|
1319 | # XXX we should turn this into a baseset instead of a set, smartset may do | |
1312 | # some optimizations from the fact this is a baseset. |
|
1320 | # some optimizations from the fact this is a baseset. | |
1313 | return subset & results |
|
1321 | return subset & results | |
1314 |
|
1322 | |||
1315 | @predicate('origin([set])', safe=True) |
|
1323 | @predicate('origin([set])', safe=True) | |
1316 | def origin(repo, subset, x): |
|
1324 | def origin(repo, subset, x): | |
1317 | """ |
|
1325 | """ | |
1318 | Changesets that were specified as a source for the grafts, transplants or |
|
1326 | Changesets that were specified as a source for the grafts, transplants or | |
1319 | rebases that created the given revisions. Omitting the optional set is the |
|
1327 | rebases that created the given revisions. Omitting the optional set is the | |
1320 | same as passing all(). If a changeset created by these operations is itself |
|
1328 | same as passing all(). If a changeset created by these operations is itself | |
1321 | specified as a source for one of these operations, only the source changeset |
|
1329 | specified as a source for one of these operations, only the source changeset | |
1322 | for the first operation is selected. |
|
1330 | for the first operation is selected. | |
1323 | """ |
|
1331 | """ | |
1324 | if x is not None: |
|
1332 | if x is not None: | |
1325 | dests = getset(repo, fullreposet(repo), x) |
|
1333 | dests = getset(repo, fullreposet(repo), x) | |
1326 | else: |
|
1334 | else: | |
1327 | dests = fullreposet(repo) |
|
1335 | dests = fullreposet(repo) | |
1328 |
|
1336 | |||
1329 | def _firstsrc(rev): |
|
1337 | def _firstsrc(rev): | |
1330 | src = _getrevsource(repo, rev) |
|
1338 | src = _getrevsource(repo, rev) | |
1331 | if src is None: |
|
1339 | if src is None: | |
1332 | return None |
|
1340 | return None | |
1333 |
|
1341 | |||
1334 | while True: |
|
1342 | while True: | |
1335 | prev = _getrevsource(repo, src) |
|
1343 | prev = _getrevsource(repo, src) | |
1336 |
|
1344 | |||
1337 | if prev is None: |
|
1345 | if prev is None: | |
1338 | return src |
|
1346 | return src | |
1339 | src = prev |
|
1347 | src = prev | |
1340 |
|
1348 | |||
1341 | o = {_firstsrc(r) for r in dests} |
|
1349 | o = {_firstsrc(r) for r in dests} | |
1342 | o -= {None} |
|
1350 | o -= {None} | |
1343 | # XXX we should turn this into a baseset instead of a set, smartset may do |
|
1351 | # XXX we should turn this into a baseset instead of a set, smartset may do | |
1344 | # some optimizations from the fact this is a baseset. |
|
1352 | # some optimizations from the fact this is a baseset. | |
1345 | return subset & o |
|
1353 | return subset & o | |
1346 |
|
1354 | |||
1347 | @predicate('outgoing([path])', safe=False) |
|
1355 | @predicate('outgoing([path])', safe=False) | |
1348 | def outgoing(repo, subset, x): |
|
1356 | def outgoing(repo, subset, x): | |
1349 | """Changesets not found in the specified destination repository, or the |
|
1357 | """Changesets not found in the specified destination repository, or the | |
1350 | default push location. |
|
1358 | default push location. | |
1351 | """ |
|
1359 | """ | |
1352 | # Avoid cycles. |
|
1360 | # Avoid cycles. | |
1353 | from . import ( |
|
1361 | from . import ( | |
1354 | discovery, |
|
1362 | discovery, | |
1355 | hg, |
|
1363 | hg, | |
1356 | ) |
|
1364 | ) | |
1357 | # i18n: "outgoing" is a keyword |
|
1365 | # i18n: "outgoing" is a keyword | |
1358 | l = getargs(x, 0, 1, _("outgoing takes one or no arguments")) |
|
1366 | l = getargs(x, 0, 1, _("outgoing takes one or no arguments")) | |
1359 | # i18n: "outgoing" is a keyword |
|
1367 | # i18n: "outgoing" is a keyword | |
1360 | dest = l and getstring(l[0], _("outgoing requires a repository path")) or '' |
|
1368 | dest = l and getstring(l[0], _("outgoing requires a repository path")) or '' | |
1361 | dest = repo.ui.expandpath(dest or 'default-push', dest or 'default') |
|
1369 | dest = repo.ui.expandpath(dest or 'default-push', dest or 'default') | |
1362 | dest, branches = hg.parseurl(dest) |
|
1370 | dest, branches = hg.parseurl(dest) | |
1363 | revs, checkout = hg.addbranchrevs(repo, repo, branches, []) |
|
1371 | revs, checkout = hg.addbranchrevs(repo, repo, branches, []) | |
1364 | if revs: |
|
1372 | if revs: | |
1365 | revs = [repo.lookup(rev) for rev in revs] |
|
1373 | revs = [repo.lookup(rev) for rev in revs] | |
1366 | other = hg.peer(repo, {}, dest) |
|
1374 | other = hg.peer(repo, {}, dest) | |
1367 | repo.ui.pushbuffer() |
|
1375 | repo.ui.pushbuffer() | |
1368 | outgoing = discovery.findcommonoutgoing(repo, other, onlyheads=revs) |
|
1376 | outgoing = discovery.findcommonoutgoing(repo, other, onlyheads=revs) | |
1369 | repo.ui.popbuffer() |
|
1377 | repo.ui.popbuffer() | |
1370 | cl = repo.changelog |
|
1378 | cl = repo.changelog | |
1371 | o = {cl.rev(r) for r in outgoing.missing} |
|
1379 | o = {cl.rev(r) for r in outgoing.missing} | |
1372 | return subset & o |
|
1380 | return subset & o | |
1373 |
|
1381 | |||
1374 | @predicate('p1([set])', safe=True) |
|
1382 | @predicate('p1([set])', safe=True) | |
1375 | def p1(repo, subset, x): |
|
1383 | def p1(repo, subset, x): | |
1376 | """First parent of changesets in set, or the working directory. |
|
1384 | """First parent of changesets in set, or the working directory. | |
1377 | """ |
|
1385 | """ | |
1378 | if x is None: |
|
1386 | if x is None: | |
1379 | p = repo[x].p1().rev() |
|
1387 | p = repo[x].p1().rev() | |
1380 | if p >= 0: |
|
1388 | if p >= 0: | |
1381 | return subset & baseset([p]) |
|
1389 | return subset & baseset([p]) | |
1382 | return baseset() |
|
1390 | return baseset() | |
1383 |
|
1391 | |||
1384 | ps = set() |
|
1392 | ps = set() | |
1385 | cl = repo.changelog |
|
1393 | cl = repo.changelog | |
1386 | for r in getset(repo, fullreposet(repo), x): |
|
1394 | for r in getset(repo, fullreposet(repo), x): | |
1387 | try: |
|
1395 | try: | |
1388 | ps.add(cl.parentrevs(r)[0]) |
|
1396 | ps.add(cl.parentrevs(r)[0]) | |
1389 | except error.WdirUnsupported: |
|
1397 | except error.WdirUnsupported: | |
1390 | ps.add(repo[r].parents()[0].rev()) |
|
1398 | ps.add(repo[r].parents()[0].rev()) | |
1391 | ps -= {node.nullrev} |
|
1399 | ps -= {node.nullrev} | |
1392 | # XXX we should turn this into a baseset instead of a set, smartset may do |
|
1400 | # XXX we should turn this into a baseset instead of a set, smartset may do | |
1393 | # some optimizations from the fact this is a baseset. |
|
1401 | # some optimizations from the fact this is a baseset. | |
1394 | return subset & ps |
|
1402 | return subset & ps | |
1395 |
|
1403 | |||
1396 | @predicate('p2([set])', safe=True) |
|
1404 | @predicate('p2([set])', safe=True) | |
1397 | def p2(repo, subset, x): |
|
1405 | def p2(repo, subset, x): | |
1398 | """Second parent of changesets in set, or the working directory. |
|
1406 | """Second parent of changesets in set, or the working directory. | |
1399 | """ |
|
1407 | """ | |
1400 | if x is None: |
|
1408 | if x is None: | |
1401 | ps = repo[x].parents() |
|
1409 | ps = repo[x].parents() | |
1402 | try: |
|
1410 | try: | |
1403 | p = ps[1].rev() |
|
1411 | p = ps[1].rev() | |
1404 | if p >= 0: |
|
1412 | if p >= 0: | |
1405 | return subset & baseset([p]) |
|
1413 | return subset & baseset([p]) | |
1406 | return baseset() |
|
1414 | return baseset() | |
1407 | except IndexError: |
|
1415 | except IndexError: | |
1408 | return baseset() |
|
1416 | return baseset() | |
1409 |
|
1417 | |||
1410 | ps = set() |
|
1418 | ps = set() | |
1411 | cl = repo.changelog |
|
1419 | cl = repo.changelog | |
1412 | for r in getset(repo, fullreposet(repo), x): |
|
1420 | for r in getset(repo, fullreposet(repo), x): | |
1413 | try: |
|
1421 | try: | |
1414 | ps.add(cl.parentrevs(r)[1]) |
|
1422 | ps.add(cl.parentrevs(r)[1]) | |
1415 | except error.WdirUnsupported: |
|
1423 | except error.WdirUnsupported: | |
1416 | parents = repo[r].parents() |
|
1424 | parents = repo[r].parents() | |
1417 | if len(parents) == 2: |
|
1425 | if len(parents) == 2: | |
1418 | ps.add(parents[1]) |
|
1426 | ps.add(parents[1]) | |
1419 | ps -= {node.nullrev} |
|
1427 | ps -= {node.nullrev} | |
1420 | # XXX we should turn this into a baseset instead of a set, smartset may do |
|
1428 | # XXX we should turn this into a baseset instead of a set, smartset may do | |
1421 | # some optimizations from the fact this is a baseset. |
|
1429 | # some optimizations from the fact this is a baseset. | |
1422 | return subset & ps |
|
1430 | return subset & ps | |
1423 |
|
1431 | |||
1424 | def parentpost(repo, subset, x, order): |
|
1432 | def parentpost(repo, subset, x, order): | |
1425 | return p1(repo, subset, x) |
|
1433 | return p1(repo, subset, x) | |
1426 |
|
1434 | |||
1427 | @predicate('parents([set])', safe=True) |
|
1435 | @predicate('parents([set])', safe=True) | |
1428 | def parents(repo, subset, x): |
|
1436 | def parents(repo, subset, x): | |
1429 | """ |
|
1437 | """ | |
1430 | The set of all parents for all changesets in set, or the working directory. |
|
1438 | The set of all parents for all changesets in set, or the working directory. | |
1431 | """ |
|
1439 | """ | |
1432 | if x is None: |
|
1440 | if x is None: | |
1433 | ps = set(p.rev() for p in repo[x].parents()) |
|
1441 | ps = set(p.rev() for p in repo[x].parents()) | |
1434 | else: |
|
1442 | else: | |
1435 | ps = set() |
|
1443 | ps = set() | |
1436 | cl = repo.changelog |
|
1444 | cl = repo.changelog | |
1437 | up = ps.update |
|
1445 | up = ps.update | |
1438 | parentrevs = cl.parentrevs |
|
1446 | parentrevs = cl.parentrevs | |
1439 | for r in getset(repo, fullreposet(repo), x): |
|
1447 | for r in getset(repo, fullreposet(repo), x): | |
1440 | try: |
|
1448 | try: | |
1441 | up(parentrevs(r)) |
|
1449 | up(parentrevs(r)) | |
1442 | except error.WdirUnsupported: |
|
1450 | except error.WdirUnsupported: | |
1443 | up(p.rev() for p in repo[r].parents()) |
|
1451 | up(p.rev() for p in repo[r].parents()) | |
1444 | ps -= {node.nullrev} |
|
1452 | ps -= {node.nullrev} | |
1445 | return subset & ps |
|
1453 | return subset & ps | |
1446 |
|
1454 | |||
1447 | def _phase(repo, subset, *targets): |
|
1455 | def _phase(repo, subset, *targets): | |
1448 | """helper to select all rev in <targets> phases""" |
|
1456 | """helper to select all rev in <targets> phases""" | |
1449 | s = repo._phasecache.getrevset(repo, targets) |
|
1457 | s = repo._phasecache.getrevset(repo, targets) | |
1450 | return subset & s |
|
1458 | return subset & s | |
1451 |
|
1459 | |||
1452 | @predicate('draft()', safe=True) |
|
1460 | @predicate('draft()', safe=True) | |
1453 | def draft(repo, subset, x): |
|
1461 | def draft(repo, subset, x): | |
1454 | """Changeset in draft phase.""" |
|
1462 | """Changeset in draft phase.""" | |
1455 | # i18n: "draft" is a keyword |
|
1463 | # i18n: "draft" is a keyword | |
1456 | getargs(x, 0, 0, _("draft takes no arguments")) |
|
1464 | getargs(x, 0, 0, _("draft takes no arguments")) | |
1457 | target = phases.draft |
|
1465 | target = phases.draft | |
1458 | return _phase(repo, subset, target) |
|
1466 | return _phase(repo, subset, target) | |
1459 |
|
1467 | |||
1460 | @predicate('secret()', safe=True) |
|
1468 | @predicate('secret()', safe=True) | |
1461 | def secret(repo, subset, x): |
|
1469 | def secret(repo, subset, x): | |
1462 | """Changeset in secret phase.""" |
|
1470 | """Changeset in secret phase.""" | |
1463 | # i18n: "secret" is a keyword |
|
1471 | # i18n: "secret" is a keyword | |
1464 | getargs(x, 0, 0, _("secret takes no arguments")) |
|
1472 | getargs(x, 0, 0, _("secret takes no arguments")) | |
1465 | target = phases.secret |
|
1473 | target = phases.secret | |
1466 | return _phase(repo, subset, target) |
|
1474 | return _phase(repo, subset, target) | |
1467 |
|
1475 | |||
1468 | def parentspec(repo, subset, x, n, order): |
|
1476 | def parentspec(repo, subset, x, n, order): | |
1469 | """``set^0`` |
|
1477 | """``set^0`` | |
1470 | The set. |
|
1478 | The set. | |
1471 | ``set^1`` (or ``set^``), ``set^2`` |
|
1479 | ``set^1`` (or ``set^``), ``set^2`` | |
1472 | First or second parent, respectively, of all changesets in set. |
|
1480 | First or second parent, respectively, of all changesets in set. | |
1473 | """ |
|
1481 | """ | |
1474 | try: |
|
1482 | try: | |
1475 | n = int(n[1]) |
|
1483 | n = int(n[1]) | |
1476 | if n not in (0, 1, 2): |
|
1484 | if n not in (0, 1, 2): | |
1477 | raise ValueError |
|
1485 | raise ValueError | |
1478 | except (TypeError, ValueError): |
|
1486 | except (TypeError, ValueError): | |
1479 | raise error.ParseError(_("^ expects a number 0, 1, or 2")) |
|
1487 | raise error.ParseError(_("^ expects a number 0, 1, or 2")) | |
1480 | ps = set() |
|
1488 | ps = set() | |
1481 | cl = repo.changelog |
|
1489 | cl = repo.changelog | |
1482 | for r in getset(repo, fullreposet(repo), x): |
|
1490 | for r in getset(repo, fullreposet(repo), x): | |
1483 | if n == 0: |
|
1491 | if n == 0: | |
1484 | ps.add(r) |
|
1492 | ps.add(r) | |
1485 | elif n == 1: |
|
1493 | elif n == 1: | |
1486 | try: |
|
1494 | try: | |
1487 | ps.add(cl.parentrevs(r)[0]) |
|
1495 | ps.add(cl.parentrevs(r)[0]) | |
1488 | except error.WdirUnsupported: |
|
1496 | except error.WdirUnsupported: | |
1489 | ps.add(repo[r].parents()[0].rev()) |
|
1497 | ps.add(repo[r].parents()[0].rev()) | |
1490 | else: |
|
1498 | else: | |
1491 | try: |
|
1499 | try: | |
1492 | parents = cl.parentrevs(r) |
|
1500 | parents = cl.parentrevs(r) | |
1493 | if parents[1] != node.nullrev: |
|
1501 | if parents[1] != node.nullrev: | |
1494 | ps.add(parents[1]) |
|
1502 | ps.add(parents[1]) | |
1495 | except error.WdirUnsupported: |
|
1503 | except error.WdirUnsupported: | |
1496 | parents = repo[r].parents() |
|
1504 | parents = repo[r].parents() | |
1497 | if len(parents) == 2: |
|
1505 | if len(parents) == 2: | |
1498 | ps.add(parents[1].rev()) |
|
1506 | ps.add(parents[1].rev()) | |
1499 | return subset & ps |
|
1507 | return subset & ps | |
1500 |
|
1508 | |||
1501 | @predicate('present(set)', safe=True) |
|
1509 | @predicate('present(set)', safe=True) | |
1502 | def present(repo, subset, x): |
|
1510 | def present(repo, subset, x): | |
1503 | """An empty set, if any revision in set isn't found; otherwise, |
|
1511 | """An empty set, if any revision in set isn't found; otherwise, | |
1504 | all revisions in set. |
|
1512 | all revisions in set. | |
1505 |
|
1513 | |||
1506 | If any of specified revisions is not present in the local repository, |
|
1514 | If any of specified revisions is not present in the local repository, | |
1507 | the query is normally aborted. But this predicate allows the query |
|
1515 | the query is normally aborted. But this predicate allows the query | |
1508 | to continue even in such cases. |
|
1516 | to continue even in such cases. | |
1509 | """ |
|
1517 | """ | |
1510 | try: |
|
1518 | try: | |
1511 | return getset(repo, subset, x) |
|
1519 | return getset(repo, subset, x) | |
1512 | except error.RepoLookupError: |
|
1520 | except error.RepoLookupError: | |
1513 | return baseset() |
|
1521 | return baseset() | |
1514 |
|
1522 | |||
1515 | # for internal use |
|
1523 | # for internal use | |
1516 | @predicate('_notpublic', safe=True) |
|
1524 | @predicate('_notpublic', safe=True) | |
1517 | def _notpublic(repo, subset, x): |
|
1525 | def _notpublic(repo, subset, x): | |
1518 | getargs(x, 0, 0, "_notpublic takes no arguments") |
|
1526 | getargs(x, 0, 0, "_notpublic takes no arguments") | |
1519 | return _phase(repo, subset, phases.draft, phases.secret) |
|
1527 | return _phase(repo, subset, phases.draft, phases.secret) | |
1520 |
|
1528 | |||
1521 | @predicate('public()', safe=True) |
|
1529 | @predicate('public()', safe=True) | |
1522 | def public(repo, subset, x): |
|
1530 | def public(repo, subset, x): | |
1523 | """Changeset in public phase.""" |
|
1531 | """Changeset in public phase.""" | |
1524 | # i18n: "public" is a keyword |
|
1532 | # i18n: "public" is a keyword | |
1525 | getargs(x, 0, 0, _("public takes no arguments")) |
|
1533 | getargs(x, 0, 0, _("public takes no arguments")) | |
1526 | phase = repo._phasecache.phase |
|
1534 | phase = repo._phasecache.phase | |
1527 | target = phases.public |
|
1535 | target = phases.public | |
1528 | condition = lambda r: phase(repo, r) == target |
|
1536 | condition = lambda r: phase(repo, r) == target | |
1529 | return subset.filter(condition, condrepr=('<phase %r>', target), |
|
1537 | return subset.filter(condition, condrepr=('<phase %r>', target), | |
1530 | cache=False) |
|
1538 | cache=False) | |
1531 |
|
1539 | |||
1532 | @predicate('remote([id [,path]])', safe=False) |
|
1540 | @predicate('remote([id [,path]])', safe=False) | |
1533 | def remote(repo, subset, x): |
|
1541 | def remote(repo, subset, x): | |
1534 | """Local revision that corresponds to the given identifier in a |
|
1542 | """Local revision that corresponds to the given identifier in a | |
1535 | remote repository, if present. Here, the '.' identifier is a |
|
1543 | remote repository, if present. Here, the '.' identifier is a | |
1536 | synonym for the current local branch. |
|
1544 | synonym for the current local branch. | |
1537 | """ |
|
1545 | """ | |
1538 |
|
1546 | |||
1539 | from . import hg # avoid start-up nasties |
|
1547 | from . import hg # avoid start-up nasties | |
1540 | # i18n: "remote" is a keyword |
|
1548 | # i18n: "remote" is a keyword | |
1541 | l = getargs(x, 0, 2, _("remote takes zero, one, or two arguments")) |
|
1549 | l = getargs(x, 0, 2, _("remote takes zero, one, or two arguments")) | |
1542 |
|
1550 | |||
1543 | q = '.' |
|
1551 | q = '.' | |
1544 | if len(l) > 0: |
|
1552 | if len(l) > 0: | |
1545 | # i18n: "remote" is a keyword |
|
1553 | # i18n: "remote" is a keyword | |
1546 | q = getstring(l[0], _("remote requires a string id")) |
|
1554 | q = getstring(l[0], _("remote requires a string id")) | |
1547 | if q == '.': |
|
1555 | if q == '.': | |
1548 | q = repo['.'].branch() |
|
1556 | q = repo['.'].branch() | |
1549 |
|
1557 | |||
1550 | dest = '' |
|
1558 | dest = '' | |
1551 | if len(l) > 1: |
|
1559 | if len(l) > 1: | |
1552 | # i18n: "remote" is a keyword |
|
1560 | # i18n: "remote" is a keyword | |
1553 | dest = getstring(l[1], _("remote requires a repository path")) |
|
1561 | dest = getstring(l[1], _("remote requires a repository path")) | |
1554 | dest = repo.ui.expandpath(dest or 'default') |
|
1562 | dest = repo.ui.expandpath(dest or 'default') | |
1555 | dest, branches = hg.parseurl(dest) |
|
1563 | dest, branches = hg.parseurl(dest) | |
1556 | revs, checkout = hg.addbranchrevs(repo, repo, branches, []) |
|
1564 | revs, checkout = hg.addbranchrevs(repo, repo, branches, []) | |
1557 | if revs: |
|
1565 | if revs: | |
1558 | revs = [repo.lookup(rev) for rev in revs] |
|
1566 | revs = [repo.lookup(rev) for rev in revs] | |
1559 | other = hg.peer(repo, {}, dest) |
|
1567 | other = hg.peer(repo, {}, dest) | |
1560 | n = other.lookup(q) |
|
1568 | n = other.lookup(q) | |
1561 | if n in repo: |
|
1569 | if n in repo: | |
1562 | r = repo[n].rev() |
|
1570 | r = repo[n].rev() | |
1563 | if r in subset: |
|
1571 | if r in subset: | |
1564 | return baseset([r]) |
|
1572 | return baseset([r]) | |
1565 | return baseset() |
|
1573 | return baseset() | |
1566 |
|
1574 | |||
1567 | @predicate('removes(pattern)', safe=True) |
|
1575 | @predicate('removes(pattern)', safe=True) | |
1568 | def removes(repo, subset, x): |
|
1576 | def removes(repo, subset, x): | |
1569 | """Changesets which remove files matching pattern. |
|
1577 | """Changesets which remove files matching pattern. | |
1570 |
|
1578 | |||
1571 | The pattern without explicit kind like ``glob:`` is expected to be |
|
1579 | The pattern without explicit kind like ``glob:`` is expected to be | |
1572 | relative to the current directory and match against a file or a |
|
1580 | relative to the current directory and match against a file or a | |
1573 | directory. |
|
1581 | directory. | |
1574 | """ |
|
1582 | """ | |
1575 | # i18n: "removes" is a keyword |
|
1583 | # i18n: "removes" is a keyword | |
1576 | pat = getstring(x, _("removes requires a pattern")) |
|
1584 | pat = getstring(x, _("removes requires a pattern")) | |
1577 | return checkstatus(repo, subset, pat, 2) |
|
1585 | return checkstatus(repo, subset, pat, 2) | |
1578 |
|
1586 | |||
1579 | @predicate('rev(number)', safe=True) |
|
1587 | @predicate('rev(number)', safe=True) | |
1580 | def rev(repo, subset, x): |
|
1588 | def rev(repo, subset, x): | |
1581 | """Revision with the given numeric identifier. |
|
1589 | """Revision with the given numeric identifier. | |
1582 | """ |
|
1590 | """ | |
1583 | # i18n: "rev" is a keyword |
|
1591 | # i18n: "rev" is a keyword | |
1584 | l = getargs(x, 1, 1, _("rev requires one argument")) |
|
1592 | l = getargs(x, 1, 1, _("rev requires one argument")) | |
1585 | try: |
|
1593 | try: | |
1586 | # i18n: "rev" is a keyword |
|
1594 | # i18n: "rev" is a keyword | |
1587 | l = int(getstring(l[0], _("rev requires a number"))) |
|
1595 | l = int(getstring(l[0], _("rev requires a number"))) | |
1588 | except (TypeError, ValueError): |
|
1596 | except (TypeError, ValueError): | |
1589 | # i18n: "rev" is a keyword |
|
1597 | # i18n: "rev" is a keyword | |
1590 | raise error.ParseError(_("rev expects a number")) |
|
1598 | raise error.ParseError(_("rev expects a number")) | |
1591 | if l not in repo.changelog and l not in (node.nullrev, node.wdirrev): |
|
1599 | if l not in repo.changelog and l not in (node.nullrev, node.wdirrev): | |
1592 | return baseset() |
|
1600 | return baseset() | |
1593 | return subset & baseset([l]) |
|
1601 | return subset & baseset([l]) | |
1594 |
|
1602 | |||
1595 | @predicate('matching(revision [, field])', safe=True) |
|
1603 | @predicate('matching(revision [, field])', safe=True) | |
1596 | def matching(repo, subset, x): |
|
1604 | def matching(repo, subset, x): | |
1597 | """Changesets in which a given set of fields match the set of fields in the |
|
1605 | """Changesets in which a given set of fields match the set of fields in the | |
1598 | selected revision or set. |
|
1606 | selected revision or set. | |
1599 |
|
1607 | |||
1600 | To match more than one field pass the list of fields to match separated |
|
1608 | To match more than one field pass the list of fields to match separated | |
1601 | by spaces (e.g. ``author description``). |
|
1609 | by spaces (e.g. ``author description``). | |
1602 |
|
1610 | |||
1603 | Valid fields are most regular revision fields and some special fields. |
|
1611 | Valid fields are most regular revision fields and some special fields. | |
1604 |
|
1612 | |||
1605 | Regular revision fields are ``description``, ``author``, ``branch``, |
|
1613 | Regular revision fields are ``description``, ``author``, ``branch``, | |
1606 | ``date``, ``files``, ``phase``, ``parents``, ``substate``, ``user`` |
|
1614 | ``date``, ``files``, ``phase``, ``parents``, ``substate``, ``user`` | |
1607 | and ``diff``. |
|
1615 | and ``diff``. | |
1608 | Note that ``author`` and ``user`` are synonyms. ``diff`` refers to the |
|
1616 | Note that ``author`` and ``user`` are synonyms. ``diff`` refers to the | |
1609 | contents of the revision. Two revisions matching their ``diff`` will |
|
1617 | contents of the revision. Two revisions matching their ``diff`` will | |
1610 | also match their ``files``. |
|
1618 | also match their ``files``. | |
1611 |
|
1619 | |||
1612 | Special fields are ``summary`` and ``metadata``: |
|
1620 | Special fields are ``summary`` and ``metadata``: | |
1613 | ``summary`` matches the first line of the description. |
|
1621 | ``summary`` matches the first line of the description. | |
1614 | ``metadata`` is equivalent to matching ``description user date`` |
|
1622 | ``metadata`` is equivalent to matching ``description user date`` | |
1615 | (i.e. it matches the main metadata fields). |
|
1623 | (i.e. it matches the main metadata fields). | |
1616 |
|
1624 | |||
1617 | ``metadata`` is the default field which is used when no fields are |
|
1625 | ``metadata`` is the default field which is used when no fields are | |
1618 | specified. You can match more than one field at a time. |
|
1626 | specified. You can match more than one field at a time. | |
1619 | """ |
|
1627 | """ | |
1620 | # i18n: "matching" is a keyword |
|
1628 | # i18n: "matching" is a keyword | |
1621 | l = getargs(x, 1, 2, _("matching takes 1 or 2 arguments")) |
|
1629 | l = getargs(x, 1, 2, _("matching takes 1 or 2 arguments")) | |
1622 |
|
1630 | |||
1623 | revs = getset(repo, fullreposet(repo), l[0]) |
|
1631 | revs = getset(repo, fullreposet(repo), l[0]) | |
1624 |
|
1632 | |||
1625 | fieldlist = ['metadata'] |
|
1633 | fieldlist = ['metadata'] | |
1626 | if len(l) > 1: |
|
1634 | if len(l) > 1: | |
1627 | fieldlist = getstring(l[1], |
|
1635 | fieldlist = getstring(l[1], | |
1628 | # i18n: "matching" is a keyword |
|
1636 | # i18n: "matching" is a keyword | |
1629 | _("matching requires a string " |
|
1637 | _("matching requires a string " | |
1630 | "as its second argument")).split() |
|
1638 | "as its second argument")).split() | |
1631 |
|
1639 | |||
1632 | # Make sure that there are no repeated fields, |
|
1640 | # Make sure that there are no repeated fields, | |
1633 | # expand the 'special' 'metadata' field type |
|
1641 | # expand the 'special' 'metadata' field type | |
1634 | # and check the 'files' whenever we check the 'diff' |
|
1642 | # and check the 'files' whenever we check the 'diff' | |
1635 | fields = [] |
|
1643 | fields = [] | |
1636 | for field in fieldlist: |
|
1644 | for field in fieldlist: | |
1637 | if field == 'metadata': |
|
1645 | if field == 'metadata': | |
1638 | fields += ['user', 'description', 'date'] |
|
1646 | fields += ['user', 'description', 'date'] | |
1639 | elif field == 'diff': |
|
1647 | elif field == 'diff': | |
1640 | # a revision matching the diff must also match the files |
|
1648 | # a revision matching the diff must also match the files | |
1641 | # since matching the diff is very costly, make sure to |
|
1649 | # since matching the diff is very costly, make sure to | |
1642 | # also match the files first |
|
1650 | # also match the files first | |
1643 | fields += ['files', 'diff'] |
|
1651 | fields += ['files', 'diff'] | |
1644 | else: |
|
1652 | else: | |
1645 | if field == 'author': |
|
1653 | if field == 'author': | |
1646 | field = 'user' |
|
1654 | field = 'user' | |
1647 | fields.append(field) |
|
1655 | fields.append(field) | |
1648 | fields = set(fields) |
|
1656 | fields = set(fields) | |
1649 | if 'summary' in fields and 'description' in fields: |
|
1657 | if 'summary' in fields and 'description' in fields: | |
1650 | # If a revision matches its description it also matches its summary |
|
1658 | # If a revision matches its description it also matches its summary | |
1651 | fields.discard('summary') |
|
1659 | fields.discard('summary') | |
1652 |
|
1660 | |||
1653 | # We may want to match more than one field |
|
1661 | # We may want to match more than one field | |
1654 | # Not all fields take the same amount of time to be matched |
|
1662 | # Not all fields take the same amount of time to be matched | |
1655 | # Sort the selected fields in order of increasing matching cost |
|
1663 | # Sort the selected fields in order of increasing matching cost | |
1656 | fieldorder = ['phase', 'parents', 'user', 'date', 'branch', 'summary', |
|
1664 | fieldorder = ['phase', 'parents', 'user', 'date', 'branch', 'summary', | |
1657 | 'files', 'description', 'substate', 'diff'] |
|
1665 | 'files', 'description', 'substate', 'diff'] | |
1658 | def fieldkeyfunc(f): |
|
1666 | def fieldkeyfunc(f): | |
1659 | try: |
|
1667 | try: | |
1660 | return fieldorder.index(f) |
|
1668 | return fieldorder.index(f) | |
1661 | except ValueError: |
|
1669 | except ValueError: | |
1662 | # assume an unknown field is very costly |
|
1670 | # assume an unknown field is very costly | |
1663 | return len(fieldorder) |
|
1671 | return len(fieldorder) | |
1664 | fields = list(fields) |
|
1672 | fields = list(fields) | |
1665 | fields.sort(key=fieldkeyfunc) |
|
1673 | fields.sort(key=fieldkeyfunc) | |
1666 |
|
1674 | |||
1667 | # Each field will be matched with its own "getfield" function |
|
1675 | # Each field will be matched with its own "getfield" function | |
1668 | # which will be added to the getfieldfuncs array of functions |
|
1676 | # which will be added to the getfieldfuncs array of functions | |
1669 | getfieldfuncs = [] |
|
1677 | getfieldfuncs = [] | |
1670 | _funcs = { |
|
1678 | _funcs = { | |
1671 | 'user': lambda r: repo[r].user(), |
|
1679 | 'user': lambda r: repo[r].user(), | |
1672 | 'branch': lambda r: repo[r].branch(), |
|
1680 | 'branch': lambda r: repo[r].branch(), | |
1673 | 'date': lambda r: repo[r].date(), |
|
1681 | 'date': lambda r: repo[r].date(), | |
1674 | 'description': lambda r: repo[r].description(), |
|
1682 | 'description': lambda r: repo[r].description(), | |
1675 | 'files': lambda r: repo[r].files(), |
|
1683 | 'files': lambda r: repo[r].files(), | |
1676 | 'parents': lambda r: repo[r].parents(), |
|
1684 | 'parents': lambda r: repo[r].parents(), | |
1677 | 'phase': lambda r: repo[r].phase(), |
|
1685 | 'phase': lambda r: repo[r].phase(), | |
1678 | 'substate': lambda r: repo[r].substate, |
|
1686 | 'substate': lambda r: repo[r].substate, | |
1679 | 'summary': lambda r: repo[r].description().splitlines()[0], |
|
1687 | 'summary': lambda r: repo[r].description().splitlines()[0], | |
1680 | 'diff': lambda r: list(repo[r].diff(git=True),) |
|
1688 | 'diff': lambda r: list(repo[r].diff(git=True),) | |
1681 | } |
|
1689 | } | |
1682 | for info in fields: |
|
1690 | for info in fields: | |
1683 | getfield = _funcs.get(info, None) |
|
1691 | getfield = _funcs.get(info, None) | |
1684 | if getfield is None: |
|
1692 | if getfield is None: | |
1685 | raise error.ParseError( |
|
1693 | raise error.ParseError( | |
1686 | # i18n: "matching" is a keyword |
|
1694 | # i18n: "matching" is a keyword | |
1687 | _("unexpected field name passed to matching: %s") % info) |
|
1695 | _("unexpected field name passed to matching: %s") % info) | |
1688 | getfieldfuncs.append(getfield) |
|
1696 | getfieldfuncs.append(getfield) | |
1689 | # convert the getfield array of functions into a "getinfo" function |
|
1697 | # convert the getfield array of functions into a "getinfo" function | |
1690 | # which returns an array of field values (or a single value if there |
|
1698 | # which returns an array of field values (or a single value if there | |
1691 | # is only one field to match) |
|
1699 | # is only one field to match) | |
1692 | getinfo = lambda r: [f(r) for f in getfieldfuncs] |
|
1700 | getinfo = lambda r: [f(r) for f in getfieldfuncs] | |
1693 |
|
1701 | |||
1694 | def matches(x): |
|
1702 | def matches(x): | |
1695 | for rev in revs: |
|
1703 | for rev in revs: | |
1696 | target = getinfo(rev) |
|
1704 | target = getinfo(rev) | |
1697 | match = True |
|
1705 | match = True | |
1698 | for n, f in enumerate(getfieldfuncs): |
|
1706 | for n, f in enumerate(getfieldfuncs): | |
1699 | if target[n] != f(x): |
|
1707 | if target[n] != f(x): | |
1700 | match = False |
|
1708 | match = False | |
1701 | if match: |
|
1709 | if match: | |
1702 | return True |
|
1710 | return True | |
1703 | return False |
|
1711 | return False | |
1704 |
|
1712 | |||
1705 | return subset.filter(matches, condrepr=('<matching%r %r>', fields, revs)) |
|
1713 | return subset.filter(matches, condrepr=('<matching%r %r>', fields, revs)) | |
1706 |
|
1714 | |||
1707 | @predicate('reverse(set)', safe=True, takeorder=True) |
|
1715 | @predicate('reverse(set)', safe=True, takeorder=True) | |
1708 | def reverse(repo, subset, x, order): |
|
1716 | def reverse(repo, subset, x, order): | |
1709 | """Reverse order of set. |
|
1717 | """Reverse order of set. | |
1710 | """ |
|
1718 | """ | |
1711 | l = getset(repo, subset, x) |
|
1719 | l = getset(repo, subset, x) | |
1712 | if order == defineorder: |
|
1720 | if order == defineorder: | |
1713 | l.reverse() |
|
1721 | l.reverse() | |
1714 | return l |
|
1722 | return l | |
1715 |
|
1723 | |||
1716 | @predicate('roots(set)', safe=True) |
|
1724 | @predicate('roots(set)', safe=True) | |
1717 | def roots(repo, subset, x): |
|
1725 | def roots(repo, subset, x): | |
1718 | """Changesets in set with no parent changeset in set. |
|
1726 | """Changesets in set with no parent changeset in set. | |
1719 | """ |
|
1727 | """ | |
1720 | s = getset(repo, fullreposet(repo), x) |
|
1728 | s = getset(repo, fullreposet(repo), x) | |
1721 | parents = repo.changelog.parentrevs |
|
1729 | parents = repo.changelog.parentrevs | |
1722 | def filter(r): |
|
1730 | def filter(r): | |
1723 | for p in parents(r): |
|
1731 | for p in parents(r): | |
1724 | if 0 <= p and p in s: |
|
1732 | if 0 <= p and p in s: | |
1725 | return False |
|
1733 | return False | |
1726 | return True |
|
1734 | return True | |
1727 | return subset & s.filter(filter, condrepr='<roots>') |
|
1735 | return subset & s.filter(filter, condrepr='<roots>') | |
1728 |
|
1736 | |||
1729 | _sortkeyfuncs = { |
|
1737 | _sortkeyfuncs = { | |
1730 | 'rev': lambda c: c.rev(), |
|
1738 | 'rev': lambda c: c.rev(), | |
1731 | 'branch': lambda c: c.branch(), |
|
1739 | 'branch': lambda c: c.branch(), | |
1732 | 'desc': lambda c: c.description(), |
|
1740 | 'desc': lambda c: c.description(), | |
1733 | 'user': lambda c: c.user(), |
|
1741 | 'user': lambda c: c.user(), | |
1734 | 'author': lambda c: c.user(), |
|
1742 | 'author': lambda c: c.user(), | |
1735 | 'date': lambda c: c.date()[0], |
|
1743 | 'date': lambda c: c.date()[0], | |
1736 | } |
|
1744 | } | |
1737 |
|
1745 | |||
1738 | def _getsortargs(x): |
|
1746 | def _getsortargs(x): | |
1739 | """Parse sort options into (set, [(key, reverse)], opts)""" |
|
1747 | """Parse sort options into (set, [(key, reverse)], opts)""" | |
1740 | args = getargsdict(x, 'sort', 'set keys topo.firstbranch') |
|
1748 | args = getargsdict(x, 'sort', 'set keys topo.firstbranch') | |
1741 | if 'set' not in args: |
|
1749 | if 'set' not in args: | |
1742 | # i18n: "sort" is a keyword |
|
1750 | # i18n: "sort" is a keyword | |
1743 | raise error.ParseError(_('sort requires one or two arguments')) |
|
1751 | raise error.ParseError(_('sort requires one or two arguments')) | |
1744 | keys = "rev" |
|
1752 | keys = "rev" | |
1745 | if 'keys' in args: |
|
1753 | if 'keys' in args: | |
1746 | # i18n: "sort" is a keyword |
|
1754 | # i18n: "sort" is a keyword | |
1747 | keys = getstring(args['keys'], _("sort spec must be a string")) |
|
1755 | keys = getstring(args['keys'], _("sort spec must be a string")) | |
1748 |
|
1756 | |||
1749 | keyflags = [] |
|
1757 | keyflags = [] | |
1750 | for k in keys.split(): |
|
1758 | for k in keys.split(): | |
1751 | fk = k |
|
1759 | fk = k | |
1752 | reverse = (k[0] == '-') |
|
1760 | reverse = (k[0] == '-') | |
1753 | if reverse: |
|
1761 | if reverse: | |
1754 | k = k[1:] |
|
1762 | k = k[1:] | |
1755 | if k not in _sortkeyfuncs and k != 'topo': |
|
1763 | if k not in _sortkeyfuncs and k != 'topo': | |
1756 | raise error.ParseError(_("unknown sort key %r") % fk) |
|
1764 | raise error.ParseError(_("unknown sort key %r") % fk) | |
1757 | keyflags.append((k, reverse)) |
|
1765 | keyflags.append((k, reverse)) | |
1758 |
|
1766 | |||
1759 | if len(keyflags) > 1 and any(k == 'topo' for k, reverse in keyflags): |
|
1767 | if len(keyflags) > 1 and any(k == 'topo' for k, reverse in keyflags): | |
1760 | # i18n: "topo" is a keyword |
|
1768 | # i18n: "topo" is a keyword | |
1761 | raise error.ParseError(_('topo sort order cannot be combined ' |
|
1769 | raise error.ParseError(_('topo sort order cannot be combined ' | |
1762 | 'with other sort keys')) |
|
1770 | 'with other sort keys')) | |
1763 |
|
1771 | |||
1764 | opts = {} |
|
1772 | opts = {} | |
1765 | if 'topo.firstbranch' in args: |
|
1773 | if 'topo.firstbranch' in args: | |
1766 | if any(k == 'topo' for k, reverse in keyflags): |
|
1774 | if any(k == 'topo' for k, reverse in keyflags): | |
1767 | opts['topo.firstbranch'] = args['topo.firstbranch'] |
|
1775 | opts['topo.firstbranch'] = args['topo.firstbranch'] | |
1768 | else: |
|
1776 | else: | |
1769 | # i18n: "topo" and "topo.firstbranch" are keywords |
|
1777 | # i18n: "topo" and "topo.firstbranch" are keywords | |
1770 | raise error.ParseError(_('topo.firstbranch can only be used ' |
|
1778 | raise error.ParseError(_('topo.firstbranch can only be used ' | |
1771 | 'when using the topo sort key')) |
|
1779 | 'when using the topo sort key')) | |
1772 |
|
1780 | |||
1773 | return args['set'], keyflags, opts |
|
1781 | return args['set'], keyflags, opts | |
1774 |
|
1782 | |||
1775 | @predicate('sort(set[, [-]key... [, ...]])', safe=True, takeorder=True) |
|
1783 | @predicate('sort(set[, [-]key... [, ...]])', safe=True, takeorder=True) | |
1776 | def sort(repo, subset, x, order): |
|
1784 | def sort(repo, subset, x, order): | |
1777 | """Sort set by keys. The default sort order is ascending, specify a key |
|
1785 | """Sort set by keys. The default sort order is ascending, specify a key | |
1778 | as ``-key`` to sort in descending order. |
|
1786 | as ``-key`` to sort in descending order. | |
1779 |
|
1787 | |||
1780 | The keys can be: |
|
1788 | The keys can be: | |
1781 |
|
1789 | |||
1782 | - ``rev`` for the revision number, |
|
1790 | - ``rev`` for the revision number, | |
1783 | - ``branch`` for the branch name, |
|
1791 | - ``branch`` for the branch name, | |
1784 | - ``desc`` for the commit message (description), |
|
1792 | - ``desc`` for the commit message (description), | |
1785 | - ``user`` for user name (``author`` can be used as an alias), |
|
1793 | - ``user`` for user name (``author`` can be used as an alias), | |
1786 | - ``date`` for the commit date |
|
1794 | - ``date`` for the commit date | |
1787 | - ``topo`` for a reverse topographical sort |
|
1795 | - ``topo`` for a reverse topographical sort | |
1788 |
|
1796 | |||
1789 | The ``topo`` sort order cannot be combined with other sort keys. This sort |
|
1797 | The ``topo`` sort order cannot be combined with other sort keys. This sort | |
1790 | takes one optional argument, ``topo.firstbranch``, which takes a revset that |
|
1798 | takes one optional argument, ``topo.firstbranch``, which takes a revset that | |
1791 | specifies what topographical branches to prioritize in the sort. |
|
1799 | specifies what topographical branches to prioritize in the sort. | |
1792 |
|
1800 | |||
1793 | """ |
|
1801 | """ | |
1794 | s, keyflags, opts = _getsortargs(x) |
|
1802 | s, keyflags, opts = _getsortargs(x) | |
1795 | revs = getset(repo, subset, s) |
|
1803 | revs = getset(repo, subset, s) | |
1796 |
|
1804 | |||
1797 | if not keyflags or order != defineorder: |
|
1805 | if not keyflags or order != defineorder: | |
1798 | return revs |
|
1806 | return revs | |
1799 | if len(keyflags) == 1 and keyflags[0][0] == "rev": |
|
1807 | if len(keyflags) == 1 and keyflags[0][0] == "rev": | |
1800 | revs.sort(reverse=keyflags[0][1]) |
|
1808 | revs.sort(reverse=keyflags[0][1]) | |
1801 | return revs |
|
1809 | return revs | |
1802 | elif keyflags[0][0] == "topo": |
|
1810 | elif keyflags[0][0] == "topo": | |
1803 | firstbranch = () |
|
1811 | firstbranch = () | |
1804 | if 'topo.firstbranch' in opts: |
|
1812 | if 'topo.firstbranch' in opts: | |
1805 | firstbranch = getset(repo, subset, opts['topo.firstbranch']) |
|
1813 | firstbranch = getset(repo, subset, opts['topo.firstbranch']) | |
1806 | revs = baseset(dagop.toposort(revs, repo.changelog.parentrevs, |
|
1814 | revs = baseset(dagop.toposort(revs, repo.changelog.parentrevs, | |
1807 | firstbranch), |
|
1815 | firstbranch), | |
1808 | istopo=True) |
|
1816 | istopo=True) | |
1809 | if keyflags[0][1]: |
|
1817 | if keyflags[0][1]: | |
1810 | revs.reverse() |
|
1818 | revs.reverse() | |
1811 | return revs |
|
1819 | return revs | |
1812 |
|
1820 | |||
1813 | # sort() is guaranteed to be stable |
|
1821 | # sort() is guaranteed to be stable | |
1814 | ctxs = [repo[r] for r in revs] |
|
1822 | ctxs = [repo[r] for r in revs] | |
1815 | for k, reverse in reversed(keyflags): |
|
1823 | for k, reverse in reversed(keyflags): | |
1816 | ctxs.sort(key=_sortkeyfuncs[k], reverse=reverse) |
|
1824 | ctxs.sort(key=_sortkeyfuncs[k], reverse=reverse) | |
1817 | return baseset([c.rev() for c in ctxs]) |
|
1825 | return baseset([c.rev() for c in ctxs]) | |
1818 |
|
1826 | |||
1819 | @predicate('subrepo([pattern])') |
|
1827 | @predicate('subrepo([pattern])') | |
1820 | def subrepo(repo, subset, x): |
|
1828 | def subrepo(repo, subset, x): | |
1821 | """Changesets that add, modify or remove the given subrepo. If no subrepo |
|
1829 | """Changesets that add, modify or remove the given subrepo. If no subrepo | |
1822 | pattern is named, any subrepo changes are returned. |
|
1830 | pattern is named, any subrepo changes are returned. | |
1823 | """ |
|
1831 | """ | |
1824 | # i18n: "subrepo" is a keyword |
|
1832 | # i18n: "subrepo" is a keyword | |
1825 | args = getargs(x, 0, 1, _('subrepo takes at most one argument')) |
|
1833 | args = getargs(x, 0, 1, _('subrepo takes at most one argument')) | |
1826 | pat = None |
|
1834 | pat = None | |
1827 | if len(args) != 0: |
|
1835 | if len(args) != 0: | |
1828 | pat = getstring(args[0], _("subrepo requires a pattern")) |
|
1836 | pat = getstring(args[0], _("subrepo requires a pattern")) | |
1829 |
|
1837 | |||
1830 | m = matchmod.exact(repo.root, repo.root, ['.hgsubstate']) |
|
1838 | m = matchmod.exact(repo.root, repo.root, ['.hgsubstate']) | |
1831 |
|
1839 | |||
1832 | def submatches(names): |
|
1840 | def submatches(names): | |
1833 | k, p, m = util.stringmatcher(pat) |
|
1841 | k, p, m = util.stringmatcher(pat) | |
1834 | for name in names: |
|
1842 | for name in names: | |
1835 | if m(name): |
|
1843 | if m(name): | |
1836 | yield name |
|
1844 | yield name | |
1837 |
|
1845 | |||
1838 | def matches(x): |
|
1846 | def matches(x): | |
1839 | c = repo[x] |
|
1847 | c = repo[x] | |
1840 | s = repo.status(c.p1().node(), c.node(), match=m) |
|
1848 | s = repo.status(c.p1().node(), c.node(), match=m) | |
1841 |
|
1849 | |||
1842 | if pat is None: |
|
1850 | if pat is None: | |
1843 | return s.added or s.modified or s.removed |
|
1851 | return s.added or s.modified or s.removed | |
1844 |
|
1852 | |||
1845 | if s.added: |
|
1853 | if s.added: | |
1846 | return any(submatches(c.substate.keys())) |
|
1854 | return any(submatches(c.substate.keys())) | |
1847 |
|
1855 | |||
1848 | if s.modified: |
|
1856 | if s.modified: | |
1849 | subs = set(c.p1().substate.keys()) |
|
1857 | subs = set(c.p1().substate.keys()) | |
1850 | subs.update(c.substate.keys()) |
|
1858 | subs.update(c.substate.keys()) | |
1851 |
|
1859 | |||
1852 | for path in submatches(subs): |
|
1860 | for path in submatches(subs): | |
1853 | if c.p1().substate.get(path) != c.substate.get(path): |
|
1861 | if c.p1().substate.get(path) != c.substate.get(path): | |
1854 | return True |
|
1862 | return True | |
1855 |
|
1863 | |||
1856 | if s.removed: |
|
1864 | if s.removed: | |
1857 | return any(submatches(c.p1().substate.keys())) |
|
1865 | return any(submatches(c.p1().substate.keys())) | |
1858 |
|
1866 | |||
1859 | return False |
|
1867 | return False | |
1860 |
|
1868 | |||
1861 | return subset.filter(matches, condrepr=('<subrepo %r>', pat)) |
|
1869 | return subset.filter(matches, condrepr=('<subrepo %r>', pat)) | |
1862 |
|
1870 | |||
1863 | def _mapbynodefunc(repo, s, f): |
|
1871 | def _mapbynodefunc(repo, s, f): | |
1864 | """(repo, smartset, [node] -> [node]) -> smartset |
|
1872 | """(repo, smartset, [node] -> [node]) -> smartset | |
1865 |
|
1873 | |||
1866 | Helper method to map a smartset to another smartset given a function only |
|
1874 | Helper method to map a smartset to another smartset given a function only | |
1867 | talking about nodes. Handles converting between rev numbers and nodes, and |
|
1875 | talking about nodes. Handles converting between rev numbers and nodes, and | |
1868 | filtering. |
|
1876 | filtering. | |
1869 | """ |
|
1877 | """ | |
1870 | cl = repo.unfiltered().changelog |
|
1878 | cl = repo.unfiltered().changelog | |
1871 | torev = cl.rev |
|
1879 | torev = cl.rev | |
1872 | tonode = cl.node |
|
1880 | tonode = cl.node | |
1873 | nodemap = cl.nodemap |
|
1881 | nodemap = cl.nodemap | |
1874 | result = set(torev(n) for n in f(tonode(r) for r in s) if n in nodemap) |
|
1882 | result = set(torev(n) for n in f(tonode(r) for r in s) if n in nodemap) | |
1875 | return smartset.baseset(result - repo.changelog.filteredrevs) |
|
1883 | return smartset.baseset(result - repo.changelog.filteredrevs) | |
1876 |
|
1884 | |||
1877 | @predicate('successors(set)', safe=True) |
|
1885 | @predicate('successors(set)', safe=True) | |
1878 | def successors(repo, subset, x): |
|
1886 | def successors(repo, subset, x): | |
1879 | """All successors for set, including the given set themselves""" |
|
1887 | """All successors for set, including the given set themselves""" | |
1880 | s = getset(repo, fullreposet(repo), x) |
|
1888 | s = getset(repo, fullreposet(repo), x) | |
1881 | f = lambda nodes: obsutil.allsuccessors(repo.obsstore, nodes) |
|
1889 | f = lambda nodes: obsutil.allsuccessors(repo.obsstore, nodes) | |
1882 | d = _mapbynodefunc(repo, s, f) |
|
1890 | d = _mapbynodefunc(repo, s, f) | |
1883 | return subset & d |
|
1891 | return subset & d | |
1884 |
|
1892 | |||
1885 | def _substringmatcher(pattern, casesensitive=True): |
|
1893 | def _substringmatcher(pattern, casesensitive=True): | |
1886 | kind, pattern, matcher = util.stringmatcher(pattern, |
|
1894 | kind, pattern, matcher = util.stringmatcher(pattern, | |
1887 | casesensitive=casesensitive) |
|
1895 | casesensitive=casesensitive) | |
1888 | if kind == 'literal': |
|
1896 | if kind == 'literal': | |
1889 | if not casesensitive: |
|
1897 | if not casesensitive: | |
1890 | pattern = encoding.lower(pattern) |
|
1898 | pattern = encoding.lower(pattern) | |
1891 | matcher = lambda s: pattern in encoding.lower(s) |
|
1899 | matcher = lambda s: pattern in encoding.lower(s) | |
1892 | else: |
|
1900 | else: | |
1893 | matcher = lambda s: pattern in s |
|
1901 | matcher = lambda s: pattern in s | |
1894 | return kind, pattern, matcher |
|
1902 | return kind, pattern, matcher | |
1895 |
|
1903 | |||
1896 | @predicate('tag([name])', safe=True) |
|
1904 | @predicate('tag([name])', safe=True) | |
1897 | def tag(repo, subset, x): |
|
1905 | def tag(repo, subset, x): | |
1898 | """The specified tag by name, or all tagged revisions if no name is given. |
|
1906 | """The specified tag by name, or all tagged revisions if no name is given. | |
1899 |
|
1907 | |||
1900 | Pattern matching is supported for `name`. See |
|
1908 | Pattern matching is supported for `name`. See | |
1901 | :hg:`help revisions.patterns`. |
|
1909 | :hg:`help revisions.patterns`. | |
1902 | """ |
|
1910 | """ | |
1903 | # i18n: "tag" is a keyword |
|
1911 | # i18n: "tag" is a keyword | |
1904 | args = getargs(x, 0, 1, _("tag takes one or no arguments")) |
|
1912 | args = getargs(x, 0, 1, _("tag takes one or no arguments")) | |
1905 | cl = repo.changelog |
|
1913 | cl = repo.changelog | |
1906 | if args: |
|
1914 | if args: | |
1907 | pattern = getstring(args[0], |
|
1915 | pattern = getstring(args[0], | |
1908 | # i18n: "tag" is a keyword |
|
1916 | # i18n: "tag" is a keyword | |
1909 | _('the argument to tag must be a string')) |
|
1917 | _('the argument to tag must be a string')) | |
1910 | kind, pattern, matcher = util.stringmatcher(pattern) |
|
1918 | kind, pattern, matcher = util.stringmatcher(pattern) | |
1911 | if kind == 'literal': |
|
1919 | if kind == 'literal': | |
1912 | # avoid resolving all tags |
|
1920 | # avoid resolving all tags | |
1913 | tn = repo._tagscache.tags.get(pattern, None) |
|
1921 | tn = repo._tagscache.tags.get(pattern, None) | |
1914 | if tn is None: |
|
1922 | if tn is None: | |
1915 | raise error.RepoLookupError(_("tag '%s' does not exist") |
|
1923 | raise error.RepoLookupError(_("tag '%s' does not exist") | |
1916 | % pattern) |
|
1924 | % pattern) | |
1917 | s = {repo[tn].rev()} |
|
1925 | s = {repo[tn].rev()} | |
1918 | else: |
|
1926 | else: | |
1919 | s = {cl.rev(n) for t, n in repo.tagslist() if matcher(t)} |
|
1927 | s = {cl.rev(n) for t, n in repo.tagslist() if matcher(t)} | |
1920 | else: |
|
1928 | else: | |
1921 | s = {cl.rev(n) for t, n in repo.tagslist() if t != 'tip'} |
|
1929 | s = {cl.rev(n) for t, n in repo.tagslist() if t != 'tip'} | |
1922 | return subset & s |
|
1930 | return subset & s | |
1923 |
|
1931 | |||
1924 | @predicate('tagged', safe=True) |
|
1932 | @predicate('tagged', safe=True) | |
1925 | def tagged(repo, subset, x): |
|
1933 | def tagged(repo, subset, x): | |
1926 | return tag(repo, subset, x) |
|
1934 | return tag(repo, subset, x) | |
1927 |
|
1935 | |||
1928 | @predicate('unstable()', safe=True) |
|
1936 | @predicate('unstable()', safe=True) | |
1929 | def unstable(repo, subset, x): |
|
1937 | def unstable(repo, subset, x): | |
1930 | msg = ("'unstable()' is deprecated, " |
|
1938 | msg = ("'unstable()' is deprecated, " | |
1931 | "use 'orphan()'") |
|
1939 | "use 'orphan()'") | |
1932 | repo.ui.deprecwarn(msg, '4.4') |
|
1940 | repo.ui.deprecwarn(msg, '4.4') | |
1933 |
|
1941 | |||
1934 | return orphan(repo, subset, x) |
|
1942 | return orphan(repo, subset, x) | |
1935 |
|
1943 | |||
1936 | @predicate('orphan()', safe=True) |
|
1944 | @predicate('orphan()', safe=True) | |
1937 | def orphan(repo, subset, x): |
|
1945 | def orphan(repo, subset, x): | |
1938 | """Non-obsolete changesets with obsolete ancestors. |
|
1946 | """Non-obsolete changesets with obsolete ancestors. | |
1939 | """ |
|
1947 | """ | |
1940 | # i18n: "orphan" is a keyword |
|
1948 | # i18n: "orphan" is a keyword | |
1941 | getargs(x, 0, 0, _("orphan takes no arguments")) |
|
1949 | getargs(x, 0, 0, _("orphan takes no arguments")) | |
1942 | unstables = obsmod.getrevs(repo, 'unstable') |
|
1950 | unstables = obsmod.getrevs(repo, 'unstable') | |
1943 | return subset & unstables |
|
1951 | return subset & unstables | |
1944 |
|
1952 | |||
1945 |
|
1953 | |||
1946 | @predicate('user(string)', safe=True) |
|
1954 | @predicate('user(string)', safe=True) | |
1947 | def user(repo, subset, x): |
|
1955 | def user(repo, subset, x): | |
1948 | """User name contains string. The match is case-insensitive. |
|
1956 | """User name contains string. The match is case-insensitive. | |
1949 |
|
1957 | |||
1950 | Pattern matching is supported for `string`. See |
|
1958 | Pattern matching is supported for `string`. See | |
1951 | :hg:`help revisions.patterns`. |
|
1959 | :hg:`help revisions.patterns`. | |
1952 | """ |
|
1960 | """ | |
1953 | return author(repo, subset, x) |
|
1961 | return author(repo, subset, x) | |
1954 |
|
1962 | |||
1955 | @predicate('wdir()', safe=True) |
|
1963 | @predicate('wdir()', safe=True) | |
1956 | def wdir(repo, subset, x): |
|
1964 | def wdir(repo, subset, x): | |
1957 | """Working directory. (EXPERIMENTAL)""" |
|
1965 | """Working directory. (EXPERIMENTAL)""" | |
1958 | # i18n: "wdir" is a keyword |
|
1966 | # i18n: "wdir" is a keyword | |
1959 | getargs(x, 0, 0, _("wdir takes no arguments")) |
|
1967 | getargs(x, 0, 0, _("wdir takes no arguments")) | |
1960 | if node.wdirrev in subset or isinstance(subset, fullreposet): |
|
1968 | if node.wdirrev in subset or isinstance(subset, fullreposet): | |
1961 | return baseset([node.wdirrev]) |
|
1969 | return baseset([node.wdirrev]) | |
1962 | return baseset() |
|
1970 | return baseset() | |
1963 |
|
1971 | |||
1964 | def _orderedlist(repo, subset, x): |
|
1972 | def _orderedlist(repo, subset, x): | |
1965 | s = getstring(x, "internal error") |
|
1973 | s = getstring(x, "internal error") | |
1966 | if not s: |
|
1974 | if not s: | |
1967 | return baseset() |
|
1975 | return baseset() | |
1968 | # remove duplicates here. it's difficult for caller to deduplicate sets |
|
1976 | # remove duplicates here. it's difficult for caller to deduplicate sets | |
1969 | # because different symbols can point to the same rev. |
|
1977 | # because different symbols can point to the same rev. | |
1970 | cl = repo.changelog |
|
1978 | cl = repo.changelog | |
1971 | ls = [] |
|
1979 | ls = [] | |
1972 | seen = set() |
|
1980 | seen = set() | |
1973 | for t in s.split('\0'): |
|
1981 | for t in s.split('\0'): | |
1974 | try: |
|
1982 | try: | |
1975 | # fast path for integer revision |
|
1983 | # fast path for integer revision | |
1976 | r = int(t) |
|
1984 | r = int(t) | |
1977 | if str(r) != t or r not in cl: |
|
1985 | if str(r) != t or r not in cl: | |
1978 | raise ValueError |
|
1986 | raise ValueError | |
1979 | revs = [r] |
|
1987 | revs = [r] | |
1980 | except ValueError: |
|
1988 | except ValueError: | |
1981 | revs = stringset(repo, subset, t) |
|
1989 | revs = stringset(repo, subset, t) | |
1982 |
|
1990 | |||
1983 | for r in revs: |
|
1991 | for r in revs: | |
1984 | if r in seen: |
|
1992 | if r in seen: | |
1985 | continue |
|
1993 | continue | |
1986 | if (r in subset |
|
1994 | if (r in subset | |
1987 | or r == node.nullrev and isinstance(subset, fullreposet)): |
|
1995 | or r == node.nullrev and isinstance(subset, fullreposet)): | |
1988 | ls.append(r) |
|
1996 | ls.append(r) | |
1989 | seen.add(r) |
|
1997 | seen.add(r) | |
1990 | return baseset(ls) |
|
1998 | return baseset(ls) | |
1991 |
|
1999 | |||
1992 | # for internal use |
|
2000 | # for internal use | |
1993 | @predicate('_list', safe=True, takeorder=True) |
|
2001 | @predicate('_list', safe=True, takeorder=True) | |
1994 | def _list(repo, subset, x, order): |
|
2002 | def _list(repo, subset, x, order): | |
1995 | if order == followorder: |
|
2003 | if order == followorder: | |
1996 | # slow path to take the subset order |
|
2004 | # slow path to take the subset order | |
1997 | return subset & _orderedlist(repo, fullreposet(repo), x) |
|
2005 | return subset & _orderedlist(repo, fullreposet(repo), x) | |
1998 | else: |
|
2006 | else: | |
1999 | return _orderedlist(repo, subset, x) |
|
2007 | return _orderedlist(repo, subset, x) | |
2000 |
|
2008 | |||
2001 | def _orderedintlist(repo, subset, x): |
|
2009 | def _orderedintlist(repo, subset, x): | |
2002 | s = getstring(x, "internal error") |
|
2010 | s = getstring(x, "internal error") | |
2003 | if not s: |
|
2011 | if not s: | |
2004 | return baseset() |
|
2012 | return baseset() | |
2005 | ls = [int(r) for r in s.split('\0')] |
|
2013 | ls = [int(r) for r in s.split('\0')] | |
2006 | s = subset |
|
2014 | s = subset | |
2007 | return baseset([r for r in ls if r in s]) |
|
2015 | return baseset([r for r in ls if r in s]) | |
2008 |
|
2016 | |||
2009 | # for internal use |
|
2017 | # for internal use | |
2010 | @predicate('_intlist', safe=True, takeorder=True) |
|
2018 | @predicate('_intlist', safe=True, takeorder=True) | |
2011 | def _intlist(repo, subset, x, order): |
|
2019 | def _intlist(repo, subset, x, order): | |
2012 | if order == followorder: |
|
2020 | if order == followorder: | |
2013 | # slow path to take the subset order |
|
2021 | # slow path to take the subset order | |
2014 | return subset & _orderedintlist(repo, fullreposet(repo), x) |
|
2022 | return subset & _orderedintlist(repo, fullreposet(repo), x) | |
2015 | else: |
|
2023 | else: | |
2016 | return _orderedintlist(repo, subset, x) |
|
2024 | return _orderedintlist(repo, subset, x) | |
2017 |
|
2025 | |||
2018 | def _orderedhexlist(repo, subset, x): |
|
2026 | def _orderedhexlist(repo, subset, x): | |
2019 | s = getstring(x, "internal error") |
|
2027 | s = getstring(x, "internal error") | |
2020 | if not s: |
|
2028 | if not s: | |
2021 | return baseset() |
|
2029 | return baseset() | |
2022 | cl = repo.changelog |
|
2030 | cl = repo.changelog | |
2023 | ls = [cl.rev(node.bin(r)) for r in s.split('\0')] |
|
2031 | ls = [cl.rev(node.bin(r)) for r in s.split('\0')] | |
2024 | s = subset |
|
2032 | s = subset | |
2025 | return baseset([r for r in ls if r in s]) |
|
2033 | return baseset([r for r in ls if r in s]) | |
2026 |
|
2034 | |||
2027 | # for internal use |
|
2035 | # for internal use | |
2028 | @predicate('_hexlist', safe=True, takeorder=True) |
|
2036 | @predicate('_hexlist', safe=True, takeorder=True) | |
2029 | def _hexlist(repo, subset, x, order): |
|
2037 | def _hexlist(repo, subset, x, order): | |
2030 | if order == followorder: |
|
2038 | if order == followorder: | |
2031 | # slow path to take the subset order |
|
2039 | # slow path to take the subset order | |
2032 | return subset & _orderedhexlist(repo, fullreposet(repo), x) |
|
2040 | return subset & _orderedhexlist(repo, fullreposet(repo), x) | |
2033 | else: |
|
2041 | else: | |
2034 | return _orderedhexlist(repo, subset, x) |
|
2042 | return _orderedhexlist(repo, subset, x) | |
2035 |
|
2043 | |||
2036 | methods = { |
|
2044 | methods = { | |
2037 | "range": rangeset, |
|
2045 | "range": rangeset, | |
2038 | "rangeall": rangeall, |
|
2046 | "rangeall": rangeall, | |
2039 | "rangepre": rangepre, |
|
2047 | "rangepre": rangepre, | |
2040 | "rangepost": rangepost, |
|
2048 | "rangepost": rangepost, | |
2041 | "dagrange": dagrange, |
|
2049 | "dagrange": dagrange, | |
2042 | "string": stringset, |
|
2050 | "string": stringset, | |
2043 | "symbol": stringset, |
|
2051 | "symbol": stringset, | |
2044 | "and": andset, |
|
2052 | "and": andset, | |
2045 | "or": orset, |
|
2053 | "or": orset, | |
2046 | "not": notset, |
|
2054 | "not": notset, | |
2047 | "difference": differenceset, |
|
2055 | "difference": differenceset, | |
2048 | "relation": relationset, |
|
2056 | "relation": relationset, | |
2049 | "relsubscript": relsubscriptset, |
|
2057 | "relsubscript": relsubscriptset, | |
2050 | "subscript": subscriptset, |
|
2058 | "subscript": subscriptset, | |
2051 | "list": listset, |
|
2059 | "list": listset, | |
2052 | "keyvalue": keyvaluepair, |
|
2060 | "keyvalue": keyvaluepair, | |
2053 | "func": func, |
|
2061 | "func": func, | |
2054 | "ancestor": ancestorspec, |
|
2062 | "ancestor": ancestorspec, | |
2055 | "parent": parentspec, |
|
2063 | "parent": parentspec, | |
2056 | "parentpost": parentpost, |
|
2064 | "parentpost": parentpost, | |
2057 | } |
|
2065 | } | |
2058 |
|
2066 | |||
2059 | def posttreebuilthook(tree, repo): |
|
2067 | def posttreebuilthook(tree, repo): | |
2060 | # hook for extensions to execute code on the optimized tree |
|
2068 | # hook for extensions to execute code on the optimized tree | |
2061 | pass |
|
2069 | pass | |
2062 |
|
2070 | |||
2063 | def match(ui, spec, repo=None, order=defineorder): |
|
2071 | def match(ui, spec, repo=None, order=defineorder): | |
2064 | """Create a matcher for a single revision spec |
|
2072 | """Create a matcher for a single revision spec | |
2065 |
|
2073 | |||
2066 | If order=followorder, a matcher takes the ordering specified by the input |
|
2074 | If order=followorder, a matcher takes the ordering specified by the input | |
2067 | set. |
|
2075 | set. | |
2068 | """ |
|
2076 | """ | |
2069 | return matchany(ui, [spec], repo=repo, order=order) |
|
2077 | return matchany(ui, [spec], repo=repo, order=order) | |
2070 |
|
2078 | |||
2071 | def matchany(ui, specs, repo=None, order=defineorder, localalias=None): |
|
2079 | def matchany(ui, specs, repo=None, order=defineorder, localalias=None): | |
2072 | """Create a matcher that will include any revisions matching one of the |
|
2080 | """Create a matcher that will include any revisions matching one of the | |
2073 | given specs |
|
2081 | given specs | |
2074 |
|
2082 | |||
2075 | If order=followorder, a matcher takes the ordering specified by the input |
|
2083 | If order=followorder, a matcher takes the ordering specified by the input | |
2076 | set. |
|
2084 | set. | |
2077 |
|
2085 | |||
2078 | If localalias is not None, it is a dict {name: definitionstring}. It takes |
|
2086 | If localalias is not None, it is a dict {name: definitionstring}. It takes | |
2079 | precedence over [revsetalias] config section. |
|
2087 | precedence over [revsetalias] config section. | |
2080 | """ |
|
2088 | """ | |
2081 | if not specs: |
|
2089 | if not specs: | |
2082 | def mfunc(repo, subset=None): |
|
2090 | def mfunc(repo, subset=None): | |
2083 | return baseset() |
|
2091 | return baseset() | |
2084 | return mfunc |
|
2092 | return mfunc | |
2085 | if not all(specs): |
|
2093 | if not all(specs): | |
2086 | raise error.ParseError(_("empty query")) |
|
2094 | raise error.ParseError(_("empty query")) | |
2087 | lookup = None |
|
2095 | lookup = None | |
2088 | if repo: |
|
2096 | if repo: | |
2089 | lookup = repo.__contains__ |
|
2097 | lookup = repo.__contains__ | |
2090 | if len(specs) == 1: |
|
2098 | if len(specs) == 1: | |
2091 | tree = revsetlang.parse(specs[0], lookup) |
|
2099 | tree = revsetlang.parse(specs[0], lookup) | |
2092 | else: |
|
2100 | else: | |
2093 | tree = ('or', |
|
2101 | tree = ('or', | |
2094 | ('list',) + tuple(revsetlang.parse(s, lookup) for s in specs)) |
|
2102 | ('list',) + tuple(revsetlang.parse(s, lookup) for s in specs)) | |
2095 |
|
2103 | |||
2096 | aliases = [] |
|
2104 | aliases = [] | |
2097 | warn = None |
|
2105 | warn = None | |
2098 | if ui: |
|
2106 | if ui: | |
2099 | aliases.extend(ui.configitems('revsetalias')) |
|
2107 | aliases.extend(ui.configitems('revsetalias')) | |
2100 | warn = ui.warn |
|
2108 | warn = ui.warn | |
2101 | if localalias: |
|
2109 | if localalias: | |
2102 | aliases.extend(localalias.items()) |
|
2110 | aliases.extend(localalias.items()) | |
2103 | if aliases: |
|
2111 | if aliases: | |
2104 | tree = revsetlang.expandaliases(tree, aliases, warn=warn) |
|
2112 | tree = revsetlang.expandaliases(tree, aliases, warn=warn) | |
2105 | tree = revsetlang.foldconcat(tree) |
|
2113 | tree = revsetlang.foldconcat(tree) | |
2106 | tree = revsetlang.analyze(tree, order) |
|
2114 | tree = revsetlang.analyze(tree, order) | |
2107 | tree = revsetlang.optimize(tree) |
|
2115 | tree = revsetlang.optimize(tree) | |
2108 | posttreebuilthook(tree, repo) |
|
2116 | posttreebuilthook(tree, repo) | |
2109 | return makematcher(tree) |
|
2117 | return makematcher(tree) | |
2110 |
|
2118 | |||
2111 | def makematcher(tree): |
|
2119 | def makematcher(tree): | |
2112 | """Create a matcher from an evaluatable tree""" |
|
2120 | """Create a matcher from an evaluatable tree""" | |
2113 | def mfunc(repo, subset=None): |
|
2121 | def mfunc(repo, subset=None): | |
2114 | if subset is None: |
|
2122 | if subset is None: | |
2115 | subset = fullreposet(repo) |
|
2123 | subset = fullreposet(repo) | |
2116 | return getset(repo, subset, tree) |
|
2124 | return getset(repo, subset, tree) | |
2117 | return mfunc |
|
2125 | return mfunc | |
2118 |
|
2126 | |||
2119 | def loadpredicate(ui, extname, registrarobj): |
|
2127 | def loadpredicate(ui, extname, registrarobj): | |
2120 | """Load revset predicates from specified registrarobj |
|
2128 | """Load revset predicates from specified registrarobj | |
2121 | """ |
|
2129 | """ | |
2122 | for name, func in registrarobj._table.iteritems(): |
|
2130 | for name, func in registrarobj._table.iteritems(): | |
2123 | symbols[name] = func |
|
2131 | symbols[name] = func | |
2124 | if func._safe: |
|
2132 | if func._safe: | |
2125 | safesymbols.add(name) |
|
2133 | safesymbols.add(name) | |
2126 |
|
2134 | |||
2127 | # load built-in predicates explicitly to setup safesymbols |
|
2135 | # load built-in predicates explicitly to setup safesymbols | |
2128 | loadpredicate(None, None, predicate) |
|
2136 | loadpredicate(None, None, predicate) | |
2129 |
|
2137 | |||
2130 | # tell hggettext to extract docstrings from these functions: |
|
2138 | # tell hggettext to extract docstrings from these functions: | |
2131 | i18nfunctions = symbols.values() |
|
2139 | i18nfunctions = symbols.values() |
@@ -1,1472 +1,1472 b'' | |||||
1 | $ cat >> $HGRCPATH << EOF |
|
1 | $ cat >> $HGRCPATH << EOF | |
2 | > [phases] |
|
2 | > [phases] | |
3 | > # public changeset are not obsolete |
|
3 | > # public changeset are not obsolete | |
4 | > publish=false |
|
4 | > publish=false | |
5 | > [ui] |
|
5 | > [ui] | |
6 | > logtemplate="{rev}:{node|short} ({phase}{if(obsolete, ' *{obsolete}*')}{if(instabilities, ' {instabilities}')}) [{tags} {bookmarks}] {desc|firstline}\n" |
|
6 | > logtemplate="{rev}:{node|short} ({phase}{if(obsolete, ' *{obsolete}*')}{if(instabilities, ' {instabilities}')}) [{tags} {bookmarks}] {desc|firstline}\n" | |
7 | > EOF |
|
7 | > EOF | |
8 | $ mkcommit() { |
|
8 | $ mkcommit() { | |
9 | > echo "$1" > "$1" |
|
9 | > echo "$1" > "$1" | |
10 | > hg add "$1" |
|
10 | > hg add "$1" | |
11 | > hg ci -m "add $1" |
|
11 | > hg ci -m "add $1" | |
12 | > } |
|
12 | > } | |
13 | $ getid() { |
|
13 | $ getid() { | |
14 | > hg log -T "{node}\n" --hidden -r "desc('$1')" |
|
14 | > hg log -T "{node}\n" --hidden -r "desc('$1')" | |
15 | > } |
|
15 | > } | |
16 |
|
16 | |||
17 | $ cat > debugkeys.py <<EOF |
|
17 | $ cat > debugkeys.py <<EOF | |
18 | > def reposetup(ui, repo): |
|
18 | > def reposetup(ui, repo): | |
19 | > class debugkeysrepo(repo.__class__): |
|
19 | > class debugkeysrepo(repo.__class__): | |
20 | > def listkeys(self, namespace): |
|
20 | > def listkeys(self, namespace): | |
21 | > ui.write('listkeys %s\n' % (namespace,)) |
|
21 | > ui.write('listkeys %s\n' % (namespace,)) | |
22 | > return super(debugkeysrepo, self).listkeys(namespace) |
|
22 | > return super(debugkeysrepo, self).listkeys(namespace) | |
23 | > |
|
23 | > | |
24 | > if repo.local(): |
|
24 | > if repo.local(): | |
25 | > repo.__class__ = debugkeysrepo |
|
25 | > repo.__class__ = debugkeysrepo | |
26 | > EOF |
|
26 | > EOF | |
27 |
|
27 | |||
28 | $ hg init tmpa |
|
28 | $ hg init tmpa | |
29 | $ cd tmpa |
|
29 | $ cd tmpa | |
30 | $ mkcommit kill_me |
|
30 | $ mkcommit kill_me | |
31 |
|
31 | |||
32 | Checking that the feature is properly disabled |
|
32 | Checking that the feature is properly disabled | |
33 |
|
33 | |||
34 | $ hg debugobsolete -d '0 0' `getid kill_me` -u babar |
|
34 | $ hg debugobsolete -d '0 0' `getid kill_me` -u babar | |
35 | abort: creating obsolete markers is not enabled on this repo |
|
35 | abort: creating obsolete markers is not enabled on this repo | |
36 | [255] |
|
36 | [255] | |
37 |
|
37 | |||
38 | Enabling it |
|
38 | Enabling it | |
39 |
|
39 | |||
40 | $ cat >> $HGRCPATH << EOF |
|
40 | $ cat >> $HGRCPATH << EOF | |
41 | > [experimental] |
|
41 | > [experimental] | |
42 | > stabilization=createmarkers,exchange |
|
42 | > stabilization=createmarkers,exchange | |
43 | > EOF |
|
43 | > EOF | |
44 |
|
44 | |||
45 | Killing a single changeset without replacement |
|
45 | Killing a single changeset without replacement | |
46 |
|
46 | |||
47 | $ hg debugobsolete 0 |
|
47 | $ hg debugobsolete 0 | |
48 | abort: changeset references must be full hexadecimal node identifiers |
|
48 | abort: changeset references must be full hexadecimal node identifiers | |
49 | [255] |
|
49 | [255] | |
50 | $ hg debugobsolete '00' |
|
50 | $ hg debugobsolete '00' | |
51 | abort: changeset references must be full hexadecimal node identifiers |
|
51 | abort: changeset references must be full hexadecimal node identifiers | |
52 | [255] |
|
52 | [255] | |
53 | $ hg debugobsolete -d '0 0' `getid kill_me` -u babar |
|
53 | $ hg debugobsolete -d '0 0' `getid kill_me` -u babar | |
54 | obsoleted 1 changesets |
|
54 | obsoleted 1 changesets | |
55 | $ hg debugobsolete |
|
55 | $ hg debugobsolete | |
56 | 97b7c2d76b1845ed3eb988cd612611e72406cef0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'babar'} |
|
56 | 97b7c2d76b1845ed3eb988cd612611e72406cef0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'babar'} | |
57 |
|
57 | |||
58 | (test that mercurial is not confused) |
|
58 | (test that mercurial is not confused) | |
59 |
|
59 | |||
60 | $ hg up null --quiet # having 0 as parent prevents it to be hidden |
|
60 | $ hg up null --quiet # having 0 as parent prevents it to be hidden | |
61 | $ hg tip |
|
61 | $ hg tip | |
62 | -1:000000000000 (public) [tip ] |
|
62 | -1:000000000000 (public) [tip ] | |
63 | $ hg up --hidden tip --quiet |
|
63 | $ hg up --hidden tip --quiet | |
64 |
|
64 | |||
65 | Killing a single changeset with itself should fail |
|
65 | Killing a single changeset with itself should fail | |
66 | (simple local safeguard) |
|
66 | (simple local safeguard) | |
67 |
|
67 | |||
68 | $ hg debugobsolete `getid kill_me` `getid kill_me` |
|
68 | $ hg debugobsolete `getid kill_me` `getid kill_me` | |
69 | abort: bad obsmarker input: in-marker cycle with 97b7c2d76b1845ed3eb988cd612611e72406cef0 |
|
69 | abort: bad obsmarker input: in-marker cycle with 97b7c2d76b1845ed3eb988cd612611e72406cef0 | |
70 | [255] |
|
70 | [255] | |
71 |
|
71 | |||
72 | $ cd .. |
|
72 | $ cd .. | |
73 |
|
73 | |||
74 | Killing a single changeset with replacement |
|
74 | Killing a single changeset with replacement | |
75 | (and testing the format option) |
|
75 | (and testing the format option) | |
76 |
|
76 | |||
77 | $ hg init tmpb |
|
77 | $ hg init tmpb | |
78 | $ cd tmpb |
|
78 | $ cd tmpb | |
79 | $ mkcommit a |
|
79 | $ mkcommit a | |
80 | $ mkcommit b |
|
80 | $ mkcommit b | |
81 | $ mkcommit original_c |
|
81 | $ mkcommit original_c | |
82 | $ hg up "desc('b')" |
|
82 | $ hg up "desc('b')" | |
83 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
83 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
84 | $ mkcommit new_c |
|
84 | $ mkcommit new_c | |
85 | created new head |
|
85 | created new head | |
86 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden |
|
86 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden | |
87 | $ hg debugobsolete --config format.obsstore-version=0 --flag 12 `getid original_c` `getid new_c` -d '121 120' |
|
87 | $ hg debugobsolete --config format.obsstore-version=0 --flag 12 `getid original_c` `getid new_c` -d '121 120' | |
88 | obsoleted 1 changesets |
|
88 | obsoleted 1 changesets | |
89 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden |
|
89 | $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden | |
90 | 2:245bde4270cd add original_c |
|
90 | 2:245bde4270cd add original_c | |
91 | $ hg debugrevlog -cd |
|
91 | $ hg debugrevlog -cd | |
92 | # rev p1rev p2rev start end deltastart base p1 p2 rawsize totalsize compression heads chainlen |
|
92 | # rev p1rev p2rev start end deltastart base p1 p2 rawsize totalsize compression heads chainlen | |
93 | 0 -1 -1 0 59 0 0 0 0 58 58 0 1 0 |
|
93 | 0 -1 -1 0 59 0 0 0 0 58 58 0 1 0 | |
94 | 1 0 -1 59 118 59 59 0 0 58 116 0 1 0 |
|
94 | 1 0 -1 59 118 59 59 0 0 58 116 0 1 0 | |
95 | 2 1 -1 118 193 118 118 59 0 76 192 0 1 0 |
|
95 | 2 1 -1 118 193 118 118 59 0 76 192 0 1 0 | |
96 | 3 1 -1 193 260 193 193 59 0 66 258 0 2 0 |
|
96 | 3 1 -1 193 260 193 193 59 0 66 258 0 2 0 | |
97 | $ hg debugobsolete |
|
97 | $ hg debugobsolete | |
98 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
98 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
99 |
|
99 | |||
100 | (check for version number of the obsstore) |
|
100 | (check for version number of the obsstore) | |
101 |
|
101 | |||
102 | $ dd bs=1 count=1 if=.hg/store/obsstore 2>/dev/null |
|
102 | $ dd bs=1 count=1 if=.hg/store/obsstore 2>/dev/null | |
103 | \x00 (no-eol) (esc) |
|
103 | \x00 (no-eol) (esc) | |
104 |
|
104 | |||
105 | do it again (it read the obsstore before adding new changeset) |
|
105 | do it again (it read the obsstore before adding new changeset) | |
106 |
|
106 | |||
107 | $ hg up '.^' |
|
107 | $ hg up '.^' | |
108 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
108 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
109 | $ mkcommit new_2_c |
|
109 | $ mkcommit new_2_c | |
110 | created new head |
|
110 | created new head | |
111 | $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c` |
|
111 | $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c` | |
112 | obsoleted 1 changesets |
|
112 | obsoleted 1 changesets | |
113 | $ hg debugobsolete |
|
113 | $ hg debugobsolete | |
114 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
114 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
115 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
115 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
116 |
|
116 | |||
117 | Register two markers with a missing node |
|
117 | Register two markers with a missing node | |
118 |
|
118 | |||
119 | $ hg up '.^' |
|
119 | $ hg up '.^' | |
120 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
120 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
121 | $ mkcommit new_3_c |
|
121 | $ mkcommit new_3_c | |
122 | created new head |
|
122 | created new head | |
123 | $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337 |
|
123 | $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337 | |
124 | obsoleted 1 changesets |
|
124 | obsoleted 1 changesets | |
125 | $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c` |
|
125 | $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c` | |
126 | $ hg debugobsolete |
|
126 | $ hg debugobsolete | |
127 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
127 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
128 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
128 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
129 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
129 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
130 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
130 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
131 |
|
131 | |||
132 | Test the --index option of debugobsolete command |
|
132 | Test the --index option of debugobsolete command | |
133 | $ hg debugobsolete --index |
|
133 | $ hg debugobsolete --index | |
134 | 0 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
134 | 0 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
135 | 1 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
135 | 1 cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
136 | 2 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
136 | 2 ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
137 | 3 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
137 | 3 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
138 |
|
138 | |||
139 | Refuse pathological nullid successors |
|
139 | Refuse pathological nullid successors | |
140 | $ hg debugobsolete -d '9001 0' 1337133713371337133713371337133713371337 0000000000000000000000000000000000000000 |
|
140 | $ hg debugobsolete -d '9001 0' 1337133713371337133713371337133713371337 0000000000000000000000000000000000000000 | |
141 | transaction abort! |
|
141 | transaction abort! | |
142 | rollback completed |
|
142 | rollback completed | |
143 | abort: bad obsolescence marker detected: invalid successors nullid |
|
143 | abort: bad obsolescence marker detected: invalid successors nullid | |
144 | [255] |
|
144 | [255] | |
145 |
|
145 | |||
146 | Check that graphlog detect that a changeset is obsolete: |
|
146 | Check that graphlog detect that a changeset is obsolete: | |
147 |
|
147 | |||
148 | $ hg log -G |
|
148 | $ hg log -G | |
149 | @ 5:5601fb93a350 (draft) [tip ] add new_3_c |
|
149 | @ 5:5601fb93a350 (draft) [tip ] add new_3_c | |
150 | | |
|
150 | | | |
151 | o 1:7c3bad9141dc (draft) [ ] add b |
|
151 | o 1:7c3bad9141dc (draft) [ ] add b | |
152 | | |
|
152 | | | |
153 | o 0:1f0dee641bb7 (draft) [ ] add a |
|
153 | o 0:1f0dee641bb7 (draft) [ ] add a | |
154 |
|
154 | |||
155 |
|
155 | |||
156 | check that heads does not report them |
|
156 | check that heads does not report them | |
157 |
|
157 | |||
158 | $ hg heads |
|
158 | $ hg heads | |
159 | 5:5601fb93a350 (draft) [tip ] add new_3_c |
|
159 | 5:5601fb93a350 (draft) [tip ] add new_3_c | |
160 | $ hg heads --hidden |
|
160 | $ hg heads --hidden | |
161 | 5:5601fb93a350 (draft) [tip ] add new_3_c |
|
161 | 5:5601fb93a350 (draft) [tip ] add new_3_c | |
162 | 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c |
|
162 | 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c | |
163 | 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c |
|
163 | 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c | |
164 | 2:245bde4270cd (draft *obsolete*) [ ] add original_c |
|
164 | 2:245bde4270cd (draft *obsolete*) [ ] add original_c | |
165 |
|
165 | |||
166 |
|
166 | |||
167 | check that summary does not report them |
|
167 | check that summary does not report them | |
168 |
|
168 | |||
169 | $ hg init ../sink |
|
169 | $ hg init ../sink | |
170 | $ echo '[paths]' >> .hg/hgrc |
|
170 | $ echo '[paths]' >> .hg/hgrc | |
171 | $ echo 'default=../sink' >> .hg/hgrc |
|
171 | $ echo 'default=../sink' >> .hg/hgrc | |
172 | $ hg summary --remote |
|
172 | $ hg summary --remote | |
173 | parent: 5:5601fb93a350 tip |
|
173 | parent: 5:5601fb93a350 tip | |
174 | add new_3_c |
|
174 | add new_3_c | |
175 | branch: default |
|
175 | branch: default | |
176 | commit: (clean) |
|
176 | commit: (clean) | |
177 | update: (current) |
|
177 | update: (current) | |
178 | phases: 3 draft |
|
178 | phases: 3 draft | |
179 | remote: 3 outgoing |
|
179 | remote: 3 outgoing | |
180 |
|
180 | |||
181 | $ hg summary --remote --hidden |
|
181 | $ hg summary --remote --hidden | |
182 | parent: 5:5601fb93a350 tip |
|
182 | parent: 5:5601fb93a350 tip | |
183 | add new_3_c |
|
183 | add new_3_c | |
184 | branch: default |
|
184 | branch: default | |
185 | commit: (clean) |
|
185 | commit: (clean) | |
186 | update: 3 new changesets, 4 branch heads (merge) |
|
186 | update: 3 new changesets, 4 branch heads (merge) | |
187 | phases: 6 draft |
|
187 | phases: 6 draft | |
188 | remote: 3 outgoing |
|
188 | remote: 3 outgoing | |
189 |
|
189 | |||
190 | check that various commands work well with filtering |
|
190 | check that various commands work well with filtering | |
191 |
|
191 | |||
192 | $ hg tip |
|
192 | $ hg tip | |
193 | 5:5601fb93a350 (draft) [tip ] add new_3_c |
|
193 | 5:5601fb93a350 (draft) [tip ] add new_3_c | |
194 | $ hg log -r 6 |
|
194 | $ hg log -r 6 | |
195 | abort: unknown revision '6'! |
|
195 | abort: unknown revision '6'! | |
196 | [255] |
|
196 | [255] | |
197 | $ hg log -r 4 |
|
197 | $ hg log -r 4 | |
198 | abort: hidden revision '4'! |
|
198 | abort: hidden revision '4'! | |
199 | (use --hidden to access hidden revisions) |
|
199 | (use --hidden to access hidden revisions) | |
200 | [255] |
|
200 | [255] | |
201 | $ hg debugrevspec 'rev(6)' |
|
201 | $ hg debugrevspec 'rev(6)' | |
202 | $ hg debugrevspec 'rev(4)' |
|
202 | $ hg debugrevspec 'rev(4)' | |
203 | $ hg debugrevspec 'null' |
|
203 | $ hg debugrevspec 'null' | |
204 | -1 |
|
204 | -1 | |
205 |
|
205 | |||
206 | Check that public changeset are not accounted as obsolete: |
|
206 | Check that public changeset are not accounted as obsolete: | |
207 |
|
207 | |||
208 | $ hg --hidden phase --public 2 |
|
208 | $ hg --hidden phase --public 2 | |
209 | $ hg log -G |
|
209 | $ hg log -G | |
210 | @ 5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c |
|
210 | @ 5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c | |
211 | | |
|
211 | | | |
212 | | o 2:245bde4270cd (public) [ ] add original_c |
|
212 | | o 2:245bde4270cd (public) [ ] add original_c | |
213 | |/ |
|
213 | |/ | |
214 | o 1:7c3bad9141dc (public) [ ] add b |
|
214 | o 1:7c3bad9141dc (public) [ ] add b | |
215 | | |
|
215 | | | |
216 | o 0:1f0dee641bb7 (public) [ ] add a |
|
216 | o 0:1f0dee641bb7 (public) [ ] add a | |
217 |
|
217 | |||
218 |
|
218 | |||
219 | And that bumped changeset are detected |
|
219 | And that bumped changeset are detected | |
220 | -------------------------------------- |
|
220 | -------------------------------------- | |
221 |
|
221 | |||
222 | If we didn't filtered obsolete changesets out, 3 and 4 would show up too. Also |
|
222 | If we didn't filtered obsolete changesets out, 3 and 4 would show up too. Also | |
223 | note that the bumped changeset (5:5601fb93a350) is not a direct successor of |
|
223 | note that the bumped changeset (5:5601fb93a350) is not a direct successor of | |
224 | the public changeset |
|
224 | the public changeset | |
225 |
|
225 | |||
226 |
$ hg log --hidden -r ' |
|
226 | $ hg log --hidden -r 'phasedivergent()' | |
227 | 5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c |
|
227 | 5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c | |
228 |
|
228 | |||
229 | And that we can't push bumped changeset |
|
229 | And that we can't push bumped changeset | |
230 |
|
230 | |||
231 | $ hg push ../tmpa -r 0 --force #(make repo related) |
|
231 | $ hg push ../tmpa -r 0 --force #(make repo related) | |
232 | pushing to ../tmpa |
|
232 | pushing to ../tmpa | |
233 | searching for changes |
|
233 | searching for changes | |
234 | warning: repository is unrelated |
|
234 | warning: repository is unrelated | |
235 | adding changesets |
|
235 | adding changesets | |
236 | adding manifests |
|
236 | adding manifests | |
237 | adding file changes |
|
237 | adding file changes | |
238 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
238 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
239 | $ hg push ../tmpa |
|
239 | $ hg push ../tmpa | |
240 | pushing to ../tmpa |
|
240 | pushing to ../tmpa | |
241 | searching for changes |
|
241 | searching for changes | |
242 | abort: push includes phase-divergent changeset: 5601fb93a350! |
|
242 | abort: push includes phase-divergent changeset: 5601fb93a350! | |
243 | [255] |
|
243 | [255] | |
244 |
|
244 | |||
245 | Fixing "bumped" situation |
|
245 | Fixing "bumped" situation | |
246 | We need to create a clone of 5 and add a special marker with a flag |
|
246 | We need to create a clone of 5 and add a special marker with a flag | |
247 |
|
247 | |||
248 | $ hg summary |
|
248 | $ hg summary | |
249 | parent: 5:5601fb93a350 tip (phase-divergent) |
|
249 | parent: 5:5601fb93a350 tip (phase-divergent) | |
250 | add new_3_c |
|
250 | add new_3_c | |
251 | branch: default |
|
251 | branch: default | |
252 | commit: (clean) |
|
252 | commit: (clean) | |
253 | update: 1 new changesets, 2 branch heads (merge) |
|
253 | update: 1 new changesets, 2 branch heads (merge) | |
254 | phases: 1 draft |
|
254 | phases: 1 draft | |
255 | phase-divergent: 1 changesets |
|
255 | phase-divergent: 1 changesets | |
256 | $ hg up '5^' |
|
256 | $ hg up '5^' | |
257 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
257 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
258 | $ hg revert -ar 5 |
|
258 | $ hg revert -ar 5 | |
259 | adding new_3_c |
|
259 | adding new_3_c | |
260 | $ hg ci -m 'add n3w_3_c' |
|
260 | $ hg ci -m 'add n3w_3_c' | |
261 | created new head |
|
261 | created new head | |
262 | $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c` |
|
262 | $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c` | |
263 | obsoleted 1 changesets |
|
263 | obsoleted 1 changesets | |
264 |
$ hg log -r ' |
|
264 | $ hg log -r 'phasedivergent()' | |
265 | $ hg log -G |
|
265 | $ hg log -G | |
266 | @ 6:6f9641995072 (draft) [tip ] add n3w_3_c |
|
266 | @ 6:6f9641995072 (draft) [tip ] add n3w_3_c | |
267 | | |
|
267 | | | |
268 | | o 2:245bde4270cd (public) [ ] add original_c |
|
268 | | o 2:245bde4270cd (public) [ ] add original_c | |
269 | |/ |
|
269 | |/ | |
270 | o 1:7c3bad9141dc (public) [ ] add b |
|
270 | o 1:7c3bad9141dc (public) [ ] add b | |
271 | | |
|
271 | | | |
272 | o 0:1f0dee641bb7 (public) [ ] add a |
|
272 | o 0:1f0dee641bb7 (public) [ ] add a | |
273 |
|
273 | |||
274 |
|
274 | |||
275 | Basic exclusive testing |
|
275 | Basic exclusive testing | |
276 |
|
276 | |||
277 | $ hg log -G --hidden |
|
277 | $ hg log -G --hidden | |
278 | @ 6:6f9641995072 (draft) [tip ] add n3w_3_c |
|
278 | @ 6:6f9641995072 (draft) [tip ] add n3w_3_c | |
279 | | |
|
279 | | | |
280 | | x 5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c |
|
280 | | x 5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c | |
281 | |/ |
|
281 | |/ | |
282 | | x 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c |
|
282 | | x 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c | |
283 | |/ |
|
283 | |/ | |
284 | | x 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c |
|
284 | | x 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c | |
285 | |/ |
|
285 | |/ | |
286 | | o 2:245bde4270cd (public) [ ] add original_c |
|
286 | | o 2:245bde4270cd (public) [ ] add original_c | |
287 | |/ |
|
287 | |/ | |
288 | o 1:7c3bad9141dc (public) [ ] add b |
|
288 | o 1:7c3bad9141dc (public) [ ] add b | |
289 | | |
|
289 | | | |
290 | o 0:1f0dee641bb7 (public) [ ] add a |
|
290 | o 0:1f0dee641bb7 (public) [ ] add a | |
291 |
|
291 | |||
292 | $ hg debugobsolete --rev 6f9641995072 |
|
292 | $ hg debugobsolete --rev 6f9641995072 | |
293 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
293 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
294 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
294 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
295 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
295 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
296 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
296 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
297 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
297 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
298 | $ hg debugobsolete --rev 6f9641995072 --exclusive |
|
298 | $ hg debugobsolete --rev 6f9641995072 --exclusive | |
299 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
299 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
300 | $ hg debugobsolete --rev 5601fb93a350 --hidden |
|
300 | $ hg debugobsolete --rev 5601fb93a350 --hidden | |
301 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
301 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
302 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
302 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
303 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
303 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
304 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
304 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
305 | $ hg debugobsolete --rev 5601fb93a350 --hidden --exclusive |
|
305 | $ hg debugobsolete --rev 5601fb93a350 --hidden --exclusive | |
306 | $ hg debugobsolete --rev 5601fb93a350+6f9641995072 --hidden --exclusive |
|
306 | $ hg debugobsolete --rev 5601fb93a350+6f9641995072 --hidden --exclusive | |
307 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
307 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
308 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
308 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
309 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
309 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
310 |
|
310 | |||
311 | $ cd .. |
|
311 | $ cd .. | |
312 |
|
312 | |||
313 | Revision 0 is hidden |
|
313 | Revision 0 is hidden | |
314 | -------------------- |
|
314 | -------------------- | |
315 |
|
315 | |||
316 | $ hg init rev0hidden |
|
316 | $ hg init rev0hidden | |
317 | $ cd rev0hidden |
|
317 | $ cd rev0hidden | |
318 |
|
318 | |||
319 | $ mkcommit kill0 |
|
319 | $ mkcommit kill0 | |
320 | $ hg up -q null |
|
320 | $ hg up -q null | |
321 | $ hg debugobsolete `getid kill0` |
|
321 | $ hg debugobsolete `getid kill0` | |
322 | obsoleted 1 changesets |
|
322 | obsoleted 1 changesets | |
323 | $ mkcommit a |
|
323 | $ mkcommit a | |
324 | $ mkcommit b |
|
324 | $ mkcommit b | |
325 |
|
325 | |||
326 | Should pick the first visible revision as "repo" node |
|
326 | Should pick the first visible revision as "repo" node | |
327 |
|
327 | |||
328 | $ hg archive ../archive-null |
|
328 | $ hg archive ../archive-null | |
329 | $ cat ../archive-null/.hg_archival.txt |
|
329 | $ cat ../archive-null/.hg_archival.txt | |
330 | repo: 1f0dee641bb7258c56bd60e93edfa2405381c41e |
|
330 | repo: 1f0dee641bb7258c56bd60e93edfa2405381c41e | |
331 | node: 7c3bad9141dcb46ff89abf5f61856facd56e476c |
|
331 | node: 7c3bad9141dcb46ff89abf5f61856facd56e476c | |
332 | branch: default |
|
332 | branch: default | |
333 | latesttag: null |
|
333 | latesttag: null | |
334 | latesttagdistance: 2 |
|
334 | latesttagdistance: 2 | |
335 | changessincelatesttag: 2 |
|
335 | changessincelatesttag: 2 | |
336 |
|
336 | |||
337 |
|
337 | |||
338 | $ cd .. |
|
338 | $ cd .. | |
339 |
|
339 | |||
340 | Exchange Test |
|
340 | Exchange Test | |
341 | ============================ |
|
341 | ============================ | |
342 |
|
342 | |||
343 | Destination repo does not have any data |
|
343 | Destination repo does not have any data | |
344 | --------------------------------------- |
|
344 | --------------------------------------- | |
345 |
|
345 | |||
346 | Simple incoming test |
|
346 | Simple incoming test | |
347 |
|
347 | |||
348 | $ hg init tmpc |
|
348 | $ hg init tmpc | |
349 | $ cd tmpc |
|
349 | $ cd tmpc | |
350 | $ hg incoming ../tmpb |
|
350 | $ hg incoming ../tmpb | |
351 | comparing with ../tmpb |
|
351 | comparing with ../tmpb | |
352 | 0:1f0dee641bb7 (public) [ ] add a |
|
352 | 0:1f0dee641bb7 (public) [ ] add a | |
353 | 1:7c3bad9141dc (public) [ ] add b |
|
353 | 1:7c3bad9141dc (public) [ ] add b | |
354 | 2:245bde4270cd (public) [ ] add original_c |
|
354 | 2:245bde4270cd (public) [ ] add original_c | |
355 | 6:6f9641995072 (draft) [tip ] add n3w_3_c |
|
355 | 6:6f9641995072 (draft) [tip ] add n3w_3_c | |
356 |
|
356 | |||
357 | Try to pull markers |
|
357 | Try to pull markers | |
358 | (extinct changeset are excluded but marker are pushed) |
|
358 | (extinct changeset are excluded but marker are pushed) | |
359 |
|
359 | |||
360 | $ hg pull ../tmpb |
|
360 | $ hg pull ../tmpb | |
361 | pulling from ../tmpb |
|
361 | pulling from ../tmpb | |
362 | requesting all changes |
|
362 | requesting all changes | |
363 | adding changesets |
|
363 | adding changesets | |
364 | adding manifests |
|
364 | adding manifests | |
365 | adding file changes |
|
365 | adding file changes | |
366 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
366 | added 4 changesets with 4 changes to 4 files (+1 heads) | |
367 | 5 new obsolescence markers |
|
367 | 5 new obsolescence markers | |
368 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
368 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
369 | $ hg debugobsolete |
|
369 | $ hg debugobsolete | |
370 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
370 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
371 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
371 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
372 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
372 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
373 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
373 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
374 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
374 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
375 |
|
375 | |||
376 | Rollback//Transaction support |
|
376 | Rollback//Transaction support | |
377 |
|
377 | |||
378 | $ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb |
|
378 | $ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb | |
379 | $ hg debugobsolete |
|
379 | $ hg debugobsolete | |
380 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
380 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
381 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
381 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
382 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
382 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
383 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
383 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
384 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
384 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
385 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:22:20 1970 +0000) {'user': 'test'} |
|
385 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 (Thu Jan 01 00:22:20 1970 +0000) {'user': 'test'} | |
386 | $ hg rollback -n |
|
386 | $ hg rollback -n | |
387 | repository tip rolled back to revision 3 (undo debugobsolete) |
|
387 | repository tip rolled back to revision 3 (undo debugobsolete) | |
388 | $ hg rollback |
|
388 | $ hg rollback | |
389 | repository tip rolled back to revision 3 (undo debugobsolete) |
|
389 | repository tip rolled back to revision 3 (undo debugobsolete) | |
390 | $ hg debugobsolete |
|
390 | $ hg debugobsolete | |
391 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
391 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
392 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
392 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
393 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
393 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
394 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
394 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
395 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
395 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
396 |
|
396 | |||
397 | $ cd .. |
|
397 | $ cd .. | |
398 |
|
398 | |||
399 | Try to push markers |
|
399 | Try to push markers | |
400 |
|
400 | |||
401 | $ hg init tmpd |
|
401 | $ hg init tmpd | |
402 | $ hg -R tmpb push tmpd |
|
402 | $ hg -R tmpb push tmpd | |
403 | pushing to tmpd |
|
403 | pushing to tmpd | |
404 | searching for changes |
|
404 | searching for changes | |
405 | adding changesets |
|
405 | adding changesets | |
406 | adding manifests |
|
406 | adding manifests | |
407 | adding file changes |
|
407 | adding file changes | |
408 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
408 | added 4 changesets with 4 changes to 4 files (+1 heads) | |
409 | 5 new obsolescence markers |
|
409 | 5 new obsolescence markers | |
410 | $ hg -R tmpd debugobsolete | sort |
|
410 | $ hg -R tmpd debugobsolete | sort | |
411 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
411 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
412 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
412 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
413 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
413 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
414 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
414 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
415 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
415 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
416 |
|
416 | |||
417 | Check obsolete keys are exchanged only if source has an obsolete store |
|
417 | Check obsolete keys are exchanged only if source has an obsolete store | |
418 |
|
418 | |||
419 | $ hg init empty |
|
419 | $ hg init empty | |
420 | $ hg --config extensions.debugkeys=debugkeys.py -R empty push tmpd |
|
420 | $ hg --config extensions.debugkeys=debugkeys.py -R empty push tmpd | |
421 | pushing to tmpd |
|
421 | pushing to tmpd | |
422 | listkeys phases |
|
422 | listkeys phases | |
423 | listkeys bookmarks |
|
423 | listkeys bookmarks | |
424 | no changes found |
|
424 | no changes found | |
425 | listkeys phases |
|
425 | listkeys phases | |
426 | [1] |
|
426 | [1] | |
427 |
|
427 | |||
428 | clone support |
|
428 | clone support | |
429 | (markers are copied and extinct changesets are included to allow hardlinks) |
|
429 | (markers are copied and extinct changesets are included to allow hardlinks) | |
430 |
|
430 | |||
431 | $ hg clone tmpb clone-dest |
|
431 | $ hg clone tmpb clone-dest | |
432 | updating to branch default |
|
432 | updating to branch default | |
433 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
433 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
434 | $ hg -R clone-dest log -G --hidden |
|
434 | $ hg -R clone-dest log -G --hidden | |
435 | @ 6:6f9641995072 (draft) [tip ] add n3w_3_c |
|
435 | @ 6:6f9641995072 (draft) [tip ] add n3w_3_c | |
436 | | |
|
436 | | | |
437 | | x 5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c |
|
437 | | x 5:5601fb93a350 (draft *obsolete*) [ ] add new_3_c | |
438 | |/ |
|
438 | |/ | |
439 | | x 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c |
|
439 | | x 4:ca819180edb9 (draft *obsolete*) [ ] add new_2_c | |
440 | |/ |
|
440 | |/ | |
441 | | x 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c |
|
441 | | x 3:cdbce2fbb163 (draft *obsolete*) [ ] add new_c | |
442 | |/ |
|
442 | |/ | |
443 | | o 2:245bde4270cd (public) [ ] add original_c |
|
443 | | o 2:245bde4270cd (public) [ ] add original_c | |
444 | |/ |
|
444 | |/ | |
445 | o 1:7c3bad9141dc (public) [ ] add b |
|
445 | o 1:7c3bad9141dc (public) [ ] add b | |
446 | | |
|
446 | | | |
447 | o 0:1f0dee641bb7 (public) [ ] add a |
|
447 | o 0:1f0dee641bb7 (public) [ ] add a | |
448 |
|
448 | |||
449 | $ hg -R clone-dest debugobsolete |
|
449 | $ hg -R clone-dest debugobsolete | |
450 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
450 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
451 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
451 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
452 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
452 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
453 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
453 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
454 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
454 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
455 |
|
455 | |||
456 |
|
456 | |||
457 | Destination repo have existing data |
|
457 | Destination repo have existing data | |
458 | --------------------------------------- |
|
458 | --------------------------------------- | |
459 |
|
459 | |||
460 | On pull |
|
460 | On pull | |
461 |
|
461 | |||
462 | $ hg init tmpe |
|
462 | $ hg init tmpe | |
463 | $ cd tmpe |
|
463 | $ cd tmpe | |
464 | $ hg debugobsolete -d '1339 0' 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 |
|
464 | $ hg debugobsolete -d '1339 0' 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 | |
465 | $ hg pull ../tmpb |
|
465 | $ hg pull ../tmpb | |
466 | pulling from ../tmpb |
|
466 | pulling from ../tmpb | |
467 | requesting all changes |
|
467 | requesting all changes | |
468 | adding changesets |
|
468 | adding changesets | |
469 | adding manifests |
|
469 | adding manifests | |
470 | adding file changes |
|
470 | adding file changes | |
471 | added 4 changesets with 4 changes to 4 files (+1 heads) |
|
471 | added 4 changesets with 4 changes to 4 files (+1 heads) | |
472 | 5 new obsolescence markers |
|
472 | 5 new obsolescence markers | |
473 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
473 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
474 | $ hg debugobsolete |
|
474 | $ hg debugobsolete | |
475 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
475 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
476 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
476 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
477 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
477 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
478 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
478 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
479 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
479 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
480 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
480 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
481 |
|
481 | |||
482 |
|
482 | |||
483 | On push |
|
483 | On push | |
484 |
|
484 | |||
485 | $ hg push ../tmpc |
|
485 | $ hg push ../tmpc | |
486 | pushing to ../tmpc |
|
486 | pushing to ../tmpc | |
487 | searching for changes |
|
487 | searching for changes | |
488 | no changes found |
|
488 | no changes found | |
489 | 1 new obsolescence markers |
|
489 | 1 new obsolescence markers | |
490 | [1] |
|
490 | [1] | |
491 | $ hg -R ../tmpc debugobsolete |
|
491 | $ hg -R ../tmpc debugobsolete | |
492 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
492 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
493 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
493 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
494 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
494 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
495 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
495 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
496 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
496 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
497 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
497 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
498 |
|
498 | |||
499 | detect outgoing obsolete and unstable |
|
499 | detect outgoing obsolete and unstable | |
500 | --------------------------------------- |
|
500 | --------------------------------------- | |
501 |
|
501 | |||
502 |
|
502 | |||
503 | $ hg log -G |
|
503 | $ hg log -G | |
504 | o 3:6f9641995072 (draft) [tip ] add n3w_3_c |
|
504 | o 3:6f9641995072 (draft) [tip ] add n3w_3_c | |
505 | | |
|
505 | | | |
506 | | o 2:245bde4270cd (public) [ ] add original_c |
|
506 | | o 2:245bde4270cd (public) [ ] add original_c | |
507 | |/ |
|
507 | |/ | |
508 | o 1:7c3bad9141dc (public) [ ] add b |
|
508 | o 1:7c3bad9141dc (public) [ ] add b | |
509 | | |
|
509 | | | |
510 | o 0:1f0dee641bb7 (public) [ ] add a |
|
510 | o 0:1f0dee641bb7 (public) [ ] add a | |
511 |
|
511 | |||
512 | $ hg up 'desc("n3w_3_c")' |
|
512 | $ hg up 'desc("n3w_3_c")' | |
513 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
513 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
514 | $ mkcommit original_d |
|
514 | $ mkcommit original_d | |
515 | $ mkcommit original_e |
|
515 | $ mkcommit original_e | |
516 | $ hg debugobsolete --record-parents `getid original_d` -d '0 0' |
|
516 | $ hg debugobsolete --record-parents `getid original_d` -d '0 0' | |
517 | obsoleted 1 changesets |
|
517 | obsoleted 1 changesets | |
518 | $ hg debugobsolete | grep `getid original_d` |
|
518 | $ hg debugobsolete | grep `getid original_d` | |
519 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
519 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
520 | $ hg log -r 'obsolete()' |
|
520 | $ hg log -r 'obsolete()' | |
521 | 4:94b33453f93b (draft *obsolete*) [ ] add original_d |
|
521 | 4:94b33453f93b (draft *obsolete*) [ ] add original_d | |
522 | $ hg summary |
|
522 | $ hg summary | |
523 | parent: 5:cda648ca50f5 tip (orphan) |
|
523 | parent: 5:cda648ca50f5 tip (orphan) | |
524 | add original_e |
|
524 | add original_e | |
525 | branch: default |
|
525 | branch: default | |
526 | commit: (clean) |
|
526 | commit: (clean) | |
527 | update: 1 new changesets, 2 branch heads (merge) |
|
527 | update: 1 new changesets, 2 branch heads (merge) | |
528 | phases: 3 draft |
|
528 | phases: 3 draft | |
529 | orphan: 1 changesets |
|
529 | orphan: 1 changesets | |
530 | $ hg log -G -r '::orphan()' |
|
530 | $ hg log -G -r '::orphan()' | |
531 | @ 5:cda648ca50f5 (draft orphan) [tip ] add original_e |
|
531 | @ 5:cda648ca50f5 (draft orphan) [tip ] add original_e | |
532 | | |
|
532 | | | |
533 | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d |
|
533 | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d | |
534 | | |
|
534 | | | |
535 | o 3:6f9641995072 (draft) [ ] add n3w_3_c |
|
535 | o 3:6f9641995072 (draft) [ ] add n3w_3_c | |
536 | | |
|
536 | | | |
537 | o 1:7c3bad9141dc (public) [ ] add b |
|
537 | o 1:7c3bad9141dc (public) [ ] add b | |
538 | | |
|
538 | | | |
539 | o 0:1f0dee641bb7 (public) [ ] add a |
|
539 | o 0:1f0dee641bb7 (public) [ ] add a | |
540 |
|
540 | |||
541 |
|
541 | |||
542 | refuse to push obsolete changeset |
|
542 | refuse to push obsolete changeset | |
543 |
|
543 | |||
544 | $ hg push ../tmpc/ -r 'desc("original_d")' |
|
544 | $ hg push ../tmpc/ -r 'desc("original_d")' | |
545 | pushing to ../tmpc/ |
|
545 | pushing to ../tmpc/ | |
546 | searching for changes |
|
546 | searching for changes | |
547 | abort: push includes obsolete changeset: 94b33453f93b! |
|
547 | abort: push includes obsolete changeset: 94b33453f93b! | |
548 | [255] |
|
548 | [255] | |
549 |
|
549 | |||
550 | refuse to push unstable changeset |
|
550 | refuse to push unstable changeset | |
551 |
|
551 | |||
552 | $ hg push ../tmpc/ |
|
552 | $ hg push ../tmpc/ | |
553 | pushing to ../tmpc/ |
|
553 | pushing to ../tmpc/ | |
554 | searching for changes |
|
554 | searching for changes | |
555 | abort: push includes orphan changeset: cda648ca50f5! |
|
555 | abort: push includes orphan changeset: cda648ca50f5! | |
556 | [255] |
|
556 | [255] | |
557 |
|
557 | |||
558 | Test that extinct changeset are properly detected |
|
558 | Test that extinct changeset are properly detected | |
559 |
|
559 | |||
560 | $ hg log -r 'extinct()' |
|
560 | $ hg log -r 'extinct()' | |
561 |
|
561 | |||
562 | Don't try to push extinct changeset |
|
562 | Don't try to push extinct changeset | |
563 |
|
563 | |||
564 | $ hg init ../tmpf |
|
564 | $ hg init ../tmpf | |
565 | $ hg out ../tmpf |
|
565 | $ hg out ../tmpf | |
566 | comparing with ../tmpf |
|
566 | comparing with ../tmpf | |
567 | searching for changes |
|
567 | searching for changes | |
568 | 0:1f0dee641bb7 (public) [ ] add a |
|
568 | 0:1f0dee641bb7 (public) [ ] add a | |
569 | 1:7c3bad9141dc (public) [ ] add b |
|
569 | 1:7c3bad9141dc (public) [ ] add b | |
570 | 2:245bde4270cd (public) [ ] add original_c |
|
570 | 2:245bde4270cd (public) [ ] add original_c | |
571 | 3:6f9641995072 (draft) [ ] add n3w_3_c |
|
571 | 3:6f9641995072 (draft) [ ] add n3w_3_c | |
572 | 4:94b33453f93b (draft *obsolete*) [ ] add original_d |
|
572 | 4:94b33453f93b (draft *obsolete*) [ ] add original_d | |
573 | 5:cda648ca50f5 (draft orphan) [tip ] add original_e |
|
573 | 5:cda648ca50f5 (draft orphan) [tip ] add original_e | |
574 | $ hg push ../tmpf -f # -f because be push unstable too |
|
574 | $ hg push ../tmpf -f # -f because be push unstable too | |
575 | pushing to ../tmpf |
|
575 | pushing to ../tmpf | |
576 | searching for changes |
|
576 | searching for changes | |
577 | adding changesets |
|
577 | adding changesets | |
578 | adding manifests |
|
578 | adding manifests | |
579 | adding file changes |
|
579 | adding file changes | |
580 | added 6 changesets with 6 changes to 6 files (+1 heads) |
|
580 | added 6 changesets with 6 changes to 6 files (+1 heads) | |
581 | 7 new obsolescence markers |
|
581 | 7 new obsolescence markers | |
582 |
|
582 | |||
583 | no warning displayed |
|
583 | no warning displayed | |
584 |
|
584 | |||
585 | $ hg push ../tmpf |
|
585 | $ hg push ../tmpf | |
586 | pushing to ../tmpf |
|
586 | pushing to ../tmpf | |
587 | searching for changes |
|
587 | searching for changes | |
588 | no changes found |
|
588 | no changes found | |
589 | [1] |
|
589 | [1] | |
590 |
|
590 | |||
591 | Do not warn about new head when the new head is a successors of a remote one |
|
591 | Do not warn about new head when the new head is a successors of a remote one | |
592 |
|
592 | |||
593 | $ hg log -G |
|
593 | $ hg log -G | |
594 | @ 5:cda648ca50f5 (draft orphan) [tip ] add original_e |
|
594 | @ 5:cda648ca50f5 (draft orphan) [tip ] add original_e | |
595 | | |
|
595 | | | |
596 | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d |
|
596 | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d | |
597 | | |
|
597 | | | |
598 | o 3:6f9641995072 (draft) [ ] add n3w_3_c |
|
598 | o 3:6f9641995072 (draft) [ ] add n3w_3_c | |
599 | | |
|
599 | | | |
600 | | o 2:245bde4270cd (public) [ ] add original_c |
|
600 | | o 2:245bde4270cd (public) [ ] add original_c | |
601 | |/ |
|
601 | |/ | |
602 | o 1:7c3bad9141dc (public) [ ] add b |
|
602 | o 1:7c3bad9141dc (public) [ ] add b | |
603 | | |
|
603 | | | |
604 | o 0:1f0dee641bb7 (public) [ ] add a |
|
604 | o 0:1f0dee641bb7 (public) [ ] add a | |
605 |
|
605 | |||
606 | $ hg up -q 'desc(n3w_3_c)' |
|
606 | $ hg up -q 'desc(n3w_3_c)' | |
607 | $ mkcommit obsolete_e |
|
607 | $ mkcommit obsolete_e | |
608 | created new head |
|
608 | created new head | |
609 | $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'` \ |
|
609 | $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'` \ | |
610 | > -u 'test <test@example.net>' |
|
610 | > -u 'test <test@example.net>' | |
611 | obsoleted 1 changesets |
|
611 | obsoleted 1 changesets | |
612 | $ hg outgoing ../tmpf # parasite hg outgoing testin |
|
612 | $ hg outgoing ../tmpf # parasite hg outgoing testin | |
613 | comparing with ../tmpf |
|
613 | comparing with ../tmpf | |
614 | searching for changes |
|
614 | searching for changes | |
615 | 6:3de5eca88c00 (draft) [tip ] add obsolete_e |
|
615 | 6:3de5eca88c00 (draft) [tip ] add obsolete_e | |
616 | $ hg push ../tmpf |
|
616 | $ hg push ../tmpf | |
617 | pushing to ../tmpf |
|
617 | pushing to ../tmpf | |
618 | searching for changes |
|
618 | searching for changes | |
619 | adding changesets |
|
619 | adding changesets | |
620 | adding manifests |
|
620 | adding manifests | |
621 | adding file changes |
|
621 | adding file changes | |
622 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
622 | added 1 changesets with 1 changes to 1 files (+1 heads) | |
623 | 1 new obsolescence markers |
|
623 | 1 new obsolescence markers | |
624 | obsoleted 1 changesets |
|
624 | obsoleted 1 changesets | |
625 |
|
625 | |||
626 | test relevance computation |
|
626 | test relevance computation | |
627 | --------------------------------------- |
|
627 | --------------------------------------- | |
628 |
|
628 | |||
629 | Checking simple case of "marker relevance". |
|
629 | Checking simple case of "marker relevance". | |
630 |
|
630 | |||
631 |
|
631 | |||
632 | Reminder of the repo situation |
|
632 | Reminder of the repo situation | |
633 |
|
633 | |||
634 | $ hg log --hidden --graph |
|
634 | $ hg log --hidden --graph | |
635 | @ 6:3de5eca88c00 (draft) [tip ] add obsolete_e |
|
635 | @ 6:3de5eca88c00 (draft) [tip ] add obsolete_e | |
636 | | |
|
636 | | | |
637 | | x 5:cda648ca50f5 (draft *obsolete*) [ ] add original_e |
|
637 | | x 5:cda648ca50f5 (draft *obsolete*) [ ] add original_e | |
638 | | | |
|
638 | | | | |
639 | | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d |
|
639 | | x 4:94b33453f93b (draft *obsolete*) [ ] add original_d | |
640 | |/ |
|
640 | |/ | |
641 | o 3:6f9641995072 (draft) [ ] add n3w_3_c |
|
641 | o 3:6f9641995072 (draft) [ ] add n3w_3_c | |
642 | | |
|
642 | | | |
643 | | o 2:245bde4270cd (public) [ ] add original_c |
|
643 | | o 2:245bde4270cd (public) [ ] add original_c | |
644 | |/ |
|
644 | |/ | |
645 | o 1:7c3bad9141dc (public) [ ] add b |
|
645 | o 1:7c3bad9141dc (public) [ ] add b | |
646 | | |
|
646 | | | |
647 | o 0:1f0dee641bb7 (public) [ ] add a |
|
647 | o 0:1f0dee641bb7 (public) [ ] add a | |
648 |
|
648 | |||
649 |
|
649 | |||
650 | List of all markers |
|
650 | List of all markers | |
651 |
|
651 | |||
652 | $ hg debugobsolete |
|
652 | $ hg debugobsolete | |
653 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
653 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
654 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
654 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
655 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
655 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
656 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
656 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
657 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
657 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
658 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
658 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
659 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
659 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
660 | cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob) |
|
660 | cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob) | |
661 |
|
661 | |||
662 | List of changesets with no chain |
|
662 | List of changesets with no chain | |
663 |
|
663 | |||
664 | $ hg debugobsolete --hidden --rev ::2 |
|
664 | $ hg debugobsolete --hidden --rev ::2 | |
665 |
|
665 | |||
666 | List of changesets that are included on marker chain |
|
666 | List of changesets that are included on marker chain | |
667 |
|
667 | |||
668 | $ hg debugobsolete --hidden --rev 6 |
|
668 | $ hg debugobsolete --hidden --rev 6 | |
669 | cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob) |
|
669 | cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob) | |
670 |
|
670 | |||
671 | List of changesets with a longer chain, (including a pruned children) |
|
671 | List of changesets with a longer chain, (including a pruned children) | |
672 |
|
672 | |||
673 | $ hg debugobsolete --hidden --rev 3 |
|
673 | $ hg debugobsolete --hidden --rev 3 | |
674 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
674 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
675 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
675 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
676 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
676 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
677 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
677 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
678 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
678 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
679 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
679 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
680 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
680 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
681 |
|
681 | |||
682 | List of both |
|
682 | List of both | |
683 |
|
683 | |||
684 | $ hg debugobsolete --hidden --rev 3::6 |
|
684 | $ hg debugobsolete --hidden --rev 3::6 | |
685 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
685 | 1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
686 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} |
|
686 | 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'} | |
687 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} |
|
687 | 245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'} | |
688 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
688 | 5601fb93a350734d935195fee37f4054c529ff39 6f96419950729f3671185b847352890f074f7557 1 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
689 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
689 | 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
690 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} |
|
690 | ca819180edb99ed25ceafb3e9584ac287e240b00 1337133713371337133713371337133713371337 0 (Thu Jan 01 00:22:18 1970 +0000) {'user': 'test'} | |
691 | cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob) |
|
691 | cda648ca50f50482b7055c0b0c4c117bba6733d9 3de5eca88c00aa039da7399a220f4a5221faa585 0 (*) {'user': 'test <test@example.net>'} (glob) | |
692 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} |
|
692 | cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'} | |
693 |
|
693 | |||
694 | List of all markers in JSON |
|
694 | List of all markers in JSON | |
695 |
|
695 | |||
696 | $ hg debugobsolete -Tjson |
|
696 | $ hg debugobsolete -Tjson | |
697 | [ |
|
697 | [ | |
698 | { |
|
698 | { | |
699 | "date": [1339.0, 0], |
|
699 | "date": [1339.0, 0], | |
700 | "flag": 0, |
|
700 | "flag": 0, | |
701 | "metadata": {"user": "test"}, |
|
701 | "metadata": {"user": "test"}, | |
702 | "precnode": "1339133913391339133913391339133913391339", |
|
702 | "precnode": "1339133913391339133913391339133913391339", | |
703 | "succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"] |
|
703 | "succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"] | |
704 | }, |
|
704 | }, | |
705 | { |
|
705 | { | |
706 | "date": [1339.0, 0], |
|
706 | "date": [1339.0, 0], | |
707 | "flag": 0, |
|
707 | "flag": 0, | |
708 | "metadata": {"user": "test"}, |
|
708 | "metadata": {"user": "test"}, | |
709 | "precnode": "1337133713371337133713371337133713371337", |
|
709 | "precnode": "1337133713371337133713371337133713371337", | |
710 | "succnodes": ["5601fb93a350734d935195fee37f4054c529ff39"] |
|
710 | "succnodes": ["5601fb93a350734d935195fee37f4054c529ff39"] | |
711 | }, |
|
711 | }, | |
712 | { |
|
712 | { | |
713 | "date": [121.0, 120], |
|
713 | "date": [121.0, 120], | |
714 | "flag": 12, |
|
714 | "flag": 12, | |
715 | "metadata": {"user": "test"}, |
|
715 | "metadata": {"user": "test"}, | |
716 | "precnode": "245bde4270cd1072a27757984f9cda8ba26f08ca", |
|
716 | "precnode": "245bde4270cd1072a27757984f9cda8ba26f08ca", | |
717 | "succnodes": ["cdbce2fbb16313928851e97e0d85413f3f7eb77f"] |
|
717 | "succnodes": ["cdbce2fbb16313928851e97e0d85413f3f7eb77f"] | |
718 | }, |
|
718 | }, | |
719 | { |
|
719 | { | |
720 | "date": [1338.0, 0], |
|
720 | "date": [1338.0, 0], | |
721 | "flag": 1, |
|
721 | "flag": 1, | |
722 | "metadata": {"user": "test"}, |
|
722 | "metadata": {"user": "test"}, | |
723 | "precnode": "5601fb93a350734d935195fee37f4054c529ff39", |
|
723 | "precnode": "5601fb93a350734d935195fee37f4054c529ff39", | |
724 | "succnodes": ["6f96419950729f3671185b847352890f074f7557"] |
|
724 | "succnodes": ["6f96419950729f3671185b847352890f074f7557"] | |
725 | }, |
|
725 | }, | |
726 | { |
|
726 | { | |
727 | "date": [1338.0, 0], |
|
727 | "date": [1338.0, 0], | |
728 | "flag": 0, |
|
728 | "flag": 0, | |
729 | "metadata": {"user": "test"}, |
|
729 | "metadata": {"user": "test"}, | |
730 | "precnode": "ca819180edb99ed25ceafb3e9584ac287e240b00", |
|
730 | "precnode": "ca819180edb99ed25ceafb3e9584ac287e240b00", | |
731 | "succnodes": ["1337133713371337133713371337133713371337"] |
|
731 | "succnodes": ["1337133713371337133713371337133713371337"] | |
732 | }, |
|
732 | }, | |
733 | { |
|
733 | { | |
734 | "date": [1337.0, 0], |
|
734 | "date": [1337.0, 0], | |
735 | "flag": 0, |
|
735 | "flag": 0, | |
736 | "metadata": {"user": "test"}, |
|
736 | "metadata": {"user": "test"}, | |
737 | "precnode": "cdbce2fbb16313928851e97e0d85413f3f7eb77f", |
|
737 | "precnode": "cdbce2fbb16313928851e97e0d85413f3f7eb77f", | |
738 | "succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"] |
|
738 | "succnodes": ["ca819180edb99ed25ceafb3e9584ac287e240b00"] | |
739 | }, |
|
739 | }, | |
740 | { |
|
740 | { | |
741 | "date": [0.0, 0], |
|
741 | "date": [0.0, 0], | |
742 | "flag": 0, |
|
742 | "flag": 0, | |
743 | "metadata": {"user": "test"}, |
|
743 | "metadata": {"user": "test"}, | |
744 | "parentnodes": ["6f96419950729f3671185b847352890f074f7557"], |
|
744 | "parentnodes": ["6f96419950729f3671185b847352890f074f7557"], | |
745 | "precnode": "94b33453f93bdb8d457ef9b770851a618bf413e1", |
|
745 | "precnode": "94b33453f93bdb8d457ef9b770851a618bf413e1", | |
746 | "succnodes": [] |
|
746 | "succnodes": [] | |
747 | }, |
|
747 | }, | |
748 | { |
|
748 | { | |
749 | "date": *, (glob) |
|
749 | "date": *, (glob) | |
750 | "flag": 0, |
|
750 | "flag": 0, | |
751 | "metadata": {"user": "test <test@example.net>"}, |
|
751 | "metadata": {"user": "test <test@example.net>"}, | |
752 | "precnode": "cda648ca50f50482b7055c0b0c4c117bba6733d9", |
|
752 | "precnode": "cda648ca50f50482b7055c0b0c4c117bba6733d9", | |
753 | "succnodes": ["3de5eca88c00aa039da7399a220f4a5221faa585"] |
|
753 | "succnodes": ["3de5eca88c00aa039da7399a220f4a5221faa585"] | |
754 | } |
|
754 | } | |
755 | ] |
|
755 | ] | |
756 |
|
756 | |||
757 | Template keywords |
|
757 | Template keywords | |
758 |
|
758 | |||
759 | $ hg debugobsolete -r6 -T '{succnodes % "{node|short}"} {date|shortdate}\n' |
|
759 | $ hg debugobsolete -r6 -T '{succnodes % "{node|short}"} {date|shortdate}\n' | |
760 | 3de5eca88c00 ????-??-?? (glob) |
|
760 | 3de5eca88c00 ????-??-?? (glob) | |
761 | $ hg debugobsolete -r6 -T '{join(metadata % "{key}={value}", " ")}\n' |
|
761 | $ hg debugobsolete -r6 -T '{join(metadata % "{key}={value}", " ")}\n' | |
762 | user=test <test@example.net> |
|
762 | user=test <test@example.net> | |
763 | $ hg debugobsolete -r6 -T '{metadata}\n' |
|
763 | $ hg debugobsolete -r6 -T '{metadata}\n' | |
764 | 'user': 'test <test@example.net>' |
|
764 | 'user': 'test <test@example.net>' | |
765 | $ hg debugobsolete -r6 -T '{flag} {get(metadata, "user")}\n' |
|
765 | $ hg debugobsolete -r6 -T '{flag} {get(metadata, "user")}\n' | |
766 | 0 test <test@example.net> |
|
766 | 0 test <test@example.net> | |
767 |
|
767 | |||
768 | Test the debug output for exchange |
|
768 | Test the debug output for exchange | |
769 | ---------------------------------- |
|
769 | ---------------------------------- | |
770 |
|
770 | |||
771 | $ hg pull ../tmpb --config 'experimental.obsmarkers-exchange-debug=True' # bundle2 |
|
771 | $ hg pull ../tmpb --config 'experimental.obsmarkers-exchange-debug=True' # bundle2 | |
772 | pulling from ../tmpb |
|
772 | pulling from ../tmpb | |
773 | searching for changes |
|
773 | searching for changes | |
774 | no changes found |
|
774 | no changes found | |
775 | obsmarker-exchange: 346 bytes received |
|
775 | obsmarker-exchange: 346 bytes received | |
776 |
|
776 | |||
777 | check hgweb does not explode |
|
777 | check hgweb does not explode | |
778 | ==================================== |
|
778 | ==================================== | |
779 |
|
779 | |||
780 | $ hg unbundle $TESTDIR/bundles/hgweb+obs.hg |
|
780 | $ hg unbundle $TESTDIR/bundles/hgweb+obs.hg | |
781 | adding changesets |
|
781 | adding changesets | |
782 | adding manifests |
|
782 | adding manifests | |
783 | adding file changes |
|
783 | adding file changes | |
784 | added 62 changesets with 63 changes to 9 files (+60 heads) |
|
784 | added 62 changesets with 63 changes to 9 files (+60 heads) | |
785 | (run 'hg heads .' to see heads, 'hg merge' to merge) |
|
785 | (run 'hg heads .' to see heads, 'hg merge' to merge) | |
786 | $ for node in `hg log -r 'desc(babar_)' --template '{node}\n'`; |
|
786 | $ for node in `hg log -r 'desc(babar_)' --template '{node}\n'`; | |
787 | > do |
|
787 | > do | |
788 | > hg debugobsolete $node |
|
788 | > hg debugobsolete $node | |
789 | > done |
|
789 | > done | |
790 | obsoleted 1 changesets |
|
790 | obsoleted 1 changesets | |
791 | obsoleted 1 changesets |
|
791 | obsoleted 1 changesets | |
792 | obsoleted 1 changesets |
|
792 | obsoleted 1 changesets | |
793 | obsoleted 1 changesets |
|
793 | obsoleted 1 changesets | |
794 | obsoleted 1 changesets |
|
794 | obsoleted 1 changesets | |
795 | obsoleted 1 changesets |
|
795 | obsoleted 1 changesets | |
796 | obsoleted 1 changesets |
|
796 | obsoleted 1 changesets | |
797 | obsoleted 1 changesets |
|
797 | obsoleted 1 changesets | |
798 | obsoleted 1 changesets |
|
798 | obsoleted 1 changesets | |
799 | obsoleted 1 changesets |
|
799 | obsoleted 1 changesets | |
800 | obsoleted 1 changesets |
|
800 | obsoleted 1 changesets | |
801 | obsoleted 1 changesets |
|
801 | obsoleted 1 changesets | |
802 | obsoleted 1 changesets |
|
802 | obsoleted 1 changesets | |
803 | obsoleted 1 changesets |
|
803 | obsoleted 1 changesets | |
804 | obsoleted 1 changesets |
|
804 | obsoleted 1 changesets | |
805 | obsoleted 1 changesets |
|
805 | obsoleted 1 changesets | |
806 | obsoleted 1 changesets |
|
806 | obsoleted 1 changesets | |
807 | obsoleted 1 changesets |
|
807 | obsoleted 1 changesets | |
808 | obsoleted 1 changesets |
|
808 | obsoleted 1 changesets | |
809 | obsoleted 1 changesets |
|
809 | obsoleted 1 changesets | |
810 | obsoleted 1 changesets |
|
810 | obsoleted 1 changesets | |
811 | obsoleted 1 changesets |
|
811 | obsoleted 1 changesets | |
812 | obsoleted 1 changesets |
|
812 | obsoleted 1 changesets | |
813 | obsoleted 1 changesets |
|
813 | obsoleted 1 changesets | |
814 | obsoleted 1 changesets |
|
814 | obsoleted 1 changesets | |
815 | obsoleted 1 changesets |
|
815 | obsoleted 1 changesets | |
816 | obsoleted 1 changesets |
|
816 | obsoleted 1 changesets | |
817 | obsoleted 1 changesets |
|
817 | obsoleted 1 changesets | |
818 | obsoleted 1 changesets |
|
818 | obsoleted 1 changesets | |
819 | obsoleted 1 changesets |
|
819 | obsoleted 1 changesets | |
820 | obsoleted 1 changesets |
|
820 | obsoleted 1 changesets | |
821 | obsoleted 1 changesets |
|
821 | obsoleted 1 changesets | |
822 | obsoleted 1 changesets |
|
822 | obsoleted 1 changesets | |
823 | obsoleted 1 changesets |
|
823 | obsoleted 1 changesets | |
824 | obsoleted 1 changesets |
|
824 | obsoleted 1 changesets | |
825 | obsoleted 1 changesets |
|
825 | obsoleted 1 changesets | |
826 | obsoleted 1 changesets |
|
826 | obsoleted 1 changesets | |
827 | obsoleted 1 changesets |
|
827 | obsoleted 1 changesets | |
828 | obsoleted 1 changesets |
|
828 | obsoleted 1 changesets | |
829 | obsoleted 1 changesets |
|
829 | obsoleted 1 changesets | |
830 | obsoleted 1 changesets |
|
830 | obsoleted 1 changesets | |
831 | obsoleted 1 changesets |
|
831 | obsoleted 1 changesets | |
832 | obsoleted 1 changesets |
|
832 | obsoleted 1 changesets | |
833 | obsoleted 1 changesets |
|
833 | obsoleted 1 changesets | |
834 | obsoleted 1 changesets |
|
834 | obsoleted 1 changesets | |
835 | obsoleted 1 changesets |
|
835 | obsoleted 1 changesets | |
836 | obsoleted 1 changesets |
|
836 | obsoleted 1 changesets | |
837 | obsoleted 1 changesets |
|
837 | obsoleted 1 changesets | |
838 | obsoleted 1 changesets |
|
838 | obsoleted 1 changesets | |
839 | obsoleted 1 changesets |
|
839 | obsoleted 1 changesets | |
840 | obsoleted 1 changesets |
|
840 | obsoleted 1 changesets | |
841 | obsoleted 1 changesets |
|
841 | obsoleted 1 changesets | |
842 | obsoleted 1 changesets |
|
842 | obsoleted 1 changesets | |
843 | obsoleted 1 changesets |
|
843 | obsoleted 1 changesets | |
844 | obsoleted 1 changesets |
|
844 | obsoleted 1 changesets | |
845 | obsoleted 1 changesets |
|
845 | obsoleted 1 changesets | |
846 | obsoleted 1 changesets |
|
846 | obsoleted 1 changesets | |
847 | obsoleted 1 changesets |
|
847 | obsoleted 1 changesets | |
848 | obsoleted 1 changesets |
|
848 | obsoleted 1 changesets | |
849 | obsoleted 1 changesets |
|
849 | obsoleted 1 changesets | |
850 | $ hg up tip |
|
850 | $ hg up tip | |
851 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
851 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
852 |
|
852 | |||
853 | #if serve |
|
853 | #if serve | |
854 |
|
854 | |||
855 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
|
855 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log | |
856 | $ cat hg.pid >> $DAEMON_PIDS |
|
856 | $ cat hg.pid >> $DAEMON_PIDS | |
857 |
|
857 | |||
858 | check changelog view |
|
858 | check changelog view | |
859 |
|
859 | |||
860 | $ get-with-headers.py --headeronly localhost:$HGPORT 'shortlog/' |
|
860 | $ get-with-headers.py --headeronly localhost:$HGPORT 'shortlog/' | |
861 | 200 Script output follows |
|
861 | 200 Script output follows | |
862 |
|
862 | |||
863 | check graph view |
|
863 | check graph view | |
864 |
|
864 | |||
865 | $ get-with-headers.py --headeronly localhost:$HGPORT 'graph' |
|
865 | $ get-with-headers.py --headeronly localhost:$HGPORT 'graph' | |
866 | 200 Script output follows |
|
866 | 200 Script output follows | |
867 |
|
867 | |||
868 | check filelog view |
|
868 | check filelog view | |
869 |
|
869 | |||
870 | $ get-with-headers.py --headeronly localhost:$HGPORT 'log/'`hg log -r . -T "{node}"`/'babar' |
|
870 | $ get-with-headers.py --headeronly localhost:$HGPORT 'log/'`hg log -r . -T "{node}"`/'babar' | |
871 | 200 Script output follows |
|
871 | 200 Script output follows | |
872 |
|
872 | |||
873 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/68' |
|
873 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/68' | |
874 | 200 Script output follows |
|
874 | 200 Script output follows | |
875 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67' |
|
875 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67' | |
876 | 404 Not Found |
|
876 | 404 Not Found | |
877 | [1] |
|
877 | [1] | |
878 |
|
878 | |||
879 | check that web.view config option: |
|
879 | check that web.view config option: | |
880 |
|
880 | |||
881 | $ killdaemons.py hg.pid |
|
881 | $ killdaemons.py hg.pid | |
882 | $ cat >> .hg/hgrc << EOF |
|
882 | $ cat >> .hg/hgrc << EOF | |
883 | > [web] |
|
883 | > [web] | |
884 | > view=all |
|
884 | > view=all | |
885 | > EOF |
|
885 | > EOF | |
886 | $ wait |
|
886 | $ wait | |
887 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
|
887 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log | |
888 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67' |
|
888 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67' | |
889 | 200 Script output follows |
|
889 | 200 Script output follows | |
890 | $ killdaemons.py hg.pid |
|
890 | $ killdaemons.py hg.pid | |
891 |
|
891 | |||
892 | Checking _enable=False warning if obsolete marker exists |
|
892 | Checking _enable=False warning if obsolete marker exists | |
893 |
|
893 | |||
894 | $ echo '[experimental]' >> $HGRCPATH |
|
894 | $ echo '[experimental]' >> $HGRCPATH | |
895 | $ echo "stabilization=" >> $HGRCPATH |
|
895 | $ echo "stabilization=" >> $HGRCPATH | |
896 | $ hg log -r tip |
|
896 | $ hg log -r tip | |
897 | obsolete feature not enabled but 68 markers found! |
|
897 | obsolete feature not enabled but 68 markers found! | |
898 | 68:c15e9edfca13 (draft) [tip ] add celestine |
|
898 | 68:c15e9edfca13 (draft) [tip ] add celestine | |
899 |
|
899 | |||
900 | reenable for later test |
|
900 | reenable for later test | |
901 |
|
901 | |||
902 | $ echo '[experimental]' >> $HGRCPATH |
|
902 | $ echo '[experimental]' >> $HGRCPATH | |
903 | $ echo "stabilization=createmarkers,exchange" >> $HGRCPATH |
|
903 | $ echo "stabilization=createmarkers,exchange" >> $HGRCPATH | |
904 |
|
904 | |||
905 | $ rm hg.pid access.log errors.log |
|
905 | $ rm hg.pid access.log errors.log | |
906 | #endif |
|
906 | #endif | |
907 |
|
907 | |||
908 | Several troubles on the same changeset (create an unstable and bumped changeset) |
|
908 | Several troubles on the same changeset (create an unstable and bumped changeset) | |
909 |
|
909 | |||
910 | $ hg debugobsolete `getid obsolete_e` |
|
910 | $ hg debugobsolete `getid obsolete_e` | |
911 | obsoleted 1 changesets |
|
911 | obsoleted 1 changesets | |
912 | $ hg debugobsolete `getid original_c` `getid babar` |
|
912 | $ hg debugobsolete `getid original_c` `getid babar` | |
913 |
$ hg log --config ui.logtemplate= -r ' |
|
913 | $ hg log --config ui.logtemplate= -r 'phasedivergent() and orphan()' | |
914 | changeset: 7:50c51b361e60 |
|
914 | changeset: 7:50c51b361e60 | |
915 | user: test |
|
915 | user: test | |
916 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
916 | date: Thu Jan 01 00:00:00 1970 +0000 | |
917 | instability: orphan, phase-divergent |
|
917 | instability: orphan, phase-divergent | |
918 | summary: add babar |
|
918 | summary: add babar | |
919 |
|
919 | |||
920 |
|
920 | |||
921 | test the "obsolete" templatekw |
|
921 | test the "obsolete" templatekw | |
922 |
|
922 | |||
923 | $ hg log -r 'obsolete()' |
|
923 | $ hg log -r 'obsolete()' | |
924 | 6:3de5eca88c00 (draft *obsolete*) [ ] add obsolete_e |
|
924 | 6:3de5eca88c00 (draft *obsolete*) [ ] add obsolete_e | |
925 |
|
925 | |||
926 | test the "troubles" templatekw |
|
926 | test the "troubles" templatekw | |
927 |
|
927 | |||
928 |
$ hg log -r ' |
|
928 | $ hg log -r 'phasedivergent() and orphan()' | |
929 | 7:50c51b361e60 (draft orphan phase-divergent) [ ] add babar |
|
929 | 7:50c51b361e60 (draft orphan phase-divergent) [ ] add babar | |
930 |
|
930 | |||
931 | test the default cmdline template |
|
931 | test the default cmdline template | |
932 |
|
932 | |||
933 |
$ hg log -T default -r ' |
|
933 | $ hg log -T default -r 'phasedivergent()' | |
934 | changeset: 7:50c51b361e60 |
|
934 | changeset: 7:50c51b361e60 | |
935 | user: test |
|
935 | user: test | |
936 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
936 | date: Thu Jan 01 00:00:00 1970 +0000 | |
937 | instability: orphan, phase-divergent |
|
937 | instability: orphan, phase-divergent | |
938 | summary: add babar |
|
938 | summary: add babar | |
939 |
|
939 | |||
940 | $ hg log -T default -r 'obsolete()' |
|
940 | $ hg log -T default -r 'obsolete()' | |
941 | changeset: 6:3de5eca88c00 |
|
941 | changeset: 6:3de5eca88c00 | |
942 | parent: 3:6f9641995072 |
|
942 | parent: 3:6f9641995072 | |
943 | user: test |
|
943 | user: test | |
944 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
944 | date: Thu Jan 01 00:00:00 1970 +0000 | |
945 | summary: add obsolete_e |
|
945 | summary: add obsolete_e | |
946 |
|
946 | |||
947 |
|
947 | |||
948 | test summary output |
|
948 | test summary output | |
949 |
|
949 | |||
950 |
$ hg up -r ' |
|
950 | $ hg up -r 'phasedivergent() and orphan()' | |
951 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
951 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
952 | $ hg summary |
|
952 | $ hg summary | |
953 | parent: 7:50c51b361e60 (orphan, phase-divergent) |
|
953 | parent: 7:50c51b361e60 (orphan, phase-divergent) | |
954 | add babar |
|
954 | add babar | |
955 | branch: default |
|
955 | branch: default | |
956 | commit: (clean) |
|
956 | commit: (clean) | |
957 | update: 2 new changesets (update) |
|
957 | update: 2 new changesets (update) | |
958 | phases: 4 draft |
|
958 | phases: 4 draft | |
959 | orphan: 2 changesets |
|
959 | orphan: 2 changesets | |
960 | phase-divergent: 1 changesets |
|
960 | phase-divergent: 1 changesets | |
961 | $ hg up -r 'obsolete()' |
|
961 | $ hg up -r 'obsolete()' | |
962 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
962 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
963 | $ hg summary |
|
963 | $ hg summary | |
964 | parent: 6:3de5eca88c00 (obsolete) |
|
964 | parent: 6:3de5eca88c00 (obsolete) | |
965 | add obsolete_e |
|
965 | add obsolete_e | |
966 | branch: default |
|
966 | branch: default | |
967 | commit: (clean) |
|
967 | commit: (clean) | |
968 | update: 3 new changesets (update) |
|
968 | update: 3 new changesets (update) | |
969 | phases: 4 draft |
|
969 | phases: 4 draft | |
970 | orphan: 2 changesets |
|
970 | orphan: 2 changesets | |
971 | phase-divergent: 1 changesets |
|
971 | phase-divergent: 1 changesets | |
972 |
|
972 | |||
973 | Test incoming/outcoming with changesets obsoleted remotely, known locally |
|
973 | Test incoming/outcoming with changesets obsoleted remotely, known locally | |
974 | =============================================================================== |
|
974 | =============================================================================== | |
975 |
|
975 | |||
976 | This test issue 3805 |
|
976 | This test issue 3805 | |
977 |
|
977 | |||
978 | $ hg init repo-issue3805 |
|
978 | $ hg init repo-issue3805 | |
979 | $ cd repo-issue3805 |
|
979 | $ cd repo-issue3805 | |
980 | $ echo "base" > base |
|
980 | $ echo "base" > base | |
981 | $ hg ci -Am "base" |
|
981 | $ hg ci -Am "base" | |
982 | adding base |
|
982 | adding base | |
983 | $ echo "foo" > foo |
|
983 | $ echo "foo" > foo | |
984 | $ hg ci -Am "A" |
|
984 | $ hg ci -Am "A" | |
985 | adding foo |
|
985 | adding foo | |
986 | $ hg clone . ../other-issue3805 |
|
986 | $ hg clone . ../other-issue3805 | |
987 | updating to branch default |
|
987 | updating to branch default | |
988 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
988 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
989 | $ echo "bar" >> foo |
|
989 | $ echo "bar" >> foo | |
990 | $ hg ci --amend |
|
990 | $ hg ci --amend | |
991 | $ cd ../other-issue3805 |
|
991 | $ cd ../other-issue3805 | |
992 | $ hg log -G |
|
992 | $ hg log -G | |
993 | @ 1:29f0c6921ddd (draft) [tip ] A |
|
993 | @ 1:29f0c6921ddd (draft) [tip ] A | |
994 | | |
|
994 | | | |
995 | o 0:d20a80d4def3 (draft) [ ] base |
|
995 | o 0:d20a80d4def3 (draft) [ ] base | |
996 |
|
996 | |||
997 | $ hg log -G -R ../repo-issue3805 |
|
997 | $ hg log -G -R ../repo-issue3805 | |
998 | @ 3:323a9c3ddd91 (draft) [tip ] A |
|
998 | @ 3:323a9c3ddd91 (draft) [tip ] A | |
999 | | |
|
999 | | | |
1000 | o 0:d20a80d4def3 (draft) [ ] base |
|
1000 | o 0:d20a80d4def3 (draft) [ ] base | |
1001 |
|
1001 | |||
1002 | $ hg incoming |
|
1002 | $ hg incoming | |
1003 | comparing with $TESTTMP/tmpe/repo-issue3805 (glob) |
|
1003 | comparing with $TESTTMP/tmpe/repo-issue3805 (glob) | |
1004 | searching for changes |
|
1004 | searching for changes | |
1005 | 3:323a9c3ddd91 (draft) [tip ] A |
|
1005 | 3:323a9c3ddd91 (draft) [tip ] A | |
1006 | $ hg incoming --bundle ../issue3805.hg |
|
1006 | $ hg incoming --bundle ../issue3805.hg | |
1007 | comparing with $TESTTMP/tmpe/repo-issue3805 (glob) |
|
1007 | comparing with $TESTTMP/tmpe/repo-issue3805 (glob) | |
1008 | searching for changes |
|
1008 | searching for changes | |
1009 | 3:323a9c3ddd91 (draft) [tip ] A |
|
1009 | 3:323a9c3ddd91 (draft) [tip ] A | |
1010 | $ hg outgoing |
|
1010 | $ hg outgoing | |
1011 | comparing with $TESTTMP/tmpe/repo-issue3805 (glob) |
|
1011 | comparing with $TESTTMP/tmpe/repo-issue3805 (glob) | |
1012 | searching for changes |
|
1012 | searching for changes | |
1013 | 1:29f0c6921ddd (draft) [tip ] A |
|
1013 | 1:29f0c6921ddd (draft) [tip ] A | |
1014 |
|
1014 | |||
1015 | #if serve |
|
1015 | #if serve | |
1016 |
|
1016 | |||
1017 | $ hg serve -R ../repo-issue3805 -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
|
1017 | $ hg serve -R ../repo-issue3805 -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log | |
1018 | $ cat hg.pid >> $DAEMON_PIDS |
|
1018 | $ cat hg.pid >> $DAEMON_PIDS | |
1019 |
|
1019 | |||
1020 | $ hg incoming http://localhost:$HGPORT |
|
1020 | $ hg incoming http://localhost:$HGPORT | |
1021 | comparing with http://localhost:$HGPORT/ |
|
1021 | comparing with http://localhost:$HGPORT/ | |
1022 | searching for changes |
|
1022 | searching for changes | |
1023 | 2:323a9c3ddd91 (draft) [tip ] A |
|
1023 | 2:323a9c3ddd91 (draft) [tip ] A | |
1024 | $ hg outgoing http://localhost:$HGPORT |
|
1024 | $ hg outgoing http://localhost:$HGPORT | |
1025 | comparing with http://localhost:$HGPORT/ |
|
1025 | comparing with http://localhost:$HGPORT/ | |
1026 | searching for changes |
|
1026 | searching for changes | |
1027 | 1:29f0c6921ddd (draft) [tip ] A |
|
1027 | 1:29f0c6921ddd (draft) [tip ] A | |
1028 |
|
1028 | |||
1029 | $ killdaemons.py |
|
1029 | $ killdaemons.py | |
1030 |
|
1030 | |||
1031 | #endif |
|
1031 | #endif | |
1032 |
|
1032 | |||
1033 | This test issue 3814 |
|
1033 | This test issue 3814 | |
1034 |
|
1034 | |||
1035 | (nothing to push but locally hidden changeset) |
|
1035 | (nothing to push but locally hidden changeset) | |
1036 |
|
1036 | |||
1037 | $ cd .. |
|
1037 | $ cd .. | |
1038 | $ hg init repo-issue3814 |
|
1038 | $ hg init repo-issue3814 | |
1039 | $ cd repo-issue3805 |
|
1039 | $ cd repo-issue3805 | |
1040 | $ hg push -r 323a9c3ddd91 ../repo-issue3814 |
|
1040 | $ hg push -r 323a9c3ddd91 ../repo-issue3814 | |
1041 | pushing to ../repo-issue3814 |
|
1041 | pushing to ../repo-issue3814 | |
1042 | searching for changes |
|
1042 | searching for changes | |
1043 | adding changesets |
|
1043 | adding changesets | |
1044 | adding manifests |
|
1044 | adding manifests | |
1045 | adding file changes |
|
1045 | adding file changes | |
1046 | added 2 changesets with 2 changes to 2 files |
|
1046 | added 2 changesets with 2 changes to 2 files | |
1047 | 2 new obsolescence markers |
|
1047 | 2 new obsolescence markers | |
1048 | $ hg out ../repo-issue3814 |
|
1048 | $ hg out ../repo-issue3814 | |
1049 | comparing with ../repo-issue3814 |
|
1049 | comparing with ../repo-issue3814 | |
1050 | searching for changes |
|
1050 | searching for changes | |
1051 | no changes found |
|
1051 | no changes found | |
1052 | [1] |
|
1052 | [1] | |
1053 |
|
1053 | |||
1054 | Test that a local tag blocks a changeset from being hidden |
|
1054 | Test that a local tag blocks a changeset from being hidden | |
1055 |
|
1055 | |||
1056 | $ hg tag -l visible -r 1 --hidden |
|
1056 | $ hg tag -l visible -r 1 --hidden | |
1057 | $ hg log -G |
|
1057 | $ hg log -G | |
1058 | @ 3:323a9c3ddd91 (draft) [tip ] A |
|
1058 | @ 3:323a9c3ddd91 (draft) [tip ] A | |
1059 | | |
|
1059 | | | |
1060 | | x 1:29f0c6921ddd (draft *obsolete*) [visible ] A |
|
1060 | | x 1:29f0c6921ddd (draft *obsolete*) [visible ] A | |
1061 | |/ |
|
1061 | |/ | |
1062 | o 0:d20a80d4def3 (draft) [ ] base |
|
1062 | o 0:d20a80d4def3 (draft) [ ] base | |
1063 |
|
1063 | |||
1064 | Test that removing a local tag does not cause some commands to fail |
|
1064 | Test that removing a local tag does not cause some commands to fail | |
1065 |
|
1065 | |||
1066 | $ hg tag -l -r tip tiptag |
|
1066 | $ hg tag -l -r tip tiptag | |
1067 | $ hg tags |
|
1067 | $ hg tags | |
1068 | tiptag 3:323a9c3ddd91 |
|
1068 | tiptag 3:323a9c3ddd91 | |
1069 | tip 3:323a9c3ddd91 |
|
1069 | tip 3:323a9c3ddd91 | |
1070 | visible 1:29f0c6921ddd |
|
1070 | visible 1:29f0c6921ddd | |
1071 | $ hg --config extensions.strip= strip -r tip --no-backup |
|
1071 | $ hg --config extensions.strip= strip -r tip --no-backup | |
1072 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1072 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1073 | $ hg tags |
|
1073 | $ hg tags | |
1074 | visible 1:29f0c6921ddd |
|
1074 | visible 1:29f0c6921ddd | |
1075 | tip 1:29f0c6921ddd |
|
1075 | tip 1:29f0c6921ddd | |
1076 |
|
1076 | |||
1077 | Test bundle overlay onto hidden revision |
|
1077 | Test bundle overlay onto hidden revision | |
1078 |
|
1078 | |||
1079 | $ cd .. |
|
1079 | $ cd .. | |
1080 | $ hg init repo-bundleoverlay |
|
1080 | $ hg init repo-bundleoverlay | |
1081 | $ cd repo-bundleoverlay |
|
1081 | $ cd repo-bundleoverlay | |
1082 | $ echo "A" > foo |
|
1082 | $ echo "A" > foo | |
1083 | $ hg ci -Am "A" |
|
1083 | $ hg ci -Am "A" | |
1084 | adding foo |
|
1084 | adding foo | |
1085 | $ echo "B" >> foo |
|
1085 | $ echo "B" >> foo | |
1086 | $ hg ci -m "B" |
|
1086 | $ hg ci -m "B" | |
1087 | $ hg up 0 |
|
1087 | $ hg up 0 | |
1088 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1088 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1089 | $ echo "C" >> foo |
|
1089 | $ echo "C" >> foo | |
1090 | $ hg ci -m "C" |
|
1090 | $ hg ci -m "C" | |
1091 | created new head |
|
1091 | created new head | |
1092 | $ hg log -G |
|
1092 | $ hg log -G | |
1093 | @ 2:c186d7714947 (draft) [tip ] C |
|
1093 | @ 2:c186d7714947 (draft) [tip ] C | |
1094 | | |
|
1094 | | | |
1095 | | o 1:44526ebb0f98 (draft) [ ] B |
|
1095 | | o 1:44526ebb0f98 (draft) [ ] B | |
1096 | |/ |
|
1096 | |/ | |
1097 | o 0:4b34ecfb0d56 (draft) [ ] A |
|
1097 | o 0:4b34ecfb0d56 (draft) [ ] A | |
1098 |
|
1098 | |||
1099 |
|
1099 | |||
1100 | $ hg clone -r1 . ../other-bundleoverlay |
|
1100 | $ hg clone -r1 . ../other-bundleoverlay | |
1101 | adding changesets |
|
1101 | adding changesets | |
1102 | adding manifests |
|
1102 | adding manifests | |
1103 | adding file changes |
|
1103 | adding file changes | |
1104 | added 2 changesets with 2 changes to 1 files |
|
1104 | added 2 changesets with 2 changes to 1 files | |
1105 | updating to branch default |
|
1105 | updating to branch default | |
1106 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1106 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1107 | $ cd ../other-bundleoverlay |
|
1107 | $ cd ../other-bundleoverlay | |
1108 | $ echo "B+" >> foo |
|
1108 | $ echo "B+" >> foo | |
1109 | $ hg ci --amend -m "B+" |
|
1109 | $ hg ci --amend -m "B+" | |
1110 | $ hg log -G --hidden |
|
1110 | $ hg log -G --hidden | |
1111 | @ 3:b7d587542d40 (draft) [tip ] B+ |
|
1111 | @ 3:b7d587542d40 (draft) [tip ] B+ | |
1112 | | |
|
1112 | | | |
1113 | | x 2:eb95e9297e18 (draft *obsolete*) [ ] temporary amend commit for 44526ebb0f98 |
|
1113 | | x 2:eb95e9297e18 (draft *obsolete*) [ ] temporary amend commit for 44526ebb0f98 | |
1114 | | | |
|
1114 | | | | |
1115 | | x 1:44526ebb0f98 (draft *obsolete*) [ ] B |
|
1115 | | x 1:44526ebb0f98 (draft *obsolete*) [ ] B | |
1116 | |/ |
|
1116 | |/ | |
1117 | o 0:4b34ecfb0d56 (draft) [ ] A |
|
1117 | o 0:4b34ecfb0d56 (draft) [ ] A | |
1118 |
|
1118 | |||
1119 |
|
1119 | |||
1120 | $ hg incoming ../repo-bundleoverlay --bundle ../bundleoverlay.hg |
|
1120 | $ hg incoming ../repo-bundleoverlay --bundle ../bundleoverlay.hg | |
1121 | comparing with ../repo-bundleoverlay |
|
1121 | comparing with ../repo-bundleoverlay | |
1122 | searching for changes |
|
1122 | searching for changes | |
1123 | 1:44526ebb0f98 (draft) [ ] B |
|
1123 | 1:44526ebb0f98 (draft) [ ] B | |
1124 | 2:c186d7714947 (draft) [tip ] C |
|
1124 | 2:c186d7714947 (draft) [tip ] C | |
1125 | $ hg log -G -R ../bundleoverlay.hg |
|
1125 | $ hg log -G -R ../bundleoverlay.hg | |
1126 | o 4:c186d7714947 (draft) [tip ] C |
|
1126 | o 4:c186d7714947 (draft) [tip ] C | |
1127 | | |
|
1127 | | | |
1128 | | @ 3:b7d587542d40 (draft) [ ] B+ |
|
1128 | | @ 3:b7d587542d40 (draft) [ ] B+ | |
1129 | |/ |
|
1129 | |/ | |
1130 | o 0:4b34ecfb0d56 (draft) [ ] A |
|
1130 | o 0:4b34ecfb0d56 (draft) [ ] A | |
1131 |
|
1131 | |||
1132 |
|
1132 | |||
1133 | #if serve |
|
1133 | #if serve | |
1134 |
|
1134 | |||
1135 | Test issue 4506 |
|
1135 | Test issue 4506 | |
1136 |
|
1136 | |||
1137 | $ cd .. |
|
1137 | $ cd .. | |
1138 | $ hg init repo-issue4506 |
|
1138 | $ hg init repo-issue4506 | |
1139 | $ cd repo-issue4506 |
|
1139 | $ cd repo-issue4506 | |
1140 | $ echo "0" > foo |
|
1140 | $ echo "0" > foo | |
1141 | $ hg add foo |
|
1141 | $ hg add foo | |
1142 | $ hg ci -m "content-0" |
|
1142 | $ hg ci -m "content-0" | |
1143 |
|
1143 | |||
1144 | $ hg up null |
|
1144 | $ hg up null | |
1145 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1145 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1146 | $ echo "1" > bar |
|
1146 | $ echo "1" > bar | |
1147 | $ hg add bar |
|
1147 | $ hg add bar | |
1148 | $ hg ci -m "content-1" |
|
1148 | $ hg ci -m "content-1" | |
1149 | created new head |
|
1149 | created new head | |
1150 | $ hg up 0 |
|
1150 | $ hg up 0 | |
1151 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1151 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1152 | $ hg graft 1 |
|
1152 | $ hg graft 1 | |
1153 | grafting 1:1c9eddb02162 "content-1" (tip) |
|
1153 | grafting 1:1c9eddb02162 "content-1" (tip) | |
1154 |
|
1154 | |||
1155 | $ hg debugobsolete `hg log -r1 -T'{node}'` `hg log -r2 -T'{node}'` |
|
1155 | $ hg debugobsolete `hg log -r1 -T'{node}'` `hg log -r2 -T'{node}'` | |
1156 | obsoleted 1 changesets |
|
1156 | obsoleted 1 changesets | |
1157 |
|
1157 | |||
1158 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
|
1158 | $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log | |
1159 | $ cat hg.pid >> $DAEMON_PIDS |
|
1159 | $ cat hg.pid >> $DAEMON_PIDS | |
1160 |
|
1160 | |||
1161 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/1' |
|
1161 | $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/1' | |
1162 | 404 Not Found |
|
1162 | 404 Not Found | |
1163 | [1] |
|
1163 | [1] | |
1164 | $ get-with-headers.py --headeronly localhost:$HGPORT 'file/tip/bar' |
|
1164 | $ get-with-headers.py --headeronly localhost:$HGPORT 'file/tip/bar' | |
1165 | 200 Script output follows |
|
1165 | 200 Script output follows | |
1166 | $ get-with-headers.py --headeronly localhost:$HGPORT 'annotate/tip/bar' |
|
1166 | $ get-with-headers.py --headeronly localhost:$HGPORT 'annotate/tip/bar' | |
1167 | 200 Script output follows |
|
1167 | 200 Script output follows | |
1168 |
|
1168 | |||
1169 | $ killdaemons.py |
|
1169 | $ killdaemons.py | |
1170 |
|
1170 | |||
1171 | #endif |
|
1171 | #endif | |
1172 |
|
1172 | |||
1173 | Test heads computation on pending index changes with obsolescence markers |
|
1173 | Test heads computation on pending index changes with obsolescence markers | |
1174 | $ cd .. |
|
1174 | $ cd .. | |
1175 | $ cat >$TESTTMP/test_extension.py << EOF |
|
1175 | $ cat >$TESTTMP/test_extension.py << EOF | |
1176 | > from mercurial import cmdutil, registrar |
|
1176 | > from mercurial import cmdutil, registrar | |
1177 | > from mercurial.i18n import _ |
|
1177 | > from mercurial.i18n import _ | |
1178 | > |
|
1178 | > | |
1179 | > cmdtable = {} |
|
1179 | > cmdtable = {} | |
1180 | > command = registrar.command(cmdtable) |
|
1180 | > command = registrar.command(cmdtable) | |
1181 | > @command(b"amendtransient",[], _('hg amendtransient [rev]')) |
|
1181 | > @command(b"amendtransient",[], _('hg amendtransient [rev]')) | |
1182 | > def amend(ui, repo, *pats, **opts): |
|
1182 | > def amend(ui, repo, *pats, **opts): | |
1183 | > def commitfunc(ui, repo, message, match, opts): |
|
1183 | > def commitfunc(ui, repo, message, match, opts): | |
1184 | > return repo.commit(message, repo['.'].user(), repo['.'].date(), match) |
|
1184 | > return repo.commit(message, repo['.'].user(), repo['.'].date(), match) | |
1185 | > opts['message'] = 'Test' |
|
1185 | > opts['message'] = 'Test' | |
1186 | > opts['logfile'] = None |
|
1186 | > opts['logfile'] = None | |
1187 | > cmdutil.amend(ui, repo, commitfunc, repo['.'], {}, pats, opts) |
|
1187 | > cmdutil.amend(ui, repo, commitfunc, repo['.'], {}, pats, opts) | |
1188 | > ui.write('%s\n' % repo.changelog.headrevs()) |
|
1188 | > ui.write('%s\n' % repo.changelog.headrevs()) | |
1189 | > EOF |
|
1189 | > EOF | |
1190 | $ cat >> $HGRCPATH << EOF |
|
1190 | $ cat >> $HGRCPATH << EOF | |
1191 | > [extensions] |
|
1191 | > [extensions] | |
1192 | > testextension=$TESTTMP/test_extension.py |
|
1192 | > testextension=$TESTTMP/test_extension.py | |
1193 | > EOF |
|
1193 | > EOF | |
1194 | $ hg init repo-issue-nativerevs-pending-changes |
|
1194 | $ hg init repo-issue-nativerevs-pending-changes | |
1195 | $ cd repo-issue-nativerevs-pending-changes |
|
1195 | $ cd repo-issue-nativerevs-pending-changes | |
1196 | $ mkcommit a |
|
1196 | $ mkcommit a | |
1197 | $ mkcommit b |
|
1197 | $ mkcommit b | |
1198 | $ hg up ".^" |
|
1198 | $ hg up ".^" | |
1199 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1199 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1200 | $ echo aa > a |
|
1200 | $ echo aa > a | |
1201 | $ hg amendtransient |
|
1201 | $ hg amendtransient | |
1202 | [1, 3] |
|
1202 | [1, 3] | |
1203 |
|
1203 | |||
1204 | Test cache consistency for the visible filter |
|
1204 | Test cache consistency for the visible filter | |
1205 | 1) We want to make sure that the cached filtered revs are invalidated when |
|
1205 | 1) We want to make sure that the cached filtered revs are invalidated when | |
1206 | bookmarks change |
|
1206 | bookmarks change | |
1207 | $ cd .. |
|
1207 | $ cd .. | |
1208 | $ cat >$TESTTMP/test_extension.py << EOF |
|
1208 | $ cat >$TESTTMP/test_extension.py << EOF | |
1209 | > import weakref |
|
1209 | > import weakref | |
1210 | > from mercurial import cmdutil, extensions, bookmarks, repoview |
|
1210 | > from mercurial import cmdutil, extensions, bookmarks, repoview | |
1211 | > def _bookmarkchanged(orig, bkmstoreinst, *args, **kwargs): |
|
1211 | > def _bookmarkchanged(orig, bkmstoreinst, *args, **kwargs): | |
1212 | > reporef = weakref.ref(bkmstoreinst._repo) |
|
1212 | > reporef = weakref.ref(bkmstoreinst._repo) | |
1213 | > def trhook(tr): |
|
1213 | > def trhook(tr): | |
1214 | > repo = reporef() |
|
1214 | > repo = reporef() | |
1215 | > hidden1 = repoview.computehidden(repo) |
|
1215 | > hidden1 = repoview.computehidden(repo) | |
1216 | > hidden = repoview.filterrevs(repo, 'visible') |
|
1216 | > hidden = repoview.filterrevs(repo, 'visible') | |
1217 | > if sorted(hidden1) != sorted(hidden): |
|
1217 | > if sorted(hidden1) != sorted(hidden): | |
1218 | > print "cache inconsistency" |
|
1218 | > print "cache inconsistency" | |
1219 | > bkmstoreinst._repo.currenttransaction().addpostclose('test_extension', trhook) |
|
1219 | > bkmstoreinst._repo.currenttransaction().addpostclose('test_extension', trhook) | |
1220 | > orig(bkmstoreinst, *args, **kwargs) |
|
1220 | > orig(bkmstoreinst, *args, **kwargs) | |
1221 | > def extsetup(ui): |
|
1221 | > def extsetup(ui): | |
1222 | > extensions.wrapfunction(bookmarks.bmstore, '_recordchange', |
|
1222 | > extensions.wrapfunction(bookmarks.bmstore, '_recordchange', | |
1223 | > _bookmarkchanged) |
|
1223 | > _bookmarkchanged) | |
1224 | > EOF |
|
1224 | > EOF | |
1225 |
|
1225 | |||
1226 | $ hg init repo-cache-inconsistency |
|
1226 | $ hg init repo-cache-inconsistency | |
1227 | $ cd repo-issue-nativerevs-pending-changes |
|
1227 | $ cd repo-issue-nativerevs-pending-changes | |
1228 | $ mkcommit a |
|
1228 | $ mkcommit a | |
1229 | a already tracked! |
|
1229 | a already tracked! | |
1230 | $ mkcommit b |
|
1230 | $ mkcommit b | |
1231 | $ hg id |
|
1231 | $ hg id | |
1232 | 13bedc178fce tip |
|
1232 | 13bedc178fce tip | |
1233 | $ echo "hello" > b |
|
1233 | $ echo "hello" > b | |
1234 | $ hg commit --amend -m "message" |
|
1234 | $ hg commit --amend -m "message" | |
1235 | $ hg book bookb -r 13bedc178fce --hidden |
|
1235 | $ hg book bookb -r 13bedc178fce --hidden | |
1236 | $ hg log -r 13bedc178fce |
|
1236 | $ hg log -r 13bedc178fce | |
1237 | 5:13bedc178fce (draft *obsolete*) [ bookb] add b |
|
1237 | 5:13bedc178fce (draft *obsolete*) [ bookb] add b | |
1238 | $ hg book -d bookb |
|
1238 | $ hg book -d bookb | |
1239 | $ hg log -r 13bedc178fce |
|
1239 | $ hg log -r 13bedc178fce | |
1240 | abort: hidden revision '13bedc178fce'! |
|
1240 | abort: hidden revision '13bedc178fce'! | |
1241 | (use --hidden to access hidden revisions) |
|
1241 | (use --hidden to access hidden revisions) | |
1242 | [255] |
|
1242 | [255] | |
1243 |
|
1243 | |||
1244 | Empty out the test extension, as it isn't compatible with later parts |
|
1244 | Empty out the test extension, as it isn't compatible with later parts | |
1245 | of the test. |
|
1245 | of the test. | |
1246 | $ echo > $TESTTMP/test_extension.py |
|
1246 | $ echo > $TESTTMP/test_extension.py | |
1247 |
|
1247 | |||
1248 | Test ability to pull changeset with locally applying obsolescence markers |
|
1248 | Test ability to pull changeset with locally applying obsolescence markers | |
1249 | (issue4945) |
|
1249 | (issue4945) | |
1250 |
|
1250 | |||
1251 | $ cd .. |
|
1251 | $ cd .. | |
1252 | $ hg init issue4845 |
|
1252 | $ hg init issue4845 | |
1253 | $ cd issue4845 |
|
1253 | $ cd issue4845 | |
1254 |
|
1254 | |||
1255 | $ echo foo > f0 |
|
1255 | $ echo foo > f0 | |
1256 | $ hg add f0 |
|
1256 | $ hg add f0 | |
1257 | $ hg ci -m '0' |
|
1257 | $ hg ci -m '0' | |
1258 | $ echo foo > f1 |
|
1258 | $ echo foo > f1 | |
1259 | $ hg add f1 |
|
1259 | $ hg add f1 | |
1260 | $ hg ci -m '1' |
|
1260 | $ hg ci -m '1' | |
1261 | $ echo foo > f2 |
|
1261 | $ echo foo > f2 | |
1262 | $ hg add f2 |
|
1262 | $ hg add f2 | |
1263 | $ hg ci -m '2' |
|
1263 | $ hg ci -m '2' | |
1264 |
|
1264 | |||
1265 | $ echo bar > f2 |
|
1265 | $ echo bar > f2 | |
1266 | $ hg commit --amend --config experimetnal.stabilization=createmarkers |
|
1266 | $ hg commit --amend --config experimetnal.stabilization=createmarkers | |
1267 | $ hg log -G |
|
1267 | $ hg log -G | |
1268 | @ 4:b0551702f918 (draft) [tip ] 2 |
|
1268 | @ 4:b0551702f918 (draft) [tip ] 2 | |
1269 | | |
|
1269 | | | |
1270 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1270 | o 1:e016b03fd86f (draft) [ ] 1 | |
1271 | | |
|
1271 | | | |
1272 | o 0:a78f55e5508c (draft) [ ] 0 |
|
1272 | o 0:a78f55e5508c (draft) [ ] 0 | |
1273 |
|
1273 | |||
1274 | $ hg log -G --hidden |
|
1274 | $ hg log -G --hidden | |
1275 | @ 4:b0551702f918 (draft) [tip ] 2 |
|
1275 | @ 4:b0551702f918 (draft) [tip ] 2 | |
1276 | | |
|
1276 | | | |
1277 | | x 3:f27abbcc1f77 (draft *obsolete*) [ ] temporary amend commit for e008cf283490 |
|
1277 | | x 3:f27abbcc1f77 (draft *obsolete*) [ ] temporary amend commit for e008cf283490 | |
1278 | | | |
|
1278 | | | | |
1279 | | x 2:e008cf283490 (draft *obsolete*) [ ] 2 |
|
1279 | | x 2:e008cf283490 (draft *obsolete*) [ ] 2 | |
1280 | |/ |
|
1280 | |/ | |
1281 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1281 | o 1:e016b03fd86f (draft) [ ] 1 | |
1282 | | |
|
1282 | | | |
1283 | o 0:a78f55e5508c (draft) [ ] 0 |
|
1283 | o 0:a78f55e5508c (draft) [ ] 0 | |
1284 |
|
1284 | |||
1285 |
|
1285 | |||
1286 | $ hg strip --hidden -r 2 --config extensions.strip= --config devel.strip-obsmarkers=no |
|
1286 | $ hg strip --hidden -r 2 --config extensions.strip= --config devel.strip-obsmarkers=no | |
1287 | saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e008cf283490-39c978dc-backup.hg (glob) |
|
1287 | saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e008cf283490-39c978dc-backup.hg (glob) | |
1288 | $ hg debugobsolete |
|
1288 | $ hg debugobsolete | |
1289 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (*) {'user': 'test'} (glob) |
|
1289 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (*) {'user': 'test'} (glob) | |
1290 | f27abbcc1f77fb409cf9160482fe619541e2d605 0 {e008cf2834908e5d6b0f792a9d4b0e2272260fb8} (*) {'user': 'test'} (glob) |
|
1290 | f27abbcc1f77fb409cf9160482fe619541e2d605 0 {e008cf2834908e5d6b0f792a9d4b0e2272260fb8} (*) {'user': 'test'} (glob) | |
1291 | $ hg log -G |
|
1291 | $ hg log -G | |
1292 | @ 2:b0551702f918 (draft) [tip ] 2 |
|
1292 | @ 2:b0551702f918 (draft) [tip ] 2 | |
1293 | | |
|
1293 | | | |
1294 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1294 | o 1:e016b03fd86f (draft) [ ] 1 | |
1295 | | |
|
1295 | | | |
1296 | o 0:a78f55e5508c (draft) [ ] 0 |
|
1296 | o 0:a78f55e5508c (draft) [ ] 0 | |
1297 |
|
1297 | |||
1298 | $ hg log -G --hidden |
|
1298 | $ hg log -G --hidden | |
1299 | @ 2:b0551702f918 (draft) [tip ] 2 |
|
1299 | @ 2:b0551702f918 (draft) [tip ] 2 | |
1300 | | |
|
1300 | | | |
1301 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1301 | o 1:e016b03fd86f (draft) [ ] 1 | |
1302 | | |
|
1302 | | | |
1303 | o 0:a78f55e5508c (draft) [ ] 0 |
|
1303 | o 0:a78f55e5508c (draft) [ ] 0 | |
1304 |
|
1304 | |||
1305 | $ hg debugbundle .hg/strip-backup/e008cf283490-*-backup.hg |
|
1305 | $ hg debugbundle .hg/strip-backup/e008cf283490-*-backup.hg | |
1306 | Stream params: sortdict([('Compression', 'BZ')]) |
|
1306 | Stream params: sortdict([('Compression', 'BZ')]) | |
1307 | changegroup -- "sortdict([('version', '02'), ('nbchanges', '2')])" |
|
1307 | changegroup -- "sortdict([('version', '02'), ('nbchanges', '2')])" | |
1308 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 |
|
1308 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 | |
1309 | f27abbcc1f77fb409cf9160482fe619541e2d605 |
|
1309 | f27abbcc1f77fb409cf9160482fe619541e2d605 | |
1310 | obsmarkers -- 'sortdict()' |
|
1310 | obsmarkers -- 'sortdict()' | |
1311 | version: 1 (70 bytes) |
|
1311 | version: 1 (70 bytes) | |
1312 | f27abbcc1f77fb409cf9160482fe619541e2d605 0 {e008cf2834908e5d6b0f792a9d4b0e2272260fb8} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1312 | f27abbcc1f77fb409cf9160482fe619541e2d605 0 {e008cf2834908e5d6b0f792a9d4b0e2272260fb8} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1313 | phase-heads -- 'sortdict()' |
|
1313 | phase-heads -- 'sortdict()' | |
1314 | f27abbcc1f77fb409cf9160482fe619541e2d605 draft |
|
1314 | f27abbcc1f77fb409cf9160482fe619541e2d605 draft | |
1315 |
|
1315 | |||
1316 | $ hg pull .hg/strip-backup/e008cf283490-*-backup.hg |
|
1316 | $ hg pull .hg/strip-backup/e008cf283490-*-backup.hg | |
1317 | pulling from .hg/strip-backup/e008cf283490-39c978dc-backup.hg |
|
1317 | pulling from .hg/strip-backup/e008cf283490-39c978dc-backup.hg | |
1318 | searching for changes |
|
1318 | searching for changes | |
1319 | no changes found |
|
1319 | no changes found | |
1320 | $ hg debugobsolete |
|
1320 | $ hg debugobsolete | |
1321 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (*) {'user': 'test'} (glob) |
|
1321 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (*) {'user': 'test'} (glob) | |
1322 | f27abbcc1f77fb409cf9160482fe619541e2d605 0 {e008cf2834908e5d6b0f792a9d4b0e2272260fb8} (*) {'user': 'test'} (glob) |
|
1322 | f27abbcc1f77fb409cf9160482fe619541e2d605 0 {e008cf2834908e5d6b0f792a9d4b0e2272260fb8} (*) {'user': 'test'} (glob) | |
1323 | $ hg log -G |
|
1323 | $ hg log -G | |
1324 | @ 2:b0551702f918 (draft) [tip ] 2 |
|
1324 | @ 2:b0551702f918 (draft) [tip ] 2 | |
1325 | | |
|
1325 | | | |
1326 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1326 | o 1:e016b03fd86f (draft) [ ] 1 | |
1327 | | |
|
1327 | | | |
1328 | o 0:a78f55e5508c (draft) [ ] 0 |
|
1328 | o 0:a78f55e5508c (draft) [ ] 0 | |
1329 |
|
1329 | |||
1330 | $ hg log -G --hidden |
|
1330 | $ hg log -G --hidden | |
1331 | @ 2:b0551702f918 (draft) [tip ] 2 |
|
1331 | @ 2:b0551702f918 (draft) [tip ] 2 | |
1332 | | |
|
1332 | | | |
1333 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1333 | o 1:e016b03fd86f (draft) [ ] 1 | |
1334 | | |
|
1334 | | | |
1335 | o 0:a78f55e5508c (draft) [ ] 0 |
|
1335 | o 0:a78f55e5508c (draft) [ ] 0 | |
1336 |
|
1336 | |||
1337 |
|
1337 | |||
1338 | Testing that strip remove markers: |
|
1338 | Testing that strip remove markers: | |
1339 |
|
1339 | |||
1340 | $ hg strip -r 1 --config extensions.strip= |
|
1340 | $ hg strip -r 1 --config extensions.strip= | |
1341 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
1341 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
1342 | saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e016b03fd86f-65ede734-backup.hg (glob) |
|
1342 | saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e016b03fd86f-65ede734-backup.hg (glob) | |
1343 | $ hg debugobsolete |
|
1343 | $ hg debugobsolete | |
1344 | $ hg log -G |
|
1344 | $ hg log -G | |
1345 | @ 0:a78f55e5508c (draft) [tip ] 0 |
|
1345 | @ 0:a78f55e5508c (draft) [tip ] 0 | |
1346 |
|
1346 | |||
1347 | $ hg log -G --hidden |
|
1347 | $ hg log -G --hidden | |
1348 | @ 0:a78f55e5508c (draft) [tip ] 0 |
|
1348 | @ 0:a78f55e5508c (draft) [tip ] 0 | |
1349 |
|
1349 | |||
1350 | $ hg debugbundle .hg/strip-backup/e016b03fd86f-*-backup.hg |
|
1350 | $ hg debugbundle .hg/strip-backup/e016b03fd86f-*-backup.hg | |
1351 | Stream params: sortdict([('Compression', 'BZ')]) |
|
1351 | Stream params: sortdict([('Compression', 'BZ')]) | |
1352 | changegroup -- "sortdict([('version', '02'), ('nbchanges', '2')])" |
|
1352 | changegroup -- "sortdict([('version', '02'), ('nbchanges', '2')])" | |
1353 | e016b03fd86fcccc54817d120b90b751aaf367d6 |
|
1353 | e016b03fd86fcccc54817d120b90b751aaf367d6 | |
1354 | b0551702f918510f01ae838ab03a463054c67b46 |
|
1354 | b0551702f918510f01ae838ab03a463054c67b46 | |
1355 | obsmarkers -- 'sortdict()' |
|
1355 | obsmarkers -- 'sortdict()' | |
1356 | version: 1 (139 bytes) |
|
1356 | version: 1 (139 bytes) | |
1357 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1357 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1358 | f27abbcc1f77fb409cf9160482fe619541e2d605 0 {e008cf2834908e5d6b0f792a9d4b0e2272260fb8} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1358 | f27abbcc1f77fb409cf9160482fe619541e2d605 0 {e008cf2834908e5d6b0f792a9d4b0e2272260fb8} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1359 | phase-heads -- 'sortdict()' |
|
1359 | phase-heads -- 'sortdict()' | |
1360 | b0551702f918510f01ae838ab03a463054c67b46 draft |
|
1360 | b0551702f918510f01ae838ab03a463054c67b46 draft | |
1361 |
|
1361 | |||
1362 | $ hg unbundle .hg/strip-backup/e016b03fd86f-*-backup.hg |
|
1362 | $ hg unbundle .hg/strip-backup/e016b03fd86f-*-backup.hg | |
1363 | adding changesets |
|
1363 | adding changesets | |
1364 | adding manifests |
|
1364 | adding manifests | |
1365 | adding file changes |
|
1365 | adding file changes | |
1366 | added 2 changesets with 2 changes to 2 files |
|
1366 | added 2 changesets with 2 changes to 2 files | |
1367 | 2 new obsolescence markers |
|
1367 | 2 new obsolescence markers | |
1368 | (run 'hg update' to get a working copy) |
|
1368 | (run 'hg update' to get a working copy) | |
1369 | $ hg debugobsolete | sort |
|
1369 | $ hg debugobsolete | sort | |
1370 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (*) {'user': 'test'} (glob) |
|
1370 | e008cf2834908e5d6b0f792a9d4b0e2272260fb8 b0551702f918510f01ae838ab03a463054c67b46 0 (*) {'user': 'test'} (glob) | |
1371 | f27abbcc1f77fb409cf9160482fe619541e2d605 0 {e008cf2834908e5d6b0f792a9d4b0e2272260fb8} (*) {'user': 'test'} (glob) |
|
1371 | f27abbcc1f77fb409cf9160482fe619541e2d605 0 {e008cf2834908e5d6b0f792a9d4b0e2272260fb8} (*) {'user': 'test'} (glob) | |
1372 | $ hg log -G |
|
1372 | $ hg log -G | |
1373 | o 2:b0551702f918 (draft) [tip ] 2 |
|
1373 | o 2:b0551702f918 (draft) [tip ] 2 | |
1374 | | |
|
1374 | | | |
1375 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1375 | o 1:e016b03fd86f (draft) [ ] 1 | |
1376 | | |
|
1376 | | | |
1377 | @ 0:a78f55e5508c (draft) [ ] 0 |
|
1377 | @ 0:a78f55e5508c (draft) [ ] 0 | |
1378 |
|
1378 | |||
1379 | $ hg log -G --hidden |
|
1379 | $ hg log -G --hidden | |
1380 | o 2:b0551702f918 (draft) [tip ] 2 |
|
1380 | o 2:b0551702f918 (draft) [tip ] 2 | |
1381 | | |
|
1381 | | | |
1382 | o 1:e016b03fd86f (draft) [ ] 1 |
|
1382 | o 1:e016b03fd86f (draft) [ ] 1 | |
1383 | | |
|
1383 | | | |
1384 | @ 0:a78f55e5508c (draft) [ ] 0 |
|
1384 | @ 0:a78f55e5508c (draft) [ ] 0 | |
1385 |
|
1385 | |||
1386 | Test that 'hg debugobsolete --index --rev' can show indices of obsmarkers when |
|
1386 | Test that 'hg debugobsolete --index --rev' can show indices of obsmarkers when | |
1387 | only a subset of those are displayed (because of --rev option) |
|
1387 | only a subset of those are displayed (because of --rev option) | |
1388 | $ hg init doindexrev |
|
1388 | $ hg init doindexrev | |
1389 | $ cd doindexrev |
|
1389 | $ cd doindexrev | |
1390 | $ echo a > a |
|
1390 | $ echo a > a | |
1391 | $ hg ci -Am a |
|
1391 | $ hg ci -Am a | |
1392 | adding a |
|
1392 | adding a | |
1393 | $ hg ci --amend -m aa |
|
1393 | $ hg ci --amend -m aa | |
1394 | $ echo b > b |
|
1394 | $ echo b > b | |
1395 | $ hg ci -Am b |
|
1395 | $ hg ci -Am b | |
1396 | adding b |
|
1396 | adding b | |
1397 | $ hg ci --amend -m bb |
|
1397 | $ hg ci --amend -m bb | |
1398 | $ echo c > c |
|
1398 | $ echo c > c | |
1399 | $ hg ci -Am c |
|
1399 | $ hg ci -Am c | |
1400 | adding c |
|
1400 | adding c | |
1401 | $ hg ci --amend -m cc |
|
1401 | $ hg ci --amend -m cc | |
1402 | $ echo d > d |
|
1402 | $ echo d > d | |
1403 | $ hg ci -Am d |
|
1403 | $ hg ci -Am d | |
1404 | adding d |
|
1404 | adding d | |
1405 | $ hg ci --amend -m dd --config experimental.stabilization.track-operation=1 |
|
1405 | $ hg ci --amend -m dd --config experimental.stabilization.track-operation=1 | |
1406 | $ hg debugobsolete --index --rev "3+7" |
|
1406 | $ hg debugobsolete --index --rev "3+7" | |
1407 | 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 \(.*\) {'user': 'test'} (re) |
|
1407 | 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 \(.*\) {'user': 'test'} (re) | |
1408 | 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 \(.*\) {'operation': 'amend', 'user': 'test'} (re) |
|
1408 | 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 \(.*\) {'operation': 'amend', 'user': 'test'} (re) | |
1409 | $ hg debugobsolete --index --rev "3+7" -Tjson |
|
1409 | $ hg debugobsolete --index --rev "3+7" -Tjson | |
1410 | [ |
|
1410 | [ | |
1411 | { |
|
1411 | { | |
1412 | "date": [0.0, 0], |
|
1412 | "date": [0.0, 0], | |
1413 | "flag": 0, |
|
1413 | "flag": 0, | |
1414 | "index": 1, |
|
1414 | "index": 1, | |
1415 | "metadata": {"user": "test"}, |
|
1415 | "metadata": {"user": "test"}, | |
1416 | "precnode": "6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1", |
|
1416 | "precnode": "6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1", | |
1417 | "succnodes": ["d27fb9b066076fd921277a4b9e8b9cb48c95bc6a"] |
|
1417 | "succnodes": ["d27fb9b066076fd921277a4b9e8b9cb48c95bc6a"] | |
1418 | }, |
|
1418 | }, | |
1419 | { |
|
1419 | { | |
1420 | "date": [0.0, 0], |
|
1420 | "date": [0.0, 0], | |
1421 | "flag": 0, |
|
1421 | "flag": 0, | |
1422 | "index": 3, |
|
1422 | "index": 3, | |
1423 | "metadata": {"operation": "amend", "user": "test"}, |
|
1423 | "metadata": {"operation": "amend", "user": "test"}, | |
1424 | "precnode": "4715cf767440ed891755448016c2b8cf70760c30", |
|
1424 | "precnode": "4715cf767440ed891755448016c2b8cf70760c30", | |
1425 | "succnodes": ["7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d"] |
|
1425 | "succnodes": ["7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d"] | |
1426 | } |
|
1426 | } | |
1427 | ] |
|
1427 | ] | |
1428 |
|
1428 | |||
1429 | Test the --delete option of debugobsolete command |
|
1429 | Test the --delete option of debugobsolete command | |
1430 | $ hg debugobsolete --index |
|
1430 | $ hg debugobsolete --index | |
1431 | 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1431 | 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1432 | 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1432 | 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1433 | 2 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1433 | 2 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1434 | 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
|
1434 | 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} | |
1435 | $ hg debugobsolete --delete 1 --delete 3 |
|
1435 | $ hg debugobsolete --delete 1 --delete 3 | |
1436 | deleted 2 obsolescence markers |
|
1436 | deleted 2 obsolescence markers | |
1437 | $ hg debugobsolete |
|
1437 | $ hg debugobsolete | |
1438 | cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1438 | cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b f9bd49731b0b175e42992a3c8fa6c678b2bc11f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1439 | 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
|
1439 | 1ab51af8f9b41ef8c7f6f3312d4706d870b1fb74 29346082e4a9e27042b62d2da0e2de211c027621 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | |
1440 |
|
1440 | |||
1441 | Test adding changeset after obsmarkers affecting it |
|
1441 | Test adding changeset after obsmarkers affecting it | |
1442 | (eg: during pull, or unbundle) |
|
1442 | (eg: during pull, or unbundle) | |
1443 |
|
1443 | |||
1444 | $ mkcommit e |
|
1444 | $ mkcommit e | |
1445 | $ hg bundle -r . --base .~1 ../bundle-2.hg |
|
1445 | $ hg bundle -r . --base .~1 ../bundle-2.hg | |
1446 | 1 changesets found |
|
1446 | 1 changesets found | |
1447 | $ getid . |
|
1447 | $ getid . | |
1448 | $ hg --config extensions.strip= strip -r . |
|
1448 | $ hg --config extensions.strip= strip -r . | |
1449 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1449 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1450 | saved backup bundle to $TESTTMP/tmpe/issue4845/doindexrev/.hg/strip-backup/9bc153528424-ee80edd4-backup.hg (glob) |
|
1450 | saved backup bundle to $TESTTMP/tmpe/issue4845/doindexrev/.hg/strip-backup/9bc153528424-ee80edd4-backup.hg (glob) | |
1451 | $ hg debugobsolete 9bc153528424ea266d13e57f9ff0d799dfe61e4b |
|
1451 | $ hg debugobsolete 9bc153528424ea266d13e57f9ff0d799dfe61e4b | |
1452 | $ hg unbundle ../bundle-2.hg |
|
1452 | $ hg unbundle ../bundle-2.hg | |
1453 | adding changesets |
|
1453 | adding changesets | |
1454 | adding manifests |
|
1454 | adding manifests | |
1455 | adding file changes |
|
1455 | adding file changes | |
1456 | added 1 changesets with 1 changes to 1 files |
|
1456 | added 1 changesets with 1 changes to 1 files | |
1457 | (run 'hg update' to get a working copy) |
|
1457 | (run 'hg update' to get a working copy) | |
1458 | $ hg log -G |
|
1458 | $ hg log -G | |
1459 | @ 7:7ae79c5d60f0 (draft) [tip ] dd |
|
1459 | @ 7:7ae79c5d60f0 (draft) [tip ] dd | |
1460 | | |
|
1460 | | | |
1461 | | o 6:4715cf767440 (draft) [ ] d |
|
1461 | | o 6:4715cf767440 (draft) [ ] d | |
1462 | |/ |
|
1462 | |/ | |
1463 | o 5:29346082e4a9 (draft) [ ] cc |
|
1463 | o 5:29346082e4a9 (draft) [ ] cc | |
1464 | | |
|
1464 | | | |
1465 | o 3:d27fb9b06607 (draft) [ ] bb |
|
1465 | o 3:d27fb9b06607 (draft) [ ] bb | |
1466 | | |
|
1466 | | | |
1467 | | o 2:6fdef60fcbab (draft) [ ] b |
|
1467 | | o 2:6fdef60fcbab (draft) [ ] b | |
1468 | |/ |
|
1468 | |/ | |
1469 | o 1:f9bd49731b0b (draft) [ ] aa |
|
1469 | o 1:f9bd49731b0b (draft) [ ] aa | |
1470 |
|
1470 | |||
1471 |
|
1471 | |||
1472 | $ cd .. |
|
1472 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now